3166 files changed, 152622 insertions, 128528 deletions

diff --git a/main/src/addins/AspNet/ChangeLog b/main/src/addins/AspNet/ChangeLog
deleted file mode 100644
index 4b94c7347a..0000000000
--- a/main/src/addins/AspNet/ChangeLog
+++ /dev/null
@@ -1,3359 +0,0 @@
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj:
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Track API changes.
-
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs: Track API changes.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Track API
-	  changes.-
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Use
-	  TextEditorData infrastructure.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/HtmlEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Track API
-	  changes.
-
-2010-07-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs: Track API changes.
-
-2010-07-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs: Changed
-	  highlighting.
-
-2010-07-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs: Track API changes.
-
-2010-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Fixed 'Bug
-	  621658 - Parameter hints disappear afterkeystroke'.
-
-2010-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs: Worked
-	  on 'Bug 621658 - Parameter hints disappear afterkeystroke'.
-
-2010-07-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs: Added styles for
-	  templated regions in files, e.g. ASP.NET and T4.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Html/HtmlParser.cs:
-	* MonoDevelop.AspNet/CodeBehind.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet.Parser/AspNetParser.cs:
-	* MonoDevelop.AspNet/AspNetParserService.cs:
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Track
-	  ProjectDomService/Parser API.
-
-	* MonoDevelop.AspNet.addin.xml: Track ProjectDomService/Parser
-	  API. Also, treat spark files as html.
-
-2010-07-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspProjectDom.cs: Workaround for gmcs
-	  bug.
-
-2010-06-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs: Fixed 'Bug 611859 -
-	  aspx highlighting issues'.
-
-2010-06-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetExecutionHandler.cs: Track api
-	  changes.
-
-2010-06-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetFileDescriptionTemplate.cs: Track
-	  SingleFileDescription template API.
-
-2010-06-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs: Fixed 'Bug 611558 -
-	  Phantom text in editor after typing </script>'.
-
-2010-06-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Partial
-	  support for HTML encoded expressions and script blocks.
-
-2010-06-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.StateEngine/AspNetDom.cs:
-	* MonoDevelop.AspNet.StateEngine/AspNetExpressionState.cs: Add
-	  support for HTML encoded expressions in the state engine.
-
-	* MonoDevelop.AspNet.StateEngine/HtmlTagState.cs:
-	* MonoDevelop.AspNet.StateEngine/HtmlScriptBodyState.cs:
-	  Support for HTML script blocks.
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj: Added file to project.
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs: Worked
-	  on ASP.NET completion.
-
-2010-05-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet.csproj: Don't require a specific M.A
-	  version.
-
-2010-05-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs: Moved duplicate field
-	  elimination code into re-usable method.
-
-	* MonoDevelop.AspNet.Gui/AspProjectDom.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs: Added
-	  support for CodeBeside members in embedded completion.
-
-	* MonoDevelop.AspNet.Parser/MemberListVisitor.cs: Collect
-	  locations of items.
-
-2010-05-29  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/RegistrationCache.cs:
-	* MonoDevelop.AspNet/ProjectRegisteredControls.cs: Change the
-	  file info caches so that they don't constantly stat the
-	  disk. Instead, they use the project file events to flush
-	  items.
-
-2010-05-29  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/ProjectRegisteredControls.cs: Fix control
-	  registration.
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Use
-	  directory for config search, not filename.
-
-2010-05-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Get the web.config
-	  name from the project. Fixes Bug 610066 - Adding a reference
-	  to an ASP.NET MVC project causes Web.config to be renamed
-	  "web.config".
-
-
-2010-05-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/PageInfo.cs: More granular version
-	  of the NRE fix.
-
-2010-05-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/PageInfo.cs: Fix an NRE.
-
-2010-05-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs: Cache ProjectDoms.
-
-2010-05-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj: Added AspProjectDom to project.
-
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs:
-	  DocumentInfo now contains the usings, ProjectDoms, script
-	  region list, class name, base type.
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Only
-	  rebuild the DocumentInfo when we get a new
-	  AspNetParsedDocument, not on every keystroke. Track APIs.
-
-	* MonoDevelop.AspNet.Gui/AspProjectDom.cs: Moved from
-	  DomWrapper in AspNetCompletion.cs.
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Added
-	  APIs for getting the usings and ProjectDoms for the
-	  document.
-
-2010-05-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Missed a file in
-	  previous commit.
-
-2010-05-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs: Pass
-	  the full list of usings to the ILanguageCompletionBuilder.
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/ProjectRegisteredControls.cs:
-	  Registration cache now tracks imports and assembly
-	  registrations.
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj: Add Sysytem.Xml.Linq reference.
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Html/PathCompletion.cs:
-	* MonoDevelop.AspNet/MasterContentFileDescriptionTemplate.cs:
-	  Fix incorrect use of ShowCustomDialog/RunCustomDialog.
-
-2010-05-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs:
-	* MonoDevelop.AspNet.Parser/MemberListVisitor.cs:
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Fixed Bug
-	  524051 - .as?x.designer.cs code generated by MonoDevelop
-	  includes fields already present in the main class.
-
-2010-05-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs:
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Parser/WebFormReferenceManager.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Move
-	  all the WebTypeManager static utility-type methods onto a
-	  WebTypeContext class. Reduces arguments and will make it
-	  easier to cache stuff.
-
-2010-05-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs: Added method for
-	  getting the IType for an HTML control. 
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Added
-	  method for looking up IType of arbitrary tag.
-
-2010-05-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProjectBinding.cs: Fix creating
-	  ASP.NET single file projects. Fixes Bug 603521 - Command
-	  errors opening aspx file.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Deployment/WebDeployService.cs:
-	* MonoDevelop.AspNet.Deployment/WebDeployOptionsPanelWidget.cs:
-	  Clean up dialog placement.
-
-2010-05-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Make
-	  prefix generation and directive insertion APIs more
-	  flexible.
-
-	* MonoDevelop.AspNet.Parser/PageInfo.cs: Make it possible to
-	  inject directives to an existing info.
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj:
-	* MonoDevelop.AspNet.Parser/PageDirectiveVisitor.cs: Removed
-	  unneeded class.
-
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs: Use new
-	  ItextToolboxItem and DocumentReferenceManager APIs to insert
-	  new directives into the DOM only when the item is actually
-	  inserted into the editor. Fixes Bug 543721 - Auto-added
-	  control directives sometimes fail.
-
-2010-05-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/PageInfo.cs:
-	* MonoDevelop.AspNet.Parser/AspNetParser.cs:
-	* MonoDevelop.AspNet.Parser.Dom/RootNode.cs:
-	* MonoDevelop.AspNet.Parser/AspNetParsedDocument.cs: Collect
-	  more information from the document for C# completion.
-
-2010-05-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.AspNet.csproj:
-	* MonoDevelop.AspNet/CodeBehind.cs:
-	* MonoDevelop.AspNet.Parser/Document.cs:
-	* MonoDevelop.AspNet.Parser/PageInfo.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs:
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs:
-	* MonoDevelop.AspNet.Parser/AspNetParser.cs:
-	* MonoDevelop.AspNet.Parser.Dom/RootNode.cs:
-	* MonoDevelop.AspNet/AspNetToolboxProvider.cs:
-	* MonoDevelop.AspNet.Parser/PageInfoVisitor.cs:
-	* MonoDevelop.AspNet.Parser/MemberListVisitor.cs:
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Parser/AspNetParsedDocument.cs:
-	* MonoDevelop.AspNet.Parser/PageDirectiveVisitor.cs:
-	* MonoDevelop.AspNet.Parser/WebFormReferenceManager.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs:
-	* MonoDevelop.AspNet/MasterContentFileDescriptionTemplate.cs:
-	  Heavy refactoring and tidying of ASP.NET parser code to
-	  support future changes.
-
-2010-05-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs: Fix Bug
-	  602154 - bin/ directory not created when building ASP.Net
-	  Web Application template.
-
-2010-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Html/PathCompletion.cs:
-	* MonoDevelop.Html/DocTypeCompletionData.cs:
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs:
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
-	  Track API changes.
-
-2010-05-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetExecutionHandler.cs: Fix checks to
-	  allow .NET 4.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Html/PathCompletion.cs:
-	* MonoDevelop.Html/DocTypeCompletionData.cs:
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
-	  Track API changes.
-
-2010-04-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Worked on
-	  ASP.NET highlighting.
-
-2010-04-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Worked on
-	  ASP.NET completion.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs: 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Worked on
-	  ASP.NET completion.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs: fixed
-	  ASP.NET completion.
-
-2010-04-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs: Worked
-	  on ASP.NET completion.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AspNet.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet.csproj: Remove import off mono.addins
-	  targets.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.AspNet.csproj:
-	* MonoDevelop.AspNet.addin.xml:
-	* MonoDevelop.Html/PathCompletion.cs:
-	* MonoDevelop.AspNet/XspParameters.cs:
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.Html/HtmlSchemaService.cs:
-	* MonoDevelop.AspNet.Parser/Document.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet.Parser/Directive.cs:
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs:
-	* MonoDevelop.AspNet.Gui/BrowserLauncher.cs:
-	* MonoDevelop.AspNet.Gui/XspOptionsPanel.cs:
-	* MonoDevelop.Html/DocTypeCompletionData.cs:
-	* MonoDevelop.AspNet.Completion/SimpleLists.cs:
-	* MonoDevelop.Html/HtmlCompletionDataProvider.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs:
-	* MonoDevelop.AspNet.Deployment/WebDeployService.cs:
-	* MonoDevelop.AspNet.Deployment/WebDeployCommands.cs:
-	* MonoDevelop.AspNet.Gui/AspNetConfigurationPanel.cs:
-	* MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs:
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs:
-	* MonoDevelop.AspNet.Deployment/WebDeployLaunchDialog.cs:
-	* MonoDevelop.AspNet.Deployment/WebDeployOptionsPanel.cs:
-	* MonoDevelop.AspNet/ProjectFolderNodeBuilderExtension.cs:
-	* MonoDevelop.AspNet/MasterContentFileDescriptionTemplate.cs:
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/Directive.cs:
-	* MonoDevelop.AspNet.Deployment/AspNetDeployServiceExtension.cs:
-	  Track ProjectFile Link API.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Html/PathCompletion.cs:
-	* MonoDevelop.Html/DocTypeCompletionData.cs:
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
-	  Track api changes.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet.addin.xml: Added some conditions to avoid
-	  early loading of extensions.
-
-	* MonoDevelop.AspNet.Gui/HtmlEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: File
-	  extensions are now declared in the node metadata.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.AspNet.Gui.XspOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebTargetEditor.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs:
-	* gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs:
-	  Flush.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetMSBuildImportProvider.cs: Track api
-	  changes.
-
-2010-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Html/PathCompletion.cs:
-	* MonoDevelop.Html/DocTypeCompletionData.cs:
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
-	  Track API changes.
-
-2010-01-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Implement
-	  the new SupportsItem method.
-
-2010-01-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/LineInterceptingTextWriter.cs: fixed
-	  possible null ref.
-
-2010-01-07  mkrueger  <${AuthorEmail}>
-
-	* MonoDevelop.AspNet/LineInterceptingTextWriter.cs: Fixed null
-	  reference exception.
-
-2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetExecutionHandler.cs: Use "xsp1" not
-	  "xsp", but include a fallback so that it still works without
-	  wrapper scripts, as xsp1 is xsp.exe.
-
-2009-12-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/LineInterceptingTextWriter.cs: Move the
-	  LineInterceptingTextWriter to another file and make it
-	  public. Implement proper support for crlf.
-
-2009-12-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Scan a few more
-	  output lines to check whether xsp has started.
-
-2009-12-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet.Gui/BrowserLauncher.cs: Scan xsp output
-	  for "Listening on port: " to detect when it's started,
-	  instead of polling the server.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Deployment/WebDeployService.cs: Name
-	  threads to make debugging easier.
-
-2009-12-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs: Worked
-	  on ASP.NET code completion.
-
-2009-12-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj:
-	* MonoDevelop.AspNet.addin.xml:
-	* MonoDevelop.AspNet.Parser.Dom/RootNode.cs:
-	* MonoDevelop.AspNet.Parser.Dom/ExpressionNode.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/ILanguageCompletionBuilder.cs: Worked
-	  on ASP.NET code completion.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs:
-	* MonoDevelop.AspNet.Deployment/WebDeployService.cs:
-	* MonoDevelop.AspNet.Deployment/AspNetDeployServiceExtension.cs:
-	  Introduced the ConfigurationSelector class to all methods
-	  that previously took a configuration name as string. This
-	  eliminates the ambiguity between solution configuration
-	  names and project configuration names.
-
-2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Track API. Set
-	  UserAssemblyPaths. Get correct configuration.
-
-	* MonoDevelop.AspNet/AspNetExecutionCommand.cs: Add property
-	  for list of user assemblies.
-
-2009-11-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Fix bad
-	  flags manipulation. Fixes Bug 556514 - asp.net Autogenerated
-	  function are not public.
-
-2009-11-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs: Strip the implicit
-	  namespace from the generated compilation unit. Required for
-	  VB.
-
-2009-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs:
-	  Simplify creation of new ASP.NET MVC configurations.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.csproj: Wire the soft debug addin into
-	  the build.
-
-2009-10-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/BrowserLauncher.cs: Fake a
-	  IProcessAsyncOperation so that is can be returned from an
-	  execution handler.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AspNet.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.AspNet.Gui.XspOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebTargetEditor.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs:
-	* gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs:
-	  Flush.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Track
-	  namespace renamings.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.AspNet.csproj: Mark *-sharp references,
-	with SpecificVersion=false. Import md.targets .
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AspNet.addin.xml: Bump MD version.
-
-2009-10-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj: Update.
-
-	* MonoDevelop.Html/PathCompletion.cs: Creates completion lists
-	  for picking file paths.
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs: Tweak API
-	  so classes can return completion lists instead of modifying
-	  one they're given.
-
-	* MonoDevelop.AspNet.Parser/Directive.cs: Complete paths for
-	  register src and for masterpagefile. Finally fix the
-	  register directive attribute completion too.
-
-2009-10-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.Html/DocTypeCompletionData.cs:
-	* MonoDevelop.AspNet/ProjectRegisteredControls.cs:
-	* MonoDevelop.AspNet.Parser/WebFormReferenceManager.cs: Use
-	  ordinal string compares where appropriate.
-
-2009-10-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Take
-	  tag name into account when resolving type from control
-	  registration directives. Only compare prefix once per
-	  directive, and use case-insensitive ordinal comparisons.
-	  Fixes bug #543727.
-
-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Resolve user
-	  controls from referenced projects. Fixes "Bug 519651 -
-	  Custom Controls cannot be registered in ASP.NET pages".
-
-2009-09-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs:
-	  Enable horizontal scroll so the dialog doesn't get
-	  oversized.
-
-2009-09-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Tidy up a
-	  few things, and fix some FIXMEs.
-
-2009-09-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Add a cache for
-	  codebehind type names.
-
-	* MonoDevelop.AspNet/ProjectRegisteredControls.cs: Factor out
-	  FileInfoCache from the control registration cache, so we can
-	  use it for a type name cache.
-
-	* MonoDevelop.AspNet/WebTypeManager.cs: Type UserControls with
-	  the type of this CodeBehind, if it can be looked up.
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Fix a
-	  couple of small bugs in UserControl type lookups.
-
-2009-09-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Found a better way
-	  of removing the encoding declaration from the header.
-
-2009-09-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Omit the xml
-	  declaration when saving the .config file, because it is
-	  declaring the utf-16 encoding, which wrong when saving the
-	  content to a utf-8 file. Fixes bug #537846 - Editing
-	  .aspx-files throws 'Error in text editor extension
-	  chain'-exception.
-
-2009-09-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet\AspNetExecutionHandler.cs: Set DEVPATH to
-	  the path of xsp. Required on Windows, so that .NET can find
-	  Mono.Web.
-
-	* MonoDevelop.AspNet\AspNetAppProject.cs: Moved the XSP check
-	  to the execution handler.
-
-2009-09-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Html/DocTypeCompletionData.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
-	  Track API changes.
-
-2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet.csproj: Don't require a specific version
-	  for Mono.Addins.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetExecutionCommand.cs:
-	* MonoDevelop.AspNet/AspNetExecutionHandler.cs: Run xsp on the
-	  correct target runtime. Support using a bundled xsp if it
-	  doesn't exist in the target runtime.
-
-2009-08-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AspNet.csproj:
-	* MonoDevelop.AspNet.addin.xml:
-	* MonoDevelop.AspNet/AspNetMSBuildImportProvider.cs: Use the
-	  new extension point for generating msbuild imports.
-
-2009-08-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetToolboxLoader.cs:
-	* MonoDevelop.AspNet/AspNetToolboxProvider.cs: Use the new
-	  AssemblyContext class to query and resolve assemblies.
-
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.csproj: Include the ASP.NET MVC and
-	  TextTemplating addins in the main solution and build.
-
-2009-08-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AspNetAddIn.csproj: Don't local-copy project references.
-
-2009-08-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs:
-	  Override and implement CopyFrom. Should allow the config
-	  editing panel to store values.
-
-2009-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AspNetAddIn.csproj: Don't local copy assemblies.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs:
-	  Flush.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs:
-	  Flush.
-
-2009-07-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetConfigurationPanel.cs:
-	* MonoDevelop.AspNet.Gui/AspNetConfigurationPanelWidget.cs:
-	  Remove unnecessary field.
-
-2009-07-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* AspNetAddIn.csproj:
-	* MonoDevelop.AspNet.Gui/AspNetFileSelector.cs:
-	* gtk-gui/MonoDevelop.AspNet.Gui.AspNetFileSelector.cs:
-	* MonoDevelop.AspNet/MasterContentFileDescriptionTemplate.cs:
-	  Move AspNetFileSelector to
-	  MonoDevelop.Project.Gui.Dialogs.ProjectFileSelectorDialog.
-
-2009-07-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProjectBinding.cs: Track api
-	  changes. Patch by Viktoria Dudka.
-
-2009-07-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* AspNetAddIn.csproj: Fixed build.
-
-2009-07-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* AspNetAddIn.csproj:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Started to
-	  work on ASP.NET code completion.
-
-2009-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs: Worked on
-	  highlighting support for code blocks.
-
-2009-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* AspNetAddIn.csproj:
-	* MonoDevelop.AspNet.addin.xml:
-	* MonoDevelop.AspNet/AspNetSyntaxMode.cs: Added ASP.NET C#
-	  region syntax highlighting.
-
-2009-07-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Properly map the
-	  configuration name to a configuration.
-
-2009-07-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Templates/WebForm-Empty.xft.xml:
-	* Templates/WebApplication.xpt.xml:
-	* Templates/MasterPage-Empty.xft.xml:
-	* Templates/WebForm-CodeBehind.xft.xml:
-	* Templates/MasterPage-CodeBehind.xft.xml:
-	* Templates/WebForm-CodeBehindNonPartial.xft.xml:
-	* Templates/MasterPage-CodeBehindNonPartial.xft.xml: Make head
-	  tag into server tag so that theming works. Patch from
-	  Alfredo De Vito.
-
-2009-07-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs: Move CodeBehindWriter from
-	  MonoDevelop.AspNet to MonoDevelop.DesignerSupport.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs:
-	* MonoDevelop.AspNet.Gui/BrowserLauncher.cs:
-	* MonoDevelop.AspNet.Gui/AspNetFileSelector.cs: Use the new
-	  DesktopService instead of PlatformService.
-
-2009-06-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs: Track assembly lookup
-	  APIs. Fix bad logic that could cause NRE.
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetToolboxLoader.cs:
-	* MonoDevelop.AspNet/AspNetToolboxProvider.cs: Track assembly
-	  lookup APIs.
-
-2009-05-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetFileDescriptionTemplate.cs:
-	* MonoDevelop.AspNet/MasterContentFileDescriptionTemplate.cs:
-	  Track api changes.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet\CodeBehind.cs:
-	* MonoDevelop.AspNet\AspNetAppProject.cs:
-	* MonoDevelop.AspNet.Gui\AspNetFileSelector.cs:
-	* MonoDevelop.AspNet\ProjectFolderNodeBuilderExtension.cs: Use
-	  the new FilePath class for handling file and directory
-	  paths.
-
-2009-04-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetExecutionCommand.cs: Added
-	  TargetRuntime parameter to AspNetExecutionComand.
-
-2009-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet/AspNetFileDescriptionTemplate.cs: Track
-	  API changes.
-
-2009-04-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs: Notify fileservice when a
-	  file that isn't open has been changed. Fixes "Bug 496278 -
-	  C# completion doesn't update when designer codebehind is
-	  updated".
-
-2009-04-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Templates/WebContentForm-CodeBehind.xft.xml: Fix the
-	  DependsOn value. Thanks to Dax@daxxfiles.net for the patch.
-
-2009-04-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* AspNetAddIn.csproj:
-	* MonoDevelop.AspNet.addin.xml:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetExecutionHandler.cs:
-	* MonoDevelop.AspNet/AspNetExecutionCommand.cs: Use an
-	  IExecutionHandler and an ExecutionCommand to handle the
-	  execution of asp.net projects. This will allow supporting
-	  special execution modes such as debug or profile.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetFileSelector.cs: Renamed
-	  PixbufService to ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetFileSelector.cs: Track API
-	  changes.
-
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* AspNetAddin.csproj: don't require specific gtk-sharp version.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetFileSelector.cs: Removed icon
-	  service.
-
-2009-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Moved
-	  SystemAssemblyService and related classes to the namespace
-	  MonoDevelop.Core.Assemblies.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AspNet.addin.xml: Bump MD version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs:
-	* MonoDevelop.AspNet/AspNetToolboxLoader.cs:
-	* MonoDevelop.AspNet/AspNetToolboxProvider.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Track
-	  api changes to support multiple target runtimes.
-
-2009-04-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/MasterContentFileDescriptionTemplate.cs:
-	  Add a using.
-
-2009-03-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Fix output directory
-	  for newly created projects, since DotNetProject changes it
-	  during project creation.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Html/HtmlParser.cs:
-	* MonoDevelop.AspNet.Parser/AspNetParser.cs:
-	* MonoDevelop.AspNet/MasterContentFileDescriptionTemplate.cs:
-	  Track API changes.
-
-2009-03-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Migrate bad output
-	  directories from MD1 format. Set proper output directory for
-	  new configurations.
-
-	* MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs: Remove
-	  output directory hacks.
-
-2009-03-13  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebTargetEditor.cs:
-	  Making some strings not translatable.
-
-2009-03-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs: Work around text editor
-	  bug (#484574) that caused modifications to open files not to
-	  be saved. Only try to save files that we've modified.
-
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Force type
-	  database to update during build. Fixes "Bug 484122 -
-	  [Regression] Default C# Asp.Net template fails to compile".
-	  Remove dead code.
-
-2009-03-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetFileSelector.cs: Show
-	  directories that contain project files, even if the
-	  directories aren't explicitly in the project. Don't
-	  duplicate directories that have children that are explictly
-	  in the project.
-
-2009-03-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Don't crash
-	  on documents without doctypes. Better root element
-	  completion for web controls and master children.
-
-2009-03-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs: Track
-	  doctype parsing changes. Fix jumping to selections.
-
-2009-03-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Changed the way
-	  execution handlers work. We are not using platform ids
-	  anymore. Instead, we use command strings when looking for
-	  execution handlers. IExecutionHandlerFactory has been
-	  removed and now everything is handled by IExecutionHandler,
-	  which has a new CanExecute method. This model is more simple
-	  and more generic.
-
-2009-02-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/ProjectFolderNodeBuilderExtension.cs:
-	  Save the project after adding a special folder.
-
-2009-02-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/ProjectFolderNodeBuilderExtension.cs:
-	  More efficient query for existing folders. Attach node
-	  builder to more limited range of node types. Show special
-	  folders even if they exist in the project, or users might
-	  get confused when the menu vanishes.
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Slim down the list
-	  of special folders to ones for web apps rather than sites.
-	  Make virtual.
-
-	* MonoDevelop.AspNet.addin.xml: Remove unused attribute.
-
-2009-02-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs:
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Move
-	  codebehind generation code from VerifyCodeBehindBuildStep to
-	  CodeBehind and refactor it into something more re-usable.
-
-2009-02-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Fix swapped
-	  parameters in ResolveVirtualPath.
-
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Generate
-	  strongly typed master accessor property if the MasterType
-	  directive is present.
-
-2009-02-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/PageInfo.cs: More properties in
-	  ToString.
-
-	* MonoDevelop.AspNet.Parser/PageInfoVisitor.cs: Ignore case of
-	  MasterType directive.
-
-2009-02-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Templates/WebContentForm.xft.xml:
-	* Templates/NestedMasterPage.xft.xml:
-	* Templates/WebContentForm-CodeBehind.xft.xml:
-	* Templates/NestedMasterPage-CodeBehind.xft.xml: Fix
-	  MasterPageFile attribute name.
-
-2009-02-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/Directive.cs: Add completion for
-	  MasterType directive.
-
-2009-02-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetFileSelector.cs: Diplay project
-	  tree and its icons correctly.
-
-2009-02-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/MasterContentFileDescriptionTemplate.cs:
-	  Add new template type that allows user to pick a master page
-	  and stubs out content regions.
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* AspNetAddIn.csproj:
-	* MonoDevelop.AspNet.addin.xml: Updated.
-
-	* Templates/MasterPage-Empty.xft.xml:
-	* Templates/MasterPage-CodeBehind.xft.xml:
-	* Templates/MasterPage-CodeBehindNonPartial.xft.xml: Correct
-	  names.
-
-	* Templates/WebContentForm.xft.xml:
-	* Templates/NestedMasterPage.xft.xml:
-	* Templates/WebContentForm-CodeBehind.xft.xml:
-	* Templates/NestedMasterPage-CodeBehind.xft.xml: New
-	  templates.
-
-	* MonoDevelop.AspNet.Gui/AspNetFileSelector.cs:
-	* gtk-gui/MonoDevelop.AspNet.Gui.AspNetFileSelector.cs: Added
-	  a UI for picking a master page.
-
-	* MonoDevelop.AspNet.Parser/ContentPlaceHolderVisitor.cs: A
-	  visitor for finding the contentplaceholder ids of a master
-	  page.
-
-2009-02-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Add methods for
-	  handling virtual paths.
-
-	* MonoDevelop.AspNet.Parser/PageInfo.cs:
-	* MonoDevelop.AspNet.Parser/PageInfoVisitor.cs: Capture
-	  MasterPageType info.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet.addin.xml: Track merge of the project pad
-	  context menu.
-
-2009-02-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetFileDescriptionTemplate.cs: Track
-	  API.
-
-2009-02-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Add an attempt at
-	  resolving assemblies from bin.
-
-2009-02-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Track
-	  assembly database API behaviour. Improve assembly resolution
-	  error handling. Fixes "Bug 477476 - Template for ASP.Net Web
-	  Application doesn't work by default." and restores ASP.NET
-	  code completion and codebehind generation.
-
-2009-02-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/HtmlEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Track API.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AspNetAddIn.csproj: Copy schemas to output directory.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Remove
-	  unnecessary "base" instance access, as csc doesn't like it.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AspNetAddIn.mdp:
-	* AspNetAddIn.csproj: Migrated to MSBuild file format.
-
-2009-02-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Track
-	  BindingService API.
-
-2009-02-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Allow
-	  forced completion for fields/properties in expressions.
-
-	* MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs: Add
-	  rollback so that expressions can be differentiated. Fixes
-	  field/property completion in expressions.
-
-2009-02-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
-	  Track BindingService API. Fixes event completion bugs.
-
-2009-02-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/ProjectRegisteredControls.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs:
-	  Implement full type lookup and listing mechanisms for
-	  controls registered in web.config. Enables full code
-	  completion for these controls. Fixes "Bug 470488 - Controls
-	  registered in web.config do not have code completion".
-
-2009-02-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Add a
-	  ControlRegistrationCache to the project to cache web.config
-	  control registrations.
-
-	* MonoDevelop.AspNet/ProjectRegisteredControls.cs: Use a
-	  custom class for encapsulating registration info instead of
-	  TagPrefixInfo, so we can attach extra data.
-
-	* MonoDevelop.AspNet/WebTypeManager.cs: Use project's
-	  ControlRegistrationCache for type lookups.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AspNet.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.AspNet.Gui.XspOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebTargetEditor.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs:
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs:
-	* gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs:
-	*
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs:
-	  Flush.
-
-2009-01-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetFileDescriptionTemplate.cs: Propagate a
-	policy parent SolutionItem through project/file creation so that
-	policies can always be resolved correctly.
-
-2009-01-29  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AspNetAddIn.mdp:
-	* MonoDevelop.AspNet/ProjectRegisteredControls.cs: Add a class to load
-	and cache control registrations from web.config files. It's intended
-	to be bound to the AspNetAppProject, for documents to look to for
-	completion and resolving types.
-
-2009-01-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs: Don't pass a null 
-	TargetFramework to SystemAssemblySevice, or it explodes. Propagate 
-	project info to the web.config handler so that it can resolve 
-	assemblies with the correct TargetFramework.
-
-2009-01-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: If the 
-	special-casing of the asp prefix to System.Web.dll fails to resolve 
-	the type, do a full lookup. Fixes the asp prefix with other controls, 
-	as is common with e.g. System.Web.Extensions.
-
-2009-01-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/MemberListVisitor.cs: Log type resolution 
-	errors to the document's error list.
-
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Make sure the 
-	member list is initialised before outputting errors, so that type 
-	resolution errors show up in the error pad. Treat them as warnings 
-	until we can be 100% sure that they're not mistakes on MD's part.
-
-2009-01-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Execute xsp in the project's
-	BaseDirectory, not the SourceDirectory, since the bin directory is
-	already assumed to be in BaseDirectory, and SourceDirectory seems to
-	be obsolete. Fixes running ASP.NET csproj projects in certain
-	circumstances.
-
-2009-01-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs: Remove closing tag
-	completion as the base class handles it now.
-
-2009-01-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetAppProjectBinding.cs:
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs:
-	* MonoDevelop.AspNet.Parser/AspNetParsedDocument.cs:
-	* MonoDevelop.AspNet.MD1Serialization/MD1AspNetCustomDataItem.cs: Track
-	DetermineWebSubtype API.
-
-	* Templates/WebForm-Empty.xft.xml:
-	* Templates/WebApplication.xpt.xml:
-	* Templates/WebControl-Empty.xft.xml:
-	* Templates/WebHandler-Empty.xft.xml:
-	* Templates/GlobalAsax-Empty.xft.xml:
-	* Templates/WebService-Empty.xft.xml:
-	* Templates/MasterPage-Empty.xft.xml:
-	* Templates/WebConfig-SubDir.xft.xml:
-	* Templates/WebForm-CodeBehind.xft.xml:
-	* Templates/WebConfig-Application.xft.xml:
-	* Templates/MasterPage-CodeBehind.xft.xml:
-	* Templates/WebHandler-CodeBehind.xft.xml:
-	* Templates/WebService-CodeBehind.xft.xml:
-	* Templates/GlobalAsax-CodeBehind.xft.xml:
-	* Templates/WebControl-CodeBehind.xft.xml:
-	* Templates/WebForm-CodeBehindNonPartial.xft.xml:
-	* Templates/MasterPage-CodeBehindNonPartial.xft.xml:
-	* Templates/WebControl-CodeBehindNonPartial.xft.xml: Don't explicitly
-	set a build action, since it was wrong for MSBuild files, and the
-	default works fine.
-
-2009-01-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Deployment/AspNetDeployServiceExtension.cs: Deploy
-	all files marked as "Content" rather than all ASP.NET files.
-
-2009-01-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Add JavaScript to WebSubType.
-
-2009-01-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Add css, xhtml, html, htm to
-	the WebSubTypes enum. This means that their default build action is
-	"Content", so they get deployed by default. Should fix "Bug 466855 -
-	CSS files in App_Themes/theme_name/ are not deployed".
-
-2009-01-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Don't try to update web.config
-	when references are removed during project loading. Fixes "Bug 465852
-	- MonoDevelop 2.0 (trunk) does not load ASP.NET projects from 1.0."
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AspNetAddIn.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Track API
-	changes.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AspNetAddIn.mdp: Don't require a specific version of Mono.Addins.
-
-2008-12-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Ignore
-	PersistChildrenAttribute, as it does more harm than good. It's
-	essentially the opposite of ParseChildrenAttribute, but it's often
-	incorrectly set, whereas ParseChildrenAttribute is almost invariably
-	correct. Also, assume that any property tagged with a
-	TemplateContainerAttribute has an InnerProperty persistence mode.
-
-2008-12-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Add TODO markers for
-	ParseChildrenAttribute.ChildControlType support.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Implemented CanExecute.
-
-	* MonoDevelop.AspNet.Gui/BrowserLauncher.cs: Track api changes.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.addin.xml: Set correct packing for Web deployment
-	panel.
-
-2008-12-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.addin.xml: Move options panels to more appropriate
-	categories.
-
-	* gtk-gui/gui.stetic: Flush.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AspNetAddIn.mdp:
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Use
-	DocumentationService to look up class documentation lazily.
-
-2008-11-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: If project's CompileTarget
-	isn't "Library", automatically fix it, since older versions of MD did
-	not set it correctly.
-
-2008-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Html/HtmlParser.cs: Implement multiple root element
-	validation since parser no longer handles this.
-
-2008-11-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Improve accuracy of
-	completions for controls' children. Add support for completing
-	properties' childen.
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Extend lookup
-	methods to be able to look for types other than Control.
-
-2008-11-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.StateEngine/HtmlTagState.cs: Improve error location
-	precision for implicitly self-closing tags.
-
-2008-11-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Improve element
-	completion.
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Make
-	AspTagCompletionData public.
-
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs: Expose methods to
-	subclass.
-
-2008-11-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Use ASP.NET
-	serialisation attributes to improve completion. Display properties as
-	children when appropriate; don't display properties as attributes or
-	controls as children when inappropriate.
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Add a shortcut
-	for HTML controls.
-
-2008-11-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Templates/WebApplication.xpt.xml: Fix case of asp:button.
-
-	* MonoDevelop.AspNet/WebTypeManager.cs: Make sure all type name lookups
-	are case insensitive (seems that MonoDevelop's defaults changed).
-	Fixes Bug 445850 - [Regression] The C# Asp Web application template
-	fails to compile .
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Trivial 1.1 to
-	2.0 API update.
-
-2008-11-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.StateEngine/HtmlTagState.cs:
-	* MonoDevelop.AspNet.StateEngine/HtmlClosingTagState.cs: Implement new
-	parser states that handle implicit tag closing for HTML.
-
-	* Makefile.am:
-	* AspNetAddIn.mdp: Updated.
-
-	* MonoDevelop.Html/HtmlParser.cs:
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs:
-	* MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs: Use the new HTML
-	parsing states.
-
-	* MonoDevelop.Html/ElementTypes.cs: Lookups to determine if an HTML tags
-	is block/inline/empty/paragraph.
-
-2008-11-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs: Flag schema for
-	update when doctype changes.
-
-2008-11-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs: Use project to resolve target
-	.NET version for assemblies.
-
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Resolve types
-	of items from register directives. Lazy-load descriptions.
-
-2008-11-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/WebTypeManager.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Include
-	controls referenced by Register directives when listing tags.
-
-2008-11-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.addin.xml: Specify position for build step.
-
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Enable designer class
-	updating for UserControls and MasterPages.
-
-2008-11-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs: Split out the HTML
-	editor extension. Add document outlining.
-
-	* Makefile.am:
-	* AspNetAddIn.mdp: Updated.
-
-	* MonoDevelop.AspNet.addin.xml:
-	* MonoDevelop.Html/HtmlParser.cs: Added an HTML parser.
-
-	* MonoDevelop.AspNet.Gui/HtmlEditorExtension.cs: Split out the HTML
-	editor extension. Add document outlining. Mostly extracted from
-	Moonlight addin.
-
-2008-11-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AspNetAddIn.mdp:
-	* MonoDevelop.AspNet.Gui/HtmlTextEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/BaseHtmlEditorExtension.cs: Renamed file.
-
-2008-11-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/HtmlTextEditorExtension.cs: Move re-usable HTML
-	editing into base class in preparation for other changes.
-
-2008-11-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/HtmlTextEditorExtension.cs: Tidy up
-	doctype->schema resolution code, and only try to resolve doctype when
-	it changes. Use case-insensitive completion.
-
-2008-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Track fix in text
-	editor's completion line/col indexing. It's now 1-indexed, as it
-	should be. Fix attribute value type resolution fallback.
-
-	* MonoDevelop.AspNet.Parser/Document.cs: Comment out some noisy debug
-	code.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Use new API; move default
-	build action code into GetDefaultBuildAction override.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AspNet.addin.xml: Bump MD version.
-
-2008-11-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Override new
-	IsLibraryBasedProjectType property, consolidating code in base class.
-
-2008-11-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Set CompileTarget to library
-	on base class, not just overriding the values on the property. Fixes
-	Bug 436275 - MD ASP.Net project does not build in VS2005.
-
-2008-11-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Track MD core API to re-enable
-	running of ASP.NET projects.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AspNet.addin.xml: fixed 'Bug 399737 - Code completion
-	busted for referenced assemblies that are not in GAC, are outside of
-	the solution, and which are referenced by other non-GAC outside
-	referenced assemblies'.
-
-2008-10-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Fix directive name
-	completion triggering.
-
-2008-10-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.StateEngine/AspNetDom.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.StateEngine/AspNetDirectiveState.cs:
-	* MonoDevelop.AspNet.StateEngine/AspNetExpressionState.cs:
-	* MonoDevelop.AspNet.StateEngine/AspNetServerCommentState.cs: Changed
-	Xml StateEngine from offset-based positions to line/column positions.
-
-2008-10-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Better default build action
-	for auto-added codebehind files.
-
-2008-10-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet/CodeBehind.cs:
-	* MonoDevelop.AspNet/AspNetAppProject.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Moved
-	codebehind/designer lookup functionality to
-	MonoDevelop.DesignerSupport.
-
-2008-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Add simple
-	field/property completions in render and databinding expressions.
-
-2008-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Finally fix event
-	handler completion with the new MD Code DOM.
-
-2008-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AspNetAddIn.mdp: Updated.
-
-	* MonoDevelop.AspNet.addin.xml: Enable HtmlEditorExtension for HTML
-	completion.
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Gui/HtmlTextEditorExtension.cs: Refactor HTML
-	completion from AspNetEditorExtension into an HtmlEditorExtension
-	base class.
-
-2008-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Completion/SimpleLists.cs: Remove unused methods.
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Move code to base
-	class. Implement more directive completions.
-
-	* MonoDevelop.AspNet.Parser/Directive.cs: Change API to alter lists
-	instead of creating them.
-
-2008-10-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Move more into the
-	base class. Implement directive name completion.
-
-	* MonoDevelop.AspNet.Parser/Directive.cs: Remove unused parameters.
-
-2008-10-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser.Internal/AspParser.cs: Improve error
-	reporting.
-
-2008-10-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Track API. Work
-	around some bugs in directive completion until they're fixed
-	properly.
-
-	* Makefile.am:
-	* AspNetAddIn.mdp: Updated.
-
-	* MonoDevelop.AspNet.Completion/SimpleLists.cs: Add utility methods for
-	simple completion lists with default values.
-
-	* MonoDevelop.AspNet.Parser/Directive.cs: Add attribute completion for
-	all directives. Some work towards completing directive names and
-	values.
-
-	* MonoDevelop.AspNet.Parser/AspNetParsedDocument.cs: Add a WebSubType
-	property.
-
-2008-10-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/Directive.cs: Add more attributes.
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Remove code that's
-	moved to base class.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/Directive.cs:
-	* MonoDevelop.Html/HtmlCompletionDataProvider.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.Html/DocTypeCompletionDataProvider.cs: Track APIs.
-
-	* Makefile.am:
-	* AspNetAddIn.mdp: Updated.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Html/DocTypeCompletionData.cs:
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs:
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs: Track
-	CompletionData API.
-
-2008-10-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AspNet.Parser/Directive.cs: Track API.
-
-	* Makefile.am:
-	* AspNetAddIn.mdp: Updated.
-
-	* MonoDevelop.AspNet.Parser/SimpleCompletionData.cs: Moved to
-	MonoDevelop.Projects.Gui.
-
-	* MonoDevelop.AspNet.Parser/AspNetCompilationUnit.cs: Not needed;
-	deleted.
-
-2008-10-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Html/DocTypeCompletionData.cs:
-	* MonoDevelop.AspNet.Parser/SimpleCompletionData.cs:
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs: Track
-	  API.
-
-2008-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Moved lots of code
-	  down to the BaseXmlEditorExtension.
-	* AspNetAddIn.mdp, Makefile.am: Updated.
-	* MonoDevelop.AspNet.Parser/AspNetParsedDocument.cs: Renamed. Add
-	  NonSerializable flag.
-
-2008-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs,
-	  MonoDevelop.AspNet.Parser/SimpleCompletionData.cs,
-	  MonoDevelop.AspNet.Parser/Directive.cs: Enable some simple
-	  completion for directive attributes.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Track API.
-	* MonoDevelop.AspNet.addin.xml, MonoDevelop.AspNet.MD1Serialization,
-	  MonoDevelop.AspNet.MD1Serialization/MD1AspNetCustomDataItem.cs,
-	  MonoDevelop.AspNet.MD1Serialization/md1format.xml,
-	  MonoDevelop.AspNet.Deployment/WebDeployService.cs,
-	  MonoDevelop.AspNet.Deployment/WebDeployResolver.cs,
-	  MonoDevelop.AspNet.Deployment/AspNetDeployServiceExtension.cs,
-	  AspNetAddIn.mdp, Makefile.am: Integrate deployment with the
-	  deployment service chnages; makes it much cleaner. Track "arbitrary
-	  build action" API changes; this improves compatibility with VS Web
-	  Apps.
-
-2008-09-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Html/DocTypeCompletionData.cs,
-	  MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs,
-	  MonoDevelop.AspNet.Parser/SimpleCompletionData.cs: Implemented
-	  IComparable <ICompletionData>.
-
-2008-09-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs,
-	  MonoDevelop.AspNet.Parser/AspNetCompilationUnit.cs,
-	  MonoDevelop.AspNet.Parser/AspNetParser.cs,
-	  MonoDevelop.AspNet.Parser/CompilationUnitVisitor.cs,
-	  MonoDevelop.AspNet/AspNetParserService.cs,
-	  MonoDevelop.AspNet/AspNetToolboxNode.cs,
-	  MonoDevelop.AspNet/CodeBehind.cs,
-	  MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Track API.
-
-2008-09-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser/CompilationUnitVisitor.cs: Track API.
-
-2008-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Html/HtmlCompletionDataProvider.cs,
-	  MonoDevelop.Html/DocTypeCompletionDataProvider.cs,
-	  MonoDevelop.AspNet.Parser/SimpleCompletionData.cs: Track api
-	  changes.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.AspNet.Gui.XspOptionsPanelWidget.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs,
-	  gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebTargetEditor.cs: Updated
-	  generated code.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs,
-	  MonoDevelop.AspNet/AspNetToolboxNode.cs,
-	  MonoDevelop.AspNet/WebTypeManager.cs: Track api changes.
-
-2008-09-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Makefile.am, AspNetAddIn.mdp: Updated.
-	* MonoDevelop.AspNet.Parser/SimpleCompletionData.cs: Utility completion
-	  data classes -- in C#3!
-	* MonoDevelop.AspNet.Parser/Directive.cs: Work-in-progress on directive
-	  completion.
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AspNet/CodeBehind.cs,
-	  MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs,
-	  MonoDevelop.AspNet/AspNetParserService.cs,
-	  MonoDevelop.AspNet/AspNetToolboxNode.cs,
-	  MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs,
-	  MonoDevelop.AspNet.Parser/CompilationUnitVisitor.cs,
-	  MonoDevelop.AspNet.Parser/AspNetParser.cs: Changed compilation
-	  unit/document meta information interface.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AspNet/ProjectFolderNodeBuilderExtension.cs: Moved the
-	  extensible tree view to its own directory.
-
-2008-09-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs, AspNetAddIn.mdp: Changes
-	  caused by parser service change.
-
-2008-08-22  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Fix attribute value
-	  completion.
-
-2008-08-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs: Replace C#3
-	  automatic properties into C# 2 properties. Fixes build on Mono <
-	  1.9. Thanks to Joshua Simmons for the patch.
-
-2008-08-12  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser.Internal/AspTokenizer.cs,
-	  MonoDevelop.AspNet.Parser.Internal/Directive.cs,
-	  MonoDevelop.AspNet.Parser.Internal/AspParser.cs,
-	  MonoDevelop.AspNet.Parser.Internal/Location.cs,
-	  MonoDevelop.AspNet.Parser.Internal/ParseException.cs,
-	  MonoDevelop.AspNet.Parser.Dom/ILocation.cs: Update from mcs SVN
-	  HEAD. Fixes "Bug 409109 - The ASP.NET Editor crashes if you leave a
-	  tag opened".
-
-2008-08-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Use Loading property instead
-	  of filename nullness hack.
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Simplify code
-	  generation appraoch for partial classes: if the file.aspx (etc)
-	  file is newer than the corresponding file.aspx.designer.* file,
-	  regenerate the designer class entirely. This means that we no
-	  longer require refactoring support, so the feature now works with
-	  Boo and VB.NET.
-	
-	  
-	
-	  Also remove support for adding members to non-partial CodeBehind
-	  classes. 
-	* MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs,
-	  MonoDevelop.AspNet.Gui/AspNetConfigurationPanelWidget.cs,
-	  gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs,
-	  gtk-gui/gui.stetic: Remove option for autogenerating members in
-	  non-partial CodeBehind classes. Add an option for disabling
-	  Codebehind updating altogether.
-
-2008-08-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Add null check.
-
-2008-08-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetExpressionState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetAttributeValueState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetSpeculativeExpressionState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetServerCommentState.cs:
-	  Implement attribute value expressions.
-	* AspNetAddIn.mdp, Makefile.am: Updated.
-
-2008-07-31  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Show all kinds of
-	  nodes in the path bar, and allow selecting them.
-	* MonoDevelop.AspNet.StateEngine/AspNetDirectiveState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetExpressionState.cs: Fix start
-	  offsets.
-	* MonoDevelop.AspNet.StateEngine/AspNetDom.cs: Add friendly
-	  representations.
-	* MonoDevelop.AspNet.StateEngine/AspNetSpeculativeExpressionState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs: Implement
-	  speculatives states. Works for expressions and server comments
-	  within tags, though not within attributes.
-
-2008-07-31  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/WebTypeManager.cs,
-	  MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Clean up
-	  System.Web lookup code.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Fix the System.Web
-	  fallbacks using new DOM. Respect project's runtime version.
-
-2008-07-31  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Add comment and
-	  CDATA completion. Only trigger tag completion in the free state.
-	* MonoDevelop.AspNet/WebTypeManager.cs: Simplify lookups using new
-	  DOM's methods. They're still broken due to the DOM database
-	  returning bad values.
-
-2008-07-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/WebTypeManager.cs,
-	  MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: More porting to
-	  new DOM.
-	* MonoDevelop.AspNet.StateEngine/AspNetSpeculativeExpressionState.cs: A
-	  "speculative state" to replace the MalformedTagState. Can create a
-	  server comment, or
-	* MonoDevelop.AspNet.StateEngine/AspNetServerCommentState.cs: Tidying
-	  up.
-	* AspNetAddIn.mdp, Makefile.am: Updated.
-
-2008-07-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetExpressionState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetServerCommentState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetDirectiveState.cs: API change
-	  to allow more that one character of rollback.
-
-2008-07-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Filter out
-	  attributes that are already in the tag.
-
-2008-07-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetExpressionState.cs: Complete the
-	  handling of expressions (in free state).
-
-2008-07-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetServerCommentState.cs: Implement
-	  server comments handling (in the free state).
-
-2008-07-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetDirectiveState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetDom.cs: Complete the handling
-	  of directives. Server comments and expressions are still broken.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Continue port to new
-	  DOM. Enable AspNetFreeState parser instead of XML one.
-	* MonoDevelop.AspNet.Parser/AspNetParser.cs: Remove debug code.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs,
-	  MonoDevelop.AspNet/AspNetParserService.cs,
-	  MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Translated old
-	  code to new dom.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AspNet/CodeBehind.cs,
-	  MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs,
-	  MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
-	  Changes for converted refactoring infrastructure.
-
-2008-07-28  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs,
-	  MonoDevelop.AspNet/WebTypeManager.cs,
-	  MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs,
-	  MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Partial port
-	  to new DOM. A *few* features are working again, but it's not nearly
-	  done. Need to be able to get assembly parse contexts to make
-	  progress.
-
-2008-07-28  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Fix document outline
-	  view with new parser infrastructure.
-
-2008-07-28  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs,
-	  MonoDevelop.AspNet/AspNetLanguageBinding.cs,
-	  MonoDevelop.AspNet.addin.xml,
-	  MonoDevelop.AspNet.Parser/AspNetCompilationUnit.cs,
-	  MonoDevelop.AspNet.Parser/CompilationUnitVisitor.cs,
-	  MonoDevelop.AspNet.Parser/AspNetExpressionFinder.cs,
-	  MonoDevelop.AspNet.Parser/AspNetParser.cs,
-	  MonoDevelop.AspNet.Parser/LocatedParserException.cs: Port to new
-	  parser infrastructure so the ASP.NET pages get parsed.
-	* MonoDevelop.AspNet.StateEngine/AspNetExpressionState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetServerCommentState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetDom.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetDirectiveState.cs: More
-	  in-progress work on ASP.NET extensions to the XML parser.
-	* AspNetAddIn.mdp, Makefile.am: Updated.
-
-2008-07-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetExpressionState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetAttributeValueState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetDom.cs: Commit initial work on
-	  ASP.NET parser extensions.
-	* Makefile.am, AspNetAddIn.mdp: Updated.
-
-2008-07-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Put path bar update
-	  on a timeout so that it doesn't make selection too laggy.
-
-2008-07-24  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Improve triggering
-	  of attribute value completion.
-
-2008-07-24  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: For
-	  System.Drawing.Color names colours autocompletion entries, use a
-	  block of the colour as the icon. Don't show system colours.
-
-2008-07-23  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Implemented node
-	  selection with the path bar using the new parser. Much more
-	  reliable, but still breaks on selecting the node the caret's in.
-	* gtk-gui/objects.xml, AspNetAddIn.mdp, Makefile.am: Removed
-	  objects.xml.
-
-2008-07-23  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetSpecialState.cs: Unneeded;
-	  removed.
-	* MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs: Stubbed.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Use the new XML
-	  parser for ASP.NET completion.
-	* gtk-gui/objects.xml, gtk-gui/gui.stetic, AspNetAddIn.mdp,
-	  Makefile.am: Updated.
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Fix tag prefix
-	  auto-generation logic.
-	* MonoDevelop.AspNet.Parser/CompilationUnitVisitor.cs: Don't fold
-	  regions by default.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AspNet.Deployment/WebDeployTarget.cs,
-	  MonoDevelop.AspNet/AspNetAppProject.cs,
-	  MonoDevelop.AspNet/AspNetAppProjectBinding.cs,
-	  MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs,
-	  MonoDevelop.AspNet/AspNetToolboxNode.cs,
-	  MonoDevelop.AspNet/XspParameters.cs: Moved serialization engine to
-	  MonoDevelop.Core. Use new syntax for specifying attribute scope.
-
-2008-07-14  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AspNet.addin.xml: Added javascript mime type (Bug 400896
-	  - Syntax Mode for Javascript).
-
-2008-06-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetSpecialState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs,
-	  MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Rework stack
-	  cloning and character rejection mechanisms in XML/ASP state engine.
-
-2008-06-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs: Track
-	  API.
-
-2008-06-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/CodeBehind.cs: Use case-insensitive checks on
-	  filenames.
-
-2008-06-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Track BindingService
-	  API. Fix possible skipping of Gdk.Threads.Leave().
-	* MonoDevelop.Html/DocTypeCompletionDataProvider.cs,
-	  MonoDevelop.Html/HtmlCompletionDataProvider.cs,
-	  MonoDevelop.Html/HtmlSchemaService.cs: Minor change to doctype
-	  completion data API.
-
-2008-06-13  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Fix a logic error that caused
-	  an exception when creating a new file group with a CodeBehind file
-	  but no designer file.
-	* Templates/WebApplication.xpt.xml: Move event hander to the user code
-	  class, not the designer class. Add protected button member because
-	  some languagee bindings can't auto-add it. Fixes "Bug 400301 -
-	  [Regression] The default VB Asp.Net template fails to compile".
-
-2008-06-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Templates/WebService-CodeBehind.xft.xml,
-	  Templates/WebHandler-CodeBehind.xft.xml,
-	  Templates/WebForm-CodeBehindNonPartial.xft.xml,
-	  Templates/WebForm-CodeBehind.xft.xml,
-	  Templates/WebControl-CodeBehindNonPartial.xft.xml,
-	  Templates/WebControl-CodeBehind.xft.xml,
-	  Templates/MasterPage-CodeBehindNonPartial.xft.xml,
-	  Templates/GlobalAsax-CodeBehind.xft.xml,
-	  Templates/MasterPage-CodeBehind.xft.xml: Set grouping/dependencies
-	  on new files.
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Set grouping dependencies on
-	  added files, and auto-add parents/children.
-
-2008-06-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser/AspNetCompilationUnit.cs: Remove old
-	  CodeBehind grouping mechanism.
-
-2008-06-10  Andres G. Aragoneses <aaragoneses@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Implement feature to allow
-	  unmanaged project references in a managed project (bug#397490).
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AspNet.addin.xml: Bump MD version.
-
-2008-06-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs: Fix path of
-	  compiled output assembly.
-
-2008-05-28  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Fixes for ASP.NET projects
-	  with new project model.
-	* Templates/WebApplication.xpt.xml: Add some "Hello World"-type code to
-	  new ASP.NET C# projects. Fixes "Bug 361348 - C# ASP.Net template
-	  doesn't indicate by default that it's working when run".
-
-2008-05-28  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser/PageInfoVisitor.cs: Actually prevent
-	  register directives overwriting page info with blank info.
-
-2008-05-27  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Fix ASP.NET projects loading
-	  with the new project model. There *may* be problems with build
-	  paths.
-	* MonoDevelop.AspNet.Parser/PageInfoVisitor.cs: Prevent register
-	  directives overwriting page info with blank info.
-
-2008-05-22  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs,
-	  MonoDevelop.AspNet/WebTypeManager.cs, Makefile.am, AspNetAddIn.mdp,
-	  MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs,
-	  MonoDevelop.AspNet.Parser/PageDirectiveVisitor.cs: Implemented
-	  auto-adding of register directives and project references when a
-	  control is added from the toolbox.
-
-2008-05-22  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Html/HtmlSchemaService.cs,
-	  MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Remove threaded
-	  schema loading. Implement an alternative lazy schema loading
-	  system.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AspNet.addin.xml: Merged the extension points for project
-	  and solution option panels into a single extension point. A single
-	  extension point will now be used for all kinds of items. Extension
-	  conditions can be used to make panels visible only for some
-	  specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs,
-	  MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Replaced
-	  ICompilerResult/DefaultCompilerResult/CompilerResults by a new
-	  BuildResult class, which has owner information at error level, so
-	  it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Filter out runtime versions
-	  that aren't 1.1 or 2.0.
-
-2008-05-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetToolboxLoader.cs: Record the supported
-	  runtime versions.
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs: Filter the item from the
-	  text editor toolbox if the supported runtimes don't match the
-	  current project.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: The Deserialize event may not
-	  be called in some file formats, so don't use it to control the
-	  project loading.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProjectBinding.cs,
-	  MonoDevelop.AspNet/AspNetAppProject.cs,
-	  MonoDevelop.AspNet/CodeBehind.cs,
-	  MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs,
-	  MonoDevelop.AspNet/AspNetParserService.cs,
-	  MonoDevelop.AspNet/AspNetToolboxNode.cs,
-	  MonoDevelop.AspNet/WebTypeManager.cs,
-	  MonoDevelop.AspNet/AspNetAppProjectConfiguration.cs,
-	  MonoDevelop.AspNet.addin.xml,
-	  MonoDevelop.AspNet.Deployment/WebDeployService.cs,
-	  MonoDevelop.AspNet.Deployment/WebDeployOptionsPanel.cs,
-	  MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs,
-	  MonoDevelop.AspNet.Gui/AspNetConfigurationPanel.cs,
-	  MonoDevelop.AspNet.Gui/AspNetConfigurationPanelWidget.cs,
-	  MonoDevelop.AspNet.Gui/XspOptionsPanel.cs,
-	  MonoDevelop.AspNet.Gui/XspOptionsPanelWidget.cs,
-	  gtk-gui/gui.stetic, AspNetAddIn.mdp, Makefile.am,
-	  MonoDevelop.AspNet.Parser/WebFormReferenceManager.cs,
-	  MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs,
-	  MonoDevelop.AspNet.Parser/Document.cs: New project model changes.
-
-2008-05-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Makefile.am: Remove conditional build for ASP.NET support; there's no
-	  longer any reason to disable it.
-
-2008-05-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs: Change ITextToolboxNode API
-	  so that nodes have more control over when they're shown.
-
-2008-05-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetToolboxProvider.cs: Moved from AspNetEdit.
-	* MonoDevelop.AspNet/AspNetToolboxLoader.cs: Implement correct loading
-	  of items in System.Web 1.1.
-	* MonoDevelop.AspNet/AspNetToolboxNode.cs: Improve support for default
-	  tag text. Markup for property grid.
-	* MonoDevelop.AspNet.addin.xml: Register provider moved from
-	  AspNetEdit.
-	* Makefile.am, AspNetAddIn.mdp: Updated.
-
-2008-05-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetDisplayBinding.cs: Remove unneeded display
-	  binding.
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Remove bound WebTypeManager
-	  instance.
-	* MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs: Add copyright.
-	* MonoDevelop.AspNet/AspNetToolboxLoader.cs,
-	  MonoDevelop.AspNet/AspNetToolboxNode.cs: Toolbox loader for ASP.NET
-	  toolbox items that makes then available to the text editor too.
-	* MonoDevelop.AspNet/AspNetParserService.cs: A place for parser-access
-	  convenience methods.
-	* MonoDevelop.AspNet/WebTypeManager.cs: Make static. Take project as
-	  argument rather than being bound to it.
-	* MonoDevelop.AspNet.addin.xml: Register new toolbox loader. Update
-	  mimetypes. Remove unneeded display binding.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Prevent some NREs.
-	* AspNetAddIn.mdp, Makefile.am: Updated.
-	* MonoDevelop.AspNet.Parser/Document.cs: If bound project is null, look
-	  it up.
-	* MonoDevelop.AspNet.Parser/CompilationUnitVisitor.cs: Prevent possible
-	  NRE.
-	* MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Add
-	  functionality for looking up and generating prefixes, for text
-	  toolbox nodes.
-
-2008-05-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Fix positions when
-	  selecting nodes.
-
-2008-05-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Use a data func for
-	  the outline treeview. Shorten many overlong lines.
-
-2008-05-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser.Dom/ParentNode.cs: Make parent nodes
-	  enumerable.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Implement document
-	  outline support for ASP.NET documents. Still a couple of issues:
-	  the parser doesn't provide the document at startup, so it won't
-	  show anything until the file is changed. It also may have
-	  performance problems on large files.
-
-2008-05-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs,
-	  MonoDevelop.AspNet/CodeBehind.cs,
-	  MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs,
-	  MonoDevelop.AspNet.Parser/Document.cs,
-	  MonoDevelop.AspNet.Parser/CompilationUnitVisitor.cs,
-	  MonoDevelop.AspNet.Parser/AspNetParser.cs,
-	  MonoDevelop.AspNet.Parser/PageInfoVisitor.cs,
-	  MonoDevelop.AspNet.Parser/PageInfo.cs,
-	  MonoDevelop.AspNet.Parser/AspNetCompilationUnit.cs: Replace
-	  direscrt use of the ASP.NET docuemnt parser with use of the parser
-	  service. Flesh out the parsed compilation units.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Use compilation
-	  units from parser service instead of parsing on every keystroke.
-	* AspNetAddIn.mdp, Makefile.am: Updated
-
-2008-05-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.addin.xml,
-	  MonoDevelop.AspNet/AspNetCodeBehindProvider.cs: Remove use of
-	  removed extension point.
-
-2008-04-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetLanguageBinding.cs,
-	  MonoDevelop.Html/HtmlCompletionDataProvider.cs,
-	  MonoDevelop.AspNet.addin.xml, Makefile.am, AspNetAddIn.mdp,
-	  MonoDevelop.AspNet.Parser/Document.cs,
-	  MonoDevelop.AspNet.Parser/CompilationUnitVisitor.cs,
-	  MonoDevelop.AspNet.Parser/AspNetExpressionFinder.cs,
-	  MonoDevelop.AspNet.Parser/AspNetParser.cs,
-	  MonoDevelop.AspNet.Parser/AspNetCompilationUnit.cs: Add support for
-	  simple folding and error underlining in ASP.NET pages.
-	* MonoDevelop.AspNet.Parser.Dom/RootNode.cs: Add support for simple
-	  folding and error underlining in ASP.NET pages. Fix mimetypes.
-
-2008-04-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Add ability to
-	  select paths (partially working).
-
-2008-04-28  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Implement path bar
-	  support.
-	* AspNetAddIn.mdp, Makefile.am,
-	  MonoDevelop.AspNet.Parser/AspNetIndentStack.cs: Remove old indent
-	  stack.
-
-2008-04-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetSpecialState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs: Change XML state
-	  engine API to allow cloning a single node (as an alternative to the
-	  whole stack).
-
-2008-04-18  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs: Add support for
-	  XML processing instructions.
-
-2008-04-18  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.StateEngine/AspNetSpecialState.cs,
-	  MonoDevelop.AspNet.StateEngine/AspNetFreeState.cs: Minimal states
-	  for ASP.NET parsing. Still need to handle expressions within
-	  attribute values.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Use new state engine
-	  for triggering completion. Haven't exorcised full document parse
-	  yet -- need it for doctype etc. Also need it (but low-priority,
-	  threaded?) for filtering existing attributes. 
-	* Makefile.am, AspNetAddIn.mdp: Updated.
-
-2008-04-14  Michael Hutchinson <mhutchinson@novell.com> 
-
-	
-
-2008-04-14  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/WebTypeManager.cs: Remove debug code.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Greatly improve
-	  completion triggering behaviour. Most noticeable with tag
-	  attributes.
-
-2008-04-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Add server-side
-	  comments to completion list.
-	* MonoDevelop.AspNet.Parser/AspNetIndentStack.cs: Add more states,
-	  document all the states' meaning, and handle closing some states.
-
-2008-04-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Html/HtmlSchema.cs: Avoid unused variable warning.
-	* gtk-gui/gui.stetic: Updated.
-	* MonoDevelop.AspNet.Parser/AspNetIndentStack.cs: Woked on indent
-	  stack. Not complete yet.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AspNet.addin.xml: Use the new mime type extension to
-	  register new file types.
-
-2008-04-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Add completion for
-	  colours, enums and booleans. Walk into base members when attempting
-	  attribute completion.
-
-2008-04-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/CodeBehind.cs: Add method for getting a
-	  non-designer class.
-	* MonoDevelop.AspNet/WebTypeManager.cs,
-	  MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Add various
-	  control lookup methods, including listing of ASP.NET controls.
-	* MonoDevelop.Html/HtmlSchema.cs: Minor cleanup.
-	* MonoDevelop.Html/HtmlSchemaService.cs: Improve lazy loading. Allow
-	  forced preloading in a thread.
-	* MonoDevelop.AspNet.addin.xml: Remove HTML 4 Transitional doctype
-	  extension, as it's a hardcoded default.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Track API. Implement
-	  ASP.NET control and attribute completion. Implement attribute value
-	  completion (and handler stubbing) for events. Improve completion
-	  triggering accuracy. Add documentation for completion items.
-	  Implement close tag completion for parent tags. Lazily load HTML
-	  schemas, and use default schema while they load. Force HTML schema
-	  service to load in background when docuement opened.
-	* AspNetAddIn.mdp, Makefile.am: Updated.
-	* MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
-	  Completion data type that inserts a method into a class if it's
-	  picked.
-	* MonoDevelop.AspNet.Parser/AspNetIndentStack.cs: Partial (still
-	  unused) implementation of indenter stack.
-
-2008-04-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser.Dom/RootNode.cs: Fix build and close
-	  correct tags.
-
-2008-04-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser.Dom/ParentNode.cs,
-	  MonoDevelop.AspNet.Parser.Dom/RootNode.cs: Add a mechanism for
-	  determining/indicating whether a tag has been closed.
-	* MonoDevelop.Html/DocTypeCompletionData.cs: Remove debug message.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Implement closing
-	  tag completion for unclosed tags. Reduce spurious completion
-	  triggering.
-
-2008-04-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Schemas, Schemas/xhtml1-transitional.xsd, Schemas/W3C-License.html,
-	  Schemas/xhtml1-strict.xsd, Schemas/readme.txt,
-	  Schemas/xhtml1-frameset.xsd: Add W3C XHTML 1.0 schemas.
-	* MonoDevelop.Html/DocTypeCompletionData.cs,
-	  MonoDevelop.Html/DocTypeCompletionDataProvider.cs: Implement
-	  completion provider for doctype declarations.
-	* MonoDevelop.Html/HtmlSchema.cs: Change to an association between an
-	  doctype and an IXmlCompletionProvider from the XmlEditor.
-	* MonoDevelop.Html/HtmlSchemaService.cs: Load doctypes and associated
-	  schemas from extension point. Expose default doctypes, and
-	  mechanisms for getting completion providers for any registered
-	  doctype, as well as a completion provider for doctypes themselves.
-	* MonoDevelop.Html/DocTypeExtensionNode.cs,
-	  MonoDevelop.AspNet.addin.xml: Added HTML(/SGML/XML) doctypes as an
-	  extension point.
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Implement HTML code
-	  completion for aspx files.
-	* Makefile.am, AspNetAddIn.mdp: Updated.
-
-2008-03-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Deployment/WebDeployLaunchDialog.cs: Fix namespace
-	  of panel.
-
-2008-03-06  Michael Hutchinson  <mhutchinson@novell.com> 
-
-	* Templates/WebConfig-SubDir.xft.xml:
-	* Templates/WebConfig-Application.xft.xml: Improve descriptions.
-
-2008-03-04  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet/AspNetAppProject.cs: Improve browser launching code.
-	* MonoDevelop.AspNet.Gui/BrowserLauncher.cs: Move browser launcher code and
-	  make it into a re-usable IAsyncOperation.
-	* AspNetAddIn.mdp, Makefile.am: Updated.
-	* MonoDevelop.AspNet.Parser/Regexes.cs: Improve server tag regex.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AspNet.Deployment/WebDeployService.cs,
-	  MonoDevelop.AspNet/XspParameters.cs,
-	  MonoDevelop.AspNet/AspNetAppProject.cs: Worked on gnome hig compliant
-	  alerts.
-
-2008-03-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs: Improve ASP.NET code
-	  completion. Now parser updates on-the-fly and suggestions are
-	  contextual.
-	* gtk-gui/gui.stetic, AspNetAddIn.mdp, Makefile.am: Updated.
-	* MonoDevelop.AspNet.Parser.Dom/ParentNode.cs,
-	  MonoDevelop.AspNet.Parser.Dom/Node.cs: Minor API name change.
-	* MonoDevelop.AspNet.Parser.Dom/RootNode.cs: Catch and collect
-	  parser-reported exceptions rather than blowing up.
-	* MonoDevelop.Html, MonoDevelop.Html/HtmlSchema.cs,
-	  MonoDevelop.Html/HtmlSchemaService.cs: Skeletion of system for
-	  schema-controlled HTML completion.
-	* MonoDevelop.AspNet.Parser/Document.cs,
-	  MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs: Make it easier to
-	  build a parser document directly rather than going through the project.
-	* MonoDevelop.AspNet.Parser/Regexes.cs: Utility class, unused right now.
-	* MonoDevelop.AspNet.Parser/LocatedParserException.cs: Allow flagging error
-	  as a warning.
-
-2008-03-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser.Internal/ParseException.cs: Fix ILocation
-	  capturing.
-	* MonoDevelop.AspNet.Parser.Dom/ParentNode.cs,
-	  MonoDevelop.AspNet.Parser.Dom/Visitor.cs,
-	  MonoDevelop.AspNet.Parser.Dom/TagNode.cs: Implement QuickExit so that
-	  visitor can terminate early.
-	* MonoDevelop.AspNet.Parser.Dom/RootNode.cs: Add some support for implicit
-	  tag closing like in HTML4, making parser more robust with sloppy input.
-	  Implement QuickExit so that visitor can terminate early.
-	* MonoDevelop.AspNet.Parser/LocatedParserException.cs: Fix possible NREs.
-	  Override ToString().
-	* MonoDevelop.AspNet.Parser/PageInfoVisitor.cs: Capture doctype. Use quick
-	  exit when desired information found.
-
-2008-02-27  Michael Hutchinson  <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs, Makefile.am,
-	  AspNetAddIn.mdp, MonoDevelop.AspNet.addin.xml: Add the beginnings of a
-	  code completion system for ASP.NET.
-	* MonoDevelop.AspNet.Parser.Dom/ParentNode.cs,
-	  MonoDevelop.AspNet.Parser.Dom/TagNode.cs,
-	  MonoDevelop.AspNet.Parser.Dom/Node.cs,
-	  MonoDevelop.AspNet.Parser.Dom/RootNode.cs,
-	  MonoDevelop.AspNet.Parser/Document.cs: Improve error resilience. Improve
-	  debug messages. Finish the node search system.
-
-2008-02-27  Michael Hutchinson  <mhutchinson@novell.com> 
-
-	* MonoDevelop.AspNet.Parser/Internal:
-	* MonoDevelop.AspNet.Parser/Tree:
-	* MonoDevelop.AspNet.Parser.Internal:
-	* MonoDevelop.AspNet.Parser.Dom:
-	* AspNetAddIn.mdp:
-	* Makefile.am: Finish restructuring directories to reflect namespaces.
-	
-	* MonoDevelop.AspNet.addin.xml: Clean up whitespace.
-
-2008-02-27  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Deployment, MonoDevelop.AspNet, Gui, Parser,
-	  MonoDevelop.AspNet.Deployment, MonoDevelop.AspNet.Gui, Project,
-	  AspNetAddIn.mdp, Makefile.am, MonoDevelop.AspNet.Parser: Restructure
-	  directories to reflect namespaces.
-
-2008-02-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Deployment/WebDeployService.cs, Deployment/WebDeployCommands.cs,
-	  Deployment/WebDeployLaunchDialog.cs,
-	  Deployment/WebDeployOptionsPanel.cs,
-	  Deployment/WebDeployOptionsPanelWidget.cs,
-	  Gui/AspNetConfigurationPanel.cs, Gui/AspNetConfigurationPanelWidget.cs,
-	  Gui/XspOptionsPanel.cs, Gui/XspOptionsPanelWidget.cs,
-	  Project/AspNetDisplayBinding.cs, Project/AspNetCommands.cs,
-	  Project/ProjectFolderNodeBuilderExtension.cs,
-	  Project/AspNetAppProjectBinding.cs,
-	  Project/AspNetMSBuildProjectExtension.cs, Project/XspParameters.cs,
-	  Project/AspNetAppProject.cs, Project/CodeBehind.cs,
-	  Project/VerifyCodeBehindBuildStep.cs,
-	  Project/AspNetAppProjectConfiguration.cs,
-	  Project/AspNetCodeBehindProvider.cs,
-	  Project/AspNetFileDescriptionTemplate.cs, Project/WebTypeManager.cs,
-	  gtk-gui/MonoDevelop.AspNet.Gui.XspOptionsPanelWidget.cs,
-	  gtk-gui/AspNetAddIn.AspNetConfigurationPanelWidget.cs,
-	  gtk-gui/AspNetAddIn.XspOptionsPanelWidget.cs,
-	  gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs,
-	  gtk-gui/gui.stetic, AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am,
-	  Parser/Tree/ParentNode.cs, Parser/Tree/ServerCommentNode.cs,
-	  Parser/Tree/Visitor.cs, Parser/Tree/ServerIncludeNode.cs,
-	  Parser/Tree/ILocation.cs, Parser/Tree/TagNode.cs,
-	  Parser/Tree/DirectiveNode.cs, Parser/Tree/Node.cs,
-	  Parser/Tree/ExpressionNode.cs, Parser/Tree/RootNode.cs,
-	  Parser/Tree/TextNode.cs, Parser/WebFormReferenceManager.cs,
-	  Parser/DebugStringVisitor.cs, Parser/Document.cs,
-	  Parser/MemberListVisitor.cs, Parser/LocatedParserException.cs,
-	  Parser/Internal/TagType.cs, Parser/Internal/AspTokenizer.cs,
-	  Parser/Internal/Directive.cs, Parser/Internal/AspParser.cs,
-	  Parser/Internal/TagAttributes.cs, Parser/Internal/Location.cs,
-	  Parser/Internal/ParseException.cs, Parser/Internal/StrUtils.cs,
-	  Parser/DocumentReferenceManager.cs, Parser/PageInfoVisitor.cs,
-	  MonoDevelop.AspNet.addin.xml: Finish renaming AspNetAddIn and its
-	  corresponding namespaces to MonoDevelop.Aspnet.
-
-2008-02-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetFileDescriptionTemplate.cs: Fix string formatting call.
-
-2008-02-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* AspNetAddIn.mdp, Makefile.am, Parser/Tree/ParentNode.cs,
-	  Parser/Tree/ServerCommentNode.cs, Parser/Tree/Visitor.cs,
-	  Parser/Tree/TagNode.cs, Parser/Tree/DirectiveNode.cs,
-	  Parser/Tree/Node.cs, Parser/Tree/ExpressionNode.cs,
-	  Parser/Tree/RootNode.cs, Parser/Tree/TextNode.cs,
-	  Parser/DebugStringVisitor.cs, Parser/Document.cs,
-	  Parser/Internal/Location.cs: Implement dumping a debug view of the parse
-	  tree, and binary searching for the parse node at a given location in the
-	  file.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* AspNetAddIn.mdp, Makefile.am: Removed some unused glade and gnome-sharp
-	  references (only the unused). But I'll continue to remove glade, we need
-	  to lower the dependency tree a bit.
-
-2008-02-20  Marek Safar <marek.safar@gmail.com> 
-
-	* Project/VerifyCodeBehindBuildStep.cs: Fixed missing parenthesis.
-
-2008-02-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/IAspNetLanguageBinding.cs,
-	  Project/AspNetFileDescriptionTemplate.cs,
-	  Templates/WebService-CodeBehind.xft.xml,
-	  Templates/WebForm-CodeBehind.xft.xml,
-	  Templates/MasterPage-Empty.xft.xml,
-	  Templates/WebControl-CodeBehindNonPartial.xft.xml,
-	  Templates/WebService-Empty.xft.xml,
-	  Templates/WebHandler-CodeBehind.xft.xml,
-	  Templates/WebForm-Empty.xft.xml,
-	  Templates/WebControl-CodeBehind.xft.xml,
-	  Templates/MasterPage-CodeBehindNonPartial.xft.xml,
-	  Templates/WebConfig-Application.xft.xml,
-	  Templates/WebHandler-Empty.xft.xml, Templates/GlobalAsax-Empty.xft.xml,
-	  Templates/WebControl-Empty.xft.xml,
-	  Templates/MasterPage-CodeBehind.xft.xml,
-	  Templates/WebForm-CodeBehindNonPartial.xft.xml: Add a mechanism for
-	  having the ASP.NET language code be different from MD's internal
-	  language codes, and use it to make VB.NET pages work OOTB.
-	* AspNetAddIn.mdp, Makefile.am: Updated.
-	* Parser/Tree/Visitor.cs, Parser/Tree/ExpressionNode.cs,
-	  Parser/Tree/RootNode.cs: The way the parser's currently used, it doesn't
-	  need to understand expressions, so rather than throwing a
-	  NotImplementedException, just insert them into the AST and carry on.
-	  Means that CodeBehind generation can be used for a much larger subset of
-	  aspx pages.
-
-2008-02-09  Mike Krüger <mkrueger@novell.com> 
-
-	* AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am: Removed source editor
-	  dependency.
-
-2008-02-05  Mike Krüger <mkrueger@novell.com> 
-
-	* AspNetAddIn.addin.xml: Structured main menu.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml: Update MD version.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml: Updated add-in category and description.
-
-2008-01-19  Ankit Jain  <jankit@novell.com>
-
-	* AspNetMSBuildProjectExtension.cs: Track changes in MSBuildProjectExtension.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Templates/WebService-CodeBehind.xft.xml,
-	  Templates/WebForm-CodeBehind.xft.xml,
-	  Templates/MasterPage-Empty.xft.xml,
-	  Templates/WebControl-CodeBehindNonPartial.xft.xml,
-	  Templates/WebConfig-SubDir.xft.xml, Templates/WebService-Empty.xft.xml,
-	  Templates/WebHandler-CodeBehind.xft.xml,
-	  Templates/WebForm-Empty.xft.xml,
-	  Templates/GlobalAsax-CodeBehind.xft.xml,
-	  Templates/WebControl-CodeBehind.xft.xml,
-	  Templates/MasterPage-CodeBehindNonPartial.xft.xml,
-	  Templates/WebConfig-Application.xft.xml,
-	  Templates/WebApplication-Empty.xpt.xml,
-	  Templates/WebHandler-Empty.xft.xml, Templates/GlobalAsax-Empty.xft.xml,
-	  Templates/WebControl-Empty.xft.xml,
-	  Templates/MasterPage-CodeBehind.xft.xml,
-	  Templates/WebForm-CodeBehindNonPartial.xft.xml,
-	  Templates/WebApplication.xpt.xml: Make template categories translatable.
-
-2008-01-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/VerifyCodeBehindBuildStep.cs: Only try to add members to
-	  CodeBehind if the needed refactoring options are supported.
-
-2008-01-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Templates/WebService-CodeBehind.xft.xml,
-	  Templates/WebForm-CodeBehind.xft.xml,
-	  Templates/WebControl-CodeBehindNonPartial.xft.xml,
-	  Templates/WebService-Empty.xft.xml,
-	  Templates/WebHandler-CodeBehind.xft.xml,
-	  Templates/WebControl-CodeBehind.xft.xml,
-	  Templates/MasterPage-CodeBehindNonPartial.xft.xml,
-	  Templates/WebHandler-Empty.xft.xml,
-	  Templates/MasterPage-CodeBehind.xft.xml,
-	  Templates/WebForm-CodeBehindNonPartial.xft.xml: Use ${EscapedIdentifier}
-	  instead of ${Name} so that files can be created with names like
-	  "Default" and work correctly in VB.NET.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.mdp: Updated project files. The order of extended properties
-	  won't change anymore.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/AspNetAppProject.cs: Moved PlatformService to MD.Core.Gui. Removed
-	  old FileIconService class, which is now implemented in PlatformService.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Deployment/WebDeployTargetEditor.cs: Track api changes.
-	* gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs,
-	  gtk-gui/gui.stetic: Updated.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/AspNetAppProject.cs: API cleanup.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/AspNetAddIn.XspOptionsPanelWidget.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs,
-	  gtk-gui/gui.stetic: Fix alignment of some labels.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml: Bump add-in versions.
-
-2007-12-06  Geoff Norton  <gnorton@novell.com>
-
-	* Project/AspNetAppProject.cs: Use PlatformService to launch a browser 
-	  instead of Gnome.Url.Show.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/objects.xml, AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am:
-	  Directory reorganization.
-
-2007-11-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: Don't try to compile if no files are set to
-	  compile, as compilers/bindings (e.g. CSharpBinding) will error out if no
-	  files are set to compile. 
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Deployment/WebDeployService.cs, Project/AspNetAppProject.cs,
-	  Parser/Document.cs: Track LoggingService API changes.
-
-2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/VerifyCodeBehindBuildStep.cs: Use RootCombine instead of
-	  CurrentOpenCombine when possible.
-
-2007-10-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Deployment/WebDeployService.cs, Deployment/WebDeployCommands.cs,
-	  Deployment/WebDeployLaunchDialog.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs,
-	  gtk-gui/gui.stetic: Enable web deploy dialog even if no targets exist,
-	  but add a button for editng/adding targets. Fixes "Bug 337804 - Web
-	  Deployment should be easier to configure".
-
-2007-10-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProjectConfiguration.cs: Fix "Bug 337819 - Directory
-	  change warning shown when creating a new Web Project.". Re-opens "Bug
-	  333419 - Output dir in ASP.NET project don't work", though it's now
-	  possible to work around the latter by setting an XML attribute in the
-	  project file.
-
-2007-10-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml: Use the html file icon for some known asp.net
-	  files.
-
-2007-10-29  Michael Hutchinson <mhutchinson@novell.com>
-
-	* AspNetAddIn.addin.xml: Use WebHandler-CodeBehind template.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml: Bump MD version.
-
-2007-10-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/VerifyCodeBehindBuildStep.cs: Fix string formatting index in a
-	  gettext call.
-
-2007-10-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: No need to handle monitor's cancel request,
-	  as AggregatedOperationMonitor does this for us.
-
-2007-10-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Templates/WebApplication-Empty.xpt.xml, Templates/WebApplication.xpt.xml:
-	  Updated project icons.
-
-2007-10-17  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/WebTypeManager.cs: Don't do web.config control lookups for 1.1
-	  projects.
-	* Parser/WebFormReferenceManager.cs: Track API change.
-	* Parser/MemberListVisitor.cs, Parser/DocumentReferenceManager.cs: Handle
-	  the "type" property of "input" HTML controls.
-
-2007-10-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs, Project/VerifyCodeBehindBuildStep.cs,
-	  Parser/MemberListVisitor.cs, Parser/LocatedParserException.cs,
-	  Parser/Internal/ParseException.cs: Rework error handling to include
-	  location info for document parse errors.
-	* Project/WebTypeManager.cs, Parser/WebFormReferenceManager.cs,
-	  Parser/DocumentReferenceManager.cs: Rework type lookups for registered
-	  controls. Now handles custom controls and user controls, whether
-	  registered in aspx file or web.config.
-	* AspNetAddIn.mdp, Makefile.am: Updated.
-	* Parser/Document.cs: Collect parse errors instead of dying in constructor.
-
-2007-10-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: Copy refs to output path during compile. Not
-	  sure it's necessary, as the Run/Deploy commands do the copy too, and
-	  people shouldn't be running their site without executing one of these
-	  commands first. However, we have had a few bug reports about this
-	  behaviour, so it's better to do what people expect.
-	* Project/VerifyCodeBehindBuildStep.cs: Report ASP.NET parser and Codebehind
-	  member generation errors as compile warnings, with file/line number
-	  info. Use Gettext for i18n of warnings. 
-	* AspNetAddIn.mdp: Updated.
-
-2007-10-12  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProjectConfiguration.cs: Allowing changing the output
-	  directory to a directory other than "bin", but only after warning the
-	  user that this may prevent the projct from running/deploying correctly.
-	  Enables some unusual use cases, and doesn't affect other people.
-
-2007-10-12  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/VerifyCodeBehindBuildStep.cs: Change how partial classes are
-	  handled during code generation to work around the fact that they don't
-	  have all of the information that the 'full' class does.
-
-2007-10-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: Use xsp2 if using 2.0 runtime (regression 
-	  introduced in previous commit).
-
-2007-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: Launch xsp directly rather than via SH. Made
-	  possible by changes to IExecutionHandler/ProcessService allowing setting
-	  environment variables on new console processes. Fixes xsp shutdown (xsp
-	  instances were not closes and were blocking ports). Hopefully fixes
-	  #330327.
-	
-	  Also, don't force copy output refs.
-
-2007-10-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Deployment/WebDeployService.cs: Build before deploying.
-	* Deployment/WebDeployTargetEditor.cs: Catch errors if file copy handler
-	  can't be found.
-
-2007-10-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/VerifyCodeBehindBuildStep.cs: Make errors in Codebehind generation
-	  into warnings rather than preventing build.
-
-2007-09-28  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: Check for xsp before running it.
-
-2007-09-28  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Deployment/WebTargetEditor.cs, Deployment/WebDeployService.cs,
-	  Deployment/WebDeployCommands.cs, Deployment/WebDeployResolver.cs,
-	  Deployment/WebDeployTargetCollection.cs, Deployment/WebDeployTarget.cs,
-	  Deployment/WebDeployWindow.cs, Deployment/WebDeployLaunchDialog.cs,
-	  Deployment/WebDeployOptionsPanel.cs,
-	  Deployment/WebDeployTargetEditor.cs,
-	  Deployment/WebDeployOptionsPanelWidget.cs, AspNetAddIn.addin.xml,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs,
-	  gtk-gui/MonoDevelop.AspNet.Deployment.WebTargetEditor.cs: Add new web
-	  deployment UI and services.
-	* Project/AspNetAppProject.cs: Add WebDeployTargets property. Use new web
-	  targets when returning DeployFiles.  Fix NRE when language binding not
-	  recognised.
-	* gtk-gui/generated.cs, gtk-gui/AspNetAddIn.XspOptionsPanelWidget.cs,
-	  gtk-gui/objects.xml, gtk-gui/gui.stetic, AspNetAddIn.mdp, Makefile.am,
-	  Gui/XspOptionsPanel.cs: Updated.
-
-2007-09-27  Ankit Jain  <jankit@novell.com>
-
-	Add support for VS2005 WebApplication projects.
-	* Project/AspNetMSBuildProjectExtension.cs: New.
-	* AspNetAddIn.addin.xml: Add Extension.
-	* AspNetAddIn.mdp: Update.
-	* Makefile.am: Update.
-
-2007-09-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: Make write-safe by using TextFile API rather
-	  than direct save.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml: Bump MD version.
-
-2007-09-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: Added reference change handlers to update the
-	  referenced assembly list in web.config.
-
-2007-09-12  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/XspOptionsPanelWidget.cs,
-	  gtk-gui/AspNetAddIn.XspOptionsPanelWidget.cs, gtk-gui/gui.stetic: Fix
-	  bugs from stetic conversion: panel status update handler and permissible
-	  port range setting.
-	* Project/AspNetAppProject.cs: Restructure execution code to handle errors
-	  better and make it possible to set MONO_OPTIONS="--debug" when calling
-	  xsp.
-
-2007-09-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/XspOptionsPanel.cs, Gui/XspOptionsPanelWidget.cs, AspNetAddIn.glade,
-	  gtk-gui/generated.cs,
-	  gtk-gui/AspNetAddIn.AspNetConfigurationPanelWidget.cs,
-	  gtk-gui/AspNetAddIn.XspOptionsPanelWidget.cs, gtk-gui/gui.stetic,
-	  AspNetAddIn.mdp, Makefile.am: Migrate XspOptionsPanel from glade to
-	  stetic.
-	* Gui/AspNetConfigurationPanelWidget.cs,
-	  Project/AspNetFileDescriptionTemplate.cs: Remove unused fields.
-
-2007-09-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/ProjectFolderNodeBuilderExtension.cs, Project/AspNetCommands.cs,
-	  AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am: Add a command/menu
-	  for creating ASP.NET special directories.
-	* Project/AspNetAppProject.cs: Add more WebSubtypes. Use GettextCatalog for
-	  MessageService call. Add method for discovering non-existent special
-	  ASP.NET directories.
-	* Project/VerifyCodeBehindBuildStep.cs: Don't prevent compilation if
-	  documents can't be parsed.
-
-2007-09-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: Fire SetDefaultBuildAction only when adding
-	  new files, not when deserialising the project. Add a "Code" WebSubtype.
-	* AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am,
-	  Templates/WebConfig-SubDir.xft.xml,
-	  Templates/WebConfig-Application.xft.xml: Add Web.config templates.
-	* Templates/WebForm-CodeBehind.xft.xml,
-	  Templates/GlobalAsax-CodeBehind.xft.xml,
-	  Templates/WebControl-CodeBehind.xft.xml,
-	  Templates/GlobalAsax-Empty.xft.xml,
-	  Templates/MasterPage-CodeBehind.xft.xml: More tweaks to templates.
-	* Templates/WebApplication.xpt.xml: Add web.config to default project
-	  template.
-
-2007-09-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am: Updated.
-	* Templates/WebService-CodeBehind.xft.xml,
-	  Templates/WebForm-CodeBehind.xft.xml,
-	  Templates/MasterPage-Empty.xft.xml, Templates/WebService-Empty.xft.xml,
-	  Templates/WebForm-Empty.xft.xml,
-	  Templates/WebHandler-CodeBehind.xft.xml,
-	  Templates/WebControl-CodeBehind.xft.xml,
-	  Templates/WebHandler-Empty.xft.xml,
-	  Templates/MasterPage-CodeBehind.xft.xml,
-	  Templates/WebControl-Empty.xft.xml, Templates/WebApplication.xpt.xml:
-	  Remove deprecated FileOptions node.
-	* Templates/WebControl-CodeBehindNonPartial.xft.xml,
-	  Templates/MasterPage-CodeBehindNonPartial.xft.xml,
-	  Templates/WebForm-CodeBehindNonPartial.xft.xml: Add non-partial-type
-	  templates.
-	* Templates/GlobalAsax-CodeBehind.xft.xml,
-	  Templates/GlobalAsax-Empty.xft.xml: Add Global.asax templates.
-	* Templates/WebApplication-Empty.xpt.xml: Add empty project template.
-
-2007-09-06  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Templates/WebService-CodeBehind.xft.xml,
-	  Templates/WebHandler-Empty.xft.xml, Templates/WebService-Empty.xft.xml,
-	  Templates/WebControl-Empty.xft.xml, Templates/WebForm-Empty.xft.xml,
-	  Templates/WebHandler-CodeBehind.xft.xml: Limit to be shown for ASP.NET
-	  projects.
-	* Templates/WebControl-CodeBehind.xft.xml,
-	  Templates/WebForm-CodeBehind.xft.xml: Limit to be shown for ASP.NET
-	  projects. Require partial class support.
-	* Templates/MasterPage-Empty.xft.xml: Limit to be shown for ASP.NET
-	  projects. Require 2.0 runtime.
-	* Templates/MasterPage-CodeBehind.xft.xml: Limit to be shown for ASP.NET
-	  projects. Require 2.0 runtime. Require partial class support.
-
-2007-09-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/AspNetAppProject.cs: Set correct BuildAction for added ASP.NET
-	  files. Convert cachedDocuments to generic collection.
-
-2007-09-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am,
-	  Templates/CodeBehindWebControl.xft.xml,
-	  Templates/CodeBehindWebForm.xft.xml,
-	  Templates/CodeBehindWebHandler.xft.xml,
-	  Templates/CodeBehindWebService.xft.xml,
-	  Templates/EmptyWebControl.xft.xml, Templates/EmptyWebForm.xft.xml,
-	  Templates/EmptyWebHandler.xft.xml, Templates/EmptyWebService.xft.xml,
-	  Templates/MasterPage-CodeBehind.xft.xml,
-	  Templates/MasterPage-Empty.xft.xml,
-	  Templates/MasterPageWithCodeBehind.xft.xml,
-	  Templates/MasterPageWithNoCodeBehind.xft.xml,
-	  Templates/WebControl-CodeBehind.xft.xml,
-	  Templates/WebControl-Empty.xft.xml,
-	  Templates/WebForm-CodeBehind.xft.xml, Templates/WebForm-Empty.xft.xml,
-	  Templates/WebHandler-CodeBehind.xft.xml,
-	  Templates/WebHandler-Empty.xft.xml,
-	  Templates/WebService-CodeBehind.xft.xml,
-	  Templates/WebService-Empty.xft.xml, Templates/WebApplication.xpt.xml:
-	  Rename template files.
-
-2007-09-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Templates/CodeBehindWebControl.xft.xml,
-	  Templates/CodeBehindWebForm.xft.xml,
-	  Templates/MasterPageWithCodeBehind.xft.xml: Use SuppressAutoOpen to stop
-	  designer CodeBehind files from opening automatically when created.
-
-2007-09-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Templates/WebApplication.xpt.xml: Use new FileReferenceTemplate to
-	  reference CodeBehindWebForm instead of duplicating whole template.
-
-2007-09-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/XspParameters.cs: Fix some compile warnings.
-	* Templates/CodeBehindWebHandler.xft.xml, Templates/EmptyWebForm.xft.xml,
-	  Templates/CodeBehindWebControl.xft.xml,
-	  Templates/CodeBehindWebService.xft.xml,
-	  Templates/CodeBehindWebForm.xft.xml,
-	  Templates/MasterPageWithNoCodeBehind.xft.xml,
-	  Templates/MasterPageWithCodeBehind.xft.xml,
-	  Templates/EmptyWebHandler.xft.xml, Templates/WebApplication.xpt.xml,
-	  Templates/EmptyWebControl.xft.xml, Templates/EmptyWebService.xft.xml:
-	  Use partial classes where possible. Default to deploying ASP.NET files
-	  rather than building them. Remove "Hello world" code. Default to 2.0
-	  runtime.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/AspNetConfigurationPanel.cs, Gui/AspNetConfigurationPanelWidget.cs,
-	  Gui/XspOptionsPanel.cs: Changes due to new property infrastructure.
-
-2007-08-31  Ankit Jain  <jankit@novell.com>
-
-	* Templates/WebApplication.xpt.xml: Set BuildAction for aspx file to
-	FileCopy.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am: Reorganized the
-	  extension point hierarchy. Embedded all add-in manifests as resources.
-
-2007-08-01  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* AspNetAppProject.cs: Fix the IDeployable implementation. The target
-	  directory names should be handled by an ASP.NET-specific
-	  IDirectoryResolver, not the GetDeployFiles method.
-
-2007-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.mdp: Updated.
-
-2007-06-19  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* Project/CodeBehind.cs: Oops, remove some development code in which 
-	  caused sharing violations.
-
-2007-06-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/AspNetAddIn.AspNetConfigurationPanelWidget.cs,
-	  AspNetAddIn.mdp: Changed some old 2.4 dependencies to 2.8. Use
-	  GettextCatalog for localizable strings.
-
-2007-06-18  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* Gui/AspNetConfigurationPanel.cs,
-	  Gui/AspNetConfigurationPanelWidget.cs, AspNetAddIn.glade,
-	  gtk-gui/generated.cs,
-	  gtk-gui/AspNetAddIn.AspNetConfigurationPanelWidget.cs,
-	  gtk-gui/objects.xml, gtk-gui/gui.stetic: More Stetic! Convert
-	  configuration panel widget from Glade to Stetic.
-	* Project/CodeBehind.cs: Some shared code for handling CodeBehind.
-	* Project/VerifyCodeBehindBuildStep.cs: Use partial classes if they're
-	  present.
-	* Project/AspNetAppProjectConfiguration.cs: Silence the error when user
-	  picks non-library target type. Rename AutoGenerateCodeBehindMembers
-	  to GenerateNonPartialCodeBehindMembers.
-	* Project/AspNetCodeBehindProvider.cs: Use code from Codebehind class.
-	* AspNetAddIn.mdp, Makefile.am: Added files.
-
-2007-06-08 Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Parser/Document.cs: Report parse errors on console, not in dialogue.
-	
-	* Parser/PageInfoVisitor.cs: Add CodeFile property.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml: Fix typo.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.mdp: Copy the .addins.xml file to the output dir.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.mdp: Don't copy project references.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.mdp, Makefile.am: Reference shared assemblies from the
-	  correct location.
-
-2007-05-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml: Fix add-in dependency.
-
-2007-05-07 Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Project/VerifyCodeBehindBuildStep.cs: Make updating files thread-safe.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml, AspNetAddIn.mdp, Makefile.am: Migration to
-	  Mono.Addins.
-
-2007-04-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/AspNetAppProject.cs: Track api changes.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/AspNetAppProject.cs: Track api changes.
-	* AspNetAddIn.addin.xml, Makefile.am: Added dependency to
-	  MonoDevelop.Deployment.
-	* AspNetAddIn.mdp: Don't copy referenced assemblies.
-
-2007-02-25 Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Project/AspNetAppProject.cs:
-	  Remove DoPreBuild override as it's a deprecated build extension point.
-	  Now set AspNetAppProjectConfiguration.SourceDirectory via a FileName
-	  override, which is more robust.
-	  Implement GetDeployFiles to handle ASP.NET bin folder.
-
-2007-02-21  Ankit Jain  <jankit@novell.com>
-
-	* Project/VerifyCodeBehindBuildStep.cs: Warn the user if
-	AutoGenerateCodeBehindMembers is false.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AspNetAddIn.mdp, Makefile.am: Synchronized the MD project and the
-	  Makefile
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/VerifyCodeBehindBuildStep.cs, AspNetAddIn.addin.xml,
-	  AspNetAddIn.mdp: Replace the IBuildStep implementation by a
-	  ProjectServiceExtension subclass. IBuildStep is not available
-	  anymore.
-
-2007-02-05 Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Templates/MasterPageWithCodeBehind.xft.xml:
-	* Project/AspNetDisplayBinding.cs:
-	* Parser/PageInfoVisitor.cs: Fix errors in last commit that came from
-	  my misunderstanding of how the CodeBehind model doesn't apply to 
-	  MasterPages. The CodeBehindService will need support for the 
-	  CodeBeside model at some point. 
-
-2007-02-04 Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Parser/Tree/DirectiveNode.cs: Workaround for parser bug, so that 
-	  Codebehind for MasterPages can be found.
-
-	* Parser/Internal/*: Update from mcs class tree.
-	
-	* Parser/PageInfoVisitor.cs:
-	* Project/AspNetDisplayBinding.cs: Handle MasterPages.
-
-2007-02-04 John Anderson <sontek@gmail.com>
-
-	* Templates/MasterPageWithNoCodeBehind.xft.xml:
-	* Templates/MasterPageWithCodeBehind.xft.xml:
-	* Makefile.am:
-	* AspNetAddIn.mdp:
-	* AspNetAddIn.addin.xml: Added templates for MasterPages.
-
-2007-02-01  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Project/AspNetAppProject.cs: More informative error messages.
-	
-	* Project/AspNetCodeBehindProvider.cs: Track API changes.
-
-2007-01-18  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Templates/CodeBehindWebControl.xft.xml: Use the proper filename 
-	rather than "Default".
-
-2007-01-18  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* AspNetAddIn/Parser/Internal/TagType.cs:
-	* AspNetAddIn/Parser/Internal/AspParser.cs:
-	* AspNetAddIn/Parser/Internal/ParseException.cs:
-	Make classes and members public so that AspNetAddIn's parser can 
-	consume them. Can revert this when AspNetEdit uses the whole parser
-	rather that just the tokeniser as it does ATM.
-
-2006-09-19 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* AspNetAddIn.mdp: Updated.
-
-2006-09-16  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Gui/AspNetConfigurationPanel.cs:
-	* AspNetAddIn.glade:
-	* Project/AspNetAppProjectConfiguration.cs:
-	* AspNetAddIn.addin.xml:
-	* Project/VerifyCodeBehindBuildStep.cs:
-	  Added a new option that can be used to disable compilation-time 
-	  CodeBehind verification for different configurations.
-
-	* Makefile.am:
-	* AspNetAddIn.mdp: Add Gui/AspNetConfigurationPanel.cs to the build.
-
-2006-09-13  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Project/AspNetAppProject.cs: Fix parsed document caching. Check if file 
-	  can be parsed before parsing, instead of at cache lookup. 
-
-2006-08-21  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Project/AspNetDisplayBinding.cs:
-	* Project/AspNetAppProject.cs:
-	* Parser/PageInfoVisitor.cs: Add support for Global.asax CodeBehind.
-	
-	* Project/AspNetCodeBehindProvider.cs:
-	* Project/AspNetAppProject.cs: Don't try to create Documents for files 
-	  that we can't parse.
-	
-	* Project/AspNetAppProject.cs: Improve web server launch checking code.
-
-2006-08-21  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Project/VerifyCodeBehindBuildStep.cs: Make sure modified files are 
-	  saved before compilation.
-	  Update the parser database to make sure our parse information is 
-	  valid.
-	  
-	* Project/AspNetAppProject.cs: Add an operation cancel handler.
-	
-	* Parser/Document.cs: trap file loading exceptions.
-
-2006-08-05  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Project/VerifyCodeBehindBuildStep.cs:
-	  Track changes in BindingService.
-	* AspNetAddIn.mdp: Remove nonexistent file.
-
-2006-07-25  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* Project/AspNetAppProject.cs:
-	  Become aware of Project.DoPreBuild; let it create the correct output 
-	  directory for us.
-	* Project/VerifyCodeBehindBuildStep.cs:
-	  Refactored some functionality into Monodevelop.DesignerSupport.
-	  BindingService.
-	  
-	
-2006-07-21  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* Project/AspNetAppProject.cs:
-	* Project/VerifyCodeBehindBuildStep.cs:
-	  Move Codebehind verification into a separate build step.
-	
-	* Project/CodeBehindClassBuilder.cs:
-	* Project/AspNetCodeBehindProvider.cs:
-	  Deleted. Functionality moved to MonoDevelop.DesignerSupport.
-	* Project/AspNetAppProject.cs:
-	* AspNetAddIn.addin.xml:
-	* Project/CodeBehindProjectFileExtension.cs:
-	  Implement CodeBehindProvider architecture.
-	
-	* Parser/PageInfoVisitor.cs:
-	  Find CodeBehind info for more filetypes.
-	
-	* Templates/CodeBehindWebHandler.xft.xml:
-	* Templates/CodeBehindWebControl.xft.xml:
-	* Templates/CodeBehindWebForm.xft.xml:
-	* Templates/WebApplication.xpt.xml:
-	  Remove unnecessary underscores in CodeBehind class names.
-	
-	* Templates/CodeBehindWebService.xft.xml:
-	* Templates/EmptyWebService.xft.xml:
-	  New templates.
-	  
-
-	* Project/AspNetDisplayBinding.cs:
-	  New file. For now, makes it possible to open ASP.NET mime types.
-	  
-	* AspNetAddIn.addin.xml:
-	* Makefile.am:
-	* AspNetAddIn.mdp:
-	  Include new files, remove old ones.
-	
-2006-07-04  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* Templates/CodeBehindWebControl.xft.xml:
-	* Templates/CodeBehindWebForm.xft.xml:
-
-	* Project/AspNetAppProject.cs:
-	* Project/CodeBehindProjectFileExtension.cs:
-	Don't always throw exceptions when CodeBehind not found.
-	
-	* AspNetAddIn.addin.xml:
-	* Project/CodeBehindProjectFileExtension.cs:
-	Change "HideCodeBehind" option to "ShowCodeBehindFiles"
-	
-	* Project/AspNetFileDescriptionTemplate.cs:
-	Move translation functionality to child CodeTranslationFileDescriptionTemplate.
-	Move name substitution functionality to SingleFileDescriptionTemplate.
-	
-	* Templates/CodeBehindWebHandler.xft.xml:
-	* Templates/EmptyWebForm.xft.xml:
-	* Templates/CodeBehindWebControl.xft.xml:
-	* Templates/CodeBehindWebForm.xft.xml:
-	* Templates/EmptyWebHandler.xft.xml:
-	* Templates/WebApplication.xpt.xml:
-	* Templates/EmptyWebControl.xft.xml:
-	Track AspNetFileDescriptionTemplate changes.
diff --git a/main/src/addins/AspNet/Commands/AddControllerDialog.cs b/main/src/addins/AspNet/Commands/AddControllerDialog.cs
index 603e60dbf0..7cce727a93 100644
--- a/main/src/addins/AspNet/Commands/AddControllerDialog.cs
+++ b/main/src/addins/AspNet/Commands/AddControllerDialog.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using Gtk;

 using MonoDevelop.Core;

 using MonoDevelop.AspNet.Projects;

+using MonoDevelop.Projects;

 

 namespace MonoDevelop.AspNet.Commands

 {

@@ -57,13 +58,14 @@ namespace MonoDevelop.AspNet.Commands
 			}

 		}

 

-		public AddControllerDialog (AspNetAppProject project)

+		public AddControllerDialog (DotNetProject project)

 		{

 			Build ();

 

+			var ext = project.GetService<AspNetAppProjectFlavor> ();

 			provider = project.LanguageBinding.GetCodeDomProvider ();

 

-			loadedTemplateList = project.GetCodeTemplates ("AddController");

+			loadedTemplateList = ext.GetCodeTemplates ("AddController");

 			bool foundEmptyTemplate = false;

 			int templateIndex = 0;

 			foreach (string file in loadedTemplateList) {

diff --git a/main/src/addins/AspNet/Commands/AddViewDialog.cs b/main/src/addins/AspNet/Commands/AddViewDialog.cs
index c7e2dc7460..4f107b31f5 100644
--- a/main/src/addins/AspNet/Commands/AddViewDialog.cs
+++ b/main/src/addins/AspNet/Commands/AddViewDialog.cs
@@ -27,22 +27,25 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using PP = System.IO.Path;
 
-using MonoDevelop.Ide;
+using Gtk;
+using Microsoft.CodeAnalysis;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.AspNet.Projects;
-using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.AspNet.WebForms;
-using Gtk;
+using MonoDevelop.Projects;
+using MonoDevelop.AspNet.WebForms.Dom;
 
 namespace MonoDevelop.AspNet.Commands
 {
 	class AddViewDialog : Dialog
 	{
-		readonly AspNetAppProject project;

+		readonly DotNetProject project;
+		readonly AspNetAppProjectFlavor aspFlavor;

 		IDictionary<string, IList<string>> loadedTemplateList;

 		IDictionary<string, ListStore> templateStore;

 		ListStore dataClassStore;

@@ -61,9 +64,10 @@ namespace MonoDevelop.AspNet.Commands
 		CheckButton partialCheck, stronglyTypedCheck, masterCheck;
 		Alignment typePanel, masterPanel;
 
-		public AddViewDialog (AspNetAppProject project)
+		public AddViewDialog (DotNetProject project)
 		{
 			this.project = project;
+			aspFlavor = project.GetService<AspNetAppProjectFlavor> ();
 
 			Build ();
 			
@@ -73,14 +77,14 @@ namespace MonoDevelop.AspNet.Commands
 			loadedTemplateList = new Dictionary<string, IList<string>> ();

 			foreach (var engine in viewEngines) {

 				viewEngineCombo.AppendText (engine);

-				loadedTemplateList[engine] = project.GetCodeTemplates ("AddView", engine);

+				loadedTemplateList[engine] = aspFlavor.GetCodeTemplates ("AddView", engine);

 			}

 

 			viewEngineCombo.Active = 0;

 			InitializeTemplateStore (loadedTemplateList);
 
 			ContentPlaceHolders = new List<string> ();
-			string siteMaster = project.VirtualToLocalPath ("~/Views/Shared/Site.master", null);
+			string siteMaster = aspFlavor.VirtualToLocalPath ("~/Views/Shared/Site.master", null);
 			if (project.Files.GetFile (siteMaster) != null)
 				masterEntry.Text = "~/Views/Shared/Site.master";
 			
@@ -221,7 +225,7 @@ namespace MonoDevelop.AspNet.Commands
 		IEnumerable<string> GetProperViewEngines ()

 		{

 			yield return "Aspx";

-			if (project.SupportsRazorViewEngine)

+			if (aspFlavor.SupportsRazorViewEngine)

 				yield return "Razor";

 		}

 

@@ -278,12 +282,13 @@ namespace MonoDevelop.AspNet.Commands
 			Validate ();
 		}
 		
-		protected void UpdateTypePanelSensitivity (object sender, EventArgs e)
+		protected async void UpdateTypePanelSensitivity (object sender, EventArgs e)
 		{

 			bool enabled = typePanel.Sensitive = stronglyTypedCheck.Active;

 

 			if (enabled && classDataProvider == null) {

-				classDataProvider = new TypeDataProvider (project);

+				classDataProvider = new TypeDataProvider ();
+				await classDataProvider.GetTypes (project);

 				dataClassStore = new ListStore (typeof (string));

 				foreach (var item in classDataProvider.TypeNamesList)

 					dataClassStore.AppendValues (item);

@@ -307,7 +312,7 @@ namespace MonoDevelop.AspNet.Commands
 				return false;

 

 			if (!IsPartialView && HasMaster && ActiveViewEngine != "Razor") {

-				if (String.IsNullOrEmpty (MasterFile) || !File.Exists (project.VirtualToLocalPath (oldMaster, null)))

+				if (String.IsNullOrEmpty (MasterFile) || !File.Exists (aspFlavor.VirtualToLocalPath (oldMaster, null)))

 					return false;

 				//PrimaryPlaceHolder can be empty

 				//Layout Page can be empty in Razor Views - it's usually set in _ViewStart.cshtml file

@@ -341,14 +346,14 @@ namespace MonoDevelop.AspNet.Commands
 			};
 			try {
 				if (MessageService.RunCustomDialog (dialog) == (int) ResponseType.Ok)
-					masterEntry.Text = project.LocalToVirtualPath (dialog.SelectedFile.FilePath);
+					masterEntry.Text = aspFlavor.LocalToVirtualPath (dialog.SelectedFile.FilePath);
 			} finally {
 				dialog.Destroy ();
 				dialog.Dispose ();
 			}
 		}
 		
-		protected virtual void MasterChanged (object sender, EventArgs e)
+		protected virtual async void MasterChanged (object sender, EventArgs e)
 		{
 			if (IsPartialView || !HasMaster)
 				return;
@@ -360,11 +365,11 @@ namespace MonoDevelop.AspNet.Commands
 			primaryPlaceholderStore.Clear ();
 			ContentPlaceHolders.Clear ();
 			
-			string realPath = project.VirtualToLocalPath (oldMaster, null);
+			string realPath = aspFlavor.VirtualToLocalPath (oldMaster, null);
 			if (!File.Exists (realPath))
 				return;
 			
-			var pd = TypeSystemService.ParseFile (project, realPath) as WebFormsParsedDocument;
+			var pd = await TypeSystemService.ParseFile (project, realPath) as WebFormsParsedDocument;
 			
 			if (pd != null) {
 				try {
@@ -468,22 +473,18 @@ namespace MonoDevelop.AspNet.Commands
 

 		class TypeDataProvider

 		{

-			public List<ITypeDefinition> TypesList { get; private set; }

-			public List<string> TypeNamesList { get; private set; }

-			Ambience ambience;

-

-			public TypeDataProvider (MonoDevelop.Projects.DotNetProject project)

+			public List<INamedTypeSymbol> TypesList { get; private set; }

+			public List<string> TypeNamesList { get; private set; }
+
+			public async Task GetTypes (MonoDevelop.Projects.DotNetProject project)
 			{

-				TypeNamesList = new List<string> ();

-				var ctx = TypeSystemService.GetCompilation (project);

-				TypesList = new List<ITypeDefinition> (ctx.MainAssembly.GetAllTypeDefinitions ());

-				this.ambience = AmbienceService.GetAmbience (project.LanguageName);

+				TypeNamesList = new List<string> ();
+				var ctx = await TypeSystemService.GetCompilationAsync (project);
+				TypesList = new List<INamedTypeSymbol> (ctx.GetAllTypesInMainAssembly ());

 				foreach (var typeDef in TypesList) {

-					TypeNamesList.Add (ambience.GetString ((IEntity)typeDef, OutputFlags.IncludeGenerics | OutputFlags.UseFullName | OutputFlags.IncludeMarkup));

+					TypeNamesList.Add (Ambience.EscapeText (typeDef.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat)));
 				}

 			}

 		}
 	}
 }
-
-		
diff --git a/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs b/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs
index f24df75a1c..2c437a46ba 100644
--- a/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs
+++ b/main/src/addins/AspNet/Commands/AddViewFromControllerCommandHandler.cs
@@ -28,6 +28,7 @@ using System;
 using MonoDevelop.Components.Commands;

 using MonoDevelop.Ide;

 using MonoDevelop.AspNet.Projects;

+using MonoDevelop.Projects;

 

 namespace MonoDevelop.AspNet.Commands

 {

@@ -41,20 +42,16 @@ namespace MonoDevelop.AspNet.Commands
 		protected override void Run ()

 		{

 			var doc = IdeApp.Workbench.ActiveDocument;

-			var project = (AspNetAppProject)doc.Project;

-			var currentLocation = doc.Editor.Caret.Location;

+			var project = (DotNetProject)doc.Project;

 

-			string controllerName = doc.ParsedDocument.GetTopLevelTypeDefinition (currentLocation).Name;

-			int pos = controllerName.LastIndexOf ("Controller", StringComparison.Ordinal);

-			if (pos > 0)

-				controllerName = controllerName.Remove (pos);

+			var method = MethodDeclarationAtCaret.Create (doc);

+			string controllerName = method.GetParentMvcControllerName ();

+			string path = doc.FileName.ParentDirectory.ParentDirectory.Combine ("Views", controllerName);

 

-			string path = doc.FileName.ParentDirectory.ParentDirectory.Combine ("Views", controllerName);
-			string actionName = doc.ParsedDocument.GetMember (currentLocation).Name;

-			AddView (project, path, actionName);

+			AddView (project, path, method.Name);

 		}

 

-		public static void AddView (AspNetAppProject project, string path, string name)

+		public static void AddView (DotNetProject project, string path, string name)

 		{

 			var provider = project.LanguageBinding.GetCodeDomProvider ();

 			if (provider == null)

@@ -127,7 +124,7 @@ namespace MonoDevelop.AspNet.Commands
 

 			if (System.IO.File.Exists (outputFile)) {

 				project.AddFile (outputFile);

-				IdeApp.ProjectOperations.Save (project);

+				IdeApp.ProjectOperations.SaveAsync (project);

 			}

 		}

 	}

diff --git a/main/src/addins/AspNet/Commands/GoToControllerCommandHandler.cs b/main/src/addins/AspNet/Commands/GoToControllerCommandHandler.cs
index ed2251cb31..2d5c091f3f 100644
--- a/main/src/addins/AspNet/Commands/GoToControllerCommandHandler.cs
+++ b/main/src/addins/AspNet/Commands/GoToControllerCommandHandler.cs
@@ -1,47 +1,53 @@
-//

-// GoToControllerCommandHandler.cs

-//

-// Author:

-//       Piotr Dowgiallo <sparekd@gmail.com>

-// 

-// Copyright (c) 2012 Piotr Dowgiallo

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

+//
+// GoToControllerCommandHandler.cs
+//
+// Author:
+//       Piotr Dowgiallo <sparekd@gmail.com>
+// 
+// Copyright (c) 2012 Piotr Dowgiallo
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System;

 using System.Linq;

-using ICSharpCode.NRefactory.TypeSystem;

+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;

+using MonoDevelop.AspNet.Projects;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

-using MonoDevelop.AspNet.Projects;

-

+using MonoDevelop.Ide.TypeSystem;

+using MonoDevelop.Refactoring;
+
 namespace MonoDevelop.AspNet.Commands

 {

-

 	class GoToControllerCommandHandler : CommandHandler

 	{

 		protected override void Update (CommandInfo info)

 		{

 			var doc = IdeApp.Workbench.ActiveDocument;

-			AspNetAppProject project;

-			if (doc == null || (project = doc.Project as AspNetAppProject) == null || !project.IsAspMvcProject) {

+			if (doc == null || doc.Project == null) {

+				info.Enabled = info.Visible = false;

+				return;

+			}

+			var aspFlavor = doc.Project.GetService<AspNetAppProjectFlavor> ();

+			if (aspFlavor == null || !aspFlavor.IsAspMvcProject) {

 				info.Enabled = info.Visible = false;

 				return;

 			}

@@ -50,17 +56,26 @@ namespace MonoDevelop.AspNet.Commands
 				info.Enabled = info.Visible = false;

 		}

 

-		protected override void Run ()

+		protected override async void Run ()

 		{

 			var doc = IdeApp.Workbench.ActiveDocument;

 			var name = doc.FileName.ParentDirectory.FileName;

-			var controller = doc.ProjectContent.GetAllTypeDefinitions ().FirstOrDefault (t => t.Name == name + "Controller");

+			var controller = await FindController (doc.Project, name);

 

 			if (controller != null)

-				IdeApp.Workbench.OpenDocument (controller.UnresolvedFile.FileName, doc.Project);

+				await RefactoringService.RoslynJumpToDeclaration (controller, doc.Project);

 			else

 				MessageService.ShowError ("Matching controller cannot be found.");

 		}

+

+		async Task<INamedTypeSymbol> FindController (MonoDevelop.Projects.Project project, string name)

+		{

+			var compilation = await TypeSystemService.GetCompilationAsync (project);

+			if (compilation == null)

+				return null;

+

+			return compilation.GetAllTypesInMainAssembly ()

+				.FirstOrDefault (symbol => symbol.Name == name + "Controller");

+		}

 	}

-	

 }

diff --git a/main/src/addins/AspNet/Commands/GoToViewCommandHandler.cs b/main/src/addins/AspNet/Commands/GoToViewCommandHandler.cs
index cbdfed0257..f84173bdca 100644
--- a/main/src/addins/AspNet/Commands/GoToViewCommandHandler.cs
+++ b/main/src/addins/AspNet/Commands/GoToViewCommandHandler.cs
@@ -26,7 +26,6 @@
 

 using System;

 using System.IO;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

@@ -43,17 +42,12 @@ namespace MonoDevelop.AspNet.Commands
 		protected override void Run ()

 		{

 			var doc = IdeApp.Workbench.ActiveDocument;

-			var currentLocation = doc.Editor.Caret.Location;

+			var method = MethodDeclarationAtCaret.Create (doc);

+			string controllerName = method.GetParentMvcControllerName ();

 

-			var controller = doc.ParsedDocument.GetTopLevelTypeDefinition (currentLocation);
-			string controllerName = controller.Name;
-			int pos = controllerName.LastIndexOf ("Controller", StringComparison.Ordinal);

-			if (pos > 0)

-				controllerName = controllerName.Remove (pos);

-
 			var baseDirectory = doc.FileName.ParentDirectory.ParentDirectory;
 

-			string actionName = doc.ParsedDocument.GetMember (currentLocation).Name;

+			string actionName = method.Name;

 			var viewFoldersPaths = new [] {

 				baseDirectory.Combine ("Views", controllerName),
 				baseDirectory.Combine ("Views", "Shared")
diff --git a/main/src/addins/AspNet/Commands/MethodDeclarationAtCaret.cs b/main/src/addins/AspNet/Commands/MethodDeclarationAtCaret.cs
new file mode 100644
index 0000000000..83ba6b4db2
--- /dev/null
+++ b/main/src/addins/AspNet/Commands/MethodDeclarationAtCaret.cs
@@ -0,0 +1,118 @@
+//
+// MethodAtCaret.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using MonoDevelop.Ide.Gui;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.AspNet.Commands
+{
+	class MethodDeclarationAtCaret
+	{
+		MethodDeclarationAtCaret ()
+		{
+		}
+
+		public static readonly MethodDeclarationAtCaret NullMethodDeclaration = new MethodDeclarationAtCaret ();
+
+		public bool IsMethodFound {
+			get {
+				return TypeDeclaration != null && MethodDeclaration != null;
+			}
+		}
+
+		public TypeDeclarationSyntax TypeDeclaration { get; private set; }
+		public MethodDeclarationSyntax MethodDeclaration { get; private set; }
+
+		public string Name {
+			get {
+				if (MethodDeclaration != null)
+					return MethodDeclaration.Identifier.ValueText;
+				return String.Empty;
+			}
+		}
+
+		public static MethodDeclarationAtCaret Create (MonoDevelop.Ide.Gui.Document doc)
+		{
+			var parsedDocument = doc.AnalysisDocument;
+			if (parsedDocument == null)
+				return NullMethodDeclaration;
+
+			SyntaxNode root = null;
+			if (!parsedDocument.TryGetSyntaxRoot (out root))
+				return NullMethodDeclaration;
+
+			SyntaxNode currentNode;
+			try {
+				int caretOffset = doc.Editor.CaretOffset;
+				currentNode = root.FindNode (TextSpan.FromBounds (caretOffset, caretOffset));
+			} catch (Exception) {
+				return NullMethodDeclaration;
+			}
+
+			var currentType = currentNode.AncestorsAndSelf ().OfType<TypeDeclarationSyntax> ().FirstOrDefault ();
+			var currentMethod = currentNode.AncestorsAndSelf ().OfType<MethodDeclarationSyntax> ().FirstOrDefault ();
+
+			return new MethodDeclarationAtCaret {
+				TypeDeclaration = currentType,
+				MethodDeclaration = currentMethod
+			};
+		}
+
+		public bool IsParentMvcController ()
+		{
+			return TypeDeclaration.Identifier.ValueText.EndsWith ("Controller", StringComparison.OrdinalIgnoreCase);
+		}
+
+		public bool IsMvcViewMethod ()
+		{
+			var correctReturnTypes = new [] { "ActionResult", "ViewResultBase", "ViewResult", "PartialViewResult" };
+
+			string returnTypeName = MethodDeclaration.ReturnType.ToString ();
+
+			return MethodDeclaration.Modifiers.Any (t => t.Kind () == SyntaxKind.PublicKeyword) &&
+				correctReturnTypes.Any (t => t == returnTypeName);
+		}
+
+		public string GetParentMvcControllerName ()
+		{
+			if (TypeDeclaration == null)
+				return String.Empty;
+
+			string controllerName = TypeDeclaration.Identifier.ValueText;
+			int pos = controllerName.LastIndexOf ("Controller", StringComparison.Ordinal);
+			if (pos > 0)
+				controllerName = controllerName.Remove (pos);
+
+			return controllerName;
+		}
+	}
+}
+
diff --git a/main/src/addins/AspNet/Commands/MvcCommandsCommonHandler.cs b/main/src/addins/AspNet/Commands/MvcCommandsCommonHandler.cs
index 03fa16fb63..8f8acfc539 100644
--- a/main/src/addins/AspNet/Commands/MvcCommandsCommonHandler.cs
+++ b/main/src/addins/AspNet/Commands/MvcCommandsCommonHandler.cs
@@ -26,7 +26,6 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.Ide;

 using MonoDevelop.AspNet.Projects;

@@ -38,23 +37,21 @@ namespace MonoDevelop.AspNet.Commands
 		public static void Update (CommandInfo info)

 		{

 			var doc = IdeApp.Workbench.ActiveDocument;

-			AspNetAppProject project;

-			if (doc == null || (project = doc.Project as AspNetAppProject) == null || !project.IsAspMvcProject || doc.ParsedDocument == null) {

+			if (doc == null || doc.Project == null || doc.ParsedDocument == null) {

 				info.Enabled = info.Visible = false;

 				return;

 			}

-

-			var currentLocation = doc.Editor.Caret.Location;

-			var topLevelType = doc.ParsedDocument.GetTopLevelTypeDefinition (currentLocation);

-			if (topLevelType == null || !topLevelType.Name.EndsWith ("Controller", StringComparison.Ordinal)) {
+			var aspFlavor = doc.Project.GetService<AspNetAppProjectFlavor> ();

+			if (aspFlavor == null || !aspFlavor.IsAspMvcProject) {

 				info.Enabled = info.Visible = false;

 				return;

 			}

 

-			var correctReturnTypes = new [] { "ActionResult", "ViewResultBase", "ViewResult", "PartialViewResult" };

-			var member = doc.ParsedDocument.GetMember (currentLocation) as IUnresolvedMethod;

-			if (member == null || !member.IsPublic || correctReturnTypes.All (t => t != member.ReturnType.ToString ()))

-				info.Enabled = info.Visible = false;

+			var method = MethodDeclarationAtCaret.Create (doc);

+			if (method.IsMethodFound && method.IsParentMvcController () && method.IsMvcViewMethod ())

+				return;

+

+			info.Enabled = info.Visible = false;

 		}

 	}

 }

diff --git a/main/src/addins/AspNet/Execution/AspNetExecutionHandler.cs b/main/src/addins/AspNet/Execution/AspNetExecutionHandler.cs
index 2e0dcca894..07dd65991f 100644
--- a/main/src/addins/AspNet/Execution/AspNetExecutionHandler.cs
+++ b/main/src/addins/AspNet/Execution/AspNetExecutionHandler.cs
@@ -89,7 +89,7 @@ namespace MonoDevelop.AspNet.Execution
 			return cmd != null && !string.IsNullOrEmpty (GetXspName (cmd));
 		}
 		
-		public IProcessAsyncOperation Execute (ExecutionCommand command, IConsole console)
+		public ProcessAsyncOperation Execute (ExecutionCommand command, OperationConsole console)
 		{
 			var cmd = (AspNetExecutionCommand) command;
 			var xspPath = GetXspPath (cmd);
@@ -102,6 +102,11 @@ namespace MonoDevelop.AspNet.Execution
 					evars.Add (v.Key, v.Value);
 			}
 
+			//HACK: work around Mono trying to create registry in non-writable location
+			if (cmd.TargetRuntime is MonoTargetRuntime && !Platform.IsWindows) {
+				evars ["MONO_REGISTRY_PATH"] = UserProfile.Current.TempDir.Combine ("aspnet-registry");
+			}
+
 			//if it's a script, use a native execution handler
 			if (xspPath.Extension != ".exe") {
 				//set mono debug mode if project's in debug mode
diff --git a/main/src/addins/AspNet/Execution/BrowserLauncher.cs b/main/src/addins/AspNet/Execution/BrowserLauncher.cs
index 6a03216721..628b4cdd00 100644
--- a/main/src/addins/AspNet/Execution/BrowserLauncher.cs
+++ b/main/src/addins/AspNet/Execution/BrowserLauncher.cs
@@ -35,7 +35,7 @@ namespace MonoDevelop.AspNet.Execution
 {	
 	static class BrowserLauncher
 	{
-		public static IProcessAsyncOperation LaunchDefaultBrowser (string url)
+		public static ProcessAsyncOperation LaunchDefaultBrowser (string url)
 		{
 			try {
 				DesktopService.ShowUrl (url);
diff --git a/main/src/addins/AspNet/Execution/XspBrowserLauncherConsole.cs b/main/src/addins/AspNet/Execution/XspBrowserLauncherConsole.cs
index c62fea6de7..c515dcb6eb 100644
--- a/main/src/addins/AspNet/Execution/XspBrowserLauncherConsole.cs
+++ b/main/src/addins/AspNet/Execution/XspBrowserLauncherConsole.cs
@@ -30,35 +30,33 @@ using MonoDevelop.Core.Execution;
 
 namespace MonoDevelop.AspNet.Execution
 {
-	class XspBrowserLauncherConsole : IConsole
+	class XspBrowserLauncherConsole : OperationConsole
 	{
-		readonly IConsole real;
+		readonly OperationConsole real;
 		LineInterceptingTextWriter outWriter;
-		Action <string> launchBrowser;
+		Action <string> launchBrowser;

+		IDisposable cancelReg;
 		
 		const int MAX_WATCHED_LINES = 30;
 		
-		public XspBrowserLauncherConsole (IConsole real, Action <string> launchBrowser)
+		public XspBrowserLauncherConsole (OperationConsole real, Action <string> launchBrowser)
 		{
 			this.real = real;
-			this.launchBrowser = launchBrowser;
+			this.launchBrowser = launchBrowser;

+			cancelReg = real.CancellationToken.Register (CancellationSource.Cancel);
 		}
 		
-		public void Dispose ()
+		public override void Dispose ()
 		{
-			real.Dispose ();
+			cancelReg.Dispose ();

+			real.Dispose ();

 		}
-		
-		public event EventHandler CancelRequested {
-			add { real.CancelRequested += value; }
-			remove { real.CancelRequested -= value; }
-		}
-		
-		public TextReader In {
+
+		public override TextReader In {
 			get { return real.In; }
 		}
 		
-		public TextWriter Out {
+		public override TextWriter Out {
 			get {
 				if (outWriter == null)
 					outWriter = new LineInterceptingTextWriter (real.Out, delegate {
@@ -75,16 +73,12 @@ namespace MonoDevelop.AspNet.Execution
 			}
 		}
 		
-		public TextWriter Error {
+		public override TextWriter Error {
 			get { return real.Error; }
 		}
 		
-		public TextWriter Log {
+		public override TextWriter Log {
 			get { return real.Log; }
 		}
-		
-		public bool CloseOnDispose {
-			get { return real.CloseOnDispose; }
-		}
 	}
 }
diff --git a/main/src/addins/AspNet/Execution/XspOptionsPanel.cs b/main/src/addins/AspNet/Execution/XspOptionsPanel.cs
index 6bd97b965d..5a97bb0c15 100644
--- a/main/src/addins/AspNet/Execution/XspOptionsPanel.cs
+++ b/main/src/addins/AspNet/Execution/XspOptionsPanel.cs
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.AspNet.Projects;
 
@@ -39,14 +39,14 @@ namespace MonoDevelop.AspNet.Execution
 	{
 		XspOptionsPanelWidget panel;
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
-			return panel = new XspOptionsPanelWidget ((AspNetAppProject) ConfiguredProject);
+			return panel = new XspOptionsPanelWidget (ConfiguredProject.GetService<AspNetAppProjectFlavor> ());
 		}
 		
 		public override void ApplyChanges ()
 		{
-			panel.Store ((AspNetAppProject) ConfiguredProject);
+			panel.Store (ConfiguredProject.GetService<AspNetAppProjectFlavor> ());
 		}
 	}
 }
diff --git a/main/src/addins/AspNet/Execution/XspOptionsPanelWidget.cs b/main/src/addins/AspNet/Execution/XspOptionsPanelWidget.cs
index 18126f4836..39ff9e1f25 100644
--- a/main/src/addins/AspNet/Execution/XspOptionsPanelWidget.cs
+++ b/main/src/addins/AspNet/Execution/XspOptionsPanelWidget.cs
@@ -46,7 +46,7 @@ namespace MonoDevelop.AspNet.Execution
 		readonly FileEntry certLocation = new FileEntry ();
 		readonly Entry passwordEntry = new Entry { InvisibleChar = '●' };
 		
-		public XspOptionsPanelWidget (AspNetAppProject project)
+		public XspOptionsPanelWidget (AspNetAppProjectFlavor project)
 		{
 			Build ();
 
@@ -165,7 +165,7 @@ namespace MonoDevelop.AspNet.Execution
 			ShowAll ();
 		}
 		
-		public void Store (AspNetAppProject project)
+		public void Store (AspNetAppProjectFlavor project)
 		{
 			XspParameters xPar = project.XspParameters;
 			
diff --git a/main/src/addins/AspNet/Html/BaseHtmlEditorExtension.cs b/main/src/addins/AspNet/Html/BaseHtmlEditorExtension.cs
index b20a67c689..9050fd647e 100644
--- a/main/src/addins/AspNet/Html/BaseHtmlEditorExtension.cs
+++ b/main/src/addins/AspNet/Html/BaseHtmlEditorExtension.cs
@@ -34,7 +34,9 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.AspNet.Html.Parser;
 using MonoDevelop.Xml.Parser;
-using MonoDevelop.Xml.Dom; 
+using MonoDevelop.Xml.Dom;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MonoDevelop.AspNet.Html
 {
@@ -84,7 +86,7 @@ namespace MonoDevelop.AspNet.Html
 			return new XmlRootState (new HtmlTagState (), new HtmlClosingTagState (true));
 		}
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 			
@@ -94,73 +96,71 @@ namespace MonoDevelop.AspNet.Html
 		
 		#endregion
 		
-		protected override void GetElementCompletions (CompletionDataList list)
+		protected override async Task<CompletionDataList> GetElementCompletions (CancellationToken token)
 		{
+			var list = new CompletionDataList ();
 			XName parentName = GetParentElementName (0);
-			AddHtmlTagCompletionData (list, Schema, parentName);
+			await AddHtmlTagCompletionData (list, Schema, parentName, token);
 			AddMiscBeginTags (list);
 			
 			//FIXME: don't show this after any elements
 			if (DocType == null)
 				list.Add ("!DOCTYPE", "md-literal", GettextCatalog.GetString ("Document type"));
+			return list;
 		}
 		
-		protected override CompletionDataList GetDocTypeCompletions ()
+		protected override Task<CompletionDataList> GetDocTypeCompletions (CancellationToken token)
 		{
-			return new CompletionDataList (from DocTypeCompletionData dat
+			return Task.FromResult (new CompletionDataList (from DocTypeCompletionData dat
 			                               in HtmlSchemaService.DocTypeCompletionData
-			                               select (CompletionData) dat);
+			                                                select (CompletionData) dat));
 		}
 		
-		protected override CompletionDataList GetAttributeCompletions (IAttributedXObject attributedOb,
-			Dictionary<string, string> existingAtts)
+		protected override async Task<CompletionDataList> GetAttributeCompletions (IAttributedXObject attributedOb,
+		                                                                     Dictionary<string, string> existingAtts, CancellationToken token)
 		{
-			if (attributedOb is XElement && !attributedOb.Name.HasPrefix) {
-				var list = new CompletionDataList ();
-				AddHtmlAttributeCompletionData (list, Schema, attributedOb.Name, existingAtts);
-				return list;
-			}
-			return null;
+			var list = new CompletionDataList ();
+			if (attributedOb is XElement && !attributedOb.Name.HasPrefix)
+				await AddHtmlAttributeCompletionData (list, Schema, attributedOb.Name, existingAtts, token);
+			return list;
 		}
 		
-		protected override CompletionDataList GetAttributeValueCompletions (IAttributedXObject ob, XAttribute att)
+		protected override async Task<CompletionDataList> GetAttributeValueCompletions (IAttributedXObject ob, XAttribute att, CancellationToken token)
 		{
-			if (ob is XElement && !ob.Name.HasPrefix) {
-				var list = new CompletionDataList ();
-				AddHtmlAttributeValueCompletionData (list, Schema, ob.Name, att.Name);
-				return list;
-			}
-			return null;
+			var list = new CompletionDataList ();
+			if (ob is XElement && !ob.Name.HasPrefix)
+				await AddHtmlAttributeValueCompletionData (list, Schema, ob.Name, att.Name, token);
+			return list;
 		}
 		
 		#region HTML data
 		
-		protected static void AddHtmlTagCompletionData (CompletionDataList list, HtmlSchema schema, XName parentName)
+		protected static async Task AddHtmlTagCompletionData (CompletionDataList list, HtmlSchema schema, XName parentName, CancellationToken token)
 		{
 			if (schema == null)
 				return;
 			
 			if (parentName.IsValid) {
-				list.AddRange (schema.CompletionProvider.GetChildElementCompletionData (parentName.FullName.ToLower ()));
+				list.AddRange (await schema.CompletionProvider.GetChildElementCompletionData (parentName.FullName.ToLower (), token));
 			} else {
-				list.AddRange (schema.CompletionProvider.GetElementCompletionData ());
+				list.AddRange (await schema.CompletionProvider.GetElementCompletionData (token));
 			}			
 		}
 		
-		protected void AddHtmlAttributeCompletionData (CompletionDataList list, HtmlSchema schema, 
-		    XName tagName, Dictionary<string, string> existingAtts)
+		protected async Task AddHtmlAttributeCompletionData (CompletionDataList list, HtmlSchema schema, 
+		                                                     XName tagName, Dictionary<string, string> existingAtts, CancellationToken token)
 		{
 			//add atts only if they're not aready in the tag
-			foreach (var datum in schema.CompletionProvider.GetAttributeCompletionData (tagName.FullName.ToLower ()))
+			foreach (var datum in await schema.CompletionProvider.GetAttributeCompletionData (tagName.FullName.ToLower (), token))
 				if (existingAtts == null || !existingAtts.ContainsKey (datum.DisplayText))
 					list.Add (datum);
 		}
 		
-		protected void AddHtmlAttributeValueCompletionData (CompletionDataList list, HtmlSchema schema, 
-		    XName tagName, XName attributeName)
+		protected async Task AddHtmlAttributeValueCompletionData (CompletionDataList list, HtmlSchema schema, 
+		                                                          XName tagName, XName attributeName, CancellationToken token)
 		{
-			list.AddRange (schema.CompletionProvider.GetAttributeValueCompletionData (tagName.FullName, 
-			                                                                          attributeName.FullName));
+			list.AddRange (await schema.CompletionProvider.GetAttributeValueCompletionData (tagName.FullName, 
+			                                                                          attributeName.FullName, token));
 		}
 		
 		#endregion
diff --git a/main/src/addins/AspNet/Html/DocTypeCompletionData.cs b/main/src/addins/AspNet/Html/DocTypeCompletionData.cs
index 583293ab43..571f8e0125 100644
--- a/main/src/addins/AspNet/Html/DocTypeCompletionData.cs
+++ b/main/src/addins/AspNet/Html/DocTypeCompletionData.cs
@@ -29,6 +29,7 @@
 using System;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.AspNet.Html
 {
@@ -61,24 +62,21 @@ namespace MonoDevelop.AspNet.Html
 			get { return name; }
 		}
 		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
-			MonoDevelop.Ide.Gui.Content.IEditableTextBuffer buf = window.CompletionWidget as MonoDevelop.Ide.Gui.Content.IEditableTextBuffer;
+			var buf = window.CompletionWidget;
 			if (buf != null) {

-				using (var undo = buf.OpenUndoGroup ()) {
-					int deleteStartOffset = window.CodeCompletionContext.TriggerOffset;
-					if (text.StartsWith (docTypeStart)) {
-						int start = window.CodeCompletionContext.TriggerOffset - docTypeStart.Length;
-						if (start >= 0) {
-							string readback = buf.GetText (start, window.CodeCompletionContext.TriggerOffset);
-							if (string.Compare (readback, docTypeStart, StringComparison.OrdinalIgnoreCase) == 0)
-								deleteStartOffset -= docTypeStart.Length;
-						}
+				int deleteStartOffset = window.CodeCompletionContext.TriggerOffset;
+				if (text.StartsWith (docTypeStart)) {
+					int start = window.CodeCompletionContext.TriggerOffset - docTypeStart.Length;
+					if (start >= 0) {
+						string readback = buf.GetText (start, window.CodeCompletionContext.TriggerOffset);
+						if (string.Compare (readback, docTypeStart, StringComparison.OrdinalIgnoreCase) == 0)
+							deleteStartOffset -= docTypeStart.Length;
 					}
-					

-					buf.DeleteText (deleteStartOffset, buf.CursorPosition - deleteStartOffset);
-					buf.InsertText (buf.CursorPosition, text);
-				}

+				}
+				

+				buf.Replace (deleteStartOffset, buf.CaretOffset - deleteStartOffset, text);
 			}
 		}
 	}
diff --git a/main/src/addins/AspNet/Html/HtmlEditorExtension.cs b/main/src/addins/AspNet/Html/HtmlEditorExtension.cs
index c287c6f7f0..b8913eadcd 100644
--- a/main/src/addins/AspNet/Html/HtmlEditorExtension.cs
+++ b/main/src/addins/AspNet/Html/HtmlEditorExtension.cs
@@ -26,9 +26,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AspNet.Html
 {
@@ -86,11 +86,11 @@ namespace MonoDevelop.AspNet.Html
 			
 			XElement el = n as XElement;
 			if (el != null && el.IsClosed && el.ClosingTag.Region.End > region.End) {
-				region = new DomRegion (region.Begin, el.ClosingTag.Region.End);
+				region = new DocumentRegion (region.Begin, el.ClosingTag.Region.End);
 			}
 			
-			int s = Editor.Document.LocationToOffset (region.BeginLine, region.BeginColumn );
-			int e = Editor.Document.LocationToOffset (region.EndLine, region.EndColumn);
+			int s = Editor.LocationToOffset (region.BeginLine, region.BeginColumn );
+			int e = Editor.LocationToOffset (region.EndLine, region.EndColumn);
 			if (e > s && s > -1)
 				Editor.SetSelection (s, e);
 		}
diff --git a/main/src/addins/AspNet/Html/HtmlParser.cs b/main/src/addins/AspNet/Html/HtmlParser.cs
index 6938328c0c..05f80ff6b3 100644
--- a/main/src/addins/AspNet/Html/HtmlParser.cs
+++ b/main/src/addins/AspNet/Html/HtmlParser.cs
@@ -30,21 +30,20 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-using ICSharpCode.NRefactory.TypeSystem;
-
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Projects;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
 using MonoDevelop.AspNet.Html.Parser;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AspNet.Html
 {
 	public class HtmlParser : TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader tr, Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)
 		{
-			var doc = new MonoDevelop.Xml.Editor.XmlParsedDocument (fileName);
+			var doc = new MonoDevelop.Xml.Editor.XmlParsedDocument (parseOptions.FileName);
 			doc.Flags = ParsedDocumentFlags.NonSerializable;
 			
 			try {
@@ -52,16 +51,16 @@ namespace MonoDevelop.AspNet.Html
 					new XmlRootState (new HtmlTagState (), new HtmlClosingTagState (true)),
 					true);
 				
-				xmlParser.Parse (tr);
+				xmlParser.Parse (parseOptions.Content.CreateReader ());
 				doc.XDocument = xmlParser.Nodes.GetRoot ();
-				doc.Add (xmlParser.Errors);
+				doc.AddRange (xmlParser.Errors);
 				if (doc.XDocument != null)
-					doc.Add (Validate (doc.XDocument));
+					doc.AddRange (Validate (doc.XDocument));
 			}
 			catch (Exception ex) {
 				MonoDevelop.Core.LoggingService.LogError ("Unhandled error parsing HTML document", ex);
 			}
-			return doc;
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)doc);
 		}
 		
 		IEnumerable<Error> Validate (XDocument doc)
diff --git a/main/src/addins/AspNet/Html/HtmlPathCompletion.cs b/main/src/addins/AspNet/Html/HtmlPathCompletion.cs
index bbb3eb29f7..76493955a1 100644
--- a/main/src/addins/AspNet/Html/HtmlPathCompletion.cs
+++ b/main/src/addins/AspNet/Html/HtmlPathCompletion.cs
@@ -30,6 +30,7 @@ using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using System.Text.RegularExpressions;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.AspNet.Html
 {
@@ -116,7 +117,7 @@ namespace MonoDevelop.AspNet.Html
 				get { throw new InvalidOperationException (); }
 			}
 			
-			public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+			public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 			{
 				string text;
 				var dialog = new MonoDevelop.Ide.Projects.ProjectFileSelectorDialog (proj, "", pattern);
diff --git a/main/src/addins/AspNet/Makefile.am b/main/src/addins/AspNet/Makefile.am
index 2dc30cad76..270cff592f 100644
--- a/main/src/addins/AspNet/Makefile.am
+++ b/main/src/addins/AspNet/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/xbuild.include
 EXTRA_DIST += \
 		$(wildcard lib/*) \
-		$(wildcard Templates/MvcCommon/*.cshtml)
+		$(wildcard Templates/MvcCommon/*.cshtml)\
+		$(wildcard Templates/Projects/Files/*.aspx)
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
index d2f9baffe1..ea87d0944f 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -71,16 +71,6 @@
       <Name>MonoDevelop.SourceEditor</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
@@ -120,22 +110,58 @@
       <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Razor">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.Helpers">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Web.WebPages">
+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.Mvc">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Web.Mvc" Condition="!Exists('$(SolutionDir)\..\.git')" />
+    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -163,6 +189,7 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="Mono.Cairo" />
     <Reference Include="Mono.Posix" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Runtime.Serialization" />
@@ -177,6 +204,21 @@
     <EmbeddedResource Include="Templates\images\aspnet-empty-project%402x.png">
       <LogicalName>aspnet-empty-project@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="Templates\images\aspnet-empty-project~dark.png">
+      <LogicalName>aspnet-empty-project~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Templates\images\aspnet-empty-project~dark%402x.png">
+      <LogicalName>aspnet-empty-project~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="gtk-gui\gui.stetic">
+      <LogicalName>gui.stetic</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Templates\images\aspnet-wizard-page.png">
+      <LogicalName>aspnet-wizard-page.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Templates\images\aspnet-wizard-page%402x.png">
+      <LogicalName>aspnet-wizard-page@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Html\HtmlSchemaService.cs" />
@@ -195,10 +237,7 @@
     <Compile Include="Razor\EditorParserFixed\RazorEditorParser.cs" />
     <Compile Include="Razor\EditorParserFixed\RazorEditorTrace.cs" />
     <Compile Include="Razor\EditorParserFixed\RazorResources.Designer.cs" />
-    <Compile Include="Projects\AspMvcProject.cs" />
     <Compile Include="Projects\AspMvcProjectConfiguration.cs" />
-    <Compile Include="Projects\AspNetAppProject.cs" />
-    <Compile Include="Projects\AspNetAppProjectBinding.cs" />
     <Compile Include="Projects\AspNetAppProjectConfiguration.cs" />
     <Compile Include="Projects\AspNetMSBuildImportProvider.cs" />
     <Compile Include="WebForms\MasterContentFileDescriptionTemplate.cs" />
@@ -300,10 +339,19 @@
     <Compile Include="Razor\RazorCSharpParsedDocument.cs" />
     <Compile Include="Razor\RazorPageInfo.cs" />
     <Compile Include="WebForms\WebFormsTypeContext.cs" />
+    <Compile Include="Projects\AspMvcProjectFlavor.cs" />
+    <Compile Include="Projects\AspNetAppProjectFlavor.cs" />
+    <Compile Include="WebForms\CSharp\CSharpProjector.cs" />
     <Compile Include="Projects\AspNetProjectTemplateWizard.cs" />
-    <Compile Include="Projects\AspNetProjectTemplateWizardPageWidget.cs" />
     <Compile Include="Projects\AspNetProjectTemplateWizardPage.cs" />
     <Compile Include="Projects\AspNetStringTagProvider.cs" />
+    <Compile Include="Commands\MethodDeclarationAtCaret.cs" />
+    <Compile Include="Razor\Dom\RazorWorkbenchService.cs" />
+    <Compile Include="Razor\RazorCSharpParserContext.cs" />
+    <Compile Include="Razor\OpenRazorDocument.cs" />
+    <Compile Include="gtk-gui\generated.cs" />
+    <Compile Include="Projects\GtkAspNetProjectTemplateWizardPageWidget.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.AspNet.Projects.GtkAspNetProjectTemplateWizardPageWidget.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
@@ -326,9 +374,6 @@
     <None Include="Templates\Mvc\Controller.xft.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\Mvc\GlobalAsax.xft.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Templates\Mvc\LayoutPage.xft.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -350,9 +395,6 @@
     <None Include="Templates\Mvc\ViewPageRazor.xft.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\Mvc\WebConfigApp.xft.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Templates\Mvc\WebConfigViews.xft.xml">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -363,12 +405,6 @@
     <None Include="Templates\WebConfig-SubDir.xft.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\WebForms\GlobalAsax-Empty.xft.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Templates\WebForms\GlobalAsax-CodeBehind.xft.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Templates\WebForms\MasterPage-CodeBehind.xft.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -435,58 +471,69 @@
     <None Include="Templates\MvcCommon\ViewPageRazor.cshtml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\Projects\MvcProjectWithUnitTest.xpt.xml">
+    <None Include="..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll">
+      <Link>System.Web.Mvc.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\Projects\MvcProject.xpt.xml">
+    <None Include="..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll">
+      <Link>System.Web.Razor.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\Projects\EmptyProject.xpt.xml">
+    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll">
+      <Link>System.Web.Helpers.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\Projects\EmptyMvcProject.xpt.xml">
+    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll">
+      <Link>System.Web.WebPages.Deployment.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\Projects\MvcRazorProject.xpt.xml">
-      <SubType>Designer</SubType>
+    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll">
+      <Link>System.Web.WebPages.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\Projects\MvcRazorProjectWithUnitTest.xpt.xml">
+    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll">
+      <Link>System.Web.WebPages.Razor.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll">
+      <Link>Microsoft.Web.Infrastructure.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Templates\Projects\MvcProject.xpt.xml">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Templates\Projects\WebApplication.xpt.xml">
+    <None Include="Templates\Projects\EmptyProject.xpt.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll">
-      <Link>System.Web.Mvc.dll</Link>
+    <None Include="Templates\Projects\WebFormsProject.xpt.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll">
-      <Link>System.Web.Razor.dll</Link>
+    <None Include="Templates\Projects\Files\Default.aspx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll">
-      <Link>System.Web.Helpers.dll</Link>
+    <None Include="Templates\Projects\Files\Default.aspx.designer.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll">
-      <Link>System.Web.WebPages.Deployment.dll</Link>
+    <None Include="Templates\Projects\Files\Default.aspx.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll">
-      <Link>System.Web.WebPages.dll</Link>
+    <None Include="Templates\GlobalAsax.xft.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll">
-      <Link>System.Web.WebPages.Razor.dll</Link>
+    <None Include="Templates\Global.tt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll">
-      <Link>Microsoft.Web.Infrastructure.dll</Link>
+    <None Include="Templates\RouteConfig.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Templates\WebApiConfig.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Templates\Projects\Files\Test.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Html\Schemas\readme.txt">
@@ -529,7 +576,9 @@
     <Folder Include="Commands\" />
     <Folder Include="ProjectPad\" />
     <Folder Include="Templates\Projects\" />
+    <Folder Include="Templates\Projects\Files\" />
     <Folder Include="Templates\images\" />
+    <Folder Include="WebForms\CSharp\" />
   </ItemGroup>
   <Target Name="BeforeBuild">
     <PropertyGroup>
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/ASPNetCodeTranslator.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/ASPNetCodeTranslator.cs
new file mode 100644
index 0000000000..2cac45c952
--- /dev/null
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/ASPNetCodeTranslator.cs
@@ -0,0 +1,44 @@
+//
+// ASPNetCodeTranslator.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.AspNet.Gui
+{
+	class ASPNetCodeTranslator : CodeTranslator
+	{
+		public override bool CanTranslate (string fromMimeType, string toMimeType)
+		{
+			return false;
+		}
+
+		public override CodeMapping GetMapping (string fromMimeType, string toMimeType, SourceText textSource)
+		{
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/AspNet/ProjectPad/AspNetFolderNodeCommandHandler.cs b/main/src/addins/AspNet/ProjectPad/AspNetFolderNodeCommandHandler.cs
index 1a79ed3373..bcbab2276b 100644
--- a/main/src/addins/AspNet/ProjectPad/AspNetFolderNodeCommandHandler.cs
+++ b/main/src/addins/AspNet/ProjectPad/AspNetFolderNodeCommandHandler.cs
@@ -31,7 +31,8 @@ using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide.Gui.Pads.ProjectPad;
 using MonoDevelop.Ide;
 using MonoDevelop.AspNet.Projects;

-using MonoDevelop.AspNet.Commands;
+using MonoDevelop.AspNet.Commands;

+using MonoDevelop.Projects;
 
 namespace MonoDevelop.AspNet.ProjectPad
 {
@@ -40,8 +41,9 @@ namespace MonoDevelop.AspNet.ProjectPad
 		[CommandUpdateHandler (AspNetCommands.AddController)]
 		public void AddControllerUpdate (CommandInfo info)
 		{
-			var project = CurrentNode.GetParentDataItem (typeof (AspNetAppProject), true) as AspNetAppProject;
-			if (project == null || !project.IsAspMvcProject) {
+			var project = CurrentNode.GetParentDataItem (typeof (DotNetProject), true) as DotNetProject;

+			var aspFlavor = project != null ? project.GetService<AspNetAppProjectFlavor> () : null;
+			if (aspFlavor == null || !aspFlavor.IsAspMvcProject) {
 				info.Enabled = info.Visible = false;
 				return;
 			}
@@ -54,7 +56,7 @@ namespace MonoDevelop.AspNet.ProjectPad
 		[CommandHandler (AspNetCommands.AddController)]
 		public void AddController ()
 		{
-			var project = (AspNetAppProject) CurrentNode.GetParentDataItem (typeof (AspNetAppProject), true);
+			var project = (DotNetProject) CurrentNode.GetParentDataItem (typeof (DotNetProject), true);
 

 			object currentItem = CurrentNode.DataItem;

 

@@ -68,7 +70,7 @@ namespace MonoDevelop.AspNet.ProjectPad
 				nav.Expanded = true;
 		}
 
-		public static void AddController (AspNetAppProject project, string path, string name)
+		public static void AddController (DotNetProject project, string path, string name)
 		{

 			var provider = project.LanguageBinding.GetCodeDomProvider ();

 			if (provider == null)

@@ -121,15 +123,15 @@ namespace MonoDevelop.AspNet.ProjectPad
 

 			if (System.IO.File.Exists (outputFile)) {

 				project.AddFile (outputFile);

-				IdeApp.ProjectOperations.Save (project);

+				IdeApp.ProjectOperations.SaveAsync (project);

 			}
 		}
 		
 		[CommandUpdateHandler (AspNetCommands.AddView)]
 		public void AddViewUpdate (CommandInfo info)
 		{
-			var project = CurrentNode.GetParentDataItem (typeof (AspNetAppProject), true) as AspNetAppProject;
-			if (project == null || !project.IsAspMvcProject) {
+			var project = CurrentNode.GetParentDataItem<DotNetProject> (true);
+			if (project == null || !project.HasFlavor<AspNetAppProjectFlavor>() || !project.GetFlavor<AspNetAppProjectFlavor>().IsAspMvcProject) {
 				info.Enabled = info.Visible = false;
 				return;
 			}
@@ -142,7 +144,7 @@ namespace MonoDevelop.AspNet.ProjectPad
 		[CommandHandler (AspNetCommands.AddView)]
 		public void AddView ()
 		{
-			var project = (AspNetAppProject) CurrentNode.GetParentDataItem (typeof (AspNetAppProject), true);
+			var project = CurrentNode.GetParentDataItem<DotNetProject> (true);
 
 			object currentItem = CurrentNode.DataItem;
 				
diff --git a/main/src/addins/AspNet/ProjectPad/AspNetProjectNodeBuilderExtension.cs b/main/src/addins/AspNet/ProjectPad/AspNetProjectNodeBuilderExtension.cs
index da125b8376..572f5e864b 100644
--- a/main/src/addins/AspNet/ProjectPad/AspNetProjectNodeBuilderExtension.cs
+++ b/main/src/addins/AspNet/ProjectPad/AspNetProjectNodeBuilderExtension.cs
@@ -29,6 +29,7 @@ using System;
 
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.AspNet.Projects;
+using MonoDevelop.Projects;
 
 namespace MonoDevelop.AspNet.ProjectPad
 {
@@ -36,7 +37,7 @@ namespace MonoDevelop.AspNet.ProjectPad
 	{
 		public override bool CanBuildNode (Type dataType)
 		{
-			return typeof(AspNetAppProject).IsAssignableFrom (dataType);
+			return typeof(DotNetProject).IsAssignableFrom (dataType);
 		}
 		
 		public override Type CommandHandlerType {
diff --git a/main/src/addins/AspNet/ProjectPad/AspNetProjectNodeCommandHandler.cs b/main/src/addins/AspNet/ProjectPad/AspNetProjectNodeCommandHandler.cs
index 3bf027f7c8..df18ea1e35 100644
--- a/main/src/addins/AspNet/ProjectPad/AspNetProjectNodeCommandHandler.cs
+++ b/main/src/addins/AspNet/ProjectPad/AspNetProjectNodeCommandHandler.cs
@@ -42,21 +42,25 @@ namespace MonoDevelop.AspNet.ProjectPad
 		[CommandHandler (AspNetCommands.AddAspNetDirectory)]
 		public void OnAddSpecialDirectory (object ob)
 		{
-			AspNetAppProject proj = CurrentNode.DataItem as AspNetAppProject;
+			var proj = CurrentNode.DataItem as DotNetProject;
 			if (proj == null)
 				return;
 			proj.AddDirectory ((string) ob);
-			IdeApp.ProjectOperations.Save (proj);
+			IdeApp.ProjectOperations.SaveAsync (proj);
 		}
 		
 		[CommandUpdateHandler (AspNetCommands.AddAspNetDirectory)]
 		public void OnAddSpecialDirectoryUpdate (CommandArrayInfo info)
 		{
-			AspNetAppProject proj = CurrentNode.DataItem as AspNetAppProject;
-			if (proj == null)
-				return;
-			
-			List<string> dirs = new List<string> (proj.GetSpecialDirectories ());
+			var proj = CurrentNode.DataItem as DotNetProject;
+			if (proj == null)

+				return;

+

+			var asp = proj.GetFlavor<AspNetAppProjectFlavor> ();

+			if (asp == null)

+				return;

+
+			List<string> dirs = new List<string> (asp.GetSpecialDirectories ());
 			dirs.Sort ();

 			List<FilePath> fullPaths = new List<FilePath> (dirs.Count);
 			foreach (string s in dirs)
diff --git a/main/src/addins/AspNet/Projects/AspMvcProject.cs b/main/src/addins/AspNet/Projects/AspMvcProject.cs
deleted file mode 100644
index 8161c25ee2..0000000000
--- a/main/src/addins/AspNet/Projects/AspMvcProject.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// 
-// AspMvcProject.cs
-//  
-// Author:
-//       Michael Hutchinson <mhutchinson@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc. (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Xml;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.AspNet.Projects
-{
-	abstract class AspMvcProject : AspNetAppProject
-	{
-		protected AspMvcProject ()
-		{
-		}
-		
-		protected AspMvcProject (string languageName)
-			: base (languageName)
-		{
-		}
-		
-		protected AspMvcProject (string languageName, ProjectCreateInformation info, XmlElement projectOptions)
-			: base (languageName, info, projectOptions)
-		{
-		}	
-		
-		public override SolutionItemConfiguration CreateConfiguration (string name)
-		{
-			var conf = new AspMvcProjectConfiguration (name);
-			conf.CopyFrom (base.CreateConfiguration (name));			
-			return conf;
-		}
-
-		public override IEnumerable<string> GetProjectTypes ()
-		{
-			yield return "AspNetMvc";
-			foreach (var t in base.GetProjectTypes ())
-				yield return t;
-		}
-
-		public override bool SupportsFramework (MonoDevelop.Core.Assemblies.TargetFramework framework)
-		{
-			return framework.CanReferenceAssembliesTargetingFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_3_5);
-		}
-
-		public override bool IsAspMvcProject {
-			get {
-				return true;
-			}
-		}
-	}

-

-	class AspMvc1Project : AspMvcProject

-	{

-		public AspMvc1Project ()

-		{

-		}

-

-		public AspMvc1Project (string languageName)

-			: base (languageName)

-		{

-		}

-

-		public AspMvc1Project (string languageName, ProjectCreateInformation info, XmlElement projectOptions)

-			: base (languageName, info, projectOptions)

-		{

-		}
-
-		protected override string GetDefaultAspNetMvcVersion ()
-		{
-			return "1.0.0.0";
-		}

-	}

-

-	class AspMvc2Project : AspMvcProject

-	{

-		public AspMvc2Project ()

-		{

-		}

-

-		public AspMvc2Project (string languageName)

-			: base (languageName)

-		{

-		}

-

-		public AspMvc2Project (string languageName, ProjectCreateInformation info, XmlElement projectOptions)

-			: base (languageName, info, projectOptions)

-		{

-		}
-
-		protected override string GetDefaultAspNetMvcVersion ()
-		{
-			return "2.0.0.0";
-		}

-	}

-

-	class AspMvc3Project : AspMvcProject

-	{

-		public AspMvc3Project ()

-		{

-		}

-

-		public AspMvc3Project (string languageName)

-			: base (languageName)

-		{

-		}

-

-		public AspMvc3Project (string languageName, ProjectCreateInformation info, XmlElement projectOptions)

-			: base (languageName, info, projectOptions)

-		{

-		}

-

-		public override bool SupportsFramework (MonoDevelop.Core.Assemblies.TargetFramework framework)

-		{

-			return framework.CanReferenceAssembliesTargetingFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_0);

-		}
-
-		protected override string GetDefaultAspNetMvcVersion ()
-		{
-			return "3.0.0.0";
-		}

-	}
-
-	class AspMvc4Project : AspMvcProject
-	{
-		public AspMvc4Project ()
-		{
-		}
-		
-		public AspMvc4Project (string languageName)
-			: base (languageName)
-		{
-		}
-		
-		public AspMvc4Project (string languageName, ProjectCreateInformation info, XmlElement projectOptions)
-			: base (languageName, info, projectOptions)
-		{
-		}
-		
-		public override bool SupportsFramework (MonoDevelop.Core.Assemblies.TargetFramework framework)
-		{
-			return framework.CanReferenceAssembliesTargetingFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_0);
-		}
-
-		protected override string GetDefaultAspNetMvcVersion ()
-		{
-			return "4.0.0.0";
-		}
-	}
-}
diff --git a/main/src/addins/AspNet/Projects/AspMvcProjectConfiguration.cs b/main/src/addins/AspNet/Projects/AspMvcProjectConfiguration.cs
index 743a6109fc..0043076fd7 100644
--- a/main/src/addins/AspNet/Projects/AspMvcProjectConfiguration.cs
+++ b/main/src/addins/AspNet/Projects/AspMvcProjectConfiguration.cs
@@ -36,9 +36,5 @@ namespace MonoDevelop.AspNet.Projects
 		public AspMvcProjectConfiguration (string name) : base (name)
 		{
 		}
-		
-		public AspMvcProjectConfiguration () : base ()
-		{
-		}
 	}
 }
diff --git a/main/src/addins/AspNet/Projects/AspMvcProjectFlavor.cs b/main/src/addins/AspNet/Projects/AspMvcProjectFlavor.cs
new file mode 100644
index 0000000000..fef6694739
--- /dev/null
+++ b/main/src/addins/AspNet/Projects/AspMvcProjectFlavor.cs
@@ -0,0 +1,96 @@
+// 
+// AspMvcProject.cs
+//  
+// Author:
+//       Michael Hutchinson <mhutchinson@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc. (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Xml;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.AspNet.Projects
+{
+	abstract class AspMvcProjectFlavor : AspNetAppProjectFlavor
+	{
+		protected override SolutionItemConfiguration OnCreateConfiguration (string name, ConfigurationKind kind)
+		{
+			var conf = new AspMvcProjectConfiguration (name);
+			conf.CopyFrom (base.OnCreateConfiguration (name, kind));
+			return conf;
+		}
+
+		protected override bool OnGetSupportsFramework (MonoDevelop.Core.Assemblies.TargetFramework framework)
+		{
+			return framework.CanReferenceAssembliesTargetingFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_3_5);
+		}
+
+		public override bool IsAspMvcProject {
+			get {
+				return true;
+			}
+		}
+	}

+

+	class AspMvc1ProjectFlavor : AspMvcProjectFlavor

+	{

+		protected override string GetDefaultAspNetMvcVersion ()
+		{
+			return "1.0.0.0";
+		}

+	}

+

+	class AspMvc2ProjectFlavor : AspMvcProjectFlavor

+	{

+		protected override string GetDefaultAspNetMvcVersion ()
+		{
+			return "2.0.0.0";
+		}

+	}

+

+	class AspMvc3ProjectFlavor : AspMvcProjectFlavor

+	{

+		protected override bool OnGetSupportsFramework (MonoDevelop.Core.Assemblies.TargetFramework framework)

+		{

+			return framework.CanReferenceAssembliesTargetingFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_0);

+		}
+
+		protected override string GetDefaultAspNetMvcVersion ()
+		{
+			return "3.0.0.0";
+		}

+	}
+
+	class AspMvc4ProjectFlavor : AspMvcProjectFlavor
+	{
+		protected override bool OnGetSupportsFramework (MonoDevelop.Core.Assemblies.TargetFramework framework)
+		{
+			return framework.CanReferenceAssembliesTargetingFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_0);
+		}
+
+		protected override string GetDefaultAspNetMvcVersion ()
+		{
+			return "4.0.0.0";
+		}
+	}
+}
diff --git a/main/src/addins/AspNet/Projects/AspNetAppProject.cs b/main/src/addins/AspNet/Projects/AspNetAppProject.cs
deleted file mode 100644
index 87a77861cc..0000000000
--- a/main/src/addins/AspNet/Projects/AspNetAppProject.cs
+++ /dev/null
@@ -1,754 +0,0 @@
-//
-// AspNetAppProject.cs: ASP.NET "Web Application" project type
-//
-// Authors:
-//   Michael Hutchinson <m.j.hutchinson@gmail.com>
-//
-// Copyright (C) 2006 Michael Hutchinson
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Xml;
-
-using ICSharpCode.NRefactory.TypeSystem;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Assemblies;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Core.ProgressMonitoring;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Ide.Desktop;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Projects;
-using MonoDevelop.AspNet.Execution;
-using MonoDevelop.AspNet.WebForms;
-
-namespace MonoDevelop.AspNet.Projects
-{
-	[DataInclude (typeof(AspNetAppProjectConfiguration))]
-	public class AspNetAppProject : DotNetAssemblyProject
-	{
-		[ItemProperty("XspParameters", IsExternal=true)]
-		XspParameters xspParameters = new XspParameters ();
-
-		WebFormsRegistrationCache registrationCache;
-		WebFormsCodeBehindTypeNameCache codebehindTypeNameCache;
-		
-		#region properties
-
-		public override IEnumerable<string> GetProjectTypes ()
-		{
-			yield return "AspNetApp";
-			foreach (var t in base.GetProjectTypes ())
-				yield return t;
-		}
-
-		public override bool IsLibraryBasedProjectType {
-			get { return true; }
-		}
-		
-		public XspParameters XspParameters {
-			get { return xspParameters; }
-		}
-		
-		internal WebFormsRegistrationCache RegistrationCache {
-			get {
-				if (registrationCache == null)
-					registrationCache = new WebFormsRegistrationCache (this);
-				return registrationCache;
-			}
-		}
-		
-		#endregion
-		
-		#region constructors
-		
-		public AspNetAppProject ()
-		{
-			Init ();
-		}
-		
-		public AspNetAppProject (string languageName)
-			: base (languageName)
-		{
-			Init ();
-		}
-		
-		public AspNetAppProject (string languageName, ProjectCreateInformation info, XmlElement projectOptions)
-			: base (languageName, info, projectOptions)
-		{
-			Init ();
-			
-			var binPath = info == null? (FilePath)"bin" : info.BinPath;
-			foreach (var cfg in Configurations.Cast<AspNetAppProjectConfiguration> ())
-				cfg.OutputDirectory = binPath;
-		}	
-		
-		public override SolutionItemConfiguration CreateConfiguration (string name)
-		{
-			var conf = new AspNetAppProjectConfiguration (name);
-			conf.CopyFrom (base.CreateConfiguration (name));
-			conf.OutputDirectory = BaseDirectory.IsNullOrEmpty? "bin" : (string)BaseDirectory.Combine ("bin");
-			return conf;
-		}
-		
-		void Init ()
-		{
-			codebehindTypeNameCache = new WebFormsCodeBehindTypeNameCache (this);
-		}
-
-		public new AspNetAppProjectConfiguration GetConfiguration (ConfigurationSelector configuration)
-		{
-			return (AspNetAppProjectConfiguration) base.GetConfiguration (configuration);
-		}
-		
-		#endregion
-		
-		public override void Dispose ()
-		{
-			codebehindTypeNameCache.Dispose ();
-			RegistrationCache.Dispose ();
-			base.Dispose ();
-		}
-		
-		#region build/prebuild/execute
-		
-		
-		protected override BuildResult DoBuild (IProgressMonitor monitor, ConfigurationSelector configuration)
-		{
-			//if no files are set to compile, then some compilers will error out
-			//though this is valid with ASP.NET apps, so we just avoid calling the compiler in this case
-			bool needsCompile = false;
-			foreach (ProjectFile pf in Files) {
-				if (pf.BuildAction == BuildAction.Compile) {
-					needsCompile = true;
-					break;
-				}
-			}
-			
-			if (needsCompile)
-				return base.DoBuild (monitor, configuration);
-			return new BuildResult ();
-		}
-		
-		ExecutionCommand CreateExecutionCommand (ConfigurationSelector config, AspNetAppProjectConfiguration configuration)
-		{
-			return new AspNetExecutionCommand {
-				ClrVersion = configuration.ClrVersion,
-				DebugMode = configuration.DebugMode,
-				XspParameters = XspParameters,
-				BaseDirectory = BaseDirectory,
-				TargetRuntime = TargetRuntime,
-				TargetFramework = TargetFramework,
-				UserAssemblyPaths = GetUserAssemblyPaths (config),
-				EnvironmentVariables = configuration.EnvironmentVariables,
-			};
-		}
-		
-		protected override bool OnGetCanExecute (ExecutionContext context, ConfigurationSelector configuration)
-		{
-			var cmd = CreateExecutionCommand (configuration, GetConfiguration (configuration));
-			return context.ExecutionHandler.CanExecute (cmd);
-		}
-		
-		protected override void DoExecute (IProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
-		{
-			//check XSP is available
-			
-			var cfg = GetConfiguration (configuration);
-			var cmd = CreateExecutionCommand (configuration, cfg);
-			var browserExcTarget = (BrowserExecutionTarget) context.ExecutionTarget;
-
-			IConsole console = null;
-			var operationMonitor = new AggregatedOperationMonitor (monitor);
-
-			bool isXsp = true; //FIXME: fix this when it might not be true - should delegate to the ExecutionHandler
-			
-			try {
-				//HACK: check XSP exists first, because error UX is cleaner w/o displaying a blank console pad.
-				if (isXsp) {
-					try {
-						AspNetExecutionHandler.GetXspPath ((AspNetExecutionCommand)cmd);
-					} catch (UserException ex) {
-						MessageService.ShowError (
-							GettextCatalog.GetString ("Could not launch ASP.NET web server"),
-						    ex.Message);
-						throw;
-					}
-				}
-
-				if (cfg.ExternalConsole)
-					console = context.ExternalConsoleFactory.CreateConsole (!cfg.PauseConsoleOutput);
-				else
-					console = context.ConsoleFactory.CreateConsole (!cfg.PauseConsoleOutput);
-
-				// The running Port value is now captured in the XspBrowserLauncherConsole object
-				string url = String.Format ("http://{0}", XspParameters.Address);
-				
-				
-				if (isXsp) {
-					console = new XspBrowserLauncherConsole (console, delegate (string port) {
-						if (browserExcTarget != null)
-							browserExcTarget.DesktopApp.Launch (String.Format("{0}:{1}", url, port));
-						else
-							BrowserLauncher.LaunchDefaultBrowser (String.Format("{0}:{1}", url, port));
-					});
-				}
-			
-				monitor.Log.WriteLine ("Running web server...");
-				
-				var op = context.ExecutionHandler.Execute (cmd, console);
-				operationMonitor.AddOperation (op); //handles cancellation
-				
-				if (!isXsp) {
-					if (browserExcTarget != null)
-						browserExcTarget.DesktopApp.Launch (url);
-					else
-						BrowserLauncher.LaunchDefaultBrowser (url);
-				}
-				
-				op.WaitForCompleted ();
-				
-				monitor.Log.WriteLine ("The web server exited with code: {0}", op.ExitCode);
-				
-			} catch (Exception ex) {
-				if (!(ex is UserException)) {
-					LoggingService.LogError ("Could not launch ASP.NET web server.", ex);
-				}
-				monitor.ReportError ("Could not launch web server.", ex);
-			} finally {
-				operationMonitor.Dispose ();
-				if (console != null)
-					console.Dispose ();
-			}
-		}
-		
-		#endregion
-		
-		#region File utility methods
-		
-		public WebSubtype DetermineWebSubtype (ProjectFile file)
-		{
-			if (LanguageBinding != null && LanguageBinding.IsSourceCodeFile (file.FilePath))
-				return WebSubtype.Code;
-			return DetermineWebSubtype (file.Name);
-		}
-		
-		public static WebSubtype DetermineWebSubtype (string fileName)
-		{
-			string extension = Path.GetExtension (fileName);
-			if (extension == null)
-				return WebSubtype.None;
-			extension = extension.ToUpperInvariant ().TrimStart ('.');
-			
-			//NOTE: No way to identify WebSubtype.Code from here
-			//use the instance method for that
-			switch (extension) {
-			case "ASPX":
-				return WebSubtype.WebForm;
-			case "MASTER":
-				return WebSubtype.MasterPage;
-			case "ASHX":
-				return WebSubtype.WebHandler;
-			case "ASCX":
-				return WebSubtype.WebControl;
-			case "ASMX":
-				return WebSubtype.WebService;
-			case "ASAX":
-				return WebSubtype.Global;
-			case "GIF":
-			case "PNG":
-			case "JPG":
-				return WebSubtype.WebImage;
-			case "SKIN":
-				return WebSubtype.WebSkin;
-			case "CONFIG":
-				return WebSubtype.Config;
-			case "BROWSER":
-				return WebSubtype.BrowserDefinition;
-			case "AXD":
-				return WebSubtype.Axd;
-			case "SITEMAP":
-				return WebSubtype.Sitemap;
-			case "CSS":
-				return WebSubtype.Css;
-			case "XHTML":
-			case "HTML":
-			case "HTM":
-				return WebSubtype.Html;
-			case "JS":
-				return WebSubtype.JavaScript;
-			case "LESS":
-				return WebSubtype.Less;
-			case "SASS":
-			case "SCSS":
-				return WebSubtype.Sass;
-			case "EOT":
-			case "TTF":
-			case "OTF":
-			case "WOFF":
-				return WebSubtype.Font;
-			case "SVG":
-				return WebSubtype.Svg;
-			case "STYL":
-				return WebSubtype.Stylus;
-			case "CSHTML":
-				return WebSubtype.Razor;
-			default:
-				return WebSubtype.None;
-			}
-		}
-		
-		#endregion
-		
-		#region special files
-		
-		#endregion
-		
-		public ProjectFile ResolveVirtualPath (string virtualPath, string relativeToFile)
-		{
-			string name = VirtualToLocalPath (virtualPath, relativeToFile);
-			if (name == null)
-				return null;
-			return Files.GetFile (name);
-		}
-		
-		public string VirtualToLocalPath (string virtualPath, string relativeToFile)
-		{
-			if (string.IsNullOrEmpty (virtualPath) || virtualPath [0] == '/' || virtualPath.IndexOf (':') > -1)
-				return null;
-
-			FilePath relativeToDir;
-			if (virtualPath.Length > 1 && virtualPath[0] == '~') {
-				if (virtualPath[1] == '/')
-					virtualPath = virtualPath.Substring (2);
-				else
-					virtualPath = virtualPath.Substring (1);
-				relativeToDir = BaseDirectory;
-			} else {
-				relativeToDir = String.IsNullOrEmpty (relativeToFile)
-					? BaseDirectory
-					: (FilePath) Path.GetDirectoryName (relativeToFile);
-			}
-			
-			virtualPath = virtualPath.Replace ('/', Path.DirectorySeparatorChar);
-			return relativeToDir.Combine (virtualPath).FullPath;
-		}
-		
-		public string LocalToVirtualPath (string filename)
-		{
-			string rel = FileService.AbsoluteToRelativePath (BaseDirectory, filename);
-			return "~/" + rel.Replace (Path.DirectorySeparatorChar, '/');
-		}
-		
-		public string LocalToVirtualPath (ProjectFile file)
-		{
-			return LocalToVirtualPath (file.FilePath);
-		}
-		
-		#region Reference handling
-		
-		protected override void OnReferenceAddedToProject (ProjectReferenceEventArgs e)
-		{
-			//short-circuit if the project is being deserialised
-			if (Loading) {
-				base.OnReferenceAddedToProject (e);
-				return;
-			}
-			
-			UpdateWebConfigRefs ();
-			
-			base.OnReferenceAddedToProject (e);
-		}
-		
-		protected override void OnReferenceRemovedFromProject (ProjectReferenceEventArgs e)
-		{
-			//short-circuit if the project is being deserialised
-			if (Loading) {
-				base.OnReferenceAddedToProject (e);
-				return;
-			}
-			
-			UpdateWebConfigRefs ();
-			
-			base.OnReferenceRemovedFromProject (e);
-		}
-		
-		void UpdateWebConfigRefs ()
-		{
-			var refs = new List<string> ();
-			foreach (var reference in References) {
-				//local copied assemblies are copied to the bin directory so ASP.NET references them automatically
-				if (reference.LocalCopy && (reference.ReferenceType == ReferenceType.Project || reference.ReferenceType == ReferenceType.Assembly))
-					continue;
-				if (string.IsNullOrEmpty (reference.Reference))
-					continue;
-				//these assemblies are referenced automatically by ASP.NET
-				if (WebFormsRegistrationCache.IsDefaultReference (reference.Reference))
-				    continue;
-				//bypass non dotnet projects
-				if ((reference.ReferenceType == ReferenceType.Project) &&
-				    (!(reference.OwnerProject.ParentSolution.FindProjectByName (reference.Reference) is DotNetProject)))
-						continue;
-				refs.Add (reference.Reference);
-			}
-						
-			var webConfig = GetWebConfig ();
-			if (webConfig == null || !File.Exists (webConfig.FilePath))
-				return;
-			
-			var textFile = TextFileProvider.Instance.GetEditableTextFile (webConfig.FilePath);
-			//use textfile API because it's write safe (writes out to another file then moves)
-			if (textFile == null)
-				textFile = MonoDevelop.Projects.Text.TextFile.ReadFile (webConfig.FilePath);
-				
-			//can't use System.Web.Configuration.WebConfigurationManager, as it can only access virtual paths within an app
-			//so need full manual handling
-			try {
-				var doc = new XmlDocument ();
-				
-				//FIXME: PreserveWhitespace doesn't handle whitespace in attribute lists
-				//doc.PreserveWhitespace = true;
-				doc.LoadXml (textFile.Text);
-				
-				//hunt our way to the assemblies element, creating elements if necessary
-				XmlElement configElement = doc.DocumentElement;
-				if (configElement == null || string.Compare (configElement.Name, "configuration", StringComparison.OrdinalIgnoreCase) != 0) {
-					configElement = (XmlElement) doc.AppendChild (doc.CreateNode (XmlNodeType.Document, "configuration", null));
-				}
-				XmlElement webElement = GetNamedXmlElement (doc, configElement, "system.web");			
-				XmlElement compilationNode = GetNamedXmlElement (doc, webElement, "compilation");
-				XmlElement assembliesNode = GetNamedXmlElement (doc, compilationNode, "assemblies");
-				
-				List<XmlNode> existingAdds = new List<XmlNode> ();
-				foreach (XmlNode node in assembliesNode)
-					if (string.Compare (node.Name, "add", StringComparison.OrdinalIgnoreCase) == 0)
-					    existingAdds.Add (node);
-				
-				//add refs to the doc if they're not in it
-				foreach (string reference in refs) {
-					int index = 0;
-					bool found = false;
-					while (index < existingAdds.Count) {
-						XmlNode node = existingAdds [index];
-						XmlAttribute att = (XmlAttribute)node.Attributes.GetNamedItem ("assembly");
-						if (att == null)
-							continue;
-						string refAtt = att.Value;
-						if (refAtt != null && refAtt == reference) {
-							existingAdds.RemoveAt (index);
-							found = true;
-							break;
-						}
-						index++;
-					}
-					if (!found) {
-						XmlElement newAdd = doc.CreateElement ("add");
-						XmlAttribute newAtt = doc.CreateAttribute ("assembly");
-						newAtt.Value = reference;
-						newAdd.Attributes.Append (newAtt);
-						assembliesNode.AppendChild (newAdd);
-					}
-				}
-				
-				//any nodes that weren't removed from the existingAdds list are old/redundant, so remove from doc
-				foreach (XmlNode node in existingAdds)
-					assembliesNode.RemoveChild (node);
-				
-				StringWriter sw = new StringWriter ();
-				XmlTextWriter tw = new XmlTextWriter (sw);
-				tw.Formatting = Formatting.Indented;
-				doc.WriteTo (tw);
-				tw.Flush ();
-				textFile.Text = sw.ToString ();
-				
-				MonoDevelop.Projects.Text.TextFile tf = textFile as MonoDevelop.Projects.Text.TextFile;
-				if (tf != null)
-					tf.Save ();
-			} catch (Exception e) {
-				LoggingService.LogWarning ("Could not modify application web.config in project " + Name, e); 
-			}
-		}
-		
-		
-		XmlElement GetNamedXmlElement (XmlDocument doc, XmlElement parent, string name)
-		{
-			XmlElement result = null;
-			foreach (XmlNode node in parent.ChildNodes) {
-				XmlElement elem = node as XmlElement;
-				if (elem != null && string.Compare (elem.Name, name, StringComparison.OrdinalIgnoreCase) == 0) {
-					result = elem;
-					break;
-				}
-			}
-			if (result == null) {
-				result = (XmlElement) parent.AppendChild (doc.CreateElement (name));
-			}
-			return result;
-		}
-		
-		ProjectFile GetWebConfig ()
-		{
-			var webConf = BaseDirectory.Combine ("web.config");
-			foreach (var file in Files)
-				if (string.Compare (file.FilePath.ToString (), webConf, StringComparison.OrdinalIgnoreCase) == 0)
-					return file;
-			return null;
-		}
-		
-		bool IsWebConfig (FilePath file)
-		{
-			var webConf = BaseDirectory.Combine ("web.config");
-			return (string.Compare (file, webConf, StringComparison.OrdinalIgnoreCase) == 0);
-		}
-		
-		#endregion
-		
-		#region File event handlers
-		
-		protected override void OnFileAddedToProject (ProjectFileEventArgs e)
-		{
-			//short-circuit if the project is being deserialised
-			if (Loading) {
-				base.OnFileAddedToProject (e);
-				return;
-			}
-
-			bool webConfigChange = false;
-			List<string> filesToAdd = new List<string> ();
-			
-			foreach (ProjectFileEventInfo fargs in e) {
-				IEnumerable<string> files = MonoDevelop.DesignerSupport.CodeBehind.GuessDependencies
-					(this, fargs.ProjectFile, groupedExtensions);
-				if (files != null)
-					filesToAdd.AddRange (files);
-				if (IsWebConfig (fargs.ProjectFile.FilePath))
-					webConfigChange = true;
-			}
-			
-			if (webConfigChange)
-				UpdateWebConfigRefs ();
-			
-			//let the base fire the event before we add files
-			//don't want to fire events out of order of files being added
-			base.OnFileAddedToProject (e);
-			
-			//make sure that the parent and child files are in the project
-			foreach (string file in filesToAdd) {
-				//NOTE: this only adds files if they are not already in the project
-				AddFile (file);
-			}
-		}
-		
-		public override string GetDefaultBuildAction (string fileName)
-		{
-			
-			WebSubtype type = DetermineWebSubtype (fileName);
-			switch (type) {
-			case WebSubtype.Code:
-				return BuildAction.Compile;
-			case WebSubtype.None:
-				return base.GetDefaultBuildAction (fileName);
-			default:
-				return BuildAction.Content;
-			}
-		}
-		
-		static string[] groupedExtensions =  { ".aspx", ".master", ".ashx", ".ascx", ".asmx", ".asax" };
-		
-		#endregion
-		
-		public virtual IEnumerable<string> GetSpecialDirectories ()
-		{
-			yield return "App_Browsers";
-			yield return "App_Data";
-			yield return "App_GlobalResources";
-			yield return "App_LocalResources";
-			yield return "Theme";
-
-			if (IsAspMvcProject) {
-				yield return "Views";
-				yield return "Models";
-				yield return "Controllers";
-			}
-			
-			// For "web site" projects
-			// "App_WebReferences", "App_Resources","App_Themes", "App_Code",
-		}
-		
-		protected override IList<string> GetCommonBuildActions ()
-		{
-			return new [] {
-				BuildAction.None,
-				BuildAction.Compile,
-				BuildAction.Content,
-				BuildAction.EmbeddedResource,
-			};
-		}
-		
-		public string GetCodebehindTypeName (string fileName)
-		{
-			lock (codebehindTypeNameCache)
-				return codebehindTypeNameCache.GetCodeBehindTypeName (fileName);
-		}
-
-		public IList<string> GetCodeTemplates (string type, string subtype = null)
-		{
-			var files = new List<string> ();
-			var names = new HashSet<string> ();
-
-			string asmDir = Path.GetDirectoryName (typeof (AspNetAppProject).Assembly.Location);
-			string lang = LanguageName;
-			if (lang == "C#") {
-				lang = "CSharp";
-			}
-
-			if (subtype != null) {
-				type = Path.Combine (type, subtype);
-			}
-
-			var dirs = new [] {
-				Path.Combine (BaseDirectory, "CodeTemplates", type),
-				Path.Combine (BaseDirectory, "CodeTemplates", lang, type),
-				Path.Combine (asmDir, "CodeTemplates", type),
-				Path.Combine (asmDir, "CodeTemplates", lang, type),
-			};
-
-			foreach (string directory in dirs)
-				if (Directory.Exists (directory))
-					foreach (string file in Directory.GetFiles (directory, "*.tt", SearchOption.TopDirectoryOnly))
-						if (names.Add (Path.GetFileName (file)))
-							files.Add (file);
-
-			return files;
-		}
-
-		protected override void PopulateSupportFileList (FileCopySet list, ConfigurationSelector configuration)
-		{
-			base.PopulateSupportFileList (list, configuration);
-
-			//HACK: workaround for MD not local-copying package references
-			foreach (MonoDevelop.Projects.ProjectReference projectReference in References) {
-				if (projectReference.Package != null && projectReference.Package.Name == "system.web.mvc") {
-					if (projectReference.ReferenceType == ReferenceType.Package)
-						foreach (SystemAssembly assem in projectReference.Package.Assemblies)
-							list.Add (assem.Location);
-					break;
-				}
-			}
-		}
-
-		public string GetAspNetMvcVersion ()
-		{
-			foreach (var pref in References) {
-				if (pref.Reference.IndexOf ("System.Web.Mvc", StringComparison.OrdinalIgnoreCase) < 0)
-					continue;
-				switch (pref.ReferenceType) {
-				case ReferenceType.Assembly:
-				case ReferenceType.Package:
-					foreach (var f in pref.GetReferencedFileNames (null)) {
-						if (Path.GetFileNameWithoutExtension (f) != "System.Web.Mvc" || !File.Exists (f))
-							continue;
-						return AssemblyName.GetAssemblyName (f).Version.ToString ();
-					}
-					break;
-				default:
-					continue;
-				}
-			}
-
-			if (IsAspMvcProject)
-				return GetDefaultAspNetMvcVersion ();
-
-			return null;
-		}
-
-		public bool SupportsRazorViewEngine {
-			get {
-				return References.Any (r => r.Reference.StartsWith ("System.Web.WebPages.Razor", StringComparison.Ordinal));
-			}
-		}
-
-		protected virtual string GetDefaultAspNetMvcVersion ()
-		{
-			return "5.2";
-		}
-
-		public virtual bool IsAspMvcProject {
-			get {
-				return References.Any (r => r.Reference.StartsWith ("System.Web.Mvc", StringComparison.Ordinal));
-			}
-		}
-
-		public bool IsAspWebApiProject {
-			get {
-				return References.Any (r => r.Reference.StartsWith ("System.Web.Http.WebHost", StringComparison.Ordinal));
-			}
-		}
-
-		public virtual bool IsAspWebFormsProject {
-			get {
-				return Files.Any (f => f.Name.EndsWith (".aspx", StringComparison.Ordinal));
-			}
-		}
-
-		class BrowserExecutionTarget : ExecutionTarget
-		{
-			string name, id;
-			public BrowserExecutionTarget (string id, string displayName, DesktopApplication app){
-				this.name = displayName;
-				this.id = id;
-				this.DesktopApp = app;
-			}
-
-			public override string Name {
-				get { return name; }
-			}
-
-			public override string Id {
-				get { return id; }
-			}
-
-			public DesktopApplication DesktopApp { get; private set; }
-		}
-
-		protected override IEnumerable<ExecutionTarget> OnGetExecutionTargets (ConfigurationSelector configuration)
-		{
-			var apps = new List<ExecutionTarget> ();
-			foreach (var browser in MonoDevelop.Ide.DesktopService.GetApplications ("test.html")) {
-				if (browser.IsDefault)
-					apps.Insert (0, new BrowserExecutionTarget (browser.Id,browser.DisplayName,browser));
-				else
-					apps.Add (new BrowserExecutionTarget (browser.Id,browser.DisplayName,browser));
-			}
-			return apps;
-		}
-	}
-}
diff --git a/main/src/addins/AspNet/Projects/AspNetAppProjectBinding.cs b/main/src/addins/AspNet/Projects/AspNetAppProjectBinding.cs
deleted file mode 100644
index 3a89feac81..0000000000
--- a/main/src/addins/AspNet/Projects/AspNetAppProjectBinding.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// AspNetAppProjectBinding.cs: Project binding for AspNetAppProject
-//
-// Authors:
-//   Michael Hutchinson <m.j.hutchinson@gmail.com>
-//
-// Copyright (C) 2006 Michael Hutchinson
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-using System.Xml;
-
-namespace MonoDevelop.AspNet.Projects
-{
-	//based heavily on DotNetProjectBinding
-	public class AspNetAppProjectBinding : IProjectBinding
-	{
-		
-		public string Name {
-			get { return "AspNetApp"; }
-		}
-		
-		public Project CreateProject (ProjectCreateInformation info, XmlElement projectOptions)
-		{
-			string lang = projectOptions.GetAttribute ("language");
-			return CreateProject (lang, info, projectOptions);
-		}
-		
-		public Project CreateProject (string language, ProjectCreateInformation info, XmlElement projectOptions)
-		{
-			return new AspNetAppProject (language, info, projectOptions);
-		}
-		
-		public Project CreateSingleFileProject (string file)
-		{
-			//TODO: get page language
-			string language = "C#";
-			
-			var info = new ProjectCreateInformation () {
-				ProjectName = Path.GetFileNameWithoutExtension (file),
-				SolutionPath = Path.GetDirectoryName (file),
-				ProjectBasePath = Path.GetDirectoryName (file),
-			};
-			var project = CreateProject (language, info, null);
-			project.Files.Add (new ProjectFile (file));
-			return project;
-		}
-
-		public bool CanCreateSingleFileProject (string sourceFile)
-		{
-			WebSubtype type = AspNetAppProject.DetermineWebSubtype (sourceFile);
-			
-			return ((type == WebSubtype.WebForm)
-			           || (type == WebSubtype.WebHandler)
-			           || (type == WebSubtype.WebService));
-		}
-	}
-}
diff --git a/main/src/addins/AspNet/Projects/AspNetAppProjectConfiguration.cs b/main/src/addins/AspNet/Projects/AspNetAppProjectConfiguration.cs
index cc20b7151b..a48276e837 100644
--- a/main/src/addins/AspNet/Projects/AspNetAppProjectConfiguration.cs
+++ b/main/src/addins/AspNet/Projects/AspNetAppProjectConfiguration.cs
@@ -37,20 +37,8 @@ namespace MonoDevelop.AspNet.Projects
 {
 	public class AspNetAppProjectConfiguration : DotNetProjectConfiguration 
 	{
-		public AspNetAppProjectConfiguration (string name) : base (name)
+		public AspNetAppProjectConfiguration (string id) : base (id)
 		{
 		}
-		
-		public AspNetAppProjectConfiguration ()
-		{
-		}
-		
-		public override void CopyFrom (ItemConfiguration configuration)
-		{
-			base.CopyFrom (configuration);
-			var cfg = configuration as AspNetAppProjectConfiguration;
-			if (cfg == null)
-				return;
-		}
 	}
 }
diff --git a/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs
new file mode 100644
index 0000000000..1527fa9c43
--- /dev/null
+++ b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs
@@ -0,0 +1,734 @@
+//
+// AspNetAppProject.cs: ASP.NET "Web Application" project type
+//
+// Authors:
+//   Michael Hutchinson <m.j.hutchinson@gmail.com>
+//
+// Copyright (C) 2006 Michael Hutchinson
+//
+//
+// This source code is licenced under The MIT License:
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Xml;
+
+using MonoDevelop.Core;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Core.Assemblies;
+using MonoDevelop.Core.Execution;
+using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Core.Serialization;
+using MonoDevelop.Ide.Desktop;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Projects;
+using MonoDevelop.AspNet.Execution;
+using MonoDevelop.AspNet.WebForms;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.AspNet.Projects
+{
+	[DataInclude (typeof(AspNetAppProjectConfiguration))]
+	public class AspNetAppProjectFlavor : DotNetProjectExtension
+	{
+		[ItemProperty("XspParameters", IsExternal=true)]
+		XspParameters xspParameters = new XspParameters ();
+
+		WebFormsRegistrationCache registrationCache;
+		WebFormsCodeBehindTypeNameCache codebehindTypeNameCache;
+
+		#region properties
+
+		protected override DotNetProjectFlags OnGetDotNetProjectFlags ()
+		{
+			return base.OnGetDotNetProjectFlags () | DotNetProjectFlags.IsLibrary;
+		}
+
+		public XspParameters XspParameters {
+			get { return xspParameters; }
+		}
+
+		internal WebFormsRegistrationCache RegistrationCache {
+			get {
+				if (registrationCache == null)
+					registrationCache = new WebFormsRegistrationCache (Project);
+				return registrationCache;
+			}
+		}
+
+		#endregion
+
+		#region constructors
+
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+			codebehindTypeNameCache = new WebFormsCodeBehindTypeNameCache (Project);
+		}
+
+		protected override void OnInitializeFromTemplate (ProjectCreateInformation projectCreateInfo, XmlElement template)
+		{
+			base.OnInitializeFromTemplate (projectCreateInfo, template);
+
+			var binPath = projectCreateInfo == null? (FilePath)"bin" : projectCreateInfo.BinPath;
+			foreach (var cfg in Project.Configurations.Cast<DotNetProjectConfiguration> ())
+				cfg.OutputDirectory = binPath;
+		}
+
+		protected override SolutionItemConfiguration OnCreateConfiguration (string name, ConfigurationKind kind)
+		{
+			var conf = new AspNetAppProjectConfiguration (name);
+			conf.CopyFrom (base.OnCreateConfiguration (name, kind));
+			conf.OutputDirectory = Project.BaseDirectory.IsNullOrEmpty? "bin" : (string)Project.BaseDirectory.Combine ("bin");
+			return conf;
+		}
+
+		public AspNetAppProjectConfiguration GetConfiguration (ConfigurationSelector configuration)
+		{
+			return (AspNetAppProjectConfiguration) Project.GetConfiguration (configuration);
+		}
+
+		#endregion
+
+		public override void Dispose ()
+		{
+			codebehindTypeNameCache.Dispose ();
+			RegistrationCache.Dispose ();
+			base.Dispose ();
+		}
+
+		#region build/prebuild/execute
+
+		protected override ProjectFeatures OnGetSupportedFeatures ()
+		{
+			return base.OnGetSupportedFeatures () | ProjectFeatures.Execute;
+		}
+
+		protected override Task<BuildResult> OnBuild (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext)
+		{
+			//if no files are set to compile, then some compilers will error out
+			//though this is valid with ASP.NET apps, so we just avoid calling the compiler in this case
+			bool needsCompile = false;
+			foreach (ProjectFile pf in Project.Files) {
+				if (pf.BuildAction == BuildAction.Compile) {
+					needsCompile = true;
+					break;
+				}
+			}
+
+			if (needsCompile)
+				return base.OnBuild (monitor, configuration, operationContext);
+			return Task.FromResult (BuildResult.CreateSuccess ());
+		}
+
+		ExecutionCommand CreateExecutionCommand (ConfigurationSelector config, AspNetAppProjectConfiguration configuration)
+		{
+			return new AspNetExecutionCommand {
+				ClrVersion = configuration.ClrVersion,
+				DebugMode = configuration.DebugSymbols,
+				XspParameters = XspParameters,
+				BaseDirectory = Project.BaseDirectory,
+				TargetRuntime = Project.TargetRuntime,
+				TargetFramework = Project.TargetFramework,
+				UserAssemblyPaths = Project.GetUserAssemblyPaths (config),
+				EnvironmentVariables = configuration.EnvironmentVariables,
+			};
+		}
+
+		protected override bool OnGetCanExecute (ExecutionContext context, ConfigurationSelector configuration)
+		{
+			var cmd = CreateExecutionCommand (configuration, GetConfiguration (configuration));
+			return context.ExecutionHandler.CanExecute (cmd);
+		}
+
+		protected async override Task OnExecute (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
+		{
+			//check XSP is available
+
+			var cfg = GetConfiguration (configuration);
+			var cmd = CreateExecutionCommand (configuration, cfg);
+			var browserExcTarget = (BrowserExecutionTarget) context.ExecutionTarget;
+
+			OperationConsole console = null;
+
+			bool isXsp = true; //FIXME: fix this when it might not be true - should delegate to the ExecutionHandler
+
+			try {
+				//HACK: check XSP exists first, because error UX is cleaner w/o displaying a blank console pad.
+				if (isXsp) {
+					try {
+						AspNetExecutionHandler.GetXspPath ((AspNetExecutionCommand)cmd);
+					} catch (UserException ex) {
+						MessageService.ShowError (
+							GettextCatalog.GetString ("Could not launch ASP.NET web server"),
+						    ex.Message);
+						throw;
+					}
+				}
+
+				if (cfg.ExternalConsole)
+					console = context.ExternalConsoleFactory.CreateConsole (!cfg.PauseConsoleOutput, monitor.CancellationToken);
+				else
+					console = context.ConsoleFactory.CreateConsole (monitor.CancellationToken);
+
+				// The running Port value is now captured in the XspBrowserLauncherConsole object
+				string url = String.Format ("http://{0}", XspParameters.Address);
+
+
+				if (isXsp) {
+					console = new XspBrowserLauncherConsole (console, delegate (string port) {
+						if (browserExcTarget != null)
+							browserExcTarget.DesktopApp.Launch (String.Format("{0}:{1}", url, port));
+						else
+							BrowserLauncher.LaunchDefaultBrowser (String.Format("{0}:{1}", url, port));
+					});
+				}
+
+				monitor.Log.WriteLine ("Running web server...");
+
+				var op = context.ExecutionHandler.Execute (cmd, console);
+
+				if (!isXsp) {
+					if (browserExcTarget != null)
+						browserExcTarget.DesktopApp.Launch (url);
+					else
+						BrowserLauncher.LaunchDefaultBrowser (url);
+				}
+
+				using (monitor.CancellationToken.Register (op.Cancel))
+					await op.Task;
+
+				monitor.Log.WriteLine ("The web server exited with code: {0}", op.ExitCode);
+
+			} catch (Exception ex) {
+				if (!(ex is UserException)) {
+					LoggingService.LogError ("Could not launch ASP.NET web server.", ex);
+				}
+				monitor.ReportError ("Could not launch web server.", ex);
+			} finally {
+				if (console != null)
+					console.Dispose ();
+			}
+		}
+
+		#endregion
+
+		#region File utility methods
+
+		public WebSubtype DetermineWebSubtype (ProjectFile file)
+		{
+			if (Project.LanguageBinding != null && Project.LanguageBinding.IsSourceCodeFile (file.FilePath))
+				return WebSubtype.Code;
+			return DetermineWebSubtype (file.Name);
+		}
+
+		public static WebSubtype DetermineWebSubtype (string fileName)
+		{
+			string extension = Path.GetExtension (fileName);
+			if (extension == null)
+				return WebSubtype.None;
+			extension = extension.ToUpperInvariant ().TrimStart ('.');
+
+			//NOTE: No way to identify WebSubtype.Code from here
+			//use the instance method for that
+			switch (extension) {
+			case "ASPX":
+				return WebSubtype.WebForm;
+			case "MASTER":
+				return WebSubtype.MasterPage;
+			case "ASHX":
+				return WebSubtype.WebHandler;
+			case "ASCX":
+				return WebSubtype.WebControl;
+			case "ASMX":
+				return WebSubtype.WebService;
+			case "ASAX":
+				return WebSubtype.Global;
+			case "GIF":
+			case "PNG":
+			case "JPG":
+				return WebSubtype.WebImage;
+			case "SKIN":
+				return WebSubtype.WebSkin;
+			case "CONFIG":
+				return WebSubtype.Config;
+			case "BROWSER":
+				return WebSubtype.BrowserDefinition;
+			case "AXD":
+				return WebSubtype.Axd;
+			case "SITEMAP":
+				return WebSubtype.Sitemap;
+			case "CSS":
+				return WebSubtype.Css;
+			case "XHTML":
+			case "HTML":
+			case "HTM":
+				return WebSubtype.Html;
+			case "JS":
+				return WebSubtype.JavaScript;
+			case "LESS":
+				return WebSubtype.Less;
+			case "SASS":
+			case "SCSS":
+				return WebSubtype.Sass;
+			case "EOT":
+			case "TTF":
+			case "OTF":
+			case "WOFF":
+				return WebSubtype.Font;
+			case "SVG":
+				return WebSubtype.Svg;
+			case "STYL":
+				return WebSubtype.Stylus;
+			case "CSHTML":
+				return WebSubtype.Razor;
+			default:
+				return WebSubtype.None;
+			}
+		}
+
+		#endregion
+
+		#region special files
+
+		#endregion
+
+		public ProjectFile ResolveVirtualPath (string virtualPath, string relativeToFile)
+		{
+			string name = VirtualToLocalPath (virtualPath, relativeToFile);
+			if (name == null)
+				return null;
+			return Project.Files.GetFile (name);
+		}
+
+		public string VirtualToLocalPath (string virtualPath, string relativeToFile)
+		{
+			if (string.IsNullOrEmpty (virtualPath) || virtualPath [0] == '/' || virtualPath.IndexOf (':') > -1)
+				return null;
+
+			FilePath relativeToDir;
+			if (virtualPath.Length > 1 && virtualPath[0] == '~') {
+				if (virtualPath[1] == '/')
+					virtualPath = virtualPath.Substring (2);
+				else
+					virtualPath = virtualPath.Substring (1);
+				relativeToDir = Project.BaseDirectory;
+			} else {
+				relativeToDir = String.IsNullOrEmpty (relativeToFile)
+					? Project.BaseDirectory
+					: (FilePath) Path.GetDirectoryName (relativeToFile);
+			}
+
+			virtualPath = virtualPath.Replace ('/', Path.DirectorySeparatorChar);
+			return relativeToDir.Combine (virtualPath).FullPath;
+		}
+
+		public string LocalToVirtualPath (string filename)
+		{
+			string rel = FileService.AbsoluteToRelativePath (Project.BaseDirectory, filename);
+			return "~/" + rel.Replace (Path.DirectorySeparatorChar, '/');
+		}
+
+		public string LocalToVirtualPath (ProjectFile file)
+		{
+			return LocalToVirtualPath (file.FilePath);
+		}
+
+		#region Reference handling
+
+		protected override void OnReferenceAddedToProject (ProjectReferenceEventArgs e)
+		{
+			//short-circuit if the project is being deserialised
+			if (Project.Loading) {
+				base.OnReferenceAddedToProject (e);
+				return;
+			}
+
+			UpdateWebConfigRefs ();
+
+			base.OnReferenceAddedToProject (e);
+		}
+
+		protected override void OnReferenceRemovedFromProject (ProjectReferenceEventArgs e)
+		{
+			//short-circuit if the project is being deserialised
+			if (Project.Loading) {
+				base.OnReferenceAddedToProject (e);
+				return;
+			}
+
+			UpdateWebConfigRefs ();
+
+			base.OnReferenceRemovedFromProject (e);
+		}
+
+		void UpdateWebConfigRefs ()
+		{
+			var refs = new List<string> ();
+			foreach (var reference in Project.References) {
+				//local copied assemblies are copied to the bin directory so ASP.NET references them automatically
+				if (reference.LocalCopy && (reference.ReferenceType == ReferenceType.Project || reference.ReferenceType == ReferenceType.Assembly))
+					continue;
+				if (string.IsNullOrEmpty (reference.Reference))
+					continue;
+				//these assemblies are referenced automatically by ASP.NET
+				if (WebFormsRegistrationCache.IsDefaultReference (reference.Reference))
+				    continue;
+				//bypass non dotnet projects
+				if ((reference.ReferenceType == ReferenceType.Project) &&
+				    (!(reference.ResolveProject (reference.OwnerProject.ParentSolution) is DotNetProject)))
+						continue;
+				refs.Add (reference.Reference);
+			}
+
+			var webConfig = GetWebConfig ();
+			if (webConfig == null || !File.Exists (webConfig.FilePath))
+				return;
+			
+			//use textfile API because it's write safe (writes out to another file then moves)
+			var textFile = MonoDevelop.Ide.TextFileProvider.Instance.GetEditableTextFile (webConfig.FilePath);
+				
+			//can't use System.Web.Configuration.WebConfigurationManager, as it can only access virtual paths within an app
+			//so need full manual handling
+			try {
+				var doc = new XmlDocument ();
+
+				//FIXME: PreserveWhitespace doesn't handle whitespace in attribute lists
+				//doc.PreserveWhitespace = true;
+				doc.LoadXml (textFile.Text);
+
+				//hunt our way to the assemblies element, creating elements if necessary
+				XmlElement configElement = doc.DocumentElement;
+				if (configElement == null || string.Compare (configElement.Name, "configuration", StringComparison.OrdinalIgnoreCase) != 0) {
+					configElement = (XmlElement) doc.AppendChild (doc.CreateNode (XmlNodeType.Document, "configuration", null));
+				}
+				XmlElement webElement = GetNamedXmlElement (doc, configElement, "system.web");
+				XmlElement compilationNode = GetNamedXmlElement (doc, webElement, "compilation");
+				XmlElement assembliesNode = GetNamedXmlElement (doc, compilationNode, "assemblies");
+
+				List<XmlNode> existingAdds = new List<XmlNode> ();
+				foreach (XmlNode node in assembliesNode)
+					if (string.Compare (node.Name, "add", StringComparison.OrdinalIgnoreCase) == 0)
+					    existingAdds.Add (node);
+
+				//add refs to the doc if they're not in it
+				foreach (string reference in refs) {
+					int index = 0;
+					bool found = false;
+					while (index < existingAdds.Count) {
+						XmlNode node = existingAdds [index];
+						XmlAttribute att = (XmlAttribute)node.Attributes.GetNamedItem ("assembly");
+						if (att == null)
+							continue;
+						string refAtt = att.Value;
+						if (refAtt != null && refAtt == reference) {
+							existingAdds.RemoveAt (index);
+							found = true;
+							break;
+						}
+						index++;
+					}
+					if (!found) {
+						XmlElement newAdd = doc.CreateElement ("add");
+						XmlAttribute newAtt = doc.CreateAttribute ("assembly");
+						newAtt.Value = reference;
+						newAdd.Attributes.Append (newAtt);
+						assembliesNode.AppendChild (newAdd);
+					}
+				}
+
+				//any nodes that weren't removed from the existingAdds list are old/redundant, so remove from doc
+				foreach (XmlNode node in existingAdds)
+					assembliesNode.RemoveChild (node);
+
+				StringWriter sw = new StringWriter ();
+				XmlTextWriter tw = new XmlTextWriter (sw);
+				tw.Formatting = Formatting.Indented;
+				doc.WriteTo (tw);
+				tw.Flush ();
+				textFile.Text = sw.ToString ();
+				textFile.WriteTextTo (textFile.FileName); 
+			} catch (Exception e) {
+				LoggingService.LogWarning ("Could not modify application web.config in project " + Project.Name, e);
+			}
+		}
+
+
+		XmlElement GetNamedXmlElement (XmlDocument doc, XmlElement parent, string name)
+		{
+			XmlElement result = null;
+			foreach (XmlNode node in parent.ChildNodes) {
+				XmlElement elem = node as XmlElement;
+				if (elem != null && string.Compare (elem.Name, name, StringComparison.OrdinalIgnoreCase) == 0) {
+					result = elem;
+					break;
+				}
+			}
+			if (result == null) {
+				result = (XmlElement) parent.AppendChild (doc.CreateElement (name));
+			}
+			return result;
+		}
+
+		ProjectFile GetWebConfig ()
+		{
+			var webConf = Project.BaseDirectory.Combine ("web.config");
+			foreach (var file in Project.Files)
+				if (string.Compare (file.FilePath.ToString (), webConf, StringComparison.OrdinalIgnoreCase) == 0)
+					return file;
+			return null;
+		}
+
+		bool IsWebConfig (FilePath file)
+		{
+			var webConf = Project.BaseDirectory.Combine ("web.config");
+			return (string.Compare (file, webConf, StringComparison.OrdinalIgnoreCase) == 0);
+		}
+
+		#endregion
+
+		#region File event handlers
+
+		protected override void OnFileAddedToProject (ProjectFileEventArgs e)
+		{
+			//short-circuit if the project is being deserialised
+			if (Project.Loading) {
+				base.OnFileAddedToProject (e);
+				return;
+			}
+
+			bool webConfigChange = false;
+			List<string> filesToAdd = new List<string> ();
+
+			foreach (ProjectFileEventInfo fargs in e) {
+				IEnumerable<string> files = MonoDevelop.DesignerSupport.CodeBehind.GuessDependencies
+					(Project, fargs.ProjectFile, groupedExtensions);
+				if (files != null)
+					filesToAdd.AddRange (files);
+				if (IsWebConfig (fargs.ProjectFile.FilePath))
+					webConfigChange = true;
+			}
+
+			if (webConfigChange)
+				UpdateWebConfigRefs ();
+
+			//let the base fire the event before we add files
+			//don't want to fire events out of order of files being added
+			base.OnFileAddedToProject (e);
+
+			//make sure that the parent and child files are in the project
+			foreach (string file in filesToAdd) {
+				//NOTE: this only adds files if they are not already in the project
+				Project.AddFile (file);
+			}
+		}
+
+		protected override string OnGetDefaultBuildAction (string fileName)
+		{
+
+			WebSubtype type = DetermineWebSubtype (fileName);
+			switch (type) {
+			case WebSubtype.Code:
+				return BuildAction.Compile;
+			case WebSubtype.None:
+				return base.OnGetDefaultBuildAction (fileName);
+			default:
+				return BuildAction.Content;
+			}
+		}
+
+		static string[] groupedExtensions =  { ".aspx", ".master", ".ashx", ".ascx", ".asmx", ".asax" };
+
+		#endregion
+
+		public virtual IEnumerable<string> GetSpecialDirectories ()
+		{
+			yield return "App_Browsers";
+			yield return "App_Data";
+			yield return "App_GlobalResources";
+			yield return "App_LocalResources";
+			yield return "Theme";
+
+			if (IsAspMvcProject) {
+				yield return "Views";
+				yield return "Models";
+				yield return "Controllers";
+			}
+
+			// For "web site" projects
+			// "App_WebReferences", "App_Resources","App_Themes", "App_Code",
+		}
+
+		protected override IList<string> OnGetCommonBuildActions ()
+		{
+			return new [] {
+				BuildAction.None,
+				BuildAction.Compile,
+				BuildAction.Content,
+				BuildAction.EmbeddedResource,
+			};
+		}
+
+		public string GetCodebehindTypeName (string fileName)
+		{
+			lock (codebehindTypeNameCache)
+				return codebehindTypeNameCache.GetCodeBehindTypeName (fileName);
+		}
+
+		public IList<string> GetCodeTemplates (string type, string subtype = null)
+		{
+			var files = new List<string> ();
+			var names = new HashSet<string> ();
+
+			string asmDir = Path.GetDirectoryName (GetType().Assembly.Location);
+			string lang = Project.LanguageName;
+			if (lang == "C#") {
+				lang = "CSharp";
+			}
+
+			if (subtype != null) {
+				type = Path.Combine (type, subtype);
+			}
+
+			var dirs = new [] {
+				Path.Combine (Project.BaseDirectory, "CodeTemplates", type),
+				Path.Combine (Project.BaseDirectory, "CodeTemplates", lang, type),
+				Path.Combine (asmDir, "CodeTemplates", type),
+				Path.Combine (asmDir, "CodeTemplates", lang, type),
+			};
+
+			foreach (string directory in dirs)
+				if (Directory.Exists (directory))
+					foreach (string file in Directory.GetFiles (directory, "*.tt", SearchOption.TopDirectoryOnly))
+						if (names.Add (Path.GetFileName (file)))
+							files.Add (file);
+
+			return files;
+		}
+
+		protected override void OnPopulateSupportFileList (FileCopySet list, ConfigurationSelector configuration)
+		{
+			base.OnPopulateSupportFileList (list, configuration);
+
+			//HACK: workaround for MD not local-copying package references
+			foreach (MonoDevelop.Projects.ProjectReference projectReference in Project.References) {
+				if (projectReference.Package != null && projectReference.Package.Name == "system.web.mvc") {
+					if (projectReference.ReferenceType == ReferenceType.Package)
+						foreach (SystemAssembly assem in projectReference.Package.Assemblies)
+							list.Add (assem.Location);
+					break;
+				}
+			}
+		}
+
+		public string GetAspNetMvcVersion ()
+		{
+			foreach (var pref in Project.References) {
+				if (pref.Reference.IndexOf ("System.Web.Mvc", StringComparison.OrdinalIgnoreCase) < 0)
+					continue;
+				switch (pref.ReferenceType) {
+				case ReferenceType.Assembly:
+				case ReferenceType.Package:
+					foreach (var f in pref.GetReferencedFileNames (null)) {
+						if (Path.GetFileNameWithoutExtension (f) != "System.Web.Mvc" || !File.Exists (f))
+							continue;
+						return AssemblyName.GetAssemblyName (f).Version.ToString ();
+					}
+					break;
+				default:
+					continue;
+				}
+			}
+
+			if (IsAspMvcProject)
+				return GetDefaultAspNetMvcVersion ();
+
+			return null;
+		}
+
+		public bool SupportsRazorViewEngine {
+			get {
+				return Project.References.Any (r => r.Reference.StartsWith ("System.Web.WebPages.Razor", StringComparison.Ordinal));
+			}
+		}
+
+		protected virtual string GetDefaultAspNetMvcVersion ()
+		{
+			return "5.2";
+		}
+
+		public virtual bool IsAspMvcProject {
+			get {
+				return Project.References.Any (r => r.Reference.StartsWith ("System.Web.Mvc", StringComparison.Ordinal));
+			}
+		}
+
+		public bool IsAspWebApiProject {
+			get {
+				return Project.References.Any (r => r.Reference.StartsWith ("System.Web.Http.WebHost", StringComparison.Ordinal));
+			}
+		}
+
+		public virtual bool IsAspWebFormsProject {
+			get {
+				return Project.Files.Any (f => f.Name.EndsWith (".aspx", StringComparison.Ordinal));
+			}
+		}
+
+		class BrowserExecutionTarget : ExecutionTarget
+		{
+			string name, id;
+			public BrowserExecutionTarget (string id, string displayName, DesktopApplication app){
+				this.name = displayName;
+				this.id = id;
+				this.DesktopApp = app;
+			}
+
+			public override string Name {
+				get { return name; }
+			}
+
+			public override string Id {
+				get { return id; }
+			}
+
+			public DesktopApplication DesktopApp { get; private set; }
+		}
+
+		protected override IEnumerable<ExecutionTarget> OnGetExecutionTargets (ConfigurationSelector configuration)
+		{
+			var apps = new List<ExecutionTarget> ();
+			foreach (var browser in MonoDevelop.Ide.DesktopService.GetApplications ("test.html")) {
+				if (browser.IsDefault)
+					apps.Insert (0, new BrowserExecutionTarget (browser.Id,browser.DisplayName,browser));
+				else
+					apps.Add (new BrowserExecutionTarget (browser.Id,browser.DisplayName,browser));
+			}
+			return apps;
+		}
+	}
+}
diff --git a/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs b/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs
index 40deaca04d..634c5edd0c 100644
--- a/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs
+++ b/main/src/addins/AspNet/Projects/AspNetMSBuildImportProvider.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Projects;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 using Mono.Addins;
 using MonoDevelop.AspNet.Projects;
 
diff --git a/main/src/addins/AspNet/Projects/AspNetMvcFileTemplateCondition.cs b/main/src/addins/AspNet/Projects/AspNetMvcFileTemplateCondition.cs
index 0a4f581ad1..d30fc4ae14 100644
--- a/main/src/addins/AspNet/Projects/AspNetMvcFileTemplateCondition.cs
+++ b/main/src/addins/AspNet/Projects/AspNetMvcFileTemplateCondition.cs
@@ -50,7 +50,7 @@ namespace MonoDevelop.AspNet.Projects
 			if (proj == null)

 				return true;

 

-			var aspProj = proj as AspNetAppProject;

+			var aspProj = proj.GetFlavor<AspNetAppProjectFlavor> ();

 			if (aspProj == null)

 				return false;

 

diff --git a/main/src/addins/AspNet/Projects/AspNetProjectTemplateWizardPage.cs b/main/src/addins/AspNet/Projects/AspNetProjectTemplateWizardPage.cs
index 6fa701717b..c410d543ea 100644
--- a/main/src/addins/AspNet/Projects/AspNetProjectTemplateWizardPage.cs
+++ b/main/src/addins/AspNet/Projects/AspNetProjectTemplateWizardPage.cs
@@ -26,14 +26,15 @@
 

 using MonoDevelop.Ide.Templates;

 using MonoDevelop.Core;

+using MonoDevelop.Core.StringParsing;
 

 namespace MonoDevelop.AspNet.Projects

 {

 	class AspNetProjectTemplateWizardPage : WizardPage

 	{

-		readonly string title = GettextCatalog.GetString ("Web Project Options");

+		readonly string title = GettextCatalog.GetString ("Configure your Web project");

 		readonly AspNetProjectTemplateWizard wizard;

-		AspNetProjectTemplateWizardPageWidget view;

+		GtkAspNetProjectTemplateWizardPageWidget view;

 

 		bool includeTestProject;

 

@@ -74,7 +75,7 @@ namespace MonoDevelop.AspNet.Projects
 		}

 

 		public bool AspNetMvcEnabled {

-			get { return wizard.Parameters.GetBoolean (aspNetMvc); }

+			get { return wizard.Parameters.GetBoolValue (aspNetMvc); }
 			set {

 				wizard.Parameters [aspNetMvc] = value.ToString ();

 				UpdateCanMoveNext ();

@@ -86,7 +87,7 @@ namespace MonoDevelop.AspNet.Projects
 		}

 

 		public bool AspNetWebFormsEnabled {

-			get { return wizard.Parameters.GetBoolean (aspNetWebForms); }

+			get { return wizard.Parameters.GetBoolValue (aspNetWebForms); }
 			set {

 				wizard.Parameters [aspNetWebForms] = value.ToString ();

 				UpdateCanMoveNext ();

@@ -98,7 +99,7 @@ namespace MonoDevelop.AspNet.Projects
 		}

 

 		public bool AspNetWebApiEnabled {

-			get { return wizard.Parameters.GetBoolean (aspNetWebApi); }

+			get { return wizard.Parameters.GetBoolValue (aspNetWebApi); }
 			set {

 				wizard.Parameters [aspNetWebApi] = value.ToString ();

 				UpdateCanMoveNext ();

@@ -118,9 +119,17 @@ namespace MonoDevelop.AspNet.Projects
 			get { return title; }

 		}

 

-		protected override object CreateNativeWidget ()

+		protected override object CreateNativeWidget<T> ()

 		{

-			return view ?? (view = new AspNetProjectTemplateWizardPageWidget (this));

+			return view ?? (view = new GtkAspNetProjectTemplateWizardPageWidget (this));

+		}

+

+		protected override void Dispose (bool disposing)

+		{

+			if (view != null) {

+				view.Dispose ();

+				view = null;

+			}

 		}

 	}

 }

diff --git a/main/src/addins/AspNet/Projects/AspNetProjectTemplateWizardPageWidget.cs b/main/src/addins/AspNet/Projects/AspNetProjectTemplateWizardPageWidget.cs
deleted file mode 100644
index b494c58a7d..0000000000
--- a/main/src/addins/AspNet/Projects/AspNetProjectTemplateWizardPageWidget.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-//

-// AspNetProjectTemplateWizardPageWidget.cs

-//

-// Author:

-//       Michael Hutchinson <m.j.hutchinson@gmail.com>

-//

-// Copyright (c) 2015 Xamarin Inc.

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

-using Gtk;

-using Gdk;

-

-namespace MonoDevelop.AspNet.Projects

-{

-	class AspNetProjectTemplateWizardPageWidget : HBox

-	{

-		readonly AspNetProjectTemplateWizardPage page;

-

-		public AspNetProjectTemplateWizardPageWidget (AspNetProjectTemplateWizardPage page)

-		{

-			this.page = page;

-

-			Build ();

-

-			includeTestProjectCheck.Active = page.IncludeTestProject;

-		}

-

-		CheckButton includeTestProjectCheck;

-		CheckButton includeMvcCheck;

-		CheckButton includeWebFormsCheck;

-		CheckButton includeWebApiCheck;

-

-		void Build ()

-		{

-			var backgroundColor = new Color (225, 228, 232);

-

-			var box = new VBox { BorderWidth = 12, Spacing = 12 };

-			var eb = new EventBox { Child = box };

-			eb.ModifyBg (StateType.Normal, backgroundColor);

-			var infoEB = new EventBox { WidthRequest = 280 };

-			infoEB.ModifyBg (StateType.Normal, new Color (255, 255, 255));

-			PackStart (eb, true, true, 0);

-			PackStart (infoEB, false, false, 0);

-

-			var frameworkLabel = new Label ("Include references and folders for:") { Xalign = 0 };

-			box.PackStart (frameworkLabel, false, false, 0);

-			var frameworkBox = new VBox { Spacing = 6 };

-			box.PackStart (new Alignment (0, 0, 0, 0) { LeftPadding = 24, Child = frameworkBox } , false, false, 0);

-

-			if (page.AspNetMvcMutable || page.AspNetMvcEnabled) {

-				includeMvcCheck = CreateFancyCheckButton (

-					"MVC",

-					"Modern programming model. Unit testable, choice of templating languages."

-				);

-				includeMvcCheck.Active = page.AspNetMvcEnabled;

-				includeMvcCheck.Toggled += (sender, e) => {

-					page.AspNetMvcEnabled = includeMvcCheck.Active;

-				};

-				includeMvcCheck.Sensitive = page.AspNetMvcMutable;

-				frameworkBox.PackStart (includeMvcCheck, false, false, 0);

-			}

-

-			if (page.AspNetWebFormsMutable || page.AspNetWebFormsEnabled) {

-				includeWebFormsCheck = CreateFancyCheckButton (

-					"Web Forms",

-					"Stateful programming model similar to desktop applications."

-				);

-				includeWebFormsCheck.Active = page.AspNetWebFormsEnabled;

-				includeWebFormsCheck.Toggled += (sender, e) => {

-					page.AspNetWebFormsEnabled = includeWebFormsCheck.Active;

-				};

-				includeWebFormsCheck.Sensitive = page.AspNetWebFormsMutable;

-				frameworkBox.PackStart (includeWebFormsCheck, false, false, 0);

-			}

-

-			if (page.AspNetWebApiMutable || page.AspNetWebApiEnabled) {

-				includeWebApiCheck = CreateFancyCheckButton (

-					"Web API",

-					"Framework for creating HTTP web services."

-				);

-				includeWebApiCheck.Active = page.AspNetWebApiEnabled;

-				includeWebApiCheck.Toggled += (sender, e) => {

-					page.AspNetWebApiEnabled = includeWebApiCheck.Active;

-				};

-				includeWebApiCheck.Sensitive = page.AspNetWebApiMutable;

-				frameworkBox.PackStart (includeWebApiCheck, false, false, 0);

-			}

-

-			includeTestProjectCheck = CreateFancyCheckButton (

-				"Include Unit Test Project",

-				"Add a Unit Test Project for testing the Web Project using NUnit."

-			);

-			includeTestProjectCheck.Toggled += (sender, e) => {

-				page.IncludeTestProject = includeTestProjectCheck.Active;

-			};

-

-			box.PackStart (includeTestProjectCheck, false, false, 0);

-

-			ShowAll ();

-		}

-

-		static CheckButton CreateFancyCheckButton (string title, string detail)

-		{

-			var button = new CheckButton ();

-			var box = new VBox { Spacing = 4 };

-			var titleLabel = new Label {

-				Markup = "<b>" + GLib.Markup.EscapeText (title) + "</b>",

-				Xalign = 0

-			};

-			box.PackStart (titleLabel, false, false, 0);

-			var detailLabel = new Label {

-				Text = detail,

-				Xalign = 0

-			};

-			box.PackStart (detailLabel, false, false, 0);

-			button.Child = new Alignment (0, 0,  0, 0)  { LeftPadding = 6, Child =  box };

-			return button;

-		}

-	}

-}

diff --git a/main/src/addins/AspNet/Projects/AspNetStringTagProvider.cs b/main/src/addins/AspNet/Projects/AspNetStringTagProvider.cs
index 93ceb0eba8..503b2267c2 100644
--- a/main/src/addins/AspNet/Projects/AspNetStringTagProvider.cs
+++ b/main/src/addins/AspNet/Projects/AspNetStringTagProvider.cs
@@ -31,7 +31,7 @@ using MonoDevelop.Core.StringParsing;
 namespace MonoDevelop.AspNet.Projects
 {
 	[Mono.Addins.Extension]
-	class AspNetStringTagProvider : StringTagProvider<AspNetAppProject>
+	class AspNetStringTagProvider : StringTagProvider<AspNetAppProjectFlavor>
 	{
 		public override IEnumerable<StringTagDescription> GetTags ()
 		{
@@ -40,7 +40,7 @@ namespace MonoDevelop.AspNet.Projects
 			yield return new StringTagDescription ("UsesAspNetWebApi", "Whether the project uses ASP.NET Web API");

 		}

 

-		public override object GetTagValue (AspNetAppProject instance, string tag)

+		public override object GetTagValue (AspNetAppProjectFlavor instance, string tag)

 		{

 			switch (tag) {

 			case "USESASPNETMVC":

diff --git a/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs b/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs
new file mode 100644
index 0000000000..699afe4c5a
--- /dev/null
+++ b/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs
@@ -0,0 +1,195 @@
+//

+// GtkAspNetProjectTemplateWizardPageWidget.cs

+//

+// Author:

+//       Michael Hutchinson <m.j.hutchinson@gmail.com>

+//       Matt Ward <matt.ward@xamarin.com>

+//

+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+using System;

+using Gdk;

+using Gtk;

+using Mono.TextEditor;

+using MonoDevelop.Components;

+using MonoDevelop.Core;

+

+namespace MonoDevelop.AspNet.Projects

+{

+	[System.ComponentModel.ToolboxItem (true)]

+	partial class GtkAspNetProjectTemplateWizardPageWidget : Gtk.Bin

+	{

+		AspNetProjectTemplateWizardPage wizardPage;

+		ImageView backgroundImageView;

+		Xwt.Drawing.Image backgroundImage;

+

+		public GtkAspNetProjectTemplateWizardPageWidget ()

+		{

+			this.Build ();

+

+			if (Platform.IsMac) {

+				int labelPaddingHeight = 5;

+				if (IsYosemiteOrHigher ())

+					labelPaddingHeight--;

+				includeLabelPadding.HeightRequest = labelPaddingHeight;

+				testingLabelPadding.HeightRequest = labelPaddingHeight;

+

+				int leftPaddingWidth = 28;

+				mvcDescriptionLeftHandPadding.WidthRequest = leftPaddingWidth;

+				webFormsDescriptionLeftHandPadding.WidthRequest = leftPaddingWidth;

+				webApiDescriptionLeftHandPadding.WidthRequest = leftPaddingWidth;

+				includeUnitTestProjectDescriptionLeftHandPadding.WidthRequest = leftPaddingWidth;

+			}

+

+			double scale = GtkWorkarounds.GetPixelScale ();

+

+			backgroundImage = Xwt.Drawing.Image.FromResource ("aspnet-wizard-page.png");

+			backgroundImageView = new ImageView (backgroundImage);

+			backgroundImageView.Xalign = (float)(1/scale);

+			backgroundImageView.Yalign = (float)(1/scale);

+			backgroundLargeImageVBox.PackStart (backgroundImageView, true, true, 0);

+

+			var separatorColor = Ide.Gui.Styles.NewProjectDialog.ProjectConfigurationSeparatorColor.ToGdkColor ();

+			var backgroundColor = Ide.Gui.Styles.NewProjectDialog.ProjectConfigurationLeftHandBackgroundColor.ToGdkColor ();

+			testingSeparator.ModifyBg (StateType.Normal, separatorColor);

+

+			leftBorderEventBox.ModifyBg (StateType.Normal, backgroundColor);

+			configurationTopEventBox.ModifyBg (StateType.Normal, backgroundColor);

+			configurationTableEventBox.ModifyBg (StateType.Normal, backgroundColor);

+			configurationBottomEventBox.ModifyBg (StateType.Normal, backgroundColor);

+			backgroundLargeImageEventBox.ModifyBg (StateType.Normal, backgroundColor);

+

+			if (Platform.IsWindows && scale > 1.0)

+				ScaleWidgets (scale);

+		}

+

+		public GtkAspNetProjectTemplateWizardPageWidget (AspNetProjectTemplateWizardPage wizardPage)

+			: this ()

+		{

+			WizardPage = wizardPage;

+		}

+

+		void ScaleWidgets (double scale)

+		{

+			ScaleWidgetsWidth (scale, new Widget[] {

+				leftBorderEventBox,

+				configurationVBox,

+				includeLabelPadding,

+				testingLabelPadding,

+				paddingLabel,

+				testingSeparator,

+				mvcDescriptionLeftHandPadding,

+				mvcDescriptionLabel,

+				webFormsDescriptionLeftHandPadding,

+				webFormsDescriptionLabel,

+				webApiDescriptionLeftHandPadding,

+				webApiDescriptionLabel,

+				includeUnitTestProjectDescriptionLabel,

+				includeUnitTestProjectDescriptionLeftHandPadding

+			});

+

+			ScaleWidgetsHeight (scale, new Widget[] {

+				includeLabelPadding,

+				testingLabelPadding,

+				testingSeparator

+			});

+		}

+

+		void ScaleWidgetsWidth (double scale, Widget[] widgets)

+		{

+			foreach (Widget widget in widgets) {

+				widget.WidthRequest = (int)(widget.WidthRequest * scale);

+			}

+		}

+

+		void ScaleWidgetsHeight (double scale, Widget[] widgets)

+		{

+			foreach (Widget widget in widgets) {

+				widget.HeightRequest = (int)(widget.HeightRequest * scale);

+			}

+		}

+

+		public override void Dispose ()

+		{

+			Dispose (backgroundImage);

+		}

+

+		void Dispose (IDisposable disposable)

+		{

+			if (disposable != null) {

+				disposable.Dispose ();

+			}

+		}

+

+		public AspNetProjectTemplateWizardPage WizardPage {

+			get { return wizardPage; }

+			set {

+				wizardPage = value;

+				LoadWizardPageInfo ();

+			}

+		}

+

+		void LoadWizardPageInfo ()

+		{

+			if (wizardPage.AspNetMvcMutable || wizardPage.AspNetMvcEnabled) {

+				includeMvcCheck.Active = wizardPage.AspNetMvcEnabled;

+				includeMvcCheck.Toggled += (sender, e) => {

+					wizardPage.AspNetMvcEnabled = includeMvcCheck.Active;

+				};

+				mvcVBox.Sensitive = wizardPage.AspNetMvcMutable;

+			}

+

+			if (wizardPage.AspNetWebFormsMutable || wizardPage.AspNetWebFormsEnabled) {

+				includeWebFormsCheck.Active = wizardPage.AspNetWebFormsEnabled;

+				includeWebFormsCheck.Toggled += (sender, e) => {

+					wizardPage.AspNetWebFormsEnabled = includeWebFormsCheck.Active;

+				};

+				webFormsVBox.Sensitive = wizardPage.AspNetWebFormsMutable;

+			} else {

+				RemoveFromTable (webFormsVBox);

+			}

+

+			if (wizardPage.AspNetWebApiMutable || wizardPage.AspNetWebApiEnabled) {

+				includeWebApiCheck.Active = wizardPage.AspNetWebApiEnabled;

+				includeWebApiCheck.Toggled += (sender, e) => {

+					wizardPage.AspNetWebApiEnabled = includeWebApiCheck.Active;

+				};

+				webApiVBox.Sensitive = wizardPage.AspNetWebApiMutable;

+			}

+

+			includeTestProjectCheck.Toggled += (sender, e) => {

+				wizardPage.IncludeTestProject = includeTestProjectCheck.Active;

+			};

+		}

+

+		void RemoveFromTable (Widget widget)

+		{

+			configurationTable.Remove (widget);

+			widget.Destroy ();

+		}

+

+		bool IsYosemiteOrHigher ()

+		{

+			return Platform.OSVersion >= MacSystemInformation.Yosemite;

+		}

+	}

+}

+

diff --git a/main/src/addins/AspNet/Properties/AddinInfo.cs b/main/src/addins/AspNet/Properties/AddinInfo.cs
index 703d5f8b35..e7986424ec 100644
--- a/main/src/addins/AspNet/Properties/AddinInfo.cs
+++ b/main/src/addins/AspNet/Properties/AddinInfo.cs
@@ -14,4 +14,4 @@ using Mono.Addins;
 [assembly:AddinDependency ("DesignerSupport", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("Xml", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("SourceEditor2", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("TextTemplating", MonoDevelop.BuildInfo.Version)]
\ No newline at end of file
+[assembly:AddinDependency ("TextTemplating", MonoDevelop.BuildInfo.Version)]
diff --git a/main/src/addins/AspNet/Properties/AssemblyInfo.cs b/main/src/addins/AspNet/Properties/AssemblyInfo.cs
index 6508a7210d..c509a6f3af 100644
--- a/main/src/addins/AspNet/Properties/AssemblyInfo.cs
+++ b/main/src/addins/AspNet/Properties/AssemblyInfo.cs
@@ -1,9 +1,12 @@
 // Autogenerated from MonoDevelop.AspNet.addin.xml
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 [assembly: AssemblyProduct ("MonoDevelop")]
 [assembly: AssemblyTitle ("ASP.NET Project Support")]
 [assembly: AssemblyDescription ("Support for ASP.NET projects, including editing, compiling, previewing and deploying to remote servers.")]
 [assembly: AssemblyVersion ("2.6")]
 [assembly: AssemblyCopyright ("MIT X11")]
+[assembly: InternalsVisibleTo("MonoDevelop.AspNet.Tests")]
+[assembly: InternalsVisibleTo("MonoDevelop.CSharpBinding.AspNet")]
diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
index 975e13f9b1..391260d6ef 100644
--- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
+++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
@@ -5,67 +5,65 @@
 		<Import assembly = "System.Web.Mvc.dll" />
 		<Import assembly = "System.Web.Razor.dll" />
 		<Import assembly = "System.Web.WebPages.Deployment.dll" />
-		<Import assembly = "System.Web.WebPages.dll" />
 		<Import assembly = "System.Web.WebPages.Razor.dll" />
+		<Import assembly = "System.Web.WebPages.dll" />
 
+		<Import file = "Html/Schemas/xhtml1-frameset.xsd" />
 		<Import file = "Html/Schemas/xhtml1-strict.xsd" />

 		<Import file = "Html/Schemas/xhtml1-transitional.xsd" />

-		<Import file = "Html/Schemas/xhtml1-frameset.xsd" />

 

-		<Import file = "Templates/WebForms/GlobalAsax-Empty.xft.xml"/>

-		<Import file = "Templates/WebForms/GlobalAsax-CodeBehind.xft.xml"/>

 		<Import file = "Templates/WebForms/MasterPage-CodeBehind.xft.xml"/>

 		<Import file = "Templates/WebForms/MasterPage-Empty.xft.xml"/>

+		<Import file = "Templates/WebForms/NestedMasterPage-CodeBehind.xft.xml"/>
 		<Import file = "Templates/WebForms/NestedMasterPage.xft.xml"/>

+		<Import file = "Templates/WebForms/WebContentForm-CodeBehind.xft.xml"/>
 		<Import file = "Templates/WebForms/WebContentForm.xft.xml"/>

+		<Import file = "Templates/WebForms/WebControl-CodeBehind.xft.xml"/>
 		<Import file = "Templates/WebForms/WebControl-Empty.xft.xml"/>

 		<Import file = "Templates/WebForms/WebForm-CodeBehind.xft.xml"/>

-		<Import file = "Templates/WebForms/NestedMasterPage-CodeBehind.xft.xml"/>

-		<Import file = "Templates/WebForms/WebControl-CodeBehind.xft.xml"/>

 		<Import file = "Templates/WebForms/WebForm-Empty.xft.xml"/>

 		<Import file = "Templates/WebForms/WebHandler-CodeBehind.xft.xml"/>

-		<Import file = "Templates/WebForms/WebService-Empty.xft.xml"/>

-		<Import file = "Templates/WebForms/WebService-CodeBehind.xft.xml"/>

 		<Import file = "Templates/WebForms/WebHandler-Empty.xft.xml"/>

-		<Import file = "Templates/WebForms/WebContentForm-CodeBehind.xft.xml"/>

+		<Import file = "Templates/WebForms/WebService-CodeBehind.xft.xml"/>
+		<Import file = "Templates/WebForms/WebService-Empty.xft.xml"/>
 

 		<Import file = "Templates/Mvc/Controller.xft.xml"/>

-		<Import file = "Templates/Mvc/ViewPage.xft.xml"/>

-		<Import file = "Templates/Mvc/ViewContentPage.xft.xml"/>

+		<Import file = "Templates/Mvc/LayoutPage.xft.xml" />
+		<Import file = "Templates/Mvc/PartialViewPageRazor.xft.xml" />
 		<Import file = "Templates/Mvc/UserControl.xft.xml"/>

+		<Import file = "Templates/Mvc/ViewContentPage.xft.xml"/>
 		<Import file = "Templates/Mvc/ViewMasterPage.xft.xml" />

-		<Import file = "Templates/Mvc/GlobalAsax.xft.xml"/>

-		<Import file = "Templates/Mvc/WebConfigApp.xft.xml"/>

-		<Import file = "Templates/Mvc/WebConfigViews.xft.xml"/>

-		<Import file = "Templates/Mvc/LayoutPage.xft.xml" />

+		<Import file = "Templates/Mvc/ViewPage.xft.xml"/>
 		<Import file = "Templates/Mvc/ViewPageRazor.xft.xml" />

-		<Import file = "Templates/Mvc/PartialViewPageRazor.xft.xml" />

+		<Import file = "Templates/Mvc/WebConfigViews.xft.xml"/>
 

-		<Import file = "Templates/Projects/EmptyMvcProject.xpt.xml" />

 		<Import file = "Templates/Projects/EmptyProject.xpt.xml" />

 		<Import file = "Templates/Projects/MvcProject.xpt.xml" />

-		<Import file = "Templates/Projects/MvcProjectWithUnitTest.xpt.xml" />

-		<Import file = "Templates/Projects/MvcRazorProject.xpt.xml" />

-		<Import file = "Templates/Projects/MvcRazorProjectWithUnitTest.xpt.xml"/>

-		<Import file = "Templates/Projects/WebApplication.xpt.xml"/>

+		<Import file = "Templates/Projects/WebFormsProject.xpt.xml"/>
+
+		<Import file = "Templates/Projects/Files/Default.aspx"/>
+		<Import file = "Templates/Projects/Files/Default.aspx.cs"/>
+		<Import file = "Templates/Projects/Files/Default.aspx.designer.cs"/>
 

-		<Import file = "Templates/MvcCommon/_Layout.cshtml"/>

-		<Import file = "Templates/MvcCommon/_ViewStart.cshtml"/>

 		<Import file = "Templates/MvcCommon/Error.cshtml"/>

 		<Import file = "Templates/MvcCommon/HomeController.cs"/>

 		<Import file = "Templates/MvcCommon/HomeControllerTest.cs"/>

 		<Import file = "Templates/MvcCommon/Index.cshtml"/>

 		<Import file = "Templates/MvcCommon/ViewPageRazor.cshtml"/>

+		<Import file = "Templates/MvcCommon/_Layout.cshtml"/>
+		<Import file = "Templates/MvcCommon/_ViewStart.cshtml"/>
 

+		<Import file = "Templates/GlobalAsax.xft.xml"/>
+		<Import file = "Templates/PreprocessedRazorTemplate.xft.xml" />
+		<Import file = "Templates/RouteConfig.cs"/>
+		<Import file = "Templates/WebApiConfig.cs"/>
 		<Import file = "Templates/WebConfig-Application.xft.xml"/>

 		<Import file = "Templates/WebConfig-SubDir.xft.xml"/>

 

-		<Import file = "Templates/PreprocessedRazorTemplate.xft.xml" />

-

+		<Import file = "CodeTemplates/CSharp/AddController/ControllerWithEmptyReadAndWriteActions.tt" />
+		<Import file = "CodeTemplates/CSharp/AddController/Empty.tt" />
 		<Import file = "CodeTemplates/CSharp/AddView/Aspx/Empty.tt" />

 		<Import file = "CodeTemplates/CSharp/AddView/Razor/Empty.tt" />

-		<Import file = "CodeTemplates/CSharp/AddController/Empty.tt" />

-		<Import file = "CodeTemplates/CSharp/AddController/ControllerWithEmptyReadAndWriteActions.tt" />

 

 		<Import file = "Razor/Razor-templates.xml" />

 	</Runtime>

@@ -83,20 +81,12 @@
 	</ExtensionPoint>

 

 	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">

-		<ProjectTemplate id   = "AspNet-EmptyMvcProject"

-		                 file = "Templates/Projects/EmptyMvcProject.xpt.xml" />

-		<ProjectTemplate id   = "AspNet-EmptyProject"

+		<ProjectTemplate id   = "MonoDevelop.AspNet.EmptyProject"

 		                 file = "Templates/Projects/EmptyProject.xpt.xml" />

-		<ProjectTemplate id   = "AspNet-MvcProject"

+		<ProjectTemplate id   = "MonoDevelop.AspNet.MvcProject"

 		                 file = "Templates/Projects/MvcProject.xpt.xml" />

-		<ProjectTemplate id   = "AspNet-MvcProjectWithUnitTest"

-		                 file = "Templates/Projects/MvcProjectWithUnitTest.xpt.xml" />

-		<ProjectTemplate id   = "AspNet-MvcRazorProject"

-		                 file = "Templates/Projects/MvcRazorProject.xpt.xml" />

-		<ProjectTemplate id   = "AspNet-MvcRazorProjectWithUnitTest"

-		                 file = "Templates/Projects/MvcRazorProjectWithUnitTest.xpt.xml"/>

-		<ProjectTemplate id   = "AspNet-WebApplication"

-		                 file = "Templates/Projects/WebApplication.xpt.xml"/>

+		<ProjectTemplate id   = "MonoDevelop.AspNet.WebApplication"

+		                 file = "Templates/Projects/WebFormsProject.xpt.xml"/>
 	</Extension>

 

 	<Extension path = "/MonoDevelop/Ide/FileTemplates">

@@ -130,10 +120,8 @@
 		<FileTemplate id   = "NestedMasterPage-CodeBehind"

 		              file = "Templates/WebForms/NestedMasterPage-CodeBehind.xft.xml" />

 

-		<FileTemplate id   = "GlobalAsax-Empty"

-		              file = "Templates/WebForms/GlobalAsax-Empty.xft.xml" />

-		<FileTemplate id   = "GlobalAsax-CodeBehind"

-		              file = "Templates/WebForms/GlobalAsax-CodeBehind.xft.xml" />

+		<FileTemplate id   = "GlobalAsax"
+		              file = "Templates/GlobalAsax.xft.xml" />
 

 		<FileTemplate id   = "WebConfig-Application"

 		              file = "Templates/WebConfig-Application.xft.xml" />

@@ -155,10 +143,6 @@
 		              file     = "Templates/Mvc/UserControl.xft.xml"/>

 		<FileTemplate id       = "AspMvcViewMasterPage"

 		              file     = "Templates/Mvc/ViewMasterPage.xft.xml" />

-		<FileTemplate id       = "AspMvcGlobalAsax"

-		              file     = "Templates/Mvc/GlobalAsax.xft.xml" />

-		<FileTemplate id       = "AspMvcWebConfigApp"

-		              file     = "Templates/Mvc/WebConfigApp.xft.xml" />

 		<FileTemplate id       = "AspMvcWebConfigViews"

 		              file     = "Templates/Mvc/WebConfigViews.xft.xml" />

 		<FileTemplate id       = "AspMvcViewPageRazor"

@@ -185,32 +169,28 @@
 		            extensions = "*.htm,*.html"/>

 	</Extension>

 

-	<Extension path = "/MonoDevelop/ProjectModel/ProjectBindings">

-		<ProjectBinding id = "AspNetApp" class = "MonoDevelop.AspNet.Projects.AspNetAppProjectBinding" />

-	</Extension>

-

-	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">

-		<DotNetProjectSubtype

+	<Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions">

+		<ProjectFlavor

 			guid="{603C0E0B-DB56-11DC-BE95-000D561079B0}"

-			type="MonoDevelop.AspNet.Projects.AspMvc1Project"

-			useXBuild="true" />

-		<DotNetProjectSubtype

+			type="MonoDevelop.AspNet.Projects.AspMvc1ProjectFlavor"

+			alias="AspNetMvc1" />

+		<ProjectFlavor

 			guid="{F85E285D-A4E0-4152-9332-AB1D724D3325}"

-			type="MonoDevelop.AspNet.Projects.AspMvc2Project"

-			useXBuild="true" />

-		<DotNetProjectSubtype

+			type="MonoDevelop.AspNet.Projects.AspMvc2ProjectFlavor"

+			alias="AspNetMvc2" />

+		<ProjectFlavor

 			guid="{E53F8FEA-EAE0-44A6-8774-FFD645390401}"

-			type="MonoDevelop.AspNet.Projects.AspMvc3Project"

-			useXBuild="true" />

-		<DotNetProjectSubtype

+			type="MonoDevelop.AspNet.Projects.AspMvc3ProjectFlavor"

+			alias="AspNetMvc3" />

+		<ProjectFlavor

 			guid="{E3E379DF-F4C6-4180-9B81-6769533ABE47}"

-			type="MonoDevelop.AspNet.Projects.AspMvc4Project"

-			useXBuild="true" />

-		<DotNetProjectSubtype

-			id="MonoDevelop.AspNet.Projects.AspNetAppProject"

+			type="MonoDevelop.AspNet.Projects.AspMvc4ProjectFlavor" 

+			alias="AspNetMvc4" />

+		<ProjectFlavor

+			id="MonoDevelop.AspNet.Projects.AspNetAppProjectFlavor"

 			guid="{349C5851-65DF-11DA-9384-00065B846F21}"

-			type="MonoDevelop.AspNet.Projects.AspNetAppProject"

-			useXBuild="true" />

+			type="MonoDevelop.AspNet.Projects.AspNetAppProjectFlavor" 

+			alias="AspNetApp" />

 	</Extension>

 

 	<Extension path = "/MonoDevelop/TypeSystem/Parser">

@@ -224,7 +204,7 @@
 	</Extension>

 

 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Run">

-		<Condition id="ItemType" value="MonoDevelop.AspNet.Projects.AspNetAppProject">

+		<Condition id="FlavorType" value="MonoDevelop.AspNet.Projects.AspNetAppProjectFlavor">

 			<Section id = "XspOptions"

 			             _label = "XSP Web Server"

 			             class = "MonoDevelop.AspNet.Execution.XspOptionsPanel"/>

@@ -269,11 +249,9 @@
 	</Extension>

 

 	<Extension path = "/MonoDevelop/Ide/ContextMenu/ProjectPad/Add">

-		<Condition id="ItemType" value="MonoDevelop.AspNet.Projects.AspNetAppProject">

-			<ItemSet id = "AspNetDirectories" _label = "ASP.NET Directory" insertafter = "MonoDevelop.Ide.Commands.ProjectCommands.NewFolder" autohide = "true">

-				<CommandItem id = "MonoDevelop.AspNet.Commands.AspNetCommands.AddAspNetDirectory" />

-			</ItemSet>

-		</Condition>

+		<ItemSet id = "AspNetDirectories" _label = "ASP.NET Directory" insertafter = "MonoDevelop.Ide.Commands.ProjectCommands.NewFolder" autohide = "true">

+			<CommandItem id = "MonoDevelop.AspNet.Commands.AspNetCommands.AddAspNetDirectory" />

+		</ItemSet>

 	</Extension>

 

 	<Extension path = "/MonoDevelop/Ide/ContextMenu/ProjectPad/Add">

@@ -316,9 +294,6 @@
 		<MimeType id="application/javascript" _description="Javascript source code" icon="md-html-file-icon" isText="true">

 			<File pattern="*.js" />

 		</MimeType>

-		<MimeType id="text/css" _description="CSS document" icon="md-html-file-icon" isText="true">

-			<File pattern="*.css" />

-		</MimeType>

 		<MimeType id="text/x-less" _description="LESS, CSS document" icon="md-html-file-icon" isText="true">

 			<File pattern="*.less" />

 		</MimeType>

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorCodeBlock.cs b/main/src/addins/AspNet/Razor/Dom/RazorCodeBlock.cs
index c6928acbfd..b8386bec5d 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorCodeBlock.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorCodeBlock.cs
@@ -25,14 +25,14 @@
 // THE SOFTWARE.

 

 using MonoDevelop.Xml.Parser;

-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorCodeBlock : RazorCodeFragment

 	{

-		public RazorCodeBlock (TextLocation start) : base (start)

+		public RazorCodeBlock (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorCodeFragment.cs b/main/src/addins/AspNet/Razor/Dom/RazorCodeFragment.cs
index 19ff98708b..6387e36ba3 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorCodeFragment.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorCodeFragment.cs
@@ -25,16 +25,16 @@
 // THE SOFTWARE.

 

 using System.Linq;

-using ICSharpCode.NRefactory;

-using Mono.TextEditor;

 using MonoDevelop.Ide;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

+using MonoDevelop.Ide.Editor.Util;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public abstract class RazorCodeFragment : XContainer

 	{

-		protected RazorCodeFragment (TextLocation start) : base (start)

+		protected RazorCodeFragment (DocumentLocation start) : base (start)

 		{

 		}

 

@@ -44,34 +44,32 @@ namespace MonoDevelop.AspNet.Razor.Dom
 

 		public string Name { get; set; }

 

-		public TextLocation? FirstBracket { get; set; }

+		public DocumentLocation? FirstBracket { get; set; }

 

-		public TextDocument Document {

+		public ITextDocument Document {

 			get {

-				if (IdeApp.Workbench.ActiveDocument != null && IdeApp.Workbench.ActiveDocument.Editor != null)

-					return IdeApp.Workbench.ActiveDocument.Editor.Document;

-				return null;

+				return RazorWorkbenchService.ActiveDocument;

 			}

 		}

 

-		public bool IsEndingBracket (TextLocation bracketLocation)

+		public bool IsEndingBracket (DocumentLocation bracketLocation)

 		{

 			// If document isn't entirely loaded

-			if (Document == null || Document.Lines.Count () < Region.BeginLine)

+			if (Document == null || Document.LineCount < Region.BeginLine)

 				return false;

 

 			if (!FirstBracket.HasValue && !FindFirstBracket (bracketLocation))

 				return false;

 

-			int firstBracketOffset = Document.GetOffset (FirstBracket.Value);

-			int currentBracketOffset = Document.GetOffset (bracketLocation);

+			int firstBracketOffset = Document.LocationToOffset (FirstBracket.Value);

+			int currentBracketOffset = Document.LocationToOffset (bracketLocation);

 

-			return Document.GetMatchingBracketOffset (firstBracketOffset) == currentBracketOffset;

+			return SimpleBracketMatcher.GetMatchingBracketOffset (Document, firstBracketOffset) == currentBracketOffset;

 		}

 

-		public bool FindFirstBracket (TextLocation currentLocation)

+		public bool FindFirstBracket (DocumentLocation currentLocation)

 		{

-			if (Document.Lines.Count () < Region.BeginLine)

+			if (Document == null || Document.LineCount < Region.BeginLine)

 				return false;

 

 			int firstBracketPosition = Document.GetTextBetween (Region.Begin, currentLocation).IndexOf ('{');

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorComment.cs b/main/src/addins/AspNet/Razor/Dom/RazorComment.cs
index 1cb572a9d6..a9a11503bb 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorComment.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorComment.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorComment : XNode

 	{

-		public RazorComment (DomRegion region) : base (region)

+		public RazorComment (DocumentRegion region) : base (region)

 		{

 		}

 

-		public RazorComment (TextLocation start) : base (start)

+		public RazorComment (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorDirective.cs b/main/src/addins/AspNet/Razor/Dom/RazorDirective.cs
index 7b1755d9a9..3eaebabb49 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorDirective.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorDirective.cs
@@ -24,14 +24,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorDirective : RazorCodeFragment

 	{

-		public RazorDirective (TextLocation start) : base (start)

+		public RazorDirective (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorExplicitExpression.cs b/main/src/addins/AspNet/Razor/Dom/RazorExplicitExpression.cs
index 15cbfc6637..80dcdae361 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorExplicitExpression.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorExplicitExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorExplicitExpression : RazorExpression

 	{

-		public RazorExplicitExpression (DomRegion region) : base (region)

+		public RazorExplicitExpression (DocumentRegion region) : base (region)

 		{

 		}

 

-		public RazorExplicitExpression (TextLocation start) : base (start)

+		public RazorExplicitExpression (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorExpression.cs b/main/src/addins/AspNet/Razor/Dom/RazorExpression.cs
index ef1ef4af95..81119710db 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorExpression.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory.TypeSystem;

-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public abstract class RazorExpression : XNode

 	{

-		protected RazorExpression (DomRegion region) : base (region)

+		protected RazorExpression (DocumentRegion region) : base (region)

 		{

 		}

 

-		protected RazorExpression (TextLocation start) : base (start)

+		protected RazorExpression (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorImplicitExpression.cs b/main/src/addins/AspNet/Razor/Dom/RazorImplicitExpression.cs
index f87a500d74..9536a8b592 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorImplicitExpression.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorImplicitExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 	public class RazorImplicitExpression : RazorExpression

 	{

-		public RazorImplicitExpression (DomRegion region) : base (region)

+		public RazorImplicitExpression (DocumentRegion region) : base (region)

 		{

 		}

 

-		public RazorImplicitExpression (TextLocation start) : base (start)

+		public RazorImplicitExpression (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorStatement.cs b/main/src/addins/AspNet/Razor/Dom/RazorStatement.cs
index 7af1bbfccf..83fa1d7444 100644
--- a/main/src/addins/AspNet/Razor/Dom/RazorStatement.cs
+++ b/main/src/addins/AspNet/Razor/Dom/RazorStatement.cs
@@ -24,15 +24,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Dom

 {

 

 	public class RazorStatement : RazorCodeFragment

 	{

-		public RazorStatement (TextLocation start) : base (start)

+		public RazorStatement (DocumentLocation start) : base (start)

 		{

 		}

 

diff --git a/main/src/addins/AspNet/Razor/Dom/RazorWorkbenchService.cs b/main/src/addins/AspNet/Razor/Dom/RazorWorkbenchService.cs
new file mode 100644
index 0000000000..97280a15fd
--- /dev/null
+++ b/main/src/addins/AspNet/Razor/Dom/RazorWorkbenchService.cs
@@ -0,0 +1,48 @@
+//
+// RazorWorkbenchService.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.AspNet.Razor.Dom
+{
+	internal static class RazorWorkbenchService
+	{
+		public static ITextDocument ActiveDocument {
+			get { 
+				return GetActiveDocument ();
+			}
+		}
+
+		internal static Func<ITextDocument> GetActiveDocument = () => {
+			if (IdeApp.Workbench.ActiveDocument != null && IdeApp.Workbench.ActiveDocument.Editor != null)
+				return IdeApp.Workbench.ActiveDocument.Editor;
+			return null;
+		};
+	}
+}
+
diff --git a/main/src/addins/AspNet/Razor/Generator/RazorTemplatePreprocessor.cs b/main/src/addins/AspNet/Razor/Generator/RazorTemplatePreprocessor.cs
index 6d7a73c175..28136349c2 100644
--- a/main/src/addins/AspNet/Razor/Generator/RazorTemplatePreprocessor.cs
+++ b/main/src/addins/AspNet/Razor/Generator/RazorTemplatePreprocessor.cs
@@ -28,6 +28,8 @@ using System;
 using System.CodeDom.Compiler;
 using System.Linq;
 using MonoDevelop.Core;
+using MonoDevelop.TextTemplating;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CustomTools;
 using MonoDevelop.Projects;
 
@@ -35,18 +37,18 @@ namespace MonoDevelop.AspNet.Razor.Generator
 {
 	class RazorTemplatePreprocessor : ISingleFileCustomTool
 	{
-		public IAsyncOperation Generate (IProgressMonitor monitor, ProjectFile file, SingleFileCustomToolResult result)
+		public Task Generate (ProgressMonitor monitor, ProjectFile file, SingleFileCustomToolResult result)
 		{
-			return new ThreadAsyncOperation (delegate {
+			return Task.Run (delegate {
 				try {
 					GenerateInternal (monitor, file, result);
 				} catch (Exception ex) {
 					result.UnhandledException = ex;
 				}
-			}, result);
+			});
 		}
 
-		static void GenerateInternal (IProgressMonitor monitor, ProjectFile file, SingleFileCustomToolResult result)
+		static void GenerateInternal (ProgressMonitor monitor, ProjectFile file, SingleFileCustomToolResult result)
 		{
 			if (file.Project.SupportedLanguages.All (l => l != "C#")) {
 				const string msg = "Razor templates are only supported in C# projects";
diff --git a/main/src/addins/AspNet/Razor/IRazorCompletionBuilder.cs b/main/src/addins/AspNet/Razor/IRazorCompletionBuilder.cs
index 242408e9bc..2beed8acba 100644
--- a/main/src/addins/AspNet/Razor/IRazorCompletionBuilder.cs
+++ b/main/src/addins/AspNet/Razor/IRazorCompletionBuilder.cs
@@ -25,45 +25,48 @@
 // THE SOFTWARE.

 

 using System.Collections.Generic;

+using System.Threading;

+using System.Threading.Tasks;

 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Ide.TypeSystem;

 using MonoDevelop.Ide.Gui;

-using ICSharpCode.NRefactory.TypeSystem;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor

 {

 	// Based on MonoDevelop.AspNet.Gui.ILanguageCompletionBuilder

 

-	public interface IRazorCompletionBuilder

+	interface IRazorCompletionBuilder

 	{

 		bool SupportsLanguage (string language);

-		ICompletionWidget CreateCompletionWidget (Document document, UnderlyingDocumentInfo docInfo);

-		ICompletionDataList HandlePopupCompletion (Document realDocument, UnderlyingDocumentInfo docInfo);

-		ICompletionDataList HandleCompletion (Document realDocument, CodeCompletionContext completionContext,

-			UnderlyingDocumentInfo docInfo, char currentChar, ref int triggerWordLength);

-		ParameterDataProvider HandleParameterCompletion (Document realDocument, CodeCompletionContext completionContext,

+		ICompletionWidget CreateCompletionWidget (TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo);

+		Task<ICompletionDataList> HandlePopupCompletion (TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo);

+		Task<ICompletionDataList> HandleCompletion (TextEditor editor, DocumentContext context, CodeCompletionContext completionContext,

+			UnderlyingDocumentInfo docInfo, char currentChar, CancellationToken token);

+		Task<MonoDevelop.Ide.CodeCompletion.ParameterHintingResult> HandleParameterCompletion (TextEditor editor, DocumentContext context, CodeCompletionContext completionContext,

 			UnderlyingDocumentInfo docInfo, char completionChar);

-		bool GetParameterCompletionCommandOffset (Document realDocument, UnderlyingDocumentInfo docInfo, out int cpos);

-		int GetCurrentParameterIndex (Document realDocument, UnderlyingDocumentInfo docInfo, int startOffset);

+	//	bool GetParameterCompletionCommandOffset (TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo, out int cpos);

+		Task<int> GetCurrentParameterIndex (TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo, int startOffset);

 	}

 

 	public class UnderlyingDocument : Document

 	{

 		internal ParsedDocument HiddenParsedDocument;

-		internal ICompilation HiddenCompilation;

 

 		public override ParsedDocument ParsedDocument {

 			get	{ return HiddenParsedDocument; }

 		}

 

-		public override ICompilation Compilation {

-			get { return HiddenCompilation; }

-		}

-

 		public UnderlyingDocument (IWorkbenchWindow window)

 			: base (window)

 		{

 		}

+

+		internal Microsoft.CodeAnalysis.Document HiddenAnalysisDocument;

+

+		public override Microsoft.CodeAnalysis.Document AnalysisDocument {

+			get { return HiddenAnalysisDocument; }

+		}

 	}

 

 	public class UnderlyingDocumentInfo

@@ -73,7 +76,7 @@ namespace MonoDevelop.AspNet.Razor
 		public UnderlyingDocument UnderlyingDocument { get; set; }

 	}

 

-	public static class RazorCompletionBuilderService

+	static class RazorCompletionBuilderService

 	{

 		static List<IRazorCompletionBuilder> builder = new List<IRazorCompletionBuilder> ();

 

diff --git a/main/src/addins/AspNet/Razor/OpenRazorDocument.cs b/main/src/addins/AspNet/Razor/OpenRazorDocument.cs
new file mode 100644
index 0000000000..39613f9b67
--- /dev/null
+++ b/main/src/addins/AspNet/Razor/OpenRazorDocument.cs
@@ -0,0 +1,94 @@
+//
+// OpenRazorDocument.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Threading;
+using System.Web.Razor;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.AspNet.Razor
+{
+	class OpenRazorDocument : IDisposable
+	{
+		ITextDocument document;
+		ChangeInfo lastChange;
+
+		public OpenRazorDocument (ITextDocument document)
+		{
+			this.document = document;
+			document.TextChanging += OnTextReplacing;
+		}
+
+		public void Dispose ()
+		{
+			document.TextChanging -= OnTextReplacing;
+			if (ParseComplete != null) {
+				ParseComplete.Dispose ();
+				ParseComplete = null;
+			}
+			if (EditorParser != null) {
+				EditorParser.Dispose ();
+				EditorParser = null;
+			}
+		}
+
+		public ITextDocument Document {
+			get { return document; }
+		}
+
+		public string FileName {
+			get { return document.FileName; }
+		}
+
+		public MonoDevelop.Web.Razor.EditorParserFixed.RazorEditorParser EditorParser { get; set; }
+		public DocumentParseCompleteEventArgs CapturedArgs { get; set; }
+		public AutoResetEvent ParseComplete { get; set; }
+
+		public ChangeInfo LastTextChange {
+			get { return lastChange; }
+		}
+
+		public void ClearLastTextChange ()
+		{
+			lock (document)
+				lastChange = null;
+		}
+
+		void OnTextReplacing (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
+		{
+			lock (document) {
+				if (lastChange == null)
+					lastChange = new ChangeInfo (e.Offset, new System.Web.Razor.Text.SeekableTextReader ((sender as MonoDevelop.Ide.Editor.ITextDocument).Text));
+				if (e.ChangeDelta > 0) {
+					lastChange.Length += e.InsertionLength;
+				} else {
+					lastChange.Length -= e.RemovalLength;
+				}
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/AspNet/Razor/Parser/RazorOutlineNode.cs b/main/src/addins/AspNet/Razor/Parser/RazorOutlineNode.cs
index 2028da9383..7d58ea9a93 100644
--- a/main/src/addins/AspNet/Razor/Parser/RazorOutlineNode.cs
+++ b/main/src/addins/AspNet/Razor/Parser/RazorOutlineNode.cs
@@ -25,16 +25,16 @@
 // THE SOFTWARE.

 

 using System.Web.Razor.Parser.SyntaxTree;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;

 using MonoDevelop.AspNet.WebForms.Dom;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Parser

 {

 	class RazorOutlineNode

 	{

 		public string Name { get; set; }

-		public DomRegion Location { get; set; }

+		public DocumentRegion Location { get; set; }

 

 		public RazorOutlineNode (XElement el)

 		{

diff --git a/main/src/addins/AspNet/Razor/Parser/StateEngineService.cs b/main/src/addins/AspNet/Razor/Parser/StateEngineService.cs
index 92f0e8f315..be9a3a58a2 100644
--- a/main/src/addins/AspNet/Razor/Parser/StateEngineService.cs
+++ b/main/src/addins/AspNet/Razor/Parser/StateEngineService.cs
@@ -25,10 +25,10 @@
 // THE SOFTWARE.

 

 using System.Diagnostics;

-using ICSharpCode.NRefactory;

 using MonoDevelop.Core;

 using MonoDevelop.Xml.Dom;

 using MonoDevelop.Xml.Parser;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.AspNet.Razor.Parser

 {

@@ -39,7 +39,7 @@ namespace MonoDevelop.AspNet.Razor.Parser
 			EndCodeFragment<T> (context, context.LocationMinus (minus));

 		}

 

-		public static void EndCodeFragment<T> (IXmlParserContext context, TextLocation loc) where T : XNode

+		public static void EndCodeFragment<T> (IXmlParserContext context, DocumentLocation loc) where T : XNode

 		{

 			var top = context.Nodes.Pop ();

 			var node = top as T;

diff --git a/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs b/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs
index 99bde2109f..1fc3994145 100644
--- a/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs
+++ b/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs
@@ -1,641 +1,674 @@
-//

-// RazorCSharpEditorExtension.cs

-//

-// Author:

-//		Piotr Dowgiallo <sparekd@gmail.com>

-//

-// Copyright (c) 2012 Piotr Dowgiallo

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text.RegularExpressions;

-using System.Web.Razor.Generator;

-using System.Web.Razor.Parser.SyntaxTree;

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.Completion;

-using ICSharpCode.NRefactory.TypeSystem;

-using Mono.TextEditor;

-using MonoDevelop.Core;

-using MonoDevelop.Ide.CodeCompletion;

-using MonoDevelop.Ide.Gui;

-using MonoDevelop.Ide.TypeSystem;

-using MonoDevelop.Xml.Dom;

-using MonoDevelop.Xml.Parser;

-using MonoDevelop.AspNet.Html;

-using MonoDevelop.AspNet.Razor.Dom;

-using MonoDevelop.AspNet.Razor.Parser;

-

-namespace MonoDevelop.AspNet.Razor

-{

-	public class RazorCSharpEditorExtension : BaseHtmlEditorExtension

-	{

-		protected RazorCSharpParsedDocument razorDocument;

-		protected UnderlyingDocumentInfo hiddenInfo;

-		IRazorCompletionBuilder completionBuilder;

-

-		bool isInCSharpContext;

-		static readonly Regex DocTypeRegex = new Regex (@"(?:PUBLIC|public)\s+""(?<fpi>[^""]*)""\s+""(?<uri>[^""]*)""");

-

-		ICompletionWidget defaultCompletionWidget;

-		Document defaultDocument;

-

-		RazorSyntaxMode syntaxMode;

-

-		UnderlyingDocument HiddenDoc {

-			get { return hiddenInfo.UnderlyingDocument; }

-		}

-

-		RazorPageInfo PageInfo {

-			get { return razorDocument.PageInfo; }

-		}

-

-		protected override XmlRootState CreateRootState ()

-		{

-			return new RazorRootState ();

-		}

-

-		public override string CompletionLanguage {

-			get {

-				return "Razor";

-			}

-		}

-		public override void Initialize ()

-		{

-			base.Initialize ();

-

-			defaultCompletionWidget = CompletionWidget;

-			defaultDocument = Document;

-			completionBuilder = RazorCompletionBuilderService.GetBuilder ("C#");

-

-			defaultDocument.Editor.Document.TextReplacing += UnderlyingDocument_TextReplacing;

-			defaultDocument.Editor.Caret.PositionChanged += delegate

-			{

-				OnCompletionContextChanged (CompletionWidget, EventArgs.Empty);

-			};

-			syntaxMode = new RazorSyntaxMode (Document);

-			defaultDocument.Editor.Document.SyntaxMode = syntaxMode;

-

-		}

-

-		public override void Dispose ()

-		{

-			if (syntaxMode != null) {

-				defaultDocument.Editor.Document.SyntaxMode = null;

-				syntaxMode.Dispose ();

-				syntaxMode = null;

-			}

-			defaultDocument.Editor.Document.TextReplacing -= UnderlyingDocument_TextReplacing;

-			base.Dispose ();

-		}

-

-		// Handles text modifications in hidden document

-		void UnderlyingDocument_TextReplacing (object sender, DocumentChangeEventArgs e)

-		{

-			if (razorDocument == null)

-				return;

-

-			EnsureUnderlyingDocumentSet ();

-			int off = CalculateCaretPosition (e.Offset);

-

-			if (e.RemovalLength > 0) {

-				int removalLength = e.RemovalLength;

-				if (off + removalLength > HiddenDoc.Editor.Length)

-					removalLength = HiddenDoc.Editor.Length - off;

-				HiddenDoc.Editor.Remove (new TextSegment (off, removalLength));

-			}

-			if (e.InsertionLength > 0) {

-				if (isInCSharpContext)

-					HiddenDoc.Editor.Insert (off, e.InsertedText.Text);

-				else // Insert spaces to correctly calculate offsets until next reparse

-					HiddenDoc.Editor.Insert (off, new String (' ', e.InsertionLength));

-			}

-			if (codeFragment != null)

-				codeFragment.EndOffset += (e.InsertionLength - e.RemovalLength);

-		}

-

-		protected override void OnParsedDocumentUpdated ()

-		{

-			base.OnParsedDocumentUpdated ();

-			try {

-				razorDocument = CU as RazorCSharpParsedDocument;

-				if (razorDocument == null || razorDocument.PageInfo.CSharpParsedFile == null)

-					return;

-

-				CreateDocType ();

-

-				// Don't update C# code in hiddenInfo when:

-				// 1) We are in a RazorState, and the completion window is visible,

-				// it'll freeze (or disappear if we call OnCompletionContextChanged).

-				// 2) We're in the middle of writing a Razor expression - if we're in an incorrect state,

-				// the generated code migh be behind what we've been already written.

-

-				var state = Tracker.Engine.CurrentState;

-				if (state is RazorState && CompletionWindowManager.IsVisible || 

-				    (!updateNeeded && (state is RazorSpeculativeState || state is RazorExpressionState)))

-					UpdateHiddenDocument (false);

-				else {

-					UpdateHiddenDocument ();

-					updateNeeded = false;

-				}

-			} catch (Exception e) {

-				LoggingService.LogError ("Error while updating razor completion.", e); 

-			}

-		}

-

-		void CreateDocType ()

-		{

-			DocType = new XDocType (TextLocation.Empty);

-			var matches = DocTypeRegex.Match (razorDocument.PageInfo.DocType);

-			if (matches.Success) {

-				DocType.PublicFpi = matches.Groups ["fpi"].Value;

-				DocType.Uri = matches.Groups ["uri"].Value;

-			}

-		}

-

-		void EnsureUnderlyingDocumentSet ()

-		{

-			if (hiddenInfo == null)

-				UpdateHiddenDocument ();

-		}

-

-		void UpdateHiddenDocument (bool updateSourceCode = true)

-		{

-			if (!updateSourceCode && hiddenInfo != null) {

-				hiddenInfo.UnderlyingDocument.HiddenParsedDocument = razorDocument.PageInfo.CSharpParsedFile;

-				hiddenInfo.UnderlyingDocument.HiddenCompilation = razorDocument.PageInfo.Compilation;

-				return;

-			}

-

-			hiddenInfo = new UnderlyingDocumentInfo ();

-

-			var viewContent = new HiddenTextEditorViewContent ();

-			viewContent.Project = Document.Project;

-			viewContent.ContentName = "Generated.cs"; // Use a name with .cs extension to get csharp ambience

-			viewContent.Text = razorDocument.PageInfo.CSharpCode;

-

-			var workbenchWindow = new HiddenWorkbenchWindow ();

-			workbenchWindow.ViewContent = viewContent;

-			hiddenInfo.UnderlyingDocument = new UnderlyingDocument (workbenchWindow) {

-				HiddenParsedDocument = razorDocument.PageInfo.CSharpParsedFile,

-				HiddenCompilation = razorDocument.PageInfo.Compilation

-			};

-

-			// completion window needs this

-			hiddenInfo.UnderlyingDocument.Editor.Parent = Editor.Parent;

-

-			currentMappings = razorDocument.PageInfo.GeneratorResults.DesignTimeLineMappings;

-			codeFragment = null;

-		}

-

-		#region Code completion

-

-		XObject prevNode;

-		bool updateNeeded;

-

-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)

-		{

-			Tracker.UpdateEngine ();

-			if (razorDocument == null)

-				return NonCSharpCompletion (key, keyChar, modifier);

-

-			var n = Tracker.Engine.Nodes.Peek ();

-			if (prevNode is RazorExpression && !(n is RazorExpression))

-				updateNeeded = true;

-			prevNode = n;

-

-			var state = Tracker.Engine.CurrentState;

-			int off = document.Editor.Caret.Offset;

-

-			char previousChar = off > 0 ? document.Editor.GetCharAt (off - 1) : ' ';

-			char beforePrevious = off > 1 ? document.Editor.GetCharAt (off - 2) : ' ';

-

-			// Determine completion context here, before calling base method to set the context correctly

-

-			// Rule out Razor comments, html, transition sign (@) and e-mail addresses

-			if (state is RazorCommentState || (previousChar != '@' && !(state is RazorState))  || keyChar == '@'

-				|| (previousChar == '@' && Char.IsLetterOrDigit (beforePrevious)))

-				return NonCSharpCompletion (key, keyChar, modifier);

-

-			// Determine if we are inside generics

-			if (previousChar == '<') {

-				var codeState = state as RazorCodeFragmentState;

-				if (codeState == null || !codeState.IsInsideGenerics)

-					return NonCSharpCompletion (key, keyChar, modifier);

-			}

-			// Determine whether we begin an html tag or generics

-			else if (keyChar == '<' && (n is XElement || !Char.IsLetterOrDigit (previousChar)))

-				return NonCSharpCompletion (key, keyChar, modifier);

-			// Determine whether we are inside html text or in code

-			else if (previousChar != '@' && n is XElement && !(state is RazorSpeculativeState) && !(state is RazorExpressionState))

-			    return NonCSharpCompletion (key, keyChar, modifier);

-

-			// We're in C# context

-			InitializeCodeCompletion ();

-			SwitchToHidden ();

-

-			bool result;

-			try {

-				result = base.KeyPress (key, keyChar, modifier);

-				if (/*EnableParameterInsight &&*/ (keyChar == ',' || keyChar == ')') && CanRunParameterCompletionCommand ())

-				    base.RunParameterCompletionCommand ();

-			} finally {

-				SwitchToReal ();

-			}

-

-			return result;

-		}

-

-		protected void SwitchToHidden ()

-		{

-			isInCSharpContext = true;

-			document = HiddenDoc;

-			CompletionWidget = completionBuilder.CreateCompletionWidget (defaultDocument, hiddenInfo);

-		}

-

-		protected void SwitchToReal ()

-		{

-			isInCSharpContext = false;

-			document = defaultDocument;

-			CompletionWidget = defaultCompletionWidget;

-		}

-

-		bool NonCSharpCompletion (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)

-		{

-			isInCSharpContext = false;

-			return base.KeyPress (key, keyChar, modifier);

-		}

-

-		protected void InitializeCodeCompletion ()

-		{

-			EnsureUnderlyingDocumentSet ();

-			hiddenInfo.OriginalCaretPosition = defaultDocument.Editor.Caret.Offset;

-			hiddenInfo.CaretPosition = CalculateCaretPosition ();

-			HiddenDoc.Editor.Caret.Offset = hiddenInfo.CaretPosition;

-		}

-

-		class CodeFragment

-		{

-			public int StartOffset { get; set; }

-			public int StartRealOffset { get; set; }

-			public int EndOffset { get; set; }

-

-			public CodeFragment ()

-			{}

-

-			public CodeFragment (int startOff, int startRealOff, int endOffset)

-			{

-				StartOffset = startOff;

-				StartRealOffset = startRealOff;

-				EndOffset = endOffset;

-			}

-		}

-

-		int GetDefaultPosition ()

-		{

-			var type = razorDocument.PageInfo.CSharpParsedFile.TopLevelTypeDefinitions.FirstOrDefault ();

-			if (type == null) {

-				return -1;

-			}

-			var method = type.Members.FirstOrDefault (m => m.Name == "Execute");

-			if (method == null) {

-				return -1;

-			}

-			return HiddenDoc.Editor.LocationToOffset (method.BodyRegion.Begin) + 1;

-		}

-

-		IDictionary<int, GeneratedCodeMapping> currentMappings;

-		CodeFragment codeFragment;

-

-		int CalculateCaretPosition ()

-		{

-			return CalculateCaretPosition (defaultDocument.Editor.Caret.Offset);

-		}

-

-		int CalculateCaretPosition (int currentOffset)

-		{

-			if (codeFragment != null) {

-				int diff = currentOffset - codeFragment.StartRealOffset;

-				int off = codeFragment.StartOffset + diff;

-				if (diff >= 0 && off <= codeFragment.EndOffset)

-					return off;

-			}

-

-			KeyValuePair<int, GeneratedCodeMapping> map;

-

-			var defaultPosition = GetDefaultPosition ();

-			if (defaultPosition < 0) {

-				defaultPosition = 0;

-			}

-

-			// If it's first line of code, create a default temp mapping, and use it until next reparse

-			if (currentMappings.Count == 0) {

-				string newLine = "\r\n#line 0 \r\n ";

-				HiddenDoc.Editor.Insert (defaultPosition, newLine);

-				map = new KeyValuePair<int, GeneratedCodeMapping> (0, new GeneratedCodeMapping (currentOffset - 1, 0, 0, 0, 0));

-				currentMappings.Add (map);

-			} else {

-				var result = currentMappings.Where (m => m.Value.StartOffset <= currentOffset);

-				if (!result.Any ())

-					return defaultPosition;

-				map = result.Last ();

-			}

-

-			string pattern = "#line " + map.Key + " ";

-			int pos = HiddenDoc.Editor.Document.IndexOf (pattern, 0, HiddenDoc.Editor.Document.TextLength, StringComparison.Ordinal);

-			if (pos == -1 || !map.Value.StartOffset.HasValue)

-				return defaultPosition;

-

-			int startRealOff = map.Value.StartOffset.Value;

-			int offDifference = currentOffset - (startRealOff + map.Value.CodeLength);

-			var line = HiddenDoc.Editor.Document.GetLineByOffset (pos);

-			int endHiddenOff = line.NextLine.Offset + map.Value.StartGeneratedColumn + map.Value.CodeLength;

-

-			int hiddenOff;

-

-			// If off is inside the map

-			if (offDifference <= 0) {

-				int delta = currentOffset - startRealOff;

-				hiddenOff = line.NextLine.Offset + map.Value.StartGeneratedColumn + delta - 1;

-				codeFragment = new CodeFragment (hiddenOff, currentOffset, endHiddenOff);

-			} else {

-				// It's a new code fragment - create a temp mapping, and use it until next reparse

-				int key = currentMappings.Last ().Key + 1;

-				string newLine = "\r\n#line " + key + " \r\n ";

-				int newOff = endHiddenOff;

-

-				if (HiddenDoc.Editor.GetCharAt (newOff) == '\n')

-					newOff++;

-

-				// We start a new mapping right after the preceding one, but need to include the difference

-				// between mapping's start and the current offset

-				HiddenDoc.Editor.Insert (newOff, newLine);

-				HiddenDoc.Editor.Insert (newOff + newLine.Length, new String (' ', offDifference) + " \r\n");

-

-				var newMap = new KeyValuePair<int, GeneratedCodeMapping> (key, new GeneratedCodeMapping (

-					startRealOff + map.Value.CodeLength, 0, 0, 0, offDifference));

-				currentMappings.Add (newMap);

-				hiddenOff = newOff + newLine.Length + offDifference;

-				codeFragment = new CodeFragment (newOff + newLine.Length, newMap.Value.StartOffset.Value,

-					newOff + newLine.Length + offDifference);

-			}

-

-			return hiddenOff;

-		}

-

-		public override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext,

-			char completionChar, ref int triggerWordLength)

-		{

-//			if (!EnableCodeCompletion)

-//				return null;

-

-			char previousChar = defaultDocument.Editor.Caret.Offset > 1 ? defaultDocument.Editor.GetCharAt (

-				defaultDocument.Editor.Caret.Offset - 2) : ' ';

-

-			// Don't show completion window when directive's name is being typed

-			var directive = Tracker.Engine.Nodes.Peek () as RazorDirective;

-			if (directive != null && !directive.FirstBracket.HasValue)

-				return null;

-

-			if (hiddenInfo != null && isInCSharpContext) {

-				var list = (CompletionDataList) completionBuilder.HandleCompletion (defaultDocument, completionContext,

-					hiddenInfo, completionChar, ref triggerWordLength);

-

-				if (list != null) {

-					//filter out the C# templates, many of them are not valid

-					int oldCount = list.Count;

-					list = FilterCSharpTemplates (list);

-					int templates = list.Count - oldCount;

-

-					if (previousChar == '@') {

-						RazorCompletion.AddAllRazorSymbols (list, razorDocument.PageInfo.HostKind);

-					}

-					if (templates > 0) {

-						AddFilteredRazorTemplates (list, previousChar == '@', true);

-					}

-				}

-				return list;

-			}

-

-			return base.HandleCodeCompletion (completionContext, completionChar, ref triggerWordLength);

-		}

-

-		//recreating the list is over 2x as fast as using remove operations, saves typically 10ms

-		static CompletionDataList FilterCSharpTemplates (CompletionDataList list)

-		{

-			var newList = new CompletionDataList () {

-				AutoCompleteEmptyMatch = list.AutoCompleteEmptyMatch,

-				AutoCompleteUniqueMatch = list.AutoCompleteUniqueMatch,

-				AutoSelect = list.AutoSelect,

-				CloseOnSquareBrackets = list.CloseOnSquareBrackets,

-				CompletionSelectionMode = list.CompletionSelectionMode,

-				DefaultCompletionString = list.DefaultCompletionString,

-				IsSorted = list.IsSorted,

-			};

-			foreach (var l in list) {

-				var c =  l as CompletionData;

-				if (c == null || (c.Icon.Name != "md-template" && c.Icon.Name != "md-template-surroundwith"))

-					newList.Add (c);

-			}

-			return newList;

-		}

-

-		static void AddFilteredRazorTemplates (CompletionDataList list, bool atTemplates, bool stripLeadingAt)

-		{

-			//add the razor templates then filter them based on whether we follow an @ char, so we don't have

-			//lots of duplicates

-			int count = list.Count;

-			MonoDevelop.Ide.CodeTemplates.CodeTemplateService.AddCompletionDataForMime ("text/x-cshtml", list);

-			for (int i = count; i < list.Count; i++) {

-				var d = (CompletionData) list[i];

-				if (atTemplates) {

-					if (d.CompletionText[0] != '@') {

-						list.RemoveAt (i);

-					} else if (stripLeadingAt) {

-						//avoid inserting a double-@, which would not expand correctly

-						d.CompletionText = d.CompletionText.Substring (1);

-					}

-				} else if (d.CompletionText[0] == '@') {

-					list.RemoveAt (i);

-				}

-			}

-		}

-

-		protected override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext,

-			bool forced, ref int triggerWordLength)

-		{

-//			if (!EnableCodeCompletion)

-//				return null;

-

-			var currentLocation = new TextLocation (completionContext.TriggerLine, completionContext.TriggerLineOffset);

-			char currentChar = completionContext.TriggerOffset < 1 ? ' ' : Buffer.GetCharAt (completionContext.TriggerOffset - 1);

-

-			var codeState = Tracker.Engine.CurrentState as RazorCodeFragmentState;

-			if (currentChar == '<' && codeState != null) {

-				if (!codeState.IsInsideParentheses && !codeState.IsInsideGenerics) {

-					var list = new CompletionDataList ();

-					GetElementCompletions (list);

-					return list;

-				}

-			} else if (currentChar == '>' && Tracker.Engine.CurrentState is RazorCodeFragmentState)

-				return ClosingTagCompletion (EditableBuffer, currentLocation);

-

-			return base.HandleCodeCompletion (completionContext, forced, ref triggerWordLength);

-		}

-

-		//we override to ensure we get parent element name even if there's a razor node in between

-		protected override void GetElementCompletions (CompletionDataList list)

-		{

-			var el = Tracker.Engine.Nodes.OfType<XElement> ().FirstOrDefault ();

-			var parentName = el == null ? new XName () : el.Name;

-

-			AddHtmlTagCompletionData (list, Schema, parentName);

-			AddMiscBeginTags (list);

-

-			//FIXME: don't show this after any elements

-			if (DocType == null)

-				list.Add ("!DOCTYPE", "md-literal", MonoDevelop.Core.GettextCatalog.GetString ("Document type"));

-		}

-

-		public override ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)

-		{

-			if (hiddenInfo != null && (isInCSharpContext || Tracker.Engine.CurrentState is RazorState)

-				&& !(Tracker.Engine.Nodes.Peek () is XElement)) {

-				InitializeCodeCompletion ();

-				return completionBuilder.HandlePopupCompletion (defaultDocument, hiddenInfo);

-			}

-

-			return base.CodeCompletionCommand (completionContext);

-		}

-

-		public override bool GetParameterCompletionCommandOffset (out int cpos)

-		{

-			if (hiddenInfo != null && isInCSharpContext)

-				return completionBuilder.GetParameterCompletionCommandOffset (defaultDocument, hiddenInfo, out cpos);

-

-			return base.GetParameterCompletionCommandOffset (out cpos);

-		}

-

-		public override int GetCurrentParameterIndex (int startOffset)

-		{

-			if (hiddenInfo != null && isInCSharpContext) {

-				return completionBuilder.GetCurrentParameterIndex (defaultDocument, hiddenInfo, startOffset);

-			}

-

-			return base.GetCurrentParameterIndex (startOffset);

-		}

-

-		public override ParameterDataProvider HandleParameterCompletion (CodeCompletionContext completionContext,

-			char completionChar)

-		{

-			if (hiddenInfo != null && isInCSharpContext) {

-				return completionBuilder.HandleParameterCompletion (defaultDocument, completionContext,

-					hiddenInfo, completionChar);

-			}

-

-			return base.HandleParameterCompletion (completionContext, completionChar);

-		}

-

-		#endregion

-

-		#region Document outline

-

-		protected override void RefillOutlineStore (ParsedDocument doc, Gtk.TreeStore store)

-		{

-			var htmlRoot = razorDocument.PageInfo.HtmlRoot;

-			var razorRoot = razorDocument.PageInfo.RazorRoot;

-			var blocks = new List<Block> ();

-			GetBlocks (razorRoot, blocks);

-			BuildTreeChildren (store, Gtk.TreeIter.Zero, htmlRoot, blocks);

-		}

-

-		void GetBlocks (Block root, IList<Block> blocks)

-		{

-			foreach (var block in root.Children.Where (n => n.IsBlock).Select (n => n as Block)) {

-				if (block.Type != BlockType.Markup)

-					blocks.Add (block);

-				if (block.Type != BlockType.Helper)

-					GetBlocks (block, blocks);

-			}

-		}

-

-		protected override void InitializeOutlineColumns (MonoDevelop.Ide.Gui.Components.PadTreeView outlineTree)

-		{

-			outlineTree.TextRenderer.Xpad = 0;

-			outlineTree.TextRenderer.Ypad = 0;

-			outlineTree.AppendColumn ("OutlineNode", outlineTree.TextRenderer, new Gtk.TreeCellDataFunc (OutlineTreeDataFunc));

-		}

-

-		protected override void OutlineSelectionChanged (object selection)

-		{

-			SelectNode ((RazorOutlineNode)selection);

-		}

-

-		void BuildTreeChildren (Gtk.TreeStore store, Gtk.TreeIter parent, XContainer p, IList<Block> blocks)

-		{

-			foreach (XNode node in p.Nodes) {

-				var el = node as XElement;

-				if (el == null) {

-					var startLoc = node.Region.Begin;

-					var endLoc = node.Region.End;

-					var doc = defaultDocument.Editor.Document;

-

-					var blocksBetween = blocks.Where (n => n.Start.AbsoluteIndex >= doc.GetOffset (startLoc)

-						&& n.Start.AbsoluteIndex <= doc.GetOffset (endLoc));

-

-					foreach (var block in blocksBetween) {

-						var outlineNode = new RazorOutlineNode (block) {

-							Location = new DomRegion (doc.OffsetToLocation (block.Start.AbsoluteIndex),

-								doc.OffsetToLocation (block.Start.AbsoluteIndex + block.Length))

-						};

-						if (!parent.Equals (Gtk.TreeIter.Zero))

-							store.AppendValues (parent, outlineNode);

-						else

-							store.AppendValues (outlineNode);

-					}

-					continue;

-				}

-

-				Gtk.TreeIter childIter;

-				if (!parent.Equals (Gtk.TreeIter.Zero))

-					childIter = store.AppendValues (parent, new RazorOutlineNode(el));

-				else

-					childIter = store.AppendValues (new RazorOutlineNode(el));

-

-				BuildTreeChildren (store, childIter, el, blocks);

-			}

-		}

-

-		void OutlineTreeDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)

-		{

-			Gtk.CellRendererText txtRenderer = (Gtk.CellRendererText)cell;

-			RazorOutlineNode n = (RazorOutlineNode)model.GetValue (iter, 0);

-			txtRenderer.Text = n.Name;

-		}

-

-		void SelectNode (RazorOutlineNode n)

-		{

-			EditorSelect (n.Location);

-		}

-

-		#endregion

-	}

-}

+//
+// RazorCSharpEditorExtension.cs
+//
+// Author:
+//		Piotr Dowgiallo <sparekd@gmail.com>
+//
+// Copyright (c) 2012 Piotr Dowgiallo
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web.Razor.Generator;
+using System.Web.Razor.Parser.SyntaxTree;
+using Mono.TextEditor;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Xml.Dom;
+using MonoDevelop.Xml.Parser;
+using MonoDevelop.AspNet.Html;
+using MonoDevelop.AspNet.Razor.Dom;
+using MonoDevelop.AspNet.Razor.Parser;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace MonoDevelop.AspNet.Razor
+{
+	public class RazorCSharpEditorExtension : BaseHtmlEditorExtension
+	{
+		protected RazorCSharpParsedDocument razorDocument;
+		internal UnderlyingDocumentInfo hiddenInfo;
+		IRazorCompletionBuilder completionBuilder;
+
+		bool isInCSharpContext;
+		static readonly Regex DocTypeRegex = new Regex (@"(?:PUBLIC|public)\s+""(?<fpi>[^""]*)""\s+""(?<uri>[^""]*)""");
+
+		ICompletionWidget defaultCompletionWidget;
+		MonoDevelop.Ide.Editor.TextEditor defaultEditor;
+		DocumentContext defaultDocumentContext;
+
+		RazorSyntaxMode syntaxMode;
+
+		UnderlyingDocument HiddenDoc {
+			get { return hiddenInfo.UnderlyingDocument; }
+		}
+
+		RazorPageInfo PageInfo {
+			get { return razorDocument.PageInfo; }
+		}
+
+		protected override XmlRootState CreateRootState ()
+		{
+			return new RazorRootState ();
+		}
+
+		public override string CompletionLanguage {
+			get {
+				return "Razor";
+			}
+		}
+
+		public RazorCSharpEditorExtension ()
+		{
+		}
+
+		/// <summary>
+		/// Used by unit tests.
+		/// </summary>
+		internal RazorCSharpEditorExtension (MonoDevelop.Ide.Gui.Document doc, RazorCSharpParsedDocument parsedDoc, bool cSharpContext)
+		{
+			razorDocument = parsedDoc;
+			Initialize (doc.Editor, doc);
+			if (cSharpContext) {
+				InitializeCodeCompletion ();
+				SwitchToHidden ();
+			}
+		}
+
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+
+			defaultCompletionWidget = CompletionWidget;
+			defaultDocumentContext = DocumentContext;
+			defaultEditor = Editor;
+			completionBuilder = RazorCompletionBuilderService.GetBuilder ("C#");
+
+			defaultEditor.TextChanging += UnderlyingDocument_TextReplacing;
+			syntaxMode = new RazorSyntaxMode (DocumentContext);
+			var textEditorData = DocumentContext.GetContent<TextEditorData> ();
+			if (textEditorData != null)
+				textEditorData.Document.SyntaxMode = syntaxMode;
+		}
+
+		public override void Dispose ()
+		{
+			if (syntaxMode != null) {
+				var textEditorData = DocumentContext.GetContent<TextEditorData> ();
+				if (textEditorData != null)
+					textEditorData.Document.SyntaxMode = null;
+				syntaxMode.Dispose ();
+				syntaxMode = null;
+			}
+			defaultEditor.TextChanging -= UnderlyingDocument_TextReplacing;
+			base.Dispose ();
+		}
+
+		// Handles text modifications in hidden document
+		void UnderlyingDocument_TextReplacing (object sender, TextChangeEventArgs e)
+		{
+			if (razorDocument == null)
+				return;
+
+			EnsureUnderlyingDocumentSet ();
+			int off = CalculateCaretPosition (e.Offset);
+
+			if (e.RemovalLength > 0) {
+				int removalLength = e.RemovalLength;
+				if (off + removalLength > HiddenDoc.Editor.Length)
+					removalLength = HiddenDoc.Editor.Length - off;
+				HiddenDoc.Editor.RemoveText (off, removalLength);
+			}
+			if (e.InsertionLength > 0) {
+				if (isInCSharpContext) {
+					HiddenDoc.Editor.InsertText (off, e.InsertedText.Text);
+					HiddenDoc.HiddenAnalysisDocument = HiddenDoc.HiddenAnalysisDocument.WithText (Microsoft.CodeAnalysis.Text.SourceText.From (HiddenDoc.Editor.Text));
+				} else // Insert spaces to correctly calculate offsets until next reparse
+					HiddenDoc.Editor.InsertText (off, new String (' ', e.InsertionLength));
+			}
+			if (codeFragment != null)
+				codeFragment.EndOffset += (e.InsertionLength - e.RemovalLength);
+		}
+
+		protected override void OnParsedDocumentUpdated ()
+		{
+			base.OnParsedDocumentUpdated ();
+			try {
+				razorDocument = CU as RazorCSharpParsedDocument;
+				if (razorDocument == null || razorDocument.PageInfo.CSharpSyntaxTree == null)
+					return;
+
+				CreateDocType ();
+
+				// Don't update C# code in hiddenInfo when:
+				// 1) We are in a RazorState, and the completion window is visible,
+				// it'll freeze (or disappear if we call OnCompletionContextChanged).
+				// 2) We're in the middle of writing a Razor expression - if we're in an incorrect state,
+				// the generated code migh be behind what we've been already written.
+
+				var state = Tracker.Engine.CurrentState;
+				if (state is RazorState && CompletionWindowManager.IsVisible || 
+				    (!updateNeeded && (state is RazorSpeculativeState || state is RazorExpressionState)))
+					UpdateHiddenDocument (false);
+				else {
+					UpdateHiddenDocument ();
+					updateNeeded = false;
+				}
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while updating razor completion.", e); 
+			}
+		}
+
+		void CreateDocType ()
+		{
+			DocType = new XDocType (MonoDevelop.Ide.Editor.DocumentLocation.Empty);
+			var matches = DocTypeRegex.Match (razorDocument.PageInfo.DocType);
+			if (matches.Success) {
+				DocType.PublicFpi = matches.Groups ["fpi"].Value;
+				DocType.Uri = matches.Groups ["uri"].Value;
+			}
+		}
+
+		void EnsureUnderlyingDocumentSet ()
+		{
+			if (hiddenInfo == null)
+				UpdateHiddenDocument ();
+		}
+
+		void UpdateHiddenDocument (bool updateSourceCode = true)
+		{
+			if (!updateSourceCode && hiddenInfo != null) {
+				hiddenInfo.UnderlyingDocument.HiddenParsedDocument = razorDocument.PageInfo.ParsedDocument;
+				return;
+			} else if (updateSourceCode && hiddenInfo != null) {
+				hiddenInfo.UnderlyingDocument.Editor.Text = razorDocument.PageInfo.CSharpCode;
+				hiddenInfo.UnderlyingDocument.HiddenParsedDocument = razorDocument.PageInfo.ParsedDocument;
+				hiddenInfo.UnderlyingDocument.HiddenAnalysisDocument = razorDocument.PageInfo.AnalysisDocument;
+				currentMappings = razorDocument.PageInfo.GeneratorResults.DesignTimeLineMappings;
+				codeFragment = null;
+				return;
+			}
+
+			hiddenInfo = new UnderlyingDocumentInfo ();
+
+			var viewContent = new HiddenTextEditorViewContent ();
+			viewContent.Project = DocumentContext.Project;
+			viewContent.ContentName = "Generated.cs"; // Use a name with .cs extension to get csharp ambience
+			viewContent.Text = razorDocument.PageInfo.CSharpCode;
+
+			var workbenchWindow = new HiddenWorkbenchWindow ();
+			workbenchWindow.ViewContent = viewContent;
+			hiddenInfo.UnderlyingDocument = new UnderlyingDocument (workbenchWindow) {
+				HiddenParsedDocument = razorDocument.PageInfo.ParsedDocument,
+				HiddenAnalysisDocument = razorDocument.PageInfo.AnalysisDocument
+			};
+
+			// completion window needs this
+			Gtk.Widget editor = hiddenInfo.UnderlyingDocument.Editor;
+			editor.Parent = ((Gtk.Widget)Editor).Parent;
+
+			currentMappings = razorDocument.PageInfo.GeneratorResults.DesignTimeLineMappings;
+			codeFragment = null;
+		}
+
+		#region Code completion
+
+		XObject prevNode;
+		bool updateNeeded;
+
+		public override bool KeyPress (KeyDescriptor descriptor)
+		{
+			Tracker.UpdateEngine ();
+			if (razorDocument == null)
+				return NonCSharpCompletion (descriptor);
+
+			var n = Tracker.Engine.Nodes.Peek ();
+			if (prevNode is RazorExpression && !(n is RazorExpression))
+				updateNeeded = true;
+			prevNode = n;
+			var state = Tracker.Engine.CurrentState;
+			int off = Editor.CaretOffset;
+
+			char previousChar = off > 0 ? Editor.GetCharAt (off - 1) : ' ';
+			char beforePrevious = off > 1 ? Editor.GetCharAt (off - 2) : ' ';
+
+			// Determine completion context here, before calling base method to set the context correctly
+
+			// Rule out Razor comments, html, transition sign (@) and e-mail addresses
+			if (state is RazorCommentState || (previousChar != '@' && !(state is RazorState))  || descriptor.KeyChar == '@'
+				|| (previousChar == '@' && Char.IsLetterOrDigit (beforePrevious)))
+				return NonCSharpCompletion (descriptor);
+
+			// Determine if we are inside generics
+			if (previousChar == '<') {
+				var codeState = state as RazorCodeFragmentState;
+				if (codeState == null || !codeState.IsInsideGenerics)
+					return NonCSharpCompletion (descriptor);
+			}
+			// Determine whether we begin an html tag or generics
+			else if (descriptor.KeyChar == '<' && (n is XElement || !Char.IsLetterOrDigit (previousChar)))
+				return NonCSharpCompletion (descriptor);
+			// Determine whether we are inside html text or in code
+			else if (previousChar != '@' && n is XElement && !(state is RazorSpeculativeState) && !(state is RazorExpressionState))
+				return NonCSharpCompletion (descriptor);
+
+			// We're in C# context
+			InitializeCodeCompletion ();
+			SwitchToHidden ();
+
+			bool result;
+			try {
+				result = base.KeyPress (descriptor);
+				if (/*EnableParameterInsight &&*/ (descriptor.KeyChar == ',' || descriptor.KeyChar == ')') && CanRunParameterCompletionCommand ())
+				    base.RunParameterCompletionCommand ();
+			} finally {
+				SwitchToReal ();
+			}
+
+			return result;
+		}
+
+		protected void SwitchToHidden ()
+		{
+			isInCSharpContext = true;
+			DocumentContext = HiddenDoc;
+			Editor = HiddenDoc.Editor;
+			CompletionWidget = completionBuilder.CreateCompletionWidget (defaultEditor, defaultDocumentContext, hiddenInfo);
+		}
+
+		protected void SwitchToReal ()
+		{
+			isInCSharpContext = false;
+			DocumentContext = defaultDocumentContext;
+			Editor = defaultEditor;
+			CompletionWidget = defaultCompletionWidget;
+		}
+
+		bool NonCSharpCompletion (KeyDescriptor descriptor)
+		{
+			isInCSharpContext = false;
+			return base.KeyPress (descriptor);
+		}
+
+		protected void InitializeCodeCompletion ()
+		{
+			EnsureUnderlyingDocumentSet ();
+			hiddenInfo.OriginalCaretPosition = defaultEditor.CaretOffset;
+			hiddenInfo.CaretPosition = CalculateCaretPosition ();
+			HiddenDoc.Editor.CaretOffset = hiddenInfo.CaretPosition;
+		}
+
+		class CodeFragment
+		{
+			public int StartOffset { get; set; }
+			public int StartRealOffset { get; set; }
+			public int EndOffset { get; set; }
+
+			public CodeFragment ()
+			{}
+
+			public CodeFragment (int startOff, int startRealOff, int endOffset)
+			{
+				StartOffset = startOff;
+				StartRealOffset = startRealOff;
+				EndOffset = endOffset;
+			}
+		}
+
+		int GetDefaultPosition ()
+		{
+			var root = razorDocument.PageInfo.CSharpSyntaxTree?.GetRoot ();
+			if (root == null)
+				return -1;
+
+			var type = root.DescendantNodes ().OfType<TypeDeclarationSyntax> ().FirstOrDefault ();
+			if (type == null) {
+				return -1;
+			}
+			var method = type.DescendantNodes ()
+				.OfType <MethodDeclarationSyntax> ()
+				.FirstOrDefault (m => m.Identifier.ValueText == "Execute");
+			if (method == null) {
+				return -1;
+			}
+			var location = method.Body.GetLocation ();
+			return location.SourceSpan.Start + 1;
+		}
+
+		IDictionary<int, GeneratedCodeMapping> currentMappings;
+		CodeFragment codeFragment;
+
+		int CalculateCaretPosition ()
+		{
+			return CalculateCaretPosition (defaultEditor.CaretOffset);
+		}
+
+		int CalculateCaretPosition (int currentOffset)
+		{
+			if (codeFragment != null) {
+				int diff = currentOffset - codeFragment.StartRealOffset;
+				int off = codeFragment.StartOffset + diff;
+				if (diff >= 0 && off <= codeFragment.EndOffset)
+					return off;
+			}
+
+			KeyValuePair<int, GeneratedCodeMapping> map;
+
+			var defaultPosition = GetDefaultPosition ();
+			if (defaultPosition < 0) {
+				defaultPosition = 0;
+			}
+
+			// If it's first line of code, create a default temp mapping, and use it until next reparse
+			if (currentMappings.Count == 0) {
+				string newLine = "\r\n#line 0 \r\n ";
+				HiddenDoc.Editor.InsertText (defaultPosition, newLine);
+				map = new KeyValuePair<int, GeneratedCodeMapping> (0, new GeneratedCodeMapping (currentOffset - 1, 0, 0, 0, 0));
+				currentMappings.Add (map);
+			} else {
+				var result = currentMappings.Where (m => m.Value.StartOffset <= currentOffset);
+				if (!result.Any ())
+					return defaultPosition;
+				map = result.Last ();
+			}
+
+			string pattern = "#line " + map.Key + " ";
+			int pos = HiddenDoc.Editor.Text.IndexOf (pattern, 0, HiddenDoc.Editor.Length, StringComparison.Ordinal);
+			if (pos == -1 || !map.Value.StartOffset.HasValue)
+				return defaultPosition;
+
+			int startRealOff = map.Value.StartOffset.Value;
+			int offDifference = currentOffset - (startRealOff + map.Value.CodeLength);
+			var line = HiddenDoc.Editor.GetLineByOffset (pos);
+			int endHiddenOff = line.NextLine.Offset + map.Value.StartGeneratedColumn + map.Value.CodeLength;
+
+			int hiddenOff;
+
+			// If off is inside the map
+			if (offDifference <= 0) {
+				int delta = currentOffset - startRealOff;
+				hiddenOff = line.NextLine.Offset + map.Value.StartGeneratedColumn + delta - 1;
+				codeFragment = new CodeFragment (hiddenOff, currentOffset, endHiddenOff);
+			} else {
+				// It's a new code fragment - create a temp mapping, and use it until next reparse
+				int key = currentMappings.Last ().Key + 1;
+				string newLine = "\r\n#line " + key + " \r\n ";
+				int newOff = endHiddenOff;
+
+				if (HiddenDoc.Editor.GetCharAt (newOff) == '\n')
+					newOff++;
+
+				// We start a new mapping right after the preceding one, but need to include the difference
+				// between mapping's start and the current offset
+				HiddenDoc.Editor.InsertText (newOff, newLine);
+				HiddenDoc.Editor.InsertText (newOff + newLine.Length, new String (' ', offDifference) + " \r\n");
+
+				var newMap = new KeyValuePair<int, GeneratedCodeMapping> (key, new GeneratedCodeMapping (
+					startRealOff + map.Value.CodeLength, 0, 0, 0, offDifference));
+				currentMappings.Add (newMap);
+				hiddenOff = newOff + newLine.Length + offDifference;
+				codeFragment = new CodeFragment (newOff + newLine.Length, newMap.Value.StartOffset.Value,
+					newOff + newLine.Length + offDifference);
+			}
+
+			return hiddenOff;
+		}
+
+		public override async System.Threading.Tasks.Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, System.Threading.CancellationToken token)
+		{
+			char previousChar = defaultEditor.CaretOffset > 1 ? defaultEditor.GetCharAt (
+				defaultEditor.CaretOffset - 2) : ' ';
+
+			// Don't show completion window when directive's name is being typed
+			var directive = Tracker.Engine.Nodes.Peek () as RazorDirective;
+			if (directive != null && !directive.FirstBracket.HasValue)
+				return null;
+
+			if (hiddenInfo != null && isInCSharpContext) {
+				var list = (CompletionDataList) await completionBuilder.HandleCompletion (defaultEditor, defaultDocumentContext, completionContext,
+					hiddenInfo, completionChar, token);
+
+				if (list != null) {
+					//filter out the C# templates, many of them are not valid
+					int oldCount = list.Count;
+					list = FilterCSharpTemplates (list);
+					int templates = list.Count - oldCount;
+
+					if (previousChar == '@') {
+						RazorCompletion.AddAllRazorSymbols (list, razorDocument.PageInfo.HostKind);
+					}
+					if (templates > 0) {
+						AddFilteredRazorTemplates (list, previousChar == '@', true);
+					}
+				}
+				return list;
+			}
+
+			return await base.HandleCodeCompletionAsync (completionContext, completionChar, token);
+		}
+
+		//recreating the list is over 2x as fast as using remove operations, saves typically 10ms
+		static CompletionDataList FilterCSharpTemplates (CompletionDataList list)
+		{
+			var newList = new CompletionDataList () {
+				AutoCompleteEmptyMatch = list.AutoCompleteEmptyMatch,
+				AutoCompleteUniqueMatch = list.AutoCompleteUniqueMatch,
+				AutoSelect = list.AutoSelect,
+				CloseOnSquareBrackets = list.CloseOnSquareBrackets,
+				CompletionSelectionMode = list.CompletionSelectionMode,
+				DefaultCompletionString = list.DefaultCompletionString,
+				IsSorted = list.IsSorted,
+				TriggerWordLength = list.TriggerWordLength
+			};
+			foreach (var l in list) {
+				var c =  l as CompletionData;
+				if (c == null || (c.Icon.Name != "md-template" && c.Icon.Name != "md-template-surroundwith"))
+					newList.Add (c);
+			}
+			return newList;
+		}
+
+		static void AddFilteredRazorTemplates (CompletionDataList list, bool atTemplates, bool stripLeadingAt)
+		{
+			//add the razor templates then filter them based on whether we follow an @ char, so we don't have
+			//lots of duplicates
+			int count = list.Count;
+			MonoDevelop.Ide.CodeTemplates.CodeTemplateService.AddCompletionDataForMime ("text/x-cshtml", list);
+			for (int i = count; i < list.Count; i++) {
+				var d = (CompletionData) list[i];
+				if (atTemplates) {
+					if (d.CompletionText[0] != '@') {
+						list.RemoveAt (i);
+					} else if (stripLeadingAt) {
+						//avoid inserting a double-@, which would not expand correctly
+						d.CompletionText = d.CompletionText.Substring (1);
+					}
+				} else if (d.CompletionText[0] == '@') {
+					list.RemoveAt (i);
+				}
+			}
+		}
+
+		protected override async Task<ICompletionDataList> HandleCodeCompletion (
+			CodeCompletionContext completionContext, bool forced, CancellationToken token)
+		{
+			var currentLocation = new MonoDevelop.Ide.Editor.DocumentLocation (completionContext.TriggerLine, completionContext.TriggerLineOffset);
+			char currentChar = completionContext.TriggerOffset < 1 ? ' ' : Editor.GetCharAt (completionContext.TriggerOffset - 1);
+
+			var codeState = Tracker.Engine.CurrentState as RazorCodeFragmentState;
+			if (currentChar == '<' && codeState != null) {
+				if (!codeState.IsInsideParentheses && !codeState.IsInsideGenerics) {
+					var list = await GetElementCompletions (token);
+					return list;
+				}
+			} else if (currentChar == '>' && Tracker.Engine.CurrentState is RazorCodeFragmentState)
+				return ClosingTagCompletion (Editor, currentLocation);
+
+			return await base.HandleCodeCompletion (completionContext, forced, token);
+		}
+
+		//we override to ensure we get parent element name even if there's a razor node in between
+		protected override async Task<CompletionDataList> GetElementCompletions (CancellationToken token)
+		{
+			var list = new CompletionDataList ();
+			var el = Tracker.Engine.Nodes.OfType<XElement> ().FirstOrDefault ();
+			var parentName = el == null ? new XName () : el.Name;
+
+			await AddHtmlTagCompletionData (list, Schema, parentName, token);
+			AddMiscBeginTags (list);
+
+			//FIXME: don't show this after any elements
+			if (DocType == null)
+				list.Add ("!DOCTYPE", "md-literal", MonoDevelop.Core.GettextCatalog.GetString ("Document type"));
+			return list;
+		}
+
+		public override Task<ICompletionDataList> CodeCompletionCommand (CodeCompletionContext completionContext)
+		{
+			if (hiddenInfo != null && (isInCSharpContext || Tracker.Engine.CurrentState is RazorState)
+				&& !(Tracker.Engine.Nodes.Peek () is XElement)) {
+				InitializeCodeCompletion ();
+				return completionBuilder.HandlePopupCompletion (defaultEditor, defaultDocumentContext, hiddenInfo);
+			}
+
+			return base.CodeCompletionCommand (completionContext);
+		}
+		/*
+		public override bool GetParameterCompletionCommandOffset (out int cpos)
+		{
+			if (hiddenInfo != null && isInCSharpContext)
+				return completionBuilder.GetParameterCompletionCommandOffset (defaultEditor, defaultDocumentContext, hiddenInfo, out cpos);
+
+			return base.GetParameterCompletionCommandOffset (out cpos);
+		}*/
+		public override Task<int> GetCurrentParameterIndex (int startOffset, CancellationToken token)
+		{
+			if (hiddenInfo != null && isInCSharpContext) {
+				return completionBuilder.GetCurrentParameterIndex (defaultEditor, defaultDocumentContext, hiddenInfo, startOffset);
+			}
+
+			return base.GetCurrentParameterIndex (startOffset, token);
+		}
+
+		public override Task<MonoDevelop.Ide.CodeCompletion.ParameterHintingResult> HandleParameterCompletionAsync (
+			CodeCompletionContext completionContext, char completionChar, CancellationToken token)
+		{
+			if (hiddenInfo != null && isInCSharpContext) {
+				return completionBuilder.HandleParameterCompletion (defaultEditor, defaultDocumentContext, completionContext,
+					hiddenInfo, completionChar);
+			}
+
+			return base.HandleParameterCompletionAsync (completionContext, completionChar, token);
+		}
+
+		#endregion
+
+		#region Document outline
+
+		protected override void RefillOutlineStore (ParsedDocument doc, Gtk.TreeStore store)
+		{
+			var htmlRoot = razorDocument.PageInfo.HtmlRoot;
+			var razorRoot = razorDocument.PageInfo.RazorRoot;
+			var blocks = new List<Block> ();
+			GetBlocks (razorRoot, blocks);
+			BuildTreeChildren (store, Gtk.TreeIter.Zero, htmlRoot, blocks);
+		}
+
+		void GetBlocks (Block root, IList<Block> blocks)
+		{
+			foreach (var block in root.Children.Where (n => n.IsBlock).Select (n => n as Block)) {
+				if (block.Type != BlockType.Markup)
+					blocks.Add (block);
+				if (block.Type != BlockType.Helper)
+					GetBlocks (block, blocks);
+			}
+		}
+
+		protected override void InitializeOutlineColumns (MonoDevelop.Ide.Gui.Components.PadTreeView outlineTree)
+		{
+			outlineTree.TextRenderer.Xpad = 0;
+			outlineTree.TextRenderer.Ypad = 0;
+			outlineTree.AppendColumn ("OutlineNode", outlineTree.TextRenderer, new Gtk.TreeCellDataFunc (OutlineTreeDataFunc));
+		}
+
+		protected override void OutlineSelectionChanged (object selection)
+		{
+			SelectNode ((RazorOutlineNode)selection);
+		}
+
+		void BuildTreeChildren (Gtk.TreeStore store, Gtk.TreeIter parent, XContainer p, IList<Block> blocks)
+		{
+			foreach (XNode node in p.Nodes) {
+				var el = node as XElement;
+				if (el == null) {
+					var startLoc = node.Region.Begin;
+					var endLoc = node.Region.End;
+					var doc = defaultEditor;
+
+					var blocksBetween = blocks.Where (n => n.Start.AbsoluteIndex >= doc.LocationToOffset (startLoc.Line, startLoc.Column)
+						&& n.Start.AbsoluteIndex <= doc.LocationToOffset (endLoc.Line, endLoc.Column));
+
+					foreach (var block in blocksBetween) {
+						var outlineNode = new RazorOutlineNode (block) {
+							Location = new MonoDevelop.Ide.Editor.DocumentRegion (doc.OffsetToLocation (block.Start.AbsoluteIndex),
+								doc.OffsetToLocation (block.Start.AbsoluteIndex + block.Length))
+						};
+						if (!parent.Equals (Gtk.TreeIter.Zero))
+							store.AppendValues (parent, outlineNode);
+						else
+							store.AppendValues (outlineNode);
+					}
+					continue;
+				}
+
+				Gtk.TreeIter childIter;
+				if (!parent.Equals (Gtk.TreeIter.Zero))
+					childIter = store.AppendValues (parent, new RazorOutlineNode(el));
+				else
+					childIter = store.AppendValues (new RazorOutlineNode(el));
+
+				BuildTreeChildren (store, childIter, el, blocks);
+			}
+		}
+
+		void OutlineTreeDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+		{
+			Gtk.CellRendererText txtRenderer = (Gtk.CellRendererText)cell;
+			RazorOutlineNode n = (RazorOutlineNode)model.GetValue (iter, 0);
+			txtRenderer.Text = n.Name;
+		}
+
+		void SelectNode (RazorOutlineNode n)
+		{
+			EditorSelect (n.Location);
+		}
+
+		#endregion
+	}
+}
diff --git a/main/src/addins/AspNet/Razor/RazorCSharpFormatter.cs b/main/src/addins/AspNet/Razor/RazorCSharpFormatter.cs
index 560408db69..4baecea24f 100644
--- a/main/src/addins/AspNet/Razor/RazorCSharpFormatter.cs
+++ b/main/src/addins/AspNet/Razor/RazorCSharpFormatter.cs
@@ -1,53 +1,54 @@
-//

-// RazorCSharpCodeFormatter.cs

-//

-// Author:

-//		Piotr Dowgiallo <sparekd@gmail.com>

-//

-// Copyright (c) 2012 Piotr Dowgiallo

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

-using System.Collections.Generic;

-using MonoDevelop.Ide.CodeFormatting;

-using MonoDevelop.Projects.Policies;

-

-namespace MonoDevelop.AspNet.Razor

-{

-	public class RazorCSharpFormatter : AbstractAdvancedFormatter

-	{

-		public override bool SupportsOnTheFlyFormatting { get { return true; } }

-		public override bool SupportsCorrectingIndent { get { return true; } }

-

-		public override void CorrectIndenting (PolicyContainer policyParent,

-			IEnumerable<string> mimeTypeChain, Mono.TextEditor.TextEditorData data, int line)

-		{

-		}

-

-		public override string FormatText (PolicyContainer policyParent,

-			IEnumerable<string> mimeTypeChain, string input, int startOffset, int endOffset)

-		{

-			return null;

-		}

-

-		public override void OnTheFlyFormat (Ide.Gui.Document doc, int startOffset, int endOffset)

-		{

-		}

-	}

-}

+//
+// RazorCSharpCodeFormatter.cs
+//
+// Author:
+//		Piotr Dowgiallo <sparekd@gmail.com>
+//
+// Copyright (c) 2012 Piotr Dowgiallo
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using MonoDevelop.Ide.CodeFormatting;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Projects.Policies;
+
+namespace MonoDevelop.AspNet.Razor
+{
+	public class RazorCSharpFormatter : AbstractCodeFormatter
+	{
+		public override bool SupportsOnTheFlyFormatting { get { return true; } }
+		public override bool SupportsCorrectingIndent { get { return true; } }
+		public override bool SupportsPartialDocumentFormatting { get { return true; } }
+
+		protected override void CorrectIndentingImplementation (PolicyContainer policyParent, TextEditor editor, int line)
+		{
+		}
+
+		protected override Core.Text.ITextSource FormatImplementation (PolicyContainer policyParent, string mimeType, Core.Text.ITextSource input, int startOffset, int length)
+		{
+			return input.CreateSnapshot (startOffset, length);
+        }
+
+		protected override void OnTheFlyFormatImplementation (TextEditor editor, DocumentContext context, int startOffset, int length)
+		{
+		}
+
+	}
+}
diff --git a/main/src/addins/AspNet/Razor/RazorCSharpParsedDocument.cs b/main/src/addins/AspNet/Razor/RazorCSharpParsedDocument.cs
index 3cac236d41..28b287fed5 100644
--- a/main/src/addins/AspNet/Razor/RazorCSharpParsedDocument.cs
+++ b/main/src/addins/AspNet/Razor/RazorCSharpParsedDocument.cs
@@ -26,6 +26,7 @@
 

 using System.Collections.Generic;

 using MonoDevelop.Ide.TypeSystem;

+using System.Linq;

 

 namespace MonoDevelop.AspNet.Razor

 {

@@ -38,10 +39,15 @@ namespace MonoDevelop.AspNet.Razor
 			PageInfo = pageInfo;

 			Flags |= ParsedDocumentFlags.NonSerializable;

 			if (PageInfo.Errors != null)

-				Add (PageInfo.Errors);

+				AddRange (PageInfo.Errors);

 		}

 

-		public override IEnumerable<FoldingRegion> Foldings	{

+		public override System.Threading.Tasks.Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (System.Threading.CancellationToken cancellationToken)

+		{

+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<FoldingRegion>)Foldings.ToList ());

+		}

+

+		public IEnumerable<FoldingRegion> Foldings	{

 			get	{

 				if (PageInfo.FoldingRegions != null) {

 					foreach (var region in PageInfo.FoldingRegions) {

diff --git a/main/src/addins/AspNet/Razor/RazorCSharpParser.cs b/main/src/addins/AspNet/Razor/RazorCSharpParser.cs
index d83d2c002e..2c20cd3d30 100644
--- a/main/src/addins/AspNet/Razor/RazorCSharpParser.cs
+++ b/main/src/addins/AspNet/Razor/RazorCSharpParser.cs
@@ -40,10 +40,6 @@ using System.Web.Razor.Text;
 using System.Web.WebPages.Razor;
 using System.Web.WebPages.Razor.Configuration;
 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-
-using Mono.TextEditor;
 
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
@@ -53,149 +49,189 @@ using MonoDevelop.Projects;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Parser;
 using MonoDevelop.AspNet.Razor.Parser;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AspNet.Razor
 {
 	public class RazorCSharpParser : TypeSystemParser
 	{
-		MonoDevelop.Web.Razor.EditorParserFixed.RazorEditorParser editorParser;
-		DocumentParseCompleteEventArgs capturedArgs;
-		AutoResetEvent parseComplete;
-		ChangeInfo lastChange;
-		string lastParsedFile;
-		TextDocument currentDocument;
-		AspNetAppProject aspProject;
-		DotNetProject project;
-		IList<TextDocument> openDocuments;
-
-		public IList<TextDocument> OpenDocuments { get { return openDocuments; } }
+		IList<OpenRazorDocument> openDocuments;
+		IList<OpenRazorDocument> documentsPendingDispose;
+
+		internal IList<OpenRazorDocument> OpenDocuments { get { return openDocuments; } }
 
 		public RazorCSharpParser ()
 		{
-			openDocuments = new List<TextDocument> ();
+			openDocuments = new List<OpenRazorDocument> ();
+			documentsPendingDispose = new List<OpenRazorDocument> ();
 
 			IdeApp.Exited += delegate {
 				//HACK: workaround for Mono's not shutting downs IsBackground threads in WaitAny calls
-				if (editorParser != null) {
-					DisposeCurrentParser ();
-				}
+				DisposeDocuments (documentsPendingDispose);
+				DisposeDocuments (openDocuments);
 			};
 		}
 
-		public override ParsedDocument Parse (bool storeAst, string fileName, System.IO.TextReader content, Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (MonoDevelop.Ide.TypeSystem.ParseOptions parseOptions, CancellationToken cancellationToken)
 		{
-			currentDocument = openDocuments.FirstOrDefault (d => d != null && d.FileName == fileName);
-			// We need document and project to be loaded to correctly initialize Razor Host.
-			this.project = project as DotNetProject;
-			if (currentDocument == null && !TryAddDocument (fileName))
-				return new RazorCSharpParsedDocument (fileName, new RazorCSharpPageInfo ());
+			OpenRazorDocument currentDocument = GetDocument (parseOptions.FileName);
+			if (currentDocument == null)
+				return System.Threading.Tasks.Task.FromResult ((ParsedDocument)new RazorCSharpParsedDocument (parseOptions.FileName, new RazorCSharpPageInfo ()));
+
+			var context = new RazorCSharpParserContext (parseOptions, currentDocument);
 
-			this.aspProject = project as AspNetAppProject;
+			lock (currentDocument) {
+				return Parse (context, cancellationToken);
+			}
+		}
+
+		OpenRazorDocument GetDocument (string fileName)
+		{
+			lock (this) {
+				DisposeDocuments (documentsPendingDispose);
 
-			EnsureParserInitializedFor (fileName);
+				OpenRazorDocument currentDocument = openDocuments.FirstOrDefault (d => d != null && d.FileName == fileName);
+				// We need document and project to be loaded to correctly initialize Razor Host.
+				if (currentDocument == null && !TryAddDocument (fileName, out currentDocument))
+					return null;
+
+				return currentDocument;
+			}
+		}
+
+		void DisposeDocuments (IEnumerable<OpenRazorDocument> documents)
+		{
+			try {
+				foreach (OpenRazorDocument document in documents.Reverse ()) {
+					document.Dispose ();
+					documentsPendingDispose.Remove (document);
+				}
+			} catch (Exception ex) {
+				LoggingService.LogError ("Dispose pending Razor document error.", ex);
+			}
+		}
+
+		System.Threading.Tasks.Task<ParsedDocument> Parse (RazorCSharpParserContext context, CancellationToken cancellationToken)
+		{
+			EnsureParserInitializedFor (context);
 
 			var errors = new List<Error> ();
 
-			using (var source = new SeekableTextReader (content)) {
-				var textChange = CreateTextChange (source);
-				var parseResult = editorParser.CheckForStructureChanges (textChange);
+			using (var source = new SeekableTextReader (context.Content.CreateReader ())) {
+				var textChange = CreateTextChange (context, source);
+				var parseResult = context.EditorParser.CheckForStructureChanges (textChange);
 				if (parseResult == PartialParseResult.Rejected) {
-					parseComplete.WaitOne ();
-					if (!capturedArgs.GeneratorResults.Success)
-						GetRazorErrors (errors);
+					context.RazorDocument.ParseComplete.WaitOne ();
+					if (!context.CapturedArgs.GeneratorResults.Success)
+						GetRazorErrors (context, errors);
 				}
 			}
 
-			ParseHtmlDocument (errors);
-			CreateCSharpParsedDocument ();
-			ClearLastChange ();
+			ParseHtmlDocument (context, errors);
+			CreateCSharpParsedDocument (context);
+			context.ClearLastTextChange ();
 
 			RazorHostKind kind = RazorHostKind.WebPage;
-			if (editorParser.Host is WebCodeRazorHost) {
+			if (context.EditorParser.Host is WebCodeRazorHost) {
 				kind = RazorHostKind.WebCode;
-			} else if (editorParser.Host is MonoDevelop.AspNet.Razor.Generator.PreprocessedRazorHost) {
+			} else if (context.EditorParser.Host is MonoDevelop.AspNet.Razor.Generator.PreprocessedRazorHost) {
 				kind = RazorHostKind.Template;
 			}
 
+			var model = context.AnalysisDocument.GetSemanticModelAsync (cancellationToken).Result;
 			var pageInfo = new RazorCSharpPageInfo () {
-				HtmlRoot = htmlParsedDocument,
-				GeneratorResults = capturedArgs.GeneratorResults,
-				Spans = editorParser.CurrentParseTree.Flatten (),
-				CSharpParsedFile = parsedCodeFile,
-				CSharpCode = csharpCode,
+				HtmlRoot = context.HtmlParsedDocument,
+				GeneratorResults = context.CapturedArgs.GeneratorResults,
+				Spans = context.EditorParser.CurrentParseTree.Flatten (),
+				CSharpSyntaxTree = context.ParsedSyntaxTree,
+				ParsedDocument = new DefaultParsedDocument ("generated.cs") { Ast = model },
+				AnalysisDocument = context.AnalysisDocument,
+				CSharpCode = context.CSharpCode,
 				Errors = errors,
-				FoldingRegions = GetFoldingRegions (),
-				Comments = comments,
-				Compilation = CreateCompilation (),
+				FoldingRegions = GetFoldingRegions (context),
+				Comments = context.Comments,
 				HostKind = kind,
 			};
 
-			return new RazorCSharpParsedDocument (fileName, pageInfo);
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)new RazorCSharpParsedDocument (context.FileName, pageInfo));
 		}
 
-		bool TryAddDocument (string fileName)
+		bool TryAddDocument (string fileName, out OpenRazorDocument currentDocument)
 		{
+			currentDocument = null;
 			if (string.IsNullOrEmpty (fileName))
 				return false;
 
 			var guiDoc = IdeApp.Workbench.GetDocument (fileName);
 			if (guiDoc != null && guiDoc.Editor != null) {
-				currentDocument = guiDoc.Editor.Document;
-				currentDocument.TextReplacing += OnTextReplacing;
+				currentDocument = new OpenRazorDocument (guiDoc.Editor);
 				lock (this) {
-					var newDocs = new List<TextDocument> (openDocuments);
+					var newDocs = new List<OpenRazorDocument> (openDocuments);
 					newDocs.Add (currentDocument);
 					openDocuments = newDocs;
 				}
+				var closedDocument = currentDocument;
 				guiDoc.Closed += (sender, args) =>
 				{
-					var doc = sender as Document;
-					if (doc.Editor != null && doc.Editor.Document != null) {
+					var doc = (Ide.Gui.Document)sender;
+					if (doc.Editor != null) {
 						lock (this) {
-							openDocuments = new List<TextDocument> (openDocuments.Where (d => d != doc.Editor.Document));
+							openDocuments = new List<OpenRazorDocument> (openDocuments.Where (d => d.FileName != doc.Editor.FileName));
 						}
 					}
 
-					if (lastParsedFile == doc.FileName && editorParser != null) {
-						DisposeCurrentParser ();
-					}
+					TryDisposingDocument (closedDocument);
+					closedDocument = null;
 				};
 				return true;
 			}
 			return false;
 		}
 
-		void EnsureParserInitializedFor (string fileName)
+		void TryDisposingDocument (OpenRazorDocument document)
 		{
-			if (lastParsedFile == fileName && editorParser != null)
-				return;
+			if (Monitor.TryEnter (document)) {
+				try {
+					document.Dispose ();
+				} finally {
+					Monitor.Exit (document);
+				}
+			} else {
+				lock (this) {
+					documentsPendingDispose.Add (document);
+				}
+			}
+		}
 
-			if (editorParser != null)
-				DisposeCurrentParser ();
+		void EnsureParserInitializedFor (RazorCSharpParserContext context)
+		{
+			if (context.EditorParser != null)
+				return;
 
-			CreateParserFor (fileName);
+			CreateParserFor (context);
 		}
 
-		void CreateParserFor (string fileName)
+		void CreateParserFor (RazorCSharpParserContext context)
 		{
-			editorParser = new MonoDevelop.Web.Razor.EditorParserFixed.RazorEditorParser (CreateRazorHost (fileName), fileName);
+			context.EditorParser = new MonoDevelop.Web.Razor.EditorParserFixed.RazorEditorParser (CreateRazorHost (context), context.FileName);
 
-			parseComplete = new AutoResetEvent (false);
-			editorParser.DocumentParseComplete += (sender, args) =>
+			context.RazorDocument.ParseComplete = new AutoResetEvent (false);
+			context.EditorParser.DocumentParseComplete += (sender, args) =>
 			{
-				capturedArgs = args;
-				parseComplete.Set ();
+				context.RazorDocument.CapturedArgs = args;
+				context.RazorDocument.ParseComplete.Set ();
 			};
-
-			lastParsedFile = fileName;
 		}
 
-		RazorEngineHost CreateRazorHost (string fileName)
+		static RazorEngineHost CreateRazorHost (RazorCSharpParserContext context)
 		{
-			if (project != null) {
-				var projectFile = project.GetProjectFile (fileName);
+			if (context.Project != null) {
+				var projectFile = context.Project.GetProjectFile (context.FileName);
 				if (projectFile != null && projectFile.Generator == "RazorTemplatePreprocessor") {
-					return new MonoDevelop.AspNet.Razor.Generator.PreprocessedRazorHost (fileName) {
+					return new MonoDevelop.AspNet.Razor.Generator.PreprocessedRazorHost (context.FileName) {
 						DesignTimeMode = true,
 						EnableLinePragmas = false,
 					};
@@ -203,15 +239,15 @@ namespace MonoDevelop.AspNet.Razor
 			}
 
 			string virtualPath = "~/Views/Default.cshtml";
-			if (aspProject != null)

-				virtualPath = aspProject.LocalToVirtualPath (fileName);

+			if (context.AspProject != null)

+				virtualPath = context.AspProject.LocalToVirtualPath (context.FileName);

 
 			WebPageRazorHost host = null;
 
 			// Try to create host using web.config file
 			var webConfigMap = new WebConfigurationFileMap ();
-			if (aspProject != null) {
-				var vdm = new VirtualDirectoryMapping (aspProject.BaseDirectory.Combine ("Views"), true, "web.config");
+			if (context.AspProject != null) {
+				var vdm = new VirtualDirectoryMapping (context.AspProject.Project.BaseDirectory.Combine ("Views"), true, "web.config");
 			webConfigMap.VirtualDirectories.Add ("/", vdm);
 			}
 			Configuration configuration;
@@ -224,13 +260,13 @@ namespace MonoDevelop.AspNet.Razor
 				//TODO: use our assemblies, not the project's
 				var rws = configuration.GetSectionGroup (RazorWebSectionGroup.GroupName) as RazorWebSectionGroup;
 				if (rws != null) {
-					host = WebRazorHostFactory.CreateHostFromConfig (rws, virtualPath, fileName);
+					host = WebRazorHostFactory.CreateHostFromConfig (rws, virtualPath, context.FileName);
 					host.DesignTimeMode = true;
 				}
 			}
 
 			if (host == null) {
-				host = new MvcWebPageRazorHost (virtualPath, fileName) { DesignTimeMode = true };
+				host = new MvcWebPageRazorHost (virtualPath, context.FileName) { DesignTimeMode = true };
 				// Add default namespaces from Razor section
 				host.NamespaceImports.Add ("System.Web.Mvc");
 				host.NamespaceImports.Add ("System.Web.Mvc.Ajax");
@@ -241,22 +277,9 @@ namespace MonoDevelop.AspNet.Razor
 			return host;
 		}
 
-		void DisposeCurrentParser ()
-		{
-			editorParser.Dispose ();
-			editorParser = null;
-			parseComplete.Dispose ();
-			parseComplete = null;
-			ClearLastChange ();
-		}
-
-		void ClearLastChange ()
-		{
-			lastChange = null;
-		}
-
-		TextChange CreateTextChange (SeekableTextReader source)
+		static TextChange CreateTextChange (RazorCSharpParserContext context, SeekableTextReader source)
 		{
+			ChangeInfo lastChange = context.GetLastTextChange ();
 			if (lastChange == null)
 				return new TextChange (0, 0, new SeekableTextReader (String.Empty), 0, source.Length, source);
 			if (lastChange.DeleteChange)
@@ -266,24 +289,21 @@ namespace MonoDevelop.AspNet.Razor
 				lastChange.AbsoluteLength, source);
 		}
 
-		void GetRazorErrors (List<Error> errors)
+		static void GetRazorErrors (RazorCSharpParserContext context, List<Error> errors)
 		{
-			foreach (var error in capturedArgs.GeneratorResults.ParserErrors) {
+			foreach (var error in context.CapturedArgs.GeneratorResults.ParserErrors) {
 				int off = error.Location.AbsoluteIndex;
 				if (error.Location.CharacterIndex > 0 && error.Length == 1)
 					off--;
-				errors.Add (new Error (ErrorType.Error, error.Message, currentDocument.OffsetToLocation (off)));
+				errors.Add (new Error (ErrorType.Error, error.Message, context.Document.OffsetToLocation (off)));
 			}
 		}
 
-		MonoDevelop.Xml.Dom.XDocument htmlParsedDocument;
-		IList<Comment> comments;
-
-		void ParseHtmlDocument (List<Error> errors)
+		static void ParseHtmlDocument (RazorCSharpParserContext context, List<Error> errors)
 		{
 			var sb = new StringBuilder ();
 			var spanList = new List<Span> ();
-			comments = new List<Comment> ();
+			context.Comments = new List<Comment> ();
 
 			Action<Span> action = (Span span) =>
 			{
@@ -305,59 +325,59 @@ namespace MonoDevelop.AspNet.Razor
 							ClosingTag = "*@",
 							CommentType = CommentType.Block,
 						};
-						comment.Region = new DomRegion (
-							currentDocument.OffsetToLocation (span.Start.AbsoluteIndex - comment.OpenTag.Length),
-							currentDocument.OffsetToLocation (span.Start.AbsoluteIndex + span.Length + comment.ClosingTag.Length));
-						comments.Add (comment);
+						comment.Region = new MonoDevelop.Ide.Editor.DocumentRegion (
+							context.Document.OffsetToLocation (span.Start.AbsoluteIndex - comment.OpenTag.Length),
+							context.Document.OffsetToLocation (span.Start.AbsoluteIndex + span.Length + comment.ClosingTag.Length));
+						context.Comments.Add (comment);
 					}
 				}
 			};
 
-			editorParser.CurrentParseTree.Accept (new CallbackVisitor (action));
+			context.EditorParser.CurrentParseTree.Accept (new CallbackVisitor (action));
 
 			var parser = new MonoDevelop.Xml.Parser.XmlParser (new WebFormsRootState (), true);
 
 			try {
 				parser.Parse (new StringReader (sb.ToString ()));
 			} catch (Exception ex) {
-				LoggingService.LogError ("Unhandled error parsing html in Razor document '" + (lastParsedFile ?? "") + "'", ex);
+				LoggingService.LogError ("Unhandled error parsing html in Razor document '" + (context.FileName ?? "") + "'", ex);
 			}
 
-			htmlParsedDocument = parser.Nodes.GetRoot ();
+			context.HtmlParsedDocument = parser.Nodes.GetRoot ();
 			errors.AddRange (parser.Errors);
 		}
 
-		IEnumerable<FoldingRegion> GetFoldingRegions ()
+		static IEnumerable<FoldingRegion> GetFoldingRegions (RazorCSharpParserContext context)
 		{
 			var foldingRegions = new List<FoldingRegion> ();
-			GetHtmlFoldingRegions (foldingRegions);
-			GetRazorFoldingRegions (foldingRegions);
+			GetHtmlFoldingRegions (context, foldingRegions);
+			GetRazorFoldingRegions (context, foldingRegions);
 			return foldingRegions;
 		}
 
-		void GetHtmlFoldingRegions (List<FoldingRegion> foldingRegions)
+		static void GetHtmlFoldingRegions (RazorCSharpParserContext context, List<FoldingRegion> foldingRegions)
 		{
-			if (htmlParsedDocument != null) {
-				var d = new MonoDevelop.AspNet.WebForms.WebFormsParsedDocument (null, WebSubtype.Html, null, htmlParsedDocument);
+			if (context.HtmlParsedDocument != null) {
+				var d = new MonoDevelop.AspNet.WebForms.WebFormsParsedDocument (null, WebSubtype.Html, null, context.HtmlParsedDocument);
 				foldingRegions.AddRange (d.Foldings);
 			}
 		}
 
-		void GetRazorFoldingRegions (List<FoldingRegion> foldingRegions)
+		static void GetRazorFoldingRegions (RazorCSharpParserContext context, List<FoldingRegion> foldingRegions)
 		{
 			var blocks = new List<Block> ();
-			GetBlocks (editorParser.CurrentParseTree, blocks);
+			GetBlocks (context.EditorParser.CurrentParseTree, blocks);
 			foreach (var block in blocks) {
-				var beginLine = currentDocument.GetLineByOffset (block.Start.AbsoluteIndex);
-				var endLine = currentDocument.GetLineByOffset (block.Start.AbsoluteIndex + block.Length);
+				var beginLine = context.Document.GetLineByOffset (block.Start.AbsoluteIndex);
+				var endLine = context.Document.GetLineByOffset (block.Start.AbsoluteIndex + block.Length);
 				if (beginLine != endLine)
 					foldingRegions.Add (new FoldingRegion (RazorUtils.GetShortName (block),
-						new DomRegion (currentDocument.OffsetToLocation (block.Start.AbsoluteIndex),
-							currentDocument.OffsetToLocation (block.Start.AbsoluteIndex + block.Length))));
+						new DocumentRegion (context.Document.OffsetToLocation (block.Start.AbsoluteIndex),
+							context.Document.OffsetToLocation (block.Start.AbsoluteIndex + block.Length))));
 			}
 		}
 
-		void GetBlocks (Block root, IList<Block> blocks)
+		static void GetBlocks (Block root, IList<Block> blocks)
 		{
 			foreach (var block in root.Children.Where (n => n.IsBlock).Select (n => n as Block)) {
 				if (block.Type != BlockType.Comment && block.Type != BlockType.Markup)
@@ -367,27 +387,33 @@ namespace MonoDevelop.AspNet.Razor
 			}
 		}
 
-		ParsedDocumentDecorator parsedCodeFile;
-		string csharpCode;
-
-		void CreateCSharpParsedDocument ()
+		static void CreateCSharpParsedDocument (RazorCSharpParserContext context)
 		{
-			var parser = new ICSharpCode.NRefactory.CSharp.CSharpParser ();
-			ICSharpCode.NRefactory.CSharp.SyntaxTree unit;
-			csharpCode = CreateCodeFile ();
-			using (var sr = new StringReader (csharpCode)) {
-				unit = parser.Parse (sr, "Generated.cs");
+			if (context.Project == null)
+				return;
+
+			context.CSharpCode = CreateCodeFile (context);
+			context.ParsedSyntaxTree = CSharpSyntaxTree.ParseText (Microsoft.CodeAnalysis.Text.SourceText.From (context.CSharpCode));
+
+			var originalProject = TypeSystemService.GetCodeAnalysisProject (context.Project);
+			if (originalProject != null) {
+				string fileName = context.FileName + ".g.cs";
+				var documentId = TypeSystemService.GetDocumentId (originalProject.Id, fileName);
+				if (documentId == null) {
+					context.AnalysisDocument = originalProject.AddDocument (
+						fileName,
+						context.ParsedSyntaxTree?.GetRoot ());
+				} else {
+					context.AnalysisDocument = TypeSystemService.GetCodeAnalysisDocument (documentId);
+				}
 			}
-			unit.Freeze ();
-			var parsedDoc = unit.ToTypeSystem ();
-			parsedCodeFile = new ParsedDocumentDecorator (parsedDoc) { Ast = unit };
 		}
 
-		string CreateCodeFile ()
+		static string CreateCodeFile (RazorCSharpParserContext context)
 		{
-			var unit = capturedArgs.GeneratorResults.GeneratedCode;
-			System.CodeDom.Compiler.CodeDomProvider provider = project != null
-				? project.LanguageBinding.GetCodeDomProvider ()
+			var unit = context.CapturedArgs.GeneratorResults.GeneratedCode;
+			System.CodeDom.Compiler.CodeDomProvider provider = context.Project != null
+				? context.Project.LanguageBinding.GetCodeDomProvider ()
 				: new Microsoft.CSharp.CSharpCodeProvider ();
 			using (var sw = new StringWriter ()) {
 				provider.GenerateCodeFromCompileUnit (unit, sw, new System.CodeDom.Compiler.CodeGeneratorOptions ()	{
@@ -400,42 +426,6 @@ namespace MonoDevelop.AspNet.Razor
 				return sw.ToString ();
 			}
 		}
-
-		// Creates compilation that includes underlying C# file for Razor view
-		ICompilation CreateCompilation ()
-		{
-			if (project != null) {
-				return TypeSystemService.GetProjectContext (project).AddOrUpdateFiles (parsedCodeFile.ParsedFile).CreateCompilation ();
-			}
-			return new SimpleCompilation (
-				new DefaultUnresolvedAssembly (Path.ChangeExtension (parsedCodeFile.FileName, ".dll")),
-				GetDefaultAssemblies ()
-			);
-		}
-
-		//FIXME: make this better reflect the real set of assemblies used by razor
-		static IEnumerable<IUnresolvedAssembly> GetDefaultAssemblies ()
-		{
-			var runtime = Runtime.SystemAssemblyService.DefaultRuntime;
-			var fx = Runtime.SystemAssemblyService.GetTargetFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_5);
-			if (!runtime.IsInstalled (fx))
-				fx = Runtime.SystemAssemblyService.GetTargetFramework (MonoDevelop.Core.Assemblies.TargetFrameworkMoniker.NET_4_0);
-			foreach (var assembly in new [] { "System", "System.Core", "System.Xml", "System.Web.Mvc,Version=3.0.0.0" }) {
-				var path = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation (assembly, fx);
-				yield return TypeSystemService.LoadAssemblyContext (runtime, fx, path);
-			}
-		}
-
-		void OnTextReplacing (object sender, DocumentChangeEventArgs e)
-		{
-			if (lastChange == null)
-				lastChange = new ChangeInfo (e.Offset, new SeekableTextReader((sender as TextDocument).Text));
-			if (e.ChangeDelta > 0) {
-				lastChange.Length += e.InsertionLength;
-			} else {
-				lastChange.Length -= e.RemovalLength;
-			}
-		}
 	}
 
 	class ChangeInfo
diff --git a/main/src/addins/AspNet/Razor/RazorCSharpParserContext.cs b/main/src/addins/AspNet/Razor/RazorCSharpParserContext.cs
new file mode 100644
index 0000000000..133c48235c
--- /dev/null
+++ b/main/src/addins/AspNet/Razor/RazorCSharpParserContext.cs
@@ -0,0 +1,100 @@
+//
+// RazorCSharpParserContext.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Web.Razor;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.AspNet.Projects;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Projects;
+using MonoDevelop.Xml.Dom;
+
+namespace MonoDevelop.AspNet.Razor
+{
+	class RazorCSharpParserContext
+	{
+		MonoDevelop.Ide.TypeSystem.ParseOptions parseOptions;
+		OpenRazorDocument razorDocument;
+
+		public RazorCSharpParserContext (MonoDevelop.Ide.TypeSystem.ParseOptions parseOptions, OpenRazorDocument razorDocument)
+		{
+			this.parseOptions = parseOptions;
+			this.razorDocument = razorDocument;
+		}
+
+		public DotNetProject Project {
+			get { return parseOptions.Project as DotNetProject; }
+		}
+
+		public AspNetAppProjectFlavor AspProject {
+			get { return parseOptions.Project.As<AspNetAppProjectFlavor> (); }
+		}
+
+		public string FileName {
+			get { return parseOptions.FileName; }
+		}
+
+		public ITextSource Content {
+			get { return parseOptions.Content; }
+		}
+
+		public ITextDocument Document {
+			get { return razorDocument.Document; }
+		}
+
+		public OpenRazorDocument RazorDocument {
+			get { return razorDocument; }
+		}
+
+		public SyntaxTree ParsedSyntaxTree { get; set; }
+		public string CSharpCode { get; set; }
+		public Microsoft.CodeAnalysis.Document AnalysisDocument { get; set; }
+		public XDocument HtmlParsedDocument { get; set; }
+		public IList<Comment> Comments { get; set; }
+		public MonoDevelop.Web.Razor.EditorParserFixed.RazorEditorParser EditorParser {
+			get { return razorDocument.EditorParser; }
+			set { razorDocument.EditorParser = value; }
+		}
+
+		public DocumentParseCompleteEventArgs CapturedArgs {
+			get { return razorDocument.CapturedArgs; }
+		}
+
+		public ChangeInfo GetLastTextChange ()
+		{
+			return razorDocument.LastTextChange;
+		}
+
+		public void ClearLastTextChange ()
+		{
+			razorDocument.ClearLastTextChange ();
+		}
+	}
+}
+
diff --git a/main/src/addins/AspNet/Razor/RazorPageInfo.cs b/main/src/addins/AspNet/Razor/RazorPageInfo.cs
index 53f1c80d2e..722adccc30 100644
--- a/main/src/addins/AspNet/Razor/RazorPageInfo.cs
+++ b/main/src/addins/AspNet/Razor/RazorPageInfo.cs
@@ -27,9 +27,9 @@
 using System.Collections.Generic;

 using System.Web.Razor;

 using System.Web.Razor.Parser.SyntaxTree;

-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Ide.TypeSystem;

 using MonoDevelop.Xml.Dom;

+using Microsoft.CodeAnalysis;

 

 namespace MonoDevelop.AspNet.Razor

 {

@@ -54,8 +54,9 @@ namespace MonoDevelop.AspNet.Razor
 

 	public class RazorCSharpPageInfo : RazorPageInfo

 	{

-		public ParsedDocumentDecorator CSharpParsedFile { get; set; }

-		public ICompilation Compilation { get; set; }

+		public SyntaxTree CSharpSyntaxTree { get; set; }

+		public ParsedDocument ParsedDocument { get; set; }

+		public Microsoft.CodeAnalysis.Document AnalysisDocument { get; set; }

 		public string CSharpCode { get; set; }

 	}

 

diff --git a/main/src/addins/AspNet/Razor/RazorSyntaxMode.cs b/main/src/addins/AspNet/Razor/RazorSyntaxMode.cs
index 1a07191a9e..8c0cb7e854 100644
--- a/main/src/addins/AspNet/Razor/RazorSyntaxMode.cs
+++ b/main/src/addins/AspNet/Razor/RazorSyntaxMode.cs
@@ -40,12 +40,13 @@ using MonoDevelop.AspNet.Razor.Parser;
 using MonoDevelop.Ide;
 using RazorSpan = System.Web.Razor.Parser.SyntaxTree.Span;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AspNet.Razor
 {
 	public class RazorSyntaxMode : SyntaxMode, IDisposable
 	{
-		public RazorSyntaxMode (Document doc)
+		public RazorSyntaxMode (DocumentContext doc)
 		{
 			this.guiDocument = doc;
 			guiDocument.DocumentParsed += HandleDocumentParsed; 
@@ -80,7 +81,7 @@ namespace MonoDevelop.AspNet.Razor
 		IList<RazorSpan> currentSpans;
 		State currentState;
 		IList<Chunk> chunks;
-		Document guiDocument;
+		DocumentContext guiDocument;
 
 		public override IEnumerable<Chunk> GetChunks (ColorScheme style, DocumentLine line, int offset, int length)
 		{
diff --git a/main/src/addins/AspNet/Templates/Global.tt b/main/src/addins/AspNet/Templates/Global.tt
new file mode 100644
index 0000000000..11cbbbe770
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/Global.tt
@@ -0,0 +1,32 @@
+<#@ template language="C#" #>
+<#
+bool webApi = IsTrue ("UsesAspNetWebApi");
+bool mvc = IsTrue ("UsesAspNetMvc");
+#>
+using System.Web;
+<# if (mvc) { #>
+using System.Web.Mvc;
+using System.Web.Routing;
+<# } #>
+<# if (webApi) { #>
+using System.Web.Http;
+<# } #>
+
+namespace <#=Tags["Namespace"]#>
+{
+	public class Global : HttpApplication
+	{
+		protected void Application_Start()
+		{
+<# if (mvc) { #>
+			AreaRegistration.RegisterAllAreas();
+<# } #>
+<# if (webApi) { #>
+			GlobalConfiguration.Configure(WebApiConfig.Register);
+<# } #>
+<# if (mvc) { #>
+			RouteConfig.RegisterRoutes(RouteTable.Routes);
+<# } #>
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/AspNet/Templates/GlobalAsax.xft.xml b/main/src/addins/AspNet/Templates/GlobalAsax.xft.xml
new file mode 100644
index 0000000000..3015f99067
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/GlobalAsax.xft.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<Template Originator="Piotr Dowgiallo"
+          Created="2012/05/16"
+          LastModified="2012/05/16">
+
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>ASP.NET Global.asax</_Name>
+		<_Category>ASP.NET</_Category>
+		<Icon>md-html-file-icon</Icon>
+		<LanguageName>C#</LanguageName>
+		<ProjectType>AspNetApp</ProjectType>
+		<DefaultFilename IsFixed="True">Global.asax</DefaultFilename>
+		<_Description>Creates an ASP.NET Global.asax file.</_Description>
+	</TemplateConfiguration>
+
+	<Conditions>
+		<ParentProject PermittedCreationPaths="" ExcludedFiles="/Global.asax:/App_Start/WebApiConfig.cs:/App_Start/RouteConfig.cs" />
+	</Conditions>
+
+	<!-- Template Content -->
+	<TemplateFiles>
+		<File name="Global.asax"  SuppressAutoOpen="true">
+<![CDATA[<%@ Application Inherits="${Namespace}.Global" %>
+]]>
+		</File>
+		<T4File name="Global.asax.cs" DependsOn="Global.asax" src="Global.tt" AddStandardHeader="true" />
+		<Directory name="App_Start" if="UsesAspNetWebApi">
+			<File name="WebApiConfig.cs" src="WebApiConfig.cs" SuppressAutoOpen="true" />
+		</Directory>
+		<Directory name="App_Start" if="UsesAspNetMvc">
+			<File name="RouteConfig.cs" src="RouteConfig.cs" SuppressAutoOpen="true" />
+		</Directory>
+	</TemplateFiles>
+</Template>
diff --git a/main/src/addins/AspNet/Templates/Mvc/GlobalAsax.xft.xml b/main/src/addins/AspNet/Templates/Mvc/GlobalAsax.xft.xml
deleted file mode 100644
index 666cbdd11b..0000000000
--- a/main/src/addins/AspNet/Templates/Mvc/GlobalAsax.xft.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>

-<Template Originator="Piotr Dowgiallo"

-          Created="2012/05/16"

-          LastModified="2012/05/16">

-

-	<!-- Template Header -->

-	<TemplateConfiguration>

-		<_Name>ASP.NET MVC Global.asax</_Name>

-		<_Category>ASP.NET MVC</_Category>

-		<Icon>md-html-file-icon</Icon>

-		<LanguageName>C#</LanguageName>

-		<ProjectType>AspNetApp</ProjectType>

-		<DefaultFilename IsFixed="True">Global.asax</DefaultFilename>

-		<_Description>Creates an ASP.NET MVC Global.asax file.</_Description>

-	</TemplateConfiguration>

-

-	<Conditions>

-		<ParentProject PermittedCreationPaths="" ExcludedFiles="/Global.asax" />

-		<AspNetMvc />

-	</Conditions>

-

-	<!-- Template Content -->

-	<TemplateFiles>

-		<File name="Global.asax">

-<![CDATA[<%@ Application Inherits="${Namespace}.MvcApplication" %>

-]]>

-		</File>

-		<File name="Global.asax.cs" DependsOn="Global.asax" >

-<![CDATA[

-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Web;

-using System.Web.Mvc;

-using System.Web.Routing;

-

-namespace ${Namespace}

-{

-    public class MvcApplication : System.Web.HttpApplication

-    {

-        public static void RegisterRoutes(RouteCollection routes)

-        {

-            routes.IgnoreRoute("{resource}.axd/{*pathInfo}");

-

-            routes.MapRoute(

-                "Default",

-                "{controller}/{action}/{id}",

-                new { controller = "Home", action = "Index", id = "" }

-            );

-

-        }

-

-        public static void RegisterGlobalFilters(GlobalFilterCollection filters)

-        {

-            filters.Add(new HandleErrorAttribute());

-        }

-

-        protected void Application_Start()

-        {

-            AreaRegistration.RegisterAllAreas();

-            RegisterGlobalFilters(GlobalFilters.Filters);

-            RegisterRoutes(RouteTable.Routes);

-        }

-    }

-}]]>

-		</File>

-	</TemplateFiles>

-</Template>

diff --git a/main/src/addins/AspNet/Templates/Mvc/WebConfigApp.xft.xml b/main/src/addins/AspNet/Templates/Mvc/WebConfigApp.xft.xml
deleted file mode 100644
index 81e9c17aef..0000000000
--- a/main/src/addins/AspNet/Templates/Mvc/WebConfigApp.xft.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0"?>

-<Template

-	Originator="Piotr Dowgiallo"

-	Created="2012/05/16"

-	LastModified="2012/05/16">

-

-	<!-- Template Header -->

-	<TemplateConfiguration>

-		<_Name>ASP.NET MVC Application Configuration</_Name>

-		<_Category>ASP.NET MVC</_Category>

-		<Icon>md-html-file-icon</Icon>

-		<LanguageName>C#</LanguageName>

-		<ProjectType>AspNetApp</ProjectType>

-		<DefaultFilename IsFixed="True">Web.config</DefaultFilename>

-		<_Description>Creates an ASP.NET MVC Web.config file for an application.</_Description>

-	</TemplateConfiguration>

-

-	<Conditions>

-		<ParentProject PermittedCreationPaths="" ExcludedFiles="Web.config" RequireProject="True"/>

-		<AspNetMvc />

-	</Conditions>

-

-	<!-- Template Content -->

-	<TemplateFiles>

-		<File name="Web.config">

-<![CDATA[<?xml version="1.0" ?>

-<!--

-Web.config file for ${ProjectName}.

-

-The settings that can be used in this file are documented at 

-http://www.mono-project.com/Config_system.web and 

-http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx

--->

-<configuration>

-	<configSections>

-		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

-			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

-				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>

-				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

-					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />

-					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />

-					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />

-					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />

-				</sectionGroup>

-			</sectionGroup>

-		</sectionGroup>

-	</configSections>

-	<system.web>

-		<!-- 

-		    Set compilation debug="true" to insert debugging 

-		    symbols into the compiled page. Because this 

-		    affects performance, set this value to true only 

-		    during development.

-		-->

-		<compilation defaultLanguage="C#" debug="false">

-			<assemblies>

-				<add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>

-				<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-				<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-				<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-				<add assembly="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-				<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

-				<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

-				<add assembly="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

-				<add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>

-				<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />

-				<add assembly="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-			</assemblies>

-		</compilation>

-

-		<customErrors mode="RemoteOnly">

-		</customErrors>

-		<pages>

-			<controls>

-				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-			</controls>

-

-			<namespaces>

-				<add namespace="System.Web.Mvc"/>

-				<add namespace="System.Web.Mvc.Ajax"/>

-				<add namespace="System.Web.Mvc.Html"/>

-				<add namespace="System.Web.Routing"/>

-				<add namespace="System.Web.Helpers" />

-				<add namespace="System.Web.WebPages"/>

-				<add namespace="System.Linq"/>

-				<add namespace="System.Collections.Generic"/>

-			</namespaces>

-		</pages>

-

-		<authorization>

-			<allow users="*" />

-		</authorization>

-

-		<httpHandlers>

-			<remove verb="*" path="*.asmx"/>

-			<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-			<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>

-			<add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-		</httpHandlers>

-

-		<httpModules>

-			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

-			<add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

-		</httpModules>

-

-		<trace

-			enabled="false"

-			localOnly="true"

-			pageOutput="false"

-			requestLimit="10"

-			traceMode="SortByTime"

-		/>

-

-		<globalization

-			requestEncoding="utf-8"

-			responseEncoding="utf-8"

-		/>

-

-	</system.web>

-

-	<system.codedom>

-		<compilers>

-			<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4"

-			          type="Microsoft.CSharp.CSharpCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-				<providerOption name="CompilerVersion" value="v4.0"/>

-				<providerOption name="WarnAsError" value="false"/>

-			</compiler>

-			<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4"

-			          type="Microsoft.VisualBasic.VBCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-				<providerOption name="CompilerVersion" value="v4.0"/>

-				<providerOption name="OptionInfer" value="true"/>

-				<providerOption name="WarnAsError" value="false"/>

-			</compiler>

-		</compilers>

-	</system.codedom>

-

-	<system.web.extensions/>

-

-	<appSettings>

-		<add key="webpages:Version" value="3.0.0.0"/>

-		<add key="ClientValidationEnabled" value="true"/>

-		<add key="UnobtrusiveJavaScriptEnabled" value="true"/>

-	</appSettings>

-</configuration>

-]]>

-		</File>

-	</TemplateFiles>

-</Template>

-

diff --git a/main/src/addins/AspNet/Templates/Mvc/WebConfigViews.xft.xml b/main/src/addins/AspNet/Templates/Mvc/WebConfigViews.xft.xml
index d3f058935b..1e273f35ad 100644
--- a/main/src/addins/AspNet/Templates/Mvc/WebConfigViews.xft.xml
+++ b/main/src/addins/AspNet/Templates/Mvc/WebConfigViews.xft.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0"?>

-<Template

-	Originator="Piotr Dowgiallo"

-	Created="2012/05/16"

-	LastModified="2012/05/16">

-

+<Template>

 	<!-- Template Header -->

 	<TemplateConfiguration>

 		<_Name>ASP.NET MVC Views Configuration</_Name>

@@ -16,14 +12,15 @@
 	</TemplateConfiguration>

 

 	<Conditions>

-		<ParentProject PermittedCreationPaths="/Views" ExcludedFiles="Web.config" />

-		<AspNetMvc razor = "true" />

+		<ParentProject PermittedCreationPaths="Views" ExcludedFiles="Web.config" />

+		<AspNetMvc />

 	</Conditions>

 

 	<!-- Template Content -->

 	<TemplateFiles>

 		<File name="Web.config">

 <![CDATA[<?xml version="1.0"?>

+

 <configuration>

 	<configSections>

 		<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

@@ -32,48 +29,29 @@
 		</sectionGroup>

 	</configSections>

 

-	<system.web>

-		<httpHandlers>

-			<add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>

-		</httpHandlers>

-

-		<!--

-			Enabling request validation in view pages would cause validation to occur

-			after the input has already been processed by the controller. By default

-			MVC performs request validation before a controller processes the input.

-			To change this behavior apply the ValidateInputAttribute to a

-			controller or action.

-		-->

-		<pages validateRequest="false"

-		       pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"

-		       pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"

-		       userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

-			<controls>

-				<add assembly="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />

-			</controls>

-		</pages>

-	</system.web>

-

-	<system.webServer>

-		<validation validateIntegratedModeConfiguration="false"/>

-		<handlers>

-			<remove name="BlockViewHandler"/>

-			<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>

-		</handlers>

-	</system.webServer>

-

 	<system.web.webPages.razor>

-		<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

+		<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

 		<pages pageBaseType="System.Web.Mvc.WebViewPage">

 			<namespaces>

 				<add namespace="System.Web.Mvc" />

 				<add namespace="System.Web.Mvc.Ajax" />

 				<add namespace="System.Web.Mvc.Html" />

 				<add namespace="System.Web.Routing" />

+				<add namespace="${Namespace}" />

 			</namespaces>

 		</pages>

 	</system.web.webPages.razor>

 

+	<appSettings>

+		<add key="webpages:Enabled" value="false" />

+	</appSettings>

+

+	<system.webServer>

+		<handlers>

+			<remove name="BlockViewHandler"/>

+			<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />

+		</handlers>

+	</system.webServer>

 </configuration>]]>

 		</File>

 	</TemplateFiles>

diff --git a/main/src/addins/AspNet/Templates/MvcCommon/HomeControllerTest.cs b/main/src/addins/AspNet/Templates/MvcCommon/HomeControllerTest.cs
index 1ae3e934c3..ab6fddeb3e 100644
--- a/main/src/addins/AspNet/Templates/MvcCommon/HomeControllerTest.cs
+++ b/main/src/addins/AspNet/Templates/MvcCommon/HomeControllerTest.cs
@@ -24,7 +24,7 @@ namespace ${Namespace}
 			var mvcName = typeof(Controller).Assembly.GetName ();

 			var isMono = Type.GetType ("Mono.Runtime") != null;

 

-			var expectedVersion = mvcName.Version.Major;

+			var expectedVersion = mvcName.Version.Major + "." + mvcName.Version.Minor;

 			var expectedRuntime = isMono? "Mono" : ".NET";

 

 			// Assert

diff --git a/main/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml b/main/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml
deleted file mode 100644
index b2bb7d0318..0000000000
--- a/main/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<Template originator="Michael Hutchinson"
-          created="2009/02/17"
-          lastModified="2012/05/17">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Empty ASP.NET MVC Project</_Name>
-		<Category>other/aspnet/general</Category>
-		<Icon>md-project-web</Icon>
-		<Image id="md-aspnet-empty-project" />
-		<LanguageName>C#</LanguageName>
-		<_Description>Creates an empty ASP.NET MVC Web Project.</_Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-	</Actions>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
-			<Options TargetFrameworkVersion = "4.5" />
-			<References>
-				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Core" />
-				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
-				<Reference type="Package" refto="System.Xml.Linq" />
-				<Reference type="Package" refto="System.Core" />
-				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			</References>
-			<Packages>
-				<Package Id="Microsoft.AspNet.Mvc" Version="5.2"/>
-			</Packages>
-			<Files>
-				<Directory name="Content" />
-				<Directory name="Controllers" />
-				<Directory name="Models" />
-				<Directory name="Scripts" />
-				<Directory name="Views">
-					<FileTemplateReference TemplateID="AspMvcWebConfigViews" name="Web.config" SuppressAutoOpen="true"  />
-				</Directory>
-				<FileTemplateReference TemplateID="AspMvcWebConfigApp" name="Web.config" SuppressAutoOpen="true" />
-				<FileTemplateReference TemplateID="AspMvcGlobalAsax" name="Global.asax" SuppressAutoOpen="true"  />
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/AspNet/Templates/Projects/EmptyProject.xpt.xml b/main/src/addins/AspNet/Templates/Projects/EmptyProject.xpt.xml
index 80e5b1f6ae..7c60a760a3 100644
--- a/main/src/addins/AspNet/Templates/Projects/EmptyProject.xpt.xml
+++ b/main/src/addins/AspNet/Templates/Projects/EmptyProject.xpt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<Template	originator="Michael Hutchinson"
-			created="2006/06/06"
-			lastModified="2006/06/06">
+<Template originator="Michael Hutchinson"
+          created="2009/02/17"
+          lastModified="2012/05/17">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
@@ -10,7 +10,9 @@
 		<Icon>md-project-web</Icon>
 		<Image id="md-aspnet-empty-project" />
 		<LanguageName>C#</LanguageName>
-		<_Description>Creates an empty ASP.NET Web Application project.</_Description>
+		<_Description>Creates an empty ASP.NET Web Project.</_Description>
+		<Wizard>MonoDevelop.AspNet.ProjectTemplateWizard</Wizard>
+		<SupportedParameters>UsesAspNetMvc;UsesAspNetWebApi</SupportedParameters>
 	</TemplateConfiguration>
 	
 	<!-- Actions -->
@@ -24,14 +26,67 @@
 		</Options>
 		
 		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
-			<Options />
+			<Options TargetFrameworkVersion = "4.5" />
 			<References>
-				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Core" />
+				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
+				<Reference type="Package" refto="System.Xml.Linq" />
+				<Reference type="Package" refto="System.Core" />
+				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 			</References>
+			<Packages>
+				<Package Id="Microsoft.AspNet.Mvc" Version="5.2.3" if="UsesAspNetMvc" />
+				<Package id="Microsoft.AspNet.WebApi" version="5.2.3" if="UsesAspNetWebApi" />
+				<package id="Newtonsoft.Json" version="6.0.8" if="UsesAspNetWebApi" />
+			</Packages>
 			<Files>
+				<Directory name="Content" if="UsesAspNetMvc" />
+				<Directory name="Controllers" if="UsesAspNetMvc" />
+				<Directory name="Models" if="UsesAspNetMvc" />
+				<Directory name="Scripts" if="UsesAspNetMvc" />
+				<Directory name="Views" if="UsesAspNetMvc">
+					<FileTemplateReference TemplateID="AspMvcWebConfigViews" name="Web.config" SuppressAutoOpen="true"  />
+				</Directory>
+				<FileTemplateReference TemplateID="WebConfig-Application" name="Web.config" SuppressAutoOpen="true" />
+				<FileTemplateReference TemplateID="GlobalAsax" name="Global.asax" SuppressAutoOpen="true"  />
+			</Files>
+		</Project>
+		<Project name = "${ProjectName}.Tests" directory = "${ProjectName}.Tests" if="IncludeTestProject">
+			<Options Target = "Library" TargetFrameworkVersion = "4.5" />
+			<References>
+				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Core" />
+				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
+				<Reference type="Package" refto="System.Xml.Linq" />
+				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Project" refto="${ProjectName}" />
+			</References>
+			<Packages>
+				<Package ID="NUnit" Version="2.6.4" />
+				<Package ID="Microsoft.AspNet.Mvc" Version="5.2.3" if="UsesAspNetMvc"/>
+				<Package id="Microsoft.AspNet.WebApi" version="5.2.3" if="UsesAspNetWebApi" />
+				<package id="Newtonsoft.Json" version="6.0.8" if="UsesAspNetWebApi" />
+			</Packages>
+			<Files>
+				<Directory name="Controllers" if="UsesAspNetMvc">
+					<File name="Test.cs" src="Files/Test.cs" />
+				</Directory>
+				<File name="Test.cs" src="Files/Test.cs" if="!UsesAspNetMvc" />
 			</Files>
 		</Project>
 	</Combine>
diff --git a/main/src/addins/AspNet/Templates/Projects/Files/Default.aspx b/main/src/addins/AspNet/Templates/Projects/Files/Default.aspx
new file mode 100644
index 0000000000..bc57610bad
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/Projects/Files/Default.aspx
@@ -0,0 +1,12 @@
+<%@ Page Language="C#" Inherits="${Namespace}.${EscapedIdentifier}" %>
+<!DOCTYPE html>
+<html>
+<head runat="server">
+	<title>${Name}</title>
+</head>
+<body>
+	<form id="form1" runat="server">
+		<asp:Button id="button1" runat="server" Text="Click me!" OnClick="button1Clicked" />
+	</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/main/src/addins/AspNet/Templates/Projects/Files/Default.aspx.cs b/main/src/addins/AspNet/Templates/Projects/Files/Default.aspx.cs
new file mode 100644
index 0000000000..b32fba12c6
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/Projects/Files/Default.aspx.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Web;
+using System.Web.UI;
+
+namespace ${Namespace} {
+
+	public partial class ${EscapedIdentifier} : System.Web.UI.Page
+	{
+		public void button1Clicked (object sender, EventArgs args)
+		{
+			button1.Text = "You clicked me";
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/AspNet/Templates/Projects/Files/Default.aspx.designer.cs b/main/src/addins/AspNet/Templates/Projects/Files/Default.aspx.designer.cs
new file mode 100644
index 0000000000..fd7b24f3f5
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/Projects/Files/Default.aspx.designer.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Web;
+using System.Web.UI;
+
+namespace ${Namespace} {
+
+	public partial class ${EscapedIdentifier}
+	{
+		protected System.Web.UI.WebControls.Button button1;
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/AspNet/Templates/Projects/Files/RouteConfig.cs b/main/src/addins/AspNet/Templates/Projects/Files/RouteConfig.cs
deleted file mode 100644
index 89330994d8..0000000000
--- a/main/src/addins/AspNet/Templates/Projects/Files/RouteConfig.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// RouteConfig.cs
-//
-// Author:
-//       Michael Hutchinson <mhutch@xamarin.com>
-//
-// Copyright (c) 2015 Xamarin Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-
-namespace MonoDevelop.AspNet.Templates.Projects.Files
-{
-	public class RouteConfig
-	{
-		public RouteConfig ()
-		{
-		}
-	}
-}
-
diff --git a/main/src/addins/AspNet/Templates/Projects/Files/Test.cs b/main/src/addins/AspNet/Templates/Projects/Files/Test.cs
new file mode 100644
index 0000000000..56790fd50c
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/Projects/Files/Test.cs
@@ -0,0 +1,14 @@
+using NUnit.Framework;
+using System;
+
+namespace ${Namespace}
+{
+	[TestFixture]
+	public class Test
+	{
+		[Test]
+		public void TestCase ()
+		{
+		}
+	}
+}
diff --git a/main/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml b/main/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml
index 05398f1b7e..f4f7171077 100644
--- a/main/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml
+++ b/main/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>

+<?xml version="1.0"?>
 <Template originator="Piotr Dowgiallo"

-          created="2012/05/16"

-          lastModified="2012/05/16">

+          created="2012/06/05"
+          lastModified="2012/06/05">
 

 	<!-- Template Header -->

 	<TemplateConfiguration>

@@ -10,7 +10,10 @@
 		<Icon>md-project-web</Icon>

 		<Image id="md-aspnet-empty-project" />

 		<LanguageName>C#</LanguageName>

-		<_Description>Creates an ASP.NET MVC Web Project.</_Description>

+		<_Description>Creates an ASP.NET MVC Web Project with Razor Views.</_Description>
+		<Wizard>MonoDevelop.AspNet.ProjectTemplateWizard</Wizard>
+		<DefaultParameters>UsesAspNetMvc=true</DefaultParameters>
+		<SupportedParameters>UsesAspNetWebApi</SupportedParameters>
 	</TemplateConfiguration>

 

 

@@ -39,12 +42,14 @@
 				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

 				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />

 				<Reference type="Package" refto="System.Xml.Linq" />

-				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-			</References>

-			<Packages>

-				<Package ID="Microsoft.AspNet.Mvc" Version="5.2" />

-			</Packages>

-			<Files>

+				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			</References>
+			<Packages>
+				<Package ID="Microsoft.AspNet.Mvc" Version="5.2.3" />
+				<Package id="Microsoft.AspNet.WebApi" version="5.2.3"  if="UsesAspNetWebApi" />
+				<package id="Newtonsoft.Json" version="6.0.8"  if="UsesAspNetWebApi" />
+			</Packages>
+			<Files>
 				<Directory name="Content" />

 				<Directory name="Controllers">

 					<File name="HomeController.cs" src="../MvcCommon/HomeController.cs" />

@@ -54,38 +59,45 @@
 				<Directory name="Views">

 					<FileTemplateReference TemplateID="AspMvcWebConfigViews" name="Web.config" SuppressAutoOpen="true"  />

 					<Directory name="Home">

-						<File name="Index.aspx">

-<![CDATA[<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>

-<!DOCTYPE html>

-<html>

-<head runat="server">

-	<title></title>

-</head>

-<body>

-	<h2>Welcome to ASP.NET MVC <%: ViewData["Version"] %> on <%: ViewData["Runtime"] %>!</h2>

-</body>

-]]>

-						</File>

+						<File name="Index.cshtml" src="../MvcCommon/Index.cshtml" />
 					</Directory>

 					<Directory name="Shared">

-						<File name="Error.aspx">

-<![CDATA[<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>

-<!DOCTYPE html>

-<html>

-<head>

-	<title>Error</title>

-</head>

-<body>

-	<div>

-		<h2>An error occurred while processing your request.</h2>

-	</div>

-</body>

-]]>

-						</File>

+						<File name="_Layout.cshtml" src="../MvcCommon/_Layout.cshtml" />
+						<File name="Error.cshtml" src="../MvcCommon/Error.cshtml" />
 					</Directory>

+					<File name="_ViewStart.cshtml" src="../MvcCommon/_ViewStart.cshtml" />
+				</Directory>
+				<FileTemplateReference TemplateID="WebConfig-Application" name="Web.config" SuppressAutoOpen="true" />
+				<FileTemplateReference TemplateID="GlobalAsax" name="Global.asax" SuppressAutoOpen="true"  />
+			</Files>
+		</Project>
+		<Project name = "${ProjectName}.Tests" directory = "${ProjectName}.Tests" if="IncludeTestProject">
+			<Options Target = "Library" TargetFrameworkVersion = "4.5" />
+			<References>
+				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Core" />
+				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
+				<Reference type="Package" refto="System.Xml.Linq" />
+				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Project" refto="${ProjectName}" />
+			</References>
+			<Packages>
+				<Package ID="NUnit" Version="2.6.4" />
+				<Package ID="Microsoft.AspNet.Mvc" Version="5.2.3" />
+				<Package id="Microsoft.AspNet.WebApi" version="5.2.3"  if="UsesAspNetWebApi" />
+				<package id="Newtonsoft.Json" version="6.0.8"  if="UsesAspNetWebApi" />
+			</Packages>
+			<Files>
+				<Directory name="Controllers">
+					<File name="HomeControllerTest.cs" src="../MvcCommon/HomeControllerTest.cs" />
 				</Directory>

-				<FileTemplateReference TemplateID="AspMvcWebConfigApp" name="Web.config" SuppressAutoOpen="true" />

-				<FileTemplateReference TemplateID="AspMvcGlobalAsax" name="Global.asax" SuppressAutoOpen="true"  />

 			</Files>

 		</Project>

 	</Combine>

diff --git a/main/src/addins/AspNet/Templates/Projects/MvcProjectWithUnitTest.xpt.xml b/main/src/addins/AspNet/Templates/Projects/MvcProjectWithUnitTest.xpt.xml
deleted file mode 100644
index 461e8a19a3..0000000000
--- a/main/src/addins/AspNet/Templates/Projects/MvcProjectWithUnitTest.xpt.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>

-<Template originator="Piotr Dowgiallo"

-          created="2012/06/05"

-          lastModified="2012/06/05">

-

-	<!-- Template Header -->

-	<TemplateConfiguration>

-		<_Name>ASP.NET MVC Project with Unit Tests</_Name>

-		<Category>other/aspnet/general</Category>

-		<Icon>md-project-web</Icon>

-		<Image id="md-aspnet-empty-project" />

-		<LanguageName>C#</LanguageName>

-		<_Description>Creates an ASP.NET MVC Web Project with a Unit Test Project.</_Description>

-	</TemplateConfiguration>

-

-

-	<!-- Actions -->

-	<Actions>

-		<Open filename = "Controllers/HomeController.cs"/>

-	</Actions>

-

-	<!-- Template Content -->

-	<Combine name = "${ProjectName}" directory = ".">

-		<Options>

-			<StartupProject>${ProjectName}</StartupProject>

-		</Options>

-

-		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">

-			<Options TargetFrameworkVersion = "4.5" />

-			<References>

-				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

-				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

-				<Reference type="Package" refto="System.Core" />

-				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />

-				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

-				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />

-				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

-				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />

-				<Reference type="Package" refto="System.Xml.Linq" />

-				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-			</References>

-			<Packages>

-				<Package ID="Microsoft.AspNet.Mvc" Version="5.2" />

-			</Packages>

-			<Files>

-				<Directory name="Content" />

-				<Directory name="Controllers">

-					<File name="HomeController.cs" src="../MvcCommon/HomeController.cs" />

-				</Directory>

-				<Directory name="Models" />

-				<Directory name="Scripts" />

-				<Directory name="Views">

-					<FileTemplateReference TemplateID="AspMvcWebConfigViews" name="Web.config" SuppressAutoOpen="true"  />

-					<Directory name="Home">

-						<File name="Index.aspx">

-<![CDATA[<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>

-<!DOCTYPE html>

-<html>

-<head runat="server">

-	<title></title>

-</head>

-<body>

-	<h2>Welcome to ASP.NET MVC <%: ViewData["Version"] %> on <%: ViewData["Runtime"] %>!</h2>

-</body>

-]]>

-						</File>

-					</Directory>

-					<Directory name="Shared">

-						<File name="Error.aspx">

-<![CDATA[<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>

-<!DOCTYPE html>

-<html>

-<head>

-	<title>Error</title>

-</head>

-<body>

-	<div>

-		<h2>An error occurred while processing your request.</h2>

-	</div>

-</body>

-]]>

-						</File>

-					</Directory>

-				</Directory>

-				<FileTemplateReference TemplateID="AspMvcWebConfigApp" name="Web.config" SuppressAutoOpen="true" />

-				<FileTemplateReference TemplateID="AspMvcGlobalAsax" name="Global.asax" SuppressAutoOpen="true"  />

-			</Files>

-		</Project>

-		<Project name = "${ProjectName}.Tests" directory = "${ProjectName}.Tests">

-			<Options Target = "Library" TargetFrameworkVersion = "4.5" />

-			<References>

-				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

-				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

-				<Reference type="Package" refto="System.Core" />

-				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />

-				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

-				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />

-				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />

-				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />

-				<Reference type="Package" refto="System.Xml.Linq" />

-				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-				<Reference type="Project" refto="${ProjectName}" />

-			</References>

-			<Packages>

-				<Package ID="Microsoft.AspNet.Mvc" Version="5.2" />

-				<Package ID="NUnit" Version="2.6.3" />

-			</Packages>

-			<Files>

-				<Directory name="Controllers">

-					<File name="HomeControllerTest.cs" src="../MvcCommon/HomeControllerTest.cs" />

-				</Directory>

-			</Files>

-		</Project>

-	</Combine>

-</Template>
\ No newline at end of file
diff --git a/main/src/addins/AspNet/Templates/Projects/MvcRazorProject.xpt.xml b/main/src/addins/AspNet/Templates/Projects/MvcRazorProject.xpt.xml
deleted file mode 100644
index 94f7e6a3a9..0000000000
--- a/main/src/addins/AspNet/Templates/Projects/MvcRazorProject.xpt.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<Template originator="Piotr Dowgiallo"
-          created="2012/06/04"
-          lastModified="2012/06/04">
-
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>ASP.NET MVC Razor Project</_Name>
-		<Category>other/aspnet/general</Category>
-		<Icon>md-project-web</Icon>
-		<Image id="md-aspnet-empty-project" />
-		<LanguageName>C#</LanguageName>
-		<_Description>Creates an ASP.NET MVC Project with Razor Views.</_Description>
-		<GroupId>md-mvc-razor-project</GroupId>
-	</TemplateConfiguration>
-
-
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "Controllers/HomeController.cs"/>
-	</Actions>
-
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-
-		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
-			<Options TargetFrameworkVersion = "4.5" />
-			<References>
-				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Core" />
-				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
-				<Reference type="Package" refto="System.Xml.Linq" />
-				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			</References>
-			<Packages>
-				<Package ID="Microsoft.AspNet.Mvc" Version="5.2" />
-			</Packages>
-			<Files>
-				<Directory name="Content" />
-				<Directory name="Controllers">
-					<File name="HomeController.cs" src="../MvcCommon/HomeController.cs" />
-				</Directory>
-				<Directory name="Models" />
-				<Directory name="Scripts" />
-				<Directory name="Views">
-					<FileTemplateReference TemplateID="AspMvcWebConfigViews" name="Web.config" SuppressAutoOpen="true"  />
-					<Directory name="Home">
-						<File name="Index.cshtml" src="../MvcCommon/Index.cshtml" />
-					</Directory>
-					<Directory name="Shared">
-						<File name="_Layout.cshtml" src="../MvcCommon/_Layout.cshtml" />
-						<File name="Error.cshtml" src="../MvcCommon/Error.cshtml" />
-					</Directory>
-					<File name="_ViewStart.cshtml" src="../MvcCommon/_ViewStart.cshtml" />
-				</Directory>
-				<FileTemplateReference TemplateID="AspMvcWebConfigApp" name="Web.config" SuppressAutoOpen="true" />
-				<FileTemplateReference TemplateID="AspMvcGlobalAsax" name="Global.asax" SuppressAutoOpen="true"  />
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/AspNet/Templates/Projects/MvcRazorProjectWithUnitTest.xpt.xml b/main/src/addins/AspNet/Templates/Projects/MvcRazorProjectWithUnitTest.xpt.xml
deleted file mode 100644
index abda80aecb..0000000000
--- a/main/src/addins/AspNet/Templates/Projects/MvcRazorProjectWithUnitTest.xpt.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<Template originator="Piotr Dowgiallo"
-          created="2012/06/05"
-          lastModified="2012/06/05">
-
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>ASP.NET MVC Razor Project with Unit Tests</_Name>
-		<Category>other/aspnet/general</Category>
-		<Icon>md-project-web</Icon>
-		<Image id="md-aspnet-empty-project" />
-		<LanguageName>C#</LanguageName>
-		<_Description>Creates an ASP.NET MVC Web Project with Razor Views and a Unit Test Project.</_Description>
-	</TemplateConfiguration>
-
-
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "Controllers/HomeController.cs"/>
-	</Actions>
-
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-
-		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
-			<Options TargetFrameworkVersion = "4.5" />
-			<References>
-				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Core" />
-				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
-				<Reference type="Package" refto="System.Xml.Linq" />
-				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			</References>
-			<Packages>
-				<Package ID="Microsoft.AspNet.Mvc" Version="5.2" />
-			</Packages>
-			<Files>
-				<Directory name="Content" />
-				<Directory name="Controllers">
-					<File name="HomeController.cs" src="../MvcCommon/HomeController.cs" />
-				</Directory>
-				<Directory name="Models" />
-				<Directory name="Scripts" />
-				<Directory name="Views">
-					<FileTemplateReference TemplateID="AspMvcWebConfigViews" name="Web.config" SuppressAutoOpen="true"  />
-					<Directory name="Home">
-						<File name="Index.cshtml" src="../MvcCommon/Index.cshtml" />
-					</Directory>
-					<Directory name="Shared">
-						<File name="_Layout.cshtml" src="../MvcCommon/_Layout.cshtml" />
-						<File name="Error.cshtml" src="../MvcCommon/Error.cshtml" />
-					</Directory>
-					<File name="_ViewStart.cshtml" src="../MvcCommon/_ViewStart.cshtml" />
-				</Directory>
-				<FileTemplateReference TemplateID="AspMvcWebConfigApp" name="Web.config" SuppressAutoOpen="true" />
-				<FileTemplateReference TemplateID="AspMvcGlobalAsax" name="Global.asax" SuppressAutoOpen="true"  />
-			</Files>
-		</Project>
-		<Project name = "${ProjectName}.Tests" directory = "${ProjectName}.Tests">
-			<Options Target = "Library" TargetFrameworkVersion = "4.5" />
-			<References>
-				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Core" />
-				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
-				<Reference type="Package" refto="System.Xml.Linq" />
-				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Project" refto="${ProjectName}" />
-			</References>
-			<Packages>
-				<Package ID="Microsoft.AspNet.Mvc" Version="5.2" />
-				<Package ID="NUnit" Version="2.6.3" />
-			</Packages>
-			<Files>
-				<Directory name="Controllers">
-					<File name="HomeControllerTest.cs" src="../MvcCommon/HomeControllerTest.cs" />
-				</Directory>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/AspNet/Templates/Projects/WebApplication.xpt.xml b/main/src/addins/AspNet/Templates/Projects/WebApplication.xpt.xml
deleted file mode 100644
index 0fe41abce8..0000000000
--- a/main/src/addins/AspNet/Templates/Projects/WebApplication.xpt.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<Template	originator="Michael Hutchinson"
-			created="2006/06/06"
-			lastModified="2006/06/06">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>ASP.NET Project</_Name>
-		<Category>other/aspnet/general</Category>
-		<Icon>md-project-web</Icon>
-		<Image id="md-aspnet-empty-project" />
-		<LanguageName>C#</LanguageName>
-		<_Description>Creates a new ASP.NET Web Application project.</_Description>
-	</TemplateConfiguration>
-	
-	<!-- Actions -->
-	<Actions>
-		<Open filename = "Default.aspx"/>
-	</Actions>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Options>
-			<StartupProject>${ProjectName}</StartupProject>
-		</Options>
-		
-		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
-			<Options />
-			<References>
-				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-			</References>
-			<Files>
-				<FileTemplateReference TemplateID="GlobalAsax-CodeBehind" name="Global.asax" />
-				<FileTemplateReference TemplateID="WebConfig-Application" name="web.config" />
-				
-				<File name="Default.aspx" DefaultExtension=".aspx">
-<![CDATA[<%@ Page Language="C#" Inherits="${Namespace}.${EscapedIdentifier}" %>
-<!DOCTYPE html>
-<html>
-<head runat="server">
-	<title>${Name}</title>
-</head>
-<body>
-	<form id="form1" runat="server">
-		<asp:Button id="button1" runat="server" Text="Click me!" OnClick="button1Clicked" />
-	</form>
-</body>
-</html>
-]]>
-				</File>
-				<File name="Default.aspx.cs">
-<![CDATA[using System;
-using System.Web;
-using System.Web.UI;
-
-namespace ${Namespace} {
-	
-	public partial class ${EscapedIdentifier} : System.Web.UI.Page
-	{
-		public void button1Clicked (object sender, EventArgs args)
-		{
-			button1.Text = "You clicked me";
-		}
-	}
-}
-]]>
-				</File>
-				<File name="Default.aspx.designer.cs" ShowAutogenerationNotice="True" AddStandardHeader="False" SuppressAutoOpen="True">
-<![CDATA[using System;
-using System.Web;
-using System.Web.UI;
-
-namespace ${Namespace} {
-	
-	public partial class ${EscapedIdentifier}
-	{
-		protected System.Web.UI.WebControls.Button button1;
-	}
-}
-]]>
-				</File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/AspNet/Templates/Projects/WebFormsProject.xpt.xml b/main/src/addins/AspNet/Templates/Projects/WebFormsProject.xpt.xml
new file mode 100644
index 0000000000..9f7a3e9f7a
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/Projects/WebFormsProject.xpt.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<Template	originator="Michael Hutchinson"
+			created="2006/06/06"
+			lastModified="2006/06/06">
+
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<_Name>ASP.NET Web Forms Project</_Name>
+		<Category>other/aspnet/general</Category>
+		<Icon>md-project-web</Icon>
+		<Image id="md-aspnet-empty-project" />
+		<LanguageName>C#</LanguageName>
+		<_Description>Creates a new ASP.NET Web Forms Project.</_Description>
+		<Wizard>MonoDevelop.AspNet.ProjectTemplateWizard</Wizard>
+		<DefaultParameters>UsesAspNetWebForms=true</DefaultParameters>
+		<SupportedParameters>UsesAspNetWebApi;UsesAspNetMvc</SupportedParameters>
+	</TemplateConfiguration>
+
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "Default.aspx"/>
+	</Actions>
+
+	<!-- Template Content -->
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+
+		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
+			<Options />
+			<References>
+				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+			</References>
+			<Packages>
+				<Package Id="Microsoft.AspNet.Mvc" Version="5.2.3" if="UsesAspNetMvc" />
+				<Package id="Microsoft.AspNet.WebApi" version="5.2.3" if="UsesAspNetWebApi" />
+				<package id="Newtonsoft.Json" version="6.0.8" if="UsesAspNetWebApi" />
+			</Packages>
+			<Files>
+				<Directory name="Content" if="UsesAspNetMvc" />
+				<Directory name="Controllers" if="UsesAspNetMvc" />
+				<Directory name="Models" if="UsesAspNetMvc" />
+				<Directory name="Scripts" if="UsesAspNetMvc" />
+				<Directory name="Views" if="UsesAspNetMvc">
+					<FileTemplateReference TemplateID="AspMvcWebConfigViews" name="Web.config" SuppressAutoOpen="true"  />
+				</Directory>
+				<FileTemplateReference TemplateID="GlobalAsax" name="Global.asax" />
+				<FileTemplateReference TemplateID="WebConfig-Application" name="web.config" />
+
+				<File name="Default.aspx" src="Files/Default.aspx" />
+				<File name="Default.aspx.cs" src="Files/Default.aspx.cs" />
+				<File name="Default.aspx.designer.cs" src="Files/Default.aspx.designer.cs" ShowAutogenerationNotice="True" AddStandardHeader="False" SuppressAutoOpen="True" />
+			</Files>
+		</Project>
+		<Project name = "${ProjectName}.Tests" directory = "${ProjectName}.Tests" if="IncludeTestProject">
+			<Options Target = "Library" TargetFrameworkVersion = "4.5" />
+			<References>
+				<Reference type="Package" refto="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Core" />
+				<Reference type="Package" refto="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
+				<Reference type="Package" refto="System.Xml.Linq" />
+				<Reference type="Package" refto="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Project" refto="${ProjectName}" />
+			</References>
+			<Packages>
+				<Package ID="NUnit" Version="2.6.4" />
+				<Package ID="Microsoft.AspNet.Mvc" Version="5.2.3" if="UsesAspNetMvc"/>
+				<Package id="Microsoft.AspNet.WebApi" version="5.2.3" if=" " />
+				<package id="Newtonsoft.Json" version="6.0.8" if=" " />
+			</Packages>
+			<Files>
+				<Directory name="Controllers" if="UsesAspNetMvc" />
+				<File name="Test.cs" src="Files/Test.cs" />
+			</Files>
+		</Project>
+	</Combine>
+</Template>
diff --git a/main/src/addins/AspNet/Templates/RouteConfig.cs b/main/src/addins/AspNet/Templates/RouteConfig.cs
new file mode 100644
index 0000000000..a6bf882278
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/RouteConfig.cs
@@ -0,0 +1,19 @@
+using System.Web.Mvc;
+using System.Web.Routing;
+
+namespace ${Namespace}
+{
+	public class RouteConfig
+	{
+		public static void RegisterRoutes(RouteCollection routes)
+		{
+			routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
+
+			routes.MapRoute(
+				name: "Default",
+				url: "{controller}/{action}/{id}",
+				defaults: new { controller = "Home", action = "Index", id = UrlParameter.Optional }
+			);
+		}
+	}
+}
diff --git a/main/src/addins/AspNet/Templates/WebApiConfig.cs b/main/src/addins/AspNet/Templates/WebApiConfig.cs
new file mode 100644
index 0000000000..58b9d5332c
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/WebApiConfig.cs
@@ -0,0 +1,21 @@
+using System.Web.Http;
+
+namespace ${Namespace}
+{
+	public static class WebApiConfig
+	{
+		public static void Register(HttpConfiguration config)
+		{
+			// Web API configuration and services
+
+			// Web API routes
+			config.MapHttpAttributeRoutes();
+
+			config.Routes.MapHttpRoute(
+				name: "DefaultApi",
+				routeTemplate: "api/{controller}/{id}",
+				defaults: new { id = RouteParameter.Optional }
+			);
+		}
+	}
+}
diff --git a/main/src/addins/AspNet/Templates/WebConfig-Application.xft.xml b/main/src/addins/AspNet/Templates/WebConfig-Application.xft.xml
index 954d3d418c..41e786594e 100644
--- a/main/src/addins/AspNet/Templates/WebConfig-Application.xft.xml
+++ b/main/src/addins/AspNet/Templates/WebConfig-Application.xft.xml
@@ -11,17 +11,17 @@
 		<Icon>md-html-file-icon</Icon>
 		<LanguageName>C#</LanguageName>
 		<ProjectType>AspNetApp</ProjectType>
-		<DefaultFilename IsFixed="True">web.config</DefaultFilename>
-		<_Description>Creates an ASP.NET web.config file for an application.</_Description>
+		<DefaultFilename IsFixed="True">Web.config</DefaultFilename>
+		<_Description>Creates an ASP.NET Web.config file for an application.</_Description>
 	</TemplateConfiguration>
 	
 	<Conditions>
-		<ParentProject PermittedCreationPaths="" ExcludedFiles="web.config" RequireProject="True"/>
+		<ParentProject PermittedCreationPaths="" ExcludedFiles="Web.config" RequireProject="True"/>
 	</Conditions>
 
 	<!-- Template Content -->
 	<TemplateFiles>
-		<File name="web.config">
+		<File name="Web.config">
 <![CDATA[<?xml version="1.0" ?>
 <!--
 Web.config file for ${ProjectName}.
@@ -31,53 +31,9 @@ http://www.mono-project.com/Config_system.web and
 http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
 -->
 <configuration>
-	<system.web>
-		<compilation 
-			defaultLanguage="C#"
-			debug="true"
-		>
-			<assemblies>
-			</assemblies>
-		</compilation>
-		
-		<customErrors
-			mode="RemoteOnly" 
-		>
-		</customErrors>
-		
-		<authentication
-			mode="None"
-		>
-		</authentication>
-		
-		<authorization>
-			<allow users="*" />
-		</authorization>
-		
-		<httpHandlers>
-		</httpHandlers>
-		
-		<trace 
-			enabled="false"
-			localOnly="true"
-			pageOutput="false"
-			requestLimit="10" 
-			traceMode="SortByTime"
-		/>
-		
-		<sessionState
-			mode="InProc" 
-			cookieless="false" 
-			timeout="20" 
-		/>
-		
-		<globalization
-			requestEncoding="utf-8" 
-			responseEncoding="utf-8" 
-		/>
-		
-		<pages>
-		</pages>
+		<system.web>
+			<compilation debug="true" targetFramework="4.5" />
+			<httpRuntime targetFramework="4.5" />
 	</system.web>
 </configuration>
 ]]>
diff --git a/main/src/addins/AspNet/Templates/WebForms/GlobalAsax-CodeBehind.xft.xml b/main/src/addins/AspNet/Templates/WebForms/GlobalAsax-CodeBehind.xft.xml
deleted file mode 100644
index caf20e8713..0000000000
--- a/main/src/addins/AspNet/Templates/WebForms/GlobalAsax-CodeBehind.xft.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<Template Originator="Michael Hutchinson"
-          Created="2006/08/21"
-          LastModified="2006/08/21">
-
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Global.asax with CodeBehind</_Name>
-		<_Category>ASP.NET Web Forms</_Category>
-		<Icon>md-html-file-icon</Icon>
-		<LanguageName>C#</LanguageName>
-		<ProjectType>AspNetApp</ProjectType>
-		<DefaultFilename IsFixed="True">Global.asax</DefaultFilename>
-		<_Description>Creates an ASP.NET Global.asax file with a CodeBehind class.</_Description>
-	</TemplateConfiguration>
-	
-	<Conditions>
-		<ParentProject PermittedCreationPaths="" ExcludedFiles="/Global.asax" />
-	</Conditions>
-
-	<!-- Template Content -->
-	<TemplateFiles>
-		<File name="Global.asax">
-<![CDATA[<%@ Application Inherits="${Namespace}.Global" %>]]>
-		</File>
-		<File name="Global.asax.cs" DependsOn="Global.asax" >
-<![CDATA[using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Web;
-using System.Web.SessionState;
-
-namespace ${Namespace}
-{
-	public class Global : System.Web.HttpApplication
-	{		
-		protected void Application_Start (Object sender, EventArgs e)
-		{
-
-		}
- 
-		protected void Session_Start (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_BeginRequest (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_EndRequest (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_AuthenticateRequest (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_Error (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Session_End (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_End (Object sender, EventArgs e)
-		{
-
-		}
-	}
-}]]>
-		</File>
-	</TemplateFiles>
-</Template>
diff --git a/main/src/addins/AspNet/Templates/WebForms/GlobalAsax-Empty.xft.xml b/main/src/addins/AspNet/Templates/WebForms/GlobalAsax-Empty.xft.xml
deleted file mode 100644
index f525d6722c..0000000000
--- a/main/src/addins/AspNet/Templates/WebForms/GlobalAsax-Empty.xft.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<Template	Originator="Michael Hutchinson"
-			Created="2006/08/21"
-			LastModified="2006/08/21">
-
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Global.asax</_Name>
-		<_Category>ASP.NET Web Forms</_Category>
-		<Icon>md-html-file-icon</Icon>
-		<LanguageName>C#</LanguageName>
-		<ProjectType>AspNetApp</ProjectType>
-		<DefaultFilename IsFixed="True">Global.asax</DefaultFilename>
-		<_Description>Creates an ASP.NET Global.asax file.</_Description>
-	</TemplateConfiguration>
-	
-	<Conditions>
-		<ParentProject PermittedCreationPaths="" ExcludedFiles="/Global.asax" />
-	</Conditions>
-
-	<!-- Template Content -->
-	<TemplateFiles>
-		<File name="Global.asax">
-<![CDATA[<%@ Application Language="C#" %>
-<script runat="server">
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Web;
-using System.Web.SessionState;
-
-namespace ${Namespace}
-{
-	public class Global : System.Web.HttpApplication
-	{		
-		protected void Application_Start (Object sender, EventArgs e)
-		{
-
-		}
- 
-		protected void Session_Start (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_BeginRequest (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_EndRequest (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_AuthenticateRequest (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_Error (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Session_End (Object sender, EventArgs e)
-		{
-
-		}
-
-		protected void Application_End (Object sender, EventArgs e)
-		{
-
-		}
-	}
-}]]>
-		</File>
-	</TemplateFiles>
-</Template>
diff --git a/main/src/addins/AspNet/Templates/images/aspnet-empty-project.png b/main/src/addins/AspNet/Templates/images/aspnet-empty-project.png
index 3fffa8a82b..df0b78b1f9 100644
--- a/main/src/addins/AspNet/Templates/images/aspnet-empty-project.png
+++ b/main/src/addins/AspNet/Templates/images/aspnet-empty-project.png
diff --git a/main/src/addins/AspNet/Templates/images/aspnet-empty-project@2x.png b/main/src/addins/AspNet/Templates/images/aspnet-empty-project@2x.png
index 6451bfae20..7b4464f373 100644
--- a/main/src/addins/AspNet/Templates/images/aspnet-empty-project@2x.png
+++ b/main/src/addins/AspNet/Templates/images/aspnet-empty-project@2x.png
diff --git a/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark.png b/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark.png
new file mode 100644
index 0000000000..54123c375a
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark.png
diff --git a/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark@2x.png b/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark@2x.png
new file mode 100644
index 0000000000..9e3cf6c4aa
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark@2x.png
diff --git a/main/src/addins/AspNet/Templates/images/aspnet-wizard-page.png b/main/src/addins/AspNet/Templates/images/aspnet-wizard-page.png
new file mode 100644
index 0000000000..a0cfc66c9e
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/images/aspnet-wizard-page.png
diff --git a/main/src/addins/AspNet/Templates/images/aspnet-wizard-page@2x.png b/main/src/addins/AspNet/Templates/images/aspnet-wizard-page@2x.png
new file mode 100644
index 0000000000..c8c6b1da38
--- /dev/null
+++ b/main/src/addins/AspNet/Templates/images/aspnet-wizard-page@2x.png
diff --git a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj
index 32b81dba69..1d1f24991c 100644
--- a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj
+++ b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj
@@ -38,6 +38,26 @@
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Razor\Dom\RazorCodeBlockParsingTests.cs" />
@@ -55,6 +75,8 @@
     <Compile Include="Razor\RazorCompletionTests.cs" />
     <Compile Include="Html\HtmlParsingTests.cs" />
     <Compile Include="Html\HtmlImplicitClosingTests.cs" />
+    <Compile Include="Razor\Dom\RazorDocumentTrackerTests.cs" />
+    <Compile Include="Razor\RazorParserTests.cs" />
     <Compile Include="WebForms\WebFormsSyntaxModeTests.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/main/src/addins/AspNet/Tests/Razor/Dom/RazorDocumentTrackerTests.cs b/main/src/addins/AspNet/Tests/Razor/Dom/RazorDocumentTrackerTests.cs
new file mode 100644
index 0000000000..f16fe1deb1
--- /dev/null
+++ b/main/src/addins/AspNet/Tests/Razor/Dom/RazorDocumentTrackerTests.cs
@@ -0,0 +1,79 @@
+//
+// RazorDocumentTrackerTests.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.AspNet.Razor.Dom;
+using MonoDevelop.AspNet.Razor.Parser;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Xml.Parser;
+using NUnit.Framework;
+using UnitTests;
+
+namespace MonoDevelop.AspNet.Tests.Razor.Dom
+{
+	[TestFixture]
+	public class RazorDocumentTrackerTests : TestBase
+	{
+		Func<ITextDocument> originalGetActiveDocument;
+		TextEditor editor;
+
+		[SetUp]
+		public void SetUp ()
+		{
+			originalGetActiveDocument = RazorWorkbenchService.GetActiveDocument;
+			editor = TextEditorFactory.CreateNewEditor ();
+			editor.MimeType = "text/x-cshtml";
+			RazorWorkbenchService.GetActiveDocument = () => {
+				return editor;
+			};
+		}
+
+		[TearDown]
+		public override void TearDown ()
+		{
+			RazorWorkbenchService.GetActiveDocument = originalGetActiveDocument;
+			base.TearDown ();
+		}
+
+		[Test]
+		public void StateShouldBeRazorRootStateAfterCodeBlock ()
+		{
+			editor.Text = 
+@"@{
+}
+
+";
+			var parser = new XmlParser (new RazorRootState (), false);
+			var tracker = new DocumentStateTracker<XmlParser> (parser, editor);
+			editor.CaretLine = 3;
+			tracker.UpdateEngine ();
+
+			Assert.IsInstanceOf<RazorRootState> (tracker.Engine.CurrentState);
+		}
+	}
+}
+
diff --git a/main/src/addins/AspNet/Tests/Razor/RazorCompletionTesting.cs b/main/src/addins/AspNet/Tests/Razor/RazorCompletionTesting.cs
index 7da98546eb..a82c38ef35 100644
--- a/main/src/addins/AspNet/Tests/Razor/RazorCompletionTesting.cs
+++ b/main/src/addins/AspNet/Tests/Razor/RazorCompletionTesting.cs
@@ -1,34 +1,37 @@
-//

-// RazorCompletionTesting.cs

-//

-// Author:

-//		Piotr Dowgiallo <sparekd@gmail.com>

-//

-// Copyright (c) 2012 Piotr Dowgiallo

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

+//
+// RazorCompletionTesting.cs
+//
+// Author:
+//		Piotr Dowgiallo <sparekd@gmail.com>
+//
+// Copyright (c) 2012 Piotr Dowgiallo
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System.IO;

+using System.Threading;

+using System.Threading.Tasks;
 using ICSharpCode.NRefactory.Completion;

 using MonoDevelop.AspNet.Projects;

 using MonoDevelop.AspNet.Razor;

 using MonoDevelop.AspNet.Razor.Parser;

+using MonoDevelop.Core.Text;

 using MonoDevelop.CSharpBinding;

 using MonoDevelop.CSharpBinding.Tests;

 using MonoDevelop.Ide.CodeCompletion;

@@ -41,47 +44,78 @@ namespace MonoDevelop.AspNet.Tests.Razor
 	//largely copied from MonoDevelop.AspNet.Tests.AspNetTesting

 

 	static class RazorCompletionTesting

-	{

+	{
+// TODO: Roslyn port

 		static readonly string extension = ".cshtml";

 

-		public static CompletionDataList CreateRazorCtrlSpaceProvider (string text, bool isInCSharpContext)

+		public static Task<CompletionDataList> CreateRazorCtrlSpaceProvider (string text, bool isInCSharpContext)

 		{

 			return CreateProvider (text, isInCSharpContext, true);

 		}

 

-		public static CompletionDataList CreateProvider (string text, bool isInCSharpContext = false, bool isCtrlSpace = false)

+		public static async Task<CompletionDataList> CreateProvider (string text, bool isInCSharpContext = false, bool isCtrlSpace = false)

 		{

-			string editorText;

-			TestViewContent sev;

-

-			var textEditorCompletion = CreateEditor (text, isInCSharpContext, out editorText, out sev);

+			var ed = await CreateEditor (text, isInCSharpContext);

 			int cursorPosition = text.IndexOf ('$');

 

-			int triggerWordLength = 1;

-			var ctx = textEditorCompletion.GetCodeCompletionContext (isInCSharpContext, sev);

+			var ctx = GetCodeCompletionContext (isInCSharpContext, ed.View, ed.Extension.hiddenInfo.UnderlyingDocument);

+

+			if (isCtrlSpace) {

+				var result = await ed.Extension.CodeCompletionCommand (ctx) as CompletionDataList;

+				TypeSystemServiceTestExtensions.UnloadSolution (solution);

+				return result;

+			} else {

+				var task = ed.Extension.HandleCodeCompletionAsync (ctx, ed.EditorText [cursorPosition - 1], default(CancellationToken));

+				TypeSystemServiceTestExtensions.UnloadSolution (solution);
+				if (task != null) {
+					return await task as CompletionDataList;
+				}
+				return null;

+			}

+		}

 

-			if (isCtrlSpace)

-				return textEditorCompletion.CodeCompletionCommand (ctx) as CompletionDataList;

+		static CodeCompletionContext GetCodeCompletionContext (bool cSharpContext, TestViewContent sev, UnderlyingDocument underlyingDocument)

+		{

+			var ctx = new CodeCompletionContext ();

+			if (!cSharpContext)

+				ctx.TriggerOffset = sev.CursorPosition;

 			else

-				return textEditorCompletion.HandleCodeCompletion (ctx, editorText[cursorPosition - 1], ref triggerWordLength) as CompletionDataList;

+				ctx.TriggerOffset = underlyingDocument.Editor.CaretOffset;

+

+			int line, column;

+			sev.GetLineColumnFromPosition (ctx.TriggerOffset, out line, out column);

+			ctx.TriggerLine = line;

+			ctx.TriggerLineOffset = column - 1;

+

+			return ctx;

 		}

 

-		public static IParameterDataProvider CreateProvider (string text)

+		public static async Task<ParameterHintingResult> CreateParameterProvider (string text)

 		{

-			string editorText;

-			TestViewContent sev;

+			var ed = await CreateEditor (text, true);
 

-			var textEditorCompletion = CreateEditor (text, true, out editorText, out sev);

 			int cursorPosition = text.IndexOf ('$');

 

-			var ctx = textEditorCompletion.GetCodeCompletionContext (true, sev);

-			return textEditorCompletion.HandleParameterCompletion (ctx, editorText[cursorPosition - 1]);

+			var ctx = GetCodeCompletionContext (true, ed.View, ed.Extension.hiddenInfo.UnderlyingDocument);
+			var task = ed.Extension.HandleParameterCompletionAsync (ctx, ed.EditorText[cursorPosition - 1], default(CancellationToken));
+			if (task != null) {
+				return await task;
+			}
+			return null;

 		}

 

-		static RazorTestingEditorExtension CreateEditor (string text, bool isInCSharpContext, out string editorText,

-			out TestViewContent sev)

+		static Solution solution;
+
+		class EditorInfo
+		{
+			public RazorCSharpEditorExtension Extension;
+			public string EditorText;
+			public TestViewContent View;
+		}

+

+		static async Task<EditorInfo> CreateEditor (string text, bool isInCSharpContext)

 		{

-			string parsedText;

+			string parsedText, editorText;

 			int cursorPosition = text.IndexOf ('$');

 			int endPos = text.IndexOf ('$', cursorPosition + 1);

 			if (endPos == -1)

@@ -92,17 +126,13 @@ namespace MonoDevelop.AspNet.Tests.Razor
 				cursorPosition = endPos - 1;

 			}

 

-			var project = new AspNetAppProject ("C#");

+			var project = Services.ProjectService.CreateProject ("C#", "AspNetApp");

 

 			project.FileName = UnitTests.TestBase.GetTempFile (".csproj");

 			string file = UnitTests.TestBase.GetTempFile (extension);

 			project.AddFile (file);

 

-			var pcw = TypeSystemService.LoadProject (project);

-			TypeSystemService.ForceUpdate (pcw);

-			pcw.ReconnectAssemblyReferences ();

-

-			sev = new TestViewContent ();

+			var sev = new TestViewContent ();

 			sev.Project = project;

 			sev.ContentName = file;

 			sev.Text = editorText;

@@ -111,13 +141,32 @@ namespace MonoDevelop.AspNet.Tests.Razor
 			var tww = new TestWorkbenchWindow ();

 			tww.ViewContent = sev;

 

-			var doc = new Document (tww);

+			var doc = new TestDocument (tww);

+			doc.Editor.FileName = sev.ContentName;

+			doc.UpdateProject (project);

+

+			solution = new MonoDevelop.Projects.Solution ();

+			solution.DefaultSolutionFolder.AddItem (project);

+			solution.AddConfiguration ("", true);

+			await TypeSystemServiceTestExtensions.LoadSolution (solution);

+

 			var parser = new RazorTestingParser {

 				Doc = doc

 			};

-			var parsedDoc = parser.Parse (false, sev.ContentName, new StringReader (parsedText), project);

-

-			return new RazorTestingEditorExtension (doc, parsedDoc as RazorCSharpParsedDocument, isInCSharpContext);

+			var options = new ParseOptions {

+				Project = project,

+				FileName = sev.ContentName,

+				Content = new StringTextSource (parsedText)

+			};

+			var parsedDoc = await parser.Parse (options, default(CancellationToken)) as RazorCSharpParsedDocument;

+			doc.HiddenParsedDocument = parsedDoc;

+

+			var editorExtension = new RazorCSharpEditorExtension (doc, parsedDoc as RazorCSharpParsedDocument, isInCSharpContext);

+			return new EditorInfo {
+				Extension = editorExtension,
+				EditorText = editorText,
+				View = sev
+			};

 		}

 	}

 

@@ -125,40 +174,11 @@ namespace MonoDevelop.AspNet.Tests.Razor
 	{

 		public Document	Doc { get; set; }

 

-		public override ParsedDocument Parse (bool storeAst, string fileName, System.IO.TextReader content, Project project = null)

-		{

-			Doc.Editor.Document.FileName = fileName;

-			OpenDocuments.Add (Doc.Editor.Document);

-			return base.Parse (storeAst, fileName, content, project);

-		}

-	}

-

-	public class RazorTestingEditorExtension : RazorCSharpEditorExtension

-	{

-		public RazorTestingEditorExtension (Document doc, RazorCSharpParsedDocument parsedDoc, bool cSharpContext)

-		{

-			razorDocument = parsedDoc;

-			Initialize (doc);

-			if (cSharpContext) {

-				InitializeCodeCompletion ();

-				SwitchToHidden ();

-			}

-		}

-

-		public CodeCompletionContext GetCodeCompletionContext (bool cSharpContext, TestViewContent sev)

+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)

 		{

-			var ctx = new CodeCompletionContext ();

-			if (!cSharpContext)

-				ctx.TriggerOffset = sev.CursorPosition;

-			else

-				ctx.TriggerOffset = hiddenInfo.UnderlyingDocument.Editor.Caret.Offset;

-

-			int line, column;

-			sev.GetLineColumnFromPosition (ctx.TriggerOffset, out line, out column);

-			ctx.TriggerLine = line;

-			ctx.TriggerLineOffset = column - 1;

-

-			return ctx;

+			Doc.Editor.FileName = parseOptions.FileName;

+			OpenDocuments.Add (new OpenRazorDocument (Doc.Editor));

+			return base.Parse (parseOptions, cancellationToken);

 		}

 	}

 }

diff --git a/main/src/addins/AspNet/Tests/Razor/RazorCompletionTests.cs b/main/src/addins/AspNet/Tests/Razor/RazorCompletionTests.cs
index 98b36239c4..15bd1f5d40 100644
--- a/main/src/addins/AspNet/Tests/Razor/RazorCompletionTests.cs
+++ b/main/src/addins/AspNet/Tests/Razor/RazorCompletionTests.cs
@@ -24,36 +24,36 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using System.Threading.Tasks;
 using NUnit.Framework;
 using UnitTests;
 
 namespace MonoDevelop.AspNet.Tests.Razor
 {
-	[Ignore ("Not working")]
 	[TestFixture]
 	class RazorCompletionTests : TestBase
 	{
 		[Test]
-		public void HtmlTagsCompletion ()
+		public async Task HtmlTagsCompletion ()
 		{
-			var provider = RazorCompletionTesting.CreateProvider ("<$", false);
+			var provider = await RazorCompletionTesting.CreateProvider ("<$", false);
 			Assert.IsNotNull (provider);
 			Assert.IsNotNull (provider.Find ("p"));
 			Assert.IsNotNull (provider.Find ("div"));
 		}
 
 		[Test]
-		public void NestedHtmlTagsCompletion ()
+		public async Task NestedHtmlTagsCompletion ()
 		{
-			var provider = RazorCompletionTesting.CreateProvider ("<div><ul><$ </ul></div>", false);
+			var provider = await RazorCompletionTesting.CreateProvider ("<div><ul><$ </ul></div>", false);
 			Assert.IsNotNull (provider);
 			Assert.IsNotNull (provider.Find ("li"));
 		}
 
 		[Test]
-		public void RazorDirectivesAndStatementsCompletion ()
+		public async Task RazorDirectivesAndStatementsCompletion ()
 		{
-			var provider = RazorCompletionTesting.CreateProvider ("@m$", true);
+			var provider = await RazorCompletionTesting.CreateProvider ("@m$", true);
 			Assert.IsNotNull (provider);
 			Assert.IsNotNull (provider.Find ("model"));
 			Assert.IsNotNull (provider.Find ("sessionstate"));
@@ -63,54 +63,57 @@ namespace MonoDevelop.AspNet.Tests.Razor
 			Assert.IsNotNull (provider.Find ("functions"));
 			Assert.IsNotNull (provider.Find ("helper"));
 			Assert.IsNotNull (provider.Find ("inherits"));
-			Assert.IsNotNull (provider.Find ("for"));
-			Assert.IsNotNull (provider.Find ("foreach"));
-			Assert.IsNotNull (provider.Find ("while"));
-			Assert.IsNotNull (provider.Find ("do"));
-			Assert.IsNotNull (provider.Find ("lock"));
-			Assert.IsNotNull (provider.Find ("switch"));
-			Assert.IsNotNull (provider.Find ("if"));
-			Assert.IsNotNull (provider.Find ("try"));
+
+			// TODO: Roslyn - the following are not working.
+			// They work for Ctrl+Space completion but not with completion as you type.
+//			Assert.IsNotNull (provider.Find ("for"));
+//			Assert.IsNotNull (provider.Find ("foreach"));
+//			Assert.IsNotNull (provider.Find ("while"));
+//			Assert.IsNotNull (provider.Find ("do"));
+//			Assert.IsNotNull (provider.Find ("lock"));
+//			Assert.IsNotNull (provider.Find ("switch"));
+//			Assert.IsNotNull (provider.Find ("if"));
+//			Assert.IsNotNull (provider.Find ("try"));
 		}
 
 		[Test]
-		public void CSharpIdentifiersCompletion ()
+		public async Task CSharpIdentifiersCompletion ()
 		{
-			var provider = RazorCompletionTesting.CreateProvider ("@{ i$ }", true);
+			var provider = await RazorCompletionTesting.CreateProvider ("@{ i$ }", true);
 			Assert.IsNotNull (provider);
 			Assert.IsNotNull (provider.Find ("int"));
 			Assert.IsNotNull (provider.Find ("var"));
 		}
 
 		[Test]
-		public void CSharpIdentifiersCtrlSpaceCompletion ()
+		public async Task CSharpIdentifiersCtrlSpaceCompletion ()
 		{
-			var provider = RazorCompletionTesting.CreateRazorCtrlSpaceProvider ("@{ $ }", true);
+			var provider = await RazorCompletionTesting.CreateRazorCtrlSpaceProvider ("@{ $ }", true);
 			Assert.IsNotNull (provider);
 			Assert.IsNotNull (provider.Find ("int"));
 			Assert.IsNotNull (provider.Find ("var"));
 		}
 
 		[Test]
-		public void CSharpMembersCompletion ()
+		public async Task CSharpMembersCompletion ()
 		{
-			var provider = RazorCompletionTesting.CreateProvider ("@{ Char.$ }", true);
+			var provider = await RazorCompletionTesting.CreateProvider ("@{ Char.$ }", true);
 			Assert.IsNotNull (provider);
 			Assert.IsNotNull (provider.Find ("IsLetter"));
 		}
 
 		[Test]
-		public void CSharpMembersCtrlSpaceCompletion ()
+		public async Task CSharpMembersCtrlSpaceCompletion ()
 		{
-			var provider = RazorCompletionTesting.CreateRazorCtrlSpaceProvider ("@{ Char.Is$ }", true);
+			var provider = await RazorCompletionTesting.CreateRazorCtrlSpaceProvider ("@{ Char.Is$ }", true);
 			Assert.IsNotNull (provider);
 			Assert.IsNotNull (provider.Find ("IsLetter"));
 		}
 
 		[Test]
-		public void CSharpParametersCompletion ()
+		public async Task CSharpParametersCompletion ()
 		{
-			var provider = RazorCompletionTesting.CreateProvider ("@{ Char.IsLetter($ }");
+			var provider = await RazorCompletionTesting.CreateParameterProvider ("@{ Char.IsLetter($ }");
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (2, provider.Count);
 		}
diff --git a/main/src/addins/AspNet/Tests/Razor/RazorParserTests.cs b/main/src/addins/AspNet/Tests/Razor/RazorParserTests.cs
new file mode 100644
index 0000000000..dd378a1ac9
--- /dev/null
+++ b/main/src/addins/AspNet/Tests/Razor/RazorParserTests.cs
@@ -0,0 +1,108 @@
+//
+// RazorParserTests.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.AspNet.Projects;
+using MonoDevelop.AspNet.Razor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.CSharpBinding;
+using MonoDevelop.CSharpBinding.Tests;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Projects;
+using NUnit.Framework;
+using UnitTests;
+
+namespace MonoDevelop.AspNet.Tests.Razor
+{
+	[TestFixture]
+	public class RazorParserTests : TestBase
+	{
+		Solution solution;
+
+		[TearDown]
+		public override void TearDown ()
+		{
+			TypeSystemServiceTestExtensions.UnloadSolution (solution);
+			base.TearDown ();
+		}
+
+		[Test]
+		public async Task PreprocessedFileUsesPreprocessorRazorHost ()
+		{
+			var document = await Parse ("@{ }", isPreprocessed: true);
+			var method = document.PageInfo.CSharpSyntaxTree
+				.GetRoot ()
+				.DescendantNodes ()
+				.OfType <MethodDeclarationSyntax> ()
+				.FirstOrDefault (m => m.Identifier.ValueText == "Generate");
+
+			Assert.IsNotNull (method);
+		}
+
+		async Task<RazorCSharpParsedDocument> Parse (string text, bool isPreprocessed)
+		{
+			var project = Services.ProjectService.CreateDotNetProject ("C#", "AspNetApp");
+
+			project.FileName = UnitTests.TestBase.GetTempFile (".csproj");
+			string file = UnitTests.TestBase.GetTempFile (".cshtml");
+			ProjectFile projectFile = project.AddFile (file);
+			if (isPreprocessed)
+				projectFile.Generator = "RazorTemplatePreprocessor";
+
+			var sev = new TestViewContent ();
+			sev.Project = project;
+			sev.ContentName = file;
+			sev.Text = text;
+
+			var tww = new TestWorkbenchWindow ();
+			tww.ViewContent = sev;
+
+			var doc = new TestDocument (tww);
+			doc.Editor.FileName = sev.ContentName;
+			doc.UpdateProject (project);
+
+			solution = new MonoDevelop.Projects.Solution ();
+			solution.DefaultSolutionFolder.AddItem (project);
+			solution.AddConfiguration ("", true);
+			await TypeSystemServiceTestExtensions.LoadSolution (solution);
+
+			var parser = new RazorTestingParser {
+				Doc = doc
+			};
+			var options = new ParseOptions {
+				Project = project,
+				FileName = file,
+				Content = new StringTextSource (text)
+			};
+			return (RazorCSharpParsedDocument)parser.Parse (options, default(CancellationToken)).Result;
+		}
+	}
+}
+
diff --git a/main/src/addins/AspNet/Tests/WebForms/WebFormsCompletionTests.cs b/main/src/addins/AspNet/Tests/WebForms/WebFormsCompletionTests.cs
index 0c041400dc..7357b046e2 100644
--- a/main/src/addins/AspNet/Tests/WebForms/WebFormsCompletionTests.cs
+++ b/main/src/addins/AspNet/Tests/WebForms/WebFormsCompletionTests.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System;
+using System.Threading.Tasks;
 using NUnit.Framework;
 
 namespace MonoDevelop.AspNet.Tests.WebForms
@@ -33,50 +34,50 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 	class WebFormsCompletionTests : UnitTests.TestBase
 	{
 		[Test]
-		public void DirectiveCompletion ()
+		public async Task DirectiveCompletion ()
 		{
-			var provider = WebFormsTesting.CreateProvider (@"<%@ $ %>", ".aspx");
+			var provider = await WebFormsTesting.CreateProvider (@"<%@ $ %>", ".aspx");
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (9, provider.Count);
 			Assert.IsNotNull (provider.Find ("Page"));
 			Assert.IsNotNull (provider.Find ("Register"));
 			
-			provider = WebFormsTesting.CreateProvider (@"<%@ $ %>", ".master");
+			provider = await WebFormsTesting.CreateProvider (@"<%@ $ %>", ".master");
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (7, provider.Count);
 			Assert.IsNotNull (provider.Find ("Master"));
 			Assert.IsNotNull (provider.Find ("Register"));
 			
-			provider = WebFormsTesting.CreateProvider (@"<%@ $ %>", ".ascx");
+			provider = await WebFormsTesting.CreateProvider (@"<%@ $ %>", ".ascx");
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (7, provider.Count);
 			Assert.IsNotNull (provider.Find ("Control"));
 			Assert.IsNotNull (provider.Find ("Register"));
 			
-			provider = WebFormsTesting.CreateProvider (@"<%@$ %>", ".aspx");
+			provider = await WebFormsTesting.CreateProvider (@"<%@$ %>", ".aspx");
 			Assert.IsNull (provider);
 			
-			provider = WebFormsTesting.CreateProvider (@"<%@   $ %>", ".aspx");
+			provider = await WebFormsTesting.CreateProvider (@"<%@   $ %>", ".aspx");
 			Assert.IsNull (provider);
 		}
 		
 		[Test]
-		public void DirectiveAttributeCompletion ()
+		public async Task DirectiveAttributeCompletion ()
 		{
-			var provider = WebFormsTesting.CreateProvider (@"<%@ Page A$ %>", ".aspx");
+			var provider = await WebFormsTesting.CreateProvider (@"<%@ Page A$ %>", ".aspx");
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (41, provider.Count);
 			Assert.IsNotNull (provider.Find ("StyleSheetTheme"));
 			Assert.IsNotNull (provider.Find ("Inherits"));
 			
-			provider = WebFormsTesting.CreateProvider (@"<%@ Master A$ %>", ".master");
+			provider = await WebFormsTesting.CreateProvider (@"<%@ Master A$ %>", ".master");
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (18, provider.Count);
 			Assert.IsNull (provider.Find ("StyleSheetTheme"));
 			Assert.IsNotNull (provider.Find ("MasterPageFile"));
 			Assert.IsNotNull (provider.Find ("Inherits"));
 			
-			provider = WebFormsTesting.CreateProvider (@"<%@ Control A$ %>", ".ascx");
+			provider = await WebFormsTesting.CreateProvider (@"<%@ Control A$ %>", ".ascx");
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (17, provider.Count);
 			Assert.IsNull (provider.Find ("StyleSheetTheme"));
@@ -85,22 +86,22 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 		
 		[Test]
 		[Ignore ("Not working")]
-		public void DirectiveAttributeCtrlSpaceCompletion ()
+		public async Task DirectiveAttributeCtrlSpaceCompletion ()
 		{
-			var provider = WebFormsTesting.CreateProvider (@"<%@ Page $ %>", ".aspx", true);
+			var provider = await WebFormsTesting.CreateProvider (@"<%@ Page $ %>", ".aspx", true);
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (41, provider.Count);
 			Assert.IsNotNull (provider.Find ("StyleSheetTheme"));
 			Assert.IsNotNull (provider.Find ("Inherits"));
 			
-			provider = WebFormsTesting.CreateProvider (@"<%@ Master $ %>", ".master", true);
+			provider = await WebFormsTesting.CreateProvider (@"<%@ Master $ %>", ".master", true);
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (18, provider.Count);
 			Assert.IsNull (provider.Find ("StyleSheetTheme"));
 			Assert.IsNotNull (provider.Find ("MasterPageFile"));
 			Assert.IsNotNull (provider.Find ("Inherits"));
 			
-			provider = WebFormsTesting.CreateProvider (@"<%@ Control $ %>", ".ascx", true);
+			provider = await WebFormsTesting.CreateProvider (@"<%@ Control $ %>", ".ascx", true);
 			Assert.IsNotNull (provider);
 			Assert.AreEqual (17, provider.Count);
 			Assert.IsNull (provider.Find ("StyleSheetTheme"));
@@ -111,9 +112,9 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 <!DOCTYPE html>
 <html>
 ";
-		void HeadBodyCompletion (bool ctrlSpace)
+		async Task HeadBodyCompletion (bool ctrlSpace)
 		{
-			var provider = WebFormsTesting.CreateProvider (pageStart + "<$", ".aspx", ctrlSpace);
+			var provider = await WebFormsTesting.CreateProvider (pageStart + "<$", ".aspx", ctrlSpace);
 			Assert.IsNotNull (provider);
 			Assert.IsNotNull (provider.Find ("head"));
 			Assert.IsNotNull (provider.Find ("body"));
@@ -123,29 +124,29 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 		}
 
 		[Test]
-		public void HeadBodyCompletionAuto ()
+		public async Task HeadBodyCompletionAuto ()
 		{
-			HeadBodyCompletion (false);
+			await HeadBodyCompletion (false);
 		}
 
 		[Test]
-		public void HeadBodyCompletionCtrlSpace ()
+		public async Task HeadBodyCompletionCtrlSpace ()
 		{
-			HeadBodyCompletion (true);
+			await HeadBodyCompletion (true);
 		}
 
 		[Test]
-		public void TagPropertiesAuto ()
+		public async Task TagPropertiesAuto ()
 		{
-			var provider = WebFormsTesting.CreateProvider (pageStart + "<asp:Button r$", ".aspx");
+			var provider = await WebFormsTesting.CreateProvider (pageStart + "<asp:Button r$", ".aspx");
 			Assert.IsNotNull (provider.Find ("runat=\"server\""));
 			Assert.IsNotNull (provider.Find ("BorderStyle"));
 		}
 
 		[Test]
-		public void TagPropertiesCtrlSpace ()
+		public async Task TagPropertiesCtrlSpace ()
 		{
-			var provider = WebFormsTesting.CreateProvider (pageStart + "<asp:Button $", ".aspx", true);
+			var provider = await WebFormsTesting.CreateProvider (pageStart + "<asp:Button $", ".aspx", true);
 			Assert.IsNotNull (provider.Find ("runat=\"server\""));
 			Assert.IsNotNull (provider.Find ("id"));
 			Assert.IsNotNull (provider.Find ("BorderStyle"));
diff --git a/main/src/addins/AspNet/Tests/WebForms/WebFormsTesting.cs b/main/src/addins/AspNet/Tests/WebForms/WebFormsTesting.cs
index 4f8e2444d9..1f8273e471 100644
--- a/main/src/addins/AspNet/Tests/WebForms/WebFormsTesting.cs
+++ b/main/src/addins/AspNet/Tests/WebForms/WebFormsTesting.cs
@@ -25,8 +25,11 @@
 // THE SOFTWARE.
 
 using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms;
+using MonoDevelop.Core.Text;
 using MonoDevelop.CSharpBinding;
 using MonoDevelop.CSharpBinding.Tests;
 using MonoDevelop.Ide.CodeCompletion;
@@ -39,25 +42,38 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 	//largely copied from RazorCompletionTesting
 	static class WebFormsTesting
 	{
-		public static CompletionDataList CreateProvider (string text, string extension, bool isCtrlSpace = false)
+		public static async Task<CompletionDataList> CreateProvider (string text, string extension, bool isCtrlSpace = false)
 		{
-			string editorText;
-			TestViewContent sev;
-
-			var textEditorCompletion = CreateEditor (text, extension, out editorText, out sev);
+			var result = await CreateEditor (text, extension);
+			var textEditorCompletion = result.Extension;
+			string editorText = result.EditorText;
+			TestViewContent sev = result.ViewContent;
 			int cursorPosition = text.IndexOf ('$');
 
-			int triggerWordLength = 1;
 			var ctx = textEditorCompletion.GetCodeCompletionContext (sev);
 
 			if (isCtrlSpace)
-				return textEditorCompletion.CodeCompletionCommand (ctx) as CompletionDataList;
-			else
-				return textEditorCompletion.HandleCodeCompletion (ctx, editorText[cursorPosition - 1], ref triggerWordLength) as CompletionDataList;
+				return await textEditorCompletion.CodeCompletionCommand (ctx) as CompletionDataList;
+			else {
+				var task = textEditorCompletion.HandleCodeCompletionAsync (ctx, editorText [cursorPosition - 1]);
+				if (task != null) {
+					return await task as CompletionDataList;
+				}
+				return null;
+			}
 		}
 
-		static WebFormsTestingEditorExtension CreateEditor (string text, string extension, out string editorText, out TestViewContent sev)
+		struct CreateEditorResult
 		{
+			public WebFormsTestingEditorExtension Extension;
+			public string EditorText;
+			public TestViewContent ViewContent;
+		}
+
+		static async Task<CreateEditorResult> CreateEditor (string text, string extension)
+		{
+			string editorText;
+			TestViewContent sev;
 			string parsedText;
 			int cursorPosition = text.IndexOf ('$');
 			int endPos = text.IndexOf ('$', cursorPosition + 1);
@@ -69,17 +85,13 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 				cursorPosition = endPos - 1;
 			}
 
-			var project = new AspNetAppProject ("C#");
-			project.References.Add (new ProjectReference (ReferenceType.Package, "System"));
-			project.References.Add (new ProjectReference (ReferenceType.Package, "System.Web"));
+			var project = Services.ProjectService.CreateDotNetProject ("C#");
+			project.References.Add (ProjectReference.CreateAssemblyReference ("System"));
+			project.References.Add (ProjectReference.CreateAssemblyReference ("System.Web"));
 			project.FileName = UnitTests.TestBase.GetTempFile (".csproj");
 			string file = UnitTests.TestBase.GetTempFile (extension);
 			project.AddFile (file);
 
-			var pcw = TypeSystemService.LoadProject (project);
-			TypeSystemService.ForceUpdate (pcw);
-			pcw.ReconnectAssemblyReferences ();
-
 			sev = new TestViewContent ();
 			sev.Project = project;
 			sev.ContentName = file;
@@ -90,19 +102,28 @@ namespace MonoDevelop.AspNet.Tests.WebForms
 			tww.ViewContent = sev;
 
 			var doc = new TestDocument (tww);
-			doc.Editor.Document.FileName = sev.ContentName;
+			doc.Editor.FileName = sev.ContentName;
 			var parser = new WebFormsParser ();
-			var parsedDoc = (WebFormsParsedDocument) parser.Parse (false, sev.ContentName, new StringReader (parsedText), project);
+			var options = new ParseOptions {
+				Project = project,
+				FileName = sev.ContentName,
+				Content = new StringTextSource (parsedText)
+			};
+			var parsedDoc = await parser.Parse (options, default(CancellationToken)) as WebFormsParsedDocument;
 			doc.HiddenParsedDocument = parsedDoc;
 
-			return new WebFormsTestingEditorExtension (doc);
+			return new CreateEditorResult {
+				Extension = new WebFormsTestingEditorExtension (doc),
+				EditorText = editorText,
+				ViewContent = sev
+			};
 		}
 
 		public class WebFormsTestingEditorExtension : WebFormsEditorExtension
 		{
 			public WebFormsTestingEditorExtension (Document doc)
 			{
-				Initialize (doc);
+				Initialize (doc.Editor, doc);
 			}
 
 			public CodeCompletionContext GetCodeCompletionContext (TestViewContent sev)
diff --git a/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs b/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs
new file mode 100644
index 0000000000..3bf093be49
--- /dev/null
+++ b/main/src/addins/AspNet/WebForms/CSharp/CSharpProjector.cs
@@ -0,0 +1,109 @@
+//
+// CSharpProjector.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Text;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.AspNet.WebForms.Dom;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor.Projection;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.AspNet.WebForms.CSharp
+{
+	public class CSharpProjector
+	{
+		public Task<Projection> CreateProjection (DocumentInfo info, IReadonlyTextDocument data, bool buildExpressions)
+		{
+			if (info == null)
+				throw new ArgumentNullException ("info");
+			if (data == null)
+				throw new ArgumentNullException ("data");
+			var document = new StringBuilder ();
+
+			WriteUsings (info.Imports, document);
+			var segBuilder = System.Collections.Immutable.ImmutableList<ProjectedSegment>.Empty.ToBuilder ();
+
+			foreach (var node in info.XScriptBlocks) {
+				var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+				var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+
+				segBuilder.Add (new ProjectedSegment (start, document.Length, end - start));
+
+				document.AppendLine (data.GetTextBetween (start, end));
+			}
+			if (buildExpressions) {
+				WriteClassDeclaration (info, document);
+				document.AppendLine ("{");
+				document.AppendLine ("void Generated ()");
+				document.AppendLine ("{");
+				//Console.WriteLine ("start:" + location.BeginLine  +"/" +location.BeginColumn);
+
+				foreach (var node in info.XExpressions) {
+					bool isBlock = node is WebFormsRenderBlock;
+
+					var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+					var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+
+					if (!isBlock) {
+						document.Append ("WriteLine (");
+						start += 1;
+					}
+
+					string expr = data.GetTextBetween (start, end);
+					segBuilder.Add (new ProjectedSegment (start, document.Length, expr.Length));
+					document.Append (expr);
+					if (!isBlock)
+						document.Append (");");
+				}
+				document.AppendLine ("}");
+				document.AppendLine ("}");
+			}
+			return Task.FromResult(new Projection (
+				TextEditorFactory.CreateNewDocument (new StringTextSource (document.ToString ()), info.AspNetDocument.FileName + ".g.cs", "text/x-csharp"),
+				segBuilder.ToImmutable ()
+			));
+		}
+
+		static void WriteUsings (IEnumerable<string> usings, StringBuilder builder)
+		{
+			foreach (var u in usings) {
+				builder.Append ("using ");
+				builder.Append (u);
+				builder.AppendLine (";");
+			}
+		}
+
+		static void WriteClassDeclaration (DocumentInfo info, StringBuilder builder)
+		{
+			builder.Append ("partial class ");
+			builder.Append (info.ClassName);
+			builder.Append (" : ");
+			builder.AppendLine (info.BaseType);
+		}
+	}
+}
+
diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsBindingExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsBindingExpression.cs
index 37c5893f40..c9b2a02fa7 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsBindingExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsBindingExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	public class WebFormsBindingExpression : WebFormsExpression

 	{
-		public WebFormsBindingExpression (DomRegion region) : base (region)

+		public WebFormsBindingExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		public WebFormsBindingExpression (TextLocation start) : base (start)

+		public WebFormsBindingExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsDirective.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsDirective.cs
index 744e6480e6..e17e59e022 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsDirective.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsDirective.cs
@@ -26,8 +26,8 @@
 
 using System.Diagnostics;
 using System.Text;
-using ICSharpCode.NRefactory;
-using MonoDevelop.Xml.Dom;
+using MonoDevelop.Xml.Dom;

+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
@@ -36,12 +36,12 @@ namespace MonoDevelop.AspNet.WebForms.Dom
 		XName name;
 		XAttributeCollection attributes;
 
-		public WebFormsDirective (TextLocation start) : base (start)

+		public WebFormsDirective (DocumentLocation start) : base (start)

 		{
 			attributes = new XAttributeCollection (this);
 		}
 
-		public WebFormsDirective (TextLocation start, XName name) : this (start)

+		public WebFormsDirective (DocumentLocation start, XName name) : this (start)

 		{
 			this.name = name;
 		}
diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsExpression.cs
index c67eff4f37..8013a9fe45 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsExpression.cs
@@ -25,19 +25,18 @@
 // THE SOFTWARE.

 
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	public abstract class WebFormsExpression : XNode

 	{
-		protected WebFormsExpression (DomRegion region) : base (region)

+		protected WebFormsExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		protected WebFormsExpression (TextLocation start) : base (start)

+		protected WebFormsExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsHtmlEncodedExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsHtmlEncodedExpression.cs
index f83c02287c..4d82c64543 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsHtmlEncodedExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsHtmlEncodedExpression.cs
@@ -24,20 +24,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	
 	public class WebFormsHtmlEncodedExpression : WebFormsExpression

 	{
-		public WebFormsHtmlEncodedExpression (DomRegion region) : base (region)

+		public WebFormsHtmlEncodedExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		public WebFormsHtmlEncodedExpression (TextLocation start) : base (start)

+		public WebFormsHtmlEncodedExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderBlock.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderBlock.cs
index 3c715302b6..adb357e1b3 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderBlock.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderBlock.cs
@@ -26,19 +26,18 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AspNet.WebForms.Dom
 {
 	public class WebFormsRenderBlock : XNode
 	{
-		public WebFormsRenderBlock (DomRegion region) : base (region)
+		public WebFormsRenderBlock (DocumentRegion region) : base (region)
 		{
 		}
 
-		public WebFormsRenderBlock (TextLocation start) : base (start)
+		public WebFormsRenderBlock (DocumentLocation start) : base (start)
 		{
 		}
 
diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderExpression.cs
index 479ec8ba31..d881836fc0 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsRenderExpression.cs
@@ -24,19 +24,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	public class WebFormsRenderExpression : WebFormsExpression

 	{
-		public WebFormsRenderExpression (DomRegion region) : base (region)

+		public WebFormsRenderExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		public WebFormsRenderExpression (TextLocation start) : base (start)

+		public WebFormsRenderExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsResourceExpression.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsResourceExpression.cs
index 26038b655c..4ffe73e8ed 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsResourceExpression.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsResourceExpression.cs
@@ -24,20 +24,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Parser;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom

 {
 	public class WebFormsResourceExpression : WebFormsExpression

 	{
-		public WebFormsResourceExpression (DomRegion region) : base (region)

+		public WebFormsResourceExpression (DocumentRegion region) : base (region)

 		{

 		}
 

-		public WebFormsResourceExpression (TextLocation start) : base (start)

+		public WebFormsResourceExpression (DocumentLocation start) : base (start)

 		{

 		}
 

diff --git a/main/src/addins/AspNet/WebForms/Dom/WebFormsServerComment.cs b/main/src/addins/AspNet/WebForms/Dom/WebFormsServerComment.cs
index 675a854916..a35a720a36 100644
--- a/main/src/addins/AspNet/WebForms/Dom/WebFormsServerComment.cs
+++ b/main/src/addins/AspNet/WebForms/Dom/WebFormsServerComment.cs
@@ -25,19 +25,18 @@
 // THE SOFTWARE.

 
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;

 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.AspNet.WebForms.Dom
 {
 	public class WebFormsServerComment : XNode
 	{
-		public WebFormsServerComment (DomRegion region) : base (region)

+		public WebFormsServerComment (DocumentRegion region) : base (region)

 		{

 		}

 
-		public WebFormsServerComment (TextLocation start) : base (start)

+		public WebFormsServerComment (DocumentLocation start) : base (start)

 		{

 		}

 
diff --git a/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs b/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs
index bd559c56d5..41a22f1779 100644
--- a/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs
+++ b/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs
@@ -26,13 +26,14 @@
 
 using System;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
 using Mono.TextEditor;
 using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Dom;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -86,20 +87,18 @@ namespace MonoDevelop.AspNet.WebForms
 	/// </summary>
 	public class DocumentInfo
 	{
-		public DocumentInfo (ICompilation dom, WebFormsParsedDocument aspNetParsedDocument, IEnumerable<string> imports)
+		public DocumentInfo (WebFormsParsedDocument aspNetParsedDocument, IEnumerable<string> imports)
 		{
-			this.Dom = dom;
 			this.AspNetDocument = aspNetParsedDocument;
 			this.Imports = imports;
 			BuildExpressionAndScriptsLists ();
 		}
 		
-		public ICompilation Dom { get; private set; }
 		public WebFormsParsedDocument AspNetDocument { get; private set; }
 		public ParsedDocument ParsedDocument { get; set; }
 		public IEnumerable<string> Imports { get; private set; }
 		
-		public IUnresolvedTypeDefinition CodeBesideClass { get; set; }
+		public INamedTypeSymbol CodeBesideClass { get; set; }
 		
 		public string BaseType {
 			get {
@@ -163,16 +162,16 @@ namespace MonoDevelop.AspNet.WebForms
 	{
 		bool SupportsLanguage (string language);
 		
-		ParsedDocument BuildDocument (DocumentInfo info, TextEditorData textEditorData);
+		ParsedDocument BuildDocument (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor textEditorData);
 		
-		ICompletionWidget CreateCompletionWidget (MonoDevelop.Ide.Gui.Document realDocument, LocalDocumentInfo localInfo);
-		
-		LocalDocumentInfo BuildLocalDocument (DocumentInfo info, TextEditorData textEditorData, string expressionText, string textAfterCaret, bool isExpression);
-		
-		ICompletionDataList HandlePopupCompletion (MonoDevelop.Ide.Gui.Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo);
-		ICompletionDataList HandleCompletion (MonoDevelop.Ide.Gui.Document realDocument, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char currentChar, ref int triggerWordLength);
-		ParameterDataProvider HandleParameterCompletion (MonoDevelop.Ide.Gui.Document realDocument, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char completionChar);
-		bool GetParameterCompletionCommandOffset (MonoDevelop.Ide.Gui.Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo, out int cpos);
+//		ICompletionWidget CreateCompletionWidget (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, LocalDocumentInfo localInfo);
+//		
+//		LocalDocumentInfo BuildLocalDocument (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor textEditorData, string expressionText, string textAfterCaret, bool isExpression);
+//		
+//		ICompletionDataList HandlePopupCompletion (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo);
+//		ICompletionDataList HandleCompletion (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char currentChar, ref int triggerWordLength);
+//		ParameterHintingResult HandleParameterCompletion (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char completionChar);
+//		bool GetParameterCompletionCommandOffset (MonoDevelop.Ide.Editor.TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo, out int cpos);
 	}
 	
 	public static class LanguageCompletionBuilderService
diff --git a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
index 4316a08c44..12f658bb6b 100644
--- a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
+++ b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
@@ -38,7 +38,7 @@ namespace MonoDevelop.AspNet.WebForms
 {
 	public class MasterContentFileDescriptionTemplate : SingleFileDescriptionTemplate
 	{
-		public override void ModifyTags (SolutionItem policyParent, Project project, string language, string identifier, string fileName, ref Dictionary<string,string> tags)
+		public override void ModifyTags (SolutionFolderItem policyParent, Project project, string language, string identifier, string fileName, ref Dictionary<string,string> tags)
 		{
 			base.ModifyTags (policyParent, project, language, identifier, fileName, ref tags);
 			if (fileName == null)
@@ -47,13 +47,13 @@ namespace MonoDevelop.AspNet.WebForms
 			tags ["AspNetMaster"] = "";
 			tags ["AspNetMasterContent"] = "";
 			
-			AspNetAppProject aspProj = project as AspNetAppProject;
+			var aspProj = project.GetService<AspNetAppProjectFlavor> ();
 			if (aspProj == null)
 				throw new InvalidOperationException ("MasterContentFileDescriptionTemplate is only valid for ASP.NET projects");
 			
 			ProjectFile masterPage = null;
 			
-			var dialog = new MonoDevelop.Ide.Projects.ProjectFileSelectorDialog (aspProj, null, "*.master");
+			var dialog = new MonoDevelop.Ide.Projects.ProjectFileSelectorDialog (project, null, "*.master");
 			try {
 				dialog.Title = GettextCatalog.GetString ("Select a Master Page...");
 				int response = MonoDevelop.Ide.MessageService.RunCustomDialog (dialog);
@@ -69,7 +69,7 @@ namespace MonoDevelop.AspNet.WebForms
 			tags ["AspNetMaster"] = aspProj.LocalToVirtualPath (masterPage);
 			
 			try {
-				var pd = TypeSystemService.ParseFile (project, masterPage.FilePath)
+				var pd = TypeSystemService.ParseFile (project, masterPage.FilePath).Result
 						as WebFormsParsedDocument;
 				if (pd == null)
 					return;
diff --git a/main/src/addins/AspNet/WebForms/SuggestedHandlerCompletionData.cs b/main/src/addins/AspNet/WebForms/SuggestedHandlerCompletionData.cs
index 1e7d7dca23..9c779f2a55 100644
--- a/main/src/addins/AspNet/WebForms/SuggestedHandlerCompletionData.cs
+++ b/main/src/addins/AspNet/WebForms/SuggestedHandlerCompletionData.cs
@@ -32,24 +32,25 @@ using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.DesignerSupport;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AspNet.WebForms
 {
 	class SuggestedHandlerCompletionData : CompletionData
 	{
-		readonly Project project;
+		readonly MonoDevelop.Projects.Project project;
 		readonly CodeMemberMethod methodInfo;
-		readonly IType codeBehindClass;
-		readonly IUnresolvedTypeDefinition codeBehindClassPart;
+		readonly INamedTypeSymbol codeBehindClass;
+		readonly Location codeBehindClassLocation;
 		
-		public SuggestedHandlerCompletionData (Project project, CodeMemberMethod methodInfo, IType codeBehindClass, IUnresolvedTypeDefinition codeBehindClassPart)
+		public SuggestedHandlerCompletionData (MonoDevelop.Projects.Project project, CodeMemberMethod methodInfo, INamedTypeSymbol codeBehindClass, Location codeBehindClassLocation)
 		{
 			this.project = project;
 			this.methodInfo = methodInfo;
 			this.codeBehindClass = codeBehindClass;
-			this.codeBehindClassPart = codeBehindClassPart;
+			this.codeBehindClassLocation = codeBehindClassLocation;
 		}
 		
 		public override IconId Icon {
@@ -74,22 +75,21 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
 			//insert the method name
-			MonoDevelop.Ide.Gui.Content.IEditableTextBuffer buf = window.CompletionWidget as MonoDevelop.Ide.Gui.Content.IEditableTextBuffer;
+			var buf = window.CompletionWidget;
 			if (buf != null) {
-				using (var undo = buf.OpenUndoGroup ()) {

-					buf.DeleteText (window.CodeCompletionContext.TriggerOffset, buf.CursorPosition - window.CodeCompletionContext.TriggerOffset);
-					buf.InsertText (buf.CursorPosition, methodInfo.Name);
-				}

+				buf.Replace (window.CodeCompletionContext.TriggerOffset, buf.CaretOffset - window.CodeCompletionContext.TriggerOffset, methodInfo.Name);
 			}
 			
 			//generate the codebehind method
-			if (codeBehindClassPart != null && project != null)
-				BindingService.AddMemberToClass (project, codeBehindClass.GetDefinition (), codeBehindClassPart, methodInfo, false);
-			else
-				BindingService.AddMemberToClass (project, codeBehindClass.GetDefinition (), codeBehindClass.GetDefinition ().Parts.First (), methodInfo, false);
+
+			// TODO: Roslyn port.
+//			if (codeBehindClassLocation != null && project != null)
+//				BindingService.AddMemberToClass (project, codeBehindClass, codeBehindClassLocation, methodInfo, false);
+//			else
+//				BindingService.AddMemberToClass (project, codeBehindClass, codeBehindClass.Locations.First (), methodInfo, false);
 		}
 	}
 }
diff --git a/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs b/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs
index bfdce9399f..d735e979ca 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs
@@ -33,13 +33,14 @@ using System;
 using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Core;
 using MonoDevelop.DesignerSupport;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Projects;
 using MonoDevelop.AspNet.Projects;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -47,7 +48,7 @@ namespace MonoDevelop.AspNet.WebForms
 	{
 		public static string GetCodeBehindClassName (ProjectFile file)
 		{
-			AspNetAppProject proj = file.Project as AspNetAppProject;
+			var proj = file.Project.GetService<AspNetAppProjectFlavor> ();
 			if (proj == null)
 				return null;
 			return proj.GetCodebehindTypeName (file.Name);
@@ -55,26 +56,26 @@ namespace MonoDevelop.AspNet.WebForms
 
 		public static ProjectFile GetDesignerFile (ProjectFile file)
 		{
-			var project = file.Project as AspNetAppProject;
+			var ext = file.Project.GetService<AspNetAppProjectFlavor> ();
 
-			var type = AspNetAppProject.DetermineWebSubtype (file.FilePath);
+			var type = AspNetAppProjectFlavor.DetermineWebSubtype (file.FilePath);
 			if (type != WebSubtype.WebForm && type != WebSubtype.WebControl && type != WebSubtype.MasterPage)
 				return null;
 
-			var dfName = project.LanguageBinding.GetFileName (file.FilePath + ".designer");
-			return project.Files.GetFile (dfName);
+			var dfName = ext.Project.LanguageBinding.GetFileName (file.FilePath + ".designer");
+			return ext.Project.Files.GetFile (dfName);
 		}
 
 		public static BuildResult UpdateDesignerFile (
 			CodeBehindWriter writer,
-			AspNetAppProject project,
+			DotNetProject project,
 			ProjectFile file, ProjectFile designerFile
 		)
 		{
 			var result = new BuildResult ();
 
 			//parse the ASP.NET file
-			var parsedDocument = TypeSystemService.ParseFile (project, file.FilePath) as WebFormsParsedDocument;
+			var parsedDocument = TypeSystemService.ParseFile (project, file.FilePath).Result as WebFormsParsedDocument;
 			if (parsedDocument == null) {
 				result.AddError (string.Format ("Failed to parse file '{0}'", file.Name));
 				return result;
@@ -91,7 +92,7 @@ namespace MonoDevelop.AspNet.WebForms
 			return result;
 		}
 
-		static void AddErrorsToResult (BuildResult result, string filename, IList<Error> errors)
+		static void AddErrorsToResult (BuildResult result, string filename, IEnumerable<Error> errors)
 		{
 			foreach (var err in errors) {
 				if (err.ErrorType == ErrorType.Warning)
@@ -102,7 +103,7 @@ namespace MonoDevelop.AspNet.WebForms
 		}
 		
 		public static BuildResult GenerateCodeBehind (
-			AspNetAppProject project,
+			DotNetProject project,
 			string filename,
 			WebFormsParsedDocument document,
 			out CodeCompileUnit ccu)
@@ -110,7 +111,7 @@ namespace MonoDevelop.AspNet.WebForms
 			ccu = null;
 			var result = new BuildResult ();
 			string className = document.Info.InheritedClass;
-			AddErrorsToResult (result, filename, document.Errors);
+			AddErrorsToResult (result, filename, document.GetErrorsAsync().Result);
 			if (result.ErrorCount > 0)
 				return result;
 			
@@ -118,6 +119,7 @@ namespace MonoDevelop.AspNet.WebForms
 				return result;
 			
 			var refman = new WebFormsTypeContext { Project = project,  Doc = document };
+			refman.CreateCompilation (default(CancellationToken)).Wait ();
 			var memberList = new WebFormsMemberListBuilder (refman, document.XDocument);
 			memberList.Build ();
 
@@ -149,10 +151,11 @@ namespace MonoDevelop.AspNet.WebForms
 				masterTypeName = document.Info.MasterPageTypeName;
 			} else if (!String.IsNullOrEmpty (document.Info.MasterPageTypeVPath)) {
 				try {
-					ProjectFile resolvedMaster = project.ResolveVirtualPath (document.Info.MasterPageTypeVPath, document.FileName);
+					var ext = project.GetService<AspNetAppProjectFlavor> ();
+					ProjectFile resolvedMaster = ext.ResolveVirtualPath (document.Info.MasterPageTypeVPath, document.FileName);
 					WebFormsParsedDocument masterParsedDocument = null;
 					if (resolvedMaster != null)
-						masterParsedDocument = TypeSystemService.ParseFile (project, resolvedMaster.FilePath) as WebFormsParsedDocument;
+						masterParsedDocument = TypeSystemService.ParseFile (project, resolvedMaster.FilePath).Result as WebFormsParsedDocument;
 					if (masterParsedDocument != null && !String.IsNullOrEmpty (masterParsedDocument.Info.InheritedClass))
 						masterTypeName = masterParsedDocument.Info.InheritedClass;
 				} catch (Exception ex) {
@@ -184,14 +187,13 @@ namespace MonoDevelop.AspNet.WebForms
 			if (memberList.Members.Count == 0)
 				return result;
 			
-			var dom = refman.Compilation;
-			var cls = ReflectionHelper.ParseReflectionName (className).Resolve (dom);
+			var cls = refman.GetTypeByMetadataName (className);
 			var members = GetDesignerMembers (memberList.Members.Values, cls, filename);
 			
 			//add fields for each control in the page
 			
 			foreach (var member in members) {
-				var type = new CodeTypeReference (member.Type.FullName);
+				var type = new CodeTypeReference (member.Type.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat));
 				typeDecl.Members.Add (new CodeMemberField (type, member.Name) { Attributes = MemberAttributes.Family });
 			}
 			return result;
@@ -204,22 +206,23 @@ namespace MonoDevelop.AspNet.WebForms
 		/// <returns>The filtered list of non-conflicting members.</returns>
 		// TODO: check compatibilty with existing members
 		public static IEnumerable<CodeBehindMember> GetDesignerMembers (
-			IEnumerable<CodeBehindMember> members, IType cls, string designerFile)
+			IEnumerable<CodeBehindMember> members, INamedTypeSymbol cls, string designerFile)
 		{
 			var existingMembers = new HashSet<string> ();
 			while (cls != null) {
-				if (cls.GetDefinition () == null)
-					break;
+//				if (cls.GetDefinition () == null)
+//					break;
 				foreach (var member in cls.GetMembers ()) {
-					if (member.Accessibility == Accessibility.Private || member.Accessibility == Accessibility.Internal)
+					if (member.DeclaredAccessibility == Accessibility.Private || member.DeclaredAccessibility == Accessibility.Internal)
 						continue;
-					if (member.Region.FileName == designerFile)
+					if (member.Locations.Any (loc => loc.IsInSource &&  loc.SourceTree.FilePath == designerFile))
 						continue;
 					existingMembers.Add (member.Name);
 				}
-				if (cls.DirectBaseTypes.All (t => t.Kind == TypeKind.Interface))
+				// TODO: check 
+				if (cls.Interfaces.Any ())
 					break;
-				cls = cls.DirectBaseTypes.First(t => t.Kind != TypeKind.Interface);
+				cls = cls.BaseType;
 			}
 			return members.Where (m => !existingMembers.Contains (m.Name));
 		}
diff --git a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
index 526911a74f..4e998fe458 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
@@ -31,20 +31,22 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide;
 using MonoDevelop.AspNet.WebForms;

-using MonoDevelop.AspNet.Projects;
+using MonoDevelop.AspNet.Projects;

+using MonoDevelop.Projects;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AspNet.WebForms
 {
-	class WebFormsCodeBehindTypeNameCache : ProjectFileCache<AspNetAppProject,string>
+	class WebFormsCodeBehindTypeNameCache : ProjectFileCache<Project,string>
 	{
-		public WebFormsCodeBehindTypeNameCache (AspNetAppProject proj) : base (proj)
+		public WebFormsCodeBehindTypeNameCache (Project proj) : base (proj)
 		{
 		}
 
 		protected override string GenerateInfo (string filename)
 		{
 			try {
-				var doc = TypeSystemService.ParseFile (filename, DesktopService.GetMimeTypeForUri (filename), File.ReadAllText (filename)) as WebFormsParsedDocument;
+				var doc = TypeSystemService.ParseFile (null, filename, DesktopService.GetMimeTypeForUri (filename), StringTextSource.ReadFrom (filename)).Result as WebFormsParsedDocument;
 				if (doc != null && !string.IsNullOrEmpty (doc.Info.InheritedClass))
 					return doc.Info.InheritedClass;
 			} catch (Exception ex) {
diff --git a/main/src/addins/AspNet/WebForms/WebFormsDirectiveCompletion.cs b/main/src/addins/AspNet/WebForms/WebFormsDirectiveCompletion.cs
index 54839d53ae..a7ded63cf7 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsDirectiveCompletion.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsDirectiveCompletion.cs
@@ -36,6 +36,7 @@ using System.Web.UI;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.AspNet.Projects;
+using MonoDevelop.Projects;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -94,7 +95,7 @@ namespace MonoDevelop.AspNet.WebForms
 		}
 		
 
-		public static CompletionDataList GetAttributeValues (AspNetAppProject project, FilePath fromFile, string directiveName, string attribute)
+		public static CompletionDataList GetAttributeValues (DotNetProject project, FilePath fromFile, string directiveName, string attribute)
 		{
 			switch (directiveName.ToLowerInvariant ()) {
 			case "page":
@@ -105,7 +106,7 @@ namespace MonoDevelop.AspNet.WebForms
 			return null;
 		}
 		
-		public static CompletionDataList GetAttributes (AspNetAppProject project, string directiveName,
+		public static CompletionDataList GetAttributes (DotNetProject project, string directiveName,
 			Dictionary<string, string> existingAtts)
 		{
 			var list = new CompletionDataList ();
@@ -199,7 +200,7 @@ namespace MonoDevelop.AspNet.WebForms
 				list.Add (s);
 		}
 		
-		static CompletionDataList GetPageAttributeValues (AspNetAppProject project, FilePath fromFile, string attribute)
+		static CompletionDataList GetPageAttributeValues (Project project, FilePath fromFile, string attribute)
 		{
 			var list = new CompletionDataList ();
 			switch (attribute.ToLowerInvariant ()) {
@@ -346,7 +347,7 @@ namespace MonoDevelop.AspNet.WebForms
 			return list.Count > 0? list : null;
 		}
 		
-		static CompletionDataList GetRegisterAttributeValues (AspNetAppProject project, FilePath fromFile, string attribute)
+		static CompletionDataList GetRegisterAttributeValues (Project project, FilePath fromFile, string attribute)
 		{
 			switch (attribute.ToLowerInvariant ()) {
 			case "src":
diff --git a/main/src/addins/AspNet/WebForms/WebFormsEditorExtension.cs b/main/src/addins/AspNet/WebForms/WebFormsEditorExtension.cs
index 96a0239b78..69a199a86e 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsEditorExtension.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsEditorExtension.cs
@@ -31,15 +31,15 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
-
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
+using System.Threading;
+using System.Threading.Tasks;
 
 using MonoDevelop.Core;
 using MonoDevelop.DesignerSupport; 
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.AspNet.Html;
 using MonoDevelop.AspNet.Html.Parser;
 using MonoDevelop.AspNet.Projects;
@@ -48,23 +48,29 @@ using S = MonoDevelop.Xml.Parser;
 using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.Xml.Parser;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Projects;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor.Projection;
 
 namespace MonoDevelop.AspNet.WebForms
 {
-	public class WebFormsEditorExtension : BaseHtmlEditorExtension
+	class WebFormsEditorExtension : BaseHtmlEditorExtension
 	{
-		static readonly Regex DocTypeRegex = new Regex (@"(?:PUBLIC|public)\s+""(?<fpi>[^""]*)""\s+""(?<uri>[^""]*)""");
+		static readonly System.Text.RegularExpressions.Regex DocTypeRegex = new System.Text.RegularExpressions.Regex (@"(?:PUBLIC|public)\s+""(?<fpi>[^""]*)""\s+""(?<uri>[^""]*)""");
 
 		WebFormsParsedDocument aspDoc;
-		AspNetAppProject project;
+		DotNetProject project;
 		WebFormsTypeContext refman = new WebFormsTypeContext ();
 
 		ILanguageCompletionBuilder documentBuilder;
-		LocalDocumentInfo localDocumentInfo;
+		Projection localDocumentProjection;
 		DocumentInfo documentInfo;
 
 		ICompletionWidget defaultCompletionWidget;
-		MonoDevelop.Ide.Gui.Document defaultDocument;
+		DocumentContext defaultDocumentContext;
+		TextEditor defaultEditor;
+		TextEditor projectedEditor;
 		
 		bool HasDoc { get { return aspDoc != null; } }
 
@@ -89,54 +95,53 @@ namespace MonoDevelop.AspNet.WebForms
 			aspDoc = CU as WebFormsParsedDocument;
 			if (HasDoc)
 				refman.Doc = aspDoc;
-			
-			var newProj = Document.Project as AspNetAppProject;
+
+			var newProj = base.DocumentContext.Project as DotNetProject;
 			if (newProj != null) {
 				project = newProj;
 				refman.Project = newProj;
 			}
-			
-			documentBuilder = HasDoc ? LanguageCompletionBuilderService.GetBuilder (aspDoc.Info.Language) : null;
-			
-			if (documentBuilder != null) {
-				documentInfo = new DocumentInfo (refman.Compilation, aspDoc, refman.GetUsings ());
-				documentInfo.ParsedDocument = documentBuilder.BuildDocument (documentInfo, Editor);
-				documentInfo.CodeBesideClass = CreateCodeBesideClass (documentInfo, refman);
+
+			if (HasDoc) {
+				documentInfo = new DocumentInfo (aspDoc, refman.GetUsings ());
+//				localDocumentProjection = new MonoDevelop.AspNet.WebForms.CSharp.CSharpProjector ().CreateProjection (documentInfo, Editor, true).Result;
+//				projectedEditor = localDocumentProjection.CreateProjectedEditor (DocumentContext);
+//				Editor.SetOrUpdateProjections (DocumentContext, new [] { localDocumentProjection  });
 			}
 		}
 		
-		static IUnresolvedTypeDefinition CreateCodeBesideClass (DocumentInfo info, WebFormsTypeContext refman)
+		static INamedTypeSymbol CreateCodeBesideClass (DocumentInfo info, WebFormsTypeContext refman)
 		{
-			var memberList = new WebFormsMemberListBuilder (refman, info.AspNetDocument.XDocument);
-			memberList.Build ();
-			var t = new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedTypeDefinition (info.ClassName);
-			var dom = refman.Compilation;
-			var baseType = ReflectionHelper.ParseReflectionName (info.BaseType).Resolve (dom);
-			foreach (var m in WebFormsCodeBehind.GetDesignerMembers (memberList.Members.Values, baseType, null)) {
-				t.Members.Add (new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedField (t, m.Name) {
-					Accessibility = Accessibility.Protected,
-					ReturnType = m.Type.ToTypeReference ()
-				});
-			}
-			return t;
+			//TODO: Roslyn port
+//			var memberList = new WebFormsMemberListBuilder (refman, info.AspNetDocument.XDocument);
+//			memberList.Build ();
+//			var t = new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedTypeDefinition (info.ClassName);
+//			var dom = refman.Compilation;
+//			var baseType = ReflectionHelper.ParseReflectionName (info.BaseType).Resolve (dom);
+//			foreach (var m in WebFormsCodeBehind.GetDesignerMembers (memberList.Members.Values, baseType, null)) {
+//				t.Members.Add (new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedField (t, m.Name) {
+//					Accessibility = Accessibility.Protected,
+//					ReturnType = m.Type.ToTypeReference ()
+//				});
+//			}
+//			return t;
+			return null;
 		}
 
-		protected override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext,
-		                                                            bool forced, ref int triggerWordLength)
+		protected override Task<ICompletionDataList> HandleCodeCompletion (
+			CodeCompletionContext completionContext, bool forced, CancellationToken token)
 		{
-			ITextBuffer buf = Buffer;
 			// completionChar may be a space even if the current char isn't, when ctrl-space is fired t
-			char currentChar = completionContext.TriggerOffset < 1? ' ' : buf.GetCharAt (completionContext.TriggerOffset - 1);
+			char currentChar = completionContext.TriggerOffset < 1? ' ' : Editor.GetCharAt (completionContext.TriggerOffset - 1);
 			//char previousChar = completionContext.TriggerOffset < 2? ' ' : buf.GetCharAt (completionContext.TriggerOffset - 2);
-			
-			
+
 			//directive names
 			if (Tracker.Engine.CurrentState is WebFormsDirectiveState) {
 				var directive = Tracker.Engine.Nodes.Peek () as WebFormsDirective;
 				if (HasDoc && directive != null && directive.Region.BeginLine == completionContext.TriggerLine &&
 				    directive.Region.BeginColumn + 3 == completionContext.TriggerLineOffset)
 				{
-					return WebFormsDirectiveCompletion.GetDirectives (aspDoc.Type);
+					return Task.FromResult ((ICompletionDataList)WebFormsDirectiveCompletion.GetDirectives (aspDoc.Type));
 				}
 				return null;
 			}
@@ -145,8 +150,9 @@ namespace MonoDevelop.AspNet.WebForms
 				if (HasDoc && directive != null && directive.Region.BeginLine == completionContext.TriggerLine &&
 				    directive.Region.BeginColumn + 4 == completionContext.TriggerLineOffset && char.IsLetter (currentChar))
 				{
-					triggerWordLength = 1;
-					return WebFormsDirectiveCompletion.GetDirectives (aspDoc.Type);
+					completionContext.TriggerWordLength = 1;
+					completionContext.TriggerOffset -= 1;
+					return Task.FromResult ((ICompletionDataList)WebFormsDirectiveCompletion.GetDirectives (aspDoc.Type));
 				}
 				return null;
 			}
@@ -157,14 +163,14 @@ namespace MonoDevelop.AspNet.WebForms
 			if (currentChar == '<' && !(isAspExprState || Tracker.Engine.CurrentState is XmlRootState)) {
 				var list = new CompletionDataList ();
 				AddAspBeginExpressions (list);
-				return list;
+				return Task.FromResult ((ICompletionDataList)list);
 			}
 			
 			if (!HasDoc || aspDoc.Info.DocType == null) {
 				//FIXME: get doctype from master page
 				DocType = null;
 			} else {
-				DocType = new XDocType (TextLocation.Empty);
+				DocType = new XDocType (DocumentLocation.Empty);
 				var matches = DocTypeRegex.Match (aspDoc.Info.DocType);
 				DocType.PublicFpi = matches.Groups["fpi"].Value;
 				DocType.Uri = matches.Groups["uri"].Value;
@@ -192,7 +198,7 @@ namespace MonoDevelop.AspNet.WebForms
 				
 			}
 			
-			return base.HandleCodeCompletion (completionContext, forced, ref triggerWordLength);
+			return base.HandleCodeCompletion (completionContext, forced, token);
 		}
 		
 		//case insensitive, no prefix
@@ -203,56 +209,53 @@ namespace MonoDevelop.AspNet.WebForms
 		
 		public void InitializeCodeCompletion (char ch)
 		{
-			int caretOffset = Document.Editor.Caret.Offset;
+			int caretOffset = Editor.CaretOffset;
 			int start = caretOffset - Tracker.Engine.CurrentStateLength;
-			if (Document.Editor.GetCharAt (start) == '=') 
+			if (Editor.GetCharAt (start) == '=') 
 				start++;
-			string sourceText = Document.Editor.GetTextBetween (start, caretOffset);
+			string sourceText = Editor.GetTextBetween (start, caretOffset);
 			if (ch != '\0')
 				sourceText += ch;
-			string textAfterCaret = Document.Editor.GetTextBetween (caretOffset, Math.Min (Document.Editor.Length, Math.Max (caretOffset, Tracker.Engine.Position + Tracker.Engine.CurrentStateLength - 2)));
+			string textAfterCaret = Editor.GetTextBetween (caretOffset, Math.Min (Editor.Length, Math.Max (caretOffset, Tracker.Engine.Position + Tracker.Engine.CurrentStateLength - 2)));
 
-			if (documentBuilder == null){
-				localDocumentInfo = null;
+			if (documentBuilder == null) {
+				localDocumentProjection = null;
 				return;
 			}
-			localDocumentInfo = documentBuilder.BuildLocalDocument (documentInfo, Editor, sourceText, textAfterCaret, true);
-			
-			var viewContent = new MonoDevelop.Ide.Gui.HiddenTextEditorViewContent ();
-			viewContent.Project = Document.Project;
-			viewContent.ContentName = localDocumentInfo.ParsedLocalDocument.FileName;
-			
-			viewContent.Text = localDocumentInfo.LocalDocument;
-			viewContent.GetTextEditorData ().Caret.Offset = localDocumentInfo.CaretPosition;
-
-			var workbenchWindow = new MonoDevelop.Ide.Gui.HiddenWorkbenchWindow ();
-			workbenchWindow.ViewContent = viewContent;
-			localDocumentInfo.HiddenDocument = new HiddenDocument (workbenchWindow) {
-				HiddenParsedDocument = localDocumentInfo.ParsedLocalDocument
-			};
+
+//			var viewContent = new MonoDevelop.Ide.Gui.HiddenTextEditorViewContent ();
+//			viewContent.Project = DocumentContext.Project;
+//			viewContent.ContentName = localDocumentInfo.ParsedLocalDocument.FileName;
+//			
+//			viewContent.Text = localDocumentInfo.LocalDocument;
+//			viewContent.Editor.CaretOffset = localDocumentInfo.CaretPosition;
+//
+//			var workbenchWindow = new MonoDevelop.Ide.Gui.HiddenWorkbenchWindow ();
+//			workbenchWindow.ViewContent = viewContent;
+//			localDocumentInfo.HiddenDocument = new HiddenDocument (workbenchWindow) {
+//				HiddenParsedDocument = localDocumentInfo.ParsedLocalDocument
+//			};
 		}
 		
 		
-		public override ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)
+		public override Task<ICompletionDataList> CodeCompletionCommand (CodeCompletionContext completionContext)
 		{
-			//completion for ASP.NET expressions
+/*			//completion for ASP.NET expressions
 			// TODO: Detect <script> state here !!!
 			if (documentBuilder != null && Tracker.Engine.CurrentState is WebFormsExpressionState) {
 				InitializeCodeCompletion ('\0');
-				return documentBuilder.HandlePopupCompletion (defaultDocument, documentInfo, localDocumentInfo);
-			}
+				return documentBuilder.HandlePopupCompletion (defaultEditor, defaultDocumentContext, documentInfo, localDocumentInfo);
+			}*/
 			return base.CodeCompletionCommand (completionContext);
 		}
 
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 			defaultCompletionWidget = CompletionWidget;
-			defaultDocument = document;
-			defaultDocument.Editor.Caret.PositionChanged += delegate {
-				OnCompletionContextChanged (CompletionWidget, EventArgs.Empty);
-			};
-			defaultDocument.Saved += AsyncUpdateDesignerFile;
+			defaultDocumentContext = DocumentContext;
+			defaultEditor = Editor;
+			defaultDocumentContext.Saved += AsyncUpdateDesignerFile;
 			OnParsedDocumentUpdated ();
 		}
 
@@ -282,55 +285,51 @@ namespace MonoDevelop.AspNet.WebForms
 				}
 			});
 		}
-		
-		public override ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
-		{
-			if (localDocumentInfo == null)
-				return base.HandleCodeCompletion (completionContext, completionChar, ref triggerWordLength);
-			localDocumentInfo.HiddenDocument.Editor.InsertAtCaret (completionChar.ToString ());
-			return documentBuilder.HandleCompletion (defaultDocument, completionContext, documentInfo, localDocumentInfo, completionChar, ref triggerWordLength);
-		}
 
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		// TODO: Roslyn port
+//		
+//		public override ICompletionDataList HandleCodeCompletionAsync (
+//		    CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
+//		{
+//			if (localDocumentInfo == null)
+//				return base.HandleCodeCompletionAsync (completionContext, completionChar, ref triggerWordLength);
+//			localDocumentInfo.HiddenDocument.Editor.InsertAtCaret (completionChar.ToString ());
+//			return documentBuilder.HandleCompletion (defaultEditor, defaultDocumentContext, completionContext, documentInfo, localDocumentInfo, completionChar, ref triggerWordLength);
+//		}
+
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
 			Tracker.UpdateEngine ();
 			bool isAspExprState = Tracker.Engine.CurrentState is WebFormsExpressionState;
 			if (documentBuilder == null || !isAspExprState)
-				return base.KeyPress (key, keyChar, modifier);
+				return base.KeyPress (descriptor);
 			InitializeCodeCompletion ('\0');
-			document = localDocumentInfo.HiddenDocument;
-			CompletionWidget = documentBuilder.CreateCompletionWidget (defaultDocument, localDocumentInfo);
+//			DocumentContext = localDocumentInfo.HiddenDocument;
+//			Editor = localDocumentInfo.HiddenDocument.Editor;
+//			CompletionWidget = documentBuilder.CreateCompletionWidget (localDocumentInfo.HiddenDocument.Editor, localDocumentInfo.HiddenDocument, localDocumentInfo);
 			bool result;
 			try {
-				result = base.KeyPress (key, keyChar, modifier);
-				if (PropertyService.Get ("EnableParameterInsight", true) && (keyChar == ',' || keyChar == ')') && CanRunParameterCompletionCommand ()) {
+				result = base.KeyPress (descriptor);
+				if (PropertyService.Get ("EnableParameterInsight", true) && (descriptor.KeyChar == ',' || descriptor.KeyChar == ')') && CanRunParameterCompletionCommand ()) {
 					RunParameterCompletionCommand ();
 				}
 			} finally {
-				document = defaultDocument;
+				DocumentContext = defaultDocumentContext;
+				Editor = defaultEditor;
 				CompletionWidget = defaultCompletionWidget;
 			}
 			return result;
 		}
-		
-		public override bool GetParameterCompletionCommandOffset (out int cpos)
-		{
-			/*if (Tracker.Engine.CurrentState is AspNetExpressionState && documentBuilder != null && localDocumentInfo != null) {
-				var result = documentBuilder.GetParameterCompletionCommandOffset (defaultDocument, documentInfo, localDocumentInfo, out cpos);
-				return result;
-			}*/
-			return base.GetParameterCompletionCommandOffset (out cpos);
-		}
-		
-		public override ParameterDataProvider HandleParameterCompletion (CodeCompletionContext completionContext, char completionChar)
-		{
-/*			if (Tracker.Engine.CurrentState is AspNetExpressionState && documentBuilder != null && localDocumentInfo != null) {
-				return documentBuilder.HandleParameterCompletion (defaultDocument, completionContext, documentInfo, localDocumentInfo, completionChar);
-			}*/
-			
-			return base.HandleParameterCompletion (completionContext, completionChar);
-		}
+
+// TODO: Roslyn port
+//		public override ParameterHintingResult HandleParameterCompletionAsync (CodeCompletionContext completionContext, char completionChar)
+//		{
+///*			if (Tracker.Engine.CurrentState is AspNetExpressionState && documentBuilder != null && localDocumentInfo != null) {
+//				return documentBuilder.HandleParameterCompletion (defaultDocument, completionContext, documentInfo, localDocumentInfo, completionChar);
+//			}*/
+//			
+//			return base.HandleParameterCompletionAsync (completionContext, completionChar);
+//		}
 
 		/*public override void RunParameterCompletionCommand ()
 		{
@@ -350,12 +349,15 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}*/
 
-		protected override void GetElementCompletions (CompletionDataList list)
+		protected override async Task<CompletionDataList> GetElementCompletions (CancellationToken token)
 		{
+			var list = new CompletionDataList ();
 			XName parentName = GetParentElementName (0);
-			
-			IType controlClass = null;
-			
+
+			INamedTypeSymbol controlClass = null;
+
+			await refman.CreateCompilation (token);
+
 			if (parentName.HasPrefix) {
 				controlClass = refman.GetControlType (parentName.Prefix, parentName.Name);
 			} else {
@@ -363,13 +365,13 @@ namespace MonoDevelop.AspNet.WebForms
 				if (grandparentName.IsValid && grandparentName.HasPrefix)
 					controlClass = refman.GetControlType (grandparentName.Prefix, grandparentName.Name);
 			}
-			
+
 			//we're just in HTML
 			if (controlClass == null) {
 				//root element?
 				if (!parentName.IsValid) {
 					if (aspDoc.Info.Subtype == WebSubtype.WebControl) {
-						AddHtmlTagCompletionData (list, Schema, new XName ("div"));
+						await AddHtmlTagCompletionData (list, Schema, new XName ("div"), token);
 						AddAspBeginExpressions (list);
 						list.AddRange (refman.GetControlCompletionData ());
 						AddMiscBeginTags (list);
@@ -380,11 +382,11 @@ namespace MonoDevelop.AspNet.WebForms
 				} else {
 					AddAspBeginExpressions (list);
 					list.AddRange (refman.GetControlCompletionData ());
-					base.GetElementCompletions (list);
+					list.AddRange (await base.GetElementCompletions (token));
 				}
-				return;
+				return list;
 			}
-			
+
 			string defaultProp;
 			bool childrenAsProperties = AreChildrenAsProperties (controlClass, out defaultProp);
 			if (defaultProp != null && defaultProp.Length == 0)
@@ -396,85 +398,86 @@ namespace MonoDevelop.AspNet.WebForms
 				list.AddRange (refman.GetControlCompletionData ());
 				AddMiscBeginTags (list);
 				//TODO: get correct parent for Content tags
-				AddHtmlTagCompletionData (list, Schema, new XName ("body"));
-				return;
+				await AddHtmlTagCompletionData (list, Schema, new XName ("body"), token);
+				return list;
 			}
 			
 			//children of properties
 			if (childrenAsProperties && (!parentName.HasPrefix || defaultProp != null)) {
 				string propName = defaultProp ?? parentName.Name;
-				IProperty property =
-					controlClass.GetProperties ()
+				IPropertySymbol property =
+					controlClass.GetMembers ().OfType<IPropertySymbol> ()
 						.FirstOrDefault (x => string.Equals (propName, x.Name, StringComparison.OrdinalIgnoreCase));
 				
 				if (property == null)
-					return;
+					return list;
 				
 				//sanity checks on attributes
 				switch (GetPersistenceMode (property)) {
 				case System.Web.UI.PersistenceMode.Attribute:
 				case System.Web.UI.PersistenceMode.EncodedInnerDefaultProperty:
-					return;
+					return list;
 					
 				case System.Web.UI.PersistenceMode.InnerDefaultProperty:
 					if (!parentName.HasPrefix)
-						return;
+						return list;
 					break;
 					
 				case System.Web.UI.PersistenceMode.InnerProperty:
 					if (parentName.HasPrefix)
-						return;
+						return list;
 					break;
 				}
 				
 				//check if allows freeform ASP/HTML content
-				if (property.ReturnType.ToString () == "System.Web.UI.ITemplate") {
+				if (property.GetReturnType ().GetFullName () == "System.Web.UI.ITemplate") {
 					AddAspBeginExpressions (list);
 					AddMiscBeginTags (list);
-					AddHtmlTagCompletionData (list, Schema, new XName ("body"));
+					await AddHtmlTagCompletionData (list, Schema, new XName ("body"), token);
 					list.AddRange (refman.GetControlCompletionData ());
-					return;
+					return list;
 				}
-				
+
 				//FIXME:unfortunately ASP.NET doesn't seem to have enough type information / attributes
 				//to be able to resolve the correct child types here
 				//so we assume it's a list and have a quick hack to find arguments of strongly typed ILists
 				
-				IType collectionType = property.ReturnType;
+				ITypeSymbol collectionType = property.GetReturnType ();
 				if (collectionType == null) {
 					list.AddRange (refman.GetControlCompletionData ());
-					return;
+					return list;
 				}
-				
+
 				string addStr = "Add";
-				IMethod meth = collectionType.GetMethods ().FirstOrDefault (m => m.Parameters.Count == 1 && m.Name == addStr);
-				
+				IMethodSymbol meth = collectionType.GetMembers ().OfType<IMethodSymbol> ().FirstOrDefault (m => m.Parameters.Length == 1 && m.Name == addStr);
+
 				if (meth != null) {
-					IType argType = meth.Parameters [0].Type;
-					var type = ReflectionHelper.ParseReflectionName ("System.Web.UI.Control").Resolve (argType.GetDefinition ().Compilation);
-					if (argType != null && argType.IsBaseType (type)) {
+					var argType = meth.Parameters [0].Type as INamedTypeSymbol;
+					INamedTypeSymbol type = refman.GetTypeByMetadataName ("System.Web.UI.Control");
+					if (argType != null && type != null && argType.IsDerivedFromClass (type)) {
 						list.AddRange (refman.GetControlCompletionData (argType));
-						return;
+						return list;
 					}
 				}
 				
 				list.AddRange (refman.GetControlCompletionData ());
-				return;
+				return list;
 			}
 			
 			//properties as children of controls
 			if (parentName.HasPrefix && childrenAsProperties) {
-				foreach (IProperty prop in GetUniqueMembers<IProperty> (controlClass.GetProperties ()))
+				foreach (IPropertySymbol prop in GetUniqueMembers<IPropertySymbol> (controlClass.GetMembers ().OfType <IPropertySymbol> ()))
 					if (GetPersistenceMode (prop) != System.Web.UI.PersistenceMode.Attribute)
-						list.Add (prop.Name, prop.GetStockIcon (), AmbienceService.GetSummaryMarkup (prop));
-				return;
+						list.Add (prop.Name, prop.GetStockIcon (), Ambience.GetSummaryMarkup (prop));
 			}
+			return list;
 		}
 		
-		protected override CompletionDataList GetAttributeCompletions (IAttributedXObject attributedOb,
-		                                                 Dictionary<string, string> existingAtts)
+		protected override async Task<CompletionDataList> GetAttributeCompletions (
+			IAttributedXObject attributedOb,
+			Dictionary<string, string> existingAtts, CancellationToken token)
 		{
-			var list = base.GetAttributeCompletions (attributedOb, existingAtts) ?? new CompletionDataList ();
+			var list = (await base.GetAttributeCompletions (attributedOb, existingAtts, token)) ?? new CompletionDataList ();
 			if (attributedOb is XElement) {
 				
 				if (!existingAtts.ContainsKey ("runat"))
@@ -494,6 +497,7 @@ namespace MonoDevelop.AspNet.WebForms
 				
 				existingAtts["ID"] = "";
 				if (attributedOb.Name.HasPrefix) {
+					await refman.CreateCompilation (token);
 					AddAspAttributeCompletionData (list, attributedOb.Name, existingAtts);
 				}
 				
@@ -503,18 +507,19 @@ namespace MonoDevelop.AspNet.WebForms
 			return list.Count > 0? list : null;
 		}
 		
-		protected override CompletionDataList GetAttributeValueCompletions (IAttributedXObject ob, XAttribute att)
+		protected override async Task<CompletionDataList> GetAttributeValueCompletions (IAttributedXObject ob, XAttribute att, CancellationToken token)
 		{
-			var list = base.GetAttributeValueCompletions (ob, att) ?? new CompletionDataList ();
+			var list = (await base.GetAttributeValueCompletions (ob, att, token)) ?? new CompletionDataList ();
 			if (ob is XElement) {
 				if (ob.Name.HasPrefix) {
 					string id = ob.GetId ();
 					if (string.IsNullOrEmpty (id) || string.IsNullOrEmpty (id.Trim ()))
 						id = null;
+					await refman.CreateCompilation (token);
 					AddAspAttributeValueCompletionData (list, ob.Name, att.Name, id);
 				}
 			} else if (ob is WebFormsDirective) {
-				return WebFormsDirectiveCompletion.GetAttributeValues (project, Document.FileName, ob.Name.FullName, att.Name.FullName);
+				return WebFormsDirectiveCompletion.GetAttributeValues (project, DocumentContext.Name, ob.Name.FullName, att.Name.FullName);
 			}
 			return list.Count > 0? list : null;
 		}
@@ -528,26 +533,26 @@ namespace MonoDevelop.AspNet.WebForms
 			if (!(expr is WebFormsBindingExpression || expr is WebFormsRenderExpression))
 				return null;
 
-			IType codeBehindClass;
+			INamedTypeSymbol codeBehindClass;
 			if (!GetCodeBehind (out codeBehindClass))
 				return null;
 			
 			//list just the class's properties, not properties on base types
 			var list = new CompletionDataList ();
-			list.AddRange (from p in codeBehindClass.GetProperties ()
-				where p.IsPublic || p.IsPublic
+			list.AddRange (from p in codeBehindClass.GetMembers ().OfType<IPropertySymbol> ()
+				where p.DeclaredAccessibility == Accessibility.Public
 				select new AspAttributeCompletionData (p));
-			list.AddRange (from p in codeBehindClass.GetFields ()
-				where p.IsProtected || p.IsPublic
+			list.AddRange (from p in codeBehindClass.GetMembers ().OfType<IFieldSymbol> ()
+				where p.DeclaredAccessibility == Accessibility.Protected || p.DeclaredAccessibility == Accessibility.Public
 				select new AspAttributeCompletionData (p));
 			
 			return list.Count > 0? list : null;
 		}
 		
-		bool GetCodeBehind (out IType codeBehindClass)
+		bool GetCodeBehind (out INamedTypeSymbol codeBehindClass)
 		{
 			if (HasDoc && !string.IsNullOrEmpty (aspDoc.Info.InheritedClass)) {
-				codeBehindClass = ReflectionHelper.ParseReflectionName (aspDoc.Info.InheritedClass).Resolve (refman.Compilation);
+				codeBehindClass = refman.GetTypeByMetadataName (aspDoc.Info.InheritedClass);
 				return codeBehindClass != null;
 			}
 
@@ -556,7 +561,6 @@ namespace MonoDevelop.AspNet.WebForms
 		}
 		
 		#region ASP.NET data
-		
 		void AddAspBeginExpressions (CompletionDataList list)
 		{
 			list.Add ("%",  "md-literal", GettextCatalog.GetString ("ASP.NET render block"));
@@ -564,12 +568,12 @@ namespace MonoDevelop.AspNet.WebForms
 			list.Add ("%@", "md-literal", GettextCatalog.GetString ("ASP.NET directive"));
 			list.Add ("%#", "md-literal", GettextCatalog.GetString ("ASP.NET databinding expression"));
 			list.Add ("%--", "md-literal", GettextCatalog.GetString ("ASP.NET server-side comment"));
-			
+
 			//valid on 2.0+ runtime only
 			if (ProjClrVersion != ClrVersion.Net_1_1) {
 				list.Add ("%$", "md-literal", GettextCatalog.GetString ("ASP.NET resource expression"));
 			}
-			
+
 			//valid on 4.0+ runtime only
 			if (ProjClrVersion != ClrVersion.Net_4_0) {
 				list.Add ("%:", "md-literal", GettextCatalog.GetString ("ASP.NET HTML encoded expression"));
@@ -580,52 +584,63 @@ namespace MonoDevelop.AspNet.WebForms
 		{
 			Debug.Assert (name.IsValid);
 			Debug.Assert (name.HasPrefix);
-			
-			IType controlClass = refman.GetControlType (name.Prefix, name.Name);
+
+			INamedTypeSymbol controlClass = refman.GetControlType (name.Prefix, name.Name);
 			if(controlClass != null)
 				AddControlMembers (list, controlClass, existingAtts);
 		}
-		
-		void AddControlMembers (CompletionDataList list, IType controlClass, Dictionary<string, string> existingAtts)
+
+		void AddControlMembers (CompletionDataList list, INamedTypeSymbol controlClass, Dictionary<string, string> existingAtts)
 		{
 			//add atts only if they're not already in the tag
-			foreach (var prop in GetUniqueMembers<IProperty> (controlClass.GetProperties ()))
-				if (prop.Accessibility == Accessibility.Public && (existingAtts == null || !existingAtts.ContainsKey (prop.Name)))
-				if (GetPersistenceMode (prop) == System.Web.UI.PersistenceMode.Attribute)
-					list.Add (new AspAttributeCompletionData (prop));
-			
+			foreach (var prop in GetUniqueMembers<IPropertySymbol> (GetAllMembers<IPropertySymbol> (controlClass)))
+				if (prop.DeclaredAccessibility == Accessibility.Public && (existingAtts == null || !existingAtts.ContainsKey (prop.Name)))
+					if (GetPersistenceMode (prop) == System.Web.UI.PersistenceMode.Attribute)
+						list.Add (new AspAttributeCompletionData (prop));
+
 			//similarly add events
-			foreach (var eve in GetUniqueMembers<IEvent> (controlClass.GetEvents ())) {
+			foreach (var eve in GetUniqueMembers<IEventSymbol> (GetAllMembers<IEventSymbol> (controlClass))) {
 				string eveName = "On" + eve.Name;
-				if (eve.Accessibility == Accessibility.Public && (existingAtts == null || !existingAtts.ContainsKey (eveName)))
+				if (eve.DeclaredAccessibility == Accessibility.Public && (existingAtts == null || !existingAtts.ContainsKey (eveName)))
 					list.Add (new AspAttributeCompletionData (eve, eveName));
 			}
 		}
-		
+
+		IEnumerable<T> GetAllMembers<T> (INamedTypeSymbol type)
+		{
+			INamedTypeSymbol currentType = type;
+			while (currentType != null) {
+				foreach (T member in currentType.GetMembers ().OfType<T> ())
+					yield return member;
+
+				currentType = currentType.BaseType;
+			}
+		}
+
 		void AddAspAttributeValueCompletionData (CompletionDataList list, XName tagName, XName attName, string id)
 		{
 			Debug.Assert (tagName.IsValid && tagName.HasPrefix);
 			Debug.Assert (attName.IsValid && !attName.HasPrefix);
-			
-			IType controlClass = refman.GetControlType (tagName.Prefix, tagName.Name);
+
+			INamedTypeSymbol controlClass = refman.GetControlType (tagName.Prefix, tagName.Name);
 			if (controlClass == null)
 				return;
 			
 			//find the codebehind class
-			IType codeBehindClass;
+			INamedTypeSymbol codeBehindClass;
 			GetCodeBehind (out codeBehindClass);
-			
+
 			//if it's an event, suggest compatible methods 
 			if (codeBehindClass != null && attName.Name.StartsWith ("On", StringComparison.Ordinal)) {
 				string eventName = attName.Name.Substring (2);
 				
-				foreach (IEvent ev in controlClass.GetEvents ()) {
+				foreach (IEventSymbol ev in controlClass.GetAccessibleMembersInThisAndBaseTypes<IEventSymbol> (controlClass)) {
 					if (ev.Name == eventName) {
 						var domMethod = BindingService.MDDomToCodeDomMethod (ev);
 						if (domMethod == null)
 							return;
 						
-						foreach (IMethod meth 
+						foreach (IMethodSymbol meth 
 						    in BindingService.GetCompatibleMethodsInClass (codeBehindClass, ev)) {
 							list.Add (meth.Name, "md-method",
 							    GettextCatalog.GetString ("A compatible method in the CodeBehind class"));
@@ -645,7 +660,7 @@ namespace MonoDevelop.AspNet.WebForms
 						
 						list.Add (
 						    new SuggestedHandlerCompletionData (project, domMethod, codeBehindClass,
-						        CodeBehind.GetNonDesignerClass (codeBehindClass))
+						        CodeBehind.GetNonDesignerClassLocation (codeBehindClass))
 						    );
 						return;
 					}
@@ -653,17 +668,17 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 			
 			//if it's a property and is an enum or bool, suggest valid values
-			foreach (IProperty prop in controlClass.GetProperties ()) {
+			foreach (IPropertySymbol prop in GetAllMembers<IPropertySymbol> (controlClass)) {
 				if (prop.Name != attName.Name)
 					continue;
 				
 				//boolean completion
-				if (prop.ReturnType.Equals (refman.Compilation.FindType (KnownTypeCode.Boolean))) {
+				if (prop.GetReturnType ().Equals (refman.GetTypeByMetadataName ("System.Boolean"))) {
 					AddBooleanCompletionData (list);
 					return;
 				}
 				//color completion
-				if (prop.ReturnType.Equals (refman.Compilation.FindType (typeof(System.Drawing.Color)))) {
+				if (prop.GetReturnType ().Equals (refman.GetTypeByMetadataName ("System.Drawing.Color"))) {
 					var conv = new System.Drawing.ColorConverter ();
 					foreach (System.Drawing.Color c in conv.GetStandardValues (null)) {
 						if (c.IsSystemColor)
@@ -675,17 +690,17 @@ namespace MonoDevelop.AspNet.WebForms
 				}
 				
 				//enum completion
-				IType retCls = prop.ReturnType;
-				if (retCls != null && retCls.Kind == TypeKind.Enum) {
-					foreach (var enumVal in retCls.GetFields ())
-						if (enumVal.IsPublic && enumVal.IsStatic)
-							list.Add (enumVal.Name, "md-literal", AmbienceService.GetSummaryMarkup (enumVal));
+				var retCls = prop.GetReturnType () as INamedTypeSymbol;
+				if (retCls != null && retCls.TypeKind == TypeKind.Enum) {
+					foreach (var enumVal in GetAllMembers<IFieldSymbol> (retCls))
+						if (enumVal.DeclaredAccessibility == Accessibility.Public && enumVal.IsStatic)
+							list.Add (enumVal.Name, "md-literal", Ambience.GetSummaryMarkup (enumVal));
 					return;
 				}
 			}
 		}
-		
-		static IEnumerable<T> GetUniqueMembers<T> (IEnumerable<T> members) where T : IMember
+
+		static IEnumerable<T> GetUniqueMembers<T> (IEnumerable<T> members) where T : ISymbol
 		{
 			var existingItems = new Dictionary<string,bool> ();
 			foreach (T item in members) {
@@ -701,53 +716,51 @@ namespace MonoDevelop.AspNet.WebForms
 			list.Add ("true", "md-literal");
 			list.Add ("false", "md-literal");
 		}
-		
 		#endregion
-		
+
 		#region Querying types' attributes
-		
-		static System.Web.UI.PersistenceMode GetPersistenceMode (IProperty prop)
+		static System.Web.UI.PersistenceMode GetPersistenceMode (IPropertySymbol prop)
 		{
-			foreach (var att in prop.Attributes) {
-				if (att.AttributeType.ReflectionName == "System.Web.UI.PersistenceModeAttribute") {
-					var expr = att.PositionalArguments.FirstOrDefault ();
-					if (expr == null) {
-						LoggingService.LogWarning ("Unknown expression type {0} in IAttribute parameter", expr);
+			foreach (var att in prop.GetAttributes ()) {
+				if (att.AttributeClass.GetFullName () == "System.Web.UI.PersistenceModeAttribute") {
+					var expr = att.ConstructorArguments.FirstOrDefault ();
+					if (expr.IsNull) {
+						LoggingService.LogWarning ("Unknown expression type {0} in Attribute parameter", expr);
 						return System.Web.UI.PersistenceMode.Attribute;
 					}
 					
-					return (System.Web.UI.PersistenceMode) expr.ConstantValue;
+					return (System.Web.UI.PersistenceMode) expr.Value;
 				}
-				if (att.AttributeType.ReflectionName == "System.Web.UI.TemplateContainerAttribute") {
+				if (att.AttributeClass.GetFullName () == "System.Web.UI.TemplateContainerAttribute") {
 					return System.Web.UI.PersistenceMode.InnerProperty;
 				}
 			}
 			return System.Web.UI.PersistenceMode.Attribute;
 		}
-		
-		static bool AreChildrenAsProperties (IType type, out string defaultProperty)
+
+		static bool AreChildrenAsProperties (INamedTypeSymbol type, out string defaultProperty)
 		{
 			bool childrenAsProperties = false;
 			defaultProperty = "";
 			
-			IAttribute att = GetAttributes (type, "System.Web.UI.ParseChildrenAttribute").FirstOrDefault ();
+			AttributeData att = GetAttributes (type, "System.Web.UI.ParseChildrenAttribute").FirstOrDefault ();
 
 			if (att == null)
 				return childrenAsProperties;
 
-			var posArgs = att.PositionalArguments;
-			if (posArgs.Count == 0)
+			var posArgs = att.ConstructorArguments;
+			if (posArgs.Length == 0)
 				return childrenAsProperties;
 			
-			if (posArgs.Count > 0) {
+			if (posArgs.Length > 0) {
 				var expr = posArgs [0];
-				if (expr == null) {
-					LoggingService.LogWarning ("Unknown expression type {0} in IAttribute parameter", expr);
+				if (expr.IsNull) {
+					LoggingService.LogWarning ("Unknown expression type {0} in Attribute parameter", expr);
 					return false;
 				}
 				
-				if (expr.ConstantValue is bool) {
-					childrenAsProperties = (bool)expr.ConstantValue;
+				if (expr.Value is bool) {
+					childrenAsProperties = (bool)expr.Value;
 				} else {
 					//TODO: implement this
 					LoggingService.LogWarning ("ASP.NET completion does not yet handle ParseChildrenAttribute (Type)");
@@ -755,34 +768,34 @@ namespace MonoDevelop.AspNet.WebForms
 				}
 			}
 			
-			if (posArgs.Count > 1) {
+			if (posArgs.Length > 1) {
 				var expr = posArgs [1];
-				if (expr == null || !(expr.ConstantValue is string)) {
+				if (expr.IsNull || !(expr.Value is string)) {
 					LoggingService.LogWarning ("Unknown expression '{0}' in IAttribute parameter", expr);
 					return false;
 				}
-				defaultProperty = (string)expr.ConstantValue;
+				defaultProperty = (string)expr.Value;
 			}
 			
 			var namedArgs = att.NamedArguments;
-			if (namedArgs.Count > 0) {
-				if (namedArgs.Any (p => p.Key.Name == "ChildrenAsProperties")) {
-					var expr = namedArgs.First (p => p.Key.Name == "ChildrenAsProperties").Value;
-					if (expr == null) {
+			if (namedArgs.Length > 0) {
+				if (namedArgs.Any (p => p.Key == "ChildrenAsProperties")) {
+					var expr = namedArgs.First (p => p.Key == "ChildrenAsProperties").Value;
+					if (expr.IsNull) {
 						LoggingService.LogWarning ("Unknown expression type {0} in IAttribute parameter", expr);
 						return false;
 					}
-					childrenAsProperties = (bool)expr.ConstantValue;
+					childrenAsProperties = (bool)expr.Value;
 				}
-				if (namedArgs.Any (p => p.Key.Name == "DefaultProperty")) {
-					var expr = namedArgs.First (p => p.Key.Name == "DefaultProperty").Value;
-					if (expr == null) {
+				if (namedArgs.Any (p => p.Key == "DefaultProperty")) {
+					var expr = namedArgs.First (p => p.Key == "DefaultProperty").Value;
+					if (expr.IsNull) {
 						LoggingService.LogWarning ("Unknown expression type {0} in IAttribute parameter", expr);
 						return false;
 					}
-					defaultProperty = (string)expr.ConstantValue;
+					defaultProperty = (string)expr.Value;
 				}
-				if (namedArgs.Any (p => p.Key.Name == "ChildControlType")) {
+				if (namedArgs.Any (p => p.Key == "ChildControlType")) {
 					//TODO: implement this
 					LoggingService.LogWarning ("ASP.NET completion does not yet handle ParseChildrenAttribute (Type)");
 					return false;
@@ -792,20 +805,19 @@ namespace MonoDevelop.AspNet.WebForms
 			return childrenAsProperties;
 		}
 		
-		static IEnumerable<IAttribute> GetAttributes (IType type, string attName)
+		static IEnumerable<AttributeData> GetAttributes (INamedTypeSymbol type, string attName)
 		{
-			foreach (var att in type.GetDefinition ().Attributes) {
-				if (att.AttributeType.ReflectionName == attName)
+			foreach (AttributeData att in type.GetAttributes()) {
+				if (att.AttributeClass.GetFullName () == attName)
 					yield return att;
 			}
 			
-			foreach (IType t2 in type.GetAllBaseTypes ()) {
-				foreach (IAttribute att in t2.GetDefinition ().Attributes)
-					if (att.AttributeType.ReflectionName == attName)
+			foreach (INamedTypeSymbol t2 in type.GetAllBaseClasses ()) {
+				foreach (AttributeData att in t2.GetAttributes ())
+					if (att.AttributeClass.GetFullName () == attName)
 						yield return att;
 			}
 		}
-		
 		#endregion
 	}
 }
diff --git a/main/src/addins/AspNet/WebForms/WebFormsMemberListBuilder.cs b/main/src/addins/AspNet/WebForms/WebFormsMemberListBuilder.cs
index 65783b3d8d..5ea9c7cba6 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsMemberListBuilder.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsMemberListBuilder.cs
@@ -34,13 +34,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-
 using MonoDevelop.Core;
 using MonoDevelop.AspNet.WebForms;
 using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -86,7 +86,7 @@ namespace MonoDevelop.AspNet.WebForms
 					);
 				} else {
 					string controlType = element.Attributes.GetValue (new XName ("type"), true);
-					IType type = docRefMan.GetType (element.Name.Prefix, element.Name.Name, controlType);
+					var type = docRefMan.GetType (element.Name.Prefix, element.Name.Name, controlType);
 	
 					if (type == null) {
 						Errors.Add (
@@ -111,7 +111,7 @@ namespace MonoDevelop.AspNet.WebForms
 	
 	public class CodeBehindMember
 	{
-		public CodeBehindMember (string name, IType type, TextLocation location)
+		public CodeBehindMember (string name, INamedTypeSymbol type, DocumentLocation location)
 		{
 			this.Name = name;
 			this.Type = type;
@@ -119,7 +119,7 @@ namespace MonoDevelop.AspNet.WebForms
 		}		
 		
 		public string Name { get; private set; }
-		public IType Type { get; private set; }
-		public TextLocation Location { get; private set; }
+		public INamedTypeSymbol Type { get; private set; }
+		public DocumentLocation Location { get; private set; }
 	}
 }
diff --git a/main/src/addins/AspNet/WebForms/WebFormsPageInfo.cs b/main/src/addins/AspNet/WebForms/WebFormsPageInfo.cs
index 48fcf3138e..5220656f16 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsPageInfo.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsPageInfo.cs
@@ -28,11 +28,11 @@
 
 using System;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
 
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.AspNet.WebForms
 {
diff --git a/main/src/addins/AspNet/WebForms/WebFormsParsedDocument.cs b/main/src/addins/AspNet/WebForms/WebFormsParsedDocument.cs
index 0089aea70e..c45a609628 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsParsedDocument.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsParsedDocument.cs
@@ -29,11 +29,12 @@
 using System;
 using System.Collections.Generic;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Dom;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -51,8 +52,13 @@ namespace MonoDevelop.AspNet.WebForms
 		
 		public WebFormsPageInfo Info { get; private set; }
 		public WebSubtype Type { get; private set; }
-		
-		public override IEnumerable<FoldingRegion> Foldings {
+
+		public override System.Threading.Tasks.Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (System.Threading.CancellationToken cancellationToken)
+		{
+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<FoldingRegion>)Foldings.ToList ());
+		}
+
+		public IEnumerable<FoldingRegion> Foldings {
 			get {				
 				if (XDocument == null)
 					yield break;
@@ -70,7 +76,7 @@ namespace MonoDevelop.AspNet.WebForms
 							
 							yield return new FoldingRegion (
 								string.Format ("<{0}#{1}... >", el.Name.FullName, controlId),
-							    new DomRegion (el.Region.Begin, el.ClosingTag.Region.End));       
+							    new DocumentRegion (el.Region.Begin, el.ClosingTag.Region.End));       
 						}
 						continue;
 					}
diff --git a/main/src/addins/AspNet/WebForms/WebFormsParser.cs b/main/src/addins/AspNet/WebForms/WebFormsParser.cs
index 03f19b91be..ba38dd44d7 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsParser.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsParser.cs
@@ -30,7 +30,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Projects;
@@ -38,12 +37,14 @@ using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Parser;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AspNet.WebForms
 {
 	public class WebFormsParser : TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader tr, Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)
 		{
 			var info = new WebFormsPageInfo ();
 			var errors = new List<Error> ();
@@ -54,9 +55,9 @@ namespace MonoDevelop.AspNet.WebForms
 			);
 			
 			try {
-				parser.Parse (tr);
+				parser.Parse (parseOptions.Content.CreateReader ());
 			} catch (Exception ex) {
-				LoggingService.LogError ("Unhandled error parsing ASP.NET document '" + (fileName ?? "") + "'", ex);
+				LoggingService.LogError ("Unhandled error parsing ASP.NET document '" + (parseOptions.FileName ?? "") + "'", ex);
 				errors.Add (new Error (ErrorType.Error, "Unhandled error parsing ASP.NET document: " + ex.Message));
 			}
 
@@ -67,20 +68,20 @@ namespace MonoDevelop.AspNet.WebForms
 			XDocument xDoc = parser.Nodes.GetRoot ();
 			info.Populate (xDoc, errors);
 			
-			var type = AspNetAppProject.DetermineWebSubtype (fileName);
+			var type = AspNetAppProjectFlavor.DetermineWebSubtype (parseOptions.FileName);
 			if (type != info.Subtype) {
 				if (info.Subtype == WebSubtype.None) {
-					errors.Add (new Error (ErrorType.Error, "File directive is missing", 1, 1));
+					errors.Add (new Error (ErrorType.Error, "File directive is missing", new DocumentLocation (1, 1)));
 				} else {
 					type = info.Subtype;
-					errors.Add (new Error (ErrorType.Warning, "File directive does not match page extension", 1, 1));
+					errors.Add (new Error (ErrorType.Warning, "File directive does not match page extension", new DocumentLocation (1, 1)));
 				}
 			}
 			
-			var result = new WebFormsParsedDocument (fileName, type, info, xDoc);
-			result.Add (errors);
+			var result = new WebFormsParsedDocument (parseOptions.FileName, type, info, xDoc);
+			result.AddRange (errors);
 			
-			return result;
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)result);
 		}
 	}
 }
diff --git a/main/src/addins/AspNet/WebForms/WebFormsRegistrationCache.cs b/main/src/addins/AspNet/WebForms/WebFormsRegistrationCache.cs
index 6b3b6217ef..30fd42a2a7 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsRegistrationCache.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsRegistrationCache.cs
@@ -38,9 +38,9 @@ using MonoDevelop.AspNet.Projects;
 
 namespace MonoDevelop.AspNet.WebForms
 {	
-	class WebFormsRegistrationCache : ProjectFileCache<AspNetAppProject,RegistrationInfo>
+	class WebFormsRegistrationCache : ProjectFileCache<DotNetProject,RegistrationInfo>
 	{
-		public WebFormsRegistrationCache (AspNetAppProject project) : base (project)
+		public WebFormsRegistrationCache (DotNetProject project) : base (project)
 		{
 		}
 		
diff --git a/main/src/addins/AspNet/WebForms/WebFormsSyntaxMode.cs b/main/src/addins/AspNet/WebForms/WebFormsSyntaxMode.cs
index 44942b8354..f641ef2adc 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsSyntaxMode.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsSyntaxMode.cs
@@ -25,8 +25,9 @@
 // THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using System.Collections.Generic;
+using System.Xml;
 using System.Text;
 using MonoDevelop.Core;
 using Mono.TextEditor;
diff --git a/main/src/addins/AspNet/WebForms/WebFormsToolboxNode.cs b/main/src/addins/AspNet/WebForms/WebFormsToolboxNode.cs
index 6ccccbddc5..2d7c8c3a28 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsToolboxNode.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsToolboxNode.cs
@@ -30,7 +30,6 @@ using System;
 using System.ComponentModel;
 using System.Drawing.Design;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Core.Serialization;
@@ -124,9 +123,9 @@ namespace MonoDevelop.AspNet.WebForms
 			//FIXME: only do this on the insert, not the preview - or remove it afterwards
 			RegisterReference (document.Project);
 			
-			var database = document.Compilation;
+			var database = document.GetCompilationAsync ().Result;
 			
-			var cls = database.FindType (Type.Load ());
+			var cls = database.GetTypeByMetadataName (Type.Load ().FullName);
 			if (cls == null)
 				return tag;
 
@@ -157,7 +156,7 @@ namespace MonoDevelop.AspNet.WebForms
 		
 		public bool IsCompatibleWith (MonoDevelop.Ide.Gui.Document document)

 		{
-			switch (AspNetAppProject.DetermineWebSubtype (document.FileName)) {
+			switch (AspNetAppProjectFlavor.DetermineWebSubtype (document.FileName)) {
 			case WebSubtype.WebForm:
 			case WebSubtype.MasterPage:
 			case WebSubtype.WebControl:
@@ -167,7 +166,7 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 			
 			var clrVersion = ClrVersion.Net_2_0;
-			var aspProj = document.Project as AspNetAppProject;
+			var aspProj = document.Project as DotNetProject;
 			if (aspProj != null && aspProj.TargetFramework.ClrVersion != ClrVersion.Default)
 				clrVersion = aspProj.TargetFramework.ClrVersion;
 			
diff --git a/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs b/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs
index 40f949abec..bab3d82ae7 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs
@@ -34,9 +34,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using Mono.TextEditor;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.TypeSystem;
@@ -45,13 +42,18 @@ using MonoDevelop.Xml.Dom;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Dom;
 using System.Reflection;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.AspNet.WebForms
 {
-	public class WebFormsTypeContext
+	class WebFormsTypeContext
 	{
-		ICompilation compilation;
-		AspNetAppProject project;
+		Compilation compilation;
+		DotNetProject project;
 		WebFormsParsedDocument doc;
 
 		public WebFormsParsedDocument Doc {
@@ -66,7 +68,7 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 
-		public AspNetAppProject Project {
+		public DotNetProject Project {
 			get {
 				return project;
 			}
@@ -78,11 +80,9 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 
-		public ICompilation Compilation {
+		public AspNetAppProjectFlavor ProjectFlavor {
 			get {
-				if (compilation == null)
-					UpdateCompilation ();
-				return compilation;
+				return project != null ? project.GetFlavor<AspNetAppProjectFlavor> () : null;
 			}
 		}
 
@@ -100,14 +100,17 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 
-		void UpdateCompilation ()
+		public async Task CreateCompilation (CancellationToken token)
 		{
+			if (compilation != null)
+				return;
+
 			const string dummyAsmName = "CompiledAspNetPage";
-			IUnresolvedAssembly asm = new DefaultUnresolvedAssembly (dummyAsmName);
-			compilation = new SimpleCompilation (asm, GetReferencedAssemblies ());
+			compilation = CSharpCompilation.Create (dummyAsmName)
+				.AddReferences (await GetReferencedAssemblies (token));
 		}
 		
-		public IType GetType (string tagPrefix, string tagName, string htmlTypeAttribute)
+		public INamedTypeSymbol GetType (string tagPrefix, string tagName, string htmlTypeAttribute)
 		{
 			if (tagPrefix == null || tagPrefix.Length < 1)
 				return HtmlControlTypeLookup (tagName, htmlTypeAttribute);
@@ -140,7 +143,7 @@ namespace MonoDevelop.AspNet.WebForms
 			return GetControlCompletionData (AssemblyTypeLookup ("System.Web.UI", "Control"));
 		}
 		
-		public IEnumerable<CompletionData> GetControlCompletionData (IType baseType)
+		public IEnumerable<CompletionData> GetControlCompletionData (INamedTypeSymbol baseType)
 		{
 			var names = new HashSet<string> ();
 
@@ -148,7 +151,7 @@ namespace MonoDevelop.AspNet.WebForms
 				var ard = rd as WebFormsPageInfo.AssemblyRegisterDirective;
 				if (ard != null) {
 					string prefix = ard.TagPrefix + ":";
-					foreach (IType cls in ListControlClasses (baseType, ard.Namespace))
+					foreach (var cls in ListControlClasses (baseType, ard.Namespace, compilation))
 						if (names.Add (prefix + cls.Name))
 							yield return new AspTagCompletionData (prefix, cls);
 					continue;
@@ -160,7 +163,7 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 		
-		public IType GetControlType (string tagPrefix, string tagName)
+		public INamedTypeSymbol GetControlType (string tagPrefix, string tagName)
 		{
 			if (String.IsNullOrEmpty (tagPrefix))
 				return null;
@@ -186,14 +189,14 @@ namespace MonoDevelop.AspNet.WebForms
 			return AssemblyTypeLookup ("System.Web.UI", "Control");
 		}
 		
-		public string GetTagPrefix (IType control)
+		public string GetTagPrefix (INamedTypeSymbol control)
 		{
-			if (control.Namespace == "System.Web.UI.HtmlControls")
+			if (control.ContainingNamespace.GetFullName () == "System.Web.UI.HtmlControls")
 				return string.Empty;
 			
 			foreach (var rd in GetControls ()) {
 				var ard = rd as WebFormsPageInfo.AssemblyRegisterDirective;
-				if (ard != null && ard.Namespace == control.Namespace)
+				if (ard != null && ard.Namespace == control.ContainingNamespace.GetFullName ())
 					return ard.TagPrefix;
 			}
 
@@ -208,7 +211,7 @@ namespace MonoDevelop.AspNet.WebForms
 		/// <summary>
 		/// Gets a tag prefix, also returning the directive that would have to be added if necessary.
 		/// </summary>
-		public string GetTagPrefixWithNewDirective (IType control, string assemblyName, string desiredPrefix, 
+		public string GetTagPrefixWithNewDirective (INamedTypeSymbol control, string assemblyName, string desiredPrefix, 
 			out WebFormsPageInfo.RegisterDirective directiveNeededToAdd)
 		{
 			directiveNeededToAdd = null;
@@ -223,14 +226,14 @@ namespace MonoDevelop.AspNet.WebForms
 			
 			var an = SystemAssemblyService.ParseAssemblyName (assemblyName);
 			
-			directiveNeededToAdd = new WebFormsPageInfo.AssemblyRegisterDirective (prefix, control.Namespace, an.Name);
+			directiveNeededToAdd = new WebFormsPageInfo.AssemblyRegisterDirective (prefix, control.ContainingNamespace.GetFullName (), an.Name);
 			
 			return prefix;
 		}
 		
 		#region "Refactoring" operations -- things that modify the file
 		
-		string GetPrefix (IType control)
+		string GetPrefix (INamedTypeSymbol control)
 		{
 			//FIXME: make this work 
 			/*
@@ -264,7 +267,7 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 			*/
 			//generate a new prefix base on initials of namespace
-			string[] namespaces = control.Namespace.Split ('.');
+			string[] namespaces = control.ContainingNamespace.GetFullName ().Split ('.');
 			char[] charr = new char[namespaces.Length];
 			for (int i = 0; i < charr.Length; i++)
 				charr[i] = char.ToLower (namespaces[i][0]);
@@ -288,7 +291,7 @@ namespace MonoDevelop.AspNet.WebForms
 			return p != null? p.Value as string : null;
 		}
 		
-		public void AddRegisterDirective (WebFormsPageInfo.RegisterDirective directive, TextEditorData editor, bool preserveCaretPosition)
+		public void AddRegisterDirective (WebFormsPageInfo.RegisterDirective directive, TextEditor editor, bool preserveCaretPosition)
 		{
 			if (doc == null)
 				return;
@@ -300,16 +303,17 @@ namespace MonoDevelop.AspNet.WebForms
 			doc.Info.RegisteredTags.Add (directive);
 			
 			var line = Math.Max (node.Region.EndLine, node.Region.BeginLine);
-			var pos = editor.Document.LocationToOffset (line, editor.Document.GetLine (line - 1).Length);
+			var pos = editor.LocationToOffset (line, editor.GetLine (line - 1).Length);
 			if (pos < 0)
 				return;
 			
 			using (var undo = editor.OpenUndoGroup ()) {
-				var oldCaret = editor.Caret.Offset;
-				
-				var inserted = editor.Insert (pos, editor.EolMarker + directive);
+				var oldCaret = editor.CaretOffset;
+				var text = editor.FormatString (pos, editor.EolMarker + directive);
+				var inserted = text.Length;
+				editor.InsertText (pos, text);
 				if (preserveCaretPosition) {
-					editor.Caret.Offset = (pos < oldCaret)? oldCaret + inserted : oldCaret;
+					editor.CaretOffset = (pos < oldCaret)? oldCaret + inserted : oldCaret;
 				}
 			}
 		}
@@ -335,8 +339,8 @@ namespace MonoDevelop.AspNet.WebForms
 
 		IList<RegistrationInfo> GetRegistrationInfos ()
 		{
-			if (project != null && doc != null)
-				return project.RegistrationCache.GetInfosForPath (Path.GetDirectoryName (doc.FileName));
+			if (ProjectFlavor != null && doc != null)
+				return ProjectFlavor.RegistrationCache.GetInfosForPath (Path.GetDirectoryName (doc.FileName));
 			return new[] { WebFormsRegistrationCache.MachineRegistrationInfo };
 		}
 
@@ -373,43 +377,51 @@ namespace MonoDevelop.AspNet.WebForms
 			return usings;
 		}
 
-		IEnumerable<IAssemblyReference> GetReferencedAssemblies ()
+		async Task<IEnumerable<MetadataReference>> GetReferencedAssemblies (CancellationToken token)
 		{
-			var references = new HashSet<IAssemblyReference> ();
+			var references = new HashSet<MetadataReference> ();
 
-			if (project != null)
-				references.Add (TypeSystemService.GetCompilation (project).MainAssembly.UnresolvedAssembly);
+			if (project != null) {
+				var result = await TypeSystemService.GetCompilationAsync (project, token);
+				if (result != null)
+					references.Add (result.ToMetadataReference ());
+			}
 
+			var tasks = new List<Task<MetadataReference>> ();
 			if (doc != null)
-				foreach (var asm in doc.Info.Assemblies.Select (a => a.Name).Select (name => GetReferencedAssembly (name)))
-					references.Add (asm);
+				foreach (var t in doc.Info.Assemblies.Select (a => a.Name).Select (name => GetReferencedAssembly (name, token)))
+					tasks.Add (t);
+
+			foreach (var t in GetRegisteredAssemblies ().Select (name => GetReferencedAssembly (name, token)))
+				tasks.Add (t);
 
-			foreach (var asm in GetRegisteredAssemblies ().Select (name => GetReferencedAssembly (name)))
+			MetadataReference[] assemblies = await Task.WhenAll (tasks);
+			foreach (var asm in assemblies)
 				references.Add (asm);
 
 			references.Remove (null);
 
 			return references;
- 		}
+		}
 
-		IAssemblyReference GetReferencedAssembly (string assemblyName)
+		async Task<MetadataReference> GetReferencedAssembly (string assemblyName, CancellationToken token)
 		{
 			var parsed = SystemAssemblyService.ParseAssemblyName (assemblyName);
 			if (string.IsNullOrEmpty (parsed.Name))
 				return null;
 
-			var r = GetProjectReference (parsed);
+			var r = await GetProjectReference (parsed, token);
 			if (r != null)
 				return r;
 
 			string path = GetAssemblyPath (assemblyName);
 			if (path != null)
-				return TypeSystemService.LoadAssemblyContext (TargetRuntime, TargetFramework, path);
+				return LoadMetadataReference (path);
 
 			return null;
 		}
 
-		IAssemblyReference GetProjectReference (AssemblyName parsed)
+		async Task<MetadataReference> GetProjectReference (AssemblyName parsed, CancellationToken token)
 		{
 			if (project == null)
 				return null;
@@ -420,20 +432,33 @@ namespace MonoDevelop.AspNet.WebForms
 				if (reference.ReferenceType == ReferenceType.Package || reference.ReferenceType == ReferenceType.Assembly) {
 					foreach (string refPath in reference.GetReferencedFileNames (null))
 						if (Path.GetFileName (refPath) == dllName)
-							return TypeSystemService.LoadAssemblyContext (project.TargetRuntime, project.TargetFramework, refPath);
+							return LoadMetadataReference (refPath);
 				}
 				else
 					if (reference.ReferenceType == ReferenceType.Project && parsed.Name == reference.Reference) {
-						var p = project.ParentSolution.FindProjectByName (reference.Reference) as DotNetProject;
+						var p = reference.ResolveProject (project.ParentSolution) as DotNetProject;
 						if (p == null)
 							continue;
-						return TypeSystemService.GetCompilation (p).MainAssembly.UnresolvedAssembly;
+						var result = await TypeSystemService.GetCompilationAsync (p);
+						if (result != null) {
+							return result.ToMetadataReference ();
+						}
+						return null;
 					}
 			}
 
 			return null;
 		}
 
+		MetadataReference LoadMetadataReference (string path)
+		{
+			var projectId = Microsoft.CodeAnalysis.ProjectId.CreateNewId ("WebFormsTypeContext");
+			var reference = MetadataReferenceCache.LoadReference (projectId, path);
+			MetadataReferenceCache.RemoveReferences (projectId);
+
+			return reference;
+		}
+
 		string GetAssemblyPath (string assemblyName)
 		{
 			var parsed = SystemAssemblyService.ParseAssemblyName (assemblyName);
@@ -543,7 +568,7 @@ namespace MonoDevelop.AspNet.WebForms
 			}
 		}
 
-		IType HtmlControlTypeLookup (string tagName, string typeAttribute)
+		INamedTypeSymbol HtmlControlTypeLookup (string tagName, string typeAttribute)
 		{
 			var str = HtmlControlLookup (tagName, typeAttribute);
 			if (str != null)
@@ -551,41 +576,51 @@ namespace MonoDevelop.AspNet.WebForms
 			return null;
 		}
 
-		static IEnumerable<IType> ListControlClasses (IType baseType, string namespac)
+		static IEnumerable<INamedTypeSymbol> ListControlClasses (INamedTypeSymbol baseType, string namespac, Compilation compilation)
 		{
-			var baseTypeDefinition = baseType.GetDefinition ();
+			var baseTypeDefinition = baseType;
 			if (baseTypeDefinition == null)
 				yield break;
 
 			//return classes if they derive from system.web.ui.control
-			foreach (var type in baseTypeDefinition.GetSubTypeDefinitions ().Where (t => t.Namespace == namespac))
-				if (!type.IsAbstract && type.IsPublic)
+			foreach (var type in GetSubTypes (baseTypeDefinition, compilation).Where (t => TypeHasNamespace (t, namespac)))
+				if (!type.IsAbstract && type.DeclaredAccessibility == Accessibility.Public)
 					yield return type;
 
-			if (!baseTypeDefinition.IsAbstract && baseTypeDefinition.IsPublic && baseTypeDefinition.Namespace == namespac) {
+			if (!baseTypeDefinition.IsAbstract && baseTypeDefinition.DeclaredAccessibility == Accessibility.Public && TypeHasNamespace (baseTypeDefinition, namespac)) {
 				yield return baseType;
 			}
 		}
 
-		IType AssemblyTypeLookup (string namespac, string tagName)
+		static IEnumerable<INamedTypeSymbol> GetSubTypes (INamedTypeSymbol baseType, Compilation compilation)
+		{
+			return compilation.GlobalNamespace.GetAllTypes().Where (t => t.IsDerivedFromClass (baseType));
+		}
+
+		static bool TypeHasNamespace (INamedTypeSymbol type, string namespac)
+		{
+			return type.ContainingNamespace != null && type.ContainingNamespace.GetFullName () == namespac;
+		}
+
+		INamedTypeSymbol AssemblyTypeLookup (string namespac, string tagName)
 		{
 			var fullName = namespac + "." + tagName;
-			var type = ReflectionHelper.ParseReflectionName (fullName).Resolve (Compilation);
-			if (type.Kind == TypeKind.Unknown)
+			var type = compilation.GetTypeByMetadataName (fullName);
+			if (type == null || type.Kind == SymbolKind.ErrorType)
 				return null;
 			return type;
 		}
 
-		public string GetControlPrefix (IType control)
+		public string GetControlPrefix (INamedTypeSymbol control)
 		{
-			if (control.Namespace == "System.Web.UI.WebControls")
+			if (control.ContainingNamespace.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat) == "System.Web.UI.WebControls")
 				return "asp";
-			if (control.Namespace == "System.Web.UI.HtmlControls")
+			if (control.ContainingNamespace.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat) == "System.Web.UI.HtmlControls")
 				return string.Empty;
 
 			//todo: handle user controls
 			foreach (var info in GetControls ().OfType<WebFormsPageInfo.AssemblyRegisterDirective> ()) {
-				if (info.Namespace == control.Namespace) {
+				if (info.Namespace == control.ContainingNamespace.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat)) {
 					if (AssemblyTypeLookup (info.Namespace, control.Name) != null)
 						return info.TagPrefix;
 				}
@@ -597,57 +632,62 @@ namespace MonoDevelop.AspNet.WebForms
 		public string GetUserControlTypeName (string virtualPath)
 		{
 			string typeName = null;
-			if (project != null && doc != null) {
-				string absolute = project.VirtualToLocalPath (virtualPath, doc.FileName);
-				typeName = project.GetCodebehindTypeName (absolute);
+			if (ProjectFlavor != null && doc != null) {
+				string absolute = ProjectFlavor.VirtualToLocalPath (virtualPath, doc.FileName);
+				typeName = ProjectFlavor.GetCodebehindTypeName (absolute);
 			}
 			return typeName ?? "System.Web.UI.UserControl";
 		}
 
-		IType GetUserControlType (string virtualPath)
+		INamedTypeSymbol GetUserControlType (string virtualPath)
 		{
 			var name = GetUserControlTypeName (virtualPath);
-			var type = ReflectionHelper.ParseReflectionName (name).Resolve (Compilation);
-			if (type.Kind == TypeKind.Unknown)
+			var type = compilation.GetTypeByMetadataName (name);
+			if (type.Kind == SymbolKind.ErrorType)
 				return null;
 			return type;
 		}
+
+		public INamedTypeSymbol GetTypeByMetadataName (string fullyQualifiedMetadataName)
+		{
+			return compilation.GetTypeByMetadataName (fullyQualifiedMetadataName);
+		}
 	}
 
 	class AspTagCompletionData : CompletionData
 	{
-		readonly IType cls;
+		readonly INamedTypeSymbol cls;
 
-		public AspTagCompletionData (string prefix, IType cls)
+		public AspTagCompletionData (string prefix, INamedTypeSymbol cls)
 			: base (prefix + cls.Name, Gtk.Stock.GoForward)
 		{
 			this.cls = cls;
 		}
 
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
+		public override async Task<TooltipInformation> CreateTooltipInformation (bool smartWrap, CancellationToken token)
 		{
-			var tt = base.CreateTooltipInformation (smartWrap);
-			tt.SignatureMarkup = cls.FullName;
-			tt.SummaryMarkup = AmbienceService.GetSummaryMarkup (cls.GetDefinition ());
+			var tt = await base.CreateTooltipInformation (smartWrap, token);
+			tt.SignatureMarkup = cls.GetFullName ();
+			tt.SummaryMarkup = await Task.Run (() => Ambience.GetSummaryMarkup (cls));
 			return tt;
 		}
 	}
 
 	class AspAttributeCompletionData : CompletionData
 	{
-		readonly IMember member;
+		readonly Microsoft.CodeAnalysis.ISymbol member;
 
-		public AspAttributeCompletionData (IMember member, string name = null)
+		public AspAttributeCompletionData (Microsoft.CodeAnalysis.ISymbol member, string name = null)
 			: base (name ?? member.Name, member.GetStockIcon ())
 		{
 			this.member = member;
 		}
 
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
+		public override async Task<TooltipInformation> CreateTooltipInformation (bool smartWrap, CancellationToken token)
 		{
-			var tt = base.CreateTooltipInformation (smartWrap);
+			var tt = await base.CreateTooltipInformation (smartWrap, token);
 			tt.SignatureMarkup = member.Name;
-			tt.SummaryMarkup = AmbienceService.GetSummaryMarkup (member);
+			tt.SummaryMarkup = await Task.Run (() => Ambience.GetSummaryMarkup (member));
 			return tt;
 		}
 	}
diff --git a/main/src/addins/AspNet/gtk-gui/MonoDevelop.AspNet.Projects.GtkAspNetProjectTemplateWizardPageWidget.cs b/main/src/addins/AspNet/gtk-gui/MonoDevelop.AspNet.Projects.GtkAspNetProjectTemplateWizardPageWidget.cs
new file mode 100644
index 0000000000..1c1fca1d19
--- /dev/null
+++ b/main/src/addins/AspNet/gtk-gui/MonoDevelop.AspNet.Projects.GtkAspNetProjectTemplateWizardPageWidget.cs
@@ -0,0 +1,454 @@
+

+// This file has been generated by the GUI designer. Do not modify.

+namespace MonoDevelop.AspNet.Projects

+{

+	internal partial class GtkAspNetProjectTemplateWizardPageWidget

+	{

+		private global::Gtk.HBox mainHBox;

+		

+		private global::Gtk.EventBox leftBorderEventBox;

+		

+		private global::Gtk.VBox configurationVBox;

+		

+		private global::Gtk.EventBox configurationTopEventBox;

+		

+		private global::Gtk.EventBox configurationTableEventBox;

+		

+		private global::Gtk.Table configurationTable;

+		

+		private global::Gtk.VBox includeLabelVBox;

+		

+		private global::Gtk.Label includeLabelPadding;

+		

+		private global::Gtk.Label includeLabel;

+		

+		private global::Gtk.VBox includeUnitTestProjectVBox;

+		

+		private global::Gtk.CheckButton includeTestProjectCheck;

+		

+		private global::Gtk.HBox includeUnitTestProjectDescriptionHBox;

+		

+		private global::Gtk.Label includeUnitTestProjectDescriptionLeftHandPadding;

+		

+		private global::Gtk.Label includeUnitTestProjectDescriptionLabel;

+		

+		private global::Gtk.VBox mvcVBox;

+		

+		private global::Gtk.CheckButton includeMvcCheck;

+		

+		private global::Gtk.HBox mvcDescriptionHBox;

+		

+		private global::Gtk.Label mvcDescriptionLeftHandPadding;

+		

+		private global::Gtk.Label mvcDescriptionLabel;

+		

+		private global::Gtk.Label paddingLabel;

+		

+		private global::Gtk.VBox testingLabelVBox;

+		

+		private global::Gtk.Label testingLabelPadding;

+		

+		private global::Gtk.Label testingLabel;

+		

+		private global::Gtk.DrawingArea testingSeparator;

+		

+		private global::Gtk.VBox webApiVBox;

+		

+		private global::Gtk.CheckButton includeWebApiCheck;

+		

+		private global::Gtk.HBox webApiDescriptionHBox;

+		

+		private global::Gtk.Label webApiDescriptionLeftHandPadding;

+		

+		private global::Gtk.Label webApiDescriptionLabel;

+		

+		private global::Gtk.VBox webFormsVBox;

+		

+		private global::Gtk.CheckButton includeWebFormsCheck;

+		

+		private global::Gtk.HBox webFormsDescriptionHBox;

+		

+		private global::Gtk.Label webFormsDescriptionLeftHandPadding;

+		

+		private global::Gtk.Label webFormsDescriptionLabel;

+		

+		private global::Gtk.EventBox configurationBottomEventBox;

+		

+		private global::Gtk.EventBox backgroundLargeImageEventBox;

+		

+		private global::Gtk.VBox backgroundLargeImageVBox;

+

+		protected virtual void Build ()

+		{

+			global::Stetic.Gui.Initialize (this);

+			// Widget MonoDevelop.AspNet.Projects.GtkAspNetProjectTemplateWizardPageWidget

+			global::Stetic.BinContainer.Attach (this);

+			this.Name = "MonoDevelop.AspNet.Projects.GtkAspNetProjectTemplateWizardPageWidget";

+			// Container child MonoDevelop.AspNet.Projects.GtkAspNetProjectTemplateWizardPageWidget.Gtk.Container+ContainerChild

+			this.mainHBox = new global::Gtk.HBox ();

+			this.mainHBox.Name = "mainHBox";

+			// Container child mainHBox.Gtk.Box+BoxChild

+			this.leftBorderEventBox = new global::Gtk.EventBox ();

+			this.leftBorderEventBox.WidthRequest = 30;

+			this.leftBorderEventBox.Name = "leftBorderEventBox";

+			this.mainHBox.Add (this.leftBorderEventBox);

+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.mainHBox [this.leftBorderEventBox]));

+			w1.Position = 0;

+			w1.Expand = false;

+			// Container child mainHBox.Gtk.Box+BoxChild

+			this.configurationVBox = new global::Gtk.VBox ();

+			this.configurationVBox.WidthRequest = 440;

+			this.configurationVBox.Name = "configurationVBox";

+			// Container child configurationVBox.Gtk.Box+BoxChild

+			this.configurationTopEventBox = new global::Gtk.EventBox ();

+			this.configurationTopEventBox.Name = "configurationTopEventBox";

+			this.configurationVBox.Add (this.configurationTopEventBox);

+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.configurationVBox [this.configurationTopEventBox]));

+			w2.Position = 0;

+			// Container child configurationVBox.Gtk.Box+BoxChild

+			this.configurationTableEventBox = new global::Gtk.EventBox ();

+			this.configurationTableEventBox.Name = "configurationTableEventBox";

+			// Container child configurationTableEventBox.Gtk.Container+ContainerChild

+			this.configurationTable = new global::Gtk.Table (((uint)(6)), ((uint)(3)), false);

+			this.configurationTable.Name = "configurationTable";

+			this.configurationTable.RowSpacing = ((uint)(7));

+			this.configurationTable.ColumnSpacing = ((uint)(6));

+			// Container child configurationTable.Gtk.Table+TableChild

+			this.includeLabelVBox = new global::Gtk.VBox ();

+			this.includeLabelVBox.Name = "includeLabelVBox";

+			// Container child includeLabelVBox.Gtk.Box+BoxChild

+			this.includeLabelPadding = new global::Gtk.Label ();

+			this.includeLabelPadding.WidthRequest = 0;

+			this.includeLabelPadding.HeightRequest = 3;

+			this.includeLabelPadding.Name = "includeLabelPadding";

+			this.includeLabelVBox.Add (this.includeLabelPadding);

+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.includeLabelVBox [this.includeLabelPadding]));

+			w3.Position = 0;

+			w3.Expand = false;

+			w3.Fill = false;

+			// Container child includeLabelVBox.Gtk.Box+BoxChild

+			this.includeLabel = new global::Gtk.Label ();

+			this.includeLabel.Name = "includeLabel";

+			this.includeLabel.Xpad = 5;

+			this.includeLabel.Xalign = 1F;

+			this.includeLabel.Yalign = 0F;

+			this.includeLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Include:");

+			this.includeLabel.Justify = ((global::Gtk.Justification)(1));

+			this.includeLabelVBox.Add (this.includeLabel);

+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.includeLabelVBox [this.includeLabel]));

+			w4.Position = 1;

+			w4.Expand = false;

+			w4.Fill = false;

+			this.configurationTable.Add (this.includeLabelVBox);

+			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.configurationTable [this.includeLabelVBox]));

+			w5.XOptions = ((global::Gtk.AttachOptions)(4));

+			w5.YOptions = ((global::Gtk.AttachOptions)(4));

+			// Container child configurationTable.Gtk.Table+TableChild

+			this.includeUnitTestProjectVBox = new global::Gtk.VBox ();

+			this.includeUnitTestProjectVBox.Name = "includeUnitTestProjectVBox";

+			// Container child includeUnitTestProjectVBox.Gtk.Box+BoxChild

+			this.includeTestProjectCheck = new global::Gtk.CheckButton ();

+			this.includeTestProjectCheck.CanFocus = true;

+			this.includeTestProjectCheck.Name = "includeTestProjectCheck";

+			this.includeTestProjectCheck.Label = global::Mono.Unix.Catalog.GetString ("Include Unit Test Project");

+			this.includeTestProjectCheck.Active = true;

+			this.includeTestProjectCheck.DrawIndicator = true;

+			this.includeTestProjectCheck.UseUnderline = true;

+			this.includeUnitTestProjectVBox.Add (this.includeTestProjectCheck);

+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.includeUnitTestProjectVBox [this.includeTestProjectCheck]));

+			w6.Position = 0;

+			w6.Expand = false;

+			w6.Fill = false;

+			// Container child includeUnitTestProjectVBox.Gtk.Box+BoxChild

+			this.includeUnitTestProjectDescriptionHBox = new global::Gtk.HBox ();

+			this.includeUnitTestProjectDescriptionHBox.Name = "includeUnitTestProjectDescriptionHBox";

+			// Container child includeUnitTestProjectDescriptionHBox.Gtk.Box+BoxChild

+			this.includeUnitTestProjectDescriptionLeftHandPadding = new global::Gtk.Label ();

+			this.includeUnitTestProjectDescriptionLeftHandPadding.WidthRequest = 21;

+			this.includeUnitTestProjectDescriptionLeftHandPadding.Name = "includeUnitTestProjectDescriptionLeftHandPadding";

+			this.includeUnitTestProjectDescriptionHBox.Add (this.includeUnitTestProjectDescriptionLeftHandPadding);

+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.includeUnitTestProjectDescriptionHBox [this.includeUnitTestProjectDescriptionLeftHandPadding]));

+			w7.Position = 0;

+			w7.Expand = false;

+			w7.Fill = false;

+			// Container child includeUnitTestProjectDescriptionHBox.Gtk.Box+BoxChild

+			this.includeUnitTestProjectDescriptionLabel = new global::Gtk.Label ();

+			this.includeUnitTestProjectDescriptionLabel.WidthRequest = 255;

+			this.includeUnitTestProjectDescriptionLabel.Name = "includeUnitTestProjectDescriptionLabel";

+			this.includeUnitTestProjectDescriptionLabel.Xalign = 0F;

+			this.includeUnitTestProjectDescriptionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span size=\'smaller\' color=\'grey\'>Add a Unit Test Project for testing the Web Pro" +

+			"ject using NUnit</span>");

+			this.includeUnitTestProjectDescriptionLabel.UseMarkup = true;

+			this.includeUnitTestProjectDescriptionLabel.Wrap = true;

+			this.includeUnitTestProjectDescriptionHBox.Add (this.includeUnitTestProjectDescriptionLabel);

+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.includeUnitTestProjectDescriptionHBox [this.includeUnitTestProjectDescriptionLabel]));

+			w8.Position = 1;

+			w8.Expand = false;

+			w8.Fill = false;

+			this.includeUnitTestProjectVBox.Add (this.includeUnitTestProjectDescriptionHBox);

+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.includeUnitTestProjectVBox [this.includeUnitTestProjectDescriptionHBox]));

+			w9.Position = 1;

+			w9.Expand = false;

+			w9.Fill = false;

+			this.configurationTable.Add (this.includeUnitTestProjectVBox);

+			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.configurationTable [this.includeUnitTestProjectVBox]));

+			w10.TopAttach = ((uint)(4));

+			w10.BottomAttach = ((uint)(5));

+			w10.LeftAttach = ((uint)(1));

+			w10.RightAttach = ((uint)(2));

+			w10.XOptions = ((global::Gtk.AttachOptions)(4));

+			w10.YOptions = ((global::Gtk.AttachOptions)(4));

+			// Container child configurationTable.Gtk.Table+TableChild

+			this.mvcVBox = new global::Gtk.VBox ();

+			this.mvcVBox.Name = "mvcVBox";

+			// Container child mvcVBox.Gtk.Box+BoxChild

+			this.includeMvcCheck = new global::Gtk.CheckButton ();

+			this.includeMvcCheck.CanFocus = true;

+			this.includeMvcCheck.Name = "includeMvcCheck";

+			this.includeMvcCheck.Label = global::Mono.Unix.Catalog.GetString ("MVC");

+			this.includeMvcCheck.Active = true;

+			this.includeMvcCheck.DrawIndicator = true;

+			this.includeMvcCheck.UseUnderline = true;

+			this.mvcVBox.Add (this.includeMvcCheck);

+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.mvcVBox [this.includeMvcCheck]));

+			w11.Position = 0;

+			w11.Expand = false;

+			w11.Fill = false;

+			// Container child mvcVBox.Gtk.Box+BoxChild

+			this.mvcDescriptionHBox = new global::Gtk.HBox ();

+			this.mvcDescriptionHBox.Name = "mvcDescriptionHBox";

+			// Container child mvcDescriptionHBox.Gtk.Box+BoxChild

+			this.mvcDescriptionLeftHandPadding = new global::Gtk.Label ();

+			this.mvcDescriptionLeftHandPadding.WidthRequest = 21;

+			this.mvcDescriptionLeftHandPadding.Name = "mvcDescriptionLeftHandPadding";

+			this.mvcDescriptionHBox.Add (this.mvcDescriptionLeftHandPadding);

+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.mvcDescriptionHBox [this.mvcDescriptionLeftHandPadding]));

+			w12.Position = 0;

+			w12.Expand = false;

+			w12.Fill = false;

+			// Container child mvcDescriptionHBox.Gtk.Box+BoxChild

+			this.mvcDescriptionLabel = new global::Gtk.Label ();

+			this.mvcDescriptionLabel.WidthRequest = 255;

+			this.mvcDescriptionLabel.Name = "mvcDescriptionLabel";

+			this.mvcDescriptionLabel.Xalign = 0F;

+			this.mvcDescriptionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span size=\'smaller\' color=\'grey\'>Modern programming model. Unit testable, choice" +

+			" of templating languages</span>");

+			this.mvcDescriptionLabel.UseMarkup = true;

+			this.mvcDescriptionLabel.Wrap = true;

+			this.mvcDescriptionHBox.Add (this.mvcDescriptionLabel);

+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.mvcDescriptionHBox [this.mvcDescriptionLabel]));

+			w13.Position = 1;

+			w13.Expand = false;

+			w13.Fill = false;

+			this.mvcVBox.Add (this.mvcDescriptionHBox);

+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.mvcVBox [this.mvcDescriptionHBox]));

+			w14.Position = 1;

+			w14.Expand = false;

+			w14.Fill = false;

+			this.configurationTable.Add (this.mvcVBox);

+			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.configurationTable [this.mvcVBox]));

+			w15.LeftAttach = ((uint)(1));

+			w15.RightAttach = ((uint)(2));

+			w15.XOptions = ((global::Gtk.AttachOptions)(4));

+			w15.YOptions = ((global::Gtk.AttachOptions)(4));

+			// Container child configurationTable.Gtk.Table+TableChild

+			this.paddingLabel = new global::Gtk.Label ();

+			this.paddingLabel.WidthRequest = 132;

+			this.paddingLabel.Name = "paddingLabel";

+			this.paddingLabel.Justify = ((global::Gtk.Justification)(1));

+			this.configurationTable.Add (this.paddingLabel);

+			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.configurationTable [this.paddingLabel]));

+			w16.TopAttach = ((uint)(5));

+			w16.BottomAttach = ((uint)(6));

+			w16.XOptions = ((global::Gtk.AttachOptions)(4));

+			w16.YOptions = ((global::Gtk.AttachOptions)(4));

+			// Container child configurationTable.Gtk.Table+TableChild

+			this.testingLabelVBox = new global::Gtk.VBox ();

+			this.testingLabelVBox.Name = "testingLabelVBox";

+			// Container child testingLabelVBox.Gtk.Box+BoxChild

+			this.testingLabelPadding = new global::Gtk.Label ();

+			this.testingLabelPadding.WidthRequest = 0;

+			this.testingLabelPadding.HeightRequest = 3;

+			this.testingLabelPadding.Name = "testingLabelPadding";

+			this.testingLabelVBox.Add (this.testingLabelPadding);

+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.testingLabelVBox [this.testingLabelPadding]));

+			w17.Position = 0;

+			w17.Expand = false;

+			w17.Fill = false;

+			// Container child testingLabelVBox.Gtk.Box+BoxChild

+			this.testingLabel = new global::Gtk.Label ();

+			this.testingLabel.Name = "testingLabel";

+			this.testingLabel.Xpad = 5;

+			this.testingLabel.Xalign = 1F;

+			this.testingLabel.Yalign = 0F;

+			this.testingLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Testing:");

+			this.testingLabel.Justify = ((global::Gtk.Justification)(1));

+			this.testingLabelVBox.Add (this.testingLabel);

+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.testingLabelVBox [this.testingLabel]));

+			w18.Position = 1;

+			w18.Expand = false;

+			w18.Fill = false;

+			this.configurationTable.Add (this.testingLabelVBox);

+			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.configurationTable [this.testingLabelVBox]));

+			w19.TopAttach = ((uint)(4));

+			w19.BottomAttach = ((uint)(5));

+			w19.XOptions = ((global::Gtk.AttachOptions)(4));

+			w19.YOptions = ((global::Gtk.AttachOptions)(4));

+			// Container child configurationTable.Gtk.Table+TableChild

+			this.testingSeparator = new global::Gtk.DrawingArea ();

+			this.testingSeparator.WidthRequest = 440;

+			this.testingSeparator.HeightRequest = 1;

+			this.testingSeparator.Name = "testingSeparator";

+			this.configurationTable.Add (this.testingSeparator);

+			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.configurationTable [this.testingSeparator]));

+			w20.TopAttach = ((uint)(3));

+			w20.BottomAttach = ((uint)(4));

+			w20.RightAttach = ((uint)(3));

+			w20.YPadding = ((uint)(10));

+			w20.XOptions = ((global::Gtk.AttachOptions)(4));

+			w20.YOptions = ((global::Gtk.AttachOptions)(0));

+			// Container child configurationTable.Gtk.Table+TableChild

+			this.webApiVBox = new global::Gtk.VBox ();

+			this.webApiVBox.Name = "webApiVBox";

+			// Container child webApiVBox.Gtk.Box+BoxChild

+			this.includeWebApiCheck = new global::Gtk.CheckButton ();

+			this.includeWebApiCheck.CanFocus = true;

+			this.includeWebApiCheck.Name = "includeWebApiCheck";

+			this.includeWebApiCheck.Label = global::Mono.Unix.Catalog.GetString ("Web API");

+			this.includeWebApiCheck.Active = true;

+			this.includeWebApiCheck.DrawIndicator = true;

+			this.includeWebApiCheck.UseUnderline = true;

+			this.webApiVBox.Add (this.includeWebApiCheck);

+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.webApiVBox [this.includeWebApiCheck]));

+			w21.Position = 0;

+			w21.Expand = false;

+			w21.Fill = false;

+			// Container child webApiVBox.Gtk.Box+BoxChild

+			this.webApiDescriptionHBox = new global::Gtk.HBox ();

+			this.webApiDescriptionHBox.Name = "webApiDescriptionHBox";

+			// Container child webApiDescriptionHBox.Gtk.Box+BoxChild

+			this.webApiDescriptionLeftHandPadding = new global::Gtk.Label ();

+			this.webApiDescriptionLeftHandPadding.WidthRequest = 21;

+			this.webApiDescriptionLeftHandPadding.Name = "webApiDescriptionLeftHandPadding";

+			this.webApiDescriptionHBox.Add (this.webApiDescriptionLeftHandPadding);

+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.webApiDescriptionHBox [this.webApiDescriptionLeftHandPadding]));

+			w22.Position = 0;

+			w22.Expand = false;

+			w22.Fill = false;

+			// Container child webApiDescriptionHBox.Gtk.Box+BoxChild

+			this.webApiDescriptionLabel = new global::Gtk.Label ();

+			this.webApiDescriptionLabel.WidthRequest = 255;

+			this.webApiDescriptionLabel.Name = "webApiDescriptionLabel";

+			this.webApiDescriptionLabel.Xalign = 0F;

+			this.webApiDescriptionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span size=\'smaller\' color=\'grey\'>Framework for creating HTTP web services</span>" +

+			"");

+			this.webApiDescriptionLabel.UseMarkup = true;

+			this.webApiDescriptionLabel.Wrap = true;

+			this.webApiDescriptionHBox.Add (this.webApiDescriptionLabel);

+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.webApiDescriptionHBox [this.webApiDescriptionLabel]));

+			w23.Position = 1;

+			w23.Expand = false;

+			w23.Fill = false;

+			this.webApiVBox.Add (this.webApiDescriptionHBox);

+			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.webApiVBox [this.webApiDescriptionHBox]));

+			w24.Position = 1;

+			w24.Expand = false;

+			w24.Fill = false;

+			this.configurationTable.Add (this.webApiVBox);

+			global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.configurationTable [this.webApiVBox]));

+			w25.TopAttach = ((uint)(2));

+			w25.BottomAttach = ((uint)(3));

+			w25.LeftAttach = ((uint)(1));

+			w25.RightAttach = ((uint)(2));

+			w25.XOptions = ((global::Gtk.AttachOptions)(4));

+			w25.YOptions = ((global::Gtk.AttachOptions)(4));

+			// Container child configurationTable.Gtk.Table+TableChild

+			this.webFormsVBox = new global::Gtk.VBox ();

+			this.webFormsVBox.Name = "webFormsVBox";

+			// Container child webFormsVBox.Gtk.Box+BoxChild

+			this.includeWebFormsCheck = new global::Gtk.CheckButton ();

+			this.includeWebFormsCheck.CanFocus = true;

+			this.includeWebFormsCheck.Name = "includeWebFormsCheck";

+			this.includeWebFormsCheck.Label = global::Mono.Unix.Catalog.GetString ("Web Forms");

+			this.includeWebFormsCheck.Active = true;

+			this.includeWebFormsCheck.DrawIndicator = true;

+			this.includeWebFormsCheck.UseUnderline = true;

+			this.webFormsVBox.Add (this.includeWebFormsCheck);

+			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.webFormsVBox [this.includeWebFormsCheck]));

+			w26.Position = 0;

+			w26.Expand = false;

+			w26.Fill = false;

+			// Container child webFormsVBox.Gtk.Box+BoxChild

+			this.webFormsDescriptionHBox = new global::Gtk.HBox ();

+			this.webFormsDescriptionHBox.Name = "webFormsDescriptionHBox";

+			// Container child webFormsDescriptionHBox.Gtk.Box+BoxChild

+			this.webFormsDescriptionLeftHandPadding = new global::Gtk.Label ();

+			this.webFormsDescriptionLeftHandPadding.WidthRequest = 21;

+			this.webFormsDescriptionLeftHandPadding.Name = "webFormsDescriptionLeftHandPadding";

+			this.webFormsDescriptionHBox.Add (this.webFormsDescriptionLeftHandPadding);

+			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.webFormsDescriptionHBox [this.webFormsDescriptionLeftHandPadding]));

+			w27.Position = 0;

+			w27.Expand = false;

+			w27.Fill = false;

+			// Container child webFormsDescriptionHBox.Gtk.Box+BoxChild

+			this.webFormsDescriptionLabel = new global::Gtk.Label ();

+			this.webFormsDescriptionLabel.WidthRequest = 255;

+			this.webFormsDescriptionLabel.Name = "webFormsDescriptionLabel";

+			this.webFormsDescriptionLabel.Xalign = 0F;

+			this.webFormsDescriptionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span size=\'smaller\' color=\'grey\'>Stateful programming model similar to desktop a" +

+			"pplications</span>");

+			this.webFormsDescriptionLabel.UseMarkup = true;

+			this.webFormsDescriptionLabel.Wrap = true;

+			this.webFormsDescriptionHBox.Add (this.webFormsDescriptionLabel);

+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.webFormsDescriptionHBox [this.webFormsDescriptionLabel]));

+			w28.Position = 1;

+			w28.Expand = false;

+			w28.Fill = false;

+			this.webFormsVBox.Add (this.webFormsDescriptionHBox);

+			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.webFormsVBox [this.webFormsDescriptionHBox]));

+			w29.Position = 1;

+			w29.Expand = false;

+			w29.Fill = false;

+			this.configurationTable.Add (this.webFormsVBox);

+			global::Gtk.Table.TableChild w30 = ((global::Gtk.Table.TableChild)(this.configurationTable [this.webFormsVBox]));

+			w30.TopAttach = ((uint)(1));

+			w30.BottomAttach = ((uint)(2));

+			w30.LeftAttach = ((uint)(1));

+			w30.RightAttach = ((uint)(2));

+			w30.XOptions = ((global::Gtk.AttachOptions)(4));

+			w30.YOptions = ((global::Gtk.AttachOptions)(4));

+			this.configurationTableEventBox.Add (this.configurationTable);

+			this.configurationVBox.Add (this.configurationTableEventBox);

+			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.configurationVBox [this.configurationTableEventBox]));

+			w32.Position = 1;

+			w32.Expand = false;

+			w32.Fill = false;

+			// Container child configurationVBox.Gtk.Box+BoxChild

+			this.configurationBottomEventBox = new global::Gtk.EventBox ();

+			this.configurationBottomEventBox.Name = "configurationBottomEventBox";

+			this.configurationVBox.Add (this.configurationBottomEventBox);

+			global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.configurationVBox [this.configurationBottomEventBox]));

+			w33.Position = 2;

+			this.mainHBox.Add (this.configurationVBox);

+			global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.mainHBox [this.configurationVBox]));

+			w34.Position = 1;

+			w34.Expand = false;

+			w34.Fill = false;

+			// Container child mainHBox.Gtk.Box+BoxChild

+			this.backgroundLargeImageEventBox = new global::Gtk.EventBox ();

+			this.backgroundLargeImageEventBox.Name = "backgroundLargeImageEventBox";

+			// Container child backgroundLargeImageEventBox.Gtk.Container+ContainerChild

+			this.backgroundLargeImageVBox = new global::Gtk.VBox ();

+			this.backgroundLargeImageVBox.Name = "backgroundLargeImageVBox";

+			this.backgroundLargeImageEventBox.Add (this.backgroundLargeImageVBox);

+			this.mainHBox.Add (this.backgroundLargeImageEventBox);

+			global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.mainHBox [this.backgroundLargeImageEventBox]));

+			w36.Position = 2;

+			this.Add (this.mainHBox);

+			if ((this.Child != null)) {

+				this.Child.ShowAll ();

+			}

+			this.Hide ();

+		}

+	}

+}

diff --git a/main/src/addins/AspNet/gtk-gui/generated.cs b/main/src/addins/AspNet/gtk-gui/generated.cs
new file mode 100644
index 0000000000..97249fd82d
--- /dev/null
+++ b/main/src/addins/AspNet/gtk-gui/generated.cs
@@ -0,0 +1,83 @@
+

+// This file has been generated by the GUI designer. Do not modify.

+namespace Stetic

+{

+	internal class Gui

+	{

+		private static bool initialized;

+

+		internal static void Initialize (Gtk.Widget iconRenderer)

+		{

+			if ((Stetic.Gui.initialized == false)) {

+				Stetic.Gui.initialized = true;

+			}

+		}

+	}

+

+	internal class BinContainer

+	{

+		private Gtk.Widget child;

+		

+		private Gtk.UIManager uimanager;

+

+		public static BinContainer Attach (Gtk.Bin bin)

+		{

+			BinContainer bc = new BinContainer ();

+			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);

+			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);

+			bin.Added += new Gtk.AddedHandler (bc.OnAdded);

+			return bc;

+		}

+

+		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)

+		{

+			if ((this.child != null)) {

+				args.Requisition = this.child.SizeRequest ();

+			}

+		}

+

+		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)

+		{

+			if ((this.child != null)) {

+				this.child.Allocation = args.Allocation;

+			}

+		}

+

+		private void OnAdded (object sender, Gtk.AddedArgs args)

+		{

+			this.child = args.Widget;

+		}

+

+		public void SetUiManager (Gtk.UIManager uim)

+		{

+			this.uimanager = uim;

+			this.child.Realized += new System.EventHandler (this.OnRealized);

+		}

+

+		private void OnRealized (object sender, System.EventArgs args)

+		{

+			if ((this.uimanager != null)) {

+				Gtk.Widget w;

+				w = this.child.Toplevel;

+				if (((w != null)

+				    && typeof(Gtk.Window).IsInstanceOfType (w))) {

+					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);

+					this.uimanager = null;

+				}

+			}

+		}

+	}

+

+	internal class ActionGroups

+	{

+		public static Gtk.ActionGroup GetActionGroup (System.Type type)

+		{

+			return Stetic.ActionGroups.GetActionGroup (type.FullName);

+		}

+

+		public static Gtk.ActionGroup GetActionGroup (string name)

+		{

+			return null;

+		}

+	}

+}

diff --git a/main/src/addins/AspNet/gtk-gui/gui.stetic b/main/src/addins/AspNet/gtk-gui/gui.stetic
new file mode 100644
index 0000000000..f1125be1ca
--- /dev/null
+++ b/main/src/addins/AspNet/gtk-gui/gui.stetic
@@ -0,0 +1,575 @@
+<?xml version="1.0" encoding="utf-8"?>
+<stetic-interface>
+  <configuration>
+    <images-root-path>..</images-root-path>
+    <target-gtk-version>2.12</target-gtk-version>
+  </configuration>
+  <import>
+    <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
+    <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
+    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
+    <widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" />
+    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
+    <widget-library name="../../../../build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll" />
+    <widget-library name="../../../../build/AddIns/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.dll" />
+    <widget-library name="../../../../build/AddIns/Xml/MonoDevelop.Xml.dll" />
+    <widget-library name="../../../../build/AddIns/AspNet/MonoDevelop.AspNet.dll" internal="true" />
+  </import>
+  <widget class="Gtk.Bin" id="MonoDevelop.AspNet.Projects.GtkAspNetProjectTemplateWizardPageWidget" design-size="644 395">
+    <property name="MemberName" />
+    <property name="Visible">False</property>
+    <property name="GeneratePublic">False</property>
+    <child>
+      <widget class="Gtk.HBox" id="mainHBox">
+        <property name="MemberName" />
+        <child>
+          <widget class="Gtk.EventBox" id="leftBorderEventBox">
+            <property name="MemberName" />
+            <property name="WidthRequest">30</property>
+            <child>
+              <placeholder />
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">False</property>
+            <property name="Expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.VBox" id="configurationVBox">
+            <property name="MemberName" />
+            <property name="WidthRequest">440</property>
+            <child>
+              <widget class="Gtk.EventBox" id="configurationTopEventBox">
+                <property name="MemberName" />
+                <child>
+                  <placeholder />
+                </child>
+              </widget>
+              <packing>
+                <property name="Position">0</property>
+                <property name="AutoSize">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.EventBox" id="configurationTableEventBox">
+                <property name="MemberName" />
+                <child>
+                  <widget class="Gtk.Table" id="configurationTable">
+                    <property name="MemberName" />
+                    <property name="NRows">6</property>
+                    <property name="NColumns">3</property>
+                    <property name="RowSpacing">7</property>
+                    <property name="ColumnSpacing">6</property>
+                    <child>
+                      <placeholder />
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                    <child>
+                      <placeholder />
+                    </child>
+                    <child>
+                      <widget class="Gtk.VBox" id="includeLabelVBox">
+                        <property name="MemberName" />
+                        <child>
+                          <widget class="Gtk.Label" id="includeLabelPadding">
+                            <property name="MemberName" />
+                            <property name="WidthRequest">0</property>
+                            <property name="HeightRequest">3</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">False</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.Label" id="includeLabel">
+                            <property name="MemberName" />
+                            <property name="Xpad">5</property>
+                            <property name="Xalign">1</property>
+                            <property name="Yalign">0</property>
+                            <property name="LabelProp" translatable="yes">Include:</property>
+                            <property name="Justify">Right</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="AutoSize">True</property>
+                        <property name="XOptions">Fill</property>
+                        <property name="YOptions">Fill</property>
+                        <property name="XExpand">False</property>
+                        <property name="XFill">True</property>
+                        <property name="XShrink">False</property>
+                        <property name="YExpand">False</property>
+                        <property name="YFill">True</property>
+                        <property name="YShrink">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.VBox" id="includeUnitTestProjectVBox">
+                        <property name="MemberName" />
+                        <child>
+                          <widget class="Gtk.CheckButton" id="includeTestProjectCheck">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="Label" translatable="yes">Include Unit Test Project</property>
+                            <property name="Active">True</property>
+                            <property name="DrawIndicator">True</property>
+                            <property name="HasLabel">True</property>
+                            <property name="UseUnderline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.HBox" id="includeUnitTestProjectDescriptionHBox">
+                            <property name="MemberName" />
+                            <child>
+                              <widget class="Gtk.Label" id="includeUnitTestProjectDescriptionLeftHandPadding">
+                                <property name="MemberName" />
+                                <property name="WidthRequest">21</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Label" id="includeUnitTestProjectDescriptionLabel">
+                                <property name="MemberName" />
+                                <property name="WidthRequest">255</property>
+                                <property name="Xalign">0</property>
+                                <property name="LabelProp" translatable="yes">&lt;span size='smaller' color='grey'&gt;Add a Unit Test Project for testing the Web Project using NUnit&lt;/span&gt;</property>
+                                <property name="UseMarkup">True</property>
+                                <property name="Wrap">True</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="TopAttach">4</property>
+                        <property name="BottomAttach">5</property>
+                        <property name="LeftAttach">1</property>
+                        <property name="RightAttach">2</property>
+                        <property name="AutoSize">True</property>
+                        <property name="XOptions">Fill</property>
+                        <property name="YOptions">Fill</property>
+                        <property name="XExpand">False</property>
+                        <property name="XFill">True</property>
+                        <property name="XShrink">False</property>
+                        <property name="YExpand">False</property>
+                        <property name="YFill">True</property>
+                        <property name="YShrink">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.VBox" id="mvcVBox">
+                        <property name="MemberName" />
+                        <child>
+                          <widget class="Gtk.CheckButton" id="includeMvcCheck">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="Label" translatable="yes">MVC</property>
+                            <property name="Active">True</property>
+                            <property name="DrawIndicator">True</property>
+                            <property name="HasLabel">True</property>
+                            <property name="UseUnderline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.HBox" id="mvcDescriptionHBox">
+                            <property name="MemberName" />
+                            <child>
+                              <widget class="Gtk.Label" id="mvcDescriptionLeftHandPadding">
+                                <property name="MemberName" />
+                                <property name="WidthRequest">21</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Label" id="mvcDescriptionLabel">
+                                <property name="MemberName" />
+                                <property name="WidthRequest">255</property>
+                                <property name="Xalign">0</property>
+                                <property name="LabelProp" translatable="yes">&lt;span size='smaller' color='grey'&gt;Modern programming model. Unit testable, choice of templating languages&lt;/span&gt;</property>
+                                <property name="UseMarkup">True</property>
+                                <property name="Wrap">True</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="LeftAttach">1</property>
+                        <property name="RightAttach">2</property>
+                        <property name="AutoSize">True</property>
+                        <property name="XOptions">Fill</property>
+                        <property name="YOptions">Fill</property>
+                        <property name="XExpand">False</property>
+                        <property name="XFill">True</property>
+                        <property name="XShrink">False</property>
+                        <property name="YExpand">False</property>
+                        <property name="YFill">True</property>
+                        <property name="YShrink">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Label" id="paddingLabel">
+                        <property name="MemberName" />
+                        <property name="WidthRequest">132</property>
+                        <property name="Justify">Right</property>
+                      </widget>
+                      <packing>
+                        <property name="TopAttach">5</property>
+                        <property name="BottomAttach">6</property>
+                        <property name="AutoSize">True</property>
+                        <property name="XOptions">Fill</property>
+                        <property name="YOptions">Fill</property>
+                        <property name="XExpand">False</property>
+                        <property name="XFill">True</property>
+                        <property name="XShrink">False</property>
+                        <property name="YExpand">False</property>
+                        <property name="YFill">True</property>
+                        <property name="YShrink">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.VBox" id="testingLabelVBox">
+                        <property name="MemberName" />
+                        <child>
+                          <widget class="Gtk.Label" id="testingLabelPadding">
+                            <property name="MemberName" />
+                            <property name="WidthRequest">0</property>
+                            <property name="HeightRequest">3</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">False</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.Label" id="testingLabel">
+                            <property name="MemberName" />
+                            <property name="Xpad">5</property>
+                            <property name="Xalign">1</property>
+                            <property name="Yalign">0</property>
+                            <property name="LabelProp" translatable="yes">Testing:</property>
+                            <property name="Justify">Right</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="TopAttach">4</property>
+                        <property name="BottomAttach">5</property>
+                        <property name="AutoSize">True</property>
+                        <property name="XOptions">Fill</property>
+                        <property name="YOptions">Fill</property>
+                        <property name="XExpand">False</property>
+                        <property name="XFill">True</property>
+                        <property name="XShrink">False</property>
+                        <property name="YExpand">False</property>
+                        <property name="YFill">True</property>
+                        <property name="YShrink">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.DrawingArea" id="testingSeparator">
+                        <property name="MemberName" />
+                        <property name="WidthRequest">440</property>
+                        <property name="HeightRequest">1</property>
+                      </widget>
+                      <packing>
+                        <property name="TopAttach">3</property>
+                        <property name="BottomAttach">4</property>
+                        <property name="RightAttach">3</property>
+                        <property name="YPadding">10</property>
+                        <property name="AutoSize">False</property>
+                        <property name="XOptions">Fill</property>
+                        <property name="YOptions">0</property>
+                        <property name="XExpand">False</property>
+                        <property name="XFill">True</property>
+                        <property name="XShrink">False</property>
+                        <property name="YExpand">False</property>
+                        <property name="YFill">False</property>
+                        <property name="YShrink">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.VBox" id="webApiVBox">
+                        <property name="MemberName" />
+                        <child>
+                          <widget class="Gtk.CheckButton" id="includeWebApiCheck">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="Label" translatable="yes">Web API</property>
+                            <property name="Active">True</property>
+                            <property name="DrawIndicator">True</property>
+                            <property name="HasLabel">True</property>
+                            <property name="UseUnderline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.HBox" id="webApiDescriptionHBox">
+                            <property name="MemberName" />
+                            <child>
+                              <widget class="Gtk.Label" id="webApiDescriptionLeftHandPadding">
+                                <property name="MemberName" />
+                                <property name="WidthRequest">21</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Label" id="webApiDescriptionLabel">
+                                <property name="MemberName" />
+                                <property name="WidthRequest">255</property>
+                                <property name="Xalign">0</property>
+                                <property name="LabelProp" translatable="yes">&lt;span size='smaller' color='grey'&gt;Framework for creating HTTP web services&lt;/span&gt;</property>
+                                <property name="UseMarkup">True</property>
+                                <property name="Wrap">True</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="TopAttach">2</property>
+                        <property name="BottomAttach">3</property>
+                        <property name="LeftAttach">1</property>
+                        <property name="RightAttach">2</property>
+                        <property name="AutoSize">True</property>
+                        <property name="XOptions">Fill</property>
+                        <property name="YOptions">Fill</property>
+                        <property name="XExpand">False</property>
+                        <property name="XFill">True</property>
+                        <property name="XShrink">False</property>
+                        <property name="YExpand">False</property>
+                        <property name="YFill">True</property>
+                        <property name="YShrink">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.VBox" id="webFormsVBox">
+                        <property name="MemberName" />
+                        <child>
+                          <widget class="Gtk.CheckButton" id="includeWebFormsCheck">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="Label" translatable="yes">Web Forms</property>
+                            <property name="Active">True</property>
+                            <property name="DrawIndicator">True</property>
+                            <property name="HasLabel">True</property>
+                            <property name="UseUnderline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.HBox" id="webFormsDescriptionHBox">
+                            <property name="MemberName" />
+                            <child>
+                              <widget class="Gtk.Label" id="webFormsDescriptionLeftHandPadding">
+                                <property name="MemberName" />
+                                <property name="WidthRequest">21</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Label" id="webFormsDescriptionLabel">
+                                <property name="MemberName" />
+                                <property name="WidthRequest">255</property>
+                                <property name="Xalign">0</property>
+                                <property name="LabelProp" translatable="yes">&lt;span size='smaller' color='grey'&gt;Stateful programming model similar to desktop applications&lt;/span&gt;</property>
+                                <property name="UseMarkup">True</property>
+                                <property name="Wrap">True</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="TopAttach">1</property>
+                        <property name="BottomAttach">2</property>
+                        <property name="LeftAttach">1</property>
+                        <property name="RightAttach">2</property>
+                        <property name="AutoSize">True</property>
+                        <property name="XOptions">Fill</property>
+                        <property name="YOptions">Fill</property>
+                        <property name="XExpand">False</property>
+                        <property name="XFill">True</property>
+                        <property name="XShrink">False</property>
+                        <property name="YExpand">False</property>
+                        <property name="YFill">True</property>
+                        <property name="YShrink">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.EventBox" id="configurationBottomEventBox">
+                <property name="MemberName" />
+                <child>
+                  <placeholder />
+                </child>
+              </widget>
+              <packing>
+                <property name="Position">2</property>
+                <property name="AutoSize">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.EventBox" id="backgroundLargeImageEventBox">
+            <property name="MemberName" />
+            <child>
+              <widget class="Gtk.VBox" id="backgroundLargeImageVBox">
+                <property name="MemberName" />
+                <child>
+                  <placeholder />
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">2</property>
+            <property name="AutoSize">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</stetic-interface>
\ No newline at end of file
diff --git a/main/src/addins/AspNet/packages.config b/main/src/addins/AspNet/packages.config
index ad0c448553..cdf928d566 100644
--- a/main/src/addins/AspNet/packages.config
+++ b/main/src/addins/AspNet/packages.config
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>

-<packages>

-  <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
+</packages>
diff --git a/main/src/addins/CBinding/AddinInfo.cs b/main/src/addins/CBinding/AddinInfo.cs
deleted file mode 100644
index 2d04910221..0000000000
--- a/main/src/addins/CBinding/AddinInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-
-using System;
-using Mono.Addins;
-using Mono.Addins.Description;
-
-[assembly:Addin ("CBinding", 
-	Namespace = "MonoDevelop",
-	Version = MonoDevelop.BuildInfo.Version,
-	Category = "Language bindings")]
-
-[assembly:AddinName ("C/C++ Language Binding")]
-[assembly:AddinDescription ("C/C++ Language binding")]
-
-[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("DesignerSupport", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("Deployment", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("Deployment.Linux", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("Refactoring", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("SourceEditor2", MonoDevelop.BuildInfo.Version)]
diff --git a/main/src/addins/CBinding/AssemblyInfo.cs b/main/src/addins/CBinding/AssemblyInfo.cs
deleted file mode 100644
index bec073d8a8..0000000000
--- a/main/src/addins/CBinding/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Autogenerated from CBinding.addin.xml
-
-using System.Reflection;
-
-[assembly: AssemblyProduct ("MonoDevelop")]
-[assembly: AssemblyTitle ("C/C++ Language Binding")]
-[assembly: AssemblyDescription ("C/C++ Language binding")]
-[assembly: AssemblyVersion ("2.6")]
-[assembly: AssemblyCopyright ("MIT X11")]
diff --git a/main/src/addins/CBinding/CBinding.Autotools/AssemblyInfo.cs b/main/src/addins/CBinding/CBinding.Autotools/AssemblyInfo.cs
deleted file mode 100644
index bd09d18668..0000000000
--- a/main/src/addins/CBinding/CBinding.Autotools/AssemblyInfo.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// AssemblyInfo.cs created with MonoDevelop
-// User: marcos at 5:00 PM 8/6/2007
-//
-// To change standard headers go to Edit->Preferences->Coding->Standard Headers
-//
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.0.0")]
-
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/main/src/addins/CBinding/CBinding.Autotools/CAutotoolsSetup.cs b/main/src/addins/CBinding/CBinding.Autotools/CAutotoolsSetup.cs
deleted file mode 100644
index afa2f9e7c5..0000000000
--- a/main/src/addins/CBinding/CBinding.Autotools/CAutotoolsSetup.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// CAutotoolsSetup.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Autotools;
-
-using CBinding;
-
-namespace CBinding.Autotools
-{
-	public class CAutotoolsSetup : ISimpleAutotoolsSetup
-	{
-		public string GetCompilerCommand (Project project, string configuration)
-		{
-			if (!CanDeploy (project))
-				throw new Exception ("Not a deployable project.");
-			
-			CProject cproj = project as CProject;
-			
-			return cproj.Compiler.CompilerCommand;
-		}
-
-		// FIXME: Currently only the compiler flags are sent, no linker flags are sent.
-		public string GetCompilerFlags (Project project, string configuration)
-		{
-			if (!CanDeploy (project))
-				throw new Exception ("Not a deployable project.");
-			
-			CProjectConfiguration config = project.Configurations[configuration] as CProjectConfiguration;
-			
-			if (config == null)
-				return string.Empty;
-			
-			CProject cproj = project as CProject;
-			
-			return cproj.Compiler.GetCompilerFlags (cproj, config);
-		}
-
-		public bool CanDeploy (Project project)
-		{
-			return project is CProject;
-		}
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj b/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj
deleted file mode 100644
index 5cb50bacca..0000000000
--- a/main/src/addins/CBinding/CBinding.Autotools/CBinding.Autotools.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B841F25D-4F6D-4E0D-885F-212B54381F28}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>MonoDevelop.CBinding.Autotools</AssemblyName>
-    <RootNamespace>CBinding.Autotools</RootNamespace>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\build\AddIns\BackendBindings\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <Execution>
-      <Execution clr-version="Net_2_0" />
-    </Execution>
-    <DefineConstants>DEBUG</DefineConstants>
-    <NoWarn>1591;1573</NoWarn>
-    <DocumentationFile>..\..\..\..\build\AddIns\BackendBindings\MonoDevelop.CBinding.Autotools.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\..\build\AddIns\BackendBindings\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <Execution>
-      <Execution clr-version="Net_2_0" />
-    </Execution>
-    <DebugSymbols>true</DebugSymbols>
-    <NoWarn>1591;1573</NoWarn>
-    <DocumentationFile>..\..\..\..\build\AddIns\BackendBindings\MonoDevelop.CBinding.Autotools.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\MonoDevelop.Autotools\MonoDevelop.Autotools.csproj">
-      <Project>{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}</Project>
-      <Name>MonoDevelop.Autotools</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\CBinding.csproj">
-      <Project>{7B57882B-AD46-469B-84E7-06DF98D11468}</Project>
-      <Name>CBinding</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
-      <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
-      <Name>MonoDevelop.Core</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Deployment\MonoDevelop.Deployment\MonoDevelop.Deployment.csproj">
-      <Project>{9BC670A8-1851-40EC-9685-279F4C98433D}</Project>
-      <Name>MonoDevelop.Deployment</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
-      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
-      <Name>MonoDevelop.Ide</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
-      <Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
-      <Name>MonoDevelop.DesignerSupport</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CAutotoolsSetup.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
diff --git a/main/src/addins/CBinding/CBinding.Autotools/ChangeLog b/main/src/addins/CBinding/CBinding.Autotools/ChangeLog
deleted file mode 100644
index 16c000d5b6..0000000000
--- a/main/src/addins/CBinding/CBinding.Autotools/ChangeLog
+++ /dev/null
@@ -1,44 +0,0 @@
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.Autotools.csproj: Merged MD.Projects into MD.Core,
-	  and MD.Projects.Gui, MD.Core.Gui and MD.Components into
-	  MD.Ide.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.Autotools.csproj: Flush.
-
-2009-10-13  Ankit Jain  <jankit@novell.com>
-
-	* CBinding.Autotools.csproj: Import md.targets .
-
-2009-06-19  Mike Krüger  <mkrueger@novell.com>
-
-	* AssemblyInfo.cs: Commented out empty assembly key file
-	  attribute (Bug 513981 - Project template causes CS1726
-	  errors).
-
-2009-02-18  Mike Krüger  <mkrueger@novell.com>
-
-	* CAutotoolsSetup.cs: Fixed 'Bug 456971 - ${ProjectDir} Not
-	  updating for currently building project'.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CBinding.Autotools.csproj: More refs to keep csc happy.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CBinding.Autotools.csproj: Don't local-copy other addins'
-	  dlls.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CBinding.Autotools.csproj: More explicit references to keep
-	  csc happy.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.Autotools.mdp:
-	* CBinding.Autotools.csproj: Migrated to MSBuild file format.
-
diff --git a/main/src/addins/CBinding/CBinding.addin.xml b/main/src/addins/CBinding/CBinding.addin.xml
deleted file mode 100644
index 35cb77e26d..0000000000
--- a/main/src/addins/CBinding/CBinding.addin.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<ExtensionModel>
-
-	<Extension path = "/MonoDevelop/Core/StockIcons">
-		<StockIcon stockid = "md-union" resource = "union-16.png" size="Menu"/>
-		<StockIcon stockid = "md-protected-union" resource = "union-protected-16.png" size="Menu"/>
-		<StockIcon stockid = "md-private-union" resource = "union-private-16.png" size="Menu"/>
-		<StockIcon stockid = "md-c-file" icon = "md-file-source" size="Menu" />
-		<StockIcon stockid = "md-h-file" icon = "md-file-header" size="Menu" />
-		<StockIcon stockid = "md-cpp-file" icon = "md-file-source" size="Menu" />
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Ide/FileFilters">
-		<FileFilter
-			id = "CPP"
-			insertbefore = "AllFiles"
-			_label = "C++ Files"
-			extensions = "*.cpp,*.h,*.hpp,*.cxx,*.cc,*.hh,*.hxx"/>
-		<FileFilter
-			id = "C"
-			insertbefore = "AllFiles"
-			_label = "C Files"
-			extensions = "*.c,*.h"/>
-		<FileFilter
-			id = "Objective C"
-			insertbefore = "AllFiles"
-			_label = "Objective C Files"
-			extensions = "*.m,*.h"/>
-		<FileFilter
-			id = "Objective C++"
-			insertbefore = "AllFiles"
-			_label = "Objective C++ Files"
-			extensions = "*.mm,*.M,*.h"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/FileTemplates">
-		<FileTemplate id = "EmptyCSourceFile" resource = "EmptyCSourceFile.xft.xml"/>
-		<FileTemplate id = "EmptyCHeaderFile" resource = "EmptyCHeaderFile.xft.xml"/>
-		<FileTemplate id = "EmptyCppSourceFile" resource = "EmptyCppSourceFile.xft.xml"/>
-		<FileTemplate id = "EmptyCppHeaderFile" resource = "EmptyCppHeaderFile.xft.xml"/>
-		<FileTemplate id = "EmptyObjCSourceFile" resource = "EmptyObjCSourceFile.xft.xml"/>
-		<FileTemplate id = "EmptyObjCppSourceFile" resource = "EmptyObjCppSourceFile.xft.xml"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
-		<!-- C -->
-		<ProjectTemplate id = "EmptyCProject" resource = "EmptyCProject.xpt.xml"/>
-		<ProjectTemplate id = "SharedLibraryCProject" resource = "SharedLibraryCProject.xpt.xml"/>
-		<ProjectTemplate id = "StaticLibraryCProject" resource = "StaticLibraryCProject.xpt.xml"/>
-		<ProjectTemplate id = "ConsoleCProject" resource = "ConsoleCProject.xpt.xml"/>
-		
-		<!-- C++ -->
-		<ProjectTemplate id = "EmptyCppProject" resource = "EmptyCppProject.xpt.xml"/>
-		<ProjectTemplate id = "SharedLibraryCppProject" resource = "SharedLibraryCppProject.xpt.xml"/>
-		<ProjectTemplate id = "StaticLibraryCppProject" resource = "StaticLibraryCppProject.xpt.xml"/>
-		<ProjectTemplate id = "ConsoleCppProject" resource = "ConsoleCppProject.xpt.xml"/>
-		
-		<!-- ObjC -->
-		<ProjectTemplate id = "ConsoleObjCProject" resource = "ConsoleObjCProject.xpt.xml"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Core/MimeTypes">
-		<MimeType id="text/x-csrc" icon="md-c-file" isText="true">
-			<File pattern="*.c" />
-		</MimeType>
-		<MimeType id="text/x-chdr" icon="md-h-file" isText="true">
-			<File pattern="*.h" />
-		</MimeType>
-		<MimeType id="text/x-c++src" icon="md-cpp-file" isText="true">
-			<File pattern="*.cpp" />
-			<File pattern="*.cc" />
-			<File pattern="*.cxx" />
-		</MimeType>
-		<MimeType id="text/x-c++hdr" icon="md-h-file" isText="true">
-			<File pattern="*.hpp" />
-			<File pattern="*.hh" />
-			<File pattern="*.hxx" />
-		</MimeType>
-		<MimeType id="text/x-objcsrc" icon="md-c-file" isText="true">
-			<File pattern="*.m" />
-		</MimeType>
-		<MimeType id="text/x-objc++src" icon="md-cpp-file" isText="true">
-			<File pattern="*.mm" />
-			<File pattern="*.M" />
-		</MimeType>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/ProjectModel/ProjectBindings">
-		<ProjectBinding id = "CProject" class = "CBinding.CProjectBinding"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/ProjectModel/LanguageBindings">
-		<LanguageBinding
-			id = "C"
-		    supportedextensions = ".c,.h"
-		    class = "CBinding.CLanguageBinding"/>
-		<LanguageBinding
-			id = "CPP"
-			supportedextensions = ".cpp,.cxx,.cc,.h,.hpp,.hh,.hxx"
-		    class = "CBinding.CppLanguageBinding"/>
-		<LanguageBinding
-			id = "Objective C"
-		    supportedextensions = ".m,.h"
-		    class = "CBinding.ObjCLanguageBinding"/>
-		<LanguageBinding
-			id = "Objective C++"
-			supportedextensions = ".mm,.M"
-		    class = "CBinding.ObjCppLanguageBinding"/>
-    </Extension>
-    
-	<Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/Projects">
-		<Section
-			id = "CBindingOptions"
-			_label = "C/C++"
-			class = "CBinding.GeneralOptionsPanelBinding"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build">
-		<Condition id = "ItemType" value = "CBinding.CProject">
-			<Section
-				id = "CompilerPanel"
-			    _label = "Compiler"
-			    insertafter = "Compile"
-			    class = "CBinding.CompilerPanelBinding"/>
-			<Section
-				id = "CodeGenerationPanel"
-			    _label = "Code Generation"
-			    class = "CBinding.CodeGenerationPanelBinding"/>
-			<Section
-				id = "OutputOptionsPanel"
-			    _label = "Output"
-			    class = "CBinding.OutputOptionsPanelBinding"/>
-		</Condition>
-	</Extension>
-	
-	<ExtensionPoint path = "/CBinding/Views/ProjectBrowser/ContextMenu/PackagesFolderNode" name = "Packages folder context menu">
-		<Description>Context menu for packages folder in the solution pad.</Description>
-		<ExtensionNodeSet id = "MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/CBinding/Views/ProjectBrowser/ContextMenu/PackageNode" name = "ProjectPackage context menu">
-		<Description>Context menu for a package in the solution pad.</Description>
-		<ExtensionNodeSet id = "MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-	
-	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
-		<NodeBuilder id = "CBinding.ProjectPad.ProjectReferencesExtension" class = "CBinding.ProjectPad.ProjectReferencesExtension"/>
-		<NodeBuilder id = "CBinding.ProjectPad.ProjectNodeExtension" class = "CBinding.ProjectPad.ProjectNodeExtension"/>
-		<NodeBuilder id = "CBinding.ProjectPad.ProjectPackagesFolderNodeBuilder" class = "CBinding.ProjectPad.ProjectPackagesFolderNodeBuilder"/>
-		<NodeBuilder id = "CBinding.ProjectPad.ProjectPackageNodeBuilder" class = "CBinding.ProjectPad.ProjectPackageNodeBuilder"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Ide/Pads/ClassPad">
-		<NodeBuilder id = "CBinding.Navigation.ProjectNodeBuilderExtension" class = "CBinding.Navigation.ProjectNodeBuilderExtension"/>
-		<NodeBuilder id = "CBinding.Navigation.NamespaceNodeBuilder" class = "CBinding.Navigation.NamespaceNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.FunctionNodeBuilder" class = "CBinding.Navigation.FunctionNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.GlobalsNodeBuilder" class = "CBinding.Navigation.GlobalsNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.ClassNodeBuilder" class = "CBinding.Navigation.ClassNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.StructureNodeBuilder" class = "CBinding.Navigation.StructureNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.MemberNodeBuilder" class = "CBinding.Navigation.MemberNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.VariableNodeBuilder" class = "CBinding.Navigation.VariableNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.MacroDefinitionsNodeBuilder" class = "CBinding.Navigation.MacroDefinitionsNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.MacroNodeBuilder" class = "CBinding.Navigation.MacroNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.EnumerationNodeBuilder" class = "CBinding.Navigation.EnumerationNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.EnumeratorNodeBuilder" class = "CBinding.Navigation.EnumeratorNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.UnionNodeBuilder" class = "CBinding.Navigation.UnionNodeBuilder"/>
-		<NodeBuilder id = "CBinding.Navigation.TypedefNodeBuilder" class = "CBinding.Navigation.TypedefNodeBuilder"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Ide/Commands">
-		<Category _name = "C/C++" id = "C/C++">
-			<Command id = "CBinding.CProjectCommands.AddPackage" _label = "Edit Packages..." />
-			<Command id = "CBinding.CProjectCommands.UpdateClassPad" _label = "Update class pad" />
-			<Command id = "CBinding.CProjectCommands.ShowPackageDetails" _label = "Details..." />
-		</Category>
-	</Extension>
-	
-	<Extension path = "/CBinding/Views/ProjectBrowser/ContextMenu/PackagesFolderNode">
-		<CommandItem id = "CBinding.CProjectCommands.AddPackage"/>
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Paste"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Ide/ContextMenu/ClassPad/Project">
-		<CommandItem id = "CBinding.CProjectCommands.UpdateClassPad"/>
-	</Extension>
-	
-	<Extension path = "/CBinding/Views/ProjectBrowser/ContextMenu/PackageNode">
-		<CommandItem id = "CBinding.CProjectCommands.ShowPackageDetails"/>
-		<SeparatorItem id = "Separator1" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Copy"/>
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/ProjectModel/ProjectServiceExtensions">
-		<Condition id="ItemType" value="CBinding.CProject">
-			<Class id = "ExtraSteps" class = "CBinding.CProjectServiceExtension"/>
-		</Condition>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
-		<Class fileExtensions=".c,.cpp,.cxx,.cc,.h,.hpp,.hh,.hxx,.m,.mm,.M" class = "CBinding.CTextEditorExtension" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
-		<DataType class = "CBinding.CProjectConfiguration"/>
-		<DataType class = "CBinding.CProject"/>
-		<DataType class = "CBinding.GccCompiler"/>
-		<DataType class = "CBinding.GppCompiler"/>
-		<DataType class = "CBinding.Package"/>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
-		<SolutionItem type="CBinding.CProject" extension="cproj" guid="{2857B73E-F847-4B02-9238-064979017E93}"/>
-	</Extension>
-	
-<!-- Current Autotools AddIn is very .NET specific
-	<Module>
-	    <Runtime>
-	        <Import assembly = "CBinding.Autotools.dll"/>
-	    </Runtime>
-	    
-		<Dependencies>
-			<Addin id = "MonoDevelop.Autotools" version = "4.2.3"/>
-		</Dependencies>
-		
-		<Extension path = "/Autotools/SimpleSetups">
-			<Class class = "CBinding.Autotools.CAutotoolsSetup"/>
-		</Extension>
-	</Module>
--->
-	
-	<Extension path = "/MonoDevelop/TypeSystem/Parser">
-		<Parser class="CBinding.Parser.CDocumentParser" mimeType = "text/x-csrc, text/x-chdr, text/x-c++src, text/x-c++hdr, text/x-objcsrc, text/x-objc++src" />
-	</Extension>
-	
-	<Extension path="/MonoDevelop/SourceEditor2/ContextMenu/Editor">
-		<Condition id="FileType" fileExtensions=".c,.cpp,.cxx,.cc,.h,.hpp,.hh,.hxx,.m,.mm,.M">
-			<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration" insertafter="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations" />
-		</Condition>
-	</Extension>
-	
-	<Extension path = "/MonoDevelop/Ide/CompletionCharacters">
-		<Complete language="C/C++" commitOnSpace="True" commitChars="{}[]().,:;+-*/%&amp;|^!~=&lt;&gt;?@#'&quot;\"/>
-	</Extension>
-</ExtensionModel>
diff --git a/main/src/addins/CBinding/CBinding.csproj b/main/src/addins/CBinding/CBinding.csproj
deleted file mode 100644
index 94f0eb7bb6..0000000000
--- a/main/src/addins/CBinding/CBinding.csproj
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7B57882B-AD46-469B-84E7-06DF98D11468}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>MonoDevelop.CBinding</AssemblyName>
-    <RootNamespace>CBinding</RootNamespace>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\build\AddIns\BackendBindings\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <Execution>
-      <Execution clr-version="Net_2_0" />
-    </Execution>
-    <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
-    <DefineConstants>DEBUG</DefineConstants>
-    <NoWarn>1591;1573</NoWarn>
-    <DocumentationFile>..\..\..\build\AddIns\BackendBindings\MonoDevelop.CBinding.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\build\AddIns\BackendBindings\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <Execution>
-      <Execution clr-version="Net_2_0" />
-    </Execution>
-    <DebugSymbols>true</DebugSymbols>
-    <NoWarn>1591;1573</NoWarn>
-    <DocumentationFile>..\..\..\build\AddIns\BackendBindings\MonoDevelop.CBinding.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Mono.Posix" />
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
-      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
-      <Name>MonoDevelop.Ide</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
-      <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
-      <Name>MonoDevelop.Core</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Deployment\MonoDevelop.Deployment\MonoDevelop.Deployment.csproj">
-      <Project>{9BC670A8-1851-40EC-9685-279F4C98433D}</Project>
-      <Name>MonoDevelop.Deployment</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Deployment\MonoDevelop.Deployment.Linux\MonoDevelop.Deployment.Linux.csproj">
-      <Project>{BA9020AD-A2D1-47C8-9A7C-756162C38296}</Project>
-      <Name>MonoDevelop.Deployment.Linux</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
-      <Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
-      <Name>MonoDevelop.DesignerSupport</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
-      <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
-      <Name>MonoDevelop.Refactoring</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
-      <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
-      <Name>MonoDevelop.Debugger</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
-      <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
-      <Name>Mono.Addins</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\debugger-libs\Mono.Debugging\Mono.Debugging.csproj">
-      <Project>{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}</Project>
-      <Name>Mono.Debugging</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\xwt\Xwt\Xwt.csproj">
-      <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project>
-      <Name>Xwt</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile.am" />
-    <None Include="README" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="CBinding.addin.xml">
-      <LogicalName>CBinding.addin.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\EmptyCProject.xpt.xml">
-      <LogicalName>EmptyCProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\EmptyCSourceFile.xft.xml">
-      <LogicalName>EmptyCSourceFile.xft.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\EmptyCppProject.xpt.xml">
-      <LogicalName>EmptyCppProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="gtk-gui\gui.stetic">
-      <LogicalName>gui.stetic</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\EmptyCHeaderFile.xft.xml">
-      <LogicalName>EmptyCHeaderFile.xft.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\EmptyCppHeaderFile.xft.xml">
-      <LogicalName>EmptyCppHeaderFile.xft.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\EmptyCppSourceFile.xft.xml">
-      <LogicalName>EmptyCppSourceFile.xft.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\SharedLibraryCProject.xpt.xml">
-      <LogicalName>SharedLibraryCProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\SharedLibraryCppProject.xpt.xml">
-      <LogicalName>SharedLibraryCppProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\StaticLibraryCProject.xpt.xml">
-      <LogicalName>StaticLibraryCProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\StaticLibraryCppProject.xpt.xml">
-      <LogicalName>StaticLibraryCppProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\ConsoleCProject.xpt.xml">
-      <LogicalName>ConsoleCProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\ConsoleCppProject.xpt.xml">
-      <LogicalName>ConsoleCppProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\ConsoleObjCProject.xpt.xml">
-      <LogicalName>ConsoleObjCProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\EmptyObjCSourceFile.xft.xml">
-      <LogicalName>EmptyObjCSourceFile.xft.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\EmptyObjCppSourceFile.xft.xml">
-      <LogicalName>EmptyObjCppSourceFile.xft.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\union-private-16.png">
-      <LogicalName>union-private-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\union-protected-16.png">
-      <LogicalName>union-protected-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\union-16.png">
-      <LogicalName>union-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="icons\update.png">
-      <LogicalName>update.png</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Project\CProject.cs" />
-    <Compile Include="Project\CProjectBinding.cs" />
-    <Compile Include="Project\CProjectConfiguration.cs" />
-    <Compile Include="gtk-gui\generated.cs" />
-    <Compile Include="Gui\CodeGenerationPanel.cs" />
-    <Compile Include="Compiler\CCompiler.cs" />
-    <Compile Include="Compiler\GccCompiler.cs" />
-    <Compile Include="Compiler\GppCompiler.cs" />
-    <Compile Include="Compiler\GNUCompiler.cs" />
-    <Compile Include="Gui\CompilerPanel.cs" />
-    <Compile Include="gtk-gui\CBinding.CodeGenerationPanel.cs" />
-    <Compile Include="gtk-gui\CBinding.CompilerPanel.cs" />
-    <Compile Include="Compiler\ICompiler.cs" />
-    <Compile Include="Project\ProjectPackageCollection.cs" />
-    <Compile Include="Gui\EditPackagesDialog.cs" />
-    <Compile Include="gtk-gui\CBinding.EditPackagesDialog.cs" />
-    <Compile Include="CLanguageBinding.cs" />
-    <Compile Include="Project\Package.cs" />
-    <Compile Include="Project\ProjectPackageEventArgs.cs" />
-    <Compile Include="Gui\OutputOptionsPanel.cs" />
-    <Compile Include="gtk-gui\CBinding.OutputOptionsPanel.cs" />
-    <Compile Include="Project\CProjectServiceExtension.cs" />
-    <Compile Include="Navigation\ProjectNodeBuilderExtension.cs" />
-    <Compile Include="Navigation\NamespaceNodeBuilder.cs" />
-    <Compile Include="ProjectPad\ProjectReferencesExtension.cs" />
-    <Compile Include="ProjectPad\ProjectPackagesFolderNodeBuilder.cs" />
-    <Compile Include="ProjectPad\ProjectPackageNodeBuilder.cs" />
-    <Compile Include="ProjectPad\ProjectNodeExtension.cs" />
-    <Compile Include="Navigation\FunctionNodeBuilder.cs" />
-    <Compile Include="Navigation\GlobalsNodeBuilder.cs" />
-    <Compile Include="Navigation\ClassNodeBuilder.cs" />
-    <Compile Include="Navigation\LanguageItemCommandHandler.cs" />
-    <Compile Include="Navigation\StructureNodeBuilder.cs" />
-    <Compile Include="Navigation\MemberNodeBuilder.cs" />
-    <Compile Include="Navigation\VariableNodeBuilder.cs" />
-    <Compile Include="Navigation\MacroNodeBuilder.cs" />
-    <Compile Include="Navigation\MacroDefinitionsNodeBuilder.cs" />
-    <Compile Include="Navigation\EnumerationNodeBuilder.cs" />
-    <Compile Include="Navigation\EnumeratorNodeBuilder.cs" />
-    <Compile Include="Navigation\UnionNodeBuilder.cs" />
-    <Compile Include="Navigation\TypedefNodeBuilder.cs" />
-    <Compile Include="Navigation\LanguageItemEventArgs.cs" />
-    <Compile Include="Navigation\ClassPadEventArgs.cs" />
-    <Compile Include="Parser\ProjectInformation.cs" />
-    <Compile Include="Parser\ProjectInformationManager.cs" />
-    <Compile Include="Parser\TagDatabaseManager.cs" />
-    <Compile Include="Parser\Tag.cs" />
-    <Compile Include="Gui\CTextEditorExtension.cs" />
-    <Compile Include="Gui\DataProvider.cs" />
-    <Compile Include="Parser\Class.cs" />
-    <Compile Include="Parser\Enumeration.cs" />
-    <Compile Include="Parser\Enumerator.cs" />
-    <Compile Include="Parser\Function.cs" />
-    <Compile Include="Parser\LanguageItem.cs" />
-    <Compile Include="Parser\Macro.cs" />
-    <Compile Include="Parser\Member.cs" />
-    <Compile Include="Parser\Namespace.cs" />
-    <Compile Include="Parser\Structure.cs" />
-    <Compile Include="Parser\Typedef.cs" />
-    <Compile Include="Parser\Union.cs" />
-    <Compile Include="Parser\Variable.cs" />
-    <Compile Include="CppLanguageBinding.cs" />
-    <Compile Include="Gui\GeneralOptionsPanel.cs" />
-    <Compile Include="gtk-gui\CBinding.GeneralOptionsPanel.cs" />
-    <Compile Include="Parser\Local.cs" />
-    <Compile Include="Gui\PackageDetails.cs" />
-    <Compile Include="gtk-gui\CBinding.PackageDetails.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Parser\CDocumentParser.cs" />
-    <Compile Include="ObjCLanguageBinding.cs" />
-    <Compile Include="ObjCppLanguageBinding.cs" />
-    <Compile Include="Parser\CompilationUnitDataProvider.cs" />
-    <Compile Include="Parser\DataProvider.cs" />
-    <Compile Include="Parser\CTagsManager.cs" />
-    <Compile Include="Parser\ExuberantCTagsManager.cs" />
-    <Compile Include="Parser\BsdCTagsManager.cs" />
-    <Compile Include="AddinInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Deployment.LinuxDeployData scriptName="cbinding" />
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
-</Project>
diff --git a/main/src/addins/CBinding/CLanguageBinding.cs b/main/src/addins/CBinding/CLanguageBinding.cs
deleted file mode 100644
index ca0c3d91ac..0000000000
--- a/main/src/addins/CBinding/CLanguageBinding.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// CLanguageBinding.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-
-namespace CBinding
-{
-	public class CLanguageBinding : ILanguageBinding
-	{
-		public string Language {
-			get { return "C"; }
-		}
-		
-		public string SingleLineCommentTag { get { return null; } }
-		public string BlockCommentStartTag { get { return "/*"; } }
-		public string BlockCommentEndTag { get { return "*/"; } }
-		
-		public bool IsSourceCodeFile (FilePath fileName)
-		{
-			return fileName.ToString ().EndsWith (".c", StringComparison.OrdinalIgnoreCase);
-		}
-		
-		public FilePath GetFileName (FilePath baseName)
-		{
-			return baseName + ".c";
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/ChangeLog b/main/src/addins/CBinding/ChangeLog
deleted file mode 100644
index 65a8cfb638..0000000000
--- a/main/src/addins/CBinding/ChangeLog
+++ /dev/null
@@ -1,1853 +0,0 @@
-2010-07-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CTextEditorExtension.cs: Fixed the C return command.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs:
-	* Navigation/LanguageItemCommandHandler.cs: Track API changes.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CBinding.csproj:
-	* Gui/CTextEditorExtension.cs: Track API changes.
-
-2010-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs: Track API changes.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CBinding.addin.xml:
-	* Parser/CDocumentParser.cs: Track ProjectDomService/Parser
-	  API.
-
-2010-06-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CProject.cs: Allow setting the External Console flag
-	  in the options.
-
-	* templates/ConsoleCProject.xpt.xml:
-	* templates/ConsoleCppProject.xpt.xml: Set the external
-	  console flag for console projects.
-
-2010-05-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Project/CProjectBinding.cs: Only create single file projects
-	  for C/C++ files.
-
-2010-05-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Compiler/GNUCompiler.cs: Don't include the generic () errors
-	  in the errors list. Don't reverse order of errors from
-	  compiler.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* CBinding.csproj:
-	* gtk-gui/gui.stetic:
-	* Gui/AddPathDialog.cs:
-	* Gui/AddLibraryDialog.cs:
-	* Gui/OutputOptionsPanel.cs:
-	* Gui/CodeGenerationPanel.cs:
-	* gtk-gui/CBinding.AddPathDialog.cs:
-	* gtk-gui/CBinding.AddLibraryDialog.cs:
-	* gtk-gui/CBinding.OutputOptionsPanel.cs:
-	* gtk-gui/CBinding.CodeGenerationPanel.cs:
-	* ProjectPad/ProjectPackagesFolderNodeBuilder.cs: Clean up
-	  dialog placement.
-
-2010-05-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* CBinding.csproj:
-	* CBinding.addin.xml:
-	* Project/CProject.cs:
-	* Gui/CTextEditorExtension.cs:
-	* Gui/SwapSourceHeaderCommand.cs: Replaced the 'Swap
-	  Source/Header' command by a handler for the 'Switch between
-	  related files' command.
-
-2010-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs: Track API changes.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs: Track API changes.
-
-2010-03-26  Levi Bard  <levi@unity3d.com>
-
-	* Project/CProject.cs: Fix linking for library projects whose
-	  names are prefixed with lib. Fixes #587298.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CBinding.addin.xml: Bumped MD version.
-
-2010-03-18  Levi Bard  <levi@unity3d.com>
-
-	* Gui/DataProvider.cs: 
-	* Gui/CTextEditorExtension.cs: Track API changes.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.csproj: Remove import off mono.addins targets.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* CBinding.csproj:
-	* CBinding.addin.xml:
-	* gtk-gui/gui.stetic:
-	* Project/CProject.cs:
-	* Gui/DataProvider.cs:
-	* Gui/CompilerPanel.cs:
-	* Compiler/CCompiler.cs:
-	* Parser/LanguageItem.cs:
-	* Compiler/GppCompiler.cs:
-	* Compiler/GNUCompiler.cs:
-	* Compiler/GccCompiler.cs:
-	* Gui/EditPackagesDialog.cs:
-	* Gui/OutputOptionsPanel.cs:
-	* Parser/CDocumentParser.cs:
-	* Gui/GeneralOptionsPanel.cs:
-	* Gui/CodeGenerationPanel.cs:
-	* Gui/CTextEditorExtension.cs:
-	* Navigation/UnionNodeBuilder.cs:
-	* Navigation/MacroNodeBuilder.cs:
-	* Navigation/ClassNodeBuilder.cs:
-	* Gui/SwapSourceHeaderCommand.cs:
-	* Navigation/MemberNodeBuilder.cs:
-	* Navigation/GlobalsNodeBuilder.cs:
-	* Navigation/TypedefNodeBuilder.cs:
-	* Navigation/FunctionNodeBuilder.cs:
-	* Navigation/VariableNodeBuilder.cs:
-	* Navigation/StructureNodeBuilder.cs:
-	* Navigation/NamespaceNodeBuilder.cs:
-	* Navigation/EnumeratorNodeBuilder.cs:
-	* Navigation/EnumerationNodeBuilder.cs:
-	* ProjectPad/ProjectPackageNodeBuilder.cs:
-	* gtk-gui/CBinding.CodeGenerationPanel.cs:
-	* Navigation/LanguageItemCommandHandler.cs:
-	* Navigation/MacroDefinitionsNodeBuilder.cs:
-	* Navigation/ProjectNodeBuilderExtension.cs:
-	* ProjectPad/ProjectPackagesFolderNodeBuilder.cs: Merged
-	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
-	  and MD.Components into MD.Ide.
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Project/CProject.cs: Track ProjectFile Link API.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/DataProvider.cs: Track api changes.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.addin.xml: Added some conditions to avoid early
-	  loading of extensions.
-
-	* Gui/CTextEditorExtension.cs: File extensions are now
-	  declared in the node metadata.
-
-2010-02-04  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/GNUCompiler.cs: Support gcc "note" errortype.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/CBinding.CompilerPanel.cs:
-	* gtk-gui/CBinding.AddPathDialog.cs:
-	* gtk-gui/CBinding.PackageDetails.cs:
-	* gtk-gui/CBinding.AddLibraryDialog.cs:
-	* gtk-gui/CBinding.OutputOptionsPanel.cs:
-	* gtk-gui/CBinding.EditPackagesDialog.cs:
-	* gtk-gui/CBinding.CodeGenerationPanel.cs:
-	* gtk-gui/CBinding.GeneralOptionsPanel.cs: Flush.
-
-2010-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs: Track API changes.
-
-2010-01-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CProjectServiceExtension.cs: Enable extension only
-	  for C projects.
-
-2010-01-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CBinding.addin.xml: Reverted the fix for Bug 468416 because
-	  it marked .h as c++ headers, which is the wrong mimetype.
-
-2010-01-04  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/TagDatabaseManager.cs: Allow parsing of headers
-	  included from packages.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Parser/TagDatabaseManager.cs: Name threads to make debugging
-	  easier.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CProject.cs:
-	* Gui/CompilerPanel.cs:
-	* Gui/EditPackagesDialog.cs:
-	* Project/CProjectServiceExtension.cs:
-	* ProjectPad/ProjectPackagesFolderNodeBuilder.cs: Introduced
-	  the ConfigurationSelector class to all methods that
-	  previously took a configuration name as string. This
-	  eliminates the ambiguity between solution configuration
-	  names and project configuration names.
-
-2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Project/CProject.cs: Track API. Get correct configuration.
-
-2009-11-06  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/CDocumentParser.cs:
-	* Parser/TagDatabaseManager.cs: Lock projectinfo on update.
-
-2009-11-06  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/EditPackagesDialog.cs: Don't let bad packages break
-	  scanning.
-
-2009-11-06  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Gui/DataProvider.cs: Escape text for parameter completion.
-
-2009-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/CompilerPanel.cs:
-	* Gui/EditPackagesDialog.cs:
-	* ProjectPad/ProjectPackagesFolderNodeBuilder.cs: Use the
-	  correct method for getting the active configuration.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CBinding.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/CBinding.AddPathDialog.cs:
-	* gtk-gui/CBinding.CompilerPanel.cs:
-	* gtk-gui/CBinding.PackageDetails.cs:
-	* gtk-gui/CBinding.AddLibraryDialog.cs:
-	* gtk-gui/CBinding.EditPackagesDialog.cs:
-	* gtk-gui/CBinding.OutputOptionsPanel.cs:
-	* gtk-gui/CBinding.CodeGenerationPanel.cs:
-	* gtk-gui/CBinding.GeneralOptionsPanel.cs: Flush.
-
-2009-10-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CProject.cs:
-	* Project/CProjectServiceExtension.cs: Properly resolve active
-	  configuration.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CBinding.addin.xml: Bump MD version.
-
-2009-10-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* CBinding.csproj:
-	* CBinding.addin.xml:
-	* Gui/CTextEditorExtension.cs:
-	* Gui/SwapSourceHeaderCommand.cs: Only show the swap
-	  source/header command contextually. Fixes "Bug 544022 -
-	  "Swap source/header" is visible in context menu for all
-	  files".
-
-2009-09-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Compiler/GNUCompiler.cs: Fix bug #478735 - Can't link a
-	  library with a dot in the name.
-
-2009-09-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs:
-	* Gui/CTextEditorExtension.cs: Track API changes.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* Gui/OutputOptionsPanel.cs: 
-	* Gui/CodeGenerationPanel.cs: 
-	* ProjectPad/ProjectPackagesFolderNodeBuilder.cs: Set dialogs
-	  transient to the gtk window of the calling widget.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.csproj: Updated dependencies. We now depend on gtk#
-	  2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-18  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/TagDatabaseManager.cs: Clear file info before update.
-
-2009-08-18  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/Member.cs: 
-	* Gui/CTextEditorExtension.cs: 
-	* Parser/TagDatabaseManager.cs: 
-	  Fix C and C++ completion.
-
-2009-08-17  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformation.cs: Fix #530826.
-
-2009-08-13  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/ProjectInformationManager.cs: Fix NRE.
-
-2009-08-12  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* CBinding.addin.xml: 
-	* Makefile.am: 
-	* Parser/CDocumentParser.cs: 
-	* CBinding.csproj: 
-	  Allows the quickfinder and folds list to be populated 
-	  from the existing ctags database. Fixes #513382.
-
-2009-08-12  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Project/CProject.cs:
-	* Parser/TagDatabaseManager.cs:
-	* Parser/ProjectInformation.cs: Remove info from parse db when
-	  a file is removed from the project. Fixes #398632.
-
-2009-08-12  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Compiler/GNUCompiler.cs: Be more helpful on unparsable
-	  compiler/linker failure. Fixes #487964.
-
-2009-08-12  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* CBinding.addin.xml: Make supported file extensions more
-	  comprehensive and consistent.
-
-2009-08-12  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* CBinding.addin.xml: Set appropriate extension point for
-	  editor context menu command. Fixes #508838.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/CBinding.PackageDetails.cs: Flush.
-
-2009-07-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs: Track API changes.
-
-2009-07-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CProjectBinding.cs: Track api changes. Patch by
-	  Viktoria Dudka.
-
-2009-07-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs: Added range check.
-
-2009-06-29  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Localize output parser.
-	  Fixes #501898.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/TagDatabaseManager.cs: Use the new DesktopService
-	  instead of PlatformService.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CProject.cs: Track api changes.
-
-2009-06-13  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CTextEditorExtension.cs: Applied patch "Bug 512617 -
-	  [PATCH] Deleting a selected line with Enter, got "Error in
-	  text editor extension chain.".
-
-2009-04-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CLanguageBinding.cs:
-	* CppLanguageBinding.cs: Track comment tag API.
-
-2009-04-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CProject.cs: Track api changes in IExecutionHandler.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* templates/ConsoleCProject.xpt.xml:
-	* templates/EmptyCSourceFile.xft.xml:
-	* templates/EmptyCHeaderFile.xft.xml:
-	* templates/ConsoleCppProject.xpt.xml:
-	* templates/EmptyCppHeaderFile.xft.xml:
-	* templates/EmptyCppSourceFile.xft.xml:
-	* templates/StaticLibraryCProject.xpt.xml:
-	* templates/SharedLibraryCProject.xpt.xml:
-	* templates/SharedLibraryCppProject.xpt.xml:
-	* templates/StaticLibraryCppProject.xpt.xml: Fixed "Bug 491090
-	  - Standard Header doesn't work".
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* Gui/CTextEditorExtension.cs:
-	* gtk-gui/CBinding.AddPathDialog.cs:
-	* gtk-gui/CBinding.AddLibraryDialog.cs: Track api changes.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* CBinding.csproj: don't require specific gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CBinding.addin.xml: Bump MD version.
-
-2009-03-13  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/CBinding.PackageDetails.cs: Making some strings not
-	  translatable.
-
-2009-03-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CProject.cs: Changed the way execution handlers
-	  work. We are not using platform ids anymore. Instead, we use
-	  command strings when looking for execution handlers.
-	  IExecutionHandlerFactory has been removed and now everything
-	  is handled by IExecutionHandler, which has a new CanExecute
-	  method. This model is more simple and more generic.
-
-2009-02-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CBinding.csproj: Don't use 'make' to build.
-
-2009-02-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Project/Package.cs:
-	* Project/CProject.cs:
-	* Compiler/ICompiler.cs:
-	* Compiler/CCompiler.cs:
-	* Compiler/GNUCompiler.cs: Fixed 'Bug 456971 - ${ProjectDir}
-	  Not updating for currently building project'.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CTextEditorExtension.cs: Rename second 'openingLine'
-	  variable, as csc is more picky about multiple locals with
-	  the same name in switches.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CBinding.csproj: Flush MD's removal of newline at end of
-	  file that was introduced by manually editing with gedit.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CBinding.csproj: Remove invalid ApplicationIcon value that
-	  broke the build in VS.
-
-2009-02-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/TagDatabaseManager.cs: fixed compiler warnings.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/CBinding.AddPathDialog.cs:
-	* gtk-gui/CBinding.CompilerPanel.cs:
-	* gtk-gui/CBinding.PackageDetails.cs:
-	* gtk-gui/CBinding.AddLibraryDialog.cs:
-	* gtk-gui/CBinding.EditPackagesDialog.cs:
-	* gtk-gui/CBinding.OutputOptionsPanel.cs:
-	* gtk-gui/CBinding.CodeGenerationPanel.cs:
-	* gtk-gui/CBinding.GeneralOptionsPanel.cs: Flush.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.mds:
-	* CBinding.mdp:
-	* CBinding.csproj: Migrated to MSBuild file format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CBinding.addin.xml: Bump MD version.
-
-2009-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* CBinding.addin.xml: fixed "Bug 468416 - *.h aren't colorized as c++
-	headers".
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CBinding.mdp: Flush project format changes.
-
-2009-01-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CTextEditorExtension.cs: fixed bug 'Bug 467553 - Enter key doesn't
-	delete selected text'.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.mdp:
-	* CBinding.Autotools/CBinding.Autotools.mdp: All projects now require fx
-	3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.mdp: Don't require a specific version of Mono.Addins.
-
-2008-12-06  Mitchell Wheeler  <mitchell.wheeler@gmail.com>
-
-	* CBinding.addin.xml: Added C++ header mimetype.
-
-2008-12-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/CTextEditorExtension.cs: Track api changes.
-
-2008-12-05  Mitchell Wheeler  <mitchell.wheeler@gmail.com>
-
-	* Gui/CodeGenerationPanel.cs: Fixed typo causing include directories to be
-	duplicated when switching between configurations.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* CBinding.mdp:
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-23  Mitchell Wheeler  <mitchell.wheeler@gmail.com>
-
-	* Gui/CTextEditorExtension.cs: Trailing whitespace after the
-	cursor when inserting a new line will no longer copy additional
-	whitespace into the next line.
-
-2008-11-23  Mitchell Wheeler  <mitchell.wheeler@gmail.com>
-
-	* Gui/CTextEditorExtension.cs: Fixed index out of range
-	exception when attempting to add a new line to the
-	beginning of a file.
-
-2008-11-23  Mitchell Wheeler  <mitchell.wheeler@gmail.com>
-
-	* Gui/CTextEditorExtension.cs: Refactored code relating to auto
-	indentation - making it more maintainable/extensible for the
-	future in addition to fixing various indentation errors under
-	certain circumstances.
-
-2008-11-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/DataProvider.cs: fixed 'Bug 447040 - Error in text editor
-	extension chain (new case)'.
-
-2008-11-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CTextEditorExtension.cs: Fix Bug 446207 - [Regression] C
-	auto-formatting screws up.
-
-2008-11-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CProject.cs: Allow running C projects.
-
-	* Makefile.am: Fix parallel build issues.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CBinding.addin.xml: Bump MD version.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/DataProvider.cs:
-	* Gui/CTextEditorExtension.cs: Track APIs.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/DataProvider.cs: Track CompletionData API.
-
-2008-10-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/DataProvider.cs: Track API.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Project/CProject.cs: Track API.
-
-2008-09-29  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/DataProvider.cs: implemented IComparable.
-
-2008-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/DataProvider.cs: Track api changes.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.mdp: Updated projects.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/CBinding.PackageDetails.cs, gtk-gui/generated.cs,
-	  gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/CBinding.AddPathDialog.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs,
-	  gtk-gui/CBinding.GeneralOptionsPanel.cs,
-	  gtk-gui/CBinding.CompilerPanel.cs,
-	  gtk-gui/CBinding.OutputOptionsPanel.cs,
-	  gtk-gui/CBinding.AddLibraryDialog.cs: Updated generated code.
-
-2008-09-08  Mitchell Wheeler <mitchell.wheeler@gmail.com>
-
-	* Gui/CTextEditorExtension.cs, Gui/AddLibraryDialog.cs,
-	  Navigation/LanguageItemCommandHandler.cs,
-	  Project/CProjectConfiguration.cs, Project/CProject.cs,
-	  gtk-gui/CBinding.PackageDetails.cs, gtk-gui/generated.cs,
-	  gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/CBinding.AddPathDialog.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs,
-	  gtk-gui/CBinding.GeneralOptionsPanel.cs,
-	  gtk-gui/CBinding.CompilerPanel.cs,
-	  gtk-gui/CBinding.OutputOptionsPanel.cs,
-	  gtk-gui/CBinding.AddLibraryDialog.cs, gtk-gui/gui.stetic,
-	  Compiler/GNUCompiler.cs: Fixed various (dependency parsing,
-	  compiling, linking) bugs, so the binding now properly handles
-	  pathnames with spaces, and use the appropriate project
-	  configuration information.  Started removing various gcc-specific
-	  library naming conventions from 'generic' areas of the C Binding
-	  codebase...  Compiled object & dependency files are now stored in the
-	  output directory, so they no longer pollute the source tree.
-	* Parser/Tag.cs, Parser/ProjectInformation.cs,
-	  Parser/TagDatabaseManager.cs, Parser/LanguageItem.cs,
-	  Parser/Member.cs: Fixed various ctags parsing bugs, in relation to
-	  pathnames containing spaces;  Tag information now references code by
-	  file & line number, to avoid potential cases where the pattern
-	  matches more than just the expected section.
-	* md1format.xml: Updated MD1 file format serialization to serialize
-	  libraries (library paths still broken?).
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ProjectPad/ProjectPackagesFolderNodeBuilder.cs,
-	  ProjectPad/ProjectPackageNodeBuilder.cs,
-	  ProjectPad/ProjectReferencesExtension.cs,
-	  ProjectPad/ProjectNodeExtension.cs,
-	  Navigation/TypedefNodeBuilder.cs,
-	  Navigation/StructureNodeBuilder.cs, Navigation/MacroNodeBuilder.cs,
-	  Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/ClassNodeBuilder.cs, Navigation/MemberNodeBuilder.cs,
-	  Navigation/EnumeratorNodeBuilder.cs,
-	  Navigation/LanguageItemCommandHandler.cs,
-	  Navigation/GlobalsNodeBuilder.cs,
-	  Navigation/FunctionNodeBuilder.cs,
-	  Navigation/VariableNodeBuilder.cs,
-	  Navigation/EnumerationNodeBuilder.cs,
-	  Navigation/UnionNodeBuilder.cs, Navigation/NamespaceNodeBuilder.cs,
-	  Navigation/MacroDefinitionsNodeBuilder.cs: Moved the extensible
-	  tree view to its own directory.
-
-2008-08-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CBinding.addin.xml, ProjectPad/ProjectResourcesExtension.cs,
-	  CBinding.mdp, Makefile.am: Remove the "resources folder" feature.
-	  Resources are now shown in the solution tree like any other files.
-	  For a detailed explanation see "Bug 381430 - [PATCH] Display
-	  resource files in main project tree".
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* CLanguageBinding.cs, CppLanguageBinding.cs: Translated old code to
-	  new dom.
-
-2008-07-21  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-
-	* Project/ProjectPackageCollection.cs: Cleanup. Fixes bug #390419.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* md1format.xml, Project/CProject.cs, Project/CProjectConfiguration.cs,
-	  Project/Package.cs: Moved serialization engine to MonoDevelop.Core.
-	  Use new syntax for specifying attribute scope.
-
-2008-06-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/CProject.cs: Don't set the build action for files when
-	  loading a project. Fixes bug #402336.
-
-2008-06-22  Mitchell Wheeler <mitchell.wheeler@gmail.com>
-
-	* Compiler/GNUCompiler.cs: Fix bug#379620.
-
-2008-06-22  Andrés G. Aragoneses <aaragoneses@novell.com> 
-
-	* Gui/EditPackagesDialog.cs: Change the way of distinguishing tabs not
-	  to rely on strings that may be translated.
-	* gtk-gui/CBinding.EditPackagesDialog.cs, gtk-gui/gui.stetic: Use
-	  custom label names.
-
-2008-06-21  Mitchell Wheeler <mitchell.wheeler@gmail.com>
-
-	* Gui/EditPackagesDialog.cs: Re-check if there is a selected
-	  package before setting the package details button to sensitive
-	  on tab/page change.
-	  Fixes new steps to reproduce the bug 398789.
-
-2008-06-10  Marcos David Marín Amador <marcosmarin@gmail.com>
-
-	* Gui/EditPackagesDialog.cs: Check if there is a selected package
-	  before setting the package details button to sensitive.
-	  Fixes bug 398789.
-
-2008-06-04  Marcos David Marín Amador <marcosmarin@gmail.com>
-
-	* Gui/GeneralOptionsPanel.cs, Parser/TagDatabaseManager.cs: Don't
-	  parse local valriables by default.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/CProject.cs: The configuration parameter of GetDeployFiles is
-	  a solution configuration, so it needs to get the mapped project
-	  configuration name. Track some api changes.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml: Bump MD version.
-
-2008-05-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/CProject.cs: Properly set debug mode when creating a project.
-
-2008-05-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CodeGenerationPanel.cs, md1format.xml, CBinding.addin.xml,
-	  CBinding.mdp, Project/CProjectConfiguration.cs,
-	  Project/CCompilationParameters.cs, Project/CProject.cs,
-	  Makefile.am, Compiler/GNUCompiler.cs: Removed
-	  CCompilationParameters because it is not really needed like in the
-	  .net case. Also changed the name used to serialize some properties,
-	  to better match the msbuild model. Added a serialization map
-	  (md1format.xml) for backwards compatibility with the old mdp
-	  format.
-
-2008-05-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/CProject.cs: BaseDirectory can't be used until the project
-	  has been saved. Fixes bug 393945 - Can not create new C Binding
-	  project.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml: Merged the extension points for project and
-	  solution option panels into a single extension point. A single
-	  extension point will now be used for all kinds of items. Extension
-	  conditions can be used to make panels visible only for some
-	  specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml: Show build options in the build section.
-	* Project/CProjectConfiguration.cs: Fix nullref. Fixes bug #393422.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/CProjectServiceExtension.cs, Project/CProject.cs,
-	  Compiler/CCompiler.cs, Compiler/ICompiler.cs,
-	  Compiler/GNUCompiler.cs: Replaced
-	  ICompilerResult/DefaultCompilerResult/CompilerResults by a new
-	  BuildResult class, which has owner information at error level, so
-	  it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/OutputOptionsPanel.cs, Gui/EditPackagesDialog.cs,
-	  Gui/CodeGenerationPanel.cs, Gui/CompilerPanel.cs,
-	  CBinding.addin.xml, ProjectPad/ProjectPackagesFolderNodeBuilder.cs,
-	  ProjectPad/ProjectPackageNodeBuilder.cs, CBinding.mdp,
-	  Parser/TagDatabaseManager.cs,
-	  Navigation/ProjectNodeBuilderExtension.cs,
-	  Project/CProjectConfiguration.cs, Project/CProjectBinding.cs,
-	  Project/CProjectServiceExtension.cs, Project/CProject.cs,
-	  gtk-gui/gui.stetic, Compiler/GNUCompiler.cs: New project model
-	  changes.
-
-2008-05-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CBinding.addin.xml: Set "isText" attribute on the mimetype
-	  definitions.
-
-2008-04-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CTextEditorExtension.cs: Track API change.
-
-2008-04-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Parser/TagDatabaseManager.cs: Fixed bug that prevented system tags from
-	  being written and parsed.
-
-2008-04-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs, gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/gui.stetic: Made details button unsensitive until a package is
-	  selected.
-
-2008-04-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs, CBinding.addin.xml,
-	  ProjectPad/ProjectPackageNodeBuilder.cs, Project/CProject.cs: Added a
-	  command to the Package context menu to see the details on the package
-	  and fixed a bug where packages could not be added to a project.
-
-2008-04-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* CBinding.addin.xml: Commented out a wrong extension point. Will find the
-	  correct one later.
-
-2008-04-12  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/PackageDetails.cs, Gui/EditPackagesDialog.cs, CBinding.addin.xml,
-	  ProjectPad/ProjectPackagesFolderNodeBuilder.cs,
-	  ProjectPad/ProjectPackageNodeBuilder.cs, CBinding.mdp,
-	  Project/Package.cs, Project/ProjectPackageCollection.cs,
-	  Project/ProjectPackageEventArgs.cs, Project/ProjectPackage.cs,
-	  Project/CProject.cs, gtk-gui/CBinding.PackageDetails.cs,
-	  gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs, gtk-gui/gui.stetic,
-	  Makefile.am, Compiler/CCompiler.cs: Changed the class ProjectPackage to
-	  just Package and created a package details dialog that can be seen from
-	  the EditPackagesDialog.
-
-2008-04-12  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs, gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/gui.stetic: Fixed bug 369688 - Find as you type doesn't work in
-	  the dialog where you select the project references.
-
-2008-04-12  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs: Alphabetically sort the list of packages and
-	  did some formatting.
-
-2008-04-11  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* CBinding.addin.xml, Gui/CTextEditorExtension.cs,
-	  Project/CProject.cs: Enable source/header swapping with a keybinding
-	  and menu items
-
-2008-04-10  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs: Fixed bug 368755: "MD should not guess if a
-	  reference is managed or unmanaged relying on cflags"
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml: Use the new mime type extension to register new
-	  file types.
-
-2008-04-03  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/TagDatabaseManager.cs: Fixed mismatched single-quote.
-
-2008-03-29  Marcos David Marín Amador <MarcosMarin@gmail.com>
-
-	* Parser/Function.cs: No longer attempt to find prototypes.
-	* Parser/TagDatabaseManager.cs: No longer generate prototype tags.
-	* Gui/GeneralOptionsPanel.cs: changed completion for local variables
-	  and memeber to on by default.
-
-2008-03-29  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/*: Add best-guess completion for members and 
-	(optionally, default off) local variables.
-
-2008-03-21  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Instead of having the Include and Lib Paths
-	  marked as ProjectPathItemProperty now mark them as regular
-	  ItemProperties and instead added functionality to insert and parse
-	  macros like ${ProjectDir} and ${CombineDir} in the Include and Lib
-	  Paths.
-
-2008-03-19  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Parser/TagDatabaseManager.cs: Search project include paths 
-	for relatively-pathed includes.
-
-2008-03-18  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CTextEditorExtension.cs: Only smart-indent when smart-indenting
-	  is enabled. Respect tabs/spaces setting.
-
-2008-03-16  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/OutputOptionsPanel.cs: Fix bug where the pauseCheckbox control could
-	  be greyed out when it should be souldn't.
-
-2008-03-14  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Insert into front of list instead of at the end,
-	  fixes bug 368478: "Multi-line build errors are displayed out of order ".
-
-2008-03-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/GeneralOptionsPanel.cs, CBinding.addin.xml: Use new options
-	  dialog infrastructure.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/LanguageItem.cs, Project/CProject.cs, Compiler/CCompiler.cs: Worked
-	  on gnome hig compliant alerts.
-
-2008-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ProjectPad/ProjectPackageNodeBuilder.cs: Handle the delete key in
-	  TreeViewPad, so it will work event if the shortcut is not defined.
-
-2008-02-19  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Handle better CleanPrecompiledHeaders, fixes bug
-	  361045.
-
-2008-02-14  Geoff Norton  <gnorton@novell.com>
-
-	* Parser/TagDatabaseManager.cs: Disable the ctag implementation on OSX 
-	as the ctags that apple ships is entirely incompatible with this parser.
-
-2008-02-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Make sure directory exists before attempting to
-	  delete it.
-
-2008-02-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Use string.Join instead of custom method.
-
-2008-02-09  Mike Krüger <mkrueger@novell.com> 
-
-	* CBinding.addin.xml, CBinding.mdp, Makefile.am: Removed source editor
-	  dependency.
-
-2008-02-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/TagDatabaseManager.cs: Improve error handling. Should fix "Bug
-	  359567 - MonoDevelop crashes when creating/opening C++ Console Project".
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml: Update MD version.
-
-2008-01-22  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Removed useless code.
-
-2008-01-18  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Parser/TagDatabaseManager.cs: Cache tags into a hash table and see if they
-	  had been previously cached before looking for them again.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/StaticLibraryCProject.xpt.xml,
-	  templates/StaticLibraryCppProject.xpt.xml,
-	  templates/EmptyCProject.xpt.xml, templates/EmptyCSourceFile.xft.xml,
-	  templates/EmptyCppProject.xpt.xml, templates/EmptyCppSourceFile.xft.xml,
-	  templates/ConsoleCProject.xpt.xml, templates/ConsoleCppProject.xpt.xml,
-	  templates/EmptyCHeaderFile.xft.xml,
-	  templates/EmptyCppHeaderFile.xft.xml,
-	  templates/SharedLibraryCProject.xpt.xml,
-	  templates/SharedLibraryCppProject.xpt.xml: Make template categories
-	  translatable.
-
-2008-01-12  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Parser/TagDatabaseManager.cs: Only lock the parsingJobs queue object.
-
-2008-01-11  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Parser/TagDatabaseManager.cs: When searching for a tag instead of doing a
-	  linear search do a binary search (ctags output sorted tag files).
-	  Greatly improves parsing speed. Also removed some unused methods.
-
-2008-01-08  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs: Make sure packages are not repeated if the
-	  system has more than one copy of the same package in different
-	  directories.
-	* Parser/TagDatabaseManager.cs: Changed the name of a propery.
-
-2008-01-07  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProject.cs: Deploy resources in the correct way.
-
-2008-01-04  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/TagDatabaseManager.cs: Only try to parse tags if ctags and gcc are
-	  installed.
-
-2007-12-31  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Report errors in the same order as they were
-	  outputted by the compiler and parse linker output to form better linker
-	  error reports.
-
-2007-12-31  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProject.cs: Copy deployment files to output directory when
-	  building the project.
-
-2007-12-28  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/GeneralOptionsPanel.cs, CBinding.addin.xml,
-	  Parser/TagDatabaseManager.cs, CBinding.mdp, Project/CProject.cs,
-	  gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs, gtk-gui/objects.xml,
-	  gtk-gui/CBinding.GeneralOptionsPanel.cs, gtk-gui/gui.stetic,
-	  Makefile.am: Added a general configuration panel for CBinding where you
-	  can choose the default compiler for new C and C++ projects as well as
-	  set if you want to parse system tags or not.
-	* Compiler/GppCompiler.cs, Compiler/GccCompiler.cs: Changed compiler names.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.mdp: Updated project files. The order of extended properties
-	  won't change anymore.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.mdp, Makefile.am: Add missing reference.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml, CBinding.mdp, CBinding.mds,
-	  CBinding.Autotools/CBinding.Autotools.mdp, Makefile.am: Directory
-	  reorganization.
-
-2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.mdp, gtk-gui/gui.stetic: Updated paths.
-
-2007-11-23  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Should fix bug #343098
-	
-	  gcc/g++ failed if path had white spaces.
-
-2007-11-17  Christian Hergert <christian.hergert@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs: Check if string is null or empty before using
-	  it to prevent crash.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/TagDatabaseManager.cs: Track LoggingService API changes.
-
-2007-11-06  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/ProjectNodeBuilderExtension.cs: Moved all the threading for the
-	  parsing of source files to the TagDatabaseManager, parsing jobs are
-	  placed on a queue and dispatched by a single thread. Fixes bug 336368.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml: Bump MD version.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml: Track changes in the Icon extension node.
-
-2007-10-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Compiler/GNUCompiler.cs: Handle cancellation of build.
-
-2007-10-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/EditPackagesDialog.cs: Normalise pkg-config paths so that comparison
-	  to avoid duplication works correctly. Add lib64 to default paths.
-	* Project/CProjectConfiguration.cs: Add configuration option to disable
-	  precompilation of headers.
-	* Project/CProjectServiceExtension.cs: Pass cleanup to ICompiler.Clean.
-	* Compiler/CCompiler.cs, Compiler/ICompiler.cs: Add Clean method and
-	  SupportsPrecompiledHeaders property.
-	* Compiler/GNUCompiler.cs: Reworked process launching so that it handles
-	  output as it's generated. (fixes "Bug 336363 - [CBinding, possibly all
-	  MD] MD hangs when a compile output is long"). Headers are now
-	  precompiled if they're set to "compile", and precompilation errors are
-	  reported. Clean precompiled headers when appropriate. Pass package flags
-	  to header precompilation. Report build phases to monitor, also using
-	  gettext.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* icons/text-x-c++src.32x32.png, templates/EmptyCHeaderFile.xft.xml,
-	  templates/EmptyCppHeaderFile.xft.xml,
-	  templates/EmptyCppSourceFile.xft.xml,
-	  templates/EmptyCSourceFile.xft.xml: Use tango file icons. Removed
-	  obsolete icons.
-
-2007-10-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.mdp, templates/StaticLibraryCProject.xpt.xml,
-	  templates/StaticLibraryCppProject.xpt.xml,
-	  templates/EmptyCProject.xpt.xml, templates/EmptyCppProject.xpt.xml,
-	  templates/ConsoleCProject.xpt.xml, templates/ConsoleCppProject.xpt.xml,
-	  templates/SharedLibraryCProject.xpt.xml,
-	  templates/SharedLibraryCppProject.xpt.xml, Makefile.am,
-	  icons/C.Project.ConsoleProject, icons/C.Project.SharedLibrary,
-	  icons/Cpp.Project.Empty, icons/C.Project.Empty,
-	  icons/C.Project.StaticLibrary, icons/c-icon-32.png,
-	  icons/cpp-icon-32.png: Updated project icons. Use the base project icon
-	  with an overlay to show the type.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.mdp, CBinding.mds, CBinding.Autotools/CBinding.Autotools.mdp:
-	  Project file names updated by change in MD path functions.
-
-2007-10-20  Chris Howie <bzximian.3.crazycomputers@neverbox.com> 
-
-	* Project/CProject.cs: Don't assume LD_LIBRARY_PATH is set.
-
-2007-10-12  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/ProjectNodeBuilderExtension.cs: If exuberant-ctags is not
-	  installed, instead of showing an error message dialog, put an error
-	  message in the class pad in the project node.
-
-2007-10-05  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/CodeGenerationPanel.cs, Project/CCompilationParameters.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs, gtk-gui/gui.stetic,
-	  Compiler/GNUCompiler.cs: Added "Treat warnings as errors" option to code
-	  generation panel and implemented it for gcc and g++.
-	* Parser/TagDatabaseManager.cs: Suppressed unused variable warning and added
-	  checks for faulty ctags tags.
-
-2007-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CBinding.mdp, gtk-gui/gui.stetic: Target GTK# 2.8.
-	* Project/CProject.cs: Track execution API changes.
-
-2007-09-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.mdp: Don't local copy references.
-
-2007-09-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/TagDatabaseManager.cs: Don't crash if the compiler can't be found.
-	* Compiler/GNUCompiler.cs: Check for the compiler before trying to compile.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CBinding.addin.xml: Bump MD version.
-
-2007-09-17  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> 
-
-	* Parser/Function.cs, Parser/TagDatabaseManager.cs,
-	  Navigation/ProjectNodeBuilderExtension.cs: Make sure ctags process exits
-	  and fixed several null pointer exceptions.
-
-2007-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs, gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/CBinding.AddPathDialog.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs,
-	  gtk-gui/CBinding.CompilerPanel.cs,
-	  gtk-gui/CBinding.OutputOptionsPanel.cs,
-	  gtk-gui/CBinding.AddLibraryDialog.cs: Updated.
-
-2007-09-14  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* CBinding.mdp: Set path to configure.in in Makefile integration.
-
-2007-09-14  Martin Dederer <martindederer@gmx.de>
-
-	* Compiler/GNUCompiler.cs: Added method to expand backticked portions
-	in compiler-/ linker-arguments
-
-2007-09-07  Marcos David Marín Amador <MarcosMarin@gmail.com>
-
-	* CBinding.Autotools: Set svn:ignore property on
-	  CBinding.Autotools.pidb
-
-2007-09-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CTextEditorExtension.cs: Track api changes.
-	* CBinding.mdp: Use gtk# 2.8.
-
-2007-09-07   <> 
-
-	* Makefile.am: Check ENABLE_C to find out if assembly should be compiled or
-	  not.
-
-2007-09-05  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/ProjectNodeBuilderExtension.cs: Update ClassPad when the
-	  project starts without having to save a file.
-
-2007-09-04  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/CodeGenerationPanel.cs, Compiler/GNUCompiler.cs: Change newlines into
-	  spaces from ExtraCompiler/LinkerArgs right before compilation so the
-	  newline and spaces are conserved when serializing the project.
-
-2007-09-03  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* Gui/OutputOptionsPanel.cs, Gui/CodeGenerationPanel.cs,
-	  Gui/CompilerPanel.cs, Parser/TagDatabaseManager.cs: Adapt to new api
-	  changes.
-
-2007-09-01  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/CompilerPanel.cs, Project/CProject.cs: Allow changing the project's
-	  language from C to C++ and vice versa by changing the compiler in the
-	  compiler panel.
-
-2007-09-01  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Fixed ccache implementation, though I'm still not
-	  sure if ccache should be used in the linking stage (Its currently not
-	  used, and I think thats correct).
-
-2007-08-31  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs, gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/gui.stetic: Ignore case when searching for a pkg-pcackages
-	  version.
-	* Compiler/CCompiler.cs, Compiler/GNUCompiler.cs: No longer call bash.
-
-2007-08-30  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* gtk-gui/CBinding.CodeGenerationPanel.cs, gtk-gui/gui.stetic: Still more
-	  CodeGenerationPanel UI improving. I think it is now good enough for now.
-
-2007-08-29  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* gtk-gui/CBinding.CodeGenerationPanel.cs, gtk-gui/gui.stetic: Improved UI,
-	  could still use more improvement.
-
-2007-08-28  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProjectConfiguration.cs: rewrote naming convetion handling.
-
-2007-08-20  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/CompilerPanel.cs, Project/CProjectConfiguration.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs,
-	  gtk-gui/CBinding.CompilerPanel.cs, gtk-gui/gui.stetic,
-	  Compiler/CCompiler.cs, Compiler/ICompiler.cs, Compiler/GNUCompiler.cs:
-	  Added support for ccache.
-
-2007-08-19  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* templates/EmptyCSourceFile.xft.xml, templates/EmptyCppSourceFile.xft.xml,
-	  templates/EmptyCHeaderFile.xft.xml,
-	  templates/EmptyCppHeaderFile.xft.xml: Fixed some default values.
-	* Project/CProject.cs: Fixed a bug where the deploy state of files was not
-	  persistent.
-
-2007-08-18  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Project/ProjectPackageCollection.cs: Added a ToStringArray method to
-	  easily get an array of the names of the packages the collection
-	  contains.
-	* Project/CProject.cs: Fixed up the deployment pkg-config package and
-	  improved deployment.
-	* Compiler/CCompiler.cs, Compiler/ICompiler.cs, Compiler/GNUCompiler.cs:
-	  Added a GenerateDefineFlags method which is used to write the deployed
-	  pkg-config package.
-
-2007-08-17  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProject.cs: Fixed a null pointer exception and changed library
-	  deployments to ProgramFilesRoot.
-
-2007-08-17  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProject.cs: Enhanced deployment.
-
-2007-08-16  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* CLanguageBinding.cs: Made C specific.
-	* CppLanguageBinding.cs: Needed so that templates can have C++ files.
-	* CBinding.addin.xml: Bumped version to 0.15.0
-	
-	  Seperated file filter for C and C++.
-	
-	  Added project templates for Shared Library, Static Library and Console
-	  Project for both C and C++.
-	
-	  Added a seperate language binding for C and one for C++ (this was
-	  necessary to have project templates that include C++ files).
-	* CBinding.mdp, templates/StaticLibraryCProject.xpt.xml,
-	  templates/StaticLibraryCppProject.xpt.xml,
-	  templates/ConsoleCProject.xpt.xml, templates/ConsoleCppProject.xpt.xml,
-	  templates/SharedLibraryCProject.xpt.xml,
-	  templates/SharedLibraryCppProject.xpt.xml, Makefile.am,
-	  icons/C.Project.ConsoleProject, icons/C.Project.SharedLibrary,
-	  icons/C.Project.StaticLibrary: New templates for Shared Library, Static
-	  Library and Console Project for C and C++.
-	* README: Added icon licence information.
-
-2007-08-15  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* CBinding.addin.xml, CBinding.mdp, Project/CProject.cs, Makefile.am:
-	  Implemented IDeployable.
-
-2007-08-15  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProject.cs: Write all directories with header files to the
-	  project's pkg-config package.
-
-2007-08-14  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* gtk-gui/CBinding.OutputOptionsPanel.cs, gtk-gui/gui.stetic: Make output
-	  entry editable.
-
-2007-08-14  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProjectServiceExtension.cs: Update the project's pkg package
-	  every time it is compiled.
-
-2007-08-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs, ProjectPad/ProjectPackagesFolderNodeBuilder.cs,
-	  Project/CProjectConfiguration.cs, Project/CProject.cs: Allow CProjects
-	  to depend on other CProjects that compile into a shared object as well
-	  as static libraries.
-
-2007-08-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/DataProvider.cs, CBinding.addin.xml, Navigation/UnionNodeBuilder.cs:
-	  Added the  union icons to the stock icons so I don't have to create my
-	  own pixbuf in the union node builder and now I can use the proper union
-	  icon in the completion widget.
-
-2007-08-12  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Parser/TagDatabaseManager.cs: Parse functions from it's prototype if
-	  possible instead of waiting for the implementation, if it is an inline
-	  function parse it with that.
-
-2007-08-12  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* CBinding.addin.xml, ProjectPad/ProjectResourcesExtension.cs, Makefile.am:
-	  Hide the resources node in the project pad for CProjects.
-
-2007-08-12  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* CBinding.addin.xml: Added the paste command to the packages folder node's
-	  context menu and the copy command to the package node's context menu.
-
-2007-08-11  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProjectConfiguration.cs: Make paths relative to project folder.
-
-2007-08-09  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/DataProvider.cs, Parser/Function.cs: Support for constant methods.
-	* CBinding.addin.xml: Fixed addin-breaker-typo-from-hell.
-
-2007-08-09  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* CBinding.addin.xml, CBinding.mdp: Some corrections.
-
-2007-08-09  Marcos David Marín Amador <MarcosMarin@gmail.com>
-
-	* CBinding.addin.xml, CBinding.mdp, Makefile.am: Updated the paths and
-	  embedded the .addin.xml into the assembly
-
-2007-08-08  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/CTextEditorExtension.cs, Gui/DataProvider.cs,
-	  Parser/ProjectInformation.cs, Parser/Function.cs,
-	  Parser/TagDatabaseManager.cs: Parse and complete for included system
-	  files too.
-
-2007-08-07  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/OutputOptionsPanel.cs, Gui/AddLibraryDialog.cs,
-	  Gui/EditPackagesDialog.cs, Gui/AddPathDialog.cs,
-	  Gui/CodeGenerationPanel.cs, gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/CBinding.AddPathDialog.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs,
-	  gtk-gui/CBinding.OutputOptionsPanel.cs,
-	  gtk-gui/CBinding.AddLibraryDialog.cs, gtk-gui/gui.stetic: Updated
-	  widgets.
-
-2007-08-07  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* CBinding.addin.xml, gtk-gui/CBinding.CodeGenerationPanel.cs: Removed
-	  autotools support since it is currently very .NET specific.
-
-2007-08-06  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* CBinding.addin.xml, CBinding.mdp, CBinding.mds,
-	  CBinding.Autotools/AssemblyInfo.cs,
-	  CBinding.Autotools/CAutotoolsSetup.cs,
-	  CBinding.Autotools/CBinding.Autotools.mdp, Compiler/CCompiler.cs,
-	  Compiler/ICompiler.cs, Compiler/GNUCompiler.cs: Started work on
-	  supporting makefile generation.
-
-2007-08-06  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/DataProvider.cs: Use correct icons.
-
-2007-08-06  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/ProjectNodeBuilderExtension.cs,
-	  ProjectPad/ProjectPackagesFolderNodeBuilder.cs: Adjusted to new API
-	  changes.
-
-2007-08-03  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/CTextEditorExtension.cs: Added support for '::' completion.
-	* Gui/DataProvider.cs: Changed the completion icon of a typedef to match the
-	  icon used in the class pad.
-	* Makefile.am, CBinding.addin.xml, CBinding.mdp,
-	  templates/EmptyCSourceFile.xft.xml,
-	  templates/EmptyCppSourceFile.xft.xml,
-	  templates/EmptyCHeaderFile.xft.xml,
-	  templates/EmptyCppHeaderFile.xft.xml: Added file templates and changed
-	  icons.
-	* Parser/ProjectInformation.cs: Added some helper methods.
-	* Parser/Function.cs: Overrided the Equals and GetHasCode methods so that it
-	  uses the function's parameters too.
-
-2007-07-26  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/ProjectNodeBuilderExtension.cs,
-	  Gui/CTextEditorExtension.cs, Project/CProject.cs,
-	  Parser/Enumerator.cs, Parser/Function.cs, Parser/Enumeration.cs,
-	  Parser/Union.cs, Parser/TagDatabaseManager.cs, Parser/Namespace.cs,
-	  Parser/Typedef.cs, Parser/Structure.cs, Parser/LanguageItem.cs,
-	  Parser/Class.cs, Parser/Member.cs: Now a file's tags are updated
-	  when the file is saved. Also, instead of writing the tags to a file
-	  I now write them to stdout and parse them from there since I now
-	  parse per file instead of the entire project.
-
-2007-07-25  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/ProjectNodeBuilderExtension.cs,
-	  Parser/TagDatabaseManager.cs: It is now possible to update tags for
-	  only one source file instead of the entire project (though it's
-	  curently not in use anywhere).
-	
-	  When it does this it creates a tags file for the source file and
-	  the included non system headers and parses that file.
-	
-	  I'm not sure where this code should be called.
-	* Navigation/LanguageItemEventArgs.cs, Navigation/ClassPadEventArgs.cs:
-	  Made these subclass EventArgs.
-	* Gui/CTextEditorExtension.cs, Gui/DataProvider.cs: Implemented simple
-	  code completion by pressing ctrl+space.
-
-2007-07-24  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/DataProvider.cs: Make the name of the method bold.
-
-2007-07-22  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Enumerator.cs, Navigation/Function.cs,
-	  Navigation/Variable.cs, Navigation/Enumeration.cs,
-	  Navigation/Union.cs, Navigation/Namespace.cs,
-	  Navigation/Typedef.cs, Navigation/Structure.cs,
-	  Navigation/Macro.cs, Navigation/LanguageItem.cs,
-	  Navigation/Class.cs, Navigation/Member.cs: Moved to
-	  CBinding.Parser.
-	* Gui/CTextEditorExtension.cs, Gui/DataProvider.cs, Parser/Tag.cs,
-	  Parser/TagDatabaseManager.cs, CBinding.mdp: Implemented simple
-	  parameters completion.
-
-2007-07-19  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Send -fPIC to the compiler if the compile
-	  target is a shared library (Is this really needed?).
-
-2007-07-19  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Fixed a bug in dependency tracking.
-
-2007-07-18  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs, Project/ProjectPackageCollection.cs,
-	  Project/CProject.cs, gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/gui.stetic, CBinding.addin.xml,
-	  ProjectPad/ProjectPackagesFolderNodeBuilder.cs: Fixed several bugs.
-	* Makefile.am, ProjectPad/ProjectPackageNodeBuilder.cs,
-	  icons/Icons.16x16.ProjectReference, CBinding.mdp: Project packages
-	  have a different icon.
-
-2007-07-17  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs, gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/gui.stetic: Got the edit packages dialog to work with
-	  adding packages from projects in the combine (though it's a bit
-	  buggy)
-
-2007-07-15  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs, Project/ProjectPackage.cs,
-	  Project/CProjectServiceExtension.cs, Project/CProject.cs,
-	  Compiler/CCompiler.cs,
-	  ProjectPad/ProjectPackagesFolderNodeBuilder.cs,
-	  ProjectPad/ProjectPackageNodeBuilder.cs: Projects can now depend on
-	  other projects in the solution (currently only projects that
-	  compile into a static library).
-
-2007-07-14  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Implemented dependency tracking. Dependency
-	  tracking is treated as a side effect of compiling.
-
-2007-07-14  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/CTextEditorExtension.cs, CBinding.addin.xml, CBinding.mdp,
-	  Makefile.am: Implemented a better formatting strategy (using a text
-	  editor extension). 
-
-2007-07-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Gui/CTextEditorExtension.cs, CBinding.addin.xml, CBinding.mdp,
-	  CFormattingStrategy.cs, Makefile.am: Implemented a very simple
-	  FormattingStrategy.
-	* Project/CProject.cs: Changed the project type from 'C/C++' to
-	  'Native'.
-
-2007-07-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/StructureNodeBuilder.cs,
-	  Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/MemberNodeBuilder.cs, Navigation/Function.cs,
-	  Navigation/Enumeration.cs, Navigation/GlobalsNodeBuilder.cs,
-	  Navigation/VariableNodeBuilder.cs,
-	  Navigation/EnumerationNodeBuilder.cs, Navigation/Member.cs,
-	  Navigation/MacroDefinitionsNodeBuilder.cs,
-	  Navigation/Enumerator.cs, Navigation/ClassNodeBuilder.cs,
-	  Navigation/Variable.cs, Navigation/Union.cs,
-	  Navigation/Namespace.cs, Navigation/Typedef.cs,
-	  Navigation/Structure.cs, Navigation/Macro.cs,
-	  Navigation/LanguageItem.cs, Navigation/FunctionNodeBuilder.cs,
-	  Navigation/UnionNodeBuilder.cs, Navigation/Class.cs,
-	  Navigation/NamespaceNodeBuilder.cs, Makefile.am, CBinding.mdp,
-	  Parser/TagDatabaseManager.cs, Parser/Tag.cs,
-	  Parser/ProjectInformation.cs, Parser/ProjectInformationManager.cs:
-	  Seperated the navigation stuff from the parsing stuff.
-
-2007-07-13  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* ProjectPad/ProjectPackageNodeBuilder.cs: Implemented dragging and
-	  dropping of packages.
-
-2007-07-12  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProjectConfiguration.cs: Fixed a bug which was causing the
-	  app to go into an infinite loop.
-
-2007-07-12  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProjectServiceExtension.cs: Removed the need to invoke bash
-	  when removing object code files.
-	* Compiler/GNUCompiler.cs: Small fixes.
-
-2007-07-12  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProjectConfiguration.cs, Project/CProject.cs,
-	  Compiler/GNUCompiler.cs: Inplemented support for precompiled header
-	  files in gcc and g++.
-	* CBinding.addin.xml: Fixed something I had broken.
-
-2007-07-10  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/ClassPadEventArgs.cs, Project/CProject.cs, Makefile.am,
-	  CBinding.addin.xml, icons/update,
-	  ProjectPad/ProjectPackagesFolderNodeBuilder.cs, CBinding.mdp: The
-	  class pad tree is now built in a seperate thread so it does not
-	  block the UI while it is being built.
-
-2007-07-07  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/GlobalsNodeBuilder.cs: Fixes class pad bug when there are
-	  multiple C projects open.
-
-2007-07-06  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/StructureNodeBuilder.cs, Navigation/ClassNodeBuilder.cs:
-	  The "Show Public Api Only" class pad option is now considered.
-
-2007-07-06  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/TagDatabaseManager.cs, Navigation/GlobalsNodeBuilder.cs:
-	  Undid the work I had started on getting the tree built in the
-	  background because I have to think more about how I'm going to
-	  implement that.
-
-2007-07-05  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/LanguageItemEventArgs.cs,
-	  Navigation/TagDatabaseManager.cs,
-	  Navigation/ProjectNavigationInformation.cs,
-	  Navigation/GlobalsNodeBuilder.cs,
-	  Navigation/LanguageItemCommandHandler.cs,
-	  Project/ProjectPackageEventArgs.cs, Makefile.am, CBinding.mdp:
-	  Started work on making the class pad tree get created in the
-	  background in a seperate thread.
-
-2007-07-03  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/TypedefNodeBuilder.cs, Navigation/StructureNodeBuilder.cs,
-	  Navigation/Function.cs, Navigation/Enumeration.cs,
-	  Navigation/TagDatabaseManager.cs,
-	  Navigation/ProjectNavigationInformation.cs,
-	  Navigation/GlobalsNodeBuilder.cs, Navigation/Member.cs,
-	  Navigation/Tag.cs, Navigation/ClassNodeBuilder.cs,
-	  Navigation/Union.cs, Navigation/Structure.cs,
-	  Navigation/Typedef.cs, Navigation/FunctionNodeBuilder.cs,
-	  Navigation/LanguageItem.cs, Navigation/Class.cs,
-	  Navigation/UnionNodeBuilder.cs, Navigation/NamespaceNodeBuilder.cs,
-	  gtk-gui/gui.stetic, Makefile.am, CBinding.addin.xml,
-	  icons/Icons.16x16.ProtectedUnion, icons/Icons.16x16.PrivateUnion,
-	  icons/Icons.16x16.Union, CBinding.mdp: Added support for typedefs
-	  and unions in the class pad.
-
-2007-07-02  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs, Navigation/StructureNodeBuilder.cs,
-	  Navigation/Enumerator.cs, Navigation/ClassNodeBuilder.cs,
-	  Navigation/Enumeration.cs, Navigation/TagDatabaseManager.cs,
-	  Navigation/ProjectNavigationInformation.cs,
-	  Navigation/EnumeratorNodeBuilder.cs,
-	  Navigation/GlobalsNodeBuilder.cs, Navigation/LanguageItem.cs,
-	  Navigation/EnumerationNodeBuilder.cs,
-	  Navigation/NamespaceNodeBuilder.cs, Makefile.am,
-	  CBinding.addin.xml, CBinding.mdp: Added support for enumerations
-	  and their respective enumerators in the class pad.
-	* Navigation/LanguageItemCommandHandler.cs: Small change which fixes a
-	  bug when double clicking a macro definition.
-
-2007-07-02  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* CBinding.addin.xml: Fixed a typo.
-
-2007-07-02  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs, Navigation/MacroNodeBuilder.cs,
-	  Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/TagDatabaseManager.cs,
-	  Navigation/ProjectNavigationInformation.cs,
-	  Navigation/GlobalsNodeBuilder.cs, Navigation/Macro.cs,
-	  Navigation/MacroDefinitionsNodeBuilder.cs, Makefile.am,
-	  CBinding.addin.xml, CBinding.mdp: Added support for macro
-	  definitions to appear in the class pad. They will appear in a
-	  special node called "Macro Definitions".
-
-2007-07-02  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs, Navigation/Variable.cs,
-	  Navigation/TagDatabaseManager.cs,
-	  Navigation/ProjectNavigationInformation.cs,
-	  Navigation/GlobalsNodeBuilder.cs,
-	  Navigation/VariableNodeBuilder.cs, Makefile.am, CBinding.addin.xml,
-	  CBinding.mdp: Added support for global variables to be added to the
-	  class pad. Also fixed options sent to ctags so macro difinitions
-	  can now be easily handled.
-
-2007-07-01  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs, Navigation/StructureNodeBuilder.cs,
-	  Navigation/ClassNodeBuilder.cs, Navigation/MemberNodeBuilder.cs,
-	  Navigation/TagDatabaseManager.cs,
-	  Navigation/ProjectNavigationInformation.cs, Navigation/Member.cs,
-	  Makefile.am, CBinding.addin.xml, CBinding.mdp: Added support for
-	  members.
-	* Navigation/Function.cs, Navigation/Namespace.cs, Navigation/Class.cs:
-	  Removed some unused usings.
-
-2007-07-01  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs, Navigation/Function.cs,
-	  Navigation/TagDatabaseManager.cs, Navigation/LanguageItem.cs:
-	  Separated the parse structure from the parser.
-
-2007-07-01  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs, Navigation/LanguageItem.cs: Optimized memory usage
-	  by parsing fields as the tags a read in.
-
-2007-06-30  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/StructureNodeBuilder.cs,
-	  Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/ClassNodeBuilder.cs, Navigation/Function.cs,
-	  Navigation/TagDatabaseManager.cs,
-	  Navigation/ProjectNavigationInformation.cs,
-	  Navigation/Namespace.cs, Navigation/LanguageItemCommandHandler.cs,
-	  Navigation/Structure.cs, Navigation/GlobalsNodeBuilder.cs,
-	  Navigation/LanguageItem.cs, Navigation/FunctionNodeBuilder.cs,
-	  Navigation/Class.cs, Navigation/NamespaceNodeBuilder.cs,
-	  Makefile.am, CBinding.addin.xml, CBinding.mdp: Added structures to
-	  the class pad and refactored the code a bit more.
-
-2007-06-29  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs, Navigation/TagDatabaseManager.cs,
-	  Navigation/Namespace.cs,
-	  Navigation/ProjectNavigationInformation.cs,
-	  Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/GlobalsNodeBuilder.cs, Navigation/ClassNodeBuilder.cs,
-	  Navigation/LanguageItem.cs, Navigation/Function.cs,
-	  Navigation/Class.cs, Navigation/NamespaceNodeBuilder.cs,
-	  gtk-gui/gui.stetic, Makefile.am, CBinding.addin.xml, CBinding.mdp:
-	  Added support for classes in the class pad and refactored the code
-	  a bit.
-
-2007-06-27  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs: Created a new enum for access modifiers.
-	* Navigation/TagDatabaseManager.cs: ctags now also creates tags for
-	  function prototypes. (needed to identify a function's namespace if
-	  any).
-	* Navigation/Namespace.cs: Changed the separator between parent/child
-	  namespaces in a namespace's FullName to :: from .
-	* Navigation/ProjectNavigationInformation.cs: Added functions field.
-	* Navigation/ProjectNodeBuilderExtension.cs: Added the special
-	  "Globals" node.
-	* Navigation/GlobalsNodeBuilder.cs, Navigation/FunctionNodeBuilder.cs,
-	  Navigation/Function.cs: Added support for functions in the Class
-	  Pad, global functions that are not in any namespace are placed in a
-	  special "Globals" node.
-	* Navigation/NamespaceNodeBuilder.cs: This namespace's global functions
-	  are now added.
-	* Makefile.am, ProjectPad/ProjectPackagesFolderNodeBuilder.cs,
-	  ProjectPad/ProjectPackageNodeBuilder.cs,
-	  ProjectPad/ProjectReferencesExtension.cs,
-	  ProjectPad/ProjectNodeExtension.cs, CBinding.mdp: Moved to folder
-	  and namespace ProjectPad
-	* CBinding.addin.xml: Added support for functions in the Class Pad,
-	  global functions are placed in a special "Globals" node.
-
-2007-06-26  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs, gtk-gui/gui.stetic:
-	  Improved spacing a bit.
-
-2007-06-26  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs: Fixed up a bit.
-	* Navigation/TagDatabaseManager.cs: The entire tag database for each
-	  project is managed here.
-	* Navigation/Namespace.cs, Navigation/ProjectNodeBuilderExtension.cs,
-	  Navigation/NamespaceNodeBuilder.cs, CBinding.addin.xml: Namespaces
-	  now appear in the Class Pad.
-	* Navigation/ProjectNavigationInformation.cs,
-	  Navigation/ProjectNavigationInformationManager.cs: Information on a
-	  project's navigation information is kept and managed here.
-	* Makefile.am, CBinding.mdp: Added new files.
-
-2007-06-25  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Navigation/Tag.cs, Navigation/Namespace.cs,
-	  Navigation/ProjectNodeBuilderExtension.cs, CBinding.addin.xml:
-	  Started work on code navigation.
-
-2007-06-25  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProjectServiceExtension.cs, Project/CProject.cs,
-	  Makefile.am, CBinding.addin.xml, CBinding.mdp, Completion.cs: Got
-	  rid of anything related to CTagsCompletion.
-
-2007-06-24  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProject.cs: Changed to accomodate the new CTagsCompletion
-	  design
-	* Completion.cs: This is where CBinding will specify more specialized
-	  behavior for the CTagsCompletion AddIn
-
-2007-06-22  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProject.cs: Made a very simple implementation of
-	  AddTagsToProvider which is the method where the logic about which
-	  tags shoud be added to the completion list window takes place.
-
-2007-06-21  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Gui/EditPackagesDialog.cs: Added a package icon to both packages
-	  columns.
-	* Project/CProjectBinding.cs, Project/CProject.cs: Implemented
-	  CreateSingleFileProject
-
-2007-06-20  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Gui/OutputOptionsPanel.cs, Project/CProject.cs,
-	  gtk-gui/CBinding.EditPackagesDialog.cs,
-	  gtk-gui/CBinding.CodeGenerationPanel.cs, Compiler/GNUCompiler.cs:
-	  Fixed a few bugs.
-
-2007-06-19  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProject.cs: Fixed bug where only projects that had a binary
-	  target got correctly cleaned.
-
-2007-06-19  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Gui/ProjectPackagesFolderNodeBuilder.cs: Changed the package
-	  added/removed handlers to just call UpdateAll from the builder.
-
-2007-06-19  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Gui/ProjectPackagesFolderNodeBuilder.cs: Changed the node builder so
-	  that it registeres even handlers correctly
-	* Project/ProjectPackageCollection.cs, Project/CProject.cs: Removed the
-	  SetProject method and replaced it with and internal get/set
-	  property.
-
-2007-06-19  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProject.cs: CProject does want it's tags written.
-
-2007-06-18  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Project/CProjectServiceExtension.cs, Project/CProject.cs: Changed to
-	  accomodate the new CTagsCompletion design.
-
-2007-06-17  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Compiler/GNUCompiler.cs: Added debug information creation for the
-	  Debug configuration and fixed bug where the target output was not
-	  buing built when it should be.
-
-2007-06-17  Marcos David Marin Amador <MarcosMarin@gmail.com> 
-
-	* Gui/CodeGenerationPanel.cs, Project/CCompilationParameters.cs,
-	  Project/CProject.cs, Compiler/GNUCompiler.cs: The extra compiler
-	  and extra linker options is now shown is an TextView in the code
-	  generation panel and I added define symbols support.
-
diff --git a/main/src/addins/CBinding/Compiler/CCompiler.cs b/main/src/addins/CBinding/Compiler/CCompiler.cs
deleted file mode 100644
index b5c99430d1..0000000000
--- a/main/src/addins/CBinding/Compiler/CCompiler.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// CCompiler.cs: asbtract class that provides some basic implementation for ICompiler
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text;
-using System.CodeDom.Compiler;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-
-namespace CBinding
-{
-	public abstract class CCompiler : ICompiler
-	{
-		protected string compilerCommand;
-		protected string linkerCommand;
-		
-		public abstract string Name {
-			get;
-		}
-			
-		public abstract Language Language {
-			get;
-		}
-		
-		public string CompilerCommand {
-			get { return compilerCommand; }
-		}
-		
-		public abstract bool SupportsCcache {
-			get;
-		}
-		
-		public abstract bool SupportsPrecompiledHeaders {
-			get;
-		}
-		
-		public abstract string GetCompilerFlags (Project project, CProjectConfiguration configuration);
-		
-		public abstract string GetDefineFlags (Project project, CProjectConfiguration configuration);
-		
-		public abstract BuildResult Compile (
-		    Project project,
-		    ProjectFileCollection projectFiles,
-		    ProjectPackageCollection packages,
-		    CProjectConfiguration configuration,
-		    IProgressMonitor monitor);
-		
-		public abstract void Clean (ProjectFileCollection projectFiles, CProjectConfiguration configuration, IProgressMonitor monitor);
-		    
-		protected abstract void ParseCompilerOutput (string errorString, CompilerResults cr);
-		
-		protected abstract void ParseLinkerOutput (string errorString, CompilerResults cr);
-		
-		protected string GeneratePkgLinkerArgs (ProjectPackageCollection packages)
-		{
-			return GeneratePkgConfigArgs (packages, "--libs");
-		}
-		
-		protected string GeneratePkgCompilerArgs (ProjectPackageCollection packages)
-		{
-			return GeneratePkgConfigArgs (packages, "--cflags");
-		}
-	
-		protected static string GeneratePkgConfigArgs (ProjectPackageCollection packages, string pkgConfigArg)
-		{
-			if (packages == null || packages.Count < 1)
-				return string.Empty;
-			string originalPkgConfigPath = Environment.GetEnvironmentVariable ("PKG_CONFIG_PATH");
-			string pkgConfigPath = originalPkgConfigPath;
-			
-			StringBuilder libs = new StringBuilder ();
-			
-			foreach (Package p in packages) {
-				if (Path.IsPathRooted (p.File)) {
-					pkgConfigPath = string.Format ("{0}{1}{2}", pkgConfigPath, Path.PathSeparator, Path.GetDirectoryName (p.File));
-					libs.Append (Path.GetFileNameWithoutExtension (p.File) + " ");
-				} else {
-					libs.Append (p.File + " ");
-				}
-			}
-			
-			string args = string.Format ("{0} \"{1}\"", pkgConfigArg, libs.ToString ().Trim ());
-			
-			StringWriter output = new StringWriter ();			
-			ProcessWrapper proc = new ProcessWrapper ();
-			
-			try {			
-				Environment.SetEnvironmentVariable ("PKG_CONFIG_PATH", pkgConfigPath);
-				proc = Runtime.ProcessService.StartProcess ("pkg-config", args, null, null);
-				proc.WaitForExit ();
-				
-				string line;
-				while ((line = proc.StandardOutput.ReadLine ()) != null)
-					output.WriteLine (line);
-			} catch (Exception ex) {
-				MessageService.ShowError ("You need to have pkg-config installed");
-			} finally {
-				proc.Close ();
-				Environment.SetEnvironmentVariable ("PKG_CONFIG_PATH", originalPkgConfigPath);
-			}
-			
-			return output.ToString ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Compiler/GNUCompiler.cs b/main/src/addins/CBinding/Compiler/GNUCompiler.cs
deleted file mode 100644
index b75471a9ff..0000000000
--- a/main/src/addins/CBinding/Compiler/GNUCompiler.cs
+++ /dev/null
@@ -1,799 +0,0 @@
-//
-// GNUCompiler.cs: Provides most functionality to compile using a GNU compiler (gcc and g++)
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//   Mitchell Wheeler <mitchell.wheeler@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.CodeDom.Compiler;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Core.ProgressMonitoring;
-using MonoDevelop.Projects;
-
-namespace CBinding
-{
-	public abstract class GNUCompiler : CCompiler
-	{
-		bool appsChecked;
-		bool compilerFound;
-		bool linkerFound;
-		
-		public override BuildResult Compile (
-		    Project project,
-		    ProjectFileCollection projectFiles,
-		    ProjectPackageCollection packages,
-		    CProjectConfiguration configuration,
-		    IProgressMonitor monitor)
-		{
-			if (!appsChecked) {
-				appsChecked = true;
-				compilerFound = CheckApp (compilerCommand);
-				linkerFound = CheckApp (linkerCommand);
-			}
-				
-			if (!compilerFound) {
-				BuildResult cres = new BuildResult ();
-				cres.AddError ("Compiler not found: " + compilerCommand);
-				return cres;
-			}
-			
-			if (!linkerFound) {
-				BuildResult cres = new BuildResult ();
-				cres.AddError ("Linker not found: " + linkerCommand);
-				return cres;
-			}
-			
-			CompilerResults cr = new CompilerResults (new TempFileCollection ());
-			bool success = true;
-			string compilerArgs = GetCompilerFlags (project, configuration) + " " + GeneratePkgCompilerArgs (packages);
-			
-			string outputName = Path.Combine (configuration.OutputDirectory,
-			                                  configuration.CompiledOutputName);
-			
-			// Precompile header files and place them in prec/<config_name>/
-			if (configuration.PrecompileHeaders) {
-				string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
-				string precConfigDir = Path.Combine (precDir, configuration.Id);
-				if (!Directory.Exists (precDir))
-					Directory.CreateDirectory (precDir);
-				if (!Directory.Exists (precConfigDir))
-					Directory.CreateDirectory (precConfigDir);
-				
-				if (!PrecompileHeaders (projectFiles, configuration, compilerArgs, monitor, cr))
-					success = false;
-			} else {
-				//old headers could interfere with the build
-				CleanPrecompiledHeaders (configuration);
-			}
-			
-			//compile source to object files
-			monitor.BeginTask (GettextCatalog.GetString ("Compiling source to object files"), 1);
-			foreach (ProjectFile f in projectFiles) {
-				if (!success) break;
-				if (f.Subtype == Subtype.Directory || f.BuildAction != BuildAction.Compile || CProject.IsHeaderFile (f.FilePath))
-					continue;
-				
-				if (configuration.UseCcache || NeedsCompiling (f, configuration))
-					success = DoCompilation (f, configuration, compilerArgs, monitor, cr, configuration.UseCcache);
-			}
-			if (success)
-				monitor.Step (1);
-			monitor.EndTask ();
-
-			if (success) {
-				switch (configuration.CompileTarget)
-				{
-				case CBinding.CompileTarget.Bin:
-					MakeBin (project, projectFiles, configuration, packages, cr, monitor, outputName);
-					break;
-				case CBinding.CompileTarget.StaticLibrary:
-					MakeStaticLibrary (project, projectFiles, configuration, packages, cr, monitor, outputName);
-					break;
-				case CBinding.CompileTarget.SharedLibrary:
-					MakeSharedLibrary (project, projectFiles, configuration, packages, cr, monitor, outputName);
-					break;
-				}
-			}
-			
-			return new BuildResult (cr, "");
-		}
-		
-		public override bool SupportsCcache {
-			get { return true; }
-		}
-		
-		public override bool SupportsPrecompiledHeaders {
-			get { return true; }
-		}
-		
-		Dictionary<string, string> GetStringTags (Project project)
-		{
-			Dictionary<string, string> result = new Dictionary<string, string> (StringComparer.InvariantCultureIgnoreCase);
-			result["PROJECTDIR"] = project.BaseDirectory;
-			result["PROJECTFILENAME"] = project.FileName;
-			return result;
-		}
-		
-		public override string GetCompilerFlags (Project project, CProjectConfiguration configuration)
-		{
-			StringBuilder args = new StringBuilder ();
-			
-			if (configuration.DebugMode)
-				args.Append ("-g ");
-			
-			if (configuration.CompileTarget == CBinding.CompileTarget.SharedLibrary)
-				args.Append ("-fPIC ");
-			
-			switch (configuration.WarningLevel)
-			{
-			case WarningLevel.None:
-				args.Append ("-w ");
-				break;
-			case WarningLevel.Normal:
-				// nothing
-				break;
-			case WarningLevel.All:
-				args.Append ("-Wall ");
-				break;
-			}
-			
-			if (configuration.WarningsAsErrors)
-				args.Append ("-Werror ");
-			
-			args.Append ("-O" + configuration.OptimizationLevel + " ");
-			
-			if (configuration.ExtraCompilerArguments != null && configuration.ExtraCompilerArguments.Length > 0) {
-				string extraCompilerArgs = ExpandBacktickedParameters(configuration.ExtraCompilerArguments.Replace ('\n', ' '));
-				args.Append (extraCompilerArgs + " ");
-			}
-			
-			if (configuration.DefineSymbols != null && configuration.DefineSymbols.Length > 0)
-				args.Append (ProcessDefineSymbols (configuration.DefineSymbols) + " ");
-			
-			if (configuration.Includes != null)
-				foreach (string inc in configuration.Includes)
-					args.Append ("-I\"" + StringParserService.Parse (inc, GetStringTags (project)) + "\" ");
-			
-			if (configuration.PrecompileHeaders) {
-				string precdir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
-				precdir = Path.Combine (precdir, configuration.Id);
-				args.Append ("-I\"" + precdir + "\"");
-			}
-			
-			return args.ToString ();
-		}
-		
-		public override string GetDefineFlags (Project project, CProjectConfiguration configuration)
-		{
-			return ProcessDefineSymbols (configuration.DefineSymbols);
-		}
-		
-		private bool NeedsCompiling (ProjectFile file, CProjectConfiguration configuration)
-		{
-			string objectFile = Path.Combine(configuration.OutputDirectory, Path.GetFileName(file.Name));
-			objectFile = Path.ChangeExtension(objectFile, ".o");
-			if (!File.Exists (objectFile))
-				return true;
-			
-			string[] dependedOnFiles = DependedOnFiles (file, configuration);
-			if (dependedOnFiles == null) {
-				return true;
-			}
-			
-			DateTime lastObjectTime = File.GetLastWriteTime (objectFile);
-			
-			try {
-				foreach (string depfile in dependedOnFiles) {
-					if (File.GetLastWriteTime (depfile) > lastObjectTime) {
-						return true;
-					}
-				}
-			} catch (IOException e) {
-				// This means the dependency file is telling us our source file
-				// depends on a file that no longer exists, all this means is that 
-				// the dependency file is outdated. We should just ignore this
-				// since the dependency file will be automatically updated when
-				// the source file is compiled.
-				e.ToString (); // suppress warning.
-			}
-			
-			return false;
-		}
-		
-		/// <summary>
-		/// Returns an array of depended on files or null if the
-		/// file containing the depended on files (.d) does does not exist.
-		/// </summary>
-		private string[] DependedOnFiles (ProjectFile file, CProjectConfiguration configuration)
-		{
-			List<string> dependencies = new List<string> ();
-			string dependenciesFile = Path.Combine(configuration.OutputDirectory, Path.GetFileName(file.Name));
-			dependenciesFile = Path.ChangeExtension(dependenciesFile, ".d");
-			
-			if (!File.Exists (dependenciesFile))
-				return null;
-			
-			// It always depends on itself ;)
-			dependencies.Add (file.Name);
-			
-			string temp;
-			using (StreamReader reader = new StreamReader (dependenciesFile)) {
-				while ((temp = reader.ReadLine ()) != null) {
-					// TODO: We really should be using a regex here,
-					// this will have issues with pathnames containing double spaces.
-					string depfile = temp.Replace(" \\", String.Empty).Trim();
-	
-					// Ignore empty strings &  object files...
-					if(String.IsNullOrEmpty(depfile) ||
-					   depfile.EndsWith(".o:") || depfile.EndsWith(".o"))
-					   continue;
-					
-					dependencies.Add(depfile.Replace(@"\ ", " "));
-				}
-			}
-
-			return dependencies.ToArray();
-		}
-		
-		private bool PrecompileHeaders (ProjectFileCollection projectFiles,
-		                                CProjectConfiguration configuration,
-		                                string args,
-		                                IProgressMonitor monitor,
-		                                CompilerResults cr)
-		{
-			monitor.BeginTask (GettextCatalog.GetString ("Precompiling headers"), 1);
-			bool success = true;
-			
-			foreach (ProjectFile file in projectFiles) {
-				if (file.Subtype == Subtype.Code && CProject.IsHeaderFile (file.Name)) {
-					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) {
-						if (!File.Exists (precomp) || configuration.UseCcache || File.GetLastWriteTime (file.Name) > File.GetLastWriteTime (precomp)) {
-							if (DoPrecompileHeader (file, precomp, args, monitor, cr) == false) {
-								success = false;
-								break;
-							}
-						}
-					} else {
-						//remove old files or they'll interfere with the build
-						if (File.Exists (precomp))
-							File.Delete (precomp);
-					}
-				}
-				
-			}
-			if (success)
-				monitor.Step (1);
-			monitor.EndTask ();
-			return success;
-		}
-		
-		private bool DoPrecompileHeader (ProjectFile file, string output, string args, IProgressMonitor monitor, CompilerResults cr)
-		{
-			string completeArgs = String.Format ("\"{0}\" {1} -o {2}", file.Name, args, output);
-			string errorOutput;
-			int exitCode = ExecuteCommand (compilerCommand, completeArgs, Path.GetDirectoryName (output), monitor, out errorOutput);
-			ParseCompilerOutput (errorOutput, cr);
-			return (exitCode == 0);
-		}
-
-		static readonly string[] libraryExtensions = { ".so", ".a", ".dll", ".dylib" };
-		/// <summary>
-		/// Checks whether a library can be linked with -lbasename
-		/// </summary>
-		/// <remarks>
-		/// This should return true iff directory is empty or in 
-		/// the configured library paths, and library is of the form blah
-		/// or libblah.(a|so|dll|dylib), 
-		/// </remarks>
-		internal bool IsStandardLibrary(CProjectConfiguration configuration,
-		                                string directory, string library,
-		                                ref string std_lib)
-		{
-			std_lib = library;
-			
-			if(!(String.IsNullOrEmpty(directory) || 
-			    configuration.LibPaths.Contains(directory)))
-				return false;
-				
-			string libraryExtension = Path.GetExtension (library);
-			
-			foreach (string extension in libraryExtensions)
-			{
-				if (libraryExtension.Equals (extension, StringComparison.OrdinalIgnoreCase)) {
-					if (library.StartsWith("lib", StringComparison.OrdinalIgnoreCase)) {
-						std_lib = std_lib.Substring(3);
-						return true;
-					} else {
-						return false;
-					}
-				}
-			}
-			
-			return true;
-		}
-		
-		private void MakeBin (Project project,
-		                      ProjectFileCollection projectFiles,
-		                     CProjectConfiguration configuration,
-		                     ProjectPackageCollection packages,
-		                     CompilerResults cr,
-		                     IProgressMonitor monitor, string outputName)
-		{
-			if (!NeedsUpdate (projectFiles, configuration, outputName)) return;
-			
-			string objectFiles = string.Join (" ", ObjectFiles (projectFiles, configuration, true));
-			string pkgargs = GeneratePkgLinkerArgs (packages);
-			StringBuilder args = new StringBuilder ();
-			
-			if (configuration.ExtraLinkerArguments != null && configuration.ExtraLinkerArguments.Length > 0) {
-				string extraLinkerArgs = ExpandBacktickedParameters(configuration.ExtraLinkerArguments.Replace ('\n', ' '));
-				args.Append (extraLinkerArgs + " ");
-			}
-			
-			if (configuration.LibPaths != null)
-				foreach (string libpath in configuration.LibPaths)
-					args.Append ("-L\"" + StringParserService.Parse (libpath, GetStringTags (project)) + "\" ");
-			
-			if (configuration.Libs != null) {
-				foreach (string lib in configuration.Libs) {
-					string directory = Path.GetDirectoryName(lib);
-					string library = Path.GetFileName(lib);
-
-					// Is this a 'standard' (as in, uses an orthodox naming convention) library..?
-					string link_lib = String.Empty;
-					if(IsStandardLibrary(configuration, directory, library, ref link_lib))
-						args.Append ("-l\"" + link_lib + "\" ");
-					// If not, reference the library by it's full pathname.
-					else
-						args.Append ("\"" + lib + "\" ");
-				}
-			}
-			
-			string linker_args = string.Format ("-o \"{0}\" {1} {2} {3}",
-			    outputName, objectFiles, pkgargs, args.ToString ());
-			
-			monitor.BeginTask (GettextCatalog.GetString ("Generating binary \"{0}\" from object files", Path.GetFileName (outputName)), 1);
-			
-			string errorOutput;
-			int exitCode = ExecuteCommand (linkerCommand, linker_args, Path.GetDirectoryName (outputName), monitor, out errorOutput);
-			if (exitCode == 0)
-				monitor.Step (1);
-			monitor.EndTask ();
-			
-			ParseCompilerOutput (errorOutput, cr);
-			ParseLinkerOutput (errorOutput, cr);
-			CheckReturnCode (exitCode, cr);
-		}
-		
-		private void MakeStaticLibrary (Project project,
-		                                ProjectFileCollection projectFiles,
-		                                CProjectConfiguration configuration,
-		                                ProjectPackageCollection packages,
-		                                CompilerResults cr,
-		                                IProgressMonitor monitor, string outputName)
-		{
-			if (!NeedsUpdate (projectFiles, configuration, outputName)) return;
-			
-			string objectFiles = string.Join (" ", ObjectFiles (projectFiles, configuration, true));
-			string args = string.Format ("rcs \"{0}\" {1}", outputName, objectFiles);
-			
-			monitor.BeginTask (GettextCatalog.GetString ("Generating static library {0} from object files", Path.GetFileName (outputName)), 1);
-			
-			string errorOutput;
-			int exitCode = ExecuteCommand ("ar", args, Path.GetDirectoryName (outputName), monitor, out errorOutput);
-			if (exitCode == 0)
-				monitor.Step (1);
-			monitor.EndTask ();
-			
-			ParseCompilerOutput (errorOutput, cr);
-			ParseLinkerOutput (errorOutput, cr);
-			CheckReturnCode (exitCode, cr);
-		}
-		
-		private void MakeSharedLibrary(Project project,
-		                               ProjectFileCollection projectFiles,
-		                               CProjectConfiguration configuration,
-		                               ProjectPackageCollection packages,
-		                               CompilerResults cr,
-		                               IProgressMonitor monitor, string outputName)
-		{
-			if (!NeedsUpdate (projectFiles, configuration, outputName)) return;
-			
-			string objectFiles = string.Join (" ", ObjectFiles (projectFiles, configuration, true));
-			string pkgargs = GeneratePkgLinkerArgs (packages);
-			StringBuilder args = new StringBuilder ();
-			
-			if (configuration.ExtraLinkerArguments != null && configuration.ExtraLinkerArguments.Length > 0) {
-				string extraLinkerArgs = ExpandBacktickedParameters(configuration.ExtraLinkerArguments.Replace ('\n', ' '));
-				args.Append (extraLinkerArgs + " ");
-			}
-			
-			if (configuration.LibPaths != null)
-				foreach (string libpath in configuration.LibPaths)
-					args.Append ("-L\"" + StringParserService.Parse (libpath, GetStringTags (project)) + "\" ");
-			
-			if (configuration.Libs != null) {
-				foreach (string lib in configuration.Libs) {
-					string directory = Path.GetDirectoryName(lib);
-					string library = Path.GetFileName(lib);
-
-					// Is this a 'standard' (as in, uses an orthodox naming convention) library..?
-					string link_lib = String.Empty;
-					if(IsStandardLibrary(configuration, directory, library, ref link_lib))
-						args.Append ("-l\"" + link_lib + "\" ");
-					// If not, reference the library by it's full pathname.
-					else
-						args.Append ("\"" + lib + "\" ");
-				}
-			}
-			
-			string linker_args = string.Format ("-shared -o \"{0}\" {1} {2} {3}",
-			    outputName, objectFiles, pkgargs, args.ToString ());
-			
-			monitor.BeginTask (GettextCatalog.GetString ("Generating shared object \"{0}\" from object files", Path.GetFileName (outputName)), 1);
-			
-			string errorOutput;
-			int exitCode = ExecuteCommand (linkerCommand , linker_args, Path.GetDirectoryName (outputName), monitor, out errorOutput);
-			if (exitCode == 0)
-				monitor.Step (1);
-			monitor.EndTask ();
-			
-			ParseCompilerOutput (errorOutput, cr);
-			ParseLinkerOutput (errorOutput, cr);
-			CheckReturnCode (exitCode, cr);
-		}
-		
-		int ExecuteCommand (string command, string args, string baseDirectory, IProgressMonitor monitor, out string errorOutput)
-		{
-			errorOutput = string.Empty;
-			int exitCode = -1;
-			
-			using (var swError = new StringWriter ()) {
-				using (var chainedError = new LogTextWriter ()) {
-					chainedError.ChainWriter (monitor.Log);
-					chainedError.ChainWriter (swError);
-			
-					monitor.Log.WriteLine ("{0} {1}", command, args);
-			
-					using (var operationMonitor = new AggregatedOperationMonitor (monitor)) {
-						using (ProcessWrapper p = Runtime.ProcessService.StartProcess (command, args, baseDirectory, monitor.Log, chainedError, null)) {
-							operationMonitor.AddOperation (p); //handles cancellation
-				
-							p.WaitForOutput ();
-							chainedError.UnchainWriter (monitor.Log);
-							chainedError.UnchainWriter (swError);
-
-							errorOutput = swError.ToString ();
-							exitCode = p.ExitCode;
-				
-							if (monitor.IsCancelRequested) {
-								monitor.Log.WriteLine (GettextCatalog.GetString ("Build cancelled"));
-								monitor.ReportError (GettextCatalog.GetString ("Build cancelled"), null);
-								if (exitCode == 0)
-									exitCode = -1;
-							}
-						}
-					}
-				}
-			}
-			
-			return exitCode;
-		}
-		
-		private string ProcessDefineSymbols (string symbols)
-		{
-			StringBuilder processed = new StringBuilder (symbols);
-			
-			// Take care of multi adyacent spaces
-			for (int i = 0; i < processed.Length; i++) {
-				if (i + 1 < processed.Length &&
-				    processed[i] == ' ' &&
-				    processed[i + 1] == ' ') {
-					processed.Remove (i--, 1);
-				}
-			}
-			
-			return processed.ToString ()
-				            .Trim ()
-				            .Replace (" ", " -D")
-				            .Insert (0, "-D");
-		}
-		
-		/// <summary>
-		/// Compiles a single source file into object code
-		/// and creates a file with it's dependencies.
-		/// </summary>
-		private bool DoCompilation (ProjectFile file,
-		                            CProjectConfiguration configuration,
-		                            string args,
-		                            IProgressMonitor monitor,
-		                            CompilerResults cr,
-		                            bool use_ccache)
-		{
-
-			string outputName = Path.Combine(configuration.OutputDirectory, Path.GetFileName(Path.ChangeExtension (file.Name, ".o")));
-			
-			string compiler_args = string.Format ("{0} -MMD \"{1}\" {2} -c -o \"{3}\"",
-			    (use_ccache ? compilerCommand : string.Empty), file.Name, args, outputName);
-
-			string errorOutput;
-			int exitCode = ExecuteCommand ((use_ccache ? "ccache" : compilerCommand), compiler_args, configuration.OutputDirectory, monitor, out errorOutput);
-			
-			ParseCompilerOutput (errorOutput, cr);
-			CheckReturnCode (exitCode, cr);
-			return exitCode == 0;
-		}
-		
-		/// <summary>
-		/// Gets the files that get compiled into object code.
-		/// </summary>
-		/// <param name="projectFiles">
-		/// A <see cref="ProjectFileCollection"/>
-		/// The project's files, extracts from here the files that get compiled into object code.
-		/// </param>
-		/// <param name="configuration">
-		/// A <see cref="CProjectConfiguration"/>
-		/// The configuration to get the object files for...
-		/// </param>
-		/// <param name="withQuotes">
-		/// A <see cref="System.Boolean"/>
-		/// If true, it will surround each object file with quotes 
-		/// so that gcc has no problem with paths that contain spaces.
-		/// </param>
-		/// <returns>
-		/// An array of strings, each string is the name of a file
-		/// that will get compiled into object code. The file name
-		/// will already have the .o extension.
-		/// </returns>
-		private string[] ObjectFiles (ProjectFileCollection projectFiles, CProjectConfiguration configuration, bool withQuotes)
-		{
-			if(projectFiles.Count == 0)
-				return new string[] {};
-
-			List<string> objectFiles = new List<string> ();
-			
-			foreach (ProjectFile f in projectFiles) {
-				if (f.BuildAction == BuildAction.Compile) {
-					string PathName = Path.Combine(configuration.OutputDirectory, Path.GetFileNameWithoutExtension(f.Name) + ".o");
-
-					if(File.Exists(PathName) == false)
-						continue;
-					
-					if (!withQuotes)
-						objectFiles.Add (PathName);
-					else
-						objectFiles.Add ("\"" + PathName + "\"");
-				}
-			}
-			
-			return objectFiles.ToArray ();
-		}
-		
-		public override void Clean (ProjectFileCollection projectFiles, CProjectConfiguration configuration, IProgressMonitor monitor)
-		{
-			//clean up object files
-			foreach (string oFile in ObjectFiles(projectFiles, configuration, false)) {
-				if (File.Exists (oFile))
-					File.Delete (oFile);
-				
-				string dFile = Path.ChangeExtension (oFile, ".d");
-				if (File.Exists (dFile))
-					File.Delete (dFile);
-			}
-			
-			CleanPrecompiledHeaders (configuration);
-		}
-		
-		void CleanPrecompiledHeaders (CProjectConfiguration configuration)
-		{
-			if (string.IsNullOrEmpty (configuration.IntermediateOutputDirectory))
-			    return;
-			
-			string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");			
-
-			if (Directory.Exists (precDir))
-				Directory.Delete (precDir, true);
-		}
-		
-		private bool NeedsUpdate (ProjectFileCollection projectFiles, CProjectConfiguration configuration, string target)
-		{
-			if (!File.Exists (target))
-				return true;
-			
-			foreach (string obj in ObjectFiles (projectFiles, configuration, false))
-				if (File.GetLastWriteTime (obj) > File.GetLastWriteTime (target))
-					return true;
-			
-			return false;
-		}
-		
-		protected override void ParseCompilerOutput (string errorString, CompilerResults cr)
-		{
-			TextReader reader = new StringReader (errorString);
-			string next;
-				
-			while ((next = reader.ReadLine ()) != null) {
-				CompilerError error = CreateErrorFromErrorString (next, reader);
-				if (error != null)
-					cr.Errors.Add (error);
-			}
-			
-			reader.Close ();
-		}
-		
-		private static Regex withColRegex = new Regex (
-		    @"^\s*(?<file>.*):(?<line>\d*):(?<column>\d*):\s*(?<level>.*)\s*:\s(?<message>.*)",
-		    RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-		private static Regex noColRegex = new Regex (
-		    @"^\s*(?<file>.*):(?<line>\d*):\s*(?<level>.*)\s*:\s(?<message>.*)",
-		    RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-		private static Regex linkerRegex = new Regex (
-		    @"^\s*(?<file>[^:]*):(?<line>\d*):\s*(?<message>.*)",
-		    RegexOptions.Compiled | RegexOptions.ExplicitCapture);
-		
-		private CompilerError CreateErrorFromErrorString (string errorString, TextReader reader)
-		{
-			CompilerError error = new CompilerError ();
-			string warning = GettextCatalog.GetString ("warning");
-			string note = GettextCatalog.GetString ("note");
-			
-			Match match = withColRegex.Match (errorString);
-			
-			if (match.Success)
-			{
-				error.FileName = match.Groups["file"].Value;
-				error.Line = int.Parse (match.Groups["line"].Value);
-				error.Column = int.Parse (match.Groups["column"].Value);
-				error.IsWarning = (match.Groups["level"].Value.Equals (warning, StringComparison.Ordinal) ||
-				                   match.Groups["level"].Value.Equals (note, StringComparison.Ordinal));
-				error.ErrorText = match.Groups["message"].Value;
-				
-				return error;
-			}
-			
-			match = noColRegex.Match (errorString);
-			
-			if (match.Success)
-			{
-				error.FileName = match.Groups["file"].Value;
-				error.Line = int.Parse (match.Groups["line"].Value);
-				error.IsWarning = (match.Groups["level"].Value.Equals (warning, StringComparison.Ordinal) ||
-				                   match.Groups["level"].Value.Equals (note, StringComparison.Ordinal));
-				error.ErrorText = match.Groups["message"].Value;
-				
-				// Skip messages that begin with ( and end with ), since they're generic.
-				//Attempt to capture multi-line versions too.
-				if (error.ErrorText.StartsWith ("(")) {
-					string error_continued = error.ErrorText;
-					do {
-						if (error_continued.EndsWith (")"))
-							return null;
-					} while ((error_continued = reader.ReadLine ()) != null);
-				}
-				
-				return error;
-			}
-			
-			return null;
-		}
-		
-		protected override void ParseLinkerOutput (string errorString, CompilerResults cr)
-		{
-			TextReader reader = new StringReader (errorString);
-			string next;
-			
-			while ((next = reader.ReadLine ()) != null) {
-				CompilerError error = CreateLinkerErrorFromErrorString (next);
-				if (error != null)
-					cr.Errors.Insert (0, error);
-			}
-			
-			reader.Close ();
-		}
-		
-		private CompilerError CreateLinkerErrorFromErrorString (string errorString)
-		{
-			CompilerError error = new CompilerError ();
-			
-			Match linkerMatch = linkerRegex.Match (errorString);
-			
-			if (linkerMatch.Success)
-			{
-				error.FileName = linkerMatch.Groups["file"].Value;
-				error.Line = int.Parse (linkerMatch.Groups["line"].Value);
-				error.ErrorText = linkerMatch.Groups["message"].Value;
-				
-				return error;
-			}
-			
-			return null;
-		}
-
-		// expands backticked portions of the parameter-list using "sh" and "echo"
-		// TODO: Do this ourselves, relying on sh/echo - and launching an entire process just for this is ... excessive.
-		public string ExpandBacktickedParameters (string tmp)
-		{
-			// 1) Quadruple \ required, to escape both echo's and sh's escape character filtering
-			// 2) \\\" required inside of echo, to translate into \" in sh, so it translates back as a " to MD...
-			string parameters = "-c \"echo " + tmp.Replace("\\", "\\\\\\\\").Replace("\"", "\\\\\\\"") + "\"";
-
-			var p = Process.Start (new ProcessStartInfo ("sh", parameters) {
-				UseShellExecute = false,
-				RedirectStandardOutput = true
-			});
-			p.Start ();
-			p.WaitForExit ();
-
-			//TODO: use async reads so we don't deadlock if stdout fills up
-			//TODO: check return code
-			return p.StandardOutput.ReadToEnd ().Trim ();
-		}
-		
-		bool CheckApp (string app)
-		{
-			try {
-				ProcessWrapper p = Runtime.ProcessService.StartProcess (app, "--version", null, null);
-				p.WaitForOutput ();
-				return true;
-			} catch {
-				return false;
-			}
-		}
-		
-		/// <summary>
-		/// Checks a compilation return code, 
-		/// and adds an error result if the compiler results
-		/// show no errors.
-		/// </summary>
-		/// <param name="returnCode">
-		/// A <see cref="System.Int32"/>: A process return code
-		/// </param>
-		/// <param name="cr">
-		/// A <see cref="CompilerResults"/>: The return code from a compilation run
-		/// </param>
-		void CheckReturnCode (int returnCode, CompilerResults cr)
-		{
-			cr.NativeCompilerReturnValue = returnCode;
-			if (0 != returnCode && 0 == cr.Errors.Count) { 
-				cr.Errors.Add (new CompilerError (string.Empty, 0, 0, string.Empty,
-				                                  GettextCatalog.GetString ("Build failed - check build output for details")));
-			}
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Compiler/GccCompiler.cs b/main/src/addins/CBinding/Compiler/GccCompiler.cs
deleted file mode 100644
index fb9fb40a81..0000000000
--- a/main/src/addins/CBinding/Compiler/GccCompiler.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// GccCompiler.cs: Provides functionality to compile using gcc
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using Mono.Addins;
-
-
-namespace CBinding
-{
-	[Extension ("/CBinding/Compilers")]
-	public class GccCompiler : GNUCompiler
-	{		
-		public override string Name {
-			get { return "gcc"; }
-		}
-		
-		public override Language Language {
-			get { return Language.C; }
-		}
-		
-		public GccCompiler ()
-		{
-			compilerCommand = "gcc";
-			linkerCommand = "gcc";
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Compiler/GppCompiler.cs b/main/src/addins/CBinding/Compiler/GppCompiler.cs
deleted file mode 100644
index cdaa66cecb..0000000000
--- a/main/src/addins/CBinding/Compiler/GppCompiler.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// GppCompiler.cs: Provides functionality to compile using g++
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using Mono.Addins;
-
-
-namespace CBinding
-{
-	[Extension ("/CBinding/Compilers")]
-	public class GppCompiler : GNUCompiler
-	{
-		public override string Name {
-			get { return "g++"; }
-		}
-		
-		public override Language Language {
-			get { return Language.CPP; }
-		}
-		
-		public GppCompiler ()
-		{
-			compilerCommand = "g++";
-			linkerCommand = "g++";
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Compiler/ICompiler.cs b/main/src/addins/CBinding/Compiler/ICompiler.cs
deleted file mode 100644
index edb2b80c96..0000000000
--- a/main/src/addins/CBinding/Compiler/ICompiler.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// ICompiler.cs: interface that must be implemented by any class that wants
-// to provide a compiler for the CBinding addin.
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Mono.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-
-namespace CBinding
-{
-	[TypeExtensionPoint ("/CBinding/Compilers")]
-	public interface ICompiler
-	{
-		string Name {
-			get;
-		}
-		
-		Language Language {
-			get;
-		}
-		
-		string CompilerCommand {
-			get;
-		}
-		
-		bool SupportsCcache {
-			get;
-		}
-		
-		bool SupportsPrecompiledHeaders {
-			get;
-		}
-		
-		string GetCompilerFlags (Project project, CProjectConfiguration configuration);
-		
-		string GetDefineFlags (Project project, CProjectConfiguration configuration);
-		
-		BuildResult Compile (
-		    Project project,
-		    ProjectFileCollection projectFiles,
-		    ProjectPackageCollection packages,
-		    CProjectConfiguration configuration,
-		    IProgressMonitor monitor);
-		
-		void Clean (ProjectFileCollection projectFiles, CProjectConfiguration configuration, IProgressMonitor monitor);
-	}
-}
diff --git a/main/src/addins/CBinding/CppLanguageBinding.cs b/main/src/addins/CBinding/CppLanguageBinding.cs
deleted file mode 100644
index 3054db393c..0000000000
--- a/main/src/addins/CBinding/CppLanguageBinding.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// CppLanguageBinding.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marín Amador
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-
-namespace CBinding
-{
-	public class CppLanguageBinding : ILanguageBinding
-	{
-		public string Language {
-			get { return "CPP"; }
-		}
-		
-		public string SingleLineCommentTag { get { return "//"; } }
-		public string BlockCommentStartTag { get { return "/*"; } }
-		public string BlockCommentEndTag { get { return "*/"; } }
-		
-		public bool IsSourceCodeFile (FilePath fileName)
-		{
-			return fileName.ToString ().EndsWith (".cpp", StringComparison.OrdinalIgnoreCase);
-		}
-		
-		public FilePath GetFileName (FilePath baseName)
-		{
-			return baseName + ".cpp";
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Gui/CTextEditorExtension.cs b/main/src/addins/CBinding/Gui/CTextEditorExtension.cs
deleted file mode 100755
index 690baf3ea6..0000000000
--- a/main/src/addins/CBinding/Gui/CTextEditorExtension.cs
+++ /dev/null
@@ -1,793 +0,0 @@
-//
-// CTextEditorExtension.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text;
-using System.Linq;
-using System.Collections.Generic;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Components;
-using MonoDevelop.Components.Commands;
-
-using CBinding.Parser;
-using Mono.TextEditor;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
-
-namespace CBinding
-{
-	public class CTextEditorExtension : CompletionTextEditorExtension, IPathedDocument
-	{
-		// Allowed chars to be next to an identifier
-		private static char[] allowedChars = new char[] {
-			'.', ':', ' ', '\t', '=', '*', '+', '-', '/', '%', ',', '&',
-			'|', '^', '{', '}', '[', ']', '(', ')', '\n', '!', '?', '<', '>'
-		};
-		
-		// Allowed Chars to be next to an identifier excluding ':' (to get the full name in '::' completion).
-		private static char[] allowedCharsMinusColon = new char[] {
-			'.', ' ', '\t', '=', '*', '+', '-', '/', '%', ',', '&', '|',
-			'^', '{', '}', '[', ']', '(', ')', '\n', '!', '?', '<', '>'
-		};
-		
-		/// <summary>
-		/// A delegate for getting completion data 
-		/// </summary>
-		private delegate CompletionDataList GetMembersForExtension (CTextEditorExtension self, string completionExtension, string completionText);
-		
-		/// <summary>
-		/// An associative array containing each completion-triggering extension 
-		/// and its respective callback
-		/// </summary>
-		private static KeyValuePair<string, GetMembersForExtension>[] completionExtensions = new KeyValuePair<string, GetMembersForExtension>[] {
-			new KeyValuePair<string, GetMembersForExtension>("::", GetItemMembers),
-			new KeyValuePair<string, GetMembersForExtension>("->", GetInstanceMembers),
-			new KeyValuePair<string, GetMembersForExtension>(".", GetInstanceMembers)
-		};
-		
-		protected Mono.TextEditor.TextEditorData textEditorData{ get; set; }
-
-		public override string CompletionLanguage {
-			get {
-				return "C/C++";
-			}
-		}
-		static bool IsOpenBrace (char c)
-		{
-			return c == '(' || c == '{' || c == '<' || c == '[';
-		}
-		static bool IsCloseBrace (char c)
-		{
-			return c == ')' || c == '}' || c == '>' || c == ']';
-		}
-		
-		static bool IsBrace (char c)
-		{
-			return IsOpenBrace  (c) || IsCloseBrace (c);
-		}
-		
-		static int SearchMatchingBracket (TextEditorData editor, int offset, char openBracket, char closingBracket, int direction)
-		{
-			bool isInString       = false;
-			bool isInChar         = false;	
-			bool isInBlockComment = false;
-			int depth = -1;
-			while (offset >= 0 && offset < editor.Length) {
-				char ch = editor.GetCharAt (offset);
-				switch (ch) {
-					case '/':
-						if (isInBlockComment) 
-							isInBlockComment = editor.GetCharAt (offset + direction) != '*';
-						if (!isInString && !isInChar && offset - direction < editor.Length) 
-							isInBlockComment = offset > 0 && editor.GetCharAt (offset - direction) == '*';
-						break;
-					case '"':
-						if (!isInChar && !isInBlockComment) 
-							isInString = !isInString;
-						break;
-					case '\'':
-						if (!isInString && !isInBlockComment) 
-							isInChar = !isInChar;
-						break;
-					default :
-						if (ch == closingBracket) {
-							if (!(isInString || isInChar || isInBlockComment)) 
-								--depth;
-						} else if (ch == openBracket) {
-							if (!(isInString || isInChar || isInBlockComment)) {
-								++depth;
-								if (depth == 0) 
-									return offset;
-							}
-						}
-						break;
-				}
-				offset += direction;
-			}
-			return -1;
-		}
-		
-		static int GetClosingBraceForLine (TextEditorData editor, DocumentLine line, out int openingLine)
-		{
-			int offset = SearchMatchingBracket (editor, line.Offset, '{', '}', -1);
-			if (offset == -1) {
-				openingLine = -1;
-				return -1;
-			}
-				
-			openingLine = editor.Document.OffsetToLineNumber (offset);
-			return offset;
-		}
-		
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
-		{
-			var line = Editor.Document.GetLine (Editor.Caret.Line);
-			string lineText = Editor.GetLineText (Editor.Caret.Line);
-			int lineCursorIndex = Math.Min (lineText.Length, Editor.Caret.Column);
-			
-			// Smart Indentation
-			if (Document.Editor.Options.IndentStyle == IndentStyle.Smart)
-			{
-				if (keyChar == '}') {
-					// Only indent if the brace is preceeded by whitespace.
-					if(AllWhiteSpace(lineText.Substring(0, lineCursorIndex))) {
-						int braceOpeningLine;
-						if(GetClosingBraceForLine(Editor, line, out braceOpeningLine) >= 0)
-						{
-							Editor.Replace (line.Offset, line.Length, GetIndent(Editor, braceOpeningLine, 0) + "}" + lineText.Substring(lineCursorIndex));
-							Editor.Document.CommitLineUpdate (line);
-							return false;
-						}
-					}
-				} else {
-					switch(key)
-					{
-						case Gdk.Key.Return:
-							// Calculate additional indentation, if any.
-							char finalChar = '\0';
-							char nextChar = '\0';
-							string indent = String.Empty;
-							if (!String.IsNullOrEmpty (Editor.SelectedText)) {
-								int cursorPos = Editor.SelectionRange.Offset;
-							
-								Editor.DeleteSelectedText ();
-								Editor.Caret.Offset = cursorPos;
-								
-								lineText = Editor.GetLineText (Editor.Caret.Line);
-								lineCursorIndex = Editor.Caret.Column;
-	//							System.Console.WriteLine(TextEditorData.Caret.Offset);
-							}
-							if(lineText.Length > 0)
-							{
-								if(lineCursorIndex > 0)
-									finalChar = lineText[Math.Min(lineCursorIndex, lineText.Length) - 1];
-								
-								if(lineCursorIndex < lineText.Length)
-									nextChar = lineText[lineCursorIndex];
-	
-								if(finalChar == '{')
-									indent = Document.Editor.Options.IndentationString;
-							}
-	
-							// If the next character is an closing brace, indent it appropriately.
-							if(IsBrace(nextChar) && !IsOpenBrace(nextChar))
-							{
-								int openingLine;
-								if(GetClosingBraceForLine (Editor, line, out openingLine) >= 0)
-								{
-									Editor.InsertAtCaret (Editor.EolMarker + GetIndent(Editor, openingLine, 0));
-									return false;
-								}
-							}
-						
-							// Default indentation method
-							Editor.InsertAtCaret (Editor.EolMarker + indent + GetIndent(Editor, Editor.Document.OffsetToLineNumber (line.Offset), lineCursorIndex));
-							
-							return false;
-						
-					}
-				}
-			}
-			
-			return base.KeyPress (key, keyChar, modifier);
-		}
-		
-		public override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
-		{
-			string lineText = Editor.GetLineText (completionContext.TriggerLine).TrimEnd();
-			
-			// If the line ends with a matched extension, invoke its handler
-			foreach (KeyValuePair<string, GetMembersForExtension> pair in completionExtensions) {
-				if (lineText.EndsWith(pair.Key)) {
-					lineText = lineText.Substring (0, lineText.Length - pair.Key.Length);
-					
-					int nameStart = lineText.LastIndexOfAny (allowedCharsMinusColon) + 1;
-					string itemName = lineText.Substring (nameStart).Trim ();
-					
-					if (string.IsNullOrEmpty (itemName))
-						return null;
-					
-					return pair.Value (this, pair.Key, itemName);
-				}
-			}
-			
-			if (char.IsLetter (completionChar)) {
-				// Aggressive completion
-				ICompletionDataList list = GlobalComplete ();
-				triggerWordLength = ResetTriggerOffset (completionContext);
-				return list;
-			}
-			
-			return null;
-		}
-		
-//		public override ICompletionDataList HandleCodeCompletion (
-//		    CodeCompletionContext completionContext, char completionChar)
-//		{
-//			int triggerWordLength = 0;
-//			return HandleCodeCompletion (completionContext, completionChar, ref triggerWordLength);
-//			
-//			string lineText = Editor.GetLineText (completionContext.TriggerLine).TrimEnd();
-//			
-//			// If the line ends with a matched extension, invoke its handler
-//			foreach (KeyValuePair<string, GetMembersForExtension> pair in completionExtensions) {
-//				if (lineText.EndsWith(pair.Key)) {
-//					lineText = lineText.Substring (0, lineText.Length - pair.Key.Length);
-//					
-//					int nameStart = lineText.LastIndexOfAny (allowedCharsMinusColon) + 1;
-//					string itemName = lineText.Substring (nameStart).Trim ();
-//					
-//					if (string.IsNullOrEmpty (itemName))
-//						return null;
-//					
-//					return pair.Value (this, pair.Key, itemName);
-//				}
-//			}
-//			
-//			return null;
-//		}
-		
-		public override ICompletionDataList CodeCompletionCommand (
-		    CodeCompletionContext completionContext)
-		{
-			int pos = completionContext.TriggerOffset;
-			string lineText = Editor.GetLineText (Editor.Caret.Line).Trim();
-			
-			foreach (KeyValuePair<string, GetMembersForExtension> pair in completionExtensions) {
-				if(lineText.EndsWith(pair.Key)) {
-					int triggerWordLength = completionContext.TriggerWordLength;
-					return HandleCodeCompletion (completionContext, Editor.GetCharAt (pos), ref triggerWordLength);
-				}
-			}
-
-			return GlobalComplete ();
-		}
-		
-		/// <summary>
-		/// Gets contained members for a namespace or class
-		/// </summary>
-		/// <param name="self">
-		/// The current CTextEditorExtension
-		/// <see cref="CTextEditorExtension"/>
-		/// </param>
-		/// <param name="completionExtension">
-		/// The extension that triggered the completion 
-		/// (e.g. "::")
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <param name="completionText">
-		/// The identifier that triggered the completion
-		/// (e.g. "Foo::")
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// Completion data for the namespace or class
-		/// <see cref="CompletionDataList"/>
-		/// </returns>
-		private static CompletionDataList GetItemMembers (CTextEditorExtension self, string completionExtension, string completionText) {
-			return self.GetMembersOfItem (completionText);
-		}
-		
-		/// <summary>
-		/// Gets contained members for an instance
-		/// </summary>
-		/// <param name="self">
-		/// The current CTextEditorExtension
-		/// <see cref="CTextEditorExtension"/>
-		/// </param>
-		/// <param name="completionExtension">
-		/// The extension that triggered the completion 
-		/// (e.g. "->")
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <param name="completionText">
-		/// The identifier that triggered the completion
-		/// (e.g. "blah->")
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// Completion data for the instance
-		/// <see cref="CompletionDataList"/>
-		/// </returns>
-		private static CompletionDataList GetInstanceMembers (CTextEditorExtension self, string completionExtension, string completionText) {
-			return self.GetMembersOfInstance (completionText, ("->" == completionExtension));
-		}
-		
-		private CompletionDataList GetMembersOfItem (string itemFullName)
-		{
-			CProject project = Document.Project as CProject;
-			
-			if (project == null)
-				return null;
-				
-			ProjectInformation info = ProjectInformationManager.Instance.Get (project);
-			CompletionDataList list = new CompletionDataList ();
-			list.AutoSelect = false;
-			
-			LanguageItem container = null;
-			
-			string currentFileName = Document.FileName;
-			bool in_project = false;
-				
-			foreach (LanguageItem li in info.Containers ()) {
-				if (itemFullName == li.FullName) {
-					container = li;
-					in_project = true;
-				}
-			}
-			
-			if (!in_project && info.IncludedFiles.ContainsKey (currentFileName)) {
-				foreach (CBinding.Parser.FileInformation fi in info.IncludedFiles[currentFileName]) {
-					foreach (LanguageItem li in fi.Containers ()) {
-						if (itemFullName == li.FullName)
-							container = li;
-					}
-				}
-			}
-			
-			if (container == null)
-				return null;
-			
-			if (in_project) {
-				AddItemsWithParent (list, info.AllItems (), container);
-			} else {
-				foreach (CBinding.Parser.FileInformation fi in info.IncludedFiles[currentFileName]) {
-					AddItemsWithParent (list, fi.AllItems (), container);
-				}
-			}
-			
-			return list;
-		}
-		
-		/// <summary>
-		/// Adds completion data for children to a list
-		/// </summary>
-		/// <param name="list">
-		/// The list to which completion data will be added
-		/// <see cref="CompletionDataList"/>
-		/// </param>
-		/// <param name="items">
-		/// A list of items to search
-		/// <see cref="IEnumerable"/>
-		/// </param>
-		/// <param name="parent">
-		/// The parent that will be matched
-		/// </param>
-		public static void AddItemsWithParent(CompletionDataList list, IEnumerable<LanguageItem> items, LanguageItem parent) {
-			foreach (LanguageItem li in items) {
-				if (li.Parent != null && li.Parent.Equals (parent))
-					list.Add (new CompletionData (li));
-			}
-		}
-
-		
-		/// <summary>
-		/// Gets completion data for a given instance
-		/// </summary>
-		/// <param name="instanceName">
-		/// The identifier of the instance
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <param name="isPointer">
-		/// Whether the instance in question is a pointer
-		/// <see cref="System.Boolean"/>
-		/// </param>
-		/// <returns>
-		/// Completion data for the instance
-		/// <see cref="CompletionDataList"/>
-		/// </returns>
-		private CompletionDataList GetMembersOfInstance (string instanceName, bool isPointer)
-		{
-			CProject project = Document.Project as CProject;
-			
-			if (project == null)
-				return null;
-				
-			ProjectInformation info = ProjectInformationManager.Instance.Get (project);
-			CompletionDataList list = new CompletionDataList ();
-			list.AutoSelect = false;
-			
-			string container = null;
-			
-			string currentFileName = Document.FileName;
-			bool in_project = false;
-			
-			// Find the typename of the instance
-			foreach (Member li in info.Members ) {
-				if (instanceName == li.Name && li.IsPointer == isPointer) {
-					container = li.InstanceType;
-					in_project = true;
-					break;
-				}
-			}
-			
-			// Search included files
-			if (!in_project && info.IncludedFiles.ContainsKey (currentFileName)) {
-				foreach (CBinding.Parser.FileInformation fi in info.IncludedFiles[currentFileName]) {
-					foreach (Member li in fi.Members) {
-						if (instanceName == li.Name && li.IsPointer == isPointer) {
-							container = li.InstanceType;
-							break;
-						}
-					}
-				}
-			}
-			
-			if (null == container) {
-				// Search locals
-				foreach (Local li in info.Locals ) {
-					if (instanceName == li.Name && li.IsPointer == isPointer && currentFileName == li.File) {
-						container = li.InstanceType;
-						in_project = true;
-						break;
-					}
-				}
-			}
-			
-			// Not found
-			if (container == null)
-				return null;
-			
-			// Get the LanguageItem corresponding to the typename 
-			// and populate completion data accordingly
-			if (in_project) {
-				AddMembersWithParent (list, info.InstanceMembers (), container);
-			} else {
-				foreach (CBinding.Parser.FileInformation fi in info.IncludedFiles[currentFileName]) {
-					AddMembersWithParent (list, fi.InstanceMembers (), container);
-				}
-			}
-			
-			return list;
-		}
-		
-		/// <summary>
-		/// Adds completion data for children to a list
-		/// </summary>
-		/// <param name="list">
-		/// The list to which completion data will be added
-		/// <see cref="CompletionDataList"/>
-		/// </param>
-		/// <param name="items">
-		/// A list of items to search
-		/// <see cref="IEnumerable"/>
-		/// </param>
-		/// <param name="parentName">
-		/// The name of the parent that will be matched
-		/// <see cref="System.String"/>
-		/// </param>
-		public static void AddMembersWithParent(CompletionDataList list, IEnumerable<LanguageItem> items, string parentName) {
-				foreach (LanguageItem li in items) {
-					if (li.Parent != null && li.Parent.Name.EndsWith (parentName))
-						list.Add (new CompletionData (li));
-				}
-		}
-
-		private ICompletionDataList GlobalComplete ()
-		{
-			CProject project = Document.Project as CProject;
-			
-			if (project == null)
-				return null;
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (project);
-			
-			CompletionDataList list = new CompletionDataList ();
-			list.AutoSelect = false;
-			
-			foreach (LanguageItem li in info.Containers ())
-				if (li.Parent == null)
-					list.Add (new CompletionData (li));
-			
-			foreach (Function f in info.Functions)
-				if (f.Parent == null)
-					list.Add (new CompletionData (f));
-
-			foreach (Enumerator e in info.Enumerators)
-				list.Add (new CompletionData (e));
-			
-			foreach (Macro m in info.Macros)
-				list.Add (new CompletionData (m));
-			
-			string currentFileName = Document.FileName;
-			
-			if (info.IncludedFiles.ContainsKey (currentFileName)) {
-				foreach (CBinding.Parser.FileInformation fi in info.IncludedFiles[currentFileName]) {
-					foreach (LanguageItem li in fi.Containers ())
-						if (li.Parent == null)
-							list.Add (new CompletionData (li));
-					
-					foreach (Function f in fi.Functions)
-						if (f.Parent == null)
-							list.Add (new CompletionData (f));
-
-					foreach (Enumerator e in fi.Enumerators)
-						list.Add (new CompletionData (e));
-					
-					foreach (Macro m in fi.Macros)
-						list.Add (new CompletionData (m));
-				}
-			}
-			
-			return list;
-		}
-		
-		public override  MonoDevelop.Ide.CodeCompletion.ParameterDataProvider HandleParameterCompletion (
-		    CodeCompletionContext completionContext, char completionChar)
-		{
-			if (completionChar != '(')
-				return null;
-			
-			CProject project = Document.Project as CProject;
-			
-			if (project == null)
-				return null;
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (project);
-			string lineText = Editor.GetLineText (Editor.Caret.Line).TrimEnd ();
-			if (lineText.EndsWith (completionChar.ToString (), StringComparison.Ordinal))
-				lineText = lineText.Remove (lineText.Length-1).TrimEnd ();
-			
-			int nameStart = lineText.LastIndexOfAny (allowedChars);
-
-			nameStart++;
-			
-			string functionName = lineText.Substring (nameStart).Trim ();
-			
-			if (string.IsNullOrEmpty (functionName))
-				return null;
-			
-			return new ParameterDataProvider (nameStart, Document, info, functionName);
-		}
-		
-		private bool AllWhiteSpace (string lineText)
-		{
-			// We will almost definately need a faster method than this
-			foreach (char c in lineText)
-				if (!char.IsWhiteSpace (c))
-					return false;
-			
-			return true;
-		}
-		
-		// Snatched from DefaultFormattingStrategy
-		private string GetIndent (TextEditorData d, int lineNumber, int terminateIndex)
-		{
-			string lineText = d.GetLineText (lineNumber);
-			if(terminateIndex > 0)
-				lineText = terminateIndex < lineText.Length ? lineText.Substring(0, terminateIndex) : lineText;
-			
-			StringBuilder whitespaces = new StringBuilder ();
-			
-			foreach (char ch in lineText) {
-				if (!char.IsWhiteSpace (ch))
-					break;
-				whitespaces.Append (ch);
-			}
-			
-			return whitespaces.ToString ();
-		}
-		
-		[CommandHandler (MonoDevelop.DesignerSupport.Commands.SwitchBetweenRelatedFiles)]
-		protected void Run ()
-		{
-			var cp = this.Document.Project as CProject;
-			if (cp != null) {
-				string match = cp.MatchingFile (this.Document.FileName);
-				if (match != null)
-					MonoDevelop.Ide.IdeApp.Workbench.OpenDocument (match, true);
-			}
-		}
-		
-		[CommandUpdateHandler (MonoDevelop.DesignerSupport.Commands.SwitchBetweenRelatedFiles)]
-		protected void Update (CommandInfo info)
-		{
-			var cp = this.Document.Project as CProject;
-			info.Visible = info.Visible = cp != null && cp.MatchingFile (this.Document.FileName) != null;
-		}
-		
-		#region IPathedDocument implementation
-		
-		public event EventHandler<DocumentPathChangedEventArgs> PathChanged;
-		
-		public Gtk.Widget CreatePathWidget (int index)
-		{
-			PathEntry[] path = CurrentPath;
-			if (null == path || 0 > index || path.Length <= index) {
-				return null;
-			}
-			
-			object tag = path[index].Tag;
-			DropDownBoxListWindow.IListDataProvider provider = null;
-			if (tag is ParsedDocument) {
-				provider = new CompilationUnitDataProvider (Document);
-			} else {
-				provider = new DataProvider (Document, tag, GetAmbience ());
-			}
-			
-			DropDownBoxListWindow window = new DropDownBoxListWindow (provider);
-			window.SelectItem (tag);
-			return window;
-		}
-
-		public PathEntry[] CurrentPath {
-			get;
-			private set;
-		}
-		
-		protected virtual void OnPathChanged (DocumentPathChangedEventArgs args)
-		{
-			if (PathChanged != null)
-				PathChanged (this, args);
-		}
-		
-		#endregion
-		
-		// Yoinked from C# binding
-		void UpdatePath (object sender, Mono.TextEditor.DocumentLocationEventArgs e)
-		{
-	/*		var unit = Document.ParsedDocument;
-			if (unit == null)
-				return;
-			
-			var loc = Document.Editor.Caret.Location;
-			
-			var result = new List<PathEntry> ();
-			var amb = GetAmbience ();
-			var type = unit.GetInnermostTypeDefinition (loc.Line, loc.Column) ?? unit.TopLevelTypeDefinitions.FirstOrDefault ();
-			var curType = type;
-			object lastTag = unit;
-			while (curType != null) {
-				var markup = amb.GetString ((IEntity)curType, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates | OutputFlags.IncludeMarkup);
-				result.Insert (0, new PathEntry (ImageService.GetPixbuf (type.GetStockIcon (), Gtk.IconSize.Menu), curType.IsObsolete () ? "<s>" + markup + "</s>" : markup) { Tag = lastTag });
-				lastTag = curType;
-				curType = curType.DeclaringTypeDefinition;
-			}
-			
-			var member = type.Members.FirstOrDefault (m => m.Region.IsInside (loc.Line, loc.Column));
-			if (member != null) {
-				var ctx = Document.ParsedDocument.ParsedFile.GetTypeResolveContext (Document.Compilation, member.Region.Begin);;
-				var markup = amb.GetString (member.CreateResolved (ctx), OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates | OutputFlags.IncludeMarkup);
-				result.Add (new PathEntry (ImageService.GetPixbuf (member.GetStockIcon (), Gtk.IconSize.Menu), member.IsObsolete () ? "<s>" + markup + "</s>" : markup) { Tag = lastTag });
-			}
-			
-			PathEntry noSelection = null;
-			if (type == null) {
-				noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = unit };
-			} else if (member == null && type.Kind != TypeKind.Delegate) 
-				noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = type };
-			if (noSelection != null) 
-				result.Add (noSelection);
-			var prev = CurrentPath;
-			CurrentPath = result.ToArray ();
-			OnPathChanged (new DocumentPathChangedEventArgs (prev));*/
-		}
-		
-		public override void Initialize ()
-		{
-			base.Initialize ();
-			textEditorData = Document.Editor;
-			UpdatePath (null, null);
-			textEditorData.Caret.PositionChanged += UpdatePath;
-			Document.DocumentParsed += delegate { UpdatePath (null, null); };
-		}
-		
-		/// <summary>
-		/// Move the completion trigger offset to the beginning of the current token
-		/// </summary>
-		protected virtual int ResetTriggerOffset (CodeCompletionContext completionContext)
-		{
-			int i = completionContext.TriggerOffset;
-			if (i >= Editor.Length)
-				return 0;
-			int accumulator = 0;
-			
-			for (;
-			     1 < i && char.IsLetterOrDigit (Editor.GetCharAt (i));
-			     --i, ++accumulator);
-			completionContext.TriggerOffset = i-1;
-			return accumulator+1;
-		}// ResetTriggerOffset
-
-		[CommandHandler (MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration)]
-		public void GotoDeclaration ()
-		{
-			LanguageItem item = GetLanguageItemAt (Editor.Caret.Location);
-			if (item != null)
-				IdeApp.Workbench.OpenDocument ((FilePath)item.File, (int)item.Line, 1);
-		}
-		
-		[CommandUpdateHandler (MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration)]
-		public void CanGotoDeclaration (CommandInfo item)
-		{
-			item.Visible = (GetLanguageItemAt (Editor.Caret.Location) != null);
-			item.Bypass = !item.Visible;
-		}
-		
-		private LanguageItem GetLanguageItemAt (DocumentLocation location)
-		{
-			CProject project = Document.Project as CProject;
-			string token = GetTokenAt (location);
-			if (project != null && !string.IsNullOrEmpty (token)) {
-				ProjectInformation info = ProjectInformationManager.Instance.Get (project);
-				return info.AllItems ().FirstOrDefault (i => i.Name.Equals (token, StringComparison.Ordinal));
-			}
-			
-			return null;
-		}
-		
-		private string GetTokenAt (DocumentLocation location)
-		{
-			int lineOffset = location.Column-1;
-			string line = Editor.GetLineText (location.Line);
-			if (line.Length == 0)
-				return "";
-			if (lineOffset >= line.Length)
-				lineOffset = line.Length - 1;
-			int first = line.LastIndexOfAny (allowedChars, lineOffset) + 1;
-			int last = line.IndexOfAny (allowedChars, lineOffset);
-			if (last < 0) last = line.Length - 1;
-			string token = string.Empty;
-			    
-			if (first >= 0 && first < last && last < line.Length) {
-				token = line.Substring (first, last-first);
-			}
-			return token.Trim ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Gui/CodeGenerationPanel.cs b/main/src/addins/CBinding/Gui/CodeGenerationPanel.cs
deleted file mode 100644
index 6740df3b2e..0000000000
--- a/main/src/addins/CBinding/Gui/CodeGenerationPanel.cs
+++ /dev/null
@@ -1,369 +0,0 @@
-//
-// CodeGenerationPanel.cs: Code generation panel to configure project
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Components;
-using MonoDevelop.Ide;
-
-namespace CBinding
-{
-	public partial class CodeGenerationPanel : Gtk.Bin
-	{
-		private CProjectConfiguration configuration;
-		private Gtk.ListStore libStore = new Gtk.ListStore (typeof(string));
-		private Gtk.ListStore libPathStore = new Gtk.ListStore (typeof(string));
-		private Gtk.ListStore includePathStore = new Gtk.ListStore (typeof(string));
-		
-		static string[,] quickPathInsertMenu = new string[,] {
-			{GettextCatalog.GetString ("_Project Directory"), "${ProjectDir}"},
-			{GettextCatalog.GetString ("_Root Solution Directory"), "${CombineDir}"},
-		};
-		
-		public CodeGenerationPanel ()
-		{
-			this.Build ();
-			
-			Gtk.CellRendererText textRenderer = new Gtk.CellRendererText ();
-			
-			libTreeView.Model = libStore;
-			libTreeView.HeadersVisible = false;
-			libTreeView.AppendColumn ("Library", textRenderer, "text", 0);
-			
-			libPathTreeView.Model = libPathStore;
-			libPathTreeView.HeadersVisible = false;
-			libPathTreeView.AppendColumn ("Library", textRenderer, "text", 0);
-			
-			includePathTreeView.Model = includePathStore;
-			includePathTreeView.HeadersVisible = false;
-			includePathTreeView.AppendColumn ("Include", textRenderer, "text", 0);
-			
-			new MenuButtonEntry (libPathEntry, quickInsertLibButton, quickPathInsertMenu);
-			new MenuButtonEntry (includePathEntry, quickInsertIncludeButton, quickPathInsertMenu);
-		}
-		
-		public void Load (CProjectConfiguration config)
-		{
-			configuration = config;
-			
-			switch (configuration.WarningLevel)
-			{
-			case WarningLevel.None:
-				noWarningRadio.Active = true;
-				break;
-			case WarningLevel.Normal:
-				normalWarningRadio.Active = true;
-				break;
-			case WarningLevel.All:
-				allWarningRadio.Active = true;
-				break;
-			}
-			
-			warningsAsErrorsCheckBox.Active = configuration.WarningsAsErrors;
-			
-			optimizationSpinButton.Value = configuration.OptimizationLevel;
-			
-			switch (configuration.CompileTarget)
-			{
-			case CBinding.CompileTarget.Bin:
-				targetComboBox.Active = 0;
-				break;
-			case CBinding.CompileTarget.StaticLibrary:
-				targetComboBox.Active = 1;
-				break;
-			case CBinding.CompileTarget.SharedLibrary:
-				targetComboBox.Active = 2;
-				break;
-			}
-			
-			extraCompilerTextView.Buffer.Text = configuration.ExtraCompilerArguments;
-			
-			extraLinkerTextView.Buffer.Text = configuration.ExtraLinkerArguments;
-			
-			defineSymbolsTextEntry.Text = configuration.DefineSymbols;
-			
-			libStore.Clear ();
-			foreach (string lib in configuration.Libs)
-				libStore.AppendValues (lib);
-			
-			libPathStore.Clear ();
-			foreach (string libPath in configuration.LibPaths)
-				libPathStore.AppendValues (libPath);
-			
-			includePathStore.Clear ();
-			foreach (string includePath in configuration.Includes)
-				includePathStore.AppendValues (includePath);
-		}
-		
-		private void OnIncludePathAdded (object sender, EventArgs e)
-		{
-			if (includePathEntry.Text.Length > 0) {				
-				includePathStore.AppendValues (includePathEntry.Text);
-				includePathEntry.Text = string.Empty;
-			}
-		}
-		
-		private void OnIncludePathRemoved (object sender, EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			includePathTreeView.Selection.GetSelected (out iter);
-			includePathStore.Remove (ref iter);
-		}
-		
-		private void OnLibPathAdded (object sender, EventArgs e)
-		{
-			if (libPathEntry.Text.Length > 0) {
-				libPathStore.AppendValues (libPathEntry.Text);
-				libPathEntry.Text = string.Empty;
-			}
-		}
-		
-		private void OnLibPathRemoved (object sender, EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			libPathTreeView.Selection.GetSelected (out iter);
-			libPathStore.Remove (ref iter);
-		}
-		
-		private void OnLibAdded (object sender, EventArgs e)
-		{
-			if (libAddEntry.Text.Length > 0) {				
-				libStore.AppendValues (libAddEntry.Text);
-				libAddEntry.Text = string.Empty;
-			}
-		}
-		
-		private void OnLibRemoved (object sender, EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			libTreeView.Selection.GetSelected (out iter);
-			libStore.Remove (ref iter);
-		}
-		
-		// TODO: This is platform specific... the C Binding should have a global list of 'standard' library dirs...
-		internal const string DEFAULT_LIB_DIR = "/usr/lib";
-		internal const string DEFAULT_INCLUDE_DIR = "/usr/lib";
-		internal const string STATIC_LIB_FILTER = "*.a";
-		internal const string DYNAMIC_LIB_FILTER = "*.so";
-		
-		private void OnBrowseButtonClick (object sender, EventArgs e)
-		{
-			var dialog = new MonoDevelop.Components.SelectFileDialog (GettextCatalog.GetString ("Add Library")) {
-				TransientFor = (Gtk.Window) Toplevel,
-				CurrentFolder = DEFAULT_LIB_DIR,
-			};
-			
-			dialog.AddFilter (GettextCatalog.GetString ("Static Library"), STATIC_LIB_FILTER);
-			dialog.AddFilter (GettextCatalog.GetString ("Dynamic Library"), DYNAMIC_LIB_FILTER);
-			dialog.AddAllFilesFilter ();
-			
-			if (dialog.Run ())
-				libAddEntry.Text = dialog.SelectedFile;
-		}
-		
-		private void OnIncludePathBrowseButtonClick (object sender, EventArgs e)
-		{
-			var dialog = new MonoDevelop.Components.SelectFolderDialog (GettextCatalog.GetString ("Add Path")) {
-				TransientFor = (Gtk.Window) Toplevel,
-				CurrentFolder = DEFAULT_INCLUDE_DIR,
-			};
-			
-			if (dialog.Run ())
-				includePathEntry.Text = dialog.SelectedFile;
-		}
-		
-		private void OnLibPathBrowseButtonClick (object sender, EventArgs e)
-		{
-			var dialog = new MonoDevelop.Components.SelectFolderDialog (GettextCatalog.GetString ("Add Path")) {
-				TransientFor = (Gtk.Window) Toplevel,
-				CurrentFolder = DEFAULT_LIB_DIR,
-			};
-			
-			if (dialog.Run ())
-				libPathEntry.Text = dialog.SelectedFile;
-		}
-		
-		public bool Store ()
-		{
-			if (configuration == null)
-				return false;
-			
-			string line;
-			Gtk.TreeIter iter;
-			
-			if (noWarningRadio.Active)
-				configuration.WarningLevel = WarningLevel.None;
-			else if (normalWarningRadio.Active)
-				configuration.WarningLevel = WarningLevel.Normal;
-			else
-				configuration.WarningLevel = WarningLevel.All;
-			
-			configuration.WarningsAsErrors = warningsAsErrorsCheckBox.Active;
-			
-			configuration.OptimizationLevel = (int)optimizationSpinButton.Value;
-			
-			switch (targetComboBox.ActiveText)
-			{
-			case "Executable":
-				configuration.CompileTarget = CBinding.CompileTarget.Bin;
-				break;
-			case "Static Library":
-				configuration.CompileTarget = CBinding.CompileTarget.StaticLibrary;
-				break;
-			case "Shared Object":
-				configuration.CompileTarget = CBinding.CompileTarget.SharedLibrary;
-				break;
-			}
-			
-			configuration.ExtraCompilerArguments = extraCompilerTextView.Buffer.Text;
-			
-			configuration.ExtraLinkerArguments = extraLinkerTextView.Buffer.Text;
-			
-			configuration.DefineSymbols = defineSymbolsTextEntry.Text;
-			
-			libStore.GetIterFirst (out iter);
-			configuration.Libs.Clear ();
-			while (libStore.IterIsValid (iter)) {
-				line = (string)libStore.GetValue (iter, 0);
-				configuration.Libs.Add (line);
-				libStore.IterNext (ref iter);
-			}
-			
-			libPathStore.GetIterFirst (out iter);
-			configuration.LibPaths.Clear ();
-			while (libPathStore.IterIsValid (iter)) {
-				line = (string)libPathStore.GetValue (iter, 0);
-				configuration.LibPaths.Add (line);
-				libPathStore.IterNext (ref iter);
-			}
-			
-			includePathStore.GetIterFirst (out iter);
-			configuration.Includes.Clear ();
-			while (includePathStore.IterIsValid (iter)) {
-				line = (string)includePathStore.GetValue (iter, 0);
-				configuration.Includes.Add (line);
-				includePathStore.IterNext (ref iter);
-			}
-			
-			return true;
-		}
-
-		protected virtual void OnLibAddEntryChanged (object sender, EventArgs e)
-		{
-			if (string.IsNullOrEmpty (libAddEntry.Text))
-			    addLibButton.Sensitive = false;
-			else
-			    addLibButton.Sensitive = true;
-		}
-
-		protected virtual void OnLibTreeViewCursorChanged (object sender, System.EventArgs e)
-		{
-			removeLibButton.Sensitive = true;
-		}
-
-		protected virtual void OnRemoveLibButtonClicked (object sender, System.EventArgs e)
-		{
-			removeLibButton.Sensitive = false;
-		}
-
-		protected virtual void OnIncludePathEntryChanged (object sender, System.EventArgs e)
-		{
-			if (string.IsNullOrEmpty (includePathEntry.Text))
-			    includePathAddButton.Sensitive = false;
-			else
-			    includePathAddButton.Sensitive = true;
-		}
-
-		protected virtual void OnLibPathEntryChanged (object sender, System.EventArgs e)
-		{
-			if (string.IsNullOrEmpty (libPathEntry.Text))
-			    libPathAddButton.Sensitive = false;
-			else
-			    libPathAddButton.Sensitive = true;
-		}
-
-		protected virtual void OnIncludePathTreeViewCursorChanged (object sender, System.EventArgs e)
-		{
-			includePathRemoveButton.Sensitive = true;
-		}
-
-		protected virtual void OnIncludePathRemoveButtonClicked (object sender, System.EventArgs e)
-		{
-			includePathRemoveButton.Sensitive = false;
-		}
-		
-		protected virtual void OnLibPathTreeViewCursorChanged (object sender, System.EventArgs e)
-		{
-			libPathRemoveButton.Sensitive = true;
-		}
-
-		protected virtual void OnLibPathRemoveButtonClicked (object sender, System.EventArgs e)
-		{
-			libPathRemoveButton.Sensitive = false;
-		}
-
-		protected virtual void OnLibAddEntryActivated (object sender, System.EventArgs e)
-		{
-			OnLibAdded (this, new EventArgs ());
-		}
-
-		protected virtual void OnIncludePathEntryActivated (object sender, System.EventArgs e)
-		{
-			OnIncludePathAdded (this, new EventArgs ());
-		}
-
-		protected virtual void OnLibPathEntryActivated (object sender, System.EventArgs e)
-		{
-			OnLibPathAdded (this, new EventArgs ());
-		}
-	}
-	
-	public class CodeGenerationPanelBinding : MultiConfigItemOptionsPanel
-	{
-		private CodeGenerationPanel panel;
-		
-		public override Gtk.Widget CreatePanelWidget ()
-		{
-			return panel = new CodeGenerationPanel ();
-		}
-		
-		public override void LoadConfigData ()
-		{
-			panel.Load ((CProjectConfiguration) CurrentConfiguration);
-		}
-		
-		public override void ApplyChanges ()
-		{
-			panel.Store ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Gui/CompilerPanel.cs b/main/src/addins/CBinding/Gui/CompilerPanel.cs
deleted file mode 100644
index 4beaa0e61a..0000000000
--- a/main/src/addins/CBinding/Gui/CompilerPanel.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-// CompilerPanel.cs: Allows the user to select what compiler to use for their project
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Ide;
-
-namespace CBinding
-{
-	public partial class CompilerPanel : Gtk.Bin
-	{
-		private CProject project;
-		private object[] compilers;
-		private ICompiler active_compiler;
-		
-		public CompilerPanel (CProject project)
-		{
-			this.Build ();
-			
-			this.project = project;
-			
-			compilers = AddinManager.GetExtensionObjects ("/CBinding/Compilers");
-			
-			foreach (ICompiler compiler in compilers) {
-				compilerComboBox.AppendText (compiler.Name);
-			}
-			
-			int active = 0;
-			Gtk.TreeIter iter;
-			Gtk.ListStore store = (Gtk.ListStore)compilerComboBox.Model;
-			store.GetIterFirst (out iter);
-			while (store.IterIsValid (iter)) {
-				if ((string)store.GetValue (iter, 0) == project.Compiler.Name) {
-					break;
-				}
-				store.IterNext (ref iter);
-				active++;
-			}
-
-			compilerComboBox.Active = active;
-			
-			useCcacheCheckBox.Active = ((CProjectConfiguration)project.GetConfiguration (IdeApp.Workspace.ActiveConfiguration)).UseCcache;
-			
-			Update ();
-		}
-		
-		public void Store ()
-		{
-			if (project == null)
-				return;
-			
-			if (!active_compiler.Equals (project.Compiler)) {
-				project.Compiler = active_compiler;
-				project.Language = active_compiler.Language;
-			}
-			
-			// Update use_ccache for all configurations
-			foreach (CProjectConfiguration conf in project.Configurations)
-				conf.UseCcache = useCcacheCheckBox.Active;
-		}
-
-		protected virtual void OnCompilerComboBoxChanged (object sender, EventArgs e)
-		{
-			Update ();
-		}
-		
-		private void Update ()
-		{
-			foreach (ICompiler compiler in compilers) {
-				if (compilerComboBox.ActiveText == compiler.Name) {
-					active_compiler = compiler;
-					break;
-				}
-			}
-			
-			if (active_compiler.SupportsCcache)
-				useCcacheCheckBox.Sensitive = true;
-			else
-				useCcacheCheckBox.Sensitive = false;
-		}
-	}
-	
-	public class CompilerPanelBinding : ItemOptionsPanel
-	{
-		CompilerPanel panel;
-		
-		public override Gtk.Widget CreatePanelWidget ()
-		{
-			return panel = new CompilerPanel ((CProject)ConfiguredProject);
-		}
-		
-		public override void ApplyChanges ()
-		{
-			panel.Store ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Gui/DataProvider.cs b/main/src/addins/CBinding/Gui/DataProvider.cs
deleted file mode 100644
index 1027c44d44..0000000000
--- a/main/src/addins/CBinding/Gui/DataProvider.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-//
-// DataProvider.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
- 
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.CodeCompletion;
-
-using CBinding.Parser;
-using MonoDevelop.Core;
-using ICSharpCode.NRefactory.Completion;
-
-namespace CBinding
-{
-	public class ParameterDataProvider : MonoDevelop.Ide.CodeCompletion.ParameterDataProvider
-	{
-		private Mono.TextEditor.TextEditorData editor;
-		private List<Function> functions = new List<Function> ();
-
-		public ParameterDataProvider (int startOffset, Document document, ProjectInformation info, string functionName) :base (startOffset)
-		{
-			this.editor = document.Editor;
-			
-			foreach (Function f in info.Functions) {
-				if (f.Name == functionName) {
-					functions.Add (f);
-				}
-			}
-			
-			string currentFile = document.FileName;
-			
-			if (info.IncludedFiles.ContainsKey (currentFile)) {
-				foreach (CBinding.Parser.FileInformation fi in info.IncludedFiles[currentFile]) {
-					foreach (Function f in fi.Functions) {
-						if (f.Name == functionName) {
-							functions.Add (f);
-						}
-					}
-				}
-			}
-		}
-		
-		// Returns the number of methods
-		public override int Count {
-			get { return functions.Count; }
-		}
-		
-		// Returns the index of the parameter where the cursor is currently positioned.
-		// -1 means the cursor is outside the method parameter list
-		// 0 means no parameter entered
-		// > 0 is the index of the parameter (1-based)
-		public int GetCurrentParameterIndex (ICompletionWidget widget, CodeCompletionContext ctx)
-		{
-			int cursor = widget.CurrentCodeCompletionContext.TriggerOffset;
-			int i = ctx.TriggerOffset;
-			if (i < 0 || i >= editor.Length || editor.GetCharAt (i) == ')')
-				return -1;
-			
-			if (i > cursor)
-				return -1;
-			else if (i == cursor)
-				return 0;
-			
-			int parameterIndex = 1;
-			
-			while (i++ < cursor) {
-				if (i >= widget.TextLength)
-					break;
-				char ch = widget.GetChar (i);
-				if (ch == ',')
-					parameterIndex++;
-				else if (ch == ')')
-					return -1;
-			}
-			
-			return parameterIndex;
-		}
-		
-		// Returns the markup to use to represent the specified method overload
-		// in the parameter information window.
-		public string GetHeading (int overload, string[] parameterMarkup, int currentParameter)
-		{
-			Function function = functions[overload];
-			string paramTxt = string.Join (", ", parameterMarkup);
-			
-			int len = function.FullName.LastIndexOf ("::");
-			string prename = null;
-			
-			if (len > 0)
-				prename = GLib.Markup.EscapeText (function.FullName.Substring (0, len + 2));
-			
-			string cons = string.Empty;
-			
-			if (function.IsConst)
-				cons = " const";
-			
-			return prename + "<b>" + function.Name + "</b>" + " (" + paramTxt + ")" + cons;
-		}
-		
-		public string GetDescription (int overload, int currentParameter)
-		{
-			return "";
-		}
-		
-		// Returns the text to use to represent the specified parameter
-		public string GetParameterDescription (int overload, int paramIndex)
-		{
-			Function function = functions[overload];
-			
-			return GLib.Markup.EscapeText (function.Parameters[paramIndex]);
-		}
-		
-		// Returns the number of parameters of the specified method
-		public override int GetParameterCount (int overload)
-		{
-			return functions[overload].Parameters.Length;
-		}
-		public override string GetParameterName (int overload, int paramIndex)
-		{
-			return "";
-		}
-		public override bool AllowParameterList (int overload)
-		{
-			return false;
-		}
-	}
-	
-	public class CompletionData : MonoDevelop.Ide.CodeCompletion.CompletionData
-	{
-		private IconId image;
-		private string text;
-		private string description;
-		private string completion_string;
-		
-		public CompletionData (LanguageItem item)
-		{
-			if (item is Class)
-				image = Stock.Class;
-			else if (item is Structure)
-				image = Stock.Struct;
-			else if (item is Union)
-				image = "md-union";
-			else if (item is Enumeration)
-				image = Stock.Enum;
-			else if (item is Enumerator)
-				image = Stock.Literal;
-			else if (item is Function)
-				image = Stock.Method;
-			else if (item is Namespace)
-				image = Stock.NameSpace;
-			else if (item is Typedef)
-				image = Stock.Interface;
-			else if (item is Member)
-				image = Stock.Field;
-			else if (item is Variable)
-				image = Stock.Field;
-			else if (item is Macro)
-				image = Stock.Literal;
-			else
-				image = Stock.Literal;
-			
-			this.text = item.Name;
-			this.completion_string = item.Name;
-			this.description = string.Empty;
-		}
-		
-		public override IconId Icon {
-			get { return image; }
-		}
-		
-		public override string DisplayText {
-			get { return text; }
-		}
-		
-		public override string Description {
-			get { return description; }
-		}
-		
-		public override string CompletionText {
-			get { return completion_string; }
-		}
-	}
-
-}
diff --git a/main/src/addins/CBinding/Gui/EditPackagesDialog.cs b/main/src/addins/CBinding/Gui/EditPackagesDialog.cs
deleted file mode 100644
index d7cd1f8adb..0000000000
--- a/main/src/addins/CBinding/Gui/EditPackagesDialog.cs
+++ /dev/null
@@ -1,569 +0,0 @@
-//
-// EditPackagesDialog.cs: Allows you to add and remove pkg-config packages to the project
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-using MonoDevelop.Components;
-
-namespace CBinding
-{
-	public partial class EditPackagesDialog : Gtk.Dialog
-	{
-		private Gtk.ListStore normalPackageListStore = new Gtk.ListStore (typeof(bool), typeof(string), typeof(string));
-		private Gtk.ListStore projectPackageListStore = new Gtk.ListStore (typeof(bool), typeof(string), typeof(string));
-		private Gtk.ListStore selectedPackageListStore = new Gtk.ListStore (typeof(string), typeof(string));
-		private CProject project;
-		private ProjectPackageCollection selectedPackages = new ProjectPackageCollection ();
-		private List<Package> packagesOfProjects;
-		private List<Package> packages = new List<Package> ();		
-		
-		// Column IDs
-		const int NormalPackageToggleID = 0;
-		const int NormalPackageNameID = 1;
-		const int NormalPackageVersionID = 2;
-		
-		const int ProjectPackageToggleID = 0;
-		const int ProjectPackageNameID = 1;
-		const int ProjectPackageVersionID = 2;
-		
-		const int SelectedPackageNameID = 0;
-		const int SelectedPackageVersionID = 1;
-		
-		public EditPackagesDialog(CProject project)
-		{
-			this.Build();
-			
-			this.project = project;
-			
-			selectedPackages.Project = project;
-			selectedPackages.AddRange (project.Packages);
-			
-			Gtk.CellRendererText textRenderer = new Gtk.CellRendererText ();
-			
-			CellRendererImage pixbufRenderer = new CellRendererImage ();
-			pixbufRenderer.StockId = "md-package";
-			
-			normalPackageListStore.DefaultSortFunc = NormalPackageCompareNodes;
-			projectPackageListStore.DefaultSortFunc = ProjectPackageCompareNodes;
-			selectedPackageListStore.DefaultSortFunc = SelectedPackageCompareNodes;
-			
-			normalPackageListStore.SetSortColumnId (NormalPackageNameID, Gtk.SortType.Ascending);
-			projectPackageListStore.SetSortColumnId (ProjectPackageNameID, Gtk.SortType.Ascending);
-			selectedPackageListStore.SetSortColumnId (SelectedPackageNameID, Gtk.SortType.Ascending);
-			
-			normalPackageTreeView.SearchColumn = NormalPackageNameID;
-			projectPackageTreeView.SearchColumn = ProjectPackageNameID;
-			selectedPackageTreeView.SearchColumn = SelectedPackageNameID;
-			
-			// <!-- Normal packages -->
-			
-			Gtk.CellRendererToggle normalPackageToggleRenderer = new Gtk.CellRendererToggle ();
-			normalPackageToggleRenderer.Activatable = true;
-			normalPackageToggleRenderer.Toggled += OnNormalPackageToggled;
-			normalPackageToggleRenderer.Xalign = 0;
-			
-			Gtk.TreeViewColumn normalPackageColumn = new Gtk.TreeViewColumn ();
-			normalPackageColumn.Title = "Package";
-			normalPackageColumn.PackStart (pixbufRenderer, false);
-			normalPackageColumn.PackStart (textRenderer, true);
-			normalPackageColumn.AddAttribute (textRenderer, "text", NormalPackageNameID);
-			
-			normalPackageTreeView.Model = normalPackageListStore;
-			normalPackageTreeView.HeadersVisible = true;
-			normalPackageTreeView.AppendColumn ("", normalPackageToggleRenderer, "active", NormalPackageToggleID);
-			normalPackageTreeView.AppendColumn (normalPackageColumn);
-			normalPackageTreeView.AppendColumn ("Version", textRenderer, "text", NormalPackageVersionID);
-			
-			// <!-- Project packages -->
-			
-			Gtk.CellRendererToggle projectPackageToggleRenderer = new Gtk.CellRendererToggle ();
-			projectPackageToggleRenderer.Activatable = true;
-			projectPackageToggleRenderer.Toggled += OnProjectPackageToggled;
-			projectPackageToggleRenderer.Xalign = 0;
-			
-			Gtk.TreeViewColumn projectPackageColumn = new Gtk.TreeViewColumn ();
-			projectPackageColumn.Title = "Package";
-			projectPackageColumn.PackStart (pixbufRenderer, false);
-			projectPackageColumn.PackStart (textRenderer, true);
-			projectPackageColumn.AddAttribute (textRenderer, "text", ProjectPackageNameID);
-			
-			projectPackageTreeView.Model = projectPackageListStore;
-			projectPackageTreeView.HeadersVisible = true;
-			projectPackageTreeView.AppendColumn ("", projectPackageToggleRenderer, "active", ProjectPackageToggleID);
-			projectPackageTreeView.AppendColumn (projectPackageColumn);
-			projectPackageTreeView.AppendColumn ("Version", textRenderer, "text", ProjectPackageVersionID);
-			
-			
-			// <!-- Selected packages -->
-			
-			Gtk.TreeViewColumn selectedPackageColumn = new Gtk.TreeViewColumn ();
-			selectedPackageColumn.Title = "Package";
-			selectedPackageColumn.PackStart (pixbufRenderer, false);
-			selectedPackageColumn.PackStart (textRenderer, true);
-			selectedPackageColumn.AddAttribute (textRenderer, "text", SelectedPackageNameID);
-			
-			selectedPackageTreeView.Model = selectedPackageListStore;
-			selectedPackageTreeView.HeadersVisible = true;
-			selectedPackageTreeView.AppendColumn (selectedPackageColumn);
-			selectedPackageTreeView.AppendColumn ("Version", textRenderer, "text", SelectedPackageVersionID);
-			
-			// Fill up the project tree view
-			packagesOfProjects = GetPackagesOfProjects (project);
-			
-			foreach (Package p in packagesOfProjects) {
-				if (p.Name == project.Name) continue;
-				
-				packages.Add (p);
-				string version = p.Version;
-				bool inProject = selectedPackages.Contains (p);
-
-				if (!IsPackageInStore (projectPackageListStore, p.Name, version, ProjectPackageNameID, ProjectPackageVersionID)) {
-				    projectPackageListStore.AppendValues (inProject, p.Name, version);
-				
-					if (inProject)
-						selectedPackageListStore.AppendValues (p.Name, version);
-				}
-			}
-			
-			// Fill up the normal tree view
-			foreach (string dir in ScanDirs ()) {
-				if (Directory.Exists (dir)) {	
-					DirectoryInfo di = new DirectoryInfo (dir);
-					FileInfo[] availablePackages = di.GetFiles ("*.pc");
-					
-					foreach (FileInfo f in availablePackages) {
-						if (!IsValidPackage (f.FullName)) { 
-							continue;
-						}
-						
-						Package package = new Package (f.FullName);
-						
-						packages.Add (package);
-						
-						string name = package.Name;
-						string version = package.Version;
-						bool inProject = selectedPackages.Contains (package);
-						
-						if (!IsPackageInStore (normalPackageListStore, name, version, NormalPackageNameID, NormalPackageVersionID)) {
-							normalPackageListStore.AppendValues (inProject, name, version);
-						
-							if (inProject)
-								selectedPackageListStore.AppendValues (name, version);
-						}
-					}
-				}
-			}
-		}
-		
-		private List<Package> GetPackagesOfProjects (Project project)
-		{
-			List<Package> packages = new List<Package>();
-			Package package;
-			
-			foreach (SolutionItem c in project.ParentFolder.Items) {
-				if (null != c && c is CProject) {
-					CProject cproj = (CProject)c;
-					CProjectConfiguration conf = (CProjectConfiguration)cproj.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
-					if (conf.CompileTarget != CBinding.CompileTarget.Bin) {
-						cproj.WriteMDPkgPackage (conf.Selector);
-						package = new Package (cproj);
-						packages.Add (package);
-					}
-				}
-			}
-			
-			return packages;
-		}
-		
-		private bool IsPackageInStore (Gtk.ListStore store, string pname, string pversion, int pname_col, int pversion_col)
-		{
-			Gtk.TreeIter search_iter;
-			bool has_elem = store.GetIterFirst (out search_iter);
-				
-			if (has_elem) {
-				while (true) {
-					string name = (string)store.GetValue (search_iter, pname_col);
-					string version = (string)store.GetValue (search_iter, pversion_col);
-					
-					if (name == pname && version == pversion)
-						return true;
-						
-					if (!store.IterNext (ref search_iter))
-						break;
-				}
-			}
-			
-			return false;
-		}
-		
-		private string[] ScanDirs ()
-		{
-			List<string> dirs = new List<string> ();
-			string pkg_var = Environment.GetEnvironmentVariable ("PKG_CONFIG_PATH");
-			string[] pkg_paths;
-			
-			dirs.Add ("/usr/lib/pkgconfig");
-			dirs.Add ("/usr/lib64/pkgconfig");
-			dirs.Add ("/usr/share/pkgconfig");
-			dirs.Add ("/usr/local/lib/pkgconfig");
-			dirs.Add ("/usr/local/share/pkgconfig");
-			dirs.Add ("/usr/lib/x86_64-linux-gnu/pkgconfig");
-			
-			if (pkg_var == null) return dirs.ToArray ();
-			
-			pkg_paths = pkg_var.Split (':');
-			
-			foreach (string dir in pkg_paths) {
-				if (string.IsNullOrEmpty (dir))
-					continue;
-				string dirPath = System.IO.Path.GetFullPath (dir);
-				if (!dirs.Contains (dirPath) && !string.IsNullOrEmpty (dir)) {
-					dirs.Add (dir);
-				}
-			}
-			
-			return dirs.ToArray ();
-		}
-		
-		private void OnOkButtonClick (object sender, EventArgs e)
-		{
-			// Use this instead of clear, since clear seems to not update the packages tree
-			while (project.Packages.Count > 0) {
-				project.Packages.RemoveAt (0);
-			}
-
-			project.Packages.AddRange (selectedPackages);
-			
-			Destroy ();
-		}
-		
-		private void OnCancelButtonClick (object sender, EventArgs e)
-		{
-			Destroy ();
-		}
-		
-		private void OnRemoveButtonClick (object sender, EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			
-			selectedPackageTreeView.Selection.GetSelected (out iter);
-			
-			if (!selectedPackageListStore.IterIsValid (iter)) return;
-			
-			string package = (string)selectedPackageListStore.GetValue (iter, SelectedPackageNameID);
-			bool isProject = false;
-			
-			foreach (Package p in selectedPackages) {
-				if (p.Name == package) {
-					isProject = p.IsProject;
-					selectedPackages.Remove (p);
-					break;
-				}
-			}
-			
-			selectedPackageListStore.Remove (ref iter);
-			
-			if (!isProject) {
-				Gtk.TreeIter search_iter;
-				bool has_elem = normalPackageListStore.GetIterFirst (out search_iter);
-					
-				if (has_elem) {
-					while (true) {
-						string current = (string)normalPackageListStore.GetValue (search_iter, NormalPackageNameID);
-						
-						if (current.Equals (package)) {
-							normalPackageListStore.SetValue (search_iter, NormalPackageToggleID, false);
-							break;
-						}
-						
-						if (!normalPackageListStore.IterNext (ref search_iter))
-							break;
-					}
-				}
-			} else {
-				Gtk.TreeIter search_iter;
-				bool has_elem = projectPackageListStore.GetIterFirst (out search_iter);
-					
-				if (has_elem) {
-					while (true) {
-						string current = (string)projectPackageListStore.GetValue (search_iter, ProjectPackageNameID);
-						
-						if (current.Equals (package)) {
-							projectPackageListStore.SetValue (search_iter, ProjectPackageToggleID, false);
-							break;
-						}
-						
-						if (!projectPackageListStore.IterNext (ref search_iter))
-							break;
-					}
-				}
-			}
-		}
-		
-		private void OnNormalPackageToggled (object sender, Gtk.ToggledArgs args)
-		{
-			Gtk.TreeIter iter;
-			bool old = true;
-			string name;
-			string version;
-
-			if (normalPackageListStore.GetIter (out iter, new Gtk.TreePath (args.Path))) {
-				old = (bool)normalPackageListStore.GetValue (iter, NormalPackageToggleID);
-				normalPackageListStore.SetValue (iter, NormalPackageToggleID, !old);
-			}
-			
-			name = (string)normalPackageListStore.GetValue (iter, NormalPackageNameID);
-			version = (string)normalPackageListStore.GetValue(iter, NormalPackageVersionID);
-			
-			if (old == false) {
-				selectedPackageListStore.AppendValues (name, version);
-				
-				foreach (Package package in packages) {
-					if (package.Name == name && package.Version == version) {
-						selectedPackages.Add (package);
-						break;
-					}
-				}
-				
-			} else {
-				Gtk.TreeIter search_iter;
-				bool has_elem = selectedPackageListStore.GetIterFirst (out search_iter);
-				
-				if (has_elem) {
-					while (true) {
-						string current = (string)selectedPackageListStore.GetValue (search_iter, SelectedPackageNameID);
-						
-						if (current.Equals (name)) {
-							selectedPackageListStore.Remove (ref search_iter);
-							foreach (Package p in selectedPackages) {
-								if (p.Name == name) {
-									selectedPackages.Remove (p);
-									break;
-								}
-							}
-							
-							break;
-						}
-						
-						if (!selectedPackageListStore.IterNext (ref search_iter))
-							break;
-					}
-				}
-			}
-		}
-		
-		private void OnProjectPackageToggled (object sender, Gtk.ToggledArgs args)
-		{
-			Gtk.TreeIter iter;
-			bool old = true;
-			string name;
-			string version;
-
-			if (projectPackageListStore.GetIter (out iter, new Gtk.TreePath (args.Path))) {
-				old = (bool)projectPackageListStore.GetValue (iter, ProjectPackageToggleID);
-				projectPackageListStore.SetValue (iter, ProjectPackageToggleID, !old);
-			}
-			
-			name = (string)projectPackageListStore.GetValue (iter, ProjectPackageNameID);
-			version = (string)projectPackageListStore.GetValue(iter, ProjectPackageVersionID);
-			
-			if (old == false) {
-				selectedPackageListStore.AppendValues (name, version);
-				
-				foreach (Package p in packagesOfProjects) {
-					if (p.Name == name) {
-						selectedPackages.Add (p);
-						break;
-					}
-				}
-			} else {
-				Gtk.TreeIter search_iter;
-				bool has_elem = selectedPackageListStore.GetIterFirst (out search_iter);
-				
-				if (has_elem)
-				{
-					while (true) {
-						string current = (string)selectedPackageListStore.GetValue (search_iter, SelectedPackageNameID);
-						
-						if (current.Equals (name)) {
-							selectedPackageListStore.Remove (ref search_iter);
-							foreach (Package p in selectedPackages) {
-								if (p.Name == name) {
-									selectedPackages.Remove (p);
-									break;
-								}
-							}
-							
-							break;
-						}
-						
-						if (!selectedPackageListStore.IterNext (ref search_iter))
-							break;
-					}
-				}
-			}
-		}
-		
-		private bool IsValidPackage (string package)
-		{
-			bool valid = false;
-			try {
-				using (StreamReader reader = new StreamReader (package)) {
-					string line;
-					
-					while ((line = reader.ReadLine ()) != null) {
-						if (line.StartsWith ("Libs:", true, null) && line.Contains (" -l")) {
-							valid = true;
-							break;
-						}
-					}
-				}
-			} catch { 
-				// Invalid file, permission error, broken symlink
-			}
-			
-			return valid;
-		}
-		
-		int NormalPackageCompareNodes (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
-		{
-			string name1 = (string)model.GetValue (a, NormalPackageNameID);
-			string name2 = (string)model.GetValue (b, NormalPackageNameID);
-			return string.Compare (name1, name2, true);
-		}
-		
-		int ProjectPackageCompareNodes (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
-		{
-			string name1 = (string)model.GetValue (a, ProjectPackageNameID);
-			string name2 = (string)model.GetValue (b, ProjectPackageNameID);
-			return string.Compare (name1, name2, true);
-		}
-		
-		int SelectedPackageCompareNodes (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
-		{
-			string name1 = (string)model.GetValue (a, SelectedPackageNameID);
-			string name2 = (string)model.GetValue (b, SelectedPackageNameID);
-			return string.Compare (name1, name2, true);
-		}
-
-		protected virtual void OnSelectedPackagesTreeViewCursorChanged (object sender, System.EventArgs e)
-		{
-			removeButton.Sensitive = true;
-		}
-
-		protected virtual void OnRemoveButtonClicked (object sender, System.EventArgs e)
-		{
-			removeButton.Sensitive = false;
-		}
-
-		protected virtual void OnDetailsButtonClicked (object sender, System.EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			Gtk.Widget active_tab = notebook1.Children [notebook1.Page];
-			string tab_label = notebook1.GetTabLabelText (active_tab);
-			string name = string.Empty;
-			string version = string.Empty;
-			Package package = null;
-			
-			if (tab_label == "System Packages") {
-				normalPackageTreeView.Selection.GetSelected (out iter);
-				name = (string)normalPackageListStore.GetValue (iter, NormalPackageNameID);
-				version = (string)normalPackageListStore.GetValue (iter, NormalPackageVersionID);
-			} else if (tab_label == "Project Packages") {
-				projectPackageTreeView.Selection.GetSelected (out iter);
-				name = (string)projectPackageListStore.GetValue (iter, ProjectPackageNameID);
-				version = (string)projectPackageListStore.GetValue (iter, ProjectPackageVersionID);
-			} else {
-				return;
-			}
-			
-			foreach (Package p in packages) {
-				if (p.Name == name && p.Version == version) {
-					package = p;
-					break;
-				}
-			}
-			
-			if (package == null)
-				return;
-			
-			PackageDetails details = new PackageDetails (package);
-			details.Modal = true;
-			details.Show ();
-		}
-		
-		protected virtual void OnNonSelectedPackageCursorChanged (object o, EventArgs e)
-		{
-			Gtk.TreeIter iter;
-			Gtk.Widget active_tab = notebook1.Children [notebook1.Page];
-			Gtk.Widget active_label = notebook1.GetTabLabel (active_tab);
-			
-			bool sensitive = false;
-			
-			if (active_label == this.labelSystemPackages) {
-				normalPackageTreeView.Selection.GetSelected (out iter);
-				if (normalPackageListStore.IterIsValid (iter))
-					sensitive = true;
-			} else if (active_label == this.labelProjectPackages) {
-				projectPackageTreeView.Selection.GetSelected (out iter);
-				if (projectPackageListStore.IterIsValid (iter))
-					sensitive = true;
-			} else {
-				return;
-			}
-			
-			detailsButton.Sensitive = sensitive;
-		}
-
-		protected virtual void OnNotebook1SwitchPage (object o, Gtk.SwitchPageArgs args)
-		{
-			Gtk.TreeIter iter;
-			Gtk.Widget active_tab = notebook1.Children [notebook1.Page];
-			
-			switch(notebook1.GetTabLabelText (active_tab))
-			{
-				case "System Packages":
-					normalPackageTreeView.Selection.GetSelected (out iter);
-					detailsButton.Sensitive = normalPackageListStore.IterIsValid (iter);
-					break;
-					
-				case "Project Packages":
-					projectPackageTreeView.Selection.GetSelected (out iter);
-					detailsButton.Sensitive = projectPackageListStore.IterIsValid (iter);
-					break;
-			}
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Gui/GeneralOptionsPanel.cs b/main/src/addins/CBinding/Gui/GeneralOptionsPanel.cs
deleted file mode 100644
index 5187231f59..0000000000
--- a/main/src/addins/CBinding/Gui/GeneralOptionsPanel.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-//
-// GeneralOptionsPanel.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Mono.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Components;
-
-namespace CBinding
-{
-	[System.ComponentModel.Category("MonoDevelop.CBinding")]
-	[System.ComponentModel.ToolboxItem(true)]
-	public partial class GeneralOptionsPanel : Gtk.Bin
-	{
-		ICompiler default_c_compiler;
-		List<ICompiler> c_compilers = new List<ICompiler> ();
-		
-		ICompiler default_cpp_compiler;
-		List<ICompiler> cpp_compilers = new List<ICompiler> ();
-		
-		public GeneralOptionsPanel ()
-		{
-			this.Build ();
-			
-			object[] compilers = AddinManager.GetExtensionObjects ("/CBinding/Compilers");
-		
-			foreach (ICompiler compiler in compilers) {
-				if (compiler.Language == Language.C) {
-					c_compilers.Add (compiler);
-				} else if (compiler.Language == Language.CPP) {
-					cpp_compilers.Add (compiler);
-				}
-			}
-			
-			foreach (ICompiler compiler in c_compilers)
-				cCombo.AppendText (compiler.Name);
-			
-			foreach (ICompiler compiler in cpp_compilers)
-				cppCombo.AppendText (compiler.Name);
-			
-			string c_compiler = PropertyService.Get<string> ("CBinding.DefaultCCompiler", new GccCompiler ().Name);
-			string cpp_compiler = PropertyService.Get<string> ("CBinding.DefaultCppCompiler", new GppCompiler ().Name);
-			ctagsEntry.Text = PropertyService.Get<string> ("CBinding.CTagsExecutable", "ctags");
-			parseSystemTagsCheck.Active = PropertyService.Get<bool> ("CBinding.ParseSystemTags", true);
-			parseLocalVariablesCheck.Active = PropertyService.Get<bool> ("CBinding.ParseLocalVariables", false);
-			
-			foreach (ICompiler compiler in c_compilers) {
-				if (compiler.Name == c_compiler) {
-					default_c_compiler = compiler;
-				}
-			}
-			
-			if (default_c_compiler == null)
-				default_c_compiler = new GccCompiler ();
-			
-			foreach (ICompiler compiler in cpp_compilers) {
-				if (compiler.Name == cpp_compiler) {
-					default_cpp_compiler = compiler;
-				}
-			}
-			
-			if (default_cpp_compiler == null)
-				default_cpp_compiler = new GppCompiler ();
-			
-			int active;
-			Gtk.TreeIter iter;
-			Gtk.ListStore store;
-			
-			active = 0;
-			store = (Gtk.ListStore)cCombo.Model;
-			store.GetIterFirst (out iter);
-			
-			while (store.IterIsValid (iter)) {
-				if ((string)store.GetValue (iter, 0) == default_c_compiler.Name) {
-					break;
-				}
-				store.IterNext (ref iter);
-				active++;
-			}
-
-			cCombo.Active = active;
-			
-			active = 0;
-			store = (Gtk.ListStore)cppCombo.Model;
-			store.GetIterFirst (out iter);
-			
-			while (store.IterIsValid (iter)) {
-				if ((string)store.GetValue (iter, 0) == default_cpp_compiler.Name) {
-					break;
-				}
-				store.IterNext (ref iter);
-				active++;
-			}
-
-			cppCombo.Active = active;
-		}
-		
-		public bool Store ()
-		{
-			PropertyService.Set ("CBinding.DefaultCCompiler", default_c_compiler.Name);
-			PropertyService.Set ("CBinding.DefaultCppCompiler", default_cpp_compiler.Name);
-			PropertyService.Set ("CBinding.CTagsExecutable", ctagsEntry.Text.Trim ());
-			PropertyService.Set ("CBinding.ParseSystemTags", parseSystemTagsCheck.Active);
-			PropertyService.Set ("CBinding.ParseLocalVariables", parseLocalVariablesCheck.Active);
-			PropertyService.SaveProperties ();
-			try {
-				// Flush cached system tags, which are ctags-version-specific
-				System.IO.Directory.Delete (Parser.CTagsManager.SystemTagsDirectory);
-				System.IO.Directory.CreateDirectory (Parser.CTagsManager.SystemTagsDirectory);
-			} catch {
-			}
-			return true;
-		}
-
-		protected virtual void OnCComboChanged (object sender, System.EventArgs e)
-		{
-			 string activeCompiler = cCombo.ActiveText;
-			
-			foreach (ICompiler compiler in c_compilers) {
-				if (compiler.Name == activeCompiler) {
-				 	default_c_compiler = compiler;
-				}
-			}
-			
-			if (default_c_compiler == null)
-				default_c_compiler = new GccCompiler ();
-		}
-
-		protected virtual void OnCppComboChanged (object sender, System.EventArgs e)
-		{
-			string activeCompiler = cppCombo.ActiveText;
-			
-			foreach (ICompiler compiler in cpp_compilers) {
-				if (compiler.Name == activeCompiler) {
-				 	default_cpp_compiler = compiler;
-				}
-			}
-			
-			if (default_cpp_compiler == null)
-				default_cpp_compiler = new GppCompiler ();
-		}
-		
-		protected virtual void OnCtagsBrowseClicked (object sender, System.EventArgs e)
-		{
-			OpenFileDialog dialog = new OpenFileDialog (GettextCatalog.GetString ("Choose ctags executable"), FileChooserAction.Open);
-			if (dialog.Run ())
-				ctagsEntry.Text = dialog.SelectedFile;
-		}
-	}
-	
-	public class GeneralOptionsPanelBinding : OptionsPanel
-	{
-		private GeneralOptionsPanel panel;
-		
-		public override Gtk.Widget CreatePanelWidget ()
-		{
-			panel = new GeneralOptionsPanel ();
-			return panel;
-		}
-		
-		public override void ApplyChanges ()
-		{
-			panel.Store ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Gui/OutputOptionsPanel.cs b/main/src/addins/CBinding/Gui/OutputOptionsPanel.cs
deleted file mode 100644
index cfa9fead06..0000000000
--- a/main/src/addins/CBinding/Gui/OutputOptionsPanel.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// OutputOptionsPanel.cs: configure output options
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Mono.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Projects;
-using MonoDevelop.Ide.Gui.Dialogs;
-
-namespace CBinding
-{
-	public partial class OutputOptionsPanel : Gtk.Bin
-	{
-		private CProjectConfiguration configuration;
-		
-		public OutputOptionsPanel ()
-		{
-			this.Build ();
-			table1.RowSpacing = 3;
-		}
-		
-		public void Load (CProjectConfiguration configuration)
-		{
-			this.configuration = configuration;
-			
-			outputNameTextEntry.Text = configuration.Output;
-			outputEntry.Path = configuration.OutputDirectory;
-			parametersTextEntry.Text = configuration.CommandLineParameters;
-			
-			if (externalConsoleCheckbox.Active)
-				pauseCheckbox.Sensitive = true;
-			
-			externalConsoleCheckbox.Active = configuration.ExternalConsole;
-			pauseCheckbox.Active = configuration.PauseConsoleOutput;
-		}
-		
-		public void Store ()
-		{
-			if (configuration == null)
-				return;
-			
-			if (outputNameTextEntry != null && outputNameTextEntry.Text.Length > 0)
-				configuration.Output = outputNameTextEntry.Text.Trim ();
-			
-			var newPath = outputEntry.Path.Trim ();
-			if (!string.IsNullOrEmpty (newPath))
-				configuration.OutputDirectory = newPath;
-			
-			if (parametersTextEntry.Text != null && parametersTextEntry.Text.Length > 0)
-				configuration.CommandLineParameters = parametersTextEntry.Text.Trim ();
-			
-			configuration.ExternalConsole = externalConsoleCheckbox.Active;
-			configuration.PauseConsoleOutput = pauseCheckbox.Active;
-		}
-
-		protected virtual void OnExternalConsoleCheckboxClicked (object sender, System.EventArgs e)
-		{
-			pauseCheckbox.Sensitive = externalConsoleCheckbox.Active;
-		}
-	}
-	
-	public class OutputOptionsPanelBinding : MultiConfigItemOptionsPanel
-	{
-		private OutputOptionsPanel panel;
-		
-		public override Gtk.Widget CreatePanelWidget ()
-		{
-			return panel = new OutputOptionsPanel ();
-		}
-		
-		public override void LoadConfigData ()
-		{
-			panel.Load ((CProjectConfiguration) CurrentConfiguration);
-		}
-		
-		public override void ApplyChanges ()
-		{
-			panel.Store ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Gui/PackageDetails.cs b/main/src/addins/CBinding/Gui/PackageDetails.cs
deleted file mode 100644
index c35b7f8b62..0000000000
--- a/main/src/addins/CBinding/Gui/PackageDetails.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// PackageDetails.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace CBinding
-{
-	public partial class PackageDetails : Gtk.Dialog
-	{
-		Gtk.ListStore requiresStore = new Gtk.ListStore (typeof(string));
-		Gtk.ListStore libPathsStore = new Gtk.ListStore (typeof(string));
-		Gtk.ListStore libsStore = new Gtk.ListStore (typeof(string));
-		Gtk.ListStore cflagsStore = new Gtk.ListStore (typeof(string));
-		
-		public PackageDetails (Package package)
-		{
-			this.Build();
-			
-			package.ParsePackage ();
-			
-			Gtk.CellRendererText textRenderer = new Gtk.CellRendererText ();
-			
-			requiresTreeView.Model = requiresStore;
-			requiresTreeView.AppendColumn ("Requires", textRenderer, "text", 0);
-			requiresTreeView.HeadersVisible = false;
-			
-			libPathsTreeView.Model = libPathsStore;
-			libPathsTreeView.AppendColumn ("LibPaths", textRenderer, "text", 0);
-			libPathsTreeView.HeadersVisible = false;
-			
-			libsTreeView.Model = libsStore;
-			libsTreeView.AppendColumn ("Libs", textRenderer, "text", 0);
-			libsTreeView.HeadersVisible = false;
-			
-			cflagsTreeView.Model = cflagsStore;
-			cflagsTreeView.AppendColumn ("CFlags", textRenderer, "text", 0);
-			cflagsTreeView.HeadersVisible = false;
-			
-			nameLabel.Text = package.Name;
-			descriptionLabel.Text = package.Description;
-			versionLabel.Text = package.Version;
-			
-			foreach (string req in package.Requires)
-				requiresStore.AppendValues (req);
-			
-			foreach (string libpath in package.LibPaths)
-				libPathsStore.AppendValues (libpath);
-			
-			foreach (string lib in package.Libs)
-				libsStore.AppendValues (lib);
-			
-			foreach (string cflag in package.CFlags)
-				cflagsStore.AppendValues (cflag);
-		}
-
-		protected virtual void OnButtonOkClicked (object sender, System.EventArgs e)
-		{
-			Destroy ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/ClassNodeBuilder.cs b/main/src/addins/CBinding/Navigation/ClassNodeBuilder.cs
deleted file mode 100644
index 157ad64978..0000000000
--- a/main/src/addins/CBinding/Navigation/ClassNodeBuilder.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// FunctionNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
- 
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class ClassNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Class); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Class)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Class c = (Class)dataObject;
-				
-			nodeInfo.Label = c.Name;
-			
-			switch (c.Access)
-			{
-			case AccessModifier.Public:
-				nodeInfo.Icon = Context.GetIcon (Stock.Class);
-				break;
-			case AccessModifier.Protected:
-				nodeInfo.Icon = Context.GetIcon (Stock.ProtectedClass);
-				break;
-			case AccessModifier.Private:
-				nodeInfo.Icon = Context.GetIcon (Stock.PrivateClass);
-				break;
-			}
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			CProject p = treeBuilder.GetParentDataItem (typeof(CProject), false) as CProject;
-			
-			if (p == null) return;
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (p);
-			
-			bool publicOnly = treeBuilder.Options["PublicApiOnly"];
-			Class thisClass = (Class)dataObject;
-			
-			// Classes
-			foreach (Class c in info.Classes)
-				if (c.Parent != null && c.Parent.Equals (thisClass) && (!publicOnly || c.Access == AccessModifier.Public))
-					treeBuilder.AddChild (c);
-			
-			// Structures
-			foreach (Structure s in info.Structures)
-				if (s.Parent != null && s.Parent.Equals (thisClass) && (!publicOnly || s.Access == AccessModifier.Public))
-					treeBuilder.AddChild (s);
-			
-			// Unions
-			foreach (Union u in info.Unions)
-				if (u.Parent != null && u.Parent.Equals (thisClass) && (!publicOnly || u.Access == AccessModifier.Public))
-					treeBuilder.AddChild (u);
-			
-			// Enumerations
-			foreach (Enumeration e in info.Enumerations)
-				if (e.Parent != null && e.Parent.Equals (thisClass) && (!publicOnly || e.Access == AccessModifier.Public))
-					treeBuilder.AddChild (e);
-			
-			// Typedefs
-			foreach (Typedef t in info.Typedefs)
-				if (t.Parent != null && t.Parent.Equals (thisClass) && (!publicOnly || t.Access == AccessModifier.Public))
-					treeBuilder.AddChild (t);
-			
-			// Functions
-			foreach (Function f in info.Functions)
-				if (f.Parent != null && f.Parent.Equals (thisClass) && (!publicOnly || f.Access == AccessModifier.Public))
-					treeBuilder.AddChild (f);
-			
-			// Members
-			foreach (Member m in info.Members)
-				if (m.Parent != null && m.Parent.Equals (thisClass) && (!publicOnly || m.Access == AccessModifier.Public))
-					treeBuilder.AddChild (m);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return true;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			return -1;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/ClassPadEventArgs.cs b/main/src/addins/CBinding/Navigation/ClassPadEventArgs.cs
deleted file mode 100644
index f878c2c69d..0000000000
--- a/main/src/addins/CBinding/Navigation/ClassPadEventArgs.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// ClassPadEventHandler.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Navigation
-{
-	public delegate void ClassPadEventHandler (ClassPadEventArgs e);
-	
-	public class ClassPadEventArgs : EventArgs
-	{
-		private Project project;
-		
-		public ClassPadEventArgs (Project project)
-		{
-			this.project = project;
-		}
-		
-		public Project Project {
-			get { return project; }
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/EnumerationNodeBuilder.cs b/main/src/addins/CBinding/Navigation/EnumerationNodeBuilder.cs
deleted file mode 100644
index 65836cea2f..0000000000
--- a/main/src/addins/CBinding/Navigation/EnumerationNodeBuilder.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// EnumerationNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
- 
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class EnumerationNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Enumeration); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Enumeration)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Enumeration e = (Enumeration)dataObject;
-				
-			nodeInfo.Label = e.Name;
-			
-			switch (e.Access)
-			{
-			case AccessModifier.Public:
-				nodeInfo.Icon = Context.GetIcon (Stock.Enum);
-				break;
-			case AccessModifier.Protected:
-				nodeInfo.Icon = Context.GetIcon (Stock.ProtectedEnum);
-				break;
-			case AccessModifier.Private:
-				nodeInfo.Icon = Context.GetIcon (Stock.PrivateEnum);
-				break;
-			}
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			CProject p = treeBuilder.GetParentDataItem (typeof(CProject), false) as CProject;
-			
-			if (p == null) return;
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (p);
-			
-			Enumeration thisEnumeration = (Enumeration)dataObject;
-			
-			// Enumerators
-			foreach (Enumerator e in info.Enumerators)
-				if (e.Parent != null && e.Parent.Equals (thisEnumeration))
-					treeBuilder.AddChild (e);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return true;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (otherNode.DataItem is Structure)
-				return 1;
-			else
-				return -1;
-		}
-	}
-}
-
diff --git a/main/src/addins/CBinding/Navigation/EnumeratorNodeBuilder.cs b/main/src/addins/CBinding/Navigation/EnumeratorNodeBuilder.cs
deleted file mode 100644
index 697d405feb..0000000000
--- a/main/src/addins/CBinding/Navigation/EnumeratorNodeBuilder.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// EnumeratorNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
- 
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class EnumeratorNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Enumerator); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Enumerator)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Enumerator e = (Enumerator)dataObject;
-				
-			nodeInfo.Label = e.Name;
-			nodeInfo.Icon = Context.GetIcon (Stock.Literal);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return false;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			return DefaultSort;
-		}
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/CBinding/Navigation/FunctionNodeBuilder.cs b/main/src/addins/CBinding/Navigation/FunctionNodeBuilder.cs
deleted file mode 100644
index a19d24cd50..0000000000
--- a/main/src/addins/CBinding/Navigation/FunctionNodeBuilder.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// FunctionNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
- 
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class FunctionNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Function); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Function)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Function f = (Function)dataObject;
-				
-			nodeInfo.Label = f.Name;
-			
-			switch (f.Access)
-			{
-			case AccessModifier.Public:
-				nodeInfo.Icon = Context.GetIcon (Stock.Method);
-				break;
-			case AccessModifier.Protected:
-				nodeInfo.Icon = Context.GetIcon (Stock.ProtectedMethod);
-				break;
-			case AccessModifier.Private:
-				nodeInfo.Icon = Context.GetIcon (Stock.PrivateMethod);
-				break;
-			}
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return false;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (otherNode.DataItem is Typedef)
-				return 1;
-			else
-				return -1;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/GlobalsNodeBuilder.cs b/main/src/addins/CBinding/Navigation/GlobalsNodeBuilder.cs
deleted file mode 100644
index 4b74bea219..0000000000
--- a/main/src/addins/CBinding/Navigation/GlobalsNodeBuilder.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// GlobalsNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
- 
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class Globals
-	{
-		private Project project;
-		
-		public Globals (Project project)
-		{
-			this.project = project;
-		}
-		
-		public Project Project {
-			get { return project; }
-		}
-	}
-	
-	public class GlobalsNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Globals); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return "Globals";
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			nodeInfo.Label = "Globals";
-			nodeInfo.Icon = Context.GetIcon (Stock.OpenFolder);
-			nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedFolder);
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			CProject p = treeBuilder.GetParentDataItem (typeof(CProject), false) as CProject;
-			
-			if (p == null) return;
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (p);
-			
-			// Classes
-			foreach (Class c in info.Classes)
-				if (c.Parent == null)
-					treeBuilder.AddChild (c);
-			
-			// Structures
-			foreach (Structure s in info.Structures)
-				if (s.Parent == null)
-					treeBuilder.AddChild (s);
-			
-			// Unions
-			foreach (Union u in info.Unions)
-				if (u.Parent == null)
-					treeBuilder.AddChild (u);
-			
-			// Enumerations
-			foreach (Enumeration e in info.Enumerations)
-				if (e.Parent == null)
-					treeBuilder.AddChild (e);
-			
-			// Typedefs
-			foreach (Typedef t in info.Typedefs)
-				if (t.Parent == null)
-					treeBuilder.AddChild (t);
-			
-			// Functions
-			foreach (Function f in info.Functions)
-				if (f.Parent == null)
-					treeBuilder.AddChild (f);
-			
-			// Variables
-			foreach (Variable v in info.Variables)
-				treeBuilder.AddChild (v);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return true;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (otherNode.DataItem is Structure)
-				return 1;
-			else
-				return -1;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/LanguageItemCommandHandler.cs b/main/src/addins/CBinding/Navigation/LanguageItemCommandHandler.cs
deleted file mode 100644
index cddd0e13a7..0000000000
--- a/main/src/addins/CBinding/Navigation/LanguageItemCommandHandler.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// FunctionNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Components;
-using CBinding.Parser;
-using MonoDevelop.Ide;
-
-namespace CBinding.Navigation
-{
-	public class LanguageItemCommandHandler : NodeCommandHandler
-	{
-		public override void ActivateItem ()
-		{
-			LanguageItem item = (LanguageItem)CurrentNode.DataItem;
-			Document doc = IdeApp.Workbench.OpenDocument (item.File);
-			//bool isMacro = item is Macro;
-			
-			doc.Editor.SetCaretTo ((int)item.Line, 0); // TODO: get column?
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/LanguageItemEventArgs.cs b/main/src/addins/CBinding/Navigation/LanguageItemEventArgs.cs
deleted file mode 100644
index 52733c5268..0000000000
--- a/main/src/addins/CBinding/Navigation/LanguageItemEventArgs.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// LanguageItemEventArgs.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public delegate void LanguageItemEventHandler (object sender, LanguageItemEventArgs e);
-	
-	public class LanguageItemEventArgs : EventArgs
-	{
-		LanguageItem item;
-		
-		public LanguageItemEventArgs (LanguageItem item)
-		{
-			this.item = item;
-		}
-		
-		public LanguageItem Item {
-			get { return item; }
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/MacroDefinitionsNodeBuilder.cs b/main/src/addins/CBinding/Navigation/MacroDefinitionsNodeBuilder.cs
deleted file mode 100644
index 458ae14ced..0000000000
--- a/main/src/addins/CBinding/Navigation/MacroDefinitionsNodeBuilder.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// MacroDefinitionsNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class MacroDefinitions
-	{
-		private Project project;
-		
-		public MacroDefinitions (Project project)
-		{
-			this.project = project;
-		}
-		
-		public Project Project {
-			get { return project; }
-		}
-	}
-	
-	public class MacroDefinitionsNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(MacroDefinitions); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return "Macro Definitions";
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			nodeInfo.Label = "Macro Definitions";
-			nodeInfo.Icon = Context.GetIcon (Stock.OpenFolder);
-			nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedFolder);
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			CProject p = treeBuilder.GetParentDataItem (typeof(CProject), false) as CProject;
-			
-			if (p == null) return;
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (p);
-			
-			foreach (Macro m in info.Macros)
-				treeBuilder.AddChild (m);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return true;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (otherNode.DataItem is Globals)
-				return 1;
-			else
-				return -1;
-		}
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/CBinding/Navigation/MacroNodeBuilder.cs b/main/src/addins/CBinding/Navigation/MacroNodeBuilder.cs
deleted file mode 100644
index 7dcf065320..0000000000
--- a/main/src/addins/CBinding/Navigation/MacroNodeBuilder.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// MacroNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
- 
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class MacroNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Macro); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Macro)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Macro m = (Macro)dataObject;
-				
-			nodeInfo.Label = m.Name;
-			nodeInfo.Icon = Context.GetIcon (Stock.Literal);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return false;
-		}
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/CBinding/Navigation/MemberNodeBuilder.cs b/main/src/addins/CBinding/Navigation/MemberNodeBuilder.cs
deleted file mode 100644
index 51821b2408..0000000000
--- a/main/src/addins/CBinding/Navigation/MemberNodeBuilder.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// FunctionNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class MemberNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Member); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Member)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Member m = (Member)dataObject;
-				
-			nodeInfo.Label = m.Name;
-			
-			switch (m.Access)
-			{
-			case AccessModifier.Public:
-				nodeInfo.Icon = Context.GetIcon (Stock.Field);
-				break;
-			case AccessModifier.Protected:
-				nodeInfo.Icon = Context.GetIcon (Stock.ProtectedField);
-				break;
-			case AccessModifier.Private:
-				nodeInfo.Icon = Context.GetIcon (Stock.PrivateField);
-				break;
-			}
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return false;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			return 1;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/NamespaceNodeBuilder.cs b/main/src/addins/CBinding/Navigation/NamespaceNodeBuilder.cs
deleted file mode 100644
index 2086a910f1..0000000000
--- a/main/src/addins/CBinding/Navigation/NamespaceNodeBuilder.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// NamespaceNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class NamespaceNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Namespace); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof (LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			if (thisNode.Options["NestedNamespaces"])
-				return ((Namespace)dataObject).Name;
-			else
-				return ((Namespace)dataObject).FullName;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			if (treeBuilder.Options["NestedNamespaces"])
-				nodeInfo.Label = ((Namespace)dataObject).Name;
-			else
-				nodeInfo.Label = ((Namespace)dataObject).FullName;
-			
-			nodeInfo.Icon = Context.GetIcon (Stock.NameSpace);
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			CProject p = treeBuilder.GetParentDataItem (typeof(CProject), false) as CProject;
-			
-			if (p == null) return;
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (p);
-			
-			Namespace thisNamespace = ((Namespace)dataObject);
-			
-			// Namespaces
-			if (treeBuilder.Options["NestedNamespaces"])
-				foreach (Namespace n in info.Namespaces)
-					if (n.Parent != null && n.Parent.Equals (thisNamespace))
-						treeBuilder.AddChild (n);
-			
-			// Classes
-			foreach (Class c in info.Classes)
-				if (c.Parent != null && c.Parent.Equals (thisNamespace))
-					treeBuilder.AddChild (c);
-			
-			// Structures
-			foreach (Structure s in info.Structures)
-				if (s.Parent != null && s.Parent.Equals (thisNamespace))
-					treeBuilder.AddChild (s);
-			
-			// Unions
-			foreach (Union u in info.Unions)
-				if (u.Parent != null && u.Parent.Equals (thisNamespace))
-					treeBuilder.AddChild (u);
-			
-			// Enumerations
-			foreach (Enumeration e in info.Enumerations)
-				if (e.Parent != null && e.Parent.Equals (thisNamespace))
-					treeBuilder.AddChild (e);
-			
-			// Typedefs
-			foreach (Typedef t in info.Typedefs)
-				if (t.Parent != null && t.Parent.Equals (thisNamespace))
-					treeBuilder.AddChild (t);
-			
-			// Functions
-			foreach (Function f in info.Functions)
-				if (f.Parent != null && f.Parent.Equals (thisNamespace))
-					treeBuilder.AddChild (f);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return true;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			return -1;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/ProjectNodeBuilderExtension.cs b/main/src/addins/CBinding/Navigation/ProjectNodeBuilderExtension.cs
deleted file mode 100644
index 0022146b60..0000000000
--- a/main/src/addins/CBinding/Navigation/ProjectNodeBuilderExtension.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// ProjectNodeBuilderExtension.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Core;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Components;
-using CBinding;
-using CBinding.Parser;
-using MonoDevelop.Ide;
-
-namespace CBinding.Navigation
-{
-	public class ProjectNodeBuilderExtension : NodeBuilderExtension
-	{
-		public ClassPadEventHandler finishedBuildingTreeHandler;
-		
-		public override bool CanBuildNode (Type dataType)
-		{
-			return typeof(CProject).IsAssignableFrom (dataType);
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(ProjectNodeBuilderExtensionHandler); }
-		}
-		
-		protected override void Initialize ()
-		{
-			finishedBuildingTreeHandler = (ClassPadEventHandler)DispatchService.GuiDispatch (new ClassPadEventHandler (OnFinishedBuildingTree));
-
-			TagDatabaseManager.Instance.FileUpdated += finishedBuildingTreeHandler;
-		}
-		
-		public override void Dispose ()
-		{
-			TagDatabaseManager.Instance.FileUpdated -= finishedBuildingTreeHandler;
-		}
-		
-		public static void CreatePadTree (object o)
-		{
-			CProject p = o as CProject;
-			if (o == null) return;
-			
-			try {
-				foreach (ProjectFile f in p.Files) {
-					if (f.BuildAction == BuildAction.Compile)
-						TagDatabaseManager.Instance.UpdateFileTags (p, f.Name);
-				}
-			} catch (IOException) {
-				return;
-			}
-		}
-		
-		private bool check_ctags = false;
-		private bool have_ctags = false;
-		
-		private void CheckForCtags ()
-		{
-			check_ctags = true;
-			have_ctags = TagDatabaseManager.Instance.DepsInstalled;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			if (!check_ctags)
-				CheckForCtags ();
-			
-			CProject p = dataObject as CProject;
-			
-			if (p == null)
-				return;
-			
-			if (!have_ctags) {
-				nodeInfo.Label = string.Format ("{0} <span foreground='red' size='small'>(CTags not installed)</span>", p.Name);
-			}
-		}
-
-		
-		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
-		{			
-			CProject p = dataObject as CProject;
-			
-			if (p == null) return;
-			
-			bool nestedNamespaces = builder.Options["NestedNamespaces"];
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (p);
-			
-			// Namespaces
-			foreach (Namespace n in info.Namespaces) {
-				if (nestedNamespaces) {
-					if (n.Parent == null) {
-						builder.AddChild (n);
-					}
-				} else {
-					builder.AddChild (n);
-				}
-			}
-			
-			// Globals
-			builder.AddChild (info.Globals);
-			
-			// Macro Definitions
-			builder.AddChild (info.MacroDefinitions);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return true;
-		}
-		
-		private void OnFinishedBuildingTree (ClassPadEventArgs e)
-		{
-			ITreeBuilder builder = Context.GetTreeBuilder (e.Project);
-			if (null != builder)
-				builder.UpdateChildren ();
-		}
-	}
-	
-	public class ProjectNodeBuilderExtensionHandler : NodeCommandHandler
-	{
-//		public override void ActivateItem ()
-//		{
-//			CProject p = CurrentNode.DataItem as CProject;
-//			
-//			if (p == null) return;
-//			
-//			Thread builderThread = new Thread (new ParameterizedThreadStart (ProjectNodeBuilderExtension.CreatePadTree));
-//			builderThread.Name = "PadBuilder";
-//			builderThread.IsBackground = true;
-//			builderThread.Start (p);
-//		}
-		
-		[CommandHandler (CProjectCommands.UpdateClassPad)]
-		public void UpdateClassPad ()
-		{
-			CProject p = CurrentNode.DataItem as CProject;
-			
-			if (p == null) return;
-			
-			foreach (ProjectFile f in p.Files) {
-				if (f.BuildAction == BuildAction.Compile)
-					TagDatabaseManager.Instance.UpdateFileTags (p, f.Name);
-			}
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/StructureNodeBuilder.cs b/main/src/addins/CBinding/Navigation/StructureNodeBuilder.cs
deleted file mode 100644
index c5909841a3..0000000000
--- a/main/src/addins/CBinding/Navigation/StructureNodeBuilder.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// StructureNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class StructureNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Structure); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Structure)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Structure s = (Structure)dataObject;
-				
-			nodeInfo.Label = s.Name;
-			
-			switch (s.Access)
-			{
-			case AccessModifier.Public:
-				nodeInfo.Icon = Context.GetIcon (Stock.Struct);
-				break;
-			case AccessModifier.Protected:
-				nodeInfo.Icon = Context.GetIcon (Stock.ProtectedStruct);
-				break;
-			case AccessModifier.Private:
-				nodeInfo.Icon = Context.GetIcon (Stock.PrivateStruct);
-				break;
-			}
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			CProject p = treeBuilder.GetParentDataItem (typeof(CProject), false) as CProject;
-			
-			if (p == null) return;
-			
-			bool publicOnly = treeBuilder.Options["PublicApiOnly"];
-			ProjectInformation info = ProjectInformationManager.Instance.Get (p);
-			
-			Structure thisStruct = (Structure)dataObject;
-			
-			// Classes
-			foreach (Class c in info.Classes)
-				if (c.Parent != null && c.Parent.Equals (thisStruct) && (!publicOnly || c.Access == AccessModifier.Public))
-					treeBuilder.AddChild (c);
-			
-			// Structures
-			foreach (Structure s in info.Structures)
-				if (s.Parent != null && s.Parent.Equals (thisStruct) && (!publicOnly || s.Access == AccessModifier.Public))
-					treeBuilder.AddChild (s);
-			
-			// Unions
-			foreach (Union u in info.Unions)
-				if (u.Parent != null && u.Parent.Equals (thisStruct) && (!publicOnly || u.Access == AccessModifier.Public))
-					treeBuilder.AddChild (u);
-			
-			// Enumerations
-			foreach (Enumeration e in info.Enumerations)
-				if (e.Parent != null && e.Parent.Equals (thisStruct) && (!publicOnly || e.Access == AccessModifier.Public))
-					treeBuilder.AddChild (e);
-			
-			// Typedefs
-			foreach (Typedef t in info.Typedefs)
-				if (t.Parent != null && t.Parent.Equals (thisStruct) && (!publicOnly || t.Access == AccessModifier.Public))
-					treeBuilder.AddChild (t);
-			
-			// Functions
-			foreach (Function f in info.Functions)
-				if (f.Parent != null && f.Parent.Equals (thisStruct) && (!publicOnly || f.Access == AccessModifier.Public))
-					treeBuilder.AddChild (f);
-			
-			// Members
-			foreach (Member m in info.Members)
-				if (m.Parent != null && m.Parent.Equals (thisStruct) && (!publicOnly || m.Access == AccessModifier.Public))
-					treeBuilder.AddChild (m);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return true;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (otherNode.DataItem is Class)
-				return 1;
-			else
-				return -1;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/TypedefNodeBuilder.cs b/main/src/addins/CBinding/Navigation/TypedefNodeBuilder.cs
deleted file mode 100644
index d94ec9fbab..0000000000
--- a/main/src/addins/CBinding/Navigation/TypedefNodeBuilder.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// TypedefNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class TypedefNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Typedef); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Typedef)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Typedef t = (Typedef)dataObject;
-				
-			nodeInfo.Label = t.Name;
-			nodeInfo.Icon = Context.GetIcon (Stock.Interface);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return false;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (otherNode.DataItem is Enumeration)
-				return 1;
-			else
-				return -1;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/UnionNodeBuilder.cs b/main/src/addins/CBinding/Navigation/UnionNodeBuilder.cs
deleted file mode 100644
index d68b26ff61..0000000000
--- a/main/src/addins/CBinding/Navigation/UnionNodeBuilder.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// UnionNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Reflection;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class UnionNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Union); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Union)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Union u = (Union)dataObject;
-				
-			nodeInfo.Label = u.Name;
-			
-			switch (u.Access)
-			{
-			case AccessModifier.Public:
-				nodeInfo.Icon = Context.GetIcon ("md-union");
-				break;
-			case AccessModifier.Protected:
-				nodeInfo.Icon = Context.GetIcon ("md-protected-union");
-				break;
-			case AccessModifier.Private:
-				nodeInfo.Icon = Context.GetIcon ("md-private-union");
-				break;
-			}
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			CProject p = treeBuilder.GetParentDataItem (typeof(CProject), false) as CProject;
-			
-			if (p == null) return;
-			
-			ProjectInformation info = ProjectInformationManager.Instance.Get (p);
-			
-			Union thisUnion = (Union)dataObject;
-			
-			// Classes
-			foreach (Class c in info.Classes)
-				if (c.Parent != null && c.Parent.Equals (thisUnion))
-					treeBuilder.AddChild (c);
-			
-			// Structures
-			foreach (Structure s in info.Structures)
-				if (s.Parent != null && s.Parent.Equals (thisUnion))
-					treeBuilder.AddChild (s);
-			
-			// Unions
-			foreach (Union u in info.Unions)
-				if (u.Parent != null && u.Parent.Equals (thisUnion))
-					treeBuilder.AddChild (u);
-			
-			// Enumerations
-			foreach (Enumeration e in info.Enumerations)
-				if (e.Parent != null && e.Parent.Equals (thisUnion))
-					treeBuilder.AddChild (e);
-			
-			// Typedefs
-			foreach (Typedef t in info.Typedefs)
-				if (t.Parent != null && t.Parent.Equals (thisUnion))
-					treeBuilder.AddChild (t);
-			
-			// Functions
-			foreach (Function f in info.Functions)
-				if (f.Parent != null && f.Parent.Equals (thisUnion))
-					treeBuilder.AddChild (f);
-			
-			// Members
-			foreach (Member m in info.Members)
-				if (m.Parent != null && m.Parent.Equals (thisUnion))
-					treeBuilder.AddChild (m);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return true;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (otherNode.DataItem is Structure)
-				return 1;
-			else
-				return -1;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Navigation/VariableNodeBuilder.cs b/main/src/addins/CBinding/Navigation/VariableNodeBuilder.cs
deleted file mode 100644
index 587b53df6d..0000000000
--- a/main/src/addins/CBinding/Navigation/VariableNodeBuilder.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// VariableNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-
-using CBinding.Parser;
-
-namespace CBinding.Navigation
-{
-	public class VariableNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Variable); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(LanguageItemCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Variable)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			Variable v = (Variable)dataObject;
-				
-			nodeInfo.Label = v.Name;
-			
-			switch (v.Access)
-			{
-			case AccessModifier.Public:
-				nodeInfo.Icon = Context.GetIcon (Stock.Field);
-				break;
-			case AccessModifier.Protected:
-				nodeInfo.Icon = Context.GetIcon (Stock.ProtectedField);
-				break;
-			case AccessModifier.Private:
-				nodeInfo.Icon = Context.GetIcon (Stock.PrivateField);
-				break;
-			}
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return false;
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			if (otherNode.DataItem is Function)
-				return 1;
-			else
-				return -1;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/ObjCLanguageBinding.cs b/main/src/addins/CBinding/ObjCLanguageBinding.cs
deleted file mode 100644
index 13bb348c35..0000000000
--- a/main/src/addins/CBinding/ObjCLanguageBinding.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// ObjCLanguageBinding.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-
-namespace CBinding
-{
-	public class ObjCLanguageBinding : ILanguageBinding
-	{
-		public string Language {
-			get { return "Objective C"; }
-		}
-		
-		public string SingleLineCommentTag { get { return "//"; } }
-		public string BlockCommentStartTag { get { return "/*"; } }
-		public string BlockCommentEndTag { get { return "*/"; } }
-		
-		public bool IsSourceCodeFile (FilePath fileName)
-		{
-			return fileName.ToString ().EndsWith (".m", StringComparison.Ordinal);
-		}
-		
-		public FilePath GetFileName (FilePath baseName)
-		{
-			return baseName + ".m";
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/ObjCppLanguageBinding.cs b/main/src/addins/CBinding/ObjCppLanguageBinding.cs
deleted file mode 100644
index 7581260bcb..0000000000
--- a/main/src/addins/CBinding/ObjCppLanguageBinding.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// ObjCLanguageBinding.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-
-namespace CBinding
-{
-	public class ObjCppLanguageBinding : ILanguageBinding
-	{
-		public string Language {
-			get { return "Objective C++"; }
-		}
-		
-		public string SingleLineCommentTag { get { return "//"; } }
-		public string BlockCommentStartTag { get { return "/*"; } }
-		public string BlockCommentEndTag { get { return "*/"; } }
-		
-		public bool IsSourceCodeFile (FilePath fileName)
-		{
-			return fileName.ToString ().EndsWith (".mm", StringComparison.OrdinalIgnoreCase) || 
-			       fileName.ToString ().EndsWith (".M", StringComparison.Ordinal);
-		}
-		
-		public FilePath GetFileName (FilePath baseName)
-		{
-			return baseName + ".mm";
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/BsdCTagsManager.cs b/main/src/addins/CBinding/Parser/BsdCTagsManager.cs
deleted file mode 100644
index 6f21867b19..0000000000
--- a/main/src/addins/CBinding/Parser/BsdCTagsManager.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// 
-// BsdCTagsManager.cs
-//  
-// Author:
-//       Levi Bard <levi@unity3d.com>
-// 
-// Copyright (c) 2010 Levi Bard
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-
-namespace CBinding.Parser
-{
-	public class BsdCTagsManager: CTagsManager
-	{
-		#region implemented abstract members of CBinding.Parser.CTagsManager
-		
-		protected override IEnumerable<string> GetTags (FileInformation fileInfo)
-		{
-			string tagFileName = Path.GetFileName (fileInfo.FileName) + ".tag";
-			string tagFullFileName = Path.Combine (SystemTagsDirectory, tagFileName);
-			
-			string ctags_options = string.Format ("-dtx '{0}'", fileInfo.FileName);
-			string ctags_output = string.Empty;
-			
-			if (!File.Exists (tagFullFileName) || File.GetLastWriteTimeUtc (tagFullFileName) < File.GetLastWriteTimeUtc (fileInfo.FileName)) {
-				ctags_output = GetOutputFromProcess (CTagsExecutable, ctags_options, Environment.CurrentDirectory);
-				File.WriteAllText (tagFullFileName, ctags_output);
-			}
-			
-			return ctags_output.Split (newlines, StringSplitOptions.RemoveEmptyEntries);
-		}
-		
-		static readonly char[] newlines = {'\r','\n'};
-		protected override IEnumerable<string> GetTags (MonoDevelop.Projects.Project project, string filename, IEnumerable<string> headers)
-		{
-			StringBuilder ctags_kinds = new StringBuilder ("-dtx");
-			
-			ctags_kinds.AppendFormat (" '{0}'", filename);
-			foreach (string header in headers) {
-				ctags_kinds.AppendFormat (" '{0}'", header);
-			}
-			
-			string output = GetOutputFromProcess (CTagsExecutable, ctags_kinds.ToString (), project.BaseDirectory);
-			if (output != null)
-				return output.Split (newlines, StringSplitOptions.RemoveEmptyEntries);
-			return null;
-		}
-
-		public override void FillFileInformation (FileInformation fileInfo)
-		{
-			IEnumerable<string> ctags_output = GetTags (fileInfo);
-			if (ctags_output == null) return;
-			
-			foreach (string tagEntry in ctags_output) {
-				if (tagEntry.StartsWith ("!_")) continue;
-				
-				Tag tag = ParseTag (tagEntry);
-				
-				if (tag != null)
-					AddInfo (fileInfo, tag, tagEntry);
-			}
-			
-			fileInfo.IsFilled = true;
-		}
-		
-		
-		// Format: symbol line file fulltext (there may not be any whitespace between symbol and line)
-		static readonly Regex tagExpression = new Regex (@"\s*(?<symbol>[^\s]+?)\s*(?<line>\d+)\s+(?<file>[^\s]+)\s+(?<raw>.*)", RegexOptions.Compiled);
-		
-		public override Tag ParseTag (string tagEntry)
-		{
-			try {
-				Match tagMatch = tagExpression.Match (tagEntry);
-				if (tagMatch == null) return null;
-				
-				TagKind kind = TagKind.Member;
-				string signature = tagMatch.Groups["raw"].Value;
-				int start = signature.IndexOf ('(');
-				int end = signature.LastIndexOf (')');
-				
-				if (start >= 0 && end > start) {
-					// Attempt to parse out method parameter block
-					signature = signature.Substring (start, end - start + 1);
-					kind = TagKind.Function; // TODO: improve kind guessing
-				}
-				return new Tag (tagMatch.Groups["symbol"].Value,
-				                tagMatch.Groups["file"].Value,
-				                ulong.Parse (tagMatch.Groups["line"].Value)+1,
-				                kind, AccessModifier.Public,
-				                null, null, null, null, null, signature);
-			} catch (Exception ex) {
-				LoggingService.LogWarning (string.Format ("Error parsing tag {0}", tagEntry), ex);
-			}
-			return null;
-		}
-		
-		#endregion
-		
-	}
-}
-
diff --git a/main/src/addins/CBinding/Parser/CDocumentParser.cs b/main/src/addins/CBinding/Parser/CDocumentParser.cs
deleted file mode 100755
index 0d13cfbbe7..0000000000
--- a/main/src/addins/CBinding/Parser/CDocumentParser.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// 
-// CDocumentParser.cs
-//  
-// Author:
-//       Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-// 
-// Copyright (c) 2009 Levi Bard
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-
-namespace CBinding.Parser
-{
-	/// <summary>
-	/// Ctags-based document parser helper
-	/// </summary>
-	public class CDocumentParser:  TypeSystemParser
-	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader reader, Project project = null)
-		{
-			var doc = new DefaultParsedDocument (fileName);
-			doc.Flags |= ParsedDocumentFlags.NonSerializable;
-			ProjectInformation pi = ProjectInformationManager.Instance.Get (project);
-			
-			string content = reader.ReadToEnd ();
-			string[] contentLines = content.Split (new string[]{Environment.NewLine}, StringSplitOptions.None);
-			
-			var globals = new DefaultUnresolvedTypeDefinition ("", GettextCatalog.GetString ("(Global Scope)"));
-			lock (pi) {
-				// Add containers to type list
-				foreach (LanguageItem li in pi.Containers ()) {
-					if (null == li.Parent && FilePath.Equals (li.File, fileName)) {
-						var tmp = AddLanguageItem (pi, globals, li, contentLines) as IUnresolvedTypeDefinition;
-						if (null != tmp){ doc.TopLevelTypeDefinitions.Add (tmp); }
-					}
-				}
-				
-				// Add global category for unscoped symbols
-				foreach (LanguageItem li in pi.InstanceMembers ()) {
-					if (null == li.Parent && FilePath.Equals (li.File, fileName)) {
-						AddLanguageItem (pi, globals, li, contentLines);
-					}
-				}
-			}
-			
-			doc.TopLevelTypeDefinitions.Add (globals);
-			return doc;
-		}
-		
-		/// <summary>
-		/// Finds the end of a function's definition by matching braces.
-		/// </summary>
-		/// <param name="content">
-		/// A <see cref="System.String"/> array: each line of the content to be searched.
-		/// </param>
-		/// <param name="startLine">
-		/// A <see cref="System.Int32"/>: The earliest line at which the function may start.
-		/// </param>
-		/// <returns>
-		/// A <see cref="System.Int32"/>: The detected end of the function.
-		/// </returns>
-		static int FindFunctionEnd (string[] content, int startLine) {
-			int start = FindFunctionStart (content, startLine);
-			if (0 > start){ return startLine; }
-			
-			int count = 0;
-			
-			for (int i= start; i<content.Length; ++i) {
-				foreach (char c in content[i]) {
-					switch (c) {
-					case '{':
-						++count;
-						break;
-					case '}':
-						if (0 >= --count) {
-							return i;
-						}
-						break;
-					}
-				}
-			}
-			
-			return startLine;
-		}
-		
-		/// <summary>
-		/// Finds the start of a function's definition.
-		/// </summary>
-		/// <param name="content">
-		/// A <see cref="System.String"/> array: each line of the content to be searched.
-		/// </param>
-		/// <param name="startLine">
-		/// A <see cref="System.Int32"/>: The earliest line at which the function may start.
-		/// </param>
-		/// <returns>
-		/// A <see cref="System.Int32"/>: The detected start of the function 
-		/// definition, or -1.
-		/// </returns>
-		static int FindFunctionStart (string[] content, int startLine) {
-			int semicolon = -1;
-			int bracket = -1;
-			
-			for (int i=startLine; i<content.Length; ++i) {
-				semicolon = content[i].IndexOf (';');
-				bracket = content[i].IndexOf ('{');
-				if (0 <= semicolon) {
-					return (0 > bracket ^ semicolon < bracket)? -1: i;
-				} else if (0 <= bracket) {
-					return i;
-				}
-			}
-			
-			return -1;
-		}
-		
-		static readonly Regex paramExpression = new Regex (@"(?<type>[^\s]+)\s+(?<subtype>[*&]*)(?<name>[^\s[]+)(?<array>\[.*)?", RegexOptions.Compiled);
-		
-		static object AddLanguageItem (ProjectInformation pi, DefaultUnresolvedTypeDefinition klass, LanguageItem li, string[] contentLines)
-		{
-			
-			if (li is Class || li is Structure || li is Enumeration) {
-				var type = LanguageItemToIType (pi, li, contentLines);
-				klass.NestedTypes.Add (type);
-				return type;
-			}
-			
-			if (li is Function) {
-				var method = FunctionToIMethod (pi, klass, (Function)li, contentLines);
-				klass.Members.Add (method);
-				return method;
-			}
-			
-			var field = LanguageItemToIField (klass, li, contentLines);
-			klass.Members.Add (field);
-			return field;
-		}
-		
-		/// <summary>
-		/// Create an IMember from a LanguageItem,
-		/// using the source document to locate declaration bounds.
-		/// </summary>
-		/// <param name="pi">
-		/// A <see cref="ProjectInformation"/> for the current project.
-		/// </param>
-		/// <param name="item">
-		/// A <see cref="LanguageItem"/>: The item to convert.
-		/// </param>
-		/// <param name="contentLines">
-		/// A <see cref="System.String[]"/>: The document in which item is defined.
-		/// </param>
-		static DefaultUnresolvedTypeDefinition LanguageItemToIType (ProjectInformation pi, LanguageItem item, string[] contentLines)
-		{
-			var klass = new DefaultUnresolvedTypeDefinition ("", item.File);
-			if (item is Class || item is Structure) {
-				klass.Region = new DomRegion ((int)item.Line, 1, FindFunctionEnd (contentLines, (int)item.Line-1) + 2, 1);
-				klass.Kind = item is Class ? TypeKind.Class : TypeKind.Struct;
-				foreach (LanguageItem li in pi.AllItems ()) {
-					if (klass.Equals (li.Parent) && FilePath.Equals (li.File, item.File))
-						AddLanguageItem (pi, klass, li, contentLines);
-				}
-				return klass;
-			}
-			
-			klass.Region = new DomRegion ((int)item.Line, 1, (int)item.Line + 1, 1);
-			klass.Kind = TypeKind.Enum;
-			return klass;
-		}
-		
-		static IUnresolvedField LanguageItemToIField (IUnresolvedTypeDefinition type, LanguageItem item, string[] contentLines)
-		{
-			var result = new DefaultUnresolvedField (type, item.Name);
-			result.Region = new DomRegion ((int)item.Line, 1, (int)item.Line + 1, 1);
-			return result;
-		}
-		
-		static IUnresolvedMethod FunctionToIMethod (ProjectInformation pi, IUnresolvedTypeDefinition type, Function function, string[] contentLines)
-		{
-			var method = new DefaultUnresolvedMethod (type, function.Name);
-			method.Region = new DomRegion ((int)function.Line, 1, FindFunctionEnd (contentLines, (int)function.Line-1)+2, 1);
-			
-			Match match;
-			bool abort = false;
-			var parameters = new List<IUnresolvedParameter> ();
-			foreach (string parameter in function.Parameters) {
-				match = paramExpression.Match (parameter);
-				if (null == match) {
-					abort = true;
-					break;
-				}
-				var typeRef = new DefaultUnresolvedTypeDefinition (string.Format ("{0}{1}{2}", match.Groups["type"].Value, match.Groups["subtype"].Value, match.Groups["array"].Value));
-				var p =  new DefaultUnresolvedParameter (typeRef, match.Groups["name"].Value);
-				parameters.Add (p);
-			}
-			if (!abort)
-				parameters.ForEach (p => method.Parameters.Add (p));
-			return method;
-		}
-		
-		
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/CTagsManager.cs b/main/src/addins/CBinding/Parser/CTagsManager.cs
deleted file mode 100644
index a26645836d..0000000000
--- a/main/src/addins/CBinding/Parser/CTagsManager.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-// 
-// CTagsManager.cs
-//  
-// Author:
-//       Levi Bard <levi@unity3d.com>
-// 
-// Copyright (c) 2010 Levi Bard
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Linq;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-
-namespace CBinding.Parser
-{
-	public abstract class CTagsManager
-	{
-		public abstract Tag ParseTag (string tagEntry);
-		protected abstract IEnumerable<string> GetTags (FileInformation fileInfo);
-		protected abstract IEnumerable<string> GetTags (Project project, string filename, IEnumerable<string> headers);
-		
-		public static readonly string SystemTagsDirectory = UserProfile.Current.CacheDir.Combine ("CTagsData");
-		
-		public static string CTagsExecutable {
-			get { return PropertyService.Get<string> ("CBinding.CTagsExecutable", "ctags"); }
-		}
-		
-		static CTagsManager ()
-		{
-			try {
-				Directory.CreateDirectory (SystemTagsDirectory);
-			} catch (IOException ioe) {
-				LoggingService.LogError ("Error creating system tags directory", ioe);
-			}
-		}
-		
-		protected virtual void AddInfo (FileInformation info, Tag tag, string ctags_output)
-		{
-			switch (tag.Kind)
-			{
-			case TagKind.Class:
-				Class c = new Class (tag, info.Project, ctags_output);
-				if (!info.Classes.Contains (c))
-					info.Classes.Add (c);
-				break;
-			case TagKind.Enumeration:
-				Enumeration e = new Enumeration (tag, info.Project, ctags_output);
-				if (!info.Enumerations.Contains (e))
-					info.Enumerations.Add (e);
-				break;
-			case TagKind.Enumerator:
-				Enumerator en= new Enumerator (tag, info.Project, ctags_output);
-				if (!info.Enumerators.Contains (en))
-					info.Enumerators.Add (en);
-				break;
-			case TagKind.ExternalVariable:
-				break;
-			case TagKind.Function:
-				Function f = new Function (tag, info.Project, ctags_output);
-				if (!info.Functions.Contains (f))
-					info.Functions.Add (f);
-				break;
-			case TagKind.Local:
-				Local lo = new Local (tag, info.Project, ctags_output);
-				if(!info.Locals.Contains (lo))
-					info.Locals.Add (lo);
-				break;
-			case TagKind.Macro:
-				Macro m = new Macro (tag, info.Project);
-				if (!info.Macros.Contains (m))
-					info.Macros.Add (m);
-				break;
-			case TagKind.Member:
-				Member me = new Member (tag, info.Project, ctags_output);
-				if (!info.Members.Contains (me))
-					info.Members.Add (me);
-				break;
-			case TagKind.Namespace:
-				Namespace n = new Namespace (tag, info.Project, ctags_output);
-				if (!info.Namespaces.Contains (n))
-					info.Namespaces.Add (n);
-				break;
-			case TagKind.Prototype:
-				Function fu = new Function (tag, info.Project, ctags_output);
-				if (!info.Functions.Contains (fu))
-					info.Functions.Add (fu);
-				break;
-			case TagKind.Structure:
-				Structure s = new Structure (tag, info.Project, ctags_output);
-				if (!info.Structures.Contains (s))
-					info.Structures.Add (s);
-				break;
-			case TagKind.Typedef:
-				Typedef t = new Typedef (tag, info.Project, ctags_output);
-				if (!info.Typedefs.Contains (t))
-					info.Typedefs.Add (t);
-				break;
-			case TagKind.Union:
-				Union u = new Union (tag, info.Project, ctags_output);
-				if (!info.Unions.Contains (u))
-					info.Unions.Add (u);
-				break;
-			case TagKind.Variable:
-				Variable v = new Variable (tag, info.Project);
-				if (!info.Variables.Contains (v))
-					info.Variables.Add (v);
-				break;
-			default:
-				break;
-			}
-		}
-		
-		public virtual void FillFileInformation (FileInformation fileInfo)
-		{
-			IEnumerable<string> ctags_output = GetTags (fileInfo);
-			
-			foreach (string tagEntry in ctags_output) {
-				if (tagEntry.StartsWith ("!_")) continue;
-				
-				Tag tag = ParseTag (tagEntry);
-				
-				if (tag != null)
-					AddInfo (fileInfo, tag, tagEntry);
-			}
-			
-			fileInfo.IsFilled = true;
-		}
-		
-		public virtual void DoUpdateFileTags (MonoDevelop.Projects.Project project, string filename, IEnumerable<string> headers)
-		{
-			ProjectInformation info = ProjectInformationManager.Instance.Get (project);
-			
-			lock (info) {
-				info.RemoveFileInfo (filename);
-	
-				IEnumerable<string> tags = GetTags (project, filename, headers);
-				if (tags == null) return;
-				
-				foreach (string tagEntry in tags) {
-					if (tagEntry.StartsWith ("!_")) continue;
-					
-					Tag tag = ParseTag (tagEntry);
-					
-					if (tag != null)
-						AddInfo (info, tag, tagEntry);
-				}
-			}
-		}
-		
-		public static string GetOutputFromProcess (string executable, string args, string baseDirectory)
-		{
-			string processOutput = null;
-			ProcessWrapper p = null;
-			StringWriter output = null,
-			             error = null;
-			try {
-				output = new StringWriter ();
-				error = new StringWriter ();
-				
-				p = Runtime.ProcessService.StartProcess (executable, args, baseDirectory, output, error, null);
-				p.WaitForOutput (10000);
-				
-				if (p.HasExited) {
-					processOutput = output.ToString ();
-				}
-			} finally {
-				if (p != null)
-					p.Dispose ();
-				if (output != null)
-					output.Dispose ();
-			}
-			
-			return processOutput;
-		}
-	}
-}
-
diff --git a/main/src/addins/CBinding/Parser/Class.cs b/main/src/addins/CBinding/Parser/Class.cs
deleted file mode 100644
index 4099c6e8c3..0000000000
--- a/main/src/addins/CBinding/Parser/Class.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Class.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Class : LanguageItem
-	{		
-		public Class (Tag tag, Project project, string ctags_output) : base (tag, project)
-		{			
-			if (GetNamespace (tag, ctags_output)) return;
-			if (GetClass (tag, ctags_output)) return;
-			if (GetStructure (tag, ctags_output)) return;
-			if (GetUnion (tag, ctags_output)) return;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs b/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs
deleted file mode 100644
index 70c59b68ec..0000000000
--- a/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// 
-//  CompilationUnitDataProvider.cs
-//  
-//  Author:
-//       Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-// 
-//  Copyright (c) 2010 Levi Bard
-// 
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Linq;
-
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Components;
-
-using Gtk;
-
-namespace CBinding.Parser
-{
-	// Yoinked from C# binding
-	public class CompilationUnitDataProvider : DropDownBoxListWindow.IListDataProvider
-	{
-		Document Document { get; set; }
-		
-		public CompilationUnitDataProvider (Document document)
-		{
-			this.Document = document;
-		}
-		
-		#region IListDataProvider implementation
-		public void Reset () { }
-		
-		public string GetMarkup (int n)
-		{
-			return GLib.Markup.EscapeText (Document.ParsedDocument.UserRegions.ElementAt (n).Name);
-		}
-		
-		internal static Xwt.Drawing.Image Pixbuf
-		{
-			get { return ImageService.GetIcon (Gtk.Stock.Add, IconSize.Menu); }
-		}
-		
-		public Xwt.Drawing.Image GetIcon (int n)
-		{
-			return Pixbuf;
-		}
-		
-		public object GetTag (int n)
-		{
-			return Document.ParsedDocument.UserRegions.ElementAt (n);
-		}
-		
-		
-		public void ActivateItem (int n)
-		{
-			var reg = Document.ParsedDocument.UserRegions.ElementAt (n);
-			MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor extEditor = Document.GetContent<MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor> ();
-			if (extEditor != null)
-				extEditor.SetCaretTo (Math.Max (1, reg.Region.BeginLine), reg.Region.BeginColumn);
-		}
-		
-		public int IconCount
-		{
-			get {
-				if (Document.ParsedDocument == null)
-					return 0;
-				return Document.ParsedDocument.UserRegions.Count ();
-			}
-		}
-		
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/CBinding/Parser/DataProvider.cs b/main/src/addins/CBinding/Parser/DataProvider.cs
deleted file mode 100755
index 201f06ac4c..0000000000
--- a/main/src/addins/CBinding/Parser/DataProvider.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// 
-//  DataProvider.cs
-//  
-//  Author:
-//       Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-// 
-//  Copyright (c) 2010 Levi Bard
-// 
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections.Generic;
-
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Components;
-
-using Gtk;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace CBinding.Parser
-{
-	// Yoinked from C# binding
-	public class DataProvider : DropDownBoxListWindow.IListDataProvider
-	{
-		object tag;
-		Ambience amb;
-		List<IUnresolvedEntity> memberList = new List<IUnresolvedEntity> ();
-		
-		Document Document {
-			get;
-			set;
-		}
-		
-		public DataProvider (Document doc, object tag, Ambience amb)
-		{
-			this.Document = doc;
-			this.tag = tag;
-			this.amb = amb;
-			Reset ();
-		}
-		
-		#region IListDataProvider implementation
-		public void Reset ()
-		{
-			memberList.Clear ();
-			if (tag is IUnresolvedFile) {
-				var types = new Stack<IUnresolvedTypeDefinition> (((IUnresolvedFile)tag).TopLevelTypeDefinitions);
-				while (types.Count > 0) {
-					var type = types.Pop ();
-					memberList.Add (type);
-					foreach (var innerType in type.NestedTypes)
-						types.Push (innerType);
-				}
-			} else if (tag is IUnresolvedTypeDefinition) {
-				memberList.AddRange (((IUnresolvedTypeDefinition)tag).Members);
-			}
-			memberList.Sort ((x, y) => String.Compare (GetString (amb, x), GetString (amb, y), StringComparison.OrdinalIgnoreCase));
-		}
-		
-		string GetString (Ambience amb, IUnresolvedEntity x)
-		{
-			var ctx = new SimpleTypeResolveContext (Document.Compilation.MainAssembly);
-			IEntity rx = null;
-			if (x is IUnresolvedMember)
-				rx = ((IUnresolvedMember)x).CreateResolved (ctx);
-			
-			if (tag is IUnresolvedFile)
-				return amb.GetString (rx, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.UseFullInnerTypeName | OutputFlags.ReformatDelegates);
-			return amb.GetString (rx, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates);
-		}
-		
-		public string GetMarkup (int n)
-		{
-			var m = memberList[n];
-//			if (m.IsObsolete ())
-//				return "<s>" + GLib.Markup.EscapeText (GetString (amb, m)) + "</s>";
-			return GLib.Markup.EscapeText (GetString (amb, m));
-		}
-		
-		public Xwt.Drawing.Image GetIcon (int n)
-		{
-			return ImageService.GetIcon (memberList[n].GetStockIcon (), Gtk.IconSize.Menu);
-		}
-		
-		public object GetTag (int n)
-		{
-			return memberList[n];
-		}
-		
-		public void ActivateItem (int n)
-		{
-			var member = memberList[n];
-			MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor extEditor = Document.GetContent<MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor> ();
-			if (extEditor != null)
-				extEditor.SetCaretTo (Math.Max (1, member.Region.BeginLine), Math.Max (1, member.Region.BeginColumn));
-		}
-		
-		public int IconCount {
-			get {
-				return memberList.Count;
-			}
-		}
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/CBinding/Parser/Enumeration.cs b/main/src/addins/CBinding/Parser/Enumeration.cs
deleted file mode 100644
index adac66a33b..0000000000
--- a/main/src/addins/CBinding/Parser/Enumeration.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Enumeration.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Enumeration : LanguageItem
-	{
-		public Enumeration (Tag tag, Project project, string ctags_output) : base (tag, project)
-		{
-			if (GetNamespace (tag, ctags_output)) return;
-			if (GetClass (tag, ctags_output)) return;
-			if (GetStructure (tag, ctags_output)) return;
-			if (GetUnion (tag, ctags_output)) return;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/Enumerator.cs b/main/src/addins/CBinding/Parser/Enumerator.cs
deleted file mode 100644
index fe3af8ab6e..0000000000
--- a/main/src/addins/CBinding/Parser/Enumerator.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Tag.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Enumerator : LanguageItem
-	{
-		public Enumerator (Tag tag, Project project, string ctags_output) : base (tag, project)
-		{
-				GetEnumeration (tag, ctags_output);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/ExuberantCTagsManager.cs b/main/src/addins/CBinding/Parser/ExuberantCTagsManager.cs
deleted file mode 100644
index 2042b64e40..0000000000
--- a/main/src/addins/CBinding/Parser/ExuberantCTagsManager.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// 
-// ExuberantCTagsManager.cs
-//  
-// Author:
-//       Levi Bard <levi@unity3d.com>
-// 
-// Copyright (c) 2010 Levi Bard
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.IO;
-using System.Text;
-using System.Linq;
-using System.Collections.Generic;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-
-namespace CBinding.Parser
-{
-	public class ExuberantCTagsManager: CTagsManager
-	{
-		#region implemented abstract members of CBinding.Parser.CTagsManager
-
-		protected override IEnumerable<string> GetTags (FileInformation fileInfo)
-		{
-			string tagFileName = Path.GetFileName (fileInfo.FileName) + ".tag";
-			string tagFullFileName = Path.Combine (SystemTagsDirectory, tagFileName);
-			string ctags_kinds = "--C++-kinds=+px";
-			string ctags_output = string.Empty;
-			
-			if (PropertyService.Get<bool> ("CBinding.ParseLocalVariables", true))
-				ctags_kinds += "l";
-			
-			string ctags_options = ctags_kinds + " --fields=+aStisk-fz --language-force=C++ --excmd=number --line-directives=yes -f '" + tagFullFileName + "' '" + fileInfo.FileName + "'";
-			
-			if (!File.Exists (tagFullFileName) || File.GetLastWriteTimeUtc (tagFullFileName) < File.GetLastWriteTimeUtc (fileInfo.FileName)) {
-				GetOutputFromProcess (CTagsExecutable, ctags_options, Environment.CurrentDirectory);
-			}
-			try {
-				ctags_output = File.ReadAllText (tagFullFileName);
-			} catch (IOException ioe) {
-				LoggingService.LogError ("Error updating system tags", ioe);
-			}
-			
-			return ctags_output.Split (newlines, StringSplitOptions.RemoveEmptyEntries);
-		}
-		
-		public override Tag ParseTag (string tagEntry)
-		{
-			string file;
-			UInt64 line;
-			string name;
-			string tagField;
-			TagKind kind;
-			AccessModifier access = AccessModifier.Public;
-			string _class = null;
-			string _namespace = null;
-			string _struct = null;
-			string _union = null;
-			string _enum = null;
-			string signature = null;
-			
-			int i1 = tagEntry.IndexOf ('\t');
-			name = tagEntry.Substring (0, tagEntry.IndexOf ('\t'));
-			
-			i1 += 1;
-			int i2 = tagEntry.IndexOf ('\t', i1);
-			file = tagEntry.Substring (i1, i2 - i1);
-			
-			i1 = i2 + 1;
-			i2 = tagEntry.IndexOf (";\"", i1);
-			line = UInt64.Parse(tagEntry.Substring (i1, i2 - i1));
-
-			i1 = i2 + 3;	
-			kind = (TagKind)tagEntry[i1];
-			
-			i1 += 2;
-			tagField = (tagEntry.Length > i1? tagField = tagEntry.Substring(i1) : String.Empty);
-			
-			string[] fields = tagField.Split ('\t');
-			int index;
-			
-			foreach (string field in fields) {
-				index = field.IndexOf (':');
-				
-				// TODO: Support friend modifier
-				if (index > 0) {
-					string key = field.Substring (0, index);
-					string val = field.Substring (index + 1);
-					
-					switch (key) {
-						case "access":
-							try {
-								access = (AccessModifier)System.Enum.Parse (typeof(AccessModifier), val, true);
-							} catch (ArgumentException) {
-							}
-							break;
-						case "class":
-							_class = val;
-							break;
-						case "namespace":
-							_namespace = val;
-							break;
-						case "struct":
-							_struct = val;
-							break;
-						case "union":
-							_union = val;
-							break;
-						case "enum":
-							_enum = val;
-							break;
-						case "signature":
-							signature = val;
-							break;
-					}
-				}
-			}
-			
-			return new Tag (name, file, line, kind, access, _class, _namespace, _struct, _union, _enum, signature);
-		}
-		
-		static readonly char[] newlines = {'\r','\n'};
-		protected override IEnumerable<string> GetTags (MonoDevelop.Projects.Project project, string filename, IEnumerable<string> headers)
-		{
-			StringBuilder ctags_kinds = new StringBuilder ("--C++-kinds=+px");
-			
-			if (PropertyService.Get<bool> ("CBinding.ParseLocalVariables", true))
-				ctags_kinds.Append ("+l");
-			
-			// Maybe we should only ask for locals for 'local' files? (not external #includes?)
-			ctags_kinds.AppendFormat (" --fields=+aStisk-fz --language-force=C++ --excmd=number --line-directives=yes -f - '{0}'", filename);
-			foreach (string header in headers) {
-				ctags_kinds.AppendFormat (" '{0}'", header);
-			}
-			
-			string output = GetOutputFromProcess (CTagsExecutable, ctags_kinds.ToString (), project.BaseDirectory);
-			if (output != null)
-				return output.Split (newlines, StringSplitOptions.RemoveEmptyEntries);
-			return null;
-		}
-		
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/CBinding/Parser/Function.cs b/main/src/addins/CBinding/Parser/Function.cs
deleted file mode 100644
index 09d12dbd21..0000000000
--- a/main/src/addins/CBinding/Parser/Function.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// Function.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Function : LanguageItem
-	{
-		private string[] parameters;
-		private string signature;
-		private bool is_const = false;
-		
-		public Function (Tag tag, Project project, string ctags_output) : base (tag, project)
-		{
-			signature = tag.Signature;
-			ParseSignature (tag.Signature);
-			
-			if (GetNamespace (tag, ctags_output)) return;
-			if (GetClass (tag, ctags_output)) return;
-			if (GetStructure (tag, ctags_output)) return;
-			if (GetUnion (tag, ctags_output)) return;
-
-			// TODO: Remove all this when sure it is no longer needed
-			// (because we no longer generate prototype tags).
-//			if (tag.Kind == TagKind.Prototype) {
-//				Access = tag.Access;
-//				if (GetNamespace (tag, ctags_output)) return;
-//				if (GetClass (tag, ctags_output)) return;
-//				if (GetStructure (tag, ctags_output)) return;
-//				if (GetUnion (tag, ctags_output)) return;
-//			} else {
-//				// If it is not a prototype tag, we attempt to get the prototype tag
-//				// we need the prototype tag because the implementation tag
-//				// marks the belonging namespace as a if it were a class
-//				// and it does not have the access field.
-//				Tag prototypeTag = TagDatabaseManager.Instance.FindTag (Name, TagKind.Prototype, ctags_output);
-//				
-//				if (prototypeTag == null) {
-//					// It does not have a prototype tag which means it is inline
-//					// and when it is inline it does have all the info we need
-//					
-//					if (GetNamespace (tag, ctags_output)) return;
-//					if (GetClass (tag, ctags_output)) return;
-//					if (GetStructure (tag, ctags_output)) return;
-//					if (GetUnion (tag, ctags_output)) return;
-//					
-//					return;
-//				}
-//				
-//				// we need to re-get the access
-//				Access = prototypeTag.Access;
-//				
-//				if (GetNamespace (prototypeTag, ctags_output)) return;
-//				if (GetClass (prototypeTag, ctags_output)) return;
-//				if (GetStructure (prototypeTag, ctags_output)) return;
-//				if (GetUnion (prototypeTag, ctags_output)) return;
-//			}
-		}
-		
-		private void ParseSignature (string signature)
-		{
-			if (null == signature) return;
-			
-			string sig = signature;
-			
-			if (signature.EndsWith ("const")) {
-				is_const = true;
-				sig = signature.Substring (0, signature.Length - 6);
-				sig = sig.Substring (1, sig.Length - 2);
-			} else {
-				sig = signature.Substring (1, signature.Length - 2);
-			}
-			
-			parameters = sig.Split (',');
-			
-			for (int i = 0; i < parameters.Length; i++)
-				parameters[i] = parameters[i].Trim ();
-		}
-		
-		public string[] Parameters {
-			get { return parameters; }
-		}
-		
-		public string Signature {
-			get { return signature; }
-		}
-		
-		public bool IsConst {
-			get { return is_const; }
-		}
-		
-		public override bool Equals (object o)
-		{
-			Function other = o as Function;
-			
-			if (other != null &&
-			    FullName == other.FullName &&
-			    Project.Equals(other.Project) &&
-				Signature == other.Signature)
-				return true;
-			
-			return false;
-		}
-		
-		public override int GetHashCode ()
-		{
-			return base.GetHashCode () + parameters.GetHashCode ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/LanguageItem.cs b/main/src/addins/CBinding/Parser/LanguageItem.cs
deleted file mode 100644
index f5a5ec69d4..0000000000
--- a/main/src/addins/CBinding/Parser/LanguageItem.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-//
-// LanguageItem.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-using MonoDevelop.Core;
-
-namespace CBinding.Parser
-{
-	public class LanguageItem
-	{
-		private Project project;
-		private string name;
-		private string file;
-		private UInt64 line;
-		private AccessModifier access;
-		private LanguageItem parent;
-		
-		public LanguageItem (Tag tag, Project project)
-		{
-			this.project = project;
-			this.name = tag.Name;
-			this.file = tag.File;
-			this.line = tag.Line;
-			this.access = tag.Access;
-		}
-		
-		/// <summary>
-		/// Attempts to get the namespace encompasing the function
-		/// returns true on success and false if it does not have one.
-		/// NOTE: if it's a method then even if the class it belongs to
-		/// has a namespace the method will not have a namespace since
-		/// it should be placed under the class node and not the namespace node
-		/// </summary>
-		protected bool GetNamespace (Tag tag, string ctags_output)
-		{
-			string n;
-			
-			if ((n = tag.Namespace) != null) {
-				int index = n.LastIndexOf (':');
-				
-				if (index > 0)
-					n = n.Substring (index + 1);
-				
-				try {
-					Tag namespaceTag = TagDatabaseManager.Instance.FindTag (
-					    n, TagKind.Namespace, ctags_output);
-					
-					if (namespaceTag != null)
-						parent = new Namespace (namespaceTag, project, ctags_output);
-					
-				} catch (IOException ex) {
-					LoggingService.LogInternalError (ex);
-					return false;
-				}
-				
-				return true;
-			}
-			
-			return false;
-		}
-		
-		protected bool GetClass (Tag tag, string ctags_output)
-		{
-			string c;
-			
-			if ((c = tag.Class) != null) {
-				int index = c.LastIndexOf (':');
-				
-				if (index > 0)
-					c = c.Substring (index + 1);
-				
-				try {
-					Tag classTag = TagDatabaseManager.Instance.FindTag (
-					    c, TagKind.Class, ctags_output);
-					
-					if (classTag != null)
-						parent = new Class (classTag, project, ctags_output);
-					
-				} catch (IOException ex) {
-					LoggingService.LogInternalError (ex);
-					return false;
-				}
-				
-				return true;
-			}
-			
-			return false;
-		}
-		
-		protected bool GetStructure (Tag tag, string ctags_output)
-		{
-			string s;
-			
-			if ((s = tag.Structure) != null) {
-				int index = s.LastIndexOf (':');
-				
-				if (index > 0)
-					s = s.Substring (index + 1);
-				
-				try {
-					Tag classTag = TagDatabaseManager.Instance.FindTag (
-					    s, TagKind.Structure, ctags_output);
-					
-					if (classTag != null)
-						parent = new Structure (classTag, project, ctags_output);
-					
-				} catch (IOException ex) {
-					LoggingService.LogInternalError (ex);
-					return false;
-				}
-				
-				return true;
-			}
-			
-			return false;
-		}
-		
-		protected bool GetEnumeration (Tag tag, string ctags_output)
-		{
-			string e;
-			
-			if ((e = tag.Enum) != null) {
-				int index = e.LastIndexOf (':');
-				
-				if (index > 0)
-					e = e.Substring (index + 1);
-				
-				try {
-					Tag enumTag = TagDatabaseManager.Instance.FindTag (
-					    e, TagKind.Enumeration, ctags_output);
-					
-					if (enumTag != null)
-						parent = new Enumeration (enumTag, project, ctags_output);
-					
-				} catch (IOException ex) {
-					LoggingService.LogInternalError (ex);
-					return false;
-				}
-				
-				return true;
-			}
-			
-			return false;
-		}
-		
-		protected bool GetUnion (Tag tag, string ctags_output)
-		{
-			string u;
-			
-			if ((u = tag.Union) != null) {
-				int index = u.LastIndexOf (':');
-				
-				if (index > 0)
-					u = u.Substring (index + 1);
-				
-				try {
-					Tag unionTag = TagDatabaseManager.Instance.FindTag (
-					    u, TagKind.Union, ctags_output);
-					
-					if (unionTag != null)
-						parent = new Union (unionTag, project, ctags_output);
-					
-				} catch (IOException ex) {
-					LoggingService.LogInternalError (ex);
-					return false;
-				}
-				
-				return true;
-			}
-			
-			return false;
-		}
-		
-		public Project Project {
-			get { return project; }
-		}
-		
-		public LanguageItem Parent {
-			get { return parent; }
-			set { parent = value; }
-		}
-		
-		public string Name {
-			get { return name; }
-		}
-		
-		public string FullName {
-			get {
-				if (Parent != null)
-					return Parent.FullName + "::" + Name;
-				return Name;
-			}
-		}
-		
-		public string File {
-			get { return file; }
-		}
-		
-		public UInt64 Line {
-			get { return line; }
-		}
-		
-		public AccessModifier Access {
-			get { return access; }
-			set { access = value; }
-		}
-		
-		public override bool Equals (object o)
-		{
-			LanguageItem other = o as LanguageItem;
-			
-			if (other != null &&
-			    other.FullName.Equals (FullName) &&
-			    other.Project.Equals (project))
-				return true;
-			
-			return false;
-		}
-		
-		public override int GetHashCode ()
-		{
-			return (name + file + line.ToString() + project.Name).GetHashCode ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/Local.cs b/main/src/addins/CBinding/Parser/Local.cs
deleted file mode 100644
index 06dd51fff0..0000000000
--- a/main/src/addins/CBinding/Parser/Local.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Member.cs
-//
-// Authors:
-//   Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-//
-// Copyright (C) 2008 Levi Bard
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	/// <summary>
-	/// Class for local variables
-	/// </summary>
-	public class Local : Member
-	{
-		public Local (Tag tag, Project project, string ctags_output) : base (tag, project, ctags_output)
-		{
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/Macro.cs b/main/src/addins/CBinding/Parser/Macro.cs
deleted file mode 100644
index 14d709b8a7..0000000000
--- a/main/src/addins/CBinding/Parser/Macro.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Macro.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Macro : LanguageItem
-	{
-		public Macro (Tag tag, Project project) : base (tag, project)
-		{
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/Member.cs b/main/src/addins/CBinding/Parser/Member.cs
deleted file mode 100644
index 46c46ede7b..0000000000
--- a/main/src/addins/CBinding/Parser/Member.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// Member.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text.RegularExpressions;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Member : LanguageItem
-	{
-		public string InstanceType {
-			get{ return instanceType; }
-		}
-		protected string instanceType;
-		
-		public bool IsPointer {
-			get{ return isPointer; }
-		}
-		protected bool isPointer;
-		
-		public Member (Tag tag, Project project, string ctags_output) : base (tag, project)
-		{
-			GetInstanceType (tag);
-			
-			if (GetClass (tag, ctags_output)) return;
-			if (GetStructure (tag, ctags_output)) return;
-			if (GetUnion (tag, ctags_output)) return;
-		}
-		
-		/// <summary>
-		/// Regex for deriving the type of a variable, 
-		/// and whether it's a pointer, 
-		/// from an expression, e.g. 
-		/// static Foo::bar<string> *blah = NULL;
-		/// </summary>
-		public static Regex InstanceTypeExpression = new Regex (
-		  @"^\s*((static|friend|const|mutable|extern|struct|union|\w*::|<[\w><:]*>)\s*)*(?<type>\w[\w\d]*)\s*(<.*>)?\s*(?<pointer>[*])?", 
-		  RegexOptions.Compiled);
-		
-		/// <summary>
-		/// Populates an instance's instanceType and isPointer fields 
-		/// by matching its pattern against InstanceTypeExpression
-		/// </summary>
-		/// <param name="tag">
-		/// The partially-populated tag of an instance
-		/// <see cref="Tag"/>
-		/// </param>
-		/// <returns>
-		/// Whether the regex was successfully matched
-		/// <see cref="System.Boolean"/>
-		/// </returns>
-		protected bool GetInstanceType (Tag tag) {
-			try {
-				string declaration = null;
-				
-				using (StreamReader reader = new StreamReader (tag.File)) {
-					for (ulong i=0; i<tag.Line; ++i) {
-						declaration = reader.ReadLine ();
-					}
-				}
-				
-				Match m = InstanceTypeExpression.Match (declaration);
-				
-				if (null != m) {
-					instanceType = m.Groups["type"].Value;
-					isPointer = m.Groups["pointer"].Success;
-					return true;
-				}
-			} catch { }
-			
-			return false;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/Namespace.cs b/main/src/addins/CBinding/Parser/Namespace.cs
deleted file mode 100644
index 061daf1cbe..0000000000
--- a/main/src/addins/CBinding/Parser/Namespace.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Namespace.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Namespace : LanguageItem
-	{	
-		public Namespace (Tag tag, Project project, string ctags_output) : base (tag, project)
-		{			
-			GetNamespace (tag, ctags_output);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/ProjectInformation.cs b/main/src/addins/CBinding/Parser/ProjectInformation.cs
deleted file mode 100644
index 86417b2254..0000000000
--- a/main/src/addins/CBinding/Parser/ProjectInformation.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-//
-// ProjectInformation.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using MonoDevelop.Projects;
-
-using CBinding.Navigation;
-
-namespace CBinding.Parser
-{
-	public class FileInformation
-	{
-		protected Project project;
-		
-		protected List<Namespace> namespaces = new List<Namespace> ();
-		protected List<Function> functions = new List<Function> ();
-		protected List<Class> classes = new List<Class> ();
-		protected List<Structure> structures = new List<Structure> ();
-		protected List<Member> members = new List<Member> ();
-		protected List<Variable> variables = new List<Variable> ();
-		protected List<Macro> macros = new List<Macro> ();
-		protected List<Enumeration> enumerations = new List<Enumeration> ();
-		protected List<Enumerator> enumerators = new List<Enumerator> ();
-		protected List<Union> unions = new List<Union> ();
-		protected List<Typedef> typedefs = new List<Typedef> ();
-		protected List<Local> locals = new List<Local> ();
-		
-		private string file_name;
-		private bool is_filled = false;
-		
-		public FileInformation (Project project)
-		{
-			this.project = project;
-			this.file_name = null;
-		}
-		
-		public FileInformation (Project project, string filename)
-		{
-			this.project = project;
-			this.file_name = filename;
-		}
-		
-		public void Clear ()
-		{
-			namespaces.Clear ();
-			functions.Clear ();
-			classes.Clear ();
-			structures.Clear ();
-			members.Clear ();
-			variables.Clear ();
-			macros.Clear ();
-			enumerations.Clear ();
-			enumerators.Clear ();
-			unions.Clear ();
-			typedefs.Clear ();
-			locals.Clear ();
-		}
-		
-		/// <summary>
-		/// Remove a file's parse information from the database.
-		/// </summary>
-		public void RemoveFileInfo(string filename)
-		{
-			namespaces.RemoveAll(delegate(Namespace item){ return item.File == filename; });
-			functions.RemoveAll(delegate(Function item){ return item.File == filename; });
-			classes.RemoveAll(delegate(Class item){ return item.File == filename; });
-			structures.RemoveAll(delegate(Structure item){ return item.File == filename; });
-			members.RemoveAll(delegate(Member item){ return item.File == filename; });
-			variables.RemoveAll(delegate(Variable item){ return item.File == filename; });
-			macros.RemoveAll(delegate(Macro item){ return item.File == filename; });
-			enumerations.RemoveAll(delegate(Enumeration item){ return item.File == filename; });
-			enumerators.RemoveAll(delegate(Enumerator item){ return item.File == filename; });
-			unions.RemoveAll(delegate(Union item){ return item.File == filename; });
-			typedefs.RemoveAll(delegate(Typedef item){ return item.File == filename; });
-			locals.RemoveAll(delegate(Local item){ return item.File == filename; });
-		}
-		
-		public IEnumerable<LanguageItem> Containers ()
-		{
-			List<LanguageItem> containers = new List<LanguageItem> ();
-			
-			containers.AddRange ((LanguageItem[])namespaces.ToArray());
-			containers.AddRange ((LanguageItem[])classes.ToArray());
-			containers.AddRange ((LanguageItem[])structures.ToArray());
-			containers.AddRange ((LanguageItem[])enumerations.ToArray());
-			containers.AddRange ((LanguageItem[])unions.ToArray());
-			
-			return containers;
-		}
-		
-		// Functions, fields
-		public IEnumerable<LanguageItem> InstanceMembers ()
-		{
-			List<LanguageItem> instanceMembers = new List<LanguageItem> ();
-			
-			instanceMembers.AddRange ((LanguageItem[])functions.ToArray());
-			instanceMembers.AddRange ((LanguageItem[])members.ToArray());
-			
-			return instanceMembers;
-		}
-		
-		// All items except macros
-		public IEnumerable<LanguageItem> AllItems ()
-		{
-			List<LanguageItem> allItems = new List<LanguageItem> ();
-			
-			allItems.AddRange (Containers ());
-			allItems.AddRange (InstanceMembers ());
-			allItems.AddRange ((LanguageItem[])variables.ToArray());
-			allItems.AddRange ((LanguageItem[])enumerators.ToArray());
-			allItems.AddRange ((LanguageItem[])typedefs.ToArray());
-			allItems.AddRange ((LanguageItem[])locals.ToArray());
-			
-			return allItems;
-		}
-		
-		public Project Project {
-			get { return project; }
-		}
-		
-		public List<Namespace> Namespaces {
-			get { return namespaces; }
-		}
-		
-		public List<Function> Functions {
-			get { return functions; }
-		}
-		
-		public List<Class> Classes {
-			get { return classes; }
-		}
-		
-		public List<Structure> Structures {
-			get { return structures; }
-		}
-		
-		public List<Member> Members {
-			get { return members; }
-		}
-		
-		public List<Variable> Variables {
-			get { return variables; }
-		}
-		
-		public List<Macro> Macros {
-			get { return macros; }
-		}
-		
-		public List<Enumeration> Enumerations {
-			get { return enumerations; }
-		}
-		
-		public List<Enumerator> Enumerators {
-			get { return enumerators; }
-		}
-		
-		public List<Union> Unions {
-			get { return unions; } 
-		}
-		
-		public List<Typedef> Typedefs {
-			get { return typedefs; }
-		}
-		
-		public List<Local> Locals {
-			get { return locals; }
-		}
-		
-		public string FileName {
-			get { return file_name; }
-			set { file_name = value; }
-		}
-		
-		public bool IsFilled {
-			get { return is_filled; }
-			set { is_filled = value; }
-		}
-	}
-
-	// TODO: Update this such that it either supports multiple configurations - or is used in a configuration specific manner.
-	public class ProjectInformation : FileInformation
-	{
-		private Globals globals;
-		private MacroDefinitions macroDefs;
-		
-		private Dictionary<string, List<FileInformation>> includedFiles = new Dictionary<string, List<FileInformation>> ();
-		
-		public ProjectInformation (Project project) : base (project)
-		{
-			globals = new Globals (project);
-			macroDefs = new MacroDefinitions (project);
-		}
-		
-		public Globals Globals {
-			get { return globals; }
-		}
-		
-		public MacroDefinitions MacroDefinitions {
-			get { return macroDefs; }
-		}
-		
-		public Dictionary<string, List<FileInformation>> IncludedFiles {
-			get { return includedFiles; }
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/ProjectInformationManager.cs b/main/src/addins/CBinding/Parser/ProjectInformationManager.cs
deleted file mode 100644
index ee94704334..0000000000
--- a/main/src/addins/CBinding/Parser/ProjectInformationManager.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// ProjectInformationManager.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using MonoDevelop.Projects;
-
-using CBinding.Navigation;
-
-namespace CBinding.Parser
-{
-	/// <summary>
-	/// Singleton class to manage the navigation information of each project
-	/// </summary>
-	public class ProjectInformationManager
-	{
-		private static ProjectInformationManager instance;
-		private List<ProjectInformation> projects = new List<ProjectInformation> ();
-		
-		private ProjectInformationManager ()
-		{
-		}
-		
-		public ProjectInformation Get (Project project)
-		{
-			foreach (ProjectInformation p in projects) {
-				if (p.Project == project || 
-				    (null != project && project.Equals (p.Project))) {
-					return p;
-				}
-			}
-			
-			ProjectInformation newinfo = new ProjectInformation (project);
-			projects.Add (newinfo);
-			
-			return newinfo;
-		}
-		
-		public static ProjectInformationManager Instance {
-			get {
-				if (instance == null)
-					instance = new ProjectInformationManager ();
-				
-				return instance;
-			}
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/Structure.cs b/main/src/addins/CBinding/Parser/Structure.cs
deleted file mode 100644
index e8c11cdb22..0000000000
--- a/main/src/addins/CBinding/Parser/Structure.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Structure.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Structure : LanguageItem
-	{
-		public Structure (Tag tag, Project project, string ctags_output) : base (tag, project)
-		{
-			if (GetNamespace (tag, ctags_output)) return;
-			if (GetClass (tag, ctags_output)) return;
-			if (GetStructure (tag, ctags_output)) return;
-			if (GetUnion (tag, ctags_output)) return;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/Tag.cs b/main/src/addins/CBinding/Parser/Tag.cs
deleted file mode 100644
index b2c02aaabb..0000000000
--- a/main/src/addins/CBinding/Parser/Tag.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// Tag.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-
-namespace CBinding.Parser
-{
-	public enum TagKind {
-		Class = 'c',
-		Macro = 'd',
-		Enumerator = 'e',
-		Function = 'f',
-		Enumeration = 'g',
-		Local = 'l',
-		Member = 'm',
-		Namespace = 'n',
-		Prototype = 'p',
-		Structure = 's',
-		Typedef = 't',
-		Union = 'u',
-		Variable = 'v',
-		ExternalVariable = 'x',
-		Unknown = ' '
-	}
-	
-	public enum AccessModifier {
-		Private,
-		Protected,
-		Public
-	}
-	
-	public class Tag
-	{
-		private string name;
-		private string file;
-		private UInt64 line;
-		private TagKind kind;
-		private AccessModifier access;
-		private string field_class;
-		private string field_namespace;
-		private string field_struct;
-		private string field_union;
-		private string field_enum;
-		private string field_signature;
-		
-		public Tag (string name,
-		            string file,
-		            UInt64 line,
-		            TagKind kind,
-		            AccessModifier access,
-		            string field_class,
-		            string field_namespace,
-		            string field_struct,
-		            string field_union,
-		            string field_enum,
-		            string field_signature)
-		{
-			this.name = name;
-			this.file = file;
-			this.line = line;	
-			this.kind = kind;
-			this.access = access;
-			this.field_class = field_class;
-			this.field_namespace = field_namespace;
-			this.field_struct = field_struct;
-			this.field_union = field_union;
-			this.field_enum = field_enum;
-			this.field_signature = field_signature;
-		}
-		
-		public string Name {
-			get { return name; }
-		}
-		
-		public string File {
-			get { return file; }
-		}
-
-		public UInt64 Line {
-			get { return line; }
-		}
-		
-		public TagKind Kind {
-			get { return kind; }
-		}
-		
-		public AccessModifier Access {
-			get { return access; }
-		}
-		
-		public string Class {
-			get { return field_class; }
-		}
-		
-		public string Namespace {
-			get { return field_namespace; }
-		}
-		
-		public string Structure {
-			get { return field_struct; }
-		}
-		
-		public string Union {
-			get { return field_union; }
-		}
-		
-		public string Enum {
-			get { return field_enum; }
-		}
-		
-		public string Signature {
-			get { return field_signature; }
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/TagDatabaseManager.cs b/main/src/addins/CBinding/Parser/TagDatabaseManager.cs
deleted file mode 100644
index c88d2c4db0..0000000000
--- a/main/src/addins/CBinding/Parser/TagDatabaseManager.cs
+++ /dev/null
@@ -1,499 +0,0 @@
-//
-// TagDatabaseManager.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//   Mitchell Wheeler <mitchell.wheeler@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using System.Threading;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Ide.Gui;
-
-using CBinding.Navigation;
-
-//  TODO
-//  Generic, language independant 'TagDatabaseManager'
-//  Parsing of ctags data into a Sqlite database, for easy/efficient access & updates.
-//  
-namespace CBinding.Parser
-{
-	/// <summary>
-	/// Singleton class to manage tag databases
-	/// </summary>
-	class TagDatabaseManager
-	{
-		private static TagDatabaseManager instance;
-		private Queue<ProjectFilePair> parsingJobs = new Queue<ProjectFilePair> ();
-		private Thread parsingThread;
-		private CTagsManager ctags;
-		
-		public event ClassPadEventHandler FileUpdated;
-		
-		bool ctagsInstalled = false;
-		bool checkedCtagsInstalled = false;
-		
-		private TagDatabaseManager()
-		{
-		}
-		
-		public static TagDatabaseManager Instance
-		{
-			get {
-				if (instance == null)
-					instance = new TagDatabaseManager ();
-				
-				return instance;
-			}
-		}
-		
-		public bool DepsInstalled {
-			get {
-				if (!checkedCtagsInstalled) {
-					checkedCtagsInstalled = true;
-					
-					try {
-						var output = new StringWriter ();
-						Runtime.ProcessService.StartProcess (CTagsManager.CTagsExecutable, "--version", null, output, null, null).WaitForExit ();
-						if (Platform.IsMac && !output.ToString ().StartsWith ("Exuberant", StringComparison.Ordinal)) {
-							System.Console.WriteLine ("Fallback to OSX ctags");
-							ctags = new BsdCTagsManager ();
-						} else {
-							ctags = new ExuberantCTagsManager ();
-						}
-					} catch {
-						LoggingService.LogWarning ("Cannot update C/C++ tags database because exuberant ctags is not installed.");
-						return false;
-					}
-					try {
-						Runtime.ProcessService.StartProcess ("gcc", "--version", null, null).WaitForOutput ();
-					} catch {
-						LoggingService.LogWarning ("Cannot update C/C++ tags database because gcc is not installed.");
-						return false;
-					}
-					lock (parsingJobs) {
-						ctagsInstalled = true;
-					}
-				}
-				return ctagsInstalled && ctags != null;
-			}
-			set {
-				//don't assume that the caller is correct :-)
-				if (value)
-					checkedCtagsInstalled = false; //wil re-determine ctagsInstalled on next getting
-				else
-					ctagsInstalled = false;
-			}
-		}
-		
-		private string[] Headers (Project project, string filename, bool with_system)
-		{
-			List<string> headers = new List<string> ();
-			CProject cproject = project as CProject;
-			if (cproject == null){ return headers.ToArray(); }
-			
-			StringBuilder output = new StringBuilder ();
-			StringBuilder option = new StringBuilder ("-M");
-			if (!with_system) {
-				option.Append("M");
-			}
-			
-			option.Append (" -MG ");
-			foreach (Package package in cproject.Packages) {
-				package.ParsePackage ();
-				option.AppendFormat ("{0} ", string.Join(" ", package.CFlags.ToArray ()));
-			}
-			
-			ProcessWrapper p = null;
-			try {
-				p = Runtime.ProcessService.StartProcess ("gcc", option.ToString () + filename.Replace(@"\ ", " ").Replace(" ", @"\ "), null, null);
-				p.WaitForOutput ();
-
-				// Doing the below completely breaks header parsing
-				// // Skip first two lines (.o & .c* files) - WARNING, sometimes this is compacted to 1 line... we need a better way of handling this.
-				// if(p.StandardOutput.ReadLine () == null) return new string[0]; // object file
-				// if(p.StandardOutput.ReadLine () == null) return new string[0]; // compile file
-
-				string line;
-				while ((line = p.StandardOutput.ReadLine ()) != null)
-					output.Append (line);
-			} catch (Exception ex) {
-				LoggingService.LogError (ex.ToString ());
-				return new string [0];
-			}
-			finally {
-				if(p != null)
-					p.Dispose();
-			}
-			
-			MatchCollection files = Regex.Matches(output.ToString().Replace(@" \", String.Empty), @" (?<file>([^ \\]|(\\ ))+)", RegexOptions.IgnoreCase);
-
-			foreach (Match match in files) {
-				string depfile = findFileInIncludes(project, match.Groups["file"].Value.Trim());
-				
-				headers.Add (depfile.Replace(@"\ ", " ").Replace(" ", @"\ "));
-			}
-			
-			return headers.ToArray ();
-		}
-		
-		/// <summary>
-		/// Finds a file in a project's include path(s)
-		/// </summary>
-		/// <param name="project">
-		/// The project whose include path is to be searched
-		/// <see cref="Project"/>
-		/// </param>
-		/// <param name="filename">
-		/// A portion of a full file path
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// The full found path, or filename if not found
-		/// <see cref="System.String"/>
-		/// </returns>
-		private static string findFileInIncludes (Project project, string filename) {
-			CProjectConfiguration conf = project.DefaultConfiguration as CProjectConfiguration;
-			string fullpath = string.Empty;
-			
-			if (!Path.IsPathRooted (filename)) {
-				// Check against base directory
-				fullpath = findFileInPath (filename, project.BaseDirectory);
-				if (string.Empty != fullpath) return fullpath;
-
-				if (conf != null) {
-					// Check project's additional configuration includes
-					foreach (string p in conf.Includes) {
-						fullpath = findFileInPath (filename, p);
-						if (string.Empty != fullpath) return fullpath;
-					}
-				}
-			}
-			
-			return filename;
-		}
-		
-		/// <summary>
-		/// Finds a file in a subdirectory of a given path
-		/// </summary>
-		/// <param name="relativeFilename">
-		/// A portion of a full file path
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <param name="path">
-		/// The path beneath which to look for relativeFilename
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// The full path, or string.Empty if not found
-		/// <see cref="System.String"/>
-		/// </returns>
-		private static string findFileInPath (string relativeFilename, string path) {
-			string tmp = Path.Combine (path, relativeFilename);
-			
-			if (Path.IsPathRooted (relativeFilename))
-				return relativeFilename;
-			else if (File.Exists (tmp))
-				return tmp;
-			
-			if (Directory.Exists (path)) {
-				foreach (string subdir in Directory.GetDirectories (path)) {
-					tmp = findFileInPath (relativeFilename, subdir);
-					if (string.Empty != tmp) return tmp;
-				}
-			}
-			
-			return string.Empty;
-		}
-		
-		private void UpdateSystemTags (Project project, string filename, IEnumerable<string> includedFiles)
-		{
-			if (!DepsInstalled)
-				return;
-			ProjectInformation info = ProjectInformationManager.Instance.Get (project);
-			List<FileInformation> files;
-			
-			lock (info) {
-				if (!info.IncludedFiles.ContainsKey (filename)) {
-					files = new List<FileInformation> ();
-					info.IncludedFiles.Add (filename, files);
-				} else {
-					files = info.IncludedFiles[filename];
-				}
-				
-				foreach (string includedFile in includedFiles) {
-					bool contains = false;
-					
-					foreach (FileInformation fi in files) {
-						if (fi.FileName == includedFile) {
-							contains = true;
-						}
-					}
-					
-					if (!contains) {
-						FileInformation newFileInfo = new FileInformation (project, includedFile);
-						files.Add (newFileInfo);
-						ctags.FillFileInformation (newFileInfo);
-					}
-					
-					contains = false;
-				}
-			}
-		}
-		
-		private void ParsingThread ()
-		{
-			try {
-				while (parsingJobs.Count > 0) {
-					ProjectFilePair p;
-					
-					lock (parsingJobs) {
-						p = parsingJobs.Dequeue ();
-					}
-					
-					string[] headers = Headers (p.Project, p.File, false);
-					ctags.DoUpdateFileTags (p.Project, p.File, headers);
-					OnFileUpdated (new ClassPadEventArgs (p.Project));
-					
-					if (PropertyService.Get<bool> ("CBinding.ParseSystemTags", true))
-						UpdateSystemTags (p.Project, p.File, Headers (p.Project, p.File, true).Except (headers));
-					
-					if (cache.Count > cache_size)
-						cache.Clear ();
-				}
-			} catch (Exception ex) {
-				LoggingService.LogError ("Unhandled error updating parser database. Disabling C/C++ parsing.", ex);
-				DepsInstalled = false;
-				return;
-			}
-		}
-		
-		public void UpdateFileTags (Project project, string filename)
-		{
-			if (!DepsInstalled)
-				return;
-			
-			ProjectFilePair p = new ProjectFilePair (project, filename);
-			
-			lock (parsingJobs) {
-				if (!parsingJobs.Contains (p))
-					parsingJobs.Enqueue (p);
-			}
-			
-			if (parsingThread == null || !parsingThread.IsAlive) {
-				parsingThread = new Thread (ParsingThread);
-				parsingThread.Name = "Tag database parser";
-				parsingThread.IsBackground = true;
-				parsingThread.Priority = ThreadPriority.Lowest;
-				parsingThread.Start();
-			}
-		}
-		
-		Tag BinarySearch (string[] ctags_lines, TagKind kind, string name)
-		{
-			int low;
-			int high = ctags_lines.Length - 2; // last element is an empty string (because of the Split)
-			int mid;
-			int start_index = 0;
-			
-			// Skip initial comment lines
-			while (ctags_lines[start_index].StartsWith ("!_"))
-				start_index++;
-
-			low = start_index;
-			
-			while (low <= high) {
-				mid = (low + high) / 2;
-				string entry = ctags_lines[mid];
-				string tag_name = entry.Substring (0, entry.IndexOf ('\t'));
-				int res = string.CompareOrdinal (tag_name, name);
-				
-				if (res < 0) {
-					low = mid + 1;
-				} else if (res > 0) {
-					high = mid - 1;
-				} else {
-					// The tag we are at has the same name than the one we are looking for
-					// but not necessarily the same type, the actual tag we are looking
-					// for might be higher up or down, so we try both, starting with going down.
-					int save = mid;
-					bool going_down = true;
-					bool eof = false;
-					
-					while (true) {
-						Tag tag = ctags.ParseTag (entry);
-						
-						if (tag == null)
-							return null;
-						
-						if (tag.Kind == kind && tag_name == name)
-							return tag;
-						
-						if (going_down) {
-							mid++;
-							
-							if (mid >= ctags_lines.Length - 1)
-								eof = true;
-							
-							if (!eof) {
-								entry = ctags_lines[mid];
-								tag_name = entry.Substring (0, entry.IndexOf ('\t'));
-								
-								if (tag_name != name) {
-									going_down = false;
-									mid = save - 1;
-								}
-							} else {
-								going_down = false;
-								mid = save - 1;
-							}
-						} else { // going up
-							mid--;
-
-							if (mid < start_index)
-								return null;
-							
-							entry = ctags_lines[mid];
-							tag_name = entry.Substring (0, entry.IndexOf ('\t'));
-							
-							if (tag_name != name)
-								return null;
-						}
-					}
-				}
-			}
-			
-			return null;
-		}
-		
-		private struct SemiTag
-		{
-			readonly internal string name;
-			readonly internal TagKind kind;
-			
-			internal SemiTag (string name, TagKind kind)
-			{
-				this.name = name;
-				this.kind = kind;
-			}
-			
-			public override int GetHashCode ()
-			{
-				return (name + kind.ToString ()).GetHashCode ();
-			}
-		}
-		
-		private const int cache_size = 10000;
-		private Dictionary<SemiTag, Tag> cache = new Dictionary<SemiTag, Tag> ();
-		
-		public Tag FindTag (string name, TagKind kind, string ctags_output)
-		{
-			SemiTag semiTag = new SemiTag (name, kind);
-			
-			if (cache.ContainsKey (semiTag))
-				return cache[semiTag];
-			else {
-				string[] ctags_lines = ctags_output.Split ('\n');
-				Tag tag = BinarySearch (ctags_lines, kind, name);
-				cache.Add (semiTag, tag);
-				
-				return tag;
-			}
-		}
-		
-		/// <summary>
-		/// Remove a file's parse information from the database.
-		/// </summary>
-		/// <param name="project">
-		/// A <see cref="Project"/>: The project to which the file belongs.
-		/// </param>
-		/// <param name="filename">
-		/// A <see cref="System.String"/>: The file.
-		/// </param>
-		public void RemoveFileInfo(Project project, string filename)
-		{
-			ProjectInformation info = ProjectInformationManager.Instance.Get (project);
-			lock (info){ info.RemoveFileInfo(filename); }
-			OnFileUpdated(new ClassPadEventArgs (project));
-		}
-		
-		/// <summary>
-		/// Wrapper method for the FileUpdated event.
-		/// </summary>
-		void OnFileUpdated (ClassPadEventArgs args)
-		{
-			if (null != FileUpdated){ FileUpdated(args); }
-		}
-		
-		private class ProjectFilePair
-		{
-			string file;
-			Project project;
-			
-			public ProjectFilePair (Project project, string file)
-			{
-				this.project = project;
-				this.file = file;
-			}
-			
-			public string File {
-				get { return file; }
-			}
-			
-			public Project Project {
-				get { return project; }
-			}
-			
-			public override bool Equals (object other)
-			{
-				ProjectFilePair o = other as ProjectFilePair;
-				
-				if (o == null)
-					return false;
-				
-				if (file == o.File && project == o.Project)
-					return true;
-				else
-					return false;
-			}
-			
-			public override int GetHashCode ()
-			{
-				return (project.ToString() + file).GetHashCode ();
-			}
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/Typedef.cs b/main/src/addins/CBinding/Parser/Typedef.cs
deleted file mode 100644
index 09b3e7f390..0000000000
--- a/main/src/addins/CBinding/Parser/Typedef.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Typedef.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Typedef : LanguageItem
-	{		
-		public Typedef (Tag tag, Project project, string ctags_output) : base (tag, project)
-		{			
-			if (GetNamespace (tag, ctags_output)) return;
-			if (GetClass (tag, ctags_output)) return;
-			if (GetStructure (tag, ctags_output)) return;
-			if (GetUnion (tag, ctags_output)) return;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Parser/Union.cs b/main/src/addins/CBinding/Parser/Union.cs
deleted file mode 100644
index d569111f41..0000000000
--- a/main/src/addins/CBinding/Parser/Union.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Union.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Union : LanguageItem
-	{
-		public Union (Tag tag, Project project, string ctags_output) : base (tag, project)
-		{
-			if (GetNamespace (tag, ctags_output)) return;
-			if (GetClass (tag, ctags_output)) return;
-			if (GetStructure (tag, ctags_output)) return;
-			if (GetUnion (tag, ctags_output)) return;
-		}
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/CBinding/Parser/Variable.cs b/main/src/addins/CBinding/Parser/Variable.cs
deleted file mode 100644
index bc9179b823..0000000000
--- a/main/src/addins/CBinding/Parser/Variable.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Variable.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-
-namespace CBinding.Parser
-{
-	public class Variable : LanguageItem
-	{
-		public Variable (Tag tag, Project project) : base (tag, project)
-		{
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Project/CProject.cs b/main/src/addins/CBinding/Project/CProject.cs
deleted file mode 100644
index 231830b4f0..0000000000
--- a/main/src/addins/CBinding/Project/CProject.cs
+++ /dev/null
@@ -1,553 +0,0 @@
-//
-// CProject.cs: C/C++ Project
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Xml;
-using System.Collections.Generic;
-using System.ComponentModel;
-
-using Mono.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Core.ProgressMonitoring;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Deployment;
-using MonoDevelop.Deployment.Linux;
-using CBinding.Parser;
-using MonoDevelop.Ide;
-
-namespace CBinding
-{
-	public enum Language {
-		C,
-		CPP,
-		OBJC,
-		OBJCPP
-	}
-	
-	public enum CProjectCommands {
-		AddPackage,
-		UpdateClassPad,
-		ShowPackageDetails,
-		GotoDeclaration,
-	}
-	
-	[DataInclude(typeof(CProjectConfiguration))]
-	public class CProject : Project, IDeployable
-	{
-		[ItemProperty ("Compiler", ValueType = typeof(CCompiler))]
-		private ICompiler compiler_manager;
-		
-		[ItemProperty ("Language")]
-		private Language language;
-		
-		[ItemProperty("Target")]
-		CBinding.CompileTarget target = CBinding.CompileTarget.Bin;
-		
-    	private ProjectPackageCollection packages = new ProjectPackageCollection ();
-		
-		public event ProjectPackageEventHandler PackageAddedToProject;
-		public event ProjectPackageEventHandler PackageRemovedFromProject;
-
-		/// <summary>
-		/// Extensions for C/C++ source files
-		/// </summary>
-		public static string[] SourceExtensions = { ".C", ".CC", ".CPP", ".CXX", ".M", ".MM" };
-		
-		/// <summary>
-		/// Extensions for C/C++ header files
-		/// </summary>
-		public static string[] HeaderExtensions = { ".H", ".HH", ".HPP", ".HXX" };
-		
-		private void Init ()
-		{
-			packages.Project = this;
-
-			if (IdeApp.IsInitialized)
-				IdeApp.Workspace.ItemAddedToSolution += OnEntryAddedToCombine;
-		}
-		
-		public CProject ()
-		{
-			Init ();
-		}
-		
-		public CProject (ProjectCreateInformation info,
-		                 XmlElement projectOptions, string language)
-		{
-			Init ();
-			string binPath = ".";
-			
-			if (info != null) {
-				Name = info.ProjectName;
-				binPath = info.BinPath;
-			}
-			
-			switch (language)
-			{
-			case "C":
-				this.language = Language.C;
-				break;
-			case "CPP":
-				this.language = Language.CPP;
-				break;
-			case "Objective C":
-				this.language = Language.OBJC;
-				break;
-			case "Objective C++":
-				this.language = Language.OBJCPP;
-				break;
-			}
-			
-			Compiler = null; // use default compiler depending on language
-			
-			CProjectConfiguration configuration =
-				(CProjectConfiguration)CreateConfiguration ("Debug");
-			
-			configuration.DefineSymbols = "DEBUG MONODEVELOP";		
-			configuration.DebugMode = true;
-				
-			Configurations.Add (configuration);
-			
-			configuration =
-				(CProjectConfiguration)CreateConfiguration ("Release");
-				
-			configuration.DebugMode = false;
-			configuration.OptimizationLevel = 3;
-			configuration.DefineSymbols = "MONODEVELOP";
-			Configurations.Add (configuration);
-			
-			foreach (CProjectConfiguration c in Configurations) {
-				c.OutputDirectory = Path.Combine (binPath, c.Id);
-				c.SourceDirectory = info.ProjectBasePath;
-				c.Output = Name;
-				
-				if (projectOptions != null) {
-					if (projectOptions.Attributes["Target"] != null) {
-						c.CompileTarget = (CBinding.CompileTarget)Enum.Parse (
-						    typeof(CBinding.CompileTarget),
-						    projectOptions.Attributes["Target"].InnerText);
-					}
-					if (projectOptions.GetAttribute ("ExternalConsole") == "True") {
-						c.ExternalConsole = true;
-						c.PauseConsoleOutput = true;
-					}
-					if (projectOptions.Attributes["PauseConsoleOutput"] != null) {
-						c.PauseConsoleOutput = bool.Parse (
-							projectOptions.Attributes["PauseConsoleOutput"].InnerText);
-					}
-					if (projectOptions.Attributes["CompilerArgs"].InnerText != null) {
-						c.ExtraCompilerArguments = projectOptions.Attributes["CompilerArgs"].InnerText;
-					}
-					if (projectOptions.Attributes["LinkerArgs"].InnerText != null) {
-						c.ExtraLinkerArguments = projectOptions.Attributes["LinkerArgs"].InnerText;
-					}
-				}
-			}			
-		}
-
-		public override IEnumerable<string> GetProjectTypes ()
-		{
-			yield return "Native";
-		}
-
-		public override string[] SupportedLanguages {
-			get { return new string[] { "C", "CPP", "Objective C", "Objective C++" }; }
-		}
-		
-		public CompileTarget CompileTarget {
-			get { return target; }
-			set { target = value; }
-		}
-		
-		public override bool IsCompileable (string fileName)
-		{
-			string ext = Path.GetExtension (fileName.ToUpper ());
-			
-			if (language == Language.C) {
-				return (ext == ".C");
-			} else {
-				return (0 <= Array.IndexOf (SourceExtensions, ext));
-			}
-		}
-		
-		public override IEnumerable<SolutionItem> GetReferencedItems (ConfigurationSelector configuration)
-		{
-			foreach (var p in base.GetReferencedItems (configuration))
-				yield return p;
-
-			if (ParentSolution == null)
-				yield break;
-
-			foreach (Package p in Packages) {
-				if (p.IsProject && p.Name != Name) {
-					var cp = ParentSolution.FindProjectByName (p.Name) as CProject;
-					if (cp != null)
-						yield return cp;
-				}
-			}
-		}
-		
-		public static bool IsHeaderFile (string filename)
-		{
-			return (0 <= Array.IndexOf (HeaderExtensions, Path.GetExtension (filename.ToUpper ())));
-		}
-		
-		/// <summary>
-		/// Ths pkg-config package is for internal MonoDevelop use only, it is not deployed.
-		/// </summary>
-		public void WriteMDPkgPackage (ConfigurationSelector configuration)
-		{
-			string pkgfile = Path.Combine (BaseDirectory, Name + ".md.pc");
-			
-			CProjectConfiguration config = (CProjectConfiguration)GetConfiguration (configuration);
-			
-			List<string> headerDirectories = new List<string> ();
-			
-			foreach (ProjectFile f in Files) {
-				if (IsHeaderFile (f.Name)) {
-					string dir = Path.GetDirectoryName (f.FilePath);
-					
-					if (!headerDirectories.Contains (dir)) {
-						headerDirectories.Add (dir);
-					}
-				}
-			}
-			
-			using (StreamWriter writer = new StreamWriter (pkgfile)) {
-				writer.WriteLine ("Name: {0}", Name);
-				writer.WriteLine ("Description: {0}", Description);
-				writer.WriteLine ("Version: {0}", Version);
-				writer.WriteLine ("Libs: -L\"{0}\" -l{1}", config.OutputDirectory, config.Output.StartsWith ("lib", StringComparison.OrdinalIgnoreCase)?
-				                                                                                                config.Output.Substring (3):
-				                                                                                                config.Output);
-//				writer.WriteLine ("Cflags: -I{0}", BaseDirectory);
-				writer.WriteLine ("Cflags: -I\"{0}\"", string.Join ("\" -I\"", headerDirectories.ToArray ()));
-			}
-			
-			// If this project compiles into a shared object we need to
-			// export the output path to the LD_LIBRARY_PATH
-			string literal = "LD_LIBRARY_PATH";
-			string ld_library_path = Environment.GetEnvironmentVariable (literal);
-			
-			if (string.IsNullOrEmpty (ld_library_path)) {
-				Environment.SetEnvironmentVariable (literal, config.OutputDirectory);
-			} else if (!ld_library_path.Contains (config.OutputDirectory)) {
-				ld_library_path = string.Format ("{0}:{1}", config.OutputDirectory, ld_library_path);
-				Environment.SetEnvironmentVariable (literal, ld_library_path);
-			}
-		}
-		
-		/// <summary>
-		/// This is the pkg-config package that gets deployed.
-		/// <returns>The pkg-config package's filename</returns>
-		/// </summary>
-		private string WriteDeployablePgkPackage (Project project, CProjectConfiguration config)
-		{
-			// FIXME: This should probably be grabed from somewhere.
-			string prefix = "/usr/local";
-			string pkgfile = Path.Combine (BaseDirectory, Name + ".pc");
-			
-			using (StreamWriter writer = new StreamWriter (pkgfile)) {
-				writer.WriteLine ("prefix={0}", prefix);
-				writer.WriteLine ("exec_prefix=${prefix}");
-				writer.WriteLine ("libdir=${exec_prefix}/lib");
-				writer.WriteLine ("includedir=${prefix}/include");
-				writer.WriteLine ();
-				writer.WriteLine ("Name: {0}", Name);
-				writer.WriteLine ("Description: {0}", Description);
-				writer.WriteLine ("Version: {0}", Version);
-				writer.WriteLine ("Requires: {0}", string.Join (" ", Packages.ToStringArray ()));
-				// TODO: How should I get this?
-				writer.WriteLine ("Conflicts: {0}", string.Empty);
-				writer.Write ("Libs: -L${libdir} ");
-				writer.WriteLine ("-l{0}", config.Output.StartsWith ("lib", StringComparison.OrdinalIgnoreCase)?
-				                                                            config.Output.Substring (3):
-				                                                            config.Output);
-				writer.Write ("Cflags: -I${includedir}/");
-				writer.WriteLine ("{0} {1}", Name, Compiler.GetDefineFlags (project, config));
-			}
-			
-			return pkgfile;
-		}
-		
-		protected override BuildResult DoBuild (IProgressMonitor monitor, ConfigurationSelector configuration)
-		{
-			CProjectConfiguration pc = (CProjectConfiguration) GetConfiguration (configuration);
-			pc.SourceDirectory = BaseDirectory;
-			
-			return compiler_manager.Compile (this,
-				Files, packages,
-				pc,
-			    monitor);
-		}
-		
-		protected virtual ExecutionCommand CreateExecutionCommand (CProjectConfiguration conf)
-		{
-			string app = Path.Combine (conf.OutputDirectory, conf.Output);
-			NativeExecutionCommand cmd = new NativeExecutionCommand (app);
-			cmd.Arguments = conf.CommandLineParameters;
-			cmd.WorkingDirectory = Path.GetFullPath (conf.OutputDirectory);
-			cmd.EnvironmentVariables = conf.EnvironmentVariables;
-			return cmd;
-		}
-
-		protected override bool OnGetCanExecute (ExecutionContext context, ConfigurationSelector solutionConfiguration)
-		{
-			CProjectConfiguration conf = (CProjectConfiguration) GetConfiguration (solutionConfiguration);
-			ExecutionCommand cmd = CreateExecutionCommand (conf);
-			return (target == CBinding.CompileTarget.Bin) && context.ExecutionHandler.CanExecute (cmd);
-		}
-
-		protected override void DoExecute (IProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
-		{
-			CProjectConfiguration conf = (CProjectConfiguration) GetConfiguration (configuration);
-			bool pause = conf.PauseConsoleOutput;
-			IConsole console;
-			
-			if (conf.CompileTarget != CBinding.CompileTarget.Bin) {
-				MessageService.ShowMessage ("Compile target is not an executable!");
-				return;
-			}
-			
-			monitor.Log.WriteLine ("Running project...");
-			
-			if (conf.ExternalConsole)
-				console = context.ExternalConsoleFactory.CreateConsole (!pause);
-			else
-				console = context.ConsoleFactory.CreateConsole (!pause);
-			
-			AggregatedOperationMonitor operationMonitor = new AggregatedOperationMonitor (monitor);
-			
-			try {
-				ExecutionCommand cmd = CreateExecutionCommand (conf);
-				if (!context.ExecutionHandler.CanExecute (cmd)) {
-					monitor.ReportError ("Cannot execute \"" + conf.Output + "\". The selected execution mode is not supported for C projects.", null);
-					return;
-				}
-				
-				IProcessAsyncOperation op = context.ExecutionHandler.Execute (cmd, console);
-				
-				operationMonitor.AddOperation (op);
-				op.WaitForCompleted ();
-				
-				monitor.Log.WriteLine ("The operation exited with code: {0}", op.ExitCode);
-			} catch (Exception ex) {
-				LoggingService.LogError (string.Format ("Cannot execute \"{0}\"", conf.Output), ex);
-				monitor.ReportError ("Cannot execute \"" + conf.Output + "\"", ex);
-			} finally {			
-				operationMonitor.Dispose ();			
-				console.Dispose ();
-			}
-		}
-		
-		public override FilePath GetOutputFileName (ConfigurationSelector configuration)
-		{
-			CProjectConfiguration conf = (CProjectConfiguration) GetConfiguration (configuration);
-			return conf.OutputDirectory.Combine (conf.CompiledOutputName);
-		}
-		
-		public override SolutionItemConfiguration CreateConfiguration (string name)
-		{
-			CProjectConfiguration conf = new CProjectConfiguration ();
-			
-			conf.Name = name;
-			
-			return conf;
-		}
-		
-		public Language Language {
-			get { return language; }
-			set { language = value; }
-		}
-		
-		public ICompiler Compiler {
-			get { return compiler_manager; }
-			set {
-				if (value != null) {
-					compiler_manager = value;
-				} else {
-					object[] compilers = AddinManager.GetExtensionObjects ("/CBinding/Compilers");
-					string compiler;
-
-					// TODO: This should depend on platform (eg: windows would be mingw or msvc)
-					if (language == Language.C)
-						compiler = PropertyService.Get ("CBinding.DefaultCCompiler", new GccCompiler ().Name);
-					else
-						compiler = PropertyService.Get ("CBinding.DefaultCppCompiler", new GppCompiler ().Name);
-					
-					foreach (ICompiler c in compilers) {
-						if (compiler == c.Name) {
-							compiler_manager = c;
-						}
-					}
-				}
-			}
-		}
-		
-		[Browsable(false)]
-		[ItemProperty ("Packages")]
-		public ProjectPackageCollection Packages {
-			get { return packages; }
-			set {
-				packages = value;
-				packages.Project = this;
-			}
-		}
-		
-		protected override void OnFileAddedToProject (ProjectFileEventArgs args)
-		{
-			base.OnFileAddedToProject (args);
-			
-			foreach (ProjectFileEventInfo e in args) {
-				if (!Loading && !IsCompileable (e.ProjectFile.Name) &&
-				    e.ProjectFile.BuildAction == BuildAction.Compile) {
-					e.ProjectFile.BuildAction = BuildAction.None;
-				}
-				
-				if (e.ProjectFile.BuildAction == BuildAction.Compile)
-					TagDatabaseManager.Instance.UpdateFileTags (this, e.ProjectFile.Name);
-			}
-		}
-		
-		protected override void OnFileChangedInProject (ProjectFileEventArgs e)
-		{
-			base.OnFileChangedInProject (e);
-			
-			foreach (ProjectFileEventInfo fe in e)
-				TagDatabaseManager.Instance.UpdateFileTags (this, fe.ProjectFile.Name);
-		}
-		
-		protected override void OnFileRemovedFromProject (ProjectFileEventArgs e)
-		{
-			base.OnFileRemovedFromProject (e);
-			
-			foreach (ProjectFileEventInfo fe in e)
-				TagDatabaseManager.Instance.RemoveFileInfo (this, fe.ProjectFile.Name);
-		}
-
-		
-		private static void OnEntryAddedToCombine (object sender, SolutionItemEventArgs e)
-		{
-			CProject p = e.SolutionItem as CProject;
-			
-			if (p == null)
-				return;
-			
-			foreach (ProjectFile f in p.Files)
-				TagDatabaseManager.Instance.UpdateFileTags (p, f.Name);
-		}
-		
-		internal void NotifyPackageRemovedFromProject (Package package)
-		{
-			PackageRemovedFromProject (this, new ProjectPackageEventArgs (this, package));
-		}
-		
-		internal void NotifyPackageAddedToProject (Package package)
-		{
-			PackageAddedToProject (this, new ProjectPackageEventArgs (this, package));
-		}
-
-		public DeployFileCollection GetDeployFiles (ConfigurationSelector configuration)
-		{
-			DeployFileCollection deployFiles = new DeployFileCollection ();
-			
-			CProjectConfiguration conf = (CProjectConfiguration) GetConfiguration (configuration);
-			CompileTarget target = conf.CompileTarget;
-			
-			// Headers and resources
-			foreach (ProjectFile f in Files) {
-				if (f.BuildAction == BuildAction.Content) {
-					string targetDirectory =
-						(IsHeaderFile (f.Name) ? TargetDirectory.Include : TargetDirectory.ProgramFiles);
-					
-					deployFiles.Add (new DeployFile (this, f.FilePath, f.ProjectVirtualPath, targetDirectory));
-				}
-			}
-			
-			// Output
-			string output = GetOutputFileName (configuration);		
-			if (!string.IsNullOrEmpty (output)) {
-				string targetDirectory = string.Empty;
-				
-				switch (target) {
-				case CompileTarget.Bin:
-					targetDirectory = TargetDirectory.ProgramFiles;
-					break;
-				case CompileTarget.SharedLibrary:
-					targetDirectory = TargetDirectory.ProgramFiles;
-					break;
-				case CompileTarget.StaticLibrary:
-					targetDirectory = TargetDirectory.ProgramFiles;
-					break;
-				}					
-				
-				deployFiles.Add (new DeployFile (this, output, Path.GetFileName (output), targetDirectory));
-			}
-			
-			// PkgPackage
-			if (target != CompileTarget.Bin) {
-				string pkgfile = WriteDeployablePgkPackage (this, conf);
-				deployFiles.Add (new DeployFile (this, Path.Combine (BaseDirectory, pkgfile), pkgfile, LinuxTargetDirectory.PkgConfig));
-			}
-			
-			return deployFiles;
-		}
-		
-		/// <summary>
-		/// Finds the corresponding source or header file
-		/// </summary>
-		/// <param name="sourceFile">
-		/// The name of the file to be matched
-		/// <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// The corresponding file, or null if not found
-		/// <see cref="System.String"/>
-		/// </returns>
-		public string MatchingFile (string sourceFile) {
-			string filenameStub = Path.GetFileNameWithoutExtension (sourceFile);
-			bool wantHeader = !CProject.IsHeaderFile (sourceFile);
-			
-			foreach (ProjectFile file in this.Files) {
-				if (filenameStub == Path.GetFileNameWithoutExtension (file.Name) 
-				   && (wantHeader == IsHeaderFile (file.Name))) {
-					return file.Name;
-				}
-			}
-			
-			return null;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Project/CProjectBinding.cs b/main/src/addins/CBinding/Project/CProjectBinding.cs
deleted file mode 100644
index db379d8763..0000000000
--- a/main/src/addins/CBinding/Project/CProjectBinding.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// CProjectBinding.cs: binding with the CProject
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Xml;
-using System.IO;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-
-namespace CBinding
-{
-	public class CProjectBinding : IProjectBinding
-	{
-		public string Name {
-			get { return "C/C++"; }
-		}
-		
-		public Project CreateProject (ProjectCreateInformation info,
-		                              XmlElement projectOptions)
-		{
-			string language = projectOptions.GetAttribute ("language");
-			return new CProject (info, projectOptions, language);
-		}
-		
-		public Project CreateSingleFileProject (string sourceFile)
-		{
-			var info = new ProjectCreateInformation () {
-				ProjectName = Path.GetFileNameWithoutExtension (sourceFile),
-				SolutionPath = Path.GetDirectoryName (sourceFile),
-				ProjectBasePath = Path.GetDirectoryName (sourceFile),
-			};
-			
-			Project project = new CProject (info, null, GetLanguage (sourceFile));
-			project.Files.Add (new ProjectFile (sourceFile));
-			return project;
-		}
-		
-		string GetLanguage (string filename)
-		{
-			switch (Path.GetExtension (filename.ToLower ())) {
-			case ".c":
-				return "C";
-			case ".cpp":
-			case ".cxx":
-				return  "CPP";
-			default:
-				return null;
-			}
-		}
-		
-		public bool CanCreateSingleFileProject (string sourceFile)
-		{
-			return GetLanguage (sourceFile) != null;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Project/CProjectConfiguration.cs b/main/src/addins/CBinding/Project/CProjectConfiguration.cs
deleted file mode 100644
index baf48b2a8a..0000000000
--- a/main/src/addins/CBinding/Project/CProjectConfiguration.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-//
-// CProjectConfiguration.cs: Configuration for C/C++ projects
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-
-namespace CBinding
-{
-	public enum CompileTarget {
-		Bin,
-		StaticLibrary,
-		SharedLibrary
-	};
-
-	// TODO: Warning levels should be compiler specific...
-	public enum WarningLevel {
-		None,
-		Normal,
-		All
-	}
-
-	// I believe it would be in the C/C++ binding's best interest to let the configuration determine
-	// which compiler to use... currently the project as a whole does this - which isn't necessarily as flexible
-	// as some may require...
-	public class CProjectConfiguration : ProjectConfiguration
-	{
-		[ItemProperty("OutputName")]
-		string output = string.Empty;
-		
-		[ItemProperty("CompileTarget")]
-		CBinding.CompileTarget target = CBinding.CompileTarget.Bin;
-		
-		[ItemProperty ("Includes")]
-		[ItemProperty ("Include", Scope = "*", ValueType = typeof(string))]
-    	private ArrayList includes = new ArrayList ();
-		
-		[ItemProperty ("LibPaths")]
-		[ItemProperty ("LibPath", Scope = "*", ValueType = typeof(string))]
-    	private ArrayList libpaths = new ArrayList ();
-		
-		[ItemProperty ("Libs")]
-		[ItemProperty ("Lib", Scope = "*", ValueType = typeof(string))]
-    	private ArrayList libs = new ArrayList ();
-		
-		[ItemProperty ("WarningLevel", DefaultValue=WarningLevel.Normal)]
-		private WarningLevel warning_level = WarningLevel.Normal;
-		
-		[ItemProperty ("WarningsAsErrors", DefaultValue=false)]
-		private bool warnings_as_errors = false;
-		
-		[ItemProperty ("OptimizationLevel", DefaultValue=0)]
-		private int optimization = 0;
-		
-		[ItemProperty ("ExtraCompilerArguments", DefaultValue="")]
-		private string extra_compiler_args = string.Empty;
-		
-		[ItemProperty ("ExtraLinkerArguments", DefaultValue="")]
-		private string extra_linker_args = string.Empty;
-		
-		[ItemProperty ("DefineSymbols", DefaultValue="")]
-		private string define_symbols = string.Empty;
-		
-		[ProjectPathItemProperty ("SourceDirectory", DefaultValue=null)]
-		private string source_directory_path;
-		
-		[ItemProperty ("UseCcache", DefaultValue=false)]
-		private bool use_ccache = false;
-		
-		[ItemProperty ("PrecompileHeaders", DefaultValue=true)]
-		private bool precompileHeaders = true;
-		
-		public string Output {
-			get { return output; }
-			set { output = value; }
-		}
-		
-		public CompileTarget CompileTarget {
-			get { return target; }
-			set { target = value; }
-		}
-
-		// TODO: This should be revised to use the naming conventions depending on OS & compiler...
-		public string CompiledOutputName {
-			get {
-				string suffix = string.Empty;
-				string prefix = string.Empty;
-				
-				switch (target)
-				{
-				case CompileTarget.Bin:
-					break;
-				case CompileTarget.StaticLibrary:
-					if (!Output.StartsWith ("lib"))
-						prefix = "lib";
-					if (!Output.EndsWith (".a"))
-						suffix = ".a";
-					break;
-				case CompileTarget.SharedLibrary:
-					if (!Output.StartsWith ("lib"))
-						prefix = "lib";
-					if (!Output.EndsWith (".so"))
-						suffix = ".so";
-					break;
-				}
-				
-				return string.Format("{0}{1}{2}", prefix, Output, suffix);
-			}
-		}
-		
-		public string SourceDirectory {
-			get { return source_directory_path; }
-			set { source_directory_path = value; }
-		}
-		
-		public ArrayList Includes {
-			get { return includes; }
-			set { includes = value; }
-		}
-		
-		public ArrayList LibPaths {
-			get { return libpaths; }
-			set { libpaths = value; }
-		}
-		
-		public ArrayList Libs {
-			get { return libs; }
-			set { libs = value; }
-		}
-		
-		public bool UseCcache {
-			get { return use_ccache; }
-			set { use_ccache = value; }
-		}
-		
-		public bool PrecompileHeaders {
-			get { return precompileHeaders; }
-			set { precompileHeaders = value; }
-		}
-		
-		public WarningLevel WarningLevel {
-			get { return warning_level; }
-			set { warning_level = value; }
-		}
-		
-		public bool WarningsAsErrors {
-			get { return warnings_as_errors; }
-			set { warnings_as_errors = value; }
-		}
-		
-		public int OptimizationLevel {
-			get { return optimization; }
-			set {
-				if (value >= 0 && value <= 3)
-					optimization = value;
-				else
-					optimization = 0;
-			}
-		}
-		
-		public string ExtraCompilerArguments {
-			get { return extra_compiler_args; }
-			set { extra_compiler_args = value; }
-		}
-		
-		public string ExtraLinkerArguments {
-			get { return extra_linker_args; }
-			set { extra_linker_args = value; }
-		}
-		
-		public string DefineSymbols {
-			get { return define_symbols; }
-			set { define_symbols = value; }
-		}
-		
-		public override void CopyFrom (ItemConfiguration configuration)
-		{
-			base.CopyFrom (configuration);
-			CProjectConfiguration conf = (CProjectConfiguration)configuration;
-			
-			output = conf.output;
-			target = conf.target;
-			includes = conf.includes;
-			libpaths = conf.libpaths;
-			libs = conf.libs;
-			source_directory_path = conf.source_directory_path;
-			use_ccache = conf.use_ccache;
-			
-			warning_level = conf.warning_level;
-			warnings_as_errors = conf.warnings_as_errors;
-			optimization = conf.optimization;
-			extra_compiler_args = conf.extra_compiler_args;
-			extra_linker_args = conf.extra_linker_args;
-			define_symbols = conf.define_symbols;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Project/CProjectServiceExtension.cs b/main/src/addins/CBinding/Project/CProjectServiceExtension.cs
deleted file mode 100644
index 22775dc090..0000000000
--- a/main/src/addins/CBinding/Project/CProjectServiceExtension.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// CProjectServiceExtension.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text;
-
-using Mono.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Execution;
-
-namespace CBinding
-{
-	public class CProjectServiceExtension : ProjectServiceExtension
-	{
-		public override bool SupportsItem (IBuildTarget item)
-		{
-			return item is CProject;
-		}
-
-		protected override BuildResult Build (IProgressMonitor monitor, SolutionEntityItem entry, ConfigurationSelector configuration)
-		{
-			CProject project = (CProject) entry;
-			CProjectConfiguration conf = (CProjectConfiguration) project.GetConfiguration (configuration);
-			if (conf.CompileTarget != CompileTarget.Bin)
-				project.WriteMDPkgPackage (configuration);
-			
-			return base.Build (monitor, entry, configuration);
-		}
-		
-		protected override void Clean (IProgressMonitor monitor, SolutionEntityItem entry, ConfigurationSelector configuration)
-		{
-			base.Clean (monitor, entry, configuration);
-			
-			CProject project = (CProject) entry;
-			CProjectConfiguration conf = (CProjectConfiguration) project.GetConfiguration (configuration);
-			project.Compiler.Clean (project.Files, conf, monitor);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Project/Package.cs b/main/src/addins/CBinding/Project/Package.cs
deleted file mode 100644
index 33a91ce3b0..0000000000
--- a/main/src/addins/CBinding/Project/Package.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-//
-// ProjectPackage.cs: A pkg-config package
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text;
-using System.Collections.Generic;
-
-using Mono.Addins;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Serialization;
-
-namespace CBinding
-{
-	public class Package
-	{
-		[ItemProperty ("file")]
-		private string file;
-		
-		[ItemProperty ("name")]
-		private string name;
-		
-		[ItemProperty ("IsProject")]
-		private bool is_project;
-
-		private string description;
-		private string version;
-		private List<string> requires = new List<string>();
-		private List<string> libPaths = new List<string>();
-		private List<string> libs = new List<string>();
-		private List<string> cflags = new List<string>();
-		private Dictionary<string, string> vars = new Dictionary<string,string> ();
-		
-		public Package (string file)
-		{
-			this.file = file;
-			this.is_project = false;
-			
-			ParsePackageEssentials ();
-		}
-		
-		public Package (CProject project)
-		{
-			name = project.Name;
-			file = Path.Combine (project.BaseDirectory, name + ".md.pc");
-			is_project = true;
-			
-			ParsePackageEssentials ();
-		}
-		
-		public Package ()
-		{
-		}
-		
-		void ParsePackageEssentials ()
-		{
-			string line;
-			
-			using (StreamReader reader = new StreamReader (file)) {
-				while ((line = reader.ReadLine ()) != null) {
-					if (line.StartsWith ("Name")) {
-						name = line.Split (':')[1].TrimStart ();
-						continue;
-					}
-					
-					if (line.StartsWith ("Version")) {
-						version = line.Split (':')[1].TrimStart ();
-					}
-				}
-			}
-		}
-		
-		bool parsed = false;
-		public void ParsePackage ()
-		{
-			if (parsed)
-				return;
-			
-			string line;
-			
-			using (StreamReader reader = new StreamReader (file)) {
-				while ((line = reader.ReadLine ()) != null) {
-					if (line.StartsWith ("#"))
-					    continue;
-					    
-					if (line.IndexOf ('=') >= 0)
-						ParseVar (line);
-					
-					if (line.IndexOf (':') >= 0)
-						ParseProperty (line);
-				}
-			}
-			
-			parsed = true;
-		}
-		
-		void ParseVar (string line)
-		{
-			int i = line.IndexOf ('=');
-			string key = line.Substring (0, i);
-			string value = line.Substring (i+1, line.Length - i-1).Trim ();
-			string parsedValue = StringParserService.Parse (value, CustomTags ());
-			
-			vars.Add (key, parsedValue);
-		}
-		
-		void ParseProperty (string line)
-		{
-			int i = line.IndexOf (':');
-			string key = line.Substring (0, i);
-			string value = StringParserService.Parse (line.Substring (i+1, line.Length - i-1).Trim (), CustomTags ());
-			
-			if (value.Length <= 0)
-				return;
-			
-			switch (key) {
-			case "Name":
-				name = value;
-				break;
-			case "Description":;
-				description = ProcessDescription (value);
-				break;
-			case "Version":
-				version = value;
-				break;
-			case "Requires":
-				ParseRequires (value);
-				break;
-			case "Libs":
-				ParseLibs (value);
-				break;
-			case "Cflags":
-				ParseCFlags (value);
-				break;
-			}
-		}
-		
-		void ParseRequires (string reqsline)
-		{
-			string[] splitted = reqsline.Split (' ');
-			
-			foreach (string str in splitted) {
-				if (str.Trim () == string.Empty)
-					continue;
-				Requires.Add (str);
-			}
-		}
-		
-		void ParseLibs (string libline)
-		{
-			int i = 0;
-			string lib;
-			
-			while (true) {
-				i = libline.IndexOf ('-', i);
-				
-				if (i < 0)
-					break;
-				
-				int count = 0;
-				
-				while (libline.Length > (count+i+2) && libline[count+i+2] != ' ')
-					count++;
-				
-				lib = libline.Substring (i+2, count);
-				
-				if (libline[i+1] == 'L') {
-					libPaths.Add (lib);
-				} else if (libline[i+1] == 'l') {
-					libs.Add (lib);
-				}
-				
-				i++;
-			}
-		}
-		
-		void ParseCFlags (string cflagsline)
-		{
-			string[] splitted = cflagsline.Split (' ');
-			
-			foreach (string str in splitted) {
-				if (str.Trim () == string.Empty)
-					continue;
-				CFlags.Add (str);
-			}
-		}
-		
-		/// <summary>
-		/// Insert '\n's to make sure string isn't too long.
-		/// </summary>
-		/// <param name="desc">
-		/// The unprocessed description.
-		/// A <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// The processed description.
-		/// A <see cref="System.String"/>
-		/// </returns>
-		string ProcessDescription (string desc)
-		{
-			int length = 80;
-			
-			if (desc.Length <= length)
-				return desc;			
-			
-			StringBuilder builder = new StringBuilder (desc);
-			int i = 0;
-			int lines = 1;
-			
-			while (i < desc.Length) {
-				i++;
-				
-				if (i > lines * length) {
-					lines++;
-					
-					do {
-						i--;
-					} while (desc [i] != ' ');
-					
-					builder.Replace (' ', '\n', i, 1);
-				}
-			}
-			
-			return builder.ToString ();
-		}
-		
-		Dictionary<string, string> CustomTags ()
-		{
-			Dictionary<string, string> customTags = new Dictionary<string, string> (StringComparer.InvariantCultureIgnoreCase);
-			int i = 0;
-			
-			foreach (KeyValuePair<string, string> kvp in vars) {
-				customTags.Add (kvp.Key, kvp.Value);
-				i++;
-			}
-			
-			return customTags;
-		}
-		
-		public string File {
-			get { return file; }
-			set { file = value; }
-		}
-		
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-		
-		public bool IsProject {
-			get { return is_project; }
-			set { is_project = value; }
-		}
-		
-		public string Version {
-			get { return version; }
-			set { version = value; }
-		}
-
-		public string Description {
-			get { return description; }
-		}
-
-		public List<string> Requires {
-			get { return requires; }
-		}
-
-		public List<string> LibPaths {
-			get { return libPaths; }
-		}
-
-		public List<string> Libs {
-			get { return libs; }
-		}
-
-		public List<string> CFlags {
-			get { return cflags; }
-		}
-		
-		public override bool Equals (object o)
-		{
-			Package other = o as Package;
-			
-			if (other == null) return false;
-			
-			return other.File.Equals (file);
-		}
-		
-		public override int GetHashCode ()
-		{
-			return (name + version).GetHashCode ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Project/ProjectPackageCollection.cs b/main/src/addins/CBinding/Project/ProjectPackageCollection.cs
deleted file mode 100644
index 3a29ee5c90..0000000000
--- a/main/src/addins/CBinding/Project/ProjectPackageCollection.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// ProjectPackageCollection.cs: Collection of pkg-config packages for the prject
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-using Mono.Addins;
-
-namespace CBinding
-{
-	[Serializable()]
-	public class ProjectPackageCollection : Collection<Package>
-	{
-		private CProject project;
-		
-		internal CProject Project {
-			get { return project; }
-			set { project = value; }
-		}
-		
-		public ProjectPackageCollection ()
-		{
-		}
-		
-		public void AddRange (IEnumerable<Package> packages)
-		{
-			foreach (Package p in packages)
-				Add (p);
-		}
-		
-		protected override void ClearItems()
-		{
-			if (project != null) {
-				List<Package> list = new List<Package> (Items);
-				base.ClearItems ();
-				foreach (Package p in list) {
-					project.NotifyPackageRemovedFromProject (p);
-				}
-			}
-		}
-		
-		protected override void InsertItem (int index, Package value)
-		{
-			base.InsertItem (index, value);
-			if (project != null) {
-				project.NotifyPackageAddedToProject (value);
-			}
-		}
-		
-		protected override void RemoveItem (int index)
-		{
-			Package p = Items [index];
-			base.RemoveItem (index);
-			if (project != null) {
-				project.NotifyPackageRemovedFromProject (p);
-			}
-		}
-		
-		protected override void SetItem (int index, Package item)
-		{
-			Package oldValue = Items [index];
-			base.SetItem (index, item);
-			if (project != null) {
-				project.NotifyPackageRemovedFromProject (oldValue);
-				project.NotifyPackageAddedToProject (item);
-			}
-		}
-
-		public string[] ToStringArray ()
-		{
-			string[] array = new string[Count];
-			int i = 0;
-			
-			foreach (Package p in Items)
-				array[i++] = p.Name;
-			
-			return array;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/Project/ProjectPackageEventArgs.cs b/main/src/addins/CBinding/Project/ProjectPackageEventArgs.cs
deleted file mode 100644
index 492ba85716..0000000000
--- a/main/src/addins/CBinding/Project/ProjectPackageEventArgs.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// ProjectPackageEventArgs.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace CBinding
-{
-	public delegate void ProjectPackageEventHandler (object sender, ProjectPackageEventArgs e);
-	
-	public class ProjectPackageEventArgs : EventArgs
-	{
-		CProject project;
-		Package package;
-		
-		public ProjectPackageEventArgs(CProject project, Package package)
-		{
-			this.project = project;
-			this.package = package;
-		}
-		
-		public CProject Project {
-			get { return project; }
-		}
-		
-		public Package Package {
-			get { return package; }
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/ProjectPad/ProjectNodeExtension.cs b/main/src/addins/CBinding/ProjectPad/ProjectNodeExtension.cs
deleted file mode 100644
index 10b6fbbb37..0000000000
--- a/main/src/addins/CBinding/ProjectPad/ProjectNodeExtension.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// ProjectNodeExtension.cs: Adds the packages node to a CProject
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Ide.Gui.Components;
-
-namespace CBinding.ProjectPad
-{
-	public class ProjectNodeExtension : NodeBuilderExtension
-	{
-		public override bool CanBuildNode (Type dataType)
-		{
-			return typeof(CProject).IsAssignableFrom (dataType);
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			CProject p = dataObject as CProject;
-			
-			if (p == null) return;
-			
-			builder.AddChild (p.Packages);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/ProjectPad/ProjectPackageNodeBuilder.cs b/main/src/addins/CBinding/ProjectPad/ProjectPackageNodeBuilder.cs
deleted file mode 100644
index 6c460d9aac..0000000000
--- a/main/src/addins/CBinding/ProjectPad/ProjectPackageNodeBuilder.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// ProjectPackageNodeBuilder.cs
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Reflection;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
-
-namespace CBinding.ProjectPad
-{
-	public class ProjectPackageNodeBuilder : TypeNodeBuilder
-	{
-		public override Type NodeDataType {
-			get { return typeof(Package); }
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(PackageNodeCommandHandler); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((Package)dataObject).File;
-		}
-		
-		public override string ContextMenuAddinPath {
-			get { return "/CBinding/Views/ProjectBrowser/ContextMenu/PackageNode"; }
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder,
-		                                object dataObject,
-		                                NodeInfo nodeInfo)
-		{
-			nodeInfo.Label = ((Package)dataObject).Name;
-			
-			if (((Package)dataObject).IsProject)
-				nodeInfo.Icon = Context.GetIcon ("md-reference-project");
-			else
-				nodeInfo.Icon = Context.GetIcon (Stock.Reference);
-		}
-	}
-	
-	public class PackageNodeCommandHandler : NodeCommandHandler
-	{
-		public override void DeleteItem ()
-		{
-			Package package = (Package)CurrentNode.DataItem;
-			CProject project = (CProject)CurrentNode.GetParentDataItem (
-			    typeof(CProject), false);
-			
-			project.Packages.Remove (package);
-			
-			IdeApp.ProjectOperations.Save (project);
-		}
-		
-		public override DragOperation CanDragNode ()
-		{
-			return DragOperation.Copy;
-		}
-		
-		[CommandHandler (CBinding.CProjectCommands.ShowPackageDetails)]
-		public void ShowPackageDetails ()
-		{
-			Package package = (Package)CurrentNode.DataItem;
-			
-			package.ParsePackage ();
-			
-			PackageDetails details = new CBinding.PackageDetails (package);
-			details.Show ();
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs b/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs
deleted file mode 100644
index 0108efab3b..0000000000
--- a/main/src/addins/CBinding/ProjectPad/ProjectPackagesFolderNodeBuilder.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-//
-// ProjectPackagesFolderNodeBuilder.cs: Node to control the packages in the project
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
-
-namespace CBinding.ProjectPad
-{	
-	public class ProjectPackagesFolderNodeBuilder : TypeNodeBuilder
-	{
-		ProjectPackageEventHandler addedHandler;
-		ProjectPackageEventHandler removedHandler;
-		
-		public override Type NodeDataType {
-			get { return typeof(ProjectPackageCollection); }
-		}
-		
-		public override void OnNodeAdded (object dataObject)
-		{
-			CProject project = ((ProjectPackageCollection)dataObject).Project;
-			if (project == null) return;
-			project.PackageAddedToProject += addedHandler;
-			project.PackageRemovedFromProject += removedHandler;
-		}
-
-		public override void OnNodeRemoved (object dataObject)
-		{
-			CProject project = ((ProjectPackageCollection)dataObject).Project;
-			if (project == null) return;
-			project.PackageAddedToProject -= addedHandler;
-			project.PackageRemovedFromProject -= removedHandler;
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(ProjectPackagesFolderNodeCommandHandler); }
-		}
-		
-		protected override void Initialize ()
-		{
-			addedHandler = (ProjectPackageEventHandler)DispatchService.GuiDispatch (new ProjectPackageEventHandler (OnAddPackage));
-			removedHandler = (ProjectPackageEventHandler)DispatchService.GuiDispatch (new ProjectPackageEventHandler (OnRemovePackage));
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return "Packages";
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
-		{			
-			nodeInfo.Label = "Packages";
-			nodeInfo.Icon = Context.GetIcon (Stock.OpenReferenceFolder);
-			nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedReferenceFolder);
-		}
-		
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			return ((ProjectPackageCollection)dataObject).Count > 0;
-		}
-		
-		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
-		{
-			ProjectPackageCollection packages = (ProjectPackageCollection)dataObject;
-			
-			foreach (Package p in packages)
-				treeBuilder.AddChild (p);
-		}
-		
-		public override string ContextMenuAddinPath {
-			get { return "/CBinding/Views/ProjectBrowser/ContextMenu/PackagesFolderNode"; }
-		}
-		
-		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
-		{
-			return -1;
-		}
-		
-		private void OnAddPackage (object sender, ProjectPackageEventArgs e)
-		{
-			ITreeBuilder builder = Context.GetTreeBuilder (e.Project.Packages);
-			if (builder != null)
-				builder.UpdateAll ();
-		}
-		
-		private void OnRemovePackage (object sender, ProjectPackageEventArgs e)
-		{
-			ITreeBuilder builder = Context.GetTreeBuilder (e.Project.Packages);
-			if (builder != null)
-				builder.UpdateAll ();
-		}
-	}
-	
-	public class ProjectPackagesFolderNodeCommandHandler : NodeCommandHandler
-	{
-		[CommandHandler (CBinding.CProjectCommands.AddPackage)]
-		public void AddPackageToProject ()
-		{
-			CProject project = (CProject)CurrentNode.GetParentDataItem (
-			    typeof(CProject), false);
-
-			using (var dlg = new EditPackagesDialog (project))
-				MessageService.ShowCustomDialog (dlg);
-			
-			IdeApp.ProjectOperations.Save (project);
-			CurrentNode.Expanded = true;
-		}
-		
-		// Currently only accepts packages and projects that compile into a static library
-		public override bool CanDropNode (object dataObject, DragOperation operation)
-		{
-			if (dataObject is Package)
-				return true;
-			
-			if (dataObject is CProject) {
-				CProject project = (CProject)dataObject;
-				
-				if (((ProjectPackageCollection)CurrentNode.DataItem).Project.Equals (project))
-					return false;
-				
-				CProjectConfiguration config = (CProjectConfiguration)project.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
-				
-				if (config.CompileTarget != CBinding.CompileTarget.Bin)
-					return true;
-			}
-			
-			return false;
-		}
-		
-		public override DragOperation CanDragNode ()
-		{
-			return DragOperation.Copy | DragOperation.Move;
-		}
-		
-		public override void OnNodeDrop (object dataObject, DragOperation operation)
-		{
-			if (dataObject is Package) {
-				Package package = (Package)dataObject;
-				ITreeNavigator nav = CurrentNode;
-				
-				CProject dest = nav.GetParentDataItem (typeof(CProject), true) as CProject;
-				nav.MoveToObject (dataObject);
-				CProject source = nav.GetParentDataItem (typeof(CProject), true) as CProject;
-				
-				dest.Packages.Add (package);
-				IdeApp.ProjectOperations.Save (dest);
-				
-				if (operation == DragOperation.Move) {
-					source.Packages.Remove (package);
-					IdeApp.ProjectOperations.Save (source);
-				}
-			} else if (dataObject is CProject) {
-				CProject draggedProject = (CProject)dataObject;
-				CProject destProject = (CurrentNode.DataItem as ProjectPackageCollection).Project;
-				
-				draggedProject.WriteMDPkgPackage (IdeApp.Workspace.ActiveConfiguration);
-				
-				Package package = new Package (draggedProject);
-				
-				if (!destProject.Packages.Contains (package)) {				
-					destProject.Packages.Add (package);
-					IdeApp.ProjectOperations.Save (destProject);
-				}
-			}
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/ProjectPad/ProjectReferencesExtension.cs b/main/src/addins/CBinding/ProjectPad/ProjectReferencesExtension.cs
deleted file mode 100644
index 8ca4e4afc9..0000000000
--- a/main/src/addins/CBinding/ProjectPad/ProjectReferencesExtension.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// ProjectReferencesExtension.cs: Hides the ProjectReferencesNode if this is a C/C++ project
-//
-// Authors:
-//   Marcos David Marin Amador <MarcosMarin@gmail.com>
-//
-// Copyright (C) 2007 Marcos David Marin Amador
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Mono.Addins;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Ide.Gui.Components;
-
-namespace CBinding.ProjectPad
-{
-	public class ProjectReferencesExtension : NodeBuilderExtension
-	{
-		public override bool CanBuildNode (Type dataType)
-		{
-			return typeof(ProjectReferenceCollection).IsAssignableFrom (dataType);
-		}
-		
-		public override void GetNodeAttributes (ITreeNavigator parentNode, object dataObject, ref NodeAttributes attributes)
-		{
-			Project p = parentNode.DataItem as Project;
-			
-			if (p is CProject)
-				attributes |= NodeAttributes.Hidden;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/README b/main/src/addins/CBinding/README
deleted file mode 100644
index f4f1ced796..0000000000
--- a/main/src/addins/CBinding/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The following icons might be under the GPL licence and might have to be replaced.
-
-C.Project.ConsoleProject, C.Project.SharedLibrary: These icons were taken and
-slightly modified from the CSharpBinding.
-
-C.Project.StaticLibrary: This icon was taken with no modifications from
-MonoDevelop.Core.Gui
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs b/main/src/addins/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs
deleted file mode 100644
index 3b3b4a1cb8..0000000000
--- a/main/src/addins/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs
+++ /dev/null
@@ -1,690 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace CBinding
-{
-	public partial class CodeGenerationPanel
-	{
-		private global::Gtk.Notebook notebook1;
-		private global::Gtk.VBox vbox6;
-		private global::Gtk.Table table1;
-		private global::Gtk.Label label4;
-		private global::Gtk.Label label5;
-		private global::Gtk.Label label6;
-		private global::Gtk.SpinButton optimizationSpinButton;
-		private global::Gtk.ComboBox targetComboBox;
-		private global::Gtk.VBox vbox1;
-		private global::Gtk.RadioButton noWarningRadio;
-		private global::Gtk.RadioButton normalWarningRadio;
-		private global::Gtk.RadioButton allWarningRadio;
-		private global::Gtk.CheckButton warningsAsErrorsCheckBox;
-		private global::Gtk.HBox hbox1;
-		private global::Gtk.Label label12;
-		private global::Gtk.Entry defineSymbolsTextEntry;
-		private global::Gtk.Frame frame2;
-		private global::Gtk.Alignment GtkAlignment;
-		private global::Gtk.Table table5;
-		private global::Gtk.Label label11;
-		private global::Gtk.Label label7;
-		private global::Gtk.ScrolledWindow scrolledwindow4;
-		private global::Gtk.TextView extraCompilerTextView;
-		private global::Gtk.ScrolledWindow scrolledwindow5;
-		private global::Gtk.TextView extraLinkerTextView;
-		private global::Gtk.Label GtkLabel12;
-		private global::Gtk.Label label1;
-		private global::Gtk.Table table2;
-		private global::Gtk.Button addLibButton;
-		private global::Gtk.Label label8;
-		private global::Gtk.Entry libAddEntry;
-		private global::Gtk.ScrolledWindow scrolledwindow1;
-		private global::Gtk.TreeView libTreeView;
-		private global::Gtk.VBox vbox4;
-		private global::Gtk.Button browseButton;
-		private global::Gtk.Button removeLibButton;
-		private global::Gtk.Label label2;
-		private global::Gtk.VBox vbox7;
-		private global::Gtk.Table table4;
-		private global::Gtk.HBox hbox2;
-		private global::Gtk.Entry libPathEntry;
-		private global::Gtk.Button quickInsertLibButton;
-		private global::Gtk.Label label10;
-		private global::Gtk.Button libPathAddButton;
-		private global::Gtk.ScrolledWindow scrolledwindow3;
-		private global::Gtk.TreeView libPathTreeView;
-		private global::Gtk.VBox vbox3;
-		private global::Gtk.Button libPathBrowseButton;
-		private global::Gtk.Button libPathRemoveButton;
-		private global::Gtk.Table table3;
-		private global::Gtk.HBox hbox3;
-		private global::Gtk.Entry includePathEntry;
-		private global::Gtk.Button quickInsertIncludeButton;
-		private global::Gtk.Button includePathAddButton;
-		private global::Gtk.Label label9;
-		private global::Gtk.ScrolledWindow scrolledwindow2;
-		private global::Gtk.TreeView includePathTreeView;
-		private global::Gtk.VBox vbox5;
-		private global::Gtk.Button includePathBrowseButton;
-		private global::Gtk.Button includePathRemoveButton;
-		private global::Gtk.Label label3;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget CBinding.CodeGenerationPanel
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "CBinding.CodeGenerationPanel";
-			// Container child CBinding.CodeGenerationPanel.Gtk.Container+ContainerChild
-			this.notebook1 = new global::Gtk.Notebook ();
-			this.notebook1.CanFocus = true;
-			this.notebook1.Name = "notebook1";
-			this.notebook1.CurrentPage = 0;
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.vbox6 = new global::Gtk.VBox ();
-			this.vbox6.Name = "vbox6";
-			this.vbox6.Spacing = 3;
-			// Container child vbox6.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(5));
-			this.table1.ColumnSpacing = ((uint)(5));
-			this.table1.BorderWidth = ((uint)(2));
-			// Container child table1.Gtk.Table+TableChild
-			this.label4 = new global::Gtk.Label ();
-			this.label4.Name = "label4";
-			this.label4.Xpad = 10;
-			this.label4.Xalign = 0F;
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("Warning Level:");
-			this.table1.Add (this.label4);
-			global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1 [this.label4]));
-			w1.XOptions = ((global::Gtk.AttachOptions)(4));
-			w1.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label5 = new global::Gtk.Label ();
-			this.label5.Name = "label5";
-			this.label5.Xpad = 10;
-			this.label5.Xalign = 0F;
-			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Optimization Level:");
-			this.table1.Add (this.label5);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5]));
-			w2.TopAttach = ((uint)(1));
-			w2.BottomAttach = ((uint)(2));
-			w2.XOptions = ((global::Gtk.AttachOptions)(4));
-			w2.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label6 = new global::Gtk.Label ();
-			this.label6.Name = "label6";
-			this.label6.Xpad = 10;
-			this.label6.Xalign = 0F;
-			this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("Target:");
-			this.table1.Add (this.label6);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.label6]));
-			w3.TopAttach = ((uint)(2));
-			w3.BottomAttach = ((uint)(3));
-			w3.XOptions = ((global::Gtk.AttachOptions)(4));
-			w3.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.optimizationSpinButton = new global::Gtk.SpinButton (0, 3, 1);
-			this.optimizationSpinButton.CanFocus = true;
-			this.optimizationSpinButton.Name = "optimizationSpinButton";
-			this.optimizationSpinButton.Adjustment.PageIncrement = 10;
-			this.optimizationSpinButton.ClimbRate = 1;
-			this.optimizationSpinButton.Numeric = true;
-			this.table1.Add (this.optimizationSpinButton);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.optimizationSpinButton]));
-			w4.TopAttach = ((uint)(1));
-			w4.BottomAttach = ((uint)(2));
-			w4.LeftAttach = ((uint)(1));
-			w4.RightAttach = ((uint)(2));
-			w4.XOptions = ((global::Gtk.AttachOptions)(4));
-			w4.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.targetComboBox = global::Gtk.ComboBox.NewText ();
-			this.targetComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("Executable"));
-			this.targetComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("Static Library"));
-			this.targetComboBox.AppendText (global::Mono.Unix.Catalog.GetString ("Shared Object"));
-			this.targetComboBox.Name = "targetComboBox";
-			this.table1.Add (this.targetComboBox);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.targetComboBox]));
-			w5.TopAttach = ((uint)(2));
-			w5.BottomAttach = ((uint)(3));
-			w5.LeftAttach = ((uint)(1));
-			w5.RightAttach = ((uint)(2));
-			w5.XOptions = ((global::Gtk.AttachOptions)(4));
-			w5.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.vbox1 = new global::Gtk.VBox ();
-			this.vbox1.Name = "vbox1";
-			this.vbox1.Spacing = 1;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.noWarningRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("no warnings"));
-			this.noWarningRadio.CanFocus = true;
-			this.noWarningRadio.Name = "noWarningRadio";
-			this.noWarningRadio.Active = true;
-			this.noWarningRadio.DrawIndicator = true;
-			this.noWarningRadio.UseUnderline = true;
-			this.noWarningRadio.Group = new global::GLib.SList (global::System.IntPtr.Zero);
-			this.vbox1.Add (this.noWarningRadio);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.noWarningRadio]));
-			w6.Position = 0;
-			w6.Expand = false;
-			w6.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.normalWarningRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("normal"));
-			this.normalWarningRadio.CanFocus = true;
-			this.normalWarningRadio.Name = "normalWarningRadio";
-			this.normalWarningRadio.DrawIndicator = true;
-			this.normalWarningRadio.UseUnderline = true;
-			this.normalWarningRadio.Group = this.noWarningRadio.Group;
-			this.vbox1.Add (this.normalWarningRadio);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.normalWarningRadio]));
-			w7.Position = 1;
-			w7.Expand = false;
-			w7.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.allWarningRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("all"));
-			this.allWarningRadio.CanFocus = true;
-			this.allWarningRadio.Name = "allWarningRadio";
-			this.allWarningRadio.DrawIndicator = true;
-			this.allWarningRadio.UseUnderline = true;
-			this.allWarningRadio.Group = this.noWarningRadio.Group;
-			this.vbox1.Add (this.allWarningRadio);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.allWarningRadio]));
-			w8.Position = 2;
-			w8.Expand = false;
-			w8.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.warningsAsErrorsCheckBox = new global::Gtk.CheckButton ();
-			this.warningsAsErrorsCheckBox.CanFocus = true;
-			this.warningsAsErrorsCheckBox.Name = "warningsAsErrorsCheckBox";
-			this.warningsAsErrorsCheckBox.Label = global::Mono.Unix.Catalog.GetString ("Treat warnings as errors");
-			this.warningsAsErrorsCheckBox.DrawIndicator = true;
-			this.warningsAsErrorsCheckBox.UseUnderline = true;
-			this.vbox1.Add (this.warningsAsErrorsCheckBox);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.warningsAsErrorsCheckBox]));
-			w9.Position = 3;
-			w9.Expand = false;
-			w9.Fill = false;
-			this.table1.Add (this.vbox1);
-			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox1]));
-			w10.LeftAttach = ((uint)(1));
-			w10.RightAttach = ((uint)(2));
-			w10.XOptions = ((global::Gtk.AttachOptions)(4));
-			w10.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox6.Add (this.table1);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.table1]));
-			w11.Position = 0;
-			w11.Expand = false;
-			w11.Fill = false;
-			// Container child vbox6.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.label12 = new global::Gtk.Label ();
-			this.label12.Name = "label12";
-			this.label12.Xpad = 13;
-			this.label12.Xalign = 0F;
-			this.label12.LabelProp = global::Mono.Unix.Catalog.GetString ("Define Symbols:");
-			this.hbox1.Add (this.label12);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label12]));
-			w12.Position = 0;
-			w12.Expand = false;
-			w12.Fill = false;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.defineSymbolsTextEntry = new global::Gtk.Entry ();
-			this.defineSymbolsTextEntry.TooltipMarkup = "A space seperated list of symbols to define.";
-			this.defineSymbolsTextEntry.CanFocus = true;
-			this.defineSymbolsTextEntry.Name = "defineSymbolsTextEntry";
-			this.defineSymbolsTextEntry.IsEditable = true;
-			this.defineSymbolsTextEntry.InvisibleChar = '●';
-			this.hbox1.Add (this.defineSymbolsTextEntry);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.defineSymbolsTextEntry]));
-			w13.Position = 1;
-			w13.Padding = ((uint)(14));
-			this.vbox6.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.hbox1]));
-			w14.Position = 1;
-			w14.Expand = false;
-			w14.Fill = false;
-			// Container child vbox6.Gtk.Box+BoxChild
-			this.frame2 = new global::Gtk.Frame ();
-			this.frame2.Name = "frame2";
-			this.frame2.ShadowType = ((global::Gtk.ShadowType)(0));
-			this.frame2.LabelYalign = 0F;
-			// Container child frame2.Gtk.Container+ContainerChild
-			this.GtkAlignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
-			this.GtkAlignment.Name = "GtkAlignment";
-			this.GtkAlignment.LeftPadding = ((uint)(12));
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			this.table5 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
-			this.table5.Name = "table5";
-			this.table5.RowSpacing = ((uint)(6));
-			this.table5.ColumnSpacing = ((uint)(9));
-			this.table5.BorderWidth = ((uint)(6));
-			// Container child table5.Gtk.Table+TableChild
-			this.label11 = new global::Gtk.Label ();
-			this.label11.Name = "label11";
-			this.label11.Xalign = 0F;
-			this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("Extra Linker Options");
-			this.table5.Add (this.label11);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table5 [this.label11]));
-			w15.LeftAttach = ((uint)(1));
-			w15.RightAttach = ((uint)(2));
-			w15.XOptions = ((global::Gtk.AttachOptions)(4));
-			w15.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table5.Gtk.Table+TableChild
-			this.label7 = new global::Gtk.Label ();
-			this.label7.Name = "label7";
-			this.label7.Xalign = 0F;
-			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("Extra Compiler Options");
-			this.table5.Add (this.label7);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table5 [this.label7]));
-			w16.XOptions = ((global::Gtk.AttachOptions)(4));
-			w16.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table5.Gtk.Table+TableChild
-			this.scrolledwindow4 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow4.CanFocus = true;
-			this.scrolledwindow4.Name = "scrolledwindow4";
-			this.scrolledwindow4.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow4.Gtk.Container+ContainerChild
-			this.extraCompilerTextView = new global::Gtk.TextView ();
-			this.extraCompilerTextView.TooltipMarkup = "A newline seperated list of extra options to send to the compiler.\nOne option can be in more than one line.\nExample:\n\t`pkg-config\n\t--cflags\n\tcairo`";
-			this.extraCompilerTextView.CanFocus = true;
-			this.extraCompilerTextView.Name = "extraCompilerTextView";
-			this.scrolledwindow4.Add (this.extraCompilerTextView);
-			this.table5.Add (this.scrolledwindow4);
-			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table5 [this.scrolledwindow4]));
-			w18.TopAttach = ((uint)(1));
-			w18.BottomAttach = ((uint)(2));
-			// Container child table5.Gtk.Table+TableChild
-			this.scrolledwindow5 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow5.CanFocus = true;
-			this.scrolledwindow5.Name = "scrolledwindow5";
-			this.scrolledwindow5.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow5.Gtk.Container+ContainerChild
-			this.extraLinkerTextView = new global::Gtk.TextView ();
-			this.extraLinkerTextView.TooltipMarkup = "A newline seperated list of extra options to send to the linker.\nOne option can be in more than one line.\nExample:\n\t`pkg-config\n\t--libs\n\tcairo`";
-			this.extraLinkerTextView.CanFocus = true;
-			this.extraLinkerTextView.Name = "extraLinkerTextView";
-			this.scrolledwindow5.Add (this.extraLinkerTextView);
-			this.table5.Add (this.scrolledwindow5);
-			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table5 [this.scrolledwindow5]));
-			w20.TopAttach = ((uint)(1));
-			w20.BottomAttach = ((uint)(2));
-			w20.LeftAttach = ((uint)(1));
-			w20.RightAttach = ((uint)(2));
-			w20.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.GtkAlignment.Add (this.table5);
-			this.frame2.Add (this.GtkAlignment);
-			this.GtkLabel12 = new global::Gtk.Label ();
-			this.GtkLabel12.Name = "GtkLabel12";
-			this.GtkLabel12.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Extra Options</b>");
-			this.GtkLabel12.UseMarkup = true;
-			this.frame2.LabelWidget = this.GtkLabel12;
-			this.vbox6.Add (this.frame2);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.frame2]));
-			w23.Position = 2;
-			this.notebook1.Add (this.vbox6);
-			// Notebook tab
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Code Generation");
-			this.notebook1.SetTabLabel (this.vbox6, this.label1);
-			this.label1.ShowAll ();
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.table2 = new global::Gtk.Table (((uint)(2)), ((uint)(3)), false);
-			this.table2.Name = "table2";
-			this.table2.RowSpacing = ((uint)(10));
-			this.table2.ColumnSpacing = ((uint)(10));
-			this.table2.BorderWidth = ((uint)(3));
-			// Container child table2.Gtk.Table+TableChild
-			this.addLibButton = new global::Gtk.Button ();
-			this.addLibButton.Sensitive = false;
-			this.addLibButton.CanFocus = true;
-			this.addLibButton.Name = "addLibButton";
-			this.addLibButton.UseUnderline = true;
-			this.addLibButton.Label = global::Mono.Unix.Catalog.GetString ("Add");
-			this.table2.Add (this.addLibButton);
-			global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.table2 [this.addLibButton]));
-			w25.LeftAttach = ((uint)(2));
-			w25.RightAttach = ((uint)(3));
-			w25.XOptions = ((global::Gtk.AttachOptions)(4));
-			w25.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.label8 = new global::Gtk.Label ();
-			this.label8.Name = "label8";
-			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Library:");
-			this.table2.Add (this.label8);
-			global::Gtk.Table.TableChild w26 = ((global::Gtk.Table.TableChild)(this.table2 [this.label8]));
-			w26.XOptions = ((global::Gtk.AttachOptions)(4));
-			w26.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.libAddEntry = new global::Gtk.Entry ();
-			this.libAddEntry.CanFocus = true;
-			this.libAddEntry.Name = "libAddEntry";
-			this.libAddEntry.IsEditable = true;
-			this.libAddEntry.InvisibleChar = '●';
-			this.table2.Add (this.libAddEntry);
-			global::Gtk.Table.TableChild w27 = ((global::Gtk.Table.TableChild)(this.table2 [this.libAddEntry]));
-			w27.LeftAttach = ((uint)(1));
-			w27.RightAttach = ((uint)(2));
-			w27.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow1.CanFocus = true;
-			this.scrolledwindow1.Name = "scrolledwindow1";
-			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			this.libTreeView = new global::Gtk.TreeView ();
-			this.libTreeView.CanFocus = true;
-			this.libTreeView.Name = "libTreeView";
-			this.scrolledwindow1.Add (this.libTreeView);
-			this.table2.Add (this.scrolledwindow1);
-			global::Gtk.Table.TableChild w29 = ((global::Gtk.Table.TableChild)(this.table2 [this.scrolledwindow1]));
-			w29.TopAttach = ((uint)(1));
-			w29.BottomAttach = ((uint)(2));
-			w29.LeftAttach = ((uint)(1));
-			w29.RightAttach = ((uint)(2));
-			// Container child table2.Gtk.Table+TableChild
-			this.vbox4 = new global::Gtk.VBox ();
-			this.vbox4.Name = "vbox4";
-			this.vbox4.Spacing = 6;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.browseButton = new global::Gtk.Button ();
-			this.browseButton.CanFocus = true;
-			this.browseButton.Name = "browseButton";
-			this.browseButton.UseUnderline = true;
-			this.browseButton.Label = global::Mono.Unix.Catalog.GetString ("Browse...");
-			this.vbox4.Add (this.browseButton);
-			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.browseButton]));
-			w30.Position = 0;
-			w30.Expand = false;
-			w30.Fill = false;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.removeLibButton = new global::Gtk.Button ();
-			this.removeLibButton.Sensitive = false;
-			this.removeLibButton.CanFocus = true;
-			this.removeLibButton.Name = "removeLibButton";
-			this.removeLibButton.UseUnderline = true;
-			this.removeLibButton.Label = global::Mono.Unix.Catalog.GetString ("Remove");
-			this.vbox4.Add (this.removeLibButton);
-			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.removeLibButton]));
-			w31.Position = 1;
-			w31.Expand = false;
-			w31.Fill = false;
-			this.table2.Add (this.vbox4);
-			global::Gtk.Table.TableChild w32 = ((global::Gtk.Table.TableChild)(this.table2 [this.vbox4]));
-			w32.TopAttach = ((uint)(1));
-			w32.BottomAttach = ((uint)(2));
-			w32.LeftAttach = ((uint)(2));
-			w32.RightAttach = ((uint)(3));
-			w32.XOptions = ((global::Gtk.AttachOptions)(4));
-			this.notebook1.Add (this.table2);
-			global::Gtk.Notebook.NotebookChild w33 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.table2]));
-			w33.Position = 1;
-			// Notebook tab
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Libraries");
-			this.notebook1.SetTabLabel (this.table2, this.label2);
-			this.label2.ShowAll ();
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.vbox7 = new global::Gtk.VBox ();
-			this.vbox7.Name = "vbox7";
-			this.vbox7.Spacing = 6;
-			this.vbox7.BorderWidth = ((uint)(3));
-			// Container child vbox7.Gtk.Box+BoxChild
-			this.table4 = new global::Gtk.Table (((uint)(2)), ((uint)(3)), false);
-			this.table4.Name = "table4";
-			this.table4.RowSpacing = ((uint)(10));
-			this.table4.ColumnSpacing = ((uint)(10));
-			// Container child table4.Gtk.Table+TableChild
-			this.hbox2 = new global::Gtk.HBox ();
-			this.hbox2.Name = "hbox2";
-			this.hbox2.Spacing = 6;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.libPathEntry = new global::Gtk.Entry ();
-			this.libPathEntry.CanFocus = true;
-			this.libPathEntry.Name = "libPathEntry";
-			this.libPathEntry.IsEditable = true;
-			this.libPathEntry.InvisibleChar = '●';
-			this.hbox2.Add (this.libPathEntry);
-			global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.libPathEntry]));
-			w34.Position = 0;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.quickInsertLibButton = new global::Gtk.Button ();
-			this.quickInsertLibButton.TooltipMarkup = "Insert a macro.";
-			this.quickInsertLibButton.CanFocus = true;
-			this.quickInsertLibButton.Name = "quickInsertLibButton";
-			this.quickInsertLibButton.UseUnderline = true;
-			this.quickInsertLibButton.Label = global::Mono.Unix.Catalog.GetString (">");
-			this.hbox2.Add (this.quickInsertLibButton);
-			global::Gtk.Box.BoxChild w35 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.quickInsertLibButton]));
-			w35.Position = 1;
-			w35.Expand = false;
-			w35.Fill = false;
-			this.table4.Add (this.hbox2);
-			global::Gtk.Table.TableChild w36 = ((global::Gtk.Table.TableChild)(this.table4 [this.hbox2]));
-			w36.LeftAttach = ((uint)(1));
-			w36.RightAttach = ((uint)(2));
-			w36.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label10 = new global::Gtk.Label ();
-			this.label10.Name = "label10";
-			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("Library:");
-			this.table4.Add (this.label10);
-			global::Gtk.Table.TableChild w37 = ((global::Gtk.Table.TableChild)(this.table4 [this.label10]));
-			w37.XOptions = ((global::Gtk.AttachOptions)(4));
-			w37.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.libPathAddButton = new global::Gtk.Button ();
-			this.libPathAddButton.Sensitive = false;
-			this.libPathAddButton.CanFocus = true;
-			this.libPathAddButton.Name = "libPathAddButton";
-			this.libPathAddButton.UseUnderline = true;
-			this.libPathAddButton.Label = global::Mono.Unix.Catalog.GetString ("Add");
-			this.table4.Add (this.libPathAddButton);
-			global::Gtk.Table.TableChild w38 = ((global::Gtk.Table.TableChild)(this.table4 [this.libPathAddButton]));
-			w38.LeftAttach = ((uint)(2));
-			w38.RightAttach = ((uint)(3));
-			w38.XOptions = ((global::Gtk.AttachOptions)(4));
-			w38.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.scrolledwindow3 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow3.CanFocus = true;
-			this.scrolledwindow3.Name = "scrolledwindow3";
-			this.scrolledwindow3.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow3.Gtk.Container+ContainerChild
-			this.libPathTreeView = new global::Gtk.TreeView ();
-			this.libPathTreeView.CanFocus = true;
-			this.libPathTreeView.Name = "libPathTreeView";
-			this.scrolledwindow3.Add (this.libPathTreeView);
-			this.table4.Add (this.scrolledwindow3);
-			global::Gtk.Table.TableChild w40 = ((global::Gtk.Table.TableChild)(this.table4 [this.scrolledwindow3]));
-			w40.TopAttach = ((uint)(1));
-			w40.BottomAttach = ((uint)(2));
-			w40.LeftAttach = ((uint)(1));
-			w40.RightAttach = ((uint)(2));
-			// Container child table4.Gtk.Table+TableChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.libPathBrowseButton = new global::Gtk.Button ();
-			this.libPathBrowseButton.CanFocus = true;
-			this.libPathBrowseButton.Name = "libPathBrowseButton";
-			this.libPathBrowseButton.UseUnderline = true;
-			this.libPathBrowseButton.Label = global::Mono.Unix.Catalog.GetString ("Browse...");
-			this.vbox3.Add (this.libPathBrowseButton);
-			global::Gtk.Box.BoxChild w41 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.libPathBrowseButton]));
-			w41.Position = 0;
-			w41.Expand = false;
-			w41.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.libPathRemoveButton = new global::Gtk.Button ();
-			this.libPathRemoveButton.Sensitive = false;
-			this.libPathRemoveButton.CanFocus = true;
-			this.libPathRemoveButton.Name = "libPathRemoveButton";
-			this.libPathRemoveButton.UseUnderline = true;
-			this.libPathRemoveButton.Label = global::Mono.Unix.Catalog.GetString ("Remove");
-			this.vbox3.Add (this.libPathRemoveButton);
-			global::Gtk.Box.BoxChild w42 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.libPathRemoveButton]));
-			w42.Position = 1;
-			w42.Expand = false;
-			w42.Fill = false;
-			this.table4.Add (this.vbox3);
-			global::Gtk.Table.TableChild w43 = ((global::Gtk.Table.TableChild)(this.table4 [this.vbox3]));
-			w43.TopAttach = ((uint)(1));
-			w43.BottomAttach = ((uint)(2));
-			w43.LeftAttach = ((uint)(2));
-			w43.RightAttach = ((uint)(3));
-			w43.XOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox7.Add (this.table4);
-			global::Gtk.Box.BoxChild w44 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.table4]));
-			w44.Position = 0;
-			// Container child vbox7.Gtk.Box+BoxChild
-			this.table3 = new global::Gtk.Table (((uint)(2)), ((uint)(3)), false);
-			this.table3.Name = "table3";
-			this.table3.RowSpacing = ((uint)(10));
-			this.table3.ColumnSpacing = ((uint)(10));
-			// Container child table3.Gtk.Table+TableChild
-			this.hbox3 = new global::Gtk.HBox ();
-			this.hbox3.Name = "hbox3";
-			this.hbox3.Spacing = 6;
-			// Container child hbox3.Gtk.Box+BoxChild
-			this.includePathEntry = new global::Gtk.Entry ();
-			this.includePathEntry.CanFocus = true;
-			this.includePathEntry.Name = "includePathEntry";
-			this.includePathEntry.IsEditable = true;
-			this.includePathEntry.InvisibleChar = '●';
-			this.hbox3.Add (this.includePathEntry);
-			global::Gtk.Box.BoxChild w45 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.includePathEntry]));
-			w45.Position = 0;
-			// Container child hbox3.Gtk.Box+BoxChild
-			this.quickInsertIncludeButton = new global::Gtk.Button ();
-			this.quickInsertIncludeButton.TooltipMarkup = "Insert a macro.";
-			this.quickInsertIncludeButton.CanFocus = true;
-			this.quickInsertIncludeButton.Name = "quickInsertIncludeButton";
-			this.quickInsertIncludeButton.UseUnderline = true;
-			this.quickInsertIncludeButton.Label = global::Mono.Unix.Catalog.GetString (">");
-			this.hbox3.Add (this.quickInsertIncludeButton);
-			global::Gtk.Box.BoxChild w46 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.quickInsertIncludeButton]));
-			w46.Position = 1;
-			w46.Expand = false;
-			w46.Fill = false;
-			this.table3.Add (this.hbox3);
-			global::Gtk.Table.TableChild w47 = ((global::Gtk.Table.TableChild)(this.table3 [this.hbox3]));
-			w47.LeftAttach = ((uint)(1));
-			w47.RightAttach = ((uint)(2));
-			w47.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table3.Gtk.Table+TableChild
-			this.includePathAddButton = new global::Gtk.Button ();
-			this.includePathAddButton.Sensitive = false;
-			this.includePathAddButton.CanFocus = true;
-			this.includePathAddButton.Name = "includePathAddButton";
-			this.includePathAddButton.UseUnderline = true;
-			this.includePathAddButton.Label = global::Mono.Unix.Catalog.GetString ("Add");
-			this.table3.Add (this.includePathAddButton);
-			global::Gtk.Table.TableChild w48 = ((global::Gtk.Table.TableChild)(this.table3 [this.includePathAddButton]));
-			w48.LeftAttach = ((uint)(2));
-			w48.RightAttach = ((uint)(3));
-			w48.XOptions = ((global::Gtk.AttachOptions)(4));
-			w48.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table3.Gtk.Table+TableChild
-			this.label9 = new global::Gtk.Label ();
-			this.label9.Name = "label9";
-			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Include:");
-			this.table3.Add (this.label9);
-			global::Gtk.Table.TableChild w49 = ((global::Gtk.Table.TableChild)(this.table3 [this.label9]));
-			w49.XOptions = ((global::Gtk.AttachOptions)(4));
-			w49.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table3.Gtk.Table+TableChild
-			this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow2.CanFocus = true;
-			this.scrolledwindow2.Name = "scrolledwindow2";
-			this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow2.Gtk.Container+ContainerChild
-			this.includePathTreeView = new global::Gtk.TreeView ();
-			this.includePathTreeView.CanFocus = true;
-			this.includePathTreeView.Name = "includePathTreeView";
-			this.scrolledwindow2.Add (this.includePathTreeView);
-			this.table3.Add (this.scrolledwindow2);
-			global::Gtk.Table.TableChild w51 = ((global::Gtk.Table.TableChild)(this.table3 [this.scrolledwindow2]));
-			w51.TopAttach = ((uint)(1));
-			w51.BottomAttach = ((uint)(2));
-			w51.LeftAttach = ((uint)(1));
-			w51.RightAttach = ((uint)(2));
-			// Container child table3.Gtk.Table+TableChild
-			this.vbox5 = new global::Gtk.VBox ();
-			this.vbox5.Name = "vbox5";
-			this.vbox5.Spacing = 6;
-			// Container child vbox5.Gtk.Box+BoxChild
-			this.includePathBrowseButton = new global::Gtk.Button ();
-			this.includePathBrowseButton.CanFocus = true;
-			this.includePathBrowseButton.Name = "includePathBrowseButton";
-			this.includePathBrowseButton.UseUnderline = true;
-			this.includePathBrowseButton.Label = global::Mono.Unix.Catalog.GetString ("Browse...");
-			this.vbox5.Add (this.includePathBrowseButton);
-			global::Gtk.Box.BoxChild w52 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.includePathBrowseButton]));
-			w52.Position = 0;
-			w52.Expand = false;
-			w52.Fill = false;
-			// Container child vbox5.Gtk.Box+BoxChild
-			this.includePathRemoveButton = new global::Gtk.Button ();
-			this.includePathRemoveButton.Sensitive = false;
-			this.includePathRemoveButton.CanFocus = true;
-			this.includePathRemoveButton.Name = "includePathRemoveButton";
-			this.includePathRemoveButton.UseUnderline = true;
-			this.includePathRemoveButton.Label = global::Mono.Unix.Catalog.GetString ("Remove");
-			this.vbox5.Add (this.includePathRemoveButton);
-			global::Gtk.Box.BoxChild w53 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.includePathRemoveButton]));
-			w53.Position = 1;
-			w53.Expand = false;
-			w53.Fill = false;
-			this.table3.Add (this.vbox5);
-			global::Gtk.Table.TableChild w54 = ((global::Gtk.Table.TableChild)(this.table3 [this.vbox5]));
-			w54.TopAttach = ((uint)(1));
-			w54.BottomAttach = ((uint)(2));
-			w54.LeftAttach = ((uint)(2));
-			w54.RightAttach = ((uint)(3));
-			w54.XOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox7.Add (this.table3);
-			global::Gtk.Box.BoxChild w55 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.table3]));
-			w55.Position = 1;
-			this.notebook1.Add (this.vbox7);
-			global::Gtk.Notebook.NotebookChild w56 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox7]));
-			w56.Position = 2;
-			// Notebook tab
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Paths");
-			this.notebook1.SetTabLabel (this.vbox7, this.label3);
-			this.label3.ShowAll ();
-			this.Add (this.notebook1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Show ();
-			this.browseButton.Clicked += new global::System.EventHandler (this.OnBrowseButtonClick);
-			this.removeLibButton.Clicked += new global::System.EventHandler (this.OnRemoveLibButtonClicked);
-			this.removeLibButton.Clicked += new global::System.EventHandler (this.OnLibRemoved);
-			this.libTreeView.CursorChanged += new global::System.EventHandler (this.OnLibTreeViewCursorChanged);
-			this.libAddEntry.Changed += new global::System.EventHandler (this.OnLibAddEntryChanged);
-			this.libAddEntry.Activated += new global::System.EventHandler (this.OnLibAddEntryActivated);
-			this.addLibButton.Clicked += new global::System.EventHandler (this.OnLibAdded);
-			this.libPathBrowseButton.Clicked += new global::System.EventHandler (this.OnLibPathBrowseButtonClick);
-			this.libPathRemoveButton.Clicked += new global::System.EventHandler (this.OnLibPathRemoveButtonClicked);
-			this.libPathRemoveButton.Clicked += new global::System.EventHandler (this.OnLibPathRemoved);
-			this.libPathTreeView.CursorChanged += new global::System.EventHandler (this.OnLibPathTreeViewCursorChanged);
-			this.libPathAddButton.Clicked += new global::System.EventHandler (this.OnLibPathAdded);
-			this.libPathEntry.Changed += new global::System.EventHandler (this.OnLibPathEntryChanged);
-			this.libPathEntry.Activated += new global::System.EventHandler (this.OnLibPathEntryActivated);
-			this.includePathBrowseButton.Clicked += new global::System.EventHandler (this.OnIncludePathBrowseButtonClick);
-			this.includePathRemoveButton.Clicked += new global::System.EventHandler (this.OnIncludePathRemoveButtonClicked);
-			this.includePathRemoveButton.Clicked += new global::System.EventHandler (this.OnIncludePathRemoved);
-			this.includePathTreeView.CursorChanged += new global::System.EventHandler (this.OnIncludePathTreeViewCursorChanged);
-			this.includePathAddButton.Clicked += new global::System.EventHandler (this.OnIncludePathAdded);
-			this.includePathEntry.Changed += new global::System.EventHandler (this.OnIncludePathEntryChanged);
-			this.includePathEntry.Activated += new global::System.EventHandler (this.OnIncludePathEntryActivated);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.CompilerPanel.cs b/main/src/addins/CBinding/gtk-gui/CBinding.CompilerPanel.cs
deleted file mode 100644
index be3c43f1ce..0000000000
--- a/main/src/addins/CBinding/gtk-gui/CBinding.CompilerPanel.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace CBinding
-{
-	public partial class CompilerPanel
-	{
-		private global::Gtk.Table table2;
-		private global::Gtk.ComboBox compilerComboBox;
-		private global::Gtk.CheckButton useCcacheCheckBox;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget CBinding.CompilerPanel
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "CBinding.CompilerPanel";
-			// Container child CBinding.CompilerPanel.Gtk.Container+ContainerChild
-			this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(3)), false);
-			this.table2.Name = "table2";
-			this.table2.RowSpacing = ((uint)(6));
-			this.table2.ColumnSpacing = ((uint)(6));
-			// Container child table2.Gtk.Table+TableChild
-			this.compilerComboBox = global::Gtk.ComboBox.NewText ();
-			this.compilerComboBox.Name = "compilerComboBox";
-			this.table2.Add (this.compilerComboBox);
-			global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table2 [this.compilerComboBox]));
-			w1.TopAttach = ((uint)(1));
-			w1.BottomAttach = ((uint)(2));
-			w1.LeftAttach = ((uint)(1));
-			w1.RightAttach = ((uint)(2));
-			w1.XOptions = ((global::Gtk.AttachOptions)(4));
-			w1.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.useCcacheCheckBox = new global::Gtk.CheckButton ();
-			this.useCcacheCheckBox.CanFocus = true;
-			this.useCcacheCheckBox.Name = "useCcacheCheckBox";
-			this.useCcacheCheckBox.Label = global::Mono.Unix.Catalog.GetString ("Use ccache");
-			this.useCcacheCheckBox.DrawIndicator = true;
-			this.useCcacheCheckBox.UseUnderline = true;
-			this.table2.Add (this.useCcacheCheckBox);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table2 [this.useCcacheCheckBox]));
-			w2.TopAttach = ((uint)(2));
-			w2.BottomAttach = ((uint)(3));
-			w2.LeftAttach = ((uint)(1));
-			w2.RightAttach = ((uint)(2));
-			w2.XOptions = ((global::Gtk.AttachOptions)(4));
-			w2.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.Add (this.table2);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Show ();
-			this.compilerComboBox.Changed += new global::System.EventHandler (this.OnCompilerComboBoxChanged);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs b/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs
deleted file mode 100644
index d2ac0eb869..0000000000
--- a/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace CBinding
-{
-	public partial class EditPackagesDialog
-	{
-		private global::Gtk.VPaned vpaned1;
-		private global::Gtk.HBox hbox1;
-		private global::Gtk.Notebook notebook1;
-		private global::Gtk.ScrolledWindow scrolledwindow1;
-		private global::Gtk.TreeView normalPackageTreeView;
-		private global::Gtk.Label labelSystemPackages;
-		private global::Gtk.ScrolledWindow scrolledwindow3;
-		private global::Gtk.TreeView projectPackageTreeView;
-		private global::Gtk.Label labelProjectPackages;
-		private global::Gtk.VBox vbox3;
-		private global::Gtk.Fixed fixed1;
-		private global::Gtk.Button detailsButton;
-		private global::Gtk.Table table1;
-		private global::Gtk.Label label3;
-		private global::Gtk.ScrolledWindow scrolledwindow2;
-		private global::Gtk.TreeView selectedPackageTreeView;
-		private global::Gtk.VBox vbox2;
-		private global::Gtk.Button removeButton;
-		private global::Gtk.Button buttonCancel;
-		private global::Gtk.Button buttonOk;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget CBinding.EditPackagesDialog
-			this.Name = "CBinding.EditPackagesDialog";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Edit packages");
-			this.Modal = true;
-			// Internal child CBinding.EditPackagesDialog.VBox
-			global::Gtk.VBox w1 = this.VBox;
-			w1.Name = "dialog1_VBox";
-			w1.BorderWidth = ((uint)(2));
-			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.vpaned1 = new global::Gtk.VPaned ();
-			this.vpaned1.CanFocus = true;
-			this.vpaned1.Name = "vpaned1";
-			this.vpaned1.Position = 183;
-			this.vpaned1.BorderWidth = ((uint)(6));
-			// Container child vpaned1.Gtk.Paned+PanedChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.notebook1 = new global::Gtk.Notebook ();
-			this.notebook1.CanFocus = true;
-			this.notebook1.Name = "notebook1";
-			this.notebook1.CurrentPage = 0;
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow1.CanFocus = true;
-			this.scrolledwindow1.Name = "scrolledwindow1";
-			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			this.normalPackageTreeView = new global::Gtk.TreeView ();
-			this.normalPackageTreeView.CanFocus = true;
-			this.normalPackageTreeView.Name = "normalPackageTreeView";
-			this.scrolledwindow1.Add (this.normalPackageTreeView);
-			this.notebook1.Add (this.scrolledwindow1);
-			// Notebook tab
-			this.labelSystemPackages = new global::Gtk.Label ();
-			this.labelSystemPackages.Name = "labelSystemPackages";
-			this.labelSystemPackages.LabelProp = global::Mono.Unix.Catalog.GetString ("System Packages");
-			this.notebook1.SetTabLabel (this.scrolledwindow1, this.labelSystemPackages);
-			this.labelSystemPackages.ShowAll ();
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.scrolledwindow3 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow3.CanFocus = true;
-			this.scrolledwindow3.Name = "scrolledwindow3";
-			this.scrolledwindow3.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow3.Gtk.Container+ContainerChild
-			this.projectPackageTreeView = new global::Gtk.TreeView ();
-			this.projectPackageTreeView.CanFocus = true;
-			this.projectPackageTreeView.Name = "projectPackageTreeView";
-			this.scrolledwindow3.Add (this.projectPackageTreeView);
-			this.notebook1.Add (this.scrolledwindow3);
-			global::Gtk.Notebook.NotebookChild w5 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.scrolledwindow3]));
-			w5.Position = 1;
-			// Notebook tab
-			this.labelProjectPackages = new global::Gtk.Label ();
-			this.labelProjectPackages.Name = "labelProjectPackages";
-			this.labelProjectPackages.LabelProp = global::Mono.Unix.Catalog.GetString ("Project Packages");
-			this.notebook1.SetTabLabel (this.scrolledwindow3, this.labelProjectPackages);
-			this.labelProjectPackages.ShowAll ();
-			this.hbox1.Add (this.notebook1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.notebook1]));
-			w6.Position = 0;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.fixed1 = new global::Gtk.Fixed ();
-			this.fixed1.HeightRequest = 21;
-			this.fixed1.Name = "fixed1";
-			this.fixed1.HasWindow = false;
-			this.vbox3.Add (this.fixed1);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.fixed1]));
-			w7.Position = 0;
-			w7.Expand = false;
-			w7.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.detailsButton = new global::Gtk.Button ();
-			this.detailsButton.WidthRequest = 33;
-			this.detailsButton.HeightRequest = 33;
-			this.detailsButton.Sensitive = false;
-			this.detailsButton.CanFocus = true;
-			this.detailsButton.Name = "detailsButton";
-			this.detailsButton.UseUnderline = true;
-			this.detailsButton.Label = global::Mono.Unix.Catalog.GetString ("...");
-			this.vbox3.Add (this.detailsButton);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.detailsButton]));
-			w8.Position = 1;
-			w8.Expand = false;
-			w8.Fill = false;
-			this.hbox1.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox3]));
-			w9.Position = 1;
-			w9.Expand = false;
-			w9.Fill = false;
-			this.vpaned1.Add (this.hbox1);
-			global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.vpaned1 [this.hbox1]));
-			w10.Resize = false;
-			// Container child vpaned1.Gtk.Paned+PanedChild
-			this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(6));
-			this.table1.ColumnSpacing = ((uint)(6));
-			// Container child table1.Gtk.Table+TableChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.Xalign = 0F;
-			this.label3.Yalign = 0F;
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Selected packages:");
-			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
-			w11.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow2.CanFocus = true;
-			this.scrolledwindow2.Name = "scrolledwindow2";
-			this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow2.Gtk.Container+ContainerChild
-			this.selectedPackageTreeView = new global::Gtk.TreeView ();
-			this.selectedPackageTreeView.CanFocus = true;
-			this.selectedPackageTreeView.Name = "selectedPackageTreeView";
-			this.scrolledwindow2.Add (this.selectedPackageTreeView);
-			this.table1.Add (this.scrolledwindow2);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.scrolledwindow2]));
-			w13.TopAttach = ((uint)(1));
-			w13.BottomAttach = ((uint)(2));
-			w13.XOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.vbox2 = new global::Gtk.VBox ();
-			this.vbox2.Name = "vbox2";
-			this.vbox2.Spacing = 6;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.removeButton = new global::Gtk.Button ();
-			this.removeButton.TooltipMarkup = "Remove selected package from the project.";
-			this.removeButton.WidthRequest = 33;
-			this.removeButton.HeightRequest = 33;
-			this.removeButton.Sensitive = false;
-			this.removeButton.CanFocus = true;
-			this.removeButton.Name = "removeButton";
-			this.removeButton.UseUnderline = true;
-			this.removeButton.Label = "";
-			global::Gtk.Image w14 = new global::Gtk.Image ();
-			w14.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-remove", global::Gtk.IconSize.Menu);
-			this.removeButton.Image = w14;
-			this.vbox2.Add (this.removeButton);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.removeButton]));
-			w15.Position = 0;
-			w15.Expand = false;
-			w15.Fill = false;
-			this.table1.Add (this.vbox2);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox2]));
-			w16.TopAttach = ((uint)(1));
-			w16.BottomAttach = ((uint)(2));
-			w16.LeftAttach = ((uint)(1));
-			w16.RightAttach = ((uint)(2));
-			w16.XOptions = ((global::Gtk.AttachOptions)(4));
-			this.vpaned1.Add (this.table1);
-			w1.Add (this.vpaned1);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(w1 [this.vpaned1]));
-			w18.Position = 0;
-			w18.Padding = ((uint)(3));
-			// Internal child CBinding.EditPackagesDialog.ActionArea
-			global::Gtk.HButtonBox w19 = this.ActionArea;
-			w19.Name = "dialog1_ActionArea";
-			w19.Spacing = 6;
-			w19.BorderWidth = ((uint)(5));
-			w19.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
-			this.buttonCancel.CanDefault = true;
-			this.buttonCancel.CanFocus = true;
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.UseStock = true;
-			this.buttonCancel.UseUnderline = true;
-			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w20 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w19 [this.buttonCancel]));
-			w20.Expand = false;
-			w20.Fill = false;
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w21 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w19 [this.buttonOk]));
-			w21.Position = 1;
-			w21.Expand = false;
-			w21.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.DefaultWidth = 580;
-			this.DefaultHeight = 449;
-			this.Hide ();
-			this.notebook1.SwitchPage += new global::Gtk.SwitchPageHandler (this.OnNotebook1SwitchPage);
-			this.normalPackageTreeView.CursorChanged += new global::System.EventHandler (this.OnNonSelectedPackageCursorChanged);
-			this.projectPackageTreeView.CursorChanged += new global::System.EventHandler (this.OnNonSelectedPackageCursorChanged);
-			this.detailsButton.Clicked += new global::System.EventHandler (this.OnDetailsButtonClicked);
-			this.removeButton.Clicked += new global::System.EventHandler (this.OnRemoveButtonClicked);
-			this.removeButton.Clicked += new global::System.EventHandler (this.OnRemoveButtonClick);
-			this.selectedPackageTreeView.CursorChanged += new global::System.EventHandler (this.OnSelectedPackagesTreeViewCursorChanged);
-			this.buttonCancel.Clicked += new global::System.EventHandler (this.OnCancelButtonClick);
-			this.buttonOk.Clicked += new global::System.EventHandler (this.OnOkButtonClick);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs b/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs
deleted file mode 100644
index 9bcbecfade..0000000000
--- a/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace CBinding
-{
-	public partial class GeneralOptionsPanel
-	{
-		private global::Gtk.Table table1;
-		private global::Gtk.ComboBox cCombo;
-		private global::Gtk.ComboBox cppCombo;
-		private global::Gtk.Button ctagsBrowse;
-		private global::Gtk.Entry ctagsEntry;
-		private global::Gtk.Label label1;
-		private global::Gtk.Label label2;
-		private global::Gtk.Label label3;
-		private global::Gtk.CheckButton parseLocalVariablesCheck;
-		private global::Gtk.CheckButton parseSystemTagsCheck;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget CBinding.GeneralOptionsPanel
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "CBinding.GeneralOptionsPanel";
-			// Container child CBinding.GeneralOptionsPanel.Gtk.Container+ContainerChild
-			this.table1 = new global::Gtk.Table (((uint)(5)), ((uint)(3)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(6));
-			this.table1.ColumnSpacing = ((uint)(6));
-			// Container child table1.Gtk.Table+TableChild
-			this.cCombo = global::Gtk.ComboBox.NewText ();
-			this.cCombo.TooltipMarkup = "Default compiler to use for new C projects.";
-			this.cCombo.Name = "cCombo";
-			this.table1.Add (this.cCombo);
-			global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1 [this.cCombo]));
-			w1.LeftAttach = ((uint)(1));
-			w1.RightAttach = ((uint)(2));
-			w1.XOptions = ((global::Gtk.AttachOptions)(4));
-			w1.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.cppCombo = global::Gtk.ComboBox.NewText ();
-			this.cppCombo.TooltipMarkup = "Default compiler to use for new C++ projects.";
-			this.cppCombo.Name = "cppCombo";
-			this.table1.Add (this.cppCombo);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.cppCombo]));
-			w2.TopAttach = ((uint)(1));
-			w2.BottomAttach = ((uint)(2));
-			w2.LeftAttach = ((uint)(1));
-			w2.RightAttach = ((uint)(2));
-			w2.XOptions = ((global::Gtk.AttachOptions)(4));
-			w2.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.ctagsBrowse = new global::Gtk.Button ();
-			this.ctagsBrowse.CanFocus = true;
-			this.ctagsBrowse.Name = "ctagsBrowse";
-			this.ctagsBrowse.UseUnderline = true;
-			this.ctagsBrowse.Label = global::Mono.Unix.Catalog.GetString ("Browse");
-			global::Gtk.Image w3 = new global::Gtk.Image ();
-			w3.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-open", global::Gtk.IconSize.Menu);
-			this.ctagsBrowse.Image = w3;
-			this.table1.Add (this.ctagsBrowse);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.ctagsBrowse]));
-			w4.TopAttach = ((uint)(2));
-			w4.BottomAttach = ((uint)(3));
-			w4.LeftAttach = ((uint)(2));
-			w4.RightAttach = ((uint)(3));
-			w4.XOptions = ((global::Gtk.AttachOptions)(4));
-			w4.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.ctagsEntry = new global::Gtk.Entry ();
-			this.ctagsEntry.CanFocus = true;
-			this.ctagsEntry.Name = "ctagsEntry";
-			this.ctagsEntry.IsEditable = true;
-			this.ctagsEntry.InvisibleChar = '●';
-			this.table1.Add (this.ctagsEntry);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.ctagsEntry]));
-			w5.TopAttach = ((uint)(2));
-			w5.BottomAttach = ((uint)(3));
-			w5.LeftAttach = ((uint)(1));
-			w5.RightAttach = ((uint)(2));
-			w5.XOptions = ((global::Gtk.AttachOptions)(4));
-			w5.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.Xpad = 10;
-			this.label1.Xalign = 1F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Default C Compiler:");
-			this.table1.Add (this.label1);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
-			w6.XOptions = ((global::Gtk.AttachOptions)(4));
-			w6.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.Xpad = 10;
-			this.label2.Xalign = 1F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Default C++ Compiler:");
-			this.table1.Add (this.label2);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
-			w7.TopAttach = ((uint)(1));
-			w7.BottomAttach = ((uint)(2));
-			w7.XOptions = ((global::Gtk.AttachOptions)(4));
-			w7.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.Xpad = 10;
-			this.label3.Xalign = 1F;
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("CTags: ");
-			this.label3.Justify = ((global::Gtk.Justification)(1));
-			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
-			w8.TopAttach = ((uint)(2));
-			w8.BottomAttach = ((uint)(3));
-			w8.XOptions = ((global::Gtk.AttachOptions)(4));
-			w8.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.parseLocalVariablesCheck = new global::Gtk.CheckButton ();
-			this.parseLocalVariablesCheck.CanFocus = true;
-			this.parseLocalVariablesCheck.Name = "parseLocalVariablesCheck";
-			this.parseLocalVariablesCheck.Label = global::Mono.Unix.Catalog.GetString ("Parse Local Variables");
-			this.parseLocalVariablesCheck.DrawIndicator = true;
-			this.parseLocalVariablesCheck.UseUnderline = true;
-			this.table1.Add (this.parseLocalVariablesCheck);
-			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.parseLocalVariablesCheck]));
-			w9.TopAttach = ((uint)(4));
-			w9.BottomAttach = ((uint)(5));
-			w9.XPadding = ((uint)(10));
-			w9.XOptions = ((global::Gtk.AttachOptions)(4));
-			w9.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.parseSystemTagsCheck = new global::Gtk.CheckButton ();
-			this.parseSystemTagsCheck.TooltipMarkup = "Choose whether you want to parse system tags or not, if you do you will get completion for things like printf, but the tag parsing process will take considerably longer.";
-			this.parseSystemTagsCheck.CanFocus = true;
-			this.parseSystemTagsCheck.Name = "parseSystemTagsCheck";
-			this.parseSystemTagsCheck.Label = global::Mono.Unix.Catalog.GetString ("Parse System Tags");
-			this.parseSystemTagsCheck.DrawIndicator = true;
-			this.parseSystemTagsCheck.UseUnderline = true;
-			this.table1.Add (this.parseSystemTagsCheck);
-			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.parseSystemTagsCheck]));
-			w10.TopAttach = ((uint)(3));
-			w10.BottomAttach = ((uint)(4));
-			w10.XPadding = ((uint)(10));
-			w10.XOptions = ((global::Gtk.AttachOptions)(4));
-			w10.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.Add (this.table1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Show ();
-			this.ctagsBrowse.Clicked += new global::System.EventHandler (this.OnCtagsBrowseClicked);
-			this.cppCombo.Changed += new global::System.EventHandler (this.OnCppComboChanged);
-			this.cCombo.Changed += new global::System.EventHandler (this.OnCComboChanged);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.OutputOptionsPanel.cs b/main/src/addins/CBinding/gtk-gui/CBinding.OutputOptionsPanel.cs
deleted file mode 100644
index 46ab68872e..0000000000
--- a/main/src/addins/CBinding/gtk-gui/CBinding.OutputOptionsPanel.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace CBinding
-{
-	public partial class OutputOptionsPanel
-	{
-		private global::Gtk.VBox vbox2;
-		private global::Gtk.Table table1;
-		private global::Gtk.Label label1;
-		private global::Gtk.Label label2;
-		private global::Gtk.Label label3;
-		private global::Gtk.Label label4;
-		private global::MonoDevelop.Components.FolderEntry outputEntry;
-		private global::Gtk.Entry outputNameTextEntry;
-		private global::Gtk.Entry parametersTextEntry;
-		private global::Gtk.CheckButton externalConsoleCheckbox;
-		private global::Gtk.CheckButton pauseCheckbox;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget CBinding.OutputOptionsPanel
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "CBinding.OutputOptionsPanel";
-			// Container child CBinding.OutputOptionsPanel.Gtk.Container+ContainerChild
-			this.vbox2 = new global::Gtk.VBox ();
-			this.vbox2.Name = "vbox2";
-			this.vbox2.Spacing = 6;
-			this.vbox2.BorderWidth = ((uint)(3));
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(2)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(6));
-			this.table1.ColumnSpacing = ((uint)(6));
-			this.table1.BorderWidth = ((uint)(3));
-			// Container child table1.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Output</b>");
-			this.label1.UseMarkup = true;
-			this.table1.Add (this.label1);
-			global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
-			w1.XOptions = ((global::Gtk.AttachOptions)(4));
-			w1.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.Xalign = 0F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Output Name:");
-			this.table1.Add (this.label2);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
-			w2.TopAttach = ((uint)(1));
-			w2.BottomAttach = ((uint)(2));
-			w2.XPadding = ((uint)(15));
-			w2.XOptions = ((global::Gtk.AttachOptions)(4));
-			w2.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.Xalign = 0F;
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Output Path:");
-			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
-			w3.TopAttach = ((uint)(2));
-			w3.BottomAttach = ((uint)(3));
-			w3.XPadding = ((uint)(15));
-			w3.XOptions = ((global::Gtk.AttachOptions)(4));
-			w3.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label4 = new global::Gtk.Label ();
-			this.label4.Name = "label4";
-			this.label4.Xalign = 0F;
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("Parameters:");
-			this.table1.Add (this.label4);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.label4]));
-			w4.TopAttach = ((uint)(3));
-			w4.BottomAttach = ((uint)(4));
-			w4.XPadding = ((uint)(15));
-			w4.XOptions = ((global::Gtk.AttachOptions)(4));
-			w4.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.outputEntry = new global::MonoDevelop.Components.FolderEntry ();
-			this.outputEntry.Name = "outputEntry";
-			this.table1.Add (this.outputEntry);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.outputEntry]));
-			w5.TopAttach = ((uint)(2));
-			w5.BottomAttach = ((uint)(3));
-			w5.LeftAttach = ((uint)(1));
-			w5.RightAttach = ((uint)(2));
-			w5.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.outputNameTextEntry = new global::Gtk.Entry ();
-			this.outputNameTextEntry.CanFocus = true;
-			this.outputNameTextEntry.Name = "outputNameTextEntry";
-			this.outputNameTextEntry.IsEditable = true;
-			this.outputNameTextEntry.InvisibleChar = '●';
-			this.table1.Add (this.outputNameTextEntry);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.outputNameTextEntry]));
-			w6.TopAttach = ((uint)(1));
-			w6.BottomAttach = ((uint)(2));
-			w6.LeftAttach = ((uint)(1));
-			w6.RightAttach = ((uint)(2));
-			w6.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.parametersTextEntry = new global::Gtk.Entry ();
-			this.parametersTextEntry.CanFocus = true;
-			this.parametersTextEntry.Name = "parametersTextEntry";
-			this.parametersTextEntry.IsEditable = true;
-			this.parametersTextEntry.InvisibleChar = '●';
-			this.table1.Add (this.parametersTextEntry);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.parametersTextEntry]));
-			w7.TopAttach = ((uint)(3));
-			w7.BottomAttach = ((uint)(4));
-			w7.LeftAttach = ((uint)(1));
-			w7.RightAttach = ((uint)(2));
-			w7.XOptions = ((global::Gtk.AttachOptions)(4));
-			w7.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox2.Add (this.table1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.table1]));
-			w8.Position = 0;
-			w8.Expand = false;
-			w8.Fill = false;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.externalConsoleCheckbox = new global::Gtk.CheckButton ();
-			this.externalConsoleCheckbox.CanFocus = true;
-			this.externalConsoleCheckbox.Name = "externalConsoleCheckbox";
-			this.externalConsoleCheckbox.Label = global::Mono.Unix.Catalog.GetString ("Run on e_xternal console");
-			this.externalConsoleCheckbox.Active = true;
-			this.externalConsoleCheckbox.DrawIndicator = true;
-			this.externalConsoleCheckbox.UseUnderline = true;
-			this.vbox2.Add (this.externalConsoleCheckbox);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.externalConsoleCheckbox]));
-			w9.Position = 1;
-			w9.Expand = false;
-			w9.Fill = false;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.pauseCheckbox = new global::Gtk.CheckButton ();
-			this.pauseCheckbox.Sensitive = false;
-			this.pauseCheckbox.CanFocus = true;
-			this.pauseCheckbox.Name = "pauseCheckbox";
-			this.pauseCheckbox.Label = global::Mono.Unix.Catalog.GetString ("Pause _console output");
-			this.pauseCheckbox.DrawIndicator = true;
-			this.pauseCheckbox.UseUnderline = true;
-			this.vbox2.Add (this.pauseCheckbox);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.pauseCheckbox]));
-			w10.Position = 2;
-			w10.Expand = false;
-			w10.Fill = false;
-			this.Add (this.vbox2);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Show ();
-			this.externalConsoleCheckbox.Clicked += new global::System.EventHandler (this.OnExternalConsoleCheckboxClicked);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.PackageDetails.cs b/main/src/addins/CBinding/gtk-gui/CBinding.PackageDetails.cs
deleted file mode 100644
index c1a4b13353..0000000000
--- a/main/src/addins/CBinding/gtk-gui/CBinding.PackageDetails.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace CBinding
-{
-	public partial class PackageDetails
-	{
-		private global::Gtk.VBox vbox3;
-		private global::Gtk.Table table1;
-		private global::Gtk.Label descriptionLabel;
-		private global::Gtk.Label label7;
-		private global::Gtk.Label label8;
-		private global::Gtk.Label label9;
-		private global::Gtk.Label nameLabel;
-		private global::Gtk.Label versionLabel;
-		private global::Gtk.VBox vbox4;
-		private global::Gtk.Label label13;
-		private global::Gtk.ScrolledWindow scrolledwindow1;
-		private global::Gtk.TreeView requiresTreeView;
-		private global::Gtk.VBox vbox2;
-		private global::Gtk.Label label1;
-		private global::Gtk.HBox hbox1;
-		private global::Gtk.ScrolledWindow scrolledwindow2;
-		private global::Gtk.TreeView libPathsTreeView;
-		private global::Gtk.ScrolledWindow scrolledwindow3;
-		private global::Gtk.TreeView libsTreeView;
-		private global::Gtk.VBox vbox5;
-		private global::Gtk.Label label2;
-		private global::Gtk.ScrolledWindow scrolledwindow4;
-		private global::Gtk.TreeView cflagsTreeView;
-		private global::Gtk.Button buttonOk;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget CBinding.PackageDetails
-			this.Name = "CBinding.PackageDetails";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Package Details");
-			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
-			// Internal child CBinding.PackageDetails.VBox
-			global::Gtk.VBox w1 = this.VBox;
-			w1.Name = "dialog1_VBox";
-			w1.BorderWidth = ((uint)(2));
-			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			this.vbox3.BorderWidth = ((uint)(3));
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
-			this.table1.Name = "table1";
-			this.table1.RowSpacing = ((uint)(6));
-			this.table1.ColumnSpacing = ((uint)(6));
-			// Container child table1.Gtk.Table+TableChild
-			this.descriptionLabel = new global::Gtk.Label ();
-			this.descriptionLabel.Name = "descriptionLabel";
-			this.descriptionLabel.Xalign = 0F;
-			this.descriptionLabel.Yalign = 0F;
-			this.descriptionLabel.LabelProp = "label12";
-			this.table1.Add (this.descriptionLabel);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.descriptionLabel]));
-			w2.TopAttach = ((uint)(2));
-			w2.BottomAttach = ((uint)(3));
-			w2.LeftAttach = ((uint)(1));
-			w2.RightAttach = ((uint)(2));
-			w2.XOptions = ((global::Gtk.AttachOptions)(4));
-			w2.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label7 = new global::Gtk.Label ();
-			this.label7.Name = "label7";
-			this.label7.Xalign = 0F;
-			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("Name:");
-			this.table1.Add (this.label7);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.label7]));
-			w3.XOptions = ((global::Gtk.AttachOptions)(4));
-			w3.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label8 = new global::Gtk.Label ();
-			this.label8.Name = "label8";
-			this.label8.Xalign = 0F;
-			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Version:");
-			this.table1.Add (this.label8);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.label8]));
-			w4.TopAttach = ((uint)(1));
-			w4.BottomAttach = ((uint)(2));
-			w4.XOptions = ((global::Gtk.AttachOptions)(4));
-			w4.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label9 = new global::Gtk.Label ();
-			this.label9.Name = "label9";
-			this.label9.Xalign = 0F;
-			this.label9.Yalign = 0F;
-			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Description:");
-			this.table1.Add (this.label9);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.label9]));
-			w5.TopAttach = ((uint)(2));
-			w5.BottomAttach = ((uint)(3));
-			w5.XOptions = ((global::Gtk.AttachOptions)(4));
-			w5.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.nameLabel = new global::Gtk.Label ();
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Xalign = 0F;
-			this.nameLabel.LabelProp = "label10";
-			this.table1.Add (this.nameLabel);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.nameLabel]));
-			w6.LeftAttach = ((uint)(1));
-			w6.RightAttach = ((uint)(2));
-			w6.XOptions = ((global::Gtk.AttachOptions)(4));
-			w6.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.versionLabel = new global::Gtk.Label ();
-			this.versionLabel.Name = "versionLabel";
-			this.versionLabel.Xalign = 0F;
-			this.versionLabel.LabelProp = "label11";
-			this.table1.Add (this.versionLabel);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.versionLabel]));
-			w7.TopAttach = ((uint)(1));
-			w7.BottomAttach = ((uint)(2));
-			w7.LeftAttach = ((uint)(1));
-			w7.RightAttach = ((uint)(2));
-			w7.XOptions = ((global::Gtk.AttachOptions)(4));
-			w7.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox3.Add (this.table1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.table1]));
-			w8.Position = 0;
-			w8.Expand = false;
-			w8.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.vbox4 = new global::Gtk.VBox ();
-			this.vbox4.Name = "vbox4";
-			this.vbox4.Spacing = 6;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.label13 = new global::Gtk.Label ();
-			this.label13.Name = "label13";
-			this.label13.Xalign = 0F;
-			this.label13.LabelProp = global::Mono.Unix.Catalog.GetString ("Requires:");
-			this.vbox4.Add (this.label13);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label13]));
-			w9.Position = 0;
-			w9.Expand = false;
-			w9.Fill = false;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow1.CanFocus = true;
-			this.scrolledwindow1.Name = "scrolledwindow1";
-			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			global::Gtk.Viewport w10 = new global::Gtk.Viewport ();
-			w10.ShadowType = ((global::Gtk.ShadowType)(0));
-			// Container child GtkViewport.Gtk.Container+ContainerChild
-			this.requiresTreeView = new global::Gtk.TreeView ();
-			this.requiresTreeView.CanFocus = true;
-			this.requiresTreeView.Name = "requiresTreeView";
-			w10.Add (this.requiresTreeView);
-			this.scrolledwindow1.Add (w10);
-			this.vbox4.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.scrolledwindow1]));
-			w13.Position = 1;
-			this.vbox3.Add (this.vbox4);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.vbox4]));
-			w14.Position = 1;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.vbox2 = new global::Gtk.VBox ();
-			this.vbox2.Name = "vbox2";
-			this.vbox2.Spacing = 6;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Libs:");
-			this.vbox2.Add (this.label1);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label1]));
-			w15.Position = 0;
-			w15.Expand = false;
-			w15.Fill = false;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow2.CanFocus = true;
-			this.scrolledwindow2.Name = "scrolledwindow2";
-			this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow2.Gtk.Container+ContainerChild
-			global::Gtk.Viewport w16 = new global::Gtk.Viewport ();
-			w16.ShadowType = ((global::Gtk.ShadowType)(0));
-			// Container child GtkViewport1.Gtk.Container+ContainerChild
-			this.libPathsTreeView = new global::Gtk.TreeView ();
-			this.libPathsTreeView.CanFocus = true;
-			this.libPathsTreeView.Name = "libPathsTreeView";
-			w16.Add (this.libPathsTreeView);
-			this.scrolledwindow2.Add (w16);
-			this.hbox1.Add (this.scrolledwindow2);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.scrolledwindow2]));
-			w19.Position = 0;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.scrolledwindow3 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow3.CanFocus = true;
-			this.scrolledwindow3.Name = "scrolledwindow3";
-			this.scrolledwindow3.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow3.Gtk.Container+ContainerChild
-			global::Gtk.Viewport w20 = new global::Gtk.Viewport ();
-			w20.ShadowType = ((global::Gtk.ShadowType)(0));
-			// Container child GtkViewport2.Gtk.Container+ContainerChild
-			this.libsTreeView = new global::Gtk.TreeView ();
-			this.libsTreeView.CanFocus = true;
-			this.libsTreeView.Name = "libsTreeView";
-			w20.Add (this.libsTreeView);
-			this.scrolledwindow3.Add (w20);
-			this.hbox1.Add (this.scrolledwindow3);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.scrolledwindow3]));
-			w23.Position = 1;
-			this.vbox2.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
-			w24.Position = 1;
-			this.vbox3.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.vbox2]));
-			w25.Position = 2;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.vbox5 = new global::Gtk.VBox ();
-			this.vbox5.Name = "vbox5";
-			this.vbox5.Spacing = 6;
-			// Container child vbox5.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.Xalign = 0F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("CFlags:");
-			this.vbox5.Add (this.label2);
-			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.label2]));
-			w26.Position = 0;
-			w26.Expand = false;
-			w26.Fill = false;
-			// Container child vbox5.Gtk.Box+BoxChild
-			this.scrolledwindow4 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow4.CanFocus = true;
-			this.scrolledwindow4.Name = "scrolledwindow4";
-			this.scrolledwindow4.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow4.Gtk.Container+ContainerChild
-			global::Gtk.Viewport w27 = new global::Gtk.Viewport ();
-			w27.ShadowType = ((global::Gtk.ShadowType)(0));
-			// Container child GtkViewport3.Gtk.Container+ContainerChild
-			this.cflagsTreeView = new global::Gtk.TreeView ();
-			this.cflagsTreeView.CanFocus = true;
-			this.cflagsTreeView.Name = "cflagsTreeView";
-			w27.Add (this.cflagsTreeView);
-			this.scrolledwindow4.Add (w27);
-			this.vbox5.Add (this.scrolledwindow4);
-			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.scrolledwindow4]));
-			w30.Position = 1;
-			this.vbox3.Add (this.vbox5);
-			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.vbox5]));
-			w31.Position = 3;
-			w1.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox3]));
-			w32.Position = 0;
-			// Internal child CBinding.PackageDetails.ActionArea
-			global::Gtk.HButtonBox w33 = this.ActionArea;
-			w33.Name = "dialog1_ActionArea";
-			w33.Spacing = 6;
-			w33.BorderWidth = ((uint)(5));
-			w33.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w34 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w33 [this.buttonOk]));
-			w34.Expand = false;
-			w34.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.DefaultWidth = 608;
-			this.DefaultHeight = 518;
-			this.Hide ();
-			this.buttonOk.Clicked += new global::System.EventHandler (this.OnButtonOkClicked);
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/gtk-gui/generated.cs b/main/src/addins/CBinding/gtk-gui/generated.cs
deleted file mode 100644
index 0ada9fc5f0..0000000000
--- a/main/src/addins/CBinding/gtk-gui/generated.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace Stetic
-{
-	internal class Gui
-	{
-		private static bool initialized;
-
-		internal static void Initialize (Gtk.Widget iconRenderer)
-		{
-			if ((Stetic.Gui.initialized == false)) {
-				Stetic.Gui.initialized = true;
-			}
-		}
-	}
-
-	internal class BinContainer
-	{
-		private Gtk.Widget child;
-		private Gtk.UIManager uimanager;
-
-		public static BinContainer Attach (Gtk.Bin bin)
-		{
-			BinContainer bc = new BinContainer ();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
-			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
-			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
-			return bc;
-		}
-
-		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
-		{
-			if ((this.child != null)) {
-				args.Requisition = this.child.SizeRequest ();
-			}
-		}
-
-		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
-		{
-			if ((this.child != null)) {
-				this.child.Allocation = args.Allocation;
-			}
-		}
-
-		private void OnAdded (object sender, Gtk.AddedArgs args)
-		{
-			this.child = args.Widget;
-		}
-
-		public void SetUiManager (Gtk.UIManager uim)
-		{
-			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
-		}
-
-		private void OnRealized (object sender, System.EventArgs args)
-		{
-			if ((this.uimanager != null)) {
-				Gtk.Widget w;
-				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
-					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
-					this.uimanager = null;
-				}
-			}
-		}
-	}
-
-	internal class IconLoader
-	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
-		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
-				return res;
-			} else {
-				int sz;
-				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-					}
-				}
-			}
-		}
-	}
-
-	internal class ActionGroups
-	{
-		public static Gtk.ActionGroup GetActionGroup (System.Type type)
-		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
-		}
-
-		public static Gtk.ActionGroup GetActionGroup (string name)
-		{
-			return null;
-		}
-	}
-}
diff --git a/main/src/addins/CBinding/gtk-gui/gui.stetic b/main/src/addins/CBinding/gtk-gui/gui.stetic
deleted file mode 100644
index d1bef0d978..0000000000
--- a/main/src/addins/CBinding/gtk-gui/gui.stetic
+++ /dev/null
@@ -1,2217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<stetic-interface>
-  <configuration>
-    <images-root-path>..</images-root-path>
-    <target-gtk-version>2.12</target-gtk-version>
-  </configuration>
-  <import>
-    <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll" />
-    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
-    <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
-    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
-    <widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" />
-    <widget-library name="../../../../build/AddIns/BackendBindings/MonoDevelop.CBinding.dll" internal="true" />
-  </import>
-  <widget class="Gtk.Bin" id="CBinding.CodeGenerationPanel" design-size="611 396">
-    <property name="MemberName" />
-    <child>
-      <widget class="Gtk.Notebook" id="notebook1">
-        <property name="MemberName" />
-        <property name="CanFocus">True</property>
-        <property name="CurrentPage">0</property>
-        <child>
-          <widget class="Gtk.VBox" id="vbox6">
-            <property name="MemberName" />
-            <property name="Spacing">3</property>
-            <child>
-              <widget class="Gtk.Table" id="table1">
-                <property name="MemberName" />
-                <property name="NRows">3</property>
-                <property name="NColumns">2</property>
-                <property name="RowSpacing">5</property>
-                <property name="ColumnSpacing">5</property>
-                <property name="BorderWidth">2</property>
-                <child>
-                  <widget class="Gtk.Label" id="label4">
-                    <property name="MemberName" />
-                    <property name="Xpad">10</property>
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Warning Level:</property>
-                  </widget>
-                  <packing>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label5">
-                    <property name="MemberName" />
-                    <property name="Xpad">10</property>
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Optimization Level:</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label6">
-                    <property name="MemberName" />
-                    <property name="Xpad">10</property>
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Target:</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">2</property>
-                    <property name="BottomAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.SpinButton" id="optimizationSpinButton">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="Upper">3</property>
-                    <property name="PageIncrement">10</property>
-                    <property name="StepIncrement">1</property>
-                    <property name="ClimbRate">1</property>
-                    <property name="Numeric">True</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ComboBox" id="targetComboBox">
-                    <property name="MemberName" />
-                    <property name="IsTextCombo">True</property>
-                    <property name="Items" translatable="yes">Executable
-Static Library
-Shared Object</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">2</property>
-                    <property name="BottomAttach">3</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox1">
-                    <property name="MemberName" />
-                    <property name="Spacing">1</property>
-                    <child>
-                      <widget class="Gtk.RadioButton" id="noWarningRadio">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Label" translatable="yes">no warnings</property>
-                        <property name="Active">True</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="Group">group1</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.RadioButton" id="normalWarningRadio">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Label" translatable="yes">normal</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="Group">group1</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.RadioButton" id="allWarningRadio">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Label" translatable="yes">all</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="Group">group1</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">2</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.CheckButton" id="warningsAsErrorsCheckBox">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Label" translatable="yes">Treat warnings as errors</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">3</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.HBox" id="hbox1">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Label" id="label12">
-                    <property name="MemberName" />
-                    <property name="Xpad">13</property>
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Define Symbols:</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Entry" id="defineSymbolsTextEntry">
-                    <property name="MemberName" />
-                    <property name="Tooltip" translatable="yes">A space seperated list of symbols to define.</property>
-                    <property name="CanFocus">True</property>
-                    <property name="IsEditable">True</property>
-                    <property name="InvisibleChar">●</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">False</property>
-                    <property name="Padding">14</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Frame" id="frame2">
-                <property name="MemberName" />
-                <property name="ShadowType">None</property>
-                <property name="LabelYalign">0</property>
-                <child>
-                  <widget class="Gtk.Alignment" id="GtkAlignment">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="Yalign">0</property>
-                    <property name="LeftPadding">12</property>
-                    <child>
-                      <widget class="Gtk.Table" id="table5">
-                        <property name="MemberName" />
-                        <property name="NRows">2</property>
-                        <property name="NColumns">2</property>
-                        <property name="RowSpacing">6</property>
-                        <property name="ColumnSpacing">9</property>
-                        <property name="BorderWidth">6</property>
-                        <child>
-                          <widget class="Gtk.Label" id="label11">
-                            <property name="MemberName" />
-                            <property name="Xalign">0</property>
-                            <property name="LabelProp" translatable="yes">Extra Linker Options</property>
-                          </widget>
-                          <packing>
-                            <property name="LeftAttach">1</property>
-                            <property name="RightAttach">2</property>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="label7">
-                            <property name="MemberName" />
-                            <property name="Xalign">0</property>
-                            <property name="LabelProp" translatable="yes">Extra Compiler Options</property>
-                          </widget>
-                          <packing>
-                            <property name="AutoSize">False</property>
-                            <property name="XOptions">Fill</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.ScrolledWindow" id="scrolledwindow4">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="ShadowType">In</property>
-                            <child>
-                              <widget class="Gtk.TextView" id="extraCompilerTextView">
-                                <property name="MemberName" />
-                                <property name="Tooltip" translatable="yes">A newline seperated list of extra options to send to the compiler.
-One option can be in more than one line.
-Example:
-	`pkg-config
-	--cflags
-	cairo`</property>
-                                <property name="CanFocus">True</property>
-                                <property name="Text" translatable="yes" />
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="AutoSize">False</property>
-                            <property name="XExpand">True</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">True</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.ScrolledWindow" id="scrolledwindow5">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="ShadowType">In</property>
-                            <child>
-                              <widget class="Gtk.TextView" id="extraLinkerTextView">
-                                <property name="MemberName" />
-                                <property name="Tooltip" translatable="yes">A newline seperated list of extra options to send to the linker.
-One option can be in more than one line.
-Example:
-	`pkg-config
-	--libs
-	cairo`</property>
-                                <property name="CanFocus">True</property>
-                                <property name="Text" translatable="yes" />
-                              </widget>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="TopAttach">1</property>
-                            <property name="BottomAttach">2</property>
-                            <property name="LeftAttach">1</property>
-                            <property name="RightAttach">2</property>
-                            <property name="AutoSize">False</property>
-                            <property name="YOptions">Fill</property>
-                            <property name="XExpand">True</property>
-                            <property name="XFill">True</property>
-                            <property name="XShrink">False</property>
-                            <property name="YExpand">False</property>
-                            <property name="YFill">True</property>
-                            <property name="YShrink">False</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="GtkLabel12">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">&lt;b&gt;Extra Options&lt;/b&gt;</property>
-                    <property name="UseMarkup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">False</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label1">
-            <property name="MemberName" />
-            <property name="LabelProp" translatable="yes">Code Generation</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Table" id="table2">
-            <property name="MemberName" />
-            <property name="NRows">2</property>
-            <property name="NColumns">3</property>
-            <property name="RowSpacing">10</property>
-            <property name="ColumnSpacing">10</property>
-            <property name="BorderWidth">3</property>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <widget class="Gtk.Button" id="addLibButton">
-                <property name="MemberName" />
-                <property name="Sensitive">False</property>
-                <property name="CanFocus">True</property>
-                <property name="Type">TextOnly</property>
-                <property name="Label" translatable="yes">Add</property>
-                <property name="UseUnderline">True</property>
-                <signal name="Clicked" handler="OnLibAdded" />
-              </widget>
-              <packing>
-                <property name="LeftAttach">2</property>
-                <property name="RightAttach">3</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label8">
-                <property name="MemberName" />
-                <property name="LabelProp" translatable="yes">Library:</property>
-              </widget>
-              <packing>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Entry" id="libAddEntry">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="IsEditable">True</property>
-                <property name="InvisibleChar">●</property>
-                <signal name="Changed" handler="OnLibAddEntryChanged" />
-                <signal name="Activated" handler="OnLibAddEntryActivated" />
-              </widget>
-              <packing>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">True</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="ShadowType">In</property>
-                <child>
-                  <widget class="Gtk.TreeView" id="libTreeView">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <signal name="CursorChanged" handler="OnLibTreeViewCursorChanged" />
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">True</property>
-                <property name="XExpand">True</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">True</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.VBox" id="vbox4">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Button" id="browseButton">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextOnly</property>
-                    <property name="Label" translatable="yes">Browse...</property>
-                    <property name="UseUnderline">True</property>
-                    <signal name="Clicked" handler="OnBrowseButtonClick" />
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Button" id="removeLibButton">
-                    <property name="MemberName" />
-                    <property name="Sensitive">False</property>
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextOnly</property>
-                    <property name="Label" translatable="yes">Remove</property>
-                    <property name="UseUnderline">True</property>
-                    <signal name="Clicked" handler="OnRemoveLibButtonClicked" />
-                    <signal name="Clicked" handler="OnLibRemoved" />
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
-                <property name="LeftAttach">2</property>
-                <property name="RightAttach">3</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">True</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label2">
-            <property name="MemberName" />
-            <property name="LabelProp" translatable="yes">Libraries</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.VBox" id="vbox7">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <property name="BorderWidth">3</property>
-            <child>
-              <widget class="Gtk.Table" id="table4">
-                <property name="MemberName" />
-                <property name="NRows">2</property>
-                <property name="NColumns">3</property>
-                <property name="RowSpacing">10</property>
-                <property name="ColumnSpacing">10</property>
-                <child>
-                  <placeholder />
-                </child>
-                <child>
-                  <widget class="Gtk.HBox" id="hbox2">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Entry" id="libPathEntry">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="IsEditable">True</property>
-                        <property name="InvisibleChar">●</property>
-                        <signal name="Changed" handler="OnLibPathEntryChanged" />
-                        <signal name="Activated" handler="OnLibPathEntryActivated" />
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Button" id="quickInsertLibButton">
-                        <property name="MemberName" />
-                        <property name="Tooltip" translatable="yes">Insert a macro.</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">&gt;</property>
-                        <property name="UseUnderline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">True</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label10">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">Library:</property>
-                  </widget>
-                  <packing>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Button" id="libPathAddButton">
-                    <property name="MemberName" />
-                    <property name="Sensitive">False</property>
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextOnly</property>
-                    <property name="Label" translatable="yes">Add</property>
-                    <property name="UseUnderline">True</property>
-                    <signal name="Clicked" handler="OnLibPathAdded" />
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">2</property>
-                    <property name="RightAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow3">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.TreeView" id="libPathTreeView">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <signal name="CursorChanged" handler="OnLibPathTreeViewCursorChanged" />
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XExpand">True</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox3">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Button" id="libPathBrowseButton">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">Browse...</property>
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnLibPathBrowseButtonClick" />
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Button" id="libPathRemoveButton">
-                        <property name="MemberName" />
-                        <property name="Sensitive">False</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">Remove</property>
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnLibPathRemoveButtonClicked" />
-                        <signal name="Clicked" handler="OnLibPathRemoved" />
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">2</property>
-                    <property name="RightAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Table" id="table3">
-                <property name="MemberName" />
-                <property name="NRows">2</property>
-                <property name="NColumns">3</property>
-                <property name="RowSpacing">10</property>
-                <property name="ColumnSpacing">10</property>
-                <child>
-                  <placeholder />
-                </child>
-                <child>
-                  <widget class="Gtk.HBox" id="hbox3">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Entry" id="includePathEntry">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="IsEditable">True</property>
-                        <property name="InvisibleChar">●</property>
-                        <signal name="Changed" handler="OnIncludePathEntryChanged" />
-                        <signal name="Activated" handler="OnIncludePathEntryActivated" />
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Button" id="quickInsertIncludeButton">
-                        <property name="MemberName" />
-                        <property name="Tooltip" translatable="yes">Insert a macro.</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">&gt;</property>
-                        <property name="UseUnderline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">True</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Button" id="includePathAddButton">
-                    <property name="MemberName" />
-                    <property name="Sensitive">False</property>
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextOnly</property>
-                    <property name="Label" translatable="yes">Add</property>
-                    <property name="UseUnderline">True</property>
-                    <signal name="Clicked" handler="OnIncludePathAdded" />
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">2</property>
-                    <property name="RightAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label9">
-                    <property name="MemberName" />
-                    <property name="LabelProp" translatable="yes">Include:</property>
-                  </widget>
-                  <packing>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow2">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.TreeView" id="includePathTreeView">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <signal name="CursorChanged" handler="OnIncludePathTreeViewCursorChanged" />
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XExpand">True</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox5">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Button" id="includePathBrowseButton">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">Browse...</property>
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnIncludePathBrowseButtonClick" />
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Button" id="includePathRemoveButton">
-                        <property name="MemberName" />
-                        <property name="Sensitive">False</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">Remove</property>
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnIncludePathRemoveButtonClicked" />
-                        <signal name="Clicked" handler="OnIncludePathRemoved" />
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">2</property>
-                    <property name="RightAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder />
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label3">
-            <property name="MemberName" />
-            <property name="LabelProp" translatable="yes">Paths</property>
-          </widget>
-          <packing>
-            <property name="type">tab</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Bin" id="CBinding.CompilerPanel" design-size="300 300">
-    <property name="MemberName" />
-    <child>
-      <widget class="Gtk.Table" id="table2">
-        <property name="MemberName" />
-        <property name="NRows">3</property>
-        <property name="NColumns">3</property>
-        <property name="RowSpacing">6</property>
-        <property name="ColumnSpacing">6</property>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <widget class="Gtk.ComboBox" id="compilerComboBox">
-            <property name="MemberName" />
-            <property name="IsTextCombo">True</property>
-            <property name="Items" translatable="yes" />
-            <signal name="Changed" handler="OnCompilerComboBoxChanged" />
-          </widget>
-          <packing>
-            <property name="TopAttach">1</property>
-            <property name="BottomAttach">2</property>
-            <property name="LeftAttach">1</property>
-            <property name="RightAttach">2</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.CheckButton" id="useCcacheCheckBox">
-            <property name="MemberName" />
-            <property name="CanFocus">True</property>
-            <property name="Label" translatable="yes">Use ccache</property>
-            <property name="DrawIndicator">True</property>
-            <property name="HasLabel">True</property>
-            <property name="UseUnderline">True</property>
-          </widget>
-          <packing>
-            <property name="TopAttach">2</property>
-            <property name="BottomAttach">3</property>
-            <property name="LeftAttach">1</property>
-            <property name="RightAttach">2</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Dialog" id="CBinding.EditPackagesDialog" design-size="580 449">
-    <property name="MemberName" />
-    <property name="Visible">False</property>
-    <property name="Title" translatable="yes">Edit packages</property>
-    <property name="Modal">True</property>
-    <property name="Buttons">2</property>
-    <property name="HelpButton">False</property>
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog1_VBox">
-        <property name="MemberName" />
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.VPaned" id="vpaned1">
-            <property name="MemberName" />
-            <property name="CanFocus">True</property>
-            <property name="Position">183</property>
-            <property name="BorderWidth">6</property>
-            <child>
-              <widget class="Gtk.HBox" id="hbox1">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Notebook" id="notebook1">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="CurrentPage">0</property>
-                    <signal name="SwitchPage" handler="OnNotebook1SwitchPage" />
-                    <child>
-                      <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShadowType">In</property>
-                        <child>
-                          <widget class="Gtk.TreeView" id="normalPackageTreeView">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <signal name="CursorChanged" handler="OnNonSelectedPackageCursorChanged" />
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Label" id="labelSystemPackages">
-                        <property name="MemberName" />
-                        <property name="LabelProp" translatable="yes">System Packages</property>
-                      </widget>
-                      <packing>
-                        <property name="type">tab</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.ScrolledWindow" id="scrolledwindow3">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShadowType">In</property>
-                        <child>
-                          <widget class="Gtk.TreeView" id="projectPackageTreeView">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <signal name="CursorChanged" handler="OnNonSelectedPackageCursorChanged" />
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Label" id="labelProjectPackages">
-                        <property name="MemberName" />
-                        <property name="LabelProp" translatable="yes">Project Packages</property>
-                      </widget>
-                      <packing>
-                        <property name="type">tab</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox3">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Fixed" id="fixed1">
-                        <property name="MemberName" />
-                        <property name="HeightRequest">21</property>
-                        <property name="HasWindow">False</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Button" id="detailsButton">
-                        <property name="MemberName" />
-                        <property name="WidthRequest">33</property>
-                        <property name="HeightRequest">33</property>
-                        <property name="Sensitive">False</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextOnly</property>
-                        <property name="Label" translatable="yes">...</property>
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnDetailsButtonClicked" />
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="Resize">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Table" id="table1">
-                <property name="MemberName" />
-                <property name="NRows">2</property>
-                <property name="NColumns">2</property>
-                <property name="RowSpacing">6</property>
-                <property name="ColumnSpacing">6</property>
-                <child>
-                  <placeholder />
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label3">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="Yalign">0</property>
-                    <property name="LabelProp" translatable="yes">Selected packages:</property>
-                  </widget>
-                  <packing>
-                    <property name="AutoSize">False</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">True</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow2">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.TreeView" id="selectedPackageTreeView">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <signal name="CursorChanged" handler="OnSelectedPackagesTreeViewCursorChanged" />
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox2">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Button" id="removeButton">
-                        <property name="MemberName" />
-                        <property name="WidthRequest">33</property>
-                        <property name="HeightRequest">33</property>
-                        <property name="Sensitive">False</property>
-                        <property name="Tooltip">Remove selected package from the project.</property>
-                        <property name="CanFocus">True</property>
-                        <property name="Type">TextAndIcon</property>
-                        <property name="Icon">stock:gtk-remove Menu</property>
-                        <property name="Label" />
-                        <property name="UseUnderline">True</property>
-                        <signal name="Clicked" handler="OnRemoveButtonClicked" />
-                        <signal name="Clicked" handler="OnRemoveButtonClick" />
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">True</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-            <property name="Padding">3</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">2</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="buttonCancel">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-cancel</property>
-            <property name="ResponseId">-6</property>
-            <signal name="Clicked" handler="OnCancelButtonClick" />
-            <property name="label">gtk-cancel</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="buttonOk">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-ok</property>
-            <property name="ResponseId">-5</property>
-            <signal name="Clicked" handler="OnOkButtonClick" />
-            <property name="label">gtk-ok</property>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Bin" id="CBinding.OutputOptionsPanel" design-size="412 273">
-    <property name="MemberName" />
-    <child>
-      <widget class="Gtk.VBox" id="vbox2">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">3</property>
-        <child>
-          <widget class="Gtk.Table" id="table1">
-            <property name="MemberName" />
-            <property name="NRows">4</property>
-            <property name="NColumns">2</property>
-            <property name="RowSpacing">6</property>
-            <property name="ColumnSpacing">6</property>
-            <property name="BorderWidth">3</property>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label1">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">&lt;b&gt;Output&lt;/b&gt;</property>
-                <property name="UseMarkup">True</property>
-              </widget>
-              <packing>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label2">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">Output Name:</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
-                <property name="XPadding">15</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label3">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">Output Path:</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">2</property>
-                <property name="BottomAttach">3</property>
-                <property name="XPadding">15</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label4">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">Parameters:</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">3</property>
-                <property name="BottomAttach">4</property>
-                <property name="XPadding">15</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="MonoDevelop.Components.FolderEntry" id="outputEntry">
-                <property name="MemberName" />
-              </widget>
-              <packing>
-                <property name="TopAttach">2</property>
-                <property name="BottomAttach">3</property>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">False</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Entry" id="outputNameTextEntry">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="IsEditable">True</property>
-                <property name="InvisibleChar">●</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">False</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Entry" id="parametersTextEntry">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="IsEditable">True</property>
-                <property name="InvisibleChar">●</property>
-              </widget>
-              <packing>
-                <property name="TopAttach">3</property>
-                <property name="BottomAttach">4</property>
-                <property name="LeftAttach">1</property>
-                <property name="RightAttach">2</property>
-                <property name="AutoSize">True</property>
-                <property name="XOptions">Fill</property>
-                <property name="YOptions">Fill</property>
-                <property name="XExpand">False</property>
-                <property name="XFill">True</property>
-                <property name="XShrink">False</property>
-                <property name="YExpand">False</property>
-                <property name="YFill">True</property>
-                <property name="YShrink">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.CheckButton" id="externalConsoleCheckbox">
-            <property name="MemberName" />
-            <property name="CanFocus">True</property>
-            <property name="Label" translatable="yes">Run on e_xternal console</property>
-            <property name="Active">True</property>
-            <property name="DrawIndicator">True</property>
-            <property name="HasLabel">True</property>
-            <property name="UseUnderline">True</property>
-            <signal name="Clicked" handler="OnExternalConsoleCheckboxClicked" />
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.CheckButton" id="pauseCheckbox">
-            <property name="MemberName" />
-            <property name="Sensitive">False</property>
-            <property name="CanFocus">True</property>
-            <property name="Label" translatable="yes">Pause _console output</property>
-            <property name="DrawIndicator">True</property>
-            <property name="HasLabel">True</property>
-            <property name="UseUnderline">True</property>
-          </widget>
-          <packing>
-            <property name="Position">2</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Bin" id="CBinding.GeneralOptionsPanel" design-size="457 300">
-    <property name="MemberName" />
-    <child>
-      <widget class="Gtk.Table" id="table1">
-        <property name="MemberName" />
-        <property name="NRows">5</property>
-        <property name="NColumns">3</property>
-        <property name="RowSpacing">6</property>
-        <property name="ColumnSpacing">6</property>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <widget class="Gtk.ComboBox" id="cCombo">
-            <property name="MemberName" />
-            <property name="Tooltip" translatable="yes">Default compiler to use for new C projects.</property>
-            <property name="IsTextCombo">True</property>
-            <property name="Items" translatable="yes" />
-            <signal name="Changed" handler="OnCComboChanged" />
-          </widget>
-          <packing>
-            <property name="LeftAttach">1</property>
-            <property name="RightAttach">2</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.ComboBox" id="cppCombo">
-            <property name="MemberName" />
-            <property name="Tooltip" translatable="yes">Default compiler to use for new C++ projects.</property>
-            <property name="IsTextCombo">True</property>
-            <property name="Items" translatable="yes" />
-            <signal name="Changed" handler="OnCppComboChanged" />
-          </widget>
-          <packing>
-            <property name="TopAttach">1</property>
-            <property name="BottomAttach">2</property>
-            <property name="LeftAttach">1</property>
-            <property name="RightAttach">2</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="ctagsBrowse">
-            <property name="MemberName">ctagsBrowse</property>
-            <property name="CanFocus">True</property>
-            <property name="Type">TextAndIcon</property>
-            <property name="Icon">stock:gtk-open Menu</property>
-            <property name="Label" translatable="yes">Browse</property>
-            <property name="UseUnderline">True</property>
-            <signal name="Clicked" handler="OnCtagsBrowseClicked" />
-          </widget>
-          <packing>
-            <property name="TopAttach">2</property>
-            <property name="BottomAttach">3</property>
-            <property name="LeftAttach">2</property>
-            <property name="RightAttach">3</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Entry" id="ctagsEntry">
-            <property name="MemberName">ctagsEntry</property>
-            <property name="CanFocus">True</property>
-            <property name="IsEditable">True</property>
-            <property name="InvisibleChar">●</property>
-          </widget>
-          <packing>
-            <property name="TopAttach">2</property>
-            <property name="BottomAttach">3</property>
-            <property name="LeftAttach">1</property>
-            <property name="RightAttach">2</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label1">
-            <property name="MemberName" />
-            <property name="Xpad">10</property>
-            <property name="Xalign">1</property>
-            <property name="LabelProp" translatable="yes">Default C Compiler:</property>
-          </widget>
-          <packing>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label2">
-            <property name="MemberName" />
-            <property name="Xpad">10</property>
-            <property name="Xalign">1</property>
-            <property name="LabelProp" translatable="yes">Default C++ Compiler:</property>
-          </widget>
-          <packing>
-            <property name="TopAttach">1</property>
-            <property name="BottomAttach">2</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label3">
-            <property name="MemberName" />
-            <property name="Xpad">10</property>
-            <property name="Xalign">1</property>
-            <property name="LabelProp" translatable="yes">CTags: </property>
-            <property name="Justify">Right</property>
-          </widget>
-          <packing>
-            <property name="TopAttach">2</property>
-            <property name="BottomAttach">3</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.CheckButton" id="parseLocalVariablesCheck">
-            <property name="MemberName" />
-            <property name="CanFocus">True</property>
-            <property name="Label" translatable="yes">Parse Local Variables</property>
-            <property name="DrawIndicator">True</property>
-            <property name="HasLabel">True</property>
-            <property name="UseUnderline">True</property>
-          </widget>
-          <packing>
-            <property name="TopAttach">4</property>
-            <property name="BottomAttach">5</property>
-            <property name="XPadding">10</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.CheckButton" id="parseSystemTagsCheck">
-            <property name="MemberName" />
-            <property name="Tooltip" translatable="yes">Choose whether you want to parse system tags or not, if you do you will get completion for things like printf, but the tag parsing process will take considerably longer.</property>
-            <property name="CanFocus">True</property>
-            <property name="Label" translatable="yes">Parse System Tags</property>
-            <property name="DrawIndicator">True</property>
-            <property name="HasLabel">True</property>
-            <property name="UseUnderline">True</property>
-          </widget>
-          <packing>
-            <property name="TopAttach">3</property>
-            <property name="BottomAttach">4</property>
-            <property name="XPadding">10</property>
-            <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Dialog" id="CBinding.PackageDetails" design-size="608 518">
-    <property name="MemberName" />
-    <property name="Visible">False</property>
-    <property name="Title" translatable="yes">Package Details</property>
-    <property name="WindowPosition">CenterOnParent</property>
-    <property name="Buttons">1</property>
-    <property name="HelpButton">False</property>
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog1_VBox">
-        <property name="MemberName" />
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.VBox" id="vbox3">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <property name="BorderWidth">3</property>
-            <child>
-              <widget class="Gtk.Table" id="table1">
-                <property name="MemberName" />
-                <property name="NRows">3</property>
-                <property name="NColumns">2</property>
-                <property name="RowSpacing">6</property>
-                <property name="ColumnSpacing">6</property>
-                <child>
-                  <widget class="Gtk.Label" id="descriptionLabel">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="Yalign">0</property>
-                    <property name="LabelProp">label12</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">2</property>
-                    <property name="BottomAttach">3</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label7">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Name:</property>
-                  </widget>
-                  <packing>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label8">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Version:</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="label9">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="Yalign">0</property>
-                    <property name="LabelProp" translatable="yes">Description:</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">2</property>
-                    <property name="BottomAttach">3</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="nameLabel">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp">label10</property>
-                  </widget>
-                  <packing>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Label" id="versionLabel">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp">label11</property>
-                  </widget>
-                  <packing>
-                    <property name="TopAttach">1</property>
-                    <property name="BottomAttach">2</property>
-                    <property name="LeftAttach">1</property>
-                    <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="XOptions">Fill</property>
-                    <property name="YOptions">Fill</property>
-                    <property name="XExpand">False</property>
-                    <property name="XFill">True</property>
-                    <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
-                    <property name="YFill">True</property>
-                    <property name="YShrink">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.VBox" id="vbox4">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Label" id="label13">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Requires:</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.Viewport" id="GtkViewport">
-                        <property name="MemberName" />
-                        <property name="ShadowType">None</property>
-                        <child>
-                          <widget class="Gtk.TreeView" id="requiresTreeView">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="ShowScrollbars">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.VBox" id="vbox2">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Label" id="label1">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">Libs:</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.HBox" id="hbox1">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.ScrolledWindow" id="scrolledwindow2">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShadowType">In</property>
-                        <child>
-                          <widget class="Gtk.Viewport" id="GtkViewport1">
-                            <property name="MemberName" />
-                            <property name="ShadowType">None</property>
-                            <child>
-                              <widget class="Gtk.TreeView" id="libPathsTreeView">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="ShowScrollbars">True</property>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.ScrolledWindow" id="scrolledwindow3">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShadowType">In</property>
-                        <child>
-                          <widget class="Gtk.Viewport" id="GtkViewport2">
-                            <property name="MemberName" />
-                            <property name="ShadowType">None</property>
-                            <child>
-                              <widget class="Gtk.TreeView" id="libsTreeView">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="ShowScrollbars">True</property>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.VBox" id="vbox5">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Label" id="label2">
-                    <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">CFlags:</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow4">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.Viewport" id="GtkViewport3">
-                        <property name="MemberName" />
-                        <property name="ShadowType">None</property>
-                        <child>
-                          <widget class="Gtk.TreeView" id="cflagsTreeView">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="ShowScrollbars">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">3</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">1</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="buttonOk">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-ok</property>
-            <property name="ResponseId">-5</property>
-            <signal name="Clicked" handler="OnButtonOkClicked" />
-            <property name="label">gtk-ok</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</stetic-interface>
\ No newline at end of file
diff --git a/main/src/addins/CBinding/icons/union-16.png b/main/src/addins/CBinding/icons/union-16.png
deleted file mode 100644
index 40aae0f994..0000000000
--- a/main/src/addins/CBinding/icons/union-16.png
+++ /dev/null
diff --git a/main/src/addins/CBinding/icons/union-private-16.png b/main/src/addins/CBinding/icons/union-private-16.png
deleted file mode 100644
index cc32f48cb7..0000000000
--- a/main/src/addins/CBinding/icons/union-private-16.png
+++ /dev/null
diff --git a/main/src/addins/CBinding/icons/union-protected-16.png b/main/src/addins/CBinding/icons/union-protected-16.png
deleted file mode 100644
index df75b65512..0000000000
--- a/main/src/addins/CBinding/icons/union-protected-16.png
+++ /dev/null
diff --git a/main/src/addins/CBinding/icons/update.png b/main/src/addins/CBinding/icons/update.png
deleted file mode 100644
index b977611a78..0000000000
--- a/main/src/addins/CBinding/icons/update.png
+++ /dev/null
diff --git a/main/src/addins/CBinding/templates/ConsoleCProject.xpt.xml b/main/src/addins/CBinding/templates/ConsoleCProject.xpt.xml
deleted file mode 100644
index 7145e507a3..0000000000
--- a/main/src/addins/CBinding/templates/ConsoleCProject.xpt.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Marcos David Marin Amador" 
-    created      = "08/16/2007"
-    lastModified = "08/16/2007">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Console Project</_Name>
-		<Category>other/misc/c</Category>
-		<Icon>md-project-console</Icon>
-		<Image id="md-console-project" />
-		<LanguageName>C</LanguageName>
-		<_Description>Creates simple hello world C project.</_Description>
-		<DefaultFilename>ConsoleCProject</DefaultFilename>
-		<GroupId>md-project-console</GroupId>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "Bin"
-				ExternalConsole = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-			
-			<Files>
-				<File name = "main.c" AddStandardHeader="True"><![CDATA[#include <stdio.h>
-
-int main (int argc, char *argv[])
-{
-	printf ("Hello world!\n");
-	
-	return 0;
-}
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/CBinding/templates/ConsoleCppProject.xpt.xml b/main/src/addins/CBinding/templates/ConsoleCppProject.xpt.xml
deleted file mode 100644
index f6b109f9db..0000000000
--- a/main/src/addins/CBinding/templates/ConsoleCppProject.xpt.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Marcos David Marin Amador" 
-    created      = "08/16/2007"
-    lastModified = "08/16/2007">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Console Project</_Name>
-		<Category>other/misc/c</Category>
-		<Icon>md-project-console</Icon>	
-		<Image id="md-console-project" />
-		<LanguageName>CPP</LanguageName>
-		<_Description>Creates simple hello world C++ project.</_Description>
-		<DefaultFilename>ConsoleCppProject</DefaultFilename>
-		<GroupId>md-project-console</GroupId>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "Bin"
-				ExternalConsole = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-			
-			<Files>
-				<File name = "main.cpp" AddStandardHeader="True"><![CDATA[#include <iostream>
-using namespace std;
-
-int main (int argc, char *argv[])
-{
-	cout << "Hello world!" << endl;
-	
-	return 0;
-}
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/CBinding/templates/ConsoleObjCProject.xpt.xml b/main/src/addins/CBinding/templates/ConsoleObjCProject.xpt.xml
deleted file mode 100644
index fa7b3c5c39..0000000000
--- a/main/src/addins/CBinding/templates/ConsoleObjCProject.xpt.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Levi Bard" 
-    created      = "07/30/2010"
-    lastModified = "07/30/2010">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Console Project</_Name>
-		<Category>other/misc/c</Category>
-		<Icon>md-project-console</Icon>
-		<Image id="md-console-project" />
-		<LanguageName>Objective C</LanguageName>
-		<_Description>Creates simple hello world Objective C project.</_Description>
-		<DefaultFilename>ConsoleObjCProject</DefaultFilename>
-		<GroupId>md-project-console</GroupId>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "Bin"
-				ExternalConsole = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-			
-			<Files>
-				<File name = "main.m" AddStandardHeader="True"><![CDATA[#import <stdio.h>
-
-int main( int argc, const char *argv[] ) {
-	printf( "hello world\n" );
-	return 0;
-}
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/CBinding/templates/EmptyCHeaderFile.xft.xml b/main/src/addins/CBinding/templates/EmptyCHeaderFile.xft.xml
deleted file mode 100644
index d9d2de4d4c..0000000000
--- a/main/src/addins/CBinding/templates/EmptyCHeaderFile.xft.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	Originator="Marcos David Marin Amador"
-	Language="C"
-	Created="08/03/2007"
-	LastModified="08/03/2007">
-	
-	<TemplateConfiguration>
-		<_Name>Empty C Header File</_Name>
-		<Icon>md-file-header</Icon>
-		<_Category>General</_Category>
-		<LanguageName>C</LanguageName>
-		<_Description>Creates an empty C header file.</_Description>
-		<DefaultFilename>EmptyCHeaderFile</DefaultFilename>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".h" AddStandardHeader="True"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>
diff --git a/main/src/addins/CBinding/templates/EmptyCProject.xpt.xml b/main/src/addins/CBinding/templates/EmptyCProject.xpt.xml
deleted file mode 100644
index a1deb60974..0000000000
--- a/main/src/addins/CBinding/templates/EmptyCProject.xpt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Marcos David Marin Amador" 
-    created      = "04/12/2007"
-    lastModified = "06/13/2007">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Empty Project</_Name>
-		<Category>other/misc/c</Category>
-		<Icon>md-project</Icon>
-		<LanguageName>C</LanguageName>
-		<_Description>Creates an empty C solution.</_Description>
-		<DefaultFilename>EmptyCProject</DefaultFilename>
-		<GroupId>md-empty-project</GroupId>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "Bin"
-				PauseConsoleOutput = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/CBinding/templates/EmptyCSourceFile.xft.xml b/main/src/addins/CBinding/templates/EmptyCSourceFile.xft.xml
deleted file mode 100644
index 4937e8f135..0000000000
--- a/main/src/addins/CBinding/templates/EmptyCSourceFile.xft.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	Originator="Marcos David Marin Amador"
-	Language="C"
-	Created="08/03/2007"
-	LastModified="08/03/2007">
-	
-	<TemplateConfiguration>
-		<_Name>Empty C Source File</_Name>
-		<Icon>md-file-source</Icon>
-		<_Category>General</_Category>
-		<LanguageName>C</LanguageName>
-		<_Description>Creates an empty C source file.</_Description>
-		<DefaultFilename>EmptyCSourceFile</DefaultFilename>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".c" AddStandardHeader="True"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>
diff --git a/main/src/addins/CBinding/templates/EmptyCppHeaderFile.xft.xml b/main/src/addins/CBinding/templates/EmptyCppHeaderFile.xft.xml
deleted file mode 100644
index ae70dde9b8..0000000000
--- a/main/src/addins/CBinding/templates/EmptyCppHeaderFile.xft.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	Originator="Marcos David Marin Amador"
-	Language="CPP"
-	Created="08/03/2007"
-	LastModified="08/03/2007">
-	
-	<TemplateConfiguration>
-		<_Name>Empty C++ Header File</_Name>
-		<Icon>md-file-header</Icon>
-		<_Category>General</_Category>
-		<LanguageName>CPP</LanguageName>
-		<_Description>Creates an empty C++ header file.</_Description>
-		<DefaultFilename>EmptyCppHeaderFile</DefaultFilename>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".h" AddStandardHeader="True"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>
diff --git a/main/src/addins/CBinding/templates/EmptyCppProject.xpt.xml b/main/src/addins/CBinding/templates/EmptyCppProject.xpt.xml
deleted file mode 100644
index 9d0b2df2aa..0000000000
--- a/main/src/addins/CBinding/templates/EmptyCppProject.xpt.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Marcos David Marin Amador" 
-    created      = "04/17/2007"
-    lastModified = "06/13/2007">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Empty Project</_Name>
-		<Category>other/misc/c</Category>
-		<Icon>md-project</Icon>
-		<LanguageName>CPP</LanguageName>
-		<_Description>Creates an empty C++ solution.</_Description>
-		<DefaultFilename>EmptyCppProject</DefaultFilename>
-		<GroupId>md-empty-project</GroupId>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "Bin"
-				PauseConsoleOutput = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/CBinding/templates/EmptyCppSourceFile.xft.xml b/main/src/addins/CBinding/templates/EmptyCppSourceFile.xft.xml
deleted file mode 100644
index e6c6ef83a1..0000000000
--- a/main/src/addins/CBinding/templates/EmptyCppSourceFile.xft.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	Originator="Marcos David Marin Amador"
-	Language="CPP"
-	Created="08/03/2007"
-	LastModified="08/03/2007">
-	
-	<TemplateConfiguration>
-		<_Name>Empty C++ Source File</_Name>
-		<Icon>md-file-source</Icon>
-		<_Category>General</_Category>
-		<LanguageName>CPP</LanguageName>
-		<_Description>Creates an empty C++ source file.</_Description>
-		<DefaultFilename>EmptyCppSourceFile</DefaultFilename>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".cpp" AddStandardHeader="True"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>
diff --git a/main/src/addins/CBinding/templates/EmptyObjCProject.xpt.xml b/main/src/addins/CBinding/templates/EmptyObjCProject.xpt.xml
deleted file mode 100644
index 210d4784ad..0000000000
--- a/main/src/addins/CBinding/templates/EmptyObjCProject.xpt.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Levi Bard" 
-    created      = "07/30/2010"
-    lastModified = "07/30/2010">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Console Project</_Name>
-		<_Category>C</_Category>
-		<Icon>md-project-console|res:c-icon-32.png</Icon>
-		<LanguageName>Objective C</LanguageName>
-		<_Description>Creates simple hello world Objective C project.</_Description>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "Bin"
-				ExternalConsole = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-			
-			<Files>
-				<File name = "main.m" AddStandardHeader="True"><![CDATA[#import <stdio.h>
-
-int main( int argc, const char *argv[] ) {
-	printf( "hello world\n" );
-	return 0;
-}
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/CBinding/templates/EmptyObjCSourceFile.xft.xml b/main/src/addins/CBinding/templates/EmptyObjCSourceFile.xft.xml
deleted file mode 100644
index 489aefc677..0000000000
--- a/main/src/addins/CBinding/templates/EmptyObjCSourceFile.xft.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	Originator="Levi Bard"
-	Language="Objective C"
-	Created="07/10/2010"
-	LastModified="07/10/2010">
-	
-	<TemplateConfiguration>
-		<_Name>Empty Objective C Source File</_Name>
-		<Icon>md-file-source</Icon>
-		<_Category>General</_Category>
-		<LanguageName>Objective C</LanguageName>
-		<_Description>Creates an empty Objective C source file.</_Description>
-		<DefaultFilename>EmptyObjCSourceFile</DefaultFilename>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".m" DefaultName="EmptyObjCSourceFile" AddStandardHeader="True"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>
diff --git a/main/src/addins/CBinding/templates/EmptyObjCppSourceFile.xft.xml b/main/src/addins/CBinding/templates/EmptyObjCppSourceFile.xft.xml
deleted file mode 100644
index 550603c408..0000000000
--- a/main/src/addins/CBinding/templates/EmptyObjCppSourceFile.xft.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	Originator="Levi Bard"
-	Language="Objective C++"
-	Created="07/10/2010"
-	LastModified="07/10/2010">
-	
-	<TemplateConfiguration>
-		<_Name>Empty Objective C++ Source File</_Name>
-		<Icon>md-file-source</Icon>
-		<_Category>General</_Category>
-		<LanguageName>Objective C++</LanguageName>
-		<_Description>Creates an empty Objective C++ source file.</_Description>
-		<DefaultFilename>EmptyObjCppSourceFile</DefaultFilename>
-	</TemplateConfiguration>
-	
-	<TemplateFiles>
-		<File DefaultExtension=".mm" DefaultName="EmptyObjCppSourceFile" AddStandardHeader="True"/>
-	</TemplateFiles>
-	
-	<FileOptions/>
-	
-</Template>
diff --git a/main/src/addins/CBinding/templates/SharedLibraryCProject.xpt.xml b/main/src/addins/CBinding/templates/SharedLibraryCProject.xpt.xml
deleted file mode 100644
index 0349b2dad3..0000000000
--- a/main/src/addins/CBinding/templates/SharedLibraryCProject.xpt.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Marcos David Marin Amador" 
-    created      = "08/16/2007"
-    lastModified = "08/16/2007">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Shared Library</_Name>
-		<Category>other/misc/c</Category>
-		<Icon>md-project-library</Icon>
-		<Image id="md-library-project" />
-		<LanguageName>C</LanguageName>
-		<_Description>Creates simple shared library C project.</_Description>
-		<DefaultFilename>SharedLibraryCProject</DefaultFilename>
-		<GroupId>md-shared-library-project</GroupId>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "SharedLibrary"
-				PauseConsoleOutput = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-			
-			<Files>
-				<File name = "main.h" AddStandardHeader="True"><![CDATA[
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-/* Add function prototypes here */
-
-#endif
-]]></File>
-				<File name = "main.c"><![CDATA[#include "main.h"
-
-/* Add function definitions here */
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/CBinding/templates/SharedLibraryCppProject.xpt.xml b/main/src/addins/CBinding/templates/SharedLibraryCppProject.xpt.xml
deleted file mode 100644
index 52f47fa589..0000000000
--- a/main/src/addins/CBinding/templates/SharedLibraryCppProject.xpt.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Marcos David Marin Amador" 
-    created      = "08/16/2007"
-    lastModified = "08/16/2007">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Shared Library</_Name>
-		<Category>other/misc/c</Category>
-		<Icon>md-project-library</Icon>
-		<Image id="md-library-project" />
-		<LanguageName>CPP</LanguageName>
-		<_Description>Creates simple shared library C++ project.</_Description>
-		<DefaultFilename>SharedLibraryCppProject</DefaultFilename>
-		<GroupId>md-shared-library-project</GroupId>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "SharedLibrary"
-				PauseConsoleOutput = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-			
-			<Files>
-				<File name = "main.h" AddStandardHeader="True"><![CDATA[#ifndef __MAIN_H__
-#define __MAIN_H__
-
-// Add function prototypes here
-
-#endif
-]]></File>
-				<File name = "main.cpp" AddStandardHeader="True"><![CDATA[#include "main.h"
-
-// Add function definitions here
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/CBinding/templates/StaticLibraryCProject.xpt.xml b/main/src/addins/CBinding/templates/StaticLibraryCProject.xpt.xml
deleted file mode 100644
index 88150e2653..0000000000
--- a/main/src/addins/CBinding/templates/StaticLibraryCProject.xpt.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Marcos David Marin Amador" 
-    created      = "08/16/2007"
-    lastModified = "08/16/2007">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Static Library</_Name>
-		<Category>other/misc/c</Category>
-		<Icon>md-project-library</Icon>
-		<Image id="md-library-project" />
-		<LanguageName>C</LanguageName>
-		<_Description>Creates simple static library C project.</_Description>
-		<DefaultFilename>StaticLibraryCProject</DefaultFilename>
-		<GroupId>md-static-library-project</GroupId>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "StaticLibrary"
-				PauseConsoleOutput = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-			
-			<Files>
-				<File name = "main.h" AddStandardHeader="True"><![CDATA[#ifndef __MAIN_H__
-#define __MAIN_H__
-
-/* Add function prototypes here */
-
-#endif
-]]></File>
-				<File name = "main.c" AddStandardHeader="True"><![CDATA[#include "main.h"
-
-/* Add function definitions here */
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
-
diff --git a/main/src/addins/CBinding/templates/StaticLibraryCppProject.xpt.xml b/main/src/addins/CBinding/templates/StaticLibraryCppProject.xpt.xml
deleted file mode 100644
index 14d0d3580e..0000000000
--- a/main/src/addins/CBinding/templates/StaticLibraryCppProject.xpt.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<Template
-	originator   = "Marcos David Marin Amador" 
-    created      = "08/16/2007"
-    lastModified = "08/16/2007">
-	
-	<!-- Template Header -->
-	<TemplateConfiguration>
-		<_Name>Static Library</_Name>
-		<Category>other/misc/c</Category>
-		<Icon>md-project-library</Icon>
-		<Image id="md-library-project" />
-		<LanguageName>CPP</LanguageName>
-		<_Description>Creates simple static library C++ project.</_Description>
-		<DefaultFilename>StaticLibraryCppProject</DefaultFilename>
-		<GroupId>md-static-library-project</GroupId>
-	</TemplateConfiguration>
-	
-	<!-- Template Content -->
-	<Combine name = "${ProjectName}" directory = ".">
-		<Project name = "${ProjectName}" directory = "." type = "C/C++">
-			<Options
-				Target = "StaticLibrary"
-				PauseConsoleOutput = "True"
-				CompilerArgs = ""
-				LinkerArgs = ""/>
-			
-			<Files>
-				<File name = "main.h" AddStandardHeader="True"><![CDATA[
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-// Add function prototypes here
-
-#endif
-]]></File>
-				<File name = "main.cpp" AddStandardHeader="True"><![CDATA[#include "main.h"
-
-// Add function definitions here
-]]></File>
-			</Files>
-		</Project>
-	</Combine>
-</Template>
diff --git a/main/src/addins/CSharpBinding/AddinInfo.cs b/main/src/addins/CSharpBinding/AddinInfo.cs
index 90e1d63e5c..0a0160f9fc 100644
--- a/main/src/addins/CSharpBinding/AddinInfo.cs
+++ b/main/src/addins/CSharpBinding/AddinInfo.cs
@@ -15,8 +15,8 @@ using Mono.Addins.Description;
 [assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("Refactoring", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("SourceEditor2", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("NUnit", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("UnitTesting", MonoDevelop.BuildInfo.Version)]
 
 // Submodules
 [assembly:AddinModule ("MonoDevelop.CSharpBinding.Autotools.dll")]
-[assembly:AddinModule ("MonoDevelop.CSharpBinding.AspNet.dll")]
+[assembly:AddinModule ("MonoDevelop.CSharpBinding.AspNet.dll")]
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/AspNet/ASPNetReferenceFinder.cs b/main/src/addins/CSharpBinding/AspNet/ASPNetReferenceFinder.cs
index 1484fe7b1d..72e11efbc1 100644
--- a/main/src/addins/CSharpBinding/AspNet/ASPNetReferenceFinder.cs
+++ b/main/src/addins/CSharpBinding/AspNet/ASPNetReferenceFinder.cs
@@ -23,12 +23,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+/*
 using System.Collections.Generic;
 
 using MonoDevelop.Core;
 using MonoDevelop.Ide.FindInFiles;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.AspNet.WebForms;
 
 namespace MonoDevelop.CSharp.Refactoring
@@ -40,7 +42,7 @@ namespace MonoDevelop.CSharp.Refactoring
 			IncludeDocumentation = true;
 		}
 		
-		IEnumerable<DomRegion> SearchMember (IEntity member, ITypeResolveContext dom, FilePath fileName, Mono.TextEditor.TextEditorData editor, Mono.TextEditor.TextDocument buildDocument, List<LocalDocumentInfo.OffsetInfo> offsetInfos, ParsedDocument parsedDocument)
+		IEnumerable<DomRegion> SearchMember (IEntity member, ITypeResolveContext dom, FilePath fileName, TextEditor editor, ITextDocument buildDocument, List<LocalDocumentInfo.OffsetInfo> offsetInfos, ParsedDocument parsedDocument)
 		{ // TODO: Type system conversion.
 			yield break;
 //			var resolver = new NRefactoryResolver (dom, parsedDocument.CompilationUnit, ICSharpCode.OldNRefactory.SupportedLanguage.CSharp, editor, fileName);
@@ -58,7 +60,7 @@ namespace MonoDevelop.CSharp.Refactoring
 //				yield return new DomRegion (fileName, loc.Line, loc.Column, loc.Line, loc.Column + result.Name.Lenhth);
 //			}
 		}
-		public override IEnumerable<MemberReference> FindReferences (MonoDevelop.Projects.Project project, IProjectContent content, IEnumerable<FilePath> files, IProgressMonitor monitor, IEnumerable<object> searchedMembers)
+		public override IEnumerable<MemberReference> FindReferences (MonoDevelop.Projects.Project project, IProjectContent content, IEnumerable<FilePath> files, ProgressMonitor monitor, IEnumerable<object> searchedMembers)
 		{ // TODO: Type system conversion.
 			yield break;
 //			var editor = TextFileProvider.Instance.GetTextEditorData (fileName);
@@ -93,3 +95,4 @@ namespace MonoDevelop.CSharp.Refactoring
 	}
 }
 
+*/
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/AspNet/AspLanguageBuilder.cs b/main/src/addins/CSharpBinding/AspNet/AspLanguageBuilder.cs
index 4e1fc93617..e6e4eaf509 100644
--- a/main/src/addins/CSharpBinding/AspNet/AspLanguageBuilder.cs
+++ b/main/src/addins/CSharpBinding/AspNet/AspLanguageBuilder.cs
@@ -23,17 +23,25 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
+/*
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Mono.TextEditor;
 using MonoDevelop.AspNet.WebForms;
 using MonoDevelop.AspNet.WebForms.Dom;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.CSharp.Parser;
+using System.IO;
+using ICSharpCode.NRefactory.Completion;
+using MonoDevelop.AspNet.StateEngine;
+using MonoDevelop.Xml.StateEngine;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.CSharp.Completion
 {
@@ -67,9 +75,8 @@ namespace MonoDevelop.CSharp.Completion
 			builder.Append (" : ");
 			builder.AppendLine (info.BaseType);
 		}
-		
-		public LocalDocumentInfo BuildLocalDocument (DocumentInfo info, TextEditorData data,
-		                                             string expressionText, string textAfterCaret, bool isExpression)
+
+		LocalDocumentInfo ILanguageCompletionBuilder.BuildLocalDocument (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor data, string expressionText, string textAfterCaret, bool isExpression)
 		{
 			var sb = new StringBuilder ();
 			
@@ -84,12 +91,12 @@ namespace MonoDevelop.CSharp.Completion
 				foreach (var node in info.XExpressions) {
 					bool isBlock = node is WebFormsRenderBlock;
 
-					if (node.Region.Begin.Line > data.Caret.Line || node.Region.Begin.Line == data.Caret.Line && node.Region.Begin.Column > data.Caret.Column - 5) 
+					if (node.Region.Begin.Line > data.CaretLine || node.Region.Begin.Line == data.CaretLine && node.Region.Begin.Column > data.CaretColumn - 5) 
 						continue;
 					//Console.WriteLine ("take xprt:" + expressions.Key.BeginLine  +"/" +expressions.Key.BeginColumn);
 
-					var start = data.Document.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
-					var end = data.Document.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+					var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+					var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
 
 					if (!isBlock) {
 						sb.Append ("WriteLine (");
@@ -114,53 +121,52 @@ namespace MonoDevelop.CSharp.Completion
 			
 			result.LocalDocument = sb.ToString ();
 			result.CaretPosition = caretPosition;
-			result.OriginalCaretPosition = data.Caret.Offset;
+			result.OriginalCaretPosition = data.CaretOffset;
 			result.ParsedLocalDocument = Parse (info.AspNetDocument.FileName, sb.ToString ());
 			return result;
 		}
 		
-		public ICompletionDataList HandlePopupCompletion (Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo)
+		public ICompletionDataList HandlePopupCompletion (TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo)
 		{
 			CodeCompletionContext codeCompletionContext;
-			using (var completion = CreateCompletion (realDocument, info, localInfo, out codeCompletionContext)) {
+			using (var completion = CreateCompletion (realEditor, realContext, info, localInfo, out codeCompletionContext)) {
 				return completion.CodeCompletionCommand (codeCompletionContext);
 			}
 		}
 		
-		public ICompletionDataList HandleCompletion (Document realDocument, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char currentChar, ref int triggerWordLength)
+		public ICompletionDataList HandleCompletion (TextEditor realEditor, DocumentContext realContext, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char currentChar, ref int triggerWordLength)
 		{
 			CodeCompletionContext ccc;
-			using (var completion = CreateCompletion (realDocument, info, localInfo, out ccc)) {
-				return completion.HandleCodeCompletion (completionContext, currentChar, ref triggerWordLength);
+			using (var completion = CreateCompletion (realEditor, realContext, info, localInfo, out ccc)) {
+				return completion.HandleCodeCompletionAsync (completionContext, currentChar, ref triggerWordLength);
 			}
 		}
 		
-		public ParameterDataProvider HandleParameterCompletion (Document realDocument, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char completionChar)
+		public ParameterHintingResult HandleParameterCompletion (TextEditor realEditor, DocumentContext realContext, CodeCompletionContext completionContext, DocumentInfo info, LocalDocumentInfo localInfo, char completionChar)
 		{
 			CodeCompletionContext ccc;
-			using (var completion = CreateCompletion (realDocument, info, localInfo, out ccc)) {
-				return completion.HandleParameterCompletion (completionContext, completionChar);
+			using (var completion = CreateCompletion (realEditor, realContext, info, localInfo, out ccc)) {
+				return completion.HandleParameterCompletionAsync (completionContext, completionChar);
 			}
 		}
 		
-		public bool GetParameterCompletionCommandOffset (Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo, out int cpos)
+		public bool GetParameterCompletionCommandOffset (TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo, out int cpos)
 		{
 			CodeCompletionContext codeCompletionContext;
-			using (var completion = CreateCompletion (realDocument, info, localInfo, out codeCompletionContext)) {
-				return completion.GetParameterCompletionCommandOffset (out cpos);
+			using (var completion = CreateCompletion (realEditor, realContext, info, localInfo, out codeCompletionContext)) {
+				int wlen;
+				return completion.GetCompletionCommandOffset (out cpos, out wlen);
 			}
 		}
 
-		public ICompletionWidget CreateCompletionWidget (Document realDocument, LocalDocumentInfo localInfo)
+		public ICompletionWidget CreateCompletionWidget (TextEditor realEditor, DocumentContext realContext, LocalDocumentInfo localInfo)
 		{
-			return new AspCompletionWidget (realDocument, localInfo);
+			return new AspCompletionWidget (realEditor, localInfo);
 		}
 		
-		CSharpCompletionTextEditorExtension CreateCompletion (Document realDocument, DocumentInfo info, LocalDocumentInfo localInfo, out CodeCompletionContext codeCompletionContext)
+		CSharpCompletionTextEditorExtension CreateCompletion (TextEditor realEditor, DocumentContext realContext, DocumentInfo info, LocalDocumentInfo localInfo, out CodeCompletionContext codeCompletionContext)
 		{
-			var doc = new TextDocument () {
-				Text = localInfo.LocalDocument,
-			};
+			var doc = TextEditorFactory.CreateNewDocument (new StringTextSource (localInfo.LocalDocument), realEditor.FileName + ".cs"); 
 			var documentLocation = doc.OffsetToLocation (localInfo.CaretPosition);
 			
 			codeCompletionContext = new CodeCompletionContext () {
@@ -170,16 +176,16 @@ namespace MonoDevelop.CSharp.Completion
 			};
 			
 			return new CSharpCompletionTextEditorExtension (localInfo.HiddenDocument) {
-				CompletionWidget = CreateCompletionWidget (realDocument, localInfo)
+				CompletionWidget = CreateCompletionWidget (realEditor, realContext, localInfo)
 			};
 		}
 		
 		class AspCompletionWidget : ICompletionWidget
 		{
-			Document realDocument;
+			TextEditor realDocument;
 			LocalDocumentInfo localInfo;
 			
-			public AspCompletionWidget (Document realDocument, LocalDocumentInfo localInfo)
+			public AspCompletionWidget (TextEditor realDocument, LocalDocumentInfo localInfo)
 			{
 				this.realDocument = realDocument;
 				this.localInfo = localInfo;
@@ -188,7 +194,7 @@ namespace MonoDevelop.CSharp.Completion
 			#region ICompletionWidget implementation
 			public CodeCompletionContext CurrentCodeCompletionContext {
 				get {
-					int delta = realDocument.Editor.Caret.Offset - localInfo.OriginalCaretPosition;
+					int delta = realDocument.CaretOffset - localInfo.OriginalCaretPosition;
 					return CreateCodeCompletionContext (localInfo.CaretPosition + delta);
 				}
 			}
@@ -217,10 +223,10 @@ namespace MonoDevelop.CSharp.Completion
 
 			public CodeCompletionContext CreateCodeCompletionContext (int triggerOffset)
 			{
-				var savedCtx = realDocument.GetContent<ICompletionWidget> ().CreateCodeCompletionContext (realDocument.Editor.Caret.Offset + triggerOffset - localInfo.CaretPosition);
+				var savedCtx = realDocument.GetContent<ICompletionWidget> ().CreateCodeCompletionContext (realDocument.CaretOffset + triggerOffset - localInfo.CaretPosition);
 				CodeCompletionContext result = new CodeCompletionContext ();
 				result.TriggerOffset = triggerOffset;
-				DocumentLocation loc = localInfo.HiddenDocument.Editor.Document.OffsetToLocation (triggerOffset);
+				var loc = localInfo.HiddenDocument.Editor.OffsetToLocation (triggerOffset);
 				result.TriggerLine   = loc.Line;
 				result.TriggerLineOffset = loc.Column - 1;
 				
@@ -234,9 +240,9 @@ namespace MonoDevelop.CSharp.Completion
 			{
 				if (ctx == null)
 					return null;
-				int min = Math.Min (ctx.TriggerOffset, localInfo.HiddenDocument.Editor.Caret.Offset);
-				int max = Math.Max (ctx.TriggerOffset, localInfo.HiddenDocument.Editor.Caret.Offset);
-				return localInfo.HiddenDocument.Editor.Document.GetTextBetween (min, max);
+				int min = Math.Min (ctx.TriggerOffset, localInfo.HiddenDocument.Editor.CaretOffset);
+				int max = Math.Max (ctx.TriggerOffset, localInfo.HiddenDocument.Editor.CaretOffset);
+				return localInfo.HiddenDocument.Editor.GetTextBetween (min, max);
 			}
 			
 			public void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word)
@@ -249,7 +255,7 @@ namespace MonoDevelop.CSharp.Completion
 				CodeCompletionContext translatedCtx = new CodeCompletionContext ();
 				int offset = localInfo.OriginalCaretPosition + ctx.TriggerOffset - localInfo.CaretPosition;
 				translatedCtx.TriggerOffset = offset;
-				DocumentLocation loc = localInfo.HiddenDocument.Editor.Document.OffsetToLocation (offset);
+				var loc = localInfo.HiddenDocument.Editor.OffsetToLocation (offset);
 				translatedCtx.TriggerLine   = loc.Line;
 				translatedCtx.TriggerLineOffset = loc.Column - 1;
 				translatedCtx.TriggerWordLength = ctx.TriggerWordLength;
@@ -258,13 +264,16 @@ namespace MonoDevelop.CSharp.Completion
 			
 			public int CaretOffset {
 				get {
-					return localInfo.HiddenDocument.Editor.Caret.Offset;
+					return localInfo.HiddenDocument.Editor.CaretOffset;
+				}
+				set {
+					localInfo.HiddenDocument.Editor.CaretOffset = value;
 				}
 			}
 			
 			public int TextLength {
 				get {
-					return localInfo.HiddenDocument.Editor.Document.TextLength;
+					return localInfo.HiddenDocument.Editor.Length;
 				}
 			}
 
@@ -279,28 +288,33 @@ namespace MonoDevelop.CSharp.Completion
 					return Gtk.Widget.DefaultStyle;
 				}
 			}
+
+			void ICompletionWidget.AddSkipChar (int cursorPosition, char c)
+			{
+				// ignore
+			}
 			#endregion
 		}
-		
-		public ParsedDocument BuildDocument (DocumentInfo info, TextEditorData data)
+
+		ParsedDocument ILanguageCompletionBuilder.BuildDocument (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor data)
 		{
 			var docStr = BuildDocumentString (info, data);
 			return Parse (info.AspNetDocument.FileName, docStr);
 		}
 		 
-		public string BuildDocumentString (DocumentInfo info, TextEditorData data, List<LocalDocumentInfo.OffsetInfo> offsetInfos = null, bool buildExpressions = false)
+		public string BuildDocumentString (DocumentInfo info, MonoDevelop.Ide.Editor.TextEditor data, List<LocalDocumentInfo.OffsetInfo> offsetInfos = null, bool buildExpressions = false)
 		{
 			var document = new StringBuilder ();
 			
 			WriteUsings (info.Imports, document);
 
 			foreach (var node in info.XScriptBlocks) {
-				var start = data.Document.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
-				var end = data.Document.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+				var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+				var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
 				if (offsetInfos != null)
 					offsetInfos.Add (new LocalDocumentInfo.OffsetInfo (start, document.Length, end - start));
 				
-				document.AppendLine (data.Document.GetTextBetween (start, end));
+				document.AppendLine (data.GetTextBetween (start, end));
 			}
 			if (buildExpressions) {
 				WriteClassDeclaration (info, document);
@@ -312,8 +326,8 @@ namespace MonoDevelop.CSharp.Completion
 				foreach (var node in info.XExpressions) {
 					bool isBlock = node is WebFormsRenderBlock;
 
-					var start = data.Document.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
-					var end = data.Document.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
+					var start = data.LocationToOffset (node.Region.Begin.Line, node.Region.Begin.Column) + 2;
+					var end = data.LocationToOffset (node.Region.End.Line, node.Region.End.Column) - 2;
 					
 					if (!isBlock) {
 						document.Append ("WriteLine (");
@@ -335,3 +349,4 @@ namespace MonoDevelop.CSharp.Completion
 		}
 	}
 }
+*/
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
index 5c7536b6d6..8813be65c6 100644
--- a/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
+++ b/main/src/addins/CSharpBinding/AspNet/CSharpBinding.AspNet.csproj
@@ -70,11 +70,6 @@
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
@@ -95,11 +90,6 @@
       <Name>MonoDevelop.Deployment</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
diff --git a/main/src/addins/CSharpBinding/AspNet/ChangeLog b/main/src/addins/CSharpBinding/AspNet/ChangeLog
deleted file mode 100644
index a065cb6c71..0000000000
--- a/main/src/addins/CSharpBinding/AspNet/ChangeLog
+++ /dev/null
@@ -1,88 +0,0 @@
-2010-07-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.AspNet.csproj: Added reference for window
-	  builds.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* AspLanguageBuilder.cs: Track API changes.
-
-2010-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* AspLanguageBuilder.cs: Fixed 'Bug 621658 - Parameter hints
-	  disappear afterkeystroke'.
-
-2010-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* AspLanguageBuilder.cs:
-	* CSharpBinding.AspNet.csproj: Worked on 'Bug 621658 -
-	  Parameter hints disappear afterkeystroke'.
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* AspLanguageBuilder.cs: Worked on ASP.NET completion.
-
-2010-05-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AspLanguageBuilder.cs: Track API.
-
-2010-05-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AspLanguageBuilder.cs: Track API. Moved a lot of generic
-	  logic out to DocumentInfo.
-
-2010-05-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AspLanguageBuilder.cs: Use the list of usings.
-
-2010-05-20  Mike Krüger  <mkrueger@novell.com>
-
-	* AspLanguageBuilder.cs: Fixed local lookup for ASP.NET.
-
-2010-05-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AspLanguageBuilder.cs: Fix type name and base class, and add
-	  usings.
-
-2010-05-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AspLanguageBuilder.cs: Heavy refactoring and tidying of
-	  ASP.NET parser code to support future changes.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* AspLanguageBuilder.cs: Worked on ASP.NET completion.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* AspLanguageBuilder.cs: Fixed ASP.NET completion.
-
-2010-04-19  Mike Krüger  <mkrueger@novell.com>
-
-	* AspLanguageBuilder.cs: Worked on ASP.NET completion.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* AspLanguageBuilder.cs:
-	* CSharpBinding.AspNet.csproj: Merged MD.Projects into
-	  MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components
-	  into MD.Ide.
-
-2010-03-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpBinding.AspNet.csproj: Don't local-copy project refs,
-	  as it duplicates assemblies and breaks running on .NET.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Add missing file.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AspLanguageBuilder.cs:
-	* CSharpBinding.AspNet.csproj: Moved AspLanguageBuilder to its
-	  own assembly and module. Dropped Asp.Net dependency.
-
diff --git a/main/src/addins/CSharpBinding/AspNet/RazorCSharpCompletionBuilder.cs b/main/src/addins/CSharpBinding/AspNet/RazorCSharpCompletionBuilder.cs
index 974f8ba511..6a39304a4f 100644
--- a/main/src/addins/CSharpBinding/AspNet/RazorCSharpCompletionBuilder.cs
+++ b/main/src/addins/CSharpBinding/AspNet/RazorCSharpCompletionBuilder.cs
@@ -25,11 +25,15 @@
 // THE SOFTWARE.

 

 using System;

+using System.Threading;

+using System.Threading.Tasks;

 using MonoDevelop.CSharp.Completion;

 using MonoDevelop.Ide.CodeCompletion;

-using Mono.TextEditor;

 using MonoDevelop.Ide.Gui;

+//using ICSharpCode.NRefactory6.CSharp.Completion;

 using MonoDevelop.AspNet.Razor;

+using MonoDevelop.Ide.Editor;

+using MonoDevelop.Ide.TypeSystem;

 

 namespace MonoDevelop.CSharp.Completion

 {

@@ -42,7 +46,7 @@ namespace MonoDevelop.CSharp.Completion
 			return language == "C#";

 		}

 

-		CSharpCompletionTextEditorExtension CreateCompletion (Document realDocument, UnderlyingDocumentInfo docInfo,

+		CSharpCompletionTextEditorExtension CreateCompletion (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo,

 			out CodeCompletionContext codeCompletionContext)

 		{

 			var documentLocation = docInfo.UnderlyingDocument.Editor.OffsetToLocation (docInfo.CaretPosition);

@@ -54,69 +58,73 @@ namespace MonoDevelop.CSharp.Completion
 			};

 

 			return new CSharpCompletionTextEditorExtension (docInfo.UnderlyingDocument) {

-				CompletionWidget = CreateCompletionWidget (realDocument, docInfo)

+				CompletionWidget = CreateCompletionWidget (editor, context, docInfo)

 			};

 		}

 

-		CSharpCompletionTextEditorExtension CreateCompletionAndUpdate (Document realDocument, UnderlyingDocumentInfo docInfo,

+		CSharpCompletionTextEditorExtension CreateCompletionAndUpdate (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo,

 			out CodeCompletionContext codeCompletionContext)

 		{

-			var completion = CreateCompletion (realDocument, docInfo, out codeCompletionContext);

+			var completion = CreateCompletion (editor, context, docInfo, out codeCompletionContext);

 			completion.UpdateParsedDocument ();

 			return completion;

 		}

 

-		public ICompletionWidget CreateCompletionWidget (Document realDocument,	UnderlyingDocumentInfo docInfo)

+		public ICompletionWidget CreateCompletionWidget (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context,	UnderlyingDocumentInfo docInfo)

 		{

-			return new RazorCompletionWidget (realDocument, docInfo);

+			return new RazorCompletionWidget (editor, context, docInfo);

 		}

 

-		public ICompletionDataList HandlePopupCompletion (Document realDocument, UnderlyingDocumentInfo docInfo)

+		public Task<ICompletionDataList> HandlePopupCompletion (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo)

 		{

 			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

+			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

 			return completion.CodeCompletionCommand (ccc);

 		}

 

-		public ICompletionDataList HandleCompletion (Document realDocument,	CodeCompletionContext completionContext,

-			UnderlyingDocumentInfo docInfo, char currentChar, ref int triggerWordLength)

+		public Task<ICompletionDataList> HandleCompletion (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context,	CodeCompletionContext completionContext,

+			UnderlyingDocumentInfo docInfo, char currentChar, CancellationToken token)

 		{

 			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

-			return completion.HandleCodeCompletion (completionContext, currentChar, ref triggerWordLength);

+			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

+			return completion.HandleCodeCompletionAsync (completionContext, currentChar, token);

 		}

 

-		public ParameterDataProvider HandleParameterCompletion (Document realDocument,	CodeCompletionContext completionContext,

+		public Task<ParameterHintingResult> HandleParameterCompletion (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context,	CodeCompletionContext completionContext,

 			UnderlyingDocumentInfo docInfo, char completionChar)

 		{

 			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

-			return completion.HandleParameterCompletion (completionContext, completionChar);

+			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

+			return completion.HandleParameterCompletionAsync (completionContext, completionChar);

 		}

 

-		public bool GetParameterCompletionCommandOffset (Document realDocument,	UnderlyingDocumentInfo docInfo, out int cpos)

-		{

-			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

-			return completion.GetParameterCompletionCommandOffset (out cpos);

-		}

+//		public bool GetParameterCompletionCommandOffset (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context,	UnderlyingDocumentInfo docInfo, out int cpos)

+//		{

+//			CodeCompletionContext ccc;

+//			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

+//			return completion.GetParameterCompletionCommandOffset (out cpos);

+//		}

 

-		public int GetCurrentParameterIndex (Document realDocument, UnderlyingDocumentInfo docInfo, int startOffset)

+		public Task<int> GetCurrentParameterIndex (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo, int startOffset)

 		{

 			CodeCompletionContext ccc;

-			var completion = CreateCompletionAndUpdate (realDocument, docInfo, out ccc);

-			return completion.GetCurrentParameterIndex (startOffset);

+			var completion = CreateCompletionAndUpdate (editor, context, docInfo, out ccc);

+			return completion.GetCurrentParameterIndex (startOffset, default(CancellationToken));

 		}

 	}

 

 	class RazorCompletionWidget : ICompletionWidget

 	{

-		Document realDocument;

+		DocumentContext realDocumentContext;

+

+		MonoDevelop.Ide.Editor.TextEditor realEditor;

+

 		UnderlyingDocumentInfo docInfo;

 

-		public RazorCompletionWidget (Document realDocument, UnderlyingDocumentInfo docInfo)

+		public RazorCompletionWidget (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, UnderlyingDocumentInfo docInfo)

 		{

-			this.realDocument = realDocument;

+			this.realEditor = editor;

+			this.realDocumentContext = context;

 			this.docInfo = docInfo;

 		}

 

@@ -131,6 +139,13 @@ namespace MonoDevelop.CSharp.Completion
 

 		public event EventHandler CompletionContextChanged;

 

+		protected virtual void OnCompletionContextChanged (EventArgs e)

+		{

+			var handler = CompletionContextChanged;

+			if (handler != null)

+				handler (this, e);

+		}

+

 		public string GetText (int startOffset, int endOffset)

 		{

 			endOffset = Math.Min (endOffset, TextLength);

@@ -156,11 +171,11 @@ namespace MonoDevelop.CSharp.Completion
 

 		public CodeCompletionContext CreateCodeCompletionContext (int triggerOffset)

 		{

-			var savedCtx = realDocument.GetContent<ICompletionWidget> ().CreateCodeCompletionContext (

-				realDocument.Editor.Caret.Offset + triggerOffset - docInfo.CaretPosition);

+			var savedCtx = realDocumentContext.GetContent<ICompletionWidget> ().CreateCodeCompletionContext (

+				realEditor.CaretOffset + triggerOffset - docInfo.CaretPosition);

 			var result = new CodeCompletionContext ();

 			result.TriggerOffset = triggerOffset;

-			var loc = docInfo.UnderlyingDocument.Editor.Document.OffsetToLocation (triggerOffset);

+			var loc = docInfo.UnderlyingDocument.Editor.OffsetToLocation (triggerOffset);

 			result.TriggerLine = loc.Line;

 			result.TriggerLineOffset = loc.Column - 1;

 

@@ -177,7 +192,7 @@ namespace MonoDevelop.CSharp.Completion
 				return null;

 			int min = Math.Min (ctx.TriggerOffset, CaretOffset);

 			int max = Math.Max (ctx.TriggerOffset, CaretOffset);

-			return docInfo.UnderlyingDocument.Editor.Document.GetTextBetween (min, max);

+			return docInfo.UnderlyingDocument.Editor.GetTextBetween (min, max);

 		}

 

 		public void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word)

@@ -193,25 +208,28 @@ namespace MonoDevelop.CSharp.Completion
 

 			var translatedCtx = new CodeCompletionContext ();

 			translatedCtx.TriggerOffset = offset;

-			var loc = docInfo.UnderlyingDocument.Editor.Document.OffsetToLocation (offset);

+			var loc = docInfo.UnderlyingDocument.Editor.OffsetToLocation (offset);

 			translatedCtx.TriggerLine = loc.Line;

 			translatedCtx.TriggerLineOffset = loc.Column - 1;

 			translatedCtx.TriggerWordLength = ctx.TriggerWordLength;

-				realDocument.GetContent<ICompletionWidget> ().SetCompletionText (

+				realDocumentContext.GetContent<ICompletionWidget> ().SetCompletionText (

 				translatedCtx, partial_word, complete_word, wordOffset);

 		}

 

 		public int CaretOffset

 		{

 			get	{

-				return docInfo.UnderlyingDocument.Editor.Caret.Offset;

+				return docInfo.UnderlyingDocument.Editor.CaretOffset;

+			}

+			set {

+				docInfo.UnderlyingDocument.Editor.CaretOffset = value;

 			}

 		}

 

 		public int TextLength

 		{

 			get	{

-				return docInfo.UnderlyingDocument.Editor.Document.TextLength;

+				return docInfo.UnderlyingDocument.Editor.Length;

 			}

 		}

 

@@ -229,6 +247,11 @@ namespace MonoDevelop.CSharp.Completion
 			}

 		}

 

+		public double ZoomLevel {

+			get {

+				return 1d;

+			}

+		}

 		#endregion

 	}

 }

diff --git a/main/src/addins/CSharpBinding/AssemblyInfo.cs b/main/src/addins/CSharpBinding/AssemblyInfo.cs
index 255ca3be25..754c5f2e56 100644
--- a/main/src/addins/CSharpBinding/AssemblyInfo.cs
+++ b/main/src/addins/CSharpBinding/AssemblyInfo.cs
@@ -8,4 +8,10 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDescription ("CSharp Language Binding")]
 [assembly: AssemblyVersion ("2.6")]
 [assembly: AssemblyCopyright ("MIT X11")]
-[assembly: InternalsVisibleTo("UnitTests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("UnitTests")]
+[assembly: InternalsVisibleTo("MonoDevelop.CSharpBinding.AspNet")]
+[assembly: InternalsVisibleTo("MonoDevelop.CSharpBinding.Tests")]
+[assembly: InternalsVisibleTo("MonoDevelop.DocFood")]
+[assembly: InternalsVisibleTo("Xamarin.Forms.Addin")]
+[assembly: InternalsVisibleTo("MonoDevelop.GtkCore")]
+[assembly: InternalsVisibleTo("MonoDevelop.IPhone")]
diff --git a/main/src/addins/CSharpBinding/Autotools/Autotools.csproj b/main/src/addins/CSharpBinding/Autotools/Autotools.csproj
index c6e075378a..f6784fc266 100644
--- a/main/src/addins/CSharpBinding/Autotools/Autotools.csproj
+++ b/main/src/addins/CSharpBinding/Autotools/Autotools.csproj
@@ -61,11 +61,6 @@
       <Name>CSharpBinding</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
diff --git a/main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs b/main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs
index 70434664bb..74eb99329f 100644
--- a/main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs
+++ b/main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs
@@ -10,7 +10,7 @@ using System.Text.RegularExpressions;
 
 namespace CSharpBinding.Autotools
 {
-	public class CSharpAutotoolsSetup : ISimpleAutotoolsSetup
+	class CSharpAutotoolsSetup : ISimpleAutotoolsSetup
 	{
 		public string GetCompilerCommand ( Project project, string configuration )
 		{
@@ -44,7 +44,7 @@ namespace CSharpBinding.Autotools
 			if ( config == null ) return "";
 			
 			CSharpCompilerParameters parameters = (CSharpCompilerParameters) config.CompilationParameters;
-			CSharpProjectParameters projectParameters = (CSharpProjectParameters) config.ProjectParameters;
+			ICSharpProject projectParameters = config.ParentItem as ICSharpProject;
 			
 			StringWriter writer = new StringWriter();
 			
@@ -64,7 +64,7 @@ namespace CSharpBinding.Autotools
 				writer.Write(" \"-nowarn:" + parameters.NoWarnings + '"');
 			}
 
-			if(config.DebugMode) {
+			if(config.DebugSymbols) {
 				writer.Write(" -debug");
 				//Check whether we have a DEBUG define
 				bool hasDebugDefine = false;
diff --git a/main/src/addins/CSharpBinding/Autotools/ChangeLog b/main/src/addins/CSharpBinding/Autotools/ChangeLog
deleted file mode 100644
index 72efcd008c..0000000000
--- a/main/src/addins/CSharpBinding/Autotools/ChangeLog
+++ /dev/null
@@ -1,72 +0,0 @@
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Autotools.csproj: Merged MD.Projects into MD.Core, and
-	  MD.Projects.Gui, MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Autotools.csproj: Worked on new formatter/parser.
-
-2010-01-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am: fixed 'Bug 568484 - NRE in resolver'.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpAutotoolsSetup.cs: Renamed some namespaces.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* Autotools.csproj: Use \ instead of '/' in the Import.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* Autotools.csproj: Add md.targets .
-
-2009-08-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Autotools.csproj: Don't make local copies of project
-	  references.
-
-2009-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* Autotools.csproj: Worked on refactoring support.
-
-2009-04-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Autotools.csproj: Flush reference version number.
-
-2009-03-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Autotools.csproj: Don't local-copy project refs.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Autotools.csproj: Don't local-copy project refs.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* Autotools.csproj: Moved text editor to core
-
-2009-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* Autotools.csproj: Monodevelop changed the reference a bit.
-
-2009-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* Autotools.csproj: Updated nrefactory references.
-
-2009-02-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpAutotoolsSetup.cs: Moved some properties from
-	  configuration parameters to project parameters.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Autotools.mdp:
-	* Autotools.csproj: Migrated to MSBuild file format.
-
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
index 8ac2fe8f96..15e1d2e01d 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
+++ b/main/src/addins/CSharpBinding/CSharpBinding.addin.xml
@@ -1,30 +1,85 @@
 <ExtensionModel>
-	
-	<ConditionType id="MSBuildTargetIsAvailable" type="MonoDevelop.Projects.Formats.MSBuild.TargetsAvailableCondition" />
+
+	<!-- Extension Points -->
+	<ExtensionPoint path = "/MonoDevelop/CSharp/Completion/ContextHandler">
+		<ExtensionNode name="Class"/>
+	</ExtensionPoint>
+
+	<!-- Extensions -->
 
 	<Extension path = "/MonoDevelop/Ide/Commands">
 		<Command id = "MonoDevelop.CodeGeneration.CodeGenerationCommands.ShowCodeGenerationWindow"
 				_label = "S_how Code Generation Window"
 				shortcut = "Alt|Insert"
 				macShortcut = "Meta|I" />
-	</Extension>
-
+		<Command id = "MonoDevelop.CSharp.Refactoring.FindProjectReferenceUsages"
+			defaultHandler = "MonoDevelop.CSharp.Refactoring.FindProjectReferenceUsagesHandler"
+			_label = "_Find reference usages"/>
+		<Command id = "MonoDevelop.CSharp.Navigation.FindExtensionMethods"
+			defaultHandler = "MonoDevelop.CSharp.Navigation.FindExtensionMethodsHandler"
+			_label = "Extension Methods"/>
+		<Command id = "MonoDevelop.Refactoring.Navigation.FindBaseSymbols"
+			defaultHandler = "MonoDevelop.CSharp.Navigation.FindBaseSymbolsHandler"
+			_label = "Base Symbols"/>
+		<Command id = "MonoDevelop.Refactoring.Navigation.FindDerivedSymbols"
+			defaultHandler = "MonoDevelop.CSharp.Refactoring.FindDerivedSymbolsHandler"
+			_label = "Derived Symbols"/>
+		<Command id = "MonoDevelop.CSharp.Navigation.FindMemberOverloads"
+			defaultHandler = "MonoDevelop.CSharp.Navigation.FindMemberOverloadsHandler"
+			_label = "Member Overloads"/>
+		<Command id = "MonoDevelop.CSharp.Navigation.FindImplementingMembers"
+			defaultHandler = "MonoDevelop.CSharp.Navigation.FindImplementingMembersHandler"
+			_label = "Implementing Members"/>
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/Commands/Refactoring">
+<!--		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.Resolve"
+				defaultHandler = "MonoDevelop.CSharp.Refactoring.ResolveCommandHandler"
+				type="array"
+				_label = "Resolve"/> -->
+		<Command id = "MonoDevelop.CSharp.Refactoring.ExtractMethodCommand"
+			defaultHandler = "MonoDevelop.CSharp.Refactoring.ExtractMethodCommandHandler"
+			_label = "Extract Method" 
+			_description = "Extracts a method"
+		/>
+		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.CurrentRefactoryOperations"
+			defaultHandler = "MonoDevelop.CSharp.Refactoring.CurrentRefactoryOperationsHandler"
+			type="array"
+			_label = "Refactory Operations" /> 
+		<Command id = "MonoDevelop.CSharp.Refactoring.OrganizeImportsCommand"
+			defaultHandler = "MonoDevelop.CSharp.Refactoring.OrganizeImportsCommandHandler"
+			_label = "_Sort Usings" 
+		/>
+		<Command id = "MonoDevelop.CSharp.Refactoring.RemoveUnusedImportsCommand"
+			defaultHandler = "MonoDevelop.CSharp.Refactoring.RemoveUnusedImportsCommandHandler"
+			_label = "_Remove Unused Usings" 
+		/>
+		<Command id = "MonoDevelop.CSharp.Refactoring.SortAndRemoveImportsCommand"
+			defaultHandler = "MonoDevelop.CSharp.Refactoring.SortAndRemoveImportsCommandHandler"
+			_label = "R_emove and Sort" 
+		/>
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/Commands/CodeNavigation">
+		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration"
+						_label = "_Go to Declaration" 
+						shortcut = "F12"
+						macShortcut = "Meta|D"/>
+	</Extension>
+		
+	
 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
-		<DotNetProject
+		<DotNetProjectType
 			language="C#"
 			extension="csproj"
 			guid="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-			import="$(MSBuildBinPath)\Microsoft.CSharp.targets"
-			resourceHandler="MonoDevelop.CSharp.Project.CSharpResourceIdBuilder"
+			type="MonoDevelop.CSharp.Project.CSharpProject"
 			/>
+	</Extension>
+
+	<Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions">
 		<Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath)\Microsoft\Portable\v4.0\Microsoft.Portable.CSharp.targets">
-			<DotNetProjectSubtype
-				guid="{786C830F-07A1-408B-BD7F-6EE04809D6DB}"
-				type="MonoDevelop.Projects.PortableDotNetProject"
-				useXBuild="true">
-				<AddImport language="C#" projects="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-				<RemoveImport language="C#" projects="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-			</DotNetProjectSubtype>
+			<ProjectFlavor guid="{786C830F-07A1-408B-BD7F-6EE04809D6DB}" type="MonoDevelop.CSharp.Project.PortableCSharpProjectFlavor" alias="C#PortableLibrary"/>
 		</Condition>
 	</Extension>
 
@@ -34,13 +89,13 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
-		<ProjectTemplate id = "CSharpConsoleProject" resource = "ConsoleProject.xpt.xml"/>
-		<ProjectTemplate id = "CSharpEmptyProject" resource = "EmptyProject.xpt.xml"/>
-		<ProjectTemplate id = "CSharpGtkSharp2Project" resource = "GtkSharp2Project.xpt.xml"/>
-		<ProjectTemplate id = "CSharpLibrary" resource = "Library.xpt.xml"/>
-		<ProjectTemplate id = "CSharpSharedAssetsProject" resource = "SharedAssetsProject.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.CSharp.ConsoleProject" resource = "ConsoleProject.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.CSharp.EmptyProject" resource = "EmptyProject.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.CSharp.GtkSharp2Project" resource = "GtkSharp2Project.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.CSharp.Library" resource = "Library.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.CSharp.SharedProject" resource = "SharedAssetsProject.xpt.xml"/>
 		<Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath)\Microsoft\Portable\v4.0\Microsoft.Portable.CSharp.targets">
-			<ProjectTemplate id = "CSharpPortableLibrary" resource = "PortableLibrary.xpt.xml" />
+			<ProjectTemplate id = "MonoDevelop.CSharp.PortableLibrary" resource = "PortableLibrary.xpt.xml" />
 		</Condition>
 	</Extension>
 
@@ -52,7 +107,7 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build/General">
-		<Condition id="ActiveLanguage" value="C#">
+		<Condition id="ProjectTypeId" value="C#">
 			<Panel id = "CSharpCompilerOptionsPanel"
 			             _label = "C#"
 			             class = "MonoDevelop.CSharp.Project.CompilerOptionsPanel"/>
@@ -60,7 +115,7 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build/Compiler">
-		<Condition id="ActiveLanguage" value="C#">
+		<Condition id="ProjectTypeId" value="C#">
 			<Panel id = "CSharpCodeGenerationPanel"
 			             _label = "Compiler"
 			             class = "MonoDevelop.CSharp.Project.CodeGenerationPanel"/>
@@ -68,9 +123,12 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectModel/LanguageBindings">
-		<LanguageBinding id    = "CSharp"
-		                 supportedextensions = ".cs"
-		                 class = "MonoDevelop.CSharp.CSharpLanguageBinding" />
+		<LanguageBinding id = "C#"
+		                 extensions = ".cs"
+		                 singleLineCommentTag = "//"
+		                 blockCommentStartTag = "/*"
+		                 blockCommentEndTag = "*/" 
+		                 codeDomType = "MonoDevelop.CSharp.CSharpEnhancedCodeProvider" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/ReferenceFinder">
@@ -78,11 +136,6 @@
 		                 class = "MonoDevelop.CSharp.Refactoring.CSharpReferenceFinder" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
-		<DataType class = "MonoDevelop.CSharp.Project.CSharpCompilerParameters" />
-		<DataType class = "MonoDevelop.CSharp.Project.CSharpProjectParameters" />
-	</Extension>
-
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
 		<!-- indent engine must be before the completion text editor engine,
 		otherwise stuff like
@@ -102,6 +155,10 @@
 		<Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.Highlighting.HighlightUsagesExtension" />
 		<Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.PathedDocumentTextEditorExtension" />
 		<Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.UnitTestTextEditorExtension" />
+		<Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.ClassOutline.CSharpOutlineTextEditorExtension" />
+		<Class fileExtensions = ".cs" class = "MonoDevelop.CSharp.CSharpNavigationTextEditorExtension" />
+		<Class fileExtensions = ".json" class = "MonoDevelop.JSon.JSonTextEditorExtension" />
+		<Class class = "MonoDevelop.CSharp.Refactoring.CSharpFeaturesTextEditorExtension" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Core/StockIcons">
@@ -122,8 +179,8 @@
 		<Formatter mimeType="text/x-csharp" class="MonoDevelop.CSharp.Formatting.CSharpFormatter" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/TypeSystem/Ambiences">
-		<Ambience mimeType="text/x-csharp" class = "MonoDevelop.CSharp.CSharpAmbience" />
+	<Extension path = "/MonoDevelop/TypeSystem/AmbienceTooltipProviders">
+		<Provider mimeType="text/x-csharp" class = "MonoDevelop.CSharp.CSharpAmbience" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/TypeSystem/Parser">
@@ -152,7 +209,7 @@
 
 	<Extension path = "/MonoDevelop/ProjectModel/PolicySets" >
 		<PolicySet id="1TBS" _name="SharpDevelop style (1TBS)" allowDiffSerialize="false">
-			<Policies resource="SharpDevelopCSharpPolicy.xml" />
+			<Policies resource="KRCSharpPolicy.xml" />
 			<Policies resource="InvariantTextStylePolicy.xml" />
 		</PolicySet>
 	</Extension>
@@ -161,24 +218,11 @@
 		<Policies resource="AllmanCSharpPolicy.xml" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/ProjectModel/PolicySets" >
-		<PolicySet id="Whitesmiths" _name="Whitesmiths style" allowDiffSerialize="false">
-			<Policies resource="WhitesmithsCSharpPolicy.xml" />
-			<Policies resource="InvariantTextStylePolicy.xml" />
-		</PolicySet>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/PolicySets" >
-		<PolicySet id="GNU" _name="GNU style" allowDiffSerialize="false">
-			<Policies resource="GNUCSharpPolicy.xml" />
-			<Policies resource="GNUTextStylePolicy.xml" />
-		</PolicySet>
-	</Extension>
-
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/MimeTypePolicyPanels">
 		<Panel id = "CSharpFormatting" _label = "C# Format" mimeType="text/x-csharp" class = "MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanel" />
 	</Extension>
 
+<!--	
 	<Extension path = "/MonoDevelop/Refactoring/CodeActions">
 		<Action mimeType="text/x-csharp"
 			_title = "Move type to another file"
@@ -189,10 +233,10 @@
 			_description = "Converts constant fields to enumeration"
 			class = "MonoDevelop.CSharp.Refactoring.CodeActions.ConvertToEnumAction" />
 	</Extension>
-	
+
 	<Extension path = "/MonoDevelop/Refactoring/CodeIssues">
 		<CodeIssue mimeType="text/x-csharp" severity = "Error" class="MonoDevelop.CSharp.Refactoring.CodeIssues.MonoTODOIssue"/>
-	</Extension>
+	</Extension> -->
 	
 	<Extension path = "/MonoDevelop/Ide/TextEditorResolver">
 		<Resolver class = "MonoDevelop.CSharp.Resolver.TextEditorResolverProvider" mimeType="text/x-csharp" />
@@ -224,36 +268,29 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Refactoring/CodeGenerators">
+
 		<Class class = "MonoDevelop.CodeGeneration.CreateConstructorGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.ReadonlyPropertyGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.PropertyGenerator" />
-		<Class class = "MonoDevelop.CodeGeneration.ImplementInterfaceMembersGenerator" />
+<!--	<Class class = "MonoDevelop.CodeGeneration.ImplementInterfaceMembersGenerator" /> -->
 		<Class class = "MonoDevelop.CodeGeneration.RequiredProtocolMemberGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.OptionalProtocolMemberGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.PartialGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.OverrideMembersGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.ToStringGenerator" />
 		<Class class = "MonoDevelop.CodeGeneration.RaiseEventMethodGenerator" />
-		<Class class = "MonoDevelop.CodeGeneration.EqualityMembersGenerator" />
+<!--		<Class class = "MonoDevelop.CodeGeneration.EqualityMembersGenerator" /> -->
 		<Class class = "MonoDevelop.CodeGeneration.WriteLineGenerator" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Refactoring/CodeActionSource">
-		<Source class ="MonoDevelop.CSharp.Refactoring.CodeActions.NRefactoryCodeActionSource"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Refactoring/CodeIssueSource">
-		<Source class ="MonoDevelop.CSharp.Refactoring.CodeIssues.NRefactoryCodeIssueSource"/>
-	</Extension>
-
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/DefaultPolicyPanels/SourceCode">
-		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanel" icon="md-prefs-name-conventions" />
+		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanel" icon="md-prefs-name-conventions" />
 	</Extension>
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/SourceCode">
-		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanel" icon="md-prefs-name-conventions" />
+		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanel" icon="md-prefs-name-conventions" />
 	</Extension>
 	<Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/SourceCode">
-		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanel" icon="md-prefs-name-conventions" />
+		<Section id="NameConventions" _label="Name Conventions" fill = "true" class="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanel" icon="md-prefs-name-conventions" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/SourceEditor2/TooltipProviders">
@@ -263,4 +300,63 @@
 	<Extension path = "/MonoDevelop/Ide/CompletionCharacters">
 		<Complete language="C#" commitOnSpace="True" commitChars="{}[]().,:;+-*/%&amp;|^!~=&lt;&gt;?@#'&quot;\"/>
 	</Extension>
-</ExtensionModel>
+
+	<Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor">
+		<Condition id="FileType" mimeTypes="text/x-csharp">
+			<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.CurrentRefactoryOperations" insertafter="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations" insertbefore="MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator"/>
+
+			<ItemSet id = "Navigate" _label = "Navigate">
+				<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.FindReferences"/>
+				<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.FindAllReferences"/>
+				<CommandItem id = "MonoDevelop.Refactoring.Navigation.FindBaseSymbols"/>
+				<CommandItem id = "MonoDevelop.Refactoring.Navigation.FindDerivedSymbols"/>
+				<SeparatorItem id = "Separator1" />
+				
+				<CommandItem id = "MonoDevelop.CSharp.Navigation.FindExtensionMethods"/>
+				<CommandItem id = "MonoDevelop.CSharp.Navigation.FindMemberOverloads"/>
+				<CommandItem id = "MonoDevelop.CSharp.Navigation.FindImplementingMembers"/>
+			</ItemSet>
+
+				
+			<ItemSet id = "Organize Imports" _label = "Organize Usings" insertafter="MonoDevelop.Ide.Commands.TextEditorCommands.ShowCodeTemplateWindow">
+				<CommandItem id = "MonoDevelop.CSharp.Refactoring.RemoveUnusedImportsCommand"/>
+				<CommandItem id = "MonoDevelop.CSharp.Refactoring.OrganizeImportsCommand"/>
+				<CommandItem id = "MonoDevelop.CSharp.Refactoring.SortAndRemoveImportsCommand"/>
+			</ItemSet>
+		</Condition>
+	</Extension>
+
+	<Extension path = "/MonoDevelop/CSharp/Completion/ContextHandler">
+		<Class class="MonoDevelop.CSharp.Completion.ProtocolMemberContextHandler" />
+	</Extension>
+	
+	<Extension path = "/MonoDevelop/Ide/BraceMatcher">
+		<Class class="MonoDevelop.CSharp.CSharpBraceMatcher" />
+	</Extension>
+	
+	<Extension path = "/MonoDevelop/Ide/ContextMenu/ProjectPad">
+		<Condition id="ItemType" value="ProjectReference|Reference">
+			<CommandItem id = "MonoDevelop.CSharp.Refactoring.FindProjectReferenceUsages" />
+		</Condition>
+	</Extension>
+	
+	<Extension path="/MonoDevelop/Ide/SearchCategories">
+		<Class class="MonoDevelop.CSharp.ProjectSearchCategory" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Refactoring/FindReferencesProvider">
+		<Class class="MonoDevelop.CSharp.Refactoring.CSharpFindReferencesProvider" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Refactoring/JumpToDeclarationHandler">
+		<Class class="MonoDevelop.CSharp.Refactoring.CSharpJumpToDeclarationHandler" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/UnitTesting/NUnitSourceCodeLocationFinder">
+		<Class class="MonoDevelop.CSharp.UnitTests.CSharpNUnitSourceCodeLocationFinder" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/AutoInsertBracketHandler">
+		<Class class="MonoDevelop.CSharp.Features.AutoInsertBracket.CSharpAutoInsertBracketHandler" insertbefore="Default"/>
+	</Extension>
+</ExtensionModel>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/CSharpBinding.csproj b/main/src/addins/CSharpBinding/CSharpBinding.csproj
index 180eb11cbd..7e33495d05 100644
--- a/main/src/addins/CSharpBinding/CSharpBinding.csproj
+++ b/main/src/addins/CSharpBinding/CSharpBinding.csproj
@@ -3,13 +3,13 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>MonoDevelop.CSharpBinding</AssemblyName>
     <RootNamespace>CSharpBinding</RootNamespace>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -52,11 +52,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
@@ -67,11 +62,6 @@
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
@@ -117,19 +107,25 @@
       <Name>Xwt</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\NUnit\MonoDevelop.NUnit.csproj">
-      <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project>
-      <Name>MonoDevelop.NUnit</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj">
       <Project>{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}</Project>
       <Name>ICSharpCode.NRefactory.CSharp.Refactoring</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj">
       <Project>{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}</Project>
       <Name>ICSharpCode.NRefactory.Xml</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\RefactoringEssentials\RefactoringEssentials\RefactoringEssentials.csproj">
+      <Project>{C465A5DC-AD28-49A2-89C0-F81838814A7E}</Project>
+      <Name>RefactoringEssentials</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj">
+      <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project>
+      <Name>MonoDevelop.UnitTesting</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -153,6 +149,34 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Composition.AttributedModel">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Composition.AttributedModel.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="templates\ConsoleProject.xpt.xml">
@@ -191,27 +215,15 @@
     <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\MonoCSharpPolicy.xml">
       <LogicalName>MonoCSharpPolicy.xml</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\SharpDevelopCSharpPolicy.xml">
-      <LogicalName>SharpDevelopCSharpPolicy.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\WhitesmithsCSharpPolicy.xml">
-      <LogicalName>WhitesmithsCSharpPolicy.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\GNUCSharpPolicy.xml">
-      <LogicalName>GNUCSharpPolicy.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Formatting\policies\GNUTextStylePolicy.xml">
-      <LogicalName>GNUTextStylePolicy.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\MonoNameConventionPolicy.xml">
-      <LogicalName>MonoNameConventionPolicy.xml</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="templates\PortableLibrary.xpt.xml">
       <LogicalName>PortableLibrary.xpt.xml</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="templates\SharedAssetsProject.xpt.xml">
       <LogicalName>SharedAssetsProject.xpt.xml</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\MonoNameConventionPolicy.xml">
+      <LogicalName>MonoNameConventionPolicy.xml</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="gtk-gui\generated.cs" />
@@ -222,7 +234,6 @@
     <Compile Include="MonoDevelop.CSharp.Formatting\CSharpFormattingPolicyPanel.cs" />
     <Compile Include="MonoDevelop.CSharp.Formatting\CSharpFormatter.cs" />
     <Compile Include="MonoDevelop.CSharp.Project\CSharpCompilerParameters.cs" />
-    <Compile Include="MonoDevelop.CSharp.Project\CSharpProjectParameters.cs" />
     <Compile Include="MonoDevelop.CSharp.Project\CSharpResourceIdBuilder.cs" />
     <Compile Include="MonoDevelop.CSharp.Project\CodeGenerationPanel.cs" />
     <Compile Include="MonoDevelop.CSharp.Project\CompilerOptionsPanelWidget.cs" />
@@ -230,8 +241,6 @@
     <Compile Include="gtk-gui\MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs" />
     <Compile Include="MonoDevelop.CSharp\CSharpBindingCompilerManager.cs" />
     <Compile Include="MonoDevelop.CSharp\CSharpEnhancedCodeProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp\CSharpLanguageBinding.cs" />
-    <Compile Include="MonoDevelop.CSharp.Resolver\TextEditorResolverProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.Formatting\Indent.cs" />
     <Compile Include="MonoDevelop.CSharp.Formatting\OnTheFlyFormatter.cs" />
     <Compile Include="MonoDevelop.CSharp.Highlighting\HighlightUsagesExtension.cs" />
@@ -248,18 +257,8 @@
     <Compile Include="MonoDevelop.CSharp\CSharpAmbience.cs" />
     <Compile Include="MonoDevelop.CSharp\PathedDocumentTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.CSharp.Completion\CSharpCompletionTextEditorExtension.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\MemberCompletionData.cs">
-      <DependentUpon>IndexerParameterDataProvider.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MonoDevelop.CSharp.Completion\DelegateDataProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpReferenceFinder.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\ConstructorParameterDataProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\MethodParameterDataProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpCodeGenerator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\NewOverrideCompletionData.cs" />
     <Compile Include="MonoDevelop.CSharp.Completion\EventCreationCompletionData.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\VariableCompletionData.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\IndexerParameterDataProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.Refactoring\HelperMethods.cs" />
     <Compile Include="MonoDevelop.CSharp.Parser\CSharpFoldingParser.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\AbstractGenerateAction.cs" />
@@ -277,45 +276,567 @@
     <Compile Include="MonoDevelop.CSharp.Formatting\CSharpIndentVirtualSpaceManager.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\ReadonlyPropertyGenerator.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\RaiseEventMethodGenerator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\ContextActionExtensions.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\MDRefactoringContext.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\Actions\MoveTypeToFile.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\MDRefactoringScript.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NRefactoryCodeIssueSource.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\NRefactoryCodeActionSource.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionRule.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionEditRuleDialog.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionPanel.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionPanelWidget.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\NameConventionPolicy.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\NRefactoryCodeActionProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NRefactoryIssueProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\NRefactoryCodeAction.cs" />
     <Compile Include="MonoDevelop.CSharp.Tooltips\LanguageItemTooltipProvider.cs" />
     <Compile Include="MonoDevelop.CSharp\AstAmbience.cs" />
     <Compile Include="MonoDevelop.CSharp\AstStockIcons.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\AbstractParameterDataProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.Highlighting\CSharpSelectionSurroundingProvider.cs" />
     <Compile Include="MonoDevelop.CSharp\SignatureMarkupCreator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\ArrayTypeParameterDataProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\ImplementInterfaceMembersGenerator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\TypeParameterDataProvider.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\Actions\ConvertToEnumAction.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeActions\Actions\ConvertToEnumDialog.cs" />
     <Compile Include="MonoDevelop.CSharp.UnitTests\UnitTestTextEditorExtension.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\BaseNRefactoryIssueProvider.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\PartialGenerator.cs" />
     <Compile Include="AddinInfo.cs" />
-    <Compile Include="MonoDevelop.CSharp.Refactoring.CodeIssues\Issues\MonoTODOIssue.cs" />
     <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpCodeGenerationService.cs" />
     <Compile Include="MonoDevelop.CSharp.CodeGeneration\ExportCodeGenerator.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\MonoCSharpCompletionEngine.cs" />
-    <Compile Include="MonoDevelop.CSharp.Completion\ProtocolCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Project\CSharpProjectExtension.cs" />
+    <Compile Include="MonoDevelop.CSharp.Project\PortableCSharpProjectFlavor.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynSymbolCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynCodeCompletionFactory.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynParameterHintingFactory.cs" />
+    <Compile Include="MonoDevelop.CSharp.ClassOutline\CSharpOutlineTextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.CSharp.ClassOutline\OutlineSortingPreferencesDialog.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.cs" />
+    <Compile Include="MonoDevelop.CSharp.ClassOutline\OutlineSettings.cs" />
+    <Compile Include="MonoDevelop.CSharp.ClassOutline\OutlineNodeComparer.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\ProtocolCompletionData.cs">
+      <DependentUpon>ProtocolMemberContextHandler.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MonoDevelop.CSharp.Formatting\CSharpTextPasteHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\CreateOverrideCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\CreatePartialCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Resolver\TextEditorResolverProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Parser\CSharpParsedDocument.cs" />
+    <Compile Include="MonoDevelop.CSharp.Resolver\DebuggerExpressionResolver.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\ImportSymbolCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\ProtocolMemberContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\AnonymousMethodCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\ObjectCreationCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\CastCompletionData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynCompletionData.cs" />
+    <Compile Include="MonoDevelop.JSon\JSonIndentationTracker.cs" />
+    <Compile Include="MonoDevelop.JSon\JSonIndentEngine.cs" />
+    <Compile Include="MonoDevelop.JSon\JSonTextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\ExtractMethodCommandHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\RefactoryCommands.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\AddImport\CSharpAddImportCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\AddImport\AbstractAddImportCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\FullyQualify\CSharpFullyQualifyCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\PredefinedCodeFixProviderNames.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\Async\CSharpConvertToAsyncMethodCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\Async\CSharpAddAwaitCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\Async\CSharpAddAsyncCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\Async\AbstractAsyncCodeFix.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\MoveTypeToFile\MoveTypeToFile.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\GotoDeclarationHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateConstructor\GenerateConstructorCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateConstructor\AbstractGenerateMemberCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateEnumMember\GenerateEnumMemberCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateMethod\GenerateConversionCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateMethod\GenerateMethodCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateVariable\GenerateVariableCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\ImplementAbstractClass\ImplementAbstractClassCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\ImplementInterface\ImplementInterfaceCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Completion\RoslynCompletionCategory.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\IntroduceVariable\IntroduceVariableCodeRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\PredefinedCodeRefactoringProviderNames.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\InlineTemporary\InlineTemporaryCodeRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\InlineTemporary\InlineTemporaryCodeRefactoringProvider.InitializerRewriter.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\InlineTemporary\InlineTemporaryCodeRefactoringProvider.ReferenceRewriter.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\ExtractMethod\ExtractMethodCodeRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\GenerateType\GenerateTypeCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\DiagnosticCustomTags.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\IDEDiagnosticIds.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\SimplifyTypeNames\SimplifyTypeNamesCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\SimplifyTypeNames\SimplifyTypeNamesCodeFixProvider.SimplifyTypeNamesFixAllProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryUsings\RemoveUnnecessaryUsingsCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryCast\RemoveUnnecessaryCastDiagnosticAnalyzerBase.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryCast\CSharpRemoveUnnecessaryCastDiagnosticAnalyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryImports\RemoveUnnecessaryImportsDiagnosticAnalyzerBase.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryImports\CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\SimplifyTypeNames\SimplifyTypeNamesDiagnosticAnalyzerBase.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\SimplifyTypeNames\CSharpSimplifyTypeNamesDiagnosticAnalyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryCast\RemoveUnnecessaryCastCodeFixProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryCast\RemoveUnnecessaryCastCodeFixProvider.RemoveUnnecessaryCastFixAllProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\MonoTODO\MonoTODODiagnosticAnalyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\ConvertToEnum\ConvertToEnumDialog.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionEditRuleDialog.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionPanel.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionPanelWidget.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionPolicy.cs" />
+    <Compile Include="MonoDevelop.CSharp.Diagnostics\InconsistentNaming\NameConventionRule.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget.cs" />
+    <Compile Include="gtk-gui\MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpFeaturesTextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\RenameHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\FindReferencesHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\GotoBaseDeclarationHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\CodeGenerationService.cs" />
+    <Compile Include="MonoDevelop.CSharp\CSharpBraceMatcher.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\FindProjectReferenceUsagesHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateFromMembers\GenerateConstructor\AbstractGenerateConstructorService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateFromMembers\GenerateConstructor\CSharpGenerateConstructorService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateFromMembers\GenerateConstructor\GenerateConstructorResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateFromMembers\AbstractCodeRefactoringResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateFromMembers\AbstractGenerateFromMembersService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateFromMembers\GenerateFromMembersHelpers.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateConstructor\AbstractGenerateConstructorService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateConstructor\CSharpGenerateConstructorService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateConstructor\GenerateConstructorHelpers.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateDefaultConstructors\AbstractGenerateDefaultConstructorsService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateDefaultConstructors\CSharpGenerateDefaultConstructorsService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateDefaultConstructors\GenerateDefaultConstructorsResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateEnumMember\AbstractGenerateEnumMemberService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateEnumMember\CSharpGenerateEnumMemberService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateParameterizedMember\AbstractGenerateConversionService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateParameterizedMember\AbstractGenerateMethodService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateParameterizedMember\AbstractGenerateParameterizedMemberService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateParameterizedMember\CSharpCommonGenerationServiceMethods.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateParameterizedMember\CSharpGenerateConversionService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateParameterizedMember\CSharpGenerateMethodService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateParameterizedMember\CSharpGenerateParameterizedMemberService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateParameterizedMember\MethodGenerationKind.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateVariable\AbstractGenerateVariableService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\GenerateVariable\CSharpGenerateVariableService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\AbstractCodeRefactoringResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateMember\AbstractGenerateMemberService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateType\AbstractGenerateTypeService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateType\CSharpGenerateTypeService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateType\GenerateTypeDialogOptions.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateType\GenerateTypeOptionsResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GenerateType\TypeKindOptions.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GotoDefinition\GotoDefinitionHelpers.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\GotoDefinition\GotoDefinitionService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementAbstractClass\AbstractImplementAbstractClassService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementAbstractClass\AbstractImplementAbstractClassService.Editor.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementAbstractClass\AbstractImplementAbstractClassService.State.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementAbstractClass\CSharpImplementAbstractClassService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementInterface\AbstractImplementInterfaceService.CodeAction.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementInterface\AbstractImplementInterfaceService.CodeAction_Conflicts.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementInterface\AbstractImplementInterfaceService.CodeAction_Method.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementInterface\AbstractImplementInterfaceService.CodeAction_Property.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementInterface\AbstractImplementInterfaceService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementInterface\AbstractImplementInterfaceService.DisposePatternCodeAction.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementInterface\AbstractImplementInterfaceService.State.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ImplementInterface\CSharpImplementInterfaceService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IndentEngine\CacheIndentEngine.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IndentEngine\CSharpIndentEngine.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IndentEngine\IDocumentIndentEngine.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IndentEngine\IndentState.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IndentEngine\IStateMachineIndentEngine.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IndentEngine\ITextPasteHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IndentEngine\NullIStateMachineIndentEngine.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IndentEngine\TextPasteIndentEngine.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.AbstractIntroduceVariableCodeAction.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.CodeAction.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.IntroduceVariableAllOccurrenceCodeAction.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.State.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.State_Attribute.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.State_Block.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.State_ConstructorInitializer.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.State_Field.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.State_Parameter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\AbstractIntroduceVariableService.State_Query.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\CSharpIntroduceVariableService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\CSharpIntroduceVariableService.Rewriter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\CSharpIntroduceVariableService_IntroduceField.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\CSharpIntroduceVariableService_IntroduceLocal.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\CSharpIntroduceVariableService_IntroduceQueryLocal.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\IntroduceVariable\IntroduceVariableResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\OrganizeImports\CSharpOrganizeImportsService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\OrganizeImports\CSharpOrganizeImportsService.Rewriter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ParameterHinting\IParameterHintingData.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ParameterHinting\IParameterHintingDataFactory.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ParameterHinting\ParameterHintingEngine.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ParameterHinting\ParameterHintingResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ParameterHinting\ParameterUtil.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\RemoveUnnecessaryImports\CSharpRemoveUnnecessaryImportsService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\RemoveUnnecessaryImports\CSharpRemoveUnnecessaryImportsService.Rewriter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\SemanticHighlighting\SemanticHighlightingVisitor.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Formatter\CommonFormattingHelpers.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Formatter\CSharpEditorFormattingService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Formatter\FormattingHelpers.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Formatter\FormattingOptionsFactory.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Formatter\FormattingRangeHelper.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Formatter\Indent.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpExtractMethodService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.Analyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.CSharpCodeGenerator.CallSiteContainerRewriter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.CSharpCodeGenerator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.CSharpCodeGenerator.ExpressionCodeGenerator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.CSharpCodeGenerator.MultipleStatementsCodeGenerator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.CSharpCodeGenerator.SingleStatementCodeGenerator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.FormattingProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.PostProcessor.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpMethodExtractor.TriviaResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpSelectionResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpSelectionResult.ExpressionResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpSelectionResult.StatementResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpSelectionValidator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpSelectionValidator.Validator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpSyntaxTriviaService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\CSharpSyntaxTriviaServiceFactory.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\CSharp\Extensions.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\AbstractExtractMethodService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\AbstractSyntaxTriviaService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\AbstractSyntaxTriviaService.Result.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\Enums.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\Extensions.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\ExtractMethodMatrix.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\ExtractMethodOptions.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\ExtractMethodResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\ExtractMethodService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\FailedExtractMethodResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\IExtractMethodService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\InsertionPoint.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\ISyntaxTriviaService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.Analyzer.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.Analyzer.SymbolMapBuilder.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.AnalyzerResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.CodeGenerator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.GeneratedCode.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.TriviaResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.TypeParameterCollector.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.VariableInfo.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\MethodExtractor.VariableSymbol.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\OperationStatus.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\OperationStatus_Statics.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\OperationStatus`1.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\ParameterStyle.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\ReturnStyle.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\SelectionResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\SelectionValidator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\SelectionValidator.NullSelectionResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\SimpleExtractMethodResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\UniqueNameGenerator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\ExtractMethod\VariableStyle.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\AttributeNamedParameterContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\AbstractKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\AbstractSyntacticSingleKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\AddKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\AliasKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\AscendingKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\AsKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\AssemblyKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\AsyncKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\AwaitKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\BaseKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\BoolKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\BreakKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ByKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ByteKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\CaseKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\CatchKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\CharKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\CheckedKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ChecksumKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ClassKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ConstKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ContinueKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\DecimalKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\DefaultKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\DefineKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\DelegateKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\DescendingKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\DisableKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\DoKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\DoubleKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\DynamicKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ElifKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ElseKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\EndIfKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\EndRegionKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\EnumKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\EqualsKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ErrorKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\EventKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ExplicitKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ExternKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\FalseKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\FieldKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\FinallyKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\FixedKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\FloatKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ForEachKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ForKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\FromKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\GetKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\GlobalKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\GotoKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\GroupKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\HiddenKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\IfKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ImplicitKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\InKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\InterfaceKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\InternalKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\IntKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\IntoKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\IsKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\JoinKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\LetKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\LineKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\LockKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\LongKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\MethodKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ModuleKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\NameOfKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\NamespaceKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\NewKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\NullKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ObjectKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\OnKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\OperatorKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\OrderByKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\OutKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\OverrideKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ParamKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ParamsKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\PartialKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\PragmaKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\PrivateKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\PropertyKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ProtectedKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\PublicKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ReadOnlyKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ReferenceKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\RefKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\RegionKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\RemoveKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\RestoreKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ReturnKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\SByteKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\SealedKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\SelectKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\SetKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ShortKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\SizeOfKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\StackAllocKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\StaticKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\StringKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\StructKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\SwitchKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ThisKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ThrowKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\TrueKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\TryKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\TypeKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\TypeOfKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\TypeVarKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\UIntKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\ULongKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\UncheckedKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\UndefKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\UnsafeKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\UShortKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\UsingKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\VarKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\VirtualKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\VoidKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\VolatileKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\WarningKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\WhenKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\WhereKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\WhileKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\KeywordRecommender\YieldKeywordRecommender.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\CompletionContext.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\CompletionEngine.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\CompletionResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\CompletionTriggerInfo.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\CompletionTriggerReason.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\EditorBrowsableBehavior.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ICompletionDataFactory.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\CastCompletionContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\CompletionContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\DelegateCreationContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\EnumMemberContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\ExplicitInterfaceContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\ExternAliasContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\FormatItemContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\KeywordContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\NamedParameterContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\ObjectCreationContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\ObjectInitializerContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\OverrideContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\PartialContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\PreProcessorExpressionContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\RoslynRecommendationsCompletionContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\SenderCompletionContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\SnippetContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\SpeculativeNameContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\SpeculativeTContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\XmlDocCommentContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp\DeclaredSymbolInfo.cs" />
+    <Compile Include="MonoDevelop.CSharp\ProjectSearchCategory.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\CodeGeneration\CodeGenerationDestination.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\CodeGeneration\CodeGenerationHelpers.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\CodeGeneration\CodeGenerationOptions.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\CodeGeneration\CodeGenerationTypeParameterSymbol.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\CodeGeneration\CodeGenerator.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\CodeGeneration\CSharpCodeGenerationService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\CodeGeneration\SyntaxAnnotationExtensions.cs" />
+    <Compile Include="Util\7BitEncodedInts.cs" />
+    <Compile Include="Util\AnnotationTable.cs" />
+    <Compile Include="Util\ArgumentSyntaxExtensions.cs" />
+    <Compile Include="Util\CastExpressionSyntaxExtensions.cs" />
+    <Compile Include="Util\CloneableStack.cs" />
+    <Compile Include="Util\CodeFixContextExtensions.cs" />
+    <Compile Include="Util\CodeGenerationSymbolFactory.cs" />
+    <Compile Include="Util\CodeRefactoringContextExtensions.cs" />
+    <Compile Include="Util\CommonAccessibilityUtilities.cs" />
+    <Compile Include="Util\CommonLocationExtensions.cs" />
+    <Compile Include="Util\CommonSyntaxNodeOrTokenExtensions.cs" />
+    <Compile Include="Util\CompilationExtensions.cs" />
+    <Compile Include="Util\CompilationUnitSyntaxExtensions.cs" />
+    <Compile Include="Util\CrefSyntaxExtensions.cs" />
+    <Compile Include="Util\CSharpSemanticFactsService.cs" />
+    <Compile Include="Util\CSharpSyntaxContext.cs" />
+    <Compile Include="Util\CSharpSyntaxFactsService.cs" />
+    <Compile Include="Util\CSharpUtil.cs" />
+    <Compile Include="Util\DocumentExtensions.cs" />
+    <Compile Include="Util\EnumerableExtensions.cs" />
+    <Compile Include="Util\EnumValueUtilities.cs" />
+    <Compile Include="Util\ExpressionSyntaxExtensions.cs" />
+    <Compile Include="Util\FastSerializer.cs" />
+    <Compile Include="Util\FindTokenHelper.cs" />
+    <Compile Include="Util\FormatStringHelper.cs" />
+    <Compile Include="Util\GeneratedCodeRecognitionService.cs" />
+    <Compile Include="Util\Hash.cs" />
+    <Compile Include="Util\HelpLink.cs" />
+    <Compile Include="Util\IAssemblySymbolExtensions.cs" />
+    <Compile Include="Util\ICodeDefinitionFactoryExtensions.cs" />
+    <Compile Include="Util\ICompilationExtensions.cs" />
+    <Compile Include="Util\IDictionaryExtensions.cs" />
+    <Compile Include="Util\IDocumentExtensions.cs" />
+    <Compile Include="Util\IMethodSymbolExtensions.cs" />
+    <Compile Include="Util\ImmutableArrayExtensions.cs" />
+    <Compile Include="Util\INamedTypeSymbolExtensions.cs" />
+    <Compile Include="Util\INamespaceOrTypeSymbolExtensions.cs" />
+    <Compile Include="Util\IParameterSymbolExtensions.cs" />
+    <Compile Include="Util\IPropertySymbolExtensions.cs" />
+    <Compile Include="Util\ISymbolExtensions.cs" />
+    <Compile Include="Util\ITypeParameterSymbolExtensions.cs" />
+    <Compile Include="Util\ITypeSymbolExtensions.cs" />
+    <Compile Include="Util\LinkedListExtension.cs" />
+    <Compile Include="Util\Matcher.cs" />
+    <Compile Include="Util\MemberDeclarationSyntaxExtensions.cs" />
+    <Compile Include="Util\NameGenerator.cs" />
+    <Compile Include="Util\NamespaceDeclarationSyntaxExtensions.cs" />
+    <Compile Include="Util\NameSyntaxComparer.cs" />
+    <Compile Include="Util\NameSyntaxExtensions.cs" />
+    <Compile Include="Util\NRefactory6Host.cs" />
+    <Compile Include="Util\ObjectExtensions.cs" />
+    <Compile Include="Util\PredefinedOperator.cs" />
+    <Compile Include="Util\QueryExpressionSyntaxExtensions.cs" />
+    <Compile Include="Util\RefactoringHelpers.cs" />
+    <Compile Include="Util\ReferenceComparer.cs" />
+    <Compile Include="Util\ReflectionCompatibilityExtensions.cs" />
+    <Compile Include="Util\SemanticDocument.cs" />
+    <Compile Include="Util\SemanticEquivalence.cs" />
+    <Compile Include="Util\SemanticMap.cs" />
+    <Compile Include="Util\SemanticModelExtensions.cs" />
+    <Compile Include="Util\SignatureComparer.cs" />
+    <Compile Include="Util\SimpleNameSyntaxExtensions.cs" />
+    <Compile Include="Util\SourceTextExtensions.cs" />
+    <Compile Include="Util\SpecializedCollections.cs" />
+    <Compile Include="Util\SpeculationAnalyzer.cs" />
+    <Compile Include="Util\StringExtensions.cs" />
+    <Compile Include="Util\StringPclExtensions.cs" />
+    <Compile Include="Util\SymbolEquivalenceComparer.cs" />
+    <Compile Include="Util\SymbolExtensions.cs" />
+    <Compile Include="Util\SymbolInfoExtensions.cs" />
+    <Compile Include="Util\SymbolKeyExtensions.cs" />
+    <Compile Include="Util\SymbolKeyResolutionExtensions.cs" />
+    <Compile Include="Util\SyntacticDocument.cs" />
+    <Compile Include="Util\SyntaxContext.cs" />
+    <Compile Include="Util\SyntaxExtensions.cs" />
+    <Compile Include="Util\SyntaxKindSet.cs" />
+    <Compile Include="Util\SyntaxListExtension.cs" />
+    <Compile Include="Util\SyntaxNodeExtensions.cs" />
+    <Compile Include="Util\SyntaxTokenExtensions.cs" />
+    <Compile Include="Util\SyntaxTreeExtensions.cs" />
+    <Compile Include="Util\SyntaxTriviaExtensions.cs" />
+    <Compile Include="Util\SyntaxTriviaListExtensions.cs" />
+    <Compile Include="Util\TaskExtensions.cs" />
+    <Compile Include="Util\TextLineExtension.cs" />
+    <Compile Include="Util\TokenComparer.cs" />
+    <Compile Include="Util\TypeDeclarationSyntaxExtensions.cs" />
+    <Compile Include="Util\TypeExtensions.cs" />
+    <Compile Include="Util\TypeGenerator.cs" />
+    <Compile Include="Util\TypeSyntaxComparer.cs" />
+    <Compile Include="Util\TypeSyntaxExtensions.cs" />
+    <Compile Include="Util\UsingsAndExternAliasesDirectiveComparer.cs" />
+    <Compile Include="Util\UsingsAndExternAliasesOrganizer.cs" />
+    <Compile Include="Util\ValueTuple.cs" />
+    <Compile Include="Util\ValueTuple`2.cs" />
+    <Compile Include="Util\WordParser.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\CodeRefactoring.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\CSharpSyntaxContext.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\TypeGuessing.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\Resources.cs" />
+    <Compile Include="MonoDevelop.CSharp\CSharpNavigationTextEditorExtension.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\EncapsulateField\AbstractEncapsulateFieldRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\EncapsulateField\AbstractEncapsulateFieldService.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\EncapsulateField\EncapsulateFieldCodeAction.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\EncapsulateField\EncapsulateFieldResult.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\EncapsulateField\EncapsulateFieldCodeRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeFixes\EncapsulateField\AbstractEncapsulateFieldRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\EncapsulateField\CSharpEncapsulateFieldService.cs" />
+    <Compile Include="Util\ConflictResolver.cs" />
+    <Compile Include="Util\AccessibilityUtilities.cs" />
+    <Compile Include="Util\Glyph.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\Completion\ContextHandler\RegexContextHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpFindReferencesProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\CSharpJumpToDeclarationHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.UnitTests\CSharpNUnitSourceCodeLocationFinder.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\CSharpAutoInsertBracketHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\AbstractTokenBraceCompletionSession.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\Sessions\BracketCompletionSession.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\Sessions\CharLiteralCompletionSession.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\Sessions\CurlyBraceCompletionSession.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\Sessions\InterpolatedStringCompletionSession.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\Sessions\LessAndGreaterThanCompletionSession.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\Sessions\ParenthesisCompletionSession.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\Sessions\StringLiteralCompletionSession.cs" />
+    <Compile Include="MonoDevelop.CSharp.Features\AutoInsertBracket\Sessions\InterpolationCompletionSession.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\AbstractAsyncHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\AsyncAnonymousMethodHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\AsyncMethodHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\AsyncParenthesizedLambdaHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\AsyncSimpleLambdaHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\AwaitHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\CheckedExpressionHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\CheckedStatementHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\ConditionalPreprocessorHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\IfStatementHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\LockStatementHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\LoopHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\RegionHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\ReturnStatementHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\SwitchStatementHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\TryStatementHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\UnsafeStatementHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\UsingStatementHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\YieldStatementHighlighter.cs" />
+    <Compile Include="MonoDevelop.CSharp.Highlighting\AbstractKeywordHighlighter.cs" />
+    <Compile Include="Util\DirectiveSyntaxExtensions.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\OrganizeImportsCommandHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.CodeRefactorings\UsingRefactorings\SortImportsCodeRefactoringProvider.cs" />
+    <Compile Include="MonoDevelop.CSharp.Navigation\FindMemberOverloadsHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Navigation\FindExtensionMethodsHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Navigation\FindDerivedSymbolsHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Navigation\FindBaseSymbolsHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Navigation\FindImplementingMembersHandler.cs" />
+    <Compile Include="MonoDevelop.CSharp.Refactoring\ConstructFixer.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
+    <None Include="MonoDevelop.CSharp.Completion\MethodParameterDataProvider.cs" />
+    <None Include="MonoDevelop.CSharp.Completion\ConstructorParameterDataProvider.cs" />
+    <None Include="MonoDevelop.CSharp.Completion\ArrayTypeParameterDataProvider.cs" />
+    <None Include="MonoDevelop.CSharp.Completion\AbstractParameterDataProvider.cs" />
+    <None Include="MonoDevelop.CSharp.CodeRefactorings\ConvertToEnum\ConvertToEnumCodeRefactoringProvider.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -329,13 +850,42 @@
     <Folder Include="MonoDevelop.CSharp.Completion\" />
     <Folder Include="MonoDevelop.CSharp.CodeGeneration\" />
     <Folder Include="MonoDevelop.CSharp.Formatting\policies\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeActions\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeActions\Actions\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeIssues\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeIssues\NamingInspection\" />
     <Folder Include="MonoDevelop.CSharp.Tooltips\" />
     <Folder Include="MonoDevelop.CSharp.UnitTests\" />
-    <Folder Include="MonoDevelop.CSharp.Refactoring.CodeIssues\Issues\" />
     <Folder Include="icons\" />
+    <Folder Include="MonoDevelop.CSharp.ClassOutline\" />
+    <Folder Include="MonoDevelop.CSharp.NRefactoryWrapper\" />
+    <Folder Include="MonoDevelop.JSon\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\AddImport\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\FullyQualify\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\Async\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\MoveTypeToFile\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateConstructor\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateEnumMember\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateMethod\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateVariable\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\ImplementAbstractClass\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\ImplementInterface\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\IntroduceVariable\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\InlineTemporary\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\ExtractMethod\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\GenerateType\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\SimplifyTypeNames\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryUsings\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryCast\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\RemoveUnnecessaryImports\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\SimplifyTypeNames\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\RemoveUnnecessaryCast\" />
+    <Folder Include="MonoDevelop.CSharp.Diagnostics\MonoTODO\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\ConvertToEnum\" />
+    <Folder Include="MonoDevelop.CSharp.CodeFixes\EncapsulateField\" />
+    <Folder Include="MonoDevelop.CSharp.Features\AutoInsertBracket\" />
+    <Folder Include="MonoDevelop.CSharp.Features\AutoInsertBracket\Sessions\" />
+    <Folder Include="MonoDevelop.CSharp.Highlighting\KeywordHighlighters\" />
+    <Folder Include="MonoDevelop.CSharp.CodeRefactorings\UsingRefactorings\" />
+    <Folder Include="MonoDevelop.CSharp.Navigation\" />
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/CSharpBinding/ChangeLog b/main/src/addins/CSharpBinding/ChangeLog
deleted file mode 100644
index 348d98119a..0000000000
--- a/main/src/addins/CSharpBinding/ChangeLog
+++ /dev/null
@@ -1,8899 +0,0 @@
-2010-07-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs: Used
-	  fast text search.
-
-2010-07-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 625064 - Internal classes aren't suggested for
-	  completion'.
-
-2010-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  fixed highlight usages extension.
-
-2010-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  No longer transform the editor contents to text when using
-	  the expression finder - the expression finder now uses the
-	  text editor directly.
-
-2010-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: Added
-	  check for #else span.
-
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Refactoring/CSharpRefactorer.cs:
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Worked on text edior performance issues / needed to
-	  restructure the resolver/member reference collector a bit.
-
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs: Don't parse
-	  method bodies for the MonoDevelop dom (skipping these is
-	  much faster & more memory efficient).
-
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: Track
-	  API changes.
-
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs: Updated to new
-	  mcs.
-
-2010-07-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  'Bug 623308 - ArgumentOutOfRangeException after typing ( for
-	  method params'.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs:
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs:
-	* MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Track API changes.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryIndexerParameterDataProvider.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryTemplateParameterDataProvider.cs:
-	  Track API changes.
-
-2010-07-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: Track
-	  API changes.
-
-2010-07-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs:
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	  Track API changes.
-
-2010-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryIndexerParameterDataProvider.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryTemplateParameterDataProvider.cs:
-	  Worked on 'Bug 621658 - Parameter hints disappear
-	  afterkeystroke'.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpBinding.addin.xml:
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs:
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	  Track ProjectDomService/Parser API.
-
-2010-07-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs:
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	  Enhanced support for keyword like names.
-
-2010-07-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Completion/DropDownBoxListWindow.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	  Worked on version control gui.
-
-2010-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngineStack.cs:
-	  added bounds check
-
-2010-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngineStack.cs:
-	  added bounds check
-
-2010-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngineStack.cs:
-	  Indenting should now reflect the mono style.
-
-2010-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngineStack.cs:
-	  Indenting should now reflect the mono style.
-
-2010-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Worked on region box.
-
-2010-07-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Region combo is now separated from the rest of the path.
-
-2010-07-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed 'Bug
-	  615992 - Intellisense broken when calling generic method.'.
-
-2010-07-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 619799 - Renaming variable also invokes
-	  auto-complete'.
-
-2010-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs:
-	* MonoDevelop.CSharp.Completion/DropDownBoxListWindow.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Worked on quick navigation bar
-
-2010-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Improved handling of inner classes.
-
-2010-07-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Completion/DropDownBoxListWindow.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  C# editor extension now uses the IPathedDocument subsystem.
-
-2010-07-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 618676 - C# code editor removes "override" word
-	  after choosing one of intellisense variants'.
-
-2010-06-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs: Added support for
-	  fixed fields & constants.
-
-2010-06-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs: Fields are now
-	  working.
-
-2010-06-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Submitted patch from Tom Spink <tspink@gmail.com>: Update to
-	  generic code completion
-
-2010-06-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs: fixed
-	  bug in abstract member overriding.
-
-2010-06-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	  Added bounds check.
-
-2010-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Only update changed lines.
-
-2010-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	  Fixed 'Bug 615988 - Go to declaration not available on
-	  generic methods'.
-
-2010-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 615983 - Refactoring does not include object
-	  initializers'.
-
-2010-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/DestructorDeclaration.cs:
-	  Worked on C# parser.
-
-2010-06-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs: Updated parser to
-	  Marek's new LocationsBag/latest mcs changes.
-
-2010-06-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.xml:
-	  Removed 'DoNotChange' option - will be availble with the
-	  next gen formatter (fixes Bug 615763 - C# code formatting
-	  throws exception when choosing "Do not change" from menu).
-
-2010-06-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 615702 - In-place variable renaming can't rename
-	  foreach loop variables'.
-
-2010-06-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	  Worked on new parser/formatter.
-
-2010-06-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	  Fixed 'Bug 615182 - Tooltip sometimes stays up too long'.
-
-2010-06-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	  Remove debug writelines.
-
-2010-06-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Optimized performance.
-
-2010-06-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Respect UTF-8 coordinates in highlight usages extension.
-
-2010-06-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed unit test.
-
-2010-06-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 614045 - Types hidden by members are not
-	  formatted properly by ambience'.
-
-2010-06-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs: Track
-	  api changes.
-
-2010-06-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  update line when removing marker.
-
-2010-06-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Fix build.
-
-2010-06-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	  Track API. Fix region offset.
-
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs: Track
-	  API. Include both body regions for properties.
-
-2010-06-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs: Track
-	  API. Emit regions for members.
-
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	  Use body regions to select body or place caret, and to
-	  remove generated body when GenerateBody is false.
-
-2010-06-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs: Fix
-	  property getter in overrides.
-
-2010-06-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/ConsoleProject.xpt.xml: Set the external console
-	  flag for console projects.
-
-2010-06-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: Track
-	  API changes.
-
-2010-06-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	  Fixed LINQ resolve error.
-
-2010-06-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs: handled other case
-	  of unresolveable types.
-
-2010-06-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs: make it clearer
-	  that the type can't be resolved.
-
-2010-06-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Handled
-	  unresolved return types
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs:
-	  Corrected base call.
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs:
-	  Corrected type name output.
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs:
-	  Removed some code duplication.
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Refactoring/CodeGenerator.cs:
-	* MonoDevelop.CSharp.Refactoring/CSharpRefactorer.cs:
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs:
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	  Code generator get's now used by code completion auto
-	  generation & insert code feature.
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs:
-	  Worked on code generation.
-
-2010-06-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* MonoDevelop.CSharp.Refactoring/CodeGenerator.cs:
-	* MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs:
-	  Worked on c# code generation.
-
-2010-06-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: Fixed
-	  'Bug 610241 - #elif Coloring Messed'.
-
-2010-05-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Worked on highight usage extensions & Bug 610048 - Sometimes
-	  symbol highlight is not cleared.
-
-2010-05-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Handled multiple type overloads.
-
-2010-05-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 610011 - Extension methods incorrectly trump real
-	  members'.
-
-2010-05-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed 'Bug
-	  610006 - Intellisense gives members of return type of
-	  functions even when that function isn't invoked'.
-
-2010-05-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 609999 - Intellisense confuses Array initializers
-	  with object initializers'.
-
-
-2010-05-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs: Fixed
-	  'Bug 608910 - Getting a "File not found" exception in
-	  monodevelop that doesn't allow me to build :('.
-
-2010-05-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 609528 - No Intellisense for LINQ join'.
-
-2010-05-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 600624 - Property initializer completion
-	  unreliable'.
-
-2010-05-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Track API changes.
-
-2010-05-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs: UseFullName flag
-	  works now for members.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fix grammar.
-
-2010-05-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed local lookup for ASP.NET.
-
-2010-05-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Disabled paste formatting (Bug 606041 - Additional blank
-	  line after every text line then text is pasted from
-	  clipboard).
-
-2010-05-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Fixed 'Bug 606884 - Control-enter in doc comments doesn't
-	  prefix the new line'.
-
-2010-05-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Fixed
-	  'Bug 606959 - switch case completion doesn't handle
-	  namespaces properly'.
-
-2010-05-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Completion/CompletionTextLinkMode.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	  Implemented request in 'Bug 607366 - Text link mode can
-	  break texteditor badly'.
-
-2010-05-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Improved semicolon auto placement.
-
-2010-05-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 534680 - LINQ keywords missing from
-	  Intellisense'.
-
-2010-05-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs: Fixed 'Bug 606506
-	  - Types of fields are not shown'
-
-2010-05-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	  Fixed 'Bug 606212 - Allow delegate renaming straight after
-	  creation'.
-
-2010-05-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Implemented 'Bug 606227 - Search reodering not available for
-	  "override" completions.'.
-
-
-2010-05-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Unsubscribe editor events.
-
-2010-05-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  catch exception in highighit usages extension.
-
-2010-05-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Fixed 'Bug 606217 - Auto-placed semi-colon doesn't take
-	  account of comments'
-
-2010-05-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 606048 - Parameter insight re-shows on every
-	  newline even when disabled'.
-
-2010-05-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed 'Bug
-	  605235 - Inaccessible functions do not show "Goto
-	  Declaration" in context menu'.
-
-2010-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 604593 - Autocomplete list sorting wrong when
-	  grouping by class.'.
-
-2010-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	  fixed 'Bug 605134 - NRE when using (an abstract class ctor?)
-	  MulticastDelegate ctor'.
-
-2010-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Added some bounds checking.
-
-2010-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Set
-	  obsolete flag for obsolete members.
-
-2010-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Implemented 'Bug 605009 - Control-shift-up/down do not work
-	  until highlight triggers'.
-
-2010-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Fixed 'Bug 605008 - Weird symbol highlighting'.
-
-2010-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  set text editor for the resolver.
-
-2010-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs:
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	  Track API changes.
-
-2010-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/QueryExpression.cs: Fixed
-	  compile warnings.
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Optimized highlight usages extension & find member visitor.
-
-2010-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightCSharpSemanticRule.cs:
-	  Fixed 'Bug 604558 - Wrong code syntax highlighting when
-	  previous line have a comment'.
-
-2010-05-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Fixed 'Bug 603971 - Symbol highlight combined with search
-	  highlight looks ugly'.
-
-2010-05-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 603733 - Pressing '!' with the autocomplete
-	  window open breaks'.
-
-2010-05-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  speed up the findmemberastvisitor.
-
-2010-05-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Only re-indent if there is need.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Make use of the new Document.Dom property.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	  Fixed 'Bug 603282 - Autogenerated method name is invalid'.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  fixed 'Bug 603344 - Matching in completion list'.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  fixed find member references for local variables.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  local variable off by 1 error.
-
-2010-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* templates/GladeSharp2Project.xpt.xml:
-	* templates/GnomeSharp2Project.xpt.xml:
-	* templates/GtkSharp2ProjectMac.xpt.xml: Remove deprecated
-	  Gnome# and Glade# project types, and add a Mac-specific GTK
-	  template that doesn't use Stetic.
-
-2010-05-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Fixed
-	  'Bug 596609 - Parameters tooltips not escaping generics in
-	  markup'.
-
-2010-05-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	  Dispose the lexer after use.
-
-2010-05-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoCSharpPolicy.xml: Added attribute to explicitly allow
-	  differential serialization for a policy (which is disabled
-	  by default).
-
-2010-05-03  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBinding.addin.xml: Set mac shortcut.
-
-2010-05-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Fixed 'Bug 601436 - Command to cycle through highlighted
-	  references'.
-
-2010-05-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed 'Bug
-	  601350 - Null ref in highlighting/tooltips'.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 600994 - Method highlight should match all
-	  methods of the generic class'.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Fixed 'Bug 601028 - Move line reindenting flattens indents'.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 601007 - Error in highlight usages extension.'.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  fixed 'Bug 601021 - Identifier highlighting assumes
-	  constructors but draws box incorrectly'.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: fixed
-	  'Bug 601169 - IntelliSense ignores inner classes'.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs:
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	  fixed 'Bug 600617 - Generic params in override completion
-	  are doubly escaped'.
-
-2010-04-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp.Formatting\CSharpFormatter.cs: Use the
-	  correct EOL marker.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Track
-	  API changes.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  fixed 'Bug 600273 - as/is completion too restrictive'.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  fixed 'Bug 599632 – Completion list should be in suggest
-	  mode for generic parameter declaration'.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CodeGenerator.cs: Fixed 'Bug
-	  599627 - Implement implicit interface generated wrong code'.
-
-2010-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: fixed
-	  code completion issue.
-
-2010-04-26  Mike Krüger  <mkrueger@novell.com>
-
-	* templates/GladeSharp2Project.xpt.xml:
-	* templates/GnomeSharp2Project.xpt.xml: Fixed some templates.
-
-2010-04-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Fixed 'Bug 598831 - Symbol highlight should not activate
-	  while there is a selection'.
-
-2010-04-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 598822 - Symbol highlight has wrong position with
-	  qualified names'.
-
-2010-04-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed possible null reference.
-
-2010-04-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpNRefactoryASTProvider.cs:
-	  Fixed 'Bug 598563 - NRE right-clicking on symbol in
-	  standalone file'.
-
-2010-04-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Worked on ASP.NET completion.
-
-2010-04-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Raised highlight usages delay.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 597671 - The += completion does not handle inner
-	  class eventargs properly'.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Patch applied from Tom Spink <tspink@gmail.com>: Where
-	  Constraint Completion
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Fixed 'Bug 597717 - Incorrect indentation using smart
-	  indent'.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Fixed 'Bug 597663 - Symbol highlight hides and re-shows at
-	  end of word'.
-
-2010-04-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Added
-	  null check.
-
-2010-04-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs:
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Optimized HighlightUsagesExtension (no additional re-parse).
-
-2010-04-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  code completion bug.
-
-2010-04-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: fixed
-	  possible null ref.
-
-2010-04-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Implemented 'Bug 595598 - Intelligent placing of
-	  semi-colons'.
-
-
-2010-04-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs:
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Implemented 'Bug 595587 - Move code block to correct depth
-	  when Alt+arrow moving'.
-
-2010-04-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 595606 - Refactoring (renaming) can alter
-	  unrelated classes'.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  de-activated usage highlighting in text link mode.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	  Made usage highlighter more robust.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs:
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	  Implemented 'Bug 595230 - Highlight all usages of symbol
-	  under cursor'.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Implemented 'Bug 595198 - Override completion should select
-	  body so it can be deleted'.
-
-2010-04-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fix NRE when opening a file with no open project.
-
-2010-04-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	  Fixed 'Bug 578195 - Wrong ctor shown on base() call'.
-
-2010-04-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngine.cs: Fixed
-	  'Bug 415469 - return ternary in a switch is not tabbed
-	  properly'.
-
-2010-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpNRefactoryASTProvider.cs:
-	  Added a 'last errors' property.
-
-2010-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* MonoDevelop.CSharp.Formatting/FormattingPanel.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngine.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngineStack.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingProperties.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	* gtk-gui/MonoDevelop.CSharp.Formatting.FormattingPanelWidget.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	  Fixed 'Bug 579358 - Smart indenter does not use policies,
-	  separate prefs confusing'.
-
-2010-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  'Bug 576354 - Type inference failure'.
-
-2010-04-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.xml:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Added option for 'Bug 593635 - Auto-formatting doesn't allow
-	  single-line if statements'.
-
-2010-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs: fixed
-	  possible null ref.
-
-2010-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed 'Bug
-	  592120 - Type resolver bug with this.Property[]'.
-
-2010-03-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp\CSharpBindingCompilerManager.cs: On
-	  windows, make sure the compiler output is written and read
-	  using utf8.
-
-2010-03-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  handled cast exception.
-
-2010-03-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Formatting/DomSpacingVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Worked on new formatter.
-
-2010-03-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/TypeMembers/AbstractMember.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/CastExpression.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ForeachStatement.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/QueryExpression.cs:
-	* MonoDevelop.CSharp.Dom/Statements/TryCatchStatement.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/DelegateDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ObjectCreateExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/MemberReferenceExpression.cs:
-	* MonoDevelop.CSharp.Dom/Statements/VariableDeclarationStatement.cs:
-	  Changed return type properties.
-
-2010-03-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/QueryExpression.cs:
-	  Worked on LINQ expressions.
-
-2010-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Dom/FullTypeName.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/Constraint.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/TypeDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/MethodDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/IdentifierExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/MemberReferenceExpression.cs:
-	  Handled templates & constraints.
-
-2010-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	  Removed duplicate section.
-
-2010-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	  Submittet patch send by ' Eugene Kulabuhov
-	  <eugene.kulabuhov@gmail.com>': Fixed MemberResolveResult
-	  clause incorrectly handling MethodResolveResult type as
-	  well.
-
-2010-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomSpacingVisitor.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/FieldDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/LambdaExpression.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/MethodDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ArgListExpression.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/IndexerDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/ArgumentDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/OperatorDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/StackAllocExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/InvocationExpression.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/ConstructorDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/BaseReferenceExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/AnonymousMethodExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ArrayObjectCreateExpression.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/ParameterDeclarationExpression.cs:
-	  Worked on new DOM.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CSharpBinding.addin.xml: Bumped MD version.
-
-2010-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomSpacingVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/IndexerExpression.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.xml:
-	* MonoDevelop.CSharp.Dom/TypeMembers/IndexerDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/OperatorDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ObjectCreateExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ArrayObjectCreateExpression.cs:
-	  Worked on new dom/parser/formatter.
-
-2010-03-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Formatting/DomSpacingVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Statements/WhileStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/IfElseStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/SwitchStatement.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/EventDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/TypeDeclaration.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Statements/TryCatchStatement.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/PropertyDeclaration.cs:
-	  Worked on new formatting engine/parser/dom.
-
-2010-03-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/Statements/IfElseStatement.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	  Worked on indenter.
-
-2010-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs: Always
-	  use the full file name for assembly references. Some
-	  assemblies from core packages are not located in the
-	  compiler directory, so a full file name is required.
-
-2010-03-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/Indent.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/Statements/BlockStatement.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.xml:
-	  Worked on indenter.
-
-2010-03-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: fixed
-	  potential ms build problem.
-
-2010-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed failing
-	  unit test.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.csproj: Remove import off mono.addins targets.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs:
-	* MonoDevelop.CSharp.Formatting/FormattingPanel.cs:
-	* MonoDevelop.CSharp.Project/CodeGenerationPanel.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs:
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs:
-	* MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs:
-	* MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs:
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightCSharpSemanticRule.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryIndexerParameterDataProvider.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryTemplateParameterDataProvider.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed 'Bug
-	  588223 - Intellisense does not recognize nested generics
-	  correctly.'.
-
-2010-03-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryTemplateParameterDataProvider.cs:
-	  Fixed 'Bug 588366 - Intellisense broken for nested generic
-	  types'.
-
-2010-03-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs:
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryTemplateParameterDataProvider.cs:
-	  Fixed 'Bug 588220 - No intellisense for generic methods.'.
-
-2010-03-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightCSharpSemanticRule.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	  Track API changes.
-
-2010-03-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 587530 – for/foreach rename refactoring ignores
-	  the scope'.
-
-2010-03-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs: Handled generated
-	  blocks/fixed some unit tests.
-
-2010-03-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ForStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/LockStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/YieldStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/FixedStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/UsingStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/WhileStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/EmptyStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/CheckedStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ForeachStatement.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Statements/UncheckedStatement.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/PointerReferenceExpression.cs:
-	  Worked on new indenter/dom.
-
-2010-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed 2nd
-	  bug described in 'Bug 586304 - Intellisense does not show
-	  several linq extenion methods when using nested generic
-	  type'.
-
-2010-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/CSharpTokenNode.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/CSharpModifierToken.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/PropertyDeclaration.cs:
-	  Worked on indenting engine.
-
-2010-03-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Formatting/Indent.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomSpacingVisitor.cs:
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ThisReferenceExpression.cs:
-	  Worked on new formatter/parser.
-
-2010-03-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpBinding.csproj: Don't local-copy project refs, as it
-	  duplicates assemblies and breaks running on .NET.
-
-2010-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	  Removed debug message.
-
-2010-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/Statements/SwitchStatement.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/TypeOfExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/SizeOfExpression.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/MethodDeclaration.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/CheckedExpression.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.xml:
-	* MonoDevelop.CSharp.Dom/Expressions/UncheckedExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/AssignmentExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ParenthesizedExpression.cs:
-	  Worked on dom/formatter/parser.
-
-2010-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 585454 - Lacking one reference to an enum type'.
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs: Track
-	  ProjectFile Link API.
-
-2010-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	  fixed bug in resolver provider.
-
-2010-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	  fix unit test.
-
-2010-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs:
-	  Refactored text editor resolve providers. Language bindings
-	  now can provide own providers.
-
-2010-03-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	  Fixed 'FindExpression' in expression finder.
-
-2010-03-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpTokenNode.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/Statements/UsingStatement.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	  Worked on DOM formatter/parser.
-
-2010-03-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs: Convert operator
-	  declaration bodies.
-
-2010-03-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fix the rest
-	  of the failing DomProperty tests.
-
-2010-03-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs: Fix indexer
-	  assignment that caused failing unit tests.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs: Fixed 'Bug
-	  583515 - No code completion for set-only properties'.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: When a member
-	  can't be resolved, a special resolve result is created.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs: Ambiences can now
-	  format delegates & take formatting policies.
-
-2010-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Dom/Identifier.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpNode.cs:
-	* MonoDevelop.CSharp.Dom/FullTypeName.cs:
-	* MonoDevelop.CSharp.Dom/CSharpTokenNode.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/AbstractCSharpNode.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/CastExpression.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomIndentationVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/PrimitiveExpression.cs:
-	  Worked on formatting visitor/dom.
-
-2010-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	  Now using the BaseRefactorer.IsMonoTouchModelMember method.
-
-2010-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs:
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	* gtk-gui/MonoDevelop.CSharp.Formatting.FormattingPanelWidget.cs:
-	  Worked on 'Bug 583014 - Need a way to stop override
-	  generating base call'.
-
-2010-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/Statements/LockStatement.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Statements/TryCatchStatement.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* gtk-gui/MonoDevelop.CSharp.Formatting.FormattingPanelWidget.cs:
-	  Worked on formatting visitor/dom.
-
-2010-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: fixed failing
-	  unit test.
-
-2010-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ForStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/WhileStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/IfElseStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ForeachStatement.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/PrimitiveExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/InvocationExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ConditionalExpression.cs:
-	  Worked on DOM & formatting visitor.
-
-2010-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	  Fixed 'Bug 583014 - Need a way to stop override generating
-	  base call'.
-
-2010-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs: Fixed 'Bug 583006
-	  - Enum members are prefixed with an enum name, in the
-	  Document Outline pad' / applied patch from Alexander
-	  Cherniuk <ts33kr@gmail.com>
-
-2010-02-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/Identifier.cs:
-	* MonoDevelop.CSharp.Dom/FullTypeName.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/BinaryOperatorExpression.cs:
-	  Worked on c# formatter & dom.
-
-2010-02-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs: Fix
-	  skipping duplicate refs.
-
-2010-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngine.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Implemented 'Bug 429265 - #region reindentation does not
-	  work with autocompletion'
-
-2010-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: fixed
-	  'Bug 582016 – Switching build configuration does not
-	  re-highlight conditional comments'.
-
-2010-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngine.cs: fixed
-	  'Bug 429265 - #region reindentation does not work with
-	  autocompletion'.
-
-2010-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: fixed
-	  pre processor tag highlighting.
-
-2010-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: fixed
-	  'Bug 582021 - parsing of nested conditional comments is
-	  broken'.
-
-
-2010-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj: Fix build.
-
-2010-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  'Bug 582017 - C# Generic Type Constraints'.
-
-2010-02-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/Statements/FixedStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ForeachStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/TryCatchStatement.cs:
-	  Worked on dom.
-
-2010-02-22  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs: fixed 'Bug
-	  578439 - Return key acts crazy in MonoDevelop'.
-
-2010-02-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed bug in
-	  array item lookup.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AspNet:
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* MonoDevelop.CSharp.Completion/AspLanguageBuilder.cs: Moved
-	  AspLanguageBuilder to its own assembly and module. Dropped
-	  Asp.Net dependency.
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Filtering by extension is now done by the document.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Track
-	  api changes.
-
-2010-02-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: Fixed
-	  'Bug 580427 - Exception, then crash while editing text.'.
-
-2010-02-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Categories are now sorted.
-
-2010-02-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Dom/Identifier.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Statements/GotoStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/WhileStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/IfElseStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ExpressionStatement.cs:
-	  Worked on new C# DOM.
-
-2010-02-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	  Fixed 'Bug 576336 - Parameter tooltip window stops working'.
-
-2010-02-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  'Bug 577225 - Inconsistent autocomplete on returned value of
-	  generic method.'.
-
-2010-02-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	  worked on c# parser.
-
-2010-02-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/IsExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/AsExpression.cs:
-	* MonoDevelop.CSharp.Dom/Statements/EmptyStatement.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/TypeOfExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/SizeOfExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ConditionalExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/DefaultValueExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/UnaryOperatorExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ThisReferenceExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/BinaryOperatorExpression.cs:
-	  Worked on parser/new dom.
-
-2010-02-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Dom/FullTypeName.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/OperatorDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/PropertyDeclaration.cs:
-	  worked on mcs based parser/new dom.
-
-2010-02-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	  Worked on DOM visitor.
-
-2010-02-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/ICSharpNode.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/CompilationUnit.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	  Worked on mcs parser/dom.
-
-2010-02-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Dom/Identifier.cs:
-	* MonoDevelop.CSharp.Dom/CSharpTokenNode.cs:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/CompilationUnit.cs:
-	* MonoDevelop.CSharp.Dom/AbtractCSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/DomFormattingVisitor.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/TypeDeclaration.cs:
-	  Worked on new dom/gmcs based parser.
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  fixed code completion activation in some cases.
-
-2010-02-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  added completion context for boolean variables (case:
-	  "varName = ").
-
-2010-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	  handle collection initalizers.
-
-2010-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	  fixed intellisense bug found by Marek.
-
-2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Kill debug code that spammed MD's stdout.
-
-2010-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Track API changes.
-
-2010-01-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.addin.xml: Remove unused extension.
-
-2010-01-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Added '!' as special closing key.
-
-2010-01-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs: fixed bug
-	  in auto formatting.
-
-2010-01-20  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.xml:
-	* gtk-gui/MonoDevelop.CSharp.Formatting.FormattingPanelWidget.cs:
-	* gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs:
-	* gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs:
-	  Implemented 'Bug 550947 - Arrays initailizers should not
-	  automatically be split on multiple lines'.
-
-2010-01-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	  brace forcement is now saved.
-
-2010-01-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs:
-	* MonoDevelop.CSharp.Refactoring/CSharpNRefactoryASTProvider.cs:
-	  Track api changes.
-
-2010-01-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  fixed 'Bug 571175 - ArgumentNullException in C# code
-	  completion'.
-
-2010-01-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj: Fix NRefactory project reference
-	  AGAIN.
-
-2010-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs: removed
-	  debug messages.
-
-2010-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs: fixed 'Bug
-	  569545 - [Windows] TextEditor sometimes adds LF on Windows'.
-
-2010-01-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: fixed 'Bug
-	  568484 - NRE in resolver'.
-
-2010-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: fixed
-	  'Bug 566544 - Locals and parameters are often not
-	  completed'.
-
-2010-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  'Bug 568204 - Inconsistency in resolution'.
-
-2010-01-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs: Fixed 'Bug 567906
-	  - Given error of .NET 3.0 in .NET 3.5 project'.
-
-2010-01-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: defines
-	  get updated by the source editor on parse event.
-
-2010-01-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: fixed 'Bug
-	  561964 - Wrong type in tooltip when there are two properties
-	  with the same name'.
-
-2010-01-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: fixed
-	  'Bug 561589 - Infinite loop throwing an exception crashes
-	  system'.
-
-2010-01-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs: fixed
-	  'Bug 560510 - Preprocessor enabled code shows as comment
-	  anyway'.
-
-2009-12-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/GtkSharp2Project.xpt.xml:
-	* templates/GnomeSharp2Project.xpt.xml:
-	* templates/GladeSharp2Project.xpt.xml: Set correct assembly
-	  target for gui projects.
-
-2009-12-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs: If C#
-	  compiler crashes, copy the stderr file to the monitor,
-	  report error message telling user to look there, and log
-	  location of the temp response/stderr/stdout files and avoid
-	  deleting them. Fixes "Bug 515013 - Compiling; a method call
-	  on an object that does not exist produces incomprehensible
-	  /tmp/*.tmp error".
-
-2009-12-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Completion/AspLanguageBuilder.cs: Worked
-	  on ASP.NET support.
-
-2009-12-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: fixed
-	  unit test.
-
-2009-12-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Completion/AspLanguageBuilder.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Worked on ASP.NET completion.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp/CSharpLanguageBinding.cs:
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs:
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs:
-	* MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs:
-	  Introduced the ConfigurationSelector class to all methods
-	  that previously took a configuration name as string. This
-	  eliminates the ambiguity between solution configuration
-	  names and project configuration names.
-
-2009-11-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs: Use 
-	  correct property for identifying runtime.
-
-2009-11-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs: Ignore
-	  the platform flag with Mono <= 2.4, because mcs/gmcs didn't
-	  support it.
-
-2009-11-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs: Emit the
-	  target platform option. Fixes bug #557146.
-
-2009-11-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Fixed
-	  possible null ref exception.
-
-2009-11-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'var a = new int' case.
-
-2009-11-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  'Bug 555672 - Crash when trying to autocomplete'.
-
-2009-11-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed 'Bug
-	  555523 - C# code completion gets confused by extension
-	  methods with same names as properties'.
-
-2009-11-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Fixed
-	  'Bug 555504 - Completion of generic types commits <T>'.
-
-2009-11-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Fixed
-	  'Bug 554376 - Overridden members show in completion as
-	  overloads'.
-
-2009-11-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Fixed
-	  'Bug 554688 - Accesting param name from completion list
-	  commits param type'.
-
-2009-11-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs: Fixed
-	  'Bug 554376 - Overridden members show in completion as
-	  overloads'.
-
-2009-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp/CustomCSharpCodeGenerator.cs: Remove the
-	  forked code generator.
-
-2009-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CSharpEnhancedCodeProvider.cs: Disable
-	  Mike's custom CodeDOM generator as it's totally broken for
-	  delegates, and breaks web refs. Had to stay late to push out
-	  a stable bugfix release for this, and missed the last train
-	  home.
-
-2009-11-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 553101 – Enum completion does not use type
-	  aliases'.
-
-2009-11-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	  Fixed 'Bug 552332 - Parameter insight re-shows inside anon
-	  delegates on every newline'.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CSharpBinding.addin.xml: Bump MD version.
-
-2009-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightCSharpSemanticRule.cs:
-	  Fixed 'Bug 551068 - Semantic highlighting crashes MD.'.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.CSharp.Formatting.FormattingPanelWidget.cs:
-	* gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs:
-	* gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs:
-	  Flush.
-
-2009-10-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 549858 - Refactoring does not change properties
-	  in lambda expressions'.
-
-2009-10-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CodeGenerator.cs: fixed Bug
-	  550024 - "resolve using" moves cursor to the added using.
-
-2009-10-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  'Bug 549864 - Intellisense does not work properly with
-	  expressions'.
-
-2009-10-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Fixed
-	  faling unit test.
-
-2009-10-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Respect the parameter insight option.
-
-2009-10-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CodeGenerator.cs: Fixed "Bug
-	  549130 - "resolve" adds using st. at wrong place when
-	  namespace and classname conflict".
-
-2009-10-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	  Fixed 'Bug 548941 - Generated event handler doesn't account
-	  for missing using statements'.
-
-2009-10-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	  implemented 'Bug 548711 - generated event handlers names
-	  should always contain "Handle"'.
-
-2009-10-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpNRefactoryASTProvider.cs:
-	  handled in extract method.
-
-2009-10-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpNRefactoryASTProvider.cs:
-	  Fixed 'Bug 548367 - Extract method adds an unwanted newline
-	  at the end'.
-
-2009-10-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CodeGenerator.cs: Overworked
-	  new member positioning code.
-
-2009-10-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/CSharpNRefactoryASTProvider.cs:
-	  Fix 'Bug 545270 - Move type to another file - part 1'.
-
-2009-10-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 547949 - Rename partial classes does not rename
-	  both classes'.
-
-2009-10-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp/CustomCSharpCodeGenerator.cs: Fixed
-	  private implementation type output again.
-
-2009-10-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Filter out special names from override completion.
-
-2009-10-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CustomCSharpCodeGenerator.cs: Tidy and
-	  fix compilation.
-
-2009-10-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CustomCSharpCodeGenerator.cs: Restore
-	  support for snippet and entry point members.
-
-2009-10-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CustomCSharpCodeGenerator.cs: Commit the
-	  first type newline removal hack, tidied up.
-
-2009-10-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CSharpEnhancedCodeProvider.cs: Re-enable
-	  the custom generator.
-
-	* MonoDevelop.CSharp/CustomCSharpCodeGenerator.cs: Add
-	  comments to header about minimising changes so we can sync
-	  from original.
-
-2009-10-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CSharp/CSharpEnhancedCodeProvider.cs: Disable
-	  the custom generator for now, as it's broken.
-
-	* MonoDevelop.CSharp/CustomCSharpCodeGenerator.cs: Revert to a
-	  clean import (except the MonoTODO -> //TODO) so that it's
-	  easier to see what changes we've made to the original.
-
-2009-10-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	  Fixed 'Bug 547611 - renaming a variable does not rename in
-	  this() invocation'.
-
-2009-10-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp/CustomCSharpCodeGenerator.cs:
-	* MonoDevelop.CSharp/CSharpEnhancedCodeProvider.cs: Added
-	  custom C# CodeDOM provider (fixing Bug 547947 - the default
-	  text when creating a new class has too many newlines and an
-	  issue with explicit interface member name generation).
-
-2009-10-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	  Fixed 'Bug 547645 - Intellisense in Object-Initializer does
-	  not work if Namespace is used'.
-
-2009-10-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	  Fixed 'Bug 547470 - Override completion for "protected
-	  internal" is wrong'.
-
-2009-10-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightCSharpSemanticRule.cs:
-	  Fixed 'Bug 546143 - Semantic Type Highlighting does not work
-	  on attributes.'.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: worked on
-	  constructor initalizer resolving.
-
-2009-10-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj: Fix build.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs:
-	  Disabled conditionditional highlighting for debugger files.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs: Fixed 'Bug
-	  540054 - 'Go to Declaration' goes wrong when methods are
-	  overloaded'.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs: Special
-	  handling of field names & typenames (same as for
-	  properties).
-
-2009-10-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Highlighting/HighlightCSharpSemanticRule.cs:
-	  Fixed 'Bug 546392 - exception in highlighting'.
-
-2009-10-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 546016 - EventHandler code completion not working
-	  if there is no space after +='.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* md1format.xml: track namespace changes.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	  Fixed 'Bug 545667 - Exception when autoformatting'.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	  Don't show return type for constructors.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.CSharp:
-	* gtk-gui/gui.stetic:
-	* CSharpBinding.csproj:
-	* Gui/CSharpAmbience.cs:
-	* Gui/ResolveVisitor.cs:
-	* Gui/FormattingPanel.cs:
-	* Parser/CodeGenerator.cs:
-	* CSharpBinding.addin.xml:
-	* CSharpLanguageBinding.cs:
-	* Parser/CSharpFormatter.cs:
-	* Gui/NRefactoryResolver.cs:
-	* MonoDevelop.CSharp.Project:
-	* Parser/NRefactoryParser.cs:
-	* Syntax/CSharpSyntaxMode.cs:
-	* Gui/CodeGenerationPanel.cs:
-	* Gui/MemberCompletionData.cs:
-	* MonoDevelop.CSharp.Resolver:
-	* MonoDevelop.CSharp.Completion:
-	* MonoDevelop.CSharp.Formatting:
-	* CSharpEnhancedCodeProvider.cs:
-	* MonoDevelop.CSharp.Refactoring:
-	* Parser/FindMemberAstVisitor.cs:
-	* MonoDevelop.CSharp.Highlighting:
-	* CSharpBindingCompilerManager.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/NewOverrideCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/CompilerOptionsPanelWidget.cs:
-	* Gui/CSharpTextEditorIndentation.cs:
-	* Gui/EventCreationCompletionData.cs:
-	* Project/CSharpResourceIdBuilder.cs:
-	* Project/CSharpProjectParameters.cs:
-	* Project/CSharpCompilerParameters.cs:
-	* Syntax/HighlightCSharpSemanticRule.cs:
-	* Parser/CSharpNRefactoryASTProvider.cs:
-	* Gui/NRefactoryParameterDataProvider.cs:
-	* Gui/NRefactoryDocumentMetaInformation.cs:
-	* FormattingStrategy/CSharpIndentEngine.cs:
-	* MonoDevelop.CSharp.Dom/CSharpAmbience.cs:
-	* MonoDevelop.CSharp/CSharpLanguageBinding.cs:
-	* FormattingStrategy/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Resolver/ResolveVisitor.cs:
-	* MonoDevelop.CSharp.Parser/NRefactoryParser.cs:
-	* FormattingStrategy/CSharpIndentEngineStack.cs:
-	* Gui/NRefactoryIndexerParameterDataProvider.cs:
-	* FormattingStrategy/CSharpFormattingPolicy.xml:
-	* Gui/NRefactoryTemplateParameterDataProvider.cs:
-	* gtk-gui/CSharpBinding.FormattingPanelWidget.cs:
-	* MonoDevelop.CSharp.Refactoring/CodeGenerator.cs:
-	* MonoDevelop.CSharp/CSharpEnhancedCodeProvider.cs:
-	* MonoDevelop.CSharp.Formatting/FormattingPanel.cs:
-	* FormattingStrategy/CSharpFormattingProperties.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormatter.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs:
-	* FormattingStrategy/CSharpFormattingPolicyPanel.cs:
-	* MonoDevelop.CSharp.Project/CodeGenerationPanel.cs:
-	* gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs:
-	* MonoDevelop.CSharp/CSharpBindingCompilerManager.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngine.cs:
-	* MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs:
-	* gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs:
-	* MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs:
-	* MonoDevelop.CSharp.Project/CSharpProjectParameters.cs:
-	* MonoDevelop.CSharp.Completion/MemberCompletionData.cs:
-	* MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs:
-	* MonoDevelop.CSharp.Refactoring/FindMemberAstVisitor.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpIndentEngineStack.cs:
-	* MonoDevelop.CSharp.Resolver/NewCSharpExpressionFinder.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.xml:
-	* MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs:
-	* MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs:
-	* MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingProperties.cs:
-	* MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs:
-	* MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs:
-	* MonoDevelop.CSharp.Refactoring/CSharpNRefactoryASTProvider.cs:
-	* gtk-gui/MonoDevelop.CSharp.Formatting.FormattingPanelWidget.cs:
-	* MonoDevelop.CSharp.Highlighting/HighlightCSharpSemanticRule.cs:
-	* gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryParameterDataProvider.cs:
-	* gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs:
-	* MonoDevelop.CSharp.Resolver/NRefactoryDocumentMetaInformation.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryIndexerParameterDataProvider.cs:
-	* MonoDevelop.CSharp.Completion/NRefactoryTemplateParameterDataProvider.cs:
-	  Renamed some namespaces.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBinding.csproj: Use \ instead of '/' in the Import.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBinding.csproj: Add md.targets .
-
-2009-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed 'Bug 545361 - Method
-	  -> Rename doesn't update instance in delegate constructor'.
-
-2009-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/HighlightCSharpSemanticRule.cs: Fixed "Bug 545332 -
-	  Crashing monodevelop".
-
-2009-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: fixed ambience output for some return
-	  types.
-
-2009-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Fixed 'Bug 545196 -
-	  Exception in C# completion'.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Add timer.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpLanguageBinding.cs:
-	* Gui/CodeGenerationPanel.cs: Assign the target plaform when
-	  creating compilation parameters. Add some counters.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CSharpBinding.addin.xml: Bump MD version.
-
-2009-10-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/MemberCompletionData.cs: Added ambience to documentation
-	  output.
-
-2009-10-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Worked on
-	  documentation output.
-
-2009-10-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Use IsAccessibleFrom
-	  method in override completion.
-
-2009-10-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryParameterDataProvider.cs: fixed extension
-	  methods output.
-
-2009-10-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed 'typeof (' context
-	  (primitive types were missing).
-
-2009-10-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* Gui/CodeGenerationPanel.cs:
-	* Project/CSharpCompilerParameters.cs:
-	* gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs: Allow
-	  setting the platform target.
-
-2009-09-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Fixed tab as reindent.
-
-2009-09-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Fixed 'Bug 542976 - Type
-	  resolution problem'.
-
-2009-09-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CSharp.Parser\CSharpParser.cs: Mono.CSharp is
-	  not available on windows.
-
-2009-09-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs:
-	* FormattingStrategy/CSharpIndentEngine.cs: Optimized indent
-	  engine.
-
-	* Parser/NRefactoryParser.cs: Fields now get their body region
-	  set to the variable declaration bounds (required for looking
-	  up in multiple field declaration: Type field1, field2,
-	  field3;).
-
-2009-09-28  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Used correct context.
-
-2009-09-28  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Building packages that have
-	  required packages now works.
-
-2009-09-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Parser:
-	* MonoDevelop.CSharp.Parser/CSharpParser.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/TypeDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/EnumDeclaration.cs:
-	  Added enumdeclaration node.
-
-2009-09-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CSharp.Dom/GeneralScope/AttributeSection.cs:
-	  Added attribute target enum.
-
-2009-09-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/MemberCompletionData.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Fixed 'Bug 542015 -
-	  Superfluous overloads'.
-
-2009-09-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Dom/Identifier.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpNode.cs:
-	* Syntax/HighlightCSharpSemanticRule.cs:
-	* MonoDevelop.CSharp.Dom/ICSharpDomVisitor.cs:
-	* MonoDevelop.CSharp.Dom/AbstractCSharpNode.cs:
-	* MonoDevelop.CSharp.Dom/QualifiedIdentifier.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/Identifier.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/Attribute.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ForStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/GotoStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/LockStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/EmptyStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/BlockStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/FixedStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/LabelStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/BreakStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/UsingStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ThrowStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/YieldStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/WhileStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ReturnStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/SwitchStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/UnsafeStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/IfElseStatement.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/CastExpression.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ForeachStatement.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/QueryExpression.cs:
-	* MonoDevelop.CSharp.Dom/Statements/CheckedStatement.cs:
-	* MonoDevelop.CSharp.Dom/Statements/TryCatchStatement.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/EventDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/TypeOfExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/SizeOfExpression.cs:
-	* MonoDevelop.CSharp.Dom/Statements/ContinueStatement.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/FieldDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/TypeDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/UsingDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/AttributeSection.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/CheckedExpression.cs:
-	* MonoDevelop.CSharp.Dom/Statements/UncheckedStatement.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/IndexerExpression.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/MethodDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/IndexerDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/AbstractMemberBase.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/PropertyDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/VariableInitializer.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/ArgumentDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/OperatorDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/PrimitiveExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/QualifiedIdentifier.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/UncheckedExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/StackAllocExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/IdentifierExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/InvocationExpression.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/DelegateDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/AssignmentExpression.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/DestructorDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ConditionalExpression.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/NamespaceDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ObjectCreateExpression.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/ConstructorDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/UsingAliasDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/NullReferenceExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ParenthesizedExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/BaseReferenceExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/ThisReferenceExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/UnaryOperatorExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/BinaryOperatorExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/AnonymousMethodExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/MemberReferenceExpression.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/PointerReferenceExpression.cs:
-	* MonoDevelop.CSharp.Dom/Statements/VariableDeclarationStatement.cs:
-	  Worked on C# DOM.
-
-2009-09-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/HighlightCSharpSemanticRule.cs: Added some checks.
-
-2009-09-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Dom/Statements:
-	* MonoDevelop.CSharp.Dom/TypeMembers:
-	* MonoDevelop.CSharp.Dom/Expressions:
-	* MonoDevelop.CSharp.Dom/GeneralScope:
-	* MonoDevelop.CSharp.Dom/Attribute.cs:
-	* MonoDevelop.CSharp.Dom/Identifier.cs:
-	* Syntax/HighlightCSharpSemanticRule.cs:
-	* MonoDevelop.CSharp.Dom/TypeDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/AttributeSection.cs:
-	* MonoDevelop.CSharp.Dom/UsingDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/DelegateDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/QualifiedIdentifier.cs:
-	* MonoDevelop.CSharp.Dom/NamespaceDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/UsingAliasDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/Identifier.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/Attribute.cs:
-	* MonoDevelop.CSharp.Dom/Statements/BlockStatement.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/AbstractMember.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/EventDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/FieldDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/TypeDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/MethodDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/AttributeSection.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/UsingDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/AbstractMemberBase.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/IndexerDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/VariableInitializer.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/ArgumentDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/Expressions/QualifiedIdentifier.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/OperatorDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/PropertyDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/DelegateDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/NamespaceDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/DestructorDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/GeneralScope/UsingAliasDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/TypeMembers/ConstructorDeclaration.cs:
-	  Worked on C# DOM.
-
-2009-09-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj: Renamed file.
-
-2009-09-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Syntax/CSharpSyntaxMode.cs:
-	* Syntax/HighlightCSharpSemanticRule.cs:
-	* Syntax/HighlightPropertiesSemanticRule.cs: Reactivated
-	  semantic highlighting.
-
-2009-09-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoDevelop.CSharp.Dom:
-	* MonoDevelop.CSharp.Dom/Attribute.cs:
-	* MonoDevelop.CSharp.Dom/Identifier.cs:
-	* MonoDevelop.CSharp.Dom/TypeDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/AttributeSection.cs:
-	* MonoDevelop.CSharp.Dom/UsingDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/DelegateDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/QualifiedIdentifier.cs:
-	* MonoDevelop.CSharp.Dom/NamespaceDeclaration.cs:
-	* MonoDevelop.CSharp.Dom/UsingAliasDeclaration.cs: Worked on
-	  c# dom.
-
-2009-09-21  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpFormattingPolicy.cs:
-	* FormattingStrategy/CSharpFormattingPolicy.xml: Fixed 'Bug
-	  540466 - Code formatter "place else on new line" is broken'.
-
-2009-09-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs:
-	* Parser/CSharpFormatter.cs:
-	* Gui/MemberCompletionData.cs:
-	* Parser/FindMemberAstVisitor.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Renamed IDomVisitable ->
-	  INode
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Gui/MemberCompletionData.cs: Show type of type.
-	  (class/interface/struct ...)
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Show return type for constants
-	  (Math.PI).
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: c# ambience now use the
-	  FullInnerTypeName setting.
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed wrong code
-	  completion popup.
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/CSharpSyntaxMode.cs: handled null exception.
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/CSharpSyntaxMode.cs: handled possible null reference.
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Use more advanced
-	  GetComponentType method instead of a custom version (removes
-	  code duplication). Fixes 'Bug 540095 - Code completion
-	  issues with dictionaries in foreach'.
-
-2009-09-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Parser/CodeGenerator.cs: Fixed explicit interfaces.
-
-2009-09-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs:
-	* Gui/NewOverrideCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Correctly set valid
-	  region/improved method overriding.
-
-2009-09-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Fixed on the fly format bug.
-
-2009-09-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Enums are no longer printed sealed.
-
-2009-09-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Fixed 'Bug 539327 -
-	  Intellisense does not work with default (type) keywork'.
-
-2009-09-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 539320 - No
-	  intellisense for delegate attributes".
-
-2009-09-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Fixed 'Bug 539318 -
-	  duplicate var suggestion'.
-
-2009-09-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Added short way to format whole
-	  document.
-
-2009-09-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: worked on formatting.
-
-2009-09-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Worked on code formatting.
-
-2009-09-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Added auto complete empty
-	  match == false for 'hint' enum completion.
-
-2009-09-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewOverrideCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/EventCreationCompletionData.cs:
-	* Gui/NRefactoryParameterDataProvider.cs:
-	* Gui/NRefactoryIndexerParameterDataProvider.cs:
-	* Gui/NRefactoryTemplateParameterDataProvider.cs: Track API
-	  changes.
-
-2009-09-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: removed debug message.
-
-2009-09-11  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: worked on formatting.
-
-2009-09-11  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Fixed "Bug 538296 -
-	  Autocompletion makes weird indentation on svn build".
-
-2009-09-11  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs: Fixed "Bug 538208 - Go to
-	  declaration not working over a generic method...".
-
-2009-09-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* Gui/CSharpTextEditorIndentation.cs: Track API changes/worked
-	  on code formatter.
-
-2009-09-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Improved formatting merge
-	  algorithm (fixing Bug 537374 - On-the-fly formatting: New
-	  line incorrectly inserted in property).
-
-2009-09-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Parser/FindMemberAstVisitor.cs: Removed debug message.
-
-2009-09-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: fixed "Bug 537187 - When
-	  'interpret tab as reindent' option is set, code templates
-	  don't work".
-
-2009-09-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Fixed "Bug 537318 - Text curser
-	  misplaced on automatic refactoring (adding spaces etc. when
-	  pressing ';')".
-
-2009-09-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: fixed "Bug 537187 - When
-	  'interpret tab as reindent' option is set, code templates
-	  don't work".
-
-2009-09-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: fixed c# ambience for nested types
-	  (they work a bit different now).
-
-2009-09-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Made a better fix for the explicit
-	  member bug (but a recreation of the code completion database
-	  is required to make it work).
-
-2009-09-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixed failing unit test.
-
-2009-09-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Fixed "Bug 536111 - Nested generic
-	  types should not show <> on code completion".
-
-2009-09-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpNRefactoryASTProvider.cs: Implementet
-	  parsetypereference.
-
-2009-09-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Fixed "Bug 535187 - Resolver
-	  result wrong when property name matches type".
-
-2009-08-31  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: Fixed unit tests.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Improved attribute output.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Parser/CSharpFormatter.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Parser/NRefactoryParser.cs:
-	* Syntax/CSharpSyntaxMode.cs:
-	* Parser/FindMemberAstVisitor.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Syntax/HighlightPropertiesSemanticRule.cs:
-	* Gui/NRefactoryIndexerParameterDataProvider.cs: Fixed unit
-	  test failures & compiler warnings.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.csproj: Updated dependencies. We now depend on
-	  gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-26  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Fixed removing of
-	  selection for insert/remove indent commands.
-
-2009-08-26  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Optimized find all
-	  references operation.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Fixed regex for parsing
-	  errors. The line+column group is optional in csc.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Fixed "Bug 533986 - Autoformat:
-	  issue when pressing enter at the end of a line".
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Use GetContent instead
-	  of casting.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: fixed possible null
-	  reference exception.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Fixed "Bug 533683 - File
-	  header automatically expanded".
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryParameterDataProvider.cs:
-	* Gui/NRefactoryIndexerParameterDataProvider.cs: Indexer xml
-	  docs are now displayed.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryIndexerParameterDataProvider.cs:
-	* Gui/NRefactoryTemplateParameterDataProvider.cs: Worked on
-	  data providers.
-
-2009-08-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fix windows build.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryIndexerParameterDataProvider.cs: Remvoved
-	  duplicate indexer.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryIndexerParameterDataProvider.cs:
-	* Gui/NRefactoryTemplateParameterDataProvider.cs: Implemented
-	  Bug 361573 - Code completion for indexers not working.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewOverrideCompletionData.cs: Fixed 'Bug 533681 - Method
-	  overriding always uses full namespaces'.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpEnhancedCodeProvider.cs: Track API changes
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs: It's now possible to
-	  determine the parent expression contexts.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryParameterDataProvider.cs: Fixed "Bug 533369 -
-	  Overloads should be ordered".
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 531035 -
-	  Automcompleted delegate callback generation for TEventArgs
-	  could be better".
-
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 528329 - Find
-	  class references returns incorrect reference".
-
-2009-08-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/SharpDevelopTree:
-	* Parser/LanguageItemVisitor.cs:
-	* Parser/CSharpExpressionFinder.cs: Remove unused stuff.
-
-2009-08-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 531525 -
-	  Refactoring + Renaming fails for delegate"
-
-2009-08-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.csproj: Don't make local copies of project
-	  references.
-
-2009-08-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/CSharpSyntaxMode.cs: fixed "Bug 527655 - Preprocessor
-	  disabled code still makes "if" coloured".
-
-2009-08-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryParameterDataProvider.cs: Added new line for
-	  parameterless methods summary documentation.
-
-2009-08-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewOverrideCompletionData.cs:
-	* FormattingStrategy/CSharpIndentEngine.cs: Fixed "Bug 507668
-	  - Wrong smart-indentation behavior in monodevelop solution
-	  itself".
-
-2009-08-03  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs: fixed "Bug 527151
-	  – smart indent: indents "too much" after "new O () { ... }"
-	  object initialisation without trailing ','".
-
-2009-08-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Fixed "Bug 527338 - Wrong type
-	  shown in tooltip when param name clashes with field name".
-
-2009-07-31  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs: Fixed failing unit test.
-
-2009-07-31  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs: Fixed 'Bug 526667 - wrong
-	  code completion in object initialisation (new O() {...};)'.
-
-2009-07-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/MemberCompletionData.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Worked on xml
-	  documentation display.
-
-2009-07-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Added null check.
-
-2009-07-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/MemberCompletionData.cs:
-	* Parser/FindMemberAstVisitor.cs:
-	* Gui/NRefactoryParameterDataProvider.cs:
-	* Gui/NRefactoryTemplateParameterDataProvider.cs: Handled
-	  parameter documentation.
-
-2009-07-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs:
-	* Gui/MemberCompletionData.cs: Custom xml documentation is now
-	  used (Bug 525260 - Custom documentation not shown in code
-	  completion.).
-
-2009-07-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Fixed bug in code formatter.
-
-2009-07-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Implemented search in xml
-	  comments for members/types.
-
-2009-07-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs:
-	* Parser/FindMemberAstVisitor.cs: Implmented search in xml
-	  documentation (currently this works only for parameters).
-
-2009-07-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed possible null
-	  reference exception.
-
-2009-07-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Syntax/CSharpSyntaxMode.cs:
-	* Gui/NewCSharpExpressionFinder.cs: Fixed failing LINQ unit
-	  tests.
-
-2009-07-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorIndentation.cs:
-	* FormattingStrategy/CSharpIndentEngineStack.cs: Worked on "on
-	  the fly" code formatting.
-
-2009-07-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 524879 - Rename
-	  on variable in "using" leaks into other scopes".
-
-2009-07-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 524877 -
-	  Incomplete rename with on variable declared in foreach
-	  statements".
-
-2009-07-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 524873 -
-	  Parameter renaming problem when type contains parameter
-	  name".
-
-2009-07-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Let the runtime find the
-	  correct compiler path.
-
-2009-07-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 524318 - Cannot
-	  rename caught exception declarations".
-
-2009-07-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/CSharpSyntaxMode.cs:
-	* Parser/FindMemberAstVisitor.cs:
-	* Syntax/HighlightPropertiesSemanticRule.cs: Removed debug
-	  messages.
-
-2009-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpNRefactoryASTProvider.cs: fixed build.
-
-2009-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpNRefactoryASTProvider.cs: handled possible
-	  parser exceptions.
-
-2009-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/CSharpSyntaxMode.cs: Correctly copying syntax mode
-	  properties.
-
-2009-07-20  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpFormattingPolicy.cs:
-	* FormattingStrategy/CSharpFormattingPolicy.xml: Added brace
-	  forcement pretty print options.
-
-2009-07-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 523334 - Find
-	  references misses a field inside a property".
-
-2009-07-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpNRefactoryASTProvider.cs: removed debug
-	  message.
-
-2009-07-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/CSharpSyntaxMode.cs: Fixed '#if' section highlighting
-	  bug with more than one defined symbol separated by ','
-
-2009-07-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: C# text editor extension
-	  can now be reused by the ASP.NET text editor extension.
-
-2009-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpNRefactoryASTProvider.cs: implemented new parse
-	  function.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpNRefactoryASTProvider.cs: Track api changes.
-
-2009-07-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Fixed "Bug 518548 -
-	  Completion is very annoying on lambda parameters".
-
-2009-07-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed partial completion.
-
-2009-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixed the code completion on
-	  interface members.
-
-2009-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: Fixed automatic namespace import
-	  (removed redundant newline).
-
-2009-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Added range check (fixes
-	  a possible exception on del/backspace).
-
-2009-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 518544 - "new"
-	  completion after "var" is almost unusably slow".
-
-2009-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewOverrideCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Implemented "Bug 518542 -
-	  Partial method completion".
-
-2009-07-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Added range check.
-
-2009-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Implemented special
-	  backspace/del behaviour inside strings as suggested by
-	  lluis.
-
-2009-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* Parser/CSharpFormatter.cs:
-	* Parser/CSharpNRefactoryASTProvider.cs: Worked on refactoring
-	  support.
-
-2009-07-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs: Fixed "Bug 518547 -
-	  Property initializer completion populates from wrong type".
-
-2009-06-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: fixed possible null reference
-	  exception.
-
-2009-06-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* Gui/CSharpTextEditorIndentation.cs: Overworked the formatted
-	  text insertion algorithm.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/CSharpFormatter.cs: Use the new DesktopService
-	  instead of PlatformService.
-
-2009-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Worked on formatter.
-
-2009-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpFormattingPolicy.cs:
-	* FormattingStrategy/CSharpFormattingPolicy.xml: Added format
-	  option for anonymous methods.
-
-2009-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* Gui/CSharpTextEditorIndentation.cs: Worked on formatter.
-
-2009-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Added null checks.
-
-2009-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* Gui/CSharpTextEditorIndentation.cs: Worked on formatter.
-
-2009-06-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* Gui/CSharpTextEditorIndentation.cs: Fixed tab key multi line
-	  formatting. worked on formatter.
-
-2009-06-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Worked on output formatter.
-
-2009-06-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* Gui/CSharpTextEditorIndentation.cs: Fixed template
-	  insertion/worked on code formatter.
-
-2009-06-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* Gui/CSharpTextEditorIndentation.cs: Worked on code
-	  formatting
-
-2009-06-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 514563 -
-	  Inconsistent treatment of nullable types for comments and
-	  information".
-
-2009-06-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Fixed "Bug 514284 - Tab
-	  key doesn't work for plain text files (with tab as reindent
-	  option set)".
-
-2009-06-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: fixed "Bug 514283 -
-	  Using tab to reindent only works from the begining of the
-	  line".
-
-2009-06-19  Mike Krüger  <mkrueger@novell.com>
-
-	* templates/AssemblyInfo.xft.xml: Fixed "Bug 513981 - Project
-	  template causes CS1726 errors".
-
-2009-06-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpEnhancedCodeProvider.cs: Pass specials to CodeDOM
-	  visitor so it can collect comments.
-
-	* Gui/CompilerOptionsPanelWidget.cs: Don't explode when
-	  ITypeResolveContext is null.
-
-2009-06-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui\CSharpTextEditorCompletion.cs: Remove debug message.
-
-	* Parser\NRefactoryParser.cs: Assign a default visibility flag
-	  for types which don't have one explicitly set in code.
-
-	* templates\GtkSharp2Project.xpt.xml: atk-sharp is a
-	  dependency of gtk-sharp, so it has to be added too to the
-	  project (.NET complains about it).
-
-2009-06-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorIndentation.cs:
-	* FormattingStrategy/CSharpFormattingPolicy.cs:
-	* FormattingStrategy/CSharpFormattingPolicy.xml: Worked on
-	  code formatting.
-
-2009-06-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/NRefactoryParser.cs: Fix issue with detection of
-	  generic constraints.
-
-2009-06-18  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpFormattingPolicy.cs: Corrected
-	  default settings
-
-2009-06-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 504555 - Right
-	  clicking on a variable name and selecting rename does not
-	  work properly.".
-
-2009-06-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Fixed "Bug 512820 –
-	  Different number of overloads reported for same method".
-
-2009-06-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/CSharpSyntaxMode.cs: Track api changes.
-
-2009-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/CSharpFormatter.cs: Add support for per-mimetype
-	  policies.
-
-2009-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* MonoCSharpPolicy.xml:
-	* CSharpBinding.addin.xml: Register the c# formatting panel
-	  and the Mono policy set.
-
-	* FormattingStrategy/CSharpFormattingPolicy.cs:
-	* FormattingStrategy/CSharpFormattingPolicyPanel.cs: Converted
-	  to mime-type formatting panel.
-
-2009-06-09  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs: Fixed "Bug 510222
-	  - Newline after colon of conditional does not have correct
-	  tabbing".
-
-2009-06-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixed "Bug 510919 - Code completion
-	  does not show interface method when not using a local var".
-
-2009-06-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed find member visitor
-	  bug.
-
-2009-06-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 510771 - Find
-	  references finds invalid references".
-
-2009-06-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* Parser/CSharpFormatter.cs:
-	* FormattingStrategy/CSharpFormattingPolicy.cs:
-	* FormattingStrategy/CSharpFormattingPolicyPanel.cs:
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Worked on C# formatter it should now fit better in the
-	  policy system.
-
-2009-06-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Fixed "Bug 509620 -
-	  Auto-completion shows empty constructor when there are no
-	  constructors available (because of being private)".
-
-2009-06-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.csproj: Set correct resource id.
-
-2009-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Fixed "Bug 509019 - Autocomplete for
-	  new generic of array omits brackets".
-
-2009-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 507063 - XML
-	  auto-comment doesn't work for indexers or properties".
-
-2009-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 507737 - Renaming
-	  parameter of method renames parameter occurrences in other
-	  methods in the same file".
-
-2009-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am: Corrected makefile.
-
-2009-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* FormattingStrategy/CSharpFormattingPolicy.cs:
-	* FormattingStrategy/CSharpFormattingPolicy.xml: Worked on C#
-	  formatting policy.
-
-2009-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 506707 - Code
-	  completion shows fully qualified class names when using
-	  alias directive is used."
-
-2009-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpLanguageBinding.cs: Add support for .net 4.0.
-
-	* CSharpBindingCompilerManager.cs: Properly locate the
-	  compiler when running on MS.NET.
-
-2009-05-14  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* Syntax/CSharpSyntaxMode.cs:
-	* Syntax/HighlightPropertiesSemanticRule.cs: Added semantic
-	  rules to the c# syntax mode.
-
-2009-05-14  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax/CSharpSyntaxMode.cs: Worked on preprocessor semantic
-	  highlighting.
-
-2009-05-14  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs: Applied
-	  patch Eberhard Beilharz <eb1@sil.org> from (Bug 503410 -
-	  Can't set warning level to 4).
-
-2009-05-13  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs:
-	* Syntax/CSharpSyntaxMode.cs: Worked on semantic
-	  highlighting/fixed bug that could cause a crash with invalid
-	  pre processor if blocks.
-
-2009-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* Syntax/CSharpSyntaxMode.cs: Worked on pre processor semantic
-	  highlighting.
-
-2009-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Syntax/CSharpSyntaxMode.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Fixed 'Bug 501999 -
-	  Intellisense completion of new array: put cursor inside
-	  brackets'
-
-2009-05-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs: Fixed query expression resolving
-	  bug.
-
-2009-05-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Syntax:
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* Syntax/CSharpSyntaxMode.cs: Added c# syntax mode.
-
-2009-05-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixed a bug that code completion
-	  shows up for not declared members ("string s; s.c."
-	  shouldn't complete anymore)
-
-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Don't use -pkg to reference
-	  assemblies, use the full assembly path. Don't add the
-	  default utf8 codepage option when building with csc. Move
-	  the /noconfig option out of the response file, csc doesn't
-	  like it. Properly build with csc when targeting MS.NET.
-
-2009-05-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 500001 – Auto
-	  XML comment (///) for struct grabs params and returns from
-	  following function".
-
-2009-05-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 499819 -
-	  "true." or "false." doesn't trigger code completion".
-
-2009-05-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/MemberCompletionData.cs: Fix duplicate filtering, so
-	  that unnecessary "overloads" don't show up.
-
-2009-04-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Remove unnecessary compiler
-	  params parsing.
-
-2009-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/EventCreationCompletionData.cs: Fixed/Improved the
-	  create event handler feature.
-
-2009-04-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Use correct environment for
-	  building the project, according to the target runtime.
-
-2009-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBinding.csproj:
-	* Gui/NewOverrideCompletionData.cs: Fixed "Bug 497991 -
-	  Completion of "overriding" an interface member results in a
-	  call to base".
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBinding.addin.xml: Changed copyright tag.
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* AssemblyInfo.cs: Changed assembly info.
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewOverrideCompletionData.cs: "overriding" interface
-	  members is now public.
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed 'Bug 495275 -
-	  override completion popup no longer includes unimplemented
-	  members from interfaces'.
-
-	* Parser/NRefactoryParser.cs: 
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: fixed "Bug 497829 - MD cannot
-	  open file due to NullReferenceException in C# binding".
-
-2009-04-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpLanguageBinding.cs: Track comment tag API.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/EventCreationCompletionData.cs: Track api changes.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* CSharpBinding.csproj: don't require specific gtk-sharp version.
-	* Gui/CSharpTextEditorCompletion.cs: fix a csc error.
-
-2009-04-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Use
-	  ToolsEnvironmentVariables from the current runtime.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpLanguageBinding.cs:
-	* Gui/CodeGenerationPanel.cs:
-	* CSharpBindingCompilerManager.cs:
-	* Gui/CompilerOptionsPanelWidget.cs:
-	* Project/CSharpCompilerParameters.cs: Worked on C# backend
-	  binding.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* CSharpLanguageBinding.cs:
-	* icons/csharp-project-16.png: Removed icon service.
-
-2009-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Moved SystemAssemblyService
-	  and related classes to the namespace
-	  MonoDevelop.Core.Assemblies.
-
-2009-04-16  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs: fixed 'Bug 494568
-	  - Indentation after C# labels is wrong.'.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CSharpBinding.addin.xml: Bump MD version.
-
-2009-04-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed "Bug 429034 - Class alias
-	  completion not working properly".
-
-2009-04-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 493202 - List
-	  References on private constructor yields nothing".
-
-2009-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Activated virtual
-	  leading whitespace feature.
-
-2009-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Fixed possible null ref
-	  exception.
-
-2009-04-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs:
-	* Parser/NRefactoryParser.cs:
-	* Gui/NRefactoryTemplateParameterDataProvider.cs: Added name
-	  validator (for Bug 414735 - Rename refactoring should not
-	  allow invalid names).
-
-2009-04-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: Implemented "Bug 492675 - New line
-	  & ; at end of line".
-
-2009-04-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: fixed bug in add namespace import
-	  method.
-
-2009-04-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: AddNamespace import is now atomar.
-
-2009-04-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs:
-	* Gui/NRefactoryResolver.cs: Added "resolve namespace"
-	  feature.
-
-2009-04-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 438696 - Error
-	  in text editor extension chain.".
-
-2009-04-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Implemented "Bug 325527 -
-	  Make C# intellisense smarted for base classes".
-
-2009-04-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/MemberCompletionData.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Added some tooltip
-	  formatting. Extension methods are marked. Method description
-	  is shown in the parameter window.
-
-2009-04-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs: Fixed "Bug 491020 - Wrong typeof
-	  intellisense".
-
-2009-04-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs: Fixed "Bug 491017 - No
-	  intellisense for static LINQ queries".
-
-2009-04-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixed failing unit test.
-
-2009-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: removed debug messages.
-
-2009-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed "Bug 491016 - No
-	  intellisense for lambdas inside linq query".
-
-2009-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Added "var" to the
-	  completion list.
-
-2009-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 487226 - No
-	  intellisense in LINQ queries" - 2.
-
-2009-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed "Bug 487237 - Broken lambda
-	  intellisense".
-
-2009-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed "Bug 487226 - No
-	  intellisense in LINQ queries".
-
-2009-03-31  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Worked on C#3 lambda resolving.
-
-2009-03-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Removed debug message.
-
-2009-03-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: implemented 'Bug 363627 - MD
-	  text editor does not show folding symbols for preprocessor
-	  directives'.
-
-2009-03-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryTemplateParameterDataProvider.cs: Implemented
-	  "Bug 324888 - Auto complete not activating in generics".
-
-	* Makefile.am:
-	* CSharpBinding.csproj: 
-
-2009-03-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Implemented "Bug 324989 -
-	  code completion doesn't strip off 'Attribute' part in
-	  Attributes".
-
-2009-03-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Added 'from ... group ... into
-	  VAR' case.
-
-2009-03-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NewCSharpExpressionFinder.cs: Worked on lambda resolving
-	  (fixing bug 'Bug 487203 - Extension methods not working').
-
-2009-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/MemberCompletionData.cs: Fixed "Bug 487209 - Incorrent
-	  intellisense for partial methods".
-
-2009-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixed "Bug 487218 - var does not work
-	  with arrays".
-
-2009-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: fixed "Bug 487228 - No intellisense
-	  for implicit arrays".
-
-2009-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs: Fixed "Bug 487236 - Object
-	  initializer completion uses wrong type".
-
-2009-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 487246 - No
-	  intellisense for extension methods".
-
-2009-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixed possible null ref.
-
-2009-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs: Added support for
-	  contextual templates.
-
-2009-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs: Fixed Header.
-
-2009-03-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/MemberCompletionData.cs: Worked on template callbacks.
-
-2009-03-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/NewOverrideCompletionData.cs:
-	* Gui/EventCreationCompletionData.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Fixed compilation
-	  error.
-
-2009-03-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* templates/GtkSharp2Project.xpt.xml: Don't require specific
-	  GTK# versions.
-
-2009-03-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Track API changes.
-
-	* Gui/CSharpTextEditorIndentation.cs: changed naming.
-
-2009-03-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Fix build.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Fixed caret end pos.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs:
-	* FormattingStrategy/CSharpIndentEngine.cs: Added auto string
-	  concat when return is hit inside a string.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: Renamed method.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: fixed 'Bug 485783 - Class/method
-	  navigation bar doesn't honor "Define symbols:" project
-	  setting when parsing file'.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs:
-	* Parser/NRefactoryParser.cs: Track API changes.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: fixed 'Bug 485610 - Can't
-	  rename a variable'.
-
-2009-03-16  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Added option categories.
-
-2009-03-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Added new code completion
-	  context (local variable naming proposal).
-
-2009-03-16  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Added place in new line options.
-
-2009-03-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CSharpFormatter.cs:
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Worked on code formatting.
-
-2009-03-15  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Added some formatting options.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpBinding.csproj: Don't local-copy project refs.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Added some options.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBinding.csproj: Moved text editor to core
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBinding.addin.xml:
-	* Parser/CSharpFormatter.cs:
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Worked on code formatting.
-
-2009-03-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* Parser/CSharpFormatter.cs:
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Worked on code formatter.
-
-2009-03-11  Mike Krüger  <mkrueger@novell.com>
-
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Worked on code formatting.
-
-2009-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* CSharpBinding.addin.xml:
-	* FormattingStrategy/CSharpFormattingStyleDefinition.xml:
-	  Added format style definition
-
-2009-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: fixed comment position.
-
-2009-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: added new constructor.
-
-2009-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* CSharpBinding.csproj:
-	* Gui/NewCSharpExpressionFinder.cs: Updated nrefactory
-	  references.
-
-2009-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Handled output of anonymous types.
-
-2009-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: fixed type name.
-
-2009-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic: 
-
-	* Gui/ResolveVisitor.cs: Using new anonymous type
-	  representation.
-
-2009-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs:
-	* FormattingStrategy/CSharpIndentEngine.cs: Worked on lambda
-	  code completion.
-
-2009-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/MemberCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Worked on icons for
-	  parameters/local variables and keywords.
-
-2009-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs: added bounds check.
-
-2009-03-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: fixed "Bug 480492 - Find
-	  field references returns incorrect references".
-
-2009-02-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 479983 - No C#
-	  completion for object initializers".
-
-2009-02-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 479986 -
-	  Incorrect new completion for var".
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.csproj: Flush.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* md1format.xml:
-	* CSharpBindingCompilerManager.cs:
-	* Project/CSharpCompilerParameters.cs: Added support for
-	  WarningsNotAsErrors, although there is no gui for setting it
-	  because it is not supported by mcs.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 479757 -
-	  Parameters of a Method when opening Parenthesis result in a
-	  blank "Tooltip".'
-
-2009-02-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpBinding.addin.xml: Register CSharpProjectParameters as 
-	  serializable.
-
-2009-02-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* md1format.xml:
-	* gtk-gui/gui.stetic:
-	* CSharpBinding.csproj:
-	* CSharpLanguageBinding.cs:
-	* CSharpBindingCompilerManager.cs:
-	* Gui/CompilerOptionsPanelWidget.cs:
-	* Project/CSharpProjectParameters.cs:
-	* Project/CSharpCompilerParameters.cs:
-	* gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs: Moved
-	  some properties from configuration parameters to project
-	  parameters.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CompilerOptionsPanelWidget.cs: Changed override Destroy
-	  --> override OnDestroyed.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Parser/FindMemberAstVisitor.cs: fixed "Bug 427453 - The
-	  rename operations are not working (for local variables)"
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CompilerOptionsPanelWidget.cs: worked on ressource
-	  de-allocation.
-
-2009-02-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Fixed 'Bug 472597 - New completion
-	  does not include array types'.
-
-2009-02-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: fixed "Bug 478702 - Underline on
-	  syntax error not working properly when using preprocessor
-	  directives and inheritance".
-
-2009-02-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Added support for some undocumented
-	  keywords.
-
-2009-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs: Removed debug message.
-
-2009-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Gui/NewOverrideCompletionData.cs: Fixed "Bug 478703 -
-	  Override completion fails to include parameter modifiers in
-	  method generation".
-
-2009-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs: Fixed some type resolving issues.
-
-2009-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Fixed failing unit test.
-
-2009-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed inner type access issues.
-
-2009-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Handled
-	  AttributeArguments context. Fixing bug 'Bug 478490 -
-	  Autocomplete Attribute Properties'.
-
-2009-02-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: fixed "Bug 472104 -
-	  Cursor misplaced when pressing tab".
-
-2009-02-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 477374 - Find
-	  references... doesn't find all references".
-
-2009-02-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: enum fields now have the correct
-	  return type.
-
-2009-02-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: Fixed "Bug 404706 - Refactorer is
-	  not aware of existing regions when inserting members".
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Track api changes.
-
-	* Project/CSharpResourceIdBuilder.cs: Allow line breaks when
-	  reading literals.
-
-2009-02-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 434979 -
-	  Automagic insertion of XML comments doesn't work as
-	  intended'.
-
-2009-02-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Removed double space in namespace
-	  output.
-
-2009-02-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Parser/FindMemberAstVisitor.cs: Fixed bug "Bug 325171 -
-	  Rename fails with overloads".
-
-2009-02-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/FindMemberAstVisitor.cs: Fixed "Bug 391066 - Rename
-	  not offered for generic classes".
-
-2009-02-13  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: fixed type output issues in the c#
-	  ambience.
-
-2009-02-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpLanguageBinding.cs:
-	* Parser/NRefactoryParser.cs:
-	* CSharpBindingCompilerManager.cs: Track API changes. Use the
-	  new ProjectItem collection.
-
-2009-02-11  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed test case 470954_bis
-
-2009-02-11  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed "Bug 474447 - Wrong
-	  completion of namespaces".
-
-2009-02-11  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Optimized ResolveIdentifier and
-	  prevented endless loop.
-
-2009-02-11  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed "Bug 470954 - using
-	  System.Windows.Forms is not honored".
-
-2009-02-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/MemberCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Fixed "Bug 350862 -
-	  Autocomplete bug with enums".
-
-2009-02-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed small namespace access bug.
-
-2009-02-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: worked on is/as
-	  completion.
-
-2009-02-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Added new "<Type> x = y
-	  as $" completion case.
-
-2009-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: now using
-	  IsAccessibleFrom for constructor accessible tests (for more
-	  complex cases than bug 473849).
-
-
-2009-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 473849 -
-	  Classes with no visible constructor shouldn't appear in
-	  "new" completion".
-
-2009-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed "Bug 473686 - Constants are
-	  not included in code completion".
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpBinding.csproj: Don't local-copy other addins' dlls.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Rename a couple of
-	  variables, as csc is more picky about multiple locals with
-	  the same name in switches.
-
-	* gtk-gui/gui.stetic: Updated.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpBinding.csproj: Don't treat warning as errors, because
-	  csc still outputs warnings for this project.
-
-2009-02-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 472092 -
-	  'yield return new' includes incaccessible members'.
-
-2009-02-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixing C#3 query expressions.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.mds:
-	* CSharpBinding.mdp:
-	* CSharpBinding.csproj: Migrated to MSBuild file format.
-
-2009-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/MemberCompletionData.cs: Avoid an InvalidCastException
-	  in the case where an overloads's member is not the same type
-	  as the main member. Not sure why this would happen, but it
-	  just did.
-
-2009-02-05  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* Gui/MemberCompletionData.cs: 
-
-	* Gui/NewCSharpExpressionFinder.cs: fixed 'Bug 471937 - Code
-	  completion of 'new' showing invorrect entries'.
-
-2009-02-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: fixed "Bug 472714 -
-	  MonoDevelop automatic indentation does not follow "Convert
-	  tabs to spaces" option".
-
-2009-02-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/MemberCompletionData.cs: Better sorting of overloads.
-
-2009-02-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/MemberCompletionData.cs: Don't auto-insert <T>. Sort
-	  overloads. Always display <> in the name when there is a
-	  generic overload.
-
-2009-02-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CSharpAmbience.cs: Handle HideGenericParameterNames
-	  flag.
-
-2009-02-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: fixed "Bug 466719 - Code completion
-	  doesn't activate with '.' inside expression using '::'
-	  operator.".
-
-2009-02-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 469910 -
-	  Incorrect type resolution on attributes".
-
-2009-02-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 471935 - Code
-	  completion window not showing in MD1CustomDataItem.cs'.
-
-2009-02-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: disabled caret beyond
-	  eol feature.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* CSharpBinding.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.mdp:
-	* gtk-gui/gui.stetic: Fix target gtk# version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.mdp:
-	* gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs:
-	  Updated.
-
-2009-02-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CSharpResourceIdBuilder.cs: Track api changes.
-
-2009-01-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.mdp:
-	* Autotools/Makefile.am:
-	* Gui/CSharpAmbience.cs:
-	* Parser/NRefactoryParser.cs:
-	* Parser/FindMemberAstVisitor.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Add support for constraints in
-	generic methods.
-
-2009-01-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorIndentation.cs: Added virtual spaces based on
-	indentation level.
-
-2009-01-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/NRefactoryParser.cs: Track api changes.
-
-2009-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/mcs:
-	* Makefile.am:
-	* Parser/mcs/mcs:
-	* CSharpBinding.mdp:
-	* Parser/mcs/dom.cs:
-	* gtk-gui/gui.stetic:
-	* Parser/mcs/mcs/PLAN:
-	* Parser/mcs/mcs/TODO:
-	* Parser/mcs/External:
-	* Parser/mcs/mcs/NOTES:
-	* gtk-gui/generated.cs:
-	* Parser/mcs/mcs/OTODO:
-	* Parser/mcs/mcs/README:
-	* Gui/ResolveVisitor.cs:
-	* Parser/mcs/mcs/doc.cs:
-	* Parser/mcs/mcs/linq.cs:
-	* Parser/mcs/mcs/mcs.sln:
-	* Parser/mcs/mcs/enum.cs:
-	* Parser/mcs/mcs/decl.cs:
-	* Parser/mcs/mcs/const.cs:
-	* Parser/mcs/mcs/OPTIMIZE:
-	* Parser/mcs/mcs/cfold.cs:
-	* Parser/mcs/mcs/ecore.cs:
-	* Parser/mcs/mcs/Makefile:
-	* Parser/mcs/cs-parser.cs:
-	* Parser/CodeGenerator.cs:
-	* Parser/mcs/mcs/gmcs.sln:
-	* Parser/mcs/mcs/class.cs:
-	* Parser/mcs/mcs/assign.cs:
-	* Parser/mcs/mcs/ChangeLog:
-	* Parser/mcs/mcs/driver.cs:
-	* Parser/mcs/mcs/lambda.cs:
-	* Parser/mcs/mcs/report.cs:
-	* Parser/mcs/mcs/support.cs:
-	* Parser/mcs/mcs/codegen.cs:
-	* Parser/mcs/mcs/generic.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Parser/mcs/mcs/convert.cs:
-	* Parser/mcs/mcs/pending.cs:
-	* Parser/mcs/mcs/literal.cs:
-	* Parser/mcs/mcs/mcs.csproj:
-	* Parser/mcs/mcs/constant.cs:
-	* Parser/mcs/mcs/nullable.cs:
-	* Parser/mcs/mcs/gmcs.csproj:
-	* Parser/mcs/mcs/delegate.cs:
-	* Parser/mcs/mcs/location.cs:
-	* Parser/mcs/mcs/lambda.todo:
-	* Parser/mcs/mcs/parameter.cs:
-	* Parser/mcs/mcs/compiler.doc:
-	* Parser/mcs/mcs/modifiers.cs:
-	* Parser/mcs/mcs/namespace.cs:
-	* Parser/mcs/mcs/anonymous.cs:
-	* Parser/mcs/mcs/statement.cs:
-	* Parser/mcs/mcs/iterators.cs:
-	* Parser/mcs/mcs/attribute.cs:
-	* Parser/mcs/mcs/roottypes.cs:
-	* Parser/mcs/mcs/expression.cs:
-	* Parser/mcs/mcs/cs-parser.jay:
-	* Parser/mcs/mcs/generic-mcs.cs:
-	* Parser/mcs/mcs/mcs.exe.config:
-	* Parser/mcs/mcs/typemanager.cs:
-	* Parser/mcs/mcs/rootcontext.cs:
-	* Parser/mcs/mcs/flowanalysis.cs:
-	* Parser/mcs/mcs/symbolwriter.cs:
-	* Parser/mcs/mcs/gmcs.exe.config:
-	* Parser/mcs/mcs/cs-tokenizer.cs:
-	* Parser/mcs/mcs/mcs.exe.sources:
-	* Parser/mcs/mcs/AssemblyInfo.cs:
-	* Parser/mcs/mcs/gmcs.exe.sources:
-	* Parser/mcs/mcs/doc-bootstrap.cs:
-	* Parser/mcs/mcs/smcs.exe.sources:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/CSharpTextEditorIndentation.cs:
-	* Parser/mcs/mcs/smcs.exe.sources-xml:
-	* Parser/mcs/External/CryptoConvert.cs:
-	* Parser/mcs/External/MonoSymbolFile.cs:
-	* Gui/NRefactoryParameterDataProvider.cs:
-	* Parser/mcs/External/MonoSymbolTable.cs:
-	* Parser/mcs/External/MonoSymbolWriter.cs:
-	* gtk-gui/CSharpBinding.FormattingPanelWidget.cs:
-	* gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs:
-	* gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs: Removed unused
-	code. Fixed compiler warnings.
-
-2009-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Fixed an unneccessary space printing before for
-	type names (affected code completion as well).
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CSharpBinding.mdp:
-	* gtk-gui/gui.stetic:
-	* Autotools/Autotools.mdp: Flush project format changes.
-
-2009-01-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Parser/NRefactoryParser.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Provide the calling class in
-	all type queries. It is required to resolve generic arguments.
-
-	* CSharpBinding.mdp: Updated.
-
-2009-01-27  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #352703.
-	* CSharpBindingCompilerManager.cs (Compile): Format define symbols list
-	to be semi-colon separated.
-
-2009-01-26  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Handled invalid endpos.
-
-2009-01-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: Corrected delegate location.
-
-	* Gui/CSharpAmbience.cs: Attribute postfix no longer print when
-	outputting attributes.
-
-2009-01-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 464788 - Variable shows
-	up twice in completion list.'.
-
-2009-01-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 464787 - completion doesn't
-	update fast enough'.
-
-2009-01-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Parser/NRefactoryParser.cs: Added support for explicit events. Fixing
-	bug "Bug 467507 - No completion of base members inside explicit
-	events".
-
-2009-01-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Handled theoretical null ref exception (But
-	I wasn't able to produce a test case). 
-
-2009-01-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed "Bug 466694 - Generic type parameters
-	missing from completion".
-
-2009-01-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed 'Bug 466692 - Missing
-	completion for return/break keywords after yield'.
-
-2009-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: fixed 'Bug 466337 - Incorrect intelisense for
-	class attribute'.
-
-2009-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 466329 - Autocomplete
-	doesn't activate with "_"".
-
-2009-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: worked on csharpambience markup.
-
-2009-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 466149 - Code completion
-	activates inside a string.'.
-
-2009-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Added global keyword. Fixing 'Bug 466063 - Missing keyword
-	'global' from code completion'.
-
-2009-01-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/MemberCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Performance optimizations in
-	AddCompletionData. Reduce calls to Ambience.GetString.
-
-	* Gui/CSharpAmbience.cs: Optimizations. In Visit(IType), avoid creating
-	a StringBuilder when the result is just the class name.
-
-2009-01-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Track api changes.
-
-2009-01-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Parser/NRefactoryParser.cs:
-	* Parser/FindMemberAstVisitor.cs: Worked on refactoring code/fixing Bug
-	456576 - refactor: rename field is not working.
-
-2009-01-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fix warning.
-
-	* md1format.xml:
-	* Project/CSharpCompilerParameters.cs: Store the LangVersion string
-	using the msbuild format. For MD1, use the old format. Fixes bug
-	#461104 - Setting C# language version on project does not parse in
-	VS.Net 2008.
-
-2009-01-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Worked on on the fly type resolving.
-
-2009-01-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: fixed "Bug 463783 - Method Navigator does not
-	show indexer parameters".
-
-2009-01-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Corrected variable scope.
-
-2009-01-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 457237 - code completion doesn't
-	show static methods when setting global variable'.
-
-2009-01-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 457003 - code completion shows
-	variables out of scope'.
-
-2009-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixed unit test for bug 323283. 
-
-2009-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Fixed anonymous class unit test.
-
-2009-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 460234 - Invalid options
-	shown when typing 'override'".
-
-2008-12-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Optimize
-	GetParameterCompletionCommandOffset. It was a cause of important
-	slowdowns in the editor when pressing return.
-
-2008-12-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Optimized. Do nothing in
-	HandleParameterCompletion unless the char is going to trigger a
-	parameter completion.
-
-	* md1format.xml: Added missing property.
-
-	* CSharpBindingCompilerManager.cs: Improve error message when an
-	assembly is not found.
-
-	* gtk-gui/gui.stetic: Update.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.mdp:
-	* Autotools/Autotools.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs:
-	* Autotools/CSharpAutotoolsSetup.cs: Track API changes.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.mdp: Don't require a specific version of Mono.Addins.
-
-2008-12-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/CSharpTextEditorIndentation.cs: Track api changes.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/MemberCompletionData.cs: Use full names in the description of the
-	members. Fixes bug #450931 - Autocomplete without namespaces is
-	confusing.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* CSharpBinding.mdp: Add AssemblyInfo.cs files that are autogenerated
-	from the addin manifests.
-
-2008-11-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Gui/MemberCompletionData.cs:
-	* Gui/NewOverrideCompletionData.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Refactored
-	ambiences/domoutputvisitor.
-
-2008-11-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: taken back last change.
-
-2008-11-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: added strongly typed overloads for getstring.
-
-2008-11-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Worked on c# ambience.
-
-2008-11-26  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: fixed some ambience bugs.
-
-2008-11-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: fixed 'Bug 434240 - Cannot explicitly
-	implement events'.
-
-2008-11-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 447985 - Exception
-	display tip is inaccurate for derived (custom) exceptions'.
-
-2008-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CSharpAmbience.cs: Don't try to prepend a return type to
-	finalisers.
-
-2008-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CSharpAmbience.cs: Format finalisers correctly.
-
-2008-11-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: fixed folding region bug.
-
-2008-11-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: worked on c# ambience.
-
-2008-11-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/MemberCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: worked on "Bug 444547 - Invalid
-	options shown when completing 'new' operator".
-
-2008-11-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 444911 - Refactor options not
-	shown'.
-
-2008-11-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 444463 - Function
-	completion lacks 'out' keywords in params'.
-
-2008-11-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: fixed 'Bug 446177 - Encapsulate field
-	operation renames incorrect variable names in external files'.
-
-2008-11-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: fixed 'Bug 445774 - Renaming class badly
-	broken; results in many errors'.
-
-2008-11-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 444112 - Generic
-	parameters missing in code completion'.
-
-2008-11-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/CodeGenerator.cs: fixed 'Bug 355948 - Rename refactoring does
-	not rename within #ifdef blocks'.
-
-2008-11-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Don't add the codepage:utf8 option if
-	the user selected another codepage. Fix by Ernesto Carrea.
-
-2008-11-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 444542 - Weird options
-	shown for 'as' operator'.
-
-2008-11-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 444538 - Namespaces missing when
-	completing 'new' operator'.
-
-2008-11-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/MemberCompletionData.cs: Remove unused code.
-
-2008-11-14  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: fixed 'Bug 444110 - Code completion doesn't
-	activate'.
-
-2008-11-14  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: Fixed full namespace display of members.
-
-	* Gui/CSharpTextEditorCompletion.cs: Worked on new completion.
-
-2008-11-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Fix completion location off-by-one.
-	Fixes extra char that was added at end of namespaces.
-
-2008-11-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Move template completion code to
-	MonoDevelop.Ide.
-
-	* Makefile.am:
-	* CSharpBinding.mdp: Updated.
-
-	* Gui/CodeTemplateCompletionData.cs: Unused, remove.
-
-2008-11-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CodeTemplateCompletionData.cs: Added double tab templates.
-
-2008-11-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Autotools/Makefile.am: Fix issue with parallel building.
-
-	* Gui/MemberCompletionData.cs: Don't use the description to
-	differentiate overloads, since it has to query info from monodoc and
-	that's very slow. Use the help url instead, which seems to work fine
-	as id.
-
-2008-11-12  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/MemberCompletionData.cs:
-	* Gui/CodeTemplateCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 443493 - C# completion
-	should not trigger at start of existing words'.
-
-2008-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Track fix in text editor's
-	completion line/col indexing. It's now 1-indexed, as it should be.
-	Allow triggering after ( and {. Don't aggressively trigger before a
-	non-whitespace/punctuation char. Replace "location" field with
-	parameter usage, so it's easier to follow the usage. Refactor out
-	some expression finder creation so it's all done in one place.
-
-2008-11-11  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/MemberCompletionData.cs: fixed 'Bug 441621 - Ctrl-space in middle
-	of word does not overwrite rest of word'.
-
-2008-11-11  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed completion popup for
-	string/char literals.
-
-2008-11-11  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/NewOverrideCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 442728 - Code completion
-	for 'override' is not aware of namespaces".
-
-2008-11-11  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/CSharpTextEditorCompletion.cs:
-	* FormattingStrategy/CSharpIndentEngine.cs: fixed 'Bug 443453 -
-	Parameter completion and comments'.
-
-2008-11-11  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 443493 - C# completion
-	should not trigger at start of existing words'.
-
-2008-11-10  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/CSharpTextEditorCompletion.cs: Added enable auto completion
-	option.
-
-2008-11-07  Mike Krüger  <mike@icsharpcode.net>
-
-	* Parser/CodeGenerator.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Parser/NRefactoryParser.cs: fixed 'Bug 364779 - When I click "Find All
-	References" monodevevlop crashes'.
-
-2008-11-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Disable debug message.
-
-2008-11-06  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 442127 - "Find all references"
-	hit uncancelable infinite loop, 100% CPU'.
-
-2008-11-06  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CodeTemplateCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Code templates are now shown in
-	code  completion list, when auto insert is enabled.
-
-2008-11-06  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 442047 - 'Go to declaration'
-	missing for vars'.
-
-2008-11-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Return mutable completion lists
-	when appropriate. Fixes Bug 440641 - "Parsing files" message not
-	shown anymore in the completion window.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.addin.xml: Bump MD version.
-
-2008-11-05  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/ResolveVisitor.cs:
-	* Parser/NRefactoryParser.cs: fixed bug 'Bug 441671 - Finalisers show up
-	in code completion'.
-
-2008-11-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CompilerOptionsPanelWidget.cs: Disable CompileTarget and MainClass
-	setting when project.IsLibraryBasedProjectType. Prevents messing up
-	ASP.NET and Moonlight projects.
-
-2008-11-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs:
-	* Gui/CompilerOptionsPanelWidget.cs: Allow setting the Main class for
-	libraries.
-
-2008-11-04  Mike Krüger  <mike@icsharpcode.net>
-
-	* Parser/CodeGenerator.cs: worked on refactoring.
-
-2008-11-04  Mike Krüger  <mike@icsharpcode.net>
-
-	* Parser/CodeGenerator.cs: Worked on refactoring.
-
-2008-11-04  Mike Krüger  <mike@icsharpcode.net>
-
-	* Parser/CodeGenerator.cs: fixed 'Bug 404906 - variable refactor -> rename freezes MD'.
-
-2008-11-03  Mike Krüger  <mike@icsharpcode.net>
-
-	* Parser/CodeGenerator.cs:
-	* Gui/NRefactoryResolver.cs: worked on refactoring operations.
-
-2008-11-03  Mike Krüger  <mike@icsharpcode.net>
-
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 439960 - Return
-	type not shown in tool tip'.
-
-2008-10-31  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: fixed bug in parameter output.
-
-2008-10-31  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 439963 - Lacking
-	members in code completion'
-
-2008-10-31  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed possible null reference.
-
-2008-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorCompletion.cs: worked on "new" completion.
-
-2008-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NewCSharpExpressionFinder.cs: Worked on "new" completion.
-
-2008-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 432438 - Incorrect
-	autocomplete for delegates'.
-
-2008-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Fixed 'Bug 432434 - Code completion
-	doesn't work with subclasses'.
-
-2008-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 436312 - Couldn't deal
-	well with elements which have generic and non-generic presence at the
-	same time'.
-
-2008-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed  duplicate member bug.
-
-2008-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 436705 - code completion
-	for constructors does not handle class name collisions properly'.
-
-2008-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: using type reference parsing for object
-	creation.
-
-2008-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 432434 - Code completion
-	doesn't work with subclasses'.
-
-2008-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: Write the comand used for compiling
-	to the output. Fixes bug #430499.
-
-2008-10-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed bug 'Bug 439601 - Intellisense Broken
-	For Partial Classes'.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 325173 - Clashes resolved
-	incorrectly'.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 439446 - Invoking
-	events has extra completion options'.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBinding.addin.xml: removed old ambience reference.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBinding.addin.xml: moved ambience extension node to project
-	model.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* CSharpBinding.addin.xml: fixed 'Bug 399737 - Code completion busted
-	for referenced assemblies that are not in GAC, are outside of the
-	solution, and which are referenced by other non-GAC outside
-	referenced assemblies'.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/EventCreationCompletionData.cs: event creation is now done with a
-	stringbuilder.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/EventCreationCompletionData.cs: Worked on event handler
-	completion.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/EventCreationCompletionData.cs: handled instantiated types for
-	event completion.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs: Removed duplicate method.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 434705 - No autocomplete
-	offered if not assigning result of 'new' to a variable'.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed possible null reference
-	exception.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Fixed 'Bug 438699 - Code completion shows
-	too many options'.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewOverrideCompletionData.cs: fixed setter generation in override
-	completion.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 436870 - Inheriting from
-	base class gives bad code completion (reopened)" 
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 432727 - No
-	completion if no constructor'.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewCSharpExpressionFinder.cs: fixed 'Bug 434705 - No autocomplete
-	offered if not assigning result of 'new' to a variable'.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: Removed debug messages.
-
-2008-10-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewOverrideCompletionData.cs: fixed override bug.
-
-2008-10-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 438708 - Changing
-	namespace results in MD hanging'.
-
-2008-10-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: fixed
-Bug 434706 -
-	Autocomplete should expand on pressing comma
-Bug 434717 - No
-	completion for nullable types
-
-	* Gui/CSharpAmbience.cs: Fixed a null reference exception.
-
-2008-10-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs: C# ambience can now print instantiated types.
-
-2008-10-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* templates/AssemblyInfo.xft.xml: Use an AssemblyVersion that'll build
-	with csc. Fixes "Bug 436273 - created AssemblyInfo.cs does not build
-	on VS2005".
-
-2008-10-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 436870 - Inheriting from
-	base class gives bad code completion".
-
-2008-10-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewOverrideCompletionData.cs: fixed Bug 436951 - Overriding an
-	abstract property is incorrect.
-
-2008-10-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Autotools/Autotools.mdp, Autotools/Makefile.am: Fix build.
-
-2008-10-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NewOverrideCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/EventCreationCompletionData.cs: fixed 'Bug 436320 - Autocomplete
-	does not show compatible event handlers'.
-
-2008-10-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 434701 - No autocomplete
-	in attributes'.
-
-2008-10-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/EventCreationCompletionData.cs: Worked on event completion.
-
-2008-10-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 434705 - No autocomplete
-	offered if not assigning result of 'new' to a variable'. 
-
-2008-10-16 Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/MemberCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs:
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 434701 - No
-	autocomplete in attributes'.
-
-2008-10-16 Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 434705 - No autocomplete
-	offered if not assigning result of 'new' to a variable'.
-
-2008-10-15 Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 434770 - No autocomplete on
-	array types'.
-
-2008-10-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/MemberCompletionData.cs: Tidy up last commit.
-
-2008-10-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/MemberCompletionData.cs: Fix accidentally marking all overloads as
-	obsolete.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Track APIs.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/MemberCompletionData.cs:
-	* Gui/NewOverrideCompletionData.cs:
-	* Gui/CSharpTextEditorCompletion.cs: Track CompletionData API.
-
-2008-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CSharpAmbience.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 431803 - Autocomplete
-	not giving any options'.
-
-2008-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/ResolveVisitor.cs:
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 432681 - Incorrect
-	completion in nested classes'.
-
-2008-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed possible null reference.
-
-2008-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/NRefactoryParser.cs: fixed 'Bug 433410 - Code folding toggle in
-	the wrong place'.
-
-2008-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs: fixed some bugs with parameters,
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 433735 - Autocomplete of
-	`using' statement behaves like `using' directive'.
-
-2008-10-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/MemberCompletionData.cs: Make code more readable.
-
-2008-10-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/NRefactoryResolver.cs: Track API changes.
-
-2008-10-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CSharpTextEditorCompletion.cs: Track API.
-
-	* Gui/MemberCompletionData.cs: Don't subclass CodeCompletionData, but
-	implement interfaces directly so we have more control over the API.
-	Don't mark as obsolete if some overloads are not obsolete.
-
-2008-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed regression bug.
-
-2008-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NRefactoryResolver.cs:
-	* Gui/NewCSharpExpressionFinder.cs:
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 432681 - Incorrect
-	completion in nested classes'.
-
-2008-10-08  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: fixed 'Bug 429025 - Code completion of 'base'
-	  doesn't work'.
-
-2008-10-08  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: fixed possible null references.
-
-2008-10-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/MemberCompletionData.cs: Re-implement sinking obsolete members to
-	  the bottom, but in a non-broken way this time.
-
-2008-10-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryParameterDataProvider.cs: fixed 'Bug 432727 - No
-	  completion if no constructor'.
-
-2008-10-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs, Gui/NRefactoryResolver.cs,
-	  Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 431382 - Code
-	  completion should strip Attribute suffix from classes deriving from
-	  System.Attribute'.
-
-2008-10-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs: fixed possible null reference in
-	  compare.
-
-2008-10-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs: fixed 'Bug 430813 - Completion list
-	  feels really broken when items are not sorted alphabetically'.
-
-2008-10-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryParameterDataProvider.cs, Gui/CSharpAmbience.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on code completion.
-
-2008-10-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/CSharpTextEditorCompletion.cs: fixed
-	  'Bug 431761 - Code completion is incorrect'.
-
-2008-10-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs: fixed +-1 error.
-
-2008-10-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed possible null reference.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: fixed 'base' bug.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs: fixed 'Bug 432436 -
-	  Code completion shouldn't activate before the equals when declaring
-	  variables'.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs, Gui/NRefactoryResolver.cs,
-	  Gui/CSharpTextEditorCompletion.cs: fixed Bug 432435 - Code
-	  completion shows 'List', not List<T>.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: fixed Bug 432658 - Incorrect completion
-	  when calling an extension method from inside another extension
-	  method.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorIndentation.cs: Fixed a bug in tab as reindent
-	  command.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 431797 - Code completion
-	  showing invalid options'.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 431759 - Code
-	  completion should not happen in #region directives'.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 431764 - Completion doesn't
-	  work in properties'.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 432437 - No
-	  completion when invoking delegates'.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Updated xml comment tag
-	  descriptions from ECMA 364.
-
-2008-10-02  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 431462 - Code
-	  completion generally unusable with with 'using' aliases'.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Track API.
-
-2008-09-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/MemberCompletionData.cs: Fix NRE that broke completion.
-
-2008-09-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Autotools/CSharpAutotoolsSetup.cs: Fix bug #394501 - tarball
-	  generated don't add -keyfile:<strong_name_file>.snk in MAKE command
-	  in Makefile.in.
-
-2008-09-29  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 430393 - "// test/"
-	  generates <summary> comment'.
-
-2008-09-29  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs: moved obsolete members at the bottom of
-	  the list.
-
-2008-09-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/NRefactoryParser.cs: Track API.
-
-2008-09-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CodeGenerationPanel.cs: Properly read and store the "warnings as
-	  errors" flag.
-	* Project/CSharpCompilerParameters.cs: Added PlatformTarget property.
-	  Other minor fixes.
-
-2008-09-26  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpAmbience.cs: Worked on csharp ambience.
-
-2008-09-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/NRefactoryParser.cs: Track API.
-
-2008-09-25  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpAmbience.cs: fixed 'Bug 424499 - Member list should display
-	  normal members and explicitly implemented members differently'.
-
-2008-09-24  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/NRefactoryParser.cs: Fix line/column of errors.
-
-2008-09-24  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: fixed anonymous type bug.
-
-2008-09-24  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs, Gui/CSharpTextEditorCompletion.cs: Show
-	  extension parameter for static resolve.
-
-2008-09-24  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs, Gui/NewOverrideCompletionData.cs,
-	  Gui/ResolveVisitor.cs, Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpAmbience.cs: Added support for C#3.0 extension methods.
-
-2008-09-24  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 427702 - Code
-	  Completion: 'is' and 'as' completion not working properly'.
-
-2008-09-24  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/NRefactoryParser.cs: Worked on tag comments.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Worked on ctrl+space code
-	  completion.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 429034 - Class alias
-	  completion not working properly'.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Added missing constructor
-	  accessible check.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs, Parser/NRefactoryParser.cs:
-	  fixed 'Bug 427448 - Code Completion: completion of constructor
-	  parameters not working'.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/NRefactoryParser.cs: Added pre processor #if directive
-	  foldings.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryParameterDataProvider.cs, Gui/CSharpAmbience.cs: fixed
-	  'Bug 429040 - Parameter completion tooltip not highlighting current
-	  parameter'.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs, Gui/ResolveVisitor.cs: fixed 'Bug 429035
-	  - Completion of string.IsNullOrEmpty throws an exception'.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewOverrideCompletionData.cs: fixed 'Bug 429032 - Override
-	  completion elements can't be selected by name'.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs, Gui/CSharpTextEditorCompletion.cs: fixed
-	  'Bug 429029 - Override completion missing some methods'.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed 'Bug 429024 - Code
-	  completion list shown for 'using' when inside a comment or string'
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewOverrideCompletionData.cs, Gui/CSharpTextEditorCompletion.cs:
-	  fixed 'Bug 428387 - Code Completion: 'override' completion is
-	  incorrect for interfaces'.
-
-2008-09-22  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Worked on ctrl+space command.
-
-2008-09-22  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpAmbience.cs: Generic method parameters are now emitted.
-
-2008-09-22  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs: fixed 'Bug 367716 - Code completion
-	  shows obsolete functions'.
-
-2008-09-22  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed bug 'Bug 427511 - Code
-	  Completion not working for files not belonging to a project'.
-
-2008-09-22  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: Resolver now throws an argumentnull
-	  exception, when dom is not set.
-
-2008-09-20  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Gui/CSharpTextEditorCompletion.cs: removed
-	  debug messages.
-
-2008-09-20  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Parser/NRefactoryParser.cs: Added operator
-	  overload handling.
-
-2008-09-20  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/NRefactoryParser.cs: Operators are now converted.
-
-2008-09-20  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewCSharpExpressionFinder.cs, Gui/CSharpTextEditorCompletion.cs:
-	  Fixed 'Bug 427375 - Code Completion: Incorrect completion of
-	  "using"'
-
-2008-09-20  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Removed duplicate get/set in
-	  property declaration.
-
-2008-09-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: fixed 'Bug 427734 - Code Completion issues
-	  with enums'.
-
-2008-09-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed.
-
-2008-09-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: forget one commit.
-
-2008-09-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: fixed 'Bug 427649 - Code Completion: protected
-	  methods shown in code completion'.
-
-2008-09-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Gui/CSharpTextEditorCompletion.cs: fixed 'Bug
-	  405000 - Namespace alias qualifier operator (::) does not trigger
-	  code completion'.
-
-2008-09-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: fixed 'Bug 397930 - Navigation to generic
-	  method not working correctly'.
-
-2008-09-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs: Found cleaner way
-	  for method resolve result.
-
-2008-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Track api changes.
-	* gtk-gui/objects.xml, gtk-gui/gui.stetic: Flush.
-
-2008-09-18  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: fixed "Bug 427294 - Code Completion:
-	  completion on values returned by methods doesn't work".
-
-2008-09-18  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 427286 - Code
-	  Completion: completion done without showing the completion list".
-
-2008-09-18  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed "Bug 427284 - Code
-	  Completion: class list shows the full name of classes".
-
-2008-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CompilerOptionsPanelWidget.cs: Properly store properties in the
-	  project configurations. The project's configuration list can't be
-	  used because it is duplicated by the properties dialog while it is
-	  being edited.
-	* Parser/NRefactoryParser.cs: Parse positional and named attribute
-	  arguments.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp: Updated projects.
-
-2008-09-17  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs, Gui/NRefactoryResolver.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Fixed code completion issue.
-
-2008-09-17  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Some changes required for unit
-	  testing.
-
-2008-09-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/MemberCompletionData.cs: Improve rendering of documentation. The
-	  new EscapeText call also fixes bug #416842.
-
-2008-09-16  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Removed some debug messages.
-
-2008-09-16  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/NewCSharpExpressionFinder.cs,
-	  Gui/CSharpTextEditorCompletion.cs: fixed regression 325081.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: fixed possible null reference exception.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewCSharpExpressionFinder.cs, Gui/CSharpTextEditorCompletion.cs:
-	  added namespace expression context.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed code completion bug.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: added typeof ( context.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: added base class context.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed regression 334620.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed regression 325509.
-
-2008-09-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/MemberCompletionData.cs: Use the EmitMarkup flag when generating
-	  member documentation.
-	* Gui/CSharpAmbience.cs: Escape '<' and '>' when emitting type names
-	  with markup.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewCSharpExpressionFinder.cs: fixed regression 324908
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryParameterDataProvider.cs, Gui/CSharpAmbience.cs: fixed
-	  regression 324907.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed offset for method
-	  completion.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: fixed regression 323317.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: fixed regression from 323283.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: fixed regression from 321306.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/CSharpTextEditorCompletion.cs: Fixed
-	  regression from bug 318834.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpAmbience.cs: Ambiences now take care of the IncludeGenerics
-	  flag.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed code completion list bug.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/CSharpTextEditorCompletion.cs: fixed
-	  cc bug.
-
-2008-09-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Run the completion extension before the
-	  indentation extension. Fixes tab completion of 'override'.
-
-2008-09-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs: fixed bug in code completion list.
-
-2008-09-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/MemberCompletionData.cs, Gui/CSharpAmbience.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on code completion.
-
-2008-09-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewOverrideCompletionData.cs, Gui/CSharpTextEditorCompletion.cs:
-	  Worked on override completion.
-
-2008-09-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Fixed bug in override completion.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Autotools/Autotools.mdp, gtk-gui/generated.cs,
-	  gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs,
-	  gtk-gui/CSharpBinding.FormattingPanelWidget.cs, gtk-gui/gui.stetic:
-	  Updated generated code.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CompilerOptionsPanelWidget.cs, Gui/CSharpTextEditorCompletion.cs,
-	  Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs: Track api
-	  changes.
-
-2008-09-11  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/NRefactoryParser.cs: Worked on fold information update.
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: Added missing search type.
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/NRefactoryParser.cs: recognizing using/namespace import
-	  differences
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryDocumentMetaInformation.cs, Parser/DomParser.cs,
-	  Parser/NRefactoryParser.cs: Changed compilation unit/document meta
-	  information interface.
-
-2008-09-09  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Added duplicate namespace filter.
-
-2008-09-09  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs, Parser/NRefactoryParser.cs: Some changes caused
-	  by interface changes.
-
-2008-09-08  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs, Parser/NRefactoryParser.cs: Fixed some issues
-	  found by unit testing.
-
-2008-09-05  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Parser/DomParser.cs,
-	  Parser/NRefactoryParser.cs: Worked on dom/refactoring.
-
-2008-09-05  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/NRefactoryParser.cs: fixed bug with namespace resolving.
-
-2008-09-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: Fixed inner type bug.
-
-2008-09-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryParameterDataProvider.cs, CSharpBinding.addin.xml,
-	  CSharpBinding.mdp, Parser/NRefactoryParser.cs, gtk-gui/gui.stetic,
-	  Makefile.am: Added nrefactory based parser.
-
-2008-08-21  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: fixed possible null ref.
-
-2008-08-20  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Parser/DomParser.cs: Worked on indexer resolving.
-
-2008-08-20  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/NewCSharpExpressionFinder.cs: Fixed some accessibility issues.
-
-2008-08-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Fixed type modifiers (fixes some bugs in
-	  stetic).
-
-2008-08-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Parser/DomParser.cs,
-	  Parser/CodeGenerator.cs: Worked on resolving/code generation.
-
-2008-08-18  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on completion.
-
-2008-08-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs,
-	  Gui/CSharpTextEditorIndentation.cs: Worked on completion.
-
-2008-08-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/CSharpTextEditorCompletion.cs,
-	  Parser/DomParser.cs, Parser/CodeGenerator.cs,
-	  Parser/LanguageItemVisitor.cs,
-	  Parser/SharpDevelopTree/GenericParameter.cs,
-	  Parser/SharpDevelopTree/Destructor.cs,
-	  Parser/SharpDevelopTree/Method.cs,
-	  Parser/SharpDevelopTree/ReturnType.cs,
-	  Parser/SharpDevelopTree/Class.cs,
-	  Parser/SharpDevelopTree/Constructor.cs,
-	  Parser/SharpDevelopTree/AttributeSection.cs,
-	  Parser/CSharpExpressionFinder.cs, Makefile.am: worked on code
-	  completion/dom/enum completion,
-
-2008-08-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Parser/CodeGenerator.cs: Worked on some todos.
-
-2008-08-08  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: Worked on some TODOS in the code generator.
-
-2008-08-08  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewOverrideCompletionData.cs, Gui/CSharpTextEditorCompletion.cs:
-	  Added ToString method auto generation.
-
-2008-08-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/CSharpAmbience.cs,
-	  Parser/CodeGenerator.cs: Worked on dom.
-
-2008-08-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/CSharpTextEditorCompletion.cs,
-	  Parser/DomParser.cs: Worked on code completion.
-
-2008-08-05  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs: Fixed resolver bug.
-
-2008-08-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Gui/CSharpAmbience.cs, Parser/DomParser.cs:
-	  Worked on ambiences and resolving
-
-2008-08-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on C#3 code completion.
-
-2008-08-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs,
-	  Gui/CSharpTextEditorIndentation.cs: Share the state engine between
-	  these two editor extensions. Should improve performance a fair bit.
-
-2008-08-01  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: added some changes for return type
-	  representation.
-
-2008-07-31  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs,
-	  Gui/CSharpTextEditorIndentation.cs: Only attach to C# documents.
-
-2008-07-31  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpParameterDataProvider.cs, Gui/OverrideCompletionData.cs,
-	  CSharpBinding.mdp, Parser/DomParser.cs, Parser/Parser.cs,
-	  Parser/CSharpVisitor.cs, Parser/Resolver.cs, Parser/TypeVisitor.cs,
-	  Parser/LanguageItemVisitor.cs, Parser/ExpressionFinder.cs,
-	  Parser/CSharpExpressionFinder.cs, CSharpAmbience.cs, Makefile.am:
-	  Removed outdated files.
-
-2008-07-31  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/NewCSharpExpressionFinder.cs: Worked on C#3 code completion.
-
-2008-07-30  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Gui/CSharpTextEditorIndentation.cs:
-	  Worked on text editor indentation.
-
-2008-07-30  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs: some changes due to
-	  dom changes.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* CSharpLanguageBinding.cs, Gui/CSharpParameterDataProvider.cs,
-	  Gui/CSharpTextEditorExtension.cs, Gui/NewCSharpExpressionFinder.cs,
-	  Gui/OverrideCompletionData.cs, Gui/CSharpAmbience.cs,
-	  Gui/CodeGenerationPanel.cs, Gui/CompilerOptionsPanelWidget.cs,
-	  Parser/Parser.cs, Parser/CSharpVisitor.cs, Parser/CodeGenerator.cs,
-	  Parser/Resolver.cs, Parser/TypeVisitor.cs,
-	  Parser/LanguageItemVisitor.cs, Parser/ExpressionFinder.cs,
-	  Parser/SharpDevelopTree/GenericParameter.cs,
-	  Parser/SharpDevelopTree/Destructor.cs,
-	  Parser/SharpDevelopTree/Method.cs,
-	  Parser/SharpDevelopTree/ReturnType.cs,
-	  Parser/SharpDevelopTree/Class.cs,
-	  Parser/SharpDevelopTree/Constructor.cs,
-	  Parser/SharpDevelopTree/AttributeSection.cs,
-	  Parser/CSharpExpressionFinder.cs, CSharpAmbience.cs: Translated old
-	  code to new dom.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Parser/CodeGenerator.cs: Changes
-	  for converted refactoring infrastructure.
-
-2008-07-28  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Parser/LanguageItemVisitor.cs: Fixed some
-	  nrefactory stuff.
-
-2008-07-28  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryDocumentMetaInformation.cs, Parser/Parser.cs: Some
-	  changes for nrefactory.
-
-2008-07-28  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryDocumentMetaInformation.cs, Gui/ResolveVisitor.cs,
-	  Parser/Parser.cs, Parser/CodeGenerator.cs, Parser/TypeVisitor.cs,
-	  Parser/LanguageItemVisitor.cs: Some changes that make the
-	  csharpbinding compile with the new nrefactory.
-
-2008-07-27  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewOverrideCompletionData.cs, Gui/CSharpTextEditorCompletion.cs,
-	  Gui/NRefactoryDocumentMetaInformation.cs,
-	  Gui/MemberCompletionData.cs, Gui/NRefactoryResolver.cs,
-	  Gui/ResolveVisitor.cs, Gui/NewCSharpExpressionFinder.cs,
-	  Gui/CSharpAmbience.cs, Parser/DomParser.cs, CSharpAmbience.cs:
-	  Worked on code completion/new dom.
-
-2008-07-23  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs, Gui/CSharpTextEditorExtension.cs:
-	  Track API.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/CSharpCompilerParameters.cs: Moved serialization engine to
-	  MonoDevelop.Core. Use new syntax for specifying attribute scope.
-
-2008-07-17  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on code completion.
-
-2008-07-16  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: fixed bug in ctrl+space completion
-	  data.
-
-2008-07-16  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs: some bugfixes.
-
-2008-07-16  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Added xml documentation
-	  support/bugfixes.
-
-2008-07-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/NewCSharpExpressionFinder.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on 'new' completion.
-
-2008-07-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Parser/DomParser.cs: Fixed namespace resolve
-	  bug.
-
-2008-07-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs: Fixed possible null reference exception.
-
-2008-07-14  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Changes due to recent dom parser changes.
-
-2008-07-14  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs: Fixed inner types.
-
-2008-07-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorCompletion.cs: Worked on ctrl+space completion.
-
-2008-07-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on code completion.
-
-2008-07-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs: Some code
-	  completion fixes.
-
-2008-07-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewOverrideCompletionData.cs, Gui/CSharpAmbience.cs,
-	  Gui/CSharpTextEditorCompletion.cs, Parser/DomParser.cs: Added C#
-	  ambience for new dom. Worked on override completion.
-
-2008-07-11  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NewOverrideCompletionData.cs, Gui/NewCSharpExpressionFinder.cs,
-	  Gui/OverrideCompletionData.cs, Gui/CSharpTextEditorCompletion.cs,
-	  Parser/DomParser.cs: Worked on code completion.
-
-2008-07-11  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/CSharpTextEditorCompletion.cs,
-	  Gui/CSharpTextEditorExtension.cs: Added xml/preprocessor completion
-	  to the new completion class.
-
-2008-07-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs, Parser/DomParser.cs: Worked on
-	  code completion.
-
-2008-07-10  Mike Krüger <mkrueger@novell.com> 
-
-	* CSharpBinding.addin.xml: accidentally checked in new code completion
-	  enabled addin file.
-
-2008-07-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/NewCSharpExpressionFinder.cs,
-	  Gui/CSharpTextEditorCompletion.cs, Parser/DomParser.cs: Worked on
-	  code completion. Added new expression finder from sharpdevelop3
-	  (LGPL).
-
-2008-07-09  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Gui/NRefactoryParameterDataProvider.cs: Worked
-	  on new dom.
-
-2008-07-09  Mike Krüger <mkrueger@novell.com> 
-
-	* CSharpBinding.addin.xml: switched back to old code completion.
-
-2008-07-09  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Gui/NRefactoryParameterDataProvider.cs,
-	  Gui/CSharpParameterDataProvider.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on method completion.
-
-2008-07-08  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on completion.
-
-2008-07-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/CSharpTextEditorCompletion.cs,
-	  Parser/DomParser.cs, Parser/mcs/dom.cs: Worked on completion.
-
-2008-07-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on code completion.
-
-2008-07-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/CSharpTextEditorCompletion.cs: Worked
-	  on text editor completion.
-
-2008-07-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Parser.cs: fixed Bug 405930 - FoldingRegions in compilation
-	  units are all folded by default.
-
-2008-07-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ResolveVisitor.cs, Gui/CSharpTextEditorCompletion.cs: Worked on
-	  completion.
-
-2008-06-25  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/CSharpTextEditorCompletion.cs: Worked on code completion.
-
-2008-06-25  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs: Worked on
-	  nrefactory resolver.
-
-2008-06-24  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/ResolveVisitor.cs,
-	  Gui/CSharpTextEditorCompletion.cs, Parser/DomParser.cs,
-	  Parser/Resolver.cs, Parser/CSharpExpressionFinder.cs, Makefile.am:
-	  Worked on code completion 
-
-2008-06-23  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fix preprocessor directive
-	  completion. Short out completion when indent engine says inside
-	  string or comment.
-	* FormattingStrategy/CSharpIndentEngine.cs: Add methods to check if
-	  inside preprocessor directive or comment/string.
-
-2008-06-23  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* FormattingStrategy/CSharpIndentEngineStack.cs,
-	  FormattingStrategy/CSharpIndentEngine.cs: Capture keywords for
-	  proprocessor directives. Pop #region/#endregion directives back
-	  out.
-
-2008-06-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Added tab == reindent function.
-
-2008-06-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/CodeGenerator.cs: Implement creation of folding regions, and
-	  copy workaround in ImplementMember to new ImplementMembers
-	  override.
-
-2008-06-20  Ankit Jain  <jankit@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs (FindOverridables): Move to
-	CodeRefactorer and use that.
-
-2008-06-19  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/NRefactoryResolver.cs, Gui/CSharpTextEditorCompletion.cs,
-	  Gui/CSharpTextEditorExtension.cs: Worked on code completion with
-	  the new dom.
-
-2008-06-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Parser/DomParserOld.cs,
-	  Parser/DomParser.cs, Parser/CSharpExpressionFinder.cs: Worked on
-	  new expression finder.
-
-2008-06-10  Andres G. Aragoneses <aaragoneses@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Implement feature to allow unmanaged
-	  project references in a managed project (bug#397490).
-
-2008-06-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: fixed 'Bug 396798 - Smart
-	  Indendation mode doesn't work with tab-to-space-conversion
-	  enabled'.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Bump MD version.
-
-2008-05-28  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Worked on dom parser.
-
-2008-05-27  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Fixed some bugs in the new dom parsing.
-
-2008-05-27  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Added new dom & new class browser.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Merged the extension points for project and
-	  solution option panels into a single extension point. A single
-	  extension point will now be used for all kinds of items. Extension
-	  conditions can be used to make panels visible only for some
-	  specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpLanguageBinding.cs, CSharpBindingCompilerManager.cs: Replaced
-	  ICompilerResult/DefaultCompilerResult/CompilerResults by a new
-	  BuildResult class, which has owner information at error level, so
-	  it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/OverrideCompletionData.cs, Gui/CodeGenerationPanel.cs,
-	  Gui/CompilerOptionsPanelWidget.cs, CSharpBinding.addin.xml,
-	  md1format.xml, CSharpBinding.mdp, Parser/Parser.cs,
-	  CSharpBindingCompilerManager.cs,
-	  Project/CSharpResourceIdBuilder.cs,
-	  Project/CSharpCompilerParameters.cs, gtk-gui/gui.stetic,
-	  Makefile.am: New project model changes.
-
-2008-05-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CSharpBinding.addin.xml: Set "isText" attribute on the mimetype
-	  definitions.
-
-2008-04-24  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Worked on mcs integration.
-
-2008-04-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fix indexer range crasher. Thanks
-	  to Atsushi Eno and Joseph Lombrozo for spotting this.
-
-2008-04-18  Marek Safar <marek.safar@gmail.com>

-

-	* Parser/mcs/**: Exposed most of the type container members.

-

-2008-04-17  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* FormattingStrategy/CSharpIndentEngine.cs: Implement
-	  IDocumentStateEngine so that state tracking logic can be moved into
-	  MonoDevelop.Ide.
-	* Gui/CSharpTextEditorExtension.cs: Move state tracking logic into
-	  MonoDevelop.Ide. Tidy some things into regions.
-
-2008-04-17  Marek Safar <marek.safar@gmail.com>

-

-	* Parser/mcs/**

-	* Parser/DomParser.cs: Added top level types info.

-

-2008-04-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Track API change. Remove char code
-	  translation hack.
-	* Gui/CompilerOptionsPanelWidget.cs: Fix minor GTK warning.
-
-2008-04-16  Marek Safar <marek.safar@gmail.com>
-
-	* Parser/mcs/**: Initial top level DOM support.
-	
-	* Parser/DomParser.cs: Updated.
-
-	* Makefile.am: Updated.
-
-2008-04-16  Marek Safar <marek.safar@gmail.com>
-
-	* Parser/mcs/cs-parser.cs: Sync with /mcs/mcs
-
-	* Makefile.am: Updated.
-
-2008-04-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Parser.cs: fixed Bug 379224 - Folded XML-comment should
-	  contain content of <summary/>
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fix potential infinite loop.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Use the new mime type extension to register
-	  new file types.
-	* Parser/CSharpVisitor.cs: Remove debug code.
-
-2008-04-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Makefile.am: updated makefile.am
-
-2008-04-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/mcs/typemanager.cs: fixes compilation error.
-
-2008-04-10  Mike Krüger <mkrueger@novell.com> 
-
-	* CSharpBinding.addin.xml, CSharpBinding.mdp, Parser/DomParser.cs,
-	  Parser/mcs, Parser/mcs/report.cs, Parser/mcs/generic.cs,
-	  Parser/mcs/support.cs, Parser/mcs/typemanager.cs,
-	  Parser/mcs/cs-tokenizer.cs, Parser/mcs/External,
-	  Parser/mcs/External/MonoSymbolWriter.cs,
-	  Parser/mcs/External/MonoSymbolFile.cs,
-	  Parser/mcs/External/CryptoConvert.cs,
-	  Parser/mcs/External/MonoSymbolTable.cs,
-	  Parser/mcs/doc-bootstrap.cs, Parser/mcs/lambda.cs,
-	  Parser/mcs/parameter.cs, Parser/mcs/modifiers.cs,
-	  Parser/mcs/pending.cs, Parser/mcs/rootcontext.cs,
-	  Parser/mcs/namespace.cs, Parser/mcs/literal.cs,
-	  Parser/mcs/ecore.cs, Parser/mcs/linq.cs, Parser/mcs/class.cs,
-	  Parser/mcs/decl.cs, Parser/mcs/location.cs,
-	  Parser/mcs/roottypes.cs, Parser/mcs/delegate.cs,
-	  Parser/mcs/flowanalysis.cs, Parser/mcs/iterators.cs,
-	  Parser/mcs/cs-parser.jay, Parser/mcs/convert.cs,
-	  Parser/mcs/assign.cs, Parser/mcs/const.cs, Parser/mcs/cfold.cs,
-	  Parser/mcs/anonymous.cs, Parser/mcs/constant.cs,
-	  Parser/mcs/driver.cs, Parser/mcs/AssemblyInfo.cs,
-	  Parser/mcs/generic-mcs.cs, Parser/mcs/nullable.cs,
-	  Parser/mcs/cs-parser.cs, Parser/mcs/expression.cs,
-	  Parser/mcs/symbolwriter.cs, Parser/mcs/attribute.cs,
-	  Parser/mcs/enum.cs, Parser/mcs/statement.cs, Parser/mcs/doc.cs,
-	  Makefile.am, Parser/mcs/codegen.cs: Worked on mcs parser layer
-	* Parser/Parser.cs: fixed 'Bug 378432 - Comments should not fold if
-	  they are not the first text on the line'.
-
-2008-04-02  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Fixed namespace bug.
-
-2008-04-02  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Parser.cs: fixed typo
-
-2008-04-02  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Parser.cs: fixed comment positioning.
-
-2008-04-02  Michael Hutchinson <mhutchinson@novell.com>
-
-	* Parser/Parser.cs: Fix build on Mono head, where gmcs's ternary 
-	  operator precedence is behaving differently for some reason. 
-
-2008-04-01  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Parser.cs: No longer generating folding regions for single
-	  line comments.
-
-2008-03-31  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CSharpVisitor.cs: added location information for using
-	  statements.
-
-2008-03-31  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Parser.cs: Added folding regions for comments.
-
-2008-03-28  Peter Johanson <peter@peterjohanson.com>
-
-	* Parser/Resolver.cs: Make "value" resolve properly to System.Array
-	  when in the setter for a property that's an array type.
-
-2008-03-27  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Added patch from Jan Oravec  to fix Bug 372380 -
-	  MD crash.
-
-2008-03-21  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: fixed Bug 372380 - MD crash.
-
-2008-03-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fix CS0136 error with csc (see gmcs
-	  "Bug 370414 - Missing CS0136").
-
-2008-03-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: fixed typo.
-
-2008-03-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Fixed Bug 367270 - MD crash.
-
-2008-03-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CodeGenerationPanel.cs, Parser/Resolver.cs,
-	  Parser/ExpressionFinder.cs,
-	  gtk-gui/CSharpBinding.FormattingPanelWidget.cs: Fixed compiler
-	  warnings, fixed Bug 369476 - NRE in C# binding crashed text editor.
-
-2008-03-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/FormattingPanel.cs, CSharpBinding.addin.xml,
-	  gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs,
-	  gtk-gui/CSharpBinding.FormattingPanelWidget.cs: Use new options
-	  dialog infrastructure.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CompilerOptionsPanelWidget.cs,
-	  gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs: Worked on gnome hig
-	  compliant alerts.
-
-2008-02-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fix line/column check. Positions are
-	  1-based.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* CSharpBinding.mdp, Makefile.am: Removed some unused glade and gnome-sharp
-	  references (only the unused). But I'll continue to remove glade, we need
-	  to lower the dependency tree a bit.
-
-2008-02-09  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Gui/FormattingPanel.cs,
-	  CSharpBinding.addin.xml, CSharpBinding.mdp,
-	  FormattingStrategy/CSharpFormattingStrategy.cs,
-	  gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs, Makefile.am:
-	  Removed SourceEditor dependency.
-
-2008-02-05  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Parser.cs: Fixed #region ... #endregion end region position.
-
-2008-02-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CSharpVisitor.cs: Corrected type location.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Update MD version.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/ConsoleProject.xpt.xml, templates/GnomeSharp2Project.xpt.xml,
-	  templates/GtkSharp2Project.xpt.xml,
-	  templates/GladeSharp2Project.xpt.xml, templates/Library.xpt.xml,
-	  templates/EmptyCSharpFile.xft.xml, templates/EmptyProject.xpt.xml,
-	  templates/AssemblyInfo.xft.xml: Make template categories translatable.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Manually create CompilerError for certain
-	  errors, as the CreateErrorFromString method returned null in that
-	  scenario. Fixes error caused by trying to use a null CompilerError.
-
-2008-01-14  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: fixed Bug 350881 - Code completion not
-	  working in a specific case.
-
-2008-01-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CSharpLanguageBinding.cs, CSharpBindingCompilerManager.cs: Don't always
-	  set the DEBUG define when debug info is emitted. However, add it to the
-	  defines list for new debug configurations.
-
-2008-01-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fixed Bug 350864 - Refactory tools - renaming.
-
-2008-01-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Fixed 350861: Autocomplete displays hidden items
-
-2008-01-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Parser/Resolver.cs: Fixed some infinite
-	  loops when a class inherits from itself due to invalid code. Fixes bug
-	  #350855.
-
-2008-01-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Check C# compiler exit code to detect
-	  when it crashes. Should fix "Bug 351347 - MD ignores mcs/gmcs crash".
-
-2007-12-31  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/AssemblyInfo.xft.xml: Add revision to version number.
-	* templates/EmptyCSharpFile.xft.xml: Use standard header instead of
-	  hardcoded header.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp: Updated project files. The order of extended properties
-	  won't change anymore.
-
-2007-12-13  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CSharpBinding.addin.xml: Updated. Prefix C# templates IDs with "CSharp" so
-	  that they're not invading the generic part of the unique ID landscape.
-	* CSharpBinding.mdp, Makefile.am: Updated.
-	* templates/ConsoleProject.xpt.xml, templates/GnomeSharp2Project.xpt.xml,
-	  templates/GtkSharp2Project.xpt.xml, templates/AssemblyInfo.xft.xml,
-	  templates/GladeSharp2Project.xpt.xml, templates/Library.xpt.xml: Move
-	  common files out of project templates to ease maintenance. Make
-	  AssemblyInfo more readable. Enable standard headers.
-	* templates/GnomeSharpProject.xpt.xml, templates/GtkSharpProject.xpt.xml,
-	  templates/GladeSharpProject.xpt.xml,
-	  templates/GnomeSharpProgram.xft.xml: Remove obsolete templates.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Parser/CodeGenerator.cs,
-	  Parser/ExpressionFinder.cs: Fix warnings.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml, Autotools/Autotools.mdp, Autotools/Makefile.am,
-	  CSharpBinding.mdp, CSharpBinding.mds, gtk-gui/gui.stetic, Makefile.am:
-	  Directory reorganization.
-
-2007-12-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fix for "Bug 345774 - "override"
-	  statement completion include members internal to another assembly.".
-
-2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Implement completion of symbols when
-	  typing #if or #elif.
-
-2007-11-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CompilerOptionsPanelWidget.cs: Load existing LangVersion value.
-
-2007-11-23  Andreia Gaita <avidigal@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: When a comma is typed in a method call,
-	check that code completion is active before calling it
-
-2007-11-22  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CSharpLanguageBinding.cs: Add support for 2.1 profile.
-	* Gui/ChooseRuntimePanel.cs: Unused; delete.
-	* Gui/CodeGenerationPanel.cs, Gui/CompilerOptionsPanelWidget.cs,
-	  gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/CSharpBinding.CompilerOptionsPanelWidget.cs: Add support for
-	  LangVersion and AdditionalArgs. Move options from per-config to
-	  per-project.
-	* CSharpBinding.addin.xml, CSharpBinding.mdp, gtk-gui/objects.xml,
-	  gtk-gui/gui.stetic, Makefile.am: Updated.
-	* Autotools/CSharpAutotoolsSetup.cs: Add support for 2.1 profile, additional
-	  args and langversion.
-	* CSharpBindingCompilerManager.cs: Add support for 2.1 profile, additional
-	  args, nowarn and langversion.
-	* Project/CSharpCompilerParameters.cs: Add support for LangVersion and
-	  AdditionalArgs.
-
-2007-11-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/CSharpCompilerParameters.cs: Removed some obsolete attributes.
-
-2007-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix distcheck by disabling automatic running of unit 
-	  tests in check target, as their running is somewhat broken.
-
-2007-11-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* CSharpEnhancedCodeProvider.cs: Use non-obsolete APIs.
-	* Parser/CodeGenerator.cs: Track API change.
-
-2007-11-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fix invalid cast. Fixes bug #342607.
-
-2007-11-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fix "Bug 342124 - Tab should indent,
-	  regardless of the position of the cursor", as its behaviour was
-	  confusingly inconsistent. Remove some unused code.
-
-2007-11-16  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/TypeVisitor.cs, CSharpBindingCompilerManager.cs: Fixed "Bug 341901
-	  - MD and CS0618 warning results". And a possible nullreference exception
-	  in TypeVisitor.
-
-2007-11-14  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Don't interpret tab as a reindent
-	  command when there's a selection. Fixes "Bug 341319 - Tab not working
-	  correctly". Also, remove a load of dead code.
-
-2007-11-13  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/OverrideCompletionData.cs: When generating overrides, only call the
-	  base if it's non-abstract and not an interface, else generate a
-	  NotImplementedException. Fixes "Bug 341495 - Problem with auto-generated
-	  code for overriden methods".
-
-2007-11-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fix completion of 'new'.
-
-2007-11-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Fixed "Bug 339209 - App crashes when trying to list
-	  members in base class when you derive from current class".
-
-2007-11-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Completion check for '#' must be done
-	  relative to trigger offset. Fixes bug #338382.
-
-2007-11-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/CSharpVisitor.cs: Set the explicit declaration type for indexers.
-	* Parser/CodeGenerator.cs: Workaround for bug in the code generator. Generic
-	  private implementation types are not generated correctly when they are
-	  generic.
-
-2007-11-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: see/seealso tags are now generated with
-	  cref (xml doc completion).
-
-2007-11-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed "Bug 340875 - Bugs while using XML
-	  comments".
-
-2007-11-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fix part 1 of "Bug 340875 - Bugs 
-	  while using XML comments". Smart indent for newlines in doc comments 
-	  was being triggered by the Enter command with the autocompletion 
-	  dropdown.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/CodeGenerator.cs, CSharpBindingCompilerManager.cs: Track
-	  LoggingService API changes.
-
-2007-11-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Don't try to look back at chars before
-	  the beginning of the buffer when deciding how to handle tabs.
-	  Restructure/comment the affected code so it's easier to understand.
-	  Fixes "Bug 340270 - Ctrl+Tab caused exception".
-
-2007-11-08  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Parser/Resolver.cs: Fixed "Bug 335140 -
-	  MD does not exlude this class from base classes list".
-
-2007-11-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed "Bug 339480 - Crash in XML comment
-	  autocompletion".
-
-2007-11-06  Zach Lute  <zach.lute@gmail.com>
-
-	* Gui/CSharpTextEditorExtension.cs: Added missing null check to fix 
-	  Bug #339445.
-
-2007-11-06  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Override TextChanged in order to update
-	  Smart Indent engine correctly when buffer is modified before its cursor.
-
-2007-11-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fixed "Bug 336598 - Renaming variables by
-	  refactoring replaces matches in the replace string" and "Bug 335977 -
-	  Rename refactoring does not rename instance in foreach".
-
-2007-11-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Fixed "Bug 337658 - MD intellisense does not work for
-	  `value'".
-
-2007-11-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* FormattingStrategy/CSharpIndentEngine.cs: Properly collapse folded
-	  statements when a block is opened. Fixes the first complaint in "Bug
-	  338383 - MD ignores existing source code structure.".
-
-2007-11-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Provide a better error message in case of
-	  type load error in the compiler. Fixes bug #325380.
-
-2007-11-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Include generic type parameters in completion list.
-	  Fixes bug #334620.
-
-2007-11-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Implemented completion context for
-	  "SomeEnum e =". In this case the completion list will show the enum
-	  name. Fixes bug #335142.
-
-2007-11-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Include in the completion list the classes from parent
-	  namespaces. Fixes bug #338394.
-
-2007-11-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Improved completion of 'namespace'
-	  keyword. Fixes bug #338392.
-
-2007-11-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Restore IsAsResolve logic. Is/as are used for
-	  downcasting, so it only makes sense to return subclasses of the provided
-	  type.
-
-2007-10-29  Michael Hutchinson  <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Don't try to look back past first 
-	  char in buffer when checking whether to run completion code.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Bump MD version.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Track changes in the Icon extension node.
-
-2007-10-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Avoid calling
-	  expressionFinder.FindExpression on every keystroke, as it calls
-	  FilterComments, which is very expensive (recorded 6% in statistical
-	  profiling, the most time spent in any managed non-runtime method). It's
-	  only called when the keystroke is completable -- not ideal, but an
-	  improvement.
-
-2007-10-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Removed GenerateDocComments' dependency
-	  on indentEngine.
-
-2007-10-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Minor optimisation.
-
-2007-10-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Read context to end of line when
-	  reindenting. Fixes "Bug 324985 - operator '::' behaves like goto label
-	  in smart indentation".
-
-2007-10-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: If indent engine says line needs to be
-	  reindented, check it's as a result of an inserted character rather than
-	  just navigating around the code.
-
-2007-10-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Don't insert a tab if it's interpreted
-	  as a reindent command.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Make compilation work when the key file
-	  contains white spaces. Fixes bug #336107.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp, icons/C#.File.EmptyFile, icons/C#.File.Form,
-	  icons/C#.File.FullFile, icons/C#.File.NewClass, icons/C#.File.WebFile,
-	  icons/C#.Project.FullProject, icons/C#.Project.ServiceProject,
-	  icons/C#.Project.UserControl, icons/C#.Project.WebProject,
-	  icons/C#.ProjectIcon, Makefile.am, templates/EmptyCSharpFile.xft.xml,
-	  templates/GnomeSharpProgram.xft.xml: Use tango file icons. Removed
-	  obsolete icons.
-
-2007-10-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp, templates/ConsoleProject.xpt.xml,
-	  templates/GtkSharpProject.xpt.xml, templates/GnomeSharpProject.xpt.xml,
-	  templates/GnomeSharp2Project.xpt.xml,
-	  templates/GtkSharp2Project.xpt.xml, templates/GnomeSharpProgram.xft.xml,
-	  templates/GladeSharpProject.xpt.xml,
-	  templates/GladeSharp2Project.xpt.xml, templates/Library.xpt.xml,
-	  templates/EmptyProject.xpt.xml, Makefile.am, icons/C#.Project.Form,
-	  icons/C#.Project.Library, icons/C#.Project.DOSProject,
-	  icons/csharp-icon-32.png, icons/C#.Project.EmptyProject: Updated project
-	  icons. Use the base project icon with an overlay to show the type.
-
-2007-10-24  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Refactored the keypress code to separate
-	  out the indent engine and doc comments, also splitting up the indent
-	  handling code into three phases. Renamed "engine" to "indentEngine".
-	  Improved handling of auto-commenting on newlines. Fixed "Bug 335824 -
-	  Better handling of the 'tab' key". Fixed "Bug 326289 - MD texteditor is
-	  painfully slow" by caching old indent stacks and bulk-copying characters
-	  during large updates.
-
-2007-10-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed "Bug 335145 - Intellisense
-	  displays wrong entries for typeof statement".
-
-2007-10-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Fixed "Bug 335133 - Intellisense does not display
-	  object members for interfaces".
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml, Makefile.am, templates/GtkSharpWindow.xft.xml:
-	  Removed the Gtk.Window template, because the Stetic addin already
-	  provides a template for creating windows.
-	* Autotools/Autotools.mdp, CSharpBinding.mdp, CSharpBinding.mds: Updated.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/OverrideCompletionData.cs: Flags for showing return types and
-	  parameters must be explicitely specified now.
-
-2007-10-18  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpParameterDataProvider.cs, Gui/CSharpTextEditorExtension.cs:
-	  Fixed "Bug 325509 - Inaccessible methods displayed in autocomplete".
-
-2007-10-17  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: changed is/as resolve.
-
-2007-10-17  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Fixed "Bug 334236 - Intellisense does not work for
-	  `is' keyword".
-
-2007-10-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Let TypeNameResolver fill the names using the compiled
-	  unit. Helps fixing bug #325081.
-
-2007-10-17  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CSharpVisitor.cs: Modified visitor to handle explicit declarations.
-
-2007-10-16  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: fixed "Bug 325528 - Intellisense contains multiple
-	  entries of same namespace".
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp, Parser/TypeNameResolver.cs, Makefile.am: Moved
-	  TypeNameResolver to MD.Projects.
-
-2007-10-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed "Bug 333140 - Xml comment
-	  generation only works when using "Smart" indentation".
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Applied changes that were neccassary for
-	  to the new FileService.
-
-2007-10-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpAmbience.cs: Always show parameter types.
-
-2007-10-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpAmbience.cs: Properly show the method name for conversion operators.
-
-2007-10-04  Zach Lute <zach.lute@gmail.com>
-
-	* Parser/CSharpVisitor.cs: Added support for implicit/explicit operators as
-	  methods. (Bug #330503)
-
-2007-10-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpAmbience.cs: Formatting fixes.
-
-2007-10-09  Mike Krüger <mkrueger@novell.com> 
-
-	* CSharpAmbience.cs: Changed the C# ambience to recognize the new conversion
-	  flags.
-
-2007-10-09  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Parser.cs: Fixed "Bug 331772 - Unable to handle conditional class
-	  definition".
-
-2007-10-09  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed "Bug 331000 - Auto-generation of
-	  XML comment tags sometimes incorrect".
-
-2007-10-09  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManger.cs: Moved code for building resources to
-	DotNetProject.
-
-2007-10-08  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: fixed "Bug 325223 - Interface refactory doesn't
-	  implement correctly (4 bugs)".
-
-2007-10-08  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/ExpressionFinder.cs: Worked on "Bug 330717 - Error while updating
-	  status of command. CurrentRefactoryOperations". Need to get reply, if
-	  this bug is fixed (couldn't reproduce the problem).
-
-2007-10-05  Ankit Jain  <jankit@novell.com>
-
-	* Autotools/CSharpAutotoolsSetup.cs (GetCompilerFlags): Correctly emit
-	flag for optimization. Don't emit -define:DEBUG if its already defined
-	in DefineSymbols.
-
-2007-10-05  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: fixed Bug 325523 - MD override
-	  auto-implementation ignores existing implementations.
-
-2007-10-05  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: fixed Bug 330793 - Delegate
-	  autocommenting crashes.
-
-2007-10-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/CSharpVisitor.cs, Parser/Resolver.cs: Properly resolve aliases
-	  bound to instantiated generic types. Fixes bug #324844.
-	* Parser/TypeNameResolver.cs: Resolve aliased class names.
-
-2007-10-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpParameterDataProvider.cs, Gui/CSharpTextEditorExtension.cs:
-	  Implemented support for the Show Parameter List command. Also, show the
-	  parameter list when typing a comma. Fixes bug #324876.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Bump MD version.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Don't set the Editor.CursorPosition
-	  property if position hasn't really changed, since it will raise the
-	  completion context change event, which closes the completion window.
-
-2007-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fix regex in RenameClass. Class name may end with
-	  ":".
-
-2007-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fix renaming of partial classes. It was using the
-	  wrong IClass to get the line and column.
-
-2007-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: When completing 'override', show
-	  overridables for System.Object.
-
-2007-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/OverrideCompletionData.cs: Generate call to base class when overriding
-	  method. Fixes bug #325524.
-
-2007-09-18  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed Bug 325438 - New doc completion
-	  slowing me down.
-
-2007-09-15  Jérémie Laval <jeremie.laval@gmail.com>
-
-	* Parser/Parser.cs: Added support for parsing error retrieval from NRefactory.
-
-2007-09-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/OverrideCompletionData.cs, Gui/CSharpTextEditorExtension.cs,
-	  CSharpAmbience.cs: Make proper use of ITypeNameResolver everywhere to
-	  resolve type names of parameters, methods, etc. Fixes bug #82854.
-	* Parser/TypeNameResolver.cs: Fix name resolution for aliases.
-
-2007-09-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs (PushColon): Handle the
-	:: operator. Fixes bug #82316.
-
-2007-09-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Minor fix.
-	* Parser/TypeNameResolver.cs: Remove debug code.
-
-2007-09-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Parser/Resolver.cs,
-	  Parser/TypeNameResolver.cs: Implement support for ITypeResolver. Add
-	  parameter completion support for delegate invocations. Fixes bug #82264
-	  and #82238.
-	* CSharpBinding.mdp: Fix warning level. Added new file.
-	* CSharpAmbience.cs: Track API changes.
-	* Makefile.am: Updated.
-
-2007-09-14  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fixed 82425:Renaming a base method doesn't rename
-	  overrides. (Fixed for properties too).
-
-2007-09-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpParameterDataProvider.cs: Improved method formatting.
-	* Gui/CSharpTextEditorExtension.cs, Parser/Resolver.cs: When resolving a
-	  type, take into account parameter types for methods and classes. Fixes
-	  bug #82209.
-
-2007-09-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpAmbience.cs: The name of a delegate is the name of the class, not
-	  the return type of the invoke method. Don't show the delegate parameters
-	  unless the 'show class modifiers' flag is set.
-
-2007-09-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fixed re opened 82311: Rename fails when we have
-	  two variables that are called the same. (another issue).
-
-2007-09-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/LanguageItemVisitor.cs: Properly resolve "this". Fixes bug #82503.
-
-2007-09-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Allow showing intrinsic names only when
-	  resolving is, as or new.
-	* Gui/FormattingPanel.cs, CSharpBinding.mdp,
-	  gtk-gui/CSharpBinding.FormattingPanelWidget.cs, gtk-gui/gui.stetic:
-	  Updated.
-	* Parser/Resolver.cs: The text editor extension needs internalResolve to
-	  return the real array types, not only System.Array. Fixes bug #82831.
-	* CSharpAmbience.cs: Add support for the new UseIntrinsicNames flag.
-
-2007-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Don't include abstract classes in the
-	  'new' completion list.
-
-2007-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/TypeVisitor.cs: Use the fully qualified name when returning the
-	  type for array items. Fixes bug #82830.
-
-2007-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs, Parser/TypeVisitor.cs: The 'this' reference is not
-	  valid outside of a class member. Fix for bug #82743.
-
-2007-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/ChooseRuntimePanel.cs, Gui/CodeGenerationPanel.cs,
-	  FormattingStrategy/CSharpFormattingStrategy.cs, CSharpAmbience.cs: Fix
-	  warnings.
-	* Gui/CSharpTextEditorExtension.cs, Parser/Resolver.cs: Disable code
-	  completion inside enum declarations. Fixes bug #82541. Removed some
-	  warnings.
-	* gtk-gui/generated.cs, gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/CSharpBinding.FormattingPanelWidget.cs, gtk-gui/gui.stetic:
-	  Updated.
-
-2007-09-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed 82770: MonoDevelop should keep in
-	  comments when return is pressed.
-
-2007-09-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed 82768: Move cursor after new
-	  summary comment.
-
-2007-09-12  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fixed 82311: Rename fails when we have two
-	  variables that are called the same.
-
-2007-09-11  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): Pass /warn: command line
-	param.
-
-2007-09-11  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: Fixed 82500: Rename refactoring enum value
-	  crashes MonoDevelop.
-
-2007-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Fixed 82760: Nul ref enableing autocomplete.
-
-2007-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed 82223: Overload selection does not
-	  work when breaking the line.
-
-2007-09-10   <> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed 82683: MonoDevelop should generate
-	  XML documentation when /// is typed.
-
-2007-09-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Track api changes.
-
-2007-09-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Resolver.cs: Fixed 82505: No autocomplete for static members. Fixed
-	  some other resolve cases too. (non static members only in non static
-	  methods)
-
-2007-09-07  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/CodeGenerator.cs: Handled bug 82714: Invalid offset in text editor.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/ChooseRuntimePanel.cs, Gui/CodeGenerationPanel.cs,
-	  Gui/FormattingPanel.cs, Parser/Resolver.cs,
-	  FormattingStrategy/CSharpFormattingStrategy.cs,
-	  FormattingStrategy/CSharpFormattingProperties.cs,
-	  gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/CSharpBinding.FormattingPanelWidget.cs, CSharpAmbience.cs:
-	  Changes due to new property infrastructure.
-
-2007-08-24  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Fixed 82555: Xml comments activating
-	  incorrectly.
-
-2007-08-23  Mike Krüger <mkrueger@novell.com> 
-
-	* CSharpEnhancedCodeProvider.cs, Parser/Parser.cs, Parser/CSharpVisitor.cs,
-	  Parser/CodeGenerator.cs, Parser/Resolver.cs, Parser/TypeVisitor.cs,
-	  Parser/LanguageItemVisitor.cs,
-	  Parser/SharpDevelopTree/GenericParameter.cs,
-	  Parser/SharpDevelopTree/Destructor.cs,
-	  Parser/SharpDevelopTree/Method.cs,
-	  Parser/SharpDevelopTree/ReturnType.cs, Parser/SharpDevelopTree/Class.cs,
-	  Parser/SharpDevelopTree/Constructor.cs: Changed to the latest NRefactory
-	  version.
-
-2007-08-23  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (GetResourceId): Set the resource id
-	correctly even if resgen is not required.
-
-2007-08-23  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #82533.
-	* CSharpBindingCompilerManager.cs (GetResourceId): Generate .resources
-	with resgen only if required.
-
-2007-08-21  Andrés G. Aragoneses  <knocte@gmail.com>
-
-	Improve fix for bug #82398.
-	* CSharpBindingCompilerManager.cs (GetResourceId): Use MONO_IOMAP=drive,
-	and only on Unix.
-
-2007-08-20  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): Add all build files to the
-	list of files to be compiled. Don't filter with CanCompile.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: When listing the members of an enum, return enum
-	  members only (it is correct to call static methods using an enum type
-	  reference, but it doesn't make much sense). Fixes bug #82250.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Method parameters must be resolved before class
-	  members. Fixes bug #82391.
-
-2007-08-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Fix possible infinite recursion (bug #82303).
-
-2007-08-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Properly set the showStatic flag after finding a
-	  member in SearchMember. Fixes a problem with nested classes and enums:
-	  members were not properly shown.
-
-2007-08-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Properly resolve inner class names. Fixes part of
-	  #82414.
-
-2007-08-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: When resolving a var name, parameters have priority
-	  over fields.
-
-2007-08-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Include arguments in the resolve list for CtrlSpace.
-	  Fixes bug #82391.
-
-2007-08-14  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #82398.
-	* CSharpBindingCompilerManager.cs (GetResourceId): Run resgen with
-	MONO_IOMAP=all.
-
-2007-08-14  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs,
-	  FormattingStrategy/CSharpIndentEngineStack.cs,
-	  FormattingStrategy/CSharpIndentEngine.cs: Added support for
-	  documentation comments 
-	
-	  (fixes bug 78578: Add XML Comment support to MonoDevelop and
-	  integrate with tooltips).
-	
-	  + Auto complete of /// tags
-	
-	  + code completion for the xml documentation tags
-	
-	  + auto generation of a header body
-
-2007-08-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Started to work on xml comment tag
-	  support.
-
-2007-08-10  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #82394.
-	* CSharpBindingCompilerManager.cs (Compile): Abort build if error while
-	generating resources.
-	(GetResourceId): Refactor slightly to report error. Also, parse
-	the line/col number for the CompilerError.
-	(RegexErrorLinePos): New.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml, Autotools/Makefile.am, CSharpBinding.mdp,
-	  Makefile.am: Reorganized the extension point hierarchy. Embedded all
-	  add-in manifests as resources.
-
-2007-07-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/CSharpSessionStateWebService.xft.xml,
-	  templates/CSharpWebService.xft.xml: Removed unused files.
-
-2007-07-30  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs: Add ctor references too. Fixes bug
-	#82204.
-
-	* Gui/CSharpTextEditorExtension.cs: Handle indent-region by
-	resetting state so that we don't get confused.
-
-2007-07-27  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpFormattingStrategy.cs (FormatLine):
-	Fixed to be a no-op.
-
-2007-07-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fixes for bug #82179.
-
-	* FormattingStrategy/CSharpIndentEngineStack.cs (Push): Added a
-	second Push() method allowing the caller to force a particular
-	indent.
-
-	* FormattingStrategy/CSharpIndentEngine.cs (PushOpenBrace): Trim
-	the indent level as we pop FoldedStatements and use
-	stack.PeekKeyword(0) instead of stack.PeekKeyword(1).
-	(PushFoldedStatement): We no longer stop pushing folded statements
-	for any reason, we simply push a folded statement with a set
-	indent in those cases (needed for keeping proper track of
-	keywords).
-
-2007-07-24  Jeffrey Stedfast  <fejj@novell.com>
-
-	Part of the fix for bug #82114.
-
-	* Parser/CodeGenerator.cs: Override a few more Visit() methods so
-	that we pick up class references in CastExpressions,
-	VariableDeclarations and ObjectCreateExpressions.
-	(AddUniqueReference): New method to add only unique references
-	to the collection.
-
-2007-07-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Write the compiler command used to
-	  compile the project to the log.
-
-2007-07-18  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs: A few fixes, including
-	one for bug #82055.
-
-	* Gui/CSharpTextEditorExtension.cs (IsInUsing): Simplified.
-	(GetPreviousToken): Fixed bug #82131.
-
-2007-07-17  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): Fixed a bug caused
-	when using any key other than Enter to auto-complete (e.g. using a
-	'(' or something).
-
-2007-07-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: When resolving a type, include the enclosing
-	  namespace in the namespace search list. Fixes bug #81865.
-	* CSharpBindingCompilerManager.cs: Make sure all output is read after
-	  running the compilation process. Should fix bug #82092.
-
-2007-07-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Properly resolve type names qualified with a
-	  namespace alias. Fixes bug #81999.
-
-2007-07-12  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs (PushNewLine): If we
-	just popped a single-line comment, we need to do more processing.
-
-2007-07-11  Ankit Jain  <jankit@novell.com>
-
-	Fix bug#82024.
-	* CSharpBindingCompilerManager.cs (DoCompilation): Workaround for a bug
-	in ProcessStartInfo.
-
-2007-07-06  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (Visit::PropertyDeclaration):
-	Implemented to fix bug #82020.
-
-2007-07-05  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs: (Visit::FieldReferenceExpression):
-	Don't limit ourselves to just Fields and Properties. Fixes bug
-	#81963.
-	(Visit::IdentifierExpression): When checking of a LocalVariable is
-	within bounds, use Region.BeginColumn instead of Region.EndColumn
-	and swap on which LocalVariable instance we check. Fixes part of
-	bug #82020.
-
-2007-07-05  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs: Sanity check that both begin and end
-	are != -1 to prevent a crash.
-	(Visit): When adding a typeDeclaration to the list of references,
-	don't add it using the StartLocation - instead, we need to find
-	the actual reference offset using StartLocation as a hint. This
-	fixes bug #82017.
-
-2007-07-03  Mike Krüger <mkrueger@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: added signing support.
-
-2007-06-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Implemented support for additional
-	  gac roots specified in packages.
-
-2007-06-20  Jeffrey Stedfast  <fejj@gnome.org>
-
-	Fixes a SmartIndenting bug reported by Latexer on IRC.
-
-	* FormattingStrategy/CSharpIndentEngine.cs (PushOpenBrace): When
-	inside a Case statement, only use nSpaces = -1 when we are either
-	on the line where the case/default label was entered or if the
-	first non-lwsp char is the '{', else use nSpaces = 0 so that we
-	indent properly.
-
-	* FormattingStrategy/CSharpIndentEngineStack.cs (Push): When
-	pushing a new Block inside a Case, we can still add an indent
-	level if nSpaces != -1.
-
-2007-06-19  Mike Krueger  <mkrueger@novell.com> 
-
-	Changed the C# file icon to look a bit more like gnome.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Autotools/Autotools.mdp, CSharpBinding.mdp: Removed unused elements.
-
-2007-05-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Added protection against infinite loop in
-	  ResolveIdentifier. Fixes bug #81769.
-
-2007-05-25  Jeffrey Stedfast  <fejj@gnome.org>
-
-	* Parser/CodeGenerator.cs (EncapsulateFieldImpGetSet):
-	Implemented.
-
-2007-05-24  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/TypeVisitor.cs (Visit::IdentifierExpression): Scan parent
-	namespaces of the calling class as well. Fixes bug #81543.
-
-2007-05-23  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (GetOptions): Override our base
-	implementation.
-
-2007-05-23  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs:
-	MonoDevelop.SourceEditor.Properties namespace no longer exists.
-
-	* FormattingStrategy/CSharpIndentEngine.cs: Same.
-
-	* Gui/OverrideCompletionData.cs: Same.
-
-	* Gui/FormattingPanel.cs: Same.
-
-2007-05-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/TypeVisitor.cs: When resolving an identifier, look first in
-	  class members, then look for types. Fixes bug #81542.
-
-2007-05-21  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): If a region of text
-	is selected, then simply pass it along to our base implementation
-	and reset our engine state if the region begins somewhere before
-	the engine's cursor. Fixes bug #81620.
-
-2007-05-18  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (IsMatchedField): New convenience
-	function to do some trivial checks to make sure the 'match' isn't
-	in the middle of some other field name (e.g. if the field we are
-	looking for is a substring of another field name, we don't want to
-	match in the middle of some other field).
-	(GetMemberNamePosition): Fixed the IField case to be a bit more
-	correct.
-	(GetMemberBounds): Overridden base class' implementation for
-	IFields so that we can get the subregion for a field declaration
-	if it is in the middle of other field declarations within the same
-	statement region.
-
-2007-05-19  Ankit Jain  <jankit@novell.com>
-
-	* CodeGenerationPanel.cs: GetProjectParserContext can fail, handle
-	that.
-	(Store): Save mainClass and Win32Icon only when relevant.
-
-2007-05-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Cursor already moved to
-	  position 2 after typing '#'.
-
-2007-05-16  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (EncapsulateField): Implemented so that
-	get/set actually have code statements.
-
-2007-05-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (RenameClass): Handle renaming of structs,
-	enums, and interfaces too.
-
-2007-05-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Include const fields in the static field list.
-	  Fixes bug #81078.
-	* CSharpBinding.mds, gtk-gui/gui.stetic: Updated.
-
-2007-05-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: (GetPreviousToken): Return tokens
-	  composed by a single char which is not a letter of digits.
-
-2007-05-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs: Comment out our own implementation of
-	AddMember, throwing a NotImplementedException() in generated code
-	can be annoying sometimes.
-
-2007-05-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Don't use the MD namespace in add-in
-	  dependencies, since the c# add-in is alread declared in the MS
-	  namespace.
-
-2007-05-11  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (AddMember): Override default
-	implementation so that we can add a statement to throw a
-	NotImplementedException.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mds: Added new c# binding solution.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Autotools/Autotools.mdp, Autotools/Makefile.am: Added project for the
-	  autotools assembly.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp: Don't copy assembly references.
-
-2007-05-08  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (GetMemberNamePosition): Fixed to
-	support IIndexers.
-	(FindParameterReference): Updated for API changes, no longer takes
-	an IMethod argument.
-	(Visit): Fixed up a bit since params can be parented by either an
-	IMethod or an IIndexer.
-
-2007-05-04  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (GetParameterNamePosition): Implemented.
-
-	* Parser/Resolver.cs (GetMethod): Check if the cursor is within the
-	declaration bounds as well, so that parameter searching works.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Test/Test.cs, Gui/ChooseRuntimePanel.cs, Gui/CodeGenerationPanel.cs,
-	  CSharpBinding.addin.xml, CSharpBinding.mdp, Makefile.am: Migration
-	  to Mono.Addins.
-
-2007-05-03  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (GetMemberNamePosition): Fixed IEvent
-	and IProperty logic and also greatly simplified the overall code.
-
-2007-05-03  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (FindVariableNamePosition): New
-	overloaded function to get the offset of a variable name.
-	(FindVariableReferences): New.
-	(FindParameterReferences): New.
-	(Visit): Added logic for matching LocalVariable and IParameters.
-
-2007-05-02  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (RenameClass): Rename all parts of the class
-	(in case the class is a partial class).
-
-2007-05-01  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Parser/CodeGenerator.cs (CreateReference): Trim the name to the
-	base name (we don't want the FullyQualifiedName). Also do some
-	fixing of the offset since the expression start offset begins
-	before the name of the type (e.g. it includes
-	public/private/etc modifiers).
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp: Don't copy referenced assemblies.
-	* CSharpBindingCompilerManager.cs: Avoid compiler warning.
-
-2007-04-09  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngineStack.cs: If we are pushing
-	a new FoldedStatement, we want to indent another level even if our
-	parent is a case-statement (unlike what we do for new Blocks).
-
-2007-03-23  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs (GetPreviousToken):
-	Reimplemented to use GetCharAt().
-	(KeyPress): Invalidate engine state if some key-code we don't
-	handle changes the buffer before our cursor position.
-
-2007-03-21  Ankit Jain  <jankit@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs (HandleCodeCompletion): Handle
-	code completion for sub namespaces.
-	(IsInUsing): New.
-	(GetPreviousToken): Handle the case when token starts at the first
-	position in the file.
-
-2007-03-20  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/CSharpParameterDataProvider.cs (GetCurrentParameterIndex):
-	Rewritten to use my CSharpIndentEngine parse tree to hopefully
-	solve bug #80883 once and for all.
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): Instead of using
-	engine.IsInsideMultiLineComment when deciding whether or not to
-	reindent the line, use engine.LineBeganInsideMultiLineComment
-	since that's what we really wanted to know.
-
-	* FormattingStrategy/CSharpIndentEngine.cs: Added more convenience
-	state properties (such as StackDepth and
-	LineBeaganInside[VerbatimString,MultiLineComment].
-
-2007-03-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): If the before/after
-	indent text is identical, then don't replace the text - instead
-	calculate what the cursor position would be and set it. (found a
-	way to avoid the text selection that occurs when you set
-	CursorPosition).
-
-	* FormattingStrategy/CSharpIndentEngine.cs (Push): Fix bug #81189
-	by resetting popVerbarim when we pop the verbatim string literal
-	off the stack
-
-2007-03-16  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/OverrideCompletionData.cs (InsertMethod, InsertProperty):
-	(InsertEvent, InsertIndexer): Use spaces rather than tabs for
-	indenting when appropriate. Fixes bug #81168.
-
-	* Gui/CSharpTextEditorExtension.cs (GetDirectiveCompletionData):
-	Add #pragma to the directives. Fixes bug #81131.
-
-2007-03-14  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): Fixed a bug where
-	if you typed the full completion text and then used <Enter> to
-	complete the fully-typed completion text, the Smart Indent code
-	would indent the next line even though it shouldn't have done so.
-
-2007-03-14  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): Use 'fname' as the
-	filename to embed. It is updated appropriately by GetResourceId().
-
-2007-03-13  Miguel de Icaza  <miguel@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): an old patch that I
-	had lying on my hard drive.   When using WinExe targets, pass the
-	"winexe" flag to the compiler.
-
-	Also pass the actual compiled resource file to be embedded, not
-	the source file. 
-
-2007-03-13  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs (PushFoldedStatement):
-	Push one anyway if our keyword (or our parent's keyword) is a loop
-	or if-else keyword.
-
-2007-03-11  Jeffrey Stedfast  <fejj@gnome.org>
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): Simplified a bit.
-	(KeyPress): Changed the logic for the tab-completion check, if
-	more than a single char has been inserted then it should be
-	considered to be tab-completion.
-	(KeyPress): Don't reindent multi-line comment lines unless they
-	begin with a '*', in which case the user probably wants to realign
-	them (if the first char on the line isn't a '*' then it might be a
-	commented-out block of code, we don't want to reindent that).
-
-2007-03-10  Jeffrey Stedfast  <fejj@gnome.org>
-
-	* FormattingStrategy/CSharpIndentEngineStack.cs (Push): We now
-	have an Inside.Case type to implement.
-
-	* FormattingStrategy/CSharpIndentEngine.cs (PushColon): Push a
-	Inside.Case onto the stack if appropriate and check
-	FormattingProperties.IndentCaseLabels to see how we should handle
-	indenting for case labels.
-	(PushSemicolon): Always set keyword to String.Empty
-	(PushOpenBrace): Changed the way we handle psuing a new block onto
-	the stack if we our parent is Inside.Case (the logic is the same,
-	but the check is a bit different now).
-	(PushCloseBrace): If our parent is Inside.Case, then we can pop
-	that along with the switch block.
-
-	* FormattingStrategy/CSharpFormattingProperties.cs
-	(IndentCaseLabels): Implemented.
-
-2007-03-09  Jeffrey Stedfast  <fejj@novell.com>
-
-	* CSharp.glade: Removed, no longer in use.
-
-	* CSharpBinding.addin.xml: Add the c# Formatting options panel to
-	the options dialog under the Text Editor options.
-
-	* gtk-gui/gui.stetic: Added a new custom FormattingPanelWidget.
-
-	* Gui/FormattingPanel.cs: New source file implementing a
-	"Formatting" options panel specific to c#.
-
-2007-03-09  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs (PushColon): Respect
-	the style settings for indenting goto labels.
-
-	* FormattingStrategy/CSharpFormattingProperties.cs: New source
-	file for c#-specific formatting properties.
-
-2007-03-09  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs (Push): Fixed a goof
-	from yesterday's commit.
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): Rearranged some
-	logic a bit to optimize seeking in the text buffer using arrow
-	keys.
-
-2007-03-08  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs: Got rid of the hack
-	that used this.commentEndedAt which was not only nasty, but didn't
-	even always work right to begin with.
-
-2007-03-07  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): Same sort of fix as
-	earlier wrt the user hitting Tab. If the user hits <Enter> and the
-	base class does not insert a '\n', then it means the user has just
-	accepted an auto-completed selection. In this case, return -
-	there's nothing left for us to do.
-
-	* FormattingStrategy/CSharpIndentEngineStack.cs (Push): Added a
-	work-around for pushing a multi-line anonmymous method {} block
-	inside a ParenList (e.g. as a callback argument).
-
-	* FormattingStrategy/CSharpIndentEngine.cs (PushHash): Doh, how
-	did I overlook this method when integrating my IndentEngine into
-	MD?
-	(PushNewLine): Properly handle multi-line array assignments.
-
-	Fix for making "default :" (as opposed to "default:") inside a
-	switch-statement work as it should, lwsp is not significant here.
-
-	* FormattingStrategy/CSharpIndentEngine.cs (PushOpenParen): Clear
-	the keyword after pushing a new ParenList onto the stack, when the
-	ParenList is popped, the keyword is restored.
-	(Reset): Changed the semantics of wordStart, this now initializes
-	to -1 instead of 0.
-	(PushNewLine): Reset wordStart back to -1.
-	(Push): When checking for a keyword, we don't need to use
-	lastNonLwsp anymore, just use wordStart.
-	(Push): wordStart should always be set to point to the beginning
-	of a word token (and never to word-delimiting chars like it was
-	before).
-
-2007-03-07  Jeffrey Stedfast  <fejj@novell.com>
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): Fixed a bug
-	preventing tab-completion from working by chaining the KeyPress()
-	to the parent.
-
-2007-03-07  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs: Fixed bug #81065 by
-	looking at the last significant char on the line. Also now keeping
-	the last char typed as part of the state so as to avoid having to
-	linebuf.ToString() and then look.
-
-2007-03-06  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpIndentEngine.cs: New class to aid in
-	smart indenting.
-
-	* FormattingStrategy/CSharpIndentEngineStack.cs: A broken out
-	piece of CSharpIndentEngine.cs to compartamentalize it a bit.
-
-	* FormattingStrategy/CSharpFormattingStrategy.cs
-	(SmartIndentLine): Don't do any indenting, Smart Indent is handled
-	elsewhere for now.
-	(FormatLine): Simplified, because this now only has to worry about '>'
-
-	* Gui/CSharpTextEditorExtension.cs (KeyPress): Implement our hooks
-	into Smart Indenting here.
-
-2007-02-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/OverrideCompletionData.cs, Gui/CSharpParameterDataProvider.cs,
-	  FormattingStrategy/CSharpFormattingStrategy.cs: Track api changes.
-
-2007-02-26  Jeffrey Stedfast  <fejj@novell.com>
-
-	* FormattingStrategy/CSharpFormattingStrategy.cs
-	(SmartIndentLine): Instead of wrapping the entire body of the
-	function in an if-block, fix it so we swap the logic thus reducing
-	the indent level of the main body making it easier to read (more
-	likely to fit in the width of your editor window).
-	(IsInsideStringOrComment): Completely rewritten to take into
-	consideration verbatim string literals, char literals, and
-	escaping inside string literals.
-	(IsInsideDocumentationComment): Same.
-
-2007-02-24  Zach Lute <zach.lute@gmail.com> 
-
-	* Gui/CSharpParameterDataProvider.cs: GetCurrentParameterIndex() now
-	  takes whether or not a comma is inside a string literal into account
-	  when determining the index.  Fixes bug #80883.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Don't show completion windo for
-	  "using" keyword when written inside a class. Fixes bug #80868.
-	* Parser/Resolver.cs: Removed unneeded parameter and fix potential
-	  nullref.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: When checking for accessibility take into account
-	  the qualifier type. There are some restrictions when accessing to
-	  protected members from incorrect qualifier types.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs, Parser/LanguageItemVisitor.cs: Properly resolve
-	  generic type identifiers. Fixes bug #80840.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/LanguageItemVisitor.cs, Parser/TypeVisitor.cs: When resolving
-	  a field reference, look for static members if instance members
-	  can't be found. Fixes bug #80841.
-
-2007-02-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp: Added project reference for NRefactory.
-	* Parser/CSharpVisitor.cs: Collect parameter flags when parsing a
-	  method. Fixes bug #80814.
-
-2007-02-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Allow crossing line boundaries when
-	  looking for tokens. Fixes bug #80719.
-	* CSharpBindingCompilerManager.cs: Handle internal packages.
-
-2007-02-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpAmbience.cs: When converting a class, honor
-	  UseFullyQualifiedName flag.
-	* Makefile.am: distcheck fixes
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp: Updated.
-	* gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/gui.stetic: Translation fixes.
-
-2007-02-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/OverrideCompletionData.cs: Moved from CSharpTextEditorExtension.
-	* Gui/CSharpParameterDataProvider.cs, Gui/CSharpTextEditorExtension.cs,
-	  CSharpBinding.mdp, Makefile.am: Implemented support for parameter
-	  information window.
-	* Parser/Resolver.cs: When searching a class, look in the calling class
-	  namespace before looking in using directives. Some fixes for
-	  generic types.
-	* Parser/CodeGenerator.cs: Some fixes for generic types.
-	* Parser/SharpDevelopTree/ReturnType.cs: Use our own system type table,
-	  since the one from NRefactory has some VB types and does case
-	  insensitive lookups.
-	* CSharpAmbience.cs: Added some ConvertTypeName calls to show the
-	  correct name for instantiated generic types.
-
-2007-02-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp,
-	  gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/gui.stetic, Makefile.am: i18n fixes.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: Cosmetic fixes in code completion
-	  of "new".
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Parser/Resolver.cs: Implemented
-	  code completion for "throw new". Don't show interfaces and abstract
-	  classes when completing "new".
-	* Parser/Parser.cs: Removed.
-	* CSharpAmbience.cs: Make sure instantiated generic classes are shown
-	  with the correct name.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs: When typing '#', move it to the
-	  first column is there is no other text before. Implemented code
-	  completion for compiler directives. Don't show sealed methods in
-	  the overridable list.
-
-2007-02-02  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): Move resource compiling code
-	to ..
-	(GetResourceId): .. here. Improve error messages.
-
-2007-02-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, Parser/Resolver.cs,
-	  CSharpAmbience.cs: Code completion of overridable members. Yay!
-
-2007-02-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/CodeGenerator.cs: Properly look for property references.
-
-2007-01-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Properly resolve alias directives. Fixes bug
-	  #80248.
-
-2007-01-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/LanguageItemVisitor.cs: Properly resolve calls to local
-	  instance methods.
-
-2007-01-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/CSharpVisitor.cs: When creating an enum, explicitely add the
-	  System.Enum base class. Make enum files "const".
-	* Parser/Resolver.cs: Removed some debug code. Show enum fields only
-	  when resolving the type only. Fixes bug #80088.
-
-2007-01-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Fix overloaded operator filter.
-
-2007-01-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/CSharpVisitor.cs, Parser/TypeVisitor.cs: Implemented support
-	  for overloaded operators.
-	* Parser/Resolver.cs: Exclude operators from the resolve list.
-	* Parser/LanguageItemVisitor.cs: When resolving overloads, try to find
-	  the closes matching signature.
-	* Parser/ExpressionFinder.cs, Parser/SharpDevelopTree/Method.cs: Fix
-	  warnings.
-	* CSharpAmbience.cs: Properly format method names for overloaded
-	  operators.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/gui.stetic: Updated.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CodeGenerationPanel.cs, CSharpBindingCompilerManager.cs,
-	  Project/CSharpCompilerParameters.cs: Implemented support for
-	  CodePage and Win32Icon options.
-	* CSharpBinding.mdp, Makefile.am: Updated.
-	* gtk-gui/CSharpBinding.CodeGenerationPanelWidget.cs,
-	  gtk-gui/generated.cs, gtk-gui/gui.stetic: Implement the options
-	  panel using stetic.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CSharpTextEditorExtension.cs, CSharpBinding.addin.xml: Created
-	  new text editor extension to properly support code completion.
-	* CSharpBinding.mdp, Makefile.am: Updated.
-	* Parser/CSharpVisitor.cs, Parser/TypeVisitor.cs,
-	  Parser/LanguageItemVisitor.cs,
-	  Parser/SharpDevelopTree/Destructor.cs,
-	  Parser/SharpDevelopTree/Method.cs,
-	  Parser/SharpDevelopTree/ReturnType.cs,
-	  Parser/SharpDevelopTree/Constructor.cs: Track api changes.
-	* Parser/Resolver.cs: Track api changes. Properly resolve instantiated
-	  generic types.
-	* CSharpAmbience.cs: Properly show generic type names.
-
-2007-01-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/LanguageItemVisitor.cs: Properly resolve method overloads.
-	  Fixes bug #77418.
-
-2007-01-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp: Removed old dependency.
-	* Parser/TypeVisitor.cs, Parser/SharpDevelopTree/ReturnType.cs: Take
-	  into account that the parser returns array dimensions starting at
-	  0, not at 1.  Fixed some issues when resolving indexer types. Fixes
-	  bug #79382.
-	* Parser/LanguageItemVisitor.cs: When visiting an indexer, if there is
-	  no indexer (it can be an array access), return the target type.
-	* templates/GtkSharp2Project.xpt.xml: Fix template.
-
-2007-01-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/GtkSharp2Project.xpt.xml: Use the new partial class model.
-
-2007-01-11  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): Echo resgen command line
-	for debugging purpose.
-
-2007-01-11  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): .resx file has paths
-	relative to the .resx file itself.
-
-2006-12-21  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): Use project's base
-	directory as the working directory when invoking the compiler.
-	(DoCompilation): Add param 'working_dir'.
-
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Track changes in FileService API.
-
-2006-12-15  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): Filename arg to resgen
-	should be quoted.
-
-2006-12-15  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): Use resgen to convert .resx
-	to embeddable resource format (.resources). Handle 'null' resourceId.
-
-2006-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.mdp, Parser/SharpDevelopTree/CompilationUnit.cs,
-	  Parser/SharpDevelopTree/Indexer.cs,
-	  Parser/SharpDevelopTree/Parameter.cs,
-	  Parser/SharpDevelopTree/Event.cs, Parser/SharpDevelopTree/Field.cs,
-	  Parser/SharpDevelopTree/Property.cs, Makefile.am: Removed some
-	  unnecessary Default* subclasses.
-	* Parser/Parser.cs, Parser/CSharpVisitor.cs, Parser/Resolver.cs,
-	  Parser/SharpDevelopTree/Destructor.cs,
-	  Parser/SharpDevelopTree/Method.cs,
-	  Parser/SharpDevelopTree/ReturnType.cs,
-	  Parser/SharpDevelopTree/Class.cs,
-	  Parser/SharpDevelopTree/Constructor.cs,
-	  Parser/SharpDevelopTree/AttributeSection.cs: Renamed Abstract*
-	  classes to Default*. Removed some unnecessary Default* subclasses.
-
-2006-12-13  Ankit Jain  <jankit@novell.com>
-
-	* Project/CSharpCompilerParameters.cs (Win32Resource): New.
-	* CSharpBindingCompilerManager.cs (Compile): Generate 
-	option for Win32Resource. Don't generate option for win32icon 
-	if win32resource is defined.
-
-2006-12-12  Ankit Jain  <jankit@novell.com>
-
-	* CSharpBindingCompilerManager.cs (Compile): Use ProjectFile.ResourceId
-	for embedded resources.
-
-2006-11-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Parser.cs: Why ParseMethodModies was set to false?
-	  re-enabling. Fixes local variable code completion.
-
-2006-11-14  Ankit Jain  <jankit@novell.com>
-
-	* Gui/CodeGenerationPanel.cs (CodeGenerationPanelWidget.ctor): Add
-	missing 'Module' option for compile target.
-
-2006-11-13 David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* Parser/SharpDevelopTree/CompilationUnit.cs: returning Tag colection
-	* Parser/Parser.cs: filling comments into compilation unit
-
-2006-11-11 David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* Gui/CodeGenerationPanel.cs: fix for bug 79199
-	
-2006-09-21 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Fixed null check.
-
-2006-09-12 Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* CSharpBindingCompilerManager.cs: Fixed win32 pathing issues, removed old mcs-specific compiler options (that weren't being used since [g]mcs options have been aligned with csc options), removed /bin/sh dependence.
-	* Project/CSharpCompilerParameters.cs: Changed default compiler to mcs.
-
-2006-09-12 Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-	
-	* Parser/CSharpVisitor.cs: Fixed compile warning.
-	* CSharpAmbience.cs: Track changes in Ambience.
-
-2006-09-01 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding/CSharpAmbience.cs: Avoid appending the class
-	  name twice.
-
-2006-08-07 Philip Turnbull <philip.turnbull@gmail.com>
-
-	* CSharpBinding/CSharpBinding.addin.xml:
-	Changed CSharpAmbience name from 'CSharp' to 'C#'.
-
-	* CSharpBinding/CSharpAmbience.cs:
-	Track API changes in Ambience.
-
-2006-08-02 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/Resolver.cs: Added null check.
-
-2006-07-30 Matej Urbas <matej.urbas@gmail.com>
-
-	* CSharpAmbience.cs: Fixed a curious null exception.
-	* Parser/CSharpVisitor.cs: Updated the visitor to store generic data as
-	  parsed by NRefactory.
-	* Parser/LanguageItemVisitor.cs:
-	* Parser/TypeVisitor.cs: Updated the way various expressions are
-	  treated in the code - to accommodate to new data for generics.
-	* Parser/SharpDevelopTree/ReturnType.cs: Added support for generics in
-	  return types.
-
-	* Parser/SharpDevelopTree/GenericParameter.cs: The new file
-	* CSharpBinding.mdp: Added the new file to the project.
-	* Makefile.am: Added the new file to the project.
-
-2006-07-28 Matej Urbas <matej.urbas@gmail.com>
-
-	* CSharpAmbience.cs: Fixed the way generics and delegates are shown in the
-	  code completion popup, and made some optimizations along the way.
-
-2006-07-23 Matej Urbas <matej.urbas@gmail.com>
-
-	* CSharpAmbience.cs: Small cosmetic corrections when converting generic
-	  types
-
-2006-07-17 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Autotools/CSharpAutotoolsSetup.cs: Support compilation with gmcs.
-	* CSharpBindingCompilerManager.cs: Track changes in SystemAssemblyService.
-
-2006-07-12 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Use a more meaningful name for the "current unit".
-	  Store the name of the file being resolved in currentFile.
-	  Changed SearchVariable, so it now returns a LocalVariable object,
-	  with all information, including the region.
-	* Parser/LanguageItemVisitor.cs: Fix crash when processing indexers.
-	  Return valid values for object creation expressions.
-	* Parser/SharpDevelopTree/ReturnType.cs: Added constructor which
-	  takes a properly resolved class as parameter.
-
-2006-07-10 Alejandro Serrano <trupill@yahoo.es>
- 
-	* CSharpAmbience.cs: Add support for generics ambience.
-	* Autotools/Makefile.am: Fixed error on compilation because
-	  of a not found reference.
-
-2006-07-05 Matej Urbas <matej.urbas@gmail.com>
- 
-	* CSharpAmbience.cs: Fixed a regression that displayed all base types of a
-	  class to be of PersistentReturnType type.
-	* Parser/CodeGenerator.cs:
-	* Parser/CSharpVisitor.cs:
-	* Parser/Resolver.cs: Updated to use ReturnType as BaseTypes in IClass
-	  instances.
- 
-2006-07-04  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* CSharpEnhancedCodeProvider.cs: Fix parsing of imports
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* CSharpLanguageBinding.cs:
-	* CSharpBindingCompilerManager.cs: Track changes in ProjectReference.
-	  Removed obsolete GenerateMakefile method.
-	* Parser/CodeGenerator.cs: Fix member reference location.
-	* Parser/ExpressionFinder.cs: Fix warning.
-	* CSharpBinding.addin.xml: Updated versions.
-
-2006-06-29  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* CSharpBinding.mdp:
-	* Makefile.am:
-	* CSharpEnhancedCodeProvider.cs:
-	New file, implements CodeDom methods CreateParser and Parse.
-	
-	* CSharpLanguageBinding.cs: Use new CSharpEnhancedCodeProvider.
-	
-	* CSharpBinding.addin.xml: Bump version so that AspNetAddIn can take 
-	a dependency on the CodeProvider's CreateParser method.
-
-2006-06-15 Scott Ellington  <scott.ellington@gmail.com>
-
-	* Autotools/CSharpAutotoolsSetup.cs:
-	
-2006-06-15 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.addin.xml: Use the DataType element instead fof Class
-	  to declare serializable types.
-
-2006-06-07 Scott Ellington  <scott.ellington@gmail.com>
-
-	* CSharpBinding.addin.xml:
-	* Autotools/CSharpAutotoolsSetup.cs:
-	* Autotools/Makefile.am:
-	* Makefile.am:
-	Add optional module for implementing simple autotools support
-
-2006-05-22 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/Parser.cs:
-	* Parser/CSharpVisitor.cs: 
-	* Parser/Resolver.cs:
-	* Parser/TypeVisitor.cs:
-	* Parser/CodeGenerator.cs:
-	* Parser/LanguageItemVisitor.cs:
-	* Parser/ExpressionFinder.cs:
-	* Parser/SharpDevelopTree/Destructor.cs:
-	* Parser/SharpDevelopTree/Indexer.cs:
-	* Parser/SharpDevelopTree/Method.cs:
-	* Parser/SharpDevelopTree/Event.cs:
-	* Parser/SharpDevelopTree/ReturnType.cs:
-	* Parser/SharpDevelopTree/Field.cs:
-	* Parser/SharpDevelopTree/Property.cs:
-	* Parser/SharpDevelopTree/Class.cs:
-	* Parser/SharpDevelopTree/Constructor.cs:
-	* parse.cs:
-	* Makefile.am: Use the new NRefactory library.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.addin.xml: Updated versions.
-	* CSharpBinding.mdp: Updated.
-
-2006-04-24 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Fix nullref caused by delegates not having
-	  a region or bodyRegion. Fixes bug #78143.
-
-2006-04-21 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpLanguageBinding.cs: Implement GetSupportedClrVersions.
-	* CSharpBinding.addin.xml: Added panel por selecting the target
-	  runtime version.
-	* CSharpBindingCompilerManager.cs: Support compilation for .net 2.0.
-	
-	* Parser/ExpressionFinder.cs:
-	* Parser/LanguageItemVisitor.cs: Fixed warnings.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/GladeSharpProject.xpt.xml:
-	* templates/GladeSharp2Project.xpt.xml: Remove gnome dependency
-	  from the glade file template. Fix by Sebastian Dröge.
-
-2006-04-07  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* CSharpBinding.addin.xml: renamed attributes in FileFilter Extension
-
-2006-04-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Reference nunit libraries using $(NUNIT_LIBS).
-
-2006-04-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/GtkSharp2Project.xpt.xml: Fix window
-	  constructor.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Updated references.
-
-2006-03-24  Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-
-	* templates/ConsoleProject.xpt.xml: Added namespace clause.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* CSharpBinding.mdp: Updated.
-	* Makefile.am: Use an unified format. Patch by Matze Braun.
-	* CSharpBinding.addin.xml: Updated add-in versions.
-
-2006-03-24  Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-
-	* Test:
-	* Test/Test.cs:
-	* Makefile.am:
-	Added an initial test which validates that the resolver
-	can resolve namespaces.
-
-2006-03-17  Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-
-	* Parser/Parser.cs:
-	* Parser/Resolver.cs:
-	Removed unused MonodocResolver.
-
-2006-03-16  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* Parser/LanguageItemVisitor.cs: Make sure that composite
-	namespaces are parsed correctly.
-
-2006-03-12  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-        * CSharp.glade: Marking some strings not to be translated. Not include balast in pot file.
-	
-2006-03-08 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Parser/CodeGenerator.cs: Fixed issues when finding class
-	  references. Add text line to found references.
-	* Parser/LanguageItemVisitor.cs: Properly resolve primitive
-	  type aliases.
-
-2006-03-07 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Makefile.am:
-	* CSharpBinding.addin.xml: Moved some templates to MD.Ide.
-
-2006-03-06 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Parser/CSharpVisitor.cs: Added null check.
-
-2006-03-02 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* templates/GtkSharp2Project.xpt.xml: Use the new template syntax.
-
-2006-02-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Parser/CSharpVisitor.cs: Generate parse information for
-	  delegates.
-
-2006-01-30 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Parser/Resolver.cs:
-	* Parser/Parser.cs: Track changes in parser api.
-
-2006-01-26 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* CSharpBinding.addin.xml: Removed BlankCombine template (now
-	in MonoDevelop.Ide).
-	* Parser/CodeGenerator.cs: Properly find members referenced
-	in subclasses.
-	* Parser/LanguageItemVisitor.cs: Visit methods must always
-	return a ILanguageItem.
-	
-	* templates/GtkSharpProject.xpt.xml:
-	* templates/GnomeSharp2Project.xpt.xml:
-	* templates/GladeSharp2Project.xpt.xml:
-	* templates/GnomeSharpProject.xpt.xml:
-	* templates/GladeSharpProject.xpt.xml: Moved to a Samples subcategories
-	for now, to reduce clutter.
-
-2006-01-15  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* Parser/CSharpVisitor.cs: Make sure that a null modifier
-	is not passed to the Field constructor which is the case
-	for enum members. Fixes bug 77080.
-
-2006-01-13 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* templates/GtkSharpProject.xpt.xml:
-	* templates/GnomeSharp2Project.xpt.xml:
-	* templates/GladeSharp2Project.xpt.xml:
-	* templates/GnomeSharpProject.xpt.xml:
-	* templates/GtkSharp2Project.xpt.xml:
-	* templates/GladeSharpProject.xpt.xml: Moved project templates to
-	the C# category, since they are C# templates.
-
-2006-01-10 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Makefile.am:
-	* CSharpBinding.mdp: Added Parser/LanguageItemVisitor.cs.
-	
-	* Parser/Parser.cs: Track api changes. Implemented ResolveIdentifier.
-	* Parser/CSharpVisitor.cs: Store attribute values in CodeExpression
-	instances.
-	* Parser/Resolver.cs: Implemented ResolveIdentifier.
-	* Parser/ExpressionFinder.cs: Updated from SharpDevelop.
-	* Parser/SharpDevelopTree/AttributeSection.cs: Track api changes.
-	
-2005-12-19  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Parser/CodeGenerator.cs: Track api changes. Added support for
-	renaming other member types (untested).
-
-2005-12-13  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Parser/Parser.cs: Track api changes.
-	* CSharpLanguageBinding.cs: Implemented the new methods in
-	IDotNetLanguageBinding.
-	* CSharpBinding.addin.xml: Removed some templates that don't really
-	belong here.
-	* CSharpBinding/CSharpBinding.mdp: Updated.
-	
-	* Parser/SharpDevelopTree/AttributeSection.cs:
-	* Parser/CSharpVisitor.cs: Properly collect region and attribute
-	information. This is a patch by Alex Gomes.
-	Also: properly set the declaring type to class members.
-	
-	* Parser/Resolver.cs: Added two new methods: ResolveExpressionType
-	returns the type of an arbitrary expression. ResolveIdentifier returns
-	information about an identifier.
-	
-	* Parser/SharpDevelopTree/Indexer.cs:
-	* Parser/SharpDevelopTree/Method.cs:
-	* Parser/SharpDevelopTree/Parameter.cs:
-	* Parser/SharpDevelopTree/Event.cs:
-	* Parser/SharpDevelopTree/Field.cs:
-	* Parser/SharpDevelopTree/Property.cs:
-	* Parser/SharpDevelopTree/Class.cs:
-	* Parser/SharpDevelopTree/Constructor.cs:
-	* Parser/SharpDevelopTree/Destructor.cs: Set the declaring type to
-	class members.
-	
-	* templates/*: Set the correct category, language and project type.
-	* Parser/CodeGenerator.cs: Initial implementation of IRefactorer.
-
-2005-11-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/GtkSharpProject.xpt.xml:
-	* templates/GnomeSharp2Project.xpt.xml:
-	* templates/GladeSharp2Project.xpt.xml:
-	* templates/ConsoleProject.xpt.xml:
-	* templates/GnomeSharpProject.xpt.xml:
-	* templates/GtkSharp2Project.xpt.xml:
-	* templates/GladeSharpProject.xpt.xml:
-	* templates/Library.xpt.xml: Added a reference to the System assembly
-	in all project templates.
-	
-	* Makefile.am: Rebuild the assembly when resources are modified. 
-
-2005-11-09  John Luke  <john.luke@gmail.com>
-
-	* FormattingStrategy/CSharpFormattingStrategy.cs:
-	use trimlineAboveText to decide whether to indent things
-	like single line if, else, for, etc.
-	second half of fix for bug # 76652
-	
-2005-10-28  John Luke  <john.luke@gmail.com>
-
-	* FormattingStrategy/CSharpFormattingStrategy.cs:
-	improve indentLine slightly, we want the indention +
-	trimmed line, not the addional whitespace in front of it
-	remove some old disabled/unported code
-
-2005-10-23  John Luke  <john.luke@gmail.com>
-
-	* CSharpBinding.addin.xml: add FormattingStrategy
-	
-2005-10-11  John Luke  <john.luke@gmail.com>
-
-	* CSharpAmbience.cs: comment out SharpAssembly stuff
-	
-2005-10-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBinding.addin.xml: Fixed incorrect class name.
-
-2005-10-11  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Fixed addin header information.
-	Use "id" attribuet instead of "name" to identify addins.
-
-2005-10-06  John Luke  <john.luke@gmail.com> 
-
-	* CSharpBindingCompilerManager (GenerateMakefile): fix mistaken
-	empty statement warning
-	
-2005-10-06  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml:
-	* CSharpLanguageBinding.cs: Register serializable types in the addin
-	configuration file.
-
-2005-10-04  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* CSharpBinding.addin.xml: Added addin dependencies.
-
-2005-09-23  Peter Johanson  <latexer@gentoo.org>
-
-	* CSharpBindingCompilerManager.cs: Fix mcs location detection.
-
-2005-08-20  Peter Johanson  <latexer@gentoo.org>
-
-	* templates/GnomeSharp2Project.xpt.xml:
-	* templates/GladeSharp2Project.xpt.xml:
-	* templates/GtkSharp2Project.xpt.xml: Change gtk-sharp references to
-	match new assembly versions.
-
-2005-08-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpAmbience.cs: Don't include the inheritance tree when converting
-	an enum.
-
-2005-08-12  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* templates/*:
-	* CSharpBinding.addin.xml: Properly reference resource icons and
-	templates.
-	* Makefile.am: Embed icon and templates as resources.
-
-2005-08-10  Ben Motmans  <ben.motmans@gmail.com>
-
-	* CSharpBinding.mdp: references update
-
-2005-08-10  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* CSharpBindingCompilerManager.cs: Disable implicit references to
-	system assemblies. All references must now be explicitely specified.
-
-2005-08-06  Ben Motmans  <ben.motmans@gmail.com>
-
-	* CSharpBindingCompilerManager.cs: correctly parse mcs errors.
-
-2005-08-09  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Parser/Parser.cs:
-	* Parser/Resolver.cs:
-	* Gui/CodeGenerationPanel.cs: Use the new IParserContext API.
-	
-	* Parser/TypeVisitor.cs: Made the class internal.
-
-2005-07-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharp.glade:
-	* Gui/CodeGenerationPanel.cs: Use a combo entry for the main class
-	field. Disable that entry when building a library.
-
-2005-07-14  Ben Motmans  <ben.motmans@gmail.com>
-
-	* templates/GladeSharp2Project.xpt.xml:
-	removed duplicate reference to glade-sharp-2.0
-
-2005-07-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/CSharpCompilerParameters.cs: Implement ICloneable.
-	* CSharpLanguageBinding.cs: CreateCompilationParameters now returns an
-	ICloneable.
-
-2005-05-15  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* CSharp.glade: Several fixes to make the dialogs more conforming
-	to the HIG.
-
-2005-04-17  John Luke  <john.luke@gmail.com>
-
-	* Makefile.am: fix distcheck
-
-2005-04-09  John Luke  <john.luke@gmail.com>
-
-	* PrettyPrinter: kill (it was empty)
-	* Parser/ExpressionFinder.cs: remove redundent assignment
-	to fix warning
-	* Gui/CodeGenerationPanel.cs: remove unused StringParserService
-	section
-
-2005-03-20  John Luke  <john.luke@gmail.com>
-
-	* CSharpBindingCompilerManager.cs: display warning on invalid
-	reference lookup, partial fix for bug #70645
-
-2005-03-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/Resolver.cs: Track api changes.
-
-2005-02-16  Ben Motmans  <ben.motmans@gmail.com>
-
-	* ConsoleProject.xpt.xml:
-	* CSharpSessionStateWebService.xpt.xml:
-	* CSharpWebService.xpt.xml:
-	* Library.xpt.xml:
-	Consistent naming
-
-	* GladeSharp2Project.xpt.xml:
-	* GnomeSharp2Project.xpt.xml:
-	* GtkSharp2Project.xpt.xml:
-	* CSharpBinding.addin.xml:
-	* Makefile.am:
-	Added templates
-
-2005-02-18  John Luke  <john.luke@gmail.com>
-
-	* CSharpCompilerManager.cs: pass /optimize if enabled
-
-2005-02-05  John Luke  <john.luke@gmail.com>
-
-	* Gui/CodeGenerationPanel.cs: enable doc generation
-
-2005-02-01  John Luke  <john.luke@gmail.com>
-
-	* Parser/Parser.cs: use ErrorInfo
-
-2005-01-28  John Luke  <john.luke@gmail.com>
-
-	* Parser/Resolver.cs (IsAccessible):
-	internal should return true
-	fixes bug# 60526
-
-2005-01-28  John Luke  <john.luke@gmail.com>
-
-	* Parser/Resolver.cs: remove incorrect special case
-	for properties that made them visible to completion
-	incorrectly on static to instance and vice-versa
-	fixes bug# 69741
-
-2005-01-28  John Luke  <john.luke@gmail.com>
-
-	* Parser/Parser.cs: update to CanParse
-	* Parser/*.cs: update some minor fixes from SD
-
-2005-01-27  John Luke  <john.luke@gmail.com>
-
-	* CSharpBindingCompilerManager.cs:
-	* Parser/CSharpVisitor.cs:
-	* Parser/Resolver.cs:
-	* FormattingStrategy/CSharpFormattingStrategy.cs: comment out
-	some unused lines that produced warnings
-
-2005-01-27  John Luke  <john.luke@gmail.com>
-
-	* CSharp.glade: update to new glade format
-	* Gui/CodeGenerationPanel.cs:
-	* CSharp.glade: use ComboBox instead of OptionMenu
-
-2005-01-26  John Luke  <john.luke@gmail.com>
-
-	* templates/GtkSharpProject.xpt.xml
-	* templates/GnomeSharpProgram.xft.xml
-	* templates/GladeSharpProject.xpt.xml: clean up,
-	consistent naming, spacing, tabbing
-
-2005-01-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpLanguageBinding.cs: 
-	* CSharpBindingCompilerManager.cs: Use the new progress monitor API.
-	
-2005-01-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpLanguageBinding.cs: 
-	* Gui/ChooseRuntimePanel.cs:
-	* Gui/CodeGenerationPanel.cs:
-	* CSharpBindingCompilerManager.cs:
-	* CSharpBinding.addin.xml:
-	* Parser/Parser.cs:
-	* Parser/Resolver.cs: Follow architecture changes.
-	
-	* Project/CSharpCompilerParameters.cs: Moved some parameters and enum
-	definitions to DotNetProjectConfiguration.
-	
-	* CSharp.glade:
-	* Gui/OutputOptionsPanel.cs: Removed dialog now implemented in Monodevelop.Base.
-
-	* Project/CSharpProject.cs:
-	* CSharpBindingExecutionManager.cs.in: Removed. Not needed any more.
-	
-	* Makefile.am: Updated.
-
-2004-12-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CSharpBindingCompilerManager.cs: StatusBarService.ProgressMonitor is
-	not a StatusBar widget any more.
-
-2004-12-09  Todd Berman  <tberman@off.net>
-
-	* CSharpBindingCompilerManager.cs: mcs in Mono 1.1.3 now outputs error
-	on stderr instead of stdout. The old code just inspected stdout, now
-	we look at both.
-
-2004-12-08  Everaldo Canuto  <everaldo_canuto@yahoo.com.br>
-
-	* CSharpBindingCompilerManager.cs: Add support to multiple compilers
-	in Makefiles generated by MonoDevelop.
-
-2004-12-07  Alexandre Gomes <alexmipego@hotmail.com>
-
-	* CSharpLanguageBinding.cs: Added CommentTag to be used by (Un)CommentCode
-
-2004-11-16  Todd Berman  <tberman@off.net>
-
-	* CSharpBindingCompilerManager.cs: Properly output local assembly
-	references.
-
-2004-11-09  Todd Berman  <tberman@off.net>
-
-	* CSharpBindingCompilerManager.cs: Use SAS for assembly detection.
-	This doesnt seem to break anything for me.
-
-2004-11-05  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-      
-	* Parser/Parser.cs: Added HandlesFileExtension to work with new
-	IParser
-
-2004-11-01  Todd Berman  <tberman@off.net>
-
-	* CSharpBindingExecutionManager.cs.in: Add fu to actually properly run
-	the execute script.
-
-2004-09-25  Peter Johanson <latexer@gentoo.org>
-
-	* CSharpBindingCompilerManager.cs: Hack to a hack to fix compilation
-	on 1.1.1 with the new corlib location.
-
-2004-09-20  Valters Svabe  <valters@inbox.lv>
-
-	* CSharpBindingExecutionManager.cs.in: Respect PauseConsoleOutput
-	option.
-
-2004-07-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/Resolver.cs: When locating the inner or outer classes, get the 
-	  class from the parser service, since it has all type names resolved 
-	  (the one got from the compilation unit does not).
-
-2004-07-05  Todd Berman  <tberman@off.net>
-
-	* CSharpBindingExecutionManager.cs: removed.
-	* CSharpBindingExecutionManager.cs.in: Added
-	* Makefile.am: modified.
-	This patch is from Marcin Krzyzanowski <krzak@pld-linux.org> and it
-	fixes mint issues.
-
-2004-07-04  John Luke  <jluke@cfl.rr.com>
-
-	* Gui/OutputOptionsPanel.cs: use MessageService, remove ResourceService
-
-2004-07-01  Todd Berman  <tberman@off.net>
-
-	* Parser/Resolver.cs: fix up CtrlSpace resolving to add this. members
-	to the completion window. We need to figure out what is causing the
-	public class MyWindow : Window not working but the public class
-	MyWindow : Gtk.Window still works and this stuff will look good.
-	* Gui/OutputOptionsPanel.cs: remove dup'd namespace.
-
-2004-06-22  John Luke <jluke@cfl.rr.com>
-
-	* CSharpBindingCompilerManager.cs: be explicit when copying the
-	assembly to avoid silent failures (use build/bin/. not build/bin)
-
-2004-06-17  John Luke  <jluke@cfl.rr.com>
-
-	* Gui/OutputOptionsPanel.cs: Use MonoDevelop.Gui.Widgets.FileSelector
-	instead of Gtk.FileSelection
-
-2004-05-30  Lluis Sanchez Gual  <lluis@ximian.com>
-
-	* Parser/Resolver.cs: Resolve base classes using a deep search in all
-	  project references. In SearchType, fixed namespace lookup so it works
-	  for inner classes as well.
-
-2004-05-27  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: fix up projects with space in
-	their name.
-
-2004-05-26  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: more makefile magic.
-
-2004-05-25  Todd Berman  <tberman@sevenl.net>
-
-	* Parser/Parser.cs: Update MonodocResolver and IsAsResolver.
-	* Parser/Resolver.cs: Update MonodocResolver and IsAsResolver
-
-2004-05-25  Lluis Sanchez Gual  <lluis@ximian.com>
-
-	* Parser/Parser.cs: Set the file name to the region of each parsed class.
-	  Added IProject parameter in CtrlSpace and Resolve.
-	* Parser/Resolver.cs: Added IProject parameter where needed. Use new 
-	  methods in IParserService.
-
-2004-05-25  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpLanguageBinding.cs: signature change for GenerateMakefile
-	* CSharpBindingCompilerManager.cs: lots of new stuff, make run compat
-	stuff, etc, etc
-
-2004-05-22  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: add "s to work around potential
-	spaces... spaces... urgh. closes bug #58840
-
-2004-05-18  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: add a warning to the top of the
-	makefiles.
-
-2004-05-18  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: change from /option to -option
-
-2004-05-16  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: output a much better makefile.
-	now using /pkg, checking for deps, etc.
-	* Parser/Parser.cs: passthrough for Monodoc resolver.
-	* Parser/Resolver.cs: New resolver for identifying a type and sending
-	back a monodoc url for it. It needs to be worked on to return proper
-	M: style urls in addition to T: style urls.
-
-2004-05-08  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: output /define and /main properly.
-
-2004-05-08  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: output /unsafe properly.
-
-2004-04-29  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: add a clean target
-
-2004-04-28  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingExecutionManager.cs: People running apps from the IDE
-	can be assumed to want line numbers if we can give them. Adding --debug
-	to the execution.
-
-2004-04-28  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: add code for project references.
-
-2004-04-28  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManger.cs: add code for assembly references
-	and embeding resources.
-
-2004-04-28  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpLanguageBinding.cs: implemented GetMakefile passthru.
-	* CSharpBindingCompilerManager.cs: dirty dirty dirty first draft run
-	through of GenerateMakefile, I have tested this with exactly *one*
-	project, and that is all, just wanted to get something in svn.
-
-2004-04-24  Todd Berman  <tberman@sevenl.net>
-
-	* Parser/Parser.cs: new IsAsResolver passthrough.
-	* Parser/Resolver.cs: new IsAsResolver to manage some (limited)
-	completion there.
-
-2004-04-23  John Luke  <jluke@cfl.rr.com>
-
-	* CsharpBindingCompilerManager.cs: add /codepage:utf8
-
-2004-04-19  Todd Berman  <tberman@sevenl.net>
-
-	* Parser/Resolver.cs: Turn local variables into a properly consumable
-	type for code completion.
-
-2004-04-09  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingCompilerManager.cs: Show that something is going
-	on so people dont get too worried. (Speed might need some work)
-	* Makefile.am: add glib
-
-2004-04-04  John Luke  <jluke@cfl.rr.com>
-
-	* CSharpBindingExecutionManager.cs: improve error message
-
-2004-04-03  Todd Berman  <tberman@sevenl.net>
-
-	* Gui/OutputOptionsPanel.cs:
-	* Gui/CodeGenerationPanel.cs: gettextify
-
-2004-04-03  Todd Berman  <tberman@sevenl.net>
-
-	* Project/CSharpCompilerParameters.cs: duh, refix library target bug
-
-2004-04-01  Todd Berman  <tberman@sevenl.net>
-
-	* Gui/OutputOptionsPanel.cs: parse resource string, closes bug #56325
-
-2004-03-31  Todd Berman  <tberman@sevenl.net>
-
-	* CSharpBindingExecutionManager.cs: dont test CompileTarget, for now
-	assume *everything* is being run in a terminal and pausing for output.
-
-2004-03-31  Todd Berman  <tberman@sevenl.net>
-
-	* Makefile.am: i think this fixed nick's bug.
-
-2004-03-28  John Luke  <jluke@cfl.rr.com>
-
-	* Parser/Resolver.cs: comment some CWL's that were causing exceptions
-
-2003-03-27  Todd Berman  <tberman@sevenl.net>
-
-	* *: update parser and other things from upstream.
-
-2003-03-26  John Luke  <jluke@cfl.rr.com>
-
-	* CSharpBindingExecutionManager.cs: use xterm instead of
-	gnome-terminal, fixes bug #53689 and also works when people
-	don't have gnome-terminal installed
-
-2004-03-22  Todd Berman  <tberman@sevenl.net>
-
-	* Project/CSharpCompilerParameters.cs: reverse WinExe and Library in
-	the enum, closing bug #55881. fix from vdaron
-
-2004-03-21  Todd Berman  <tberman@sevenl.net>
-
-	* Parser/Parser.cs:
-	* Parser/CSharpVisitor.cs:
-	* Parser/Resolver.cs:
-	* Parser/TypeVisitor.cs:
-	* Parser/SharpDevelopTree/Indexer.cs:
-	* Parser/SharpDevelopTree/Method.cs:
-	* Parser/SharpDevelopTree/Event.cs:
-	* Parser/SharpDevelopTree/ReturnType.cs:
-	* Parser/SharpDevelopTree/Field.cs:
-	* Parser/SharpDevelopTree/Property.cs:
-	* Parser/SharpDevelopTree/Constructor.cs:
-	* Parser/SharpDevelopTree/Class.cs: changes to reflect brand spankin
-	new parser. (from #D)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
new file mode 100644
index 0000000000..8ee2f4e5f1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
@@ -0,0 +1,520 @@
+//
+// ClassOutlineTextEditorExtension.cs
+//
+// Author:
+//   Michael Hutchinson <mhutchinson@novell.com>
+//
+// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using Gtk;
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide;
+using MonoDevelop.Components;
+using MonoDevelop.Components.Docking;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.DesignerSupport;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.CSharp.ClassOutline
+{
+	/// <summary>
+	/// Displays a types and members outline of the current document.
+	/// </summary>
+	/// <remarks>
+	/// Document types and members are displayed in a tree view.
+	/// The displayed nodes can be sorted by changing the sorting properties state.
+	/// The sort behaviour is serialized into MonoDevelopProperties.xml.
+	/// Nodes with lower sortKey value will be sorted before nodes with higher value.
+	/// Nodes with equal sortKey will be sorted by string comparison of the name of the nodes.
+	/// The string comparison ignores symbols (e.g. sort 'Foo()' next to '~Foo()').
+	/// </remarks>
+	/// <seealso cref="MonoDevelop.CSharp.ClassOutline.OutlineNodeComparer"/>
+	/// <seealso cref="MonoDevelop.CSharp.ClassOutline.OutlineSettings"/>
+	class CSharpOutlineTextEditorExtension : TextEditorExtension, IOutlinedDocument
+	{
+		SemanticModel lastCU = null;
+
+		MonoDevelop.Ide.Gui.Components.PadTreeView outlineTreeView;
+		TreeStore outlineTreeStore;
+		TreeModelSort outlineTreeModelSort;
+		Widget[] toolbarWidgets;
+		AstAmbience astAmbience;
+
+		OutlineNodeComparer comparer;
+		OutlineSettings settings;
+
+		bool refreshingOutline;
+		bool disposed;
+		bool outlineReady;
+
+
+		public override bool IsValidInContext (DocumentContext context)
+		{
+			return LanguageBindingService.GetBindingPerFileName (context.Name) != null;
+		}
+
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+
+			if (DocumentContext != null)
+				DocumentContext.DocumentParsed += UpdateDocumentOutline;
+			astAmbience = new AstAmbience (TypeSystemService.Workspace.Options);
+		}
+
+		public override void Dispose ()
+		{
+			if (disposed)
+				return;
+			disposed = true;
+			if (DocumentContext != null)
+				DocumentContext.DocumentParsed -= UpdateDocumentOutline;
+			RemoveRefillOutlineStoreTimeout ();
+			lastCU = null;
+			settings = null;
+			comparer = null;
+			base.Dispose ();
+		}
+
+		Widget IOutlinedDocument.GetOutlineWidget ()
+		{
+			if (outlineTreeView != null)
+				return outlineTreeView;
+
+			outlineTreeStore = new TreeStore (typeof(object));
+			outlineTreeModelSort = new TreeModelSort (outlineTreeStore);
+			
+			settings = OutlineSettings.Load ();
+			comparer = new OutlineNodeComparer (new AstAmbience (TypeSystemService.Workspace.Options), settings, outlineTreeModelSort);
+
+			outlineTreeModelSort.SetSortFunc (0, comparer.CompareNodes);
+			outlineTreeModelSort.SetSortColumnId (0, SortType.Ascending);
+
+			outlineTreeView = new MonoDevelop.Ide.Gui.Components.PadTreeView (outlineTreeStore);
+
+			var pixRenderer = new CellRendererImage ();
+			pixRenderer.Xpad = 0;
+			pixRenderer.Ypad = 0;
+
+			outlineTreeView.TextRenderer.Xpad = 0;
+			outlineTreeView.TextRenderer.Ypad = 0;
+
+			TreeViewColumn treeCol = new TreeViewColumn ();
+			treeCol.PackStart (pixRenderer, false);
+
+			treeCol.SetCellDataFunc (pixRenderer, new TreeCellDataFunc (OutlineTreeIconFunc));
+			treeCol.PackStart (outlineTreeView.TextRenderer, true);
+
+			treeCol.SetCellDataFunc (outlineTreeView.TextRenderer, new TreeCellDataFunc (OutlineTreeTextFunc));
+			outlineTreeView.AppendColumn (treeCol);
+
+			outlineTreeView.HeadersVisible = false;
+
+			outlineTreeView.Selection.Changed += delegate {
+				JumpToDeclaration (false);
+			};
+			
+			outlineTreeView.RowActivated += delegate {
+				JumpToDeclaration (true);
+			};
+
+			var analysisDocument = DocumentContext.ParsedDocument;
+			if (analysisDocument != null)
+				lastCU = analysisDocument.GetAst<SemanticModel> ();
+
+			outlineTreeView.Realized += delegate { RefillOutlineStore (); };
+			UpdateSorting ();
+
+			var sw = new CompactScrolledWindow ();
+			sw.Add (outlineTreeView);
+			sw.ShowAll ();
+			return sw;
+		}
+		
+		IEnumerable<Widget> IOutlinedDocument.GetToolbarWidgets ()
+		{
+			if (toolbarWidgets != null)
+				return toolbarWidgets;
+			
+			var groupToggleButton = new ToggleButton {
+				Image = new ImageView (Ide.Gui.Stock.GroupByCategory, IconSize.Menu),
+				TooltipText = GettextCatalog.GetString ("Group entries by type"),
+				Active = settings.IsGrouped,
+			};	
+			groupToggleButton.Toggled += delegate {
+				if (groupToggleButton.Active == settings.IsGrouped)
+					return;
+				settings.IsGrouped = groupToggleButton.Active;
+				UpdateSorting ();
+			};
+
+			var sortAlphabeticallyToggleButton = new ToggleButton {
+				Image = new ImageView (Ide.Gui.Stock.SortAlphabetically, IconSize.Menu),
+				TooltipText = GettextCatalog.GetString ("Sort entries alphabetically"),
+				Active = settings.IsSorted,
+			};	
+			sortAlphabeticallyToggleButton.Toggled += delegate {
+				if (sortAlphabeticallyToggleButton.Active == settings.IsSorted)
+					return;
+				settings.IsSorted = sortAlphabeticallyToggleButton.Active;
+				UpdateSorting ();
+			};
+
+			var preferencesButton = new DockToolButton (Ide.Gui.Stock.Options) {
+				TooltipText = GettextCatalog.GetString ("Open preferences dialog"),
+			};
+			preferencesButton.Clicked += delegate {
+				using (var dialog = new OutlineSortingPreferencesDialog (settings)) {
+					if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog) == (int)Gtk.ResponseType.Ok) {
+						dialog.SaveSettings ();
+						comparer = new OutlineNodeComparer (new AstAmbience (TypeSystemService.Workspace.Options), settings, outlineTreeModelSort);
+						UpdateSorting ();
+					}
+				}
+			};
+			
+			return toolbarWidgets = new Widget[] {
+				groupToggleButton,
+				sortAlphabeticallyToggleButton,
+				new VSeparator (),
+				preferencesButton,
+			};
+		}
+		
+		void JumpToDeclaration (bool focusEditor)
+		{
+			if (!outlineReady)
+				return;
+			TreeIter iter;
+			if (!outlineTreeView.Selection.GetSelected (out iter))
+				return;
+
+			var o = outlineTreeStore.GetValue (IsSorting () ? outlineTreeModelSort.ConvertIterToChildIter (iter) : iter, 0);
+
+			var syntaxNode = o as SyntaxNode;
+			if (syntaxNode != null) {
+				Editor.CaretOffset = syntaxNode.SpanStart;
+			} else {
+				Editor.CaretOffset = ((SyntaxTrivia)o).SpanStart;
+			}
+
+			if (focusEditor)
+				Editor.GrabFocus ();
+		}
+
+		static void OutlineTreeIconFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+		{
+			var pixRenderer = (CellRendererImage)cell;
+			object o = model.GetValue (iter, 0);
+			if (o is SyntaxNode) {
+				pixRenderer.Image = ImageService.GetIcon (((SyntaxNode)o).GetStockIcon (), IconSize.Menu);
+			} else if (o is SyntaxTrivia) {
+				pixRenderer.Image = ImageService.GetIcon (Ide.Gui.Stock.Region, IconSize.Menu);
+			}
+		}
+
+		void OutlineTreeTextFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+		{
+			var txtRenderer = (CellRendererText)cell;
+			object o = model.GetValue (iter, 0);
+			var syntaxNode = o as SyntaxNode;
+			if (syntaxNode != null) {
+				txtRenderer.Markup = astAmbience.GetEntityMarkup (syntaxNode);
+			} else if (o is SyntaxTrivia) {
+				txtRenderer.Text = ((SyntaxTrivia)o).ToString ();
+			}
+		}
+
+		void IOutlinedDocument.ReleaseOutlineWidget ()
+		{
+			if (outlineTreeView == null)
+				return;
+			var w = (ScrolledWindow)outlineTreeView.Parent;
+			w.Destroy ();
+			if (outlineTreeModelSort != null) {
+				outlineTreeModelSort.Dispose ();
+				outlineTreeModelSort = null;
+			}
+			if (outlineTreeStore != null) {
+				outlineTreeStore.Dispose ();
+				outlineTreeStore = null;
+			}
+			outlineTreeView = null;
+			settings = null;
+			foreach (var tw in toolbarWidgets)
+				tw.Destroy ();
+			toolbarWidgets = null;
+			comparer = null;
+		}
+
+		void RemoveRefillOutlineStoreTimeout ()
+		{
+			if (refillOutlineStoreId == 0)
+				return;
+			GLib.Source.Remove (refillOutlineStoreId);
+			refillOutlineStoreId = 0;
+		}
+
+		uint refillOutlineStoreId;
+		void UpdateDocumentOutline (object sender, EventArgs args)
+		{
+			var analysisDocument = DocumentContext.ParsedDocument;
+			if (analysisDocument == null)
+				return;
+			lastCU = analysisDocument.GetAst<SemanticModel> ();
+			//limit update rate to 3s
+			if (!refreshingOutline) {
+				refreshingOutline = true;
+				refillOutlineStoreId = GLib.Timeout.Add (3000, RefillOutlineStore);
+			}
+		}
+
+		bool RefillOutlineStore ()
+		{
+			Runtime.AssertMainThread ();
+			Gdk.Threads.Enter ();
+			refreshingOutline = false;
+			if (outlineTreeStore == null || !outlineTreeView.IsRealized) {
+				refillOutlineStoreId = 0;
+				return false;
+			}
+			
+			outlineReady = false;
+			outlineTreeStore.Clear ();
+			if (lastCU != null) {
+				BuildTreeChildren (outlineTreeStore, TreeIter.Zero, lastCU);
+				TreeIter it;
+				if (IsSorting ()) {
+					if (outlineTreeModelSort.GetIterFirst (out it))
+						outlineTreeView.Selection.SelectIter (it);
+				} else {
+					if (outlineTreeStore.GetIterFirst (out it))
+						outlineTreeView.Selection.SelectIter (it);
+				}
+
+				outlineTreeView.ExpandAll ();
+			}
+			outlineReady = true;
+
+			Gdk.Threads.Leave ();
+
+			//stop timeout handler
+			refillOutlineStoreId = 0;
+			return false;
+		}
+
+		class TreeVisitor : CSharpSyntaxWalker
+		{
+			TreeStore store;
+			TreeIter curIter;
+
+			public TreeVisitor (TreeStore store, TreeIter curIter) : base (SyntaxWalkerDepth.Trivia)
+			{
+				this.store = store;
+				this.curIter = curIter;
+			}
+
+			TreeIter Append (object node) 
+			{
+				if (!curIter.Equals (TreeIter.Zero))
+					return store.AppendValues (curIter, node);
+				return store.AppendValues (node);
+			}
+
+			public override void VisitTrivia (SyntaxTrivia trivia)
+			{
+				switch (trivia.Kind ()) {
+				case SyntaxKind.RegionDirectiveTrivia:
+					curIter = Append (trivia);
+					break;
+				case SyntaxKind.EndRegionDirectiveTrivia:
+					TreeIter parent;
+					if (store.IterParent (out parent, curIter))
+						curIter = parent;
+					break;
+				}
+				base.VisitTrivia (trivia);
+			}
+
+			void VisitBody (SyntaxNode node)
+			{
+				var oldIter = curIter;
+
+				foreach (var syntaxNodeOrToken in node.ChildNodesAndTokens ()) {
+					var syntaxNode = syntaxNodeOrToken.AsNode ();
+					if (syntaxNode != null) {
+						Visit (syntaxNode);
+					} else {
+						var syntaxToken = syntaxNodeOrToken.AsToken ();
+						if (syntaxToken.Kind () == SyntaxKind.OpenBraceToken)
+							curIter = Append (node);
+						VisitToken (syntaxToken);
+					}
+				}
+				curIter = oldIter;
+
+			}
+
+			public override void VisitNamespaceDeclaration (NamespaceDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitClassDeclaration (ClassDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitStructDeclaration (StructDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitEnumDeclaration (EnumDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitInterfaceDeclaration (InterfaceDeclarationSyntax node)
+			{
+				VisitBody (node);
+			}
+
+			public override void VisitDelegateDeclaration (DelegateDeclarationSyntax node)
+			{
+				base.VisitDelegateDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitFieldDeclaration (FieldDeclarationSyntax node)
+			{
+				base.VisitFieldDeclaration (node);
+				foreach (var v in node.Declaration.Variables)
+					Append (v);
+			}
+
+			public override void VisitPropertyDeclaration (PropertyDeclarationSyntax node)
+			{
+				base.VisitPropertyDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitIndexerDeclaration (IndexerDeclarationSyntax node)
+			{
+				base.VisitIndexerDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitMethodDeclaration (MethodDeclarationSyntax node)
+			{
+				base.VisitMethodDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitOperatorDeclaration (OperatorDeclarationSyntax node)
+			{
+				base.VisitOperatorDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitConstructorDeclaration (ConstructorDeclarationSyntax node)
+			{
+				base.VisitConstructorDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitDestructorDeclaration (DestructorDeclarationSyntax node)
+			{
+				base.VisitDestructorDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitEventDeclaration (EventDeclarationSyntax node)
+			{
+				base.VisitEventDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitEventFieldDeclaration (EventFieldDeclarationSyntax node)
+			{
+				base.VisitEventFieldDeclaration (node);
+				foreach (var v in node.Declaration.Variables)
+					Append (v);
+			}
+
+			public override void VisitEnumMemberDeclaration (EnumMemberDeclarationSyntax node)
+			{
+				base.VisitEnumMemberDeclaration (node);
+				Append (node);
+			}
+
+			public override void VisitBlock (BlockSyntax node)
+			{
+				// skip
+			}
+		}
+
+
+		static void BuildTreeChildren (TreeStore store, TreeIter parent, SemanticModel parsedDocument)
+		{
+			if (parsedDocument == null)
+				return;
+
+			var root = parsedDocument.SyntaxTree.GetRoot ();
+
+			var visitor = new TreeVisitor (store, parent);
+			visitor.Visit (root); 
+		}
+
+		void UpdateSorting ()
+		{
+			if (IsSorting ()) {
+				// Sort the model, sort keys may have changed.
+				// Only setting the column again does not re-sort so we set the function instead.
+				outlineTreeModelSort.SetSortFunc (0, comparer.CompareNodes);
+				outlineTreeView.Model = outlineTreeModelSort;
+			} else {
+				outlineTreeView.Model = outlineTreeStore;
+			}
+
+			// Because sorting the tree by setting the sort function also collapses the tree view we expand
+			// the whole tree.
+			outlineTreeView.ExpandAll ();
+		}
+
+		bool IsSorting ()
+		{
+			return settings.IsGrouped || settings.IsSorted;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineNodeComparer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineNodeComparer.cs
new file mode 100755
index 0000000000..ea844666b0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineNodeComparer.cs
@@ -0,0 +1,293 @@
+//
+// ClassOutlineNodeComparer.cs
+//
+// Authors:
+//  Helmut Duregger <helmutduregger@gmx.at>
+//
+// Copyright (c) 2010 Helmut Duregger
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Xml.Serialization;
+
+using Gtk;
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.CSharp.ClassOutline
+{
+	/// <remarks>
+	/// This implementation uses a primary sort key (int based on node's group) and
+	/// a secondary sort key (string based on node's name) for comparison.
+	/// </remarks>
+	/// <seealso cref="MonoDevelop.CSharp.ClassOutline.OutlineSettings"/>
+	class OutlineNodeComparer : IComparer<TreeIter>
+	{
+		const string DEFAULT_REGION_NAME = "region";
+		
+		AstAmbience ambience;
+		TreeModel model;
+		OutlineSettings settings;
+		int[] groupTable;
+
+		/// <param name="ambience">
+		/// The ambience used on retrieval of node names.
+		/// </param>
+		/// <param name="settings">
+		/// The properties used on retrieval of node sort keys and sorting settings.
+		/// </param>
+		/// <param name="model">
+		/// The model containing the nodes to compare.
+		/// </param>
+		public OutlineNodeComparer (AstAmbience ambience, OutlineSettings settings, TreeModel model)
+		{
+			this.ambience = ambience;
+			this.settings = settings;
+			this.model = model;
+			BuildGroupTable ();
+		}
+
+		public int Compare (TreeIter a, TreeIter b)
+		{
+			return CompareNodes (model, a, b);
+		}
+
+		/// <summary>
+		/// Compares nodes by primary (group) and secondary (name) sort keys depending on
+		/// sort properties.
+		/// </summary>
+		/// <remarks>
+		/// For methods, constructors and destructors are sorted at the top.
+		/// </remarks>
+		/// <param name="model">
+		/// The TreeModel that the iterators refer to.
+		/// </param>
+		/// <param name="node1">
+		/// The first tree node that will be compared.
+		/// </param>
+		/// <param name="node2">
+		/// The second tree node that will be compared.
+		/// </param>
+		/// <returns>
+		/// Less than zero if nodeA &lt; nodeB
+		/// Zero if nodeA == nodeB.
+		/// Greater than zero if nodeA &gt; nodeB.
+		/// </returns>
+		public int CompareNodes (TreeModel model, TreeIter node1, TreeIter node2)
+		{
+			object o1 = model.GetValue (node1, 0);
+			object o2 = model.GetValue (node2, 0);
+			if (o1 == null) {
+				return o2 == null? 0 : 1;
+			} else if (o2 == null) {
+				return -1;
+			}
+			
+			if (settings.IsGrouped) {
+				int groupOrder = GetGroupPriority (o1) - GetGroupPriority (o2);
+				if (groupOrder != 0)
+					return groupOrder;
+				
+				var m1 = o1 as BaseMethodDeclarationSyntax;
+				if (m1 != null)
+					return CompareMethods (m1, (BaseMethodDeclarationSyntax)o2, settings.IsSorted);
+			}
+			
+			if (settings.IsSorted)
+				return CompareName (o1, o2);
+			
+			return CompareRegion (o1, o2);
+		}
+
+		int CompareName (object o1, object o2)
+		{
+			var sort = string.Compare (
+				GetSortName (o1),
+				GetSortName (o2),
+				System.Globalization.CultureInfo.CurrentCulture,
+				System.Globalization.CompareOptions.IgnoreSymbols);
+			if (sort == 0)
+				return CompareRegion (o1, o2);
+			return sort;
+		}
+
+		int CompareMethods (BaseMethodDeclarationSyntax m1, BaseMethodDeclarationSyntax m2, bool isSortingAlphabetically)
+		{
+			// Here we sort constructors before finalizers before other methods.
+			// Remember that two constructors have the same name.
+
+			// Sort constructors at top.
+			
+			bool isCtor1 = m1 is ConstructorDeclarationSyntax;
+			bool isCtor2 = m2 is ConstructorDeclarationSyntax;
+
+			if (isCtor1) {
+				if (isCtor2)
+					return CompareRegion (m1, m2);
+				else
+					return -1;
+			} else if (isCtor2) {
+				return 1;
+			}
+			
+			// Sort finalizers after constructors.
+			//
+			// Sorting two finalizers even though this is not valid C#. This gives a correct
+			// outline during editing.
+			
+			bool isFinalizer1 = IsFinalizer (m1);
+			bool isFinalizer2 = IsFinalizer (m2);
+			
+			if (isFinalizer1) {
+				if (isFinalizer2)
+					return CompareRegion (m1, m2);
+				else
+					return -1;
+			} else if (isFinalizer2) {
+				return 1;
+			}
+			
+			if (isSortingAlphabetically)
+				return CompareName (m1, m2);
+			else
+				return CompareRegion (m1, m2);
+		}
+
+		bool IsConstructor (object node)
+		{
+			return node is ConstructorDeclarationSyntax;
+		}
+
+		bool IsFinalizer (object node)
+		{
+			return node is DestructorDeclarationSyntax;
+		}
+		
+		const int GROUP_INDEX_REGIONS = 0;
+		const int GROUP_INDEX_NAMESPACES = 1;
+		const int GROUP_INDEX_TYPES = 2;
+		const int GROUP_INDEX_FIELDS = 3;
+		const int GROUP_INDEX_PROPERTIES = 4;
+		const int GROUP_INDEX_EVENTS = 5;
+		const int GROUP_INDEX_METHODS = 6;
+		
+		void BuildGroupTable ()
+		{
+			groupTable = new int[7];
+			int i = -10;
+			foreach (var g in settings.GroupOrder) {
+				switch (g) {
+				case OutlineSettings.GroupRegions:
+					groupTable[GROUP_INDEX_REGIONS] = i++;
+					break;
+				case OutlineSettings.GroupNamespaces:
+					groupTable[GROUP_INDEX_NAMESPACES] = i++;
+					break;
+				case OutlineSettings.GroupTypes:
+					groupTable[GROUP_INDEX_TYPES] = i++;
+					break;
+				case OutlineSettings.GroupFields:
+					groupTable[GROUP_INDEX_FIELDS] = i++;
+					break;
+				case OutlineSettings.GroupProperties:
+					groupTable[GROUP_INDEX_PROPERTIES] = i++;
+					break;
+				case OutlineSettings.GroupEvents:
+					groupTable[GROUP_INDEX_EVENTS] = i++;
+					break;
+				case OutlineSettings.GroupMethods:
+					groupTable[GROUP_INDEX_METHODS] = i++;
+					break;
+				}
+			}
+		}
+
+		int GetGroupPriority (object node)
+		{
+			if (node is SyntaxTrivia)
+				return groupTable[GROUP_INDEX_REGIONS];
+			if (node is string)
+				return groupTable[GROUP_INDEX_NAMESPACES];
+			if (node is BaseTypeDeclarationSyntax)
+				return groupTable[GROUP_INDEX_TYPES];
+			if (node is FieldDeclarationSyntax)
+				return groupTable[GROUP_INDEX_FIELDS];
+			if (node is PropertyDeclarationSyntax)
+				return groupTable[GROUP_INDEX_PROPERTIES];
+			if (node is EventDeclarationSyntax || node is EventFieldDeclarationSyntax)
+				return groupTable[GROUP_INDEX_EVENTS];
+			if (node is BaseMethodDeclarationSyntax)
+				return groupTable[GROUP_INDEX_METHODS];
+			return 0;
+		}
+
+		/// <summary>
+		/// Returns the name of the node that should be used as a secondary sort key.
+		/// </summary>
+		/// <param name="node">
+		/// A node in the tree. Expected to be either an IMember or a FoldingRegion.
+		/// </param>
+		/// <returns>
+		/// A string representing the secondary sort key.
+		/// The empty string if node is neither an IMember nor a FoldingRegion.
+		/// </returns>
+		string GetSortName (object node)
+		{
+			if (node is SyntaxNode) {
+				// Return the name without type or parameters
+				return ambience.GetEntityMarkup ((SyntaxNode)node);
+			}
+		
+			if (node is SyntaxTrivia) {
+				// Return trimmed region name or fallback
+				string name = ((SyntaxTrivia)node).ToString ().Trim ();
+				
+				// ClassOutlineTextEditorExtension uses a fallback name for regions
+				// so we do the same here with a slighty different name.
+				if (name.Length == 0)
+					name = DEFAULT_REGION_NAME;
+				
+				return name;
+			}
+			
+			return string.Empty;
+		}
+		
+		internal static int GetOffset (object o)
+		{
+			var m = o as SyntaxNode;
+			if (m != null)
+				return m.SpanStart;
+			//			if (o is FoldingRegion)
+			//	return ((FoldingRegion)o).Region;
+			return 0;
+		}
+		
+		internal static int CompareRegion (object o1, object o2)
+		{
+			return GetOffset (o1).CompareTo (GetOffset (o2));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSettings.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSettings.cs
new file mode 100644
index 0000000000..8f6a63a96d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSettings.cs
@@ -0,0 +1,106 @@
+//
+// ClassOutlineSortingProperties.cs
+//
+// Authors:
+//  Helmut Duregger <helmutduregger@gmx.at>
+//
+// Copyright (c) 2010 Helmut Duregger
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Xml.Serialization;
+using System.Linq;
+
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.ClassOutline
+{
+	/// <summary>
+	/// Stores sorting status and is serialized to configuration properties.
+	/// </summary>
+	/// <remarks>
+	/// Stores the sorting configuration, e.g. if the class outline is currently sorted
+	/// or what primary sort key values the individual node groups have. This class is
+	/// serialized to the configuration file MonoDevelopProperties.xml.
+	/// </remarks>
+	/// <seealso cref="MonoDevelop.CSharp.ClassOutline.CSharpOutlineTextEditorExtension"/>
+	class OutlineSettings
+	{
+		const string KEY_GROUP_ORDER = "MonoDevelop.DesignerSupport.ClassOutline.GroupOrder";
+		const string KEY_IS_GROUPED = "MonoDevelop.DesignerSupport.ClassOutline.IsGrouped";
+		const string KEY_IS_SORTED  = "MonoDevelop.DesignerSupport.ClassOutline.IsSorted";
+		
+		public const string GroupRegions = "Regions";
+		public const string GroupNamespaces = "Namespaces";
+		public const string GroupTypes = "Types";
+		public const string GroupFields = "Fields";
+		public const string GroupProperties = "Properties";
+		public const string GroupEvents = "Events";
+		public const string GroupMethods = "Methods";
+		
+		static Dictionary<string,string> groupNames = new Dictionary<string, string> {
+			{ GroupRegions,    GettextCatalog.GetString ("Regions") },
+			{ GroupNamespaces, GettextCatalog.GetString ("Namespaces") },
+			{ GroupTypes,      GettextCatalog.GetString ("Types") },
+			{ GroupProperties, GettextCatalog.GetString ("Properties") },
+			{ GroupFields,     GettextCatalog.GetString ("Fields") },
+			{ GroupEvents,     GettextCatalog.GetString ("Events") },
+			{ GroupMethods,    GettextCatalog.GetString ("Methods") },
+		};
+		
+		OutlineSettings ()
+		{
+		}
+		
+		public static OutlineSettings Load ()
+		{
+			var cs = new OutlineSettings ();
+			cs.IsGrouped = PropertyService.Get (KEY_IS_GROUPED, false);
+			cs.IsSorted = PropertyService.Get (KEY_IS_SORTED, false);
+			
+			string s = PropertyService.Get (KEY_GROUP_ORDER, "");
+			if (s.Length == 0) {
+				cs.GroupOrder = groupNames.Keys.ToArray ();
+			} else {
+				cs.GroupOrder = s.Split (new char[] {','}, StringSplitOptions.RemoveEmptyEntries);
+			}
+			return cs;
+		}
+		
+		public void Save ()
+		{
+			PropertyService.Set (KEY_IS_GROUPED, IsGrouped);
+			PropertyService.Set (KEY_IS_SORTED, IsSorted);
+			PropertyService.Set (KEY_GROUP_ORDER, string.Join (",", GroupOrder));
+		}
+		
+		public static string GetGroupName (string group)
+		{
+			return groupNames [group];
+		}
+		
+		public IList<string> GroupOrder { get; set; }
+		public bool IsGrouped { get; set; }
+		public bool IsSorted { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSortingPreferencesDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSortingPreferencesDialog.cs
new file mode 100644
index 0000000000..713bca748e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/OutlineSortingPreferencesDialog.cs
@@ -0,0 +1,77 @@
+//
+// SortingPreferencesDialog.cs
+//
+// Authors:
+//  Helmut Duregger <helmutduregger@gmx.at>
+//
+// Copyright (c) 2011 Helmut Duregger
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+
+using Gtk;
+
+using MonoDevelop.Core;
+
+
+namespace MonoDevelop.CSharp.ClassOutline
+{
+	/// <summary>
+	/// Provides a priority list of the groups that items in the class outline can be grouped in.
+	/// </summary>
+	/// <remarks>
+	/// The user can sort the list with button presses and thereby change the order of groups
+	/// in the outline, while grouping is active.
+	/// </remarks>
+	partial class OutlineSortingPreferencesDialog : Dialog
+	{
+		OutlineSettings settings;
+		
+		public OutlineSortingPreferencesDialog (OutlineSettings settings)
+		{
+			this.Build ();
+
+			priorityList.Model = new ListStore (typeof (string), typeof (string));
+			priorityList.AppendColumn ("", new CellRendererText (), "text", 1);
+			
+			priorityList.Model.Clear ();
+			foreach (string g in settings.GroupOrder) {
+				priorityList.Model.AppendValues (g, OutlineSettings.GetGroupName (g));
+			}
+			
+			this.settings = settings;
+		}
+		
+		public void SaveSettings ()
+		{
+			TreeIter iter;
+			if (priorityList.Model.GetIterFirst (out iter)) {
+				var order = new List<string> ();
+				do {
+					order.Add ((string) priorityList.Model.GetValue (iter, 0));
+				} while (priorityList.Model.IterNext (ref iter));
+				settings.GroupOrder = order; 
+			}
+			settings.Save ();
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
new file mode 100644
index 0000000000..29a9f41fc2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
@@ -0,0 +1,526 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using MonoDevelop.Ide.TypeSystem;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	internal abstract partial class AbstractAddImportCodeFixProvider : CodeFixProvider
+	{
+		protected abstract bool IgnoreCase { get; }
+
+		protected abstract bool CanAddImport(SyntaxNode node, CancellationToken cancellationToken);
+		protected abstract bool CanAddImportForMethod(Diagnostic diagnostic, ref SyntaxNode node);
+		protected abstract bool CanAddImportForNamespace(Diagnostic diagnostic, ref SyntaxNode node);
+		protected abstract bool CanAddImportForQuery(Diagnostic diagnostic, ref SyntaxNode node);
+		protected abstract bool CanAddImportForType(Diagnostic diagnostic, ref SyntaxNode node);
+
+		protected abstract ISet<INamespaceSymbol> GetNamespacesInScope(SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken);
+		protected abstract ITypeSymbol GetQueryClauseInfo(SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken);
+		protected abstract string GetDescription(INamespaceOrTypeSymbol symbol, SemanticModel semanticModel, SyntaxNode root);
+		protected abstract Task<Document> AddImportAsync(SyntaxNode contextNode, INamespaceOrTypeSymbol symbol, Document documemt, bool specialCaseSystem, CancellationToken cancellationToken);
+		protected abstract bool IsViableExtensionMethod(IMethodSymbol method, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken);
+		protected abstract IEnumerable<ITypeSymbol> GetProposedTypes(string name, List<ITypeSymbol> accessibleTypeSymbols, SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope);
+		internal abstract bool IsViableField(IFieldSymbol field, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken);
+		internal abstract bool IsViableProperty(IPropertySymbol property, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken);
+		internal abstract bool IsAddMethodContext(SyntaxNode node, SemanticModel semanticModel);
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var diagnostics = context.Diagnostics;
+			var cancellationToken = context.CancellationToken;
+
+			var project = document.Project;
+			var diagnostic = diagnostics.First();
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			if (root.FullSpan.Length < span.Start)
+				return;
+			var ancestors = root.FindToken(span.Start, findInsideTrivia: true).GetAncestors<SyntaxNode>();
+			if (!ancestors.Any())
+			{
+				return;
+			}
+
+			var node = ancestors.FirstOrDefault(n => n.Span.Contains(span) && n != root);
+			if (node == null)
+			{
+				return;
+			}
+
+			var placeSystemNamespaceFirst = true; //document.Project.Solution.Workspace.Options.GetOption(Microsoft.CodeAnalysis.Shared.Options.OrganizerOptions.PlaceSystemNamespaceFirst, document.Project.Language);
+
+			if (!cancellationToken.IsCancellationRequested)
+			{
+				if (this.CanAddImport(node, cancellationToken))
+				{
+					var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+					//var containingType = semanticModel.GetEnclosingNamedType(node.SpanStart, cancellationToken);
+					//var containingTypeOrAssembly = containingType ?? (ISymbol)semanticModel.Compilation.Assembly;
+					var namespacesInScope = this.GetNamespacesInScope(semanticModel, node, cancellationToken);
+
+					var matchingTypesNamespaces = await this.GetNamespacesForMatchingTypesAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var matchingTypes = await this.GetMatchingTypesAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var matchingNamespaces = await this.GetNamespacesForMatchingNamespacesAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var matchingExtensionMethodsNamespaces = await this.GetNamespacesForMatchingExtensionMethodsAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var matchingFieldsAndPropertiesAsync = await this.GetNamespacesForMatchingFieldsAndPropertiesAsync(project, diagnostic, node, semanticModel, namespacesInScope,  cancellationToken).ConfigureAwait(false);
+					var queryPatternsNamespaces = await this.GetNamespacesForQueryPatternsAsync(project, diagnostic, node, semanticModel, namespacesInScope, cancellationToken).ConfigureAwait(false);
+
+					if (matchingTypesNamespaces != null || matchingNamespaces != null || matchingExtensionMethodsNamespaces != null || matchingFieldsAndPropertiesAsync != null || queryPatternsNamespaces != null || matchingTypes != null)
+					{
+						matchingTypesNamespaces = matchingTypesNamespaces ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						matchingNamespaces = matchingNamespaces ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						matchingExtensionMethodsNamespaces = matchingExtensionMethodsNamespaces ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						matchingFieldsAndPropertiesAsync = matchingFieldsAndPropertiesAsync ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						queryPatternsNamespaces = queryPatternsNamespaces ?? SpecializedCollections.EmptyList<INamespaceSymbol>();
+						matchingTypes = matchingTypes ?? SpecializedCollections.EmptyList<ITypeSymbol>();
+
+						var proposedImports =
+							matchingTypesNamespaces.Cast<INamespaceOrTypeSymbol> ()
+								.Concat (matchingNamespaces.Cast<INamespaceOrTypeSymbol> ())
+								.Concat (matchingExtensionMethodsNamespaces.Cast<INamespaceOrTypeSymbol> ())
+								.Concat (matchingFieldsAndPropertiesAsync.Cast<INamespaceOrTypeSymbol> ())
+								.Concat (queryPatternsNamespaces.Cast<INamespaceOrTypeSymbol> ())
+								.Concat (matchingTypes.Cast<INamespaceOrTypeSymbol> ())
+								.Distinct ()
+								.Where (NotNull)
+								.Where (NotGlobalNamespace)
+								.ToList ();
+						proposedImports.Sort (INamespaceOrTypeSymbolExtensions.CompareNamespaceOrTypeSymbols);
+						proposedImports = proposedImports.Take (8).ToList ();
+							
+						if (proposedImports.Count > 0)
+						{
+							cancellationToken.ThrowIfCancellationRequested();
+
+							foreach (var import in proposedImports)
+							{
+								var action = new DocumentChangeAction(
+									node.Span, 
+									DiagnosticSeverity.Error, 
+									this.GetDescription(import, semanticModel, node), 
+									(c) => this.AddImportAsync(node, import, document, placeSystemNamespaceFirst, cancellationToken)
+								);
+
+								context.RegisterCodeFix(action, diagnostic);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForMatchingTypesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForType(diagnostic, ref node))
+			{
+				return null;
+			}
+
+			string name;
+			int arity;
+			bool inAttributeContext, hasIncompleteParentMember;
+			CalculateContext(node,  out name, out arity, out inAttributeContext, out hasIncompleteParentMember);
+
+			var symbols = await GetTypeSymbols(project, node, semanticModel, name, inAttributeContext, cancellationToken).ConfigureAwait(false);
+			if (symbols == null)
+			{
+				return null;
+			}
+
+			return GetNamespacesForMatchingTypesAsync(semanticModel, namespacesInScope, arity, inAttributeContext, hasIncompleteParentMember, symbols);
+		}
+
+		private IEnumerable<INamespaceSymbol> GetNamespacesForMatchingTypesAsync(SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope, int arity, bool inAttributeContext, bool hasIncompleteParentMember, IEnumerable<ITypeSymbol> symbols)
+		{
+			var accessibleTypeSymbols = symbols
+				.Where(s => s.ContainingSymbol is INamespaceSymbol
+					&& ArityAccessibilityAndAttributeContextAreCorrect(
+						semanticModel, s, arity,
+						inAttributeContext, hasIncompleteParentMember))
+				.ToList();
+
+			return GetProposedNamespaces(
+				accessibleTypeSymbols.Select(s => s.ContainingNamespace),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private async Task<IEnumerable<ITypeSymbol>> GetMatchingTypesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForType(diagnostic, ref node))
+			{
+				return null;
+			}
+
+			string name;
+			int arity;
+			bool inAttributeContext, hasIncompleteParentMember;
+			CalculateContext(node,  out name, out arity, out inAttributeContext, out hasIncompleteParentMember);
+
+			var symbols = await GetTypeSymbols(project, node, semanticModel, name, inAttributeContext, cancellationToken).ConfigureAwait(false);
+			if (symbols == null)
+			{
+				return null;
+			}
+
+			return GetMatchingTypes(semanticModel, namespacesInScope, name, arity, inAttributeContext, symbols, hasIncompleteParentMember);
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForMatchingNamespacesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForNamespace(diagnostic, ref node))
+			{
+				return null;
+			}
+
+			string name;
+			int arity;
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+
+			if (ExpressionBinds(node, semanticModel, cancellationToken))
+			{
+				return null;
+			}
+
+			var symbols = await SymbolFinder.FindDeclarationsAsync(
+				project, name, this.IgnoreCase, SymbolFilter.Namespace, cancellationToken).ConfigureAwait(false);
+
+			return GetProposedNamespaces(
+				symbols.OfType<INamespaceSymbol>().Select(n => n.ContainingNamespace),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForMatchingExtensionMethodsAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForMethod(diagnostic,  ref node))
+			{
+				return null;
+			}
+
+			var expression = node.Parent;
+
+			var extensionMethods = SpecializedCollections.EmptyEnumerable<INamespaceSymbol>();
+			var symbols = await GetSymbolsAsync(project, node, semanticModel,  cancellationToken).ConfigureAwait(false);
+			if (symbols != null)
+			{
+				extensionMethods = FilterForExtensionMethods(semanticModel, namespacesInScope,  expression, symbols, cancellationToken);
+			}
+
+			var addMethods = SpecializedCollections.EmptyEnumerable<INamespaceSymbol>();
+			var methodSymbols = await GetAddMethodsAsync(project, diagnostic, node, semanticModel, namespacesInScope,  expression, cancellationToken).ConfigureAwait(false);
+			if (methodSymbols != null)
+			{
+				addMethods = GetProposedNamespaces(
+					methodSymbols.Select(s => s.ContainingNamespace),
+					semanticModel,
+					namespacesInScope);
+			}
+
+			return extensionMethods.Concat(addMethods);
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForMatchingFieldsAndPropertiesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForMethod(diagnostic,  ref node))
+			{
+				return null;
+			}
+
+			var expression = node.Parent;
+
+			var symbols = await GetSymbolsAsync(project, node, semanticModel,  cancellationToken).ConfigureAwait(false);
+
+			if (symbols != null)
+			{
+				return FilterForFieldsAndProperties(semanticModel, namespacesInScope,  expression, symbols, cancellationToken);
+			}
+
+			return null;
+		}
+
+		private IEnumerable<INamespaceSymbol> FilterForFieldsAndProperties(SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope, SyntaxNode expression, IEnumerable<ISymbol> symbols, CancellationToken cancellationToken)
+		{
+			var propertySymbols = symbols
+				.OfType<IPropertySymbol>()
+				.Where(property => property.ContainingType?.IsAccessibleWithin(semanticModel.Compilation.Assembly) == true &&
+					IsViableProperty(property, expression, semanticModel,  cancellationToken))
+				.ToList();
+
+			var fieldSymbols = symbols
+				.OfType<IFieldSymbol>()
+				.Where(field => field.ContainingType?.IsAccessibleWithin(semanticModel.Compilation.Assembly) == true &&
+					IsViableField(field, expression, semanticModel,  cancellationToken))
+				.ToList();
+
+			return GetProposedNamespaces(
+				propertySymbols.Select(s => s.ContainingNamespace).Concat(fieldSymbols.Select(s => s.ContainingNamespace)),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private Task<IEnumerable<ISymbol>> GetSymbolsAsync(
+			Microsoft.CodeAnalysis.Project project,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+
+			// See if the name binds.  If it does, there's nothing further we need to do.
+			if (ExpressionBinds(node, semanticModel, cancellationToken, checkForExtensionMethods: true))
+			{
+				return Task.FromResult (Enumerable.Empty<ISymbol>());
+			}
+
+			string name;
+			int arity;
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+			if (name == null)
+			{
+				return Task.FromResult (Enumerable.Empty<ISymbol>());
+			}
+
+			return SymbolFinder.FindDeclarationsAsync(project, name, this.IgnoreCase, SymbolFilter.Member, cancellationToken);
+		}
+
+		private async Task<IEnumerable<IMethodSymbol>> GetAddMethodsAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			SyntaxNode expression,
+			CancellationToken cancellationToken)
+		{
+			string name;
+			int arity;
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+			if (name != null)
+			{
+				return SpecializedCollections.EmptyEnumerable<IMethodSymbol>();
+			}
+
+			if (IsAddMethodContext(node, semanticModel))
+			{
+				var symbols = await SymbolFinder.FindDeclarationsAsync(project, "Add", this.IgnoreCase, SymbolFilter.Member, cancellationToken).ConfigureAwait(false);
+				return symbols
+					.OfType<IMethodSymbol>()
+					.Where(method => method.IsExtensionMethod &&
+						method.ContainingType?.IsAccessibleWithin(semanticModel.Compilation.Assembly) == true &&
+						IsViableExtensionMethod(method, expression, semanticModel,  cancellationToken));
+			}
+
+			return SpecializedCollections.EmptyEnumerable<IMethodSymbol>();
+		}
+
+		private IEnumerable<INamespaceSymbol> FilterForExtensionMethods(SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope,  SyntaxNode expression, IEnumerable<ISymbol> symbols, CancellationToken cancellationToken)
+		{
+			var extensionMethodSymbols = symbols
+				.OfType<IMethodSymbol>()
+				.Where(method => method.IsExtensionMethod &&
+					method.ContainingType?.IsAccessibleWithin(semanticModel.Compilation.Assembly) == true &&
+					IsViableExtensionMethod(method, expression, semanticModel,  cancellationToken))
+				.ToList();
+
+			return GetProposedNamespaces(
+				extensionMethodSymbols.Select(s => s.ContainingNamespace),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private async Task<IEnumerable<INamespaceSymbol>> GetNamespacesForQueryPatternsAsync(
+			Microsoft.CodeAnalysis.Project project,
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope,
+			CancellationToken cancellationToken)
+		{
+			if (!this.CanAddImportForQuery(diagnostic, ref node))
+			{
+				return null;
+			}
+
+			ITypeSymbol type = this.GetQueryClauseInfo(semanticModel, node, cancellationToken);
+			if (type == null)
+			{
+				return null;
+			}
+
+			// find extension methods named "Select"
+			var symbols = await SymbolFinder.FindDeclarationsAsync(project, "Select", this.IgnoreCase, SymbolFilter.Member, cancellationToken).ConfigureAwait(false);
+
+			var extensionMethodSymbols = symbols
+				.OfType<IMethodSymbol>()
+				.Where(s => s.IsExtensionMethod && IsViableExtensionMethod(type, s))
+				.ToList();
+
+			return GetProposedNamespaces(
+				extensionMethodSymbols.Select(s => s.ContainingNamespace),
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private bool IsViableExtensionMethod(
+			ITypeSymbol typeSymbol,
+			IMethodSymbol method)
+		{
+			return typeSymbol != null && method.ReduceExtensionMethod(typeSymbol) != null;
+		}
+
+		private static bool ArityAccessibilityAndAttributeContextAreCorrect(
+			SemanticModel semanticModel,
+			ITypeSymbol symbol,
+			int arity,
+			bool inAttributeContext,
+			bool hasIncompleteParentMember)
+		{
+			return (arity == 0 || symbol.GetArity() == arity || hasIncompleteParentMember)
+				&& symbol.IsAccessibleWithin(semanticModel.Compilation.Assembly)
+				&& (!inAttributeContext || symbol.IsAttribute());
+		}
+
+		private async Task<IEnumerable<ITypeSymbol>> GetTypeSymbols(
+			Microsoft.CodeAnalysis.Project project,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			string name,
+			bool inAttributeContext,
+			CancellationToken cancellationToken)
+		{
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return null;
+			}
+
+			if (ExpressionBinds(node, semanticModel, cancellationToken))
+			{
+				return null;
+			}
+
+			var symbols = await SymbolFinder.FindDeclarationsAsync(project, name, this.IgnoreCase, SymbolFilter.Type, cancellationToken).ConfigureAwait(false);
+
+			// also lookup type symbols with the "Attribute" suffix.
+			if (inAttributeContext)
+			{
+				symbols = symbols.Concat(
+					await SymbolFinder.FindDeclarationsAsync(project, name + "Attribute", this.IgnoreCase, SymbolFilter.Type, cancellationToken).ConfigureAwait(false));
+			}
+
+			return symbols.OfType<ITypeSymbol>();
+		}
+
+		private IEnumerable<ITypeSymbol> GetMatchingTypes(SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope, string name, int arity, bool inAttributeContext, IEnumerable<ITypeSymbol> symbols, bool hasIncompleteParentMember)
+		{
+			var accessibleTypeSymbols = symbols
+				.Where(s => ArityAccessibilityAndAttributeContextAreCorrect(
+					semanticModel, s, arity,
+					inAttributeContext, hasIncompleteParentMember))
+				.ToList();
+
+			return GetProposedTypes(
+				name,
+				accessibleTypeSymbols,
+				semanticModel,
+				namespacesInScope);
+		}
+
+		private static void CalculateContext(SyntaxNode node, out string name, out int arity, out bool inAttributeContext, out bool hasIncompleteParentMember)
+		{
+			// Has to be a simple identifier or generic name.
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+
+			inAttributeContext = node.IsAttributeName();
+			hasIncompleteParentMember = node.HasIncompleteParentMember();
+		}
+
+		protected bool ExpressionBinds(SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken, bool checkForExtensionMethods = false)
+		{
+			// See if the name binds to something other then the error type. If it does, there's nothing further we need to do.
+			// For extension methods, however, we will continue to search if there exists any better matched method.
+			cancellationToken.ThrowIfCancellationRequested();
+			var symbolInfo = semanticModel.GetSymbolInfo(expression, cancellationToken);
+			if (symbolInfo.CandidateReason == CandidateReason.OverloadResolutionFailure && !checkForExtensionMethods)
+			{
+				return true;
+			}
+
+			return symbolInfo.Symbol != null;
+		}
+
+		protected IEnumerable<INamespaceSymbol> GetProposedNamespaces(
+			IEnumerable<INamespaceSymbol> namespaces,
+			SemanticModel semanticModel,
+			ISet<INamespaceSymbol> namespacesInScope)
+		{
+			// We only want to offer to add a using if we don't already have one.
+			return
+				namespaces.Where(n => !n.IsGlobalNamespace)
+					.Select(n => semanticModel.Compilation.GetCompilationNamespace(n) ?? n)
+					.Where(n => n != null && !namespacesInScope.Contains(n));
+		}
+
+		private static bool NotGlobalNamespace(INamespaceOrTypeSymbol symbol)
+		{
+			return symbol.IsNamespace ? !((INamespaceSymbol)symbol).IsGlobalNamespace : true;
+		}
+
+		private static bool NotNull(INamespaceOrTypeSymbol symbol)
+		{
+			return symbol != null;
+		}
+
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/CSharpAddImportCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/CSharpAddImportCodeFixProvider.cs
new file mode 100644
index 0000000000..994bd39571
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/AddImport/CSharpAddImportCodeFixProvider.cs
@@ -0,0 +1,642 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+using MonoDevelop.CSharp.CodeFixes;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.AddUsingOrImport), Shared]
+	class CSharpAddImportCodeFixProvider : AbstractAddImportCodeFixProvider
+	{
+		/// <summary>
+		/// name does not exist in context
+		/// </summary>
+		private const string CS0103 = "CS0103";
+
+		/// <summary>
+		/// type or namespace could not be found
+		/// </summary>
+		private const string CS0246 = "CS0246";
+
+		/// <summary>
+		/// wrong number of type args
+		/// </summary>
+		private const string CS0305 = "CS0305";
+
+		/// <summary>
+		/// type does not contain a definition of method or extension method
+		/// </summary>
+		private const string CS1061 = "CS1061";
+
+		/// <summary>
+		/// cannot find implementation of query pattern
+		/// </summary>
+		private const string CS1935 = "CS1935";
+
+		/// <summary>
+		/// The non-generic type 'A' cannot be used with type arguments
+		/// </summary>
+		private const string CS0308 = "CS0308";
+
+		/// <summary>
+		/// 'A' is inaccessible due to its protection level
+		/// </summary>
+		private const string CS0122 = "CS0122";
+
+		/// <summary>
+		/// The using alias 'A' cannot be used with type arguments
+		/// </summary>
+		private const string CS0307 = "CS0307";
+
+		/// <summary>
+		/// 'A' is not an attribute class
+		/// </summary>
+		private const string CS0616 = "CS0616";
+
+		/// <summary>
+		/// ; expected.
+		/// </summary>
+		private const string CS1002 = "CS1002";
+
+		/// <summary>
+		/// Syntax error, 'A' expected
+		/// </summary>
+		private const string CS1003 = "CS1003";
+
+		/// <summary>
+		/// cannot convert from 'int' to 'string'
+		/// </summary>
+		private const string CS1503 = "CS1503";
+
+		/// <summary>
+		/// XML comment on 'construct' has syntactically incorrect cref attribute 'name'
+		/// </summary>
+		private const string CS1574 = "CS1574";
+
+		/// <summary>
+		/// Invalid type for parameter 'parameter number' in XML comment cref attribute
+		/// </summary>
+		private const string CS1580 = "CS1580";
+
+		/// <summary>
+		/// Invalid return type in XML comment cref attribute
+		/// </summary>
+		private const string CS1581 = "CS1581";
+
+		/// <summary>
+		/// XML comment has syntactically incorrect cref attribute
+		/// </summary>
+		private const string CS1584 = "CS1584";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get
+			{
+				return ImmutableArray.Create(
+					CS0103,
+					CS0246,
+					CS0305,
+					CS1061,
+					CS1935,
+					CS0308,
+					CS0122,
+					CS0307,
+					CS0616,
+					CS1002,
+					CS1003,
+					CS1503,
+					CS1574,
+					CS1580,
+					CS1581,
+					CS1584);
+			}
+		}
+
+		protected override bool IgnoreCase
+		{
+			get { return false; }
+		}
+
+		protected override bool CanAddImport(SyntaxNode node, CancellationToken cancellationToken)
+		{
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return false;
+			}
+
+			return node.CanAddUsingDirectives(cancellationToken);
+		}
+
+		protected override bool CanAddImportForMethod(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			switch (diagnostic.Id)
+			{
+			case CS1061:
+				if (node.IsKind(SyntaxKind.ConditionalAccessExpression))
+				{
+					node = (node as ConditionalAccessExpressionSyntax).WhenNotNull;
+				}
+				else if (node.IsKind(SyntaxKind.MemberBindingExpression))
+				{
+					node = (node as MemberBindingExpressionSyntax).Name;
+				}
+				else if (node.Parent.IsKind(SyntaxKind.CollectionInitializerExpression))
+				{
+					return true;
+				}
+
+				break;
+			case CS0122:
+				break;
+
+			case CS1503:
+				//// look up its corresponding method name
+				var parent = node.GetAncestor<InvocationExpressionSyntax>();
+				if (parent == null)
+				{
+					return false;
+				}
+
+				var method = parent.Expression as MemberAccessExpressionSyntax;
+				if (method != null)
+				{
+					node = method.Name;
+				}
+
+				break;
+
+			default:
+				return false;
+			}
+
+			var simpleName = node as SimpleNameSyntax;
+			if (!simpleName.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) &&
+				!simpleName.IsParentKind(SyntaxKind.MemberBindingExpression))
+			{
+				return false;
+			}
+
+			var memberAccess = simpleName.Parent as MemberAccessExpressionSyntax;
+			var memberBinding = simpleName.Parent as MemberBindingExpressionSyntax;
+			if (memberAccess.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) ||
+				memberAccess.IsParentKind(SyntaxKind.ElementAccessExpression) ||
+				memberBinding.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) ||
+				memberBinding.IsParentKind(SyntaxKind.ElementAccessExpression))
+			{
+				return false;
+			}
+
+			if (!node.IsMemberAccessExpressionName())
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		protected override bool CanAddImportForNamespace(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			return false;
+		}
+
+		protected override bool CanAddImportForQuery(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			if (diagnostic.Id != CS1935)
+			{
+				return false;
+			}
+
+			return node.AncestorsAndSelf().Any(n => n is QueryExpressionSyntax && !(n.Parent is QueryContinuationSyntax));
+		}
+
+		protected override bool CanAddImportForType(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			switch (diagnostic.Id)
+			{
+			case CS0103:
+			case CS0246:
+			case CS0305:
+			case CS0308:
+			case CS0122:
+			case CS0307:
+			case CS0616:
+			case CS1003:
+			case CS1580:
+			case CS1581:
+				break;
+
+			case CS1002:
+				//// only lookup errors inside ParenthesizedLambdaExpression e.g., () => { ... }
+				if (node.Ancestors().OfType<ParenthesizedLambdaExpressionSyntax>().Any())
+				{
+					if (node is SimpleNameSyntax)
+					{
+						break;
+					}
+					else if (node is BlockSyntax || node is MemberAccessExpressionSyntax || node is BinaryExpressionSyntax)
+					{
+						var last = node.DescendantNodes().OfType<SimpleNameSyntax>().LastOrDefault();
+						if (!TryFindStandaloneType(ref node))
+						{
+							node = node.DescendantNodes().OfType<SimpleNameSyntax>().FirstOrDefault();
+						}
+						else
+						{
+							node = last;
+						}
+					}
+				}
+				else
+				{
+					return false;
+				}
+
+				break;
+
+			case CS1574:
+			case CS1584:
+				var cref = node as QualifiedCrefSyntax;
+				if (cref != null)
+				{
+					node = cref.Container;
+				}
+
+				break;
+
+			default:
+				return false;
+			}
+
+			return TryFindStandaloneType(ref node);
+		}
+
+		private static bool TryFindStandaloneType(ref SyntaxNode node)
+		{
+			var qn = node as QualifiedNameSyntax;
+			if (qn != null)
+			{
+				node = GetLeftMostSimpleName(qn);
+			}
+
+			var simpleName = node as SimpleNameSyntax;
+			return simpleName.LooksLikeStandaloneTypeName();
+		}
+
+		private static SimpleNameSyntax GetLeftMostSimpleName(QualifiedNameSyntax qn)
+		{
+			while (qn != null)
+			{
+				var left = qn.Left;
+				var simpleName = left as SimpleNameSyntax;
+				if (simpleName != null)
+				{
+					return simpleName;
+				}
+
+				qn = left as QualifiedNameSyntax;
+			}
+
+			return null;
+		}
+
+		protected override ISet<INamespaceSymbol> GetNamespacesInScope(
+			SemanticModel semanticModel,
+			SyntaxNode node,
+			CancellationToken cancellationToken)
+		{
+			return semanticModel.GetUsingNamespacesInScope(node);
+		}
+
+		protected override ITypeSymbol GetQueryClauseInfo(
+			SemanticModel semanticModel,
+			SyntaxNode node,
+			CancellationToken cancellationToken)
+		{
+			var query = node.AncestorsAndSelf().OfType<QueryExpressionSyntax>().First();
+
+			if (InfoBoundSuccessfully(semanticModel.GetQueryClauseInfo(query.FromClause, cancellationToken)))
+			{
+				return null;
+			}
+
+			foreach (var clause in query.Body.Clauses)
+			{
+				if (InfoBoundSuccessfully(semanticModel.GetQueryClauseInfo(clause, cancellationToken)))
+				{
+					return null;
+				}
+			}
+
+			if (InfoBoundSuccessfully(semanticModel.GetSymbolInfo(query.Body.SelectOrGroup, cancellationToken)))
+			{
+				return null;
+			}
+
+			var fromClause = query.FromClause;
+			return semanticModel.GetTypeInfo(fromClause.Expression, cancellationToken).Type;
+		}
+
+		private bool InfoBoundSuccessfully(SymbolInfo symbolInfo)
+		{
+			return InfoBoundSuccessfully(symbolInfo.Symbol);
+		}
+
+		private bool InfoBoundSuccessfully(QueryClauseInfo semanticInfo)
+		{
+			return InfoBoundSuccessfully(semanticInfo.OperationInfo);
+		}
+
+		private static bool InfoBoundSuccessfully(ISymbol operation)
+		{
+			operation = operation.GetOriginalUnreducedDefinition();
+			return operation != null;
+		}
+
+		protected override string GetDescription(INamespaceOrTypeSymbol namespaceSymbol, SemanticModel semanticModel, SyntaxNode contextNode)
+		{
+			var root = GetCompilationUnitSyntaxNode(contextNode);
+
+			// No localization necessary
+			string externAliasString;
+			if (TryGetExternAliasString(namespaceSymbol, semanticModel, root, out externAliasString))
+			{
+				return string.Format ("extern alias {0};", externAliasString);
+			}
+
+			string namespaceString;
+			if (TryGetNamespaceString(namespaceSymbol, root, false, null, out namespaceString))
+			{
+				return string.Format ("using {0};", namespaceString);
+			}
+
+			// If we get here then neither a namespace or a an extern alias can be added.
+			// There is no valid string to show to the user and there is 
+			// likely a bug in that we should know about.
+			throw new InvalidOperationException ();
+		}
+
+		protected override async Task<Document> AddImportAsync(
+			SyntaxNode contextNode,
+			INamespaceOrTypeSymbol namespaceSymbol,
+			Document document,
+			bool placeSystemNamespaceFirst,
+			CancellationToken cancellationToken)
+		{
+			var root = GetCompilationUnitSyntaxNode(contextNode, cancellationToken);
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var simpleUsingDirective = GetUsingDirective(root, namespaceSymbol, semanticModel, fullyQualify: false);
+			var externAliasUsingDirective = GetExternAliasUsingDirective(root, namespaceSymbol, semanticModel);
+			if (externAliasUsingDirective != null)
+			{
+				root = root.AddExterns(
+					externAliasUsingDirective
+					.WithAdditionalAnnotations(Formatter.Annotation));
+			}
+
+			if (simpleUsingDirective != null)
+			{
+				// Because of the way usings can be nested inside of namespace declarations,
+				// we need to check if the usings must be fully qualified so as not to be
+				// ambiguous with the containing namespace. 
+				if (UsingsAreContainedInNamespace(contextNode))
+				{
+					// When we add usings we try and place them, as best we can, where the user
+					// wants them according to their settings.  This means we can't just add the fully-
+					// qualified usings and expect the simplifier to take care of it, the usings have to be
+					// simplified before we attempt to add them to the document.
+					// You might be tempted to think that we could call 
+					//   AddUsings -> Simplifier -> SortUsings
+					// But this will clobber the users using settings without asking.  Instead we create a new
+					// Document and check if our using can be simplified.  Worst case we need to back out the 
+					// fully qualified change and reapply with the simple name.
+					var fullyQualifiedUsingDirective = GetUsingDirective(root, namespaceSymbol, semanticModel, fullyQualify: true);
+					SyntaxNode newRoot = root.AddUsingDirective(
+						fullyQualifiedUsingDirective, contextNode, placeSystemNamespaceFirst,
+						Formatter.Annotation);
+					var newDocument = document.WithSyntaxRoot(newRoot);
+					var newSemanticModel = await newDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+					newRoot = await newDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+					var newUsing = newRoot
+						.DescendantNodes().OfType<UsingDirectiveSyntax>().Where(uds => uds.IsEquivalentTo(fullyQualifiedUsingDirective, topLevel: true)).Single();
+					var speculationAnalyzer = new SpeculationAnalyzer(newUsing.Name, simpleUsingDirective.Name, newSemanticModel, cancellationToken);
+					if (speculationAnalyzer.ReplacementChangesSemantics())
+					{
+						// Not fully qualifying the using causes to refer to a different namespace so we need to keep it as is.
+						return newDocument;
+					}
+					else
+					{
+						// It does not matter if it is fully qualified or simple so lets return the simple name.
+						return document.WithSyntaxRoot(root.AddUsingDirective(
+							simpleUsingDirective, contextNode, placeSystemNamespaceFirst,
+							Formatter.Annotation));
+					}
+				}
+				else
+				{
+					// simple form
+					return document.WithSyntaxRoot(root.AddUsingDirective(
+						simpleUsingDirective, contextNode, placeSystemNamespaceFirst,
+						Formatter.Annotation));
+				}
+			}
+
+			return document.WithSyntaxRoot(root);
+		}
+
+		private static ExternAliasDirectiveSyntax GetExternAliasUsingDirective(CompilationUnitSyntax root, INamespaceOrTypeSymbol namespaceSymbol, SemanticModel semanticModel)
+		{
+			string externAliasString;
+			if (TryGetExternAliasString(namespaceSymbol, semanticModel, root, out externAliasString))
+			{
+				return SyntaxFactory.ExternAliasDirective(SyntaxFactory.Identifier(externAliasString));
+			}
+
+			return null;
+		}
+
+		private UsingDirectiveSyntax GetUsingDirective(CompilationUnitSyntax root, INamespaceOrTypeSymbol namespaceSymbol, SemanticModel semanticModel, bool fullyQualify)
+		{
+			string namespaceString;
+			string externAliasString;
+			TryGetExternAliasString(namespaceSymbol, semanticModel, root, out externAliasString);
+			if (externAliasString != null)
+			{
+				if (TryGetNamespaceString(namespaceSymbol, root, false, externAliasString, out namespaceString))
+				{
+					return SyntaxFactory.UsingDirective(SyntaxFactory.ParseName(namespaceString));
+				}
+
+				return null;
+			}
+
+			if (TryGetNamespaceString(namespaceSymbol, root, fullyQualify, null, out namespaceString))
+			{
+				return SyntaxFactory.UsingDirective(SyntaxFactory.ParseName(namespaceString));
+			}
+
+			return null;
+		}
+
+		private bool UsingsAreContainedInNamespace(SyntaxNode contextNode)
+		{
+			return contextNode.GetAncestor<NamespaceDeclarationSyntax>()?.DescendantNodes().OfType<UsingDirectiveSyntax>().FirstOrDefault() != null;
+		}
+
+		private static bool TryGetExternAliasString(INamespaceOrTypeSymbol namespaceSymbol, SemanticModel semanticModel, CompilationUnitSyntax root, out string externAliasString)
+		{
+			externAliasString = null;
+			var metadataReference = semanticModel.Compilation.GetMetadataReference(namespaceSymbol.ContainingAssembly);
+			if (metadataReference == null)
+			{
+				return false;
+			}
+
+			var properties = metadataReference.Properties;
+			var aliases = properties.Aliases;
+			if (aliases.IsDefaultOrEmpty)
+			{
+				return false;
+			}
+
+			aliases = properties.Aliases.Where(a => a != MetadataReferenceProperties.GlobalAlias).ToImmutableArray();
+			if (!aliases.Any())
+			{
+				return false;
+			}
+
+			externAliasString = aliases.First();
+			return ShouldAddExternAlias(aliases, root);
+		}
+
+		private static bool TryGetNamespaceString(INamespaceOrTypeSymbol namespaceSymbol, CompilationUnitSyntax root, bool fullyQualify, string alias, out string namespaceString)
+		{
+			namespaceString = fullyQualify
+				? namespaceSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)
+				: namespaceSymbol.ToDisplayString();
+
+			if (alias != null)
+			{
+				namespaceString = alias + "::" + namespaceString;
+			}
+
+			return ShouldAddUsing(namespaceString, root);
+		}
+
+		private static bool ShouldAddExternAlias(ImmutableArray<string> aliases, CompilationUnitSyntax root)
+		{
+			var identifiers = root.DescendantNodes().OfType<ExternAliasDirectiveSyntax>().Select(e => e.Identifier.ToString());
+			var externAliases = aliases.Where(a => identifiers.Contains(a));
+			return !externAliases.Any();
+		}
+
+		private static bool ShouldAddUsing(string usingDirective, CompilationUnitSyntax root)
+		{
+			return !root.Usings.Select(u => u.Name.ToString()).Contains(usingDirective);
+		}
+
+		private static CompilationUnitSyntax GetCompilationUnitSyntaxNode(SyntaxNode contextNode, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return (CompilationUnitSyntax)contextNode.SyntaxTree.GetRoot(cancellationToken);
+		}
+
+		protected override bool IsViableExtensionMethod(IMethodSymbol method, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			var leftExpression = expression.GetExpressionOfMemberAccessExpression() ?? expression.GetExpressionOfConditionalMemberAccessExpression();
+			if (leftExpression == null)
+			{
+				if (expression.IsKind(SyntaxKind.CollectionInitializerExpression))
+				{
+					leftExpression = expression.GetAncestor<ObjectCreationExpressionSyntax>();
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			var semanticInfo = semanticModel.GetTypeInfo(leftExpression, cancellationToken);
+			var leftExpressionType = semanticInfo.Type;
+
+			return leftExpressionType != null && method.ReduceExtensionMethod(leftExpressionType) != null;
+		}
+
+		protected override IEnumerable<ITypeSymbol> GetProposedTypes(string name, List<ITypeSymbol> accessibleTypeSymbols, SemanticModel semanticModel, ISet<INamespaceSymbol> namespacesInScope)
+		{
+			if (accessibleTypeSymbols == null)
+			{
+				yield break;
+			}
+
+			foreach (var typeSymbol in accessibleTypeSymbols)
+			{
+				if ((typeSymbol != null) && (typeSymbol.ContainingType != null) && typeSymbol.ContainingType.IsStatic)
+				{
+					yield return typeSymbol.ContainingType;
+				}
+			}
+		}
+
+		internal override bool IsViableField(IFieldSymbol field, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			return IsViablePropertyOrField(field, expression, semanticModel, cancellationToken);
+		}
+
+		internal override bool IsViableProperty(IPropertySymbol property, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			return IsViablePropertyOrField(property, expression, semanticModel, cancellationToken);
+		}
+
+		private bool IsViablePropertyOrField(ISymbol propertyOrField, SyntaxNode expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			if (!propertyOrField.IsStatic)
+			{
+				return false;
+			}
+
+			var leftName = (expression as MemberAccessExpressionSyntax)?.Expression as SimpleNameSyntax;
+			if (leftName == null)
+			{
+				return false;
+			}
+
+			return string.Compare(propertyOrField.ContainingType.Name, leftName.Identifier.Text, this.IgnoreCase) == 0;
+		}
+
+		internal override bool IsAddMethodContext(SyntaxNode node, SemanticModel semanticModel)
+		{
+			if (node.Parent.IsKind(SyntaxKind.CollectionInitializerExpression))
+			{
+				var objectCreationExpressionSyntax = node.GetAncestor<ObjectCreationExpressionSyntax>();
+				if (objectCreationExpressionSyntax == null)
+				{
+					return false;
+				}
+
+				return true;
+			}
+
+			return false;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/AbstractAsyncCodeFix.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/AbstractAsyncCodeFix.cs
new file mode 100644
index 0000000000..263d637f26
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/AbstractAsyncCodeFix.cs
@@ -0,0 +1,88 @@
+//
+// AbstractAsyncCodeFix.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Immutable;
+using System.Linq;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.CodeActions;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.CodeFixes;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+
+	internal abstract partial class AbstractAsyncCodeFix : CodeFixProvider
+	{
+		protected abstract Task<CodeAction> GetCodeFix(SyntaxNode root, SyntaxNode node, Document document, Diagnostic diagnostic, CancellationToken cancellationToken);
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+
+			SyntaxNode node;
+			if (!TryGetNode(root, context.Span, out node))
+			{
+				return;
+			}
+
+			var diagnostic = context.Diagnostics.FirstOrDefault();
+
+			var codeAction = await GetCodeFix(root, node, context.Document, diagnostic, context.CancellationToken).ConfigureAwait(false);
+
+			if (codeAction != null)
+			{
+				context.RegisterCodeFix(codeAction, diagnostic);
+			}
+		}
+
+		private bool TryGetNode(SyntaxNode root, Microsoft.CodeAnalysis.Text.TextSpan span, out SyntaxNode node)
+		{
+			node = null;
+			var ancestors = root.FindToken(span.Start).GetAncestors<SyntaxNode>();
+			if (!ancestors.Any())
+			{
+				return false;
+			}
+
+			node = ancestors.FirstOrDefault(n => n.Span.Contains(span) && n != root);
+			return node != null;
+		}
+	}
+	
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAsyncCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAsyncCodeFixProvider.cs
new file mode 100644
index 0000000000..a5fcc5b4b2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAsyncCodeFixProvider.cs
@@ -0,0 +1,229 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.CodeActions;
+using RefactoringEssentials;
+using MonoDevelop.CSharp.CodeFixes;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	internal abstract partial class AbstractAddAsyncAwaitCodeFixProvider : AbstractAsyncCodeFix
+	{
+		protected abstract string GetDescription(Diagnostic diagnostic, SyntaxNode node, SemanticModel semanticModel, CancellationToken cancellationToken);
+		protected abstract Task<SyntaxNode> GetNewRoot(SyntaxNode root, SyntaxNode oldNode, SemanticModel semanticModel, Diagnostic diagnostic, Document document, CancellationToken cancellationToken);
+
+		protected override async Task<CodeAction> GetCodeFix(SyntaxNode root, SyntaxNode node, Document document, Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+			var newRoot = await this.GetNewRoot(root, node, semanticModel, diagnostic, document, cancellationToken).ConfigureAwait(false);
+			if (newRoot != null)
+			{
+				return new DocumentChangeAction(node.Span, DiagnosticSeverity.Error,
+					this.GetDescription(diagnostic, node, semanticModel, cancellationToken),
+					token => Task.FromResult(document.WithSyntaxRoot(newRoot)));
+			}
+
+			return null;
+		}
+
+		protected bool TryGetTypes(
+			SyntaxNode expression,
+			SemanticModel semanticModel,
+			out INamedTypeSymbol source,
+			out INamedTypeSymbol destination)
+		{
+			source = null;
+			destination = null;
+
+			var info = semanticModel.GetSymbolInfo(expression);
+			var methodSymbol = info.Symbol as IMethodSymbol;
+			if (methodSymbol == null)
+			{
+				return false;
+			}
+
+			var compilation = semanticModel.Compilation;
+			var taskType = compilation.GetTypeByMetadataName("System.Threading.Tasks.Task");
+			if (taskType == null)
+			{
+				return false;
+			}
+
+			var returnType = methodSymbol.ReturnType as INamedTypeSymbol;
+			if (returnType == null)
+			{
+				return false;
+			}
+
+			source = taskType;
+			destination = returnType;
+			return true;
+		}
+
+	}
+
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.AddAsync), Shared]
+	internal class CSharpAddAsyncCodeFixProvider : AbstractAddAsyncCodeFixProvider
+	{
+		/// <summary>
+		/// The 'await' operator can only be used within an async method. Consider marking this method with the 'async' modifier and changing its return type to 'Task'.
+		/// </summary>
+		private const string CS4032 = "CS4032";
+
+		/// <summary>
+		/// The 'await' operator can only be used within an async method. Consider marking this method with the 'async' modifier and changing its return type to 'Task'.
+		/// </summary>
+		private const string CS4033 = "CS4033";
+
+		/// <summary>
+		/// The 'await' operator can only be used within an async lambda expression. Consider marking this method with the 'async' modifier.
+		/// </summary>
+		private const string CS4034 = "CS4034";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS4032, CS4033, CS4034); }
+		}
+
+		protected override string GetDescription(Diagnostic diagnostic, SyntaxNode node, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			return GettextCatalog.GetString ("Make async");
+		}
+
+		protected override async Task<SyntaxNode> GetNewRoot(SyntaxNode root, SyntaxNode oldNode, SemanticModel semanticModel, Diagnostic diagnostic, Document document, CancellationToken cancellationToken)
+		{
+			var methodNode = GetContainingMember(oldNode);
+			if (methodNode == null)
+			{
+				return null;
+			}
+
+			var newMethodNode = await ConvertToAsync(methodNode, semanticModel, document, cancellationToken).ConfigureAwait(false);
+			if (newMethodNode != null)
+			{
+				return root.ReplaceNode(methodNode, newMethodNode);
+			}
+
+			return null;
+		}
+
+		private static SyntaxNode GetContainingMember(SyntaxNode oldNode)
+		{
+			var parenthesizedLambda = oldNode
+				.Ancestors()
+				.FirstOrDefault(n =>
+				                n.IsKind(SyntaxKind.ParenthesizedLambdaExpression));
+
+			if (parenthesizedLambda != null)
+			{
+				return parenthesizedLambda;
+			}
+
+			var simpleLambda = oldNode
+				.Ancestors()
+				.FirstOrDefault(n =>
+				                n.IsKind(SyntaxKind.SimpleLambdaExpression));
+
+			if (simpleLambda != null)
+			{
+				return simpleLambda;
+			}
+
+			return oldNode
+				.Ancestors()
+				.FirstOrDefault(n =>
+				                n.IsKind(SyntaxKind.MethodDeclaration));
+		}
+
+		private async Task<SyntaxNode> ConvertToAsync(SyntaxNode node, SemanticModel semanticModel, Document document, CancellationToken cancellationToken)
+		{
+			var methodNode = node as MethodDeclarationSyntax;
+			if (methodNode != null)
+			{
+				return await ConvertMethodToAsync(document, semanticModel, methodNode, cancellationToken).ConfigureAwait(false);
+			}
+
+			var parenthesizedLambda = node as ParenthesizedLambdaExpressionSyntax;
+			if (parenthesizedLambda != null)
+			{
+				return ConvertParenthesizedLambdaToAsync(parenthesizedLambda);
+			}
+
+			var simpleLambda = node as SimpleLambdaExpressionSyntax;
+			if (simpleLambda != null)
+			{
+				return ConvertSimpleLambdaToAsync(simpleLambda);
+			}
+
+			return null;
+		}
+
+		private static SyntaxNode ConvertParenthesizedLambdaToAsync(ParenthesizedLambdaExpressionSyntax parenthesizedLambda)
+		{
+			return SyntaxFactory.ParenthesizedLambdaExpression(
+				SyntaxFactory.Token(SyntaxKind.AsyncKeyword),
+				parenthesizedLambda.ParameterList,
+				parenthesizedLambda.ArrowToken,
+				parenthesizedLambda.Body)
+				                .WithAdditionalAnnotations(Formatter.Annotation);
+		}
+
+		private static SyntaxNode ConvertSimpleLambdaToAsync(SimpleLambdaExpressionSyntax simpleLambda)
+		{
+			return SyntaxFactory.SimpleLambdaExpression(
+				SyntaxFactory.Token(SyntaxKind.AsyncKeyword),
+				simpleLambda.Parameter,
+				simpleLambda.ArrowToken,
+				simpleLambda.Body)
+				                .WithAdditionalAnnotations(Formatter.Annotation);
+		}
+
+		protected override SyntaxNode AddAsyncKeyword(SyntaxNode node)
+		{
+			var methodNode = node as MethodDeclarationSyntax;
+			if (methodNode == null)
+			{
+				return null;
+			}
+
+			return methodNode
+				.AddModifiers(SyntaxFactory.Token(SyntaxKind.AsyncKeyword))
+				.WithAdditionalAnnotations(Formatter.Annotation);
+		}
+
+		protected override SyntaxNode AddAsyncKeywordAndTaskReturnType(SyntaxNode node, ITypeSymbol existingReturnType, INamedTypeSymbol taskTypeSymbol)
+		{
+			var methodNode = node as MethodDeclarationSyntax;
+			if (methodNode == null)
+			{
+				return null;
+			}
+
+			if (taskTypeSymbol == null)
+			{
+				return null;
+			}
+
+			var returnType = taskTypeSymbol.Construct(existingReturnType).GenerateTypeSyntax();
+			return AddAsyncKeyword(methodNode.WithReturnType(returnType));
+		}
+
+		protected override bool DoesConversionExist(Compilation compilation, ITypeSymbol source, ITypeSymbol destination)
+		{
+			return compilation.ClassifyConversion(source, destination).Exists;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAwaitCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAwaitCodeFixProvider.cs
new file mode 100644
index 0000000000..9bcb3033d1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpAddAwaitCodeFixProvider.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+using System.Linq;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.CodeActions;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.CodeFixes;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	internal abstract partial class AbstractAddAsyncCodeFixProvider : AbstractAddAsyncAwaitCodeFixProvider
+	{
+		protected const string SystemThreadingTasksTask = "System.Threading.Tasks.Task";
+		protected const string SystemThreadingTasksTaskT = "System.Threading.Tasks.Task`1";
+		protected abstract SyntaxNode AddAsyncKeyword(SyntaxNode methodNode);
+		protected abstract SyntaxNode AddAsyncKeywordAndTaskReturnType(SyntaxNode methodNode, ITypeSymbol existingReturnType, INamedTypeSymbol taskTypeSymbol);
+		protected abstract bool DoesConversionExist(Compilation compilation, ITypeSymbol source, ITypeSymbol destination);
+
+		protected async Task<SyntaxNode> ConvertMethodToAsync(Document document, SemanticModel semanticModel, SyntaxNode methodNode, CancellationToken cancellationToken)
+		{
+			var methodSymbol = semanticModel.GetDeclaredSymbol(methodNode, cancellationToken) as IMethodSymbol;
+
+			if (methodSymbol.ReturnsVoid)
+			{
+				return AddAsyncKeyword(methodNode);
+			}
+
+			var returnType = methodSymbol.ReturnType;
+			var compilation = semanticModel.Compilation;
+
+			var taskSymbol = compilation.GetTypeByMetadataName(SystemThreadingTasksTask);
+			var genericTaskSymbol = compilation.GetTypeByMetadataName(SystemThreadingTasksTaskT);
+			if (taskSymbol == null)
+			{
+				return null;
+			}
+
+			if (returnType is IErrorTypeSymbol)
+			{
+				// The return type of the method will not bind.  This could happen for a lot of reasons.
+				// The type may not actually exist or the user could just be missing a using/import statement.
+				// We're going to try and see if there are any known types that have the same name as 
+				// our return type, and then check if those are convertible to Task.  If they are then
+				// we assume the user just has a missing using.  If they are not, we wrap the return
+				// type in a generic Task.
+				var typeName = returnType.Name;
+
+				var results = await SymbolFinder.FindDeclarationsAsync(
+					document.Project, typeName, ignoreCase: false, filter: SymbolFilter.Type, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+				if (results.OfType<ITypeSymbol>().Any(s => DoesConversionExist(compilation, s, taskSymbol)))
+				{
+					return AddAsyncKeyword(methodNode);
+				}
+
+				return AddAsyncKeywordAndTaskReturnType(methodNode, returnType, genericTaskSymbol);
+			}
+
+			if (DoesConversionExist(compilation, returnType, taskSymbol))
+			{
+				return AddAsyncKeyword(methodNode);
+			}
+
+			return AddAsyncKeywordAndTaskReturnType(methodNode, returnType, genericTaskSymbol);
+		}
+	}
+
+
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.AddAwait), Shared]
+	internal class CSharpAddAwaitCodeFixProvider : AbstractAddAsyncAwaitCodeFixProvider
+	{
+		/// <summary>
+		/// Since this is an async method, the return expression must be of type 'blah' rather than 'baz'
+		/// </summary>
+		private const string CS4014 = "CS4014";
+
+		/// <summary>
+		/// Because this call is not awaited, execution of the current method continues before the call is completed.
+		/// </summary>
+		private const string CS4016 = "CS4016";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS4014, CS4016); }
+		}
+
+		protected override string GetDescription(Diagnostic diagnostic, SyntaxNode node, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			return GettextCatalog.GetString ("Insert 'await'");
+		}
+
+		protected override Task<SyntaxNode> GetNewRoot(SyntaxNode root, SyntaxNode oldNode, SemanticModel semanticModel, Diagnostic diagnostic, Document document, CancellationToken cancellationToken)
+		{
+			var expression = oldNode as ExpressionSyntax;
+
+			switch (diagnostic.Id)
+			{
+				case CS4014:
+					if (expression == null)
+					{
+						return Task.FromResult<SyntaxNode>(null);
+					}
+
+				return Task.FromResult(root.ReplaceNode(oldNode, ConvertToAwaitExpression(expression)));
+				case CS4016:
+					if (expression == null)
+					{
+					return Task.FromResult (default (SyntaxNode));
+					}
+
+					if (!IsCorrectReturnType(expression, semanticModel))
+					{
+					return Task.FromResult (default (SyntaxNode));
+					}
+
+				return Task.FromResult(root.ReplaceNode(oldNode, ConvertToAwaitExpression(expression)));
+				default:
+				return Task.FromResult (default (SyntaxNode));
+			}
+		}
+
+		private bool IsCorrectReturnType(ExpressionSyntax expression, SemanticModel semanticModel)
+		{
+			INamedTypeSymbol taskType = null;
+			INamedTypeSymbol returnType = null;
+			return TryGetTypes(expression, semanticModel, out taskType, out returnType) &&
+				semanticModel.Compilation.ClassifyConversion(taskType, returnType).Exists;
+		}
+
+		private static ExpressionSyntax ConvertToAwaitExpression(ExpressionSyntax expression)
+		{
+			return SyntaxFactory.AwaitExpression(expression)
+				                .WithAdditionalAnnotations(Formatter.Annotation);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpConvertToAsyncMethodCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpConvertToAsyncMethodCodeFixProvider.cs
new file mode 100644
index 0000000000..b1bd4224f6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/Async/CSharpConvertToAsyncMethodCodeFixProvider.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CodeActions;
+using RefactoringEssentials;
+using MonoDevelop.CSharp.CodeFixes;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	internal abstract partial class AbstractChangeToAsyncCodeFixProvider : AbstractAsyncCodeFix
+	{
+		protected abstract Task<string> GetDescription(Diagnostic diagnostic, SyntaxNode node, SemanticModel semanticModel, CancellationToken cancellationToken);
+		protected abstract Task<Tuple<SyntaxTree, SyntaxNode>> GetRootInOtherSyntaxTree(SyntaxNode node, SemanticModel semanticModel, Diagnostic diagnostic, CancellationToken cancellationToken);
+
+		protected override async Task<CodeAction> GetCodeFix(SyntaxNode root, SyntaxNode node, Document document, Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+			var result = await GetRootInOtherSyntaxTree(node, semanticModel, diagnostic, cancellationToken).ConfigureAwait(false);
+			if (result != null)
+			{
+				var syntaxTree = result.Item1;
+				var newRoot = result.Item2;
+				var otherDocument = document.Project.Solution.GetDocument(syntaxTree);
+				return new DocumentChangeAction(node.Span, DiagnosticSeverity.Error,
+					await this.GetDescription(diagnostic, node, semanticModel, cancellationToken).ConfigureAwait(false),
+					token => Task.FromResult(otherDocument.WithSyntaxRoot(newRoot)));
+			}
+
+			return null;
+		}
+	}
+
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.ConvertToAsync), Shared]
+	internal class CSharpConvertToAsyncMethodCodeFixProvider : AbstractChangeToAsyncCodeFixProvider
+	{
+		/// <summary>
+		/// Cannot await void.
+		/// </summary>
+		private const string CS4008 = "CS4008";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS4008); }
+		}
+
+		protected override async Task<string> GetDescription(
+			Diagnostic diagnostic,
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			var methodNode = await GetMethodDeclaration(node, semanticModel, cancellationToken).ConfigureAwait(false);
+			return string.Format(GettextCatalog.GetString ("Make {0} return Task instead of void"), methodNode.WithBody(null));
+		}
+
+		protected override async Task<Tuple<SyntaxTree, SyntaxNode>> GetRootInOtherSyntaxTree(
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			Diagnostic diagnostic,
+			CancellationToken cancellationToken)
+		{
+			var methodDeclaration = await GetMethodDeclaration(node, semanticModel, cancellationToken).ConfigureAwait(false);
+			if (methodDeclaration == null)
+			{
+				return null;
+			}
+
+			var oldRoot = await methodDeclaration.SyntaxTree.GetRootAsync(cancellationToken).ConfigureAwait(false);
+			var newRoot = oldRoot.ReplaceNode(methodDeclaration, ConvertToAsyncFunction(methodDeclaration));
+			return Tuple.Create(oldRoot.SyntaxTree, newRoot);
+		}
+
+		private async Task<MethodDeclarationSyntax> GetMethodDeclaration(
+			SyntaxNode node,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			var invocationExpression = node.ChildNodes().FirstOrDefault(n => n.IsKind(SyntaxKind.InvocationExpression));
+			var methodSymbol = semanticModel.GetSymbolInfo(invocationExpression, cancellationToken).Symbol as IMethodSymbol;
+			if (methodSymbol == null)
+			{
+				return null;
+			}
+
+			var methodReference = methodSymbol.DeclaringSyntaxReferences.FirstOrDefault();
+			if (methodReference == null)
+			{
+				return null;
+			}
+
+			var methodDeclaration = (await methodReference.GetSyntaxAsync(cancellationToken).ConfigureAwait(false)) as MethodDeclarationSyntax;
+			if (methodDeclaration == null)
+			{
+				return null;
+			}
+
+			if (!methodDeclaration.Modifiers.Any(m => m.IsKind(SyntaxKind.AsyncKeyword)))
+			{
+				return null;
+			}
+
+			return methodDeclaration;
+		}
+
+		private MethodDeclarationSyntax ConvertToAsyncFunction(MethodDeclarationSyntax methodDeclaration)
+		{
+			return methodDeclaration.WithReturnType(
+				SyntaxFactory.ParseTypeName("Task")
+				.WithLeadingTrivia(methodDeclaration.ReturnType.GetLeadingTrivia())
+				.WithTrailingTrivia(methodDeclaration.ReturnType.GetTrailingTrivia()));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/EncapsulateField/AbstractEncapsulateFieldRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/EncapsulateField/AbstractEncapsulateFieldRefactoringProvider.cs
new file mode 100644
index 0000000000..dcda5767d2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/EncapsulateField/AbstractEncapsulateFieldRefactoringProvider.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading.Tasks;
+using ICSharpCode.NRefactory6.CSharp.CodeRefactorings.EncapsulateField;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace Microsoft.CodeAnalysis.CodeRefactorings.EncapsulateField
+{
+	internal abstract class AbstractEncapsulateFieldRefactoringProvider : CodeRefactoringProvider
+	{
+		CSharpEncapsulateFieldService service = new CSharpEncapsulateFieldService ();
+
+		public sealed override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			var actions = await service.GetEncapsulateFieldCodeActionsAsync(context.Document, context.Span, context.CancellationToken).ConfigureAwait(false);
+			foreach (var action in actions)
+				context.RegisterRefactoring(action);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/EncapsulateField/EncapsulateFieldCodeRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/EncapsulateField/EncapsulateFieldCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..b65d232c50
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/EncapsulateField/EncapsulateFieldCodeRefactoringProvider.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeRefactorings.EncapsulateField
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = "Encapsulate Field"), Shared]
+	internal class EncapsulateFieldRefactoringProvider : AbstractEncapsulateFieldRefactoringProvider
+	{
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/FullyQualify/CSharpFullyQualifyCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/FullyQualify/CSharpFullyQualifyCodeFixProvider.cs
new file mode 100644
index 0000000000..83d779f9b3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/FullyQualify/CSharpFullyQualifyCodeFixProvider.cs
@@ -0,0 +1,331 @@
+//
+// CSharpFullyQualifyCodeFixProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeFixes;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using System.Threading.Tasks;
+using System.Linq;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.FindSymbols;
+using System.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis.CodeActions;
+using System;
+using RefactoringEssentials;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.CSharp.Completion;
+
+namespace MonoDevelop.CSharp.CodeFixes.FullyQualify
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = "Fully Qualify")]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.AddUsingOrImport)]
+	class CSharpFullyQualifyCodeFixProvider : CodeFixProvider
+	{
+		/// <summary>
+		/// name does not exist in context
+		/// </summary>
+		private const string CS0103 = "CS0103";
+
+		/// <summary>
+		/// 'reference' is an ambiguous reference between 'identifier' and 'identifier'
+		/// </summary>
+		private const string CS0104 = "CS0104";
+
+		/// <summary>
+		/// type or namespace could not be found
+		/// </summary>
+		private const string CS0246 = "CS0246";
+
+		/// <summary>
+		/// wrong number of type args
+		/// </summary>
+		private const string CS0305 = "CS0305";
+
+		/// <summary>
+		/// The non-generic type 'A' cannot be used with type arguments
+		/// </summary>
+		private const string CS0308 = "CS0308";
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0103, CS0104, CS0246, CS0305, CS0308); }
+		}
+
+		protected bool IgnoreCase
+		{
+			get { return false; }
+		}
+
+		protected bool CanFullyQualify(Diagnostic diagnostic, ref SyntaxNode node)
+		{
+			var simpleName = node as SimpleNameSyntax;
+			if (simpleName == null)
+			{
+				return false;
+			}
+
+			if (!simpleName.LooksLikeStandaloneTypeName())
+			{
+				return false;
+			}
+
+			if (!simpleName.CanBeReplacedWithAnyName())
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		protected SyntaxNode ReplaceNode(SyntaxNode node, string containerName, CancellationToken cancellationToken)
+		{
+			var simpleName = (SimpleNameSyntax)node;
+
+			var leadingTrivia = simpleName.GetLeadingTrivia();
+			var newName = simpleName.WithLeadingTrivia(SyntaxTriviaList.Empty);
+
+			var qualifiedName = SyntaxFactory.QualifiedName(
+				SyntaxFactory.ParseName(containerName), newName);
+
+			qualifiedName = qualifiedName.WithLeadingTrivia(leadingTrivia);
+			qualifiedName = qualifiedName.WithAdditionalAnnotations(Formatter.Annotation);
+
+			var syntaxTree = simpleName.SyntaxTree;
+			return syntaxTree.GetRoot(cancellationToken).ReplaceNode((NameSyntax)simpleName, qualifiedName);
+		}
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var diagnostics = context.Diagnostics;
+			var cancellationToken = context.CancellationToken;
+
+			var project = document.Project;
+			var diagnostic = diagnostics.First();
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var node = root.FindToken(span.Start).GetAncestors<SyntaxNode>().First(n => n.Span.Contains(span));
+
+			// Has to be a simple identifier or generic name.
+			if (node != null && CanFullyQualify(diagnostic, ref node))
+			{
+				var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+				var matchingTypes = await this.GetMatchingTypesAsync(project, semanticModel, node, cancellationToken).ConfigureAwait(false);
+				var matchingNamespaces = await this.GetMatchingNamespacesAsync(project, semanticModel, node, cancellationToken).ConfigureAwait(false);
+
+				if (matchingTypes != null || matchingNamespaces != null)
+				{
+					matchingTypes = matchingTypes ?? SpecializedCollections.EmptyEnumerable<ISymbol>();
+					matchingNamespaces = matchingNamespaces ?? SpecializedCollections.EmptyEnumerable<ISymbol>();
+
+					var matchingTypeContainers = FilterAndSort(GetContainers(matchingTypes, semanticModel.Compilation));
+					var matchingNamespaceContainers = FilterAndSort(GetContainers(matchingNamespaces, semanticModel.Compilation));
+
+					var proposedContainers =
+						matchingTypeContainers.Concat(matchingNamespaceContainers)
+							.Distinct()
+							.Take(8);
+
+					foreach (var container in proposedContainers)
+					{
+						var containerName = RoslynCompletionData.SafeMinimalDisplayString (container, semanticModel, node.SpanStart);
+
+						string name;
+						int arity;
+						node.GetNameAndArityOfSimpleName(out name, out arity);
+
+						// Actual member name might differ by case.
+						string memberName;
+						if (this.IgnoreCase)
+						{
+							var member = container.GetMembers(name).FirstOrDefault();
+							memberName = member != null ? member.Name : name;
+						}
+						else
+						{
+							memberName = name;
+						}
+
+						var codeAction = new DocumentChangeAction(
+							node.Span,
+							DiagnosticSeverity.Info,
+							string.Format(GettextCatalog.GetString ("Change '{0}' to '{1}.{2}'"), name, containerName, memberName),
+							(c) =>
+							{
+								var newRoot = this.ReplaceNode(node, containerName, c);
+								return Task.FromResult(document.WithSyntaxRoot(newRoot));
+							});
+
+						context.RegisterCodeFix(codeAction, diagnostic);
+					}
+				}
+			}
+		}
+
+		internal async Task<IEnumerable<ISymbol>> GetMatchingTypesAsync(
+			Microsoft.CodeAnalysis.Project project, SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			// Can't be on the right hand side of binary expression (like 'dot').
+			cancellationToken.ThrowIfCancellationRequested();
+			string name;
+			int arity;
+			node.GetNameAndArityOfSimpleName(out name, out arity);
+
+			var symbols = await SymbolFinder.FindDeclarationsAsync(project, name, this.IgnoreCase, SymbolFilter.Type, cancellationToken).ConfigureAwait(false);
+
+			// also lookup type symbols with the "Attribute" suffix.
+			var inAttributeContext = node.IsAttributeName();
+			if (inAttributeContext)
+			{
+				symbols = symbols.Concat(
+					await SymbolFinder.FindDeclarationsAsync(project, name + "Attribute", this.IgnoreCase, SymbolFilter.Type, cancellationToken).ConfigureAwait(false));
+			}
+
+			var accessibleTypeSymbols = symbols
+				.OfType<INamedTypeSymbol>()
+				.Where(s => (arity == 0 || s.GetArity() == arity)
+					&& s.IsAccessibleWithin(semanticModel.Compilation.Assembly)
+					&& (!inAttributeContext || s.IsAttribute())
+					&& HasValidContainer(s))
+				.ToList();
+
+			return accessibleTypeSymbols;
+		}
+
+		private static bool HasValidContainer(ISymbol symbol)
+		{
+			var container = symbol.ContainingSymbol;
+			return container is INamespaceSymbol ||
+				(container is INamedTypeSymbol && !((INamedTypeSymbol)container).IsGenericType);
+		}
+
+		internal async Task<IEnumerable<ISymbol>> GetMatchingNamespacesAsync(
+			Microsoft.CodeAnalysis.Project project,
+			SemanticModel semanticModel,
+			SyntaxNode simpleName,
+			CancellationToken cancellationToken)
+		{
+			if (simpleName.IsAttributeName())
+			{
+				return null;
+			}
+
+			string name;
+			int arity;
+			simpleName.GetNameAndArityOfSimpleName(out name, out arity);
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return null;
+			}
+
+			var symbols = await SymbolFinder.FindDeclarationsAsync(project, name, this.IgnoreCase, SymbolFilter.Namespace, cancellationToken).ConfigureAwait(false);
+
+			var namespaces = symbols
+				.OfType<INamespaceSymbol>()
+				.Where(n => !n.IsGlobalNamespace &&
+					HasAccessibleTypes(n, semanticModel, cancellationToken));
+
+			return namespaces;
+		}
+
+		private bool HasAccessibleTypes(INamespaceSymbol @namespace, SemanticModel model, CancellationToken cancellationToken)
+		{
+			return Enumerable.Any(@namespace.GetAllTypes(cancellationToken), t => t.IsAccessibleWithin(model.Compilation.Assembly));
+		}
+
+		private static IEnumerable<INamespaceOrTypeSymbol> GetContainers(IEnumerable<ISymbol> symbols, Compilation compilation)
+		{
+			foreach (var symbol in symbols)
+			{
+				var containingSymbol = symbol.ContainingSymbol as INamespaceOrTypeSymbol;
+				if (containingSymbol is INamespaceSymbol)
+				{
+					containingSymbol = compilation.GetCompilationNamespace((INamespaceSymbol)containingSymbol);
+				}
+
+				if (containingSymbol != null)
+				{
+					yield return containingSymbol;
+				}
+			}
+		}
+
+		private IEnumerable<INamespaceOrTypeSymbol> FilterAndSort(IEnumerable<INamespaceOrTypeSymbol> symbols)
+		{
+			symbols = symbols ?? SpecializedCollections.EmptyList<INamespaceOrTypeSymbol>();
+			var list = symbols.Distinct ().Where<INamespaceOrTypeSymbol> (n => n is INamedTypeSymbol || !((INamespaceSymbol)n).IsGlobalNamespace).ToList ();
+			list.Sort (this.Compare);
+			return list;
+		}
+
+		private static readonly ConditionalWeakTable<INamespaceOrTypeSymbol, IList<string>> s_symbolToNameMap =
+			new ConditionalWeakTable<INamespaceOrTypeSymbol, IList<string>>();
+
+		private static IList<string> GetNameParts(INamespaceOrTypeSymbol symbol)
+		{
+			return symbol.ToDisplayString(MonoDevelop.Ide.TypeSystem.Ambience.NameFormat).Split('.');
+		}
+
+		private int Compare(INamespaceOrTypeSymbol n1, INamespaceOrTypeSymbol n2)
+		{
+			if (n1 is INamedTypeSymbol && n2 is INamespaceSymbol)
+			{
+				return -1;
+			}
+			else if (n1 is INamespaceSymbol && n2 is INamedTypeSymbol)
+			{
+				return 1;
+			}
+
+			var names1 = s_symbolToNameMap.GetValue(n1, GetNameParts);
+			var names2 = s_symbolToNameMap.GetValue(n2, GetNameParts);
+
+			for (var i = 0; i < Math.Min(names1.Count, names2.Count); i++)
+			{
+				var comp = names1[i].CompareTo(names2[i]);
+				if (comp != 0)
+				{
+					return comp;
+				}
+			}
+
+			return names1.Count - names2.Count;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/AbstractGenerateMemberCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/AbstractGenerateMemberCodeFixProvider.cs
new file mode 100644
index 0000000000..1c735ea833
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/AbstractGenerateMemberCodeFixProvider.cs
@@ -0,0 +1,106 @@
+//
+// AbstractGenerateMemberCodeFixProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using ICSharpCode.NRefactory6.CSharp;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateConstructor
+{
+	internal abstract class AbstractGenerateMemberCodeFixProvider : CodeFixProvider
+	{
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			// NOTE(DustinCa): Not supported in REPL for now.
+			if (context.Document.SourceCodeKind == SourceCodeKind.Script)
+			{
+				return;
+			}
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+
+			var root = await model.SyntaxTree.GetRootAsync (context.CancellationToken).ConfigureAwait (false);
+			var names = GetTargetNodes(root, context.Span);
+			foreach (var name in names)
+			{
+				var codeActions = await GetCodeActionsAsync(context.Document, name, context.CancellationToken).ConfigureAwait(false);
+				if (codeActions == null)
+				{
+					continue;
+				}
+				foreach (var act in codeActions)
+					context.RegisterCodeFix (act, context.Diagnostics);
+				return;
+			}
+		}
+
+		protected abstract Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken);
+
+		protected virtual SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			return node;
+		}
+
+		protected virtual bool IsCandidate(SyntaxNode node)
+		{
+			return false;
+		}
+
+		protected virtual IEnumerable<SyntaxNode> GetTargetNodes(SyntaxNode root, TextSpan span)
+		{
+			var token = root.FindToken(span.Start);
+			if (!token.Span.IntersectsWith(span))
+			{
+				yield break;
+			}
+
+			var nodes = token.GetAncestors<SyntaxNode>().Where(IsCandidate);
+			foreach (var node in nodes)
+			{
+				var name = GetTargetNode(node);
+
+				if (name != null)
+				{
+					yield return name;
+				}
+			}
+		}
+	}
+	
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/GenerateConstructorCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/GenerateConstructorCodeFixProvider.cs
new file mode 100644
index 0000000000..42853f44da
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateConstructor/GenerateConstructorCodeFixProvider.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateConstructor;
+using System;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateConstructor
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateConstructor), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.FullyQualify)]
+	internal class GenerateConstructorCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0122 = "CS0122"; // CS0122: 'C' is inaccessible due to its protection level
+		private const string CS1729 = "CS1729"; // CS1729: 'C' does not contain a constructor that takes n arguments
+		private const string CS1739 = "CS1739"; // CS1739: The best overload for 'Program' does not have a parameter named 'v'
+		private const string CS1503 = "CS1503"; // CS1503: Argument 1: cannot convert from 'T1' to 'T2'
+		private const string CS7036 = "CS7036"; // CS7036: There is no argument given that corresponds to the required formal parameter 'v' of 'C.C(int)'
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0122, CS1729, CS1739, CS1503, CS7036); }
+		}
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return new CSharpGenerateConstructorService ().GenerateConstructorAsync (document, node, cancellationToken);
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node is SimpleNameSyntax || node is ObjectCreationExpressionSyntax || node is ConstructorInitializerSyntax || node is AttributeSyntax;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			var objectCreationNode = node as ObjectCreationExpressionSyntax;
+			if (objectCreationNode != null)
+			{
+				return objectCreationNode.Type.GetRightmostName();
+			}
+
+			var attributeNode = node as AttributeSyntax;
+			if (attributeNode != null)
+			{
+				return attributeNode.Name;
+			}
+
+			return node;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateEnumMember/GenerateEnumMemberCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateEnumMember/GenerateEnumMemberCodeFixProvider.cs
new file mode 100644
index 0000000000..29823cc623
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateEnumMember/GenerateEnumMemberCodeFixProvider.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateEnumMember;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateEnumMember
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateEnumMember), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateConstructor)]
+	internal class GenerateEnumMemberCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0117 = "CS0117"; // error CS0117: 'Color' does not contain a definition for 'Red'
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0117); }
+		}
+		static CSharpGenerateEnumMemberService service = new CSharpGenerateEnumMemberService();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateEnumMemberAsync(document, node, cancellationToken);
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node is IdentifierNameSyntax;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateConversionCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateConversionCodeFixProvider.cs
new file mode 100644
index 0000000000..4db9c211a7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateConversionCodeFixProvider.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateMethod
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateConversion), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateEnumMember)]
+	internal class GenerateConversionCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0029 = "CS0029"; // error CS0029: Cannot implicitly convert type 'type' to 'type'
+		private const string CS0030 = "CS0030"; // error CS0030: Cannot convert type 'type' to 'type'
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0029, CS0030); }
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node.IsKind(SyntaxKind.IdentifierName) ||
+				node.IsKind(SyntaxKind.MethodDeclaration) ||
+				node.IsKind(SyntaxKind.InvocationExpression) ||
+				node.IsKind(SyntaxKind.CastExpression) ||
+				node is LiteralExpressionSyntax ||
+				node is SimpleNameSyntax ||
+				node is ExpressionSyntax;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			var invocation = node as InvocationExpressionSyntax;
+			if (invocation != null)
+			{
+				return invocation.Expression.GetRightmostName();
+			}
+
+			var memberBindingExpression = node as MemberBindingExpressionSyntax;
+			if (memberBindingExpression != null)
+			{
+				return memberBindingExpression.Name;
+			}
+
+			return node;
+		}
+		static CSharpGenerateConversionService service = new CSharpGenerateConversionService ();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateConversionAsync(document, node, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateMethodCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateMethodCodeFixProvider.cs
new file mode 100644
index 0000000000..c1c8396fa3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateMethod/GenerateMethodCodeFixProvider.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateMethod
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateMethod), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateEnumMember)]
+	internal class GenerateMethodCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0103 = "CS0103"; // error CS0103: Error The name 'Foo' does not exist in the current context
+		private const string CS1061 = "CS1061"; // error CS1061: Error 'Class' does not contain a definition for 'Foo' and no extension method 'Foo' 
+		private const string CS0117 = "CS0117"; // error CS0117: 'Class' does not contain a definition for 'Foo'
+		private const string CS0122 = "CS0122"; // error CS0122: 'Class' is inaccessible due to its protection level.
+		private const string CS0539 = "CS0539"; // error CS0539: 'A.Foo<T>()' in explicit interface declaration is not a member of interface
+		private const string CS1501 = "CS1501"; // error CS1501: No overload for method 'M' takes 1 arguments
+		private const string CS1503 = "CS1503"; // error CS1503: Argument 1: cannot convert from 'double' to 'int'
+		private const string CS0305 = "CS0305"; // error CS0305: Using the generic method 'CA.M<V>()' requires 1 type arguments
+		private const string CS0308 = "CS0308"; // error CS0308: The non-generic method 'Program.Foo()' cannot be used with type arguments
+		private const string CS1660 = "CS1660"; // error CS1660: Cannot convert lambda expression to type 'string[]' because it is not a delegate type
+		private const string CS1739 = "CS1739"; // error CS1739: The best overload for 'M' does not have a parameter named 'x'
+		private const string CS7036 = "CS7036"; // error CS7036: There is no argument given that corresponds to the required formal parameter 'x' of 'C.M(int)'
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0103, CS1061, CS0117, CS0122, CS0539, CS1501, CS1503, CS0305, CS0308, CS1660, CS1739, CS7036); }
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node.IsKind(SyntaxKind.IdentifierName) ||
+				node.IsKind(SyntaxKind.MethodDeclaration) ||
+				node.IsKind(SyntaxKind.InvocationExpression) ||
+				node.IsKind(SyntaxKind.CastExpression) ||
+				node is LiteralExpressionSyntax ||
+				node is SimpleNameSyntax ||
+				node is ExpressionSyntax;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			var invocation = node as InvocationExpressionSyntax;
+			if (invocation != null)
+			{
+				return invocation.Expression.GetRightmostName();
+			}
+
+			var memberBindingExpression = node as MemberBindingExpressionSyntax;
+			if (memberBindingExpression != null)
+			{
+				return memberBindingExpression.Name;
+			}
+
+			return node;
+		}
+		static CSharpGenerateMethodService service = new CSharpGenerateMethodService ();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateMethodAsync(document, node, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateType/GenerateTypeCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateType/GenerateTypeCodeFixProvider.cs
new file mode 100644
index 0000000000..6039a17dc7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateType/GenerateTypeCodeFixProvider.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+using ICSharpCode.NRefactory6.CSharp.GenerateType;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateType
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateType), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateVariable)]
+	internal class GenerateTypeCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS0103 = "CS0103"; // error CS0103: The name 'Foo' does not exist in the current context
+		private const string CS0117 = "CS0117"; // error CS0117: 'x' does not contain a definition for 'y'
+		private const string CS0234 = "CS0234"; // error CS0234: The type or namespace name 'C' does not exist in the namespace 'N' (are you missing an assembly reference?)
+		private const string CS0246 = "CS0246"; // error CS0246: The type or namespace name 'T' could not be found (are you missing a using directive or an assembly reference?)
+		private const string CS0305 = "CS0305"; // error CS0305: Using the generic type 'C<T1>' requires 1 type arguments
+		private const string CS0308 = "CS0308"; // error CS0308: The non-generic type 'A' cannot be used with type arguments
+		private const string CS0426 = "CS0426"; // error CS0426: The type name 'S' does not exist in the type 'Program'
+		private const string CS0616 = "CS0616"; // error CS0616: 'x' is not an attribute class
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0103, CS0117, CS0234, CS0246, CS0305, CS0308, CS0426, CS0616); }
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			var qualified = node as QualifiedNameSyntax;
+			if (qualified != null)
+			{
+				return true;
+			}
+
+			var simple = node as SimpleNameSyntax;
+			if (simple != null)
+			{
+				return !simple.IsParentKind(SyntaxKind.QualifiedName);
+			}
+
+			var memberAccess = node as MemberAccessExpressionSyntax;
+			if (memberAccess != null)
+			{
+				return true;
+			}
+			if (node.IsKind (SyntaxKind.ObjectCreationExpression))
+				return true;
+			return false;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			if (node.IsKind (SyntaxKind.ObjectCreationExpression))
+				node = ((ObjectCreationExpressionSyntax)node).Type;
+			return ((ExpressionSyntax)node).GetRightmostName();
+		}
+
+		static readonly CSharpGenerateTypeService service = new CSharpGenerateTypeService ();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateTypeAsync(document, node, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateVariable/GenerateVariableCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateVariable/GenerateVariableCodeFixProvider.cs
new file mode 100644
index 0000000000..11e589fc05
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/GenerateVariable/GenerateVariableCodeFixProvider.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.GenerateMember.GenerateVariable;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.CodeFixes.GenerateConstructor;
+
+namespace MonoDevelop.CSharp.CodeFixes.GenerateVariable
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.GenerateVariable), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateMethod)]
+	internal class GenerateVariableCodeFixProvider : AbstractGenerateMemberCodeFixProvider
+	{
+		private const string CS1061 = "CS1061"; // error CS1061: 'C' does not contain a definition for 'Foo' and no extension method 'Foo' accepting a first argument of type 'C' could be found
+		private const string CS0103 = "CS0103"; // error CS0103: The name 'Foo' does not exist in the current context
+		private const string CS0117 = "CS0117"; // error CS0117: 'TestNs.Program' does not contain a definition for 'blah'
+		private const string CS0539 = "CS0539"; // error CS0539: 'Class.SomeProp' in explicit interface declaration is not a member of interface
+		private const string CS0246 = "CS0246"; // error CS0246: The type or namespace name 'Version' could not be found
+
+		public override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS1061, CS0103, CS0117, CS0539, CS0246); }
+		}
+
+		protected override bool IsCandidate(SyntaxNode node)
+		{
+			return node is SimpleNameSyntax || node is PropertyDeclarationSyntax || node is MemberBindingExpressionSyntax;
+		}
+
+		protected override SyntaxNode GetTargetNode(SyntaxNode node)
+		{
+			if (node.IsKind(SyntaxKind.MemberBindingExpression))
+			{
+				var nameNode = node.ChildNodes().FirstOrDefault(n => n.IsKind(SyntaxKind.IdentifierName));
+				if (nameNode != null)
+				{
+					return nameNode;
+				}
+			}
+
+			return base.GetTargetNode(node);
+		}
+		static readonly CSharpGenerateVariableService service = new CSharpGenerateVariableService ();
+
+		protected override Task<IEnumerable<CodeAction>> GetCodeActionsAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return service.GenerateVariableAsync(document, node, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementAbstractClass/ImplementAbstractClassCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementAbstractClass/ImplementAbstractClassCodeFixProvider.cs
new file mode 100644
index 0000000000..25c8b7f949
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementAbstractClass/ImplementAbstractClassCodeFixProvider.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.ImplementAbstractClass;
+using MonoDevelop.Core;
+using RefactoringEssentials;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.ImplementAbstractClass
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.ImplementAbstractClass), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateType)]
+	internal class ImplementAbstractClassCodeFixProvider : CodeFixProvider
+	{
+		private const string CS0534 = "CS0534"; // 'Program' does not implement inherited abstract member 'Foo.bar()'
+
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0534); }
+		}
+
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var root = await context.Document.GetSyntaxRootAsync(context.CancellationToken).ConfigureAwait(false);
+
+			var token = root.FindToken(context.Span.Start);
+			if (!token.Span.IntersectsWith(context.Span))
+			{
+				return;
+			}
+
+			var classNode = token.Parent as ClassDeclarationSyntax;
+			if (classNode == null)
+			{
+				return;
+			}
+
+			var model = await context.Document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			
+			foreach (var baseTypeSyntax in classNode.BaseList.Types)
+			{
+				var node = baseTypeSyntax.Type;
+
+				if (service.CanImplementAbstractClass(
+					context.Document,
+					model,
+					node,
+					context.CancellationToken))
+				{
+					var title = GettextCatalog.GetString ("Implement Abstract Class");
+					var abstractType = model.GetTypeInfo(node, context.CancellationToken).Type;
+					//var id = GetCodeActionId(abstractType.ContainingAssembly.Name, abstractType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
+					context.RegisterCodeFix(
+						new DocumentChangeAction(node.Span, DiagnosticSeverity.Error, title,
+							(c) => ImplementAbstractClassAsync(context.Document, node, c)),
+						context.Diagnostics);
+					return;
+				}
+			}
+		}
+
+		// internal for testing purposes.
+		internal static string GetCodeActionId(string assemblyName, string abstractTypeFullyQualifiedName)
+		{
+			return "ImplementAbstractClass;" +
+				assemblyName + ";" +
+				abstractTypeFullyQualifiedName;
+		}
+		static CSharpImplementAbstractClassService service = new CSharpImplementAbstractClassService ();
+
+		private async Task<Document> ImplementAbstractClassAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return await service.ImplementAbstractClassAsync(
+				document,
+				await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false),
+				node,
+				cancellationToken).ConfigureAwait(false);
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementInterface/ImplementInterfaceCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementInterface/ImplementInterfaceCodeFixProvider.cs
new file mode 100644
index 0000000000..89f89add8a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/ImplementInterface/ImplementInterfaceCodeFixProvider.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface;
+using ICSharpCode.NRefactory6.CSharp;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.CodeFixes.ImplementInterface
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.ImplementInterface), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.ImplementAbstractClass)]
+	internal class ImplementInterfaceCodeFixProvider : CodeFixProvider
+	{
+		private readonly Func<TypeSyntax, bool> _interfaceName = n => n.Parent is BaseTypeSyntax && n.Parent.Parent is BaseListSyntax && ((BaseTypeSyntax)n.Parent).Type == n;
+		private readonly Func<IEnumerable<CodeAction>, bool> _codeActionAvailable = actions => actions != null && actions.Any();
+
+		internal const string CS0535 = "CS0535"; // 'Program' does not implement interface member 'System.Collections.IEnumerable.GetEnumerator()'
+		internal const string CS0737 = "CS0737"; // 'Class' does not implement interface member 'IInterface.M()'. 'Class.M()' cannot implement an interface member because it is not public.
+		internal const string CS0738 = "CS0738"; // 'C' does not implement interface member 'I.Method1()'. 'B.Method1()' cannot implement 'I.Method1()' because it does not have the matching return type of 'void'.
+
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(CS0535, CS0737, CS0738); }
+		}
+		static CSharpImplementInterfaceService service = new CSharpImplementInterfaceService();
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+			var token = root.FindToken(span.Start);
+			if (!token.Span.IntersectsWith(span))
+			{
+				return;
+			}
+
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+
+			var actions = token.Parent.GetAncestorsOrThis<TypeSyntax>()
+				.Where(_interfaceName)
+				.Select(n => service.GetCodeActions(document, model, n, cancellationToken))
+				.FirstOrDefault(_codeActionAvailable);
+
+			if (_codeActionAvailable(actions))
+			{
+				context.RegisterFixes(actions, context.Diagnostics);
+			}
+		}
+
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/MoveTypeToFile/MoveTypeToFile.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/MoveTypeToFile/MoveTypeToFile.cs
new file mode 100644
index 0000000000..97af87855c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/MoveTypeToFile/MoveTypeToFile.cs
@@ -0,0 +1,215 @@
+// 
+// MoveTypeToFile.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using ICSharpCode.NRefactory.CSharp;
+using RefactoringEssentials;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide;
+using System.Collections.Generic;
+using MonoDevelop.Ide.StandardHeader;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.MoveTypeToFile
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = "Move type to file")]
+	class MoveTypeToFile : CodeRefactoringProvider
+	{
+		public async override Task ComputeRefactoringsAsync (CodeRefactoringContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait (false);
+			var token = root.FindToken(span.Start);
+
+			var type = token.Parent as BaseTypeDeclarationSyntax;
+			if (type == null)
+				return;
+			if (type.Parent is BaseTypeDeclarationSyntax)
+				return;
+			
+			if (Path.GetFileNameWithoutExtension (document.FilePath) == type.Identifier.ToString ())
+				return;
+					
+			string title;
+			if (IsSingleType (root)) {
+				title = String.Format (GettextCatalog.GetString ("Rename file to '{0}'"), Path.GetFileName (GetCorrectFileName (document, type)));
+			} else {
+				title = String.Format (GettextCatalog.GetString ("Move type to file '{0}'"), Path.GetFileName (GetCorrectFileName (document, type)));
+			}
+			context.RegisterRefactoring (new MyCodeAction (document, title, root, type));
+		}
+
+		class MyCodeAction : CodeAction
+		{
+			readonly Document document;
+			readonly BaseTypeDeclarationSyntax type;
+			readonly SyntaxNode root;
+
+			public MyCodeAction (Document document, string title, SyntaxNode root, BaseTypeDeclarationSyntax type)
+			{
+				this.root = root;
+				this.title = title;
+				this.type = type;
+				this.document = document;
+
+			}
+
+			string title;
+			public override string Title {
+				get {
+					return this.title;
+				}
+			}
+
+			protected override Task<Document> GetChangedDocumentAsync (System.Threading.CancellationToken cancellationToken)
+			{
+				var correctFileName = GetCorrectFileName (document, type);
+				if (IsSingleType (root)) {
+					FileService.RenameFile (document.FilePath, correctFileName);
+					var doc = IdeApp.Workbench.ActiveDocument;
+					if (doc.HasProject) {
+						IdeApp.ProjectOperations.SaveAsync (doc.Project);
+					}
+					return Task.FromResult (document);
+				} 
+				return Task.FromResult (CreateNewFile (type, correctFileName));
+			}
+
+			Document CreateNewFile (BaseTypeDeclarationSyntax type, string correctFileName)
+			{
+				var doc = IdeApp.Workbench.ActiveDocument;
+				var content = doc.Editor.Text;
+
+				var types = new List<BaseTypeDeclarationSyntax> (
+					root
+					.DescendantNodesAndSelf (n => !(n is BaseTypeDeclarationSyntax))
+					.OfType<BaseTypeDeclarationSyntax> ()
+					.Where (t => t.SpanStart != type.SpanStart)
+				);
+				types.Sort ((x, y) => y.SpanStart.CompareTo (x.SpanStart));
+
+				foreach (var removeType in types) {
+					var bounds = CalcTypeBounds (removeType);
+					content = content.Remove (bounds.Offset, bounds.Length);
+				}
+
+				if (doc.HasProject) {
+					string header = StandardHeaderService.GetHeader (doc.Project, correctFileName, true);
+					if (!string.IsNullOrEmpty (header))
+						content = header + doc.Editor.GetEolMarker () + StripHeader (content);
+				}
+				content = StripDoubleBlankLines (content);
+
+				File.WriteAllText (correctFileName, content);
+				if (doc.HasProject) {
+					doc.Project.AddFile (correctFileName);
+					IdeApp.ProjectOperations.SaveAsync (doc.Project);
+				}
+
+				doc.Editor.RemoveText (CalcTypeBounds (type));
+
+				return document;
+			}
+
+			ISegment CalcTypeBounds (BaseTypeDeclarationSyntax type)
+			{
+				int start = type.Span.Start;
+				int end = type.Span.End;
+				foreach (var trivia in type.GetLeadingTrivia ()) {
+					if (trivia.Kind () == SyntaxKind.SingleLineDocumentationCommentTrivia) {
+						start = trivia.FullSpan.Start;
+					}
+				}
+
+				return TextSegment.FromBounds (start, end);
+			}
+		}
+
+		static bool IsBlankLine (IReadonlyTextDocument doc, int i)
+		{
+			var line = doc.GetLine (i);
+			return line.Length == line.GetIndentation (doc).Length;
+		}
+
+		static string StripDoubleBlankLines (string content)
+		{
+			var doc = TextEditorFactory.CreateNewDocument (new StringTextSource (content), "a.cs");
+			for (int i = 1; i + 1 <= doc.LineCount; i++) {
+				if (IsBlankLine (doc, i) && IsBlankLine (doc, i + 1)) {
+					doc.RemoveText (doc.GetLine (i).SegmentIncludingDelimiter);
+					i--;
+					continue;
+				}
+			}
+			return doc.Text;
+		}
+
+		static string StripHeader (string content)
+		{
+			var doc = TextEditorFactory.CreateNewDocument (new StringTextSource (content), "");
+			while (true) {
+				string lineText = doc.GetLineText (1);
+				if (lineText == null)
+					break;
+				if (lineText.StartsWith ("//", StringComparison.Ordinal)) {
+					doc.RemoveText (doc.GetLine (1).SegmentIncludingDelimiter);
+					continue;
+				}
+				break;
+			}
+			return doc.Text;
+		}
+		
+		static bool IsSingleType (SyntaxNode root)
+		{
+			return root.DescendantNodesAndSelf (c => !(c is BaseTypeDeclarationSyntax)).OfType<BaseTypeDeclarationSyntax> ().Count () == 1;
+		}
+
+		internal static string GetCorrectFileName (Document document, BaseTypeDeclarationSyntax type)
+		{
+			if (type == null)
+				return document.FilePath;
+			return Path.Combine (Path.GetDirectoryName (document.FilePath), type.Identifier + Path.GetExtension (document.FilePath));
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/PredefinedCodeFixProviderNames.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/PredefinedCodeFixProviderNames.cs
new file mode 100644
index 0000000000..71e0e7e62e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/PredefinedCodeFixProviderNames.cs
@@ -0,0 +1,64 @@
+//
+// PredefinedCodeFixProviderNames.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeFixes
+{
+	static class PredefinedCodeFixProviderNames
+	{
+		public const string AddAwait = "Add Await For Expression";
+		public const string AddAsync = "Add Async To Member";
+		public const string ChangeReturnType = "Change Return Type";
+		public const string ChangeToYield = "Change To Yield";
+		public const string ConvertToAsync = "Convert To Async";
+		public const string ConvertToIterator = "Convert To Iterator";
+		public const string CorrectNextControlVariable = "Correct Next Control Variable";
+		public const string AddMissingReference = "Add Missing Reference";
+		public const string AddUsingOrImport = "Add Using or Import";
+		public const string FullyQualify = "Fully Qualify";
+		public const string FixIncorrectFunctionReturnType = "Fix Incorrect Function Return Type";
+		public const string FixIncorrectExitContinue = "Fix Incorrect Exit Continue";
+		public const string GenerateConstructor = "Generate Constructor";
+		public const string GenerateEndConstruct = "Generate End Construct";
+		public const string GenerateEnumMember = "Generate Enum Member";
+		public const string GenerateEvent = "Generate Event";
+		public const string GenerateVariable = "Generate Variable";
+		public const string GenerateMethod = "Generate Method";
+		public const string GenerateConversion = "Generate Conversion";
+		public const string GenerateType = "Generate Type";
+		public const string ImplementAbstractClass = "Implement Abstract Class";
+		public const string ImplementInterface = "Implement Interface";
+		public const string InsertMissingCast = "InsertMissingCast";
+		public const string MoveToTopOfFile = "Move To Top Of File";
+		public const string RemoveUnnecessaryCast = "Remove Unnecessary Casts";
+		public const string RemoveUnnecessaryImports = "Remove Unnecessary Usings or Imports";
+		public const string RenameTracking = "Rename Tracking";
+		public const string SimplifyNames = "Simplify Names";
+		public const string SpellCheck = "Spell Check";
+		public const string Suppression = "Suppression";
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.RemoveUnnecessaryCastFixAllProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.RemoveUnnecessaryCastFixAllProvider.cs
new file mode 100644
index 0000000000..ec7d818390
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.RemoveUnnecessaryCastFixAllProvider.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace MonoDevelop.CSharp.CodeFixes.RemoveUnnecessaryCast
+{
+	internal partial class RemoveUnnecessaryCastCodeFixProvider : CodeFixProvider
+	{
+//		private class RemoveUnnecessaryCastFixAllProvider : BatchSimplificationFixAllProvider
+//		{
+//			internal static new readonly RemoveUnnecessaryCastFixAllProvider Instance = new RemoveUnnecessaryCastFixAllProvider();
+//
+//			protected override SyntaxNode GetNodeToSimplify(SyntaxNode root, SemanticModel model, Diagnostic diagnostic, Workspace workspace, out string codeActionId, CancellationToken cancellationToken)
+//			{
+//				codeActionId = null;
+//				return GetCastNode(root, model, diagnostic.Location.SourceSpan, cancellationToken);
+//			}
+//
+//			protected override bool NeedsParentFixup
+//			{
+//				get
+//				{
+//					return true;
+//				}
+//			}
+//
+//			protected override async Task<Document> AddSimplifyAnnotationsAsync(Document document, SyntaxNode nodeToSimplify, CancellationToken cancellationToken)
+//			{
+//				var cast = nodeToSimplify as CastExpressionSyntax;
+//				if (cast == null)
+//				{
+//					return null;
+//				}
+//
+//				return await RemoveUnnecessaryCastAsync(document, cast, cancellationToken).ConfigureAwait(false);
+//			}
+//		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.cs
new file mode 100644
index 0000000000..26283ce45d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryCast/RemoveUnnecessaryCastCodeFixProvider.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Diagnostics;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Core;
+using RefactoringEssentials;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.CSharp.CodeFixes.RemoveUnnecessaryCast
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.RemoveUnnecessaryCast), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.ImplementInterface)]
+	internal partial class RemoveUnnecessaryCastCodeFixProvider : CodeFixProvider
+	{
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(IDEDiagnosticIds.RemoveUnnecessaryCastDiagnosticId); }
+		}
+
+//		public sealed override FixAllProvider GetFixAllProvider()
+//		{
+//			return RemoveUnnecessaryCastFixAllProvider.Instance;
+//		}
+//
+		private static CastExpressionSyntax GetCastNode(SyntaxNode root, SemanticModel model, TextSpan span, CancellationToken cancellationToken)
+		{
+			var token = root.FindToken(span.Start);
+			if (!token.Span.IntersectsWith(span))
+			{
+				return null;
+			}
+
+			return token.GetAncestors<CastExpressionSyntax>()
+				.FirstOrDefault(c => c.Span.IntersectsWith(span) && c.IsUnnecessaryCast(model, cancellationToken));
+		}
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var node = GetCastNode(root, model, span, cancellationToken);
+			if (node == null)
+			{
+				return;
+			}
+
+			context.RegisterCodeFix(
+				new DocumentChangeAction(node.Span, DiagnosticSeverity.Warning,
+					GettextCatalog.GetString ("Remove Unnecessary Cast"),
+					(c) => RemoveUnnecessaryCastAsync(document, node, c)),
+				context.Diagnostics);
+		}
+
+		private static async Task<Document> RemoveUnnecessaryCastAsync(Document document, CastExpressionSyntax cast, CancellationToken cancellationToken)
+		{
+			var annotatedCast = cast.WithAdditionalAnnotations(Simplifier.Annotation);
+
+			if (annotatedCast.Expression is ParenthesizedExpressionSyntax)
+			{
+				annotatedCast = annotatedCast.WithExpression(
+					annotatedCast.Expression.WithAdditionalAnnotations(Simplifier.Annotation));
+			}
+			else
+			{
+				annotatedCast = annotatedCast.WithExpression(
+					annotatedCast.Expression.Parenthesize());
+			}
+
+			ExpressionSyntax oldNode = cast;
+			ExpressionSyntax newNode = annotatedCast;
+
+			// Ensure that we simplify any parenting parenthesized expressions not just on the syntax tree level but also on Token based
+			// Case 1:
+			//  In the syntax, (((Task<Action>)x).Result)() 
+			//                 oldNode = (Task<Action>)x
+			//                 newNode = (Task<Action>)(x)
+			//                 Final newNode will be (((Task<Action>)(x)).Result)
+			while (oldNode.Parent.IsKind(SyntaxKind.ParenthesizedExpression) || oldNode.GetFirstToken().GetPreviousToken().Parent.IsKind(SyntaxKind.ParenthesizedExpression))
+			{
+				var parenthesizedExpression = (ParenthesizedExpressionSyntax)oldNode.GetFirstToken().GetPreviousToken().Parent;
+				newNode = parenthesizedExpression.ReplaceNode(oldNode, newNode)
+					.WithAdditionalAnnotations(Simplifier.Annotation);
+				oldNode = parenthesizedExpression;
+			}
+
+			newNode = newNode.WithAdditionalAnnotations(Formatter.Annotation);
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var newRoot = root.ReplaceNode(oldNode, newNode);
+
+			return document.WithSyntaxRoot(newRoot);
+		}
+//
+//		private class MyCodeAction : CodeAction.DocumentChangeAction
+//		{
+//			public MyCodeAction(string title, Func<CancellationToken, Task<Document>> createChangedDocument) :
+//			base(title, createChangedDocument)
+//			{
+//			}
+//		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryUsings/RemoveUnnecessaryUsingsCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryUsings/RemoveUnnecessaryUsingsCodeFixProvider.cs
new file mode 100644
index 0000000000..e3ed5cea15
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/RemoveUnnecessaryUsings/RemoveUnnecessaryUsingsCodeFixProvider.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.RemoveUnnecessaryImports;
+using MonoDevelop.Core;
+using RefactoringEssentials;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.CSharp.Diagnostics;
+
+namespace MonoDevelop.CSharp.CodeFixes.RemoveUnusedUsings
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.RemoveUnnecessaryImports), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.AddMissingReference)]
+	internal class RemoveUnnecessaryUsingsCodeFixProvider : CodeFixProvider
+	{
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get { return ImmutableArray.Create(IDEDiagnosticIds.RemoveUnnecessaryImportsDiagnosticId); }
+		}
+
+		public sealed override FixAllProvider GetFixAllProvider()
+		{
+			return WellKnownFixAllProviders.BatchFixer;
+		}
+
+		static readonly CSharpRemoveUnnecessaryImportsService service = new CSharpRemoveUnnecessaryImportsService();
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var newDocument = service.RemoveUnnecessaryImports(document, model, root, cancellationToken);
+			if (newDocument == document || newDocument == null)
+			{
+				return;
+			}
+
+			context.RegisterCodeFix(
+				new DocumentChangeAction(context.Diagnostics[0].Location.SourceSpan, DiagnosticSeverity.Warning,
+					GettextCatalog.GetString ("Remove Unnecessary Usings"),
+					(c) => Task.FromResult(newDocument)),
+				context.Diagnostics);
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.SimplifyTypeNamesFixAllProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.SimplifyTypeNamesFixAllProvider.cs
new file mode 100644
index 0000000000..543c9b3b38
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.SimplifyTypeNamesFixAllProvider.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.CSharp.CodeFixes.SimplifyTypeNames
+{
+	internal partial class SimplifyTypeNamesCodeFixProvider : CodeFixProvider
+	{
+//		private class SimplifyTypeNamesFixAllProvider : BatchSimplificationFixAllProvider
+//		{
+//			internal static new readonly SimplifyTypeNamesFixAllProvider Instance = new SimplifyTypeNamesFixAllProvider();
+//
+//			protected override SyntaxNode GetNodeToSimplify(SyntaxNode root, SemanticModel model, Diagnostic diagnostic, Workspace workspace, out string codeActionId, CancellationToken cancellationToken)
+//			{
+//				codeActionId = null;
+//				string diagnosticId;
+//				var node = SimplifyTypeNamesCodeFixProvider.GetNodeToSimplify(root, model, diagnostic.Location.SourceSpan, workspace.Options, out diagnosticId, cancellationToken);
+//				if (node != null)
+//				{
+//					codeActionId = GetCodeActionId(diagnosticId, node.ToString());
+//				}
+//
+//				return node;
+//			}
+//		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.cs
new file mode 100644
index 0000000000..0b2b11df09
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeFixes/SimplifyTypeNames/SimplifyTypeNamesCodeFixProvider.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Diagnostics;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Core;
+using System;
+using Microsoft.CodeAnalysis.CSharp;
+using RefactoringEssentials;
+using MonoDevelop.CSharp.Diagnostics.SimplifyTypeNames;
+
+namespace MonoDevelop.CSharp.CodeFixes.SimplifyTypeNames
+{
+	[ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.SimplifyNames), Shared]
+	[ExtensionOrder(After = PredefinedCodeFixProviderNames.RemoveUnnecessaryCast)]
+	internal partial class SimplifyTypeNamesCodeFixProvider : CodeFixProvider
+	{
+		public sealed override ImmutableArray<string> FixableDiagnosticIds
+		{
+			get
+			{
+				return ImmutableArray.Create(
+					IDEDiagnosticIds.SimplifyNamesDiagnosticId,
+					IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId,
+					IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId);
+			}
+		}
+
+//		public sealed override FixAllProvider GetFixAllProvider()
+//		{
+//			return SimplifyTypeNamesFixAllProvider.Instance;
+//		}
+
+		internal static SyntaxNode GetNodeToSimplify(SyntaxNode root, SemanticModel model, TextSpan span, OptionSet optionSet, out string diagnosticId, CancellationToken cancellationToken)
+		{
+			diagnosticId = null;
+			var token = root.FindToken(span.Start, findInsideTrivia: true);
+			if (!token.Span.IntersectsWith(span))
+			{
+				return null;
+			}
+
+			foreach (var n in token.GetAncestors<SyntaxNode>())
+			{
+				if (n.Span.IntersectsWith(span) && CanSimplifyTypeNameExpression(model, n, optionSet, span, out diagnosticId, cancellationToken))
+				{
+					return n;
+				}
+			}
+
+			return null;
+		}
+
+		public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
+		{
+			var document = context.Document;
+			var span = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var optionSet = document.Project.Solution.Workspace.Options;
+			string diagnosticId;
+			var node = GetNodeToSimplify(root, model, span, optionSet, out diagnosticId, cancellationToken);
+			if (node == null)
+			{
+				return;
+			}
+
+			var id = GetCodeActionId(diagnosticId, node.ToString());
+			var title = id;
+			var codeAction = new DocumentChangeAction(node.Span, DiagnosticSeverity.Warning, title,
+				(c) => SimplifyTypeNameAsync(document, node, c));
+
+			context.RegisterCodeFix(codeAction, context.Diagnostics);
+		}
+
+		// internal for testing purpose
+		internal static string GetCodeActionId(string diagnosticId, string nodeText)
+		{
+			switch (diagnosticId)
+			{
+			case IDEDiagnosticIds.SimplifyNamesDiagnosticId:
+				return string.Format(GettextCatalog.GetString ("Simplify name '{0}'"), nodeText);
+
+			case IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId:
+				return string.Format(GettextCatalog.GetString ("Simplify member access '{0}'"), nodeText);
+
+			case IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId:
+				return GettextCatalog.GetString ("Remove 'this' qualification");
+
+			default:
+				throw new InvalidOperationException();
+			}
+		}
+
+		private static bool CanSimplifyTypeNameExpression(SemanticModel model, SyntaxNode node, OptionSet optionSet, TextSpan span, out string diagnosticId, CancellationToken cancellationToken)
+		{
+			diagnosticId = null;
+			TextSpan issueSpan;
+			if (!CSharpSimplifyTypeNamesDiagnosticAnalyzer.IsCandidate(node) ||
+				!CSharpSimplifyTypeNamesDiagnosticAnalyzer.CanSimplifyTypeNameExpression(model, node, optionSet, out issueSpan, out diagnosticId, cancellationToken))
+			{
+				return false;
+			}
+
+			return issueSpan.Equals(span);
+		}
+
+		private async Task<Document> SimplifyTypeNameAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var expressionSyntax = node;
+			var annotatedexpressionSyntax = expressionSyntax.WithAdditionalAnnotations(Simplifier.Annotation, Formatter.Annotation);
+
+			if (annotatedexpressionSyntax.Kind() == SyntaxKind.IsExpression || annotatedexpressionSyntax.Kind() == SyntaxKind.AsExpression)
+			{
+				var right = ((BinaryExpressionSyntax)annotatedexpressionSyntax).Right;
+				annotatedexpressionSyntax = annotatedexpressionSyntax.ReplaceNode(right, right.WithAdditionalAnnotations(Simplifier.Annotation));
+			}
+
+			SyntaxNode oldNode = expressionSyntax;
+			SyntaxNode newNode = annotatedexpressionSyntax;
+
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var newRoot = root.ReplaceNode(oldNode, newNode);
+
+			return document.WithSyntaxRoot(newRoot);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/AbstractGenerateAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/AbstractGenerateAction.cs
index 12fcc3a87d..13234fff9e 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/AbstractGenerateAction.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/AbstractGenerateAction.cs
@@ -31,18 +31,22 @@ using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Refactoring;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Components;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.CSharp.Completion;
+using MonoDevelop.CSharp.Formatting;
 
 namespace MonoDevelop.CodeGeneration
 {
-	public abstract class AbstractGenerateAction : IGenerateAction
+	abstract class AbstractGenerateAction : IGenerateAction
 	{
 		readonly TreeStore store = new TreeStore (typeof(bool), typeof(Xwt.Drawing.Image), typeof(string), typeof(object));
 		readonly CodeGenerationOptions options;
 		
-		public CodeGenerationOptions Options {
+		internal CodeGenerationOptions Options {
 			get {
 				return options; 
 			}
@@ -76,23 +80,18 @@ namespace MonoDevelop.CodeGeneration
 			column.Expand = true;
 
 			treeView.AppendColumn (column);
-			Ambience ambience = AmbienceService.GetAmbienceForFile (options.Document.FileName);
 			foreach (object obj in GetValidMembers ()) {
-				var member = obj as IEntity;
+				var member = obj as ISymbol;
 				if (member != null) {
-					Store.AppendValues (false, ImageService.GetIcon (member.GetStockIcon (), IconSize.Menu), ambience.GetString (member, OutputFlags.ClassBrowserEntries), member);
+					Store.AppendValues (false, ImageService.GetIcon (member.GetStockIcon (), IconSize.Menu), member.ToDisplayString (Ambience.LabelFormat), member);
 					continue;
 				}
 
-				var tuple = obj as Tuple<IMember, bool>;
+				var tuple = obj as Tuple<ISymbol, bool>;
 				if (tuple != null) {
-					Store.AppendValues (false, ImageService.GetIcon (tuple.Item1.GetStockIcon (), IconSize.Menu), ambience.GetString (tuple.Item1, OutputFlags.ClassBrowserEntries), tuple);
+					Store.AppendValues (false, ImageService.GetIcon (tuple.Item1.GetStockIcon (), IconSize.Menu), tuple.Item1.ToDisplayString (Ambience.LabelFormat), tuple);
 					continue;
 				}
-
-				var variable = obj as IVariable;
-				if (variable != null)
-					Store.AppendValues (false, ImageService.GetIcon (variable.GetStockIcon (), IconSize.Menu), variable.Name, variable);
 			}
 			
 			treeView.Model = store;
@@ -118,10 +117,9 @@ namespace MonoDevelop.CodeGeneration
 		
 		static string AddIndent (string text, string indent)
 		{
-			var doc = new Mono.TextEditor.TextDocument ();
-			doc.Text = text;
+			var doc = TextEditorFactory.CreateNewReadonlyDocument (new StringTextSource (text), "");
 			var result = new StringBuilder ();
-			foreach (var line in doc.Lines) {
+			foreach (var line in doc.GetLines ()) {
 				result.Append (indent);
 				result.Append (doc.GetTextAt (line.SegmentIncludingDelimiter));
 			}
@@ -141,7 +139,7 @@ namespace MonoDevelop.CodeGeneration
 			} while (store.IterNext (ref iter));
 
 			var output = new StringBuilder ();
-			string indent = RefactoringOptions.GetIndent (options.Document, (IEntity)options.EnclosingMember ?? options.EnclosingType) + "\t";
+			string indent = options.Editor.GetVirtualIndentationString (options.Editor.CaretLine);
 			foreach (string nodeText in GenerateCode (includedMembers)) {
 				if (output.Length > 0) {
 					output.AppendLine ();
@@ -151,8 +149,14 @@ namespace MonoDevelop.CodeGeneration
 			}
 
 			if (output.Length > 0) {
-				var data = options.Document.Editor;
-				data.InsertAtCaret (output.ToString ().TrimStart ());
+				var data = options.Editor;
+				data.EnsureCaretIsNotVirtual ();
+				int offset = data.CaretOffset;
+				var text = output.ToString ().TrimStart ();
+				using (var undo = data.OpenUndoGroup ()) {
+					data.InsertAtCaret (text);
+					OnTheFlyFormatter.Format (data, options.DocumentContext, offset, offset + text.Length);
+				}
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs
index 3ec0f395d3..82fbc7abe2 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs
@@ -26,148 +26,157 @@
 using System.Linq;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Resolver;
 using System;
 using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.Simplification;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Options;
+using MonoDevelop.Ide.Gui.Content;
+using Microsoft.CodeAnalysis.Formatting;
+using System.Diagnostics;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.Completion;
 
 namespace MonoDevelop.CodeGeneration
 {
-	public class CodeGenerationOptions
+	sealed class CodeGenerationOptions
 	{
-		public Document Document {
+		readonly int offset;
+
+		public TextEditor Editor
+		{
 			get;
 			private set;
 		}
-		
-		public ITypeDefinition EnclosingType {
+
+		public DocumentContext DocumentContext
+		{
 			get;
 			private set;
 		}
-		
-		public IUnresolvedTypeDefinition EnclosingPart {
+
+		public ITypeSymbol EnclosingType
+		{
 			get;
 			private set;
 		}
-		
-		public IMember EnclosingMember {
+
+		public SyntaxNode EnclosingMemberSyntax
+		{
 			get;
 			private set;
 		}
-		
-		public string MimeType {
-			get {
-				return DesktopService.GetMimeTypeForUri (Document.FileName);
-			}
+
+		public TypeDeclarationSyntax EnclosingPart
+		{
+			get;
+			private set;
 		}
-		
-		public CSharpFormattingOptions FormattingOptions {
-			get {
-				var doc = Document;
-				var policyParent = doc.Project != null ? doc.Project.Policies : null;
-				var types = DesktopService.GetMimeTypeInheritanceChain (doc.Editor.MimeType);
-				var codePolicy = policyParent != null ? policyParent.Get<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types) : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
-				return codePolicy.CreateOptions ();
-			}
+
+		public ISymbol EnclosingMember
+		{
+			get;
+			private set;
 		}
-		
-		static AstNode FirstExpressionChild (AstNode parent)
+
+		public string MimeType
 		{
-			AstNode node = parent.FirstChild;
-			if (node == null)
-				return null;
-			while (node != null && !(node is Expression || node is Statement)) {
-				node = node.NextSibling;
+			get
+			{
+				return DesktopService.GetMimeTypeForUri (DocumentContext.Name);
 			}
-			return node;
 		}
-		
-		static AstNode NextExpression (AstNode parent)
+
+		public OptionSet FormattingOptions
 		{
-			AstNode node = parent.GetNextNode ();
-			if (node == null)
-				return null;
-			while (node != null && !(node is Expression || node is Statement)) {
-				node = node.GetNextNode ();
+			get
+			{
+				var doc = DocumentContext;
+				var policyParent = doc.Project != null ? doc.Project.Policies : null;
+				var types = DesktopService.GetMimeTypeInheritanceChain (Editor.MimeType);
+				var codePolicy = policyParent != null ? policyParent.Get<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types) : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
+				var textPolicy = policyParent != null ? policyParent.Get<TextStylePolicy> (types) : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
+				return codePolicy.CreateOptions (textPolicy);
 			}
-			return node;
 		}
-		
-		readonly Lazy<CSharpResolver> currentState;
-		public CSharpResolver CurrentState {
-			get {
-				return currentState.Value;
-			}
+
+		public SemanticModel CurrentState
+		{
+			get;
+			private set;
 		}
-		
-		public CodeGenerationOptions ()
+
+		internal CodeGenerationOptions (TextEditor editor, DocumentContext ctx)
 		{
-			currentState = new Lazy<CSharpResolver> (() => {
-				var parsedDocument = Document.ParsedDocument;
-				if (parsedDocument == null)
-					return null;
-				var unit = parsedDocument.GetAst<SyntaxTree> ().Clone ();
-				var file = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-				
-				var resolvedNode = unit.GetNodeAt<BlockStatement> (Document.Editor.Caret.Location);
-				if (resolvedNode == null)
-					return null;
-				
-				var expr = new IdentifierExpression ("foo");
-				resolvedNode.Add (expr);
-				
-				var ctx = file.GetTypeResolveContext (Document.Compilation, Document.Editor.Caret.Location);
-				
-				var resolver = new CSharpResolver (ctx);
-				
-				var astResolver = new CSharpAstResolver (resolver, unit, file);
-				astResolver.ApplyNavigator (new NodeListResolveVisitorNavigator (expr), CancellationToken.None);
-				astResolver.Resolve (expr);
-				return astResolver.GetResolverStateBefore (expr);
-			});
+			Editor = editor;
+			DocumentContext = ctx;
+			if (ctx.ParsedDocument != null)
+				CurrentState = ctx.ParsedDocument.GetAst<SemanticModel> ();
+			offset = editor.CaretOffset;
+			var tree = CurrentState.SyntaxTree;
+			EnclosingPart = tree.GetContainingTypeDeclaration (offset, default(CancellationToken));
+			if (EnclosingPart != null) {
+				EnclosingType = CurrentState.GetDeclaredSymbol (EnclosingPart) as ITypeSymbol;
+
+				foreach (var member in EnclosingPart.Members) {
+					if (member.Span.Contains (offset)) {
+						EnclosingMemberSyntax = member;
+						break;
+					}
+
+				}
+				if (EnclosingMemberSyntax != null)
+					EnclosingMember = CurrentState.GetDeclaredSymbol (EnclosingMemberSyntax);
+			}
 		}
-		
-		public AstType CreateShortType (IType fullType)
+
+		public string CreateShortType (ITypeSymbol fullType)
 		{
-			var parsedFile = Document.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			
-			var compilation = Document.Compilation;
-			fullType = compilation.Import (fullType);
-			var csResolver = parsedFile.GetResolver (compilation, Document.Editor.Caret.Location);
-			
-			var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
-			return builder.ConvertType (fullType);
+			return RoslynCompletionData.SafeMinimalDisplayString (fullType, CurrentState, offset);
 		}
-		
-		public CodeGenerator CreateCodeGenerator ()
+
+		public static CodeGenerationOptions CreateCodeGenerationOptions (TextEditor document, DocumentContext ctx)
 		{
-			var result = CodeGenerator.CreateGenerator (Document);
-			if (result == null)
-				LoggingService.LogError ("Generator can't be generated for : " + Document.Editor.MimeType);
-			return result;
+			return new CodeGenerationOptions (document, ctx);
 		}
-		
-		public static CodeGenerationOptions CreateCodeGenerationOptions (Document document)
+
+		public async Task<string> OutputNode (SyntaxNode node, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			document.UpdateParseDocument ();
-			var options = new CodeGenerationOptions {
-				Document = document
-			};
-			if (document.ParsedDocument != null && document.ParsedDocument.ParsedFile != null) {
-				options.EnclosingPart = document.ParsedDocument.ParsedFile.GetInnermostTypeDefinition (document.Editor.Caret.Location);
-				var project = document.Project;
-				if (options.EnclosingPart != null && project != null)
-					options.EnclosingType = options.EnclosingPart.Resolve (project).GetDefinition ();
-				if (options.EnclosingType != null) {
-					options.EnclosingMember = options.EnclosingType.Members.FirstOrDefault (m => !m.IsSynthetic && m.Region.FileName == document.FileName && m.Region.IsInside (document.Editor.Caret.Location));
-				}
+			node = Formatter.Format (node, TypeSystemService.Workspace, FormattingOptions, cancellationToken);
+
+			var text = Editor.Text;
+			string nodeText = node.ToString ();
+			text = text.Insert (offset, nodeText);
+
+			var backgroundDocument = DocumentContext.AnalysisDocument.WithText (SourceText.From (text));
+
+			var currentRoot = await backgroundDocument.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+
+			// add formatter & simplifier annotations 
+			var oldNode = currentRoot.FindNode (TextSpan.FromBounds(offset, offset + nodeText.Length));
+			currentRoot = currentRoot.ReplaceNode (oldNode, oldNode.WithAdditionalAnnotations (Formatter.Annotation, Simplifier.Annotation)); 
+
+			// get updated node
+			node = currentRoot.FindNode (TextSpan.FromBounds(offset, offset + nodeText.Length));
+			currentRoot = currentRoot.TrackNodes (node);
+
+			backgroundDocument = backgroundDocument.WithSyntaxRoot (currentRoot);
+			backgroundDocument = await Formatter.FormatAsync (backgroundDocument, Formatter.Annotation, cancellationToken: cancellationToken).ConfigureAwait(false);
+			backgroundDocument = await Simplifier.ReduceAsync (backgroundDocument, Simplifier.Annotation, cancellationToken: cancellationToken).ConfigureAwait(false);
+			var newRoot = await backgroundDocument.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+
+			var formattedNode = newRoot.GetCurrentNode (node);
+			if (formattedNode == null) {
+				LoggingService.LogError ("Fatal error: Can't find current formatted node in code generator document.");
+				return nodeText;
 			}
-			return options;
+			return formattedNode.ToString ();
 		}
-		
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CreateConstructorGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CreateConstructorGenerator.cs
index d48bafe43d..a14f6603a5 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CreateConstructorGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CreateConstructorGenerator.cs
@@ -1,166 +1,210 @@
-// 
-// CreateConstructorGenerator.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using Gtk;
+// 

+// CreateConstructorGenerator.cs

+//  

+// Author:

+//       Mike Krüger <mkrueger@novell.com>

+// 

+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)

+// 

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+// 

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+using System;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
+using System.Text;

+using System.Linq;

 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
+using ICSharpCode.NRefactory6.CSharp;

+using Gtk;

+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.CodeGeneration
 {
 	class CreateConstructorGenerator : ICodeGenerator
 	{
-		public string Icon {
-			get {
+		public string Icon
+		{
+			get
+			{
 				return "md-newmethod";
 			}
 		}
-		
-		public string Text {
-			get {
+
+		public string Text
+		{
+			get
+			{
 				return GettextCatalog.GetString ("Constructor");
 			}
 		}
-		
-		public string GenerateDescription {
-			get {
+
+		public string GenerateDescription
+		{
+			get
+			{
 				return GettextCatalog.GetString ("Select members to be initialized by the constructor.");
 			}
 		}
-		
+
 		public bool IsValid (CodeGenerationOptions options)
 		{
 			var createConstructor = new CreateConstructor (options);
 			return createConstructor.IsValid ();
 		}
-		
+
 		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, TreeView treeView)
 		{
 			var createConstructor = new CreateConstructor (options);
 			createConstructor.Initialize (treeView);
 			return createConstructor;
 		}
-		
+

+		internal static TypeSyntax ConvertType (ITypeSymbol symbol)

+		{

+			// TODO: There needs to be a better way doing that.

+			return SyntaxFactory.ParseTypeName (symbol.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat));

+		}

+
 		class CreateConstructor : AbstractGenerateAction
 		{
 			public CreateConstructor (CodeGenerationOptions options) : base (options)
 			{
 			}
-			
+
 			protected override IEnumerable<object> GetValidMembers ()
 			{
 				if (Options.EnclosingType == null || Options.EnclosingMember != null)
 					yield break;
 
-				var bt = Options.EnclosingType.DirectBaseTypes.FirstOrDefault (t => t.Kind != TypeKind.Interface);
+				var bt = Options.EnclosingType.BaseType;
 
 				if (bt != null) {
-					var ctors = bt.GetConstructors (m => !m.IsSynthetic).ToList ();
-					foreach (var ctor in ctors) {
-						if (ctor.Parameters.Count > 0 || ctors.Count > 1) {
+					var ctors = bt.GetMembers ().OfType<IMethodSymbol> ().Where (m => m.MethodKind == MethodKind.Constructor && !m.IsImplicitlyDeclared).ToList ();
+					foreach (IMethodSymbol ctor in ctors) {
+						if (ctor.Parameters.Length > 0 || ctors.Count > 1) {
 							yield return ctor;
 						}
-					} 
+					}
 				}
 
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
+				foreach (IFieldSymbol field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+					if (field.IsImplicitlyDeclared)
 						continue;
 					yield return field;
 				}
 
-				foreach (IProperty property in Options.EnclosingType.Properties) {
-					if (property.IsSynthetic)
+				foreach (IPropertySymbol property in Options.EnclosingType.GetMembers ().OfType<IPropertySymbol> ()) {
+					if (property.IsImplicitlyDeclared)
 						continue;
-					if (!property.CanSet)
+					if (property.SetMethod == null)
 						continue;
 					yield return property;
 				}
 			}
-			
-			static string CreateParameterName (IMember member)
+
+			static string CreateParameterName (ISymbol member)
 			{
 				if (char.IsUpper (member.Name[0]))
 					return char.ToLower (member.Name[0]) + member.Name.Substring (1);
 				return member.Name;
 			}
-			
+
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
-			{
+			{

 				bool gotConstructorOverrides = false;
-				foreach (IMethod m in includedMembers.OfType<IMethod> ().Where (m => m.SymbolKind == SymbolKind.Constructor)) {
+				foreach (IMethodSymbol m in includedMembers.OfType<IMethodSymbol> ().Where (m => m.MethodKind == MethodKind.Constructor)) {
 					gotConstructorOverrides = true;
-					var init = new ConstructorInitializer {
-						ConstructorInitializerType = ConstructorInitializerType.Base
-					};
-
-					var overridenConstructor = new ConstructorDeclaration {
-						Name = Options.EnclosingType.Name,
-						Modifiers = Modifiers.Public,
-						Body = new BlockStatement (),
-					};
-
-					if (m.Parameters.Count > 0)
-						overridenConstructor.Initializer = init;
-
+					var parameters = new List<ParameterSyntax> ();

+					var initArgs = new List<ArgumentSyntax> ();

+					var statements = new List<StatementSyntax> ();

 					foreach (var par in m.Parameters) {
-						overridenConstructor.Parameters.Add (new ParameterDeclaration (Options.CreateShortType (par.Type), par.Name));
-						init.Arguments.Add (new IdentifierExpression(par.Name)); 
+						parameters.Add (SyntaxFactory.Parameter (SyntaxFactory.Identifier (par.Name)).WithType (ConvertType (par.Type)));

+						initArgs.Add (SyntaxFactory.Argument (SyntaxFactory.ParseExpression (par.Name)));
 					}
-					foreach (var member in includedMembers.OfType<IMember> ()) {
-						if (member.SymbolKind == SymbolKind.Constructor)
+
+					foreach (ISymbol member in includedMembers) {
+						if (member.Kind == SymbolKind.Method)
 							continue;
-						overridenConstructor.Parameters.Add (new ParameterDeclaration (Options.CreateShortType (member.ReturnType), CreateParameterName (member)));
+						var paramName = CreateParameterName (member);
+						parameters.Add (SyntaxFactory.Parameter (SyntaxFactory.Identifier (paramName)).WithType (ConvertType (member.GetReturnType ())));
 
-						var memberReference = new MemberReferenceExpression (new ThisReferenceExpression (), member.Name);
-						var assign = new AssignmentExpression (memberReference, AssignmentOperatorType.Assign, new IdentifierExpression (CreateParameterName (member)));
-						overridenConstructor.Body.Statements.Add (new ExpressionStatement (assign));
+						statements.Add (

+							SyntaxFactory.ExpressionStatement (

+								SyntaxFactory.AssignmentExpression (

+									SyntaxKind.SimpleAssignmentExpression,

+									SyntaxFactory.MemberAccessExpression (

+										SyntaxKind.SimpleMemberAccessExpression,

+										SyntaxFactory.ThisExpression (),

+										SyntaxFactory.IdentifierName (member.Name)

+									),

+									SyntaxFactory.IdentifierName (paramName)

+								)

+							)

+						);
 					}
 
-					yield return overridenConstructor.ToString (Options.FormattingOptions);
+					var node = SyntaxFactory.ConstructorDeclaration (
+					SyntaxFactory.List<AttributeListSyntax> (),
+					SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.PublicKeyword)),
+					SyntaxFactory.Identifier (Options.EnclosingType.Name),
+					SyntaxFactory.ParameterList (SyntaxFactory.SeparatedList<ParameterSyntax> (parameters)),
+						initArgs.Count > 0 ? SyntaxFactory.ConstructorInitializer (SyntaxKind.BaseConstructorInitializer, SyntaxFactory.ArgumentList (SyntaxFactory.SeparatedList<ArgumentSyntax> (initArgs))) : null,
+					SyntaxFactory.Block (statements.ToArray ())
+				);

+					yield return Options.OutputNode (node).Result;
 				}
 				if (gotConstructorOverrides)
-					yield break;
-				var constructorDeclaration = new ConstructorDeclaration {
-					Name = Options.EnclosingType.Name,
-					Modifiers = Modifiers.Public,
-					Body = new BlockStatement ()
-				};
-
-				foreach (IMember member in includedMembers) {
-					constructorDeclaration.Parameters.Add (new ParameterDeclaration (Options.CreateShortType (member.ReturnType), CreateParameterName (member)));
-
-					var memberReference = new MemberReferenceExpression (new ThisReferenceExpression (), member.Name);
-					var assign = new AssignmentExpression (memberReference, AssignmentOperatorType.Assign, new IdentifierExpression (CreateParameterName (member)));
-					constructorDeclaration.Body.Statements.Add (new ExpressionStatement (assign));
+					yield break;

+

+				var parameters2 = new List<ParameterSyntax> ();

+				var statements2 = new List<StatementSyntax> ();
+				foreach (ISymbol member in includedMembers) {
+					var paramName = CreateParameterName (member);

+					parameters2.Add (SyntaxFactory.Parameter (SyntaxFactory.Identifier (paramName)).WithType (ConvertType (member.GetReturnType ())));

+

+					statements2.Add (

+						SyntaxFactory.ExpressionStatement (

+							SyntaxFactory.AssignmentExpression (

+								SyntaxKind.SimpleAssignmentExpression,

+								SyntaxFactory.MemberAccessExpression (

+									SyntaxKind.SimpleMemberAccessExpression,

+									SyntaxFactory.ThisExpression (),

+									SyntaxFactory.IdentifierName (member.Name)

+								),

+								SyntaxFactory.IdentifierName (paramName)

+							)

+						)

+					);

 				}
 				
-				yield return constructorDeclaration.ToString (Options.FormattingOptions);
+				var node2 = SyntaxFactory.ConstructorDeclaration (

+					SyntaxFactory.List<AttributeListSyntax> (),

+					SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.PublicKeyword)),

+					SyntaxFactory.Identifier (Options.EnclosingType.Name),

+					SyntaxFactory.ParameterList (SyntaxFactory.SeparatedList<ParameterSyntax> (parameters2)),

+					null,

+					SyntaxFactory.Block (statements2.ToArray ())

+				);

+				yield return Options.OutputNode (node2).Result;
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/EqualityMembersGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/EqualityMembersGenerator.cs
index 49d89a70e6..d5849c638b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/EqualityMembersGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/EqualityMembersGenerator.cs
@@ -1,159 +1,160 @@
-// 
-// EqualityMembersGenerator.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace MonoDevelop.CodeGeneration
-{
-	class EqualityMembersGenerator : ICodeGenerator
-	{
-		public string Icon {
-			get {
-				return "md-newmethod";
-			}
-		}
-		
-		public string Text {
-			get {
-				return GettextCatalog.GetString ("Equality members");
-			}
-		}
-		
-		public string GenerateDescription {
-			get {
-				return GettextCatalog.GetString ("Select members to include in equality.");
-			}
-		}
-		
-		public bool IsValid (CodeGenerationOptions options)
-		{
-			return new CreateEquality (options).IsValid ();
-		}
-		
-		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
-		{
-			var createEventMethod = new CreateEquality (options);
-			createEventMethod.Initialize (treeView);
-			return createEventMethod;
-		}
-		
-		class CreateEquality : AbstractGenerateAction
-		{
-			public CreateEquality (CodeGenerationOptions options) : base (options)
-			{
-			}
-			
-			protected override IEnumerable<object> GetValidMembers ()
-			{
-				if (Options.EnclosingType == null || Options.EnclosingMember != null)
-					yield break;
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
-						continue;
-					yield return field;
-				}
-
-				foreach (IProperty property in Options.EnclosingType.Properties) {
-					if (property.IsSynthetic)
-						continue;
-					if (property.CanGet)
-						yield return property;
-				}
-			}
-			
-			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
-			{
-				// Genereate Equals
-				var methodDeclaration = new MethodDeclaration ();
-				methodDeclaration.Name = "Equals";
-
-				methodDeclaration.ReturnType = new PrimitiveType ("bool");
-				methodDeclaration.Modifiers = Modifiers.Public | Modifiers.Override;
-				methodDeclaration.Body = new BlockStatement ();
-				methodDeclaration.Parameters.Add (new ParameterDeclaration (new PrimitiveType ("object"), "obj"));
-				var paramId = new IdentifierExpression ("obj");
-				var ifStatement = new IfElseStatement ();
-				ifStatement.Condition = new BinaryOperatorExpression (paramId, BinaryOperatorType.Equality, new PrimitiveExpression (null));
-				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (false));
-				methodDeclaration.Body.Statements.Add (ifStatement);
-
-				ifStatement = new IfElseStatement ();
-				var arguments = new List<Expression> ();
-				arguments.Add (new ThisReferenceExpression ());
-				arguments.Add (paramId.Clone ());
-				ifStatement.Condition = new InvocationExpression (new IdentifierExpression ("ReferenceEquals"), arguments);
-				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (true));
-				methodDeclaration.Body.Statements.Add (ifStatement);
-
-				ifStatement = new IfElseStatement ();
-				ifStatement.Condition = new BinaryOperatorExpression (new InvocationExpression (new MemberReferenceExpression (paramId.Clone (), "GetType")), BinaryOperatorType.InEquality, new TypeOfExpression (new SimpleType (Options.EnclosingType.Name)));
-				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (false));
-				methodDeclaration.Body.Statements.Add (ifStatement);
-
-				var varType = new SimpleType (Options.EnclosingType.Name);
-				var varDecl = new VariableDeclarationStatement (varType, "other", new CastExpression (varType.Clone (), paramId.Clone ()));
-				methodDeclaration.Body.Statements.Add (varDecl);
-				
-				var otherId = new IdentifierExpression ("other");
-				Expression binOp = null;
-				foreach (IMember member in includedMembers) {
-					Expression right = new BinaryOperatorExpression (new IdentifierExpression (member.Name), BinaryOperatorType.Equality, new MemberReferenceExpression (otherId.Clone (), member.Name));
-					binOp = binOp == null ? right : new BinaryOperatorExpression (binOp, BinaryOperatorType.ConditionalAnd, right);
-				}
-
-				methodDeclaration.Body.Statements.Add (new ReturnStatement (binOp));
-				yield return methodDeclaration.ToString (Options.FormattingOptions);
-
-				methodDeclaration = new MethodDeclaration ();
-				methodDeclaration.Name = "GetHashCode";
-
-				methodDeclaration.ReturnType = new PrimitiveType ("int");
-				methodDeclaration.Modifiers = Modifiers.Public | Modifiers.Override;
-				methodDeclaration.Body = new BlockStatement ();
-
-				binOp = null;
-				foreach (IMember member in includedMembers) {
-					Expression right;
-					right = new InvocationExpression (new MemberReferenceExpression (new IdentifierExpression (member.Name), "GetHashCode"));
-
-					IType type = member.ReturnType;
-					if (type != null && type.Kind != TypeKind.Struct && type.Kind != TypeKind.Enum)
-						right = new ParenthesizedExpression (new ConditionalExpression (new BinaryOperatorExpression (new IdentifierExpression (member.Name), BinaryOperatorType.InEquality, new PrimitiveExpression (null)), right, new PrimitiveExpression (0)));
-
-					binOp = binOp == null ? right : new BinaryOperatorExpression (binOp, BinaryOperatorType.ExclusiveOr, right);
-				}
-				var uncheckedBlock = new BlockStatement ();
-				uncheckedBlock.Statements.Add (new ReturnStatement (binOp));
-
-				methodDeclaration.Body.Statements.Add (new UncheckedStatement (uncheckedBlock));
-				yield return methodDeclaration.ToString (Options.FormattingOptions);
-			}
-		}
-	}
-}
+//// 
+//// EqualityMembersGenerator.cs
+////  
+//// Author:
+////       Mike Krüger <mkrueger@novell.com>
+//// 
+//// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+//// 
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+//// 
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+//// 
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//
+//using System.Collections.Generic;
+//using MonoDevelop.Core;
+//using Microsoft.CodeAnalysis;
+//using ICSharpCode.NRefactory.CSharp;
+//using ICSharpCode.NRefactory6.CSharp;
+//
+//namespace MonoDevelop.CodeGeneration
+//{
+//	class EqualityMembersGenerator : ICodeGenerator
+//	{
+//		public string Icon {
+//			get {
+//				return "md-newmethod";
+//			}
+//		}
+//		
+//		public string Text {
+//			get {
+//				return GettextCatalog.GetString ("Equality members");
+//			}
+//		}
+//		
+//		public string GenerateDescription {
+//			get {
+//				return GettextCatalog.GetString ("Select members to include in equality.");
+//			}
+//		}
+//		
+//		public bool IsValid (CodeGenerationOptions options)
+//		{
+//			return new CreateEquality (options).IsValid ();
+//		}
+//		
+//		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
+//		{
+//			var createEventMethod = new CreateEquality (options);
+//			createEventMethod.Initialize (treeView);
+//			return createEventMethod;
+//		}
+//		
+//		class CreateEquality : AbstractGenerateAction
+//		{
+//			public CreateEquality (CodeGenerationOptions options) : base (options)
+//			{
+//			}
+//			
+//			protected override IEnumerable<object> GetValidMembers ()
+//			{
+//				if (Options.EnclosingType == null || Options.EnclosingMember != null)
+//					yield break;
+//				foreach (IFieldSymbol field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+//					if (field.IsImplicitlyDeclared)
+//						continue;
+//					yield return field;
+//				}
+//
+//				foreach (IPropertySymbol property in Options.EnclosingType.GetMembers ().OfType<IPropertySymbol> ()) {
+//					if (property.IsImplicitlyDeclared)
+//						continue;
+//					if (property.GetMethod != null)
+//						yield return property;
+//				}
+//			}
+//			
+//			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
+//			{
+//				// Genereate Equals
+//				var methodDeclaration = new MethodDeclaration ();
+//				methodDeclaration.Name = "Equals";
+//
+//				methodDeclaration.ReturnType = new PrimitiveType ("bool");
+//				methodDeclaration.Modifiers = Modifiers.Public | Modifiers.Override;
+//				methodDeclaration.Body = new BlockStatement ();
+//				methodDeclaration.Parameters.Add (new ParameterDeclaration (new PrimitiveType ("object"), "obj"));
+//				var paramId = new IdentifierExpression ("obj");
+//				var ifStatement = new IfElseStatement ();
+//				ifStatement.Condition = new BinaryOperatorExpression (paramId, BinaryOperatorType.Equality, new PrimitiveExpression (null));
+//				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (false));
+//				methodDeclaration.Body.Statements.Add (ifStatement);
+//
+//				ifStatement = new IfElseStatement ();
+//				var arguments = new List<Expression> ();
+//				arguments.Add (new ThisReferenceExpression ());
+//				arguments.Add (paramId.Clone ());
+//				ifStatement.Condition = new InvocationExpression (new IdentifierExpression ("ReferenceEquals"), arguments);
+//				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (true));
+//				methodDeclaration.Body.Statements.Add (ifStatement);
+//
+//				ifStatement = new IfElseStatement ();
+//				ifStatement.Condition = new BinaryOperatorExpression (new InvocationExpression (new MemberReferenceExpression (paramId.Clone (), "GetType")), BinaryOperatorType.InEquality, new TypeOfExpression (new SimpleType (Options.EnclosingType.Name)));
+//				ifStatement.TrueStatement = new ReturnStatement (new PrimitiveExpression (false));
+//				methodDeclaration.Body.Statements.Add (ifStatement);
+//
+//				var varType = new SimpleType (Options.EnclosingType.Name);
+//				var varDecl = new VariableDeclarationStatement (varType, "other", new CastExpression (varType.Clone (), paramId.Clone ()));
+//				methodDeclaration.Body.Statements.Add (varDecl);
+//				
+//				var otherId = new IdentifierExpression ("other");
+//				Expression binOp = null;
+//				foreach (ISymbol member in includedMembers) {
+//					Expression right = new BinaryOperatorExpression (new IdentifierExpression (member.Name), BinaryOperatorType.Equality, new MemberReferenceExpression (otherId.Clone (), member.Name));
+//					binOp = binOp == null ? right : new BinaryOperatorExpression (binOp, BinaryOperatorType.ConditionalAnd, right);
+//				}
+//
+//				methodDeclaration.Body.Statements.Add (new ReturnStatement (binOp));
+//				yield return methodDeclaration.ToString ();
+//
+//				methodDeclaration = new MethodDeclaration ();
+//				methodDeclaration.Name = "GetHashCode";
+//
+//				methodDeclaration.ReturnType = new PrimitiveType ("int");
+//				methodDeclaration.Modifiers = Modifiers.Public | Modifiers.Override;
+//				methodDeclaration.Body = new BlockStatement ();
+//
+//				binOp = null;
+//				foreach (ISymbol member in includedMembers) {
+//					Expression right;
+//					right = new InvocationExpression (new MemberReferenceExpression (new IdentifierExpression (member.Name), "GetHashCode"));
+//
+//					var type = member.GetReturnType ();
+//					if (type != null && type.TypeKind != TypeKind.Struct && type.TypeKind != TypeKind.Enum)
+//						right = new ParenthesizedExpression (new ConditionalExpression (new BinaryOperatorExpression (new IdentifierExpression (member.Name), BinaryOperatorType.InEquality, new PrimitiveExpression (null)), right, new PrimitiveExpression (0)));
+//
+//					binOp = binOp == null ? right : new BinaryOperatorExpression (binOp, BinaryOperatorType.ExclusiveOr, right);
+//				}
+//				var uncheckedBlock = new BlockStatement ();
+//				uncheckedBlock.Statements.Add (new ReturnStatement (binOp));
+//
+//				methodDeclaration.Body.Statements.Add (new UncheckedStatement (uncheckedBlock));
+//				yield return methodDeclaration.ToString ();
+//			}
+//		}
+//	}
+//}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs
index 4eb780329e..10f8682db0 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs
@@ -25,20 +25,20 @@
 // THE SOFTWARE.
 using Gtk;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
 using MonoDevelop.CodeGeneration;
 using MonoDevelop.CSharp.Completion;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Refactoring;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.CodeGeneration
 {
 	abstract class BaseExportCodeGenerator : ICodeGenerator
 	{
-		public abstract bool IsValidMember (IMember member);
+		public abstract bool IsValidMember (ISymbol member);
 
 		#region ICodeGenerator implementation
 
@@ -70,106 +70,90 @@ namespace MonoDevelop.CodeGeneration
 
 		#endregion
 
-		public static bool HasProtocolAttribute (IType type, out string name)
-		{
-			foreach (var attrs in type.GetDefinition ().GetAttributes ()) {
-				if (attrs.AttributeType.Name == "ProtocolAttribute" && MonoCSharpCompletionEngine.IsFoundationNamespace (attrs.AttributeType.Namespace)) {
-					foreach (var na in attrs.NamedArguments) {
-						if (na.Key.Name != "Name")
-							continue;
-						name = na.Value.ConstantValue as string;
-						if (name != null)
-							return true;
-					}
-				}
-			}
-			name = null;
-			return false;
-		}
-
-		public static Attribute GenerateExportAttribute (RefactoringContext ctx, IMember member)
-		{
-			if (member == null)
-				return null;
-
-			bool useMonoTouchNamespace = false;
-			var exportAttribute = member.GetAttribute (new FullTypeName (new TopLevelTypeName ("Foundation", "ExportAttribute")));
-			if (exportAttribute == null) {
-				useMonoTouchNamespace = true;
-				exportAttribute = member.GetAttribute (new FullTypeName (new TopLevelTypeName ("MonoTouch.Foundation", "ExportAttribute")));
-			}
-
-			if (exportAttribute == null || exportAttribute.PositionalArguments.Count == 0)
-				return null;
 
-			var astType = useMonoTouchNamespace
-				? CreateMonoTouchExportAttributeAst (ctx)
-				: CreateUnifiedExportAttributeAst (ctx);
-
-			var attr = new Attribute {
-				Type = astType,
-			};
-
-			attr.Arguments.Add (new PrimitiveExpression (exportAttribute.PositionalArguments [0].ConstantValue)); 
-			return attr;
-		}
-
-		static AstType CreateUnifiedExportAttributeAst (RefactoringContext ctx)
-		{
-			var astType = ctx.CreateShortType ("Foundation", "ExportAttribute");
-			if (astType is SimpleType) {
-				astType = new SimpleType ("Export");
-			} else {
-				astType = new MemberType (new SimpleType ("Foundation"), "Export");
-			}
-			return astType;
-		}
-
-		static AstType CreateMonoTouchExportAttributeAst (RefactoringContext ctx)
-		{
-			var astType = ctx.CreateShortType ("MonoTouch.Foundation", "ExportAttribute");
-			if (astType is SimpleType) {
-				astType = new SimpleType ("Export");
-			} else {
-				astType = new MemberType (new MemberType (new SimpleType ("MonoTouch"), "Foundation"), "Export");
-			}
-			return astType;
-		}
-
-		static IMember GetProtocolMember (RefactoringContext ctx, IType protocolType, IMember member)
-		{
-			foreach (var m in protocolType.GetMembers (m => m.SymbolKind == member.SymbolKind && m.Name == member.Name)) {
-				if (!SignatureComparer.Ordinal.Equals (m, member))
-					return null;
-				var prop = m as IProperty;
-				if (prop != null) {
-					if (prop.CanGet && GenerateExportAttribute (ctx, prop.Getter) != null ||
-						prop.CanSet && GenerateExportAttribute (ctx, prop.Setter) != null)
-						return m;
-				} else {
-					if (GenerateExportAttribute (ctx, m) != null)
-						return m;
-				}
-			}
-			return null;
-		}
-
-		static string GetProtocol (IMember member)
+//		public static Attribute GenerateExportAttribute (RefactoringContext ctx, IMember member)
+//		{
+//			if (member == null)
+//				return null;
+//
+//			bool useMonoTouchNamespace = false;
+//			var exportAttribute = member.GetAttribute (new FullTypeName (new TopLevelTypeName ("Foundation", "ExportAttribute")));
+//			if (exportAttribute == null) {
+//				useMonoTouchNamespace = true;
+//				exportAttribute = member.GetAttribute (new FullTypeName (new TopLevelTypeName ("MonoTouch.Foundation", "ExportAttribute")));
+//			}
+//
+//			if (exportAttribute == null || exportAttribute.PositionalArguments.Count == 0)
+//				return null;
+//
+//			var astType = useMonoTouchNamespace
+//				? CreateMonoTouchExportAttributeAst (ctx)
+//				: CreateUnifiedExportAttributeAst (ctx);
+//
+//			var attr = new Attribute {
+//				Type = astType,
+//			};
+//
+//			attr.Arguments.Add (new PrimitiveExpression (exportAttribute.PositionalArguments [0].ConstantValue)); 
+//			return attr;
+//		}
+//
+//		static AstType CreateUnifiedExportAttributeAst (RefactoringContext ctx)
+//		{
+//			var astType = ctx.CreateShortType ("Foundation", "ExportAttribute");
+//			if (astType is SimpleType) {
+//				astType = new SimpleType ("Export");
+//			} else {
+//				astType = new MemberType (new SimpleType ("Foundation"), "Export");
+//			}
+//			return astType;
+//		}
+//
+//		static AstType CreateMonoTouchExportAttributeAst (RefactoringContext ctx)
+//		{
+//			var astType = ctx.CreateShortType ("MonoTouch.Foundation", "ExportAttribute");
+//			if (astType is SimpleType) {
+//				astType = new SimpleType ("Export");
+//			} else {
+//				astType = new MemberType (new MemberType (new SimpleType ("MonoTouch"), "Foundation"), "Export");
+//			}
+//			return astType;
+//		}
+//
+//		static IMember GetProtocolMember (RefactoringContext ctx, IType protocolType, IMember member)
+//		{
+//			foreach (var m in protocolType.GetMembers (m => m.SymbolKind == member.SymbolKind && m.Name == member.Name)) {
+//				if (!SignatureComparer.Ordinal.Equals (m, member))
+//					return null;
+//				var prop = m as IProperty;
+//				if (prop != null) {
+//					if (prop.CanGet && GenerateExportAttribute (ctx, prop.Getter) != null ||
+//						prop.CanSet && GenerateExportAttribute (ctx, prop.Setter) != null)
+//						return m;
+//				} else {
+//					if (GenerateExportAttribute (ctx, m) != null)
+//						return m;
+//				}
+//			}
+//			return null;
+//		}
+//
+		static string GetProtocol (ISymbol member)
 		{
-			var attr = member.Attributes.FirstOrDefault (a => a.AttributeType.Name == "ExportAttribute" && MonoCSharpCompletionEngine.IsFoundationNamespace (a.AttributeType.Namespace));
-			if (attr == null || attr.PositionalArguments.Count == 0)
+			var attr = member.GetAttributes ().FirstOrDefault (a => a.AttributeClass.Name == "ExportAttribute" && ProtocolMemberContextHandler.IsFoundationNamespace (a.AttributeClass.ContainingNamespace));
+			if (attr == null || attr.ConstructorArguments.Length == 0)
 				return null;
-			return attr.PositionalArguments.First ().ConstantValue.ToString ();
+			return attr.ConstructorArguments.First ().Value.ToString ();
 		}
 
-		public static bool IsImplemented (IType type, IMember protocolMember)
+		public static bool IsImplemented (ITypeSymbol type, ISymbol protocolMember)
 		{
-			foreach (var m in type.GetMembers (m => m.SymbolKind == protocolMember.SymbolKind && m.Name == protocolMember.Name)) {
-				var p = m as IProperty;
+			foreach (var m in type.GetMembers().Where (m => m.Kind == protocolMember.Kind && m.Name == protocolMember.Name)) {
+				var p = m as IPropertySymbol;
 				if (p != null) {
-					if (p.CanGet && ((IProperty)protocolMember).CanGet && GetProtocol (p.Getter) == GetProtocol (((IProperty)protocolMember).Getter))
+					if (p.GetMethod != null && ((IPropertySymbol)protocolMember).GetMethod != null && GetProtocol (p.GetMethod) == GetProtocol (((IPropertySymbol)protocolMember).GetMethod))
 						return true;
-					if (p.CanSet && ((IProperty)protocolMember).CanSet && GetProtocol (p.Setter) == GetProtocol (((IProperty)protocolMember).Setter))
+					if (p.SetMethod != null && ((IPropertySymbol)protocolMember).SetMethod != null && GetProtocol (p.SetMethod) == GetProtocol (((IPropertySymbol)protocolMember).SetMethod))
 						return true;
 					continue;
 				}
@@ -194,32 +178,32 @@ namespace MonoDevelop.CodeGeneration
 				var type = Options.EnclosingType;
 				if (type == null || Options.EnclosingMember != null)
 					yield break;
-				foreach (var t in type.DirectBaseTypes) {
+				foreach (var t in type.GetBaseTypes ()) {
 					string name;
-					if (!HasProtocolAttribute (t, out name))
+					if (!ProtocolMemberContextHandler.HasProtocolAttribute (t, out name))
 						continue;
-					var protocolType = Options.Document.Compilation.FindType (new FullTypeName (new TopLevelTypeName (t.Namespace, name)));
+					var protocolType = Options.CurrentState.Compilation.GetTypeByMetadataName (t.ContainingNamespace.GetFullName () + "." + name);
 					if (protocolType == null)
 						break;
-					foreach (var member in protocolType.GetMethods (null, GetMemberOptions.IgnoreInheritedMembers)) {
-						if (member.ImplementedInterfaceMembers.Any ())
+					foreach (var member in protocolType.GetMembers().OfType<IMethodSymbol>()) {
+						if (member.ExplicitInterfaceImplementations.Length > 0)
 							continue;
 						if (!cg.IsValidMember (member))
 							continue;
 						if (IsImplemented (type, member))
 							continue;
-						if (member.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" && MonoCSharpCompletionEngine.IsFoundationNamespace (a.AttributeType.Namespace)))
+						if (member.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && ProtocolMemberContextHandler.IsFoundationNamespace (a.AttributeClass.ContainingNamespace)))
 							yield return member;
 					}
-					foreach (var member in protocolType.GetProperties (null, GetMemberOptions.IgnoreInheritedMembers)) {
-						if (member.ImplementedInterfaceMembers.Any ())
+					foreach (var member in protocolType.GetMembers().OfType<IPropertySymbol>()) {
+						if (member.ExplicitInterfaceImplementations.Length > 0)
 							continue;
 						if (!cg.IsValidMember (member))
 							continue;
 						if (IsImplemented (type, member))
 							continue;
-						if (member.CanGet && member.Getter.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" &&  MonoCSharpCompletionEngine.IsFoundationNamespace (a.AttributeType.Namespace)) ||
-							member.CanSet && member.Setter.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" &&  MonoCSharpCompletionEngine.IsFoundationNamespace (a.AttributeType.Namespace)))
+						if (member.GetMethod != null && member.GetMethod.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && ProtocolMemberContextHandler.IsFoundationNamespace (a.AttributeClass.ContainingNamespace)) ||
+							member.SetMethod != null && member.SetMethod.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && ProtocolMemberContextHandler.IsFoundationNamespace (a.AttributeClass.ContainingNamespace)))
 							yield return member;
 					}
 				}
@@ -227,63 +211,11 @@ namespace MonoDevelop.CodeGeneration
 
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				var ctx = MDRefactoringContext.Create (Options.Document, Options.Document.Editor.Caret.Location).Result;
-				if (ctx == null)
-					yield break;
-				var builder = ctx.CreateTypeSystemAstBuilder ();
-
-				foreach (IMember member in includedMembers) {
-					yield return GenerateMemberCode (ctx, builder, member);
+				foreach (ISymbol member in includedMembers) {
+					yield return CSharpCodeGenerator.CreateProtocolMemberImplementation (Options.DocumentContext, Options.Editor, Options.EnclosingType, Options.EnclosingPart.GetLocation (), member, false, null).Code;
 				}
 			}
 		}
-	
-		internal static string GenerateMemberCode (MDRefactoringContext ctx, TypeSystemAstBuilder builder, IMember member)
-		{
-			var method = builder.ConvertEntity (member) as MethodDeclaration;
-			if (method != null) {
-				method.Body = new BlockStatement {
-					new ThrowStatement (new ObjectCreateExpression (ctx.CreateShortType ("System", "NotImplementedException")))
-				};
-				method.Modifiers &= ~Modifiers.Virtual;
-				method.Modifiers &= ~Modifiers.Abstract;
-				method.Attributes.Add (new AttributeSection {
-					Attributes =  {
-						GenerateExportAttribute (ctx, member)
-					}
-				});
-				return method.ToString (ctx.FormattingOptions);
-			}
-			var property = builder.ConvertEntity (member) as PropertyDeclaration;
-			if (property == null)
-				return null;
-			var p = (IProperty)member;
-			property.Modifiers &= ~Modifiers.Virtual;
-			property.Modifiers &= ~Modifiers.Abstract;
-			if (p.CanGet) {
-				property.Getter.Body = new BlockStatement {
-					new ThrowStatement (new ObjectCreateExpression (ctx.CreateShortType ("System", "NotImplementedException")))
-				};
-				property.Getter.Attributes.Add (new AttributeSection {
-					Attributes =  {
-						GenerateExportAttribute (ctx, p.Getter)
-					}
-				});
-			}
-			if (p.CanSet) {
-				property.Setter.Body = new BlockStatement {
-					new ThrowStatement (new ObjectCreateExpression (ctx.CreateShortType ("System", "NotImplementedException")))
-				};
-				property.Setter.Attributes.Add (new AttributeSection {
-					Attributes =  {
-						GenerateExportAttribute (ctx, p.Setter)
-					}
-				});
-			}
-			return property.ToString (ctx.FormattingOptions);
-		}
 	}
 
 	class OptionalProtocolMemberGenerator : BaseExportCodeGenerator
@@ -300,7 +232,7 @@ namespace MonoDevelop.CodeGeneration
 			}
 		}
 
-		public override bool IsValidMember (IMember member)
+		public override bool IsValidMember (ISymbol member)
 		{
 			return !member.IsAbstract;
 		}
@@ -320,11 +252,9 @@ namespace MonoDevelop.CodeGeneration
 			}
 		}
 
-		public override bool IsValidMember (IMember member)
+		public override bool IsValidMember (ISymbol member)
 		{
 			return member.IsAbstract;
 		}
 	}
-
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs
index a96cc7cc11..600d197bab 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs
@@ -31,7 +31,7 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Refactoring;
 using System.Collections.Generic;
 using MonoDevelop.Ide;
-using Mono.TextEditor.PopupWindow;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -134,10 +134,10 @@ namespace MonoDevelop.CodeGeneration
 			GetSize (out w, out h);
 			
 			int myMonitor = Screen.GetMonitorAtPoint (x, y);
-			Gdk.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen, myMonitor);
+			Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, myMonitor);
 
 			if (x + w > geometry.Right)
-				x = geometry.Right - w;
+				x = (int)geometry.Right - w;
 
 			if (y + h > geometry.Bottom)
 				y = y - completionContext.TriggerTextHeight - h;
@@ -174,9 +174,9 @@ namespace MonoDevelop.CodeGeneration
 			}
 		}
 		
-		public static void ShowIfValid (Document document, MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext)
+		public static void ShowIfValid (TextEditor editor, DocumentContext context, MonoDevelop.Ide.CodeCompletion.CodeCompletionContext completionContext)
 		{
-			var options = CodeGenerationOptions.CreateCodeGenerationOptions (document);
+			var options = CodeGenerationOptions.CreateCodeGenerationOptions (editor, context);
 			
 			var validGenerators = new List<ICodeGenerator> ();
 			foreach (var generator in CodeGenerationService.CodeGenerators) {
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ICodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ICodeGenerator.cs
index b70422665b..f0d64d40ba 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ICodeGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ICodeGenerator.cs
@@ -31,7 +31,7 @@ using Mono.Addins;
 
 namespace MonoDevelop.CodeGeneration
 {
-	public interface ICodeGenerator
+	internal interface ICodeGenerator
 	{
 		string Icon {
 			get;
@@ -50,14 +50,14 @@ namespace MonoDevelop.CodeGeneration
 		IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView);
 	}
 	
-	public interface IGenerateAction 
+	interface IGenerateAction 
 	{
 		void GenerateCode ();
 	}
 	
 	static class CodeGenerationService
 	{
-		static List<ICodeGenerator> codeGenerators = new List<ICodeGenerator>();
+		static readonly List<ICodeGenerator> codeGenerators = new List<ICodeGenerator>();
 		
 		static CodeGenerationService ()
 		{
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ImplementInterfaceMembersGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ImplementInterfaceMembersGenerator.cs
index 7646b4002f..caf0bbe4e9 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ImplementInterfaceMembersGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ImplementInterfaceMembersGenerator.cs
@@ -1,101 +1,100 @@
+////
+//// ImplementInterfaceMembersGenerator.cs
+////
+//// Author:
+////       Mike Krüger <mkrueger@xamarin.com>
+////
+//// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+////
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+////
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+////
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//using Gtk;
+//using System.Collections.Generic;
+//using MonoDevelop.Core;
+//using MonoDevelop.Refactoring;
+//using ICSharpCode.NRefactory.CSharp;
+//using ICSharpCode.NRefactory.TypeSystem;
+//using MonoDevelop.Ide.TypeSystem;
+//using System;
 //
-// ImplementInterfaceMembersGenerator.cs
+//namespace MonoDevelop.CodeGeneration
+//{
+//	class ImplementInterfaceMembersGenerator : ICodeGenerator
+//	{
+//		public string Icon {
+//			get {
+//				return "md-method";
+//			}
+//		}
+//		
+//		public string Text {
+//			get {
+//				return GettextCatalog.GetString ("Implement interface members");
+//			}
+//		}
+//		
+//		public string GenerateDescription {
+//			get {
+//				return GettextCatalog.GetString ("Select members to be implemented.");
+//			}
+//		}
+//		
+//		public bool IsValid (CodeGenerationOptions options)
+//		{
+//			return new OverrideMethods (options).IsValid ();
+//		}
+//		
+//		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
+//		{
+//			OverrideMethods overrideMethods = new OverrideMethods (options);
+//			overrideMethods.Initialize (treeView);
+//			return overrideMethods;
+//		}
+//		
+//		class OverrideMethods : AbstractGenerateAction
+//		{
+//			public OverrideMethods (CodeGenerationOptions options) : base (options)
+//			{
+//			}
+//			
+//			protected override IEnumerable<object> GetValidMembers ()
+//			{
+//				var type = Options.EnclosingType;
+//				if (type == null || Options.EnclosingMember != null)
+//					yield break;
 //
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
+//				foreach (var baseType in Options.EnclosingType.Interfaces) {
+//					bool ifm;
+////					foreach (var t in ICSharpCode.NRefactory.CSharp.Refactoring.ImplementInterfaceAction.CollectMembersToImplement (type, baseType, false, out ifm)) {
+////						yield return t;
+////					}
+//				}
+//			}
+//			
+//			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
+//			{
+//				var generator = Options.CreateCodeGenerator ();
+//				generator.AutoIndent = false;
+//				foreach (Tuple<IMember, bool> member in includedMembers)
+//					yield return "";
+//					//					yield return generator.CreateMemberImplementation (Options.EnclosingType, Options.EnclosingPart, member.Item1, member.Item2).Code;
+//			}
+//		}
+//	}
+//}
 //
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using Gtk;
-using System.Collections.Generic;
-using MonoDevelop.Core;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using System;
-
-namespace MonoDevelop.CodeGeneration
-{
-	class ImplementInterfaceMembersGenerator : ICodeGenerator
-	{
-		public string Icon {
-			get {
-				return "md-method";
-			}
-		}
-		
-		public string Text {
-			get {
-				return GettextCatalog.GetString ("Implement interface members");
-			}
-		}
-		
-		public string GenerateDescription {
-			get {
-				return GettextCatalog.GetString ("Select members to be implemented.");
-			}
-		}
-		
-		public bool IsValid (CodeGenerationOptions options)
-		{
-			return new OverrideMethods (options).IsValid ();
-		}
-		
-		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
-		{
-			OverrideMethods overrideMethods = new OverrideMethods (options);
-			overrideMethods.Initialize (treeView);
-			return overrideMethods;
-		}
-		
-		class OverrideMethods : AbstractGenerateAction
-		{
-			public OverrideMethods (CodeGenerationOptions options) : base (options)
-			{
-			}
-			
-			protected override IEnumerable<object> GetValidMembers ()
-			{
-				var type = Options.EnclosingType;
-				if (type == null || Options.EnclosingMember != null)
-					yield break;
-
-				foreach (var baseType in Options.EnclosingType.DirectBaseTypes) {
-					if (baseType.Kind != TypeKind.Interface)
-						continue;
-					bool ifm;
-					foreach (var t in ICSharpCode.NRefactory.CSharp.Refactoring.ImplementInterfaceAction.CollectMembersToImplement (type, baseType, false, out ifm)) {
-						yield return t;
-					}
-				}
-			}
-			
-			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
-			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				foreach (Tuple<IMember, bool> member in includedMembers) 
-					yield return generator.CreateMemberImplementation (Options.EnclosingType, Options.EnclosingPart, member.Item1, member.Item2).Code;
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/OverrideMembersGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/OverrideMembersGenerator.cs
index 57b241976a..8d1b747b4b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/OverrideMembersGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/OverrideMembersGenerator.cs
@@ -28,8 +28,11 @@ using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Core;
 using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Refactoring;
 using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.CodeGeneration
@@ -41,62 +44,105 @@ namespace MonoDevelop.CodeGeneration
 				return "md-method";
 			}
 		}
-		
+
 		public string Text {
 			get {
 				return GettextCatalog.GetString ("Override members");
 			}
 		}
-		
+
 		public string GenerateDescription {
 			get {
 				return GettextCatalog.GetString ("Select members to be overridden.");
 			}
 		}
-		
+
 		public bool IsValid (CodeGenerationOptions options)
 		{
 			return new OverrideMethods (options).IsValid ();
 		}
-		
+
 		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
 		{
 			OverrideMethods overrideMethods = new OverrideMethods (options);
 			overrideMethods.Initialize (treeView);
 			return overrideMethods;
 		}
-		
+
 		class OverrideMethods : AbstractGenerateAction
 		{
 			public OverrideMethods (CodeGenerationOptions options) : base (options)
 			{
 			}
-			
+
 			protected override IEnumerable<object> GetValidMembers ()
 			{
-				var type = Options.EnclosingType;
-				if (type == null || Options.EnclosingMember != null)
-					yield break;
-				HashSet<string> memberName = new HashSet<string> ();
-				foreach (var member in Options.EnclosingType.GetMembers ()) {
-					if (member.IsSynthetic)
-						continue;
-					if (member.IsOverridable) {
-						string id = AmbienceService.DefaultAmbience.GetString (member, OutputFlags.ClassBrowserEntries);
-						if (memberName.Contains (id))
-							continue;
-						memberName.Add (id);
-						yield return member;
+				var encType = Options.EnclosingType as INamedTypeSymbol;
+				if (encType == null || Options.EnclosingMember != null)
+					return Enumerable.Empty<object> ();
+
+
+				var result = new HashSet<ISymbol> ();
+				var cancellationToken = default(CancellationToken);
+				var baseTypes = encType.GetBaseTypes ().Reverse ();
+				foreach (var type in baseTypes) {
+					RemoveOverriddenMembers (result, type, cancellationToken);
+
+					AddOverridableMembers (result, encType, type, cancellationToken);
+				}
+				RemoveOverriddenMembers (result, encType, cancellationToken);
+				return result;
+			}
+
+			static void AddOverridableMembers (HashSet<ISymbol> result, INamedTypeSymbol containingType, INamedTypeSymbol type, CancellationToken cancellationToken)
+			{
+				foreach (var member in type.GetMembers()) {
+					if (IsOverridable (member, containingType)) {
+						result.Add (member);
+					}
+				}
+			}
+
+			protected static void RemoveOverriddenMembers (HashSet<ISymbol> result, INamedTypeSymbol containingType, CancellationToken cancellationToken)
+			{
+				foreach (var member in containingType.GetMembers()) {
+					var overriddenMember = member.OverriddenMember ();
+					if (overriddenMember != null) {
+						result.Remove (overriddenMember);
 					}
 				}
 			}
-			
+
+			public static bool IsOverridable (ISymbol member, INamedTypeSymbol containingType)
+			{
+				if (member.IsAbstract || member.IsVirtual || member.IsOverride) {
+					if (member.IsSealed) {
+						return false;
+					}
+
+					if (!member.IsAccessibleWithin (containingType)) {
+						return false;
+					}
+
+					switch (member.Kind) {
+					case SymbolKind.Event:
+						return true;
+					case SymbolKind.Method:
+						return ((IMethodSymbol)member).MethodKind == MethodKind.Ordinary;
+					case SymbolKind.Property:
+						return !((IPropertySymbol)member).IsWithEvents;
+					}
+				}
+				return false;
+			}
+
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				foreach (IMember member in includedMembers) 
-					yield return generator.CreateMemberImplementation (Options.EnclosingType, Options.EnclosingPart, member, false).Code;
+				var currentType = Options.EnclosingType as INamedTypeSymbol;
+
+				foreach (ISymbol member in includedMembers) {
+					yield return CSharpCodeGenerator.CreateOverridenMemberImplementation (Options.DocumentContext, Options.Editor, currentType, currentType.Locations.First (), member, false, null).Code;
+				}
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PartialGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PartialGenerator.cs
index fbde16fec2..c2329223d2 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PartialGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PartialGenerator.cs
@@ -23,11 +23,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System;
+
+using System.Linq;
 using System.Collections.Generic;
 using Gtk;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Core;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.Refactoring;
 using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.CodeGeneration
@@ -76,21 +79,37 @@ namespace MonoDevelop.CodeGeneration
 				if (type == null || Options.EnclosingMember != null)
 					yield break;
 
-				foreach (var method in Options.EnclosingType.Methods) {
-					if (method.IsPartial && method.BodyRegion.IsEmpty) {
+				foreach (var method in Options.EnclosingType.GetMembers ().OfType<Microsoft.CodeAnalysis.IMethodSymbol> ()) {
+					if (method.MethodKind != Microsoft.CodeAnalysis.MethodKind.Ordinary)
+						continue;
+					if (IsEmptyPartialMethod(method)) {
 						yield return method;
 					}
 				}	
 			}
 
+			static bool IsEmptyPartialMethod(Microsoft.CodeAnalysis.ISymbol member, CancellationToken cancellationToken = default(CancellationToken))
+			{
+				var method = member as Microsoft.CodeAnalysis.IMethodSymbol;
+				if (method == null || method.IsDefinedInMetadata ())
+					return false;
+				foreach (var r in method.DeclaringSyntaxReferences) {
+					var node = r.GetSyntax (cancellationToken) as Microsoft.CodeAnalysis.CSharp.Syntax.MethodDeclarationSyntax;
+					if (node == null)
+						continue;
+					if (node.Body != null || !node.Modifiers.Any(m => m.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.PartialKeyword)))
+						return false;
+				}
+
+				return true;
+			}
+
+
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				foreach (IMethod member in includedMembers) 
-					yield return generator.CreateMemberImplementation (Options.EnclosingType, Options.EnclosingPart, member, false).Code;
+				foreach (Microsoft.CodeAnalysis.IMethodSymbol member in includedMembers)
+					yield return CSharpCodeGenerator.CreatePartialMemberImplementation (Options.DocumentContext, Options.Editor, Options.EnclosingType, Options.EnclosingPart.GetLocation (), member, false, null).Code;
 			}
 		}
 	}
 }
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PropertyGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PropertyGenerator.cs
index b8829e58e7..c658adc37b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PropertyGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/PropertyGenerator.cs
@@ -25,16 +25,15 @@
 // THE SOFTWARE.
 
 using System;
-
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using Gtk;
+using System.Linq;
 using System.Collections.Generic;
-using MonoDevelop.Refactoring;
 using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -86,19 +85,19 @@ namespace MonoDevelop.CodeGeneration
 			{
 				if (Options.EnclosingType == null || Options.EnclosingMember != null)
 					yield break;
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
+				foreach (var field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+					if (field.IsImplicitlyDeclared)
 						continue;
-					var list = Options.EnclosingType.Fields.Where (f => f.Name == CreatePropertyName (field));;
+					var list = Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ().Where (f => f.Name == CreatePropertyName (field));
 					if (!list.Any ())
 						yield return field;
 				}
 			}
 			
-			static string CreatePropertyName (IMember member)
+			static string CreatePropertyName (ISymbol member)
 			{
 				int i = 0;
-				while (i + 1 < member.Name.Length && member.Name[i] == '_')
+				while (i + 1 < member.Name.Length && member.Name [i] == '_')
 					i++;
 				if (i + 1 >= member.Name.Length)
 					return char.ToUpper (member.Name [i]).ToString ();
@@ -107,10 +106,49 @@ namespace MonoDevelop.CodeGeneration
 			
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				var generator = Options.CreateCodeGenerator ();
-				generator.AutoIndent = false;
-				foreach (IField field in includedMembers)
-					yield return generator.CreateFieldEncapsulation (Options.EnclosingPart, field, CreatePropertyName (field), Accessibility.Public, ReadOnly);
+				foreach (IFieldSymbol field in includedMembers) {
+					var node = SyntaxFactory.PropertyDeclaration (
+						CreateConstructorGenerator.ConvertType (field.Type),
+						CreatePropertyName (field)
+					);
+
+					node = node.AddAccessorListAccessors (
+						SyntaxFactory.AccessorDeclaration (
+							SyntaxKind.GetAccessorDeclaration, 
+							SyntaxFactory.Block (
+								SyntaxFactory.ReturnStatement (
+									SyntaxFactory.MemberAccessExpression (
+										SyntaxKind.SimpleMemberAccessExpression,
+										SyntaxFactory.ThisExpression (),
+										SyntaxFactory.IdentifierName (field.Name)
+									)
+								)
+							)
+						)
+					);
+					if (!ReadOnly) {
+						node = node.AddAccessorListAccessors (
+							SyntaxFactory.AccessorDeclaration (
+								SyntaxKind.SetAccessorDeclaration, 
+								SyntaxFactory.Block (
+									SyntaxFactory.ExpressionStatement (
+										SyntaxFactory.AssignmentExpression (
+											SyntaxKind.SimpleAssignmentExpression,
+											SyntaxFactory.MemberAccessExpression (
+												SyntaxKind.SimpleMemberAccessExpression,
+												SyntaxFactory.ThisExpression (),
+												SyntaxFactory.IdentifierName (field.Name)
+											),
+											SyntaxFactory.IdentifierName ("value")
+										)
+									)
+								)
+							)
+						);
+					}
+					yield return Options.OutputNode (node).Result;
+				}
+
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/RaiseEventMethodGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/RaiseEventMethodGenerator.cs
index 76b0f7bd57..ef38ac7adc 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/RaiseEventMethodGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/RaiseEventMethodGenerator.cs
@@ -25,15 +25,18 @@
 // THE SOFTWARE.
 using System;
 
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Refactoring;
 using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -77,7 +80,7 @@ namespace MonoDevelop.CodeGeneration
 			{
 			}
 
-			static string GetEventMethodName (IMember member)
+			static string GetEventMethodName (ISymbol member)
 			{
 				return "On" + member.Name;
 			}
@@ -86,13 +89,13 @@ namespace MonoDevelop.CodeGeneration
 			{
 				if (Options.EnclosingType == null || Options.EnclosingMember != null)
 					yield break;
-				foreach (var e in Options.EnclosingType.Events) {
-					if (e.IsSynthetic)
+				foreach (IEventSymbol e in Options.EnclosingType.GetMembers ().OfType<IEventSymbol> ()) {
+					if (e.IsImplicitlyDeclared)
 						continue;
-					var invokeMethod = e.ReturnType.GetDelegateInvokeMethod ();
+					var invokeMethod = e.GetReturnType ().GetDelegateInvokeMethod ();
 					if (invokeMethod == null)
 						continue;
-					if (Options.EnclosingType.GetMethods (m => m.Name == GetEventMethodName (e)).Any ())
+					if (Options.EnclosingType.GetMembers ().OfType<IMethodSymbol> ().Any (m => m.Name == GetEventMethodName (e)))
 						continue;
 					yield return e;
 				}
@@ -100,40 +103,89 @@ namespace MonoDevelop.CodeGeneration
 
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				foreach (IMember member in includedMembers) {
-					var invokeMethod = member.ReturnType.GetDelegateInvokeMethod ();
+				foreach (IEventSymbol member in includedMembers) {
+					var invokeMethod = member.GetReturnType ().GetDelegateInvokeMethod ();
 					if (invokeMethod == null)
 						continue;
 
-					var methodDeclaration = new MethodDeclaration () {
-						Name = GetEventMethodName (member),
-						ReturnType = new PrimitiveType ("void"),
-						Modifiers = Modifiers.Protected | Modifiers.Virtual,
-						Parameters = {
-							new ParameterDeclaration (Options.CreateShortType (invokeMethod.Parameters [1].Type), invokeMethod.Parameters [1].Name)
-						},
-						Body = new BlockStatement () {
-							new VariableDeclarationStatement (
-								new SimpleType ("var"),//Options.CreateShortType (member.ReturnType), 
-								handlerName, 
-								new MemberReferenceExpression (new ThisReferenceExpression (), member.Name)
-							),
-							new IfElseStatement () {
-								Condition = new BinaryOperatorExpression (new IdentifierExpression (handlerName), BinaryOperatorType.InEquality, new PrimitiveExpression (null)),
-								TrueStatement = new ExpressionStatement (new InvocationExpression (new IdentifierExpression (handlerName)) {
-									Arguments = {
-										new ThisReferenceExpression (),
-										new IdentifierExpression (invokeMethod.Parameters [1].Name)
-									}
-								})
-							}
-						}
-					};
+					var node = SyntaxFactory.MethodDeclaration (
+						SyntaxFactory.PredefinedType (SyntaxFactory.Token (SyntaxKind.VoidKeyword)),
+						SyntaxFactory.Identifier (GetEventMethodName (member))
+					);
+
+					node = node.WithModifiers (SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword), SyntaxFactory.Token (SyntaxKind.VirtualKeyword)));
+					node = node.WithParameterList (SyntaxFactory.ParameterList (SyntaxFactory.SeparatedList<ParameterSyntax> (new [] {
+						SyntaxFactory.Parameter (SyntaxFactory.Identifier (invokeMethod.Parameters [1].Name)).WithType (SyntaxFactory.ParseTypeName (Options.CreateShortType (invokeMethod.Parameters [1].Type)))
+					})));
 
-					yield return methodDeclaration.ToString (Options.FormattingOptions);
+					bool csharp6Style = true;
+					;
+					if (csharp6Style) {
+						var expressionSyntax = SyntaxFactory.ParseExpression ("foo?.bar") as ConditionalAccessExpressionSyntax;
+						Console.WriteLine (expressionSyntax.OperatorToken.Kind ());
+						Console.WriteLine (expressionSyntax.Expression.GetType ());
+						Console.WriteLine (expressionSyntax.WhenNotNull.GetType ());
+						node = node.WithBody (SyntaxFactory.Block (
+							SyntaxFactory.ExpressionStatement (
+								SyntaxFactory.InvocationExpression (
+									SyntaxFactory.ConditionalAccessExpression (
+										SyntaxFactory.MemberAccessExpression (
+											SyntaxKind.SimpleMemberAccessExpression,
+											SyntaxFactory.ThisExpression (),
+											SyntaxFactory.IdentifierName (member.Name)
+										),
+										SyntaxFactory.MemberBindingExpression (SyntaxFactory.IdentifierName ("Invoke"))
+									),
+									SyntaxFactory.ArgumentList (
+										SyntaxFactory.SeparatedList<ArgumentSyntax> (new [] {
+											SyntaxFactory.Argument (SyntaxFactory.ThisExpression ()),
+											SyntaxFactory.Argument (SyntaxFactory.IdentifierName (invokeMethod.Parameters [1].Name))
+										})
+									)
+								)
+							)
+						));
+					} else {
+						node = node.WithBody (SyntaxFactory.Block (
+							SyntaxFactory.LocalDeclarationStatement (
+								SyntaxFactory.VariableDeclaration (
+									SyntaxFactory.ParseTypeName ("var"),
+									SyntaxFactory.SeparatedList<VariableDeclaratorSyntax> (new [] {
+										SyntaxFactory.VariableDeclarator (SyntaxFactory.Identifier (handlerName)).WithInitializer (
+											SyntaxFactory.EqualsValueClause (
+												SyntaxFactory.MemberAccessExpression (
+													SyntaxKind.SimpleMemberAccessExpression,
+													SyntaxFactory.ThisExpression (),
+													SyntaxFactory.IdentifierName (member.Name)
+												)
+											)
+										)
+									})
+								)
+							),
+							SyntaxFactory.IfStatement (
+								SyntaxFactory.BinaryExpression (
+									SyntaxKind.NotEqualsExpression,
+									SyntaxFactory.IdentifierName (handlerName),
+									SyntaxFactory.ParseExpression ("null")
+								),
+								SyntaxFactory.ExpressionStatement (
+									SyntaxFactory.InvocationExpression (
+										SyntaxFactory.IdentifierName (handlerName), 
+										SyntaxFactory.ArgumentList (
+											SyntaxFactory.SeparatedList<ArgumentSyntax> (new [] {
+												SyntaxFactory.Argument (SyntaxFactory.ThisExpression ()),
+												SyntaxFactory.Argument (SyntaxFactory.IdentifierName (invokeMethod.Parameters [1].Name))
+											})
+										)
+									)
+								)
+							)
+						));
+					}
+					yield return Options.OutputNode (node).Result;
 				}
 			}
 		}
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ReadonlyPropertyGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ReadonlyPropertyGenerator.cs
index 928ddb1fab..d6b71bcc5f 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ReadonlyPropertyGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ReadonlyPropertyGenerator.cs
@@ -25,14 +25,12 @@
 // THE SOFTWARE.
 using System;
 
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using Gtk;
 using System.Collections.Generic;
 using MonoDevelop.Refactoring;
 using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
 
 namespace MonoDevelop.CodeGeneration
@@ -70,4 +68,4 @@ namespace MonoDevelop.CodeGeneration
 			return createProperty;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ToStringGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ToStringGenerator.cs
index 9d7913d8ae..516a34c15c 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ToStringGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ToStringGenerator.cs
@@ -7,7 +7,7 @@
 // Copyright (c) 2009 Novell, Inc (http://www.novell.com)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
+// of this software and associated documentation files (the "Software" ), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
@@ -25,75 +25,79 @@
 // THE SOFTWARE.
 
 using System;
-using MonoDevelop.Components;
-using Gtk;
-using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
 using System.Text;
 using MonoDevelop.Core;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
 
 namespace MonoDevelop.CodeGeneration
 {
 	class ToStringGenerator : ICodeGenerator
 	{
-		public string Icon {
-			get {
+		public string Icon
+		{
+			get
+			{
 				return "md-newmethod";
 			}
 		}
-		
-		public string Text {
-			get {
+
+		public string Text
+		{
+			get
+			{
 				return GettextCatalog.GetString ("ToString() implementation");
 			}
 		}
-		
-		public string GenerateDescription {
-			get {
+
+		public string GenerateDescription
+		{
+			get
+			{
 				return GettextCatalog.GetString ("Select members to be outputted.");
 			}
 		}
-		
+
 		public bool IsValid (CodeGenerationOptions options)
 		{
 			return new CreateToString (options).IsValid ();
 		}
-		
+
 		public IGenerateAction InitalizeSelection (CodeGenerationOptions options, Gtk.TreeView treeView)
 		{
 			CreateToString createToString = new CreateToString (options);
 			createToString.Initialize (treeView);
 			return createToString;
 		}
-		
+
 		class CreateToString : AbstractGenerateAction
 		{
 			public CreateToString (CodeGenerationOptions options) : base (options)
 			{
 			}
-			
+
 			protected override IEnumerable<object> GetValidMembers ()
 			{
 				if (Options.EnclosingType == null || Options.EnclosingMember != null)
 					yield break;
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
+
+				foreach (var field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+					if (field.IsImplicitlyDeclared)
 						continue;
 					yield return field;
 				}
 
-				foreach (IProperty property in Options.EnclosingType.Properties) {
-					if (property.IsSynthetic)
+				foreach (var property in Options.EnclosingType.GetMembers ().OfType<IPropertySymbol> ()) {
+					if (property.IsImplicitlyDeclared)
 						continue;
-					if (property.CanGet)
+					if (property.GetMethod != null)
 						yield return property;
 				}
 			}
-			
+
 			string GetFormatString (IEnumerable<object> includedMembers)
 			{
 				var format = new StringBuilder ();
@@ -101,7 +105,7 @@ namespace MonoDevelop.CodeGeneration
 				format.Append (Options.EnclosingType.Name);
 				format.Append (": ");
 				int i = 0;
-				foreach (IEntity member in includedMembers) {
+				foreach (ISymbol member in includedMembers) {
 					if (i > 0)
 						format.Append (", ");
 					format.Append (member.Name);
@@ -112,22 +116,37 @@ namespace MonoDevelop.CodeGeneration
 				format.Append ("]");
 				return format.ToString ();
 			}
-			
+
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				yield return new MethodDeclaration () {
-					Name = "ToString",
-					ReturnType = new PrimitiveType ("string"),
-					Modifiers = Modifiers.Public | Modifiers.Override,
-					Body = new BlockStatement () {
-						new ReturnStatement (
-							new InvocationExpression (
-								new MemberReferenceExpression (new TypeReferenceExpression (new PrimitiveType ("string")), "Format"), 
-								new Expression [] { new PrimitiveExpression (GetFormatString (includedMembers)) }.Concat (includedMembers.Select (member => new IdentifierExpression (((IEntity)member).Name)))
+				List<ArgumentSyntax> arguments = new List<ArgumentSyntax> ();
+				arguments.Add (SyntaxFactory.Argument (SyntaxFactory.LiteralExpression (SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal (GetFormatString (includedMembers)))));
+				foreach (ISymbol member in includedMembers) {
+					arguments.Add (SyntaxFactory.Argument (SyntaxFactory.IdentifierName (member.Name)));
+				}
+				var node = SyntaxFactory.MethodDeclaration (
+					SyntaxFactory.List<AttributeListSyntax>(),
+					SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.PublicKeyword), SyntaxFactory.Token (SyntaxKind.OverrideKeyword)),
+					SyntaxFactory.ParseTypeName ("string"),
+					null,
+					SyntaxFactory.Identifier ("ToString"),
+					null,
+					SyntaxFactory.ParameterList (),
+					SyntaxFactory.List<TypeParameterConstraintClauseSyntax>(),
+					SyntaxFactory.Block (
+						SyntaxFactory.ReturnStatement (
+							SyntaxFactory.InvocationExpression (
+								SyntaxFactory.MemberAccessExpression (
+									SyntaxKind.SimpleMemberAccessExpression,
+									SyntaxFactory.ParseExpression ("string"),
+									SyntaxFactory.IdentifierName ("Format")
+								),
+								SyntaxFactory.ArgumentList (SyntaxFactory.SeparatedList<ArgumentSyntax> (arguments))
 							)
 						)
-					} 
-				}.ToString (Options.FormattingOptions);
+					),
+					null);
+				yield return Options.OutputNode (node).Result;
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/WriteLineGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/WriteLineGenerator.cs
index 3a47fe1d5e..f150e59a13 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/WriteLineGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/WriteLineGenerator.cs
@@ -25,15 +25,13 @@
 // THE SOFTWARE.
 
 using System;
-using MonoDevelop.Components;
-using Gtk;
-using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
 using System.Text;
 using MonoDevelop.Core;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
 
 namespace MonoDevelop.CodeGeneration
 {
@@ -77,52 +75,56 @@ namespace MonoDevelop.CodeGeneration
 			
 			protected override IEnumerable<object> GetValidMembers ()
 			{
-				if (Options == null || Options.EnclosingType == null || Options.EnclosingMember == null || Options.Document == null)
+				if (Options == null || Options.EnclosingType == null)
 					yield break;
-				var editor = Options.Document.Editor;
+				if (Options.EnclosingMember == null)
+					yield break;
+				if (Options.DocumentContext == null)
+					yield break;
+				var editor = Options.Editor;
 				if (editor == null)
 					yield break;
 				
-				
 				// add local variables
 				var state = Options.CurrentState;
 				if (state != null) {
-					foreach (var v in state.LocalVariables) 
+					foreach (var v in state.LookupSymbols (editor.CaretOffset).OfType<ILocalSymbol> ())
 						yield return v;
 				}
-				
+
 				// add parameters
-				if (Options.EnclosingMember is IParameterizedMember) {
-					foreach (IParameter param in ((IParameterizedMember)Options.EnclosingMember).Parameters)
+				if (Options.EnclosingMember is IMethodSymbol) {
+					foreach (var param in ((IMethodSymbol)Options.EnclosingMember).Parameters)
 						yield return param;
 				}
-				
+				if (Options.EnclosingMember is IPropertySymbol) {
+					foreach (var param in ((IPropertySymbol)Options.EnclosingMember).Parameters)
+						yield return param;
+				}
+
 				// add type members
-				foreach (IField field in Options.EnclosingType.Fields) {
-					if (field.IsSynthetic)
+				foreach (IFieldSymbol field in Options.EnclosingType.GetMembers ().OfType<IFieldSymbol> ()) {
+					if (field.IsImplicitlyDeclared)
 						continue;
 					yield return field;
 				}
 
-				foreach (IProperty property in Options.EnclosingType.Properties) {
-					if (property.IsSynthetic)
+				foreach (IPropertySymbol property in Options.EnclosingType.GetMembers ().OfType<IPropertySymbol> ()) {
+					if (property.IsImplicitlyDeclared)
 						continue;
-					if (property.CanGet)
+					if (property.GetMethod != null)
 						yield return property;
 				}
 			}
 			
 			static string GetName (object m)
 			{
-				var e = m as IEntity;
-				if (e != null)
-					return e.Name;
-				return ((IVariable)m).Name;
+				return ((ISymbol)m).Name;
 			}
 			
 			protected override IEnumerable<string> GenerateCode (List<object> includedMembers)
 			{
-				StringBuilder format = new StringBuilder ();
+				var format = new StringBuilder ();
 				int i = 0;
 				foreach (var member in includedMembers) {
 					if (i > 0)
@@ -132,14 +134,26 @@ namespace MonoDevelop.CodeGeneration
 					format.Append (i++);
 					format.Append ("}");
 				}
-				
-				var consoleType = typeof (Console).ToTypeReference ().Resolve (Options.Document.Compilation.TypeResolveContext);
-				var invocationExpression = new InvocationExpression (new MemberReferenceExpression (new TypeReferenceExpression (Options.CreateShortType (consoleType)), "WriteLine"));
-				invocationExpression.Arguments.Add (new PrimitiveExpression (format.ToString ()));
-				foreach (var member in includedMembers) {
-					invocationExpression.Arguments.Add (new IdentifierExpression (GetName (member)));
-				}
-				yield return new ExpressionStatement (invocationExpression).ToString (Options.FormattingOptions);
+
+				var arguments = new List<ArgumentSyntax> ();
+				arguments.Add (SyntaxFactory.Argument (SyntaxFactory.LiteralExpression (SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal (format.ToString ()))));
+				var node = 
+					SyntaxFactory.ExpressionStatement (
+						SyntaxFactory.InvocationExpression (
+							SyntaxFactory.MemberAccessExpression (SyntaxKind.SimpleMemberAccessExpression,
+								SyntaxFactory.MemberAccessExpression (SyntaxKind.SimpleMemberAccessExpression, 
+									SyntaxFactory.IdentifierName ("System"), 
+									SyntaxFactory.IdentifierName ("Console")
+								),
+								SyntaxFactory.IdentifierName ("WriteLine")
+							),
+							SyntaxFactory.ArgumentList (
+								SyntaxFactory.SeparatedList<ArgumentSyntax> (arguments)
+							)
+						)
+					);
+
+				yield return Options.OutputNode (node).Result;
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/CSharpSyntaxContext.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/CSharpSyntaxContext.cs
new file mode 100644
index 0000000000..95efd8254e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/CSharpSyntaxContext.cs
@@ -0,0 +1,574 @@
+/*
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	public class ReflectionNamespaces
+	{
+		public const string WorkspacesAsmName = ", Microsoft.CodeAnalysis.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+		public const string CSWorkspacesAsmName = ", Microsoft.CodeAnalysis.CSharp.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+		public const string CAAsmName = ", Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+		public const string CACSharpAsmName = ", Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+	}
+
+	public class CSharpSyntaxContext
+	{
+		readonly static Type typeInfoCSharpSyntaxContext;
+		readonly static Type typeInfoAbstractSyntaxContext;
+		readonly static MethodInfo createContextMethod;
+		readonly static PropertyInfo leftTokenProperty;
+		readonly static PropertyInfo targetTokenProperty;
+		readonly static FieldInfo isIsOrAsTypeContextField;
+		readonly static FieldInfo isInstanceContextField;
+		readonly static FieldInfo isNonAttributeExpressionContextField;
+		readonly static FieldInfo isPreProcessorKeywordContextField;
+		readonly static FieldInfo isPreProcessorExpressionContextField;
+		readonly static FieldInfo containingTypeDeclarationField;
+		readonly static FieldInfo isGlobalStatementContextField;
+		readonly static FieldInfo isParameterTypeContextField;
+		readonly static PropertyInfo syntaxTreeProperty;
+
+
+		object instance;
+
+		public SyntaxToken LeftToken {
+			get {
+				return (SyntaxToken)leftTokenProperty.GetValue (instance);
+			}
+		}
+
+		public SyntaxToken TargetToken {
+			get {
+				return (SyntaxToken)targetTokenProperty.GetValue (instance);
+			}
+		}
+
+		public bool IsIsOrAsTypeContext {
+			get {
+				return (bool)isIsOrAsTypeContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsInstanceContext {
+			get {
+				return (bool)isInstanceContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsNonAttributeExpressionContext {
+			get {
+				return (bool)isNonAttributeExpressionContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsPreProcessorKeywordContext {
+			get {
+				return (bool)isPreProcessorKeywordContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsPreProcessorExpressionContext {
+			get {
+				return (bool)isPreProcessorExpressionContextField.GetValue (instance);
+			}
+		}
+
+		public TypeDeclarationSyntax ContainingTypeDeclaration {
+			get {
+				return (TypeDeclarationSyntax)containingTypeDeclarationField.GetValue (instance);
+			}
+		}
+
+		public bool IsGlobalStatementContext {
+			get {
+				return (bool)isGlobalStatementContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsParameterTypeContext {
+			get {
+				return (bool)isParameterTypeContextField.GetValue (instance);
+			}
+		}
+
+		public SyntaxTree SyntaxTree {
+			get {
+				return (SyntaxTree)syntaxTreeProperty.GetValue (instance);
+			}
+		}
+
+
+		readonly static MethodInfo isMemberDeclarationContextMethod;
+
+		public bool IsMemberDeclarationContext (
+			ISet<SyntaxKind> validModifiers = null,
+			ISet<SyntaxKind> validTypeDeclarations = null,
+			bool canBePartial = false,
+			CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (bool)isMemberDeclarationContextMethod.Invoke (instance, new object[] {
+					validModifiers,
+					validTypeDeclarations,
+					canBePartial,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		readonly static MethodInfo isTypeDeclarationContextMethod;
+
+		public bool IsTypeDeclarationContext (
+			ISet<SyntaxKind> validModifiers = null,
+			ISet<SyntaxKind> validTypeDeclarations = null,
+			bool canBePartial = false,
+			CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (bool)isTypeDeclarationContextMethod.Invoke (instance, new object[] {
+					validModifiers,
+					validTypeDeclarations,
+					canBePartial,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		readonly static PropertyInfo isPreProcessorDirectiveContextProperty;
+
+		public bool IsPreProcessorDirectiveContext {
+			get {
+				return (bool)isPreProcessorDirectiveContextProperty.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isInNonUserCodeField;
+
+		public bool IsInNonUserCode {
+			get {
+				return (bool)isInNonUserCodeField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isIsOrAsContextField;
+
+		public bool IsIsOrAsContext {
+			get {
+				return (bool)isIsOrAsContextField.GetValue (instance);
+			}
+		}
+
+		readonly static MethodInfo isTypeAttributeContextMethod;
+
+		public bool IsTypeAttributeContext (CancellationToken cancellationToken)
+		{
+			try {
+				return (bool)isTypeAttributeContextMethod.Invoke (instance, new object[] { cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		readonly static PropertyInfo isAnyExpressionContextProperty;
+
+		public bool IsAnyExpressionContext {
+			get {
+				return (bool)isAnyExpressionContextProperty.GetValue (instance);
+			}
+		}
+
+		readonly static PropertyInfo isStatementContextProperty;
+
+		public bool IsStatementContext {
+			get {
+				return (bool)isStatementContextProperty.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isDefiniteCastTypeContextField;
+
+		public bool IsDefiniteCastTypeContext {
+			get {
+				return (bool)isDefiniteCastTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isObjectCreationTypeContextField;
+
+		public bool IsObjectCreationTypeContext {
+			get {
+				return (bool)isObjectCreationTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isGenericTypeArgumentContextField;
+
+		public bool IsGenericTypeArgumentContext {
+			get {
+				return (bool)isGenericTypeArgumentContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isLocalVariableDeclarationContextField;
+
+		public bool IsLocalVariableDeclarationContext {
+			get {
+				return (bool)isLocalVariableDeclarationContextField.GetValue (instance);
+			}
+		}
+
+
+		readonly static FieldInfo isFixedVariableDeclarationContextField;
+
+		public bool IsFixedVariableDeclarationContext {
+			get {
+				return (bool)isFixedVariableDeclarationContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isPossibleLambdaOrAnonymousMethodParameterTypeContextField;
+
+		public bool IsPossibleLambdaOrAnonymousMethodParameterTypeContext {
+			get {
+				return (bool)isPossibleLambdaOrAnonymousMethodParameterTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isImplicitOrExplicitOperatorTypeContextField;
+
+		public bool IsImplicitOrExplicitOperatorTypeContext {
+			get {
+				return (bool)isImplicitOrExplicitOperatorTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isPrimaryFunctionExpressionContextField;
+
+		public bool IsPrimaryFunctionExpressionContext {
+			get {
+				return (bool)isPrimaryFunctionExpressionContextField.GetValue (instance);
+			}
+		}
+
+
+		readonly static FieldInfo isCrefContextField;
+
+		public bool IsCrefContext {
+			get {
+				return (bool)isCrefContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isDelegateReturnTypeContextField;
+
+		public bool IsDelegateReturnTypeContext {
+			get {
+				return (bool)isDelegateReturnTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isEnumBaseListContextField;
+
+		public bool IsEnumBaseListContext {
+			get {
+				return (bool)isEnumBaseListContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isConstantExpressionContextField;
+
+		public bool IsConstantExpressionContext {
+			get {
+				return (bool)isConstantExpressionContextField.GetValue (instance);
+			}
+		}
+
+		readonly static MethodInfo isMemberAttributeContextMethod;
+		public bool IsMemberAttributeContext(ISet<SyntaxKind> validTypeDeclarations, CancellationToken cancellationToken)
+		{
+			try {
+				return (bool)isMemberAttributeContextMethod.Invoke (instance, new object [] {
+					validTypeDeclarations,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+
+		}
+
+		readonly static FieldInfo precedingModifiersField;
+
+		public ISet<SyntaxKind> PrecedingModifiers {
+			get {
+				return (ISet<SyntaxKind>)precedingModifiersField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isTypeOfExpressionContextField;
+
+		public bool IsTypeOfExpressionContext {
+			get {
+				return (bool)isTypeOfExpressionContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo containingTypeOrEnumDeclarationField;
+
+		public BaseTypeDeclarationSyntax ContainingTypeOrEnumDeclaration {
+			get {
+				return (BaseTypeDeclarationSyntax)containingTypeOrEnumDeclarationField.GetValue (instance);
+			}
+		}
+		static readonly PropertyInfo isAttributeNameContextProperty;
+
+		public bool IsAttributeNameContext {
+			get {
+				return (bool)isAttributeNameContextProperty.GetValue (instance);
+			}
+		}
+
+		static readonly PropertyInfo isInQueryProperty;
+		public bool IsInQuery {
+			get {
+				return (bool)isInQueryProperty.GetValue (instance);
+			}
+		}
+
+
+		static CSharpSyntaxContext ()
+		{
+			typeInfoAbstractSyntaxContext = Type.GetType("Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery.AbstractSyntaxContext" + ReflectionNamespaces.WorkspacesAsmName, true);
+			typeInfoCSharpSyntaxContext = Type.GetType ("Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery.CSharpSyntaxContext" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+
+			createContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("CreateContext", BindingFlags.Static | BindingFlags.Public);
+			leftTokenProperty = typeInfoAbstractSyntaxContext.GetProperty ("LeftToken");
+			targetTokenProperty = typeInfoAbstractSyntaxContext.GetProperty ("TargetToken");
+			isIsOrAsTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsIsOrAsTypeContext");
+			isInstanceContextField = typeInfoCSharpSyntaxContext.GetField ("IsInstanceContext");
+			isNonAttributeExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsNonAttributeExpressionContext");
+			isPreProcessorKeywordContextField = typeInfoCSharpSyntaxContext.GetField ("IsPreProcessorKeywordContext");
+			isPreProcessorExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsPreProcessorExpressionContext");
+			containingTypeDeclarationField = typeInfoCSharpSyntaxContext.GetField ("ContainingTypeDeclaration");
+			isGlobalStatementContextField = typeInfoCSharpSyntaxContext.GetField ("IsGlobalStatementContext");
+			isParameterTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsParameterTypeContext");
+			isMemberDeclarationContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("IsMemberDeclarationContext", BindingFlags.Instance | BindingFlags.Public);
+			isTypeDeclarationContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("IsTypeDeclarationContext", BindingFlags.Instance | BindingFlags.Public);
+			syntaxTreeProperty = typeInfoAbstractSyntaxContext.GetProperty ("SyntaxTree");
+			isPreProcessorDirectiveContextProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsPreProcessorDirectiveContext");
+			isInNonUserCodeField = typeInfoCSharpSyntaxContext.GetField ("IsInNonUserCode");
+			isIsOrAsContextField = typeInfoCSharpSyntaxContext.GetField ("IsIsOrAsContext");
+			isTypeAttributeContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("IsTypeAttributeContext", BindingFlags.Instance | BindingFlags.Public);
+			isAnyExpressionContextProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsAnyExpressionContext");
+			isStatementContextProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsStatementContext");
+			isDefiniteCastTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsDefiniteCastTypeContext");
+			isObjectCreationTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsObjectCreationTypeContext");
+			isGenericTypeArgumentContextField = typeInfoCSharpSyntaxContext.GetField ("IsGenericTypeArgumentContext");
+			isLocalVariableDeclarationContextField = typeInfoCSharpSyntaxContext.GetField ("IsLocalVariableDeclarationContext");
+			isFixedVariableDeclarationContextField = typeInfoCSharpSyntaxContext.GetField ("IsFixedVariableDeclarationContext");
+			isPossibleLambdaOrAnonymousMethodParameterTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsPossibleLambdaOrAnonymousMethodParameterTypeContext");
+			isImplicitOrExplicitOperatorTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsImplicitOrExplicitOperatorTypeContext");
+			isPrimaryFunctionExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsPrimaryFunctionExpressionContext");
+			isCrefContextField = typeInfoCSharpSyntaxContext.GetField ("IsCrefContext");
+			isDelegateReturnTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsDelegateReturnTypeContext");
+			isEnumBaseListContextField = typeInfoCSharpSyntaxContext.GetField ("IsEnumBaseListContext");
+			isConstantExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsConstantExpressionContext");
+			isMemberAttributeContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("IsMemberAttributeContext", BindingFlags.Instance | BindingFlags.Public);
+			precedingModifiersField = typeInfoCSharpSyntaxContext.GetField ("PrecedingModifiers");
+			isTypeOfExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsTypeOfExpressionContext");
+			containingTypeOrEnumDeclarationField = typeInfoCSharpSyntaxContext.GetField ("ContainingTypeOrEnumDeclaration");
+
+			isAttributeNameContextProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsAttributeNameContext");
+			isInQueryProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsInQuery");
+		}
+
+		public SemanticModel SemanticModel {
+			get;
+			private set;
+		}
+
+		public int Position {
+			get;
+			private set;
+		}
+
+		CSharpSyntaxContext (object instance)
+		{
+			this.instance = instance;
+		}
+
+		public static CSharpSyntaxContext CreateContext (Workspace workspace, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			try {
+				return new CSharpSyntaxContext (createContextMethod.Invoke (null, new object[] {
+					workspace,
+					semanticModel,
+					position,
+					cancellationToken
+				})) {
+					SemanticModel = semanticModel,
+					Position = position
+				};
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+
+	class CSharpTypeInferenceService
+	{
+		readonly static Type typeInfo;
+		readonly static MethodInfo inferTypesMethod;
+		readonly static MethodInfo inferTypes2Method;
+		readonly object instance;
+
+		static CSharpTypeInferenceService ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CSharp.CSharpTypeInferenceService" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+
+			inferTypesMethod = typeInfo.GetMethod ("InferTypes", new[] {
+				typeof(SemanticModel),
+				typeof(int),
+				typeof(CancellationToken)
+			});
+			inferTypes2Method = typeInfo.GetMethod ("InferTypes", new[] {
+				typeof(SemanticModel),
+				typeof(SyntaxNode),
+				typeof(CancellationToken)
+			});
+		}
+
+		public CSharpTypeInferenceService ()
+		{
+			instance = Activator.CreateInstance (typeInfo);
+		}
+
+		public IEnumerable<ITypeSymbol> InferTypes (SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			try {
+				return (IEnumerable<ITypeSymbol>)inferTypesMethod.Invoke (instance, new object[] {
+					semanticModel,
+					position,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public IEnumerable<ITypeSymbol> InferTypes (SemanticModel semanticModel, SyntaxNode expression, CancellationToken cancellationToken)
+		{
+			try {
+				return (IEnumerable<ITypeSymbol>)inferTypes2Method.Invoke (instance, new object[] {
+					semanticModel,
+					expression,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		public ITypeSymbol InferType(
+			SemanticModel semanticModel,
+			SyntaxNode expression,
+			bool objectAsDefault,
+			CancellationToken cancellationToken)
+		{
+			var types = InferTypes(semanticModel, expression, cancellationToken)
+				.WhereNotNull();
+
+			if (!types.Any())
+			{
+				return objectAsDefault ? semanticModel.Compilation.ObjectType : null;
+			}
+
+			return types.FirstOrDefault();
+		}
+
+
+		public INamedTypeSymbol InferDelegateType(
+			SemanticModel semanticModel,
+			SyntaxNode expression,
+			CancellationToken cancellationToken)
+		{
+			var type = this.InferType(semanticModel, expression, objectAsDefault: false, cancellationToken: cancellationToken);
+			return type.GetDelegateType(semanticModel.Compilation);
+		}
+
+
+		public ITypeSymbol InferType(
+			SemanticModel semanticModel,
+			int position,
+			bool objectAsDefault,
+			CancellationToken cancellationToken)
+		{
+			var types = this.InferTypes(semanticModel, position, cancellationToken)
+				.WhereNotNull();
+
+			if (!types.Any())
+			{
+				return objectAsDefault ? semanticModel.Compilation.ObjectType : null;
+			}
+
+			return types.FirstOrDefault();
+		}
+
+	}
+
+	public class CaseCorrector
+	{
+		readonly static Type typeInfo;
+		readonly static MethodInfo caseCorrectAsyncMethod;
+
+		static CaseCorrector ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CaseCorrection.CaseCorrector" + ReflectionNamespaces.WorkspacesAsmName, true);
+
+			Annotation = (SyntaxAnnotation)typeInfo.GetField ("Annotation", BindingFlags.Public | BindingFlags.Static).GetValue (null);
+
+			caseCorrectAsyncMethod = typeInfo.GetMethod ("CaseCorrectAsync", new[] {
+				typeof(Document),
+				typeof(SyntaxAnnotation),
+				typeof(CancellationToken)
+			});
+		}
+
+		public static readonly SyntaxAnnotation Annotation;
+
+		public static Task<Document> CaseCorrectAsync (Document document, SyntaxAnnotation annotation, CancellationToken cancellationToken)
+		{
+			try {
+				return (Task<Document>)caseCorrectAsyncMethod.Invoke (null, new object[] { document, annotation, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+
+
+}
+*/
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/CodeRefactoring.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/CodeRefactoring.cs
new file mode 100644
index 0000000000..5efc6b7113
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/CodeRefactoring.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CodeActions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+
+namespace RefactoringEssentials
+{
+	/// <summary>
+	/// Represents a set of transformations that can be applied to a piece of code.
+	/// </summary>
+	class CodeRefactoring  //: ICodeRefactoring
+	{
+		private readonly CodeRefactoringProvider _provider;
+		private readonly IReadOnlyList<CodeAction> _actions;
+
+		public CodeRefactoringProvider Provider
+		{
+			get { return _provider; }
+		}
+
+		/// <summary>
+		/// List of possible actions that can be used to transform the code.
+		/// </summary>
+		public IEnumerable<CodeAction> Actions
+		{
+			get
+			{
+				return _actions;
+			}
+		}
+
+		public CodeRefactoring(CodeRefactoringProvider provider, IEnumerable<CodeAction> actions)
+		{
+			_provider = provider;
+			_actions = actions.ToImmutableArray();
+
+			if (_actions.Count == 0)
+			{
+				throw new ArgumentException("Actions can not be empty", "actions");
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ConvertToEnum/ConvertToEnumCodeRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ConvertToEnum/ConvertToEnumCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..7338da42f4
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ConvertToEnum/ConvertToEnumCodeRefactoringProvider.cs
@@ -0,0 +1,504 @@
+//  
+// Author:
+//       Luís Reis <luiscubal@gmail.com>
+// 
+// Copyright (c) 2013 Luís Reis
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using ICSharpCode.NRefactory.PatternMatching;
+using MonoDevelop.CodeActions;
+using ICSharpCode.NRefactory;
+using System.Threading;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.Decompiler.ILAst;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.CSharp.Refactoring.CodeActions
+{
+	/// <summary>
+	/// Generates an enumeration from const fields
+	/// </summary>
+	class ConvertToEnumAction : MonoDevelop.CodeActions.CodeActionProvider
+	{
+		public override IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions (TextEditor editor, DocumentContext doc, object refactoringContext, MonoDevelop.Ide.Editor.DocumentLocation loc, CancellationToken cancellationToken)
+		{
+			var mdCtx = refactoringContext as MDRefactoringContext;
+
+			if (mdCtx == null || mdCtx.IsInvalid)
+				yield break;
+
+			VariableInitializer currentVariable = mdCtx.GetNode<VariableInitializer>();
+			if (currentVariable == null) {
+				yield break;
+			}
+
+			FieldDeclaration currentField = currentVariable.Parent as FieldDeclaration;
+			if (currentField == null) {
+				yield break;
+			}
+
+			if (!currentField.Modifiers.HasFlag(Modifiers.Const)) {
+				yield break;
+			}
+
+			PrimitiveType baseType = TypeToIntegerPrimitive(mdCtx, currentField.ReturnType);
+			if (baseType == null) {
+				//Can't make enums of these types
+				yield break;
+			}
+
+			TypeDeclaration containerType = currentVariable.GetParent<TypeDeclaration>();
+
+			//Get all the fields/variables that the enum can possibly cover
+			//Don't check the name just yet. That'll come later.
+
+			var constFields = containerType.Members.OfType<FieldDeclaration>()
+				.Where(field => field.GetParent<TypeDeclaration>() == containerType && field.HasModifier(Modifiers.Const)).ToList();
+
+			var constVariables = constFields.SelectMany(field => field.Variables).ToList();
+
+			//Now, it's time to check the name of the selected variable
+			//We'll use this to search for prefixes later
+
+			var names = constVariables.Select(variable => variable.Name).ToList();
+			string currentName = currentVariable.Name;
+
+			//Now, find the common name prefixes
+			//If the variable is called 'A_B_C_D', then 'A', 'A_B' and 'A_B_C' are
+			//the potentially available prefixes.
+			//Note that the common prefixes are the ones that more than one variable
+			//has.
+			//Each prefix has an associated action.
+
+			foreach (var prefix in GetCommonPrefixes (currentName, names)) {
+				string title = string.Format(GettextCatalog.GetString("Create enum '{0}'"), prefix);
+
+				yield return new DefaultCodeAction(title, (ctx, script) => {
+					PrepareToRunAction (prefix, baseType, containerType, constVariables, cancellationToken, ctx, script);
+				});
+			}
+		}
+
+		void PrepareToRunAction (string prefix, PrimitiveType baseType, TypeDeclaration containerType, List<VariableInitializer> variables, CancellationToken cancellationToken, RefactoringContext context, Script script)
+		{
+			List<string> names = variables.Select(variable => variable.Name).ToList();
+			Dictionary<string, string> newNames = names.ToDictionary(originalName => originalName, originalName => {
+				if (!originalName.StartsWith(prefix)) {
+					return originalName;
+				}
+				int startName = prefix.Length;
+				while (startName < originalName.Length - 1 && originalName[startName] == '_') {
+					++startName;
+				}
+				return originalName.Substring(startName);
+			});
+
+			string enumName;
+			using (var dialog = new ConvertToEnumDialog (prefix, variables, variables.Where(variable => variable.Name.StartsWith(prefix, StringComparison.InvariantCulture)
+			                                                                                               && VariableHasSpecifiedIntegerType(context, variable, baseType)).ToList(), newNames))
+			{
+				if (dialog.Run (/*MonoDevelop.Ide.IdeApp.Workbench.RootWindow*/) != Xwt.Command.Ok) {
+					return;
+				}
+				enumName = dialog.EnumName;
+				variables = dialog.SelectedVariables;
+				newNames = dialog.NewNames;
+			}
+
+			RunAction (context, baseType, enumName, newNames, containerType, variables, script);
+			
+		}
+
+		void RunAction(RefactoringContext context, AstType baseType, string enumName, Dictionary<string, string> newNames, TypeDeclaration containerTypeDeclaration, List<VariableInitializer> variables, Script script)
+		{
+			var names = variables.Select (variable => variable.Name).ToList ();
+			var containerType = (context.Resolve(containerTypeDeclaration) as TypeResolveResult).Type;
+
+			var fields = containerTypeDeclaration.Members.OfType<FieldDeclaration>().Where(field => field.Modifiers.HasFlag(Modifiers.Const)).ToList();
+			List<VariableInitializer> variableUnitsToRemove = new List<VariableInitializer>(variables);
+			List<FieldDeclaration> fieldsToRemove = new List<FieldDeclaration>();
+
+			foreach (var field in fields) {
+				if (field.Variables.All(variableUnitsToRemove.Contains)) {
+					fieldsToRemove.Add(field);
+
+					variableUnitsToRemove.RemoveAll(field.Variables.Contains);
+				}
+			}
+
+			var generatedEnum = CreateEnumDeclaration(baseType, enumName, variables, names, newNames);
+
+			AstNode root = GetRootNodeOf(containerTypeDeclaration);
+			var newRoot = root.Clone();
+
+			FixIdentifiers(context, enumName, variables, containerType, baseType, names, newNames, root, newRoot);
+			foreach (var member in root.Descendants.OfType<MemberReferenceExpression>().Where (member => names.Contains (member.MemberName))) {
+				if (variables.Any(variable => variable.Descendants.Contains(member))) {
+					//Already handled
+					continue;
+				}
+
+				var resolvedIdentifier = context.Resolve(member) as MemberResolveResult;
+				if (resolvedIdentifier == null) {
+					continue;
+				}
+
+				if (resolvedIdentifier.Type.Equals(containerType)) {
+					continue;
+				}
+
+				var equivalentMember = GetEquivalentNodeFor(root, newRoot, member);
+				MemberReferenceExpression memberToReplace = (MemberReferenceExpression)equivalentMember;
+
+				var replacement = CreateReplacementMemberReference(enumName, baseType, newNames, memberToReplace);
+				memberToReplace.ReplaceWith(replacement);
+			}
+
+			//Fix the file
+			InsertAfterEquivalent(root, newRoot, containerTypeDeclaration.LBraceToken, generatedEnum, Roles.TypeMemberRole);
+
+			foreach (var variableToRemove in variableUnitsToRemove) {
+				GetEquivalentNodeFor(root, newRoot, variableToRemove).Remove();
+			}
+			foreach (var fieldToRemove in fieldsToRemove) {
+				GetEquivalentNodeFor(root, newRoot, fieldToRemove).Remove();
+			}
+
+			script.Replace(root, newRoot);
+
+			ReplaceVariableReferences(context, root, baseType, enumName, script, newNames, variables);
+		}
+
+		static void ReplaceVariableReferences(RefactoringContext context, AstNode root, AstType baseType, string enumName, Script script, Dictionary<string, string> newNames, IEnumerable<VariableInitializer> variables)
+		{
+			var resolveResults = variables.Select(variable => (MemberResolveResult)context.Resolve(variable));
+			var resolvedFields = resolveResults.Select(resolveResult => resolveResult.Member);
+			script.DoGlobalOperationOn(resolvedFields, (newCtx, newScript, foundNodes) =>  {
+				foreach (var foundNode in foundNodes) {
+					TypeDeclaration newContainerType = foundNode.GetParent<TypeDeclaration>();
+					if (root.Descendants.OfType<TypeDeclaration>().Select(type => ((TypeResolveResult)context.Resolve(type)).Type.FullName).ToList().Contains(((TypeResolveResult)newCtx.Resolve(newContainerType)).Type.FullName)) {
+						//This file has already been fixed
+						return;
+					}
+					var identifierExpr = foundNode as IdentifierExpression;
+					if (identifierExpr != null) {
+						newScript.Replace(identifierExpr, CreateIdentifierReplacement(enumName, baseType, newNames, identifierExpr));
+						continue;
+					}
+					var memberRef = foundNode as MemberReferenceExpression;
+					if (memberRef != null) {
+						var replacement = CreateReplacementMemberReference(enumName, baseType, newNames, memberRef);
+						newScript.Replace(memberRef, replacement);
+					}
+				}
+			});
+		}
+
+		TypeDeclaration CreateEnumDeclaration(AstType baseType, string enumName, List<VariableInitializer> variables, List<string> names, Dictionary<string, string> newNames)
+		{
+			TypeDeclaration generatedEnum = new TypeDeclaration();
+			generatedEnum.ClassType = ClassType.Enum;
+			generatedEnum.BaseTypes.Add(baseType.Clone());
+			generatedEnum.Name = enumName;
+			generatedEnum.Modifiers = GetCombinedModifier((Modifiers)variables.Select(variable => ((FieldDeclaration)variable.Parent).Modifiers).Aggregate(0, (prev, newModifier) => prev | (int)newModifier));
+			foreach (var variable in variables) {
+				var generatedMember = new EnumMemberDeclaration();
+				generatedMember.Name = newNames[variable.Name];
+				var value = variable.Initializer.Clone();
+				foreach (var identifier in value.DescendantsAndSelf.OfType<IdentifierExpression>().Where(identifier => names.Contains(identifier.Identifier))) {
+					var newIdentifier = new IdentifierExpression(newNames[identifier.Identifier]);
+					if (identifier == value) {
+						value = newIdentifier;
+						break;
+					}
+					identifier.ReplaceWith(newIdentifier);
+				}
+				generatedMember.Initializer = value;
+				generatedEnum.Members.Add(generatedMember);
+			}
+			return generatedEnum;
+		}
+
+		/// <summary>
+		/// Determines whether the initialized variable has the specified primitive integer type
+		/// </summary>
+		/// <returns><c>true</c> if the initialized variable has the specified type; otherwise, <c>false</c>.</returns>
+		/// <param name="context">The context to use.</param>
+		/// <param name="variable">The variable initializer to check.</param>
+		/// <param name="type">The type to compare with.</param>
+		bool VariableHasSpecifiedIntegerType(RefactoringContext context, VariableInitializer variable, AstType type)
+		{
+			return TypeToIntegerPrimitive(context, variable.GetParent<FieldDeclaration>().ReturnType).Match(type).Success;
+		}
+
+		static Dictionary<string, PrimitiveType> primitiveTypes = new Dictionary<string, PrimitiveType>();
+
+		static ConvertToEnumAction()
+		{
+			primitiveTypes.Add(typeof(byte).FullName, new PrimitiveType("byte"));
+			primitiveTypes.Add(typeof(sbyte).FullName, new PrimitiveType("sbyte"));
+
+			primitiveTypes.Add(typeof(short).FullName, new PrimitiveType("short"));
+			primitiveTypes.Add(typeof(int).FullName, new PrimitiveType("int"));
+			primitiveTypes.Add(typeof(long).FullName, new PrimitiveType("long"));
+
+			primitiveTypes.Add(typeof(ushort).FullName, new PrimitiveType("ushort"));
+			primitiveTypes.Add(typeof(uint).FullName, new PrimitiveType("uint"));
+			primitiveTypes.Add(typeof(ulong).FullName, new PrimitiveType("ulong"));
+		}
+
+		/// <summary>
+		/// Gets a PrimitiveType instance from an AstType.
+		/// Only returns integer types (and never the char type)
+		/// </summary>
+		/// <returns>The integer primitive.</returns>
+		/// <param name="context">The context to use.</param>
+		/// <param name="type">The AstType to get the primitive from.</param>
+		PrimitiveType TypeToIntegerPrimitive(RefactoringContext context, AstType type)
+		{
+			var resolvedType = context.ResolveType(type) as DefaultResolvedTypeDefinition;
+
+			PrimitiveType primitiveType;
+			if (!primitiveTypes.TryGetValue(resolvedType.FullName, out primitiveType)) {
+				return null;
+			}
+
+			return primitiveType;
+		}
+
+		static Expression CreateReplacementMemberReference(string enumName, AstType baseType, Dictionary<string, string> newNames, MemberReferenceExpression memberToReplace)
+		{
+			return new ParenthesizedExpression(new CastExpression(baseType.Clone(), new MemberReferenceExpression(new MemberReferenceExpression(memberToReplace.Target.Clone(), enumName), newNames [memberToReplace.MemberName])));
+		}
+
+		void FixIdentifiers(RefactoringContext context, string enumName, List<VariableInitializer> variables, IType containerType, AstType baseType, List<string> names, Dictionary<string, string> newNames, AstNode root, AstNode newRoot)
+		{
+			foreach (var identifier in root.Descendants.OfType<IdentifierExpression> ().Where (identifier => names.Contains (identifier.Identifier))) {
+				if (variables.Any(variable => variable.Descendants.Contains(identifier))) {
+					//Already handled
+					continue;
+				}
+				var resolvedIdentifier = context.Resolve(identifier) as MemberResolveResult;
+				if (resolvedIdentifier == null) {
+					continue;
+				}
+				if (resolvedIdentifier.Type.Equals(containerType)) {
+					continue;
+				}
+				var replacement = CreateIdentifierReplacement(enumName, baseType, newNames, identifier);
+				GetEquivalentNodeFor(root, newRoot, identifier).ReplaceWith(replacement);
+			}
+		}
+
+		static ParenthesizedExpression CreateIdentifierReplacement(string enumName, AstType baseType, Dictionary<string, string> newNames, IdentifierExpression identifier)
+		{
+			var replacement = new ParenthesizedExpression(new CastExpression(baseType.Clone(), new MemberReferenceExpression(new IdentifierExpression(enumName), newNames [identifier.Identifier])));
+			return replacement;
+		}
+
+		/// <summary>
+		/// Finds the corresponding node in another ("new") AST.
+		/// Assumes entities have not been renamed and no statements have been removed.
+		/// </summary>
+		/// <returns>The equivalent node in the new AST.</returns>
+		/// <param name="root">The root of the first ("old") AST.</param>
+		/// <param name="newRoot">The root of the new AST.</param>
+		/// <param name="nodeToFind">Node (from the old AST) to find in the new one.</param>
+		AstNode GetEquivalentNodeFor(AstNode root, AstNode newRoot, AstNode nodeToFind)
+		{
+			if (nodeToFind == null) {
+				throw new ArgumentNullException("nodeToFind");
+			}
+
+			if (nodeToFind.Parent != root) {
+				AstNode foundRoot = GetEquivalentNodeFor(root, newRoot, nodeToFind.Parent);
+				if (foundRoot == null) {
+					//If the equivalent of the parent does not exist in the new AST,
+					//then neither does this node.
+					return null;
+				}
+				newRoot = foundRoot;
+				root = nodeToFind.Parent;
+			}
+
+			//At this point, the roots are the parents of the nodes to check
+			//root is the parent of the nodeToFind, and newRoot is the parent of the node to return
+
+			var block = root as BlockStatement;
+			if (block != null && nodeToFind.Role == BlockStatement.StatementRole) {
+				//This could be a problem if statements were removed in the new AST,
+				//but fortunately that's not the problem we're trying to solve.
+				return ((BlockStatement)newRoot).Statements.ElementAt(block.TakeWhile(statement => statement != nodeToFind).Count());
+			}
+
+			//First, we'll narrow down the search - the equivalent node *always* has the same type and role as nodeToFind
+			//The Role check will help e.g. in binary expressions (where there is a 'Left' and a 'Right' role)
+			var candidates = newRoot.Children.Where(child => child.GetType() == nodeToFind.GetType() && child.Role == nodeToFind.Role);
+			var entity = nodeToFind as EntityDeclaration;
+			if (entity != null) {
+				var field = nodeToFind as FieldDeclaration;
+				if (field != null) {
+					//Fields have to be treated separately because fields have no names
+					candidates = candidates.Where(candidate => IsEquivalentField((FieldDeclaration) candidate, field));
+				}
+				else {
+					//Some entities can be distinguished by name.
+					candidates = candidates.Where(candidate => ((EntityDeclaration)candidate).Name == entity.Name);
+
+					var method = nodeToFind as MethodDeclaration;
+					if (method != null) {
+						//Methods, however, can be overloaded - so their names aren't enough.
+						candidates = candidates.Where(candidate => CheckIfMethodsHaveSameParameters((MethodDeclaration) candidate, method));
+					}
+				}
+			}
+
+			var ns = nodeToFind as NamespaceDeclaration;
+			if (ns != null) {
+				candidates = candidates.Where(candidate => ((NamespaceDeclaration)candidate).Name == ns.Name).ToList();
+				if (candidates.Count() > 1) {
+					throw new NotImplementedException("Two or more namespace declarations with the same name are siblings. This case is not currently supported by this action.");
+				}
+			}
+
+			var initializer = nodeToFind as VariableInitializer;
+			if (initializer != null) {
+				candidates = candidates.Where(candidate => ((VariableInitializer)candidate).Name == initializer.Name);
+			}
+
+			var equivalentNode = candidates.SingleOrDefault();
+			return equivalentNode;
+		}
+
+		bool IsEquivalentField(FieldDeclaration field1, FieldDeclaration field2) {
+			return field1.Variables.Any(variable1 => {
+				return field2.Variables.Any(variable2 => variable1.Name == variable2.Name);
+			});
+		}
+
+		bool CheckIfMethodsHaveSameParameters(MethodDeclaration methodDeclaration, MethodDeclaration comparedMethod)
+		{
+			if (methodDeclaration.Parameters.Count != comparedMethod.Parameters.Count) {
+				return false;
+			}
+
+			ParameterDeclaration param1 = methodDeclaration.Parameters.FirstOrDefault();
+			ParameterDeclaration param2 = comparedMethod.Parameters.FirstOrDefault();
+
+			while (param1 != null) {
+				//If the names or initializers are different, this will still match.
+				//But if the type or order changes, this will complain
+				if (!param1.Type.Match(param2.Type).Success) {
+					return false;
+				}
+
+				param1 = (ParameterDeclaration) param1.GetNextSibling(node => node is ParameterDeclaration);
+				param2 = (ParameterDeclaration) param2.GetNextSibling(node => node is ParameterDeclaration);
+			}
+
+			return true;
+		}
+
+		void InsertAfterEquivalent<T>(AstNode root, AstNode newRoot, AstNode prevNode, T newNode, Role<T> role)
+			where T : AstNode
+		{
+			AstNode equivalentPrevNode = GetEquivalentNodeFor(root, newRoot, prevNode);
+			equivalentPrevNode.Parent.InsertChildAfter<T>(equivalentPrevNode, newNode, role);
+		}
+
+		/// <summary>
+		/// Gets the least permissive access modifier that still allows access to
+		/// fields or methods with the specified modifiers.
+		/// This will ignore all modifiers unrelated to access - such as const and readonly
+		/// </summary>
+		/// <returns>A modifier that is at least as permissive as all provided modifiers.</returns>
+		/// <param name="modifiers">The modifiers to use.</param>
+		Modifiers GetCombinedModifier(Modifiers modifiers)
+		{
+			if (modifiers.HasFlag(Modifiers.Public))
+				return Modifiers.Public;
+
+			Modifiers combinedModifier = 0;
+			if (modifiers.HasFlag(Modifiers.Protected)) {
+				combinedModifier |= Modifiers.Protected;
+			}
+			if (modifiers.HasFlag(Modifiers.Internal)) {
+				combinedModifier |= Modifiers.Internal;
+			}
+
+			//No modifier if the fields are all private.
+			return combinedModifier;
+		}
+
+		/// <summary>
+		/// Gets all prefixes that more than one name have.
+		/// </summary>
+		/// <returns>The common prefixes.</returns>
+		/// <param name="currentName">The name to use.</param>
+		/// <param name="names">The names to check.</param>
+		IEnumerable<string> GetCommonPrefixes(string currentName, IEnumerable<string> names)
+		{
+			//Find the indexes that 'split' words in the variable name
+			var boundariesForCurrentWord = GetWordsBoundaries(currentName);
+
+			//Get the candidate prefixes
+			List<string> proposedPrefixes = boundariesForCurrentWord.Select(boundary => currentName.Substring(0, boundary)).ToList();
+
+			//Return only the prefixes that more than one variable has.
+			return proposedPrefixes.Where(prefix => names.Count(name => name.StartsWith(prefix, StringComparison.InvariantCulture)) > 1);
+		}
+
+		List<int> GetWordsBoundaries(string name)
+		{
+			List<int> foundBoundaries = new List<int>();
+			for (int i = 1; i < name.Length - 1; ++i) {
+				char chr = name [i];
+				if (chr == '_') {
+					foundBoundaries.Add(i);
+					continue;
+				}
+
+				if (char.IsUpper(chr) && char.IsLower(name [i - 1])) {
+					foundBoundaries.Add(i);
+					continue;
+				}
+			}
+
+			return foundBoundaries;
+		}
+
+		AstNode GetRootNodeOf(AstNode node)
+		{
+			while (node.Parent != null) {
+				node = node.Parent;
+			}
+
+			return node;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/ConvertToEnumDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ConvertToEnum/ConvertToEnumDialog.cs
index 26c3a299a2..26c3a299a2 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/ConvertToEnumDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ConvertToEnum/ConvertToEnumDialog.cs
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ExtractMethod/ExtractMethodCodeRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ExtractMethod/ExtractMethodCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..3ce95e78c7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/ExtractMethod/ExtractMethodCodeRefactoringProvider.cs
@@ -0,0 +1,105 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using System;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Text;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp.ExtractMethod;
+using RefactoringEssentials;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.ExtractMethod
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.ExtractMethod), Shared]
+	internal class ExtractMethodCodeRefactoringProvider : CodeRefactoringProvider
+	{
+		public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			// Don't bother if there isn't a selection
+			var textSpan = context.Span;
+			if (textSpan.IsEmpty)
+			{
+				return;
+			}
+			var document = context.Document;
+			var cancellationToken = context.CancellationToken;
+
+			var workspace = document.Project.Solution.Workspace;
+			if (workspace.Kind == WorkspaceKind.MiscellaneousFiles)
+			{
+				return;
+			}
+			if (IdeApp.Workbench.ActiveDocument == null || IdeApp.Workbench.ActiveDocument.Editor == null)
+				return;
+			var activeInlineRenameSession = IdeApp.Workbench.ActiveDocument.Editor.EditMode != MonoDevelop.Ide.Editor.EditMode.Edit;
+			if (activeInlineRenameSession)
+			{
+				return;
+			}
+			var model = await context.Document.GetSemanticModelAsync (context.CancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (context.CancellationToken))
+				return;
+			
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return;
+			}
+
+			var action = await GetCodeActionAsync(document, textSpan, cancellationToken: cancellationToken).ConfigureAwait(false);
+			if (action == null)
+			{
+				return;
+			}
+
+			context.RegisterRefactoring(action.Item1);
+		}
+
+		static CSharpExtractMethodService service = new CSharpExtractMethodService ();
+
+		private async Task<Tuple<CodeAction, string>> GetCodeActionAsync(
+			Document document,
+			TextSpan textSpan,
+			CancellationToken cancellationToken)
+		{
+			var options = document.Project.Solution.Workspace.Options;
+			try {
+				var result = await service.ExtractMethodAsync(
+					document,
+					textSpan,
+					options,
+					cancellationToken).ConfigureAwait(false);
+
+				if (result.Succeeded || result.SucceededWithSuggestion)
+				{
+					var description = options.GetOption(ExtractMethodOptions.AllowMovingDeclaration, document.Project.Language) ?
+						GettextCatalog.GetString ("Extract Method + Local") : GettextCatalog.GetString ("Extract Method");
+
+					var codeAction = new DocumentChangeAction(textSpan, DiagnosticSeverity.Info, description, (c) => AddRenameAnnotationAsync(result.Document, result.InvocationNameToken, c));
+					var methodBlock = result.MethodDeclarationNode;
+
+					return Tuple.Create<CodeAction, string>(codeAction, methodBlock.ToString());
+				}
+			} catch (Exception) {
+				// currently the extract method refactoring crashes often. Ignore the roslyn issues for now.
+			}
+			return null;
+		}
+
+		private async Task<Document> AddRenameAnnotationAsync(Document document, SyntaxToken invocationNameToken, CancellationToken cancellationToken)
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+			var finalRoot = root.ReplaceToken(
+				invocationNameToken,
+				invocationNameToken.WithAdditionalAnnotations(RenameAnnotation.Create()));
+
+			return document.WithSyntaxRoot(finalRoot);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.InitializerRewriter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.InitializerRewriter.cs
new file mode 100644
index 0000000000..6ab7a54616
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.InitializerRewriter.cs
@@ -0,0 +1,105 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.InlineTemporary
+{
+	internal partial class InlineTemporaryCodeRefactoringProvider
+	{
+		/// <summary>
+		/// This class handles rewriting initializer expressions that refer to the variable
+		/// being initialized into a simpler form.  For example, in "int x = x = 1", we want to
+		/// get just "1" back as the initializer.
+		/// </summary>
+		private class InitializerRewriter : CSharpSyntaxRewriter
+		{
+			private readonly SemanticModel _semanticModel;
+			private readonly ILocalSymbol _localSymbol;
+
+			private InitializerRewriter(ExpressionSyntax initializer, ILocalSymbol localSymbol, SemanticModel semanticModel)
+			{
+				_semanticModel = semanticModel;
+				_localSymbol = localSymbol;
+			}
+
+			private bool IsReference(SimpleNameSyntax name)
+			{
+				if (name.Identifier.ValueText != _localSymbol.Name)
+				{
+					return false;
+				}
+
+				var symbol = _semanticModel.GetSymbolInfo(name).Symbol;
+				return symbol != null
+					&& symbol.Equals(_localSymbol);
+			}
+
+			public override SyntaxNode VisitAssignmentExpression(AssignmentExpressionSyntax node)
+			{
+				// Note - leave this as SyntaxNode for now, we might have already re-written it
+				var newNode = base.VisitAssignmentExpression(node);
+
+				if (newNode.Kind() == SyntaxKind.SimpleAssignmentExpression)
+				{
+					// It's okay to just look at the text, since we're explicitly looking for an
+					// identifier standing alone, and we know we're in a local's initializer.
+					// The text can only bind to the initializer.
+					var assignment = (AssignmentExpressionSyntax)newNode;
+					var name = assignment.Left.Kind() == SyntaxKind.IdentifierName
+						? (IdentifierNameSyntax)assignment.Left
+						: null;
+
+					if (name != null && IsReference(name))
+					{
+						return assignment.Right;
+					}
+				}
+
+				return newNode;
+			}
+
+			public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
+			{
+				if (IsReference(node))
+				{
+					var assignmentExpression = node.Parent as AssignmentExpressionSyntax;
+					if (assignmentExpression != null)
+					{
+						if (assignmentExpression.IsCompoundAssignExpression() &&
+							assignmentExpression.Left == node)
+						{
+							return node.Update(node.Identifier.WithAdditionalAnnotations(CreateConflictAnnotation()));
+						}
+					}
+				}
+
+				return base.VisitIdentifierName(node);
+			}
+
+			public override SyntaxNode VisitParenthesizedExpression(ParenthesizedExpressionSyntax node)
+			{
+				var newNode = base.VisitParenthesizedExpression(node);
+
+				if (node != newNode && newNode.Kind() == SyntaxKind.ParenthesizedExpression)
+				{
+					return newNode.WithAdditionalAnnotations(Simplifier.Annotation);
+				}
+
+				return newNode;
+			}
+
+			public static ExpressionSyntax Visit(ExpressionSyntax initializer, ILocalSymbol local, SemanticModel semanticModel)
+			{
+				var simplifier = new InitializerRewriter(initializer, local, semanticModel);
+				return (ExpressionSyntax)simplifier.Visit(initializer);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.ReferenceRewriter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.ReferenceRewriter.cs
new file mode 100644
index 0000000000..16d712e672
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.ReferenceRewriter.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.InlineTemporary
+{
+	internal partial class InlineTemporaryCodeRefactoringProvider
+	{
+		private class ReferenceRewriter : CSharpSyntaxRewriter
+		{
+			private readonly SemanticModel _semanticModel;
+			private readonly ILocalSymbol _localSymbol;
+			private readonly VariableDeclaratorSyntax _variableDeclarator;
+			private readonly ExpressionSyntax _expressionToInline;
+			private readonly CancellationToken _cancellationToken;
+
+			private ReferenceRewriter(
+				SemanticModel semanticModel,
+				VariableDeclaratorSyntax variableDeclarator,
+				ExpressionSyntax expressionToInline,
+				CancellationToken cancellationToken)
+			{
+				_semanticModel = semanticModel;
+				_localSymbol = (ILocalSymbol)semanticModel.GetDeclaredSymbol(variableDeclarator, cancellationToken);
+				_variableDeclarator = variableDeclarator;
+				_expressionToInline = expressionToInline;
+				_cancellationToken = cancellationToken;
+			}
+
+			private bool IsReference(SimpleNameSyntax name)
+			{
+				if (name.Identifier.ValueText != _variableDeclarator.Identifier.ValueText)
+				{
+					return false;
+				}
+
+				var symbol = _semanticModel.GetSymbolInfo(name).Symbol;
+				return symbol != null
+					&& symbol.Equals(_localSymbol);
+			}
+
+			public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
+			{
+				_cancellationToken.ThrowIfCancellationRequested();
+
+				if (IsReference(node))
+				{
+					if (HasConflict(node, _variableDeclarator))
+					{
+						return node.Update(node.Identifier.WithAdditionalAnnotations(CreateConflictAnnotation()));
+					}
+
+					return _expressionToInline
+						.Parenthesize()
+						.WithAdditionalAnnotations(Formatter.Annotation, Simplifier.Annotation);
+				}
+
+				return base.VisitIdentifierName(node);
+			}
+
+			public override SyntaxNode VisitAnonymousObjectMemberDeclarator(AnonymousObjectMemberDeclaratorSyntax node)
+			{
+				var nameEquals = node.NameEquals;
+				var expression = node.Expression;
+				var identifier = expression as IdentifierNameSyntax;
+
+				if (nameEquals != null || identifier == null || !IsReference(identifier) || HasConflict(identifier, _variableDeclarator))
+				{
+					return base.VisitAnonymousObjectMemberDeclarator(node);
+				}
+
+				// Special case inlining into anonymous types to ensure that we keep property names:
+				//
+				// E.g.
+				//     int x = 42;
+				//     var a = new { x; };
+				//
+				// Should become:
+				//     var a = new { x = 42; };
+				nameEquals = SyntaxFactory.NameEquals(identifier);
+				expression = (ExpressionSyntax)this.Visit(expression);
+				return node.Update(nameEquals, expression).WithAdditionalAnnotations(Simplifier.Annotation, Formatter.Annotation);
+			}
+
+			public static SyntaxNode Visit(
+				SemanticModel semanticModel,
+				SyntaxNode scope,
+				VariableDeclaratorSyntax variableDeclarator,
+				ExpressionSyntax expressionToInline,
+				CancellationToken cancellationToken)
+			{
+				var rewriter = new ReferenceRewriter(semanticModel, variableDeclarator, expressionToInline, cancellationToken);
+				return rewriter.Visit(scope);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..0d1a5c6a68
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/InlineTemporary/InlineTemporaryCodeRefactoringProvider.cs
@@ -0,0 +1,575 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using RefactoringEssentials;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.InlineTemporary
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.InlineTemporary), Shared]
+	internal partial class InlineTemporaryCodeRefactoringProvider : CodeRefactoringProvider
+	{
+		internal static readonly SyntaxAnnotation DefinitionAnnotation = new SyntaxAnnotation();
+		internal static readonly SyntaxAnnotation ReferenceAnnotation = new SyntaxAnnotation();
+		internal static readonly SyntaxAnnotation InitializerAnnotation = new SyntaxAnnotation();
+		internal static readonly SyntaxAnnotation ExpressionToInlineAnnotation = new SyntaxAnnotation();
+
+		public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			var document = context.Document;
+			var textSpan = context.Span;
+			var cancellationToken = context.CancellationToken;
+
+			if (document.Project.Solution.Workspace.Kind == WorkspaceKind.MiscellaneousFiles)
+			{
+				return;
+			}
+			var model = await document.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+			var root = await document.GetCSharpSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			if (textSpan.Start >= root.FullSpan.Length)
+				return;
+			var token = root.FindToken(textSpan.Start);
+
+			if (!token.Span.Contains(textSpan))
+			{
+				return;
+			}
+
+			var node = token.Parent;
+
+			if (!node.IsKind(SyntaxKind.VariableDeclarator) ||
+				!node.IsParentKind(SyntaxKind.VariableDeclaration) ||
+				!node.Parent.IsParentKind(SyntaxKind.LocalDeclarationStatement))
+			{
+				return;
+			}
+
+			var variableDeclarator = (VariableDeclaratorSyntax)node;
+			var variableDeclaration = (VariableDeclarationSyntax)variableDeclarator.Parent;
+			var localDeclarationStatement = (LocalDeclarationStatementSyntax)variableDeclaration.Parent;
+
+			if (variableDeclarator.Identifier != token ||
+				variableDeclarator.Initializer == null ||
+				variableDeclarator.Initializer.Value.IsMissing ||
+				variableDeclarator.Initializer.Value.IsKind(SyntaxKind.StackAllocArrayCreationExpression))
+			{
+				return;
+			}
+
+			if (localDeclarationStatement.ContainsDiagnostics)
+			{
+				return;
+			}
+
+			var references = await GetReferencesAsync(document, variableDeclarator, cancellationToken).ConfigureAwait(false);
+			if (!references.Any())
+			{
+				return;
+			}
+
+			context.RegisterRefactoring(
+				new DocumentChangeAction(node.Span, DiagnosticSeverity.Info,
+					GettextCatalog.GetString ("Inline temporary variable"),
+					(c) => this.InlineTemporaryAsync(document, variableDeclarator, c)));
+		}
+
+		private async Task<IEnumerable<ReferenceLocation>> GetReferencesAsync(
+			Document document,
+			VariableDeclaratorSyntax variableDeclarator,
+			CancellationToken cancellationToken)
+		{
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var local = semanticModel.GetDeclaredSymbol(variableDeclarator, cancellationToken);
+
+			if (local != null)
+			{
+				var findReferencesResult = await SymbolFinder.FindReferencesAsync(local, document.Project.Solution, cancellationToken).ConfigureAwait(false);
+				var locations = findReferencesResult.Single(r => r.Definition == local).Locations;
+				if (!locations.Any(loc => semanticModel.SyntaxTree.OverlapsHiddenPosition(loc.Location.SourceSpan, cancellationToken)))
+				{
+					return locations;
+				}
+			}
+
+			return SpecializedCollections.EmptyEnumerable<ReferenceLocation>();
+		}
+
+		private static bool HasConflict(IdentifierNameSyntax identifier, VariableDeclaratorSyntax variableDeclarator)
+		{
+			// TODO: Check for more conflict types.
+			if (identifier.SpanStart < variableDeclarator.SpanStart)
+			{
+				return true;
+			}
+
+			var identifierNode = identifier
+				.Ancestors()
+				.TakeWhile(n => n.Kind() == SyntaxKind.ParenthesizedExpression || n.Kind() == SyntaxKind.CastExpression)
+				.LastOrDefault();
+
+			if (identifierNode == null)
+			{
+				identifierNode = identifier;
+			}
+
+			if (identifierNode.IsParentKind(SyntaxKind.Argument))
+			{
+				var argument = (ArgumentSyntax)identifierNode.Parent;
+				if (argument.RefOrOutKeyword.Kind() != SyntaxKind.None)
+				{
+					return true;
+				}
+			}
+			else if (identifierNode.Parent.IsKind(
+				SyntaxKind.PreDecrementExpression,
+				SyntaxKind.PreIncrementExpression,
+				SyntaxKind.PostDecrementExpression,
+				SyntaxKind.PostIncrementExpression,
+				SyntaxKind.AddressOfExpression))
+			{
+				return true;
+			}
+			else if (identifierNode.Parent is AssignmentExpressionSyntax)
+			{
+				var binaryExpression = (AssignmentExpressionSyntax)identifierNode.Parent;
+				if (binaryExpression.Left == identifierNode)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		private static SyntaxAnnotation CreateConflictAnnotation()
+		{
+			return ConflictAnnotation.Create(GettextCatalog.GetString ("Conflict(s) detected."));
+		}
+
+		private async Task<Document> InlineTemporaryAsync(Document document, VariableDeclaratorSyntax declarator, CancellationToken cancellationToken)
+		{
+			var workspace = document.Project.Solution.Workspace;
+
+			// Annotate the variable declarator so that we can get back to it later.
+			var updatedDocument = await document.ReplaceNodeAsync(declarator, declarator.WithAdditionalAnnotations(DefinitionAnnotation), cancellationToken).ConfigureAwait(false);
+			var semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+			var variableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+
+			// Create the expression that we're actually going to inline.
+			var expressionToInline = await CreateExpressionToInlineAsync(variableDeclarator, updatedDocument, cancellationToken).ConfigureAwait(false);
+
+			// Collect the identifier names for each reference.
+			var local = (ILocalSymbol)semanticModel.GetDeclaredSymbol(variableDeclarator, cancellationToken);
+			var symbolRefs = await SymbolFinder.FindReferencesAsync(local, updatedDocument.Project.Solution, cancellationToken).ConfigureAwait(false);
+			var references = symbolRefs.Single(r => r.Definition == local).Locations;
+			var syntaxRoot = await updatedDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+			// Collect the topmost parenting expression for each reference.
+			var nonConflictingIdentifierNodes = references
+				.Select(loc => (IdentifierNameSyntax)syntaxRoot.FindToken(loc.Location.SourceSpan.Start).Parent)
+				.Where(ident => !HasConflict(ident, variableDeclarator));
+
+			// Add referenceAnnotions to identifier nodes being replaced.
+			updatedDocument = await updatedDocument.ReplaceNodesAsync(
+				nonConflictingIdentifierNodes,
+				(o, n) => n.WithAdditionalAnnotations(ReferenceAnnotation),
+				cancellationToken).ConfigureAwait(false);
+
+			semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			variableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+
+			// Get the annotated reference nodes.
+			nonConflictingIdentifierNodes = await FindReferenceAnnotatedNodesAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+
+			var topmostParentingExpressions = nonConflictingIdentifierNodes
+				.Select(ident => GetTopMostParentingExpression(ident))
+				.Distinct();
+
+			var originalInitializerSymbolInfo = semanticModel.GetSymbolInfo(variableDeclarator.Initializer.Value, cancellationToken);
+
+			// Make each topmost parenting statement or Equals Clause Expressions semantically explicit.
+			updatedDocument = await updatedDocument.ReplaceNodesAsync(topmostParentingExpressions, (o, n) => Simplifier.Expand(n, semanticModel, workspace, cancellationToken: cancellationToken), cancellationToken).ConfigureAwait(false);
+			semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var semanticModelBeforeInline = semanticModel;
+
+			variableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			var scope = GetScope(variableDeclarator);
+
+			var newScope = ReferenceRewriter.Visit(semanticModel, scope, variableDeclarator, expressionToInline, cancellationToken);
+
+			updatedDocument = await updatedDocument.ReplaceNodeAsync(scope, newScope, cancellationToken).ConfigureAwait(false);
+			semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+			variableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			newScope = GetScope(variableDeclarator);
+			var conflicts = newScope.GetAnnotatedNodesAndTokens(ConflictAnnotation.Kind);
+			var declaratorConflicts = variableDeclarator.GetAnnotatedNodesAndTokens(ConflictAnnotation.Kind);
+
+			// Note that we only remove the local declaration if there weren't any conflicts,
+			// unless those conflicts are inside the local declaration.
+			if (conflicts.Count() == declaratorConflicts.Count())
+			{
+				// Certain semantic conflicts can be detected only after the reference rewriter has inlined the expression
+				var newDocument = await DetectSemanticConflicts(updatedDocument,
+					semanticModel,
+					semanticModelBeforeInline,
+					originalInitializerSymbolInfo,
+					cancellationToken).ConfigureAwait(false);
+
+				if (updatedDocument == newDocument)
+				{
+					// No semantic conflicts, we can remove the definition.
+					updatedDocument = await updatedDocument.ReplaceNodeAsync(newScope, RemoveDeclaratorFromScope(variableDeclarator, newScope), cancellationToken).ConfigureAwait(false);
+				}
+				else
+				{
+					// There were some semantic conflicts, don't remove the definition.
+					updatedDocument = newDocument;
+				}
+			}
+
+			return updatedDocument;
+		}
+
+		private static async Task<VariableDeclaratorSyntax> FindDeclaratorAsync(Document document, CancellationToken cancellationToken)
+		{
+			return await FindNodeWithAnnotationAsync<VariableDeclaratorSyntax>(document, DefinitionAnnotation, cancellationToken).ConfigureAwait(false);
+		}
+
+		private static async Task<ExpressionSyntax> FindInitializerAsync(Document document, CancellationToken cancellationToken)
+		{
+			return await FindNodeWithAnnotationAsync<ExpressionSyntax>(document, InitializerAnnotation, cancellationToken).ConfigureAwait(false);
+		}
+
+		private static async Task<T> FindNodeWithAnnotationAsync<T>(Document document, SyntaxAnnotation annotation, CancellationToken cancellationToken)
+			where T : SyntaxNode
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			return root
+				.GetAnnotatedNodesAndTokens(annotation)
+				.Single()
+				.AsNode() as T;
+		}
+
+		private static async Task<IEnumerable<IdentifierNameSyntax>> FindReferenceAnnotatedNodesAsync(Document document, CancellationToken cancellationToken)
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			return FindReferenceAnnotatedNodes(root);
+		}
+
+		private static IEnumerable<IdentifierNameSyntax> FindReferenceAnnotatedNodes(SyntaxNode root)
+		{
+			var annotatedNodesAndTokens = root.GetAnnotatedNodesAndTokens(ReferenceAnnotation);
+			foreach (var nodeOrToken in annotatedNodesAndTokens)
+			{
+				if (nodeOrToken.IsNode && nodeOrToken.AsNode().IsKind(SyntaxKind.IdentifierName))
+				{
+					yield return (IdentifierNameSyntax)nodeOrToken.AsNode();
+				}
+			}
+		}
+
+		private SyntaxNode GetScope(VariableDeclaratorSyntax variableDeclarator)
+		{
+			var variableDeclaration = (VariableDeclarationSyntax)variableDeclarator.Parent;
+			var localDeclaration = (LocalDeclarationStatementSyntax)variableDeclaration.Parent;
+			var scope = localDeclaration.Parent;
+
+			while (scope.IsKind(SyntaxKind.LabeledStatement))
+			{
+				scope = scope.Parent;
+			}
+
+			var parentExpressions = scope.AncestorsAndSelf().OfType<ExpressionSyntax>();
+			if (parentExpressions.Any())
+			{
+				scope = parentExpressions.LastOrDefault().Parent;
+			}
+
+			return scope;
+		}
+
+		private VariableDeclaratorSyntax FindDeclarator(SyntaxNode node)
+		{
+			var annotatedNodesOrTokens = node.GetAnnotatedNodesAndTokens(DefinitionAnnotation).ToList();
+
+			return (VariableDeclaratorSyntax)annotatedNodesOrTokens.First().AsNode();
+		}
+
+		private SyntaxTriviaList GetTriviaToPreserve(SyntaxTriviaList syntaxTriviaList)
+		{
+			return ShouldPreserve(syntaxTriviaList) ? syntaxTriviaList : default(SyntaxTriviaList);
+		}
+
+		private static bool ShouldPreserve(SyntaxTriviaList trivia)
+		{
+			return trivia.Any(
+				t => t.Kind() == SyntaxKind.SingleLineCommentTrivia ||
+				t.Kind() == SyntaxKind.MultiLineCommentTrivia ||
+				t.IsDirective);
+		}
+
+		private SyntaxNode RemoveDeclaratorFromVariableList(VariableDeclaratorSyntax variableDeclarator, VariableDeclarationSyntax variableDeclaration)
+		{
+			Debug.Assert(variableDeclaration.Variables.Count > 1);
+			Debug.Assert(variableDeclaration.Variables.Contains(variableDeclarator));
+
+			var localDeclaration = (LocalDeclarationStatementSyntax)variableDeclaration.Parent;
+			var scope = GetScope(variableDeclarator);
+
+			var newLocalDeclaration = localDeclaration.RemoveNode(variableDeclarator, SyntaxRemoveOptions.KeepNoTrivia)
+				.WithAdditionalAnnotations(Formatter.Annotation);
+
+			return scope.ReplaceNode(localDeclaration, newLocalDeclaration);
+		}
+
+		private SyntaxNode RemoveDeclaratorFromScope(VariableDeclaratorSyntax variableDeclarator, SyntaxNode scope)
+		{
+			var variableDeclaration = (VariableDeclarationSyntax)variableDeclarator.Parent;
+
+			// If there is more than one variable declarator, remove this one from the variable declaration.
+			if (variableDeclaration.Variables.Count > 1)
+			{
+				return RemoveDeclaratorFromVariableList(variableDeclarator, variableDeclaration);
+			}
+
+			var localDeclaration = (LocalDeclarationStatementSyntax)variableDeclaration.Parent;
+
+			// There's only one variable declarator, so we'll remove the local declaration
+			// statement entirely. This means that we'll concatenate the leading and trailing
+			// trivia of this declaration and move it to the next statement.
+			var leadingTrivia = localDeclaration
+				.GetLeadingTrivia()
+				.Reverse()
+				.SkipWhile(t => t.MatchesKind(SyntaxKind.WhitespaceTrivia))
+				.Reverse()
+				.ToSyntaxTriviaList();
+
+			var trailingTrivia = localDeclaration
+				.GetTrailingTrivia()
+				.SkipWhile(t => t.MatchesKind(SyntaxKind.WhitespaceTrivia, SyntaxKind.EndOfLineTrivia))
+				.ToSyntaxTriviaList();
+
+			var newLeadingTrivia = leadingTrivia.Concat(trailingTrivia);
+
+			var nextToken = localDeclaration.GetLastToken().GetNextTokenOrEndOfFile();
+			var newNextToken = nextToken.WithPrependedLeadingTrivia(newLeadingTrivia)
+				.WithAdditionalAnnotations(Formatter.Annotation);
+
+			var newScope = scope.ReplaceToken(nextToken, newNextToken);
+
+			var newLocalDeclaration = (LocalDeclarationStatementSyntax)FindDeclarator(newScope).Parent.Parent;
+
+			// If the local is parented by a label statement, we can't remove this statement. Instead,
+			// we'll replace the local declaration with an empty expression statement.
+			if (newLocalDeclaration.IsParentKind(SyntaxKind.LabeledStatement))
+			{
+				var labeledStatement = (LabeledStatementSyntax)newLocalDeclaration.Parent;
+				var newLabeledStatement = labeledStatement.ReplaceNode(newLocalDeclaration, SyntaxFactory.ParseStatement(""));
+
+				return newScope.ReplaceNode(labeledStatement, newLabeledStatement);
+			}
+
+			return newScope.RemoveNode(newLocalDeclaration, SyntaxRemoveOptions.KeepNoTrivia);
+		}
+
+		private ExpressionSyntax SkipRedundantExteriorParentheses(ExpressionSyntax expression)
+		{
+			while (expression.IsKind(SyntaxKind.ParenthesizedExpression))
+			{
+				var parenthesized = (ParenthesizedExpressionSyntax)expression;
+				if (parenthesized.Expression == null ||
+					parenthesized.Expression.IsMissing)
+				{
+					break;
+				}
+
+				if (parenthesized.Expression.IsKind(SyntaxKind.ParenthesizedExpression) ||
+					parenthesized.Expression.IsKind(SyntaxKind.IdentifierName))
+				{
+					expression = parenthesized.Expression;
+				}
+				else
+				{
+					break;
+				}
+			}
+
+			return expression;
+		}
+
+		public static IEnumerable<SyntaxTrivia> SkipInitialWhitespace(SyntaxTriviaList triviaList)
+		{
+			return triviaList.SkipWhile(t => t.Kind() == SyntaxKind.WhitespaceTrivia);
+		}
+
+		private async Task<ExpressionSyntax> CreateExpressionToInlineAsync(
+			VariableDeclaratorSyntax variableDeclarator,
+			Document document,
+			CancellationToken cancellationToken)
+		{
+			var updatedDocument = document;
+
+			var expression = SkipRedundantExteriorParentheses(variableDeclarator.Initializer.Value);
+			var semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var localSymbol = (ILocalSymbol)semanticModel.GetDeclaredSymbol(variableDeclarator, cancellationToken);
+			var newExpression = InitializerRewriter.Visit(expression, localSymbol, semanticModel);
+
+			// If this is an array initializer, we need to transform it into an array creation
+			// expression for inlining.
+			if (newExpression.Kind() == SyntaxKind.ArrayInitializerExpression)
+			{
+				var arrayType = (ArrayTypeSyntax)localSymbol.Type.GenerateTypeSyntax();
+				var arrayInitializer = (InitializerExpressionSyntax)newExpression;
+
+				// Add any non-whitespace trailing trivia from the equals clause to the type.
+				var equalsToken = variableDeclarator.Initializer.EqualsToken;
+				if (equalsToken.HasTrailingTrivia)
+				{
+					var trailingTrivia = SkipInitialWhitespace(equalsToken.TrailingTrivia);
+					if (trailingTrivia.Any())
+					{
+						arrayType = arrayType.WithTrailingTrivia(trailingTrivia);
+					}
+				}
+
+				newExpression = SyntaxFactory.ArrayCreationExpression(arrayType, arrayInitializer);
+			}
+
+			newExpression = newExpression.WithAdditionalAnnotations(InitializerAnnotation);
+
+			updatedDocument = await updatedDocument.ReplaceNodeAsync(variableDeclarator.Initializer.Value, newExpression, cancellationToken).ConfigureAwait(false);
+			semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			newExpression = await FindInitializerAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			var newVariableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			localSymbol = (ILocalSymbol)semanticModel.GetDeclaredSymbol(newVariableDeclarator, cancellationToken);
+
+			var explicitCastExpression = newExpression.CastIfPossible(localSymbol.Type, newVariableDeclarator.SpanStart, semanticModel);
+
+			if (explicitCastExpression != newExpression)
+			{
+				updatedDocument = await updatedDocument.ReplaceNodeAsync(newExpression, explicitCastExpression, cancellationToken).ConfigureAwait(false);
+				semanticModel = await updatedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+				newVariableDeclarator = await FindDeclaratorAsync(updatedDocument, cancellationToken).ConfigureAwait(false);
+			}
+
+			// Now that the variable declarator is normalized, make its initializer
+			// value semantically explicit.
+			newExpression = await Simplifier.ExpandAsync(newVariableDeclarator.Initializer.Value, updatedDocument, cancellationToken: cancellationToken).ConfigureAwait(false);
+			return newExpression.WithAdditionalAnnotations(ExpressionToInlineAnnotation);
+		}
+
+		private static SyntaxNode GetTopMostParentingExpression(ExpressionSyntax expression)
+		{
+			return expression.AncestorsAndSelf().OfType<ExpressionSyntax>().Last();
+		}
+
+		private static async Task<Document> DetectSemanticConflicts(
+			Document inlinedDocument,
+			SemanticModel newSemanticModelForInlinedDocument,
+			SemanticModel semanticModelBeforeInline,
+			SymbolInfo originalInitializerSymbolInfo,
+			CancellationToken cancellationToken)
+		{
+			// In this method we detect if inlining the expression introduced the following semantic change:
+			// The symbol info associated with any of the inlined expressions does not match the symbol info for original initializer expression prior to inline.
+
+			// If any semantic changes were introduced by inlining, we update the document with conflict annotations.
+			// Otherwise we return the given inlined document without any changes.
+
+			var syntaxRootBeforeInline = await semanticModelBeforeInline.SyntaxTree.GetRootAsync(cancellationToken).ConfigureAwait(false);
+
+			// Get all the identifier nodes which were replaced with inlined expression.
+			var originalIdentifierNodes = FindReferenceAnnotatedNodes(syntaxRootBeforeInline).ToList ();
+
+			if (!originalIdentifierNodes.Any())
+			{
+				// No conflicts
+				return inlinedDocument;
+			}
+
+			// Get all the inlined expression nodes.
+			var syntaxRootAfterInline = await inlinedDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var inlinedExprNodes = syntaxRootAfterInline.GetAnnotatedNodesAndTokens(ExpressionToInlineAnnotation).ToList ();
+			Debug.Assert(originalIdentifierNodes.Count() == inlinedExprNodes.Count());
+
+			Dictionary<SyntaxNode, SyntaxNode> replacementNodesWithChangedSemantics = null;
+			using (var originalNodesEnum = originalIdentifierNodes.GetEnumerator())
+			{
+				using (var inlinedNodesOrTokensEnum = inlinedExprNodes.GetEnumerator())
+				{
+					while (originalNodesEnum.MoveNext())
+					{
+						inlinedNodesOrTokensEnum.MoveNext();
+						var originalNode = originalNodesEnum.Current;
+
+						// expressionToInline is Parenthesized prior to replacement, so get the parenting parenthesized expression.
+						var inlinedNode = (ExpressionSyntax)inlinedNodesOrTokensEnum.Current.Parent;
+						Debug.Assert(inlinedNode.IsKind(SyntaxKind.ParenthesizedExpression));
+
+						// inlinedNode is the expanded form of the actual initializer expression in the original document.
+						// We have annotated the inner initializer with a special syntax annotation "InitializerAnnotation".
+						// Get this annotated node and compute the symbol info for this node in the inlined document.
+						var innerInitializerInInlineNodeorToken = inlinedNode.GetAnnotatedNodesAndTokens(InitializerAnnotation).First();
+
+						ExpressionSyntax innerInitializerInInlineNode = (ExpressionSyntax)(innerInitializerInInlineNodeorToken.IsNode ?
+							innerInitializerInInlineNodeorToken.AsNode() :
+							innerInitializerInInlineNodeorToken.AsToken().Parent);
+						var newInializerSymbolInfo = newSemanticModelForInlinedDocument.GetSymbolInfo(innerInitializerInInlineNode, cancellationToken);
+
+						// Verification: The symbol info associated with any of the inlined expressions does not match the symbol info for original initializer expression prior to inline.
+						if (!SpeculationAnalyzer.SymbolInfosAreCompatible(originalInitializerSymbolInfo, newInializerSymbolInfo, performEquivalenceCheck: true))
+						{
+							newInializerSymbolInfo = newSemanticModelForInlinedDocument.GetSymbolInfo(inlinedNode, cancellationToken);
+							if (!SpeculationAnalyzer.SymbolInfosAreCompatible(originalInitializerSymbolInfo, newInializerSymbolInfo, performEquivalenceCheck: true))
+							{
+								if (replacementNodesWithChangedSemantics == null)
+								{
+									replacementNodesWithChangedSemantics = new Dictionary<SyntaxNode, SyntaxNode>();
+								}
+
+								replacementNodesWithChangedSemantics.Add(inlinedNode, originalNode);
+							}
+						}
+					}
+				}
+			}
+
+			if (replacementNodesWithChangedSemantics == null)
+			{
+				// No conflicts.
+				return inlinedDocument;
+			}
+
+			// Replace the conflicting inlined nodes with the original nodes annotated with conflict annotation.
+			Func<SyntaxNode, SyntaxNode, SyntaxNode> conflictAnnotationAdder =
+				(SyntaxNode oldNode, SyntaxNode newNode) =>
+				newNode.WithAdditionalAnnotations(ConflictAnnotation.Create(GettextCatalog.GetString ("Conflict(s) detected.")));
+
+			return await inlinedDocument.ReplaceNodesAsync(replacementNodesWithChangedSemantics.Keys, conflictAnnotationAdder, cancellationToken).ConfigureAwait(false);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/IntroduceVariable/IntroduceVariableCodeRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/IntroduceVariable/IntroduceVariableCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..59f1b83585
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/IntroduceVariable/IntroduceVariableCodeRefactoringProvider.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable;
+using ICSharpCode.NRefactory6.CSharp;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.IntroduceVariable
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.IntroduceVariable), Shared]
+	class IntroduceVariableCodeRefactoringProvider : CodeRefactoringProvider
+	{
+		static readonly CSharpIntroduceVariableService service = new CSharpIntroduceVariableService ();
+
+		public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			var document = context.Document;
+			var textSpan = context.Span;
+			var cancellationToken = context.CancellationToken;
+			if (document.Project.Solution.Workspace.Kind == WorkspaceKind.MiscellaneousFiles)
+			{
+				return;
+			}
+			var model = await document.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+			var result = await service.IntroduceVariableAsync(document, textSpan, cancellationToken).ConfigureAwait(false);
+
+			if (!result.ContainsChanges)
+			{
+				return;
+			}
+
+			var actions = result.GetCodeRefactoring(cancellationToken).Actions;
+			context.RegisterRefactorings(actions);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
new file mode 100644
index 0000000000..87228da8cf
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
@@ -0,0 +1,47 @@
+//
+// PredefinedCodeRefactoringProviderNames.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.CSharp.CodeRefactorings
+{
+	static class PredefinedCodeRefactoringProviderNames
+	{
+		public const string AddConstructorParametersFromMembers = "Add Parameters From Members Code Action Provider";
+		public const string ChangeSignature = "Change Signature Code Action Provider";
+		public const string EncapsulateField = "Encapsulate Field";
+		public const string ExtractInterface = "Extract Interface Code Action Provider";
+		public const string ExtractMethod = "Extract Method Code Action Provider";
+		public const string GenerateConstructorFromMembers = "Generate Constructor From Members Code Action Provider";
+		public const string GenerateDefaultConstructors = "Generate Default Constructors Code Action Provider";
+		public const string GenerateEqualsAndGetHashCode = "Generate Equals and GetHashCode Code Action Provider";
+		public const string InlineTemporary = "Inline Temporary Code Action Provider";
+		public const string IntroduceVariable = "Introduce Variable Code Action Provider";
+		public const string InvertIf = "Invert If Code Action Provider";
+		public const string MoveDeclarationNearReference = "Move Declaration Near Reference Code Action Provider";
+		public const string SimplifyLambda = "Simplify Lambda Code Action Provider";
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/Resources.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/Resources.cs
new file mode 100644
index 0000000000..0f4728caa5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/Resources.cs
@@ -0,0 +1,98 @@
+//
+// Resources.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class Resources 
+	{
+		public static string GenerateConstructor = "Generate constructor '{0}({1})'";
+		public static string GenerateFieldAssigningConstructor = "Generate field assigning constructor '{0}({1})'";
+		public static string GenerateDelegatingConstructor = "Generate delegating constructor '{0}({1})'";
+
+		public static string GenerateEnumMemberIn = "Generate enum member '{0}' in '{1}'";
+		public static string GenerateNewConstructorIn = "Generate constructor in '{0}'";
+
+		public static string GenerateAbstractMethod = "Generate abstract method '{0}' in '{1}'";
+		public static string GenerateAbstractProperty = "Generate abstract property '{0}' in '{1}'";
+		public static string GeneratePropertyIn = "Generate property '{1}.{0}'";
+		public static string GenerateMethodIn = "Generate method '{1}.{0}'";
+
+		public static string GenerateAll = "Generate all";
+
+		public static string GenerateConstantIn = "Generate constant '{0}' in '{1}'";
+		public static string GenerateReadonlyProperty = "Generate read-only property '{1}.{0}'";
+		public static string GenerateReadonlyField = "Generate read-only field '{1}.{0}'";
+		public static string GenerateFieldIn = "Generate field '{0}' in '{1}'";
+		public static string GenerateLocal = "Generate local '{0}'";
+
+		public static string ImplementInterface = "Implement interface";
+		public static string ImplementInterfaceAbstractly = "Implement interface abstractly";
+		public static string ImplementInterfaceExplicitly = "Implement interface explicitly";
+		public static string ImplementInterfaceExplicitlyWithDisposePattern = "Implement interface explicitly with Dispose pattern";
+		public static string ImplementInterfaceThrough = "Implement interface through '{0}'";
+		public static string ImplementInterfaceWithDisposePattern = "Implement interface with Dispose pattern";
+
+		public static string ImplicitConversionDisplayText = "Generate implicit conversion operator in '{0}'";
+		public static string ExplicitConversionDisplayText = "Generate explicit conversion operator in '{0}'";
+
+		public static string GenerateForIn = "Generate {0} for '{1}' in '{2}'";
+		public static string GenerateForInNewFile = "Generate {0} for '{1}' in '{2}' (new file)";
+		public static string GlobalNamespace = "Global Namespace";
+		public static string GenerateNewType = "Generate new type...";
+		public static string ToDetectRedundantCalls = "To detect redundant calls";
+
+		public static string DisposeManagedStateTodo = "TODO: dispose managed state (managed objects).";
+		public static string FreeUnmanagedResourcesTodo = "TODO: free unmanaged resources (unmanaged objects) and override a finalizer below.";
+		public static string SetLargeFieldsToNullTodo = "TODO: set large fields to null.";
+		public static string OverrideAFinalizerTodo = "TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources.";
+		public static string DoNotChangeThisCodeUseDispose = "Do not change this code. Put cleanup code in Dispose(bool disposing) above.";
+		public static string ThisCodeAddedToCorrectlyImplementDisposable = "This code added to correctly implement the disposable pattern.";
+		public static string UncommentTheFollowingIfFinalizerOverriddenTodo = "TODO: uncomment the following line if the finalizer is overridden above.";
+
+
+		public static string IntroduceConstantFor = "Introduce constant for '{0}'";
+		public static string IntroduceConstantForAllOccurrences = "Introduce constant for all occurrences of '{0}'";
+		public static string IntroduceFieldFor = "Introduce field for '{0}'";
+		public static string IntroduceFieldForAllOccurrences = "Introduce field for all occurrences of '{0}'";
+		public static string IntroduceLocalConstantFor = "Introduce local constant for '{0}'";
+		public static string IntroduceLocalConstantForAll = "Introduce local constant for all occurrences of '{0}'";
+		public static string IntroduceLocalFor = "Introduce local for '{0}'";
+		public static string IntroduceLocalForAllOccurrences = "Introduce local for all occurrences of '{0}'";
+		public static string IntroduceQueryVariableFor = "Introduce query variable for '{0}'";
+		public static string IntroduceQueryVariableForAll = "Introduce query variable for all occurrences of '{0}'";
+
+		public static string OrganizeUsingsWithAccelerator = "_Organize Usings";
+		public static string RemoveAndSortUsingsWithAccelerator = "Remove _and Sort Usings";
+		public static string SortUsingsWithAccelerator = "_Sort Usings";
+		public static string RemoveUnnecessaryUsingsWithAccelerator = "_Remove Unnecessary Usings";
+		public static string EncapsulateFieldsUsages = "Encapsulate fields (and use property)";
+		public static string EncapsulateFields = "Encapsulate fields (but still use field)";
+		public static string EncapsulateFieldUsages = "Encapsulate field: '{0}' (and use property)";
+		public static string EncapsulateField = "Encapsulate field: '{0}' (but still use field)";
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/TypeGuessing.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/TypeGuessing.cs
new file mode 100644
index 0000000000..bc53ea931c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/TypeGuessing.cs
@@ -0,0 +1,384 @@
+//
+// TypeGuessing.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Threading;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class TypeGuessing
+	{
+		static int GetArgumentIndex(IEnumerable<ArgumentSyntax> arguments, SyntaxNode parameter)
+		{
+			//Console.WriteLine("arg:" +parameter);
+			int argumentNumber = 0;
+			foreach (var arg in arguments) {
+				//Console.WriteLine(arg +"/"+parameter);
+				if (arg == parameter) {
+					return argumentNumber;
+				}
+				argumentNumber++;
+			}
+			return -1;
+		}
+
+		static IEnumerable<ITypeSymbol> GetAllValidTypesFromInvocation(SemanticModel resolver, InvocationExpressionSyntax invoke, SyntaxNode parameter)
+		{
+			int index = GetArgumentIndex(invoke.ArgumentList.Arguments, parameter);
+			if (index < 0)
+				yield break;
+			var targetResult = resolver.GetSymbolInfo(invoke.Expression);
+
+//			var targetResult = resolver.Resolve(invoke.Target) as MethodGroupResolveResult;
+//			if (targetResult != null) {
+			foreach (var method in targetResult.CandidateSymbols) {
+				var parameters = method.GetParameters();
+				if (index < parameters.Length) {
+					if (parameters [index].IsParams) {
+						var arrayType = parameters[index].Type as IArrayTypeSymbol;
+						if (arrayType != null)
+							yield return arrayType.ElementType;
+					}
+					yield return parameters[index].Type;
+				}
+			}
+
+//				foreach (var extMethods in targetResult.GetExtensionMethods ()) {
+//					foreach (var extMethod in extMethods) {
+//						ITypeSymbol[] inferredTypes;
+//						var m = extMethod;
+//						if (CSharpResolver.IsEligibleExtensionMethod(targetResult.TargetType, extMethod, true, out inferredTypes)) {
+//							if (inferredTypes != null)
+//								m = extMethod.Specialize(new TypeParameterSubstitution(null, inferredTypes));
+//						}
+//
+//						int correctedIndex = index + 1;
+//						if (correctedIndex < m.Parameters.Count) {
+//							if (m.Parameters [correctedIndex].IsParams) {
+//								var arrayType = m.Parameters [correctedIndex].Type as ArrayType;
+//								if (arrayType != null)
+//									yield return arrayType.ElementType;
+//							}
+//							yield return m.Parameters [correctedIndex].Type;
+//						}
+//					}
+//				}
+//			}
+		}
+
+//		static IEnumerable<ITypeSymbol> GetAllValidTypesFromObjectCreation(SemanticModel resolver, ObjectCreateExpressionSyntax invoke, SyntaxNode parameter)
+//		{
+//			int index = GetArgumentIndex(invoke.Arguments, parameter);
+//			if (index < 0)
+//				yield break;
+//
+//			var targetResult = resolver.Resolve(invoke.Type);
+//			if (targetResult is TypeResolveResult) {
+//				var type = ((TypeResolveResult)targetResult).Type;
+//				if (type.Kind == TypeKind.Delegate && index == 0) {
+//					yield return type;
+//					yield break;
+//				}
+//				foreach (var constructor in type.GetConstructors ()) {
+//					if (index < constructor.Parameters.Count)
+//						yield return constructor.Parameters [index].Type;
+//				}
+//			}
+//		}
+//
+//		public static ITypeSymbol GetElementType(SemanticModel resolver, ITypeSymbol type)
+//		{
+//			// TODO: A better get element type method.
+//			if (type.Kind == TypeKind.Array || type.Kind == TypeKind.Dynamic) {
+//				if (type.Kind == TypeKind.Array)
+//					return ((ArrayType)type).ElementType;
+//				return resolver.Compilation.FindType(KnownTypeCode.Object);
+//			}
+//
+//
+//			foreach (var method in type.GetMethods (m => m.Name == "GetEnumerator")) {
+//				ITypeSymbol returnType = null;
+//				foreach (var prop in method.ReturnType.GetProperties(p => p.Name == "Current")) {
+//					if (returnType != null && prop.ReturnType.IsKnownType (KnownTypeCode.Object))
+//						continue;
+//					returnType = prop.ReturnType;
+//				}
+//				if (returnType != null)
+//					return returnType;
+//			}
+//
+//			return resolver.Compilation.FindType(KnownTypeCode.Object);
+//		}
+//
+//		static IEnumerable<ITypeSymbol> GuessFromConstructorInitializer(SemanticModel resolver, SyntaxNode expr)
+//		{
+//			var init = expr.Parent as ConstructorInitializer;
+//			var rr = resolver.Resolve(expr.Parent);
+//			int index = GetArgumentIndex(init.Arguments, expr);
+//			if (index >= 0) {
+//				foreach (var constructor in rr.Type.GetConstructors()) {
+//					if (index < constructor.Parameters.Count) {
+//						yield return constructor.Parameters[index].Type;
+//					}
+//				}
+//			}
+//		}
+
+		public static IEnumerable<ITypeSymbol> GetValidTypes(SemanticModel model, SyntaxNode expr, CancellationToken cancellationToken = default(CancellationToken))
+		{
+//			if (expr.Role == Roles.Condition) {
+//				return new [] { model.Compilation.FindType (KnownTypeCode.Boolean) };
+//			}
+//
+			var mref = expr.Parent as MemberAccessExpressionSyntax;
+			if (mref != null && mref.Name != expr) {
+				mref = null;
+			}
+			if (mref != null) {
+				// case: guess enum when trying to access not existent enum member
+				var rr = model.GetTypeInfo(mref.Expression);
+				if (rr.Type != null && rr.Type.TypeKind == TypeKind.Enum)
+					return new [] { rr.Type };
+			}
+
+//			if (expr.Parent is ParenthesizedExpressionSyntax || expr.Parent is NamedArgumentExpressionSyntax) {
+//				return GetValidTypes(model, expr.Parent);
+//			}
+//			if (expr.Parent is DirectionExpressionSyntax) {
+//				var parent = expr.Parent.Parent;
+//				if (parent is InvocationExpressionSyntax) {
+//					var invoke = (InvocationExpressionSyntax)parent;
+//					return GetAllValidTypesFromInvocation(model, invoke, expr.Parent);
+//				}
+//			}
+//
+//			if (expr.Parent is ArrayInitializerExpressionSyntax) {
+//				if (expr is NamedExpressionSyntax)
+//					return new [] { model.Resolve(((NamedExpressionSyntax)expr).ExpressionSyntax).Type };
+//
+//				var aex = expr.Parent as ArrayInitializerExpressionSyntax;
+//				if (aex.IsSingleElement)
+//					aex = aex.Parent as ArrayInitializerExpressionSyntax;
+//				var type = GetElementType(model, model.Resolve(aex.Parent).Type);
+//				if (type.Kind != TypeKind.Unknown)
+//					return new [] { type };
+//			}
+//
+//			if (expr.Parent is ObjectCreateExpressionSyntax) {
+//				var invoke = (ObjectCreateExpressionSyntax)expr.Parent;
+//				return GetAllValidTypesFromObjectCreation(model, invoke, expr);
+//			}
+//
+//			if (expr.Parent is ArrayCreateExpressionSyntax) {
+//				var ace = (ArrayCreateExpressionSyntax)expr.Parent;
+//				if (!ace.Type.IsNull) {
+//					return new [] { model.Resolve(ace.Type).Type };
+//				}
+//			}
+//
+//			if (expr.Parent is VariableInitializer) {
+//				var initializer = (VariableInitializer)expr.Parent;
+//				var field = initializer.GetParent<FieldDeclaration>();
+//				if (field != null) {
+//					var rr = model.Resolve(field.ReturnType);
+//					if (!rr.IsError)
+//						return new [] { rr.Type };
+//				}
+//				var varStmt = initializer.GetParent<VariableDeclarationStatement>();
+//				if (varStmt != null) {
+//					var rr = model.Resolve(varStmt.Type);
+//					if (!rr.IsError)
+//						return new [] { rr.Type };
+//				}
+//				return new [] { model.Resolve(initializer).Type };
+//			}
+//
+//			if (expr.Parent is CastExpressionSyntax) {
+//				var cast = (CastExpressionSyntax)expr.Parent;
+//				return new [] { model.Resolve(cast.Type).Type };
+//			}
+//
+//			if (expr.Parent is AsExpressionSyntax) {
+//				var cast = (AsExpressionSyntax)expr.Parent;
+//				return new [] { model.Resolve(cast.Type).Type };
+//			}
+
+			if (expr.Parent is AssignmentExpressionSyntax || mref != null && mref.Parent is AssignmentExpressionSyntax ) {
+				var assign = expr.Parent as AssignmentExpressionSyntax ?? mref.Parent as AssignmentExpressionSyntax;
+				var other = assign.Left == expr || assign.Left == mref ? assign.Right : assign.Left;
+				return new [] { model.GetTypeInfo(other).Type };
+			}
+
+//			if (expr.Parent is BinaryOperatorExpressionSyntax) {
+//				var assign = (BinaryOperatorExpressionSyntax)expr.Parent;
+//				var other = assign.Left == expr ? assign.Right : assign.Left;
+//				return new [] { model.Resolve(other).Type };
+//			}
+//
+//			if (expr.Parent is ReturnStatement) {
+//				var parent = expr.Ancestors.FirstOrDefault(n => n is EntityDeclaration || n is AnonymousMethodExpressionSyntax|| n is LambdaExpressionSyntax);
+//				if (parent != null) {
+//					var rr = model.Resolve(parent);
+//					if (!rr.IsError)
+//						return new [] { rr.Type };
+//				}
+//				var e = parent as EntityDeclaration;
+//				if (e != null) {
+//					var rt = model.Resolve(e.ReturnType);
+//					if (!rt.IsError)
+//						return new [] { rt.Type };
+//				}
+//			}
+//
+//			if (expr.Parent is YieldReturnStatement) {
+//				var state = model.GetResolverStateBefore(expr);
+//				if (state != null && (state.CurrentMember.ReturnType is ParameterizedType)) {
+//					var pt = (ParameterizedType)state.CurrentMember.ReturnType;
+//					if (pt.FullName == "System.Collections.Generic.IEnumerable") {
+//						return new [] { pt.TypeArguments.First() };
+//					}
+//				}
+//			}
+//
+//			if (expr.Parent is UnaryOperatorExpressionSyntax) {
+//				var uop = (UnaryOperatorExpressionSyntax)expr.Parent;
+//				switch (uop.Operator) {
+//					case UnaryOperatorType.Not:
+//						return new [] { model.Compilation.FindType(KnownTypeCode.Boolean) };
+//						case UnaryOperatorType.Minus:
+//						case UnaryOperatorType.Plus:
+//						case UnaryOperatorType.Increment:
+//						case UnaryOperatorType.Decrement:
+//						case UnaryOperatorType.PostIncrement:
+//						case UnaryOperatorType.PostDecrement:
+//						return new [] { model.Compilation.FindType(KnownTypeCode.Int32) };
+//				}
+//			}
+//
+//			if (expr.Parent is ConstructorInitializer)
+//				return GuessFromConstructorInitializer(model, expr);
+//
+//			if (expr.Parent is NamedExpressionSyntax) {
+//				var rr = model.Resolve(expr.Parent);
+//				if (!rr.IsError) {
+//					return new [] { rr.Type };
+//				}
+//			}
+
+			if (expr.IsKind(SyntaxKind.Argument)) {
+				var parent = expr.Parent.Parent;
+				var invocationParent = parent as InvocationExpressionSyntax;
+				if (invocationParent != null) {
+					return GetAllValidTypesFromInvocation(model, invocationParent, expr);
+				}
+			}
+
+			var types = typeInferenceService.InferTypes(model, expr, cancellationToken).ToList();
+
+			return types;
+		}
+
+		public static readonly CSharpTypeInferenceService typeInferenceService = new CSharpTypeInferenceService ();
+
+		public static TypeSyntax GuessAstType(SemanticModel context, SyntaxNode expr, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var types = GetValidTypes(context, expr,cancellationToken).ToList();
+			/*var typeInference = new TypeInference(context.Compilation);
+			typeInference.Algorithm = TypeInferenceAlgorithm.Improved;
+			var inferedType = typeInference.FindTypeInBounds(type, emptyTypes);*/
+
+			if (types.Count == 0)
+				return SyntaxFactory.PredefinedType(SyntaxFactory.Token(SyntaxKind.ObjectKeyword));
+
+			var resultType = types[0];
+
+			foreach (var type in types) {
+				if (type.SpecialType == SpecialType.System_Object) {
+					resultType = type;
+					break;
+				}
+			}
+
+			return resultType.GenerateTypeSyntax ();
+		}
+
+
+		public static ITypeSymbol GuessType(SemanticModel context, SyntaxNode expr, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var types = GetValidTypes(context, expr,cancellationToken).ToList();
+			/*var typeInference = new TypeInference(context.Compilation);
+			typeInference.Algorithm = TypeInferenceAlgorithm.Improved;
+			var inferedType = typeInference.FindTypeInBounds(type, emptyTypes);*/
+
+			if (types.Count == 0)
+				return context.Compilation.GetTypeSymbol ("System", "Object", 0, cancellationToken);
+
+			var resultType = types[0];
+
+			foreach (var type in types) {
+				if (type.SpecialType == SpecialType.System_Object) {
+					resultType = type;
+					break;
+				}
+			}
+
+			return resultType;
+		}
+
+//		public static ITypeSymbol GuessType(BaseRefactoringContext context, SyntaxNode expr)
+//		{
+//			if (expr is SimpleType && expr.Role == Roles.TypeArgument) {
+//				if (expr.Parent is MemberReferenceExpressionSyntax || expr.Parent is IdentifierExpressionSyntax) {
+//					var rr = context.Resolve (expr.Parent);
+//					var argumentNumber = expr.Parent.GetChildrenByRole (Roles.TypeArgument).TakeWhile (c => c != expr).Count ();
+//
+//					var mgrr = rr as MethodGroupResolveResult;
+//					if (mgrr != null && mgrr.Methods.Any () && mgrr.Methods.First ().TypeArguments.Count > argumentNumber)
+//						return mgrr.Methods.First ().TypeParameters[argumentNumber]; 
+//				} else if (expr.Parent is MemberType || expr.Parent is SimpleType) {
+//					var rr = context.Resolve (expr.Parent);
+//					var argumentNumber = expr.Parent.GetChildrenByRole (Roles.TypeArgument).TakeWhile (c => c != expr).Count ();
+//					var mgrr = rr as TypeResolveResult;
+//					if (mgrr != null &&  mgrr.Type.TypeParameterCount > argumentNumber) {
+//						return mgrr.Type.GetDefinition ().TypeParameters[argumentNumber]; 
+//					}
+//				}
+//			}
+//
+//			var type = GetValidTypes(context.Resolver, expr).ToArray();
+//			var typeInference = new TypeInference(context.Compilation);
+//			typeInference.Algorithm = TypeInferenceAlgorithm.Improved;
+//			var inferedType = typeInference.FindTypeInBounds(type, emptyTypes);
+//			return inferedType;
+//		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/UsingRefactorings/SortImportsCodeRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/UsingRefactorings/SortImportsCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..388386c4b4
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeRefactorings/UsingRefactorings/SortImportsCodeRefactoringProvider.cs
@@ -0,0 +1,118 @@
+//
+// SortImportsCodeRefactoringProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Composition;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable;
+using ICSharpCode.NRefactory6.CSharp;
+using RefactoringEssentials;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core;
+using System;
+using System.Threading;
+using MonoDevelop.CSharp.Refactoring;
+using System.Linq;
+
+namespace MonoDevelop.CSharp.CodeRefactorings.IntroduceVariable
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = "Sort Imports Code Action Provider"), Shared]
+	class SortImportsCodeRefactoringProvider : CodeRefactoringProvider
+	{
+		public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			var document = context.Document;
+			var textSpan = context.Span;
+			var cancellationToken = context.CancellationToken;
+			if (document.Project.Solution.Workspace.Kind == WorkspaceKind.MiscellaneousFiles)
+			{
+				return;
+			}
+			var model = await document.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+			var root = await document.GetCSharpSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			if (textSpan.Start >= root.FullSpan.Length)
+				return;
+			var token = root.FindToken(textSpan.Start);
+
+			if (!token.Span.Contains(textSpan))
+			{
+				return;
+			}
+
+			var node = token.Parent.AncestorsAndSelf ().FirstOrDefault (n => n.IsKind(SyntaxKind.UsingDirective)  || n.IsParentKind(SyntaxKind.ExternAliasDirective));
+			if (node == null)
+			{
+				return;
+			}
+
+			context.RegisterRefactoring(
+				new DocumentChangeAction(node.Span, DiagnosticSeverity.Info,
+				                         GettextCatalog.GetString ("Sort usings"),
+				                         (t) => OrganizeImportsCommandHandler.SortUsingsAsync(document, t)));
+		}
+	}
+
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = "Sort And Remove Imports Code Action Provider"), Shared]
+	class SortAndRemoveImportsCodeRefactoringProvider : CodeRefactoringProvider
+	{
+		public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			var document = context.Document;
+			var textSpan = context.Span;
+			var cancellationToken = context.CancellationToken;
+			if (document.Project.Solution.Workspace.Kind == WorkspaceKind.MiscellaneousFiles)
+			{
+				return;
+			}
+			var model = await document.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return;
+			var root = await document.GetCSharpSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			if (textSpan.Start >= root.FullSpan.Length)
+				return;
+			var token = root.FindToken(textSpan.Start);
+			if (!token.Span.Contains(textSpan))
+			{
+				return;
+			}
+
+			var node = token.Parent.AncestorsAndSelf ().FirstOrDefault (n => n.IsKind(SyntaxKind.UsingDirective)  || n.IsParentKind(SyntaxKind.ExternAliasDirective));
+			if (node == null)
+			{
+				return;
+			}
+
+			context.RegisterRefactoring(
+				new DocumentChangeAction(node.Span, DiagnosticSeverity.Info,
+				                         GettextCatalog.GetString ("Sort and remove usings"),
+				                         (t) => SortAndRemoveImportsCommandHandler.SortAndRemoveAsync(document, t)));
+		}
+	}
+
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AbstractParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AbstractParameterDataProvider.cs
index d505a33737..8cde44cca3 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AbstractParameterDataProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AbstractParameterDataProvider.cs
@@ -35,7 +35,7 @@ using MonoDevelop.Ide.CodeCompletion;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	abstract class AbstractParameterDataProvider : ParameterDataProvider
+	abstract class AbstractParameterDataProvider : ParameterHintingData
 	{
 		protected CSharpCompletionTextEditorExtension ext;
 
@@ -49,28 +49,29 @@ namespace MonoDevelop.CSharp.Completion
 		TypeSystemAstBuilder builder;
 		protected string GetShortType (IType type)
 		{
-			if (builder == null) {
-				var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Document.Editor.Caret.Location);
-				var state = new CSharpResolver (ctx);
-				builder = new TypeSystemAstBuilder (state);
-				var dt = state.CurrentTypeDefinition;
-				var declaring = ctx.CurrentTypeDefinition != null ? ctx.CurrentTypeDefinition.DeclaringTypeDefinition : null;
-				if (declaring != null) {
-					while (dt != null) {
-						if (dt.Equals (declaring)) {
-							builder.AlwaysUseShortTypeNames = true;
-							break;
-						}
-						dt = dt.DeclaringTypeDefinition;
-					}
-				}
-			}
-			try {
-				return GLib.Markup.EscapeText (builder.ConvertType(type).ToString (ext.FormattingPolicy.CreateOptions ()));
-			} catch (Exception e) {
-				LoggingService.LogError ("Exception while getting short type.", e);
-				return "";
-			}
+			return type.Name;
+//			if (builder == null) {
+//				var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Document.Editor.Caret.Location);
+//				var state = new CSharpResolver (ctx);
+//				builder = new TypeSystemAstBuilder (state);
+//				var dt = state.CurrentTypeDefinition;
+//				var declaring = ctx.CurrentTypeDefinition != null ? ctx.CurrentTypeDefinition.DeclaringTypeDefinition : null;
+//				if (declaring != null) {
+//					while (dt != null) {
+//						if (dt.Equals (declaring)) {
+//							builder.AlwaysUseShortTypeNames = true;
+//							break;
+//						}
+//						dt = dt.DeclaringTypeDefinition;
+//					}
+//				}
+//			}
+//			try {
+//				return GLib.Markup.EscapeText (builder.ConvertType(type).ToString (ext.FormattingPolicy.CreateOptions ()));
+//			} catch (Exception e) {
+//				LoggingService.LogError ("Exception while getting short type.", e);
+//				return "";
+//			}
 		}
 
 		protected string GetParameterString (IParameter parameter)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AnonymousMethodCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AnonymousMethodCompletionData.cs
new file mode 100644
index 0000000000..a9a0652de2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/AnonymousMethodCompletionData.cs
@@ -0,0 +1,65 @@
+//
+// AnonymousMethodCompletionData.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.CSharp.Formatting;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class AnonymousMethodCompletionData : RoslynCompletionData
+	{
+		RoslynCodeCompletionFactory factory;
+		public override int PriorityGroup { get { return 2; } }
+
+		public AnonymousMethodCompletionData (RoslynCodeCompletionFactory factory, ICompletionDataKeyHandler keyHandler) : base (keyHandler)
+		{
+			this.factory = factory;
+			this.Icon = "md-newmethod";
+		}
+
+		public override int CompareTo (object obj)
+		{
+			var anonymousMethodCompletionData = obj as AnonymousMethodCompletionData;
+			if (anonymousMethodCompletionData == null)
+				return -1;
+
+			return DisplayText.CompareTo(anonymousMethodCompletionData.DisplayText);
+		}
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Ide.Editor.Extension.KeyDescriptor descriptor)
+		{
+			base.InsertCompletionText (window, ref ka, descriptor);
+			factory.Ext.Editor.GetContent<CSharpTextEditorIndentation> ().DoReSmartIndent ();
+			if (this.CompletionText.Contains ("\n")) {
+				
+				factory.Ext.Editor.GetContent<CSharpTextEditorIndentation> ().DoReSmartIndent (factory.Ext.Editor.GetLine (factory.Ext.Editor.CaretLine).NextLine.Offset);
+			}
+		}
+
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ArrayTypeParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ArrayTypeParameterDataProvider.cs
index f909337cbf..e41ed579e5 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ArrayTypeParameterDataProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ArrayTypeParameterDataProvider.cs
@@ -29,7 +29,6 @@ using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.CSharp.Formatting;
 using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using Mono.TextEditor;
 
 namespace MonoDevelop.CSharp.Completion
 {
@@ -47,9 +46,9 @@ namespace MonoDevelop.CSharp.Completion
 			var tooltipInfo = new TooltipInformation ();
 			var file = ext.CSharpUnresolvedFile;
 			var compilation = ext.UnresolvedFileCompilation;
-			var textEditorData = ext.TextEditorData;
+			var textEditorData = ext.Editor;
 			var formattingPolicy = ext.FormattingPolicy;
-			var resolver = file.GetResolver (compilation, textEditorData.Caret.Location);
+			var resolver = file.GetResolver (compilation, textEditorData.CaretLocation);
 			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
 			sig.HighlightParameter = currentParameter;
 			tooltipInfo.SignatureMarkup = sig.GetArrayIndexerMarkup (arrayType);
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
index daa38a4a2d..82df3930d5 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
@@ -26,45 +26,46 @@
 
 using System;
 using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using MonoDevelop.Core;
 using System.Collections.Generic;
 
-using Mono.TextEditor;
-
-using MonoDevelop.Core;
 using MonoDevelop.Debugger;
-using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.CodeGeneration;
-using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.CodeTemplates;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Components.Commands;
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Completion;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.Completion;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-using MonoDevelop.CSharp.Project;
 using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using MonoDevelop.Refactoring;
+
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
 using System.Xml;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Refactoring;
+using System.Diagnostics;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide;
+using Mono.Addins;
+using System.Reflection;
+using System.Runtime.ExceptionServices;   
+using MonoDevelop.Ide.TypeSystem;
+using RefactoringEssentials;
+using MonoDevelop.CSharp.Diagnostics.InconsistentNaming;
+using RefactoringEssentials.CSharp.Diagnostics;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	public class CSharpCompletionTextEditorExtension : CompletionTextEditorExtension, IParameterCompletionDataFactory, ITextEditorMemberPositionProvider, IDebuggerExpressionResolver
+	sealed class CSharpCompletionTextEditorExtension : CompletionTextEditorExtension, IDebuggerExpressionResolver
 	{
-		internal protected virtual Mono.TextEditor.TextEditorData TextEditorData {
+/*		internal protected virtual Mono.TextEditor.TextEditorData TextEditorData {
 			get {
 				var doc = Document;
 				if (doc == null)
@@ -76,9 +77,12 @@ namespace MonoDevelop.CSharp.Completion
 		protected virtual IProjectContent ProjectContent {
 			get { return Document.GetProjectContext (); }
 		}
-
+*/
 		SyntaxTree unit;
-		static readonly SyntaxTree emptyUnit = new SyntaxTree ();
+		static readonly SyntaxTree emptyUnit = CSharpSyntaxTree.ParseText ("");
+
+		List<CompletionContextHandler> additionalContextHandlers = new List<CompletionContextHandler> ();
+
 		SyntaxTree Unit {
 			get {
 				return unit ?? emptyUnit;
@@ -87,36 +91,16 @@ namespace MonoDevelop.CSharp.Completion
 				unit = value;
 			}
 		}
-		
-		public new MonoDevelop.Ide.Gui.Document Document {
-			get {
-				return base.document;
-			}
-		}
 
-		public ICompilation UnresolvedFileCompilation {
-			get;
-			set;
-		}
-		
-		public CSharpUnresolvedFile CSharpUnresolvedFile {
-			get;
-			set;
-		}
-		
-		public ParsedDocument ParsedDocument {
+		public MonoDevelop.Ide.TypeSystem.ParsedDocument ParsedDocument {
 			get {
-				return document.ParsedDocument;
+				return DocumentContext.ParsedDocument;
 			}
 		}
-		
-		public virtual ICompilation Compilation {
-			get { return Project != null ? TypeSystemService.GetCompilation (Project) : ProjectContent.CreateCompilation (); }
-		}
-		
+		 
 		public MonoDevelop.Projects.Project Project {
 			get {
-				return document.Project;
+				return DocumentContext.Project;
 			}
 		}
 		
@@ -125,11 +109,7 @@ namespace MonoDevelop.CSharp.Completion
 			get {
 				if (policy == null) {
 					IEnumerable<string> types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
-					if (Document.Project != null && Document.Project.Policies != null) {
-						policy = base.Document.Project.Policies.Get<CSharpFormattingPolicy> (types);
-					} else {
-						policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types);
-					}
+					policy = DocumentContext.GetPolicy<CSharpFormattingPolicy> (types);
 				}
 				return policy;
 			}
@@ -141,14 +121,58 @@ namespace MonoDevelop.CSharp.Completion
 			}
 		}
 
-		internal MDRefactoringContext MDRefactoringCtx {
-			get;
-			private set;
+		internal static Func<Microsoft.CodeAnalysis.Document, CancellationToken, Task<Microsoft.CodeAnalysis.Document>> WithFrozenPartialSemanticsAsync;
+		static List<CompletionData> snippets;
+
+		static CSharpCompletionTextEditorExtension ()
+		{
+			try {
+				var methodInfo = typeof (Microsoft.CodeAnalysis.Document).GetMethod ("WithFrozenPartialSemanticsAsync", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.InvokeMethod);
+				if (methodInfo == null)
+					LoggingService.LogError ("Error in completion set up: Document.WithFrozenPartialSemanticsAsync not found!");
+
+				WithFrozenPartialSemanticsAsync = delegate (Microsoft.CodeAnalysis.Document doc, CancellationToken token) {
+					try {
+						return (Task<Microsoft.CodeAnalysis.Document>)methodInfo.Invoke (doc, new object [] { token });
+					} catch (TargetInvocationException ex) {
+						ExceptionDispatchInfo.Capture (ex.InnerException).Throw ();
+						return null;
+					}
+				};
+
+				CompletionEngine.SnippetCallback = delegate (CancellationToken arg) {
+					if (snippets != null)
+						return Task.FromResult ((IEnumerable<CompletionData>)snippets);
+					var newSnippets = new List<CompletionData> ();
+					foreach (var ct in MonoDevelop.Ide.CodeTemplates.CodeTemplateService.GetCodeTemplates ("text/x-csharp")) {
+						if (string.IsNullOrEmpty (ct.Shortcut) || ct.CodeTemplateContext != MonoDevelop.Ide.CodeTemplates.CodeTemplateContext.Standard)
+							continue;
+						newSnippets.Add (new RoslynCompletionData (null) {
+							CompletionText = ct.Shortcut,
+							DisplayText = ct.Shortcut,
+							Description = ct.Shortcut + Environment.NewLine + GettextCatalog.GetString (ct.Description),
+							Icon = ct.Icon
+						});
+					}
+					snippets = newSnippets;
+					return Task.FromResult ((IEnumerable<CompletionData>)newSnippets);
+				};
+				NameProposalService.Replace (new NameConventionRule.NamePropsalStrategy ());
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while loading c# completion text editor extension.", e);
+			}
 		}
 
-		
 		public CSharpCompletionTextEditorExtension ()
 		{
+			try {
+				foreach (var node in AddinManager.GetExtensionNodes<InstanceExtensionNode> ("/MonoDevelop/CSharp/Completion/ContextHandler")) {
+					var handler = (CompletionContextHandler)node.CreateInstance ();
+					additionalContextHandlers.Add (handler);
+				}
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while creating c# completion text editor extension.", e);
+			}
 		}
 
 		bool addEventHandlersInInitialization = true;
@@ -160,23 +184,23 @@ namespace MonoDevelop.CSharp.Completion
 		public CSharpCompletionTextEditorExtension (MonoDevelop.Ide.Gui.Document doc, bool addEventHandlersInInitialization = true) : this ()
 		{
 			this.addEventHandlersInInitialization = addEventHandlersInInitialization;
-			Initialize (doc);
+			Initialize (doc.Editor, doc);
 		}
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-			var parsedDocument = document.ParsedDocument;
+
+			var parsedDocument = DocumentContext.ParsedDocument;
 			if (parsedDocument != null) {
-				this.Unit = parsedDocument.GetAst<SyntaxTree> ();
-				this.UnresolvedFileCompilation = Compilation;
-				this.CSharpUnresolvedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-				if (addEventHandlersInInitialization)
-					document.Editor.Caret.PositionChanged += HandlePositionChanged;
+//				this.Unit = parsedDocument.GetAst<SyntaxTree> ();
+//					this.UnresolvedFileCompilation = DocumentContext.Compilation;
+//					this.CSharpUnresolvedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
+//					Editor.CaretPositionChanged += HandlePositionChanged;
 			}
-
+			
 			if (addEventHandlersInInitialization)
-				Document.DocumentParsed += HandleDocumentParsed; 
+				DocumentContext.DocumentParsed += HandleDocumentParsed; 
 		}
 
 		CancellationTokenSource src = new CancellationTokenSource ();
@@ -186,46 +210,27 @@ namespace MonoDevelop.CSharp.Completion
 			src.Cancel ();
 			src = new CancellationTokenSource ();
 		}
-
-		void HandlePositionChanged (object sender, DocumentLocationEventArgs e)
-		{
-			StopPositionChangedTask ();
-			var doc = Document;
-			if (doc == null || doc.Editor == null)
-				return;
-			MDRefactoringContext.Create (doc, doc.Editor.Caret.Location, src.Token).ContinueWith (t => {
-				MDRefactoringCtx = t.Result;
-			}, TaskContinuationOptions.ExecuteSynchronously);
-		}
-		
+			
 		[CommandUpdateHandler (CodeGenerationCommands.ShowCodeGenerationWindow)]
 		public void CheckShowCodeGenerationWindow (CommandInfo info)
 		{
-			info.Enabled = TextEditorData != null && Document.GetContent<ICompletionWidget> () != null;
+			info.Enabled = Editor != null && DocumentContext.GetContent<ICompletionWidget> () != null;
 		}
 
 		[CommandHandler (CodeGenerationCommands.ShowCodeGenerationWindow)]
 		public void ShowCodeGenerationWindow ()
 		{
-			var completionWidget = Document.GetContent<ICompletionWidget> ();
+			var completionWidget = DocumentContext.GetContent<ICompletionWidget> ();
 			if (completionWidget == null)
 				return;
-			CodeCompletionContext completionContext = completionWidget.CreateCodeCompletionContext (TextEditorData.Caret.Offset);
-			GenerateCodeWindow.ShowIfValid (Document, completionContext);
+			CodeCompletionContext completionContext = completionWidget.CreateCodeCompletionContext (Editor.CaretOffset);
+			GenerateCodeWindow.ShowIfValid (Editor, DocumentContext, completionContext);
 		}
 
 		public override void Dispose ()
 		{
-			StopPositionChangedTask ();
-			unit = null;
-			CSharpUnresolvedFile = null;
-			UnresolvedFileCompilation = null;
-			Document.DocumentParsed -= HandleDocumentParsed;
-			if (unstableTypeSystemSegmentTree != null) {
-				unstableTypeSystemSegmentTree.RemoveListener ();
-				unstableTypeSystemSegmentTree = null;
-			}
-
+			CancelParsedDocumentUpdate ();
+			DocumentContext.DocumentParsed -= HandleDocumentParsed;
 			if (validTypeSystemSegmentTree != null) {
 				validTypeSystemSegmentTree.RemoveListener ();
 				validTypeSystemSegmentTree = null;
@@ -234,32 +239,38 @@ namespace MonoDevelop.CSharp.Completion
 			base.Dispose ();
 		}
 
+		CancellationTokenSource documentParsedTokenSrc = new CancellationTokenSource ();
+
 		void HandleDocumentParsed (object sender, EventArgs e)
 		{
-			var newDocument = Document.ParsedDocument;
-			if (newDocument == null) 
+			var parsedDocument = DocumentContext.ParsedDocument;
+			if (parsedDocument == null)
 				return;
-			var newTree = TypeSystemSegmentTree.Create (newDocument, TextEditorData);
-
-			if (unstableTypeSystemSegmentTree != null)
-				unstableTypeSystemSegmentTree.RemoveListener ();
-
-			if (!newDocument.HasErrors) {
-				if (validTypeSystemSegmentTree != null)
-					validTypeSystemSegmentTree.RemoveListener ();
-				validTypeSystemSegmentTree = newTree;
-				unstableTypeSystemSegmentTree = null;
-			} else {
-				unstableTypeSystemSegmentTree = newTree;
-			}
-			newTree.InstallListener (document.Editor.Document);
+			var semanticModel = parsedDocument.GetAst<SemanticModel> ();
+			if (semanticModel == null)
+				return;
+			CancelParsedDocumentUpdate ();
+			var token = documentParsedTokenSrc.Token;
+			Task.Run(delegate {
+				try {
+					var newTree = TypeSystemSegmentTree.Create (semanticModel, token);
+					if (validTypeSystemSegmentTree != null)
+						validTypeSystemSegmentTree.RemoveListener ();
+					validTypeSystemSegmentTree = newTree;
+					newTree.InstallListener (Editor);
+					if (TypeSegmentTreeUpdated != null)
+						TypeSegmentTreeUpdated (this, EventArgs.Empty);
+				} catch (OperationCanceledException) {
+				}
+			});
+		}
 
-			this.Unit = newDocument.GetAst<SyntaxTree> ();
-			this.CSharpUnresolvedFile = newDocument.ParsedFile as CSharpUnresolvedFile;
-			this.UnresolvedFileCompilation = Compilation;
-			if (TypeSegmentTreeUpdated != null)
-				TypeSegmentTreeUpdated (this, EventArgs.Empty);
+		void CancelParsedDocumentUpdate ()
+		{
+			documentParsedTokenSrc.Cancel ();
+			documentParsedTokenSrc = new CancellationTokenSource ();
 		}
+
 		public event EventHandler TypeSegmentTreeUpdated;
 
 		public void UpdateParsedDocument ()
@@ -267,11 +278,11 @@ namespace MonoDevelop.CSharp.Completion
 			HandleDocumentParsed (null, null);
 		}
 		
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			bool result = base.KeyPress (key, keyChar, modifier);
+			bool result = base.KeyPress (descriptor);
 			
-			if (/*EnableParameterInsight &&*/ (keyChar == ',' || keyChar == ')') && CanRunParameterCompletionCommand ())
+			if (/*EnableParameterInsight &&*/ (descriptor.KeyChar == ',' || descriptor.KeyChar == ')') && CanRunParameterCompletionCommand ())
 				base.RunParameterCompletionCommand ();
 			
 //			if (IsInsideComment ())
@@ -279,26 +290,27 @@ namespace MonoDevelop.CSharp.Completion
 			return result;
 		}
 		
-		public override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
+		public override Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
 //			if (!EnableCodeCompletion)
 //				return null;
-			if (!EnableAutoCodeCompletion && char.IsLetter (completionChar))
+			if (!IdeApp.Preferences.EnableAutoCodeCompletion && char.IsLetter (completionChar))
 				return null;
 
 			//	var timer = Counters.ResolveTime.BeginTiming ();
 			try {
+				int triggerWordLength = 0;
 				if (char.IsLetterOrDigit (completionChar) || completionChar == '_') {
-					if (completionContext.TriggerOffset > 1 && char.IsLetterOrDigit (TextEditorData.GetCharAt (completionContext.TriggerOffset - 2)))
+					if (completionContext.TriggerOffset > 1 && char.IsLetterOrDigit (Editor.GetCharAt (completionContext.TriggerOffset - 2)))
 						return null;
 					triggerWordLength = 1;
 				}
-				return InternalHandleCodeCompletion (completionContext, completionChar, false, ref triggerWordLength);
+				return InternalHandleCodeCompletion (completionContext, completionChar, false, triggerWordLength, token);
 			} catch (Exception e) {
 				LoggingService.LogError ("Unexpected code completion exception." + Environment.NewLine + 
-					"FileName: " + Document.FileName + Environment.NewLine + 
+					"FileName: " + DocumentContext.Name + Environment.NewLine + 
 					"Position: line=" + completionContext.TriggerLine + " col=" + completionContext.TriggerLineOffset + Environment.NewLine + 
-					"Line text: " + TextEditorData.GetLineText (completionContext.TriggerLine), 
+					"Line text: " + Editor.GetLineText (completionContext.TriggerLine), 
 					e);
 				return null;
 			} finally {
@@ -307,12 +319,51 @@ namespace MonoDevelop.CSharp.Completion
 			}
 		}
 
-		class CSharpCompletionDataList : CompletionDataList
+		static bool IsIdentifierPart (char ch)
 		{
-			public CSharpResolver Resolver {
-				get;
-				set;
+			return char.IsLetterOrDigit (ch) || ch == '_';
+		}
+
+		public override Task<ICompletionDataList> HandleBackspaceOrDeleteCodeCompletionAsync (CodeCompletionContext completionContext, SpecialKey key, char triggerCharacter, CancellationToken token = default(CancellationToken))
+		{
+			if (!IdeApp.Preferences.EnableAutoCodeCompletion)
+				return null;
+			if (!char.IsLetterOrDigit (triggerCharacter) && triggerCharacter != '_')
+				return null;
+			//char completionChar = Editor.GetCharAt (completionContext.TriggerOffset - 1);
+			//Console.WriteLine ("completion char: " + completionChar);
+			//	var timer = Counters.ResolveTime.BeginTiming ();
+
+			if (key == SpecialKey.BackSpace || key == SpecialKey.Delete) {
+				char ch  = completionContext.TriggerOffset > 0 ? Editor.GetCharAt (completionContext.TriggerOffset - 1) : '\0';
+				char ch2 = completionContext.TriggerOffset < Editor.Length ? Editor.GetCharAt (completionContext.TriggerOffset) : '\0';
+				if (!IsIdentifierPart (ch) && !IsIdentifierPart (ch2))
+					return null;
 			}
+			try {
+				int triggerWordLength = 0;
+				return InternalHandleCodeCompletion (completionContext, triggerCharacter, true, triggerWordLength, token).ContinueWith ( t => {
+					var result = (CompletionDataList)t.Result;
+					if (result == null)
+						return null;
+					result.AutoCompleteUniqueMatch = false;
+					result.AutoCompleteEmptyMatch = false;
+					return (ICompletionDataList)result;
+				});
+			} catch (Exception e) {
+				LoggingService.LogError ("Unexpected code completion exception." + Environment.NewLine + 
+				                         "FileName: " + DocumentContext.Name + Environment.NewLine + 
+				                         "Position: line=" + completionContext.TriggerLine + " col=" + completionContext.TriggerLineOffset + Environment.NewLine + 
+				                         "Line text: " + Editor.GetLineText (completionContext.TriggerLine), 
+				                         e);
+				return null;
+			} finally {
+				//			if (timer != null)
+				//				timer.Dispose ();
+			}		}
+
+		class CSharpCompletionDataList : CompletionDataList
+		{
 		}
 
 		interface IListData
@@ -320,120 +371,186 @@ namespace MonoDevelop.CSharp.Completion
 			CSharpCompletionDataList List { get; set; }
 		}
 
-		ICompletionContextProvider CreateContextProvider ()
-		{
-			return new CompletionContextProvider (document.ParsedDocument, TextEditorData, validTypeSystemSegmentTree, unstableTypeSystemSegmentTree);
-		}
 
-		CSharpTypeResolveContext CreateTypeResolveContext ()
+		void AddImportCompletionData (CompletionResult completionResult, CSharpCompletionDataList result, RoslynCodeCompletionFactory factory, SemanticModel semanticModel, int position, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			var compilation = UnresolvedFileCompilation;
-			if (compilation == null)
-				return null;
-			var rctx = new CSharpTypeResolveContext (compilation.MainAssembly);
-			var loc = TextEditorData.Caret.Location;
-			rctx = rctx.WithUsingScope (CSharpUnresolvedFile.GetUsingScope (loc).Resolve (compilation));
-			int offset = TextEditorData.Caret.Offset;
-			var curDef = GetTypeAt (offset);
-			if (curDef != null) {
-				var resolvedDef = curDef.Resolve (rctx).GetDefinition ();
-				if (resolvedDef == null)
-					return rctx;
-				rctx = rctx.WithCurrentTypeDefinition (resolvedDef);
-				var foundMember = GetMemberAt (offset);
-				if (foundMember != null) {
-					var curMember = resolvedDef.Members.FirstOrDefault (m => m.Region.FileName == foundMember.Region.FileName && m.Region.Begin == foundMember.Region.Begin);
-					if (curMember != null)
-						rctx = rctx.WithCurrentMember (curMember);
+			if (result.Count == 0)
+				return;
+			var root = semanticModel.SyntaxTree.GetRoot ();
+			var node = root.FindNode (TextSpan.FromBounds (position, position));
+			var syntaxTree = root.SyntaxTree;
+
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken) || 
+				syntaxTree.GetContainingTypeOrEnumDeclaration(position, cancellationToken) is EnumDeclarationSyntax ||
+				syntaxTree.IsPreProcessorDirectiveContext(position, cancellationToken))
+				return;
+
+			var extensionMethodImport =  syntaxTree.IsRightOfDotOrArrowOrColonColon (position, cancellationToken);
+			ITypeSymbol extensionType = null;
+
+			if (extensionMethodImport) {
+				var memberAccess = completionResult.SyntaxContext.TargetToken.Parent as MemberAccessExpressionSyntax;
+				if (memberAccess != null) {
+					extensionType = completionResult.SyntaxContext.SemanticModel.GetTypeInfo (memberAccess.Expression).Type;
+					if (extensionType == null) {
+						return;
+					}
+				} else {
+					return;
 				}
 			}
 
-			return rctx;
+			var tokenLeftOfPosition = syntaxTree.FindTokenOnLeftOfPosition (position, cancellationToken);
+
+			if (extensionMethodImport ||
+			    syntaxTree.IsGlobalStatementContext (position, cancellationToken) ||
+			    syntaxTree.IsExpressionContext (position, tokenLeftOfPosition, true, cancellationToken) ||
+			    syntaxTree.IsStatementContext (position, tokenLeftOfPosition, cancellationToken) ||
+			    syntaxTree.IsTypeContext (position, cancellationToken) ||
+			    syntaxTree.IsTypeDeclarationContext (position, tokenLeftOfPosition, cancellationToken) ||
+			    syntaxTree.IsNamespaceContext (position, cancellationToken) ||
+			    syntaxTree.IsMemberDeclarationContext (position, tokenLeftOfPosition, cancellationToken) ||
+			    syntaxTree.IsLabelContext (position, cancellationToken)) {
+				var usedNamespaces = new HashSet<string> ();
+				foreach (var un in semanticModel.GetUsingNamespacesInScope (node)) {
+					usedNamespaces.Add (un.GetFullName ()); 
+				}
+				var enclosingNamespaceName = semanticModel.GetEnclosingNamespace (position, cancellationToken).GetFullName ();
+
+				var stack = new Stack<INamespaceOrTypeSymbol>();
+				foreach (var member in semanticModel.Compilation.GlobalNamespace.GetNamespaceMembers ())
+					stack.Push (member);
+				var extMethodDict = extensionMethodImport ? new Dictionary<INamespaceSymbol, List<ImportSymbolCompletionData>> () : null;
+				while (stack.Count > 0) {
+					if (cancellationToken.IsCancellationRequested)
+						break;
+					var current = stack.Pop();
+					var currentNs = current as INamespaceSymbol;
+					if (currentNs != null) {
+						var currentNsName = currentNs.GetFullName ();
+						if (usedNamespaces.Contains (currentNsName) ||
+							enclosingNamespaceName == currentNsName ||
+							(enclosingNamespaceName.StartsWith (currentNsName, StringComparison.Ordinal) &&
+							enclosingNamespaceName [currentNsName.Length] == '.')) {
+							foreach (var member in currentNs.GetNamespaceMembers ())
+								stack.Push (member);
+						} else {
+							foreach (var member in currentNs.GetMembers())
+								stack.Push (member);
+						}
+					} else {
+						var type = (INamedTypeSymbol)current;
+						if (type.IsImplicitClass || type.IsScriptClass)
+							continue;
+						if (type.DeclaredAccessibility != Accessibility.Public) {
+							if (type.DeclaredAccessibility != Accessibility.Internal)
+								continue;
+							if (!type.IsAccessibleWithin (semanticModel.Compilation.Assembly))
+								continue;
+						}
+						if (extensionMethodImport) {
+							if (!type.MightContainExtensionMethods)
+								continue;
+							foreach (var extMethod in type.GetMembers ().OfType<IMethodSymbol> ().Where (method => method.IsExtensionMethod)) {
+								var reducedMethod = extMethod.ReduceExtensionMethod (extensionType);
+								if (reducedMethod != null) {
+									List<ImportSymbolCompletionData> importSymbolList;
+									if (!extMethodDict.TryGetValue (type.ContainingNamespace, out importSymbolList)) {
+										extMethodDict.Add (type.ContainingNamespace, importSymbolList = new List<ImportSymbolCompletionData> ());
+									}
+									var newData = new ImportSymbolCompletionData (this, factory, reducedMethod, false);
+									var existingItem = importSymbolList.FirstOrDefault (data => data.Symbol.Name == extMethod.Name);
+									if (existingItem != null) {
+										existingItem.AddOverload (newData);
+									} else {
+										result.Add (newData);
+										importSymbolList.Add (newData);
+									}
+								}
+							}
+						} else {
+							result.Add (new ImportSymbolCompletionData (this, factory, type, false));
+						}
+					}
+				}
+			}
 		}
-		CompletionEngineCache cache = new CompletionEngineCache ();
-		ICompletionDataList InternalHandleCodeCompletion (CodeCompletionContext completionContext, char completionChar, bool ctrlSpace, ref int triggerWordLength)
+
+		Task<ICompletionDataList> InternalHandleCodeCompletion (CodeCompletionContext completionContext, char completionChar, bool ctrlSpace, int triggerWordLength, CancellationToken token, bool forceSymbolCompletion = false)
 		{
-			var data = TextEditorData;
-			if (data.CurrentMode is TextLinkEditMode) {
-				if (((TextLinkEditMode)data.CurrentMode).TextLinkMode == TextLinkMode.EditIdentifier)
-					return null;
-			}
-			if (Unit == null || CSharpUnresolvedFile == null)
-				return null;
-			if(unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
-				return null;
+			if (Editor.EditMode != MonoDevelop.Ide.Editor.EditMode.Edit)
+				return Task.FromResult ((ICompletionDataList)null);
+//			var data = Editor;
+//			if (data.CurrentMode is TextLinkEditMode) {
+//				if (((TextLinkEditMode)data.CurrentMode).TextLinkMode == TextLinkMode.EditIdentifier)
+//					return null;
+//			}
+			var offset = Editor.CaretOffset;
 
 			var list = new CSharpCompletionDataList ();
-			list.Resolver = CSharpUnresolvedFile != null ? CSharpUnresolvedFile.GetResolver (UnresolvedFileCompilation, TextEditorData.Caret.Location) : new CSharpResolver (Compilation);
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null)
-				return null;
-			var completionDataFactory = new CompletionDataFactory (this, new CSharpResolver (ctx));
-			if (MDRefactoringCtx == null) {
-				src.Cancel ();
-				MDRefactoringCtx = MDRefactoringContext.Create (Document, TextEditorData.Caret.Location).Result;
-			}
+			list.TriggerWordLength = triggerWordLength;
+			var analysisDocument = DocumentContext.AnalysisDocument;
+			if (analysisDocument == null)
+				return Task.FromResult ((ICompletionDataList)null);
+			return Task.Run (async delegate {
+				try {
+					
+					var partialDoc = await WithFrozenPartialSemanticsAsync (analysisDocument, token).ConfigureAwait (false);
+					var semanticModel = await partialDoc.GetSemanticModelAsync (token).ConfigureAwait (false);
+
+					var roslynCodeCompletionFactory = new RoslynCodeCompletionFactory (this, semanticModel);
+					foreach (var extHandler in additionalContextHandlers.OfType<IExtensionContextHandler> ())
+						extHandler.Init (roslynCodeCompletionFactory);
+					var engine = new CompletionEngine(MonoDevelop.Ide.TypeSystem.TypeSystemService.Workspace, roslynCodeCompletionFactory);
+					var ctx = new ICSharpCode.NRefactory6.CSharp.CompletionContext (partialDoc, offset, semanticModel);
+					ctx.AdditionalContextHandlers = additionalContextHandlers;
+					var triggerInfo = new CompletionTriggerInfo (ctrlSpace ? CompletionTriggerReason.CompletionCommand : CompletionTriggerReason.CharTyped, completionChar);
+					var completionResult = await engine.GetCompletionDataAsync (ctx, triggerInfo, token).ConfigureAwait (false);
+					if (completionResult == CompletionResult.Empty)
+						return null;
+					
+					foreach (var symbol in completionResult) {
+						list.Add ((Ide.CodeCompletion.CompletionData)symbol); 
+					}
 
-			var engine = new MonoCSharpCompletionEngine (
-				this,
-				data.Document,
-				CreateContextProvider (),
-				completionDataFactory,
-				ProjectContent,
-				ctx
-			);
-			completionDataFactory.Engine = engine;
-			engine.AutomaticallyAddImports = AddImportedItemsToCompletionList.Value;
-			engine.IncludeKeywordsInCompletionList = EnableAutoCodeCompletion || IncludeKeywordsInCompletionList.Value;
-			engine.CompletionEngineCache = cache;
-			if (FilterCompletionListByEditorBrowsable) {
-				engine.EditorBrowsableBehavior = IncludeEditorBrowsableAdvancedMembers ? EditorBrowsableBehavior.IncludeAdvanced : EditorBrowsableBehavior.Normal;
-			} else {
-				engine.EditorBrowsableBehavior = EditorBrowsableBehavior.Ignore;
-			}
-			if (Document.HasProject && MonoDevelop.Ide.IdeApp.IsInitialized) {
-				var configuration = Document.Project.GetConfiguration (MonoDevelop.Ide.IdeApp.Workspace.ActiveConfiguration) as DotNetProjectConfiguration;
-				var par = configuration != null ? configuration.CompilationParameters as CSharpCompilerParameters : null;
-				if (par != null)
-					engine.LanguageVersion = MonoDevelop.CSharp.Parser.TypeSystemParser.ConvertLanguageVersion (par.LangVersion);
-			}
+					if (forceSymbolCompletion || (IdeApp.Preferences.AddImportedItemsToCompletionList.Value && list.OfType<RoslynSymbolCompletionData> ().Any (cd => (cd.GetType () == typeof (RoslynSymbolCompletionData)) && (cd.Symbol is ITypeSymbol || cd.Symbol is IMethodSymbol)))) {
+						AddImportCompletionData (completionResult, list, roslynCodeCompletionFactory, semanticModel, offset, token);
+					}
 
-			engine.FormattingPolicy = FormattingPolicy.CreateOptions ();
-			engine.EolMarker = data.EolMarker;
-			engine.IndentString = data.Options.IndentationString;
-			try {
-				foreach (var cd in engine.GetCompletionData (completionContext.TriggerOffset, ctrlSpace)) {
-					list.Add (cd);
-					if (cd is IListData)
-						((IListData)cd).List = list;
+					list.AutoCompleteEmptyMatch = completionResult.AutoCompleteEmptyMatch;
+					// list.AutoCompleteEmptyMatchOnCurlyBrace = completionResult.AutoCompleteEmptyMatchOnCurlyBracket;
+					list.AutoSelect = completionResult.AutoSelect;
+					list.DefaultCompletionString = completionResult.DefaultCompletionString;
+					// list.CloseOnSquareBrackets = completionResult.CloseOnSquareBrackets;
+					if (ctrlSpace)
+						list.AutoCompleteUniqueMatch = true;
+				} catch (OperationCanceledException) {
+					return null;
+				} catch (AggregateException e) {
+					e.Flatten ().Handle (f => f is OperationCanceledException);
+				} catch (Exception e) {
+					LoggingService.LogError ("Error while getting C# recommendations", e); 
 				}
-			} catch (Exception e) {
-				LoggingService.LogError ("Error while getting completion data.", e);
-			}
-			list.AutoCompleteEmptyMatch = engine.AutoCompleteEmptyMatch;
-			list.AutoCompleteEmptyMatchOnCurlyBrace = engine.AutoCompleteEmptyMatchOnCurlyBracket;
-			list.AutoSelect = engine.AutoSelect;
-			list.DefaultCompletionString = engine.DefaultCompletionString;
-			list.CloseOnSquareBrackets = engine.CloseOnSquareBrackets;
-			if (ctrlSpace)
-				list.AutoCompleteUniqueMatch = true;
-			return list.Count > 0 ? list : null;
+				return (ICompletionDataList)list;
+			});
 		}
 		
-		public override ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)
+		public override Task<ICompletionDataList> CodeCompletionCommand (CodeCompletionContext completionContext)
 		{
 			int triggerWordLength = 0;
-			char ch = completionContext.TriggerOffset > 0 ? TextEditorData.GetCharAt (completionContext.TriggerOffset - 1) : '\0';
-			return InternalHandleCodeCompletion (completionContext, ch, true, ref triggerWordLength);
+			char ch = completionContext.TriggerOffset > 0 ? Editor.GetCharAt (completionContext.TriggerOffset - 1) : '\0';
+			return InternalHandleCodeCompletion (completionContext, ch, true, triggerWordLength, default(CancellationToken));
 		}
 
-		static bool HasAllUsedParameters (IParameterDataProvider provider, List<string> list, int n)
+		static bool HasAllUsedParameters (MonoDevelop.Ide.CodeCompletion.ParameterHintingData provider, string[] list)
 		{
-			int pc = provider.GetParameterCount (n);
+			if (provider == null || list == null)
+				return true;
+			int pc = provider.ParameterCount;
 			foreach (var usedParam in list) {
 				bool found = false;
 				for (int m = 0; m < pc; m++) {
-					if (usedParam == provider.GetParameterName (n, m)){
+					if (usedParam == provider.GetParameterName (m)){
 						found = true;
 						break;
 					}
@@ -443,29 +560,24 @@ namespace MonoDevelop.CSharp.Completion
 			}
 			return true;
 		}
-		public override int GuessBestMethodOverload (IParameterDataProvider provider, int currentOverload)
+
+		public override async Task<int> GuessBestMethodOverload (MonoDevelop.Ide.CodeCompletion.ParameterHintingResult provider, int currentOverload, CancellationToken token)
 		{
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null)
+			var analysisDocument = DocumentContext.AnalysisDocument;
+			if (analysisDocument == null)
 				return -1;
-			var engine = new CSharpParameterCompletionEngine (
-				TextEditorData.Document,
-				CreateContextProvider (),
-				this,
-				ProjectContent,
-				ctx
-				);
-			List<string> list;
-			int cparam = engine.GetCurrentParameterIndex (provider.StartOffset, TextEditorData.Caret.Offset, out list);
-			if (cparam > provider.GetParameterCount (currentOverload) && !provider.AllowParameterList (currentOverload) || !HasAllUsedParameters (provider, list, currentOverload)) {
+			var result = await ICSharpCode.NRefactory6.CSharp.ParameterUtil.GetCurrentParameterIndex (analysisDocument, provider.StartOffset, Editor.CaretOffset);
+			var cparam = result.ParameterIndex;
+			var list = result.UsedNamespaceParameters;
+			if (cparam > provider[currentOverload].ParameterCount && !provider[currentOverload].IsParameterListAllowed || !HasAllUsedParameters (provider[currentOverload], list)) {
 				// Look for an overload which has more parameters
 				int bestOverload = -1;
 				int bestParamCount = int.MaxValue;
 				for (int n = 0; n < provider.Count; n++) {
-					int pc = provider.GetParameterCount (n);
+					int pc = provider[n].ParameterCount;
 					if (pc < bestParamCount && pc >= cparam) {
 
-						if (HasAllUsedParameters (provider, list, n)) {
+						if (HasAllUsedParameters (provider[n], list)) {
 							bestOverload = n;
 							bestParamCount = pc;
 						}
@@ -475,7 +587,7 @@ namespace MonoDevelop.CSharp.Completion
 				}
 				if (bestOverload == -1) {
 					for (int n=0; n<provider.Count; n++) {
-						if (provider.AllowParameterList (n) && HasAllUsedParameters (provider, list, n)) {
+						if (provider[n].IsParameterListAllowed && HasAllUsedParameters (provider[n], list)) {
 							bestOverload = n;
 							break;
 						}
@@ -487,12 +599,12 @@ namespace MonoDevelop.CSharp.Completion
 		}
 
 		
-		static bool ContainsPublicConstructors (ITypeDefinition t)
-		{
-			if (t.Methods.Count (m => m.IsConstructor) == 0)
-				return true;
-			return t.Methods.Any (m => m.IsConstructor && m.IsPublic);
-		}
+//		static bool ContainsPublicConstructors (ITypeDefinition t)
+//		{
+//			if (t.Methods.Count (m => m.IsConstructor) == 0)
+//				return true;
+//			return t.Methods.Any (m => m.IsConstructor && m.IsPublic);
+//		}
 
 
 //			CompletionDataList result = new ProjectDomCompletionDataList ();
@@ -599,141 +711,75 @@ namespace MonoDevelop.CSharp.Completion
 //				}
 //			}
 //		}
-		
-		public override ParameterDataProvider HandleParameterCompletion (CodeCompletionContext completionContext, char completionChar)
+
+		public override Task<Ide.CodeCompletion.ParameterHintingResult> ParameterCompletionCommand (CodeCompletionContext completionContext)
 		{
-//			if (!EnableCodeCompletion)
-//				return null;
-			if (Unit == null || CSharpUnresolvedFile == null)
-				return null;
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null)
-				return null;
+			char ch = completionContext.TriggerOffset > 0 ? Editor.GetCharAt (completionContext.TriggerOffset - 1) : '\0';
+			return InternalHandleParameterCompletionCommand (completionContext, ch, true, default(CancellationToken));
+		}
 
-			if (completionChar != '(' && completionChar != ',')
-				return null;
+		public override Task<MonoDevelop.Ide.CodeCompletion.ParameterHintingResult> HandleParameterCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default (CancellationToken))
+		{
+			return InternalHandleParameterCompletionCommand (completionContext, completionChar, false, token);
+		}
 
+		public async Task<MonoDevelop.Ide.CodeCompletion.ParameterHintingResult> InternalHandleParameterCompletionCommand (CodeCompletionContext completionContext, char completionChar, bool force, CancellationToken token = default(CancellationToken))
+		{
+			var data = Editor;
+			if (!force && completionChar != '(' && completionChar != ',')
+				return null;
+			if (Editor.EditMode != EditMode.Edit)
+				return null;
+			var offset = Editor.CaretOffset;
 			try {
-				var engine = new CSharpParameterCompletionEngine (
-					TextEditorData.Document,
-					CreateContextProvider (),
-					this,
-					ProjectContent,
-					ctx
-				);
-				return engine.GetParameterDataProvider (completionContext.TriggerOffset, completionChar) as ParameterDataProvider;
+
+				var analysisDocument = DocumentContext.AnalysisDocument;
+				if (analysisDocument == null)
+					return null;
+				var partialDoc = await WithFrozenPartialSemanticsAsync (analysisDocument, token);
+				var semanticModel = await partialDoc.GetSemanticModelAsync ();
+				var engine = new ParameterHintingEngine (MonoDevelop.Ide.TypeSystem.TypeSystemService.Workspace, new RoslynParameterHintingFactory ());
+				var result = await engine.GetParameterDataProviderAsync (analysisDocument, semanticModel, offset, token);
+				return new MonoDevelop.Ide.CodeCompletion.ParameterHintingResult (result.OfType<MonoDevelop.Ide.CodeCompletion.ParameterHintingData>().ToList (), result.StartOffset);
 			} catch (Exception e) {
 				LoggingService.LogError ("Unexpected parameter completion exception." + Environment.NewLine + 
-					"FileName: " + Document.FileName + Environment.NewLine + 
+					"FileName: " + DocumentContext.Name + Environment.NewLine + 
 					"Position: line=" + completionContext.TriggerLine + " col=" + completionContext.TriggerLineOffset + Environment.NewLine + 
-					"Line text: " + TextEditorData.GetLineText (completionContext.TriggerLine), 
+					"Line text: " + Editor.GetLineText (completionContext.TriggerLine), 
 					e);
-				return null;
-			} finally {
-				//			if (timer != null)
-				//				timer.Dispose ();
 			}
+			return null;
 		}
 		
-		List<string> GetUsedNamespaces ()
-		{
-			var scope = CSharpUnresolvedFile.GetUsingScope (TextEditorData.Caret.Location);
-			var result = new List<string> ();
-			while (scope != null) {
-				result.Add (scope.NamespaceName);
-				var ctx = CSharpUnresolvedFile.GetResolver (Compilation, scope.Region.Begin);
-				foreach (var u in scope.Usings) {
-					var ns = u.ResolveNamespace (ctx);
-					if (ns == null)
-						continue;
-					result.Add (ns.FullName);
-				}
-				scope = scope.Parent;
-			}
-			return result;
-		}
-
-		public override bool GetParameterCompletionCommandOffset (out int cpos)
-		{
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null) {
-				cpos = -1;
-				return false;
-			}
-
-			var engine = new CSharpParameterCompletionEngine (
-				TextEditorData.Document,
-				CreateContextProvider (),
-				this,
-				ProjectContent,
-				ctx
-			);
-			engine.SetOffset (TextEditorData.Caret.Offset);
-			return engine.GetParameterCompletionCommandOffset (out cpos);
-		}
-
-		public override int GetCurrentParameterIndex (int startOffset)
+//		List<string> GetUsedNamespaces ()
+//		{
+//			var scope = CSharpUnresolvedFile.GetUsingScope (document.Editor.Caret.Location);
+//			var result = new List<string> ();
+//			while (scope != null) {
+//				result.Add (scope.NamespaceName);
+//				var ctx = CSharpUnresolvedFile.GetResolver (Document.Compilation, scope.Region.Begin);
+//				foreach (var u in scope.Usings) {
+//					var ns = u.ResolveNamespace (ctx);
+//					if (ns == null)
+//						continue;
+//					result.Add (ns.FullName);
+//				}
+//				scope = scope.Parent;
+//			}
+//			return result;
+//		}
+		public override async Task<int> GetCurrentParameterIndex (int startOffset, CancellationToken token)
 		{
-			var ctx = CreateTypeResolveContext ();
-			if (ctx == null)
+			var analysisDocument = DocumentContext.AnalysisDocument;
+			var caretOffset = Editor.CaretOffset;
+			if (analysisDocument == null || startOffset > caretOffset)
 				return -1;
-
-			var engine = new CSharpParameterCompletionEngine (
-				TextEditorData.Document,
-				CreateContextProvider (),
-				this,
-				ProjectContent,
-				ctx
-			);
-			List<string> list;
-			return engine.GetCurrentParameterIndex (startOffset, TextEditorData.Caret.Offset, out list);
+			var partialDoc = await WithFrozenPartialSemanticsAsync (analysisDocument, default(CancellationToken)).ConfigureAwait (false);
+			var result = ParameterUtil.GetCurrentParameterIndex (partialDoc, startOffset, caretOffset).Result;
+			return result.ParameterIndex;
 		}
-		/*
-		internal int GetCurrentParameterIndex (ICompletionWidget widget, int offset, int memberStart)
-		{
-			int cursor = widget.CurrentCodeCompletionContext.TriggerOffset;
-			int i = offset;
-			if (i > cursor)
-				return -1;
-			if (i == cursor) 
-				return 1; // parameters are 1 based
-			var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
-			var engine = new CSharpIndentEngine (MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types));
-			int index = memberStart + 1;
-			int parentheses = 0;
-			int bracket = 0;
-			do {
-				char c = widget.GetChar (i - 1);
-				engine.Push (c);
-				switch (c) {
-				case '{':
-					if (!engine.IsInsideOrdinaryCommentOrString)
-						bracket++;
-					break;
-				case '}':
-					if (!engine.IsInsideOrdinaryCommentOrString)
-						bracket--;
-					break;
-				case '(':
-					if (!engine.IsInsideOrdinaryCommentOrString)
-						parentheses++;
-					break;
-				case ')':
-					if (!engine.IsInsideOrdinaryCommentOrString)
-						parentheses--;
-					break;
-				case ',':
-					if (!engine.IsInsideOrdinaryCommentOrString && parentheses == 1 && bracket == 0)
-						index++;
-					break;
-				}
-				i++;
-			} while (i <= cursor && parentheses >= 0);
-			
-			return parentheses != 1 || bracket > 0 ? -1 : index;
-		}*/
-
 
+/*
 		#region ICompletionDataFactory implementation
 		internal class CompletionDataFactory : ICompletionDataFactory
 		{
@@ -821,10 +867,10 @@ namespace MonoDevelop.CSharp.Completion
 					overloads.Add (data);
 				}
 
-				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 				{
 					var currentWord = GetCurrentWord (window);
-					if (CompletionText == "new()" && keyChar == '(') {
+					if (CompletionText == "new()" && descriptor.KeyChar == '(') {
 						window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, currentWord, "new");
 					} else {
 						window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, currentWord, CompletionText);
@@ -879,20 +925,20 @@ namespace MonoDevelop.CSharp.Completion
 				public override TooltipInformation CreateTooltipInformation (bool smartWrap)
 				{
 					var def = type.GetDefinition ();
-					var result = def != null ? MemberCompletionData.CreateTooltipInformation (compilation, file, List.Resolver, ext.TextEditorData, ext.FormattingPolicy, def, smartWrap)  : new TooltipInformation ();
-//					if (ConflictingTypes != null) {
-//						var conflicts = new StringBuilder ();
-//						var sig = new SignatureMarkupCreator (List.Resolver, ext.FormattingPolicy.CreateOptions ());
-//						for (int i = 0; i < ConflictingTypes.Count; i++) {
-//							var ct = ConflictingTypes[i];
-//							if (i > 0)
-//								conflicts.AppendLine (",");
-////							if ((i + 1) % 5 == 0)
-////								conflicts.Append (Environment.NewLine + "\t");
-//							conflicts.Append (sig.GetTypeReferenceString (((TypeCompletionData)ct).type));
-//						}
-//						result.AddCategory ("Type Conflicts", conflicts.ToString ());
-//					}
+					var result = def != null ? MemberCompletionData.CreateTooltipInformation (compilation, file, List.Resolver, ext.Editor, ext.FormattingPolicy, def, smartWrap)  : new TooltipInformation ();
+					if (ConflictingTypes != null) {
+						var conflicts = new StringBuilder ();
+						var sig = new SignatureMarkupCreator (List.Resolver, ext.FormattingPolicy.CreateOptions ());
+						for (int i = 0; i < ConflictingTypes.Count; i++) {
+							var ct = ConflictingTypes[i];
+							if (i > 0)
+								conflicts.AppendLine (",");
+//							if ((i + 1) % 5 == 0)
+//								conflicts.Append (Environment.NewLine + "\t");
+							conflicts.Append (sig.GetTypeReferenceString (((TypeCompletionData)ct).type));
+						}
+						result.AddCategory ("Type Conflicts", conflicts.ToString ());
+					}
 					return result;
 				}
 
@@ -1024,11 +1070,11 @@ namespace MonoDevelop.CSharp.Completion
 
 
 
-				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 				{
 					var currentWord = GetCurrentWord (window);
 					var text = CompletionText;
-					if (keyChar != '>')
+					if (descriptor.KeyChar != '>')
 						text += ">";
 					window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, currentWord, text);
 				}
@@ -1065,7 +1111,7 @@ namespace MonoDevelop.CSharp.Completion
 			}
 			ICompletionData ICompletionDataFactory.CreateNewPartialCompletionData (int declarationBegin, IUnresolvedTypeDefinition type, IUnresolvedMember m)
 			{
-				var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.TextEditorData.Caret.Location);
+				var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Editor.CaretLocation);
 				return new NewOverrideCompletionData (ext, declarationBegin, type, m.CreateResolved (ctx));
 			}
 			IEnumerable<ICompletionData> ICompletionDataFactory.CreateCodeTemplateCompletionData ()
@@ -1079,7 +1125,7 @@ namespace MonoDevelop.CSharp.Completion
 			
 			IEnumerable<ICompletionData> ICompletionDataFactory.CreatePreProcessorDefinesCompletionData ()
 			{
-				var project = ext.document.Project;
+				var project = ext.DocumentContext.Project;
 				if (project == null)
 					yield break;
 				var configuration = project.GetConfiguration (MonoDevelop.Ide.IdeApp.Workspace.ActiveConfiguration) as DotNetProjectConfiguration;
@@ -1148,352 +1194,16 @@ namespace MonoDevelop.CSharp.Completion
 			}
 
 
-			class ImportSymbolCompletionData : CompletionData, IEntityCompletionData
-			{
-				readonly IType type;
-				readonly bool useFullName;
-				readonly CSharpCompletionTextEditorExtension ext;
-				public IType Type {
-					get { return this.type; }
-				}
-
-				public ImportSymbolCompletionData (CSharpCompletionTextEditorExtension ext, bool useFullName, IType type, bool addConstructors)
-				{
-					this.ext = ext;
-					this.useFullName = useFullName;
-					this.type = type;
-					this.DisplayFlags |= ICSharpCode.NRefactory.Completion.DisplayFlags.IsImportCompletion;
-				}
-
-				public override TooltipInformation CreateTooltipInformation (bool smartWrap)
-				{
-					return MemberCompletionData.CreateTooltipInformation (ext, null, type.GetDefinition (), smartWrap);
-				}
-
-				bool initialized = false;
-				bool generateUsing, insertNamespace;
-
-				void Initialize ()
-				{
-					if (initialized)
-						return;
-					initialized = true;
-					if (string.IsNullOrEmpty (type.Namespace)) 
-						return;
-					generateUsing = !useFullName;
-					insertNamespace = useFullName;
-				}
-
-				#region IActionCompletionData implementation
-				public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
-				{
-					Initialize ();
-					var doc = ext.document;
-					using (var undo = doc.Editor.OpenUndoGroup ()) {
-						string text = insertNamespace ? type.Namespace + "." + type.Name : type.Name;
-						if (text != GetCurrentWord (window)) {
-							if (window.WasShiftPressed && generateUsing) 
-								text = type.Namespace + "." + text;
-							window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, GetCurrentWord (window), text);
-						}
-					
-						if (!window.WasShiftPressed && generateUsing) {
-							var generator = CodeGenerator.CreateGenerator (doc);
-							if (generator != null) {
-								generator.AddGlobalNamespaceImport (doc, type.Namespace);
-								// reparse
-								doc.UpdateParseDocument ();
-							}
-						}
-					}
-					ka |= KeyActions.Ignore;
-				}
-				#endregion
-
-				#region ICompletionData implementation
-				public override IconId Icon {
-					get {
-						return type.GetStockIcon ();
-					}
-				}
-				
-				public override string DisplayText {
-					get {
-						return type.Name;
-					}
-				}
-
-				static string GetDefaultDisplaySelection (string description, bool isSelected)
-				{
-					if (!isSelected)
-						return "<span foreground=\"darkgray\">" + description + "</span>";
-					return description;
-				}
-
-				string displayDescription = null;
-				public override string GetDisplayDescription (bool isSelected)
-				{
-					if (displayDescription == null) {
-						Initialize ();
-						if (generateUsing || insertNamespace) {
-							displayDescription = string.Format (GettextCatalog.GetString ("(from '{0}')"), type.Namespace);
-						} else {
-							displayDescription = "";
-						}
-					}
-					return GetDefaultDisplaySelection (displayDescription, isSelected);
-				}
-
-				public override string Description {
-					get {
-						return type.Namespace;
-					}
-				}
-
-				public override string CompletionText {
-					get {
-						return type.Name;
-					}
-				}
-				#endregion
-
-
-				List<CompletionData> overloads;
-
-				public override IEnumerable<ICompletionData> OverloadedData {
-					get {
-						yield return this;
-						if (overloads == null)
-							yield break;
-						foreach (var overload in overloads)
-							yield return overload;
-					}
-				}
-
-				public override bool HasOverloads {
-					get { return overloads != null && overloads.Count > 0; }
-				}
-
-				public override void AddOverload (ICSharpCode.NRefactory.Completion.ICompletionData data)
-				{
-					AddOverload ((ImportSymbolCompletionData)data);
-				}
-
-				void AddOverload (ImportSymbolCompletionData overload)
-				{
-					if (overloads == null)
-						overloads = new List<CompletionData> ();
-					overloads.Add (overload);
-				}
-
-				IEntity IEntityCompletionData.Entity {
-					get {
-						return type.GetDefinition ();
-					}
-				}
-			}
-
-
-			ICompletionData ICompletionDataFactory.CreateImportCompletionData(IType type, bool useFullName, bool addConstructors)
-			{
-				return new ImportSymbolCompletionData (ext, useFullName, type, addConstructors);
-			}
-
-		}
+			
 		#endregion
-
-		#region IParameterCompletionDataFactory implementation
-		IParameterDataProvider IParameterCompletionDataFactory.CreateConstructorProvider (int startOffset, IType type)
-		{
-			return new ConstructorParameterDataProvider (startOffset, this, type);
-		}
-
-		IParameterDataProvider IParameterCompletionDataFactory.CreateConstructorProvider (int startOffset, IType type, AstNode initializer)
-		{
-			return new ConstructorParameterDataProvider (startOffset, this, type, initializer);
-		}
-
-		IParameterDataProvider IParameterCompletionDataFactory.CreateMethodDataProvider (int startOffset, IEnumerable<IMethod> methods)
-		{
-			return new MethodParameterDataProvider (startOffset, this, methods);
-		}
-		
-		IParameterDataProvider IParameterCompletionDataFactory.CreateDelegateDataProvider (int startOffset, IType type)
-		{
-			return new DelegateDataProvider (startOffset, this, type);
-		}
-		
-		IParameterDataProvider IParameterCompletionDataFactory.CreateIndexerParameterDataProvider (int startOffset, IType type, IEnumerable<IProperty> indexers, AstNode resolvedNode)
-		{
-			var arrayType = type as ArrayType;
-			if (arrayType != null)
-				return new ArrayTypeParameterDataProvider (startOffset, this, arrayType);
-			return new IndexerParameterDataProvider (startOffset, this, type, indexers, resolvedNode);
-		}
+*/
 		
-		IParameterDataProvider IParameterCompletionDataFactory.CreateTypeParameterDataProvider (int startOffset, IEnumerable<IType> types)
-		{
-			return new TypeParameterDataProvider (startOffset, this, types);
-		}
-
-		IParameterDataProvider IParameterCompletionDataFactory.CreateTypeParameterDataProvider (int startOffset, IEnumerable<IMethod> methods)
-		{
-			return new TypeParameterDataProvider (startOffset, this, methods);
-		}
-		#endregion
 
 		#region IDebuggerExpressionResolver implementation
 
-		static string GetIdentifierName (TextEditorData editor, Identifier id, out int startOffset)
-		{
-			startOffset = editor.LocationToOffset (id.StartLocation.Line, id.StartLocation.Column);
-
-			return editor.GetTextBetween (id.StartLocation, id.EndLocation);
-		}
-
-		internal static string ResolveExpression (TextEditorData editor, ResolveResult result, AstNode node, out int startOffset)
-		{
-			//Console.WriteLine ("result is a {0}", result.GetType ().Name);
-			startOffset = -1;
-
-			if (result is NamespaceResolveResult ||
-				result is ConversionResolveResult ||
-				result is ConstantResolveResult ||
-				result is ForEachResolveResult ||
-				result is TypeIsResolveResult ||
-				result is TypeOfResolveResult ||
-				result is ErrorResolveResult)
-				return null;
-
-			if (result.IsCompileTimeConstant)
-				return null;
-
-			startOffset = editor.LocationToOffset (node.StartLocation.Line, node.StartLocation.Column);
-
-			if (result is InvocationResolveResult) {
-				var ir = (InvocationResolveResult) result;
-				if (ir.Member.Name == ".ctor") {
-					// if the user is hovering over something like "new Abc (...)", we want to show them type information for Abc
-					return ir.Member.DeclaringType.FullName;
-				}
-
-				// do not support general method invocation for tooltips because it could cause side-effects
-				return null;
-			} else if (result is LocalResolveResult) {
-				if (node is ParameterDeclaration) {
-					// user is hovering over a method parameter, but we don't want to include the parameter type
-					var param = (ParameterDeclaration) node;
-
-					return GetIdentifierName (editor, param.NameToken, out startOffset);
-				}
-
-				if (node is VariableInitializer) {
-					// user is hovering over something like "int fubar = 5;", but we don't want the expression to include the " = 5"
-					var variable = (VariableInitializer) node;
-
-					return GetIdentifierName (editor, variable.NameToken, out startOffset);
-				}
-			} else if (result is MemberResolveResult) {
-				var mr = (MemberResolveResult) result;
-
-				if (node is PropertyDeclaration) {
-					var prop = (PropertyDeclaration) node;
-					var name = GetIdentifierName (editor, prop.NameToken, out startOffset);
-
-					// if the property is static, then we want to return "Full.TypeName.Property"
-					if (prop.Modifiers.HasFlag (Modifiers.Static))
-						return mr.Member.DeclaringType.FullName + "." + name;
-
-					// otherwise we want to return "this.Property" so that it won't conflict with anything else in the local scope
-					return "this." + name;
-				}
-
-				if (node is FieldDeclaration) {
-					var field = (FieldDeclaration) node;
-					var name = GetIdentifierName (editor, field.NameToken, out startOffset);
-
-					// if the field is static, then we want to return "Full.TypeName.Field"
-					if (field.Modifiers.HasFlag (Modifiers.Static))
-						return mr.Member.DeclaringType.FullName + "." + name;
-
-					// otherwise we want to return "this.Field" so that it won't conflict with anything else in the local scope
-					return "this." + name;
-				}
-
-				if (node is VariableInitializer) {
-					// user is hovering over a field declaration that includes initialization
-					var variable = (VariableInitializer) node;
-					var name = GetIdentifierName (editor, variable.NameToken, out startOffset);
-
-					// walk up the AST to find the FieldDeclaration so that we can determine if it is static or not
-					var field = variable.GetParent<FieldDeclaration> ();
-
-					// if the field is static, then we want to return "Full.TypeName.Field"
-					if (field.Modifiers.HasFlag (Modifiers.Static))
-						return mr.Member.DeclaringType.FullName + "." + name;
-
-					// otherwise we want to return "this.Field" so that it won't conflict with anything else in the local scope
-					return "this." + name;
-				}
-
-				if (node is NamedExpression) {
-					// user is hovering over 'Property' in an expression like: var fubar = new Fubar () { Property = baz };
-					var variable = node.GetParent<VariableInitializer> ();
-					if (variable != null) {
-						var variableName = GetIdentifierName (editor, variable.NameToken, out startOffset);
-						var name = GetIdentifierName (editor, ((NamedExpression) node).NameToken, out startOffset);
-
-						return variableName + "." + name;
-					}
-				}
-			} else if (result is TypeResolveResult) {
-				return ((TypeResolveResult) result).Type.FullName;
-			}
-
-			return editor.GetTextBetween (node.StartLocation, node.EndLocation);
-		}
-
-		static bool TryResolveAt (Document doc, DocumentLocation loc, out ResolveResult result, out AstNode node)
-		{
-			if (doc == null)
-				throw new ArgumentNullException ("doc");
-
-			result = null;
-			node = null;
-
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null)
-				return false;
-
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-
-			if (unit == null || parsedFile == null)
-				return false;
-
-			try {
-				result = ResolveAtLocation.Resolve (new Lazy<ICompilation> (() => doc.Compilation), parsedFile, unit, loc, out node);
-				if (result == null || node is Statement)
-					return false;
-			} catch {
-				return false;
-			}
-
-			return true;
-		}
-
-		string IDebuggerExpressionResolver.ResolveExpression (TextEditorData editor, Document doc, int offset, out int startOffset)
+		async Task<DebugDataTipInfo> IDebuggerExpressionResolver.ResolveExpressionAsync (IReadonlyTextDocument editor, DocumentContext doc, int offset, CancellationToken cancellationToken)
 		{
-			ResolveResult result;
-			AstNode node;
-
-			var loc = editor.OffsetToLocation (offset);
-			if (!TryResolveAt (doc, loc, out result, out node)) {
-				startOffset = -1;
-				return null;
-			}
-
-			return ResolveExpression (editor, result, node, out startOffset);
+			return await Resolver.DebuggerExpressionResolver.ResolveAsync (editor, doc, offset, cancellationToken).ConfigureAwait (false);
 		}
 
 		#endregion
@@ -1501,16 +1211,15 @@ namespace MonoDevelop.CSharp.Completion
 		#region TypeSystemSegmentTree
 
 		TypeSystemSegmentTree validTypeSystemSegmentTree;
-		TypeSystemSegmentTree unstableTypeSystemSegmentTree;
 
 		internal class TypeSystemTreeSegment : TreeSegment
 		{
-			public IUnresolvedEntity Entity {
+			public SyntaxNode Entity {
 				get;
 				private set;
 			}
 			
-			public TypeSystemTreeSegment (int offset, int length, IUnresolvedEntity entity) : base (offset, length)
+			public TypeSystemTreeSegment (int offset, int length, SyntaxNode entity) : base (offset, length)
 			{
 				this.Entity = entity;
 			}
@@ -1519,8 +1228,6 @@ namespace MonoDevelop.CSharp.Completion
 		internal TypeSystemTreeSegment GetMemberSegmentAt (int offset)
 		{
 			TypeSystemTreeSegment result = null;
-			if (unstableTypeSystemSegmentTree != null)
-				result = unstableTypeSystemSegmentTree.GetMemberSegmentAt (offset);
 			if (result == null && validTypeSystemSegmentTree != null)
 				result = validTypeSystemSegmentTree.GetMemberSegmentAt (offset);
 			return result;
@@ -1528,174 +1235,148 @@ namespace MonoDevelop.CSharp.Completion
 		
 		internal class TypeSystemSegmentTree : SegmentTree<TypeSystemTreeSegment>
 		{
-			public IUnresolvedTypeDefinition GetTypeAt (int offset)
-			{
-				IUnresolvedTypeDefinition result = null;
-				foreach (var seg in GetSegmentsAt (offset).Where (s => s.Entity is IUnresolvedTypeDefinition)) {
-					if (result == null || result.Region.IsInside (seg.Entity.Region.Begin))
-						result = (IUnresolvedTypeDefinition)seg.Entity;
-				}
-				return result;
-			}
-			
-			public IUnresolvedMember GetMemberAt (int offset)
+			public SyntaxNode GetMemberAt (int offset)
 			{
 				// Members don't overlap
-				var seg = GetSegmentsAt (offset).FirstOrDefault (s => s.Entity is IUnresolvedMember);
+				var seg = GetSegmentsAt (offset).FirstOrDefault ();
 				if (seg == null)
 					return null;
-				return (IUnresolvedMember)seg.Entity;
+				return seg.Entity;
 			}
 			
 			public TypeSystemTreeSegment GetMemberSegmentAt (int offset)
 			{
-				// Members don't overlap
-				var seg = GetSegmentsAt (offset).FirstOrDefault (s => s.Entity is IUnresolvedMember);
-				if (seg == null)
-					return null;
-				return seg;
+				return GetSegmentsAt (offset).LastOrDefault ();
 			}
 
 			
-			internal static TypeSystemSegmentTree Create (ParsedDocument parsedDocument, TextEditorData textEditorData)
+			
+			internal static TypeSystemSegmentTree Create (SemanticModel semanticModel, CancellationToken token)
 			{
-				TypeSystemSegmentTree result = new TypeSystemSegmentTree ();
-				
-				foreach (var type in parsedDocument.TopLevelTypeDefinitions)
-					AddType (textEditorData, result, type);
-				
-				return result;
+				var visitor = new TreeVisitor (token);
+				visitor.Visit (semanticModel.SyntaxTree.GetRoot ()); 
+				return visitor.Result;
 			}
-			
-			static void AddType (TextEditorData textEditorData, TypeSystemSegmentTree result, IUnresolvedTypeDefinition type)
+
+			class TreeVisitor : CSharpSyntaxWalker
 			{
-				int offset = textEditorData.LocationToOffset (type.Region.Begin);
-				int endOffset = type.Region.End.IsEmpty ? int.MaxValue : textEditorData.LocationToOffset (type.Region.End);
-				if (endOffset < 0)
-					endOffset = int.MaxValue;
-				result.Add (new TypeSystemTreeSegment (offset, endOffset - offset, type));
-				foreach (var entity in type.Members) {
-					if (entity.IsSynthetic)
-						continue;
-					offset = textEditorData.LocationToOffset (entity.Region.Begin);
-					endOffset = textEditorData.LocationToOffset (entity.Region.End);
-					if (endOffset < 0)
-						endOffset = int.MaxValue;
-					result.Add (new TypeSystemTreeSegment (offset, endOffset - offset, entity));
+				readonly CancellationToken token;
+				public TypeSystemSegmentTree Result = new TypeSystemSegmentTree ();
+
+				public TreeVisitor (System.Threading.CancellationToken token)
+				{
+					this.token = token;
 				}
-				
-				foreach (var nested in type.NestedTypes)
-					AddType (textEditorData, result, nested);
-			}
-		}
-		
-		public IUnresolvedTypeDefinition GetTypeAt (int offset)
-		{
-			if (unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
-				return null;
-			IUnresolvedTypeDefinition type = null;
-			if (unstableTypeSystemSegmentTree != null)
-				type = unstableTypeSystemSegmentTree.GetTypeAt (offset);
-			if (type == null && validTypeSystemSegmentTree != null)
-				type = validTypeSystemSegmentTree.GetTypeAt (offset);
-			return type;
-		}
-			
-		public IUnresolvedMember GetMemberAt (int offset)
-		{
-			if (unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
-				return null;
 
-			IUnresolvedMember member = null;
-			if (unstableTypeSystemSegmentTree != null)
-				member = unstableTypeSystemSegmentTree.GetMemberAt (offset);
-			if (member == null && validTypeSystemSegmentTree != null)
-				member = validTypeSystemSegmentTree.GetMemberAt (offset);
+				public override void VisitClassDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.ClassDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+					base.VisitClassDeclaration (node);
+				}
+				public override void VisitStructDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.StructDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+					base.VisitStructDeclaration (node);
+				}
 
-			return member;
-		}
-		#endregion
+				public override void VisitInterfaceDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.InterfaceDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+					base.VisitInterfaceDeclaration (node);
+				}
 
+				public override void VisitEnumDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.EnumDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-		class CompletionContextProvider : ICompletionContextProvider
-		{
-			readonly ParsedDocument parsedDocument;
-			readonly TextEditorData textEditorData;
-			readonly TypeSystemSegmentTree validTypeSystemSegmentTree;
-			readonly TypeSystemSegmentTree unstableTypeSystemSegmentTree;
+				public override void VisitPropertyDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.PropertyDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			public CompletionContextProvider (ParsedDocument parsedDocument, TextEditorData textEditorData,
-				TypeSystemSegmentTree validTypeSystemSegmentTree, TypeSystemSegmentTree unstableTypeSystemSegmentTree)
-			{
-				this.parsedDocument = parsedDocument;
-				this.textEditorData = textEditorData;
-				this.validTypeSystemSegmentTree = validTypeSystemSegmentTree;
-				this.unstableTypeSystemSegmentTree = unstableTypeSystemSegmentTree;
-			}
+				public override void VisitMethodDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.MethodDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			IList<string> ICompletionContextProvider.ConditionalSymbols {
-				get {
-					return parsedDocument.GetAst<SyntaxTree> ().ConditionalSymbols;
+				public override void VisitConstructorDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.ConstructorDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
 				}
-			}
 
-			void ICompletionContextProvider.GetCurrentMembers (int offset, out IUnresolvedTypeDefinition currentType, out IUnresolvedMember currentMember)
-			{
-				currentType = GetTypeAt (offset);
-				currentMember = GetMemberAt (offset);
-			}
+				public override void VisitDestructorDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.DestructorDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			public IUnresolvedTypeDefinition GetTypeAt (int offset)
-			{
-				if (unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
-					return null;
-				IUnresolvedTypeDefinition type = null;
-				if (unstableTypeSystemSegmentTree != null)
-					type = unstableTypeSystemSegmentTree.GetTypeAt (offset);
-				if (type == null && validTypeSystemSegmentTree != null)
-					type = validTypeSystemSegmentTree.GetTypeAt (offset);
-				return type;
-			}
+				public override void VisitIndexerDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.IndexerDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			public IUnresolvedMember GetMemberAt (int offset)
-			{
-				if (unstableTypeSystemSegmentTree == null && validTypeSystemSegmentTree == null)
-					return null;
+				public override void VisitDelegateDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.DelegateDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-				IUnresolvedMember member = null;
-				if (unstableTypeSystemSegmentTree != null)
-					member = unstableTypeSystemSegmentTree.GetMemberAt (offset);
-				if (member == null && validTypeSystemSegmentTree != null)
-					member = validTypeSystemSegmentTree.GetMemberAt (offset);
-				return member;
-			}
+				public override void VisitOperatorDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.OperatorDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
+				}
 
-			Tuple<string, TextLocation> ICompletionContextProvider.GetMemberTextToCaret (int caretOffset, IUnresolvedTypeDefinition currentType, IUnresolvedMember currentMember)
-			{
-				int startOffset;
-				if (currentMember != null && currentType != null && currentType.Kind != TypeKind.Enum) {
-					startOffset = textEditorData.LocationToOffset(currentMember.Region.Begin);
-				} else if (currentType != null) {
-					startOffset = textEditorData.LocationToOffset(currentType.Region.Begin);
-				} else {
-					startOffset = 0;
+				public override void VisitEventDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.EventDeclarationSyntax node)
+				{
+					Result.Add (new TypeSystemTreeSegment (node.SpanStart, node.Span.Length, node));
 				}
-				while (startOffset > 0) {
-					char ch = textEditorData.GetCharAt(startOffset - 1);
-					if (ch != ' ' && ch != '\t') {
-						break;
-					}
-					--startOffset;
+
+				public override void VisitBlock (Microsoft.CodeAnalysis.CSharp.Syntax.BlockSyntax node)
+				{
+					token.ThrowIfCancellationRequested ();
 				}
-				return Tuple.Create (caretOffset > startOffset ? textEditorData.GetTextAt (startOffset, caretOffset - startOffset) : "", 
-				                     (TextLocation)textEditorData.OffsetToLocation (startOffset));
 			}
+			
+		}
+		
+		public SyntaxNode GetMemberAt (int offset)
+		{
+			SyntaxNode member = null;
+			if (member == null && validTypeSystemSegmentTree != null)
+				member = validTypeSystemSegmentTree.GetMemberAt (offset);
 
+			return member;
+		}
+		#endregion
+	
+	
 
-			CSharpAstResolver ICompletionContextProvider.GetResolver (CSharpResolver resolver, AstNode rootNode)
-			{
-				return new CSharpAstResolver (resolver, rootNode, parsedDocument.ParsedFile as CSharpUnresolvedFile);
+		[CommandHandler(RefactoryCommands.ImportSymbol)]
+		async void ImportSymbolCommand ()
+		{
+			if (Editor.SelectionMode == SelectionMode.Block)
+				return;
+			var analysisDocument = DocumentContext.AnalysisDocument;
+			if (analysisDocument == null)
+				return;
+			var offset = Editor.CaretOffset;
+
+			int cpos, wlen;
+			if (!GetCompletionCommandOffset (out cpos, out wlen)) {
+				cpos = Editor.CaretOffset;
+				wlen = 0;
 			}
+			CurrentCompletionContext = CompletionWidget.CreateCodeCompletionContext (cpos);
+			CurrentCompletionContext.TriggerWordLength = wlen;
+
+			int triggerWordLength = 0;
+			char ch = CurrentCompletionContext.TriggerOffset > 0 ? Editor.GetCharAt (CurrentCompletionContext.TriggerOffset - 1) : '\0';
+				
+			var	completionList = await InternalHandleCodeCompletion (CurrentCompletionContext, ch, true, triggerWordLength, default(CancellationToken), true);
+			if (completionList != null)
+				CompletionWindowManager.ShowWindow (this, (char)0, completionList, CompletionWidget, CurrentCompletionContext);
+			else
+				CurrentCompletionContext = null;
 		}
+
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CastCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CastCompletionData.cs
new file mode 100644
index 0000000000..91651bd413
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CastCompletionData.cs
@@ -0,0 +1,76 @@
+// 
+// CSharpCompletionTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.CodeCompletion;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class CastCompletionData : RoslynSymbolCompletionData
+	{
+		readonly SemanticModel semanticModel;
+		readonly SyntaxNode nodeToCast;
+		readonly ITypeSymbol targetType;
+
+		public CastCompletionData (ICompletionDataKeyHandler keyHandler, RoslynCodeCompletionFactory factory, SemanticModel semanticModel, ISymbol symbol, SyntaxNode nodeToCast, ITypeSymbol targetType) : base(keyHandler, factory, symbol)
+		{
+			this.targetType = targetType;
+			this.nodeToCast = nodeToCast;
+			this.semanticModel = semanticModel;
+		}
+
+		public override string GetDisplayDescription (bool isSelected)
+		{
+			var description = "<small>(cast to " + SafeMinimalDisplayString (targetType, semanticModel, nodeToCast.SpanStart, Ambience.LabelFormat) + ")</small>";
+			if (isSelected)
+				return description;
+			return "<span foreground=\"darkgray\">" + description + "</span>";
+		}
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
+		{
+			var editor = factory.Ext.Editor;
+			var offset = window.CodeCompletionContext.TriggerOffset;
+			using (var undo = editor.OpenUndoGroup ()) {
+				base.InsertCompletionText (window, ref ka, descriptor);
+				var span = nodeToCast.Span;
+				var type = SafeMinimalDisplayString (targetType, semanticModel, nodeToCast.SpanStart, Ambience.LabelFormat);
+				editor.ReplaceText (span.Start, span.Length, "((" + type + ")" + nodeToCast + ")");
+			}
+		}
+
+		public override bool IsOverload (CompletionData other)
+		{
+			return false;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ConstructorParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ConstructorParameterDataProvider.cs
index c9d6a2855b..28196b83eb 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ConstructorParameterDataProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ConstructorParameterDataProvider.cs
@@ -43,7 +43,7 @@ namespace MonoDevelop.CSharp.Completion
 		{
 			this.type = type;
 			
-			var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Document.Editor.Caret.Location) as CSharpTypeResolveContext;
+			var ctx = ext.CSharpUnresolvedFile.GetTypeResolveContext (ext.UnresolvedFileCompilation, ext.Editor.CaretLocation) as CSharpTypeResolveContext;
 
 			var lookup = new MemberLookup (ctx.CurrentTypeDefinition, ext.Compilation.MainAssembly);
 			bool isProtectedAllowed = false;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreateOverrideCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreateOverrideCompletionData.cs
new file mode 100644
index 0000000000..7b1cdb3456
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreateOverrideCompletionData.cs
@@ -0,0 +1,153 @@
+// CreateOverrideCompletionData.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Gui.Content;
+using System.Collections.Generic;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.CSharp.Formatting;
+using System;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class CreateOverrideCompletionData : RoslynSymbolCompletionData
+	{
+		readonly int declarationBegin;
+		readonly ITypeSymbol currentType;
+
+		bool afterKeyword;
+
+		public bool GenerateBody { get; set; }
+
+		string displayText;
+		public override string DisplayText {
+			get {
+				if (displayText == null) {
+					if (factory == null) {
+						displayText = Symbol.Name;
+					} else {
+						var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+						displayText = Ambience.EscapeText (SafeMinimalDisplayString (base.Symbol, model, declarationBegin, Ambience.LabelFormat)) + " {...}";
+					}
+
+					if (!afterKeyword)
+						displayText = "override " + displayText;
+				}
+
+				return displayText;
+			}
+		}
+
+		public override string GetDisplayTextMarkup ()
+		{
+			var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+
+			var result = Ambience.EscapeText (SafeMinimalDisplayString (Symbol, model, declarationBegin, Ambience.LabelFormat)) + " {...}";
+			var idx = result.IndexOf (Symbol.Name, StringComparison.Ordinal);
+			if (idx >= 0) {
+				result = 
+					result.Substring(0, idx) +
+					      "<b>" + Symbol.Name + "</b>"+
+					      result.Substring(idx + Symbol.Name.Length);
+			}
+
+			if (!afterKeyword)
+				result = "override " + result;
+
+			return ApplyDiplayFlagsFormatting (result);
+		}
+
+		public CreateOverrideCompletionData (ICompletionDataKeyHandler keyHandler, RoslynCodeCompletionFactory factory, int declarationBegin, ITypeSymbol currentType, Microsoft.CodeAnalysis.ISymbol member, bool afterKeyword) : base (keyHandler, factory, member, member.ToDisplayString ())
+		{
+			this.afterKeyword = afterKeyword;
+			this.currentType = currentType;
+			this.declarationBegin = declarationBegin;
+			this.GenerateBody = true;
+		}
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
+		{
+			var editor = ext.Editor;
+			bool isExplicit = false;
+//			if (member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+//				foreach (var m in type.Members) {
+//					if (m.Name == member.Name && !m.ReturnType.Equals (member.ReturnType)) {
+//						isExplicit = true;
+//						break;
+//					}
+//				}
+//			}
+//			var resolvedType = type.Resolve (ext.Project).GetDefinition ();
+//			if (ext.Project != null)
+//				generator.PolicyParent = ext.Project.Policies;
+			
+			var result = CSharpCodeGenerator.CreateOverridenMemberImplementation (ext.DocumentContext, ext.Editor, currentType, currentType.Locations.First (), Symbol, isExplicit, factory.SemanticModel);
+			string sb = result.Code.TrimStart ();
+			int trimStart = result.Code.Length - sb.Length;
+			sb = sb.TrimEnd ();
+			
+			var lastRegion = result.BodyRegions.LastOrDefault ();
+			var region = lastRegion == null? null
+				: new CodeGeneratorBodyRegion (lastRegion.StartOffset - trimStart, lastRegion.EndOffset - trimStart);
+			
+			int targetCaretPosition;
+			int selectionEndPosition = -1;
+			if (region != null && region.IsValid) {
+				targetCaretPosition = declarationBegin + region.StartOffset;
+				if (region.Length > 0) {
+					if (GenerateBody) {
+						selectionEndPosition = declarationBegin + region.EndOffset;
+					} else {
+						//FIXME: if there are multiple regions, remove all of them
+						sb = sb.Substring (0, region.StartOffset) + sb.Substring (region.EndOffset); 
+					}
+				}
+			} else {
+				targetCaretPosition = declarationBegin + sb.Length;
+			}
+			
+			editor.ReplaceText (declarationBegin, editor.CaretOffset - declarationBegin, sb);
+			if (selectionEndPosition > 0) {
+				editor.CaretOffset = selectionEndPosition;
+				editor.SetSelection (targetCaretPosition, selectionEndPosition);
+			} else {
+				editor.CaretOffset = targetCaretPosition;
+			}
+
+			OnTheFlyFormatter.Format (editor, ext.DocumentContext, declarationBegin, declarationBegin + sb.Length);
+		}
+
+		public override bool IsOverload (CompletionData other)
+		{
+			return false;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreatePartialCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreatePartialCompletionData.cs
new file mode 100644
index 0000000000..ea516a9ae7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CreatePartialCompletionData.cs
@@ -0,0 +1,144 @@
+//
+// CreatePartialCompletionData.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Formatting;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using System;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class CreatePartialCompletionData : RoslynSymbolCompletionData
+	{
+		readonly ITypeSymbol currentType;
+		readonly int declarationBegin;
+
+		bool afterKeyword;
+
+		public bool GenerateBody { get; set; }
+
+		string displayText;
+		public override string DisplayText {
+			get {
+				if (displayText == null) {
+					if (factory == null) {
+						displayText = Symbol.Name;
+					} else {
+						var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+						displayText = Ambience.EscapeText (SafeMinimalDisplayString (base.Symbol, model, ext.Editor.CaretOffset, Ambience.LabelFormat)) + " {...}";
+					}
+					if (!afterKeyword)
+						displayText = "partial " + displayText;
+				}
+				return displayText;
+			}
+		}
+
+
+		public override string GetDisplayTextMarkup ()
+		{
+			var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+
+			var result = Ambience.EscapeText (SafeMinimalDisplayString(base.Symbol, model, ext.Editor.CaretOffset, Ambience.LabelFormat)) + " {...}";
+			var idx = result.IndexOf (Symbol.Name, StringComparison.Ordinal);
+			if (idx >= 0) {
+				result = 
+					result.Substring(0, idx) +
+					"<b>" + Symbol.Name + "</b>"+
+					result.Substring(idx + Symbol.Name.Length);
+			}
+
+			if (!afterKeyword)
+				result = "partial " + result;
+
+			return ApplyDiplayFlagsFormatting (result);
+		}
+
+		public CreatePartialCompletionData (ICompletionDataKeyHandler keyHandler, RoslynCodeCompletionFactory factory, int declarationBegin, ITypeSymbol currentType, ISymbol member, bool afterKeyword) : base (keyHandler, factory, member)
+		{
+			this.afterKeyword = afterKeyword;
+			this.currentType = currentType;
+			this.declarationBegin = declarationBegin;
+			this.GenerateBody = true;
+		}
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
+		{
+			var editor = ext.Editor;
+			bool isExplicit = false;
+			//			if (member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+			//				foreach (var m in type.Members) {
+			//					if (m.Name == member.Name && !m.ReturnType.Equals (member.ReturnType)) {
+			//						isExplicit = true;
+			//						break;
+			//					}
+			//				}
+			//			}
+			//			var resolvedType = type.Resolve (ext.Project).GetDefinition ();
+			//			if (ext.Project != null)
+			//				generator.PolicyParent = ext.Project.Policies;
+
+			var result = CSharpCodeGenerator.CreatePartialMemberImplementation (ext.DocumentContext, ext.Editor, currentType, currentType.Locations.First (), Symbol, isExplicit, factory.SemanticModel);
+			string sb = result.Code.TrimStart ();
+			int trimStart = result.Code.Length - sb.Length;
+			sb = sb.TrimEnd ();
+
+			var lastRegion = result.BodyRegions.LastOrDefault ();
+			var region = lastRegion == null? null
+				: new CodeGeneratorBodyRegion (lastRegion.StartOffset - trimStart, lastRegion.EndOffset - trimStart);
+
+			int targetCaretPosition;
+			int selectionEndPosition = -1;
+			if (region != null && region.IsValid) {
+				targetCaretPosition = declarationBegin + region.EndOffset;
+
+			} else {
+				targetCaretPosition = declarationBegin + sb.Length;
+			}
+
+			editor.ReplaceText (declarationBegin, editor.CaretOffset - declarationBegin, sb);
+			if (selectionEndPosition > 0) {
+				editor.CaretOffset = selectionEndPosition;
+				editor.SetSelection (targetCaretPosition, selectionEndPosition);
+			} else {
+				editor.CaretOffset = targetCaretPosition;
+			}
+
+			OnTheFlyFormatter.Format (editor, ext.DocumentContext, declarationBegin, declarationBegin + sb.Length);
+			editor.CaretLine--;
+		}
+
+		public override bool IsOverload (CompletionData other)
+		{
+			return false;
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/DelegateDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/DelegateDataProvider.cs
deleted file mode 100644
index 527a7aa8b8..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/DelegateDataProvider.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// 
-// DelegateDataProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Mike Krüger <mkrueger@novell.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Parser;
-using System.Text.RegularExpressions;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.CSharp.Resolver;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class DelegateDataProvider : AbstractParameterDataProvider
-	{
-//		IType delegateType;
-		IMethod delegateMethod;
-
-		ICompilation compilation;
-		CSharpUnresolvedFile file;
-		
-		public DelegateDataProvider (int startOffset, CSharpCompletionTextEditorExtension ext, IType delegateType) : base (ext, startOffset)
-		{
-			compilation = ext.UnresolvedFileCompilation;
-			file = ext.CSharpUnresolvedFile;
-			//			this.delegateType = delegateType;
-			this.delegateMethod = delegateType.GetDelegateInvokeMethod ();
-		}
-
-		public override TooltipInformation CreateTooltipInformation (int overload, int currentParameter, bool smartWrap)
-		{
-			return MethodParameterDataProvider.CreateTooltipInformation (ext, compilation, file, delegateMethod, currentParameter, smartWrap);
-		}
-
-		#region IParameterDataProvider implementation
-		public override int GetParameterCount (int overload)
-		{
-			if (overload >= Count)
-				return -1;
-			return delegateMethod.Parameters != null ? delegateMethod.Parameters.Count : 0;
-		}
-		
-		public override bool AllowParameterList (int overload)
-		{
-			if (overload >= Count)
-				return false;
-			var lastParam = delegateMethod.Parameters.LastOrDefault ();
-			return lastParam != null && lastParam.IsParams;
-		}
-
-		public override string GetParameterName (int overload, int paramIndex)
-		{
-			return delegateMethod.Parameters[paramIndex].Name;
-		}
-		
-		public override int Count {
-			get {
-				return 1;
-			}
-		}
-		#endregion 
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs
index ed967df971..47384b7952 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs
@@ -32,109 +32,120 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.CSharp.Formatting;
 using MonoDevelop.CSharp.Parser;
-using Mono.TextEditor;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor.Util;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide;
+using MonoDevelop.Refactoring;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+using System.Threading.Tasks;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	class EventCreationCompletionData : CompletionData
+	class EventCreationCompletionData : AnonymousMethodCompletionData
 	{
-		string parameterList;
-		IUnresolvedMember callingMember;
-//		CSharpCompletionTextEditorExtension ext;
-		int initialOffset;
-		public bool AddSemicolon = true;
-		TextEditorData editor;
-
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
+		readonly RoslynCodeCompletionFactory factory;
+		readonly ITypeSymbol delegateType;
+
+		public override Task<TooltipInformation> CreateTooltipInformation (bool smartWrap, CancellationToken token)
+		{
+			return Task.FromResult (new TooltipInformation ());
+		}
+
+		public override int PriorityGroup { get { return 2; } }
+
+		public EventCreationCompletionData (ICompletionDataKeyHandler keyHandler, RoslynCodeCompletionFactory factory, ITypeSymbol delegateType, string varName, INamedTypeSymbol curType) : base (factory, keyHandler)
 		{
-			var tooltipInfo = new TooltipInformation ();
-			return tooltipInfo;
+			this.DisplayText = varName;
+			this.delegateType = delegateType;
+			this.factory = factory;
+			this.Icon = "md-newmethod";
 		}
 
-		public EventCreationCompletionData (CSharpCompletionTextEditorExtension ext, string methodName, IType delegateType, IEvent evt, string parameterList, IUnresolvedMember callingMember, IUnresolvedTypeDefinition declaringType) : base (null)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
-			if (string.IsNullOrEmpty (methodName)) {
-				this.DisplayText   = (evt != null ? evt.Name : "");
-			} else {
-				this.DisplayText   = Char.ToUpper (methodName[0]) + methodName.Substring (1) + (evt != null ? evt.Name : "");
-			}
-			
-			if (declaringType != null && declaringType.Members.Any (m => m.Name == this.DisplayText)) {
-				for (int i = 1; i < 10000; i++) {
-					if (!declaringType.Members.Any (m => m.Name == this.DisplayText + i)) {
-						this.DisplayText = this.DisplayText + i.ToString ();
-						break;
+			// insert add/remove event handler code after +=/-=
+			var editor = factory.Ext.Editor;
+
+
+			bool AddSemicolon = true;
+			var position = window.CodeCompletionContext.TriggerOffset;
+			editor.ReplaceText (position, editor.CaretOffset - position, this.DisplayText + (AddSemicolon ? ";" : ""));
+
+
+			var document = IdeApp.Workbench.ActiveDocument;
+			var parsedDocument = document.UpdateParseDocument ().Result;
+			var semanticModel = parsedDocument.GetAst<SemanticModel> ();
+
+			var declaringType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol> (position, default(CancellationToken));
+			var enclosingSymbol = semanticModel.GetEnclosingSymbol<ISymbol> (position, default(CancellationToken));
+
+			var insertionPoints = InsertionPointService.GetInsertionPoints (
+				document.Editor,
+				parsedDocument,
+				declaringType,
+				editor.CaretOffset
+			);
+			var options = new InsertionModeOptions (
+				GettextCatalog.GetString ("Create new method"),
+				insertionPoints,
+				point => {
+					if (!point.Success) 
+						return;
+					var indent = "\t";
+					var sb = new StringBuilder ();
+					if (enclosingSymbol != null && enclosingSymbol.IsStatic)
+						sb.Append ("static ");
+					sb.Append ("void ");
+					int pos2 = sb.Length;
+					sb.Append (this.DisplayText);
+					sb.Append (' ');
+					sb.Append("(");
+
+					var delegateMethod = delegateType.GetDelegateInvokeMethod();
+					for (int k = 0; k < delegateMethod.Parameters.Length; k++) {
+						if (k > 0) {
+							sb.Append(", ");
+						}
+						sb.Append (RoslynCompletionData.SafeMinimalDisplayString (delegateMethod.Parameters [k], semanticModel, position, MonoDevelop.Ide.TypeSystem.Ambience.LabelFormat)); 
 					}
+					sb.Append(")");
+
+					sb.Append (editor.EolMarker);
+					sb.Append (indent);
+					sb.Append ("{");
+					sb.Append (editor.EolMarker);
+					sb.Append (indent);
+					sb.Append (editor.Options.GetIndentationString ());
+					//int cursorPos = pos + sb.Length;
+					sb.Append (editor.EolMarker);
+					sb.Append (indent);
+					sb.Append ("}");
+					point.InsertionPoint.Insert (document.Editor, document, sb.ToString ());
+					//			// start text link mode after insert
+					//			var links = new List<TextLink> ();
+					//			var link = new TextLink ("name");
+					//			
+					//			link.AddLink (new TextSegment (initialOffset, this.DisplayText.Length));
+					//			link.AddLink (new TextSegment (initialOffset + pos + pos2, this.DisplayText.Length));
+					//			links.Add (link);
+					//			editor.StartTextLinkMode (new TextLinkModeOptions (links));
 				}
-			}
-			this.editor        = ext.TextEditorData;
-			this.parameterList = parameterList;
-			this.callingMember = callingMember;
-			this.Icon          = "md-newmethod";
-			this.initialOffset = editor.Caret.Offset;
+			);
+
+			editor.StartInsertionMode (options);
+
 		}
-		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+
+		public override bool IsOverload (CompletionData other)
 		{
-			// insert add/remove event handler code after +=/-=
-			editor.Replace (initialOffset, editor.Caret.Offset - initialOffset, this.DisplayText + (AddSemicolon ? ";" : ""));
-			
-			// Search opening bracket of member
-			int pos = callingMember != null && !callingMember.BodyRegion.Begin.IsEmpty ? editor.Document.LocationToOffset (callingMember.BodyRegion.BeginLine, callingMember.BodyRegion.BeginColumn) : initialOffset;
-			while (pos < editor.Document.TextLength && editor.Document.GetCharAt (pos) != '{') {
-				pos++;
-			}
-			
-			// Search closing bracket of member
-			pos = editor.Document.GetMatchingBracketOffset (pos) + 1;
-			
-			pos = Math.Max (0, Math.Min (pos, editor.Document.TextLength - 1));
-			
-			// Insert new event handler after closing bracket
-			var line = callingMember != null ? editor.Document.GetLine (callingMember.Region.BeginLine) : editor.Document.GetLineByOffset (initialOffset);
-			string indent = line.GetIndentation (editor.Document);
-			
-			StringBuilder sb = new StringBuilder ();
-			sb.Append (editor.EolMarker);
-			sb.Append (editor.EolMarker);
-			sb.Append (indent);
-			if (callingMember != null && callingMember.IsStatic)
-				sb.Append ("static ");
-			sb.Append ("void ");
-			int pos2 = sb.Length;
-			sb.Append (this.DisplayText);
-			sb.Append (' ');
-			sb.Append (this.parameterList);
-			sb.Append (editor.EolMarker);
-			sb.Append (indent);
-			sb.Append ("{");
-			sb.Append (editor.EolMarker);
-			sb.Append (indent);
-			sb.Append (editor.Options.IndentationString);
-			int cursorPos = pos + sb.Length;
-			sb.Append (editor.EolMarker);
-			sb.Append (indent);
-			sb.Append ("}");
-			editor.Insert (pos, sb.ToString ());
-			editor.Caret.Offset = cursorPos;
-			
-			// start text link mode after insert
-			List<TextLink> links = new List<TextLink> ();
-			TextLink link = new TextLink ("name");
-			
-			link.AddLink (new TextSegment (0, this.DisplayText.Length));
-			link.AddLink (new TextSegment (pos - initialOffset + pos2, this.DisplayText.Length));
-			links.Add (link);
-			
-			var tle = new TextLinkEditMode (editor.Parent, initialOffset, links);
-			tle.TextLinkMode = TextLinkMode.EditIdentifier;
-			tle.SetCaretPosition = true;
-			tle.SelectPrimaryLink = true;
-			tle.OldMode = editor.CurrentMode;
-			tle.StartMode ();
-			editor.CurrentMode = tle;
+			return false;
 		}
 	}
 	
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs
new file mode 100644
index 0000000000..f74e834298
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs
@@ -0,0 +1,158 @@
+//
+// ImportSymbolCompletionData.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using GLib;
+using System.Collections.Generic;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Components.PropertyGrid.PropertyEditors;
+using MonoDevelop.Ide.Editor;
+using System.Text;
+using ICSharpCode.NRefactory.MonoCSharp;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class ImportSymbolCompletionData : RoslynSymbolCompletionData
+	{
+		CSharpCompletionTextEditorExtension completionExt;
+		ISymbol type;
+		bool useFullName;
+
+		public override IconId Icon {
+			get {
+				return type.GetStockIcon ();
+			}
+		}
+
+		public override int PriorityGroup { get { return int.MinValue; } }
+
+		public ImportSymbolCompletionData (CSharpCompletionTextEditorExtension ext, RoslynCodeCompletionFactory factory, ISymbol type, bool useFullName) : base (null, factory, type)
+		{
+			this.completionExt = ext;
+			this.useFullName = useFullName;
+			this.type = type;
+			this.DisplayFlags |= DisplayFlags.IsImportCompletion;
+		}
+
+		bool initialized = false;
+		bool generateUsing, insertNamespace;
+
+		void Initialize ()
+		{
+			if (initialized)
+				return;
+			initialized = true;
+			if (type.ContainingNamespace == null) 
+				return;
+			generateUsing = !useFullName;
+			insertNamespace = useFullName;
+		}
+
+		static string GetDefaultDisplaySelection (string description, bool isSelected)
+		{
+			if (!isSelected)
+				return "<span foreground=\"darkgray\">" + description + "</span>";
+			return description;
+		}
+
+		string displayDescription = null;
+		public override string GetDisplayDescription (bool isSelected)
+		{
+			if (displayDescription == null) {
+				Initialize ();
+				if (generateUsing || insertNamespace) {
+					displayDescription = string.Format (GettextCatalog.GetString ("(from '{0}')"), type.ContainingNamespace.Name);
+				} else {
+					displayDescription = "";
+				}
+			}
+			return GetDefaultDisplaySelection (displayDescription, isSelected);
+		}
+
+		#region IActionCompletionData implementation
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, MonoDevelop.Ide.Editor.Extension.KeyDescriptor descriptor)
+		{
+			Initialize ();
+			var doc = completionExt.DocumentContext;
+
+			base.InsertCompletionText (window, ref ka, descriptor);
+
+			using (var undo = completionExt.Editor.OpenUndoGroup ()) {
+				if (!window.WasShiftPressed && generateUsing) {
+					AddGlobalNamespaceImport (completionExt.Editor, doc, type.ContainingNamespace.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat));
+				}
+			}
+			ka |= KeyActions.Ignore;
+		}
+
+		static void AddGlobalNamespaceImport (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context, string nsName)
+		{
+			var parsedDocument = context.ParsedDocument;
+			var unit = parsedDocument.GetAst<SemanticModel> ();
+			if (unit == null)
+				return;
+
+			int offset = SearchUsingInsertionPoint (unit.SyntaxTree.GetRoot ());
+
+			var text = new StringBuilder ();
+			text.Append ("using ");
+			text.Append (nsName);
+			text.Append (";");
+			text.Append (editor.EolMarker);
+
+			editor.InsertText (offset, text.ToString ());
+		}
+
+		static int SearchUsingInsertionPoint (SyntaxNode parent)
+		{
+			var result = 0;
+			foreach (SyntaxNode node in parent.ChildNodes ()) {
+				if (node.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective)) {
+					result = node.FullSpan.End;
+					continue;
+				}
+				SyntaxTrivia last = new SyntaxTrivia ();
+
+				foreach (var trivia in node.GetLeadingTrivia ()) {
+					if (last.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.SingleLineCommentTrivia)||
+						last.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.DefineDirectiveTrivia) || 
+						last.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.MultiLineCommentTrivia) || 
+						last.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.SingleLineDocumentationCommentTrivia))
+						result = trivia.Span.End;
+					last = trivia;
+				}
+				break;
+			}
+			return result;
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/IndexerParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/IndexerParameterDataProvider.cs
deleted file mode 100644
index 38bb78ff5f..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/IndexerParameterDataProvider.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// 
-// NRefactoryIndexerParameterDataProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Parser;
-
-using System.Text.RegularExpressions;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class IndexerParameterDataProvider : AbstractParameterDataProvider
-	{
-//		AstNode resolvedExpression;
-		List<IProperty> indexers;
-
-		ICompilation compilation;
-		CSharpUnresolvedFile file;
-		
-		public IndexerParameterDataProvider (int startOffset, CSharpCompletionTextEditorExtension ext, IType type, IEnumerable<IProperty> indexers, AstNode resolvedExpression) : base (ext, startOffset)
-		{
-			compilation = ext.UnresolvedFileCompilation;
-			file = ext.CSharpUnresolvedFile;
-			//			this.resolvedExpression = resolvedExpression;
-			this.indexers = new List<IProperty> (indexers);
-		}
-
-		public override TooltipInformation CreateTooltipInformation (int overload, int currentParameter, bool smartWrap)
-		{
-			return MethodParameterDataProvider.CreateTooltipInformation (ext, compilation, file, indexers[overload], currentParameter, smartWrap);
-		}
-
-		#region IParameterDataProvider implementation
-		public override int GetParameterCount (int overload)
-		{
-			if (overload >= Count)
-				return -1;
-			var indexer = indexers[overload];
-			return indexer != null && indexer.Parameters != null ? indexer.Parameters.Count : 0;
-		}
-
-		public override bool AllowParameterList (int overload)
-		{
-			if (overload >= Count)
-				return false;
-			var lastParam = indexers[overload].Parameters.LastOrDefault ();
-			return lastParam != null && lastParam.IsParams;
-		}
-
-		public override string GetParameterName (int overload, int paramIndex)
-		{
-			var indexer = indexers[overload];
-			return indexer.Parameters[paramIndex].Name;
-		}
-
-		public override int Count {
-			get {
-				return indexers != null ? indexers.Count : 0;
-			}
-		}
-		#endregion
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
deleted file mode 100644
index b5d11b0e20..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
+++ /dev/null
@@ -1,864 +0,0 @@
-// MemberCompletionData.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.Completion;
-using ICSharpCode.NRefactory.Documentation;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.IO;
-using MonoDevelop.CSharp.Formatting;
-using Gtk;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class MemberCompletionData : CompletionData, IEntityCompletionData
-	{
-		CSharpCompletionTextEditorExtension editorCompletion;
-		OutputFlags flags;
-		bool hideExtensionParameter = true;
-		static CSharpAmbience ambience = new CSharpAmbience ();
-		string completionString;
-		string displayText;
-		Dictionary<string, CompletionData> overloads;
-
-		Mono.TextEditor.TextEditorData Editor {
-			get {
-				return editorCompletion.TextEditorData;
-			}
-		}
-
-		MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy Policy {
-			get {
-				return editorCompletion.FormattingPolicy;
-			}
-		}
-
-		public override string Description {
-			get {
-				return "";
-			}
-		}
-
-		public override string CompletionText {
-			get { return completionString; }
-			set { completionString = value; }
-		}
-
-		public override string DisplayText {
-			get {
-				if (displayText == null) {
-					displayText = ambience.GetString (Entity.SymbolKind == SymbolKind.Constructor ? Entity.DeclaringTypeDefinition : Entity, flags | OutputFlags.HideGenericParameterNames);
-				}
-				return displayText; 
-			}
-		}
-
-		public override IconId Icon {
-			get {
-				return (Entity.SymbolKind == SymbolKind.Constructor ? Entity.DeclaringTypeDefinition : Entity).GetStockIcon ();
-			}
-		}
-
-		public bool HideExtensionParameter {
-			get {
-				return hideExtensionParameter;
-			}
-			set {
-				hideExtensionParameter = value;
-			}
-		}
-
-		bool isDelegateExpected;
-		public bool IsDelegateExpected {
-			get {
-				return isDelegateExpected || factory != null && factory.Engine.PossibleDelegates.Count > 0;
-			} 
-			set {
-				isDelegateExpected = value;
-			}
-		}
-
-		ICompilation compilation;
-		CSharpUnresolvedFile file;
-		CSharpCompletionTextEditorExtension.CompletionDataFactory factory;
-
-		public MemberCompletionData (CSharpCompletionTextEditorExtension.CompletionDataFactory factory, IEntity entity, OutputFlags flags) : this(factory.ext, entity, flags)
-		{
-			this.factory = factory;
-		}
-
-		public MemberCompletionData (CSharpCompletionTextEditorExtension editorCompletion, IEntity entity, OutputFlags flags)
-		{
-			compilation = editorCompletion.UnresolvedFileCompilation;
-			file = editorCompletion.CSharpUnresolvedFile;
-
-			this.editorCompletion = editorCompletion;
-			this.flags = flags;
-			SetMember (entity);
-			DisplayFlags = DisplayFlags.DescriptionHasMarkup;
-			var m = Entity as IMember;
-			if (m != null && m.IsObsolete ())
-				DisplayFlags |= DisplayFlags.Obsolete;
-		}
-
-		public bool SearchBracket (int start, out int pos)
-		{
-			pos = -1;
-			
-			for (int i = start; i < Editor.Length; i++) {
-				char ch = Editor.GetCharAt (i);
-				if (ch == '(') {
-					pos = i + 1;
-					return true;
-				}
-				if (!char.IsWhiteSpace (ch))
-					return false;
-			}
-			return false;
-		}
-
-		static bool HasNonMethodMembersWithSameName (IMember member)
-		{
-			return member.DeclaringType.GetFields ().Cast<INamedElement> ()
-				.Concat (member.DeclaringType.GetProperties ().Cast<INamedElement> ())
-				.Concat (member.DeclaringType.GetEvents ().Cast<INamedElement> ())
-				.Concat (member.DeclaringType.GetNestedTypes ().Cast<INamedElement> ())
-				.Any (e => e.Name == member.Name);
-		}
-
-		static bool HasAnyOverloadWithParameters (IMethod method)
-		{
-			if (method.SymbolKind == SymbolKind.Constructor) 
-				return method.DeclaringType.GetConstructors ().Any (m => m.Parameters.Count > 0);
-			return method.DeclaringType.GetMethods ().Any (m => m.Name == method.Name && m.Parameters.Count > 0);
-		}
-
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
-		{
-			InsertCompletionText (window, ref ka, closeChar, keyChar, modifier, CompletionTextEditorExtension.AddParenthesesAfterCompletion, CompletionTextEditorExtension.AddOpeningOnly);
-		}
-
-		bool IsBracketAlreadyInserted (IMethod method)
-		{
-			int offset = Editor.Caret.Offset;
-			while (offset < Editor.Length) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsLetterOrDigit (ch))
-					break;
-				offset++;
-			}
-			while (offset < Editor.Length) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsWhiteSpace (ch))
-					return ch == '(' || ch == '<' && RequireGenerics (method);
-				offset++;
-			}
-			return false;
-		}
-
-		bool InsertSemicolon (int exprStart)
-		{
-			int offset = exprStart;
-			while (offset > 0) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsWhiteSpace (ch)) {
-					if (ch != '{' && ch != '}' && ch != ';')
-						return false;
-					break;
-				}
-				offset--;
-			}
-
-			offset = Editor.Caret.Offset;
-			while (offset < Editor.Length) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsLetterOrDigit (ch))
-					break;
-				offset++;
-			}
-			while (offset < Editor.Length) {
-				char ch = Editor.GetCharAt (offset);
-				if (!char.IsWhiteSpace (ch))
-					return char.IsLetter (ch) || ch == '}';
-				offset++;
-			}
-			return true;
-		}
-
-		public void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier, bool addParens, bool addOpeningOnly)
-		{
-			string text = CompletionText;
-			string partialWord = GetCurrentWord (window);
-			int skipChars = 0;
-			bool runParameterCompletionCommand = false;
-			bool runCompletionCompletionCommand = false;
-			var method = Entity as IMethod;
-			if (addParens && !IsDelegateExpected && method != null && !HasNonMethodMembersWithSameName ((IMember)Entity) && !IsBracketAlreadyInserted (method)) {
-				var line = Editor.GetLine (Editor.Caret.Line);
-				//var start = window.CodeCompletionContext.TriggerOffset + partialWord.Length + 2;
-				//var end = line.Offset + line.Length;
-				//string textToEnd = start < end ? Editor.GetTextBetween (start, end) : "";
-				bool addSpace = Policy.BeforeMethodCallParentheses && CSharpTextEditorIndentation.OnTheFlyFormatting;
-
-				int exprStart = window.CodeCompletionContext.TriggerOffset - 1;
-				while (exprStart > line.Offset) {
-					char ch = Editor.GetCharAt (exprStart);
-					if (ch != '.' && ch != '_' && /*ch != '<' && ch != '>' && */!char.IsLetterOrDigit (ch))
-						break;
-					exprStart--;
-				}
-				bool insertSemicolon = InsertSemicolon(exprStart);
-				if (Entity.SymbolKind == SymbolKind.Constructor)
-					insertSemicolon = false;
-				//int pos;
-
-				Gdk.Key[] keys = new [] { Gdk.Key.Return, Gdk.Key.Tab, Gdk.Key.space, Gdk.Key.KP_Enter, Gdk.Key.ISO_Enter };
-				if (keys.Contains (closeChar) || keyChar == '.') {
-					if (HasAnyOverloadWithParameters (method)) {
-						if (addOpeningOnly) {
-							text += RequireGenerics (method) ? "<|" : (addSpace ? " (|" : "(|");
-							skipChars = 0;
-						} else {
-							if (keyChar == '.') {
-								if (RequireGenerics (method)) {
-									text += addSpace ? "<> ()" : "<>()";
-								} else {
-									text += addSpace ? " ()" : "()";
-								}
-								skipChars = 0;
-							} else {
-								if (insertSemicolon) {
-									if (RequireGenerics (method)) {
-										text += addSpace ? "<|> ();" : "<|>();";
-										skipChars = addSpace ? 5 : 4;
-									} else {
-										text += addSpace ? " (|);" : "(|);";
-										skipChars = 2;
-									}
-								} else {
-									if (RequireGenerics (method)) {
-										text += addSpace ? "<|> ()" :  "<|>()";
-										skipChars = addSpace ? 4 : 3;
-									} else {
-										text += addSpace ? " (|)" : "(|)";
-										skipChars = 1;
-									}
-								}
-							}
-						}
-						runParameterCompletionCommand = true;
-					} else {
-						if (addOpeningOnly) {
-							text += RequireGenerics (method) ? "<|" : (addSpace ? " (|" : "(|");
-							skipChars = 0;
-						} else {
-							if (keyChar == '.') {
-								if (RequireGenerics (method)) {
-									text += addSpace ? "<> ().|" : "<>().|";
-								} else {
-									text += addSpace ? " ().|" : "().|";
-								}
-								skipChars = 0;
-							} else {
-								if (insertSemicolon) {
-									if (RequireGenerics (method)) {
-										text += addSpace ? "<|> ();" : "<|>();";
-									} else {
-										text += addSpace ? " ();|" : "();|";
-									}
-
-								} else {
-									if (RequireGenerics (method)) {
-										text += addSpace ? "<|> ()" : "<|>()";
-									} else {
-										text += addSpace ? " ()|" : "()|";
-									}
-
-								}
-							}
-						}
-					}
-					if (keyChar == '(') {
-						var skipChar = Editor.SkipChars.LastOrDefault ();
-						if (skipChar != null && skipChar.Offset == (window.CodeCompletionContext.TriggerOffset + partialWord.Length) && skipChar.Char == ')')
-							Editor.Remove (skipChar.Offset, 1);
-					}
-				}
-				ka |= KeyActions.Ignore;
-			}
-			if ((DisplayFlags & DisplayFlags.NamedArgument) == DisplayFlags.NamedArgument &&
-				CompletionTextEditorExtension.AddParenthesesAfterCompletion &&
-			    (closeChar == Gdk.Key.Tab ||
-				 closeChar == Gdk.Key.KP_Tab ||
-				 closeChar == Gdk.Key.ISO_Left_Tab ||
-				 closeChar == Gdk.Key.Return ||
-				 closeChar == Gdk.Key.KP_Enter ||
-				 closeChar == Gdk.Key.ISO_Enter ||
-				 closeChar == Gdk.Key.space ||
-				 closeChar == Gdk.Key.KP_Space)) {
-				if (Policy.AroundAssignmentParentheses)
-					text += " ";
-				text += "=";
-				if (Policy.AroundAssignmentParentheses && !(closeChar == Gdk.Key.space || closeChar == Gdk.Key.KP_Space))
-					text += " ";
-				runCompletionCompletionCommand = true;
-			}
-			window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, partialWord, text);
-			int offset = Editor.Caret.Offset;
-			for (int i = 0; i < skipChars; i++) {
-				Editor.SetSkipChar (offset, Editor.GetCharAt (offset));
-				offset++;
-			}
-			
-			if (runParameterCompletionCommand)
-				editorCompletion.RunParameterCompletionCommand ();
-			if (runCompletionCompletionCommand && IdeApp.Workbench != null) {
-				Application.Invoke (delegate {
-					editorCompletion.RunCompletionCommand ();
-				});
-			}
-		}
-
-		bool ContainsType (IType testType, IType searchType)
-		{
-			if (testType == searchType)
-				return true;
-			foreach (var arg in testType.TypeArguments)
-				if (ContainsType (arg, searchType))
-					return true;
-			return false;
-		}
-
-		bool RequireGenerics (IMethod method)
-		{
-			if (method.SymbolKind == SymbolKind.Constructor)
-				return method.DeclaringType.TypeParameterCount > 0;
-			var testMethod = method.ReducedFrom ?? method;
-			return testMethod.TypeArguments.Any (t => !testMethod.Parameters.Any (p => ContainsType(p.Type, t)));
-		}
-
-		void SetMember (IEntity entity)
-		{
-			this.Entity = entity;
-			this.completionString = displayText = (Entity.SymbolKind == SymbolKind.Constructor ? Entity.DeclaringTypeDefinition : Entity).Name;
-		}
-
-		TypeSystemAstBuilder GetBuilder (ICompilation compilation)
-		{
-			var ctx = editorCompletion.CSharpUnresolvedFile.GetTypeResolveContext (editorCompletion.UnresolvedFileCompilation, editorCompletion.Document.Editor.Caret.Location) as CSharpTypeResolveContext;
-			var state = new CSharpResolver (ctx);
-			var builder = new TypeSystemAstBuilder (state);
-			builder.AddTypeReferenceAnnotations  = true;
-			var dt = state.CurrentTypeDefinition;
-			var declaring = ctx.CurrentTypeDefinition != null ? ctx.CurrentTypeDefinition.DeclaringTypeDefinition : null;
-			if (declaring != null) {
-				while (dt != null) {
-					if (dt.Equals (declaring)) {
-						builder.AlwaysUseShortTypeNames = true;
-						break;
-					}
-					dt = dt.DeclaringTypeDefinition;
-				}
-			}
-			return builder;
-		}
-
-		internal class MyAmbience  : IAmbience
-		{
-			TypeSystemAstBuilder builder;
-
-			public MyAmbience (TypeSystemAstBuilder builder)
-			{
-				this.builder = builder;
-				ConversionFlags = ICSharpCode.NRefactory.TypeSystem.ConversionFlags.StandardConversionFlags;
-			}
-
-			public ConversionFlags ConversionFlags { get; set; }
-			#region ConvertEntity
-			public string ConvertSymbol(ISymbol symbol)
-			{
-				if (symbol is IEntity)
-					return ConvertEntity ((IEntity)symbol);
-				return symbol.ToString ();
-			}
-
-			public string ConvertEntity (IEntity entity)
-			{
-				if (entity == null)
-					throw new ArgumentNullException ("entity");
-				
-				StringWriter writer = new StringWriter ();
-				ConvertEntity (entity, new TextWriterTokenWriter (writer), FormattingOptionsFactory.CreateMono ());
-				return writer.ToString ();
-			}
-
-			public void ConvertEntity (IEntity entity, TextWriterTokenWriter formatter, CSharpFormattingOptions formattingPolicy)
-			{
-				if (entity == null)
-					throw new ArgumentNullException ("entity");
-				if (formatter == null)
-					throw new ArgumentNullException ("formatter");
-				if (formattingPolicy == null)
-					throw new ArgumentNullException ("options");
-				
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				EntityDeclaration node = astBuilder.ConvertEntity (entity);
-				PrintModifiers (node.Modifiers, formatter);
-				
-				if ((ConversionFlags & ConversionFlags.ShowDefinitionKeyword) == ConversionFlags.ShowDefinitionKeyword) {
-					if (node is TypeDeclaration) {
-						switch (((TypeDeclaration)node).ClassType) {
-						case ClassType.Class:
-							formatter.WriteKeyword (Roles.ClassKeyword, "class");
-							break;
-						case ClassType.Struct:
-							formatter.WriteKeyword (Roles.StructKeyword, "struct");
-							break;
-						case ClassType.Interface:
-							formatter.WriteKeyword (Roles.InterfaceKeyword, "interface");
-							break;
-						case ClassType.Enum:
-							formatter.WriteKeyword (Roles.EnumKeyword, "enum");
-							break;
-						default:
-							throw new Exception ("Invalid value for ClassType");
-						}
-						formatter.Space ();
-					} else if (node is DelegateDeclaration) {
-						formatter.WriteKeyword (Roles.DelegateKeyword, "delegate");
-						formatter.Space ();
-					} else if (node is EventDeclaration) {
-						formatter.WriteKeyword (EventDeclaration.EventKeywordRole, "event");
-						formatter.Space ();
-					}
-				}
-				
-				if ((ConversionFlags & ConversionFlags.ShowReturnType) == ConversionFlags.ShowReturnType) {
-					var rt = node.GetChildByRole (Roles.Type);
-					if (!rt.IsNull) {
-						rt.AcceptVisitor (new CSharpOutputVisitor (formatter, formattingPolicy));
-						formatter.Space ();
-					}
-				}
-				
-				if (entity is ITypeDefinition)
-					WriteTypeDeclarationName ((ITypeDefinition)entity, formatter, formattingPolicy);
-				else
-					WriteMemberDeclarationName ((IMember)entity, formatter, formattingPolicy);
-				
-				if ((ConversionFlags & ConversionFlags.ShowParameterList) == ConversionFlags.ShowParameterList && HasParameters (entity)) {
-					if (entity.SymbolKind == SymbolKind.Indexer)
-						formatter.WriteToken (Roles.LBracket, "[");
-					else 
-						formatter.WriteToken (Roles.LBrace, "(");
-					bool first = true;
-					foreach (var param in node.GetChildrenByRole(Roles.Parameter)) {
-						if (first) {
-							first = false;
-						} else {
-							formatter.WriteToken (Roles.Comma, ",");
-							formatter.Space ();
-						}
-						param.AcceptVisitor (new CSharpOutputVisitor (formatter, formattingPolicy));
-					}
-					if (entity.SymbolKind == SymbolKind.Indexer)
-						formatter.WriteToken (Roles.RBracket, "]");
-					else 
-						formatter.WriteToken (Roles.RBrace, ")");
-				}
-				
-				if ((ConversionFlags & ConversionFlags.ShowBody) == ConversionFlags.ShowBody && !(node is TypeDeclaration)) {
-					IProperty property = entity as IProperty;
-					if (property != null) {
-						formatter.Space ();
-						formatter.WriteToken (Roles.LBrace, "{");
-						formatter.Space ();
-						if (property.CanGet) {
-							formatter.WriteKeyword (PropertyDeclaration.GetKeywordRole, "get");
-							formatter.WriteToken (Roles.Semicolon, ";");
-							formatter.Space ();
-						}
-						if (property.CanSet) {
-							formatter.WriteKeyword (PropertyDeclaration.SetKeywordRole, "set");
-							formatter.WriteToken (Roles.Semicolon, ";");
-							formatter.Space ();
-						}
-						formatter.WriteToken (Roles.RBrace, "}");
-					} else {
-						formatter.WriteToken (Roles.Semicolon, ";");
-					}
-				}
-			}
-
-			bool HasParameters (IEntity e)
-			{
-				switch (e.SymbolKind) {
-				case SymbolKind.TypeDefinition:
-					return ((ITypeDefinition)e).Kind == TypeKind.Delegate;
-				case SymbolKind.Indexer:
-				case SymbolKind.Method:
-				case SymbolKind.Operator:
-				case SymbolKind.Constructor:
-				case SymbolKind.Destructor:
-					return true;
-				default:
-					return false;
-				}
-			}
-			public string ConvertConstantValue (object constantValue)
-			{
-				if (constantValue == null)
-					return "null";
-				return constantValue.ToString ();
-			}
-
-			TypeSystemAstBuilder CreateAstBuilder ()
-			{
-				return builder;
-			}
-
-			void WriteTypeDeclarationName (ITypeDefinition typeDef, TextWriterTokenWriter formatter, CSharpFormattingOptions formattingPolicy)
-			{
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				if (typeDef.DeclaringTypeDefinition != null) {
-					WriteTypeDeclarationName (typeDef.DeclaringTypeDefinition, formatter, formattingPolicy);
-					formatter.WriteToken (Roles.Dot, ".");
-				} else if ((ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) == ConversionFlags.UseFullyQualifiedTypeNames) {
-					formatter.WriteIdentifier (Identifier.Create (typeDef.Namespace));
-					formatter.WriteToken (Roles.Dot, ".");
-				}
-				formatter.WriteIdentifier (Identifier.Create (typeDef.Name));
-				if ((ConversionFlags & ConversionFlags.ShowTypeParameterList) == ConversionFlags.ShowTypeParameterList) {
-					var outputVisitor = new CSharpOutputVisitor (formatter, formattingPolicy);
-					outputVisitor.WriteTypeParameters (astBuilder.ConvertEntity (typeDef).GetChildrenByRole (Roles.TypeParameter));
-				}
-			}
-
-			void WriteMemberDeclarationName (IMember member, TextWriterTokenWriter formatter, CSharpFormattingOptions formattingPolicy)
-			{
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				if ((ConversionFlags & ConversionFlags.ShowDeclaringType) == ConversionFlags.ShowDeclaringType) {
-					ConvertType (member.DeclaringType, formatter, formattingPolicy);
-					formatter.WriteToken (Roles.Dot, ".");
-				}
-				switch (member.SymbolKind) {
-				case SymbolKind.Indexer:
-					formatter.WriteKeyword (IndexerDeclaration.ThisKeywordRole, "this");
-					break;
-				case SymbolKind.Constructor:
-					formatter.WriteIdentifier (Identifier.Create (member.DeclaringType.Name));
-					break;
-				case SymbolKind.Destructor:
-					formatter.WriteToken (DestructorDeclaration.TildeRole, "~");
-					formatter.WriteIdentifier (Identifier.Create (member.DeclaringType.Name));
-					break;
-				case SymbolKind.Operator:
-					switch (member.Name) {
-					case "op_Implicit":
-						formatter.WriteKeyword (OperatorDeclaration.ImplicitRole, "implicit");
-						formatter.Space ();
-						formatter.WriteKeyword (OperatorDeclaration.OperatorKeywordRole, "operator");
-						formatter.Space ();
-						ConvertType (member.ReturnType, formatter, formattingPolicy);
-						break;
-					case "op_Explicit":
-						formatter.WriteKeyword (OperatorDeclaration.ExplicitRole, "explicit");
-						formatter.Space ();
-						formatter.WriteKeyword (OperatorDeclaration.OperatorKeywordRole, "operator");
-						formatter.Space ();
-						ConvertType (member.ReturnType, formatter, formattingPolicy);
-						break;
-					default:
-						formatter.WriteKeyword (OperatorDeclaration.OperatorKeywordRole, "operator");
-						formatter.Space ();
-						var operatorType = OperatorDeclaration.GetOperatorType (member.Name);
-						if (operatorType.HasValue) {
-							formatter.WriteToken (OperatorDeclaration.GetRole (operatorType.Value), OperatorDeclaration.GetToken (operatorType.Value));
-						}
-						else
-							formatter.WriteIdentifier (Identifier.Create (member.Name));
-						break;
-					}
-					break;
-				default:
-					formatter.WriteIdentifier (Identifier.Create (member.Name));
-					break;
-				}
-				if ((ConversionFlags & ConversionFlags.ShowTypeParameterList) == ConversionFlags.ShowTypeParameterList && member.SymbolKind == SymbolKind.Method) {
-					var outputVisitor = new CSharpOutputVisitor (formatter, formattingPolicy);
-					outputVisitor.WriteTypeParameters (astBuilder.ConvertEntity (member).GetChildrenByRole (Roles.TypeParameter));
-				}
-			}
-
-			void PrintModifiers (Modifiers modifiers, TextWriterTokenWriter formatter)
-			{
-				foreach (var m in CSharpModifierToken.AllModifiers) {
-					if ((modifiers & m) == m) {
-						formatter.WriteToken (TypeDeclaration.ModifierRole, CSharpModifierToken.GetModifierName (m));
-						formatter.Space ();
-					}
-				}
-			}
-
-
-#endregion
-			
-			public string ConvertVariable (IVariable v)
-			{
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				AstNode astNode = astBuilder.ConvertVariable (v);
-				return astNode.ToString ().TrimEnd (';', '\r', '\n');
-			}
-
-			public string ConvertType (IType type)
-			{
-				if (type == null)
-					throw new ArgumentNullException ("type");
-				
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				AstType astType = astBuilder.ConvertType (type);
-				return astType.ToString ();
-			}
-
-			public void ConvertType (IType type, TextWriterTokenWriter formatter, CSharpFormattingOptions formattingPolicy)
-			{
-				TypeSystemAstBuilder astBuilder = CreateAstBuilder ();
-				AstType astType = astBuilder.ConvertType (type);
-				astType.AcceptVisitor (new CSharpOutputVisitor (formatter, formattingPolicy));
-			}
-
-			public string WrapComment (string comment)
-			{
-				return "// " + comment;
-			}
-		}
-
-		public static TooltipInformation CreateTooltipInformation (CSharpCompletionTextEditorExtension editorCompletion, CSharpResolver resolver, IEntity entity, bool smartWrap)
-		{
-			return CreateTooltipInformation (editorCompletion.UnresolvedFileCompilation, editorCompletion.CSharpUnresolvedFile, resolver, editorCompletion.TextEditorData, editorCompletion.FormattingPolicy, entity, smartWrap);
-		}
-
-		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IEntity entity, bool smartWrap, bool createFooter = false)
-		{
-			return CreateTooltipInformation (compilation, file, null, textEditorData, formattingPolicy, entity, smartWrap, createFooter);
-		}
-
-		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, CSharpResolver resolver, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IEntity entity, bool smartWrap, bool createFooter = false)
-		{
-			var tooltipInfo = new TooltipInformation ();
-			if (resolver == null)
-				resolver = file != null ? file.GetResolver (compilation, textEditorData.Caret.Location) : new CSharpResolver (compilation);
-			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
-			sig.BreakLineAfterReturnType = smartWrap;
-			try {
-				tooltipInfo.SignatureMarkup = sig.GetMarkup (entity);
-			} catch (Exception e) {
-				LoggingService.LogError ("Got exception while creating markup for :" + entity, e);
-				return new TooltipInformation ();
-			}
-			tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (entity) ?? "";
-			
-			if (entity is IMember) {
-				var evt = (IMember)entity;
-				if (evt.ReturnType.Kind == TypeKind.Delegate) {
-					tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (evt.ReturnType));
-				}
-			}
-			if (entity is IMethod) {
-				var method = (IMethod)entity;
-				if (method.IsExtensionMethod) {
-					tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.DeclaringTypeDefinition.FullName);
-				}
-			}
-			if (createFooter) {
-				tooltipInfo.FooterMarkup = sig.CreateFooter (entity);
-			}
-			return tooltipInfo;
-		}
-
-		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IType type, bool smartWrap, bool createFooter = false)
-		{
-			var tooltipInfo = new TooltipInformation ();
-			if (type.Kind == TypeKind.Unknown)
-				return tooltipInfo;
-			var resolver = file != null ? file.GetResolver (compilation, textEditorData.Caret.Location) : new CSharpResolver (compilation);
-			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
-			sig.BreakLineAfterReturnType = smartWrap;
-			try {
-				tooltipInfo.SignatureMarkup = sig.GetMarkup (type.IsParameterized ? type.GetDefinition () : type);
-			} catch (Exception e) {
-				LoggingService.LogError ("Got exception while creating markup for :" + type, e);
-				return new TooltipInformation ();
-			}
-			if (type.IsParameterized) {
-				var typeInfo = new StringBuilder ();
-				for (int i = 0; i < type.TypeParameterCount; i++) {
-					typeInfo.AppendLine (type.GetDefinition ().TypeParameters [i].Name + " is " + sig.GetTypeReferenceString (type.TypeArguments [i]));
-				}
-				tooltipInfo.AddCategory ("Type Parameters", typeInfo.ToString ());
-			}
-
-			var def = type.GetDefinition ();
-			if (def != null) {
-				if (createFooter)
-					tooltipInfo.FooterMarkup = sig.CreateFooter (def);
-				tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (def) ?? "";
-			}
-			return tooltipInfo;
-		}
-
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
-		{
-			return CreateTooltipInformation (compilation, file, editorCompletion.TextEditorData, editorCompletion.FormattingPolicy, Entity, smartWrap);
-		}
-		#region IOverloadedCompletionData implementation 
-	
-		class OverloadSorter : IComparer<ICompletionData>
-		{
-			public OverloadSorter ()
-			{
-			}
-
-			public int Compare (ICompletionData x, ICompletionData y)
-			{
-				var mx = ((MemberCompletionData)x).Entity as IMember;
-				var my = ((MemberCompletionData)y).Entity as IMember;
-				int result;
-				
-				if (mx is ITypeDefinition && my is ITypeDefinition) {
-					result = ((((ITypeDefinition)mx).TypeParameters.Count).CompareTo (((ITypeDefinition)my).TypeParameters.Count));
-					if (result != 0)
-						return result;
-				}
-				
-				if (mx is IMethod && my is IMethod) {
-					return MethodParameterDataProvider.MethodComparer ((IMethod)mx, (IMethod)my);
-				}
-				string sx = mx.ReflectionName;// ambience.GetString (mx, flags);
-				string sy = my.ReflectionName;// ambience.GetString (my, flags);
-				result = sx.Length.CompareTo (sy.Length);
-				return result == 0 ? string.Compare (sx, sy) : result;
-			}
-		}
-
-		public override IEnumerable<ICompletionData> OverloadedData {
-			get {
-				if (overloads == null)
-					return new CompletionData[] { this };
-				
-				var sorted = new List<ICompletionData> (overloads.Values);
-				sorted.Add (this);
-				sorted.Sort (new OverloadSorter ());
-				return sorted;
-			}
-		}
-
-		public override bool HasOverloads {
-			get { return overloads != null && overloads.Count > 0; }
-		}
-
-		public override void AddOverload (ICSharpCode.NRefactory.Completion.ICompletionData data)
-		{
-			AddOverload ((MemberCompletionData)data);
-		}
-
-		public void AddOverload (MemberCompletionData overload)
-		{
-			if (overloads == null)
-				overloads = new Dictionary<string, CompletionData> ();
-			
-			if (overload.Entity is IMember && Entity is IMember) {
-				// filter overriden members that came from base classes
-				// note that the overload tree is traversed top down.
-				var member = Entity as IMember;
-				if (member.IsOverride)
-					return;
-
-				string MemberId = (overload.Entity as IMember).GetIdString ();
-				if (MemberId != (this.Entity as IMember).GetIdString () && !overloads.ContainsKey (MemberId)) {
-					overloads [MemberId] = overload;
-					
-					//if any of the overloads is obsolete, we should not mark the item obsolete
-					if (!(overload.Entity as IMember).IsObsolete ())
-						DisplayFlags &= ~DisplayFlags.Obsolete;
-				}
-			}
-		}
-		#endregion
-
-		#region IEntityCompletionData implementation
-		public IEntity Entity {
-			get;
-			set;
-		}
-		#endregion
-
-		public override int CompareTo (object obj)
-		{
-			int result = base.CompareTo (obj);
-			if (result == 0) {
-				var mcd = obj as MemberCompletionData;
-				if (mcd != null) {
-					var mc = mcd;
-					if (this.Entity.SymbolKind == SymbolKind.Method) {
-						var method = (IMethod)this.Entity;
-						if (method.IsExtensionMethod)
-							return 1;
-					}
-					if (mc.Entity.SymbolKind == SymbolKind.Method) {
-						var method = (IMethod)mc.Entity;
-						if (method.IsExtensionMethod)
-							return -1;
-					}
-				} else {
-					return -1;
-				}
-			}
-			return result;
-		}
-
-		public override string ToString ()
-		{
-			return string.Format ("[MemberCompletionData: Entity={0}]", Entity);
-		}
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
index 01551b3b39..d9114e5050 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
@@ -39,7 +39,7 @@ using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using ICSharpCode.NRefactory.CSharp.Completion;
 using MonoDevelop.Ide.CodeCompletion;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp.Completion
 {
@@ -126,55 +126,55 @@ namespace MonoDevelop.CSharp.Completion
 
 		public static TooltipInformation CreateTooltipInformation (CSharpCompletionTextEditorExtension ext, ICompilation compilation, CSharpUnresolvedFile file, IParameterizedMember entity, int currentParameter, bool smartWrap)
 		{
-			return CreateTooltipInformation (compilation, file, ext.TextEditorData, ext.FormattingPolicy, entity, currentParameter, smartWrap);
+			return CreateTooltipInformation (compilation, file, ext.Editor, ext.FormattingPolicy, entity, currentParameter, smartWrap);
 		}
 
-		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IParameterizedMember entity, int currentParameter, bool smartWrap)
+		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditor textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IParameterizedMember entity, int currentParameter, bool smartWrap)
 		{
 			var tooltipInfo = new TooltipInformation ();
-			var resolver = file.GetResolver (compilation, textEditorData.Caret.Location);
-			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
-			sig.HighlightParameter = currentParameter;
-			sig.BreakLineAfterReturnType = smartWrap;
-			try {
-				tooltipInfo.SignatureMarkup = sig.GetMarkup (entity);
-			} catch (Exception e) {
-				LoggingService.LogError ("Got exception while creating markup for :" + entity, e);
-				return new TooltipInformation ();
-			}
-			tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (entity) ?? "";
-			
-			if (entity is IMethod) {
-				var method = (IMethod)entity;
-				if (method.IsExtensionMethod) {
-					tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.DeclaringTypeDefinition.FullName);
-				}
-			}
-			int paramIndex = currentParameter;
-
-			if (entity is IMethod && ((IMethod)entity).IsExtensionMethod)
-				paramIndex++;
-			paramIndex = Math.Min (entity.Parameters.Count - 1, paramIndex);
-
-			var curParameter = paramIndex >= 0  && paramIndex < entity.Parameters.Count ? entity.Parameters [paramIndex] : null;
-			if (curParameter != null) {
-
-				string docText = AmbienceService.GetDocumentation (entity);
-				if (!string.IsNullOrEmpty (docText)) {
-					string text = docText;
-					Regex paramRegex = new Regex ("(\\<param\\s+name\\s*=\\s*\"" + curParameter.Name + "\"\\s*\\>.*?\\</param\\>)", RegexOptions.Compiled);
-					Match match = paramRegex.Match (docText);
-					
-					if (match.Success) {
-						text = AmbienceService.GetDocumentationMarkup (entity, match.Groups [1].Value);
-						if (!string.IsNullOrWhiteSpace (text))
-							tooltipInfo.AddCategory (GettextCatalog.GetString ("Parameter"), text);
-					}
-				}
-		
-				if (curParameter.Type.Kind == TypeKind.Delegate)
-					tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (curParameter.Type));
-			}
+//			var resolver = file.GetResolver (compilation, textEditorData.Caret.Location);
+//			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
+//			sig.HighlightParameter = currentParameter;
+//			sig.BreakLineAfterReturnType = smartWrap;
+//			try {
+//				tooltipInfo.SignatureMarkup = sig.GetMarkup (entity);
+//			} catch (Exception e) {
+//				LoggingService.LogError ("Got exception while creating markup for :" + entity, e);
+//				return new TooltipInformation ();
+//			}
+//			tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (entity) ?? "";
+//			
+//			if (entity is IMethod) {
+//				var method = (IMethod)entity;
+//				if (method.IsExtensionMethod) {
+//					tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.DeclaringTypeDefinition.FullName);
+//				}
+//			}
+//			int paramIndex = currentParameter;
+//
+//			if (entity is IMethod && ((IMethod)entity).IsExtensionMethod)
+//				paramIndex++;
+//			paramIndex = Math.Min (entity.Parameters.Count - 1, paramIndex);
+//
+//			var curParameter = paramIndex >= 0  && paramIndex < entity.Parameters.Count ? entity.Parameters [paramIndex] : null;
+//			if (curParameter != null) {
+//
+//				string docText = AmbienceService.GetDocumentation (entity);
+//				if (!string.IsNullOrEmpty (docText)) {
+//					string text = docText;
+//					Regex paramRegex = new Regex ("(\\<param\\s+name\\s*=\\s*\"" + curParameter.Name + "\"\\s*\\>.*?\\</param\\>)", RegexOptions.Compiled);
+//					Match match = paramRegex.Match (docText);
+//					
+//					if (match.Success) {
+//						text = AmbienceService.GetDocumentationMarkup (entity, match.Groups [1].Value);
+//						if (!string.IsNullOrWhiteSpace (text))
+//							tooltipInfo.AddCategory (GettextCatalog.GetString ("Parameter"), text);
+//					}
+//				}
+//		
+//				if (curParameter.Type.Kind == TypeKind.Delegate)
+//					tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (curParameter.Type));
+//			}
 			return tooltipInfo;
 		}
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MonoCSharpCompletionEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MonoCSharpCompletionEngine.cs
deleted file mode 100644
index 0046a7322d..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MonoCSharpCompletionEngine.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// MonoCSharpCompletionEngine.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp.Completion;
-using System.Collections.Generic;
-using MonoDevelop.CodeGeneration;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using ICSharpCode.NRefactory.Editor;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class MonoCSharpCompletionEngine : CSharpCompletionEngine
-	{
-		readonly CSharpCompletionTextEditorExtension ext;
-
-		public CSharpCompletionTextEditorExtension Ext {
-			get {
-				return ext;
-			}
-		}
-
-		public MDRefactoringContext MDRefactoringCtx {
-			get {
-				return ext.MDRefactoringCtx;
-			}
-		}
-
-		public MonoCSharpCompletionEngine (CSharpCompletionTextEditorExtension ext, ICSharpCode.NRefactory.Editor.IDocument document, ICompletionContextProvider completionContextProvider, ICompletionDataFactory factory, ICSharpCode.NRefactory.TypeSystem.IProjectContent content, ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpTypeResolveContext ctx) : base (document, completionContextProvider, factory, content, ctx)
-		{
-			this.ext = ext;
-		}
-
-		protected override void AddVirtuals (List<IMember> alreadyInserted, CompletionDataWrapper col, string modifiers, IType curType, int declarationBegin)
-		{
-			base.AddVirtuals (alreadyInserted, col, modifiers, curType, declarationBegin);
-			foreach (var member in GetProtocolMembers (curType)) {
-				if (alreadyInserted.Contains (member))
-					continue;
-				if (BaseExportCodeGenerator.IsImplemented (curType, member))
-					continue;
-				alreadyInserted.Add (member);
-				var data = new ProtocolCompletionData (this, declarationBegin, member);
-				col.Add (data);
-			}
-		}
-
-		internal static bool IsFoundationNamespace (string ns )
-		{
-			return (ns == "MonoTouch.Foundation" || ns == "Foundation");
-		}
-
-		IEnumerable<IMember> GetProtocolMembers (IType curType)
-		{
-			foreach (var t in curType.DirectBaseTypes) {
-				string name;
-				if (!BaseExportCodeGenerator.HasProtocolAttribute (t, out name))
-					continue;
-				var protocolType = Compilation.FindType (new FullTypeName (new TopLevelTypeName (t.Namespace, name)));
-				if (protocolType == null)
-					break;
-				foreach (var member in protocolType.GetMethods (null, GetMemberOptions.IgnoreInheritedMembers)) {
-					if (member.ImplementedInterfaceMembers.Any () || member.IsAbstract || !member.IsVirtual)
-						continue;
-					if (member.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" && IsFoundationNamespace (a.AttributeType.Namespace))) {
-						yield return member;
-					}
-				}
-				foreach (var member in protocolType.GetProperties (null, GetMemberOptions.IgnoreInheritedMembers)) {
-					if (member.ImplementedInterfaceMembers.Any () || member.IsAbstract || !member.IsVirtual)
-						continue;
-					if (member.CanGet && member.Getter.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" &&  IsFoundationNamespace (a.AttributeType.Namespace)) ||
-						member.CanSet && member.Setter.Attributes.Any (a => a.AttributeType.Name == "ExportAttribute" &&  IsFoundationNamespace (a.AttributeType.Namespace)))
-						yield return member;
-				}
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs
deleted file mode 100644
index 4d779caaca..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// NewOverrideCompletionData.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.Linq;
-using System.Text;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class NewOverrideCompletionData : CompletionData
-	{
-		CSharpCompletionTextEditorExtension ext;
-		IMember member;
-		static Ambience ambience = new CSharpAmbience ();
-		int    declarationBegin;
-		IUnresolvedTypeDefinition  type;
-		
-		public bool GenerateBody { get; set; }
-
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
-		{
-			return MemberCompletionData.CreateTooltipInformation (ext, null, member, smartWrap);
-		}
-
-		public NewOverrideCompletionData (CSharpCompletionTextEditorExtension ext, int declarationBegin, IUnresolvedTypeDefinition type, IMember member) : base (null)
-		{
-			this.ext = ext;
-			this.type   = type;
-			this.member = member;
-			
-			this.declarationBegin = declarationBegin;
-			this.GenerateBody = true;
-			this.Icon = member.GetStockIcon ();
-			this.DisplayText = ambience.GetString (member, OutputFlags.IncludeParameters | OutputFlags.IncludeParameterName | OutputFlags.IncludeGenerics | OutputFlags.HideExtensionsParameter| OutputFlags.IncludeAccessor);
-			this.CompletionText = member.SymbolKind == SymbolKind.Indexer ? "this" : member.Name;
-		}
-		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
-		{
-			var editor = ext.TextEditorData;
-			var generator = CodeGenerator.CreateGenerator (ext.Document);
-			bool isExplicit = false;
-			if (member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
-				foreach (var m in type.Members) {
-					if (m.Name == member.Name && !m.ReturnType.Equals (member.ReturnType)) {
-						isExplicit = true;
-						break;
-					}
-				}
-			}
-			var resolvedType = type.Resolve (ext.Project).GetDefinition ();
-			if (ext.Project != null)
-				generator.PolicyParent = ext.Project.Policies;
-			var result = generator.CreateMemberImplementation (resolvedType, type, member, isExplicit);
-			string sb = result.Code.TrimStart ();
-			int trimStart = result.Code.Length - sb.Length;
-			sb = sb.TrimEnd ();
-			
-			var lastRegion = result.BodyRegions.LastOrDefault ();
-			var region = lastRegion == null? null
-				: new CodeGeneratorBodyRegion (lastRegion.StartOffset - trimStart, lastRegion.EndOffset - trimStart);
-			
-			int targetCaretPosition;
-			int selectionEndPosition = -1;
-			if (region != null && region.IsValid) {
-				targetCaretPosition = declarationBegin + region.StartOffset;
-				if (region.Length > 0) {
-					if (GenerateBody) {
-						selectionEndPosition = declarationBegin + region.EndOffset;
-					} else {
-						//FIXME: if there are multiple regions, remove all of them
-						sb = sb.Substring (0, region.StartOffset) + sb.Substring (region.EndOffset); 
-					}
-				}
-			} else {
-				targetCaretPosition = declarationBegin + sb.Length;
-			}
-			
-			editor.Replace (declarationBegin, editor.Caret.Offset - declarationBegin, sb);
-			if (selectionEndPosition > 0) {
-				editor.Caret.Offset = selectionEndPosition;
-				editor.SetSelection (targetCaretPosition, selectionEndPosition);
-			} else {
-				editor.Caret.Offset = targetCaretPosition;
-			}
-		}
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ObjectCreationCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ObjectCreationCompletionData.cs
new file mode 100644
index 0000000000..23b972c75f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ObjectCreationCompletionData.cs
@@ -0,0 +1,155 @@
+// 
+// CSharpCompletionTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+using System.Text;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using System.Linq;
+using Gtk;
+using MonoDevelop.Ide;
+using System.Collections.Generic;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class ObjectCreationCompletionData : RoslynSymbolCompletionData
+	{
+		public static readonly SymbolDisplayFormat HideParameters =
+			new SymbolDisplayFormat(
+				globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+				propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+				memberOptions: SymbolDisplayMemberOptions.None,
+				parameterOptions:
+				SymbolDisplayParameterOptions.None,
+				miscellaneousOptions:
+				SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+				SymbolDisplayMiscellaneousOptions.UseSpecialTypes
+			);
+
+		readonly ITypeSymbol type;
+		readonly ISymbol symbol;
+		ISymbol insertSymbol;
+		readonly int declarationBegin;
+		readonly bool afterKeyword;
+		readonly SemanticModel semanticModel;
+
+		string displayText;
+
+
+		public override string DisplayText {
+			get {
+				if (displayText == null) {
+					displayText = CropGlobal(RoslynCompletionData.SafeMinimalDisplayString (symbol, semanticModel, declarationBegin, Ambience.LabelFormat)) + "()";
+					if (!afterKeyword)
+						displayText = "new " + displayText;
+				}
+				return displayText;
+			}
+		}
+
+		public override string GetDisplayTextMarkup ()
+		{
+			var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+
+			var result = "<b>" + Ambience.EscapeText (CropGlobal(RoslynCompletionData.SafeMinimalDisplayString (symbol, model, declarationBegin, HideParameters))) + "</b>()";
+			if (!afterKeyword)
+				result = "new " + result;
+			return ApplyDiplayFlagsFormatting (result);
+		}
+
+		static string CropGlobal (string str)
+		{
+			// shouldn't happen according to the display format - but happens. bug ?
+			if (str.StartsWith ("global::"))
+				return str.Substring ("global::".Length);
+			return str;
+		}
+
+		public override bool HasOverloads {
+			get {
+				return true;
+			}
+		}
+
+		List<CompletionData> overloads;
+		public override IReadOnlyList<CompletionData> OverloadedData {
+			get {
+				if (overloads == null) {
+					overloads = new List<CompletionData> ();
+					foreach (var constructor in type.GetMembers ().OfType<IMethodSymbol> ().Where (m => m.MethodKind == MethodKind.Constructor)) {
+						overloads.Add (new ObjectCreationCompletionData (KeyHandler, factory, semanticModel, type, constructor, declarationBegin, afterKeyword) { insertSymbol = this.insertSymbol }); 
+					}
+				}
+				return overloads;
+			}
+		}
+
+		public ObjectCreationCompletionData (ICompletionDataKeyHandler keyHandler, RoslynCodeCompletionFactory factory, SemanticModel semanticModel, ITypeSymbol type, ISymbol symbol, int declarationBegin, bool afterKeyword) : base(keyHandler, factory, symbol)
+		{
+			this.type = type;
+			this.semanticModel = semanticModel;
+			this.afterKeyword = afterKeyword;
+			this.declarationBegin = declarationBegin;
+			this.symbol = insertSymbol = symbol;
+		}
+
+		protected override string GetInsertionText ()
+		{
+			var sb = new StringBuilder ();
+			if (!afterKeyword)
+				sb.Append ("new ");
+			sb.Append (CropGlobal (RoslynCompletionData.SafeMinimalDisplayString (insertSymbol, semanticModel, declarationBegin, HideParameters)));
+			return sb.ToString () ;
+		}
+
+		public override int CompareTo (object obj)
+		{
+			var objCrCompData = obj as ObjectCreationCompletionData;
+			if (objCrCompData == null)
+				return -1;
+
+			return DisplayText.CompareTo(objCrCompData.DisplayText);
+		}
+
+		internal static bool HasAnyConstructorWithParameters (ITypeSymbol symbol)
+		{
+			return symbol.GetMembers()
+				.OfType<IMethodSymbol>()
+				.Where(m => m.MethodKind == MethodKind.Constructor)
+				.Any (m => m.Parameters.Length > 0);
+		}
+
+		public override bool IsOverload (CompletionData other)
+		{
+			return false;
+		}
+	}
+
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs
index edb8a32224..2fa3acb6b4 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs
@@ -28,60 +28,158 @@ using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.CodeGeneration;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CSharp.Refactoring;
+using System.Linq;
+using MonoDevelop.CSharp.Formatting;
 
 namespace MonoDevelop.CSharp.Completion
 {
-	class ProtocolCompletionData : CompletionData
+	class ProtocolCompletionData : RoslynSymbolCompletionData
 	{
-		readonly MonoCSharpCompletionEngine engine;
-		readonly IMember member;
-		readonly static Ambience ambience = new CSharpAmbience ();
-		readonly int    declarationBegin;
+		readonly int declarationBegin;
+		readonly ITypeSymbol currentType;
 
 		public bool GenerateBody { get; set; }
 
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
+		static readonly SymbolDisplayFormat NameFormat;
+
+		internal static readonly SymbolDisplayFormat overrideNameFormat;
+
+		static ProtocolCompletionData ()
 		{
-			return MemberCompletionData.CreateTooltipInformation (engine.Ext, null, member, smartWrap);
+			NameFormat = new SymbolDisplayFormat (
+				globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+				propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters | SymbolDisplayGenericsOptions.IncludeVariance,
+				memberOptions: SymbolDisplayMemberOptions.IncludeParameters | SymbolDisplayMemberOptions.IncludeExplicitInterface,
+				parameterOptions:
+				SymbolDisplayParameterOptions.IncludeParamsRefOut |
+				SymbolDisplayParameterOptions.IncludeExtensionThis |
+				SymbolDisplayParameterOptions.IncludeType |
+				SymbolDisplayParameterOptions.IncludeName,
+				miscellaneousOptions:
+				SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+				SymbolDisplayMiscellaneousOptions.UseSpecialTypes
+			);
+
+			overrideNameFormat = NameFormat.WithParameterOptions (
+				SymbolDisplayParameterOptions.IncludeDefaultValue |
+				SymbolDisplayParameterOptions.IncludeExtensionThis |
+				SymbolDisplayParameterOptions.IncludeType |
+				SymbolDisplayParameterOptions.IncludeName |
+				SymbolDisplayParameterOptions.IncludeParamsRefOut
+			);
 		}
 
-		public ProtocolCompletionData (MonoCSharpCompletionEngine engine, int declarationBegin, IMember member) : base (null)
+		string displayText;
+
+		bool afterKeyword;
+
+		public override string DisplayText {
+			get {
+				if (displayText == null) {
+					if (factory == null) {
+						displayText = Symbol.Name;
+					} else {
+						var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+						displayText = RoslynCompletionData.SafeMinimalDisplayString (base.Symbol, model, ext.Editor.CaretOffset, overrideNameFormat);
+					}
+					if (!afterKeyword)
+						displayText = "override " + displayText;
+				}
+
+				return displayText;
+			}
+		}
+
+		public override string CompletionText {
+			get {
+				return Symbol.Name;
+			}
+		}
+
+		public override string GetDisplayTextMarkup ()
 		{
-			this.engine = engine;
-			this.member = member;
+			if (factory == null)
+				return Symbol.Name;
+			var model = ext.ParsedDocument.GetAst<SemanticModel> ();
+
+			var result = RoslynCompletionData.SafeMinimalDisplayString (base.Symbol, model, declarationBegin, Ambience.LabelFormat) + " {...}";
+			var idx = result.IndexOf (Symbol.Name);
+			if (idx >= 0) {
+				result =
+					result.Substring (0, idx) +
+						  "<b>" + Symbol.Name + "</b>" +
+						  result.Substring (idx + Symbol.Name.Length);
+			}
+
+			if (!afterKeyword)
+				result = "override " + result;
+
+			return ApplyDiplayFlagsFormatting (result);
+		}
 
+		public ProtocolCompletionData (ICompletionDataKeyHandler keyHandler, RoslynCodeCompletionFactory factory, int declarationBegin, ITypeSymbol currentType, Microsoft.CodeAnalysis.ISymbol member, bool afterKeyword) : base (keyHandler, factory, member, member.ToDisplayString ())
+		{
+			this.afterKeyword = afterKeyword;
+			this.currentType = currentType;
 			this.declarationBegin = declarationBegin;
 			this.GenerateBody = true;
-			this.Icon = member.GetStockIcon ();
-			this.DisplayText = ambience.GetString (member, OutputFlags.IncludeParameters | OutputFlags.IncludeParameterName | OutputFlags.IncludeGenerics | OutputFlags.HideExtensionsParameter| OutputFlags.IncludeAccessor);
-			this.CompletionText = member.SymbolKind == SymbolKind.Indexer ? "this" : member.Name;
 		}
 
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
-			var ext = engine.Ext;
-			var editor = ext.TextEditorData;
-			var generator = CodeGenerator.CreateGenerator (ext.Document);
-			if (ext.Project != null)
-				generator.PolicyParent = ext.Project.Policies;
-			var builder = engine.MDRefactoringCtx.CreateTypeSystemAstBuilder ();
-
-			string sb = BaseExportCodeGenerator.GenerateMemberCode (engine.MDRefactoringCtx, builder, member);
+			var editor = ext.Editor;
+			bool isExplicit = false;
+			//			if (member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+			//				foreach (var m in type.Members) {
+			//					if (m.Name == member.Name && !m.ReturnType.Equals (member.ReturnType)) {
+			//						isExplicit = true;
+			//						break;
+			//					}
+			//				}
+			//			}
+			//			var resolvedType = type.Resolve (ext.Project).GetDefinition ();
+			//			if (ext.Project != null)
+			//				generator.PolicyParent = ext.Project.Policies;
+
+			var result = CSharpCodeGenerator.CreateProtocolMemberImplementation (ext.DocumentContext, ext.Editor, currentType, currentType.Locations.First (), Symbol, isExplicit, factory.SemanticModel);
+			string sb = result.Code.TrimStart ();
+			int trimStart = result.Code.Length - sb.Length;
 			sb = sb.TrimEnd ();
 
-			string indent = editor.GetIndentationString (editor.Caret.Location); 
-			sb = sb.Replace (editor.EolMarker, editor.EolMarker + indent);
+			var lastRegion = result.BodyRegions.LastOrDefault ();
+			var region = lastRegion == null ? null
+				: new CodeGeneratorBodyRegion (lastRegion.StartOffset - trimStart, lastRegion.EndOffset - trimStart);
 
-			int targetCaretPosition = sb.LastIndexOf ("throw", StringComparison.Ordinal);
-			int selectionEndPosition = sb.LastIndexOf (";", StringComparison.Ordinal);
+			int targetCaretPosition;
+			int selectionEndPosition = -1;
+			if (region != null && region.IsValid) {
+				targetCaretPosition = declarationBegin + region.StartOffset;
+				if (region.Length > 0) {
+					if (GenerateBody) {
+						selectionEndPosition = declarationBegin + region.EndOffset;
+					} else {
+						//FIXME: if there are multiple regions, remove all of them
+						sb = sb.Substring (0, region.StartOffset) + sb.Substring (region.EndOffset);
+					}
+				}
+			} else {
+				targetCaretPosition = declarationBegin + sb.Length;
+			}
 
-			editor.Replace (declarationBegin, editor.Caret.Offset - declarationBegin, sb);
+			editor.ReplaceText (declarationBegin, editor.CaretOffset - declarationBegin, sb);
 			if (selectionEndPosition > 0) {
-				targetCaretPosition += declarationBegin;
-				selectionEndPosition += declarationBegin;
-				editor.Caret.Offset = selectionEndPosition;
+				editor.CaretOffset = selectionEndPosition;
 				editor.SetSelection (targetCaretPosition, selectionEndPosition);
+			} else {
+				editor.CaretOffset = targetCaretPosition;
 			}
+
+			OnTheFlyFormatter.Format (editor, ext.DocumentContext, declarationBegin, declarationBegin + sb.Length);
 		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolMemberContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolMemberContextHandler.cs
new file mode 100644
index 0000000000..af50f28a22
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolMemberContextHandler.cs
@@ -0,0 +1,173 @@
+//
+// ProtocolMemberContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.Linq;
+using Mono.Addins.Description;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.CSharp.Completion
+{	
+	interface IExtensionContextHandler
+	{
+		void Init (RoslynCodeCompletionFactory factory);
+	}
+
+	class ProtocolMemberContextHandler : OverrideContextHandler, IExtensionContextHandler
+	{
+		RoslynCodeCompletionFactory factory;
+
+		void IExtensionContextHandler.Init (RoslynCodeCompletionFactory factory)
+		{
+			this.factory = factory;
+		}
+
+		protected override IEnumerable<CompletionData> CreateCompletionData (CompletionEngine engine, SemanticModel semanticModel, int position, ITypeSymbol returnType, Accessibility seenAccessibility, SyntaxToken startToken, SyntaxToken tokenBeforeReturnType, bool afterKeyword, CancellationToken cancellationToken)
+		{
+			var result = new List<CompletionData> ();
+			ISet<ISymbol> overridableMembers;
+			if (!TryDetermineOverridableProtocolMembers (semanticModel, tokenBeforeReturnType, seenAccessibility, out overridableMembers, cancellationToken)) {
+				return result;
+			}
+			if (returnType != null) {
+				overridableMembers = FilterOverrides (overridableMembers, returnType);
+			}
+			var curType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol> (startToken.SpanStart, cancellationToken);
+			var declarationBegin = afterKeyword ? startToken.SpanStart : position - 1;
+			foreach (var m in overridableMembers) {
+				var data = new ProtocolCompletionData (this, factory, declarationBegin, curType, m, afterKeyword);
+				result.Add (data);
+			}
+			return result;
+		}
+
+		static bool TryDetermineOverridableProtocolMembers(SemanticModel semanticModel, SyntaxToken startToken, Accessibility seenAccessibility, out ISet<ISymbol> overridableMembers, CancellationToken cancellationToken)
+		{
+			var result = new HashSet<ISymbol>();
+			var containingType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol>(startToken.SpanStart, cancellationToken);
+			if (containingType != null && !containingType.IsScriptClass && !containingType.IsImplicitClass)
+			{
+				if (containingType.TypeKind == TypeKind.Class || containingType.TypeKind == TypeKind.Struct)
+				{
+					var baseTypes = containingType.GetBaseTypes().Reverse().Concat(containingType.AllInterfaces);
+					foreach (var type in baseTypes)
+					{
+						cancellationToken.ThrowIfCancellationRequested();
+
+						// Prefer overrides in derived classes
+						RemoveOverriddenMembers(result, type, cancellationToken);
+
+						// Retain overridable methods
+						AddProtocolMembers(semanticModel, result, containingType, type, cancellationToken);
+					}
+					// Don't suggest already overridden members
+					RemoveOverriddenMembers(result, containingType, cancellationToken);
+				}
+			}
+
+			// Filter based on accessibility
+			if (seenAccessibility != Accessibility.NotApplicable)
+			{
+				result.RemoveWhere(m => m.DeclaredAccessibility != seenAccessibility);
+			}
+
+
+			// Filter members that are already overriden - they're already part of 'override completion'
+			ISet<ISymbol> realOverridableMembers;
+			if (OverrideContextHandler.TryDetermineOverridableMembers (semanticModel, startToken, seenAccessibility, out realOverridableMembers, cancellationToken)) {
+				result.RemoveWhere (m => realOverridableMembers.Any (m2 => IsEqualMember (m, m2)));
+			}
+
+			overridableMembers = result;
+			return overridableMembers.Count > 0;
+		}
+
+		static bool IsEqualMember (ISymbol m, ISymbol m2)
+		{
+			return SignatureComparer.HaveSameSignature (m, m2, true);
+		}
+
+		static void AddProtocolMembers(SemanticModel semanticModel, HashSet<ISymbol> result, INamedTypeSymbol containingType, INamedTypeSymbol type, CancellationToken cancellationToken)
+		{
+			string name;
+			if (!HasProtocolAttribute (type, out name))
+				return;
+			var protocolType = semanticModel.Compilation.GlobalNamespace.GetAllTypes (cancellationToken).FirstOrDefault (t => string.Equals (t.Name, name, StringComparison.OrdinalIgnoreCase));
+			if (protocolType == null)
+				return;
+			
+			foreach (var member in protocolType.GetMembers ().OfType<IMethodSymbol> ()) {
+				if (member.ExplicitInterfaceImplementations.Length > 0 || member.IsAbstract || !member.IsVirtual)
+					continue;
+				if (member.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && IsFoundationNamespace (a.AttributeClass.ContainingNamespace.GetFullName ()))) {
+					result.Add (member);
+				}
+
+			}
+			foreach (var member in protocolType.GetMembers ().OfType<IPropertySymbol> ()) {
+				if (member.ExplicitInterfaceImplementations.Length > 0 || member.IsAbstract || !member.IsVirtual)
+					continue;
+				if (member.GetMethod != null && member.GetMethod.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && IsFoundationNamespace (a.AttributeClass.ContainingNamespace.GetFullName ())) ||
+					member.SetMethod != null && member.SetMethod.GetAttributes ().Any (a => a.AttributeClass.Name == "ExportAttribute" && IsFoundationNamespace (a.AttributeClass.ContainingNamespace.GetFullName ())))
+					result.Add (member);
+			}
+		}
+
+		internal static bool IsFoundationNamespace (string ns )
+		{
+			return (ns == "MonoTouch.Foundation" || ns == "Foundation");
+		}
+
+		internal static bool IsFoundationNamespace (INamespaceSymbol ns)
+		{
+			return IsFoundationNamespace (ns.GetFullName ());
+		}
+
+		internal static bool HasProtocolAttribute (INamedTypeSymbol type, out string name)
+		{
+			foreach (var baseType in type.GetAllBaseClassesAndInterfaces (true)) {
+				foreach (var attrs in baseType.GetAttributes ()) {
+					if (attrs.AttributeClass.Name == "ProtocolAttribute" && IsFoundationNamespace (attrs.AttributeClass.ContainingNamespace.GetFullName ())) {
+						foreach (var na in attrs.NamedArguments) {
+							if (na.Key != "Name")
+								continue;
+							name = na.Value.Value as string;
+							if (name != null)
+								return true;
+						}
+					}
+				}
+			}
+			name = null;
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCodeCompletionFactory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCodeCompletionFactory.cs
new file mode 100644
index 0000000000..2a6095366f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCodeCompletionFactory.cs
@@ -0,0 +1,271 @@
+// 
+// CSharpCompletionTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.CodeCompletion;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class RoslynCodeCompletionFactory : ICompletionDataFactory
+	{
+		readonly CSharpCompletionTextEditorExtension ext;
+		readonly SemanticModel semanticModel;
+
+		public CSharpCompletionTextEditorExtension Ext {
+			get {
+				return this.ext;
+			}
+		}
+
+		public SemanticModel SemanticModel {
+			get {
+				return this.semanticModel;
+			}
+		}
+
+		public RoslynCodeCompletionFactory (CSharpCompletionTextEditorExtension ext, SemanticModel semanticModel)
+		{
+			if (ext == null)
+				throw new ArgumentNullException ("ext");
+			if (semanticModel == null)
+				throw new ArgumentNullException ("semanticModel");
+			this.semanticModel = semanticModel;
+			this.ext = ext;
+		}
+
+		#region ICompletionDataFactory implementation
+
+
+		class KeywordCompletionData : RoslynCompletionData
+		{
+			static SignatureMarkupCreator creator = new SignatureMarkupCreator (null, 0);
+
+			SyntaxKind kind;
+
+			public KeywordCompletionData (ICompletionDataKeyHandler keyHandler, SyntaxKind kind) : base (keyHandler)
+			{
+				this.kind = kind;
+			}
+
+			public override Task<TooltipInformation> CreateTooltipInformation (bool smartWrap, System.Threading.CancellationToken cancelToken)
+			{
+				if (kind == SyntaxKind.IdentifierToken)
+					return Task.FromResult (creator.GetKeywordTooltip (SyntaxFactory.Identifier (this.DisplayText)));
+				return Task.FromResult (creator.GetKeywordTooltip (SyntaxFactory.Token (kind)));
+			}
+		}
+
+		CompletionData ICompletionDataFactory.CreateKeywordCompletion (ICompletionDataKeyHandler keyHandler, string data, SyntaxKind syntaxKind)
+		{
+			return new KeywordCompletionData (keyHandler, syntaxKind) {
+				CompletionText = data,
+				DisplayText = data,
+				Icon = "md-keyword"
+			};
+		}
+
+		CompletionData ICompletionDataFactory.CreateGenericData (ICompletionDataKeyHandler keyHandler, string data, GenericDataType genericDataType)
+		{
+			return new RoslynCompletionData (keyHandler) {
+				CompletionText = data,
+				DisplayText = data,
+				Icon = "md-keyword"
+			};
+		}
+		
+		ISymbolCompletionData ICompletionDataFactory.CreateEnumMemberCompletionData (ICompletionDataKeyHandler keyHandler, ISymbol alias, IFieldSymbol field)
+		{
+			return new RoslynSymbolCompletionData (keyHandler, this, field, RoslynCompletionData.SafeMinimalDisplayString (alias ?? field.Type, semanticModel, ext.Editor.CaretOffset, Ambience.NameFormat) + "." + field.Name);
+		}
+		
+		class FormatItemCompletionData : RoslynCompletionData
+		{
+			string format;
+			string description;
+			object example;
+
+			public FormatItemCompletionData (ICompletionDataKeyHandler keyHandler, string format, string description, object example) : base (keyHandler)
+			{
+				this.format = format;
+				this.description = description;
+				this.example = example;
+			}
+
+			public override string DisplayText {
+				get {
+					return format;
+				}
+			}
+
+			public override string GetDisplayDescription (bool isSelected)
+			{
+				return "- <span foreground=\"darkgray\" size='small'>" + description + "</span>";
+			}
+
+			string rightSideDescription = null;
+			public override string GetRightSideDescription (bool isSelected)
+			{
+				if (rightSideDescription == null) {
+					try {
+						rightSideDescription = "<span size='small'>" + string.Format ("{0:" +format +"}", example) +"</span>";
+					} catch (Exception e) {
+						rightSideDescription = "";
+						LoggingService.LogError ("Format error.", e);
+					}
+				}
+				return rightSideDescription;
+			}
+
+			public override string CompletionText {
+				get {
+					return format;
+				}
+			}
+
+			public override int CompareTo (object obj)
+			{
+				return 0;
+			}
+		}
+
+		CompletionData ICompletionDataFactory.CreateFormatItemCompletionData (ICompletionDataKeyHandler keyHandler, string format, string description, object example)
+		{
+			return new FormatItemCompletionData (keyHandler, format, description, example);
+		}
+
+		class XmlDocCompletionData : RoslynCompletionData
+		{
+			//readonly CSharpCompletionTextEditorExtension ext;
+			/*
+			#region IListData implementation
+
+			CSharpCompletionDataList list;
+			public CSharpCompletionDataList List {
+				get {
+					return list;
+				}
+				set {
+					list = value;
+				}
+			}
+
+			#endregion*/
+
+			public XmlDocCompletionData (ICompletionDataKeyHandler keyHandler, RoslynCodeCompletionFactory ext, string title, string description, string insertText) : base (keyHandler, title, "md-keyword", description, insertText ?? title)
+			{
+				// this.ext = ext;
+				//this.title = title;
+			}
+//			public override TooltipInformation CreateTooltipInformation (bool smartWrap)
+//			{
+//				var sig = new SignatureMarkupCreator (ext.Editor, ext.DocumentContext, ext.Editor.CaretOffset);
+//				sig.BreakLineAfterReturnType = smartWrap;
+//				return sig.GetKeywordTooltip (title, null);
+//			}
+
+			public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, MonoDevelop.Ide.Editor.Extension.KeyDescriptor descriptor)
+			{
+				var currentWord = GetCurrentWord (window, descriptor);
+				var text = CompletionText;
+				if (descriptor.KeyChar == '>' && text.EndsWith (">", StringComparison.Ordinal))
+					text = text.Substring (0, text.Length - 1);
+				if (text.StartsWith ("<", StringComparison.Ordinal))
+					text = text.Substring (1);
+				
+				window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, currentWord, text);
+			}
+		}
+
+		CompletionData ICompletionDataFactory.CreateXmlDocCompletionData (ICompletionDataKeyHandler keyHandler, string title, string description, string insertText)
+		{
+			return new XmlDocCompletionData (keyHandler, this, title, description, insertText);
+		}
+
+		ISymbolCompletionData ICompletionDataFactory.CreateSymbolCompletionData (ICompletionDataKeyHandler keyHandler, ISymbol symbol)
+		{
+			return new RoslynSymbolCompletionData (keyHandler, this, symbol, symbol.Name);
+		}
+		
+		ISymbolCompletionData ICompletionDataFactory.CreateSymbolCompletionData (ICompletionDataKeyHandler keyHandler, ISymbol symbol, string text)
+		{
+			return new RoslynSymbolCompletionData (keyHandler, this, symbol, text);
+		}
+
+		ISymbolCompletionData ICompletionDataFactory.CreateExistingMethodDelegate (ICompletionDataKeyHandler keyHandler, IMethodSymbol method)
+		{
+			return new RoslynSymbolCompletionData (keyHandler, this, method, method.Name) { IsDelegateExpected = true };
+		}
+
+		CompletionData ICompletionDataFactory.CreateNewOverrideCompletionData(ICompletionDataKeyHandler keyHandler, int declarationBegin, ITypeSymbol currentType, ISymbol m, bool afterKeyword)
+		{
+			return new CreateOverrideCompletionData (keyHandler, this, declarationBegin, currentType, m, afterKeyword);
+		}
+
+		CompletionData ICompletionDataFactory.CreatePartialCompletionData(ICompletionDataKeyHandler keyHandler, int declarationBegin, ITypeSymbol currentType, IMethodSymbol method, bool afterKeyword)
+		{
+			return new CreatePartialCompletionData (keyHandler, this, declarationBegin, currentType, method, afterKeyword);
+		}
+
+		CompletionData ICompletionDataFactory.CreateAnonymousMethod(ICompletionDataKeyHandler keyHandler, string displayText, string description, string textBeforeCaret, string textAfterCaret)
+		{
+			return new AnonymousMethodCompletionData (this, keyHandler) {
+				CompletionText = textBeforeCaret + "|" + textAfterCaret,
+				DisplayText = displayText,
+				Description = description
+			};
+		}
+
+		CompletionData ICompletionDataFactory.CreateNewMethodDelegate(ICompletionDataKeyHandler keyHandler, ITypeSymbol delegateType, string varName, INamedTypeSymbol curType)
+		{
+			return new EventCreationCompletionData (keyHandler, this, delegateType, varName, curType);
+		}
+
+		CompletionData ICompletionDataFactory.CreateObjectCreation (ICompletionDataKeyHandler keyHandler, ITypeSymbol type, ISymbol symbol, int declarationBegin, bool afterKeyword)
+		{
+			return new ObjectCreationCompletionData (keyHandler, this, semanticModel, type, symbol, declarationBegin, afterKeyword);
+		}
+
+		CompletionData ICompletionDataFactory.CreateCastCompletionData (ICompletionDataKeyHandler keyHandler, ISymbol member, SyntaxNode nodeToCast, ITypeSymbol targetType)
+		{
+			return new CastCompletionData (keyHandler, this, semanticModel, member, nodeToCast, targetType);
+		}
+
+		CompletionCategory ICompletionDataFactory.CreateCompletionDataCategory (ISymbol forSymbol)
+		{
+			return new RoslynCompletionCategory (forSymbol);
+		}
+
+		#endregion
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionCategory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionCategory.cs
new file mode 100644
index 0000000000..88353106fc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionCategory.cs
@@ -0,0 +1,63 @@
+//
+// RoslynCompletionCategory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class RoslynCompletionCategory : CompletionCategory
+	{
+		readonly ISymbol symbol;
+
+		public RoslynCompletionCategory (ISymbol symbol)
+		{
+			this.symbol = symbol;
+			this.DisplayText = Ambience.EscapeText (symbol.ToDisplayString (MonoDevelop.Ide.TypeSystem.Ambience.NameFormat));
+			this.Icon = MonoDevelop.Ide.TypeSystem.Stock.GetStockIcon (symbol);
+		}
+
+		public override int CompareTo (CompletionCategory other)
+		{
+			if (other == null)
+				return 1;
+			var t1 = symbol as INamedTypeSymbol;
+			var t2 = ((RoslynCompletionCategory)other).symbol as INamedTypeSymbol;
+			if (t1 != null && t2 != null) {
+				if (t1.AllInterfaces.Contains (t2) || t1.GetBaseTypes().Contains (t2))
+					return -1;
+				if (t2.AllInterfaces.Contains (t1) || t2.GetBaseTypes().Contains (t1))
+					return 1;
+			}
+
+			return this.DisplayText.CompareTo (other.DisplayText);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionData.cs
new file mode 100644
index 0000000000..719c867cf6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynCompletionData.cs
@@ -0,0 +1,118 @@
+//
+// RoslynCompletionData.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using GLib;
+using System.Collections.Generic;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using Xwt;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class RoslynCompletionData : ISymbolCompletionData
+	{
+		
+		public RoslynCompletionData (ICompletionDataKeyHandler keyHandler)
+		{
+			this.KeyHandler = keyHandler;
+		}
+
+		public RoslynCompletionData (ICompletionDataKeyHandler keyHandler, string text) : base (text)
+		{
+			this.KeyHandler = keyHandler;
+		}
+
+		public RoslynCompletionData (ICompletionDataKeyHandler keyHandler, string text, IconId icon) : base (text, icon)
+		{
+			this.KeyHandler = keyHandler;
+		}
+
+		public RoslynCompletionData (ICompletionDataKeyHandler keyHandler, string text, IconId icon, string description) : base (text, icon, description)
+		{
+			this.KeyHandler = keyHandler;
+		}
+		
+		public RoslynCompletionData (ICompletionDataKeyHandler keyHandler, string displayText, IconId icon, string description, string completionText) : base (displayText, icon, description, completionText)
+		{
+			this.KeyHandler = keyHandler;
+		}
+
+		internal static string SafeMinimalDisplayString (ISymbol symbol, SemanticModel semanticModel, int position)
+		{
+			return SafeMinimalDisplayString (symbol, semanticModel, position, Ambience.LabelFormat);
+		}
+
+		internal static string SafeMinimalDisplayString (ISymbol symbol, SemanticModel semanticModel, int position, SymbolDisplayFormat format)
+		{
+			try {
+				return symbol.ToMinimalDisplayString (semanticModel, position, format);
+			} catch (ArgumentOutOfRangeException) {
+				try {
+					return symbol.ToMinimalDisplayString (semanticModel, semanticModel.SyntaxTree.Length / 2, format);
+				} catch (ArgumentOutOfRangeException) {
+					return symbol.Name;
+				}
+			}
+		}
+
+		
+//		class OverloadSorter : IComparer<ICompletionData>
+//		{
+//			public OverloadSorter ()
+//			{
+//			}
+//
+//			public int Compare (ICompletionData x, ICompletionData y)
+//			{
+//				var mx = ((RoslynCompletionData)x).Entity as IMember;
+//				var my = ((RoslynCompletionData)y).Entity as IMember;
+//				int result;
+//				
+//				if (mx is ITypeDefinition && my is ITypeDefinition) {
+//					result = ((((ITypeDefinition)mx).TypeParameters.Count).CompareTo (((ITypeDefinition)my).TypeParameters.Count));
+//					if (result != 0)
+//						return result;
+//				}
+//				
+//				if (mx is IMethod && my is IMethod) {
+//					return MethodParameterDataProvider.MethodComparer ((IMethod)mx, (IMethod)my);
+//				}
+//				string sx = mx.ReflectionName;// ambience.GetString (mx, flags);
+//				string sy = my.ReflectionName;// ambience.GetString (my, flags);
+//				result = sx.Length.CompareTo (sy.Length);
+//				return result == 0 ? string.Compare (sx, sy) : result;
+//			}
+//		}
+
+	}
+
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynParameterHintingFactory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynParameterHintingFactory.cs
new file mode 100644
index 0000000000..49919a4794
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynParameterHintingFactory.cs
@@ -0,0 +1,306 @@
+//
+// RoslynParameterHintingFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class RoslynParameterHintingFactory : IParameterHintingDataFactory
+	{
+		#region IParameterHintingDataFactory implementation
+
+		IParameterHintingData IParameterHintingDataFactory.CreateConstructorProvider (Microsoft.CodeAnalysis.IMethodSymbol constructor)
+		{
+			return new ParameterHintingData (constructor);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateMethodDataProvider (Microsoft.CodeAnalysis.IMethodSymbol method)
+		{
+			return new ParameterHintingData (method);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateDelegateDataProvider (Microsoft.CodeAnalysis.ITypeSymbol delegateType)
+		{
+			return new DelegateParameterHintingData (delegateType);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateIndexerParameterDataProvider (Microsoft.CodeAnalysis.IPropertySymbol indexer, Microsoft.CodeAnalysis.SyntaxNode resolvedNode)
+		{
+			return new ParameterHintingData (indexer);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateTypeParameterDataProvider (Microsoft.CodeAnalysis.INamedTypeSymbol type)
+		{
+			return new TypeParameterHintingData (type);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateTypeParameterDataProvider (Microsoft.CodeAnalysis.IMethodSymbol method)
+		{
+			return new TypeParameterHintingData (method);
+		}
+
+		IParameterHintingData IParameterHintingDataFactory.CreateArrayDataProvider (Microsoft.CodeAnalysis.IArrayTypeSymbol arrayType)
+		{
+			return new ArrayParameterHintingData (arrayType);
+		}
+
+		#endregion
+
+		class ParameterHintingData : MonoDevelop.Ide.CodeCompletion.ParameterHintingData, IParameterHintingData
+		{
+			public ParameterHintingData (IMethodSymbol symbol) : base (symbol)
+			{
+			}
+
+			public ParameterHintingData (IPropertySymbol symbol) : base (symbol)
+			{
+			}
+			public override Task<TooltipInformation> CreateTooltipInformation (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, int currentParameter, bool smartWrap, CancellationToken cancelToken)
+			{
+				return CreateTooltipInformation (editor, ctx, Symbol, currentParameter, smartWrap, cancelToken);
+			}
+			
+			internal static Task<TooltipInformation> CreateTooltipInformation (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, ISymbol sym, int currentParameter, bool smartWrap, CancellationToken cancelToken)
+			{
+				var tooltipInfo = new TooltipInformation ();
+				var sig = new SignatureMarkupCreator (ctx, editor != null ? editor.CaretOffset : 0);
+				sig.HighlightParameter = currentParameter;
+				sig.BreakLineAfterReturnType = smartWrap;
+
+				return Task.Run (() => {
+					if (cancelToken.IsCancellationRequested)
+						return null;
+					try {
+						tooltipInfo.SignatureMarkup = sig.GetMarkup (sym);
+					} catch (Exception e) {
+						LoggingService.LogError ("Got exception while creating markup for :" + sym, e);
+						return new TooltipInformation ();
+					}
+					tooltipInfo.SummaryMarkup = Ambience.GetSummaryMarkup (sym) ?? "";
+
+					if (cancelToken.IsCancellationRequested)
+						return null;
+					
+					if (sym is IMethodSymbol) {
+						var method = (IMethodSymbol)sym;
+						if (method.IsExtensionMethod && method.ReducedFrom != null && method.ReducedFrom.ContainingType != null) {
+							tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.ReducedFrom.ContainingType.Name);
+						}
+					}
+					int paramIndex = currentParameter;
+
+					//				if (Symbol is IMethodSymbol && ((IMethodSymbol)Symbol).IsExtensionMethod)
+					//					paramIndex++;
+					var list = GetParameterList (sym);
+					paramIndex = Math.Min (list.Length - 1, paramIndex);
+
+					var curParameter = paramIndex >= 0 && paramIndex < list.Length ? list [paramIndex] : null;
+					if (curParameter != null) {
+
+						string docText = Ambience.GetDocumentation (sym);
+						if (!string.IsNullOrEmpty (docText)) {
+							string text = docText;
+							Regex paramRegex = new Regex ("(\\<param\\s+name\\s*=\\s*\"" + curParameter.Name + "\"\\s*\\>.*?\\</param\\>)", RegexOptions.Compiled);
+							Match match = paramRegex.Match (docText);
+
+							if (match.Success) {
+								text = Ambience.GetDocumentationMarkup (sym, match.Groups [1].Value);
+								if (!string.IsNullOrWhiteSpace (text))
+									tooltipInfo.AddCategory (GettextCatalog.GetString ("Parameter"), text);
+							}
+						}
+						if (curParameter.Type.TypeKind == TypeKind.Delegate)
+							tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (curParameter.Type));
+					}
+					return tooltipInfo;
+				});
+			}
+
+			static ImmutableArray<IParameterSymbol> GetParameterList (ISymbol data)
+			{
+				var ms = data as IMethodSymbol;
+				if (ms != null)
+					return ms.Parameters;
+				
+				var ps = data as IPropertySymbol;
+				if (ps != null)
+					return ps.Parameters;
+
+				return ImmutableArray<IParameterSymbol>.Empty;
+			}
+
+			public override string GetParameterName (int currentParameter)
+			{
+				var list = GetParameterList (Symbol);
+				if (currentParameter < 0 || currentParameter >= list.Length)
+					throw new ArgumentOutOfRangeException ("currentParameter");
+				return list [currentParameter].Name;
+			}
+
+			public override int ParameterCount {
+				get {
+					return GetParameterList (Symbol).Length;
+				}
+			}
+
+			public override bool IsParameterListAllowed {
+				get {
+					var param = GetParameterList (Symbol).LastOrDefault ();
+					return param != null && param.IsParams;
+				}
+			}
+		}
+
+		class DelegateParameterHintingData : MonoDevelop.Ide.CodeCompletion.ParameterHintingData, IParameterHintingData
+		{
+			readonly IMethodSymbol invocationMethod;
+
+			public DelegateParameterHintingData (ITypeSymbol symbol) : base (symbol)
+			{
+				this.invocationMethod = symbol.GetDelegateInvokeMethod ();
+			}
+
+			public override string GetParameterName (int currentParameter)
+			{
+				var list = invocationMethod.Parameters;
+				if (currentParameter < 0 || currentParameter >= list.Length)
+					throw new ArgumentOutOfRangeException ("currentParameter");
+				return list [currentParameter].Name;
+			}
+
+			public override int ParameterCount {
+				get {
+					return invocationMethod.Parameters.Length;
+				}
+			}
+
+			public override bool IsParameterListAllowed {
+				get {
+					var param = invocationMethod.Parameters.LastOrDefault ();
+					return param != null && param.IsParams;
+				}
+			}
+
+			public override Task<TooltipInformation> CreateTooltipInformation (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, int currentParameter, bool smartWrap, CancellationToken cancelToken)
+			{
+				return ParameterHintingData.CreateTooltipInformation (editor, ctx, invocationMethod, currentParameter, smartWrap, cancelToken);
+			}
+		}
+
+		class ArrayParameterHintingData : MonoDevelop.Ide.CodeCompletion.ParameterHintingData, IParameterHintingData
+		{
+			readonly IArrayTypeSymbol arrayType;
+
+			public ArrayParameterHintingData (IArrayTypeSymbol arrayType) : base (arrayType)
+			{
+				this.arrayType = arrayType;
+			}
+
+			public override string GetParameterName (int currentParameter)
+			{
+				return null;
+			}
+
+			public override int ParameterCount {
+				get {
+					return arrayType.Rank;
+				}
+			}
+
+			public override bool IsParameterListAllowed {
+				get {
+					return false;
+				}
+			}
+			
+			public override Task<TooltipInformation> CreateTooltipInformation (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, int currentParameter, bool smartWrap, CancellationToken cancelToken)
+			{
+				var sig = new SignatureMarkupCreator (ctx, editor != null ? editor.CaretOffset : 0) {
+					HighlightParameter = currentParameter
+				};
+				return Task.FromResult (new TooltipInformation {
+					SignatureMarkup = sig.GetArrayIndexerMarkup (arrayType)
+				});
+			}
+			
+		}
+
+		class TypeParameterHintingData : MonoDevelop.Ide.CodeCompletion.ParameterHintingData, IParameterHintingData
+		{
+			public TypeParameterHintingData (IMethodSymbol symbol) : base (symbol)
+			{
+			}
+
+			public TypeParameterHintingData (INamedTypeSymbol symbol) : base (symbol)
+			{
+			}
+
+			static ImmutableArray<ITypeParameterSymbol> GetTypeParameterList (IParameterHintingData data)
+			{
+				var ms = data.Symbol as IMethodSymbol;
+				if (ms != null)
+					return ms.TypeParameters;
+				
+				var ps = data.Symbol as INamedTypeSymbol;
+				if (ps != null)
+					return ps.TypeParameters;
+
+				return ImmutableArray<ITypeParameterSymbol>.Empty;
+			}
+
+			public override string GetParameterName (int currentParameter)
+			{
+				var list = GetTypeParameterList (this);
+				if (currentParameter < 0 || currentParameter >= list.Length)
+					throw new ArgumentOutOfRangeException ("currentParameter");
+				return list [currentParameter].Name;
+			}
+
+			public override int ParameterCount {
+				get {
+					return GetTypeParameterList (this).Length;
+				}
+			}
+
+			public override bool IsParameterListAllowed {
+				get {
+					return false;
+				}
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynSymbolCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynSymbolCompletionData.cs
new file mode 100644
index 0000000000..6b0520948c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/RoslynSymbolCompletionData.cs
@@ -0,0 +1,512 @@
+// 
+// CSharpCompletionTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis;
+using GLib;
+using System.Collections.Generic;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using Xwt;
+using MonoDevelop.Ide;
+using System.Threading.Tasks;
+using System.Threading;
+using MonoDevelop.Ide.Editor;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace MonoDevelop.CSharp.Completion
+{
+	class RoslynSymbolCompletionData : RoslynCompletionData
+	{
+		public override string DisplayText {
+			get {
+				return text ?? Symbol.Name;
+			}
+			set {
+				text = value;
+			}
+		}
+
+		public override string CompletionText {
+			get {
+				return text ?? Symbol.Name;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
+		}
+
+		public override MonoDevelop.Core.IconId Icon {
+			get {
+				return MonoDevelop.Ide.TypeSystem.Stock.GetStockIcon (Symbol);
+			}
+			set {
+				throw new NotSupportedException ();
+			}
+		}
+
+		public bool IsDelegateExpected { get; set; }
+
+
+		string text;
+		protected readonly RoslynCodeCompletionFactory factory;
+
+		protected CSharpCompletionTextEditorExtension ext { get { return factory?.Ext; } }
+
+		public RoslynSymbolCompletionData (ICompletionDataKeyHandler keyHandler, RoslynCodeCompletionFactory factory, ISymbol symbol, string text = null) : base (keyHandler)
+		{
+			this.factory = factory;
+			this.text = text;
+			Symbol = symbol;
+			if (IsObsolete (Symbol))
+				DisplayFlags |= DisplayFlags.Obsolete;
+			rightSideDescription = new Lazy<string> (delegate {
+				var returnType = symbol.GetReturnType ();
+				if (returnType == null || factory == null)
+					return null;
+				try {
+					return "<span font='Sans 10'>" + GLib.Markup.EscapeText (SafeMinimalDisplayString (returnType, factory.SemanticModel, ext.Editor.CaretOffset)) + "</span>";
+				} catch (Exception e) {
+					LoggingService.LogError ("Format error.", e);
+				}
+				return null;
+			});
+		}
+
+		static readonly SymbolDisplayFormat nameOnlyFormat =
+			new SymbolDisplayFormat(
+				globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameOnly,
+				propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.None,
+				memberOptions: SymbolDisplayMemberOptions.None,
+				parameterOptions:
+				SymbolDisplayParameterOptions.None,
+				miscellaneousOptions:
+				SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+				SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+		
+		protected virtual string GetInsertionText ()
+		{
+			if (text != null)
+				return text;
+			return Symbol.ToDisplayString (nameOnlyFormat);
+		}
+
+		Lazy<string> rightSideDescription;
+		public override string GetRightSideDescription (bool isSelected)
+		{
+			return rightSideDescription.Value;
+		}
+
+
+		public override Task<TooltipInformation> CreateTooltipInformation (bool smartWrap, CancellationToken ctoken)
+		{
+			return CreateTooltipInformation (ctoken, ext.Editor, ext.DocumentContext, Symbol, smartWrap, model: factory.SemanticModel);
+		}
+		
+		public static Task<TooltipInformation> CreateTooltipInformation (CancellationToken ctoken, MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext ctx, ISymbol entity, bool smartWrap, bool createFooter = false, SemanticModel model = null)
+		{
+			var tooltipInfo = new TooltipInformation ();
+//			if (resolver == null)
+//				resolver = file != null ? file.GetResolver (compilation, textEditorData.Caret.Location) : new CSharpResolver (compilation);
+			var sig = new SignatureMarkupCreator (ctx, editor != null ? editor.CaretOffset : 0);
+			sig.SemanticModel = model;
+			sig.BreakLineAfterReturnType = smartWrap;
+
+			return Task.Run (() => {
+				if (ctoken.IsCancellationRequested)
+					return null;
+				try {
+					tooltipInfo.SignatureMarkup = sig.GetMarkup (entity);
+				} catch (Exception e) {
+					LoggingService.LogError ("Got exception while creating markup for :" + entity, e);
+					return new TooltipInformation ();
+				}
+
+				if (ctoken.IsCancellationRequested)
+					return null;
+				
+				tooltipInfo.SummaryMarkup = Ambience.GetSummaryMarkup (entity) ?? "";
+
+				//			if (entity is IMember) {
+				//				var evt = (IMember)entity;
+				//				if (evt.ReturnType.Kind == TypeKind.Delegate) {
+				//					tooltipInfo.AddCategory (GettextCatalog.GetString ("Delegate Info"), sig.GetDelegateInfo (evt.ReturnType));
+				//				}
+				//			}
+				if (entity is IMethodSymbol) {
+					var method = (IMethodSymbol)entity;
+					if (method.IsExtensionMethod) {
+						tooltipInfo.AddCategory (GettextCatalog.GetString ("Extension Method from"), method.ContainingType.Name);
+					}
+				}
+				if (createFooter) {
+					tooltipInfo.FooterMarkup = sig.CreateFooter (entity);
+				}
+				return tooltipInfo;
+			});
+		}
+
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, MonoDevelop.Ide.Editor.Extension.KeyDescriptor descriptor)
+		{
+			string partialWord = GetCurrentWord (window, descriptor);
+			int skipChars = 0;
+			bool runParameterCompletionCommand = false;
+			bool runCompletionCompletionCommand = false;
+			var method = Symbol as IMethodSymbol;
+
+			bool addParens = IdeApp.Preferences.AddParenthesesAfterCompletion;
+			bool addOpeningOnly = IdeApp.Preferences.AddOpeningOnly;
+			var Editor = ext.Editor;
+			var Policy = ext.FormattingPolicy;
+			string insertionText = this.GetInsertionText();
+
+			if (addParens && !IsDelegateExpected && method != null && !HasNonMethodMembersWithSameName (window, Symbol) && !IsBracketAlreadyInserted (ext, method)) {
+				var line = Editor.GetLine (Editor.CaretLine);
+				//var start = window.CodeCompletionContext.TriggerOffset + partialWord.Length + 2;
+				//var end = line.Offset + line.Length;
+				//string textToEnd = start < end ? Editor.GetTextBetween (start, end) : "";
+				bool addSpace = Policy.SpaceAfterMethodCallName && MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.OnTheFlyFormatting;
+
+				int exprStart = window.CodeCompletionContext.TriggerOffset - 1;
+				while (exprStart > line.Offset) {
+					char ch = Editor.GetCharAt (exprStart);
+					if (ch != '.' && ch != '_' && !char.IsLetterOrDigit (ch))
+						break;
+					exprStart--;
+				}
+				bool insertSemicolon = InsertSemicolon(ext, exprStart);
+				if (Symbol is IMethodSymbol && ((IMethodSymbol)Symbol).MethodKind == MethodKind.Constructor)
+					insertSemicolon = false;
+				//int pos;
+
+				var keys = new [] { SpecialKey.Return, SpecialKey.Tab, SpecialKey.Space };
+				if (keys.Contains (descriptor.SpecialKey) || descriptor.KeyChar == '.') {
+					if (HasAnyOverloadWithParameters (method)) {
+						if (addOpeningOnly) {
+							insertionText += RequireGenerics (method) ? "<|" : (addSpace ? " (|" : "(|");
+							skipChars = 0;
+						} else {
+							if (descriptor.KeyChar == '.') {
+								if (RequireGenerics (method)) {
+									insertionText += addSpace ? "<> ()" : "<>()";
+								} else {
+									insertionText += addSpace ? " ()" : "()";
+								}
+								skipChars = 0;
+							} else {
+								if (insertSemicolon) {
+									if (RequireGenerics (method)) {
+										insertionText += addSpace ? "<|> ();" : "<|>();";
+										skipChars = addSpace ? 5 : 4;
+									} else {
+										insertionText += addSpace ? " (|);" : "(|);";
+										skipChars = 2;
+									}
+								} else {
+									if (RequireGenerics (method)) {
+										insertionText += addSpace ? "<|> ()" :  "<|>()";
+										skipChars = addSpace ? 4 : 3;
+									} else {
+										insertionText += addSpace ? " (|)" : "(|)";
+										skipChars = 1;
+									}
+								}
+							}
+						}
+						runParameterCompletionCommand = true;
+					} else {
+						if (addOpeningOnly) {
+							insertionText += RequireGenerics (method) ? "<|" : (addSpace ? " (|" : "(|");
+							skipChars = 0;
+						} else {
+							if (descriptor.KeyChar == '.') {
+								if (RequireGenerics (method)) {
+									insertionText += addSpace ? "<> ()" : "<>()";
+								} else {
+									insertionText += addSpace ? " ()" : "()";
+								}
+								skipChars = 0;
+							} else {
+								if (insertSemicolon) {
+									if (RequireGenerics (method)) {
+										insertionText += addSpace ? "<|> ();" : "<|>();";
+									} else {
+										insertionText += addSpace ? " ();|" : "();|";
+									}
+
+								} else {
+									if (RequireGenerics (method)) {
+										insertionText += addSpace ? "<|> ()" : "<|>()";
+									} else {
+										insertionText += addSpace ? " ()|" : "()|";
+									}
+
+								}
+							}
+						}
+					}
+				}
+				if (descriptor.KeyChar == ';') {
+					insertionText += addSpace ? " ()" : "()";
+
+				}
+				ka |= KeyActions.Ignore;
+			}
+			if ((DisplayFlags & DisplayFlags.NamedArgument) == DisplayFlags.NamedArgument &&
+				IdeApp.Preferences.AddParenthesesAfterCompletion &&
+				(descriptor.SpecialKey == SpecialKey.Tab ||
+					descriptor.SpecialKey == SpecialKey.Return ||
+					descriptor.SpecialKey == SpecialKey.Space)) {
+				if (true/*Policy.AroundAssignmentParentheses */)
+					insertionText += " ";
+				insertionText += "=";
+				if (/*Policy.AroundAssignmentParentheses && */descriptor.SpecialKey != SpecialKey.Space)
+					insertionText += " ";
+				runCompletionCompletionCommand = true;
+			}
+			window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, partialWord, insertionText);
+			int offset = Editor.CaretOffset;
+			for (int i = skipChars - 1; i --> 0;) {
+				Editor.StartSession (new SkipCharSession (Editor.GetCharAt (offset)));
+				offset++;
+			}
+
+			if (runParameterCompletionCommand && IdeApp.Workbench != null) {
+				Application.Invoke (delegate {
+					ext.RunParameterCompletionCommand ();
+				});
+			}
+
+			if (runCompletionCompletionCommand && IdeApp.Workbench != null) {
+				Application.Invoke (delegate {
+					ext.RunCompletionCommand ();
+				});
+			}
+		}
+
+		static bool IsBracketAlreadyInserted (CSharpCompletionTextEditorExtension ext, IMethodSymbol method)
+		{
+			var Editor = ext.Editor;
+			int offset = Editor.CaretOffset;
+			while (offset < Editor.Length) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsLetterOrDigit (ch))
+					break;
+				offset++;
+			}
+			while (offset < Editor.Length) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsWhiteSpace (ch))
+					return ch == '(' || ch == '<' && RequireGenerics (method);
+				offset++;
+			}
+			return false;
+		}
+
+
+
+		internal static bool InsertSemicolon (CSharpCompletionTextEditorExtension ext, int exprStart)
+		{
+			var Editor = ext.Editor;
+			int offset = exprStart;
+			while (offset > 0) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsWhiteSpace (ch)) {
+					if (ch != '{' && ch != '}' && ch != ';')
+						return false;
+					break;
+				}
+				offset--;
+			}
+
+			offset = Editor.CaretOffset;
+			while (offset < Editor.Length) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsLetterOrDigit (ch))
+					break;
+				offset++;
+			}
+			while (offset < Editor.Length) {
+				char ch = Editor.GetCharAt (offset);
+				if (!char.IsWhiteSpace (ch))
+					return char.IsLetter (ch) || ch == '}';
+				offset++;
+			}
+			return true;
+		}
+
+		internal static bool HasAnyOverloadWithParameters (IMethodSymbol method)
+		{
+			if (method.MethodKind == MethodKind.Constructor) 
+				return method.ContainingType.GetMembers()
+					.OfType<IMethodSymbol>()
+					.Where(m => m.MethodKind == MethodKind.Constructor)
+					.Any (m => m.Parameters.Length > 0);
+			return method.ContainingType
+				.GetMembers()
+				.OfType<IMethodSymbol>()
+				.Any (m => m.Name == method.Name && m.Parameters.Length > 0);
+		}
+
+		bool HasNonMethodMembersWithSameName (CompletionListWindow window, ISymbol member)
+		{
+			var method = member as IMethodSymbol;
+			if (method == null)
+				return true;
+			if (method == null || method.MethodKind == MethodKind.Constructor)
+				return false;
+
+			ITypeSymbol type = null;
+			var model = ext.DocumentContext.AnalysisDocument?.GetSemanticModelAsync ().WaitAndGetResult(default(CancellationToken));
+			if (model == null)
+				return false;
+			var token = model.SyntaxTree.FindTokenOnLeftOfPosition (window.StartOffset, default (CancellationToken));
+			var node = token.Parent as MemberAccessExpressionSyntax;
+			if (node != null) {
+				type = model.GetTypeInfo (node.Expression, default (CancellationToken)).Type;
+			}
+
+			if (type == null)
+				type = method.ReceiverType ?? method.ContainingType;
+			foreach (var m in type.GetMembers ().Where (m => m.Kind != SymbolKind.Method)) {
+				if (m.Name == member.Name)
+					return true;
+			}
+			return false;
+		}
+
+		static bool RequireGenerics (IMethodSymbol method)
+		{
+			System.Collections.Immutable.ImmutableArray<ITypeSymbol> typeArgs;
+			if (method.MethodKind == MethodKind.Constructor) {
+				typeArgs = method.ContainingType.TypeArguments;
+			} else {
+				typeArgs = method.TypeArguments;
+			}
+			
+			if (!typeArgs.Any (ta => ta.TypeKind == TypeKind.TypeParameter))
+				return false;
+			var testMethod = method.ReducedFrom ?? method;
+			return typeArgs.Any (t => !testMethod.Parameters.Any (p => ContainsType(p.Type, t)));
+		}
+
+		static bool ContainsType (ITypeSymbol testType, ITypeSymbol searchType)
+		{
+			if (testType == null)
+				return false;
+			if (testType == searchType)
+				return true;
+			var namedTypeSymbol = testType as INamedTypeSymbol;
+			if (namedTypeSymbol != null) {
+				foreach (var arg in namedTypeSymbol.TypeParameters)
+					if (ContainsType (arg, searchType))
+						return true;
+			}
+			return false;
+		}
+
+		public override int CompareTo (object obj)
+		{
+			var anonymousMethodCompletionData = obj as AnonymousMethodCompletionData;
+			if (anonymousMethodCompletionData != null)
+				return -1;
+			var objectCreationData = obj as ObjectCreationCompletionData;
+			if (objectCreationData != null)
+				return -1;
+			int ret = base.CompareTo (obj);
+			if (ret == 0) {
+				var sym = Symbol;
+				var other = obj as RoslynSymbolCompletionData;
+				if (other == null)
+					return 0;
+				if (sym.Kind == other.Symbol.Kind) {
+					var m1 = sym as IMethodSymbol;
+					var m2 = other.Symbol as IMethodSymbol;
+					if (m1 != null)
+						return m1.Parameters.Length.CompareTo (m2.Parameters.Length);
+					var p1 = sym as IPropertySymbol;
+					var p2 = other.Symbol as IPropertySymbol;
+					if (p1 != null)
+						return p1.Parameters.Length.CompareTo (p2.Parameters.Length);
+				}
+			}
+			return ret;
+		}
+
+		static bool IsObsolete (ISymbol symbol)
+		{
+			return symbol.GetAttributes ().Any (attr => attr.AttributeClass.Name == "ObsoleteAttribute" && attr.AttributeClass.ContainingNamespace.GetFullName () == "System");
+		}
+
+
+		public override bool IsOverload (CompletionData other)
+		{
+			var os = other as RoslynSymbolCompletionData;
+			if (os != null) {
+				return Symbol.Kind == os.Symbol.Kind && 
+					   Symbol.Name == os.Symbol.Name;
+			}
+
+			return false;
+		}
+
+		//		public static TooltipInformation CreateTooltipInformation (ICompilation compilation, CSharpUnresolvedFile file, TextEditorData textEditorData, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy formattingPolicy, IType type, bool smartWrap, bool createFooter = false)
+		//		{
+		//			var tooltipInfo = new TooltipInformation ();
+		//			var resolver = file != null ? file.GetResolver (compilation, textEditorData.Caret.Location) : new CSharpResolver (compilation);
+		//			var sig = new SignatureMarkupCreator (resolver, formattingPolicy.CreateOptions ());
+		//			sig.BreakLineAfterReturnType = smartWrap;
+		//			try {
+		//				tooltipInfo.SignatureMarkup = sig.GetMarkup (type.IsParameterized ? type.GetDefinition () : type);
+		//			} catch (Exception e) {
+		//				LoggingService.LogError ("Got exception while creating markup for :" + type, e);
+		//				return new TooltipInformation ();
+		//			}
+		//			if (type.IsParameterized) {
+		//				var typeInfo = new StringBuilder ();
+		//				for (int i = 0; i < type.TypeParameterCount; i++) {
+		//					typeInfo.AppendLine (type.GetDefinition ().TypeParameters [i].Name + " is " + sig.GetTypeReferenceString (type.TypeArguments [i]));
+		//				}
+		//				tooltipInfo.AddCategory ("Type Parameters", typeInfo.ToString ());
+		//			}
+		//
+		//			var def = type.GetDefinition ();
+		//			if (def != null) {
+		//				if (createFooter)
+		//					tooltipInfo.FooterMarkup = sig.CreateFooter (def);
+		//				tooltipInfo.SummaryMarkup = AmbienceService.GetSummaryMarkup (def) ?? "";
+		//			}
+		//			return tooltipInfo;
+		//		}
+	}
+
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/TypeParameterDataProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/TypeParameterDataProvider.cs
deleted file mode 100644
index 0e5f2ce907..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/TypeParameterDataProvider.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// 
-// TemplateParameterDataProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.CodeCompletion;
-using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Parser;
-using System.Text.RegularExpressions;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.CSharp.Resolver;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class TypeParameterDataProvider: IParameterDataProvider
-	{
-		int startOffset;
-		//CSharpCompletionTextEditorExtension ext;
-		
-		List<IType> types;
-		List<IMethod> methods;
-		CSharpAmbience ambience = new CSharpAmbience ();
-
-		public int StartOffset {
-			get {
-				return startOffset;
-			}
-		}		
-		
-		public TypeParameterDataProvider (int startOffset, CSharpCompletionTextEditorExtension ext, IEnumerable<IType> types)
-		{
-			this.startOffset = startOffset;
-			//			this.ext = ext;
-			this.types = new List<IType> (types);
-		}
-
-		public TypeParameterDataProvider (int startOffset, CSharpCompletionTextEditorExtension ext, IEnumerable<IMethod> methods)
-		{
-			this.startOffset = startOffset;
-			//			this.ext = ext;
-			this.methods = new List<IMethod> (methods);
-		}
-
-		static int TypeComparer (IType left, IType right)
-		{
-			return left.TypeParameterCount - right.TypeParameterCount;
-		}
-		
-		#region IParameterDataProvider implementation
-		
-		protected virtual string GetPrefix (IMethod method)
-		{
-			var flags = OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.IncludeGenerics;
-			return ambience.GetString (method.ReturnType, flags) + " ";
-		}
-		
-		public string GetHeading (int overload, string[] parameterMarkup, int currentParameter)
-		{
-			var result = new StringBuilder ();
-			result.Append ("<b>");
-			if (methods != null) {
-				result.Append (ambience.GetString (methods [overload], OutputFlags.UseFullName | OutputFlags.IncludeMarkup));
-			} else {
-				result.Append (ambience.GetString (types [overload], OutputFlags.UseFullName | OutputFlags.IncludeMarkup));
-			}
-			result.Append ("</b>");
-			result.Append ("&lt;");
-			int parameterCount = 0;
-			foreach (string parameter in parameterMarkup) {
-				if (parameterCount > 0)
-					result.Append (", ");
-				result.Append (parameter);
-				parameterCount++;
-			}
-			result.Append ("&gt;");
-			
-			return result.ToString ();
-		}
-		
-		public string GetDescription (int overload, int currentParameter)
-		{
-			return "";
-		}
-		
-		public string GetParameterDescription (int overload, int paramIndex)
-		{
-			if (methods != null)
-				return ambience.GetString (methods[overload].TypeParameters [paramIndex], OutputFlags.AssemblyBrowserDescription | OutputFlags.HideExtensionsParameter | OutputFlags.IncludeGenerics | OutputFlags.IncludeModifiers | OutputFlags.HighlightName);
-
-			var type = types[overload];
-			
-			if (paramIndex < 0 || paramIndex >= type.TypeParameterCount)
-				return "";
-			
-			return ambience.GetString (type.GetDefinition ().TypeParameters [paramIndex], OutputFlags.AssemblyBrowserDescription | OutputFlags.HideExtensionsParameter | OutputFlags.IncludeGenerics | OutputFlags.IncludeModifiers | OutputFlags.HighlightName);
-		}
-		
-		public int GetParameterCount (int overload)
-		{
-			if (overload >= Count)
-				return -1;
-			
-			if (methods != null)
-				return methods[overload].TypeParameters.Count;
-			var type = types[overload];
-			return type != null ? type.TypeParameterCount : 0;
-		}
-
-		public string GetParameterName (int overload, int paramIndex)
-		{
-			// unused
-			return "T";
-		}
-
-
-		public bool AllowParameterList (int overload)
-		{
-			return false;
-		}
-
-		public int Count {
-			get {
-				if (methods != null)
-					return methods.Count;
-				return types != null ? types.Count : 0;
-			}
-		}
-		#endregion 
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/VariableCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/VariableCompletionData.cs
deleted file mode 100644
index 34ae8a585a..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/VariableCompletionData.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// 
-// VariableCompletionData.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.Ide.CodeCompletion;
-using ICSharpCode.NRefactory.Completion;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.CSharp.Completion
-{
-	class VariableCompletionData : CompletionData, IVariableCompletionData
-	{
-		readonly CSharpCompletionTextEditorExtension ext;
-
-		public IVariable Variable {
-			get;
-			private set;
-		}
-
-		public override TooltipInformation CreateTooltipInformation (bool smartWrap)
-		{
-			var tooltipInfo = new TooltipInformation ();
-			var resolver = ext.CSharpUnresolvedFile.GetResolver (ext.Compilation, ext.Document.Editor.Caret.Location);
-			var sig = new SignatureMarkupCreator (resolver, ext.FormattingPolicy.CreateOptions ());
-			sig.BreakLineAfterReturnType = smartWrap;
-			tooltipInfo.SignatureMarkup = sig.GetLocalVariableMarkup (Variable);
-			return tooltipInfo;
-		}
-
-		public VariableCompletionData (CSharpCompletionTextEditorExtension ext, IVariable variable) : base (variable.Name, variable.GetStockIcon ())
-		{
-			this.ext = ext;
-			this.Variable = variable;
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/DiagnosticCustomTags.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/DiagnosticCustomTags.cs
new file mode 100644
index 0000000000..d05d91c55f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/DiagnosticCustomTags.cs
@@ -0,0 +1,35 @@
+//
+// DiagnosticCustomTags.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.CSharp.Diagnostics
+{
+	static class DiagnosticCustomTags
+	{
+		public static readonly string[] Unnecessary = { WellKnownDiagnosticTags.Unnecessary, WellKnownDiagnosticTags.Telemetry };
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/IDEDiagnosticIds.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/IDEDiagnosticIds.cs
new file mode 100644
index 0000000000..7d067e38d2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/IDEDiagnosticIds.cs
@@ -0,0 +1,43 @@
+//
+// IDEDiagnosticIds.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.CSharp.Diagnostics
+{
+	static class IDEDiagnosticIds
+	{
+		public const string SimplifyNamesDiagnosticId = "IDE0001";
+		public const string SimplifyMemberAccessDiagnosticId = "IDE0002";
+		public const string SimplifyThisOrMeDiagnosticId = "IDE0003";
+		public const string RemoveUnnecessaryCastDiagnosticId = "IDE0004";
+		public const string RemoveUnnecessaryImportsDiagnosticId = "IDE0005";
+
+		public const string MonoTODODiagnosticDiagnosticId = "XS0001";
+
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/MonoNameConventionPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/MonoNameConventionPolicy.xml
index 4643473284..4643473284 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/MonoNameConventionPolicy.xml
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/MonoNameConventionPolicy.xml
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionEditRuleDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionEditRuleDialog.cs
new file mode 100644
index 0000000000..02fcc66359
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionEditRuleDialog.cs
@@ -0,0 +1,211 @@
+// 
+// NamingConventionEditRuleDialog.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using Gtk;
+using System.Collections.Generic;
+using MonoDevelop.Core;
+using RefactoringEssentials.CSharp.Diagnostics;
+
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
+{
+	partial class NameConventionEditRuleDialog : Gtk.Dialog
+	{
+		static readonly Dictionary<AffectedEntity, string> EntityName = new Dictionary<AffectedEntity, string> ();
+		static readonly Dictionary<Modifiers, string> AccessibilityName = new Dictionary<Modifiers, string> ();
+		
+		static NameConventionEditRuleDialog ()
+		{
+			EntityName [AffectedEntity.Namespace] = GettextCatalog.GetString ("Namespaces");
+
+			EntityName [AffectedEntity.Class] = GettextCatalog.GetString ("Classes");
+			EntityName [AffectedEntity.Struct] = GettextCatalog.GetString ("Structs");
+			EntityName [AffectedEntity.Enum] = GettextCatalog.GetString ("Enums");
+			EntityName [AffectedEntity.Interface] = GettextCatalog.GetString ("Interfaces");
+			EntityName [AffectedEntity.Delegate] = GettextCatalog.GetString ("Delegates");
+	
+			EntityName [AffectedEntity.CustomAttributes] = GettextCatalog.GetString ("Attributes");
+			EntityName [AffectedEntity.CustomEventArgs] = GettextCatalog.GetString ("Event Arguments");
+			EntityName [AffectedEntity.CustomExceptions] = GettextCatalog.GetString ("Exceptions");
+	
+			EntityName [AffectedEntity.Property] = GettextCatalog.GetString ("Properties");
+			EntityName [AffectedEntity.AsyncMethod] = GettextCatalog.GetString ("Async methods");
+			EntityName [AffectedEntity.Method] = GettextCatalog.GetString ("Methods");
+			EntityName [AffectedEntity.Field] = GettextCatalog.GetString ("Fields");
+			EntityName [AffectedEntity.ConstantField] = GettextCatalog.GetString ("Constant fields");
+			EntityName [AffectedEntity.ReadonlyField] = GettextCatalog.GetString ("Readonly fields");
+			EntityName [AffectedEntity.Event] = GettextCatalog.GetString ("Events");
+			EntityName [AffectedEntity.EnumMember] = GettextCatalog.GetString ("Enum Members");
+	
+			EntityName [AffectedEntity.Parameter] = GettextCatalog.GetString ("Parameters");
+			EntityName [AffectedEntity.TypeParameter] = GettextCatalog.GetString ("Type Parameters");
+	
+			// Unit test special case
+			EntityName [AffectedEntity.TestType] = GettextCatalog.GetString ("Test Types");
+			EntityName [AffectedEntity.TestMethod] = GettextCatalog.GetString ("Test Methods");
+	
+			// private entities
+			EntityName [AffectedEntity.LambdaParameter] = GettextCatalog.GetString ("Lambda Parameters");
+			EntityName [AffectedEntity.LocalVariable] = GettextCatalog.GetString ("Local Variables");
+			EntityName [AffectedEntity.LocalConstant] = GettextCatalog.GetString ("Local Constants");
+			EntityName [AffectedEntity.Label] = GettextCatalog.GetString ("Labels");
+
+			AccessibilityName [Modifiers.Public] = GettextCatalog.GetString ("Public");
+			AccessibilityName [Modifiers.Private] = GettextCatalog.GetString ("Private");
+			AccessibilityName [Modifiers.Internal] = GettextCatalog.GetString ("Internal");
+			AccessibilityName [Modifiers.Protected] = GettextCatalog.GetString ("Protected");
+		}
+
+		NameConventionRule rule;
+
+		ListStore entityStore       = new ListStore (typeof(string), typeof(AffectedEntity), typeof(bool));
+		ListStore accessibiltyStore = new ListStore (typeof(string), typeof(Modifiers), typeof(bool));
+
+		public NameConventionEditRuleDialog (NameConventionRule rule)
+		{
+			if (rule == null)
+				throw new System.ArgumentNullException ("rule");
+			this.rule = rule;
+			this.Build ();
+
+			var ct1 = new CellRendererToggle ();
+			ct1.Toggled += delegate(object o, Gtk.ToggledArgs args) {
+				TreeIter iter;
+				if (!entityStore.GetIterFromString (out iter, args.Path))
+					return;
+				entityStore.SetValue (iter, 2, !(bool)entityStore.GetValue (iter, 2));
+			};
+			treeviewEntities.AppendColumn ("IsChecked", ct1, "active", 2);
+			treeviewEntities.AppendColumn ("Entity", new CellRendererText (), "text", 0);
+			treeviewEntities.Model = entityStore;
+			
+			var ct2 = new CellRendererToggle ();
+			ct2.Toggled += delegate(object o, Gtk.ToggledArgs args) {
+				TreeIter iter;
+				if (!accessibiltyStore.GetIterFromString (out iter, args.Path))
+					return;
+				accessibiltyStore.SetValue (iter, 2, !(bool)accessibiltyStore.GetValue (iter, 2));
+			};
+			treeviewAccessibility.AppendColumn ("IsChecked", ct2, "active", 2);
+			treeviewAccessibility.AppendColumn ("Entity", new CellRendererText (), "text", 0);
+			treeviewAccessibility.Model = accessibiltyStore;
+			buttonOk.Clicked += (sender, e) => Apply ();
+
+			FillDialog ();
+		}
+
+		public void FillDialog ()
+		{
+			entryRuleName.Text = rule.Name ?? "";
+			if (rule.RequiredPrefixes != null)
+				entryPrefix.Text = rule.RequiredPrefixes.FirstOrDefault (); 
+			if (rule.AllowedPrefixes != null)
+				entryPrefixAllowed.Text = string.Join (", ", rule.AllowedPrefixes); 
+			if (rule.RequiredSuffixes != null)
+				entrySuffix.Text = rule.RequiredSuffixes.FirstOrDefault (); 
+			styleComboBox.AppendText ("PascalCase"); 
+			styleComboBox.AppendText ("CamelCase"); 
+			styleComboBox.AppendText ("ALLUPPER"); 
+			styleComboBox.AppendText ("alllower"); 
+			styleComboBox.AppendText ("Firstupper"); 
+			styleComboBox.AppendText ("PascalCase_underscoreTolerant"); 
+			styleComboBox.AppendText ("PascalCase_UnderscoreTolerant"); 
+			styleComboBox.AppendText ("CamelCase_underscoreTolerant"); 
+			styleComboBox.AppendText ("CamelCase_UnderscoreTolerant"); 
+
+			styleComboBox.Active = (int)rule.NamingStyle - 1;
+
+			foreach (AffectedEntity ae in Enum.GetValues (typeof (AffectedEntity))) {
+				if (!EntityName.ContainsKey (ae))
+					continue;
+				entityStore.AppendValues (EntityName [ae], ae, rule.AffectedEntity.HasFlag (ae));
+			}
+			
+			foreach (Modifiers mod in Enum.GetValues (typeof (Modifiers))) {
+				if (!AccessibilityName.ContainsKey (mod))
+					continue;
+				accessibiltyStore.AppendValues (AccessibilityName [mod], mod, rule.VisibilityMask.HasFlag (mod));
+			}
+
+			checkbuttonStatic.Active = rule.IncludeStaticEntities;
+			checkbuttonInstanceMembers.Active = rule.IncludeInstanceMembers;
+
+		}
+
+		public void Apply ()
+		{
+			rule.Name = entryRuleName.Text;
+			rule.NamingStyle = (NamingStyle)(1 + styleComboBox.Active);
+
+			var prefix = entryPrefix.Text.Trim ();
+			if (string.IsNullOrEmpty (prefix)) {
+				rule.RequiredPrefixes = null;
+			} else {
+				rule.RequiredPrefixes = new [] { prefix };
+			}
+			
+			var allowedPrefix = entryPrefixAllowed.Text.Trim ();
+			if (string.IsNullOrEmpty (allowedPrefix)) {
+				rule.AllowedPrefixes = null;
+			} else {
+				rule.AllowedPrefixes = allowedPrefix.Split (',', ';').Select (s => s.Trim ()).ToArray ();
+			}
+			
+			var suffix = entrySuffix.Text.Trim ();
+			if (string.IsNullOrEmpty (suffix)) {
+				rule.RequiredSuffixes = null;
+			} else {
+				rule.RequiredSuffixes = new [] { suffix };
+			}
+
+			var ae = AffectedEntity.None;
+			TreeIter iter;
+			if (entityStore.GetIterFirst (out iter)) {
+				do {
+					var entity = (AffectedEntity)entityStore.GetValue (iter, 1);
+					var include = (bool)entityStore.GetValue (iter, 2);
+					if (include)
+						ae |= entity;
+				} while (entityStore.IterNext (ref iter));
+			}
+			rule.AffectedEntity = ae;
+
+			var mod = Modifiers.None;
+			if (accessibiltyStore.GetIterFirst (out iter)) {
+				do {
+					var entity = (Modifiers)accessibiltyStore.GetValue (iter, 1);
+					var include = (bool)accessibiltyStore.GetValue (iter, 2);
+					if (include)
+						mod |= entity;
+				} while (accessibiltyStore.IterNext (ref iter));
+			}
+			rule.VisibilityMask = mod;
+			rule.IncludeStaticEntities = checkbuttonStatic.Active;
+			rule.IncludeInstanceMembers = checkbuttonInstanceMembers.Active;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanel.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanel.cs
new file mode 100644
index 0000000000..b71b916792
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanel.cs
@@ -0,0 +1,73 @@
+// 
+// NamingConventionPanel.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin <http://xamarin.com>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Gui.Dialogs;
+using MonoDevelop.Components;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
+{
+	class NameConventionPanel : PolicyOptionsPanel<NameConventionPolicy>
+	{
+		NameConventionPanelWidget panel;
+		
+		static NameConventionPanel ()
+		{
+			// ensure that custom text editor shemes are loaded.
+			TextEditorDisplayBinding.InitSourceEditor ();
+		}
+		
+		protected override string PolicyTitleWithMnemonic {
+			get {
+				return GettextCatalog.GetString ("_Naming Style");
+			}
+		}
+
+		public override Control CreatePanelWidget ()
+		{
+			panel = new NameConventionPanelWidget ();
+			panel.PolicyChanged += delegate {
+				UpdateSelectedNamedPolicy ();
+			};
+			return panel;
+		}
+		
+		protected override void LoadFrom (NameConventionPolicy policy)
+		{
+			panel.Policy = policy.Clone ();
+		}
+		
+		protected override NameConventionPolicy GetPolicy ()
+		{
+			// return cloned policy
+			panel.ApplyChanges ();
+			return panel.Policy;
+		}
+	}
+
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanelWidget.cs
new file mode 100644
index 0000000000..a5e8616ce9
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPanelWidget.cs
@@ -0,0 +1,156 @@
+// 
+// NamingConventionPanelWidget.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Gtk;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using System.Collections.Generic;
+
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
+{
+	[System.ComponentModel.ToolboxItem(true)]
+	partial class NameConventionPanelWidget : Gtk.Bin
+	{
+		TreeStore treeStore = new TreeStore (typeof(NameConventionRule));
+		NameConventionPolicy policy;
+
+		internal NameConventionPolicy Policy {
+			get {
+				return policy;
+			}
+			set {
+				policy = value;
+				FillRules (policy.Rules);
+			}
+		}
+
+		public NameConventionPanelWidget ()
+		{
+			Build ();	
+			Show ();
+
+			var ct1 = new CellRendererText ();
+			var col1 = treeviewConventions.AppendColumn (GettextCatalog.GetString ("Rule"), ct1);
+			col1.Expand = true;
+			col1.SetCellDataFunc (ct1, delegate (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter) {
+				var rule = (NameConventionRule)model.GetValue (iter, 0);
+				ct1.Text = rule.Name;
+			});
+			
+			
+			var ct2 = new CellRendererText ();
+			var col2 = treeviewConventions.AppendColumn (GettextCatalog.GetString ("Example"), ct2);
+			col2.Expand = true;
+			col2.SetCellDataFunc (ct2, delegate (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter) {
+				var rule = (NameConventionRule)model.GetValue (iter, 0);
+				ct2.Text = rule.GetPreview ();
+			});
+			
+			treeviewConventions.Model = treeStore;
+			treeviewConventions.Selection.Changed += HandleSelectionChanged;
+			treeviewConventions.RowActivated += (o, args) => EditSelectedEntry ();
+			buttonEdit.Clicked += (o, s) => EditSelectedEntry ();
+			buttonRemove.Clicked += (o, s) => RemoveSelectedEntry ();
+			buttonAdd.Clicked += (o, s) => AddEntry ();
+
+			HandleSelectionChanged (null, null);
+		}
+
+		void HandleSelectionChanged (object sender, EventArgs e)
+		{
+			TreeIter iter;
+			buttonEdit.Sensitive = treeviewConventions.Selection.GetSelected (out iter);
+		}
+
+		public void ApplyChanges ()
+		{
+			var rules = new List<NameConventionRule> ();
+			TreeIter iter;
+			if (treeStore.GetIterFirst (out iter)) {
+				do {
+					var rule = (NameConventionRule)treeStore.GetValue (iter, 0);
+					rules.Add (rule);
+				} while (treeStore.IterNext (ref iter));
+			}
+			policy.Rules = rules.ToArray ();
+			if (IdeApp.Workbench.ActiveDocument != null)
+				IdeApp.Workbench.ActiveDocument.UpdateParseDocument ();
+		}
+
+		void AddEntry ()
+		{
+			var newRule = new NameConventionRule ();
+			newRule.Name = "New Rule";
+			using (var diag = new NameConventionEditRuleDialog (newRule)) {
+				var result = MessageService.ShowCustomDialog (diag);
+				if (result == (int)ResponseType.Ok)
+					treeStore.AppendValues (newRule);
+				OnPolicyChanged (EventArgs.Empty);
+			}
+		}
+
+		void EditSelectedEntry ()
+		{
+			TreeIter iter;
+			if (!treeviewConventions.Selection.GetSelected (out iter))
+				return;
+			var rule = treeStore.GetValue (iter, 0) as NameConventionRule;
+			using (var diag = new NameConventionEditRuleDialog (rule)) {
+				int result = MessageService.ShowCustomDialog (diag);
+				treeviewConventions.QueueResize ();
+				if (result == (int)Gtk.ResponseType.Ok)
+					OnPolicyChanged (EventArgs.Empty);
+			}
+		}
+		
+		void RemoveSelectedEntry ()
+		{
+			TreeIter iter;
+			if (!treeviewConventions.Selection.GetSelected (out iter))
+				return;
+			treeStore.Remove (ref iter);
+			OnPolicyChanged (EventArgs.Empty);
+		}
+
+		void FillRules (IEnumerable<NameConventionRule> rules)
+		{
+			treeStore.Clear ();
+			foreach (var rule in rules) {
+				treeStore.AppendValues (rule);
+			}
+		}
+
+		protected virtual void OnPolicyChanged (EventArgs e)
+		{
+			var handler = PolicyChanged;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public event EventHandler PolicyChanged;
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPolicy.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPolicy.cs
new file mode 100644
index 0000000000..bf2805536f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionPolicy.cs
@@ -0,0 +1,96 @@
+// 
+// NamingConventions.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using MonoDevelop.Projects.Policies;
+using MonoDevelop.Core.Serialization;
+using RefactoringEssentials.CSharp.Diagnostics;
+
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
+{
+	[PolicyType ("Naming Conventions Policy")]
+	class NameConventionPolicy : IEquatable<NameConventionPolicy>
+	{
+		NameConventionRule[] rules = new NameConventionRule[0];
+
+		[ItemProperty]
+		public NameConventionRule[] Rules {
+			get { return rules; }
+			set { rules = value; }
+		}
+
+		public NameConventionPolicy Clone ()
+		{
+			var result = new NameConventionPolicy ();
+			result.rules = new List<NameConventionRule> (rules.Select (r => r.Clone ())).ToArray ();
+			return result;
+		}
+
+		public NameConventionPolicy ()
+		{
+			rules = new List<NameConventionRule> (DefaultRules.GetFdgRules ().Select (r => new NameConventionRule (r))).ToArray ();
+		}
+
+		class NamingConventionService : RefactoringEssentials.CSharp.Diagnostics.NamingConventionService
+		{
+			NameConventionPolicy policy;
+			NamingRule[] rules = null;
+			public override IEnumerable<RefactoringEssentials.CSharp.Diagnostics.NamingRule> Rules {
+				get {
+					if (rules == null) {
+						this.rules = policy.Rules.Select (r => r.GetNRefactoryRule ()).ToArray ();
+					}
+					return rules;
+				}
+			}
+
+			public NamingConventionService (NameConventionPolicy policy)
+			{
+				this.policy = policy;
+			}
+			
+		}
+
+		public RefactoringEssentials.CSharp.Diagnostics.NamingConventionService CreateNRefactoryService ()
+		{
+			return new NamingConventionService (this);
+		}
+
+		#region IEquatable implementation
+		public bool Equals (NameConventionPolicy other)
+		{
+			if (Rules.Length != other.Rules.Length) 
+				return false;
+			for (int i = 0; i < rules.Length; i++) {
+				if (!rules [i].Equals (other.Rules[i]))
+					return false;
+			}
+			return true;
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionRule.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionRule.cs
new file mode 100644
index 0000000000..d9f24284bc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/InconsistentNaming/NameConventionRule.cs
@@ -0,0 +1,587 @@
+// 
+// NamingRule.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Text;
+using MonoDevelop.Projects.Policies;
+using MonoDevelop.Core.Serialization;
+using RefactoringEssentials.CSharp.Diagnostics;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
+using System.Globalization;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
+{
+	[DataItem ("NamingRule")]
+	sealed class NameConventionRule
+	{
+		NamingRule wrappedRule = new NamingRule (AffectedEntity.None);
+
+		[ItemProperty]
+		public string Name {
+			get { return wrappedRule.Name; } 
+			set { wrappedRule.Name = value;} 
+		}
+		
+		[ItemProperty]
+		public string[] RequiredPrefixes {
+			get { return wrappedRule.RequiredPrefixes; } 
+			set { wrappedRule.RequiredPrefixes = value;} 
+		}
+		
+		[ItemProperty]
+		public string[] AllowedPrefixes {
+			get { return wrappedRule.AllowedPrefixes; } 
+			set { wrappedRule.AllowedPrefixes = value;} 
+		}
+		
+		[ItemProperty]
+		public string[] RequiredSuffixes {
+			get { return wrappedRule.RequiredSuffixes; } 
+			set { wrappedRule.RequiredSuffixes = value;} 
+		}
+
+		[ItemProperty]
+		public string[] ForbiddenPrefixes {
+			get { return wrappedRule.ForbiddenPrefixes; } 
+			set { wrappedRule.ForbiddenPrefixes = value;} 
+		}
+
+		[ItemProperty]
+		public string[] ForbiddenSuffixes {
+			get { return wrappedRule.ForbiddenSuffixes; } 
+			set { wrappedRule.ForbiddenSuffixes = value;} 
+		}
+
+		[ItemProperty]
+		public AffectedEntity AffectedEntity {
+			get { return wrappedRule.AffectedEntity; } 
+			set { wrappedRule.AffectedEntity = value;} 
+		}
+
+		[ItemProperty]
+		public Modifiers VisibilityMask {
+			get { return wrappedRule.VisibilityMask; } 
+			set { wrappedRule.VisibilityMask = value;} 
+		}
+
+		[ItemProperty]
+		public NamingStyle NamingStyle {
+			get { return wrappedRule.NamingStyle; } 
+			set { wrappedRule.NamingStyle = value;} 
+		}
+
+		[ItemProperty]
+		public bool IncludeInstanceMembers {
+			get { return wrappedRule.IncludeInstanceMembers; } 
+			set { wrappedRule.IncludeInstanceMembers = value;} 
+		}
+
+		[ItemProperty]
+		public bool IncludeStaticEntities {
+			get { return wrappedRule.IncludeStaticEntities; } 
+			set { wrappedRule.IncludeStaticEntities = value;} 
+		}
+
+		internal NameConventionRule (NamingRule wrappedRule)
+		{
+			this.wrappedRule = wrappedRule;
+		}
+		
+		public NameConventionRule ()
+		{
+		}
+
+		public NameConventionRule Clone ()
+		{
+			return new NameConventionRule () {
+				wrappedRule = this.wrappedRule.Clone ()
+			};
+		}
+
+		public string GetPreview ()
+		{
+			return wrappedRule.GetPreview ();
+		}
+
+		internal NamingRule GetNRefactoryRule ()
+		{
+			return wrappedRule;
+		}
+
+		public string CorrectName (string name)
+		{
+			string prefix = null, suffix = null;
+			string realName = name;
+			string id = name;
+
+			// check prefix
+			if (AllowedPrefixes != null && AllowedPrefixes.Length > 0) {
+				var allowedPrefix = AllowedPrefixes.FirstOrDefault (p => id.StartsWith (p, StringComparison.Ordinal));
+				if (allowedPrefix != null) {
+					prefix = allowedPrefix;
+					id = id.Substring (allowedPrefix.Length);
+				}
+			}
+
+			if (prefix == null && RequiredPrefixes != null && RequiredPrefixes.Length > 0) {
+				var requiredPrefix = RequiredPrefixes.FirstOrDefault (p => id.StartsWith (p, StringComparison.Ordinal));
+				if (requiredPrefix == null) {
+					prefix = RequiredPrefixes[0];
+				} else {
+					prefix = requiredPrefix;
+					id = id.Substring (requiredPrefix.Length);
+				}
+			}
+
+			if (prefix == null && ForbiddenPrefixes != null && ForbiddenPrefixes.Length > 0) {
+				var forbiddenPrefix = ForbiddenPrefixes.FirstOrDefault (p => id.StartsWith (p, StringComparison.Ordinal));
+				if (forbiddenPrefix != null) {
+					id = id.Substring (forbiddenPrefix.Length);
+				}
+			}
+
+			// check suffix
+			if (RequiredSuffixes != null && RequiredSuffixes.Length > 0) {
+				var requiredSuffix = RequiredSuffixes.FirstOrDefault (s => id.EndsWith (s, StringComparison.Ordinal));
+				if (requiredSuffix == null) {
+					suffix = RequiredSuffixes[0];
+				} else {
+					suffix = requiredSuffix;
+					id = id.Substring (0, id.Length - requiredSuffix.Length);
+				}
+			} 
+
+			if (suffix == null && ForbiddenSuffixes != null && ForbiddenSuffixes.Length > 0) {
+				var forbiddenSuffix = ForbiddenSuffixes.FirstOrDefault (p => id.EndsWith (p, StringComparison.Ordinal));
+				if (forbiddenSuffix != null) {
+					id = id.Substring (0, id.Length - forbiddenSuffix.Length);
+				}
+			}
+			Console.WriteLine ("style: " + NamingStyle);
+			switch (NamingStyle) {
+			case NamingStyle.AllLower:
+				if (id.Any (ch => char.IsLetter (ch) && char.IsUpper (ch))) {
+					realName = LowerCaseIdentifier (WordParser.BreakWords (id));
+				} else {
+					realName = id;
+				}
+				break;
+			case NamingStyle.AllUpper:
+				if (id.Any (ch => char.IsLetter (ch) && char.IsLower (ch))) {
+					realName = UpperCaseIdentifier (WordParser.BreakWords (id));
+				} else {
+					realName = id;
+				}
+				break;
+
+			case NamingStyle.CamelCase:
+				if (id.Length > 0 && !char.IsLower (id [0])) {
+				} else if (!CheckUnderscore (id, UnderscoreHandling.Forbid)) {
+				} else {
+					realName = id;
+					break;
+				}
+				realName = CamelCaseIdentifier (id);
+				break;
+			case NamingStyle.CamelCaseWithLowerLetterUnderscore:
+				if (id.Length > 0 && !char.IsLower (id [0])) {
+				} else if (!CheckUnderscore (id, UnderscoreHandling.AllowWithLowerStartingLetter)) {
+				} else {
+					realName = id;
+					break;
+				}
+				realName = CamelCaseWithLowerLetterUnderscore (id);
+				break;
+			case NamingStyle.CamelCaseWithUpperLetterUnderscore:
+				if (id.Length > 0 && !char.IsLower (id [0])) {
+				} else if (!CheckUnderscore (id, UnderscoreHandling.AllowWithUpperStartingLetter)) {
+				} else {
+					realName = id;
+					break;
+				}
+				realName = CamelCaseWithUpperLetterUnderscore (id);
+				break;
+
+			case NamingStyle.PascalCase:
+				if (id.Length > 0 && !char.IsUpper (id [0])) {
+				} else if (!CheckUnderscore (id, UnderscoreHandling.Forbid)) {
+				} else {
+					realName = id;
+					break;
+				}
+				realName = PascalCaseIdentifier (id);
+				break;
+			case NamingStyle.PascalCaseWithLowerLetterUnderscore:
+				if (id.Length > 0 && !char.IsUpper (id [0])) {
+				} else if (!CheckUnderscore (id, UnderscoreHandling.AllowWithLowerStartingLetter)) {
+				} else {
+					realName = id;
+					break;
+				}
+				realName = PascalCaseWithLowerLetterUnderscore (id);
+				break;
+			case NamingStyle.PascalCaseWithUpperLetterUnderscore:
+				if (id.Length > 0 && !char.IsUpper (id [0])) {
+				} else if (!CheckUnderscore (id, UnderscoreHandling.AllowWithUpperStartingLetter)) {
+				} else {
+					realName = id;
+					break;
+				}
+				realName = PascalCaseWithUpperLetterUnderscore (id);
+				break;
+			case NamingStyle.FirstUpper:
+				if (id.Length > 0 && !char.IsUpper (id [0])) {
+				} else if (id.Take (1).Any (ch => char.IsLetter (ch) && char.IsUpper (ch))) {
+				} else {
+					realName = id;
+					break;
+				}
+				realName = FirstUpperIdentifier (WordParser.BreakWords (id));
+				break;
+			}
+
+			return prefix + realName + suffix;
+		}
+
+		static string ConvertToValidName(string id, Func<char, char> firstCharFunc, Func<char, char> followingCharFunc)
+		{
+			var sb = new StringBuilder();
+			bool first = true;
+			for (int i = 0; i < id.Length; i++) {
+				char ch = id[i];
+				if (i == 0 && ch == '_')
+					continue;
+				if (first && char.IsLetter(ch)) {
+					sb.Append(firstCharFunc(ch));
+					firstCharFunc = followingCharFunc;
+					first = false;
+					continue;
+				}
+				if (ch == '_') {
+					if (first)
+						continue;
+					if (i + 1 < id.Length && id[i + 1] == '_')
+						continue;
+
+					if (i + 1 < id.Length) {
+						if (char.IsDigit(id[i + 1])) {
+							sb.Append('_');
+						} else {
+							first = true;
+						}
+					}
+					continue;
+				}
+				sb.Append(ch);
+			}
+			return sb.ToString();
+		}
+
+		static string ConvertToValidNameWithSpecialUnderscoreHandling(string id, Func<char, char> firstCharFunc, Func<char, char> afterUnderscoreLetter)
+		{
+			var sb = new StringBuilder();
+			bool first = true;
+			for (int i = 0; i < id.Length; i++) {
+				char ch = id[i];
+				if (first && char.IsLetter(ch)) {
+					sb.Append(firstCharFunc(ch));
+					first = false;
+					continue;
+				}
+				if (ch == '_') {
+					if (first)
+						continue;
+					if (i + 1 < id.Length && id[i + 1] == '_')
+						continue;
+					sb.Append('_');
+					i++;
+					if (i < id.Length)
+						sb.Append(afterUnderscoreLetter (id[i]));
+					continue;
+				}
+				sb.Append(ch);
+			}
+			return sb.ToString();
+		}
+
+		static string CamelCaseIdentifier(string id)
+		{
+			return ConvertToValidName(id, ch => char.ToLower(ch), ch => char.ToUpper (ch));
+		}
+
+		static string CamelCaseWithLowerLetterUnderscore(string id)
+		{
+			return ConvertToValidNameWithSpecialUnderscoreHandling(id, ch => char.ToLower(ch), ch => char.ToLower(ch));
+		}
+
+		static string CamelCaseWithUpperLetterUnderscore(string id)
+		{
+			return ConvertToValidNameWithSpecialUnderscoreHandling(id, ch => char.ToLower(ch), ch => char.ToUpper(ch));
+		}
+
+		static string PascalCaseIdentifier(string id)
+		{
+			return ConvertToValidName(id, ch => char.ToUpper(ch), ch => char.ToUpper (ch));
+		}
+
+		static string PascalCaseWithLowerLetterUnderscore(string id)
+		{
+			return ConvertToValidNameWithSpecialUnderscoreHandling(id, ch => char.ToUpper(ch), ch => char.ToLower (ch));
+		}
+
+		static string PascalCaseWithUpperLetterUnderscore(string id)
+		{
+			return ConvertToValidNameWithSpecialUnderscoreHandling(id, ch => char.ToUpper(ch), ch => char.ToUpper(ch));
+		}
+
+		static string LowerCaseIdentifier(List<string> words)
+		{
+			var sb = new StringBuilder();
+			sb.Append(words [0].ToLower());
+			for (int i = 1; i < words.Count; i++) {
+				sb.Append('_');
+				sb.Append(words [i].ToLower());
+			}
+			return sb.ToString();
+		}
+
+		static string UpperCaseIdentifier(List<string> words)
+		{
+			var sb = new StringBuilder();
+			sb.Append(words [0].ToUpper());
+			for (int i = 1; i < words.Count; i++) {
+				sb.Append('_');
+				sb.Append(words [i].ToUpper());
+			}
+			return sb.ToString();
+		}
+
+		static string FirstUpperIdentifier(List<string> words)
+		{
+			var sb = new StringBuilder();
+			AppendCapitalized(words [0], sb);
+			for (int i = 1; i < words.Count; i++) {
+				sb.Append('_');
+				sb.Append(words [i].ToLower());
+			}
+			return sb.ToString();
+		}
+
+		static void AppendCapitalized(string word, StringBuilder sb)
+		{
+			sb.Append(word.ToLower());
+			sb [sb.Length - word.Length] = char.ToUpper(sb [sb.Length - word.Length]);
+		}
+
+		static bool CheckUnderscore(string id, UnderscoreHandling handling)
+		{
+			for (int i = 1; i < id.Length; i++) {
+				char ch = id [i];
+				if (ch == '_' && !HandleUnderscore(handling, id, ref i))
+					return false;
+			}
+			return true;
+		}
+
+		enum UnderscoreHandling {
+			Forbid,
+			Allow,
+			AllowWithLowerStartingLetter,
+			AllowWithUpperStartingLetter
+		}
+
+		static bool HandleUnderscore(UnderscoreHandling handling, string id, ref int i)
+		{
+			switch (handling) {
+				case UnderscoreHandling.Forbid:
+				if (i + 1 < id.Length) {
+					char ch = id [i + 1];
+					if (char.IsDigit(ch)) {
+						i++;
+						return true;
+					}
+				}
+				return false;
+				case UnderscoreHandling.Allow:
+				return true;
+				case UnderscoreHandling.AllowWithLowerStartingLetter:
+				if (i + 1 < id.Length) {
+					char ch = id [i + 1];
+					if (char.IsLetter(ch) && !char.IsLower(ch) || ch =='_')
+						return false;
+					i++;
+				}
+				return true;
+				case UnderscoreHandling.AllowWithUpperStartingLetter:
+				if (i + 1 < id.Length) {
+					char ch = id [i + 1];
+					if (char.IsLetter(ch) && !char.IsUpper(ch) || ch =='_')
+						return false;
+					i++;
+				}
+				return true;
+				default:
+				throw new ArgumentOutOfRangeException();
+			}
+		}
+
+		internal class NamePropsalStrategy : RefactoringEssentials.INameProposalStrategy
+		{
+			static readonly char[] s_underscoreCharArray = new[] { '_' };
+			static readonly CultureInfo EnUSCultureInfo = new CultureInfo("en-US");
+
+			string DefaultGetNameProposal(string baseName, SyntaxKind syntaxKindHint, Document document, int position)
+			{
+				switch (syntaxKindHint)
+				{
+					case SyntaxKind.ClassDeclaration:
+					case SyntaxKind.StructDeclaration:
+					case SyntaxKind.InterfaceDeclaration:
+					case SyntaxKind.EnumDeclaration:
+					case SyntaxKind.DelegateDeclaration:
+					case SyntaxKind.MethodDeclaration:
+					case SyntaxKind.PropertyDeclaration:
+					case SyntaxKind.EventDeclaration:
+					case SyntaxKind.EventFieldDeclaration:
+					case SyntaxKind.EnumMemberDeclaration:
+
+					// Trim leading underscores
+					var newBaseName = baseName.TrimStart(s_underscoreCharArray);
+
+					// Trim leading "m_"
+					if (newBaseName.Length >= 2 && newBaseName[0] == 'm' && newBaseName[1] == '_')
+					{
+						newBaseName = newBaseName.Substring(2);
+					}
+
+					// Take original name if no characters left
+					if (newBaseName.Length == 0)
+					{
+						newBaseName = baseName;
+					}
+
+					// Make the first character upper case using the "en-US" culture.  See discussion at
+					// https://github.com/dotnet/roslyn/issues/5524.
+					var firstCharacter = EnUSCultureInfo.TextInfo.ToUpper(newBaseName[0]);
+					return firstCharacter.ToString() + newBaseName.Substring(1);
+
+					case SyntaxKind.Parameter:
+					case SyntaxKind.FieldDeclaration:
+					case SyntaxKind.VariableDeclaration:
+					case SyntaxKind.LocalDeclarationStatement:
+					return char.ToLower(baseName[0]).ToString() + baseName.Substring(1);
+				}
+				return baseName;
+			}
+
+			public string GetNameProposal(string baseName, SyntaxKind syntaxKindHint, Accessibility accessibility, bool isStatic, Document document, int position)
+			{
+				var container = PolicyService.DefaultPolicies;
+				var project = TypeSystemService.GetMonoProject (document.Id);
+				if (project == null)
+					project = IdeApp.ProjectOperations.CurrentSelectedProject;
+				if (project != null)
+					container = project.Policies;
+				var policy = container.Get<NameConventionPolicy> ();
+				var entity = GetAffectedEntity (syntaxKindHint);
+
+				var mod = Modifiers.None;
+				switch (accessibility) {
+				case Accessibility.Private:
+					mod = Modifiers.Private;
+					break;
+				case Accessibility.ProtectedAndInternal:
+					mod = Modifiers.Internal | Modifiers.Protected;
+					break;
+				case Accessibility.Protected:
+					mod = Modifiers.Protected;
+					break;
+				case Accessibility.Internal:
+					mod = Modifiers.Internal;
+					break;
+				case Accessibility.ProtectedOrInternal:
+					mod = Modifiers.Internal | Modifiers.Protected;
+					break;
+				case Accessibility.Public:
+					mod = Modifiers.Public;
+					break;
+				}
+
+				foreach (var rule in policy.Rules) {
+					if ((rule.AffectedEntity & entity) != entity)
+						continue;
+					if (isStatic && !rule.IncludeStaticEntities)
+						continue;
+					if ((rule.VisibilityMask & mod) != mod)
+						continue;
+					return rule.CorrectName (baseName);
+				}
+
+				return DefaultGetNameProposal (baseName, syntaxKindHint, document, position);
+			}
+
+			AffectedEntity GetAffectedEntity (SyntaxKind syntaxKindHint)
+			{
+				switch (syntaxKindHint) {
+				case SyntaxKind.ClassDeclaration:
+					return AffectedEntity.Class;
+				case SyntaxKind.StructDeclaration:
+					return AffectedEntity.Struct;
+				case SyntaxKind.InterfaceDeclaration:
+					return AffectedEntity.Interface;
+				case SyntaxKind.EnumDeclaration:
+					return AffectedEntity.Enum;
+				case SyntaxKind.DelegateDeclaration:
+					return AffectedEntity.Delegate;
+				case SyntaxKind.MethodDeclaration:
+					return AffectedEntity.Method;
+				case SyntaxKind.PropertyDeclaration:
+					return AffectedEntity.Property;
+				case SyntaxKind.EventDeclaration:
+					return AffectedEntity.Event;
+				case SyntaxKind.EventFieldDeclaration:
+					return AffectedEntity.Event;
+				case SyntaxKind.EnumMemberDeclaration:
+					return AffectedEntity.EnumMember;
+				case SyntaxKind.Parameter:
+					return AffectedEntity.Parameter;
+				case SyntaxKind.FieldDeclaration:
+					return AffectedEntity.Field;
+				case SyntaxKind.VariableDeclaration:
+					return AffectedEntity.LocalVariable;
+				case SyntaxKind.LocalDeclarationStatement:
+					return AffectedEntity.LocalVariable;
+				}
+				return AffectedEntity.None;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/MonoTODO/MonoTODODiagnosticAnalyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/MonoTODO/MonoTODODiagnosticAnalyzer.cs
new file mode 100644
index 0000000000..ad7f68ea93
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/MonoTODO/MonoTODODiagnosticAnalyzer.cs
@@ -0,0 +1,105 @@
+//
+// MonoTODODiagnosticAnalyzer.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+using MonoDevelop.Ide.TypeSystem;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.Diagnostics.MonoTODODiagnostic
+{
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	sealed class MonoTODODiagnosticAnalyzer : DiagnosticAnalyzer
+	{
+		static readonly ImmutableArray<SyntaxKind> syntaxKindsOfInterest = ImmutableArray.Create(
+			SyntaxKind.IdentifierName,                // foo
+			SyntaxKind.SimpleMemberAccessExpression,  // foo.bar
+			SyntaxKind.PointerMemberAccessExpression, // foo->bar
+			SyntaxKind.ConditionalAccessExpression    // foo?.bar
+		);
+
+		static readonly DiagnosticDescriptor descriptor = new DiagnosticDescriptor(
+			IDEDiagnosticIds.MonoTODODiagnosticDiagnosticId,
+			"Find usages of mono todo items",
+			"{0}",
+			DiagnosticAnalyzerCategories.Notifications,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true);
+
+		public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics {
+			get {
+				return ImmutableArray.Create(descriptor);
+			}
+		}
+
+		public override void Initialize(AnalysisContext context)
+		{
+			context.RegisterSyntaxNodeAction(
+				(nodeContext) => {
+					Diagnostic diagnostic;
+					if (TryFindMonoTODO(nodeContext.SemanticModel, nodeContext.Node, out diagnostic, nodeContext.CancellationToken))
+						nodeContext.ReportDiagnostic (diagnostic);
+				},
+				syntaxKindsOfInterest);
+		}
+
+		static readonly Dictionary<string, string> attributes = new Dictionary<string, string> {
+			{ "MonoTODOAttribute", "Mono TODO" },
+			{ "MonoNotSupportedAttribute", "Mono NOT SUPPORTED" },
+			{ "MonoLimitationAttribute", "Mono LIMITATION" }
+		};
+
+		bool TryFindMonoTODO (SemanticModel semanticModel, SyntaxNode node, out Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			var info = semanticModel.GetSymbolInfo (node);
+			diagnostic = default(Diagnostic);
+			if (info.Symbol == null || semanticModel.IsFromGeneratedCode (cancellationToken))
+				return false;
+
+			foreach (var attr in info.Symbol.GetAttributes ()) {
+				if (attr.AttributeClass.ContainingNamespace.GetFullName () != "System")
+					continue;
+				string val;
+				if (attributes.TryGetValue (attr.AttributeClass.Name, out val)) {
+					string msg = null;
+					if (attr.ConstructorArguments.Length > 0) {
+						var arg = attr.ConstructorArguments [0];
+						msg = arg.Value != null ? arg.Value.ToString () : null;
+					}
+					var tree = semanticModel.SyntaxTree;
+					diagnostic = Diagnostic.Create(descriptor, tree.GetLocation(node.Span), string.IsNullOrEmpty (msg) ? val : val + ": " + msg);
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/CSharpRemoveUnnecessaryCastDiagnosticAnalyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/CSharpRemoveUnnecessaryCastDiagnosticAnalyzer.cs
new file mode 100644
index 0000000000..dcb06caf87
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/CSharpRemoveUnnecessaryCastDiagnosticAnalyzer.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Diagnostics.RemoveUnnecessaryCast
+{
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	internal sealed class CSharpRemoveUnnecessaryCastDiagnosticAnalyzer : RemoveUnnecessaryCastDiagnosticAnalyzerBase<SyntaxKind>
+	{
+		private static readonly ImmutableArray<SyntaxKind> s_kindsOfInterest = ImmutableArray.Create(SyntaxKind.CastExpression);
+
+		public override ImmutableArray<SyntaxKind> SyntaxKindsOfInterest
+		{
+			get
+			{
+				return s_kindsOfInterest;
+			}
+		}
+
+		protected override bool IsUnnecessaryCast(SemanticModel model, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var cast = (CastExpressionSyntax)node;
+			return cast.IsUnnecessaryCast(model, cancellationToken);
+		}
+
+		protected override TextSpan GetDiagnosticSpan(SyntaxNode node)
+		{
+			var cast = (CastExpressionSyntax)node;
+			return TextSpan.FromBounds(cast.OpenParenToken.SpanStart, cast.CloseParenToken.Span.End);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/RemoveUnnecessaryCastDiagnosticAnalyzerBase.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/RemoveUnnecessaryCastDiagnosticAnalyzerBase.cs
new file mode 100644
index 0000000000..350c09e970
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryCast/RemoveUnnecessaryCastDiagnosticAnalyzerBase.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.Diagnostics.RemoveUnnecessaryCast
+{
+	internal abstract class RemoveUnnecessaryCastDiagnosticAnalyzerBase<TLanguageKindEnum> : DiagnosticAnalyzer where TLanguageKindEnum : struct
+	{
+		private static string s_localizableTitle = GettextCatalog.GetString ("Remove Unnecessary Cast");
+		private static string s_localizableMessage = GettextCatalog.GetString ("Cast is redundant.");
+
+		private static readonly DiagnosticDescriptor s_descriptor = new DiagnosticDescriptor(IDEDiagnosticIds.RemoveUnnecessaryCastDiagnosticId,
+			s_localizableTitle,
+			s_localizableMessage,
+			DiagnosticAnalyzerCategories.RedundanciesInCode,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true,
+			customTags: DiagnosticCustomTags.Unnecessary);
+
+		#region Interface methods
+
+		public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
+		{
+			get
+			{
+				return ImmutableArray.Create(s_descriptor);
+			}
+		}
+
+		public override void Initialize(AnalysisContext context)
+		{
+			context.RegisterSyntaxNodeAction(
+				(nodeContext) =>
+				{
+					Diagnostic diagnostic;
+					if (TryRemoveCastExpression(nodeContext.SemanticModel, nodeContext.Node, out diagnostic, nodeContext.CancellationToken))
+					{
+						nodeContext.ReportDiagnostic(diagnostic);
+					}
+				},
+				this.SyntaxKindsOfInterest.ToArray());
+		}
+
+		public abstract ImmutableArray<TLanguageKindEnum> SyntaxKindsOfInterest { get; }
+
+		#endregion
+
+		protected abstract bool IsUnnecessaryCast(SemanticModel model, SyntaxNode node, CancellationToken cancellationToken);
+		protected abstract TextSpan GetDiagnosticSpan(SyntaxNode node);
+
+		private bool TryRemoveCastExpression(
+			SemanticModel model, SyntaxNode node, out Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			diagnostic = default(Diagnostic);
+			if (model.IsFromGeneratedCode (cancellationToken))
+				return false;
+			if (!IsUnnecessaryCast(model, node, cancellationToken))
+			{
+				return false;
+			}
+
+			var tree = model.SyntaxTree;
+			var span = GetDiagnosticSpan(node);
+			if (tree.OverlapsHiddenPosition(span, cancellationToken))
+			{
+				return false;
+			}
+
+			diagnostic = Diagnostic.Create(s_descriptor, tree.GetLocation(span));
+			return true;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer.cs
new file mode 100644
index 0000000000..30c1046d09
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.RemoveUnnecessaryImports;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CSharp.Diagnostics.RemoveUnnecessaryImports
+{
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	internal sealed class CSharpRemoveUnnecessaryImportsDiagnosticAnalyzer : RemoveUnnecessaryImportsDiagnosticAnalyzerBase
+	{
+		private static readonly string s_TitleAndMessageFormat = GettextCatalog.GetString ("Using directive is unnecessary.");
+
+		protected override LocalizableString GetTitleAndMessageFormatForClassificationIdDescriptor()
+		{
+			return s_TitleAndMessageFormat;
+		}
+
+		protected override IEnumerable<SyntaxNode> GetUnnecessaryImports(SemanticModel semanticModel, SyntaxNode root, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return CSharpRemoveUnnecessaryImportsService.GetUnnecessaryImports(semanticModel, root, cancellationToken);
+		}
+
+		protected override IEnumerable<TextSpan> GetFixableDiagnosticSpans(IEnumerable<SyntaxNode> nodes, SyntaxTree tree, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			//var nodesContainingUnnecessaryUsings = new HashSet<SyntaxNode>();
+			foreach (var node in nodes) {
+				yield return node.Span;
+//				var nodeContainingUnnecessaryUsings = node.GetAncestors().First(n => n is NamespaceDeclarationSyntax || n is CompilationUnitSyntax);
+//				if (!nodesContainingUnnecessaryUsings.Add(nodeContainingUnnecessaryUsings))
+//				{
+//					continue;
+//				}
+//
+//				yield return nodeContainingUnnecessaryUsings is NamespaceDeclarationSyntax ?
+//					((NamespaceDeclarationSyntax)nodeContainingUnnecessaryUsings).Usings.GetContainedSpan() :
+//					((CompilationUnitSyntax)nodeContainingUnnecessaryUsings).Usings.GetContainedSpan();
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/RemoveUnnecessaryImportsDiagnosticAnalyzerBase.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/RemoveUnnecessaryImportsDiagnosticAnalyzerBase.cs
new file mode 100644
index 0000000000..338c130b6f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/RemoveUnnecessaryImports/RemoveUnnecessaryImportsDiagnosticAnalyzerBase.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.Diagnostics.RemoveUnnecessaryImports
+{
+	internal abstract class RemoveUnnecessaryImportsDiagnosticAnalyzerBase : DiagnosticAnalyzer
+	{
+		// NOTE: This is a trigger diagnostic, which doesn't show up in the ruleset editor and hence doesn't need a conventional IDE Diagnostic ID string.
+		internal const string DiagnosticFixableId = "RemoveUnnecessaryImportsFixable";
+
+		// The NotConfigurable custom tag ensures that user can't turn this diagnostic into a warning / error via
+		// ruleset editor or solution explorer. Setting messageFormat to empty string ensures that we won't display
+		// this diagnostic in the preview pane header.
+		//private static readonly DiagnosticDescriptor s_fixableIdDescriptor =
+		//	new DiagnosticDescriptor(DiagnosticFixableId,
+		//		title: "", messageFormat: "", category: "",
+		//		defaultSeverity: DiagnosticSeverity.Hidden,
+		//		isEnabledByDefault: true,
+		//		customTags: WellKnownDiagnosticTags.NotConfigurable);
+
+		protected abstract LocalizableString GetTitleAndMessageFormatForClassificationIdDescriptor();
+
+		private DiagnosticDescriptor _classificationIdDescriptor;
+		private DiagnosticDescriptor GetClassificationIdDescriptor()
+		{
+			if (_classificationIdDescriptor == null)
+			{
+				var titleAndMessageFormat = GetTitleAndMessageFormatForClassificationIdDescriptor();
+				_classificationIdDescriptor =
+					new DiagnosticDescriptor(IDEDiagnosticIds.RemoveUnnecessaryImportsDiagnosticId,
+						titleAndMessageFormat,
+						titleAndMessageFormat,
+						DiagnosticAnalyzerCategories.RedundanciesInCode,
+						DiagnosticSeverity.Warning,
+						isEnabledByDefault: true,
+						customTags: DiagnosticCustomTags.Unnecessary);
+			}
+
+			return _classificationIdDescriptor;
+		}
+
+		private ImmutableArray<DiagnosticDescriptor> _descriptors;
+		public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
+		{
+			get
+			{
+				if (_descriptors == null)
+				{
+					_descriptors = ImmutableArray.Create(GetClassificationIdDescriptor());
+				}
+
+				return _descriptors;
+			}
+		}
+
+		public override void Initialize(AnalysisContext context)
+		{
+			context.RegisterSemanticModelAction(this.AnalyzeSemanticModel);
+		}
+
+		private void AnalyzeSemanticModel(SemanticModelAnalysisContext context)
+		{
+			if (context.IsFromGeneratedCode ())
+				return;
+			var tree = context.SemanticModel.SyntaxTree;
+			var root = tree.GetRoot();
+			var unncessaryImports = GetUnnecessaryImports(context.SemanticModel, root);
+			if (unncessaryImports != null && unncessaryImports.Any())
+			{
+				Func<SyntaxNode, SyntaxToken> getLastTokenFunc = GetLastTokenDelegateForContiguousSpans();
+				var contiguousSpans = unncessaryImports.GetContiguousSpans(getLastTokenFunc);
+				var diagnostics = CreateClassificationDiagnostics(contiguousSpans, tree).Concat(
+					CreateFixableDiagnostics(unncessaryImports, tree));
+				var spans = new List<TextSpan> ();
+				foreach (var diagnostic in diagnostics)
+				{
+					if (spans.Any (s => s.OverlapsWith (diagnostic.Location.SourceSpan)))
+						continue;
+					spans.Add (diagnostic.Location.SourceSpan);
+					context.ReportDiagnostic(diagnostic);
+				}
+			}
+		}
+
+		protected abstract IEnumerable<SyntaxNode> GetUnnecessaryImports(SemanticModel semanticModel, SyntaxNode root, CancellationToken cancellationToken = default(CancellationToken));
+		protected virtual Func<SyntaxNode, SyntaxToken> GetLastTokenDelegateForContiguousSpans()
+		{
+			return null;
+		}
+
+		// Create one diagnostic for each unnecessary span that will be classified as Unnecessary
+		private IEnumerable<Diagnostic> CreateClassificationDiagnostics(IEnumerable<TextSpan> contiguousSpans, SyntaxTree tree, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			foreach (var span in contiguousSpans)
+			{
+				if (tree.OverlapsHiddenPosition(span, cancellationToken))
+				{
+					continue;
+				}
+
+				yield return Diagnostic.Create(GetClassificationIdDescriptor(), tree.GetLocation(span));
+			}
+		}
+
+		protected abstract IEnumerable<TextSpan> GetFixableDiagnosticSpans(IEnumerable<SyntaxNode> nodes, SyntaxTree tree, CancellationToken cancellationToken = default(CancellationToken));
+
+		private IEnumerable<Diagnostic> CreateFixableDiagnostics(IEnumerable<SyntaxNode> nodes, SyntaxTree tree, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var spans = GetFixableDiagnosticSpans(nodes, tree, cancellationToken);
+			foreach (var span in spans) {
+				yield return Diagnostic.Create(GetClassificationIdDescriptor(), tree.GetLocation(span));
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/CSharpSimplifyTypeNamesDiagnosticAnalyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/CSharpSimplifyTypeNamesDiagnosticAnalyzer.cs
new file mode 100644
index 0000000000..a072a3f630
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/CSharpSimplifyTypeNamesDiagnosticAnalyzer.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.Diagnostics.SimplifyTypeNames
+{
+	[DiagnosticAnalyzer(LanguageNames.CSharp)]
+	internal sealed class CSharpSimplifyTypeNamesDiagnosticAnalyzer : SimplifyTypeNamesDiagnosticAnalyzerBase<SyntaxKind>
+	{
+		private static readonly ImmutableArray<SyntaxKind> s_kindsOfInterest = ImmutableArray.Create(SyntaxKind.QualifiedName,
+			SyntaxKind.AliasQualifiedName,
+			SyntaxKind.GenericName,
+			SyntaxKind.IdentifierName,
+			SyntaxKind.SimpleMemberAccessExpression,
+			SyntaxKind.QualifiedCref);
+
+		public override void Initialize(AnalysisContext analysisContext)
+		{
+			analysisContext.RegisterSyntaxNodeAction(AnalyzeNode, s_kindsOfInterest.ToArray());
+		}
+
+		protected override void AnalyzeNode(SyntaxNodeAnalysisContext context)
+		{
+			if (context.IsFromGeneratedCode ())
+				return;
+			if (context.Node.Ancestors(ascendOutOfTrivia: false).Any(n => s_kindsOfInterest.Contains(n.Kind())))
+			{
+				// Already simplified an ancestor of this node.
+				return;
+			}
+
+			Diagnostic diagnostic;
+			Func<SyntaxNode, bool> descendIntoChildren = n =>
+			{
+				if (!IsRegularCandidate(n) ||
+					!TrySimplifyTypeNameExpression(context.SemanticModel, n, context.Options, out diagnostic, context.CancellationToken))
+				{
+					return true;
+				}
+				context.ReportDiagnostic(diagnostic);
+				return false;
+			};
+
+			// find regular node first - search from top to down. once found one, don't get into its children
+			foreach (var candidate in context.Node.DescendantNodesAndSelf(descendIntoChildren))
+			{
+				context.CancellationToken.ThrowIfCancellationRequested();
+			}
+
+			// now search structure trivia
+			foreach (var candidate in context.Node.DescendantNodesAndSelf(descendIntoChildren: n => !IsCrefCandidate(n), descendIntoTrivia: true))
+			{
+				context.CancellationToken.ThrowIfCancellationRequested();
+
+				if (IsCrefCandidate(candidate) &&
+					TrySimplifyTypeNameExpression(context.SemanticModel, candidate, context.Options, out diagnostic, context.CancellationToken))
+				{
+					context.ReportDiagnostic(diagnostic);
+				}
+			}
+		}
+
+		internal static bool IsCandidate(SyntaxNode node)
+		{
+			return IsRegularCandidate(node) || IsCrefCandidate(node);
+		}
+
+		private static bool IsRegularCandidate(SyntaxNode node)
+		{
+			return node != null && s_kindsOfInterest.Contains(node.Kind());
+		}
+
+		private static bool IsCrefCandidate(SyntaxNode node)
+		{
+			return node is QualifiedCrefSyntax;
+		}
+
+		protected sealed override bool CanSimplifyTypeNameExpressionCore(SemanticModel model, SyntaxNode node, OptionSet optionSet, out TextSpan issueSpan, out string diagnosticId, CancellationToken cancellationToken)
+		{
+			return CanSimplifyTypeNameExpression(model, node, optionSet, out issueSpan, out diagnosticId, cancellationToken);
+		}
+
+		internal static bool CanSimplifyTypeNameExpression(SemanticModel model, SyntaxNode node, OptionSet optionSet, out TextSpan issueSpan, out string diagnosticId, CancellationToken cancellationToken)
+		{
+			issueSpan = default(TextSpan);
+			diagnosticId = IDEDiagnosticIds.SimplifyNamesDiagnosticId;
+
+			// For Crefs, currently only Qualified Crefs needs to be handled separately
+			if (node.Kind() == SyntaxKind.QualifiedCref)
+			{
+				if (node.ContainsDiagnostics)
+				{
+					return false;
+				}
+
+				var crefSyntax = (CrefSyntax)node;
+
+				CrefSyntax replacementNode;
+				if (!crefSyntax.TryReduceOrSimplifyExplicitName (model, out replacementNode, out issueSpan, optionSet, cancellationToken))
+				{
+					return false;
+				}
+			}
+			else
+			{
+				var expression = (ExpressionSyntax)node;
+				if (expression.ContainsDiagnostics)
+				{
+					return false;
+				}
+
+				// in case of an As or Is expression we need to handle the binary expression, because it might be 
+				// required to add parenthesis around the expression. Adding the parenthesis is done in the CSharpNameSimplifier.Rewriter
+				var expressionToCheck = expression.Kind() == SyntaxKind.AsExpression || expression.Kind() == SyntaxKind.IsExpression
+					? ((BinaryExpressionSyntax)expression).Right
+					: expression;
+
+				ExpressionSyntax replacementSyntax;
+				if (!expressionToCheck.TryReduceOrSimplifyExplicitName(model, out replacementSyntax, out issueSpan, optionSet, cancellationToken))
+				{
+					return false;
+				}
+
+				if (expression.Kind() == SyntaxKind.SimpleMemberAccessExpression)
+				{
+					var memberAccess = (MemberAccessExpressionSyntax)expression;
+					diagnosticId = memberAccess.Expression.Kind() == SyntaxKind.ThisExpression ?
+						IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId :
+						IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId;
+				}
+			}
+
+			return true;
+		}
+
+		protected override string GetLanguageName()
+		{
+			return LanguageNames.CSharp;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/SimplifyTypeNamesDiagnosticAnalyzerBase.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/SimplifyTypeNamesDiagnosticAnalyzerBase.cs
new file mode 100644
index 0000000000..6734509864
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Diagnostics/SimplifyTypeNames/SimplifyTypeNamesDiagnosticAnalyzerBase.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.TypeSystem;
+using System;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CSharp.Diagnostics.SimplifyTypeNames
+{
+	internal abstract class SimplifyTypeNamesDiagnosticAnalyzerBase<TLanguageKindEnum> : DiagnosticAnalyzer where TLanguageKindEnum : struct
+	{
+		private static string s_localizableMessage = GettextCatalog.GetString ("Name can be simplified.");
+		private static string s_localizableTitleSimplifyNames = GettextCatalog.GetString ("Simplify Names");
+
+		private static readonly DiagnosticDescriptor s_descriptorSimplifyNames = new DiagnosticDescriptor(IDEDiagnosticIds.SimplifyNamesDiagnosticId,
+			s_localizableTitleSimplifyNames,
+			s_localizableMessage,
+			DiagnosticAnalyzerCategories.RedundanciesInCode,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true,
+			customTags: DiagnosticCustomTags.Unnecessary);
+
+		private static string s_localizableTitleSimplifyMemberAccess = GettextCatalog.GetString ("Simplify member access '{0}'");
+		private static readonly DiagnosticDescriptor s_descriptorSimplifyMemberAccess = new DiagnosticDescriptor(IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId,
+			s_localizableTitleSimplifyMemberAccess,
+			s_localizableMessage,
+			DiagnosticAnalyzerCategories.RedundanciesInCode,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true,
+			customTags: DiagnosticCustomTags.Unnecessary);
+
+		private static string s_localizableTitleSimplifyThisOrMe = GettextCatalog.GetString ("Remove 'this'");
+		private static readonly DiagnosticDescriptor s_descriptorSimplifyThisOrMe = new DiagnosticDescriptor(IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId,
+			s_localizableTitleSimplifyThisOrMe,
+			s_localizableMessage,
+			DiagnosticAnalyzerCategories.RedundanciesInCode,
+			DiagnosticSeverity.Warning,
+			isEnabledByDefault: true,
+			customTags: DiagnosticCustomTags.Unnecessary);
+
+
+		public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
+		{
+			get
+			{
+				return ImmutableArray.Create(s_descriptorSimplifyNames, s_descriptorSimplifyMemberAccess, s_descriptorSimplifyThisOrMe);
+			}
+		}
+
+		protected abstract void AnalyzeNode(SyntaxNodeAnalysisContext context);
+
+		protected abstract bool CanSimplifyTypeNameExpressionCore(SemanticModel model, SyntaxNode node, OptionSet optionSet, out TextSpan issueSpan, out string diagnosticId, CancellationToken cancellationToken);
+
+		private OptionSet GetOptionSet(AnalyzerOptions analyzerOptions)
+		{
+			return TypeSystemService.Workspace.Options;
+		}
+
+		protected abstract string GetLanguageName();
+
+		protected bool TrySimplifyTypeNameExpression(SemanticModel model, SyntaxNode node, AnalyzerOptions analyzerOptions, out Diagnostic diagnostic, CancellationToken cancellationToken)
+		{
+			diagnostic = default(Diagnostic);
+
+			var optionSet = GetOptionSet(analyzerOptions);
+			string diagnosticId;
+
+			TextSpan issueSpan;
+			if (!CanSimplifyTypeNameExpressionCore(model, node, optionSet, out issueSpan, out diagnosticId, cancellationToken))
+			{
+				return false;
+			}
+
+			if (model.SyntaxTree.OverlapsHiddenPosition(issueSpan, cancellationToken))
+			{
+				return false;
+			}
+
+			DiagnosticDescriptor descriptor;
+			switch (diagnosticId)
+			{
+			case IDEDiagnosticIds.SimplifyNamesDiagnosticId:
+				descriptor = s_descriptorSimplifyNames;
+				break;
+
+			case IDEDiagnosticIds.SimplifyMemberAccessDiagnosticId:
+				descriptor = s_descriptorSimplifyMemberAccess;
+				break;
+
+			case IDEDiagnosticIds.SimplifyThisOrMeDiagnosticId:
+				descriptor = s_descriptorSimplifyThisOrMe;
+				break;
+
+			default:
+				throw new InvalidOperationException();
+			}
+
+			var tree = model.SyntaxTree;
+			diagnostic = Diagnostic.Create(descriptor, tree.GetLocation(issueSpan));
+			return true;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/AbstractTokenBraceCompletionSession.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/AbstractTokenBraceCompletionSession.cs
new file mode 100644
index 0000000000..5c49eba0b2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/AbstractTokenBraceCompletionSession.cs
@@ -0,0 +1,162 @@
+//
+// AbstractTokenBraceCompletionSession.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	abstract class AbstractTokenBraceCompletionSession : EditSession, ICheckPointEditSession
+	{
+		DocumentContext ctx;
+
+		public Document Document { get { return ctx.AnalysisDocument; } }
+
+		public SyntaxTree CurrentSnapshot {
+			get {
+				return ctx.AnalysisDocument.GetSyntaxTreeAsync ().Result;
+			}
+		}
+
+		protected int OpeningTokenKind { get; }
+		protected int ClosingTokenKind { get; }
+
+		readonly char closingChar;
+
+		protected AbstractTokenBraceCompletionSession (DocumentContext ctx,
+		                                               int openingTokenKind, int closingTokenKind, char ch)
+		{
+			this.closingChar = ch;
+			this.ctx = ctx;
+			this.OpeningTokenKind = openingTokenKind;
+			this.ClosingTokenKind = closingTokenKind;
+		}
+	
+		public virtual bool CheckOpeningPoint(TextEditor editor, DocumentContext ctx, CancellationToken cancellationToken)
+		{
+			var snapshot = CurrentSnapshot;
+			var position = StartOffset;
+			var token = FindToken(snapshot, position, cancellationToken);
+
+			if (!IsValidToken(token))
+			{
+				return false;
+			}
+
+			return token.RawKind == OpeningTokenKind && token.SpanStart == position;
+		}
+
+
+		protected override void OnEditorSet ()
+		{
+			this.startOffset = Editor.CaretOffset - 1;
+			this.endOffset = startOffset + 2;
+		}
+
+		public override void BeforeType (char ch, out bool handledCommand)
+		{
+			handledCommand = false;
+			if (!CheckIsValid() || ch != this.closingChar) {
+				return;
+			}
+			if (AllowOverType (default(CancellationToken))) {
+				Editor.CaretOffset++;
+				this.endOffset = this.startOffset = 0;
+				handledCommand = true;
+				Editor.EndSession ();
+			}
+		}
+
+		public override void AfterBackspace ()
+		{
+			if (Editor.CaretOffset == StartOffset) {
+				Editor.EndSession ();
+			}
+		}
+
+		public override void AfterDelete ()
+		{
+			if (Editor.CaretOffset - 1 == StartOffset) {
+				Editor.EndSession ();
+			}
+		}
+
+		protected bool IsValidToken(SyntaxToken token)
+		{
+			return token.Parent != null && !(token.Parent is SkippedTokensTriviaSyntax);
+		}
+
+		public virtual void AfterStart(CancellationToken cancellationToken)
+		{
+		}
+
+		public virtual void AfterReturn(CancellationToken cancellationToken)
+		{
+		}
+
+		public virtual bool AllowOverType(CancellationToken cancellationToken)
+		{
+			return CheckCurrentPosition(cancellationToken) && CheckClosingTokenKind(cancellationToken);
+		}
+
+		protected bool CheckClosingTokenKind(CancellationToken cancellationToken)
+		{
+			var document = Document;
+			if (document != null)
+			{
+				var root = document.GetSyntaxRootAsync(cancellationToken).WaitAndGetResult(cancellationToken);
+				var position = EndOffset;
+
+				return root.FindTokenFromEnd(position, includeZeroWidth: false, findInsideTrivia: true).RawKind == this.ClosingTokenKind;
+			}
+
+			return true;
+		}
+
+		protected bool CheckCurrentPosition(CancellationToken cancellationToken)
+		{
+			var document = Document;
+			if (document != null)
+			{
+				// make sure auto closing is called from a valid position
+				var tree = document.GetSyntaxTreeAsync(cancellationToken).WaitAndGetResult(cancellationToken);
+				return !tree.IsInNonUserCode(Editor.CaretOffset, cancellationToken);
+			}
+
+			return true;
+		}
+
+		internal static SyntaxToken FindToken (SyntaxTree snapshot, int position, CancellationToken cancellationToken)
+		{
+			var root = snapshot.GetRootAsync(cancellationToken).WaitAndGetResult(CancellationToken.None);
+			return root.FindToken(position, findInsideTrivia: true);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/CSharpAutoInsertBracketHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/CSharpAutoInsertBracketHandler.cs
new file mode 100644
index 0000000000..9545658e62
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/CSharpAutoInsertBracketHandler.cs
@@ -0,0 +1,170 @@
+//
+// CSharpAutoInsertBracketHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.CSharp.Formatting;
+using MonoDevelop.Ide.TypeSystem;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	class CSharpAutoInsertBracketHandler : AutoInsertBracketHandler
+	{
+		public override bool CanHandle (TextEditor editor)
+		{
+			
+			return editor.MimeType == CSharpFormatter.MimeType;
+		}
+
+		public override bool Handle (TextEditor editor, DocumentContext ctx, KeyDescriptor descriptor)
+		{
+			char closingBrace;
+			if (!IsSupportedOpeningBrace (descriptor.KeyChar, out closingBrace)  || !CheckCodeContext (editor, ctx, editor.CaretOffset - 1, descriptor.KeyChar, default (CancellationToken))  || ctx.AnalysisDocument == null)
+				return false;
+			
+			var session = CreateEditorSession (editor, ctx, editor.CaretOffset, descriptor.KeyChar, default (CancellationToken));
+			session.SetEditor (editor);
+			if (session == null | !((ICheckPointEditSession)session).CheckOpeningPoint (editor, ctx, default (CancellationToken)))
+				return false;
+			using (var undo = editor.OpenUndoGroup ()) {
+				editor.EnsureCaretIsNotVirtual ();
+				editor.InsertAtCaret (closingBrace.ToString ());
+				editor.CaretOffset--;
+				editor.StartSession (session);
+			}
+			return true;
+		}
+
+		protected virtual bool CheckCodeContext(TextEditor editor, DocumentContext ctx, int position, char openingBrace, CancellationToken cancellationToken)
+		{
+			// SPECIAL CASE: Allow in curly braces in string literals to support interpolated strings.
+			if (openingBrace == CurlyBrace.OpenCharacter &&
+			    InterpolationCompletionSession.IsContext(editor, ctx, position, cancellationToken))
+			{
+				return true;
+			}
+
+			if (openingBrace == DoubleQuote.OpenCharacter &&
+			    InterpolatedStringCompletionSession.IsContext(editor, ctx, position, cancellationToken))
+			{
+				return true;
+			}
+		
+			// check that the user is not typing in a string literal or comment
+			var tree = ctx.AnalysisDocument.GetSyntaxTreeAsync(cancellationToken).Result;
+
+			return !tree.IsInNonUserCode(position, cancellationToken);
+		}
+
+		EditSession CreateEditorSession(TextEditor editor, DocumentContext ctx, int openingPosition, char openingBrace, CancellationToken cancellationToken)
+		{
+			switch (openingBrace)
+			{
+				case CurlyBrace.OpenCharacter:
+				return InterpolationCompletionSession.IsContext(editor, ctx, openingPosition, cancellationToken)
+					? (EditSession)new InterpolationCompletionSession()
+						: new CurlyBraceCompletionSession(ctx);
+
+				case DoubleQuote.OpenCharacter:
+				return InterpolatedStringCompletionSession.IsContext(editor, ctx, openingPosition, cancellationToken)
+					? (EditSession)new InterpolatedStringCompletionSession()
+						: new StringLiteralCompletionSession(ctx);
+
+				case Bracket.OpenCharacter: return new BracketCompletionSession(ctx);
+				case Parenthesis.OpenCharacter: return new ParenthesisCompletionSession(ctx);
+				case SingleQuote.OpenCharacter: return new CharLiteralCompletionSession(ctx);
+				case LessAndGreaterThan.OpenCharacter: return new LessAndGreaterThanCompletionSession(ctx);
+			}
+
+			return null;
+		}
+
+
+		protected bool IsSupportedOpeningBrace (char openingBrace, out char closingBrace)
+		{
+			switch (openingBrace) {
+			case Bracket.OpenCharacter:
+				closingBrace = Bracket.CloseCharacter;
+				return true;
+			case CurlyBrace.OpenCharacter:
+				closingBrace = CurlyBrace.CloseCharacter;
+				return true;
+			case Parenthesis.OpenCharacter:
+				closingBrace = Parenthesis.CloseCharacter;
+				return true;
+			case SingleQuote.OpenCharacter:
+				closingBrace = SingleQuote.CloseCharacter;
+				return true;
+			case DoubleQuote.OpenCharacter:
+				closingBrace = DoubleQuote.CloseCharacter;
+				return true;
+			case LessAndGreaterThan.OpenCharacter:
+				closingBrace = LessAndGreaterThan.CloseCharacter;
+				return true;
+			}
+			closingBrace = openingBrace;
+			return false;
+		}
+
+		static class CurlyBrace
+		{
+			public const char OpenCharacter = '{';
+			public const char CloseCharacter = '}';
+		}
+
+		static class Parenthesis
+		{
+			public const char OpenCharacter = '(';
+			public const char CloseCharacter = ')';
+		}
+
+		static class Bracket
+		{
+			public const char OpenCharacter = '[';
+			public const char CloseCharacter = ']';
+		}
+
+		static class LessAndGreaterThan
+		{
+			public const char OpenCharacter = '<';
+			public const char CloseCharacter = '>';
+		}
+
+		static class DoubleQuote
+		{
+			public const char OpenCharacter = '"';
+			public const char CloseCharacter = '"';
+		}
+
+		static class SingleQuote
+		{
+			public const char OpenCharacter = '\'';
+			public const char CloseCharacter = '\'';
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/BracketCompletionSession.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/BracketCompletionSession.cs
new file mode 100644
index 0000000000..97d1fe479d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/BracketCompletionSession.cs
@@ -0,0 +1,42 @@
+//
+// BracketCompletionSession.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	class BracketCompletionSession : AbstractTokenBraceCompletionSession
+	{
+		
+		public BracketCompletionSession(DocumentContext ctx)
+			: base(ctx, (int)SyntaxKind.OpenBracketToken, (int)SyntaxKind.CloseBracketToken, ']')
+		{
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/CharLiteralCompletionSession.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/CharLiteralCompletionSession.cs
new file mode 100644
index 0000000000..cb92a393d8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/CharLiteralCompletionSession.cs
@@ -0,0 +1,47 @@
+//
+// CharLiteralCompletionSession.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	class CharLiteralCompletionSession : AbstractTokenBraceCompletionSession
+	{
+		public CharLiteralCompletionSession(DocumentContext ctx)
+			: base(ctx, (int)SyntaxKind.CharacterLiteralToken, (int)SyntaxKind.CharacterLiteralToken, '\'')
+		{
+		}
+
+		public override bool AllowOverType(CancellationToken cancellationToken)
+		{
+			return true;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/CurlyBraceCompletionSession.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/CurlyBraceCompletionSession.cs
new file mode 100644
index 0000000000..9eda90679b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/CurlyBraceCompletionSession.cs
@@ -0,0 +1,40 @@
+//
+// CurlyBraceCompletionSession.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	internal class CurlyBraceCompletionSession : AbstractTokenBraceCompletionSession
+	{
+		public CurlyBraceCompletionSession(DocumentContext ctx)
+			: base(ctx, (int)SyntaxKind.OpenBraceToken, (int)SyntaxKind.CloseBraceToken, '}')
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/InterpolatedStringCompletionSession.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/InterpolatedStringCompletionSession.cs
new file mode 100644
index 0000000000..fc9b086324
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/InterpolatedStringCompletionSession.cs
@@ -0,0 +1,86 @@
+//
+// InterpolatedStringCompletionSession.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using MonoDevelop.Ide.Editor;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	internal class InterpolatedStringCompletionSession : SkipCharSession, ICheckPointEditSession
+	{
+		public InterpolatedStringCompletionSession() : base ('"')
+		{
+		}
+
+		public bool CheckOpeningPoint(TextEditor editor, DocumentContext ctx, CancellationToken cancellationToken)
+		{
+			var snapshot = ctx.AnalysisDocument.GetSyntaxTreeAsync (cancellationToken).WaitAndGetResult(cancellationToken);
+			var position = editor.CaretOffset - 1;
+			var token = AbstractTokenBraceCompletionSession.FindToken(snapshot, position, cancellationToken);
+
+			return token.IsKind(SyntaxKind.InterpolatedStringStartToken, SyntaxKind.InterpolatedVerbatimStringStartToken)
+				        && token.Span.End - 1 == position;
+		}
+
+		public static bool IsContext(TextEditor editor, DocumentContext ctx, int position, CancellationToken cancellationToken)
+		{
+			// Check to see if we're to the right of an $ or an @$
+			var start = position - 1;
+			if (start < 0)
+			{
+				return false;
+			}
+
+			if (editor[start] == '@')
+			{
+				start--;
+
+				if (start < 0)
+				{
+					return false;
+				}
+			}
+
+			if (editor[start] != '$')
+			{
+				return false;
+			}
+
+			var tree = ctx.AnalysisDocument.GetSyntaxTreeAsync (cancellationToken).WaitAndGetResult(cancellationToken);
+			var token = tree.GetRoot(cancellationToken).FindTokenOnLeftOfPosition(start);
+
+			return tree.IsExpressionContext(start, token, attributes: false, cancellationToken: cancellationToken)
+				       || tree.IsStatementContext(start, token, cancellationToken);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/InterpolationCompletionSession.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/InterpolationCompletionSession.cs
new file mode 100644
index 0000000000..b39b9e42cd
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/InterpolationCompletionSession.cs
@@ -0,0 +1,100 @@
+//
+// InterpolationCompletionSession.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using MonoDevelop.Ide.Editor;
+using Roslyn.Utilities;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	interface ICheckPointEditSession
+	{
+		bool CheckOpeningPoint (TextEditor editor, DocumentContext ctx, CancellationToken cancellationToken);
+	}
+
+	internal class InterpolationCompletionSession : SkipCharSession, ICheckPointEditSession
+	{
+		public InterpolationCompletionSession() : base('}')
+		{
+		}
+
+		public bool CheckOpeningPoint(TextEditor editor, DocumentContext ctx, CancellationToken cancellationToken)
+		{
+			var snapshot = ctx.AnalysisDocument.GetSyntaxTreeAsync (cancellationToken).WaitAndGetResult(cancellationToken);
+			var position = editor.CaretOffset - 1;
+			var token = AbstractTokenBraceCompletionSession.FindToken(snapshot, position, cancellationToken);
+
+			return token.IsKind(SyntaxKind.OpenBraceToken)
+				        && token.SpanStart == position;
+		}
+
+		public static bool IsContext(TextEditor editor, DocumentContext ctx,  int position, CancellationToken cancellationToken)
+		{
+			// First, check to see if the character to the left of the position is an open curly. If it is,
+			// we shouldn't complete because the user may be trying to escape a curly.
+			var index = position - 1;
+			var openCurlyCount = 0;
+			while (index >= 0)
+			{
+				if (editor[index] == '{')
+				{
+					openCurlyCount++;
+				}
+				else
+				{
+					break;
+				}
+
+				index--;
+			}
+
+			if (openCurlyCount > 0 && openCurlyCount % 2 == 1)
+			{
+				return false;
+			}
+
+			// Next, check to see if we're typing in an interpolated string
+			var tree = ctx.AnalysisDocument.GetSyntaxTreeAsync(cancellationToken).WaitAndGetResult(cancellationToken);
+			var token = tree.GetRoot(cancellationToken).FindTokenOnLeftOfPosition(position);
+
+			if (!token.Span.IntersectsWith(position))
+			{
+				return false;
+			}
+
+			return token.IsKind(
+				SyntaxKind.InterpolatedStringStartToken,
+				SyntaxKind.InterpolatedVerbatimStringStartToken,
+				SyntaxKind.InterpolatedStringTextToken,
+				SyntaxKind.InterpolatedStringEndToken);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/LessAndGreaterThanCompletionSession.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/LessAndGreaterThanCompletionSession.cs
new file mode 100644
index 0000000000..370e6d9599
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/LessAndGreaterThanCompletionSession.cs
@@ -0,0 +1,114 @@
+//
+// LessAndGreaterThanCompletionSession.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
+using Roslyn.Utilities;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	internal class LessAndGreaterThanCompletionSession : AbstractTokenBraceCompletionSession, ICheckPointEditSession
+	{
+		public LessAndGreaterThanCompletionSession(DocumentContext ctx)
+			: base(ctx, (int)SyntaxKind.LessThanToken, (int)SyntaxKind.GreaterThanToken, '>')
+		{
+		}
+
+		public override bool CheckOpeningPoint(TextEditor editor, DocumentContext ctx, CancellationToken cancellationToken)
+		{
+			var snapshot = CurrentSnapshot;
+			var position = StartOffset;
+			var token = FindToken(snapshot, position, cancellationToken);
+
+			// check what parser thinks about the newly typed "<" and only proceed if parser thinks it is "<" of 
+			// type argument or parameter list
+			if (!token.CheckParent<TypeParameterListSyntax>(n => n.LessThanToken == token) &&
+			    !token.CheckParent<TypeArgumentListSyntax>(n => n.LessThanToken == token) &&
+			    !PossibleTypeArgument(token, cancellationToken))
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		private bool PossibleTypeArgument(SyntaxToken token, CancellationToken cancellationToken)
+		{
+			var node = token.Parent as BinaryExpressionSyntax;
+
+			// type argument can be easily ambiguous with normal < operations
+			if (node == null || node.Kind() != SyntaxKind.LessThanExpression || node.OperatorToken != token)
+			{
+				return false;
+			}
+
+			// use binding to see whether it is actually generic type or method 
+			var document = Document;
+			if (document == null)
+			{
+				return false;
+			}
+
+			var model = document.GetSemanticModelAsync(cancellationToken).WaitAndGetResult(cancellationToken);
+
+			// Analyze node on the left of < operator to verify if it is a generic type or method.
+			var leftNode = node.Left;
+			if (leftNode is ConditionalAccessExpressionSyntax)
+			{
+				// If node on the left is a conditional access expression, get the member binding expression 
+				// from the innermost conditional access expression, which is the left of < operator. 
+				// e.g: Case a?.b?.c< : we need to get the conditional access expression .b?.c and analyze its
+				// member binding expression (the .c) to see if it is a generic type/method.
+				// Case a?.b?.c.d< : we need to analyze .c.d
+				// Case a?.M(x => x?.P)?.M2< : We need to analyze .M2
+				leftNode = leftNode.GetInnerMostConditionalAccessExpression().WhenNotNull;
+			}
+
+			var info = model.GetSymbolInfo(leftNode, cancellationToken);
+			return info.CandidateSymbols.Any(IsGenericTypeOrMethod);
+		}
+
+		private static bool IsGenericTypeOrMethod(ISymbol symbol)
+		{
+			return symbol.GetArity() > 0;
+		}
+
+		public override bool AllowOverType(CancellationToken cancellationToken)
+		{
+			return CheckCurrentPosition(cancellationToken);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/ParenthesisCompletionSession.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/ParenthesisCompletionSession.cs
new file mode 100644
index 0000000000..67fa048129
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/ParenthesisCompletionSession.cs
@@ -0,0 +1,70 @@
+//
+// ParenthesisCompletionSession.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	internal class ParenthesisCompletionSession : AbstractTokenBraceCompletionSession
+	{
+		public ParenthesisCompletionSession(DocumentContext ctx)
+			: base(ctx, (int)SyntaxKind.OpenParenToken, (int)SyntaxKind.CloseParenToken, ')')
+		{
+		}
+
+		public override bool CheckOpeningPoint(TextEditor editor, DocumentContext ctx, CancellationToken cancellationToken)
+		{
+			var snapshot = CurrentSnapshot;
+			var position = StartOffset;
+			var token = FindToken(snapshot, position, cancellationToken);
+
+			// check token at the opening point first
+			if (!IsValidToken(token) ||
+			    token.RawKind != OpeningTokenKind ||
+			    token.SpanStart != position || token.Parent == null)
+			{
+				return false;
+			}
+
+			// now check whether parser think whether there is already counterpart closing parenthesis
+			var pair = token.Parent.GetParentheses();
+
+			// if pair is on the same line, then the closing parenthesis must belong to other tracker.
+			// let it through
+			if (Editor.GetLineByOffset (pair.Item1.SpanStart).LineNumber == Editor.GetLineByOffset(pair.Item2.Span.End).LineNumber)
+			{
+				return true;
+			}
+
+			return (int)pair.Item2.Kind() != ClosingTokenKind || pair.Item2.Span.Length == 0;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/StringLiteralCompletionSession.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/StringLiteralCompletionSession.cs
new file mode 100644
index 0000000000..f8a7ab4bd2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/AutoInsertBracket/Sessions/StringLiteralCompletionSession.cs
@@ -0,0 +1,68 @@
+//
+// StringLiteralCompletionSession.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.CSharp.Features.AutoInsertBracket
+{
+	internal class StringLiteralCompletionSession : AbstractTokenBraceCompletionSession
+	{
+		private const char VerbatimStringPrefix = '@';
+
+		public StringLiteralCompletionSession(DocumentContext ctx)
+			: base(ctx, (int)SyntaxKind.StringLiteralToken, (int)SyntaxKind.StringLiteralToken, '\"')
+		{
+		}
+
+		public override bool CheckOpeningPoint(TextEditor editor, DocumentContext ctx, CancellationToken cancellationToken)
+		{
+			var snapshot = CurrentSnapshot;
+			var position = StartOffset;
+			var token = FindToken(snapshot, position, cancellationToken);
+
+			if (!IsValidToken(token) || token.RawKind != OpeningTokenKind)
+			{
+				return false;
+			}
+
+			if (token.SpanStart == position)
+			{
+				return true;
+			}
+
+			return token.SpanStart + 1 == position && Editor.GetCharAt (token.SpanStart) == VerbatimStringPrefix;
+		}
+
+		public override bool AllowOverType(CancellationToken cancellationToken)
+		{
+			return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CSharpCodeGenerationService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CSharpCodeGenerationService.cs
new file mode 100644
index 0000000000..e12162dfa5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CSharpCodeGenerationService.cs
@@ -0,0 +1,330 @@
+//
+// CSharpCodeGenerationService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.Reflection;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeGeneration
+{
+	class CSharpCodeGenerationService
+	{
+		readonly static Type typeInfo;
+		readonly object instance;
+
+		readonly static MethodInfo createEventDeclarationMethod;
+		readonly static MethodInfo createFieldDeclaration;
+		readonly static MethodInfo createMethodDeclaration;
+		readonly static MethodInfo createPropertyDeclaration;
+		readonly static MethodInfo createNamedTypeDeclaration;
+		readonly static MethodInfo createNamespaceDeclaration;
+		readonly static MethodInfo addMethodAsync;
+		readonly static MethodInfo addMembersAsync;
+
+		readonly static MethodInfo canAddTo1, canAddTo2;
+
+		static CSharpCodeGenerationService ()
+		{
+			var abstractServiceType = Type.GetType ("Microsoft.CodeAnalysis.CodeGeneration.AbstractCodeGenerationService" + ReflectionNamespaces.WorkspacesAsmName, true);
+			var codeGenerationDestinationType = Type.GetType ("Microsoft.CodeAnalysis.CodeGeneration.CodeGenerationDestination" + ReflectionNamespaces.WorkspacesAsmName, true);
+			var codeGenerationOptionsType = Type.GetType ("Microsoft.CodeAnalysis.CodeGeneration.CodeGenerationOptions" + ReflectionNamespaces.WorkspacesAsmName, true);
+
+
+
+
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CSharp.CodeGeneration.CSharpCodeGenerationService" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			//TDeclarationNode destination, IMethodSymbol method, CodeGenerationOptions options = null, CancellationToken cancellationToken = default(CancellationToken)
+
+
+			addMethod = typeInfo.GetMethods ().Single (m => 
+			                                           m.Name == "AddMethod" &&
+			                                           m.GetParameters ().Count () == 4);
+			if (addMethod == null)
+				throw new InvalidOperationException ("AddMethod not found.");
+
+			createEventDeclarationMethod = typeInfo.GetMethod ("CreateEventDeclaration", BindingFlags.Instance | BindingFlags.Public, null, new [] { typeof(IEventSymbol), codeGenerationDestinationType, codeGenerationOptionsType }, null);
+			if (createEventDeclarationMethod == null)
+				throw new InvalidOperationException ("CreateEventDeclaration not found.");
+
+			createFieldDeclaration = typeInfo.GetMethod ("CreateFieldDeclaration", BindingFlags.Instance | BindingFlags.Public, null, new [] { typeof(IFieldSymbol), codeGenerationDestinationType, codeGenerationOptionsType }, null);
+			if (createFieldDeclaration == null)
+				throw new InvalidOperationException ("CreateFieldDeclaration not found.");
+
+			createMethodDeclaration = typeInfo.GetMethod ("CreateMethodDeclaration", BindingFlags.Instance | BindingFlags.Public, null, new [] { typeof(IMethodSymbol), codeGenerationDestinationType, codeGenerationOptionsType }, null);
+			if (createMethodDeclaration == null)
+				throw new InvalidOperationException ("CreateMethodDeclaration not found.");
+
+			createPropertyDeclaration = typeInfo.GetMethod ("CreatePropertyDeclaration", BindingFlags.Instance | BindingFlags.Public, null, new [] { typeof(IPropertySymbol), codeGenerationDestinationType, codeGenerationOptionsType }, null);
+			if (createPropertyDeclaration == null)
+				throw new InvalidOperationException ("CreatePropertyDeclaration not found.");
+
+			createNamedTypeDeclaration = typeInfo.GetMethod ("CreateNamedTypeDeclaration", BindingFlags.Instance | BindingFlags.Public, null, new [] { typeof(INamedTypeSymbol), codeGenerationDestinationType, codeGenerationOptionsType, typeof(CancellationToken) }, null);
+			if (createNamedTypeDeclaration == null)
+				throw new InvalidOperationException ("CreateNamedTypeDeclaration not found.");
+
+			createNamespaceDeclaration = typeInfo.GetMethod ("CreateNamespaceDeclaration", BindingFlags.Instance | BindingFlags.Public, null, new [] { typeof(INamespaceSymbol), codeGenerationDestinationType, codeGenerationOptionsType, typeof(CancellationToken) }, null);
+			if (createNamespaceDeclaration == null)
+				throw new InvalidOperationException ("CreateNamespaceDeclaration not found.");
+
+			addMethodAsync = abstractServiceType.GetMethod ("AddMethodAsync", BindingFlags.Instance | BindingFlags.Public);
+			if (addMethodAsync == null)
+				throw new InvalidOperationException ("AddMethodAsync not found.");
+			addPropertyAsync = abstractServiceType.GetMethod ("AddPropertyAsync", BindingFlags.Instance | BindingFlags.Public);
+			if (addPropertyAsync == null)
+				throw new InvalidOperationException ("AddPropertyAsync not found.");
+
+
+
+			addMembersAsync = abstractServiceType.GetMethod ("AddMembersAsync", BindingFlags.Instance | BindingFlags.Public, null, new [] { typeof(Solution), typeof(INamedTypeSymbol), typeof(IEnumerable<ISymbol>), CodeGenerationOptions.typeInfo, typeof(CancellationToken) }, null);
+			if (addMembersAsync == null)
+				throw new InvalidOperationException ("AddMembersAsync not found.");
+
+			canAddTo1 = typeInfo.GetMethod ("CanAddTo", new [] {typeof(ISymbol), typeof(Solution), typeof(CancellationToken) });
+			if (canAddTo1 == null)
+				throw new InvalidOperationException ("CanAddTo1 not found.");
+
+			canAddTo2 = typeInfo.GetMethod ("CanAddTo", new [] {typeof(SyntaxNode), typeof(Solution), typeof(CancellationToken) });
+			if (canAddTo2 == null)
+				throw new InvalidOperationException ("CanAddTo1 not found.");
+
+			addFieldAsync = abstractServiceType.GetMethod ("AddFieldAsync", BindingFlags.Instance | BindingFlags.Public, null, new [] { typeof(Solution), typeof(INamedTypeSymbol), typeof(IFieldSymbol), CodeGenerationOptions.typeInfo, typeof(CancellationToken) }, null);
+			if (addFieldAsync == null)
+				throw new InvalidOperationException ("AddFieldAsync not found.");
+
+			addStatements = typeInfo.GetMethod ("AddStatements", BindingFlags.Instance | BindingFlags.Public);
+			if (addStatements == null)
+				throw new InvalidOperationException ("AddStatements not found.");
+
+		}
+
+		public CSharpCodeGenerationService(HostLanguageServices languageServices)
+		{
+			instance = Activator.CreateInstance (typeInfo, new object[] {
+				languageServices
+			});
+		}
+
+		public CSharpCodeGenerationService (Workspace workspace, string language)
+		{
+			var languageService = workspace.Services.GetLanguageServices (language);
+
+			this.instance = Activator.CreateInstance (typeInfo, new [] { languageService });
+		}
+
+		public CSharpCodeGenerationService (Workspace workspace) : this (workspace, LanguageNames.CSharp)
+		{
+		}
+
+		static MethodInfo addStatements;
+		public TDeclarationNode AddStatements<TDeclarationNode>(
+			TDeclarationNode destinationMember,
+			IEnumerable<SyntaxNode> statements,
+			CodeGenerationOptions options,
+			CancellationToken cancellationToken)
+		{
+			try {
+				return (TDeclarationNode)addStatements.MakeGenericMethod (typeof (TDeclarationNode)).Invoke (instance, new object[] { destinationMember, statements, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return default(TDeclarationNode);
+			}
+		}
+
+		static MethodInfo addMethod;
+
+		/// <summary>
+		/// Adds a method into destination.
+		/// </summary>
+		public TDeclarationNode AddMethod<TDeclarationNode>(TDeclarationNode destination, IMethodSymbol method, CodeGenerationOptions options = null, CancellationToken cancellationToken = default(CancellationToken)) where TDeclarationNode : SyntaxNode
+		{
+			try {
+				return (TDeclarationNode)addMethod.MakeGenericMethod (typeof (TDeclarationNode)).Invoke (instance, new object[] { destination, method, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return default (TDeclarationNode);
+			}
+		}
+
+
+		/// <summary>
+		/// Returns a newly created event declaration node from the provided event.
+		/// </summary>
+		public SyntaxNode CreateEventDeclaration(IEventSymbol @event, CodeGenerationDestination destination = CodeGenerationDestination.Unspecified)
+		{
+			try {
+				return (SyntaxNode)createEventDeclarationMethod.Invoke (instance, new object[] { @event, (int)destination, null });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Returns a newly created field declaration node from the provided field.
+		/// </summary>
+		public SyntaxNode CreateFieldDeclaration(IFieldSymbol field, CodeGenerationDestination destination = CodeGenerationDestination.Unspecified)
+		{
+			try {
+				return (SyntaxNode)createFieldDeclaration.Invoke (instance, new object[] { @field, (int)destination, null });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Returns a newly created method declaration node from the provided method.
+		/// </summary>
+		public SyntaxNode CreateMethodDeclaration(IMethodSymbol method, CodeGenerationDestination destination = CodeGenerationDestination.Unspecified)
+		{
+			try {
+				return (SyntaxNode)createMethodDeclaration.Invoke (instance, new object[] { @method, (int)destination, null });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Returns a newly created property declaration node from the provided property.
+		/// </summary>
+		public SyntaxNode CreatePropertyDeclaration(IPropertySymbol property, CodeGenerationDestination destination = CodeGenerationDestination.Unspecified)
+		{
+			try {
+				return (SyntaxNode)createPropertyDeclaration.Invoke (instance, new object[] { @property, (int)destination, null });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Returns a newly created named type declaration node from the provided named type.
+		/// </summary>
+		public SyntaxNode CreateNamedTypeDeclaration(INamedTypeSymbol namedType, CodeGenerationDestination destination, CodeGenerationOptions options, CancellationToken cancellationToken)
+		{
+			try {
+				return (SyntaxNode)createNamedTypeDeclaration.Invoke (instance, new object[] { @namedType, destination, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Returns a newly created namespace declaration node from the provided namespace.
+		/// </summary>
+		public SyntaxNode CreateNamespaceDeclaration(INamespaceSymbol @namespace, CodeGenerationDestination destination, CodeGenerationOptions options, CancellationToken cancellationToken)
+		{
+			try {
+				return (SyntaxNode)createNamespaceDeclaration.Invoke (instance, new object[] { @namespace, (int)destination, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public Task<Document> AddMethodAsync(Solution solution, INamedTypeSymbol destination, IMethodSymbol method, CodeGenerationOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<Document>)addMethodAsync.Invoke (instance, new object[] { solution, destination, method, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public Task<Document> AddPropertyAsync(Solution solution, INamedTypeSymbol destination, IPropertySymbol property, CodeGenerationOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<Document>)addPropertyAsync.Invoke (instance, new object[] { solution, destination, property, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Adds all the provided members into destination.
+		/// </summary>
+		public Task<Document> AddMembersAsync(Solution solution, INamedTypeSymbol destination, IEnumerable<ISymbol> members, CodeGenerationOptions options = null, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<Document>)addMembersAsync.Invoke (instance, new object[] { solution, destination, members, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo addFieldAsync;
+		static MethodInfo addPropertyAsync;
+
+		public Task<Document> AddFieldAsync(Solution solution, INamedTypeSymbol destination, IFieldSymbol field, CodeGenerationOptions options, CancellationToken cancellationToken)
+		{
+			try {
+				return (Task<Document>)addFieldAsync.Invoke (instance, new object[] { solution, destination, field, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		/// <summary>
+		/// <c>true</c> if destination is a location where other symbols can be added to.
+		/// </summary>
+		public bool CanAddTo(ISymbol destination, Solution solution, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (bool)canAddTo1.Invoke (instance, new object[] { destination, solution, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// <c>true</c> if destination is a location where other symbols can be added to.
+		/// </summary>
+		public bool CanAddTo(SyntaxNode destination, Solution solution, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (bool)canAddTo2.Invoke (instance, new object[] { destination, solution, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationDestination.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationDestination.cs
new file mode 100644
index 0000000000..95d22e070f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationDestination.cs
@@ -0,0 +1,47 @@
+//
+// CodeGenerationDestination.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.Reflection;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeGeneration
+{
+	enum CodeGenerationDestination
+	{
+		Unspecified = 0,
+		CompilationUnit = 1,
+		Namespace = 2,
+		ClassType = 3,
+		EnumType = 4,
+		InterfaceType = 5,
+		ModuleType = 6,
+		StructType = 7,
+	}
+	
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationHelpers.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationHelpers.cs
new file mode 100644
index 0000000000..8e0673457f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationHelpers.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Formatting;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeGeneration
+{
+	static class CodeGenerationHelpers
+	{
+		public static SyntaxNode GenerateThrowStatement(
+			SyntaxGenerator factory,
+			SemanticDocument document,
+			string exceptionMetadataName,
+			CancellationToken cancellationToken)
+		{
+			var compilation = document.SemanticModel.Compilation;
+			var exceptionType = compilation.GetTypeByMetadataName(exceptionMetadataName);
+
+			// If we can't find the Exception, we obviously can't generate anything.
+			if (exceptionType == null)
+			{
+				return null;
+			}
+
+			var exceptionCreationExpression = factory.ObjectCreationExpression(
+				exceptionType,
+				SpecializedCollections.EmptyList<SyntaxNode>());
+
+			return factory.ThrowStatement(exceptionCreationExpression);
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationOptions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationOptions.cs
new file mode 100644
index 0000000000..e534a4e64b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationOptions.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeGeneration
+{
+	class CodeGenerationOptions
+	{
+		internal readonly static Type typeInfo;
+		readonly object instance;
+
+		internal object Instance {
+			get {
+				return instance;
+			}
+		}
+
+		static CodeGenerationOptions ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CodeGeneration.CodeGenerationOptions" + ReflectionNamespaces.WorkspacesAsmName, true);
+		}
+
+		public CodeGenerationOptions(
+			Location contextLocation = null,
+			Location afterThisLocation = null,
+			Location beforeThisLocation = null,
+			bool addImports = true,
+			bool placeSystemNamespaceFirst = true,
+			IEnumerable<INamespaceSymbol> additionalImports = null,
+			bool generateMembers = true,
+			bool mergeNestedNamespaces = true,
+			bool mergeAttributes = true,
+			bool generateDefaultAccessibility = true,
+			bool generateMethodBodies = true,
+			bool generateDocumentationComments = false,
+			bool autoInsertionLocation = true,
+			bool reuseSyntax = false)
+		{
+			instance = Activator.CreateInstance (typeInfo, new object[] {
+				contextLocation,
+				afterThisLocation,
+				beforeThisLocation,
+				addImports,
+				placeSystemNamespaceFirst,
+				additionalImports,
+				generateMembers,
+				mergeNestedNamespaces,
+				mergeAttributes,
+				generateDefaultAccessibility,
+				generateMethodBodies,
+				generateDocumentationComments,
+				autoInsertionLocation,
+				reuseSyntax
+			});
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationTypeParameterSymbol.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationTypeParameterSymbol.cs
new file mode 100644
index 0000000000..bc61fce570
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerationTypeParameterSymbol.cs
@@ -0,0 +1,89 @@
+//
+// CodeGenerationTypeParameterSymbol.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class CodeGenerationTypeParameterSymbol
+	{
+		readonly static Type typeInfo;
+		readonly object instance;
+
+		internal object Instance {
+			get {
+				return instance;
+			}
+		}
+
+		readonly static System.Reflection.PropertyInfo constraintTypesProperty;
+		public ImmutableArray<ITypeSymbol> ConstraintTypes { 
+			get {
+				return (ImmutableArray<ITypeSymbol>)constraintTypesProperty.GetValue (instance);
+			}
+			internal set {
+				constraintTypesProperty.SetValue (instance, value);
+			}
+		}
+
+
+		static CodeGenerationTypeParameterSymbol ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CodeGeneration.CodeGenerationTypeParameterSymbol" + ReflectionNamespaces.WorkspacesAsmName, true);
+			constraintTypesProperty = typeInfo.GetProperty ("ConstraintTypes");
+		}
+
+		public CodeGenerationTypeParameterSymbol(
+			INamedTypeSymbol containingType,
+			IList<AttributeData> attributes,
+			VarianceKind varianceKind,
+			string name,
+			ImmutableArray<ITypeSymbol> constraintTypes,
+			bool hasConstructorConstraint,
+			bool hasReferenceConstraint,
+			bool hasValueConstraint,
+			int ordinal)
+		{
+			instance = Activator.CreateInstance (typeInfo, new object[] {
+				containingType,
+				attributes,
+				varianceKind,
+				name,
+				constraintTypes,
+				hasConstructorConstraint,
+				hasReferenceConstraint,
+				hasValueConstraint,
+				ordinal
+			});
+		}
+
+
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerator.cs
new file mode 100644
index 0000000000..0c31f9024a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/CodeGenerator.cs
@@ -0,0 +1,137 @@
+//
+// CodeGenerator.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using System.Reflection;
+using System.Threading;
+using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	#if NR6
+		public
+	#endif
+	static class CodeGenerator
+	{
+		readonly static Type typeInfo;
+
+		static CodeGenerator ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CodeGeneration.CodeGenerator" + ReflectionNamespaces.WorkspacesAsmName, true);
+			addPropertyDeclarationAsyncMethod = typeInfo.GetMethod ("AddPropertyDeclarationAsync", BindingFlags.Static | BindingFlags.Public);
+			addMethodDeclarationAsyncMethod = typeInfo.GetMethod ("AddMethodDeclarationAsync", BindingFlags.Static | BindingFlags.Public);
+			addFieldDeclarationAsyncMethod = typeInfo.GetMethod ("AddFieldDeclarationAsync", BindingFlags.Static | BindingFlags.Public);
+			addNamespaceOrTypeDeclarationAsyncMethod = typeInfo.GetMethod ("AddNamespaceOrTypeDeclarationAsync", BindingFlags.Static | BindingFlags.Public);
+			addNamedTypeDeclarationAsyncMethod1 = typeInfo.GetMethod ("AddNamedTypeDeclarationAsync", new [] { typeof(Solution), typeof(INamedTypeSymbol), typeof(INamedTypeSymbol), CodeGenerationOptions.typeInfo, typeof(CancellationToken) });
+			addNamedTypeDeclarationAsyncMethod2 = typeInfo.GetMethod ("AddNamedTypeDeclarationAsync", new [] { typeof(Solution), typeof(INamespaceSymbol), typeof(INamedTypeSymbol), CodeGenerationOptions.typeInfo, typeof(CancellationToken) });
+		}
+
+		static MethodInfo addNamedTypeDeclarationAsyncMethod1;
+
+		public static Task<Document> AddNamedTypeDeclarationAsync(Solution solution, INamedTypeSymbol destination, INamedTypeSymbol namedType, CodeGenerationOptions options = default(CodeGenerationOptions), CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<Document>)addNamedTypeDeclarationAsyncMethod1.Invoke (null, new object[] { solution, destination, namedType, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo addNamedTypeDeclarationAsyncMethod2;
+		public static Task<Document> AddNamedTypeDeclarationAsync(Solution solution, INamespaceSymbol destination, INamedTypeSymbol namedType, CodeGenerationOptions options = default(CodeGenerationOptions), CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<Document>)addNamedTypeDeclarationAsyncMethod2.Invoke (null, new object[] { solution, destination, namedType, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo addNamespaceOrTypeDeclarationAsyncMethod;
+
+		public static Task<Document> AddNamespaceOrTypeDeclarationAsync(Solution solution, INamespaceSymbol destination, INamespaceOrTypeSymbol namespaceOrType, CodeGenerationOptions options = default(CodeGenerationOptions), CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<Document>)addNamespaceOrTypeDeclarationAsyncMethod.Invoke (null, new object[] { solution, destination, namespaceOrType, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		readonly static MethodInfo addFieldDeclarationAsyncMethod;
+
+		public static Task<Document> AddFieldDeclarationAsync(Solution solution, INamedTypeSymbol destination, IFieldSymbol field, CodeGenerationOptions options = default(CodeGenerationOptions), CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<Document>)addFieldDeclarationAsyncMethod.Invoke (null, new object[] { solution, destination, field, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		readonly static MethodInfo addPropertyDeclarationAsyncMethod;
+		public static Task<Document> AddPropertyDeclarationAsync(Solution solution, INamedTypeSymbol destination, IPropertySymbol property, CodeGenerationOptions options = default(CodeGenerationOptions), CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<Document>)addPropertyDeclarationAsyncMethod.Invoke (null, new object[] { solution, destination, property, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		readonly static MethodInfo addMethodDeclarationAsyncMethod;
+		public static Task<Document> AddMethodDeclarationAsync(Solution solution, INamedTypeSymbol destination, IMethodSymbol method, CodeGenerationOptions options = default(CodeGenerationOptions), CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<Document>)addMethodDeclarationAsyncMethod.Invoke (null, new object[] { solution, destination, method, options != null ? options.Instance : null, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public static Task<Document> AddMemberDeclarationsAsync(Solution solution, INamedTypeSymbol destination, IEnumerable<ISymbol> members, CodeGenerationOptions options = default(CodeGenerationOptions), CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return  new CSharpCodeGenerationService(solution.Workspace, destination.Language).AddMembersAsync(solution, destination, members, options, cancellationToken);
+		}
+
+		public static bool CanAdd(Solution solution, ISymbol destination, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return new CSharpCodeGenerationService(solution.Workspace, destination.Language).CanAddTo(destination, solution, cancellationToken);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/SyntaxAnnotationExtensions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/SyntaxAnnotationExtensions.cs
new file mode 100644
index 0000000000..edfd190b22
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/CodeGeneration/SyntaxAnnotationExtensions.cs
@@ -0,0 +1,58 @@
+//
+// SyntaxAnnotationExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeGeneration
+{
+	static class SyntaxAnnotationExtensions
+	{
+		readonly static Type typeInfo;
+
+		static SyntaxAnnotationExtensions ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CodeGeneration.SyntaxAnnotationExtensions" + ReflectionNamespaces.WorkspacesAsmName, true);
+			addAnnotationToSymbolMethod = typeInfo.GetMethod ("AddAnnotationToSymbol", BindingFlags.Public | BindingFlags.Static);
+		}
+
+		readonly static MethodInfo addAnnotationToSymbolMethod;
+
+		public static TSymbol AddAnnotationToSymbol<TSymbol>(
+			this SyntaxAnnotation annotation,
+			TSymbol symbol)
+			where TSymbol : ISymbol
+		{
+			try {
+				return (TSymbol)addAnnotationToSymbolMethod.MakeGenericMethod (typeof(TSymbol)).Invoke (null, new object[] { annotation, symbol });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return default (TSymbol);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionContext.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionContext.cs
new file mode 100644
index 0000000000..d58c2524f0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionContext.cs
@@ -0,0 +1,105 @@
+//
+// CompletionContext.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class CompletionContext
+	{
+		readonly Document document;
+
+		public Document Document {
+			get {
+				return document;
+			}
+		}
+
+		SemanticModel semanticModel;
+
+		internal async Task<SemanticModel> GetSemanticModelAsync (CancellationToken cancellationToken = default (CancellationToken)) 
+		{
+			if (semanticModel == null)
+				semanticModel = await document.GetSemanticModelAsync (cancellationToken);
+			return semanticModel;
+		}
+
+		readonly int position;
+		public int Position {
+			get {
+				return position;
+			}
+		}
+
+		Task<SyntaxContext>  syntaxContext;
+		object syntaxCreationLock = new object ();
+
+		internal Task<SyntaxContext> GetSyntaxContextAsync  (Workspace workspace, CancellationToken cancellationToken = default (CancellationToken)) 
+		{
+			if (syntaxContext == null) {
+				lock (syntaxCreationLock) {
+					syntaxContext = syntaxContext ?? Task.FromResult (SyntaxContext.Create (workspace, document, semanticModel, position, cancellationToken));/*Task.Run (() => {
+						var cw = SyntaxContext.Create (workspace, document, semanticModel, position, cancellationToken);
+						System.Console.WriteLine (cw);
+						return cw;
+					})*/;
+				}
+			}
+			return syntaxContext;
+		}
+
+		IEnumerable<CompletionContextHandler> additionalContextHandlers;
+
+		/// <summary>
+		/// Adds completion context handlers to the given context.
+		/// </summary>
+		public IEnumerable<CompletionContextHandler> AdditionalContextHandlers {
+			get {
+				return additionalContextHandlers ?? Enumerable.Empty<CompletionContextHandler> ();
+			}
+			set {
+				additionalContextHandlers = value;
+			}
+		}
+
+		/// <summary>
+		/// If false no default handlers will be used and only the AdditionalContextHandlers will run.
+		/// </summary>
+		public bool UseDefaultContextHandlers { get; set; } = true;
+
+		public CompletionContext (Document document, int position, SemanticModel semanticModel  = null)
+		{
+			this.document = document;
+			this.semanticModel = semanticModel;
+			this.position = position;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionEngine.cs
new file mode 100644
index 0000000000..b3395be726
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionEngine.cs
@@ -0,0 +1,222 @@
+// 
+// CSharpCompletionEngine.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Text;
+using Microsoft.CodeAnalysis.Recommendations;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.CSharp.Completion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	partial class CompletionEngine 
+	{
+		static CompletionContextHandler[] handlers = {
+			new RoslynRecommendationsCompletionContextHandler (),
+			new OverrideContextHandler(),
+			new PartialContextHandler(),
+			new EnumMemberContextHandler(),
+			new XmlDocCommentContextHandler(),
+			new ExplicitInterfaceContextHandler(),
+			new AttributeNamedParameterContextHandler(),
+			new NamedParameterContextHandler(),
+			new SpeculativeTContextHandler(),
+			new SnippetContextHandler(),
+			new ObjectInitializerContextHandler(),
+			new FormatItemContextHandler(),
+			new SpeculativeNameContextHandler(),
+			new DelegateCreationContextHandler(),
+			new ObjectCreationContextHandler(),
+			new SenderCompletionContextHandler(),
+			new CastCompletionContextHandler(),
+			new PreProcessorExpressionContextHandler(), 
+			new RegexContextHandler(),
+			new KeywordContextHandler(),
+		};
+
+		readonly ICompletionDataFactory factory;
+		readonly Workspace workspace;
+
+		public ICompletionDataFactory Factory {
+			get {
+				return factory;
+			}
+		}
+
+		public Workspace Workspace {
+			get {
+				return workspace;
+			}
+		}
+
+		public CompletionEngine(Workspace workspace, ICompletionDataFactory factory)
+		{
+			if (workspace == null)
+				throw new ArgumentNullException("workspace");
+			if (factory == null)
+				throw new ArgumentNullException("factory");
+			this.workspace = workspace;
+			this.factory = factory;
+		}
+
+		public async Task<CompletionResult> GetCompletionDataAsync(CompletionContext completionContext, CompletionTriggerInfo info, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (completionContext == null)
+				throw new ArgumentNullException ("completionContext");
+
+			var document = completionContext.Document;
+			var semanticModel = await completionContext.GetSemanticModelAsync (cancellationToken).ConfigureAwait(false);
+			var position = completionContext.Position;
+			var text = await document.GetTextAsync (cancellationToken).ConfigureAwait (false);
+			var ctx = await completionContext.GetSyntaxContextAsync (workspace, cancellationToken);
+			ctx.SemanticModel = semanticModel;
+
+			// case lambda parameter (n1, $
+			if (ctx.TargetToken.IsKind (SyntaxKind.CommaToken) &&
+				ctx.TargetToken.Parent != null && ctx.TargetToken.Parent.Parent != null &&
+				ctx.TargetToken.Parent.Parent.IsKind(SyntaxKind.ParenthesizedLambdaExpression)) 
+				return CompletionResult.Empty;
+
+			var result = new CompletionResult { SyntaxContext = ctx };
+
+			if (position > 0) {
+				var nonExclusiveHandlers = new List<CompletionContextHandler> ();
+				var exclusiveHandlers = new List<CompletionContextHandler> ();
+				var toRetriggerHandlers = new List<CompletionContextHandler> ();
+				IEnumerable<CompletionContextHandler> handlerList;
+				if (completionContext.UseDefaultContextHandlers) {
+					handlerList = handlers.Concat (completionContext.AdditionalContextHandlers);
+				} else {
+					handlerList = completionContext.AdditionalContextHandlers;
+				}
+
+				foreach (var handler in handlerList) {
+					if (info.CompletionTriggerReason == CompletionTriggerReason.CompletionCommand || handler.IsTriggerCharacter (text, position - 1)) {
+						if (await handler.IsExclusiveAsync (completionContext, ctx, info, cancellationToken)) {
+							exclusiveHandlers.Add (handler);
+						} else {
+							nonExclusiveHandlers.Add (handler);
+						}
+					} else {
+						toRetriggerHandlers.Add (handler);
+					}
+				}
+
+				foreach (var handler in exclusiveHandlers) {
+					var handlerResult = handler.GetCompletionDataAsync (result, this, completionContext, info, ctx, cancellationToken).Result;
+					//if (handlerResult != null) {
+					//	Console.WriteLine ("-----" + handler);
+					//	foreach (var item in handlerResult) {
+					//		Console.WriteLine (item.DisplayText);
+					//	}
+					//} else {
+					//	Console.WriteLine ("-----" + handler + " == NULL");
+					//}
+					if (handlerResult != null)
+						result.AddRange (handlerResult);
+				}
+
+				if (result.Count == 0) {
+					foreach (var handler in nonExclusiveHandlers) {
+						var handlerResult = handler.GetCompletionDataAsync (result, this, completionContext, info, ctx, cancellationToken).Result;
+						//if (handlerResult != null) {
+						//	Console.WriteLine ("-----" + handler);
+						//	foreach (var item in handlerResult) {
+						//		Console.WriteLine (item.DisplayText);
+						//	}
+						//} else {
+						//	Console.WriteLine ("-----" + handler + " == NULL");
+						//}
+						if (handlerResult != null && handlerResult.Any ()) {
+							result.AddRange (handlerResult);
+						} else {
+							toRetriggerHandlers.Add (handler);
+						}
+					}
+
+					if (result.Count > 0) {
+						info = info.WithCompletionTriggerReason (CompletionTriggerReason.RetriggerCommand);
+						foreach (var handler in toRetriggerHandlers) {
+							var handlerResult = handler.GetCompletionDataAsync (result, this, completionContext, info, ctx, cancellationToken).Result;
+							if (handlerResult != null)
+								result.AddRange (handlerResult);
+						}
+					}
+				}
+			}
+
+			// prevent auto selection for "<number>." case
+			if (ctx.TargetToken.IsKind(SyntaxKind.DotToken)) {
+				var accessExpr = ctx.TargetToken.Parent as MemberAccessExpressionSyntax;
+				if (accessExpr != null &&
+					accessExpr.Expression != null &&
+					accessExpr.Expression.IsKind(SyntaxKind.NumericLiteralExpression))  {
+					result.AutoSelect = false;
+				}
+			}
+
+			if (ctx.LeftToken.Parent != null &&
+				ctx.LeftToken.Parent.Parent != null &&
+				ctx.TargetToken.Parent != null && !ctx.TargetToken.Parent.IsKind(SyntaxKind.NameEquals) &&
+				ctx.LeftToken.Parent.Parent.IsKind(SyntaxKind.AnonymousObjectMemberDeclarator))
+				result.AutoSelect = false;
+
+			if (ctx.TargetToken.IsKind (SyntaxKind.OpenParenToken) && ctx.TargetToken.GetPreviousToken ().IsKind (SyntaxKind.OpenParenToken)) {
+				var validTypes = TypeGuessing.GetValidTypes (semanticModel, ctx.TargetToken.Parent, cancellationToken);
+				result.AutoSelect = !validTypes.Any (t => t.IsDelegateType ());
+			}
+
+			foreach (var type in ctx.InferredTypes) {
+				if (type.TypeKind == TypeKind.Delegate) {
+					result.AutoSelect = false;
+					break;
+				}
+			}
+			
+			return result;
+		}
+
+		IEnumerable<ISymbol> GetAllMembers (ITypeSymbol type)
+		{
+			if (type == null)
+				yield break;
+			foreach (var member in type.GetMembers()) {
+				yield return member;
+			}
+			foreach (var baseMember in GetAllMembers(type.BaseType))
+				yield return baseMember;
+		}
+
+		public static Func<CancellationToken, Task<IEnumerable<CompletionData>>> SnippetCallback;
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionResult.cs
new file mode 100644
index 0000000000..2182d9af75
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionResult.cs
@@ -0,0 +1,127 @@
+//
+// CompletionResult.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class CompletionResult : IReadOnlyList<CompletionData>
+	{
+		public static readonly CompletionResult Empty = new CompletionResult ();
+
+		readonly List<CompletionData> data = new List<CompletionData> ();
+
+		public string DefaultCompletionString {
+			get;
+			internal set;
+		}
+
+		bool autoCompleteEmptyMatch = true;
+
+		public bool AutoCompleteEmptyMatch {
+			get { return autoCompleteEmptyMatch; }
+			set { autoCompleteEmptyMatch = value; }
+		}
+
+		public bool AutoCompleteEmptyMatchOnCurlyBracket {
+			get;
+			set;
+		}
+
+		public bool AutoSelect {
+			get;
+			set;
+		}
+
+		public bool CloseOnSquareBrackets {
+			get;
+			set;
+		}
+
+		internal SyntaxContext SyntaxContext;
+
+		public readonly List<IMethodSymbol> PossibleDelegates = new List<IMethodSymbol>();
+
+		#region IReadOnlyList<ICompletionData> implemenation
+		public IEnumerator<CompletionData> GetEnumerator()
+		{
+			return data.GetEnumerator();
+		}
+
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return ((System.Collections.IEnumerable)data).GetEnumerator();
+		}
+		
+		public CompletionData this[int index] {
+			get {
+				return data [index];
+			}
+		}
+
+		public int Count {
+			get {
+				return data.Count;
+			}
+		}
+		#endregion
+		
+		internal CompletionResult()
+		{
+			AutoSelect = true;
+			AutoCompleteEmptyMatchOnCurlyBracket = true;
+		}
+		
+		internal void AddData (CompletionData completionData)
+		{
+			var displayText = completionData.DisplayText;
+			foreach (var od in data) {
+				if (od.IsOverload (completionData) && completionData.IsOverload (od)) {
+					od.AddOverload (completionData);
+					return;
+				}
+			}
+			data.Add(completionData); 
+		}
+
+		internal void AddRange (IEnumerable<CompletionData> completionData)
+		{
+			foreach (var cd in completionData) {
+				AddData (cd);
+			}
+		}
+
+		public static CompletionResult Create(IEnumerable<CompletionData> data)
+		{
+			var result = new CompletionResult();
+			result.data.AddRange(data);
+			return result;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerInfo.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerInfo.cs
new file mode 100644
index 0000000000..a7b0a42ff1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerInfo.cs
@@ -0,0 +1,102 @@
+//
+// CompletionTriggerInfo.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	/// <summary>
+	/// Provides information about what triggered completion.
+	/// </summary>
+	public struct CompletionTriggerInfo
+	{
+		/// <summary>
+		/// Provides the reason that completion was triggered.
+		/// </summary>
+		public CompletionTriggerReason CompletionTriggerReason { get; private set; }
+
+		/// <summary>
+		/// If the <see cref="CompletionTriggerReason"/> was <see
+		/// cref="CompletionTriggerReason.CharTyped"/> then this was the character that was
+		/// typed or deleted by backspace.  Otherwise it is null.
+		/// </summary>
+		public char? TriggerCharacter { get; private set; }
+
+		/// <summary>
+		/// Returns true if the reason completion was triggered was to augment an existing list of
+		/// completion items.
+		/// </summary>
+		public bool IsAugment { get; private set; }
+
+		/// <summary>
+		///  Returns true if completion was triggered by the debugger.
+		/// </summary>
+		public bool IsDebugger { get; private set; }
+
+		/// <summary>
+		/// Return true if completion is running in the Immediate Window.
+		/// </summary>
+		public bool IsImmediateWindow { get; private set; }
+
+		public CompletionTriggerInfo (CompletionTriggerReason completionTriggerReason, char? triggerCharacter = null, bool isAugment = false, bool isDebugger = false, bool isImmediateWindow = false) : this()
+		{
+			this.CompletionTriggerReason = completionTriggerReason;
+			this.TriggerCharacter = triggerCharacter;
+			this.IsAugment = isAugment;
+			this.IsDebugger = isDebugger;
+			this.IsImmediateWindow = isImmediateWindow;
+		}
+
+		public CompletionTriggerInfo WithIsAugment(bool isAugment)
+		{
+			return this.IsAugment == isAugment
+				? this
+				: new CompletionTriggerInfo(this.CompletionTriggerReason, this.TriggerCharacter, isAugment, this.IsDebugger, this.IsImmediateWindow);
+		}
+
+		public CompletionTriggerInfo WithIsDebugger(bool isDebugger)
+		{
+			return this.IsDebugger == isDebugger
+				? this
+				: new CompletionTriggerInfo(this.CompletionTriggerReason, this.TriggerCharacter, this.IsAugment, isDebugger, this.IsImmediateWindow);
+		}
+
+		public CompletionTriggerInfo WithIsImmediateWindow(bool isImmediateWIndow)
+		{
+			return this.IsImmediateWindow == isImmediateWIndow
+				       ? this
+					       : new CompletionTriggerInfo(this.CompletionTriggerReason, this.TriggerCharacter, this.IsAugment, this.IsDebugger, isImmediateWIndow);
+		}
+
+		public CompletionTriggerInfo WithCompletionTriggerReason(CompletionTriggerReason reason)
+		{
+			return this.CompletionTriggerReason == reason
+				       ? this
+					       : new CompletionTriggerInfo(reason, this.TriggerCharacter, this.IsAugment, this.IsDebugger, this.IsImmediateWindow);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerReason.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerReason.cs
new file mode 100644
index 0000000000..df9a2edafb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/CompletionTriggerReason.cs
@@ -0,0 +1,39 @@
+//
+// CompletionTriggerReason.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	public enum CompletionTriggerReason
+	{
+		CharTyped,
+		CompletionCommand,
+		BackspaceOrDeleteCommand,
+		RetriggerCommand
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/AttributeNamedParameterContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/AttributeNamedParameterContextHandler.cs
new file mode 100644
index 0000000000..5cd4140eff
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/AttributeNamedParameterContextHandler.cs
@@ -0,0 +1,233 @@
+//
+// AttributeNamedParameterContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Linq;
+using System.Collections.Immutable;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class AttributeNamedParameterContextHandler : CompletionContextHandler
+	{
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+
+			var syntaxTree = ctx.SyntaxTree;
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken))
+			{
+				return null;
+			}
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() != SyntaxKind.OpenParenToken && token.Kind() != SyntaxKind.CommaToken)
+			{
+				return null;
+			}
+
+			var attributeArgumentList = token.Parent as AttributeArgumentListSyntax;
+			var attributeSyntax = token.Parent.Parent as AttributeSyntax;
+			if (attributeSyntax == null || attributeArgumentList == null)
+			{
+				return null;
+			}
+
+			// We actually want to collect two sets of named parameters to present the user.  The
+			// normal named parameters that come from the attribute constructors.  These will be
+			// presented like "foo:".  And also the named parameters that come from the writable
+			// fields/properties in the attribute.  These will be presented like "bar =".  
+
+			var existingNamedParameters = GetExistingNamedParameters(attributeArgumentList, position);
+
+			var workspace = document.Project.Solution.Workspace;
+			var semanticModel = await document.GetCSharpSemanticModelForNodeAsync(attributeSyntax, cancellationToken).ConfigureAwait(false);
+			var nameColonItems = await GetNameColonItemsAsync(engine, workspace, semanticModel, position, token, attributeSyntax, existingNamedParameters, cancellationToken).ConfigureAwait(false);
+			var nameEqualsItems = await GetNameEqualsItemsAsync(engine, workspace, semanticModel, position, token, attributeSyntax, existingNamedParameters, cancellationToken).ConfigureAwait(false);
+
+			// If we're after a name= parameter, then we only want to show name= parameters.
+			if (IsAfterNameEqualsArgument(token))
+			{
+				return nameEqualsItems;
+			}
+
+			return nameColonItems.Concat(nameEqualsItems);
+		}
+		public override async Task<bool> IsExclusiveAsync(CompletionContext completionContext, SyntaxContext syntaxContext, CompletionTriggerInfo triggerInfo, CancellationToken cancellationToken)
+		{
+			var syntaxTree = await completionContext.Document.GetCSharpSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+			var token = syntaxTree.FindTokenOnLeftOfPosition(completionContext.Position, cancellationToken)
+			                      .GetPreviousTokenIfTouchingWord(completionContext.Position);
+
+			return IsAfterNameColonArgument(token) || IsAfterNameEqualsArgument(token);
+		}
+
+		private bool IsAfterNameColonArgument(SyntaxToken token)
+		{
+			var argumentList = token.Parent as AttributeArgumentListSyntax;
+			if (token.Kind() == SyntaxKind.CommaToken && argumentList != null)
+			{
+				foreach (var item in argumentList.Arguments.GetWithSeparators())
+				{
+					if (item.IsToken && item.AsToken() == token)
+					{
+						return false;
+					}
+
+					if (item.IsNode)
+					{
+						var node = item.AsNode() as AttributeArgumentSyntax;
+						if (node.NameColon != null)
+						{
+							return true;
+						}
+					}
+				}
+			}
+
+			return false;
+		}
+
+		private bool IsAfterNameEqualsArgument(SyntaxToken token)
+		{
+			var argumentList = token.Parent as AttributeArgumentListSyntax;
+			if (token.Kind() == SyntaxKind.CommaToken && argumentList != null)
+			{
+				foreach (var item in argumentList.Arguments.GetWithSeparators())
+				{
+					if (item.IsToken && item.AsToken() == token)
+					{
+						return false;
+					}
+
+					if (item.IsNode)
+					{
+						var node = item.AsNode() as AttributeArgumentSyntax;
+						if (node.NameEquals != null)
+						{
+							return true;
+						}
+					}
+				}
+			}
+
+			return false;
+		}
+
+		private Task<IEnumerable<CompletionData>> GetNameEqualsItemsAsync(CompletionEngine engine, Workspace workspace, SemanticModel semanticModel,
+			int position, SyntaxToken token, AttributeSyntax attributeSyntax, ISet<string> existingNamedParameters,
+			CancellationToken cancellationToken)
+		{
+			var attributeNamedParameters = GetAttributeNamedParameters(semanticModel, position, attributeSyntax, cancellationToken);
+			// var unspecifiedNamedParameters = attributeNamedParameters.Where(p => !existingNamedParameters.Contains(p.Name));
+
+			// var text = await semanticModel.SyntaxTree.GetTextAsync(cancellationToken).ConfigureAwait(false);
+			return Task.FromResult ( 
+				attributeNamedParameters
+					.Where (p => !existingNamedParameters.Contains (p.Name))
+					.Select (p => {
+						var result = engine.Factory.CreateSymbolCompletionData (this, p);
+						result.DisplayFlags |= DisplayFlags.NamedArgument;
+						return (CompletionData)result;
+				}));
+
+
+		}
+
+		private Task<IEnumerable<CompletionData>> GetNameColonItemsAsync(
+			CompletionEngine engine, Workspace workspace, SemanticModel semanticModel, int position, SyntaxToken token, AttributeSyntax attributeSyntax, ISet<string> existingNamedParameters,
+			CancellationToken cancellationToken)
+		{
+			var parameterLists = GetParameterLists(semanticModel, position, attributeSyntax, cancellationToken);
+			parameterLists = parameterLists.Where(pl => IsValid(pl, existingNamedParameters));
+
+			// var text = await semanticModel.SyntaxTree.GetTextAsync(cancellationToken).ConfigureAwait(false);
+			return Task.FromResult ( 
+				from pl in parameterLists
+			 from p in pl
+			 where !existingNamedParameters.Contains (p.Name)
+				select engine.Factory.CreateGenericData(this, p.Name + ":", GenericDataType.NamedParameter));
+		}
+
+		private bool IsValid(ImmutableArray<IParameterSymbol> parameterList, ISet<string> existingNamedParameters)
+		{
+			return existingNamedParameters.Except(parameterList.Select(p => p.Name)).IsEmpty();
+		}
+
+		private ISet<string> GetExistingNamedParameters(AttributeArgumentListSyntax argumentList, int position)
+		{
+			var existingArguments1 =
+				argumentList.Arguments.Where(a => a.Span.End <= position)
+					.Where(a => a.NameColon != null)
+					.Select(a => a.NameColon.Name.Identifier.ValueText);
+			var existingArguments2 =
+				argumentList.Arguments.Where(a => a.Span.End <= position)
+					.Where(a => a.NameEquals != null)
+					.Select(a => a.NameEquals.Name.Identifier.ValueText);
+
+			return existingArguments1.Concat(existingArguments2).ToSet();
+		}
+
+		private IEnumerable<ImmutableArray<IParameterSymbol>> GetParameterLists(
+			SemanticModel semanticModel,
+			int position,
+			AttributeSyntax attribute,
+			CancellationToken cancellationToken)
+		{
+			var within = semanticModel.GetEnclosingNamedTypeOrAssembly(position, cancellationToken);
+			var attributeType = semanticModel.GetTypeInfo(attribute, cancellationToken).Type as INamedTypeSymbol;
+			if (within != null && attributeType != null)
+			{
+				return attributeType.InstanceConstructors.Where(c => c.IsAccessibleWithin(within))
+					.Select(c => c.Parameters);
+			}
+
+			return SpecializedCollections.EmptyEnumerable<ImmutableArray<IParameterSymbol>>();
+		}
+
+		private IEnumerable<ISymbol> GetAttributeNamedParameters(
+			SemanticModel semanticModel,
+			int position,
+			AttributeSyntax attribute,
+			CancellationToken cancellationToken)
+		{
+			var within = semanticModel.GetEnclosingNamedTypeOrAssembly(position, cancellationToken);
+			var attributeType = semanticModel.GetTypeInfo(attribute, cancellationToken).Type as INamedTypeSymbol;
+			return attributeType.GetAttributeNamedParameters(semanticModel.Compilation, within);
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CastCompletionContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CastCompletionContextHandler.cs
new file mode 100644
index 0000000000..122f405bf9
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CastCompletionContextHandler.cs
@@ -0,0 +1,172 @@
+//
+// CastCompletionContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class CastCompletionContextHandler : CompletionContextHandler
+	{
+		protected override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var position = completionContext.Position;
+			var document = completionContext.Document;
+			var syntaxTree = ctx.SyntaxTree;
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken) ||
+				syntaxTree.IsPreProcessorDirectiveContext(position, cancellationToken))
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			if (!syntaxTree.IsRightOfDotOrArrowOrColonColon(position, cancellationToken))
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			var ma = ctx.LeftToken.Parent as MemberAccessExpressionSyntax;
+			if (ma == null)
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+
+			var model = ctx.CSharpSyntaxContext.SemanticModel;
+
+			var symbolInfo = model.GetSymbolInfo (ma.Expression);
+			if (symbolInfo.Symbol == null)
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+
+			var list = new List<CompletionData> ();
+			var within = model.GetEnclosingNamedTypeOrAssembly(position, cancellationToken);
+			var addedSymbols = new HashSet<string> ();
+			SyntaxNode ancestor = ma.Expression;
+			while (ancestor != null) {
+				// check parent if for direct type check
+				var ifStmSyntax = ancestor as IfStatementSyntax;
+				if (ifStmSyntax != null) {
+					var condition = ifStmSyntax.Condition.SkipParens ();
+					if (condition != null && condition.IsKind (SyntaxKind.IsExpression)) {
+						var isExpr = ((BinaryExpressionSyntax)condition);
+						var leftSymbol = model.GetSymbolInfo (isExpr.Left);
+
+						if (leftSymbol.Symbol == symbolInfo.Symbol) {
+							var type = model.GetTypeInfo (isExpr.Right).Type;
+							if (type != null) {
+								Analyze (engine, ma.Expression, type, model.GetTypeInfo (isExpr.Left).Type, within, list, addedSymbols, cancellationToken);
+							}
+						}
+					}
+					// skip if else ... if else
+					if (ancestor.Parent is ElseClauseSyntax) {
+						while (ancestor is IfStatementSyntax || ancestor is ElseClauseSyntax)
+							ancestor = ancestor.Parent;
+						continue;
+					}
+					goto loop;
+				}
+
+				// check parent block if an if is there that checks the type
+				var blockSyntax = ancestor as BlockSyntax;
+				if (blockSyntax != null) {
+					foreach (var ifStmt in blockSyntax.Statements.OfType<IfStatementSyntax> ()) {
+						if (ifStmt.Span.End >= ma.Span.Start)
+							break;
+						var condition = ifStmt.Condition.SkipParens ();
+						bool wasNegated = false;
+						if (condition.IsKind (SyntaxKind.LogicalNotExpression)) {
+							condition = ((PrefixUnaryExpressionSyntax)condition).Operand.SkipParens ();
+							wasNegated = true;
+						}
+						if (condition == null || !condition.IsKind (SyntaxKind.IsExpression))
+							goto loop;
+						var stmt = ifStmt.Statement;
+						if (stmt is BlockSyntax) {
+							stmt = ((BlockSyntax)stmt).Statements.LastOrDefault ();
+						}
+						if (!wasNegated || 
+						    stmt == null ||
+							!stmt.IsKind (SyntaxKind.ReturnStatement) && !stmt.IsKind (SyntaxKind.ContinueStatement) && !stmt.IsKind (SyntaxKind.BreakStatement) && !stmt.IsKind (SyntaxKind.ThrowStatement))
+							goto loop;
+
+						var isExpr = ((BinaryExpressionSyntax)condition);
+						var leftSymbol = model.GetSymbolInfo (isExpr.Left);
+						if (leftSymbol.Symbol == symbolInfo.Symbol) {
+							var type = model.GetTypeInfo (isExpr.Right).Type;
+							if (type != null) {
+								Analyze (engine, ma.Expression, type, model.GetTypeInfo (isExpr.Left).Type, within, list, addedSymbols, cancellationToken);
+							}
+						}
+					}
+				}
+
+				var binOp = ancestor as BinaryExpressionSyntax;
+				if (binOp != null && binOp.IsKind (SyntaxKind.LogicalAndExpression)) {
+					if (binOp.Left.SkipParens ().IsKind (SyntaxKind.IsExpression)) {
+						var isExpr = ((BinaryExpressionSyntax)binOp.Left.SkipParens ());
+						var leftSymbol = model.GetSymbolInfo (isExpr.Left);
+
+						if (leftSymbol.Symbol == symbolInfo.Symbol) {
+							var type = model.GetTypeInfo (isExpr.Right).Type;
+							if (type != null) {
+								Analyze (engine, ma.Expression, type, model.GetTypeInfo (isExpr.Left).Type, within, list, addedSymbols, cancellationToken);
+							}
+						}
+					}
+				}
+
+				loop: ancestor = ancestor.Parent;
+			}
+
+			return Task.FromResult ((IEnumerable<CompletionData>)list);
+		}
+
+		void Analyze (CompletionEngine engine, SyntaxNode node, ITypeSymbol type, ITypeSymbol stopAt, ISymbol within, List<CompletionData> list, HashSet<string> addedSymbols, CancellationToken cancellationToken)
+		{
+			var startType = type;
+
+			while (type != null && type.SpecialType != SpecialType.System_Object && type != stopAt) {
+				foreach (var member in type.GetMembers ()) {
+					cancellationToken.ThrowIfCancellationRequested ();
+					if (member.IsImplicitlyDeclared || member.IsStatic)
+						continue;
+					if (member.IsOrdinaryMethod () || member.Kind == SymbolKind.Field || member.Kind == SymbolKind.Property) {
+						if (member.IsAccessibleWithin (within)) {
+							var completionData = engine.Factory.CreateCastCompletionData (this, member, node, startType);
+							if (addedSymbols.Contains (completionData.DisplayText))
+								continue;
+							addedSymbols.Add (completionData.DisplayText);
+							list.Add (completionData);
+						}
+					}
+				}
+
+				type = type.BaseType;
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CompletionContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CompletionContextHandler.cs
new file mode 100644
index 0000000000..b12afc3665
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/CompletionContextHandler.cs
@@ -0,0 +1,188 @@
+//
+// CompletionContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+
+using Microsoft.CodeAnalysis.Text;
+using System.Threading.Tasks;
+using System.Security.Policy;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	abstract class CompletionContextHandler : ICompletionDataKeyHandler
+	{
+		public async Task<IEnumerable<CompletionData>> GetCompletionDataAsync (CompletionResult result, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			// If we were triggered by typign a character, then do a semantic check to make sure
+			// we're still applicable.  If not, then return immediately.
+			if (info.CompletionTriggerReason == CompletionTriggerReason.CharTyped)
+			{
+				var isSemanticTriggerCharacter = await IsSemanticTriggerCharacterAsync(completionContext.Document, completionContext.Position - 1, cancellationToken).ConfigureAwait(false);
+				if (!isSemanticTriggerCharacter)
+					return null;
+			}
+
+			return await GetItemsWorkerAsync(result, engine, completionContext, info, ctx, cancellationToken).ConfigureAwait(false);
+
+		}
+
+		protected virtual Task<bool> IsSemanticTriggerCharacterAsync(Document document, int characterPosition, CancellationToken cancellationToken)
+        {
+			return Task.FromResult (true);
+        }
+
+		protected abstract Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult result, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken);
+
+		static readonly char[] csharpCommitChars = {
+			' ', '{', '}', '[', ']', '(', ')', '.', ',', ':',
+			';', '+', '-', '*', '/', '%', '&', '|', '^', '!',
+			'~', '=', '<', '>', '?', '@', '#', '\'', '\"', '\\'
+		};
+
+		public virtual bool IsCommitCharacter (CompletionData completionItem, char ch, string textTypedSoFar)
+		{
+			return csharpCommitChars.Contains (ch);
+		}
+
+		public virtual bool SendEnterThroughToEditor(CompletionData completionItem, string textTypedSoFar)
+		{
+			return string.Compare (completionItem.DisplayText, textTypedSoFar, StringComparison.OrdinalIgnoreCase) == 0;
+		}
+
+		public virtual bool IsFilterCharacter(CompletionData completionItem, char ch, string textTypedSoFar)
+		{
+			return false;
+		}
+
+		public virtual Task<bool> IsExclusiveAsync(CompletionContext completionContext, SyntaxContext syntaxContext, CompletionTriggerInfo triggerInfo, CancellationToken cancellationToken)
+		{
+			return Task.FromResult (false);
+		}
+
+		public virtual bool IsTriggerCharacter (SourceText text, int position)
+		{
+			var ch = text [position];
+			return ch == '.' || // simple member access
+				ch == '#' || // pre processor directives 
+				ch == '>' && position >= 1 && text [position - 1] == '-' || // pointer member access
+				ch == ':' && position >= 1 && text [position - 1] == ':' || // alias name
+				IsStartingNewWord (text, position);
+		}
+
+		internal protected static bool IsTriggerAfterSpaceOrStartOfWordCharacter(SourceText text, int characterPosition)
+		{
+			var ch = text[characterPosition];
+			if (ch == ' ') {
+				ch = text[characterPosition - 1];
+				return !char.IsWhiteSpace (ch);
+			}
+			return IsStartingNewWord(text, characterPosition);
+		}
+
+		internal protected static bool IsStartingNewWord (SourceText text, int position)
+		{
+			var ch = text [position];
+			if (!SyntaxFacts.IsIdentifierStartCharacter (ch))
+				return false;
+
+			if (position > 0 && IsWordCharacter (text [position - 1]))
+				return false;
+
+			if (position < text.Length - 1 && IsWordCharacter (text [position + 1]))
+				return false;
+
+			return true;
+		}
+
+		protected static bool IsWordCharacter (char ch)
+		{
+			return SyntaxFacts.IsIdentifierStartCharacter (ch) || SyntaxFacts.IsIdentifierPartCharacter (ch);
+		}
+
+		protected static bool IsOnStartLine(int position, SourceText text, int startLine)
+		{
+			return text.Lines.IndexOf(position) == startLine;
+		}
+
+		protected static TextSpan GetTextChangeSpan(SourceText text, int position)
+		{
+			return GetTextChangeSpan(text, position, IsTextChangeSpanStartCharacter, IsWordCharacter);
+		}
+
+		public static bool IsTextChangeSpanStartCharacter(char ch)
+		{
+			return ch == '@' || IsWordCharacter(ch);
+		}
+
+		public static TextSpan GetTextChangeSpan(SourceText text, int position,
+			Func<char, bool> isWordStartCharacter, Func<char, bool> isWordCharacter)
+		{
+			int start = position;
+			while (start > 0 && isWordStartCharacter(text[start - 1]))
+			{
+				start--;
+			}
+
+			// If we're brought up in the middle of a word, extend to the end of the word as well.
+			// This means that if a user brings up the completion list at the start of the word they
+			// will "insert" the text before what's already there (useful for qualifying existing
+			// text).  However, if they bring up completion in the "middle" of a word, then they will
+			// "overwrite" the text. Useful for correcting misspellings or just replacing unwanted
+			// code with new code.
+			int end = position;
+			if (start != position)
+			{
+				while (end < text.Length && isWordCharacter(text[end]))
+				{
+					end++;
+				}
+			}
+
+			return TextSpan.FromBounds(start, end);
+		}
+
+		protected class UnionCompletionItemComparer : IEqualityComparer<CompletionData>
+		{
+			public static UnionCompletionItemComparer Instance = new UnionCompletionItemComparer();
+
+			public bool Equals(CompletionData x, CompletionData y)
+			{
+				return x.DisplayText == y.DisplayText;
+			}
+
+			public int GetHashCode(CompletionData obj)
+			{
+				return obj.DisplayText.GetHashCode();
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/DelegateCreationContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/DelegateCreationContextHandler.cs
new file mode 100644
index 0000000000..51587c77da
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/DelegateCreationContextHandler.cs
@@ -0,0 +1,285 @@
+//
+// DelegateCreationContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using System.Text;
+using Microsoft.CodeAnalysis.Text;
+using ICSharpCode.NRefactory6.CSharp.ExtractMethod;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.CSharp.Completion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class DelegateCreationContextHandler : CompletionContextHandler
+	{
+		internal static readonly SymbolDisplayFormat NameFormat =
+			new SymbolDisplayFormat (
+				globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+				propertyStyle: SymbolDisplayPropertyStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters | SymbolDisplayGenericsOptions.IncludeVariance,
+				memberOptions: SymbolDisplayMemberOptions.IncludeParameters | SymbolDisplayMemberOptions.IncludeExplicitInterface,
+				parameterOptions:
+				SymbolDisplayParameterOptions.IncludeParamsRefOut |
+				SymbolDisplayParameterOptions.IncludeExtensionThis |
+				SymbolDisplayParameterOptions.IncludeType |
+				SymbolDisplayParameterOptions.IncludeName,
+				miscellaneousOptions:
+				SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+				SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+
+		internal static readonly SymbolDisplayFormat overrideNameFormat = NameFormat.WithParameterOptions (
+			SymbolDisplayParameterOptions.IncludeDefaultValue |
+			SymbolDisplayParameterOptions.IncludeExtensionThis |
+			SymbolDisplayParameterOptions.IncludeType |
+			SymbolDisplayParameterOptions.IncludeName |
+			SymbolDisplayParameterOptions.IncludeParamsRefOut);
+
+		public override bool IsTriggerCharacter (SourceText text, int position)
+		{
+			var ch = text [position];
+			return ch == '(' || ch == '[' || ch == ',' || IsTriggerAfterSpaceOrStartOfWordCharacter (text, position);
+		}
+
+		protected override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult result, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+
+			var tree = ctx.SyntaxTree;
+			var model = ctx.SemanticModel;
+			if (tree.IsInNonUserCode (position, cancellationToken))
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+
+			if (!ctx.CSharpSyntaxContext.IsAnyExpressionContext)
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			var enclosingType = model.GetEnclosingNamedType (position, cancellationToken);
+			if (enclosingType == null)
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			var memberMethods = enclosingType.GetMembers ().OfType<IMethodSymbol> ().Where (m => m.MethodKind == MethodKind.Ordinary).ToArray ();
+
+			var list = new List<CompletionData> ();
+			foreach (var type in ctx.InferredTypes) {
+				if (type.TypeKind != TypeKind.Delegate)
+					continue;
+
+				AddCompatibleMethods (engine, list, type, memberMethods, cancellationToken);
+
+				string delegateName = null;
+
+				if (ctx.TargetToken.IsKind (SyntaxKind.PlusEqualsToken)) {
+					delegateName = GuessEventHandlerBaseName (ctx.LeftToken.Parent, ctx.ContainingTypeDeclaration);
+				}
+
+				AddDelegateHandlers (list, ctx.TargetToken.Parent, model, engine, result, type, position, delegateName, cancellationToken);
+			}
+			if (list.Count > 0) {
+				result.AutoSelect = false;
+			}
+			return Task.FromResult ((IEnumerable<CompletionData>)list);
+		}
+
+		void AddCompatibleMethods (CompletionEngine engine, List<CompletionData> list, ITypeSymbol delegateType, IMethodSymbol [] memberMethods, CancellationToken cancellationToken)
+		{
+			var delegateMethod = delegateType.GetDelegateInvokeMethod ();
+			foreach (var method in memberMethods) {
+				if (method.ReturnType.Equals (delegateMethod.ReturnType) && SignatureComparer.HaveSameSignature (delegateMethod.Parameters, method.Parameters, false, false)) {
+					list.Add (engine.Factory.CreateExistingMethodDelegate (this, method));
+				}
+			}
+		}
+
+		static string GuessEventHandlerBaseName (SyntaxNode node, TypeDeclarationSyntax containingTypeDeclaration)
+		{
+			var addAssign = node as AssignmentExpressionSyntax;
+			if (addAssign == null)
+				return null;
+
+			var ident = addAssign.Left as IdentifierNameSyntax;
+			if (ident != null)
+				return ToPascalCase (containingTypeDeclaration.Identifier + "_" + ident);
+
+			var memberAccess = addAssign.Left as MemberAccessExpressionSyntax;
+			if (memberAccess != null)
+				return ToPascalCase (GetMemberAccessBaseName(memberAccess) + "_" + memberAccess.Name);
+
+			return null;
+		}
+
+		static string GetMemberAccessBaseName (MemberAccessExpressionSyntax memberAccess)
+		{
+			var ident = memberAccess.Expression as IdentifierNameSyntax;
+			if (ident != null)
+				return ident.ToString ();
+
+			var ma = memberAccess.Expression as MemberAccessExpressionSyntax;
+			if (ma != null)
+				return ma.Name.ToString ();
+
+			return "Handle";
+		}
+
+		static string ToPascalCase (string str)
+		{
+			var result = new StringBuilder ();
+			result.Append (char.ToUpper (str[0]));
+			bool nextUpper = false;
+			for (int i = 1; i < str.Length; i++) {
+				var ch = str [i];
+				if (nextUpper && char.IsLetter (ch)) {
+					ch = char.ToUpper (ch);
+                    nextUpper = false;
+				}
+				result.Append (ch);
+				if (ch == '_')
+					nextUpper = true;
+			}
+
+			return result.ToString ();
+		}
+
+		void AddDelegateHandlers (List<CompletionData> completionList, SyntaxNode parent, SemanticModel semanticModel, CompletionEngine engine, CompletionResult result, ITypeSymbol delegateType, int position, string optDelegateName, CancellationToken cancellationToken)
+		{
+			var delegateMethod = delegateType.GetDelegateInvokeMethod ();
+			result.PossibleDelegates.Add (delegateMethod);
+
+			var thisLineIndent = "";
+			string EolMarker = "\n";
+			bool addSemicolon = true;
+			bool addDefault = true;
+
+			string delegateEndString = EolMarker + thisLineIndent + "}" + (addSemicolon ? ";" : "");
+			//bool containsDelegateData = completionList.Result.Any(d => d.DisplayText.StartsWith("delegate("));
+			CompletionData item;
+			if (addDefault) {
+				item = engine.Factory.CreateAnonymousMethod (
+					this,
+					"delegate",
+					"Creates anonymous delegate.",
+					"delegate {" + EolMarker + thisLineIndent,
+					delegateEndString
+				);
+				if (!completionList.Any (i => i.DisplayText == item.DisplayText))
+					completionList.Add (item);
+
+				//if (LanguageVersion.Major >= 5)
+
+				item = engine.Factory.CreateAnonymousMethod (
+					this,
+					"async delegate",
+					"Creates anonymous async delegate.",
+					"async delegate {" + EolMarker + thisLineIndent,
+					delegateEndString
+				);
+				if (!completionList.Any (i => i.DisplayText == item.DisplayText))
+					completionList.Add (item);
+			}
+
+			var sb = new StringBuilder ("(");
+			var sbWithoutTypes = new StringBuilder ("(");
+			for (int k = 0; k < delegateMethod.Parameters.Length; k++) {
+				if (k > 0) {
+					sb.Append (", ");
+					sbWithoutTypes.Append (", ");
+				}
+				sb.Append (RoslynCompletionData.SafeMinimalDisplayString (delegateMethod.Parameters [k], semanticModel, position, overrideNameFormat));
+				sbWithoutTypes.Append (delegateMethod.Parameters [k].Name);
+			}
+
+			sb.Append (")");
+			sbWithoutTypes.Append (")");
+			var signature = sb.ToString ()
+				.Replace (", params ", ", ")
+				.Replace ("(params ", "(");
+
+			if (completionList.All (data => data.DisplayText != signature)) {
+				item = engine.Factory.CreateAnonymousMethod (
+					this,
+					signature + " =>",
+					"Creates typed lambda expression.",
+					signature + " => ",
+					(addSemicolon ? ";" : "")
+				);
+				if (!completionList.Any (i => i.DisplayText == item.DisplayText))
+					completionList.Add (item);
+
+				// if (LanguageVersion.Major >= 5) {
+
+				item = engine.Factory.CreateAnonymousMethod (
+					this,
+					"async " + signature + " =>",
+					"Creates typed async lambda expression.",
+					"async " + signature + " => ",
+					(addSemicolon ? ";" : "")
+				);
+				if (!completionList.Any (i => i.DisplayText == item.DisplayText))
+					completionList.Add (item);
+
+				var signatureWithoutTypes = sbWithoutTypes.ToString ();
+				if (!delegateMethod.Parameters.Any (p => p.RefKind != RefKind.None) && completionList.All (data => data.DisplayText != signatureWithoutTypes)) {
+					item = engine.Factory.CreateAnonymousMethod (
+						this,
+						signatureWithoutTypes + " =>",
+						"Creates typed lambda expression.",
+						signatureWithoutTypes + " => ",
+						(addSemicolon ? ";" : "")
+					);
+					if (!completionList.Any (i => i.DisplayText == item.DisplayText))
+						completionList.Add (item);
+
+					//if (LanguageVersion.Major >= 5) {
+					item = engine.Factory.CreateAnonymousMethod (
+						this,
+						"async " + signatureWithoutTypes + " =>",
+						"Creates typed async lambda expression.",
+						"async " + signatureWithoutTypes + " => ",
+						(addSemicolon ? ";" : "")
+					);
+					if (!completionList.Any (i => i.DisplayText == item.DisplayText))
+						completionList.Add (item);
+
+					//}
+				}
+			}
+			string varName = optDelegateName ?? "Handle" + delegateType.Name;
+
+            
+			var curType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol> (position, cancellationToken);
+			var uniqueName = new UniqueNameGenerator (semanticModel).CreateUniqueMethodName (parent, varName);
+			item = engine.Factory.CreateNewMethodDelegate (this, delegateType, uniqueName, curType);
+			if (!completionList.Any (i => i.DisplayText == item.DisplayText))
+				completionList.Add (item);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/EnumMemberContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/EnumMemberContextHandler.cs
new file mode 100644
index 0000000000..01b219567f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/EnumMemberContextHandler.cs
@@ -0,0 +1,137 @@
+//
+// EnumMemberContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.Recommendations;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.Options;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.CSharp.Completion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+
+//	class CompletionEngineCache
+//	{
+//		public List<INamespace>  namespaces;
+//		public ICompletionData[] importCompletion;
+//	}
+	
+	class EnumMemberContextHandler : CompletionContextHandler
+	{
+		public override bool IsCommitCharacter (CompletionData completionItem, char ch, string textTypedSoFar)
+		{
+			// Only commit on dot.
+			return ch == '.';
+		}
+
+		public override bool IsTriggerCharacter(SourceText text, int position)
+		{
+			// Bring up on space or at the start of a word, or after a ( or [.
+			//
+			// Note: we don't want to bring this up after traditional enum operators like & or |.
+			// That's because we don't like the experience where the enum appears directly after the
+			// operator.  Instead, the user normally types <space> and we will bring up the list
+			// then.
+			var ch = text[position];
+			return
+				ch == ' ' ||
+				ch == '[' ||
+				ch == '(' ||
+				(/*options.GetOption(CompletionOptions.TriggerOnTypingLetters, LanguageNames.CSharp) && CompletionUtilities.*/IsStartingNewWord(text, position));
+		}
+
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var model = ctx.SemanticModel;
+			var tree = ctx.SyntaxTree;
+			if (tree.IsInNonUserCode(completionContext.Position, cancellationToken))
+				return Enumerable.Empty<CompletionData> ();
+
+			var token = tree.FindTokenOnLeftOfPosition(completionContext.Position, cancellationToken);
+			if (token.IsMandatoryNamedParameterPosition())
+				return Enumerable.Empty<CompletionData> ();
+			var result = new List<CompletionData> ();
+
+			// check if it's the first parameter and set autoselect == false if a parameterless version exists.
+			if (token.IsKind (SyntaxKind.OpenParenToken)) {
+				var parent = token.Parent?.Parent;
+				if (parent == null)
+					return Enumerable.Empty<CompletionData> ();
+				var symbolInfo = model.GetSymbolInfo (parent);
+				foreach (var symbol in new [] { symbolInfo.Symbol }.Concat (symbolInfo.CandidateSymbols)) {
+					if (symbol != null && symbol.IsKind (SymbolKind.Method)) {
+						if (symbol.GetParameters ().Length == 0) {
+							completionResult.AutoSelect = false;
+							break;
+						}
+					}
+				}
+			}
+
+			foreach (var _type in ctx.InferredTypes) {
+				var type = _type;
+				if (type.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T) {
+					type = type.GetTypeArguments().FirstOrDefault();
+					if (type == null)
+						continue;
+				}
+
+				if (type.TypeKind != TypeKind.Enum)
+					continue;
+				if (!type.IsEditorBrowsable ())
+					continue;
+
+				// Does type have any aliases?
+				ISymbol alias = await type.FindApplicableAlias(completionContext.Position, model, cancellationToken).ConfigureAwait(false);
+
+				var displayString = RoslynCompletionData.SafeMinimalDisplayString (type, model, completionContext.Position, SymbolDisplayFormat.CSharpErrorMessageFormat);
+				if (string.IsNullOrEmpty (completionResult.DefaultCompletionString)) {
+					completionResult.DefaultCompletionString = displayString;
+					completionResult.AutoCompleteEmptyMatch = true;
+
+				}
+				result.Add (engine.Factory.CreateSymbolCompletionData(this, type, displayString));
+				foreach (IFieldSymbol field in type.GetMembers().OfType<IFieldSymbol>()) {
+					if (field.DeclaredAccessibility == Accessibility.Public && (field.IsConst || field.IsStatic)) {
+						result.Add (engine.Factory.CreateEnumMemberCompletionData(this, alias, field));
+					}
+				}
+			}
+			return result;
+		}
+	}
+
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ExplicitInterfaceContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ExplicitInterfaceContextHandler.cs
new file mode 100644
index 0000000000..ddda1d8dd5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ExplicitInterfaceContextHandler.cs
@@ -0,0 +1,154 @@
+//
+// ExplicitInterfaceContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class ExplicitInterfaceContextHandler : CompletionContextHandler
+	{
+		public override bool IsTriggerCharacter(SourceText text, int position)
+		{
+			return text[position] == '.';
+		}
+
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var position = completionContext.Position;
+			var document = completionContext.Document;
+			var span = new TextSpan(position, 0);
+			var semanticModel = await document.GetCSharpSemanticModelForSpanAsync(span, cancellationToken).ConfigureAwait(false);
+			var syntaxTree = semanticModel.SyntaxTree;
+			//	var ctx = await completionContext.GetSyntaxContextAsync (engine.Workspace, cancellationToken).ConfigureAwait (false);
+
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken) ||
+				syntaxTree.IsPreProcessorDirectiveContext(position, cancellationToken))
+			{
+				return Enumerable.Empty<CompletionData> ();
+			}
+
+			if (!syntaxTree.IsRightOfDotOrArrowOrColonColon(position, cancellationToken))
+			{
+				return Enumerable.Empty<CompletionData> ();
+			}
+
+			var node = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken)
+				.GetPreviousTokenIfTouchingWord(position)
+				.Parent;
+
+			if (node.Kind() == SyntaxKind.ExplicitInterfaceSpecifier)
+			{
+				return await GetCompletionsOffOfExplicitInterfaceAsync(
+					engine, document, semanticModel, position, ((ExplicitInterfaceSpecifierSyntax)node).Name, cancellationToken).ConfigureAwait(false);
+			}
+
+			return Enumerable.Empty<CompletionData> ();
+		}
+
+		private Task<IEnumerable<CompletionData>> GetCompletionsOffOfExplicitInterfaceAsync(
+			CompletionEngine engine, Document document, SemanticModel semanticModel, int position, NameSyntax name, CancellationToken cancellationToken)
+		{
+			// Bind the interface name which is to the left of the dot
+			var syntaxTree = semanticModel.SyntaxTree;
+			var nameBinding = semanticModel.GetSymbolInfo(name, cancellationToken);
+			// var context = CSharpSyntaxContext.CreateContext(document.Project.Solution.Workspace, semanticModel, position, cancellationToken);
+
+			var symbol = nameBinding.Symbol as ITypeSymbol;
+			if (symbol == null || symbol.TypeKind != TypeKind.Interface)
+			{
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			}
+
+			var members = semanticModel.LookupSymbols (
+	              position: name.SpanStart,
+	              container: symbol)
+				.Where (s => !s.IsStatic);
+			//	.FilterToVisibleAndBrowsableSymbols(document.ShouldHideAdvancedMembers(), semanticModel.Compilation);
+
+			// We're going to create a entry for each one, including the signature
+			var completions = new List<CompletionData>();
+
+//			var signatureDisplayFormat =
+//				new SymbolDisplayFormat(
+//					genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+//					memberOptions:
+//					SymbolDisplayMemberOptions.IncludeParameters,
+//					parameterOptions:
+//					SymbolDisplayParameterOptions.IncludeName |
+//					SymbolDisplayParameterOptions.IncludeType |
+//					SymbolDisplayParameterOptions.IncludeParamsRefOut,
+//					miscellaneousOptions:
+//					SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+//					SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+
+			var namePosition = name.SpanStart;
+
+			// var text = await context.SyntaxTree.GetTextAsync(cancellationToken).ConfigureAwait(false);
+			// var textChangeSpan = GetTextChangeSpan(text, context.Position);
+
+			foreach (var member in members)
+			{
+				// var displayString = member.ToMinimalDisplayString(semanticModel, namePosition, signatureDisplayFormat);
+				// var memberCopied = member;
+				// var insertionText = displayString;
+
+				completions.Add(engine.Factory.CreateSymbolCompletionData (this, member)
+
+					/*new SymbolCompletionItem(
+					this,
+					displayString,
+					insertionText: insertionText,
+					filterSpan: textChangeSpan,
+					position: position,
+					symbols: new List<ISymbol> { member },
+					context: context) */);
+			}
+
+			return Task.FromResult ((IEnumerable<CompletionData>)completions);
+		}
+
+//		public override TextChange GetTextChange(CompletionItem selectedItem, char? ch = default(char), string textTypedSoFar = null)
+//		{
+//			if (ch.HasValue && ch.Value == '(')
+//			{
+//				return new TextChange(selectedItem.FilterSpan, ((SymbolCompletionItem)selectedItem).Symbols[0].Name);
+//			}
+//
+//			return new TextChange(selectedItem.FilterSpan, selectedItem.DisplayText);
+//		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ExternAliasContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ExternAliasContextHandler.cs
new file mode 100644
index 0000000000..abb5d17e6c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ExternAliasContextHandler.cs
@@ -0,0 +1,73 @@
+//
+// ExternAliasContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class ExternAliasContextHandler : CompletionContextHandler
+	{
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+
+			var tree = ctx.SyntaxTree;
+
+			if (tree.IsInNonUserCode(position, cancellationToken))
+				return Enumerable.Empty<CompletionData> ();
+
+			var targetToken = tree.FindTokenOnLeftOfPosition(position, cancellationToken).GetPreviousTokenIfTouchingWord(position);
+			if (targetToken.IsKind(SyntaxKind.AliasKeyword) && targetToken.Parent.IsKind(SyntaxKind.ExternAliasDirective))
+			{
+				var compilation = await document.GetCSharpCompilationAsync(cancellationToken).ConfigureAwait(false);
+				var aliases = compilation.ExternalReferences.Where(r => r.Properties.Aliases != null).SelectMany(r => r.Properties.Aliases).ToSet();
+
+				if (aliases.Any())
+				{
+					var root = await tree.GetRootAsync(cancellationToken).ConfigureAwait(false);
+					var usedAliases = root.ChildNodes().OfType<ExternAliasDirectiveSyntax>().Where(e => !e.Identifier.IsMissing).Select(e => e.Identifier.ValueText);
+					foreach (var used in usedAliases) {
+						aliases.Remove (used); 
+					}
+					aliases.Remove(MetadataReferenceProperties.GlobalAlias);
+					return aliases.Select (e => engine.Factory.CreateGenericData (this, e, GenericDataType.Undefined));
+				}
+			}
+
+			return Enumerable.Empty<CompletionData> ();
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/FormatItemContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/FormatItemContextHandler.cs
new file mode 100644
index 0000000000..e59dfbb359
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/FormatItemContextHandler.cs
@@ -0,0 +1,269 @@
+//
+// FormatItemContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class FormatItemContextHandler : CompletionContextHandler
+	{
+		public override bool IsTriggerCharacter (Microsoft.CodeAnalysis.Text.SourceText text, int position)
+		{
+			var ch = text [position];
+			return ch == ':' || ch == '"';
+		}
+
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+			var semanticModel = ctx.SemanticModel;
+
+			if (ctx.TargetToken.Parent != null && ctx.TargetToken.Parent.Parent != null && 
+			    ctx.TargetToken.Parent.Parent.IsKind(SyntaxKind.Argument)) {
+				SourceText text;
+				if (!completionContext.Document.TryGetText (out text)) {
+					text = await completionContext.Document.GetTextAsync ();
+				}
+				var currentChar = text [completionContext.Position - 1];
+				if (ctx.TargetToken.Parent == null || !ctx.TargetToken.Parent.IsKind(SyntaxKind.StringLiteralExpression) ||
+				    ctx.TargetToken.Parent.Parent == null || !ctx.TargetToken.Parent.Parent.IsKind(SyntaxKind.Argument) ||
+				    ctx.TargetToken.Parent.Parent.Parent == null || !ctx.TargetToken.Parent.Parent.Parent.IsKind(SyntaxKind.ArgumentList) ||
+				    ctx.TargetToken.Parent.Parent.Parent.Parent == null || !ctx.TargetToken.Parent.Parent.Parent.Parent.IsKind(SyntaxKind.InvocationExpression)) {
+					return Enumerable.Empty<CompletionData> ();
+				}
+				var formatArgument = GetFormatItemNumber(document, position);
+				var invocationExpression = ctx.TargetToken.Parent.Parent.Parent.Parent as InvocationExpressionSyntax;
+				return GetFormatCompletionData(engine, semanticModel, invocationExpression, formatArgument, currentChar);
+			}
+
+			return Enumerable.Empty<CompletionData> ();
+		}
+
+
+		static readonly DateTime curDate = DateTime.Now;
+
+		IEnumerable<CompletionData> GenerateNumberFormatitems(CompletionEngine engine, bool isFloatingPoint)
+		{
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "D", "decimal", 123);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "D5", "decimal", 123);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "C", "currency", 123);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "C0", "currency", 123);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "E", "exponential", 1.23E4);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "E2", "exponential", 1.234);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "e2", "exponential", 1.234);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "F", "fixed-point", 123.45);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "F1", "fixed-point", 123.45);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "G", "general", 1.23E+56);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "g2", "general", 1.23E+56);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "N", "number", 12345.68);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "N1", "number", 12345.68);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "P", "percent", 12.34);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "P1", "percent", 12.34);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "R", "round-trip", 0.1230000001);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "X", "hexadecimal", 1234);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "x8", "hexadecimal", 1234);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "0000", "custom", 123);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "####", "custom", 123);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "##.###", "custom", 1.23);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "##.000", "custom", 1.23);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "## 'items'", "custom", 12);
+		}
+
+		IEnumerable<CompletionData> GenerateDateTimeFormatitems(CompletionEngine engine)
+		{
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "D", "long date", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "d", "short date", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "F", "full date long", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "f", "full date short", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "G", "general long", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "g", "general short", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "M", "month", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "O", "ISO 8601", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "R", "RFC 1123", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "s", "sortable", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "T", "long time", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "t", "short time", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "U", "universal full", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "u", "universal sortable", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "Y", "year month", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "yy-MM-dd", "custom", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "yyyy MMMMM dd", "custom", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "yy-MMM-dd ddd", "custom", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "yyyy-M-d dddd", "custom", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "hh:mm:ss t z", "custom", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "hh:mm:ss tt zz", "custom", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "HH:mm:ss tt zz", "custom", curDate);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "HH:m:s tt zz", "custom", curDate);
+
+		}
+
+		[Flags]
+		enum TestEnum
+		{
+			EnumCaseName = 0,
+			Flag1 = 1,
+			Flag2 = 2,
+			Flags
+		}
+
+		IEnumerable<CompletionData> GenerateEnumFormatitems(CompletionEngine engine)
+		{
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "G", "string value", TestEnum.EnumCaseName);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "F", "flags value", TestEnum.Flags);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "D", "integer value", TestEnum.Flags);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "X", "hexadecimal", TestEnum.Flags);
+		}
+
+		IEnumerable<CompletionData> GenerateTimeSpanFormatitems(CompletionEngine engine)
+		{
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "c", "invariant", new TimeSpan(0, 1, 23, 456));
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "G", "general long", new TimeSpan(0, 1, 23, 456));
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "g", "general short", new TimeSpan(0, 1, 23, 456));
+		}
+
+		static Guid defaultGuid = Guid.NewGuid();
+
+		IEnumerable<CompletionData> GenerateGuidFormatitems(CompletionEngine engine)
+		{
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "N", "digits", defaultGuid);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "D", "hypens", defaultGuid);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "B", "braces", defaultGuid);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, "P", "parentheses", defaultGuid);
+		}
+
+
+		static int GetFormatItemNumber(Document document, int offset)
+		{
+			int number = 0;
+			var o = offset - 2;
+			var text = document.GetTextAsync().Result;
+			while (o > 0) {
+				char ch = text[o];
+				if (ch == '{')
+					return number;
+				if (!char.IsDigit(ch))
+					break;
+				number = number * 10 + ch - '0';
+				o--;
+			}
+			return -1;
+		}
+
+		IEnumerable<CompletionData> GetFormatCompletionForType(CompletionEngine engine, ITypeSymbol type)
+		{
+			if (type == null) {
+				return GenerateNumberFormatitems (engine, false)
+					.Concat (GenerateDateTimeFormatitems (engine))
+					.Concat (GenerateTimeSpanFormatitems (engine))
+					.Concat (GenerateEnumFormatitems (engine))
+					.Concat (GenerateGuidFormatitems (engine));
+			}
+
+			switch (type.ToString()) {
+				case "long":
+				case "System.Int64":
+				case "ulong":
+				case "System.UInt64":
+				case "int":
+				case "System.Int32":
+				case "uint":
+				case "System.UInt32":
+				case "short":
+				case "System.Int16":
+				case "ushort":
+				case "System.UInt16":
+				case "byte":
+				case "System.Byte":
+				case "sbyte":
+				case "System.SByte":
+				return GenerateNumberFormatitems(engine, false);
+				case "float":
+				case "System.Single":
+				case "double":
+				case "System.Double":
+				case "decimal":
+				case "System.Decimal":
+				return GenerateNumberFormatitems(engine, true);
+				case "System.Enum":
+				return GenerateEnumFormatitems(engine);
+				case "System.DateTime":
+				return GenerateDateTimeFormatitems(engine);
+				case "System.TimeSpan":
+				return GenerateTimeSpanFormatitems(engine);
+				case "System.Guid":
+				return GenerateGuidFormatitems(engine);
+			}
+			return CompletionResult.Empty;
+		}
+
+		IEnumerable<CompletionData> GetFormatCompletionData(CompletionEngine engine, SemanticModel semanticModel, InvocationExpressionSyntax invocationExpression, int formatArgument, char currentChar)
+		{
+			var symbolInfo = semanticModel.GetSymbolInfo (invocationExpression);
+			var method = symbolInfo.Symbol as IMethodSymbol ?? symbolInfo.CandidateSymbols.OfType<IMethodSymbol> ().FirstOrDefault ();
+			var ma = invocationExpression.Expression as MemberAccessExpressionSyntax;
+
+			if (ma != null && ma.Name.ToString () == "ToString") {
+				if (method == null || currentChar != '"') {
+					return Enumerable.Empty<CompletionData> ();
+				}
+				if (method != null) {
+					return GetFormatCompletionForType (engine, method.ContainingType);
+				} else {
+					return Enumerable.Empty<CompletionData> ();
+				}
+			} else {
+				if(method == null || currentChar != ':') {
+					return Enumerable.Empty<CompletionData> ();
+				}
+				ExpressionSyntax fmtArgumets;
+				IList<ExpressionSyntax> args;
+				if (FormatStringHelper.TryGetFormattingParameters(semanticModel, invocationExpression, out fmtArgumets, out args, null)) {
+					ITypeSymbol type = null;
+					if (formatArgument  + 1< args.Count) {
+						var invokeArgument = semanticModel.GetSymbolInfo(args[formatArgument + 1]);
+						if (invokeArgument.Symbol != null)
+							type = invokeArgument.Symbol.GetReturnType();
+					}
+
+					return GetFormatCompletionForType(engine, type);
+				}
+			}
+			return Enumerable.Empty<CompletionData> ();
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/KeywordContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/KeywordContextHandler.cs
new file mode 100644
index 0000000000..13b0a61863
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/KeywordContextHandler.cs
@@ -0,0 +1,247 @@
+//
+// KeywordContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.Recommendations;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Text;
+using System.Threading.Tasks;
+using ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	internal sealed class RecommendedKeyword
+	{
+		public SyntaxKind Kind { get; private set; }
+		public string Keyword { get; private set; }
+		public bool IsIntrinsic { get; private set; }
+		public bool ShouldFormatOnCommit { get; private set; }
+
+
+		public RecommendedKeyword (string keyword, SyntaxKind kind, bool isIntrinsic = false, bool shouldFormatOnCommit = false)
+		{
+			this.Kind = kind;
+			this.Keyword = keyword;
+			this.IsIntrinsic = isIntrinsic;
+			this.ShouldFormatOnCommit = shouldFormatOnCommit;
+		}
+		
+	}
+
+	internal interface IKeywordRecommender<TContext>
+	{
+		IEnumerable<RecommendedKeyword> RecommendKeywords(int position, TContext context, CancellationToken cancellationToken);
+	}
+
+	class KeywordContextHandler : CompletionContextHandler
+	{
+		static readonly IKeywordRecommender<CSharpSyntaxContext>[] recommender = {
+			new AbstractKeywordRecommender(),
+			new AddKeywordRecommender(),
+			new AliasKeywordRecommender(),
+			new AscendingKeywordRecommender(),
+			new AsKeywordRecommender(),
+			new AssemblyKeywordRecommender(),
+			new AsyncKeywordRecommender(),
+			new AwaitKeywordRecommender(),
+			new BaseKeywordRecommender(),
+			new BoolKeywordRecommender(),
+			new BreakKeywordRecommender(),
+			new ByKeywordRecommender(),
+			new ByteKeywordRecommender(),
+			new CaseKeywordRecommender(),
+			new CatchKeywordRecommender(),
+			new CharKeywordRecommender(),
+			new CheckedKeywordRecommender(),
+			new ChecksumKeywordRecommender(),
+			new ClassKeywordRecommender(),
+			new ConstKeywordRecommender(),
+			new ContinueKeywordRecommender(),
+			new DecimalKeywordRecommender(),
+			new DefaultKeywordRecommender(),
+			new DefineKeywordRecommender(),
+			new DelegateKeywordRecommender(),
+			new DescendingKeywordRecommender(),
+			new DisableKeywordRecommender(),
+			new DoKeywordRecommender(),
+			new DoubleKeywordRecommender(),
+			new DynamicKeywordRecommender(),
+			new ElifKeywordRecommender(),
+			new ElseKeywordRecommender(),
+			new EndIfKeywordRecommender(),
+			new EndRegionKeywordRecommender(),
+			new EnumKeywordRecommender(),
+			new EqualsKeywordRecommender(),
+			new ErrorKeywordRecommender(),
+			new EventKeywordRecommender(),
+			new ExplicitKeywordRecommender(),
+			new ExternKeywordRecommender(),
+			new FalseKeywordRecommender(),
+			new FieldKeywordRecommender(),
+			new FinallyKeywordRecommender(),
+			new FixedKeywordRecommender(),
+			new FloatKeywordRecommender(),
+			new ForEachKeywordRecommender(),
+			new ForKeywordRecommender(),
+			new FromKeywordRecommender(),
+			new GetKeywordRecommender(),
+			new GlobalKeywordRecommender(),
+			new GotoKeywordRecommender(),
+			new GroupKeywordRecommender(),
+			new HiddenKeywordRecommender(),
+			new IfKeywordRecommender(),
+			new ImplicitKeywordRecommender(),
+			new InKeywordRecommender(),
+			new InterfaceKeywordRecommender(),
+			new InternalKeywordRecommender(),
+			new IntKeywordRecommender(),
+			new IntoKeywordRecommender(),
+			new IsKeywordRecommender(),
+			new JoinKeywordRecommender(),
+			new LetKeywordRecommender(),
+			new LineKeywordRecommender(),
+			new LockKeywordRecommender(),
+			new LongKeywordRecommender(),
+			new MethodKeywordRecommender(),
+			new ModuleKeywordRecommender(),
+			new NameOfKeywordRecommender(),
+			new NamespaceKeywordRecommender(),
+			new NewKeywordRecommender(),
+			new NullKeywordRecommender(),
+			new ObjectKeywordRecommender(),
+			new OnKeywordRecommender(),
+			new OperatorKeywordRecommender(),
+			new OrderByKeywordRecommender(),
+			new OutKeywordRecommender(),
+			new OverrideKeywordRecommender(),
+			new ParamKeywordRecommender(),
+			new ParamsKeywordRecommender(),
+			new PartialKeywordRecommender(),
+			new PragmaKeywordRecommender(),
+			new PrivateKeywordRecommender(),
+			new PropertyKeywordRecommender(),
+			new ProtectedKeywordRecommender(),
+			new PublicKeywordRecommender(),
+			new ReadOnlyKeywordRecommender(),
+			new ReferenceKeywordRecommender(),
+			new RefKeywordRecommender(),
+			new RegionKeywordRecommender(),
+			new RemoveKeywordRecommender(),
+			new RestoreKeywordRecommender(),
+			new ReturnKeywordRecommender(),
+			new SByteKeywordRecommender(),
+			new SealedKeywordRecommender(),
+			new SelectKeywordRecommender(),
+			new SetKeywordRecommender(),
+			new ShortKeywordRecommender(),
+			new SizeOfKeywordRecommender(),
+			new StackAllocKeywordRecommender(),
+			new StaticKeywordRecommender(),
+			new StringKeywordRecommender(),
+			new StructKeywordRecommender(),
+			new SwitchKeywordRecommender(),
+			new ThisKeywordRecommender(),
+			new ThrowKeywordRecommender(),
+			new TrueKeywordRecommender(),
+			new TryKeywordRecommender(),
+			new TypeKeywordRecommender(),
+			new TypeOfKeywordRecommender(),
+			new TypeVarKeywordRecommender(),
+			new UIntKeywordRecommender(),
+			new ULongKeywordRecommender(),
+			new UncheckedKeywordRecommender(),
+			new UndefKeywordRecommender(),
+			new UnsafeKeywordRecommender(),
+			new UShortKeywordRecommender(),
+			new UsingKeywordRecommender(),
+			new VarKeywordRecommender(),
+			new VirtualKeywordRecommender(),
+			new VoidKeywordRecommender(),
+			new VolatileKeywordRecommender(),
+			new WarningKeywordRecommender(),
+//			new WhenKeywordRecommender(),
+			new WhereKeywordRecommender(),
+			new WhileKeywordRecommender(),
+			new YieldKeywordRecommender()
+		};
+
+		public override bool IsTriggerCharacter (Microsoft.CodeAnalysis.Text.SourceText text, int position)
+		{
+			var ch = text [position];
+			return ch == '#' || 
+				ch == ' ' && position >= 1 && !char.IsWhiteSpace (text [position - 1]) ||
+				IsStartingNewWord (text, position);
+		}
+
+		protected override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var model = ctx.SemanticModel;
+			if (ctx.CSharpSyntaxContext.IsInNonUserCode) {
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			}
+
+			if (ctx.TargetToken.IsKind (SyntaxKind.OverrideKeyword))
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+
+			if (info.CompletionTriggerReason == CompletionTriggerReason.CharTyped && info.TriggerCharacter == ' ') {
+				if (!ctx.CSharpSyntaxContext.IsEnumBaseListContext && !ctx.LeftToken.IsKind (SyntaxKind.EqualsToken) && !ctx.LeftToken.IsKind (SyntaxKind.EqualsEqualsToken))
+					return Task.FromResult (Enumerable.Empty<CompletionData> ());
+//				completionResult.AutoCompleteEmptyMatch = false;
+			}
+
+			var result = new List<CompletionData> ();
+
+			foreach (var r in recommender) {
+				var recommended = r.RecommendKeywords (completionContext.Position, ctx.CSharpSyntaxContext, cancellationToken);
+				if (recommended == null)
+					continue;
+				foreach (var kw in recommended) {
+					result.Add (engine.Factory.CreateKeywordCompletion (this, kw.Keyword, kw.Kind));
+				}
+			}
+		
+//			if (ctx.IsPreProcessorKeywordContext) {
+//				foreach (var kw in preprocessorKeywords)
+//					result.Add(factory.CreateGenericData (this, kw, GenericDataType.PreprocessorKeyword));
+//			}
+//			
+
+//			if (parent.IsKind(SyntaxKind.TypeParameterConstraintClause)) {
+//				result.Add(factory.CreateGenericData (this, "new()", GenericDataType.PreprocessorKeyword));
+//			}
+			return Task.FromResult ((IEnumerable<CompletionData>)result);
+		} 
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/NamedParameterContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/NamedParameterContextHandler.cs
new file mode 100644
index 0000000000..4d607424e5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/NamedParameterContextHandler.cs
@@ -0,0 +1,220 @@
+//
+// NamedParameterContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class NamedParameterContextHandler : CompletionContextHandler, IEqualityComparer<IParameterSymbol>
+	{
+
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+			var syntaxTree = ctx.SyntaxTree;
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken))
+			{
+				return null;
+			}
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() != SyntaxKind.OpenParenToken &&
+				token.Kind() != SyntaxKind.OpenBracketToken &&
+				token.Kind() != SyntaxKind.CommaToken)
+			{
+				return null;
+			}
+
+			var argumentList = token.Parent as BaseArgumentListSyntax;
+			if (argumentList == null)
+			{
+				return null;
+			}
+
+			var semanticModel = await document.GetCSharpSemanticModelForNodeAsync(argumentList, cancellationToken).ConfigureAwait(false);
+			var parameterLists = GetParameterLists(semanticModel, position, argumentList.Parent, cancellationToken);
+			if (parameterLists == null)
+			{
+				return null;
+			}
+
+			var existingNamedParameters = GetExistingNamedParameters(argumentList, position);
+			parameterLists = parameterLists.Where(pl => IsValid(pl, existingNamedParameters));
+
+			var unspecifiedParameters = parameterLists.SelectMany(pl => pl)
+				.Where(p => !existingNamedParameters.Contains(p.Name))
+				.Distinct(this);
+
+			// var text = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
+
+			return unspecifiedParameters
+				.Select(p => engine.Factory.CreateGenericData(this, p.Name + ":", GenericDataType.NamedParameter));
+		}
+
+
+		private bool IsValid(ImmutableArray<IParameterSymbol> parameterList, ISet<string> existingNamedParameters)
+		{
+			// A parameter list is valid if it has parameters that match in name all the existing
+			// named parameters that have been provided.
+			return existingNamedParameters.Except(parameterList.Select(p => p.Name)).IsEmpty();
+		}
+
+		private ISet<string> GetExistingNamedParameters(BaseArgumentListSyntax argumentList, int position)
+		{
+			var existingArguments = argumentList.Arguments.Where(a => a.Span.End <= position && a.NameColon != null)
+				.Select(a => a.NameColon.Name.Identifier.ValueText);
+
+			return existingArguments.ToSet();
+		}
+
+		private IEnumerable<ImmutableArray<IParameterSymbol>> GetParameterLists(
+			SemanticModel semanticModel,
+			int position,
+			SyntaxNode invocableNode,
+			CancellationToken cancellationToken)
+		{
+			return invocableNode.TypeSwitch(
+				(InvocationExpressionSyntax invocationExpression) => GetInvocationExpressionParameterLists(semanticModel, position, invocationExpression, cancellationToken),
+				(ConstructorInitializerSyntax constructorInitializer) => GetConstructorInitializerParameterLists(semanticModel, position, constructorInitializer, cancellationToken),
+				(ElementAccessExpressionSyntax elementAccessExpression) => GetElementAccessExpressionParameterLists(semanticModel, position, elementAccessExpression, cancellationToken),
+				(ObjectCreationExpressionSyntax objectCreationExpression) => GetObjectCreationExpressionParameterLists(semanticModel, position, objectCreationExpression, cancellationToken));
+		}
+
+		private IEnumerable<ImmutableArray<IParameterSymbol>> GetObjectCreationExpressionParameterLists(
+			SemanticModel semanticModel,
+			int position,
+			ObjectCreationExpressionSyntax objectCreationExpression,
+			CancellationToken cancellationToken)
+		{
+			var type = semanticModel.GetTypeInfo(objectCreationExpression, cancellationToken).Type as INamedTypeSymbol;
+			var within = semanticModel.GetEnclosingNamedType(position, cancellationToken);
+			if (type != null && within != null && type.TypeKind != TypeKind.Delegate)
+			{
+				return type.InstanceConstructors.Where(c => c.IsAccessibleWithin(within))
+					.Select(c => c.Parameters);
+			}
+
+			return null;
+		}
+
+		private IEnumerable<ImmutableArray<IParameterSymbol>> GetElementAccessExpressionParameterLists(
+			SemanticModel semanticModel,
+			int position,
+			ElementAccessExpressionSyntax elementAccessExpression,
+			CancellationToken cancellationToken)
+		{
+			var expressionSymbol = semanticModel.GetSymbolInfo(elementAccessExpression.Expression, cancellationToken).GetAnySymbol();
+			var expressionType = semanticModel.GetTypeInfo(elementAccessExpression.Expression, cancellationToken).Type;
+
+			if (expressionSymbol != null && expressionType != null)
+			{
+				var indexers = semanticModel.LookupSymbols(position, expressionType, WellKnownMemberNames.Indexer).OfType<IPropertySymbol>();
+				var within = semanticModel.GetEnclosingNamedTypeOrAssembly(position, cancellationToken);
+				if (within != null)
+				{
+					return indexers.Where(i => i.IsAccessibleWithin(within, throughTypeOpt: expressionType))
+						.Select(i => i.Parameters);
+				}
+			}
+
+			return null;
+		}
+
+		private IEnumerable<ImmutableArray<IParameterSymbol>> GetConstructorInitializerParameterLists(
+			SemanticModel semanticModel,
+			int position,
+			ConstructorInitializerSyntax constructorInitializer,
+			CancellationToken cancellationToken)
+		{
+			var within = semanticModel.GetEnclosingNamedType(position, cancellationToken);
+			if (within != null &&
+				(within.TypeKind == TypeKind.Struct || within.TypeKind == TypeKind.Class))
+			{
+				var type = constructorInitializer.Kind() == SyntaxKind.BaseConstructorInitializer
+					? within.BaseType
+					: within;
+
+				if (type != null)
+				{
+					return type.InstanceConstructors.Where(c => c.IsAccessibleWithin(within))
+						.Select(c => c.Parameters);
+				}
+			}
+
+			return null;
+		}
+
+		private IEnumerable<ImmutableArray<IParameterSymbol>> GetInvocationExpressionParameterLists(
+			SemanticModel semanticModel,
+			int position,
+			InvocationExpressionSyntax invocationExpression,
+			CancellationToken cancellationToken)
+		{
+			var within = semanticModel.GetEnclosingNamedTypeOrAssembly(position, cancellationToken);
+			if (within != null)
+			{
+				var methodGroup = semanticModel.GetMemberGroup(invocationExpression.Expression, cancellationToken).OfType<IMethodSymbol>();
+				var expressionType = semanticModel.GetTypeInfo(invocationExpression.Expression, cancellationToken).Type as INamedTypeSymbol;
+
+				if (methodGroup.Any())
+				{
+					return methodGroup.Where(m => m.IsAccessibleWithin(within))
+						.Select(m => m.Parameters);
+				}
+				else if (expressionType.IsDelegateType())
+				{
+					var delegateType = (INamedTypeSymbol)expressionType;
+					return SpecializedCollections.SingletonEnumerable(delegateType.DelegateInvokeMethod.Parameters);
+				}
+			}
+
+			return null;
+		}
+
+		bool IEqualityComparer<IParameterSymbol>.Equals(IParameterSymbol x, IParameterSymbol y)
+		{
+			return x.Name.Equals(y.Name);
+		}
+
+		int IEqualityComparer<IParameterSymbol>.GetHashCode(IParameterSymbol obj)
+		{
+			return obj.Name.GetHashCode();
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ObjectCreationContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ObjectCreationContextHandler.cs
new file mode 100644
index 0000000000..fabe16b413
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ObjectCreationContextHandler.cs
@@ -0,0 +1,231 @@
+//
+// ObjectCreationContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class ObjectCreationContextHandler : CompletionContextHandler
+	{
+		// static readonly ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders.NewKeywordRecommender nkr = new ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders.NewKeywordRecommender ();
+
+		public override bool IsTriggerCharacter (Microsoft.CodeAnalysis.Text.SourceText text, int position)
+		{
+			return IsTriggerAfterSpaceOrStartOfWordCharacter (text, position);
+		}
+
+		public override bool IsCommitCharacter (CompletionData completionItem, char ch, string textTypedSoFar)
+		{
+			return ch == ' ' || ch == '(' || ch == '{' || ch == '[';
+		}
+
+		static string[] primitiveTypesKeywords = {
+			// "void",
+			"object",
+			"bool",
+			"byte",
+			"sbyte",
+			"char",
+			"short",
+			"int",
+			"long",
+			"ushort",
+			"uint",
+			"ulong",
+			"float",
+			"double",
+			"decimal",
+			"string"
+		};
+		static SyntaxKind[] primitiveTypesKeywordKinds = {
+			// "void",
+			SyntaxKind.ObjectKeyword,
+			SyntaxKind.BoolKeyword,
+			SyntaxKind.ByteKeyword,
+			SyntaxKind.SByteKeyword,
+			SyntaxKind.CharKeyword,
+			SyntaxKind.ShortKeyword,
+			SyntaxKind.IntKeyword,
+			SyntaxKind.LongKeyword,
+			SyntaxKind.UShortKeyword,
+			SyntaxKind.UIntKeyword,
+			SyntaxKind.ULongKeyword,
+			SyntaxKind.FloatKeyword,
+			SyntaxKind.DoubleKeyword,
+			SyntaxKind.DecimalKeyword,
+			SyntaxKind.StringKeyword
+		};
+
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult result, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var list = new List<CompletionData> ();
+
+			var newExpression = GetObjectCreationNewExpression (ctx.SyntaxTree, completionContext.Position, cancellationToken);
+			if (newExpression == null) {
+				if (ctx.SyntaxTree.IsInNonUserCode(completionContext.Position, cancellationToken) ||
+					ctx.SyntaxTree.IsPreProcessorDirectiveContext(completionContext.Position, cancellationToken))
+					return Enumerable.Empty<CompletionData> ();
+
+//				if (!nkr.IsValid (completionContext.Position, ctx.CSharpSyntaxContext, cancellationToken))
+//					return Enumerable.Empty<ICompletionData> ();
+
+				var tokenOnLeftOfPosition = ctx.SyntaxTree.FindTokenOnLeftOfPosition (completionContext.Position, cancellationToken);
+				if (!tokenOnLeftOfPosition.IsKind (SyntaxKind.EqualsToken) && !tokenOnLeftOfPosition.Parent.IsKind (SyntaxKind.EqualsValueClause))
+					return Enumerable.Empty<CompletionData> ();
+	
+				foreach (var inferredType in SyntaxContext.InferenceService.InferTypes (ctx.CSharpSyntaxContext.SemanticModel, completionContext.Position, cancellationToken)) {
+					if (inferredType.IsEnumType () || inferredType.IsInterfaceType () || inferredType.IsAbstract)
+						continue;
+					foreach (var symbol in await GetPreselectedSymbolsWorker(ctx.CSharpSyntaxContext, inferredType, completionContext.Position - 1, cancellationToken)) {
+						var symbolCompletionData = engine.Factory.CreateObjectCreation (this, inferredType, symbol, completionContext.Position, false);
+						list.Add (symbolCompletionData);
+					}	
+				}
+				return list;
+			}
+
+			var type = SyntaxContext.InferenceService.InferType (ctx.CSharpSyntaxContext.SemanticModel, newExpression, objectAsDefault: false, cancellationToken: cancellationToken);
+
+			foreach (var symbol in await GetPreselectedSymbolsWorker(ctx.CSharpSyntaxContext, type, completionContext.Position, cancellationToken)) {
+				var symbolCompletionData = engine.Factory.CreateObjectCreation (this, type, symbol, newExpression.SpanStart, true);
+				list.Add (symbolCompletionData);
+				if (string.IsNullOrEmpty (result.DefaultCompletionString)) {
+					result.DefaultCompletionString = symbolCompletionData.DisplayText;
+					result.AutoCompleteEmptyMatch = true;
+				}
+			}
+			for (int i = 0; i < primitiveTypesKeywords.Length; i++) {
+				var keyword = primitiveTypesKeywords [i];
+				list.Add (engine.Factory.CreateKeywordCompletion (this, keyword, primitiveTypesKeywordKinds[i]));
+			}
+
+			return list;
+		}
+
+
+		static Task<IEnumerable<ISymbol>> GetPreselectedSymbolsWorker2 (CSharpSyntaxContext context, ITypeSymbol type, CancellationToken cancellationToken)
+		{
+			// Unwrap an array type fully.  We only want to offer the underlying element type in the
+			// list of completion items.
+			bool isArray = false;
+			while (type is IArrayTypeSymbol) {
+				isArray = true;
+				type = ((IArrayTypeSymbol)type).ElementType;
+			}
+
+			if (type == null) {
+				return Task.FromResult (Enumerable.Empty<ISymbol> ());
+			}
+
+			// Unwrap nullable
+			if (type.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T) {
+				type = type.GetTypeArguments ().FirstOrDefault ();
+			}
+
+			if (type.SpecialType == SpecialType.System_Void) {
+				return Task.FromResult (Enumerable.Empty<ISymbol> ());
+			}
+
+			if (type.ContainsAnonymousType ()) {
+				return Task.FromResult (Enumerable.Empty<ISymbol> ());
+			}
+
+			if (!type.CanBeReferencedByName) {
+				return Task.FromResult (Enumerable.Empty<ISymbol> ());
+			}
+
+			// Normally the user can't say things like "new IList".  Except for "IList[] x = new |".
+			// In this case we do want to allow them to preselect certain types in the completion
+			// list even if they can't new them directly.
+			if (!isArray) {
+				if (type.TypeKind == TypeKind.Interface ||
+				    type.TypeKind == TypeKind.Pointer ||
+				    type.TypeKind == TypeKind.Dynamic ||
+				    type.IsAbstract) {
+					return Task.FromResult (Enumerable.Empty<ISymbol> ());
+				}
+
+				if (type.TypeKind == TypeKind.TypeParameter &&
+				    !((ITypeParameterSymbol)type).HasConstructorConstraint) {
+					return Task.FromResult (Enumerable.Empty<ISymbol> ());
+				}
+			}
+
+//			if (!type.IsEditorBrowsable(options.GetOption(RecommendationOptions.HideAdvancedMembers, context.SemanticModel.Language), context.SemanticModel.Compilation))
+//			{
+//				return SpecializedTasks.EmptyEnumerable<ISymbol>();
+//			}
+//
+			return Task.FromResult (SpecializedCollections.SingletonEnumerable ((ISymbol)type));
+		}
+
+		static async Task<IEnumerable<ISymbol>> GetPreselectedSymbolsWorker (CSharpSyntaxContext context, ITypeSymbol inferredType, int position, CancellationToken cancellationToken)
+		{
+			var result = await GetPreselectedSymbolsWorker2 (context, inferredType, cancellationToken).ConfigureAwait (false);
+			if (result.Any ()) {
+				var type = (ITypeSymbol)result.Single ();
+				var alias = await type.FindApplicableAlias (position, context.SemanticModel, cancellationToken).ConfigureAwait (false);
+				if (alias != null) {
+					return SpecializedCollections.SingletonEnumerable (alias);
+				}
+			}
+
+			return result;
+		}
+
+		internal static SyntaxNode GetObjectCreationNewExpression (SyntaxTree tree, int position, CancellationToken cancellationToken)
+		{
+			if (tree != null) {
+				if (!tree.IsInNonUserCode (position, cancellationToken)) {
+					var tokenOnLeftOfPosition = tree.FindTokenOnLeftOfPosition (position, cancellationToken);
+					var newToken = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord (position);
+
+					// Only after 'new'.
+					if (newToken.Kind () == SyntaxKind.NewKeyword) {
+						// Only if the 'new' belongs to an object creation expression (and isn't a 'new'
+						// modifier on a member).
+						if (tree.IsObjectCreationTypeContext (position, tokenOnLeftOfPosition, cancellationToken)) {
+							return newToken.Parent as ExpressionSyntax;
+						}
+					}
+				}
+			}
+
+			return null;
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ObjectInitializerContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ObjectInitializerContextHandler.cs
new file mode 100644
index 0000000000..48b71efef0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/ObjectInitializerContextHandler.cs
@@ -0,0 +1,253 @@
+//
+// ObjectInitializerContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class ObjectInitializerContextHandler : CompletionContextHandler
+	{
+		public override bool SendEnterThroughToEditor (CompletionData completionItem, string textTypedSoFar)
+		{
+			return false;
+		}
+		public override async Task<bool> IsExclusiveAsync (CompletionContext completionContext, SyntaxContext syntaxContext, CompletionTriggerInfo triggerInfo, CancellationToken cancellationToken)
+		{
+			// We're exclusive if this context could only be an object initializer and not also a
+			// collection initializer. If we're initializing something that could be initialized as
+			// an object or as a collection, say we're not exclusive. That way the rest of
+			// intellisense can be used in the collection intitializer.
+			// 
+			// Consider this case:
+
+			// class c : IEnumerable<int> 
+			// { 
+			// public void Add(int addend) { }
+			// public int foo; 
+			// }
+
+			// void foo()
+			// {
+			//    var b = new c {|
+			// }
+
+			// There we could initialize b using either an object initializer or a collection
+			// initializer. Since we don't know which the user will use, we'll be non-exclusive, so
+			// the other providers can help the user write the collection initializer, if they want
+			// to.
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+			var tree = await document.GetCSharpSyntaxTreeAsync (cancellationToken).ConfigureAwait (false);
+
+			if (tree.IsInNonUserCode (position, cancellationToken)) {
+				return false;
+			}
+
+			var token = tree.FindTokenOnLeftOfPosition (position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord (position);
+
+			if (token.Parent == null) {
+				return false;
+			}
+
+			var expression = token.Parent.Parent as ExpressionSyntax;
+			if (expression == null) {
+				return false;
+			}
+
+			var semanticModel = await document.GetCSharpSemanticModelForNodeAsync (expression, cancellationToken).ConfigureAwait (false);
+			var initializedType = semanticModel.GetTypeInfo (expression, cancellationToken).Type;
+			if (initializedType == null) {
+				return false;
+			}
+
+			// Non-exclusive if initializedType can be initialized as a collection.
+			if (initializedType.CanSupportCollectionInitializer ()) {
+				return false;
+			}
+
+			// By default, only our member names will show up.
+			return true;
+		}
+
+		public override bool IsTriggerCharacter (Microsoft.CodeAnalysis.Text.SourceText text, int characterPosition)
+		{
+			return base.IsTriggerCharacter (text, characterPosition) || text [characterPosition] == ' ';
+		}
+
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+			var workspace = document.Project.Solution.Workspace;
+			var semanticModel = await document.GetSemanticModelForSpanAsync (new TextSpan (position, 0), cancellationToken).ConfigureAwait (false);
+			var typeAndLocation = GetInitializedType (document, semanticModel, position, cancellationToken);
+			if (typeAndLocation == null)
+				return Enumerable.Empty<CompletionData> ();
+
+			var initializedType = typeAndLocation.Item1 as INamedTypeSymbol;
+			var initializerLocation = typeAndLocation.Item2;
+			if (initializedType == null)
+				return Enumerable.Empty<CompletionData> ();
+
+			// Find the members that can be initialized. If we have a NamedTypeSymbol, also get the overridden members.
+			IEnumerable<ISymbol> members = semanticModel.LookupSymbols (position, initializedType);
+			members = members.Where (m => IsInitializable (m, initializedType) &&
+				 m.CanBeReferencedByName &&
+				 IsLegalFieldOrProperty (m) &&
+				 !m.IsImplicitlyDeclared);
+
+			// Filter out those members that have already been typed
+			var alreadyTypedMembers = GetInitializedMembers (semanticModel.SyntaxTree, position, cancellationToken);
+			var uninitializedMembers = members.Where (m => !alreadyTypedMembers.Contains (m.Name));
+
+			uninitializedMembers = uninitializedMembers.Where (m => m.IsEditorBrowsable ());
+
+			// var text = await semanticModel.SyntaxTree.GetTextAsync(cancellationToken).ConfigureAwait(false);
+			// var changes = GetTextChangeSpan(text, position);
+			var list = new List<CompletionData> ();
+
+			// Return the members
+			foreach (var member in uninitializedMembers) {
+				list.Add (engine.Factory.CreateSymbolCompletionData (this, member));
+			}
+			return list;
+		}
+
+		static bool IsLegalFieldOrProperty (ISymbol symbol)
+		{
+			var type = symbol.GetMemberType ();
+			if (type != null && type.CanSupportCollectionInitializer ()) {
+				return true;
+			}
+
+			return symbol.IsWriteableFieldOrProperty ();
+		}
+
+
+		static bool IsInitializable (ISymbol member, INamedTypeSymbol containingType)
+		{
+			var propertySymbol = member as IPropertySymbol;
+			if (propertySymbol != null) {
+				if (propertySymbol.Parameters.Any (p => !p.IsOptional))
+					return false;
+			}
+
+
+			return
+				!member.IsStatic &&
+				member.MatchesKind (SymbolKind.Field, SymbolKind.Property) &&
+				member.IsAccessibleWithin (containingType);
+		}
+
+
+		static Tuple<ITypeSymbol, Location> GetInitializedType (Document document, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var tree = semanticModel.SyntaxTree;
+			if (tree.IsInNonUserCode (position, cancellationToken)) {
+				return null;
+			}
+
+			var token = tree.FindTokenOnLeftOfPosition (position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord (position);
+
+			if (token.Kind () != SyntaxKind.CommaToken && token.Kind () != SyntaxKind.OpenBraceToken) {
+				return null;
+			}
+
+			if (token.Parent == null || token.Parent.Parent == null) {
+				return null;
+			}
+
+			// If we got a comma, we can syntactically find out if we're in an ObjectInitializerExpression
+			if (token.Kind () == SyntaxKind.CommaToken &&
+				token.Parent.Kind () != SyntaxKind.ObjectInitializerExpression) {
+				return null;
+			}
+
+			// new Foo { bar = $$
+			if (token.Parent.Parent.IsKind (SyntaxKind.ObjectCreationExpression)) {
+				var objectCreation = token.Parent.Parent as ObjectCreationExpressionSyntax;
+				if (objectCreation == null) {
+					return null;
+				}
+
+				var ctor = semanticModel.GetSymbolInfo (objectCreation, cancellationToken).Symbol;
+				var type = ctor != null ? ctor.ContainingType : null;
+				if (type == null) {
+					type = semanticModel.GetSpeculativeTypeInfo (objectCreation.SpanStart, objectCreation.Type, SpeculativeBindingOption.BindAsTypeOrNamespace).Type as INamedTypeSymbol;
+				}
+
+				return Tuple.Create<ITypeSymbol, Location> (type, token.GetLocation ());
+			}
+
+			// Nested: new Foo { bar = { $$
+			if (token.Parent.Parent.IsKind (SyntaxKind.SimpleAssignmentExpression)) {
+				// Use the type inferrer to get the type being initialzied.
+				var typeInferenceService = TypeGuessing.typeInferenceService;
+				var parentInitializer = token.GetAncestor<InitializerExpressionSyntax> ();
+
+				var expectedType = typeInferenceService.InferType (semanticModel, parentInitializer, objectAsDefault: false, cancellationToken: cancellationToken);
+				return Tuple.Create (expectedType, token.GetLocation ());
+			}
+
+			return null;
+		}
+
+		static HashSet<string> GetInitializedMembers (SyntaxTree tree, int position, CancellationToken cancellationToken)
+		{
+			var token = tree.FindTokenOnLeftOfPosition (position, cancellationToken)
+				.GetPreviousTokenIfTouchingWord (position);
+
+			// We should have gotten back a { or ,
+			if (token.Kind () == SyntaxKind.CommaToken || token.Kind () == SyntaxKind.OpenBraceToken) {
+				if (token.Parent != null) {
+					var initializer = token.Parent as InitializerExpressionSyntax;
+
+					if (initializer != null) {
+						return new HashSet<string> (initializer.Expressions.OfType<AssignmentExpressionSyntax> ()
+							.Where (b => b.OperatorToken.Kind () == SyntaxKind.EqualsToken)
+							.Select (b => b.Left)
+							.OfType<IdentifierNameSyntax> ()
+							.Select (i => i.Identifier.ValueText));
+					}
+				}
+			}
+
+			return new HashSet<string> ();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/OverrideContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/OverrideContextHandler.cs
new file mode 100644
index 0000000000..aa0699864c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/OverrideContextHandler.cs
@@ -0,0 +1,431 @@
+//
+// OverrideContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System.Linq;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp;
+using System;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class OverrideContextHandler : CompletionContextHandler
+	{
+		public override bool IsTriggerCharacter (SourceText text, int position)
+		{
+			return IsTriggerAfterSpaceOrStartOfWordCharacter (text, position);
+		}
+
+		public override async Task<bool> IsExclusiveAsync (CompletionContext completionContext, SyntaxContext ctx, CompletionTriggerInfo triggerInfo, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var semanticModel = ctx.SemanticModel;
+			var tree = ctx.SyntaxTree;
+			if (tree.IsInNonUserCode(completionContext.Position, cancellationToken))
+				return false;
+
+			var text = await document.GetTextAsync (cancellationToken).ConfigureAwait (false);
+
+			var startLineNumber = text.Lines.IndexOf (completionContext.Position);
+
+			// modifiers* override modifiers* type? |
+			Accessibility seenAccessibility;
+			//DeclarationModifiers modifiers;
+			var token = tree.FindTokenOnLeftOfPosition(completionContext.Position, cancellationToken);
+			if (token.Parent == null)
+				return false;
+			
+			var parentMember = token.Parent.AncestorsAndSelf ().OfType<MemberDeclarationSyntax> ().FirstOrDefault (m => !m.IsKind (SyntaxKind.IncompleteMember));
+
+			if (!(parentMember is BaseTypeDeclarationSyntax) &&
+
+			    /* May happen in case: 
+				 * 
+				 * override $
+				 * public override string Foo () {} 
+				 */
+			    !(token.IsKind (SyntaxKind.OverrideKeyword) && token.Span.Start <= parentMember.Span.Start))
+				return false;
+
+			var position = completionContext.Position;
+			var startToken = token.GetPreviousTokenIfTouchingWord(position);
+			ITypeSymbol returnType;
+			SyntaxToken tokenBeforeReturnType;
+			TryDetermineReturnType (startToken, semanticModel, cancellationToken, out returnType, out tokenBeforeReturnType);
+			if (returnType == null) {
+				var enclosingType = semanticModel.GetEnclosingSymbol (position, cancellationToken) as INamedTypeSymbol;
+				if (enclosingType != null && (startToken.IsKind (SyntaxKind.OpenBraceToken) || startToken.IsKind (SyntaxKind.CloseBraceToken) || startToken.IsKind (SyntaxKind.SemicolonToken))) {
+					return false;
+				}
+			}
+
+			if (!TryDetermineModifiers(ref tokenBeforeReturnType, text, startLineNumber, out seenAccessibility/*, out modifiers*/) ||
+			    !TryCheckForTrailingTokens (tree, text, startLineNumber, position, cancellationToken)) {
+				return false;
+			}
+			return true;
+		}
+
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			// var ctx = await completionContext.GetSyntaxContextAsync (engine.Workspace, cancellationToken).ConfigureAwait (false);
+			var document = completionContext.Document;
+			var semanticModel = ctx.SemanticModel;
+			var tree = ctx.SyntaxTree;
+			if (tree.IsInNonUserCode(completionContext.Position, cancellationToken))
+				return Enumerable.Empty<CompletionData> ();
+
+			var text = await document.GetTextAsync (cancellationToken).ConfigureAwait (false);
+
+			var startLineNumber = text.Lines.IndexOf (completionContext.Position);
+
+			// modifiers* override modifiers* type? |
+			Accessibility seenAccessibility;
+			//DeclarationModifiers modifiers;
+			var token = tree.FindTokenOnLeftOfPosition (completionContext.Position, cancellationToken);
+			if (token.Parent == null)
+				return Enumerable.Empty<CompletionData> ();
+
+			// don't show up in that case: int { $$
+			if (token.Parent.IsKind (SyntaxKind.SkippedTokensTrivia))
+				return Enumerable.Empty<CompletionData> ();
+			var im = token.Parent.Ancestors ().OfType<IncompleteMemberSyntax> ().FirstOrDefault ();
+			if (im != null) {
+				var token2 = tree.FindTokenOnLeftOfPosition (im.Span.Start, cancellationToken);
+				if (token2.Parent.IsKind (SyntaxKind.SkippedTokensTrivia))
+					return Enumerable.Empty<CompletionData> ();
+			}
+
+			var parentMember = token.Parent.AncestorsAndSelf ().OfType<MemberDeclarationSyntax> ().FirstOrDefault (m => !m.IsKind (SyntaxKind.IncompleteMember));
+
+			if (!(parentMember is BaseTypeDeclarationSyntax) &&
+
+				/* May happen in case: 
+				 * 
+				 * override $
+				 * public override string Foo () {} 
+				 */
+				!(token.IsKind (SyntaxKind.OverrideKeyword) && token.Span.Start <= parentMember.Span.Start))
+				return Enumerable.Empty<CompletionData> ();
+
+            var position = completionContext.Position;
+            var startToken = token.GetPreviousTokenIfTouchingWord(position);
+			ITypeSymbol returnType;
+			SyntaxToken tokenBeforeReturnType;
+			TryDetermineReturnType (startToken, semanticModel, cancellationToken, out returnType, out tokenBeforeReturnType);
+			if (returnType == null) {
+				var enclosingType = semanticModel.GetEnclosingSymbol (position, cancellationToken) as INamedTypeSymbol;
+				if (enclosingType != null && (startToken.IsKind (SyntaxKind.OpenBraceToken) || startToken.IsKind (SyntaxKind.CloseBraceToken) || startToken.IsKind (SyntaxKind.SemicolonToken))) {
+					return CreateCompletionData (engine, semanticModel, position, returnType, Accessibility.NotApplicable, startToken, tokenBeforeReturnType, false, cancellationToken);
+				}
+			}
+
+			if (!TryDetermineModifiers(ref tokenBeforeReturnType, text, startLineNumber, out seenAccessibility/*, out modifiers*/) ||
+			    !TryCheckForTrailingTokens (tree, text, startLineNumber, position, cancellationToken)) {
+				return Enumerable.Empty<CompletionData> ();
+			}
+
+			return CreateCompletionData (engine, semanticModel, position, returnType, seenAccessibility, startToken, tokenBeforeReturnType, true, cancellationToken);
+		}
+
+		protected virtual IEnumerable<CompletionData> CreateCompletionData (CompletionEngine engine, SemanticModel semanticModel, int position, ITypeSymbol returnType, Accessibility seenAccessibility, SyntaxToken startToken, SyntaxToken tokenBeforeReturnType, bool afterKeyword, CancellationToken cancellationToken)
+		{
+			var result = new List<CompletionData> ();
+			ISet<ISymbol> overridableMembers;
+			if (!TryDetermineOverridableMembers (semanticModel, tokenBeforeReturnType, seenAccessibility, out overridableMembers, cancellationToken)) {
+				return result;
+			}
+			if (returnType != null) {
+				overridableMembers = FilterOverrides (overridableMembers, returnType);
+			}
+			var curType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol> (position, cancellationToken);
+			var declarationBegin = afterKeyword ? startToken.Parent.SpanStart : position - 1;
+			foreach (var m in overridableMembers) {
+				var data = engine.Factory.CreateNewOverrideCompletionData (this, declarationBegin, curType, m, afterKeyword);
+				result.Add (data);
+			}
+			return result;
+		}
+
+		protected static ISet<ISymbol> FilterOverrides(ISet<ISymbol> members, ITypeSymbol returnType)
+		{
+			var filteredMembers = new HashSet<ISymbol>(
+				from m in members
+				where m.GetReturnType ().ToString () ==  returnType.ToString ()
+				select m);
+
+			// Don't filter by return type if we would then have nothing to show.
+			// This way, the user gets completion even if they speculatively typed the wrong return type
+			if (filteredMembers.Count > 0)
+			{
+				members = filteredMembers;
+			}
+
+			return members;
+		}
+
+		static bool TryDetermineReturnType(SyntaxToken startToken, SemanticModel semanticModel, CancellationToken cancellationToken, out ITypeSymbol returnType, out SyntaxToken nextToken)
+		{
+			nextToken = startToken;
+			returnType = null;
+			if (startToken.Parent is TypeSyntax)
+			{
+				var typeSyntax = (TypeSyntax)startToken.Parent;
+
+				// 'partial' is actually an identifier.  If we see it just bail.  This does mean
+				// we won't handle overrides that actually return a type called 'partial'.  And
+				// not a single tear was shed.
+				if (typeSyntax is IdentifierNameSyntax &&
+				    ((IdentifierNameSyntax)typeSyntax).Identifier.IsKindOrHasMatchingText(SyntaxKind.PartialKeyword))
+				{
+					return false;
+				}
+
+				returnType = semanticModel.GetTypeInfo(typeSyntax, cancellationToken).Type;
+				nextToken = typeSyntax.GetFirstToken().GetPreviousToken();
+			}
+
+			return true;
+		}
+
+
+		static bool HasOverridden (ISymbol original, ISymbol testSymbol)
+		{
+			if (original.Kind != testSymbol.Kind)
+				return false;
+			switch (testSymbol.Kind) {
+				case SymbolKind.Method:
+				return ((IMethodSymbol)testSymbol).OverriddenMethod == original;
+				case SymbolKind.Property:
+				return ((IPropertySymbol)testSymbol).OverriddenProperty == original;
+				case SymbolKind.Event:
+				return ((IEventSymbol)testSymbol).OverriddenEvent == original;
+			}
+			return false;
+		}
+
+		public static bool IsOverridable(ISymbol member, INamedTypeSymbol containingType)
+		{
+			if (member.IsAbstract || member.IsVirtual || member.IsOverride) {
+				if (member.IsSealed) {
+					return false;
+				}
+
+				if (!member.IsAccessibleWithin(containingType)) {
+					return false;
+				}
+
+				switch (member.Kind) {
+					case SymbolKind.Event:
+					return true;
+					case SymbolKind.Method:
+					return ((IMethodSymbol)member).MethodKind == MethodKind.Ordinary;
+					case SymbolKind.Property:
+					return !((IPropertySymbol)member).IsWithEvents;
+				}
+			}
+			return false;
+		}
+
+		internal static bool TryDetermineOverridableMembers(SemanticModel semanticModel, SyntaxToken startToken, Accessibility seenAccessibility, out ISet<ISymbol> overridableMembers, CancellationToken cancellationToken)
+		{
+			var result = new HashSet<ISymbol>();
+			var containingType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol>(startToken.SpanStart, cancellationToken);
+			if (containingType != null && !containingType.IsScriptClass && !containingType.IsImplicitClass)
+			{
+				if (containingType.TypeKind == TypeKind.Class || containingType.TypeKind == TypeKind.Struct)
+				{
+					var baseTypes = containingType.GetBaseTypes().Reverse();
+					foreach (var type in baseTypes)
+					{
+						cancellationToken.ThrowIfCancellationRequested();
+
+						// Prefer overrides in derived classes
+						RemoveOverriddenMembers(result, type, cancellationToken);
+
+						// Retain overridable methods
+						AddOverridableMembers(result, containingType, type, cancellationToken);
+					}
+					// Don't suggest already overridden members
+					RemoveOverriddenMembers(result, containingType, cancellationToken);
+				}
+			}
+
+			// Filter based on accessibility
+			if (seenAccessibility != Accessibility.NotApplicable)
+			{
+				result.RemoveWhere(m => m.DeclaredAccessibility != seenAccessibility);
+			}
+
+			overridableMembers = result;
+			return overridableMembers.Count > 0;
+		}
+
+		static void AddOverridableMembers(HashSet<ISymbol> result, INamedTypeSymbol containingType, INamedTypeSymbol type, CancellationToken cancellationToken)
+		{
+			foreach (var member in type.GetMembers())
+			{
+				cancellationToken.ThrowIfCancellationRequested();
+
+				if (IsOverridable(member, containingType))
+				{
+					result.Add(member);
+				}
+			}
+		}
+
+		protected static void RemoveOverriddenMembers(HashSet<ISymbol> result, INamedTypeSymbol containingType, CancellationToken cancellationToken)
+		{
+			foreach (var member in containingType.GetMembers())
+			{
+				cancellationToken.ThrowIfCancellationRequested();
+				var overriddenMember = member.OverriddenMember();
+				if (overriddenMember != null)
+				{
+					result.Remove(overriddenMember);
+				}
+			}
+		}
+
+
+		static bool TryCheckForTrailingTokens (SyntaxTree tree, SourceText text, int startLineNumber, int position, CancellationToken cancellationToken)
+		{
+			var root = tree.GetRoot (cancellationToken);
+			var token = root.FindToken (position);
+
+			// Don't want to offer Override completion if there's a token after the current
+			// position.
+			if (token.SpanStart > position) {
+				return false;
+			}
+
+			// If the next token is also on our line then we don't want to offer completion.
+			if (IsOnStartLine (text, startLineNumber, token.GetNextToken ().SpanStart)) {
+				return false;
+			}
+
+			return true;
+		}
+
+		static bool IsOnStartLine (SourceText text, int startLineNumber, int position)
+		{
+			return text.Lines.IndexOf (position) == startLineNumber;
+		}
+
+		static bool TryDetermineModifiers(ref SyntaxToken startToken, SourceText text, int startLine, out Accessibility seenAccessibility/*, out DeclarationModifiers modifiers*/)
+		{
+			var token = startToken;
+			//modifiers = new DeclarationModifiers();
+			seenAccessibility = Accessibility.NotApplicable;
+			var overrideToken = default(SyntaxToken);
+
+			while (IsOnStartLine(token.SpanStart, text, startLine) && !token.IsKind(SyntaxKind.None))
+			{
+				switch (token.Kind())
+				{
+					//case SyntaxKind.UnsafeKeyword:
+					//	       isUnsafe = true;
+					//break;
+					case SyntaxKind.OverrideKeyword:
+						       overrideToken = token;
+					break;
+					//case SyntaxKind.SealedKeyword:
+					//	       isSealed = true;
+					//break;
+					//case SyntaxKind.AbstractKeyword:
+					//	       isAbstract = true;
+					//break;
+					case SyntaxKind.ExternKeyword:
+					break;
+
+						// Filter on the most recently typed accessibility; keep the first one we see
+					case SyntaxKind.PublicKeyword:
+						       if (seenAccessibility == Accessibility.NotApplicable)
+						{
+							seenAccessibility = Accessibility.Public;
+						}
+
+					break;
+					case SyntaxKind.InternalKeyword:
+						       if (seenAccessibility == Accessibility.NotApplicable)
+						{
+							seenAccessibility = Accessibility.Internal;
+						}
+
+						// If we see internal AND protected, filter for protected internal
+						if (seenAccessibility == Accessibility.Protected)
+						{
+							seenAccessibility = Accessibility.ProtectedOrInternal;
+						}
+
+					break;
+					case SyntaxKind.ProtectedKeyword:
+						       if (seenAccessibility == Accessibility.NotApplicable)
+						{
+							seenAccessibility = Accessibility.Protected;
+						}
+
+						// If we see protected AND internal, filter for protected internal
+						if (seenAccessibility == Accessibility.Internal)
+						{
+							seenAccessibility = Accessibility.ProtectedOrInternal;
+						}
+
+					break;
+					default:
+						// Anything else and we bail.
+					return false;
+				}
+
+				var previousToken = token.GetPreviousToken();
+
+				// We want only want to consume modifiers
+				if (previousToken.IsKind(SyntaxKind.None) || !IsOnStartLine(previousToken.SpanStart, text, startLine))
+				{
+					break;
+				}
+
+				token = previousToken;
+			}
+
+			startToken = token;
+		/*	modifiers = new DeclarationModifiers ()
+				.WithIsUnsafe (isUnsafe)
+				.WithIsAbstract (isAbstract)
+				.WithIsOverride (true)
+				.WithIsSealed (isSealed);*/
+			return overrideToken.IsKind(SyntaxKind.OverrideKeyword) && IsOnStartLine(overrideToken.Parent.SpanStart, text, startLine);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/PartialContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/PartialContextHandler.cs
new file mode 100644
index 0000000000..8f656edf60
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/PartialContextHandler.cs
@@ -0,0 +1,203 @@
+//
+// PartialContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Linq;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp;
+using System;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class PartialContextHandler : CompletionContextHandler
+	{
+		public override bool IsTriggerCharacter (SourceText text, int position)
+		{
+			return IsTriggerAfterSpaceOrStartOfWordCharacter (text, position);
+		}
+
+		public override Task<bool> IsExclusiveAsync (CompletionContext completionContext, SyntaxContext ctx, CompletionTriggerInfo triggerInfo, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+			var tree = ctx.SyntaxTree;
+
+			//DeclarationModifiers modifiers;
+			SyntaxToken token;
+
+			var semanticModel = ctx.SemanticModel;
+			var enclosingSymbol = semanticModel.GetEnclosingSymbol (position, cancellationToken) as INamedTypeSymbol;
+
+			// Only inside classes and structs
+			if (enclosingSymbol == null || !(enclosingSymbol.TypeKind == TypeKind.Struct || enclosingSymbol.TypeKind == TypeKind.Class)) {
+				return Task.FromResult (false);
+			}
+
+			if (!IsPartialCompletionContext (tree, position, cancellationToken/*, out modifiers*/, out token)) {
+				return Task.FromResult (false);
+			}
+
+			return Task.FromResult (true);
+
+		}
+
+		protected override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+			var tree = ctx.SyntaxTree;
+
+			//DeclarationModifiers modifiers;
+			SyntaxToken token;
+
+			var semanticModel = ctx.SemanticModel;
+			var enclosingSymbol = semanticModel.GetEnclosingSymbol (position, cancellationToken) as INamedTypeSymbol;
+
+			// Only inside classes and structs
+			if (enclosingSymbol == null || !(enclosingSymbol.TypeKind == TypeKind.Struct || enclosingSymbol.TypeKind == TypeKind.Class)) {
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			}
+
+			if (!IsPartialCompletionContext (tree, position, cancellationToken/*, out modifiers*/, out token)) {
+				if (enclosingSymbol != null && (token.IsKind (SyntaxKind.OpenBraceToken) || token.IsKind (SyntaxKind.CloseBraceToken) || token.IsKind (SyntaxKind.SemicolonToken))) {
+					return Task.FromResult (CreateCompletionData (engine, semanticModel, position, enclosingSymbol, token, false, cancellationToken));
+				}
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			}
+
+			return Task.FromResult (CreateCompletionData (engine, semanticModel, position, enclosingSymbol, token, true, cancellationToken));
+		}
+
+		protected virtual IEnumerable<CompletionData> CreateCompletionData (CompletionEngine engine, SemanticModel semanticModel, int position, INamedTypeSymbol enclosingType, SyntaxToken token, bool afterPartialKeyword, CancellationToken cancellationToken)
+		{
+			var symbols = semanticModel.LookupSymbols(position, container: enclosingType)
+				.OfType<IMethodSymbol>()
+				.Where(m => IsPartial(m) && m.PartialImplementationPart == null);
+
+			var list = new List<CompletionData> ();
+
+			var declarationBegin = afterPartialKeyword ? token.Parent.SpanStart : position - 1;
+			foreach (var m in symbols) {
+				var data = engine.Factory.CreatePartialCompletionData (
+					this,
+					declarationBegin,
+					enclosingType,
+					m,
+					afterPartialKeyword
+				);
+				list.Add (data); 
+			}
+			return list;
+		}
+
+		static bool IsPartial(IMethodSymbol m)
+		{
+			if (m.DeclaredAccessibility != Accessibility.NotApplicable &&
+				m.DeclaredAccessibility != Accessibility.Private)
+			{
+				return false;
+			}
+
+			if (!m.ReturnsVoid)
+			{
+				return false;
+			}
+
+			if (m.IsVirtual)
+			{
+				return false;
+			}
+
+			var declarations = m.DeclaringSyntaxReferences.Select(r => r.GetSyntax()).OfType<MethodDeclarationSyntax>();
+			return declarations.Any(d => d.Body == null && d.Modifiers.Any(SyntaxKind.PartialKeyword));
+		}
+
+		static bool IsPartialCompletionContext(SyntaxTree tree, int position, CancellationToken cancellationToken, /*out DeclarationModifiers modifiers, */out SyntaxToken token)
+		{
+			var touchingToken = tree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			var targetToken = touchingToken.GetPreviousTokenIfTouchingWord(position);
+			var text = tree.GetText(cancellationToken);
+
+			token = targetToken;
+
+			//modifiers = default(DeclarationModifiers);
+
+			if (targetToken.IsKind(SyntaxKind.VoidKeyword, SyntaxKind.PartialKeyword) ||
+				(targetToken.Kind() == SyntaxKind.IdentifierToken && targetToken.HasMatchingText(SyntaxKind.PartialKeyword)))
+			{
+				return !IsOnSameLine (touchingToken.GetNextToken (), touchingToken, text) &&
+				VerifyModifiers (tree, position, cancellationToken/*, out modifiers*/);
+			}
+
+			return false;
+		}
+
+		static bool VerifyModifiers(SyntaxTree tree, int position, CancellationToken cancellationToken/*, out DeclarationModifiers modifiers*/)
+		{
+			var touchingToken = tree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			var token = touchingToken.GetPreviousToken();
+
+			bool foundPartial = touchingToken.IsKindOrHasMatchingText(SyntaxKind.PartialKeyword);
+			//bool foundAsync = false;
+
+			while (IsOnSameLine(token, touchingToken, tree.GetText(cancellationToken)))
+			{
+				if (token.IsKind(SyntaxKind.ExternKeyword, SyntaxKind.PublicKeyword, SyntaxKind.ProtectedKeyword, SyntaxKind.InternalKeyword))
+				{
+					//modifiers = default(DeclarationModifiers);
+					return false;
+				}
+
+				//if (token.IsKindOrHasMatchingText(SyntaxKind.AsyncKeyword))
+				//{
+				//	foundAsync = true;
+				//}
+
+				foundPartial = foundPartial || token.IsKindOrHasMatchingText(SyntaxKind.PartialKeyword);
+
+				token = token.GetPreviousToken();
+			}
+
+			/*modifiers = new DeclarationModifiers()
+				.WithPartial(true)
+				.WithAsync (foundAsync);*/
+			return foundPartial;
+		}
+
+		static bool IsOnSameLine(SyntaxToken syntaxToken, SyntaxToken touchingToken, SourceText text)
+		{
+			return !syntaxToken.IsKind(SyntaxKind.None)
+				&& !touchingToken.IsKind(SyntaxKind.None)
+				&& text.Lines.IndexOf(syntaxToken.SpanStart) == text.Lines.IndexOf(touchingToken.SpanStart);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/PreProcessorExpressionContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/PreProcessorExpressionContextHandler.cs
new file mode 100644
index 0000000000..0a9051cec3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/PreProcessorExpressionContextHandler.cs
@@ -0,0 +1,59 @@
+//
+// PreProcessorExpressionContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class PreProcessorExpressionContextHandler : CompletionContextHandler
+	{
+		public override bool IsTriggerCharacter (Microsoft.CodeAnalysis.Text.SourceText text, int position)
+		{
+			return IsTriggerAfterSpaceOrStartOfWordCharacter (text, position);
+		}
+
+		protected override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var model = ctx.SemanticModel;
+
+			var result = new List<CompletionData> ();
+			if (ctx.IsPreProcessorExpressionContext) {
+				var parseOptions = model.SyntaxTree.Options as CSharpParseOptions;
+				foreach (var define in parseOptions.PreprocessorSymbolNames) {
+					result.Add(engine.Factory.CreateGenericData (this, define, GenericDataType.PreprocessorSymbol));
+				}
+			}
+			return Task.FromResult ((IEnumerable<CompletionData>)result);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/RegexContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/RegexContextHandler.cs
new file mode 100644
index 0000000000..c53f466fd2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/RegexContextHandler.cs
@@ -0,0 +1,170 @@
+//
+// RegexContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis.Text;
+using ICSharpCode.NRefactory6.CSharp.Analysis;
+using MonoDevelop.Ide;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{	
+	class RegexContextHandler : CompletionContextHandler
+	{
+		public override bool IsTriggerCharacter (Microsoft.CodeAnalysis.Text.SourceText text, int position)
+		{
+			var ch = text [position];
+			return ch == '\\' || base.IsTriggerCharacter (text, position);
+		}
+
+		protected override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+			var semanticModel = ctx.SemanticModel;
+			if (info.TriggerCharacter == '\\') {
+				if (ctx.TargetToken.Parent != null && ctx.TargetToken.Parent.Parent != null &&
+				ctx.TargetToken.Parent.Parent.IsKind (SyntaxKind.Argument)) {
+					var argument = ctx.TargetToken.Parent.Parent as ArgumentSyntax;
+
+					var symbolInfo = semanticModel.GetSymbolInfo (ctx.TargetToken.Parent.Parent.Parent.Parent);
+					if (symbolInfo.Symbol == null)
+						return TaskUtil.EmptyEnumerable<CompletionData> ();
+
+					if (SemanticHighlightingVisitor<int>.IsRegexMatchMethod (symbolInfo)) {
+						if (((ArgumentListSyntax)argument.Parent).Arguments [1] != argument)
+							return TaskUtil.EmptyEnumerable<CompletionData> ();
+						completionResult.AutoSelect = false;
+						return Task.FromResult (GetFormatCompletionData (engine, argument.Expression.ToString () [0] == '@'));
+					}
+					if (SemanticHighlightingVisitor<int>.IsRegexConstructor (symbolInfo)) {
+						if (((ArgumentListSyntax)argument.Parent).Arguments [0] != argument)
+							return TaskUtil.EmptyEnumerable<CompletionData> ();
+						completionResult.AutoSelect = false;
+						return Task.FromResult (GetFormatCompletionData (engine, argument.Expression.ToString () [0] == '@'));
+					}
+				}
+			} else {
+				var ma = ctx.TargetToken.Parent as MemberAccessExpressionSyntax;
+				if (ma != null) {
+					var symbolInfo = semanticModel.GetSymbolInfo (ma.Expression);
+					var typeInfo = semanticModel.GetTypeInfo (ma.Expression);
+					var type = typeInfo.Type;
+					if (type != null && type.Name == "Match"  && type.ContainingNamespace.GetFullName () == "System.Text.RegularExpressions" ) {
+						var items = new List<CompletionData>();
+						foreach (var grp in GetGroups (ctx, symbolInfo.Symbol)) {
+							items.Add (engine.Factory.CreateGenericData (this, "Groups[\"" + grp + "\"]", GenericDataType.Undefined));
+						}
+
+						return Task.FromResult ((IEnumerable<CompletionData>)items);
+					}
+				}
+			}
+			return TaskUtil.EmptyEnumerable<CompletionData> ();
+		}
+
+		IEnumerable<string> GetGroups (SyntaxContext ctx, ISymbol symbol)
+		{
+			var root = ctx.SyntaxTree.GetRoot ();
+			foreach (var decl in symbol.DeclaringSyntaxReferences) {
+				Optional<object> val = null;
+
+				var node = root.FindNode (decl.Span) as VariableDeclaratorSyntax;
+				if (node == null)
+					continue;
+				var invocation = node.Initializer.Value as InvocationExpressionSyntax;
+				var invocationSymbol = ctx.SemanticModel.GetSymbolInfo (invocation).Symbol;
+				if (invocationSymbol.Name == "Match" && SemanticHighlightingVisitor<int>.IsRegexType (invocationSymbol.ContainingType)) {
+					if (invocation.ArgumentList.Arguments.Count == 1) {
+						var memberAccess = invocation.Expression as MemberAccessExpressionSyntax;
+						if (memberAccess == null)
+							continue;
+						var target = ctx.SemanticModel.GetSymbolInfo (memberAccess.Expression).Symbol;
+						if (target.DeclaringSyntaxReferences.Length == 0)
+							continue;
+						var targetNode = root.FindNode (target.DeclaringSyntaxReferences.First ().Span) as VariableDeclaratorSyntax;
+						if (targetNode == null)
+							continue;
+						var objectCreation = targetNode.Initializer.Value as ObjectCreationExpressionSyntax;
+						if (objectCreation == null)
+							continue;
+						var targetNodeSymbol = ctx.SemanticModel.GetSymbolInfo (objectCreation).Symbol;
+						if (SemanticHighlightingVisitor<int>.IsRegexType (targetNodeSymbol.ContainingType)) {
+							if (objectCreation.ArgumentList.Arguments.Count < 1)
+								continue;
+							val = ctx.SemanticModel.GetConstantValue (objectCreation.ArgumentList.Arguments [0].Expression);
+						}
+					} else {
+						if (invocation.ArgumentList.Arguments.Count < 2)
+							continue;
+						val = ctx.SemanticModel.GetConstantValue (invocation.ArgumentList.Arguments [1].Expression);
+					}
+
+					if (!val.HasValue)
+						continue;
+					var str = val.Value.ToString ();
+					int idx = -1;
+					while  ((idx = str.IndexOf ("(?<", idx + 1, StringComparison.Ordinal)) >= 0) {
+						var closingIndex = str.IndexOf (">", idx, StringComparison.Ordinal);
+						if (closingIndex >= idx) {
+							yield return str.Substring (idx + 3, closingIndex - idx - 3);
+							idx = closingIndex - 1;
+						}
+					}
+				}
+			}
+		}
+
+		IEnumerable<CompletionData> GetFormatCompletionData (CompletionEngine engine, bool isVerbatimString)
+		{
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"d", "Digit character", null);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"D", "Non-digit character", null);
+
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"b", "Word boundary", null);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"B", "Non-word boundary", null);
+
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"w", "Word character", null);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"W", "Non-word character", null);
+
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"s", "White-space character", null);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"S", "Non-white-space character", null);
+
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"A", "Start boundary", null);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"Z", "End boundary", null);
+
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"k<name>", "Named backreference", null);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"P{name}", "Negative unicode category or unicode block", null);
+			yield return engine.Factory.CreateFormatItemCompletionData(this, (isVerbatimString ? "" : "\\") +"p{name}", "Unicode category or unicode block", null);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/RoslynRecommendationsCompletionContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/RoslynRecommendationsCompletionContextHandler.cs
new file mode 100644
index 0000000000..ba0e749494
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/RoslynRecommendationsCompletionContextHandler.cs
@@ -0,0 +1,188 @@
+//
+// RoslynRecommendationsCompletionContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.Recommendations;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+
+	//	class CompletionEngineCache
+	//	{
+	//		public List<INamespace>  namespaces;
+	//		public ICompletionData[] importCompletion;
+	//	}
+
+	class RoslynRecommendationsCompletionContextHandler : CompletionContextHandler
+	{
+		public override bool IsTriggerCharacter (SourceText text, int position)
+		{
+			var ch = text [position];
+			return ch == '.' || 
+				ch == ' ' && position >= 1 && !char.IsWhiteSpace (text [position - 1]) ||
+				ch == '#' || // pre processor directives 
+				ch == '>' && position >= 1 && text [position - 1] == '-' || // pointer member access
+				ch == ':' && position >= 1 && text [position - 1] == ':' || // alias name
+				IsStartingNewWord (text, position);
+		}
+
+		bool IsException (ITypeSymbol type)
+		{
+			if (type == null)
+				return false;
+			if (type.Name == "Exception" && type.ContainingNamespace.Name == "System")
+				return true;
+			return IsException (type.BaseType);
+		}
+
+		protected override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var semanticModel = ctx.SemanticModel;
+			var result = new List<CompletionData> ();
+			if (info.TriggerCharacter == ' ') {
+				var newExpression = ObjectCreationContextHandler.GetObjectCreationNewExpression (ctx.SyntaxTree, completionContext.Position, cancellationToken);
+				if (newExpression == null && info.CompletionTriggerReason == CompletionTriggerReason.CharTyped  && !ctx.LeftToken.IsKind (SyntaxKind.EqualsToken) && !ctx.LeftToken.IsKind (SyntaxKind.EqualsEqualsToken))
+					return Task.FromResult (Enumerable.Empty<CompletionData> ());
+
+				completionResult.AutoCompleteEmptyMatch = false;
+			}
+
+			var parent = ctx.TargetToken.Parent;
+			bool isInAttribute = ctx.CSharpSyntaxContext.IsAttributeNameContext;
+			bool isInBaseList = parent != null && parent.IsKind (SyntaxKind.BaseList);
+			bool isInUsingDirective = parent != null && parent.Parent != null && parent.Parent.IsKind (SyntaxKind.UsingDirective) && !parent.IsKind (SyntaxKind.QualifiedName);
+			var isInQuery = ctx.CSharpSyntaxContext.IsInQuery;
+			var completionDataLookup = new Dictionary<Tuple<string, SymbolKind>, ISymbolCompletionData> ();
+			bool isInCatchTypeExpression = parent != null && parent.IsKind (SyntaxKind.CatchDeclaration) || 
+			                               parent.IsKind (SyntaxKind.QualifiedName) && parent.Parent != null && parent.Parent.IsKind (SyntaxKind.CatchDeclaration);
+			Action<ISymbolCompletionData> addData = d => {
+				var key = Tuple.Create (d.DisplayText, d.Symbol.Kind);
+				ISymbolCompletionData data;
+				if (completionDataLookup.TryGetValue (key, out data)) {
+					data.AddOverload (d);
+					return;
+				}
+				completionDataLookup.Add (key, d);
+				result.Add (d);
+			};
+
+			var completionCategoryLookup = new Dictionary<string, CompletionCategory> ();
+			foreach (var symbol in Recommender.GetRecommendedSymbolsAtPosition (semanticModel, completionContext.Position, engine.Workspace, null, cancellationToken)) {
+				if (symbol.Kind == SymbolKind.NamedType) {
+					if (isInAttribute) {
+						var type = (ITypeSymbol)symbol;
+						if (type.IsAttribute ()) {
+							var v = type.Name.Substring (0, type.Name.Length - "Attribute".Length);
+							var needsEscaping = SyntaxFacts.GetKeywordKind(v) != SyntaxKind.None;
+							needsEscaping = needsEscaping || (isInQuery && SyntaxFacts.IsQueryContextualKeyword(SyntaxFacts.GetContextualKeywordKind(v)));
+							if (!needsEscaping) {
+								addData (engine.Factory.CreateSymbolCompletionData (this, symbol, v));
+								continue;
+							}
+						}
+					}
+					if (isInBaseList) {
+						var type = (ITypeSymbol)symbol;
+						if (type.IsSealed || type.IsStatic)
+							continue;
+					}
+					if (isInCatchTypeExpression) {
+						var type = (ITypeSymbol)symbol;
+						if (!IsException (type))
+							continue;
+					}
+				}
+
+				if (isInUsingDirective && symbol.Kind != SymbolKind.Namespace)
+					continue;
+
+				var newData = engine.Factory.CreateSymbolCompletionData (this, symbol, symbol.Name.EscapeIdentifier (isInQuery));
+				ISymbol categorySymbol;
+				var method = symbol as IMethodSymbol;
+				if (method != null) {
+					if (method.IsReducedExtension ()) {
+						categorySymbol = method.ReceiverType;
+					} else {
+						categorySymbol = (ISymbol)symbol.ContainingType;
+					}
+				} else {
+					categorySymbol = (ISymbol)symbol.ContainingType ?? symbol.ContainingNamespace;
+				}
+				if (categorySymbol != null) {
+					CompletionCategory category;
+					var key = categorySymbol.ToDisplayString ();
+					if (!completionCategoryLookup.TryGetValue (key, out category)) {
+						completionCategoryLookup [key] = category = engine.Factory.CreateCompletionDataCategory (categorySymbol);
+					}
+					newData.CompletionCategory = category;
+				}
+				addData (newData);
+			}
+			return Task.FromResult ((IEnumerable<CompletionData>)result);
+		}
+
+		protected override async Task<bool> IsSemanticTriggerCharacterAsync(Document document, int characterPosition, CancellationToken cancellationToken)
+		{
+			bool? result = await IsTriggerOnDotAsync(document, characterPosition, cancellationToken).ConfigureAwait(false);
+			if (result.HasValue)
+			{
+				return result.Value;
+			}
+
+			return true;
+		}
+
+		private async Task<bool?> IsTriggerOnDotAsync(Document document, int characterPosition, CancellationToken cancellationToken)
+		{
+			var text = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
+			if (text[characterPosition] != '.')
+			{
+				return null;
+			}
+
+			// don't want to trigger after a number.  All other cases after dot are ok.
+			var tree = await document.GetCSharpSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var token = tree.FindToken(characterPosition);
+			if (token.Kind() == SyntaxKind.DotToken)
+			{
+				token = token.GetPreviousToken();
+			}
+
+			return token.Kind() != SyntaxKind.NumericLiteralToken;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SenderCompletionContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SenderCompletionContextHandler.cs
new file mode 100644
index 0000000000..8d1ff8733a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SenderCompletionContextHandler.cs
@@ -0,0 +1,123 @@
+//
+// SenderCompletionContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class SenderCompletionContextHandler : CompletionContextHandler
+	{
+		protected override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var position = completionContext.Position;
+			var document = completionContext.Document;
+			var syntaxTree = ctx.SyntaxTree;
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken) ||
+				syntaxTree.IsPreProcessorDirectiveContext(position, cancellationToken))
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			if (!syntaxTree.IsRightOfDotOrArrowOrColonColon(position, cancellationToken))
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			var ma = ctx.LeftToken.Parent as MemberAccessExpressionSyntax;
+			if (ma == null)
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+
+			var model = ctx.CSharpSyntaxContext.SemanticModel;
+
+			var symbolInfo = model.GetSymbolInfo (ma.Expression);
+			if (symbolInfo.Symbol == null || symbolInfo.Symbol.Kind != SymbolKind.Parameter)
+				return Task.FromResult (Enumerable.Empty<CompletionData> ());
+			var list = new List<CompletionData> ();
+			var within = model.GetEnclosingNamedTypeOrAssembly(position, cancellationToken);
+			var addedSymbols = new HashSet<string> ();
+
+			foreach (var ano in ma.AncestorsAndSelf ().OfType<AnonymousMethodExpressionSyntax> ()) {
+				Analyze (engine, model, ma.Expression, within, list, ano.ParameterList, symbolInfo.Symbol, addedSymbols, cancellationToken);
+			}
+
+			foreach (var ano in ma.AncestorsAndSelf ().OfType<ParenthesizedLambdaExpressionSyntax> ()) {
+				Analyze (engine, model, ma.Expression, within, list, ano.ParameterList, symbolInfo.Symbol, addedSymbols, cancellationToken);
+			}
+
+			return Task.FromResult ((IEnumerable<CompletionData>)list);
+		}
+
+		void Analyze (CompletionEngine engine,SemanticModel model, SyntaxNode node, ISymbol within, List<CompletionData> list, ParameterListSyntax parameterList, ISymbol symbol, HashSet<string> addedSymbols, CancellationToken cancellationToken)
+		{
+			var type = CheckParameterList (model, parameterList, symbol, cancellationToken);
+			if (type == null)
+				return;
+			var startType = type;
+
+			while (type.SpecialType != SpecialType.System_Object) {
+				foreach (var member in type.GetMembers ()) {
+					if (member.IsImplicitlyDeclared || member.IsStatic)
+						continue;
+					if (member.IsOrdinaryMethod () || member.Kind == SymbolKind.Field || member.Kind == SymbolKind.Property) {
+						if (member.IsAccessibleWithin (within)) {
+							var completionData = engine.Factory.CreateCastCompletionData(this, member, node, startType);
+							if (addedSymbols.Contains (completionData.DisplayText))
+								continue;
+							addedSymbols.Add (completionData.DisplayText);
+							list.Add (completionData);
+						}
+					}
+				}
+
+				type = type.BaseType;
+			}
+		}
+
+		static ITypeSymbol CheckParameterList (SemanticModel model, ParameterListSyntax listSyntax, ISymbol parameter, CancellationToken cancellationToken)
+		{
+			var param = listSyntax?.Parameters.FirstOrDefault ();
+			if (param == null)
+				return null;
+			var declared = model.GetDeclaredSymbol (param, cancellationToken);
+			if (declared != parameter)
+				return null;
+			var assignmentExpr = listSyntax.Parent.Parent as AssignmentExpressionSyntax;
+			if (assignmentExpr == null || !assignmentExpr.IsKind (SyntaxKind.AddAssignmentExpression))
+				return null;
+			var left = assignmentExpr.Left as MemberAccessExpressionSyntax;
+			if (left == null)
+				return null;
+			var symbolInfo = model.GetSymbolInfo (left.Expression);
+			if (symbolInfo.Symbol == null || symbolInfo.Symbol is ITypeSymbol)
+				return null;
+			return model.GetTypeInfo (left.Expression).Type;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SnippetContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SnippetContextHandler.cs
new file mode 100644
index 0000000000..a37fef24e8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SnippetContextHandler.cs
@@ -0,0 +1,105 @@
+//
+// SnippetContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Linq;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class SnippetContextHandler : CompletionContextHandler
+	{
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+
+			var syntaxTree = await document.GetCSharpSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken) ||
+				syntaxTree.IsRightOfDotOrArrowOrColonColon(position, cancellationToken) ||
+				syntaxTree.GetContainingTypeOrEnumDeclaration(position, cancellationToken) is EnumDeclarationSyntax)
+			{
+				return Enumerable.Empty<CompletionData>();
+			}
+
+			// var span = new TextSpan(position, 0);
+//			var semanticModel = await document.GetCSharpSemanticModelForSpanAsync(span, cancellationToken).ConfigureAwait(false);
+			if (syntaxTree.IsPreProcessorDirectiveContext(position, cancellationToken))
+			{
+				var directive = syntaxTree.GetRoot(cancellationToken).FindTokenOnLeftOfPosition(position, includeDirectives: true).GetAncestor<DirectiveTriviaSyntax>();
+				if (directive.DirectiveNameToken.IsKind(
+					SyntaxKind.IfKeyword,
+					SyntaxKind.RegionKeyword,
+					SyntaxKind.ElseKeyword,
+					SyntaxKind.ElifKeyword,
+					SyntaxKind.ErrorKeyword,
+					SyntaxKind.LineKeyword,
+					SyntaxKind.PragmaKeyword,
+					SyntaxKind.EndIfKeyword,
+					SyntaxKind.UndefKeyword,
+					SyntaxKind.EndRegionKeyword,
+					SyntaxKind.WarningKeyword))
+				{
+					return Enumerable.Empty<CompletionData>();
+				}
+
+				return await GetSnippetCompletionItemsAsync(cancellationToken).ConfigureAwait(false);
+			}
+			var tokenLeftOfPosition = syntaxTree.FindTokenOnLeftOfPosition (position, cancellationToken);
+
+			if (syntaxTree.IsGlobalStatementContext(position, cancellationToken) ||
+				syntaxTree.IsExpressionContext(position, tokenLeftOfPosition, true, cancellationToken) ||
+				syntaxTree.IsStatementContext(position, tokenLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsTypeContext(position, cancellationToken) ||
+				syntaxTree.IsTypeDeclarationContext(position, tokenLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsNamespaceContext(position, cancellationToken) ||
+				syntaxTree.IsMemberDeclarationContext(position, tokenLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsLabelContext(position, cancellationToken))
+			{
+				return await GetSnippetCompletionItemsAsync(cancellationToken).ConfigureAwait(false);
+			}
+
+			return Enumerable.Empty<CompletionData>();
+		}
+
+		Task<IEnumerable<CompletionData>> GetSnippetCompletionItemsAsync(CancellationToken cancellationToken)
+		{
+			if (CompletionEngine.SnippetCallback == null)
+				return Task.FromResult (Enumerable.Empty<CompletionData>());
+			return CompletionEngine.SnippetCallback (cancellationToken);
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SpeculativeNameContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SpeculativeNameContextHandler.cs
new file mode 100644
index 0000000000..a7692ddde8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SpeculativeNameContextHandler.cs
@@ -0,0 +1,130 @@
+//
+// SpeculativeNameContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using System.Text;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class SpeculativeNameContextHandler : CompletionContextHandler
+	{
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var tree = await completionContext.Document.GetCSharpSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+			if (tree.IsInNonUserCode(completionContext.Position, cancellationToken) ||
+				tree.IsPreProcessorDirectiveContext(completionContext.Position, cancellationToken) || 
+				info.CompletionTriggerReason != CompletionTriggerReason.CompletionCommand)
+				return Enumerable.Empty<CompletionData>();
+
+			var token = tree.FindTokenOnLeftOfPosition(completionContext.Position, cancellationToken);
+			if (token.Span.End == completionContext.Position)
+				return Enumerable.Empty<CompletionData>();
+			var parent = token.Parent.AncestorsAndSelf ().OfType<GenericNameSyntax> ().FirstOrDefault () ?? token.Parent;
+
+			if (!parent.Parent.IsKind (SyntaxKind.IncompleteMember) &&
+			    !IsLocal(parent) &&
+			    !parent.Parent.IsKind (SyntaxKind.Parameter) &&
+			    !parent.Parent.IsKind (SyntaxKind.ForEachStatement)) {
+				return Enumerable.Empty<CompletionData>();
+			}
+
+			if (info.TriggerCharacter != ' ' &&
+				parent.Parent.IsKind (SyntaxKind.ExpressionStatement)) {
+				return Enumerable.Empty<CompletionData>();
+			}
+			var list = new List<CompletionData> ();
+
+			if (parent.IsKind(SyntaxKind.PredefinedType)) {			
+				switch (token.Kind()) {
+				case SyntaxKind.ObjectKeyword:
+					list.Add (engine.Factory.CreateGenericData(this, "o", GenericDataType.NameProposal));
+					list.Add (engine.Factory.CreateGenericData(this, "obj", GenericDataType.NameProposal));
+					return list;
+				case SyntaxKind.BoolKeyword:
+					list.Add (engine.Factory.CreateGenericData(this, "b", GenericDataType.NameProposal));
+					list.Add (engine.Factory.CreateGenericData(this, "pred", GenericDataType.NameProposal));
+					return list;
+				case SyntaxKind.CharKeyword:
+		       		list.Add (engine.Factory.CreateGenericData(this, "c", GenericDataType.NameProposal));
+					list.Add (engine.Factory.CreateGenericData(this, "ch", GenericDataType.NameProposal));
+					return list;
+				case SyntaxKind.StringKeyword:
+					list.Add (engine.Factory.CreateGenericData(this, "str", GenericDataType.NameProposal));
+					return list;
+				case SyntaxKind.DoubleKeyword:
+				case SyntaxKind.FloatKeyword:
+				case SyntaxKind.DecimalKeyword:
+					list.Add (engine.Factory.CreateGenericData(this, "d", GenericDataType.NameProposal));
+					list.Add (engine.Factory.CreateGenericData(this, "f", GenericDataType.NameProposal));
+					list.Add (engine.Factory.CreateGenericData(this, "m", GenericDataType.NameProposal));
+					return list;
+				default:
+					list.Add (engine.Factory.CreateGenericData(this, "i", GenericDataType.NameProposal));
+					list.Add (engine.Factory.CreateGenericData(this, "j", GenericDataType.NameProposal));
+					list.Add (engine.Factory.CreateGenericData(this, "k", GenericDataType.NameProposal));
+					return list;
+				}
+			} else {
+				var incompleteMember = parent.Parent as IncompleteMemberSyntax;
+				if (incompleteMember != null)
+					return list;
+				var gns = parent as GenericNameSyntax;
+				var names = WordParser.BreakWords (gns != null ? gns.Identifier.ToString () : token.ToString ().Trim ());
+				var possibleName = new StringBuilder ();
+				for (int i = 0; i < names.Count; i++) {
+					possibleName.Length = 0;
+					for (int j = i; j < names.Count; j++) {
+						if (string.IsNullOrEmpty (names [j])) {
+							continue;
+						}
+						if (j == i) { 
+							names [j] = Char.ToLower (names [j] [0]) + names [j].Substring (1);
+						}
+						possibleName.Append (names [j]);
+					}
+					list.Add (engine.Factory.CreateGenericData (this, possibleName.ToString (), GenericDataType.NameProposal));
+				}
+			}
+			return list;
+		}
+
+		bool IsLocal (SyntaxNode tokenParent)
+		{
+			if ((tokenParent.IsKind (SyntaxKind.GenericName) || tokenParent.IsKind (SyntaxKind.IdentifierName) || tokenParent.IsKind (SyntaxKind.PredefinedType)) &&
+			    (tokenParent.Parent.IsKind (SyntaxKind.ExpressionStatement) || tokenParent.Parent.IsKind (SyntaxKind.VariableDeclaration)))
+				return true;
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SpeculativeTContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SpeculativeTContextHandler.cs
new file mode 100644
index 0000000000..9c972e7a5f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/SpeculativeTContextHandler.cs
@@ -0,0 +1,104 @@
+//
+// SpeculativeTContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class SpeculativeTContextHandler : CompletionContextHandler
+	{
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+
+			return await document.GetUnionResultsFromDocumentAndLinks(
+				UnionCompletionItemComparer.Instance,
+				async (doc, ct) => await GetSpeculativeTCompletions(engine, doc, position, ct).ConfigureAwait(false),
+				cancellationToken).ConfigureAwait(false);
+		}
+
+		private async Task<IEnumerable<CompletionData>> GetSpeculativeTCompletions(CompletionEngine engine, Document document, int position, CancellationToken cancellationToken)
+		{
+			var syntaxTree = await document.GetCSharpSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken) ||
+				syntaxTree.IsPreProcessorDirectiveContext(position, cancellationToken))
+			{
+				return Enumerable.Empty<CompletionData>();
+			}
+
+			// If we're in a generic type argument context, use the start of the generic type name
+			// as the position for the rest of the context checks.
+			int testPosition = position;
+			var leftToken = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+
+			var semanticModel = await document.GetCSharpSemanticModelForNodeAsync(leftToken.Parent, cancellationToken).ConfigureAwait(false);
+			if (syntaxTree.IsGenericTypeArgumentContext(position, leftToken, cancellationToken, semanticModel))
+			{
+				// Walk out until we find the start of the partial written generic
+				SyntaxToken nameToken;
+				while (syntaxTree.IsInPartiallyWrittenGeneric(testPosition, cancellationToken, out nameToken))
+				{
+					testPosition = nameToken.SpanStart;
+				}
+
+				// If the user types Foo<T, automatic brace completion will insert the close brace
+				// and the generic won't be "partially written".
+				if (testPosition == position)
+				{
+					var typeArgumentList = leftToken.GetAncestor<TypeArgumentListSyntax>();
+					if (typeArgumentList != null)
+					{
+						if (typeArgumentList.LessThanToken != default(SyntaxToken) && typeArgumentList.GreaterThanToken != default(SyntaxToken))
+						{
+							testPosition = typeArgumentList.LessThanToken.SpanStart;
+						}
+					}
+				}
+			}
+
+			if ((!leftToken.GetPreviousTokenIfTouchingWord(position).IsKindOrHasMatchingText(SyntaxKind.AsyncKeyword) &&
+				syntaxTree.IsMemberDeclarationContext(testPosition, contextOpt: null, validModifiers: SyntaxKindSet.AllMemberModifiers, validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken)) ||
+				syntaxTree.IsGlobalMemberDeclarationContext(testPosition, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+				syntaxTree.IsGlobalStatementContext(testPosition, cancellationToken) ||
+				syntaxTree.IsDelegateReturnTypeContext(testPosition, syntaxTree.FindTokenOnLeftOfPosition(testPosition, cancellationToken), cancellationToken))
+			{
+				const string T = "T";
+				return new [] { engine.Factory.CreateGenericData (this, T, GenericDataType.Undefined) };
+			}
+			return Enumerable.Empty<CompletionData>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/XmlDocCommentContextHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/XmlDocCommentContextHandler.cs
new file mode 100644
index 0000000000..f60ac12781
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ContextHandler/XmlDocCommentContextHandler.cs
@@ -0,0 +1,400 @@
+//
+// XmlDocCommentContextHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.CodeCompletion;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class XmlDocCommentContextHandler : CompletionContextHandler
+	{
+		protected async override Task<IEnumerable<CompletionData>> GetItemsWorkerAsync (CompletionResult completionResult, CompletionEngine engine, CompletionContext completionContext, CompletionTriggerInfo info, SyntaxContext ctx, CancellationToken cancellationToken)
+		{
+			if (info.IsDebugger)
+			{
+				return null;
+			}
+			var document = completionContext.Document;
+			var position = completionContext.Position;
+
+			var tree = await document.GetCSharpSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+			var token = tree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			var parentTrivia = token.GetAncestor<DocumentationCommentTriviaSyntax>();
+
+			if (parentTrivia == null)
+			{
+				return null;
+			}
+
+			var items = new List<CompletionData>();
+			var text = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
+			var span = GetTextChangeSpan(text, position);
+
+			var attachedToken = parentTrivia.ParentTrivia.Token;
+			if (attachedToken.Kind() == SyntaxKind.None)
+			{
+				return null;
+			}
+
+			var semanticModel = await document.GetCSharpSemanticModelForNodeAsync(attachedToken.Parent, cancellationToken).ConfigureAwait(false);
+
+			ISymbol declaredSymbol = null;
+			var memberDeclaration = attachedToken.GetAncestor<MemberDeclarationSyntax>();
+			if (memberDeclaration != null)
+			{
+				declaredSymbol = semanticModel.GetDeclaredSymbol(memberDeclaration, cancellationToken);
+			}
+			else
+			{
+				var typeDeclaration = attachedToken.GetAncestor<TypeDeclarationSyntax>();
+				if (typeDeclaration != null)
+				{
+					declaredSymbol = semanticModel.GetDeclaredSymbol(typeDeclaration, cancellationToken);
+				}
+			}
+
+			if (declaredSymbol != null)
+			{
+				items.AddRange(GetTagsForSymbol(engine, declaredSymbol, span, parentTrivia, token));
+			}
+
+			if (token.Parent.Kind() == SyntaxKind.XmlEmptyElement || token.Parent.Kind() == SyntaxKind.XmlText ||
+				(token.Parent.IsKind(SyntaxKind.XmlElementEndTag) && token.IsKind(SyntaxKind.GreaterThanToken)) ||
+				(token.Parent.IsKind(SyntaxKind.XmlName) && token.Parent.IsParentKind(SyntaxKind.XmlEmptyElement)))
+			{
+				if (token.Parent.Parent.Kind() == SyntaxKind.XmlElement)
+				{
+					items.AddRange(GetNestedTags(engine, span));
+				}
+
+				if (token.Parent.Parent.Kind() == SyntaxKind.XmlElement && ((XmlElementSyntax)token.Parent.Parent).StartTag.Name.LocalName.ValueText == "list")
+				{
+					items.AddRange(GetListItems(engine, span));
+				}
+
+				if (token.Parent.IsParentKind(SyntaxKind.XmlEmptyElement) & token.Parent.Parent.IsParentKind(SyntaxKind.XmlElement))
+				{
+					var element = (XmlElementSyntax)token.Parent.Parent.Parent;
+					if (element.StartTag.Name.LocalName.ValueText == "list")
+					{
+						items.AddRange(GetListItems(engine, span));
+					}
+				}
+
+				if (token.Parent.Parent.Kind() == SyntaxKind.XmlElement && ((XmlElementSyntax)token.Parent.Parent).StartTag.Name.LocalName.ValueText == "listheader")
+				{
+					items.AddRange(GetListHeaderItems(engine, span));
+				}
+
+				if (token.Parent.Parent is DocumentationCommentTriviaSyntax)
+				{
+					items.AddRange(GetTopLevelSingleUseNames(engine, parentTrivia, span));
+					items.AddRange(GetTopLevelRepeatableItems(engine, span));
+				}
+			}
+
+			if (token.Parent.Kind() == SyntaxKind.XmlElementStartTag)
+			{
+				var startTag = (XmlElementStartTagSyntax)token.Parent;
+
+				if (token == startTag.GreaterThanToken && startTag.Name.LocalName.ValueText == "list")
+				{
+					items.AddRange(GetListItems(engine, span));
+				}
+
+				if (token == startTag.GreaterThanToken && startTag.Name.LocalName.ValueText == "listheader")
+				{
+					items.AddRange(GetListHeaderItems(engine, span));
+				}
+			}
+
+			items.AddRange(GetAlwaysVisibleItems(engine, span));
+			return items;
+		}
+
+		public override bool IsCommitCharacter (CompletionData ICompletionData, char ch, string textTypedSoFar)
+		{
+			if ((ch == '"' || ch == ' ')
+				&& ICompletionData.DisplayText.Contains(ch))
+			{
+				return false;
+			}
+
+			return base.IsCommitCharacter(ICompletionData, ch, textTypedSoFar) || ch == '>' || ch == '\t';
+		}
+
+		public override bool IsTriggerCharacter (SourceText text, int position)
+		{
+			return text[position] == '<';
+		}
+//
+//		public override bool SendEnterThroughToEditor(ICompletionData ICompletionData, string textTypedSoFar)
+//		{
+//			return false;
+//		}
+
+		private IEnumerable<CompletionData> GetTopLevelSingleUseNames(CompletionEngine engine, DocumentationCommentTriviaSyntax parentTrivia, TextSpan span)
+		{
+			var names = new HashSet<string>(new[] { "summary", "remarks", "example", "completionlist" });
+
+			RemoveExistingTags(parentTrivia, names, (x) => x.StartTag.Name.LocalName.ValueText);
+
+			return names.Select(n => GetItem(engine, n, span));
+		}
+
+		private void RemoveExistingTags(DocumentationCommentTriviaSyntax parentTrivia, ISet<string> names, Func<XmlElementSyntax, string> selector)
+		{
+			if (parentTrivia != null)
+			{
+				foreach (var node in parentTrivia.Content)
+				{
+					var element = node as XmlElementSyntax;
+					if (element != null)
+					{
+						names.Remove(selector(element));
+					}
+				}
+			}
+		}
+
+		private IEnumerable<CompletionData> GetTagsForSymbol(CompletionEngine engine, ISymbol symbol, TextSpan filterSpan, DocumentationCommentTriviaSyntax trivia, SyntaxToken token)
+		{
+			if (symbol is IMethodSymbol)
+			{
+				return GetTagsForMethod(engine, (IMethodSymbol)symbol, filterSpan, trivia, token);
+			}
+
+			if (symbol is IPropertySymbol)
+			{
+				return GetTagsForProperty(engine, (IPropertySymbol)symbol, filterSpan, trivia);
+			}
+
+			if (symbol is INamedTypeSymbol)
+			{
+				return GetTagsForType(engine, (INamedTypeSymbol)symbol, filterSpan, trivia);
+			}
+
+			return SpecializedCollections.EmptyEnumerable<CompletionData>();
+		}
+
+		private IEnumerable<CompletionData> GetTagsForType(CompletionEngine engine, INamedTypeSymbol symbol, TextSpan filterSpan, DocumentationCommentTriviaSyntax trivia)
+		{
+			var items = new List<CompletionData>();
+
+			var typeParameters = symbol.TypeParameters.Select(p => p.Name).ToSet();
+
+			RemoveExistingTags(trivia, typeParameters, x => AttributeSelector(x, "typeparam"));
+
+			items.AddRange(typeParameters.Select(t => engine.Factory.CreateXmlDocCompletionData (
+				this,
+				FormatParameter("typeparam", t))));
+			return items;
+		}
+
+		private string AttributeSelector(XmlElementSyntax element, string attribute)
+		{
+			if (!element.StartTag.IsMissing && !element.EndTag.IsMissing)
+			{
+				var startTag = element.StartTag;
+				var nameAttribute = startTag.Attributes.OfType<XmlNameAttributeSyntax>().FirstOrDefault(a => a.Name.LocalName.ValueText == "name");
+				if (nameAttribute != null)
+				{
+					if (startTag.Name.LocalName.ValueText == attribute)
+					{
+						return nameAttribute.Identifier.Identifier.ValueText;
+					}
+				}
+			}
+
+			return null;
+		}
+
+		private IEnumerable<CompletionData> GetTagsForProperty(CompletionEngine engine, IPropertySymbol symbol, TextSpan filterSpan, DocumentationCommentTriviaSyntax trivia)
+		{
+			var items = new List<CompletionData>();
+
+			var typeParameters = symbol.GetTypeArguments().Select(p => p.Name).ToSet();
+
+			RemoveExistingTags(trivia, typeParameters, x => AttributeSelector(x, "typeparam"));
+
+			items.AddRange(typeParameters.Select(t => engine.Factory.CreateXmlDocCompletionData(this, "typeparam", null, "name$" + t)));
+			items.Add(engine.Factory.CreateXmlDocCompletionData(this, "value"));
+			return items;
+		}
+
+		private IEnumerable<CompletionData> GetTagsForMethod(CompletionEngine engine, IMethodSymbol symbol, TextSpan filterSpan, DocumentationCommentTriviaSyntax trivia, SyntaxToken token)
+		{
+			var items = new List<CompletionData>();
+
+			var parameters = symbol.GetParameters().Select(p => p.Name).ToSet();
+			var typeParameters = symbol.TypeParameters.Select(t => t.Name).ToSet();
+
+			// User is trying to write a name, try to suggest only names.
+			if (token.Parent.IsKind(SyntaxKind.XmlNameAttribute) ||
+				(token.Parent.IsKind(SyntaxKind.IdentifierName) && token.Parent.IsParentKind(SyntaxKind.XmlNameAttribute)))
+			{
+				string parentElementName = null;
+
+				var emptyElement = token.GetAncestor<XmlEmptyElementSyntax>();
+				if (emptyElement != null)
+				{
+					parentElementName = emptyElement.Name.LocalName.Text;
+				}
+
+				// We're writing the name of a paramref or typeparamref
+				if (parentElementName == "paramref")
+				{
+					items.AddRange(parameters.Select(p => engine.Factory.CreateXmlDocCompletionData (this, p)));
+				}
+				else if (parentElementName == "typeparamref")
+				{
+					items.AddRange(typeParameters.Select(t => engine.Factory.CreateXmlDocCompletionData (this, t)));
+				}
+
+				return items;
+			}
+
+			var returns = true;
+
+			RemoveExistingTags(trivia, parameters, x => AttributeSelector(x, "param"));
+			RemoveExistingTags(trivia, typeParameters, x => AttributeSelector(x, "typeparam"));
+
+			foreach (var node in trivia.Content)
+			{
+				var element = node as XmlElementSyntax;
+				if (element != null && !element.StartTag.IsMissing && !element.EndTag.IsMissing)
+				{
+					var startTag = element.StartTag;
+
+					if (startTag.Name.LocalName.ValueText == "returns")
+					{
+						returns = false;
+						break;
+					}
+				}
+			}
+
+			items.AddRange(parameters.Select(p => engine.Factory.CreateXmlDocCompletionData (this, FormatParameter("param", p))));
+			items.AddRange(typeParameters.Select(t => engine.Factory.CreateXmlDocCompletionData (this, FormatParameter("typeparam", t))));
+
+			if (returns && !symbol.ReturnsVoid)
+			{
+				items.Add(engine.Factory.CreateXmlDocCompletionData (this, "returns"));
+			}
+
+			return items;
+		}
+
+
+		readonly Dictionary<string, string[]> _tagMap = new Dictionary<string, string[]> {
+			{ "exception", new[] { "<exception cref=\"", "\">" } },
+			{ "!--", new[] { "<!--", "-->" } },
+			{ "![CDATA[", new[] { "<![CDATA[", "]]>" } },
+			{ "include", new[] { "<include file=\'", "\' path=\'[@name=\"\"]\'/>" } },
+			{ "permission", new[] { "<permission cref=\"", "\"" } },
+			{ "see", new[] { "<see cref=\"", "\"/>" } },
+			{ "seealso", new[] { "<seealso cref=\"", "\"/>" } },
+			{ "list", new[] { "<list type=\"", "\">" } },
+			{ "paramref", new[] { "<paramref name=\"", "\"/>" } },
+			{ "typeparamref", new[] { "<typeparamref name=\"", "\"/>" } },
+			{ "completionlist", new[] { "<completionlist cref=\"", "\"/>" } },
+		};
+
+		readonly string[][] _attributeMap =  {
+			new [] { "exception", "cref", "cref=\"", "\"" },
+			new [] { "permission",  "cref", "cref=\"", "\"" },
+			new [] { "see", "cref", "cref=\"", "\"" },
+			new [] { "seealso", "cref", "cref=\"", "\"" },
+			new [] { "list", "type", "type=\"", "\"" },
+			new [] { "param", "name", "name=\"", "\"" },
+			new [] { "include", "file", "file=\"", "\"" },
+			new [] { "include", "path", "path=\"", "\"" }
+		};
+
+		protected CompletionData GetItem(CompletionEngine engine, string n, TextSpan span)
+		{
+			if (_tagMap.ContainsKey(n))
+			{
+				var value = _tagMap[n];
+				return engine.Factory.CreateXmlDocCompletionData (this, n, null, value [0] + "|" + value [1]);
+			}
+			return engine.Factory.CreateXmlDocCompletionData (this, n);
+		}
+
+		protected IEnumerable<CompletionData> GetAttributeItem(CompletionEngine engine, string n, TextSpan span)
+		{
+			var items = _attributeMap.Where(x => x[0] == n).Select(x => engine.Factory.CreateXmlDocCompletionData(this, x[1],null, x[2] + "|" + x[3]));
+			if (items.Any ())
+				return items;
+			
+			return new [] { engine.Factory.CreateXmlDocCompletionData (this, n) };
+		}
+
+		protected IEnumerable<CompletionData> GetAlwaysVisibleItems(CompletionEngine engine, TextSpan filterSpan)
+		{
+			return new[] { "see", "seealso", "![CDATA[", "!--" }
+				.Select(t => GetItem(engine, t, filterSpan));
+		}
+
+		protected IEnumerable<CompletionData> GetNestedTags(CompletionEngine engine, TextSpan filterSpan)
+		{
+			return new[] { "c", "code", "para", "list", "paramref", "typeparamref" }
+				.Select(t => GetItem(engine, t, filterSpan));
+		}
+
+		protected IEnumerable<CompletionData> GetTopLevelRepeatableItems(CompletionEngine engine, TextSpan filterSpan)
+		{
+			return new[] { "exception", "include", "permission" }
+				.Select(t => GetItem(engine, t, filterSpan));
+		}
+
+		protected IEnumerable<CompletionData> GetListItems(CompletionEngine engine, TextSpan span)
+		{
+			return new[] { "listheader", "term", "item", "description" }
+				.Select(t => GetItem(engine, t, span));
+		}
+
+		protected IEnumerable<CompletionData> GetListHeaderItems(CompletionEngine engine, TextSpan span)
+		{
+			return new[] { "term", "description" }
+				.Select(t => GetItem(engine, t, span));
+		}
+
+		protected string FormatParameter(string kind, string name)
+		{
+			return string.Format("{0} name=\"{1}\"", kind, name);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/EditorBrowsableBehavior.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/EditorBrowsableBehavior.cs
new file mode 100644
index 0000000000..07e261a383
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/EditorBrowsableBehavior.cs
@@ -0,0 +1,35 @@
+//
+// EditorBrowsableBehavior.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	public enum EditorBrowsableBehavior
+	{
+		Ignore,
+		Normal,
+		IncludeAdvanced
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ICompletionDataFactory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ICompletionDataFactory.cs
new file mode 100644
index 0000000000..f1f5516f2a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/ICompletionDataFactory.cs
@@ -0,0 +1,81 @@
+// 
+// ICompletionDataFactory.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	public enum GenericDataType
+	{
+		AttributeTarget,
+		Undefined,
+		PreprocessorKeyword,
+		PreprocessorSymbol,
+		NameProposal,
+		NamedParameter
+	}
+
+	public interface ICompletionDataFactory
+	{
+		CompletionData CreateKeywordCompletion (ICompletionDataKeyHandler keyHandler, string data, SyntaxKind syntaxKind);
+
+		CompletionData CreateGenericData (ICompletionDataKeyHandler keyHandler, string data, GenericDataType genericDataType = GenericDataType.Undefined);
+
+		CompletionData CreateFormatItemCompletionData (ICompletionDataKeyHandler keyHandler, string format, string description, object example);
+
+		CompletionData CreateXmlDocCompletionData (ICompletionDataKeyHandler keyHandler, string tag, string description = null, string tagInsertionText = null);
+
+		ISymbolCompletionData CreateSymbolCompletionData (ICompletionDataKeyHandler keyHandler, ISymbol symbol);
+		ISymbolCompletionData CreateSymbolCompletionData (ICompletionDataKeyHandler keyHandler, ISymbol symbol, string text);
+
+		/// <summary>
+		/// Creates enum member completion data. 
+		/// Form: Type.Member
+		/// Used for generating enum members Foo.A, Foo.B where the enum 'Foo' is valid.
+		/// </summary>
+		ISymbolCompletionData CreateEnumMemberCompletionData (ICompletionDataKeyHandler keyHandler, ISymbol typeAlias, IFieldSymbol field);
+
+		CompletionData CreateNewOverrideCompletionData (ICompletionDataKeyHandler keyHandler, int declarationBegin, ITypeSymbol currentType, ISymbol m, bool afterKeyword);
+
+		CompletionData CreatePartialCompletionData (ICompletionDataKeyHandler keyHandler, int declarationBegin, ITypeSymbol currentType, IMethodSymbol method, bool afterKeyword);
+
+		/// <summary>
+		/// Creates the event creation completion data.
+		/// </summary>
+		CompletionData CreateNewMethodDelegate (ICompletionDataKeyHandler keyHandler, ITypeSymbol delegateType, string varName, INamedTypeSymbol curType);
+		ISymbolCompletionData CreateExistingMethodDelegate (ICompletionDataKeyHandler keyHandler, IMethodSymbol method);
+
+		CompletionData CreateAnonymousMethod (ICompletionDataKeyHandler keyHandler, string displayText, string description, string textBeforeCaret, string textAfterCaret);
+
+		CompletionData CreateObjectCreation (ICompletionDataKeyHandler keyHandler, ITypeSymbol typeToCreate, ISymbol symbol, int declarationBegin, bool afterKeyword);
+
+		CompletionData CreateCastCompletionData (ICompletionDataKeyHandler keyHandler, ISymbol member, SyntaxNode nodeToCast, ITypeSymbol targetType);
+
+		CompletionCategory CreateCompletionDataCategory (ISymbol forSymbol);
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AbstractKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AbstractKeywordRecommender.cs
new file mode 100644
index 0000000000..1cf1e8e40a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AbstractKeywordRecommender.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+	internal class AbstractKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.ExternKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.UnsafeKeyword,
+            SyntaxKind.OverrideKeyword,
+        };
+
+        private static readonly ISet<SyntaxKind> s_validTypeModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.NewKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.UnsafeKeyword
+            };
+
+        public AbstractKeywordRecommender()
+            : base(SyntaxKind.AbstractKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+				context.IsMemberDeclarationContext(
+                    validModifiers: s_validMemberModifiers,
+					validTypeDeclarations: SyntaxKindSet.ClassOnlyTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken) ||
+				context.IsTypeDeclarationContext(
+                    validModifiers: s_validTypeModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AbstractSyntacticSingleKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AbstractSyntacticSingleKeywordRecommender.cs
new file mode 100644
index 0000000000..bdb9c6f847
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AbstractSyntacticSingleKeywordRecommender.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+	internal abstract partial class AbstractSyntacticSingleKeywordRecommender : IKeywordRecommender<CSharpSyntaxContext>
+    {
+        private readonly bool _isValidInPreprocessorContext;
+
+        protected internal SyntaxKind KeywordKind { get; private set; }
+
+        internal bool ShouldFormatOnCommit { get; private set; }
+
+        protected AbstractSyntacticSingleKeywordRecommender(
+            SyntaxKind keywordKind,
+            bool isValidInPreprocessorContext = false,
+            bool shouldFormatOnCommit = false)
+        {
+            this.KeywordKind = keywordKind;
+            _isValidInPreprocessorContext = isValidInPreprocessorContext;
+            this.ShouldFormatOnCommit = shouldFormatOnCommit;
+        }
+
+        protected abstract bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken);
+
+        public IEnumerable<RecommendedKeyword> RecommendKeywords(
+            int position,
+            CSharpSyntaxContext context,
+            CancellationToken cancellationToken)
+        {
+            var syntaxKind = this.RecommendKeyword(position, context, cancellationToken);
+            if (syntaxKind.HasValue)
+            {
+				return new [] {
+					new RecommendedKeyword(SyntaxFacts.GetText(syntaxKind.Value), syntaxKind.Value, shouldFormatOnCommit: this.ShouldFormatOnCommit)
+				};
+            }
+
+            return null;
+        }
+
+        internal IEnumerable<RecommendedKeyword> RecommendKeywords_Test(int position, CSharpSyntaxContext context)
+        {
+            var syntaxKind = this.RecommendKeyword(position, context, CancellationToken.None);
+            if (syntaxKind.HasValue)
+            {
+				return  new [] {
+					new RecommendedKeyword(SyntaxFacts.GetText(syntaxKind.Value), syntaxKind.Value)
+				};
+            }
+
+            return null;
+        }
+
+		private SyntaxKind? RecommendKeyword(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // NOTE: The collector ensures that we're not in "NonUserCode" like comments, strings, inactive code
+            // for perf reasons.
+            var syntaxTree = context.SemanticModel.SyntaxTree;
+            if (!_isValidInPreprocessorContext &&
+				context.IsPreProcessorDirectiveContext)
+            {
+                return null;
+            }
+
+            if (!IsValidContext(position, context, cancellationToken))
+            {
+                return null;
+            }
+
+            return this.KeywordKind;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AddKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AddKeywordRecommender.cs
new file mode 100644
index 0000000000..672e0502a2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AddKeywordRecommender.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class AddKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public AddKeywordRecommender()
+            : base(SyntaxKind.AddKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+			return context.TargetToken.IsAccessorDeclarationContext<EventDeclarationSyntax>(position, SyntaxKind.AddKeyword);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AliasKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AliasKeywordRecommender.cs
new file mode 100644
index 0000000000..3d6b87302a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AliasKeywordRecommender.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class AliasKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public AliasKeywordRecommender()
+            : base(SyntaxKind.AliasKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //   extern |
+            //   extern a|
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.ExternKeyword)
+            {
+                // members can be 'extern' but we don't want
+                // 'alias' to show up in a 'type'.
+                return token.GetAncestor<TypeDeclarationSyntax>() == null;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AsKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AsKeywordRecommender.cs
new file mode 100644
index 0000000000..3d667239aa
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AsKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class AsKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public AsKeywordRecommender()
+            : base(SyntaxKind.AsKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+			return !context.IsInNonUserCode && context.IsIsOrAsContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AscendingKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AscendingKeywordRecommender.cs
new file mode 100644
index 0000000000..ec3e54f007
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AscendingKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class AscendingKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public AscendingKeywordRecommender()
+            : base(SyntaxKind.AscendingKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.TargetToken.IsOrderByDirectionContext();
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AssemblyKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AssemblyKeywordRecommender.cs
new file mode 100644
index 0000000000..31cb8b3a47
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AssemblyKeywordRecommender.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class AssemblyKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public AssemblyKeywordRecommender()
+            : base(SyntaxKind.AssemblyKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+			if (context.IsTypeAttributeContext(cancellationToken))
+            {
+                var token = context.LeftToken;
+                var type = token.GetAncestor<MemberDeclarationSyntax>();
+
+                return type == null || type.IsParentKind(SyntaxKind.CompilationUnit);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AsyncKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AsyncKeywordRecommender.cs
new file mode 100644
index 0000000000..49abcb325d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AsyncKeywordRecommender.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class AsyncKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public AsyncKeywordRecommender() :
+            base(SyntaxKind.AsyncKeyword, isValidInPreprocessorContext: false)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+			if (context.IsAnyExpressionContext)
+            {
+                return true;
+            }
+
+            return !context.TargetToken.IsKindOrHasMatchingText(SyntaxKind.PartialKeyword)
+                && InMemberDeclarationContext(position, context, cancellationToken);
+        }
+
+        private static bool InMemberDeclarationContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+			return context.SyntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken)
+                || context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: true,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AwaitKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AwaitKeywordRecommender.cs
new file mode 100644
index 0000000000..c2604eaad6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/AwaitKeywordRecommender.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class AwaitKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public AwaitKeywordRecommender()
+            : base(SyntaxKind.AwaitKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsAnyExpressionContext || context.IsStatementContext)
+            {
+                foreach (var node in context.LeftToken.GetAncestors<SyntaxNode>())
+                {
+					if (node.IsAnyLambdaOrAnonymousMethod())
+                    {
+                        return true;
+                    }
+
+                    if (node.IsKind(SyntaxKind.QueryExpression))
+                    {
+                        return false;
+                    }
+
+                    if (node.IsKind(SyntaxKind.LockStatement))
+                    {
+                        var lockStatement = (LockStatementSyntax)node;
+                        if (lockStatement.Statement != null &&
+                            !lockStatement.Statement.IsMissing &&
+                            lockStatement.Statement.Span.Contains(position))
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/BaseKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/BaseKeywordRecommender.cs
new file mode 100644
index 0000000000..68206249d8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/BaseKeywordRecommender.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class BaseKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public BaseKeywordRecommender()
+            : base(SyntaxKind.BaseKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // We need to at least be in a type declaration context.  This prevents us from showing
+            // calls to 'base' in things like top level repl statements and whatnot.
+            if (context.ContainingTypeDeclaration != null)
+            {
+                return
+                    IsConstructorInitializerContext(position, context, cancellationToken) ||
+                    IsInstanceExpressionOrStatement(context);
+            }
+
+            return false;
+        }
+
+        private static bool IsInstanceExpressionOrStatement(CSharpSyntaxContext context)
+        {
+            if (context.IsInstanceContext)
+            {
+                return context.IsNonAttributeExpressionContext || context.IsStatementContext;
+            }
+
+            return false;
+        }
+
+        private bool IsConstructorInitializerContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //   Foo() : |
+
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.ColonToken &&
+                token.Parent is ConstructorInitializerSyntax &&
+                token.Parent.IsParentKind(SyntaxKind.ConstructorDeclaration) &&
+                token.Parent.GetParent().IsParentKind(SyntaxKind.ClassDeclaration))
+            {
+                var constructor = token.GetAncestor<ConstructorDeclarationSyntax>();
+				if (constructor.Modifiers.Any(t => t.Kind () == SyntaxKind.StaticKeyword))
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/BoolKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/BoolKeywordRecommender.cs
new file mode 100644
index 0000000000..44c5b2322f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/BoolKeywordRecommender.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class BoolKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public BoolKeywordRecommender()
+            : base(SyntaxKind.BoolKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+				context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+				context.IsObjectCreationTypeContext ||
+				context.IsGenericTypeArgumentContext ||
+                context.IsIsOrAsTypeContext ||
+				context.IsLocalVariableDeclarationContext ||
+				context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+				context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+				context.IsImplicitOrExplicitOperatorTypeContext ||
+				context.IsPrimaryFunctionExpressionContext ||
+				context.IsCrefContext ||
+				syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+				context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/BreakKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/BreakKeywordRecommender.cs
new file mode 100644
index 0000000000..8275ac1434
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/BreakKeywordRecommender.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class BreakKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public BreakKeywordRecommender()
+            : base(SyntaxKind.BreakKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsInBreakableConstructContext(context) ||
+                context.TargetToken.IsAfterYieldKeyword();
+        }
+
+        private static bool IsInBreakableConstructContext(CSharpSyntaxContext context)
+        {
+            if (!context.IsStatementContext)
+            {
+                return false;
+            }
+
+            // allowed if we're inside a loop/switch construct.
+
+            var token = context.LeftToken;
+            foreach (var v in token.GetAncestors<SyntaxNode>())
+            {
+                if (v.IsAnyLambdaOrAnonymousMethod())
+                {
+                    // if we hit a lambda while walking up, then we can't
+                    // 'continue' any outer loops.
+                    return false;
+                }
+
+                if (v.IsBreakableConstruct())
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ByKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ByKeywordRecommender.cs
new file mode 100644
index 0000000000..07d5db338e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ByKeywordRecommender.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ByKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ByKeywordRecommender()
+            : base(SyntaxKind.ByKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //   group e |
+            //   group e b|
+
+            var token = context.LeftToken;
+            var group = token.GetAncestor<GroupClauseSyntax>();
+
+            if (group == null)
+            {
+                return false;
+            }
+
+            var lastToken = group.GroupExpression.GetLastToken(includeSkipped: true);
+
+            // group e |
+			if (!token.IntersectsWith(position) &&
+                token == lastToken)
+            {
+                return true;
+            }
+
+            // group e b|
+            if (token.IntersectsWith(position) &&
+                token.Kind() == SyntaxKind.IdentifierToken &&
+                token.GetPreviousToken(includeSkipped: true) == lastToken)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ByteKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ByteKeywordRecommender.cs
new file mode 100644
index 0000000000..c40eb00cd7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ByteKeywordRecommender.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ByteKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ByteKeywordRecommender()
+            : base(SyntaxKind.ByteKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsEnumBaseListContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CaseKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CaseKeywordRecommender.cs
new file mode 100644
index 0000000000..c8e9c0f1db
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CaseKeywordRecommender.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class CaseKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public CaseKeywordRecommender()
+            : base(SyntaxKind.CaseKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.TargetToken.IsSwitchLabelContext() ||
+                IsAfterGotoInSwitchContext(context);
+        }
+
+        internal static bool IsAfterGotoInSwitchContext(CSharpSyntaxContext context)
+        {
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.GotoKeyword &&
+                token.GetAncestor<SwitchStatementSyntax>() != null)
+            {
+                // todo: what if we're in a lambda... or a try/finally or 
+                // something?  Might want to filter this out.
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CatchKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CatchKeywordRecommender.cs
new file mode 100644
index 0000000000..26433adf28
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CatchKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class CatchKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public CatchKeywordRecommender()
+            : base(SyntaxKind.CatchKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.SyntaxTree.IsCatchOrFinallyContext(position, context.LeftToken, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CharKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CharKeywordRecommender.cs
new file mode 100644
index 0000000000..a0d530742c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CharKeywordRecommender.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class CharKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public CharKeywordRecommender()
+            : base(SyntaxKind.CharKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CheckedKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CheckedKeywordRecommender.cs
new file mode 100644
index 0000000000..bdcb72853d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/CheckedKeywordRecommender.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class CheckedKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public CheckedKeywordRecommender()
+            : base(SyntaxKind.CheckedKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsNonAttributeExpressionContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ChecksumKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ChecksumKeywordRecommender.cs
new file mode 100644
index 0000000000..14aceee892
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ChecksumKeywordRecommender.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ChecksumKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ChecksumKeywordRecommender()
+            : base(SyntaxKind.ChecksumKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // # pragma |
+            // # pragma w|
+            var previousToken1 = context.TargetToken;
+            var previousToken2 = previousToken1.GetPreviousToken(includeSkipped: true);
+
+            return
+                previousToken1.Kind() == SyntaxKind.PragmaKeyword &&
+                previousToken2.Kind() == SyntaxKind.HashToken;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ClassKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ClassKeywordRecommender.cs
new file mode 100644
index 0000000000..47a255c363
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ClassKeywordRecommender.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ClassKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.NewKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.AbstractKeyword,
+                SyntaxKind.SealedKeyword,
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.UnsafeKeyword
+            };
+
+        public ClassKeywordRecommender()
+            : base(SyntaxKind.ClassKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsGlobalStatementContext ||
+                context.IsTypeDeclarationContext(
+                    validModifiers: s_validModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: true,
+                    cancellationToken: cancellationToken) ||
+                syntaxTree.IsTypeParameterConstraintStartContext(position, context.LeftToken, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ConstKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ConstKeywordRecommender.cs
new file mode 100644
index 0000000000..49710fe6ed
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ConstKeywordRecommender.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ConstKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.PrivateKeyword,
+        };
+
+        private static readonly ISet<SyntaxKind> s_validGlobalModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.PrivateKeyword,
+        };
+
+        public ConstKeywordRecommender()
+            : base(SyntaxKind.ConstKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsMemberDeclarationContext(context, cancellationToken) ||
+                IsLocalVariableDeclaration(context);
+        }
+
+        private bool IsMemberDeclarationContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.SyntaxTree.IsGlobalMemberDeclarationContext(context.Position, s_validGlobalModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: s_validModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+
+        private bool IsLocalVariableDeclaration(CSharpSyntaxContext context)
+        {
+            // cases:
+            //   void Foo() {
+            //     |
+            //
+            //   |
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ContinueKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ContinueKeywordRecommender.cs
new file mode 100644
index 0000000000..e2f1aeb73b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ContinueKeywordRecommender.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ContinueKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ContinueKeywordRecommender()
+            : base(SyntaxKind.ContinueKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (!context.IsStatementContext)
+            {
+                return false;
+            }
+
+            // allowed if we're inside a loop construct.
+
+            var leaf = context.LeftToken;
+            foreach (var v in leaf.GetAncestors<SyntaxNode>())
+            {
+                if (v.IsAnyLambdaOrAnonymousMethod())
+                {
+                    // if we hit a lambda while walking up, then we can't
+                    // 'continue' any outer loops.
+                    return false;
+                }
+
+                if (v.IsContinuableConstruct())
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DecimalKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DecimalKeywordRecommender.cs
new file mode 100644
index 0000000000..e0280702fb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DecimalKeywordRecommender.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class DecimalKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public DecimalKeywordRecommender()
+            : base(SyntaxKind.DecimalKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DefaultKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DefaultKeywordRecommender.cs
new file mode 100644
index 0000000000..935b5b62eb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DefaultKeywordRecommender.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class DefaultKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public DefaultKeywordRecommender()
+            : base(SyntaxKind.DefaultKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsValidPreProcessorContext(context) ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsAnyExpressionContext ||
+                context.TargetToken.IsSwitchLabelContext();
+        }
+
+        private static bool IsValidPreProcessorContext(CSharpSyntaxContext context)
+        {
+            // cases:
+            //   #line |
+            //   #line d|
+            //   # line |
+            //   # line d|
+
+            var previousToken1 = context.TargetToken;
+            var previousToken2 = previousToken1.GetPreviousToken(includeSkipped: true);
+
+            return
+                previousToken1.Kind() == SyntaxKind.LineKeyword &&
+                previousToken2.Kind() == SyntaxKind.HashToken;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DefineKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DefineKeywordRecommender.cs
new file mode 100644
index 0000000000..5ff0f4412a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DefineKeywordRecommender.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class DefineKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public DefineKeywordRecommender()
+            : base(SyntaxKind.DefineKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                syntaxTree.IsBeforeFirstToken(position, cancellationToken) &&
+                context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DelegateKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DelegateKeywordRecommender.cs
new file mode 100644
index 0000000000..42049a0b93
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DelegateKeywordRecommender.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class DelegateKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.UnsafeKeyword
+            };
+
+        public DelegateKeywordRecommender()
+            : base(SyntaxKind.DelegateKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+				(context.IsNonAttributeExpressionContext && !context.IsConstantExpressionContext) ||
+                IsAfterAsyncKeywordInExpressionContext(context, cancellationToken) ||
+                context.IsTypeDeclarationContext(
+                    validModifiers: s_validModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+
+        private static bool IsAfterAsyncKeywordInExpressionContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.TargetToken.IsKindOrHasMatchingText(SyntaxKind.AsyncKeyword) &&
+                context.SyntaxTree.IsExpressionContext(
+                    context.TargetToken.SpanStart,
+                    context.TargetToken,
+                    attributes: false,
+                    cancellationToken: cancellationToken,
+                    semanticModelOpt: context.SemanticModel);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DescendingKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DescendingKeywordRecommender.cs
new file mode 100644
index 0000000000..0c62897af0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DescendingKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class DescendingKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public DescendingKeywordRecommender()
+            : base(SyntaxKind.DescendingKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.TargetToken.IsOrderByDirectionContext();
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DisableKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DisableKeywordRecommender.cs
new file mode 100644
index 0000000000..87e5166b5d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DisableKeywordRecommender.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class DisableKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public DisableKeywordRecommender()
+            : base(SyntaxKind.DisableKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // # pragma warning |
+            // # pragma warning d|
+            var previousToken1 = context.TargetToken;
+            var previousToken2 = previousToken1.GetPreviousToken(includeSkipped: true);
+            var previousToken3 = previousToken2.GetPreviousToken(includeSkipped: true);
+
+            return
+                previousToken1.Kind() == SyntaxKind.WarningKeyword &&
+                previousToken2.Kind() == SyntaxKind.PragmaKeyword &&
+                previousToken3.Kind() == SyntaxKind.HashToken;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DoKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DoKeywordRecommender.cs
new file mode 100644
index 0000000000..ca525b4868
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DoKeywordRecommender.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class DoKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public DoKeywordRecommender()
+            : base(SyntaxKind.DoKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DoubleKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DoubleKeywordRecommender.cs
new file mode 100644
index 0000000000..51330c929c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DoubleKeywordRecommender.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class DoubleKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public DoubleKeywordRecommender()
+            : base(SyntaxKind.DoubleKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DynamicKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DynamicKeywordRecommender.cs
new file mode 100644
index 0000000000..6f45d48507
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/DynamicKeywordRecommender.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class DynamicKeywordRecommender : IKeywordRecommender<CSharpSyntaxContext>
+    {
+        private bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            if (context.IsPreProcessorDirectiveContext)
+            {
+                return false;
+            }
+
+            return IsDynamicTypeContext(position, context, cancellationToken);
+        }
+
+        public IEnumerable<RecommendedKeyword> RecommendKeywords(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (IsValidContext(position, context, cancellationToken))
+            {
+				yield return new RecommendedKeyword("dynamic", SyntaxKind.IdentifierToken);
+            }
+        }
+
+        protected static bool IsDynamicTypeContext(
+            int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+
+            // first do quick exit check
+            if (syntaxTree.IsDefinitelyNotTypeContext(position, cancellationToken))
+            {
+                return false;
+            }
+
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsDefiniteCastTypeContext ||
+                syntaxTree.IsPossibleCastTypeContext(position, context.LeftToken, cancellationToken) ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsIsOrAsTypeContext ||
+                syntaxTree.IsDefaultExpressionContext(position, context.LeftToken, cancellationToken) ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ElifKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ElifKeywordRecommender.cs
new file mode 100644
index 0000000000..0d2b5d21b9
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ElifKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ElifKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ElifKeywordRecommender()
+            : base(SyntaxKind.ElifKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ElseKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ElseKeywordRecommender.cs
new file mode 100644
index 0000000000..9c6acbd43d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ElseKeywordRecommender.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ElseKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ElseKeywordRecommender()
+            : base(SyntaxKind.ElseKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsPreProcessorKeywordContext)
+            {
+                return true;
+            }
+
+            var token = context.TargetToken;
+
+            var statement = token.GetAncestor<StatementSyntax>();
+            var ifStatement = statement.GetAncestorOrThis<IfStatementSyntax>();
+
+            if (statement == null || ifStatement == null)
+            {
+                return false;
+            }
+
+            // cases:
+            //   if (foo)
+            //     Console.WriteLine();
+            //   |
+            //   if (foo)
+            //     Console.WriteLine();
+            //   e|
+            if (token.IsKind(SyntaxKind.SemicolonToken) && ifStatement.Statement.GetLastToken(includeSkipped: true) == token)
+            {
+                return true;
+            }
+
+            // if (foo) {
+            //     Console.WriteLine();
+            //   } |
+            //   if (foo) {
+            //     Console.WriteLine();
+            //   } e|
+            if (token.IsKind(SyntaxKind.CloseBraceToken) && ifStatement.Statement is BlockSyntax && token == ((BlockSyntax)ifStatement.Statement).CloseBraceToken)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EndIfKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EndIfKeywordRecommender.cs
new file mode 100644
index 0000000000..0042a43660
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EndIfKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class EndIfKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public EndIfKeywordRecommender()
+            : base(SyntaxKind.EndIfKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EndRegionKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EndRegionKeywordRecommender.cs
new file mode 100644
index 0000000000..741c814181
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EndRegionKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class EndRegionKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public EndRegionKeywordRecommender()
+            : base(SyntaxKind.EndRegionKeyword, isValidInPreprocessorContext: true, shouldFormatOnCommit: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EnumKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EnumKeywordRecommender.cs
new file mode 100644
index 0000000000..69d31fad97
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EnumKeywordRecommender.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class EnumKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+            };
+
+        public EnumKeywordRecommender()
+            : base(SyntaxKind.EnumKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                context.IsTypeDeclarationContext(
+                    validModifiers: s_validModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EqualsKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EqualsKeywordRecommender.cs
new file mode 100644
index 0000000000..e2f4bd912a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EqualsKeywordRecommender.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class EqualsKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public EqualsKeywordRecommender()
+            : base(SyntaxKind.EqualsKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //   join a in expr o1 |
+            //   join a in expr o1 e|
+
+            var token = context.TargetToken;
+
+            var join = token.GetAncestor<JoinClauseSyntax>();
+            if (join == null)
+            {
+                return false;
+            }
+
+            var lastToken = join.LeftExpression.GetLastToken(includeSkipped: true);
+
+            // join a in expr |
+            if (join.LeftExpression.Width() > 0 &&
+                token == lastToken)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ErrorKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ErrorKeywordRecommender.cs
new file mode 100644
index 0000000000..5e21f268ae
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ErrorKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ErrorKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ErrorKeywordRecommender()
+            : base(SyntaxKind.ErrorKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EventKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EventKeywordRecommender.cs
new file mode 100644
index 0000000000..04c955265e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/EventKeywordRecommender.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class EventKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.NewKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.VirtualKeyword,
+                SyntaxKind.SealedKeyword,
+                SyntaxKind.OverrideKeyword,
+                SyntaxKind.AbstractKeyword,
+                SyntaxKind.ExternKeyword,
+                SyntaxKind.UnsafeKeyword
+            };
+
+        public EventKeywordRecommender()
+            : base(SyntaxKind.EventKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsGlobalStatementContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(validModifiers: s_validModifiers, validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken) ||
+				context.IsMemberAttributeContext(SyntaxKindSet.ClassInterfaceStructTypeDeclarations, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ExplicitKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ExplicitKeywordRecommender.cs
new file mode 100644
index 0000000000..7931912b56
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ExplicitKeywordRecommender.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ExplicitKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.ExternKeyword,
+                SyntaxKind.UnsafeKeyword,
+            };
+
+        public ExplicitKeywordRecommender()
+            : base(SyntaxKind.ExplicitKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsMemberDeclarationContext(validModifiers: s_validMemberModifiers, validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                // operators must be both public and static
+				var modifiers = context.PrecedingModifiers;
+
+                return
+                    modifiers.Contains(SyntaxKind.PublicKeyword) &&
+                    modifiers.Contains(SyntaxKind.StaticKeyword);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ExternKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ExternKeywordRecommender.cs
new file mode 100644
index 0000000000..7c6f740ab9
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ExternKeywordRecommender.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ExternKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.NewKeyword,
+                SyntaxKind.OverrideKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.SealedKeyword,
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.UnsafeKeyword,
+                SyntaxKind.VirtualKeyword,
+            };
+
+        private static readonly ISet<SyntaxKind> s_validGlobalModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.NewKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.UnsafeKeyword,
+            };
+
+        public ExternKeywordRecommender()
+            : base(SyntaxKind.ExternKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                IsExternAliasContext(context) ||
+                context.IsGlobalStatementContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, s_validGlobalModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: s_validModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+
+        private static bool IsExternAliasContext(CSharpSyntaxContext context)
+        {
+            // cases:
+            // root: |
+
+            // root: e|
+
+            // extern alias a;
+            // |
+
+            // extern alias a;
+            // e|
+
+            // all the above, but inside a namespace.
+            // usings and other constructs *cannot* precede.
+
+            var token = context.TargetToken;
+
+            // root: |
+            if (token.Kind() == SyntaxKind.None)
+            {
+                // root namespace
+                return true;
+            }
+
+            if (token.Kind() == SyntaxKind.OpenBraceToken &&
+				token.Parent.IsKind(SyntaxKind.NamespaceDeclaration))
+            {
+                return true;
+            }
+
+            // extern alias a;
+            // |
+            if (token.Kind() == SyntaxKind.SemicolonToken &&
+                token.Parent.IsKind(SyntaxKind.ExternAliasDirective))
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FalseKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FalseKeywordRecommender.cs
new file mode 100644
index 0000000000..1fa404a42b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FalseKeywordRecommender.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class FalseKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public FalseKeywordRecommender()
+            : base(SyntaxKind.FalseKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsAnyExpressionContext ||
+                context.IsPreProcessorExpressionContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.TargetToken.IsUnaryOperatorContext();
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FieldKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FieldKeywordRecommender.cs
new file mode 100644
index 0000000000..cb50cf176b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FieldKeywordRecommender.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class FieldKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        // interfaces don't have members that you can put a [field:] attribute on
+        private static readonly ISet<SyntaxKind> s_validTypeDeclarations = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.StructDeclaration,
+            SyntaxKind.ClassDeclaration,
+            SyntaxKind.EnumDeclaration,
+        };
+
+        public FieldKeywordRecommender()
+            : base(SyntaxKind.FieldKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsMemberAttributeContext(s_validTypeDeclarations, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FinallyKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FinallyKeywordRecommender.cs
new file mode 100644
index 0000000000..0ac6a78e75
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FinallyKeywordRecommender.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class FinallyKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public FinallyKeywordRecommender()
+            : base(SyntaxKind.FinallyKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return syntaxTree.IsCatchOrFinallyContext(position, context.LeftToken, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FixedKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FixedKeywordRecommender.cs
new file mode 100644
index 0000000000..371916e0a6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FixedKeywordRecommender.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class FixedKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.PrivateKeyword,
+            SyntaxKind.UnsafeKeyword,
+        };
+
+        public FixedKeywordRecommender()
+            : base(SyntaxKind.FixedKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsUnsafeStatementContext(context) ||
+                IsMemberDeclarationContext(context, cancellationToken);
+        }
+
+        private static bool IsMemberDeclarationContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.TargetToken.IsUnsafeContext() &&
+               (context.SyntaxTree.IsGlobalMemberDeclarationContext(context.Position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+               context.IsMemberDeclarationContext(validModifiers: s_validModifiers, validTypeDeclarations: SyntaxKindSet.StructOnlyTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken));
+        }
+
+        private static bool IsUnsafeStatementContext(CSharpSyntaxContext context)
+        {
+            return
+                context.TargetToken.IsUnsafeContext() &&
+                context.IsStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FloatKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FloatKeywordRecommender.cs
new file mode 100644
index 0000000000..e5759bfcd8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FloatKeywordRecommender.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class FloatKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public FloatKeywordRecommender()
+            : base(SyntaxKind.FloatKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ForEachKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ForEachKeywordRecommender.cs
new file mode 100644
index 0000000000..f39dc09669
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ForEachKeywordRecommender.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ForEachKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ForEachKeywordRecommender()
+            : base(SyntaxKind.ForEachKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ForKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ForKeywordRecommender.cs
new file mode 100644
index 0000000000..6013d73f54
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ForKeywordRecommender.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ForKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ForKeywordRecommender()
+            : base(SyntaxKind.ForKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FromKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FromKeywordRecommender.cs
new file mode 100644
index 0000000000..c9db4eda7f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/FromKeywordRecommender.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class FromKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public FromKeywordRecommender()
+            : base(SyntaxKind.FromKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsGlobalStatementContext ||
+                syntaxTree.IsValidContextForFromClause(position, context.LeftToken, cancellationToken, semanticModelOpt: context.SemanticModel);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GetKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GetKeywordRecommender.cs
new file mode 100644
index 0000000000..22fe43af57
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GetKeywordRecommender.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class GetKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public GetKeywordRecommender()
+            : base(SyntaxKind.GetKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.TargetToken.IsAccessorDeclarationContext<PropertyDeclarationSyntax>(position, SyntaxKind.GetKeyword) ||
+                context.TargetToken.IsAccessorDeclarationContext<IndexerDeclarationSyntax>(position, SyntaxKind.GetKeyword);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GlobalKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GlobalKeywordRecommender.cs
new file mode 100644
index 0000000000..7cb8df670e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GlobalKeywordRecommender.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class GlobalKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public GlobalKeywordRecommender()
+            : base(SyntaxKind.GlobalKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+
+            if (syntaxTree.IsMemberDeclarationContext(position, context.LeftToken, cancellationToken))
+            {
+                var token = context.TargetToken;
+
+                if (token.GetAncestor<EnumDeclarationSyntax>() == null)
+                {
+                    return true;
+                }
+            }
+
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsAnyExpressionContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsIsOrAsTypeContext ||
+                syntaxTree.IsUsingAliasContext(position, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GotoKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GotoKeywordRecommender.cs
new file mode 100644
index 0000000000..e252d97856
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GotoKeywordRecommender.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class GotoKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public GotoKeywordRecommender()
+            : base(SyntaxKind.GotoKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GroupKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GroupKeywordRecommender.cs
new file mode 100644
index 0000000000..401c5825d6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/GroupKeywordRecommender.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class GroupKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public GroupKeywordRecommender()
+            : base(SyntaxKind.GroupKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var token = context.TargetToken;
+
+            // var q = from x in y
+            //         |
+            if (!token.IntersectsWith(position) &&
+                token.IsLastTokenOfQueryClause())
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/HiddenKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/HiddenKeywordRecommender.cs
new file mode 100644
index 0000000000..f7047a9dcf
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/HiddenKeywordRecommender.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class HiddenKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public HiddenKeywordRecommender()
+            : base(SyntaxKind.HiddenKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //   #line |
+            //   #line h|
+            //   # line |
+            //   # line h|
+
+            var previousToken1 = context.TargetToken;
+            var previousToken2 = previousToken1.GetPreviousToken(includeSkipped: true);
+
+            return
+                previousToken1.Kind() == SyntaxKind.LineKeyword &&
+                previousToken2.Kind() == SyntaxKind.HashToken;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IfKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IfKeywordRecommender.cs
new file mode 100644
index 0000000000..dd5839e814
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IfKeywordRecommender.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class IfKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public IfKeywordRecommender()
+            : base(SyntaxKind.IfKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsPreProcessorKeywordContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ImplicitKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ImplicitKeywordRecommender.cs
new file mode 100644
index 0000000000..ba32b643c0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ImplicitKeywordRecommender.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ImplicitKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.ExternKeyword,
+                SyntaxKind.UnsafeKeyword,
+            };
+
+        public ImplicitKeywordRecommender()
+            : base(SyntaxKind.ImplicitKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsMemberDeclarationContext(validModifiers: s_validMemberModifiers, validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                // operators must be both public and static
+                var modifiers = context.PrecedingModifiers;
+
+                return
+                    modifiers.Contains(SyntaxKind.PublicKeyword) &&
+                    modifiers.Contains(SyntaxKind.StaticKeyword);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/InKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/InKeywordRecommender.cs
new file mode 100644
index 0000000000..f8c14fef53
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/InKeywordRecommender.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class InKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public InKeywordRecommender()
+            : base(SyntaxKind.InKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsValidContextInForEachClause(context) ||
+                IsValidContextInFromClause(context, cancellationToken) ||
+                IsValidContextInJoinClause(context, cancellationToken) ||
+                context.TargetToken.IsTypeParameterVarianceContext();
+        }
+
+        private bool IsValidContextInForEachClause(CSharpSyntaxContext context)
+        {
+            // cases:
+            //   foreach (var v |
+            //   foreach (var v i|
+
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.IdentifierToken)
+            {
+                var statement = token.GetAncestor<ForEachStatementSyntax>();
+                if (statement != null && token == statement.Identifier)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool IsValidContextInFromClause(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.IdentifierToken)
+            {
+                // case:
+                //   from x |
+                if (token.GetPreviousToken(includeSkipped: true).IsKindOrHasMatchingText(SyntaxKind.FromKeyword))
+                {
+                    var typeSyntax = token.Parent as TypeSyntax;
+					if (!typeSyntax.IsPotentialTypeName(context.SemanticModel, cancellationToken))
+                    {
+                        return true;
+                    }
+                }
+
+                var fromClause = token.Parent as FromClauseSyntax;
+                if (fromClause != null)
+                {
+                    // case:
+                    //   from int x |
+                    if (token == fromClause.Identifier && fromClause.Type != null)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        private bool IsValidContextInJoinClause(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.IdentifierToken)
+            {
+                var joinClause = token.Parent.FirstAncestorOrSelf<JoinClauseSyntax>();
+                if (joinClause != null)
+                {
+                    // case:
+                    //   join int x |
+                    if (token == joinClause.Identifier && joinClause.Type != null)
+                    {
+                        return true;
+                    }
+
+                    // case:
+                    //   join x |
+                    if (joinClause.Type != null &&
+                        joinClause.Type.IsKind(SyntaxKind.IdentifierName) &&
+                        token == ((IdentifierNameSyntax)joinClause.Type).Identifier &&
+                        !joinClause.Type.IsPotentialTypeName(context.SemanticModel, cancellationToken))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IntKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IntKeywordRecommender.cs
new file mode 100644
index 0000000000..91dc5e0fe8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IntKeywordRecommender.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class IntKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public IntKeywordRecommender()
+            : base(SyntaxKind.IntKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsEnumBaseListContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/InterfaceKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/InterfaceKeywordRecommender.cs
new file mode 100644
index 0000000000..56107f6ff0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/InterfaceKeywordRecommender.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class InterfaceKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.UnsafeKeyword
+            };
+
+        public InterfaceKeywordRecommender()
+            : base(SyntaxKind.InterfaceKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                context.IsTypeDeclarationContext(
+                    validModifiers: s_validModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: true,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/InternalKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/InternalKeywordRecommender.cs
new file mode 100644
index 0000000000..9e975f2735
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/InternalKeywordRecommender.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class InternalKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public InternalKeywordRecommender()
+            : base(SyntaxKind.InternalKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                IsValidContextForAccessor(context) ||
+                IsValidContextForType(context, cancellationToken) ||
+                IsValidContextForMember(context, cancellationToken);
+        }
+
+        private static bool IsValidContextForAccessor(CSharpSyntaxContext context)
+        {
+            if (context.TargetToken.IsAccessorDeclarationContext<PropertyDeclarationSyntax>(context.Position) ||
+                context.TargetToken.IsAccessorDeclarationContext<IndexerDeclarationSyntax>(context.Position))
+            {
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool IsValidContextForMember(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.SyntaxTree.IsGlobalMemberDeclarationContext(context.Position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(validModifiers: SyntaxKindSet.AllMemberModifiers, validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool IsValidContextForType(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsTypeDeclarationContext(validModifiers: SyntaxKindSet.AllTypeModifiers, validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool CheckPreviousAccessibilityModifiers(CSharpSyntaxContext context)
+        {
+            // internal things can be protected.
+            var precedingModifiers = context.PrecedingModifiers;
+            return
+                !precedingModifiers.Contains(SyntaxKind.PublicKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.InternalKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.PrivateKeyword);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IntoKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IntoKeywordRecommender.cs
new file mode 100644
index 0000000000..d19d8dcf64
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IntoKeywordRecommender.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class IntoKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public IntoKeywordRecommender()
+            : base(SyntaxKind.IntoKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsValidContextForJoin(context) ||
+                IsValidContextForSelect(context) ||
+                IsValidContextForGroup(context);
+        }
+
+        private bool IsValidContextForSelect(CSharpSyntaxContext context)
+        {
+            var token = context.TargetToken;
+
+            var select = token.GetAncestor<SelectClauseSyntax>();
+            if (select == null)
+            {
+                return false;
+            }
+
+            if (select.Expression.Width() == 0)
+            {
+                return false;
+            }
+
+            var lastToken = select.Expression.GetLastToken(includeSkipped: true);
+
+            if (lastToken == token)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool IsValidContextForGroup(CSharpSyntaxContext context)
+        {
+            var token = context.TargetToken;
+
+            var group = token.GetAncestor<GroupClauseSyntax>();
+            if (group == null)
+            {
+                return false;
+            }
+
+            if (group.ByExpression.Width() == 0 ||
+                group.GroupExpression.Width() == 0)
+            {
+                return false;
+            }
+
+            var lastToken = group.ByExpression.GetLastToken(includeSkipped: true);
+
+            if (lastToken == token)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private static bool IsValidContextForJoin(CSharpSyntaxContext context)
+        {
+            // cases:
+            //   join a in expr o1 equals o2 |
+            //   join a in expr o1 equals o2 i|
+
+            var token = context.TargetToken;
+            var join = token.GetAncestor<JoinClauseSyntax>();
+
+            if (join == null)
+            {
+                // happens for:
+                //   join a in expr on o1 equals o2 e|
+                if (!token.IntersectsWith(context.Position))
+                {
+                    return false;
+                }
+
+                token = token.GetPreviousToken(includeSkipped: true);
+                join = token.GetAncestor<JoinClauseSyntax>();
+
+                if (join == null)
+                {
+                    return false;
+                }
+            }
+
+            var lastToken = join.RightExpression.GetLastToken(includeSkipped: true);
+
+            // join a in expr on o1 equals o2 |
+            if (token == lastToken &&
+                !lastToken.IntersectsWith(context.Position))
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IsKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IsKeywordRecommender.cs
new file mode 100644
index 0000000000..e9359aae81
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/IsKeywordRecommender.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class IsKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public IsKeywordRecommender()
+            : base(SyntaxKind.IsKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //    expr |
+            return !context.IsInNonUserCode && context.IsIsOrAsContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/JoinKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/JoinKeywordRecommender.cs
new file mode 100644
index 0000000000..d61b937922
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/JoinKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class JoinKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public JoinKeywordRecommender()
+            : base(SyntaxKind.JoinKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.SyntaxTree.IsValidContextForJoinClause(position, context.LeftToken, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LetKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LetKeywordRecommender.cs
new file mode 100644
index 0000000000..f76d9b97ca
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LetKeywordRecommender.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class LetKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public LetKeywordRecommender()
+            : base(SyntaxKind.LetKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var token = context.TargetToken;
+
+            // var q = from x in y
+            //         |
+            if (!token.IntersectsWith(position) &&
+                token.IsLastTokenOfQueryClause())
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LineKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LineKeywordRecommender.cs
new file mode 100644
index 0000000000..f481ef3436
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LineKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class LineKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public LineKeywordRecommender()
+            : base(SyntaxKind.LineKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LockKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LockKeywordRecommender.cs
new file mode 100644
index 0000000000..0ce70f2edb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LockKeywordRecommender.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class LockKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public LockKeywordRecommender()
+            : base(SyntaxKind.LockKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LongKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LongKeywordRecommender.cs
new file mode 100644
index 0000000000..c2e8ce8963
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/LongKeywordRecommender.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class LongKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public LongKeywordRecommender()
+            : base(SyntaxKind.LongKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsEnumBaseListContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/MethodKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/MethodKeywordRecommender.cs
new file mode 100644
index 0000000000..e9e61a1240
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/MethodKeywordRecommender.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class MethodKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public MethodKeywordRecommender()
+            : base(SyntaxKind.MethodKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsMemberAttributeContext(SyntaxKindSet.ClassInterfaceStructTypeDeclarations, cancellationToken))
+            {
+                return true;
+            }
+
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.OpenBracketToken &&
+                token.Parent.IsKind(SyntaxKind.AttributeList))
+            {
+                if (token.GetAncestor<PropertyDeclarationSyntax>() != null ||
+                    token.GetAncestor<EventDeclarationSyntax>() != null)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ModuleKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ModuleKeywordRecommender.cs
new file mode 100644
index 0000000000..f86d6d6a11
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ModuleKeywordRecommender.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ModuleKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ModuleKeywordRecommender()
+            : base(SyntaxKind.ModuleKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsTypeAttributeContext(cancellationToken))
+            {
+                var token = context.LeftToken;
+                var type = token.GetAncestor<MemberDeclarationSyntax>();
+
+                return type == null || type.IsParentKind(SyntaxKind.CompilationUnit);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NameOfKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NameOfKeywordRecommender.cs
new file mode 100644
index 0000000000..dc6589997f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NameOfKeywordRecommender.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class NameOfKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public NameOfKeywordRecommender()
+            : base(SyntaxKind.NameOfKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsAnyExpressionContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                IsAttributeArgumentContext(context);
+        }
+
+        private bool IsAttributeArgumentContext(CSharpSyntaxContext context)
+        {
+            return
+                context.IsAnyExpressionContext &&
+                context.LeftToken.GetAncestor<AttributeSyntax>() != null;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NamespaceKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NamespaceKeywordRecommender.cs
new file mode 100644
index 0000000000..f2cd4ef2fc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NamespaceKeywordRecommender.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class NamespaceKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public NamespaceKeywordRecommender()
+            : base(SyntaxKind.NamespaceKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+
+            // namespaces are illegal in interactive code:
+            if (syntaxTree.IsInteractiveOrScript())
+            {
+                return false;
+            }
+
+            // cases:
+            // root: |
+
+            // root: n|
+
+            // extern alias a;
+            // |
+
+            // extern alias a;
+            // n|
+
+            // using Foo;
+            // |
+
+            // using Foo;
+            // n|
+
+            // using Foo = Bar;
+            // |
+
+            // using Foo = Bar;
+            // n|
+
+            // namespace N {}
+            // |
+
+            // namespace N {}
+            // n|
+
+            // class C {}
+            // |
+
+            // class C {}
+            // n|
+
+            var leftToken = context.LeftToken;
+            var token = context.TargetToken;
+
+            // root: n|
+
+            // ns Foo { n|
+
+            // extern alias a;
+            // n|
+
+            // using Foo;
+            // n|
+
+            // using Foo = Bar;
+            // n|
+
+            // a namespace can't come before usings/externs
+            // a child namespace can't come before usings/externs
+            if (leftToken.GetNextToken(includeSkipped: true).IsUsingOrExternKeyword())
+            {
+                return false;
+            }
+
+            // root: |
+            if (token.Kind() == SyntaxKind.None)
+            {
+                // root namespace
+                var root = syntaxTree.GetRoot(cancellationToken) as CompilationUnitSyntax;
+                if (root.Externs.Count > 0 ||
+                    root.Usings.Count > 0)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            if (token.Kind() == SyntaxKind.OpenBraceToken &&
+                token.Parent.IsKind(SyntaxKind.NamespaceDeclaration))
+            {
+                return true;
+            }
+
+            // extern alias a;
+            // |
+
+            // using Foo;
+            // |
+            if (token.Kind() == SyntaxKind.SemicolonToken)
+            {
+                if (token.Parent.IsKind(SyntaxKind.ExternAliasDirective, SyntaxKind.UsingDirective))
+                {
+                    return true;
+                }
+            }
+
+            // class C {}
+            // |
+            if (token.Kind() == SyntaxKind.CloseBraceToken)
+            {
+                if (token.Parent is TypeDeclarationSyntax &&
+                    !(token.Parent.GetParent() is TypeDeclarationSyntax))
+                {
+                    return true;
+                }
+                else if (token.Parent.IsKind(SyntaxKind.NamespaceDeclaration))
+                {
+                    return true;
+                }
+            }
+
+            // delegate void D();
+            // |
+
+            if (token.Kind() == SyntaxKind.SemicolonToken)
+            {
+                if (token.Parent.IsKind(SyntaxKind.DelegateDeclaration) &&
+                    !(token.Parent.GetParent() is TypeDeclarationSyntax))
+                {
+                    return true;
+                }
+            }
+
+            // [assembly: foo]
+            // |
+
+            if (token.Kind() == SyntaxKind.CloseBracketToken &&
+                token.Parent.IsKind(SyntaxKind.AttributeList) &&
+                token.Parent.IsParentKind(SyntaxKind.CompilationUnit))
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NewKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NewKeywordRecommender.cs
new file mode 100644
index 0000000000..f5c8c5742f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NewKeywordRecommender.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+	internal class NewKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.AbstractKeyword,
+                SyntaxKind.ExternKeyword,
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.ReadOnlyKeyword,
+                SyntaxKind.SealedKeyword,
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.UnsafeKeyword,
+                SyntaxKind.VirtualKeyword,
+                SyntaxKind.VolatileKeyword,
+            };
+
+        protected static readonly ISet<SyntaxKind> ValidTypeModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.AbstractKeyword,
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.SealedKeyword,
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.UnsafeKeyword
+            };
+
+        public NewKeywordRecommender()
+            : base(SyntaxKind.NewKeyword)
+        {
+        }
+
+		protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+		{
+			return IsValid (position, context, cancellationToken);
+		}
+
+		public bool IsValid(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsNewConstraintContext(context, cancellationToken) ||
+                context.IsAnyExpressionContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                IsMemberDeclarationContext(context, cancellationToken) ||
+                IsTypeDeclarationContext(context, cancellationToken);
+        }
+
+        private bool IsTypeDeclarationContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsTypeDeclarationContext(validModifiers: ValidTypeModifiers, validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                // we must be on a nested type.
+                var token = context.LeftToken;
+                return token.GetAncestors<TypeDeclarationSyntax>()
+                    .Any(t => token.SpanStart > t.OpenBraceToken.Span.End &&
+                              token.Span.End < t.CloseBraceToken.SpanStart);
+            }
+
+            return false;
+        }
+
+        private bool IsMemberDeclarationContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.SyntaxTree.IsGlobalMemberDeclarationContext(context.Position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: s_validMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+
+        private static bool IsNewConstraintContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //    where T : |
+            //    where T : class, |
+            //    where T : Foo, |
+            // note: 'new()' can't come after a 'struct' constraint.
+
+            if (context.SyntaxTree.IsTypeParameterConstraintStartContext(context.Position, context.LeftToken, cancellationToken))
+            {
+                return true;
+            }
+
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.CommaToken &&
+                token.Parent.IsKind(SyntaxKind.TypeParameterConstraintClause))
+            {
+                var constraintClause = token.Parent as TypeParameterConstraintClauseSyntax;
+                if (!constraintClause.Constraints
+                        .OfType<ClassOrStructConstraintSyntax>()
+                        .Any(c => c.ClassOrStructKeyword.Kind() == SyntaxKind.StructKeyword))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NullKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NullKeywordRecommender.cs
new file mode 100644
index 0000000000..3200470fb2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/NullKeywordRecommender.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class NullKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public NullKeywordRecommender()
+            : base(SyntaxKind.NullKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+
+            return
+                context.IsAnyExpressionContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                IsInSelectCaseContext(context, cancellationToken);
+        }
+
+        private bool IsInSelectCaseContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var token = context.TargetToken;
+            if (token.Kind() != SyntaxKind.CaseKeyword)
+            {
+                return false;
+            }
+
+            var switchStatement = token.GetAncestor<SwitchStatementSyntax>();
+            if (switchStatement != null)
+            {
+                var info = context.SemanticModel.GetTypeInfo(switchStatement.Expression, cancellationToken);
+                if (info.Type != null &&
+                    info.Type.IsValueType)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ObjectKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ObjectKeywordRecommender.cs
new file mode 100644
index 0000000000..15293d61e3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ObjectKeywordRecommender.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ObjectKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ObjectKeywordRecommender()
+            : base(SyntaxKind.ObjectKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsNonAttributeExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsTypeOfExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsDefaultExpressionContext(position, context.LeftToken, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OnKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OnKeywordRecommender.cs
new file mode 100644
index 0000000000..0665f64786
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OnKeywordRecommender.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class OnKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public OnKeywordRecommender()
+            : base(SyntaxKind.OnKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //   join a in expr |
+            //   join a in expr o|
+            //   join a.b c in expr |
+            //   join a.b c in expr o|
+
+            var token = context.TargetToken;
+
+            var join = token.GetAncestor<JoinClauseSyntax>();
+            if (join == null)
+            {
+                return false;
+            }
+
+            // join a in expr |
+            // join a.b c in expr |
+
+            var lastToken = join.InExpression.GetLastToken(includeSkipped: true);
+
+            if (join.InExpression.Width() > 0 &&
+                token == lastToken)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OperatorKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OperatorKeywordRecommender.cs
new file mode 100644
index 0000000000..2cc67a5057
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OperatorKeywordRecommender.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class OperatorKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+//        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+//            {
+//                SyntaxKind.StaticKeyword,
+//                SyntaxKind.PublicKeyword,
+//                SyntaxKind.ExternKeyword,
+//            };
+
+        public OperatorKeywordRecommender()
+            : base(SyntaxKind.OperatorKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //   public static implicit |
+            //   public static explicit |
+            var token = context.TargetToken;
+
+            return
+                token.Kind() == SyntaxKind.ImplicitKeyword ||
+                token.Kind() == SyntaxKind.ExplicitKeyword;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OrderByKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OrderByKeywordRecommender.cs
new file mode 100644
index 0000000000..7bc71ac08c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OrderByKeywordRecommender.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class OrderByKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public OrderByKeywordRecommender()
+            : base(SyntaxKind.OrderByKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var token = context.TargetToken;
+
+            // var q = from x in y
+            //         |
+            if (!token.IntersectsWith(position) &&
+                token.IsLastTokenOfQueryClause())
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OutKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OutKeywordRecommender.cs
new file mode 100644
index 0000000000..8b81204b29
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OutKeywordRecommender.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class OutKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public OutKeywordRecommender()
+            : base(SyntaxKind.OutKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+
+            // TODO(cyrusn): lambda/anon methods can have out/ref parameters
+            return
+                context.TargetToken.IsTypeParameterVarianceContext() ||
+                syntaxTree.IsParameterModifierContext(position, context.LeftToken, cancellationToken) ||
+                syntaxTree.IsAnonymousMethodParameterModifierContext(position, context.LeftToken, cancellationToken) ||
+                syntaxTree.IsPossibleLambdaParameterModifierContext(position, context.LeftToken, cancellationToken) ||
+                context.TargetToken.IsConstructorOrMethodParameterArgumentContext() ||
+                context.TargetToken.IsXmlCrefParameterModifierContext();
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OverrideKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OverrideKeywordRecommender.cs
new file mode 100644
index 0000000000..d01a356317
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/OverrideKeywordRecommender.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class OverrideKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.ExternKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.UnsafeKeyword,
+            SyntaxKind.SealedKeyword,
+            SyntaxKind.AbstractKeyword,
+        };
+
+        public OverrideKeywordRecommender()
+            : base(SyntaxKind.OverrideKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsMemberDeclarationContext(
+                validModifiers: s_validMemberModifiers,
+                validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                canBePartial: false,
+                cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ParamKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ParamKeywordRecommender.cs
new file mode 100644
index 0000000000..6d4cd307f1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ParamKeywordRecommender.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ParamKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ParamKeywordRecommender()
+            : base(SyntaxKind.ParamKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.OpenBracketToken &&
+                token.Parent.IsKind(SyntaxKind.AttributeList))
+            {
+                if (token.GetAncestor<PropertyDeclarationSyntax>() != null ||
+                    token.GetAncestor<EventDeclarationSyntax>() != null)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ParamsKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ParamsKeywordRecommender.cs
new file mode 100644
index 0000000000..dbb7434508
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ParamsKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ParamsKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ParamsKeywordRecommender()
+            : base(SyntaxKind.ParamsKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.SyntaxTree.IsParameterModifierContext(context.Position, context.LeftToken, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PartialKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PartialKeywordRecommender.cs
new file mode 100644
index 0000000000..e9105b4619
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PartialKeywordRecommender.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class PartialKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.AsyncKeyword,
+            SyntaxKind.StaticKeyword
+        };
+
+        public PartialKeywordRecommender()
+            : base(SyntaxKind.PartialKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                IsMemberDeclarationContext(context, cancellationToken) ||
+                IsTypeDeclarationContext(context, cancellationToken);
+        }
+
+        private bool IsMemberDeclarationContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsMemberDeclarationContext(validModifiers: s_validMemberModifiers, validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                var token = context.LeftToken;
+                var decl = token.GetAncestor<TypeDeclarationSyntax>();
+
+                // partial methods must be in partial types
+                if (!decl.Modifiers.Any(t => t.IsKindOrHasMatchingText(SyntaxKind.PartialKeyword)))
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool IsTypeDeclarationContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsTypeDeclarationContext(
+                validModifiers: SyntaxKindSet.AllTypeModifiers,
+                validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                canBePartial: false,
+                cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PragmaKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PragmaKeywordRecommender.cs
new file mode 100644
index 0000000000..556d2ee144
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PragmaKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class PragmaKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public PragmaKeywordRecommender()
+            : base(SyntaxKind.PragmaKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PrivateKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PrivateKeywordRecommender.cs
new file mode 100644
index 0000000000..26a1f1d8f2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PrivateKeywordRecommender.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class PrivateKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public PrivateKeywordRecommender()
+            : base(SyntaxKind.PrivateKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                IsValidContextForAccessor(context) ||
+                IsValidContextForType(context, cancellationToken) ||
+                IsValidContextForMember(context, cancellationToken);
+        }
+
+        private static bool IsValidContextForAccessor(CSharpSyntaxContext context)
+        {
+            if (context.TargetToken.IsAccessorDeclarationContext<PropertyDeclarationSyntax>(context.Position) ||
+                context.TargetToken.IsAccessorDeclarationContext<IndexerDeclarationSyntax>(context.Position))
+            {
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool IsValidContextForMember(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.SyntaxTree.IsGlobalMemberDeclarationContext(context.Position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(validModifiers: SyntaxKindSet.AllMemberModifiers, validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                var modifiers = context.PrecedingModifiers;
+
+                // can't have private + abstract/virtual/override/sealed
+                if (modifiers.Contains(SyntaxKind.AbstractKeyword) ||
+                    modifiers.Contains(SyntaxKind.VirtualKeyword) ||
+                    modifiers.Contains(SyntaxKind.OverrideKeyword) ||
+                    modifiers.Contains(SyntaxKind.SealedKeyword))
+                {
+                    return false;
+                }
+
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool IsValidContextForType(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsTypeDeclarationContext(validModifiers: SyntaxKindSet.AllTypeModifiers, validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                // private things can't be in namespaces.
+                var typeDecl = context.ContainingTypeDeclaration;
+                if (typeDecl == null)
+                {
+                    return false;
+                }
+
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool CheckPreviousAccessibilityModifiers(CSharpSyntaxContext context)
+        {
+            var precedingModifiers = context.PrecedingModifiers;
+            return
+                !precedingModifiers.Contains(SyntaxKind.PublicKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.InternalKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.ProtectedKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.PrivateKeyword);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PropertyKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PropertyKeywordRecommender.cs
new file mode 100644
index 0000000000..6be63e7031
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PropertyKeywordRecommender.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class PropertyKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public PropertyKeywordRecommender()
+            : base(SyntaxKind.PropertyKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsMemberAttributeContext(SyntaxKindSet.ClassInterfaceStructTypeDeclarations, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ProtectedKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ProtectedKeywordRecommender.cs
new file mode 100644
index 0000000000..3c7d897e22
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ProtectedKeywordRecommender.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ProtectedKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ProtectedKeywordRecommender()
+            : base(SyntaxKind.ProtectedKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsValidContextForAccessor(context) ||
+                IsValidContextForType(context, cancellationToken) ||
+                IsValidContextForMember(context, cancellationToken);
+        }
+
+        private static bool IsValidContextForAccessor(CSharpSyntaxContext context)
+        {
+            if (context.TargetToken.IsAccessorDeclarationContext<PropertyDeclarationSyntax>(context.Position) ||
+                context.TargetToken.IsAccessorDeclarationContext<IndexerDeclarationSyntax>(context.Position))
+            {
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool IsValidContextForMember(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsMemberDeclarationContext(validModifiers: SyntaxKindSet.AllMemberModifiers, validTypeDeclarations: SyntaxKindSet.ClassOnlyTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool IsValidContextForType(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsTypeDeclarationContext(validModifiers: SyntaxKindSet.AllTypeModifiers, validTypeDeclarations: SyntaxKindSet.ClassOnlyTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                // protected things can't be in namespaces.
+                var typeDecl = context.ContainingTypeDeclaration;
+                if (typeDecl == null)
+                {
+                    return false;
+                }
+
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool CheckPreviousAccessibilityModifiers(CSharpSyntaxContext context)
+        {
+            // We can show up after 'internal'.
+            var precedingModifiers = context.PrecedingModifiers;
+            return
+                !precedingModifiers.Contains(SyntaxKind.PublicKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.ProtectedKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.PrivateKeyword);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PublicKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PublicKeywordRecommender.cs
new file mode 100644
index 0000000000..21debc6f36
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/PublicKeywordRecommender.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class PublicKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public PublicKeywordRecommender()
+            : base(SyntaxKind.PublicKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                IsValidContextForType(context, cancellationToken) ||
+                IsValidContextForMember(context, cancellationToken);
+        }
+
+        private static bool IsValidContextForMember(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.SyntaxTree.IsGlobalMemberDeclarationContext(context.Position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken))
+            {
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool IsValidContextForType(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsTypeDeclarationContext(validModifiers: SyntaxKindSet.AllTypeModifiers, validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken))
+            {
+                return CheckPreviousAccessibilityModifiers(context);
+            }
+
+            return false;
+        }
+
+        private static bool CheckPreviousAccessibilityModifiers(CSharpSyntaxContext context)
+        {
+            var precedingModifiers = context.PrecedingModifiers;
+            return
+                !precedingModifiers.Contains(SyntaxKind.PublicKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.InternalKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.ProtectedKeyword) &&
+                !precedingModifiers.Contains(SyntaxKind.PrivateKeyword);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ReadOnlyKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ReadOnlyKeywordRecommender.cs
new file mode 100644
index 0000000000..0e845ed6e9
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ReadOnlyKeywordRecommender.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ReadOnlyKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.NewKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.StaticKeyword,
+            };
+
+        public ReadOnlyKeywordRecommender()
+            : base(SyntaxKind.ReadOnlyKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                context.SyntaxTree.IsGlobalMemberDeclarationContext(context.Position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: s_validMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RefKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RefKeywordRecommender.cs
new file mode 100644
index 0000000000..83081f1ebd
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RefKeywordRecommender.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class RefKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public RefKeywordRecommender()
+            : base(SyntaxKind.RefKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                syntaxTree.IsParameterModifierContext(position, context.LeftToken, cancellationToken) ||
+                syntaxTree.IsAnonymousMethodParameterModifierContext(position, context.LeftToken, cancellationToken) ||
+                syntaxTree.IsPossibleLambdaParameterModifierContext(position, context.LeftToken, cancellationToken) ||
+                context.TargetToken.IsConstructorOrMethodParameterArgumentContext() ||
+                context.TargetToken.IsXmlCrefParameterModifierContext();
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ReferenceKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ReferenceKeywordRecommender.cs
new file mode 100644
index 0000000000..5fb24646fe
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ReferenceKeywordRecommender.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ReferenceKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ReferenceKeywordRecommender()
+            : base(SyntaxKind.ReferenceKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                syntaxTree.IsInteractiveOrScript() &&
+                syntaxTree.IsBeforeFirstToken(position, cancellationToken) &&
+                context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RegionKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RegionKeywordRecommender.cs
new file mode 100644
index 0000000000..67fffd3948
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RegionKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class RegionKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public RegionKeywordRecommender()
+            : base(SyntaxKind.RegionKeyword, isValidInPreprocessorContext: true, shouldFormatOnCommit: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RemoveKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RemoveKeywordRecommender.cs
new file mode 100644
index 0000000000..e9abae057c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RemoveKeywordRecommender.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class RemoveKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public RemoveKeywordRecommender()
+            : base(SyntaxKind.RemoveKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.TargetToken.IsAccessorDeclarationContext<EventDeclarationSyntax>(position, SyntaxKind.RemoveKeyword);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RestoreKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RestoreKeywordRecommender.cs
new file mode 100644
index 0000000000..715edd7c22
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/RestoreKeywordRecommender.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class RestoreKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public RestoreKeywordRecommender()
+            : base(SyntaxKind.RestoreKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // # pragma warning |
+            // # pragma warning r|
+            var previousToken1 = context.TargetToken;
+            var previousToken2 = previousToken1.GetPreviousToken(includeSkipped: true);
+            var previousToken3 = previousToken2.GetPreviousToken(includeSkipped: true);
+
+            return
+               previousToken1.Kind() == SyntaxKind.WarningKeyword &&
+               previousToken2.Kind() == SyntaxKind.PragmaKeyword &&
+               previousToken3.Kind() == SyntaxKind.HashToken;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ReturnKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ReturnKeywordRecommender.cs
new file mode 100644
index 0000000000..da927d71be
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ReturnKeywordRecommender.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ReturnKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ReturnKeywordRecommender()
+            : base(SyntaxKind.ReturnKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.TargetToken.IsAfterYieldKeyword() ||
+                IsAttributeContext(context, cancellationToken);
+        }
+
+        private static bool IsAttributeContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsMemberAttributeContext(SyntaxKindSet.ClassInterfaceStructTypeDeclarations, cancellationToken) ||
+                (context.SyntaxTree.IsInteractiveOrScript() && context.IsTypeAttributeContext(cancellationToken));
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SByteKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SByteKeywordRecommender.cs
new file mode 100644
index 0000000000..c8edd8e150
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SByteKeywordRecommender.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class SByteKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public SByteKeywordRecommender()
+            : base(SyntaxKind.SByteKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsNonAttributeExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsEnumBaseListContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SealedKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SealedKeywordRecommender.cs
new file mode 100644
index 0000000000..ac89445eee
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SealedKeywordRecommender.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class SealedKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.ExternKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.NewKeyword,
+            SyntaxKind.OverrideKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.UnsafeKeyword,
+        };
+
+        private static readonly ISet<SyntaxKind> s_validTypeModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.PrivateKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.UnsafeKeyword
+        };
+
+        public SealedKeywordRecommender()
+            : base(SyntaxKind.SealedKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: s_validMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassOnlyTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken) ||
+                context.IsTypeDeclarationContext(
+                    validModifiers: s_validTypeModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SelectKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SelectKeywordRecommender.cs
new file mode 100644
index 0000000000..76afd5cc48
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SelectKeywordRecommender.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class SelectKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public SelectKeywordRecommender()
+            : base(SyntaxKind.SelectKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var token = context.TargetToken;
+
+            // for orderby, ascending is the default so select should be available in the orderby direction context
+            if (token.IsOrderByDirectionContext())
+            {
+                return true;
+            }
+
+            // var q = from x in y
+            //         |
+            if (!token.IntersectsWith(position) &&
+                token.IsLastTokenOfQueryClause())
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SetKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SetKeywordRecommender.cs
new file mode 100644
index 0000000000..bd37ed26a0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SetKeywordRecommender.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class SetKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public SetKeywordRecommender()
+            : base(SyntaxKind.SetKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.TargetToken.IsAccessorDeclarationContext<PropertyDeclarationSyntax>(position, SyntaxKind.SetKeyword) ||
+                context.TargetToken.IsAccessorDeclarationContext<IndexerDeclarationSyntax>(position, SyntaxKind.SetKeyword);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ShortKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ShortKeywordRecommender.cs
new file mode 100644
index 0000000000..e017ee200c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ShortKeywordRecommender.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ShortKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ShortKeywordRecommender()
+            : base(SyntaxKind.ShortKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsEnumBaseListContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SizeOfKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SizeOfKeywordRecommender.cs
new file mode 100644
index 0000000000..b789d84171
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SizeOfKeywordRecommender.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class SizeOfKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public SizeOfKeywordRecommender()
+            : base(SyntaxKind.SizeOfKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsNonAttributeExpressionContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StackAllocKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StackAllocKeywordRecommender.cs
new file mode 100644
index 0000000000..eb66b49210
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StackAllocKeywordRecommender.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class StackAllocKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public StackAllocKeywordRecommender()
+            : base(SyntaxKind.StackAllocKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // type t = |
+            var token = context.TargetToken;
+            if (token.IsUnsafeContext())
+            {
+                if (token.Kind() == SyntaxKind.EqualsToken &&
+                    token.Parent.IsKind(SyntaxKind.EqualsValueClause) &&
+                    token.Parent.IsParentKind(SyntaxKind.VariableDeclarator) &&
+                    token.Parent.Parent.IsParentKind(SyntaxKind.VariableDeclaration))
+                {
+                    var variableDeclaration = (VariableDeclarationSyntax)token.Parent.Parent.Parent;
+                    if (variableDeclaration.IsParentKind(SyntaxKind.LocalDeclarationStatement) ||
+                        variableDeclaration.IsParentKind(SyntaxKind.ForStatement))
+                    {
+                        return variableDeclaration.Type.IsVar || variableDeclaration.Type.IsKind(SyntaxKind.PointerType);
+                    }
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StaticKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StaticKeywordRecommender.cs
new file mode 100644
index 0000000000..8daf3e29b5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StaticKeywordRecommender.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class StaticKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validTypeModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.PrivateKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.UnsafeKeyword,
+        };
+
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.AsyncKeyword,
+            SyntaxKind.ExternKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.PrivateKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.ReadOnlyKeyword,
+            SyntaxKind.UnsafeKeyword,
+            SyntaxKind.VolatileKeyword,
+        };
+
+        private static readonly ISet<SyntaxKind> s_validGlobalMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.ExternKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.PrivateKeyword,
+            SyntaxKind.ReadOnlyKeyword,
+            SyntaxKind.UnsafeKeyword,
+            SyntaxKind.VolatileKeyword,
+        };
+
+        public StaticKeywordRecommender()
+            : base(SyntaxKind.StaticKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                context.TargetToken.IsUsingKeywordInUsingDirective() ||
+                IsValidContextForType(context, cancellationToken) ||
+                IsValidContextForMember(context, cancellationToken);
+        }
+
+        private static bool IsValidContextForMember(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.SyntaxTree.IsGlobalMemberDeclarationContext(context.Position, s_validGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: s_validMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+
+        private static bool IsValidContextForType(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsTypeDeclarationContext(
+                validModifiers: s_validTypeModifiers,
+                validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                canBePartial: false,
+                cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StringKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StringKeywordRecommender.cs
new file mode 100644
index 0000000000..a064a15360
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StringKeywordRecommender.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class StringKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public StringKeywordRecommender()
+            : base(SyntaxKind.StringKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsTypeOfExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsDefaultExpressionContext(position, context.LeftToken, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StructKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StructKeywordRecommender.cs
new file mode 100644
index 0000000000..ad11333782
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/StructKeywordRecommender.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class StructKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.UnsafeKeyword
+            };
+
+        public StructKeywordRecommender()
+            : base(SyntaxKind.StructKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsGlobalStatementContext ||
+                context.IsTypeDeclarationContext(
+                    validModifiers: s_validModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: true,
+                    cancellationToken: cancellationToken) ||
+                syntaxTree.IsTypeParameterConstraintStartContext(position, context.LeftToken, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SwitchKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SwitchKeywordRecommender.cs
new file mode 100644
index 0000000000..628463284a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/SwitchKeywordRecommender.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class SwitchKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public SwitchKeywordRecommender()
+            : base(SyntaxKind.SwitchKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ThisKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ThisKeywordRecommender.cs
new file mode 100644
index 0000000000..ded002dfd5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ThisKeywordRecommender.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ThisKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ThisKeywordRecommender()
+            : base(SyntaxKind.ThisKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsInstanceExpressionOrStatement(context) ||
+                IsExtensionMethodParameterContext(context, cancellationToken) ||
+                IsConstructorInitializerContext(context);
+        }
+
+        private static bool IsInstanceExpressionOrStatement(CSharpSyntaxContext context)
+        {
+            if (context.IsInstanceContext)
+            {
+                return context.IsNonAttributeExpressionContext || context.IsStatementContext;
+            }
+
+            return false;
+        }
+
+        private bool IsConstructorInitializerContext(CSharpSyntaxContext context)
+        {
+            // cases:
+            //   Foo() : |
+
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.ColonToken &&
+                token.Parent is ConstructorInitializerSyntax &&
+                token.Parent.IsParentKind(SyntaxKind.ConstructorDeclaration))
+            {
+                var constructor = token.GetAncestor<ConstructorDeclarationSyntax>();
+				if (constructor.Modifiers.Any(m => m.IsKind (SyntaxKind.StaticKeyword)))
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        private static bool IsExtensionMethodParameterContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // TODO(cyrusn): lambda/anon methods can have out/ref parameters
+            if (!context.SyntaxTree.IsParameterModifierContext(context.Position, context.LeftToken, cancellationToken, allowableIndex: 0))
+            {
+                return false;
+            }
+
+            var token = context.LeftToken;
+            var method = token.GetAncestor<MethodDeclarationSyntax>();
+            var typeDecl = method.GetAncestorOrThis<TypeDeclarationSyntax>();
+
+            if (method == null || typeDecl == null)
+            {
+                return false;
+            }
+
+            if (typeDecl.Kind() != SyntaxKind.ClassDeclaration)
+            {
+                return false;
+            }
+
+            if (!method.Modifiers.Any(t => t.Kind() == SyntaxKind.StaticKeyword))
+            {
+                return false;
+            }
+
+            if (!typeDecl.Modifiers.Any(t => t.Kind() == SyntaxKind.StaticKeyword))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ThrowKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ThrowKeywordRecommender.cs
new file mode 100644
index 0000000000..9572ebe9ab
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ThrowKeywordRecommender.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ThrowKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ThrowKeywordRecommender()
+            : base(SyntaxKind.ThrowKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TrueKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TrueKeywordRecommender.cs
new file mode 100644
index 0000000000..a190aae0b8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TrueKeywordRecommender.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class TrueKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public TrueKeywordRecommender()
+            : base(SyntaxKind.TrueKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsAnyExpressionContext ||
+                context.IsPreProcessorExpressionContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.TargetToken.IsUnaryOperatorContext();
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TryKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TryKeywordRecommender.cs
new file mode 100644
index 0000000000..27945aa024
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TryKeywordRecommender.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class TryKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public TryKeywordRecommender()
+            : base(SyntaxKind.TryKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TypeKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TypeKeywordRecommender.cs
new file mode 100644
index 0000000000..4d9bf61e9d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TypeKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class TypeKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public TypeKeywordRecommender()
+            : base(SyntaxKind.TypeKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsTypeAttributeContext(cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TypeOfKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TypeOfKeywordRecommender.cs
new file mode 100644
index 0000000000..c68e66d8e5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TypeOfKeywordRecommender.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class TypeOfKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public TypeOfKeywordRecommender()
+            : base(SyntaxKind.TypeOfKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                (context.IsAnyExpressionContext && !context.IsConstantExpressionContext) ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                IsAttributeArgumentContext(context);
+        }
+
+        private bool IsAttributeArgumentContext(CSharpSyntaxContext context)
+        {
+            return
+                context.IsAnyExpressionContext &&
+                context.LeftToken.GetAncestor<AttributeSyntax>() != null;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TypeVarKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TypeVarKeywordRecommender.cs
new file mode 100644
index 0000000000..cac63dd97a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/TypeVarKeywordRecommender.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class TypeVarKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public TypeVarKeywordRecommender()
+            : base(SyntaxKind.TypeVarKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.OpenBracketToken &&
+                token.Parent.IsKind(SyntaxKind.AttributeList))
+            {
+                var typeParameters = token.GetAncestor<TypeParameterListSyntax>();
+                var type = typeParameters.GetAncestorOrThis<TypeDeclarationSyntax>();
+
+                if (type != null && type.TypeParameterList == typeParameters)
+                {
+                    return true;
+                }
+
+                var @delegate = typeParameters.GetAncestorOrThis<DelegateDeclarationSyntax>();
+                if (@delegate != null && @delegate.TypeParameterList == typeParameters)
+                {
+                    return true;
+                }
+
+                var method = typeParameters.GetAncestorOrThis<MethodDeclarationSyntax>();
+                if (method != null && method.TypeParameterList == typeParameters)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UIntKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UIntKeywordRecommender.cs
new file mode 100644
index 0000000000..282af54e04
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UIntKeywordRecommender.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class UIntKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public UIntKeywordRecommender()
+            : base(SyntaxKind.UIntKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsEnumBaseListContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ULongKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ULongKeywordRecommender.cs
new file mode 100644
index 0000000000..08c52123d8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/ULongKeywordRecommender.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class ULongKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public ULongKeywordRecommender()
+            : base(SyntaxKind.ULongKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsEnumBaseListContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UShortKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UShortKeywordRecommender.cs
new file mode 100644
index 0000000000..42406d6d2a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UShortKeywordRecommender.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class UShortKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public UShortKeywordRecommender()
+            : base(SyntaxKind.UShortKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsAnyExpressionContext ||
+                context.IsDefiniteCastTypeContext ||
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsObjectCreationTypeContext ||
+                context.IsGenericTypeArgumentContext ||
+                context.IsEnumBaseListContext ||
+                context.IsIsOrAsTypeContext ||
+                context.IsLocalVariableDeclarationContext ||
+                context.IsFixedVariableDeclarationContext ||
+                context.IsParameterTypeContext ||
+                context.IsPossibleLambdaOrAnonymousMethodParameterTypeContext ||
+                context.IsImplicitOrExplicitOperatorTypeContext ||
+                context.IsPrimaryFunctionExpressionContext ||
+                context.IsCrefContext ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+                syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: SyntaxKindSet.AllMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UncheckedKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UncheckedKeywordRecommender.cs
new file mode 100644
index 0000000000..118703f82e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UncheckedKeywordRecommender.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class UncheckedKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public UncheckedKeywordRecommender()
+            : base(SyntaxKind.UncheckedKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsNonAttributeExpressionContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UndefKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UndefKeywordRecommender.cs
new file mode 100644
index 0000000000..e887b40db7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UndefKeywordRecommender.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class UndefKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public UndefKeywordRecommender()
+            : base(SyntaxKind.UndefKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                syntaxTree.IsBeforeFirstToken(position, cancellationToken) &&
+                context.IsPreProcessorKeywordContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UnsafeKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UnsafeKeywordRecommender.cs
new file mode 100644
index 0000000000..1a1accb611
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UnsafeKeywordRecommender.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class UnsafeKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validTypeModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.AbstractKeyword,
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.NewKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.SealedKeyword,
+                SyntaxKind.StaticKeyword,
+            };
+
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.AbstractKeyword,
+                SyntaxKind.ExternKeyword,
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.NewKeyword,
+                SyntaxKind.OverrideKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.ReadOnlyKeyword,
+                SyntaxKind.SealedKeyword,
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.VirtualKeyword,
+                SyntaxKind.VolatileKeyword,
+            };
+
+        private static readonly ISet<SyntaxKind> s_validGlobalMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.ExternKeyword,
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.NewKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.ReadOnlyKeyword,
+                SyntaxKind.StaticKeyword,
+                SyntaxKind.VolatileKeyword,
+            };
+
+        public UnsafeKeywordRecommender()
+            : base(SyntaxKind.UnsafeKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                context.IsTypeDeclarationContext(validModifiers: s_validTypeModifiers, validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations, canBePartial: false, cancellationToken: cancellationToken) ||
+                syntaxTree.IsGlobalMemberDeclarationContext(position, s_validGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: s_validMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UsingKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UsingKeywordRecommender.cs
new file mode 100644
index 0000000000..f1dc791e6f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/UsingKeywordRecommender.cs
@@ -0,0 +1,139 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class UsingKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public UsingKeywordRecommender()
+            : base(SyntaxKind.UsingKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            //  using (foo) { }
+            //  using Foo;
+            //  using Foo = Bar;
+            return
+                context.IsStatementContext ||
+                context.IsGlobalStatementContext ||
+                IsUsingDirectiveContext(context, cancellationToken);
+        }
+
+        private static bool IsUsingDirectiveContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // cases:
+            // root: |
+
+            // root: u|
+
+            // extern alias a;
+            // |
+
+            // extern alias a;
+            // u|
+
+            // using Foo;
+            // |
+
+            // using Foo;
+            // u|
+
+            // using Foo = Bar;
+            // |
+
+            // using Foo = Bar;
+            // u|
+
+            // t valid:
+            // namespace N {}
+            // |
+
+            // namespace N {}
+            // u|
+
+            // class C {}
+            // |
+
+            // class C {}
+            // u|
+
+            // |
+            // extern alias a;
+
+            // u|
+            // extern alias a;
+
+            var originalToken = context.LeftToken;
+            var token = context.TargetToken;
+
+            // root: u|
+
+            // ns Foo { u|
+
+            // extern alias a;
+            // u|
+
+            // using Foo;
+            // u|
+
+            // using Foo = Bar;
+            // u|
+
+            // root: |
+			if (token.Kind() == SyntaxKind.None)
+            {
+                // root namespace
+
+                // a using can't come before externs
+                var nextToken = originalToken.GetNextToken(includeSkipped: true);
+                if (nextToken.Kind() == SyntaxKind.ExternKeyword ||
+                    ((CompilationUnitSyntax)context.SyntaxTree.GetRoot(cancellationToken)).Externs.Count > 0)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            if (token.Kind() == SyntaxKind.OpenBraceToken &&
+                token.Parent.IsKind(SyntaxKind.NamespaceDeclaration))
+            {
+                var ns = (NamespaceDeclarationSyntax)token.Parent;
+
+                // a child using can't come before externs
+                var nextToken = originalToken.GetNextToken(includeSkipped: true);
+                if (nextToken.Kind() == SyntaxKind.ExternKeyword)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            // extern alias a;
+            // |
+
+            // using Foo;
+            // |
+            if (token.Kind() == SyntaxKind.SemicolonToken)
+            {
+                if (token.Parent.IsKind(SyntaxKind.ExternAliasDirective) ||
+                    token.Parent.IsKind(SyntaxKind.UsingDirective))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VarKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VarKeywordRecommender.cs
new file mode 100644
index 0000000000..6627a049e9
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VarKeywordRecommender.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class VarKeywordRecommender : IKeywordRecommender<CSharpSyntaxContext>
+    {
+        public VarKeywordRecommender()
+        {
+        }
+
+        private bool IsValidContext(CSharpSyntaxContext context)
+        {
+            if (context.IsStatementContext ||
+                context.IsGlobalStatementContext)
+            {
+                return true;
+            }
+
+            return context.IsLocalVariableDeclarationContext;
+        }
+
+        public IEnumerable<RecommendedKeyword> RecommendKeywords(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (IsValidContext(context))
+            {
+				yield return new RecommendedKeyword("var", SyntaxKind.TypeVarKeyword);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VirtualKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VirtualKeywordRecommender.cs
new file mode 100644
index 0000000000..d98e7b1616
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VirtualKeywordRecommender.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class VirtualKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.ExternKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.UnsafeKeyword,
+        };
+
+        public VirtualKeywordRecommender()
+            : base(SyntaxKind.VirtualKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsMemberDeclarationContext(
+                validModifiers: s_validMemberModifiers,
+                validTypeDeclarations: SyntaxKindSet.ClassOnlyTypeDeclarations,
+                canBePartial: false,
+                cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VoidKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VoidKeywordRecommender.cs
new file mode 100644
index 0000000000..4228baa2ea
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VoidKeywordRecommender.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class VoidKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+        {
+            SyntaxKind.NewKeyword,
+            SyntaxKind.PublicKeyword,
+            SyntaxKind.ProtectedKeyword,
+            SyntaxKind.InternalKeyword,
+            SyntaxKind.PrivateKeyword,
+            SyntaxKind.StaticKeyword,
+            SyntaxKind.VirtualKeyword,
+            SyntaxKind.SealedKeyword,
+            SyntaxKind.OverrideKeyword,
+            SyntaxKind.AbstractKeyword,
+            SyntaxKind.ExternKeyword,
+            SyntaxKind.UnsafeKeyword,
+            SyntaxKind.AsyncKeyword
+        };
+
+        public VoidKeywordRecommender()
+            : base(SyntaxKind.VoidKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                IsMemberReturnTypeContext(position, context, cancellationToken) ||
+                context.IsGlobalStatementContext ||
+                context.IsTypeOfExpressionContext ||
+                syntaxTree.IsSizeOfExpressionContext(position, context.LeftToken, cancellationToken) ||
+                context.IsDelegateReturnTypeContext ||
+                IsUnsafeLocalVariableDeclarationContext(context) ||
+                IsUnsafeParameterTypeContext(context) ||
+                IsUnsafeCastTypeContext(context) ||
+                IsUnsafeDefaultExpressionContext(context, cancellationToken) ||
+                context.IsFixedVariableDeclarationContext;
+        }
+
+        private bool IsUnsafeDefaultExpressionContext(CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.TargetToken.IsUnsafeContext() &&
+                context.SyntaxTree.IsDefaultExpressionContext(context.Position, context.LeftToken, cancellationToken);
+        }
+
+        private bool IsUnsafeCastTypeContext(CSharpSyntaxContext context)
+        {
+            if (context.TargetToken.IsUnsafeContext())
+            {
+                if (context.IsDefiniteCastTypeContext)
+                {
+                    return true;
+                }
+
+                var token = context.TargetToken;
+
+                if (token.Kind() == SyntaxKind.OpenParenToken &&
+                    token.Parent.IsKind(SyntaxKind.ParenthesizedExpression))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool IsUnsafeParameterTypeContext(CSharpSyntaxContext context)
+        {
+            return
+                context.TargetToken.IsUnsafeContext() &&
+                context.IsParameterTypeContext;
+        }
+
+        private bool IsUnsafeLocalVariableDeclarationContext(CSharpSyntaxContext context)
+        {
+            if (context.TargetToken.IsUnsafeContext())
+            {
+                return
+                    context.IsLocalVariableDeclarationContext ||
+                    context.IsStatementContext;
+            }
+
+            return false;
+        }
+
+        private bool IsMemberReturnTypeContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            var syntaxTree = context.SyntaxTree;
+            return
+                syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: s_validModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+                    canBePartial: true,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VolatileKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VolatileKeywordRecommender.cs
new file mode 100644
index 0000000000..c23381f2a2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/VolatileKeywordRecommender.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class VolatileKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        private static readonly ISet<SyntaxKind> s_validMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+            {
+                SyntaxKind.NewKeyword,
+                SyntaxKind.PublicKeyword,
+                SyntaxKind.ProtectedKeyword,
+                SyntaxKind.InternalKeyword,
+                SyntaxKind.PrivateKeyword,
+                SyntaxKind.StaticKeyword,
+            };
+
+        public VolatileKeywordRecommender()
+            : base(SyntaxKind.VolatileKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                context.IsGlobalStatementContext ||
+                context.SyntaxTree.IsGlobalMemberDeclarationContext(context.Position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+                context.IsMemberDeclarationContext(
+                    validModifiers: s_validMemberModifiers,
+                    validTypeDeclarations: SyntaxKindSet.ClassStructTypeDeclarations,
+                    canBePartial: false,
+                    cancellationToken: cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WarningKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WarningKeywordRecommender.cs
new file mode 100644
index 0000000000..60cfc7c5c2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WarningKeywordRecommender.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class WarningKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public WarningKeywordRecommender()
+            : base(SyntaxKind.WarningKeyword, isValidInPreprocessorContext: true)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            // # warning
+            if (context.IsPreProcessorKeywordContext)
+            {
+                return true;
+            }
+
+            // # pragma |
+            // # pragma w|
+            var previousToken1 = context.TargetToken;
+            var previousToken2 = previousToken1.GetPreviousToken(includeSkipped: true);
+
+            return
+                previousToken1.Kind() == SyntaxKind.PragmaKeyword &&
+                previousToken2.Kind() == SyntaxKind.HashToken;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WhenKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WhenKeywordRecommender.cs
new file mode 100644
index 0000000000..bccfe04c80
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WhenKeywordRecommender.cs
@@ -0,0 +1,21 @@
+//// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+//
+//using System.Threading;
+//using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+//using Microsoft.CodeAnalysis.CSharp;
+//
+//namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+//{
+//    internal class WhenKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+//    {
+//        public WhenKeywordRecommender()
+//			: base(SyntaxKind.WhenKeyword, isValidInPreprocessorContext: true)
+//        {
+//        }
+//
+//        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+//        {
+//            return context.IsCatchFilterContext;
+//        }
+//    }
+//}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WhereKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WhereKeywordRecommender.cs
new file mode 100644
index 0000000000..e0ba199c16
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WhereKeywordRecommender.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class WhereKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public WhereKeywordRecommender()
+            : base(SyntaxKind.WhereKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return
+                IsQueryContext(context) ||
+                IsTypeParameterConstraintContext(context);
+        }
+
+        private bool IsTypeParameterConstraintContext(CSharpSyntaxContext context)
+        {
+            // cases:
+            //   class C<T> |
+            //   class C<T> : IFoo |
+            //   class C<T> where T : IFoo |
+            //   delegate void D<T> |
+            //   delegate void D<T> where T : IFoo |
+            //   void Foo<T>() |
+            //   void Foo<T>() where T : IFoo |
+
+            var token = context.TargetToken;
+
+            // class C<T> |
+
+            if (token.Kind() == SyntaxKind.GreaterThanToken)
+            {
+                var typeParameters = token.GetAncestor<TypeParameterListSyntax>();
+                if (typeParameters != null && token == typeParameters.GetLastToken(includeSkipped: true))
+                {
+                    var decl = typeParameters.GetAncestorOrThis<TypeDeclarationSyntax>();
+                    if (decl != null && decl.TypeParameterList == typeParameters)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            // delegate void D<T>() |
+            if (token.Kind() == SyntaxKind.CloseParenToken &&
+                token.Parent.IsKind(SyntaxKind.ParameterList) &&
+                token.Parent.IsParentKind(SyntaxKind.DelegateDeclaration))
+            {
+                var decl = token.GetAncestor<DelegateDeclarationSyntax>();
+                if (decl != null && decl.TypeParameterList != null)
+                {
+                    return true;
+                }
+            }
+
+            // void Foo<T>() |
+
+            if (token.Kind() == SyntaxKind.CloseParenToken &&
+                token.Parent.IsKind(SyntaxKind.ParameterList) &&
+                token.Parent.IsParentKind(SyntaxKind.MethodDeclaration))
+            {
+                var decl = token.GetAncestor<MethodDeclarationSyntax>();
+                if (decl != null && decl.Arity > 0)
+                {
+                    return true;
+                }
+            }
+
+            // class C<T> : IFoo |
+            var baseList = token.GetAncestor<BaseListSyntax>();
+            if (baseList.GetParent() is TypeDeclarationSyntax)
+            {
+                var typeDecl = baseList.GetParent() as TypeDeclarationSyntax;
+                if (typeDecl.TypeParameterList != null &&
+                    typeDecl.BaseList.Types.Any(t => token == t.GetLastToken(includeSkipped: true)))
+                {
+                    // token is IdentifierName "where"
+                    // only suggest "where" if token's previous token is also "where"
+                    if (token.Parent is IdentifierNameSyntax && token.HasMatchingText(SyntaxKind.WhereKeyword))
+                    {
+                        // Check for zero-width tokens in case there is a missing comma in the base list.
+                        // For example: class C<T> : Foo where where |
+                        return token
+                            .GetPreviousToken(includeZeroWidth: true)
+                            .IsKindOrHasMatchingText(SyntaxKind.WhereKeyword);
+                    }
+
+                    // System.|
+                    // Not done typing the qualified name
+                    if (token.IsKind(SyntaxKind.DotToken))
+                    {
+                        return false;
+                    }
+
+                    return true;
+                }
+            }
+
+            // class C<T> where T : IFoo |
+            // delegate void D<T> where T : IFoo |
+            var constraintClause = token.GetAncestor<TypeParameterConstraintClauseSyntax>();
+
+            if (constraintClause != null)
+            {
+                if (constraintClause.Constraints.Any(c => token == c.GetLastToken(includeSkipped: true)))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private static bool IsQueryContext(CSharpSyntaxContext context)
+        {
+            var token = context.TargetToken;
+
+            // var q = from x in y
+            //         |
+            if (!token.IntersectsWith(context.Position) &&
+                token.IsLastTokenOfQueryClause())
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WhileKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WhileKeywordRecommender.cs
new file mode 100644
index 0000000000..8185dc4a93
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/WhileKeywordRecommender.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class WhileKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public WhileKeywordRecommender()
+            : base(SyntaxKind.WhileKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            if (context.IsStatementContext ||
+                context.IsGlobalStatementContext)
+            {
+                return true;
+            }
+
+            // do {
+            // } |
+
+            // do {
+            // } w|
+
+            // Note: the case of
+            //   do 
+            //     Foo();
+            //   |
+            // is taken care of in the IsStatementContext case.
+
+            var token = context.TargetToken;
+
+            if (token.Kind() == SyntaxKind.CloseBraceToken &&
+                token.Parent.IsKind(SyntaxKind.Block) &&
+                token.Parent.IsParentKind(SyntaxKind.DoStatement))
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/YieldKeywordRecommender.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/YieldKeywordRecommender.cs
new file mode 100644
index 0000000000..cf875303bd
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Completion/KeywordRecommender/YieldKeywordRecommender.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion.KeywordRecommenders
+{
+    internal class YieldKeywordRecommender : AbstractSyntacticSingleKeywordRecommender
+    {
+        public YieldKeywordRecommender()
+            : base(SyntaxKind.YieldKeyword)
+        {
+        }
+
+        protected override bool IsValidContext(int position, CSharpSyntaxContext context, CancellationToken cancellationToken)
+        {
+            return context.IsStatementContext;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/AbstractEncapsulateFieldRefactoringProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/AbstractEncapsulateFieldRefactoringProvider.cs
new file mode 100644
index 0000000000..2d25415e66
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/AbstractEncapsulateFieldRefactoringProvider.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using ICSharpCode.NRefactory.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeRefactorings.EncapsulateField
+{
+	abstract class AbstractEncapsulateFieldRefactoringProvider : CodeRefactoringProvider
+	{
+		CSharpEncapsulateFieldService service = new CSharpEncapsulateFieldService ();
+
+		public sealed override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			var actions = await service.GetEncapsulateFieldCodeActionsAsync(context.Document, context.Span, context.CancellationToken).ConfigureAwait(false);
+
+			context.RegisterRefactorings(actions);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/AbstractEncapsulateFieldService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/AbstractEncapsulateFieldService.cs
new file mode 100644
index 0000000000..48dd1db1d3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/AbstractEncapsulateFieldService.cs
@@ -0,0 +1,426 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Rename;
+using Microsoft.CodeAnalysis.Rename.ConflictEngine;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using System.Globalization;
+using System.Reflection;
+using Microsoft.CodeAnalysis.Options;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeRefactorings.EncapsulateField
+{
+	internal abstract class AbstractEncapsulateFieldService : ILanguageService
+	{
+		static AbstractEncapsulateFieldService()
+		{
+			renameSymbolMethod = typeof (Renamer).GetMethod ("RenameSymbolAsync", BindingFlags.Static | BindingFlags.NonPublic, null, new Type [] { typeof(Solution), typeof(ISymbol), typeof(string), typeof(OptionSet), typeof(Func<Location, bool>), typeof(Func<IEnumerable<ISymbol>, bool?>), typeof(CancellationToken) }, null);
+			if (renameSymbolMethod == null)
+				throw new Exception ("Can't find RenameSymbolAsync method.");
+		}
+
+		public async Task<EncapsulateFieldResult> EncapsulateFieldAsync(Document document, TextSpan span, bool useDefaultBehavior, CancellationToken cancellationToken)
+		{
+			var fields = await GetFieldsAsync(document, span, cancellationToken).ConfigureAwait(false);
+			if (fields == null || !fields.Any())
+			{
+				return null;
+			}
+
+			return new EncapsulateFieldResult(c => EncapsulateFieldResultAsync(document, span, useDefaultBehavior, c));
+		}
+
+		public async Task<IEnumerable<EncapsulateFieldCodeAction>> GetEncapsulateFieldCodeActionsAsync(Document document, TextSpan span, CancellationToken cancellationToken)
+		{
+			var fields = (await GetFieldsAsync(document, span, cancellationToken).ConfigureAwait(false)).ToImmutableArrayOrEmpty();
+			if (fields.Length == 0)
+			{
+				return SpecializedCollections.EmptyEnumerable<EncapsulateFieldCodeAction>();
+			}
+
+			if (fields.Length == 1)
+			{
+				// there is only one field
+				return EncapsulateOneField(document, span, fields[0], index: 0);
+			}
+			else
+			{
+				// there are multiple fields.
+				var current = SpecializedCollections.EmptyEnumerable<EncapsulateFieldCodeAction>();
+
+				if (span.IsEmpty)
+				{
+					// if there is no selection, get action for each field + all of them.
+					for (var i = 0; i < fields.Length; i++)
+					{
+						current = current.Concat(EncapsulateOneField(document, span, fields[i], i));
+					}
+				}
+
+				return current.Concat(EncapsulateAllFields(document, span));
+			}
+		}
+
+		private IEnumerable<EncapsulateFieldCodeAction> EncapsulateAllFields(Document document, TextSpan span)
+		{
+			var action1Text = Resources.EncapsulateFieldsUsages;
+			var action2Text = Resources.EncapsulateFields;
+
+			return new[]
+			{
+				new EncapsulateFieldCodeAction(new EncapsulateFieldResult(c => EncapsulateFieldResultAsync(document, span, true, c)), action1Text),
+				new EncapsulateFieldCodeAction(new EncapsulateFieldResult(c => EncapsulateFieldResultAsync(document, span, false, c)), action2Text)
+			};
+		}
+
+		private IEnumerable<EncapsulateFieldCodeAction> EncapsulateOneField(Document document, TextSpan span, IFieldSymbol field, int index)
+		{
+			var action1Text = string.Format(Resources.EncapsulateFieldUsages, field.Name);
+			var action2Text = string.Format(Resources.EncapsulateField, field.Name);
+
+			return new[]
+			{
+				new EncapsulateFieldCodeAction(new EncapsulateFieldResult(c => SingleEncapsulateFieldResultAsync(document, span, index, true, c)), action1Text),
+				new EncapsulateFieldCodeAction(new EncapsulateFieldResult(c => SingleEncapsulateFieldResultAsync(document, span, index, false, c)), action2Text)
+			};
+		}
+
+		private async Task<Result> SingleEncapsulateFieldResultAsync(Document document, TextSpan span, int index, bool updateReferences, CancellationToken cancellationToken)
+		{
+			var fields = (await GetFieldsAsync(document, span, cancellationToken).ConfigureAwait(false)).ToImmutableArrayOrEmpty();
+			//Contract.Requires(fields.Length > index);
+
+			var field = fields[index];
+			var result = await EncapsulateFieldAsync(field, document, updateReferences, cancellationToken).ConfigureAwait(false);
+			if (result == null)
+			{
+				return new Result(document.Project.Solution, field);
+			}
+
+			return result;
+		}
+
+		private async Task<Result> EncapsulateFieldResultAsync(Document document, TextSpan span, bool updateReferences, CancellationToken cancellationToken)
+		{
+			// probably later we want to add field and reason why it failed.
+			var failedFieldSymbols = new List<IFieldSymbol>();
+
+			var fields = await GetFieldsAsync(document, span, cancellationToken).ConfigureAwait(false);
+			//Contract.Requires(fields.Any());
+
+			// For now, build up the multiple field case by encapsulating one at a time.
+			Result result = null;
+			foreach (var field in fields)
+			{
+				var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+				var compilation = semanticModel.Compilation;
+				var currentField = field.GetSymbolKey().Resolve(compilation, cancellationToken: cancellationToken).Symbol as IFieldSymbol;
+
+				// We couldn't resolve this field. skip it
+				if (currentField == null)
+				{
+					failedFieldSymbols.Add(field);
+					continue;
+				}
+
+				result = await EncapsulateFieldAsync(currentField, document, updateReferences, cancellationToken).ConfigureAwait(false);
+				if (result == null)
+				{
+					failedFieldSymbols.Add(field);
+					continue;
+				}
+
+				document = result.Solution.GetDocument(document.Id);
+			}
+
+			if (result == null)
+			{
+				return new Result(document.Project.Solution, fields.ToArray());
+			}
+
+			// add failed field symbol info
+			return result.WithFailedFields(failedFieldSymbols);
+		}
+
+		private async Task<Result> EncapsulateFieldAsync(IFieldSymbol field, Document document, bool updateReferences, CancellationToken cancellationToken)
+		{
+			var originalField = field;
+			var finalNames = GeneratePropertyAndFieldNames(field);
+			var finalFieldName = finalNames.Item1;
+			var generatedPropertyName = finalNames.Item2;
+
+			// Annotate the field declarations so we can find it after rename.
+			var fieldDeclaration = field.DeclaringSyntaxReferences.First();
+			var declarationAnnotation = new SyntaxAnnotation();
+			document = document.WithSyntaxRoot(fieldDeclaration.SyntaxTree.GetRoot(cancellationToken).ReplaceNode(fieldDeclaration.GetSyntax(cancellationToken),
+			                                                                                                      fieldDeclaration.GetSyntax(cancellationToken).WithAdditionalAnnotations(declarationAnnotation)));
+
+			var solution = document.Project.Solution;
+
+			foreach (var linkedDocumentId in document.GetLinkedDocumentIds())
+			{
+				var linkedDocument = solution.GetDocument(linkedDocumentId);
+				var linkedRoot = await linkedDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+				var linkedFieldNode = linkedRoot.FindNode(fieldDeclaration.Span);
+				if (linkedFieldNode.Span != fieldDeclaration.Span)
+				{
+					continue;
+				}
+
+				var updatedRoot = linkedRoot.ReplaceNode(linkedFieldNode, linkedFieldNode.WithAdditionalAnnotations(declarationAnnotation));
+				solution = solution.WithDocumentSyntaxRoot(linkedDocumentId, updatedRoot);
+			}
+
+			document = solution.GetDocument(document.Id);
+
+			// Resolve the annotated symbol and prepare for rename.
+
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var compilation = semanticModel.Compilation;
+			field = field.GetSymbolKey().Resolve(compilation, cancellationToken: cancellationToken).Symbol as IFieldSymbol;
+
+			var solutionNeedingProperty = solution;
+
+			// We couldn't resolve field after annotating its declaration. Bail
+			if (field == null)
+			{
+				return null;
+			}
+
+			solutionNeedingProperty = await UpdateReferencesAsync(
+				updateReferences, solution, document, field, finalFieldName, generatedPropertyName, cancellationToken).ConfigureAwait(false);
+			document = solutionNeedingProperty.GetDocument(document.Id);
+
+			var markFieldPrivate = field.DeclaredAccessibility != Accessibility.Private;
+			var rewrittenFieldDeclaration = await RewriteFieldNameAndAccessibility(finalFieldName, markFieldPrivate, document, declarationAnnotation, cancellationToken).ConfigureAwait(false);
+
+			document = await Formatter.FormatAsync(document.WithSyntaxRoot(rewrittenFieldDeclaration), Formatter.Annotation, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+			solution = document.Project.Solution;
+			foreach (var linkedDocumentId in document.GetLinkedDocumentIds())
+			{
+				var linkedDocument = solution.GetDocument(linkedDocumentId);
+				var updatedLinkedRoot = await RewriteFieldNameAndAccessibility(finalFieldName, markFieldPrivate, linkedDocument, declarationAnnotation, cancellationToken).ConfigureAwait(false);
+				var updatedLinkedDocument = await Formatter.FormatAsync(linkedDocument.WithSyntaxRoot(updatedLinkedRoot), Formatter.Annotation, cancellationToken: cancellationToken).ConfigureAwait(false);
+				solution = updatedLinkedDocument.Project.Solution;
+			}
+
+			document = solution.GetDocument(document.Id);
+
+			semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			compilation = semanticModel.Compilation;
+
+			var newRoot = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var newDeclaration = newRoot.GetAnnotatedNodes<SyntaxNode>(declarationAnnotation).First();
+			field = semanticModel.GetDeclaredSymbol(newDeclaration, cancellationToken) as IFieldSymbol;
+
+			var generatedProperty = GenerateProperty(generatedPropertyName, finalFieldName, originalField.DeclaredAccessibility, originalField, field.ContainingType, new SyntaxAnnotation(), document, cancellationToken);
+
+			var solutionWithProperty = await AddPropertyAsync(document, document.Project.Solution, field, generatedProperty, cancellationToken).ConfigureAwait(false);
+
+			return new Result(solutionWithProperty, originalField.ToDisplayString(), Glyph.FieldPublic);
+		}
+
+		static Task<Solution> RenameSymbolAsync (Solution solution, ISymbol symbol, string newName, OptionSet options, Func<Location, bool> filter, Func<IEnumerable<ISymbol>, bool?> hasConflict = null, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return (Task<Solution>)renameSymbolMethod.Invoke (null, new object [] { solution, symbol, newName, options, filter, hasConflict, cancellationToken });
+		}
+
+		private async Task<Solution> UpdateReferencesAsync(
+			bool updateReferences, Solution solution, Document document, IFieldSymbol field, string finalFieldName, string generatedPropertyName, CancellationToken cancellationToken)
+		{
+			if (!updateReferences)
+			{
+				return solution;
+			}
+
+			if (field.IsReadOnly)
+			{
+				// Inside the constructor we want to rename references the field to the final field name.
+				var constructorSyntaxes = GetConstructorNodes(field.ContainingType).ToSet();
+				if (finalFieldName != field.Name && constructorSyntaxes.Count > 0)
+				{
+					solution = await RenameSymbolAsync(solution, field, finalFieldName, solution.Workspace.Options,
+					                                           location => constructorSyntaxes.Any(c => c.Span.IntersectsWith(location.SourceSpan)), cancellationToken: cancellationToken).ConfigureAwait(false);
+					document = solution.GetDocument(document.Id);
+
+					var compilation = await document.Project.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
+
+					field = field.GetSymbolKey().Resolve(compilation, cancellationToken: cancellationToken).Symbol as IFieldSymbol;
+				}
+
+				// Outside the constructor we want to rename references to the field to final property name.
+				return await RenameSymbolAsync(solution, field, generatedPropertyName, solution.Workspace.Options,
+				                                       location => !constructorSyntaxes.Any(c => c.Span.IntersectsWith(location.SourceSpan)), cancellationToken: cancellationToken).ConfigureAwait(false);
+			}
+			else
+			{
+				// Just rename everything.
+				return await Renamer.RenameSymbolAsync(solution, field, generatedPropertyName, solution.Workspace.Options, cancellationToken).ConfigureAwait(false);
+			}
+		}
+
+		internal abstract IEnumerable<SyntaxNode> GetConstructorNodes(INamedTypeSymbol containingType);
+
+		protected async Task<Solution> AddPropertyAsync(Document document, Solution destinationSolution, IFieldSymbol field, IPropertySymbol property, CancellationToken cancellationToken)
+		{
+			var codeGenerationService = new CSharpCodeGenerationService (document.Project.Solution.Workspace);
+
+			var fieldDeclaration = field.DeclaringSyntaxReferences.First();
+			var options = new CodeGenerationOptions(contextLocation: fieldDeclaration.SyntaxTree.GetLocation(fieldDeclaration.Span));
+
+			var destination = field.ContainingType;
+			var updatedDocument = await codeGenerationService.AddPropertyAsync(destinationSolution, destination, property, options, cancellationToken)
+			                                                 .ConfigureAwait(false);
+
+			updatedDocument = await Formatter.FormatAsync(updatedDocument, Formatter.Annotation, cancellationToken: cancellationToken).ConfigureAwait(false);
+			updatedDocument = await Simplifier.ReduceAsync(updatedDocument, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+			return updatedDocument.Project.Solution;
+		}
+
+		protected IPropertySymbol GenerateProperty(string propertyName, string fieldName, Accessibility accessibility, IFieldSymbol field, INamedTypeSymbol containingSymbol, SyntaxAnnotation annotation, Document document, CancellationToken cancellationToken)
+		{
+			var factory = document.GetLanguageService<SyntaxGenerator>();
+
+			var propertySymbol = annotation.AddAnnotationToSymbol(CodeGenerationSymbolFactory.CreatePropertySymbol(containingType: containingSymbol,
+			                                                                                                       attributes: SpecializedCollections.EmptyList<AttributeData>(),
+			                                                                                                       accessibility: ComputeAccessibility(accessibility, field.Type),
+			                                                                                                       modifiers: new DeclarationModifiers().WithIsStatic (field.IsStatic).WithIsReadOnly (field.IsReadOnly).WithIsUnsafe (field.IsUnsafe()),
+			                                                                                                       type: field.Type,
+			                                                                                                       explicitInterfaceSymbol: null,
+			                                                                                                       name: propertyName,
+			                                                                                                       parameters: SpecializedCollections.EmptyList<IParameterSymbol>(),
+			                                                                                                       getMethod: CreateGet(fieldName, field, factory),
+			                                                                                                       setMethod: field.IsReadOnly || field.IsConst ? null : CreateSet(fieldName, field, factory)));
+
+			return Simplifier.Annotation.AddAnnotationToSymbol(
+				Formatter.Annotation.AddAnnotationToSymbol(propertySymbol));
+		}
+
+		protected abstract Tuple<string, string> GeneratePropertyAndFieldNames(IFieldSymbol field);
+
+		protected Accessibility ComputeAccessibility(Accessibility accessibility, ITypeSymbol type)
+		{
+			var computedAccessibility = accessibility;
+			if (accessibility == Accessibility.NotApplicable || accessibility == Accessibility.Private)
+			{
+				computedAccessibility = Accessibility.Public;
+			}
+
+			var returnTypeAccessibility = type.DetermineMinimalAccessibility();
+
+			return AccessibilityUtilities.Minimum(computedAccessibility, returnTypeAccessibility);
+		}
+
+		protected IMethodSymbol CreateSet(string originalFieldName, IFieldSymbol field, SyntaxGenerator factory)
+		{
+			var assigned = !field.IsStatic
+			                     ? factory.MemberAccessExpression(
+				                     factory.ThisExpression(),
+				                     factory.IdentifierName(originalFieldName))
+			                     : factory.IdentifierName(originalFieldName);
+
+			var body = factory.ExpressionStatement(
+				factory.AssignmentStatement(
+					assigned.WithAdditionalAnnotations(Simplifier.Annotation),
+					factory.IdentifierName("value")));
+
+			return CodeGenerationSymbolFactory.CreateAccessorSymbol(SpecializedCollections.EmptyList<AttributeData>(),
+			                                                        Accessibility.NotApplicable,
+			                                                        new[] { body }.ToList());
+		}
+
+		protected IMethodSymbol CreateGet(string originalFieldName, IFieldSymbol field, SyntaxGenerator factory)
+		{
+			var body = factory.ReturnStatement(
+				factory.IdentifierName(originalFieldName));
+
+			return CodeGenerationSymbolFactory.CreateAccessorSymbol(SpecializedCollections.EmptyList<AttributeData>(),
+			                                                        Accessibility.NotApplicable,
+			                                                        new[] { body }.ToList());
+		}
+
+		private static readonly char[] s_underscoreCharArray = new[] { '_' };
+
+		protected string GeneratePropertyName(string fieldName)
+		{
+			// Trim leading underscores
+			var baseName = fieldName.TrimStart(s_underscoreCharArray);
+
+			// Trim leading "m_"
+			if (baseName.Length >= 2 && baseName[0] == 'm' && baseName[1] == '_')
+			{
+				baseName = baseName.Substring(2);
+			}
+
+			// Take original name if no characters left
+			if (baseName.Length == 0)
+			{
+				baseName = fieldName;
+			}
+
+			// Make the first character upper case using the "en-US" culture.  See discussion at
+			// https://github.com/dotnet/roslyn/issues/5524.
+			var firstCharacter = EnUSCultureInfo.TextInfo.ToUpper(baseName[0]);
+			return firstCharacter.ToString() + baseName.Substring(1);
+		}
+
+		internal static readonly CultureInfo EnUSCultureInfo = new CultureInfo("en-US");
+		static MethodInfo renameSymbolMethod;
+
+		protected abstract Task<SyntaxNode> RewriteFieldNameAndAccessibility(string originalFieldName, bool makePrivate, Document document, SyntaxAnnotation declarationAnnotation, CancellationToken cancellationToken);
+		protected abstract Task<IEnumerable<IFieldSymbol>> GetFieldsAsync(Document document, TextSpan span, CancellationToken cancellationToken);
+
+		internal class Result
+		{
+			public Result(Solution solutionWithProperty, string name, Glyph glyph)
+			{
+				this.Solution = solutionWithProperty;
+				this.Name = name;
+				this.Glyph = glyph;
+			}
+
+			public Result(Solution solutionWithProperty, string name, Glyph glyph, List<IFieldSymbol> failedFieldSymbols) :
+			this(solutionWithProperty, name, glyph)
+			{
+				this.FailedFields = failedFieldSymbols.ToImmutableArrayOrEmpty();
+			}
+
+			public Result(Solution originalSolution, params IFieldSymbol[] fields) :
+			this(originalSolution, string.Empty, Glyph.Error)
+			{
+				this.FailedFields = fields.ToImmutableArrayOrEmpty();
+			}
+
+			public Solution Solution { get; }
+			public string Name { get; }
+			public Glyph Glyph { get; }
+			public ImmutableArray<IFieldSymbol> FailedFields { get; }
+
+			public Result WithFailedFields(List<IFieldSymbol> failedFieldSymbols)
+			{
+				if (failedFieldSymbols.Count == 0)
+				{
+					return this;
+				}
+
+				return new Result(Solution, Name, Glyph, failedFieldSymbols);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/CSharpEncapsulateFieldService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/CSharpEncapsulateFieldService.cs
new file mode 100644
index 0000000000..7d11fd3d2c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/CSharpEncapsulateFieldService.cs
@@ -0,0 +1,193 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeRefactorings.EncapsulateField
+{
+	internal class CSharpEncapsulateFieldService : AbstractEncapsulateFieldService
+	{
+		protected async override Task<SyntaxNode> RewriteFieldNameAndAccessibility(string originalFieldName, bool makePrivate, Document document, SyntaxAnnotation declarationAnnotation, CancellationToken cancellationToken)
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+			var declarator = root.GetAnnotatedNodes<VariableDeclaratorSyntax>(declarationAnnotation).FirstOrDefault();
+
+			// There may be no field to rewrite if this document is part of a set of linked files
+			// and the declaration is not conditionally compiled in this document's project.
+			if (declarator == null)
+			{
+				return root;
+			}
+
+			var tempAnnotation = new SyntaxAnnotation();
+			var newIdentifier = SyntaxFactory.Identifier(originalFieldName)
+			                                 .WithTrailingTrivia(declarator.Identifier.TrailingTrivia)
+			                                 .WithLeadingTrivia(declarator.Identifier.LeadingTrivia);
+
+			var updatedDeclarator = declarator.WithIdentifier(newIdentifier).WithAdditionalAnnotations(tempAnnotation);
+
+			root = root.ReplaceNode(declarator, updatedDeclarator);
+			document = document.WithSyntaxRoot(root);
+
+			var declaration = root.GetAnnotatedNodes<SyntaxNode>(tempAnnotation).First().Parent as VariableDeclarationSyntax;
+
+			if (declaration.Variables.Count == 1)
+			{
+				var fieldSyntax = declaration.Parent as FieldDeclarationSyntax;
+
+				var modifierKinds = new[] { SyntaxKind.PrivateKeyword, SyntaxKind.ProtectedKeyword, SyntaxKind.InternalKeyword, SyntaxKind.PublicKeyword };
+
+				if (makePrivate)
+				{
+					var modifiers = SpecializedCollections.SingletonEnumerable(SyntaxFactory.Token(SyntaxKind.PrivateKeyword))
+					                                      .Concat(fieldSyntax.Modifiers.Where(m => !modifierKinds.Contains(m.Kind())));
+
+					root = root.ReplaceNode(fieldSyntax, fieldSyntax.WithModifiers(
+						SyntaxFactory.TokenList(modifiers))
+					                        .WithAdditionalAnnotations(Formatter.Annotation)
+					                        .WithLeadingTrivia(fieldSyntax.GetLeadingTrivia())
+					                        .WithTrailingTrivia(fieldSyntax.GetTrailingTrivia()));
+				}
+			}
+			else if (declaration.Variables.Count > 1 && makePrivate)
+			{
+				document = document.WithSyntaxRoot(root);
+				var codeGenService = new CSharpCodeGenerationService (document.Project.Solution.Workspace.Services.GetLanguageServices (LanguageNames.CSharp));
+				var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+				root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+				declarator = root.GetAnnotatedNodes<VariableDeclaratorSyntax>(tempAnnotation).First();
+				declaration = declarator.Parent as VariableDeclarationSyntax;
+
+				var field = semanticModel.GetDeclaredSymbol(declarator, cancellationToken) as IFieldSymbol;
+
+				var fieldToAdd = declarationAnnotation.AddAnnotationToSymbol(CodeGenerationSymbolFactory.CreateFieldSymbol(
+					field.GetAttributes(),
+					Accessibility.Private,
+					new DeclarationModifiers().WithIsStatic (field.IsStatic).WithIsReadOnly(field.IsReadOnly).WithIsConst(field.IsConst),
+					field.Type,
+					field.Name,
+					field.HasConstantValue,
+					field.ConstantValue,
+					declarator.Initializer));
+
+				var withField = await codeGenService.AddFieldAsync(document.Project.Solution, field.ContainingType, fieldToAdd, new CodeGenerationOptions(), cancellationToken).ConfigureAwait(false);
+				root = await withField.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+				declarator = root.GetAnnotatedNodes<VariableDeclaratorSyntax>(tempAnnotation).First();
+				declaration = declarator.Parent as VariableDeclarationSyntax;
+
+				return root.RemoveNode(declarator, SyntaxRemoveOptions.KeepNoTrivia);
+			}
+
+			return root;
+		}
+
+		protected override async Task<IEnumerable<IFieldSymbol>> GetFieldsAsync(Document document, TextSpan span, CancellationToken cancellationToken)
+		{
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+
+			var fields = root.DescendantNodes(d => d.Span.IntersectsWith(span))
+			                 .OfType<FieldDeclarationSyntax>()
+			                 .Where(n => n.Span.IntersectsWith(span));
+
+			var declarations = fields.Where(CanEncapsulate).Select(f => f.Declaration);
+
+			IEnumerable<VariableDeclaratorSyntax> declarators;
+			if (span.IsEmpty)
+			{
+				// no selection, get all variables
+				declarators = declarations.SelectMany(d => d.Variables);
+			}
+			else
+			{
+				// has selection, get only the ones that are included in the selection
+				declarators = declarations.SelectMany(d => d.Variables.Where(v => v.Span.IntersectsWith(span)));
+			}
+
+			return declarators.Select(d => semanticModel.GetDeclaredSymbol(d, cancellationToken) as IFieldSymbol)
+				              .WhereNotNull()
+				              .Where(f => f.Name.Length != 0);
+		}
+
+		private bool CanEncapsulate(FieldDeclarationSyntax field)
+		{
+			return field.Parent is TypeDeclarationSyntax;
+		}
+
+		protected override Tuple<string, string> GeneratePropertyAndFieldNames(IFieldSymbol field)
+		{
+			// Special case: if the field is "new", we will preserve its original name and the new keyword.
+			if (field.DeclaredAccessibility == Accessibility.Private || IsNew(field))
+			{
+				// Create some capitalized version of the field name for the property
+				return Tuple.Create(field.Name, MakeUnique(GeneratePropertyName(field.Name), field.ContainingType));
+			}
+			else
+			{
+				// Generate the new property name using the rules from 695042
+				var newPropertyName = GeneratePropertyName(field.Name);
+
+				if (newPropertyName == field.Name)
+				{
+					// If we wind up with the field's old name, give the field the unique version of its current name.
+					return Tuple.Create(MakeUnique(GenerateFieldName(field, field.Name), field.ContainingType), newPropertyName);
+				}
+
+				// Otherwise, ensure the property's name is unique.
+				newPropertyName = MakeUnique(newPropertyName, field.ContainingType);
+				var newFieldName = GenerateFieldName(field, newPropertyName);
+
+				// If converting the new property's name into a field name results in the old field name, we're done.
+				if (newFieldName == field.Name)
+				{
+					return Tuple.Create(newFieldName, newPropertyName);
+				}
+
+				// Otherwise, ensure the new field name is unique.
+				return Tuple.Create(MakeUnique(newFieldName, field.ContainingType), newPropertyName);
+			}
+		}
+
+		private bool IsNew(IFieldSymbol field)
+		{
+			return field.DeclaringSyntaxReferences.Any(d => d.GetSyntax().GetAncestor<FieldDeclarationSyntax>().Modifiers.Any(SyntaxKind.NewKeyword));
+		}
+
+		private string GenerateFieldName(IFieldSymbol field, string correspondingPropertyName)
+		{
+			return char.ToLower(correspondingPropertyName[0]).ToString() + correspondingPropertyName.Substring(1);
+		}
+
+		protected string MakeUnique(string baseName, INamedTypeSymbol containingType, bool considerBaseMembers = true)
+		{
+			var containingTypeMemberNames = containingType.GetAccessibleMembersInThisAndBaseTypes<ISymbol>(containingType).Select(m => m.Name);
+			return NameGenerator.GenerateUniqueName(baseName, containingTypeMemberNames.ToSet(), StringComparer.Ordinal);
+		}
+
+		internal override IEnumerable<SyntaxNode> GetConstructorNodes(INamedTypeSymbol containingType)
+		{
+			return containingType.Constructors.SelectMany(c => c.DeclaringSyntaxReferences.Select(d => d.GetSyntax()));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/EncapsulateFieldCodeAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/EncapsulateFieldCodeAction.cs
new file mode 100644
index 0000000000..84c0c5123e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/EncapsulateFieldCodeAction.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeRefactorings.EncapsulateField
+{
+	class EncapsulateFieldCodeAction : CodeAction
+	{
+		private EncapsulateFieldResult _result;
+		private string _title;
+
+		public EncapsulateFieldCodeAction(EncapsulateFieldResult result, string title)
+		{
+			_result = result;
+			_title = title;
+		}
+
+		public override string Title
+		{
+			get { return _title; }
+		}
+
+		protected override Task<Solution> GetChangedSolutionAsync(CancellationToken cancellationToken)
+		{
+			return _result.GetSolutionAsync(cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/EncapsulateFieldResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/EncapsulateFieldResult.cs
new file mode 100644
index 0000000000..dac9827496
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/EncapsulateField/EncapsulateFieldResult.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.CodeRefactorings.EncapsulateField
+{
+	class EncapsulateFieldResult
+	{
+		private readonly Func<CancellationToken, Task<AbstractEncapsulateFieldService.Result>> _resultGetter;
+
+		public EncapsulateFieldResult(Func<CancellationToken, Task<AbstractEncapsulateFieldService.Result>> resultGetter)
+		{
+			_resultGetter = resultGetter;
+		}
+
+		public async Task<string> GetNameAsync(CancellationToken cancellationToken)
+		{
+			var result = await _resultGetter(cancellationToken).ConfigureAwait(false);
+			return result.Name;
+		}
+
+		public async Task<Glyph> GetGlyphAsync(CancellationToken cancellationToken)
+		{
+			var result = await _resultGetter(cancellationToken).ConfigureAwait(false);
+			return result.Glyph;
+		}
+
+		public async Task<Solution> GetSolutionAsync(CancellationToken cancellationToken)
+		{
+			var result = await _resultGetter(cancellationToken).ConfigureAwait(false);
+			return result.Solution;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/AbstractExtractMethodService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/AbstractExtractMethodService.cs
new file mode 100644
index 0000000000..dafbe228da
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/AbstractExtractMethodService.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract class AbstractExtractMethodService<TValidator, TExtractor, TResult> : IExtractMethodService
+        where TValidator : SelectionValidator
+        where TExtractor : MethodExtractor
+        where TResult : SelectionResult
+    {
+        protected abstract TValidator CreateSelectionValidator(SemanticDocument document, TextSpan textSpan, OptionSet options);
+        protected abstract TExtractor CreateMethodExtractor(TResult selectionResult);
+
+        public async Task<ExtractMethodResult> ExtractMethodAsync(
+            Document document,
+            TextSpan textSpan,
+            OptionSet options,
+            CancellationToken cancellationToken)
+        {
+            options = options ?? document.Project.Solution.Workspace.Options;
+
+            var semanticDocument = await SemanticDocument.CreateAsync(document, cancellationToken).ConfigureAwait(false);
+
+            var validator = this.CreateSelectionValidator(semanticDocument, textSpan, options);
+
+            var selectionResult = await validator.GetValidSelectionAsync(cancellationToken).ConfigureAwait(false);
+            if (!selectionResult.ContainsValidContext)
+            {
+                return new FailedExtractMethodResult(selectionResult.Status);
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // extract method
+            var extractor = this.CreateMethodExtractor((TResult)selectionResult);
+
+            return await extractor.ExtractMethodAsync(cancellationToken).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/AbstractSyntaxTriviaService.Result.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/AbstractSyntaxTriviaService.Result.cs
new file mode 100644
index 0000000000..e15e7edff1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/AbstractSyntaxTriviaService.Result.cs
@@ -0,0 +1,296 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class AbstractSyntaxTriviaService
+    {
+        private class Result : ITriviaSavedResult
+        {
+            private static readonly AnnotationResolver s_defaultAnnotationResolver = ResolveAnnotation;
+            private static readonly TriviaResolver s_defaultTriviaResolver = ResolveTrivia;
+
+            private readonly SyntaxNode _root;
+            private readonly int _endOfLineKind;
+
+            private readonly Dictionary<TriviaLocation, SyntaxAnnotation> _annotations;
+            private readonly Dictionary<TriviaLocation, IEnumerable<SyntaxTrivia>> _triviaList;
+
+            public Result(
+                SyntaxNode root,
+                int endOfLineKind,
+                Dictionary<TriviaLocation, SyntaxAnnotation> annotations,
+                Dictionary<TriviaLocation, IEnumerable<SyntaxTrivia>> triviaList)
+            {
+                //Contract.ThrowIfNull(root);
+                //Contract.ThrowIfNull(annotations);
+                //Contract.ThrowIfNull(triviaList);
+
+                _root = root;
+                _endOfLineKind = endOfLineKind;
+
+                _annotations = annotations;
+                _triviaList = triviaList;
+            }
+
+            public SyntaxNode Root
+            {
+                get { return _root; }
+            }
+
+            public SyntaxNode RestoreTrivia(
+                SyntaxNode root,
+                AnnotationResolver annotationResolver = null,
+                TriviaResolver triviaResolver = null)
+            {
+                var tokens = RecoverTokensAtEdges(root, annotationResolver);
+                var map = CreateOldToNewTokensMap(tokens, triviaResolver);
+
+                return root.ReplaceTokens(map.Keys, (o, n) => map[o]);
+            }
+
+            private Dictionary<SyntaxToken, SyntaxToken> CreateOldToNewTokensMap(
+                Dictionary<TriviaLocation, PreviousNextTokenPair> tokenPairs,
+                Dictionary<TriviaLocation, LeadingTrailingTriviaPair> triviaPairs)
+            {
+                var map = new Dictionary<SyntaxToken, SyntaxToken>();
+                foreach (var pair in CreateUniqueTokenTriviaPairs(tokenPairs, triviaPairs))
+                {
+                    var localCopy = pair;
+                    var previousToken = map.GetOrAdd(localCopy.Item1.PreviousToken, _ => localCopy.Item1.PreviousToken);
+                    map[localCopy.Item1.PreviousToken] = previousToken.WithTrailingTrivia(localCopy.Item2.TrailingTrivia);
+
+                    var nextToken = map.GetOrAdd(localCopy.Item1.NextToken, _ => localCopy.Item1.NextToken);
+                    map[localCopy.Item1.NextToken] = nextToken.WithLeadingTrivia(localCopy.Item2.LeadingTrivia);
+                }
+
+                return map;
+            }
+
+            private LeadingTrailingTriviaPair GetTrailingAndLeadingTrivia(TriviaLocation locationKind, PreviousNextTokenPair tokenPair, IEnumerable<SyntaxTrivia> trivia)
+            {
+                var list = trivia.ToList();
+
+                // there are some noisy trivia
+                var index = GetFirstEndOfLineIndex(list);
+
+                return new LeadingTrailingTriviaPair
+                {
+                    TrailingTrivia = CreateTriviaListFromTo(list, 0, index),
+                    LeadingTrivia = CreateTriviaListFromTo(list, index + 1, list.Count - 1)
+                };
+            }
+
+            private int GetFirstEndOfLineIndex(List<SyntaxTrivia> list)
+            {
+                for (int i = 0; i < list.Count; i++)
+                {
+                    if (list[i].RawKind == _endOfLineKind)
+                    {
+                        return i;
+                    }
+                }
+
+                return list.Count - 1;
+            }
+
+            private Dictionary<TriviaLocation, SyntaxToken> RecoverTokensAtEdges(
+                SyntaxNode root,
+                AnnotationResolver annotationResolver)
+            {
+                var resolver = annotationResolver ?? s_defaultAnnotationResolver;
+
+                var tokens = Enumerable.Range((int)TriviaLocation.BeforeBeginningOfSpan, TriviaLocationsCount)
+                                       .Cast<TriviaLocation>()
+                                       .ToDictionary(
+                                            location => location,
+                                            location => resolver(root, location, _annotations[location]));
+
+                // check variable assumption. ordering of two pairs can't be changed
+                //Contract.ThrowIfFalse(
+                //    (tokens[TriviaLocation.BeforeBeginningOfSpan].RawKind == 0 && tokens[TriviaLocation.AfterEndOfSpan].RawKind == 0) ||
+                //    (tokens[TriviaLocation.BeforeBeginningOfSpan].RawKind == 0 /* && don't care */) ||
+                //    (/* don't care && */ tokens[TriviaLocation.AfterEndOfSpan].RawKind == 0) ||
+                //    (tokens[TriviaLocation.BeforeBeginningOfSpan].Span.End <= tokens[TriviaLocation.AfterEndOfSpan].SpanStart));
+
+                //Contract.ThrowIfFalse(
+                //    (tokens[TriviaLocation.AfterBeginningOfSpan].RawKind == 0 && tokens[TriviaLocation.BeforeEndOfSpan].RawKind == 0) ||
+                //    (tokens[TriviaLocation.AfterBeginningOfSpan].RawKind == 0 /* && don't care */) ||
+                //    (/* don't care && */ tokens[TriviaLocation.BeforeEndOfSpan].RawKind == 0) ||
+                //    (tokens[TriviaLocation.AfterBeginningOfSpan] == tokens[TriviaLocation.BeforeEndOfSpan]) ||
+                //    (tokens[TriviaLocation.AfterBeginningOfSpan].GetPreviousToken(includeZeroWidth: true) == tokens[TriviaLocation.BeforeEndOfSpan]) ||
+                //    (tokens[TriviaLocation.AfterBeginningOfSpan].Span.End <= tokens[TriviaLocation.BeforeEndOfSpan].SpanStart));
+
+                return tokens;
+            }
+
+            private Dictionary<SyntaxToken, SyntaxToken> CreateOldToNewTokensMap(
+                Dictionary<TriviaLocation, SyntaxToken> tokens,
+                TriviaResolver triviaResolver)
+            {
+                var tokenPairs = CreatePreviousNextTokenPairs(tokens);
+                var tokenToLeadingTrailingTriviaMap = CreateTokenLeadingTrailingTriviaMap(tokens);
+
+                var resolver = triviaResolver ?? s_defaultTriviaResolver;
+
+                var triviaPairs = Enumerable.Range((int)TriviaLocation.BeforeBeginningOfSpan, TriviaLocationsCount)
+                                            .Cast<TriviaLocation>()
+                                            .ToDictionary(
+                                                location => location,
+                                                location => CreateTriviaPairs(
+                                                                location,
+                                                                tokenPairs[location],
+                                                                resolver(location, tokenPairs[location], tokenToLeadingTrailingTriviaMap)));
+
+                return CreateOldToNewTokensMap(tokenPairs, triviaPairs);
+            }
+
+            private LeadingTrailingTriviaPair CreateTriviaPairs(
+                TriviaLocation locationKind,
+                PreviousNextTokenPair tokenPair,
+                IEnumerable<SyntaxTrivia> trivia)
+            {
+                // beginning of the tree
+                if (tokenPair.PreviousToken.RawKind == 0)
+                {
+                    return new LeadingTrailingTriviaPair { TrailingTrivia = SpecializedCollections.EmptyEnumerable<SyntaxTrivia>(), LeadingTrivia = trivia };
+                }
+
+                return GetTrailingAndLeadingTrivia(locationKind, tokenPair, trivia);
+            }
+
+            private IEnumerable<Tuple<PreviousNextTokenPair, LeadingTrailingTriviaPair>> CreateUniqueTokenTriviaPairs(
+                Dictionary<TriviaLocation, PreviousNextTokenPair> tokenPairs,
+                Dictionary<TriviaLocation, LeadingTrailingTriviaPair> triviaPairs)
+            {
+                // if there are dup, duplicated one will be ignored.
+                var set = new HashSet<PreviousNextTokenPair>();
+                for (int i = (int)TriviaLocation.BeforeBeginningOfSpan; i <= (int)TriviaLocation.AfterEndOfSpan; i++)
+                {
+                    var location = (TriviaLocation)i;
+                    var key = tokenPairs[location];
+                    if (set.Contains(key))
+                    {
+                        continue;
+                    }
+
+                    yield return Tuple.Create(key, triviaPairs[location]);
+                    set.Add(key);
+                }
+            }
+
+            private Dictionary<SyntaxToken, LeadingTrailingTriviaPair> CreateTokenLeadingTrailingTriviaMap(
+                Dictionary<TriviaLocation, SyntaxToken> tokens)
+            {
+                var tuple = default(LeadingTrailingTriviaPair);
+                var map = new Dictionary<SyntaxToken, LeadingTrailingTriviaPair>();
+
+                tuple = map.GetOrAdd(tokens[TriviaLocation.BeforeBeginningOfSpan], _ => default(LeadingTrailingTriviaPair));
+                map[tokens[TriviaLocation.BeforeBeginningOfSpan]] = new LeadingTrailingTriviaPair
+                {
+                    LeadingTrivia = tuple.LeadingTrivia,
+                    TrailingTrivia = _triviaList[TriviaLocation.BeforeBeginningOfSpan]
+                };
+
+                tuple = map.GetOrAdd(tokens[TriviaLocation.AfterBeginningOfSpan], _ => default(LeadingTrailingTriviaPair));
+                map[tokens[TriviaLocation.AfterBeginningOfSpan]] = new LeadingTrailingTriviaPair
+                {
+                    LeadingTrivia = _triviaList[TriviaLocation.AfterBeginningOfSpan],
+                    TrailingTrivia = tuple.TrailingTrivia
+                };
+
+                tuple = map.GetOrAdd(tokens[TriviaLocation.BeforeEndOfSpan], _ => default(LeadingTrailingTriviaPair));
+                map[tokens[TriviaLocation.BeforeEndOfSpan]] = new LeadingTrailingTriviaPair
+                {
+                    LeadingTrivia = tuple.LeadingTrivia,
+                    TrailingTrivia = _triviaList[TriviaLocation.BeforeEndOfSpan]
+                };
+
+                tuple = map.GetOrAdd(tokens[TriviaLocation.AfterEndOfSpan], _ => default(LeadingTrailingTriviaPair));
+                map[tokens[TriviaLocation.AfterEndOfSpan]] = new LeadingTrailingTriviaPair
+                {
+                    LeadingTrivia = _triviaList[TriviaLocation.AfterEndOfSpan],
+                    TrailingTrivia = tuple.TrailingTrivia
+                };
+
+                return map;
+            }
+
+            private Dictionary<TriviaLocation, PreviousNextTokenPair> CreatePreviousNextTokenPairs(
+                Dictionary<TriviaLocation, SyntaxToken> tokens)
+            {
+                var tokenPairs = new Dictionary<TriviaLocation, PreviousNextTokenPair>();
+
+                tokenPairs[TriviaLocation.BeforeBeginningOfSpan] = new PreviousNextTokenPair
+                {
+                    PreviousToken = tokens[TriviaLocation.BeforeBeginningOfSpan],
+                    NextToken = tokens[TriviaLocation.BeforeBeginningOfSpan].GetNextToken(includeZeroWidth: true)
+                };
+
+                tokenPairs[TriviaLocation.AfterBeginningOfSpan] = new PreviousNextTokenPair
+                {
+                    PreviousToken = tokens[TriviaLocation.AfterBeginningOfSpan].GetPreviousToken(includeZeroWidth: true),
+                    NextToken = tokens[TriviaLocation.AfterBeginningOfSpan]
+                };
+
+                tokenPairs[TriviaLocation.BeforeEndOfSpan] = new PreviousNextTokenPair
+                {
+                    PreviousToken = tokens[TriviaLocation.BeforeEndOfSpan],
+                    NextToken = tokens[TriviaLocation.BeforeEndOfSpan].GetNextToken(includeZeroWidth: true)
+                };
+
+                tokenPairs[TriviaLocation.AfterEndOfSpan] = new PreviousNextTokenPair
+                {
+                    PreviousToken = tokens[TriviaLocation.AfterEndOfSpan].GetPreviousToken(includeZeroWidth: true),
+                    NextToken = tokens[TriviaLocation.AfterEndOfSpan]
+                };
+
+                return tokenPairs;
+            }
+
+            private IEnumerable<SyntaxTrivia> CreateTriviaListFromTo(
+                List<SyntaxTrivia> list,
+                int startIndex,
+                int endIndex)
+            {
+                if (startIndex > endIndex)
+                {
+                    yield break;
+                }
+
+                for (int i = startIndex; i <= endIndex; i++)
+                {
+                    yield return list[i];
+                }
+            }
+
+            private static SyntaxToken ResolveAnnotation(
+                SyntaxNode root,
+                TriviaLocation location,
+                SyntaxAnnotation annotation)
+            {
+                return root.GetAnnotatedNodesAndTokens(annotation).FirstOrDefault().AsToken();
+            }
+
+            private static IEnumerable<SyntaxTrivia> ResolveTrivia(
+                TriviaLocation location,
+                PreviousNextTokenPair tokenPair,
+                Dictionary<SyntaxToken, LeadingTrailingTriviaPair> triviaMap)
+            {
+                var previousTriviaPair = triviaMap.ContainsKey(tokenPair.PreviousToken) ? triviaMap[tokenPair.PreviousToken] : default(LeadingTrailingTriviaPair);
+                var nextTriviaPair = triviaMap.ContainsKey(tokenPair.NextToken) ? triviaMap[tokenPair.NextToken] : default(LeadingTrailingTriviaPair);
+
+                var trailingTrivia = previousTriviaPair.TrailingTrivia ?? SpecializedCollections.EmptyEnumerable<SyntaxTrivia>();
+                var leadingTrivia = nextTriviaPair.LeadingTrivia ?? SpecializedCollections.EmptyEnumerable<SyntaxTrivia>();
+
+                return tokenPair.PreviousToken.TrailingTrivia.Concat(trailingTrivia).Concat(leadingTrivia).Concat(tokenPair.NextToken.LeadingTrivia);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/AbstractSyntaxTriviaService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/AbstractSyntaxTriviaService.cs
new file mode 100644
index 0000000000..451ed6c336
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/AbstractSyntaxTriviaService.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class AbstractSyntaxTriviaService : ISyntaxTriviaService
+    {
+        private const int TriviaLocationsCount = 4;
+
+        //private readonly ISyntaxFactsService _syntaxFactsService;
+        private readonly int _endOfLineKind;
+
+        protected AbstractSyntaxTriviaService(/*ISyntaxFactsService syntaxFactsService, */int endOfLineKind)
+        {
+//            _syntaxFactsService = syntaxFactsService;
+            _endOfLineKind = endOfLineKind;
+        }
+
+        public ITriviaSavedResult SaveTriviaAroundSelection(SyntaxNode root, TextSpan textSpan)
+        {
+            var tokens = GetTokensAtEdges(root, textSpan);
+
+            // span must contain after and before spans at the both edges
+
+            var triviaList = GetTriviaAtEdges(tokens, textSpan);
+
+            var annotations = Enumerable.Range((int)TriviaLocation.BeforeBeginningOfSpan, TriviaLocationsCount)
+                                        .Cast<TriviaLocation>()
+                                        .ToDictionary(location => location, _ => new SyntaxAnnotation());
+
+            var map = CreateOldToNewTokensMap(tokens, annotations);
+            var rootWithAnnotation = ReplaceTokens(root, map.Keys, (o, n) => map[o]);
+
+            return CreateResult(rootWithAnnotation, annotations, triviaList);
+        }
+
+        private SyntaxNode ReplaceTokens(
+            SyntaxNode root,
+            IEnumerable<SyntaxToken> oldTokens,
+            Func<SyntaxToken, SyntaxToken, SyntaxToken> computeReplacementToken)
+        {
+            return root.ReplaceTokens(oldTokens, (o, n) => computeReplacementToken(o, n));
+        }
+
+        private ITriviaSavedResult CreateResult(
+            SyntaxNode root,
+            Dictionary<TriviaLocation, SyntaxAnnotation> annotations,
+            Dictionary<TriviaLocation, IEnumerable<SyntaxTrivia>> triviaList)
+        {
+            return new Result(root, _endOfLineKind, annotations, triviaList);
+        }
+
+        private Dictionary<SyntaxToken, SyntaxToken> CreateOldToNewTokensMap(
+            Dictionary<TriviaLocation, SyntaxToken> tokens,
+            Dictionary<TriviaLocation, SyntaxAnnotation> annotations)
+        {
+            var token = default(SyntaxToken);
+            var map = new Dictionary<SyntaxToken, SyntaxToken>();
+			var emptyList = SpecializedCollections.EmptyEnumerable<SyntaxTrivia>();
+
+			token = map.GetOrAdd(tokens[TriviaLocation.BeforeBeginningOfSpan], _ => tokens[TriviaLocation.BeforeBeginningOfSpan]);
+            map[tokens[TriviaLocation.BeforeBeginningOfSpan]] = token.WithTrailingTrivia(emptyList).WithAdditionalAnnotations(annotations[TriviaLocation.BeforeBeginningOfSpan]);
+
+            token = map.GetOrAdd(tokens[TriviaLocation.AfterBeginningOfSpan], _ => tokens[TriviaLocation.AfterBeginningOfSpan]);
+            map[tokens[TriviaLocation.AfterBeginningOfSpan]] = token.WithLeadingTrivia(emptyList).WithAdditionalAnnotations(annotations[TriviaLocation.AfterBeginningOfSpan]);
+
+            token = map.GetOrAdd(tokens[TriviaLocation.BeforeEndOfSpan], _ => tokens[TriviaLocation.BeforeEndOfSpan]);
+            map[tokens[TriviaLocation.BeforeEndOfSpan]] = token.WithTrailingTrivia(emptyList).WithAdditionalAnnotations(annotations[TriviaLocation.BeforeEndOfSpan]);
+
+            token = map.GetOrAdd(tokens[TriviaLocation.AfterEndOfSpan], _ => tokens[TriviaLocation.AfterEndOfSpan]);
+            map[tokens[TriviaLocation.AfterEndOfSpan]] = token.WithLeadingTrivia(emptyList).WithAdditionalAnnotations(annotations[TriviaLocation.AfterEndOfSpan]);
+
+            return map;
+        }
+
+        private Dictionary<TriviaLocation, IEnumerable<SyntaxTrivia>> GetTriviaAtEdges(Dictionary<TriviaLocation, SyntaxToken> tokens, TextSpan textSpan)
+        {
+            var triviaAtBeginning = SplitTrivia(tokens[TriviaLocation.BeforeBeginningOfSpan], tokens[TriviaLocation.AfterBeginningOfSpan], t => t.FullSpan.End <= textSpan.Start);
+            var triviaAtEnd = SplitTrivia(tokens[TriviaLocation.BeforeEndOfSpan], tokens[TriviaLocation.AfterEndOfSpan], t => t.FullSpan.Start < textSpan.End);
+
+            var triviaList = new Dictionary<TriviaLocation, IEnumerable<SyntaxTrivia>>();
+            triviaList[TriviaLocation.BeforeBeginningOfSpan] = triviaAtBeginning.Item1;
+            triviaList[TriviaLocation.AfterBeginningOfSpan] = triviaAtBeginning.Item2;
+
+            triviaList[TriviaLocation.BeforeEndOfSpan] = triviaAtEnd.Item1;
+            triviaList[TriviaLocation.AfterEndOfSpan] = triviaAtEnd.Item2;
+            return triviaList;
+        }
+
+        private Dictionary<TriviaLocation, SyntaxToken> GetTokensAtEdges(SyntaxNode root, TextSpan textSpan)
+        {
+            var tokens = new Dictionary<TriviaLocation, SyntaxToken>();
+			tokens[TriviaLocation.AfterBeginningOfSpan] = root.FindTokenOnRightOfPosition(textSpan.Start, includeSkipped: false);
+            tokens[TriviaLocation.BeforeBeginningOfSpan] = tokens[TriviaLocation.AfterBeginningOfSpan].GetPreviousToken(includeZeroWidth: true);
+			tokens[TriviaLocation.BeforeEndOfSpan] = root.FindTokenOnLeftOfPosition(textSpan.End, includeSkipped: false);
+            tokens[TriviaLocation.AfterEndOfSpan] = tokens[TriviaLocation.BeforeEndOfSpan].GetNextToken(includeZeroWidth: true);
+            return tokens;
+        }
+
+        private static Tuple<List<SyntaxTrivia>, List<SyntaxTrivia>> SplitTrivia(
+                SyntaxToken token1,
+                SyntaxToken token2,
+                Func<SyntaxTrivia, bool> conditionToLeftAtCallSite)
+        {
+            var triviaLeftAtCallSite = new List<SyntaxTrivia>();
+            var triviaMovedToDefinition = new List<SyntaxTrivia>();
+
+            foreach (var trivia in token1.TrailingTrivia.Concat(token2.LeadingTrivia))
+            {
+                if (conditionToLeftAtCallSite(trivia))
+                {
+                    triviaLeftAtCallSite.Add(trivia);
+                }
+                else
+                {
+                    triviaMovedToDefinition.Add(trivia);
+                }
+            }
+
+            return Tuple.Create(triviaLeftAtCallSite, triviaMovedToDefinition);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpExtractMethodService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpExtractMethodService.cs
new file mode 100644
index 0000000000..128de150a4
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpExtractMethodService.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	class CSharpExtractMethodService : AbstractExtractMethodService<CSharpSelectionValidator, CSharpMethodExtractor, CSharpSelectionResult>
+    {
+        [ImportingConstructor]
+        public CSharpExtractMethodService()
+        {
+        }
+
+        protected override CSharpSelectionValidator CreateSelectionValidator(SemanticDocument document, TextSpan textSpan, OptionSet options)
+        {
+            return new CSharpSelectionValidator(document, textSpan, options);
+        }
+
+        protected override CSharpMethodExtractor CreateMethodExtractor(CSharpSelectionResult selectionResult)
+        {
+            return new CSharpMethodExtractor(selectionResult);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.Analyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.Analyzer.cs
new file mode 100644
index 0000000000..bb6774a2f2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.Analyzer.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor : MethodExtractor
+    {
+        private class CSharpAnalyzer : Analyzer
+        {
+            private static readonly HashSet<int> s_nonNoisySyntaxKindSet = new HashSet<int>(new int[] { (int)SyntaxKind.WhitespaceTrivia, (int)SyntaxKind.EndOfLineTrivia });
+
+            public static Task<AnalyzerResult> AnalyzeAsync(SelectionResult selectionResult, CancellationToken cancellationToken)
+            {
+                var analyzer = new CSharpAnalyzer(selectionResult, cancellationToken);
+                return analyzer.AnalyzeAsync();
+            }
+
+            public CSharpAnalyzer(SelectionResult selectionResult, CancellationToken cancellationToken) :
+                base(selectionResult, cancellationToken)
+            {
+            }
+
+            protected override VariableInfo CreateFromSymbol(
+                Compilation compilation,
+                ISymbol symbol,
+                ITypeSymbol type,
+                VariableStyle style,
+                bool variableDeclared)
+            {
+                return CreateFromSymbolCommon<LocalDeclarationStatementSyntax>(compilation, symbol, type, style, s_nonNoisySyntaxKindSet);
+            }
+
+            protected override int GetIndexOfVariableInfoToUseAsReturnValue(IList<VariableInfo> variableInfo)
+            {
+                var numberOfOutParameters = 0;
+                var numberOfRefParameters = 0;
+
+                int outSymbolIndex = -1;
+                int refSymbolIndex = -1;
+
+                for (int i = 0; i < variableInfo.Count; i++)
+                {
+                    var variable = variableInfo[i];
+
+                    // there should be no one set as return value yet
+                    //Contract.ThrowIfTrue(variable.UseAsReturnValue);
+
+                    if (!variable.CanBeUsedAsReturnValue)
+                    {
+                        continue;
+                    }
+
+                    // check modifier
+                    if (variable.ParameterModifier == ParameterBehavior.Ref)
+                    {
+                        numberOfRefParameters++;
+                        refSymbolIndex = i;
+                    }
+                    else if (variable.ParameterModifier == ParameterBehavior.Out)
+                    {
+                        numberOfOutParameters++;
+                        outSymbolIndex = i;
+                    }
+                }
+
+                // if there is only one "out" or "ref", that will be converted to return statement.
+                if (numberOfOutParameters == 1)
+                {
+                    return outSymbolIndex;
+                }
+
+                if (numberOfRefParameters == 1)
+                {
+                    return refSymbolIndex;
+                }
+
+                return -1;
+            }
+
+            protected override ITypeSymbol GetRangeVariableType(SemanticModel model, IRangeVariableSymbol symbol)
+            {
+                var info = model.GetSpeculativeTypeInfo(this.SelectionResult.FinalSpan.Start, SyntaxFactory.ParseName(symbol.Name), SpeculativeBindingOption.BindAsExpression);
+				if (info.Type.IsErrorType())
+                {
+                    return null;
+                }
+
+                return info.Type == null || info.Type.SpecialType == Microsoft.CodeAnalysis.SpecialType.System_Object
+                    ? info.Type
+                    : info.ConvertedType;
+            }
+
+            protected override Tuple<SyntaxNode, SyntaxNode> GetFlowAnalysisNodeRange()
+            {
+                var csharpSelectionResult = this.SelectionResult as CSharpSelectionResult;
+
+                var first = csharpSelectionResult.GetFirstStatement();
+                var last = csharpSelectionResult.GetLastStatement();
+
+                // single statement case
+                if (first == last ||
+                    first.Span.Contains(last.Span))
+                {
+                    return new Tuple<SyntaxNode, SyntaxNode>(first, first);
+                }
+
+                // multiple statement case
+                var firstUnderContainer = csharpSelectionResult.GetFirstStatementUnderContainer();
+                var lastUnderContainer = csharpSelectionResult.GetLastStatementUnderContainer();
+                return new Tuple<SyntaxNode, SyntaxNode>(firstUnderContainer, lastUnderContainer);
+            }
+
+            protected override bool ContainsReturnStatementInSelectedCode(IEnumerable<SyntaxNode> jumpOutOfRegionStatements)
+            {
+                return jumpOutOfRegionStatements.Where(n => n is ReturnStatementSyntax).Any();
+            }
+
+            protected override bool ReadOnlyFieldAllowed()
+            {
+                var scope = this.SelectionResult.GetContainingScopeOf<ConstructorDeclarationSyntax>();
+                return scope == null;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.CallSiteContainerRewriter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.CallSiteContainerRewriter.cs
new file mode 100644
index 0000000000..8231f1d2ad
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.CallSiteContainerRewriter.cs
@@ -0,0 +1,392 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor
+    {
+        private abstract partial class CSharpCodeGenerator
+        {
+            private class CallSiteContainerRewriter : CSharpSyntaxRewriter
+            {
+                private readonly SyntaxNode _outmostCallSiteContainer;
+                private readonly IEnumerable<SyntaxNode> _statementsOrFieldToInsert;
+                private readonly HashSet<SyntaxAnnotation> _variableToRemoveMap;
+                private readonly SyntaxNode _firstStatementOrFieldToReplace;
+                private readonly SyntaxNode _lastStatementOrFieldToReplace;
+
+                public CallSiteContainerRewriter(
+                    SyntaxNode outmostCallSiteContainer,
+                    HashSet<SyntaxAnnotation> variableToRemoveMap,
+                    SyntaxNode firstStatementOrFieldToReplace,
+                    SyntaxNode lastStatementOrFieldToReplace,
+                    IEnumerable<SyntaxNode> statementsOrFieldToInsert)
+                {
+//                    Contract.ThrowIfNull(outmostCallSiteContainer);
+//                    Contract.ThrowIfNull(variableToRemoveMap);
+//                    Contract.ThrowIfNull(firstStatementOrFieldToReplace);
+//                    Contract.ThrowIfNull(lastStatementOrFieldToReplace);
+//                    Contract.ThrowIfNull(statementsOrFieldToInsert);
+//                    Contract.ThrowIfTrue(statementsOrFieldToInsert.IsEmpty());
+
+                    _outmostCallSiteContainer = outmostCallSiteContainer;
+
+                    _variableToRemoveMap = variableToRemoveMap;
+                    _statementsOrFieldToInsert = statementsOrFieldToInsert;
+
+                    _firstStatementOrFieldToReplace = firstStatementOrFieldToReplace;
+                    _lastStatementOrFieldToReplace = lastStatementOrFieldToReplace;
+
+                    //Contract.ThrowIfFalse(_firstStatementOrFieldToReplace.Parent == _lastStatementOrFieldToReplace.Parent);
+                }
+
+                public SyntaxNode Generate()
+                {
+                    return Visit(_outmostCallSiteContainer);
+                }
+
+                private SyntaxNode ContainerOfStatementsOrFieldToReplace
+                {
+                    get { return _firstStatementOrFieldToReplace.Parent; }
+                }
+
+                public override SyntaxNode VisitLocalDeclarationStatement(LocalDeclarationStatementSyntax node)
+                {
+                    node = (LocalDeclarationStatementSyntax)base.VisitLocalDeclarationStatement(node);
+
+                    var list = new List<VariableDeclaratorSyntax>();
+                    var triviaList = new List<SyntaxTrivia>();
+
+                    // go through each var decls in decl statement
+                    foreach (var variable in node.Declaration.Variables)
+                    {
+                        if (_variableToRemoveMap.HasSyntaxAnnotation(variable))
+                        {
+                            // if it had initialization, it shouldn't reach here.
+                            //Contract.ThrowIfFalse(variable.Initializer == null);
+
+                            // we don't remove trivia around tokens we remove
+                            triviaList.AddRange(variable.GetLeadingTrivia());
+                            triviaList.AddRange(variable.GetTrailingTrivia());
+                            continue;
+                        }
+
+                        if (triviaList.Count > 0)
+                        {
+                            list.Add(variable.WithPrependedLeadingTrivia(triviaList));
+                            triviaList.Clear();
+                            continue;
+                        }
+
+                        list.Add(variable);
+                    }
+
+                    if (list.Count == 0)
+                    {
+                        // nothing has survived. remove this from the list
+                        if (triviaList.Count == 0)
+                        {
+                            return null;
+                        }
+
+                        // well, there are trivia associated with the node.
+                        // we can't just delete the node since then, we will lose
+                        // the trivia. unfortunately, it is not easy to attach the trivia
+                        // to next token. for now, create an empty statement and associate the
+                        // trivia to the statement
+
+                        // TODO : think about a way to move the trivia to next token.
+                        return SyntaxFactory.EmptyStatement(SyntaxFactory.Token(SyntaxFactory.TriviaList(triviaList), SyntaxKind.SemicolonToken, SyntaxTriviaList.Create(SyntaxFactory.ElasticMarker)));
+                    }
+
+                    if (list.Count == node.Declaration.Variables.Count)
+                    {
+                        // nothing has changed, return as it is
+                        return node;
+                    }
+
+                    // TODO : fix how it manipulate trivia later
+
+                    // if there is left over syntax trivia, it will be attached to leading trivia
+                    // of semicolon
+                    return
+                        SyntaxFactory.LocalDeclarationStatement(
+                            node.Modifiers,
+                                SyntaxFactory.VariableDeclaration(
+                                    node.Declaration.Type,
+                                    SyntaxFactory.SeparatedList(list)),
+                                    node.SemicolonToken.WithPrependedLeadingTrivia(triviaList));
+                }
+
+                // for every kind of extract methods
+                public override SyntaxNode VisitBlock(BlockSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        // make sure we visit nodes under the block
+                        return base.VisitBlock(node);
+                    }
+
+					return node.WithStatements(VisitList(ReplaceStatements(node.Statements)).ToSyntaxList());
+                }
+
+                public override SyntaxNode VisitSwitchSection(SwitchSectionSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        // make sure we visit nodes under the switch section
+                        return base.VisitSwitchSection(node);
+                    }
+
+                    return node.WithStatements(VisitList(ReplaceStatements(node.Statements)).ToSyntaxList());
+                }
+
+                // only for single statement or expression
+                public override SyntaxNode VisitLabeledStatement(LabeledStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitLabeledStatement(node);
+                    }
+
+                    return node.WithStatement(ReplaceStatementIfNeeded(node.Statement));
+                }
+
+                public override SyntaxNode VisitElseClause(ElseClauseSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitElseClause(node);
+                    }
+
+                    return node.WithStatement(ReplaceStatementIfNeeded(node.Statement));
+                }
+
+                public override SyntaxNode VisitIfStatement(IfStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitIfStatement(node);
+                    }
+
+                    return node.WithCondition(VisitNode(node.Condition))
+                               .WithStatement(ReplaceStatementIfNeeded(node.Statement))
+                               .WithElse(VisitNode(node.Else));
+                }
+
+                public override SyntaxNode VisitLockStatement(LockStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitLockStatement(node);
+                    }
+
+                    return node.WithExpression(VisitNode(node.Expression))
+                               .WithStatement(ReplaceStatementIfNeeded(node.Statement));
+                }
+
+                public override SyntaxNode VisitFixedStatement(FixedStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitFixedStatement(node);
+                    }
+
+                    return node.WithDeclaration(VisitNode(node.Declaration))
+                               .WithStatement(ReplaceStatementIfNeeded(node.Statement));
+                }
+
+                public override SyntaxNode VisitUsingStatement(UsingStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitUsingStatement(node);
+                    }
+
+                    return node.WithDeclaration(VisitNode(node.Declaration))
+                               .WithExpression(VisitNode(node.Expression))
+                               .WithStatement(ReplaceStatementIfNeeded(node.Statement));
+                }
+
+                public override SyntaxNode VisitForEachStatement(ForEachStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitForEachStatement(node);
+                    }
+
+                    return node.WithExpression(VisitNode(node.Expression))
+                               .WithStatement(ReplaceStatementIfNeeded(node.Statement));
+                }
+
+                public override SyntaxNode VisitForStatement(ForStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitForStatement(node);
+                    }
+
+                    return node.WithDeclaration(VisitNode(node.Declaration))
+                               .WithInitializers(VisitList(node.Initializers))
+                               .WithCondition(VisitNode(node.Condition))
+                               .WithIncrementors(VisitList(node.Incrementors))
+                               .WithStatement(ReplaceStatementIfNeeded(node.Statement));
+                }
+
+                public override SyntaxNode VisitDoStatement(DoStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitDoStatement(node);
+                    }
+
+                    return node.WithStatement(ReplaceStatementIfNeeded(node.Statement))
+                               .WithCondition(VisitNode(node.Condition));
+                }
+
+                public override SyntaxNode VisitWhileStatement(WhileStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitWhileStatement(node);
+                    }
+
+                    return node.WithCondition(VisitNode(node.Condition))
+                               .WithStatement(ReplaceStatementIfNeeded(node.Statement));
+                }
+
+                private TNode VisitNode<TNode>(TNode node) where TNode : SyntaxNode
+                {
+                    return (TNode)Visit(node);
+                }
+
+                private StatementSyntax ReplaceStatementIfNeeded(StatementSyntax statement)
+                {
+                    //Contract.ThrowIfNull(statement);
+
+                    // if all three same
+                    if ((statement != _firstStatementOrFieldToReplace) || (_firstStatementOrFieldToReplace != _lastStatementOrFieldToReplace))
+                    {
+                        return statement;
+                    }
+
+                    // replace one statement with another
+                    if (_statementsOrFieldToInsert.Count() == 1)
+                    {
+                        return _statementsOrFieldToInsert.Cast<StatementSyntax>().Single();
+                    }
+
+                    // replace one statement with multiple statements (see bug # 6310)
+                    return SyntaxFactory.Block(SyntaxFactory.List(_statementsOrFieldToInsert.Cast<StatementSyntax>()));
+                }
+
+                private SyntaxList<StatementSyntax> ReplaceStatements(SyntaxList<StatementSyntax> statements)
+                {
+                    // okay, this visit contains the statement
+                    var newStatements = new List<StatementSyntax>(statements);
+
+                    var firstStatementIndex = newStatements.FindIndex(s => s == _firstStatementOrFieldToReplace);
+                    //Contract.ThrowIfFalse(firstStatementIndex >= 0);
+
+                    var lastStatementIndex = newStatements.FindIndex(s => s == _lastStatementOrFieldToReplace);
+                    //Contract.ThrowIfFalse(lastStatementIndex >= 0);
+
+                    //Contract.ThrowIfFalse(firstStatementIndex <= lastStatementIndex);
+
+                    // remove statement that must be removed
+                    newStatements.RemoveRange(firstStatementIndex, lastStatementIndex - firstStatementIndex + 1);
+
+                    // add new statements to replace
+                    newStatements.InsertRange(firstStatementIndex, _statementsOrFieldToInsert.Cast<StatementSyntax>());
+
+                    return newStatements.ToSyntaxList();
+                }
+
+                private SyntaxList<MemberDeclarationSyntax> ReplaceMembers(SyntaxList<MemberDeclarationSyntax> members, bool global)
+                {
+                    // okay, this visit contains the statement
+                    var newMembers = new List<MemberDeclarationSyntax>(members);
+
+                    var firstMemberIndex = newMembers.FindIndex(s => s == (global ? _firstStatementOrFieldToReplace.Parent : _firstStatementOrFieldToReplace));
+                    //Contract.ThrowIfFalse(firstMemberIndex >= 0);
+
+                    var lastMemberIndex = newMembers.FindIndex(s => s == (global ? _lastStatementOrFieldToReplace.Parent : _lastStatementOrFieldToReplace));
+                    //Contract.ThrowIfFalse(lastMemberIndex >= 0);
+
+                    //Contract.ThrowIfFalse(firstMemberIndex <= lastMemberIndex);
+
+                    // remove statement that must be removed
+                    newMembers.RemoveRange(firstMemberIndex, lastMemberIndex - firstMemberIndex + 1);
+
+                    // add new statements to replace
+                    newMembers.InsertRange(firstMemberIndex,
+                        _statementsOrFieldToInsert.Select(s => global ? SyntaxFactory.GlobalStatement((StatementSyntax)s) : (MemberDeclarationSyntax)s));
+
+					return newMembers.ToSyntaxList();
+                }
+
+                public override SyntaxNode VisitGlobalStatement(GlobalStatementSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitGlobalStatement(node);
+                    }
+
+                    return node.WithStatement(ReplaceStatementIfNeeded(node.Statement));
+                }
+
+                public override SyntaxNode VisitConstructorDeclaration(ConstructorDeclarationSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitConstructorDeclaration(node);
+                    }
+
+                    //Contract.ThrowIfFalse(_firstStatementOrFieldToReplace == _lastStatementOrFieldToReplace);
+                    return node.WithInitializer((ConstructorInitializerSyntax)_statementsOrFieldToInsert.Single());
+                }
+
+                public override SyntaxNode VisitClassDeclaration(ClassDeclarationSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitClassDeclaration(node);
+                    }
+
+                    var newMembers = VisitList(ReplaceMembers(node.Members, global: false));
+                    return node.WithMembers(newMembers);
+                }
+
+                public override SyntaxNode VisitStructDeclaration(StructDeclarationSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace)
+                    {
+                        return base.VisitStructDeclaration(node);
+                    }
+
+                    var newMembers = VisitList(ReplaceMembers(node.Members, global: false));
+                    return node.WithMembers(newMembers);
+                }
+
+                public override SyntaxNode VisitCompilationUnit(CompilationUnitSyntax node)
+                {
+                    if (node != this.ContainerOfStatementsOrFieldToReplace.Parent)
+                    {
+                        // make sure we visit nodes under the block
+                        return base.VisitCompilationUnit(node);
+                    }
+
+                    var newMembers = VisitList(ReplaceMembers(node.Members, global: true));
+                    return node.WithMembers(newMembers);
+                }
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.ExpressionCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.ExpressionCodeGenerator.cs
new file mode 100644
index 0000000000..f9cb3772dc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.ExpressionCodeGenerator.cs
@@ -0,0 +1,242 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor
+    {
+        private partial class CSharpCodeGenerator
+        {
+            private class ExpressionCodeGenerator : CSharpCodeGenerator
+            {
+                public ExpressionCodeGenerator(
+                    InsertionPoint insertionPoint,
+                    SelectionResult selectionResult,
+                    AnalyzerResult analyzerResult) :
+                    base(insertionPoint, selectionResult, analyzerResult)
+                {
+                }
+
+                public static bool IsExtractMethodOnExpression(SelectionResult code)
+                {
+                    return code.SelectionInExpression;
+                }
+
+                protected override SyntaxToken CreateMethodName()
+                {
+                    var methodName = "NewMethod";
+                    var containingScope = this.CSharpSelectionResult.GetContainingScope();
+
+                    methodName = GetMethodNameBasedOnExpression(methodName, containingScope);
+
+                    var semanticModel = this.SemanticDocument.SemanticModel;
+                    var nameGenerator = new UniqueNameGenerator(semanticModel);
+                    return SyntaxFactory.Identifier(nameGenerator.CreateUniqueMethodName(containingScope, methodName));
+                }
+
+                private static string GetMethodNameBasedOnExpression(string methodName, SyntaxNode expression)
+                {
+                    if (expression.Parent != null &&
+                        expression.Parent.Kind() == SyntaxKind.EqualsValueClause &&
+                        expression.Parent.Parent != null &&
+                        expression.Parent.Parent.Kind() == SyntaxKind.VariableDeclarator)
+                    {
+                        var name = ((VariableDeclaratorSyntax)expression.Parent.Parent).Identifier.ValueText;
+                        return (name != null && name.Length > 0) ? MakeMethodName("Get", name) : methodName;
+                    }
+
+                    if (expression is MemberAccessExpressionSyntax)
+                    {
+                        expression = ((MemberAccessExpressionSyntax)expression).Name;
+                    }
+
+                    if (expression is NameSyntax)
+                    {
+                        SimpleNameSyntax unqualifiedName;
+
+                        switch (expression.Kind())
+                        {
+                            case SyntaxKind.IdentifierName:
+                            case SyntaxKind.GenericName:
+                                unqualifiedName = (SimpleNameSyntax)expression;
+                                break;
+                            case SyntaxKind.QualifiedName:
+                                unqualifiedName = ((QualifiedNameSyntax)expression).Right;
+                                break;
+                            case SyntaxKind.AliasQualifiedName:
+                                unqualifiedName = ((AliasQualifiedNameSyntax)expression).Name;
+                                break;
+                            default:
+                                throw new System.NotSupportedException("Unexpected name kind: " + expression.Kind().ToString());
+                        }
+
+                        var unqualifiedNameIdentifierValueText = unqualifiedName.Identifier.ValueText;
+                        return (unqualifiedNameIdentifierValueText != null && unqualifiedNameIdentifierValueText.Length > 0) ? MakeMethodName("Get", unqualifiedNameIdentifierValueText) : methodName;
+                    }
+
+                    return methodName;
+                }
+
+                protected override IEnumerable<StatementSyntax> GetInitialStatementsForMethodDefinitions()
+                {
+                    //Contract.ThrowIfFalse(IsExtractMethodOnExpression(this.CSharpSelectionResult));
+
+                    ExpressionSyntax expression = null;
+
+                    // special case for array initializer
+                    var returnType = (ITypeSymbol)this.AnalyzerResult.ReturnType;
+                    var containingScope = this.CSharpSelectionResult.GetContainingScope();
+
+                    if (returnType.TypeKind == TypeKind.Array && containingScope is InitializerExpressionSyntax)
+                    {
+                        var typeSyntax = returnType.GenerateTypeSyntax();
+
+                        expression = SyntaxFactory.ArrayCreationExpression(typeSyntax as ArrayTypeSyntax, containingScope as InitializerExpressionSyntax);
+                    }
+                    else
+                    {
+                        expression = containingScope as ExpressionSyntax;
+                    }
+
+                    if (this.AnalyzerResult.HasReturnType)
+                    {
+                        return SpecializedCollections.SingletonEnumerable<StatementSyntax>(
+                            SyntaxFactory.ReturnStatement(
+                                WrapInCheckedExpressionIfNeeded(expression)));
+                    }
+                    else
+                    {
+                        return SpecializedCollections.SingletonEnumerable<StatementSyntax>(
+                            SyntaxFactory.ExpressionStatement(
+                                WrapInCheckedExpressionIfNeeded(expression)));
+                    }
+                }
+
+                private ExpressionSyntax WrapInCheckedExpressionIfNeeded(ExpressionSyntax expression)
+                {
+                    var kind = this.CSharpSelectionResult.UnderCheckedExpressionContext();
+                    if (kind == SyntaxKind.None)
+                    {
+                        return expression;
+                    }
+
+                    return SyntaxFactory.CheckedExpression(kind, expression);
+                }
+
+                protected override SyntaxNode GetOutermostCallSiteContainerToProcess(CancellationToken cancellationToken)
+                {
+                    var callSiteContainer = GetCallSiteContainerFromOutermostMoveInVariable(cancellationToken);
+                    if (callSiteContainer != null)
+                    {
+                        return callSiteContainer;
+                    }
+                    else
+                    {
+                        return GetCallSiteContainerFromExpression();
+                    }
+                }
+
+                private SyntaxNode GetCallSiteContainerFromExpression()
+                {
+                    var container = this.CSharpSelectionResult.GetInnermostStatementContainer();
+
+//                    Contract.ThrowIfNull(container);
+//                    Contract.ThrowIfFalse(container.IsStatementContainerNode() ||
+//                                          container is TypeDeclarationSyntax ||
+//                                          container is ConstructorDeclarationSyntax ||
+//                                          container is CompilationUnitSyntax);
+
+                    return container;
+                }
+
+                protected override SyntaxNode GetFirstStatementOrInitializerSelectedAtCallSite()
+                {
+                    var scope = (SyntaxNode)this.CSharpSelectionResult.GetContainingScopeOf<StatementSyntax>();
+                    if (scope == null)
+                    {
+                        scope = this.CSharpSelectionResult.GetContainingScopeOf<FieldDeclarationSyntax>();
+                    }
+
+                    if (scope == null)
+                    {
+                        scope = this.CSharpSelectionResult.GetContainingScopeOf<ConstructorInitializerSyntax>();
+                    }
+
+                    return scope;
+                }
+
+                protected override SyntaxNode GetLastStatementOrInitializerSelectedAtCallSite()
+                {
+                    return GetFirstStatementOrInitializerSelectedAtCallSite();
+                }
+
+                protected override async Task<SyntaxNode> GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(
+                    SyntaxAnnotation callSiteAnnotation, CancellationToken cancellationToken)
+                {
+                    var enclosingStatement = GetFirstStatementOrInitializerSelectedAtCallSite();
+                    var callSignature = CreateCallSignature().WithAdditionalAnnotations(callSiteAnnotation);
+                    var invocation = callSignature.IsKind(SyntaxKind.AwaitExpression) ? ((AwaitExpressionSyntax)callSignature).Expression : callSignature;
+
+                    var sourceNode = this.CSharpSelectionResult.GetContainingScope();
+//                    Contract.ThrowIfTrue(
+//                        sourceNode.Parent is MemberAccessExpressionSyntax && ((MemberAccessExpressionSyntax)sourceNode.Parent).Name == sourceNode,
+//                        "invalid scope. given scope is not an expression");
+
+                    // To lower the chances that replacing sourceNode with callSignature will break the user's
+                    // code, we make the enclosing statement semantically explicit. This ends up being a little
+                    // bit more work because we need to annotate the sourceNode so that we can get back to it
+                    // after rewriting the enclosing statement.
+                    var updatedDocument = this.SemanticDocument.Document;
+                    var sourceNodeAnnotation = new SyntaxAnnotation();
+                    var enclosingStatementAnnotation = new SyntaxAnnotation();
+                    var newEnclosingStatement = enclosingStatement
+                        .ReplaceNode(sourceNode, sourceNode.WithAdditionalAnnotations(sourceNodeAnnotation))
+                        .WithAdditionalAnnotations(enclosingStatementAnnotation);
+
+					updatedDocument = await updatedDocument.ReplaceNodeAsync(enclosingStatement, newEnclosingStatement, cancellationToken).ConfigureAwait(false);
+
+                    var updatedRoot = await updatedDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+                    newEnclosingStatement = updatedRoot.GetAnnotatedNodesAndTokens(enclosingStatementAnnotation).Single().AsNode();
+
+                    // because of the complexifiction we cannot guarantee that there is only one annotation.
+                    // however complexification of names is prepended, so the last annotation should be the original one.
+                    sourceNode = updatedRoot.GetAnnotatedNodesAndTokens(sourceNodeAnnotation).Last().AsNode();
+
+                    // we want to replace the old identifier with a invocation expression, but because of MakeExplicit we might have
+                    // a member access now instead of the identifer. So more syntax fiddling is needed.
+                    if (sourceNode.Parent.Kind() == SyntaxKind.SimpleMemberAccessExpression &&
+                        ((ExpressionSyntax)sourceNode).IsRightSideOfDot())
+                    {
+                        var explicitMemberAccess = (MemberAccessExpressionSyntax)sourceNode.Parent;
+                        var replacementMemberAccess = explicitMemberAccess.CopyAnnotationsTo(
+                            SyntaxFactory.MemberAccessExpression(
+                                sourceNode.Parent.Kind(),
+                                explicitMemberAccess.Expression,
+                                (SimpleNameSyntax)((InvocationExpressionSyntax)invocation).Expression));
+                        var newInvocation = SyntaxFactory.InvocationExpression(
+                            replacementMemberAccess,
+                            ((InvocationExpressionSyntax)invocation).ArgumentList);
+
+                        var newCallSignature = callSignature != invocation ?
+                            callSignature.ReplaceNode(invocation, newInvocation) : invocation.CopyAnnotationsTo(newInvocation);
+
+                        sourceNode = sourceNode.Parent;
+                        callSignature = newCallSignature;
+                    }
+
+                    return newEnclosingStatement.ReplaceNode(sourceNode, callSignature);
+                }
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.MultipleStatementsCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.MultipleStatementsCodeGenerator.cs
new file mode 100644
index 0000000000..4da57f7be2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.MultipleStatementsCodeGenerator.cs
@@ -0,0 +1,139 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor
+    {
+        private partial class CSharpCodeGenerator
+        {
+            class MultipleStatementsCodeGenerator : CSharpCodeGenerator
+            {
+                public MultipleStatementsCodeGenerator(
+                    InsertionPoint insertionPoint,
+                    SelectionResult selectionResult,
+                    AnalyzerResult analyzerResult) :
+                    base(insertionPoint, selectionResult, analyzerResult)
+                {
+                }
+
+                public static bool IsExtractMethodOnMultipleStatements(SelectionResult code)
+                {
+                    var result = (CSharpSelectionResult)code;
+                    var first = result.GetFirstStatement();
+                    var last = result.GetLastStatement();
+
+                    if (first != last)
+                    {
+                        //var firstUnderContainer = result.GetFirstStatementUnderContainer();
+                        //var lastUnderContainer = result.GetLastStatementUnderContainer();
+                        //Contract.ThrowIfFalse(firstUnderContainer.Parent == lastUnderContainer.Parent);
+                        return true;
+                    }
+
+                    return false;
+                }
+
+                protected override SyntaxToken CreateMethodName()
+                {
+                    // change this to more smarter one.
+                    var semanticModel = this.SemanticDocument.SemanticModel;
+                    var nameGenerator = new UniqueNameGenerator(semanticModel);
+                    var scope = this.CSharpSelectionResult.GetContainingScope();
+                    return SyntaxFactory.Identifier(nameGenerator.CreateUniqueMethodName(scope, "NewMethod"));
+                }
+
+                protected override IEnumerable<StatementSyntax> GetInitialStatementsForMethodDefinitions()
+                {
+                    var firstSeen = false;
+                    var firstStatementUnderContainer = this.CSharpSelectionResult.GetFirstStatementUnderContainer();
+                    var lastStatementUnderContainer = this.CSharpSelectionResult.GetLastStatementUnderContainer();
+
+                    var list = new List<StatementSyntax>();
+                    foreach (var statement in GetStatementsFromContainer(firstStatementUnderContainer.Parent))
+                    {
+                        // reset first seen
+                        if (!firstSeen)
+                        {
+                            firstSeen = statement == firstStatementUnderContainer;
+                        }
+
+                        // continue until we see the first statement
+                        if (!firstSeen)
+                        {
+                            continue;
+                        }
+
+                        list.Add(statement);
+
+                        // exit if we see last statement
+                        if (statement == lastStatementUnderContainer)
+                        {
+                            break;
+                        }
+                    }
+
+                    return list;
+                }
+
+                protected override SyntaxNode GetOutermostCallSiteContainerToProcess(CancellationToken cancellationToken)
+                {
+                    var callSiteContainer = GetCallSiteContainerFromOutermostMoveInVariable(cancellationToken);
+                    if (callSiteContainer != null)
+                    {
+                        return callSiteContainer;
+                    }
+                    else
+                    {
+                        var firstStatement = this.CSharpSelectionResult.GetFirstStatementUnderContainer();
+                        return firstStatement.Parent;
+                    }
+                }
+
+                private SyntaxList<StatementSyntax> GetStatementsFromContainer(SyntaxNode node)
+                {
+//                    Contract.ThrowIfNull(node);
+//                    Contract.ThrowIfFalse(node.IsStatementContainerNode());
+
+                    var blockNode = node as BlockSyntax;
+                    if (blockNode != null)
+                    {
+                        return blockNode.Statements;
+                    }
+
+                    var switchSecionNode = node as SwitchSectionSyntax;
+                    if (switchSecionNode != null)
+                    {
+                        return switchSecionNode.Statements;
+                    }
+
+					return new SyntaxList<StatementSyntax> ();//Contract.FailWithReturn<SyntaxList<StatementSyntax>>("unknown statements container!");
+                }
+
+                protected override SyntaxNode GetFirstStatementOrInitializerSelectedAtCallSite()
+                {
+                    return this.CSharpSelectionResult.GetFirstStatementUnderContainer();
+                }
+
+                protected override SyntaxNode GetLastStatementOrInitializerSelectedAtCallSite()
+                {
+                    return this.CSharpSelectionResult.GetLastStatementUnderContainer();
+                }
+
+                protected override Task<SyntaxNode> GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(
+                    SyntaxAnnotation callSiteAnnotation, CancellationToken cancellationToken)
+                {
+                    var statement = GetStatementContainingInvocationToExtractedMethodWorker();
+                    return Task.FromResult<SyntaxNode>(statement.WithAdditionalAnnotations(callSiteAnnotation));
+                }
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.SingleStatementCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.SingleStatementCodeGenerator.cs
new file mode 100644
index 0000000000..1d42d4b3db
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.SingleStatementCodeGenerator.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor
+    {
+        private partial class CSharpCodeGenerator
+        {
+            class SingleStatementCodeGenerator : CSharpCodeGenerator
+            {
+                public SingleStatementCodeGenerator(
+                    InsertionPoint insertionPoint,
+                    SelectionResult selectionResult,
+                    AnalyzerResult analyzerResult) :
+                    base(insertionPoint, selectionResult, analyzerResult)
+                {
+                }
+
+                public static bool IsExtractMethodOnSingleStatement(SelectionResult code)
+                {
+                    var result = (CSharpSelectionResult)code;
+                    var firstStatement = result.GetFirstStatement();
+                    var lastStatement = result.GetLastStatement();
+
+                    return firstStatement == lastStatement || firstStatement.Span.Contains(lastStatement.Span);
+                }
+
+                protected override SyntaxToken CreateMethodName()
+                {
+                    // change this to more smarter one.
+                    var semanticModel = this.SemanticDocument.SemanticModel;
+                    var nameGenerator = new UniqueNameGenerator(semanticModel);
+                    var scope = this.CSharpSelectionResult.GetContainingScope();
+                    return SyntaxFactory.Identifier(nameGenerator.CreateUniqueMethodName(scope, "NewMethod"));
+                }
+
+                protected override IEnumerable<StatementSyntax> GetInitialStatementsForMethodDefinitions()
+                {
+                   // Contract.ThrowIfFalse(IsExtractMethodOnSingleStatement(this.CSharpSelectionResult));
+
+                    return SpecializedCollections.SingletonEnumerable<StatementSyntax>(this.CSharpSelectionResult.GetFirstStatement());
+                }
+
+                protected override SyntaxNode GetOutermostCallSiteContainerToProcess(CancellationToken cancellationToken)
+                {
+                    var callSiteContainer = GetCallSiteContainerFromOutermostMoveInVariable(cancellationToken);
+                    if (callSiteContainer != null)
+                    {
+                        return callSiteContainer;
+                    }
+                    else
+                    {
+                        var firstStatement = this.CSharpSelectionResult.GetFirstStatement();
+                        return firstStatement.Parent;
+                    }
+                }
+
+                protected override SyntaxNode GetFirstStatementOrInitializerSelectedAtCallSite()
+                {
+                    return this.CSharpSelectionResult.GetFirstStatement();
+                }
+
+                protected override SyntaxNode GetLastStatementOrInitializerSelectedAtCallSite()
+                {
+                    // it is a single statement case. either first statement is same as last statement or
+                    // last statement belongs (embedded statement) to the first statement.
+                    return this.CSharpSelectionResult.GetFirstStatement();
+                }
+
+                protected override Task<SyntaxNode> GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(
+                    SyntaxAnnotation callSiteAnnotation, CancellationToken cancellationToken)
+                {
+                    var statement = GetStatementContainingInvocationToExtractedMethodWorker();
+                    return Task.FromResult<SyntaxNode>(statement.WithAdditionalAnnotations(callSiteAnnotation));
+                }
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.cs
new file mode 100644
index 0000000000..6fbdfa5f52
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.CSharpCodeGenerator.cs
@@ -0,0 +1,583 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor
+    {
+        private abstract partial class CSharpCodeGenerator : CodeGenerator<StatementSyntax, ExpressionSyntax, SyntaxNode>
+        {
+            private SyntaxToken _methodName;
+
+            public static async Task<GeneratedCode> GenerateAsync(
+                InsertionPoint insertionPoint,
+                SelectionResult selectionResult,
+                AnalyzerResult analyzerResult,
+                CancellationToken cancellationToken)
+            {
+                var codeGenerator = Create(insertionPoint, selectionResult, analyzerResult);
+                return await codeGenerator.GenerateAsync(cancellationToken).ConfigureAwait(false);
+            }
+
+            private static CSharpCodeGenerator Create(
+                InsertionPoint insertionPoint,
+                SelectionResult selectionResult,
+                AnalyzerResult analyzerResult)
+            {
+                if (ExpressionCodeGenerator.IsExtractMethodOnExpression(selectionResult))
+                {
+                    return new ExpressionCodeGenerator(insertionPoint, selectionResult, analyzerResult);
+                }
+
+                if (SingleStatementCodeGenerator.IsExtractMethodOnSingleStatement(selectionResult))
+                {
+                    return new SingleStatementCodeGenerator(insertionPoint, selectionResult, analyzerResult);
+                }
+
+                if (MultipleStatementsCodeGenerator.IsExtractMethodOnMultipleStatements(selectionResult))
+                {
+                    return new MultipleStatementsCodeGenerator(insertionPoint, selectionResult, analyzerResult);
+                }
+
+				return null;//Contract.FailWithReturn<CSharpCodeGenerator>("Unknown selection");
+            }
+
+            protected CSharpCodeGenerator(
+                InsertionPoint insertionPoint,
+                SelectionResult selectionResult,
+                AnalyzerResult analyzerResult) :
+                base(insertionPoint, selectionResult, analyzerResult)
+            {
+                //Contract.ThrowIfFalse(this.SemanticDocument == selectionResult.SemanticDocument);
+
+                var nameToken = (SyntaxToken)CreateMethodName();
+                _methodName = nameToken.WithAdditionalAnnotations(this.MethodNameAnnotation);
+            }
+
+            private CSharpSelectionResult CSharpSelectionResult
+            {
+                get { return (CSharpSelectionResult)this.SelectionResult; }
+            }
+
+            protected override SyntaxNode GetPreviousMember(SemanticDocument document)
+            {
+                var node = this.InsertionPoint.With(document).GetContext();
+                return (node.Parent is GlobalStatementSyntax) ? node.Parent : node;
+            }
+
+            protected override OperationStatus<IMethodSymbol> GenerateMethodDefinition(CancellationToken cancellationToken)
+            {
+                var result = CreateMethodBody(cancellationToken);
+
+				var methodSymbol = CodeGenerationSymbolFactory.CreateMethodSymbol(
+                    attributes: SpecializedCollections.EmptyList<AttributeData>(),
+                    accessibility: Accessibility.Private,
+                    modifiers: CreateMethodModifiers(),
+                    returnType: this.AnalyzerResult.ReturnType,
+                    explicitInterfaceSymbol: null,
+                    name: _methodName.ToString(),
+                    typeParameters: CreateMethodTypeParameters(cancellationToken),
+                    parameters: CreateMethodParameters(),
+                    statements: result.Data);
+
+                return result.With(
+					this.MethodDefinitionAnnotation.AddAnnotationToSymbol(
+                        Formatter.Annotation.AddAnnotationToSymbol(methodSymbol)));
+            }
+
+            protected override async Task<SyntaxNode> GenerateBodyForCallSiteContainerAsync(CancellationToken cancellationToken)
+            {
+                var container = this.GetOutermostCallSiteContainerToProcess(cancellationToken);
+                var variableMapToRemove = CreateVariableDeclarationToRemoveMap(
+                    this.AnalyzerResult.GetVariablesToMoveIntoMethodDefinition(cancellationToken), cancellationToken);
+                var firstStatementToRemove = GetFirstStatementOrInitializerSelectedAtCallSite();
+                var lastStatementToRemove = GetLastStatementOrInitializerSelectedAtCallSite();
+
+                //Contract.ThrowIfFalse(firstStatementToRemove.Parent == lastStatementToRemove.Parent);
+
+                var statementsToInsert = await CreateStatementsOrInitializerToInsertAtCallSiteAsync(cancellationToken).ConfigureAwait(false);
+
+                var callSiteGenerator =
+                    new CallSiteContainerRewriter(
+                        container,
+                        variableMapToRemove,
+                        firstStatementToRemove,
+                        lastStatementToRemove,
+                        statementsToInsert);
+
+                return container.CopyAnnotationsTo(callSiteGenerator.Generate()).WithAdditionalAnnotations(Formatter.Annotation);
+            }
+
+            private async Task<IEnumerable<SyntaxNode>> CreateStatementsOrInitializerToInsertAtCallSiteAsync(CancellationToken cancellationToken)
+            {
+                var selectedNode = this.GetFirstStatementOrInitializerSelectedAtCallSite();
+
+                // field initializer and constructor initializer case
+                if (selectedNode is ConstructorInitializerSyntax ||
+                    selectedNode is FieldDeclarationSyntax)
+                {
+                    var statement = await GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(this.CallSiteAnnotation, cancellationToken).ConfigureAwait(false);
+                    return SpecializedCollections.SingletonEnumerable(statement);
+                }
+
+                // regular case
+                var semanticModel = this.SemanticDocument.SemanticModel;
+                var context = this.InsertionPoint.GetContext();
+                var postProcessor = new PostProcessor(semanticModel, context.SpanStart);
+                var statements = SpecializedCollections.EmptyEnumerable<StatementSyntax>();
+
+                statements = AddSplitOrMoveDeclarationOutStatementsToCallSite(statements, cancellationToken);
+                statements = postProcessor.MergeDeclarationStatements(statements);
+                statements = AddAssignmentStatementToCallSite(statements, cancellationToken);
+                statements = await AddInvocationAtCallSiteAsync(statements, cancellationToken).ConfigureAwait(false);
+                statements = AddReturnIfUnreachable(statements, cancellationToken);
+
+                return statements;
+            }
+
+            private SimpleNameSyntax CreateMethodNameForInvocation()
+            {
+                return this.AnalyzerResult.MethodTypeParametersInDeclaration.Count == 0
+                    ? (SimpleNameSyntax)SyntaxFactory.IdentifierName(_methodName)
+                    : SyntaxFactory.GenericName(_methodName, SyntaxFactory.TypeArgumentList(CreateMethodCallTypeVariables()));
+            }
+
+            private SeparatedSyntaxList<TypeSyntax> CreateMethodCallTypeVariables()
+            {
+                //Contract.ThrowIfTrue(this.AnalyzerResult.MethodTypeParametersInDeclaration.Count == 0);
+
+                // propagate any type variable used in extracted code
+                var typeVariables = new List<TypeSyntax>();
+                foreach (var methodTypeParameter in this.AnalyzerResult.MethodTypeParametersInDeclaration)
+                {
+                    typeVariables.Add(SyntaxFactory.ParseTypeName(methodTypeParameter.Name));
+                }
+
+                return SyntaxFactory.SeparatedList(typeVariables);
+            }
+
+            protected SyntaxNode GetCallSiteContainerFromOutermostMoveInVariable(CancellationToken cancellationToken)
+            {
+                var outmostVariable = GetOutermostVariableToMoveIntoMethodDefinition(cancellationToken);
+                if (outmostVariable == null)
+                {
+                    return null;
+                }
+
+                var idToken = outmostVariable.GetIdentifierTokenAtDeclaration(this.SemanticDocument);
+                var declStatement = idToken.GetAncestor<LocalDeclarationStatementSyntax>();
+//                Contract.ThrowIfNull(declStatement);
+//                Contract.ThrowIfFalse(declStatement.Parent.IsStatementContainerNode());
+
+                return declStatement.Parent;
+            }
+
+            private DeclarationModifiers CreateMethodModifiers()
+            {
+                var isUnsafe = this.CSharpSelectionResult.ShouldPutUnsafeModifier();
+                var isAsync = this.CSharpSelectionResult.ShouldPutAsyncModifier();
+				var result = DeclarationModifiers.None;
+				if (isUnsafe)
+					result = result.WithIsUnsafe (true);
+				if (isAsync)
+					result = result.WithAsync (true);
+				if (!this.AnalyzerResult.UseInstanceMember)
+					result = result.WithIsStatic (true);
+				return result;
+            }
+
+            private static SyntaxKind GetParameterRefSyntaxKind(ParameterBehavior parameterBehavior)
+            {
+                return parameterBehavior == ParameterBehavior.Ref ?
+                        SyntaxKind.RefKeyword :
+                            parameterBehavior == ParameterBehavior.Out ?
+                                SyntaxKind.OutKeyword : SyntaxKind.None;
+            }
+
+            private OperationStatus<List<SyntaxNode>> CreateMethodBody(CancellationToken cancellationToken)
+            {
+                var statements = GetInitialStatementsForMethodDefinitions();
+
+                statements = SplitOrMoveDeclarationIntoMethodDefinition(statements, cancellationToken);
+                statements = MoveDeclarationOutFromMethodDefinition(statements, cancellationToken);
+                statements = AppendReturnStatementIfNeeded(statements);
+                statements = CleanupCode(statements);
+
+                // set output so that we can use it in negative preview
+                var wrapped = WrapInCheckStatementIfNeeded(statements);
+                return CheckActiveStatements(statements).With(wrapped.ToList<SyntaxNode>());
+            }
+
+            private IEnumerable<StatementSyntax> WrapInCheckStatementIfNeeded(IEnumerable<StatementSyntax> statements)
+            {
+                var kind = this.CSharpSelectionResult.UnderCheckedStatementContext();
+                if (kind == SyntaxKind.None)
+                {
+                    return statements;
+                }
+
+                if (statements.Skip(1).Any())
+                {
+                    return SpecializedCollections.SingletonEnumerable<StatementSyntax>(SyntaxFactory.CheckedStatement(kind, SyntaxFactory.Block(statements)));
+                }
+
+                var block = statements.Single() as BlockSyntax;
+                if (block != null)
+                {
+                    return SpecializedCollections.SingletonEnumerable<StatementSyntax>(SyntaxFactory.CheckedStatement(kind, block));
+                }
+
+                return SpecializedCollections.SingletonEnumerable<StatementSyntax>(SyntaxFactory.CheckedStatement(kind, SyntaxFactory.Block(statements)));
+            }
+
+            private IEnumerable<StatementSyntax> CleanupCode(IEnumerable<StatementSyntax> statements)
+            {
+                var semanticModel = this.SemanticDocument.SemanticModel;
+                var context = this.InsertionPoint.GetContext();
+                var postProcessor = new PostProcessor(semanticModel, context.SpanStart);
+
+                statements = postProcessor.RemoveRedundantBlock(statements);
+                statements = postProcessor.RemoveDeclarationAssignmentPattern(statements);
+                statements = postProcessor.RemoveInitializedDeclarationAndReturnPattern(statements);
+
+                return statements;
+            }
+
+            private OperationStatus CheckActiveStatements(IEnumerable<StatementSyntax> statements)
+            {
+                var count = statements.Count();
+                if (count == 0)
+                {
+                    return OperationStatus.NoActiveStatement;
+                }
+
+                if (count == 1)
+                {
+                    var returnStatement = statements.Single() as ReturnStatementSyntax;
+                    if (returnStatement != null && returnStatement.Expression == null)
+                    {
+                        return OperationStatus.NoActiveStatement;
+                    }
+                }
+
+                foreach (var statement in statements)
+                {
+                    var declStatement = statement as LocalDeclarationStatementSyntax;
+                    if (declStatement == null)
+                    {
+                        // found one
+                        return OperationStatus.Succeeded;
+                    }
+
+                    foreach (var variable in declStatement.Declaration.Variables)
+                    {
+                        if (variable.Initializer != null)
+                        {
+                            // found one
+                            return OperationStatus.Succeeded;
+                        }
+                    }
+                }
+
+                return OperationStatus.NoActiveStatement;
+            }
+
+            private IEnumerable<StatementSyntax> MoveDeclarationOutFromMethodDefinition(
+                IEnumerable<StatementSyntax> statements, CancellationToken cancellationToken)
+            {
+                var variableToRemoveMap = CreateVariableDeclarationToRemoveMap(
+                    this.AnalyzerResult.GetVariablesToMoveOutToCallSiteOrDelete(cancellationToken), cancellationToken);
+
+                foreach (var statement in statements)
+                {
+                    var declarationStatement = statement as LocalDeclarationStatementSyntax;
+                    if (declarationStatement == null)
+                    {
+                        // if given statement is not decl statement, do nothing.
+                        yield return statement;
+                        continue;
+                    }
+
+                    var expressionStatements = new List<StatementSyntax>();
+                    var list = new List<VariableDeclaratorSyntax>();
+                    var triviaList = new List<SyntaxTrivia>();
+
+                    // When we modify the declaration to an initialization we have to preserve the leading trivia
+                    var firstVariableToAttachTrivia = true;
+
+                    // go through each var decls in decl statement, and create new assignment if
+                    // variable is initialized at decl.
+                    foreach (var variableDeclaration in declarationStatement.Declaration.Variables)
+                    {
+                        if (variableToRemoveMap.HasSyntaxAnnotation(variableDeclaration))
+                        {
+                            if (variableDeclaration.Initializer != null)
+                            {
+                                SyntaxToken identifier = ApplyTriviaFromDeclarationToAssignmentIdentifier(declarationStatement, firstVariableToAttachTrivia, variableDeclaration);
+
+                                // move comments with the variable here
+                                expressionStatements.Add(CreateAssignmentExpressionStatement(identifier, variableDeclaration.Initializer.Value));
+                            }
+                            else
+                            {
+                                // we don't remove trivia around tokens we remove
+                                triviaList.AddRange(variableDeclaration.GetLeadingTrivia());
+                                triviaList.AddRange(variableDeclaration.GetTrailingTrivia());
+                            }
+
+                            firstVariableToAttachTrivia = false;
+                            continue;
+                        }
+
+                        // Prepend the trivia from the declarations without initialization to the next persisting variable declaration
+                        if (triviaList.Count > 0)
+                        {
+                            list.Add(variableDeclaration.WithPrependedLeadingTrivia(triviaList));
+                            triviaList.Clear();
+                            firstVariableToAttachTrivia = false;
+                            continue;
+                        }
+
+                        firstVariableToAttachTrivia = false;
+                        list.Add(variableDeclaration);
+                    }
+
+                    if (list.Count == 0 && triviaList.Count > 0)
+                    {
+                        // well, there are trivia associated with the node.
+                        // we can't just delete the node since then, we will lose
+                        // the trivia. unfortunately, it is not easy to attach the trivia
+                        // to next token. for now, create an empty statement and associate the
+                        // trivia to the statement
+
+                        // TODO : think about a way to trivia attached to next token
+                        yield return SyntaxFactory.EmptyStatement(SyntaxFactory.Token(SyntaxFactory.TriviaList(triviaList), SyntaxKind.SemicolonToken, SyntaxTriviaList.Create(SyntaxFactory.ElasticMarker)));
+                        triviaList.Clear();
+                    }
+
+                    // return survived var decls
+                    if (list.Count > 0)
+                    {
+                        yield return
+                                SyntaxFactory.LocalDeclarationStatement(
+                                    declarationStatement.Modifiers,
+                                        SyntaxFactory.VariableDeclaration(
+                                            declarationStatement.Declaration.Type,
+                                            SyntaxFactory.SeparatedList(list)),
+                                            declarationStatement.SemicolonToken.WithPrependedLeadingTrivia(triviaList));
+                        triviaList.Clear();
+                    }
+
+                    // return any expression statement if there was any
+                    foreach (var expressionStatement in expressionStatements)
+                    {
+                        yield return expressionStatement;
+                    }
+                }
+            }
+
+            private static SyntaxToken ApplyTriviaFromDeclarationToAssignmentIdentifier(LocalDeclarationStatementSyntax declarationStatement, bool firstVariableToAttachTrivia, VariableDeclaratorSyntax variable)
+            {
+                var identifier = variable.Identifier;
+                var typeSyntax = declarationStatement.Declaration.Type;
+                if (firstVariableToAttachTrivia && typeSyntax != null)
+                {
+                    var identifierLeadingTrivia = new SyntaxTriviaList();
+
+                    if (typeSyntax.HasLeadingTrivia)
+                    {
+                        identifierLeadingTrivia = identifierLeadingTrivia.AddRange(typeSyntax.GetLeadingTrivia());
+                    }
+
+                    identifierLeadingTrivia = identifierLeadingTrivia.AddRange(identifier.LeadingTrivia);
+                    identifier = identifier.WithLeadingTrivia(identifierLeadingTrivia);
+                }
+
+                return identifier;
+            }
+
+            private static SyntaxToken GetIdentifierTokenAndTrivia(SyntaxToken identifier, TypeSyntax typeSyntax)
+            {
+                if (typeSyntax != null)
+                {
+                    var identifierLeadingTrivia = new SyntaxTriviaList();
+                    var identifierTrailingTrivia = new SyntaxTriviaList();
+                    if (typeSyntax.HasLeadingTrivia)
+                    {
+                        identifierLeadingTrivia = identifierLeadingTrivia.AddRange(typeSyntax.GetLeadingTrivia());
+                    }
+
+                    if (typeSyntax.HasTrailingTrivia)
+                    {
+                        identifierLeadingTrivia = identifierLeadingTrivia.AddRange(typeSyntax.GetTrailingTrivia());
+                    }
+
+                    identifierLeadingTrivia = identifierLeadingTrivia.AddRange(identifier.LeadingTrivia);
+                    identifierTrailingTrivia = identifierTrailingTrivia.AddRange(identifier.TrailingTrivia);
+                    identifier = identifier.WithLeadingTrivia(identifierLeadingTrivia)
+                                           .WithTrailingTrivia(identifierTrailingTrivia);
+                }
+
+                return identifier;
+            }
+
+            private IEnumerable<StatementSyntax> SplitOrMoveDeclarationIntoMethodDefinition(
+                IEnumerable<StatementSyntax> statements,
+                CancellationToken cancellationToken)
+            {
+                var semanticModel = this.SemanticDocument.SemanticModel;
+                var context = this.InsertionPoint.GetContext();
+                var postProcessor = new PostProcessor(semanticModel, context.SpanStart);
+
+                var declStatements = CreateDeclarationStatements(AnalyzerResult.GetVariablesToSplitOrMoveIntoMethodDefinition(cancellationToken), cancellationToken);
+                declStatements = postProcessor.MergeDeclarationStatements(declStatements);
+
+                return declStatements.Concat(statements);
+            }
+
+            private ExpressionSyntax CreateAssignmentExpression(SyntaxToken identifier, ExpressionSyntax rvalue)
+            {
+                return SyntaxFactory.AssignmentExpression(
+                    SyntaxKind.SimpleAssignmentExpression,
+                    SyntaxFactory.IdentifierName(identifier),
+                    rvalue);
+            }
+
+            protected override bool LastStatementOrHasReturnStatementInReturnableConstruct()
+            {
+                var lastStatement = this.GetLastStatementOrInitializerSelectedAtCallSite();
+                var container = lastStatement.GetAncestorsOrThis<SyntaxNode>().FirstOrDefault(n => n.IsReturnableConstruct());
+                if (container == null)
+                {
+                    // case such as field initializer
+                    return false;
+                }
+
+                var blockBody = container.GetBlockBody();
+                if (blockBody == null)
+                {
+                    // such as expression lambda. there is no statement
+                    return false;
+                }
+
+                // check whether it is last statement except return statement
+                var statements = blockBody.Statements;
+                if (statements.Last() == lastStatement)
+                {
+                    return true;
+                }
+
+                var index = statements.IndexOf((StatementSyntax)lastStatement);
+                return statements[index + 1].Kind() == SyntaxKind.ReturnStatement;
+            }
+
+            protected override SyntaxToken CreateIdentifier(string name)
+            {
+                return SyntaxFactory.Identifier(name);
+            }
+
+            protected override StatementSyntax CreateReturnStatement(string identifierName = null)
+            {
+                return string.IsNullOrEmpty(identifierName)
+                    ? SyntaxFactory.ReturnStatement()
+                    : SyntaxFactory.ReturnStatement(SyntaxFactory.IdentifierName(identifierName));
+            }
+
+            protected override ExpressionSyntax CreateCallSignature()
+            {
+                var methodName = CreateMethodNameForInvocation().WithAdditionalAnnotations(Simplifier.Annotation);
+
+                var arguments = new List<ArgumentSyntax>();
+                foreach (var argument in this.AnalyzerResult.MethodParameters)
+                {
+                    var modifier = GetParameterRefSyntaxKind(argument.ParameterModifier);
+                    var refOrOut = modifier == SyntaxKind.None ? default(SyntaxToken) : SyntaxFactory.Token(modifier);
+
+                    arguments.Add(SyntaxFactory.Argument(SyntaxFactory.IdentifierName(argument.Name)).WithRefOrOutKeyword(refOrOut));
+                }
+
+                var invocation = SyntaxFactory.InvocationExpression(methodName,
+                                    SyntaxFactory.ArgumentList(SyntaxFactory.SeparatedList(arguments)));
+
+                var shouldPutAsyncModifier = this.CSharpSelectionResult.ShouldPutAsyncModifier();
+                if (!shouldPutAsyncModifier)
+                {
+                    return invocation;
+                }
+
+                return SyntaxFactory.AwaitExpression(invocation);
+            }
+
+            protected override StatementSyntax CreateAssignmentExpressionStatement(SyntaxToken identifier, ExpressionSyntax rvalue)
+            {
+                return SyntaxFactory.ExpressionStatement(CreateAssignmentExpression((SyntaxToken)identifier, rvalue));
+            }
+
+            protected override StatementSyntax CreateDeclarationStatement(
+                VariableInfo variable,
+                CancellationToken cancellationToken,
+                ExpressionSyntax initialValue = null)
+            {
+                var type = variable.GetVariableType(this.SemanticDocument);
+                var typeNode = type.GenerateTypeSyntax();
+
+                var equalsValueClause = initialValue == null ? null : SyntaxFactory.EqualsValueClause(value: initialValue);
+
+                return SyntaxFactory.LocalDeclarationStatement(
+                    SyntaxFactory.VariableDeclaration(typeNode)
+                          .AddVariables(SyntaxFactory.VariableDeclarator(SyntaxFactory.Identifier(variable.Name)).WithInitializer(equalsValueClause)));
+            }
+
+            protected override async Task<GeneratedCode> CreateGeneratedCodeAsync(OperationStatus status, SemanticDocument newDocument, CancellationToken cancellationToken)
+            {
+                if (status.Succeeded())
+                {
+                    // in hybrid code cases such as extract method, formatter will have some difficulties on where it breaks lines in two.
+                    // here, we explicitly insert newline at the end of "{" of auto generated method decl so that anchor knows how to find out
+                    // indentation of inserted statements (from users code) with user code style preserved
+                    var root = newDocument.Root;
+                    var methodDefinition = root.GetAnnotatedNodes<MethodDeclarationSyntax>(this.MethodDefinitionAnnotation).First();
+
+                    var newMethodDefinition =
+                        methodDefinition.ReplaceToken(
+                            methodDefinition.Body.OpenBraceToken,
+                            methodDefinition.Body.OpenBraceToken.WithAppendedTrailingTrivia(
+                                SpecializedCollections.SingletonEnumerable(SyntaxFactory.CarriageReturnLineFeed)));
+
+                    newDocument = await newDocument.WithSyntaxRootAsync(root.ReplaceNode(methodDefinition, newMethodDefinition), cancellationToken).ConfigureAwait(false);
+                }
+
+                return await base.CreateGeneratedCodeAsync(status, newDocument, cancellationToken).ConfigureAwait(false);
+            }
+
+            protected StatementSyntax GetStatementContainingInvocationToExtractedMethodWorker()
+            {
+                var callSignature = CreateCallSignature();
+
+                if (this.AnalyzerResult.HasReturnType)
+                {
+                    //Contract.ThrowIfTrue(this.AnalyzerResult.HasVariableToUseAsReturnValue);
+                    return SyntaxFactory.ReturnStatement(callSignature);
+                }
+
+                return SyntaxFactory.ExpressionStatement(callSignature);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.FormattingProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.FormattingProvider.cs
new file mode 100644
index 0000000000..34cc3caa41
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.FormattingProvider.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.Formatting.Rules;
+using Microsoft.CodeAnalysis.Options;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor : MethodExtractor
+    {
+//        private class FormattingRule : AbstractFormattingRule
+//        {
+//            public FormattingRule()
+//            {
+//            }
+//
+//            public override AdjustNewLinesOperation GetAdjustNewLinesOperation(SyntaxToken previousToken, SyntaxToken currentToken, OptionSet optionSet, NextOperation<AdjustNewLinesOperation> nextOperation)
+//            {
+//                // for extract method case, for a hybrid case, don't force rule, but preserve user style
+//                var operation = base.GetAdjustNewLinesOperation(previousToken, currentToken, optionSet, nextOperation);
+//                if (operation == null)
+//                {
+//                    return null;
+//                }
+//
+//                if (operation.Option == AdjustNewLinesOption.ForceLinesIfOnSingleLine)
+//                {
+//                    return FormattingOperations.CreateAdjustNewLinesOperation(operation.Line, AdjustNewLinesOption.PreserveLines);
+//                }
+//
+//                if (operation.Option != AdjustNewLinesOption.ForceLines)
+//                {
+//                    return operation;
+//                }
+//
+//                if (previousToken.RawKind == (int)SyntaxKind.OpenBraceToken)
+//                {
+//                    return operation;
+//                }
+//
+//                if (previousToken.BetweenFieldAndNonFieldMember(currentToken))
+//                {
+//                    // make sure to have at least 2 line breaks between field and other members except field
+//                    return FormattingOperations.CreateAdjustNewLinesOperation(2, AdjustNewLinesOption.PreserveLines);
+//                }
+//
+//                if (previousToken.HasHybridTriviaBetween(currentToken))
+//                {
+//                    return FormattingOperations.CreateAdjustNewLinesOperation(operation.Line, AdjustNewLinesOption.PreserveLines);
+//                }
+//
+//                return operation;
+//            }
+//
+//            public override void AddAnchorIndentationOperations(List<AnchorIndentationOperation> list, SyntaxNode node, OptionSet optionSet, NextAction<AnchorIndentationOperation> nextOperation)
+//            {
+//                if (node.IsKind(SyntaxKind.SimpleLambdaExpression) || node.IsKind(SyntaxKind.ParenthesizedLambdaExpression) || node.IsKind(SyntaxKind.AnonymousMethodExpression))
+//                {
+//                    return;
+//                }
+//
+//                nextOperation.Invoke(list);
+//            }
+//        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.PostProcessor.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.PostProcessor.cs
new file mode 100644
index 0000000000..4c4a49d088
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.PostProcessor.cs
@@ -0,0 +1,314 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor
+    {
+        private class PostProcessor
+        {
+            private readonly SemanticModel _semanticModel;
+            private readonly int _contextPosition;
+
+            public PostProcessor(SemanticModel semanticModel, int contextPosition)
+            {
+                //Contract.ThrowIfNull(semanticModel);
+
+                _semanticModel = semanticModel;
+                _contextPosition = contextPosition;
+            }
+
+            public IEnumerable<StatementSyntax> RemoveRedundantBlock(IEnumerable<StatementSyntax> statements)
+            {
+                // it must have only one statement
+                if (statements.Count() != 1)
+                {
+                    return statements;
+                }
+
+                // that statement must be a block
+                var block = statements.Single() as BlockSyntax;
+                if (block == null)
+                {
+                    return statements;
+                }
+
+                // we have a block, remove them
+                return RemoveRedundantBlock(block);
+            }
+
+            private IEnumerable<StatementSyntax> RemoveRedundantBlock(BlockSyntax block)
+            {
+                // if block doesn't have any statement
+                if (block.Statements.Count == 0)
+                {
+                    // either remove the block if it doesn't have any trivia, or return as it is if
+                    // there are trivia attached to block
+                    return (block.OpenBraceToken.GetAllTrivia().IsEmpty() && block.CloseBraceToken.GetAllTrivia().IsEmpty()) ?
+                        SpecializedCollections.EmptyEnumerable<StatementSyntax>() : SpecializedCollections.SingletonEnumerable<StatementSyntax>(block);
+                }
+
+                // okay transfer asset attached to block to statements
+                var firstStatement = block.Statements.First();
+                var firstToken = firstStatement.GetFirstToken(includeZeroWidth: true);
+                var firstTokenWithAsset = block.OpenBraceToken.CopyAnnotationsTo(firstToken).WithPrependedLeadingTrivia(block.OpenBraceToken.GetAllTrivia());
+
+                var lastStatement = block.Statements.Last();
+                var lastToken = lastStatement.GetLastToken(includeZeroWidth: true);
+                var lastTokenWithAsset = block.CloseBraceToken.CopyAnnotationsTo(lastToken).WithAppendedTrailingTrivia(block.CloseBraceToken.GetAllTrivia());
+
+                // create new block with new tokens
+                block = block.ReplaceTokens(new[] { firstToken, lastToken }, (o, c) => (o == firstToken) ? firstTokenWithAsset : lastTokenWithAsset);
+
+                // return only statements without the wrapping block
+                return block.Statements;
+            }
+
+            public IEnumerable<StatementSyntax> MergeDeclarationStatements(IEnumerable<StatementSyntax> statements)
+            {
+                if (statements.FirstOrDefault() == null)
+                {
+                    return statements;
+                }
+
+                return MergeDeclarationStatementsWorker(statements);
+            }
+
+            private IEnumerable<StatementSyntax> MergeDeclarationStatementsWorker(IEnumerable<StatementSyntax> statements)
+            {
+                var map = new Dictionary<ITypeSymbol, List<LocalDeclarationStatementSyntax>>();
+                foreach (var statement in statements)
+                {
+                    if (!IsDeclarationMergable(statement))
+                    {
+                        foreach (var declStatement in GetMergedDeclarationStatements(map))
+                        {
+                            yield return declStatement;
+                        }
+
+                        yield return statement;
+                        continue;
+                    }
+
+                    AppendDeclarationStatementToMap(statement as LocalDeclarationStatementSyntax, map);
+                }
+
+                // merge leftover
+                if (map.Count <= 0)
+                {
+                    yield break;
+                }
+
+                foreach (var declStatement in GetMergedDeclarationStatements(map))
+                {
+                    yield return declStatement;
+                }
+            }
+
+            private void AppendDeclarationStatementToMap(
+                LocalDeclarationStatementSyntax statement,
+                Dictionary<ITypeSymbol, List<LocalDeclarationStatementSyntax>> map)
+            {
+                // Contract.ThrowIfNull(statement);
+
+                var type = _semanticModel.GetSpeculativeTypeInfo(_contextPosition, statement.Declaration.Type, SpeculativeBindingOption.BindAsTypeOrNamespace).Type;
+                //Contract.ThrowIfNull(type);
+
+                map.GetOrAdd(type, _ => new List<LocalDeclarationStatementSyntax>()).Add(statement);
+            }
+
+            private IEnumerable<LocalDeclarationStatementSyntax> GetMergedDeclarationStatements(
+                Dictionary<ITypeSymbol, List<LocalDeclarationStatementSyntax>> map)
+            {
+                foreach (var keyValuePair in map)
+                {
+                    //Contract.ThrowIfFalse(keyValuePair.Value.Count > 0);
+
+                    // merge all variable decl for current type
+                    var variables = new List<VariableDeclaratorSyntax>();
+                    foreach (var statement in keyValuePair.Value)
+                    {
+                        foreach (var variable in statement.Declaration.Variables)
+                        {
+                            variables.Add(variable);
+                        }
+                    }
+
+                    // and create one decl statement
+                    // use type name from the first decl statement
+                    yield return
+                        SyntaxFactory.LocalDeclarationStatement(
+                            SyntaxFactory.VariableDeclaration(keyValuePair.Value.First().Declaration.Type, SyntaxFactory.SeparatedList(variables)));
+                }
+
+                map.Clear();
+            }
+
+            private bool IsDeclarationMergable(StatementSyntax statement)
+            {
+                //Contract.ThrowIfNull(statement);
+
+                // to be mergable, statement must be
+                // 1. decl statement without any extra info
+                // 2. no initialization on any of its decls
+                // 3. no trivia except whitespace
+                // 4. type must be known
+
+                var declarationStatement = statement as LocalDeclarationStatementSyntax;
+                if (declarationStatement == null)
+                {
+                    return false;
+                }
+
+                if (declarationStatement.Modifiers.Count > 0 ||
+                    declarationStatement.IsConst ||
+                    declarationStatement.IsMissing)
+                {
+                    return false;
+                }
+
+                if (ContainsAnyInitialization(declarationStatement))
+                {
+                    return false;
+                }
+
+                if (!ContainsOnlyWhitespaceTrivia(declarationStatement))
+                {
+                    return false;
+                }
+
+                var semanticInfo = _semanticModel.GetSpeculativeTypeInfo(_contextPosition, declarationStatement.Declaration.Type, SpeculativeBindingOption.BindAsTypeOrNamespace).Type;
+                if (semanticInfo == null ||
+                    semanticInfo.TypeKind == TypeKind.Error ||
+                    semanticInfo.TypeKind == TypeKind.Unknown)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+
+            private bool ContainsAnyInitialization(LocalDeclarationStatementSyntax statement)
+            {
+                foreach (var variable in statement.Declaration.Variables)
+                {
+                    if (variable.Initializer != null)
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            private static bool ContainsOnlyWhitespaceTrivia(StatementSyntax statement)
+            {
+                foreach (var token in statement.DescendantTokens())
+                {
+                    foreach (var trivia in token.LeadingTrivia.Concat(token.TrailingTrivia))
+                    {
+                        if (trivia.Kind() != SyntaxKind.WhitespaceTrivia &&
+                            trivia.Kind() != SyntaxKind.EndOfLineTrivia)
+                        {
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+
+            public IEnumerable<StatementSyntax> RemoveInitializedDeclarationAndReturnPattern(IEnumerable<StatementSyntax> statements)
+            {
+                // if we have inline temp variable as service, we could just use that service here.
+                // since it is not a service right now, do very simple clean up
+                if (statements.ElementAtOrDefault(2) != null)
+                {
+                    return statements;
+                }
+
+                var declaration = statements.ElementAtOrDefault(0) as LocalDeclarationStatementSyntax;
+                var returnStatement = statements.ElementAtOrDefault(1) as ReturnStatementSyntax;
+                if (declaration == null || returnStatement == null)
+                {
+                    return statements;
+                }
+
+                if (declaration.Declaration == null ||
+                    declaration.Declaration.Variables.Count != 1 ||
+                    declaration.Declaration.Variables[0].Initializer == null ||
+                    declaration.Declaration.Variables[0].Initializer.Value == null ||
+                    declaration.Declaration.Variables[0].Initializer.Value is StackAllocArrayCreationExpressionSyntax ||
+                    returnStatement.Expression == null)
+                {
+                    return statements;
+                }
+
+                if (!ContainsOnlyWhitespaceTrivia(declaration) ||
+                    !ContainsOnlyWhitespaceTrivia(returnStatement))
+                {
+                    return statements;
+                }
+
+                var variableName = declaration.Declaration.Variables[0].Identifier.ToString();
+                if (returnStatement.Expression.ToString() != variableName)
+                {
+                    return statements;
+                }
+
+                return SpecializedCollections.SingletonEnumerable<StatementSyntax>(SyntaxFactory.ReturnStatement(declaration.Declaration.Variables[0].Initializer.Value));
+            }
+
+            public IEnumerable<StatementSyntax> RemoveDeclarationAssignmentPattern(IEnumerable<StatementSyntax> statements)
+            {
+                // if we have inline temp variable as service, we could just use that service here.
+                // since it is not a service right now, do very simple clean up
+                var declaration = statements.ElementAtOrDefault(0) as LocalDeclarationStatementSyntax;
+                var assignment = statements.ElementAtOrDefault(1) as ExpressionStatementSyntax;
+                if (declaration == null || assignment == null)
+                {
+                    return statements;
+                }
+
+                if (ContainsAnyInitialization(declaration) ||
+                    declaration.Declaration == null ||
+                    declaration.Declaration.Variables.Count != 1 ||
+                    assignment.Expression == null ||
+                    assignment.Expression.Kind() != SyntaxKind.SimpleAssignmentExpression)
+                {
+                    return statements;
+                }
+
+                if (!ContainsOnlyWhitespaceTrivia(declaration) ||
+                    !ContainsOnlyWhitespaceTrivia(assignment))
+                {
+                    return statements;
+                }
+
+                var variableName = declaration.Declaration.Variables[0].Identifier.ToString();
+
+                var assignmentExpression = assignment.Expression as AssignmentExpressionSyntax;
+                if (assignmentExpression.Left == null ||
+                    assignmentExpression.Right == null ||
+                    assignmentExpression.Left.ToString() != variableName)
+                {
+                    return statements;
+                }
+
+                var variable = declaration.Declaration.Variables[0].WithInitializer(SyntaxFactory.EqualsValueClause(assignmentExpression.Right));
+                return SpecializedCollections.SingletonEnumerable<StatementSyntax>(
+                    declaration.WithDeclaration(
+                        declaration.Declaration.WithVariables(
+                            SyntaxFactory.SingletonSeparatedList(variable)))).Concat(statements.Skip(2));
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.TriviaResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.TriviaResult.cs
new file mode 100644
index 0000000000..524acb5fb2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.TriviaResult.cs
@@ -0,0 +1,161 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor
+    {
+        private class CSharpTriviaResult : TriviaResult
+        {
+            public static async Task<CSharpTriviaResult> ProcessAsync(SelectionResult selectionResult, CancellationToken cancellationToken)
+            {
+				var preservationService = new CSharpSyntaxTriviaService ();
+                var root = selectionResult.SemanticDocument.Root;
+                var result = preservationService.SaveTriviaAroundSelection(root, selectionResult.FinalSpan);
+                return new CSharpTriviaResult(
+                    await selectionResult.SemanticDocument.WithSyntaxRootAsync(result.Root, cancellationToken).ConfigureAwait(false),
+                    result);
+            }
+
+            private CSharpTriviaResult(SemanticDocument document, ITriviaSavedResult result) :
+                base(document, result, (int)SyntaxKind.EndOfLineTrivia, (int)SyntaxKind.WhitespaceTrivia)
+            {
+            }
+
+            protected override AnnotationResolver GetAnnotationResolver(SyntaxNode callsite, SyntaxNode method)
+            {
+                var methodDefinition = method as MethodDeclarationSyntax;
+                if (callsite == null || methodDefinition == null)
+                {
+                    return null;
+                }
+
+                return (node, location, annotation) => AnnotationResolver(node, location, annotation, callsite, methodDefinition);
+            }
+
+            protected override TriviaResolver GetTriviaResolver(SyntaxNode method)
+            {
+                var methodDefinition = method as MethodDeclarationSyntax;
+                if (methodDefinition == null)
+                {
+                    return null;
+                }
+
+                return (location, tokenPair, triviaMap) => TriviaResolver(location, tokenPair, triviaMap, methodDefinition);
+            }
+
+            private SyntaxToken AnnotationResolver(
+                SyntaxNode node,
+                TriviaLocation location,
+                SyntaxAnnotation annotation,
+                SyntaxNode callsite,
+                MethodDeclarationSyntax method)
+            {
+                var token = node.GetAnnotatedNodesAndTokens(annotation).FirstOrDefault().AsToken();
+                if (token.RawKind != 0)
+                {
+                    return token;
+                }
+
+                switch (location)
+                {
+                    case TriviaLocation.BeforeBeginningOfSpan:
+                        return callsite.GetFirstToken(includeZeroWidth: true).GetPreviousToken(includeZeroWidth: true);
+                    case TriviaLocation.AfterEndOfSpan:
+                        return callsite.GetLastToken(includeZeroWidth: true).GetNextToken(includeZeroWidth: true);
+                    case TriviaLocation.AfterBeginningOfSpan:
+                        return method.Body.OpenBraceToken.GetNextToken(includeZeroWidth: true);
+                    case TriviaLocation.BeforeEndOfSpan:
+                        return method.Body.CloseBraceToken.GetPreviousToken(includeZeroWidth: true);
+                }
+
+				return token; //Contract.FailWithReturn<SyntaxToken>("can't happen");
+            }
+
+            private IEnumerable<SyntaxTrivia> TriviaResolver(
+                TriviaLocation location,
+                PreviousNextTokenPair tokenPair,
+                Dictionary<SyntaxToken, LeadingTrailingTriviaPair> triviaMap,
+                MethodDeclarationSyntax method)
+            {
+                // Resolve trivia at the edge of the selection. simple case is easy to deal with, but complex cases where
+                // elastic trivia and user trivia are mixed (hybrid case) and we want to preserve some part of user coding style
+                // but not others can be dealt with here.
+
+                // method has no statement in them. so basically two trivia list now pointing to same thing. "{" and "}"
+                if (tokenPair.PreviousToken == method.Body.OpenBraceToken &&
+                    tokenPair.NextToken == method.Body.CloseBraceToken)
+                {
+                    return (location == TriviaLocation.AfterBeginningOfSpan) ?
+                        SpecializedCollections.SingletonEnumerable<SyntaxTrivia>(SyntaxFactory.ElasticMarker) :
+                        SpecializedCollections.EmptyEnumerable<SyntaxTrivia>();
+                }
+
+                var previousTriviaPair = triviaMap.ContainsKey(tokenPair.PreviousToken) ? triviaMap[tokenPair.PreviousToken] : default(LeadingTrailingTriviaPair);
+                var nextTriviaPair = triviaMap.ContainsKey(tokenPair.NextToken) ? triviaMap[tokenPair.NextToken] : default(LeadingTrailingTriviaPair);
+
+                var trailingTrivia = previousTriviaPair.TrailingTrivia ?? SpecializedCollections.EmptyEnumerable<SyntaxTrivia>();
+                var leadingTrivia = nextTriviaPair.LeadingTrivia ?? SpecializedCollections.EmptyEnumerable<SyntaxTrivia>();
+
+                var list = trailingTrivia.Concat(leadingTrivia);
+
+                switch (location)
+                {
+                    case TriviaLocation.BeforeBeginningOfSpan:
+                        return FilterBeforeBeginningOfSpan(tokenPair, list);
+                    case TriviaLocation.AfterEndOfSpan:
+                        return FilterTriviaList(list.Concat(tokenPair.NextToken.LeadingTrivia));
+                    case TriviaLocation.AfterBeginningOfSpan:
+                        return FilterTriviaList(AppendTrailingTrivia(tokenPair).Concat(list).Concat(tokenPair.NextToken.LeadingTrivia));
+                    case TriviaLocation.BeforeEndOfSpan:
+                        return FilterTriviaList(tokenPair.PreviousToken.TrailingTrivia.Concat(list).Concat(tokenPair.NextToken.LeadingTrivia));
+                }
+
+				return null;//Contract.FailWithReturn<IEnumerable<SyntaxTrivia>>("Shouldn't reach here");
+            }
+
+            private IEnumerable<SyntaxTrivia> FilterBeforeBeginningOfSpan(PreviousNextTokenPair tokenPair, IEnumerable<SyntaxTrivia> list)
+            {
+                var allList = FilterTriviaList(tokenPair.PreviousToken.TrailingTrivia.Concat(list).Concat(AppendLeadingTrivia(tokenPair)));
+
+                if (tokenPair.PreviousToken.RawKind == (int)SyntaxKind.OpenBraceToken)
+                {
+                    return RemoveBlankLines(allList);
+                }
+
+                return allList;
+            }
+
+            private IEnumerable<SyntaxTrivia> AppendLeadingTrivia(PreviousNextTokenPair tokenPair)
+            {
+                if (tokenPair.PreviousToken.RawKind == (int)SyntaxKind.OpenBraceToken ||
+                    tokenPair.PreviousToken.RawKind == (int)SyntaxKind.SemicolonToken)
+                {
+                    return tokenPair.NextToken.LeadingTrivia;
+                }
+
+                return SpecializedCollections.EmptyEnumerable<SyntaxTrivia>();
+            }
+
+            private IEnumerable<SyntaxTrivia> AppendTrailingTrivia(PreviousNextTokenPair tokenPair)
+            {
+                if (tokenPair.PreviousToken.RawKind == (int)SyntaxKind.OpenBraceToken ||
+                    tokenPair.PreviousToken.RawKind == (int)SyntaxKind.SemicolonToken)
+                {
+                    return tokenPair.PreviousToken.TrailingTrivia;
+                }
+
+                return SpecializedCollections.EmptyEnumerable<SyntaxTrivia>();
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.cs
new file mode 100644
index 0000000000..216915c21d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpMethodExtractor.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Formatting.Rules;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpMethodExtractor : MethodExtractor
+    {
+        public CSharpMethodExtractor(CSharpSelectionResult result) :
+            base(result)
+        {
+        }
+
+        protected override Task<AnalyzerResult> AnalyzeAsync(SelectionResult selectionResult, CancellationToken cancellationToken)
+        {
+            return CSharpAnalyzer.AnalyzeAsync(selectionResult, cancellationToken);
+        }
+
+        protected override async Task<InsertionPoint> GetInsertionPointAsync(SemanticDocument document, int position, CancellationToken cancellationToken)
+        {
+            //Contract.ThrowIfFalse(position >= 0);
+
+            var root = await document.Document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var basePosition = root.FindToken(position);
+
+            var memberNode = basePosition.GetAncestor<MemberDeclarationSyntax>();
+//            Contract.ThrowIfNull(memberNode);
+//            Contract.ThrowIfTrue(memberNode.Kind() == SyntaxKind.NamespaceDeclaration);
+
+            var globalStatement = memberNode as GlobalStatementSyntax;
+            if (globalStatement != null)
+            {
+                // check whether we are extracting whole global statement out
+                if (this.OriginalSelectionResult.FinalSpan.Contains(memberNode.Span))
+                {
+                    return await InsertionPoint.CreateAsync(document, globalStatement.Parent, cancellationToken).ConfigureAwait(false);
+                }
+
+                return await InsertionPoint.CreateAsync(document, globalStatement.Statement, cancellationToken).ConfigureAwait(false);
+            }
+
+            return await InsertionPoint.CreateAsync(document, memberNode, cancellationToken).ConfigureAwait(false);
+        }
+
+        protected override async Task<TriviaResult> PreserveTriviaAsync(SelectionResult selectionResult, CancellationToken cancellationToken)
+        {
+            return await CSharpTriviaResult.ProcessAsync(selectionResult, cancellationToken).ConfigureAwait(false);
+        }
+
+        protected override async Task<SemanticDocument> ExpandAsync(SelectionResult selection, CancellationToken cancellationToken)
+        {
+            var lastExpression = selection.GetFirstTokenInSelection().GetCommonRoot(selection.GetLastTokenInSelection()).GetAncestors<ExpressionSyntax>().LastOrDefault();
+            if (lastExpression == null)
+            {
+                return selection.SemanticDocument;
+            }
+
+            var newExpression = await Simplifier.ExpandAsync(lastExpression, selection.SemanticDocument.Document, n => n != selection.GetContainingScope(), expandParameter: false, cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await selection.SemanticDocument.WithSyntaxRootAsync(selection.SemanticDocument.Root.ReplaceNode(lastExpression, newExpression), cancellationToken).ConfigureAwait(false);
+        }
+
+        protected override Task<MethodExtractor.GeneratedCode> GenerateCodeAsync(InsertionPoint insertionPoint, SelectionResult selectionResult, AnalyzerResult analyzeResult, CancellationToken cancellationToken)
+        {
+            return CSharpCodeGenerator.GenerateAsync(insertionPoint, selectionResult, analyzeResult, cancellationToken);
+        }
+
+//        protected override IEnumerable<IFormattingRule> GetFormattingRules(Document document)
+//        {
+//            return SpecializedCollections.SingletonEnumerable(new FormattingRule()).Concat(Formatter.GetDefaultFormattingRules(document));
+//        }
+
+        protected override SyntaxToken GetMethodNameAtInvocation(IEnumerable<SyntaxNodeOrToken> methodNames)
+        {
+            return (SyntaxToken)methodNames.FirstOrDefault(t => !t.Parent.IsKind(SyntaxKind.MethodDeclaration));
+        }
+
+        protected override async Task<OperationStatus> CheckTypeAsync(
+            Document document,
+            SyntaxNode contextNode,
+            Location location,
+            ITypeSymbol type,
+            CancellationToken cancellationToken)
+        {
+            //Contract.ThrowIfNull(type);
+
+            // this happens when there is no return type
+            if (type.SpecialType == SpecialType.System_Void)
+            {
+                return OperationStatus.Succeeded;
+            }
+
+            if (type.TypeKind == TypeKind.Error ||
+                type.TypeKind == TypeKind.Unknown)
+            {
+                return OperationStatus.ErrorOrUnknownType;
+            }
+
+            // if it is type parameter, make sure we are getting same type parameter
+            var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+            foreach (var typeParameter in TypeParameterCollector.Collect(type))
+            {
+                var typeName = SyntaxFactory.ParseTypeName(typeParameter.Name);
+                var currentType = semanticModel.GetSpeculativeTypeInfo(contextNode.SpanStart, typeName, SpeculativeBindingOption.BindAsTypeOrNamespace).Type;
+                if (currentType == null || !currentType.Equals(typeParameter))
+                {
+                    return new OperationStatus(OperationStatusFlag.BestEffort,
+                        string.Format("FeaturesResources.TypeParameterIsHiddenByAnother",
+                            typeParameter.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
+                            currentType == null ? string.Empty : currentType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)));
+                }
+            }
+
+            return OperationStatus.Succeeded;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionResult.ExpressionResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionResult.ExpressionResult.cs
new file mode 100644
index 0000000000..20c6abc55c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionResult.ExpressionResult.cs
@@ -0,0 +1,140 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    partial class CSharpSelectionResult
+    {
+        private class ExpressionResult : CSharpSelectionResult
+        {
+            public ExpressionResult(
+                OperationStatus status,
+                TextSpan originalSpan,
+                TextSpan finalSpan,
+                OptionSet options,
+                bool selectionInExpression,
+                SemanticDocument document,
+                SyntaxAnnotation firstTokenAnnotation,
+                SyntaxAnnotation lastTokenAnnotation) :
+                base(status, originalSpan, finalSpan, options, selectionInExpression, document, firstTokenAnnotation, lastTokenAnnotation)
+            {
+            }
+
+            public override bool ContainingScopeHasAsyncKeyword()
+            {
+                return false;
+            }
+
+            public override SyntaxNode GetContainingScope()
+            {
+//                Contract.ThrowIfNull(this.SemanticDocument);
+//                Contract.ThrowIfFalse(this.SelectionInExpression);
+
+                var firstToken = this.GetFirstTokenInSelection();
+                var lastToken = this.GetLastTokenInSelection();
+                return firstToken.GetCommonRoot(lastToken).GetAncestorOrThis<ExpressionSyntax>();
+            }
+
+            public override ITypeSymbol GetContainingScopeType()
+            {
+                var node = this.GetContainingScope();
+                var model = this.SemanticDocument.SemanticModel;
+
+                if (!node.IsExpression())
+                {
+                   // Contract.Fail("this shouldn't happen");
+                    return null;
+                }
+
+                // special case for array initializer and explict cast
+                if (node.IsArrayInitializer())
+                {
+                    var variableDeclExpression = node.GetAncestorOrThis<VariableDeclarationSyntax>();
+                    if (variableDeclExpression != null)
+                    {
+                        return model.GetTypeInfo(variableDeclExpression.Type).Type;
+                    }
+                }
+
+                if (node.IsExpressionInCast())
+                {
+                    // bug # 12774 and # 4780
+                    // if the expression is under cast, we use the heuristic below
+                    // 1. if regular binding returns a meaningful type, we use it as it is
+                    // 2. if it doesn't, even if the cast itself wasn't included in the selection, we will treat it 
+                    //    as it was in the selection
+                    var regularType = GetRegularExpressionType(model, node);
+                    if (regularType != null && !regularType.IsObjectType())
+                    {
+                        return regularType;
+                    }
+
+                    var castExpression = node.Parent as CastExpressionSyntax;
+                    if (castExpression != null)
+                    {
+                        return model.GetTypeInfo(castExpression.Type).Type;
+                    }
+                }
+
+                return GetRegularExpressionType(model, node);
+            }
+
+            private static ITypeSymbol GetRegularExpressionType(SemanticModel semanticModel, SyntaxNode node)
+            {
+                // regular case. always use ConvertedType to get implicit conversion right.
+                var expression = node.GetUnparenthesizedExpression();
+
+                var info = semanticModel.GetTypeInfo(expression);
+                var conv = semanticModel.GetConversion(expression);
+
+                if (info.ConvertedType == null || info.ConvertedType.IsErrorType())
+                {
+                    // there is no implicit conversion involved. no need to go further
+                    return info.Type;
+                }
+
+                // always use converted type if method group
+                if ((!node.IsKind(SyntaxKind.ObjectCreationExpression) && semanticModel.GetMemberGroup(expression).Length > 0) ||
+                    IsCoClassImplicitConversion(info, conv, semanticModel.Compilation.CoClassType()))
+                {
+                    return info.ConvertedType;
+                }
+
+                // check implicit conversion
+                if (conv.IsImplicit && (conv.IsConstantExpression || conv.IsEnumeration))
+                {
+                    return info.ConvertedType;
+                }
+
+                // always try to use type that is more specific than object type if possible.
+                return !info.Type.IsObjectType() ? info.Type : info.ConvertedType;
+            }
+        }
+
+        private static bool IsCoClassImplicitConversion(TypeInfo info, Conversion conversion, ISymbol coclassSymbol)
+        {
+            if (!conversion.IsImplicit ||
+                 info.ConvertedType == null ||
+                 info.ConvertedType.TypeKind != TypeKind.Interface)
+            {
+                return false;
+            }
+
+            // let's see whether this interface has coclass attribute
+            return info.ConvertedType.GetAttributes().Any(c => c.AttributeClass.Equals(coclassSymbol));
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionResult.StatementResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionResult.StatementResult.cs
new file mode 100644
index 0000000000..3f22c7c35d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionResult.StatementResult.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    partial class CSharpSelectionResult
+    {
+        private class StatementResult : CSharpSelectionResult
+        {
+            public StatementResult(
+                OperationStatus status,
+                TextSpan originalSpan,
+                TextSpan finalSpan,
+                OptionSet options,
+                bool selectionInExpression,
+                SemanticDocument document,
+                SyntaxAnnotation firstTokenAnnotation,
+                SyntaxAnnotation lastTokenAnnotation) :
+                base(status, originalSpan, finalSpan, options, selectionInExpression, document, firstTokenAnnotation, lastTokenAnnotation)
+            {
+            }
+
+            public override bool ContainingScopeHasAsyncKeyword()
+            {
+                var node = this.GetContainingScope();
+                //var semanticModel = this.SemanticDocument.SemanticModel;
+
+                return node.TypeSwitch(
+                    (AccessorDeclarationSyntax access) => false,
+                    (MethodDeclarationSyntax method) => method.Modifiers.Any(SyntaxKind.AsyncKeyword),
+                    (ParenthesizedLambdaExpressionSyntax lambda) => lambda.AsyncKeyword.Kind() == SyntaxKind.AsyncKeyword,
+                    (SimpleLambdaExpressionSyntax lambda) => lambda.AsyncKeyword.Kind() == SyntaxKind.AsyncKeyword,
+                    (AnonymousMethodExpressionSyntax anonymous) => anonymous.AsyncKeyword.Kind() == SyntaxKind.AsyncKeyword);
+            }
+
+            public override SyntaxNode GetContainingScope()
+            {
+//                Contract.ThrowIfNull(this.SemanticDocument);
+//                Contract.ThrowIfTrue(this.SelectionInExpression);
+
+                // it contains statements
+                var firstToken = this.GetFirstTokenInSelection();
+                return firstToken.GetAncestors<SyntaxNode>().FirstOrDefault(n =>
+                {
+                    return n is BaseMethodDeclarationSyntax ||
+                           n is AccessorDeclarationSyntax ||
+                           n is ParenthesizedLambdaExpressionSyntax ||
+                           n is SimpleLambdaExpressionSyntax ||
+                           n is AnonymousMethodExpressionSyntax ||
+                           n is CompilationUnitSyntax;
+                });
+            }
+
+            public override ITypeSymbol GetContainingScopeType()
+            {
+                //Contract.ThrowIfTrue(this.SelectionInExpression);
+
+                var node = this.GetContainingScope();
+                var semanticModel = this.SemanticDocument.SemanticModel;
+
+                return node.TypeSwitch(
+                    (AccessorDeclarationSyntax access) =>
+                    {
+                        // property case
+                        if (access.Parent == null || access.Parent.Parent == null)
+                        {
+                            return null;
+                        }
+
+                        return ((IPropertySymbol)semanticModel.GetDeclaredSymbol(access.Parent.Parent)).Type;
+                    },
+                    (MethodDeclarationSyntax method) => ((IMethodSymbol)semanticModel.GetDeclaredSymbol(method)).ReturnType,
+                    (ParenthesizedLambdaExpressionSyntax lambda) => semanticModel.GetLambdaOrAnonymousMethodReturnType(lambda),
+                    (SimpleLambdaExpressionSyntax lambda) => semanticModel.GetLambdaOrAnonymousMethodReturnType(lambda),
+                    (AnonymousMethodExpressionSyntax anonymous) => semanticModel.GetLambdaOrAnonymousMethodReturnType(anonymous));
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionResult.cs
new file mode 100644
index 0000000000..5709e1b139
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionResult.cs
@@ -0,0 +1,207 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class CSharpSelectionResult : SelectionResult
+    {
+        public static async Task<CSharpSelectionResult> CreateAsync(
+            OperationStatus status,
+            TextSpan originalSpan,
+            TextSpan finalSpan,
+            OptionSet options,
+            bool selectionInExpression,
+            SemanticDocument document,
+            SyntaxToken firstToken,
+            SyntaxToken lastToken,
+            CancellationToken cancellationToken)
+        {
+//            Contract.ThrowIfNull(status);
+//            Contract.ThrowIfNull(document);
+
+            var firstTokenAnnotation = new SyntaxAnnotation();
+            var lastTokenAnnotation = new SyntaxAnnotation();
+
+            var root = await document.Document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var newDocument = await SemanticDocument.CreateAsync(document.Document.WithSyntaxRoot(root.AddAnnotations(
+                    new[]
+                    {
+                        Tuple.Create<SyntaxToken, SyntaxAnnotation>(firstToken, firstTokenAnnotation),
+                        Tuple.Create<SyntaxToken, SyntaxAnnotation>(lastToken, lastTokenAnnotation)
+                    })), cancellationToken).ConfigureAwait(false);
+
+            if (selectionInExpression)
+            {
+                return new ExpressionResult(
+                    status, originalSpan, finalSpan, options, selectionInExpression,
+                    newDocument, firstTokenAnnotation, lastTokenAnnotation);
+            }
+            else
+            {
+                return new StatementResult(
+                    status, originalSpan, finalSpan, options, selectionInExpression,
+                    newDocument, firstTokenAnnotation, lastTokenAnnotation);
+            }
+        }
+
+        protected CSharpSelectionResult(
+            OperationStatus status,
+            TextSpan originalSpan,
+            TextSpan finalSpan,
+            OptionSet options,
+            bool selectionInExpression,
+            SemanticDocument document,
+            SyntaxAnnotation firstTokenAnnotation,
+            SyntaxAnnotation lastTokenAnnotation) :
+            base(status, originalSpan, finalSpan, options, selectionInExpression,
+                 document, firstTokenAnnotation, lastTokenAnnotation)
+        {
+        }
+
+        protected override bool UnderAsyncAnonymousMethod(SyntaxToken token, SyntaxToken firstToken, SyntaxToken lastToken)
+        {
+            var current = token.Parent;
+            for (; current != null; current = current.Parent)
+            {
+                if (current is MemberDeclarationSyntax ||
+                    current is SimpleLambdaExpressionSyntax ||
+                    current is ParenthesizedLambdaExpressionSyntax ||
+                    current is AnonymousMethodExpressionSyntax)
+                {
+                    break;
+                }
+            }
+
+            if (current == null || current is MemberDeclarationSyntax)
+            {
+                return false;
+            }
+
+            // make sure the selection contains the lambda
+            return firstToken.SpanStart <= current.GetFirstToken().SpanStart &&
+                   current.GetLastToken().Span.End <= lastToken.Span.End;
+        }
+
+        public StatementSyntax GetFirstStatement()
+        {
+            return GetFirstStatement<StatementSyntax>();
+        }
+
+        public StatementSyntax GetLastStatement()
+        {
+            return GetLastStatement<StatementSyntax>();
+        }
+
+        public StatementSyntax GetFirstStatementUnderContainer()
+        {
+            //Contract.ThrowIfTrue(this.SelectionInExpression);
+
+            var firstToken = this.GetFirstTokenInSelection();
+            var statement = firstToken.Parent.GetStatementUnderContainer();
+            //Contract.ThrowIfNull(statement);
+
+            return statement;
+        }
+
+        public StatementSyntax GetLastStatementUnderContainer()
+        {
+            //Contract.ThrowIfTrue(this.SelectionInExpression);
+
+            var lastToken = this.GetLastTokenInSelection();
+            var statement = lastToken.Parent.GetStatementUnderContainer();
+
+            //Contract.ThrowIfNull(statement);
+            //var firstStatementUnderContainer = this.GetFirstStatementUnderContainer();
+            //Contract.ThrowIfFalse(statement.Parent == firstStatementUnderContainer.Parent);
+
+            return statement;
+        }
+
+        public SyntaxNode GetInnermostStatementContainer()
+        {
+            //Contract.ThrowIfFalse(this.SelectionInExpression);
+            var containingScope = this.GetContainingScope();
+            var statements = containingScope.GetAncestorsOrThis<StatementSyntax>();
+            StatementSyntax last = null;
+
+            foreach (var statement in statements)
+            {
+                if (statement.IsStatementContainerNode())
+                {
+                    return statement;
+                }
+
+                last = statement;
+            }
+
+            // constructor initializer case
+            var constructorInitializer = this.GetContainingScopeOf<ConstructorInitializerSyntax>();
+            if (constructorInitializer != null)
+            {
+                return constructorInitializer.Parent;
+            }
+
+            // field initializer case
+            var field = this.GetContainingScopeOf<FieldDeclarationSyntax>();
+            if (field != null)
+            {
+                return field.Parent;
+            }
+
+//            Contract.ThrowIfFalse(last.IsParentKind(SyntaxKind.GlobalStatement));
+//            Contract.ThrowIfFalse(last.Parent.IsParentKind(SyntaxKind.CompilationUnit));
+            return last.Parent.Parent;
+        }
+
+        public bool ShouldPutUnsafeModifier()
+        {
+            var token = this.GetFirstTokenInSelection();
+            var ancestors = token.GetAncestors<SyntaxNode>();
+
+            // if enclosing type contains unsafe keyword, we don't need to put it again
+            if (ancestors.Where(a => SyntaxFacts.IsTypeDeclaration(a.Kind()))
+                         .Cast<MemberDeclarationSyntax>()
+                         .Any(m => m.GetModifiers().Any(SyntaxKind.UnsafeKeyword)))
+            {
+                return false;
+            }
+
+            return token.Parent.IsUnsafeContext();
+        }
+
+        public SyntaxKind UnderCheckedExpressionContext()
+        {
+            return UnderCheckedContext<CheckedExpressionSyntax>();
+        }
+
+        public SyntaxKind UnderCheckedStatementContext()
+        {
+            return UnderCheckedContext<CheckedStatementSyntax>();
+        }
+
+        private SyntaxKind UnderCheckedContext<T>() where T : SyntaxNode
+        {
+            var token = this.GetFirstTokenInSelection();
+            var contextNode = token.Parent.GetAncestor<T>();
+            if (contextNode == null)
+            {
+                return SyntaxKind.None;
+            }
+
+            return contextNode.Kind();
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionValidator.Validator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionValidator.Validator.cs
new file mode 100644
index 0000000000..ab18e973c8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionValidator.Validator.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpSelectionValidator
+    {
+        public bool Check(SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+        {
+            return node.TypeSwitch(
+                (ExpressionSyntax expression) => CheckExpression(semanticModel, expression, cancellationToken),
+                (BlockSyntax block) => CheckBlock(semanticModel, block, cancellationToken),
+                (StatementSyntax statement) => CheckStatement(semanticModel, statement, cancellationToken),
+                (GlobalStatementSyntax globalStatement) => CheckGlobalStatement(semanticModel, globalStatement, cancellationToken));
+        }
+
+        private bool CheckGlobalStatement(SemanticModel semanticModel, GlobalStatementSyntax globalStatement, CancellationToken cancellationToken)
+        {
+            return true;
+        }
+
+        private bool CheckBlock(SemanticModel semanticModel, BlockSyntax block, CancellationToken cancellationToken)
+        {
+            // TODO(cyrusn): Is it intentional that fixed statement is not in this list?
+            if (block.Parent is BlockSyntax ||
+                block.Parent is DoStatementSyntax ||
+                block.Parent is ElseClauseSyntax ||
+                block.Parent is ForEachStatementSyntax ||
+                block.Parent is ForStatementSyntax ||
+                block.Parent is IfStatementSyntax ||
+                block.Parent is LockStatementSyntax ||
+                block.Parent is UsingStatementSyntax ||
+                block.Parent is WhileStatementSyntax)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool CheckExpression(SemanticModel semanticModel, ExpressionSyntax expression, CancellationToken cancellationToken)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // TODO(cyrusn): This is probably unnecessary.  What we should be doing is binding
+            // the type of the expression and seeing if it contains an anonymous type.
+            if (expression is AnonymousObjectCreationExpressionSyntax)
+            {
+                return false;
+            }
+
+            return expression.CanReplaceWithRValue(semanticModel, cancellationToken);
+        }
+
+        private bool CheckStatement(SemanticModel semanticModel, StatementSyntax statement, CancellationToken cancellationToken)
+        {
+            if (statement is CheckedStatementSyntax ||
+                statement is DoStatementSyntax ||
+                statement is EmptyStatementSyntax ||
+                statement is ExpressionStatementSyntax ||
+                statement is FixedStatementSyntax ||
+                statement is ForEachStatementSyntax ||
+                statement is ForStatementSyntax ||
+                statement is IfStatementSyntax ||
+                statement is LocalDeclarationStatementSyntax ||
+                statement is LockStatementSyntax ||
+                statement is ReturnStatementSyntax ||
+                statement is SwitchStatementSyntax ||
+                statement is ThrowStatementSyntax ||
+                statement is TryStatementSyntax ||
+                statement is UnsafeStatementSyntax ||
+                statement is UsingStatementSyntax ||
+                statement is WhileStatementSyntax)
+            {
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionValidator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionValidator.cs
new file mode 100644
index 0000000000..a2eb2e77dc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSelectionValidator.cs
@@ -0,0 +1,486 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class CSharpSelectionValidator : SelectionValidator
+    {
+        public CSharpSelectionValidator(
+            SemanticDocument document,
+            TextSpan textSpan,
+            OptionSet options) :
+            base(document, textSpan, options)
+        {
+        }
+
+        public override async Task<SelectionResult> GetValidSelectionAsync(CancellationToken cancellationToken)
+        {
+            if (!this.ContainsValidSelection)
+            {
+                return NullSelection;
+            }
+
+            var text = this.SemanticDocument.Text;
+            var root = this.SemanticDocument.Root;
+            var model = this.SemanticDocument.SemanticModel;
+
+            // go through pipe line and calculate information about the user selection
+            var selectionInfo = GetInitialSelectionInfo(root, text, cancellationToken);
+            selectionInfo = AssignInitialFinalTokens(selectionInfo, root, cancellationToken);
+            selectionInfo = AdjustFinalTokensBasedOnContext(selectionInfo, model, cancellationToken);
+            selectionInfo = AssignFinalSpan(selectionInfo, text, cancellationToken);
+            selectionInfo = ApplySpecialCases(selectionInfo, text, cancellationToken);
+            selectionInfo = CheckErrorCasesAndAppendDescriptions(selectionInfo, root, cancellationToken);
+
+            // there was a fatal error that we couldn't even do negative preview, return error result
+            if (selectionInfo.Status.FailedWithNoBestEffortSuggestion())
+            {
+                return new ErrorSelectionResult(selectionInfo.Status);
+            }
+
+            var controlFlowSpan = GetControlFlowSpan(selectionInfo);
+            if (!selectionInfo.SelectionInExpression)
+            {
+                var statementRange = GetStatementRangeContainedInSpan<StatementSyntax>(root, controlFlowSpan, cancellationToken);
+                if (statementRange == null)
+                {
+                    selectionInfo = selectionInfo.WithStatus(s => s.With(OperationStatusFlag.None, "CSharpFeaturesResources.CantDetermineValidRangeOfStatements"));
+                    return new ErrorSelectionResult(selectionInfo.Status);
+                }
+
+                var isFinalSpanSemanticallyValid = IsFinalSpanSemanticallyValidSpan(model, controlFlowSpan, statementRange, cancellationToken);
+                if (!isFinalSpanSemanticallyValid)
+                {
+                    // check control flow only if we are extracting statement level, not expression
+                    // level. you can not have goto that moves control out of scope in expression level
+                    // (even in lambda)
+                    selectionInfo = selectionInfo.WithStatus(s => s.With(OperationStatusFlag.BestEffort, "CSharpFeaturesResources.NotAllCodePathReturns"));
+                }
+            }
+
+            return await CSharpSelectionResult.CreateAsync(
+                selectionInfo.Status,
+                selectionInfo.OriginalSpan,
+                selectionInfo.FinalSpan,
+                this.Options,
+                selectionInfo.SelectionInExpression,
+                this.SemanticDocument,
+                selectionInfo.FirstTokenInFinalSpan,
+                selectionInfo.LastTokenInFinalSpan,
+                cancellationToken).ConfigureAwait(false);
+        }
+
+        private SelectionInfo ApplySpecialCases(SelectionInfo selectionInfo, SourceText text, CancellationToken cancellationToken)
+        {
+            if (selectionInfo.Status.FailedWithNoBestEffortSuggestion() || !selectionInfo.SelectionInExpression)
+            {
+                return selectionInfo;
+            }
+
+            var expressionNode = selectionInfo.FirstTokenInFinalSpan.GetCommonRoot(selectionInfo.LastTokenInFinalSpan);
+            if (!expressionNode.IsAnyAssignExpression())
+            {
+                return selectionInfo;
+            }
+
+            var assign = (AssignmentExpressionSyntax)expressionNode;
+
+            // make sure there is a visible token at right side expression
+            if (assign.Right.GetLastToken().Kind() == SyntaxKind.None)
+            {
+                return selectionInfo;
+            }
+
+            return AssignFinalSpan(selectionInfo.With(s => s.FirstTokenInFinalSpan = assign.Right.GetFirstToken(includeZeroWidth: true))
+                                                .With(s => s.LastTokenInFinalSpan = assign.Right.GetLastToken(includeZeroWidth: true)),
+                                   text, cancellationToken);
+        }
+
+        private TextSpan GetControlFlowSpan(SelectionInfo selectionInfo)
+        {
+            return TextSpan.FromBounds(selectionInfo.FirstTokenInFinalSpan.SpanStart, selectionInfo.LastTokenInFinalSpan.Span.End);
+        }
+
+        private SelectionInfo AdjustFinalTokensBasedOnContext(
+            SelectionInfo selectionInfo,
+            SemanticModel semanticModel,
+            CancellationToken cancellationToken)
+        {
+            if (selectionInfo.Status.FailedWithNoBestEffortSuggestion())
+            {
+                return selectionInfo;
+            }
+
+            // don't need to adjust anything if it is multi-statements case
+            if (!selectionInfo.SelectionInExpression && !selectionInfo.SelectionInSingleStatement)
+            {
+                return selectionInfo;
+            }
+
+            // get the node that covers the selection
+            var node = selectionInfo.FirstTokenInFinalSpan.GetCommonRoot(selectionInfo.LastTokenInFinalSpan);
+
+            var validNode = Check(semanticModel, node, cancellationToken);
+            if (validNode)
+            {
+                return selectionInfo;
+            }
+
+            var firstValidNode = node.GetAncestors<SyntaxNode>().FirstOrDefault(n => Check(semanticModel, n, cancellationToken));
+            if (firstValidNode == null)
+            {
+                // couldn't find any valid node
+                return selectionInfo.WithStatus(s => new OperationStatus(OperationStatusFlag.None, "CSharpFeaturesResources.SelectionDoesNotContainAValidNode"))
+                                    .With(s => s.FirstTokenInFinalSpan = default(SyntaxToken))
+                                    .With(s => s.LastTokenInFinalSpan = default(SyntaxToken));
+            }
+
+            firstValidNode = (firstValidNode.Parent is ExpressionStatementSyntax) ? firstValidNode.Parent : firstValidNode;
+
+            return selectionInfo.With(s => s.SelectionInExpression = firstValidNode is ExpressionSyntax)
+                                .With(s => s.SelectionInSingleStatement = firstValidNode is StatementSyntax)
+                                .With(s => s.FirstTokenInFinalSpan = firstValidNode.GetFirstToken(includeZeroWidth: true))
+                                .With(s => s.LastTokenInFinalSpan = firstValidNode.GetLastToken(includeZeroWidth: true));
+        }
+
+        private SelectionInfo GetInitialSelectionInfo(SyntaxNode root, SourceText text, CancellationToken cancellationToken)
+        {
+            var adjustedSpan = GetAdjustedSpan(text, this.OriginalSpan);
+
+            var firstTokenInSelection = root.FindTokenOnRightOfPosition(adjustedSpan.Start, includeSkipped: false);
+            var lastTokenInSelection = root.FindTokenOnLeftOfPosition(adjustedSpan.End, includeSkipped: false);
+
+            if (firstTokenInSelection.Kind() == SyntaxKind.None || lastTokenInSelection.Kind() == SyntaxKind.None)
+            {
+                return new SelectionInfo { Status = new OperationStatus(OperationStatusFlag.None, "CSharpFeaturesResources.InvalidSelection"), OriginalSpan = adjustedSpan };
+            }
+
+            if (!adjustedSpan.Contains(firstTokenInSelection.Span) && !adjustedSpan.Contains(lastTokenInSelection.Span))
+            {
+                return new SelectionInfo
+                {
+                    Status = new OperationStatus(OperationStatusFlag.None, "CSharpFeaturesResources.SelectionDoesNotContainAValidToken"),
+                    OriginalSpan = adjustedSpan,
+                    FirstTokenInOriginalSpan = firstTokenInSelection,
+                    LastTokenInOriginalSpan = lastTokenInSelection
+                };
+            }
+
+            if (!firstTokenInSelection.UnderValidContext() || !lastTokenInSelection.UnderValidContext())
+            {
+                return new SelectionInfo
+                {
+					Status = new OperationStatus(OperationStatusFlag.None, "CSharpFeaturesResources.InvalidContext"),
+                    OriginalSpan = adjustedSpan,
+                    FirstTokenInOriginalSpan = firstTokenInSelection,
+                    LastTokenInOriginalSpan = lastTokenInSelection
+                };
+            }
+
+            var commonRoot = firstTokenInSelection.GetCommonRoot(lastTokenInSelection);
+            if (commonRoot == null)
+            {
+                return new SelectionInfo
+                {
+					Status = new OperationStatus(OperationStatusFlag.None, "CSharpFeaturesResources.NoCommonRootNodeForExtraction"),
+                    OriginalSpan = adjustedSpan,
+                    FirstTokenInOriginalSpan = firstTokenInSelection,
+                    LastTokenInOriginalSpan = lastTokenInSelection
+                };
+            }
+
+            var selectionInExpression = commonRoot is ExpressionSyntax;
+            if (!selectionInExpression && !commonRoot.UnderValidContext())
+            {
+                return new SelectionInfo
+                {
+					Status = new OperationStatus(OperationStatusFlag.None, "CSharpFeaturesResources.NoValidSelectionToPerformExtraction"),
+                    OriginalSpan = adjustedSpan,
+                    FirstTokenInOriginalSpan = firstTokenInSelection,
+                    LastTokenInOriginalSpan = lastTokenInSelection
+                };
+            }
+
+            return new SelectionInfo
+            {
+                Status = OperationStatus.Succeeded,
+                OriginalSpan = adjustedSpan,
+                CommonRootFromOriginalSpan = commonRoot,
+                SelectionInExpression = selectionInExpression,
+                FirstTokenInOriginalSpan = firstTokenInSelection,
+                LastTokenInOriginalSpan = lastTokenInSelection
+            };
+        }
+
+        private SelectionInfo CheckErrorCasesAndAppendDescriptions(SelectionInfo selectionInfo, SyntaxNode root, CancellationToken cancellationToken)
+        {
+            if (selectionInfo.Status.FailedWithNoBestEffortSuggestion())
+            {
+                return selectionInfo;
+            }
+
+            if (selectionInfo.FirstTokenInFinalSpan.IsMissing || selectionInfo.LastTokenInFinalSpan.IsMissing)
+            {
+				selectionInfo = selectionInfo.WithStatus(s => s.With(OperationStatusFlag.None, "CSharpFeaturesResources.ContainsInvalidSelection"));
+            }
+
+            // get the node that covers the selection
+            var commonNode = selectionInfo.FirstTokenInFinalSpan.GetCommonRoot(selectionInfo.LastTokenInFinalSpan);
+
+            if ((selectionInfo.SelectionInExpression || selectionInfo.SelectionInSingleStatement) && commonNode.HasDiagnostics())
+            {
+				selectionInfo = selectionInfo.WithStatus(s => s.With(OperationStatusFlag.None, "CSharpFeaturesResources.TheSelectionContainsSyntacticErrors"));
+            }
+
+            var tokens = root.DescendantTokens(selectionInfo.FinalSpan);
+            if (tokens.ContainPreprocessorCrossOver(selectionInfo.FinalSpan))
+            {
+				selectionInfo = selectionInfo.WithStatus(s => s.With(OperationStatusFlag.BestEffort, "CSharpFeaturesResources.SelectionCanNotCrossOverPreprocessorDirectives"));
+            }
+
+            // TODO : check whether this can be handled by control flow analysis engine
+            if (tokens.Any(t => t.Kind() == SyntaxKind.YieldKeyword))
+            {
+				selectionInfo = selectionInfo.WithStatus(s => s.With(OperationStatusFlag.BestEffort, "CSharpFeaturesResources.SelectionCanNotContainAYieldStatement"));
+            }
+
+            // TODO : check behavior of control flow analysis engine around exception and exception handling.
+            if (tokens.ContainArgumentlessThrowWithoutEnclosingCatch(selectionInfo.FinalSpan))
+            {
+				selectionInfo = selectionInfo.WithStatus(s => s.With(OperationStatusFlag.BestEffort, "CSharpFeaturesResources.SelectionCanNotContainThrowStatement"));
+            }
+
+            if (selectionInfo.SelectionInExpression && commonNode.PartOfConstantInitializerExpression())
+            {
+				selectionInfo = selectionInfo.WithStatus(s => s.With(OperationStatusFlag.None, "CSharpFeaturesResources.SelectionCanNotBePartOfConstInitializerExpr"));
+            }
+
+            if (commonNode.IsUnsafeContext())
+            {
+				selectionInfo = selectionInfo.WithStatus(s => s.With(s.Flag, "CSharpFeaturesResources.TheSelectedCodeIsInsideAnUnsafeContext"));
+            }
+
+            var selectionChanged = selectionInfo.FirstTokenInOriginalSpan != selectionInfo.FirstTokenInFinalSpan || selectionInfo.LastTokenInOriginalSpan != selectionInfo.LastTokenInFinalSpan;
+            if (selectionChanged)
+            {
+                selectionInfo = selectionInfo.WithStatus(s => s.MarkSuggestion());
+            }
+
+            return selectionInfo;
+        }
+
+        private SelectionInfo AssignInitialFinalTokens(SelectionInfo selectionInfo, SyntaxNode root, CancellationToken cancellationToken)
+        {
+            if (selectionInfo.Status.FailedWithNoBestEffortSuggestion())
+            {
+                return selectionInfo;
+            }
+
+            if (selectionInfo.SelectionInExpression)
+            {
+                // simple expression case
+                return selectionInfo.With(s => s.FirstTokenInFinalSpan = s.CommonRootFromOriginalSpan.GetFirstToken(includeZeroWidth: true))
+                                    .With(s => s.LastTokenInFinalSpan = s.CommonRootFromOriginalSpan.GetLastToken(includeZeroWidth: true));
+            }
+
+            var range = GetStatementRangeContainingSpan<StatementSyntax>(
+                root, TextSpan.FromBounds(selectionInfo.FirstTokenInOriginalSpan.SpanStart, selectionInfo.LastTokenInOriginalSpan.Span.End),
+                cancellationToken);
+
+            if (range == null)
+            {
+				return selectionInfo.WithStatus(s => s.With(OperationStatusFlag.None, "CSharpFeaturesResources.NoValidStatementRangeToExtractOut"));
+            }
+
+            var statement1 = (StatementSyntax)range.Item1;
+            var statement2 = (StatementSyntax)range.Item2;
+
+            if (statement1 == statement2)
+            {
+                // check one more time to see whether it is an expression case
+                var expression = selectionInfo.CommonRootFromOriginalSpan.GetAncestor<ExpressionSyntax>();
+                if (expression != null && statement1.Span.Contains(expression.Span))
+                {
+                    return selectionInfo.With(s => s.SelectionInExpression = true)
+                                        .With(s => s.FirstTokenInFinalSpan = expression.GetFirstToken(includeZeroWidth: true))
+                                        .With(s => s.LastTokenInFinalSpan = expression.GetLastToken(includeZeroWidth: true));
+                }
+
+                // single statement case
+                return selectionInfo.With(s => s.SelectionInSingleStatement = true)
+                                    .With(s => s.FirstTokenInFinalSpan = statement1.GetFirstToken(includeZeroWidth: true))
+                                    .With(s => s.LastTokenInFinalSpan = statement1.GetLastToken(includeZeroWidth: true));
+            }
+
+            // move only statements inside of the block
+            return selectionInfo.With(s => s.FirstTokenInFinalSpan = statement1.GetFirstToken(includeZeroWidth: true))
+                                .With(s => s.LastTokenInFinalSpan = statement2.GetLastToken(includeZeroWidth: true));
+        }
+
+        private SelectionInfo AssignFinalSpan(SelectionInfo selectionInfo, SourceText text, CancellationToken cancellationToken)
+        {
+            if (selectionInfo.Status.FailedWithNoBestEffortSuggestion())
+            {
+                return selectionInfo;
+            }
+
+            // set final span
+            var start = (selectionInfo.FirstTokenInOriginalSpan == selectionInfo.FirstTokenInFinalSpan) ?
+                            Math.Min(selectionInfo.FirstTokenInOriginalSpan.SpanStart, selectionInfo.OriginalSpan.Start) :
+                            selectionInfo.FirstTokenInFinalSpan.FullSpan.Start;
+
+            var end = (selectionInfo.LastTokenInOriginalSpan == selectionInfo.LastTokenInFinalSpan) ?
+                            Math.Max(selectionInfo.LastTokenInOriginalSpan.Span.End, selectionInfo.OriginalSpan.End) :
+                            selectionInfo.LastTokenInFinalSpan.FullSpan.End;
+
+            return selectionInfo.With(s => s.FinalSpan = GetAdjustedSpan(text, TextSpan.FromBounds(start, end)));
+        }
+
+        public override bool ContainsNonReturnExitPointsStatements(IEnumerable<SyntaxNode> jumpsOutOfRegion)
+        {
+            return jumpsOutOfRegion.Where(n => !(n is ReturnStatementSyntax)).Any();
+        }
+
+        public override IEnumerable<SyntaxNode> GetOuterReturnStatements(SyntaxNode commonRoot, IEnumerable<SyntaxNode> jumpsOutOfRegion)
+        {
+            var returnStatements = jumpsOutOfRegion.Where(s => s is ReturnStatementSyntax);
+
+            var container = commonRoot.GetAncestorsOrThis<SyntaxNode>().Where(a => a.IsReturnableConstruct()).FirstOrDefault();
+            if (container == null)
+            {
+                return SpecializedCollections.EmptyEnumerable<SyntaxNode>();
+            }
+
+            var returnableConstructPairs = returnStatements.Select(r => Tuple.Create(r, r.GetAncestors<SyntaxNode>().Where(a => a.IsReturnableConstruct()).FirstOrDefault()))
+                                                           .Where(p => p.Item2 != null);
+
+            // now filter return statements to only include the one under outmost container
+            return returnableConstructPairs.Where(p => p.Item2 == container).Select(p => p.Item1);
+        }
+
+        public override bool IsFinalSpanSemanticallyValidSpan(
+            SyntaxNode root, TextSpan textSpan,
+            IEnumerable<SyntaxNode> returnStatements, CancellationToken cancellationToken)
+        {
+            // return statement shouldn't contain any return value
+            if (returnStatements.Cast<ReturnStatementSyntax>().Any(r => r.Expression != null))
+            {
+                return false;
+            }
+
+            var lastToken = (SyntaxToken)root.FindToken(textSpan.End);
+            if (lastToken.Kind() == SyntaxKind.None)
+            {
+                return false;
+            }
+
+            var container = lastToken.GetAncestors<SyntaxNode>().FirstOrDefault(n => n.IsReturnableConstruct());
+            if (container == null)
+            {
+                return false;
+            }
+
+            var body = container.GetBlockBody();
+            if (body == null)
+            {
+                return false;
+            }
+
+            // make sure that next token of the last token in the selection is the close braces of containing block
+            if (body.CloseBraceToken != lastToken.GetNextToken(includeZeroWidth: true))
+            {
+                return false;
+            }
+
+            // alright, for these construcuts, it must be okay to be extracted
+            switch (container.Kind())
+            {
+                case SyntaxKind.AnonymousMethodExpression:
+                case SyntaxKind.SimpleLambdaExpression:
+                case SyntaxKind.ParenthesizedLambdaExpression:
+                    return true;
+            }
+
+            // now, only method is okay to be extracted out
+            var method = body.Parent as MethodDeclarationSyntax;
+            if (method == null)
+            {
+                return false;
+            }
+
+            // make sure this method doesn't have return type.
+            return method.ReturnType.TypeSwitch((PredefinedTypeSyntax p) => p.Keyword.Kind() == SyntaxKind.VoidKeyword);
+        }
+
+        private static TextSpan GetAdjustedSpan(SourceText text, TextSpan textSpan)
+        {
+            // beginning of a file
+            if (textSpan.IsEmpty || textSpan.End == 0)
+            {
+                return textSpan;
+            }
+
+            // if it is a start of new line, make it belong to previous line
+            var line = text.Lines.GetLineFromPosition(textSpan.End);
+            if (line.Start != textSpan.End)
+            {
+                return textSpan;
+            }
+
+            // get previous line
+            //Contract.ThrowIfFalse(line.LineNumber > 0);
+            var previousLine = text.Lines[line.LineNumber - 1];
+            return TextSpan.FromBounds(textSpan.Start, previousLine.End);
+        }
+
+        private class SelectionInfo
+        {
+            public OperationStatus Status { get; set; }
+
+            public TextSpan OriginalSpan { get; set; }
+            public TextSpan FinalSpan { get; set; }
+
+            public SyntaxNode CommonRootFromOriginalSpan { get; set; }
+
+            public SyntaxToken FirstTokenInOriginalSpan { get; set; }
+            public SyntaxToken LastTokenInOriginalSpan { get; set; }
+
+            public SyntaxToken FirstTokenInFinalSpan { get; set; }
+            public SyntaxToken LastTokenInFinalSpan { get; set; }
+
+            public bool SelectionInExpression { get; set; }
+            public bool SelectionInSingleStatement { get; set; }
+
+            public SelectionInfo WithStatus(Func<OperationStatus, OperationStatus> statusGetter)
+            {
+                return With(s => s.Status = statusGetter(s.Status));
+            }
+
+            public SelectionInfo With(Action<SelectionInfo> valueSetter)
+            {
+                var newInfo = this.Clone();
+                valueSetter(newInfo);
+                return newInfo;
+            }
+
+            public SelectionInfo Clone()
+            {
+                return (SelectionInfo)this.MemberwiseClone();
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSyntaxTriviaService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSyntaxTriviaService.cs
new file mode 100644
index 0000000000..a8107c2c14
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSyntaxTriviaService.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	class CSharpSyntaxTriviaService : AbstractSyntaxTriviaService
+    {
+        public CSharpSyntaxTriviaService()
+			: base((int)SyntaxKind.EndOfLineTrivia)
+        {
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSyntaxTriviaServiceFactory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSyntaxTriviaServiceFactory.cs
new file mode 100644
index 0000000000..3fcd67d257
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/CSharpSyntaxTriviaServiceFactory.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+
+using Microsoft.CodeAnalysis;
+
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+//    [ExportLanguageServiceFactory(typeof(ISyntaxTriviaService), LanguageNames.CSharp), Shared]
+//    class CSharpSyntaxTriviaServiceFactory : ILanguageServiceFactory
+//    {
+//        public ILanguageService CreateLanguageService(HostLanguageServices provider)
+//        {
+//            return new CSharpSyntaxTriviaService(provider);
+//        }
+//    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/Extensions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/Extensions.cs
new file mode 100644
index 0000000000..61825c5c53
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/CSharp/Extensions.cs
@@ -0,0 +1,285 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	static partial class Extensions
+    {
+        public static ExpressionSyntax GetUnparenthesizedExpression(this SyntaxNode node)
+        {
+            var parenthesizedExpression = node as ParenthesizedExpressionSyntax;
+            if (parenthesizedExpression == null)
+            {
+                return node as ExpressionSyntax;
+            }
+
+            return GetUnparenthesizedExpression(parenthesizedExpression.Expression);
+        }
+
+        public static StatementSyntax GetStatementUnderContainer(this SyntaxNode node)
+        {
+            //Contract.ThrowIfNull(node);
+
+            while (node != null)
+            {
+                if (node.Parent != null &&
+                    node.Parent.IsStatementContainerNode())
+                {
+                    return node as StatementSyntax;
+                }
+
+                node = node.Parent;
+            }
+
+            return null;
+        }
+
+        public static StatementSyntax GetParentLabeledStatementIfPossible(this SyntaxNode node)
+        {
+            return (StatementSyntax)((node.Parent is LabeledStatementSyntax) ? node.Parent : node);
+        }
+
+        public static bool IsStatementContainerNode(this SyntaxNode node)
+        {
+            return node is BlockSyntax || node is SwitchSectionSyntax;
+        }
+
+        public static BlockSyntax GetBlockBody(this SyntaxNode node)
+        {
+            return node.TypeSwitch(
+                (BaseMethodDeclarationSyntax m) => m.Body,
+                (AccessorDeclarationSyntax a) => a.Body,
+                (SimpleLambdaExpressionSyntax s) => s.Body as BlockSyntax,
+                (ParenthesizedLambdaExpressionSyntax p) => p.Body as BlockSyntax,
+                (AnonymousMethodExpressionSyntax a) => a.Block);
+        }
+
+        public static bool UnderValidContext(this SyntaxNode node)
+        {
+            //Contract.ThrowIfNull(node);
+
+            Func<SyntaxNode, bool> predicate = n =>
+            {
+                if (n is BaseMethodDeclarationSyntax ||
+                    n is AccessorDeclarationSyntax ||
+                    n is BlockSyntax ||
+                    n is GlobalStatementSyntax)
+                {
+                    return true;
+                }
+
+                var constructorInitializer = n as ConstructorInitializerSyntax;
+                if (constructorInitializer != null)
+                {
+                    return constructorInitializer.ContainsInArgument(node.Span);
+                }
+
+                return false;
+            };
+
+            if (!node.GetAncestorsOrThis<SyntaxNode>().Any(predicate))
+            {
+                return false;
+            }
+
+            if (node.FromScript() || node.GetAncestor<TypeDeclarationSyntax>() != null)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        public static bool UnderValidContext(this SyntaxToken token)
+        {
+            return token.GetAncestors<SyntaxNode>().Any(n => n.CheckTopLevel(token.Span));
+        }
+
+        public static bool PartOfConstantInitializerExpression(this SyntaxNode node)
+        {
+            return node.PartOfConstantInitializerExpression<FieldDeclarationSyntax>(n => n.Modifiers) ||
+                   node.PartOfConstantInitializerExpression<LocalDeclarationStatementSyntax>(n => n.Modifiers);
+        }
+
+        private static bool PartOfConstantInitializerExpression<T>(this SyntaxNode node, Func<T, SyntaxTokenList> modifiersGetter) where T : SyntaxNode
+        {
+            var decl = node.GetAncestor<T>();
+            if (decl == null)
+            {
+                return false;
+            }
+
+            if (!modifiersGetter(decl).Any(t => t.Kind() == SyntaxKind.ConstKeyword))
+            {
+                return false;
+            }
+
+            // we are under decl with const modifier, check we are part of initializer expression
+            var equal = node.GetAncestor<EqualsValueClauseSyntax>();
+            if (equal == null)
+            {
+                return false;
+            }
+
+            return equal.Value != null && equal.Value.Span.Contains(node.Span);
+        }
+
+        public static bool ContainArgumentlessThrowWithoutEnclosingCatch(this IEnumerable<SyntaxToken> tokens, TextSpan textSpan)
+        {
+            foreach (var token in tokens)
+            {
+                if (token.Kind() != SyntaxKind.ThrowKeyword)
+                {
+                    continue;
+                }
+
+                var throwStatement = token.Parent as ThrowStatementSyntax;
+                if (throwStatement == null || throwStatement.Expression != null)
+                {
+                    continue;
+                }
+
+                var catchClause = token.GetAncestor<CatchClauseSyntax>();
+                if (catchClause == null || !textSpan.Contains(catchClause.Span))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public static bool ContainPreprocessorCrossOver(this IEnumerable<SyntaxToken> tokens, TextSpan textSpan)
+        {
+            int activeRegions = 0;
+            int activeIfs = 0;
+
+            foreach (var trivia in tokens.GetAllTrivia())
+            {
+                if (!textSpan.Contains(trivia.Span))
+                {
+                    continue;
+                }
+
+                switch (trivia.Kind())
+                {
+                    case SyntaxKind.RegionDirectiveTrivia:
+                        activeRegions++;
+                        break;
+                    case SyntaxKind.EndRegionDirectiveTrivia:
+                        if (activeRegions <= 0)
+                        {
+                            return true;
+                        }
+
+                        activeRegions--;
+                        break;
+                    case SyntaxKind.IfDirectiveTrivia:
+                        activeIfs++;
+                        break;
+                    case SyntaxKind.EndIfDirectiveTrivia:
+                        if (activeIfs <= 0)
+                        {
+                            return true;
+                        }
+
+                        activeIfs--;
+                        break;
+                    case SyntaxKind.ElseDirectiveTrivia:
+                    case SyntaxKind.ElifDirectiveTrivia:
+                        if (activeIfs <= 0)
+                        {
+                            return true;
+                        }
+
+                        break;
+                }
+            }
+
+            return activeIfs != 0 || activeRegions != 0;
+        }
+
+        public static IEnumerable<SyntaxTrivia> GetAllTrivia(this IEnumerable<SyntaxToken> tokens)
+        {
+            foreach (var token in tokens)
+            {
+                foreach (var trivia in token.LeadingTrivia)
+                {
+                    yield return trivia;
+                }
+
+                foreach (var trivia in token.TrailingTrivia)
+                {
+                    yield return trivia;
+                }
+            }
+        }
+
+        public static bool HasSyntaxAnnotation(this HashSet<SyntaxAnnotation> set, SyntaxNode node)
+        {
+            return set.Any(a => node.GetAnnotatedNodesAndTokens(a).Any());
+        }
+
+        public static bool HasHybridTriviaBetween(this SyntaxToken token1, SyntaxToken token2)
+        {
+            if (token1.TrailingTrivia.Any(t => !t.IsElastic()))
+            {
+                return true;
+            }
+
+            if (token2.LeadingTrivia.Any(t => !t.IsElastic()))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        public static bool IsArrayInitializer(this SyntaxNode node)
+        {
+            return node is InitializerExpressionSyntax && node.Parent is EqualsValueClauseSyntax;
+        }
+
+        public static bool IsExpressionInCast(this SyntaxNode node)
+        {
+            return node is ExpressionSyntax && node.Parent is CastExpressionSyntax;
+        }
+
+        public static bool IsExpression(this SyntaxNode node)
+        {
+            return node is ExpressionSyntax;
+        }
+
+        public static bool IsErrorType(this ITypeSymbol type)
+        {
+            return type == null || type.Kind == SymbolKind.ErrorType;
+        }
+
+        public static bool IsObjectType(this ITypeSymbol type)
+        {
+            return type == null || type.SpecialType == SpecialType.System_Object;
+        }
+
+        public static bool BetweenFieldAndNonFieldMember(this SyntaxToken token1, SyntaxToken token2)
+        {
+            if (token1.RawKind != (int)SyntaxKind.SemicolonToken || !(token1.Parent is FieldDeclarationSyntax))
+            {
+                return false;
+            }
+
+            var field = token2.GetAncestor<FieldDeclarationSyntax>();
+            return field == null;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/Enums.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/Enums.cs
new file mode 100644
index 0000000000..36b85e5578
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/Enums.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	public enum DeclarationBehavior
+    {
+        None,
+        Delete,
+        MoveIn,
+        MoveOut,
+        SplitIn,
+        SplitOut
+    }
+
+	public enum ReturnBehavior
+    {
+        None,
+        Initialization,
+        Assignment
+    }
+
+	public enum ParameterBehavior
+    {
+        None,
+        Input,
+        Out,
+        Ref
+    }
+
+    /// <summary>
+    /// status code for extract method operations
+    /// </summary>
+    [Flags]
+	public enum OperationStatusFlag
+    {
+        None = 0x0,
+
+        /// <summary>
+        /// operation has succeeded
+        /// </summary>
+        Succeeded = 0x1,
+
+        /// <summary>
+        /// operation has succeeded with a span that is different than original span
+        /// </summary>
+        Suggestion = 0x2,
+
+        /// <summary>
+        /// operation has failed but can provide some best effort result
+        /// </summary>
+        BestEffort = 0x4,
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/Extensions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/Extensions.cs
new file mode 100644
index 0000000000..5a4f85d696
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/Extensions.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	static partial class Extensions
+    {
+        public static bool Succeeded(this OperationStatus status)
+        {
+            return status.Flag.Succeeded();
+        }
+
+        public static bool FailedWithNoBestEffortSuggestion(this OperationStatus status)
+        {
+            return status.Flag.Failed() && !status.Flag.HasBestEffort();
+        }
+
+        public static bool Failed(this OperationStatus status)
+        {
+            return status.Flag.Failed();
+        }
+
+        public static bool Succeeded(this OperationStatusFlag flag)
+        {
+            return (flag & OperationStatusFlag.Succeeded) != 0;
+        }
+
+        public static bool Failed(this OperationStatusFlag flag)
+        {
+            return !flag.Succeeded();
+        }
+
+        public static bool HasBestEffort(this OperationStatusFlag flag)
+        {
+            return (flag & OperationStatusFlag.BestEffort) != 0;
+        }
+
+        public static bool HasSuggestion(this OperationStatusFlag flag)
+        {
+            return (flag & OperationStatusFlag.Suggestion) != 0;
+        }
+
+        public static bool HasMask(this OperationStatusFlag flag, OperationStatusFlag mask)
+        {
+            return (flag & mask) != 0x0;
+        }
+
+        public static OperationStatusFlag RemoveFlag(this OperationStatusFlag baseFlag, OperationStatusFlag flagToRemove)
+        {
+            return baseFlag & ~flagToRemove;
+        }
+
+        public static ITypeSymbol GetLambdaOrAnonymousMethodReturnType(this SemanticModel binding, SyntaxNode node)
+        {
+            var info = binding.GetSymbolInfo(node);
+            if (info.Symbol == null)
+            {
+                return null;
+            }
+
+            var methodSymbol = info.Symbol as IMethodSymbol;
+            if (methodSymbol.MethodKind != MethodKind.AnonymousFunction)
+            {
+                return null;
+            }
+
+            return methodSymbol.ReturnType;
+        }
+
+        public static Task<SemanticDocument> WithSyntaxRootAsync(this SemanticDocument semanticDocument, SyntaxNode root, CancellationToken cancellationToken)
+        {
+            return SemanticDocument.CreateAsync(semanticDocument.Document.WithSyntaxRoot(root), cancellationToken);
+        }
+
+        /// <summary>
+        /// get tokens with given annotation in current document
+        /// </summary>
+		public static SyntaxToken GetTokenWithAnnotaton(this SemanticDocument document, SyntaxAnnotation annotation)
+        {
+            return document.Root.GetAnnotatedNodesAndTokens(annotation).Single().AsToken();
+        }
+
+        /// <summary>
+        /// resolve the given symbol against compilation this snapshot has
+        /// </summary>
+        public static T ResolveType<T>(this SemanticModel semanticModel, T symbol) where T : class, ITypeSymbol
+        {
+			return (T)symbol.GetSymbolKey().Resolve(semanticModel.Compilation).GetAnySymbol();
+        }
+
+        /// <summary>
+        /// check whether node contains error for itself but not from its child node
+        /// </summary>
+        public static bool HasDiagnostics(this SyntaxNode node)
+        {
+            var set = new HashSet<Diagnostic>(node.GetDiagnostics());
+
+            foreach (var child in node.ChildNodes())
+            {
+                set.ExceptWith(child.GetDiagnostics());
+            }
+
+            return set.Count > 0;
+        }
+
+        public static bool FromScript(this SyntaxNode node)
+        {
+            if (node.SyntaxTree == null)
+            {
+                return false;
+            }
+
+            return node.SyntaxTree.Options.Kind != SourceCodeKind.Regular;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodMatrix.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodMatrix.cs
new file mode 100644
index 0000000000..972a936f74
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodMatrix.cs
@@ -0,0 +1,229 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    class ExtractMethodMatrix
+    {
+        private static readonly Dictionary<Key, VariableStyle> s_matrix;
+
+        static ExtractMethodMatrix()
+        {
+            s_matrix = new Dictionary<Key, VariableStyle>();
+            BuildMatrix();
+        }
+
+        public static VariableStyle GetVariableStyle(
+            bool captured,
+            bool dataFlowIn,
+            bool dataFlowOut,
+            bool alwaysAssigned,
+            bool variableDeclared,
+            bool readInside,
+            bool writtenInside,
+            bool readOutside,
+            bool writtenOutside,
+            bool unsafeAddressTaken)
+        {
+#if false
+            // decide not to treat capture variable special
+            if (captured)
+            {
+                // if a variable is captured, it can only be passed as ref parameter.
+                return VariableStyle.OnlyAsRefParam;
+            }
+#endif
+            // bug # 12258, 12114
+            // use "out" if "&" is taken for the variable
+            if (unsafeAddressTaken)
+            {
+                return VariableStyle.Out;
+            }
+
+            var key = new Key(
+                dataFlowIn,
+                dataFlowOut,
+                alwaysAssigned,
+                variableDeclared,
+                readInside,
+                writtenInside,
+                readOutside,
+                writtenOutside);
+
+            // special cases
+            if (!s_matrix.ContainsKey(key))
+            {
+                // Interesting case.  Due to things like constant analysis there can be regions that
+                // the compiler considers data not to flow in (because analysis proves that that
+                // path will never be taken).  However, the variable can still be read/written inside
+                // the region.  For purposes of extract method, we check for this case, and we
+                // pretend it's as if data flowed into the region.  
+                if (!dataFlowIn && (readInside || writtenInside))
+                {
+                    key = new Key(true, dataFlowOut, alwaysAssigned, variableDeclared, readInside, writtenInside, readOutside, writtenOutside);
+                }
+
+                // another interesting case (bug # 10875)
+                // basically, it can happen in malformed code where a variable is not properly assigned but used outside of the selection + unreachable code region
+                // for such cases, treat it like "MoveOut"
+                if (!dataFlowOut && !alwaysAssigned && variableDeclared && !writtenInside && readOutside)
+                {
+                    key = new Key(dataFlowIn, /*dataFlowOut*/ true, alwaysAssigned, variableDeclared, readInside, writtenInside, readOutside, writtenOutside);
+                }
+            }
+
+            // Contract.ThrowIfFalse(s_matrix.ContainsKey(key));
+
+            return s_matrix[key];
+        }
+
+        private static void BuildMatrix()
+        {
+            // meaning of each boolean values (total of 69 different cases)
+            // data flowin/data flow out/always assigned/variable declared/ read inside/written inside/read outside/written outside
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: false, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: false, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: false, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: false, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.MoveIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.SplitIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: false, writtenInside: false, readOutside: false, writtenOutside: true), VariableStyle.MoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: false, writtenInside: false, readOutside: true, writtenOutside: true), VariableStyle.MoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: false, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.None);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: false, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: false, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: false, readOutside: false, writtenOutside: false), VariableStyle.None);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: false, readOutside: false, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: false, readOutside: true, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.None);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: false, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.MoveIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: false, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.SplitIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: false, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.SplitIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: false, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.SplitIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.MoveIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.SplitIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.SplitIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.SplitIn);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: true, readInside: false, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.None);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: true, readInside: false, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: true, readInside: false, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: true, readInside: true, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.None);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: true, readInside: true, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: false, alwaysAssigned: true, variableDeclared: true, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.SplitOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: false, readInside: false, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.Ref);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: false, readInside: false, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.Ref);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.Ref);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.Ref);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: true, readInside: false, writtenInside: false, readOutside: true, writtenOutside: false), VariableStyle.NotUsed);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: true, readInside: false, writtenInside: false, readOutside: true, writtenOutside: true), VariableStyle.NotUsed);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: true, readInside: false, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: true, readInside: false, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: false, readOutside: true, writtenOutside: false), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: false, readOutside: true, writtenOutside: true), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: false, variableDeclared: true, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: true, variableDeclared: false, readInside: false, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.Out);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: true, variableDeclared: false, readInside: false, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.Out);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.Out);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.Out);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: true, variableDeclared: true, readInside: false, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: true, variableDeclared: true, readInside: false, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: true, variableDeclared: true, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: false, dataFlowOut: true, alwaysAssigned: true, variableDeclared: true, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.OutWithMoveOut);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: false, readOutside: false, writtenOutside: false), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: false, readOutside: false, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: false, readOutside: true, writtenOutside: false), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: false, readOutside: true, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: false, writtenOutside: false), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: false, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: false, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.InputOnly);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: true, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.OutWithErrorInput);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: true, alwaysAssigned: false, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.Ref);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: true, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: false), VariableStyle.OutWithErrorInput);
+            s_matrix.Add(new Key(dataFlowIn: true, dataFlowOut: true, alwaysAssigned: true, variableDeclared: false, readInside: true, writtenInside: true, readOutside: true, writtenOutside: true), VariableStyle.Ref);
+        }
+
+        private struct Key : IEquatable<Key>
+        {
+            public bool DataFlowIn { get; }
+            public bool DataFlowOut { get; }
+            public bool AlwaysAssigned { get; }
+            public bool VariableDeclared { get; }
+            public bool ReadInside { get; }
+            public bool WrittenInside { get; }
+            public bool ReadOutside { get; }
+            public bool WrittenOutside { get; }
+
+            public Key(
+                bool dataFlowIn,
+                bool dataFlowOut,
+                bool alwaysAssigned,
+                bool variableDeclared,
+                bool readInside,
+                bool writtenInside,
+                bool readOutside,
+                bool writtenOutside) :
+                this()
+            {
+                this.DataFlowIn = dataFlowIn;
+                this.DataFlowOut = dataFlowOut;
+                this.AlwaysAssigned = alwaysAssigned;
+                this.VariableDeclared = variableDeclared;
+                this.ReadInside = readInside;
+                this.WrittenInside = writtenInside;
+                this.ReadOutside = readOutside;
+                this.WrittenOutside = writtenOutside;
+            }
+
+            public bool Equals(Key key)
+            {
+                return this.DataFlowIn == key.DataFlowIn &&
+                       this.DataFlowOut == key.DataFlowOut &&
+                       this.AlwaysAssigned == key.AlwaysAssigned &&
+                       this.VariableDeclared == key.VariableDeclared &&
+                       this.ReadInside == key.ReadInside &&
+                       this.WrittenInside == key.WrittenInside &&
+                       this.ReadOutside == key.ReadOutside &&
+                       this.WrittenOutside == key.WrittenOutside;
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (obj is Key)
+                {
+                    return Equals((Key)obj);
+                }
+
+                return false;
+            }
+
+            public override int GetHashCode()
+            {
+                var hashCode = 0;
+
+                hashCode = this.DataFlowIn ? 1 << 7 | hashCode : hashCode;
+                hashCode = this.DataFlowOut ? 1 << 6 | hashCode : hashCode;
+                hashCode = this.AlwaysAssigned ? 1 << 5 | hashCode : hashCode;
+                hashCode = this.VariableDeclared ? 1 << 4 | hashCode : hashCode;
+                hashCode = this.ReadInside ? 1 << 3 | hashCode : hashCode;
+                hashCode = this.WrittenInside ? 1 << 2 | hashCode : hashCode;
+                hashCode = this.ReadOutside ? 1 << 1 | hashCode : hashCode;
+                hashCode = this.WrittenOutside ? 1 << 0 | hashCode : hashCode;
+
+                return hashCode;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodOptions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodOptions.cs
new file mode 100644
index 0000000000..9bb3dec0af
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodOptions.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.CodeAnalysis.Options;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    static class ExtractMethodOptions
+    {
+        public const string FeatureName = "ExtractMethod";
+
+        public static readonly PerLanguageOption<bool> AllowBestEffort = new PerLanguageOption<bool>(FeatureName, "Allow Best Effort", defaultValue: false);
+
+        public static readonly PerLanguageOption<bool> DontPutOutOrRefOnStruct = new PerLanguageOption<bool>(FeatureName, "Don't Put Out Or Ref On Strcut", defaultValue: true);
+
+        public static readonly PerLanguageOption<bool> AllowMovingDeclaration = new PerLanguageOption<bool>(FeatureName, "Allow Moving Declaration", defaultValue: false);
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodResult.cs
new file mode 100644
index 0000000000..16a49ae80d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodResult.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	class ExtractMethodResult
+	{
+		/// <summary>
+		/// True if the extract method operation succeeded.
+		/// </summary>
+		public bool Succeeded { get; }
+
+		/// <summary>
+		/// True if the extract method operation is possible if the original span is adjusted.
+		/// </summary>
+		public bool SucceededWithSuggestion { get; }
+
+		/// <summary>
+		/// The transformed document that was produced as a result of the extract method operation.
+		/// </summary>
+		public Document Document { get; }
+
+		/// <summary>
+		/// The reasons why the extract method operation did not succeed.
+		/// </summary>
+		public IEnumerable<string> Reasons { get; }
+
+		/// <summary>
+		/// the generated method node that contains the extracted code.
+		/// </summary>
+		public SyntaxNode MethodDeclarationNode { get; }
+
+		/// <summary>
+		/// The name token for the invocation node that replaces the extracted code.
+		/// </summary>
+		public SyntaxToken InvocationNameToken { get; }
+
+		public ExtractMethodResult(
+			OperationStatusFlag status,
+			IEnumerable<string> reasons,
+			Document document,
+			SyntaxToken invocationNameToken,
+			SyntaxNode methodDeclarationNode)
+		{
+			this.Status = status;
+
+			this.Succeeded = status.Succeeded() && !status.HasSuggestion();
+			this.SucceededWithSuggestion = status.Succeeded() && status.HasSuggestion();
+
+			this.Reasons = (reasons ?? SpecializedCollections.EmptyEnumerable<string>()).ToReadOnlyCollection();
+
+			this.Document = document;
+			this.InvocationNameToken = invocationNameToken;
+			this.MethodDeclarationNode = methodDeclarationNode;
+		}
+
+		/// <summary>
+		/// public status of result. more fine grained reason why it is failed. 
+		/// </summary>
+		public OperationStatusFlag Status { get; }
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodService.cs
new file mode 100644
index 0000000000..db42f1dc3a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ExtractMethodService.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	static class ExtractMethodService
+    {
+		readonly static CSharpExtractMethodService service = new CSharpExtractMethodService ();
+
+        public static Task<ExtractMethodResult> ExtractMethodAsync(Document document, TextSpan textSpan, OptionSet options = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return service.ExtractMethodAsync(document, textSpan, options, cancellationToken);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/FailedExtractMethodResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/FailedExtractMethodResult.cs
new file mode 100644
index 0000000000..eeeea1b54e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/FailedExtractMethodResult.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    class FailedExtractMethodResult : ExtractMethodResult
+    {
+        public FailedExtractMethodResult(OperationStatus status)
+            : base(status.Flag, status.Reasons, null, default(SyntaxToken), default(SyntaxNode))
+        {
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/IExtractMethodService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/IExtractMethodService.cs
new file mode 100644
index 0000000000..4422c18b45
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/IExtractMethodService.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    interface IExtractMethodService : ILanguageService
+    {
+        Task<ExtractMethodResult> ExtractMethodAsync(Document document, TextSpan textSpan, OptionSet options = null, CancellationToken cancellationToken = default(CancellationToken));
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ISyntaxTriviaService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ISyntaxTriviaService.cs
new file mode 100644
index 0000000000..f75f66ce20
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ISyntaxTriviaService.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	public enum TriviaLocation
+    {
+        BeforeBeginningOfSpan = 0,
+        AfterBeginningOfSpan,
+        BeforeEndOfSpan,
+        AfterEndOfSpan
+    }
+
+	public struct PreviousNextTokenPair
+    {
+        public SyntaxToken PreviousToken { get; set; }
+        public SyntaxToken NextToken { get; set; }
+    }
+
+	public struct LeadingTrailingTriviaPair
+    {
+        public IEnumerable<SyntaxTrivia> LeadingTrivia { get; set; }
+        public IEnumerable<SyntaxTrivia> TrailingTrivia { get; set; }
+    }
+
+	public delegate SyntaxToken AnnotationResolver(SyntaxNode root, TriviaLocation location, SyntaxAnnotation annotation);
+	public delegate IEnumerable<SyntaxTrivia> TriviaResolver(TriviaLocation location, PreviousNextTokenPair tokenPair, Dictionary<SyntaxToken, LeadingTrailingTriviaPair> triviaMap);
+
+    /// <summary>
+    /// contains information to restore trivia later on to the annotated tree
+    /// </summary>
+	public interface ITriviaSavedResult
+    {
+        /// <summary>
+        /// root node of the annotated tree.
+        /// </summary>
+        SyntaxNode Root { get; }
+
+        /// <summary>
+        /// restore saved trivia to given tree
+        /// </summary>
+        /// <param name="root">root node to the annotated tree</param>
+        /// <param name="annotationResolver">it provides a custom way of resolving annotations to retrieve right tokens to attach trivia</param>
+        /// <param name="triviaResolver">it provides a custom way of creating trivia list between two tokens</param>
+        /// <returns>root node to a trivia restored tree</returns>
+        SyntaxNode RestoreTrivia(SyntaxNode root, AnnotationResolver annotationResolver = null, TriviaResolver triviaResolver = null);
+    }
+
+    /// <summary>
+    /// syntax trivia related services
+    /// </summary>
+	public interface ISyntaxTriviaService : ILanguageService
+    {
+        /// <summary>
+        /// save trivia around span and let user restore trivia later
+        /// </summary>
+        /// <param name="root">root node of a tree</param>
+        /// <param name="textSpan">selection whose trivia around its edges will be saved</param>
+        /// <returns>object that holds onto enough information to restore trivia later</returns>
+        ITriviaSavedResult SaveTriviaAroundSelection(SyntaxNode root, TextSpan textSpan);
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/InsertionPoint.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/InsertionPoint.cs
new file mode 100644
index 0000000000..51bbb415e0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/InsertionPoint.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	class InsertionPoint
+    {
+        private readonly SyntaxAnnotation _annotation;
+        private readonly Lazy<SyntaxNode> _context;
+
+        public static async Task<InsertionPoint> CreateAsync(SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken)
+        {
+            var root = document.Root;
+            var annotation = new SyntaxAnnotation();
+            var newRoot = root.AddAnnotations(SpecializedCollections.SingletonEnumerable(Tuple.Create(node, annotation)));
+            return new InsertionPoint(await document.WithSyntaxRootAsync(newRoot, cancellationToken).ConfigureAwait(false), annotation);
+        }
+
+        private InsertionPoint(SemanticDocument document, SyntaxAnnotation annotation)
+        {
+            //Contract.ThrowIfNull(document);
+            //Contract.ThrowIfNull(annotation);
+
+            this.SemanticDocument = document;
+            _annotation = annotation;
+            _context = CreateLazyContextNode();
+        }
+
+        public SemanticDocument SemanticDocument { get; }
+
+        public SyntaxNode GetRoot()
+        {
+            return this.SemanticDocument.Root;
+        }
+
+        public SyntaxNode GetContext()
+        {
+            return _context.Value;
+        }
+
+        public InsertionPoint With(SemanticDocument document)
+        {
+            return new InsertionPoint(document, _annotation);
+        }
+
+        private Lazy<SyntaxNode> CreateLazyContextNode()
+        {
+            return new Lazy<SyntaxNode>(ComputeContextNode, isThreadSafe: true);
+        }
+
+        private SyntaxNode ComputeContextNode()
+        {
+            var root = this.SemanticDocument.Root;
+            return root.GetAnnotatedNodesAndTokens(_annotation).Single().AsNode();
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.Analyzer.SymbolMapBuilder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.Analyzer.SymbolMapBuilder.cs
new file mode 100644
index 0000000000..f0d01b4629
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.Analyzer.SymbolMapBuilder.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+        protected abstract partial class Analyzer
+        {
+            private class SymbolMapBuilder : SyntaxWalker
+            {
+                private readonly SemanticModel _semanticModel;
+                //private readonly ISyntaxFactsService _service;
+                private readonly TextSpan _span;
+                private readonly Dictionary<ISymbol, List<SyntaxToken>> _symbolMap;
+                private readonly CancellationToken _cancellationToken;
+
+                public static Dictionary<ISymbol, List<SyntaxToken>> Build(
+                  //  ISyntaxFactsService service,
+                    SemanticModel semanticModel,
+                    SyntaxNode root,
+                    TextSpan span,
+                    CancellationToken cancellationToken)
+                {
+                    //Contract.ThrowIfNull(semanticModel);
+//                    Contract.ThrowIfNull(service);
+                    //Contract.ThrowIfNull(root);
+
+                    var builder = new SymbolMapBuilder(/*service, */semanticModel, span, cancellationToken);
+                    builder.Visit(root);
+
+                    return builder._symbolMap;
+                }
+
+                private SymbolMapBuilder(
+                //    ISyntaxFactsService service,
+                    SemanticModel semanticModel,
+                    TextSpan span,
+                    CancellationToken cancellationToken)
+                    : base(SyntaxWalkerDepth.Token)
+                {
+                    _semanticModel = semanticModel;
+                //    _service = service;
+                    _span = span;
+                    _symbolMap = new Dictionary<ISymbol, List<SyntaxToken>>();
+                    _cancellationToken = cancellationToken;
+                }
+
+                protected override void VisitToken(SyntaxToken token)
+                {
+                    if (token.IsMissing ||
+                        token.Width() <= 0 ||
+						!token.IsIdentifier() ||
+                        !_span.Contains(token.Span) ||
+						token.Parent.IsNamedParameter())
+                    {
+                        return;
+                    }
+
+                    var symbolInfo = _semanticModel.GetSymbolInfo(token, _cancellationToken);
+                    foreach (var sym in symbolInfo.GetAllSymbols())
+                    {
+                        // add binding result to map
+                        var list = _symbolMap.GetOrAdd(sym, _ => new List<SyntaxToken>());
+                        list.Add(token);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.Analyzer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.Analyzer.cs
new file mode 100644
index 0000000000..c2826dae1d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.Analyzer.cs
@@ -0,0 +1,957 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+        protected abstract partial class Analyzer
+        {
+            private readonly SemanticDocument _semanticDocument;
+
+            protected readonly CancellationToken CancellationToken;
+            protected readonly SelectionResult SelectionResult;
+
+            protected Analyzer(SelectionResult selectionResult, CancellationToken cancellationToken)
+            {
+				//Contract.ThrowIfNull(selectionResult);
+
+                this.SelectionResult = selectionResult;
+                _semanticDocument = selectionResult.SemanticDocument;
+                this.CancellationToken = cancellationToken;
+            }
+
+            /// <summary>
+            /// convert text span to node range for the flow analysis API
+            /// </summary>
+            protected abstract Tuple<SyntaxNode, SyntaxNode> GetFlowAnalysisNodeRange();
+
+            /// <summary>
+            /// check whether selection contains return statement or not
+            /// </summary>
+            protected abstract bool ContainsReturnStatementInSelectedCode(IEnumerable<SyntaxNode> jumpOutOfRegionStatements);
+
+            /// <summary>
+            /// create VariableInfo type
+            /// </summary>
+            protected abstract VariableInfo CreateFromSymbol(Compilation compilation, ISymbol symbol, ITypeSymbol type, VariableStyle variableStyle, bool variableDeclared);
+
+            /// <summary>
+            /// among variables that will be used as parameters at the extracted method, check whether one of the parameter can be used as return
+            /// </summary>
+            protected abstract int GetIndexOfVariableInfoToUseAsReturnValue(IList<VariableInfo> variableInfo);
+
+            /// <summary>
+            /// get type of the range variable symbol
+            /// </summary>
+            protected abstract ITypeSymbol GetRangeVariableType(SemanticModel model, IRangeVariableSymbol symbol);
+
+            /// <summary>
+            /// check whether the selection is at the placed where read-only field is allowed to be extracted out
+            /// </summary>
+            /// <returns></returns>
+            protected abstract bool ReadOnlyFieldAllowed();
+
+            public async Task<AnalyzerResult> AnalyzeAsync()
+            {
+                // do data flow analysis
+                var model = _semanticDocument.SemanticModel;
+                var dataFlowAnalysisData = GetDataFlowAnalysisData(model);
+
+                // build symbol map for the identifiers used inside of the selection
+                var symbolMap = GetSymbolMap(model);
+
+                // gather initial local or parameter variable info
+                var variableInfoMap = GenerateVariableInfoMap(model, dataFlowAnalysisData, symbolMap);
+
+                // check whether instance member is used inside of the selection
+                var instanceMemberIsUsed = IsInstanceMemberUsedInSelectedCode(dataFlowAnalysisData);
+
+                // check whether end of selection is reachable
+                var endOfSelectionReachable = IsEndOfSelectionReachable(model);
+
+                // collects various variable informations
+                // extracted code contains return value
+                var isInExpressionOrHasReturnStatement = IsInExpressionOrHasReturnStatement(model);
+                var signatureTuple = GetSignatureInformation(model, dataFlowAnalysisData, variableInfoMap, isInExpressionOrHasReturnStatement);
+
+                var parameters = signatureTuple.Item1;
+                var returnType = signatureTuple.Item2;
+                var variableToUseAsReturnValue = signatureTuple.Item3;
+                var unsafeAddressTakenUsed = signatureTuple.Item4;
+
+                var returnTypeTuple = AdjustReturnType(model, returnType);
+
+                returnType = returnTypeTuple.Item1;
+                bool returnTypeHasAnonymousType = returnTypeTuple.Item2;
+                bool awaitTaskReturn = returnTypeTuple.Item3;
+
+                // create new document
+                var newDocument = await CreateDocumentWithAnnotationsAsync(_semanticDocument, parameters, CancellationToken).ConfigureAwait(false);
+
+                // collect method type variable used in selected code
+                var sortedMap = new SortedDictionary<int, ITypeParameterSymbol>();
+                var typeParametersInConstraintList = GetMethodTypeParametersInConstraintList(model, variableInfoMap, symbolMap, sortedMap);
+                var typeParametersInDeclaration = GetMethodTypeParametersInDeclaration(returnType, sortedMap);
+
+                // check various error cases
+                var operationStatus = GetOperationStatus(model, symbolMap, parameters, unsafeAddressTakenUsed, returnTypeHasAnonymousType);
+
+                return new AnalyzerResult(
+                        newDocument,
+                        typeParametersInDeclaration, typeParametersInConstraintList,
+                        parameters, variableToUseAsReturnValue, returnType, awaitTaskReturn,
+                        instanceMemberIsUsed, endOfSelectionReachable, operationStatus);
+            }
+
+            private Tuple<ITypeSymbol, bool, bool> AdjustReturnType(SemanticModel model, ITypeSymbol returnType)
+            {
+                // check whether return type contains anonymous type and if it does, fix it up by making it object
+                var returnTypeHasAnonymousType = returnType.ContainsAnonymousType();
+				returnType = returnTypeHasAnonymousType ? returnType.RemoveAnonymousTypes(model.Compilation) : returnType;
+
+                // if selection contains await which is not under async lambda or anonymous delegate,
+                // change return type to be wrapped in Task
+                var shouldPutAsyncModifier = this.SelectionResult.ShouldPutAsyncModifier();
+                if (shouldPutAsyncModifier)
+                {
+                    bool awaitTaskReturn;
+                    WrapReturnTypeInTask(model, ref returnType, out awaitTaskReturn);
+
+                    return Tuple.Create(returnType, returnTypeHasAnonymousType, awaitTaskReturn);
+                }
+
+                // unwrap task if needed
+                UnwrapTaskIfNeeded(model, ref returnType);
+                return Tuple.Create(returnType, returnTypeHasAnonymousType, false);
+            }
+
+            private void UnwrapTaskIfNeeded(SemanticModel model, ref ITypeSymbol returnType)
+            {
+                // nothing to unwrap
+                if (!this.SelectionResult.ContainingScopeHasAsyncKeyword() ||
+                    !this.ContainsReturnStatementInSelectedCode(model))
+                {
+                    return;
+                }
+
+                var originalDefinition = returnType.OriginalDefinition;
+
+                // see whether it needs to be unwrapped
+                var taskType = model.Compilation.TaskType();
+                if (originalDefinition.Equals(taskType))
+                {
+                    returnType = model.Compilation.GetSpecialType(SpecialType.System_Void);
+                    return;
+                }
+
+                var genericTaskType = model.Compilation.TaskOfTType();
+                if (originalDefinition.Equals(genericTaskType))
+                {
+                    returnType = ((INamedTypeSymbol)returnType).TypeArguments[0];
+                    return;
+                }
+
+                // nothing to unwrap
+                return;
+            }
+
+            private void WrapReturnTypeInTask(SemanticModel model, ref ITypeSymbol returnType, out bool awaitTaskReturn)
+            {
+                awaitTaskReturn = false;
+
+                var genericTaskType = model.Compilation.TaskOfTType();
+                var taskType = model.Compilation.TaskType();
+
+                if (returnType.Equals(model.Compilation.GetSpecialType(SpecialType.System_Void)))
+                {
+                    // convert void to Task type
+                    awaitTaskReturn = true;
+                    returnType = taskType;
+                    return;
+                }
+
+                if (this.SelectionResult.SelectionInExpression)
+                {
+                    returnType = genericTaskType.Construct(returnType);
+                    return;
+                }
+
+                if (ContainsReturnStatementInSelectedCode(model))
+                {
+                    // check whether we will use return type as it is or not.
+                    awaitTaskReturn = returnType.Equals(taskType);
+                    return;
+                }
+
+                // okay, wrap the return type in Task<T>
+                returnType = genericTaskType.Construct(returnType);
+            }
+
+            private Tuple<IList<VariableInfo>, ITypeSymbol, VariableInfo, bool> GetSignatureInformation(
+                SemanticModel model,
+                DataFlowAnalysis dataFlowAnalysisData,
+                IDictionary<ISymbol, VariableInfo> variableInfoMap,
+                bool isInExpressionOrHasReturnStatement)
+            {
+                if (isInExpressionOrHasReturnStatement)
+                {
+                    // check whether current selection contains return statement
+                    var parameters = GetMethodParameters(variableInfoMap.Values);
+                    var returnType = this.SelectionResult.GetContainingScopeType();
+                    if (returnType == null)
+                    {
+                        returnType = model.Compilation.GetSpecialType(SpecialType.System_Object);
+                    }
+
+                    var unsafeAddressTakenUsed = ContainsVariableUnsafeAddressTaken(dataFlowAnalysisData, variableInfoMap.Keys);
+                    return Tuple.Create(parameters, returnType, default(VariableInfo), unsafeAddressTakenUsed);
+                }
+                else
+                {
+                    // no return statement
+                    var parameters = MarkVariableInfoToUseAsReturnValueIfPossible(GetMethodParameters(variableInfoMap.Values));
+                    var variableToUseAsReturnValue = parameters.FirstOrDefault(v => v.UseAsReturnValue);
+                    var returnType = default(ITypeSymbol);
+                    if (variableToUseAsReturnValue != null)
+                    {
+                        returnType = variableToUseAsReturnValue.GetVariableType(_semanticDocument);
+                    }
+                    else
+                    {
+                        returnType = model.Compilation.GetSpecialType(SpecialType.System_Void);
+                    }
+
+                    var unsafeAddressTakenUsed = ContainsVariableUnsafeAddressTaken(dataFlowAnalysisData, variableInfoMap.Keys);
+                    return Tuple.Create(parameters, returnType, variableToUseAsReturnValue, unsafeAddressTakenUsed);
+                }
+            }
+
+            private bool IsInExpressionOrHasReturnStatement(SemanticModel model)
+            {
+                var isInExpressionOrHasReturnStatement = this.SelectionResult.SelectionInExpression;
+                if (!isInExpressionOrHasReturnStatement)
+                {
+                    var containsReturnStatement = ContainsReturnStatementInSelectedCode(model);
+                    isInExpressionOrHasReturnStatement |= containsReturnStatement;
+                }
+
+                return isInExpressionOrHasReturnStatement;
+            }
+
+            private OperationStatus GetOperationStatus(
+                SemanticModel model, Dictionary<ISymbol, List<SyntaxToken>> symbolMap, IList<VariableInfo> parameters,
+                bool unsafeAddressTakenUsed, bool returnTypeHasAnonymousType)
+            {
+                var readonlyFieldStatus = CheckReadOnlyFields(model, symbolMap);
+
+                var namesWithAnonymousTypes = parameters.Where(v => v.OriginalTypeHadAnonymousTypeOrDelegate).Select(v => v.Name ?? string.Empty);
+                if (returnTypeHasAnonymousType)
+                {
+                    namesWithAnonymousTypes = namesWithAnonymousTypes.Concat("return type");
+                }
+
+                var anonymousTypeStatus = namesWithAnonymousTypes.Any() ?
+                    new OperationStatus(OperationStatusFlag.BestEffort, string.Format("FeaturesResources.ContainsAnonymousType", string.Join(", ", namesWithAnonymousTypes))) :
+                    OperationStatus.Succeeded;
+
+                var unsafeAddressStatus = unsafeAddressTakenUsed ? OperationStatus.UnsafeAddressTaken : OperationStatus.Succeeded;
+
+                var asyncRefOutParameterStatue = CheckAsyncMethodRefOutParameters(parameters);
+
+                return readonlyFieldStatus.With(anonymousTypeStatus).With(unsafeAddressStatus).With(asyncRefOutParameterStatue);
+            }
+
+            private OperationStatus CheckAsyncMethodRefOutParameters(IList<VariableInfo> parameters)
+            {
+                if (this.SelectionResult.ShouldPutAsyncModifier())
+                {
+                    var names = parameters.Where(v => !v.UseAsReturnValue && (v.ParameterModifier == ParameterBehavior.Out || v.ParameterModifier == ParameterBehavior.Ref))
+                                          .Select(p => p.Name ?? string.Empty);
+
+                    if (names.Any())
+                    {
+                        return new OperationStatus(OperationStatusFlag.BestEffort, string.Format("FeaturesResources.AsyncMethodWithRefOutParameters", string.Join(", ", names)));
+                    }
+                }
+
+                return OperationStatus.Succeeded;
+            }
+
+            private Task<SemanticDocument> CreateDocumentWithAnnotationsAsync(SemanticDocument document, IList<VariableInfo> variables, CancellationToken cancellationToken)
+            {
+                var annotations = new List<Tuple<SyntaxToken, SyntaxAnnotation>>(variables.Count);
+                variables.Do(v => v.AddIdentifierTokenAnnotationPair(annotations, cancellationToken));
+
+                if (annotations.Count == 0)
+                {
+                    return Task.FromResult(document);
+                }
+
+                return document.WithSyntaxRootAsync(document.Root.AddAnnotations(annotations), cancellationToken);
+            }
+
+            private Dictionary<ISymbol, List<SyntaxToken>> GetSymbolMap(SemanticModel model)
+            {
+                var context = this.SelectionResult.GetContainingScope();
+                var symbolMap = SymbolMapBuilder.Build(model, context, this.SelectionResult.FinalSpan, CancellationToken);
+
+                return symbolMap;
+            }
+
+            private bool ContainsVariableUnsafeAddressTaken(DataFlowAnalysis dataFlowAnalysisData, IEnumerable<ISymbol> symbols)
+            {
+                // check whether the selection contains "&" over a symbol exist
+                var map = new HashSet<ISymbol>(dataFlowAnalysisData.UnsafeAddressTaken);
+                return symbols.Any(s => map.Contains(s));
+            }
+
+            private DataFlowAnalysis GetDataFlowAnalysisData(SemanticModel model)
+            {
+                if (this.SelectionResult.SelectionInExpression)
+                {
+                    return model.AnalyzeDataFlow(this.SelectionResult.GetContainingScope());
+                }
+
+                var pair = GetFlowAnalysisNodeRange();
+                return model.AnalyzeDataFlow(pair.Item1, pair.Item2);
+            }
+
+            private bool IsEndOfSelectionReachable(SemanticModel model)
+            {
+                if (this.SelectionResult.SelectionInExpression)
+                {
+                    return true;
+                }
+
+                var pair = GetFlowAnalysisNodeRange();
+                var analysis = model.AnalyzeControlFlow(pair.Item1, pair.Item2);
+                return analysis.EndPointIsReachable;
+            }
+
+            private IList<VariableInfo> MarkVariableInfoToUseAsReturnValueIfPossible(IList<VariableInfo> variableInfo)
+            {
+                var variableToUseAsReturnValueIndex = GetIndexOfVariableInfoToUseAsReturnValue(variableInfo);
+                if (variableToUseAsReturnValueIndex >= 0)
+                {
+                    variableInfo[variableToUseAsReturnValueIndex] = VariableInfo.CreateReturnValue(variableInfo[variableToUseAsReturnValueIndex]);
+                }
+
+                return variableInfo;
+            }
+
+            private IList<VariableInfo> GetMethodParameters(ICollection<VariableInfo> variableInfo)
+            {
+                var list = new List<VariableInfo>(variableInfo);
+
+                list.Sort(VariableInfo.Compare);
+
+                return list;
+            }
+
+            private IDictionary<ISymbol, VariableInfo> GenerateVariableInfoMap(
+                SemanticModel model, DataFlowAnalysis dataFlowAnalysisData, Dictionary<ISymbol, List<SyntaxToken>> symbolMap)
+            {
+//                Contract.ThrowIfNull(model);
+//                Contract.ThrowIfNull(dataFlowAnalysisData);
+
+                var variableInfoMap = new Dictionary<ISymbol, VariableInfo>();
+
+                // create map of each data
+                var capturedMap = new HashSet<ISymbol>(dataFlowAnalysisData.Captured);
+                var dataFlowInMap = new HashSet<ISymbol>(dataFlowAnalysisData.DataFlowsIn);
+                var dataFlowOutMap = new HashSet<ISymbol>(dataFlowAnalysisData.DataFlowsOut);
+                var alwaysAssignedMap = new HashSet<ISymbol>(dataFlowAnalysisData.AlwaysAssigned);
+                var variableDeclaredMap = new HashSet<ISymbol>(dataFlowAnalysisData.VariablesDeclared);
+                var readInsideMap = new HashSet<ISymbol>(dataFlowAnalysisData.ReadInside);
+                var writtenInsideMap = new HashSet<ISymbol>(dataFlowAnalysisData.WrittenInside);
+                var readOutsideMap = new HashSet<ISymbol>(dataFlowAnalysisData.ReadOutside);
+                var writtenOutsideMap = new HashSet<ISymbol>(dataFlowAnalysisData.WrittenOutside);
+                var unsafeAddressTakenMap = new HashSet<ISymbol>(dataFlowAnalysisData.UnsafeAddressTaken);
+
+                // gather all meaningful symbols for the span.
+                var candidates = new HashSet<ISymbol>(readInsideMap);
+                candidates.UnionWith(writtenInsideMap);
+                candidates.UnionWith(variableDeclaredMap);
+
+                foreach (var symbol in candidates)
+                {
+                    if (IsThisParameter(symbol) ||
+                        IsInteractiveSynthesizedParameter(symbol))
+                    {
+                        continue;
+                    }
+
+                    var captured = capturedMap.Contains(symbol);
+                    var dataFlowIn = dataFlowInMap.Contains(symbol);
+                    var dataFlowOut = dataFlowOutMap.Contains(symbol);
+                    var alwaysAssigned = alwaysAssignedMap.Contains(symbol);
+                    var variableDeclared = variableDeclaredMap.Contains(symbol);
+                    var readInside = readInsideMap.Contains(symbol);
+                    var writtenInside = writtenInsideMap.Contains(symbol);
+                    var readOutside = readOutsideMap.Contains(symbol);
+                    var writtenOutside = writtenOutsideMap.Contains(symbol);
+                    var unsafeAddressTaken = unsafeAddressTakenMap.Contains(symbol);
+
+                    // if it is static local, make sure it is not defined inside
+                    if (symbol.IsStatic)
+                    {
+                        dataFlowIn = dataFlowIn && !variableDeclared;
+                    }
+
+                    // make sure readoutside is true when dataflowout is true (bug #3790)
+                    // when a variable is only used inside of loop, a situation where dataflowout == true and readOutside == false
+                    // can happen. but for extract method's point of view, this is not an information that would affect output.
+                    // so, here we adjust flags to follow predefined assumption.
+                    readOutside = readOutside || dataFlowOut;
+
+                    // make sure data flow out is true when declared inside/written inside/read outside/not written outside are true (bug #6277)
+                    dataFlowOut = dataFlowOut || (variableDeclared && writtenInside && readOutside && !writtenOutside);
+
+                    // variable that is declared inside but never referenced outside. just ignore it and move to next one.
+                    if (variableDeclared && !dataFlowOut && !readOutside && !writtenOutside)
+                    {
+                        continue;
+                    }
+
+                    // parameter defined inside of the selection (such as lambda parameter) will be ignored (bug # 10964)
+                    if (symbol is IParameterSymbol && variableDeclared)
+                    {
+                        continue;
+                    }
+
+                    var type = GetSymbolType(model, symbol);
+                    if (type == null)
+                    {
+                        continue;
+                    }
+
+                    var variableStyle = GetVariableStyle(symbolMap, symbol, model, type,
+                        captured, dataFlowIn, dataFlowOut, alwaysAssigned, variableDeclared,
+                        readInside, writtenInside, readOutside, writtenOutside, unsafeAddressTaken);
+
+                    AddVariableToMap(variableInfoMap, symbol, CreateFromSymbol(model.Compilation, symbol, type, variableStyle, variableDeclared));
+                }
+
+                return variableInfoMap;
+            }
+
+            private void AddVariableToMap(IDictionary<ISymbol, VariableInfo> variableInfoMap, ISymbol localOrParameter, VariableInfo variableInfo)
+            {
+                variableInfoMap.Add(localOrParameter, variableInfo);
+            }
+
+            private VariableStyle GetVariableStyle(
+                Dictionary<ISymbol, List<SyntaxToken>> symbolMap,
+                ISymbol symbol,
+                SemanticModel model,
+                ITypeSymbol type,
+                bool captured,
+                bool dataFlowIn,
+                bool dataFlowOut,
+                bool alwaysAssigned,
+                bool variableDeclared,
+                bool readInside,
+                bool writtenInside,
+                bool readOutside,
+                bool writtenOutside,
+                bool unsafeAddressTaken)
+            {
+//                Contract.ThrowIfNull(model);
+//                Contract.ThrowIfNull(type);
+
+                var style = ExtractMethodMatrix.GetVariableStyle(captured, dataFlowIn, dataFlowOut, alwaysAssigned, variableDeclared,
+                                                                 readInside, writtenInside, readOutside, writtenOutside, unsafeAddressTaken);
+
+                if (SelectionContainsOnlyIdentifierWithSameType(type))
+                {
+                    return style;
+                }
+
+                if (UserDefinedValueType(model.Compilation, type) && !this.SelectionResult.DontPutOutOrRefOnStruct)
+                {
+                    return AlwaysReturn(style);
+                }
+
+                // for captured variable, never try to move the decl into extracted method
+                if (captured && (style == VariableStyle.MoveIn))
+                {
+                    return VariableStyle.Out;
+                }
+
+                // check special value type cases
+                if (type.IsValueType && !IsWrittenInsideForFrameworkValueType(symbolMap, model, symbol, writtenInside))
+                {
+                    return style;
+                }
+
+                // don't blindly always return. make sure there is a write inside of the selection
+                if (this.SelectionResult.AllowMovingDeclaration || !writtenInside)
+                {
+                    return style;
+                }
+
+                return AlwaysReturn(style);
+            }
+
+            private bool IsWrittenInsideForFrameworkValueType(
+                Dictionary<ISymbol, List<SyntaxToken>> symbolMap, SemanticModel model, ISymbol symbol, bool writtenInside)
+            {
+                List<SyntaxToken> tokens;
+                if (!symbolMap.TryGetValue(symbol, out tokens))
+                {
+                    return writtenInside;
+                }
+
+                // this relies on the fact that our IsWrittenTo only cares about syntax to figure out whether
+                // something is written to or not. but not semantic. 
+                // we probably need to move the API to syntaxFact service not semanticFact.
+                //
+                // if one wants to get result that also considers semantic, he should use data control flow analysis API.
+				return tokens.Any(t => t.Parent is ExpressionSyntax && ((ExpressionSyntax)t.Parent).IsWrittenTo());
+            }
+
+            private bool SelectionContainsOnlyIdentifierWithSameType(ITypeSymbol type)
+            {
+                if (!this.SelectionResult.SelectionInExpression)
+                {
+                    return false;
+                }
+
+                var firstToken = this.SelectionResult.GetFirstTokenInSelection();
+                var lastToken = this.SelectionResult.GetLastTokenInSelection();
+
+                if (!firstToken.Equals(lastToken))
+                {
+                    return false;
+                }
+
+                return type.Equals(this.SelectionResult.GetContainingScopeType());
+            }
+
+            private bool UserDefinedValueType(Compilation compilation, ITypeSymbol type)
+            {
+                if (!type.IsValueType || type.IsPointerType() || type.IsEnumType())
+                {
+                    return false;
+                }
+
+                return type.OriginalDefinition.SpecialType == SpecialType.None && !WellKnownFrameworkValueType(compilation, type);
+            }
+
+            private bool WellKnownFrameworkValueType(Compilation compilation, ITypeSymbol type)
+            {
+                if (!type.IsValueType)
+                {
+                    return false;
+                }
+
+                var cancellationTokenType = compilation.GetTypeByMetadataName("System.Threading.CancellationToken");
+                if (cancellationTokenType != null && cancellationTokenType.Equals(type))
+                {
+                    return true;
+                }
+
+                return false;
+            }
+
+            private ITypeSymbol GetSymbolType(SemanticModel model, ISymbol symbol)
+            {
+                var local = symbol as ILocalSymbol;
+                if (local != null)
+                {
+                    return local.Type;
+                }
+
+                var parameter = symbol as IParameterSymbol;
+                if (parameter != null)
+                {
+                    return parameter.Type;
+                }
+
+                var rangeVariable = symbol as IRangeVariableSymbol;
+                if (rangeVariable != null)
+                {
+                    return GetRangeVariableType(model, rangeVariable);
+                }
+
+                return null;
+            }
+
+            protected VariableStyle AlwaysReturn(VariableStyle style)
+            {
+                if (style == VariableStyle.InputOnly)
+                {
+                    return VariableStyle.Ref;
+                }
+
+                if (style == VariableStyle.MoveIn)
+                {
+                    return VariableStyle.Out;
+                }
+
+                if (style == VariableStyle.SplitIn)
+                {
+                    return VariableStyle.Out;
+                }
+
+                if (style == VariableStyle.SplitOut)
+                {
+                    return VariableStyle.OutWithMoveOut;
+                }
+
+                return style;
+            }
+
+            private bool IsParameterUsedOutside(ISymbol localOrParameter)
+            {
+                var parameter = localOrParameter as IParameterSymbol;
+                if (parameter == null)
+                {
+                    return false;
+                }
+
+                return parameter.RefKind != RefKind.None;
+            }
+
+            private bool IsParameterAssigned(ISymbol localOrParameter)
+            {
+                // hack for now.
+                var parameter = localOrParameter as IParameterSymbol;
+                if (parameter == null)
+                {
+                    return false;
+                }
+
+                return parameter.RefKind != RefKind.Out;
+            }
+
+            private bool IsThisParameter(ISymbol localOrParameter)
+            {
+                var parameter = localOrParameter as IParameterSymbol;
+                if (parameter == null)
+                {
+                    return false;
+                }
+
+                return parameter.IsThis;
+            }
+
+            private bool IsInteractiveSynthesizedParameter(ISymbol localOrParameter)
+            {
+                var parameter = localOrParameter as IParameterSymbol;
+                if (parameter == null)
+                {
+                    return false;
+                }
+
+                return parameter.IsImplicitlyDeclared &&
+                       parameter.ContainingAssembly.IsInteractive &&
+                       parameter.ContainingSymbol != null &&
+                       parameter.ContainingSymbol.ContainingType != null &&
+                       parameter.ContainingSymbol.ContainingType.IsScriptClass;
+            }
+
+            private bool ContainsReturnStatementInSelectedCode(SemanticModel model)
+            {
+                //Contract.ThrowIfTrue(this.SelectionResult.SelectionInExpression);
+
+                var pair = GetFlowAnalysisNodeRange();
+                var controlFlowAnalysisData = model.AnalyzeControlFlow(pair.Item1, pair.Item2);
+
+                return ContainsReturnStatementInSelectedCode(controlFlowAnalysisData.ExitPoints);
+            }
+
+            private void AddTypeParametersToMap(IEnumerable<ITypeParameterSymbol> typeParameters, IDictionary<int, ITypeParameterSymbol> sortedMap)
+            {
+                foreach (var typeParameter in typeParameters)
+                {
+                    AddTypeParameterToMap(typeParameter, sortedMap);
+                }
+            }
+
+            private void AddTypeParameterToMap(ITypeParameterSymbol typeParameter, IDictionary<int, ITypeParameterSymbol> sortedMap)
+            {
+                if (typeParameter == null ||
+                    typeParameter.DeclaringMethod == null ||
+                    sortedMap.ContainsKey(typeParameter.Ordinal))
+                {
+                    return;
+                }
+
+                sortedMap[typeParameter.Ordinal] = typeParameter;
+            }
+
+            private void AppendMethodTypeVariableFromDataFlowAnalysis(
+                SemanticModel model,
+                IDictionary<ISymbol, VariableInfo> variableInfoMap,
+                IDictionary<int, ITypeParameterSymbol> sortedMap)
+            {
+                foreach (var symbol in variableInfoMap.Keys)
+                {
+                    var parameter = symbol as IParameterSymbol;
+                    if (parameter != null)
+                    {
+                        AddTypeParametersToMap(TypeParameterCollector.Collect(parameter.Type), sortedMap);
+                        continue;
+                    }
+
+                    var local = symbol as ILocalSymbol;
+                    if (local != null)
+                    {
+                        AddTypeParametersToMap(TypeParameterCollector.Collect(local.Type), sortedMap);
+                        continue;
+                    }
+
+                    var rangeVariable = symbol as IRangeVariableSymbol;
+                    if (rangeVariable != null)
+                    {
+                        var type = GetRangeVariableType(model, rangeVariable);
+                        AddTypeParametersToMap(TypeParameterCollector.Collect(type), sortedMap);
+                        continue;
+                    }
+
+                    //Contract.Fail(FeaturesResources.UnknownSymbolKind);
+                }
+            }
+
+            private void AppendMethodTypeParameterFromConstraint(SortedDictionary<int, ITypeParameterSymbol> sortedMap)
+            {
+                var typeParametersInConstraint = new List<ITypeParameterSymbol>();
+
+                // collect all type parameter appears in constraint
+                foreach (var typeParameter in sortedMap.Values)
+                {
+                    var constraintTypes = typeParameter.ConstraintTypes;
+                    if (constraintTypes.IsDefaultOrEmpty)
+                    {
+                        continue;
+                    }
+
+                    foreach (var type in constraintTypes)
+                    {
+                        // constraint itself is type parameter
+                        typeParametersInConstraint.AddRange(TypeParameterCollector.Collect(type));
+                    }
+                }
+
+                // pick up only valid type parameter and add them to the map
+                foreach (var typeParameter in typeParametersInConstraint)
+                {
+                    AddTypeParameterToMap(typeParameter, sortedMap);
+                }
+            }
+
+            private void AppendMethodTypeParameterUsedDirectly(IDictionary<ISymbol, List<SyntaxToken>> symbolMap, IDictionary<int, ITypeParameterSymbol> sortedMap)
+            {
+                foreach (var pair in symbolMap.Where(p => p.Key.Kind == SymbolKind.TypeParameter))
+                {
+                    var typeParameter = pair.Key as ITypeParameterSymbol;
+                    if (typeParameter.DeclaringMethod == null ||
+                        sortedMap.ContainsKey(typeParameter.Ordinal))
+                    {
+                        continue;
+                    }
+
+                    sortedMap[typeParameter.Ordinal] = typeParameter;
+                }
+            }
+
+            private IEnumerable<ITypeParameterSymbol> GetMethodTypeParametersInConstraintList(
+                SemanticModel model,
+                IDictionary<ISymbol, VariableInfo> variableInfoMap,
+                IDictionary<ISymbol, List<SyntaxToken>> symbolMap,
+                SortedDictionary<int, ITypeParameterSymbol> sortedMap)
+            {
+                // find starting points
+                AppendMethodTypeVariableFromDataFlowAnalysis(model, variableInfoMap, sortedMap);
+                AppendMethodTypeParameterUsedDirectly(symbolMap, sortedMap);
+
+                // recursively dive into constraints to find all constraints needed
+                AppendTypeParametersInConstraintsUsedByConstructedTypeWithItsOwnConstraints(sortedMap);
+
+                return sortedMap.Values.ToList();
+            }
+
+            private void AppendTypeParametersInConstraintsUsedByConstructedTypeWithItsOwnConstraints(SortedDictionary<int, ITypeParameterSymbol> sortedMap)
+            {
+                var visited = new HashSet<ITypeSymbol>();
+                var candidates = SpecializedCollections.EmptyEnumerable<ITypeParameterSymbol>();
+
+                // collect all type parameter appears in constraint
+                foreach (var typeParameter in sortedMap.Values)
+                {
+                    var constraintTypes = typeParameter.ConstraintTypes;
+                    if (constraintTypes.IsDefaultOrEmpty)
+                    {
+                        continue;
+                    }
+
+                    foreach (var type in constraintTypes)
+                    {
+                        candidates = candidates.Concat(AppendTypeParametersInConstraintsUsedByConstructedTypeWithItsOwnConstraints(type, visited));
+                    }
+                }
+
+                // pick up only valid type parameter and add them to the map
+                foreach (var typeParameter in candidates)
+                {
+                    AddTypeParameterToMap(typeParameter, sortedMap);
+                }
+            }
+
+            private IEnumerable<ITypeParameterSymbol> AppendTypeParametersInConstraintsUsedByConstructedTypeWithItsOwnConstraints(
+                ITypeSymbol type, HashSet<ITypeSymbol> visited)
+            {
+                if (visited.Contains(type))
+                {
+                    return SpecializedCollections.EmptyEnumerable<ITypeParameterSymbol>();
+                }
+
+                visited.Add(type);
+
+                if (type.OriginalDefinition.Equals(type))
+                {
+                    return SpecializedCollections.EmptyEnumerable<ITypeParameterSymbol>();
+                }
+
+                var constructedType = type as INamedTypeSymbol;
+                if (constructedType == null)
+                {
+                    return SpecializedCollections.EmptyEnumerable<ITypeParameterSymbol>();
+                }
+
+                var parameters = constructedType.GetAllTypeParameters().ToList();
+                var arguments = constructedType.GetAllTypeArguments().ToList();
+
+                //Contract.ThrowIfFalse(parameters.Count == arguments.Count);
+
+                var typeParameters = new List<ITypeParameterSymbol>();
+                for (int i = 0; i < parameters.Count; i++)
+                {
+                    var parameter = parameters[i];
+
+                    var argument = arguments[i] as ITypeParameterSymbol;
+                    if (argument != null)
+                    {
+                        // no constraint, nothing to do
+                        if (!parameter.HasConstructorConstraint &&
+                            !parameter.HasReferenceTypeConstraint &&
+                            !parameter.HasValueTypeConstraint &&
+                            parameter.ConstraintTypes.IsDefaultOrEmpty)
+                        {
+                            continue;
+                        }
+
+                        typeParameters.Add(argument);
+                        continue;
+                    }
+
+                    var candidate = arguments[i] as INamedTypeSymbol;
+                    if (candidate == null)
+                    {
+                        continue;
+                    }
+
+                    typeParameters.AddRange(AppendTypeParametersInConstraintsUsedByConstructedTypeWithItsOwnConstraints(candidate, visited));
+                }
+
+                return typeParameters;
+            }
+
+            private IEnumerable<ITypeParameterSymbol> GetMethodTypeParametersInDeclaration(ITypeSymbol returnType, SortedDictionary<int, ITypeParameterSymbol> sortedMap)
+            {
+                // add return type to the map
+                AddTypeParametersToMap(TypeParameterCollector.Collect(returnType), sortedMap);
+
+                AppendMethodTypeParameterFromConstraint(sortedMap);
+
+                return sortedMap.Values.ToList();
+            }
+
+            private OperationStatus CheckReadOnlyFields(SemanticModel semanticModel, Dictionary<ISymbol, List<SyntaxToken>> symbolMap)
+            {
+                if (ReadOnlyFieldAllowed())
+                {
+                    return OperationStatus.Succeeded;
+                }
+
+                List<string> names = null;
+                
+                foreach (var pair in symbolMap.Where(p => p.Key.Kind == SymbolKind.Field))
+                {
+                    var field = (IFieldSymbol)pair.Key;
+                    if (!field.IsReadOnly)
+                    {
+                        continue;
+                    }
+
+                    var tokens = pair.Value;
+					if (tokens.All(t => !((ExpressionSyntax)t.Parent).IsWrittenTo()))
+                    {
+                        continue;
+                    }
+
+                    names = names ?? new List<string>();
+                    names.Add(field.Name ?? string.Empty);
+                }
+
+                if (names != null)
+                {
+                    return new OperationStatus(OperationStatusFlag.BestEffort, string.Format("FeaturesResources.AssingingToReadonlyFields", string.Join(", ", names)));
+                }
+
+                return OperationStatus.Succeeded;
+            }
+
+            private bool IsInstanceMemberUsedInSelectedCode(DataFlowAnalysis dataFlowAnalysisData)
+            {
+                //Contract.ThrowIfNull(dataFlowAnalysisData);
+
+                // "this" can be used as a lvalue in a struct, check WrittenInside as well
+                return dataFlowAnalysisData.ReadInside.Any(s => IsThisParameter(s)) ||
+                       dataFlowAnalysisData.WrittenInside.Any(s => IsThisParameter(s));
+            }
+
+            protected VariableInfo CreateFromSymbolCommon<T>(
+                Compilation compilation,
+                ISymbol symbol,
+                ITypeSymbol type,
+                VariableStyle style,
+                HashSet<int> nonNoisySyntaxKindSet) where T : SyntaxNode
+            {
+                var local = symbol as ILocalSymbol;
+                if (local != null)
+                {
+                    return new VariableInfo(
+                        new LocalVariableSymbol<T>(compilation, local, type, nonNoisySyntaxKindSet),
+                        style);
+                }
+
+                var parameter = symbol as IParameterSymbol;
+                if (parameter != null)
+                {
+                    return new VariableInfo(new ParameterVariableSymbol(compilation, parameter, type), style);
+                }
+
+                var rangeVariable = symbol as IRangeVariableSymbol;
+                if (rangeVariable != null)
+                {
+                    return new VariableInfo(new QueryVariableSymbol(compilation, rangeVariable, type), style);
+                }
+
+				return null;//Contract.FailWithReturn<VariableInfo>(FeaturesResources.Unknown);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.AnalyzerResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.AnalyzerResult.cs
new file mode 100644
index 0000000000..ea3e5af836
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.AnalyzerResult.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+        protected class AnalyzerResult
+        {
+            private readonly IList<ITypeParameterSymbol> _typeParametersInDeclaration;
+            private readonly IList<ITypeParameterSymbol> _typeParametersInConstraintList;
+            private readonly IList<VariableInfo> _variables;
+            private readonly VariableInfo _variableToUseAsReturnValue;
+
+            public AnalyzerResult(
+				SemanticDocument document,
+                IEnumerable<ITypeParameterSymbol> typeParametersInDeclaration,
+                IEnumerable<ITypeParameterSymbol> typeParametersInConstraintList,
+                IList<VariableInfo> variables,
+                VariableInfo variableToUseAsReturnValue,
+                ITypeSymbol returnType,
+                bool awaitTaskReturn,
+                bool instanceMemberIsUsed,
+                bool endOfSelectionReachable,
+                OperationStatus status)
+            {
+                var semanticModel = document.SemanticModel;
+
+                this.UseInstanceMember = instanceMemberIsUsed;
+                this.EndOfSelectionReachable = endOfSelectionReachable;
+                this.AwaitTaskReturn = awaitTaskReturn;
+                this.SemanticDocument = document;
+                _typeParametersInDeclaration = typeParametersInDeclaration.Select(s => semanticModel.ResolveType(s)).ToList();
+                _typeParametersInConstraintList = typeParametersInConstraintList.Select(s => semanticModel.ResolveType(s)).ToList();
+                _variables = variables;
+                this.ReturnType = semanticModel.ResolveType(returnType);
+                _variableToUseAsReturnValue = variableToUseAsReturnValue;
+                this.Status = status;
+            }
+
+            public AnalyzerResult With(SemanticDocument document)
+            {
+                if (this.SemanticDocument == document)
+                {
+                    return this;
+                }
+
+                return new AnalyzerResult(
+                    document,
+                    _typeParametersInDeclaration,
+                    _typeParametersInConstraintList,
+                    _variables,
+                    _variableToUseAsReturnValue,
+                    this.ReturnType,
+                    this.AwaitTaskReturn,
+                    this.UseInstanceMember,
+                    this.EndOfSelectionReachable,
+                    this.Status);
+            }
+
+            /// <summary>
+            /// used to determine whether static can be used
+            /// </summary>
+            public bool UseInstanceMember { get; }
+
+            /// <summary>
+            /// used to determine whether "return" statement needs to be inserted
+            /// </summary>
+            public bool EndOfSelectionReachable { get; }
+
+            /// <summary>
+            /// document this result is based on
+            /// </summary>
+            public SemanticDocument SemanticDocument { get; }
+
+            /// <summary>
+            /// flag to show whether task return type is due to await
+            /// </summary>
+            public bool AwaitTaskReturn { get; }
+
+            /// <summary>
+            /// return type
+            /// </summary>
+            public ITypeSymbol ReturnType { get; }
+
+            /// <summary>
+            /// analyzer result operation status
+            /// </summary>
+            public OperationStatus Status { get; }
+
+            public ReadOnlyCollection<ITypeParameterSymbol> MethodTypeParametersInDeclaration
+            {
+                get
+                {
+                    return new ReadOnlyCollection<ITypeParameterSymbol>(_typeParametersInDeclaration);
+                }
+            }
+
+            public ReadOnlyCollection<ITypeParameterSymbol> MethodTypeParametersInConstraintList
+            {
+                get
+                {
+                    return new ReadOnlyCollection<ITypeParameterSymbol>(_typeParametersInConstraintList);
+                }
+            }
+
+            public bool HasVariableToUseAsReturnValue
+            {
+                get
+                {
+                    return _variableToUseAsReturnValue != null;
+                }
+            }
+
+            public VariableInfo VariableToUseAsReturnValue
+            {
+                get
+                {
+                    //Contract.ThrowIfNull(_variableToUseAsReturnValue);
+                    return _variableToUseAsReturnValue;
+                }
+            }
+
+            public bool HasReturnType
+            {
+                get
+                {
+                    return this.ReturnType.SpecialType != SpecialType.System_Void && !this.AwaitTaskReturn;
+                }
+            }
+
+            public IEnumerable<VariableInfo> MethodParameters
+            {
+                get
+                {
+                    return _variables.Where(v => v.UseAsParameter);
+                }
+            }
+
+            public IEnumerable<VariableInfo> GetVariablesToSplitOrMoveIntoMethodDefinition(CancellationToken cancellationToken)
+            {
+                return _variables
+                           .Where(v => v.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.SplitIn ||
+                                       v.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.MoveIn);
+            }
+
+            public IEnumerable<VariableInfo> GetVariablesToMoveIntoMethodDefinition(CancellationToken cancellationToken)
+            {
+                return _variables.Where(v => v.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.MoveIn);
+            }
+
+            public IEnumerable<VariableInfo> GetVariablesToMoveOutToCallSite(CancellationToken cancellationToken)
+            {
+                return _variables.Where(v => v.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.MoveOut);
+            }
+
+            public IEnumerable<VariableInfo> GetVariablesToMoveOutToCallSiteOrDelete(CancellationToken cancellationToken)
+            {
+                return _variables.Where(v => v.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.MoveOut ||
+                                                 v.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.Delete);
+            }
+
+            public IEnumerable<VariableInfo> GetVariablesToSplitOrMoveOutToCallSite(CancellationToken cancellationToken)
+            {
+                return _variables.Where(v => v.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.SplitOut ||
+                                                 v.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.MoveOut);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.CodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.CodeGenerator.cs
new file mode 100644
index 0000000000..06a9faec87
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.CodeGenerator.cs
@@ -0,0 +1,316 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+        protected abstract partial class CodeGenerator<TStatement, TExpression, TNodeUnderContainer>
+            where TStatement : SyntaxNode
+            where TExpression : SyntaxNode
+            where TNodeUnderContainer : SyntaxNode
+        {
+            protected readonly SyntaxAnnotation MethodNameAnnotation;
+            protected readonly SyntaxAnnotation MethodDefinitionAnnotation;
+            protected readonly SyntaxAnnotation CallSiteAnnotation;
+
+            protected readonly InsertionPoint InsertionPoint;
+            protected readonly SemanticDocument SemanticDocument;
+            protected readonly SelectionResult SelectionResult;
+            protected readonly AnalyzerResult AnalyzerResult;
+
+            protected CodeGenerator(InsertionPoint insertionPoint, SelectionResult selectionResult, AnalyzerResult analyzerResult)
+            {
+                //Contract.ThrowIfFalse(insertionPoint.SemanticDocument == analyzerResult.SemanticDocument);
+
+                this.InsertionPoint = insertionPoint;
+                this.SemanticDocument = insertionPoint.SemanticDocument;
+
+                this.SelectionResult = selectionResult;
+                this.AnalyzerResult = analyzerResult;
+
+                this.MethodNameAnnotation = new SyntaxAnnotation();
+                this.CallSiteAnnotation = new SyntaxAnnotation();
+				this.MethodDefinitionAnnotation = MonoDevelop.Ide.TypeSystem.TypeSystemService.InsertionModeAnnotation;
+            }
+
+            #region method to be implemented in sub classes
+
+            protected abstract SyntaxNode GetOutermostCallSiteContainerToProcess(CancellationToken cancellationToken);
+            protected abstract Task<SyntaxNode> GenerateBodyForCallSiteContainerAsync(CancellationToken cancellationToken);
+            protected abstract SyntaxNode GetPreviousMember(SemanticDocument document);
+            protected abstract OperationStatus<IMethodSymbol> GenerateMethodDefinition(CancellationToken cancellationToken);
+
+            protected abstract SyntaxToken CreateIdentifier(string name);
+            protected abstract SyntaxToken CreateMethodName();
+            protected abstract bool LastStatementOrHasReturnStatementInReturnableConstruct();
+
+            protected abstract TNodeUnderContainer GetFirstStatementOrInitializerSelectedAtCallSite();
+            protected abstract TNodeUnderContainer GetLastStatementOrInitializerSelectedAtCallSite();
+            protected abstract Task<TNodeUnderContainer> GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(SyntaxAnnotation callsiteAnnotation, CancellationToken cancellationToken);
+
+            protected abstract TExpression CreateCallSignature();
+            protected abstract TStatement CreateDeclarationStatement(VariableInfo variable, CancellationToken cancellationToken, TExpression initialValue = null);
+            protected abstract TStatement CreateAssignmentExpressionStatement(SyntaxToken identifier, TExpression rvalue);
+            protected abstract TStatement CreateReturnStatement(string identifierName = null);
+
+            protected abstract IEnumerable<TStatement> GetInitialStatementsForMethodDefinitions();
+            #endregion
+
+            public async Task<GeneratedCode> GenerateAsync(CancellationToken cancellationToken)
+            {
+                var root = this.SemanticDocument.Root;
+
+                // should I check venus hidden position check here as well?
+                root = root.ReplaceNode(this.GetOutermostCallSiteContainerToProcess(cancellationToken), await this.GenerateBodyForCallSiteContainerAsync(cancellationToken).ConfigureAwait(false));
+                var callSiteDocument = await this.SemanticDocument.WithSyntaxRootAsync(root, cancellationToken).ConfigureAwait(false);
+
+                var newCallSiteRoot = callSiteDocument.Root;
+                var previousMemberNode = GetPreviousMember(callSiteDocument);
+
+                // it is possible in a script file case where there is no previous member. in that case, insert new text into top level script
+                var destination = (previousMemberNode.Parent == null) ? previousMemberNode : previousMemberNode.Parent;
+
+				var codeGenerationService = new CSharpCodeGenerationService (this.SemanticDocument.Document.Project.Solution.Workspace.Services.GetLanguageServices (LanguageNames.CSharp));
+                var result = this.GenerateMethodDefinition(cancellationToken);
+                var newContainer = codeGenerationService.AddMethod(
+                    destination, result.Data,
+					new CodeGenerationOptions(afterThisLocation: previousMemberNode.GetLocation(), generateDefaultAccessibility: false, generateMethodBodies: true),
+                    cancellationToken);
+
+                var newDocument = callSiteDocument.Document.WithSyntaxRoot(newCallSiteRoot.ReplaceNode(destination, newContainer));
+                newDocument = await Simplifier.ReduceAsync(newDocument, Simplifier.Annotation, null, cancellationToken).ConfigureAwait(false);
+
+                var finalDocument = await SemanticDocument.CreateAsync(newDocument, cancellationToken).ConfigureAwait(false);
+                var finalRoot = finalDocument.Root;
+
+                var methodDefinition = finalRoot.GetAnnotatedNodesAndTokens(this.MethodDefinitionAnnotation).FirstOrDefault();
+                if (!methodDefinition.IsNode || methodDefinition.AsNode() == null)
+                {
+                    return await CreateGeneratedCodeAsync(
+                        result.Status.With(OperationStatus.FailedWithUnknownReason), finalDocument, cancellationToken).ConfigureAwait(false);
+                }
+
+                if (methodDefinition.SyntaxTree.IsHiddenPosition(methodDefinition.AsNode().SpanStart, cancellationToken) ||
+                    methodDefinition.SyntaxTree.IsHiddenPosition(methodDefinition.AsNode().Span.End, cancellationToken))
+                {
+                    return await CreateGeneratedCodeAsync(
+                        result.Status.With(OperationStatus.OverlapsHiddenPosition), finalDocument, cancellationToken).ConfigureAwait(false);
+                }
+
+                return await CreateGeneratedCodeAsync(result.Status, finalDocument, cancellationToken).ConfigureAwait(false);
+            }
+
+            protected virtual Task<GeneratedCode> CreateGeneratedCodeAsync(OperationStatus status, SemanticDocument newDocument, CancellationToken cancellationToken)
+            {
+                return Task.FromResult(new GeneratedCode(
+                    status,
+                    newDocument,
+                    this.MethodNameAnnotation,
+                    this.CallSiteAnnotation,
+                    this.MethodDefinitionAnnotation));
+            }
+
+            protected VariableInfo GetOutermostVariableToMoveIntoMethodDefinition(CancellationToken cancellationToken)
+            {
+                var variables = new List<VariableInfo>(this.AnalyzerResult.GetVariablesToMoveIntoMethodDefinition(cancellationToken));
+                if (variables.Count <= 0)
+                {
+                    return null;
+                }
+
+                variables.Sort(VariableInfo.Compare);
+                return variables[0];
+            }
+
+            protected IEnumerable<TStatement> AddReturnIfUnreachable(
+                IEnumerable<TStatement> statements, CancellationToken cancellationToken)
+            {
+                if (this.AnalyzerResult.EndOfSelectionReachable)
+                {
+                    return statements;
+                }
+
+                var type = this.SelectionResult.GetContainingScopeType();
+                if (type != null && type.SpecialType != SpecialType.System_Void)
+                {
+                    return statements;
+                }
+
+                // no return type + end of selection not reachable
+                if (LastStatementOrHasReturnStatementInReturnableConstruct())
+                {
+                    return statements;
+                }
+
+                return statements.Concat(CreateReturnStatement());
+            }
+
+            protected async Task<IEnumerable<TStatement>> AddInvocationAtCallSiteAsync(
+                IEnumerable<TStatement> statements, CancellationToken cancellationToken)
+            {
+                if (this.AnalyzerResult.HasVariableToUseAsReturnValue)
+                {
+                    return statements;
+                }
+
+                //Contract.ThrowIfTrue(this.AnalyzerResult.GetVariablesToSplitOrMoveOutToCallSite(cancellationToken).Any(v => v.UseAsReturnValue));
+
+                // add invocation expression
+                return statements.Concat(
+                    (TStatement)(SyntaxNode)await GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(this.CallSiteAnnotation, cancellationToken).ConfigureAwait(false));
+            }
+
+            protected IEnumerable<TStatement> AddAssignmentStatementToCallSite(
+                IEnumerable<TStatement> statements,
+                CancellationToken cancellationToken)
+            {
+                if (!this.AnalyzerResult.HasVariableToUseAsReturnValue)
+                {
+                    return statements;
+                }
+
+                var variable = this.AnalyzerResult.VariableToUseAsReturnValue;
+                if (variable.ReturnBehavior == ReturnBehavior.Initialization)
+                {
+                    // there must be one decl behavior when there is "return value and initialize" variable
+                    //Contract.ThrowIfFalse(this.AnalyzerResult.GetVariablesToSplitOrMoveOutToCallSite(cancellationToken).Single(v => v.ReturnBehavior == ReturnBehavior.Initialization) != null);
+
+                    return statements.Concat(
+                        CreateDeclarationStatement(variable, cancellationToken, CreateCallSignature()).WithAdditionalAnnotations(this.CallSiteAnnotation));
+                }
+
+                //Contract.ThrowIfFalse(variable.ReturnBehavior == ReturnBehavior.Assignment);
+                return statements.Concat(
+                    CreateAssignmentExpressionStatement(CreateIdentifier(variable.Name), CreateCallSignature()).WithAdditionalAnnotations(this.CallSiteAnnotation));
+            }
+
+            protected IEnumerable<TStatement> CreateDeclarationStatements(IEnumerable<VariableInfo> variables, CancellationToken cancellationToken)
+            {
+                var list = new List<TStatement>();
+
+                foreach (var variable in variables)
+                {
+                    list.Add(CreateDeclarationStatement(variable, cancellationToken));
+                }
+
+                return list;
+            }
+
+            protected IEnumerable<TStatement> AddSplitOrMoveDeclarationOutStatementsToCallSite(IEnumerable<TStatement> statements, CancellationToken cancellationToken)
+            {
+                var list = new List<TStatement>();
+
+                foreach (var variable in this.AnalyzerResult.GetVariablesToSplitOrMoveOutToCallSite(cancellationToken))
+                {
+                    if (variable.UseAsReturnValue)
+                    {
+                        continue;
+                    }
+
+                    list.Add(CreateDeclarationStatement(variable, cancellationToken));
+                }
+
+                return list;
+            }
+
+            protected IEnumerable<TStatement> AppendReturnStatementIfNeeded(IEnumerable<TStatement> statements)
+            {
+                if (!this.AnalyzerResult.HasVariableToUseAsReturnValue)
+                {
+                    return statements;
+                }
+
+                var variableToUseAsReturnValue = this.AnalyzerResult.VariableToUseAsReturnValue;
+
+                //Contract.ThrowIfFalse(variableToUseAsReturnValue.ReturnBehavior == ReturnBehavior.Assignment ||
+                //                      variableToUseAsReturnValue.ReturnBehavior == ReturnBehavior.Initialization);
+
+                return statements.Concat(CreateReturnStatement(this.AnalyzerResult.VariableToUseAsReturnValue.Name));
+            }
+
+            protected HashSet<SyntaxAnnotation> CreateVariableDeclarationToRemoveMap(
+                IEnumerable<VariableInfo> variables, CancellationToken cancellationToken)
+            {
+                var annotations = new List<Tuple<SyntaxToken, SyntaxAnnotation>>();
+
+                foreach (var variable in variables)
+                {
+//                    Contract.ThrowIfFalse(variable.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.MoveOut ||
+//                                          variable.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.MoveIn ||
+//                                          variable.GetDeclarationBehavior(cancellationToken) == DeclarationBehavior.Delete);
+
+                    variable.AddIdentifierTokenAnnotationPair(annotations, cancellationToken);
+                }
+
+                return new HashSet<SyntaxAnnotation>(annotations.Select(t => t.Item2));
+            }
+
+            protected IList<ITypeParameterSymbol> CreateMethodTypeParameters(CancellationToken cancellationToken)
+            {
+                if (this.AnalyzerResult.MethodTypeParametersInDeclaration.Count == 0)
+                {
+                    return SpecializedCollections.EmptyList<ITypeParameterSymbol>();
+                }
+
+                var set = new HashSet<ITypeParameterSymbol>(this.AnalyzerResult.MethodTypeParametersInConstraintList);
+
+                var typeParameters = new List<ITypeParameterSymbol>();
+                foreach (var parameter in this.AnalyzerResult.MethodTypeParametersInDeclaration)
+                {
+                    if (parameter != null && set.Contains(parameter))
+                    {
+                        typeParameters.Add(parameter);
+                        continue;
+                    }
+
+					typeParameters.Add(CodeGenerationSymbolFactory.CreateTypeParameter(
+                        parameter.GetAttributes(), parameter.Variance, parameter.Name, ImmutableArray.Create<ITypeSymbol>(),
+                        parameter.HasConstructorConstraint, parameter.HasReferenceTypeConstraint, parameter.HasValueTypeConstraint, parameter.Ordinal));
+                }
+
+                return typeParameters;
+            }
+
+            protected IList<IParameterSymbol> CreateMethodParameters()
+            {
+                var parameters = new List<IParameterSymbol>();
+
+                foreach (var parameter in this.AnalyzerResult.MethodParameters)
+                {
+                    var refKind = GetRefKind(parameter.ParameterModifier);
+                    var type = parameter.GetVariableType(this.SemanticDocument);
+
+                    parameters.Add(
+						CodeGenerationSymbolFactory.CreateParameterSymbol(
+                            attributes: SpecializedCollections.EmptyList<AttributeData>(),
+                            refKind: refKind,
+                            isParams: false,
+                            type: type,
+                            name: parameter.Name));
+                }
+
+                return parameters;
+            }
+
+            private static RefKind GetRefKind(ParameterBehavior parameterBehavior)
+            {
+                return parameterBehavior == ParameterBehavior.Ref ? RefKind.Ref :
+                            parameterBehavior == ParameterBehavior.Out ? RefKind.Out : RefKind.None;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.GeneratedCode.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.GeneratedCode.cs
new file mode 100644
index 0000000000..5590199a6a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.GeneratedCode.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+		internal class GeneratedCode
+        {
+            public GeneratedCode(
+                OperationStatus status,
+                SemanticDocument document,
+                SyntaxAnnotation methodNameAnnotation,
+                SyntaxAnnotation callsiteAnnotation,
+                SyntaxAnnotation methodDefinitionAnnotation)
+            {
+                //Contract.ThrowIfNull(document);
+                //Contract.ThrowIfNull(methodNameAnnotation);
+                //Contract.ThrowIfNull(callsiteAnnotation);
+                //Contract.ThrowIfNull(methodDefinitionAnnotation);
+
+                this.Status = status;
+                this.SemanticDocument = document;
+                this.MethodNameAnnotation = methodNameAnnotation;
+                this.CallSiteAnnotation = callsiteAnnotation;
+                this.MethodDefinitionAnnotation = methodDefinitionAnnotation;
+            }
+
+            public OperationStatus Status { get; }
+            public SemanticDocument SemanticDocument { get; }
+
+            public SyntaxAnnotation MethodNameAnnotation { get; }
+            public SyntaxAnnotation CallSiteAnnotation { get; }
+            public SyntaxAnnotation MethodDefinitionAnnotation { get; }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.TriviaResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.TriviaResult.cs
new file mode 100644
index 0000000000..9bbd32c02b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.TriviaResult.cs
@@ -0,0 +1,181 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+        protected abstract class TriviaResult
+        {
+            private readonly int _endOfLineKind;
+            private readonly int _whitespaceKind;
+
+            private readonly ITriviaSavedResult _result;
+
+            public TriviaResult(SemanticDocument document, ITriviaSavedResult result, int endOfLineKind, int whitespaceKind)
+            {
+                this.SemanticDocument = document;
+
+                _result = result;
+                _endOfLineKind = endOfLineKind;
+                _whitespaceKind = whitespaceKind;
+            }
+
+            protected abstract AnnotationResolver GetAnnotationResolver(SyntaxNode callsite, SyntaxNode methodDefinition);
+            protected abstract TriviaResolver GetTriviaResolver(SyntaxNode methodDefinition);
+
+            public SemanticDocument SemanticDocument { get; }
+
+            public async Task<OperationStatus<SemanticDocument>> ApplyAsync(GeneratedCode generatedCode, CancellationToken cancellationToken)
+            {
+                var document = generatedCode.SemanticDocument;
+                var root = document.Root;
+
+                var callsiteAnnotation = generatedCode.CallSiteAnnotation;
+                var methodDefinitionAnnotation = generatedCode.MethodDefinitionAnnotation;
+
+                var callsite = root.GetAnnotatedNodesAndTokens(callsiteAnnotation).SingleOrDefault().AsNode();
+                var method = root.GetAnnotatedNodesAndTokens(methodDefinitionAnnotation).SingleOrDefault().AsNode();
+
+                var annotationResolver = GetAnnotationResolver(callsite, method);
+                var triviaResolver = GetTriviaResolver(method);
+                if (annotationResolver == null || triviaResolver == null)
+                {
+                    // bug # 6644
+                    // this could happen in malformed code. return as it was.
+                    var status = new OperationStatus(OperationStatusFlag.None, "FeaturesResources.CantNotConstructFinalTree");
+                    return status.With(document);
+                }
+
+                return OperationStatus.Succeeded.With(
+                    await document.WithSyntaxRootAsync(_result.RestoreTrivia(root, annotationResolver, triviaResolver), cancellationToken).ConfigureAwait(false));
+            }
+
+            protected IEnumerable<SyntaxTrivia> FilterTriviaList(IEnumerable<SyntaxTrivia> list)
+            {
+                // has noisy token
+                if (list.Any(t => t.RawKind != _endOfLineKind && t.RawKind != _whitespaceKind))
+                {
+                    return RemoveLeadingElasticBeforeEndOfLine(list);
+                }
+
+                // whitespace only
+                return MergeLineBreaks(list);
+            }
+
+            protected IEnumerable<SyntaxTrivia> RemoveBlankLines(IEnumerable<SyntaxTrivia> list)
+            {
+                // remove any blank line at the beginging
+                var currentLine = new List<SyntaxTrivia>();
+                var result = new List<SyntaxTrivia>();
+
+                var seenFirstEndOfLine = false;
+                int i = 0;
+
+                foreach (var trivia in list)
+                {
+                    i++;
+
+                    if (trivia.RawKind == _endOfLineKind)
+                    {
+                        if (seenFirstEndOfLine)
+                        {
+                            // empty line. remove it
+                            if (currentLine.All(t => t.RawKind == _endOfLineKind || t.RawKind == _whitespaceKind))
+                            {
+                                continue;
+                            }
+
+                            // non empty line after the first end of line.
+                            // return now
+                            return result.Concat(currentLine).Concat(list.Skip(i - 1));
+                        }
+                        else
+                        {
+                            seenFirstEndOfLine = true;
+
+                            result.AddRange(currentLine);
+                            result.Add(trivia);
+                            currentLine.Clear();
+
+                            continue;
+                        }
+                    }
+
+                    currentLine.Add(trivia);
+                }
+
+                return result.Concat(currentLine);
+            }
+
+            protected IEnumerable<SyntaxTrivia> RemoveLeadingElasticBeforeEndOfLine(IEnumerable<SyntaxTrivia> list)
+            {
+                var trivia = list.FirstOrDefault();
+                if (!trivia.IsElastic())
+                {
+                    return list;
+                }
+
+                var listWithoutHead = list.Skip(1);
+                trivia = listWithoutHead.FirstOrDefault();
+                if (trivia.RawKind == _endOfLineKind)
+                {
+                    return listWithoutHead;
+                }
+
+                if (trivia.IsElastic())
+                {
+                    return RemoveLeadingElasticBeforeEndOfLine(listWithoutHead);
+                }
+
+                return list;
+            }
+
+            protected IEnumerable<SyntaxTrivia> MergeLineBreaks(IEnumerable<SyntaxTrivia> list)
+            {
+                // this will make sure that it doesn't have more than two subsequent end of line
+                // trivia without any noisy trivia
+                var stack = new Stack<SyntaxTrivia>();
+                int numberOfEndOfLinesWithoutAnyNoisyTrivia = 0;
+
+                foreach (var trivia in list)
+                {
+                    if (trivia.IsElastic())
+                    {
+                        stack.Push(trivia);
+                        continue;
+                    }
+
+                    if (trivia.RawKind == _endOfLineKind)
+                    {
+                        numberOfEndOfLinesWithoutAnyNoisyTrivia++;
+
+                        if (numberOfEndOfLinesWithoutAnyNoisyTrivia > 2)
+                        {
+                            // get rid of any whitespace trivia from stack
+                            var top = stack.Peek();
+                            while (!top.IsElastic() && top.RawKind == _whitespaceKind)
+                            {
+                                stack.Pop();
+                                top = stack.Peek();
+                            }
+
+                            continue;
+                        }
+                    }
+
+                    stack.Push(trivia);
+                }
+
+                return stack.Reverse();
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.TypeParameterCollector.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.TypeParameterCollector.cs
new file mode 100644
index 0000000000..3c2c401c60
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.TypeParameterCollector.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+        protected class TypeParameterCollector : SymbolVisitor
+        {
+            private readonly List<ITypeParameterSymbol> _typeParameters = new List<ITypeParameterSymbol>();
+
+            public static IEnumerable<ITypeParameterSymbol> Collect(ITypeSymbol typeSymbol)
+            {
+                var collector = new TypeParameterCollector();
+                typeSymbol.Accept(collector);
+
+                return collector._typeParameters;
+            }
+
+            public override void DefaultVisit(ISymbol node)
+            {
+                throw new NotImplementedException();
+            }
+
+            public override void VisitDynamicType(IDynamicTypeSymbol dynamicTypeSymbol)
+            {
+            }
+
+            public override void VisitArrayType(IArrayTypeSymbol arrayTypeSymbol)
+            {
+                arrayTypeSymbol.ElementType.Accept(this);
+            }
+
+            public override void VisitPointerType(IPointerTypeSymbol pointerTypeSymbol)
+            {
+                pointerTypeSymbol.PointedAtType.Accept(this);
+            }
+
+            public override void VisitNamedType(INamedTypeSymbol namedTypeSymbol)
+            {
+                foreach (var argument in namedTypeSymbol.GetAllTypeArguments())
+                {
+                    argument.Accept(this);
+                }
+            }
+
+            public override void VisitTypeParameter(ITypeParameterSymbol typeParameterTypeSymbol)
+            {
+                _typeParameters.Add(typeParameterTypeSymbol);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.VariableInfo.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.VariableInfo.cs
new file mode 100644
index 0000000000..d624ffec4b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.VariableInfo.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+        protected class VariableInfo
+        {
+            private readonly VariableSymbol _variableSymbol;
+            private readonly VariableStyle _variableStyle;
+            private readonly bool _useAsReturnValue;
+
+            public VariableInfo(
+                VariableSymbol variableSymbol,
+                VariableStyle variableStyle,
+                bool useAsReturnValue = false)
+            {
+                _variableSymbol = variableSymbol;
+                _variableStyle = variableStyle;
+                _useAsReturnValue = useAsReturnValue;
+            }
+
+            public bool UseAsReturnValue
+            {
+                get
+                {
+                    //Contract.ThrowIfFalse(!_useAsReturnValue || _variableStyle.ReturnStyle.ReturnBehavior != ReturnBehavior.None);
+                    return _useAsReturnValue;
+                }
+            }
+
+            public bool CanBeUsedAsReturnValue
+            {
+                get
+                {
+                    return _variableStyle.ReturnStyle.ReturnBehavior != ReturnBehavior.None;
+                }
+            }
+
+            public bool UseAsParameter
+            {
+                get
+                {
+                    return (!_useAsReturnValue && _variableStyle.ParameterStyle.ParameterBehavior != ParameterBehavior.None) ||
+                           (_useAsReturnValue && _variableStyle.ReturnStyle.ParameterBehavior != ParameterBehavior.None);
+                }
+            }
+
+            public ParameterBehavior ParameterModifier
+            {
+                get
+                {
+                    return _useAsReturnValue ? _variableStyle.ReturnStyle.ParameterBehavior : _variableStyle.ParameterStyle.ParameterBehavior;
+                }
+            }
+
+            public DeclarationBehavior GetDeclarationBehavior(CancellationToken cancellationToken)
+            {
+                if (_useAsReturnValue)
+                {
+                    return _variableStyle.ReturnStyle.DeclarationBehavior;
+                }
+
+                if (_variableSymbol.GetUseSaferDeclarationBehavior(cancellationToken))
+                {
+                    return _variableStyle.ParameterStyle.SaferDeclarationBehavior;
+                }
+
+                return _variableStyle.ParameterStyle.DeclarationBehavior;
+            }
+
+            public ReturnBehavior ReturnBehavior
+            {
+                get
+                {
+                    if (_useAsReturnValue)
+                    {
+                        return _variableStyle.ReturnStyle.ReturnBehavior;
+                    }
+
+                    return ReturnBehavior.None;
+                }
+            }
+
+            public static VariableInfo CreateReturnValue(VariableInfo variable)
+            {
+                //Contract.ThrowIfNull(variable);
+                //Contract.ThrowIfFalse(variable.CanBeUsedAsReturnValue);
+                //Contract.ThrowIfFalse(variable.ParameterModifier == ParameterBehavior.Out || variable.ParameterModifier == ParameterBehavior.Ref);
+
+                return new VariableInfo(variable._variableSymbol, variable._variableStyle, useAsReturnValue: true);
+            }
+
+            public void AddIdentifierTokenAnnotationPair(
+                List<Tuple<SyntaxToken, SyntaxAnnotation>> annotations, CancellationToken cancellationToken)
+            {
+                _variableSymbol.AddIdentifierTokenAnnotationPair(annotations, cancellationToken);
+            }
+
+            public string Name
+            {
+                get { return _variableSymbol.Name; }
+            }
+
+            public bool OriginalTypeHadAnonymousTypeOrDelegate
+            {
+                get { return _variableSymbol.OriginalTypeHadAnonymousTypeOrDelegate; }
+            }
+
+            public ITypeSymbol GetVariableType(SemanticDocument document)
+            {
+                return document.SemanticModel.ResolveType(_variableSymbol.OriginalType);
+            }
+
+            public SyntaxToken GetIdentifierTokenAtDeclaration(SemanticDocument document)
+            {
+                return document.GetTokenWithAnnotaton(_variableSymbol.IdentifierTokenAnnotation);
+            }
+
+            public SyntaxToken GetIdentifierTokenAtDeclaration(SyntaxNode node)
+            {
+                return node.GetAnnotatedTokens(_variableSymbol.IdentifierTokenAnnotation).SingleOrDefault();
+            }
+
+            public static int Compare(VariableInfo left, VariableInfo right)
+            {
+                return VariableSymbol.Compare(left._variableSymbol, right._variableSymbol);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.VariableSymbol.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.VariableSymbol.cs
new file mode 100644
index 0000000000..8783713ead
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.VariableSymbol.cs
@@ -0,0 +1,357 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+        /// <summary>
+        /// temporary symbol until we have a symbol that can hold onto both local and parameter symbol
+        /// </summary>
+        protected abstract class VariableSymbol
+        {
+            protected VariableSymbol(Compilation compilation, ITypeSymbol type)
+            {
+                this.OriginalTypeHadAnonymousTypeOrDelegate = type.ContainsAnonymousType();
+                this.OriginalType = this.OriginalTypeHadAnonymousTypeOrDelegate ? type.RemoveAnonymousTypes(compilation) : type;
+            }
+
+            public abstract int DisplayOrder { get; }
+            public abstract string Name { get; }
+
+            public abstract bool GetUseSaferDeclarationBehavior(CancellationToken cancellationToken);
+            public abstract SyntaxAnnotation IdentifierTokenAnnotation { get; }
+            public abstract SyntaxToken GetOriginalIdentifierToken(CancellationToken cancellationToken);
+
+            public abstract void AddIdentifierTokenAnnotationPair(
+                List<Tuple<SyntaxToken, SyntaxAnnotation>> annotations, CancellationToken cancellationToken);
+
+            protected abstract int CompareTo(VariableSymbol right);
+
+            /// <summary>
+            /// return true if original type had anonymous type or delegate somewhere in the type
+            /// </summary>
+            public bool OriginalTypeHadAnonymousTypeOrDelegate { get; }
+
+            /// <summary>
+            /// get the original type with anonymous type removed
+            /// </summary>
+            public ITypeSymbol OriginalType { get; }
+
+            public static int Compare(VariableSymbol left, VariableSymbol right)
+            {
+                if (left.DisplayOrder == right.DisplayOrder)
+                {
+                    return left.CompareTo(right);
+                }
+
+                return left.DisplayOrder - right.DisplayOrder;
+            }
+        }
+
+        protected abstract class NotMovableVariableSymbol : VariableSymbol
+        {
+            public NotMovableVariableSymbol(Compilation compilation, ITypeSymbol type) :
+                base(compilation, type)
+            {
+            }
+
+            public override bool GetUseSaferDeclarationBehavior(CancellationToken cancellationToken)
+            {
+                // decl never get moved
+                return false;
+            }
+
+            [ExcludeFromCodeCoverage]
+            public override SyntaxToken GetOriginalIdentifierToken(CancellationToken cancellationToken)
+            {
+				throw new InvalidOperationException();
+            }
+
+            [ExcludeFromCodeCoverage]
+            public override SyntaxAnnotation IdentifierTokenAnnotation
+            {
+				get { throw new InvalidOperationException(); }
+            }
+
+            public override void AddIdentifierTokenAnnotationPair(
+                List<Tuple<SyntaxToken, SyntaxAnnotation>> annotations, CancellationToken cancellationToken)
+            {
+                // do nothing for parameter
+            }
+        }
+
+        protected class ParameterVariableSymbol : NotMovableVariableSymbol, IComparable<ParameterVariableSymbol>
+        {
+            private readonly IParameterSymbol _parameterSymbol;
+
+            public ParameterVariableSymbol(Compilation compilation, IParameterSymbol parameterSymbol, ITypeSymbol type) :
+                base(compilation, type)
+            {
+                //Contract.ThrowIfNull(parameterSymbol);
+                _parameterSymbol = parameterSymbol;
+            }
+
+            public override int DisplayOrder
+            {
+                get { return 0; }
+            }
+
+            protected override int CompareTo(VariableSymbol right)
+            {
+                return this.CompareTo((ParameterVariableSymbol)right);
+            }
+
+            public int CompareTo(ParameterVariableSymbol other)
+            {
+                //Contract.ThrowIfNull(other);
+
+                if (this == other)
+                {
+                    return 0;
+                }
+
+                var compare = CompareTo((IMethodSymbol)_parameterSymbol.ContainingSymbol, (IMethodSymbol)other._parameterSymbol.ContainingSymbol);
+                if (compare != 0)
+                {
+                    return compare;
+                }
+
+               // Contract.ThrowIfFalse(_parameterSymbol.Ordinal != other._parameterSymbol.Ordinal);
+                return (_parameterSymbol.Ordinal > other._parameterSymbol.Ordinal) ? 1 : -1;
+            }
+
+            private int CompareTo(IMethodSymbol left, IMethodSymbol right)
+            {
+                if (left == null && right == null)
+                {
+                    return 0;
+                }
+
+                if (left.Equals(right))
+                {
+                    return 0;
+                }
+
+                if (left.MethodKind == MethodKind.AnonymousFunction &&
+                    right.MethodKind != MethodKind.AnonymousFunction)
+                {
+                    return 1;
+                }
+
+                if (left.MethodKind != MethodKind.AnonymousFunction &&
+                    right.MethodKind == MethodKind.AnonymousFunction)
+                {
+                    return -1;
+                }
+
+                if (left.MethodKind == MethodKind.AnonymousFunction &&
+                    right.MethodKind == MethodKind.AnonymousFunction)
+                {
+                    //Contract.ThrowIfFalse(left.Locations.Length == 1);
+                    //Contract.ThrowIfFalse(right.Locations.Length == 1);
+
+                    return left.Locations[0].SourceSpan.Start - right.Locations[0].SourceSpan.Start;
+                }
+
+				return 0;//Contract.FailWithReturn<int>("Shouldn't reach here");
+            }
+
+            public override string Name
+            {
+                get
+                {
+                    return _parameterSymbol.ToDisplayString(
+                        new SymbolDisplayFormat(
+                            parameterOptions: SymbolDisplayParameterOptions.IncludeName,
+                            miscellaneousOptions: SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers));
+                }
+            }
+        }
+
+        protected class LocalVariableSymbol<T> : VariableSymbol, IComparable<LocalVariableSymbol<T>> where T : SyntaxNode
+        {
+            private readonly SyntaxAnnotation _annotation;
+            private readonly ILocalSymbol _localSymbol;
+            private readonly HashSet<int> _nonNoisySet;
+
+            public LocalVariableSymbol(Compilation compilation, ILocalSymbol localSymbol, ITypeSymbol type, HashSet<int> nonNoisySet) :
+                base(compilation, type)
+            {
+//                Contract.ThrowIfNull(localSymbol);
+//                Contract.ThrowIfNull(nonNoisySet);
+
+                _annotation = new SyntaxAnnotation();
+                _localSymbol = localSymbol;
+                _nonNoisySet = nonNoisySet;
+            }
+
+            public override int DisplayOrder
+            {
+                get { return 1; }
+            }
+
+            protected override int CompareTo(VariableSymbol right)
+            {
+                return this.CompareTo((LocalVariableSymbol<T>)right);
+            }
+
+            public int CompareTo(LocalVariableSymbol<T> other)
+            {
+                //Contract.ThrowIfNull(other);
+
+                if (this == other)
+                {
+                    return 0;
+                }
+
+                //Contract.ThrowIfFalse(_localSymbol.Locations.Length == 1);
+                //Contract.ThrowIfFalse(other._localSymbol.Locations.Length == 1);
+                //Contract.ThrowIfFalse(_localSymbol.Locations[0].IsInSource);
+                //Contract.ThrowIfFalse(other._localSymbol.Locations[0].IsInSource);
+                //Contract.ThrowIfFalse(_localSymbol.Locations[0].SourceTree == other._localSymbol.Locations[0].SourceTree);
+                //Contract.ThrowIfFalse(_localSymbol.Locations[0].SourceSpan.Start != other._localSymbol.Locations[0].SourceSpan.Start);
+
+                return _localSymbol.Locations[0].SourceSpan.Start - other._localSymbol.Locations[0].SourceSpan.Start;
+            }
+
+            public override string Name
+            {
+                get
+                {
+                    return _localSymbol.ToDisplayString(
+                        new SymbolDisplayFormat(
+                            miscellaneousOptions: SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers));
+                }
+            }
+
+            public override SyntaxToken GetOriginalIdentifierToken(CancellationToken cancellationToken)
+            {
+//                Contract.ThrowIfFalse(_localSymbol.Locations.Length == 1);
+//                Contract.ThrowIfFalse(_localSymbol.Locations[0].IsInSource);
+//                Contract.ThrowIfNull(_localSymbol.Locations[0].SourceTree);
+
+                var tree = _localSymbol.Locations[0].SourceTree;
+                var span = _localSymbol.Locations[0].SourceSpan;
+
+                var token = tree.GetRoot(cancellationToken).FindToken(span.Start);
+                //Contract.ThrowIfFalse(token.Span.Equals(span));
+
+                return token;
+            }
+
+            public override SyntaxAnnotation IdentifierTokenAnnotation
+            {
+                get { return _annotation; }
+            }
+
+            public override void AddIdentifierTokenAnnotationPair(
+                List<Tuple<SyntaxToken, SyntaxAnnotation>> annotations, CancellationToken cancellationToken)
+            {
+                annotations.Add(Tuple.Create(this.GetOriginalIdentifierToken(cancellationToken), _annotation));
+            }
+
+            public override bool GetUseSaferDeclarationBehavior(CancellationToken cancellationToken)
+            {
+                var identifier = this.GetOriginalIdentifierToken(cancellationToken);
+
+                // check whether there is a noisy trivia around the token.
+                if (ContainsNoisyTrivia(identifier.LeadingTrivia))
+                {
+                    return true;
+                }
+
+                if (ContainsNoisyTrivia(identifier.TrailingTrivia))
+                {
+                    return true;
+                }
+
+                var declStatement = identifier.Parent.FirstAncestorOrSelf<T>((n) => true);
+                if (declStatement == null)
+                {
+                    return true;
+                }
+
+                foreach (var token in declStatement.DescendantTokens())
+                {
+                    if (ContainsNoisyTrivia(token.LeadingTrivia))
+                    {
+                        return true;
+                    }
+
+                    if (ContainsNoisyTrivia(token.TrailingTrivia))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            private bool ContainsNoisyTrivia(SyntaxTriviaList list)
+            {
+                return list.Any(t => !_nonNoisySet.Contains(t.RawKind));
+            }
+        }
+
+        protected class QueryVariableSymbol : NotMovableVariableSymbol, IComparable<QueryVariableSymbol>
+        {
+            private readonly IRangeVariableSymbol _symbol;
+
+            public QueryVariableSymbol(Compilation compilation, IRangeVariableSymbol symbol, ITypeSymbol type) :
+                base(compilation, type)
+            {
+                //Contract.ThrowIfNull(symbol);
+                _symbol = symbol;
+            }
+
+            public override int DisplayOrder
+            {
+                get { return 2; }
+            }
+
+            protected override int CompareTo(VariableSymbol right)
+            {
+                return this.CompareTo((QueryVariableSymbol)right);
+            }
+
+            public int CompareTo(QueryVariableSymbol other)
+            {
+                //Contract.ThrowIfNull(other);
+
+                if (this == other)
+                {
+                    return 0;
+                }
+
+                var locationLeft = _symbol.Locations.First();
+                var locationRight = other._symbol.Locations.First();
+
+//                Contract.ThrowIfFalse(locationLeft.IsInSource);
+//                Contract.ThrowIfFalse(locationRight.IsInSource);
+//                Contract.ThrowIfFalse(locationLeft.SourceTree == locationRight.SourceTree);
+//                Contract.ThrowIfFalse(locationLeft.SourceSpan.Start != locationRight.SourceSpan.Start);
+
+                return locationLeft.SourceSpan.Start - locationRight.SourceSpan.Start;
+            }
+
+            public override string Name
+            {
+                get
+                {
+                    return _symbol.ToDisplayString(
+                        new SymbolDisplayFormat(
+                            miscellaneousOptions: SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers));
+                }
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.cs
new file mode 100644
index 0000000000..98cba2afd5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/MethodExtractor.cs
@@ -0,0 +1,171 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Formatting.Rules;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    abstract partial class MethodExtractor
+    {
+        protected readonly SelectionResult OriginalSelectionResult;
+
+        public MethodExtractor(SelectionResult selectionResult)
+        {
+            //Contract.ThrowIfNull(selectionResult);
+            this.OriginalSelectionResult = selectionResult;
+        }
+
+        protected abstract Task<AnalyzerResult> AnalyzeAsync(SelectionResult selectionResult, CancellationToken cancellationToken);
+        protected abstract Task<InsertionPoint> GetInsertionPointAsync(SemanticDocument document, int position, CancellationToken cancellationToken);
+        protected abstract Task<TriviaResult> PreserveTriviaAsync(SelectionResult selectionResult, CancellationToken cancellationToken);
+        protected abstract Task<SemanticDocument> ExpandAsync(SelectionResult selection, CancellationToken cancellationToken);
+
+        protected abstract Task<GeneratedCode> GenerateCodeAsync(InsertionPoint insertionPoint, SelectionResult selectionResult, AnalyzerResult analyzeResult, CancellationToken cancellationToken);
+
+        protected abstract SyntaxToken GetMethodNameAtInvocation(IEnumerable<SyntaxNodeOrToken> methodNames);
+        // protected abstract IEnumerable<IFormattingRule> GetFormattingRules(Document document);
+
+        protected abstract Task<OperationStatus> CheckTypeAsync(Document document, SyntaxNode contextNode, Location location, ITypeSymbol type, CancellationToken cancellationToken);
+
+        public async Task<ExtractMethodResult> ExtractMethodAsync(CancellationToken cancellationToken)
+        {
+            var operationStatus = this.OriginalSelectionResult.Status;
+
+            var analyzeResult = await AnalyzeAsync(this.OriginalSelectionResult, cancellationToken).ConfigureAwait(false);
+            cancellationToken.ThrowIfCancellationRequested();
+
+            operationStatus = await CheckVariableTypesAsync(analyzeResult.Status.With(operationStatus), analyzeResult, cancellationToken).ConfigureAwait(false);
+            if (operationStatus.FailedWithNoBestEffortSuggestion())
+            {
+                return new FailedExtractMethodResult(operationStatus);
+            }
+
+            var insertionPoint = await GetInsertionPointAsync(analyzeResult.SemanticDocument, this.OriginalSelectionResult.OriginalSpan.Start, cancellationToken).ConfigureAwait(false);
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var triviaResult = await PreserveTriviaAsync(this.OriginalSelectionResult.With(insertionPoint.SemanticDocument), cancellationToken).ConfigureAwait(false);
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var expandedDocument = await ExpandAsync(this.OriginalSelectionResult.With(triviaResult.SemanticDocument), cancellationToken).ConfigureAwait(false);
+
+            var generatedCode = await GenerateCodeAsync(
+                insertionPoint.With(expandedDocument),
+                this.OriginalSelectionResult.With(expandedDocument),
+                analyzeResult.With(expandedDocument),
+                cancellationToken).ConfigureAwait(false);
+
+            var applied = await triviaResult.ApplyAsync(generatedCode, cancellationToken).ConfigureAwait(false);
+            var afterTriviaRestored = applied.With(operationStatus);
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (afterTriviaRestored.Status.FailedWithNoBestEffortSuggestion())
+            {
+                return CreateExtractMethodResult(
+                    operationStatus, generatedCode.SemanticDocument, generatedCode.MethodNameAnnotation, generatedCode.MethodDefinitionAnnotation);
+            }
+
+            var finalDocument = afterTriviaRestored.Data.Document;
+            finalDocument = await Formatter.FormatAsync(finalDocument, Formatter.Annotation, options: null,/* rules: GetFormattingRules(finalDocument), */cancellationToken: cancellationToken).ConfigureAwait(false);
+
+            cancellationToken.ThrowIfCancellationRequested();
+            return CreateExtractMethodResult(
+                operationStatus.With(generatedCode.Status),
+                await SemanticDocument.CreateAsync(finalDocument, cancellationToken).ConfigureAwait(false),
+                generatedCode.MethodNameAnnotation,
+                generatedCode.MethodDefinitionAnnotation);
+        }
+
+        private ExtractMethodResult CreateExtractMethodResult(
+            OperationStatus status, SemanticDocument semanticDocument,
+            SyntaxAnnotation invocationAnnotation, SyntaxAnnotation methodAnnotation)
+        {
+            var newRoot = semanticDocument.Root;
+            var annotatedTokens = newRoot.GetAnnotatedNodesAndTokens(invocationAnnotation);
+            var methodDefinition = newRoot.GetAnnotatedNodesAndTokens(methodAnnotation).FirstOrDefault().AsNode();
+
+            return new SimpleExtractMethodResult(status, semanticDocument.Document, GetMethodNameAtInvocation(annotatedTokens), methodDefinition);
+        }
+
+        private async Task<OperationStatus> CheckVariableTypesAsync(
+            OperationStatus status,
+            AnalyzerResult analyzeResult,
+            CancellationToken cancellationToken)
+        {
+            var document = analyzeResult.SemanticDocument;
+
+            // sync selection result to same semantic data as analyzeResult
+            var firstToken = this.OriginalSelectionResult.With(document).GetFirstTokenInSelection();
+            var context = firstToken.Parent;
+
+            var result = await TryCheckVariableTypeAsync(document, context, analyzeResult.GetVariablesToMoveIntoMethodDefinition(cancellationToken), status, cancellationToken).ConfigureAwait(false);
+            if (!result.Item1)
+            {
+                result = await TryCheckVariableTypeAsync(document, context, analyzeResult.GetVariablesToSplitOrMoveIntoMethodDefinition(cancellationToken), result.Item2, cancellationToken).ConfigureAwait(false);
+                if (!result.Item1)
+                {
+                    result = await TryCheckVariableTypeAsync(document, context, analyzeResult.MethodParameters, result.Item2, cancellationToken).ConfigureAwait(false);
+                    if (!result.Item1)
+                    {
+                        result = await TryCheckVariableTypeAsync(document, context, analyzeResult.GetVariablesToMoveOutToCallSite(cancellationToken), result.Item2, cancellationToken).ConfigureAwait(false);
+                        if (!result.Item1)
+                        {
+                            result = await TryCheckVariableTypeAsync(document, context, analyzeResult.GetVariablesToSplitOrMoveOutToCallSite(cancellationToken), result.Item2, cancellationToken).ConfigureAwait(false);
+                            if (!result.Item1)
+                            {
+                                return result.Item2;
+                            }
+                        }
+                    }
+                }
+            }
+
+            status = result.Item2;
+
+            var checkedStatus = await CheckTypeAsync(document.Document, context, context.GetLocation(), analyzeResult.ReturnType, cancellationToken).ConfigureAwait(false);
+            return checkedStatus.With(status);
+        }
+
+        private async Task<Tuple<bool, OperationStatus>> TryCheckVariableTypeAsync(
+            SemanticDocument document, SyntaxNode contextNode, IEnumerable<VariableInfo> variables,
+            OperationStatus status, CancellationToken cancellationToken)
+        {
+            if (status.FailedWithNoBestEffortSuggestion())
+            {
+                return Tuple.Create(false, status);
+            }
+
+            var location = contextNode.GetLocation();
+
+            foreach (var variable in variables)
+            {
+                var originalType = variable.GetVariableType(document);
+                var result = await CheckTypeAsync(document.Document, contextNode, location, originalType, cancellationToken).ConfigureAwait(false);
+                if (result.FailedWithNoBestEffortSuggestion())
+                {
+                    status = status.With(result);
+                    return Tuple.Create(false, status);
+                }
+            }
+
+            return Tuple.Create(true, status);
+        }
+
+        public static string MakeMethodName(string prefix, string originalName)
+        {
+            var startingWithLetter = originalName.SkipWhile(c => !char.IsLetter(c)).ToArray();
+            var name = startingWithLetter.Length == 0 ? originalName : new string(startingWithLetter);
+
+            return char.IsUpper(name[0]) ?
+                prefix + name :
+                prefix + char.ToUpper(name[0]).ToString() + name.Substring(1);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/OperationStatus.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/OperationStatus.cs
new file mode 100644
index 0000000000..8c762ed461
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/OperationStatus.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class OperationStatus
+    {
+        public OperationStatus(OperationStatusFlag flag, string reason)
+        {
+            //Contract.ThrowIfTrue(flag.Succeeded() && flag.HasBestEffort());
+
+            this.Flag = flag;
+            this.Reasons = reason == null ? SpecializedCollections.EmptyEnumerable<string>() : SpecializedCollections.SingletonEnumerable(reason);
+        }
+
+        private OperationStatus(OperationStatusFlag flag, IEnumerable<string> reasons)
+        {
+            //Contract.ThrowIfNull(reasons);
+            //Contract.ThrowIfTrue(flag.Succeeded() && flag.HasBestEffort());
+
+            this.Flag = flag;
+            this.Reasons = reasons;
+        }
+
+        public OperationStatus With(OperationStatusFlag flag, string reason)
+        {
+            var newFlag = this.Flag | flag;
+
+            newFlag = (this.Failed() || flag.Failed()) ? newFlag.RemoveFlag(OperationStatusFlag.Succeeded) : newFlag;
+            newFlag = newFlag.Succeeded() ? newFlag.RemoveFlag(OperationStatusFlag.BestEffort) : newFlag;
+
+            var reasons = reason == null ? this.Reasons : this.Reasons.Concat(reason);
+            return new OperationStatus(newFlag, reasons);
+        }
+
+        public OperationStatus With(OperationStatus operationStatus)
+        {
+            var newFlag = this.Flag | operationStatus.Flag;
+
+            newFlag = (this.Failed() || operationStatus.Failed()) ? newFlag.RemoveFlag(OperationStatusFlag.Succeeded) : newFlag;
+            newFlag = newFlag.Succeeded() ? newFlag.RemoveFlag(OperationStatusFlag.BestEffort) : newFlag;
+
+            var reasons = this.Reasons.Concat(operationStatus.Reasons);
+            return new OperationStatus(newFlag, reasons);
+        }
+
+        public OperationStatus MakeFail()
+        {
+            return new OperationStatus(OperationStatusFlag.None, this.Reasons);
+        }
+
+        public OperationStatus MarkSuggestion()
+        {
+            return new OperationStatus(this.Flag | OperationStatusFlag.Suggestion, this.Reasons);
+        }
+
+        public OperationStatus<T> With<T>(T data)
+        {
+            return Create(this, data);
+        }
+
+        public OperationStatusFlag Flag { get; }
+        public IEnumerable<string> Reasons { get; }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/OperationStatus_Statics.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/OperationStatus_Statics.cs
new file mode 100644
index 0000000000..3768600158
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/OperationStatus_Statics.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class OperationStatus
+    {
+        public static readonly OperationStatus Succeeded = new OperationStatus(OperationStatusFlag.Succeeded, reason: null);
+		public static readonly OperationStatus FailedWithUnknownReason = new OperationStatus(OperationStatusFlag.None, reason: "FeaturesResources.ExtractMethodFailedWithUnknownReasons");
+		public static readonly OperationStatus OverlapsHiddenPosition = new OperationStatus(OperationStatusFlag.None, "FeaturesResources.GeneratedCodeIsOverlapping");
+
+		public static readonly OperationStatus NoActiveStatement = new OperationStatus(OperationStatusFlag.BestEffort, "FeaturesResources.NoActiveStatement");
+		public static readonly OperationStatus ErrorOrUnknownType = new OperationStatus(OperationStatusFlag.BestEffort, "FeaturesResources.ErrorOrUnknownType");
+		public static readonly OperationStatus UnsafeAddressTaken = new OperationStatus(OperationStatusFlag.BestEffort, "FeaturesResources.TheAddressOfAVariableIsUsed");
+
+        /// <summary>
+        /// create operation status with the given data
+        /// </summary>
+        public static OperationStatus<T> Create<T>(OperationStatus status, T data)
+        {
+            return new OperationStatus<T>(status, data);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/OperationStatus`1.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/OperationStatus`1.cs
new file mode 100644
index 0000000000..48301d7ed5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/OperationStatus`1.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    /// <summary>
+    /// operation status paired with data
+    /// </summary>
+	class OperationStatus<T>
+    {
+        public OperationStatus(OperationStatus status, T data)
+        {
+            this.Status = status;
+            this.Data = data;
+        }
+
+        public OperationStatus Status { get; }
+        public T Data { get; }
+
+        public OperationStatus<T> With(OperationStatus status)
+        {
+            return new OperationStatus<T>(status, this.Data);
+        }
+
+        public OperationStatus<TNew> With<TNew>(TNew data)
+        {
+            return new OperationStatus<TNew>(this.Status, data);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ParameterStyle.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ParameterStyle.cs
new file mode 100644
index 0000000000..ad012fdc4a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ParameterStyle.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    class ParameterStyle
+    {
+        public ParameterBehavior ParameterBehavior { get; private set; }
+        public DeclarationBehavior DeclarationBehavior { get; private set; }
+        public DeclarationBehavior SaferDeclarationBehavior { get; private set; }
+
+        public static readonly ParameterStyle None =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.None, DeclarationBehavior = DeclarationBehavior.None, SaferDeclarationBehavior = DeclarationBehavior.None };
+
+        public static readonly ParameterStyle InputOnly =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.Input, DeclarationBehavior = DeclarationBehavior.None, SaferDeclarationBehavior = DeclarationBehavior.None };
+
+        public static readonly ParameterStyle Delete =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.None, DeclarationBehavior = DeclarationBehavior.Delete, SaferDeclarationBehavior = DeclarationBehavior.None };
+
+        public static readonly ParameterStyle MoveOut =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.None, DeclarationBehavior = DeclarationBehavior.MoveOut, SaferDeclarationBehavior = DeclarationBehavior.SplitOut };
+
+        public static readonly ParameterStyle SplitOut =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.None, DeclarationBehavior = DeclarationBehavior.SplitOut, SaferDeclarationBehavior = DeclarationBehavior.SplitOut };
+
+        public static readonly ParameterStyle MoveIn =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.None, DeclarationBehavior = DeclarationBehavior.MoveIn, SaferDeclarationBehavior = DeclarationBehavior.SplitIn };
+
+        public static readonly ParameterStyle SplitIn =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.None, DeclarationBehavior = DeclarationBehavior.SplitIn, SaferDeclarationBehavior = DeclarationBehavior.SplitIn };
+
+        public static readonly ParameterStyle Out =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.Out, DeclarationBehavior = DeclarationBehavior.None, SaferDeclarationBehavior = DeclarationBehavior.None };
+
+        public static readonly ParameterStyle Ref =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.Ref, DeclarationBehavior = DeclarationBehavior.None, SaferDeclarationBehavior = DeclarationBehavior.None };
+
+        public static readonly ParameterStyle OutWithMoveOut =
+            new ParameterStyle() { ParameterBehavior = ParameterBehavior.Out, DeclarationBehavior = DeclarationBehavior.MoveOut, SaferDeclarationBehavior = DeclarationBehavior.MoveOut };
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ReturnStyle.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ReturnStyle.cs
new file mode 100644
index 0000000000..9f7d8625c4
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/ReturnStyle.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    class ReturnStyle
+    {
+        public ParameterBehavior ParameterBehavior { get; private set; }
+        public ReturnBehavior ReturnBehavior { get; private set; }
+        public DeclarationBehavior DeclarationBehavior { get; private set; }
+
+        public static readonly ReturnStyle None =
+            new ReturnStyle() { ParameterBehavior = ParameterBehavior.None, ReturnBehavior = ReturnBehavior.None, DeclarationBehavior = DeclarationBehavior.None };
+
+        public static readonly ReturnStyle AssignmentWithInput =
+            new ReturnStyle() { ParameterBehavior = ParameterBehavior.Input, ReturnBehavior = ReturnBehavior.Assignment, DeclarationBehavior = DeclarationBehavior.None };
+
+        public static readonly ReturnStyle AssignmentWithNoInput =
+            new ReturnStyle() { ParameterBehavior = ParameterBehavior.None, ReturnBehavior = ReturnBehavior.Assignment, DeclarationBehavior = DeclarationBehavior.SplitIn };
+
+        public static readonly ReturnStyle Initialization =
+            new ReturnStyle() { ParameterBehavior = ParameterBehavior.None, ReturnBehavior = ReturnBehavior.Initialization, DeclarationBehavior = DeclarationBehavior.SplitOut };
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SelectionResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SelectionResult.cs
new file mode 100644
index 0000000000..df2ff4ec47
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SelectionResult.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    /// <summary>
+    /// clean up this code when we do selection validator work.
+    /// </summary>
+	abstract class SelectionResult
+    {
+        protected SelectionResult(OperationStatus status)
+        {
+            // Contract.ThrowIfNull(status);
+
+            this.Status = status;
+        }
+
+        protected SelectionResult(
+            OperationStatus status,
+            TextSpan originalSpan,
+            TextSpan finalSpan,
+            OptionSet options,
+            bool selectionInExpression,
+            SemanticDocument document,
+            SyntaxAnnotation firstTokenAnnotation,
+            SyntaxAnnotation lastTokenAnnotation)
+        {
+            this.Status = status;
+
+            this.OriginalSpan = originalSpan;
+            this.FinalSpan = finalSpan;
+
+            this.SelectionInExpression = selectionInExpression;
+            this.Options = options;
+
+            this.FirstTokenAnnotation = firstTokenAnnotation;
+            this.LastTokenAnnotation = lastTokenAnnotation;
+
+            this.SemanticDocument = document;
+        }
+
+        protected abstract bool UnderAsyncAnonymousMethod(SyntaxToken token, SyntaxToken firstToken, SyntaxToken lastToken);
+
+        public abstract bool ContainingScopeHasAsyncKeyword();
+
+        public abstract SyntaxNode GetContainingScope();
+        public abstract ITypeSymbol GetContainingScopeType();
+
+        public OperationStatus Status { get; }
+        public TextSpan OriginalSpan { get; }
+        public TextSpan FinalSpan { get; }
+        public OptionSet Options { get; }
+        public bool SelectionInExpression { get; }
+        public SemanticDocument SemanticDocument { get; private set; }
+        public SyntaxAnnotation FirstTokenAnnotation { get; }
+        public SyntaxAnnotation LastTokenAnnotation { get; }
+
+        public SelectionResult With(SemanticDocument document)
+        {
+            if (this.SemanticDocument == document)
+            {
+                return this;
+            }
+
+            var clone = (SelectionResult)this.MemberwiseClone();
+            clone.SemanticDocument = document;
+
+            return clone;
+        }
+
+        public bool ContainsValidContext
+        {
+            get
+            {
+                return this.SemanticDocument != null;
+            }
+        }
+
+        public SyntaxToken GetFirstTokenInSelection()
+        {
+            return this.SemanticDocument.GetTokenWithAnnotaton(this.FirstTokenAnnotation);
+        }
+
+        public SyntaxToken GetLastTokenInSelection()
+        {
+            return this.SemanticDocument.GetTokenWithAnnotaton(this.LastTokenAnnotation);
+        }
+
+        public TNode GetContainingScopeOf<TNode>() where TNode : SyntaxNode
+        {
+            var containingScope = this.GetContainingScope();
+            return containingScope.GetAncestorOrThis<TNode>();
+        }
+
+        protected T GetFirstStatement<T>() where T : SyntaxNode
+        {
+            //Contract.ThrowIfTrue(this.SelectionInExpression);
+
+            var token = this.GetFirstTokenInSelection();
+            return token.GetAncestor<T>();
+        }
+
+        protected T GetLastStatement<T>() where T : SyntaxNode
+        {
+            //Contract.ThrowIfTrue(this.SelectionInExpression);
+
+            var token = this.GetLastTokenInSelection();
+            return token.GetAncestor<T>();
+        }
+
+        public bool ShouldPutAsyncModifier()
+        {
+            var firstToken = this.GetFirstTokenInSelection();
+            var lastToken = this.GetLastTokenInSelection();
+
+            for (var currentToken = firstToken;
+                currentToken.Span.End < lastToken.SpanStart;
+                currentToken = currentToken.GetNextToken())
+            {
+                // [|
+                //     async () => await ....
+                // |]
+                //
+                // for the case above, even if the selection contains "await", it doesn't belong to the enclosing block
+                // which extract method is applied to
+				if (currentToken.IsAwaitKeyword()
+                    && !UnderAsyncAnonymousMethod(currentToken, firstToken, lastToken))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public bool AllowMovingDeclaration
+        {
+            get
+            {
+                return this.Options.GetOption(ExtractMethodOptions.AllowMovingDeclaration, this.SemanticDocument.Project.Language);
+            }
+        }
+
+        public bool DontPutOutOrRefOnStruct
+        {
+            get
+            {
+                return this.Options.GetOption(ExtractMethodOptions.DontPutOutOrRefOnStruct, this.SemanticDocument.Project.Language);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SelectionValidator.NullSelectionResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SelectionValidator.NullSelectionResult.cs
new file mode 100644
index 0000000000..3a957d7222
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SelectionValidator.NullSelectionResult.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	partial class SelectionValidator
+    {
+        // null object
+        protected class NullSelectionResult : SelectionResult
+        {
+            public NullSelectionResult() :
+                this(OperationStatus.FailedWithUnknownReason)
+            {
+            }
+
+            protected NullSelectionResult(OperationStatus status) :
+                base(status)
+            {
+            }
+
+            protected override bool UnderAsyncAnonymousMethod(SyntaxToken token, SyntaxToken firstToken, SyntaxToken lastToken)
+            {
+                throw new InvalidOperationException();
+            }
+
+            public override bool ContainingScopeHasAsyncKeyword()
+            {
+                throw new InvalidOperationException();
+            }
+			 
+            public override SyntaxNode GetContainingScope()
+            {
+                throw new InvalidOperationException();
+            }
+
+            public override ITypeSymbol GetContainingScopeType()
+            {
+                throw new InvalidOperationException();
+            }
+        }
+
+        protected class ErrorSelectionResult : NullSelectionResult
+        {
+            public ErrorSelectionResult(OperationStatus status) :
+                base(status.MakeFail())
+            {
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SelectionValidator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SelectionValidator.cs
new file mode 100644
index 0000000000..4067dfe48d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SelectionValidator.cs
@@ -0,0 +1,185 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	abstract partial class SelectionValidator
+    {
+        protected static readonly SelectionResult NullSelection = new NullSelectionResult();
+
+        protected readonly SemanticDocument SemanticDocument;
+        protected readonly TextSpan OriginalSpan;
+        protected readonly OptionSet Options;
+
+        protected SelectionValidator(
+            SemanticDocument document,
+            TextSpan textSpan,
+            OptionSet options)
+        {
+            //Contract.ThrowIfNull(document);
+
+            this.SemanticDocument = document;
+            this.OriginalSpan = textSpan;
+            this.Options = options;
+        }
+
+        public bool ContainsValidSelection
+        {
+            get
+            {
+                return !this.OriginalSpan.IsEmpty;
+            }
+        }
+
+        public abstract Task<SelectionResult> GetValidSelectionAsync(CancellationToken cancellationToken);
+        public abstract IEnumerable<SyntaxNode> GetOuterReturnStatements(SyntaxNode commonRoot, IEnumerable<SyntaxNode> jumpsOutOfRegion);
+        public abstract bool IsFinalSpanSemanticallyValidSpan(SyntaxNode node, TextSpan textSpan, IEnumerable<SyntaxNode> returnStatements, CancellationToken cancellationToken);
+        public abstract bool ContainsNonReturnExitPointsStatements(IEnumerable<SyntaxNode> jumpsOutOfRegion);
+
+        protected bool IsFinalSpanSemanticallyValidSpan(
+            SemanticModel semanticModel, TextSpan textSpan, Tuple<SyntaxNode, SyntaxNode> range, CancellationToken cancellationToken)
+        {
+            //Contract.ThrowIfNull(range);
+
+            var controlFlowAnalysisData = semanticModel.AnalyzeControlFlow(range.Item1, range.Item2);
+
+            // there must be no control in and out of given span
+            if (controlFlowAnalysisData.EntryPoints.Any())
+            {
+                return false;
+            }
+
+            // check something like continue, break, yield break, yield return, and etc
+            if (ContainsNonReturnExitPointsStatements(controlFlowAnalysisData.ExitPoints))
+            {
+                return false;
+            }
+
+            // okay, there is no branch out, check whether next statement can be executed normally
+            var returnStatements = GetOuterReturnStatements(range.Item1.GetCommonRoot(range.Item2), controlFlowAnalysisData.ExitPoints);
+            if (!returnStatements.Any())
+            {
+                if (!controlFlowAnalysisData.EndPointIsReachable)
+                {
+                    // REVIEW: should we just do extract method regardless or show some warning to user?
+                    // in dev10, looks like we went ahead and did the extract method even if selection contains
+                    // unreachable code.
+                }
+
+                return true;
+            }
+
+            // okay, only branch was return. make sure we have all return in the selection. (?)
+            if (!controlFlowAnalysisData.EndPointIsReachable)
+            {
+                return true;
+            }
+
+            // there is a return statement, and current position is reachable. let's check whether this is a case where that is okay
+            return IsFinalSpanSemanticallyValidSpan(semanticModel.SyntaxTree.GetRoot(cancellationToken), textSpan, returnStatements, cancellationToken);
+        }
+
+        protected Tuple<SyntaxNode, SyntaxNode> GetStatementRangeContainingSpan<T>(
+            SyntaxNode root, TextSpan textSpan, CancellationToken cancellationToken) where T : SyntaxNode
+        {
+            // use top-down approach to find smallest statement range that contains given span.
+            // this approach is more expansive than bottom-up approach I used before but way simpler and easy to understand
+            var token1 = root.FindToken(textSpan.Start);
+            var token2 = root.FindTokenFromEnd(textSpan.End);
+
+			var commonRoot = token1.GetCommonRoot(token2).GetAncestorOrThis<T>() ?? root;
+
+            var firstStatement = default(T);
+            var lastStatement = default(T);
+
+            var spine = new List<T>();
+
+            foreach (var stmt in commonRoot.DescendantNodesAndSelf().OfType<T>())
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // quick skip check.
+                // - not containing at all
+                if (stmt.Span.End < textSpan.Start)
+                {
+                    continue;
+                }
+
+                // quick exit check
+                // - passed candidate statements
+                if (textSpan.End < stmt.SpanStart)
+                {
+                    break;
+                }
+
+                if (stmt.SpanStart <= textSpan.Start)
+                {
+                    // keep track spine
+                    spine.Add(stmt);
+                }
+
+                if (textSpan.End <= stmt.Span.End && spine.Any(s => s.Parent == stmt.Parent))
+                {
+                    // malformed code or selection can make spine to have more than an elements
+                    firstStatement = spine.First(s => s.Parent == stmt.Parent);
+                    lastStatement = stmt;
+
+                    spine.Clear();
+                }
+            }
+
+            if (firstStatement == null || lastStatement == null)
+            {
+                return null;
+            }
+
+            return new Tuple<SyntaxNode, SyntaxNode>(firstStatement, lastStatement);
+        }
+
+        protected Tuple<SyntaxNode, SyntaxNode> GetStatementRangeContainedInSpan<T>(
+            SyntaxNode root, TextSpan textSpan, CancellationToken cancellationToken) where T : SyntaxNode
+        {
+            // use top-down approach to find largest statement range contained in the given span
+            // this method is a bit more expensive than bottom-up approach, but way more simpler than the other approach.
+            var token1 = root.FindToken(textSpan.Start);
+            var token2 = root.FindTokenFromEnd(textSpan.End);
+
+            var commonRoot = token1.GetCommonRoot(token2).GetAncestorOrThis<T>() ?? root;
+
+            T firstStatement = null;
+            T lastStatement = null;
+
+            foreach (var stmt in commonRoot.DescendantNodesAndSelf().OfType<T>())
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                if (firstStatement == null && stmt.SpanStart >= textSpan.Start)
+                {
+                    firstStatement = stmt;
+                }
+
+                if (firstStatement != null && stmt.Span.End <= textSpan.End && stmt.Parent == firstStatement.Parent)
+                {
+                    lastStatement = stmt;
+                }
+            }
+
+            if (firstStatement == null || lastStatement == null)
+            {
+                return null;
+            }
+
+            return new Tuple<SyntaxNode, SyntaxNode>(firstStatement, lastStatement);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SimpleExtractMethodResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SimpleExtractMethodResult.cs
new file mode 100644
index 0000000000..ccdc5aaac6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/SimpleExtractMethodResult.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    class SimpleExtractMethodResult : ExtractMethodResult
+    {
+        public SimpleExtractMethodResult(
+            OperationStatus status,
+            Document document,
+            SyntaxToken invocationNameToken,
+            SyntaxNode methodDefinition)
+            : base(status.Flag, status.Reasons, document, invocationNameToken, methodDefinition)
+        {
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/UniqueNameGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/UniqueNameGenerator.cs
new file mode 100644
index 0000000000..ed5ac2b4f0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/UniqueNameGenerator.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+    class UniqueNameGenerator
+    {
+        private readonly SemanticModel _semanticModel;
+
+        public UniqueNameGenerator(SemanticModel semanticModel)
+        {
+            //Contract.ThrowIfNull(semanticModel);
+            _semanticModel = semanticModel;
+        }
+
+        public string CreateUniqueMethodName(SyntaxNode contextNode, string baseName)
+        {
+            //Contract.ThrowIfNull(contextNode);
+            //Contract.ThrowIfNull(baseName);
+
+            return NameGenerator.GenerateUniqueName(baseName, string.Empty,
+               n => _semanticModel.LookupSymbols(contextNode.SpanStart, /*container*/null, n).Length == 0);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/VariableStyle.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/VariableStyle.cs
new file mode 100644
index 0000000000..3eb25eebf0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ExtractMethod/VariableStyle.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace ICSharpCode.NRefactory6.CSharp.ExtractMethod
+{
+	class VariableStyle
+    {
+        public ParameterStyle ParameterStyle { get; private set; }
+        public ReturnStyle ReturnStyle { get; private set; }
+
+        public static readonly VariableStyle None =
+            new VariableStyle() { ParameterStyle = ParameterStyle.None, ReturnStyle = ReturnStyle.None };
+
+        public static readonly VariableStyle InputOnly =
+            new VariableStyle() { ParameterStyle = ParameterStyle.InputOnly, ReturnStyle = ReturnStyle.None };
+
+        public static readonly VariableStyle Delete =
+            new VariableStyle() { ParameterStyle = ParameterStyle.Delete, ReturnStyle = ReturnStyle.None };
+
+        public static readonly VariableStyle MoveOut =
+            new VariableStyle() { ParameterStyle = ParameterStyle.MoveOut, ReturnStyle = ReturnStyle.None };
+
+        public static readonly VariableStyle SplitOut =
+            new VariableStyle() { ParameterStyle = ParameterStyle.SplitOut, ReturnStyle = ReturnStyle.None };
+
+        public static readonly VariableStyle MoveIn =
+            new VariableStyle() { ParameterStyle = ParameterStyle.MoveIn, ReturnStyle = ReturnStyle.None };
+
+        public static readonly VariableStyle SplitIn =
+            new VariableStyle() { ParameterStyle = ParameterStyle.SplitIn, ReturnStyle = ReturnStyle.None };
+
+        public static readonly VariableStyle NotUsed =
+            new VariableStyle() { ParameterStyle = ParameterStyle.MoveOut, ReturnStyle = ReturnStyle.Initialization };
+
+        public static readonly VariableStyle Ref =
+            new VariableStyle() { ParameterStyle = ParameterStyle.Ref, ReturnStyle = ReturnStyle.AssignmentWithInput };
+
+        public static readonly VariableStyle OnlyAsRefParam =
+            new VariableStyle() { ParameterStyle = ParameterStyle.Ref, ReturnStyle = ReturnStyle.None };
+
+        public static readonly VariableStyle Out =
+            new VariableStyle() { ParameterStyle = ParameterStyle.Out, ReturnStyle = ReturnStyle.AssignmentWithNoInput };
+
+        public static readonly VariableStyle OutWithErrorInput =
+            new VariableStyle() { ParameterStyle = ParameterStyle.Out, ReturnStyle = ReturnStyle.AssignmentWithInput };
+
+        public static readonly VariableStyle OutWithMoveOut =
+            new VariableStyle() { ParameterStyle = ParameterStyle.OutWithMoveOut, ReturnStyle = ReturnStyle.Initialization };
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/CSharpEditorFormattingService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/CSharpEditorFormattingService.cs
new file mode 100644
index 0000000000..04508ba1d7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/CSharpEditorFormattingService.cs
@@ -0,0 +1,292 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Formatting.Rules;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using System.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	partial class CSharpEditorFormattingService
+	{
+		private readonly ImmutableHashSet<char> _supportedChars;
+		private readonly ImmutableHashSet<char> _autoFormattingTriggerChars;
+		private readonly ImmutableDictionary<char, ImmutableHashSet<SyntaxKind>> _multiWordsMap;
+
+		public CSharpEditorFormattingService()
+		{
+			_autoFormattingTriggerChars = ImmutableHashSet.CreateRange<char>(";}");
+
+			// add all auto formatting trigger to supported char
+			_supportedChars = _autoFormattingTriggerChars.Union("{}#nte:)");
+
+			// set up multi words map
+			_multiWordsMap = ImmutableDictionary.CreateRange(new[]
+				{
+					new KeyValuePair<char, ImmutableHashSet<SyntaxKind>> ('n', ImmutableHashSet.Create(SyntaxKind.RegionKeyword, SyntaxKind.EndRegionKeyword)),
+					new KeyValuePair<char, ImmutableHashSet<SyntaxKind>> ('t', ImmutableHashSet.Create(SyntaxKind.SelectKeyword)),
+					new KeyValuePair<char, ImmutableHashSet<SyntaxKind>> ('e', ImmutableHashSet.Create(SyntaxKind.WhereKeyword)),
+				});
+		}
+
+		public bool SupportsFormatDocument { get { return true; } }
+
+		public bool SupportsFormatOnPaste { get { return true; } }
+
+		public bool SupportsFormatSelection { get { return true; } }
+
+		public bool SupportsFormatOnReturn { get { return true; } }
+
+		public bool SupportsFormattingOnTypedCharacter(Document document, char ch)
+		{
+			var optionsService = document.Project.Solution.Workspace.Options;
+			//			if ((ch == '}' && !optionsService.GetOption(FeatureOnOffOptions.AutoFormattingOnCloseBrace, document.Project.Language)) ||
+			//				(ch == ';' && !optionsService.GetOption(FeatureOnOffOptions.AutoFormattingOnSemicolon, document.Project.Language)))
+			//			{
+			//				return false;
+			//			}
+
+			return _supportedChars.Contains(ch);
+		}
+
+		//		public async Task<IList<TextChange>> GetFormattingChangesAsync(Document document, TextSpan? textSpan, CancellationToken cancellationToken)
+		//		{
+		//			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+		//
+		//			var span = textSpan.HasValue ? textSpan.Value : new TextSpan(0, root.FullSpan.Length);
+		//			var formattingSpan = CommonFormattingHelpers.GetFormattingSpan(root, span);
+		//			return Formatter.GetFormattedTextChanges(root, new TextSpan[] { formattingSpan }, document.Project.Solution.Workspace, cancellationToken: cancellationToken);
+		//		}
+		//
+		//		public async Task<IList<TextChange>> GetFormattingChangesOnPasteAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken)
+		//		{
+		//			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+		//			var formattingSpan = CommonFormattingHelpers.GetFormattingSpan(root, textSpan);
+		//			var service = document.GetLanguageService<ISyntaxFormattingService>();
+		//			if (service == null)
+		//			{
+		//				return SpecializedCollections.EmptyList<TextChange>();
+		//			}
+		//
+		//			var rules = new List<IFormattingRule>() { new PasteFormattingRule() };
+		//			rules.AddRange(service.GetDefaultFormattingRules());
+		//
+		//			return Formatter.GetFormattedTextChanges(root, new[] { formattingSpan }, document.Project.Solution.Workspace, rules: rules, cancellationToken: cancellationToken);
+		//		}
+		//
+		//		private IEnumerable<IFormattingRule> GetFormattingRules(Document document, int position)
+		//		{
+		//			var workspace = document.Project.Solution.Workspace;
+		//			var formattingRuleFactory = workspace.Services.GetService<IHostDependentFormattingRuleFactoryService>();
+		//			return formattingRuleFactory.CreateRule(document, position).Concat(Formatter.GetDefaultFormattingRules(document));
+		//		}
+		//
+		//		public async Task<IList<TextChange>> GetFormattingChangesOnReturnAsync(Document document, int caretPosition, CancellationToken cancellationToken)
+		//		{
+		//			var formattingRules = this.GetFormattingRules(document, caretPosition);
+		//
+		//			// first, find the token user just typed.
+		//			SyntaxToken token = await GetTokenBeforeTheCaretAsync(document, caretPosition, cancellationToken).ConfigureAwait(false);
+		//
+		//			if (token.IsMissing)
+		//			{
+		//				return null;
+		//			}
+		//
+		//			string text = null;
+		//			if (IsInvalidToken(token, ref text))
+		//			{
+		//				return null;
+		//			}
+		//
+		//			// Check to see if the token is ')' and also the parent is a using statement. If not, bail
+		//			if (TokenShouldNotFormatOnReturn(token))
+		//			{
+		//				return null;
+		//			}
+		//
+		//			// if formatting range fails, do format token one at least
+		//			var changes = await FormatRangeAsync(document, token, formattingRules, cancellationToken).ConfigureAwait(false);
+		//			if (changes.Count > 0)
+		//			{
+		//				return changes;
+		//			}
+		//
+		//			// if we can't, do normal smart indentation
+		//			return await FormatTokenAsync(document, token, formattingRules, cancellationToken).ConfigureAwait(false);
+		//		}
+		//
+		public static bool TokenShouldNotFormatOnReturn(SyntaxToken token)
+		{
+			return !token.IsKind(SyntaxKind.CloseParenToken) || !token.Parent.IsKind(SyntaxKind.UsingStatement);
+		}
+
+		public static bool TokenShouldNotFormatOnTypeChar(SyntaxToken token)
+		{
+			return (token.IsKind(SyntaxKind.CloseParenToken) && !token.Parent.IsKind(SyntaxKind.UsingStatement)) ||
+				(token.IsKind(SyntaxKind.ColonToken) && !(token.Parent.IsKind(SyntaxKind.LabeledStatement) || token.Parent.IsKind(SyntaxKind.CaseSwitchLabel) || token.Parent.IsKind(SyntaxKind.DefaultSwitchLabel)));
+		}
+
+		//		public async Task<IList<TextChange>> GetFormattingChangesAsync(Document document, char typedChar, int caretPosition, CancellationToken cancellationToken)
+		//		{
+		//			var formattingRules = this.GetFormattingRules(document, caretPosition);
+		//
+		//			// first, find the token user just typed.
+		//			SyntaxToken token = await GetTokenBeforeTheCaretAsync(document, caretPosition, cancellationToken).ConfigureAwait(false);
+		//
+		//			if (token.IsMissing ||
+		//				!ValidSingleOrMultiCharactersTokenKind(typedChar, token.Kind()) ||
+		//				token.IsKind(SyntaxKind.EndOfFileToken, SyntaxKind.None))
+		//			{
+		//				return null;
+		//			}
+		//
+		//			var service = document.GetLanguageService<ISyntaxFactsService>();
+		//			if (service != null && service.IsInNonUserCode(token.SyntaxTree, caretPosition, cancellationToken))
+		//			{
+		//				return null;
+		//			}
+		//
+		//			// Check to see if any of the below. If not, bail.
+		//			// case 1: The token is ')' and the parent is an using statement.
+		//			// case 2: The token is ':' and the parent is either labelled statement or case switch or default switch
+		//			if (TokenShouldNotFormatOnTypeChar(token))
+		//			{
+		//				return null;
+		//			}
+		//
+		//			// if formatting range fails, do format token one at least
+		//			var changes = await FormatRangeAsync(document, token, formattingRules, cancellationToken).ConfigureAwait(false);
+		//			if (changes.Count > 0)
+		//			{
+		//				return changes;
+		//			}
+		//
+		//			// if we can't, do normal smart indentation
+		//			return await FormatTokenAsync(document, token, formattingRules, cancellationToken).ConfigureAwait(false);
+		//		}
+
+		public static async Task<SyntaxToken> GetTokenBeforeTheCaretAsync(Document document, int caretPosition, CancellationToken cancellationToken)
+		{
+			var tree = await document.GetCSharpSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+
+			var position = Math.Max(0, caretPosition - 1);
+			var root = await tree.GetRootAsync(cancellationToken).ConfigureAwait(false);
+			var token = root.FindToken(position, findInsideTrivia: true);
+			return token;
+		}
+
+		//		private async Task<IList<TextChange>> FormatTokenAsync(Document document, SyntaxToken token, IEnumerable<IFormattingRule> formattingRules, CancellationToken cancellationToken)
+		//		{
+		//			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+		//			var formatter = CreateSmartTokenFormatter(document.Project.Solution.Workspace.Options, formattingRules, root);
+		//			var changes = formatter.FormatToken(document.Project.Solution.Workspace, token, cancellationToken);
+		//			return changes;
+		//		}
+		//
+		//		private ISmartTokenFormatter CreateSmartTokenFormatter(OptionSet optionSet, IEnumerable<IFormattingRule> formattingRules, SyntaxNode root)
+		//		{
+		//			return new SmartTokenFormatter(optionSet, formattingRules, (CompilationUnitSyntax)root);
+		//		}
+		//
+		//		private async Task<IList<TextChange>> FormatRangeAsync(
+		//			Document document, SyntaxToken endToken, IEnumerable<IFormattingRule> formattingRules,
+		//			CancellationToken cancellationToken)
+		//		{
+		//			if (!IsEndToken(endToken))
+		//			{
+		//				return SpecializedCollections.EmptyList<TextChange>();
+		//			}
+		//
+		//			var tokenRange = FormattingRangeHelper.FindAppropriateRange(endToken);
+		//			if (tokenRange == null || tokenRange.Value.Item1.Equals(tokenRange.Value.Item2))
+		//			{
+		//				return SpecializedCollections.EmptyList<TextChange>();
+		//			}
+		//
+		//			if (IsInvalidTokenKind(tokenRange.Value.Item1) || IsInvalidTokenKind(tokenRange.Value.Item2))
+		//			{
+		//				return SpecializedCollections.EmptyList<TextChange>();
+		//			}
+		//
+		//			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+		//			var formatter = new SmartTokenFormatter(document.Project.Solution.Workspace.Options, formattingRules, (CompilationUnitSyntax)root);
+		//
+		//			var changes = formatter.FormatRange(document.Project.Solution.Workspace, tokenRange.Value.Item1, tokenRange.Value.Item2, cancellationToken);
+		//			return changes;
+		//		}
+		//
+		//		private bool IsEndToken(SyntaxToken endToken)
+		//		{
+		//			if (endToken.IsKind(SyntaxKind.OpenBraceToken))
+		//			{
+		//				return false;
+		//			}
+		//
+		//			return true;
+		//		}
+		//
+		public bool ValidSingleOrMultiCharactersTokenKind(char typedChar, SyntaxKind kind)
+		{
+			ImmutableHashSet<SyntaxKind> set;
+			if (!_multiWordsMap.TryGetValue(typedChar, out set))
+			{
+				// all single char token is valid
+				return true;
+			}
+
+			return set.Contains(kind);
+		}
+
+		public bool IsInvalidToken(char typedChar, SyntaxToken token)
+		{
+			string text = null;
+			if (IsInvalidToken(token, ref text))
+			{
+				return true;
+			}
+
+			return text[0] != typedChar;
+		}
+
+		public bool IsInvalidToken(SyntaxToken token, ref string text)
+		{
+			if (IsInvalidTokenKind(token))
+			{
+				return true;
+			}
+
+			text = token.ToString();
+			if (text.Length != 1)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		private bool IsInvalidTokenKind(SyntaxToken token)
+		{
+			// invalid token to be formatted
+			return token.IsKind(SyntaxKind.None) ||
+				token.IsKind(SyntaxKind.EndOfDirectiveToken) ||
+				token.IsKind(SyntaxKind.EndOfFileToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/CommonFormattingHelpers.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/CommonFormattingHelpers.cs
new file mode 100644
index 0000000000..673f64030b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/CommonFormattingHelpers.cs
@@ -0,0 +1,372 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Formatting.Rules;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CommonFormattingHelpers
+	{
+//		public static readonly Comparison<SuppressOperation> SuppressOperationComparer = (o1, o2) =>
+//		{
+//			return o1.TextSpan.Start - o2.TextSpan.Start;
+//		};
+//
+//		public static readonly Comparison<IndentBlockOperation> IndentBlockOperationComparer = (o1, o2) =>
+//		{
+//			// smaller one goes left
+//			var s = o1.TextSpan.Start - o2.TextSpan.Start;
+//			if (s != 0)
+//			{
+//				return s;
+//			}
+//
+//			// bigger one goes left
+//			var e = o2.TextSpan.End - o1.TextSpan.End;
+//			if (e != 0)
+//			{
+//				return e;
+//			}
+//
+//			return 0;
+//		};
+//
+//		public static IEnumerable<ValueTuple<SyntaxToken, SyntaxToken>> ConvertToTokenPairs(this SyntaxNode root, IList<TextSpan> spans)
+//		{
+//			Contract.ThrowIfNull(root);
+//			Contract.ThrowIfFalse(spans.Count > 0);
+//
+//			if (spans.Count == 1)
+//			{
+//				// special case, if there is only one span, return right away
+//				yield return root.ConvertToTokenPair(spans[0]);
+//				yield break;
+//			}
+//
+//			var pairs = new List<ValueTuple<SyntaxToken, SyntaxToken>>();
+//			var previousOne = root.ConvertToTokenPair(spans[0]);
+//
+//			// iterate through each spans and make sure each one doesn't overlap each other
+//			for (int i = 1; i < spans.Count; i++)
+//			{
+//				var currentOne = root.ConvertToTokenPair(spans[i]);
+//				if (currentOne.Item1.SpanStart <= previousOne.Item2.Span.End)
+//				{
+//					// oops, looks like two spans are overlapping each other. merge them
+//					previousOne = ValueTuple.Create(previousOne.Item1, previousOne.Item2.Span.End < currentOne.Item2.Span.End ? currentOne.Item2 : previousOne.Item2);
+//					continue;
+//				}
+//
+//				// okay, looks like things are in good shape
+//				yield return previousOne;
+//
+//				// move to next one
+//				previousOne = currentOne;
+//			}
+//
+//			// give out the last one
+//			yield return previousOne;
+//		}
+//
+//		public static ValueTuple<SyntaxToken, SyntaxToken> ConvertToTokenPair(this SyntaxNode root, TextSpan textSpan)
+//		{
+//			Contract.ThrowIfNull(root);
+//			Contract.ThrowIfTrue(textSpan.IsEmpty);
+//
+//			var startToken = root.FindToken(textSpan.Start);
+//
+//			// empty token, get previous non-zero length token
+//			if (startToken.IsMissing)
+//			{
+//				// if there is no previous token, startToken will be set to SyntaxKind.None
+//				startToken = startToken.GetPreviousToken();
+//			}
+//
+//			// span is on leading trivia
+//			if (textSpan.Start < startToken.SpanStart)
+//			{
+//				// if there is no previous token, startToken will be set to SyntaxKind.None
+//				startToken = startToken.GetPreviousToken();
+//			}
+//
+//			// adjust position where we try to search end token
+//			var endToken = (root.FullSpan.End <= textSpan.End) ?
+//				root.GetLastToken(includeZeroWidth: true) : root.FindToken(textSpan.End);
+//
+//			// empty token, get next token
+//			if (endToken.IsMissing)
+//			{
+//				endToken = endToken.GetNextToken();
+//			}
+//
+//			// span is on trailing trivia
+//			if (endToken.Span.End < textSpan.End)
+//			{
+//				endToken = endToken.GetNextToken();
+//			}
+//
+//			// make sure tokens are not SyntaxKind.None
+//			startToken = (startToken.RawKind != 0) ? startToken : root.GetFirstToken(includeZeroWidth: true);
+//			endToken = (endToken.RawKind != 0) ? endToken : root.GetLastToken(includeZeroWidth: true);
+//
+//			// token is in right order
+//			Contract.ThrowIfFalse(startToken.Equals(endToken) || startToken.Span.End <= endToken.SpanStart);
+//			return ValueTuple.Create(startToken, endToken);
+//		}
+//
+//		public static bool IsInvalidTokenRange(this SyntaxNode root, SyntaxToken startToken, SyntaxToken endToken)
+//		{
+//			// given token must be token exist excluding EndOfFile token.
+//			if (startToken.RawKind == 0 || endToken.RawKind == 0)
+//			{
+//				return true;
+//			}
+//
+//			if (startToken.Equals(endToken))
+//			{
+//				return false;
+//			}
+//
+//			// regular case. 
+//			// start token can't be end of file token and start token must be before end token if it's not the same token.
+//			return root.FullSpan.End == startToken.SpanStart || startToken.FullSpan.End > endToken.FullSpan.Start;
+//		}
+//
+//		public static int GetTokenColumn(this SyntaxTree tree, SyntaxToken token, int tabSize)
+//		{
+//			Contract.ThrowIfNull(tree);
+//			Contract.ThrowIfTrue(token.RawKind == 0);
+//
+//			var startPosition = token.SpanStart;
+//			var line = tree.GetText().Lines.GetLineFromPosition(startPosition);
+//
+//			return line.GetColumnFromLineOffset(startPosition - line.Start, tabSize);
+//		}
+//
+//		public static string GetText(this SourceText text, SyntaxToken token1, SyntaxToken token2)
+//		{
+//			return (token1.RawKind == 0) ? text.ToString(TextSpan.FromBounds(0, token2.SpanStart)) : text.ToString(TextSpan.FromBounds(token1.Span.End, token2.SpanStart));
+//		}
+//
+		public static string GetTextBetween(SyntaxToken token1, SyntaxToken token2)
+		{
+			var builder = new StringBuilder();
+			AppendTextBetween(token1, token2, builder);
+
+			return builder.ToString();
+		}
+
+		public static void AppendTextBetween(SyntaxToken token1, SyntaxToken token2, StringBuilder builder)
+		{
+//			Contract.ThrowIfTrue(token1.RawKind == 0 && token2.RawKind == 0);
+//			Contract.ThrowIfTrue(token1.Equals(token2));
+//
+			if (token1.RawKind == 0)
+			{
+				AppendLeadingTriviaText(token2, builder);
+				return;
+			}
+
+			if (token2.RawKind == 0)
+			{
+				AppendTrailingTriviaText(token1, builder);
+				return;
+			}
+
+			//var token1PartOftoken2LeadingTrivia = token1.FullSpan.Start > token2.FullSpan.Start;
+
+			if (token1.FullSpan.End == token2.FullSpan.Start)
+			{
+				AppendTextBetweenTwoAdjacentTokens(token1, token2, builder);
+				return;
+			}
+
+			AppendTrailingTriviaText(token1, builder);
+
+			for (var token = token1.GetNextToken(includeZeroWidth: true); token.FullSpan.End <= token2.FullSpan.Start; token = token.GetNextToken(includeZeroWidth: true))
+			{
+				builder.Append(token.ToFullString());
+			}
+
+			AppendPartialLeadingTriviaText(token2, builder, token1.TrailingTrivia.FullSpan.End);
+		}
+
+		private static void AppendTextBetweenTwoAdjacentTokens(SyntaxToken token1, SyntaxToken token2, StringBuilder builder)
+		{
+			AppendTrailingTriviaText(token1, builder);
+			AppendLeadingTriviaText(token2, builder);
+		}
+
+		private static void AppendLeadingTriviaText(SyntaxToken token, StringBuilder builder)
+		{
+			if (!token.HasLeadingTrivia)
+			{
+				return;
+			}
+
+			foreach (var trivia in token.LeadingTrivia)
+			{
+				builder.Append(trivia.ToFullString());
+			}
+		}
+
+		/// <summary>
+		/// If the token1 is expected to be part of the leading trivia of the token2 then the trivia
+		/// before the token1FullSpanEnd, which the fullspan end of the token1 should be ignored
+		/// </summary>
+		private static void AppendPartialLeadingTriviaText(SyntaxToken token, StringBuilder builder, int token1FullSpanEnd)
+		{
+			if (!token.HasLeadingTrivia)
+			{
+				return;
+			}
+
+			foreach (var trivia in token.LeadingTrivia)
+			{
+				if (trivia.FullSpan.End <= token1FullSpanEnd)
+				{
+					continue;
+				}
+
+				builder.Append(trivia.ToFullString());
+			}
+		}
+
+		private static void AppendTrailingTriviaText(SyntaxToken token, StringBuilder builder)
+		{
+			if (!token.HasTrailingTrivia)
+			{
+				return;
+			}
+
+			foreach (var trivia in token.TrailingTrivia)
+			{
+				builder.Append(trivia.ToFullString());
+			}
+		}
+
+//		/// <summary>
+//		/// this will create a span that includes its trailing trivia of its previous token and leading trivia of its next token
+//		/// for example, for code such as "class A { int ...", if given tokens are "A" and "{", this will return span [] of "class[ A { ]int ..."
+//		/// which included trailing trivia of "class" which is previous token of "A", and leading trivia of "int" which is next token of "{"
+//		/// </summary>
+//		public static TextSpan GetSpanIncludingTrailingAndLeadingTriviaOfAdjacentTokens(SyntaxToken startToken, SyntaxToken endToken)
+//		{
+//			// most of cases we can just ask previous and next token to create the span, but in some corner cases such as omitted token case,
+//			// those navigation function doesn't work, so we have to explore the tree ourselves to create rigth span
+//			var startPosition = GetStartPositionOfSpan(startToken);
+//			var endPosition = GetEndPositionOfSpan(endToken);
+//
+//			return TextSpan.FromBounds(startPosition, endPosition);
+//		}
+//
+//		private static int GetEndPositionOfSpan(SyntaxToken token)
+//		{
+//			var nextToken = token.GetNextToken();
+//			if (nextToken.RawKind != 0)
+//			{
+//				return nextToken.SpanStart;
+//			}
+//
+//			var backwardPosition = token.FullSpan.End;
+//			var parentNode = GetParentThatContainsGivenSpan(token.Parent, backwardPosition, forward: false);
+//			if (parentNode == null)
+//			{
+//				// reached the end of tree
+//				return token.FullSpan.End;
+//			}
+//
+//			Contract.ThrowIfFalse(backwardPosition < parentNode.FullSpan.End);
+//
+//			nextToken = parentNode.FindToken(backwardPosition + 1);
+//
+//			Contract.ThrowIfTrue(nextToken.RawKind == 0);
+//
+//			return nextToken.SpanStart;
+//		}
+//
+//		public static int GetStartPositionOfSpan(SyntaxToken token)
+//		{
+//			var previousToken = token.GetPreviousToken();
+//			if (previousToken.RawKind != 0)
+//			{
+//				return previousToken.Span.End;
+//			}
+//
+//			// first token in the tree
+//			var forwardPosition = token.FullSpan.Start;
+//			if (forwardPosition <= 0)
+//			{
+//				return 0;
+//			}
+//
+//			var parentNode = GetParentThatContainsGivenSpan(token.Parent, forwardPosition, forward: true);
+//			if (parentNode == null)
+//			{
+//				return Contract.FailWithReturn<int>("This can't happen");
+//			}
+//
+//			Contract.ThrowIfFalse(parentNode.FullSpan.Start < forwardPosition);
+//
+//			previousToken = parentNode.FindToken(forwardPosition + 1);
+//
+//			Contract.ThrowIfTrue(previousToken.RawKind == 0);
+//
+//			return previousToken.Span.End;
+//		}
+//
+//		private static SyntaxNode GetParentThatContainsGivenSpan(SyntaxNode node, int position, bool forward)
+//		{
+//			while (node != null)
+//			{
+//				var fullSpan = node.FullSpan;
+//				if (forward)
+//				{
+//					if (fullSpan.Start < position)
+//					{
+//						return node;
+//					}
+//				}
+//				else
+//				{
+//					if (position > fullSpan.End)
+//					{
+//						return node;
+//					}
+//				}
+//
+//				node = node.Parent;
+//			}
+//
+//			return null;
+//		}
+//
+//		public static bool HasAnyWhitespaceElasticTrivia(SyntaxToken previousToken, SyntaxToken currentToken)
+//		{
+//			if ((!previousToken.ContainsAnnotations && !currentToken.ContainsAnnotations) ||
+//				(!previousToken.HasTrailingTrivia && !currentToken.HasLeadingTrivia))
+//			{
+//				return false;
+//			}
+//
+//			return previousToken.TrailingTrivia.HasAnyWhitespaceElasticTrivia() || currentToken.LeadingTrivia.HasAnyWhitespaceElasticTrivia();
+//		}
+//
+//		public static bool IsNull<T>(T t) where T : class
+//		{
+//			return t == null;
+//		}
+//
+//		public static bool IsNotNull<T>(T t) where T : class
+//		{
+//			return !IsNull(t);
+//		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/FormattingHelpers.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/FormattingHelpers.cs
new file mode 100644
index 0000000000..210aec33e9
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/FormattingHelpers.cs
@@ -0,0 +1,552 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class FormattingHelpers
+	{
+		// TODO:  Need to determine correct way to handle newlines
+		public const string NewLine = "\r\n";
+
+		public static string GetIndent(this SyntaxToken token)
+		{
+			var precedingTrivia = token.GetAllPrecedingTriviaToPreviousToken();
+
+			// indent is the spaces/tabs between last new line (if there is one) and end of trivia
+			var indent = precedingTrivia.AsString();
+			int lastNewLinePos = indent.LastIndexOf(NewLine);
+			if (lastNewLinePos != -1)
+			{
+				int start = lastNewLinePos + NewLine.Length;
+				indent = indent.Substring(start, indent.Length - start);
+			}
+
+			return indent;
+		}
+
+		public static string ContentBeforeLastNewLine(this IEnumerable<SyntaxTrivia> trivia)
+		{
+			var leading = trivia.AsString();
+			int lastNewLinePos = leading.LastIndexOf(NewLine);
+			if (lastNewLinePos == -1)
+			{
+				return string.Empty;
+			}
+			else
+			{
+				return leading.Substring(0, lastNewLinePos);
+			}
+		}
+
+		public static ValueTuple<SyntaxToken, SyntaxToken> GetBracePair(this SyntaxNode node)
+		{
+			return node.GetBraces();
+		}
+
+		public static bool IsValidBracePair(this ValueTuple<SyntaxToken, SyntaxToken> bracePair)
+		{
+			if (bracePair.Item1.IsKind(SyntaxKind.None) ||
+				bracePair.Item1.IsMissing ||
+				bracePair.Item2.IsKind(SyntaxKind.None))
+			{
+				return false;
+			}
+
+			// don't check whether token is actually braces as long as it is not none.
+			return true;
+		}
+
+		public static bool IsOpenParenInParameterList(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.OpenParenToken && token.Parent.Kind() == SyntaxKind.ParameterList;
+		}
+
+		public static bool IsCloseParenInParameterList(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.CloseParenToken && token.Parent.Kind() == SyntaxKind.ParameterList;
+		}
+
+		public static bool IsOpenParenInArgumentList(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.OpenParenToken && token.Parent.Kind() == SyntaxKind.ArgumentList;
+		}
+
+		public static bool IsCloseParenInArgumentList(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.CloseParenToken && token.Parent.Kind() == SyntaxKind.ArgumentList;
+		}
+
+		public static bool IsColonInTypeBaseList(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.ColonToken && token.Parent.Kind() == SyntaxKind.BaseList;
+		}
+
+		public static bool IsCommaInArgumentOrParameterList(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.CommaToken && (token.Parent.IsAnyArgumentList() || token.Parent.Kind() == SyntaxKind.ParameterList);
+		}
+
+		public static bool IsLambdaBodyBlock(this SyntaxNode node)
+		{
+			if (node.Kind() != SyntaxKind.Block)
+			{
+				return false;
+			}
+
+			return node.Parent.Kind() == SyntaxKind.SimpleLambdaExpression ||
+				node.Parent.Kind() == SyntaxKind.ParenthesizedLambdaExpression;
+		}
+
+		public static bool IsAnonymousMethodBlock(this SyntaxNode node)
+		{
+			if (node.Kind() != SyntaxKind.Block)
+			{
+				return false;
+			}
+
+			return node.Parent.Kind() == SyntaxKind.AnonymousMethodExpression;
+		}
+
+		public static bool IsSemicolonInForStatement(this SyntaxToken token)
+		{
+			var forStatement = token.Parent as ForStatementSyntax;
+			return
+				token.Kind() == SyntaxKind.SemicolonToken &&
+				forStatement != null &&
+				(forStatement.FirstSemicolonToken == token || forStatement.SecondSemicolonToken == token);
+		}
+
+		public static bool IsSemicolonOfEmbeddedStatement(this SyntaxToken token)
+		{
+			if (token.Kind() != SyntaxKind.SemicolonToken)
+			{
+				return false;
+			}
+
+			var statement = token.Parent as StatementSyntax;
+			if (statement == null ||
+				statement.GetLastToken() != token)
+			{
+				return false;
+			}
+
+			return IsEmbeddedStatement(statement);
+		}
+
+		public static bool IsCloseBraceOfExpression(this SyntaxToken token)
+		{
+			if (token.Kind() != SyntaxKind.CloseBraceToken)
+			{
+				return false;
+			}
+
+			return token.Parent is ExpressionSyntax;
+		}
+
+		public static bool IsCloseBraceOfEmbeddedBlock(this SyntaxToken token)
+		{
+			if (token.Kind() != SyntaxKind.CloseBraceToken)
+			{
+				return false;
+			}
+
+			var block = token.Parent as BlockSyntax;
+			if (block == null ||
+				block.CloseBraceToken != token)
+			{
+				return false;
+			}
+
+			return IsEmbeddedStatement(block);
+		}
+
+		public static bool IsEmbeddedStatement(this SyntaxNode node)
+		{
+			SyntaxNode statementOrElse = node as StatementSyntax;
+			if (statementOrElse == null)
+			{
+				statementOrElse = node as ElseClauseSyntax;
+			}
+
+			return statementOrElse != null
+				&& statementOrElse.Parent != null
+				&& statementOrElse.Parent.IsEmbeddedStatementOwner();
+		}
+
+		public static bool IsCommaInEnumDeclaration(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.CommaToken &&
+				token.Parent.IsKind(SyntaxKind.EnumDeclaration);
+		}
+
+		public static bool IsCommaInAnyArgumentsList(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.CommaToken &&
+				token.Parent.IsAnyArgumentList();
+		}
+
+		public static bool IsParenInParenthesizedExpression(this SyntaxToken token)
+		{
+			var parenthesizedExpression = token.Parent as ParenthesizedExpressionSyntax;
+			if (parenthesizedExpression == null)
+			{
+				return false;
+			}
+
+			return parenthesizedExpression.OpenParenToken.Equals(token) || parenthesizedExpression.CloseParenToken.Equals(token);
+		}
+
+		public static bool IsParenInArgumentList(this SyntaxToken token)
+		{
+			var parent = token.Parent;
+			switch (parent.Kind())
+			{
+			case SyntaxKind.SizeOfExpression:
+				var sizeOfExpression = (SizeOfExpressionSyntax)parent;
+				return sizeOfExpression.OpenParenToken == token || sizeOfExpression.CloseParenToken == token;
+
+			case SyntaxKind.TypeOfExpression:
+				var typeOfExpression = (TypeOfExpressionSyntax)parent;
+				return typeOfExpression.OpenParenToken == token || typeOfExpression.CloseParenToken == token;
+
+			case SyntaxKind.CheckedExpression:
+			case SyntaxKind.UncheckedExpression:
+				var checkedOfExpression = (CheckedExpressionSyntax)parent;
+				return checkedOfExpression.OpenParenToken == token || checkedOfExpression.CloseParenToken == token;
+
+			case SyntaxKind.DefaultExpression:
+				var defaultExpression = (DefaultExpressionSyntax)parent;
+				return defaultExpression.OpenParenToken == token || defaultExpression.CloseParenToken == token;
+
+			case SyntaxKind.MakeRefExpression:
+				var makeRefExpression = (MakeRefExpressionSyntax)parent;
+				return makeRefExpression.OpenParenToken == token || makeRefExpression.CloseParenToken == token;
+
+			case SyntaxKind.RefTypeExpression:
+				var refTypeOfExpression = (RefTypeExpressionSyntax)parent;
+				return refTypeOfExpression.OpenParenToken == token || refTypeOfExpression.CloseParenToken == token;
+
+			case SyntaxKind.RefValueExpression:
+				var refValueExpression = (RefValueExpressionSyntax)parent;
+				return refValueExpression.OpenParenToken == token || refValueExpression.CloseParenToken == token;
+
+			case SyntaxKind.ArgumentList:
+				var argumentList = (ArgumentListSyntax)parent;
+				return argumentList.OpenParenToken == token || argumentList.CloseParenToken == token;
+
+			case SyntaxKind.AttributeArgumentList:
+				var attributeArgumentList = (AttributeArgumentListSyntax)parent;
+				return attributeArgumentList.OpenParenToken == token || attributeArgumentList.CloseParenToken == token;
+			}
+
+			return false;
+		}
+
+		public static bool IsCloseParenInStatement(this SyntaxToken token)
+		{
+			var statement = token.Parent as StatementSyntax;
+			if (statement == null)
+			{
+				return false;
+			}
+
+			var ifStatement = statement as IfStatementSyntax;
+			if (ifStatement != null)
+			{
+				return ifStatement.CloseParenToken.Equals(token);
+			}
+
+			var switchStatement = statement as SwitchStatementSyntax;
+			if (switchStatement != null)
+			{
+				return switchStatement.CloseParenToken.Equals(token);
+			}
+
+			var whileStatement = statement as WhileStatementSyntax;
+			if (whileStatement != null)
+			{
+				return whileStatement.CloseParenToken.Equals(token);
+			}
+
+			var doStatement = statement as DoStatementSyntax;
+			if (doStatement != null)
+			{
+				return doStatement.CloseParenToken.Equals(token);
+			}
+
+			var forStatement = statement as ForStatementSyntax;
+			if (forStatement != null)
+			{
+				return forStatement.CloseParenToken.Equals(token);
+			}
+
+			var foreachStatement = statement as ForEachStatementSyntax;
+			if (foreachStatement != null)
+			{
+				return foreachStatement.CloseParenToken.Equals(token);
+			}
+
+			var lockStatement = statement as LockStatementSyntax;
+			if (lockStatement != null)
+			{
+				return lockStatement.CloseParenToken.Equals(token);
+			}
+
+			var usingStatement = statement as UsingStatementSyntax;
+			if (usingStatement != null)
+			{
+				return usingStatement.CloseParenToken.Equals(token);
+			}
+
+			return false;
+		}
+
+		public static bool IsDotInMemberAccessOrQualifiedName(this SyntaxToken token)
+		{
+			return token.IsDotInMemberAccess() || (token.Kind() == SyntaxKind.DotToken && token.Parent.Kind() == SyntaxKind.QualifiedName);
+		}
+
+		public static bool IsDotInMemberAccess(this SyntaxToken token)
+		{
+			var memberAccess = token.Parent as MemberAccessExpressionSyntax;
+			if (memberAccess == null)
+			{
+				return false;
+			}
+
+			return token.Kind() == SyntaxKind.DotToken
+				&& memberAccess.OperatorToken.Equals(token);
+		}
+
+		public static bool IsGenericGreaterThanToken(this SyntaxToken token)
+		{
+			if (token.Kind() == SyntaxKind.GreaterThanToken)
+			{
+				return token.Parent.IsKind(SyntaxKind.TypeParameterList, SyntaxKind.TypeArgumentList);
+			}
+
+			return false;
+		}
+
+		public static bool IsCommaInInitializerExpression(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.CommaToken &&
+				((token.Parent is InitializerExpressionSyntax) ||
+					(token.Parent is AnonymousObjectCreationExpressionSyntax));
+		}
+
+		public static bool IsIdentiferInLabeledStatement(this SyntaxToken token)
+		{
+			var labeledStatement = token.Parent as LabeledStatementSyntax;
+			return token.Kind() == SyntaxKind.IdentifierToken &&
+				labeledStatement != null &&
+				labeledStatement.Identifier == token;
+		}
+
+		public static bool IsColonInSwitchLabel(this SyntaxToken token)
+		{
+			return FormattingRangeHelper.IsColonInSwitchLabel(token);
+		}
+
+		public static bool IsColonInLabeledStatement(this SyntaxToken token)
+		{
+			var labeledStatement = token.Parent as LabeledStatementSyntax;
+			return token.Kind() == SyntaxKind.ColonToken &&
+				labeledStatement != null &&
+				labeledStatement.ColonToken == token;
+		}
+
+		public static bool IsEmbeddedStatementOwnerWithCloseParen(this SyntaxNode node)
+		{
+			return node is IfStatementSyntax ||
+				node is WhileStatementSyntax ||
+				node is ForStatementSyntax ||
+				node is ForEachStatementSyntax ||
+				node is UsingStatementSyntax;
+		}
+
+		public static bool IsNestedQueryExpression(this SyntaxToken token)
+		{
+			var fromClause = token.Parent as FromClauseSyntax;
+			return token.Kind() == SyntaxKind.InKeyword &&
+				fromClause != null &&
+				fromClause.Expression is QueryExpressionSyntax;
+		}
+
+		public static bool IsFirstFromKeywordInExpression(this SyntaxToken token)
+		{
+			var queryExpression = token.Parent.Parent as QueryExpressionSyntax;
+			return token.Kind() == SyntaxKind.FromKeyword &&
+				queryExpression != null &&
+				queryExpression.GetFirstToken().Equals(token);
+		}
+
+		public static bool IsInitializerForObjectOrAnonymousObjectCreationExpression(this SyntaxNode node)
+		{
+			var initializer = node as InitializerExpressionSyntax;
+			AnonymousObjectMemberDeclaratorSyntax anonymousObjectInitializer = null;
+			if (initializer == null)
+			{
+				anonymousObjectInitializer = node as AnonymousObjectMemberDeclaratorSyntax;
+				if (anonymousObjectInitializer == null)
+				{
+					return false;
+				}
+			}
+
+			var parent = initializer != null ? initializer.Parent : anonymousObjectInitializer.Parent;
+			if (parent is AnonymousObjectCreationExpressionSyntax)
+			{
+				return true;
+			}
+
+			if (parent is ObjectCreationExpressionSyntax)
+			{
+				if (initializer.Expressions.Count <= 0)
+				{
+					return true;
+				}
+
+				var expression = initializer.Expressions[0];
+				if (expression.Kind() == SyntaxKind.SimpleAssignmentExpression)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsInitializerForArrayOrCollectionCreationExpression(this SyntaxNode node)
+		{
+			var initializer = node as InitializerExpressionSyntax;
+			AnonymousObjectMemberDeclaratorSyntax anonymousObjectInitializer = null;
+			if (initializer == null)
+			{
+				anonymousObjectInitializer = node as AnonymousObjectMemberDeclaratorSyntax;
+				if (anonymousObjectInitializer == null)
+				{
+					return false;
+				}
+			}
+
+			var parent = initializer != null ? initializer.Parent : anonymousObjectInitializer.Parent;
+			if (parent is ArrayCreationExpressionSyntax ||
+				parent is ImplicitArrayCreationExpressionSyntax ||
+				parent is EqualsValueClauseSyntax ||
+				parent.Kind() == SyntaxKind.SimpleAssignmentExpression)
+			{
+				return true;
+			}
+
+			if (parent is ObjectCreationExpressionSyntax)
+			{
+				return !IsInitializerForObjectOrAnonymousObjectCreationExpression(initializer);
+			}
+
+			return false;
+		}
+
+		public static bool ParenOrBracketContainsNothing(this SyntaxToken token1, SyntaxToken token2)
+		{
+			return (token1.Kind() == SyntaxKind.OpenParenToken && token2.Kind() == SyntaxKind.CloseParenToken) ||
+				(token1.Kind() == SyntaxKind.OpenBracketToken && token2.Kind() == SyntaxKind.CloseBracketToken);
+		}
+
+		public static bool IsLastTokenInLabelStatement(this SyntaxToken token)
+		{
+			if (token.Kind() != SyntaxKind.SemicolonToken && token.Kind() != SyntaxKind.CloseBraceToken)
+			{
+				return false;
+			}
+
+			if (token.Parent == null)
+			{
+				return false;
+			}
+
+			return token.Parent.Parent is LabeledStatementSyntax;
+		}
+
+		public static ValueTuple<SyntaxToken, SyntaxToken> GetFirstAndLastMemberDeclarationTokensAfterAttributes(this MemberDeclarationSyntax node)
+		{
+			// Contract.ThrowIfNull(node);
+
+			// there are no attributes associated with the node. return back first and last token of the node.
+			var attributes = node.GetAttributes();
+			if (attributes.Count == 0)
+			{
+				return ValueTuple.Create(node.GetFirstToken(includeZeroWidth: true), node.GetLastToken(includeZeroWidth: true));
+			}
+
+			var lastToken = node.GetLastToken(includeZeroWidth: true);
+			var lastAttributeToken = attributes.Last().GetLastToken(includeZeroWidth: true);
+			if (lastAttributeToken.Equals(lastToken))
+			{
+				return ValueTuple.Create(default(SyntaxToken), default(SyntaxToken));
+			}
+
+			var firstTokenAfterAttribute = lastAttributeToken.GetNextToken(includeZeroWidth: true);
+
+			// there are attributes, get first token after the tokens belong to attributes
+			return ValueTuple.Create(firstTokenAfterAttribute, lastToken);
+		}
+
+		public static bool IsBlockBody(this SyntaxNode node)
+		{
+			// Contract.ThrowIfNull(node);
+
+			var blockNode = node as BlockSyntax;
+			if (blockNode == null)
+			{
+				return false;
+			}
+
+			switch (blockNode.Parent.Kind())
+			{
+			case SyntaxKind.AnonymousMethodExpression:
+			case SyntaxKind.CheckedStatement:
+			case SyntaxKind.UncheckedStatement:
+			case SyntaxKind.UnsafeStatement:
+			case SyntaxKind.TryStatement:
+			case SyntaxKind.CatchClause:
+			case SyntaxKind.FinallyClause:
+			case SyntaxKind.MethodDeclaration:
+			case SyntaxKind.OperatorDeclaration:
+			case SyntaxKind.ConversionOperatorDeclaration:
+			case SyntaxKind.ConstructorDeclaration:
+			case SyntaxKind.DestructorDeclaration:
+			case SyntaxKind.AddAccessorDeclaration:
+			case SyntaxKind.GetAccessorDeclaration:
+			case SyntaxKind.SetAccessorDeclaration:
+			case SyntaxKind.RemoveAccessorDeclaration:
+			case SyntaxKind.UnknownAccessorDeclaration:
+				return true;
+			default:
+				return false;
+			}
+		}
+
+		public static bool IsPlusOrMinusExpression(this SyntaxToken token)
+		{
+			if (token.Kind() != SyntaxKind.PlusToken && token.Kind() != SyntaxKind.MinusToken)
+			{
+				return false;
+			}
+
+			return token.Parent is PrefixUnaryExpressionSyntax;
+		}
+
+		public static bool IsInterpolation(this SyntaxToken currentToken)
+		{
+			return currentToken.Parent.IsKind(SyntaxKind.Interpolation);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/FormattingOptionsFactory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/FormattingOptionsFactory.cs
new file mode 100644
index 0000000000..aa33936784
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/FormattingOptionsFactory.cs
@@ -0,0 +1,170 @@
+// 
+// FormattingOptionsFactory.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using Microsoft.CodeAnalysis.Formatting;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	/// The formatting options factory creates pre defined formatting option styles.
+	/// </summary>
+	static class FormattingOptionsFactory
+	{
+		readonly static Workspace defaultWs = new TestWorkspace ();
+
+		internal class TestWorkspace : Workspace
+		{
+			readonly static HostServices services = Microsoft.CodeAnalysis.Host.Mef.MefHostServices.DefaultHost;
+			public TestWorkspace(string workspaceKind = "Test") : base(services , workspaceKind)
+			{
+			}
+
+		}
+//		/// <summary>
+//		/// Creates empty CSharpFormatting options.
+//		/// </summary>
+//		public static CSharpFormattingOptions CreateEmpty()
+//		{
+//			return new CSharpFormattingOptions();
+//		}
+
+		/// <summary>
+		/// Creates mono indent style CSharpFormatting options.
+		/// </summary>
+		public static OptionSet CreateMono()
+		{
+			var options = defaultWs.Options;
+			options = options.WithChangedOption(CSharpFormattingOptions.SpaceAfterMethodCallName, true);
+			options = options.WithChangedOption(CSharpFormattingOptions.SpaceAfterSemicolonsInForStatement, true);
+
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLineForCatch, false);
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLineForFinally, false);
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInAnonymousMethods, false);
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInControlBlocks, false);
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInLambdaExpressionBody, false);
+
+			options = options.WithChangedOption(CSharpFormattingOptions.IndentSwitchSection, false);
+
+			options = options.WithChangedOption(FormattingOptions.UseTabs, LanguageNames.CSharp, true);
+			options = options.WithChangedOption(FormattingOptions.TabSize, LanguageNames.CSharp, 4);
+			options = options.WithChangedOption(FormattingOptions.NewLine, LanguageNames.CSharp, "\n");
+
+			return options;
+		}
+
+		/// <summary>
+		/// Creates sharp develop indent style CSharpFormatting options.
+		/// </summary>
+		public static OptionSet CreateSharpDevelop()
+		{
+			var baseOptions = CreateKRStyle();
+			return baseOptions;
+		}
+
+		/// <summary>
+		/// The K&amp;R style, so named because it was used in Kernighan and Ritchie's book The C Programming Language,
+		/// is commonly used in C. It is less common for C++, C#, and others.
+		/// </summary>
+		public static OptionSet CreateKRStyle()
+		{
+			var options = defaultWs.Options;
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLineForCatch, false);
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLineForFinally, false);
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInAnonymousMethods, false);
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInControlBlocks, false);
+			options = options.WithChangedOption(CSharpFormattingOptions.NewLinesForBracesInLambdaExpressionBody, false);
+
+			options = options.WithChangedOption(FormattingOptions.UseTabs, LanguageNames.CSharp, true);
+			options = options.WithChangedOption(FormattingOptions.TabSize, LanguageNames.CSharp, 4);
+			options = options.WithChangedOption(FormattingOptions.NewLine, LanguageNames.CSharp, "\n");
+
+			return options;
+		}
+
+		/// <summary>
+		/// Creates allman indent style CSharpFormatting options used in Visual Studio.
+		/// </summary>
+		public static OptionSet CreateAllman()
+		{
+			var options = defaultWs.Options;
+			options = options.WithChangedOption(FormattingOptions.UseTabs, LanguageNames.CSharp, true);
+			options = options.WithChangedOption(FormattingOptions.TabSize, LanguageNames.CSharp, 4);
+			options = options.WithChangedOption(FormattingOptions.NewLine, LanguageNames.CSharp, "\n");
+			return options;
+		}
+
+//		/// <summary>
+//		/// The Whitesmiths style, also called Wishart style to a lesser extent, is less common today than the previous three. It was originally used in the documentation for the first commercial C compiler, the Whitesmiths Compiler.
+//		/// </summary>
+//		public static CSharpFormattingOptions CreateWhitesmiths()
+//		{
+//			var baseOptions = CreateKRStyle();
+//				
+//			baseOptions.NamespaceBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.ClassBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.InterfaceBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.StructBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.EnumBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.MethodBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.ConstructorBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.DestructorBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.AnonymousMethodBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.PropertyBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.PropertyGetBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.PropertySetBraceStyle = BraceStyle.NextLineShifted;
+//	
+//			baseOptions.EventBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.EventAddBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.EventRemoveBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.StatementBraceStyle = BraceStyle.NextLineShifted;
+//			baseOptions.IndentBlocksInsideExpressions = true;
+//			return baseOptions;
+//		}
+//
+//		/// <summary>
+//		/// Like the Allman and Whitesmiths styles, GNU style puts braces on a line by themselves, indented by 2 spaces,
+//		/// except when opening a function definition, where they are not indented.
+//		/// In either case, the contained code is indented by 2 spaces from the braces.
+//		/// Popularised by Richard Stallman, the layout may be influenced by his background of writing Lisp code.
+//		/// In Lisp the equivalent to a block (a progn) 
+//		/// is a first class data entity and giving it its own indent level helps to emphasize that,
+//		/// whereas in C a block is just syntax.
+//		/// Although not directly related to indentation, GNU coding style also includes a space before the bracketed 
+//		/// list of arguments to a function.
+//		/// </summary>
+//		public static CSharpFormattingOptions CreateGNU()
+//		{
+//			var baseOptions = CreateAllman();
+//			baseOptions.StatementBraceStyle = BraceStyle.NextLineShifted2;
+//			return baseOptions;
+//		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/FormattingRangeHelper.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/FormattingRangeHelper.cs
new file mode 100644
index 0000000000..492868b050
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/FormattingRangeHelper.cs
@@ -0,0 +1,434 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	/// this help finding a range of tokens to format based on given ending token
+	/// </summary>
+	static class FormattingRangeHelper
+	{
+		public static ValueTuple<SyntaxToken, SyntaxToken>? FindAppropriateRange(SyntaxToken endToken, bool useDefaultRange = true)
+		{
+			// Contract.ThrowIfTrue(endToken.Kind() == SyntaxKind.None);
+
+			return FixupOpenBrace(FindAppropriateRangeWorker(endToken, useDefaultRange));
+		}
+
+		private static ValueTuple<SyntaxToken, SyntaxToken>? FixupOpenBrace(ValueTuple<SyntaxToken, SyntaxToken>? tokenRange)
+		{
+			if (!tokenRange.HasValue)
+			{
+				return tokenRange;
+			}
+
+			// with a auto brace completion which will do auto formatting when a user types "{", it is quite common that we will automatically put a space
+			// between "{" and "}". but user might blindly type without knowing that " " has automatically inserted for him. and ends up have two spaces.
+			// for those cases, whenever we see previous token of the range is "{", we expand the range to include preceeding "{"
+			var currentToken = tokenRange.Value.Item1;
+			var previousToken = currentToken.GetPreviousToken();
+
+			while (currentToken.Kind() != SyntaxKind.CloseBraceToken && previousToken.Kind() == SyntaxKind.OpenBraceToken)
+			{
+				var pair = previousToken.Parent.GetBracePair();
+				if (pair.Item2.Kind() == SyntaxKind.None || !AreTwoTokensOnSameLine(previousToken, pair.Item2))
+				{
+					return ValueTuple.Create(currentToken, tokenRange.Value.Item2);
+				}
+
+				currentToken = previousToken;
+				previousToken = currentToken.GetPreviousToken();
+			}
+
+			return ValueTuple.Create(currentToken, tokenRange.Value.Item2);
+		}
+
+		private static ValueTuple<SyntaxToken, SyntaxToken>? FindAppropriateRangeWorker(SyntaxToken endToken, bool useDefaultRange)
+		{
+			// special token that we know how to find proper starting token
+			switch (endToken.Kind())
+			{
+			case SyntaxKind.CloseBraceToken:
+				{
+					return FindAppropriateRangeForCloseBrace(endToken);
+				}
+
+			case SyntaxKind.SemicolonToken:
+				{
+					return FindAppropriateRangeForSemicolon(endToken);
+				}
+
+			case SyntaxKind.ColonToken:
+				{
+					return FindAppropriateRangeForColon(endToken);
+				}
+
+			default:
+				{
+					// default case
+					if (!useDefaultRange)
+					{
+						return null;
+					}
+
+					// if given token is skipped token, don't bother to find appropriate
+					// starting point
+					if (endToken.Kind() == SyntaxKind.SkippedTokensTrivia)
+					{
+						return null;
+					}
+
+					var parent = endToken.Parent;
+					if (parent == null)
+					{
+						// if there is no parent setup yet, nothing we can do here.
+						return null;
+					}
+
+					// if we are called due to things in trivia or literals, don't bother
+					// finding a starting token
+					if (parent.Kind() == SyntaxKind.StringLiteralExpression ||
+						parent.Kind() == SyntaxKind.CharacterLiteralExpression)
+					{
+						return null;
+					}
+
+					// format whole node that containing the end token + its previous one
+					// to do indentation
+					return ValueTuple.Create(GetAppropriatePreviousToken(parent.GetFirstToken()), parent.GetLastToken());
+				}
+			}
+		}
+
+		private static ValueTuple<SyntaxToken, SyntaxToken>? FindAppropriateRangeForSemicolon(SyntaxToken endToken)
+		{
+			var parent = endToken.Parent;
+			if (parent == null || parent.Kind() == SyntaxKind.SkippedTokensTrivia)
+			{
+				return null;
+			}
+
+			if ((parent is UsingDirectiveSyntax) ||
+				(parent is DelegateDeclarationSyntax) ||
+				(parent is FieldDeclarationSyntax) ||
+				(parent is EventFieldDeclarationSyntax) ||
+				(parent is MethodDeclarationSyntax))
+			{
+				return ValueTuple.Create(GetAppropriatePreviousToken(parent.GetFirstToken(), canTokenBeFirstInABlock: true), parent.GetLastToken());
+			}
+
+			if (parent is AccessorDeclarationSyntax)
+			{
+				// if both accessors are on the same line, format the accessor list
+				// { get; set; }
+				var propertyDeclaration = GetEnclosingMember(endToken) as PropertyDeclarationSyntax;
+				if (propertyDeclaration != null &&
+					AreTwoTokensOnSameLine(propertyDeclaration.AccessorList.OpenBraceToken, propertyDeclaration.AccessorList.CloseBraceToken))
+				{
+					return ValueTuple.Create(propertyDeclaration.AccessorList.OpenBraceToken, propertyDeclaration.AccessorList.CloseBraceToken);
+				}
+
+				// otherwise, just format the accessor
+				return ValueTuple.Create(GetAppropriatePreviousToken(parent.GetFirstToken(), canTokenBeFirstInABlock: true), parent.GetLastToken());
+			}
+
+			if (parent is StatementSyntax && !endToken.IsSemicolonInForStatement())
+			{
+				var container = GetTopContainingNode(parent);
+				if (container == null)
+				{
+					return ValueTuple.Create(GetAppropriatePreviousToken(parent.GetFirstToken()), parent.GetLastToken());
+				}
+
+				if (IsSpecialContainingNode(container))
+				{
+					return ValueTuple.Create(GetAppropriatePreviousToken(container.GetFirstToken()), container.GetLastToken());
+				}
+
+				return ValueTuple.Create(GetAppropriatePreviousToken(parent.GetFirstToken(), canTokenBeFirstInABlock: true), parent.GetLastToken());
+			}
+
+			// don't do anything
+			return null;
+		}
+
+		private static ValueTuple<SyntaxToken, SyntaxToken>? FindAppropriateRangeForCloseBrace(SyntaxToken endToken)
+		{
+			// don't do anything if there is no proper parent
+			var parent = endToken.Parent;
+			if (parent == null || parent.Kind() == SyntaxKind.SkippedTokensTrivia)
+			{
+				return null;
+			}
+
+			// cases such as namespace, type, enum, method almost any top level elements
+			if (parent is MemberDeclarationSyntax ||
+				parent is SwitchStatementSyntax)
+			{
+				return ValueTuple.Create(GetAppropriatePreviousToken(parent.GetFirstToken()), parent.GetLastToken());
+			}
+
+			// property decl body or initializer
+			if (parent is AccessorListSyntax)
+			{
+				// include property decl
+				var containerOfList = parent.Parent;
+				if (containerOfList == null)
+				{
+					return ValueTuple.Create(GetAppropriatePreviousToken(parent.GetFirstToken()), parent.GetLastToken());
+				}
+
+				return ValueTuple.Create(containerOfList.GetFirstToken(), containerOfList.GetLastToken());
+			}
+
+			if (parent is AnonymousObjectCreationExpressionSyntax)
+			{
+				return ValueTuple.Create(parent.GetFirstToken(), parent.GetLastToken());
+			}
+
+			if (parent is InitializerExpressionSyntax)
+			{
+				var parentOfParent = parent.Parent;
+				if (parentOfParent == null)
+				{
+					return ValueTuple.Create(GetAppropriatePreviousToken(parent.GetFirstToken()), parent.GetLastToken());
+				}
+
+				// double initializer case such as
+				// { { }
+				var doubleInitializer = parentOfParent as InitializerExpressionSyntax;
+				if (doubleInitializer != null)
+				{
+					// if parent block has a missing brace, and current block is on same line, then
+					// don't try to indent inner block.
+					var firstTokenOfInnerBlock = parent.GetFirstToken();
+					var lastTokenOfInnerBlock = parent.GetLastToken();
+
+					var twoTokensOnSameLine = AreTwoTokensOnSameLine(firstTokenOfInnerBlock, lastTokenOfInnerBlock);
+					if (twoTokensOnSameLine)
+					{
+						return ValueTuple.Create(firstTokenOfInnerBlock, lastTokenOfInnerBlock);
+					}
+				}
+
+				// include owner of the initializer node such as creation node
+				return ValueTuple.Create(parentOfParent.GetFirstToken(), parentOfParent.GetLastToken());
+			}
+
+			if (parent is BlockSyntax)
+			{
+				var containerOfBlock = GetTopContainingNode(parent);
+				if (containerOfBlock == null)
+				{
+					return ValueTuple.Create(GetAppropriatePreviousToken(parent.GetFirstToken()), parent.GetLastToken());
+				}
+
+				// things like method, constructor, etc and special cases
+				if (containerOfBlock is MemberDeclarationSyntax ||
+					IsSpecialContainingNode(containerOfBlock))
+				{
+					return ValueTuple.Create(GetAppropriatePreviousToken(containerOfBlock.GetFirstToken()), containerOfBlock.GetLastToken());
+				}
+
+				// double block case on single line case
+				// { { }
+				if (containerOfBlock is BlockSyntax)
+				{
+					// if parent block has a missing brace, and current block is on same line, then
+					// don't try to indent inner block.
+					var firstTokenOfInnerBlock = parent.GetFirstToken();
+					var lastTokenOfInnerBlock = parent.GetLastToken();
+
+					var twoTokensOnSameLine = AreTwoTokensOnSameLine(firstTokenOfInnerBlock, lastTokenOfInnerBlock);
+					if (twoTokensOnSameLine)
+					{
+						return ValueTuple.Create(firstTokenOfInnerBlock, lastTokenOfInnerBlock);
+					}
+				}
+
+				// okay, for block, indent regardless whether it is first one on the line
+				return ValueTuple.Create(GetPreviousTokenIfNotFirstTokenInTree(parent.GetFirstToken()), parent.GetLastToken());
+			}
+
+			// don't do anything
+			return null;
+		}
+
+		private static ValueTuple<SyntaxToken, SyntaxToken>? FindAppropriateRangeForColon(SyntaxToken endToken)
+		{
+			// don't do anything if there is no proper parent
+			var parent = endToken.Parent;
+			if (parent == null || parent.Kind() == SyntaxKind.SkippedTokensTrivia)
+			{
+				return null;
+			}
+
+			// cases such as namespace, type, enum, method almost any top level elements
+			if (IsColonInSwitchLabel(endToken))
+			{
+				return ValueTuple.Create(GetPreviousTokenIfNotFirstTokenInTree(parent.GetFirstToken()), parent.GetLastToken());
+			}
+
+			return null;
+		}
+
+		private static SyntaxToken GetPreviousTokenIfNotFirstTokenInTree(SyntaxToken token)
+		{
+			var previousToken = token.GetPreviousToken();
+			return previousToken.Kind() == SyntaxKind.None ? token : previousToken;
+		}
+
+		private static bool AreTwoTokensOnSameLine(SyntaxToken token1, SyntaxToken token2)
+		{
+			var tree = token1.SyntaxTree;
+			var text = default(SourceText);
+			if (tree != null && tree.TryGetText(out text))
+			{
+				var line1 = text.Lines.IndexOf(token1.Span.End);
+				var line2 = text.Lines.IndexOf(token2.SpanStart);
+
+				return line1 == line2;
+			}
+
+			return CommonFormattingHelpers.GetTextBetween(token1, token2).ContainsLineBreak();
+		}
+
+		private static SyntaxToken GetAppropriatePreviousToken(SyntaxToken startToken, bool canTokenBeFirstInABlock = false)
+		{
+			var previousToken = startToken.GetPreviousToken();
+			if (previousToken.Kind() == SyntaxKind.None)
+			{
+				// no previous token, return as it is
+				return startToken;
+			}
+
+			if (AreTwoTokensOnSameLine(previousToken, startToken))
+			{
+				// The previous token can be '{' of a block and type declaration
+				// { int s = 0;
+				if (canTokenBeFirstInABlock)
+				{
+					if (IsOpenBraceTokenOfABlockOrTypeOrNamespace(previousToken))
+					{
+						return previousToken;
+					}
+				}
+
+				// there is another token on same line.
+				return startToken;
+			}
+
+			// start token is the first token on line
+
+			// now check a special case where previous token belongs to a label.
+			if (previousToken.IsLastTokenInLabelStatement())
+			{
+				var labelNode = previousToken.Parent.Parent;
+				return GetAppropriatePreviousToken(labelNode.GetFirstToken());
+			}
+
+			return previousToken;
+		}
+
+		private static bool IsOpenBraceTokenOfABlockOrTypeOrNamespace(SyntaxToken previousToken)
+		{
+			return previousToken.IsKind(SyntaxKind.OpenBraceToken) &&
+				(previousToken.Parent.IsKind(SyntaxKind.Block) ||
+					previousToken.Parent is TypeDeclarationSyntax ||
+					previousToken.Parent is NamespaceDeclarationSyntax);
+		}
+
+		private static bool IsSpecialContainingNode(SyntaxNode node)
+		{
+			return
+				node.Kind() == SyntaxKind.IfStatement ||
+				node.Kind() == SyntaxKind.ElseClause ||
+				node.Kind() == SyntaxKind.WhileStatement ||
+				node.Kind() == SyntaxKind.ForStatement ||
+				node.Kind() == SyntaxKind.ForEachStatement ||
+				node.Kind() == SyntaxKind.UsingStatement ||
+				node.Kind() == SyntaxKind.DoStatement ||
+				node.Kind() == SyntaxKind.TryStatement ||
+				node.Kind() == SyntaxKind.CatchClause ||
+				node.Kind() == SyntaxKind.FinallyClause ||
+				node.Kind() == SyntaxKind.LabeledStatement;
+		}
+
+		private static SyntaxNode GetTopContainingNode(SyntaxNode node)
+		{
+			node = node.Parent;
+			if (!IsSpecialContainingNode(node))
+			{
+				return node;
+			}
+
+			var lastSpecialContainingNode = node;
+			node = node.Parent;
+
+			while (node != null)
+			{
+				if (!IsSpecialContainingNode(node))
+				{
+					return lastSpecialContainingNode;
+				}
+
+				lastSpecialContainingNode = node;
+				node = node.Parent;
+			}
+
+			return null;
+		}
+
+		public static bool IsColonInSwitchLabel(SyntaxToken token)
+		{
+			var switchLabel = token.Parent as SwitchLabelSyntax;
+			return token.Kind() == SyntaxKind.ColonToken &&
+				switchLabel != null &&
+				switchLabel.ColonToken == token;
+		}
+
+		public static bool InBetweenTwoMembers(SyntaxToken previousToken, SyntaxToken currentToken)
+		{
+			if (previousToken.Kind() != SyntaxKind.SemicolonToken && previousToken.Kind() != SyntaxKind.CloseBraceToken)
+			{
+				return false;
+			}
+
+			if (currentToken.Kind() == SyntaxKind.CloseBraceToken)
+			{
+				return false;
+			}
+
+			var previousMember = GetEnclosingMember(previousToken);
+			var nextMember = GetEnclosingMember(currentToken);
+
+			return previousMember != null
+				&& nextMember != null
+				&& previousMember != nextMember;
+		}
+
+		public static MemberDeclarationSyntax GetEnclosingMember(SyntaxToken token)
+		{
+			if (token.Kind() == SyntaxKind.CloseBraceToken)
+			{
+				if (token.Parent.Kind() == SyntaxKind.Block ||
+					token.Parent.Kind() == SyntaxKind.AccessorList)
+				{
+					return token.Parent.Parent as MemberDeclarationSyntax;
+				}
+			}
+
+			return token.Parent.FirstAncestorOrSelf<MemberDeclarationSyntax>();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/Indent.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/Indent.cs
new file mode 100644
index 0000000000..9da04bb2ea
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/Formatter/Indent.cs
@@ -0,0 +1,249 @@
+// 
+// Indent.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	public enum IndentType
+	{
+		Block,
+		DoubleBlock,
+		Continuation,
+		Alignment,
+		Label,
+		Empty
+	}
+
+	class Indent
+	{
+		readonly CloneableStack<IndentType> indentStack = new CloneableStack<IndentType>();
+		readonly OptionSet options;
+		int curIndent;
+		int extraSpaces;
+		string indentString;
+
+		public int CurIndent {
+			get {
+				return curIndent;
+			}
+		}
+
+		public Indent(OptionSet options)
+		{
+			this.options = options;
+			Reset();
+		}
+
+		Indent(Indent engine)
+		{
+			this.indentStack = engine.indentStack.Clone();
+			this.options = engine.options;
+			this.curIndent = engine.curIndent;
+			this.extraSpaces = engine.extraSpaces;
+			this.indentString = engine.indentString;
+		}
+
+		public Indent Clone()
+		{
+			return new Indent(this);
+		}
+
+		public void Reset()
+		{
+			curIndent = 0;
+			indentString = "";
+			indentStack.Clear();
+		}
+
+		public void Push(IndentType type)
+		{
+			indentStack.Push(type);
+			curIndent += GetIndent(type);
+			Update();
+		}
+
+		public void Push(Indent indent)
+		{
+			foreach (var i in indent.indentStack)
+				Push(i);
+		}
+
+		public void Pop()
+		{
+			curIndent -= GetIndent(indentStack.Pop());
+			Update();
+		}
+
+		public bool PopIf(IndentType type)
+		{
+			if (Count > 0 && Peek() == type)
+			{
+				Pop();
+				return true;
+			}
+
+			return false;
+		}
+
+		public void PopWhile(IndentType type)
+		{
+			while (Count > 0 && Peek() == type)
+			{
+				Pop();
+			}
+		}
+
+		public bool PopTry()
+		{
+			if (Count > 0)
+			{
+				Pop();
+				return true;
+			}
+
+			return false;
+		}
+
+		public int Count {
+			get {
+				return indentStack.Count;
+			}
+		}
+
+		public IndentType Peek()
+		{
+			return indentStack.Peek();
+		}
+
+		int GetIndent(IndentType indentType)
+		{
+			switch (indentType) {
+				case IndentType.Block:
+					return options.GetOption(FormattingOptions.IndentationSize, LanguageNames.CSharp);
+				case IndentType.DoubleBlock:
+					return options.GetOption(FormattingOptions.IndentationSize, LanguageNames.CSharp) * 2;
+				case IndentType.Alignment:
+				case IndentType.Continuation:
+					return options.GetOption(FormattingOptions.IndentationSize, LanguageNames.CSharp);
+				case IndentType.Label:
+					return options.GetOption(FormattingOptions.IndentationSize, LanguageNames.CSharp);
+				case IndentType.Empty:
+					return 0;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+		}
+
+		void Update()
+		{
+			if (!options.GetOption(FormattingOptions.UseTabs, LanguageNames.CSharp)) {
+				indentString = new string(' ', curIndent + ExtraSpaces);
+				return;
+			}
+			var tabSize = options.GetOption(FormattingOptions.TabSize, LanguageNames.CSharp);
+			indentString = new string('\t', curIndent / tabSize) + new string(' ', curIndent % tabSize) + new string(' ', ExtraSpaces);
+		}
+
+		public int ExtraSpaces {
+			get {
+				return extraSpaces;
+			}
+			set {
+				if (value < 0)
+					throw new ArgumentOutOfRangeException("ExtraSpaces >= 0 but was " + value);
+				extraSpaces = value;
+				Update();
+			}
+		}
+
+
+		public string IndentString {
+			get {
+				return indentString;
+			}
+		}
+
+		public override string ToString()
+		{
+			return string.Format("[Indent: curIndent={0}]", curIndent);
+		}
+
+		public Indent GetIndentWithoutSpace ()
+		{
+			var result = new Indent(options);
+			foreach (var i in indentStack)
+					result.Push(i);
+			return result;
+		}
+
+		public static Indent ConvertFrom(string indentString, Indent correctIndent, OptionSet options = null)
+		{
+			options = options ?? correctIndent.options;
+			var result = new Indent(options);
+
+			var indent = string.Concat(indentString.Where(c => c == ' ' || c == '\t'));
+			var indentTypes = new Stack<IndentType>(correctIndent.indentStack);
+
+			foreach (var _ in indent.TakeWhile(c => c == '\t'))
+			{
+				if (indentTypes.Count > 0)
+					result.Push(indentTypes.Pop());
+				else
+					result.Push(IndentType.Continuation);
+			}
+
+			result.ExtraSpaces = indent
+				.SkipWhile(c => c == '\t')
+				.TakeWhile(c => c == ' ')
+				.Count();
+
+			return result;
+		}
+
+		public void RemoveAlignment()
+		{
+			ExtraSpaces = 0;
+			if (Count > 0 && Peek() == IndentType.Alignment)
+				Pop();
+		}
+
+		public void SetAlignment(int i, bool forceSpaces = false)
+		{
+			var alignChars = Math.Max(0, i);
+			if (forceSpaces) {
+				ExtraSpaces = alignChars;
+				return;
+			}
+			RemoveAlignment();
+			Push(IndentType.Alignment);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/AbstractCodeRefactoringResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/AbstractCodeRefactoringResult.cs
new file mode 100644
index 0000000000..3e6736f98b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/AbstractCodeRefactoringResult.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using RefactoringEssentials;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateFromMembers
+{
+	abstract class AbstractCodeRefactoringResult
+	{
+		private readonly CodeRefactoring _codeRefactoring;
+
+		protected AbstractCodeRefactoringResult(CodeRefactoring codeRefactoring)
+		{
+			_codeRefactoring = codeRefactoring;
+		}
+
+		public bool ContainsChanges
+		{
+			get
+			{
+				return _codeRefactoring != null;
+			}
+		}
+
+		public CodeRefactoring GetCodeRefactoring(CancellationToken cancellationToken)
+		{
+			return _codeRefactoring;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/AbstractGenerateFromMembersService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/AbstractGenerateFromMembersService.cs
new file mode 100644
index 0000000000..05087c3b7a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/AbstractGenerateFromMembersService.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using RefactoringEssentials;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateFromMembers
+{
+	abstract class AbstractGenerateFromMembersService<TMemberDeclarationSyntax>
+		where TMemberDeclarationSyntax : SyntaxNode
+	{
+		protected AbstractGenerateFromMembersService()
+		{
+		}
+
+		protected abstract Task<IList<TMemberDeclarationSyntax>> GetSelectedMembersAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken);
+		protected abstract IEnumerable<ISymbol> GetDeclaredSymbols(SemanticModel semanticModel, TMemberDeclarationSyntax memberDeclaration, CancellationToken cancellationToken);
+
+		protected class SelectedMemberInfo
+		{
+			public INamedTypeSymbol ContainingType;
+			public IList<TMemberDeclarationSyntax> SelectedDeclarations;
+			public IList<ISymbol> SelectedMembers;
+		}
+
+		protected async Task<SelectedMemberInfo> GetSelectedMemberInfoAsync(
+			Document document, TextSpan textSpan, CancellationToken cancellationToken)
+		{
+			var selectedDeclarations = await this.GetSelectedMembersAsync(document, textSpan, cancellationToken).ConfigureAwait(false);
+
+			if (selectedDeclarations.Count > 0)
+			{
+				var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+				var selectedMembers = selectedDeclarations.SelectMany(
+					d => this.GetDeclaredSymbols(semanticModel, d, cancellationToken)).WhereNotNull().ToList();
+				if (selectedMembers.Count > 0)
+				{
+					var containingType = selectedMembers.First().ContainingType;
+					if (containingType != null)
+					{
+						return new SelectedMemberInfo { ContainingType = containingType, SelectedDeclarations = selectedDeclarations, SelectedMembers = selectedMembers };
+					}
+				}
+			}
+
+			return null;
+		}
+
+		protected static bool IsWritableInstanceFieldOrProperty(ISymbol symbol)
+		{
+			// Can use non const fields and properties with setters in them.
+			return
+				IsInstanceFieldOrProperty(symbol) &&
+				IsWritableFieldOrProperty(symbol);
+		}
+
+		private static bool IsWritableFieldOrProperty(ISymbol symbol)
+		{
+			return symbol.TypeSwitch(
+				(IFieldSymbol field) => !field.IsConst,
+				(IPropertySymbol property) => property.SetMethod != null);
+		}
+
+		protected static bool IsInstanceFieldOrProperty(ISymbol symbol)
+		{
+			return !symbol.IsStatic && (IsField(symbol) || IsProperty(symbol));
+		}
+
+		private static bool IsProperty(ISymbol symbol)
+		{
+			return symbol.Kind == SymbolKind.Property;
+		}
+
+		private static bool IsField(ISymbol symbol)
+		{
+			return symbol.Kind == SymbolKind.Field;
+		}
+
+		protected CodeRefactoring CreateCodeRefactoring(
+			IList<TMemberDeclarationSyntax> selectedDeclarations,
+			IEnumerable<CodeAction> actions)
+		{
+			#if false
+			var lastDeclaration = selectedDeclarations.Last();
+			var endSpan = new TextSpan(lastDeclaration.Span.End - 1, 1);
+			return new CodeRefactoring(actions, endSpan);
+			#endif
+			return new CodeRefactoring(null, actions);
+		}
+
+		protected List<IParameterSymbol> DetermineParameters(
+			IList<ISymbol> selectedMembers)
+		{
+			var parameters = new List<IParameterSymbol>();
+
+			foreach (var symbol in selectedMembers)
+			{
+				var type = symbol is IFieldSymbol
+					? ((IFieldSymbol)symbol).Type
+					: ((IPropertySymbol)symbol).Type;
+
+				parameters.Add(CodeGenerationSymbolFactory.CreateParameterSymbol(
+					attributes: null,
+					refKind: RefKind.None,
+					isParams: false,
+					type: type,
+					name: symbol.Name.ToCamelCase()));
+			}
+
+			return parameters;
+		}
+
+		protected IMethodSymbol GetDelegatedConstructor(
+			INamedTypeSymbol containingType,
+			List<IParameterSymbol> parameters)
+		{
+			var q =
+				from c in containingType.InstanceConstructors
+				orderby c.Parameters.Length descending
+					where c.Parameters.Length > 0 && c.Parameters.Length < parameters.Count
+					where c.Parameters.All(p => p.RefKind == RefKind.None) && !c.Parameters.Any(p => p.IsParams)
+				let constructorTypes = c.Parameters.Select(p => p.Type)
+				let symbolTypes = parameters.Take(c.Parameters.Length).Select(p => p.Type)
+					where constructorTypes.SequenceEqual(symbolTypes)
+				select c;
+
+			return q.FirstOrDefault();
+		}
+
+		protected bool HasMatchingConstructor(
+			INamedTypeSymbol containingType,
+			List<IParameterSymbol> parameters)
+		{
+			return containingType.InstanceConstructors.Any(c => MatchesConstructor(c, parameters));
+		}
+
+		private bool MatchesConstructor(
+			IMethodSymbol constructor,
+			List<IParameterSymbol> parameters)
+		{
+			return parameters.Select(p => p.Type).SequenceEqual(constructor.Parameters.Select(p => p.Type));
+		}
+
+		protected static readonly SymbolDisplayFormat SimpleFormat =
+			new SymbolDisplayFormat(
+				typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameOnly,
+				genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+				parameterOptions: SymbolDisplayParameterOptions.IncludeParamsRefOut | SymbolDisplayParameterOptions.IncludeType,
+				miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateConstructor/AbstractGenerateConstructorService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateConstructor/AbstractGenerateConstructorService.cs
new file mode 100644
index 0000000000..a40512e2bd
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateConstructor/AbstractGenerateConstructorService.cs
@@ -0,0 +1,263 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editing;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateFromMembers.GenerateConstructor
+{
+	abstract partial class AbstractGenerateConstructorService<TService, TMemberDeclarationSyntax> :
+	AbstractGenerateFromMembersService<TMemberDeclarationSyntax>
+		where TService : AbstractGenerateConstructorService<TService, TMemberDeclarationSyntax>
+		where TMemberDeclarationSyntax : SyntaxNode
+	{
+		protected AbstractGenerateConstructorService()
+		{
+		}
+
+		public async Task<GenerateConstructorResult> GenerateConstructorAsync(
+			Document document, TextSpan textSpan, CancellationToken cancellationToken)
+		{
+//			using (Logger.LogBlock(FunctionId.Refactoring_GenerateFromMembers_GenerateConstructor, cancellationToken))
+//			{
+			var info = await GetSelectedMemberInfoAsync(document, textSpan, cancellationToken).ConfigureAwait(false);
+			if (info != null)
+			{
+				var state = State.Generate((TService)this, document, textSpan, info.ContainingType, info.SelectedMembers, cancellationToken);
+				if (state != null)
+				{
+					return new GenerateConstructorResult(
+						CreateCodeRefactoring(info.SelectedDeclarations, GetCodeActions(document, state)));
+				}
+			}
+
+			return GenerateConstructorResult.Failure;
+//			}
+		}
+
+		private IEnumerable<CodeAction> GetCodeActions(Document document, State state)
+		{
+			yield return new FieldDelegatingCodeAction((TService)this, document, state);
+			if (state.DelegatedConstructor != null)
+			{
+				yield return new ConstructorDelegatingCodeAction((TService)this, document, state);
+			}
+		}
+
+		private class ConstructorDelegatingCodeAction : CodeAction
+		{
+			private readonly Document _document;
+			private readonly State _state;
+
+			public ConstructorDelegatingCodeAction(
+				TService service,
+				Document document,
+				State state)
+			{
+				_document = document;
+				_state = state;
+			}
+
+			protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+			{
+				// First, see if there are any constructors that would take the first 'n' arguments
+				// we've provided.  If so, delegate to those, and then create a field for any
+				// remaining arguments.  Try to match from largest to smallest.
+				//
+				// Otherwise, just generate a normal constructor that assigns any provided
+				// parameters into fields.
+				var provider = _document.Project.Solution.Workspace.Services.GetLanguageServices(_state.ContainingType.Language);
+				var factory = provider.GetService<SyntaxGenerator>();
+
+				var thisConstructorArguments = _state.DelegatedConstructor.Parameters.Select (par => factory.Argument (par.RefKind, SyntaxFactory.IdentifierName (par.Name))).ToList ();
+				var statements = new List<SyntaxNode>();
+
+				for (var i = _state.DelegatedConstructor.Parameters.Length; i < _state.Parameters.Count; i++)
+				{
+					var symbolName = _state.SelectedMembers[i].Name;
+					var parameterName = _state.Parameters[i].Name;
+					var assignExpression = factory.AssignmentStatement(
+						factory.MemberAccessExpression(
+							factory.ThisExpression(),
+							factory.IdentifierName(symbolName)),
+						factory.IdentifierName(parameterName));
+
+					var expressionStatement = factory.ExpressionStatement(assignExpression);
+					statements.Add(expressionStatement);
+				}
+
+				var syntaxTree = await _document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+				var codeGenerationService = new CSharpCodeGenerationService (_document.Project.Solution.Workspace.Services.GetLanguageServices (LanguageNames.CSharp));
+				var result = await codeGenerationService.AddMethodAsync(
+					_document.Project.Solution,
+					_state.ContainingType,
+					CodeGenerationSymbolFactory.CreateConstructorSymbol(
+						attributes: null,
+						accessibility: Accessibility.Public,
+						modifiers: new DeclarationModifiers(),
+						typeName: _state.ContainingType.Name,
+						parameters: _state.Parameters,
+						statements: statements,
+						thisConstructorArguments: thisConstructorArguments),
+					new CodeGenerationOptions(contextLocation: syntaxTree.GetLocation(_state.TextSpan), generateDefaultAccessibility: false),
+					cancellationToken: cancellationToken)
+					.ConfigureAwait(false);
+
+				return result;
+			}
+
+			public override string Title
+			{
+				get
+				{
+				//	var symbolDisplayService = _document.GetLanguageService<ISymbolDisplayService>();
+					var parameters = _state.Parameters.Select(p => p.ToDisplayString(SimpleFormat));
+					var parameterString = string.Join(", ", parameters);
+
+					return string.Format(Resources.GenerateDelegatingConstructor,
+						_state.ContainingType.Name, parameterString);
+				}
+			}
+		}
+
+		private class FieldDelegatingCodeAction : CodeAction
+		{
+			private readonly Document _document;
+			private readonly State _state;
+
+			public FieldDelegatingCodeAction(
+				TService service,
+				Document document,
+				State state)
+			{
+				_document = document;
+				_state = state;
+			}
+
+			protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+			{
+				// First, see if there are any constructors that would take the first 'n' arguments
+				// we've provided.  If so, delegate to those, and then create a field for any
+				// remaining arguments.  Try to match from largest to smallest.
+				//
+				// Otherwise, just generate a normal constructor that assigns any provided
+				// parameters into fields.
+				var parameterToExistingFieldMap = new Dictionary<string, ISymbol>();
+				for (int i = 0; i < _state.Parameters.Count; i++)
+				{
+					parameterToExistingFieldMap[_state.Parameters[i].Name] = _state.SelectedMembers[i];
+				}
+
+				var factory = _document.GetLanguageService<SyntaxGenerator>();
+
+				var syntaxTree = await _document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+				var members = factory.CreateFieldDelegatingConstructor(
+					_state.ContainingType.Name,
+					_state.ContainingType,
+					_state.Parameters,
+					parameterToExistingFieldMap,
+					parameterToNewFieldMap: null,
+					cancellationToken: cancellationToken);
+				var codeGenerationService = new CSharpCodeGenerationService (_document.Project.Solution.Workspace.Services.GetLanguageServices (LanguageNames.CSharp));
+
+				var result = await codeGenerationService.AddMembersAsync(
+					_document.Project.Solution,
+					_state.ContainingType,
+					members,
+					new CodeGenerationOptions(contextLocation: syntaxTree.GetLocation(_state.TextSpan), generateDefaultAccessibility: false),
+					cancellationToken)
+					.ConfigureAwait(false);
+
+				return result;
+			}
+
+
+			public override string Title
+			{
+				get
+				{
+					var parameters = _state.Parameters.Select(p => p.ToDisplayString(SimpleFormat));
+					var parameterString = string.Join(", ", parameters);
+
+					if (_state.DelegatedConstructor == null)
+					{
+						return string.Format(Resources.GenerateConstructor,
+							_state.ContainingType.Name, parameterString);
+					}
+					else
+					{
+						return string.Format(Resources.GenerateFieldAssigningConstructor,
+							_state.ContainingType.Name, parameterString);
+					}
+				}
+			}
+		}
+
+
+		private class State
+		{
+			public TextSpan TextSpan { get; private set; }
+			public IMethodSymbol DelegatedConstructor { get; private set; }
+			public INamedTypeSymbol ContainingType { get; private set; }
+			public IList<ISymbol> SelectedMembers { get; private set; }
+			public List<IParameterSymbol> Parameters { get; private set; }
+
+			public static State Generate(
+				TService service,
+				Document document,
+				TextSpan textSpan,
+				INamedTypeSymbol containingType,
+				IList<ISymbol> selectedMembers,
+				CancellationToken cancellationToken)
+			{
+				var state = new State();
+				if (!state.TryInitialize(service, document, textSpan, containingType, selectedMembers, cancellationToken))
+				{
+					return null;
+				}
+
+				return state;
+			}
+
+			private bool TryInitialize(
+				TService service,
+				Document document,
+				TextSpan textSpan,
+				INamedTypeSymbol containingType,
+				IList<ISymbol> selectedMembers,
+				CancellationToken cancellationToken)
+			{
+				if (!selectedMembers.All(IsWritableInstanceFieldOrProperty))
+				{
+					return false;
+				}
+
+				this.SelectedMembers = selectedMembers;
+				this.ContainingType = containingType;
+				this.TextSpan = textSpan;
+				if (this.ContainingType == null || this.ContainingType.TypeKind == TypeKind.Interface)
+				{
+					return false;
+				}
+
+				this.Parameters = service.DetermineParameters(selectedMembers);
+
+				if (service.HasMatchingConstructor(this.ContainingType, this.Parameters))
+				{
+					return false;
+				}
+
+				this.DelegatedConstructor = service.GetDelegatedConstructor(this.ContainingType, this.Parameters);
+				return true;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateConstructor/CSharpGenerateConstructorService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateConstructor/CSharpGenerateConstructorService.cs
new file mode 100644
index 0000000000..28815e3687
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateConstructor/CSharpGenerateConstructorService.cs
@@ -0,0 +1,53 @@
+//
+// CSharpGenerateConstructorService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateFromMembers.GenerateConstructor
+{
+	class CSharpGenerateConstructorService :
+	AbstractGenerateConstructorService<CSharpGenerateConstructorService, MemberDeclarationSyntax>
+	{
+		protected override Task<IList<MemberDeclarationSyntax>> GetSelectedMembersAsync(
+			Document document, TextSpan textSpan, CancellationToken cancellationToken)
+		{
+			return GenerateFromMembersHelpers.GetSelectedMembersAsync(document, textSpan, cancellationToken);
+		}
+
+		protected override IEnumerable<ISymbol> GetDeclaredSymbols(
+			SemanticModel semanticModel, MemberDeclarationSyntax memberDeclaration, CancellationToken cancellationToken)
+		{
+			return GenerateFromMembersHelpers.GetDeclaredSymbols(semanticModel, memberDeclaration, cancellationToken);
+		}
+	}
+
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateConstructor/GenerateConstructorResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateConstructor/GenerateConstructorResult.cs
new file mode 100644
index 0000000000..04be848d30
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateConstructor/GenerateConstructorResult.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using RefactoringEssentials;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateFromMembers.GenerateConstructor
+{
+	class GenerateConstructorResult : AbstractCodeRefactoringResult
+	{
+		public static readonly GenerateConstructorResult Failure = new GenerateConstructorResult(null);
+
+		public GenerateConstructorResult(CodeRefactoring codeRefactoring)
+			: base(codeRefactoring)
+		{
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateFromMembersHelpers.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateFromMembersHelpers.cs
new file mode 100644
index 0000000000..233b242c45
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateFromMembers/GenerateFromMembersHelpers.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateFromMembers
+{
+	internal static class GenerateFromMembersHelpers
+	{
+		internal static async Task<IList<MemberDeclarationSyntax>> GetSelectedMembersAsync(
+			Document document, TextSpan textSpan, CancellationToken cancellationToken)
+		{
+			var tree = await document.GetCSharpSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+			return tree.GetMembersInSpan(textSpan, cancellationToken);
+		}
+
+		internal static IEnumerable<ISymbol> GetDeclaredSymbols(SemanticModel semanticModel, MemberDeclarationSyntax memberDeclaration, CancellationToken cancellationToken)
+		{
+			if (memberDeclaration is FieldDeclarationSyntax)
+			{
+				return ((FieldDeclarationSyntax)memberDeclaration).Declaration.Variables.Select(
+					v => semanticModel.GetDeclaredSymbol(v, cancellationToken));
+			}
+
+			return SpecializedCollections.SingletonEnumerable(
+				semanticModel.GetDeclaredSymbol(memberDeclaration, cancellationToken));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/AbstractCodeRefactoringResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/AbstractCodeRefactoringResult.cs
new file mode 100644
index 0000000000..243b58e7ca
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/AbstractCodeRefactoringResult.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using RefactoringEssentials;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember
+{
+	abstract class AbstractCodeRefactoringResult
+	{
+		private readonly CodeRefactoring _codeRefactoring;
+
+		protected AbstractCodeRefactoringResult(CodeRefactoring codeRefactoring)
+		{
+			_codeRefactoring = codeRefactoring;
+		}
+
+		public bool ContainsChanges
+		{
+			get
+			{
+				return _codeRefactoring != null;
+			}
+		}
+
+		public CodeRefactoring GetCodeRefactoring(CancellationToken cancellationToken)
+		{
+			return _codeRefactoring;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/AbstractGenerateMemberService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/AbstractGenerateMemberService.cs
new file mode 100644
index 0000000000..bd6f9685c0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/AbstractGenerateMemberService.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember
+{
+	abstract partial class AbstractGenerateMemberService<TSimpleNameSyntax, TExpressionSyntax>
+		where TSimpleNameSyntax : TExpressionSyntax
+		where TExpressionSyntax : SyntaxNode
+	{
+		protected AbstractGenerateMemberService()
+		{
+		}
+
+		protected static readonly ISet<TypeKind> EnumType = new HashSet<TypeKind> { TypeKind.Enum };
+		protected static readonly ISet<TypeKind> ClassInterfaceModuleStructTypes = new HashSet<TypeKind>
+		{
+			TypeKind.Class,
+			TypeKind.Module,
+			TypeKind.Struct,
+			TypeKind.Interface
+		};
+
+		protected bool ValidateTypeToGenerateIn(
+			Solution solution,
+			INamedTypeSymbol typeToGenerateIn,
+			bool isStatic,
+			ISet<TypeKind> typeKinds,
+			CancellationToken cancellationToken)
+		{
+			if (typeToGenerateIn == null)
+			{
+				return false;
+			}
+
+			if (typeToGenerateIn.IsAnonymousType)
+			{
+				return false;
+			}
+
+			if (!typeKinds.Contains(typeToGenerateIn.TypeKind))
+			{
+				return false;
+			}
+
+			if (typeToGenerateIn.TypeKind == TypeKind.Interface && isStatic)
+			{
+				return false;
+			}
+
+			// TODO(cyrusn): Make sure that there is a totally visible part somewhere (i.e.
+			// venus) that we can generate into.
+			var locations = typeToGenerateIn.Locations;
+			return locations.Any(loc => loc.IsInSource);
+		}
+
+		protected bool TryDetermineTypeToGenerateIn(
+			SemanticDocument document,
+			INamedTypeSymbol containingType,
+			TExpressionSyntax simpleNameOrMemberAccessExpression,
+			CancellationToken cancellationToken,
+			out INamedTypeSymbol typeToGenerateIn,
+			out bool isStatic)
+		{
+			typeToGenerateIn = null;
+			isStatic = false;
+
+			var semanticModel = document.SemanticModel;
+			var isMemberAccessExpression = simpleNameOrMemberAccessExpression.IsMemberAccessExpression();
+			if (isMemberAccessExpression ||
+				simpleNameOrMemberAccessExpression.IsConditionalMemberAccessExpression())
+			{
+				var beforeDotExpression = isMemberAccessExpression ?
+					simpleNameOrMemberAccessExpression.GetExpressionOfMemberAccessExpression() :
+					simpleNameOrMemberAccessExpression.GetExpressionOfConditionalMemberAccessExpression();
+				if (beforeDotExpression != null)
+				{
+					var typeInfo = semanticModel.GetTypeInfo(beforeDotExpression, cancellationToken);
+					var semanticInfo = semanticModel.GetSymbolInfo(beforeDotExpression, cancellationToken);
+
+					typeToGenerateIn = typeInfo.Type is ITypeParameterSymbol
+						? ((ITypeParameterSymbol)typeInfo.Type).GetNamedTypeSymbolConstraint()
+						: typeInfo.Type as INamedTypeSymbol;
+
+					isStatic = semanticInfo.Symbol is INamedTypeSymbol;
+				}
+			}
+			else if (simpleNameOrMemberAccessExpression.IsPointerMemberAccessExpression())
+			{
+				var beforeArrowExpression = simpleNameOrMemberAccessExpression.GetExpressionOfMemberAccessExpression();
+				if (beforeArrowExpression != null)
+				{
+					var typeInfo = semanticModel.GetTypeInfo(beforeArrowExpression, cancellationToken);
+
+					if (typeInfo.Type.IsPointerType())
+					{
+						typeToGenerateIn = ((IPointerTypeSymbol)typeInfo.Type).PointedAtType as INamedTypeSymbol;
+						isStatic = false;
+					}
+				}
+			}
+			else if (simpleNameOrMemberAccessExpression.IsAttributeNamedArgumentIdentifier())
+			{
+				var attributeNode = simpleNameOrMemberAccessExpression.GetAncestors().FirstOrDefault(CSharpSyntaxFactsService.IsAttribute);
+				var attributeName = attributeNode.GetNameOfAttribute();
+				var attributeType = semanticModel.GetTypeInfo(attributeName, cancellationToken);
+
+				typeToGenerateIn = attributeType.Type as INamedTypeSymbol;
+				isStatic = false;
+			}
+			else if (simpleNameOrMemberAccessExpression.IsObjectInitializerNamedAssignmentIdentifier())
+			{
+				var objectCreationNode = simpleNameOrMemberAccessExpression.GetAncestors().FirstOrDefault(CSharpSyntaxFactsService.IsObjectCreationExpression);
+				typeToGenerateIn = semanticModel.GetTypeInfo(objectCreationNode, cancellationToken).Type as INamedTypeSymbol;
+				isStatic = false;
+			}
+			else
+			{
+				// Generating into the containing type.
+				typeToGenerateIn = containingType;
+				isStatic = simpleNameOrMemberAccessExpression.IsInStaticContext();
+			}
+
+			if (typeToGenerateIn != null)
+			{
+				typeToGenerateIn = typeToGenerateIn.OriginalDefinition;
+			}
+
+			return typeToGenerateIn != null;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateConstructor/AbstractGenerateConstructorService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateConstructor/AbstractGenerateConstructorService.cs
new file mode 100644
index 0000000000..e35be8230c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateConstructor/AbstractGenerateConstructorService.cs
@@ -0,0 +1,701 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using Microsoft.CodeAnalysis.Editing;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using System;
+using Microsoft.CodeAnalysis.FindSymbols;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateConstructor
+{
+	abstract partial class AbstractGenerateConstructorService<TService, TArgumentSyntax, TAttributeArgumentSyntax>
+		where TService : AbstractGenerateConstructorService<TService, TArgumentSyntax, TAttributeArgumentSyntax>
+		where TArgumentSyntax : SyntaxNode
+		where TAttributeArgumentSyntax : SyntaxNode
+	{
+
+		protected AbstractGenerateConstructorService()
+		{
+		}
+
+		protected abstract bool IsSimpleNameGeneration(SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken);
+		protected abstract bool IsConstructorInitializerGeneration(SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken);
+
+		protected abstract bool TryInitializeConstructorInitializerGeneration(SemanticDocument document, SyntaxNode constructorInitializer, CancellationToken cancellationToken, out SyntaxToken token, out IList<TArgumentSyntax> arguments, out INamedTypeSymbol typeToGenerateIn);
+		protected abstract bool TryInitializeSimpleNameGenerationState(SemanticDocument document, SyntaxNode simpleName, CancellationToken cancellationToken, out SyntaxToken token, out IList<TArgumentSyntax> arguments, out INamedTypeSymbol typeToGenerateIn);
+		protected abstract bool TryInitializeSimpleAttributeNameGenerationState(SemanticDocument document, SyntaxNode simpleName, CancellationToken cancellationToken, out SyntaxToken token, out IList<TArgumentSyntax> arguments, out IList<TAttributeArgumentSyntax> attributeArguments, out INamedTypeSymbol typeToGenerateIn);
+
+		protected abstract IList<string> GenerateParameterNames(SemanticModel semanticModel, IEnumerable<TArgumentSyntax> arguments, IList<string> reservedNames = null);
+		protected virtual IList<string> GenerateParameterNames(SemanticModel semanticModel, IEnumerable<TAttributeArgumentSyntax> arguments, IList<string> reservedNames = null) { return null; }
+		protected abstract string GenerateNameForArgument(SemanticModel semanticModel, TArgumentSyntax argument);
+		protected virtual string GenerateNameForArgument(SemanticModel semanticModel, TAttributeArgumentSyntax argument) { return null; }
+		protected abstract RefKind GetRefKind(TArgumentSyntax argument);
+		protected abstract bool IsNamedArgument(TArgumentSyntax argument);
+		protected abstract ITypeSymbol GetArgumentType(SemanticModel semanticModel, TArgumentSyntax argument, CancellationToken cancellationToken);
+		protected virtual ITypeSymbol GetAttributeArgumentType(SemanticModel semanticModel, TAttributeArgumentSyntax argument, CancellationToken cancellationToken) { return null; }
+
+		public async Task<IEnumerable<CodeAction>> GenerateConstructorAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var semanticDocument = await SemanticDocument.CreateAsync(document, cancellationToken).ConfigureAwait(false);
+
+			var state = await State.GenerateAsync((TService)this, semanticDocument, node, cancellationToken).ConfigureAwait(false);
+			if (state == null)
+			{
+				return SpecializedCollections.EmptyEnumerable<CodeAction>();
+			}
+
+			return GetActions(document, state);
+		}
+
+		private IEnumerable<CodeAction> GetActions(Document document, State state)
+		{
+			yield return new GenerateConstructorCodeAction((TService)this, document, state);
+		}
+
+		private class GenerateConstructorCodeAction : CodeAction
+		{
+			private readonly State _state;
+			private readonly Document _document;
+			private readonly TService _service;
+
+			public GenerateConstructorCodeAction(
+				TService service,
+				Document document,
+				State state)
+			{
+				_service = service;
+				_document = document;
+				_state = state;
+			}
+
+			protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+			{
+				var semanticDocument = await SemanticDocument.CreateAsync(_document, cancellationToken).ConfigureAwait(false);
+				var editor = new Editor(_service, semanticDocument, _state, cancellationToken);
+				return await editor.GetEditAsync().ConfigureAwait(false);
+			}
+
+			public override string Title
+			{
+				get
+				{
+					return string.Format(Resources.GenerateNewConstructorIn,
+						_state.TypeToGenerateIn.Name);
+				}
+			}
+		}
+
+		protected abstract bool IsConversionImplicit(Compilation compilation, ITypeSymbol sourceType, ITypeSymbol targetType);
+
+		internal abstract IMethodSymbol GetDelegatingConstructor(State state, SemanticDocument document, int argumentCount, INamedTypeSymbol namedType, ISet<IMethodSymbol> candidates, CancellationToken cancellationToken);
+
+		private partial class Editor
+		{
+			private readonly TService _service;
+			private readonly SemanticDocument _document;
+			private readonly State _state;
+			private readonly CancellationToken _cancellationToken;
+
+			public Editor(
+				TService service,
+				SemanticDocument document,
+				State state,
+				CancellationToken cancellationToken)
+			{
+				_service = service;
+				_document = document;
+				_state = state;
+				_cancellationToken = cancellationToken;
+			}
+
+			internal async Task<Document> GetEditAsync()
+			{
+				// First, see if there's an accessible base constructor that would accept these
+				// types, then just call into that instead of generating fields.
+				//
+				// then, see if there are any constructors that would take the first 'n' arguments
+				// we've provided.  If so, delegate to those, and then create a field for any
+				// remaining arguments.  Try to match from largest to smallest.
+				//
+				// Otherwise, just generate a normal constructor that assigns any provided
+				// parameters into fields.
+
+				var edit = await GenerateThisOrBaseDelegatingConstructorAsync().ConfigureAwait(false);
+				if (edit != null)
+				{
+					return edit;
+				}
+
+				return await GenerateFieldDelegatingConstructorAsync().ConfigureAwait(false);
+			}
+
+			private async Task<Document> GenerateThisOrBaseDelegatingConstructorAsync()
+			{
+				// We don't have to deal with the zero length case, since there's nothing to
+				// delegate.  It will fall out of the GenerateFieldDelegatingConstructor above.
+				for (int i = _state.Arguments.Count; i >= 1; i--)
+				{
+					var edit = await GenerateThisOrBaseDelegatingConstructorAsync(i).ConfigureAwait(false);
+					if (edit != null)
+					{
+						return edit;
+					}
+				}
+
+				return null;
+			}
+
+			private async Task<Document> GenerateThisOrBaseDelegatingConstructorAsync(int argumentCount)
+			{
+				Document edit;
+				if ((edit = await GenerateDelegatingConstructorAsync(argumentCount, _state.TypeToGenerateIn).ConfigureAwait(false)) != null ||
+					(edit = await GenerateDelegatingConstructorAsync(argumentCount, _state.TypeToGenerateIn.BaseType).ConfigureAwait(false)) != null)
+				{
+					return edit;
+				}
+
+				return null;
+			}
+
+			private async Task<Document> GenerateDelegatingConstructorAsync(
+				int argumentCount,
+				INamedTypeSymbol namedType)
+			{
+				if (namedType == null)
+				{
+					return null;
+				}
+
+				// We can't resolve overloads across language.
+				if (_document.Project.Language != namedType.Language)
+				{
+					return null;
+				}
+
+				// var arguments = _state.Arguments.Take(argumentCount).ToList();
+				var remainingArguments = _state.Arguments.Skip(argumentCount).ToList();
+				var remainingAttributeArguments = _state.AttributeArguments != null ? _state.AttributeArguments.Skip(argumentCount).ToList() : null;
+				var remainingParameterTypes = _state.ParameterTypes.Skip(argumentCount).ToList();
+
+				var instanceConstructors = namedType.InstanceConstructors.Where(IsSymbolAccessible).ToSet();
+				if (instanceConstructors.IsEmpty())
+				{
+					return null;
+				}
+
+				var delegatedConstructor = _service.GetDelegatingConstructor(_state, _document, argumentCount, namedType, instanceConstructors, _cancellationToken);
+				if (delegatedConstructor == null)
+				{
+					return null;
+				}
+
+				// There was a best match.  Call it directly.  
+				var provider = _document.Project.Solution.Workspace.Services.GetLanguageServices(_state.TypeToGenerateIn.Language);
+				var syntaxFactory = provider.GetService<SyntaxGenerator>();
+				var codeGenerationService = new CSharpCodeGenerationService (_document.Project.Solution.Workspace);
+
+				// Map the first N parameters to the other constructor in this type.  Then
+				// try to map any further parameters to existing fields.  Finally, generate
+				// new fields if no such parameters exist.
+
+				// Find the names of the parameters that will follow the parameters we're
+				// delegating.
+				var remainingParameterNames = _service.GenerateParameterNames(
+					_document.SemanticModel, remainingArguments, delegatedConstructor.Parameters.Select(p => p.Name).ToList());
+
+				// Can't generate the constructor if the parameter names we're copying over forcibly
+				// conflict with any names we generated.
+				if (delegatedConstructor.Parameters.Select(p => p.Name).Intersect(remainingParameterNames).Any())
+				{
+					return null;
+				}
+
+				// Try to map those parameters to fields.
+				Dictionary<string, ISymbol> parameterToExistingFieldMap;
+				Dictionary<string, string> parameterToNewFieldMap;
+				List<IParameterSymbol> remainingParameters;
+				this.GetParameters(remainingArguments, remainingAttributeArguments, remainingParameterTypes, remainingParameterNames, out parameterToExistingFieldMap, out parameterToNewFieldMap, out remainingParameters);
+
+				var fields = syntaxFactory.CreateFieldsForParameters(remainingParameters, parameterToNewFieldMap);
+				var assignStatements = syntaxFactory.CreateAssignmentStatements(remainingParameters, parameterToExistingFieldMap, parameterToNewFieldMap);
+
+				var allParameters = delegatedConstructor.Parameters.Concat(remainingParameters).ToList();
+
+				var isThis = namedType.Equals(_state.TypeToGenerateIn);
+				var delegatingArguments = syntaxFactory.CreateArguments(delegatedConstructor.Parameters);
+				var baseConstructorArguments = isThis ? null : delegatingArguments;
+				var thisConstructorArguments = isThis ? delegatingArguments : null;
+
+				var constructor = CodeGenerationSymbolFactory.CreateConstructorSymbol(
+					attributes: null,
+					accessibility: Accessibility.Public,
+					modifiers: default(DeclarationModifiers),
+					typeName: _state.TypeToGenerateIn.Name,
+					parameters: allParameters,
+					statements: assignStatements.ToList(),
+					baseConstructorArguments: baseConstructorArguments,
+					thisConstructorArguments: thisConstructorArguments);
+
+				var members = new List<ISymbol>(fields) { constructor };
+				var result = await codeGenerationService.AddMembersAsync(
+					_document.Project.Solution,
+					_state.TypeToGenerateIn,
+					members,
+					new CodeGenerationOptions(_state.Token.GetLocation(), generateDefaultAccessibility: false),
+					_cancellationToken)
+					.ConfigureAwait(false);
+
+				return result;
+			}
+
+			private async Task<Document> GenerateFieldDelegatingConstructorAsync()
+			{
+				var arguments = _state.Arguments.ToList();
+				var parameterTypes = _state.ParameterTypes;
+
+				var typeParametersNames = _state.TypeToGenerateIn.GetAllTypeParameters().Select(t => t.Name).ToList();
+				var parameterNames = _state.AttributeArguments != null
+					? _service.GenerateParameterNames(_document.SemanticModel, _state.AttributeArguments, typeParametersNames)
+					: _service.GenerateParameterNames(_document.SemanticModel, arguments, typeParametersNames);
+
+				Dictionary<string, ISymbol> parameterToExistingFieldMap;
+				Dictionary<string, string> parameterToNewFieldMap;
+				List<IParameterSymbol> parameters;
+				GetParameters(arguments, _state.AttributeArguments, parameterTypes, parameterNames, out parameterToExistingFieldMap, out parameterToNewFieldMap, out parameters);
+
+				var provider = _document.Project.Solution.Workspace.Services.GetLanguageServices(_state.TypeToGenerateIn.Language);
+				var syntaxFactory = provider.GetService<SyntaxGenerator>();
+				var codeGenerationService = new CSharpCodeGenerationService (_document.Project.Solution.Workspace);
+
+				var members = syntaxFactory.CreateFieldDelegatingConstructor(
+					_state.TypeToGenerateIn.Name, _state.TypeToGenerateIn, parameters,
+					parameterToExistingFieldMap, parameterToNewFieldMap, _cancellationToken);
+
+				var result = await codeGenerationService.AddMembersAsync(
+					_document.Project.Solution,
+					_state.TypeToGenerateIn,
+					members,
+					new CodeGenerationOptions(_state.Token.GetLocation(), generateDefaultAccessibility: false),
+					_cancellationToken)
+					.ConfigureAwait(false);
+
+				return result;
+			}
+
+			private void GetParameters(
+				IList<TArgumentSyntax> arguments,
+				IList<TAttributeArgumentSyntax> attributeArguments,
+				IList<ITypeSymbol> parameterTypes,
+				IList<string> parameterNames,
+				out Dictionary<string, ISymbol> parameterToExistingFieldMap,
+				out Dictionary<string, string> parameterToNewFieldMap,
+				out List<IParameterSymbol> parameters)
+			{
+				parameterToExistingFieldMap = new Dictionary<string, ISymbol>();
+				parameterToNewFieldMap = new Dictionary<string, string>();
+				parameters = new List<IParameterSymbol>();
+
+				for (var i = 0; i < parameterNames.Count; i++)
+				{
+					// See if there's a matching field we can use.  First test in a case sensitive
+					// manner, then case insensitively.
+					if (!TryFindMatchingField(arguments, attributeArguments, parameterNames, parameterTypes, i, parameterToExistingFieldMap, parameterToNewFieldMap, caseSentitive: true))
+					{
+						if (!TryFindMatchingField(arguments, attributeArguments, parameterNames, parameterTypes, i, parameterToExistingFieldMap, parameterToNewFieldMap, caseSentitive: false))
+						{
+							parameterToNewFieldMap[parameterNames[i]] = parameterNames[i];
+						}
+					}
+
+					parameters.Add(CodeGenerationSymbolFactory.CreateParameterSymbol(
+						attributes: null,
+						refKind: _service.GetRefKind(arguments[i]),
+						isParams: false,
+						type: parameterTypes[i],
+						name: parameterNames[i]));
+				}
+			}
+
+			private bool TryFindMatchingField(
+				IList<TArgumentSyntax> arguments,
+				IList<TAttributeArgumentSyntax> attributeArguments,
+				IList<string> parameterNames,
+				IList<ITypeSymbol> parameterTypes,
+				int index,
+				Dictionary<string, ISymbol> parameterToExistingFieldMap,
+				Dictionary<string, string> parameterToNewFieldMap,
+				bool caseSentitive)
+			{
+				var parameterName = parameterNames[index];
+				var parameterType = parameterTypes[index];
+				var isFixed = _service.IsNamedArgument(arguments[index]);
+
+				// For non-out parameters, see if there's already a field there with the same name.
+				// If so, and it has a compatible type, then we can just assign to that field.
+				// Otherwise, we'll need to choose a different name for this member so that it
+				// doesn't conflict with something already in the type. First check the current type
+				// for a matching field.  If so, defer to it.
+				var comparison = caseSentitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
+
+				foreach (var type in _state.TypeToGenerateIn.GetBaseTypesAndThis())
+				{
+					var ignoreAccessibility = type.Equals(_state.TypeToGenerateIn);
+					var symbol = type.GetMembers()
+						.FirstOrDefault(s => s.Name.Equals(parameterName, comparison));
+
+					if (symbol != null)
+					{
+						if (ignoreAccessibility || IsSymbolAccessible(symbol))
+						{
+							if (IsViableFieldOrProperty(parameterType, symbol))
+							{
+								// Ok!  We can just the existing field.  
+								parameterToExistingFieldMap[parameterName] = symbol;
+							}
+							else
+							{
+								// Uh-oh.  Now we have a problem.  We can't assign this parameter to
+								// this field.  So we need to create a new field.  Find a name not in
+								// use so we can assign to that.  
+								var newFieldName = NameGenerator.EnsureUniqueness(
+									attributeArguments != null ?
+									_service.GenerateNameForArgument(_document.SemanticModel, attributeArguments[index]) :
+									_service.GenerateNameForArgument(_document.SemanticModel, arguments[index]),
+									GetUnavailableMemberNames().Concat(parameterToNewFieldMap.Values));
+
+								if (isFixed)
+								{
+									// Can't change the parameter name, so map the existing parameter
+									// name to the new field name.
+									parameterToNewFieldMap[parameterName] = newFieldName;
+								}
+								else
+								{
+									// Can change the parameter name, so do so.
+									parameterNames[index] = newFieldName;
+									parameterToNewFieldMap[newFieldName] = newFieldName;
+								}
+							}
+
+							return true;
+						}
+					}
+				}
+
+				return false;
+			}
+
+			private IEnumerable<string> GetUnavailableMemberNames()
+			{
+				return _state.TypeToGenerateIn.MemberNames.Concat(
+					from type in _state.TypeToGenerateIn.GetBaseTypes()
+					from member in type.GetMembers()
+					select member.Name);
+			}
+
+			private bool IsViableFieldOrProperty(
+				ITypeSymbol parameterType,
+				ISymbol symbol)
+			{
+				if (parameterType.Language != symbol.Language)
+				{
+					return false;
+				}
+
+				if (symbol != null && !symbol.IsStatic)
+				{
+					if (symbol is IFieldSymbol)
+					{
+						var field = (IFieldSymbol)symbol;
+						return
+							!field.IsConst &&
+							_service.IsConversionImplicit(_document.SemanticModel.Compilation, parameterType, field.Type);
+					}
+					else if (symbol is IPropertySymbol)
+					{
+						var property = (IPropertySymbol)symbol;
+						return
+							property.Parameters.Length == 0 &&
+							property.SetMethod != null &&
+							_service.IsConversionImplicit(_document.SemanticModel.Compilation, parameterType, property.Type);
+					}
+				}
+
+				return false;
+			}
+
+			private bool IsSymbolAccessible(
+				ISymbol symbol)
+			{
+				if (symbol == null)
+				{
+					return false;
+				}
+
+				if (symbol.Kind == SymbolKind.Property)
+				{
+					if (!IsSymbolAccessible(((IPropertySymbol)symbol).SetMethod))
+					{
+						return false;
+					}
+				}
+
+				// Public and protected constructors are accessible.  Internal constructors are
+				// accessible if we have friend access.  We can't call the normal accessibility
+				// checkers since they will think that a protected constructor isn't accessible
+				// (since we don't have the destination type that would have access to them yet).
+				switch (symbol.DeclaredAccessibility)
+				{
+				case Accessibility.ProtectedOrInternal:
+				case Accessibility.Protected:
+				case Accessibility.Public:
+					return true;
+				case Accessibility.ProtectedAndInternal:
+				case Accessibility.Internal:
+					return _document.SemanticModel.Compilation.Assembly.IsSameAssemblyOrHasFriendAccessTo(
+						symbol.ContainingAssembly);
+
+				default:
+					return false;
+				}
+			}
+		}
+
+		protected internal class State
+		{
+			public IList<TArgumentSyntax> Arguments { get; private set; }
+
+			public IList<TAttributeArgumentSyntax> AttributeArguments { get; private set; }
+
+			// The type we're creating a constructor for.  Will be a class or struct type.
+			public INamedTypeSymbol TypeToGenerateIn { get; private set; }
+
+			public IList<ITypeSymbol> ParameterTypes { get; private set; }
+			public IList<RefKind> ParameterRefKinds { get; private set; }
+
+			public SyntaxToken Token { get; private set; }
+			public bool IsConstructorInitializerGeneration { get; private set; }
+
+			private State()
+			{
+				this.IsConstructorInitializerGeneration = false;
+			}
+
+			public static async Task<State> GenerateAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				var state = new State();
+				if (!await state.TryInitializeAsync(service, document, node, cancellationToken).ConfigureAwait(false))
+				{
+					return null;
+				}
+
+				return state;
+			}
+
+			private async Task<bool> TryInitializeAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				if (service.IsConstructorInitializerGeneration(document, node, cancellationToken))
+				{
+					if (!await TryInitializeConstructorInitializerGenerationAsync(service, document, node, cancellationToken).ConfigureAwait(false))
+					{
+						return false;
+					}
+				}
+				else if (service.IsSimpleNameGeneration(document, node, cancellationToken))
+				{
+					if (!await TryInitializeSimpleNameGenerationAsync(service, document, node, cancellationToken).ConfigureAwait(false))
+					{
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+
+				if (!new CSharpCodeGenerationService (document.Project.Solution.Workspace).CanAddTo(this.TypeToGenerateIn, document.Project.Solution, cancellationToken))
+				{
+					return false;
+				}
+
+				this.ParameterTypes = this.ParameterTypes ?? GetParameterTypes(service, document, cancellationToken);
+				this.ParameterRefKinds = this.Arguments.Select(service.GetRefKind).ToList();
+
+				return !ClashesWithExistingConstructor(service, document, cancellationToken);
+			}
+
+			private bool ClashesWithExistingConstructor(TService service, SemanticDocument document, CancellationToken cancellationToken)
+			{
+				var parameters = this.ParameterTypes.Zip(this.ParameterRefKinds, (t, r) => CodeGenerationSymbolFactory.CreateParameterSymbol(
+					attributes: null,
+					refKind: r,
+					isParams: false,
+					type: t,
+					name: string.Empty)).ToList();
+
+				return this.TypeToGenerateIn.InstanceConstructors.Any(c => SignatureComparer.HaveSameSignature(parameters, c.Parameters, compareParameterName: true, isCaseSensitive: true));
+			}
+
+			internal List<ITypeSymbol> GetParameterTypes(
+				TService service,
+				SemanticDocument document,
+				CancellationToken cancellationToken)
+			{
+				var allTypeParameters = this.TypeToGenerateIn.GetAllTypeParameters();
+				var semanticModel = document.SemanticModel;
+				var allTypes = this.AttributeArguments != null
+					? this.AttributeArguments.Select(a => service.GetAttributeArgumentType(semanticModel, a, cancellationToken))
+					: this.Arguments.Select(a => service.GetArgumentType(semanticModel, a, cancellationToken));
+
+				return allTypes.Select(t => FixType(t, semanticModel, allTypeParameters)).ToList();
+			}
+
+			private ITypeSymbol FixType(ITypeSymbol typeSymbol, SemanticModel semanticModel, IEnumerable<ITypeParameterSymbol> allTypeParameters)
+			{
+				var compilation = semanticModel.Compilation;
+				return typeSymbol.RemoveAnonymousTypes(compilation)
+					.RemoveUnavailableTypeParameters(compilation, allTypeParameters)
+					.RemoveUnnamedErrorTypes(compilation);
+			}
+
+			private async Task<bool> TryInitializeConstructorInitializerGenerationAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode constructorInitializer,
+				CancellationToken cancellationToken)
+			{
+				SyntaxToken token;
+				IList<TArgumentSyntax> arguments;
+				INamedTypeSymbol typeToGenerateIn;
+				if (!service.TryInitializeConstructorInitializerGeneration(document, constructorInitializer, cancellationToken,
+					out token, out arguments, out typeToGenerateIn))
+				{
+					return false;
+				}
+
+				this.Token = token;
+				this.Arguments = arguments;
+				this.IsConstructorInitializerGeneration = true;
+
+				var semanticModel = document.SemanticModel;
+				var semanticInfo = semanticModel.GetSymbolInfo(constructorInitializer, cancellationToken);
+
+				cancellationToken.ThrowIfCancellationRequested();
+				if (semanticInfo.Symbol != null)
+				{
+					return false;
+				}
+
+				return await TryDetermineTypeToGenerateInAsync(document, typeToGenerateIn, cancellationToken).ConfigureAwait(false);
+			}
+
+			private async Task<bool> TryInitializeSimpleNameGenerationAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode simpleName,
+				CancellationToken cancellationToken)
+			{
+				SyntaxToken token;
+				IList<TArgumentSyntax> arguments;
+				IList<TAttributeArgumentSyntax> attributeArguments;
+				INamedTypeSymbol typeToGenerateIn;
+				if (service.TryInitializeSimpleNameGenerationState(document, simpleName, cancellationToken,
+					out token, out arguments, out typeToGenerateIn))
+				{
+					this.Token = token;
+					this.Arguments = arguments;
+				}
+				else if (service.TryInitializeSimpleAttributeNameGenerationState(document, simpleName, cancellationToken,
+					out token, out arguments, out attributeArguments, out typeToGenerateIn))
+				{
+					this.Token = token;
+					this.AttributeArguments = attributeArguments;
+					this.Arguments = arguments;
+
+					//// Attribute parameters are restricted to be constant values (simple types or string, etc).
+					if (this.AttributeArguments != null && GetParameterTypes(service, document, cancellationToken).Any(t => !IsValidAttributeParameterType(t)))
+					{
+						return false;
+					}
+					else if (GetParameterTypes(service, document, cancellationToken).Any(t => !IsValidAttributeParameterType(t)))
+					{
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+
+				cancellationToken.ThrowIfCancellationRequested();
+
+				return await TryDetermineTypeToGenerateInAsync(document, typeToGenerateIn, cancellationToken).ConfigureAwait(false);
+			}
+
+			private bool IsValidAttributeParameterType(ITypeSymbol type)
+			{
+				if (type.Kind == SymbolKind.ArrayType)
+				{
+					var arrayType = (IArrayTypeSymbol)type;
+					if (arrayType.Rank != 1)
+					{
+						return false;
+					}
+
+					type = arrayType.ElementType;
+				}
+
+				if (type.IsEnumType())
+				{
+					return true;
+				}
+
+				switch (type.SpecialType)
+				{
+				case SpecialType.System_Boolean:
+				case SpecialType.System_Byte:
+				case SpecialType.System_Char:
+				case SpecialType.System_Int16:
+				case SpecialType.System_Int32:
+				case SpecialType.System_Int64:
+				case SpecialType.System_Double:
+				case SpecialType.System_Single:
+				case SpecialType.System_String:
+					return true;
+
+				default:
+					return false;
+				}
+			}
+
+			private async Task<bool> TryDetermineTypeToGenerateInAsync(
+				SemanticDocument document,
+				INamedTypeSymbol original,
+				CancellationToken cancellationToken)
+			{
+				var definition = await SymbolFinder.FindSourceDefinitionAsync(original, document.Project.Solution, cancellationToken).ConfigureAwait(false);
+				this.TypeToGenerateIn = definition as INamedTypeSymbol;
+
+				return this.TypeToGenerateIn != null &&
+					(this.TypeToGenerateIn.TypeKind == TypeKind.Class ||
+						this.TypeToGenerateIn.TypeKind == TypeKind.Struct);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateConstructor/CSharpGenerateConstructorService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateConstructor/CSharpGenerateConstructorService.cs
new file mode 100644
index 0000000000..f737ff1a3a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateConstructor/CSharpGenerateConstructorService.cs
@@ -0,0 +1,279 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateConstructor
+{
+	class CSharpGenerateConstructorService : AbstractGenerateConstructorService<CSharpGenerateConstructorService, ArgumentSyntax, AttributeArgumentSyntax>
+	{
+		private static readonly SyntaxAnnotation s_annotation = new SyntaxAnnotation();
+
+		protected override bool IsSimpleNameGeneration(SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return node is SimpleNameSyntax;
+		}
+
+		protected override bool IsConstructorInitializerGeneration(SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return node is ConstructorInitializerSyntax;
+		}
+
+		protected override bool TryInitializeConstructorInitializerGeneration(
+			SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken,
+			out SyntaxToken token, out IList<ArgumentSyntax> arguments, out INamedTypeSymbol typeToGenerateIn)
+		{
+			var constructorInitializer = (ConstructorInitializerSyntax)node;
+
+			if (!constructorInitializer.ArgumentList.CloseParenToken.IsMissing)
+			{
+				token = constructorInitializer.ThisOrBaseKeyword;
+				arguments = constructorInitializer.ArgumentList.Arguments.ToList();
+
+				var semanticModel = document.SemanticModel;
+				var currentType = semanticModel.GetEnclosingNamedType(constructorInitializer.SpanStart, cancellationToken);
+				typeToGenerateIn = constructorInitializer.IsKind(SyntaxKind.ThisConstructorInitializer)
+					? currentType
+					: currentType.BaseType.OriginalDefinition;
+				return typeToGenerateIn != null;
+			}
+
+			token = default(SyntaxToken);
+			arguments = null;
+			typeToGenerateIn = null;
+			return false;
+		}
+
+		protected override bool TryInitializeSimpleNameGenerationState(
+			SemanticDocument document,
+			SyntaxNode node,
+			CancellationToken cancellationToken,
+			out SyntaxToken token,
+			out IList<ArgumentSyntax> arguments,
+			out INamedTypeSymbol typeToGenerateIn)
+		{
+			var simpleName = (SimpleNameSyntax)node;
+			var fullName = simpleName.IsRightSideOfQualifiedName()
+				? (NameSyntax)simpleName.Parent
+				: simpleName;
+
+			if (fullName.Parent is ObjectCreationExpressionSyntax)
+			{
+				var objectCreationExpression = (ObjectCreationExpressionSyntax)fullName.Parent;
+				if (objectCreationExpression.ArgumentList != null &&
+					!objectCreationExpression.ArgumentList.CloseParenToken.IsMissing)
+				{
+					var symbolInfo = document.SemanticModel.GetSymbolInfo(objectCreationExpression.Type, cancellationToken);
+					token = simpleName.Identifier;
+					arguments = objectCreationExpression.ArgumentList.Arguments.ToList();
+					typeToGenerateIn = symbolInfo.GetAnySymbol() as INamedTypeSymbol;
+					return typeToGenerateIn != null;
+				}
+			}
+
+			token = default(SyntaxToken);
+			arguments = null;
+			typeToGenerateIn = null;
+			return false;
+		}
+
+		protected override bool TryInitializeSimpleAttributeNameGenerationState(
+			SemanticDocument document,
+			SyntaxNode node,
+			CancellationToken cancellationToken,
+			out SyntaxToken token,
+			out IList<ArgumentSyntax> arguments,
+			out IList<AttributeArgumentSyntax> attributeArguments,
+			out INamedTypeSymbol typeToGenerateIn)
+		{
+			var simpleName = (SimpleNameSyntax)node;
+			var fullName = simpleName.IsRightSideOfQualifiedName()
+				? (NameSyntax)simpleName.Parent
+				: simpleName;
+
+			if (fullName.Parent is AttributeSyntax)
+			{
+				var attribute = (AttributeSyntax)fullName.Parent;
+				if (attribute.ArgumentList != null &&
+					!attribute.ArgumentList.CloseParenToken.IsMissing)
+				{
+					var symbolInfo = document.SemanticModel.GetSymbolInfo(attribute, cancellationToken);
+					if (symbolInfo.CandidateReason == CandidateReason.OverloadResolutionFailure && !symbolInfo.CandidateSymbols.IsEmpty)
+					{
+						token = simpleName.Identifier;
+						attributeArguments = attribute.ArgumentList.Arguments.ToList();
+						arguments = attributeArguments.Select(x => SyntaxFactory.Argument(x.NameColon ?? ((x.NameEquals != null) ? SyntaxFactory.NameColon(x.NameEquals.Name) : null), default(SyntaxToken), x.Expression)).ToList();
+
+						typeToGenerateIn = symbolInfo.CandidateSymbols.FirstOrDefault().ContainingSymbol as INamedTypeSymbol;
+						return typeToGenerateIn != null;
+					}
+				}
+			}
+
+			token = default(SyntaxToken);
+			arguments = null;
+			attributeArguments = null;
+			typeToGenerateIn = null;
+			return false;
+		}
+
+		protected override IList<string> GenerateParameterNames(
+			SemanticModel semanticModel, IEnumerable<ArgumentSyntax> arguments, IList<string> reservedNames)
+		{
+			return semanticModel.GenerateParameterNames(arguments, reservedNames);
+		}
+
+		protected override IList<string> GenerateParameterNames(
+			SemanticModel semanticModel, IEnumerable<AttributeArgumentSyntax> arguments, IList<string> reservedNames)
+		{
+			return semanticModel.GenerateParameterNames(arguments, reservedNames);
+		}
+
+		protected override string GenerateNameForArgument(
+			SemanticModel semanticModel, ArgumentSyntax argument)
+		{
+			return semanticModel.GenerateNameForArgument(argument);
+		}
+
+		protected override string GenerateNameForArgument(
+			SemanticModel semanticModel, AttributeArgumentSyntax argument)
+		{
+			return semanticModel.GenerateNameForArgument(argument);
+		}
+
+		protected override RefKind GetRefKind(ArgumentSyntax argument)
+		{
+			return argument.RefOrOutKeyword.Kind() == SyntaxKind.RefKeyword ? RefKind.Ref :
+				argument.RefOrOutKeyword.Kind() == SyntaxKind.OutKeyword ? RefKind.Out : RefKind.None;
+		}
+
+		protected override bool IsNamedArgument(ArgumentSyntax argument)
+		{
+			return argument.NameColon != null;
+		}
+
+		protected override ITypeSymbol GetArgumentType(
+			SemanticModel semanticModel, ArgumentSyntax argument, CancellationToken cancellationToken)
+		{
+			return semanticModel.GetType(argument.Expression, cancellationToken);
+		}
+
+		protected override ITypeSymbol GetAttributeArgumentType(
+			SemanticModel semanticModel, AttributeArgumentSyntax argument, CancellationToken cancellationToken)
+		{
+			return semanticModel.GetType(argument.Expression, cancellationToken);
+		}
+
+		protected override bool IsConversionImplicit(Compilation compilation, ITypeSymbol sourceType, ITypeSymbol targetType)
+		{
+			return compilation.ClassifyConversion(sourceType, targetType).IsImplicit;
+		}
+
+		internal override IMethodSymbol GetDelegatingConstructor(State state, SemanticDocument document, int argumentCount, INamedTypeSymbol namedType, ISet<IMethodSymbol> candidates, CancellationToken cancellationToken)
+		{
+			var oldToken = state.Token;
+			var tokenKind = oldToken.Kind();
+
+			if (state.IsConstructorInitializerGeneration)
+			{
+				SyntaxToken thisOrBaseKeyword;
+				SyntaxKind newCtorInitializerKind;
+				if (tokenKind != SyntaxKind.BaseKeyword && state.TypeToGenerateIn == namedType)
+				{
+					thisOrBaseKeyword = SyntaxFactory.Token(SyntaxKind.ThisKeyword);
+					newCtorInitializerKind = SyntaxKind.ThisConstructorInitializer;
+				}
+				else
+				{
+					thisOrBaseKeyword = SyntaxFactory.Token(SyntaxKind.BaseKeyword);
+					newCtorInitializerKind = SyntaxKind.BaseConstructorInitializer;
+				}
+
+				var ctorInitializer = (ConstructorInitializerSyntax)oldToken.Parent;
+				var oldArgumentList = ctorInitializer.ArgumentList;
+				var newArgumentList = GetNewArgumentList(oldArgumentList, argumentCount);
+
+				var newCtorInitializer = SyntaxFactory.ConstructorInitializer(newCtorInitializerKind, ctorInitializer.ColonToken, thisOrBaseKeyword, newArgumentList);
+				SemanticModel speculativeModel;
+				if (document.SemanticModel.TryGetSpeculativeSemanticModel(ctorInitializer.Span.Start, newCtorInitializer, out speculativeModel))
+				{
+					var symbolInfo = speculativeModel.GetSymbolInfo(newCtorInitializer, cancellationToken);
+					return GenerateConstructorHelpers.GetDelegatingConstructor(symbolInfo, candidates, namedType);
+				}
+			}
+			else
+			{
+				var oldNode = oldToken.Parent
+					.AncestorsAndSelf(ascendOutOfTrivia: false)
+					.Where(node => SpeculationAnalyzer.CanSpeculateOnNode(node))
+					.LastOrDefault();
+
+				var typeNameToReplace = (TypeSyntax)oldToken.Parent;
+				TypeSyntax newTypeName;
+				if (namedType != state.TypeToGenerateIn)
+				{
+					while (true)
+					{
+						var parentType = typeNameToReplace.Parent as TypeSyntax;
+						if (parentType == null)
+						{
+							break;
+						}
+
+						typeNameToReplace = parentType;
+					}
+
+					newTypeName = namedType.GenerateTypeSyntax().WithAdditionalAnnotations(s_annotation);
+				}
+				else
+				{
+					newTypeName = typeNameToReplace.WithAdditionalAnnotations(s_annotation);
+				}
+
+				var newNode = oldNode.ReplaceNode(typeNameToReplace, newTypeName);
+				newTypeName = (TypeSyntax)newNode.GetAnnotatedNodes(s_annotation).Single();
+
+				var oldArgumentList = (ArgumentListSyntax)newTypeName.Parent.ChildNodes().FirstOrDefault(n => n is ArgumentListSyntax);
+				if (oldArgumentList != null)
+				{
+					var newArgumentList = GetNewArgumentList(oldArgumentList, argumentCount);
+					if (newArgumentList != oldArgumentList)
+					{
+						newNode = newNode.ReplaceNode(oldArgumentList, newArgumentList);
+						newTypeName = (TypeSyntax)newNode.GetAnnotatedNodes(s_annotation).Single();
+					}
+				}
+
+				var speculativeModel = SpeculationAnalyzer.CreateSpeculativeSemanticModelForNode(oldNode, newNode, document.SemanticModel);
+				if (speculativeModel != null)
+				{
+					var symbolInfo = speculativeModel.GetSymbolInfo(newTypeName.Parent, cancellationToken);
+					return GenerateConstructorHelpers.GetDelegatingConstructor(symbolInfo, candidates, namedType);
+				}
+			}
+
+			return null;
+		}
+
+		private static ArgumentListSyntax GetNewArgumentList(ArgumentListSyntax oldArgumentList, int argumentCount)
+		{
+			if (oldArgumentList.IsMissing || oldArgumentList.Arguments.Count == argumentCount)
+			{
+				return oldArgumentList;
+			}
+
+			var newArguments = oldArgumentList.Arguments.Take(argumentCount);
+			return SyntaxFactory.ArgumentList(new SeparatedSyntaxList<ArgumentSyntax>().AddRange(newArguments));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateConstructor/GenerateConstructorHelpers.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateConstructor/GenerateConstructorHelpers.cs
new file mode 100644
index 0000000000..ce7fdf3c5d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateConstructor/GenerateConstructorHelpers.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateConstructor
+{
+	internal static class GenerateConstructorHelpers
+	{
+		public static IMethodSymbol GetDelegatingConstructor(SymbolInfo symbolInfo, ISet<IMethodSymbol> candidateInstanceConstructors, INamedTypeSymbol containingType)
+		{
+			var symbol = symbolInfo.Symbol as IMethodSymbol;
+			if (symbol == null && symbolInfo.CandidateSymbols.Count() == 1)
+			{
+				// Even though the symbol info has a non-viable candidate symbol, we are trying to speculate a base constructor
+				// invocation from a different position then where the invocation to it would be generated.
+				// Passed in candidateInstanceConstructors actually represent all accessible and invocable constructor symbols.
+				// So, we allow candidate symbol for inaccessible OR not creatable candidate reason if it is in the given candidateInstanceConstructors.
+				if (symbolInfo.CandidateReason == CandidateReason.Inaccessible ||
+					(symbolInfo.CandidateReason == CandidateReason.NotCreatable && containingType.IsAbstract))
+				{
+					symbol = symbolInfo.CandidateSymbols.Single() as IMethodSymbol;
+				}
+			}
+
+			if (symbol != null && candidateInstanceConstructors.Contains(symbol))
+			{
+				return symbol;
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateDefaultConstructors/AbstractGenerateDefaultConstructorsService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateDefaultConstructors/AbstractGenerateDefaultConstructorsService.cs
new file mode 100644
index 0000000000..e29c216a19
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateDefaultConstructors/AbstractGenerateDefaultConstructorsService.cs
@@ -0,0 +1,239 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using RefactoringEssentials;
+using Microsoft.CodeAnalysis.Editing;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateDefaultConstructors
+{
+	abstract partial class AbstractGenerateDefaultConstructorsService<TService>
+		where TService : AbstractGenerateDefaultConstructorsService<TService>
+	{
+		protected AbstractGenerateDefaultConstructorsService()
+		{
+		}
+
+		protected abstract bool TryInitializeState(SemanticDocument document, TextSpan textSpan, CancellationToken cancellationToken, out SyntaxNode baseTypeNode, out INamedTypeSymbol classType);
+
+		public async Task<GenerateDefaultConstructorsResult> GenerateDefaultConstructorsAsync(
+			Document document,
+			TextSpan textSpan,
+			CancellationToken cancellationToken)
+		{
+			var semanticDocument = await SemanticDocument.CreateAsync(document, cancellationToken).ConfigureAwait(false);
+
+			if (textSpan.IsEmpty)
+			{
+				var state = State.Generate((TService)this, semanticDocument, textSpan, cancellationToken);
+				if (state != null)
+				{
+					return new GenerateDefaultConstructorsResult(new CodeRefactoring(null, GetActions(document, state)));
+				}
+			}
+
+			return GenerateDefaultConstructorsResult.Failure;
+		}
+
+		private IEnumerable<CodeAction> GetActions(Document document, State state)
+		{
+			foreach (var constructor in state.UnimplementedConstructors)
+			{
+				yield return new GenerateDefaultConstructorCodeAction((TService)this, document, state, constructor);
+			}
+
+			if (state.UnimplementedConstructors.Count > 1)
+			{
+				yield return new CodeActionAll((TService)this, document, state, state.UnimplementedConstructors);
+			}
+		}
+
+		private abstract class AbstractCodeAction : CodeAction
+		{
+			private readonly IList<IMethodSymbol> _constructors;
+			private readonly Document _document;
+			private readonly State _state;
+			private readonly string _title;
+
+			protected AbstractCodeAction(
+				TService service,
+				Document document,
+				State state,
+				IList<IMethodSymbol> constructors,
+				string title)
+			{
+				_document = document;
+				_state = state;
+				_constructors = constructors;
+				_title = title;
+			}
+
+			public override string Title
+			{
+				get { return _title; }
+			}
+
+			protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+			{
+				var result = await CodeGenerator.AddMemberDeclarationsAsync(
+					_document.Project.Solution,
+					_state.ClassType,
+					_constructors.Select(CreateConstructorDefinition),
+					cancellationToken: cancellationToken).ConfigureAwait(false);
+
+				return result;
+			}
+
+			private IMethodSymbol CreateConstructorDefinition(
+				IMethodSymbol constructor)
+			{
+				var syntaxFactory = _document.GetLanguageService<SyntaxGenerator>();
+				var baseConstructorArguments = constructor.Parameters.Length != 0
+					? syntaxFactory.CreateArguments(constructor.Parameters)
+					: null;
+
+				return CodeGenerationSymbolFactory.CreateConstructorSymbol(
+					attributes: null,
+					accessibility: constructor.DeclaredAccessibility,
+					modifiers: new DeclarationModifiers(),
+					typeName: _state.ClassType.Name,
+					parameters: constructor.Parameters,
+					statements: null,
+					baseConstructorArguments: baseConstructorArguments);
+			}
+		}
+
+
+		private class GenerateDefaultConstructorCodeAction : AbstractCodeAction
+		{
+			public GenerateDefaultConstructorCodeAction(
+				TService service,
+				Document document,
+				State state,
+				IMethodSymbol constructor)
+				: base(service, document, state, new[] { constructor }, GetDisplayText(state, constructor))
+			{
+			}
+
+			private static string GetDisplayText(State state, IMethodSymbol constructor)
+			{
+				var parameters = constructor.Parameters.Select(p => p.Name);
+				var parameterString = string.Join(", ", parameters);
+
+				return string.Format(Resources.GenerateConstructor + ".",
+					state.ClassType.Name, parameterString);
+			}
+		}
+
+		private class CodeActionAll : AbstractCodeAction
+		{
+			public CodeActionAll(
+				TService service,
+				Document document,
+				State state,
+				IList<IMethodSymbol> constructors)
+				: base(service, document, state, GetConstructors(state, constructors), Resources.GenerateAll)
+			{
+			}
+
+			private static IList<IMethodSymbol> GetConstructors(State state, IList<IMethodSymbol> constructors)
+			{
+				return state.UnimplementedDefaultConstructor != null
+					? new[] { state.UnimplementedDefaultConstructor }.Concat(constructors).ToList()
+					: constructors;
+			}
+		}
+		private class State
+		{
+			public INamedTypeSymbol ClassType { get; private set; }
+
+			public IList<IMethodSymbol> UnimplementedConstructors { get; private set; }
+			public IMethodSymbol UnimplementedDefaultConstructor { get; private set; }
+
+			public SyntaxNode BaseTypeNode { get; private set; }
+
+			private State()
+			{
+			}
+
+			public static State Generate(
+				TService service,
+				SemanticDocument document,
+				TextSpan textSpan,
+				CancellationToken cancellationToken)
+			{
+				var state = new State();
+				if (!state.TryInitialize(service, document, textSpan, cancellationToken))
+				{
+					return null;
+				}
+
+				return state;
+			}
+
+			private bool TryInitialize(
+				TService service,
+				SemanticDocument document,
+				TextSpan textSpan,
+				CancellationToken cancellationToken)
+			{
+				SyntaxNode baseTypeNode;
+				INamedTypeSymbol classType;
+				if (!service.TryInitializeState(document, textSpan, cancellationToken, out baseTypeNode, out classType))
+				{
+					return false;
+				}
+
+				if (!baseTypeNode.Span.IntersectsWith(textSpan.Start))
+				{
+					return false;
+				}
+
+				this.BaseTypeNode = baseTypeNode;
+				this.ClassType = classType;
+
+				var baseType = this.ClassType.BaseType;
+
+				if (this.ClassType.TypeKind != TypeKind.Class ||
+					this.ClassType.IsStatic ||
+					baseType == null ||
+					baseType.SpecialType == SpecialType.System_Object ||
+					baseType.TypeKind == TypeKind.Error)
+				{
+					return false;
+				}
+
+				var classConstructors = this.ClassType.InstanceConstructors;
+				var baseTypeConstructors =
+					baseType.InstanceConstructors
+						.Where(c => c.IsAccessibleWithin(this.ClassType));
+
+				var missingConstructors =
+					baseTypeConstructors.Where(c1 => !classConstructors.Any(
+						c2 => SignatureComparer.HaveSameSignature(c1.Parameters, c2.Parameters, compareParameterName: true, isCaseSensitive: true))).ToList();
+
+				this.UnimplementedConstructors = missingConstructors;
+
+				this.UnimplementedDefaultConstructor = baseTypeConstructors.FirstOrDefault(c => c.Parameters.Length == 0);
+				if (this.UnimplementedDefaultConstructor != null)
+				{
+					if (classConstructors.Any(c => c.Parameters.Length == 0 && !c.IsImplicitlyDeclared))
+					{
+						this.UnimplementedDefaultConstructor = null;
+					}
+				}
+
+				return this.UnimplementedConstructors.Count > 0;
+			}
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateDefaultConstructors/CSharpGenerateDefaultConstructorsService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateDefaultConstructors/CSharpGenerateDefaultConstructorsService.cs
new file mode 100644
index 0000000000..39e6775830
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateDefaultConstructors/CSharpGenerateDefaultConstructorsService.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateDefaultConstructors
+{
+	class CSharpGenerateDefaultConstructorsService : AbstractGenerateDefaultConstructorsService<CSharpGenerateDefaultConstructorsService>
+	{
+		protected override bool TryInitializeState(
+			SemanticDocument document, TextSpan textSpan, CancellationToken cancellationToken,
+			out SyntaxNode baseTypeNode, out INamedTypeSymbol classType)
+		{
+			if (!cancellationToken.IsCancellationRequested)
+			{
+				var node = document.Root.FindToken(textSpan.Start).GetAncestor<TypeSyntax>();
+				if (node != null)
+				{
+					if (node.Parent is BaseTypeSyntax && node.Parent.IsParentKind(SyntaxKind.BaseList))
+					{
+						var baseList = (BaseListSyntax)node.Parent.Parent;
+						if (baseList.Types.Count > 0 &&
+							baseList.Types[0].Type == node &&
+							baseList.IsParentKind(SyntaxKind.ClassDeclaration))
+						{
+							var semanticModel = document.SemanticModel;
+							classType = semanticModel.GetDeclaredSymbol(baseList.Parent, cancellationToken) as INamedTypeSymbol;
+							baseTypeNode = node;
+							return classType != null;
+						}
+					}
+				}
+			}
+
+			baseTypeNode = null;
+			classType = null;
+			return false;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateDefaultConstructors/GenerateDefaultConstructorsResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateDefaultConstructors/GenerateDefaultConstructorsResult.cs
new file mode 100644
index 0000000000..7d4e474df1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateDefaultConstructors/GenerateDefaultConstructorsResult.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using RefactoringEssentials;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateDefaultConstructors
+{
+	class GenerateDefaultConstructorsResult : AbstractCodeRefactoringResult
+	{
+		public static readonly GenerateDefaultConstructorsResult Failure = new GenerateDefaultConstructorsResult(null);
+
+		internal GenerateDefaultConstructorsResult(CodeRefactoring codeRefactoring)
+			: base(codeRefactoring)
+		{
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateEnumMember/AbstractGenerateEnumMemberService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateEnumMember/AbstractGenerateEnumMemberService.cs
new file mode 100644
index 0000000000..de1dbd97c7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateEnumMember/AbstractGenerateEnumMemberService.cs
@@ -0,0 +1,238 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateEnumMember
+{
+	abstract class AbstractGenerateEnumMemberService<TService, TSimpleNameSyntax, TExpressionSyntax> :
+	AbstractGenerateMemberService<TSimpleNameSyntax, TExpressionSyntax>
+		where TService : AbstractGenerateEnumMemberService<TService, TSimpleNameSyntax, TExpressionSyntax>
+		where TSimpleNameSyntax : TExpressionSyntax
+		where TExpressionSyntax : SyntaxNode
+	{
+		protected AbstractGenerateEnumMemberService()
+		{
+		}
+
+		protected abstract bool IsIdentifierNameGeneration(SyntaxNode node);
+		protected abstract bool TryInitializeIdentifierNameState(SemanticDocument document, TSimpleNameSyntax identifierName, CancellationToken cancellationToken, out SyntaxToken identifierToken, out TExpressionSyntax simpleNameOrMemberAccessExpression);
+
+		public async Task<IEnumerable<CodeAction>> GenerateEnumMemberAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var semanticDocument = await SemanticDocument.CreateAsync(document, cancellationToken).ConfigureAwait(false);
+			var state = await State.GenerateAsync((TService)this, semanticDocument, node, cancellationToken).ConfigureAwait(false);
+			if (state == null)
+			{
+				return SpecializedCollections.EmptyEnumerable<CodeAction>();
+			}
+
+			return GetActions(document, state);
+		}
+
+		private IEnumerable<CodeAction> GetActions(Document document, State state)
+		{
+			yield return new GenerateEnumMemberCodeAction((TService)this, document, state);
+		}
+
+		private partial class GenerateEnumMemberCodeAction : CodeAction
+		{
+			private readonly Document _document;
+			private readonly State _state;
+
+			public GenerateEnumMemberCodeAction(
+				TService service,
+				Document document,
+				State state)
+			{
+				_document = document;
+				_state = state;
+			}
+
+			protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+			{
+
+				var value = _state.TypeToGenerateIn.LastEnumValueHasInitializer()
+					? EnumValueUtilities.GetNextEnumValue(_state.TypeToGenerateIn, cancellationToken)
+					: null;
+
+				var result = await new CSharpCodeGenerationService (_document.Project.Solution.Workspace).AddFieldAsync(
+					_document.Project.Solution,
+					_state.TypeToGenerateIn,
+					CodeGenerationSymbolFactory.CreateFieldSymbol(
+						attributes: null,
+						accessibility: Accessibility.Public,
+						modifiers: default(DeclarationModifiers),
+						type: _state.TypeToGenerateIn,
+						name: _state.IdentifierToken.ValueText,
+						hasConstantValue: value != null,
+						constantValue: value),
+					new CodeGenerationOptions(contextLocation: _state.IdentifierToken.GetLocation(), generateDefaultAccessibility: false),
+					cancellationToken)
+					.ConfigureAwait(false);
+
+				return result;
+			}
+
+			public override string Title
+			{
+				get
+				{
+					var text = Resources.GenerateEnumMemberIn;
+
+					return string.Format(
+						text,
+						_state.IdentifierToken.ValueText,
+						_state.TypeToGenerateIn.Name);
+				}
+			}
+		}
+
+
+		private partial class State
+		{
+			// public TypeDeclarationSyntax ContainingTypeDeclaration { get; private set; }
+			public INamedTypeSymbol TypeToGenerateIn { get; private set; }
+
+			// Just the name of the method.  i.e. "Foo" in "Foo" or "X.Foo"
+			public SyntaxToken IdentifierToken { get; private set; }
+			public TSimpleNameSyntax SimpleName { get; private set; }
+			public TExpressionSyntax SimpleNameOrMemberAccessExpression { get; private set; }
+
+			public static async Task<State> GenerateAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				var state = new State();
+				if (!await state.TryInitializeAsync(service, document, node, cancellationToken).ConfigureAwait(false))
+				{
+					return null;
+				}
+
+				return state;
+			}
+
+			private async Task<bool> TryInitializeAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				if (service.IsIdentifierNameGeneration(node))
+				{
+					if (!TryInitializeIdentifierName(service, document, (TSimpleNameSyntax)node, cancellationToken))
+					{
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+
+				// Ok.  It either didn't bind to any symbols, or it bound to a symbol but with
+				// errors.  In the former case we definitely want to offer to generate a field.  In
+				// the latter case, we want to generate a field *unless* there's an existing member
+				// with the same name.  Note: it's ok if there's an existing field with the same
+				// name.
+				var existingMembers = this.TypeToGenerateIn.GetMembers(this.IdentifierToken.ValueText);
+				if (existingMembers.Any())
+				{
+					// TODO: Code coverage There was an existing member that the new member would
+					// clash with.  
+					return false;
+				}
+
+				cancellationToken.ThrowIfCancellationRequested();
+				this.TypeToGenerateIn = await SymbolFinder.FindSourceDefinitionAsync(this.TypeToGenerateIn, document.Project.Solution, cancellationToken).ConfigureAwait(false) as INamedTypeSymbol;
+				if (!service.ValidateTypeToGenerateIn(
+					document.Project.Solution, this.TypeToGenerateIn, true, EnumType, cancellationToken))
+				{
+					return false;
+				}
+
+				return CodeGenerator.CanAdd(document.Project.Solution, this.TypeToGenerateIn, cancellationToken);
+			}
+
+			private bool TryInitializeIdentifierName(
+				TService service,
+				SemanticDocument document,
+				TSimpleNameSyntax identifierName,
+				CancellationToken cancellationToken)
+			{
+				this.SimpleName = identifierName;
+
+				SyntaxToken identifierToken;
+				TExpressionSyntax simpleNameOrMemberAccessExpression;
+				if (!service.TryInitializeIdentifierNameState(document, identifierName, cancellationToken,
+					out identifierToken, out simpleNameOrMemberAccessExpression))
+				{
+					return false;
+				}
+
+				this.IdentifierToken = identifierToken;
+				this.SimpleNameOrMemberAccessExpression = simpleNameOrMemberAccessExpression;
+
+				var semanticModel = document.SemanticModel;
+				if ((simpleNameOrMemberAccessExpression as ExpressionSyntax).IsWrittenTo() ||
+					simpleNameOrMemberAccessExpression.IsInNamespaceOrTypeContext())
+				{
+					return false;
+				}
+
+				// Now, try to bind the invocation and see if it succeeds or not.  if it succeeds and
+				// binds uniquely, then we don't need to offer this quick fix.
+				cancellationToken.ThrowIfCancellationRequested();
+				var containingType = semanticModel.GetEnclosingNamedType(identifierToken.SpanStart, cancellationToken);
+				if (containingType == null)
+				{
+					return false;
+				}
+
+				var semanticInfo = semanticModel.GetSymbolInfo(this.SimpleNameOrMemberAccessExpression, cancellationToken);
+				if (cancellationToken.IsCancellationRequested)
+				{
+					return false;
+				}
+
+				if (semanticInfo.Symbol != null)
+				{
+					return false;
+				}
+
+				// Either we found no matches, or this was ambiguous. Either way, we might be able
+				// to generate a method here.  Determine where the user wants to generate the method
+				// into, and if it's valid then proceed.
+				INamedTypeSymbol typeToGenerateIn;
+				bool isStatic;
+				if (!service.TryDetermineTypeToGenerateIn(
+					document, containingType, simpleNameOrMemberAccessExpression, cancellationToken,
+					out typeToGenerateIn, out isStatic))
+				{
+					return false;
+				}
+
+				if (!isStatic)
+				{
+					return false;
+				}
+
+				this.TypeToGenerateIn = typeToGenerateIn;
+				return true;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateEnumMember/CSharpGenerateEnumMemberService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateEnumMember/CSharpGenerateEnumMemberService.cs
new file mode 100644
index 0000000000..61b2b19cf3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateEnumMember/CSharpGenerateEnumMemberService.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateEnumMember
+{
+	partial class CSharpGenerateEnumMemberService :
+	AbstractGenerateEnumMemberService<CSharpGenerateEnumMemberService, SimpleNameSyntax, ExpressionSyntax>
+	{
+		protected override bool IsIdentifierNameGeneration(SyntaxNode node)
+		{
+			return node is IdentifierNameSyntax;
+		}
+
+		protected override bool TryInitializeIdentifierNameState(
+			SemanticDocument document, SimpleNameSyntax identifierName, CancellationToken cancellationToken,
+			out SyntaxToken identifierToken, out ExpressionSyntax simpleNameOrMemberAccessExpression)
+		{
+			identifierToken = identifierName.Identifier;
+			if (identifierToken.ValueText != string.Empty &&
+				!identifierName.IsVar)
+			{
+				var memberAccess = identifierName.Parent as MemberAccessExpressionSyntax;
+				simpleNameOrMemberAccessExpression = memberAccess != null && memberAccess.Name == identifierName
+					? (ExpressionSyntax)memberAccess
+					: identifierName;
+
+				// If we're being invoked, then don't offer this, offer generate method instead.
+				// Note: we could offer to generate a field with a delegate type.  However, that's
+				// very esoteric and probably not what most users want.
+				if (simpleNameOrMemberAccessExpression.IsParentKind(SyntaxKind.InvocationExpression) ||
+					simpleNameOrMemberAccessExpression.IsParentKind(SyntaxKind.ObjectCreationExpression) ||
+					simpleNameOrMemberAccessExpression.IsParentKind(SyntaxKind.GotoStatement) ||
+					simpleNameOrMemberAccessExpression.IsParentKind(SyntaxKind.AliasQualifiedName))
+				{
+					return false;
+				}
+
+				return true;
+			}
+
+			identifierToken = default(SyntaxToken);
+			simpleNameOrMemberAccessExpression = null;
+			return false;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/AbstractGenerateConversionService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/AbstractGenerateConversionService.cs
new file mode 100644
index 0000000000..85bb3d5ddb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/AbstractGenerateConversionService.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember
+{
+	abstract partial class AbstractGenerateConversionService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax> :
+	AbstractGenerateParameterizedMemberService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax>
+		where TService : AbstractGenerateConversionService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax>
+		where TSimpleNameSyntax : TExpressionSyntax
+		where TExpressionSyntax : SyntaxNode
+		where TInvocationExpressionSyntax : TExpressionSyntax
+	{
+		protected abstract bool IsImplicitConversionGeneration(SyntaxNode node);
+		protected abstract bool IsExplicitConversionGeneration(SyntaxNode node);
+		protected abstract bool TryInitializeImplicitConversionState(SemanticDocument document, SyntaxNode expression, ISet<TypeKind> classInterfaceModuleStructTypes, CancellationToken cancellationToken, out SyntaxToken identifierToken, out IMethodSymbol methodSymbol, out INamedTypeSymbol typeToGenerateIn);
+		protected abstract bool TryInitializeExplicitConversionState(SemanticDocument document, SyntaxNode expression, ISet<TypeKind> classInterfaceModuleStructTypes, CancellationToken cancellationToken, out SyntaxToken identifierToken, out IMethodSymbol methodSymbol, out INamedTypeSymbol typeToGenerateIn);
+
+		public async Task<IEnumerable<CodeAction>> GenerateConversionAsync(
+			Document document,
+			SyntaxNode node,
+			CancellationToken cancellationToken)
+		{
+			var semanticDocument = await SemanticDocument.CreateAsync(document, cancellationToken).ConfigureAwait(false);
+			var state = await State.GenerateConversionStateAsync((TService)this, semanticDocument, node, cancellationToken).ConfigureAwait(false);
+			if (state == null)
+			{
+				return SpecializedCollections.EmptyEnumerable<CodeAction>();
+			}
+
+			return GetActions(document, state, cancellationToken);
+		}
+
+		protected new class State : AbstractGenerateParameterizedMemberService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax>.State
+		{
+			public static async Task<State> GenerateConversionStateAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode interfaceNode,
+				CancellationToken cancellationToken)
+			{
+				var state = new State();
+				if (!await state.TryInitializeConversionAsync(service, document, interfaceNode, cancellationToken).ConfigureAwait(false))
+				{
+					return null;
+				}
+
+				return state;
+			}
+
+			private Task<bool> TryInitializeConversionAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				if (service.IsImplicitConversionGeneration(node))
+				{
+					if (!TryInitializeImplicitConversion(service, document, node, cancellationToken))
+					{
+						return Task.FromResult (false);
+					}
+				}
+				else if (service.IsExplicitConversionGeneration(node))
+				{
+					if (!TryInitializeExplicitConversion(service, document, node, cancellationToken))
+					{
+						return Task.FromResult (false);
+					}
+				}
+
+				return TryFinishInitializingState(service, document, cancellationToken);
+			}
+
+			private bool TryInitializeExplicitConversion(TService service, SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken)
+			{
+				MethodKind = MethodKind.Conversion;
+				SyntaxToken identifierToken;
+				IMethodSymbol methodSymbol;
+				INamedTypeSymbol typeToGenerateIn;
+				if (!service.TryInitializeExplicitConversionState(
+					document, node, ClassInterfaceModuleStructTypes, cancellationToken,
+					out identifierToken, out methodSymbol, out typeToGenerateIn))
+				{
+					return false;
+				}
+
+				this.ContainingType = document.SemanticModel.GetEnclosingNamedType(node.SpanStart, cancellationToken);
+				if (ContainingType == null)
+				{
+					return false;
+				}
+
+				this.IdentifierToken = identifierToken;
+				this.TypeToGenerateIn = typeToGenerateIn;
+				this.SignatureInfo = new MethodSignatureInfo(document, this, methodSymbol);
+				this.location = node.GetLocation();
+				this.MethodGenerationKind = MethodGenerationKind.ExplicitConversion;
+				return true;
+			}
+
+			private bool TryInitializeImplicitConversion(TService service, SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken)
+			{
+				MethodKind = MethodKind.Conversion;
+				SyntaxToken identifierToken;
+				IMethodSymbol methodSymbol;
+				INamedTypeSymbol typeToGenerateIn;
+				if (!service.TryInitializeImplicitConversionState(
+					document, node, ClassInterfaceModuleStructTypes, cancellationToken,
+					out identifierToken, out methodSymbol, out typeToGenerateIn))
+				{
+					return false;
+				}
+
+				this.ContainingType = document.SemanticModel.GetEnclosingNamedType(node.SpanStart, cancellationToken);
+				if (ContainingType == null)
+				{
+					return false;
+				}
+
+				this.IdentifierToken = identifierToken;
+				this.TypeToGenerateIn = typeToGenerateIn;
+				this.SignatureInfo = new MethodSignatureInfo(document, this, methodSymbol);
+				this.MethodGenerationKind = MethodGenerationKind.ImplicitConversion;
+				return true;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/AbstractGenerateMethodService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/AbstractGenerateMethodService.cs
new file mode 100644
index 0000000000..b3d945e969
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/AbstractGenerateMethodService.cs
@@ -0,0 +1,267 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember
+{
+	abstract partial class AbstractGenerateMethodService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax> :
+	AbstractGenerateParameterizedMemberService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax>
+		where TService : AbstractGenerateMethodService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax>
+		where TSimpleNameSyntax : TExpressionSyntax
+		where TExpressionSyntax : SyntaxNode
+		where TInvocationExpressionSyntax : TExpressionSyntax
+	{
+		protected abstract bool IsSimpleNameGeneration(SyntaxNode node);
+		protected abstract bool IsExplicitInterfaceGeneration(SyntaxNode node);
+		protected abstract bool TryInitializeExplicitInterfaceState(SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken, out SyntaxToken identifierToken, out IMethodSymbol methodSymbol, out INamedTypeSymbol typeToGenerateIn);
+		protected abstract bool TryInitializeSimpleNameState(SemanticDocument document, TSimpleNameSyntax simpleName, CancellationToken cancellationToken, out SyntaxToken identifierToken, out TExpressionSyntax simpleNameOrMemberAccessExpression, out TInvocationExpressionSyntax invocationExpressionOpt, out bool isInConditionalExpression);
+		protected abstract ITypeSymbol CanGenerateMethodForSimpleNameOrMemberAccessExpression(SemanticModel semanticModel, TExpressionSyntax expresion, CancellationToken cancellationToken);
+
+		public async Task<IEnumerable<CodeAction>> GenerateMethodAsync(
+			Document document,
+			SyntaxNode node,
+			CancellationToken cancellationToken)
+		{
+			var semanticDocument = await SemanticDocument.CreateAsync(document, cancellationToken).ConfigureAwait(false);
+			var state = await State.GenerateMethodStateAsync((TService)this, semanticDocument, node, cancellationToken).ConfigureAwait(false);
+			if (state == null)
+			{
+				return SpecializedCollections.EmptyEnumerable<CodeAction>();
+			}
+
+			return GetActions(document, state, cancellationToken);
+		}
+
+		internal protected new class State : AbstractGenerateParameterizedMemberService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax>.State
+		{
+			public static async Task<State> GenerateMethodStateAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode interfaceNode,
+				CancellationToken cancellationToken)
+			{
+				var state = new State();
+				if (!await state.TryInitializeMethodAsync(service, document, interfaceNode, cancellationToken).ConfigureAwait(false))
+				{
+					return null;
+				}
+
+				return state;
+			}
+
+			private Task<bool> TryInitializeMethodAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				// Cases that we deal with currently:
+				//
+				// 1) expr.Foo
+				// 2) expr->Foo
+				// 3) Foo
+				// 4) expr.Foo()
+				// 5) expr->Foo()
+				// 6) Foo()
+				// 7) ReturnType Explicit.Interface.Foo()
+				//
+				// In the first 3 invocationExpressionOpt will be null and we'll have to infer a
+				// delegate type in order to figure out the right method signature to generate. In
+				// the next 3 invocationExpressionOpt will be non null and will be used to figure
+				// out the types/name of the parameters to generate. In the last one, we're going to
+				// generate into an interface.
+				if (service.IsExplicitInterfaceGeneration(node))
+				{
+					if (!TryInitializeExplicitInterface(service, document, node, cancellationToken))
+					{
+						return Task.FromResult (false);
+					}
+				}
+				else if (service.IsSimpleNameGeneration(node))
+				{
+					if (!TryInitializeSimpleName(service, document, (TSimpleNameSyntax)node, cancellationToken))
+					{
+						return Task.FromResult (false);
+					}
+				}
+
+				return TryFinishInitializingState(service, document, cancellationToken);
+			}
+
+			private bool TryInitializeExplicitInterface(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode methodDeclaration,
+				CancellationToken cancellationToken)
+			{
+				MethodKind = MethodKind.Ordinary;
+				SyntaxToken identifierToken;
+				IMethodSymbol methodSymbol;
+				INamedTypeSymbol typeToGenerateIn;
+				if (!service.TryInitializeExplicitInterfaceState(
+					document, methodDeclaration, cancellationToken,
+					out identifierToken, out methodSymbol, out typeToGenerateIn))
+				{
+					return false;
+				}
+
+				if (methodSymbol.ExplicitInterfaceImplementations.Any())
+				{
+					return false;
+				}
+
+				this.IdentifierToken = identifierToken;
+				this.TypeToGenerateIn = typeToGenerateIn;
+
+				cancellationToken.ThrowIfCancellationRequested();
+				var semanticModel = document.SemanticModel;
+				this.ContainingType = semanticModel.GetEnclosingNamedType(methodDeclaration.SpanStart, cancellationToken);
+				if (this.ContainingType == null)
+				{
+					return false;
+				}
+
+				if (!this.ContainingType.Interfaces.Contains(this.TypeToGenerateIn))
+				{
+					return false;
+				}
+
+				this.SignatureInfo = new MethodSignatureInfo(document, this, methodSymbol);
+				return true;
+			}
+
+			private bool TryInitializeSimpleName(
+				TService service,
+				SemanticDocument document,
+				TSimpleNameSyntax simpleName,
+				CancellationToken cancellationToken)
+			{
+				MethodKind = MethodKind.Ordinary;
+				this.SimpleNameOpt = simpleName;
+
+				SyntaxToken identifierToken;
+				TExpressionSyntax simpleNameOrMemberAccessExpression;
+				TInvocationExpressionSyntax invocationExpressionOpt;
+				bool isInConditionalExpression;
+				if (!service.TryInitializeSimpleNameState(
+					document, simpleName, cancellationToken,
+					out identifierToken, out simpleNameOrMemberAccessExpression, out invocationExpressionOpt, out isInConditionalExpression))
+				{
+					return false;
+				}
+
+				this.IdentifierToken = identifierToken;
+				this.SimpleNameOrMemberAccessExpression = simpleNameOrMemberAccessExpression;
+				this.InvocationExpressionOpt = invocationExpressionOpt;
+				this.IsInConditionalAccessExpression = isInConditionalExpression;
+
+				if (string.IsNullOrWhiteSpace(this.IdentifierToken.ValueText))
+				{
+					return false;
+				}
+
+				// If we're not in a type, don't even bother.  NOTE(cyrusn): We'll have to rethink this
+				// for C# Script.
+				cancellationToken.ThrowIfCancellationRequested();
+				var semanticModel = document.SemanticModel;
+				this.ContainingType = semanticModel.GetEnclosingNamedType(this.SimpleNameOpt.SpanStart, cancellationToken);
+				if (this.ContainingType == null)
+				{
+					return false;
+				}
+
+				if (this.InvocationExpressionOpt != null)
+				{
+					this.SignatureInfo = service.CreateInvocationMethodInfo(document, this);
+				}
+				else
+				{
+					var delegateType = TypeGuessing.typeInferenceService.InferDelegateType(semanticModel, this.SimpleNameOrMemberAccessExpression, cancellationToken);
+					if (delegateType != null && delegateType.DelegateInvokeMethod != null)
+					{
+						this.SignatureInfo = new MethodSignatureInfo(document, this, delegateType.DelegateInvokeMethod);
+					}
+					else
+					{
+						// We don't have and invocation expression or a delegate, but we may have a special expression without parenthesis.  Lets see
+						// if the type inference service can directly infer the type for our expression.
+						var expressionType = service.CanGenerateMethodForSimpleNameOrMemberAccessExpression(semanticModel, this.SimpleNameOrMemberAccessExpression, cancellationToken);
+						if (expressionType == null)
+						{
+							return false;
+						}
+
+						this.SignatureInfo = new MethodSignatureInfo(document, this, CreateMethodSymbolWithReturnType(expressionType));
+					}
+				}
+
+				// Now, try to bind the invocation and see if it succeeds or not.  if it succeeds and
+				// binds uniquely, then we don't need to offer this quick fix.
+				cancellationToken.ThrowIfCancellationRequested();
+
+				// If the name bound with errors, then this is a candidate for generate method.
+				var semanticInfo = semanticModel.GetSymbolInfo(this.SimpleNameOrMemberAccessExpression, cancellationToken);
+				if (semanticInfo.GetAllSymbols().Any(s => s.Kind == SymbolKind.Local || s.Kind == SymbolKind.Parameter) &&
+					!service.AreSpecialOptionsActive(semanticModel))
+				{
+					// if the name bound to something in scope then we don't want to generate the
+					// method because it will be shadowed by what's in scope. Unless we are in a 
+					// special state such as Option Strict On where we want to generate fixes even
+					// if we shadow types.
+					return false;
+				}
+
+				// Check if the symbol is on the list of valid symbols for this language. 
+				cancellationToken.ThrowIfCancellationRequested();
+				if (semanticInfo.Symbol != null && !service.IsValidSymbol(semanticInfo.Symbol, semanticModel))
+				{
+					return false;
+				}
+
+				// Either we found no matches, or this was ambiguous. Either way, we might be able
+				// to generate a method here.  Determine where the user wants to generate the method
+				// into, and if it's valid then proceed.
+				cancellationToken.ThrowIfCancellationRequested();
+				INamedTypeSymbol typeToGenerateIn;
+				bool isStatic;
+				if (!service.TryDetermineTypeToGenerateIn(
+					document, this.ContainingType, this.SimpleNameOrMemberAccessExpression, cancellationToken,
+					out typeToGenerateIn, out isStatic))
+				{
+					return false;
+				}
+
+				var expressionSyntax = (this.InvocationExpressionOpt ?? this.SimpleNameOrMemberAccessExpression) as ExpressionSyntax;
+				this.IsWrittenTo = expressionSyntax.IsWrittenTo();
+				this.TypeToGenerateIn = typeToGenerateIn;
+				this.IsStatic = isStatic;
+				this.MethodGenerationKind = MethodGenerationKind.Member;
+				return true;
+			}
+
+			private static IMethodSymbol CreateMethodSymbolWithReturnType(ITypeSymbol expressionType)
+			{
+				return CodeGenerationSymbolFactory.CreateMethodSymbol(
+					attributes: SpecializedCollections.EmptyList<AttributeData>(),
+					accessibility: default(Accessibility),
+					modifiers: default(DeclarationModifiers),
+					returnType: expressionType,
+					explicitInterfaceSymbol: null,
+					name: null,
+					typeParameters: SpecializedCollections.EmptyList<ITypeParameterSymbol>(),
+					parameters: SpecializedCollections.EmptyList<IParameterSymbol>());
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/AbstractGenerateParameterizedMemberService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/AbstractGenerateParameterizedMemberService.cs
new file mode 100644
index 0000000000..02b8984131
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/AbstractGenerateParameterizedMemberService.cs
@@ -0,0 +1,595 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using System;
+using System.Threading.Tasks;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using Microsoft.CodeAnalysis.Editing;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.FindSymbols;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember
+{
+	abstract partial class AbstractGenerateParameterizedMemberService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax> :
+	AbstractGenerateMemberService<TSimpleNameSyntax, TExpressionSyntax>
+		where TService : AbstractGenerateParameterizedMemberService<TService, TSimpleNameSyntax, TExpressionSyntax, TInvocationExpressionSyntax>
+		where TSimpleNameSyntax : TExpressionSyntax
+		where TExpressionSyntax : SyntaxNode
+		where TInvocationExpressionSyntax : TExpressionSyntax
+	{
+		protected AbstractGenerateParameterizedMemberService()
+		{
+		}
+
+		protected abstract AbstractInvocationInfo CreateInvocationMethodInfo(SemanticDocument document, State abstractState);
+
+		protected abstract bool IsValidSymbol(ISymbol symbol, SemanticModel semanticModel);
+		protected abstract bool AreSpecialOptionsActive(SemanticModel semanticModel);
+
+		protected virtual bool ContainingTypesOrSelfHasUnsafeKeyword(INamedTypeSymbol containingType)
+		{
+			return false;
+		}
+
+		protected virtual string GetImplicitConversionDisplayText(State state)
+		{
+			return string.Empty;
+		}
+
+		protected virtual string GetExplicitConversionDisplayText(State state)
+		{
+			return string.Empty;
+		}
+
+		protected IEnumerable<CodeAction> GetActions(Document document, State state, CancellationToken cancellationToken)
+		{
+			yield return new GenerateParameterizedMemberCodeAction((TService)this, document, state, isAbstract: false, generateProperty: false);
+
+			// If we're trying to generate an instance method into an abstract class (but not a
+			// static class or an interface), then offer to generate it abstractly.
+			var canGenerateAbstractly = state.TypeToGenerateIn.IsAbstract &&
+				!state.TypeToGenerateIn.IsStatic &&
+				state.TypeToGenerateIn.TypeKind != TypeKind.Interface &&
+				!state.IsStatic;
+
+			if (canGenerateAbstractly)
+			{
+				yield return new GenerateParameterizedMemberCodeAction((TService)this, document, state, isAbstract: true, generateProperty: false);
+			}
+
+			if (true/*semanticFacts.SupportsParameterizedProperties*/ &&
+				state.InvocationExpressionOpt != null)
+			{
+				var typeParameters = state.SignatureInfo.DetermineTypeParameters(cancellationToken);
+				var returnType = state.SignatureInfo.DetermineReturnType(cancellationToken);
+
+				if (typeParameters.Count == 0 && returnType.SpecialType != SpecialType.System_Void)
+				{
+					yield return new GenerateParameterizedMemberCodeAction((TService)this, document, state, isAbstract: false, generateProperty: true);
+
+					if (canGenerateAbstractly)
+					{
+						yield return new GenerateParameterizedMemberCodeAction((TService)this, document, state, isAbstract: true, generateProperty: true);
+					}
+				}
+			}
+		}
+		internal protected abstract class AbstractInvocationInfo : SignatureInfo
+		{
+			protected abstract bool IsIdentifierName();
+
+			protected abstract IList<ITypeParameterSymbol> GetCapturedTypeParameters(CancellationToken cancellationToken);
+			protected abstract IList<ITypeParameterSymbol> GenerateTypeParameters(CancellationToken cancellationToken);
+
+			protected AbstractInvocationInfo(SemanticDocument document, State state)
+				: base(document, state)
+			{
+			}
+
+			public override IList<ITypeParameterSymbol> DetermineTypeParameters(CancellationToken cancellationToken)
+			{
+				var typeParameters = DetermineTypeParametersWorker(cancellationToken);
+				return typeParameters.Select(tp => MassageTypeParameter(tp, cancellationToken)).ToList();
+			}
+
+			private IList<ITypeParameterSymbol> DetermineTypeParametersWorker(
+				CancellationToken cancellationToken)
+			{
+				if (IsIdentifierName())
+				{
+					// If the user wrote something like Foo(x) then we still might want to generate
+					// a generic method if the expression 'x' captured any method type variables.
+					var capturedTypeParameters = GetCapturedTypeParameters(cancellationToken);
+					var availableTypeParameters = this.State.TypeToGenerateIn.GetAllTypeParameters();
+					var result = capturedTypeParameters.Except(availableTypeParameters).ToList();
+					return result;
+				}
+				else
+				{
+					return GenerateTypeParameters(cancellationToken);
+				}
+			}
+
+			private ITypeParameterSymbol MassageTypeParameter(
+				ITypeParameterSymbol typeParameter,
+				CancellationToken cancellationToken)
+			{
+				var constraints = typeParameter.ConstraintTypes.Where(ts => !ts.IsUnexpressableTypeParameterConstraint()).ToList();
+				var classTypes = constraints.Where(ts => ts.TypeKind == TypeKind.Class).ToList();
+				var nonClassTypes = constraints.Where(ts => ts.TypeKind != TypeKind.Class).ToList();
+
+				classTypes = MergeClassTypes(classTypes, cancellationToken);
+				constraints = classTypes.Concat(nonClassTypes).ToList();
+				if (constraints.SequenceEqual(typeParameter.ConstraintTypes))
+				{
+					return typeParameter;
+				}
+
+				return CodeGenerationSymbolFactory.CreateTypeParameter(
+					attributes: null,
+					varianceKind: typeParameter.Variance,
+					name: typeParameter.Name,
+					constraintTypes: ImmutableArray.CreateRange<ITypeSymbol>(constraints),
+					hasConstructorConstraint: typeParameter.HasConstructorConstraint,
+					hasReferenceConstraint: typeParameter.HasReferenceTypeConstraint,
+					hasValueConstraint: typeParameter.HasValueTypeConstraint);
+			}
+
+			private List<ITypeSymbol> MergeClassTypes(List<ITypeSymbol> classTypes, CancellationToken cancellationToken)
+			{
+				var compilation = this.Document.SemanticModel.Compilation;
+				for (int i = classTypes.Count - 1; i >= 0; i--)
+				{
+					// For example, 'Attribute'.
+					var type1 = classTypes[i];
+
+					for (int j = 0; j < classTypes.Count; j++)
+					{
+						if (j != i)
+						{
+							// For example 'FooAttribute'.
+							var type2 = classTypes[j];
+
+							if (IsImplicitReferenceConversion(compilation, type2, type1))
+							{
+								// If there's an implicit reference conversion (i.e. from
+								// FooAttribute to Attribute), then we don't need Attribute as it's
+								// implied by the second attribute;
+								classTypes.RemoveAt(i);
+								break;
+							}
+						}
+					}
+				}
+
+				return classTypes;
+			}
+
+			protected abstract bool IsImplicitReferenceConversion(Compilation compilation, ITypeSymbol sourceType, ITypeSymbol targetType);
+		}
+		private partial class GenerateParameterizedMemberCodeAction : CodeAction
+		{
+			private readonly TService _service;
+			private readonly Document _document;
+			private readonly State _state;
+			private readonly bool _isAbstract;
+			private readonly bool _generateProperty;
+
+			public GenerateParameterizedMemberCodeAction(
+				TService service,
+				Document document,
+				State state,
+				bool isAbstract,
+				bool generateProperty)
+			{
+				_service = service;
+				_document = document;
+				_state = state;
+				_isAbstract = isAbstract;
+				_generateProperty = generateProperty;
+			}
+
+			private string GetDisplayText(
+				State state,
+				bool isAbstract,
+				bool generateProperty)
+			{
+				switch (state.MethodGenerationKind)
+				{
+				case MethodGenerationKind.Member:
+					var text = generateProperty ?
+						isAbstract ? Resources.GenerateAbstractProperty : Resources.GeneratePropertyIn :
+						isAbstract ? Resources.GenerateAbstractMethod : Resources.GenerateMethodIn;
+
+					var name = state.IdentifierToken.ValueText;
+					var destination = state.TypeToGenerateIn.Name;
+					return string.Format(text, name, destination);
+				case MethodGenerationKind.ImplicitConversion:
+					return _service.GetImplicitConversionDisplayText(_state);
+				case MethodGenerationKind.ExplicitConversion:
+					return _service.GetExplicitConversionDisplayText(_state);
+				default:
+					throw new InvalidOperationException();
+				}
+			}
+
+			protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+			{
+				//var syntaxTree = await _document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+				var syntaxFactory = _document.Project.Solution.Workspace.Services.GetLanguageServices(_state.TypeToGenerateIn.Language).GetService<SyntaxGenerator>();
+
+				if (_generateProperty)
+				{
+					var property = _state.SignatureInfo.GenerateProperty(syntaxFactory, _isAbstract, _state.IsWrittenTo, cancellationToken);
+
+					var result = await CodeGenerator.AddPropertyDeclarationAsync(
+						_document.Project.Solution,
+						_state.TypeToGenerateIn,
+						property,
+						new CodeGenerationOptions(afterThisLocation: _state.IdentifierToken.GetLocation(), generateDefaultAccessibility: false),
+						cancellationToken)
+						.ConfigureAwait(false);
+
+					return await AnnotateInsertionMode(_document.Project.Solution.GetDocument(result.Id), result);
+				}
+				else
+				{
+					var method = _state.SignatureInfo.GenerateMethod(syntaxFactory, _isAbstract, cancellationToken);
+
+					var result = await CodeGenerator.AddMethodDeclarationAsync(
+						_document.Project.Solution,
+						_state.TypeToGenerateIn,
+						method,
+						new CodeGenerationOptions(afterThisLocation: _state.Location, generateDefaultAccessibility: false),
+						cancellationToken)
+						.ConfigureAwait(false);
+
+					return await AnnotateInsertionMode(_document.Project.Solution.GetDocument(result.Id), result);
+				}
+			}
+
+			async Task<Document> AnnotateInsertionMode (Document oldDocument, Document result)
+			{
+				var newRoot = await result.GetSyntaxRootAsync ();
+				var changes = await oldDocument.GetTextChangesAsync (result);
+				foreach (var change in changes) {
+
+					var parent = newRoot.FindNode (change.Span);
+					if (parent == null || !(parent is MethodDeclarationSyntax || parent is PropertyDeclarationSyntax))
+						continue;
+					return result.WithSyntaxRoot (newRoot.ReplaceNode (parent, parent.WithAdditionalAnnotations (TypeSystemService.InsertionModeAnnotation)));
+				}
+				return result;
+			}
+
+			public override string Title
+			{
+				get
+				{
+					return GetDisplayText(_state, _isAbstract, _generateProperty);
+				}
+			}
+		}
+
+		protected class MethodSignatureInfo : SignatureInfo
+		{
+			private readonly IMethodSymbol _methodSymbol;
+
+			public MethodSignatureInfo(
+				SemanticDocument document,
+				State state,
+				IMethodSymbol methodSymbol)
+				: base(document, state)
+			{
+				_methodSymbol = methodSymbol;
+			}
+
+			protected override ITypeSymbol DetermineReturnTypeWorker(CancellationToken cancellationToken)
+			{
+				if (State.IsInConditionalAccessExpression)
+				{
+					return _methodSymbol.ReturnType.RemoveNullableIfPresent();
+				}
+
+				return _methodSymbol.ReturnType;
+			}
+
+			public override IList<ITypeParameterSymbol> DetermineTypeParameters(CancellationToken cancellationToken)
+			{
+				return _methodSymbol.TypeParameters;
+			}
+
+			protected override IList<RefKind> DetermineParameterModifiers(CancellationToken cancellationToken)
+			{
+				return _methodSymbol.Parameters.Select(p => p.RefKind).ToList();
+			}
+
+			protected override IList<bool> DetermineParameterOptionality(CancellationToken cancellationToken)
+			{
+				return _methodSymbol.Parameters.Select(p => p.IsOptional).ToList();
+			}
+
+			protected override IList<ITypeSymbol> DetermineParameterTypes(CancellationToken cancellationToken)
+			{
+				return _methodSymbol.Parameters.Select(p => p.Type).ToList();
+			}
+
+			protected override IList<string> DetermineParameterNames(CancellationToken cancellationToken)
+			{
+				return _methodSymbol.Parameters.Select(p => p.Name).ToList();
+			}
+		}
+
+		internal protected abstract class SignatureInfo
+		{
+			protected readonly SemanticDocument Document;
+			protected readonly State State;
+
+			public SignatureInfo(
+				SemanticDocument document,
+				State state)
+			{
+				this.Document = document;
+				this.State = state;
+			}
+
+			public abstract IList<ITypeParameterSymbol> DetermineTypeParameters(CancellationToken cancellationToken);
+			public ITypeSymbol DetermineReturnType(CancellationToken cancellationToken)
+			{
+				return FixType(DetermineReturnTypeWorker(cancellationToken), cancellationToken);
+			}
+
+			protected abstract ITypeSymbol DetermineReturnTypeWorker(CancellationToken cancellationToken);
+			protected abstract IList<RefKind> DetermineParameterModifiers(CancellationToken cancellationToken);
+			protected abstract IList<ITypeSymbol> DetermineParameterTypes(CancellationToken cancellationToken);
+			protected abstract IList<bool> DetermineParameterOptionality(CancellationToken cancellationToken);
+			protected abstract IList<string> DetermineParameterNames(CancellationToken cancellationToken);
+
+			internal IPropertySymbol GenerateProperty(
+				SyntaxGenerator factory,
+				bool isAbstract, bool includeSetter,
+				CancellationToken cancellationToken)
+			{
+				var accessibility = DetermineAccessibility(isAbstract);
+				var getMethod = CodeGenerationSymbolFactory.CreateAccessorSymbol(
+					attributes: null,
+					accessibility: accessibility,
+					statements: GenerateStatements(factory, isAbstract, cancellationToken));
+
+				var setMethod = includeSetter ? getMethod : null;
+
+				return CodeGenerationSymbolFactory.CreatePropertySymbol(
+					attributes: null,
+					accessibility: accessibility,
+					modifiers: DeclarationModifiers.None.WithIsStatic(State.IsStatic).WithIsAbstract (isAbstract),
+					type: DetermineReturnType(cancellationToken),
+					explicitInterfaceSymbol: null,
+					name: this.State.IdentifierToken.ValueText,
+					parameters: DetermineParameters(cancellationToken),
+					getMethod: getMethod,
+					setMethod: setMethod);
+			}
+
+			public IMethodSymbol GenerateMethod(
+				SyntaxGenerator factory,
+				bool isAbstract,
+				CancellationToken cancellationToken)
+			{
+				var parameters = DetermineParameters(cancellationToken);
+				var returnType = DetermineReturnType(cancellationToken);
+				var isUnsafe = (parameters
+					.Any(p => p.Type.IsUnsafe()) || returnType.IsUnsafe()) &&
+					!State.IsContainedInUnsafeType;
+				var method = CodeGenerationSymbolFactory.CreateMethodSymbol(
+					attributes: null,
+					accessibility: DetermineAccessibility(isAbstract),
+					modifiers: DeclarationModifiers.None.WithIsStatic(State.IsStatic).WithIsAbstract (isAbstract).WithIsUnsafe (isUnsafe),
+					returnType: returnType,
+					explicitInterfaceSymbol: null,
+					name: this.State.IdentifierToken.ValueText,
+					typeParameters: DetermineTypeParameters(cancellationToken),
+					parameters: parameters,
+					statements: GenerateStatements(factory, isAbstract, cancellationToken),
+					handlesExpressions: null,
+					returnTypeAttributes: null,
+					methodKind: State.MethodKind);
+
+				// Ensure no conflicts between type parameter names and parameter names.
+				//var languageServiceProvider = this.Document.Project.Solution.Workspace.Services.GetLanguageServices(this.State.TypeToGenerateIn.Language);
+
+				var equalityComparer = StringComparer.Ordinal;
+				var reservedParameterNames = this.DetermineParameterNames(cancellationToken).ToSet(equalityComparer);
+				var newTypeParameterNames = NameGenerator.EnsureUniqueness(
+					method.TypeParameters.Select(t => t.Name).ToList(), n => !reservedParameterNames.Contains(n));
+
+				return method.RenameTypeParameters(newTypeParameterNames);
+			}
+
+			private ITypeSymbol FixType(
+				ITypeSymbol typeSymbol,
+				CancellationToken cancellationToken)
+			{
+				// A type can't refer to a type parameter that isn't available in the type we're
+				// eventually generating into.
+				var availableMethodTypeParameters = this.DetermineTypeParameters(cancellationToken);
+				var availableTypeParameters = this.State.TypeToGenerateIn.GetAllTypeParameters();
+
+				var compilation = this.Document.SemanticModel.Compilation;
+				var allTypeParameters = availableMethodTypeParameters.Concat(availableTypeParameters);
+
+				return typeSymbol.RemoveAnonymousTypes(compilation)
+					.ReplaceTypeParametersBasedOnTypeConstraints(compilation, allTypeParameters, this.Document.Document.Project.Solution, cancellationToken)
+					.RemoveUnavailableTypeParameters(compilation, allTypeParameters)
+					.RemoveUnnamedErrorTypes(compilation);
+			}
+
+			private IList<SyntaxNode> GenerateStatements(
+				SyntaxGenerator factory,
+				bool isAbstract,
+				CancellationToken cancellationToken)
+			{
+				var throwStatement = CodeGenerationHelpers.GenerateThrowStatement(factory, this.Document, "System.NotImplementedException", cancellationToken);
+
+				return isAbstract || State.TypeToGenerateIn.TypeKind == TypeKind.Interface || throwStatement == null
+					? null
+						: new[] { throwStatement };
+			}
+
+			private IList<IParameterSymbol> DetermineParameters(CancellationToken cancellationToken)
+			{
+				var modifiers = DetermineParameterModifiers(cancellationToken);
+				var types = DetermineParameterTypes(cancellationToken).Select(t => FixType(t, cancellationToken)).ToList();
+				var optionality = DetermineParameterOptionality(cancellationToken);
+				var names = DetermineParameterNames(cancellationToken);
+
+				var result = new List<IParameterSymbol>();
+				for (var i = 0; i < modifiers.Count; i++)
+				{
+					result.Add(CodeGenerationSymbolFactory.CreateParameterSymbol(
+						attributes: null,
+						refKind: modifiers[i],
+						isParams: false,
+						isOptional: optionality[i],
+						type: types[i],
+						name: names[i]));
+				}
+
+				return result;
+			}
+
+			private Accessibility DetermineAccessibility(bool isAbstract)
+			{
+				var containingType = this.State.ContainingType;
+
+				// If we're generating into an interface, then we don't use any modifiers.
+				if (State.TypeToGenerateIn.TypeKind != TypeKind.Interface)
+				{
+					// Otherwise, figure out what accessibility modifier to use and optionally
+					// mark it as static.
+					if (containingType.IsContainedWithin(State.TypeToGenerateIn) && !isAbstract)
+					{
+						return Accessibility.Private;
+					}
+					else if (DerivesFrom(containingType) && State.IsStatic)
+					{
+						// NOTE(cyrusn): We only generate protected in the case of statics.  Consider
+						// the case where we're generating into one of our base types.  i.e.:
+						//
+						// class B : A { void Foo() { A a; a.Foo(); }
+						//
+						// In this case we can *not* mark the method as protected.  'B' can only
+						// access protected members of 'A' through an instance of 'B' (or a subclass
+						// of B).  It can not access protected members through an instance of the
+						// superclass.  In this case we need to make the method public or internal.
+						//
+						// However, this does not apply if the method will be static.  i.e.
+						// 
+						// class B : A { void Foo() { A.Foo(); }
+						//
+						// B can access the protected statics of A, and so we generate 'Foo' as
+						// protected.
+
+						// TODO: Code coverage
+						return Accessibility.Protected;
+					}
+					else if (containingType.ContainingAssembly.IsSameAssemblyOrHasFriendAccessTo(State.TypeToGenerateIn.ContainingAssembly))
+					{
+						return Accessibility.Internal;
+					}
+					else
+					{
+						// TODO: Code coverage
+						return Accessibility.Public;
+					}
+				}
+
+				return Accessibility.NotApplicable;
+			}
+
+			private bool DerivesFrom(INamedTypeSymbol containingType)
+			{
+				return containingType.GetBaseTypes().Select(t => t.OriginalDefinition)
+					.OfType<INamedTypeSymbol>()
+					.Contains(State.TypeToGenerateIn);
+			}
+		}
+
+		internal protected abstract class State
+		{
+			public INamedTypeSymbol ContainingType { get; protected set; }
+			public INamedTypeSymbol TypeToGenerateIn { get; protected set; }
+			public bool IsStatic { get; protected set; }
+			public bool IsContainedInUnsafeType { get; protected set; }
+
+			// Just the name of the method.  i.e. "Foo" in "X.Foo" or "X.Foo()"
+			public SyntaxToken IdentifierToken { get; protected set; }
+			public TSimpleNameSyntax SimpleNameOpt { get; protected set; }
+
+			// The entire expression containing the name, not including the invocation.  i.e. "X.Foo"
+			// in "X.Foo()".
+			public TExpressionSyntax SimpleNameOrMemberAccessExpression { get; protected set; }
+			public TInvocationExpressionSyntax InvocationExpressionOpt { get; protected set; }
+			public bool IsInConditionalAccessExpression { get; protected set; }
+
+			public bool IsWrittenTo { get; protected set; }
+
+			public SignatureInfo SignatureInfo { get; protected set; }
+			public MethodKind MethodKind { get; internal set; }
+			public MethodGenerationKind MethodGenerationKind { get; protected set; }
+			protected Location location = null;
+			public Location Location
+			{
+				get
+				{
+					if (IdentifierToken.SyntaxTree != null)
+					{
+						return IdentifierToken.GetLocation();
+					}
+
+					return location;
+				}
+			}
+
+			protected async Task<bool> TryFinishInitializingState(TService service, SemanticDocument document, CancellationToken cancellationToken)
+			{
+				cancellationToken.ThrowIfCancellationRequested();
+				this.TypeToGenerateIn = await SymbolFinder.FindSourceDefinitionAsync(this.TypeToGenerateIn, document.Project.Solution, cancellationToken).ConfigureAwait(false) as INamedTypeSymbol;
+				if (this.TypeToGenerateIn.IsErrorType())
+				{
+					return false;
+				}
+
+				if (!service.ValidateTypeToGenerateIn(document.Project.Solution, this.TypeToGenerateIn,
+					this.IsStatic, ClassInterfaceModuleStructTypes, cancellationToken))
+				{
+					return false;
+				}
+
+				if (!new CSharpCodeGenerationService(document.Project.Solution.Workspace).CanAddTo(this.TypeToGenerateIn, document.Project.Solution, cancellationToken))
+				{
+					return false;
+				}
+
+				// Ok.  It either didn't bind to any symbols, or it bound to a symbol but with
+				// errors.  In the former case we definitely want to offer to generate a method.  In
+				// the latter case, we want to generate a method *unless* there's an existing method
+				// with the same signature.
+				var existingMethods = this.TypeToGenerateIn.GetMembers(this.IdentifierToken.ValueText)
+					.OfType<IMethodSymbol>();
+
+				var destinationProvider = document.Project.Solution.Workspace.Services.GetLanguageServices(this.TypeToGenerateIn.Language);
+				var syntaxFactory = destinationProvider.GetService<SyntaxGenerator>();
+				this.IsContainedInUnsafeType = service.ContainingTypesOrSelfHasUnsafeKeyword(this.TypeToGenerateIn);
+				var generatedMethod = this.SignatureInfo.GenerateMethod(syntaxFactory, false, cancellationToken);
+				return !existingMethods.Any(m => SignatureComparer.HaveSameSignature(m, generatedMethod, caseSensitive: true, compareParameterName: true, isParameterCaseSensitive: true));
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpCommonGenerationServiceMethods.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpCommonGenerationServiceMethods.cs
new file mode 100644
index 0000000000..1f9a4ae970
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpCommonGenerationServiceMethods.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember
+{
+	internal static class CSharpCommonGenerationServiceMethods
+	{
+		public static bool AreSpecialOptionsActive(SemanticModel semanticModel)
+		{
+			return false;
+		}
+
+		public static bool IsValidSymbol(ISymbol symbol, SemanticModel semanticModel)
+		{
+			return false;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpGenerateConversionService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpGenerateConversionService.cs
new file mode 100644
index 0000000000..ecf4076cea
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpGenerateConversionService.cs
@@ -0,0 +1,233 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember
+{
+	partial class CSharpGenerateConversionService :
+	AbstractGenerateConversionService<CSharpGenerateConversionService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax>
+	{
+		protected override bool IsImplicitConversionGeneration(SyntaxNode node)
+		{
+			return node is ExpressionSyntax &&
+				(node.Parent is AssignmentExpressionSyntax || node.Parent is EqualsValueClauseSyntax) &&
+				!(node is CastExpressionSyntax) &&
+				!(node is MemberAccessExpressionSyntax);
+		}
+
+		protected override bool IsExplicitConversionGeneration(SyntaxNode node)
+		{
+			return node is CastExpressionSyntax;
+		}
+
+		protected override bool ContainingTypesOrSelfHasUnsafeKeyword(INamedTypeSymbol containingType)
+		{
+			return containingType.ContainingTypesOrSelfHasUnsafeKeyword();
+		}
+
+		protected override AbstractInvocationInfo CreateInvocationMethodInfo(SemanticDocument document, AbstractGenerateParameterizedMemberService<CSharpGenerateConversionService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax>.State state)
+		{
+			return new CSharpGenerateParameterizedMemberService<CSharpGenerateConversionService>.InvocationExpressionInfo(document, state);
+		}
+
+		protected override bool AreSpecialOptionsActive(SemanticModel semanticModel)
+		{
+			return CSharpCommonGenerationServiceMethods.AreSpecialOptionsActive(semanticModel);
+		}
+
+		protected override bool IsValidSymbol(ISymbol symbol, SemanticModel semanticModel)
+		{
+			return CSharpCommonGenerationServiceMethods.IsValidSymbol(symbol, semanticModel);
+		}
+
+		protected override bool TryInitializeImplicitConversionState(
+			SemanticDocument document,
+			SyntaxNode expression,
+			ISet<TypeKind> classInterfaceModuleStructTypes,
+			CancellationToken cancellationToken,
+			out SyntaxToken identifierToken,
+			out IMethodSymbol methodSymbol,
+			out INamedTypeSymbol typeToGenerateIn)
+		{
+			if (TryGetConversionMethodAndTypeToGenerateIn(document, expression, classInterfaceModuleStructTypes, cancellationToken, out methodSymbol, out typeToGenerateIn))
+			{
+				identifierToken = SyntaxFactory.Token(
+					default(SyntaxTriviaList),
+					SyntaxKind.ImplicitKeyword,
+					WellKnownMemberNames.ImplicitConversionName,
+					WellKnownMemberNames.ImplicitConversionName,
+					default(SyntaxTriviaList));
+				return true;
+			}
+
+			identifierToken = default(SyntaxToken);
+			methodSymbol = null;
+			typeToGenerateIn = null;
+			return false;
+		}
+
+		protected override bool TryInitializeExplicitConversionState(
+			SemanticDocument document,
+			SyntaxNode expression,
+			ISet<TypeKind> classInterfaceModuleStructTypes,
+			CancellationToken cancellationToken,
+			out SyntaxToken identifierToken,
+			out IMethodSymbol methodSymbol,
+			out INamedTypeSymbol typeToGenerateIn)
+		{
+			if (TryGetConversionMethodAndTypeToGenerateIn(document, expression, classInterfaceModuleStructTypes, cancellationToken, out methodSymbol, out typeToGenerateIn))
+			{
+				identifierToken = SyntaxFactory.Token(
+					default(SyntaxTriviaList),
+					SyntaxKind.ImplicitKeyword,
+					WellKnownMemberNames.ExplicitConversionName,
+					WellKnownMemberNames.ExplicitConversionName,
+					default(SyntaxTriviaList));
+				return true;
+			}
+
+			identifierToken = default(SyntaxToken);
+			methodSymbol = null;
+			typeToGenerateIn = null;
+			return false;
+		}
+
+		private bool TryGetConversionMethodAndTypeToGenerateIn(
+			SemanticDocument document,
+			SyntaxNode expression,
+			ISet<TypeKind> classInterfaceModuleStructTypes,
+			CancellationToken cancellationToken,
+			out IMethodSymbol methodSymbol,
+			out INamedTypeSymbol typeToGenerateIn)
+		{
+			var castExpression = expression as CastExpressionSyntax;
+			if (castExpression != null)
+			{
+				return TryGetExplicitConversionMethodAndTypeToGenerateIn(
+					document,
+					castExpression,
+					classInterfaceModuleStructTypes,
+					cancellationToken,
+					out methodSymbol,
+					out typeToGenerateIn);
+			}
+
+			return TryGetImplicitConversionMethodAndTypeToGenerateIn(
+				document,
+				expression,
+				classInterfaceModuleStructTypes,
+				cancellationToken,
+				out methodSymbol,
+				out typeToGenerateIn);
+		}
+
+		private bool TryGetExplicitConversionMethodAndTypeToGenerateIn(
+			SemanticDocument document,
+			CastExpressionSyntax castExpression,
+			ISet<TypeKind> classInterfaceModuleStructTypes,
+			CancellationToken cancellationToken,
+			out IMethodSymbol methodSymbol,
+			out INamedTypeSymbol typeToGenerateIn)
+		{
+			methodSymbol = null;
+			typeToGenerateIn = document.SemanticModel.GetTypeInfo(castExpression.Type, cancellationToken).Type as INamedTypeSymbol;
+			var parameterSymbol = document.SemanticModel.GetTypeInfo(castExpression.Expression, cancellationToken).Type as INamedTypeSymbol;
+			if (typeToGenerateIn == null || parameterSymbol == null || typeToGenerateIn.IsErrorType() || parameterSymbol.IsErrorType())
+			{
+				return false;
+			}
+
+			methodSymbol = GenerateMethodSymbol(typeToGenerateIn, parameterSymbol);
+
+			if (!ValidateTypeToGenerateIn(
+				document.Project.Solution,
+				typeToGenerateIn,
+				true,
+				classInterfaceModuleStructTypes,
+				cancellationToken))
+			{
+				typeToGenerateIn = parameterSymbol;
+			}
+
+			return true;
+		}
+
+		private bool TryGetImplicitConversionMethodAndTypeToGenerateIn(
+			SemanticDocument document,
+			SyntaxNode expression,
+			ISet<TypeKind> classInterfaceModuleStructTypes,
+			CancellationToken cancellationToken,
+			out IMethodSymbol methodSymbol,
+			out INamedTypeSymbol typeToGenerateIn)
+		{
+			methodSymbol = null;
+			typeToGenerateIn = document.SemanticModel.GetTypeInfo(expression, cancellationToken).ConvertedType as INamedTypeSymbol;
+			var parameterSymbol = document.SemanticModel.GetTypeInfo(expression, cancellationToken).Type as INamedTypeSymbol;
+			if (typeToGenerateIn == null || parameterSymbol == null || typeToGenerateIn.IsErrorType() || parameterSymbol.IsErrorType())
+			{
+				return false;
+			}
+
+			methodSymbol = GenerateMethodSymbol(typeToGenerateIn, parameterSymbol);
+
+			if (!ValidateTypeToGenerateIn(
+				document.Project.Solution,
+				typeToGenerateIn,
+				true,
+				classInterfaceModuleStructTypes,
+				cancellationToken))
+			{
+				typeToGenerateIn = parameterSymbol;
+			}
+
+			return true;
+		}
+
+		private static IMethodSymbol GenerateMethodSymbol(INamedTypeSymbol typeToGenerateIn, INamedTypeSymbol parameterSymbol)
+		{
+			// Remove any generic parameters
+			if (typeToGenerateIn.IsGenericType)
+			{
+				typeToGenerateIn = typeToGenerateIn.ConstructUnboundGenericType().ConstructedFrom;
+			}
+
+			return CodeGenerationSymbolFactory.CreateMethodSymbol(
+				attributes: SpecializedCollections.EmptyList<AttributeData>(),
+				accessibility: default(Accessibility),
+				modifiers: default(DeclarationModifiers),
+				returnType: typeToGenerateIn,
+				explicitInterfaceSymbol: null,
+				name: null,
+				typeParameters: SpecializedCollections.EmptyList<ITypeParameterSymbol>(),
+				parameters: new[] { CodeGenerationSymbolFactory.CreateParameterSymbol(parameterSymbol, "v") },
+				methodKind: MethodKind.Conversion);
+		}
+
+		protected override string GetImplicitConversionDisplayText(AbstractGenerateParameterizedMemberService<CSharpGenerateConversionService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax>.State state)
+		{
+			return string.Format(Resources.ImplicitConversionDisplayText, state.TypeToGenerateIn.Name);
+		}
+
+		protected override string GetExplicitConversionDisplayText(AbstractGenerateParameterizedMemberService<CSharpGenerateConversionService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax>.State state)
+		{
+			return string.Format(Resources.ExplicitConversionDisplayText, state.TypeToGenerateIn.Name);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpGenerateMethodService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpGenerateMethodService.cs
new file mode 100644
index 0000000000..be978c0823
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpGenerateMethodService.cs
@@ -0,0 +1,173 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember
+{
+	partial class CSharpGenerateMethodService :
+	AbstractGenerateMethodService<CSharpGenerateMethodService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax>
+	{
+		protected override bool IsExplicitInterfaceGeneration(SyntaxNode node)
+		{
+			return node is MethodDeclarationSyntax;
+		}
+
+		protected override bool IsSimpleNameGeneration(SyntaxNode node)
+		{
+			return node is SimpleNameSyntax;
+		}
+
+		protected override bool ContainingTypesOrSelfHasUnsafeKeyword(INamedTypeSymbol containingType)
+		{
+			return containingType.ContainingTypesOrSelfHasUnsafeKeyword();
+		}
+
+		protected override AbstractInvocationInfo CreateInvocationMethodInfo(SemanticDocument document, AbstractGenerateParameterizedMemberService<CSharpGenerateMethodService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax>.State state)
+		{
+			return new CSharpGenerateParameterizedMemberService<CSharpGenerateMethodService>.InvocationExpressionInfo(document, state);
+		}
+
+		protected override bool AreSpecialOptionsActive(SemanticModel semanticModel)
+		{
+			return CSharpCommonGenerationServiceMethods.AreSpecialOptionsActive(semanticModel);
+		}
+
+		protected override bool IsValidSymbol(ISymbol symbol, SemanticModel semanticModel)
+		{
+			return CSharpCommonGenerationServiceMethods.IsValidSymbol(symbol, semanticModel);
+		}
+
+		protected override bool TryInitializeExplicitInterfaceState(
+			SemanticDocument document,
+			SyntaxNode node,
+			CancellationToken cancellationToken,
+			out SyntaxToken identifierToken,
+			out IMethodSymbol methodSymbol,
+			out INamedTypeSymbol typeToGenerateIn)
+		{
+			var methodDeclaration = (MethodDeclarationSyntax)node;
+			identifierToken = methodDeclaration.Identifier;
+
+			if (methodDeclaration.ExplicitInterfaceSpecifier != null &&
+				!methodDeclaration.ParameterList.OpenParenToken.IsMissing &&
+				!methodDeclaration.ParameterList.CloseParenToken.IsMissing)
+			{
+				var semanticModel = document.SemanticModel;
+				methodSymbol = semanticModel.GetDeclaredSymbol(methodDeclaration, cancellationToken) as IMethodSymbol;
+				if (methodSymbol != null && !methodSymbol.ExplicitInterfaceImplementations.Any())
+				{
+					var semanticInfo = semanticModel.GetTypeInfo(methodDeclaration.ExplicitInterfaceSpecifier.Name, cancellationToken);
+					typeToGenerateIn = semanticInfo.Type as INamedTypeSymbol;
+					return typeToGenerateIn != null;
+				}
+			}
+
+			identifierToken = default(SyntaxToken);
+			methodSymbol = null;
+			typeToGenerateIn = null;
+			return false;
+		}
+
+		protected override bool TryInitializeSimpleNameState(
+			SemanticDocument document,
+			SimpleNameSyntax simpleName,
+			CancellationToken cancellationToken,
+			out SyntaxToken identifierToken,
+			out ExpressionSyntax simpleNameOrMemberAccessExpression,
+			out InvocationExpressionSyntax invocationExpressionOpt,
+			out bool isInConditionalAccessExpression)
+		{
+			identifierToken = simpleName.Identifier;
+
+			var memberAccess = simpleName?.Parent as MemberAccessExpressionSyntax;
+			var conditionalMemberAccess = simpleName?.Parent?.Parent?.Parent as ConditionalAccessExpressionSyntax;
+			var inConditionalMemberAccess = conditionalMemberAccess != null;
+			if (memberAccess != null)
+			{
+				simpleNameOrMemberAccessExpression = (ExpressionSyntax)memberAccess;
+			}
+			else if (inConditionalMemberAccess)
+			{
+				simpleNameOrMemberAccessExpression = (ExpressionSyntax)conditionalMemberAccess;
+			}
+			else
+			{
+				simpleNameOrMemberAccessExpression = simpleName;
+			}
+
+			if (memberAccess == null || memberAccess.Name == simpleName)
+			{
+				if (simpleNameOrMemberAccessExpression.IsParentKind(SyntaxKind.InvocationExpression))
+				{
+					invocationExpressionOpt = (InvocationExpressionSyntax)simpleNameOrMemberAccessExpression.Parent;
+					isInConditionalAccessExpression = inConditionalMemberAccess;
+					return !invocationExpressionOpt.ArgumentList.CloseParenToken.IsMissing;
+				}
+				// We need to check that the tree is structured like so:
+				// ConditionalAccessExpressionSyntax
+				//    ->  InvocationExpressionSyntax
+				//          ->   MemberBindingExpressionSyntax
+				// and that the name at the end of this expression matches the simple name we were given
+				else if ((((simpleNameOrMemberAccessExpression as ConditionalAccessExpressionSyntax)
+					?.WhenNotNull as InvocationExpressionSyntax)
+					?.Expression as MemberBindingExpressionSyntax)
+					?.Name == simpleName)
+				{
+					invocationExpressionOpt = (InvocationExpressionSyntax)((ConditionalAccessExpressionSyntax)simpleNameOrMemberAccessExpression).WhenNotNull;
+					isInConditionalAccessExpression = inConditionalMemberAccess;
+					return !invocationExpressionOpt.ArgumentList.CloseParenToken.IsMissing;
+				}
+				else if (simpleName.IsKind(SyntaxKind.IdentifierName))
+				{
+					// If we don't have an invocation node, then see if we can infer a delegate in
+					// this location. Check if this is a place where a delegate can go.  Only do this
+					// for identifier names. for now.  It gets really funky if you have to deal with
+					// a generic name here.
+
+					// Can't assign into a method.
+					if (!simpleNameOrMemberAccessExpression.IsLeftSideOfAnyAssignExpression())
+					{
+						invocationExpressionOpt = null;
+						isInConditionalAccessExpression = inConditionalMemberAccess;
+						return true;
+					}
+				}
+			}
+
+			identifierToken = default(SyntaxToken);
+			simpleNameOrMemberAccessExpression = null;
+			invocationExpressionOpt = null;
+			isInConditionalAccessExpression = false;
+			return false;
+		}
+
+		protected override ITypeSymbol CanGenerateMethodForSimpleNameOrMemberAccessExpression(
+			SemanticModel semanticModel,
+			ExpressionSyntax expresion,
+			CancellationToken cancellationToken)
+		{
+			if (semanticModel.SyntaxTree.IsNameOfContext(expresion.SpanStart, semanticModel, cancellationToken))
+			{
+				return TypeGuessing.typeInferenceService.InferType(semanticModel, expresion, true, cancellationToken);
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpGenerateParameterizedMemberService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpGenerateParameterizedMemberService.cs
new file mode 100644
index 0000000000..ad3462c2ce
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/CSharpGenerateParameterizedMemberService.cs
@@ -0,0 +1,172 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember
+{
+	internal abstract class CSharpGenerateParameterizedMemberService<TService> : AbstractGenerateParameterizedMemberService<TService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax>
+		where TService : AbstractGenerateParameterizedMemberService<TService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax>
+	{
+		internal protected partial class InvocationExpressionInfo : AbstractInvocationInfo
+		{
+			private readonly InvocationExpressionSyntax _invocationExpression;
+
+			public InvocationExpressionInfo(
+				SemanticDocument document,
+				AbstractGenerateParameterizedMemberService<TService, SimpleNameSyntax, ExpressionSyntax, InvocationExpressionSyntax>.State state)
+				: base(document, state)
+			{
+				_invocationExpression = state.InvocationExpressionOpt;
+			}
+
+			protected override IList<string> DetermineParameterNames(CancellationToken cancellationToken)
+			{
+				return this.Document.SemanticModel.GenerateParameterNames(
+					_invocationExpression.ArgumentList);
+			}
+
+			protected override ITypeSymbol DetermineReturnTypeWorker(CancellationToken cancellationToken)
+			{
+				// Defer to the type inferrer to figure out what the return type of this new method
+				// should be.
+				var inferredType = TypeGuessing.typeInferenceService.InferType(this.Document.SemanticModel,
+					_invocationExpression, objectAsDefault: true, cancellationToken: cancellationToken);
+				if (State.IsInConditionalAccessExpression)
+				{
+					return inferredType.RemoveNullableIfPresent();
+				}
+
+				return inferredType;
+			}
+
+			protected override IList<ITypeParameterSymbol> GetCapturedTypeParameters(CancellationToken cancellationToken)
+			{
+				var result = new List<ITypeParameterSymbol>();
+				var semanticModel = this.Document.SemanticModel;
+				foreach (var argument in _invocationExpression.ArgumentList.Arguments)
+				{
+					var type = semanticModel.GetType(argument.Expression, cancellationToken);
+					type.GetReferencedTypeParameters(result);
+				}
+
+				return result;
+			}
+
+			protected override IList<ITypeParameterSymbol> GenerateTypeParameters(CancellationToken cancellationToken)
+			{
+				// Generate dummy type parameter names for a generic method.  If the user is inside a
+				// generic method, and calls a generic method with type arguments from the outer
+				// method, then use those same names for the generated type parameters.
+				//
+				// TODO(cyrusn): If we do capture method type variables, then we should probably
+				// capture their constraints as well.
+				var genericName = (GenericNameSyntax)this.State.SimpleNameOpt;
+				//var semanticModel = this.Document.SemanticModel;
+
+				if (genericName.TypeArgumentList.Arguments.Count == 1)
+				{
+					var typeParameter = GetUniqueTypeParameter(
+						genericName.TypeArgumentList.Arguments.First(),
+						s => !State.TypeToGenerateIn.GetAllTypeParameters().Any(t => t.Name == s),
+						cancellationToken);
+
+					return new List<ITypeParameterSymbol> { typeParameter };
+				}
+				else
+				{
+					var list = new List<ITypeParameterSymbol>();
+
+					var usedIdentifiers = new HashSet<string> { "T" };
+					foreach (var type in genericName.TypeArgumentList.Arguments)
+					{
+						var typeParameter = GetUniqueTypeParameter(
+							type,
+							s => !usedIdentifiers.Contains(s) && !State.TypeToGenerateIn.GetAllTypeParameters().Any(t => t.Name == s),
+							cancellationToken);
+
+						usedIdentifiers.Add(typeParameter.Name);
+
+						list.Add(typeParameter);
+					}
+
+					return list;
+				}
+			}
+
+			private ITypeParameterSymbol GetUniqueTypeParameter(
+				TypeSyntax type,
+				Func<string, bool> isUnique,
+				CancellationToken cancellationToken)
+			{
+				var methodTypeParameter = GetMethodTypeParameter(type, cancellationToken);
+				return methodTypeParameter != null
+					? methodTypeParameter
+						: CodeGenerationSymbolFactory.CreateTypeParameterSymbol(NameGenerator.GenerateUniqueName("T", isUnique));
+			}
+
+			private ITypeParameterSymbol GetMethodTypeParameter(TypeSyntax type, CancellationToken cancellationToken)
+			{
+				if (type is IdentifierNameSyntax)
+				{
+					var info = this.Document.SemanticModel.GetTypeInfo(type, cancellationToken);
+					if (info.Type is ITypeParameterSymbol &&
+						((ITypeParameterSymbol)info.Type).TypeParameterKind == TypeParameterKind.Method)
+					{
+						return (ITypeParameterSymbol)info.Type;
+					}
+				}
+
+				return null;
+			}
+
+			protected override IList<RefKind> DetermineParameterModifiers(CancellationToken cancellationToken)
+			{
+				return
+					_invocationExpression.ArgumentList.Arguments.Select(
+						a => a.RefOrOutKeyword.Kind() == SyntaxKind.RefKeyword ? RefKind.Ref :
+						a.RefOrOutKeyword.Kind() == SyntaxKind.OutKeyword ? RefKind.Out : RefKind.None).ToList();
+			}
+
+			protected override IList<ITypeSymbol> DetermineParameterTypes(CancellationToken cancellationToken)
+			{
+				return _invocationExpression.ArgumentList.Arguments.Select(a => DetermineParameterType(a, cancellationToken)).ToList();
+			}
+
+			private ITypeSymbol DetermineParameterType(
+				ArgumentSyntax argument,
+				CancellationToken cancellationToken)
+			{
+				return argument.DetermineParameterType(this.Document.SemanticModel, cancellationToken);
+			}
+
+			protected override IList<bool> DetermineParameterOptionality(CancellationToken cancellationToken)
+			{
+				return _invocationExpression.ArgumentList.Arguments.Select(a => false).ToList();
+			}
+
+			protected override bool IsIdentifierName()
+			{
+				return this.State.SimpleNameOpt.Kind() == SyntaxKind.IdentifierName;
+			}
+
+			protected override bool IsImplicitReferenceConversion(Compilation compilation, ITypeSymbol sourceType, ITypeSymbol targetType)
+			{
+				var conversion = compilation.ClassifyConversion(sourceType, targetType);
+				return conversion.IsImplicit && conversion.IsReference;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/MethodGenerationKind.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/MethodGenerationKind.cs
new file mode 100644
index 0000000000..cbafecdebb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateParameterizedMember/MethodGenerationKind.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateParameterizedMember
+{
+	public enum MethodGenerationKind
+	{
+		Member,
+		ImplicitConversion,
+		ExplicitConversion
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
new file mode 100644
index 0000000000..6bf6e3bd68
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -0,0 +1,710 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Options;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.Editing;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace Microsoft.CodeAnalysis.GenerateMember.GenerateVariable
+{
+	abstract partial class AbstractGenerateVariableService<TService, TSimpleNameSyntax, TExpressionSyntax> :
+	AbstractGenerateMemberService<TSimpleNameSyntax, TExpressionSyntax>
+		where TService : AbstractGenerateVariableService<TService, TSimpleNameSyntax, TExpressionSyntax>
+		where TSimpleNameSyntax : TExpressionSyntax
+		where TExpressionSyntax : SyntaxNode
+	{
+		protected AbstractGenerateVariableService()
+		{
+		}
+
+		protected abstract bool IsExplicitInterfaceGeneration(SyntaxNode node);
+		protected abstract bool IsIdentifierNameGeneration(SyntaxNode node);
+
+		protected abstract bool TryInitializeExplicitInterfaceState(SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken, out SyntaxToken identifierToken, out IPropertySymbol propertySymbol, out INamedTypeSymbol typeToGenerateIn);
+		protected abstract bool TryInitializeIdentifierNameState(SemanticDocument document, TSimpleNameSyntax identifierName, CancellationToken cancellationToken, out SyntaxToken identifierToken, out TExpressionSyntax simpleNameOrMemberAccessExpression, out bool isInExecutableBlock, out bool isinConditionalAccessExpression);
+
+		protected abstract bool TryConvertToLocalDeclaration(ITypeSymbol type, SyntaxToken identifierToken, OptionSet options, out SyntaxNode newRoot);
+
+		public async Task<IEnumerable<CodeAction>> GenerateVariableAsync(
+			Document document,
+			SyntaxNode node,
+			CancellationToken cancellationToken)
+		{
+			var semanticDocument = await SemanticDocument.CreateAsync(document, cancellationToken).ConfigureAwait(false);
+
+			var state = await State.GenerateAsync((TService)this, semanticDocument, node, cancellationToken).ConfigureAwait(false);
+			if (state == null)
+			{
+				return SpecializedCollections.EmptyEnumerable<CodeAction>();
+			}
+
+			var result = new List<CodeAction>();
+
+			var canGenerateMember = ICSharpCode.NRefactory6.CSharp.CodeGenerator.CanAdd(document.Project.Solution, state.TypeToGenerateIn, cancellationToken);
+
+			// prefer fields over properties (and vice versa) depending on the casing of the member.
+			// lowercase -> fields.  title case -> properties.
+			var name = state.IdentifierToken.ValueText;
+			if (char.IsUpper(name.FirstOrDefault()))
+			{
+				if (canGenerateMember)
+				{
+					AddPropertyCodeActions(result, document, state);
+					AddFieldCodeActions(result, document, state);
+				}
+
+				AddLocalCodeActions(result, document, state);
+			}
+			else
+			{
+				if (canGenerateMember)
+				{
+					AddFieldCodeActions(result, document, state);
+					AddPropertyCodeActions(result, document, state);
+				}
+
+				AddLocalCodeActions(result, document, state);
+			}
+
+			return result;
+		}
+
+		protected virtual bool ContainingTypesOrSelfHasUnsafeKeyword(INamedTypeSymbol containingType)
+		{
+			return false;
+		}
+
+		private void AddPropertyCodeActions(List<CodeAction> result, Document document, State state)
+		{
+			if (state.IsInRefContext || state.IsInOutContext)
+			{
+				return;
+			}
+
+			if (state.IsConstant)
+			{
+				return;
+			}
+
+			if (state.TypeToGenerateIn.TypeKind == TypeKind.Interface && state.IsStatic)
+			{
+				return;
+			}
+
+			result.Add(new GenerateVariableCodeAction((TService)this, document, state, generateProperty: true, isReadonly: false, isConstant: false));
+
+			if (state.TypeToGenerateIn.TypeKind == TypeKind.Interface && !state.IsWrittenTo)
+			{
+				result.Add(new GenerateVariableCodeAction((TService)this, document, state, generateProperty: true, isReadonly: true, isConstant: false));
+			}
+		}
+
+		private void AddFieldCodeActions(List<CodeAction> result, Document document, State state)
+		{
+			if (state.TypeToGenerateIn.TypeKind != TypeKind.Interface)
+			{
+				if (state.IsConstant)
+				{
+					result.Add(new GenerateVariableCodeAction((TService)this, document, state, generateProperty: false, isReadonly: false, isConstant: true));
+				}
+				else
+				{
+					result.Add(new GenerateVariableCodeAction((TService)this, document, state, generateProperty: false, isReadonly: false, isConstant: false));
+
+					// If we haven't written to the field, or we're in the constructor for the type
+					// we're writing into, then we can generate this field read-only.
+					if (!state.IsWrittenTo || state.IsInConstructor)
+					{
+						result.Add(new GenerateVariableCodeAction((TService)this, document, state, generateProperty: false, isReadonly: true, isConstant: false));
+					}
+				}
+			}
+		}
+
+		private void AddLocalCodeActions(List<CodeAction> result, Document document, State state)
+		{
+			if (state.CanGenerateLocal())
+			{
+				result.Add(new GenerateLocalCodeAction((TService)this, document, state));
+			}
+		}
+
+		private partial class GenerateVariableCodeAction : CodeAction
+		{
+			//private readonly TService _service;
+			private readonly State _state;
+			private readonly bool _generateProperty;
+			private readonly bool _isReadonly;
+			private readonly bool _isConstant;
+			private readonly Document _document;
+			private readonly string _equivalenceKey;
+
+			public GenerateVariableCodeAction(
+				TService service,
+				Document document,
+				State state,
+				bool generateProperty,
+				bool isReadonly,
+				bool isConstant)
+			{
+				//_service = service;
+				_document = document;
+				_state = state;
+				_generateProperty = generateProperty;
+				_isReadonly = isReadonly;
+				_isConstant = isConstant;
+				_equivalenceKey = Title;
+			}
+
+			protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+			{
+				var generateUnsafe = _state.TypeMemberType.IsUnsafe() &&
+					!_state.IsContainedInUnsafeType;
+
+				if (_generateProperty)
+				{
+					var getAccessor = CodeGenerationSymbolFactory.CreateAccessorSymbol(
+						attributes: null,
+						accessibility: DetermineMaximalAccessibility(_state),
+						statements: null);
+					var setAccessor = _isReadonly ? null : CodeGenerationSymbolFactory.CreateAccessorSymbol(
+						attributes: null,
+						accessibility: DetermineMinimalAccessibility(_state),
+						statements: null);
+
+					var result = await ICSharpCode.NRefactory6.CSharp.CodeGenerator.AddPropertyDeclarationAsync(
+						_document.Project.Solution,
+						_state.TypeToGenerateIn,
+						CodeGenerationSymbolFactory.CreatePropertySymbol(
+							attributes: null,
+							accessibility: DetermineMaximalAccessibility(_state),
+							modifiers: DeclarationModifiers.None.WithIsStatic(_state.IsStatic).WithIsUnsafe (generateUnsafe),
+							type: _state.TypeMemberType,
+							explicitInterfaceSymbol: null,
+							name: _state.IdentifierToken.ValueText,
+							isIndexer: _state.IsIndexer,
+							parameters: _state.Parameters,
+							getMethod: getAccessor,
+							setMethod: setAccessor),
+						new CodeGenerationOptions(contextLocation: _state.IdentifierToken.GetLocation(), generateDefaultAccessibility: false),
+						cancellationToken: cancellationToken)
+						.ConfigureAwait(false);
+
+					return await AnnotateInsertionMode (_document.Project.Solution.GetDocument(result.Id), result);
+				}
+				else
+				{
+					var result = await ICSharpCode.NRefactory6.CSharp.CodeGenerator.AddFieldDeclarationAsync(
+						_document.Project.Solution,
+						_state.TypeToGenerateIn,
+						CodeGenerationSymbolFactory.CreateFieldSymbol(
+							attributes: null,
+							accessibility: DetermineMinimalAccessibility(_state),
+							modifiers: _isConstant ?
+							DeclarationModifiers.None.WithIsConst(true).WithIsUnsafe(generateUnsafe) :
+							DeclarationModifiers.None.WithIsStatic(_state.IsStatic).WithIsReadOnly (_isReadonly).WithIsUnsafe(generateUnsafe),
+							type: _state.TypeMemberType,
+							name: _state.IdentifierToken.ValueText),
+						new CodeGenerationOptions(contextLocation: _state.IdentifierToken.GetLocation(), generateDefaultAccessibility: false),
+						cancellationToken: cancellationToken)
+						.ConfigureAwait(false);
+
+					return await AnnotateInsertionMode (_document.Project.Solution.GetDocument (result.Id), result);
+				}
+			}
+
+			async Task<Document> AnnotateInsertionMode (Document oldDocument, Document result)
+			{
+				var newRoot = await result.GetSyntaxRootAsync ();
+				var changes = await oldDocument.GetTextChangesAsync (result);
+				foreach (var change in changes) {
+
+					var parent = newRoot.FindNode (change.Span);
+					if (parent == null || !(parent is FieldDeclarationSyntax || parent is PropertyDeclarationSyntax))
+						continue;
+					return result.WithSyntaxRoot (newRoot.ReplaceNode (parent, parent.WithAdditionalAnnotations (TypeSystemService.InsertionModeAnnotation)));
+				}
+				return result;
+			}
+
+			private Accessibility DetermineMaximalAccessibility(State state)
+			{
+				if (state.TypeToGenerateIn.TypeKind == TypeKind.Interface)
+				{
+					return Accessibility.NotApplicable;
+				}
+
+				var accessibility = Accessibility.Public;
+
+				// Ensure that we're not overly exposing a type.
+				var containingTypeAccessibility = state.TypeToGenerateIn.DetermineMinimalAccessibility();
+				var effectiveAccessibility = CommonAccessibilityUtilities.Minimum(
+					containingTypeAccessibility, accessibility);
+
+				var returnTypeAccessibility = state.TypeMemberType.DetermineMinimalAccessibility();
+
+				if (CommonAccessibilityUtilities.Minimum(effectiveAccessibility, returnTypeAccessibility) !=
+					effectiveAccessibility)
+				{
+					return returnTypeAccessibility;
+				}
+
+				return accessibility;
+			}
+
+			private Accessibility DetermineMinimalAccessibility(State state)
+			{
+				if (state.TypeToGenerateIn.TypeKind == TypeKind.Interface)
+				{
+					return Accessibility.NotApplicable;
+				}
+
+				// Otherwise, figure out what accessibility modifier to use and optionally mark
+				// it as static.
+				if (state.SimpleNameOrMemberAccessExpressionOpt.IsAttributeNamedArgumentIdentifier())
+				{
+					return Accessibility.Public;
+				}
+				else if (state.ContainingType.IsContainedWithin(state.TypeToGenerateIn))
+				{
+					return Accessibility.Private;
+				}
+				else if (DerivesFrom(state, state.ContainingType) && state.IsStatic)
+				{
+					// NOTE(cyrusn): We only generate protected in the case of statics.  Consider
+					// the case where we're generating into one of our base types.  i.e.:
+					//
+					// class B : A { void Foo() { A a; a.Foo(); }
+					//
+					// In this case we can *not* mark the method as protected.  'B' can only
+					// access protected members of 'A' through an instance of 'B' (or a subclass
+					// of B).  It can not access protected members through an instance of the
+					// superclass.  In this case we need to make the method public or internal.
+					//
+					// However, this does not apply if the method will be static.  i.e.
+					// 
+					// class B : A { void Foo() { A.Foo(); }
+					//
+					// B can access the protected statics of A, and so we generate 'Foo' as
+					// protected.
+					return Accessibility.Protected;
+				}
+				else if (state.ContainingType.ContainingAssembly.IsSameAssemblyOrHasFriendAccessTo(state.TypeToGenerateIn.ContainingAssembly))
+				{
+					return Accessibility.Internal;
+				}
+				else
+				{
+					// TODO: Code coverage - we need a unit-test that generates across projects
+					return Accessibility.Public;
+				}
+			}
+
+			private bool DerivesFrom(State state, INamedTypeSymbol containingType)
+			{
+				return containingType.GetBaseTypes().Select(t => t.OriginalDefinition)
+					.Contains(state.TypeToGenerateIn);
+			}
+
+			public override string Title
+			{
+				get
+				{
+					var text = _isConstant
+						? Resources.GenerateConstantIn
+						: _generateProperty
+						? _isReadonly ? Resources.GenerateReadonlyProperty : Resources.GeneratePropertyIn
+						: _isReadonly ? Resources.GenerateReadonlyField : Resources.GenerateFieldIn;
+
+					return string.Format(
+						text,
+						_state.IdentifierToken.ValueText,
+						_state.TypeToGenerateIn.Name);
+				}
+			}
+
+			public override string EquivalenceKey
+			{
+				get
+				{
+					return _equivalenceKey;
+				}
+			}
+		}
+
+		private class GenerateLocalCodeAction : CodeAction
+		{
+			private readonly TService _service;
+			private readonly Document _document;
+			private readonly State _state;
+
+			public GenerateLocalCodeAction(TService service, Document document, State state)
+			{
+				_service = service;
+				_document = document;
+				_state = state;
+			}
+
+			public override string Title
+			{
+				get
+				{
+					var text = Resources.GenerateLocal;
+
+					return string.Format(
+						text,
+						_state.IdentifierToken.ValueText);
+				}
+			}
+
+			protected override Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+			{
+				var newRoot = GetNewRoot(cancellationToken);
+				var newDocument = _document.WithSyntaxRoot(newRoot);
+
+				return Task.FromResult(newDocument);
+			}
+
+			private SyntaxNode GetNewRoot(CancellationToken cancellationToken)
+			{
+				SyntaxNode newRoot;
+				if (_service.TryConvertToLocalDeclaration(_state.LocalType, _state.IdentifierToken, _document.Project.Solution.Workspace.Options, out newRoot))
+				{
+					return newRoot;
+				}
+
+				var syntaxFactory = _document.GetLanguageService<SyntaxGenerator>();
+				var initializer = _state.IsOnlyWrittenTo
+					? null
+					: syntaxFactory.DefaultExpression(_state.LocalType);
+
+				var type = _state.LocalType;
+				var localStatement = syntaxFactory.LocalDeclarationStatement(type, _state.IdentifierToken.ValueText, initializer);
+				localStatement = localStatement.WithAdditionalAnnotations(Microsoft.CodeAnalysis.Formatting.Formatter.Annotation);
+
+				var codeGenService = new CSharpCodeGenerationService (_document.Project.Solution.Workspace);
+				var root = _state.IdentifierToken.GetAncestors<SyntaxNode>().Last();
+
+				return codeGenService.AddStatements(
+					root,
+					SpecializedCollections.SingletonEnumerable(localStatement),
+					options: new CodeGenerationOptions(beforeThisLocation: _state.IdentifierToken.GetLocation()),
+					cancellationToken: cancellationToken);
+			}
+		}
+
+		private partial class State
+		{
+			public INamedTypeSymbol ContainingType { get; private set; }
+			public INamedTypeSymbol TypeToGenerateIn { get; private set; }
+			public bool IsStatic { get; private set; }
+			public bool IsConstant { get; private set; }
+			public bool IsIndexer { get; private set; }
+			public bool IsContainedInUnsafeType { get; private set; }
+			public IList<IParameterSymbol> Parameters { get; private set; }
+
+			// Just the name of the method.  i.e. "Foo" in "Foo" or "X.Foo"
+			public SyntaxToken IdentifierToken { get; private set; }
+			public TSimpleNameSyntax SimpleNameOpt { get; private set; }
+
+			// The entire expression containing the name.  i.e. "X.Foo"
+			public TExpressionSyntax SimpleNameOrMemberAccessExpressionOpt { get; private set; }
+
+			public ITypeSymbol TypeMemberType { get; private set; }
+			public ITypeSymbol LocalType { get; private set; }
+
+			public bool IsWrittenTo { get; private set; }
+			public bool IsOnlyWrittenTo { get; private set; }
+
+			public bool IsInConstructor { get; private set; }
+			public bool IsInRefContext { get; private set; }
+			public bool IsInOutContext { get; private set; }
+			public bool IsInMemberContext { get; private set; }
+
+			public bool IsInExecutableBlock { get; private set; }
+			public bool IsInConditionalAccessExpression { get; private set; }
+
+			public static async Task<State> GenerateAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode interfaceNode,
+				CancellationToken cancellationToken)
+			{
+				var state = new State();
+				if (!await state.TryInitializeAsync(service, document, interfaceNode, cancellationToken).ConfigureAwait(false))
+				{
+					return null;
+				}
+
+				return state;
+			}
+
+			private async Task<bool> TryInitializeAsync(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				if (service.IsIdentifierNameGeneration(node))
+				{
+					// Cases that we deal with currently:
+					//
+					// 1) expr.Foo
+					// 2) expr->Foo
+					// 3) Foo
+					if (!TryInitializeSimpleName(service, document, (TSimpleNameSyntax)node, cancellationToken))
+					{
+						return false;
+					}
+				}
+				else if (service.IsExplicitInterfaceGeneration(node))
+				{
+					// 4)  bool IFoo.NewProp
+					if (!TryInitializeExplicitInterface(service, document, node, cancellationToken))
+					{
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+
+				// Ok.  It either didn't bind to any symbols, or it bound to a symbol but with
+				// errors.  In the former case we definitely want to offer to generate a field.  In
+				// the latter case, we want to generate a field *unless* there's an existing member
+				// with the same name.  Note: it's ok if there's a  method with the same name.
+				var existingMembers = this.TypeToGenerateIn.GetMembers(this.IdentifierToken.ValueText)
+					.Where(m => m.Kind != SymbolKind.Method);
+				if (existingMembers.Any())
+				{
+					// TODO: Code coverage
+					// There was an existing method that the new method would clash with.  
+					return false;
+				}
+
+				if (cancellationToken.IsCancellationRequested)
+				{
+					return false;
+				}
+
+				this.TypeToGenerateIn = await SymbolFinder.FindSourceDefinitionAsync(this.TypeToGenerateIn, document.Project.Solution, cancellationToken).ConfigureAwait(false) as INamedTypeSymbol;
+
+				if (!service.ValidateTypeToGenerateIn(
+					document.Project.Solution, this.TypeToGenerateIn, this.IsStatic, ClassInterfaceModuleStructTypes, cancellationToken))
+				{
+					return false;
+				}
+
+				this.IsContainedInUnsafeType = service.ContainingTypesOrSelfHasUnsafeKeyword(this.TypeToGenerateIn);
+
+				return CanGenerateLocal() || ICSharpCode.NRefactory6.CSharp.CodeGenerator.CanAdd(document.Project.Solution, this.TypeToGenerateIn, cancellationToken);
+			}
+
+			internal bool CanGenerateLocal()
+			{
+				return !this.IsInMemberContext && this.IsInExecutableBlock;
+			}
+
+			private bool TryInitializeExplicitInterface(
+				TService service,
+				SemanticDocument document,
+				SyntaxNode propertyDeclaration,
+				CancellationToken cancellationToken)
+			{
+				SyntaxToken identifierToken;
+				IPropertySymbol propertySymbol;
+				INamedTypeSymbol typeToGenerateIn;
+				if (!service.TryInitializeExplicitInterfaceState(
+					document, propertyDeclaration, cancellationToken,
+					out identifierToken, out propertySymbol, out typeToGenerateIn))
+				{
+					return false;
+				}
+
+				this.IdentifierToken = identifierToken;
+				this.TypeToGenerateIn = typeToGenerateIn;
+
+				if (propertySymbol.ExplicitInterfaceImplementations.Any())
+				{
+					return false;
+				}
+
+				cancellationToken.ThrowIfCancellationRequested();
+
+				var semanticModel = document.SemanticModel;
+				this.ContainingType = semanticModel.GetEnclosingNamedType(this.IdentifierToken.SpanStart, cancellationToken);
+				if (this.ContainingType == null)
+				{
+					return false;
+				}
+
+				if (!this.ContainingType.Interfaces.OfType<INamedTypeSymbol>().Contains(this.TypeToGenerateIn))
+				{
+					return false;
+				}
+
+				this.IsIndexer = propertySymbol.IsIndexer;
+				this.Parameters = propertySymbol.Parameters;
+				this.TypeMemberType = propertySymbol.Type;
+
+				// By default, make it readonly, unless there's already an setter defined.
+				this.IsWrittenTo = propertySymbol.SetMethod != null;
+
+				return true;
+			}
+
+			private bool TryInitializeSimpleName(
+				TService service,
+				SemanticDocument document,
+				TSimpleNameSyntax simpleName,
+				CancellationToken cancellationToken)
+			{
+				SyntaxToken identifierToken;
+				TExpressionSyntax simpleNameOrMemberAccessExpression;
+				bool isInExecutableBlock;
+				bool isInConditionalAccessExpression;
+				if (!service.TryInitializeIdentifierNameState(
+					document, simpleName, cancellationToken,
+					out identifierToken, out simpleNameOrMemberAccessExpression, out isInExecutableBlock, out isInConditionalAccessExpression))
+				{
+					return false;
+				}
+
+				if (string.IsNullOrWhiteSpace(identifierToken.ValueText))
+				{
+					return false;
+				}
+
+				this.SimpleNameOpt = simpleName;
+				this.IdentifierToken = identifierToken;
+				this.SimpleNameOrMemberAccessExpressionOpt = simpleNameOrMemberAccessExpression;
+				this.IsInExecutableBlock = isInExecutableBlock;
+				this.IsInConditionalAccessExpression = isInConditionalAccessExpression;
+
+				// If we're in a type context then we shouldn't offer to generate a field or
+				// property.
+				if (SimpleNameOrMemberAccessExpressionOpt.IsInNamespaceOrTypeContext())
+				{
+					return false;
+				}
+
+				var expr = SimpleNameOrMemberAccessExpressionOpt as ExpressionSyntax;
+				this.IsConstant = expr.IsInConstantContext();
+
+				// If we're not in a type, don't even bother.  NOTE(cyrusn): We'll have to rethink this
+				// for C# Script.
+				cancellationToken.ThrowIfCancellationRequested();
+				var semanticModel = document.SemanticModel;
+				this.ContainingType = semanticModel.GetEnclosingNamedType(this.IdentifierToken.SpanStart, cancellationToken);
+				if (this.ContainingType == null)
+				{
+					return false;
+				}
+
+				// Now, try to bind the invocation and see if it succeeds or not.  if it succeeds and
+				// binds uniquely, then we don't need to offer this quick fix.
+				cancellationToken.ThrowIfCancellationRequested();
+				var semanticInfo = semanticModel.GetSymbolInfo(this.SimpleNameOrMemberAccessExpressionOpt, cancellationToken);
+
+				cancellationToken.ThrowIfCancellationRequested();
+				if (semanticInfo.Symbol != null)
+				{
+					return false;
+				}
+
+				// Either we found no matches, or this was ambiguous. Either way, we might be able
+				// to generate a method here.  Determine where the user wants to generate the method
+				// into, and if it's valid then proceed.
+				cancellationToken.ThrowIfCancellationRequested();
+				INamedTypeSymbol typeToGenerateIn;
+				bool isStatic;
+				if (!service.TryDetermineTypeToGenerateIn(document, this.ContainingType, this.SimpleNameOrMemberAccessExpressionOpt, cancellationToken,
+					out typeToGenerateIn, out isStatic))
+				{
+					return false;
+				}
+
+				this.TypeToGenerateIn = typeToGenerateIn;
+				this.IsStatic = isStatic;
+
+				DetermineFieldType(document, cancellationToken);
+
+				this.IsInRefContext = expr.IsInRefContext();
+				this.IsInOutContext = expr.IsInOutContext();
+				this.IsWrittenTo = expr.IsWrittenTo();
+				this.IsOnlyWrittenTo = expr.IsOnlyWrittenTo();
+				this.IsInConstructor = DetermineIsInConstructor(document);
+				this.IsInMemberContext = this.SimpleNameOpt != this.SimpleNameOrMemberAccessExpressionOpt ||
+					expr.IsObjectInitializerNamedAssignmentIdentifier();
+				return true;
+			}
+
+			private void DetermineFieldType(
+				SemanticDocument document,
+				CancellationToken cancellationToken)
+			{
+				var inferredType = TypeGuessing.typeInferenceService.InferType(
+					document.SemanticModel, this.SimpleNameOrMemberAccessExpressionOpt,
+					objectAsDefault: true,
+					cancellationToken: cancellationToken);
+				inferredType = inferredType.SpecialType == SpecialType.System_Void
+					? document.SemanticModel.Compilation.ObjectType
+					: inferredType;
+
+				if (this.IsInConditionalAccessExpression)
+				{
+					inferredType = inferredType.RemoveNullableIfPresent();
+				}
+
+				// Substitute 'object' for all captured method type parameters.  Note: we may need to
+				// do this for things like anonymous types, as well as captured type parameters that
+				// aren't in scope in the destination type.
+				var capturedMethodTypeParameters = inferredType.GetReferencedMethodTypeParameters();
+				var mapping = capturedMethodTypeParameters.ToDictionary(tp => tp,
+					tp => document.SemanticModel.Compilation.ObjectType);
+
+				this.TypeMemberType = inferredType.SubstituteTypes(mapping, document.SemanticModel.Compilation);
+				var availableTypeParameters = this.TypeToGenerateIn.GetAllTypeParameters();
+				this.TypeMemberType = TypeMemberType.RemoveUnavailableTypeParameters(
+					document.SemanticModel.Compilation, availableTypeParameters);
+
+				var enclosingMethodSymbol = document.SemanticModel.GetEnclosingSymbol<IMethodSymbol>(this.SimpleNameOrMemberAccessExpressionOpt.SpanStart, cancellationToken);
+				if (enclosingMethodSymbol != null && enclosingMethodSymbol.TypeParameters != null && enclosingMethodSymbol.TypeParameters.Count() != 0)
+				{
+					var combinedTypeParameters = new List<ITypeParameterSymbol>();
+					combinedTypeParameters.AddRange(availableTypeParameters);
+					combinedTypeParameters.AddRange(enclosingMethodSymbol.TypeParameters);
+					this.LocalType = inferredType.RemoveUnavailableTypeParameters(
+						document.SemanticModel.Compilation, combinedTypeParameters);
+				}
+				else
+				{
+					this.LocalType = this.TypeMemberType;
+				}
+			}
+
+			private bool DetermineIsInConstructor(SemanticDocument document)
+			{
+				if (!this.ContainingType.OriginalDefinition.Equals(this.TypeToGenerateIn.OriginalDefinition))
+				{
+					return false;
+				}
+
+				return SimpleNameOpt.IsInConstructor();
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateVariable/CSharpGenerateVariableService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateVariable/CSharpGenerateVariableService.cs
new file mode 100644
index 0000000000..826b40dfe7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateMember/GenerateVariable/CSharpGenerateVariableService.cs
@@ -0,0 +1,167 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.GenerateMember.GenerateVariable;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.CodeAnalysis.GenerateMember.GenerateVariable
+{
+	partial class CSharpGenerateVariableService :
+	AbstractGenerateVariableService<CSharpGenerateVariableService, SimpleNameSyntax, ExpressionSyntax>
+	{
+		protected override bool IsExplicitInterfaceGeneration(SyntaxNode node)
+		{
+			return node is PropertyDeclarationSyntax;
+		}
+
+		protected override bool IsIdentifierNameGeneration(SyntaxNode node)
+		{
+			return node is IdentifierNameSyntax;
+		}
+
+		protected override bool ContainingTypesOrSelfHasUnsafeKeyword(INamedTypeSymbol containingType)
+		{
+			return containingType.ContainingTypesOrSelfHasUnsafeKeyword();
+		}
+
+		protected override bool TryInitializeExplicitInterfaceState(
+			SemanticDocument document, SyntaxNode node, CancellationToken cancellationToken,
+			out SyntaxToken identifierToken, out IPropertySymbol propertySymbol, out INamedTypeSymbol typeToGenerateIn)
+		{
+			var propertyDeclaration = (PropertyDeclarationSyntax)node;
+			identifierToken = propertyDeclaration.Identifier;
+
+			if (propertyDeclaration.ExplicitInterfaceSpecifier != null)
+			{
+				var semanticModel = document.SemanticModel;
+				propertySymbol = semanticModel.GetDeclaredSymbol(propertyDeclaration, cancellationToken) as IPropertySymbol;
+				if (propertySymbol != null && !propertySymbol.ExplicitInterfaceImplementations.Any())
+				{
+					var info = semanticModel.GetTypeInfo(propertyDeclaration.ExplicitInterfaceSpecifier.Name, cancellationToken);
+					typeToGenerateIn = info.Type as INamedTypeSymbol;
+					return typeToGenerateIn != null;
+				}
+			}
+
+			identifierToken = default(SyntaxToken);
+			propertySymbol = null;
+			typeToGenerateIn = null;
+			return false;
+		}
+
+		protected override bool TryInitializeIdentifierNameState(
+			SemanticDocument document, SimpleNameSyntax identifierName, CancellationToken cancellationToken,
+			out SyntaxToken identifierToken, out ExpressionSyntax simpleNameOrMemberAccessExpression, out bool isInExecutableBlock, out bool isConditionalAccessExpression)
+		{
+			identifierToken = identifierName.Identifier;
+			if (identifierToken.ValueText != string.Empty &&
+				!identifierName.IsVar)
+			{
+				var memberAccess = identifierName.Parent as MemberAccessExpressionSyntax;
+				var conditionalMemberAccess = identifierName.Parent.Parent as ConditionalAccessExpressionSyntax;
+				if (memberAccess?.Name == identifierName)
+				{
+					simpleNameOrMemberAccessExpression = (ExpressionSyntax)memberAccess;
+				}
+				else if ((conditionalMemberAccess?.WhenNotNull as MemberBindingExpressionSyntax)?.Name == identifierName)
+				{
+					simpleNameOrMemberAccessExpression = conditionalMemberAccess;
+				}
+				else
+				{
+					simpleNameOrMemberAccessExpression = identifierName;
+				}
+
+				// If we're being invoked, then don't offer this, offer generate method instead.
+				// Note: we could offer to generate a field with a delegate type.  However, that's
+				// very esoteric and probably not what most users want.
+				if (!IsLegal(document, simpleNameOrMemberAccessExpression, cancellationToken))
+				{
+					isInExecutableBlock = false;
+					isConditionalAccessExpression = false;
+					return false;
+				}
+
+				var block = identifierName.GetAncestor<BlockSyntax>();
+				isInExecutableBlock = block != null && !block.OverlapsHiddenPosition(cancellationToken);
+				isConditionalAccessExpression = conditionalMemberAccess != null;
+				return true;
+			}
+
+			identifierToken = default(SyntaxToken);
+			simpleNameOrMemberAccessExpression = null;
+			isInExecutableBlock = false;
+			isConditionalAccessExpression = false;
+			return false;
+		}
+
+		private bool IsLegal(
+			SemanticDocument document,
+			ExpressionSyntax expression,
+			CancellationToken cancellationToken)
+		{
+			// TODO(cyrusn): Consider supporting this at some point.  It is difficult because we'd
+			// need to replace the identifier typed with the fully qualified name of the field we
+			// were generating.
+			if (expression.IsParentKind(SyntaxKind.AttributeArgument))
+			{
+				return false;
+			}
+
+			if (expression.IsParentKind(SyntaxKind.ConditionalAccessExpression))
+			{
+				return true;
+			}
+
+			return expression.CanReplaceWithLValue(document.SemanticModel, cancellationToken);
+		}
+
+		protected override bool TryConvertToLocalDeclaration(ITypeSymbol type, SyntaxToken identifierToken, OptionSet options, out SyntaxNode newRoot)
+		{
+			var token = (SyntaxToken)identifierToken;
+			var node = identifierToken.Parent as IdentifierNameSyntax;
+			if (node.IsLeftSideOfAssignExpression() && node.Parent.IsParentKind(SyntaxKind.ExpressionStatement))
+			{
+				var assignExpression = (AssignmentExpressionSyntax)node.Parent;
+				var expressionStatement = (StatementSyntax)assignExpression.Parent;
+
+				var declarationStatement = SyntaxFactory.LocalDeclarationStatement(
+					SyntaxFactory.VariableDeclaration(
+						GenerateTypeSyntax(type, options),
+						SyntaxFactory.SingletonSeparatedList(
+							SyntaxFactory.VariableDeclarator(token, null, SyntaxFactory.EqualsValueClause(
+								assignExpression.OperatorToken, assignExpression.Right)))));
+				declarationStatement = declarationStatement.WithAdditionalAnnotations(Formatter.Annotation);
+
+				var root = token.GetAncestor<CompilationUnitSyntax>();
+				newRoot = root.ReplaceNode(expressionStatement, declarationStatement);
+
+				return true;
+			}
+
+			newRoot = null;
+			return false;
+		}
+
+		private static TypeSyntax GenerateTypeSyntax(ITypeSymbol type, OptionSet options)
+		{
+			return type.ContainsAnonymousType() || 
+				(true/*options.GetOption(CSharpCodeStyleOptions.UseVarWhenDeclaringLocals)*/ && type.TypeKind != TypeKind.Delegate)
+				? SyntaxFactory.IdentifierName("var")
+					: type.GenerateTypeSyntax();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/AbstractGenerateTypeService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/AbstractGenerateTypeService.cs
new file mode 100644
index 0000000000..ed9782dcf3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/AbstractGenerateTypeService.cs
@@ -0,0 +1,1813 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.FindSymbols;
+using System.IO;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateType
+{
+	abstract partial class AbstractGenerateTypeService<TService, TSimpleNameSyntax, TObjectCreationExpressionSyntax, TExpressionSyntax, TTypeDeclarationSyntax, TArgumentSyntax> 
+		where TService : AbstractGenerateTypeService<TService, TSimpleNameSyntax, TObjectCreationExpressionSyntax, TExpressionSyntax, TTypeDeclarationSyntax, TArgumentSyntax>
+		where TSimpleNameSyntax : TExpressionSyntax
+		where TObjectCreationExpressionSyntax : TExpressionSyntax
+		where TExpressionSyntax : SyntaxNode
+		where TTypeDeclarationSyntax : SyntaxNode
+		where TArgumentSyntax : SyntaxNode
+	{
+		protected AbstractGenerateTypeService ()
+		{
+		}
+
+		protected abstract bool TryInitializeState (SemanticDocument document, TSimpleNameSyntax simpleName, CancellationToken cancellationToken, out GenerateTypeServiceStateOptions generateTypeServiceStateOptions);
+
+		protected abstract TExpressionSyntax GetLeftSideOfDot (TSimpleNameSyntax simpleName);
+
+		protected abstract bool TryGetArgumentList (TObjectCreationExpressionSyntax objectCreationExpression, out IList<TArgumentSyntax> argumentList);
+
+		protected abstract string DefaultFileExtension { get; }
+
+		protected abstract IList<ITypeParameterSymbol> GetTypeParameters (State state, SemanticModel semanticModel, CancellationToken cancellationToken);
+
+		protected abstract Accessibility GetAccessibility (State state, SemanticModel semanticModel, bool intoNamespace, CancellationToken cancellationToken);
+
+		protected abstract IList<string> GenerateParameterNames (SemanticModel semanticModel, IList<TArgumentSyntax> arguments);
+
+		protected abstract INamedTypeSymbol DetermineTypeToGenerateIn (SemanticModel semanticModel, TSimpleNameSyntax simpleName, CancellationToken cancellationToken);
+
+		protected abstract ITypeSymbol DetermineArgumentType (SemanticModel semanticModel, TArgumentSyntax argument, CancellationToken cancellationToken);
+
+		protected abstract bool IsInCatchDeclaration (TExpressionSyntax expression);
+
+		protected abstract bool IsArrayElementType (TExpressionSyntax expression);
+
+		protected abstract bool IsInVariableTypeContext (TExpressionSyntax expression);
+
+		protected abstract bool IsInValueTypeConstraintContext (SemanticModel semanticModel, TExpressionSyntax expression, CancellationToken cancellationToken);
+
+		protected abstract bool IsInInterfaceList (TExpressionSyntax expression);
+
+		internal abstract bool TryGetBaseList (TExpressionSyntax expression, out TypeKindOptions returnValue);
+
+		internal abstract bool IsPublicOnlyAccessibility (TExpressionSyntax expression, Project project);
+
+		internal abstract bool IsGenericName (TSimpleNameSyntax simpleName);
+
+		internal abstract bool IsSimpleName (TExpressionSyntax expression);
+
+		internal abstract Solution TryAddUsingsOrImportToDocument (Solution updatedSolution, SyntaxNode modifiedRoot, Document document, TSimpleNameSyntax simpleName, string includeUsingsOrImports, CancellationToken cancellationToken);
+
+		protected abstract bool TryGetNameParts (TExpressionSyntax expression, out IList<string> nameParts);
+
+		public abstract string GetRootNamespace (CompilationOptions options);
+
+		public abstract Task<Tuple<INamespaceSymbol, INamespaceOrTypeSymbol, Location>> GetOrGenerateEnclosingNamespaceSymbol (INamedTypeSymbol namedTypeSymbol, string[] containers, Document selectedDocument, SyntaxNode selectedDocumentRoot, CancellationToken cancellationToken);
+
+		public async Task<IEnumerable<CodeAction>> GenerateTypeAsync (
+			Document document,
+			SyntaxNode node,
+			CancellationToken cancellationToken)
+		{
+			//using (Logger.LogBlock (FunctionId.Refactoring_GenerateType, cancellationToken)) {
+				var semanticDocument = await SemanticDocument.CreateAsync (document, cancellationToken).ConfigureAwait (false);
+
+				var state = State.Generate ((TService)this, semanticDocument, node, cancellationToken);
+				if (state != null) {
+					return GetActions (semanticDocument, node, state, cancellationToken);
+				}
+
+				return SpecializedCollections.EmptyEnumerable<CodeAction> ();
+			//}
+		}
+
+		private IEnumerable<CodeAction> GetActions (
+			SemanticDocument document,
+			SyntaxNode node,
+			State state,
+			CancellationToken cancellationToken)
+		{
+			//var generateNewTypeInDialog = false;
+			if (state.NamespaceToGenerateInOpt != null) {
+				var workspace = document.Project.Solution.Workspace;
+				if (workspace == null || workspace.CanApplyChange (ApplyChangesKind.AddDocument)) {
+					//generateNewTypeInDialog = true;
+					yield return new GenerateTypeCodeAction ((TService)this, document.Document, state, intoNamespace: true, inNewFile: true);
+				}
+
+				// If they just are generating "Foo" then we want to offer to generate it into the
+				// namespace in the same file.  However, if they are generating "SomeNS.Foo", then we
+				// only want to allow them to generate if "SomeNS" is the namespace they are
+				// currently in.
+				var isSimpleName = state.SimpleName == state.NameOrMemberAccessExpression;
+				var generateIntoContaining = IsGeneratingIntoContainingNamespace (document, node, state, cancellationToken);
+
+				if ((isSimpleName || generateIntoContaining) &&
+				    CanGenerateIntoContainingNamespace (document, node, state, cancellationToken)) {
+					yield return new GenerateTypeCodeAction ((TService)this, document.Document, state, intoNamespace: true, inNewFile: false);
+				}
+			}
+
+			if (state.TypeToGenerateInOpt != null) {
+				yield return new GenerateTypeCodeAction ((TService)this, document.Document, state, intoNamespace: false, inNewFile: false);
+			}
+
+			//if (generateNewTypeInDialog) {
+			//	yield return new GenerateTypeCodeActionWithOption ((TService)this, document.Document, state);
+			//}
+		}
+
+		private bool CanGenerateIntoContainingNamespace (SemanticDocument document, SyntaxNode node, State state, CancellationToken cancellationToken)
+		{
+			var containingNamespace = document.SemanticModel.GetEnclosingNamespace (node.SpanStart, cancellationToken);
+
+			// Only allow if the containing namespace is one that can be generated
+			// into.  
+			var decl = containingNamespace.GetDeclarations ()
+				.Where (r => r.SyntaxTree == node.SyntaxTree)
+				.Select (r => r.GetSyntax (cancellationToken))
+				.FirstOrDefault (node.GetAncestorsOrThis<SyntaxNode> ().Contains);
+
+			return
+				decl != null &&
+				new CSharpCodeGenerationService (document.Project.Solution.Workspace).CanAddTo (decl, document.Project.Solution, cancellationToken);
+		}
+
+		private bool IsGeneratingIntoContainingNamespace (
+			SemanticDocument document,
+			SyntaxNode node,
+			State state,
+			CancellationToken cancellationToken)
+		{
+			var containingNamespace = document.SemanticModel.GetEnclosingNamespace (node.SpanStart, cancellationToken);
+			if (containingNamespace != null) {
+				var containingNamespaceName = containingNamespace.ToDisplayString ();
+				return containingNamespaceName.Equals (state.NamespaceToGenerateInOpt);
+			}
+
+			return false;
+		}
+
+		protected static string GetTypeName (State state)
+		{
+			const string AttributeSuffix = "Attribute";
+
+			return state.IsAttribute && !state.NameIsVerbatim && !state.Name.EndsWith (AttributeSuffix, StringComparison.Ordinal)
+				? state.Name + AttributeSuffix
+					: state.Name;
+		}
+
+		protected IList<ITypeParameterSymbol> GetTypeParameters (
+			State state,
+			SemanticModel semanticModel,
+			IEnumerable<SyntaxNode> typeArguments,
+			CancellationToken cancellationToken)
+		{
+			var arguments = typeArguments.ToList ();
+			var arity = arguments.Count;
+			var typeParameters = new List<ITypeParameterSymbol> ();
+
+			// For anything that was a type parameter, just use the name (if we haven't already
+			// used it).  Otherwise, synthesize new names for the parameters.
+			var names = new string[arity];
+			var isFixed = new bool[arity];
+			for (var i = 0; i < arity; i++) {
+				var argument = i < arguments.Count ? arguments [i] : null;
+				var type = argument == null ? null : semanticModel.GetTypeInfo (argument, cancellationToken).Type;
+				if (type is ITypeParameterSymbol) {
+					var name = type.Name;
+
+					// If we haven't seen this type parameter already, then we can use this name
+					// and 'fix' it so that it doesn't change. Otherwise, use it, but allow it
+					// to be changed if it collides with anything else.
+					isFixed [i] = !names.Contains (name);
+					names [i] = name;
+					typeParameters.Add ((ITypeParameterSymbol)type);
+				} else {
+					names [i] = "T";
+					typeParameters.Add (null);
+				}
+			}
+
+			// We can use a type parameter as long as it hasn't been used in an outer type.
+			var canUse = state.TypeToGenerateInOpt == null
+				? default(Func<string, bool>)
+				: s => state.TypeToGenerateInOpt.GetAllTypeParameters ().All (t => t.Name != s);
+
+			var uniqueNames = NameGenerator.EnsureUniqueness (names, isFixed, canUse: canUse);
+			for (int i = 0; i < uniqueNames.Count; i++) {
+				if (typeParameters [i] == null || typeParameters [i].Name != uniqueNames [i]) {
+					typeParameters [i] = CodeGenerationSymbolFactory.CreateTypeParameterSymbol (uniqueNames [i]);
+				}
+			}
+
+			return typeParameters;
+		}
+
+		protected Accessibility DetermineDefaultAccessibility (
+			State state,
+			SemanticModel semanticModel,
+			bool intoNamespace,
+			CancellationToken cancellationToken)
+		{
+			if (state.IsPublicAccessibilityForTypeGeneration) {
+				return Accessibility.Public;
+			}
+
+			// If we're a nested type of the type being generated into, then the new type can be
+			// private.  otherwise, it needs to be internal.
+			if (!intoNamespace && state.TypeToGenerateInOpt != null) {
+				var outerTypeSymbol = semanticModel.GetEnclosingNamedType (state.SimpleName.SpanStart, cancellationToken);
+
+				if (outerTypeSymbol != null && outerTypeSymbol.IsContainedWithin (state.TypeToGenerateInOpt)) {
+					return Accessibility.Private;
+				}
+			}
+
+			return Accessibility.Internal;
+		}
+
+		protected IList<ITypeParameterSymbol> GetAvailableTypeParameters (
+			State state,
+			SemanticModel semanticModel,
+			bool intoNamespace,
+			CancellationToken cancellationToken)
+		{
+			var availableInnerTypeParameters = GetTypeParameters (state, semanticModel, cancellationToken);
+			var availableOuterTypeParameters = !intoNamespace && state.TypeToGenerateInOpt != null
+				? state.TypeToGenerateInOpt.GetAllTypeParameters ()
+				: SpecializedCollections.EmptyEnumerable<ITypeParameterSymbol> ();
+
+			return availableOuterTypeParameters.Concat (availableInnerTypeParameters).ToList ();
+		}
+
+		protected bool IsWithinTheImportingNamespace (Document document, int triggeringPosition, string includeUsingsOrImports, CancellationToken cancellationToken)
+		{
+			var semanticModel = document.GetSemanticModelAsync (cancellationToken).WaitAndGetResult (cancellationToken);
+			if (semanticModel != null) {
+				var namespaceSymbol = semanticModel.GetEnclosingNamespace (triggeringPosition, cancellationToken);
+				if (namespaceSymbol != null && namespaceSymbol.ToDisplayString ().StartsWith (includeUsingsOrImports, StringComparison.Ordinal)) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		protected bool GeneratedTypesMustBePublic (Project project)
+		{
+//			var projectInfoService = project.Solution.Workspace.Services.GetService<IProjectInfoService> ();
+//			if (projectInfoService != null) {
+//				return projectInfoService.GeneratedTypesMustBePublic (project);
+//			}
+
+			return false;
+		}
+
+		private class GenerateTypeCodeAction : CodeAction
+		{
+			private readonly bool _intoNamespace;
+			private readonly bool _inNewFile;
+			private readonly TService _service;
+			private readonly Document _document;
+			private readonly State _state;
+			private readonly string _equivalenceKey;
+
+			public GenerateTypeCodeAction (
+				TService service,
+				Document document,
+				State state,
+				bool intoNamespace,
+				bool inNewFile)
+			{
+				_service = service;
+				_document = document;
+				_state = state;
+				_intoNamespace = intoNamespace;
+				_inNewFile = inNewFile;
+				_equivalenceKey = Title;
+			}
+
+			private static string FormatDisplayText (
+				State state,
+				bool inNewFile,
+				string destination)
+			{
+				//var finalName = GetTypeName (state);
+
+				if (inNewFile) {
+					return string.Format (Resources.GenerateForInNewFile,
+						state.IsStruct ? "struct" : state.IsInterface ? "interface" : "class",
+						state.Name, destination);
+				} else {
+					return string.Format (Resources.GenerateForIn,
+						state.IsStruct ? "struct" : state.IsInterface ? "interface" : "class",
+						state.Name, destination);
+				}
+			}
+
+			protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync (CancellationToken cancellationToken)
+			{
+				var semanticDocument = await SemanticDocument.CreateAsync (_document, cancellationToken).ConfigureAwait (false);
+
+				var editor = new Editor ( _service, semanticDocument, _state, _intoNamespace, _inNewFile, cancellationToken: cancellationToken);
+
+				return await editor.GetOperationsAsync ().ConfigureAwait (false);
+			}
+
+			public override string Title {
+				get {
+					if (_intoNamespace) {
+						var namespaceToGenerateIn = string.IsNullOrEmpty (_state.NamespaceToGenerateInOpt) ? Resources.GlobalNamespace : _state.NamespaceToGenerateInOpt;
+						return FormatDisplayText (_state, _inNewFile, namespaceToGenerateIn);
+					} else {
+						return FormatDisplayText (_state, inNewFile: false, destination: _state.TypeToGenerateInOpt.Name);
+					}
+				}
+			}
+
+			public override string EquivalenceKey {
+				get {
+					return _equivalenceKey;
+				}
+			}
+		}
+
+		private class GenerateTypeCodeActionWithOption : CodeActionWithOptions
+		{
+			private readonly TService _service;
+			private readonly Document _document;
+			private readonly State _state;
+
+			internal GenerateTypeCodeActionWithOption (TService service, Document document, State state)
+			{
+				_service = service;
+				_document = document;
+				_state = state;
+			}
+
+			public override string Title {
+				get {
+					return Resources.GenerateNewType;
+				}
+			}
+
+			public override string EquivalenceKey {
+				get {
+					return _state.Name;
+				}
+			}
+
+			public override object GetOptions (CancellationToken cancellationToken)
+			{
+				//var typeKindValue = GetTypeKindOption (_state);
+				var isPublicOnlyAccessibility = IsPublicOnlyAccessibility (_state, _document.Project);
+
+				// TODO : Callback
+				return new GenerateTypeOptionsResult (
+					isPublicOnlyAccessibility ? Accessibility.Public : Accessibility.Internal,
+					TypeKind.Class,
+					_state.Name,
+					_document.Project,
+					true,
+					_state.Name + ".cs",
+					null,
+					null,
+					_document,
+					false
+				);
+				/*
+				//				return generateTypeOptionsService.GetGenerateTypeOptions (
+//					_state.Name,
+					//					new GenerateTypeDialogOptions (isPublicOnlyAccessibility, typeKindValue, _state.IsAttribute),
+//					_document,
+//					notificationService,
+//					projectManagementService,
+//					syntaxFactsService);
+				private class VisualStudioGenerateTypeOptionsService : IGenerateTypeOptionsService
+				{
+					private bool _isNewFile = false;
+					private string _accessSelectString = "";
+					private string _typeKindSelectString = "";
+
+					private IGeneratedCodeRecognitionService _generatedCodeService;
+
+					public VisualStudioGenerateTypeOptionsService(IGeneratedCodeRecognitionService generatedCodeService)
+					{
+						_generatedCodeService = generatedCodeService;
+					}
+
+					public GenerateTypeOptionsResult GetGenerateTypeOptions(
+						string typeName,
+						GenerateTypeDialogOptions generateTypeDialogOptions,
+						Document document,
+						INotificationService notificationService,
+						IProjectManagementService projectManagementService,
+						ISyntaxFactsService syntaxFactsService)
+					{
+						var viewModel = new GenerateTypeDialogViewModel(
+							document,
+							notificationService,
+							projectManagementService,
+							syntaxFactsService,
+							_generatedCodeService,
+							generateTypeDialogOptions,
+							typeName,
+							document.Project.Language == LanguageNames.CSharp ? ".cs" : ".vb",
+							_isNewFile,
+							_accessSelectString,
+							_typeKindSelectString);
+
+						var dialog = new GenerateTypeDialog(viewModel);
+						var result = dialog.ShowModal();
+
+						if (result.HasValue && result.Value)
+						{
+							// Retain choice
+							_isNewFile = viewModel.IsNewFile;
+							_accessSelectString = viewModel.SelectedAccessibilityString;
+							_typeKindSelectString = viewModel.SelectedTypeKindString;
+
+							return new GenerateTypeOptionsResult(
+								accessibility: viewModel.SelectedAccessibility,
+								typeKind: viewModel.SelectedTypeKind,
+								typeName: viewModel.TypeName,
+								project: viewModel.SelectedProject,
+								isNewFile: viewModel.IsNewFile,
+								newFileName: viewModel.FileName.Trim(),
+								folders: viewModel.Folders,
+								fullFilePath: viewModel.FullFilePath,
+								existingDocument: viewModel.SelectedDocument,
+								areFoldersValidIdentifiers: viewModel.AreFoldersValidIdentifiers);
+						}
+						else
+						{
+							return GenerateTypeOptionsResult.Cancelled;
+						}
+					}
+				}
+
+				*/
+			}
+
+			private bool IsPublicOnlyAccessibility (State state, Project project)
+			{
+				return _service.IsPublicOnlyAccessibility (state.NameOrMemberAccessExpression, project) || _service.IsPublicOnlyAccessibility (state.SimpleName, project);
+			}
+
+			private TypeKindOptions GetTypeKindOption (State state)
+			{
+				TypeKindOptions typeKindValue;
+
+				var gotPreassignedTypeOptions = GetPredefinedTypeKindOption (state, out typeKindValue);
+				if (!gotPreassignedTypeOptions) {
+					typeKindValue = state.IsSimpleNameGeneric ? TypeKindOptionsHelper.RemoveOptions (typeKindValue, TypeKindOptions.GenericInCompatibleTypes) : typeKindValue;
+					typeKindValue = state.IsMembersWithModule ? TypeKindOptionsHelper.AddOption (typeKindValue, TypeKindOptions.Module) : typeKindValue;
+					typeKindValue = state.IsInterfaceOrEnumNotAllowedInTypeContext ? TypeKindOptionsHelper.RemoveOptions (typeKindValue, TypeKindOptions.Interface, TypeKindOptions.Enum) : typeKindValue;
+					typeKindValue = state.IsDelegateAllowed ? typeKindValue : TypeKindOptionsHelper.RemoveOptions (typeKindValue, TypeKindOptions.Delegate);
+					typeKindValue = state.IsEnumNotAllowed ? TypeKindOptionsHelper.RemoveOptions (typeKindValue, TypeKindOptions.Enum) : typeKindValue;
+				}
+
+				return typeKindValue;
+			}
+
+			private bool GetPredefinedTypeKindOption (State state, out TypeKindOptions typeKindValueFinal)
+			{
+				if (state.IsAttribute) {
+					typeKindValueFinal = TypeKindOptions.Attribute;
+					return true;
+				}
+
+				TypeKindOptions typeKindValue = TypeKindOptions.None;
+				if (_service.TryGetBaseList (state.NameOrMemberAccessExpression, out typeKindValue) || _service.TryGetBaseList (state.SimpleName, out typeKindValue)) {
+					typeKindValueFinal = typeKindValue;
+					return true;
+				}
+
+				if (state.IsClassInterfaceTypes) {
+					typeKindValueFinal = TypeKindOptions.BaseList;
+					return true;
+				}
+
+				if (state.IsDelegateOnly) {
+					typeKindValueFinal = TypeKindOptions.Delegate;
+					return true;
+				}
+
+				if (state.IsTypeGeneratedIntoNamespaceFromMemberAccess) {
+					typeKindValueFinal = state.IsSimpleNameGeneric ? TypeKindOptionsHelper.RemoveOptions (TypeKindOptions.MemberAccessWithNamespace, TypeKindOptions.GenericInCompatibleTypes) : TypeKindOptions.MemberAccessWithNamespace;
+					typeKindValueFinal = state.IsEnumNotAllowed ? TypeKindOptionsHelper.RemoveOptions (typeKindValueFinal, TypeKindOptions.Enum) : typeKindValueFinal;
+					return true;
+				}
+
+				typeKindValueFinal = TypeKindOptions.AllOptions;
+				return false;
+			}
+
+			protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync (object options, CancellationToken cancellationToken)
+			{
+				IEnumerable<CodeActionOperation> operations = null;
+
+				var generateTypeOptions = options as GenerateTypeOptionsResult;
+				if (generateTypeOptions != null && !generateTypeOptions.IsCancelled) {
+					var semanticDocument = SemanticDocument.CreateAsync (_document, cancellationToken).WaitAndGetResult (cancellationToken);
+					var editor = new Editor (_service, semanticDocument, _state, true, generateTypeOptions, cancellationToken);
+					operations = await editor.GetOperationsAsync ().ConfigureAwait (false);
+				}
+
+				return operations;
+			}
+		}
+
+		protected abstract bool IsConversionImplicit (Compilation compilation, ITypeSymbol sourceType, ITypeSymbol targetType);
+
+		private partial class Editor
+		{
+			private TService _service;
+			private TargetProjectChangeInLanguage _targetProjectChangeInLanguage = TargetProjectChangeInLanguage.NoChange;
+			AbstractGenerateTypeService<TService, TSimpleNameSyntax, TObjectCreationExpressionSyntax, TExpressionSyntax, TTypeDeclarationSyntax, TArgumentSyntax>  _targetLanguageService;
+
+			private readonly SemanticDocument _document;
+			private readonly State _state;
+			private readonly bool _intoNamespace;
+			private readonly bool _inNewFile;
+			private readonly bool _fromDialog;
+			private readonly GenerateTypeOptionsResult _generateTypeOptionsResult;
+			private readonly CancellationToken _cancellationToken;
+
+
+			public Editor (
+				TService service,
+				SemanticDocument document,
+				State state,
+				bool intoNamespace,
+				bool inNewFile,
+				CancellationToken cancellationToken)
+			{
+				_service = service;
+				_document = document;
+				_state = state;
+				_intoNamespace = intoNamespace;
+				_inNewFile = inNewFile;
+				_cancellationToken = cancellationToken;
+			}
+
+			public Editor (
+				TService service,
+				SemanticDocument document,
+				State state,
+				bool fromDialog,
+				GenerateTypeOptionsResult generateTypeOptionsResult,
+				CancellationToken cancellationToken)
+			{
+				_service = service;
+				_document = document;
+				_state = state;
+				_fromDialog = fromDialog;
+				_generateTypeOptionsResult = generateTypeOptionsResult;
+				_cancellationToken = cancellationToken;
+			}
+
+			private enum TargetProjectChangeInLanguage
+			{
+				NoChange,
+				CSharpToVisualBasic,
+				VisualBasicToCSharp
+			}
+
+			internal async Task<IEnumerable<CodeActionOperation>> GetOperationsAsync ()
+			{
+				// Check to see if it is from GFU Dialog
+				if (!_fromDialog) {
+					// Generate the actual type declaration.
+					var namedType = GenerateNamedType ();
+
+					if (_intoNamespace) {
+						if (_inNewFile) {
+							// Generating into a new file is somewhat complicated.
+							var documentName = GetTypeName (_state) + _service.DefaultFileExtension;
+
+							return await GetGenerateInNewFileOperationsAsync (
+								namedType,
+								documentName,
+								null,
+								true,
+								null,
+								_document.Project,
+								_document.Project,
+								isDialog: false).ConfigureAwait (false);
+						} else {
+							return await GetGenerateIntoContainingNamespaceOperationsAsync (namedType).ConfigureAwait (false);
+						}
+					} else {
+						return await GetGenerateIntoTypeOperationsAsync (namedType).ConfigureAwait (false);
+					}
+				} else {
+					var namedType = GenerateNamedType (_generateTypeOptionsResult);
+
+//					// Honor the options from the dialog
+//					// Check to see if the type is requested to be generated in cross language Project
+//					// e.g.: C# -> VB or VB -> C#
+//					if (_document.Project.Language != _generateTypeOptionsResult.Project.Language) {
+//						_targetProjectChangeInLanguage =
+//							_generateTypeOptionsResult.Project.Language == LanguageNames.CSharp
+//							? TargetProjectChangeInLanguage.VisualBasicToCSharp
+//							: TargetProjectChangeInLanguage.CSharpToVisualBasic;
+//
+//						// Get the cross language service
+//						_targetLanguageService = _generateTypeOptionsResult.Project.LanguageServices.GetService<IGenerateTypeService> ();
+//					}
+
+					if (_generateTypeOptionsResult.IsNewFile) {
+						return await GetGenerateInNewFileOperationsAsync (
+							namedType,
+							_generateTypeOptionsResult.NewFileName,
+							_generateTypeOptionsResult.Folders,
+							_generateTypeOptionsResult.AreFoldersValidIdentifiers,
+							_generateTypeOptionsResult.FullFilePath,
+							_generateTypeOptionsResult.Project,
+							_document.Project,
+							isDialog: true).ConfigureAwait (false);
+					} else {
+						return await GetGenerateIntoExistingDocumentAsync (
+							namedType,
+							_document.Project,
+							_generateTypeOptionsResult,
+							isDialog: true).ConfigureAwait (false);
+					}
+				}
+			}
+
+			private string GetNamespaceToGenerateInto ()
+			{
+				var namespaceToGenerateInto = _state.NamespaceToGenerateInOpt.Trim ();
+				var rootNamespace = _service.GetRootNamespace (_document.SemanticModel.Compilation.Options).Trim ();
+				if (!string.IsNullOrWhiteSpace (rootNamespace)) {
+					if (namespaceToGenerateInto == rootNamespace ||
+					    namespaceToGenerateInto.StartsWith (rootNamespace + ".", StringComparison.Ordinal)) {
+						namespaceToGenerateInto = namespaceToGenerateInto.Substring (rootNamespace.Length);
+					}
+				}
+
+				return namespaceToGenerateInto;
+			}
+
+			private string GetNamespaceToGenerateIntoForUsageWithNamespace (Project targetProject, Project triggeringProject)
+			{
+				var namespaceToGenerateInto = _state.NamespaceToGenerateInOpt.Trim ();
+
+				if (targetProject.Language == LanguageNames.CSharp ||
+				    targetProject == triggeringProject) {
+					// If the target project is C# project then we don't have to make any modification to the namespace
+					// or
+					// This is a VB project generation into itself which requires no change as well
+					return namespaceToGenerateInto;
+				}
+
+				// If the target Project is VB then we have to check if the RootNamespace of the VB project is the parent most namespace of the type being generated
+				// True, Remove the RootNamespace
+				// False, Add Global to the Namespace
+				//Contract.Assert (targetProject.Language == LanguageNames.VisualBasic);
+				var targetLanguageService = _targetLanguageService;
+//				if (_document.Project.Language == LanguageNames.VisualBasic) {
+//					targetLanguageService = _service;
+//				} else {
+//					targetLanguageService = _targetLanguageService;
+//				}
+
+				var rootNamespace = targetLanguageService.GetRootNamespace (targetProject.CompilationOptions).Trim ();
+				if (!string.IsNullOrWhiteSpace (rootNamespace)) {
+					var rootNamespaceLength = CheckIfRootNamespacePresentInNamespace (namespaceToGenerateInto, rootNamespace);
+					if (rootNamespaceLength > -1) {
+						// True, Remove the RootNamespace
+						namespaceToGenerateInto = namespaceToGenerateInto.Substring (rootNamespaceLength);
+					} else {
+						// False, Add Global to the Namespace
+						namespaceToGenerateInto = AddGlobalDotToTheNamespace (namespaceToGenerateInto);
+					}
+				} else {
+					// False, Add Global to the Namespace
+					namespaceToGenerateInto = AddGlobalDotToTheNamespace (namespaceToGenerateInto);
+				}
+
+				return namespaceToGenerateInto;
+			}
+
+			private string AddGlobalDotToTheNamespace (string namespaceToBeGenerated)
+			{
+				return "Global." + namespaceToBeGenerated;
+			}
+
+			// Returns the length of the meaningful rootNamespace substring part of namespaceToGenerateInto
+			private int CheckIfRootNamespacePresentInNamespace (string namespaceToGenerateInto, string rootNamespace)
+			{
+				if (namespaceToGenerateInto == rootNamespace) {
+					return rootNamespace.Length;
+				}
+
+				if (namespaceToGenerateInto.StartsWith (rootNamespace + ".", StringComparison.Ordinal)) {
+					return rootNamespace.Length + 1;
+				}
+
+				return -1;
+			}
+
+			private void AddFoldersToNamespaceContainers (List<string> container, IList<string> folders)
+			{
+				// Add the folder as part of the namespace if there are not empty
+				if (folders != null && folders.Count != 0) {
+					// Remove the empty entries and replace the spaces in the folder name to '_'
+					var refinedFolders = folders.Where (n => n != null && !n.IsEmpty ()).Select (n => n.Replace (' ', '_')).ToArray ();
+					container.AddRange (refinedFolders);
+				}
+			}
+
+			private async Task<IEnumerable<CodeActionOperation>> GetGenerateInNewFileOperationsAsync (
+				INamedTypeSymbol namedType,
+				string documentName,
+				IList<string> folders,
+				bool areFoldersValidIdentifiers,
+				string fullFilePath,
+				Project projectToBeUpdated,
+				Project triggeringProject,
+				bool isDialog)
+			{
+				// First, we fork the solution with a new, empty, file in it.  
+				var newDocumentId = DocumentId.CreateNewId (projectToBeUpdated.Id, debugName: documentName);
+				var newSolution = projectToBeUpdated.Solution.AddDocument (newDocumentId, documentName, string.Empty, folders, fullFilePath);
+
+				// Now we get the semantic model for that file we just added.  We do that to get the
+				// root namespace in that new document, along with location for that new namespace.
+				// That way, when we use the code gen service we can say "add this symbol to the
+				// root namespace" and it will pick the one in the new file.
+				var newDocument = newSolution.GetDocument (newDocumentId);
+				var newSemanticModel = await newDocument.GetSemanticModelAsync (_cancellationToken).ConfigureAwait (false);
+				var enclosingNamespace = newSemanticModel.GetEnclosingNamespace (0, _cancellationToken);
+
+				var namespaceContainersAndUsings = GetNamespaceContainersAndAddUsingsOrImport (isDialog, folders, areFoldersValidIdentifiers, projectToBeUpdated, triggeringProject);
+
+				var containers = namespaceContainersAndUsings.Item1;
+				var includeUsingsOrImports = namespaceContainersAndUsings.Item2;
+
+				var rootNamespaceOrType = namedType.GenerateRootNamespaceOrType (containers);
+
+				// Now, actually ask the code gen service to add this namespace or type to the root
+				// namespace in the new file.  This will properly generate the code, and add any
+				// additional niceties like imports/usings.
+				var codeGenResult = await CodeGenerator.AddNamespaceOrTypeDeclarationAsync (
+					                    newSolution,
+					                    enclosingNamespace,
+					                    rootNamespaceOrType,
+					                    new CodeGenerationOptions (newSemanticModel.SyntaxTree.GetLocation (new TextSpan ()), generateDefaultAccessibility: false),
+					                    _cancellationToken).ConfigureAwait (false);
+
+				// containers is determined to be
+				// 1: folders -> if triggered from Dialog
+				// 2: containers -> if triggered not from a Dialog but from QualifiedName
+				// 3: triggering document folder structure -> if triggered not from a Dialog and a SimpleName
+				var adjustedContainer = isDialog ? folders :
+					_state.SimpleName != _state.NameOrMemberAccessExpression ? containers.ToList () : _document.Document.Folders.ToList ();
+
+				// Now, take the code that would be generated and actually create an edit that would
+				// produce a document with that code in it.
+
+				return CreateAddDocumentAndUpdateUsingsOrImportsOperations (
+					projectToBeUpdated,
+					triggeringProject,
+					documentName,
+					await codeGenResult.GetSyntaxRootAsync (_cancellationToken).ConfigureAwait (false),
+					_document.Document,
+					includeUsingsOrImports,
+					adjustedContainer,
+					SourceCodeKind.Regular,
+					_cancellationToken);
+			}
+
+			private IEnumerable<CodeActionOperation> CreateAddDocumentAndUpdateUsingsOrImportsOperations (
+				Project projectToBeUpdated,
+				Project triggeringProject,
+				string documentName,
+				SyntaxNode root,
+				Document generatingDocument,
+				string includeUsingsOrImports,
+				IList<string> containers,
+				SourceCodeKind sourceCodeKind,
+				CancellationToken cancellationToken)
+			{
+				// TODO(cyrusn): make sure documentId is unique.
+				var documentId = DocumentId.CreateNewId (projectToBeUpdated.Id, documentName);
+
+				var updatedSolution = projectToBeUpdated.Solution.AddDocument (DocumentInfo.Create (
+					documentId,
+					documentName,
+					containers,
+					sourceCodeKind,
+					filePath: Path.Combine (Path.GetDirectoryName (generatingDocument.FilePath), documentName)
+				));
+
+				updatedSolution = updatedSolution.WithDocumentSyntaxRoot (documentId, root, PreservationMode.PreserveIdentity);
+
+				// Update the Generating Document with a using if required
+				if (includeUsingsOrImports != null) {
+					updatedSolution = _service.TryAddUsingsOrImportToDocument (updatedSolution, null, _document.Document, _state.SimpleName, includeUsingsOrImports, cancellationToken);
+				}
+
+				// Add reference of the updated project to the triggering Project if they are 2 different projects
+				updatedSolution = AddProjectReference (projectToBeUpdated, triggeringProject, updatedSolution);
+
+				return new CodeActionOperation[] {
+					new ApplyChangesOperation (updatedSolution),
+					new OpenDocumentOperation (documentId)
+				};
+			}
+
+			private static Solution AddProjectReference (Project projectToBeUpdated, Project triggeringProject, Solution updatedSolution)
+			{
+				if (projectToBeUpdated != triggeringProject) {
+					if (!triggeringProject.ProjectReferences.Any (pr => pr.ProjectId == projectToBeUpdated.Id)) {
+						updatedSolution = updatedSolution.AddProjectReference (triggeringProject.Id, new ProjectReference (projectToBeUpdated.Id));
+					}
+				}
+
+				return updatedSolution;
+			}
+
+			private async Task<IEnumerable<CodeActionOperation>> GetGenerateIntoContainingNamespaceOperationsAsync (INamedTypeSymbol namedType)
+			{
+				var enclosingNamespace = _document.SemanticModel.GetEnclosingNamespace (
+					                         _state.SimpleName.SpanStart, _cancellationToken);
+
+				var solution = _document.Project.Solution;
+				var codeGenResult = await CodeGenerator.AddNamedTypeDeclarationAsync (
+					                    solution,
+					                    enclosingNamespace,
+					                    namedType,
+					                    new CodeGenerationOptions (afterThisLocation: _document.SyntaxTree.GetLocation (_state.SimpleName.Span), generateDefaultAccessibility: false),
+					                    _cancellationToken)
+					.ConfigureAwait (false);
+
+				return new CodeActionOperation[] { new ApplyChangesOperation (codeGenResult.Project.Solution) };
+			}
+
+			private async Task<IEnumerable<CodeActionOperation>> GetGenerateIntoExistingDocumentAsync (
+				INamedTypeSymbol namedType,
+				Project triggeringProject,
+				GenerateTypeOptionsResult generateTypeOptionsResult,
+				bool isDialog)
+			{
+				var root = await generateTypeOptionsResult.ExistingDocument.GetSyntaxRootAsync (_cancellationToken).ConfigureAwait (false);
+				var folders = generateTypeOptionsResult.ExistingDocument.Folders;
+
+				var namespaceContainersAndUsings = GetNamespaceContainersAndAddUsingsOrImport (isDialog, new List<string> (folders), generateTypeOptionsResult.AreFoldersValidIdentifiers, generateTypeOptionsResult.Project, triggeringProject);
+
+				var containers = namespaceContainersAndUsings.Item1;
+				var includeUsingsOrImports = namespaceContainersAndUsings.Item2;
+
+				Tuple<INamespaceSymbol, INamespaceOrTypeSymbol, Location> enclosingNamespaceGeneratedTypeToAddAndLocation = null;
+				if (_targetProjectChangeInLanguage == TargetProjectChangeInLanguage.NoChange) {
+					enclosingNamespaceGeneratedTypeToAddAndLocation = _service.GetOrGenerateEnclosingNamespaceSymbol (
+						namedType,
+						containers,
+						generateTypeOptionsResult.ExistingDocument,
+						root,
+						_cancellationToken).WaitAndGetResult (_cancellationToken);
+				} else {
+					enclosingNamespaceGeneratedTypeToAddAndLocation = _targetLanguageService.GetOrGenerateEnclosingNamespaceSymbol (
+						namedType,
+						containers,
+						generateTypeOptionsResult.ExistingDocument,
+						root,
+						_cancellationToken).WaitAndGetResult (_cancellationToken);
+				}
+
+				var solution = _document.Project.Solution;
+				var codeGenResult = await CodeGenerator.AddNamespaceOrTypeDeclarationAsync (
+					                    solution,
+					                    enclosingNamespaceGeneratedTypeToAddAndLocation.Item1,
+					                    enclosingNamespaceGeneratedTypeToAddAndLocation.Item2,
+					                    new CodeGenerationOptions (afterThisLocation: enclosingNamespaceGeneratedTypeToAddAndLocation.Item3, generateDefaultAccessibility: false),
+					                    _cancellationToken)
+					.ConfigureAwait (false);
+				var newRoot = await codeGenResult.GetSyntaxRootAsync (_cancellationToken).ConfigureAwait (false);
+				var updatedSolution = solution.WithDocumentSyntaxRoot (generateTypeOptionsResult.ExistingDocument.Id, newRoot, PreservationMode.PreserveIdentity);
+
+				// Update the Generating Document with a using if required
+				if (includeUsingsOrImports != null) {
+					updatedSolution = _service.TryAddUsingsOrImportToDocument (
+						updatedSolution,
+						generateTypeOptionsResult.ExistingDocument.Id == _document.Document.Id ? newRoot : null,
+						_document.Document,
+						_state.SimpleName,
+						includeUsingsOrImports,
+						_cancellationToken);
+				}
+
+				updatedSolution = AddProjectReference (generateTypeOptionsResult.Project, triggeringProject, updatedSolution);
+
+				return new CodeActionOperation[] { new ApplyChangesOperation (updatedSolution) };
+			}
+
+			private Tuple<string[], string> GetNamespaceContainersAndAddUsingsOrImport (
+				bool isDialog,
+				IList<string> folders,
+				bool areFoldersValidIdentifiers,
+				Project targetProject,
+				Project triggeringProject)
+			{
+				string includeUsingsOrImports = null;
+				if (!areFoldersValidIdentifiers) {
+					folders = SpecializedCollections.EmptyList<string> ();
+				}
+
+				// Now actually create the symbol that we want to add to the root namespace.  The
+				// symbol may either be a named type (if we're not generating into a namespace) or
+				// it may be a namespace symbol.
+				string[] containers = null;
+				if (!isDialog) {
+					// Not generated from the Dialog 
+					containers = GetNamespaceToGenerateInto ().Split (new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
+				} else if (!_service.IsSimpleName (_state.NameOrMemberAccessExpression)) {
+					// If the usage was with a namespace
+					containers = GetNamespaceToGenerateIntoForUsageWithNamespace (targetProject, triggeringProject).Split (new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
+				} else {
+					// Generated from the Dialog
+					List<string> containerList = new List<string> ();
+
+					string rootNamespaceOfTheProjectGeneratedInto;
+
+					if (_targetProjectChangeInLanguage == TargetProjectChangeInLanguage.NoChange) {
+						rootNamespaceOfTheProjectGeneratedInto = _service.GetRootNamespace (_generateTypeOptionsResult.Project.CompilationOptions).Trim ();
+					} else {
+						rootNamespaceOfTheProjectGeneratedInto = _targetLanguageService.GetRootNamespace (_generateTypeOptionsResult.Project.CompilationOptions).Trim ();
+					}
+
+					// TODO : Default namespace support
+					//var projectManagementService = _document.Project.Solution.Workspace.Services.GetService<IProjectManagementService> ();
+					var defaultNamespace = "";// projectManagementService.GetDefaultNamespace (targetProject, targetProject.Solution.Workspace);
+
+					// Case 1 : If the type is generated into the same C# project or
+					// Case 2 : If the type is generated from a C# project to a C# Project
+					// Case 3 : If the Type is generated from a VB Project to a C# Project
+					// Using and Namespace will be the DefaultNamespace + Folder Structure
+					if ((_document.Project == _generateTypeOptionsResult.Project && _document.Project.Language == LanguageNames.CSharp) ||
+					    (_targetProjectChangeInLanguage == TargetProjectChangeInLanguage.NoChange && _generateTypeOptionsResult.Project.Language == LanguageNames.CSharp) ||
+					    _targetProjectChangeInLanguage == TargetProjectChangeInLanguage.VisualBasicToCSharp) {
+						if (!string.IsNullOrWhiteSpace (defaultNamespace)) {
+							containerList.Add (defaultNamespace);
+						}
+
+						// Populate the ContainerList
+						AddFoldersToNamespaceContainers (containerList, folders);
+
+						containers = containerList.ToArray ();
+						includeUsingsOrImports = string.Join (".", containerList.ToArray ());
+					}
+
+					// Case 4 : If the type is generated into the same VB project or
+					// Case 5 : If Type is generated from a VB Project to VB Project
+					// Case 6 : If Type is generated from a C# Project to VB Project 
+					// Namespace will be Folder Structure and Import will have the RootNamespace of the project generated into as part of the Imports
+					if ((_document.Project == _generateTypeOptionsResult.Project && _document.Project.Language == LanguageNames.VisualBasic) ||
+					    (_document.Project != _generateTypeOptionsResult.Project && _targetProjectChangeInLanguage == TargetProjectChangeInLanguage.NoChange && _generateTypeOptionsResult.Project.Language == LanguageNames.VisualBasic) ||
+					    _targetProjectChangeInLanguage == TargetProjectChangeInLanguage.CSharpToVisualBasic) {
+						// Populate the ContainerList
+						AddFoldersToNamespaceContainers (containerList, folders);
+						containers = containerList.ToArray ();
+						includeUsingsOrImports = string.Join (".", containerList.ToArray ());
+						if (!string.IsNullOrWhiteSpace (rootNamespaceOfTheProjectGeneratedInto)) {
+							includeUsingsOrImports = string.IsNullOrEmpty (includeUsingsOrImports) ?
+								rootNamespaceOfTheProjectGeneratedInto :
+								rootNamespaceOfTheProjectGeneratedInto + "." + includeUsingsOrImports;
+						}
+					}
+				}
+
+				return Tuple.Create (containers, includeUsingsOrImports);
+			}
+
+			private async Task<IEnumerable<CodeActionOperation>> GetGenerateIntoTypeOperationsAsync (INamedTypeSymbol namedType)
+			{
+				//var codeGenService = GetCodeGenerationService ();
+				var solution = _document.Project.Solution;
+				var codeGenResult = await CodeGenerator.AddNamedTypeDeclarationAsync (
+					                    solution,
+					                    _state.TypeToGenerateInOpt,
+					                    namedType,
+					                    new CodeGenerationOptions (contextLocation: _state.SimpleName.GetLocation (), generateDefaultAccessibility: false),
+					                    _cancellationToken)
+					.ConfigureAwait (false);
+
+				return new CodeActionOperation[] { new ApplyChangesOperation (codeGenResult.Project.Solution) };
+			}
+
+			private IList<ITypeSymbol> GetArgumentTypes (IList<TArgumentSyntax> argumentList)
+			{
+				var types = argumentList.Select (a => _service.DetermineArgumentType (_document.SemanticModel, a, _cancellationToken));
+				return types.Select (FixType).ToList ();
+			}
+
+			private ITypeSymbol FixType (
+				ITypeSymbol typeSymbol)
+			{
+				var compilation = _document.SemanticModel.Compilation;
+				return typeSymbol.RemoveUnnamedErrorTypes (compilation);
+			}
+
+			private CSharpCodeGenerationService GetCodeGenerationService ()
+			{
+				var language = _state.TypeToGenerateInOpt == null
+					? _state.SimpleName.Language
+					: _state.TypeToGenerateInOpt.Language;
+				return new CSharpCodeGenerationService(_document.Project.Solution.Workspace, language);
+			}
+
+			private bool TryFindMatchingField (
+				string parameterName,
+				ITypeSymbol parameterType,
+				Dictionary<string, ISymbol> parameterToFieldMap,
+				bool caseSensitive)
+			{
+				// If the base types have an accessible field or property with the same name and
+				// an acceptable type, then we should just defer to that.
+				if (_state.BaseTypeOrInterfaceOpt != null) {
+					var comparison = caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
+					var query =
+						_state.BaseTypeOrInterfaceOpt
+							.GetBaseTypesAndThis ()
+							.SelectMany (t => t.GetMembers ())
+							.Where (s => s.Name.Equals (parameterName, comparison));
+					var symbol = query.FirstOrDefault (IsSymbolAccessible);
+
+					if (IsViableFieldOrProperty (parameterType, symbol)) {
+						parameterToFieldMap [parameterName] = symbol;
+						return true;
+					}
+				}
+
+				return false;
+			}
+
+			private bool IsViableFieldOrProperty (
+				ITypeSymbol parameterType,
+				ISymbol symbol)
+			{
+				if (symbol != null && !symbol.IsStatic && parameterType.Language == symbol.Language) {
+					if (symbol is IFieldSymbol) {
+						var field = (IFieldSymbol)symbol;
+						return
+							!field.IsReadOnly &&
+						_service.IsConversionImplicit (_document.SemanticModel.Compilation, parameterType, field.Type);
+					} else if (symbol is IPropertySymbol) {
+						var property = (IPropertySymbol)symbol;
+						return
+							property.Parameters.Length == 0 &&
+						property.SetMethod != null &&
+						IsSymbolAccessible (property.SetMethod) &&
+						_service.IsConversionImplicit (_document.SemanticModel.Compilation, parameterType, property.Type);
+					}
+				}
+
+				return false;
+			}
+
+			private bool IsSymbolAccessible (ISymbol symbol)
+			{
+				// Public and protected constructors are accessible.  Internal constructors are
+				// accessible if we have friend access.  We can't call the normal accessibility
+				// checkers since they will think that a protected constructor isn't accessible
+				// (since we don't have the destination type that would have access to them yet).
+				switch (symbol.DeclaredAccessibility) {
+				case Accessibility.ProtectedOrInternal:
+				case Accessibility.Protected:
+				case Accessibility.Public:
+					return true;
+				case Accessibility.ProtectedAndInternal:
+				case Accessibility.Internal:
+					// TODO: Code coverage
+					return _document.SemanticModel.Compilation.Assembly.IsSameAssemblyOrHasFriendAccessTo (
+						symbol.ContainingAssembly);
+
+				default:
+					return false;
+				}
+			}
+		}
+
+		internal abstract IMethodSymbol GetDelegatingConstructor (TObjectCreationExpressionSyntax objectCreation, INamedTypeSymbol namedType, SemanticModel model, ISet<IMethodSymbol> candidates, CancellationToken cancellationToken);
+
+		private partial class Editor
+		{
+			private INamedTypeSymbol GenerateNamedType ()
+			{
+				return CodeGenerationSymbolFactory.CreateNamedTypeSymbol (
+					DetermineAttributes (),
+					DetermineAccessibility (),
+					DetermineModifiers (),
+					DetermineTypeKind (),
+					DetermineName (),
+					DetermineTypeParameters (),
+					DetermineBaseType (),
+					DetermineInterfaces (),
+					members: DetermineMembers ());
+			}
+
+			private INamedTypeSymbol GenerateNamedType (GenerateTypeOptionsResult options)
+			{
+				if (options.TypeKind == TypeKind.Delegate) {
+					return CodeGenerationSymbolFactory.CreateDelegateTypeSymbol (
+						DetermineAttributes (),
+						options.Accessibility,
+						DetermineModifiers (),
+						DetermineReturnType (options),
+						options.TypeName,
+						DetermineTypeParameters (options),
+						DetermineParameters (options));
+				}
+
+				return CodeGenerationSymbolFactory.CreateNamedTypeSymbol (
+					DetermineAttributes (),
+					options.Accessibility,
+					DetermineModifiers (),
+					options.TypeKind,
+					options.TypeName,
+					DetermineTypeParameters (),
+					DetermineBaseType (),
+					DetermineInterfaces (),
+					members: DetermineMembers (options));
+			}
+
+			private ITypeSymbol DetermineReturnType (GenerateTypeOptionsResult options)
+			{
+				if (_state.DelegateMethodSymbol == null ||
+				    _state.DelegateMethodSymbol.ReturnType == null ||
+				    _state.DelegateMethodSymbol.ReturnType is IErrorTypeSymbol) {
+					// Since we cannot determine the return type, we are returning void
+					return _state.Compilation.GetSpecialType (SpecialType.System_Void);
+				} else {
+					return _state.DelegateMethodSymbol.ReturnType;
+				}
+			}
+
+			private IList<ITypeParameterSymbol> DetermineTypeParameters (GenerateTypeOptionsResult options)
+			{
+				if (_state.DelegateMethodSymbol != null) {
+					return _state.DelegateMethodSymbol.TypeParameters;
+				}
+
+				// If the delegate symbol cannot be determined then 
+				return DetermineTypeParameters ();
+			}
+
+			private IList<IParameterSymbol> DetermineParameters (GenerateTypeOptionsResult options)
+			{
+				if (_state.DelegateMethodSymbol != null) {
+					return _state.DelegateMethodSymbol.Parameters;
+				}
+
+				return null;
+			}
+
+			private IList<ISymbol> DetermineMembers (GenerateTypeOptionsResult options = null)
+			{
+				var members = new List<ISymbol> ();
+				AddMembers (members, options);
+
+				if (_state.IsException) {
+					AddExceptionConstructors (members);
+				}
+
+				return members;
+			}
+
+			private void AddMembers (IList<ISymbol> members, GenerateTypeOptionsResult options = null)
+			{
+				AddProperties (members);
+
+				IList<TArgumentSyntax> argumentList;
+				if (!_service.TryGetArgumentList (_state.ObjectCreationExpressionOpt, out argumentList)) {
+					return;
+				}
+
+				var parameterTypes = GetArgumentTypes (argumentList);
+
+				// Don't generate this constructor if it would conflict with a default exception
+				// constructor.  Default exception constructors will be added automatically by our
+				// caller.
+				if (_state.IsException &&
+				    _state.BaseTypeOrInterfaceOpt.InstanceConstructors.Any (
+					    c => c.Parameters.Select (p => p.Type).SequenceEqual (parameterTypes))) {
+					return;
+				}
+
+				// If there's an accessible base constructor that would accept these types, then
+				// just call into that instead of generating fields.
+				if (_state.BaseTypeOrInterfaceOpt != null) {
+					if (_state.BaseTypeOrInterfaceOpt.TypeKind == TypeKind.Interface && argumentList.Count == 0) {
+						// No need to add the default constructor if our base type is going to be
+						// 'object'.  We get that constructor for free.
+						return;
+					}
+
+					var accessibleInstanceConstructors = _state.BaseTypeOrInterfaceOpt.InstanceConstructors.Where (
+						                                     IsSymbolAccessible).ToSet ();
+
+					if (accessibleInstanceConstructors.Any ()) {
+						var delegatedConstructor = _service.GetDelegatingConstructor (_state.ObjectCreationExpressionOpt, _state.BaseTypeOrInterfaceOpt, _document.SemanticModel, accessibleInstanceConstructors, _cancellationToken);
+						if (delegatedConstructor != null) {
+							// There was a best match.  Call it directly.  
+							AddBaseDelegatingConstructor (delegatedConstructor, members);
+							return;
+						}
+					}
+				}
+
+				// Otherwise, just generate a normal constructor that assigns any provided
+				// parameters into fields.
+				AddFieldDelegatingConstructor (argumentList, members, options);
+			}
+
+			private void AddProperties (IList<ISymbol> members)
+			{
+				foreach (var property in _state.PropertiesToGenerate) {
+					IPropertySymbol generatedProperty;
+					if (_service.TryGenerateProperty (property, _document.SemanticModel, _cancellationToken, out generatedProperty)) {
+						members.Add (generatedProperty);
+					}
+				}
+			}
+
+			private void AddBaseDelegatingConstructor (
+				IMethodSymbol methodSymbol,
+				IList<ISymbol> members)
+			{
+				// If we're generating a constructor to delegate into the no-param base constructor
+				// then we can just elide the constructor entirely.
+				if (methodSymbol.Parameters.Length == 0) {
+					return;
+				}
+
+				var factory = _document.Project.LanguageServices.GetService<SyntaxGenerator> ();
+				members.Add (factory.CreateBaseDelegatingConstructor (
+					methodSymbol, DetermineName ()));
+			}
+
+			private void AddFieldDelegatingConstructor (
+				IList<TArgumentSyntax> argumentList, IList<ISymbol> members, GenerateTypeOptionsResult options = null)
+			{
+				var factory = _document.Project.LanguageServices.GetService<SyntaxGenerator> ();
+
+				var availableTypeParameters = _service.GetAvailableTypeParameters (_state, _document.SemanticModel, _intoNamespace, _cancellationToken);
+				var parameterTypes = GetArgumentTypes (argumentList);
+				var parameterNames = _service.GenerateParameterNames (_document.SemanticModel, argumentList);
+				var parameters = new List<IParameterSymbol> ();
+
+				var parameterToExistingFieldMap = new Dictionary<string, ISymbol> ();
+				var parameterToNewFieldMap = new Dictionary<string, string> ();
+
+				for (var i = 0; i < parameterNames.Count; i++) {
+					var refKind = argumentList [i].GetRefKindOfArgument ();
+
+					var parameterName = parameterNames [i];
+					var parameterType = (ITypeSymbol)parameterTypes [i];
+					parameterType = parameterType.RemoveUnavailableTypeParameters (
+						_document.SemanticModel.Compilation, availableTypeParameters);
+
+					if (!TryFindMatchingField (parameterName, parameterType, parameterToExistingFieldMap, caseSensitive: true)) {
+						if (!TryFindMatchingField (parameterName, parameterType, parameterToExistingFieldMap, caseSensitive: false)) {
+							parameterToNewFieldMap [parameterName] = parameterName;
+						}
+					}
+
+					parameters.Add (CodeGenerationSymbolFactory.CreateParameterSymbol (
+						attributes: null,
+						refKind: refKind,
+						isParams: false,
+						type: parameterType,
+						name: parameterName));
+				}
+
+				// Empty Constructor for Struct is not allowed
+				if (!(parameters.Count == 0 && options != null && (options.TypeKind == TypeKind.Struct || options.TypeKind == TypeKind.Structure))) {
+					var symbols = factory.CreateFieldDelegatingConstructor (DetermineName (), null, parameters, parameterToExistingFieldMap, parameterToNewFieldMap, _cancellationToken);
+					foreach (var c in symbols)
+						members.Add (c);
+				}
+			}
+
+			private void AddExceptionConstructors (IList<ISymbol> members)
+			{
+				var factory = _document.Project.LanguageServices.GetService<SyntaxGenerator> ();
+				var exceptionType = _document.SemanticModel.Compilation.ExceptionType ();
+				var constructors =
+					exceptionType.InstanceConstructors
+						.Where (c => c.DeclaredAccessibility == Accessibility.Public || c.DeclaredAccessibility == Accessibility.Protected)
+						.Select (c => CodeGenerationSymbolFactory.CreateConstructorSymbol (
+						attributes: null,
+						accessibility: c.DeclaredAccessibility,
+						modifiers: default(DeclarationModifiers),
+						typeName: DetermineName (),
+						parameters: c.Parameters,
+						statements: null,
+						baseConstructorArguments: c.Parameters.Length == 0 ? null : factory.CreateArguments (c.Parameters)));
+				foreach (var c in constructors)
+					members.Add (c);
+			}
+
+			private IList<AttributeData> DetermineAttributes ()
+			{
+				if (_state.IsException) {
+					var serializableType = _document.SemanticModel.Compilation.SerializableAttributeType ();
+					if (serializableType != null) {
+						var attribute = CodeGenerationSymbolFactory.CreateAttributeData (serializableType);
+						return new[] { attribute };
+					}
+				}
+
+				return null;
+			}
+
+			private Accessibility DetermineAccessibility ()
+			{
+				return _service.GetAccessibility (_state, _document.SemanticModel, _intoNamespace, _cancellationToken);
+			}
+
+			private DeclarationModifiers DetermineModifiers ()
+			{
+				return default(DeclarationModifiers);
+			}
+
+			private INamedTypeSymbol DetermineBaseType ()
+			{
+				if (_state.BaseTypeOrInterfaceOpt == null || _state.BaseTypeOrInterfaceOpt.TypeKind == TypeKind.Interface) {
+					return null;
+				}
+
+				return RemoveUnavailableTypeParameters (_state.BaseTypeOrInterfaceOpt);
+			}
+
+			private IList<INamedTypeSymbol> DetermineInterfaces ()
+			{
+				if (_state.BaseTypeOrInterfaceOpt != null && _state.BaseTypeOrInterfaceOpt.TypeKind == TypeKind.Interface) {
+					var type = RemoveUnavailableTypeParameters (_state.BaseTypeOrInterfaceOpt);
+					if (type != null) {
+						return new[] { type };
+					}
+				}
+
+				return SpecializedCollections.EmptyList<INamedTypeSymbol> ();
+			}
+
+			private INamedTypeSymbol RemoveUnavailableTypeParameters (INamedTypeSymbol type)
+			{
+				return type.RemoveUnavailableTypeParameters (
+					_document.SemanticModel.Compilation, GetAvailableTypeParameters ()) as INamedTypeSymbol;
+			}
+
+			private string DetermineName ()
+			{
+				return GetTypeName (_state);
+			}
+
+			private IList<ITypeParameterSymbol> DetermineTypeParameters ()
+			{
+				return _service.GetTypeParameters (_state, _document.SemanticModel, _cancellationToken);
+			}
+
+			private TypeKind DetermineTypeKind ()
+			{
+				return _state.IsStruct
+					? TypeKind.Struct
+						: _state.IsInterface
+					? TypeKind.Interface
+						: TypeKind.Class;
+			}
+
+			protected IList<ITypeParameterSymbol> GetAvailableTypeParameters ()
+			{
+				var availableInnerTypeParameters = _service.GetTypeParameters (_state, _document.SemanticModel, _cancellationToken);
+				var availableOuterTypeParameters = !_intoNamespace && _state.TypeToGenerateInOpt != null
+					? _state.TypeToGenerateInOpt.GetAllTypeParameters ()
+					: SpecializedCollections.EmptyEnumerable<ITypeParameterSymbol> ();
+
+				return availableOuterTypeParameters.Concat (availableInnerTypeParameters).ToList ();
+			}
+		}
+
+		internal abstract bool TryGenerateProperty (TSimpleNameSyntax propertyName, SemanticModel semanticModel, CancellationToken cancellationToken, out IPropertySymbol property);
+
+		protected class State
+		{
+			public string Name { get; private set; }
+
+			public bool NameIsVerbatim { get; private set; }
+
+			// The name node that we're on.  Will be used to the name the type if it's
+			// generated.
+			public TSimpleNameSyntax SimpleName { get; private set; }
+
+			// The entire expression containing the name, not including the creation.  i.e. "X.Foo"
+			// in "new X.Foo()".
+			public TExpressionSyntax NameOrMemberAccessExpression { get; private set; }
+
+			// The object creation node if we have one.  i.e. if we're on the 'Foo' in "new X.Foo()".
+			public TObjectCreationExpressionSyntax ObjectCreationExpressionOpt { get; private set; }
+
+			// One of these will be non null.  It's also possible for both to be non null. For
+			// example, if you have "class C { Foo f; }", then "Foo" can be generated inside C or
+			// inside the global namespace.  The namespace can be null or the type can be null if the
+			// user has something like "ExistingType.NewType" or "ExistingNamespace.NewType".  In
+			// that case they're being explicit about what they want to generate into.
+			public INamedTypeSymbol TypeToGenerateInOpt { get; private set; }
+
+			public string NamespaceToGenerateInOpt { get; private set; }
+
+			// If we can infer a base type or interface for this type.
+			//
+			// i.e.: "IList<int> foo = new MyList();"
+			public INamedTypeSymbol BaseTypeOrInterfaceOpt { get; private set; }
+
+			public bool IsInterface { get; private set; }
+
+			public bool IsStruct { get; private set; }
+
+			public bool IsAttribute { get; private set; }
+
+			public bool IsException { get; private set; }
+
+			public bool IsMembersWithModule { get; private set; }
+
+			public bool IsTypeGeneratedIntoNamespaceFromMemberAccess { get; private set; }
+
+			public bool IsSimpleNameGeneric { get; private set; }
+
+			public bool IsPublicAccessibilityForTypeGeneration { get; private set; }
+
+			public bool IsInterfaceOrEnumNotAllowedInTypeContext { get; private set; }
+
+			public IMethodSymbol DelegateMethodSymbol { get; private set; }
+
+			public bool IsDelegateAllowed { get; private set; }
+
+			public bool IsEnumNotAllowed { get; private set; }
+
+			public Compilation Compilation { get; }
+
+			public bool IsDelegateOnly { get; private set; }
+
+			public bool IsClassInterfaceTypes { get; private set; }
+
+			public List<TSimpleNameSyntax> PropertiesToGenerate { get; private set; }
+
+			private State (Compilation compilation)
+			{
+				this.Compilation = compilation;
+			}
+
+			public static State Generate (
+				TService service,
+				SemanticDocument document,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				var state = new State (document.SemanticModel.Compilation);
+				if (!state.TryInitialize (service, document, node, cancellationToken)) {
+					return null;
+				}
+
+				return state;
+			}
+
+			private bool TryInitialize (
+				TService service,
+				SemanticDocument document,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				if (!(node is TSimpleNameSyntax)) {
+					return false;
+				}
+
+				this.SimpleName = (TSimpleNameSyntax)node;
+				string name;
+				int arity;
+				this.SimpleName.GetNameAndArityOfSimpleName (out name, out arity);
+
+				this.Name = name;
+				this.NameIsVerbatim = this.SimpleName.GetFirstToken ().IsVerbatimIdentifier ();
+				if (string.IsNullOrWhiteSpace (this.Name)) {
+					return false;
+				}
+
+				// We only support simple names or dotted names.  i.e. "(some + expr).Foo" is not a
+				// valid place to generate a type for Foo.
+				GenerateTypeServiceStateOptions generateTypeServiceStateOptions;
+				if (!service.TryInitializeState (document, this.SimpleName, cancellationToken, out generateTypeServiceStateOptions)) {
+					return false;
+				}
+
+				this.NameOrMemberAccessExpression = generateTypeServiceStateOptions.NameOrMemberAccessExpression;
+				this.ObjectCreationExpressionOpt = generateTypeServiceStateOptions.ObjectCreationExpressionOpt;
+
+				var semanticModel = document.SemanticModel;
+				var info = semanticModel.GetSymbolInfo (this.SimpleName, cancellationToken);
+				if (info.Symbol != null) {
+					// This bound, so no need to generate anything.
+					return false;
+				}
+
+				if (!semanticModel.IsTypeContext (this.NameOrMemberAccessExpression.SpanStart, cancellationToken) &&
+					!semanticModel.IsExpressionContext (this.NameOrMemberAccessExpression.SpanStart, cancellationToken) &&
+					!semanticModel.IsStatementContext (this.NameOrMemberAccessExpression.SpanStart, cancellationToken) &&
+					!semanticModel.IsNameOfContext (this.NameOrMemberAccessExpression.SpanStart, cancellationToken) &&
+					!semanticModel.IsNamespaceContext (this.NameOrMemberAccessExpression.SpanStart, cancellationToken)) {
+					return false;
+				}
+
+				// If this isn't something that can be created, then don't bother offering to create
+				// it.
+				if (info.CandidateReason == CandidateReason.NotCreatable) {
+					return false;
+				}
+
+				if (info.CandidateReason == CandidateReason.Inaccessible ||
+				   info.CandidateReason == CandidateReason.NotReferencable ||
+				   info.CandidateReason == CandidateReason.OverloadResolutionFailure) {
+					// We bound to something inaccessible, or overload resolution on a 
+					// constructor call failed.  Don't want to offer GenerateType here.
+					return false;
+				}
+
+				if (this.ObjectCreationExpressionOpt != null) {
+					// If we're new'ing up something illegal, then don't offer generate type.
+					var typeInfo = semanticModel.GetTypeInfo (this.ObjectCreationExpressionOpt, cancellationToken);
+					if (typeInfo.Type.IsModuleType ()) {
+						return false;
+					}
+				}
+
+				DetermineNamespaceOrTypeToGenerateIn (service, document, cancellationToken);
+
+				// Now, try to infer a possible base type for this new class/interface.
+				this.InferBaseType (service, document, cancellationToken);
+				this.IsInterface = GenerateInterface (service, cancellationToken);
+				this.IsStruct = GenerateStruct (service, semanticModel, cancellationToken);
+				this.IsAttribute = this.BaseTypeOrInterfaceOpt != null && this.BaseTypeOrInterfaceOpt.Equals (semanticModel.Compilation.AttributeType ());
+				this.IsException = this.BaseTypeOrInterfaceOpt != null && this.BaseTypeOrInterfaceOpt.Equals (semanticModel.Compilation.ExceptionType ());
+				this.IsMembersWithModule = generateTypeServiceStateOptions.IsMembersWithModule;
+				this.IsTypeGeneratedIntoNamespaceFromMemberAccess = generateTypeServiceStateOptions.IsTypeGeneratedIntoNamespaceFromMemberAccess;
+				this.IsInterfaceOrEnumNotAllowedInTypeContext = generateTypeServiceStateOptions.IsInterfaceOrEnumNotAllowedInTypeContext;
+				this.IsDelegateAllowed = generateTypeServiceStateOptions.IsDelegateAllowed;
+				this.IsDelegateOnly = generateTypeServiceStateOptions.IsDelegateOnly;
+				this.IsEnumNotAllowed = generateTypeServiceStateOptions.IsEnumNotAllowed;
+				this.DelegateMethodSymbol = generateTypeServiceStateOptions.DelegateCreationMethodSymbol;
+				this.IsClassInterfaceTypes = generateTypeServiceStateOptions.IsClassInterfaceTypes;
+				this.IsSimpleNameGeneric = service.IsGenericName (this.SimpleName);
+				this.PropertiesToGenerate = generateTypeServiceStateOptions.PropertiesToGenerate;
+
+				if (this.IsAttribute && this.TypeToGenerateInOpt.GetAllTypeParameters ().Any ()) {
+					this.TypeToGenerateInOpt = null;
+				}
+
+				return this.TypeToGenerateInOpt != null || this.NamespaceToGenerateInOpt != null;
+			}
+
+			private void InferBaseType (
+				TService service,
+				SemanticDocument document,
+				CancellationToken cancellationToken)
+			{
+				// See if we can find a possible base type for the type being generated.
+				// NOTE(cyrusn): I currently limit this to when we have an object creation node.
+				// That's because that's when we would have an expression that could be conerted to
+				// somethign else.  i.e. if the user writes "IList<int> list = new Foo()" then we can
+				// infer a base interface for 'Foo'.  However, if they write "IList<int> list = Foo"
+				// then we don't really want to infer a base type for 'Foo'.
+
+				// However, there are a few other cases were we can infer a base type.
+				if (service.IsInCatchDeclaration (this.NameOrMemberAccessExpression)) {
+					this.BaseTypeOrInterfaceOpt = document.SemanticModel.Compilation.ExceptionType ();
+				} else if (NameOrMemberAccessExpression.IsAttributeName ()) {
+					this.BaseTypeOrInterfaceOpt = document.SemanticModel.Compilation.AttributeType ();
+				} else if (
+					service.IsArrayElementType (this.NameOrMemberAccessExpression) ||
+					service.IsInVariableTypeContext (this.NameOrMemberAccessExpression) ||
+					this.ObjectCreationExpressionOpt != null) {
+					var expr = this.ObjectCreationExpressionOpt ?? this.NameOrMemberAccessExpression;
+					var baseType = TypeGuessing.typeInferenceService.InferType (document.SemanticModel, expr, objectAsDefault: true, cancellationToken: cancellationToken) as INamedTypeSymbol;
+					SetBaseType (baseType);
+				}
+			}
+
+			private void SetBaseType (INamedTypeSymbol baseType)
+			{
+				if (baseType == null) {
+					return;
+				}
+
+				// A base type need to be non class or interface type.  Also, being 'object' is
+				// redundant as the base type.  
+				if (baseType.IsSealed || baseType.IsStatic || baseType.SpecialType == SpecialType.System_Object) {
+					return;
+				}
+
+				if (baseType.TypeKind != TypeKind.Class && baseType.TypeKind != TypeKind.Interface) {
+					return;
+				}
+
+				this.BaseTypeOrInterfaceOpt = baseType;
+			}
+
+			private bool GenerateStruct (TService service, SemanticModel semanticModel, CancellationToken cancellationToken)
+			{
+				return service.IsInValueTypeConstraintContext (semanticModel, this.NameOrMemberAccessExpression, cancellationToken);
+			}
+
+			private bool GenerateInterface (
+				TService service,
+				CancellationToken cancellationToken)
+			{
+				if (!this.IsAttribute &&
+				   !this.IsException &&
+				   this.Name.LooksLikeInterfaceName () &&
+				   this.ObjectCreationExpressionOpt == null &&
+				   (this.BaseTypeOrInterfaceOpt == null || this.BaseTypeOrInterfaceOpt.TypeKind == TypeKind.Interface)) {
+					return true;
+				}
+
+				return service.IsInInterfaceList (this.NameOrMemberAccessExpression);
+			}
+
+			private void DetermineNamespaceOrTypeToGenerateIn (
+				TService service,
+				SemanticDocument document,
+				CancellationToken cancellationToken)
+			{
+				DetermineNamespaceOrTypeToGenerateInWorker (service, document.SemanticModel, cancellationToken);
+
+				// Can only generate into a type if it's a class and it's from source.
+				if (this.TypeToGenerateInOpt != null) {
+					if (this.TypeToGenerateInOpt.TypeKind != TypeKind.Class &&
+					   this.TypeToGenerateInOpt.TypeKind != TypeKind.Module) {
+						this.TypeToGenerateInOpt = null;
+					} else {
+						var symbol = SymbolFinder.FindSourceDefinitionAsync (this.TypeToGenerateInOpt, document.Project.Solution, cancellationToken).WaitAndGetResult (cancellationToken);
+						if (symbol == null ||
+						   !symbol.IsKind (SymbolKind.NamedType) ||
+						   !symbol.Locations.Any (loc => loc.IsInSource)) {
+							this.TypeToGenerateInOpt = null;
+							return;
+						}
+
+						var sourceTreeToBeGeneratedIn = symbol.Locations.First (loc => loc.IsInSource).SourceTree;
+						var documentToBeGeneratedIn = document.Project.Solution.GetDocument (sourceTreeToBeGeneratedIn);
+
+						if (documentToBeGeneratedIn == null) {
+							this.TypeToGenerateInOpt = null;
+							return;
+						}
+
+						// If the 2 documents are in different project then we must have Public Accessibility.
+						// If we are generating in a website project, we also want to type to be public so the 
+						// designer files can access the type.
+						if (documentToBeGeneratedIn.Project != document.Project ||
+						   service.GeneratedTypesMustBePublic (documentToBeGeneratedIn.Project)) {
+							this.IsPublicAccessibilityForTypeGeneration = true;
+						}
+
+						this.TypeToGenerateInOpt = (INamedTypeSymbol)symbol;
+					}
+				}
+
+				if (this.TypeToGenerateInOpt != null) {
+					if (!CodeGenerator.CanAdd (document.Project.Solution, this.TypeToGenerateInOpt, cancellationToken)) {
+						this.TypeToGenerateInOpt = null;
+					}
+				}
+			}
+
+			private bool DetermineNamespaceOrTypeToGenerateInWorker (
+				TService service,
+				SemanticModel semanticModel,
+				CancellationToken cancellationToken)
+			{
+				// If we're on the right of a dot, see if we can figure out what's on the left.  If
+				// it doesn't bind to a type or a namespace, then we can't proceed.
+				if (this.SimpleName != this.NameOrMemberAccessExpression) {
+					return DetermineNamespaceOrTypeToGenerateIn (
+						service, semanticModel,
+						service.GetLeftSideOfDot (this.SimpleName), cancellationToken);
+				} else {
+					// The name is standing alone.  We can either generate the type into our
+					// containing type, or into our containing namespace.
+					//
+					// TODO(cyrusn): We need to make this logic work if the type is in the
+					// base/interface list of a type.
+					var format = SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle (SymbolDisplayGlobalNamespaceStyle.Omitted);
+					this.TypeToGenerateInOpt = service.DetermineTypeToGenerateIn (semanticModel, this.SimpleName, cancellationToken);
+					if (this.TypeToGenerateInOpt != null) {
+						this.NamespaceToGenerateInOpt = this.TypeToGenerateInOpt.ContainingNamespace.ToDisplayString (format);
+					} else {
+						var namespaceSymbol = semanticModel.GetEnclosingNamespace (this.SimpleName.SpanStart, cancellationToken);
+						if (namespaceSymbol != null) {
+							this.NamespaceToGenerateInOpt = namespaceSymbol.ToDisplayString (format);
+						}
+					}
+				}
+
+				return true;
+			}
+
+			private bool DetermineNamespaceOrTypeToGenerateIn (
+				TService service,
+				SemanticModel semanticModel,
+				TExpressionSyntax leftSide,
+				CancellationToken cancellationToken)
+			{
+				var leftSideInfo = semanticModel.GetSymbolInfo (leftSide, cancellationToken);
+
+				if (leftSideInfo.Symbol != null) {
+					var symbol = leftSideInfo.Symbol;
+
+					if (symbol is INamespaceSymbol) {
+						this.NamespaceToGenerateInOpt = symbol.ToDisplayString (Ambience.NameFormat);
+						return true;
+					} else if (symbol is INamedTypeSymbol) {
+						// TODO: Code coverage
+						this.TypeToGenerateInOpt = (INamedTypeSymbol)symbol.OriginalDefinition;
+						return true;
+					}
+
+					// We bound to something other than a namespace or named type.  Can't generate a
+					// type inside this.
+					return false;
+				} else {
+					// If it's a dotted name, then perhaps it's a namespace.  i.e. the user wrote
+					// "new Foo.Bar.Baz()".  In this case we want to generate a namespace for
+					// "Foo.Bar".
+					IList<string> nameParts;
+					if (service.TryGetNameParts (leftSide, out nameParts)) {
+						this.NamespaceToGenerateInOpt = string.Join (".", nameParts);
+						return true;
+					}
+				}
+
+				return false;
+			}
+		}
+
+		protected class GenerateTypeServiceStateOptions
+		{
+			public TExpressionSyntax NameOrMemberAccessExpression { get; set; }
+
+			public TObjectCreationExpressionSyntax ObjectCreationExpressionOpt { get; set; }
+
+			public IMethodSymbol DelegateCreationMethodSymbol { get; set; }
+
+			public List<TSimpleNameSyntax> PropertiesToGenerate { get; }
+
+			public bool IsMembersWithModule { get; set; }
+
+			public bool IsTypeGeneratedIntoNamespaceFromMemberAccess { get; set; }
+
+			public bool IsInterfaceOrEnumNotAllowedInTypeContext { get; set; }
+
+			public bool IsDelegateAllowed { get; set; }
+
+			public bool IsEnumNotAllowed { get; set; }
+
+			public bool IsDelegateOnly { get; internal set; }
+
+			public bool IsClassInterfaceTypes { get; internal set; }
+
+			public GenerateTypeServiceStateOptions ()
+			{
+				NameOrMemberAccessExpression = null;
+				ObjectCreationExpressionOpt = null;
+				DelegateCreationMethodSymbol = null;
+				IsMembersWithModule = false;
+				PropertiesToGenerate = new List<TSimpleNameSyntax> ();
+				IsTypeGeneratedIntoNamespaceFromMemberAccess = false;
+				IsInterfaceOrEnumNotAllowedInTypeContext = false;
+				IsDelegateAllowed = true;
+				IsEnumNotAllowed = false;
+				IsDelegateOnly = false;
+			}
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/CSharpGenerateTypeService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/CSharpGenerateTypeService.cs
new file mode 100644
index 0000000000..7e03af8a31
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/CSharpGenerateTypeService.cs
@@ -0,0 +1,941 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp.GenerateMember.GenerateConstructor;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateType
+{
+	class CSharpGenerateTypeService :
+	AbstractGenerateTypeService<CSharpGenerateTypeService, SimpleNameSyntax, ObjectCreationExpressionSyntax, ExpressionSyntax, TypeDeclarationSyntax, ArgumentSyntax>
+	{
+		private static readonly SyntaxAnnotation s_annotation = new SyntaxAnnotation();
+
+		protected override string DefaultFileExtension
+		{
+			get
+			{
+				return ".cs";
+			}
+		}
+
+		protected override ExpressionSyntax GetLeftSideOfDot(SimpleNameSyntax simpleName)
+		{
+			return simpleName.GetLeftSideOfDot();
+		}
+
+		protected override bool IsInCatchDeclaration(ExpressionSyntax expression)
+		{
+			return expression.IsParentKind(SyntaxKind.CatchDeclaration);
+		}
+
+		protected override bool IsArrayElementType(ExpressionSyntax expression)
+		{
+			return expression.IsParentKind(SyntaxKind.ArrayType) &&
+				             expression.Parent.IsParentKind(SyntaxKind.ArrayCreationExpression);
+		}
+
+		protected override bool IsInValueTypeConstraintContext(
+			SemanticModel semanticModel,
+			ExpressionSyntax expression,
+			CancellationToken cancellationToken)
+		{
+			if (expression is TypeSyntax && expression.IsParentKind(SyntaxKind.TypeArgumentList))
+			{
+				var typeArgumentList = (TypeArgumentListSyntax)expression.Parent;
+				var symbolInfo = semanticModel.GetSymbolInfo(typeArgumentList.Parent, cancellationToken);
+				var symbol = symbolInfo.GetAnySymbol();
+				if (symbol.IsConstructor())
+				{
+					symbol = symbol.ContainingType;
+				}
+
+				var parameterIndex = typeArgumentList.Arguments.IndexOf((TypeSyntax)expression);
+				var type = symbol as INamedTypeSymbol;
+				if (type != null)
+				{
+					type = type.OriginalDefinition;
+					var typeParameter = parameterIndex < type.TypeParameters.Length ? type.TypeParameters[parameterIndex] : null;
+					return typeParameter != null && typeParameter.HasValueTypeConstraint;
+				}
+
+				var method = symbol as IMethodSymbol;
+				if (method != null)
+				{
+					method = method.OriginalDefinition;
+					var typeParameter = parameterIndex < method.TypeParameters.Length ? method.TypeParameters[parameterIndex] : null;
+					return typeParameter != null && typeParameter.HasValueTypeConstraint;
+				}
+			}
+
+			return false;
+		}
+
+		protected override bool IsInInterfaceList(ExpressionSyntax expression)
+		{
+			if (expression is TypeSyntax &&
+			    expression.Parent is BaseTypeSyntax &&
+			    expression.Parent.IsParentKind(SyntaxKind.BaseList) &&
+			    ((BaseTypeSyntax)expression.Parent).Type == expression)
+			{
+				var baseList = (BaseListSyntax)expression.Parent.Parent;
+
+				// If it's after the first item, then it's definitely an interface.
+				if (baseList.Types[0] != expression.Parent)
+				{
+					return true;
+				}
+
+				// If it's in the base list of an interface or struct, then it's definitely an
+				// interface.
+				return
+					baseList.IsParentKind(SyntaxKind.InterfaceDeclaration) ||
+					        baseList.IsParentKind(SyntaxKind.StructDeclaration);
+			}
+
+			if (expression is TypeSyntax &&
+			    expression.IsParentKind(SyntaxKind.TypeConstraint) &&
+			    expression.Parent.IsParentKind(SyntaxKind.TypeParameterConstraintClause))
+			{
+				var typeConstraint = (TypeConstraintSyntax)expression.Parent;
+				var constraintClause = (TypeParameterConstraintClauseSyntax)typeConstraint.Parent;
+				var index = constraintClause.Constraints.IndexOf(typeConstraint);
+
+				// If it's after the first item, then it's definitely an interface.
+				return index > 0;
+			}
+
+			return false;
+		}
+
+		protected override bool TryGetNameParts(ExpressionSyntax expression, out IList<string> nameParts)
+		{
+			nameParts = new List<string>();
+			return expression.TryGetNameParts(out nameParts);
+		}
+
+		protected override bool TryInitializeState(
+			SemanticDocument document,
+			SimpleNameSyntax simpleName,
+			CancellationToken cancellationToken,
+			out GenerateTypeServiceStateOptions generateTypeServiceStateOptions)
+		{
+			generateTypeServiceStateOptions = new GenerateTypeServiceStateOptions();
+
+			if (simpleName.IsVar)
+			{
+				return false;
+			}
+
+			if (SyntaxFacts.IsAliasQualifier(simpleName))
+			{
+				return false;
+			}
+
+			// Never offer if we're in a using directive, unless its a static using.  The feeling here is that it's highly
+			// unlikely that this would be a location where a user would be wanting to generate
+			// something.  They're really just trying to reference something that exists but
+			// isn't available for some reason (i.e. a missing reference).
+			var usingDirectiveSyntax = simpleName.GetAncestorOrThis<UsingDirectiveSyntax>();
+			if (usingDirectiveSyntax != null && usingDirectiveSyntax.StaticKeyword.Kind() != SyntaxKind.StaticKeyword)
+			{
+				return false;
+			}
+
+			ExpressionSyntax nameOrMemberAccessExpression = null;
+			if (simpleName.IsRightSideOfDot())
+			{
+				// This simplename comes from the cref
+				if (simpleName.IsParentKind(SyntaxKind.NameMemberCref))
+				{
+					return false;
+				}
+
+				nameOrMemberAccessExpression = generateTypeServiceStateOptions.NameOrMemberAccessExpression = (ExpressionSyntax)simpleName.Parent;
+
+				// If we're on the right side of a dot, then the left side better be a name (and
+				// not an arbitrary expression).
+				var leftSideExpression = simpleName.GetLeftSideOfDot();
+				if (!leftSideExpression.IsKind(
+					SyntaxKind.QualifiedName,
+					SyntaxKind.IdentifierName,
+					SyntaxKind.AliasQualifiedName,
+					SyntaxKind.GenericName,
+					SyntaxKind.SimpleMemberAccessExpression))
+				{
+					return false;
+				}
+			}
+			else
+			{
+				nameOrMemberAccessExpression = generateTypeServiceStateOptions.NameOrMemberAccessExpression = simpleName;
+			}
+
+			// BUG(5712): Don't offer generate type in an enum's base list.
+			if (nameOrMemberAccessExpression.Parent is BaseTypeSyntax &&
+			    nameOrMemberAccessExpression.Parent.IsParentKind(SyntaxKind.BaseList) &&
+			    ((BaseTypeSyntax)nameOrMemberAccessExpression.Parent).Type == nameOrMemberAccessExpression &&
+			    nameOrMemberAccessExpression.Parent.Parent.IsParentKind(SyntaxKind.EnumDeclaration))
+			{
+				return false;
+			}
+
+			// If we can guarantee it's a type only context, great.  Otherwise, we may not want to
+			// provide this here.
+			var semanticModel = document.SemanticModel;
+			if (!SyntaxFacts.IsInNamespaceOrTypeContext(nameOrMemberAccessExpression))
+			{
+				// Don't offer Generate Type in an expression context *unless* we're on the left
+				// side of a dot.  In that case the user might be making a type that they're
+				// accessing a static off of.
+				var syntaxTree = semanticModel.SyntaxTree;
+				var start = nameOrMemberAccessExpression.SpanStart;
+				var tokenOnLeftOfStart = syntaxTree.FindTokenOnLeftOfPosition(start, cancellationToken);
+				var isExpressionContext = syntaxTree.IsExpressionContext(start, tokenOnLeftOfStart, attributes: true, cancellationToken: cancellationToken, semanticModelOpt: semanticModel);
+				var isStatementContext = syntaxTree.IsStatementContext(start, tokenOnLeftOfStart, cancellationToken);
+				var isExpressionOrStatementContext = isExpressionContext || isStatementContext;
+
+				// Delegate Type Creation is not allowed in Non Type Namespace Context
+				generateTypeServiceStateOptions.IsDelegateAllowed = false;
+
+				if (!isExpressionOrStatementContext)
+				{
+					return false;
+				}
+
+				if (!simpleName.IsLeftSideOfDot() && !simpleName.IsInsideNameOf())
+				{
+					if (nameOrMemberAccessExpression == null || !nameOrMemberAccessExpression.IsKind(SyntaxKind.SimpleMemberAccessExpression) || !simpleName.IsRightSideOfDot())
+					{
+						return false;
+					}
+
+					var leftSymbol = semanticModel.GetSymbolInfo(((MemberAccessExpressionSyntax)nameOrMemberAccessExpression).Expression, cancellationToken).Symbol;
+					var token = simpleName.GetLastToken().GetNextToken();
+
+					// We let only the Namespace to be left of the Dot
+					if (leftSymbol == null ||
+					    !leftSymbol.IsKind(SymbolKind.Namespace) ||
+					    !token.IsKind(SyntaxKind.DotToken))
+					{
+						return false;
+					}
+					else
+					{
+						generateTypeServiceStateOptions.IsMembersWithModule = true;
+						generateTypeServiceStateOptions.IsTypeGeneratedIntoNamespaceFromMemberAccess = true;
+					}
+				}
+
+				// Global Namespace 
+				if (!generateTypeServiceStateOptions.IsTypeGeneratedIntoNamespaceFromMemberAccess &&
+				    !SyntaxFacts.IsInNamespaceOrTypeContext(simpleName))
+				{
+					var token = simpleName.GetLastToken().GetNextToken();
+					if (token.IsKind(SyntaxKind.DotToken) &&
+					    simpleName.Parent == token.Parent)
+					{
+						generateTypeServiceStateOptions.IsMembersWithModule = true;
+						generateTypeServiceStateOptions.IsTypeGeneratedIntoNamespaceFromMemberAccess = true;
+					}
+				}
+			}
+
+			var fieldDeclaration = simpleName.GetAncestor<FieldDeclarationSyntax>();
+			if (fieldDeclaration != null &&
+			    fieldDeclaration.Parent is CompilationUnitSyntax &&
+			    document.Document.SourceCodeKind == SourceCodeKind.Regular)
+			{
+				return false;
+			}
+
+			// Check to see if Module could be an option in the Type Generation in Cross Language Generation
+			var nextToken = simpleName.GetLastToken().GetNextToken();
+			if (simpleName.IsLeftSideOfDot() ||
+			    nextToken.IsKind(SyntaxKind.DotToken))
+			{
+				if (simpleName.IsRightSideOfDot())
+				{
+					var parent = simpleName.Parent as QualifiedNameSyntax;
+					if (parent != null)
+					{
+						var leftSymbol = semanticModel.GetSymbolInfo(parent.Left, cancellationToken).Symbol;
+
+						if (leftSymbol != null && leftSymbol.IsKind(SymbolKind.Namespace))
+						{
+							generateTypeServiceStateOptions.IsMembersWithModule = true;
+						}
+					}
+				}
+			}
+
+			if (SyntaxFacts.IsInNamespaceOrTypeContext(nameOrMemberAccessExpression))
+			{
+				if (nextToken.IsKind(SyntaxKind.DotToken))
+				{
+					// In Namespace or Type Context we cannot have Interface, Enum, Delegate as part of the Left Expression of a QualifiedName
+					generateTypeServiceStateOptions.IsDelegateAllowed = false;
+					generateTypeServiceStateOptions.IsInterfaceOrEnumNotAllowedInTypeContext = true;
+					generateTypeServiceStateOptions.IsMembersWithModule = true;
+				}
+
+				// case: class Foo<T> where T: MyType
+				if (nameOrMemberAccessExpression.GetAncestors<TypeConstraintSyntax>().Any())
+				{
+					generateTypeServiceStateOptions.IsClassInterfaceTypes = true;
+					return true;
+				}
+
+				// Events
+				if (nameOrMemberAccessExpression.GetAncestors<EventFieldDeclarationSyntax>().Any() ||
+				    nameOrMemberAccessExpression.GetAncestors<EventDeclarationSyntax>().Any())
+				{
+					// Case : event foo name11
+					// Only Delegate
+					if (simpleName.Parent != null && !(simpleName.Parent is QualifiedNameSyntax))
+					{
+						generateTypeServiceStateOptions.IsDelegateOnly = true;
+						return true;
+					}
+
+					// Case : event SomeSymbol.foo name11
+					if (nameOrMemberAccessExpression is QualifiedNameSyntax)
+					{
+						// Only Namespace, Class, Struct and Module are allowed to contain Delegate
+						// Case : event Something.Mytype.<Delegate> Identifier
+						if (nextToken.IsKind(SyntaxKind.DotToken))
+						{
+							if (nameOrMemberAccessExpression.Parent != null && nameOrMemberAccessExpression.Parent is QualifiedNameSyntax)
+							{
+								return true;
+							}
+							else
+							{
+								//Contract.Fail("Cannot reach this point");
+							}
+						}
+						else
+						{
+							// Case : event Something.<Delegate> Identifier
+							generateTypeServiceStateOptions.IsDelegateOnly = true;
+							return true;
+						}
+					}
+				}
+			}
+			else
+			{
+				// MemberAccessExpression
+				if ((nameOrMemberAccessExpression.IsKind(SyntaxKind.SimpleMemberAccessExpression) || (nameOrMemberAccessExpression.Parent != null && nameOrMemberAccessExpression.IsParentKind(SyntaxKind.SimpleMemberAccessExpression)))
+				    && nameOrMemberAccessExpression.IsLeftSideOfDot())
+				{
+					// Check to see if the expression is part of Invocation Expression
+					ExpressionSyntax outerMostMemberAccessExpression = null;
+					if (nameOrMemberAccessExpression.IsKind(SyntaxKind.SimpleMemberAccessExpression))
+					{
+						outerMostMemberAccessExpression = nameOrMemberAccessExpression;
+					}
+					else
+					{
+						Debug.Assert(nameOrMemberAccessExpression.IsParentKind(SyntaxKind.SimpleMemberAccessExpression));
+						outerMostMemberAccessExpression = (ExpressionSyntax)nameOrMemberAccessExpression.Parent;
+					}
+
+					outerMostMemberAccessExpression = outerMostMemberAccessExpression.GetAncestorsOrThis<ExpressionSyntax>().SkipWhile((n) => n != null && n.IsKind(SyntaxKind.SimpleMemberAccessExpression)).FirstOrDefault();
+					if (outerMostMemberAccessExpression != null && outerMostMemberAccessExpression is InvocationExpressionSyntax)
+					{
+						generateTypeServiceStateOptions.IsEnumNotAllowed = true;
+					}
+				}
+			}
+
+			// Cases:
+			// // 1 - Function Address
+			// var s2 = new MyD2(foo);
+
+			// // 2 - Delegate
+			// MyD1 d = null;
+			// var s1 = new MyD2(d);
+
+			// // 3 - Action
+			// Action action1 = null;
+			// var s3 = new MyD2(action1);
+
+			// // 4 - Func
+			// Func<int> lambda = () => { return 0; };
+			// var s4 = new MyD3(lambda);
+
+			if (nameOrMemberAccessExpression.Parent is ObjectCreationExpressionSyntax)
+			{
+				var objectCreationExpressionOpt = generateTypeServiceStateOptions.ObjectCreationExpressionOpt = (ObjectCreationExpressionSyntax)nameOrMemberAccessExpression.Parent;
+
+				// Enum and Interface not Allowed in Object Creation Expression
+				generateTypeServiceStateOptions.IsInterfaceOrEnumNotAllowedInTypeContext = true;
+
+				if (objectCreationExpressionOpt.ArgumentList != null)
+				{
+					if (objectCreationExpressionOpt.ArgumentList.CloseParenToken.IsMissing)
+					{
+						return false;
+					}
+
+					// Get the Method symbol for the Delegate to be created
+					if (generateTypeServiceStateOptions.IsDelegateAllowed &&
+					    objectCreationExpressionOpt.ArgumentList.Arguments.Count == 1)
+					{
+						generateTypeServiceStateOptions.DelegateCreationMethodSymbol = GetMethodSymbolIfPresent(semanticModel, objectCreationExpressionOpt.ArgumentList.Arguments[0].Expression, cancellationToken);
+					}
+					else
+					{
+						generateTypeServiceStateOptions.IsDelegateAllowed = false;
+					}
+				}
+
+				if (objectCreationExpressionOpt.Initializer != null)
+				{
+					foreach (var expression in objectCreationExpressionOpt.Initializer.Expressions)
+					{
+						var simpleAssignmentExpression = expression as AssignmentExpressionSyntax;
+						if (simpleAssignmentExpression == null)
+						{
+							continue;
+						}
+
+						var name = simpleAssignmentExpression.Left as SimpleNameSyntax;
+						if (name == null)
+						{
+							continue;
+						}
+
+						generateTypeServiceStateOptions.PropertiesToGenerate.Add(name);
+					}
+				}
+			}
+
+			if (generateTypeServiceStateOptions.IsDelegateAllowed)
+			{
+				// MyD1 z1 = foo;
+				if (nameOrMemberAccessExpression.Parent.IsKind(SyntaxKind.VariableDeclaration))
+				{
+					var variableDeclaration = (VariableDeclarationSyntax)nameOrMemberAccessExpression.Parent;
+					if (variableDeclaration.Variables.Count != 0)
+					{
+						var firstVarDeclWithInitializer = variableDeclaration.Variables.FirstOrDefault(var => var.Initializer != null && var.Initializer.Value != null);
+						if (firstVarDeclWithInitializer != null && firstVarDeclWithInitializer.Initializer != null && firstVarDeclWithInitializer.Initializer.Value != null)
+						{
+							generateTypeServiceStateOptions.DelegateCreationMethodSymbol = GetMethodSymbolIfPresent(semanticModel, firstVarDeclWithInitializer.Initializer.Value, cancellationToken);
+						}
+					}
+				}
+
+				// var w1 = (MyD1)foo;
+				if (nameOrMemberAccessExpression.Parent.IsKind(SyntaxKind.CastExpression))
+				{
+					var castExpression = (CastExpressionSyntax)nameOrMemberAccessExpression.Parent;
+					if (castExpression.Expression != null)
+					{
+						generateTypeServiceStateOptions.DelegateCreationMethodSymbol = GetMethodSymbolIfPresent(semanticModel, castExpression.Expression, cancellationToken);
+					}
+				}
+			}
+
+			return true;
+		}
+
+		private IMethodSymbol GetMethodSymbolIfPresent(SemanticModel semanticModel, ExpressionSyntax expression, CancellationToken cancellationToken)
+		{
+			if (expression == null)
+			{
+				return null;
+			}
+
+			var memberGroup = semanticModel.GetMemberGroup(expression, cancellationToken);
+			if (memberGroup.Count() != 0)
+			{
+				return memberGroup.ElementAt(0).IsKind(SymbolKind.Method) ? (IMethodSymbol)memberGroup.ElementAt(0) : null;
+			}
+
+			var expressionType = semanticModel.GetTypeInfo(expression, cancellationToken).Type;
+			if (expressionType.IsDelegateType())
+			{
+				return ((INamedTypeSymbol)expressionType).DelegateInvokeMethod;
+			}
+
+			var expressionSymbol = semanticModel.GetSymbolInfo(expression, cancellationToken).Symbol;
+			if (expressionSymbol.IsKind(SymbolKind.Method))
+			{
+				return (IMethodSymbol)expressionSymbol;
+			}
+
+			return null;
+		}
+
+		private Accessibility DetermineAccessibilityConstraint(
+			State state,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			return semanticModel.DetermineAccessibilityConstraint(
+				state.NameOrMemberAccessExpression as TypeSyntax, cancellationToken);
+		}
+
+		protected override IList<ITypeParameterSymbol> GetTypeParameters(
+			State state,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			if (state.SimpleName is GenericNameSyntax)
+			{
+				var genericName = (GenericNameSyntax)state.SimpleName;
+				var typeArguments = state.SimpleName.Arity == genericName.TypeArgumentList.Arguments.Count
+				                         ? genericName.TypeArgumentList.Arguments.OfType<SyntaxNode>().ToList()
+				                         : Enumerable.Repeat<SyntaxNode>(null, state.SimpleName.Arity);
+				return this.GetTypeParameters(state, semanticModel, typeArguments, cancellationToken);
+			}
+
+			return SpecializedCollections.EmptyList<ITypeParameterSymbol>();
+		}
+
+		protected override bool TryGetArgumentList(ObjectCreationExpressionSyntax objectCreationExpression, out IList<ArgumentSyntax> argumentList)
+		{
+			if (objectCreationExpression != null && objectCreationExpression.ArgumentList != null)
+			{
+				argumentList = objectCreationExpression.ArgumentList.Arguments.ToList();
+				return true;
+			}
+
+			argumentList = null;
+			return false;
+		}
+
+		protected override IList<string> GenerateParameterNames(
+			SemanticModel semanticModel, IList<ArgumentSyntax> arguments)
+		{
+			return semanticModel.GenerateParameterNames(arguments);
+		}
+
+		public override string GetRootNamespace(CompilationOptions options)
+		{
+			return string.Empty;
+		}
+
+		protected override bool IsInVariableTypeContext(ExpressionSyntax expression)
+		{
+			return false;
+		}
+
+		protected override INamedTypeSymbol DetermineTypeToGenerateIn(SemanticModel semanticModel, SimpleNameSyntax simpleName, CancellationToken cancellationToken)
+		{
+			return semanticModel.GetEnclosingNamedType(simpleName.SpanStart, cancellationToken);
+		}
+
+		protected override Accessibility GetAccessibility(State state, SemanticModel semanticModel, bool intoNamespace, CancellationToken cancellationToken)
+		{
+			var accessibility = DetermineDefaultAccessibility(state, semanticModel, intoNamespace, cancellationToken);
+			if (!state.IsTypeGeneratedIntoNamespaceFromMemberAccess)
+			{
+				var accessibilityConstraint = DetermineAccessibilityConstraint(state, semanticModel, cancellationToken);
+
+				if (accessibilityConstraint == Accessibility.Public ||
+				    accessibilityConstraint == Accessibility.Internal)
+				{
+					accessibility = accessibilityConstraint;
+				}
+			}
+
+			return accessibility;
+		}
+
+		protected override ITypeSymbol DetermineArgumentType(SemanticModel semanticModel, ArgumentSyntax argument, CancellationToken cancellationToken)
+		{
+			return argument.DetermineParameterType(semanticModel, cancellationToken);
+		}
+
+		protected override bool IsConversionImplicit(Compilation compilation, ITypeSymbol sourceType, ITypeSymbol targetType)
+		{
+			return compilation.ClassifyConversion(sourceType, targetType).IsImplicit;
+		}
+
+		public override async Task<Tuple<INamespaceSymbol, INamespaceOrTypeSymbol, Location>> GetOrGenerateEnclosingNamespaceSymbol(INamedTypeSymbol namedTypeSymbol, string[] containers, Document selectedDocument, SyntaxNode selectedDocumentRoot, CancellationToken cancellationToken)
+		{
+			var compilationUnit = (CompilationUnitSyntax)selectedDocumentRoot;
+			var semanticModel = await selectedDocument.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			if (containers.Length != 0)
+			{
+				// Search the NS declaration in the root
+				var containerList = new List<string>(containers);
+				var enclosingNamespace = GetDeclaringNamespace(containerList, 0, compilationUnit);
+				if (enclosingNamespace != null)
+				{
+					var enclosingNamespaceSymbol = semanticModel.GetSymbolInfo(enclosingNamespace.Name, cancellationToken);
+					if (enclosingNamespaceSymbol.Symbol != null)
+					{
+						return Tuple.Create((INamespaceSymbol)enclosingNamespaceSymbol.Symbol,
+						                    (INamespaceOrTypeSymbol)namedTypeSymbol,
+						                    enclosingNamespace.CloseBraceToken.GetLocation());
+					}
+				}
+			}
+
+			var globalNamespace = semanticModel.GetEnclosingNamespace(0, cancellationToken);
+			var rootNamespaceOrType = namedTypeSymbol.GenerateRootNamespaceOrType(containers);
+			var lastMember = compilationUnit.Members.LastOrDefault();
+			Location afterThisLocation = null;
+			if (lastMember != null)
+			{
+				afterThisLocation = semanticModel.SyntaxTree.GetLocation(new TextSpan(lastMember.Span.End, 0));
+			}
+			else
+			{
+				afterThisLocation = semanticModel.SyntaxTree.GetLocation(new TextSpan());
+			}
+
+			return Tuple.Create(globalNamespace,
+			                    rootNamespaceOrType,
+			                    afterThisLocation);
+		}
+
+		private NamespaceDeclarationSyntax GetDeclaringNamespace(List<string> containers, int indexDone, CompilationUnitSyntax compilationUnit)
+		{
+			foreach (var member in compilationUnit.Members)
+			{
+				var namespaceDeclaration = GetDeclaringNamespace(containers, 0, member);
+				if (namespaceDeclaration != null)
+				{
+					return namespaceDeclaration;
+				}
+			}
+
+			return null;
+		}
+
+		private NamespaceDeclarationSyntax GetDeclaringNamespace(List<string> containers, int indexDone, SyntaxNode localRoot)
+		{
+			var namespaceDecl = localRoot as NamespaceDeclarationSyntax;
+			if (namespaceDecl == null || namespaceDecl.Name is AliasQualifiedNameSyntax)
+			{
+				return null;
+			}
+
+			List<string> namespaceContainers = new List<string>();
+			GetNamespaceContainers(namespaceDecl.Name, namespaceContainers);
+
+			if (namespaceContainers.Count + indexDone > containers.Count ||
+			    !IdentifierMatches(indexDone, namespaceContainers, containers))
+			{
+				return null;
+			}
+
+			indexDone = indexDone + namespaceContainers.Count;
+			if (indexDone == containers.Count)
+			{
+				return namespaceDecl;
+			}
+
+			foreach (var member in namespaceDecl.Members)
+			{
+				var resultant = GetDeclaringNamespace(containers, indexDone, member);
+				if (resultant != null)
+				{
+					return resultant;
+				}
+			}
+
+			return null;
+		}
+
+		private bool IdentifierMatches(int indexDone, List<string> namespaceContainers, List<string> containers)
+		{
+			for (int i = 0; i < namespaceContainers.Count; ++i)
+			{
+				if (namespaceContainers[i] != containers[indexDone + i])
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		private void GetNamespaceContainers(NameSyntax name, List<string> namespaceContainers)
+		{
+			if (name is QualifiedNameSyntax)
+			{
+				GetNamespaceContainers(((QualifiedNameSyntax)name).Left, namespaceContainers);
+				namespaceContainers.Add(((QualifiedNameSyntax)name).Right.Identifier.ValueText);
+			}
+			else
+			{
+				Debug.Assert(name is SimpleNameSyntax);
+				namespaceContainers.Add(((SimpleNameSyntax)name).Identifier.ValueText);
+			}
+		}
+
+		internal override bool TryGetBaseList(ExpressionSyntax expression, out TypeKindOptions typeKindValue)
+		{
+			typeKindValue = TypeKindOptions.AllOptions;
+
+			if (expression == null)
+			{
+				return false;
+			}
+
+			var node = expression as SyntaxNode;
+
+			while (node != null)
+			{
+				if (node is BaseListSyntax)
+				{
+					if (node.Parent != null && (node.Parent is InterfaceDeclarationSyntax || node.Parent is StructDeclarationSyntax))
+					{
+						typeKindValue = TypeKindOptions.Interface;
+						return true;
+					}
+
+					typeKindValue = TypeKindOptions.BaseList;
+					return true;
+				}
+
+				node = node.Parent;
+			}
+
+			return false;
+		}
+
+		internal override bool IsPublicOnlyAccessibility(ExpressionSyntax expression, Project project)
+		{
+			if (expression == null)
+			{
+				return false;
+			}
+
+			if (GeneratedTypesMustBePublic(project))
+			{
+				return true;
+			}
+
+			var node = expression as SyntaxNode;
+			SyntaxNode previousNode = null;
+
+			while (node != null)
+			{
+				// Types in BaseList, Type Constraint or Member Types cannot be of restricter accessibility than the declaring type
+				if ((node is BaseListSyntax || node is TypeParameterConstraintClauseSyntax) &&
+				    node.Parent != null &&
+				    node.Parent is TypeDeclarationSyntax)
+				{
+					var typeDecl = node.Parent as TypeDeclarationSyntax;
+					if (typeDecl != null)
+					{
+						if (typeDecl.GetModifiers().Any(m => m.Kind() == SyntaxKind.PublicKeyword))
+						{
+							return IsAllContainingTypeDeclsPublic(typeDecl);
+						}
+						else
+						{
+							// The Type Decl which contains the BaseList does not contain Public
+							return false;
+						}
+					}
+
+					//Contract.Fail("Cannot reach this point");
+				}
+
+				if ((node is EventDeclarationSyntax || node is EventFieldDeclarationSyntax) &&
+				    node.Parent != null &&
+				    node.Parent is TypeDeclarationSyntax)
+				{
+					// Make sure the GFU is not inside the Accessors
+					if (previousNode != null && previousNode is AccessorListSyntax)
+					{
+						return false;
+					}
+
+					// Make sure that Event Declaration themselves are Public in the first place
+					if (!node.GetModifiers().Any(m => m.Kind() == SyntaxKind.PublicKeyword))
+					{
+						return false;
+					}
+
+					return IsAllContainingTypeDeclsPublic(node);
+				}
+
+				previousNode = node;
+				node = node.Parent;
+			}
+
+			return false;
+		}
+
+		private bool IsAllContainingTypeDeclsPublic(SyntaxNode node)
+		{
+			// Make sure that all the containing Type Declarations are also Public
+			var containingTypeDeclarations = node.GetAncestors<TypeDeclarationSyntax>();
+			if (containingTypeDeclarations.Count() == 0)
+			{
+				return true;
+			}
+			else
+			{
+				return containingTypeDeclarations.All(typedecl => typedecl.GetModifiers().Any(m => m.Kind() == SyntaxKind.PublicKeyword));
+			}
+		}
+
+		internal override bool IsGenericName(SimpleNameSyntax simpleName)
+		{
+			if (simpleName == null)
+			{
+				return false;
+			}
+
+			var genericName = simpleName as GenericNameSyntax;
+			return genericName != null;
+		}
+
+		internal override bool IsSimpleName(ExpressionSyntax expression)
+		{
+			return expression is SimpleNameSyntax;
+		}
+
+		internal override Solution TryAddUsingsOrImportToDocument(Solution updatedSolution, SyntaxNode modifiedRoot, Document document, SimpleNameSyntax simpleName, string includeUsingsOrImports, CancellationToken cancellationToken)
+		{
+			// Nothing to include
+			if (string.IsNullOrWhiteSpace(includeUsingsOrImports))
+			{
+				return updatedSolution;
+			}
+
+			var placeSystemNamespaceFirst = true;//document.Project.Solution.Workspace.Options.GetOption(OrganizerOptions.PlaceSystemNamespaceFirst, document.Project.Language);
+
+			SyntaxNode root = null;
+			if (modifiedRoot == null)
+			{
+				root = document.GetSyntaxRootAsync(cancellationToken).WaitAndGetResult(cancellationToken);
+			}
+			else
+			{
+				root = modifiedRoot;
+			}
+
+			if (root is CompilationUnitSyntax)
+			{
+				var compilationRoot = (CompilationUnitSyntax)root;
+				var usingDirective = SyntaxFactory.UsingDirective(SyntaxFactory.ParseName(includeUsingsOrImports));
+
+				// Check if the usings is already present
+				if (compilationRoot.Usings.Where(n => n != null && n.Alias == null)
+				    .Select(n => n.Name.ToString())
+				    .Any(n => n.Equals(includeUsingsOrImports)))
+				{
+					return updatedSolution;
+				}
+
+				// Check if the GFU is triggered from the namespace same as the usings namespace
+				if (IsWithinTheImportingNamespace(document, simpleName.SpanStart, includeUsingsOrImports, cancellationToken))
+				{
+					return updatedSolution;
+				}
+
+				var addedCompilationRoot = compilationRoot.AddUsingDirectives(new[] { usingDirective }, placeSystemNamespaceFirst, Formatter.Annotation);
+				updatedSolution = updatedSolution.WithDocumentSyntaxRoot(document.Id, addedCompilationRoot, PreservationMode.PreserveIdentity);
+			}
+
+			return updatedSolution;
+		}
+
+		private ITypeSymbol GetPropertyType(
+			SimpleNameSyntax property,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			var parent = property.Parent as AssignmentExpressionSyntax;
+			if (parent != null)
+			{
+				return TypeGuessing.typeInferenceService.InferType(semanticModel, parent.Left, true, cancellationToken);
+			}
+
+			return null;
+		}
+
+		private IPropertySymbol CreatePropertySymbol(SimpleNameSyntax propertyName, ITypeSymbol propertyType)
+		{
+			return CodeGenerationSymbolFactory.CreatePropertySymbol(
+				attributes: SpecializedCollections.EmptyList<AttributeData>(),
+				accessibility: Accessibility.Public,
+				modifiers: new DeclarationModifiers(),
+				explicitInterfaceSymbol: null,
+				name: propertyName.ToString(),
+				type: propertyType,
+				parameters: null,
+				getMethod: s_accessor,
+				setMethod: s_accessor,
+				isIndexer: false);
+		}
+
+		private static readonly IMethodSymbol s_accessor = CodeGenerationSymbolFactory.CreateAccessorSymbol(
+			attributes: null,
+			accessibility: Accessibility.Public,
+			statements: null);
+
+		internal override bool TryGenerateProperty(
+			SimpleNameSyntax propertyName,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken,
+			out IPropertySymbol property)
+		{
+			property = null;
+			var propertyType = GetPropertyType(propertyName, semanticModel, cancellationToken);
+			if (propertyType == null || propertyType is IErrorTypeSymbol)
+			{
+				property = CreatePropertySymbol(propertyName, semanticModel.Compilation.ObjectType);
+				return true;
+			}
+
+			property = CreatePropertySymbol(propertyName, propertyType);
+			return true;
+		}
+
+		internal override IMethodSymbol GetDelegatingConstructor(ObjectCreationExpressionSyntax objectCreation, INamedTypeSymbol namedType, SemanticModel model, ISet<IMethodSymbol> candidates, CancellationToken cancellationToken)
+		{
+			var oldNode = objectCreation
+				.AncestorsAndSelf(ascendOutOfTrivia: false)
+				.Where(node => SpeculationAnalyzer.CanSpeculateOnNode(node))
+				.LastOrDefault();
+
+			var typeNameToReplace = objectCreation.Type;
+			var newTypeName = namedType.GenerateTypeSyntax();
+			var newObjectCreation = objectCreation.WithType(newTypeName).WithAdditionalAnnotations(s_annotation);
+			var newNode = oldNode.ReplaceNode(objectCreation, newObjectCreation);
+
+			var speculativeModel = SpeculationAnalyzer.CreateSpeculativeSemanticModelForNode(oldNode, newNode, model);
+			if (speculativeModel != null)
+			{
+				newObjectCreation = (ObjectCreationExpressionSyntax)newNode.GetAnnotatedNodes(s_annotation).Single();
+				var symbolInfo = speculativeModel.GetSymbolInfo(newObjectCreation, cancellationToken);
+				return GenerateConstructorHelpers.GetDelegatingConstructor(symbolInfo, candidates, namedType);
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/GenerateTypeDialogOptions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/GenerateTypeDialogOptions.cs
new file mode 100644
index 0000000000..d91da3dcb5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/GenerateTypeDialogOptions.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateType
+{
+	class GenerateTypeDialogOptions
+	{
+		public bool IsPublicOnlyAccessibility { get; }
+		public TypeKindOptions TypeKindOptions { get; }
+		public bool IsAttribute { get; }
+
+		public GenerateTypeDialogOptions(
+			bool isPublicOnlyAccessibility = false,
+			TypeKindOptions typeKindOptions = TypeKindOptions.AllOptions,
+			bool isAttribute = false)
+		{
+			IsPublicOnlyAccessibility = isPublicOnlyAccessibility;
+			this.TypeKindOptions = typeKindOptions;
+			IsAttribute = isAttribute;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/GenerateTypeOptionsResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/GenerateTypeOptionsResult.cs
new file mode 100644
index 0000000000..cd9c90856e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/GenerateTypeOptionsResult.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateType
+{
+	class GenerateTypeOptionsResult
+	{
+		public static readonly GenerateTypeOptionsResult Cancelled = new GenerateTypeOptionsResult(isCancelled: true);
+
+		public Accessibility Accessibility { get; }
+		public Document ExistingDocument { get; }
+		public bool IsCancelled { get; }
+		public bool IsNewFile { get; }
+		public IList<string> Folders { get; }
+		public string NewFileName { get; }
+		public Project Project { get; }
+		public TypeKind TypeKind { get; }
+		public string FullFilePath { get; }
+		public string TypeName { get; }
+		public bool AreFoldersValidIdentifiers { get; }
+
+		public GenerateTypeOptionsResult(
+			Accessibility accessibility,
+			TypeKind typeKind,
+			string typeName,
+			Project project,
+			bool isNewFile,
+			string newFileName,
+			IList<string> folders,
+			string fullFilePath,
+			Document existingDocument,
+			bool areFoldersValidIdentifiers,
+			bool isCancelled = false)
+		{
+			this.Accessibility = accessibility;
+			this.TypeKind = typeKind;
+			this.TypeName = typeName;
+			this.Project = project;
+			this.IsNewFile = isNewFile;
+			this.NewFileName = newFileName;
+			this.Folders = folders;
+			this.FullFilePath = fullFilePath;
+			this.ExistingDocument = existingDocument;
+			this.AreFoldersValidIdentifiers = areFoldersValidIdentifiers;
+			this.IsCancelled = isCancelled;
+		}
+
+		private GenerateTypeOptionsResult(bool isCancelled)
+		{
+			this.IsCancelled = isCancelled;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/TypeKindOptions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/TypeKindOptions.cs
new file mode 100644
index 0000000000..3bfdc96dfb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GenerateType/TypeKindOptions.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ICSharpCode.NRefactory6.CSharp.GenerateType
+{
+	[Flags]
+	public enum TypeKindOptions
+	{
+		None = 0x0,
+
+		Class = 0x1,
+		Structure = 0x2,
+		Interface = 0x4,
+		Enum = 0x8,
+		Delegate = 0x10,
+		Module = 0x20,
+
+		// Enables class, struct, interface, enum and delegate
+		AllOptions = Class | Structure | Interface | Enum | Delegate,
+
+		// Only class is valid with Attribute
+		Attribute = Class,
+
+		// Only class, struct and interface are allowed. No Enums
+		BaseList = Class | Interface,
+
+		AllOptionsWithModule = AllOptions | Module,
+
+		// Only Interface and Delegate cannot be part of the member access with Namespace as Left expression
+		MemberAccessWithNamespace = Class | Structure | Enum | Module,
+
+		// Enum and Modules are incompatible with Generics
+		GenericInCompatibleTypes = Enum | Module
+	}
+
+	internal class TypeKindOptionsHelper
+	{
+		public static bool IsClass(TypeKindOptions option)
+		{
+			return (option & TypeKindOptions.Class) != 0 ? true : false;
+		}
+
+		public static bool IsStructure(TypeKindOptions option)
+		{
+			return (option & TypeKindOptions.Structure) != 0 ? true : false;
+		}
+
+		public static bool IsInterface(TypeKindOptions option)
+		{
+			return (option & TypeKindOptions.Interface) != 0 ? true : false;
+		}
+
+		public static bool IsEnum(TypeKindOptions option)
+		{
+			return (option & TypeKindOptions.Enum) != 0 ? true : false;
+		}
+
+		public static bool IsDelegate(TypeKindOptions option)
+		{
+			return (option & TypeKindOptions.Delegate) != 0 ? true : false;
+		}
+
+		public static bool IsModule(TypeKindOptions option)
+		{
+			return (option & TypeKindOptions.Module) != 0 ? true : false;
+		}
+
+		public static TypeKindOptions RemoveOptions(TypeKindOptions fromValue, params TypeKindOptions[] removeValues)
+		{
+			var tempReturnValue = fromValue;
+			foreach (var removeValue in removeValues)
+			{
+				tempReturnValue = tempReturnValue & ~removeValue;
+			}
+
+			return tempReturnValue;
+		}
+
+		internal static TypeKindOptions AddOption(TypeKindOptions toValue, TypeKindOptions addValue)
+		{
+			return toValue | addValue;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GotoDefinition/GotoDefinitionHelpers.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GotoDefinition/GotoDefinitionHelpers.cs
new file mode 100644
index 0000000000..301c4cfe7d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GotoDefinition/GotoDefinitionHelpers.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.GotoDefinition
+{
+	static class GoToDefinitionHelpers
+	{
+		
+		public static bool TryGoToDefinition(
+			ISymbol symbol,
+			Project project,
+			ITypeSymbol containingTypeSymbol,
+			bool throwOnHiddenDefinition,
+			CancellationToken cancellationToken)
+		{
+			var alias = symbol as IAliasSymbol;
+			if (alias != null)
+			{
+				var ns = alias.Target as INamespaceSymbol;
+				if (ns != null && ns.IsGlobalNamespace)
+				{
+					return false;
+				}
+			}
+
+			// VB global import aliases have a synthesized SyntaxTree.
+			// We can't go to the definition of the alias, so use the target type.
+
+			var solution = project.Solution;
+			if (symbol is IAliasSymbol &&
+				GeneratedCodeRecognitionService.GetPreferredSourceLocations(solution, symbol).All(l => project.Solution.GetDocument(l.SourceTree) == null))
+			{
+				symbol = ((IAliasSymbol)symbol).Target;
+			}
+
+			var definition = SymbolFinder.FindSourceDefinitionAsync(symbol, solution, cancellationToken).Result;
+			cancellationToken.ThrowIfCancellationRequested();
+
+			symbol = definition ?? symbol;
+
+			if (TryThirdPartyNavigation(symbol, solution, containingTypeSymbol))
+			{
+				return true;
+			}
+
+			// If it is a partial method declaration with no body, choose to go to the implementation
+			// that has a method body.
+			if (symbol is IMethodSymbol)
+			{
+				symbol = ((IMethodSymbol)symbol).PartialImplementationPart ?? symbol;
+			}
+
+			var preferredSourceLocations = GeneratedCodeRecognitionService.GetPreferredSourceLocations(solution, symbol).ToArray();
+			if (GoToDefinitionService.TryNavigateToSymbol (symbol, project, true))
+				return true;
+			else if (!preferredSourceLocations.Any ())
+				return false;
+
+			// If we have a single location, then just navigate to it.
+			if (preferredSourceLocations.Length == 1)
+			{
+				var firstItem = preferredSourceLocations[0];
+				var workspace = project.Solution.Workspace;
+				if (GoToDefinitionService.CanNavigateToSpan(workspace, solution.GetDocument(firstItem.SourceTree).Id, firstItem.SourceSpan))
+				{
+					return GoToDefinitionService.TryNavigateToSpan(workspace, solution.GetDocument(firstItem.SourceTree).Id, firstItem.SourceSpan, true);
+				}
+				else
+				{
+					if (throwOnHiddenDefinition)
+					{
+						const int E_FAIL = -2147467259;
+						throw new COMException("The definition of the object is hidden.", E_FAIL);
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+			else
+			{
+				// We have multiple viable source locations, so ask the host what to do. Most hosts
+				// will simply display the results to the user and allow them to choose where to 
+				// go.
+				GoToDefinitionService.DisplayMultiple (preferredSourceLocations.Select (location => Tuple.Create (solution, symbol, location)).ToList ());
+
+				return false;
+			}
+		}
+
+		private static bool TryThirdPartyNavigation(ISymbol symbol, Solution solution, ITypeSymbol containingTypeSymbol)
+		{
+			// Allow third parties to navigate to all symbols except types/constructors
+			// if we are navigating from the corresponding type.
+
+			if (containingTypeSymbol != null &&
+				(symbol is ITypeSymbol || symbol.IsConstructor()))
+			{
+				var candidateTypeSymbol = symbol is ITypeSymbol
+					? symbol
+					: symbol.ContainingType;
+
+				if (containingTypeSymbol == candidateTypeSymbol)
+				{
+					// We are navigating from the same type, so don't allow third parties to perform the navigation.
+					// This ensures that if we navigate to a class from within that class, we'll stay in the same file
+					// rather than navigate to, say, XAML.
+					return false;
+				}
+			}
+
+			// Notify of navigation so third parties can intercept the navigation
+			return GoToDefinitionService.TrySymbolNavigationNotify(symbol, solution);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GotoDefinition/GotoDefinitionService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GotoDefinition/GotoDefinitionService.cs
new file mode 100644
index 0000000000..f0cd820b45
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/GotoDefinition/GotoDefinitionService.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.GotoDefinition
+{
+	static class GoToDefinitionService
+	{
+		/// <summary>
+		/// Navigate to the first source location of a given symbol.
+		/// bool TryNavigateToSymbol(ISymbol symbol, Project project, bool usePreviewTab = false);
+		/// </summary>
+		public static Func<ISymbol, Project, bool, bool> TryNavigateToSymbol = delegate {
+			return true;
+		};
+
+		/// <summary>
+		/// Navigates to the given position in the specified document, opening it if necessary.
+		/// bool TryNavigateToSpan(Workspace workspace, DocumentId documentId, TextSpan textSpan, bool usePreviewTab = false);
+		/// </summary>
+		public static Func<Workspace, DocumentId, TextSpan, bool, bool> TryNavigateToSpan = delegate {
+			return true;
+		};
+
+		/// <summary>
+		/// Determines whether it is possible to navigate to the given position in the specified document.
+		/// bool CanNavigateToSpan(Workspace workspace, DocumentId documentId, TextSpan textSpan);
+		/// </summary>
+		public static Func<Workspace, DocumentId, TextSpan, bool> CanNavigateToSpan = delegate {
+			return true;
+		};
+
+		public static Action<IEnumerable<Tuple<Solution, ISymbol, Location>>> DisplayMultiple = delegate {
+		};
+
+		/// <summary>
+		/// bool TrySymbolNavigationNotify(ISymbol symbol, Solution solution);
+		/// </summary>
+		/// <returns>True if the navigation was handled, indicating that the caller should not 
+		/// perform the navigation.
+		/// 
+		/// </returns>
+		public static Func<ISymbol, Solution, bool> TrySymbolNavigationNotify = delegate {
+			return false;
+		};
+
+		static ISymbol FindRelatedExplicitlyDeclaredSymbol(ISymbol symbol, Compilation compilation)
+		{
+			return symbol;
+		}
+
+		public static async Task<ISymbol> FindSymbolAsync(Document document, int position, CancellationToken cancellationToken)
+		{
+			var workspace = document.Project.Solution.Workspace;
+
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			//var symbol = SymbolFinder.FindSymbolAtPosition(semanticModel, position, workspace, bindLiteralsToUnderlyingType: true, cancellationToken: cancellationToken);
+			var symbol = SymbolFinder.FindSymbolAtPosition(semanticModel, position, workspace, cancellationToken: cancellationToken);
+
+			return FindRelatedExplicitlyDeclaredSymbol(symbol, semanticModel.Compilation);
+		}
+
+//		public async Task<IEnumerable<INavigableItem>> FindDefinitionsAsync(Document document, int position, CancellationToken cancellationToken)
+//		{
+//			var symbol = await FindSymbolAsync(document, position, cancellationToken).ConfigureAwait(false);
+//
+//			// realize the list here so that the consumer await'ing the result doesn't lazily cause
+//			// them to be created on an inappropriate thread.
+//			return NavigableItemFactory.GetItemsfromPreferredSourceLocations(document.Project.Solution, symbol).ToList();
+//		}
+
+		public static bool TryGoToDefinition(Document document, int position, CancellationToken cancellationToken)
+		{
+			var symbol = FindSymbolAsync(document, position, cancellationToken).Result;
+
+			if (symbol != null)
+			{
+				var containingTypeSymbol = GetContainingTypeSymbol(position, document, cancellationToken);
+
+				if (GoToDefinitionHelpers.TryGoToDefinition(symbol, document.Project, containingTypeSymbol, throwOnHiddenDefinition: true, cancellationToken: cancellationToken))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		private static ITypeSymbol GetContainingTypeSymbol(int caretPosition, Document document, CancellationToken cancellationToken)
+		{
+			var syntaxRoot = document.GetSyntaxRootAsync(cancellationToken).Result;
+			var containingTypeDeclaration = syntaxRoot.GetContainingTypeDeclaration(caretPosition);
+
+			if (containingTypeDeclaration != null)
+			{
+				var semanticModel = document.GetSemanticModelAsync(cancellationToken).Result;
+				return semanticModel.GetDeclaredSymbol(containingTypeDeclaration, cancellationToken) as ITypeSymbol;
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/AbstractImplementAbstractClassService.Editor.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/AbstractImplementAbstractClassService.Editor.cs
new file mode 100644
index 0000000000..6fa2da1dba
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/AbstractImplementAbstractClassService.Editor.cs
@@ -0,0 +1,167 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementAbstractClass
+{
+	partial class AbstractImplementAbstractClassService
+	{
+		private partial class Editor
+		{
+			private readonly Document _document;
+			private readonly SemanticModel _model;
+			private readonly State _state;
+
+			public Editor(
+				Document document,
+				SemanticModel model,
+				State state)
+			{
+				_document = document;
+				_model = model;
+				_state = state;
+			}
+
+			public async Task<Document> GetEditAsync(CancellationToken cancellationToken)
+			{
+				var unimplementedMembers = _state.UnimplementedMembers;
+
+				var memberDefinitions = GenerateMembers(
+					unimplementedMembers,
+					cancellationToken);
+
+				var result = await CodeGenerator.AddMemberDeclarationsAsync(
+					_document.Project.Solution,
+					_state.ClassType,
+					memberDefinitions,
+					new CodeGenerationOptions(_state.Location.GetLocation(), generateDefaultAccessibility: false),
+					cancellationToken)
+					.ConfigureAwait(false);
+
+				return result;
+			}
+
+			private IList<ISymbol> GenerateMembers(
+				IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> unimplementedMembers,
+				CancellationToken cancellationToken)
+			{
+				return
+					unimplementedMembers.SelectMany(t => t.Item2)
+						.Select(m => GenerateMember(m, cancellationToken))
+						.WhereNotNull()
+						.ToList();
+			}
+
+			private ISymbol GenerateMember(
+				ISymbol member,
+				CancellationToken cancellationToken)
+			{
+				cancellationToken.ThrowIfCancellationRequested();
+
+				// Check if we need to add 'unsafe' to the signature we're generating.
+				var addUnsafe = member.IsUnsafe() && !_state.Location.IsUnsafeContext();
+
+				return GenerateMember(member, addUnsafe, cancellationToken);
+			}
+
+			private ISymbol GenerateMember(
+				ISymbol member,
+				bool addUnsafe,
+				CancellationToken cancellationToken)
+			{
+				var modifiers = DeclarationModifiers.None.WithIsOverride(true).WithIsUnsafe (addUnsafe);
+				var accessibility = member.ComputeResultantAccessibility(_state.ClassType);
+
+				if (member.Kind == SymbolKind.Method)
+				{
+					return GenerateMethod((IMethodSymbol)member, modifiers, accessibility, cancellationToken);
+				}
+				else if (member.Kind == SymbolKind.Property)
+				{
+					return GenerateProperty((IPropertySymbol)member, modifiers, accessibility, cancellationToken);
+				}
+				else if (member.Kind == SymbolKind.Event)
+				{
+					var @event = (IEventSymbol)member;
+					return CodeGenerationSymbolFactory.CreateEventSymbol(
+						@event,
+						accessibility: accessibility,
+						modifiers: modifiers);
+				}
+
+				return null;
+			}
+
+			private ISymbol GenerateMethod(
+				IMethodSymbol method, DeclarationModifiers modifiers, Accessibility accessibility, CancellationToken cancellationToken)
+			{
+				var syntaxFactory = _document.Project.LanguageServices.GetService<SyntaxGenerator>();
+
+				var throwingBody = syntaxFactory.CreateThrowNotImplementStatement (_model.Compilation);
+
+				method = method.EnsureNonConflictingNames(_state.ClassType, cancellationToken);
+
+				return CodeGenerationSymbolFactory.CreateMethodSymbol(
+					method,
+					accessibility: accessibility,
+					modifiers: modifiers,
+					statements: new [] { throwingBody });
+			}
+
+			private IPropertySymbol GenerateProperty(
+				IPropertySymbol property,
+				DeclarationModifiers modifiers,
+				Accessibility accessibility,
+				CancellationToken cancellationToken)
+			{
+				var syntaxFactory = _document.Project.LanguageServices.GetService<SyntaxGenerator>();
+
+				var throwingBody = syntaxFactory.CreateThrowNotImplementedStatementBlock(
+					_model.Compilation);
+
+				var getMethod = ShouldGenerateAccessor(property.GetMethod)
+					? CodeGenerationSymbolFactory.CreateAccessorSymbol(
+						property.GetMethod,
+						attributes: null,
+						accessibility: property.GetMethod.ComputeResultantAccessibility(_state.ClassType),
+						statements: throwingBody)
+					: null;
+
+				var setMethod = ShouldGenerateAccessor(property.SetMethod)
+					? CodeGenerationSymbolFactory.CreateAccessorSymbol(
+						property.SetMethod,
+						attributes: null,
+						accessibility: property.SetMethod.ComputeResultantAccessibility(_state.ClassType),
+						statements: throwingBody)
+					: null;
+
+				return CodeGenerationSymbolFactory.CreatePropertySymbol(
+					property,
+					accessibility: accessibility,
+					modifiers: modifiers,
+					getMethod: getMethod,
+					setMethod: setMethod);
+			}
+
+			private bool ShouldGenerateAccessor(IMethodSymbol method)
+			{
+				return
+					method != null &&
+					method.IsAccessibleWithin(_state.ClassType) &&
+					_state.ClassType.FindImplementationForAbstractMember(method) == null;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/AbstractImplementAbstractClassService.State.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/AbstractImplementAbstractClassService.State.cs
new file mode 100644
index 0000000000..0d924b2c79
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/AbstractImplementAbstractClassService.State.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementAbstractClass
+{
+	partial class AbstractImplementAbstractClassService
+	{
+		private class State
+		{
+			public SyntaxNode Location { get; }
+			public INamedTypeSymbol ClassType { get; }
+			public INamedTypeSymbol AbstractClassType { get; }
+
+			// The members that are not implemented at all.
+			public IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> UnimplementedMembers { get; }
+
+			private State(SyntaxNode node, INamedTypeSymbol classType, INamedTypeSymbol abstractClassType, IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> unimplementedMembers)
+			{
+				this.Location = node;
+				this.ClassType = classType;
+				this.AbstractClassType = abstractClassType;
+				this.UnimplementedMembers = unimplementedMembers;
+			}
+
+			public static State Generate(
+				AbstractImplementAbstractClassService service,
+				Document document,
+				SemanticModel model,
+				SyntaxNode node,
+				CancellationToken cancellationToken)
+			{
+				INamedTypeSymbol classType, abstractClassType;
+				if (!service.TryInitializeState(document, model, node, cancellationToken,
+					out classType, out abstractClassType))
+				{
+					return null;
+				}
+
+				if (!CodeGenerator.CanAdd(document.Project.Solution, classType, cancellationToken))
+				{
+					return null;
+				}
+
+				if (classType.IsAbstract)
+				{
+					return null;
+				}
+
+				var unimplementedMembers = classType.GetAllUnimplementedMembers(
+					SpecializedCollections.SingletonEnumerable(abstractClassType), cancellationToken);
+
+				if (unimplementedMembers != null && unimplementedMembers.Count >= 1)
+				{
+					return new State(node, classType, abstractClassType, unimplementedMembers);
+				}
+				else
+				{
+					return null;
+				}
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/AbstractImplementAbstractClassService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/AbstractImplementAbstractClassService.cs
new file mode 100644
index 0000000000..b625b46e7d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/AbstractImplementAbstractClassService.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementAbstractClass
+{
+	abstract partial class AbstractImplementAbstractClassService
+	{
+		protected AbstractImplementAbstractClassService()
+		{
+		}
+
+		protected abstract bool TryInitializeState(Document document, SemanticModel model, SyntaxNode classNode, CancellationToken cancellationToken, out INamedTypeSymbol classType, out INamedTypeSymbol abstractClassType);
+
+		public Task<Document> ImplementAbstractClassAsync(Document document, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var state = State.Generate(this, document, model, node, cancellationToken);
+			if (state == null)
+			{
+				return Task.FromResult (default(Document));
+			}
+
+			return new Editor(document, model, state).GetEditAsync(cancellationToken);
+		}
+
+		public bool CanImplementAbstractClass(Document document, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return State.Generate(this, document, model, node, cancellationToken) != null;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/CSharpImplementAbstractClassService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/CSharpImplementAbstractClassService.cs
new file mode 100644
index 0000000000..939d65e432
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementAbstractClass/CSharpImplementAbstractClassService.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementAbstractClass
+{
+	class CSharpImplementAbstractClassService : AbstractImplementAbstractClassService
+	{
+		protected override bool TryInitializeState(
+			Document document, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken,
+			out INamedTypeSymbol classType, out INamedTypeSymbol abstractClassType)
+		{
+			var baseClassNode = node as TypeSyntax;
+			if (baseClassNode != null && baseClassNode.Parent is BaseTypeSyntax &&
+				baseClassNode.Parent.IsParentKind(SyntaxKind.BaseList) &&
+				((BaseTypeSyntax)baseClassNode.Parent).Type == baseClassNode)
+			{
+				if (baseClassNode.Parent.Parent.IsParentKind(SyntaxKind.ClassDeclaration))
+				{
+					abstractClassType = model.GetTypeInfo(baseClassNode, cancellationToken).Type as INamedTypeSymbol;
+					cancellationToken.ThrowIfCancellationRequested();
+
+					if (abstractClassType.IsAbstractClass())
+					{
+						var classDecl = baseClassNode.Parent.Parent.Parent as ClassDeclarationSyntax;
+						classType = model.GetDeclaredSymbol(classDecl, cancellationToken) as INamedTypeSymbol;
+
+						return classType != null && abstractClassType != null;
+					}
+				}
+			}
+
+			classType = null;
+			abstractClassType = null;
+			return false;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction.cs
new file mode 100644
index 0000000000..6f66185d4b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction.cs
@@ -0,0 +1,560 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+using ICSharpCode.NRefactory6.CSharp.CodeGeneration;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface
+{
+	abstract partial class AbstractImplementInterfaceService
+    {
+        internal partial class ImplementInterfaceCodeAction : CodeAction
+        {
+            protected readonly bool Explicitly;
+            protected readonly bool Abstractly;
+            protected readonly ISymbol ThroughMember;
+            protected readonly Document Document;
+            protected readonly State State;
+            protected readonly AbstractImplementInterfaceService Service;
+            private readonly string _equivalenceKey;
+
+            internal ImplementInterfaceCodeAction(
+                AbstractImplementInterfaceService service,
+                Document document,
+                State state,
+                bool explicitly,
+                bool abstractly,
+                ISymbol throughMember)
+            {
+                this.Service = service;
+                this.Document = document;
+                this.State = state;
+                this.Abstractly = abstractly;
+                this.Explicitly = explicitly;
+                this.ThroughMember = throughMember;
+                _equivalenceKey = ComputeEquivalenceKey(state, explicitly, abstractly, throughMember, this.GetType().FullName);
+            }
+
+            public static ImplementInterfaceCodeAction CreateImplementAbstractlyCodeAction(
+                AbstractImplementInterfaceService service,
+                Document document,
+                State state)
+            {
+                return new ImplementInterfaceCodeAction(service, document, state, explicitly: false, abstractly: true, throughMember: null);
+            }
+
+            public static ImplementInterfaceCodeAction CreateImplementCodeAction(
+                AbstractImplementInterfaceService service,
+                Document document,
+                State state)
+            {
+                return new ImplementInterfaceCodeAction(service, document, state, explicitly: false, abstractly: false, throughMember: null);
+            }
+
+            public static ImplementInterfaceCodeAction CreateImplementExplicitlyCodeAction(
+                AbstractImplementInterfaceService service,
+                Document document,
+                State state)
+            {
+                return new ImplementInterfaceCodeAction(service, document, state, explicitly: true, abstractly: false, throughMember: null);
+            }
+
+            public static ImplementInterfaceCodeAction CreateImplementThroughMemberCodeAction(
+                AbstractImplementInterfaceService service,
+                Document document,
+                State state,
+                ISymbol throughMember)
+            {
+                return new ImplementInterfaceCodeAction(service, document, state, explicitly: false, abstractly: false, throughMember: throughMember);
+            }
+
+            public override string Title
+            {
+                get
+                {
+                    if (Explicitly)
+                    {
+						return Resources.ImplementInterfaceExplicitly;
+                    }
+                    else if (Abstractly)
+                    {
+                        return Resources.ImplementInterfaceAbstractly;
+                    }
+                    else if (ThroughMember != null)
+                    {
+						return string.Format(Resources.ImplementInterfaceThrough, GetDescription(ThroughMember));
+                    }
+                    else
+                    {
+						return Resources.ImplementInterface;
+                    }
+                }
+            }
+
+            private static string ComputeEquivalenceKey(
+                State state,
+                bool explicitly,
+                bool abstractly,
+                ISymbol throughMember,
+                string codeActionTypeName)
+            {
+                var interfaceType = state.InterfaceTypes.First();
+                var typeName = interfaceType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+                var assemblyName = interfaceType.ContainingAssembly.Name;
+
+                return GetCodeActionEquivalenceKey(assemblyName, typeName, explicitly, abstractly, throughMember, codeActionTypeName);
+            }
+
+            // internal for testing purposes.
+            internal static string GetCodeActionEquivalenceKey(
+                string interfaceTypeAssemblyName,
+                string interfaceTypeFullyQualifiedName,
+                bool explicitly,
+                bool abstractly,
+                ISymbol throughMember,
+                string codeActionTypeName)
+            {
+                if (throughMember != null)
+                {
+                    return null;
+                }
+
+                return explicitly.ToString() + ";" +
+                    abstractly.ToString() + ";" +
+                    interfaceTypeAssemblyName + ";" +
+                    interfaceTypeFullyQualifiedName + ";" +
+                    codeActionTypeName;
+            }
+
+            public override string EquivalenceKey
+            {
+                get
+                {
+                    return _equivalenceKey;
+                }
+            }
+
+            private static string GetDescription(ISymbol throughMember)
+            {
+                return throughMember.TypeSwitch(
+                    (IFieldSymbol field) => field.Name,
+                    (IPropertySymbol property) => property.Name);
+            }
+
+            protected override Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+            {
+                return GetUpdatedDocumentAsync(cancellationToken);
+            }
+
+            public Task<Document> GetUpdatedDocumentAsync(CancellationToken cancellationToken)
+            {
+                var unimplementedMembers = Explicitly ? State.UnimplementedExplicitMembers : State.UnimplementedMembers;
+                return GetUpdatedDocumentAsync(Document, unimplementedMembers, State.ClassOrStructType, State.ClassOrStructDecl, cancellationToken);
+            }
+
+            public virtual async Task<Document> GetUpdatedDocumentAsync(
+                    Document document,
+                    IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> unimplementedMembers,
+                    INamedTypeSymbol classOrStructType,
+                    SyntaxNode classOrStructDecl,
+                    CancellationToken cancellationToken)
+            {
+                var result = document;
+                var compilation = await result.Project.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
+
+                var memberDefinitions = GenerateMembers(
+                    compilation,
+                    unimplementedMembers,
+                    cancellationToken);
+
+                result = await CodeGenerator.AddMemberDeclarationsAsync(
+                    result.Project.Solution, classOrStructType, memberDefinitions,
+					new CodeGenerationOptions(contextLocation: classOrStructDecl.GetLocation(), generateDefaultAccessibility: false),
+                    cancellationToken).ConfigureAwait(false);
+
+                return result;
+            }
+
+            private IList<ISymbol> GenerateMembers(
+                Compilation compilation,
+                IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> unimplementedMembers,
+                CancellationToken cancellationToken)
+            {
+                // As we go along generating members we may end up with conflicts.  For example, say
+                // you have "interface IFoo { string Bar { get; } }" and "interface IQuux { int Bar
+                // { get; } }" and we need to implement both 'Bar' methods.  The second will have to
+                // be explicitly implemented as it will conflict with the first.  So we need to keep
+                // track of what we've actually implemented so that we can check further interface
+                // members against both the actual type and that list.
+                //
+                // Similarly, if you have two interfaces with the same member, then we don't want to
+                // implement that member twice.  
+                //
+                // Note: if we implement a method explicitly then we do *not* add it to this list.
+                // That's because later members won't conflict with it even if they have the same
+                // signature otherwise.  i.e. if we chose to implement IFoo.Bar explicitly, then we
+                // could implement IQuux.Bar implicitly (and vice versa).
+                var implementedVisibleMembers = new List<ISymbol>();
+                var implementedMembers = new List<ISymbol>();
+
+                foreach (var tuple in unimplementedMembers)
+                {
+                    var interfaceType = tuple.Item1;
+                    var unimplementedInterfaceMembers = tuple.Item2;
+
+                    foreach (var unimplementedInterfaceMember in unimplementedInterfaceMembers)
+                    {
+                        var member = GenerateMember(compilation, unimplementedInterfaceMember, implementedVisibleMembers, cancellationToken);
+                        if (member != null)
+                        {
+                            implementedMembers.Add(member);
+
+                            if (!(member.ExplicitInterfaceImplementations().Any() && Service.HasHiddenExplicitImplementation))
+                            {
+                                implementedVisibleMembers.Add(member);
+                            }
+                        }
+                    }
+                }
+
+                return implementedMembers;
+            }
+
+            private bool IsReservedName(string name)
+            {
+                return
+                    IdentifiersMatch(State.ClassOrStructType.Name, name) ||
+                    State.ClassOrStructType.TypeParameters.Any(t => IdentifiersMatch(t.Name, name));
+            }
+
+            private string DetermineMemberName(ISymbol member, List<ISymbol> implementedVisibleMembers)
+            {
+				if (HasConflictingMember(member, implementedVisibleMembers))
+                {
+                    var memberNames = State.ClassOrStructType.GetAccessibleMembersInThisAndBaseTypes<ISymbol>(State.ClassOrStructType).Select(m => m.Name);
+
+                    return NameGenerator.GenerateUniqueName(
+                        string.Format("{0}_{1}", member.ContainingType.Name, member.Name),
+                        n => !memberNames.Contains(n) &&
+                            !implementedVisibleMembers.Any(m => IdentifiersMatch(m.Name, n)) &&
+                            !IsReservedName(n));
+                }
+
+                return member.Name;
+            }
+
+            private ISymbol GenerateMember(
+                Compilation compilation,
+                ISymbol member,
+                List<ISymbol> implementedVisibleMembers,
+                CancellationToken cancellationToken)
+            {
+                // First check if we already generate a member that matches the member we want to
+                // generate.  This can happen in C# when you have interfaces that have the same
+                // method, and you are implementing implicitly.  For example:
+                //
+                // interface IFoo { void Foo(); }
+                //
+                // interface IBar : IFoo { new void Foo(); }
+                //
+                // class C : IBar
+                //
+                // In this case we only want to generate 'Foo' once.
+                if (HasMatchingMember(implementedVisibleMembers, member))
+                {
+                    return null;
+                }
+
+                var memberName = DetermineMemberName(member, implementedVisibleMembers);
+
+                // See if we need to generate an invisible member.  If we do, then reset the name
+                // back to what then member wants it to be.
+                var generateInvisibleMember = GenerateInvisibleMember(member, memberName);
+                memberName = generateInvisibleMember ? member.Name : memberName;
+
+                var generateAbstractly = !generateInvisibleMember && Abstractly;
+
+                // Check if we need to add 'new' to the signature we're adding.  We only need to do this
+                // if we're not generating something explicit and we have a naming conflict with
+                // something in our base class hierarchy.
+                var addNew = !generateInvisibleMember && HasNameConflict(member, memberName, State.ClassOrStructType.GetBaseTypes());
+
+                // Check if we need to add 'unsafe' to the signature we're generating.
+				var addUnsafe = member.IsUnsafe() && !State.Location.IsUnsafeContext();
+
+                return GenerateMember(compilation, member, memberName, generateInvisibleMember, generateAbstractly, addNew, addUnsafe, cancellationToken);
+            }
+
+            private bool GenerateInvisibleMember(ISymbol member, string memberName)
+            {
+                if (Service.HasHiddenExplicitImplementation)
+                {
+                    // User asked for an explicit (i.e. invisible) member.
+                    if (Explicitly)
+                    {
+                        return true;
+                    }
+
+                    // Have to create an invisible member if we have constraints we can't express
+                    // with a visible member.
+                    if (HasUnexpressableConstraint(member))
+                    {
+                        return true;
+                    }
+
+                    // If we had a conflict with a member of the same name, then we have to generate
+                    // as an invisible member.
+                    if (member.Name != memberName)
+                    {
+                        return true;
+                    }
+                }
+
+                // Can't generate an invisible member if the lanugage doesn't support it.
+                return false;
+            }
+
+            private bool HasUnexpressableConstraint(ISymbol member)
+            {
+                // interface IFoo<T> { void Bar<U>() where U : T; }
+                //
+                // class A : IFoo<int> { }
+                //
+                // In this case we cannot generate an implement method for Bar.  That's because we'd
+                // need to say "where U : int" and that's disallowed by the language.  So we must
+                // generate something explicit here.
+                if (member.Kind != SymbolKind.Method)
+                {
+                    return false;
+                }
+
+                var method = member as IMethodSymbol;
+
+                return method.TypeParameters.Any(IsUnexpressableTypeParameter);
+            }
+
+            private static bool IsUnexpressableTypeParameter(ITypeParameterSymbol typeParameter)
+            {
+                var condition1 = typeParameter.ConstraintTypes.Count(t => t.TypeKind == TypeKind.Class) >= 2;
+                var condition2 = typeParameter.ConstraintTypes.Any(ts => ts.IsUnexpressableTypeParameterConstraint());
+                var condition3 = typeParameter.HasReferenceTypeConstraint && typeParameter.ConstraintTypes.Any(ts => ts.IsReferenceType && ts.SpecialType != SpecialType.System_Object);
+
+                return condition1 || condition2 || condition3;
+            }
+
+            private ISymbol GenerateMember(
+                Compilation compilation,
+                ISymbol member,
+                string memberName,
+                bool generateInvisibly,
+                bool generateAbstractly,
+                bool addNew,
+                bool addUnsafe,
+                CancellationToken cancellationToken)
+            {
+                var factory = this.Document.GetLanguageService<SyntaxGenerator>();
+				var modifiers = DeclarationModifiers.None.WithIsAbstract(generateAbstractly).WithIsNew (addNew).WithIsUnsafe (addUnsafe);
+
+                var useExplicitInterfaceSymbol = generateInvisibly || !Service.CanImplementImplicitly;
+                var accessibility = member.Name == memberName ? Accessibility.Public : Accessibility.Private;
+
+                if (member.Kind == SymbolKind.Method)
+                {
+                    var method = (IMethodSymbol)member;
+
+                    return GenerateMethod(compilation, method, accessibility, modifiers, generateAbstractly, useExplicitInterfaceSymbol, memberName, cancellationToken);
+                }
+                else if (member.Kind == SymbolKind.Property)
+                {
+                    var property = (IPropertySymbol)member;
+
+                    return GenerateProperty(compilation, property, accessibility, modifiers, generateAbstractly, useExplicitInterfaceSymbol, memberName, cancellationToken);
+                }
+                else if (member.Kind == SymbolKind.Event)
+                {
+                    var @event = (IEventSymbol)member;
+
+                    var accessor = CodeGenerationSymbolFactory.CreateAccessorSymbol(
+                        attributes: null,
+                        accessibility: Accessibility.NotApplicable,
+                        statements: factory.CreateThrowNotImplementedStatementBlock(compilation));
+
+                    return CodeGenerationSymbolFactory.CreateEventSymbol(
+                        @event,
+                        accessibility: accessibility,
+                        modifiers: modifiers,
+                        explicitInterfaceSymbol: useExplicitInterfaceSymbol ? @event : null,
+                        name: memberName,
+                        addMethod: generateInvisibly ? accessor : null,
+                        removeMethod: generateInvisibly ? accessor : null);
+                }
+
+                return null;
+            }
+
+            private SyntaxNode CreateThroughExpression(SyntaxGenerator factory)
+            {
+                var through = ThroughMember.IsStatic
+                    ? factory.IdentifierName(State.ClassOrStructType.Name)
+                    : factory.ThisExpression();
+
+                through = factory.MemberAccessExpression(
+                    through, factory.IdentifierName(ThroughMember.Name));
+
+                var throughMemberType = ThroughMember.GetMemberType();
+                if ((State.InterfaceTypes != null) && (throughMemberType != null))
+                {
+                    // In the case of 'implement interface through field / property' , we need to know what
+                    // interface we are implementing so that we can insert casts to this interface on every
+                    // usage of the field in the generated code. Without these casts we would end up generating
+                    // code that fails compilation in certain situations.
+                    // 
+                    // For example consider the following code.
+                    //      class C : IReadOnlyList<int> { int[] field; }
+                    // When applying the 'implement interface through field' code fix in the above example,
+                    // we need to generate the following code to implement the Count property on IReadOnlyList<int>
+                    //      class C : IReadOnlyList<int> { int[] field; int Count { get { ((IReadOnlyList<int>)field).Count; } ...}
+                    // as opposed to the following code which will fail to compile (because the array field
+                    // doesn't have a property named .Count) -
+                    //      class C : IReadOnlyList<int> { int[] field; int Count { get { field.Count; } ...}
+                    //
+                    // The 'InterfaceTypes' property on the state object always contains only one item
+                    // in the case of C# i.e. it will contain exactly the interface we are trying to implement.
+                    // This is also the case most of the time in the case of VB, except in certain error conditions
+                    // (recursive / circular cases) where the span of the squiggle for the corresponding 
+                    // diagnostic (BC30149) changes and 'InterfaceTypes' ends up including all interfaces
+                    // in the Implements clause. For the purposes of inserting the above cast, we ignore the
+                    // uncommon case and optimize for the common one - in other words, we only apply the cast
+                    // in cases where we can unambiguously figure out which interface we are trying to implement.
+                    var interfaceBeingImplemented = State.InterfaceTypes.SingleOrDefault();
+                    if ((interfaceBeingImplemented != null) && (!throughMemberType.Equals(interfaceBeingImplemented)))
+                    {
+                        through = factory.CastExpression(interfaceBeingImplemented,
+                            through.WithAdditionalAnnotations (Simplifier.Annotation));
+
+						through = through.Parenthesize();
+                    }
+                }
+
+                return through.WithAdditionalAnnotations(Simplifier.Annotation);
+            }
+
+            private bool HasNameConflict(
+                ISymbol member,
+                string memberName,
+                IEnumerable<INamedTypeSymbol> baseTypes)
+            {
+                // There's a naming conflict if any member in the base types chain is accessible to
+                // us, has our name.  Note: a simple name won't conflict with a generic name (and
+                // vice versa).  A method only conflicts with another method if they have the same
+                // parameter signature (return type is irrelevant). 
+                return
+                    baseTypes.Any(ts => ts.GetMembers(memberName)
+                                          .Where(m => m.IsAccessibleWithin(State.ClassOrStructType))
+                                          .Any(m => HasNameConflict(member, memberName, m)));
+            }
+
+            private static bool HasNameConflict(
+                ISymbol member,
+                string memberName,
+                ISymbol baseMember)
+            {
+                //Contract.Requires(memberName == baseMember.Name);
+
+                if (member.Kind == SymbolKind.Method && baseMember.Kind == SymbolKind.Method)
+                {
+                    // A method only conflicts with another method if htey have the same parameter
+                    // signature (return type is irrelevant). 
+                    var method1 = (IMethodSymbol)member;
+                    var method2 = (IMethodSymbol)baseMember;
+
+                    if (method1.MethodKind == MethodKind.Ordinary &&
+                        method2.MethodKind == MethodKind.Ordinary &&
+                        method1.TypeParameters.Length == method2.TypeParameters.Length)
+                    {
+                        return method1.Parameters.Select(p => p.Type)
+                                                 .SequenceEqual(method2.Parameters.Select(p => p.Type));
+                    }
+                }
+
+                // Any non method members with the same name simple name conflict.
+                return true;
+            }
+
+            private bool IdentifiersMatch(string identifier1, string identifier2)
+            {
+                return this.IsCaseSensitive
+                    ? identifier1 == identifier2
+                    : StringComparer.OrdinalIgnoreCase.Equals(identifier1, identifier2);
+            }
+
+            private bool IsCaseSensitive
+            {
+                get
+                {
+					return true;//this.Document.GetLanguageService<ISyntaxFactsService>().IsCaseSensitive;
+                }
+            }
+
+            private bool HasMatchingMember(List<ISymbol> implementedVisibleMembers, ISymbol member)
+            {
+                // If this is a language that doesn't support implicit implementation then no
+                // implemented members will ever match.  For example, if you have:
+                //
+                // Interface IFoo : sub Foo() : End Interface
+                //
+                // Interface IBar : Inherits IFoo : Shadows Sub Foo() : End Interface
+                //
+                // Class C : Implements IBar
+                //
+                // We'll first end up generating:
+                //
+                // Public Sub Foo() Implements IFoo.Foo
+                //
+                // However, that same method won't be viable for IBar.Foo (unlike C#) because it
+                // explicitly specifies its interface).
+                if (!Service.CanImplementImplicitly)
+                {
+                    return false;
+                }
+
+                return implementedVisibleMembers.Any(m => MembersMatch(m, member));
+            }
+
+            private bool MembersMatch(ISymbol member1, ISymbol member2)
+            {
+                if (member1.Kind != member2.Kind)
+                {
+                    return false;
+                }
+
+				if (member1.DeclaredAccessibility != member2.DeclaredAccessibility ||
+				    member1.IsStatic != member2.IsStatic)
+                {
+                    return false;
+                }
+
+                if (member1.ExplicitInterfaceImplementations().Any() || member2.ExplicitInterfaceImplementations().Any())
+                {
+                    return false;
+                }
+
+				return SignatureComparer.HaveSameSignatureAndConstraintsAndReturnTypeAndAccessors(
+                    member1, member2, this.IsCaseSensitive);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Conflicts.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Conflicts.cs
new file mode 100644
index 0000000000..0e92c1a073
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Conflicts.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface
+{
+    abstract partial class AbstractImplementInterfaceService
+    {
+        internal partial class ImplementInterfaceCodeAction
+        {
+            private bool HasConflictingMember(ISymbol member, List<ISymbol> implementedVisibleMembers)
+            {
+                // Checks if this member conflicts with an existing member in classOrStructType or with
+                // a method we've already implemented.  If so, we'll need to implement this one
+                // explicitly.
+
+                var allMembers = State.ClassOrStructType.GetAccessibleMembersInThisAndBaseTypes<ISymbol>(State.ClassOrStructType).Concat(implementedVisibleMembers);
+
+                var conflict1 = allMembers.Any(m => HasConflict(m, member));
+                var conflict2 = IsReservedName(member.Name);
+
+                return conflict1 || conflict2;
+            }
+
+            private bool HasConflict(ISymbol member1, ISymbol member2)
+            {
+                // If either of these members are invisible explicit, then there is no conflict.
+                if (Service.HasHiddenExplicitImplementation)
+                {
+                    if (member1.ExplicitInterfaceImplementations().Any() || member2.ExplicitInterfaceImplementations().Any())
+                    {
+                        // explicit methods don't conflict with anything.
+                        return false;
+                    }
+                }
+
+                // Members normally conflict if they have the same name.  The exceptions are methods
+                // and parameterized properties (which conflict if htey have the same signature).
+                if (!IdentifiersMatch(member1.Name, member2.Name))
+                {
+                    return false;
+                }
+
+                // If they differ in type, then it's almost always a conflict.  There may be
+                // exceptions to this, but i don't know of any.
+                if (member1.Kind != member2.Kind)
+                {
+                    return true;
+                }
+
+                // At this point, we have two members of the same type with the same name.  If they
+                // have a different signature (for example, methods, or parameterized properties),
+                // then they do not conflict.
+                if (!SignatureComparer.HaveSameSignature(member1, member2, this.IsCaseSensitive))
+                {
+                    return false;
+                }
+
+                // Now we have to members with the same name, type and signature. If the language
+                // doesn't support implicit implementation, then these members are definitely in
+                // conflict.
+                if (!Service.CanImplementImplicitly)
+                {
+                    return true;
+                }
+
+                // two members conflict if they have the same signature and have
+                //
+                // a) different return types
+                // b) different accessibility
+                // c) different constraints
+                if (member1.DeclaredAccessibility != member2.DeclaredAccessibility ||
+                    !SignatureComparer.HaveSameSignatureAndConstraintsAndReturnTypeAndAccessors(member1, member2, this.IsCaseSensitive))
+                {
+                    return true;
+                }
+
+                // Same name, type, accessibility, return type, *and* the services can implement
+                // implicitly.  These are not in conflict.
+                return false;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Method.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Method.cs
new file mode 100644
index 0000000000..228a0df7f8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Method.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface
+{
+	abstract partial class AbstractImplementInterfaceService
+    {
+        internal partial class ImplementInterfaceCodeAction
+        {
+            private ISymbol GenerateMethod(
+                Compilation compilation,
+                IMethodSymbol method,
+                Accessibility accessibility,
+                DeclarationModifiers modifiers,
+                bool generateAbstractly,
+                bool useExplicitInterfaceSymbol,
+                string memberName,
+                CancellationToken cancellationToken)
+            {
+
+                var updatedMethod = method.EnsureNonConflictingNames(
+                    this.State.ClassOrStructType, cancellationToken);
+
+                updatedMethod = updatedMethod.RemoveAttributeFromParametersAndReturnType(compilation.ComAliasNameAttributeType());
+
+                return CodeGenerationSymbolFactory.CreateMethodSymbol(
+                    updatedMethod,
+                    accessibility: accessibility,
+                    modifiers: modifiers,
+                    explicitInterfaceSymbol: useExplicitInterfaceSymbol ? updatedMethod : null,
+                    name: memberName,
+                    statements: generateAbstractly ? null : new[] { CreateStatement(compilation, updatedMethod, cancellationToken) });
+            }
+
+            private SyntaxNode CreateStatement(
+                Compilation compilation,
+                IMethodSymbol method,
+                CancellationToken cancellationToken)
+            {
+                if (ThroughMember == null)
+                {
+                    var factory = this.Document.GetLanguageService<SyntaxGenerator>();
+                    return factory.CreateThrowNotImplementStatement(compilation);
+                }
+                else
+                {
+                    return CreateDelegationStatement(method);
+                }
+            }
+
+            private SyntaxNode CreateDelegationStatement(
+                IMethodSymbol method)
+            {
+                var factory = this.Document.GetLanguageService<SyntaxGenerator>();
+                var through = CreateThroughExpression(factory);
+
+                var memberName = method.IsGenericMethod
+                    ? factory.GenericName(method.Name, method.TypeArguments.OfType<ITypeSymbol>().ToList())
+                    : factory.IdentifierName(method.Name);
+
+                through = factory.MemberAccessExpression(
+                    through, memberName);
+
+                var arguments = factory.CreateArguments(method.Parameters.As<IParameterSymbol>());
+                var invocationExpression = factory.InvocationExpression(through, arguments);
+
+                return method.ReturnsVoid
+                    ? factory.ExpressionStatement(invocationExpression)
+                    : factory.ReturnStatement(invocationExpression);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Property.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Property.cs
new file mode 100644
index 0000000000..3141688e3a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.CodeAction_Property.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface
+{
+	abstract partial class AbstractImplementInterfaceService
+    {
+		internal partial class ImplementInterfaceCodeAction
+        {
+            private ISymbol GenerateProperty(
+                Compilation compilation,
+                IPropertySymbol property,
+                Accessibility accessibility,
+                DeclarationModifiers modifiers,
+                bool generateAbstractly,
+                bool useExplicitInterfaceSymbol,
+                string memberName,
+                CancellationToken cancellationToken)
+            {
+                //var factory = this.Document.GetLanguageService<SyntaxGenerator>();
+                var comAliasNameAttribute = compilation.ComAliasNameAttributeType();
+
+                var getAccessor = property.GetMethod == null
+                    ? null
+                    : CodeGenerationSymbolFactory.CreateAccessorSymbol(
+                        property.GetMethod.RemoveAttributeFromParametersAndReturnType(comAliasNameAttribute),
+                        attributes: null,
+                        accessibility: accessibility,
+                        explicitInterfaceSymbol: useExplicitInterfaceSymbol ? property.GetMethod : null,
+                        statements: GetGetAccessorStatements(compilation, property, generateAbstractly, cancellationToken));
+
+                var setAccessor = property.SetMethod == null
+                    ? null
+                    : CodeGenerationSymbolFactory.CreateAccessorSymbol(
+                        property.SetMethod.RemoveAttributeFromParametersAndReturnType(comAliasNameAttribute),
+                        attributes: null,
+                        accessibility: accessibility,
+                        explicitInterfaceSymbol: useExplicitInterfaceSymbol ? property.SetMethod : null,
+                        statements: GetSetAccessorStatements(compilation, property, generateAbstractly, cancellationToken));
+
+                var parameterNames = NameGenerator.EnsureUniqueness(
+                    property.Parameters.Select(p => p.Name).ToList(), isCaseSensitive: true);
+
+				var updatedProperty = property.RenameParameters(parameterNames);
+
+                updatedProperty = updatedProperty.RemoveAttributeFromParameters(comAliasNameAttribute);
+
+                // TODO(cyrusn): Delegate through throughMember if it's non-null.
+                return CodeGenerationSymbolFactory.CreatePropertySymbol(
+                    updatedProperty,
+                    accessibility: accessibility,
+                    modifiers: modifiers,
+                    explicitInterfaceSymbol: useExplicitInterfaceSymbol ? property : null,
+                    name: memberName,
+                    getMethod: getAccessor,
+                    setMethod: setAccessor);
+            }
+
+            private IList<SyntaxNode> GetSetAccessorStatements(
+                Compilation compilation,
+                IPropertySymbol property,
+                bool generateAbstractly,
+                CancellationToken cancellationToken)
+            {
+                if (generateAbstractly)
+                {
+                    return null;
+                }
+
+                var factory = this.Document.GetLanguageService<SyntaxGenerator>();
+                if (ThroughMember != null)
+                {
+                    var throughExpression = CreateThroughExpression(factory);
+                    SyntaxNode expression;
+
+                    if (property.IsIndexer)
+                    {
+                        expression = throughExpression;
+                    }
+                    else
+                    {
+                        expression = factory.MemberAccessExpression(
+                                                throughExpression, factory.IdentifierName(property.Name));
+                    }
+
+                    if (property.Parameters.Length > 0)
+                    {
+                        var arguments = factory.CreateArguments(property.Parameters.As<IParameterSymbol>());
+                        expression = factory.ElementAccessExpression(expression, arguments);
+                    }
+
+                    expression = factory.AssignmentStatement(expression, factory.IdentifierName("value"));
+
+                    return new[] { factory.ExpressionStatement(expression) };
+                }
+
+				return factory.CreateThrowNotImplementedStatementBlock(compilation);
+            }
+
+            private IList<SyntaxNode> GetGetAccessorStatements(
+                Compilation compilation,
+                IPropertySymbol property,
+                bool generateAbstractly,
+                CancellationToken cancellationToken)
+            {
+                if (generateAbstractly)
+                {
+                    return null;
+                }
+
+                var factory = this.Document.GetLanguageService<SyntaxGenerator>();
+                if (ThroughMember != null)
+                {
+                    var throughExpression = CreateThroughExpression(factory);
+                    SyntaxNode expression;
+
+                    if (property.IsIndexer)
+                    {
+                        expression = throughExpression;
+                    }
+                    else
+                    {
+                        expression = factory.MemberAccessExpression(
+                                                throughExpression, factory.IdentifierName(property.Name));
+                    }
+
+                    if (property.Parameters.Length > 0)
+                    {
+                        var arguments = factory.CreateArguments(property.Parameters.As<IParameterSymbol>());
+                        expression = factory.ElementAccessExpression(expression, arguments);
+                    }
+
+                    return new[] { factory.ReturnStatement(expression) };
+                }
+
+                return factory.CreateThrowNotImplementedStatementBlock(compilation);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.DisposePatternCodeAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.DisposePatternCodeAction.cs
new file mode 100644
index 0000000000..f88296279e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.DisposePatternCodeAction.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface
+{
+	abstract partial class AbstractImplementInterfaceService
+    {
+        private static INamedTypeSymbol TryGetSymbolForIDisposable(Compilation compilation)
+        {
+            // Get symbol for 'System.IDisposable'.
+            var idisposable = compilation.GetSpecialType(SpecialType.System_IDisposable);
+            if ((idisposable != null) && (idisposable.TypeKind == TypeKind.Interface))
+            {
+                var idisposableMembers = idisposable.GetMembers().ToArray();
+
+                // Get symbol for 'System.IDisposable.Dispose()'.
+                IMethodSymbol disposeMethod = null;
+                if ((idisposableMembers.Length == 1) && (idisposableMembers[0].Kind == SymbolKind.Method) &&
+                    (idisposableMembers[0].Name == "Dispose"))
+                {
+                    disposeMethod = idisposableMembers[0] as IMethodSymbol;
+                    if ((disposeMethod != null) && (!disposeMethod.IsStatic) && disposeMethod.ReturnsVoid &&
+                        (disposeMethod.Arity == 0) && (disposeMethod.Parameters.Length == 0))
+                    {
+                        return idisposable;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private bool ShouldImplementDisposePattern(Document document, State state, bool explicitly)
+        {
+            // Dispose pattern should be implemented only if -
+            // 1. An interface named 'System.IDisposable' is unimplemented.
+            // 2. This interface has one and only one member - a non-generic method named 'Dispose' that takes no arguments and returns 'void'.
+            // 3. The implementing type is a class that does not already declare any conflicting members named 'disposedValue' or 'Dispose'
+            //    (because we will be generating a 'disposedValue' field and a couple of methods named 'Dispose' as part of implementing 
+            //    the dispose pattern).
+            var unimplementedMembers = explicitly ? state.UnimplementedExplicitMembers : state.UnimplementedMembers;
+            var idisposable = TryGetSymbolForIDisposable(state.Model.Compilation);
+            return (idisposable != null) &&
+                   unimplementedMembers.Any(m => m.Item1.Equals(idisposable)) &&
+                   this.CanImplementDisposePattern(state.ClassOrStructType, state.ClassOrStructDecl);
+        }
+
+        internal class ImplementInterfaceWithDisposePatternCodeAction : ImplementInterfaceCodeAction
+        {
+            internal ImplementInterfaceWithDisposePatternCodeAction(
+                AbstractImplementInterfaceService service,
+                Document document,
+                State state,
+                bool explicitly,
+                bool abstractly,
+                ISymbol throughMember) : base(service, document, state, explicitly, abstractly, throughMember)
+            {
+            }
+
+            public static ImplementInterfaceWithDisposePatternCodeAction CreateImplementWithDisposePatternCodeAction(
+                AbstractImplementInterfaceService service,
+                Document document,
+                State state)
+            {
+                return new ImplementInterfaceWithDisposePatternCodeAction(service, document, state, explicitly: false, abstractly: false, throughMember: null);
+            }
+
+            public static ImplementInterfaceWithDisposePatternCodeAction CreateImplementExplicitlyWithDisposePatternCodeAction(
+                AbstractImplementInterfaceService service,
+                Document document,
+                State state)
+            {
+                return new ImplementInterfaceWithDisposePatternCodeAction(service, document, state, explicitly: true, abstractly: false, throughMember: null);
+            }
+
+            public override string Title
+            {
+                get
+                {
+                    if (Explicitly)
+                    {
+                        return Resources.ImplementInterfaceExplicitlyWithDisposePattern;
+                    }
+                    else
+                    {
+                        return Resources.ImplementInterfaceWithDisposePattern;
+                    }
+                }
+            }
+
+            private static readonly SyntaxAnnotation s_implementingTypeAnnotation = new SyntaxAnnotation("ImplementingType");
+            public override async Task<Document> GetUpdatedDocumentAsync(
+                    Document document,
+                    IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> unimplementedMembers,
+                    INamedTypeSymbol classOrStructType,
+                    SyntaxNode classOrStructDecl,
+                    CancellationToken cancellationToken)
+            {
+                var result = document;
+                var compilation = await result.Project.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
+
+                // Add an annotation to the type declaration node so that we can find it again to append the dispose pattern implementation below.
+                result = await result.ReplaceNodeAsync(
+                    classOrStructDecl,
+                    classOrStructDecl.WithAdditionalAnnotations(s_implementingTypeAnnotation),
+                    cancellationToken).ConfigureAwait(false);
+                var root = await result.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+                classOrStructDecl = root.GetAnnotatedNodes(s_implementingTypeAnnotation).Single();
+                compilation = await result.Project.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
+                classOrStructType = classOrStructType.GetSymbolKey().Resolve(compilation, cancellationToken: cancellationToken).Symbol as INamedTypeSymbol;
+
+                // Use the code generation service to generate all unimplemented members except those that are
+                // part of the dispose pattern. We can't use the code generation service to implement the dispose
+                // pattern since the code generation service doesn't support injection of the custom boiler
+                // plate code required for implementing the dispose pattern.
+                var idisposable = TryGetSymbolForIDisposable(compilation);
+                result = await base.GetUpdatedDocumentAsync(
+                                            result,
+                                            unimplementedMembers.Where(m => !m.Item1.Equals(idisposable)).ToList(),
+                                            classOrStructType,
+                                            classOrStructDecl,
+                                            cancellationToken).ConfigureAwait(false);
+
+                // Now append the dispose pattern implementation.
+                root = await result.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+                classOrStructDecl = root.GetAnnotatedNodes(s_implementingTypeAnnotation).Single();
+                compilation = await result.Project.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
+                classOrStructType = classOrStructType.GetSymbolKey().Resolve(compilation, cancellationToken: cancellationToken).Symbol as INamedTypeSymbol;
+                result = Service.ImplementDisposePattern(result, root, classOrStructType, classOrStructDecl.SpanStart, Explicitly);
+
+                // Remove the annotation since we don't need it anymore.
+                root = await result.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+                classOrStructDecl = root.GetAnnotatedNodes(s_implementingTypeAnnotation).Single();
+                result = await result.ReplaceNodeAsync(
+                    classOrStructDecl,
+                    classOrStructDecl.WithoutAnnotations(s_implementingTypeAnnotation),
+                    cancellationToken).ConfigureAwait(false);
+
+                return result;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.State.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.State.cs
new file mode 100644
index 0000000000..b1048b7efa
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.State.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface
+{
+	abstract partial class AbstractImplementInterfaceService
+    {
+		internal protected class State
+        {
+            public SyntaxNode Location { get; }
+            public SyntaxNode ClassOrStructDecl { get; }
+            public INamedTypeSymbol ClassOrStructType { get; }
+            public IEnumerable<INamedTypeSymbol> InterfaceTypes { get; }
+            public SemanticModel Model { get; }
+
+            // The members that are not implemented at all.
+            public IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> UnimplementedMembers { get; private set; }
+
+            // The members that have no explicit implementation.
+            public IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> UnimplementedExplicitMembers { get; private set; }
+
+            public State(SyntaxNode interfaceNode, SyntaxNode classOrStructDecl, INamedTypeSymbol classOrStructType, IEnumerable<INamedTypeSymbol> interfaceTypes, SemanticModel model)
+            {
+                this.Location = interfaceNode;
+                this.ClassOrStructDecl = classOrStructDecl;
+                this.ClassOrStructType = classOrStructType;
+                this.InterfaceTypes = interfaceTypes;
+                this.Model = model;
+            }
+
+            public static State Generate(
+                AbstractImplementInterfaceService service,
+                Document document,
+                SemanticModel model,
+                SyntaxNode interfaceNode,
+                CancellationToken cancellationToken)
+            {
+                SyntaxNode classOrStructDecl;
+                INamedTypeSymbol classOrStructType;
+                IEnumerable<INamedTypeSymbol> interfaceTypes;
+                if (!service.TryInitializeState(document, model, interfaceNode, cancellationToken,
+                    out classOrStructDecl, out classOrStructType, out interfaceTypes))
+                {
+                    return null;
+                }
+
+                if (!CodeGenerator.CanAdd(document.Project.Solution, classOrStructType, cancellationToken))
+                {
+                    return null;
+                }
+
+                var state = new State(interfaceNode, classOrStructDecl, classOrStructType, interfaceTypes, model);
+
+                if (service.CanImplementImplicitly)
+                {
+                    state.UnimplementedMembers = state.ClassOrStructType.GetAllUnimplementedMembers(
+                        interfaceTypes, cancellationToken);
+
+                    state.UnimplementedExplicitMembers = state.ClassOrStructType.GetAllUnimplementedExplicitMembers(
+                        interfaceTypes, cancellationToken);
+
+                    var allMembersImplemented = state.UnimplementedMembers == null || state.UnimplementedMembers.Count == 0;
+                    var allMembersImplementedExplicitly = state.UnimplementedExplicitMembers == null || state.UnimplementedExplicitMembers.Count == 0;
+
+                    return !allMembersImplementedExplicitly && !allMembersImplemented ? state : null;
+                }
+                else
+                {
+                    state.UnimplementedMembers = state.ClassOrStructType.GetAllUnimplementedExplicitMembers(
+                        interfaceTypes, cancellationToken);
+
+                    var allMembersImplemented = state.UnimplementedMembers == null || state.UnimplementedMembers.Count == 0;
+                    return !allMembersImplemented ? state : null;
+                }
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.cs
new file mode 100644
index 0000000000..f4ba3bcf6f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/AbstractImplementInterfaceService.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface
+{
+	abstract partial class AbstractImplementInterfaceService
+	{
+		protected AbstractImplementInterfaceService()
+		{
+		}
+
+		protected abstract bool CanImplementImplicitly { get; }
+		protected abstract bool HasHiddenExplicitImplementation { get; }
+		protected abstract bool TryInitializeState(Document document, SemanticModel model, SyntaxNode interfaceNode, CancellationToken cancellationToken, out SyntaxNode classOrStructDecl, out INamedTypeSymbol classOrStructType, out IEnumerable<INamedTypeSymbol> interfaceTypes);
+		protected abstract bool CanImplementDisposePattern(INamedTypeSymbol symbol, SyntaxNode classDecl);
+		protected abstract Document ImplementDisposePattern(Document document, SyntaxNode root, INamedTypeSymbol symbol, int position, bool explicitly);
+
+		public async Task<Document> ImplementInterfaceAsync(Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var state = State.Generate(this, document, model, node, cancellationToken);
+			if (state == null)
+			{
+				return document;
+			}
+
+			// While implementing just one default action, like in the case of pressing enter after interface name in VB,
+			// choose to implement with the dispose pattern as that's the Dev12 behavior.
+			var action = ShouldImplementDisposePattern(document, state, explicitly: false) ?
+				ImplementInterfaceWithDisposePatternCodeAction.CreateImplementWithDisposePatternCodeAction(this, document, state) :
+				ImplementInterfaceCodeAction.CreateImplementCodeAction(this, document, state);
+
+			return await action.GetUpdatedDocumentAsync(cancellationToken).ConfigureAwait(false);
+		}
+
+		public IEnumerable<CodeAction> GetCodeActions(Document document, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var state = State.Generate(this, document, model, node, cancellationToken);
+			return GetActions(document, state);
+		}
+
+		private IEnumerable<CodeAction> GetActions(Document document, State state)
+		{
+			if (state == null)
+			{
+				yield break;
+			}
+
+			if (state.UnimplementedMembers != null && state.UnimplementedMembers.Count > 0)
+			{
+				yield return ImplementInterfaceCodeAction.CreateImplementCodeAction(this, document, state);
+
+				if (ShouldImplementDisposePattern(document, state, explicitly: false))
+				{
+					yield return ImplementInterfaceWithDisposePatternCodeAction.CreateImplementWithDisposePatternCodeAction(this, document, state);
+				}
+
+				var delegatableMembers = GetDelegatableMembers(state);
+				foreach (var member in delegatableMembers)
+				{
+					yield return ImplementInterfaceCodeAction.CreateImplementThroughMemberCodeAction(this, document, state, member);
+				}
+
+				if (state.ClassOrStructType.IsAbstract)
+				{
+					yield return ImplementInterfaceCodeAction.CreateImplementAbstractlyCodeAction(this, document, state);
+				}
+			}
+
+			if (state.UnimplementedExplicitMembers != null && state.UnimplementedExplicitMembers.Count > 0)
+			{
+				yield return ImplementInterfaceCodeAction.CreateImplementExplicitlyCodeAction(this, document, state);
+
+				if (ShouldImplementDisposePattern(document, state, explicitly: true))
+				{
+					yield return ImplementInterfaceWithDisposePatternCodeAction.CreateImplementExplicitlyWithDisposePatternCodeAction(this, document, state);
+				}
+			}
+		}
+
+		private IList<ISymbol> GetDelegatableMembers(State state)
+		{
+			var fields =
+				state.ClassOrStructType.GetMembers()
+					.OfType<IFieldSymbol>()
+					.Where(f => !f.IsImplicitlyDeclared)
+					.Where(f => f.Type.GetAllInterfacesIncludingThis().Contains(state.InterfaceTypes.First()))
+					.OfType<ISymbol>();
+
+			// Select all properties with zero parameters that also have a getter
+			var properties =
+				state.ClassOrStructType.GetMembers()
+					.OfType<IPropertySymbol>()
+					.Where(p => (!p.IsImplicitlyDeclared) && (p.Parameters.Length == 0) && (p.GetMethod != null))
+					.Where(p => p.Type.GetAllInterfacesIncludingThis().Contains(state.InterfaceTypes.First()))
+					.OfType<ISymbol>();
+
+			return fields.Concat(properties).ToList();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/CSharpImplementInterfaceService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/CSharpImplementInterfaceService.cs
new file mode 100644
index 0000000000..33834a9f6e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ImplementInterface/CSharpImplementInterfaceService.cs
@@ -0,0 +1,170 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Composition;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.ImplementInterface
+{
+	class CSharpImplementInterfaceService : AbstractImplementInterfaceService
+	{
+		protected override bool TryInitializeState(
+			Document document, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken,
+			out SyntaxNode classOrStructDecl, out INamedTypeSymbol classOrStructType, out IEnumerable<INamedTypeSymbol> interfaceTypes)
+		{
+			if (!cancellationToken.IsCancellationRequested)
+			{
+				var interfaceNode = node as TypeSyntax;
+				if (interfaceNode != null && interfaceNode.Parent is BaseTypeSyntax &&
+					interfaceNode.Parent.IsParentKind(SyntaxKind.BaseList) &&
+					((BaseTypeSyntax)interfaceNode.Parent).Type == interfaceNode)
+				{
+					if (interfaceNode.Parent.Parent.IsParentKind(SyntaxKind.ClassDeclaration) ||
+						interfaceNode.Parent.Parent.IsParentKind(SyntaxKind.StructDeclaration))
+					{
+						var interfaceSymbolInfo = model.GetSymbolInfo(interfaceNode, cancellationToken);
+						if (interfaceSymbolInfo.CandidateReason != CandidateReason.WrongArity)
+						{
+							var interfaceType = interfaceSymbolInfo.GetAnySymbol() as INamedTypeSymbol;
+							cancellationToken.ThrowIfCancellationRequested();
+
+							if (interfaceType != null && interfaceType.TypeKind == TypeKind.Interface)
+							{
+								classOrStructDecl = interfaceNode.Parent.Parent.Parent as TypeDeclarationSyntax;
+								classOrStructType = model.GetDeclaredSymbol(classOrStructDecl, cancellationToken) as INamedTypeSymbol;
+								interfaceTypes = SpecializedCollections.SingletonEnumerable(interfaceType);
+
+								return interfaceTypes != null && classOrStructType != null;
+							}
+						}
+					}
+				}
+			}
+
+			classOrStructDecl = null;
+			classOrStructType = null;
+			interfaceTypes = null;
+			return false;
+		}
+
+		protected override bool CanImplementImplicitly
+		{
+			get
+			{
+				return true;
+			}
+		}
+
+		protected override bool HasHiddenExplicitImplementation
+		{
+			get
+			{
+				return true;
+			}
+		}
+
+		private static ClassDeclarationSyntax GetClassDeclarationAt(SyntaxNode root, int position)
+		{
+			var node = root.FindToken(position).Parent.FirstAncestorOrSelf((SyntaxNode n) => n.IsKind(SyntaxKind.ClassDeclaration));
+			return node as ClassDeclarationSyntax;
+		}
+
+		protected override bool CanImplementDisposePattern(INamedTypeSymbol symbol, SyntaxNode classDecl)
+		{
+			// The dispose pattern is only applicable if the implementing type is a class that does not already declare any conflicting
+			// members named 'disposedValue' or 'Dispose' (because we will be generating a 'disposedValue' field and a couple of methods
+			// named 'Dispose' as part of implementing the dispose pattern).
+			return (classDecl != null) &&
+				classDecl.IsKind(SyntaxKind.ClassDeclaration) &&
+				(symbol != null) &&
+				!symbol.GetMembers().Any(m => (m.MetadataName == "Dispose") || (m.MetadataName == "disposedValue"));
+		}
+
+		protected override Document ImplementDisposePattern(Document document, SyntaxNode root, INamedTypeSymbol symbol, int position, bool explicitly)
+		{
+			var classDecl = GetClassDeclarationAt(root, position);
+			Debug.Assert(CanImplementDisposePattern(symbol, classDecl), "ImplementDisposePattern called with bad inputs");
+
+			// Generate the IDisposable boilerplate code.  The generated code cannot be one giant resource string
+			// because of the need to parse, format, and simplify the result; during pseudo-localized builds, resource
+			// strings are given a special prefix and suffix that will break the parser, hence the requirement to
+			// localize the comments individually.
+			var code = string.Format (@"
+    #region IDisposable Support
+    private bool disposedValue = false; // {0}
+
+    {1}void Dispose(bool disposing)
+			{{
+					if (!disposedValue)
+					{{
+							if (disposing)
+							{{
+									// {2}
+								}}
+
+							// {3}
+							// {4}
+
+							disposedValue = true;
+						}}
+				}}
+
+				// {5}
+				// ~{6}() {{
+				//   // {7}
+				//   Dispose(false);
+				// }}
+
+				// {8}
+				{9}Dispose()
+			{{
+					// {10}
+					Dispose(true);
+					// {11}
+					// GC.SuppressFinalize(this);
+				}}
+				#endregion
+				",
+				Resources.ToDetectRedundantCalls, 
+				(symbol.IsSealed ? "" : "protected virtual "), 
+				Resources.DisposeManagedStateTodo, 
+				Resources.FreeUnmanagedResourcesTodo, 
+				Resources.SetLargeFieldsToNullTodo, 
+				Resources.OverrideAFinalizerTodo, 
+				classDecl.Identifier.Value, 
+				Resources.DoNotChangeThisCodeUseDispose, 
+				Resources.ThisCodeAddedToCorrectlyImplementDisposable, 
+				(explicitly ? "void System.IDisposable." : "public void "), 
+				Resources.DoNotChangeThisCodeUseDispose,
+				Resources.UncommentTheFollowingIfFinalizerOverriddenTodo
+			);
+
+				var decls = SyntaxFactory.ParseSyntaxTree(code)
+				.GetRoot().DescendantNodes().OfType<MemberDeclarationSyntax>()
+				.Select(decl => decl.WithAdditionalAnnotations(Formatter.Annotation, Simplifier.Annotation))
+				.ToArray();
+
+			// Append #endregion to the trailing trivia of the last declaration being generated.
+			decls[decls.Length - 1] = decls[decls.Length - 1].WithAppendedTrailingTrivia(
+				SyntaxFactory.TriviaList(
+					SyntaxFactory.Trivia(SyntaxFactory.EndRegionDirectiveTrivia(true)),
+					SyntaxFactory.CarriageReturnLineFeed));
+
+			// Ensure that open and close brace tokens are generated in case they are missing.
+			var newNode = classDecl.EnsureOpenAndCloseBraceTokens().AddMembers(decls);
+
+			return document.WithSyntaxRoot(root.ReplaceNode(classDecl, newNode));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/CSharpIndentEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/CSharpIndentEngine.cs
new file mode 100644
index 0000000000..f7f4206ab1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/CSharpIndentEngine.cs
@@ -0,0 +1,535 @@
+//
+// CSharpIndentEngine.cs
+//
+// Author:
+//       Matej Miklečić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Miklečić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Core.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	///     Indentation engine based on a state machine.
+	///     Supports only pushing new chars to the end.
+	/// </summary>
+	/// <remarks>
+	///     Represents the context for transitions between <see cref="IndentState"/>.
+	///     Delegates the responsibility for pushing a new char to the current 
+	///     state and changes between states depending on the pushed chars.
+	/// </remarks>
+	class CSharpIndentEngine : IStateMachineIndentEngine
+	{
+		#region Properties
+
+		/// <summary>
+		///     Formatting options.
+		/// </summary>
+		internal readonly OptionSet options;
+
+		/// <summary>
+		///     Represents the new line character.
+		/// </summary>
+		internal readonly char newLineChar;
+
+		/// <summary>
+		///     The current indentation state.
+		/// </summary>
+		internal IndentState currentState;
+
+		/// <summary>
+		///     Stores conditional symbols of #define directives.
+		/// </summary>
+		internal HashSet<string> conditionalSymbols;
+
+		/// <summary>
+		///     Stores custom conditional symbols.
+		/// </summary>
+		internal HashSet<string> customConditionalSymbols;
+
+		/// <summary>
+		///     Stores the results of evaluations of the preprocessor if/elif directives 
+		///     in the current block (between #if and #endif).
+		/// </summary>
+		internal CloneableStack<bool> ifDirectiveEvalResults = new CloneableStack<bool> ();
+
+		/// <summary>
+		///     Stores the indentation levels of the if directives in the current block.
+		/// </summary>
+		internal CloneableStack<Indent> ifDirectiveIndents = new CloneableStack<Indent>();
+
+		/// <summary>
+		///     Stores the last sequence of characters that can form a
+		///     valid keyword or variable name.
+		/// </summary>
+		internal StringBuilder wordToken;
+
+		/// <summary>
+		///     Stores the previous sequence of chars that formed a
+		///     valid keyword or variable name.
+		/// </summary>
+		internal string previousKeyword;
+
+		#endregion
+
+		#region IDocumentIndentEngine
+
+		/// <inheritdoc />
+		public string ThisLineIndent
+		{
+			get
+			{
+				// OPTION: IndentBlankLines
+				// remove the indentation of this line if isLineStart is true
+//				if (!textEditorOptions.IndentBlankLines && isLineStart)
+//				{
+//					return string.Empty;
+//				}
+
+				return currentState.ThisLineIndent.IndentString;
+			}
+		}
+
+		/// <inheritdoc />
+		public string NextLineIndent
+		{
+			get
+			{
+				return currentState.NextLineIndent.IndentString;
+			}
+		}
+
+		/// <inheritdoc />
+		public string CurrentIndent
+		{
+			get
+			{
+				return currentIndent.ToString();
+			}
+		}
+
+		/// <inheritdoc />
+		/// <remarks>
+		///     This is set depending on the current <see cref="Location"/> and
+		///     can change its value until the <see cref="newLineChar"/> char is
+		///     pushed. If this is true, that doesn't necessarily mean that the
+		///     current line has an incorrect indent (this can be determined
+		///     only at the end of the current line).
+		/// </remarks>
+		public bool NeedsReindent
+		{
+			get
+			{
+				// return true if it's the first column of the line and it has an indent
+				if (previousChar == newLineChar)
+				{
+					return ThisLineIndent.Length > 0;
+				}
+
+				// ignore incorrect indentations when there's only ws on this line
+				if (isLineStart)
+				{
+					return false;
+				}
+
+				return ThisLineIndent != CurrentIndent.ToString();
+			}
+		}
+
+		/// <inheritdoc />
+		public int Offset
+		{
+			get
+			{
+				return offset;
+			}
+		}
+
+//		/// <inheritdoc />
+//		public TextLocation Location
+//		{
+//			get
+//			{
+//				return new TextLocation(line, column);
+//			}
+//		}
+
+		/// <inheritdoc />
+		public bool EnableCustomIndentLevels
+		{
+			get;
+			set;
+		}
+
+		#endregion
+
+		#region Fields
+
+		/// <summary>
+		///    Represents the number of pushed chars.
+		/// </summary>
+		internal int offset = 0;
+
+		/// <summary>
+		///    The current line number.
+		/// </summary>
+		internal int line = 1;
+
+		/// <summary>
+		///    The current column number.
+		/// </summary>
+		/// <remarks>
+		///    One char can take up multiple columns (e.g. \t).
+		/// </remarks>
+		internal int column = 1;
+
+		/// <summary>
+		///    True if <see cref="char.IsWhiteSpace(char)"/> is true for all
+		///    chars at the current line.
+		/// </summary>
+		internal bool isLineStart = true;
+
+		/// <summary>
+		///    True if <see cref="isLineStart"/> was true before the current
+		///    <see cref="wordToken"/>.
+		/// </summary>
+		internal bool isLineStartBeforeWordToken = true;
+
+		/// <summary>
+		///    Current char that's being pushed.
+		/// </summary>
+		internal char currentChar = '\0';
+
+		/// <summary>
+		///    Last non-whitespace char that has been pushed.
+		/// </summary>
+		internal char previousChar = '\0';
+
+		/// <summary>
+		///    Previous new line char
+		/// </summary>
+		internal char previousNewline = '\0';
+
+		/// <summary>
+		///    Current indent level on this line.
+		/// </summary>
+		internal StringBuilder currentIndent = new StringBuilder();
+
+		/// <summary>
+		///     True if this line began in <see cref="VerbatimStringState"/>.
+		/// </summary>
+		internal bool lineBeganInsideVerbatimString = false;
+
+		/// <summary>
+		///     True if this line began in <see cref="MultiLineCommentState"/>.
+		/// </summary>
+		internal bool lineBeganInsideMultiLineComment = false;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		///     Creates a new CSharpIndentEngine instance.
+		/// </summary>
+		/// <param name="formattingOptions">
+		///     C# formatting options.
+		/// </param>
+		public CSharpIndentEngine(OptionSet formattingOptions)
+		{
+			this.options = formattingOptions;
+
+			this.currentState = new GlobalBodyState(this);
+
+			this.conditionalSymbols = new HashSet<string>();
+			this.customConditionalSymbols = new HashSet<string>();
+			this.wordToken = new StringBuilder();
+			this.previousKeyword = string.Empty;
+			this.newLineChar = formattingOptions.GetOption(FormattingOptions.NewLine, LanguageNames.CSharp)[0];
+		}
+
+		/// <summary>
+		///     Creates a new CSharpIndentEngine instance from the given prototype.
+		/// </summary>
+		/// <param name="prototype">
+		///     An CSharpIndentEngine instance.
+		/// </param>
+		public CSharpIndentEngine(CSharpIndentEngine prototype)
+		{
+			this.options = prototype.options;
+
+			this.newLineChar = prototype.newLineChar;
+			this.currentState = prototype.currentState.Clone(this);
+			this.conditionalSymbols = new HashSet<string>(prototype.conditionalSymbols);
+			this.customConditionalSymbols = new HashSet<string>(prototype.customConditionalSymbols);
+
+			this.wordToken = new StringBuilder(prototype.wordToken.ToString());
+			this.previousKeyword = string.Copy(prototype.previousKeyword);
+
+			this.offset = prototype.offset;
+			this.line = prototype.line;
+			this.column = prototype.column;
+			this.isLineStart = prototype.isLineStart;
+			this.isLineStartBeforeWordToken = prototype.isLineStartBeforeWordToken;
+			this.currentChar = prototype.currentChar;
+			this.previousChar = prototype.previousChar;
+			this.previousNewline = prototype.previousNewline;
+			this.currentIndent = new StringBuilder(prototype.CurrentIndent.ToString());
+			this.lineBeganInsideMultiLineComment = prototype.lineBeganInsideMultiLineComment;
+			this.lineBeganInsideVerbatimString = prototype.lineBeganInsideVerbatimString;
+			this.ifDirectiveEvalResults = prototype.ifDirectiveEvalResults.Clone();
+			this.ifDirectiveIndents = prototype.ifDirectiveIndents.Clone();
+
+			this.EnableCustomIndentLevels = prototype.EnableCustomIndentLevels;
+		}
+
+		#endregion
+
+		#region IClonable
+
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+
+		/// <inheritdoc />
+		IDocumentIndentEngine IDocumentIndentEngine.Clone()
+		{
+			return Clone();
+		}
+
+		public IStateMachineIndentEngine Clone()
+		{
+			return new CSharpIndentEngine(this);
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <inheritdoc />
+		public void Push(char ch)
+		{
+			// append this char to the wordbuf if it can form a valid keyword, otherwise check
+			// if the last sequence of chars form a valid keyword and reset the wordbuf.
+			if ((wordToken.Length == 0 ? char.IsLetter(ch) : char.IsLetterOrDigit(ch)) || ch == '_')
+			{
+				wordToken.Append(ch);
+			}
+			else if (wordToken.Length > 0)
+			{
+				currentState.CheckKeyword(wordToken.ToString());
+				previousKeyword = wordToken.ToString();
+				wordToken.Length = 0;
+				isLineStartBeforeWordToken = false;
+			}
+
+			var isNewLine = NewLine.IsNewLine(ch);
+			if (!isNewLine) {
+				currentState.Push(currentChar = ch);
+				offset++;
+				previousNewline = '\0';
+				// ignore whitespace and newline chars
+				var isWhitespace = currentChar == ' ' || currentChar == '\t';
+				if (!isWhitespace)
+				{
+					previousChar = currentChar;
+					isLineStart = false;
+				}
+
+				if (isLineStart)
+				{
+					currentIndent.Append(ch);
+				}
+
+				if (ch == '\t')
+				{
+					var indentSize = options.GetOption(FormattingOptions.IndentationSize, LanguageNames.CSharp);
+					var nextTabStop = (column - 1 + indentSize) / indentSize;
+					column = 1 + nextTabStop * indentSize;
+				}
+				else
+				{
+					column++;
+				}
+			} else {
+				if (ch == NewLine.LF && previousNewline == NewLine.CR) {
+					offset++;
+					return;
+				}
+				currentState.Push(currentChar = newLineChar);
+				offset++;
+
+				previousNewline = ch;
+				// there can be more than one chars that determine the EOL,
+				// the engine uses only one of them defined with newLineChar
+				if (currentChar != newLineChar)
+				{
+					return;
+				}
+				currentIndent.Length = 0;
+				isLineStart = true;
+				isLineStartBeforeWordToken = true;
+				column = 1;
+				line++;
+
+				lineBeganInsideMultiLineComment = IsInsideMultiLineComment;
+				lineBeganInsideVerbatimString = IsInsideVerbatimString;
+			}
+		}
+
+		/// <inheritdoc />
+		public void Reset()
+		{
+			currentState = new GlobalBodyState(this);
+			conditionalSymbols.Clear();
+			ifDirectiveEvalResults.Clear();
+			ifDirectiveIndents.Clear();
+
+			offset = 0;
+			line = 1;
+			column = 1;
+			isLineStart = true;
+			currentChar = '\0';
+			previousChar = '\0';
+			currentIndent.Length = 0;
+			lineBeganInsideMultiLineComment = false;
+			lineBeganInsideVerbatimString = false;
+		}
+
+		/// <inheritdoc />
+		public void Update(SourceText sourceText, int offset)
+		{
+			if (Offset > offset)
+			{
+				Reset();
+			}
+
+			while (Offset < offset)
+			{
+				Push(sourceText[Offset]);
+			}
+		}
+
+		/// <summary>
+		/// Defines the conditional symbol.
+		/// </summary>
+		/// <param name="defineSymbol">The symbol to define.</param>
+		public void DefineSymbol(string defineSymbol)
+		{
+			if (!customConditionalSymbols.Contains(defineSymbol))
+				customConditionalSymbols.Add(defineSymbol);
+		}
+
+		/// <summary>
+		/// Removes the symbol.
+		/// </summary>
+		/// <param name="undefineSymbol">The symbol to undefine.</param>
+		public void RemoveSymbol(string undefineSymbol)
+		{
+			if (customConditionalSymbols.Contains(undefineSymbol))
+				customConditionalSymbols.Remove(undefineSymbol);
+		}
+		#endregion
+
+		#region IStateMachineIndentEngine
+
+		public bool IsInsidePreprocessorDirective
+		{
+			get { return currentState is PreProcessorState; }
+		}
+
+		public bool IsInsidePreprocessorComment
+		{
+			get { return currentState is PreProcessorCommentState; }
+		}
+
+		public bool IsInsideStringLiteral
+		{
+			get { return currentState is StringLiteralState; }
+		}
+
+		public bool IsInsideVerbatimString
+		{
+			get { return currentState is VerbatimStringState; }
+		}
+
+		public bool IsInsideCharacter
+		{
+			get { return currentState is CharacterState; }
+		}
+
+		public bool IsInsideString
+		{
+			get { return IsInsideStringLiteral || IsInsideVerbatimString || IsInsideCharacter; }
+		}
+
+		public bool IsInsideLineComment
+		{
+			get { return currentState is LineCommentState; }
+		}
+
+		public bool IsInsideMultiLineComment
+		{
+			get { return currentState is MultiLineCommentState; }
+		}
+
+		public bool IsInsideDocLineComment
+		{
+			get { return currentState is DocCommentState; }
+		}
+
+		public bool IsInsideComment
+		{
+			get { return IsInsideLineComment || IsInsideMultiLineComment || IsInsideDocLineComment; }
+		}
+
+		public bool IsInsideOrdinaryComment
+		{
+			get { return IsInsideLineComment || IsInsideMultiLineComment; }
+		}
+
+		public bool IsInsideOrdinaryCommentOrString
+		{
+			get { return IsInsideOrdinaryComment || IsInsideString; }
+		}
+
+		public bool LineBeganInsideVerbatimString
+		{
+			get { return lineBeganInsideVerbatimString; }
+		}
+
+		public bool LineBeganInsideMultiLineComment
+		{
+			get { return lineBeganInsideMultiLineComment; }
+		}
+
+		#endregion
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/CacheIndentEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/CacheIndentEngine.cs
new file mode 100644
index 0000000000..4db7d35987
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/CacheIndentEngine.cs
@@ -0,0 +1,623 @@
+//
+// CacheIndentEngine.cs
+//
+// Author:
+//       Matej Miklečić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Miklečić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	///     Represents a decorator of an IStateMachineIndentEngine instance that provides
+	///     logic for reseting and updating the engine on text changed events.
+	/// </summary>
+	/// <remarks>
+	///     The decorator is based on periodical caching of the engine's state and
+	///     delegating all logic behind indentation to the currently active engine.
+	/// </remarks>
+	class CacheIndentEngine : IStateMachineIndentEngine
+	{
+
+		#region Properties
+
+		IStateMachineIndentEngine currentEngine;
+		Stack<IStateMachineIndentEngine> cachedEngines = new Stack<IStateMachineIndentEngine>();
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		///     Creates a new CacheIndentEngine instance.
+		/// </summary>
+		/// <param name="decoratedEngine">
+		///     An instance of <see cref="IStateMachineIndentEngine"/> to which the
+		///     logic for indentation will be delegated.
+		/// </param>
+		/// <param name="cacheRate">
+		///     The number of chars between caching.
+		/// </param>
+		public CacheIndentEngine(IStateMachineIndentEngine decoratedEngine, int cacheRate = 2000)
+		{
+			this.currentEngine = decoratedEngine;
+		}
+
+		/// <summary>
+		///     Creates a new CacheIndentEngine instance from the given prototype.
+		/// </summary>
+		/// <param name="prototype">
+		///     A CacheIndentEngine instance.
+		/// </param>
+		public CacheIndentEngine(CacheIndentEngine prototype)
+		{
+			this.currentEngine = prototype.currentEngine.Clone();
+		}
+
+		#endregion
+
+		#region IDocumentIndentEngine
+
+		/// <inheritdoc />
+		public string ThisLineIndent {
+			get { return currentEngine.ThisLineIndent; }
+		}
+
+		/// <inheritdoc />
+		public string NextLineIndent {
+			get { return currentEngine.NextLineIndent; }
+		}
+
+		/// <inheritdoc />
+		public string CurrentIndent {
+			get { return currentEngine.CurrentIndent; }
+		}
+
+		/// <inheritdoc />
+		public bool NeedsReindent {
+			get { return currentEngine.NeedsReindent; }
+		}
+
+		/// <inheritdoc />
+		public int Offset {
+			get { return currentEngine.Offset; }
+		}
+
+//		/// <inheritdoc />
+//		public TextLocation Location {
+//			get { return currentEngine.Location; }
+//		}
+
+		/// <inheritdoc />
+		public bool EnableCustomIndentLevels
+		{
+			get { return currentEngine.EnableCustomIndentLevels; }
+			set { currentEngine.EnableCustomIndentLevels = value; }
+		}
+
+		/// <inheritdoc />
+		public void Push(char ch)
+		{
+			currentEngine.Push(ch);
+		}
+
+		/// <inheritdoc />
+		public void Reset()
+		{
+			currentEngine.Reset();
+			cachedEngines.Clear();
+		}
+
+		/// <summary>
+		/// Resets the engine to offset. Clears all cached engines after the given offset.
+		/// </summary>
+		public void ResetEngineToPosition(SourceText sourceText, int offset)
+		{
+			// We are already there
+			if (currentEngine.Offset <= offset)
+				return;
+			
+			bool gotCachedEngine = false;
+			while (cachedEngines.Count > 0) {
+				var topEngine = cachedEngines.Peek();
+				if (topEngine.Offset <= offset) {
+					currentEngine = topEngine.Clone();
+					gotCachedEngine = true;
+					break;
+				} else {
+					cachedEngines.Pop();
+				}
+			}
+			if (!gotCachedEngine)
+				currentEngine.Reset();
+		}
+
+		/// <inheritdoc />
+		/// <remarks>
+		///     If the <paramref name="position"/> is negative, the engine will
+		///     update to: document.TextLength + (offset % document.TextLength+1)
+		///     Otherwise it will update to: offset % document.TextLength+1
+		/// </remarks>
+		public void Update(SourceText sourceText, int position)
+		{
+			const int BUFFER_SIZE = 2000;
+			
+			if (currentEngine.Offset == position) {
+				//positions match, nothing to be done
+				return;
+			} else if (currentEngine.Offset > position) {
+				//moving backwards, so reset from previous saved location
+				ResetEngineToPosition(sourceText, position);
+			}
+
+			// get the engine caught up
+			int nextSave = (cachedEngines.Count == 0) ? BUFFER_SIZE : cachedEngines.Peek().Offset + BUFFER_SIZE;
+			if (currentEngine.Offset + 1 == position) {
+				char ch = sourceText[currentEngine.Offset];
+				currentEngine.Push(ch);
+				if (currentEngine.Offset == nextSave)
+					cachedEngines.Push(currentEngine.Clone());
+			} else {
+				//bulk copy characters in case buffer is unmanaged 
+				//(faster if we reduce managed/unmanaged transitions)
+				while (currentEngine.Offset < position) {
+					int endCut = currentEngine.Offset + BUFFER_SIZE;
+					if (endCut > position)
+						endCut = position;
+					string buffer = sourceText.GetSubText(TextSpan.FromBounds(currentEngine.Offset, endCut)).ToString();
+					foreach (char ch in buffer) {
+						currentEngine.Push(ch);
+						//ConsoleWrite ("pushing character '{0}'", ch);
+						if (currentEngine.Offset == nextSave) {
+							cachedEngines.Push(currentEngine.Clone());
+							nextSave += BUFFER_SIZE;
+						}
+					}
+				}
+			}
+		}
+
+		//public IStateMachineIndentEngine GetEngine(int offset)
+		//{
+		//	ResetEngineToPosition(offset);
+		//	return currentEngine;
+		//}
+
+		#endregion
+
+		#region IClonable
+
+		/// <inheritdoc />
+		public IStateMachineIndentEngine Clone()
+		{
+			return new CacheIndentEngine(this);
+		}
+
+		/// <inheritdoc />
+		IDocumentIndentEngine IDocumentIndentEngine.Clone()
+		{
+			return Clone();
+		}
+
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+
+		#endregion
+
+		#region IStateMachineIndentEngine
+
+		public bool IsInsidePreprocessorDirective {
+			get { return currentEngine.IsInsidePreprocessorDirective; }
+		}
+
+		public bool IsInsidePreprocessorComment {
+			get { return currentEngine.IsInsidePreprocessorComment; }
+		}
+
+		public bool IsInsideStringLiteral {
+			get { return currentEngine.IsInsideStringLiteral; }
+		}
+
+		public bool IsInsideVerbatimString {
+			get { return currentEngine.IsInsideVerbatimString; }
+		}
+
+		public bool IsInsideCharacter {
+			get { return currentEngine.IsInsideCharacter; }
+		}
+
+		public bool IsInsideString {
+			get { return currentEngine.IsInsideString; }
+		}
+
+		public bool IsInsideLineComment {
+			get { return currentEngine.IsInsideLineComment; }
+		}
+
+		public bool IsInsideMultiLineComment {
+			get { return currentEngine.IsInsideMultiLineComment; }
+		}
+
+		public bool IsInsideDocLineComment {
+			get { return currentEngine.IsInsideDocLineComment; }
+		}
+
+		public bool IsInsideComment {
+			get { return currentEngine.IsInsideComment; }
+		}
+
+		public bool IsInsideOrdinaryComment {
+			get { return currentEngine.IsInsideOrdinaryComment; }
+		}
+
+		public bool IsInsideOrdinaryCommentOrString {
+			get { return currentEngine.IsInsideOrdinaryCommentOrString; }
+		}
+
+		public bool LineBeganInsideVerbatimString {
+			get { return currentEngine.LineBeganInsideVerbatimString; }
+		}
+
+		public bool LineBeganInsideMultiLineComment {
+			get { return currentEngine.LineBeganInsideMultiLineComment; }
+		}
+
+		#endregion
+
+	}
+	/*
+/		// <summary>
+	///     Represents a decorator of an IStateMachineIndentEngine instance that provides
+	///     logic for reseting and updating the engine on text changed events.
+	/// </summary>
+	/// <remarks>
+	///     The decorator is based on periodical caching of the engine's state and
+	///     delegating all logic behind indentation to the currently active engine.
+	/// </remarks>
+	class CacheIndentEngine : IStateMachineIndentEngine
+	{
+		#region Properties
+		
+		/// <summary>
+		///     Represents the cache interval in number of chars pushed to the engine.
+		/// </summary>
+		/// <remarks>
+		///     When this many new chars are pushed to the engine, the currently active
+		///     engine gets cloned and added to the end of <see cref="cachedEngines"/>.
+		/// </remarks>
+		readonly int cacheRate;
+		
+		/// <summary>
+		///     Determines how much memory to reserve on initialization for the
+		///     cached engines.
+		/// </summary>
+		const int cacheCapacity = 25;
+		
+		/// <summary>
+		///     Currently active engine.
+		/// </summary>
+		/// <remarks>
+		///     Should be equal to the last engine in <see cref="cachedEngines"/>.
+		/// </remarks>
+		IStateMachineIndentEngine currentEngine;
+		
+		/// <summary>
+		///     List of cached engines sorted ascending by 
+		///     <see cref="IDocumentIndentEngine.Offset"/>.
+		/// </summary>
+		IStateMachineIndentEngine[] cachedEngines;
+		
+		/// <summary>
+		///     The index of the last cached engine in cachedEngines.
+		/// </summary>
+		/// <remarks>
+		///     Should be equal to: currentEngine.Offset / CacheRate
+		/// </remarks>
+		int lastCachedEngine;
+		
+		#endregion
+		
+		#region Constructors
+		
+		/// <summary>
+		///     Creates a new CacheIndentEngine instance.
+		/// </summary>
+		/// <param name="decoratedEngine">
+		///     An instance of <see cref="IStateMachineIndentEngine"/> to which the
+		///     logic for indentation will be delegated.
+		/// </param>
+		/// <param name="cacheRate">
+		///     The number of chars between caching.
+		/// </param>
+		public CacheIndentEngine(IStateMachineIndentEngine decoratedEngine, int cacheRate = 2000)
+		{
+			this.cachedEngines = new IStateMachineIndentEngine[cacheCapacity];
+			
+			this.cachedEngines[0] = decoratedEngine.Clone();
+			this.currentEngine = this.cachedEngines[0].Clone();
+			this.cacheRate = cacheRate;
+		}
+		
+		/// <summary>
+		///     Creates a new CacheIndentEngine instance from the given prototype.
+		/// </summary>
+		/// <param name="prototype">
+		///     A CacheIndentEngine instance.
+		/// </param>
+		public CacheIndentEngine(CacheIndentEngine prototype)
+		{
+			this.cachedEngines = new IStateMachineIndentEngine[prototype.cachedEngines.Length];
+			Array.Copy(prototype.cachedEngines, this.cachedEngines, prototype.cachedEngines.Length);
+			
+			this.lastCachedEngine = prototype.lastCachedEngine;
+			this.currentEngine = prototype.currentEngine.Clone();
+			this.cacheRate = prototype.cacheRate;
+		}
+		
+		#endregion
+		
+		#region Methods
+		
+		/// <summary>
+		///     Performs caching of the <see cref="CacheIndentEngine.currentEngine"/>.
+		/// </summary>
+		void cache()
+		{
+			if (currentEngine.Offset % cacheRate != 0)
+			{
+				throw new Exception("The current engine's offset is not divisable with the cacheRate.");
+			}
+			
+			// determine the new current engine from cachedEngines
+			lastCachedEngine = currentEngine.Offset / cacheRate;
+			
+			if (cachedEngines.Length < lastCachedEngine + 1)
+			{
+				Array.Resize(ref cachedEngines, lastCachedEngine * 2);
+			}
+			
+			cachedEngines[lastCachedEngine] = currentEngine.Clone();
+		}
+		
+		#endregion
+		
+		#region IDocumentIndentEngine
+		
+		/// <inheritdoc />
+		public IDocument Document
+		{
+			get { return currentEngine.Document; }
+		}
+		
+		/// <inheritdoc />
+		public string ThisLineIndent
+		{
+			get { return currentEngine.ThisLineIndent; }
+		}
+		
+		/// <inheritdoc />
+		public string NextLineIndent
+		{
+			get { return currentEngine.NextLineIndent; }
+		}
+		
+		/// <inheritdoc />
+		public string CurrentIndent
+		{
+			get { return currentEngine.CurrentIndent; }
+		}
+		
+		/// <inheritdoc />
+		public bool NeedsReindent
+		{
+			get { return currentEngine.NeedsReindent; }
+		}
+		
+		/// <inheritdoc />
+		public int Offset
+		{
+			get { return currentEngine.Offset; }
+		}
+		
+		/// <inheritdoc />
+		public TextLocation Location
+		{
+			get { return currentEngine.Location; }
+		}
+		
+		/// <inheritdoc />
+		public void Push(char ch)
+		{
+			currentEngine.Push(ch);
+			
+			if (currentEngine.Offset % cacheRate == 0)
+			{
+				cache();
+			}
+		}
+		
+		/// <inheritdoc />
+		public void Reset()
+		{
+			currentEngine = cachedEngines[lastCachedEngine = 0];
+		}
+		
+		/// <inheritdoc />
+		/// <remarks>
+		///     If the <paramref name="offset"/> is negative, the engine will
+		///     update to: document.TextLength + (offset % document.TextLength+1)
+		///     Otherwise it will update to: offset % document.TextLength+1
+		/// </remarks>
+		public void Update(int offset)
+		{
+			// map the given offset to the [0, document.TextLength] interval
+			// using modulo arithmetics
+			offset %= Document.TextLength + 1;
+			if (offset < 0)
+			{
+				offset += Document.TextLength + 1;
+			}
+			
+			// check if the engine has to be updated to some previous offset
+			if (currentEngine.Offset > offset)
+			{
+				// replace the currentEngine with the first one whose offset
+				// is less then the given <paramref name="offset"/>
+				lastCachedEngine =  offset / cacheRate;
+				currentEngine = cachedEngines[lastCachedEngine].Clone();
+			}
+			
+			// update the engine to the given offset
+			while (Offset < offset)
+			{
+				Push(Document.GetCharAt(Offset));
+			}
+		}
+		
+		public IStateMachineIndentEngine GetEngine(int offset)
+		{
+			// map the given offset to the [0, document.TextLength] interval
+			// using modulo arithmetics
+			offset %= Document.TextLength + 1;
+			if (offset < 0)
+			{
+				offset += Document.TextLength + 1;
+			}
+			
+			// check if the engine has to be updated to some previous offset
+			if (currentEngine.Offset > offset)
+			{
+				// replace the currentEngine with the first one whose offset
+				// is less then the given <paramref name="offset"/>
+				lastCachedEngine =  offset / cacheRate;
+				return cachedEngines[lastCachedEngine].Clone();
+			}
+			
+			return currentEngine;
+		}
+		
+		#endregion
+		
+		#region IClonable
+		
+		/// <inheritdoc />
+		public IStateMachineIndentEngine Clone()
+		{
+			return new CacheIndentEngine(this);
+		}
+		
+		/// <inheritdoc />
+		IDocumentIndentEngine IDocumentIndentEngine.Clone()
+		{
+			return Clone();
+		}
+		
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+		
+		#endregion
+		
+		#region IStateMachineIndentEngine
+		
+		public bool IsInsidePreprocessorDirective
+		{
+			get { return currentEngine.IsInsidePreprocessorDirective; }
+		}
+		
+		public bool IsInsidePreprocessorComment
+		{
+			get { return currentEngine.IsInsidePreprocessorComment; }
+		}
+		
+		public bool IsInsideStringLiteral
+		{
+			get { return currentEngine.IsInsideStringLiteral; }
+		}
+		
+		public bool IsInsideVerbatimString
+		{
+			get { return currentEngine.IsInsideVerbatimString; }
+		}
+		
+		public bool IsInsideCharacter
+		{
+			get { return currentEngine.IsInsideCharacter; }
+		}
+		
+		public bool IsInsideString
+		{
+			get { return currentEngine.IsInsideString; }
+		}
+		
+		public bool IsInsideLineComment
+		{
+			get { return currentEngine.IsInsideLineComment; }
+		}
+		
+		public bool IsInsideMultiLineComment
+		{
+			get { return currentEngine.IsInsideMultiLineComment; }
+		}
+		
+		public bool IsInsideDocLineComment
+		{
+			get { return currentEngine.IsInsideDocLineComment; }
+		}
+		
+		public bool IsInsideComment
+		{
+			get { return currentEngine.IsInsideComment; }
+		}
+		
+		public bool IsInsideOrdinaryComment
+		{
+			get { return currentEngine.IsInsideOrdinaryComment; }
+		}
+		
+		public bool IsInsideOrdinaryCommentOrString
+		{
+			get { return currentEngine.IsInsideOrdinaryCommentOrString; }
+		}
+		
+		public bool LineBeganInsideVerbatimString
+		{
+			get { return currentEngine.LineBeganInsideVerbatimString; }
+		}
+		
+		public bool LineBeganInsideMultiLineComment
+		{
+			get { return currentEngine.LineBeganInsideMultiLineComment; }
+		}
+		
+		#endregion
+	}
+	
+	*/
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/IDocumentIndentEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/IDocumentIndentEngine.cs
new file mode 100644
index 0000000000..793ff67397
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/IDocumentIndentEngine.cs
@@ -0,0 +1,99 @@
+//
+// IDocumentIndentEngine.cs
+//
+// Author:
+//       Matej Miklečić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Miklečić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	///     The base interface for all indent engines.
+	/// </summary>
+	public interface IDocumentIndentEngine : ICloneable
+	{
+		/// <summary>
+		///     The indentation string of the current line.
+		/// </summary>
+		string ThisLineIndent { get; }
+
+		/// <summary>
+		///     The indentation string of the next line.
+		/// </summary>
+		string NextLineIndent { get; }
+
+		/// <summary>
+		///     The indent string on the beginning of the current line.
+		/// </summary>
+		string CurrentIndent { get; }
+
+		/// <summary>
+		///     True if the current line needs to be reindented.
+		/// </summary>
+		bool NeedsReindent { get; }
+
+		/// <summary>
+		///     The current offset of the engine.
+		/// </summary>
+		int Offset { get; }
+
+		/// <summary>
+		///     If this is true, the engine should try to adjust its indent 
+		///     levels to manual user's corrections, even if they are wrong.
+		/// </summary>
+		bool EnableCustomIndentLevels { get; set; }
+
+		/// <summary>
+		///     Pushes a new char into the engine which calculates the new
+		///     indentation levels.
+		/// </summary>
+		/// <param name="ch">
+		///     A new character.
+		/// </param>
+		void Push(char ch);
+
+		/// <summary>
+		///     Resets the engine.
+		/// </summary>
+		void Reset();
+
+		/// <summary>
+		///     Updates the engine to the given offset.
+		/// </summary>
+		/// <param name="offset">
+		///     Valid offset in <see cref="Document"/>.
+		/// </param>
+		void Update(SourceText sourceText, int offset);
+
+		/// <summary>
+		///     Clones the engine and preserves the current state.
+		/// </summary>
+		/// <returns>
+		///     An indentical clone which can operate without interference
+		///     with this engine.
+		/// </returns>
+		new IDocumentIndentEngine Clone();
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/IStateMachineIndentEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/IStateMachineIndentEngine.cs
new file mode 100644
index 0000000000..fa6a456f41
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/IStateMachineIndentEngine.cs
@@ -0,0 +1,60 @@
+//
+// IStateMachineIndentEngine.cs
+//
+// Author:
+//       Matej Miklečić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Miklečić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	public interface IStateMachineIndentEngine : IDocumentIndentEngine
+	{
+		bool IsInsidePreprocessorDirective { get; }
+
+		bool IsInsidePreprocessorComment { get; }
+
+		bool IsInsideStringLiteral { get; }
+
+		bool IsInsideVerbatimString { get; }
+
+		bool IsInsideCharacter { get; }
+
+		bool IsInsideString { get; }
+
+		bool IsInsideLineComment { get; }
+
+		bool IsInsideMultiLineComment { get; }
+
+		bool IsInsideDocLineComment { get; }
+
+		bool IsInsideComment { get; }
+
+		bool IsInsideOrdinaryComment { get; }
+
+		bool IsInsideOrdinaryCommentOrString { get; }
+
+		bool LineBeganInsideVerbatimString { get; }
+
+		bool LineBeganInsideMultiLineComment { get; }
+
+		new IStateMachineIndentEngine Clone();
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/ITextPasteHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/ITextPasteHandler.cs
new file mode 100644
index 0000000000..c93541e68c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/ITextPasteHandler.cs
@@ -0,0 +1,52 @@
+// ITextPasteHandler.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	/// The text paste handler can do formattings to a text that is about to be pasted
+	/// into the text document.
+	/// </summary>
+	public interface ITextPasteHandler
+	{
+		/// <summary>
+		/// Formats plain text that is inserted at a specified offset.
+		/// </summary>
+		/// <returns>
+		/// The text that will get inserted at that position.
+		/// </returns>
+		/// <param name="offset">The offset where the text will be inserted.</param>
+		/// <param name="text">The text to be inserted.</param>
+		/// <param name="copyData">Additional data in case the text was copied from a Mono.TextEditor.</param>
+		string FormatPlainText(SourceText sourceText, int offset, string text, byte[] copyData);
+
+		/// <summary>
+		/// Gets the copy data for a specific segment inside the document. This can contain additional information.
+		/// </summary>
+		/// <param name="segment">The text segment that is about to be copied.</param>
+		byte[] GetCopyData(SourceText sourceText, TextSpan segment);
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/IndentState.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/IndentState.cs
new file mode 100644
index 0000000000..40d31ca9f6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/IndentState.cs
@@ -0,0 +1,2026 @@
+//
+// IndentState.cs
+//
+// Author:
+//       Matej Miklečić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Miklečić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis;
+using System.Collections;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	#region IndentState
+
+	/// <summary>
+	///     The base class for all indentation states. 
+	///     Each state defines the logic for indentation based on chars that
+	///     are pushed to it.
+	/// </summary>
+	abstract class IndentState : ICloneable
+	{
+		#region Properties
+
+		/// <summary>
+		///     The indentation engine using this state.
+		/// </summary>
+		public CSharpIndentEngine Engine;
+
+		/// <summary>
+		///     The parent state. 
+		///     This state can use the indentation levels of its parent.
+		///     When this state exits, the engine returns to the parent.
+		/// </summary>
+		public IndentState Parent;
+
+		/// <summary>
+		///     The indentation of the current line.
+		///     This is set when the state is created and will be changed to
+		///     <see cref="NextLineIndent"/> when the <see cref="CSharpIndentEngine.newLineChar"/> 
+		///     is pushed.
+		/// </summary>
+		public Indent ThisLineIndent;
+
+		/// <summary>
+		///     The indentation of the next line.
+		///     This is set when the state is created and can change depending
+		///     on the pushed chars.
+		/// </summary>
+		public Indent NextLineIndent;
+
+		#endregion
+
+		#region Constructors
+
+		protected IndentState()
+		{
+		}
+
+		/// <summary>
+		///     Creates a new indentation state that is a copy of the given
+		///     prototype.
+		/// </summary>
+		/// <param name="prototype">
+		///     The prototype state.
+		/// </param>
+		/// <param name="engine">
+		///     The engine of the new state.
+		/// </param>
+		protected IndentState(IndentState prototype, CSharpIndentEngine engine)
+		{
+			Engine = engine;
+			Parent = prototype.Parent != null ? prototype.Parent.Clone(engine) : null;
+
+			ThisLineIndent = prototype.ThisLineIndent.Clone();
+			NextLineIndent = prototype.NextLineIndent.Clone();
+		}
+
+		#endregion
+
+		#region IClonable
+
+		object ICloneable.Clone()
+		{
+			return Clone(Engine);
+		}
+
+		public abstract IndentState Clone(CSharpIndentEngine engine);
+
+		#endregion
+
+		#region Methods
+
+		internal void Initialize (CSharpIndentEngine engine, IndentState parent = null)
+		{
+			Parent = parent;
+			Engine = engine;
+
+			InitializeState();
+		}
+
+		/// <summary>
+		///     Initializes the state:
+		///       - sets the default indentation levels.
+		/// </summary>
+		/// <remarks>
+		///     Each state can override this method if it needs a different
+		///     logic for setting up the default indentations.
+		/// </remarks>
+		public virtual void InitializeState()
+		{
+			ThisLineIndent = new Indent(Engine.options);
+			NextLineIndent = ThisLineIndent.Clone();
+		}
+
+		/// <summary>
+		///     Actions performed when this state exits.
+		/// </summary>
+		public virtual void OnExit()
+		{
+			if (Parent != null)
+			{
+				// if a state exits on the newline character, it has to push
+				// it back to its parent (and so on recursively if the parent 
+				// state also exits). Otherwise, the parent state wouldn't
+				// know that the engine isn't on the same line anymore.
+				if (Engine.currentChar == Engine.newLineChar)
+				{
+					Parent.Push(Engine.newLineChar);
+				}
+
+				// when a state exits the engine stays on the same line and this
+				// state has to override the Parent.ThisLineIndent.
+				Parent.ThisLineIndent = ThisLineIndent.Clone();
+			}
+		}
+
+		/// <summary>
+		///     Changes the current state of the <see cref="CSharpIndentEngine"/> using the current
+		///     state as the parent for the new one.
+		/// </summary>
+		/// <typeparam name="T">
+		///     The type of the new state. Must be assignable from <see cref="IndentState"/>.
+		/// </typeparam>
+		public void ChangeState<T>()
+			where T : IndentState, new ()
+		{
+			var t = new T();
+			t.Initialize(Engine, Engine.currentState);
+			Engine.currentState = t;
+		}
+
+		/// <summary>
+		///     Exits this state by setting the current state of the
+		///     <see cref="CSharpIndentEngine"/> to this state's parent.
+		/// </summary>
+		public void ExitState()
+		{
+			OnExit();
+			Engine.currentState = Engine.currentState.Parent ?? new GlobalBodyState(Engine);
+		}
+
+		/// <summary>
+		///     Common logic behind the push method.
+		///     Each state can override this method and implement its own logic.
+		/// </summary>
+		/// <param name="ch">
+		///     The current character that's being pushed.
+		/// </param>
+		public virtual void Push(char ch)
+		{
+			// replace ThisLineIndent with NextLineIndent if the newLineChar is pushed
+			if (ch == Engine.newLineChar)
+			{
+				var delta = Engine.options.GetOption(FormattingOptions.IndentationSize, LanguageNames.CSharp);
+				while (NextLineIndent.CurIndent - ThisLineIndent.CurIndent > delta &&
+					   NextLineIndent.PopIf(IndentType.Continuation));
+				ThisLineIndent = NextLineIndent.Clone();
+
+			}
+		}
+
+		/// <summary>
+		///     When derived, checks if the given sequence of chars form
+		///     a valid keyword or variable name, depending on the state.
+		/// </summary>
+		/// <param name="keyword">
+		///     A possible keyword.
+		/// </param>
+		public virtual void CheckKeyword(string keyword)
+		{ }
+
+		/// <summary>
+		///     When derived, checks if the given sequence of chars form
+		///     a valid keyword or variable name, depending on the state.
+		/// </summary>
+		/// <param name="keyword">
+		///     A possible keyword.
+		/// </param>
+		/// <remarks>
+		///     This method should be called from <see cref="Push(char)"/>.
+		///     It is left to derived classes to call this method because of
+		///     performance issues.
+		/// </remarks>
+		public virtual void CheckKeywordOnPush(string keyword)
+		{ }
+
+		#endregion
+	}
+
+	#endregion
+
+	#region Null state
+
+	/// <summary>
+	///     Null state.
+	/// </summary>
+	/// <remarks>
+	///     Doesn't define any transitions to new states.
+	/// </remarks>
+	class NullState : IndentState
+	{
+		public NullState()
+		{ }
+
+		public NullState(NullState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{ }
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new NullState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region Brackets body states
+
+	#region Brackets body base
+
+	/// <summary>
+	///     The base for all brackets body states.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between a pair of brackets.
+	/// </remarks>
+	abstract class BracketsBodyBaseState : IndentState
+	{
+	
+		/// <summary>
+		///     When derived in a concrete bracket body state, represents
+		///     the closed bracket character pair.
+		/// </summary>
+		public abstract char ClosedBracket { get; }
+
+		protected BracketsBodyBaseState()
+		{ }
+
+		protected BracketsBodyBaseState(BracketsBodyBaseState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+			switch (ch) {
+				case '#':
+					if (Engine.isLineStart)
+						ChangeState<PreProcessorState>();
+					break;
+				case '/':
+					if (Engine.previousChar == '/')
+						ChangeState<LineCommentState>();
+					break;
+				case '*':
+					if (Engine.previousChar == '/')
+						ChangeState<MultiLineCommentState>();
+					break;
+				case '"':
+					if (Engine.previousChar == '@')
+					{
+						ChangeState<VerbatimStringState>();
+					}
+					else
+					{
+						ChangeState<StringLiteralState>();
+					}
+					break;
+				case '\'':
+					ChangeState<CharacterState>();
+					break;
+				case '{':
+					ChangeState<BracesBodyState>();
+					break;
+				case '(':
+					ChangeState<ParenthesesBodyState>();
+					break;
+				case '[':
+					ChangeState<SquareBracketsBodyState>();
+					break;
+				default:
+					if (ch == ClosedBracket)
+						ExitState();
+					break;
+			}
+		}
+	}
+
+	#endregion
+
+	#region Braces body state
+
+	/// <summary>
+	///     Braces body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between { and }.
+	/// </remarks>
+	class BracesBodyState : BracketsBodyBaseState
+	{
+		/// <summary>
+		///     Type of the current block body.
+		/// </summary>
+		public Body CurrentBody;
+
+		/// <summary>
+		///     Type of the next block body.
+		///     Same as <see cref="CurrentBody"/> if none of the
+		///     <see cref="Body"/> keywords have been read.
+		/// </summary>
+		public Body NextBody;
+
+		/// <summary>
+		///     Type of the current statement.
+		/// </summary>
+		public Statement CurrentStatement
+		{
+			get
+			{
+				return currentStatement;
+			}
+			set
+			{
+				// clear NestedIfStatementLevels if this statement breaks the sequence
+				if (currentStatement == Statement.None && value != Statement.Else)
+				{
+					NestedIfStatementLevels.Clear();
+				}
+
+				currentStatement = value;
+			}
+		}
+		Statement currentStatement;
+
+		/// <summary>
+		///    Contains indent levels of nested if statements.
+		/// </summary>
+		internal CloneableStack<Indent> NestedIfStatementLevels = new CloneableStack<Indent>();
+
+		/// <summary>
+		///    Contains the indent level of the last statement or body keyword.
+		/// </summary>
+		public Indent LastBlockIndent;
+
+		/// <summary>
+		///     True if the engine is on the right side of the equal operator '='.
+		/// </summary>
+		public bool IsRightHandExpression;
+
+		/// <summary>
+		///     True if the '=' char has been pushed and it's not
+		///     a part of a relational operator (&gt;=, &lt;=, !=, ==).
+		/// </summary>
+		public bool IsEqualCharPushed;
+
+		/// <summary>
+		///     The indentation of the previous line.
+		/// </summary>
+		public int PreviousLineIndent;
+
+		/// <summary>
+		///     True if the dot member (e.g. method invocation) indentation has
+		///     been handled in the current statement.
+		/// </summary>
+		public bool IsMemberReferenceDotHandled;
+
+		public override char ClosedBracket
+		{
+			get { return '}'; }
+		}
+
+		public BracesBodyState()
+		{
+		}
+
+		public BracesBodyState(BracesBodyState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			CurrentBody = prototype.CurrentBody;
+			NextBody = prototype.NextBody;
+			CurrentStatement = prototype.CurrentStatement;
+			NestedIfStatementLevels = prototype.NestedIfStatementLevels.Clone();
+			IsRightHandExpression = prototype.IsRightHandExpression;
+			IsEqualCharPushed = prototype.IsEqualCharPushed;
+			IsMemberReferenceDotHandled = prototype.IsMemberReferenceDotHandled;
+			LastBlockIndent = prototype.LastBlockIndent;
+			PreviousLineIndent = prototype.PreviousLineIndent;
+		}
+
+		public override void Push(char ch)
+		{
+			// handle IsRightHandExpression property
+			if (IsEqualCharPushed)
+			{
+				if (IsRightHandExpression)
+				{
+					if (ch == Engine.newLineChar)
+					{
+						NextLineIndent.RemoveAlignment();
+						NextLineIndent.Push(IndentType.Continuation);
+					}
+				}
+				// ignore "==" and "=>" operators
+				else if (ch != '=' && ch != '>')
+				{
+					IsRightHandExpression = true;
+
+					if (ch == Engine.newLineChar)
+					{
+						NextLineIndent.Push(IndentType.Continuation);
+					}
+					else
+					{
+						NextLineIndent.SetAlignment(Engine.column - NextLineIndent.CurIndent);
+					}
+				}
+
+				IsEqualCharPushed = ch == ' ' || ch == '\t';
+			}
+
+			if (ch == ';' || (ch == ',' && IsRightHandExpression))
+			{
+				OnStatementExit();
+			}
+			else if (ch == '=' && !(Engine.previousChar == '=' || Engine.previousChar == '<' || Engine.previousChar == '>' || Engine.previousChar == '!'))
+			{
+				IsEqualCharPushed = true;
+			}
+			else if (ch == '.' && !IsMemberReferenceDotHandled)
+			{
+				// OPTION: CSharpFormattingOptions.AlignToMemberReferenceDot
+				if (true /*Engine.options.AlignToMemberReferenceDot*/ && !Engine.isLineStart)
+				{
+					IsMemberReferenceDotHandled = true;
+					NextLineIndent.RemoveAlignment();
+					NextLineIndent.SetAlignment(Engine.column - NextLineIndent.CurIndent - 1, true);
+				}
+				else if (Engine.isLineStart)
+				{
+					IsMemberReferenceDotHandled = true;
+
+					ThisLineIndent.RemoveAlignment();
+					while (ThisLineIndent.CurIndent > PreviousLineIndent && 
+					       ThisLineIndent.PopIf(IndentType.Continuation)) ;
+					ThisLineIndent.Push(IndentType.Continuation);
+					NextLineIndent = ThisLineIndent.Clone();
+				}
+			}
+			else if (ch == ':' && Engine.isLineStart && !IsRightHandExpression)
+			{
+				// try to capture ': base(...)', ': this(...)' and inherit statements when they are on a new line
+				ThisLineIndent.Push(IndentType.Continuation);
+			}
+			else if (ch == Engine.newLineChar)
+			{
+				PreviousLineIndent = ThisLineIndent.CurIndent;
+			}
+
+			if (Engine.wordToken.ToString() == "else")
+			{
+				CheckKeywordOnPush("else");
+			}
+
+			base.Push(ch);
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+
+			// OPTION: IDocumentIndentEngine.EnableCustomIndentLevels
+			var parent = Parent as BracesBodyState;
+			if (parent == null || parent.LastBlockIndent == null || !Engine.EnableCustomIndentLevels)
+			{			
+				NextLineIndent.RemoveAlignment();
+				NextLineIndent.PopIf(IndentType.Continuation);
+			}
+			else
+			{
+				NextLineIndent = parent.LastBlockIndent.Clone();
+			}
+
+			if (Engine.isLineStart)
+			{
+				NextLineIndent.RemoveAlignment();
+				NextLineIndent.PopIf(IndentType.Continuation);
+
+				ThisLineIndent = NextLineIndent.Clone();
+			}
+
+			CurrentBody = extractBody(Parent);
+			NextBody = Body.None;
+			CurrentStatement = Statement.None;
+
+			AddIndentation(CurrentBody);
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new BracesBodyState(this, engine);
+		}
+
+		public override void OnExit()
+		{
+			if (Parent is BracesBodyState)
+			{
+				((BracesBodyState)Parent).OnStatementExit();
+			}
+
+			if (Engine.isLineStart)
+			{
+				ThisLineIndent.RemoveAlignment();
+				ThisLineIndent.PopTry();
+				/*BraceStyle style;
+				if (TryGetBraceStyle(this.CurrentBody, out style)) {
+					if (style == BraceStyle.NextLineShifted ||
+						style == BraceStyle.NextLineShifted2||
+						style == BraceStyle.BannerStyle) {
+						ThisLineIndent.Push(IndentType.Block);
+					}
+				}*/
+			}
+
+			base.OnExit();
+		}
+
+		/// <summary>
+		///     Actions performed when the current statement exits.
+		/// </summary>
+		public virtual void OnStatementExit()
+		{
+			IsRightHandExpression = false;
+			IsMemberReferenceDotHandled = false;
+
+			NextLineIndent.RemoveAlignment();
+			NextLineIndent.PopWhile(IndentType.Continuation);
+
+			CurrentStatement = Statement.None;
+			NextBody = Body.None;
+			LastBlockIndent = null;
+		}
+
+		#region Helpers
+
+		/// <summary>
+		///     Types of braces bodies.
+		/// </summary>
+		public enum Body
+		{
+			None,
+			Namespace,
+			Class,
+			Struct,
+			Interface,
+			Enum,
+			Switch,
+			Case,
+			Try,
+			Catch,
+			Finally
+		}
+
+		/// <summary>
+		///     Types of statements.
+		/// </summary>
+		public enum Statement
+		{
+			None,
+			If,
+			Else,
+			Do,
+			While,
+			For,
+			Foreach,
+			Lock,
+			Using,
+			Return
+		}
+
+		static readonly Dictionary<string, Body> bodies = new Dictionary<string, Body>
+		{
+			{ "namespace", Body.Namespace },
+			{ "class", Body.Class },
+			{ "struct", Body.Struct },
+			{ "interface", Body.Interface },
+			{ "enum", Body.Enum },
+			{ "switch", Body.Switch },
+			{ "try", Body.Try },
+			{ "catch", Body.Catch },
+			{ "finally", Body.Finally },
+		};
+
+		static readonly Dictionary<string, Statement> statements = new Dictionary<string, Statement>
+		{
+			{ "if", Statement.If },
+			// { "else", Statement.Else }, // should be handled in CheckKeywordAtPush
+			{ "do", Statement.Do },
+			{ "while", Statement.While },
+			{ "for", Statement.For },
+			{ "foreach", Statement.Foreach },
+			{ "lock", Statement.Lock },
+			{ "using", Statement.Using },
+			{ "return", Statement.Return },
+		};
+
+		static readonly HashSet<string> blocks = new HashSet<string>
+		{
+			"namespace",
+			"class",
+			"struct",
+			"interface",
+			"enum",
+			"switch",
+			"try",
+			"catch",
+			"finally",
+			"if",
+			"else",
+			"do",
+			"while",
+			"for",
+			"foreach",
+			"lock",
+			"using",
+		};
+
+		readonly string[] caseDefaultKeywords = {
+			"case",
+			"default"
+		};
+
+		readonly string[] classStructKeywords = {
+			"class",
+			"struct"
+		};
+
+		/// <summary>
+		///     Checks if the given string is a keyword and sets the
+		///     <see cref="NextBody"/> and the <see cref="CurrentStatement"/>
+		///     variables appropriately.
+		/// </summary>
+		/// <param name="keyword">
+		///     A possible keyword.
+		/// </param>
+		/// <remarks>
+		///     This method is called from <see cref="Push(char)"/>
+		/// </remarks>
+		public override void CheckKeywordOnPush(string keyword)
+		{
+			if (keyword == "else")
+			{
+				CurrentStatement = Statement.Else;
+
+				// OPTION: CSharpFormattingOptions.AlignElseInIfStatements
+				if (true && NestedIfStatementLevels.Count > 0)
+				{
+					ThisLineIndent = NestedIfStatementLevels.Pop().Clone();
+					NextLineIndent = ThisLineIndent.Clone();
+				}
+
+				NextLineIndent.Push(IndentType.Continuation);
+			}
+
+			if (blocks.Contains(keyword) && Engine.NeedsReindent)
+			{
+				LastBlockIndent = Indent.ConvertFrom(Engine.CurrentIndent, ThisLineIndent, Engine.options);
+			}
+		}
+
+		/// <summary>
+		///     Checks if the given string is a keyword and sets the
+		///     <see cref="NextBody"/> and the <see cref="CurrentStatement"/>
+		///     variables appropriately.
+		/// </summary>
+		/// <param name="keyword">
+		///     A possible keyword.
+		/// </param>
+		public override void CheckKeyword(string keyword)
+		{
+			if (bodies.ContainsKey(keyword))
+			{
+				var isKeywordTemplateConstraint =
+					classStructKeywords.Contains(keyword) &&
+					(NextBody == Body.Class || NextBody == Body.Struct || NextBody == Body.Interface);
+
+				if (!isKeywordTemplateConstraint)
+				{
+					NextBody = bodies[keyword];
+				}
+			}
+			else if (caseDefaultKeywords.Contains(keyword) && CurrentBody == Body.Switch && Engine.isLineStartBeforeWordToken)
+			{
+				ChangeState<SwitchCaseState>();
+			}
+			else if (keyword == "where" && Engine.isLineStartBeforeWordToken)
+			{
+				// try to capture where (generic type constraint)
+				ThisLineIndent.Push(IndentType.Continuation);
+			}
+			else if (statements.ContainsKey(keyword))
+			{
+				Statement previousStatement = CurrentStatement;
+				CurrentStatement = statements[keyword];
+
+				// return if this is a using declaration or alias
+				if (CurrentStatement == Statement.Using &&
+				   (this is GlobalBodyState || CurrentBody == Body.Namespace))
+				{
+					return;
+				}
+				// OPTION: CSharpFormattingOptions.AlignEmbeddedIfStatements
+				if (true /*Engine.options.AlignEmbeddedStatements*/ &&
+					previousStatement == Statement.If &&
+					CurrentStatement == Statement.If)
+				{
+					ThisLineIndent.PopIf(IndentType.Continuation);
+					NextLineIndent.PopIf(IndentType.Continuation);
+				}
+
+				// OPTION: CSharpFormattingOptions.AlignEmbeddedStatements
+				if (true /*Engine.options.AlignEmbeddedStatements*/ &&
+					previousStatement == Statement.Lock &&
+					CurrentStatement == Statement.Lock)
+				{
+					ThisLineIndent.PopIf(IndentType.Continuation);
+					NextLineIndent.PopIf(IndentType.Continuation);
+				}
+
+				// OPTION: CSharpFormattingOptions.AlignEmbeddedUsingStatements
+				if (true /*Engine.options.AlignEmbeddedStatements*/ &&
+					previousStatement == Statement.Using &&
+					CurrentStatement == Statement.Using)
+				{
+					ThisLineIndent.PopIf(IndentType.Continuation);
+					NextLineIndent.PopIf(IndentType.Continuation);
+				}
+
+				// only add continuation for 'else' in 'else if' statement.
+				if (!(CurrentStatement == Statement.If && previousStatement == Statement.Else && !Engine.isLineStartBeforeWordToken))
+				{
+					NextLineIndent.Push(IndentType.Continuation);
+				}
+
+				if (CurrentStatement == Statement.If)
+				{
+					NestedIfStatementLevels.Push(ThisLineIndent);
+				}
+			}
+
+			if (blocks.Contains(keyword) && Engine.NeedsReindent)
+			{
+				LastBlockIndent = Indent.ConvertFrom(Engine.CurrentIndent, ThisLineIndent, Engine.options);
+			}
+		}
+
+//		/// <summary>
+//		///     Pushes a new level of indentation depending on the given
+//		///     <paramref name="braceStyle"/>.
+//		/// </summary>
+//		void AddIndentation(BraceStyle braceStyle)
+//		{
+//			switch (braceStyle)
+//			{
+//				case BraceStyle.NextLineShifted:
+//					ThisLineIndent.Push(IndentType.Block);
+//					NextLineIndent.Push(IndentType.Block);
+//					break;
+//				case BraceStyle.DoNotChange:
+//				case BraceStyle.EndOfLine:
+//				case BraceStyle.EndOfLineWithoutSpace:
+//				case BraceStyle.NextLine:
+//				case BraceStyle.BannerStyle:
+//					NextLineIndent.Push(IndentType.Block);
+//					break;
+//				case BraceStyle.NextLineShifted2:
+//					ThisLineIndent.Push(IndentType.Block);
+//					NextLineIndent.Push(IndentType.DoubleBlock);
+//					break;
+//			}
+//		}
+
+//		bool TryGetBraceStyle (Body body, out BraceStyle style)
+//		{
+//			style = BraceStyle.DoNotChange;
+//			switch (body)
+//			{
+//				case Body.None:
+//					if (!Engine.options.IndentBlocks)
+//						return false;
+//					style = Engine.options.StatementBraceStyle;
+//					return true;
+//				case Body.Namespace:
+//					if (!Engine.options.IndentNamespaceBody)
+//						return false;
+//					style = Engine.options.NamespaceBraceStyle;
+//					return true;
+//				case Body.Class:
+//					if (!Engine.options.IndentClassBody)
+//						return false;
+//					style = Engine.options.ClassBraceStyle;
+//					return true;
+//				case Body.Struct:
+//					if (!Engine.options.IndentStructBody)
+//						return false;
+//					style = Engine.options.StructBraceStyle;
+//					return true;
+//				case Body.Interface:
+//					if (!Engine.options.IndentInterfaceBody)
+//						return false;
+//					style = Engine.options.InterfaceBraceStyle;
+//					return true;
+//				case Body.Enum:
+//					if (!Engine.options.IndentEnumBody)
+//						return false;
+//					style = Engine.options.EnumBraceStyle;
+//					return true;
+//				case Body.Switch:
+//					if (!Engine.options.IndentSwitchBody)
+//						return false;
+//					style = Engine.options.StatementBraceStyle;
+//					return true;
+//				case Body.Try:
+//				case Body.Catch:
+//				case Body.Finally:
+//					style = Engine.options.StatementBraceStyle;
+//					return true;
+//			}
+//			return false;
+//		}
+
+		/// <summary>
+		///     Pushes a new level of indentation depending on the given
+		///     <paramref name="body"/>.
+		/// </summary>
+		void AddIndentation(Body body)
+		{
+			NextLineIndent.Push(IndentType.Block);
+
+//			BraceStyle style;
+//			if (TryGetBraceStyle (body, out style)) {
+//				AddIndentation(style);
+//			} else {
+//				NextLineIndent.Push(IndentType.Empty);
+//			}
+		}
+
+		/// <summary>
+		///     Extracts the <see cref="CurrentBody"/> from the given state.
+		/// </summary>
+		/// <returns>
+		///     The correct <see cref="Body"/> type for this state.
+		/// </returns>
+		static Body extractBody(IndentState state)
+		{
+			if (state != null && state is BracesBodyState)
+			{
+				return ((BracesBodyState)state).NextBody;
+			}
+
+			return Body.None;
+		}
+
+		#endregion
+	}
+
+	#endregion
+
+	#region Global body state
+
+	/// <summary>
+	///     Global body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents the global space of the program.
+	/// </remarks>
+	class GlobalBodyState : BracesBodyState
+	{
+		public override char ClosedBracket
+		{
+			get { return '\0'; }
+		}
+
+		public GlobalBodyState()
+		{ }
+
+
+		public GlobalBodyState(CSharpIndentEngine engine)
+		{
+			Initialize (engine, null);
+		}
+
+		public GlobalBodyState(GlobalBodyState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new GlobalBodyState(this, engine);
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = new Indent(Engine.options);
+			NextLineIndent = ThisLineIndent.Clone();
+		}
+	}
+
+	#endregion
+
+	#region Switch-case body state
+
+	/// <summary>
+	///     Switch-case statement state.
+	/// </summary>
+	/// <remarks>
+	///     Represents the block of code in one switch case (including default).
+	/// </remarks>
+	class SwitchCaseState : BracesBodyState
+	{
+		public SwitchCaseState()
+		{ }
+
+		public SwitchCaseState(SwitchCaseState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{
+			// on ClosedBracket both this state (a case or a default statement)
+			// and also the whole switch block (handled in the base class) must exit.
+			if (ch == ClosedBracket)
+			{
+				ExitState();
+				if (Parent is BracesBodyState)
+					Parent.OnExit();
+			}
+			else if (ch == ':') 
+			{
+				NextLineIndent.ExtraSpaces = 0;
+			}
+
+			base.Push(ch);
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+
+			// remove all continuations and extra spaces
+			ThisLineIndent.RemoveAlignment(); 
+			ThisLineIndent.PopWhile(IndentType.Continuation);
+
+			NextLineIndent.RemoveAlignment();
+			NextLineIndent.PopWhile(IndentType.Continuation);
+			
+
+			if (Engine.options.GetOption(CSharpFormattingOptions.IndentSwitchSection))
+			{
+				NextLineIndent.Push(IndentType.Block);
+			}
+			else
+			{
+				NextLineIndent.Push(IndentType.Empty);
+			}
+		}
+
+		static readonly string[] caseDefaultKeywords = {
+			"case",
+			"default"
+		};
+
+		static readonly string[] breakContinueReturnGotoKeywords = {
+			"break",
+			"continue",
+			"return",
+			"goto"
+		};
+
+		public override void CheckKeyword(string keyword)
+		{
+			if (caseDefaultKeywords.Contains(keyword) && Engine.isLineStartBeforeWordToken)
+			{
+				ExitState();
+				ChangeState<SwitchCaseState>();
+			}
+			else if (breakContinueReturnGotoKeywords.Contains(keyword) && Engine.isLineStartBeforeWordToken)
+			{
+				// OPTION: Engine.formattingOptions.IndentBreakStatements
+				if (true/*!Engine.options.IndentBreakStatements*/)
+				{
+					ThisLineIndent = Parent.ThisLineIndent.Clone();
+				}
+			}
+
+			base.CheckKeyword(keyword);
+		}
+
+
+		public override void OnExit()
+		{
+			//Parent.OnExit();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new SwitchCaseState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region Parentheses body state
+
+	/// <summary>
+	///     Parentheses body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between ( and ).
+	/// </remarks>
+	class ParenthesesBodyState : BracketsBodyBaseState
+	{
+		/// <summary>
+		///     True if any char has been pushed.
+		/// </summary>
+		public bool IsSomethingPushed;
+
+		public override char ClosedBracket
+		{
+			get { return ')'; }
+		}
+
+		public ParenthesesBodyState()
+		{ }
+
+		public ParenthesesBodyState(ParenthesesBodyState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsSomethingPushed = prototype.IsSomethingPushed;
+		}
+
+		public override void Push(char ch)
+		{
+			if (ch == Engine.newLineChar)
+			{
+				if (!Engine.options.GetOption(CSharpFormattingOptions.NewLinesForBracesInAnonymousMethods)) {
+					if (NextLineIndent.PopIf(IndentType.Continuation)) {
+						NextLineIndent.Push(IndentType.Block);
+					}
+				}
+			}
+			else if (!IsSomethingPushed)
+			{
+				// OPTION: CSharpFormattingOptions.AlignToFirstMethodCallArgument
+				if (true /* Engine.options.AlignToFirstMethodCallArgument*/)
+				{
+					NextLineIndent.PopTry();
+					// align the next line at the beginning of the open bracket
+					NextLineIndent.ExtraSpaces = Math.Max(0, Engine.column - NextLineIndent.CurIndent - 1);
+				}
+			}
+
+			base.Push(ch);
+			IsSomethingPushed = true;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+			NextLineIndent.Push(IndentType.Continuation);
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new ParenthesesBodyState(this, engine);
+		}
+
+		public override void OnExit()
+		{
+			if (Engine.isLineStart)
+			{
+				if (ThisLineIndent.ExtraSpaces > 0)
+				{
+					ThisLineIndent.ExtraSpaces--;
+				}
+				else
+				{
+					ThisLineIndent.PopTry();
+				}
+			}
+			base.OnExit();
+		}
+	}
+
+	#endregion
+
+	#region Square brackets body state
+
+	/// <summary>
+	///     Square brackets body state.
+	/// </summary>
+	/// <remarks>
+	///     Represents a block of code between [ and ].
+	/// </remarks>
+	class SquareBracketsBodyState : BracketsBodyBaseState
+	{
+		/// <summary>
+		///     True if any char has been pushed.
+		/// </summary>
+		public bool IsSomethingPushed;
+
+		public override char ClosedBracket
+		{
+			get { return ']'; }
+		}
+
+		public SquareBracketsBodyState()
+		{ }
+
+		public SquareBracketsBodyState(SquareBracketsBodyState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsSomethingPushed = prototype.IsSomethingPushed;
+		}
+
+		public override void Push(char ch)
+		{
+			if (ch == Engine.newLineChar)
+			{
+				if (NextLineIndent.PopIf(IndentType.Continuation))
+				{
+					NextLineIndent.Push(IndentType.Block);
+				}
+			}
+			else if (!IsSomethingPushed)
+			{
+				// OPTION: CSharpFormattingOptions.AlignToFirstIndexerArgument
+				if (true /*Engine.options.AlignToFirstIndexerArgument*/)
+				{
+					NextLineIndent.PopTry();
+					// align the next line at the beginning of the open bracket
+					NextLineIndent.ExtraSpaces = Math.Max(0, Engine.column - NextLineIndent.CurIndent - 1);
+				}
+			}
+
+			base.Push(ch);
+			IsSomethingPushed = true;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+			NextLineIndent.Push(IndentType.Continuation);
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new SquareBracketsBodyState(this, engine);
+		}
+
+		public override void OnExit()
+		{
+			if (Engine.isLineStart)
+			{
+				if (ThisLineIndent.ExtraSpaces > 0)
+				{
+					ThisLineIndent.ExtraSpaces--;
+				}
+				else
+				{
+					ThisLineIndent.PopTry();
+				}
+			}
+
+			base.OnExit();
+		}
+	}
+
+	#endregion
+
+	#endregion
+
+	#region PreProcessor state
+
+	/// <summary>
+	///     PreProcessor directive state.
+	/// </summary>
+	/// <remarks>
+	///     Activated when the '#' char is pushed and the 
+	///     <see cref="CSharpIndentEngine.isLineStart"/> is true.
+	/// </remarks>
+	class PreProcessorState : IndentState
+	{
+		/// <summary>
+		///     The type of the preprocessor directive.
+		/// </summary>
+		public PreProcessorDirective DirectiveType;
+
+		/// <summary>
+		///     If <see cref="DirectiveType"/> is set (not equal to 'None'), this
+		///     stores the expression of the directive.
+		/// </summary>
+		public StringBuilder DirectiveStatement;
+
+		public PreProcessorState()
+		{
+			DirectiveType = PreProcessorDirective.None;
+			DirectiveStatement = new StringBuilder();
+		}
+
+		public PreProcessorState(PreProcessorState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			DirectiveType = prototype.DirectiveType;
+			DirectiveStatement = new StringBuilder(prototype.DirectiveStatement.ToString());
+		}
+
+		public override void Push(char ch)
+		{
+			// HACK: if this change would be left for the CheckKeyword method, we will lose
+			//       it if the next pushed char is newLineChar since ThisLineIndent will be 
+			//       immediately replaced with NextLineIndent. As this most likely will
+			//       happen, we check for "endregion" on every push.
+			if (Engine.wordToken.ToString() == "endregion")
+			{
+				CheckKeywordOnPush("endregion");
+			}
+
+			base.Push(ch);
+
+			if (DirectiveType != PreProcessorDirective.None)
+			{
+				DirectiveStatement.Append(ch);
+			}
+
+			if (ch == Engine.newLineChar)
+			{
+				ExitState();
+				switch (DirectiveType)
+				{
+					case PreProcessorDirective.If:
+						Engine.ifDirectiveEvalResults.Push(eval(DirectiveStatement.ToString()));
+						if (Engine.ifDirectiveEvalResults.Peek())
+						{
+							// the if/elif directive is true -> continue with the previous state
+						}
+						else
+						{
+							// the if/elif directive is false -> change to a state that will 
+							// ignore any chars until #endif or #elif
+							ChangeState<PreProcessorCommentState>();
+						}
+						break;
+					case PreProcessorDirective.Elif:
+						if (Engine.ifDirectiveEvalResults.Count > 0)
+						{
+							if (!Engine.ifDirectiveEvalResults.Peek())
+							{
+								if (Engine.currentState is PreProcessorCommentState)
+									ExitState();
+								Engine.ifDirectiveEvalResults.Pop();
+								goto case PreProcessorDirective.If;
+							}
+							// previous if was true -> comment
+							ChangeState<PreProcessorCommentState>();
+						}
+						break;
+					case PreProcessorDirective.Else:
+						if (Engine.ifDirectiveEvalResults.Count > 0 && Engine.ifDirectiveEvalResults.Peek())
+						{
+							// some if/elif directive was true -> change to a state that will 
+							// ignore any chars until #endif
+							if (!(Engine.currentState is PreProcessorCommentState))
+								ChangeState<PreProcessorCommentState>();
+						}
+						else
+						{
+							// none if/elif directives were true -> exit comment state.
+							if (Engine.currentState is PreProcessorCommentState)
+								ExitState();
+						}
+						break;
+					case PreProcessorDirective.Define:
+						var defineSymbol = DirectiveStatement.ToString().Trim();
+						if (!Engine.conditionalSymbols.Contains(defineSymbol))
+						{
+							Engine.conditionalSymbols.Add(defineSymbol);
+						}
+						break;
+					case PreProcessorDirective.Undef:
+						var undefineSymbol = DirectiveStatement.ToString().Trim();
+						if (Engine.conditionalSymbols.Contains(undefineSymbol))
+						{
+							Engine.conditionalSymbols.Remove(undefineSymbol);
+						}
+						break;
+					case PreProcessorDirective.Endif:
+						// marks the end of this block
+						if (Engine.currentState is PreProcessorCommentState)
+							ExitState();
+						if (Engine.ifDirectiveEvalResults.Count > 0)
+							Engine.ifDirectiveEvalResults.Pop();
+						if (Engine.ifDirectiveIndents.Count > 0)
+							Engine.ifDirectiveIndents.Pop();
+						break;
+					case PreProcessorDirective.Region:
+					case PreProcessorDirective.Pragma:
+					case PreProcessorDirective.Warning:
+					case PreProcessorDirective.Error:
+					case PreProcessorDirective.Line:
+						// continue with the previous state
+						break;
+				}
+			}
+		}
+
+		public override void InitializeState()
+		{
+			// OPTION: IndentPreprocessorDirectives
+			if (true /*Engine.options.IndentPreprocessorDirectives*/)
+			{
+				if (Engine.ifDirectiveIndents.Count > 0)
+				{
+					ThisLineIndent = Engine.ifDirectiveIndents.Peek().Clone();
+				}
+				else
+				{
+					ThisLineIndent = Parent.ThisLineIndent.Clone();
+				}
+			}
+//			else
+//			{
+//				ThisLineIndent = new Indent(Engine.options);
+//			}
+
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		static readonly Dictionary<string, PreProcessorDirective> preProcessorDirectives = new Dictionary<string, PreProcessorDirective>
+		{
+			{ "if", PreProcessorDirective.If },
+			{ "elif", PreProcessorDirective.Elif },
+			{ "else", PreProcessorDirective.Else },
+			{ "endif", PreProcessorDirective.Endif },
+			{ "region", PreProcessorDirective.Region },
+			{ "endregion", PreProcessorDirective.Endregion },
+			{ "pragma", PreProcessorDirective.Pragma },
+			{ "warning", PreProcessorDirective.Warning },
+			{ "error", PreProcessorDirective.Error },
+			{ "line", PreProcessorDirective.Line },
+			{ "define", PreProcessorDirective.Define },
+			{ "undef", PreProcessorDirective.Undef }
+		};
+
+		public override void CheckKeywordOnPush(string keyword)
+		{
+			if (keyword == "endregion")
+			{
+				DirectiveType = PreProcessorDirective.Endregion;
+				ThisLineIndent = Parent.NextLineIndent.Clone();
+			}
+		}
+
+		public override void CheckKeyword(string keyword)
+		{
+			// check if the directive type has already been set
+			if (DirectiveType != PreProcessorDirective.None)
+			{
+				return;
+			}
+
+			if (preProcessorDirectives.ContainsKey(keyword))
+			{
+				DirectiveType = preProcessorDirectives[keyword];
+
+				// adjust the indentation for the region directive
+				if (DirectiveType == PreProcessorDirective.Region)
+				{
+					ThisLineIndent = Parent.NextLineIndent.Clone();
+				}
+				else if (DirectiveType == PreProcessorDirective.If)
+				{
+					Engine.ifDirectiveIndents.Push(ThisLineIndent.Clone());
+				}
+			}
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new PreProcessorState(this, engine);
+		}
+
+		/// <summary>
+		///     Types of preprocessor directives.
+		/// </summary>
+		public enum PreProcessorDirective
+		{
+			None,
+			If,
+			Elif,
+			Else,
+			Endif,
+			Region,
+			Endregion,
+			Pragma,
+			Warning,
+			Error,
+			Line,
+			Define,
+			Undef
+		}
+
+		#region Pre processor evaluation (from cs-tokenizer.cs)
+
+		static bool is_identifier_start_character(int c)
+		{
+			return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_' || Char.IsLetter((char)c);
+		}
+
+		static bool is_identifier_part_character(char c)
+		{
+			if (c >= 'a' && c <= 'z')
+				return true;
+
+			if (c >= 'A' && c <= 'Z')
+				return true;
+
+			if (c == '_' || (c >= '0' && c <= '9'))
+				return true;
+
+			if (c < 0x80)
+				return false;
+
+			return Char.IsLetter(c) || Char.GetUnicodeCategory(c) == UnicodeCategory.ConnectorPunctuation;
+		}
+
+		bool eval_val(string s)
+		{
+			if (s == "true")
+				return true;
+			if (s == "false")
+				return false;
+
+			return Engine.conditionalSymbols != null && Engine.conditionalSymbols.Contains(s) ||
+				Engine.customConditionalSymbols != null && Engine.customConditionalSymbols.Contains(s);
+		}
+
+		bool pp_primary(ref string s)
+		{
+			s = s.Trim();
+			int len = s.Length;
+
+			if (len > 0)
+			{
+				char c = s[0];
+
+				if (c == '(')
+				{
+					s = s.Substring(1);
+					bool val = pp_expr(ref s, false);
+					if (s.Length > 0 && s[0] == ')')
+					{
+						s = s.Substring(1);
+						return val;
+					}
+					return false;
+				}
+
+				if (is_identifier_start_character(c))
+				{
+					int j = 1;
+
+					while (j < len)
+					{
+						c = s[j];
+
+						if (is_identifier_part_character(c))
+						{
+							j++;
+							continue;
+						}
+						bool v = eval_val(s.Substring(0, j));
+						s = s.Substring(j);
+						return v;
+					}
+					bool vv = eval_val(s);
+					s = "";
+					return vv;
+				}
+			}
+			return false;
+		}
+
+		bool pp_unary(ref string s)
+		{
+			s = s.Trim();
+			int len = s.Length;
+
+			if (len > 0)
+			{
+				if (s[0] == '!')
+				{
+					if (len > 1 && s[1] == '=')
+					{
+						return false;
+					}
+					s = s.Substring(1);
+					return !pp_primary(ref s);
+				}
+				else
+					return pp_primary(ref s);
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		bool pp_eq(ref string s)
+		{
+			bool va = pp_unary(ref s);
+
+			s = s.Trim();
+			int len = s.Length;
+			if (len > 0)
+			{
+				if (s[0] == '=')
+				{
+					if (len > 2 && s[1] == '=')
+					{
+						s = s.Substring(2);
+						return va == pp_unary(ref s);
+					}
+					else
+					{
+						return false;
+					}
+				}
+				else if (s[0] == '!' && len > 1 && s[1] == '=')
+				{
+					s = s.Substring(2);
+
+					return va != pp_unary(ref s);
+
+				}
+			}
+
+			return va;
+
+		}
+
+		bool pp_and(ref string s)
+		{
+			bool va = pp_eq(ref s);
+
+			s = s.Trim();
+			int len = s.Length;
+			if (len > 0)
+			{
+				if (s[0] == '&')
+				{
+					if (len > 2 && s[1] == '&')
+					{
+						s = s.Substring(2);
+						return (va & pp_and(ref s));
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+			return va;
+		}
+
+		//
+		// Evaluates an expression for `#if' or `#elif'
+		//
+		bool pp_expr(ref string s, bool isTerm)
+		{
+			bool va = pp_and(ref s);
+			s = s.Trim();
+			int len = s.Length;
+			if (len > 0)
+			{
+				char c = s[0];
+
+				if (c == '|')
+				{
+					if (len > 2 && s[1] == '|')
+					{
+						s = s.Substring(2);
+						return va | pp_expr(ref s, isTerm);
+					}
+					else
+					{
+
+						return false;
+					}
+				}
+				if (isTerm)
+				{
+					return false;
+				}
+			}
+
+			return va;
+		}
+
+		bool eval(string s)
+		{
+			bool v = pp_expr(ref s, true);
+			s = s.Trim();
+			if (s.Length != 0)
+			{
+				return false;
+			}
+
+			return v;
+		}
+
+		#endregion
+	}
+
+	#endregion
+
+	#region PreProcessorComment state
+
+	/// <summary>
+	///     PreProcessor comment state.
+	/// </summary>
+	/// <remarks>
+	///     Activates when the #if or #elif directive is false and ignores
+	///     all pushed chars until the next '#'.
+	/// </remarks>
+	class PreProcessorCommentState : IndentState
+	{
+		public PreProcessorCommentState()
+		{ }
+
+		public PreProcessorCommentState(PreProcessorCommentState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == '#' && Engine.isLineStart)
+			{
+				ChangeState<PreProcessorState>();
+			}
+		}
+
+		public override void InitializeState()
+		{
+			// OPTION: IndentPreprocessorDirectives
+			if (true/*Engine.options.IndentPreprocessorDirectives*/ &&
+			    Engine.ifDirectiveIndents.Count > 0)
+			{
+				ThisLineIndent = Engine.ifDirectiveIndents.Peek().Clone();
+				NextLineIndent = ThisLineIndent.Clone();
+			}
+			else
+			{
+				ThisLineIndent = Parent.NextLineIndent.Clone();
+				NextLineIndent = ThisLineIndent.Clone();
+			}
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new PreProcessorCommentState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region LineComment state
+
+	/// <summary>
+	///     Single-line comment state.
+	/// </summary>
+	class LineCommentState : IndentState
+	{
+		/// <summary>
+		///     It's possible that this should be the DocComment state:
+		///         check if the first next pushed char is equal to '/'.
+		/// </summary>
+		public bool CheckForDocComment = true;
+
+		public LineCommentState()
+		{
+			/*			if (engine.formattingOptions.KeepCommentsAtFirstColumn && engine.column == 2)
+				ThisLineIndent.Reset();*/
+		}
+
+		public LineCommentState(LineCommentState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			CheckForDocComment = prototype.CheckForDocComment;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.newLineChar)
+			{
+				// to handle cases like //\n/*
+				// Otherwise line 2 would be treated as line comment.
+				Engine.previousChar = '\0';
+				ExitState();
+			}
+			else if (ch == '/' && CheckForDocComment)
+			{
+				// wrong state, should be DocComment.
+				ExitState();
+				ChangeState<DocCommentState>();
+			}
+
+			CheckForDocComment = false;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new LineCommentState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region DocComment state
+
+	/// <summary>
+	///     XML documentation comment state.
+	/// </summary>
+	class DocCommentState : IndentState
+	{
+		public DocCommentState()
+		{ }
+
+		public DocCommentState(DocCommentState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{ }
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.newLineChar)
+			{
+				ExitState();
+			}
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new DocCommentState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region MultiLineComment state
+
+	/// <summary>
+	///     Multi-line comment state.
+	/// </summary>
+	class MultiLineCommentState : IndentState
+	{
+		/// <summary>
+		///     True if any char has been pushed to this state.
+		/// </summary>
+		/// <remarks>
+		///     Needed to resolve an issue when the first pushed char is '/'.
+		///     The state would falsely exit on this sequence of chars '/*/',
+		///     since it only checks if the last two chars are '/' and '*'.
+		/// </remarks>
+		public bool IsAnyCharPushed;
+
+		public MultiLineCommentState()
+		{ }
+
+		public MultiLineCommentState(MultiLineCommentState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsAnyCharPushed = prototype.IsAnyCharPushed;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == '/' && Engine.previousChar == '*' && IsAnyCharPushed)
+			{
+				ExitState();
+			}
+
+			IsAnyCharPushed = true;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = ThisLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new MultiLineCommentState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region StringLiteral state
+
+	/// <summary>
+	///     StringLiteral state.
+	/// </summary>
+	class StringLiteralState : IndentState
+	{
+		/// <summary>
+		///     True if the next char is escaped with '\'.
+		/// </summary>
+		public bool IsEscaped;
+
+		public StringLiteralState()
+		{ }
+
+		public StringLiteralState(StringLiteralState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsEscaped = prototype.IsEscaped;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.newLineChar || (!IsEscaped && ch == '"')) {
+				ExitState();
+			} else {
+				IsEscaped = ch == '\\' && !IsEscaped;
+			}
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new StringLiteralState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region Verbatim string state
+
+	/// <summary>
+	///     Verbatim string state.
+	/// </summary>
+	class VerbatimStringState : IndentState
+	{
+		/// <summary>
+		///     True if there is an odd number of '"' in a row.
+		/// </summary>
+		public bool IsEscaped;
+
+		public VerbatimStringState()
+		{ }
+
+		public VerbatimStringState(VerbatimStringState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsEscaped = prototype.IsEscaped;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (IsEscaped && ch != '"')
+			{
+				ExitState();
+				// the char has been pushed to the wrong state, push it back
+				Engine.currentState.Push(ch);
+			}
+
+			IsEscaped = ch == '"' && !IsEscaped;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = new Indent(Engine.options);
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new VerbatimStringState(this, engine);
+		}
+	}
+
+	#endregion
+
+	#region Character state
+
+	/// <summary>
+	///     Character state.
+	/// </summary>
+	class CharacterState : IndentState
+	{
+		/// <summary>
+		///     True if the next char is escaped with '\'.
+		/// </summary>
+		public bool IsEscaped;
+
+		public CharacterState()
+		{ }
+
+		public CharacterState(CharacterState prototype, CSharpIndentEngine engine)
+			: base(prototype, engine)
+		{
+			IsEscaped = prototype.IsEscaped;
+		}
+
+		public override void Push(char ch)
+		{
+			base.Push(ch);
+
+			if (ch == Engine.newLineChar)
+			{
+				ExitState();
+			}
+			else if (!IsEscaped && ch == '\'')
+			{
+				ExitState();
+			}
+
+			IsEscaped = ch == '\\' && !IsEscaped;
+		}
+
+		public override void InitializeState()
+		{
+			ThisLineIndent = Parent.ThisLineIndent.Clone();
+			NextLineIndent = Parent.NextLineIndent.Clone();
+		}
+
+		public override IndentState Clone(CSharpIndentEngine engine)
+		{
+			return new CharacterState(this, engine);
+		}
+	}
+
+	#endregion
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/NullIStateMachineIndentEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/NullIStateMachineIndentEngine.cs
new file mode 100644
index 0000000000..d4f32a1f80
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/NullIStateMachineIndentEngine.cs
@@ -0,0 +1,207 @@
+//
+// NullIStateMachineIndentEngine.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	/// An empty IStateMachineIndentEngine implementation that does nothing.
+	/// </summary>
+	public sealed class NullIStateMachineIndentEngine : IStateMachineIndentEngine
+	{
+		int offset;
+
+		public NullIStateMachineIndentEngine()
+		{
+		}
+
+		#region IStateMachineIndentEngine implementation
+		public IStateMachineIndentEngine Clone()
+		{
+			return new NullIStateMachineIndentEngine() { offset = this.offset };
+		}
+
+		bool IStateMachineIndentEngine.IsInsidePreprocessorDirective {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsidePreprocessorComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideStringLiteral {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideVerbatimString {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideCharacter {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideString {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideLineComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideMultiLineComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideDocLineComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideOrdinaryComment {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.IsInsideOrdinaryCommentOrString {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.LineBeganInsideVerbatimString {
+			get {
+				return false;
+			}
+		}
+
+		bool IStateMachineIndentEngine.LineBeganInsideMultiLineComment {
+			get {
+				return false;
+			}
+		}
+		#endregion
+
+		#region IDocumentIndentEngine implementation
+		void IDocumentIndentEngine.Push(char ch)
+		{
+			offset++;
+		}
+
+		void IDocumentIndentEngine.Reset()
+		{
+			this.offset = 0;
+		}
+
+		void IDocumentIndentEngine.Update(SourceText sourceText, int offset)
+		{
+			this.offset = offset;
+		}
+
+		IDocumentIndentEngine IDocumentIndentEngine.Clone()
+		{
+			return Clone();
+		}
+
+		string IDocumentIndentEngine.ThisLineIndent {
+			get {
+				return "";
+			}
+		}
+
+		string IDocumentIndentEngine.NextLineIndent {
+			get {
+				return "";
+			}
+		}
+
+		string IDocumentIndentEngine.CurrentIndent {
+			get {
+				return "";
+			}
+		}
+
+		bool IDocumentIndentEngine.NeedsReindent {
+			get {
+				return false;
+			}
+		}
+
+		int IDocumentIndentEngine.Offset {
+			get {
+				return offset;
+			}
+		}
+//		TextLocation IDocumentIndentEngine.Location {
+//			get {
+//				return TextLocation.Empty;
+//			}
+//		}
+
+		/// <inheritdoc />
+		public bool EnableCustomIndentLevels
+		{
+			get { return false; }
+			set { }
+		}
+
+		#endregion
+
+		#region ICloneable implementation
+		object ICloneable.Clone()
+		{
+			return Clone();
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/TextPasteIndentEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/TextPasteIndentEngine.cs
new file mode 100644
index 0000000000..d2e44e4412
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IndentEngine/TextPasteIndentEngine.cs
@@ -0,0 +1,685 @@
+//
+// TextPasteIndentEngine.cs
+//
+// Author:
+//       Matej Miklečić <matej.miklecic@gmail.com>
+//
+// Copyright (c) 2013 Matej Miklečić (matej.miklecic@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	///     Represents a decorator of an IStateMachineIndentEngine instance
+	///     that provides logic for text paste events.
+	/// </summary>
+	class TextPasteIndentEngine : IDocumentIndentEngine, ITextPasteHandler
+	{
+
+		#region Properties
+
+		/// <summary>
+		///     An instance of IStateMachineIndentEngine which handles
+		///     the indentation logic.
+		/// </summary>
+		IStateMachineIndentEngine engine;
+		/// <summary>
+		///     Text editor options.
+		/// </summary>
+		internal readonly OptionSet options;
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		///     Creates a new TextPasteIndentEngine instance.
+		/// </summary>
+		/// <param name="decoratedEngine">
+		///     An instance of <see cref="IStateMachineIndentEngine"/> to which the
+		///     logic for indentation will be delegated.
+		/// </param>
+		/// <param name = "options"></param>
+		public TextPasteIndentEngine (IStateMachineIndentEngine decoratedEngine, OptionSet options)
+		{
+			this.engine = decoratedEngine;
+			this.options = options;
+			this.engine.EnableCustomIndentLevels = false;
+		}
+
+		#endregion
+
+		#region ITextPasteHandler
+		/// <inheritdoc />
+		string ITextPasteHandler.FormatPlainText (SourceText sourceText, int offset, string text, byte [] copyData)
+		{
+			if (copyData != null && copyData.Length == 1) {
+				var strategy = TextPasteUtils.Strategies [(PasteStrategy)copyData [0]];
+				text = strategy.Decode (text);
+			}
+			engine.Update (sourceText, offset);
+
+			if (engine.IsInsideStringLiteral) {
+				int idx = text.IndexOf ('"');
+				if (idx > 0) {
+					var o = offset;
+					while (o < sourceText.Length) {
+						char ch = sourceText [o];
+						engine.Push (ch);
+						if (NewLine.IsNewLine (ch))
+							break;
+						o++;
+						if (!engine.IsInsideStringLiteral)
+							return TextPasteUtils.StringLiteralStrategy.Encode (text);
+					}
+					return TextPasteUtils.StringLiteralStrategy.Encode (text.Substring (0, idx)) + text.Substring (idx);
+				}
+				return TextPasteUtils.StringLiteralStrategy.Encode (text);
+
+			} else if (engine.IsInsideVerbatimString) {
+				int idx = text.IndexOf ('"');
+				if (idx > 0) {
+					var o = offset;
+					while (o < sourceText.Length) {
+						char ch = sourceText [o];
+						engine.Push (ch);
+						o++;
+						if (!engine.IsInsideVerbatimString)
+							return TextPasteUtils.VerbatimStringStrategy.Encode (text);
+					}
+					return TextPasteUtils.VerbatimStringStrategy.Encode (text.Substring (0, idx)) + text.Substring (idx);
+				}
+
+				return TextPasteUtils.VerbatimStringStrategy.Encode (text);
+			}
+
+
+			// on the fly formatting is done in post formatting, if turned off just correct indenting.
+			try {
+				if (DefaultSourceEditorOptions.Instance.OnTheFlyFormatting) {
+					return text;
+				}
+			} catch {
+				// may happen in unit tests -> ignore
+			}
+
+			var line = sourceText.Lines.GetLineFromPosition (offset);
+			var pasteAtLineStart = line.Start == offset;
+			var indentedText = new StringBuilder ();
+			var curLine = new StringBuilder ();
+			var clonedEngine = engine.Clone ();
+			bool isNewLine = false, gotNewLine = false;
+			for (int i = 0; i < text.Length; i++) {
+				var ch = text [i];
+				if (clonedEngine.IsInsideVerbatimString || clonedEngine.IsInsideMultiLineComment || clonedEngine.IsInsidePreprocessorComment) {
+					clonedEngine.Push (ch);
+					curLine.Append (ch);
+					continue;
+				}
+
+				var delimiterLength = NewLine.GetDelimiterLength (ch, i + 1 < text.Length ? text [i + 1] : ' ');
+				if (delimiterLength > 0) {
+					isNewLine = true;
+					if (gotNewLine || pasteAtLineStart) {
+						if (curLine.Length > 0 /*|| formattingOptions.EmptyLineFormatting == EmptyLineFormatting.Indent*/)
+							indentedText.Append (clonedEngine.ThisLineIndent);
+					}
+					indentedText.Append (curLine);
+					var newLine = options.GetOption (FormattingOptions.NewLine, LanguageNames.CSharp);
+					indentedText.Append (newLine);
+					curLine.Length = 0;
+					gotNewLine = true;
+					i += delimiterLength - 1;
+					// textEditorOptions.EolMarker[0] is the newLineChar used by the indentation engine.
+					clonedEngine.Push (newLine [0]);
+				} else {
+					if (isNewLine) {
+						if (ch == '\t' || ch == ' ') {
+							clonedEngine.Push (ch);
+							continue;
+						}
+						isNewLine = false;
+					}
+					curLine.Append (ch);
+					clonedEngine.Push (ch);
+				}
+				if (clonedEngine.IsInsideVerbatimString || clonedEngine.IsInsideMultiLineComment &&
+					!(clonedEngine.LineBeganInsideVerbatimString || clonedEngine.LineBeganInsideMultiLineComment)) {
+					if (gotNewLine) {
+						if (curLine.Length > 0 /*|| formattingOptions.EmptyLineFormatting == EmptyLineFormatting.Indent*/)
+							indentedText.Append (clonedEngine.ThisLineIndent);
+					}
+					pasteAtLineStart = false;
+					indentedText.Append (curLine);
+					curLine.Length = 0;
+					gotNewLine = false;
+					continue;
+				}
+			}
+			if (gotNewLine && (!pasteAtLineStart || curLine.Length > 0)) {
+				indentedText.Append (clonedEngine.ThisLineIndent);
+			}
+			if (curLine.Length > 0) {
+				indentedText.Append (curLine);
+			}
+			return indentedText.ToString ();
+		}
+
+		/// <inheritdoc />
+		byte [] ITextPasteHandler.GetCopyData (SourceText sourceText, TextSpan segment)
+		{
+			engine.Update (sourceText, segment.Start);
+			if (engine.IsInsideStringLiteral) {
+				return new [] { (byte)PasteStrategy.StringLiteral };
+			} else if (engine.IsInsideVerbatimString) {
+				return new [] { (byte)PasteStrategy.VerbatimString };
+			}
+
+			return null;
+		}
+
+		#endregion
+
+		#region IDocumentIndentEngine
+
+		/// <inheritdoc />
+		public string ThisLineIndent {
+			get { return engine.ThisLineIndent; }
+		}
+
+		/// <inheritdoc />
+		public string NextLineIndent {
+			get { return engine.NextLineIndent; }
+		}
+
+		/// <inheritdoc />
+		public string CurrentIndent {
+			get { return engine.CurrentIndent; }
+		}
+
+		/// <inheritdoc />
+		public bool NeedsReindent {
+			get { return engine.NeedsReindent; }
+		}
+
+		/// <inheritdoc />
+		public int Offset {
+			get { return engine.Offset; }
+		}
+
+		//		/// <inheritdoc />
+		//		public TextLocation Location {
+		//			get { return engine.Location; }
+		//		}
+
+		/// <inheritdoc />
+		public bool EnableCustomIndentLevels {
+			get { return engine.EnableCustomIndentLevels; }
+			set { engine.EnableCustomIndentLevels = value; }
+		}
+
+		/// <inheritdoc />
+		public void Push (char ch)
+		{
+			engine.Push (ch);
+		}
+
+		/// <inheritdoc />
+		public void Reset ()
+		{
+			engine.Reset ();
+		}
+
+		/// <inheritdoc />
+		public void Update (SourceText sourceText, int offset)
+		{
+			engine.Update (sourceText, offset);
+		}
+
+		#endregion
+
+		#region IClonable
+
+		public IDocumentIndentEngine Clone ()
+		{
+			return new TextPasteIndentEngine (engine, options);
+		}
+
+		object ICloneable.Clone ()
+		{
+			return Clone ();
+		}
+
+		#endregion
+
+	}
+
+	/// <summary>
+	///     Types of text-paste strategies.
+	/// </summary>
+	public enum PasteStrategy : byte
+	{
+		PlainText = 0,
+		StringLiteral = 1,
+		VerbatimString = 2
+	}
+
+	/// <summary>
+	///     Defines some helper methods for dealing with text-paste events.
+	/// </summary>
+	static class TextPasteUtils
+	{
+		/// <summary>
+		///     Collection of text-paste strategies.
+		/// </summary>
+		public static TextPasteStrategies Strategies = new TextPasteStrategies ();
+
+		/// <summary>
+		///     The interface for a text-paste strategy.
+		/// </summary>
+		public interface IPasteStrategy
+		{
+			/// <summary>
+			///     Formats the given text according with this strategy rules.
+			/// </summary>
+			/// <param name="text">
+			///    The text to format.
+			/// </param>
+			/// <returns>
+			///     Formatted text.
+			/// </returns>
+			string Encode (string text);
+
+			/// <summary>
+			///     Converts text formatted according with this strategy rules
+			///     to its original form.
+			/// </summary>
+			/// <param name="text">
+			///     Formatted text to convert.
+			/// </param>
+			/// <returns>
+			///     Original form of the given formatted text.
+			/// </returns>
+			string Decode (string text);
+
+			/// <summary>
+			///     Type of this strategy.
+			/// </summary>
+			PasteStrategy Type { get; }
+		}
+
+		/// <summary>
+		///     Wrapper that discovers all defined text-paste strategies and defines a way
+		///     to easily access them through their <see cref="PasteStrategy"/> type.
+		/// </summary>
+		public sealed class TextPasteStrategies
+		{
+			/// <summary>
+			///     Collection of discovered text-paste strategies.
+			/// </summary>
+			IDictionary<PasteStrategy, IPasteStrategy> strategies;
+
+			/// <summary>
+			///     Uses reflection to find all types derived from <see cref="IPasteStrategy"/>
+			///     and adds an instance of each strategy to <see cref="strategies"/>.
+			/// </summary>
+			public TextPasteStrategies ()
+			{
+				strategies = new Dictionary<PasteStrategy, IPasteStrategy> ();
+				strategies [PasteStrategy.PlainText] = PlainTextPasteStrategy.Instance;
+				strategies [PasteStrategy.StringLiteral] = StringLiteralPasteStrategy.Instance;
+				strategies [PasteStrategy.VerbatimString] = VerbatimStringPasteStrategy.Instance;
+			}
+
+			/// <summary>
+			///     Checks if there is a strategy of the given type and returns it.
+			/// </summary>
+			/// <param name="strategy">
+			///     Type of the strategy instance.
+			/// </param>
+			/// <returns>
+			///     A strategy instance of the requested type,
+			///     or <see cref="DefaultStrategy"/> if it wasn't found.
+			/// </returns>
+			public IPasteStrategy this [PasteStrategy strategy] {
+				get {
+					if (strategies.ContainsKey (strategy)) {
+						return strategies [strategy];
+					}
+
+					return DefaultStrategy;
+				}
+			}
+		}
+
+		/// <summary>
+		///     Doesn't do any formatting. Serves as the default strategy.
+		/// </summary>
+		class PlainTextPasteStrategy : IPasteStrategy
+		{
+
+			#region Singleton
+
+			public static IPasteStrategy Instance {
+				get {
+					return instance ?? (instance = new PlainTextPasteStrategy ());
+				}
+			}
+
+			static PlainTextPasteStrategy instance;
+
+			protected PlainTextPasteStrategy ()
+			{
+			}
+
+			#endregion
+
+			/// <inheritdoc />
+			public string Encode (string text)
+			{
+				return text;
+			}
+
+			/// <inheritdoc />
+			public string Decode (string text)
+			{
+				return text;
+			}
+
+			/// <inheritdoc />
+			public PasteStrategy Type {
+				get { return PasteStrategy.PlainText; }
+			}
+		}
+
+		/// <summary>
+		///     Escapes chars in the given text so that they don't
+		///     break a valid string literal.
+		/// </summary>
+		internal class StringLiteralPasteStrategy : IPasteStrategy
+		{
+
+			#region Singleton
+
+			public static IPasteStrategy Instance {
+				get {
+					return instance ?? (instance = new StringLiteralPasteStrategy ());
+				}
+			}
+
+			static StringLiteralPasteStrategy instance;
+
+			protected StringLiteralPasteStrategy ()
+			{
+			}
+
+			#endregion
+
+			/// <inheritdoc />
+			public string Encode (string text)
+			{
+				return ConvertString (text);
+			}
+
+			/// <summary>
+			/// Gets the escape sequence for the specified character.
+			/// </summary>
+			/// <remarks>This method does not convert ' or ".</remarks>
+			public static string ConvertChar (char ch)
+			{
+				switch (ch) {
+				case '\\':
+					return "\\\\";
+				case '\0':
+					return "\\0";
+				case '\a':
+					return "\\a";
+				case '\b':
+					return "\\b";
+				case '\f':
+					return "\\f";
+				case '\n':
+					return "\\n";
+				case '\r':
+					return "\\r";
+				case '\t':
+					return "\\t";
+				case '\v':
+					return "\\v";
+				default:
+					if (char.IsControl (ch) || char.IsSurrogate (ch) ||
+						// print all uncommon white spaces as numbers
+						(char.IsWhiteSpace (ch) && ch != ' ')) {
+						return "\\u" + ((int)ch).ToString ("x4");
+					} else {
+						return ch.ToString ();
+					}
+				}
+			}
+
+			/// <summary>
+			/// Converts special characters to escape sequences within the given string.
+			/// </summary>
+			public static string ConvertString (string str)
+			{
+				StringBuilder sb = new StringBuilder ();
+				foreach (char ch in str) {
+					if (ch == '"') {
+						sb.Append ("\\\"");
+					} else {
+						sb.Append (ConvertChar (ch));
+					}
+				}
+				return sb.ToString ();
+			}
+
+			/// <inheritdoc />
+			public string Decode (string text)
+			{
+				var result = new StringBuilder ();
+				bool isEscaped = false;
+
+				for (int i = 0; i < text.Length; i++) {
+					var ch = text [i];
+					if (isEscaped) {
+						switch (ch) {
+						case 'a':
+							result.Append ('\a');
+							break;
+						case 'b':
+							result.Append ('\b');
+							break;
+						case 'n':
+							result.Append ('\n');
+							break;
+						case 't':
+							result.Append ('\t');
+							break;
+						case 'v':
+							result.Append ('\v');
+							break;
+						case 'r':
+							result.Append ('\r');
+							break;
+						case '\\':
+							result.Append ('\\');
+							break;
+						case 'f':
+							result.Append ('\f');
+							break;
+						case '0':
+							result.Append (0);
+							break;
+						case '"':
+							result.Append ('"');
+							break;
+						case '\'':
+							result.Append ('\'');
+							break;
+						case 'x':
+							char r;
+							if (TryGetHex (text, -1, ref i, out r)) {
+								result.Append (r);
+								break;
+							}
+							goto default;
+						case 'u':
+							if (TryGetHex (text, 4, ref i, out r)) {
+								result.Append (r);
+								break;
+							}
+							goto default;
+						case 'U':
+							if (TryGetHex (text, 8, ref i, out r)) {
+								result.Append (r);
+								break;
+							}
+							goto default;
+						default:
+							result.Append ('\\');
+							result.Append (ch);
+							break;
+						}
+						isEscaped = false;
+						continue;
+					}
+					if (ch != '\\') {
+						result.Append (ch);
+					} else {
+						isEscaped = true;
+					}
+				}
+
+				return result.ToString ();
+			}
+
+			static bool TryGetHex (string text, int count, ref int idx, out char r)
+			{
+				int i;
+				int total = 0;
+				int top = count != -1 ? count : 4;
+
+				for (i = 0; i < top; i++) {
+					int c = text [idx + 1 + i];
+
+					if (c >= '0' && c <= '9')
+						c = (int)c - (int)'0';
+					else if (c >= 'A' && c <= 'F')
+						c = (int)c - (int)'A' + 10;
+					else if (c >= 'a' && c <= 'f')
+						c = (int)c - (int)'a' + 10;
+					else {
+						r = '\0';
+						return false;
+					}
+					total = (total * 16) + c;
+				}
+
+				if (top == 8) {
+					if (total > 0x0010FFFF) {
+						r = '\0';
+						return false;
+					}
+
+					if (total >= 0x00010000)
+						total = ((total - 0x00010000) / 0x0400 + 0xD800);
+				}
+				r = (char)total;
+				idx += top;
+				return true;
+			}
+
+			/// <inheritdoc />
+			public PasteStrategy Type {
+				get { return PasteStrategy.StringLiteral; }
+			}
+		}
+
+		/// <summary>
+		///     Escapes chars in the given text so that they don't
+		///     break a valid verbatim string.
+		/// </summary>
+		class VerbatimStringPasteStrategy : IPasteStrategy
+		{
+
+			#region Singleton
+
+			public static IPasteStrategy Instance {
+				get {
+					return instance ?? (instance = new VerbatimStringPasteStrategy ());
+				}
+			}
+
+			static VerbatimStringPasteStrategy instance;
+
+			protected VerbatimStringPasteStrategy ()
+			{
+			}
+
+			#endregion
+
+			static readonly Dictionary<char, IEnumerable<char>> encodeReplace = new Dictionary<char, IEnumerable<char>> {
+				{ '\"', "\"\"" },
+			};
+
+			/// <inheritdoc />
+			public string Encode (string text)
+			{
+				return string.Concat (text.SelectMany (c => encodeReplace.ContainsKey (c) ? encodeReplace [c] : new [] { c }));
+			}
+
+			/// <inheritdoc />
+			public string Decode (string text)
+			{
+				bool isEscaped = false;
+				return string.Concat (text.Where (c => !(isEscaped = !isEscaped && c == '"')));
+			}
+
+			/// <inheritdoc />
+			public PasteStrategy Type {
+				get { return PasteStrategy.VerbatimString; }
+			}
+		}
+
+		/// <summary>
+		///     The default text-paste strategy.
+		/// </summary>
+		public static IPasteStrategy DefaultStrategy = PlainTextPasteStrategy.Instance;
+		/// <summary>
+		///     String literal text-paste strategy.
+		/// </summary>
+		public static IPasteStrategy StringLiteralStrategy = StringLiteralPasteStrategy.Instance;
+		/// <summary>
+		///     Verbatim string text-paste strategy.
+		/// </summary>
+		public static IPasteStrategy VerbatimStringStrategy = VerbatimStringPasteStrategy.Instance;
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.AbstractIntroduceVariableCodeAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.AbstractIntroduceVariableCodeAction.cs
new file mode 100644
index 0000000000..d233632cbb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.AbstractIntroduceVariableCodeAction.cs
@@ -0,0 +1,134 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Simplification;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        internal abstract class AbstractIntroduceVariableCodeAction : CodeAction
+        {
+            private readonly bool _allOccurrences;
+            private readonly bool _isConstant;
+            private readonly bool _isLocal;
+            private readonly bool _isQueryLocal;
+            private readonly TExpressionSyntax _expression;
+            private readonly SemanticDocument _document;
+            private readonly TService _service;
+            private readonly string _title;
+
+            private static Regex s_newlinePattern = new Regex(@"[\r\n]+", RegexOptions.Compiled);
+
+            internal AbstractIntroduceVariableCodeAction(
+                TService service,
+                SemanticDocument document,
+                TExpressionSyntax expression,
+                bool allOccurrences,
+                bool isConstant,
+                bool isLocal,
+                bool isQueryLocal)
+            {
+                _service = service;
+                _document = document;
+                _expression = expression;
+                _allOccurrences = allOccurrences;
+                _isConstant = isConstant;
+                _isLocal = isLocal;
+                _isQueryLocal = isQueryLocal;
+                _title = CreateDisplayText(expression);
+            }
+
+            public override string Title
+            {
+                get { return _title; }
+            }
+
+            protected override async Task<Document> GetChangedDocumentAsync(CancellationToken cancellationToken)
+            {
+                var changedDocument = await GetChangedDocumentCoreAsync(cancellationToken).ConfigureAwait(false);
+                return await Simplifier.ReduceAsync(changedDocument, cancellationToken: cancellationToken).ConfigureAwait(false);
+            }
+
+            private async Task<Document> GetChangedDocumentCoreAsync(CancellationToken cancellationToken)
+            {
+                if (_isQueryLocal)
+                {
+                    return await _service.IntroduceQueryLocalAsync(_document, _expression, _allOccurrences, cancellationToken).ConfigureAwait(false);
+                }
+                else if (_isLocal)
+                {
+                    return await _service.IntroduceLocalAsync(_document, _expression, _allOccurrences, _isConstant, cancellationToken).ConfigureAwait(false);
+                }
+                else
+                {
+                    return await IntroduceFieldAsync(cancellationToken).ConfigureAwait(false);
+                }
+            }
+
+            private async Task<Document> IntroduceFieldAsync(CancellationToken cancellationToken)
+            {
+                var result = await _service.IntroduceFieldAsync(_document, _expression, _allOccurrences, _isConstant, cancellationToken).ConfigureAwait(false);
+                return result.Item1;
+            }
+
+            private string CreateDisplayText(TExpressionSyntax expression)
+            {
+				var singleLineExpression = expression.ConvertToSingleLine();
+                var nodeString = singleLineExpression.ToFullString().Trim();
+
+                // prevent the display string from spanning multiple lines
+                nodeString = s_newlinePattern.Replace(nodeString, " ");
+
+                // prevent the display string from being too long
+                const int MaxLength = 40;
+                if (nodeString.Length > MaxLength)
+                {
+                    nodeString = nodeString.Substring(0, MaxLength) + "...";
+                }
+
+                return CreateDisplayText(nodeString);
+            }
+
+            private string CreateDisplayText(string nodeString)
+            {
+                // Indexed by: allOccurrences, isConstant, isLocal
+                var formatStrings = new string[2, 2, 2]
+                {
+                  {
+                    { Resources.IntroduceFieldFor, Resources.IntroduceLocalFor },
+                    { Resources.IntroduceConstantFor, Resources.IntroduceLocalConstantFor }
+                  },
+                  {
+                    { Resources.IntroduceFieldForAllOccurrences,  Resources.IntroduceLocalForAllOccurrences },
+                    { Resources.IntroduceConstantForAllOccurrences, Resources.IntroduceLocalConstantForAll }
+                  }
+                };
+
+                var formatString = _isQueryLocal
+                    ? _allOccurrences
+                        ? Resources.IntroduceQueryVariableForAll
+                        : Resources.IntroduceQueryVariableFor
+                    : formatStrings[_allOccurrences ? 1 : 0, _isConstant ? 1 : 0, _isLocal ? 1 : 0];
+                return string.Format(formatString, nodeString);
+            }
+
+            protected ITypeSymbol GetExpressionType(
+                CancellationToken cancellationToken)
+            {
+                var semanticModel = _document.SemanticModel;
+                var typeInfo = semanticModel.GetTypeInfo(_expression, cancellationToken);
+
+                return typeInfo.Type ?? typeInfo.ConvertedType ?? semanticModel.Compilation.GetSpecialType(SpecialType.System_Object);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.CodeAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.CodeAction.cs
new file mode 100644
index 0000000000..f4084abecb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.CodeAction.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Simplification;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        private class IntroduceVariableCodeAction : AbstractIntroduceVariableCodeAction
+        {
+            internal IntroduceVariableCodeAction(
+                TService service,
+                SemanticDocument document,
+                TExpressionSyntax expression,
+                bool allOccurrences,
+                bool isConstant,
+                bool isLocal,
+                bool isQueryLocal)
+                : base(service, document, expression, allOccurrences, isConstant, isLocal, isQueryLocal)
+            {
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.IntroduceVariableAllOccurrenceCodeAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.IntroduceVariableAllOccurrenceCodeAction.cs
new file mode 100644
index 0000000000..aebb852346
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.IntroduceVariableAllOccurrenceCodeAction.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CaseCorrection;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Simplification;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        private class IntroduceVariableAllOccurrenceCodeAction : AbstractIntroduceVariableCodeAction
+        {
+            internal IntroduceVariableAllOccurrenceCodeAction(
+                TService service,
+                SemanticDocument document,
+                TExpressionSyntax expression,
+                bool allOccurrences,
+                bool isConstant,
+                bool isLocal,
+                bool isQueryLocal)
+                : base(service, document, expression, allOccurrences, isConstant, isLocal, isQueryLocal)
+            {
+            }
+
+            protected override async Task<Document> PostProcessChangesAsync(Document document, CancellationToken cancellationToken)
+            {
+				// TODO: Formatting conversation ? AllowDisjointSpanMerging not supported in nuget roslyn right now.
+				var optionSet = document.Project.Solution.Workspace.Options;//.WithChangedOption(FormattingOptions.AllowDisjointSpanMerging, true);
+                document = await Simplifier.ReduceAsync(document, Simplifier.Annotation, cancellationToken: cancellationToken).ConfigureAwait(false);
+                document = await Formatter.FormatAsync(document, Formatter.Annotation, cancellationToken: cancellationToken).ConfigureAwait(false);
+                document = await CaseCorrector.CaseCorrectAsync(document, CaseCorrector.Annotation, cancellationToken).ConfigureAwait(false);
+                return document;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State.cs
new file mode 100644
index 0000000000..49d2c8aa67
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State.cs
@@ -0,0 +1,271 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        private partial class State
+        {
+            public SemanticDocument Document { get; private set; }
+            public TExpressionSyntax Expression { get; private set; }
+
+            public bool InAttributeContext { get; private set; }
+            public bool InBlockContext { get; private set; }
+            public bool InConstructorInitializerContext { get; private set; }
+            public bool InFieldContext { get; private set; }
+            public bool InParameterContext { get; private set; }
+            public bool InQueryContext { get; private set; }
+            public bool InExpressionBodiedMemberContext { get; private set; }
+
+            public bool IsConstant { get; private set; }
+
+            private SemanticMap _semanticMap;
+            private readonly TService _service;
+
+            public State(TService service, SemanticDocument document)
+            {
+                _service = service;
+                this.Document = document;
+            }
+
+            public static State Generate(
+                TService service,
+                SemanticDocument document,
+                TextSpan textSpan,
+                CancellationToken cancellationToken)
+            {
+                var state = new State(service, document);
+                if (!state.TryInitialize(textSpan, cancellationToken))
+                {
+                    return null;
+                }
+
+                return state;
+            }
+
+            private bool TryInitialize(
+                TextSpan textSpan,
+                CancellationToken cancellationToken)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return false;
+                }
+
+                var tree = this.Document.SyntaxTree;
+
+                this.Expression = this.GetExpressionUnderSpan(tree, textSpan, cancellationToken);
+                if (this.Expression == null)
+                {
+                    return false;
+                }
+
+                var containingType = this.Expression.AncestorsAndSelf()
+                    .Select(n => this.Document.SemanticModel.GetDeclaredSymbol(n, cancellationToken))
+                    .OfType<INamedTypeSymbol>()
+                    .FirstOrDefault();
+
+                containingType = containingType ?? this.Document.SemanticModel.Compilation.ScriptClass;
+
+                if (containingType == null || containingType.TypeKind == TypeKind.Interface)
+                {
+                    return false;
+                }
+
+                if (!CanIntroduceVariable(cancellationToken))
+                {
+                    return false;
+                }
+
+                this.IsConstant = this.Document.SemanticModel.GetConstantValue(this.Expression, cancellationToken).HasValue;
+
+                // Note: the ordering of these clauses are important.  They go, generally, from 
+                // innermost to outermost order.  
+                if (IsInQueryContext(cancellationToken))
+                {
+                    if (CanGenerateInto<TQueryExpressionSyntax>(cancellationToken))
+                    {
+                        this.InQueryContext = true;
+                        return true;
+                    }
+
+                    return false;
+                }
+
+                if (IsInConstructorInitializerContext(cancellationToken))
+                {
+                    if (CanGenerateInto<TTypeDeclarationSyntax>(cancellationToken))
+                    {
+                        this.InConstructorInitializerContext = true;
+                        return true;
+                    }
+
+                    return false;
+                }
+
+                var enclosingBlocks = _service.GetContainingExecutableBlocks(this.Expression);
+                if (enclosingBlocks.Any())
+                {
+                    // If we're inside a block, then don't even try the other options (like field,
+                    // constructor initializer, etc.).  This is desirable behavior.  If we're in a 
+                    // block in a field, then we're in a lambda, and we want to offer to generate
+                    // a local, and not a field.
+                    if (IsInBlockContext(cancellationToken))
+                    {
+                        this.InBlockContext = true;
+                        return true;
+                    }
+
+                    return false;
+                }
+
+                // The ordering of checks is important here. If we are inside a block within an Expression 
+                // bodied member, we should treat it as if we are in block context.
+                // For example, in such a scenario we should generate inside the block, instead of rewriting
+                // a concise expression bodied member to its equivalent that has a body with a block.
+                // For this reason, block should precede expression bodied member check.
+                if (_service.IsInExpressionBodiedMember(this.Expression))
+                {
+                    if (CanGenerateInto<TTypeDeclarationSyntax>(cancellationToken))
+                    {
+                        this.InExpressionBodiedMemberContext = true;
+                        return true;
+                    }
+
+                    return false;
+                }
+
+                if (CanGenerateInto<TTypeDeclarationSyntax>(cancellationToken))
+                {
+                    if (IsInParameterContext(cancellationToken))
+                    {
+                        this.InParameterContext = true;
+                        return true;
+                    }
+                    else if (IsInFieldContext(cancellationToken))
+                    {
+                        this.InFieldContext = true;
+                        return true;
+                    }
+                    else if (IsInAttributeContext(cancellationToken))
+                    {
+                        this.InAttributeContext = true;
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            public SemanticMap GetSemanticMap(CancellationToken cancellationToken)
+            {
+				_semanticMap = _semanticMap ?? this.Document.SemanticModel.GetSemanticMap(this.Expression, cancellationToken);
+                return _semanticMap;
+            }
+
+            private TExpressionSyntax GetExpressionUnderSpan(SyntaxTree tree, TextSpan textSpan, CancellationToken cancellationToken)
+            {
+                var root = tree.GetRoot(cancellationToken);
+                var startToken = root.FindToken(textSpan.Start);
+                var stopToken = root.FindToken(textSpan.End);
+
+                if (textSpan.End <= stopToken.SpanStart)
+                {
+                    stopToken = stopToken.GetPreviousToken(includeSkipped: true);
+                }
+
+                if (startToken.RawKind == 0 || stopToken.RawKind == 0)
+                {
+                    return null;
+                }
+
+                var containingExpressions1 = startToken.GetAncestors<TExpressionSyntax>().ToList();
+                var containingExpressions2 = stopToken.GetAncestors<TExpressionSyntax>().ToList();
+
+                var commonExpression = containingExpressions1.FirstOrDefault(containingExpressions2.Contains);
+                if (commonExpression == null)
+                {
+                    return null;
+                }
+
+                if (!(textSpan.Start >= commonExpression.FullSpan.Start &&
+                      textSpan.Start <= commonExpression.SpanStart))
+                {
+                    return null;
+                }
+
+                if (!(textSpan.End >= commonExpression.Span.End &&
+                      textSpan.End <= commonExpression.FullSpan.End))
+                {
+                    return null;
+                }
+
+                return commonExpression;
+            }
+
+            private bool CanIntroduceVariable(
+                CancellationToken cancellationToken)
+            {
+                // Don't generate a variable for an expression that's the only expression in a
+                // statement.  Otherwise we'll end up with something like "v;" which is not
+                // legal in C#.
+                if (!_service.CanIntroduceVariableFor(this.Expression))
+                {
+                    return false;
+                }
+
+                if (this.Expression is TTypeSyntax)
+                {
+                    return false;
+                }
+
+                // Even though we're creating a variable, we still ask if we can be replaced with an
+                // RValue and not an LValue.  This is because introduction of a local adds a *new* LValue
+                // location, and we want to ensure that any writes will still happen to the *original*
+                // LValue location.  i.e. if you have: "a[1] = b" then you don't want to change that to
+                // "var c = a[1]; c = b", as that write is no longer happening into the right LValue.
+                //
+                // In essense, this says "i can be replaced with an expression as long as i'm not being
+                // written to".
+				return this.Document.SemanticModel.CanReplaceWithRValue(this.Expression, cancellationToken);
+            }
+
+            private bool CanGenerateInto<TSyntax>(CancellationToken cancellationToken)
+                where TSyntax : SyntaxNode
+            {
+                if (this.Document.SemanticModel.Compilation.ScriptClass != null)
+                {
+                    return true;
+                }
+
+                var syntax = this.Expression.GetAncestor<TSyntax>();
+                return syntax != null && !syntax.OverlapsHiddenPosition(cancellationToken);
+            }
+
+            private bool IsInTypeDeclarationOrValidCompilationUnit()
+            {
+                if (this.Expression.GetAncestorOrThis<TTypeDeclarationSyntax>() != null)
+                {
+                    return true;
+                }
+
+                // If we're interactive/script, we can generate into the compilation unit.
+                if (this.Document.Document.SourceCodeKind != SourceCodeKind.Regular)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Attribute.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Attribute.cs
new file mode 100644
index 0000000000..16057e7b78
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Attribute.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        private partial class State
+        {
+            private bool IsInAttributeContext(
+                CancellationToken cancellationToken)
+            {
+                if (!_service.IsInAttributeArgumentInitializer(this.Expression))
+                {
+                    return false;
+                }
+
+                // Have to make sure we're on or inside a type decl so that we have some place to
+                // put the result.
+                return IsInTypeDeclarationOrValidCompilationUnit();
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Block.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Block.cs
new file mode 100644
index 0000000000..6c557e43ee
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Block.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        private partial class State
+        {
+            private bool IsInBlockContext(
+                CancellationToken cancellationToken)
+            {
+                if (!this.IsInTypeDeclarationOrValidCompilationUnit())
+                {
+                    return false;
+                }
+
+                // If refer to a query property, then we use the query context instead.
+                var bindingMap = GetSemanticMap(cancellationToken);
+                if (bindingMap.AllReferencedSymbols.Any(s => s is IRangeVariableSymbol))
+                {
+                    return false;
+                }
+
+                var type = GetTypeSymbol(this.Document, this.Expression, cancellationToken, objectAsDefault: false);
+                if (type == null || type.SpecialType == SpecialType.System_Void)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_ConstructorInitializer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_ConstructorInitializer.cs
new file mode 100644
index 0000000000..d83304cfe1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_ConstructorInitializer.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        private partial class State
+        {
+            private bool IsInConstructorInitializerContext(
+                CancellationToken cancellationToken)
+            {
+                // Note: if we're in a lambda that has a block body, then we don't ever get here
+                // because of the early check for IsInBlockContext.
+                if (!_service.IsInConstructorInitializer(this.Expression))
+                {
+                    return false;
+                }
+
+                var bindingMap = GetSemanticMap(cancellationToken);
+
+                // Can't extract out if a parameter is referenced.
+                if (bindingMap.AllReferencedSymbols.OfType<IParameterSymbol>().Any())
+                {
+                    return false;
+                }
+
+                // Can't extract out an anonymous type used in a constructor initializer.
+                var info = this.Document.SemanticModel.GetTypeInfo(this.Expression, cancellationToken);
+                if (info.Type.ContainsAnonymousType())
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Field.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Field.cs
new file mode 100644
index 0000000000..5ca19e5b3b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Field.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        private partial class State
+        {
+            private bool IsInFieldContext(
+                CancellationToken cancellationToken)
+            {
+                // Note: if we're in a lambda that has a block body, then we don't ever get here
+                // because of the early check for IsInBlockContext.
+                if (!_service.IsInFieldInitializer(this.Expression))
+                {
+                    return false;
+                }
+
+                if (!IsInTypeDeclarationOrValidCompilationUnit())
+                {
+                    return false;
+                }
+
+                // if the expression in the field references any parameters then that means it was
+                // either an expression inside a lambda in the field, or it was an expression in a
+                // query inside the field.  Either of which cannot be extracted out further by this
+                // fix.
+                var bindingMap = GetSemanticMap(cancellationToken);
+                if (bindingMap.AllReferencedSymbols.OfType<IParameterSymbol>().Any())
+                {
+                    return false;
+                }
+
+                // Can't extract out an anonymous type used in a field initializer.
+                var info = this.Document.SemanticModel.GetTypeInfo(this.Expression, cancellationToken);
+                if (info.Type.ContainsAnonymousType())
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Parameter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Parameter.cs
new file mode 100644
index 0000000000..a71b546629
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Parameter.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        private partial class State
+        {
+            private bool IsInParameterContext(
+                CancellationToken cancellationToken)
+            {
+                if (!_service.IsInParameterInitializer(this.Expression))
+                {
+                    return false;
+                }
+
+                // The default value for a parameter is a constant.  So we always allow it unless it
+                // happens to capture one of the method's type parameters.
+                var bindingMap = this.GetSemanticMap(cancellationToken);
+                if (bindingMap.AllReferencedSymbols.OfType<ITypeParameterSymbol>()
+                                                    .Where(tp => tp.TypeParameterKind == TypeParameterKind.Method)
+                                                    .Any())
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Query.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Query.cs
new file mode 100644
index 0000000000..4612e91aa3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.State_Query.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+    {
+        private partial class State
+        {
+            private bool IsInQueryContext(
+                CancellationToken cancellationToken)
+            {
+                if (!_service.IsInNonFirstQueryClause(this.Expression))
+                {
+                    return false;
+                }
+
+                var semanticMap = GetSemanticMap(cancellationToken);
+                if (!semanticMap.AllReferencedSymbols.Any(s => s is IRangeVariableSymbol))
+                {
+                    return false;
+                }
+
+                var info = this.Document.SemanticModel.GetTypeInfo(this.Expression, cancellationToken);
+                if (info.Type == null || info.Type.SpecialType == SpecialType.System_Void)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.cs
new file mode 100644
index 0000000000..105a11dd3c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/AbstractIntroduceVariableService.cs
@@ -0,0 +1,330 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using RefactoringEssentials;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.TypeSystem;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	abstract partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+		where TService : AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax>
+		where TExpressionSyntax : SyntaxNode
+		where TTypeSyntax : TExpressionSyntax
+		where TTypeDeclarationSyntax : SyntaxNode
+		where TQueryExpressionSyntax : TExpressionSyntax
+	{
+		protected abstract bool IsInNonFirstQueryClause(TExpressionSyntax expression);
+		protected abstract bool IsInFieldInitializer(TExpressionSyntax expression);
+		protected abstract bool IsInParameterInitializer(TExpressionSyntax expression);
+		protected abstract bool IsInConstructorInitializer(TExpressionSyntax expression);
+		protected abstract bool IsInAttributeArgumentInitializer(TExpressionSyntax expression);
+		protected abstract bool IsInExpressionBodiedMember(TExpressionSyntax expression);
+
+		protected abstract IEnumerable<SyntaxNode> GetContainingExecutableBlocks(TExpressionSyntax expression);
+		protected abstract IList<bool> GetInsertionIndices(TTypeDeclarationSyntax destination, CancellationToken cancellationToken);
+
+		protected abstract bool CanIntroduceVariableFor(TExpressionSyntax expression);
+		protected abstract bool CanReplace(TExpressionSyntax expression);
+
+		protected abstract Task<Document> IntroduceQueryLocalAsync(SemanticDocument document, TExpressionSyntax expression, bool allOccurrences, CancellationToken cancellationToken);
+		protected abstract Task<Document> IntroduceLocalAsync(SemanticDocument document, TExpressionSyntax expression, bool allOccurrences, bool isConstant, CancellationToken cancellationToken);
+		protected abstract Task<Tuple<Document, SyntaxNode, int>> IntroduceFieldAsync(SemanticDocument document, TExpressionSyntax expression, bool allOccurrences, bool isConstant, CancellationToken cancellationToken);
+
+		protected virtual bool BlockOverlapsHiddenPosition(SyntaxNode block, CancellationToken cancellationToken)
+		{
+			return block.OverlapsHiddenPosition(cancellationToken);
+		}
+
+		public async Task<IntroduceVariableResult> IntroduceVariableAsync(
+			Document document,
+			TextSpan textSpan,
+			CancellationToken cancellationToken)
+		{
+			var semanticDocument = await SemanticDocument.CreateAsync(document, cancellationToken).ConfigureAwait(false);
+
+			var state = State.Generate((TService)this, semanticDocument, textSpan, cancellationToken);
+			if (state == null)
+			{
+				return IntroduceVariableResult.Failure;
+			}
+
+			var actions = await CreateActionsAsync(state, cancellationToken).ConfigureAwait(false);
+			if (actions.Count == 0)
+			{
+				return IntroduceVariableResult.Failure;
+			}
+
+			return new IntroduceVariableResult(new CodeRefactoring(null, actions));
+		}
+
+		private async Task<List<CodeAction>> CreateActionsAsync(State state, CancellationToken cancellationToken)
+		{
+			var actions = new List<CodeAction>();
+
+			if (state.InQueryContext)
+			{
+				actions.Add(CreateAction(state, allOccurrences: false, isConstant: false, isLocal: false, isQueryLocal: true));
+				actions.Add(CreateAction(state, allOccurrences: true, isConstant: false, isLocal: false, isQueryLocal: true));
+			}
+			else if (state.InParameterContext)
+			{
+				actions.Add(CreateAction(state, allOccurrences: false, isConstant: true, isLocal: false, isQueryLocal: false));
+				actions.Add(CreateAction(state, allOccurrences: true, isConstant: true, isLocal: false, isQueryLocal: false));
+			}
+			else if (state.InFieldContext)
+			{
+				actions.Add(CreateAction(state, allOccurrences: false, isConstant: state.IsConstant, isLocal: false, isQueryLocal: false));
+				actions.Add(CreateAction(state, allOccurrences: true, isConstant: state.IsConstant, isLocal: false, isQueryLocal: false));
+			}
+			else if (state.InConstructorInitializerContext)
+			{
+				actions.Add(CreateAction(state, allOccurrences: false, isConstant: state.IsConstant, isLocal: false, isQueryLocal: false));
+				actions.Add(CreateAction(state, allOccurrences: true, isConstant: state.IsConstant, isLocal: false, isQueryLocal: false));
+			}
+			else if (state.InAttributeContext)
+			{
+				actions.Add(CreateAction(state, allOccurrences: false, isConstant: true, isLocal: false, isQueryLocal: false));
+				actions.Add(CreateAction(state, allOccurrences: true, isConstant: true, isLocal: false, isQueryLocal: false));
+			}
+			else if (state.InBlockContext)
+			{
+				await CreateConstantFieldActionsAsync(state, actions, cancellationToken).ConfigureAwait(false);
+
+				var blocks = this.GetContainingExecutableBlocks(state.Expression);
+				var block = blocks.FirstOrDefault();
+
+				if (!BlockOverlapsHiddenPosition(block, cancellationToken))
+				{
+					actions.Add(CreateAction(state, allOccurrences: false, isConstant: state.IsConstant, isLocal: true, isQueryLocal: false));
+
+					if (blocks.All(b => !BlockOverlapsHiddenPosition(b, cancellationToken)))
+					{
+						actions.Add(CreateAction(state, allOccurrences: true, isConstant: state.IsConstant, isLocal: true, isQueryLocal: false));
+					}
+				}
+			}
+			else if (state.InExpressionBodiedMemberContext)
+			{
+				await CreateConstantFieldActionsAsync(state, actions, cancellationToken).ConfigureAwait(false);
+				actions.Add(CreateAction(state, allOccurrences: false, isConstant: state.IsConstant, isLocal: true, isQueryLocal: false));
+				actions.Add(CreateAction(state, allOccurrences: true, isConstant: state.IsConstant, isLocal: true, isQueryLocal: false));
+			}
+
+			return actions;
+		}
+
+		private async Task CreateConstantFieldActionsAsync(State state, List<CodeAction> actions, CancellationToken cancellationToken)
+		{
+			if (state.IsConstant &&
+			    !state.GetSemanticMap(cancellationToken).AllReferencedSymbols.OfType<ILocalSymbol>().Any() &&
+			    !state.GetSemanticMap(cancellationToken).AllReferencedSymbols.OfType<IParameterSymbol>().Any())
+			{
+				// If something is a constant, and it doesn't access any other locals constants,
+				// then we prefer to offer to generate a constant field instead of a constant
+				// local.
+				var action1 = CreateAction(state, allOccurrences: false, isConstant: true, isLocal: false, isQueryLocal: false);
+				if (await CanGenerateIntoContainerAsync(state, action1, cancellationToken).ConfigureAwait(false))
+				{
+					actions.Add(action1);
+				}
+
+				var action2 = CreateAction(state, allOccurrences: true, isConstant: true, isLocal: false, isQueryLocal: false);
+				if (await CanGenerateIntoContainerAsync(state, action2, cancellationToken).ConfigureAwait(false))
+				{
+					actions.Add(action2);
+				}
+			}
+		}
+
+		private async Task<bool> CanGenerateIntoContainerAsync(State state, CodeAction action, CancellationToken cancellationToken)
+		{
+			var result = await this.IntroduceFieldAsync(
+				state.Document, state.Expression,
+				allOccurrences: false, isConstant: state.IsConstant, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+			SyntaxNode destination = result.Item2;
+			int insertionIndex = result.Item3;
+
+			if (!destination.OverlapsHiddenPosition(cancellationToken))
+			{
+				return true;
+			}
+
+			if (destination is TTypeDeclarationSyntax)
+			{
+				var insertionIndices = this.GetInsertionIndices((TTypeDeclarationSyntax)destination, cancellationToken);
+				if (insertionIndices != null &&
+				    insertionIndices.Count > insertionIndex &&
+				    insertionIndices[insertionIndex])
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		private CodeAction CreateAction(State state, bool allOccurrences, bool isConstant, bool isLocal, bool isQueryLocal)
+		{
+			if (allOccurrences)
+			{
+				return new IntroduceVariableAllOccurrenceCodeAction((TService)this, state.Document, state.Expression, allOccurrences, isConstant, isLocal, isQueryLocal);
+			}
+
+			return new IntroduceVariableCodeAction((TService)this, state.Document, state.Expression, allOccurrences, isConstant, isLocal, isQueryLocal);
+		}
+
+		protected static SyntaxToken GenerateUniqueFieldName(
+			SemanticDocument document,
+			TExpressionSyntax expression,
+			bool isConstant,
+			CancellationToken cancellationToken)
+		{
+			var semanticModel = document.SemanticModel;
+			var baseName = semanticModel.GenerateNameForExpression(expression, isConstant);
+
+			// A field can't conflict with any existing member names.
+			var declaringType = semanticModel.GetEnclosingNamedType(expression.SpanStart, cancellationToken);
+			var reservedNames = declaringType.GetMembers().Select(m => m.Name);
+
+			return NameGenerator.EnsureUniqueness(baseName, reservedNames, true).ToIdentifierToken();
+		}
+
+		protected static SyntaxToken GenerateUniqueLocalName(
+			SemanticDocument document,
+			TExpressionSyntax expression,
+			bool isConstant,
+			CancellationToken cancellationToken)
+		{
+
+			var semanticModel = document.SemanticModel;
+			var baseName = semanticModel.GenerateNameForExpression(expression, capitalize: isConstant);
+			var reservedNames = semanticModel.LookupSymbols(expression.SpanStart).Select(s => s.Name);
+
+			return NameGenerator.EnsureUniqueness(baseName, reservedNames, true).ToIdentifierToken();
+		}
+
+		protected ISet<TExpressionSyntax> FindMatches(
+			SemanticDocument originalDocument,
+			TExpressionSyntax expressionInOriginal,
+			SemanticDocument currentDocument,
+			SyntaxNode withinNodeInCurrent,
+			bool allOccurrences,
+			CancellationToken cancellationToken)
+		{
+			var originalSemanticModel = originalDocument.SemanticModel;
+			var currentSemanticModel = currentDocument.SemanticModel;
+
+			var matches = from nodeInCurrent in withinNodeInCurrent.DescendantNodesAndSelf().OfType<TExpressionSyntax>()
+				                                                       where NodeMatchesExpression(originalSemanticModel, currentSemanticModel, expressionInOriginal, nodeInCurrent, allOccurrences, cancellationToken)
+			                                                       select nodeInCurrent;
+			return new HashSet<TExpressionSyntax>(matches.OfType<TExpressionSyntax>());
+		}
+
+		private bool NodeMatchesExpression(
+			SemanticModel originalSemanticModel,
+			SemanticModel currentSemanticModel,
+			TExpressionSyntax expressionInOriginal,
+			TExpressionSyntax nodeInCurrent,
+			bool allOccurrences,
+			CancellationToken cancellationToken)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+			if (nodeInCurrent == expressionInOriginal)
+			{
+				return true;
+			}
+			else
+			{
+				if (allOccurrences &&
+				    this.CanReplace(nodeInCurrent))
+				{
+					return SemanticEquivalence.AreSemanticallyEquivalent(
+						originalSemanticModel, currentSemanticModel, expressionInOriginal, nodeInCurrent);
+				}
+			}
+
+			return false;
+		}
+
+		protected TNode Rewrite<TNode>(
+			SemanticDocument originalDocument,
+			TExpressionSyntax expressionInOriginal,
+			TExpressionSyntax variableName,
+			SemanticDocument currentDocument,
+			TNode withinNodeInCurrent,
+			bool allOccurrences,
+			CancellationToken cancellationToken)
+			where TNode : SyntaxNode
+		{
+			var matches = FindMatches(originalDocument, expressionInOriginal, currentDocument, withinNodeInCurrent, allOccurrences, cancellationToken);
+
+			// Parenthesize the variable, and go and replace anything we find with it.
+			// NOTE: we do not want elastic trivia as we want to just replace the existing code 
+			// as is, while preserving the trivia there.  We do not want to update it.
+			var replacement = variableName.Parenthesize(includeElasticTrivia: false)
+			                             .WithAdditionalAnnotations(Formatter.Annotation);
+
+			return RewriteCore(withinNodeInCurrent, replacement, matches);
+		}
+
+		protected abstract TNode RewriteCore<TNode>(
+			TNode node,
+			SyntaxNode replacementNode,
+			ISet<TExpressionSyntax> matches)
+			where TNode : SyntaxNode;
+
+		protected static ITypeSymbol GetTypeSymbol(
+			SemanticDocument document,
+			TExpressionSyntax expression,
+			CancellationToken cancellationToken,
+			bool objectAsDefault = true)
+		{
+			var semanticModel = document.SemanticModel;
+			var typeInfo = semanticModel.GetTypeInfo(expression, cancellationToken);
+
+			if (typeInfo.Type != null)
+			{
+				return typeInfo.Type;
+			}
+
+			if (typeInfo.ConvertedType != null)
+			{
+				return typeInfo.ConvertedType;
+			}
+
+			if (objectAsDefault)
+			{
+				return semanticModel.Compilation.GetSpecialType(SpecialType.System_Object);
+			}
+
+			return null;
+		}
+
+		protected static IEnumerable<IParameterSymbol> GetAnonymousMethodParameters(
+			SemanticDocument document, TExpressionSyntax expression, CancellationToken cancellationToken)
+		{
+			var semanticModel = document.SemanticModel;
+			var semanticMap = semanticModel.GetSemanticMap(expression, cancellationToken);
+
+			var anonymousMethodParameters = semanticMap.AllReferencedSymbols
+			                                           .OfType<IParameterSymbol>()
+			                                           .Where(p => p.ContainingSymbol.IsAnonymousFunction());
+			return anonymousMethodParameters;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService.Rewriter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService.Rewriter.cs
new file mode 100644
index 0000000000..f72aaf5a12
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService.Rewriter.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class CSharpIntroduceVariableService
+	{
+		private class Rewriter : CSharpSyntaxRewriter
+		{
+			private readonly SyntaxAnnotation _replacementAnnotation = new SyntaxAnnotation ();
+			private readonly SyntaxNode _replacementNode;
+			private readonly ISet<ExpressionSyntax> _matches;
+
+			private Rewriter (SyntaxNode replacementNode, ISet<ExpressionSyntax> matches)
+			{
+				_replacementNode = replacementNode;
+				_matches = matches;
+			}
+
+			public override SyntaxNode Visit (SyntaxNode node)
+			{
+				var expression = node as ExpressionSyntax;
+				if (expression != null &&
+					_matches.Contains (expression)) {
+					return _replacementNode
+						.WithLeadingTrivia (expression.GetLeadingTrivia ())
+						.WithTrailingTrivia (expression.GetTrailingTrivia ())
+						.WithAdditionalAnnotations (_replacementAnnotation);
+				}
+
+				return base.Visit (node);
+			}
+
+			public override SyntaxNode VisitParenthesizedExpression (ParenthesizedExpressionSyntax node)
+			{
+				var newNode = base.VisitParenthesizedExpression (node);
+				if (node != newNode &&
+					newNode.IsKind (SyntaxKind.ParenthesizedExpression)) {
+					var parenthesizedExpression = (ParenthesizedExpressionSyntax)newNode;
+					var innerExpression = parenthesizedExpression.OpenParenToken.GetNextToken ().Parent;
+					if (innerExpression.HasAnnotation (_replacementAnnotation)) {
+						return newNode.WithAdditionalAnnotations (Simplifier.Annotation);
+					}
+				}
+
+				return newNode;
+			}
+
+			public static SyntaxNode Visit (SyntaxNode node, SyntaxNode replacementNode, ISet<ExpressionSyntax> matches)
+			{
+				return new Rewriter (replacementNode, matches).Visit ((SyntaxNode)node);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService.cs
new file mode 100644
index 0000000000..f049393d89
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+                     {
+	partial class CSharpIntroduceVariableService :
+	AbstractIntroduceVariableService<CSharpIntroduceVariableService, ExpressionSyntax, TypeSyntax, TypeDeclarationSyntax, QueryExpressionSyntax>
+	{
+		protected override bool IsInNonFirstQueryClause(ExpressionSyntax expression)
+		{
+			var query = expression.GetAncestor<QueryExpressionSyntax>();
+			if (query != null)
+			{
+				// Can't introduce for the first clause in a query.
+				var fromClause = expression.GetAncestor<FromClauseSyntax>();
+				if (fromClause == null || query.FromClause != fromClause)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		protected override bool IsInFieldInitializer(ExpressionSyntax expression)
+		{
+			return expression.GetAncestorOrThis<VariableDeclaratorSyntax>()
+				             .GetAncestorOrThis<FieldDeclarationSyntax>() != null;
+		}
+
+		protected override bool IsInParameterInitializer(ExpressionSyntax expression)
+		{
+			return expression.GetAncestorOrThis<EqualsValueClauseSyntax>().IsParentKind(SyntaxKind.Parameter);
+		}
+
+		protected override bool IsInConstructorInitializer(ExpressionSyntax expression)
+		{
+			return expression.GetAncestorOrThis<ConstructorInitializerSyntax>() != null;
+		}
+
+		protected override bool IsInExpressionBodiedMember(ExpressionSyntax expression)
+		{
+			// walk up until we find a nearest enclosing block or arrow expression.
+			for (SyntaxNode node = expression; node != null; node = node.GetParent())
+			{
+				// If we are in an expression bodied member and if the expression has a block body, then,
+				// act as if we're in a block context and not in an expression body context at all.
+				if (node.IsKind(SyntaxKind.Block))
+				{
+					return false;
+				}
+				else if (node.IsKind(SyntaxKind.ArrowExpressionClause))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		protected override bool IsInAttributeArgumentInitializer(ExpressionSyntax expression)
+		{
+			// Don't call the base here.  We want to let the user extract a constant if they've
+			// said "Foo(a = 10)"
+			var attributeArgument = expression.GetAncestorOrThis<AttributeArgumentSyntax>();
+			if (attributeArgument != null)
+			{
+				// Can't extract an attribute initializer if it contains an array initializer of any
+				// sort.  Also, we can't extract if there's any typeof expression within it.
+				if (!expression.DepthFirstTraversal().Any(n => n.RawKind == (int)SyntaxKind.ArrayCreationExpression) &&
+				    !expression.DepthFirstTraversal().Any(n => n.RawKind == (int)SyntaxKind.TypeOfExpression))
+				{
+					var attributeDecl = attributeArgument.GetAncestorOrThis<AttributeListSyntax>();
+
+					// Also can't extract an attribute initializer if the attribute is a global one.
+					if (!attributeDecl.IsParentKind(SyntaxKind.CompilationUnit))
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		protected override bool CanIntroduceVariableFor(ExpressionSyntax expression)
+		{
+			if (expression.WalkUpParentheses().IsParentKind(SyntaxKind.ExpressionStatement))
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		protected override IEnumerable<SyntaxNode> GetContainingExecutableBlocks(ExpressionSyntax expression)
+		{
+			return expression.GetAncestorsOrThis<BlockSyntax>();
+		}
+
+		protected override IList<bool> GetInsertionIndices(TypeDeclarationSyntax destination, CancellationToken cancellationToken)
+		{
+			return destination.GetInsertionIndices(cancellationToken);
+		}
+
+		protected override bool CanReplace(ExpressionSyntax expression)
+		{
+			return true;
+		}
+
+		protected override TNode RewriteCore<TNode>(
+			TNode node,
+			SyntaxNode replacementNode,
+			ISet<ExpressionSyntax> matches)
+		{
+			return (TNode)Rewriter.Visit(node, replacementNode, matches);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService_IntroduceField.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService_IntroduceField.cs
new file mode 100644
index 0000000000..6e4c8a22a5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService_IntroduceField.cs
@@ -0,0 +1,199 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class CSharpIntroduceVariableService
+	{
+		protected override Task<Tuple<Document, SyntaxNode, int>> IntroduceFieldAsync(
+			SemanticDocument document,
+			ExpressionSyntax expression,
+			bool allOccurrences,
+			bool isConstant,
+			CancellationToken cancellationToken)
+		{
+			var oldTypeDeclaration = expression.GetAncestorOrThis<TypeDeclarationSyntax>();
+
+			var oldType = oldTypeDeclaration != null
+				? document.SemanticModel.GetDeclaredSymbol(oldTypeDeclaration, cancellationToken) as INamedTypeSymbol
+				: document.SemanticModel.Compilation.ScriptClass;
+			var newNameToken = (SyntaxToken)GenerateUniqueFieldName(document, expression, isConstant, cancellationToken);
+
+			var newQualifiedName = oldTypeDeclaration != null
+				? SyntaxFactory.MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, SyntaxFactory.ParseName(oldType.ToDisplayString (Ambience.NameFormat)), SyntaxFactory.IdentifierName(newNameToken))
+				: (ExpressionSyntax)SyntaxFactory.IdentifierName(newNameToken);
+
+			newQualifiedName = newQualifiedName.WithAdditionalAnnotations(Simplifier.Annotation);
+
+			var newFieldDeclaration = SyntaxFactory.FieldDeclaration(
+				default(SyntaxList<AttributeListSyntax>),
+				MakeFieldModifiers(isConstant, inScript: oldType.IsScriptClass),
+				SyntaxFactory.VariableDeclaration(
+					GetTypeSymbol(document, expression, cancellationToken).GenerateTypeSyntax(),
+					SyntaxFactory.SingletonSeparatedList(
+						SyntaxFactory.VariableDeclarator(
+							newNameToken.WithAdditionalAnnotations(RenameAnnotation.Create()),
+							null,
+							SyntaxFactory.EqualsValueClause(expression))))).WithAdditionalAnnotations(Formatter.Annotation);
+
+			if (oldTypeDeclaration != null)
+			{
+				var newTypeDeclaration = Rewrite(
+					document, expression, newQualifiedName, document, oldTypeDeclaration, allOccurrences, cancellationToken);
+
+				var insertionIndex = isConstant ?
+					DetermineConstantInsertPosition(oldTypeDeclaration.Members, newTypeDeclaration.Members) :
+					DetermineFieldInsertPosition(oldTypeDeclaration.Members, newTypeDeclaration.Members);
+
+				var finalTypeDeclaration = InsertMember(newTypeDeclaration, newFieldDeclaration, insertionIndex);
+
+				SyntaxNode destination = oldTypeDeclaration;
+				var newRoot = document.Root.ReplaceNode(oldTypeDeclaration, finalTypeDeclaration);
+				return Task.FromResult(Tuple.Create(document.Document.WithSyntaxRoot(newRoot), destination, insertionIndex));
+			}
+			else
+			{
+				var oldCompilationUnit = (CompilationUnitSyntax)document.Root;
+				var newCompilationUnit = Rewrite(
+					document, expression, newQualifiedName, document, oldCompilationUnit, allOccurrences, cancellationToken);
+
+				var insertionIndex = isConstant ?
+					DetermineConstantInsertPosition(oldCompilationUnit.Members, newCompilationUnit.Members) :
+					DetermineFieldInsertPosition(oldCompilationUnit.Members, newCompilationUnit.Members);
+
+				SyntaxNode destination = oldCompilationUnit;
+				var newRoot = newCompilationUnit.WithMembers(newCompilationUnit.Members.Insert(insertionIndex, newFieldDeclaration));
+				return Task.FromResult(Tuple.Create(document.Document.WithSyntaxRoot(newRoot), destination, insertionIndex));
+			}
+		}
+
+		protected static int DetermineConstantInsertPosition(
+			SyntaxList<MemberDeclarationSyntax> oldMembers,
+			SyntaxList<MemberDeclarationSyntax> newMembers)
+		{
+			// 1) Place the constant after the last constant.
+			//
+			// 2) If there is no constant, place it before the first field
+			//
+			// 3) If the first change is before either of those, then place before the first
+			// change
+			//
+			// 4) Otherwise, place it at the start.
+			var index = 0;
+			var lastConstantIndex = oldMembers.LastIndexOf(IsConstantField);
+
+			if (lastConstantIndex >= 0)
+			{
+				index = lastConstantIndex + 1;
+			}
+			else
+			{
+				var firstFieldIndex = oldMembers.IndexOf(member => member is FieldDeclarationSyntax);
+				if (firstFieldIndex >= 0)
+				{
+					index = firstFieldIndex;
+				}
+			}
+
+			var firstChangeIndex = DetermineFirstChange(oldMembers, newMembers);
+			if (firstChangeIndex >= 0)
+			{
+				index = Math.Min(index, firstChangeIndex);
+			}
+
+			return index;
+		}
+
+		protected static int DetermineFieldInsertPosition(
+			SyntaxList<MemberDeclarationSyntax> oldMembers,
+			SyntaxList<MemberDeclarationSyntax> newMembers)
+		{
+			// 1) Place the constant after the last field.
+			//
+			// 2) If there is no field, place it after the last constant
+			//
+			// 3) If the first change is before either of those, then place before the first
+			// change
+			//
+			// 4) Otherwise, place it at the start.
+			var index = 0;
+			var lastFieldIndex = oldMembers.LastIndexOf(member => member is FieldDeclarationSyntax);
+			if (lastFieldIndex >= 0)
+			{
+				index = lastFieldIndex + 1;
+			}
+			else
+			{
+				var lastConstantIndex = oldMembers.LastIndexOf(IsConstantField);
+				if (lastConstantIndex >= 0)
+				{
+					index = lastConstantIndex + 1;
+				}
+			}
+
+			var firstChangeIndex = DetermineFirstChange(oldMembers, newMembers);
+			if (firstChangeIndex >= 0)
+			{
+				index = Math.Min(index, firstChangeIndex);
+			}
+
+			return index;
+		}
+
+		private static bool IsConstantField(MemberDeclarationSyntax member)
+		{
+			var field = member as FieldDeclarationSyntax;
+			return field != null && field.Modifiers.Any(SyntaxKind.ConstKeyword);
+		}
+
+		protected static int DetermineFirstChange(SyntaxList<MemberDeclarationSyntax> oldMembers, SyntaxList<MemberDeclarationSyntax> newMembers)
+		{
+			for (int i = 0; i < oldMembers.Count; i++)
+			{
+				if (!SyntaxFactory.AreEquivalent(oldMembers[i], newMembers[i], topLevel: false))
+				{
+					return i;
+				}
+			}
+
+			return -1;
+		}
+
+		protected static TypeDeclarationSyntax InsertMember(
+			TypeDeclarationSyntax typeDeclaration,
+			MemberDeclarationSyntax memberDeclaration,
+			int index)
+		{
+			return typeDeclaration.WithMembers(
+				typeDeclaration.Members.Insert(index, memberDeclaration));
+		}
+
+		private SyntaxTokenList MakeFieldModifiers(bool isConstant, bool inScript)
+		{
+			if (isConstant)
+			{
+				return SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.PrivateKeyword), SyntaxFactory.Token(SyntaxKind.ConstKeyword));
+			}
+			else if (inScript)
+			{
+				return SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.PrivateKeyword), SyntaxFactory.Token(SyntaxKind.ReadOnlyKeyword));
+			}
+			else
+			{
+				return SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.PrivateKeyword), SyntaxFactory.Token(SyntaxKind.StaticKeyword), SyntaxFactory.Token(SyntaxKind.ReadOnlyKeyword));
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService_IntroduceLocal.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService_IntroduceLocal.cs
new file mode 100644
index 0000000000..5bcb949f9e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService_IntroduceLocal.cs
@@ -0,0 +1,378 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Simplification;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class CSharpIntroduceVariableService
+	{
+		protected override Task<Document> IntroduceLocalAsync(
+			SemanticDocument document,
+			ExpressionSyntax expression,
+			bool allOccurrences,
+			bool isConstant,
+			CancellationToken cancellationToken)
+		{
+			var options = document.Project.Solution.Workspace.Options;
+
+			var newLocalNameToken = (SyntaxToken)GenerateUniqueLocalName(document, expression, isConstant, cancellationToken);
+			var newLocalName = SyntaxFactory.IdentifierName(newLocalNameToken);
+
+			var modifiers = isConstant
+				? SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.ConstKeyword))
+			                   : default(SyntaxTokenList);
+
+			var declarationStatement = SyntaxFactory.LocalDeclarationStatement(
+				modifiers,
+				SyntaxFactory.VariableDeclaration(
+					this.GetTypeSyntax(document, expression, isConstant, options, cancellationToken),
+					SyntaxFactory.SingletonSeparatedList(SyntaxFactory.VariableDeclarator(
+						newLocalNameToken.WithAdditionalAnnotations(RenameAnnotation.Create()),
+						null,
+						SyntaxFactory.EqualsValueClause(expression.WithoutTrailingTrivia().WithoutLeadingTrivia())))));
+
+			var anonymousMethodParameters = GetAnonymousMethodParameters(document, expression, cancellationToken);
+			var lambdas = anonymousMethodParameters.SelectMany(p => p.ContainingSymbol.DeclaringSyntaxReferences.Select(r => r.GetSyntax(cancellationToken)).AsEnumerable())
+			                                       .Where(n => n is ParenthesizedLambdaExpressionSyntax || n is SimpleLambdaExpressionSyntax)
+			                                       .ToSet();
+
+			var parentLambda = GetParentLambda(expression, lambdas);
+
+			if (parentLambda != null)
+			{
+				return Task.FromResult(IntroduceLocalDeclarationIntoLambda(
+					document, expression, newLocalName, declarationStatement, parentLambda, allOccurrences, cancellationToken));
+			}
+			else if (IsInExpressionBodiedMember(expression))
+			{
+				return Task.FromResult(RewriteExpressionBodiedMemberAndIntroduceLocalDeclaration(
+					document, expression, newLocalName, declarationStatement, allOccurrences, cancellationToken));
+			}
+			else
+			{
+				return IntroduceLocalDeclarationIntoBlockAsync(
+					document, expression, newLocalName, declarationStatement, allOccurrences, cancellationToken);
+			}
+		}
+
+		private Document IntroduceLocalDeclarationIntoLambda(
+			SemanticDocument document,
+			ExpressionSyntax expression,
+			IdentifierNameSyntax newLocalName,
+			LocalDeclarationStatementSyntax declarationStatement,
+			SyntaxNode oldLambda,
+			bool allOccurrences,
+			CancellationToken cancellationToken)
+		{
+			var oldBody = oldLambda is ParenthesizedLambdaExpressionSyntax
+				? (ExpressionSyntax)((ParenthesizedLambdaExpressionSyntax)oldLambda).Body
+			                                                                        : (ExpressionSyntax)((SimpleLambdaExpressionSyntax)oldLambda).Body;
+
+			var rewrittenBody = Rewrite(
+				document, expression, newLocalName, document, oldBody, allOccurrences, cancellationToken);
+
+			var delegateType = document.SemanticModel.GetTypeInfo(oldLambda, cancellationToken).ConvertedType as INamedTypeSymbol;
+
+			var newBody = delegateType != null && delegateType.DelegateInvokeMethod != null && delegateType.DelegateInvokeMethod.ReturnsVoid
+			                                                  ? SyntaxFactory.Block(declarationStatement)
+			                                                  : SyntaxFactory.Block(declarationStatement, SyntaxFactory.ReturnStatement(rewrittenBody));
+
+			newBody = newBody.WithAdditionalAnnotations(Formatter.Annotation);
+
+			var newLambda = oldLambda is ParenthesizedLambdaExpressionSyntax
+				? ((ParenthesizedLambdaExpressionSyntax)oldLambda).WithBody(newBody)
+			                                                      : (SyntaxNode)((SimpleLambdaExpressionSyntax)oldLambda).WithBody(newBody);
+
+			var newRoot = document.Root.ReplaceNode(oldLambda, newLambda);
+			return document.Document.WithSyntaxRoot(newRoot);
+		}
+
+		private SyntaxNode GetParentLambda(ExpressionSyntax expression, ISet<SyntaxNode> lambdas)
+		{
+			var current = expression;
+			while (current != null)
+			{
+				if (lambdas.Contains(current.Parent))
+				{
+					return current.Parent;
+				}
+
+				current = current.Parent as ExpressionSyntax;
+			}
+
+			return null;
+		}
+
+		private TypeSyntax GetTypeSyntax(SemanticDocument document, ExpressionSyntax expression, bool isConstant, OptionSet options, CancellationToken cancellationToken)
+		{
+			var typeSymbol = GetTypeSymbol(document, expression, cancellationToken);
+			if (typeSymbol.ContainsAnonymousType())
+			{
+				return SyntaxFactory.IdentifierName("var");
+			}
+
+			if (!isConstant && true /*options.GetOption(CSharpCodeStyleOptions.UseVarWhenDeclaringLocals) */&& CanUseVar(typeSymbol))
+			{
+				return SyntaxFactory.IdentifierName("var");
+			}
+
+			return typeSymbol.GenerateTypeSyntax();
+		}
+
+		private bool CanUseVar(ITypeSymbol typeSymbol)
+		{
+			return typeSymbol.TypeKind != TypeKind.Delegate && !typeSymbol.IsErrorType();
+		}
+
+		private static async Task<Tuple<SemanticDocument, ISet<ExpressionSyntax>>> ComplexifyParentingStatements(
+			SemanticDocument semanticDocument,
+			ISet<ExpressionSyntax> matches,
+			CancellationToken cancellationToken)
+		{
+			// First, track the matches so that we can get back to them later.
+			var newRoot = semanticDocument.Root.TrackNodes(matches);
+			var newDocument = semanticDocument.Document.WithSyntaxRoot(newRoot);
+			var newSemanticDocument = await SemanticDocument.CreateAsync(newDocument, cancellationToken).ConfigureAwait(false);
+			var newMatches = newSemanticDocument.Root.GetCurrentNodes(matches.AsEnumerable()).ToSet();
+
+			// Next, expand the topmost parenting expression of each match, being careful
+			// not to expand the matches themselves.
+			var topMostExpressions = newMatches
+				.Select(m => m.AncestorsAndSelf().OfType<ExpressionSyntax>().Last())
+				.Distinct();
+
+			newRoot = await newSemanticDocument.Root
+			                                   .ReplaceNodesAsync(
+				                                   topMostExpressions,
+				                                   computeReplacementAsync: async (oldNode, newNode, ct) =>
+				{
+					return await Simplifier
+						.ExpandAsync(
+							oldNode,
+							newSemanticDocument.Document,
+							expandInsideNode: node =>
+							{
+								var expression = node as ExpressionSyntax;
+								return expression == null
+									|| !newMatches.Contains(expression);
+							},
+							cancellationToken: ct)
+						.ConfigureAwait(false);
+				},
+				                                   cancellationToken: cancellationToken)
+			                                   .ConfigureAwait(false);
+
+			newDocument = newSemanticDocument.Document.WithSyntaxRoot(newRoot);
+			newSemanticDocument = await SemanticDocument.CreateAsync(newDocument, cancellationToken).ConfigureAwait(false);
+			newMatches = newSemanticDocument.Root.GetCurrentNodes(matches.AsEnumerable()).ToSet();
+
+			return Tuple.Create(newSemanticDocument, newMatches);
+		}
+
+		private Document RewriteExpressionBodiedMemberAndIntroduceLocalDeclaration(
+			SemanticDocument document,
+			ExpressionSyntax expression,
+			NameSyntax newLocalName,
+			LocalDeclarationStatementSyntax declarationStatement,
+			bool allOccurrences,
+			CancellationToken cancellationToken)
+		{
+			var oldBody = expression.GetAncestorOrThis<ArrowExpressionClauseSyntax>();
+			var oldParentingNode = oldBody.Parent;
+			var leadingTrivia = oldBody.GetLeadingTrivia()
+			                           .AddRange(oldBody.ArrowToken.TrailingTrivia);
+
+			var newStatement = Rewrite(document, expression, newLocalName, document, oldBody.Expression, allOccurrences, cancellationToken);
+			var newBody = SyntaxFactory.Block(declarationStatement, SyntaxFactory.ReturnStatement(newStatement))
+			                           .WithLeadingTrivia(leadingTrivia)
+			                           .WithTrailingTrivia(oldBody.GetTrailingTrivia())
+			                           .WithAdditionalAnnotations(Formatter.Annotation);
+
+			SyntaxNode newParentingNode = null;
+			if (oldParentingNode is BasePropertyDeclarationSyntax)
+			{
+				var getAccessor = SyntaxFactory.AccessorDeclaration(SyntaxKind.GetAccessorDeclaration, newBody);
+				var accessorList = SyntaxFactory.AccessorList(SyntaxFactory.List(new[] { getAccessor }));
+
+				newParentingNode = ((BasePropertyDeclarationSyntax)oldParentingNode).RemoveNode(oldBody, SyntaxRemoveOptions.KeepNoTrivia);
+
+				if (newParentingNode.IsKind(SyntaxKind.PropertyDeclaration))
+				{
+					var propertyDeclaration = ((PropertyDeclarationSyntax)newParentingNode);
+					newParentingNode = propertyDeclaration
+						.WithAccessorList(accessorList)
+						.WithSemicolonToken(SyntaxFactory.Token(SyntaxKind.None))
+						.WithTrailingTrivia(propertyDeclaration.SemicolonToken.TrailingTrivia);
+				}
+				else if (newParentingNode.IsKind(SyntaxKind.IndexerDeclaration))
+				{
+					var indexerDeclaration = ((IndexerDeclarationSyntax)newParentingNode);
+					newParentingNode = indexerDeclaration
+						.WithAccessorList(accessorList)
+						.WithSemicolonToken(SyntaxFactory.Token(SyntaxKind.None))
+						.WithTrailingTrivia(indexerDeclaration.SemicolonToken.TrailingTrivia);
+				}
+			}
+			else if (oldParentingNode is BaseMethodDeclarationSyntax)
+			{
+				newParentingNode = ((BaseMethodDeclarationSyntax)oldParentingNode)
+					.RemoveNode(oldBody, SyntaxRemoveOptions.KeepNoTrivia)
+					.WithBody(newBody);
+
+				if (newParentingNode.IsKind(SyntaxKind.MethodDeclaration))
+				{
+					var methodDeclaration = ((MethodDeclarationSyntax)newParentingNode);
+					newParentingNode = methodDeclaration
+						.WithSemicolonToken(SyntaxFactory.Token(SyntaxKind.None))
+						.WithTrailingTrivia(methodDeclaration.SemicolonToken.TrailingTrivia);
+				}
+				else if (newParentingNode.IsKind(SyntaxKind.OperatorDeclaration))
+				{
+					var operatorDeclaration = ((OperatorDeclarationSyntax)newParentingNode);
+					newParentingNode = operatorDeclaration
+						.WithSemicolonToken(SyntaxFactory.Token(SyntaxKind.None))
+						.WithTrailingTrivia(operatorDeclaration.SemicolonToken.TrailingTrivia);
+				}
+				else if (newParentingNode.IsKind(SyntaxKind.ConversionOperatorDeclaration))
+				{
+					var conversionOperatorDeclaration = ((ConversionOperatorDeclarationSyntax)newParentingNode);
+					newParentingNode = conversionOperatorDeclaration
+						.WithSemicolonToken(SyntaxFactory.Token(SyntaxKind.None))
+						.WithTrailingTrivia(conversionOperatorDeclaration.SemicolonToken.TrailingTrivia);
+				}
+			}
+
+			var newRoot = document.Root.ReplaceNode(oldParentingNode, newParentingNode);
+			return document.Document.WithSyntaxRoot(newRoot);
+		}
+
+		private async Task<Document> IntroduceLocalDeclarationIntoBlockAsync(
+			SemanticDocument document,
+			ExpressionSyntax expression,
+			NameSyntax newLocalName,
+			LocalDeclarationStatementSyntax declarationStatement,
+			bool allOccurrences,
+			CancellationToken cancellationToken)
+		{
+			declarationStatement = declarationStatement.WithAdditionalAnnotations(Formatter.Annotation);
+
+			var oldOutermostBlock = expression.GetAncestorsOrThis<BlockSyntax>().LastOrDefault();
+			var matches = FindMatches(document, expression, document, oldOutermostBlock, allOccurrences, cancellationToken);
+			Debug.Assert(matches.Contains(expression));
+
+			var complexified = await ComplexifyParentingStatements(document, matches, cancellationToken).ConfigureAwait(false);
+			document = complexified.Item1;
+			matches = complexified.Item2;
+
+			// Our original expression should have been one of the matches, which were tracked as part
+			// of complexification, so we can retrieve the latest version of the expression here.
+			expression = document.Root.GetCurrentNodes(expression).First();
+
+			var innermostStatements = new HashSet<StatementSyntax>(
+				matches.Select(expr => expr.GetAncestorOrThis<StatementSyntax>()));
+
+			if (innermostStatements.Count == 1)
+			{
+				// If there was only one match, or all the matches came from the same
+				// statement, then we want to place the declaration right above that
+				// statement. Note: we special case this because the statement we are going
+				// to go above might not be in a block and we may have to generate it
+				return IntroduceLocalForSingleOccurrenceIntoBlock(
+					document, expression, newLocalName, declarationStatement, allOccurrences, cancellationToken);
+			}
+
+			var oldInnerMostCommonBlock = matches.FindInnermostCommonBlock();
+			var allAffectedStatements = new HashSet<StatementSyntax>(matches.SelectMany(expr => expr.GetAncestorsOrThis<StatementSyntax>()));
+			var firstStatementAffectedInBlock = oldInnerMostCommonBlock.Statements.First(allAffectedStatements.Contains);
+
+			var firstStatementAffectedIndex = oldInnerMostCommonBlock.Statements.IndexOf(firstStatementAffectedInBlock);
+
+			var newInnerMostBlock = Rewrite(
+				document, expression, newLocalName, document, oldInnerMostCommonBlock, allOccurrences, cancellationToken);
+
+			var statements = new List<StatementSyntax>();
+			statements.AddRange(newInnerMostBlock.Statements.Take(firstStatementAffectedIndex));
+			statements.Add(declarationStatement);
+			statements.AddRange(newInnerMostBlock.Statements.Skip(firstStatementAffectedIndex));
+
+			var finalInnerMostBlock = newInnerMostBlock.WithStatements(
+				SyntaxFactory.List<StatementSyntax>(statements));
+
+			var newRoot = document.Root.ReplaceNode(oldInnerMostCommonBlock, finalInnerMostBlock);
+			return document.Document.WithSyntaxRoot(newRoot);
+		}
+
+		private Document IntroduceLocalForSingleOccurrenceIntoBlock(
+			SemanticDocument document,
+			ExpressionSyntax expression,
+			NameSyntax localName,
+			LocalDeclarationStatementSyntax localDeclaration,
+			bool allOccurrences,
+			CancellationToken cancellationToken)
+		{
+			var oldStatement = expression.GetAncestorOrThis<StatementSyntax>();
+			var newStatement = Rewrite(
+				document, expression, localName, document, oldStatement, allOccurrences, cancellationToken);
+
+			if (oldStatement.IsParentKind(SyntaxKind.Block))
+			{
+				var oldBlock = oldStatement.Parent as BlockSyntax;
+				var statementIndex = oldBlock.Statements.IndexOf(oldStatement);
+
+				var newBlock = oldBlock.WithStatements(CreateNewStatementList(
+					oldBlock.Statements, localDeclaration, newStatement, statementIndex));
+
+				var newRoot = document.Root.ReplaceNode(oldBlock, newBlock);
+				return document.Document.WithSyntaxRoot(newRoot);
+			}
+			else if (oldStatement.IsParentKind(SyntaxKind.SwitchSection))
+			{
+				var oldSwitchSection = oldStatement.Parent as SwitchSectionSyntax;
+				var statementIndex = oldSwitchSection.Statements.IndexOf(oldStatement);
+
+				var newSwitchSection = oldSwitchSection.WithStatements(CreateNewStatementList(
+					oldSwitchSection.Statements, localDeclaration, newStatement, statementIndex));
+
+				var newRoot = document.Root.ReplaceNode(oldSwitchSection, newSwitchSection);
+				return document.Document.WithSyntaxRoot(newRoot);
+			}
+			else
+			{
+				// we need to introduce a block to put the original statement, along with
+				// the statement we're generating
+				var newBlock = SyntaxFactory.Block(localDeclaration, newStatement).WithAdditionalAnnotations(Formatter.Annotation);
+
+				var newRoot = document.Root.ReplaceNode(oldStatement, newBlock);
+				return document.Document.WithSyntaxRoot(newRoot);
+			}
+		}
+
+		private static SyntaxList<StatementSyntax> CreateNewStatementList(
+			SyntaxList<StatementSyntax> oldStatements,
+			LocalDeclarationStatementSyntax localDeclaration,
+			StatementSyntax newStatement,
+			int statementIndex)
+		{
+			return oldStatements.Take(statementIndex)
+				                .Concat(localDeclaration.WithLeadingTrivia(oldStatements.Skip(statementIndex).First().GetLeadingTrivia()))
+				                .Concat(newStatement.WithoutLeadingTrivia())
+				                .Concat(oldStatements.Skip(statementIndex + 1))
+				                .ToSyntaxList();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService_IntroduceQueryLocal.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService_IntroduceQueryLocal.cs
new file mode 100644
index 0000000000..79ff57296e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/CSharpIntroduceVariableService_IntroduceQueryLocal.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	partial class CSharpIntroduceVariableService
+	{
+		private static bool IsAnyQueryClause(SyntaxNode node)
+		{
+			return node is QueryClauseSyntax || node is SelectOrGroupClauseSyntax;
+		}
+
+		protected override Task<Document> IntroduceQueryLocalAsync(
+			SemanticDocument document, ExpressionSyntax expression, bool allOccurrences, CancellationToken cancellationToken)
+		{
+			var newLocalNameToken = (SyntaxToken)GenerateUniqueLocalName(document, expression, isConstant: false, cancellationToken: cancellationToken);
+			var newLocalName = SyntaxFactory.IdentifierName(newLocalNameToken);
+
+			var letClause = SyntaxFactory.LetClause(
+				newLocalNameToken.WithAdditionalAnnotations(RenameAnnotation.Create()),
+				expression).WithAdditionalAnnotations(Formatter.Annotation);
+
+			var oldOutermostQuery = expression.GetAncestorsOrThis<QueryExpressionSyntax>().LastOrDefault();
+			var matches = FindMatches(document, expression, document, oldOutermostQuery, allOccurrences, cancellationToken);
+			var innermostClauses = new HashSet<SyntaxNode>(
+				matches.Select(expr => expr.GetAncestorsOrThis<SyntaxNode>().First(IsAnyQueryClause)));
+
+			if (innermostClauses.Count == 1)
+			{
+				// If there was only one match, or all the matches came from the same
+				// statement, hten we want to place the declaration right above that
+				// statement. Note: we special case this because the statement we are going
+				// to go above might not be in a block and we may have to generate it
+				return Task.FromResult(IntroduceQueryLocalForSingleOccurrence(
+					document, expression, newLocalName, letClause, allOccurrences, cancellationToken));
+			}
+
+			var oldInnerMostCommonQuery = matches.FindInnermostCommonNode<QueryExpressionSyntax>();
+			var newInnerMostQuery = Rewrite(
+				document, expression, newLocalName, document, oldInnerMostCommonQuery, allOccurrences, cancellationToken);
+
+			var allAffectedClauses = new HashSet<SyntaxNode>(matches.SelectMany(expr => expr.GetAncestorsOrThis<SyntaxNode>().Where(IsAnyQueryClause)));
+
+			var oldClauses = oldInnerMostCommonQuery.GetAllClauses();
+			var newClauses = newInnerMostQuery.GetAllClauses();
+
+			var firstClauseAffectedInQuery = oldClauses.First(allAffectedClauses.Contains);
+			var firstClauseAffectedIndex = oldClauses.IndexOf(firstClauseAffectedInQuery);
+
+			var finalClauses = newClauses.Take(firstClauseAffectedIndex)
+			                             .Concat(letClause)
+			                             .Concat(newClauses.Skip(firstClauseAffectedIndex)).ToList();
+
+			var finalQuery = newInnerMostQuery.WithAllClauses(finalClauses);
+			var newRoot = document.Root.ReplaceNode(oldInnerMostCommonQuery, finalQuery);
+
+			return Task.FromResult(document.Document.WithSyntaxRoot(newRoot));
+		}
+
+		private Document IntroduceQueryLocalForSingleOccurrence(
+			SemanticDocument document,
+			ExpressionSyntax expression,
+			NameSyntax newLocalName,
+			LetClauseSyntax letClause,
+			bool allOccurrences,
+			CancellationToken cancellationToken)
+		{
+			var oldClause = expression.GetAncestors<SyntaxNode>().First(IsAnyQueryClause);
+			var newClause = Rewrite(
+				document, expression, newLocalName, document, oldClause, allOccurrences, cancellationToken);
+
+			var oldQuery = (QueryBodySyntax)oldClause.Parent;
+			var newQuery = GetNewQuery(oldQuery, oldClause, newClause, letClause);
+
+			var newRoot = document.Root.ReplaceNode(oldQuery, newQuery);
+			return document.Document.WithSyntaxRoot(newRoot);
+		}
+
+		private static QueryBodySyntax GetNewQuery(
+			QueryBodySyntax oldQuery,
+			SyntaxNode oldClause,
+			SyntaxNode newClause,
+			LetClauseSyntax letClause)
+		{
+			var oldClauses = oldQuery.GetAllClauses();
+			var oldClauseIndex = oldClauses.IndexOf(oldClause);
+
+			var newClauses = oldClauses.Take(oldClauseIndex)
+			                           .Concat(letClause)
+			                           .Concat(newClause)
+			                           .Concat(oldClauses.Skip(oldClauseIndex + 1)).ToList();
+			return oldQuery.WithAllClauses(newClauses);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/IntroduceVariableResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/IntroduceVariableResult.cs
new file mode 100644
index 0000000000..3277daf9fe
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/IntroduceVariable/IntroduceVariableResult.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using RefactoringEssentials;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.IntroduceVariable
+{
+	class IntroduceVariableResult
+	{
+		public static readonly IntroduceVariableResult Failure = new IntroduceVariableResult(null);
+
+		private readonly CodeRefactoring _codeRefactoring;
+
+		public IntroduceVariableResult(CodeRefactoring codeRefactoring)
+		{
+			_codeRefactoring = codeRefactoring;
+		}
+
+		public bool ContainsChanges
+		{
+			get
+			{
+				return _codeRefactoring != null;
+			}
+		}
+
+		public CodeRefactoring GetCodeRefactoring(CancellationToken cancellationToken)
+		{
+			return _codeRefactoring;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/OrganizeImports/CSharpOrganizeImportsService.Rewriter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/OrganizeImports/CSharpOrganizeImportsService.Rewriter.cs
new file mode 100644
index 0000000000..003760e4bb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/OrganizeImports/CSharpOrganizeImportsService.Rewriter.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.OrganizeImports
+{
+	partial class CSharpOrganizeImportsService
+    {
+        private class Rewriter : CSharpSyntaxRewriter
+        {
+            private readonly bool _placeSystemNamespaceFirst;
+            public readonly IList<TextChange> TextChanges = new List<TextChange>();
+
+            public Rewriter(bool placeSystemNamespaceFirst)
+            {
+                _placeSystemNamespaceFirst = placeSystemNamespaceFirst;
+            }
+
+            public override SyntaxNode VisitCompilationUnit(CompilationUnitSyntax node)
+            {
+                node = (CompilationUnitSyntax)base.VisitCompilationUnit(node);
+
+                SyntaxList<ExternAliasDirectiveSyntax> organizedExternAliasList;
+                SyntaxList<UsingDirectiveSyntax> organizedUsingList;
+				UsingsAndExternAliasesOrganizer.Organize(
+                    node.Externs, node.Usings, _placeSystemNamespaceFirst,
+                    out organizedExternAliasList, out organizedUsingList);
+
+                var result = node.WithExterns(organizedExternAliasList).WithUsings(organizedUsingList);
+                if (node != result)
+                {
+                    AddTextChange(node.Externs, organizedExternAliasList);
+                    AddTextChange(node.Usings, organizedUsingList);
+                }
+
+                return result;
+            }
+
+            public override SyntaxNode VisitNamespaceDeclaration(NamespaceDeclarationSyntax node)
+            {
+                node = (NamespaceDeclarationSyntax)base.VisitNamespaceDeclaration(node);
+
+                SyntaxList<ExternAliasDirectiveSyntax> organizedExternAliasList;
+                SyntaxList<UsingDirectiveSyntax> organizedUsingList;
+                UsingsAndExternAliasesOrganizer.Organize(
+                    node.Externs, node.Usings, _placeSystemNamespaceFirst,
+                    out organizedExternAliasList, out organizedUsingList);
+
+                var result = node.WithExterns(organizedExternAliasList).WithUsings(organizedUsingList);
+                if (node != result)
+                {
+                    AddTextChange(node.Externs, organizedExternAliasList);
+                    AddTextChange(node.Usings, organizedUsingList);
+                }
+
+                return result;
+            }
+
+            private void AddTextChange<TSyntax>(SyntaxList<TSyntax> list, SyntaxList<TSyntax> organizedList)
+                where TSyntax : SyntaxNode
+            {
+                if (list.Count > 0)
+                {
+                    this.TextChanges.Add(new TextChange(GetTextSpan(list), GetNewText(organizedList)));
+                }
+            }
+
+            private string GetNewText<TSyntax>(SyntaxList<TSyntax> organizedList)
+                where TSyntax : SyntaxNode
+            {
+                return string.Join(string.Empty, organizedList.Select(t => t.ToFullString()));
+            }
+
+            private TextSpan GetTextSpan<TSyntax>(SyntaxList<TSyntax> list)
+                where TSyntax : SyntaxNode
+            {
+                return TextSpan.FromBounds(list.First().FullSpan.Start, list.Last().FullSpan.End);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/OrganizeImports/CSharpOrganizeImportsService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/OrganizeImports/CSharpOrganizeImportsService.cs
new file mode 100644
index 0000000000..67542be953
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/OrganizeImports/CSharpOrganizeImportsService.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.OrganizeImports
+{
+	partial class CSharpOrganizeImportsService
+	{
+		public async Task<Document> OrganizeImportsAsync(Document document, bool placeSystemNamespaceFirst, CancellationToken cancellationToken)
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var rewriter = new Rewriter(placeSystemNamespaceFirst);
+			var newRoot = rewriter.Visit(root);
+
+			return document.WithSyntaxRoot(newRoot);
+		}
+
+		public string OrganizeImportsDisplayStringWithAccelerator
+		{
+			get
+			{
+				return Resources.OrganizeUsingsWithAccelerator;
+			}
+		}
+
+		public string SortImportsDisplayStringWithAccelerator
+		{
+			get
+			{
+				return Resources.SortUsingsWithAccelerator;
+			}
+		}
+
+		public string RemoveUnusedImportsDisplayStringWithAccelerator
+		{
+			get
+			{
+				return Resources.RemoveUnnecessaryUsingsWithAccelerator;
+			}
+		}
+
+		public string SortAndRemoveUnusedImportsDisplayStringWithAccelerator
+		{
+			get
+			{
+				return Resources.RemoveAndSortUsingsWithAccelerator;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/IParameterHintingData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/IParameterHintingData.cs
new file mode 100644
index 0000000000..30323490f1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/IParameterHintingData.cs
@@ -0,0 +1,229 @@
+// 
+// IParameterDataProvider.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	/// <summary>
+	/// Provides intellisense information for a collection of parametrized members.
+	/// </summary>
+	public interface IParameterHintingData
+	{
+		/// <summary>
+		/// Gets the symbol for which the parameter should be created.
+		/// </summary>
+		ISymbol Symbol {
+			get;
+		}
+		
+		int ParameterCount {
+			get;
+		}
+		
+		bool IsParameterListAllowed {
+			get;
+		}
+
+		string GetParameterName (int currentParameter);
+	}
+	
+	class ParameterHintingData : IParameterHintingData
+	{
+		public ISymbol Symbol {
+			get;
+			private set;
+		}
+		
+		public ParameterHintingData(IMethodSymbol symbol)
+		{
+			this.Symbol = symbol;
+		}
+		
+		public ParameterHintingData(IPropertySymbol symbol)
+		{
+			this.Symbol = symbol;
+		}
+		
+		static ImmutableArray<IParameterSymbol> GetParameterList (IParameterHintingData data)
+		{
+			var ms = data.Symbol as IMethodSymbol;
+			if (ms != null)
+				return ms.Parameters;
+				
+			var ps = data.Symbol as IPropertySymbol;
+			if (ps != null)
+				return ps.Parameters;
+
+			return ImmutableArray<IParameterSymbol>.Empty;
+		}
+		
+		public string GetParameterName (int currentParameter)
+		{
+			var list = GetParameterList (this);
+			if (currentParameter < 0 || currentParameter >= list.Length)
+				throw new ArgumentOutOfRangeException ("currentParameter");
+			return list [currentParameter].Name;
+		}
+
+		public int ParameterCount {
+			get {
+				return GetParameterList(this).Length;
+			}
+		}
+
+		public bool IsParameterListAllowed {
+			get {
+				var param = GetParameterList(this).LastOrDefault();
+				return param != null && param.IsParams;
+			}
+		}
+	}
+	
+	class DelegateParameterHintingData : IParameterHintingData
+	{
+		readonly IMethodSymbol invocationMethod;
+
+		public ISymbol Symbol {
+			get;
+			private set;
+		}
+		
+		public DelegateParameterHintingData(ITypeSymbol symbol)
+		{
+			this.Symbol = symbol;
+			this.invocationMethod = symbol.GetDelegateInvokeMethod();
+		}
+		
+		public string GetParameterName (int currentParameter)
+		{
+			var list = invocationMethod.Parameters;
+			if (currentParameter < 0 || currentParameter >= list.Length)
+				throw new ArgumentOutOfRangeException ("currentParameter");
+			return list [currentParameter].Name;
+		}
+
+		public int ParameterCount {
+			get {
+				return invocationMethod.Parameters.Length;
+			}
+		}
+
+		public bool IsParameterListAllowed {
+			get {
+				var param = invocationMethod.Parameters.LastOrDefault();
+				return param != null && param.IsParams;
+			}
+		}
+	}
+
+	class ArrayParameterHintingData : IParameterHintingData
+	{
+		readonly IArrayTypeSymbol arrayType;
+
+		public ISymbol Symbol {
+			get {
+				return arrayType;
+			}
+		}
+		
+		public ArrayParameterHintingData(IArrayTypeSymbol arrayType)
+		{
+			this.arrayType = arrayType;
+		}
+		
+		public string GetParameterName (int currentParameter)
+		{
+			return null;
+		}
+
+		public int ParameterCount {
+			get {
+				return arrayType.Rank;
+			}
+		}
+
+		public bool IsParameterListAllowed {
+			get {
+				return false;
+			}
+		}
+	}
+
+	class TypeParameterHintingData : IParameterHintingData
+	{
+		public ISymbol Symbol {
+			get;
+			private set;
+		}
+		
+		public TypeParameterHintingData(IMethodSymbol symbol)
+		{
+			this.Symbol = symbol;
+		}
+		
+		public TypeParameterHintingData(INamedTypeSymbol symbol)
+		{
+			this.Symbol = symbol;
+		}
+		
+		static ImmutableArray<ITypeParameterSymbol> GetTypeParameterList (IParameterHintingData data)
+		{
+			var ms = data.Symbol as IMethodSymbol;
+			if (ms != null)
+				return ms.TypeParameters;
+				
+			var ps = data.Symbol as INamedTypeSymbol;
+			if (ps != null)
+				return ps.TypeParameters;
+
+			return ImmutableArray<ITypeParameterSymbol>.Empty;
+		}
+
+		
+		public string GetParameterName (int currentParameter)
+		{
+			var list = GetTypeParameterList (this);
+			if (currentParameter < 0 || currentParameter >= list.Length)
+				throw new ArgumentOutOfRangeException ("currentParameter");
+			return list [currentParameter].Name;
+		}
+
+		public int ParameterCount {
+			get {
+				return GetTypeParameterList(this).Length;
+			}
+		}
+
+		public bool IsParameterListAllowed {
+			get {
+				return false;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/IParameterHintingDataFactory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/IParameterHintingDataFactory.cs
new file mode 100644
index 0000000000..4995e19c3c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/IParameterHintingDataFactory.cs
@@ -0,0 +1,47 @@
+// 
+// IParameterCopmletionFactory.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	public interface IParameterHintingDataFactory
+	{
+		IParameterHintingData CreateConstructorProvider (IMethodSymbol constructor);
+
+		IParameterHintingData CreateMethodDataProvider (IMethodSymbol method);
+
+		IParameterHintingData CreateDelegateDataProvider (ITypeSymbol delegateType);
+		
+		IParameterHintingData CreateIndexerParameterDataProvider (IPropertySymbol indexer, SyntaxNode resolvedNode);
+		
+		IParameterHintingData CreateArrayDataProvider (IArrayTypeSymbol arrayType);
+		
+		IParameterHintingData CreateTypeParameterDataProvider (INamedTypeSymbol type);
+
+		IParameterHintingData CreateTypeParameterDataProvider (IMethodSymbol method);
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingEngine.cs
new file mode 100644
index 0000000000..0dff09ee36
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingEngine.cs
@@ -0,0 +1,332 @@
+// 
+// CSharpParameterCompletionEngine.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.CodeDom;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.TypeSystem;
+using System.Security.Cryptography;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class ParameterHintingEngine
+	{
+		readonly IParameterHintingDataFactory factory;
+		readonly Workspace workspace;
+	
+		public ParameterHintingEngine(Workspace workspace, IParameterHintingDataFactory factory)
+		{
+			if (workspace == null)
+				throw new ArgumentNullException("workspace");
+			if (factory == null)
+				throw new ArgumentNullException("factory");
+			this.workspace = workspace;
+			this.factory = factory;
+		}
+
+		public Task<ParameterHintingResult> GetParameterDataProviderAsync (Document document, SemanticModel semanticModel, int position, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			return InternalGetParameterDataProviderAsync (document, semanticModel, position, cancellationToken, 0);
+		}
+
+		public async Task<ParameterHintingResult> InternalGetParameterDataProviderAsync (Document document, SemanticModel semanticModel, int position, CancellationToken cancellationToken, int recCount)
+		{
+			if (position == 0 || recCount > 1)
+				return ParameterHintingResult.Empty;
+			var tree = await document.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
+			var tokenLeftOfPosition = tree.FindTokenOnLeftOfPosition (position, cancellationToken);
+			if (tokenLeftOfPosition.IsKind (SyntaxKind.LessThanToken)) {
+				var startToken = tokenLeftOfPosition.GetPreviousToken();
+				return HandleTypeParameterCase(semanticModel, startToken.Parent, cancellationToken);
+			}
+		
+			var context = SyntaxContext.Create(workspace, document, semanticModel, position, cancellationToken);
+			var targetParent = context.TargetToken.Parent;
+			if (targetParent == null)
+				return ParameterHintingResult.Empty;
+
+			if (context.TargetToken.IsKind (SyntaxKind.IdentifierName)) {
+				targetParent = targetParent.Parent;
+			}
+			
+			if (context.TargetToken.IsKind (SyntaxKind.CloseParenToken) || context.TargetToken.IsKind (SyntaxKind.CloseBracketToken) || context.TargetToken.IsKind (SyntaxKind.GreaterThanToken))
+				targetParent = targetParent.Parent;
+			if (targetParent == null)
+				return ParameterHintingResult.Empty;
+			var node = targetParent.Parent;
+
+			// case: identifier<arg1,|
+			if (node == null) {
+				if (context.LeftToken.Kind() == SyntaxKind.CommaToken) {
+					targetParent = context.LeftToken.GetPreviousToken().Parent;
+					node = targetParent.Parent;
+					if (node.Kind() == SyntaxKind.LessThanExpression) {
+						return HandleTypeParameterCase(semanticModel, ((BinaryExpressionSyntax)node).Left, cancellationToken);
+
+					}
+				}
+				return ParameterHintingResult.Empty;
+			}
+			if (node.IsKind (SyntaxKind.Argument)) {
+				node = node.Parent.Parent;
+			} else {
+				if (!(targetParent is BaseArgumentListSyntax) && !(targetParent is AttributeArgumentListSyntax) && !(targetParent is InitializerExpressionSyntax)) {
+					if (position == targetParent.Span.Start)
+						return ParameterHintingResult.Empty;
+					return await InternalGetParameterDataProviderAsync (document, semanticModel, targetParent.Span.Start, cancellationToken, recCount + 1).ConfigureAwait (false);
+				}
+			}
+			switch (node.Kind()) {
+				case SyntaxKind.Attribute:
+					return HandleAttribute(semanticModel, node, cancellationToken);					
+				case SyntaxKind.ThisConstructorInitializer:
+				case SyntaxKind.BaseConstructorInitializer:
+					return HandleConstructorInitializer(semanticModel, node, cancellationToken);
+				case SyntaxKind.ObjectCreationExpression:
+					return HandleObjectCreationExpression(semanticModel, node, cancellationToken);
+				case SyntaxKind.InvocationExpression:
+					return HandleInvocationExpression(semanticModel, (InvocationExpressionSyntax)node, cancellationToken);
+				case SyntaxKind.ElementAccessExpression:
+					return HandleElementAccessExpression(semanticModel, (ElementAccessExpressionSyntax)node, cancellationToken);
+			}
+			return ParameterHintingResult.Empty;
+		}
+
+		ParameterHintingResult HandleInvocationExpression(SemanticModel semanticModel, InvocationExpressionSyntax node, CancellationToken cancellationToken)
+		{
+			var info = semanticModel.GetSymbolInfo(node, cancellationToken);
+			var result = new ParameterHintingResult(node.SpanStart);
+
+			var targetTypeInfo = semanticModel.GetTypeInfo (node.Expression);
+			if (targetTypeInfo.Type != null && targetTypeInfo.Type.TypeKind == TypeKind.Delegate) {
+				result.AddData (factory.CreateMethodDataProvider (targetTypeInfo.Type.GetDelegateInvokeMethod ()));
+				return result;
+			}
+
+			var within = semanticModel.GetEnclosingNamedTypeOrAssembly(node.SpanStart, cancellationToken);
+			ITypeSymbol type;
+			var ma = node.Expression as MemberAccessExpressionSyntax;
+			string name = null;
+			bool staticLookup = false;
+			if (ma != null) {
+				staticLookup = semanticModel.GetSymbolInfo (ma.Expression).Symbol is ITypeSymbol;
+				type = semanticModel.GetTypeInfo (ma.Expression).Type; 
+				name = info.Symbol?.Name ?? ma.Name.Identifier.ValueText;
+			} else {
+				type = within as ITypeSymbol;
+				name = info.Symbol?.Name ?? node.Expression.ToString ();
+				var sym = semanticModel.GetEnclosingSymbol (node.SpanStart, cancellationToken); 
+				staticLookup = sym.IsStatic;
+			}
+			var addedMethods = new List<IMethodSymbol> ();
+			var filterMethod = new HashSet<IMethodSymbol> ();
+			for (;type != null; type = type.BaseType) {
+				foreach (var method in type.GetMembers ().OfType<IMethodSymbol> ().Concat (GetExtensionMethods(semanticModel, type, node, cancellationToken)).Where (m => m.Name == name)) {
+					if (staticLookup && !method.IsStatic)
+						continue;
+					if (method.OverriddenMethod != null)
+						filterMethod.Add (method.OverriddenMethod);
+					if (filterMethod.Contains (method))
+						continue;
+					if (addedMethods.Any (added => SignatureComparer.HaveSameSignature (method, added, true)))
+						continue;
+					if (method.IsAccessibleWithin (within)) {
+						if (info.Symbol != null) {
+							var smethod = (IMethodSymbol)info.Symbol;
+							if (smethod != null && smethod.OriginalDefinition == method) {
+								continue;
+							}
+						}
+						addedMethods.Add (method); 
+						result.AddData (factory.CreateMethodDataProvider (method));
+					}
+				}
+			}
+			if (info.Symbol != null && !addedMethods.Contains (info.Symbol)) {
+				if (!staticLookup || info.Symbol.IsStatic)
+					result.AddData (factory.CreateMethodDataProvider ((IMethodSymbol)info.Symbol));
+			}
+			return result;
+		}
+
+		IEnumerable<IMethodSymbol> GetExtensionMethods (SemanticModel semanticModel, ITypeSymbol typeToExtend, InvocationExpressionSyntax node, CancellationToken cancellationToken)
+		{
+			var usedNamespaces = new HashSet<string> ();
+			foreach (var un in semanticModel.GetUsingNamespacesInScope (node)) {
+				usedNamespaces.Add (un.GetFullName ());
+			}
+			var enclosingNamespaceName = semanticModel.GetEnclosingNamespace (node.SpanStart, cancellationToken).GetFullName ();
+
+			var stack = new Stack<INamespaceOrTypeSymbol> ();
+			stack.Push (semanticModel.Compilation.GlobalNamespace);
+
+			while (stack.Count > 0) {
+				if (cancellationToken.IsCancellationRequested)
+					break;
+				var current = stack.Pop ();
+				var currentNs = current as INamespaceSymbol;
+				if (currentNs != null) {
+
+					foreach (var member in currentNs.GetNamespaceMembers ()) {
+						var currentNsName = member.GetFullName ();
+						if (usedNamespaces.Contains (currentNsName) ||
+							enclosingNamespaceName == currentNsName ||
+							(enclosingNamespaceName.StartsWith (currentNsName, StringComparison.Ordinal) &&
+							enclosingNamespaceName [currentNsName.Length] == '.')) {
+							stack.Push (member);
+						}
+					}
+
+					foreach (var member in currentNs.GetTypeMembers ())
+						stack.Push (member);
+
+				} else {
+					var type = (INamedTypeSymbol)current;
+					if (type.IsImplicitClass || type.IsScriptClass)
+						continue;
+					if (type.DeclaredAccessibility != Accessibility.Public) {
+						if (type.DeclaredAccessibility != Accessibility.Internal)
+							continue;
+						if (!type.IsAccessibleWithin (semanticModel.Compilation.Assembly))
+							continue;
+					}
+					if (!type.MightContainExtensionMethods)
+						continue;
+					foreach (var extMethod in type.GetMembers ().OfType<IMethodSymbol> ().Where (method => method.IsExtensionMethod)) {
+						var reducedMethod = extMethod.ReduceExtensionMethod (typeToExtend);
+						if (reducedMethod != null) {
+							yield return reducedMethod;
+						}
+					}
+				}
+			}
+		}
+
+		ParameterHintingResult HandleTypeParameterCase(SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var result = new ParameterHintingResult(node.SpanStart);
+			string typeName;
+			var gns = node as GenericNameSyntax;
+			if (gns != null) {
+				typeName = gns.Identifier.ToString ();
+			} else {
+				typeName = node.ToString ();
+			}
+
+			foreach (var cand in semanticModel.LookupSymbols (node.SpanStart).OfType<INamedTypeSymbol> ()) {
+				if (cand.TypeParameters.Length == 0)
+					continue;
+				if (cand.Name == typeName || cand.GetFullName () == typeName)
+					result.AddData(factory.CreateTypeParameterDataProvider(cand));
+			}
+
+			if (result.Count == 0) {
+				foreach (var cand in semanticModel.LookupSymbols (node.SpanStart).OfType<IMethodSymbol> ()) {
+					if (cand.TypeParameters.Length == 0)
+						continue;
+					if (cand.Name == typeName)
+						result.AddData (factory.CreateTypeParameterDataProvider (cand));
+				}
+			}
+			return result;
+		}
+			
+		ParameterHintingResult HandleAttribute(SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var info = semanticModel.GetSymbolInfo(node, cancellationToken);
+			var result = new ParameterHintingResult(node.SpanStart);
+			var resolvedMethod = info.Symbol as IMethodSymbol;
+			if (resolvedMethod != null)
+				result.AddData(factory.CreateConstructorProvider(resolvedMethod));
+			result.AddRange(info.CandidateSymbols.OfType<IMethodSymbol>().Select (m => factory.CreateConstructorProvider(m)));
+			return result;
+		}
+		
+		ParameterHintingResult HandleConstructorInitializer(SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var info = semanticModel.GetSymbolInfo(node, cancellationToken);
+			var result = new ParameterHintingResult(node.SpanStart);
+			
+			var resolvedMethod = info.Symbol as IMethodSymbol;
+			if (resolvedMethod != null)
+				result.AddData(factory.CreateConstructorProvider(resolvedMethod));
+			result.AddRange(info.CandidateSymbols.OfType<IMethodSymbol>().Select (m => factory.CreateConstructorProvider(m)));
+			return result;
+		}
+		
+		ParameterHintingResult HandleElementAccessExpression(SemanticModel semanticModel, ElementAccessExpressionSyntax node, CancellationToken cancellationToken)
+		{
+			var within = semanticModel.GetEnclosingNamedTypeOrAssembly(node.SpanStart, cancellationToken);
+
+			var targetTypeInfo = semanticModel.GetTypeInfo (node.Expression);
+			ITypeSymbol type = targetTypeInfo.Type;
+			if (type == null)
+				return ParameterHintingResult.Empty;
+
+			var result = new ParameterHintingResult(node.SpanStart);
+			if (type.TypeKind == TypeKind.Array) {
+				result.AddData (factory.CreateArrayDataProvider ((IArrayTypeSymbol)type));
+				return result;
+			}
+
+			var addedProperties = new List<IPropertySymbol> ();
+			for (;type != null; type = type.BaseType) {
+				foreach (var indexer in type.GetMembers ().OfType<IPropertySymbol> ().Where (p => p.IsIndexer)) {
+					if (addedProperties.Any (added => SignatureComparer.HaveSameSignature (indexer, added, true)))
+						continue;
+
+					if (indexer.IsAccessibleWithin (within)) {
+						addedProperties.Add (indexer); 
+						result.AddData (factory.CreateIndexerParameterDataProvider (indexer, node));
+					}
+				}
+			}
+			return result;
+		}
+		
+		ParameterHintingResult HandleObjectCreationExpression (SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			// var info = semanticModel.GetSymbolInfo(node, cancellationToken);
+			var result = new ParameterHintingResult(node.SpanStart);
+			var within = semanticModel.GetEnclosingNamedTypeOrAssembly(node.SpanStart, cancellationToken);
+
+			var targetTypeInfo = semanticModel.GetTypeInfo (node);
+			if (targetTypeInfo.Type != null) {
+				foreach (IMethodSymbol c in targetTypeInfo.Type.GetMembers().OfType<IMethodSymbol>().Where(m => m.MethodKind == MethodKind.Constructor)) {
+					if (c.IsAccessibleWithin (within)) {
+						result.AddData(factory.CreateConstructorProvider(c));
+					}
+				}
+			}
+			return result;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingResult.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingResult.cs
new file mode 100644
index 0000000000..ebd7cf1eec
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterHintingResult.cs
@@ -0,0 +1,87 @@
+//
+// ParameterHintingResult.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory6.CSharp.Completion
+{
+	class ParameterHintingResult : IReadOnlyList<IParameterHintingData>
+	{
+		public static readonly ParameterHintingResult Empty = new ParameterHintingResult (-1);
+		
+		readonly List<IParameterHintingData> data = new List<IParameterHintingData> ();
+		
+		/// <summary>
+		/// Gets the start offset of the parameter expression node.
+		/// </summary>
+		public int StartOffset { 
+			get;
+			private set;
+		}
+
+		#region IReadOnlyList<IParameterHintingData> implementation
+		
+		public IEnumerator<IParameterHintingData> GetEnumerator()
+		{
+			return data.GetEnumerator();
+		}
+
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return ((System.Collections.IEnumerable)data).GetEnumerator();
+		}
+		
+		public IParameterHintingData this[int index] {
+			get {
+				return data [index];
+			}
+		}
+
+		public int Count {
+			get {
+				return data.Count;
+			}
+		}
+		
+		#endregion
+		
+		internal protected ParameterHintingResult(int startOffset)
+		{
+			this.StartOffset = startOffset;
+		}
+		
+		internal protected void AddData (IParameterHintingData parameterHintingData)
+		{
+			data.Add(parameterHintingData); 
+		}
+		
+		internal protected void AddRange (IEnumerable<IParameterHintingData> parameterHintingDataCollection)
+		{
+			data.AddRange(parameterHintingDataCollection); 
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterUtil.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterUtil.cs
new file mode 100644
index 0000000000..415d37e1ab
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/ParameterHinting/ParameterUtil.cs
@@ -0,0 +1,123 @@
+//
+// ParameterUtil.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MonoDevelop.Core.Text;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class ParameterIndexResult
+	{
+		public readonly static ParameterIndexResult Invalid = new ParameterIndexResult (null, -1);
+		public readonly static ParameterIndexResult First   = new ParameterIndexResult (null, 0);
+		
+		public readonly string[] UsedNamespaceParameters;
+		public readonly int      ParameterIndex;
+		
+		
+		internal ParameterIndexResult(string[] usedNamespaceParameters, int parameterIndex)
+		{
+			UsedNamespaceParameters = usedNamespaceParameters;
+			ParameterIndex = parameterIndex;
+		}
+	}
+		
+	static class ParameterUtil
+	{
+		public static async Task<ParameterIndexResult> GetCurrentParameterIndex (Document document, int startOffset, int caretOffset, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			List<string> usedNamedParameters = null;
+			if (startOffset < 0)
+				return ParameterIndexResult.Invalid;
+
+			var tree = await document.GetSyntaxTreeAsync (cancellationToken).ConfigureAwait (false);
+			var root = await tree.GetRootAsync (cancellationToken).ConfigureAwait (false);
+			if (startOffset >= root.FullSpan.Length)
+				return ParameterIndexResult.Invalid;
+			var token = root.FindToken (startOffset);
+			if (token.Parent == null)
+				return ParameterIndexResult.Invalid;
+
+			SyntaxNode argList = null;
+
+			var invocation = token.Parent.AncestorsAndSelf ().FirstOrDefault (n =>
+				n is InvocationExpressionSyntax ||
+			                 n is ObjectCreationExpressionSyntax ||
+			                 n is ElementAccessExpressionSyntax ||
+			                 n is ConstructorInitializerSyntax ||
+			                 n is AttributeSyntax);
+			if (invocation is InvocationExpressionSyntax) {
+				argList = ((InvocationExpressionSyntax)invocation).ArgumentList;
+			} else if (invocation is ObjectCreationExpressionSyntax) {
+				argList = ((ObjectCreationExpressionSyntax)invocation).ArgumentList;
+			} else if (invocation is ElementAccessExpressionSyntax) {
+				argList = ((ElementAccessExpressionSyntax)invocation).ArgumentList;
+			} else if (invocation is ConstructorInitializerSyntax) {
+				argList = ((ConstructorInitializerSyntax)invocation).ArgumentList;
+			} else if (invocation is AttributeSyntax) {
+				argList = ((AttributeSyntax)invocation).ArgumentList;
+			}
+			if (argList == null)
+				return ParameterIndexResult.Invalid;
+			int i = 0;
+			int j = 0;
+			if (caretOffset <= argList.SpanStart || caretOffset >= argList.Span.End) {
+				return ParameterIndexResult.Invalid;
+			}
+			
+			foreach (var child in argList.ChildNodesAndTokens ()) {
+				if (child.Span.End > caretOffset) {
+					if (i == 0 && j <= 1)
+						return ParameterIndexResult.First;
+					return new ParameterIndexResult (usedNamedParameters != null ? usedNamedParameters.ToArray () : null, i + 1);
+				}
+
+				if (child.IsToken) {
+					if (child.IsKind (Microsoft.CodeAnalysis.CSharp.SyntaxKind.CommaToken))
+						i++;
+				} else {
+					var node = child.AsNode () as ArgumentSyntax;
+					if (node != null && node.NameColon != null) {
+						if (usedNamedParameters == null)
+							usedNamedParameters = new List<string> ();
+						usedNamedParameters.Add (node.NameColon.Name.Identifier.Text);
+					}
+				}
+				j++;
+			}
+			if (j > 0) {
+				return new ParameterIndexResult (usedNamedParameters != null ? usedNamedParameters.ToArray () : null, i + 1);
+			}
+			return ParameterIndexResult.Invalid;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsService.Rewriter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsService.Rewriter.cs
new file mode 100644
index 0000000000..d46886d49f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsService.Rewriter.cs
@@ -0,0 +1,168 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.RemoveUnnecessaryImports
+{
+	partial class CSharpRemoveUnnecessaryImportsService
+	{
+		private class Rewriter : CSharpSyntaxRewriter
+		{
+			private readonly ISet<UsingDirectiveSyntax> _unnecessaryUsingsDoNotAccessDirectly;
+			private readonly CancellationToken _cancellationToken;
+
+			public Rewriter(ISet<UsingDirectiveSyntax> unnecessaryUsings, CancellationToken cancellationToken)
+				: base(visitIntoStructuredTrivia: true)
+			{
+				_unnecessaryUsingsDoNotAccessDirectly = unnecessaryUsings;
+				_cancellationToken = cancellationToken;
+			}
+
+			public override SyntaxNode DefaultVisit(SyntaxNode node)
+			{
+				_cancellationToken.ThrowIfCancellationRequested();
+				return base.DefaultVisit(node);
+			}
+
+			private void ProcessUsings(
+				SyntaxList<UsingDirectiveSyntax> usings,
+				ISet<UsingDirectiveSyntax> usingsToRemove,
+				out SyntaxList<UsingDirectiveSyntax> finalUsings,
+				out SyntaxTriviaList finalTrivia)
+			{
+				var currentUsings = new List<UsingDirectiveSyntax>(usings);
+
+				finalTrivia = default(SyntaxTriviaList);
+				for (int i = 0; i < usings.Count; i++)
+				{
+					if (usingsToRemove.Contains(usings[i]))
+					{
+						var currentUsing = currentUsings[i];
+						currentUsings[i] = null;
+
+						var leadingTrivia = currentUsing.GetLeadingTrivia();
+						if (leadingTrivia.Any(t => t.Kind() != SyntaxKind.EndOfLineTrivia && t.Kind() != SyntaxKind.WhitespaceTrivia))
+						{
+							// This using had trivia we want to preserve.  If we're the last
+							// directive, then copy this trivia out so that our caller can place
+							// it on the next token.  If there is any directive following us,
+							// then place it on that.
+							if (i < usings.Count - 1)
+							{
+								currentUsings[i + 1] = currentUsings[i + 1].WithPrependedLeadingTrivia(leadingTrivia);
+							}
+							else
+							{
+								finalTrivia = leadingTrivia;
+							}
+						}
+					}
+				}
+
+				finalUsings = currentUsings.WhereNotNull().ToSyntaxList();
+			}
+
+			private ISet<UsingDirectiveSyntax> GetUsingsToRemove(
+				SyntaxList<UsingDirectiveSyntax> oldUsings,
+				SyntaxList<UsingDirectiveSyntax> newUsings)
+			{
+				var result = new HashSet<UsingDirectiveSyntax>();
+				for (int i = 0; i < oldUsings.Count; i++)
+				{
+					if (_unnecessaryUsingsDoNotAccessDirectly.Contains(oldUsings[i]))
+					{
+						result.Add(newUsings[i]);
+					}
+				}
+
+				return result;
+			}
+
+			public override SyntaxNode VisitCompilationUnit(CompilationUnitSyntax node)
+			{
+				var compilationUnit = (CompilationUnitSyntax)base.VisitCompilationUnit(node);
+
+				var usingsToRemove = GetUsingsToRemove(node.Usings, compilationUnit.Usings);
+				if (usingsToRemove.Count == 0)
+				{
+					return compilationUnit;
+				}
+
+				SyntaxList<UsingDirectiveSyntax> finalUsings;
+				SyntaxTriviaList finalTrivia;
+				ProcessUsings(compilationUnit.Usings, usingsToRemove, out finalUsings, out finalTrivia);
+
+				// If there was any left over trivia, then attach it to the next token that
+				// follows the usings.
+				if (finalTrivia.Count > 0)
+				{
+					var nextToken = compilationUnit.Usings.Last().GetLastToken().GetNextToken();
+					compilationUnit = compilationUnit.ReplaceToken(nextToken, nextToken.WithPrependedLeadingTrivia(finalTrivia));
+				}
+
+				var resultCompilationUnit = compilationUnit.WithUsings(finalUsings);
+				if (finalUsings.Count == 0 &&
+					resultCompilationUnit.Externs.Count == 0 &&
+					resultCompilationUnit.Members.Count >= 1)
+				{
+					// We've removed all the usings and now the first thing in the namespace is a
+					// type.  In this case, remove any newlines preceding the type.
+					var firstToken = resultCompilationUnit.GetFirstToken();
+					var newFirstToken = StripNewLines(firstToken);
+					resultCompilationUnit = resultCompilationUnit.ReplaceToken(firstToken, newFirstToken);
+				}
+
+				return resultCompilationUnit;
+			}
+
+			public override SyntaxNode VisitNamespaceDeclaration(NamespaceDeclarationSyntax node)
+			{
+				var namespaceDeclaration = (NamespaceDeclarationSyntax)base.VisitNamespaceDeclaration(node);
+				var usingsToRemove = GetUsingsToRemove(node.Usings, namespaceDeclaration.Usings);
+				if (usingsToRemove.Count == 0)
+				{
+					return namespaceDeclaration;
+				}
+
+				SyntaxList<UsingDirectiveSyntax> finalUsings;
+				SyntaxTriviaList finalTrivia;
+				ProcessUsings(namespaceDeclaration.Usings, usingsToRemove, out finalUsings, out finalTrivia);
+
+				// If there was any left over trivia, then attach it to the next token that
+				// follows the usings.
+				if (finalTrivia.Count > 0)
+				{
+					var nextToken = namespaceDeclaration.Usings.Last().GetLastToken().GetNextToken();
+					namespaceDeclaration = namespaceDeclaration.ReplaceToken(nextToken, nextToken.WithPrependedLeadingTrivia(finalTrivia));
+				}
+
+				var resultNamespace = namespaceDeclaration.WithUsings(finalUsings);
+				if (finalUsings.Count == 0 &&
+					resultNamespace.Externs.Count == 0 &&
+					resultNamespace.Members.Count >= 1)
+				{
+					// We've removed all the usings and now the first thing in the namespace is a
+					// type.  In this case, remove any newlines preceding the type.
+					var firstToken = resultNamespace.Members.First().GetFirstToken();
+					var newFirstToken = StripNewLines(firstToken);
+					resultNamespace = resultNamespace.ReplaceToken(firstToken, newFirstToken);
+				}
+
+				return resultNamespace;
+			}
+
+			private static SyntaxToken StripNewLines(SyntaxToken firstToken)
+			{
+				return firstToken.WithLeadingTrivia(firstToken.LeadingTrivia.SkipWhile(t => t.Kind() == SyntaxKind.EndOfLineTrivia));
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsService.cs
new file mode 100644
index 0000000000..fd5496194c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/RemoveUnnecessaryImports/CSharpRemoveUnnecessaryImportsService.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp.Features.RemoveUnnecessaryImports
+{
+	partial class CSharpRemoveUnnecessaryImportsService
+	{
+		public static IEnumerable<SyntaxNode> GetUnnecessaryImports(SemanticModel semanticModel, SyntaxNode root, CancellationToken cancellationToken)
+		{
+			var diagnostics = semanticModel.GetDiagnostics(cancellationToken: cancellationToken);
+			if (!diagnostics.Any())
+			{
+				return null;
+			}
+
+			var unnecessaryImports = new HashSet<UsingDirectiveSyntax>();
+
+			foreach (var diagnostic in diagnostics)
+			{
+				if (diagnostic.Id == "CS8019")
+				{
+					var node = root.FindNode(diagnostic.Location.SourceSpan) as UsingDirectiveSyntax;
+
+					if (node != null)
+					{
+						unnecessaryImports.Add(node);
+					}
+				}
+			}
+
+			if (cancellationToken.IsCancellationRequested || !unnecessaryImports.Any())
+			{
+				return null;
+			}
+
+			return unnecessaryImports;
+		}
+
+		public Document RemoveUnnecessaryImports(Document document, SemanticModel model, SyntaxNode root, CancellationToken cancellationToken)
+		{
+			var unnecessaryImports = GetUnnecessaryImports(model, root, cancellationToken) as ISet<UsingDirectiveSyntax>;
+			if (unnecessaryImports == null)
+			{
+				return document;
+			}
+
+			var oldRoot = (CompilationUnitSyntax)root;
+			if (unnecessaryImports.Any(import => oldRoot.OverlapsHiddenPosition(cancellationToken)))
+			{
+				return document;
+			}
+
+			var newRoot = (CompilationUnitSyntax)new Rewriter(unnecessaryImports, cancellationToken).Visit(oldRoot);
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return null;
+			}
+
+			return document.WithSyntaxRoot(FormatResult(document, newRoot, cancellationToken));
+		}
+
+		private SyntaxNode FormatResult(Document document, CompilationUnitSyntax newRoot, CancellationToken cancellationToken)
+		{
+			var spans = new List<TextSpan>();
+			AddFormattingSpans(newRoot, spans, cancellationToken);
+			return Formatter.Format(newRoot, spans, document.Project.Solution.Workspace, document.Project.Solution.Workspace.Options, cancellationToken: cancellationToken);
+		}
+
+		private void AddFormattingSpans(
+			CompilationUnitSyntax compilationUnit,
+			List<TextSpan> spans,
+			CancellationToken cancellationToken)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+			spans.Add(TextSpan.FromBounds(0, GetEndPosition(compilationUnit, compilationUnit.Members)));
+
+			foreach (var @namespace in compilationUnit.Members.OfType<NamespaceDeclarationSyntax>())
+			{
+				AddFormattingSpans(@namespace, spans, cancellationToken);
+			}
+		}
+
+		private void AddFormattingSpans(
+			NamespaceDeclarationSyntax namespaceMember,
+			List<TextSpan> spans,
+			CancellationToken cancellationToken)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+			spans.Add(TextSpan.FromBounds(namespaceMember.SpanStart, GetEndPosition(namespaceMember, namespaceMember.Members)));
+
+			foreach (var @namespace in namespaceMember.Members.OfType<NamespaceDeclarationSyntax>())
+			{
+				AddFormattingSpans(@namespace, spans, cancellationToken);
+			}
+		}
+
+		private int GetEndPosition(SyntaxNode container, SyntaxList<MemberDeclarationSyntax> list)
+		{
+			return list.Count > 0 ? list[0].SpanStart : container.Span.End;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/SemanticHighlighting/SemanticHighlightingVisitor.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/SemanticHighlighting/SemanticHighlightingVisitor.cs
new file mode 100644
index 0000000000..ddef6ea1e8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Features/SemanticHighlighting/SemanticHighlightingVisitor.cs
@@ -0,0 +1,716 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Core.Text;
+using System.Text.RegularExpressions;
+
+namespace ICSharpCode.NRefactory6.CSharp.Analysis
+{
+	/// <summary>
+	/// C# Semantic highlighter.
+	/// </summary>
+	abstract class SemanticHighlightingVisitor<TColor> : CSharpSyntaxWalker
+	{
+		protected CancellationToken cancellationToken = default(CancellationToken);
+
+		protected TColor defaultTextColor;
+		protected TColor referenceTypeColor;
+		protected TColor valueTypeColor;
+		protected TColor interfaceTypeColor;
+		protected TColor enumerationTypeColor;
+		protected TColor typeParameterTypeColor;
+		protected TColor delegateTypeColor;
+
+		protected TColor methodCallColor;
+		protected TColor methodDeclarationColor;
+
+		protected TColor eventDeclarationColor;
+		protected TColor eventAccessColor;
+
+		protected TColor propertyDeclarationColor;
+		protected TColor propertyAccessColor;
+
+		protected TColor fieldDeclarationColor;
+		protected TColor fieldAccessColor;
+
+		protected TColor variableDeclarationColor;
+		protected TColor variableAccessColor;
+
+		protected TColor parameterDeclarationColor;
+		protected TColor parameterAccessColor;
+
+		protected TColor valueKeywordColor;
+		protected TColor externAliasKeywordColor;
+		protected TColor varKeywordTypeColor;
+		protected TColor nameofKeywordColor;
+		protected TColor whenKeywordColor;
+
+		/// <summary>
+		/// Used for 'in' modifiers on type parameters.
+		/// </summary>
+		/// <remarks>
+		/// 'in' may have a different color when used with 'foreach'.
+		/// 'out' is not colored by semantic highlighting, as syntax highlighting can already detect it as a parameter modifier.
+		/// </remarks>
+		protected TColor parameterModifierColor;
+
+		/// <summary>
+		/// Used for inactive code (excluded by preprocessor or ConditionalAttribute)
+		/// </summary>
+		protected TColor inactiveCodeColor;
+
+		protected TColor stringFormatItemColor;
+
+		protected TColor stringRegexCharacterClass;
+		protected TColor stringRegexGroupingConstructs;
+		protected TColor stringRegexSetConstructs;
+		protected TColor stringRegexComments;
+		protected TColor stringRegexEscapeCharacter;
+		protected TColor stringRegexAltEscapeCharacter;
+
+		protected TColor stringRegexErrors;
+
+		protected TextSpan region;
+
+		protected SemanticModel semanticModel;
+		// bool isInAccessorContainingValueParameter;
+
+		protected abstract void Colorize (TextSpan span, TColor color);
+
+		protected SemanticHighlightingVisitor (SemanticModel semanticModel) : base (SyntaxWalkerDepth.Trivia)
+		{
+			this.semanticModel = semanticModel;
+		}
+
+		#region Colorize helper methods
+		protected void Colorize (SyntaxNode node, TColor color)
+		{
+			if (node == null)
+				return;
+			Colorize (node.Span, color);
+		}
+
+		protected void Colorize (SyntaxToken node, TColor color)
+		{
+			Colorize (node.Span, color);
+		}
+
+		#endregion
+		public override void VisitRefTypeExpression (Microsoft.CodeAnalysis.CSharp.Syntax.RefTypeExpressionSyntax node)
+		{
+			base.VisitRefTypeExpression (node);
+			Colorize (node.Expression, referenceTypeColor);
+		}
+
+		public override void VisitCompilationUnit (CompilationUnitSyntax node)
+		{
+			var startNode = node.DescendantNodesAndSelf (n => region.Start <= n.SpanStart).FirstOrDefault ();
+			if (startNode == node || startNode == null) {
+				base.VisitCompilationUnit (node);
+			} else {
+				this.Visit (startNode);
+			}
+		}
+
+		public override void Visit (SyntaxNode node)
+		{
+			if (node.Span.End < region.Start)
+				return;
+			if (node.Span.Start > region.End)
+				return;
+			base.Visit(node);
+		}
+
+		void HighlightStringFormatItems(LiteralExpressionSyntax expr)
+		{
+			if (!expr.Token.IsKind(SyntaxKind.StringLiteralToken))
+				return;
+			var text = expr.Token.Text;
+			int start = -1;
+			for (int i = 0; i < text.Length; i++) {
+				char ch = text [i];
+
+				if (NewLine.GetDelimiterType(ch, i + 1 < text.Length ? text [i + 1] : '\0') != UnicodeNewline.Unknown) {
+					continue;
+				}
+
+				if (ch == '{' && start < 0) {
+					char next = i + 1 < text.Length ? text [i + 1] : '\0';
+					if (next == '{') {
+						i++;
+						continue;
+					}
+					start = i;
+				}
+				
+				if (ch == '}' && start >= 0) {
+					Colorize(new TextSpan (expr.SpanStart + start, i - start + 1), stringFormatItemColor);
+					start = -1;
+				}
+			}
+		}
+
+		public override void VisitInvocationExpression(InvocationExpressionSyntax node)
+		{
+			var symbolInfo = semanticModel.GetSymbolInfo (node.Expression, cancellationToken);
+
+			if (IsInactiveConditional (symbolInfo.Symbol) || IsEmptyPartialMethod (symbolInfo.Symbol, cancellationToken)) {
+				// mark the whole invocation statement as inactive code
+				Colorize (node.Span, inactiveCodeColor);
+				return;
+			}
+			if (node.Expression.IsKind (SyntaxKind.IdentifierName) && symbolInfo.Symbol == null) {
+				var id = (IdentifierNameSyntax)node.Expression;
+				if (id.Identifier.ValueText == "nameof") {
+					Colorize (id.Span, nameofKeywordColor);
+				}
+			}
+
+			ExpressionSyntax fmtArgumets;
+			IList<ExpressionSyntax> args;
+			if (node.ArgumentList.Arguments.Count > 1 && FormatStringHelper.TryGetFormattingParameters (semanticModel, node, out fmtArgumets, out args, null, cancellationToken)) {
+				var expr = node.ArgumentList.Arguments.First ();
+				if (expr != null) {
+					var literalExpressionSyntax = expr.Expression as LiteralExpressionSyntax;
+					if (literalExpressionSyntax != null)
+						HighlightStringFormatItems (literalExpressionSyntax);
+				}
+			}
+
+			var containingType = symbolInfo.Symbol?.ContainingType;
+			if (IsRegexMatchMethod (symbolInfo)) {
+				if (node.ArgumentList.Arguments.Count > 1) {
+					var pattern = node.ArgumentList.Arguments [1].Expression as LiteralExpressionSyntax;
+					if (pattern != null && pattern.IsKind (SyntaxKind.StringLiteralExpression)) {
+						ColorizeRegex (pattern);
+					}
+
+				}
+			}
+
+			base.VisitInvocationExpression (node);
+		}
+
+		internal static bool IsRegexMatchMethod (SymbolInfo symbolInfo)
+		{
+			var symbol = symbolInfo.Symbol;
+			if (symbol == null)
+				return false;
+			return IsRegexType (symbol.ContainingType) && symbol.IsStatic && (symbol.Name == "IsMatch" || symbol.Name == "Match" || symbol.Name == "Matches");
+		}
+
+		public override void VisitObjectCreationExpression (ObjectCreationExpressionSyntax node)
+		{
+			base.VisitObjectCreationExpression (node);
+			var symbolInfo = semanticModel.GetSymbolInfo (node, cancellationToken);
+			if (IsRegexConstructor (symbolInfo)) {
+				if (node.ArgumentList.Arguments.Count > 0) {
+					var pattern = node.ArgumentList.Arguments [0].Expression as LiteralExpressionSyntax;
+					if (pattern != null && pattern.IsKind (SyntaxKind.StringLiteralExpression)) {
+						ColorizeRegex (pattern);
+					}
+				}
+			}
+		}
+
+		internal static bool IsRegexConstructor (SymbolInfo symbolInfo)
+		{
+			return symbolInfo.Symbol?.ContainingType is INamedTypeSymbol && IsRegexType (symbolInfo.Symbol.ContainingType);
+		}
+
+		internal static bool IsRegexType (INamedTypeSymbol containingType)
+		{
+			return containingType != null && containingType.Name == "Regex" && containingType.ContainingNamespace.GetFullName () == "System.Text.RegularExpressions";
+		}
+
+		void ColorizeRegex (LiteralExpressionSyntax literal)
+		{
+			string pattern = literal.Token.ToString ();
+			if (pattern.Length == 0)
+				return;
+			bool isVerbatim = pattern [0] == '@';
+			bool inSet = false, inGroup = false;
+			int lastEscape = -1;
+			for (int i = 1; i < pattern.Length - 1; i++) {
+				char ch = pattern [i];
+				switch (ch) {
+				case '\\':
+					var start = i;
+					i++;
+					if (!isVerbatim) {
+						if (pattern [i] == '\\') {
+							i++;
+						} else {
+							break;
+						}
+					}
+
+					switch (pattern[i]) {
+					case 'w':
+					case 'W':
+					case 's':
+					case 'S':
+					case 'd':
+					case 'D':
+						Colorize (new TextSpan (literal.SpanStart + start, i - start + 1), stringRegexCharacterClass);
+						break;
+					case 'A':
+					case 'Z':
+					case 'z':
+					case 'G':
+					case 'b':
+					case 'B': 
+						// Anchor
+						Colorize (new TextSpan (literal.SpanStart + start, i - start + 1), stringRegexCharacterClass);
+						break;
+					default:
+						if (lastEscape == literal.SpanStart + start) {
+							Colorize (new TextSpan (literal.SpanStart + start, i - start + 1), stringRegexAltEscapeCharacter);
+							lastEscape = -1;
+						} else {
+							Colorize (new TextSpan (literal.SpanStart + start, i - start + 1), stringRegexEscapeCharacter);
+							lastEscape = literal.SpanStart + i + 1;
+						}
+						break;
+					}
+					break;
+				case '^':
+					if (inSet) {
+						Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexSetConstructs);
+					} else {
+						Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexCharacterClass);
+					}
+					break;
+				case '$':
+					// Anchor
+					Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexCharacterClass);
+					break;
+				case '.':
+					Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexCharacterClass);
+					break;
+				case '|':
+					// Alternate
+					Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexCharacterClass);
+					break;
+				case '*':
+				case '+':
+				case '?':
+					// Quantifier
+					Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexCharacterClass);
+					break;
+				case '{': {
+					var closingIndex = pattern.IndexOf ('}', i + 1);
+					if (closingIndex >= 0) {
+						// Quantifier
+						Colorize (new TextSpan (literal.SpanStart + i, closingIndex - i + 1), stringRegexCharacterClass);
+						i = closingIndex;
+					} else {
+						Colorize (new TextSpan (literal.SpanStart + i, pattern.Length - i), stringRegexErrors);
+						i = pattern.Length;
+					}
+					break;
+				}
+				case '[': {
+						var closingIndex = pattern.IndexOf (']', i + 1);
+						if (closingIndex < 0) {
+							Colorize (new TextSpan (literal.SpanStart + i, pattern.Length - i), stringRegexErrors);
+							i = pattern.Length;
+							break;
+						}
+						inSet = true;
+						Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexSetConstructs);
+					}
+					break;
+				case ']':
+					inSet = false;
+					Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexSetConstructs);
+					break;
+				case '-':
+					if (inSet)
+						Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexSetConstructs);
+					break;
+				case '(':
+					if (i + 1 < pattern.Length && pattern[i + 1 ] == '?') {
+						if (i + 2 < pattern.Length && pattern[i + 2] == '#') {
+							var closingIndex = pattern.IndexOf (')', i + 2);
+							if (closingIndex < 0) {
+								Colorize (new TextSpan (literal.SpanStart + i, pattern.Length - i), stringRegexErrors);
+								i = pattern.Length;
+								break;
+							}
+							Colorize (new TextSpan (literal.SpanStart + i, closingIndex - i + 1), stringRegexComments);
+							i = closingIndex;
+							break;
+						}
+						Colorize (new TextSpan (literal.SpanStart + i, 2), stringRegexGroupingConstructs);
+						inGroup = true;
+						i++;
+						break;
+					}
+					Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexGroupingConstructs);
+					break;
+				case '<':
+				case '>':
+					if (inGroup) {
+						Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexGroupingConstructs);
+					}
+					break;
+				case ')':
+					inGroup = false;
+					Colorize (new TextSpan (literal.SpanStart + i, 1), stringRegexGroupingConstructs);
+					break;
+				}
+				
+			}
+		}
+
+		bool IsInactiveConditional(ISymbol member)
+		{
+			if (member == null || member.Kind != SymbolKind.Method)
+				return false;
+			var method = member as IMethodSymbol;
+			if (method.ReturnType.SpecialType != SpecialType.System_Void)
+				return false;
+			
+			var om = method.OverriddenMethod;
+			while (om != null) {
+				if (IsInactiveConditional (om.GetAttributes()))
+					return true;
+				om = om.OverriddenMethod;
+			}
+			
+			return IsInactiveConditional(member.GetAttributes());
+		}
+
+		bool IsInactiveConditional(System.Collections.Immutable.ImmutableArray<AttributeData> attributes)
+		{
+			foreach (var attr in attributes) {
+				if (attr.AttributeClass.Name == "ConditionalAttribute" && attr.AttributeClass.ContainingNamespace.ToString() == "System.Diagnostics" && attr.ConstructorArguments.Length == 1) {
+					string symbol = attr.ConstructorArguments[0].Value as string;
+					if (symbol != null) {
+						var options = (CSharpParseOptions)semanticModel.SyntaxTree.Options;
+						if (!options.PreprocessorSymbolNames.Contains(symbol))
+							return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		static bool IsEmptyPartialMethod(ISymbol member, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var method = member as IMethodSymbol;
+			if (method == null || method.IsDefinedInMetadata ())
+				return false;
+			foreach (var r in method.DeclaringSyntaxReferences) {
+				var node = r.GetSyntax (cancellationToken) as MethodDeclarationSyntax;
+				if (node == null)
+					continue;
+				if (node.Body != null || !node.Modifiers.Any(m => m.IsKind (SyntaxKind.PartialKeyword)))
+					return false;
+			}
+
+			return true;
+		}
+
+		public override void VisitExternAliasDirective(ExternAliasDirectiveSyntax node)
+		{
+			base.VisitExternAliasDirective(node);
+			Colorize (node.AliasKeyword.Span, externAliasKeywordColor);
+		}
+		
+		public override void VisitGenericName(GenericNameSyntax node)
+		{
+			base.VisitGenericName(node);
+			var info = semanticModel.GetSymbolInfo(node, cancellationToken);
+			TColor color;
+			if (TryGetSymbolColor(info, out color)) {
+				Colorize(node.Identifier.Span, color);
+			}
+		}
+		
+		public override void VisitStructDeclaration(Microsoft.CodeAnalysis.CSharp.Syntax.StructDeclarationSyntax node)
+		{
+			base.VisitStructDeclaration(node);
+			Colorize(node.Identifier, valueTypeColor);
+		}
+		
+		public override void VisitInterfaceDeclaration(Microsoft.CodeAnalysis.CSharp.Syntax.InterfaceDeclarationSyntax node)
+		{
+			base.VisitInterfaceDeclaration(node);
+			Colorize(node.Identifier, interfaceTypeColor);
+		}
+		
+		public override void VisitClassDeclaration(Microsoft.CodeAnalysis.CSharp.Syntax.ClassDeclarationSyntax node)
+		{
+			var symbol = semanticModel.GetDeclaredSymbol(node);
+			if (symbol != null && IsInactiveConditional (symbol)) {
+				Colorize (node, inactiveCodeColor);
+			} else {
+				base.VisitClassDeclaration (node);
+				Colorize (node.Identifier, referenceTypeColor);
+			}
+		}
+		
+		public override void VisitEnumDeclaration(Microsoft.CodeAnalysis.CSharp.Syntax.EnumDeclarationSyntax node)
+		{
+			base.VisitEnumDeclaration(node);
+			Colorize(node.Identifier, enumerationTypeColor);
+		}
+		
+		public override void VisitDelegateDeclaration(Microsoft.CodeAnalysis.CSharp.Syntax.DelegateDeclarationSyntax node)
+		{
+			base.VisitDelegateDeclaration(node);
+			Colorize(node.Identifier, delegateTypeColor);
+		}
+		
+		public override void VisitTypeParameter(Microsoft.CodeAnalysis.CSharp.Syntax.TypeParameterSyntax node)
+		{
+			base.VisitTypeParameter(node);
+			Colorize(node.Identifier, typeParameterTypeColor);
+		}
+		
+		public override void VisitEventDeclaration(Microsoft.CodeAnalysis.CSharp.Syntax.EventDeclarationSyntax node)
+		{
+			base.VisitEventDeclaration(node);
+			Colorize(node.Identifier, eventDeclarationColor);
+		}
+		
+		public override void VisitMethodDeclaration(Microsoft.CodeAnalysis.CSharp.Syntax.MethodDeclarationSyntax node)
+		{
+			var symbol = semanticModel.GetDeclaredSymbol(node);
+			if (symbol != null && IsInactiveConditional (symbol)) {
+				Colorize (node, inactiveCodeColor);
+			} else {
+				base.VisitMethodDeclaration (node);
+				Colorize (node.Identifier, methodDeclarationColor);
+			}
+		}
+		
+		public override void VisitPropertyDeclaration(Microsoft.CodeAnalysis.CSharp.Syntax.PropertyDeclarationSyntax node)
+		{
+			base.VisitPropertyDeclaration(node);
+			Colorize(node.Identifier, propertyDeclarationColor);
+		}
+
+		public override void VisitParameter(Microsoft.CodeAnalysis.CSharp.Syntax.ParameterSyntax node)
+		{
+			base.VisitParameter(node);
+			Colorize(node.Identifier, parameterDeclarationColor);
+		}
+
+		public override void VisitIdentifierName(Microsoft.CodeAnalysis.CSharp.Syntax.IdentifierNameSyntax node)
+		{
+			base.VisitIdentifierName(node);
+			if (node.IsVar) {
+				var symbolInfo = semanticModel.GetSymbolInfo(node, cancellationToken);
+				if (node.Parent is ForEachStatementSyntax) {
+					var sym = semanticModel.GetDeclaredSymbol(node.Parent, cancellationToken);
+					if (sym != null) {
+						Colorize(node.Span, varKeywordTypeColor);
+						return;
+					}
+				}
+				var vds = node.Parent as VariableDeclarationSyntax;
+				if (vds != null && vds.Variables.Count == 1) {
+					// var sym = vds.Variables[0].Initializer != null ? vds.Variables[0].Initializer.Value as LiteralExpressionSyntax : null;
+					if (symbolInfo.Symbol == null || symbolInfo.Symbol.Name != "var") {
+						Colorize(node.Span, varKeywordTypeColor);
+						return;
+					}
+				}
+			}
+			
+			switch (node.Identifier.Text) {
+				case "add":
+				case "async":
+				case "await":
+				case "get":
+				case "partial":
+				case "remove":
+				case "set":
+				case "where":
+				case "yield":
+				case "from":
+				case "select":
+				case "group":
+				case "into":
+				case "orderby":
+				case "join":
+				case "let":
+				case "on":
+				case "equals":
+				case "by":
+				case "ascending":
+				case "descending":
+				case "dynamic":
+					// Reset color of contextual keyword to default if it's used as an identifier.
+					// Note that this method does not get called when 'var' or 'dynamic' is used as a type,
+					// because types get highlighted with valueTypeColor/referenceTypeColor instead.
+					Colorize(node.Span, defaultTextColor);
+					break;
+				case "global":
+//					// Reset color of 'global' keyword to default unless its used as part of 'global::'.
+//					MemberType parentMemberType = identifier.Parent as MemberType;
+//					if (parentMemberType == null || !parentMemberType.IsDoubleColon)
+						Colorize(node.Span, defaultTextColor);
+					break;
+			}
+			// "value" is handled in VisitIdentifierExpression()
+			// "alias" is handled in VisitExternAliasDeclaration()
+
+			TColor color;
+			if (TryGetSymbolColor (semanticModel.GetSymbolInfo (node, cancellationToken), out color)) {
+				if (node.Parent is AttributeSyntax || node.Parent is QualifiedNameSyntax && node.Parent.Parent is AttributeSyntax)
+					color = referenceTypeColor;
+				Colorize (node.Span, color);
+			}
+		}
+		
+		bool TryGetSymbolColor(SymbolInfo info, out TColor color)
+		{
+			var symbol = info.Symbol;
+
+			if (symbol == null) {
+				color = default(TColor);
+			return false;
+			}
+			
+			switch (symbol.Kind) {
+				case SymbolKind.Field:
+					color = fieldAccessColor;
+					return true;
+				case SymbolKind.Event:
+					color = eventAccessColor;
+					return true;
+				case SymbolKind.Parameter:
+					var param = (IParameterSymbol)symbol;
+					var method = param.ContainingSymbol as IMethodSymbol;
+					if (param.Name == "value" && method != null && (
+						method.MethodKind == MethodKind.EventAdd || 
+						method.MethodKind == MethodKind.EventRaise ||
+						method.MethodKind == MethodKind.EventRemove ||
+						method.MethodKind == MethodKind.PropertySet)) {
+						color = valueKeywordColor;
+					} else {
+						color = parameterAccessColor;
+					}
+					return true;
+				case SymbolKind.RangeVariable:
+					color = variableAccessColor;
+					return true;
+				case SymbolKind.Method:
+					color = methodCallColor;
+					return true;
+				case SymbolKind.Property:
+					color = propertyAccessColor;
+					return true;
+				case SymbolKind.TypeParameter:
+					color = typeParameterTypeColor;
+					return true;
+				case SymbolKind.Local:
+					color = variableAccessColor;
+					return true;
+				case SymbolKind.NamedType:
+					var type = (INamedTypeSymbol)symbol;
+					switch (type.TypeKind) {
+						case TypeKind.Class:
+							color = referenceTypeColor;
+							break;
+						case TypeKind.Delegate:
+							color = delegateTypeColor;
+							break;
+						case TypeKind.Enum:
+							color = enumerationTypeColor;
+							break;
+						case TypeKind.Error:
+							color = default(TColor);
+							return false;
+						case TypeKind.Interface:
+							color = interfaceTypeColor;
+							break;
+						case TypeKind.Struct:
+							color = valueTypeColor;
+							break;
+						case TypeKind.TypeParameter:
+							color = typeParameterTypeColor;
+							break;
+						default:
+							color = referenceTypeColor;
+							break;
+					}
+					return true;
+			}
+			color = default(TColor);
+			return false;
+		}
+		
+		public override void VisitVariableDeclaration(Microsoft.CodeAnalysis.CSharp.Syntax.VariableDeclarationSyntax node)
+		{
+			base.VisitVariableDeclaration(node);
+			TColor color;
+			if (node.Parent.IsKind(SyntaxKind.EventFieldDeclaration))
+				color = eventDeclarationColor;
+			else if (node.Parent.IsKind(SyntaxKind.FieldDeclaration))
+				color = fieldDeclarationColor;
+			else
+				color = variableDeclarationColor;
+
+			foreach (var declarations in node.Variables) {
+				// var info = semanticModel.GetTypeInfo(declarations, cancellationToken); 
+				Colorize(declarations.Identifier, color);
+			}
+		}
+
+		public override void VisitTrivia (SyntaxTrivia trivia)
+		{
+			base.VisitTrivia (trivia);
+			if (trivia.IsKind (SyntaxKind.DisabledTextTrivia)) {
+				Colorize(trivia.Span, inactiveCodeColor);
+			}
+		}
+
+		int blockDepth;
+		
+		public override void VisitBlock(Microsoft.CodeAnalysis.CSharp.Syntax.BlockSyntax node)
+		{
+			blockDepth++;
+			cancellationToken.ThrowIfCancellationRequested ();
+			base.VisitBlock(node);
+			blockDepth--;
+		}
+
+		public override void VisitCatchFilterClause (CatchFilterClauseSyntax node)
+		{
+			if (!node.WhenKeyword.IsMissing) {
+				Colorize(node.WhenKeyword, whenKeywordColor);
+			}
+			base.VisitCatchFilterClause (node);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
index fd3d5506ed..106ee1e933 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
@@ -27,19 +27,25 @@ using System;
 using System.Collections.Generic;
 
 
-using Mono.TextEditor;
 using MonoDevelop.CSharp.Formatting;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Projects.Policies;
 using System.Linq;
 using MonoDevelop.Ide.CodeFormatting;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Core;
 using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.Formatting;
+using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.CSharp.Formatting
 {
-	class CSharpFormatter : AbstractAdvancedFormatter
+	class CSharpFormatter : AbstractCodeFormatter
 	{
 		static internal readonly string MimeType = "text/x-csharp";
 
@@ -47,110 +53,59 @@ namespace MonoDevelop.CSharp.Formatting
 
 		public override bool SupportsCorrectingIndent { get { return true; } }
 
-		public override void CorrectIndenting (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, 
-			TextEditorData data, int line)
+		public override bool SupportsPartialDocumentFormatting { get { return true; } }
+
+		protected override void CorrectIndentingImplementation (PolicyContainer policyParent, TextEditor editor, int line)
 		{
-			DocumentLine lineSegment = data.Document.GetLine (line);
+			var lineSegment = editor.GetLine (line);
 			if (lineSegment == null)
 				return;
 
 			try {
-				var policy = policyParent.Get<CSharpFormattingPolicy> (mimeTypeChain);
-				var tracker = new CSharpIndentEngine (data.Document, data.CreateNRefactoryTextEditorOptions (),  policy.CreateOptions ());
+				var policy = policyParent.Get<CSharpFormattingPolicy> (MimeType);
+				var textpolicy = policyParent.Get<TextStylePolicy> (MimeType);
+				var tracker = new CSharpIndentEngine (policy.CreateOptions (textpolicy));
 
-				tracker.Update (lineSegment.Offset);
+				tracker.Update (IdeApp.Workbench.ActiveDocument.Editor, lineSegment.Offset);
 				for (int i = lineSegment.Offset; i < lineSegment.Offset + lineSegment.Length; i++) {
-					tracker.Push (data.Document.GetCharAt (i));
+					tracker.Push (editor.GetCharAt (i));
 				}
 
-				string curIndent = lineSegment.GetIndentation (data.Document);
+				string curIndent = lineSegment.GetIndentation (editor);
 
 				int nlwsp = curIndent.Length;
-				if (!tracker.LineBeganInsideMultiLineComment || (nlwsp < lineSegment.LengthIncludingDelimiter && data.Document.GetCharAt (lineSegment.Offset + nlwsp) == '*')) {
+				if (!tracker.LineBeganInsideMultiLineComment || (nlwsp < lineSegment.LengthIncludingDelimiter && editor.GetCharAt (lineSegment.Offset + nlwsp) == '*')) {
 					// Possibly replace the indent
 					string newIndent = tracker.ThisLineIndent;
 					if (newIndent != curIndent) 
-						data.Replace (lineSegment.Offset, nlwsp, newIndent);
+						editor.ReplaceText (lineSegment.Offset, nlwsp, newIndent);
 				}
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while indenting", e);
 			}
 		}
 
-		public override void OnTheFlyFormat (MonoDevelop.Ide.Gui.Document doc, int startOffset, int endOffset)
+		protected override void OnTheFlyFormatImplementation (TextEditor editor, DocumentContext context, int startOffset, int length)
 		{
-			OnTheFlyFormatter.Format (doc, startOffset, endOffset);
+			OnTheFlyFormatter.Format (editor, context, startOffset, startOffset + length);
 		}
 
-
-		public static string FormatText (CSharpFormattingPolicy policy, TextStylePolicy textPolicy, string mimeType, string input, int startOffset, int endOffset)
+		public static string FormatText (CSharpFormattingPolicy policy, TextStylePolicy textPolicy, string input, int startOffset, int endOffset)
 		{
-			var data = new TextEditorData ();
-			data.Document.SuppressHighlightUpdate = true;
-			data.Document.MimeType = mimeType;
-			data.Document.FileName = "toformat.cs";
-			if (textPolicy != null) {
-				data.Options.TabsToSpaces = textPolicy.TabsToSpaces;
-				data.Options.TabSize = textPolicy.TabWidth;
-				data.Options.IndentationSize = textPolicy.IndentWidth;
-				data.Options.IndentStyle = textPolicy.RemoveTrailingWhitespace ? IndentStyle.Virtual : IndentStyle.Smart;
-			}
-			data.Text = input;
-
-			// System.Console.WriteLine ("-----");
-			// System.Console.WriteLine (data.Text.Replace (" ", ".").Replace ("\t", "->"));
-			// System.Console.WriteLine ("-----");
-
-			var parser = new CSharpParser ();
-			var compilationUnit = parser.Parse (data);
-			bool hadErrors = parser.HasErrors;
-			
-			if (hadErrors) {
-				//				foreach (var e in parser.ErrorReportPrinter.Errors)
-				//					Console.WriteLine (e.Message);
-				return input.Substring (startOffset, Math.Max (0, Math.Min (endOffset, input.Length) - startOffset));
-			}
-
-			var originalVersion = data.Document.Version;
-
-			var textEditorOptions = data.CreateNRefactoryTextEditorOptions ();
-			var formattingVisitor = new ICSharpCode.NRefactory.CSharp.CSharpFormatter (
-				policy.CreateOptions (),
-				textEditorOptions
-			) {
-				FormattingMode = FormattingMode.Intrusive
-			};
-
-			var changes = formattingVisitor.AnalyzeFormatting (data.Document, compilationUnit);
-			try {
-				changes.ApplyChanges (startOffset, endOffset - startOffset);
-			} catch (Exception e) {
-				LoggingService.LogError ("Error in code formatter", e);
-				return input.Substring (startOffset, Math.Max (0, Math.Min (endOffset, input.Length) - startOffset));
-			}
+			var inputTree = CSharpSyntaxTree.ParseText (input);
 
-			// check if the formatter has produced errors
-			parser = new CSharpParser ();
-			parser.Parse (data);
-			if (parser.HasErrors) {
-				LoggingService.LogError ("C# formatter produced source code errors. See console for output.");
-				return input.Substring (startOffset, Math.Max (0, Math.Min (endOffset, input.Length) - startOffset));
-			}
-
-			var currentVersion = data.Document.Version;
-
-			string result = data.GetTextBetween (startOffset, originalVersion.MoveOffsetTo (currentVersion, endOffset));
-			data.Dispose ();
-			return result;
+			var root = inputTree.GetRoot ();
+			var doc = Formatter.Format (root, new TextSpan (startOffset, endOffset - startOffset), TypeSystemService.Workspace, policy.CreateOptions (textPolicy));
+			var result = doc.ToFullString ();
+			return result.Substring (startOffset, endOffset + result.Length - input.Length - startOffset);
 		}
 
-		public override string FormatText (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, string input, int startOffset, int endOffset)
+		protected override ITextSource FormatImplementation (PolicyContainer policyParent, string mimeType, ITextSource input, int startOffset, int length)
 		{
-			var policy = policyParent.Get<CSharpFormattingPolicy> (mimeTypeChain);
-			var textPolicy = policyParent.Get<TextStylePolicy> (mimeTypeChain);
-
-			return FormatText (policy, textPolicy, mimeTypeChain.First (), input, startOffset, endOffset);
+			var policy = policyParent.Get<CSharpFormattingPolicy> (mimeType);
+			var textPolicy = policyParent.Get<TextStylePolicy> (mimeType);
 
+			return new StringTextSource (FormatText (policy, textPolicy, input.Text, startOffset, startOffset + length));
 		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs
index e6d7a466f3..5d2f151199 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicy.cs
@@ -32,14 +32,19 @@ using System.Xml;
 using System.Text;
 using System.Linq;
 using MonoDevelop.Projects.Policies;
-using ICSharpCode.NRefactory.CSharp;
+using Microsoft.CodeAnalysis.Options;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Gui.Content;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp.Formatting
 {
-	[PolicyType ("C# formatting")]
-	public class CSharpFormattingPolicy : IEquatable<CSharpFormattingPolicy>
+	[PolicyType ("C# formatting (roslyn)")]
+	public sealed class CSharpFormattingPolicy : IEquatable<CSharpFormattingPolicy>
 	{
-		readonly CSharpFormattingOptions options = FormattingOptionsFactory.CreateMono ();
+		OptionSet options;
 		
 		public string Name {
 			get;
@@ -53,1602 +58,542 @@ namespace MonoDevelop.CSharp.Formatting
 		
 		public CSharpFormattingPolicy Clone ()
 		{
-			return new CSharpFormattingPolicy (options.Clone ());
+			return new CSharpFormattingPolicy (options);
 		}
 
-		public CSharpFormattingOptions CreateOptions ()
+		public static OptionSet Apply (OptionSet options, TextStylePolicy policy)
 		{
-			return options;
-		}
-		
-		static CSharpFormattingPolicy ()
-		{
-			if (!PolicyService.InvariantPolicies.ReadOnly)
-				 PolicyService.InvariantPolicies.Set<CSharpFormattingPolicy> (new CSharpFormattingPolicy (), "text/x-csharp");
-		}
-		
-		protected CSharpFormattingPolicy (CSharpFormattingOptions options)
-		{
-			this.options = options;
-		}
-		
-		
-		#region Indentation
-		[ItemProperty]
-		public bool IndentNamespaceBody {
-			get {
-				return options.IndentNamespaceBody;
-			}
-			set {
-				options.IndentNamespaceBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentClassBody {
-			get {
-				return options.IndentClassBody;
-			}
-			set {
-				options.IndentClassBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentInterfaceBody {
-			get {
-				return options.IndentInterfaceBody;
-			}
-			set {
-				options.IndentInterfaceBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentStructBody {
-			get {
-				return options.IndentStructBody;
-			}
-			set {
-				options.IndentStructBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentEnumBody {
-			get {
-				return options.IndentEnumBody;
-			}
-			set {
-				options.IndentEnumBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentMethodBody {
-			get {
-				return options.IndentMethodBody;
-			}
-			set {
-				options.IndentMethodBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentPropertyBody {
-			get {
-				return options.IndentPropertyBody;
-			}
-			set {
-				options.IndentPropertyBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentEventBody {
-			get {
-				return options.IndentEventBody;
-			}
-			set {
-				options.IndentEventBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentBlocks {
-			get {
-				return options.IndentBlocks;
-			}
-			set {
-				options.IndentBlocks = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentSwitchBody {
-			get {
-				return options.IndentSwitchBody;
-			}
-			set {
-				options.IndentSwitchBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentCaseBody {
-			get {
-				return options.IndentCaseBody;
-			}
-			set {
-				options.IndentCaseBody = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool IndentBreakStatements {
-			get {
-				return options.IndentBreakStatements;
-			}
-			set {
-				options.IndentBreakStatements = value;
+			var result = options;
+			if (policy != null) {
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentationSize, LanguageNames.CSharp, policy.IndentWidth);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.NewLine, LanguageNames.CSharp, policy.GetEolMarker ());
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.SmartIndent, LanguageNames.CSharp, FormattingOptions.IndentStyle.Smart);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.TabSize, LanguageNames.CSharp, policy.TabWidth);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.UseTabs, LanguageNames.CSharp, !policy.TabsToSpaces);
 			}
+			return result;
 		}
 
-		[ItemProperty]
-		public bool IndentBlocksInsideExpressions {
-			get {
-				return options.IndentBlocksInsideExpressions;
-			}
-			set {
-				options.IndentBlocksInsideExpressions = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AlignEmbeddedStatements {
-			get {
-				return options.AlignEmbeddedStatements;
-			}
-			set {
-				options.AlignEmbeddedStatements = value;
+		public static OptionSet Apply (OptionSet options, ITextEditorOptions policy)
+		{
+			var result = options;
+			if (policy != null) {
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentationSize, LanguageNames.CSharp, policy.IndentationSize);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.NewLine, LanguageNames.CSharp, policy.DefaultEolMarker);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.SmartIndent, LanguageNames.CSharp, FormattingOptions.IndentStyle.Smart);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.TabSize, LanguageNames.CSharp, policy.TabSize);
+				result = result.WithChangedOption (Microsoft.CodeAnalysis.Formatting.FormattingOptions.UseTabs, LanguageNames.CSharp, !policy.TabsToSpaces);
 			}
+			return result;
 		}
 
-		[ItemProperty]
-		public PropertyFormatting SimplePropertyFormatting {
-			get {
-				return options.SimplePropertyFormatting;
-			}
-			set {
-				options.SimplePropertyFormatting = value;
-			}
+		public OptionSet CreateOptions (TextStylePolicy policy)
+		{
+			return Apply (options, policy);
 		}
 
-		[ItemProperty]
-		public PropertyFormatting AutoPropertyFormatting {
-			get {
-				return options.AutoPropertyFormatting;
-			}
-			set {
-				options.AutoPropertyFormatting = value;
-			}
+		public OptionSet CreateOptions (ITextEditorOptions policy)
+		{
+			return Apply (options, policy);
 		}
 
-		[ItemProperty]
-		public bool IndentPreprocessorDirectives {
-			get {
-				return options.IndentPreprocessorDirectives;
-			}
-			set {
-				options.IndentPreprocessorDirectives = value;
-			}
-		}
-		#endregion
-		
-		#region Braces
-		[ItemProperty]
-		public BraceStyle NamespaceBraceStyle {
-			get {
-				return options.NamespaceBraceStyle;
-			}
-			set {
-				options.NamespaceBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle ClassBraceStyle {
-			get {
-				return options.ClassBraceStyle;
-			}
-			set {
-				options.ClassBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle InterfaceBraceStyle {
-			get {
-				return options.InterfaceBraceStyle;
-			}
-			set {
-				options.InterfaceBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle StructBraceStyle {
-			get {
-				return options.StructBraceStyle;
-			}
-			set {
-				options.StructBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle EnumBraceStyle {
-			get {
-				return options.EnumBraceStyle;
-			}
-			set {
-				options.EnumBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle MethodBraceStyle {
-			get {
-				return options.MethodBraceStyle;
-			}
-			set {
-				options.MethodBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle AnonymousMethodBraceStyle {
-			get {
-				return options.AnonymousMethodBraceStyle;
-			}
-			set {
-				options.AnonymousMethodBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle ConstructorBraceStyle {
-			get {
-				return options.ConstructorBraceStyle;
-			}
-			set {
-				options.ConstructorBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle DestructorBraceStyle {
-			get {
-				return options.DestructorBraceStyle;
-			}
-			set {
-				options.DestructorBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle PropertyBraceStyle {
-			get {
-				return options.PropertyBraceStyle;
-			}
-			set {
-				options.PropertyBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle PropertyGetBraceStyle {
-			get {
-				return options.PropertyGetBraceStyle;
-			}
-			set {
-				options.PropertyGetBraceStyle = value;
-			}
+		static CSharpFormattingPolicy ()
+		{
+			if (!PolicyService.InvariantPolicies.ReadOnly)
+				 PolicyService.InvariantPolicies.Set<CSharpFormattingPolicy> (new CSharpFormattingPolicy (), "text/x-csharp");
 		}
 		
-		[ItemProperty]
-		public BraceStyle PropertySetBraceStyle {
-			get {
-				return options.PropertySetBraceStyle;
-			}
-			set {
-				options.PropertySetBraceStyle = value;
-			}
+		public CSharpFormattingPolicy (OptionSet options)
+		{
+			if (options == null)
+				throw new ArgumentNullException ("options");
+			this.options = options;
 		}
 
+		#region Indent options
 		[ItemProperty]
-		public PropertyFormatting SimpleGetBlockFormatting {
+		public bool IndentBlock {
 			get {
-				return options.SimpleGetBlockFormatting;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBlock);
 			}
 			set {
-				options.SimpleGetBlockFormatting = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBlock, value);
 			}
 		}
 
 		[ItemProperty]
-		public PropertyFormatting SimpleSetBlockFormatting {
-			get {
-
-				return options.SimpleSetBlockFormatting;
-			}
-			set {
-				options.SimpleSetBlockFormatting = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle EventBraceStyle {
+		public bool IndentBraces {
 			get {
-				return options.EventBraceStyle;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBraces);
 			}
 			set {
-				options.EventBraceStyle = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBraces, value);
 			}
 		}
-		
-		[ItemProperty]
-		public BraceStyle EventAddBraceStyle {
-			get {
-				return options.EventAddBraceStyle;
-			}
-			set {
-				options.EventAddBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public BraceStyle EventRemoveBraceStyle {
-			get {
-				return options.EventRemoveBraceStyle;
-			}
-			set {
-				options.EventRemoveBraceStyle = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AllowEventAddBlockInline {
-			get {
-				return options.AllowEventAddBlockInline;
-			}
-			set {
-				options.AllowEventAddBlockInline = value;
-			}
-		}
-		
+
 		[ItemProperty]
-		public bool AllowEventRemoveBlockInline {
+		public bool IndentSwitchSection {
 			get {
-				return options.AllowEventRemoveBlockInline;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchSection);
 			}
 			set {
-				options.AllowEventRemoveBlockInline = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchSection, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public BraceStyle StatementBraceStyle {
+		public bool IndentSwitchCaseSection {
 			get {
-				return options.StatementBraceStyle;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchCaseSection);
 			}
 			set {
-				options.StatementBraceStyle = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchCaseSection, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public bool AllowIfBlockInline {
+		public Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions LabelPositioning {
 			get {
-				return options.AllowIfBlockInline;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.LabelPositioning);
 			}
 			set {
-				options.AllowIfBlockInline = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.LabelPositioning, value);
 			}
 		}
-		
 		#endregion
 
-		#region NewLines
-		[ItemProperty]
-		public NewLinePlacement ElseNewLinePlacement {
-			get {
-				return options.ElseNewLinePlacement;
-			}
-			set {
-				options.ElseNewLinePlacement = value;
-			}
-		}
-		
-		[ItemProperty]
-		public NewLinePlacement ElseIfNewLinePlacement {
-			get {
-				return options.ElseIfNewLinePlacement;
-			}
-			set {
-				options.ElseIfNewLinePlacement = value;
-			}
-		}
-		
-		[ItemProperty]
-		public NewLinePlacement CatchNewLinePlacement {
-			get {
-				return options.CatchNewLinePlacement;
-			}
-			set {
-				options.CatchNewLinePlacement = value;
-			}
-		}
-		
-		[ItemProperty]
-		public NewLinePlacement FinallyNewLinePlacement {
-			get {
-				return options.FinallyNewLinePlacement;
-			}
-			set {
-				options.FinallyNewLinePlacement = value;
-			}
-		}
-		
+		#region New line options
+
 		[ItemProperty]
-		public NewLinePlacement WhileNewLinePlacement {
+		public bool NewLinesForBracesInTypes {
 			get {
-				return options.WhileNewLinePlacement;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInTypes);
 			}
 			set {
-				options.WhileNewLinePlacement = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInTypes, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement EmbeddedStatementPlacement {
+		public bool NewLinesForBracesInMethods {
 			get {
-				return options.EmbeddedStatementPlacement;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInMethods);
 			}
 			set {
-				options.EmbeddedStatementPlacement = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInMethods, value);
 			}
 		}
 
 
-		
 		[ItemProperty]
-		public Wrapping ArrayInitializerWrapping {
+		public bool NewLinesForBracesInProperties {
 			get {
-				return options.ArrayInitializerWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInProperties);
 			}
 			set {
-				options.ArrayInitializerWrapping = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInProperties, value);
 			}
 		}
 
-	[ItemProperty]
-		public BraceStyle ArrayInitializerBraceStyle {
-			get {
-				return options.ArrayInitializerBraceStyle;
-			}
-			set {
-				options.ArrayInitializerBraceStyle = value;
-			}
-		}
 
 		[ItemProperty]
-		public bool KeepCommentsAtFirstColumn {
+		public bool NewLinesForBracesInAccessors {
 			get {
-				return options.KeepCommentsAtFirstColumn;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAccessors);
 			}
 			set {
-				options.KeepCommentsAtFirstColumn = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAccessors, value);
 			}
 		}
 
-		#endregion
-		
-		#region Spaces
-		// Methods
 		[ItemProperty]
-		public bool BeforeMethodDeclarationParentheses {
+		public bool NewLinesForBracesInAnonymousMethods {
 			get {
-				return options.SpaceBeforeMethodDeclarationParentheses;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousMethods);
 			}
 			set {
-				options.SpaceBeforeMethodDeclarationParentheses = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousMethods, value);
 			}
 		}
-		
+			
 		[ItemProperty]
-		public bool BetweenEmptyMethodDeclarationParentheses {
+		public bool NewLinesForBracesInControlBlocks {
 			get {
-				return options.SpaceBetweenEmptyMethodDeclarationParentheses;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInControlBlocks);
 			}
 			set {
-				options.SpaceBetweenEmptyMethodDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeMethodDeclarationParameterComma {
-			get {
-				return options.SpaceBeforeMethodDeclarationParameterComma;
-			}
-			set {
-				options.SpaceBeforeMethodDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterMethodDeclarationParameterComma {
-			get {
-				return options.SpaceAfterMethodDeclarationParameterComma;
-			}
-			set {
-				options.SpaceAfterMethodDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinMethodDeclarationParentheses {
-			get {
-				return options.SpaceWithinMethodDeclarationParentheses;
-			}
-			set {
-				options.SpaceWithinMethodDeclarationParentheses = value;
-			}
-		}
-		
-		// Method calls
-		[ItemProperty]
-		public bool BeforeMethodCallParentheses {
-			get {
-				return options.SpaceBeforeMethodCallParentheses;
-			}
-			set {
-				options.SpaceBeforeMethodCallParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BetweenEmptyMethodCallParentheses {
-			get {
-				return options.SpaceBetweenEmptyMethodCallParentheses;
-			}
-			set {
-				options.SpaceBetweenEmptyMethodCallParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeMethodCallParameterComma {
-			get {
-				return options.SpaceBeforeMethodCallParameterComma;
-			}
-			set {
-				options.SpaceBeforeMethodCallParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterMethodCallParameterComma {
-			get {
-				return options.SpaceAfterMethodCallParameterComma;
-			}
-			set {
-				options.SpaceAfterMethodCallParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinMethodCallParentheses {
-			get {
-				return options.SpaceWithinMethodCallParentheses;
-			}
-			set {
-				options.SpaceWithinMethodCallParentheses = value;
-			}
-		}
-		
-		// fields
-		
-		[ItemProperty]
-		public bool BeforeFieldDeclarationComma {
-			get {
-				return options.SpaceBeforeFieldDeclarationComma;
-			}
-			set {
-				options.SpaceBeforeFieldDeclarationComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterFieldDeclarationComma {
-			get {
-				return options.SpaceAfterFieldDeclarationComma;
-			}
-			set {
-				options.SpaceAfterFieldDeclarationComma = value;
-			}
-		}
-		
-		// local variables
-		
-		[ItemProperty]
-		public bool BeforeLocalVariableDeclarationComma {
-			get {
-				return options.SpaceBeforeLocalVariableDeclarationComma;
-			}
-			set {
-				options.SpaceBeforeLocalVariableDeclarationComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterLocalVariableDeclarationComma {
-			get {
-				return options.SpaceAfterLocalVariableDeclarationComma;
-			}
-			set {
-				options.SpaceAfterLocalVariableDeclarationComma = value;
-			}
-		}
-		
-		// constructors
-		
-		[ItemProperty]
-		public bool BeforeConstructorDeclarationParentheses {
-			get {
-				return options.SpaceBeforeConstructorDeclarationParentheses;
-			}
-			set {
-				options.SpaceBeforeConstructorDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BetweenEmptyConstructorDeclarationParentheses {
-			get {
-				return options.SpaceBetweenEmptyConstructorDeclarationParentheses;
-			}
-			set {
-				options.SpaceBetweenEmptyConstructorDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeConstructorDeclarationParameterComma {
-			get {
-				return options.SpaceBeforeConstructorDeclarationParameterComma;
-			}
-			set {
-				options.SpaceBeforeConstructorDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterConstructorDeclarationParameterComma {
-			get {
-				return options.SpaceAfterConstructorDeclarationParameterComma;
-			}
-			set {
-				options.SpaceAfterConstructorDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinConstructorDeclarationParentheses {
-			get {
-				return options.SpaceWithinConstructorDeclarationParentheses;
-			}
-			set {
-				options.SpaceWithinConstructorDeclarationParentheses = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInControlBlocks, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineBeforeConstructorInitializerColon {
+		public bool NewLinesForBracesInAnonymousTypes {
 			get {
-				return options.NewLineBeforeConstructorInitializerColon;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousTypes);
 			}
 			set {
-				options.NewLineBeforeConstructorInitializerColon = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousTypes, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAfterConstructorInitializerColon {
+		public bool NewLinesForBracesInObjectCollectionArrayInitializers {
 			get {
-				return options.NewLineAfterConstructorInitializerColon;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInObjectCollectionArrayInitializers);
 			}
 			set {
-				options.NewLineAfterConstructorInitializerColon = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInObjectCollectionArrayInitializers, value);
 			}
 		}
 
-		// indexer
-		[ItemProperty]
-		public bool BeforeIndexerDeclarationBracket {
-			get {
-				return options.SpaceBeforeIndexerDeclarationBracket;
-			}
-			set {
-				options.SpaceBeforeIndexerDeclarationBracket = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinIndexerDeclarationBracket {
-			get {
-				return options.SpaceWithinIndexerDeclarationBracket;
-			}
-			set {
-				options.SpaceWithinIndexerDeclarationBracket = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeIndexerDeclarationParameterComma {
-			get {
-				return options.SpaceBeforeIndexerDeclarationParameterComma;
-			}
-			set {
-				options.SpaceBeforeIndexerDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterIndexerDeclarationParameterComma {
-			get {
-				return options.SpaceAfterIndexerDeclarationParameterComma;
-			}
-			set {
-				options.SpaceAfterIndexerDeclarationParameterComma = value;
-			}
-		}
-		
-		// delegates
-		
-		[ItemProperty]
-		public bool BeforeDelegateDeclarationParentheses {
-			get {
-				return options.SpaceBeforeDelegateDeclarationParentheses;
-			}
-			set {
-				options.SpaceBeforeDelegateDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BetweenEmptyDelegateDeclarationParentheses {
-			get {
-				return options.SpaceBetweenEmptyDelegateDeclarationParentheses;
-			}
-			set {
-				options.SpaceBetweenEmptyDelegateDeclarationParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeDelegateDeclarationParameterComma {
-			get {
-				return options.SpaceBeforeDelegateDeclarationParameterComma;
-			}
-			set {
-				options.SpaceBeforeDelegateDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterDelegateDeclarationParameterComma {
-			get {
-				return options.SpaceAfterDelegateDeclarationParameterComma;
-			}
-			set {
-				options.SpaceAfterDelegateDeclarationParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinDelegateDeclarationParentheses {
-			get {
-				return options.SpaceWithinDelegateDeclarationParentheses;
-			}
-			set {
-				options.SpaceWithinDelegateDeclarationParentheses = value;
-			}
-		}
-		
-		
 		[ItemProperty]
-		public bool NewParentheses {
+		public bool NewLinesForBracesInLambdaExpressionBody {
 			get {
-				return options.SpaceBeforeNewParentheses;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInLambdaExpressionBody);
 			}
 			set {
-				options.SpaceBeforeNewParentheses = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInLambdaExpressionBody, value);
 			}
 		}
-		
-		[ItemProperty]
-		public bool IfParentheses {
-			get {
-				return options.SpaceBeforeIfParentheses;
-			}
-			set {
-				options.SpaceBeforeIfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WhileParentheses {
-			get {
-				return options.SpaceBeforeWhileParentheses;
-			}
-			set {
-				options.SpaceBeforeWhileParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ForParentheses {
-			get {
-				return options.SpaceBeforeForParentheses;
-			}
-			set {
-				options.SpaceBeforeForParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ForeachParentheses {
-			get {
-				return options.SpaceBeforeForeachParentheses;
-			}
-			set {
-				options.SpaceBeforeForeachParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool CatchParentheses {
-			get {
-				return options.SpaceBeforeCatchParentheses;
-			}
-			set {
-				options.SpaceBeforeCatchParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool SwitchParentheses {
-			get {
-				return options.SpaceBeforeSwitchParentheses;
-			}
-			set {
-				options.SpaceBeforeSwitchParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool LockParentheses {
-			get {
-				return options.SpaceBeforeLockParentheses;
-			}
-			set {
-				options.SpaceBeforeLockParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool UsingParentheses {
-			get {
-				return options.SpaceBeforeUsingParentheses;
-			}
-			set {
-				options.SpaceBeforeUsingParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundAssignmentParentheses {
-			get {
-				return options.SpaceAroundAssignment;
-			}
-			set {
-				options.SpaceAroundAssignment = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundLogicalOperatorParentheses {
-			get {
-				return options.SpaceAroundLogicalOperator;
-			}
-			set {
-				options.SpaceAroundLogicalOperator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundEqualityOperatorParentheses {
-			get {
-				return options.SpaceAroundEqualityOperator;
-			}
-			set {
-				options.SpaceAroundEqualityOperator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AroundRelationalOperatorParentheses {
-			get {
-				return options.SpaceAroundRelationalOperator;
-			}
-			set {
-				options.SpaceAroundRelationalOperator = value;
-			}
-		}
-		
+
 		[ItemProperty]
-		public bool AroundBitwiseOperatorParentheses {
+		public bool NewLineForElse {
 			get {
-				return options.SpaceAroundBitwiseOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForElse);
 			}
 			set {
-				options.SpaceAroundBitwiseOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForElse, value);
 			}
 		}
-		
+			
 		[ItemProperty]
-		public bool AroundAdditiveOperatorParentheses {
+		public bool NewLineForCatch {
 			get {
-				return options.SpaceAroundAdditiveOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForCatch);
 			}
 			set {
-				options.SpaceAroundAdditiveOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForCatch, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public bool AroundMultiplicativeOperatorParentheses {
+		public bool NewLineForFinally {
 			get {
-				return options.SpaceAroundMultiplicativeOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForFinally);
 			}
 			set {
-				options.SpaceAroundMultiplicativeOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForFinally, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public bool AroundShiftOperatorParentheses {
+		public bool NewLineForMembersInObjectInit {
 			get {
-				return options.SpaceAroundShiftOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInObjectInit);
 			}
 			set {
-				options.SpaceAroundShiftOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInObjectInit, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public bool AroundNullCoalescingOperator {
+		public bool NewLineForMembersInAnonymousTypes {
 			get {
-				return options.SpaceAroundNullCoalescingOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInAnonymousTypes);
 			}
 			set {
-				options.SpaceAroundNullCoalescingOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInAnonymousTypes, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool SpaceAfterUnsafeAddressOfOperator {
+		public bool NewLineForClausesInQuery {
 			get {
-				return options.SpaceAfterUnsafeAddressOfOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForClausesInQuery);
 			}
 			set {
-				options.SpaceAfterUnsafeAddressOfOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForClausesInQuery, value);
 			}
 		}
+		#endregion
 
+		#region Spacing options
 
 		[ItemProperty]
-		public bool SpaceAfterUnsafeAsteriskOfOperator {
+		public bool SpacingAfterMethodDeclarationName {
 			get {
-				return options.SpaceAfterUnsafeAsteriskOfOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAfterMethodDeclarationName);
 			}
 			set {
-				options.SpaceAfterUnsafeAsteriskOfOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAfterMethodDeclarationName, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool SpaceAroundUnsafeArrowOperator {
+		public bool SpaceWithinMethodDeclarationParenthesis {
 			get {
-				return options.SpaceAroundUnsafeArrowOperator;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodDeclarationParenthesis);
 			}
 			set {
-				options.SpaceAroundUnsafeArrowOperator = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodDeclarationParenthesis, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool WithinParentheses {
-			get {
-				return options.SpacesWithinParentheses;
-			}
-			set {
-				options.SpacesWithinParentheses = value;
-			}
-		}
-		
-		
-		[ItemProperty]
-		public bool WithinIfParentheses {
-			get {
-				return options.SpacesWithinIfParentheses;
-			}
-			set {
-				options.SpacesWithinIfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinWhileParentheses {
-			get {
-				return options.SpacesWithinWhileParentheses;
-			}
-			set {
-				options.SpacesWithinWhileParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinForParentheses {
-			get {
-				return options.SpacesWithinForParentheses;
-			}
-			set {
-				options.SpacesWithinForParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinForEachParentheses {
-			get {
-				return options.SpacesWithinForeachParentheses;
-			}
-			set {
-				options.SpacesWithinForeachParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinCatchParentheses {
-			get {
-				return options.SpacesWithinCatchParentheses;
-			}
-			set {
-				options.SpacesWithinCatchParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinSwitchParentheses {
-			get {
-				return options.SpacesWithinSwitchParentheses;
-			}
-			set {
-				options.SpacesWithinSwitchParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinLockParentheses {
-			get {
-				return options.SpacesWithinLockParentheses;
-			}
-			set {
-				options.SpacesWithinLockParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinUsingParentheses {
-			get {
-				return options.SpacesWithinUsingParentheses;
-			}
-			set {
-				options.SpacesWithinUsingParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinCastParentheses {
-			get {
-				return options.SpacesWithinCastParentheses;
-			}
-			set {
-				options.SpacesWithinCastParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinSizeOfParentheses {
-			get {
-				return options.SpacesWithinSizeOfParentheses;
-			}
-			set {
-				options.SpacesWithinSizeOfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeSizeOfParentheses {
-			get {
-				return options.SpaceBeforeSizeOfParentheses;
-			}
-			set {
-				options.SpaceBeforeSizeOfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinTypeOfParentheses {
-			get {
-				return options.SpacesWithinTypeOfParentheses;
-			}
-			set {
-				options.SpacesWithinTypeOfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinNewParentheses {
+		public bool SpaceBetweenEmptyMethodDeclarationParentheses {
 			get {
-				return options.SpacesWithinNewParentheses;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodDeclarationParentheses);
 			}
 			set {
-				options.SpacesWithinNewParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BetweenEmptyNewParentheses {
-			get {
-				return options.SpacesBetweenEmptyNewParentheses;
-			}
-			set {
-				options.SpacesBetweenEmptyNewParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeNewParameterComma {
-			get {
-				return options.SpaceBeforeNewParameterComma;
-			}
-			set {
-				options.SpaceBeforeNewParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool AfterNewParameterComma {
-			get {
-				return options.SpaceAfterNewParameterComma;
-			}
-			set {
-				options.SpaceAfterNewParameterComma = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool BeforeTypeOfParentheses {
-			get {
-				return options.SpaceBeforeTypeOfParentheses;
-			}
-			set {
-				options.SpaceBeforeTypeOfParentheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool WithinCheckedExpressionParantheses {
-			get {
-				return options.SpacesWithinCheckedExpressionParantheses;
-			}
-			set {
-				options.SpacesWithinCheckedExpressionParantheses = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ConditionalOperatorBeforeConditionSpace {
-			get {
-				return options.SpaceBeforeConditionalOperatorCondition;
-			}
-			set {
-				options.SpaceBeforeConditionalOperatorCondition = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ConditionalOperatorAfterConditionSpace {
-			get {
-				return options.SpaceAfterConditionalOperatorCondition;
-			}
-			set {
-				options.SpaceAfterConditionalOperatorCondition = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ConditionalOperatorBeforeSeparatorSpace {
-			get {
-				return options.SpaceBeforeConditionalOperatorSeparator;
-			}
-			set {
-				options.SpaceBeforeConditionalOperatorSeparator = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool ConditionalOperatorAfterSeparatorSpace {
-			get {
-				return options.SpaceAfterConditionalOperatorSeparator;
-			}
-			set {
-				options.SpaceAfterConditionalOperatorSeparator = value;
-			}
-		}
-		
-		// brackets
-		[ItemProperty]
-		public bool SpacesWithinBrackets {
-			get {
-				return options.SpacesWithinBrackets;
-			}
-			set {
-				options.SpacesWithinBrackets = value;
-			}
-		}
-		[ItemProperty]
-		public bool SpacesBeforeBrackets {
-			get {
-				return options.SpacesBeforeBrackets;
-			}
-			set {
-				options.SpacesBeforeBrackets = value;
-			}
-		}
-		[ItemProperty]
-		public bool BeforeBracketComma {
-			get {
-				return options.SpaceBeforeBracketComma;
-			}
-			set {
-				options.SpaceBeforeBracketComma = value;
-			}
-		}
-		[ItemProperty]
-		public bool AfterBracketComma {
-			get {
-				return options.SpaceAfterBracketComma;
-			}
-			set {
-				options.SpaceAfterBracketComma = value;
-			}
-		}
-		
-		
-		[ItemProperty]
-		public bool SpacesBeforeForSemicolon {
-			get {
-				return options.SpaceBeforeForSemicolon;
-			}
-			set {
-				options.SpaceBeforeForSemicolon = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodDeclarationParentheses, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool SpaceBeforeSemicolon {
+		public bool SpaceAfterMethodCallName {
 			get {
-				return options.SpaceBeforeSemicolon;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterMethodCallName);
 			}
 			set {
-				options.SpaceBeforeSemicolon = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterMethodCallName, value);
 			}
 		}
-		
-		[ItemProperty]
-		public bool SpacesAfterForSemicolon {
-			get {
-				return options.SpaceAfterForSemicolon;
-			}
-			set {
-				options.SpaceAfterForSemicolon = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool SpacesAfterTypecast {
-			get {
-				return options.SpaceAfterTypecast;
-			}
-			set {
-				options.SpaceAfterTypecast = value;
-			}
-		}
-		
-		[ItemProperty]
-		public bool SpacesBeforeArrayDeclarationBrackets {
-			get {
-				return options.SpaceBeforeArrayDeclarationBrackets;
-			}
-			set {
-				options.SpaceBeforeArrayDeclarationBrackets = value;
-			}
-		}
-		#endregion
-		
-		#region Blank Lines
-		[ItemProperty]
-		public int BlankLinesBeforeUsings {
-			get {
-				return options.MinimumBlankLinesBeforeUsings;
-			}
-			set {
-				options.MinimumBlankLinesBeforeUsings = value;
-			}
-		}
-		
-		[ItemProperty]
-		public int BlankLinesAfterUsings {
-			get {
-				return options.MinimumBlankLinesAfterUsings;
-			}
-			set {
-				options.MinimumBlankLinesAfterUsings = value;
-			}
-		}
-		
+
 		[ItemProperty]
-		public int BlankLinesBeforeFirstDeclaration {
+		public bool SpaceWithinMethodCallParentheses {
 			get {
-				return options.MinimumBlankLinesBeforeFirstDeclaration;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodCallParentheses);
 			}
 			set {
-				options.MinimumBlankLinesBeforeFirstDeclaration = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodCallParentheses, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public int BlankLinesBetweenTypes {
+		public bool SpaceBetweenEmptyMethodCallParentheses {
 			get {
-				return options.MinimumBlankLinesBetweenTypes;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodCallParentheses);
 			}
 			set {
-				options.MinimumBlankLinesBetweenTypes = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodCallParentheses, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public int BlankLinesBetweenFields {
+		public bool SpaceAfterControlFlowStatementKeyword {
 			get {
-				return options.MinimumBlankLinesBetweenFields;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterControlFlowStatementKeyword);
 			}
 			set {
-				options.MinimumBlankLinesBetweenFields = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterControlFlowStatementKeyword, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public int BlankLinesBetweenEventFields {
+		public bool SpaceWithinExpressionParentheses {
 			get {
-				return options.MinimumBlankLinesBetweenEventFields;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinExpressionParentheses);
 			}
 			set {
-				options.MinimumBlankLinesBetweenEventFields = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinExpressionParentheses, value);
 			}
 		}
-		
+
 		[ItemProperty]
-		public int BlankLinesBetweenMembers {
+		public bool SpaceWithinCastParentheses {
 			get {
-				return options.MinimumBlankLinesBetweenMembers;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinCastParentheses);
 			}
 			set {
-				options.MinimumBlankLinesBetweenMembers = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinCastParentheses, value);
 			}
 		}
 
 		[ItemProperty]
-		public int BlankLinesAroundRegion {
+		public bool SpaceWithinOtherParentheses {
 			get {
-				return options.MinimumBlankLinesAroundRegion;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinOtherParentheses);
 			}
 			set {
-				options.MinimumBlankLinesAroundRegion = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinOtherParentheses, value);
 			}
 		}
 
 		[ItemProperty]
-		public int BlankLinesInsideRegion {
+		public bool SpaceAfterCast {
 			get {
-				return options.MinimumBlankLinesInsideRegion;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterCast);
 			}
 			set {
-				options.MinimumBlankLinesInsideRegion = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterCast, value);
 			}
 		}
-		#endregion
 
-		#region Wrapping
 		[ItemProperty]
-		public Wrapping MethodCallArgumentWrapping {
+		public bool SpacesIgnoreAroundVariableDeclaration {
 			get {
-				return options.MethodCallArgumentWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacesIgnoreAroundVariableDeclaration);
 			}
 			set {
-				options.MethodCallArgumentWrapping = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacesIgnoreAroundVariableDeclaration, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAferMethodCallOpenParentheses {
+		public bool SpaceBeforeOpenSquareBracket {
 			get {
-				return options.NewLineAferMethodCallOpenParentheses;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeOpenSquareBracket);
 			}
 			set {
-				options.NewLineAferMethodCallOpenParentheses = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeOpenSquareBracket, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement MethodCallClosingParenthesesOnNewLine {
+		public bool SpaceBetweenEmptySquareBrackets {
 			get {
-				return options.MethodCallClosingParenthesesOnNewLine;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptySquareBrackets);
 			}
 			set {
-				options.MethodCallClosingParenthesesOnNewLine = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptySquareBrackets, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool AlignToFirstMethodCallArgument {
+		public bool SpaceWithinSquareBrackets {
 			get {
-				return options.AlignToFirstMethodCallArgument;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinSquareBrackets);
 			}
 			set {
-				options.AlignToFirstMethodCallArgument = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinSquareBrackets, value);
 			}
 		}
 
 		[ItemProperty]
-		public Wrapping MethodDeclarationParameterWrapping {
+		public bool SpaceAfterColonInBaseTypeDeclaration {
 			get {
-				return options.MethodDeclarationParameterWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterColonInBaseTypeDeclaration);
 			}
 			set {
-				options.MethodDeclarationParameterWrapping = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterColonInBaseTypeDeclaration, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAferMethodDeclarationOpenParentheses {
+		public bool SpaceAfterComma {
 			get {
-				return options.NewLineAferMethodDeclarationOpenParentheses;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterComma);
 			}
 			set {
-				options.NewLineAferMethodDeclarationOpenParentheses = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterComma, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement MethodDeclarationClosingParenthesesOnNewLine {
+		public bool SpaceAfterDot {
 			get {
-				return options.MethodDeclarationClosingParenthesesOnNewLine;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterDot);
 			}
 			set {
-				options.MethodDeclarationClosingParenthesesOnNewLine = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterDot, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool AlignToFirstMethodDeclarationParameter {
+		public bool SpaceAfterSemicolonsInForStatement {
 			get {
-				return options.AlignToFirstMethodDeclarationParameter;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterSemicolonsInForStatement);
 			}
 			set {
-				options.AlignToFirstMethodDeclarationParameter = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterSemicolonsInForStatement, value);
 			}
 		}
-	
+
 		[ItemProperty]
-		public Wrapping IndexerDeclarationParameterWrapping {
+		public bool SpaceBeforeColonInBaseTypeDeclaration {
 			get {
-				return options.IndexerDeclarationParameterWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeColonInBaseTypeDeclaration);
 			}
 			set {
-				options.IndexerDeclarationParameterWrapping = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeColonInBaseTypeDeclaration, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAferIndexerDeclarationOpenBracket {
+		public bool SpaceBeforeComma {
 			get {
-				return options.NewLineAferIndexerDeclarationOpenBracket;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeComma);
 			}
 			set {
-				options.NewLineAferIndexerDeclarationOpenBracket = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeComma, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement IndexerDeclarationClosingBracketOnNewLine {
+		public bool SpaceBeforeDot {
 			get {
-				return options.IndexerDeclarationClosingBracketOnNewLine;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeDot);
 			}
 			set {
-				options.IndexerDeclarationClosingBracketOnNewLine = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeDot, value);
 			}
 		}
 
 		[ItemProperty]
-		public bool AlignToFirstIndexerDeclarationParameter {
+		public bool SpaceBeforeSemicolonsInForStatement {
 			get {
-				return options.AlignToFirstIndexerDeclarationParameter;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeSemicolonsInForStatement);
 			}
 			set {
-				options.AlignToFirstIndexerDeclarationParameter = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeSemicolonsInForStatement, value);
 			}
 		}
 
 		[ItemProperty]
-		public Wrapping IndexerArgumentWrapping {
+		public Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions SpacingAroundBinaryOperator {
 			get {
-				return options.IndexerArgumentWrapping;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAroundBinaryOperator);
 			}
 			set {
-				options.IndexerArgumentWrapping = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAroundBinaryOperator, value);
 			}
 		}
+		#endregion
+
+		#region Wrapping options
 
 		[ItemProperty]
-		public NewLinePlacement NewLineAferIndexerOpenBracket {
+		public bool WrappingPreserveSingleLine {
 			get {
-				return options.NewLineAferIndexerOpenBracket;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingPreserveSingleLine);
 			}
 			set {
-				options.NewLineAferIndexerOpenBracket = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingPreserveSingleLine, value);
 			}
 		}
 
 		[ItemProperty]
-		public NewLinePlacement IndexerClosingBracketOnNewLine {
+		public bool WrappingKeepStatementsOnSingleLine {
 			get {
-				return options.IndexerClosingBracketOnNewLine;
+				return options.GetOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingKeepStatementsOnSingleLine);
 			}
 			set {
-				options.IndexerClosingBracketOnNewLine = value;
+				options = options.WithChangedOption (Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingKeepStatementsOnSingleLine, value);
 			}
 		}
 
+		#endregion
+
+		#region Code Style options
+		bool placeSystemDirectiveFirst = true;
 		[ItemProperty]
-		public bool AlignToFirstIndexerArgument {
+		public bool PlaceSystemDirectiveFirst {
 			get {
-				return options.AlignToFirstIndexerArgument;
+				return placeSystemDirectiveFirst;
 			}
+
 			set {
-				options.AlignToFirstIndexerArgument = value;
+				placeSystemDirectiveFirst = value;
 			}
 		}
 
@@ -1656,7 +601,7 @@ namespace MonoDevelop.CSharp.Formatting
 
 		public CSharpFormattingPolicy ()
 		{
-			this.options = FormattingOptionsFactory.CreateMono ();
+			this.options = TypeSystemService.Workspace.Options;
 		}
 		
 		public static CSharpFormattingPolicy Load (FilePath selectedFile)
@@ -1707,10 +652,14 @@ namespace MonoDevelop.CSharp.Formatting
 				writer.WriteAttributeString ("name", Name);
 				foreach (PropertyInfo info in typeof (CSharpFormattingPolicy).GetProperties ()) {
 					if (info.GetCustomAttributes (false).Any (o => o.GetType () == typeof(ItemPropertyAttribute))) {
-						writer.WriteStartElement ("Property");
+						writer.WriteStartElement (info.Name);
+						writer.WriteValue (info.GetValue (this, null).ToString ());
+						writer.WriteEndElement ();
+
+						/*						writer.WriteStartElement ("Property");
 						writer.WriteAttributeString ("name", info.Name);
 						writer.WriteAttributeString ("value", info.GetValue (this, null).ToString ());
-						writer.WriteEndElement ();
+						writer.WriteEndElement ();*/
 					}
 				}
 				writer.WriteEndElement ();
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs
index e4475c07f3..8cff36c94c 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanel.cs
@@ -24,9 +24,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp.Formatting
 {
@@ -37,10 +38,10 @@ namespace MonoDevelop.CSharp.Formatting
 		static CSharpFormattingPolicyPanel ()
 		{
 			// ensure that custom text editor shemes are loaded.
-			MonoDevelop.SourceEditor.SourceEditorDisplayBinding.InitSourceEditor ();
+			TextEditorDisplayBinding.InitSourceEditor ();
 		}
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			return panel = new CSharpFormattingPolicyPanelWidget ();
 		}
@@ -60,5 +61,11 @@ namespace MonoDevelop.CSharp.Formatting
 			// return cloned policy
 			return panel.Policy;
 		}
+
+		protected override void OnPolicyStored ()
+		{
+			base.OnPolicyStored ();
+			DefaultSourceEditorOptions.Instance.FireChange ();
+		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs
index ab4093f96c..3094571e03 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs
@@ -26,6 +26,7 @@
 using System;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor;
 
 
 namespace MonoDevelop.CSharp.Formatting
@@ -33,7 +34,8 @@ namespace MonoDevelop.CSharp.Formatting
 	[System.ComponentModel.ToolboxItem(true)]
 	partial class CSharpFormattingPolicyPanelWidget : Gtk.Bin
 	{
-		readonly Mono.TextEditor.TextEditor texteditor = new Mono.TextEditor.TextEditor ();
+		readonly TextEditor texteditor = TextEditorFactory.CreateNewEditor ();
+
 //		Gtk.ListStore model = new Gtk.ListStore (typeof(string));
 //		List<CSharpFormattingPolicy> policies = new List<CSharpFormattingPolicy> ();
 		const string example = @"using System;
@@ -50,14 +52,14 @@ namespace Example {
 }";
 		TextStylePolicy textStylePolicy;
 		CSharpFormattingPolicy policy;
-		public CSharpFormattingPolicy Policy {
+		internal CSharpFormattingPolicy Policy {
 			get {
 				return policy;
 			}
 		}
 
 
-		public void SetPolicy (CSharpFormattingPolicy formattingPolicy, TextStylePolicy textStylePolicy)
+		internal void SetPolicy (CSharpFormattingPolicy formattingPolicy, TextStylePolicy textStylePolicy)
 		{
 			policy = formattingPolicy;
 			this.textStylePolicy = textStylePolicy;
@@ -77,26 +79,18 @@ namespace Example {
 			policy = new CSharpFormattingPolicy ();
 			buttonEdit.Clicked += HandleButtonEditClicked;
 			
-			var options = MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance;
-			texteditor.Options.FontName = options.FontName;
-			texteditor.Options.ColorScheme = options.ColorScheme;
-			texteditor.Options.ShowFoldMargin = false;
-			texteditor.Options.ShowIconMargin = false;
-			texteditor.Options.ShowLineNumberMargin = false;
-			texteditor.Document.ReadOnly = true;
-			texteditor.Document.MimeType = CSharpFormatter.MimeType;
+			texteditor.Options = DefaultSourceEditorOptions.PlainEditor;
+			texteditor.IsReadOnly = true;
+			texteditor.MimeType = CSharpFormatter.MimeType;
 			scrolledwindow1.Child = texteditor;
 			ShowAll ();
 		}
 
 		public void FormatSample ()
 		{
-			if (textStylePolicy != null) {
-				texteditor.Options.IndentationSize = textStylePolicy.IndentWidth;
-				texteditor.Options.TabSize = textStylePolicy.TabWidth;
-				texteditor.Options.TabsToSpaces = textStylePolicy.TabsToSpaces;
-			}
-			texteditor.Document.Text = CSharpFormatter.FormatText (policy, textStylePolicy, CSharpFormatter.MimeType, example, 0, example.Length);
+			texteditor.Options = DefaultSourceEditorOptions.Instance.WithTextStyle (textStylePolicy);
+
+			texteditor.Text = CSharpFormatter.FormatText (policy, textStylePolicy, example, 0, example.Length);
 		}
 
 		void HandleButtonEditClicked (object sender, EventArgs e)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
index 346dad4f94..df1c115eae 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
@@ -30,391 +30,51 @@ using MonoDevelop.Ide;
 using System.Reflection;
 using System.Collections.Generic;
 using System.Linq;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Gui.Content;
 
 
 namespace MonoDevelop.CSharp.Formatting
 {
-	partial class CSharpFormattingProfileDialog : Dialog
+	partial class CSharpFormattingProfileDialog : Gtk.Dialog
 	{
-		readonly Mono.TextEditor.TextEditor texteditor = new Mono.TextEditor.TextEditor ();
+		readonly TextEditor texteditor = TextEditorFactory.CreateNewEditor ();
 		readonly CSharpFormattingPolicy profile;
-		TreeStore indentOptions, bacePositionOptions, newLineOptions, whiteSpaceOptions, wrappingOptions;
-		
-		static readonly Dictionary<Wrapping, string> arrayInitializerTranslationDictionary = new Dictionary<Wrapping, string> ();
-		static readonly Dictionary<BraceStyle, string> braceStyleTranslationDictionary = new Dictionary<BraceStyle, string> ();
-		//static Dictionary<BraceForcement, string> braceForcementTranslationDictionary = new Dictionary<BraceForcement, string> ();
-		static readonly Dictionary<PropertyFormatting, string> propertyFormattingTranslationDictionary = new Dictionary<PropertyFormatting, string> ();
-		static readonly Dictionary<NewLinePlacement, string>  newLinePlacementTranslationDictionary = new Dictionary<NewLinePlacement, string> ();
-		
+		TreeStore indentationOptions, newLineOptions, spacingOptions, styleOptions, wrappingOptions;
+		static readonly Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions, string> labelPositionOptionsTranslationDictionary = new Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions, string> ();
+		static readonly Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions, string> binaryOperatorSpacingOptionsDictionary = new Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions, string> ();
+
+
 		static CSharpFormattingProfileDialog ()
 		{
-			braceStyleTranslationDictionary [BraceStyle.DoNotChange] = GettextCatalog.GetString ("Do not change");
-			braceStyleTranslationDictionary [BraceStyle.EndOfLine] = GettextCatalog.GetString ("End of line");
-			braceStyleTranslationDictionary [BraceStyle.EndOfLineWithoutSpace] = GettextCatalog.GetString ("End of line without space");
-			braceStyleTranslationDictionary [BraceStyle.NextLine] = GettextCatalog.GetString ("Next line");
-			braceStyleTranslationDictionary [BraceStyle.NextLineShifted] = GettextCatalog.GetString ("Next line shifted");
-			braceStyleTranslationDictionary [BraceStyle.NextLineShifted2] = GettextCatalog.GetString ("Next line shifted2");
-			braceStyleTranslationDictionary [BraceStyle.BannerStyle] = GettextCatalog.GetString ("Banner style");
-			
-			propertyFormattingTranslationDictionary [PropertyFormatting.AllowOneLine] = GettextCatalog.GetString ("Allow one line");
-			propertyFormattingTranslationDictionary [PropertyFormatting.ForceOneLine] = GettextCatalog.GetString ("Force one line");
-			propertyFormattingTranslationDictionary [PropertyFormatting.ForceNewLine] = GettextCatalog.GetString ("Force new line");
-			
-			arrayInitializerTranslationDictionary [Wrapping.DoNotChange] = GettextCatalog.GetString ("Do not change");
-			arrayInitializerTranslationDictionary [Wrapping.DoNotWrap] = GettextCatalog.GetString ("Do not Wrap");
-			arrayInitializerTranslationDictionary [Wrapping.WrapAlways] = GettextCatalog.GetString ("Wrap always");
-			arrayInitializerTranslationDictionary [Wrapping.WrapIfTooLong] = GettextCatalog.GetString ("Wrap if too long");
+			labelPositionOptionsTranslationDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.LeftMost] = GettextCatalog.GetString ("leftmost column");
+			labelPositionOptionsTranslationDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.NoIndent] = GettextCatalog.GetString ("normal placement");
+			labelPositionOptionsTranslationDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.OneLess] = GettextCatalog.GetString ("one indent less");
 
-			newLinePlacementTranslationDictionary [NewLinePlacement.DoNotCare] = GettextCatalog.GetString ("Allow both");
-			newLinePlacementTranslationDictionary [NewLinePlacement.NewLine] = GettextCatalog.GetString ("Always new line");
-			newLinePlacementTranslationDictionary [NewLinePlacement.SameLine] = GettextCatalog.GetString ("Always same line");
+			binaryOperatorSpacingOptionsDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Ignore] = GettextCatalog.GetString ("ignore");
+			binaryOperatorSpacingOptionsDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Remove] = GettextCatalog.GetString ("remove");
+			binaryOperatorSpacingOptionsDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Single] = GettextCatalog.GetString ("single");
 		}
 		
 		public static string TranslateValue (object value)
 		{
-			if (value is BraceStyle)
-				return braceStyleTranslationDictionary [(BraceStyle)value];
-//			if (value is BraceForcement) 
-//				return braceForcementTranslationDictionary [(BraceForcement)value];
-			if (value is PropertyFormatting)
-				return propertyFormattingTranslationDictionary [(PropertyFormatting)value];
-			if (value is Wrapping)
-				return arrayInitializerTranslationDictionary [(Wrapping)value];
-			if (value is NewLinePlacement)
-				return newLinePlacementTranslationDictionary [(NewLinePlacement)value];
+			if (value is Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions)
+				return labelPositionOptionsTranslationDictionary [(Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions)value];
+			if (value is Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions)
+				return binaryOperatorSpacingOptionsDictionary [(Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions)value];
 			throw new Exception ("unknown property type: " + value);
 		}
-		
+
 		public static object ConvertProperty (Type propertyType, string newText)
 		{
-			if (propertyType == typeof(BraceStyle))
-				return braceStyleTranslationDictionary.First (p => p.Value == newText).Key;
-//			if (propertyType == typeof(BraceForcement)) 
-//				return braceForcementTranslationDictionary.First (p => p.Value == newText).Key;
-			if (propertyType == typeof(PropertyFormatting)) 
-				return propertyFormattingTranslationDictionary.First (p => p.Value == newText).Key;
-			if (propertyType == typeof(Wrapping))
-				return arrayInitializerTranslationDictionary.First (p => p.Value == newText).Key;
-			if (propertyType == typeof(NewLinePlacement))
-				return newLinePlacementTranslationDictionary.First (p => p.Value == newText).Key;
+			if (propertyType == typeof(Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions))
+				return labelPositionOptionsTranslationDictionary.First (p => p.Value == newText).Key;
+			if (propertyType == typeof(Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions))
+				return binaryOperatorSpacingOptionsDictionary.First (p => p.Value == newText).Key;
 			throw new Exception ("unknown property type: " + propertyType);
 		}
-		
-		#region Examples
-		const string methodSpaceExample = @"class ClassDeclaration { 
-		public static void Main (string[] args)
-		{
-			Console.WriteLine (""Hello World!"");
-		}
-	}";
-		
-		const string propertyExample = @"class ClassDeclaration { 
-		int myProperty;
-		int MyProperty { 
-			get { return myProperty;} 
-			set { myProperty = value;} 
-		}
 
-		string Simple { get { ; } set { ; } }
-
-		int myOtherProperty;
-		int MyOtherProperty { 
-			get { 
-				Console.WriteLine (""get myOtherProperty"");
-				return myOtherProperty;
-			} 
-			set { 
-				if (myOtherProperty != value)
-					myOtherProperty = value;
-			} 
-		}
-		
-		int MyAutoProperty { 
-			get;
-			set;
-		}
-
-		int MyOtherAutoProperty { get; set; }
-	}";
-		
-		const string spaceExample = @"class ClassDeclaration { 
-		public void TestMethod ()
-		{
-			try {
-				TestMethod ("""");
-			} catch (Exception e) {
-				// Do something
-			} finally {
-				// Do something
-			}
-		}
-		
-		public void TestMethod (string test)
-		{
-			lock (this) {
-				switch (test) {
-					case ""A"":
-						Console.WriteLine (""was A"");
-						break;
-					case ""B"":
-						Console.WriteLine (""was B"");
-						break;
-				}
-			}
-		}
-		
-		public void Calculate (int a, int b)
-		{
-			if (a < b) {
-				for (int i = a; i < b; i++) {
-					Console.WriteLine (i);
-				}
-			} else {
-				using (object o = new object ()) {
-					while (b < a) {
-						ConentryNamesole.WriteLine (b++);
-					}
-				}
-			}
-		}
-	}";
-		const string eventExample = @"class ClassDeclaration { 
-		EventHandler<EventArgs> onAction;
-		public event EventHandler<EventArgs> Action {
-			add { onAction = (EventHandler<EventArgs>)Delegate.Combine(onAction, value); }
-			remove { onAction = (EventHandler<EventArgs>)Delegate.Remove(onAction, value);}
-		}
-		EventHandler<EventArgs> onAnotherAction;
-		public event EventHandler<EventArgs> AnotherAction {
-			add { if (value != null) 
-					onAnotherAction = (EventHandler<EventArgs>)Delegate.Combine(onAnotherAction, value); }
-			remove { if (value != null) 
-					onAnotherAction = (EventHandler<EventArgs>)Delegate.Remove(onAnotherAction, value);}
-		}
-	}";
-		
-		const string simpleUsingStatement = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			using (object o = new object ()) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		
-		const string simpleFixedStatement = @"class ClassDeclaration { 
-		public void Test (Point pt)
-		{
-			fixed (int* p = &pt.x) {
-				*p = 10; 
-			}
-		}
-	}";
-		
-		const string simpleIf = @"class ClassDeclaration { 
-		public void Test (int i)
-		{
-			if (i == 5) {
-				Console.WriteLine (""== 5"");
-			} else if (i > 0) {
-				Console.WriteLine ("">0"");
-			} else if (i < 0) {
-				Console.WriteLine (""<0"");
-			} else {
-				Console.WriteLine (""== 0"");
-			}
-		}
-	}";
-		const string longMethodCall = @"class ClassDeclaration { 
-		public void Test (int test)
-		{
-			LongMethodCallInSameLine (""Hello"", 1, test);
-			LongMethodCallInMultiple (
-""Hello"", 
-		1, 
-		test);
-
-		LongMethodCallInMultipleCase2 (""Hello"", 
-		                               1, 
-		                               test);
-	}
-}";
-		const string longMethodDeclaration = @"class ClassDeclaration { 
-	public void LongMethodCallInSameLine (int test, string foo, double bar)
-	{
-	}
-	public void LongMethodCallInMultiple (
-int test,
-string foo,
-double bar)
-	{
-	}
-	public void LongMethodCallInMultipleCase2 (int test,
-string foo,
-double bar)
-	{
-	}
-}";
-		const string longIndexerDeclaration = @"class ClassDeclaration { 
-	public int this [int test, string foo, double bar]
-	{
-		get {}
-	}
-	public int this [
-int test,
-string foo,
-double bar]
-	{
-		get {}
-	}
-	public int this [int test,
-string foo,
-double bar]
-	{
-		get {}
-	}
-}";
-		const string longIndexer = @"class ClassDeclaration { 
-		public void Test (int test)
-		{
-			this [""Hello"", 1, test] = 0;
-			this [
-""Hello"", 
-		1, 
-		test] = 0;
-
-		this [""Hello"", 
-		                               1, 
-		                               test] = 0;
-	}
-}";
-		const string simpleWhile = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			while (true) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		const string simpleCatch = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			try {
-				Console.WriteLine (""Hello World!"");
-			} catch (Exception) {
-				Console.WriteLine (""Got exception!!"");
-			} finally {
-				Console.WriteLine (""finally done."");
-			}
-		}
-	}";
-		
-		const string simpleDoWhile = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			int i = 0;
-			do {
-				Console.WriteLine (""Hello World!"");
-			} while (i++ < 10);
-		}
-	}";
-		
-		const string simpleArrayInitializer = @"class ClassDeclaration { 
-		public void Test (object o)
-		{
-			int[] i = new int[] { 1, 3, 3, 7 };
-		}
-	}";
-		const string condOpExample = @"class ClassDeclaration { 
-		public string GetSign (int i)
-		{
-			return i < 0 ? ""-"" : ""+"";
-		}
-	}";
-		const string switchExample = @"class ClassDeclaration { 
-		public void Test (int i)
-		{
-			switch (i) {
-				case 0:
-					Console.WriteLine (""was zero"");
-					break;
-				case 1:
-					Console.WriteLine (""was one"");
-					break;
-				default:
-					Console.WriteLine (""was "" + i);
-					break;
-			}
-		}
-	}";
-		const string simpleFor = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			for (int i = 0; i < 10; i++) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		const string simpleForeach = @"class ClassDeclaration : ArrayList { 
-		public void Test ()
-		{
-			foreach (object o in this) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		const string simpleLock = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			lock (this) {
-				Console.WriteLine (""Hello World!"");
-			}
-		}
-	}";
-		const string operatorExample = @"class ClassDeclaration { 
-		public void TestMethod ()
-		{
-			int a = 5 << 5;
-			int b = (a + 5 - 3) * 6 / 2;
-			a += b;
-			a = a & ~255;
-			if (a == b || b < a >> 1) {
-				b -= a;
-			}
-		}
-		object Test (object a, object b)
-		{
-			return a ?? b;
-		}
-	}";
-		const string blankLineExample = @"// Example
-using System;
-using System.Collections;
-namespace TestSpace {
-	using MyNamespace;
-	class Test
-	{
-		int a;
-		string b;
-		public Test (int a, string b)
-		{
-			this.a = a;
-			this.b = b;
-		}
-		void Print ()
-		{
-			Console.WriteLine (""a: {0} b : {1}"", a, b);
-		}
-	}
-	class MyTest 
-	{
-	}
-}
-";
-		#endregion
-		
 		const int propertyColumn   = 0;
 		const int displayTextColumn = 1;
 		const int exampleTextColumn = 2;
@@ -437,15 +97,16 @@ namespace TestSpace {
 					treeView = treeviewIndentOptions;
 					break;
 				case 1:
-					treeView = treeviewBracePositions;
+					treeView = treeviewNewLines;
 					break;
 				case 2: // Blank lines
-					UpdateExample (blankLineExample);
-					return;
-				case 3: // white spaces
-					return;
+					treeView = treeviewSpacing;
+					break;
+				case 3:
+					treeView = treeviewWrapping;
+					break;
 				case 4:
-					treeView = treeviewNewLines;
+					treeView = treeviewStyle;
 					break;
 				default:
 					return;
@@ -458,30 +119,25 @@ namespace TestSpace {
 			};
 			notebookCategories.ShowTabs = false;
 			comboboxCategories.AppendText (GettextCatalog.GetString ("Indentation"));
-			comboboxCategories.AppendText (GettextCatalog.GetString ("Braces"));
-			comboboxCategories.AppendText (GettextCatalog.GetString ("Blank lines"));
-			comboboxCategories.AppendText (GettextCatalog.GetString ("Wrapping"));
-			comboboxCategories.AppendText (GettextCatalog.GetString ("White Space"));
 			comboboxCategories.AppendText (GettextCatalog.GetString ("New Lines"));
+			comboboxCategories.AppendText (GettextCatalog.GetString ("Spacing"));
+			comboboxCategories.AppendText (GettextCatalog.GetString ("Wrapping"));
+			comboboxCategories.AppendText (GettextCatalog.GetString ("Style"));
 			comboboxCategories.Changed += delegate {
 				texteditor.Text = "";
 				notebookCategories.Page = comboboxCategories.Active;
 			};
 			comboboxCategories.Active = 0;
 			
-			var options = MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance;
-			texteditor.Options.FontName = options.FontName;
-			texteditor.Options.ColorScheme = options.ColorScheme;
-			texteditor.Options.ShowFoldMargin = false;
-			texteditor.Options.ShowIconMargin = false;
-			texteditor.Options.ShowLineNumberMargin = false;
-			texteditor.Document.ReadOnly = true;
-			texteditor.Document.MimeType = CSharpFormatter.MimeType;
+			var options = DefaultSourceEditorOptions.Instance;
+			texteditor.Options = DefaultSourceEditorOptions.PlainEditor;
+			texteditor.IsReadOnly = true;
+			texteditor.MimeType = CSharpFormatter.MimeType;
 			scrolledwindow.Child = texteditor;
 			ShowAll ();
 			
 			#region Indent options
-			indentOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+			indentationOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
 			
 			var column = new TreeViewColumn ();
 			// pixbuf column
@@ -495,7 +151,7 @@ namespace TestSpace {
 			column.PackStart (cellRendererText, true);
 			column.SetAttributes (cellRendererText, "text", 1);
 			 
-			treeviewIndentOptions.Model = indentOptions;
+			treeviewIndentOptions.Model = indentationOptions;
 			treeviewIndentOptions.HeadersVisible = false;
 			treeviewIndentOptions.Selection.Changed += TreeSelectionChanged;
 			treeviewIndentOptions.AppendColumn (column);
@@ -509,7 +165,7 @@ namespace TestSpace {
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
 
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, indentOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, indentationOptions).ComboboxEdited;
 			
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -518,58 +174,23 @@ namespace TestSpace {
 			var cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Ypad = 1;
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewIndentOptions, indentOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewIndentOptions, indentationOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
-			
 			treeviewIndentOptions.AppendColumn (column);
-			var category = AddOption (indentOptions, null, GettextCatalog.GetString ("Declarations"), null);
-			AddOption (indentOptions, category, "IndentNamespaceBody", GettextCatalog.GetString ("within namespaces"), "namespace Test { class AClass {} }");
-			
-			AddOption (indentOptions, category, "IndentClassBody", GettextCatalog.GetString ("within classes"), "class AClass { int aField; void AMethod () {}}");
-			AddOption (indentOptions, category, "IndentInterfaceBody", GettextCatalog.GetString ("within interfaces"), "interface IAInterfaces { int AProperty {get;set;} void AMethod ();}");
-			AddOption (indentOptions, category, "IndentStructBody", GettextCatalog.GetString ("within structs"), "struct AStruct { int aField; void AMethod () {}}");
-			AddOption (indentOptions, category, "IndentEnumBody", GettextCatalog.GetString ("within enums"), "enum AEnum { A, B, C }");
-			
-			AddOption (indentOptions, category, "IndentMethodBody", GettextCatalog.GetString ("within methods"), methodSpaceExample);
-			AddOption (indentOptions, category, "IndentPropertyBody", GettextCatalog.GetString ("within properties"), propertyExample);
-			AddOption (indentOptions, category, "IndentEventBody", GettextCatalog.GetString ("within events"), eventExample);
-			
-			category = AddOption (indentOptions, null, GettextCatalog.GetString ("Statements"), null);
-			AddOption (indentOptions, category, "IndentBlocks", GettextCatalog.GetString ("within blocks"), spaceExample);
-			AddOption (indentOptions, category, "IndentSwitchBody", GettextCatalog.GetString ("Indent 'switch' body"), spaceExample);
-			AddOption (indentOptions, category, "IndentCaseBody", GettextCatalog.GetString ("Indent 'case' body"), spaceExample);
-			AddOption (indentOptions, category, "IndentBreakStatements", GettextCatalog.GetString ("Indent 'break' statements"), spaceExample);
-			AddOption (indentOptions, category, "IndentPreprocessorDirectives", GettextCatalog.GetString ("Indent pre processor directives"), 
-				@"#define DEBUG
-class Test {
-	#if DEBUG
-	void Example ()
-	{
-	}
-	#endif
-}
-");
 
-			AddOption (indentOptions, category, "IndentBlocksInsideExpressions", GettextCatalog.GetString ("Indent blocks inside expressions"), 
-				@"
-class Test
-{
-	void Example ()
-	{
-		Test(delegate {
-			Call ();
-		});
-	}
-}
-");
-			AddOption (indentOptions, category, "AlignEmbeddedStatements", GettextCatalog.GetString ("Align embedded statements"), "class AClass { void AMethod () { if (a) if (b) { int c; } } } ");
+
+			AddOption (indentationOptions, "IndentBlock", GettextCatalog.GetString ("Indent block contents"), "namespace Test { class AClass { void Method () { int x; int y; } } }");
+			AddOption (indentationOptions, "IndentBraces", GettextCatalog.GetString ("Indent open and close braces"), "class AClass { int aField; void AMethod () {}}");
+			AddOption (indentationOptions, "IndentSwitchSection", GettextCatalog.GetString ("Indent switch sections"), "class AClass { void Method (int x) { switch (x) { case 1: break; } } }");
+			AddOption (indentationOptions, "IndentSwitchCaseSection", GettextCatalog.GetString ("Indent case sections"), "class AClass { void Method (int x) { switch (x) { case 1: break; } } }");
+			AddOption (indentationOptions, "LabelPositioning", GettextCatalog.GetString ("Label indentation"), "enum AEnum { A, B, C }");
 			treeviewIndentOptions.ExpandAll ();
 			#endregion
 			
-			#region Brace options
-			bacePositionOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+			#region New line options
+			newLineOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
 			
 			column = new TreeViewColumn ();
 			// pixbuf column
@@ -582,10 +203,10 @@ class Test
 			column.PackStart (cellRendererText, true);
 			column.SetAttributes (cellRendererText, "text", 1);
 			
-			treeviewBracePositions.Model = bacePositionOptions;
-			treeviewBracePositions.HeadersVisible = false;
-			treeviewBracePositions.Selection.Changed += TreeSelectionChanged;
-			treeviewBracePositions.AppendColumn (column);
+			treeviewNewLines.Model = newLineOptions;
+			treeviewNewLines.HeadersVisible = false;
+			treeviewNewLines.Selection.Changed += TreeSelectionChanged;
+			treeviewNewLines.AppendColumn (column);
 			
 			column = new TreeViewColumn ();
 			cellRendererCombo = new CellRendererCombo ();
@@ -595,7 +216,7 @@ class Test
 			cellRendererCombo.Model = ComboBoxStore;
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, bacePositionOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, newLineOptions).ComboboxEdited;
 
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -604,49 +225,126 @@ class Test
 			cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
 			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewBracePositions, bacePositionOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewNewLines, newLineOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
 			
-			treeviewBracePositions.AppendColumn (column);
-			
-			AddOption (bacePositionOptions, "NamespaceBraceStyle", GettextCatalog.GetString ("Namespace declaration"), "namespace TestNameSpace {}");
-			
-			AddOption (bacePositionOptions, "ClassBraceStyle", GettextCatalog.GetString ("Class declaration"), "class ClassDeclaration {}");
-			AddOption (bacePositionOptions, "InterfaceBraceStyle", GettextCatalog.GetString ("Interface declaration"), "interface InterfaceDeclaraction {}");
-			AddOption (bacePositionOptions, "StructBraceStyle", GettextCatalog.GetString ("Struct declaration"), "struct StructDeclaration {}");
-			AddOption (bacePositionOptions, "EnumBraceStyle", GettextCatalog.GetString ("Enum declaration"), "enum EnumDeclaration { A, B, C}");
-			
-			AddOption (bacePositionOptions, "MethodBraceStyle", GettextCatalog.GetString ("Method declaration"), "class ClassDeclaration { void MyMethod () {} }");
-			AddOption (bacePositionOptions, "AnonymousMethodBraceStyle", GettextCatalog.GetString ("Anonymous methods"), "class ClassDeclaration { void MyMethod () { MyEvent += delegate (object sender, EventArgs e) { if (true) Console.WriteLine (\"Hello World\"); }; } }");
-			AddOption (bacePositionOptions, "ConstructorBraceStyle", GettextCatalog.GetString ("Constructor declaration"), "class ClassDeclaration { public ClassDeclaration () {} }");
-			AddOption (bacePositionOptions, "DestructorBraceStyle", GettextCatalog.GetString ("Destructor declaration"), "class ClassDeclaration { ~ClassDeclaration () {} }");
-			
-			AddOption (bacePositionOptions, "StatementBraceStyle", GettextCatalog.GetString ("Statements"), spaceExample);
-			
-			category = AddOption (bacePositionOptions, "PropertyBraceStyle", GettextCatalog.GetString ("Property declaration"), propertyExample);
-			AddOption (bacePositionOptions, category, "AutoPropertyFormatting", GettextCatalog.GetString ("Allow automatic property in one line"), propertyExample);
-			AddOption (bacePositionOptions, category, "SimplePropertyFormatting", GettextCatalog.GetString ("Allow simple property in one line"), propertyExample);
+			treeviewNewLines.AppendColumn (column);
+
+			var category = AddOption (newLineOptions, null, GettextCatalog.GetString ("New line options for braces"), null);
+			AddOption (newLineOptions, category, "NewLinesForBracesInTypes", GettextCatalog.GetString ("Place open brace on new line for types"), @"class Example
+{
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInMethods", GettextCatalog.GetString ("Place open brace on new line for methods"), @"void Example()
+{
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInProperties", GettextCatalog.GetString ("Place open brace on new line for properties"), @"int Example { 
+	get  { 
+		return 1;
+	}
+	set {
+		// nothing
+	}
+}
+"
+);
 
+			AddOption (newLineOptions, category, "NewLinesForBracesInAccessors", GettextCatalog.GetString ("Place open brace on new line for property accessors"), @"int Example { 
+	get  { 
+		return 1;
+	}
+	set {
+		// nothing
+	}
+}
+"
+);
 
-			AddOption (bacePositionOptions, category, "PropertyGetBraceStyle", GettextCatalog.GetString ("Get declaration"), propertyExample);
-			AddOption (bacePositionOptions, category, "SimpleGetBlockFormatting", GettextCatalog.GetString ("Allow one line get"), propertyExample);
-			AddOption (bacePositionOptions, category, "PropertySetBraceStyle", GettextCatalog.GetString ("Set declaration"), propertyExample);
-			AddOption (bacePositionOptions, category, "SimpleSetBlockFormatting", GettextCatalog.GetString ("Allow one line set"), propertyExample);
-			
-			
-			category = AddOption (bacePositionOptions, "EventBraceStyle", GettextCatalog.GetString ("Event declaration"), eventExample);
-			AddOption (bacePositionOptions, category, "EventAddBraceStyle", GettextCatalog.GetString ("Add declaration"), eventExample);
-			AddOption (bacePositionOptions, category, "AllowEventAddBlockInline", GettextCatalog.GetString ("Allow one line add"), eventExample);
-			AddOption (bacePositionOptions, category, "EventRemoveBraceStyle", GettextCatalog.GetString ("Remove declaration"), eventExample);
-			AddOption (bacePositionOptions, category, "AllowEventRemoveBlockInline", GettextCatalog.GetString ("Allow one line remove"), eventExample);
-			
-			treeviewBracePositions.ExpandAll ();
+
+			AddOption (newLineOptions, category, "NewLinesForBracesInAnonymousMethods", GettextCatalog.GetString ("Place open brace on new line for anonymous methods"), @"void Example()
+{
+	var del = new delegate (int i, int j) {
+	};
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInControlBlocks", GettextCatalog.GetString ("Place open brace on new line for control blocks"), @"void Example()
+{
+	if (true)
+	{
+	}
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInAnonymousTypes", GettextCatalog.GetString ("Place open brace on new line for anonymous types"), @"void Example()
+{
+	var c = new
+	{
+		A = 1,
+		B = 2
+	};
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInObjectCollectionArrayInitializers", GettextCatalog.GetString ("Place open brace on new line for object initializers"), @"void Example()
+{
+	new MyObject
+	{
+		A = 1,
+		B = 2 
+	};
+}");
+			AddOption (newLineOptions, category, "NewLinesForBracesInLambdaExpressionBody", GettextCatalog.GetString ("Place open brace on new line for lambda expression"), @"void Example()
+{
+	Action act = () =>
+	{
+	};
+}");
+
+			category = AddOption (newLineOptions, null, GettextCatalog.GetString ("New line options for keywords"), null);
+			AddOption (newLineOptions, category, "NewLineForElse", GettextCatalog.GetString ("Place \"else\" on new line"), @"void Example()
+{
+	if (true) {
+		// ...
+	} else {
+		// ...
+	}
+}");
+			AddOption (newLineOptions, category, "NewLineForCatch", GettextCatalog.GetString ("Place \"catch\" on new line"), @"void Example()
+{
+	try {
+	} catch {
+	} finally {
+	}
+}");
+			AddOption (newLineOptions, category, "NewLineForFinally", GettextCatalog.GetString ("Place \"finally\" on new line"), @"void Example()
+{
+	try {
+	} catch {
+	} finally {
+	}
+}");
+
+			category = AddOption (newLineOptions, null, GettextCatalog.GetString ("New line options for expressions"), null);
+			AddOption (newLineOptions, category, "NewLineForMembersInObjectInit", GettextCatalog.GetString ("Place members in object initializers on new line"), @"void Example()
+{
+	new MyObject {
+		A = 1,
+		B = 2
+	};
+}");
+			AddOption (newLineOptions, category, "NewLineForMembersInAnonymousTypes", GettextCatalog.GetString ("Place members in anonymous types on new line"), @"void Example()
+{
+	var c = new
+	{
+		A = 1,
+		B = 2
+	};
+}");
+			AddOption (newLineOptions, category, "NewLineForClausesInQuery", GettextCatalog.GetString ("Place query expression clauses on new line"), @"void Example()
+{
+	from o in col select o.Foo;
+}");
+			treeviewNewLines.ExpandAll ();
 			#endregion
 			
-			#region New line options
-			newLineOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+			#region Spacing options
+			spacingOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
 
 			column = new TreeViewColumn ();
 			// pixbuf column
@@ -658,10 +356,10 @@ class Test
 			column.PackStart (cellRendererText, true);
 			column.SetAttributes (cellRendererText, "text", 1);
 
-			treeviewNewLines.Model = newLineOptions;
-			treeviewNewLines.HeadersVisible = false;
-			treeviewNewLines.Selection.Changed += TreeSelectionChanged;
-			treeviewNewLines.AppendColumn (column);
+			treeviewSpacing.Model = spacingOptions;
+			treeviewSpacing.HeadersVisible = false;
+			treeviewSpacing.Selection.Changed += TreeSelectionChanged;
+			treeviewSpacing.AppendColumn (column);
 
 			column = new TreeViewColumn ();
 			cellRendererCombo = new CellRendererCombo ();
@@ -671,7 +369,7 @@ class Test
 			cellRendererCombo.Model = ComboBoxStore;
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, newLineOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, spacingOptions).ComboboxEdited;
 
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -680,63 +378,137 @@ class Test
 			cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
 			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewNewLines, newLineOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewSpacing, spacingOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
 
-			treeviewNewLines.AppendColumn (column);
+			treeviewSpacing.AppendColumn (column);
 
-			AddOption (newLineOptions, "ElseNewLinePlacement", GettextCatalog.GetString ("Place 'else' on new line"), simpleIf);
-			AddOption (newLineOptions, "ElseIfNewLinePlacement", GettextCatalog.GetString ("Place 'else if' on new line"), simpleIf);
-			AddOption (newLineOptions, "CatchNewLinePlacement", GettextCatalog.GetString ("Place 'catch' on new line"), simpleCatch);
-			AddOption (newLineOptions, "FinallyNewLinePlacement", GettextCatalog.GetString ("Place 'finally' on new line"), simpleCatch);
-			AddOption (newLineOptions, "WhileNewLinePlacement", GettextCatalog.GetString ("Place 'while' on new line"), simpleDoWhile);
-			AddOption (newLineOptions, "ArrayInitializerWrapping", GettextCatalog.GetString ("Place array initializers on new line"), simpleArrayInitializer);
-			AddOption (newLineOptions, "EmbeddedStatementPlacement", GettextCatalog.GetString ("Place embedded statements on new line"), @"class Test
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for method declarations"), null);
+			AddOption (spacingOptions, category, "SpacingAfterMethodDeclarationName", GettextCatalog.GetString ("Insert space between method name and its opening parenthesis"), 
+				@"void Example()
+{
+}");
+
+			AddOption (spacingOptions, category, "SpaceWithinMethodDeclarationParenthesis", GettextCatalog.GetString ("Insert space within argument list parentheses"), 
+				@"void Example(int i, int j)
 {
-	public void Example ()
-	{
-		if (true)
-			Call ();
-		
-		foreach (var o in col) DoSomething (o);
-	}
 }");
-			string constructorInitializer=@"class Test
+			AddOption (spacingOptions, category, "SpaceBetweenEmptyMethodDeclarationParentheses", GettextCatalog.GetString ("Insert space within empty argument list parentheses"), @"void Example()
 {
+}");
 
-	public Test () : base ()
-	{
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for method calls"), null);
+			AddOption (spacingOptions, category, "SpaceAfterMethodCallName", GettextCatalog.GetString ("Insert space between method name and its opening parenthesis"), @"void Example()
+{
+	Test();
+}");
+			AddOption (spacingOptions, category, "SpaceWithinMethodCallParentheses", GettextCatalog.GetString ("Insert space within argument list parentheses"), @"void Example()
+{
+	Test(1, 2);
+}");
+			AddOption (spacingOptions, category, "SpaceBetweenEmptyMethodCallParentheses", GettextCatalog.GetString ("Insert space within empty argument list parentheses"), @"void Example()
+{
+	Test();
+}");
 
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set other spacing options"), null);
+			AddOption (spacingOptions, category, "SpaceAfterControlFlowStatementKeyword", GettextCatalog.GetString ("Insert space after keywords in control flow statements"), @"void Example()
+{
+	if (condition)
+	{
 	}
+}");
 
-	public Test ()
-		: base ()
+			AddOption (spacingOptions, category, "SpaceWithinExpressionParentheses", GettextCatalog.GetString ("Insert space within parentheses of expressions"), @"void Example()
+{
+	i = (5 + 3) * 2;
+}");
+			AddOption (spacingOptions, category, "SpaceWithinCastParentheses", GettextCatalog.GetString ("Insert space within parentheses of type casts"), @"void Example()
+{
+	test = (ITest)o;
+}");
+			AddOption (spacingOptions, category, "SpaceWithinOtherParentheses", GettextCatalog.GetString ("Insert space within parentheses of control flow statements"), @"void Example()
+{
+	if (condition)
 	{
-
 	}
+}");
 
-	public Test () :
-		base ()
-	{
+			AddOption (spacingOptions, category, "SpaceAfterCast", GettextCatalog.GetString ("Insert space after casts"), @"void Example()
+{
+	test = (ITest)o;
+}");
+			AddOption (spacingOptions, category, "SpacesIgnoreAroundVariableDeclaration", GettextCatalog.GetString ("Ignore spaces in declaration statements"), @"void Example()
+{
+	int x=5;
+}");
 
-	}
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for brackets"), null);
+			AddOption (spacingOptions, category, "SpaceBeforeOpenSquareBracket", GettextCatalog.GetString ("Insert space before open square bracket"), @"void Example()
+{
+	i[5] = 3;
+}");
+			AddOption (spacingOptions, category, "SpaceBetweenEmptySquareBrackets", GettextCatalog.GetString ("Insert space within empty square brackets"), @"void Example()
+{
+	new int[] {1, 2};
+}");
+			AddOption (spacingOptions, category, "SpaceWithinSquareBrackets", GettextCatalog.GetString ("Insert space within square brackets"), @"void Example()
+{
+	i[5] = 3;
+}");
 
-	public Test ()
-		:
-		base ()
+			category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for brackets"), null);
+			AddOption (spacingOptions, category, "SpaceAfterColonInBaseTypeDeclaration", GettextCatalog.GetString ("Insert space after colon for base or interface in type declaration"), @"class Foo : Bar
+{
+}");
+			AddOption (spacingOptions, category, "SpaceAfterComma", GettextCatalog.GetString ("Insert space after comma"), @"void Example()
+{
+	for (int i =0; i < 10, i >5;i++)
 	{
-
 	}
-}";
-			AddOption (newLineOptions, "NewLineBeforeConstructorInitializerColon", GettextCatalog.GetString("Place constructor initializer ':' on new line"), constructorInitializer);
-			AddOption (newLineOptions, "NewLineAfterConstructorInitializerColon", GettextCatalog.GetString("Place constructor initializer 'base/this' on new line"), constructorInitializer);
-			treeviewNewLines.ExpandAll ();
+}");
+			AddOption (spacingOptions, category, "SpaceAfterDot", GettextCatalog.GetString ("Insert space after dot"), @"void Example()
+{
+	Foo.Bar.Test();
+}");
+			AddOption (spacingOptions, category, "SpaceAfterSemicolonsInForStatement", GettextCatalog.GetString ("Insert space after semicolon in \"for\" statement"), @"void Example()
+{
+	for (int i = 0; i< 10; i++)
+	{
+	}
+}");
+			AddOption (spacingOptions, category, "SpaceBeforeColonInBaseTypeDeclaration", GettextCatalog.GetString ("Insert space before colon for base or interface in type declaration"), @"class Foo : Bar
+{
+}");
+			AddOption (spacingOptions, category, "SpaceBeforeComma", GettextCatalog.GetString ("Insert space before comma"), @"void Example()
+{
+	for (int i =0; i < 10, i >5;i++)
+	{
+	}
+}");
+			AddOption (spacingOptions, category, "SpaceBeforeDot", GettextCatalog.GetString ("Insert space before dot"), @"void Example()
+{
+	Foo.Bar.Test();
+}");
+			AddOption (spacingOptions, category, "SpaceBeforeSemicolonsInForStatement", GettextCatalog.GetString ("Insert space before semicolon in \"for\" statement"), @"void Example()
+{
+	for (int i = 0; i< 10; i++)
+	{
+	}
+}");
+
+			AddOption (spacingOptions, category, "SpacingAroundBinaryOperator", GettextCatalog.GetString ("Set spacing for operators"), @"void Example()
+{
+	i = (5 + 3) * 2;
+}");
+
+			treeviewSpacing.ExpandAll ();
 			#endregion
-			
-			#region Wrapping options
-			wrappingOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+
+			#region Style options
+			styleOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
 
 			column = new TreeViewColumn ();
 			// pixbuf column
@@ -749,10 +521,10 @@ class Test
 			column.SetAttributes (cellRendererText, "text", 1);
 
 
-			treeviewWrappingCategory.Model = wrappingOptions;
-			treeviewWrappingCategory.HeadersVisible = false;
-			treeviewWrappingCategory.Selection.Changed += TreeSelectionChanged;
-			treeviewWrappingCategory.AppendColumn (column);
+			treeviewStyle.Model = styleOptions;
+			treeviewStyle.HeadersVisible = false;
+			treeviewStyle.Selection.Changed += TreeSelectionChanged;
+			treeviewStyle.AppendColumn (column);
 
 			column = new TreeViewColumn ();
 			cellRendererCombo = new CellRendererCombo ();
@@ -762,7 +534,7 @@ class Test
 			cellRendererCombo.Model = ComboBoxStore;
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, wrappingOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, styleOptions).ComboboxEdited;
 
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -771,59 +543,39 @@ class Test
 			cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
 			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewNewLines, wrappingOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewSpacing, styleOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
 
-			treeviewWrappingCategory.AppendColumn (column);
-
-			category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Method declarations"), null);
-			AddOption (wrappingOptions, category, "MethodDeclarationParameterWrapping", GettextCatalog.GetString ("Parameters"), longMethodDeclaration);
-			AddOption (wrappingOptions, category, "NewLineAferMethodDeclarationOpenParentheses", GettextCatalog.GetString ("New line after open parentheses"), longMethodDeclaration);
-			AddOption (wrappingOptions, category, "MethodDeclarationClosingParenthesesOnNewLine", GettextCatalog.GetString ("New line before closing parentheses"), longMethodDeclaration);
-			AddOption (wrappingOptions, category, "AlignToFirstMethodDeclarationParameter", GettextCatalog.GetString ("Align to first parameter"), longMethodDeclaration);
+			treeviewStyle.AppendColumn (column);
 
-			category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Method calls"), null);
-			AddOption (wrappingOptions, category, "MethodCallArgumentWrapping", GettextCatalog.GetString ("Arguments"), longMethodCall);
-			AddOption (wrappingOptions, category, "NewLineAferMethodCallOpenParentheses", GettextCatalog.GetString ("New line after open parentheses"), longMethodCall);
-			AddOption (wrappingOptions, category, "MethodCallClosingParenthesesOnNewLine", GettextCatalog.GetString ("New line before closing parentheses"), longMethodCall);
-			AddOption (wrappingOptions, category, "AlignToFirstMethodCallArgument", GettextCatalog.GetString ("Align to first argument"), longMethodCall);
+			AddOption (styleOptions, "PlaceSystemDirectiveFirst", GettextCatalog.GetString ("Place System directives first when sorting usings"), "");
 
-			category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Indexer declarations"), null);
-			AddOption (wrappingOptions, category, "IndexerDeclarationParameterWrapping", GettextCatalog.GetString ("Parameters"), longIndexerDeclaration);
-			AddOption (wrappingOptions, category, "NewLineAferIndexerDeclarationOpenBracket", GettextCatalog.GetString ("New line after open parentheses"), longIndexerDeclaration);
-			AddOption (wrappingOptions, category, "IndexerDeclarationClosingBracketOnNewLine", GettextCatalog.GetString ("New line before closing parentheses"), longIndexerDeclaration);
-			AddOption (wrappingOptions, category, "AlignToFirstIndexerDeclarationParameter", GettextCatalog.GetString ("Align to first parameter"), longIndexerDeclaration);
+			// AddOption (styleOptions, category, null, GettextCatalog.GetString ("Qualify member access with 'this'"), null);
+			// AddOption (styleOptions, category, null, GettextCatalog.GetString ("Use 'var' when generating locals"), null);
 
-			category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Indexer usage"), null);
-			AddOption (wrappingOptions, category, "IndexerArgumentWrapping", GettextCatalog.GetString ("Arguments"), longIndexer);
-			AddOption (wrappingOptions, category, "NewLineAferIndexerOpenBracket", GettextCatalog.GetString ("New line after open bracket"), longIndexer);
-			AddOption (wrappingOptions, category, "IndexerClosingBracketOnNewLine", GettextCatalog.GetString ("New line before closing bracket"), longIndexer);
-			AddOption (wrappingOptions, category, "AlignToFirstIndexerArgument", GettextCatalog.GetString ("Align to first parameter"), longIndexer);
-
-			treeviewWrappingCategory.ExpandAll ();
+			treeviewStyle.ExpandAll ();
 			#endregion
 
-			#region White space options
-			whiteSpaceOptions = new TreeStore (typeof (string), typeof (string), typeof (string), typeof(bool), typeof(bool));
-			
-			
+			#region Wrapping options
+			wrappingOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+
 			column = new TreeViewColumn ();
 			// pixbuf column
 			column.PackStart (pixbufCellRenderer, false);
 			column.SetCellDataFunc (pixbufCellRenderer, RenderIcon);
-			
+
 			// text column
 			cellRendererText.Ypad = 1;
 			column.PackStart (cellRendererText, true);
 			column.SetAttributes (cellRendererText, "text", 1);
-			
-			treeviewInsertWhiteSpaceCategory.Model = whiteSpaceOptions;
-			treeviewInsertWhiteSpaceCategory.HeadersVisible = false;
-			treeviewInsertWhiteSpaceCategory.Selection.Changed += TreeSelectionChanged;
-			treeviewInsertWhiteSpaceCategory.AppendColumn (column);
-			
+
+			treeviewWrapping.Model = wrappingOptions;
+			treeviewWrapping.HeadersVisible = false;
+			treeviewWrapping.Selection.Changed += TreeSelectionChanged;
+			treeviewWrapping.AppendColumn (column);
+
 			column = new TreeViewColumn ();
 			cellRendererCombo = new CellRendererCombo ();
 			cellRendererCombo.Ypad = 1;
@@ -832,334 +584,26 @@ class Test
 			cellRendererCombo.Model = ComboBoxStore;
 			cellRendererCombo.HasEntry = false;
 			cellRendererCombo.Editable = !profile.IsBuiltIn;
-			cellRendererCombo.Edited += new ComboboxEditedHandler (this, whiteSpaceOptions).ComboboxEdited;
+			cellRendererCombo.Edited += new ComboboxEditedHandler (this, wrappingOptions).ComboboxEdited;
 
 			column.PackStart (cellRendererCombo, false);
 			column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
 			column.SetCellDataFunc (cellRendererCombo, ComboboxDataFunc);
-			
+
 			cellRendererToggle = new CellRendererToggle ();
 			cellRendererToggle.Activatable = !profile.IsBuiltIn;
 			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewInsertWhiteSpaceCategory, whiteSpaceOptions).Toggled;
+			cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewSpacing, wrappingOptions).Toggled;
 			column.PackStart (cellRendererToggle, false);
 			column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
 			column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
-			
-			treeviewInsertWhiteSpaceCategory.AppendColumn (column);
-			
-			string example = @"class Example {
-		void Test ()
-		{
-		}
-		
-		void Test (int a, int b, int c)
-		{
-		}
-}";
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Declarations"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeMethodDeclarationParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinMethodDeclarationParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyMethodDeclarationParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeMethodDeclarationParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterMethodDeclarationParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			example = @"class Example {
-		int a, b, c;
-}";
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Fields"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeFieldDeclarationComma", GettextCatalog.GetString ("before comma in multiple field declarations"), example);
-			AddOption (whiteSpaceOptions, category, "AfterFieldDeclarationComma", GettextCatalog.GetString ("after comma in multiple field declarations"), example);
-			
-			example = @"class Example {
-	Example () 
-	{
-	}
-
-	Example (int a, int b, int c) 
-	{
-	}
-}";
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Constructors"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeConstructorDeclarationParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinConstructorDeclarationParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyConstructorDeclarationParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeConstructorDeclarationParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterConstructorDeclarationParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			example = @"class Example {
-	public int this[int a, int b] {
-		get {
-			return a + b;
-		}
-	}
-}";
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Indexer"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeIndexerDeclarationBracket", GettextCatalog.GetString ("before opening bracket"), example);
-			AddOption (whiteSpaceOptions, category, "WithinIndexerDeclarationBracket", GettextCatalog.GetString ("within brackets"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeIndexerDeclarationParameterComma", GettextCatalog.GetString ("before comma in brackets"), example);
-			AddOption (whiteSpaceOptions, category, "AfterIndexerDeclarationParameterComma", GettextCatalog.GetString ("after comma in brackets"), example);
-			
-			example = @"delegate void FooBar (int a, int b, int c);
-delegate void BarFoo ();
-";
-			
-			category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Delegates"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeDelegateDeclarationParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinDelegateDeclarationParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyDelegateDeclarationParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeDelegateDeclarationParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterDelegateDeclarationParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			var upperCategory = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Statements"), null);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'if'"), simpleIf);
-			AddOption (whiteSpaceOptions, category, "IfParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleIf);
-			AddOption (whiteSpaceOptions, category, "WithinIfParentheses", GettextCatalog.GetString ("within parenthesis"), simpleIf);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'while'"), simpleWhile);
-			AddOption (whiteSpaceOptions, category, "WhileParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleWhile);
-			AddOption (whiteSpaceOptions, category, "WithinWhileParentheses", GettextCatalog.GetString ("within parenthesis"), simpleWhile);
-
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'for'"), simpleFor);
-			AddOption (whiteSpaceOptions, category, "ForParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleFor);
-			AddOption (whiteSpaceOptions, category, "WithinForParentheses", GettextCatalog.GetString ("within parenthesis"), simpleFor);
-			AddOption (whiteSpaceOptions, category, "SpacesBeforeForSemicolon", GettextCatalog.GetString ("before semicolon"), simpleFor);
-			AddOption (whiteSpaceOptions, category, "SpacesAfterForSemicolon", GettextCatalog.GetString ("after semicolon"), simpleFor);
-
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'foreach'"), simpleForeach);
-			AddOption (whiteSpaceOptions, category, "ForeachParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleForeach);
-			AddOption (whiteSpaceOptions, category, "WithinForEachParentheses", GettextCatalog.GetString ("within parenthesis"), simpleForeach);
-
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'catch'"), simpleCatch);
-			AddOption (whiteSpaceOptions, category, "CatchParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleCatch);
-			AddOption (whiteSpaceOptions, category, "WithinCatchParentheses", GettextCatalog.GetString ("within parenthesis"), simpleCatch);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'switch'"), switchExample);
-			AddOption (whiteSpaceOptions, category, "SwitchParentheses", GettextCatalog.GetString ("before opening parenthesis"), switchExample);
-			AddOption (whiteSpaceOptions, category, "WithinSwitchParentheses", GettextCatalog.GetString ("within parenthesis"), switchExample);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'lock'"), simpleLock);
-			AddOption (whiteSpaceOptions, category, "LockParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleLock);
-			AddOption (whiteSpaceOptions, category, "WithinLockParentheses", GettextCatalog.GetString ("within parenthesis"), simpleLock);
-
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'using'"), simpleUsingStatement);
-			AddOption (whiteSpaceOptions, category, "UsingParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleUsingStatement);
-			AddOption (whiteSpaceOptions, category, "WithinUsingParentheses", GettextCatalog.GetString ("within parenthesis"), simpleUsingStatement);
-			
-			
-			upperCategory = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Expressions"), null);
-			
-			example = @"class Example {
-		void Test ()
-		{
-			Console.WriteLine();
-			Console.WriteLine(""{0} {1}!"", ""Hello"", ""World"");
-		}
-}";
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Method invocations"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeMethodCallParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinMethodCallParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyMethodCallParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeMethodCallParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterMethodCallParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Object creation"), example);
-			example = @"partial class Example {
-		void Test ()
-		{
-			var anExample = new Example (1, 2, 3);
-			var emptyExample = new Example ();
-		}
-}";
-			AddOption (whiteSpaceOptions, category, "NewParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinNewParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BetweenEmptyNewParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeNewParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "AfterNewParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-			
-			
-			example = @"class Example {
-		void Test ()
-		{
-			a[1,2] = b[3];
-		}
-}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Element access"), example);
-			AddOption (whiteSpaceOptions, category, "SpacesBeforeBrackets", GettextCatalog.GetString ("before opening bracket"), example);
-			AddOption (whiteSpaceOptions, category, "SpacesWithinBrackets", GettextCatalog.GetString ("within brackets"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeBracketComma", GettextCatalog.GetString ("before comma in brackets"), example);
-			AddOption (whiteSpaceOptions, category, "AfterBracketComma", GettextCatalog.GetString ("after comma in brackets"), example);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Parentheses"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "WithinParentheses", GettextCatalog.GetString ("within parenthesis"), operatorExample);
-			
-			example = @"class ClassDeclaration { 
-		public void Test (object o)
-		{
-			int i = (int)o;
-		}
-	}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Type cast"), example);
-			AddOption (whiteSpaceOptions, category, "WithinCastParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "SpacesAfterTypecast", GettextCatalog.GetString ("after type cast"), example);
-			
-			example = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			int i = sizeof (ClassDeclaration);
-		}
-	}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'sizeof'"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeSizeOfParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinSizeOfParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			
-			example = @"class ClassDeclaration { 
-		public void Test ()
-		{
-			Type t = typeof (ClassDeclaration);
-		}
-	}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'typeof'"), example);
-			AddOption (whiteSpaceOptions, category, "BeforeTypeOfParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
-			AddOption (whiteSpaceOptions, category, "WithinTypeOfParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-			
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Around Operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundAssignmentParentheses", GettextCatalog.GetString ("Assignment (=, +=, -=, ...)"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundLogicalOperatorParentheses", GettextCatalog.GetString ("Logical (&&, ||) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundEqualityOperatorParentheses", GettextCatalog.GetString ("Equality (==, !=) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundRelationalOperatorParentheses", GettextCatalog.GetString ("Relational (<, >, <=, >=) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundBitwiseOperatorParentheses", GettextCatalog.GetString ("Bitwise &, |, ^, ~() operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundAdditiveOperatorParentheses", GettextCatalog.GetString ("Additive (+, -) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundMultiplicativeOperatorParentheses", GettextCatalog.GetString ("Multiplicative (*, /, %) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundShiftOperatorParentheses", GettextCatalog.GetString ("Shift (<<, >>) operators"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "AroundNullCoalescingOperator", GettextCatalog.GetString ("Null coalescing (??) operator"), operatorExample);
-			AddOption (whiteSpaceOptions, category, "SpaceAfterUnsafeAddressOfOperator", GettextCatalog.GetString ("Unsafe addressof operator (&)"), @"unsafe class ClassDeclaration { 
-	public void TestMethod ()
-	{
-		int* a = &x;
-	}
-}");
-			AddOption (whiteSpaceOptions, category, "SpaceAfterUnsafeAsteriskOfOperator", GettextCatalog.GetString ("Unsafe asterisk operator (*)"), @"unsafe class ClassDeclaration { 
-	public void TestMethod ()
-	{
-		int a = *x;
-	}
-}");
-			AddOption (whiteSpaceOptions, category, "SpaceAroundUnsafeArrowOperator", GettextCatalog.GetString ("Unsafe arrow operator (->)"), @"unsafe class ClassDeclaration { 
-	public void TestMethod ()
-	{
-		x->Foo();
-	}
-}");
 
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Conditional Operator (?:)"), condOpExample);
-			AddOption (whiteSpaceOptions, category, "ConditionalOperatorBeforeConditionSpace", GettextCatalog.GetString ("before '?'"), condOpExample);
-			AddOption (whiteSpaceOptions, category, "ConditionalOperatorAfterConditionSpace", GettextCatalog.GetString ("after '?'"), condOpExample);
-			AddOption (whiteSpaceOptions, category, "ConditionalOperatorBeforeSeparatorSpace", GettextCatalog.GetString ("before ':'"), condOpExample);
-			AddOption (whiteSpaceOptions, category, "ConditionalOperatorAfterSeparatorSpace", GettextCatalog.GetString ("after ':'"), condOpExample);
-			
-			example = @"class ClassDeclaration { 
-		string[][] field;
-		int[] test;
-	}";
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Array Declarations"), example);
-			AddOption (whiteSpaceOptions, category, "SpacesBeforeArrayDeclarationBrackets", GettextCatalog.GetString ("before opening bracket"), example);
+			treeviewWrapping.AppendColumn (column);
 
-			category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Other"), example);
-			AddOption (whiteSpaceOptions, category, "SpaceBeforeSemicolon", GettextCatalog.GetString ("before semicolon"), example);
-
-			/*
-			whiteSpaceOptions= new ListStore (typeof (Option), typeof (bool), typeof (bool)); 
-			column = new TreeViewColumn ();
-			// text column
-			column.PackStart (cellRendererText, true);
-			column.SetCellDataFunc (cellRendererText, delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
-				((CellRendererText)cell).Text = ((Option)model.GetValue (iter, 0)).DisplayName;
-			});
-			treeviewInsertWhiteSpaceOptions.AppendColumn (column);
-			
-			column = new TreeViewColumn ();
-			cellRendererCombo = new CellRendererCombo ();
-			cellRendererCombo.Ypad = 1;
-			cellRendererCombo.Mode = CellRendererMode.Editable;
-			cellRendererCombo.TextColumn = 1;
-			cellRendererCombo.Model = comboBoxStore;
-			cellRendererCombo.HasEntry = false;
-			cellRendererCombo.Editable = !profile.IsBuiltIn;
-
-			cellRendererCombo.Edited += delegate(object o, EditedArgs args) {
-				TreeIter iter;
-				var model = whiteSpaceOptions;
-				if (model.GetIterFromString (out iter, args.Path)) {
-					var option = (Option)model.GetValue (iter, 0);
-					PropertyInfo info = GetPropertyByName (option.PropertyName);
-					if (info == null)
-						return;
-					var value = Enum.Parse (info.PropertyType, args.NewText);
-					info.SetValue (profile, value, null);
-					UpdateExample (texteditor.Document.Text);
-				}
-			};
-			
-			column.PackStart (cellRendererCombo, false);
-			column.SetAttributes (cellRendererCombo, "visible", 2);
-			column.SetCellDataFunc (cellRendererCombo,  delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
-				((CellRendererCombo)cell).Text = GetValue (((Option)model.GetValue (iter, 0)).PropertyName).ToString ();
-			});
-			
-			cellRendererToggle = new CellRendererToggle ();
-			cellRendererToggle.Activatable = !profile.IsBuiltIn;
-			cellRendererToggle.Ypad = 1;
-			cellRendererToggle.Toggled += delegate(object o, ToggledArgs args) {
-				TreeIter iter;
-				var model = whiteSpaceOptions;
-				if (model.GetIterFromString (out iter, args.Path)) {
-					var option = (Option)model.GetValue (iter, 0);
-					PropertyInfo info = GetPropertyByName (option.PropertyName);
-					if (info == null || info.PropertyType != typeof(bool))
-						return;
-					bool value = (bool)info.GetValue (this.profile, null);
-					info.SetValue (profile, !value, null);
-					UpdateExample (texteditor.Document.Text);
-				}
-			};
-			
-			column.PackStart (cellRendererToggle, false);
-			column.SetAttributes (cellRendererToggle, "visible", 1);
-			column.SetCellDataFunc (cellRendererToggle,  delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
-				((CellRendererToggle)cell).Active = (bool)GetValue (((Option)model.GetValue (iter, 0)).PropertyName);
-			});
-			
-			treeviewInsertWhiteSpaceOptions.AppendColumn (column);
-			
-			treeviewInsertWhiteSpaceOptions.Model = whiteSpaceOptions;*/
-			treeviewInsertWhiteSpaceCategory.ExpandAll ();
-			#endregion
-			
-			#region Blank line options
-			entryBeforUsings.Text = profile.BlankLinesBeforeUsings.ToString ();
-			entryAfterUsings.Text = profile.BlankLinesAfterUsings.ToString ();
-			
-			entryBeforeFirstDeclaration.Text = profile.BlankLinesBeforeFirstDeclaration.ToString ();
-			entryBetweenTypes.Text = profile.BlankLinesBetweenTypes.ToString ();
-			
-			entryBetweenFields.Text = profile.BlankLinesBetweenFields.ToString ();
-			entryBetweenEvents.Text = profile.BlankLinesBetweenEventFields.ToString ();
-			entryBetweenMembers.Text = profile.BlankLinesBetweenMembers.ToString ();
-			entryInsideRegion.Text = profile.BlankLinesInsideRegion.ToString ();
-			entryAroundRegion.Text = profile.BlankLinesAroundRegion.ToString ();
+			AddOption (wrappingOptions, "WrappingPreserveSingleLine", GettextCatalog.GetString ("Leave block on single line"), "");
+			AddOption (wrappingOptions, "WrappingKeepStatementsOnSingleLine", GettextCatalog.GetString ("Leave statements and member declarations on the same line"), "");
 
-			entryBeforUsings.Changed += HandleEntryBeforUsingsChanged;
-			entryAfterUsings.Changed += HandleEntryBeforUsingsChanged;
-			entryBeforeFirstDeclaration.Changed += HandleEntryBeforUsingsChanged;
-			entryBetweenTypes.Changed += HandleEntryBeforUsingsChanged;
-			entryBetweenFields.Changed += HandleEntryBeforUsingsChanged;
-			entryBetweenEvents.Changed += HandleEntryBeforUsingsChanged;
-			entryBetweenMembers.Changed += HandleEntryBeforUsingsChanged;
-			entryAroundRegion.Changed += HandleEntryBeforUsingsChanged;
-			entryInsideRegion.Changed += HandleEntryBeforUsingsChanged;
+			treeviewWrapping.ExpandAll ();
 			#endregion
 		}
 		
@@ -1169,20 +613,6 @@ delegate void BarFoo ();
 			return int.TryParse (entry.Text, out newValue) ? newValue : oldValue;
 		}
 
-		void HandleEntryBeforUsingsChanged (object sender, EventArgs e)
-		{
-			profile.BlankLinesBeforeUsings = SetFlag (entryBeforUsings, profile.BlankLinesBeforeUsings);
-			profile.BlankLinesAfterUsings = SetFlag (entryAfterUsings, profile.BlankLinesAfterUsings);
-			profile.BlankLinesBeforeFirstDeclaration = SetFlag (entryBeforeFirstDeclaration, profile.BlankLinesBeforeFirstDeclaration);
-			profile.BlankLinesBetweenTypes = SetFlag (entryBetweenTypes, profile.BlankLinesBetweenTypes);
-			profile.BlankLinesBetweenFields = SetFlag (entryBetweenFields, profile.BlankLinesBetweenFields);
-			profile.BlankLinesBetweenMembers = SetFlag (entryBetweenMembers, profile.BlankLinesBetweenMembers);
-			profile.BlankLinesBetweenEventFields = SetFlag (entryBetweenEvents, profile.BlankLinesBetweenMembers);
-			profile.BlankLinesAroundRegion = SetFlag (entryAroundRegion, profile.BlankLinesAroundRegion);
-			profile.BlankLinesInsideRegion = SetFlag (entryInsideRegion, profile.BlankLinesInsideRegion);
-	UpdateExample (blankLineExample);
-		}
-		
 		static PropertyInfo GetPropertyByName (string name)
 		{
 			PropertyInfo info = typeof(CSharpFormattingPolicy).GetProperty (name);
@@ -1190,8 +620,7 @@ delegate void BarFoo ();
 				throw new Exception (name + " property not found");
 			return info;
 		}
-		
-		
+
 		static TreeIter AddOption (TreeStore model, string propertyName, string displayName, string example)
 		{
 			bool isBool = false;
@@ -1247,7 +676,10 @@ delegate void BarFoo ();
 			} else {
 				text = "";
 			}
-			texteditor.Document.Text = CSharpFormatter.FormatText (profile, null, CSharpFormatter.MimeType, text, 0, text.Length);
+
+			var types = DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+			var textPolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
+			texteditor.Text = CSharpFormatter.FormatText (profile, textPolicy, text, 0, text.Length);
 		}
 		
 		static PropertyInfo GetProperty (TreeModel model, TreeIter iter)
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpIndentVirtualSpaceManager.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpIndentVirtualSpaceManager.cs
index 0782defa74..2970e88724 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpIndentVirtualSpaceManager.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpIndentVirtualSpaceManager.cs
@@ -24,62 +24,44 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
 using System;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.CSharp.Formatting
 {
-	class IndentVirtualSpaceManager : IIndentationTracker
+	class IndentVirtualSpaceManager : IndentationTracker
 	{
-		readonly TextEditorData data;
-		readonly CacheIndentEngine stateTracker;

-

-		public IndentVirtualSpaceManager(TextEditorData data, CacheIndentEngine stateTracker)
+		readonly TextEditor data;
+		readonly CacheIndentEngine stateTracker;
+
+		public IndentVirtualSpaceManager(TextEditor data, CacheIndentEngine stateTracker)
 		{
 			this.data = data;
 			this.stateTracker = stateTracker;
 		}
 
-		string GetIndentationString (DocumentLocation loc)
+		#region IndentationTracker implementation
+		public override string GetIndentationString (int lineNumber)
 		{
-			var line = data.Document.GetLine (loc.Line);
+			var line = data.GetLine (lineNumber);
 			if (line == null)
 				return "";
 			// Get context to the end of the line w/o changing the main engine's state
 			var offset = line.Offset;
-			string curIndent = line.GetIndentation (data.Document);
+			string curIndent = line.GetIndentation (data);
 			try {
-				stateTracker.Update (Math.Min (data.Length, offset + Math.Min (line.Length, loc.Column - 1)));
+				stateTracker.Update (data, Math.Min (data.Length, offset + line.Length));
 				int nlwsp = curIndent.Length;
-				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && data.Document.GetCharAt (offset + nlwsp) == '*'))
+				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && data.GetCharAt (offset + nlwsp) == '*'))
 					return stateTracker.ThisLineIndent;
 			} catch (Exception e) {
-				LoggingService.LogError ("Error while indenting at "+ loc, e); 
+				LoggingService.LogError ("Error while indenting at line " + lineNumber, e); 
 			}
 			return curIndent;
 		}
-
-		public string GetIndentationString (int lineNumber, int column)
-		{
-			return GetIndentationString (new DocumentLocation (lineNumber, column));
-		}
-
-		public string GetIndentationString (int offset)
-		{
-			return GetIndentationString (data.OffsetToLocation (offset));
-		}
-
-		public int GetVirtualIndentationColumn (int offset)
-		{
-			return 1 + GetIndentationString (offset).Length;
-		}
-		
-		public int GetVirtualIndentationColumn (int lineNumber, int column)
-		{
-			return 1 + GetIndentationString (lineNumber, column).Length;
-		}
+		#endregion
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
index fce4666569..83290e9f36 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
@@ -31,48 +31,39 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Refactoring;
-using Mono.TextEditor;
 using MonoDevelop.Ide.CodeTemplates;
-using MonoDevelop.SourceEditor;
-using ICSharpCode.NRefactory.CSharp.Completion;
-using ICSharpCode.NRefactory.Editor;
 using System.Linq;
 using System.Text;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory;
-
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Projects;
+using MonoDevelop.Core.Text;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Options;

+using MonoDevelop.Refactoring;
+

 namespace MonoDevelop.CSharp.Formatting
 {
 	class CSharpTextEditorIndentation : TextEditorExtension
 	{
-		CacheIndentEngine stateTracker;
+		internal ICSharpCode.NRefactory6.CSharp.CacheIndentEngine stateTracker;
 		int cursorPositionBeforeKeyPress;
 
-		TextEditorData textEditorData {
-			get {
-				return document.Editor;
-			}
-		}
-
-		readonly IEnumerable<string> types = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
+		readonly static IEnumerable<string> types = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
 
 		CSharpFormattingPolicy Policy {
 			get {
-				if (Document != null && Document.Project != null && Document.Project.Policies != null) {
-					return Document.Project.Policies.Get<CSharpFormattingPolicy> (types);
-				}
-				return MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types);
+				return DocumentContext.GetPolicy<CSharpFormattingPolicy> (types);
 			}
 		}
 
 		TextStylePolicy TextStylePolicy {
 			get {
-				if (Document != null && Document.Project != null && Document.Project.Policies != null) {
-					return Document.Project.Policies.Get<TextStylePolicy> (types);
-				}
-				return MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
+				return DocumentContext.GetPolicy<TextStylePolicy> (types);
 			}
 		}
 
@@ -80,64 +71,33 @@ namespace MonoDevelop.CSharp.Formatting
 
 		static CSharpTextEditorIndentation ()
 		{
-			CompletionWindowManager.WordCompleted += delegate(object sender, CodeCompletionContextEventArgs e) {
-				var editor = e.Widget as IExtensibleTextEditor;
+			CompletionWindowManager.WordCompleted += delegate (object sender, CodeCompletionContextEventArgs e) {
+				var editor = e.Widget as IServiceProvider;
 				if (editor == null)
 					return;
-				var textEditorExtension = editor.Extension;
-				while (textEditorExtension != null && !(textEditorExtension is CSharpTextEditorIndentation)) {
-					textEditorExtension = textEditorExtension.Next;
-				}
-				var extension = textEditorExtension as CSharpTextEditorIndentation;
+				var extension = editor.GetService (typeof (CSharpTextEditorIndentation)) as CSharpTextEditorIndentation;
 				if (extension == null)
 					return;
-				extension.SafeUpdateIndentEngine (extension.textEditorData.Caret.Offset);
+				extension.SafeUpdateIndentEngine (extension.Editor.CaretOffset);
 				if (extension.stateTracker.NeedsReindent)
 					extension.DoReSmartIndent ();
 			};
+
+			RefactoringService.OptionSetCreation = (editor, ctx) => {
+				var policy = ctx.Project.Policies.Get<CSharpFormattingPolicy> (types);
+				return policy.CreateOptions (editor.Options);
+			};
 		}
 
 		internal void SafeUpdateIndentEngine (int offset)
 		{
 			try {
-				stateTracker.Update (offset);
+				stateTracker.Update (Editor, offset);
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while updating the indentation engine", e);
 			}
 		}
 
-		void HandleTextPaste (int insertionOffset, string text, int insertedChars)
-		{
-			if (document.Editor.Options.IndentStyle == IndentStyle.None ||
-			    document.Editor.Options.IndentStyle == IndentStyle.Auto)
-				return;
-
-			// Just correct the start line of the paste operation - the text is already indented.
-			var curLine = Editor.GetLineByOffset (insertionOffset);
-			var curLineOffset = curLine.Offset;
-			SafeUpdateIndentEngine (curLineOffset);
-			if (!stateTracker.IsInsideOrdinaryCommentOrString) {
-				int pos = curLineOffset;
-				string curIndent = curLine.GetIndentation (textEditorData.Document);
-				int nlwsp = curIndent.Length;
-
-				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < curLine.LengthIncludingDelimiter && textEditorData.Document.GetCharAt (curLineOffset + nlwsp) == '*')) {
-					// Possibly replace the indent
-					SafeUpdateIndentEngine (curLineOffset + curLine.Length);
-					string newIndent = stateTracker.ThisLineIndent;
-					if (newIndent != curIndent) {
-						if (CompletionWindowManager.IsVisible) {
-							if (pos < CompletionWindowManager.CodeCompletionContext.TriggerOffset)
-								CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp;
-						}
-						textEditorData.Replace (pos, nlwsp, newIndent);
-						textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
-					}
-				}
-			}
-			textEditorData.FixVirtualIndentation ();
-		}
-
 		public static bool OnTheFlyFormatting {
 			get {
 				return PropertyService.Get ("OnTheFlyFormatting", true);
@@ -147,24 +107,23 @@ namespace MonoDevelop.CSharp.Formatting
 			}
 		}
 
-		void RunFormatter (DocumentLocation location)
+		void RunFormatter (MonoDevelop.Ide.Editor.DocumentLocation location)
 		{
-			if (OnTheFlyFormatting && textEditorData != null && !(textEditorData.CurrentMode is TextLinkEditMode) && !(textEditorData.CurrentMode is InsertionCursorEditMode)) {
-				OnTheFlyFormatter.Format (Document, location);
-			}
+			if (!OnTheFlyFormatting || Editor == null || Editor.EditMode != EditMode.Edit)
+				return;
+			var offset = Editor.LocationToOffset (location);
+			OnTheFlyFormatter.Format (Editor, DocumentContext, offset, offset, optionSet: optionSet);
 		}
 
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 
-
-			if (textEditorData != null) {
-				textEditorData.Options.Changed += HandleTextOptionsChanged;
+			if (Editor != null) {
+				Editor.OptionsChanged += HandleTextOptionsChanged;
 				HandleTextOptionsChanged (this, EventArgs.Empty);
-				textEditorData.Document.TextReplacing += HandleTextReplacing;
-				textEditorData.Document.TextReplaced += HandleTextReplaced;
-				textEditorData.Paste += HandleTextPaste;
+				Editor.TextChanging += HandleTextReplacing;
+				Editor.TextChanged += HandleTextReplaced;
 			}
 			if (IdeApp.Workspace != null)
 				IdeApp.Workspace.ActiveConfigurationChanged += HandleTextOptionsChanged;
@@ -172,47 +131,61 @@ namespace MonoDevelop.CSharp.Formatting
 
 		bool indentationDisabled;
 
+		public static IEnumerable<string> GetDefinedSymbols (MonoDevelop.Projects.Project project)
+		{
+			var workspace = IdeApp.Workspace;
+			if (workspace == null || project == null)
+				yield break;
+			var configuration = project.GetConfiguration (workspace.ActiveConfiguration) as DotNetProjectConfiguration;
+			if (configuration != null) {
+				foreach (string s in configuration.GetDefineSymbols ())
+					yield return s;
+				// Workaround for mcs defined symbol
+				if (configuration.TargetRuntime.RuntimeId == "Mono")
+					yield return "__MonoCS__";
+			}
+		}
+
 		void HandleTextOptionsChanged (object sender, EventArgs e)
 		{
-			var policy = Policy.CreateOptions ();
-			var options = Editor.CreateNRefactoryTextEditorOptions ();
-			options.IndentBlankLines = true;
-			IStateMachineIndentEngine indentEngine;
+			//var options = Editor.CreateNRefactoryTextEditorOptions ();
+			optionSet = Policy.CreateOptions (Editor.Options);
+			//options.IndentBlankLines = true;
+			ICSharpCode.NRefactory6.CSharp.IStateMachineIndentEngine indentEngine;
 			try {
-				var csharpIndentEngine = new CSharpIndentEngine (textEditorData.Document, options, policy);
+				var csharpIndentEngine = new ICSharpCode.NRefactory6.CSharp.CSharpIndentEngine (optionSet);
 				//csharpIndentEngine.EnableCustomIndentLevels = true;
-				foreach (var symbol in MonoDevelop.CSharp.Highlighting.CSharpSyntaxMode.GetDefinedSymbols (document.Project)) {
+				foreach (var symbol in GetDefinedSymbols (DocumentContext.Project)) {
 					csharpIndentEngine.DefineSymbol (symbol);
 				}
 				indentEngine = csharpIndentEngine;
 			} catch (Exception ex) {
 				LoggingService.LogError ("Error while creating the c# indentation engine", ex);
-				indentEngine = new NullIStateMachineIndentEngine (textEditorData.Document);
+				indentEngine = new ICSharpCode.NRefactory6.CSharp.NullIStateMachineIndentEngine ();
 			}
-			stateTracker = new CacheIndentEngine (indentEngine);
+			stateTracker = new ICSharpCode.NRefactory6.CSharp.CacheIndentEngine (indentEngine);
 			if (DefaultSourceEditorOptions.Instance.IndentStyle == IndentStyle.Auto) {
-				textEditorData.IndentationTracker = new DefaultIndentationTracker (textEditorData.Document);
+				Editor.SetIndentationTracker (null);
 			} else {
-				textEditorData.IndentationTracker = new IndentVirtualSpaceManager (textEditorData, stateTracker);
+				Editor.SetIndentationTracker (new IndentVirtualSpaceManager (Editor, stateTracker));
 			}
 
 			indentationDisabled = DefaultSourceEditorOptions.Instance.IndentStyle == IndentStyle.Auto || DefaultSourceEditorOptions.Instance.IndentStyle == IndentStyle.None;
 			if (indentationDisabled) {
-				textEditorData.TextPasteHandler = null;
+				Editor.SetTextPasteHandler (null);
 			} else {
-				textEditorData.TextPasteHandler = new TextPasteIndentEngine (stateTracker, options, policy);
+				Editor.SetTextPasteHandler (new CSharpTextPasteHandler (this, stateTracker, optionSet));
 			}
 		}
 
 		public override void Dispose ()
 		{
-			if (textEditorData != null) {
-				textEditorData.TextPasteHandler = null;
-				textEditorData.Paste -= HandleTextPaste;
-				textEditorData.Options.Changed -= HandleTextOptionsChanged;
-				textEditorData.IndentationTracker = null;
-				textEditorData.Document.TextReplacing -= HandleTextReplacing;
-				textEditorData.Document.TextReplaced -= HandleTextReplaced;
+			if (Editor != null) {
+				Editor.SetTextPasteHandler (null);
+				Editor.OptionsChanged -= HandleTextOptionsChanged;
+				Editor.SetIndentationTracker (null);
+				Editor.TextChanging -= HandleTextReplacing;
+				Editor.TextChanged -= HandleTextReplaced;
 			}
 			IdeApp.Workspace.ActiveConfigurationChanged -= HandleTextOptionsChanged;
 			stateTracker = null;
@@ -221,31 +194,31 @@ namespace MonoDevelop.CSharp.Formatting
 
 		bool? wasInVerbatimString;
 
-		void HandleTextReplaced (object sender, DocumentChangeEventArgs e)
+		void HandleTextReplaced (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
 		{
-			stateTracker.ResetEngineToPosition (e.Offset); 
+			stateTracker.ResetEngineToPosition (Editor, e.Offset); 
 			if (wasInVerbatimString == null)
 				return;
-			if (e.RemovalLength != 1 || textEditorData.Document.CurrentAtomicUndoOperationType == OperationType.Format)
+			if (e.RemovalLength != 1 /*|| textEditorData.Document.CurrentAtomicUndoOperationType == OperationType.Format*/)
 				return;
-			SafeUpdateIndentEngine (Math.Min (textEditorData.Document.TextLength, e.Offset + e.InsertionLength + 1));
+			SafeUpdateIndentEngine (Math.Min (Editor.Length, e.Offset + e.InsertionLength + 1));
 			if (wasInVerbatimString == true && !stateTracker.IsInsideVerbatimString) {
-				textEditorData.Document.TextReplacing -= HandleTextReplacing;
-				textEditorData.Document.TextReplaced -= HandleTextReplaced;
-				ConvertVerbatimStringToNormal (textEditorData, e.Offset + e.InsertionLength + 1);
-				textEditorData.Document.TextReplacing += HandleTextReplacing;
-				textEditorData.Document.TextReplaced += HandleTextReplaced;
+				Editor.TextChanging -= HandleTextReplacing;
+				Editor.TextChanged -= HandleTextReplaced;
+				ConvertVerbatimStringToNormal (Editor, e.Offset + e.InsertionLength + 1);
+				Editor.TextChanging += HandleTextReplacing;
+				Editor.TextChanged += HandleTextReplaced;
 			}
 		}
 
-		void HandleTextReplacing (object sender, DocumentChangeEventArgs e)
+		void HandleTextReplacing (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
 		{
 			wasInVerbatimString = null;
 			var o = e.Offset + e.RemovalLength;
-			if (o < 0 || o + 1 > textEditorData.Length || e.RemovalLength != 1 || textEditorData.Document.IsInUndo) {
+			if (o < 0 || o + 1 > Editor.Length || e.RemovalLength != 1/* || textEditorData.Document.IsInUndo*/) {
 				return;
 			}
-			if (textEditorData.GetCharAt (o) != '"')
+			if (Editor.GetCharAt (o) != '"')
 				return;
 			SafeUpdateIndentEngine (o + 1);
 			wasInVerbatimString = stateTracker.IsInsideVerbatimString;
@@ -279,7 +252,7 @@ namespace MonoDevelop.CSharp.Formatting
 			return result.ToString ();
 		}
 
-		static void ConvertNormalToVerbatimString (TextEditorData textEditorData, int offset)
+		static void ConvertNormalToVerbatimString (ITextDocument textEditorData, int offset)
 		{
 			var endOffset = offset;
 			while (endOffset < textEditorData.Length) {
@@ -301,10 +274,10 @@ namespace MonoDevelop.CSharp.Formatting
 				return;
 			var plainText = TextPasteUtils.StringLiteralPasteStrategy.Instance.Decode (textEditorData.GetTextAt (offset, endOffset - offset));
 			var newText = TextPasteUtils.VerbatimStringStrategy.Encode (plainText);
-			textEditorData.Replace (offset, endOffset - offset, newText);
+			textEditorData.ReplaceText (offset, endOffset - offset, newText);
 		}
 
-		static void ConvertVerbatimStringToNormal (TextEditorData textEditorData, int offset)
+		static void ConvertVerbatimStringToNormal (ITextDocument textEditorData, int offset)
 		{
 			var endOffset = offset;
 			while (endOffset < textEditorData.Length) {
@@ -320,14 +293,12 @@ namespace MonoDevelop.CSharp.Formatting
 			}
 			var plainText = TextPasteUtils.VerbatimStringStrategy.Decode (textEditorData.GetTextAt (offset, endOffset - offset));
 			var newText = TextPasteUtils.StringLiteralPasteStrategy.Instance.Encode (plainText);
-			textEditorData.Replace (offset, endOffset - offset, newText);
+			textEditorData.ReplaceText (offset, endOffset - offset, newText);
 		}
 
-		internal IStateMachineIndentEngine StateTracker { get { return stateTracker; } }
-
 		public bool DoInsertTemplate ()
 		{
-			string word = CodeTemplate.GetWordBeforeCaret (textEditorData);
+			string word = CodeTemplate.GetTemplateShortcutBeforeCaret (Editor);
 			foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplates (CSharpFormatter.MimeType)) {
 				if (template.Shortcut == word)
 					return true;
@@ -340,8 +311,8 @@ namespace MonoDevelop.CSharp.Formatting
 		void CheckXmlCommentCloseTag (char keyChar)
 		{
 			if (keyChar == '>' && stateTracker.IsInsideDocLineComment) {
-				var location = Editor.Caret.Location;
-				string lineText = Editor.GetLineText (Editor.Caret.Line);
+				var location = Editor.CaretLocation;
+				string lineText = Editor.GetLineText (Editor.CaretLine);
 				int startIndex = Math.Min (location.Column - 2, lineText.Length - 1);
 				while (startIndex >= 0 && lineText [startIndex] != '<') {
 					--startIndex;
@@ -357,8 +328,10 @@ namespace MonoDevelop.CSharp.Formatting
 						endIndex++;
 					}
 					string tag = endIndex - startIndex > 0 ? lineText.Substring (startIndex + 1, endIndex - startIndex - 1) : null;
-					if (!string.IsNullOrEmpty (tag) && CSharpCompletionEngine.CommentTags.Any (t => t == tag)) {
-						Editor.Document.Insert (Editor.Caret.Offset, "</" + tag + ">", AnchorMovementType.BeforeInsertion);
+					if (!string.IsNullOrEmpty (tag) && ICSharpCode.NRefactory.CSharp.Completion.CSharpCompletionEngine.CommentTags.Any (t => t == tag)) {
+						var caretOffset = Editor.CaretOffset;
+						Editor.InsertText (caretOffset, "</" + tag + ">");
+						Editor.CaretOffset = caretOffset;
 					}
 				}
 			}
@@ -366,99 +339,98 @@ namespace MonoDevelop.CSharp.Formatting
 
 		internal void ReindentOnTab ()
 		{
-			int cursor = textEditorData.Caret.Offset;
-			if (stateTracker.IsInsideVerbatimString && cursor > 0 && cursor < textEditorData.Document.TextLength && textEditorData.GetCharAt (cursor - 1) == '"')
+			int cursor = Editor.CaretOffset;
+			if (stateTracker.IsInsideVerbatimString && cursor > 0 && cursor < Editor.Length && Editor.GetCharAt (cursor - 1) == '"')
 				SafeUpdateIndentEngine (cursor + 1);
 			if (stateTracker.IsInsideVerbatimString) {
 				// insert normal tab inside @" ... "
-				if (textEditorData.IsSomethingSelected) {
-					textEditorData.SelectedText = "\t";
+				if (Editor.IsSomethingSelected) {
+					Editor.SelectedText = "\t";
 				}
 				else {
-					textEditorData.Insert (cursor, "\t");
+					Editor.InsertText (cursor, "\t");
 				}
-				textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
+				// textEditorData.Document.CommitLineUpdate (textEditorData.CaretLine);
 			}
 			else if (cursor >= 1) {
-				if (textEditorData.Caret.Column > 1) {
+				if (Editor.CaretColumn > 1) {
 					int delta = cursor - cursorPositionBeforeKeyPress;
 					if (delta < 2 && delta > 0) {
-						textEditorData.Remove (cursor - delta, delta);
-						textEditorData.Caret.Offset = cursor - delta;
-						textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
+						Editor.RemoveText (cursor - delta, delta);
+						Editor.CaretOffset = cursor - delta;
+						// textEditorData.Document.CommitLineUpdate (textEditorData.CaretLine);
 					}
 				}
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+				SafeUpdateIndentEngine (Editor.CaretOffset);
 				DoReSmartIndent ();
 			}
 		}
 
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			bool skipFormatting = StateTracker.IsInsideOrdinaryCommentOrString ||
-			                      StateTracker.IsInsidePreprocessorDirective;
-
-			cursorPositionBeforeKeyPress = textEditorData.Caret.Offset;
-			bool isSomethingSelected = textEditorData.IsSomethingSelected;
-			if (key == Gdk.Key.BackSpace && textEditorData.Caret.Offset == lastInsertedSemicolon) {
-				textEditorData.Document.Undo ();
+			completionWindowWasVisible = CompletionWindowManager.IsVisible;
+			cursorPositionBeforeKeyPress = Editor.CaretOffset;
+			bool isSomethingSelected = Editor.IsSomethingSelected;
+			if (descriptor.SpecialKey == SpecialKey.BackSpace && Editor.CaretOffset == lastInsertedSemicolon) {
+				EditActions.Undo (Editor);
 				lastInsertedSemicolon = -1;
 				return false;
 			}
+
 			lastInsertedSemicolon = -1;
-			if (keyChar == ';' && !(textEditorData.CurrentMode is TextLinkEditMode) && !DoInsertTemplate () && !isSomethingSelected && PropertyService.Get (
+			if (descriptor.KeyChar == ';' && Editor.EditMode == EditMode.Edit && !DoInsertTemplate () && !isSomethingSelected && PropertyService.Get (
 				    "SmartSemicolonPlacement",
 				    false
 			    ) && !(stateTracker.IsInsideComment || stateTracker.IsInsideString)) {
-				bool retval = base.KeyPress (key, keyChar, modifier);
-				DocumentLine curLine = textEditorData.Document.GetLine (textEditorData.Caret.Line);
-				string text = textEditorData.Document.GetTextAt (curLine);
+				bool retval = base.KeyPress (descriptor);
+				var curLine = Editor.GetLine (Editor.CaretLine);
+				string text = Editor.GetTextAt (curLine);
 				if (!(text.EndsWith (";", StringComparison.Ordinal) || text.Trim ().StartsWith ("for", StringComparison.Ordinal))) {
 					int guessedOffset;
 
-					if (GuessSemicolonInsertionOffset (textEditorData, curLine, textEditorData.Caret.Offset, out guessedOffset)) {
-						using (var undo = textEditorData.OpenUndoGroup ()) {
-							textEditorData.Remove (textEditorData.Caret.Offset - 1, 1);
-							textEditorData.Caret.Offset = guessedOffset;
-							lastInsertedSemicolon = textEditorData.Caret.Offset + 1;
-							retval = base.KeyPress (key, keyChar, modifier);
+					if (GuessSemicolonInsertionOffset (Editor, curLine, Editor.CaretOffset, out guessedOffset)) {
+						using (var undo = Editor.OpenUndoGroup ()) {
+							Editor.RemoveText (Editor.CaretOffset - 1, 1);
+							Editor.CaretOffset = guessedOffset;
+							lastInsertedSemicolon = Editor.CaretOffset + 1;
+							retval = base.KeyPress (descriptor);
 						}
 					}
 				}
-				using (var undo = textEditorData.OpenUndoGroup ()) {
-					if (OnTheFlyFormatting && textEditorData != null && !(textEditorData.CurrentMode is TextLinkEditMode) && !(textEditorData.CurrentMode is InsertionCursorEditMode)) {
-						OnTheFlyFormatter.FormatStatmentAt (Document, textEditorData.Caret.Location);
+				using (var undo = Editor.OpenUndoGroup ()) {
+					if (OnTheFlyFormatting && Editor != null && Editor.EditMode == EditMode.Edit) {
+						OnTheFlyFormatter.FormatStatmentAt (Editor, DocumentContext, Editor.CaretLocation, optionSet: optionSet);
 					}
 				}
 				return retval;
 			}
 			
-			if (key == Gdk.Key.Tab) {
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
-				if (stateTracker.IsInsideStringLiteral && !textEditorData.IsSomethingSelected) {
-					var lexer = new CSharpCompletionEngineBase.MiniLexer (textEditorData.Document.GetTextAt (0, textEditorData.Caret.Offset));
+			if (descriptor.SpecialKey == SpecialKey.Tab && descriptor.ModifierKeys == ModifierKeys.None && !CompletionWindowManager.IsVisible) {
+				SafeUpdateIndentEngine (Editor.CaretOffset);
+				if (stateTracker.IsInsideStringLiteral && !Editor.IsSomethingSelected) {
+					var lexer = new ICSharpCode.NRefactory.CSharp.Completion.CSharpCompletionEngineBase.MiniLexer (Editor.GetTextAt (0, Editor.CaretOffset));
 					lexer.Parse ();
 					if (lexer.IsInString) {
-						textEditorData.InsertAtCaret ("\\t");
+						Editor.InsertAtCaret ("\\t");
 						return false;
 					}
 				}
 			}
 
 
-			if (key == Gdk.Key.Tab && DefaultSourceEditorOptions.Instance.TabIsReindent && !CompletionWindowManager.IsVisible && !(textEditorData.CurrentMode is TextLinkEditMode) && !DoInsertTemplate () && !isSomethingSelected) {
+			if (descriptor.SpecialKey == SpecialKey.Tab && DefaultSourceEditorOptions.Instance.TabIsReindent && !CompletionWindowManager.IsVisible && Editor.EditMode == EditMode.Edit && !DoInsertTemplate () && !isSomethingSelected) {
 				ReindentOnTab ();
 
 				return false;
 			}
 
-			SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+			SafeUpdateIndentEngine (Editor.CaretOffset);
 			if (!stateTracker.IsInsideOrdinaryCommentOrString) {
-				if (keyChar == '@') {
-					var retval = base.KeyPress (key, keyChar, modifier);
-					int cursor = textEditorData.Caret.Offset;
-					if (cursor < textEditorData.Length && textEditorData.GetCharAt (cursor) == '"')
-						ConvertNormalToVerbatimString (textEditorData, cursor + 1);
+				if (descriptor.KeyChar == '@') {
+					var retval = base.KeyPress (descriptor);
+					int cursor = Editor.CaretOffset;
+					if (cursor < Editor.Length && Editor.GetCharAt (cursor) == '"')
+						ConvertNormalToVerbatimString (Editor, cursor + 1);
 					return retval;
 				}
 			}
@@ -468,34 +440,52 @@ namespace MonoDevelop.CSharp.Formatting
 			if (!indentationDisabled) {
 				bool retval;
 				//capture some of the current state
-				int oldBufLen = textEditorData.Length;
-				int oldLine = textEditorData.Caret.Line + 1;
+				int oldBufLen = Editor.Length;
+				int oldLine = Editor.CaretLine + 1;
 				bool reIndent = false;
 
 				//pass through to the base class, which actually inserts the character
 				//and calls HandleCodeCompletion etc to handles completion
-				using (var undo = textEditorData.OpenUndoGroup ()) {
-					DoPreInsertionSmartIndent (key);
+				using (var undo = Editor.OpenUndoGroup ()) {
+					DoPreInsertionSmartIndent (descriptor.SpecialKey);
 				}
 				wasInStringLiteral = stateTracker.IsInsideStringLiteral;
+
+
+				bool returnBetweenBraces =
+					descriptor.SpecialKey == SpecialKey.Return && 
+					descriptor.ModifierKeys == ModifierKeys.None && 
+					          Editor.CaretOffset > 0 && Editor.CaretOffset < Editor.Length && 
+					          Editor.GetCharAt (Editor.CaretOffset - 1) == '{' && Editor.GetCharAt (Editor.CaretOffset) == '}' && !stateTracker.IsInsideOrdinaryCommentOrString;
+
 				bool automaticReindent;
 				// need to be outside of an undo group - otherwise it interferes with other text editor extension
 				// esp. the documentation insertion undo steps.
-				retval = base.KeyPress (key, keyChar, modifier);
+				retval = base.KeyPress (descriptor);
+
+				
 				//handle inserted characters
-				if (textEditorData.Caret.Offset <= 0 || textEditorData.IsSomethingSelected)
+				if (Editor.CaretOffset <= 0 || Editor.IsSomethingSelected)
 					return retval;
 				
-				lastCharInserted = TranslateKeyCharForIndenter (key, keyChar, textEditorData.GetCharAt (textEditorData.Caret.Offset - 1));
+				lastCharInserted = TranslateKeyCharForIndenter (descriptor.SpecialKey, descriptor.KeyChar, Editor.GetCharAt (Editor.CaretOffset - 1));
 				if (lastCharInserted == '\0')
 					return retval;
-				using (var undo = textEditorData.OpenUndoGroup ()) {
-					SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+				using (var undo = Editor.OpenUndoGroup ()) {
+
+					if (returnBetweenBraces) {
+						var oldOffset = Editor.CaretOffset;
+						Editor.InsertAtCaret (Editor.EolMarker);
+						DoReSmartIndent ();
+						Editor.CaretOffset = oldOffset;
+					}
+
+					SafeUpdateIndentEngine (Editor.CaretOffset);
 
-					if (key == Gdk.Key.Return && modifier == Gdk.ModifierType.ControlMask) {
-						FixLineStart (textEditorData, stateTracker, textEditorData.Caret.Line + 1);
+					if (descriptor.SpecialKey == SpecialKey.Return && descriptor.ModifierKeys == ModifierKeys.Control) {
+						FixLineStart (Editor, stateTracker, Editor.CaretLine + 1);
 					} else {
-						if (!(oldLine == textEditorData.Caret.Line + 1 && lastCharInserted == '\n') && (oldBufLen != textEditorData.Length || lastCharInserted != '\0')) {
+						if (!(oldLine == Editor.CaretLine + 1 && lastCharInserted == '\n') && (oldBufLen != Editor.Length || lastCharInserted != '\0')) {
 							DoPostInsertionSmartIndent (lastCharInserted, out reIndent);
 						} else {
 							reIndent = lastCharInserted == '\n';
@@ -505,67 +495,121 @@ namespace MonoDevelop.CSharp.Formatting
 					//N.B. if the engine says we need to reindent, make sure that it's because a char was 
 					//inserted rather than just updating the stack due to moving around
 
-					SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+					SafeUpdateIndentEngine (Editor.CaretOffset);
 					// Automatically reindent in text link mode will cause the mode exiting, therefore we need to prevent that.
-					automaticReindent = (stateTracker.NeedsReindent && lastCharInserted != '\0') && !(textEditorData.CurrentMode is TextLinkEditMode);
-					if (key == Gdk.Key.Return && (reIndent || automaticReindent)) {
-						if (textEditorData.Options.IndentStyle == IndentStyle.Virtual) {
-							if (textEditorData.GetLine (textEditorData.Caret.Line).Length == 0)
-								textEditorData.Caret.Column = textEditorData.IndentationTracker.GetVirtualIndentationColumn (textEditorData.Caret.Location);
+					automaticReindent = (stateTracker.NeedsReindent && lastCharInserted != '\0') && Editor.EditMode == EditMode.Edit;
+					if (descriptor.SpecialKey == SpecialKey.Return && (reIndent || automaticReindent)) {
+						if (Editor.Options.IndentStyle == IndentStyle.Virtual) {
+							if (Editor.GetLine (Editor.CaretLine).Length == 0)
+								Editor.CaretColumn = Editor.GetVirtualIndentationColumn (Editor.CaretLine);
 						} else {
 							DoReSmartIndent ();
 						}
 					}
 				}
+
 				const string reindentChars = ";){}";
-				if (reIndent || key != Gdk.Key.Return && key != Gdk.Key.Tab && automaticReindent && reindentChars.Contains (keyChar)) {
-					using (var undo = textEditorData.OpenUndoGroup ()) {
+				if (reIndent || descriptor.SpecialKey != SpecialKey.Return && descriptor.SpecialKey != SpecialKey.Tab && automaticReindent && reindentChars.Contains (descriptor.KeyChar)) {
+					using (var undo = Editor.OpenUndoGroup ()) {
 						DoReSmartIndent ();
 					}
 				}
 
-				if (!skipFormatting && !(stateTracker.IsInsideComment || stateTracker.IsInsideString)) {
-					if (keyChar == ';' || keyChar == '}') {
-						using (var undo = textEditorData.OpenUndoGroup ()) {
-							if (OnTheFlyFormatting && textEditorData != null && !(textEditorData.CurrentMode is TextLinkEditMode) && !(textEditorData.CurrentMode is InsertionCursorEditMode)) {
-								OnTheFlyFormatter.FormatStatmentAt (Document, textEditorData.Caret.Location);
-							}
-						}
-					}
-				}
-
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+				HandleOnTheFlyFormatting (descriptor);
+				SafeUpdateIndentEngine (Editor.CaretOffset);
 				lastCharInserted = '\0';
-				CheckXmlCommentCloseTag (keyChar);
+				CheckXmlCommentCloseTag (descriptor.KeyChar);
 				return retval;
 			}
 
-			if (textEditorData.Options.IndentStyle == IndentStyle.Auto && DefaultSourceEditorOptions.Instance.TabIsReindent && key == Gdk.Key.Tab) {
-				bool retval = base.KeyPress (key, keyChar, modifier);
+			if (Editor.Options.IndentStyle == IndentStyle.Auto && DefaultSourceEditorOptions.Instance.TabIsReindent && descriptor.SpecialKey == SpecialKey.Tab) {
+				bool retval = base.KeyPress (descriptor);
 				DoReSmartIndent ();
-				CheckXmlCommentCloseTag (keyChar);
+				CheckXmlCommentCloseTag (descriptor.KeyChar);
 				return retval;
 			}
 
 			//pass through to the base class, which actually inserts the character
 			//and calls HandleCodeCompletion etc to handles completion
-			var result = base.KeyPress (key, keyChar, modifier);
+			var result = base.KeyPress (descriptor);
 
-			if (!indentationDisabled && (key == Gdk.Key.Return || key == Gdk.Key.KP_Enter)) {
+			if (!indentationDisabled && (descriptor.SpecialKey == SpecialKey.Return)) {
 				DoReSmartIndent ();
 			}
 
-			CheckXmlCommentCloseTag (keyChar);
+			CheckXmlCommentCloseTag (descriptor.KeyChar);
 
-			if (!skipFormatting && keyChar == '}')
-				RunFormatter (new DocumentLocation (textEditorData.Caret.Location.Line, textEditorData.Caret.Location.Column));
+			HandleOnTheFlyFormatting (descriptor);
+			
 			return result;
 		}
 
-		static bool IsSemicolonalreadyPlaced (TextEditorData data, int caretOffset)
+		void HandleOnTheFlyFormatting (KeyDescriptor descriptor)
+		{
+			if (descriptor.KeyChar == '{')
+				return;
+			SafeUpdateIndentEngine (Editor.CaretOffset);
+			bool skipFormatting = stateTracker.IsInsideOrdinaryCommentOrString || stateTracker.IsInsidePreprocessorDirective;
+			if (!skipFormatting && !(stateTracker.IsInsideComment || stateTracker.IsInsideString)) {
+				if (DocumentContext.ParsedDocument == null || DocumentContext.ParsedDocument.GetAst<SemanticModel> () == null)
+					return;
+				var document = DocumentContext.AnalysisDocument;
+				if (document == null)
+					return;
+				if (!skipFormatting && service.SupportsFormattingOnTypedCharacter (document, descriptor.KeyChar)) {
+					var caretPosition = Editor.CaretOffset;
+					var token = CSharpEditorFormattingService.GetTokenBeforeTheCaretAsync (document, caretPosition, default(CancellationToken)).Result;
+					if (token.IsMissing || !service.ValidSingleOrMultiCharactersTokenKind (descriptor.KeyChar, token.Kind ()) || token.IsKind (SyntaxKind.EndOfFileToken, SyntaxKind.None))
+						return;
+					if (CSharpEditorFormattingService.TokenShouldNotFormatOnTypeChar (token))
+						return;
+					using (var undo = Editor.OpenUndoGroup ()) {
+						if (OnTheFlyFormatting && Editor != null && Editor.EditMode == EditMode.Edit) {
+							OnTheFlyFormatter.FormatStatmentAt (Editor, DocumentContext, Editor.CaretLocation, optionSet: optionSet);
+						}
+					}
+				}
+			}
+			if (OnTheFlyFormatting && descriptor.SpecialKey == SpecialKey.Return) {
+				try {
+					FormatOnReturn ();
+				} catch (Exception e) {
+					LoggingService.LogError ("Exception while formatting", e);
+				}
+			}
+		}
+
+		async void FormatOnReturn (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var document = DocumentContext.AnalysisDocument;
+			if (document == null)
+				return;
+			var caretPosition = Editor.CaretOffset;
+			var token = await CSharpEditorFormattingService.GetTokenBeforeTheCaretAsync(document, caretPosition, cancellationToken).ConfigureAwait(false);
+			if (token.IsMissing)
+				return;
+
+			string text = null;
+			if (service.IsInvalidToken(token, ref text))
+				return;
+			// Check to see if the token is ')' and also the parent is a using statement. If not, bail
+			if (CSharpEditorFormattingService.TokenShouldNotFormatOnReturn(token))
+				return;
+			var tokenRange = FormattingRangeHelper.FindAppropriateRange(token);
+			if (tokenRange == null || !tokenRange.HasValue || tokenRange.Value.Item1.Equals(tokenRange.Value.Item2))
+				return;
+			var value = tokenRange.Value;
+			using (var undo = Editor.OpenUndoGroup ()) {
+				OnTheFlyFormatter.Format (Editor, DocumentContext, value.Item1.SpanStart, value.Item2.Span.End, optionSet: optionSet);
+			}
+		}
+
+		CSharpEditorFormattingService service = new CSharpEditorFormattingService ();
+
+		static bool IsSemicolonalreadyPlaced (IReadonlyTextDocument data, int caretOffset)
 		{
 			for (int pos2 = caretOffset - 1; pos2-- > 0;) {
-				var ch2 = data.Document.GetCharAt (pos2);
+				var ch2 = data.GetCharAt (pos2);
 				if (ch2 == ';') {
 					return true;
 				}
@@ -575,7 +619,7 @@ namespace MonoDevelop.CSharp.Formatting
 			return false;
 		}
 
-		public static bool GuessSemicolonInsertionOffset (TextEditorData data, ISegment curLine, int caretOffset, out int outOffset)
+		public static bool GuessSemicolonInsertionOffset (IReadonlyTextDocument data, MonoDevelop.Core.Text.ISegment curLine, int caretOffset, out int outOffset)
 		{
 			int lastNonWsOffset = caretOffset;
 			char lastNonWsChar = '\0';
@@ -598,7 +642,7 @@ namespace MonoDevelop.CSharp.Formatting
 
 			var offset = curLine.Offset;
 			string lineText = data.GetTextAt (caretOffset, max - caretOffset);
-			var lexer = new CSharpCompletionEngineBase.MiniLexer (lineText);
+			var lexer = new ICSharpCode.NRefactory.CSharp.Completion.CSharpCompletionEngineBase.MiniLexer (lineText);
 			lexer.Parse ((ch, i) => {
 				if (lexer.IsInSingleComment || lexer.IsInMultiLineComment)
 					return true;
@@ -619,13 +663,12 @@ namespace MonoDevelop.CSharp.Formatting
 			return true;
 		}
 
-		static char TranslateKeyCharForIndenter (Gdk.Key key, char keyChar, char docChar)
+		static char TranslateKeyCharForIndenter (SpecialKey key, char keyChar, char docChar)
 		{
 			switch (key) {
-			case Gdk.Key.Return:
-			case Gdk.Key.KP_Enter:
+			case SpecialKey.Return:
 				return '\n';
-			case Gdk.Key.Tab:
+			case SpecialKey.Tab:
 				return '\t';
 			default:
 				if (docChar == keyChar)
@@ -637,14 +680,14 @@ namespace MonoDevelop.CSharp.Formatting
 		// removes "\s*\+\s*" patterns (used for special behaviour inside strings)
 		void HandleStringConcatinationDeletion (int start, int end)
 		{
-			if (start < 0 || end >= textEditorData.Length || textEditorData.IsSomethingSelected)
+			if (start < 0 || end >= Editor.Length || Editor.IsSomethingSelected)
 				return;
-			char ch = textEditorData.GetCharAt (start);
+			char ch = Editor.GetCharAt (start);
 			if (ch == '"') {
 				int sgn = Math.Sign (end - start);
 				bool foundPlus = false;
-				for (int max = start + sgn; max != end && max >= 0 && max < textEditorData.Length; max += sgn) {
-					ch = textEditorData.GetCharAt (max);
+				for (int max = start + sgn; max != end && max >= 0 && max < Editor.Length; max += sgn) {
+					ch = Editor.GetCharAt (max);
 					if (Char.IsWhiteSpace (ch))
 						continue;
 					if (ch == '+') {
@@ -655,11 +698,11 @@ namespace MonoDevelop.CSharp.Formatting
 						if (!foundPlus)
 							break;
 						if (sgn < 0) {
-							textEditorData.Remove (max, start - max);
-							textEditorData.Caret.Offset = max + 1;
+							Editor.RemoveText (max, start - max);
+							Editor.CaretOffset = max + 1;
 						} else {
-							textEditorData.Remove (start + sgn, max - start);
-							textEditorData.Caret.Offset = start;
+							Editor.RemoveText (start + sgn, max - start);
+							Editor.CaretOffset = start;
 						}
 						break;
 					} else {
@@ -669,23 +712,23 @@ namespace MonoDevelop.CSharp.Formatting
 			}
 		}
 
-		void DoPreInsertionSmartIndent (Gdk.Key key)
+		void DoPreInsertionSmartIndent (SpecialKey key)
 		{
 			switch (key) {
-			case Gdk.Key.BackSpace:
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
-				HandleStringConcatinationDeletion (textEditorData.Caret.Offset - 1, 0);
+			case SpecialKey.BackSpace:
+				SafeUpdateIndentEngine (Editor.CaretOffset);
+				HandleStringConcatinationDeletion (Editor.CaretOffset - 1, 0);
 				break;
-			case Gdk.Key.Delete:
-				SafeUpdateIndentEngine (textEditorData.Caret.Offset);
-				HandleStringConcatinationDeletion (textEditorData.Caret.Offset, textEditorData.Length);
+			case SpecialKey.Delete:
+				SafeUpdateIndentEngine (Editor.CaretOffset);
+				HandleStringConcatinationDeletion (Editor.CaretOffset, Editor.Length);
 				break;
 			}
 		}
 		//special handling for certain characters just inserted , for comments etc
 		void DoPostInsertionSmartIndent (char charInserted, out bool reIndent)
 		{
-			SafeUpdateIndentEngine (textEditorData.Caret.Offset);
+			SafeUpdateIndentEngine (Editor.CaretOffset);
 			reIndent = false;
 			switch (charInserted) {
 			case '}':
@@ -693,7 +736,9 @@ namespace MonoDevelop.CSharp.Formatting
 				reIndent = true;
 				break;
 			case '\n':
-				if (FixLineStart (textEditorData, stateTracker, stateTracker.Location.Line))
+				if (completionWindowWasVisible) // \n is handled by an open completion window 
+					return;
+				if (FixLineStart (Editor, stateTracker, Editor.OffsetToLineNumber (stateTracker.Offset)))
 					return;
 				//newline always reindents unless it's had special handling
 				reIndent = true;
@@ -702,18 +747,20 @@ namespace MonoDevelop.CSharp.Formatting
 		}
 
 		internal bool wasInStringLiteral;
+		OptionSet optionSet;
+		bool completionWindowWasVisible;
 
-		public bool FixLineStart (TextEditorData textEditorData, IStateMachineIndentEngine stateTracker, int lineNumber)
+		public bool FixLineStart (TextEditor textEditorData, ICSharpCode.NRefactory6.CSharp.IStateMachineIndentEngine stateTracker, int lineNumber)
 		{
-			if (lineNumber > DocumentLocation.MinLine) {
-				DocumentLine line = textEditorData.Document.GetLine (lineNumber);
+			if (lineNumber > 1) {
+				var line = textEditorData.GetLine (lineNumber);
 				if (line == null)
 					return false;
 
-				DocumentLine prevLine = textEditorData.Document.GetLine (lineNumber - 1);
+				var prevLine = textEditorData.GetLine (lineNumber - 1);
 				if (prevLine == null)
 					return false;
-				string trimmedPreviousLine = textEditorData.Document.GetTextAt (prevLine).TrimStart ();
+				string trimmedPreviousLine = textEditorData.GetTextAt (prevLine).TrimStart ();
 
 				//xml doc comments
 				//check previous line was a doc comment
@@ -723,13 +770,13 @@ namespace MonoDevelop.CSharp.Formatting
 						return false;
 					//check that the newline command actually inserted a newline
 					textEditorData.EnsureCaretIsNotVirtual ();
-					var nextLineSegment = textEditorData.Document.GetLine (lineNumber + 1);
-					string nextLine = nextLineSegment != null ? textEditorData.Document.GetTextAt (nextLineSegment).TrimStart () : "";
+					var nextLineSegment = textEditorData.GetLine (lineNumber + 1);
+					string nextLine = nextLineSegment != null ? textEditorData.GetTextAt (nextLineSegment).TrimStart () : "";
 
 					if (trimmedPreviousLine.Length > "///".Length || nextLine.StartsWith ("///", StringComparison.Ordinal)) {
-						var insertionPoint = textEditorData.Caret.Offset;
-						int inserted = textEditorData.Insert (insertionPoint, "/// ");
-						textEditorData.Caret.Offset = insertionPoint + inserted;
+						var insertionPoint = textEditorData.CaretOffset;
+						textEditorData.InsertText (insertionPoint, "/// ");
+						textEditorData.CaretOffset = insertionPoint + "/// ".Length;
 						return true;
 					}
 					//multi-line comments
@@ -746,59 +793,59 @@ namespace MonoDevelop.CSharp.Formatting
 						commentPrefix = "*";
 					}
 
-					int indentSize = line.GetIndentation (textEditorData.Document).Length;
-					var insertedText = prevLine.GetIndentation (textEditorData.Document) + commentPrefix;
-					textEditorData.Replace (line.Offset, indentSize, insertedText);
-					textEditorData.Caret.Offset = line.Offset + insertedText.Length;
+					int indentSize = line.GetIndentation (textEditorData).Length;
+					var insertedText = prevLine.GetIndentation (textEditorData) + commentPrefix;
+					textEditorData.ReplaceText (line.Offset, indentSize, insertedText);
+					textEditorData.CaretOffset = line.Offset + insertedText.Length;
 					return true;
 				} else if (wasInStringLiteral) {
-					var lexer = new CSharpCompletionEngineBase.MiniLexer (textEditorData.Document.GetTextAt (0, prevLine.EndOffset).TrimEnd ());
+					var lexer = new ICSharpCode.NRefactory.CSharp.Completion.CSharpCompletionEngineBase.MiniLexer (textEditorData.GetTextAt (0, prevLine.EndOffset).TrimEnd ());
 					lexer.Parse ();
 					if (!lexer.IsInString)
 						return false;
 					textEditorData.EnsureCaretIsNotVirtual ();
-					textEditorData.Insert (prevLine.Offset + prevLine.Length, "\" +");
+					textEditorData.InsertText (prevLine.Offset + prevLine.Length, "\" +");
 
-					int indentSize = textEditorData.Caret.Offset - line.Offset;
-					var insertedText = prevLine.GetIndentation (textEditorData.Document) + (trimmedPreviousLine.StartsWith ("\"", StringComparison.Ordinal) ? "" : "\t") + "\"";
-					textEditorData.Replace (line.Offset, indentSize, insertedText);
+					int indentSize = textEditorData.CaretOffset - line.Offset;
+					var insertedText = prevLine.GetIndentation (textEditorData) + (trimmedPreviousLine.StartsWith ("\"", StringComparison.Ordinal) ? "" : "\t") + "\"";
+					textEditorData.ReplaceText (line.Offset, indentSize, insertedText);
 					return true;
 				}
 			}
 			return false;
 		}
 		//does re-indenting and cursor positioning
-		void DoReSmartIndent ()
+		internal void DoReSmartIndent ()
 		{
-			DoReSmartIndent (textEditorData.Caret.Offset);
+			DoReSmartIndent (Editor.CaretOffset);
 		}
 
-		void DoReSmartIndent (int cursor)
+		internal void DoReSmartIndent (int cursor)
 		{
 			SafeUpdateIndentEngine (cursor);
 			if (stateTracker.LineBeganInsideVerbatimString || stateTracker.LineBeganInsideMultiLineComment)
 				return;
 			if (DefaultSourceEditorOptions.Instance.IndentStyle == IndentStyle.Auto) {
-				textEditorData.FixVirtualIndentation ();
+				Editor.FixVirtualIndentation ();
 				return;
 			}
-			var line = textEditorData.Document.GetLineByOffset (cursor);
+			var line = Editor.GetLineByOffset (cursor);
 
 			// Get context to the end of the line w/o changing the main engine's state
 			var curTracker = stateTracker.Clone ();
 			try {
 				for (int max = cursor; max < line.EndOffset; max++) {
-					curTracker.Push (textEditorData.Document.GetCharAt (max));
+					curTracker.Push (Editor.GetCharAt (max));
 				}
 			} catch (Exception e) {
 				LoggingService.LogError ("Exception during indentation", e);
 			}
 			
 			int pos = line.Offset;
-			string curIndent = line.GetIndentation (textEditorData.Document);
+			string curIndent = line.GetIndentation (Editor);
 			int nlwsp = curIndent.Length;
 			int offset = cursor > pos + nlwsp ? cursor - (pos + nlwsp) : 0;
-			if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && textEditorData.Document.GetCharAt (line.Offset + nlwsp) == '*')) {
+			if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && Editor.GetCharAt (line.Offset + nlwsp) == '*')) {
 				// Possibly replace the indent
 				string newIndent = curTracker.ThisLineIndent;
 				int newIndentLength = newIndent.Length;
@@ -807,9 +854,9 @@ namespace MonoDevelop.CSharp.Formatting
 						if (pos < CompletionWindowManager.CodeCompletionContext.TriggerOffset)
 							CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp;
 					}
-
-					newIndentLength = textEditorData.Replace (pos, nlwsp, newIndent);
-					textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
+					newIndentLength = newIndent.Length;
+					Editor.ReplaceText (pos, nlwsp, newIndent);
+					//textEditorData.CommitLineUpdate (textEditorData.CaretLine);
 					CompletionWindowManager.HideWindow ();
 				}
 				pos += newIndentLength;
@@ -819,7 +866,7 @@ namespace MonoDevelop.CSharp.Formatting
 
 			pos += offset;
 
-			textEditorData.FixVirtualIndentation ();
+			Editor.FixVirtualIndentation ();
 		}
 
 		/*
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs
new file mode 100644
index 0000000000..96b8635c4f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs
@@ -0,0 +1,94 @@
+//
+// TextPasteIndentEngine.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.CodeCompletion;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.CSharp.Formatting
+{
+	class CSharpTextPasteHandler : TextPasteHandler
+	{
+		readonly ICSharpCode.NRefactory6.CSharp.ITextPasteHandler engine;
+		readonly CSharpTextEditorIndentation indent;
+
+		public CSharpTextPasteHandler (CSharpTextEditorIndentation indent, ICSharpCode.NRefactory6.CSharp.IStateMachineIndentEngine decoratedEngine, OptionSet formattingOptions)
+		{
+			this.engine = new ICSharpCode.NRefactory6.CSharp.TextPasteIndentEngine (decoratedEngine, formattingOptions);
+			this.indent = indent;
+		}
+
+		public override string FormatPlainText (int offset, string text, byte[] copyData)
+		{
+			return engine.FormatPlainText (indent.Editor, offset, text, copyData);
+		}
+
+		public override byte[] GetCopyData (int offset, int length)
+		{
+			return engine.GetCopyData (indent.Editor, new TextSpan (offset, length));
+		}
+
+		public override void PostFomatPastedText (int insertionOffset, int insertedChars)
+		{
+			if (indent.Editor.Options.IndentStyle == IndentStyle.None ||
+				indent.Editor.Options.IndentStyle == IndentStyle.Auto)
+				return;
+			if (DefaultSourceEditorOptions.Instance.OnTheFlyFormatting) {
+				OnTheFlyFormatter.Format (indent.Editor, indent.DocumentContext, insertionOffset, insertionOffset + insertedChars);
+				return;
+			}
+			// Just correct the start line of the paste operation - the text is already indented.
+			var curLine = indent.Editor.GetLineByOffset (insertionOffset);
+			var curLineOffset = curLine.Offset;
+			indent.SafeUpdateIndentEngine (curLineOffset);
+			if (!indent.stateTracker.IsInsideOrdinaryCommentOrString) {
+				int pos = curLineOffset;
+				string curIndent = curLine.GetIndentation (indent.Editor);
+				int nlwsp = curIndent.Length;
+
+				if (!indent.stateTracker.LineBeganInsideMultiLineComment || (nlwsp < curLine.LengthIncludingDelimiter && indent.Editor.GetCharAt (curLineOffset + nlwsp) == '*')) {
+					// Possibly replace the indent
+					indent.SafeUpdateIndentEngine (curLineOffset + curLine.Length);
+					string newIndent = indent.stateTracker.ThisLineIndent;
+					if (newIndent != curIndent) {
+						if (CompletionWindowManager.IsVisible) {
+							if (pos < CompletionWindowManager.CodeCompletionContext.TriggerOffset)
+								CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp;
+						}
+						indent.Editor.ReplaceText (pos, nlwsp, newIndent);
+						//						textEditorData.Document.CommitLineUpdate (textEditorData.CaretLine);
+					}
+				}
+			}
+			indent.Editor.FixVirtualIndentation ();
+
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/NewFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/NewFormattingProfileDialog.cs
index c9d37eaa91..5794cf9fad 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/NewFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/NewFormattingProfileDialog.cs
@@ -36,14 +36,14 @@ namespace MonoDevelop.CSharp.Formatting
 		}
 		
 		
-		public CSharpFormattingPolicy InitializeFrom {
+		internal CSharpFormattingPolicy InitializeFrom {
 			get {
 				return policies[comboboxInitFrom.Active];
 			}
 		}
 		
 		readonly List<CSharpFormattingPolicy> policies;
-		public NewFormattingProfileDialog (List<CSharpFormattingPolicy> policies)
+		internal NewFormattingProfileDialog (List<CSharpFormattingPolicy> policies)
 		{
 			// ReSharper disable once DoNotCallOverridableMethodsInConstructor
 			this.Build ();
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs
index e8bb9b6b7d..049c9906fd 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs
@@ -23,244 +23,108 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using Mono.TextEditor;
+
 using MonoDevelop.Ide;
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Projects.Policies;
-using ICSharpCode.NRefactory.CSharp;
-using System.Text;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
+using System.Linq;
 using MonoDevelop.CSharp.Completion;
 using MonoDevelop.CSharp.Refactoring;
 using MonoDevelop.CSharp.Parser;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Gui.Content;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Options;
 
 namespace MonoDevelop.CSharp.Formatting
 {
 	static class OnTheFlyFormatter
 	{
-		public static void Format (MonoDevelop.Ide.Gui.Document data)
+		public static void Format (TextEditor editor, DocumentContext context)
 		{
-			Format (data, 0, data.Editor.Length);
+			Format (editor, context, 0, editor.Length);
 		}
 
-		public static void Format (MonoDevelop.Ide.Gui.Document data, TextLocation location)
-		{
-			Format (data, location, location, false);
-		} 
-
-		public static void Format (MonoDevelop.Ide.Gui.Document data, TextLocation startLocation, TextLocation endLocation, bool exact = true)
+		public static void Format (TextEditor editor, DocumentContext context, int startOffset, int endOffset, bool exact = true, OptionSet optionSet = null)
 		{
-			Format (data, data.Editor.LocationToOffset (startLocation), data.Editor.LocationToOffset (endLocation), exact);
-		}
-		
-		public static void Format (MonoDevelop.Ide.Gui.Document data, int startOffset, int endOffset, bool exact = true)
-		{
-			var policyParent = data.Project != null ? data.Project.Policies : PolicyService.DefaultPolicies;
+			var policyParent = context.Project != null ? context.Project.Policies : PolicyService.DefaultPolicies;
 			var mimeTypeChain = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
-			Format (policyParent, mimeTypeChain, data, startOffset, endOffset, exact);
+			Format (policyParent, mimeTypeChain, editor, context, startOffset, endOffset, exact, optionSet: optionSet);
 		}
 
-		public static void FormatStatmentAt (MonoDevelop.Ide.Gui.Document data, DocumentLocation location)
+		public static void FormatStatmentAt (TextEditor editor, DocumentContext context, MonoDevelop.Ide.Editor.DocumentLocation location, OptionSet optionSet = null)
 		{
-			var offset = data.Editor.LocationToOffset (location);
-			var policyParent = data.Project != null ? data.Project.Policies : PolicyService.DefaultPolicies;
+			var offset = editor.LocationToOffset (location);
+			var policyParent = context.Project != null ? context.Project.Policies : PolicyService.DefaultPolicies;
 			var mimeTypeChain = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
-			Format (policyParent, mimeTypeChain, data, offset, offset, false, true);
-		}		
-		
-
-		static string BuildStub (MonoDevelop.Ide.Gui.Document data, CSharpCompletionTextEditorExtension.TypeSystemTreeSegment seg, int endOffset, out int memberStartOffset)
-		{
-			var pf = data.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (pf == null) {
-				memberStartOffset = 0;
-				return null;
-			}
-			
-			var sb = new StringBuilder ();
-			
-			int closingBrackets = 0;
-			// use the member start location to determine the using scope, because this information is in sync, the position in
-			// the file may have changed since last parse run (we have up 2 date locations from the type segment tree).
-			var scope = pf.GetUsingScope (seg.Entity.Region.Begin);
-
-			while (scope != null && !string.IsNullOrEmpty (scope.NamespaceName)) {
-				// Hack: some syntax errors lead to invalid namespace names.
-				if (scope.NamespaceName.EndsWith ("<invalid>", StringComparison.Ordinal)) {
-					scope = scope.Parent;
-					continue;
-				}
-				sb.Append ("namespace Stub {");
-				sb.Append (data.Editor.EolMarker);
-				closingBrackets++;
-				while (scope.Parent != null && scope.Parent.Region == scope.Region)
-					scope = scope.Parent;
-				scope = scope.Parent;
-			}
-
-			var parent = seg.Entity.DeclaringTypeDefinition;
-			while (parent != null) {
-				sb.Append ("class " + parent.Name + " {");
-				sb.Append (data.Editor.EolMarker);
-				closingBrackets++;
-				parent = parent.DeclaringTypeDefinition;
-			}
-
-			var segmentLine = data.Editor.GetLineByOffset (seg.Offset);
-			memberStartOffset = sb.Length + seg.Offset - segmentLine.Offset;
-			var text = data.Editor.GetTextBetween (Math.Max (0, segmentLine.Offset), endOffset);
-			sb.Append (text);
-			var lex = new CSharpCompletionEngineBase.MiniLexer (text);
-			lex.Parse ((ch,i) => {
-				if (lex.IsInString || lex.IsInChar || lex.IsInVerbatimString || lex.IsInSingleComment || lex.IsInMultiLineComment || lex.IsInPreprocessorDirective)
-					return false;
-				if (ch =='{') {
-					closingBrackets++;
-				} else if (ch =='}') {
-					closingBrackets--;
-				}
-				return false;
-			});
-
-
-			// Insert at least caret column eol markers otherwise the reindent of the generated closing bracket
-			// could interfere with the current indentation.
-			var endLocation = data.Editor.OffsetToLocation (endOffset);
-			for (int i = 0; i <= endLocation.Column; i++) {
-				sb.Append (data.Editor.EolMarker);
-			}
-			sb.Append (data.Editor.EolMarker);
-			sb.Append (new string ('}', closingBrackets));
-			return sb.ToString ();
+			Format (policyParent, mimeTypeChain, editor, context, offset, offset, false, true, optionSet: optionSet);
 		}
-		
-		static FormattingChanges GetFormattingChanges (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, MonoDevelop.Ide.Gui.Document document, string input, DomRegion formattingRegion, ref int formatStartOffset, ref int formatLength, bool formatLastStatementOnly)
-		{
-			using (var stubData = TextEditorData.CreateImmutable (input)) {
-				stubData.Document.FileName = document.FileName;
-				var parser = document.HasProject ? new CSharpParser (TypeSystemParser.GetCompilerArguments (document.Project)) : new CSharpParser ();
-				var compilationUnit = parser.Parse (stubData);
-				bool hadErrors = parser.HasErrors;
-				if (hadErrors) {
-					using (var stubData2 = TextEditorData.CreateImmutable (input + "}")) {
-						compilationUnit = parser.Parse (stubData2);
-						hadErrors = parser.HasErrors;
-					}
-				}
-				// try it out, if the behavior is better when working only with correct code.
-				if (hadErrors) {
-					return null;
-				}
-				
-				var policy = policyParent.Get<CSharpFormattingPolicy> (mimeTypeChain);
-				
-				var formattingVisitor = new ICSharpCode.NRefactory.CSharp.CSharpFormatter (policy.CreateOptions (), document.Editor.CreateNRefactoryTextEditorOptions ());
-				formattingVisitor.FormattingMode = FormattingMode.Intrusive;
-				formattingVisitor.AddFormattingRegion (formattingRegion);
-
 
-				var changes = formattingVisitor.AnalyzeFormatting (stubData.Document, compilationUnit);
-
-				if (formatLastStatementOnly) {
-					AstNode node = compilationUnit.GetAdjacentNodeAt<Statement> (stubData.OffsetToLocation (formatStartOffset + formatLength - 1));
-					if (node != null) {
-						while (node.Role == Roles.EmbeddedStatement || node.Role == IfElseStatement.TrueRole || node.Role == IfElseStatement.FalseRole)
-							node = node.Parent;
-						// include indentation if node starts in new line
-						var formatNode = node.GetPrevNode ();
-						if (formatNode.Role != Roles.NewLine)
-							formatNode = node;
-						var start = stubData.LocationToOffset (formatNode.StartLocation);
-						if (start > formatStartOffset) {
-							var end = stubData.LocationToOffset (node.EndLocation);
-							formatStartOffset = start;
-							formatLength = end - start;
-						}
-					}
-				}
-				return changes;
-			}
-		}
-		
-		public static void Format (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, MonoDevelop.Ide.Gui.Document data, int startOffset, int endOffset, bool exact, bool formatLastStatementOnly = false)
+		static void Format (PolicyContainer policyParent, IEnumerable<string> mimeTypeChain, TextEditor editor, DocumentContext context, int startOffset, int endOffset, bool exact, bool formatLastStatementOnly = false, OptionSet optionSet = null)
 		{
-			if (data.ParsedDocument == null)
-				return;
-			var ext = data.GetContent<CSharpCompletionTextEditorExtension> ();
-			if (ext == null)
-				return;
-			string text;
-			int formatStartOffset, formatLength, realTextDelta;
-			DomRegion formattingRegion;
-			int startDelta = 1;
+			TextSpan span;
 			if (exact) {
-				text = data.Editor.Text;
-				var seg = ext.GetMemberSegmentAt (startOffset);
-				var seg2 = ext.GetMemberSegmentAt (endOffset);
-				if (seg != null && seg == seg2) {
-					var member = seg.Entity;
-					if (member == null || member.Region.IsEmpty || member.BodyRegion.End.IsEmpty)
-						return;
-
-					text = BuildStub (data, seg, endOffset, out formatStartOffset);
-					startDelta = startOffset - seg.Offset;
-					formatLength = endOffset - startOffset + startDelta;
-					realTextDelta = seg.Offset - formatStartOffset;
-					formattingRegion = new DomRegion (data.Editor.OffsetToLocation (formatStartOffset), data.Editor.OffsetToLocation (endOffset));
-				} else {
-					formatStartOffset = startOffset;
-					formatLength = endOffset - startOffset;
-					realTextDelta = 0;
-					formattingRegion = new DomRegion (data.Editor.OffsetToLocation (startOffset), data.Editor.OffsetToLocation (endOffset));
-				}
+				span = new TextSpan (startOffset, endOffset - startOffset);
 			} else {
-				var seg = ext.GetMemberSegmentAt (startOffset - 1);
-				if (seg == null) {
-					return;
-				}
-				var member = seg.Entity;
-				if (member == null)
-					return;
-	
-				// Build stub
-				text = BuildStub (data, seg, startOffset, out formatStartOffset);
-				formattingRegion = new DomRegion (data.Editor.OffsetToLocation (formatStartOffset), data.Editor.OffsetToLocation (endOffset));
-
-				formatLength = endOffset - seg.Offset;
-				realTextDelta = seg.Offset - formatStartOffset;
+				span = new TextSpan (0, endOffset);
 			}
-			// Get changes from formatting visitor
-			var changes = GetFormattingChanges (policyParent, mimeTypeChain, data, text, formattingRegion, ref formatStartOffset, ref formatLength, formatLastStatementOnly);
-			if (changes == null)
+
+			var analysisDocument = context.AnalysisDocument;
+			if (analysisDocument == null)
 				return;
+			using (var undo = editor.OpenUndoGroup (/*OperationType.Format*/)) {
+				try {
+					var syntaxTree = analysisDocument.GetSyntaxTreeAsync ().Result;
+
+					if (formatLastStatementOnly) {
+						var root = syntaxTree.GetRoot ();
+						var token = root.FindToken (endOffset);
+						var tokens = ICSharpCode.NRefactory6.CSharp.FormattingRangeHelper.FindAppropriateRange (token);
+						if (tokens.HasValue) {
+							span = new TextSpan (tokens.Value.Item1.SpanStart, tokens.Value.Item2.Span.End - tokens.Value.Item1.SpanStart);
+						} else {
+							var parent = token.Parent;
+							if (parent != null)
+								span = parent.FullSpan;
+						}
+					}
 
-			// Do the actual formatting
-//			var originalVersion = data.Editor.Document.Version;
+					if (optionSet == null) {
+						var policy = policyParent.Get<CSharpFormattingPolicy> (mimeTypeChain);
+						var textPolicy = policyParent.Get<TextStylePolicy> (mimeTypeChain);
+						optionSet = policy.CreateOptions (textPolicy);
+					}
 
-			using (var undo = data.Editor.OpenUndoGroup (OperationType.Format)) {
-				try {
-					changes.ApplyChanges (formatStartOffset + startDelta, Math.Max (0, formatLength - startDelta - 1), delegate (int replaceOffset, int replaceLength, string insertText) {
-						int translatedOffset = realTextDelta + replaceOffset;
-						data.Editor.Document.CommitLineUpdate (data.Editor.OffsetToLineNumber (translatedOffset));
-						data.Editor.Replace (translatedOffset, replaceLength, insertText);
-					}, (replaceOffset, replaceLength, insertText) => {
-						int translatedOffset = realTextDelta + replaceOffset;
-						if (translatedOffset < 0 || translatedOffset + replaceLength > data.Editor.Length || replaceLength < 0)
-							return true;
-						return data.Editor.GetTextAt (translatedOffset, replaceLength) == insertText;
-					});
+					var doc = Formatter.FormatAsync (analysisDocument, span, optionSet).Result;
+					var newTree = doc.GetSyntaxTreeAsync ().Result;
+					var caretOffset = editor.CaretOffset;
+
+					int delta = 0;
+					foreach (var change in newTree.GetChanges (syntaxTree)) {
+						if (!exact && change.Span.Start + delta >= caretOffset)
+							continue;
+						var newText = change.NewText;
+						editor.ReplaceText (delta + change.Span.Start, change.Span.Length, newText);
+						delta = delta - change.Span.Length + newText.Length;
+					}
+					if (startOffset < caretOffset) {
+						var caretEndOffset = caretOffset + delta;
+						if (0 <= caretEndOffset && caretEndOffset < editor.Length)
+							editor.CaretOffset = caretEndOffset;
+						if (editor.CaretColumn == 1) {
+							if (editor.CaretLine > 1 && editor.GetLine (editor.CaretLine - 1).Length == 0)
+								editor.CaretLine--;
+							editor.CaretColumn = editor.GetVirtualIndentationColumn (editor.CaretLine);
+						}
+					}
 				} catch (Exception e) {
 					LoggingService.LogError ("Error in on the fly formatter", e);
 				}
-
-//				var currentVersion = data.Editor.Document.Version;
-//				data.Editor.Caret.Offset = originalVersion.MoveOffsetTo (currentVersion, caretOffset, ICSharpCode.NRefactory.Editor.AnchorMovementType.Default);
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml
index be1a18f6b7..076944f828 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/AllmanCSharpPolicy.xml
@@ -27,138 +27,50 @@ THE SOFTWARE.
 -->
 
 <CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>NextLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>NextLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>NextLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>NextLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>NextLine</EventBraceStyle>
-	<EventAddBraceStyle>NextLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>NextLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>NextLine</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>NewLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>NewLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>NewLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>DoNotCare</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>DoNotChange</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>NextLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<IndentBlocksInsideExpressions>True</IndentBlocksInsideExpressions>
+	<IndentBlock>True</IndentBlock>
+	<IndentBraces>False</IndentBraces>
+	<IndentSwitchSection>True</IndentSwitchSection>
+	<IndentSwitchCaseSection>True</IndentSwitchCaseSection>
+	<LabelPositioning>OneLess</LabelPositioning>
+	<NewLinesForBracesInTypes>True</NewLinesForBracesInTypes>
+	<NewLinesForBracesInMethods>True</NewLinesForBracesInMethods>
+	<NewLinesForBracesInProperties>True</NewLinesForBracesInProperties>
+	<NewLinesForBracesInAccessors>True</NewLinesForBracesInAccessors>
+	<NewLinesForBracesInAnonymousMethods>True</NewLinesForBracesInAnonymousMethods>
+	<NewLinesForBracesInControlBlocks>True</NewLinesForBracesInControlBlocks>
+	<NewLinesForBracesInAnonymousTypes>True</NewLinesForBracesInAnonymousTypes>
+	<NewLinesForBracesInObjectCollectionArrayInitializers>True</NewLinesForBracesInObjectCollectionArrayInitializers>
+	<NewLinesForBracesInLambdaExpressionBody>True</NewLinesForBracesInLambdaExpressionBody>
+	<NewLineForElse>True</NewLineForElse>
+	<NewLineForCatch>True</NewLineForCatch>
+	<NewLineForFinally>True</NewLineForFinally>
+	<NewLineForMembersInObjectInit>True</NewLineForMembersInObjectInit>
+	<NewLineForMembersInAnonymousTypes>True</NewLineForMembersInAnonymousTypes>
+	<NewLineForClausesInQuery>True</NewLineForClausesInQuery>
+	<SpacingAfterMethodDeclarationName>False</SpacingAfterMethodDeclarationName>
+	<SpaceWithinMethodDeclarationParenthesis>False</SpaceWithinMethodDeclarationParenthesis>
+	<SpaceBetweenEmptyMethodDeclarationParentheses>False</SpaceBetweenEmptyMethodDeclarationParentheses>
+	<SpaceAfterMethodCallName>False</SpaceAfterMethodCallName>
+	<SpaceWithinMethodCallParentheses>False</SpaceWithinMethodCallParentheses>
+	<SpaceBetweenEmptyMethodCallParentheses>False</SpaceBetweenEmptyMethodCallParentheses>
+	<SpaceAfterControlFlowStatementKeyword>True</SpaceAfterControlFlowStatementKeyword>
+	<SpaceWithinExpressionParentheses>False</SpaceWithinExpressionParentheses>
+	<SpaceWithinCastParentheses>False</SpaceWithinCastParentheses>
+	<SpaceWithinOtherParentheses>False</SpaceWithinOtherParentheses>
+	<SpaceAfterCast>False</SpaceAfterCast>
+	<SpacesIgnoreAroundVariableDeclaration>False</SpacesIgnoreAroundVariableDeclaration>
+	<SpaceBeforeOpenSquareBracket>False</SpaceBeforeOpenSquareBracket>
+	<SpaceBetweenEmptySquareBrackets>False</SpaceBetweenEmptySquareBrackets>
+	<SpaceWithinSquareBrackets>False</SpaceWithinSquareBrackets>
+	<SpaceAfterColonInBaseTypeDeclaration>True</SpaceAfterColonInBaseTypeDeclaration>
+	<SpaceAfterComma>True</SpaceAfterComma>
+	<SpaceAfterDot>False</SpaceAfterDot>
+	<SpaceAfterSemicolonsInForStatement>True</SpaceAfterSemicolonsInForStatement>
+	<SpaceBeforeColonInBaseTypeDeclaration>True</SpaceBeforeColonInBaseTypeDeclaration>
+	<SpaceBeforeComma>False</SpaceBeforeComma>
+	<SpaceBeforeDot>False</SpaceBeforeDot>
+	<SpaceBeforeSemicolonsInForStatement>False</SpaceBeforeSemicolonsInForStatement>
+	<SpacingAroundBinaryOperator>Single</SpacingAroundBinaryOperator>
+	<WrappingPreserveSingleLine>True</WrappingPreserveSingleLine>
+	<WrappingKeepStatementsOnSingleLine>True</WrappingKeepStatementsOnSingleLine>
 </CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml
deleted file mode 100644
index a40b19ac24..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUCSharpPolicy.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<!--
-
-GNUCSharpPolicy.xml
- 
-Author:
-      Mike Krüger <mkrueger@xamarin.com>
-
-Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-
-<CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<PropertyFormatting>AllowOneLine</PropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>EndOfLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>EndOfLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>EndOfLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>EndOfLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>EndOfLine</EventBraceStyle>
-	<EventAddBraceStyle>EndOfLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>EndOfLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>NextLineShifted2</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentBlocksInsideExpressions>False</IndentBlocksInsideExpressions>
-</CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUTextStylePolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUTextStylePolicy.xml
deleted file mode 100644
index e04fa3260f..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/GNUTextStylePolicy.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
-GNUTextStylePolicy.xml
- 
-Author:
-      Mike Krüger <mkrueger@xamarin.com>
-
-Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<TextStylePolicy scope="text/x-csharp">
-	<FileWidth>120</FileWidth>
-	<TabWidth>4</TabWidth>
-	<IndentWidth>2</IndentWidth>
-	<TabsToSpaces>True</TabsToSpaces>
-	<NoTabsAfterNonTabs>False</NoTabsAfterNonTabs>
-	<RemoveTrailingWhitespace>True</RemoveTrailingWhitespace>
-	<EolMarker>Unix</EolMarker>
-</TextStylePolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml
index b9f7b6b8a6..b717463f6c 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/KRCSharpPolicy.xml
@@ -27,138 +27,50 @@ THE SOFTWARE.
 -->
 
 <CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>EndOfLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>EndOfLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>EndOfLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>EndOfLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>EndOfLine</EventBraceStyle>
-	<EventAddBraceStyle>EndOfLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>EndOfLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>EndOfLine</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<IndentBlocksInsideExpressions>False</IndentBlocksInsideExpressions>
+	<IndentBlock>True</IndentBlock>
+	<IndentBraces>False</IndentBraces>
+	<IndentSwitchSection>True</IndentSwitchSection>
+	<IndentSwitchCaseSection>True</IndentSwitchCaseSection>
+	<LabelPositioning>OneLess</LabelPositioning>
+	<NewLinesForBracesInTypes>True</NewLinesForBracesInTypes>
+	<NewLinesForBracesInMethods>True</NewLinesForBracesInMethods>
+	<NewLinesForBracesInProperties>False</NewLinesForBracesInProperties>
+	<NewLinesForBracesInAccessors>False</NewLinesForBracesInAccessors>
+	<NewLinesForBracesInAnonymousMethods>False</NewLinesForBracesInAnonymousMethods>
+	<NewLinesForBracesInControlBlocks>False</NewLinesForBracesInControlBlocks>
+	<NewLinesForBracesInAnonymousTypes>False</NewLinesForBracesInAnonymousTypes>
+	<NewLinesForBracesInObjectCollectionArrayInitializers>False</NewLinesForBracesInObjectCollectionArrayInitializers>
+	<NewLinesForBracesInLambdaExpressionBody>False</NewLinesForBracesInLambdaExpressionBody>
+	<NewLineForElse>False</NewLineForElse>
+	<NewLineForCatch>False</NewLineForCatch>
+	<NewLineForFinally>False</NewLineForFinally>
+	<NewLineForMembersInObjectInit>False</NewLineForMembersInObjectInit>
+	<NewLineForMembersInAnonymousTypes>False</NewLineForMembersInAnonymousTypes>
+	<NewLineForClausesInQuery>False</NewLineForClausesInQuery>
+	<SpacingAfterMethodDeclarationName>False</SpacingAfterMethodDeclarationName>
+	<SpaceWithinMethodDeclarationParenthesis>False</SpaceWithinMethodDeclarationParenthesis>
+	<SpaceBetweenEmptyMethodDeclarationParentheses>False</SpaceBetweenEmptyMethodDeclarationParentheses>
+	<SpaceAfterMethodCallName>False</SpaceAfterMethodCallName>
+	<SpaceWithinMethodCallParentheses>False</SpaceWithinMethodCallParentheses>
+	<SpaceBetweenEmptyMethodCallParentheses>False</SpaceBetweenEmptyMethodCallParentheses>
+	<SpaceAfterControlFlowStatementKeyword>True</SpaceAfterControlFlowStatementKeyword>
+	<SpaceWithinExpressionParentheses>False</SpaceWithinExpressionParentheses>
+	<SpaceWithinCastParentheses>False</SpaceWithinCastParentheses>
+	<SpaceWithinOtherParentheses>False</SpaceWithinOtherParentheses>
+	<SpaceAfterCast>False</SpaceAfterCast>
+	<SpacesIgnoreAroundVariableDeclaration>False</SpacesIgnoreAroundVariableDeclaration>
+	<SpaceBeforeOpenSquareBracket>False</SpaceBeforeOpenSquareBracket>
+	<SpaceBetweenEmptySquareBrackets>False</SpaceBetweenEmptySquareBrackets>
+	<SpaceWithinSquareBrackets>False</SpaceWithinSquareBrackets>
+	<SpaceAfterColonInBaseTypeDeclaration>True</SpaceAfterColonInBaseTypeDeclaration>
+	<SpaceAfterComma>True</SpaceAfterComma>
+	<SpaceAfterDot>False</SpaceAfterDot>
+	<SpaceAfterSemicolonsInForStatement>True</SpaceAfterSemicolonsInForStatement>
+	<SpaceBeforeColonInBaseTypeDeclaration>True</SpaceBeforeColonInBaseTypeDeclaration>
+	<SpaceBeforeComma>False</SpaceBeforeComma>
+	<SpaceBeforeDot>False</SpaceBeforeDot>
+	<SpaceBeforeSemicolonsInForStatement>False</SpaceBeforeSemicolonsInForStatement>
+	<SpacingAroundBinaryOperator>Single</SpacingAroundBinaryOperator>
+	<WrappingPreserveSingleLine>True</WrappingPreserveSingleLine>
+	<WrappingKeepStatementsOnSingleLine>True</WrappingKeepStatementsOnSingleLine>
 </CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml
index 9924d6f2c3..de17e13698 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/MonoCSharpPolicy.xml
@@ -27,140 +27,50 @@ THE SOFTWARE.
 -->
 
 <CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="True">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>False</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>EndOfLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>EndOfLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>EndOfLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>EndOfLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>EndOfLine</EventBraceStyle>
-	<EventAddBraceStyle>EndOfLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>EndOfLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>EndOfLine</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>True</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>True</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>True</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>DoNotCare</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>DoNotCare</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>True</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>True</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>True</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<AlignToFirstIndexerArgument>False</AlignToFirstIndexerArgument>
-	<AlignToFirstMethodCallArgument>False</AlignToFirstMethodCallArgument>
-	<IndentBlocksInsideExpressions>False</IndentBlocksInsideExpressions>
+	<IndentBlock>True</IndentBlock>
+	<IndentBraces>False</IndentBraces>
+	<IndentSwitchSection>False</IndentSwitchSection>
+	<IndentSwitchCaseSection>True</IndentSwitchCaseSection>
+	<LabelPositioning>OneLess</LabelPositioning>
+	<NewLinesForBracesInTypes>True</NewLinesForBracesInTypes>
+	<NewLinesForBracesInMethods>True</NewLinesForBracesInMethods>
+	<NewLinesForBracesInProperties>False</NewLinesForBracesInProperties>
+	<NewLinesForBracesInAccessors>False</NewLinesForBracesInAccessors>
+	<NewLinesForBracesInAnonymousMethods>False</NewLinesForBracesInAnonymousMethods>
+	<NewLinesForBracesInControlBlocks>False</NewLinesForBracesInControlBlocks>
+	<NewLinesForBracesInAnonymousTypes>False</NewLinesForBracesInAnonymousTypes>
+	<NewLinesForBracesInObjectCollectionArrayInitializers>False</NewLinesForBracesInObjectCollectionArrayInitializers>
+	<NewLinesForBracesInLambdaExpressionBody>False</NewLinesForBracesInLambdaExpressionBody>
+	<NewLineForElse>False</NewLineForElse>
+	<NewLineForCatch>False</NewLineForCatch>
+	<NewLineForFinally>False</NewLineForFinally>
+	<NewLineForMembersInObjectInit>False</NewLineForMembersInObjectInit>
+	<NewLineForMembersInAnonymousTypes>False</NewLineForMembersInAnonymousTypes>
+	<NewLineForClausesInQuery>False</NewLineForClausesInQuery>
+	<SpacingAfterMethodDeclarationName>True</SpacingAfterMethodDeclarationName>
+	<SpaceWithinMethodDeclarationParenthesis>False</SpaceWithinMethodDeclarationParenthesis>
+	<SpaceBetweenEmptyMethodDeclarationParentheses>False</SpaceBetweenEmptyMethodDeclarationParentheses>
+	<SpaceAfterMethodCallName>True</SpaceAfterMethodCallName>
+	<SpaceWithinMethodCallParentheses>False</SpaceWithinMethodCallParentheses>
+	<SpaceBetweenEmptyMethodCallParentheses>False</SpaceBetweenEmptyMethodCallParentheses>
+	<SpaceAfterControlFlowStatementKeyword>True</SpaceAfterControlFlowStatementKeyword>
+	<SpaceWithinExpressionParentheses>False</SpaceWithinExpressionParentheses>
+	<SpaceWithinCastParentheses>False</SpaceWithinCastParentheses>
+	<SpaceWithinOtherParentheses>False</SpaceWithinOtherParentheses>
+	<SpaceAfterCast>False</SpaceAfterCast>
+	<SpacesIgnoreAroundVariableDeclaration>False</SpacesIgnoreAroundVariableDeclaration>
+	<SpaceBeforeOpenSquareBracket>True</SpaceBeforeOpenSquareBracket>
+	<SpaceBetweenEmptySquareBrackets>False</SpaceBetweenEmptySquareBrackets>
+	<SpaceWithinSquareBrackets>False</SpaceWithinSquareBrackets>
+	<SpaceAfterColonInBaseTypeDeclaration>True</SpaceAfterColonInBaseTypeDeclaration>
+	<SpaceAfterComma>True</SpaceAfterComma>
+	<SpaceAfterDot>False</SpaceAfterDot>
+	<SpaceAfterSemicolonsInForStatement>True</SpaceAfterSemicolonsInForStatement>
+	<SpaceBeforeColonInBaseTypeDeclaration>True</SpaceBeforeColonInBaseTypeDeclaration>
+	<SpaceBeforeComma>False</SpaceBeforeComma>
+	<SpaceBeforeDot>False</SpaceBeforeDot>
+	<SpaceBeforeSemicolonsInForStatement>False</SpaceBeforeSemicolonsInForStatement>
+	<SpacingAroundBinaryOperator>Single</SpacingAroundBinaryOperator>
+	<WrappingPreserveSingleLine>True</WrappingPreserveSingleLine>
+	<WrappingKeepStatementsOnSingleLine>True</WrappingKeepStatementsOnSingleLine>
 </CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml
deleted file mode 100644
index 396628950f..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/SharpDevelopCSharpPolicy.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--
-
-SharpDevelopCSharpPolicy.xml
- 
-Author:
-      Mike Krüger <mkrueger@xamarin.com>
-
-Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLine</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLine</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLine</InterfaceBraceStyle>
-	<StructBraceStyle>NextLine</StructBraceStyle>
-	<EnumBraceStyle>NextLine</EnumBraceStyle>
-	<MethodBraceStyle>NextLine</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>EndOfLine</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLine</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLine</DestructorBraceStyle>
-	<PropertyBraceStyle>EndOfLine</PropertyBraceStyle>
-	<PropertyGetBraceStyle>EndOfLine</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>EndOfLine</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>EndOfLine</EventBraceStyle>
-	<EventAddBraceStyle>EndOfLine</EventAddBraceStyle>
-	<EventRemoveBraceStyle>EndOfLine</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>EndOfLine</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<IndentBlocksInsideExpressions>False</IndentBlocksInsideExpressions>
-</CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml
deleted file mode 100644
index f4ed3e864e..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/policies/WhitesmithsCSharpPolicy.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--
-
-WhitesmithsCSharpPolicy.xml
- 
-Author:
-      Mike Krüger <mkrueger@xamarin.com>
-
-Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<CSharpFormattingPolicy scope="text/x-csharp" allowDiffSerialize="False">
-	<IndentNamespaceBody>True</IndentNamespaceBody>
-	<IndentClassBody>True</IndentClassBody>
-	<IndentInterfaceBody>True</IndentInterfaceBody>
-	<IndentStructBody>True</IndentStructBody>
-	<IndentEnumBody>True</IndentEnumBody>
-	<IndentMethodBody>True</IndentMethodBody>
-	<IndentPropertyBody>True</IndentPropertyBody>
-	<IndentEventBody>True</IndentEventBody>
-	<IndentBlocks>True</IndentBlocks>
-	<IndentSwitchBody>True</IndentSwitchBody>
-	<IndentCaseBody>True</IndentCaseBody>
-	<IndentBreakStatements>True</IndentBreakStatements>
-	<AlignEmbeddedStatements>True</AlignEmbeddedStatements>
-	<SimplePropertyFormatting>AllowOneLine</SimplePropertyFormatting>
-	<AutoPropertyFormatting>AllowOneLine</AutoPropertyFormatting>
-	<NamespaceBraceStyle>NextLineShifted</NamespaceBraceStyle>
-	<ClassBraceStyle>NextLineShifted</ClassBraceStyle>
-	<InterfaceBraceStyle>NextLineShifted</InterfaceBraceStyle>
-	<StructBraceStyle>NextLineShifted</StructBraceStyle>
-	<EnumBraceStyle>NextLineShifted</EnumBraceStyle>
-	<MethodBraceStyle>NextLineShifted</MethodBraceStyle>
-	<AnonymousMethodBraceStyle>NextLineShifted</AnonymousMethodBraceStyle>
-	<ConstructorBraceStyle>NextLineShifted</ConstructorBraceStyle>
-	<DestructorBraceStyle>NextLineShifted</DestructorBraceStyle>
-	<PropertyBraceStyle>NextLineShifted</PropertyBraceStyle>
-	<PropertyGetBraceStyle>NextLineShifted</PropertyGetBraceStyle>
-	<PropertySetBraceStyle>NextLineShifted</PropertySetBraceStyle>
-	<SimpleGetBlockFormatting>AllowOneLine</SimpleGetBlockFormatting>
-	<SimpleSetBlockFormatting>AllowOneLine</SimpleSetBlockFormatting>
-	<EventBraceStyle>NextLineShifted</EventBraceStyle>
-	<EventAddBraceStyle>NextLineShifted</EventAddBraceStyle>
-	<EventRemoveBraceStyle>NextLineShifted</EventRemoveBraceStyle>
-	<AllowEventAddBlockInline>True</AllowEventAddBlockInline>
-	<AllowEventRemoveBlockInline>True</AllowEventRemoveBlockInline>
-	<StatementBraceStyle>NextLineShifted</StatementBraceStyle>
-	<AllowIfBlockInline>False</AllowIfBlockInline>
-	<ElseNewLinePlacement>SameLine</ElseNewLinePlacement>
-	<ElseIfNewLinePlacement>SameLine</ElseIfNewLinePlacement>
-	<CatchNewLinePlacement>SameLine</CatchNewLinePlacement>
-	<FinallyNewLinePlacement>SameLine</FinallyNewLinePlacement>
-	<WhileNewLinePlacement>SameLine</WhileNewLinePlacement>
-	<ArrayInitializerWrapping>WrapIfTooLong</ArrayInitializerWrapping>
-	<ArrayInitializerBraceStyle>EndOfLine</ArrayInitializerBraceStyle>
-	<KeepCommentsAtFirstColumn>True</KeepCommentsAtFirstColumn>
-	<BeforeMethodDeclarationParentheses>False</BeforeMethodDeclarationParentheses>
-	<BetweenEmptyMethodDeclarationParentheses>False</BetweenEmptyMethodDeclarationParentheses>
-	<BeforeMethodDeclarationParameterComma>False</BeforeMethodDeclarationParameterComma>
-	<AfterMethodDeclarationParameterComma>True</AfterMethodDeclarationParameterComma>
-	<WithinMethodDeclarationParentheses>False</WithinMethodDeclarationParentheses>
-	<BeforeMethodCallParentheses>False</BeforeMethodCallParentheses>
-	<BetweenEmptyMethodCallParentheses>False</BetweenEmptyMethodCallParentheses>
-	<BeforeMethodCallParameterComma>False</BeforeMethodCallParameterComma>
-	<AfterMethodCallParameterComma>True</AfterMethodCallParameterComma>
-	<WithinMethodCallParentheses>False</WithinMethodCallParentheses>
-	<BeforeFieldDeclarationComma>False</BeforeFieldDeclarationComma>
-	<AfterFieldDeclarationComma>True</AfterFieldDeclarationComma>
-	<BeforeLocalVariableDeclarationComma>False</BeforeLocalVariableDeclarationComma>
-	<AfterLocalVariableDeclarationComma>True</AfterLocalVariableDeclarationComma>
-	<BeforeConstructorDeclarationParentheses>False</BeforeConstructorDeclarationParentheses>
-	<BetweenEmptyConstructorDeclarationParentheses>False</BetweenEmptyConstructorDeclarationParentheses>
-	<BeforeConstructorDeclarationParameterComma>False</BeforeConstructorDeclarationParameterComma>
-	<AfterConstructorDeclarationParameterComma>True</AfterConstructorDeclarationParameterComma>
-	<WithinConstructorDeclarationParentheses>False</WithinConstructorDeclarationParentheses>
-	<NewLineBeforeConstructorInitializerColon>NewLine</NewLineBeforeConstructorInitializerColon>
-	<NewLineAfterConstructorInitializerColon>SameLine</NewLineAfterConstructorInitializerColon>
-	<BeforeIndexerDeclarationBracket>True</BeforeIndexerDeclarationBracket>
-	<WithinIndexerDeclarationBracket>False</WithinIndexerDeclarationBracket>
-	<BeforeIndexerDeclarationParameterComma>False</BeforeIndexerDeclarationParameterComma>
-	<AfterIndexerDeclarationParameterComma>True</AfterIndexerDeclarationParameterComma>
-	<BeforeDelegateDeclarationParentheses>False</BeforeDelegateDeclarationParentheses>
-	<BetweenEmptyDelegateDeclarationParentheses>False</BetweenEmptyDelegateDeclarationParentheses>
-	<BeforeDelegateDeclarationParameterComma>False</BeforeDelegateDeclarationParameterComma>
-	<AfterDelegateDeclarationParameterComma>False</AfterDelegateDeclarationParameterComma>
-	<WithinDelegateDeclarationParentheses>False</WithinDelegateDeclarationParentheses>
-	<NewParentheses>False</NewParentheses>
-	<IfParentheses>True</IfParentheses>
-	<WhileParentheses>True</WhileParentheses>
-	<ForParentheses>True</ForParentheses>
-	<ForeachParentheses>True</ForeachParentheses>
-	<CatchParentheses>True</CatchParentheses>
-	<SwitchParentheses>True</SwitchParentheses>
-	<LockParentheses>True</LockParentheses>
-	<UsingParentheses>True</UsingParentheses>
-	<AroundAssignmentParentheses>True</AroundAssignmentParentheses>
-	<AroundLogicalOperatorParentheses>True</AroundLogicalOperatorParentheses>
-	<AroundEqualityOperatorParentheses>True</AroundEqualityOperatorParentheses>
-	<AroundRelationalOperatorParentheses>True</AroundRelationalOperatorParentheses>
-	<AroundBitwiseOperatorParentheses>True</AroundBitwiseOperatorParentheses>
-	<AroundAdditiveOperatorParentheses>True</AroundAdditiveOperatorParentheses>
-	<AroundMultiplicativeOperatorParentheses>True</AroundMultiplicativeOperatorParentheses>
-	<AroundShiftOperatorParentheses>True</AroundShiftOperatorParentheses>
-	<AroundNullCoalescingOperator>True</AroundNullCoalescingOperator>
-	<WithinParentheses>False</WithinParentheses>
-	<WithinIfParentheses>False</WithinIfParentheses>
-	<WithinWhileParentheses>False</WithinWhileParentheses>
-	<WithinForParentheses>False</WithinForParentheses>
-	<WithinForEachParentheses>False</WithinForEachParentheses>
-	<WithinCatchParentheses>False</WithinCatchParentheses>
-	<WithinSwitchParentheses>False</WithinSwitchParentheses>
-	<WithinLockParentheses>False</WithinLockParentheses>
-	<WithinUsingParentheses>False</WithinUsingParentheses>
-	<WithinCastParentheses>False</WithinCastParentheses>
-	<WithinSizeOfParentheses>False</WithinSizeOfParentheses>
-	<BeforeSizeOfParentheses>False</BeforeSizeOfParentheses>
-	<WithinTypeOfParentheses>False</WithinTypeOfParentheses>
-	<WithinNewParentheses>False</WithinNewParentheses>
-	<BetweenEmptyNewParentheses>False</BetweenEmptyNewParentheses>
-	<BeforeNewParameterComma>False</BeforeNewParameterComma>
-	<AfterNewParameterComma>True</AfterNewParameterComma>
-	<BeforeTypeOfParentheses>False</BeforeTypeOfParentheses>
-	<WithinCheckedExpressionParantheses>False</WithinCheckedExpressionParantheses>
-	<ConditionalOperatorBeforeConditionSpace>True</ConditionalOperatorBeforeConditionSpace>
-	<ConditionalOperatorAfterConditionSpace>True</ConditionalOperatorAfterConditionSpace>
-	<ConditionalOperatorBeforeSeparatorSpace>True</ConditionalOperatorBeforeSeparatorSpace>
-	<ConditionalOperatorAfterSeparatorSpace>True</ConditionalOperatorAfterSeparatorSpace>
-	<SpacesWithinBrackets>False</SpacesWithinBrackets>
-	<SpacesBeforeBrackets>False</SpacesBeforeBrackets>
-	<BeforeBracketComma>False</BeforeBracketComma>
-	<AfterBracketComma>True</AfterBracketComma>
-	<SpacesBeforeForSemicolon>False</SpacesBeforeForSemicolon>
-	<SpacesAfterForSemicolon>True</SpacesAfterForSemicolon>
-	<SpacesAfterTypecast>False</SpacesAfterTypecast>
-	<SpacesBeforeArrayDeclarationBrackets>False</SpacesBeforeArrayDeclarationBrackets>
-	<BlankLinesBeforeUsings>0</BlankLinesBeforeUsings>
-	<BlankLinesAfterUsings>1</BlankLinesAfterUsings>
-	<BlankLinesBeforeFirstDeclaration>0</BlankLinesBeforeFirstDeclaration>
-	<BlankLinesBetweenTypes>1</BlankLinesBetweenTypes>
-	<BlankLinesBetweenFields>0</BlankLinesBetweenFields>
-	<BlankLinesBetweenEventFields>0</BlankLinesBetweenEventFields>
-	<BlankLinesBetweenMembers>1</BlankLinesBetweenMembers>
-	<BlankLinesInsideRegion>1</BlankLinesInsideRegion>
-	<BlankLinesAroundRegion>1</BlankLinesAroundRegion>
-	<IndentPreprocessorDirectives>True</IndentPreprocessorDirectives>
-	<IndentBlocksInsideExpressions>True</IndentBlocksInsideExpressions>
-</CSharpFormattingPolicy>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/AbstractKeywordHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/AbstractKeywordHighlighter.cs
new file mode 100644
index 0000000000..72ff5203dc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/AbstractKeywordHighlighter.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.Implementation.Highlighting
+{
+	interface IHighlighter
+	{
+		IEnumerable<TextSpan> GetHighlights (
+			SyntaxNode root, int position, CancellationToken cancellationToken);
+		
+	}
+	internal abstract class AbstractKeywordHighlighter<TNode> : IHighlighter
+		where TNode : SyntaxNode
+	{
+		public IEnumerable<TextSpan> GetHighlights(
+			SyntaxNode root, int position, CancellationToken cancellationToken)
+		{
+			foreach (var token in GetTokens(root, position))
+			{
+				for (var parent = token.Parent; parent != null; parent = parent.Parent)
+				{
+					if (parent is TNode)
+					{
+						var highlights = GetHighlights((TNode)parent, cancellationToken);
+
+						// Only return them if any of them matched
+						if (highlights.Any(span => span.IntersectsWith(position)))
+						{
+							// Return the non-empty spans
+							return highlights.Where(s => !s.IsEmpty).Distinct();
+						}
+					}
+				}
+			}
+
+			return SpecializedCollections.EmptyEnumerable<TextSpan>();
+		}
+
+		protected abstract IEnumerable<TextSpan> GetHighlights(TNode node, CancellationToken cancellationToken);
+
+		protected TextSpan EmptySpan(int position)
+		{
+			return new TextSpan(position, 0);
+		}
+
+		internal static IEnumerable<SyntaxToken> GetTokens(
+			SyntaxNode root,
+			int position)
+		{
+			var tokens1 = GetTokens(root, position, findInsideTrivia: true);
+			var tokens2 = GetTokens(root, position, findInsideTrivia: false);
+			return tokens1.Concat(tokens2);
+		}
+
+		private static IEnumerable<SyntaxToken> GetTokens(
+			SyntaxNode root,
+			int position,
+			bool findInsideTrivia)
+		{
+			yield return root.FindToken(position - 0, findInsideTrivia);
+
+			if (position > 0)
+			{
+				yield return root.FindToken(position - 1, findInsideTrivia);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs
index 9b252d0c6e..36e297bd6b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs
@@ -24,78 +24,119 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using Mono.TextEditor;
 using MonoDevelop.CSharp.Formatting;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.CSharp.Highlighting
 {
-	class CSharpSelectionSurroundingProvider : DefaultSelectionSurroundingProvider
+	class CSharpSelectionSurroundingProvider : SelectionSurroundingProvider
 	{
-		MonoDevelop.Ide.Gui.Document document;
+		readonly DocumentContext context;
+		readonly TextEditor editor;
 
-		public CSharpSelectionSurroundingProvider (MonoDevelop.Ide.Gui.Document document)
+		public CSharpSelectionSurroundingProvider (MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context)
 		{
-			this.document = document;
+			this.editor = editor;
+			this.context = context;
 		}
 
-		public override bool GetSelectionSurroundings (TextEditorData textEditorData, uint unicodeKey, out string start, out string end)
+		#region SelectionSurroundingProvider implementation
+
+		public override bool GetSelectionSurroundings (uint unicodeKey, out string start, out string end)
 		{
-			if (unicodeKey == '/') {
+			switch ((char)unicodeKey) {
+			case '"':
+				start = editor.SelectionRegion.BeginLine != editor.SelectionRegion.EndLine ? "@\"" : "\"";
+				end = "\"";
+				return true;
+			case '\'':
+				start = end = "'";
+				return true;
+			case '(':
+				start = "(";
+				end = ")";
+				return true;
+			case '<':
+				start = "<";
+				end = ">";
+				return true;
+			case '[':
+				start = "[";
+				end = "]";
+				return true;
+			case '{':
+				start = "{";
+				end = "}";
+				return true;
+			case '/':
 				start = "/*";
 				end = "*/";
 				return true;
+			default:
+				start = end = "";
+				return false;
 			}
-
-			if (unicodeKey == '"') {
-				start = textEditorData.MainSelection.Anchor.Line != textEditorData.MainSelection.Lead.Line ? "@\"" : "\"";
-				end = "\"";
-				return true;
-			}
-			return base.GetSelectionSurroundings (textEditorData, unicodeKey, out start, out end);
 		}
 
-		public override void HandleSpecialSelectionKey (TextEditorData textEditorData,uint unicodeKey)
+		public override void HandleSpecialSelectionKey (uint unicodeKey)
 		{
 			string start, end;
-			GetSelectionSurroundings (textEditorData, unicodeKey, out start, out end);
-			var selection = textEditorData.MainSelection;
+			((SelectionSurroundingProvider)this).GetSelectionSurroundings (unicodeKey, out start, out end);
+
+			if (editor.SelectionMode == SelectionMode.Block) {
+				var selection = editor.SelectionRegion;
+				int startCol = System.Math.Min (selection.Begin.Column, selection.End.Column) - 1;
+				int endCol = System.Math.Max (selection.Begin.Column, selection.End.Column);
+
+				int minLine = System.Math.Min (selection.Begin.Line, selection.End.Line);
+				int maxLine = System.Math.Max (selection.BeginLine, selection.End.Line);
 
-			if (textEditorData.MainSelection.SelectionMode == SelectionMode.Block) {
-				int startCol = System.Math.Min (selection.Anchor.Column, selection.Lead.Column) - 1;
-				int endCol = System.Math.Max (selection.Anchor.Column, selection.Lead.Column);
-				for (int lineNumber = selection.MinLine; lineNumber <= selection.MaxLine; lineNumber++) {
-					DocumentLine lineSegment = textEditorData.GetLine (lineNumber);
+
+				for (int lineNumber = minLine; lineNumber <= maxLine; lineNumber++) {
+					var lineSegment = editor.GetLine (lineNumber);
 
 					if (lineSegment.Offset + startCol < lineSegment.EndOffset)
-						textEditorData.Insert (lineSegment.Offset + startCol, start);
+						editor.InsertText (lineSegment.Offset + startCol, start);
 					if (lineSegment.Offset + endCol < lineSegment.EndOffset)
-						textEditorData.Insert (lineSegment.Offset + endCol, end);
+						editor.InsertText (lineSegment.Offset + endCol, end);
 				}
 
-				textEditorData.MainSelection = new Selection (
-					new DocumentLocation (selection.Anchor.Line, endCol == selection.Anchor.Column ? endCol + start.Length : startCol + 1 + start.Length),
-					new DocumentLocation (selection.Lead.Line, endCol == selection.Anchor.Column ? startCol + 1 + start.Length : endCol + start.Length),
-					Mono.TextEditor.SelectionMode.Block);
-				textEditorData.Document.CommitMultipleLineUpdate (textEditorData.MainSelection.MinLine, textEditorData.MainSelection.MaxLine);
+//				textEditorData.MainSelection = new Selection (
+//					new DocumentLocation (selection.Anchor.Line, endCol == selection.Anchor.Column ? endCol + start.Length : startCol + 1 + start.Length),
+//					new DocumentLocation (selection.Lead.Line, endCol == selection.Anchor.Column ? startCol + 1 + start.Length : endCol + start.Length),
+//					Mono.TextEditor.SelectionMode.Block);
 			} else {
-				int anchorOffset = selection.GetAnchorOffset (textEditorData);
-				int leadOffset = selection.GetLeadOffset (textEditorData);
-				if (leadOffset < anchorOffset) {
-					int tmp = anchorOffset;
-					anchorOffset = leadOffset;
-					leadOffset = tmp;
-				}
-				textEditorData.Insert (anchorOffset, start);
-				textEditorData.Insert (leadOffset >= anchorOffset ? leadOffset + start.Length : leadOffset, end);
-			//	textEditorData.SetSelection (anchorOffset + start.Length, leadOffset + start.Length);
-				if (CSharpTextEditorIndentation.OnTheFlyFormatting) {
-					var l1 = textEditorData.GetLineByOffset (anchorOffset);
-					var l2 = textEditorData.GetLineByOffset (leadOffset);
-					OnTheFlyFormatter.Format (document, l1.Offset, l2.EndOffsetIncludingDelimiter);
+				var selectionRange = editor.SelectionRange;
+				int anchorOffset = selectionRange.Offset;
+				int leadOffset = selectionRange.EndOffset;
+				var text = editor.GetTextAt (selectionRange);
+				if (editor.Options.GenerateFormattingUndoStep) {
+					using (var undo = editor.OpenUndoGroup ()) {
+						editor.ReplaceText (selectionRange, start);
+					}
+					using (var undo = editor.OpenUndoGroup ()) {
+						editor.ReplaceText (anchorOffset, 1, start + text + end);
+						editor.SetSelection (anchorOffset + start.Length, leadOffset + start.Length + end.Length);
+					}
+					if (unicodeKey == '{') {
+						using (var undo = editor.OpenUndoGroup ()) {
+							OnTheFlyFormatter.Format (editor, context, anchorOffset + start.Length - 1, leadOffset + start.Length + end.Length);
+						}
+					}
+				} else {
+					using (var undo = editor.OpenUndoGroup ()) {
+						editor.InsertText (anchorOffset, start);
+						editor.InsertText (leadOffset >= anchorOffset ? leadOffset + start.Length : leadOffset, end);
+						if (unicodeKey == '{') {
+							OnTheFlyFormatter.Format (editor, context, anchorOffset + start.Length, leadOffset + start.Length + end.Length);
+						} else {
+							editor.SetSelection (anchorOffset + start.Length, leadOffset + start.Length + end.Length);
+						}
+					}
 				}
 			}
 		}
-
+		#endregion
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
index 968f5db7f7..d1633673de 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
@@ -28,30 +28,17 @@
 
 using System;
 using System.Linq;
-using System.Collections.Generic;
-using Mono.TextEditor.Highlighting;
-using Mono.TextEditor;
-using System.Xml;
-using MonoDevelop.Projects;
-using MonoDevelop.CSharp.Project;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Tasks;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Analysis;
+using Microsoft.CodeAnalysis.Text;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using MonoDevelop.SourceEditor.QuickTasks;
 using System.Threading;
-using System.Diagnostics;
-using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Analysis;
-using ICSharpCode.NRefactory;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.Refactoring;
-
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Core.Text;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
 
 namespace MonoDevelop.CSharp.Highlighting
 {
@@ -68,611 +55,184 @@ namespace MonoDevelop.CSharp.Highlighting
 			return true;
 		}
 	}
-	
-	class CSharpSyntaxMode : SyntaxMode, IQuickTaskProvider, IDisposable
-	{
-		readonly Document guiDocument;
-
-		CSharpAstResolver resolver;
-		CancellationTokenSource src;
 
-		public bool SemanticHighlightingEnabled {
-			get {
-				return true;
-			}
-		}
+	class CSharpSyntaxMode : SemanticHighlighting
+	{
+		HighlightingSegmentTree highlightTree;
+		CancellationTokenSource src = new CancellationTokenSource ();
 
-		internal class StyledTreeSegment : TreeSegment
+		public CSharpSyntaxMode (TextEditor editor, DocumentContext documentContext) : base (editor, documentContext)
 		{
-			public string Style {
-				get;
-				private set;
-			}
-			
-			public StyledTreeSegment (int offset, int length, string style) : base (offset, length)
-			{
-				Style = style;
-			}
+			DocumentParsed ();
 		}
-		
-		class HighlightingSegmentTree : SegmentTree<StyledTreeSegment>
-		{
-			public bool GetStyle (Chunk chunk, ref int endOffset, out string style)
-			{
-				var segment = GetSegmentsAt (chunk.Offset).FirstOrDefault ();
-				if (segment == null) {
-					style = null;
-					return false;
-				}
-				endOffset = segment.EndOffset;
-				style = segment.Style;
-				return true;
-			}
-			
-			public void AddStyle (int startOffset, int endOffset, string style)
-			{
-				if (IsDirty)
-					return;
-				Add (new StyledTreeSegment (startOffset, endOffset - startOffset, style));
-			}
-		}
-		
-		Dictionary<DocumentLine, HighlightingVisitior> lineSegments = new Dictionary<DocumentLine, HighlightingVisitior> ();
 
-		public bool DisableConditionalHighlighting {
-			get;
-			set;
-		}
+		#region implemented abstract members of SemanticHighlighting
 
-		public static IEnumerable<string> GetDefinedSymbols (MonoDevelop.Projects.Project project)
+		protected override void DocumentParsed ()
 		{
-			var workspace = IdeApp.Workspace;
-			if (workspace == null || project == null)
-				yield break;
-			var configuration = project.GetConfiguration (workspace.ActiveConfiguration) as DotNetProjectConfiguration;
-			if (configuration != null) {
-				foreach (string s in configuration.GetDefineSymbols ())
-					yield return s;
-				// Workaround for mcs defined symbol
-				if (configuration.TargetRuntime.RuntimeId == "Mono") 
-					yield return "__MonoCS__";
-			}
-		}
-
-		void HandleDocumentParsed (object sender, EventArgs e)
-		{
-			if (src != null)
-				src.Cancel ();
-			resolver = null;
-			if (guiDocument.IsProjectContextInUpdate) {
+			var parsedDocument = documentContext.ParsedDocument;
+			if (parsedDocument == null)
 				return;
-			}
-			if (guiDocument != null && SemanticHighlightingEnabled) {
-				var parsedDocument = guiDocument.ParsedDocument;
-				if (parsedDocument != null) {
-					if (guiDocument.Project != null && guiDocument.IsCompileableInProject) {
-						src = new CancellationTokenSource ();
-						var newResolverTask = guiDocument.GetSharedResolver ();
-						var cancellationToken = src.Token;
-						System.Threading.Tasks.Task.Factory.StartNew (delegate {
-							if (newResolverTask == null)
-								return;
-							var newResolver = newResolverTask.Result;
-							if (newResolver == null)
-								return;
-							var visitor = new QuickTaskVisitor (newResolver, cancellationToken);
-							try {
-								newResolver.RootNode.AcceptVisitor (visitor);
-							} catch (Exception ex) {
-								LoggingService.LogError ("Error while analyzing the file for the semantic highlighting.", ex);
-								return;
-							}
-							if (!cancellationToken.IsCancellationRequested) {
-								Gtk.Application.Invoke (delegate {
-									if (cancellationToken.IsCancellationRequested)
-										return;
-									var editorData = guiDocument.Editor;
-									if (editorData == null)
-										return;
-//									compilation = newResolver.Compilation;
-									resolver = newResolver;
-									quickTasks = visitor.QuickTasks;
-									OnTasksUpdated (EventArgs.Empty);
-									foreach (var kv in lineSegments) {
-										try {
-											kv.Value.tree.RemoveListener ();
-										} catch (Exception) {
-										}
-									}
-									lineSegments.Clear ();
-									var textEditor = editorData.Parent;
-									if (textEditor != null) {
-										if (!parsedDocument.HasErrors) {
-											var margin = textEditor.TextViewMargin;
-											margin.PurgeLayoutCache ();
-											textEditor.QueueDraw ();
-										}
-									}
-								});
-							}
-						}, cancellationToken);
-					}
-				}
-			}
-		}
-
-		class HighlightingVisitior : SemanticHighlightingVisitor<string>
-		{
-			readonly int lineNumber;
-			readonly int lineOffset;
-			readonly int lineLength;
-			internal HighlightingSegmentTree tree = new HighlightingSegmentTree ();
-
-			public HighlightingVisitior (CSharpAstResolver resolver, CancellationToken cancellationToken, int lineNumber, int lineOffset, int lineLength)
-			{
-				if (resolver == null)
-					throw new ArgumentNullException ("resolver");
-				this.resolver = resolver;
-				this.cancellationToken = cancellationToken;
-				this.lineNumber = lineNumber;
-				this.lineOffset = lineOffset;
-				this.lineLength = lineLength;
-				regionStart = new TextLocation (lineNumber, 1);
-				regionEnd  = new TextLocation (lineNumber, lineLength);
-
-				Setup ();
-			}
-
-			void Setup ()
-			{
-				defaultTextColor = "Plain Text";
-				referenceTypeColor = "User Types";
-				valueTypeColor = "User Types(Value types)";
-				interfaceTypeColor = "User Types(Interfaces)";
-				enumerationTypeColor = "User Types(Enums)";
-				typeParameterTypeColor = "User Types(Type parameters)";
-				delegateTypeColor = "User Types(Delegates)";
-
-				methodCallColor = "User Method Usage";
-				methodDeclarationColor = "User Method Declaration";
-
-				eventDeclarationColor = "User Event Declaration";
-				eventAccessColor = "User Event Usage";
-
-				fieldDeclarationColor ="User Field Declaration";
-				fieldAccessColor = "User Field Usage";
-
-				propertyDeclarationColor = "User Property Declaration";
-				propertyAccessColor = "User Property Usage";
-
-				variableDeclarationColor = "User Variable Declaration";
-				variableAccessColor = "User Variable Usage";
-
-				parameterDeclarationColor = "User Parameter Declaration";
-				parameterAccessColor = "User Parameter Usage";
-
-				valueKeywordColor = "Keyword(Context)";
-				externAliasKeywordColor = "Keyword(Namespace)";
-				varKeywordTypeColor = "Keyword(Type)";
+			var resolver = parsedDocument.GetAst<SemanticModel> ();
+			if (resolver == null)
+				return;
+			CancelHighlightingTask ();
+			var token = src.Token;
 
-				parameterModifierColor = "Keyword(Parameter)";
-				inactiveCodeColor = "Excluded Code";
-				syntaxErrorColor = "Syntax Error";
+			Task.Run (async delegate {
+				try {
+					var root = await resolver.SyntaxTree.GetRootAsync (token);
+					var newTree = new HighlightingSegmentTree ();
 
-				stringFormatItemColor = "String Format Items";
-			}
-
-			protected override void Colorize(TextLocation start, TextLocation end, string color)
-			{
-				int startOffset;
-				if (start.Line == lineNumber) {
-					startOffset = lineOffset + start.Column - 1;
-				} else {
-					if (start.Line > lineNumber)
-						return;
-					startOffset = lineOffset;
-				}
-				int endOffset;
-				if (end.Line == lineNumber) {
-					endOffset = lineOffset +end.Column - 1;
-				} else {
-					if (end.Line < lineNumber)
-						return;
-					endOffset = lineOffset + lineLength;
-				}
-				tree.AddStyle (startOffset, endOffset, color);
-			}
+					var visitor = new HighlightingVisitior (resolver, newTree.Add, token, TextSegment.FromBounds(0, root.FullSpan.Length));
+					visitor.Visit (root);
 
-			public override void VisitSimpleType (SimpleType simpleType)
-			{
-				var identifierToken = simpleType.IdentifierToken;
-				VisitChildrenUntil(simpleType, identifierToken);
-				var resolveResult = resolver.Resolve (simpleType, cancellationToken);
-				if (resolveResult.Type.Namespace == "System") {
-					switch (resolveResult.Type.Name) {
-					case "nfloat":
-					case "nint":
-					case "nuint":
-						Colorize(identifierToken, "Keyword(Type)");
-						break;
-					default:
-						Colorize (identifierToken, resolveResult);
-						break;
+					if (!token.IsCancellationRequested) {
+						Gtk.Application.Invoke (delegate {
+							if (token.IsCancellationRequested)
+								return;
+							if (highlightTree != null) {
+								highlightTree.RemoveListener ();
+							}
+							highlightTree = newTree;
+							highlightTree.InstallListener (editor);
+							NotifySemanticHighlightingUpdate ();
+						});
 					}
-				} else {
-					Colorize (identifierToken, resolveResult);
-				}
-				VisitChildrenAfter(simpleType, identifierToken);
-			}
-
-			public override void VisitIdentifierExpression (IdentifierExpression identifierExpression)
-			{
-				var identifier = identifierExpression.IdentifierToken;
-				VisitChildrenUntil(identifierExpression, identifier);
-				if (isInAccessorContainingValueParameter && identifierExpression.Identifier == "value") {
-					Colorize(identifier, valueKeywordColor);
-				} else {
-					var resolveResult = resolver.Resolve (identifierExpression, cancellationToken);
-					Colorize (identifier, resolveResult);
+				} catch (OperationCanceledException) {
+				} catch (AggregateException ae) {
+					ae.Flatten ().Handle (x => x is OperationCanceledException); 
 				}
-				VisitChildrenAfter(identifierExpression, identifier);
-			}
+			}, token);
 		}
 
-		class QuickTaskVisitor : DepthFirstAstVisitor
+		void CancelHighlightingTask ()
 		{
-			internal List<QuickTask> QuickTasks = new List<QuickTask> ();
-			readonly CSharpAstResolver resolver;
-			readonly CancellationToken cancellationToken;
-
-			public QuickTaskVisitor (CSharpAstResolver resolver, CancellationToken cancellationToken)
-			{
-				this.resolver = resolver;
-				this.cancellationToken = cancellationToken;
-			}
-			
-			protected override void VisitChildren (AstNode node)
-			{
-				if (cancellationToken.IsCancellationRequested)
-					return;
-				base.VisitChildren (node);
-			}
-
-			public override void VisitIdentifierExpression (IdentifierExpression identifierExpression)
-			{
-				base.VisitIdentifierExpression (identifierExpression);
-				var result = resolver.Resolve (identifierExpression, cancellationToken);
-				if (result.IsError) {
-					QuickTasks.Add (new QuickTask (() => string.Format ("error CS0103: The name `{0}' does not exist in the current context", identifierExpression.Identifier), identifierExpression.StartLocation, Severity.Error));
-				}
-			}
-
-			public override void VisitMemberReferenceExpression (MemberReferenceExpression memberReferenceExpression)
-			{
-				base.VisitMemberReferenceExpression (memberReferenceExpression);
-				var result = resolver.Resolve (memberReferenceExpression, cancellationToken) as UnknownMemberResolveResult;
-				if (result != null && result.TargetType.Kind != TypeKind.Unknown) {
-					QuickTasks.Add (new QuickTask (string.Format ("error CS0117: `{0}' does not contain a definition for `{1}'", result.TargetType.FullName, memberReferenceExpression.MemberName), memberReferenceExpression.MemberNameToken.StartLocation, Severity.Error));
-				}
-			}
-
-			public override void VisitSimpleType (SimpleType simpleType)
-			{
-				base.VisitSimpleType (simpleType);
-				var result = resolver.Resolve (simpleType, cancellationToken);
-				if (result.IsError) {
-					QuickTasks.Add (new QuickTask (string.Format ("error CS0246: The type or namespace name `{0}' could not be found. Are you missing an assembly reference?", simpleType.Identifier), simpleType.StartLocation, Severity.Error));
-				}
-			}
-
-			public override void VisitMemberType (MemberType memberType)
-			{
-				base.VisitMemberType (memberType);
-				var result = resolver.Resolve (memberType, cancellationToken);
-				if (result.IsError) {
-					QuickTasks.Add (new QuickTask (string.Format ("error CS0246: The type or namespace name `{0}' could not be found. Are you missing an assembly reference?", memberType.MemberName), memberType.StartLocation, Severity.Error));
-				}
-			}
-
-			public override void VisitComment (ICSharpCode.NRefactory.CSharp.Comment comment)
-			{
-			}
+			src.Cancel ();
+			src = new CancellationTokenSource ();
 		}
-		
-		static CSharpSyntaxMode ()
+
+		public override IEnumerable<ColoredSegment> GetColoredSegments (ISegment segment)
 		{
-			MonoDevelop.Debugger.DebuggingService.DisableConditionalCompilation += DispatchService.GuiDispatch (new EventHandler<DocumentEventArgs> (OnDisableConditionalCompilation));
-			if (IdeApp.Workspace != null) {
-				IdeApp.Workspace.ActiveConfigurationChanged += delegate {
-					foreach (var doc in IdeApp.Workbench.Documents) {
-						TextEditorData data = doc.Editor;
-						if (data == null)
-							continue;
-						// Force syntax mode reparse (required for #if directives)
-						var editor = doc.Editor;
-						if (editor != null) {
-							if (data.Document.SyntaxMode is SyntaxMode) {
-								((SyntaxMode)data.Document.SyntaxMode).UpdateDocumentHighlighting ();
-								SyntaxModeService.WaitUpdate (data.Document);
-							}
-							editor.Parent.TextViewMargin.PurgeLayoutCache ();
-							doc.ReparseDocument ();
-							editor.Parent.QueueDraw ();
-						}
-					}
-				};
-			}
-			CommentTag.SpecialCommentTagsChanged += (sender, e) => {
-				UpdateCommentRule ();
-				var actDoc = IdeApp.Workbench.ActiveDocument;
-				if (actDoc != null && actDoc.Editor != null) {
-					actDoc.UpdateParseDocument ();
-					actDoc.Editor.Parent.TextViewMargin.PurgeLayoutCache ();
-					actDoc.Editor.Parent.QueueDraw ();
-				}
-			};
+			var result = new List<ColoredSegment> ();
+			if (highlightTree == null)
+				return result;
+			return highlightTree.GetSegmentsOverlapping (segment).Select (seg => seg.GetColoredSegment () );
 		}
-		
-		static void OnDisableConditionalCompilation (object s, DocumentEventArgs e)
+
+		public override void Dispose ()
 		{
-			var mode = e.Document.Editor.Document.SyntaxMode as CSharpSyntaxMode;
-			if (mode == null)
-				return;
-			mode.DisableConditionalHighlighting = true;
-			e.Document.Editor.Document.CommitUpdateAll ();
+			CancelHighlightingTask ();
+			if (highlightTree != null)
+				highlightTree.RemoveListener ();
+			highlightTree = null;
+			base.Dispose ();
 		}
-		
-		static Dictionary<string, string> contextualHighlightKeywords;
-		static readonly string[] ContextualKeywords = new string[] {
-			"value"
-/*			"async",
-			"await",
-			, //*
-			"get", "set", "add", "remove",  //*
-			"var", //*
-			"global",
-			"partial", //* 
-			"where",  //*
-			"select",
-			"group",
-			"by",
-			"into",
-			"from",
-			"ascending",
-			"descending",
-			"orderby",
-			"let",
-			"join",
-			"on",
-			"equals"*/
-		};
-
-		#region Syntax mode rule cache
-		static List<Rule> _rules;
-		static List<Mono.TextEditor.Highlighting.Keywords> _keywords;
-		static Span[] _spans;
-		static Match[] _matches;
-		static Marker[] _prevMarker;
-		static List<SemanticRule> _SemanticRules;
-		static Rule _commentRule;
-		static Dictionary<string, Mono.TextEditor.Highlighting.Keywords> _keywordTable;
-		static Dictionary<string, Mono.TextEditor.Highlighting.Keywords> _keywordTableIgnoreCase;
-		static Dictionary<string, List<string>> _properties;
+
 		#endregion
+	}
+
+	class StyledTreeSegment : TreeSegment
+	{
+		string style;
 
-		static void UpdateCommentRule ()
+		public StyledTreeSegment (int offset, int length, string colorStyleKey) : base (offset, length)
 		{
-			if (_commentRule == null)
-				return;
-			var joinedTasks = string.Join ("", CommentTag.SpecialCommentTags.Select (t => t.Tag));
-			_commentRule.SetDelimiter (new string ("&()<>{}[]~!%^*-+=|\\#/:;\"' ,\t.?".Where (c => joinedTasks.IndexOf (c) < 0).ToArray ()));
-			_commentRule.Keywords = new[] {
-				new Keywords {
-					Color = "Comment Tag",
-					Words = CommentTag.SpecialCommentTags.Select (t => t.Tag)
-				}
-			};
+			this.style = colorStyleKey;
 		}
 
-		public CSharpSyntaxMode (Document document)
+		public ColoredSegment GetColoredSegment ()
 		{
-			this.guiDocument = document;
-			guiDocument.DocumentParsed += HandleDocumentParsed;
-			if (guiDocument.ParsedDocument != null)
-				HandleDocumentParsed (this, EventArgs.Empty);
-
-			bool loadRules = _rules == null;
-
-			if (loadRules) {
-				var provider = new ResourceStreamProvider (typeof(ResourceStreamProvider).Assembly, typeof(ResourceStreamProvider).Assembly.GetManifestResourceNames ().First (s => s.Contains ("CSharpSyntaxMode")));
-				using (var reader = provider.Open ()) {
-					SyntaxMode baseMode = SyntaxMode.Read (reader);
-					_rules = new List<Rule> (baseMode.Rules.Where (r => r.Name != "Comment"));
-					_rules.Add (new Rule {
-						Name = "PreProcessorComment"
-					});
-
-					_commentRule = new Rule {
-						Name = "Comment",
-						IgnoreCase = true
-					};
-					UpdateCommentRule ();
-
-					_rules.Add (_commentRule);
-					_keywords = new List<Keywords> (baseMode.Keywords);
-					_spans = new List<Span> (baseMode.Spans.Where (span => span.Begin.Pattern != "#")).ToArray ();
-					_matches = baseMode.Matches;
-					_prevMarker = baseMode.PrevMarker;
-					_SemanticRules = new List<SemanticRule> (baseMode.SemanticRules);
-					_keywordTable = baseMode.keywordTable;
-					_keywordTableIgnoreCase = baseMode.keywordTableIgnoreCase;
-					_properties = baseMode.Properties;
-				}
-
-				contextualHighlightKeywords = new Dictionary<string, string> ();
-				foreach (var word in ContextualKeywords) {
-					if (_keywordTable.ContainsKey (word)) {
-						contextualHighlightKeywords[word] = _keywordTable[word].Color;
-					} else {
-						Console.WriteLine ("missing keyword:"+word);
-					}
-				}
-
-				foreach (var word in ContextualKeywords) {
-					_keywordTable.Remove (word);
-				}
-			}
-
-			rules = _rules;
-			keywords = _keywords;
-			spans = _spans;
-			matches = _matches;
-			prevMarker = _prevMarker;
-			SemanticRules = _SemanticRules;
-			keywordTable = _keywordTable;
-			keywordTableIgnoreCase = _keywordTableIgnoreCase;
-			properties = _properties;
-
-			if (loadRules) {
-				AddSemanticRule ("Comment", new HighlightUrlSemanticRule ("Comment(Line)"));
-				AddSemanticRule ("XmlDocumentation", new HighlightUrlSemanticRule ("Comment(Doc)"));
-				AddSemanticRule ("String", new HighlightUrlSemanticRule ("String"));
-			}
+			return new ColoredSegment (Offset, Length, style);
 		}
+	}
+
+	class HighlightingSegmentTree : SegmentTree<StyledTreeSegment>
+	{
+	}
 
-		#region IDisposable implementation
+	class HighlightingVisitior : SemanticHighlightingVisitor<string>
+	{
+		readonly Action<StyledTreeSegment> colorizeCallback;
 
-		public void Dispose ()
+		public HighlightingVisitior (SemanticModel resolver, Action<StyledTreeSegment> colorizeCallback, CancellationToken cancellationToken, ISegment textSpan) : base (resolver)
 		{
-			if (src != null)
-				src.Cancel ();
-			guiDocument.DocumentParsed -= HandleDocumentParsed;
+			if (resolver == null)
+				throw new ArgumentNullException (nameof (resolver));
+			this.cancellationToken = cancellationToken;
+			this.colorizeCallback = colorizeCallback;
+			this.region = new TextSpan (textSpan.Offset, textSpan.Length);
+			Setup ();
 		}
+		
+		void Setup ()
+		{
+			
+			defaultTextColor = ColorScheme.PlainTextKey;
+			referenceTypeColor = ColorScheme.UserTypesKey;
+			valueTypeColor = ColorScheme.UserTypesValueTypesKey;
+			interfaceTypeColor = ColorScheme.UserTypesInterfacesKey;
+			enumerationTypeColor = ColorScheme.UserTypesEnumsKey;
+			typeParameterTypeColor = ColorScheme.UserTypesTypeParametersKey;
+			delegateTypeColor = ColorScheme.UserTypesDelegatesKey;
 
-		#endregion
+			methodCallColor = ColorScheme.UserMethodUsageKey;
+			methodDeclarationColor = ColorScheme.UserMethodDeclarationKey;
 
+			eventDeclarationColor = ColorScheme.UserEventDeclarationKey;
+			eventAccessColor = ColorScheme.UserEventUsageKey;
 
-//		public override SpanParser CreateSpanParser (DocumentLine line, CloneableStack<Span> spanStack)
-//		{
-//			return new CSharpSpanParser (this, spanStack ?? line.StartSpan.Clone ());
-//		}
-		
-		public override ChunkParser CreateChunkParser (SpanParser spanParser, ColorScheme style, DocumentLine line)
-		{
-			return new CSharpChunkParser (this, spanParser, style, line);
-		}
+			fieldDeclarationColor = ColorScheme.UserFieldDeclarationKey;
+			fieldAccessColor = ColorScheme.UserFieldUsageKey;
 
-		protected class CSharpChunkParser : ChunkParser, IResolveVisitorNavigator
-		{
+			propertyDeclarationColor = ColorScheme.UserPropertyDeclarationKey;
+			propertyAccessColor = ColorScheme.UserPropertyUsageKey;
 
-			HashSet<string> tags = new HashSet<string> ();
-			
-			CSharpSyntaxMode csharpSyntaxMode;
-			int lineNumber;
-			public CSharpChunkParser (CSharpSyntaxMode csharpSyntaxMode, SpanParser spanParser, ColorScheme style, DocumentLine line) : base (csharpSyntaxMode, spanParser, style, line)
-			{
-				lineNumber = line.LineNumber;
-				this.csharpSyntaxMode = csharpSyntaxMode;
-				foreach (var tag in CommentTag.SpecialCommentTags) {
-					tags.Add (tag.Tag);
-				}
+			variableDeclarationColor = ColorScheme.UserVariableDeclarationKey;
+			variableAccessColor = ColorScheme.UserVariableUsageKey;
 
-			}
+			parameterDeclarationColor = ColorScheme.UserParameterDeclarationKey;
+			parameterAccessColor = ColorScheme.UserParameterUsageKey;
 
-			#region IResolveVisitorNavigator implementation
-			ResolveVisitorNavigationMode IResolveVisitorNavigator.Scan(AstNode node)
-			{
-				if (node is SimpleType || node is MemberType
-					|| node is IdentifierExpression || node is MemberReferenceExpression
-					|| node is InvocationExpression) {
-					return ResolveVisitorNavigationMode.Resolve;
-				}
-				return ResolveVisitorNavigationMode.Scan;
-			}
-			
-			void IResolveVisitorNavigator.Resolved(AstNode node, ResolveResult result)
-			{
-			}
-			
-			void IResolveVisitorNavigator.ProcessConversion(Expression expression, ResolveResult result, Conversion conversion, IType targetType)
-			{
-			}
-			#endregion
-			static int TokenLength (AstNode node)
-			{
-				Debug.Assert (node.StartLocation.Line == node.EndLocation.Line);
-				return node.EndLocation.Column - node.StartLocation.Column;
-			}
+			valueKeywordColor = ColorScheme.KeywordContextKey;
+			externAliasKeywordColor = ColorScheme.KeywordNamespaceKey;
+			varKeywordTypeColor = ColorScheme.KeywordTypesKey;
 
-			protected override void AddRealChunk (Chunk chunk)
-			{
-				var document = csharpSyntaxMode.guiDocument;
-				var parsedDocument = document != null ? document.ParsedDocument : null;
-				if (parsedDocument != null && csharpSyntaxMode.SemanticHighlightingEnabled && csharpSyntaxMode.resolver != null) {
-					int endLoc = -1;
-					string semanticStyle = null;
-					if (spanParser.CurSpan != null && (spanParser.CurSpan.Rule == "Comment" || spanParser.CurSpan.Rule == "PreProcessorComment")) {
-						base.AddRealChunk (chunk);
-						return;
-					}
+			parameterModifierColor = ColorScheme.KeywordParameterKey;
+			inactiveCodeColor = ColorScheme.ExcludedCodeKey;
 
-					try {
-						HighlightingVisitior visitor;
-						if (!csharpSyntaxMode.lineSegments.TryGetValue (line, out visitor)) {
-							var resolver = csharpSyntaxMode.resolver;
-							visitor = new HighlightingVisitior (resolver, default (CancellationToken), lineNumber, base.line.Offset, line.Length);
-							visitor.tree.InstallListener (doc);
-							resolver.RootNode.AcceptVisitor (visitor);
-							csharpSyntaxMode.lineSegments[line] = visitor;
-						}
-						string style;
-						if (visitor.tree.GetStyle (chunk, ref endLoc, out style)) {
-							semanticStyle = style;
-						}
-					} catch (Exception e) {
-						Console.WriteLine ("Error in semantic highlighting: " + e);
-					}
-					if (semanticStyle != null) {
-						if (endLoc < chunk.EndOffset) {
-							base.AddRealChunk (new Chunk (chunk.Offset, endLoc - chunk.Offset, semanticStyle));
-							base.AddRealChunk (new Chunk (endLoc, chunk.EndOffset - endLoc, chunk.Style));
-							return;
-						}
-						chunk.Style = semanticStyle;
-					}
-				}
-				
-				base.AddRealChunk (chunk);
-			}
-			
-			protected override string GetStyle (Chunk chunk)
-			{
-				if (spanParser.CurRule.Name == "Comment") {
-					if (tags.Contains (doc.GetTextAt (chunk))) 
-						return "Comment Tag";
-				}
-				return base.GetStyle (chunk);
-			}
-		}
-		
+			stringFormatItemColor = ColorScheme.StringFormatItemsKey;
+			nameofKeywordColor = ColorScheme.KeywordOtherKey;
+			whenKeywordColor = ColorScheme.KeywordOtherKey; 
 
-		#region IQuickTaskProvider implementation
-		public event EventHandler TasksUpdated;
+			stringRegexCharacterClass = ColorScheme.RegexCharacterClassKey;
+			stringRegexGroupingConstructs = ColorScheme.RegexGroupingConstructsKey;
+			stringRegexSetConstructs = ColorScheme.RegexSetConstructsKey;
+			stringRegexErrors = ColorScheme.SyntaxErrorKey;
+			stringRegexComments = ColorScheme.CommentsSingleLineKey;
+			stringRegexEscapeCharacter = ColorScheme.RegexEscapeCharacterKey;
+			stringRegexAltEscapeCharacter = ColorScheme.RegexAltEscapeCharacterKey;
+		}
 
-		protected virtual void OnTasksUpdated (EventArgs e)
+		protected override void Colorize (TextSpan span, string color)
 		{
-			var handler = TasksUpdated;
-			if (handler != null)
-				handler (this, e);
+			colorizeCallback (new StyledTreeSegment (span.Start, span.Length, color));
 		}
 
-		List<QuickTask> quickTasks;
-		public IEnumerable<QuickTask> QuickTasks {
-			get {
-				return quickTasks;
+		public override void VisitIdentifierName (Microsoft.CodeAnalysis.CSharp.Syntax.IdentifierNameSyntax node)
+		{
+			switch (node.Identifier.Text) {
+			case "nfloat":
+			case "nint":
+			case "nuint":
+				var symbol = base.semanticModel.GetSymbolInfo (node).Symbol as INamedTypeSymbol;
+				if (symbol != null && symbol.ContainingNamespace.ToDisplayString () == "System") {
+					Colorize (node.Span, "Keyword(Type)");
+					return;
+				}
+				break;
 			}
+			base.VisitIdentifierName (node);
 		}
-		#endregion
 	}
 }
- 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
index 7c4df6c26c..ab1331bd1f 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
@@ -26,78 +26,218 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Resolver;
 using MonoDevelop.Ide.FindInFiles;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp;
 using System.Threading;
 using MonoDevelop.SourceEditor;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide;
+using MonoDevelop.Refactoring;
+using Microsoft.CodeAnalysis.FindSymbols;
+using MonoDevelop.Ide.TypeSystem;
+using System.Threading.Tasks;
+using System.Collections.Immutable;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
 
 namespace MonoDevelop.CSharp.Highlighting
 {
-	public class HighlightUsagesExtension : AbstractUsagesExtension<ResolveResult>
+	class UsageData
+	{
+		public RefactoringSymbolInfo SymbolInfo;
+		public Document Document;
+		public int Offset;
+
+		public ISymbol Symbol {
+			get { return SymbolInfo != null ? SymbolInfo.Symbol ?? SymbolInfo.DeclaredSymbol : null; }
+		}
+	}
+	
+	class HighlightUsagesExtension : AbstractUsagesExtension<UsageData>
 	{
 		CSharpSyntaxMode syntaxMode;
+		static IHighlighter [] highlighters;
 
-		public override void Initialize ()
+		static HighlightUsagesExtension ()
+		{
+			highlighters = typeof (HighlightUsagesExtension).Assembly
+				.GetTypes ()
+				.Where (t => !t.IsAbstract && typeof (IHighlighter).IsAssignableFrom (t))
+				.Select (t => (IHighlighter)Activator.CreateInstance (t)).ToArray ();
+		}
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-
-			TextEditorData.SelectionSurroundingProvider = new CSharpSelectionSurroundingProvider (Document);
-			syntaxMode = new CSharpSyntaxMode (Document);
-			TextEditorData.Document.SyntaxMode = syntaxMode;
+			Editor.SetSelectionSurroundingProvider (new CSharpSelectionSurroundingProvider (Editor, DocumentContext));
+			syntaxMode = new CSharpSyntaxMode (Editor, DocumentContext);
+			Editor.SemanticHighlighting = syntaxMode;
 		}
 
 		public override void Dispose ()
 		{
 			if (syntaxMode != null) {
-				TextEditorData.Document.SyntaxMode = null;
+				Editor.SemanticHighlighting = null;
 				syntaxMode.Dispose ();
 				syntaxMode = null;
 			}
 			base.Dispose ();
 		}
+		
+		protected async override Task<UsageData> ResolveAsync (CancellationToken token)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return new UsageData ();
+			var analysisDocument = doc.AnalysisDocument;
+			if (analysisDocument == null)
+				return new UsageData ();
+
+			var symbolInfo = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor, token);
+			if (symbolInfo.Symbol == null && symbolInfo.DeclaredSymbol == null)
+				return new UsageData {
+					Document = analysisDocument,
+					Offset = doc.Editor.CaretOffset
+				};
+			
+			if (symbolInfo.Symbol != null && !symbolInfo.Node.IsKind (SyntaxKind.IdentifierName) && !symbolInfo.Node.IsKind (SyntaxKind.GenericName)) 
+				return new UsageData ();
+
+			return new UsageData {
+				Document = analysisDocument,
+				SymbolInfo = symbolInfo,
+				Offset = doc.Editor.CaretOffset
+			};
+		}
 
-		protected override bool TryResolve (out ResolveResult resolveResult)
+		protected override async Task<IEnumerable<MemberReference>> GetReferencesAsync (UsageData resolveResult, CancellationToken token)
 		{
-			AstNode node;
-			resolveResult = null;
-			if (!Document.TryResolveAt (Document.Editor.Caret.Location, out resolveResult, out node)) {
-				return false;
+			var result = new List<MemberReference> ();
+			if (resolveResult.Symbol == null) {
+				if (resolveResult.Document == null)
+					return result;
+				var root = await resolveResult.Document.GetSyntaxRootAsync (token).ConfigureAwait (false);
+				var doc2 = resolveResult.Document;
+
+				foreach (var highlighter in highlighters) {
+					try {
+						foreach (var span in highlighter.GetHighlights (root, resolveResult.Offset, token)) {
+							result.Add (new MemberReference (span, doc2.FilePath, span.Start, span.Length) {
+								ReferenceUsageType = ReferenceUsageType.Keyword
+							});
+						}
+					} catch (Exception e) {
+						LoggingService.LogError ("Highlighter " + highlighter + " threw exception.", e);
+					}
+				}
+				return result;
 			}
-			if (node is PrimitiveType) {
-				return false;
+
+			var doc = resolveResult.Document;
+			var documents = ImmutableHashSet.Create (doc); 
+			var symbol = resolveResult.Symbol;
+			foreach (var loc in symbol.Locations) {
+				if (loc.IsInSource && loc.SourceTree.FilePath == doc.FilePath)
+					result.Add (new MemberReference (symbol, doc.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length) {
+						ReferenceUsageType = ReferenceUsageType.Declariton	
+					});
 			}
-			return true;
-		}
 
+			foreach (var mref in await SymbolFinder.FindReferencesAsync (symbol, TypeSystemService.Workspace.CurrentSolution, documents, token)) {
+				foreach (var loc in mref.Locations) {
+					Microsoft.CodeAnalysis.Text.TextSpan span = loc.Location.SourceSpan;
+					var root = loc.Location.SourceTree.GetRoot ();
+					var node = root.FindNode (loc.Location.SourceSpan);
+					var trivia = root.FindTrivia (loc.Location.SourceSpan.Start);
+					if (!trivia.IsKind (SyntaxKind.SingleLineDocumentationCommentTrivia)) {
+						span = node.Span;
+					}
 
-		protected override IEnumerable<MemberReference> GetReferences (ResolveResult resolveResult, CancellationToken token)
-		{
-			var finder = new MonoDevelop.CSharp.Refactoring.CSharpReferenceFinder ();
-			if (resolveResult is MemberResolveResult) {
-				finder.SetSearchedMembers (new [] { ((MemberResolveResult)resolveResult).Member });
-			} else if (resolveResult is TypeResolveResult) {
-				finder.SetSearchedMembers (new [] { resolveResult.Type });
-			} else if (resolveResult is MethodGroupResolveResult) { 
-				finder.SetSearchedMembers (((MethodGroupResolveResult)resolveResult).Methods);
-			} else if (resolveResult is NamespaceResolveResult) { 
-				finder.SetSearchedMembers (new [] { ((NamespaceResolveResult)resolveResult).Namespace });
-			} else if (resolveResult is LocalResolveResult) { 
-				finder.SetSearchedMembers (new [] { ((LocalResolveResult)resolveResult).Variable });
-			} else if (resolveResult is NamedArgumentResolveResult) { 
-				finder.SetSearchedMembers (new [] { ((NamedArgumentResolveResult)resolveResult).Parameter });
-			} else {
-				return EmptyList;
+
+
+
+
+					if (span.Start != loc.Location.SourceSpan.Start) {
+						span = loc.Location.SourceSpan;
+					}
+					result.Add (new MemberReference (symbol, doc.FilePath, span.Start, span.Length) {
+						ReferenceUsageType = GetUsage (node)
+					});
+				}
+			}
+
+			foreach (var loc in await GetAdditionalReferencesAsync (doc, symbol, token)) {
+				result.Add (new MemberReference (symbol, doc.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length) {
+					ReferenceUsageType = ReferenceUsageType.Write
+				});
 			}
 
-			try {
-				return new List<MemberReference> (finder.FindInDocument (Document, token));
-			} catch (Exception e) {
-				LoggingService.LogError ("Error in highlight usages extension.", e);
+			return result;
+		}
+
+		async Task<IEnumerable<Location>> GetAdditionalReferencesAsync (Document document, ISymbol symbol, CancellationToken cancellationToken)
+		{
+			// The FindRefs engine won't find references through 'var' for performance reasons.
+			// Also, they are not needed for things like rename/sig change, and the normal find refs
+			// feature.  However, we would lke the results to be highlighted to get a good experience
+			// while editing (especially since highlighting may have been invoked off of 'var' in
+			// the first place).
+			//
+			// So we look for the references through 'var' directly in this file and add them to the
+			// results found by the engine.
+			List<Location> results = null;
+
+			if (symbol is INamedTypeSymbol && symbol.Name != "var") {
+				var originalSymbol = symbol.OriginalDefinition;
+				var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+
+				var descendents = root.DescendantNodes ();
+				var semanticModel = default (SemanticModel);
+
+				foreach (var type in descendents.OfType<IdentifierNameSyntax> ()) {
+					cancellationToken.ThrowIfCancellationRequested ();
+
+					if (type.IsVar) {
+						if (semanticModel == null) {
+							semanticModel = await document.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+						}
+
+						var boundSymbol = semanticModel.GetSymbolInfo (type, cancellationToken).Symbol;
+						boundSymbol = boundSymbol == null ? null : boundSymbol.OriginalDefinition;
+
+						if (originalSymbol.Equals (boundSymbol)) {
+							if (results == null) {
+								results = new List<Location> ();
+							}
+
+							results.Add (type.GetLocation ());
+						}
+					}
+				}
 			}
-			return EmptyList;
+
+			return results ?? SpecializedCollections.EmptyEnumerable<Location> ();
 		}
+
+		static ReferenceUsageType GetUsage (SyntaxNode node)
+		{
+			if (node == null)
+				return ReferenceUsageType.Read;
+			
+			var parent = node.AncestorsAndSelf ().OfType<ExpressionSyntax> ().FirstOrDefault();
+			if (parent == null)
+				return ReferenceUsageType.Read;
+			if (parent.IsOnlyWrittenTo ())
+				return ReferenceUsageType.Write;
+			if (parent.IsWrittenTo ())
+				return ReferenceUsageType.ReadWrite;
+			return ReferenceUsageType.Read;
+		}
+
 	}
 }
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AbstractAsyncHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AbstractAsyncHighlighter.cs
new file mode 100644
index 0000000000..83b9f20e7c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AbstractAsyncHighlighter.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory6;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal abstract class AbstractAsyncHighlighter<TNode> : AbstractKeywordHighlighter<TNode> where TNode : SyntaxNode
+    {
+        protected void HighlightRelatedKeywords(SyntaxNode node, List<TextSpan> spans)
+        {
+            // Highlight async keyword
+            node.TypeSwitch(
+                (MethodDeclarationSyntax methodDeclaration) =>
+                {
+                    var asyncModifier = methodDeclaration.Modifiers.FirstOrDefault(m => m.Kind() == SyntaxKind.AsyncKeyword);
+                    if (asyncModifier.Kind() != SyntaxKind.None)
+                    {
+                        spans.Add(asyncModifier.Span);
+                    }
+                },
+                (SimpleLambdaExpressionSyntax simpleLambda) =>
+                {
+                    if (simpleLambda.AsyncKeyword.Kind() == SyntaxKind.AsyncKeyword)
+                    {
+                        spans.Add(simpleLambda.AsyncKeyword.Span);
+                    }
+                },
+                (ParenthesizedLambdaExpressionSyntax parenthesizedLambda) =>
+                {
+                    if (parenthesizedLambda.AsyncKeyword.Kind() == SyntaxKind.AsyncKeyword)
+                    {
+                        spans.Add(parenthesizedLambda.AsyncKeyword.Span);
+                    }
+                },
+                (AnonymousMethodExpressionSyntax anonymousMethod) =>
+                {
+                    if (anonymousMethod.AsyncKeyword.Kind() == SyntaxKind.AsyncKeyword)
+                    {
+                        spans.Add(anonymousMethod.AsyncKeyword.Span);
+                    }
+                });
+
+            // Highlight await keywords
+            node.TypeSwitch(
+                (AwaitExpressionSyntax awaitExpression) =>
+                {
+                    // Note if there is already a highlight for the previous token, merge it
+                    // with this span. That way, we highlight nested awaits with a single span.
+                    var handled = false;
+                    var awaitToken = awaitExpression.AwaitKeyword;
+                    var previousToken = awaitToken.GetPreviousToken();
+                    if (!previousToken.Span.IsEmpty)
+                    {
+                        var index = spans.FindIndex(s => s.Contains(previousToken.Span));
+                        if (index >= 0)
+                        {
+                            var span = spans[index];
+                            spans[index] = TextSpan.FromBounds(span.Start, awaitToken.Span.End);
+                            handled = true;
+                        }
+                    }
+
+                    if (!handled)
+                    {
+                        spans.Add(awaitToken.Span);
+                    }
+                });
+
+            foreach (var child in node.ChildNodes())
+            {
+                // Only recurse if we have anything to do
+                if (!child.IsReturnableConstruct())
+                {
+                    HighlightRelatedKeywords(child, spans);
+                }
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncAnonymousMethodHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncAnonymousMethodHighlighter.cs
new file mode 100644
index 0000000000..7861625b17
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncAnonymousMethodHighlighter.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class AsyncAnonymousMethodHighlighter : AbstractAsyncHighlighter<AnonymousMethodExpressionSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(AnonymousMethodExpressionSyntax node, CancellationToken cancellationToken)
+        {
+            if (node.AsyncKeyword.Kind() != SyntaxKind.AsyncKeyword)
+            {
+                return SpecializedCollections.EmptyEnumerable<TextSpan>();
+            }
+
+            var spans = new List<TextSpan>();
+
+            HighlightRelatedKeywords(node, spans);
+
+            return spans;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncMethodHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncMethodHighlighter.cs
new file mode 100644
index 0000000000..eaa20b27e3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncMethodHighlighter.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class AsyncMethodHighlighter : AbstractAsyncHighlighter<MethodDeclarationSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(MethodDeclarationSyntax node, CancellationToken cancellationToken)
+        {
+            if (!node.Modifiers.Any(SyntaxKind.AsyncKeyword))
+            {
+                return SpecializedCollections.EmptyEnumerable<TextSpan>();
+            }
+
+            var spans = new List<TextSpan>();
+
+            HighlightRelatedKeywords(node, spans);
+
+            return spans;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncParenthesizedLambdaHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncParenthesizedLambdaHighlighter.cs
new file mode 100644
index 0000000000..81e1d4a990
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncParenthesizedLambdaHighlighter.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class AsyncParenthesizedLambdaHighlighter : AbstractAsyncHighlighter<ParenthesizedLambdaExpressionSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(ParenthesizedLambdaExpressionSyntax node, CancellationToken cancellationToken)
+        {
+            if (node.AsyncKeyword.Kind() != SyntaxKind.AsyncKeyword)
+            {
+                return SpecializedCollections.EmptyEnumerable<TextSpan>();
+            }
+
+            var spans = new List<TextSpan>();
+
+            HighlightRelatedKeywords(node, spans);
+
+            return spans;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncSimpleLambdaHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncSimpleLambdaHighlighter.cs
new file mode 100644
index 0000000000..d6ecbea7d7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AsyncSimpleLambdaHighlighter.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class AsyncSimpleLambdaHighlighter : AbstractAsyncHighlighter<SimpleLambdaExpressionSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(SimpleLambdaExpressionSyntax node, CancellationToken cancellationToken)
+        {
+            if (node.AsyncKeyword.Kind() != SyntaxKind.AsyncKeyword)
+            {
+                return SpecializedCollections.EmptyEnumerable<TextSpan>();
+            }
+
+            var spans = new List<TextSpan>();
+
+            HighlightRelatedKeywords(node, spans);
+
+            return spans;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AwaitHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AwaitHighlighter.cs
new file mode 100644
index 0000000000..8dfb69f7dc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/AwaitHighlighter.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class AwaitHighlighter : AbstractAsyncHighlighter<AwaitExpressionSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(AwaitExpressionSyntax awaitExpression, CancellationToken cancellationToken)
+        {
+            var parent = awaitExpression
+                             .AncestorsAndSelf()
+                             .FirstOrDefault(n => n.IsReturnableConstruct());
+
+            if (parent == null)
+            {
+                return SpecializedCollections.EmptyEnumerable<TextSpan>();
+            }
+
+            var spans = new List<TextSpan>();
+
+            HighlightRelatedKeywords(parent, spans);
+
+            return spans;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedExpressionHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedExpressionHighlighter.cs
new file mode 100644
index 0000000000..0a5e8991da
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedExpressionHighlighter.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class CheckedExpressionHighlighter : AbstractKeywordHighlighter<CheckedExpressionSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            CheckedExpressionSyntax checkedExpressionSyntax, CancellationToken cancellationToken)
+        {
+            switch (checkedExpressionSyntax.Kind())
+            {
+                case SyntaxKind.CheckedExpression:
+                case SyntaxKind.UncheckedExpression:
+                    yield return checkedExpressionSyntax.Keyword.Span;
+                    break;
+                default:
+                    yield break;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedStatementHighlighter.cs
new file mode 100644
index 0000000000..12f5349a12
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/CheckedStatementHighlighter.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+	internal class CheckedStatementHighlighter : AbstractKeywordHighlighter<CheckedStatementSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            CheckedStatementSyntax checkedStatement, CancellationToken cancellationToken)
+        {
+            yield return checkedStatement.Keyword.Span;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ConditionalPreprocessorHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ConditionalPreprocessorHighlighter.cs
new file mode 100644
index 0000000000..48cb19a19d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ConditionalPreprocessorHighlighter.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class ConditionalPreprocessorHighlighter : AbstractKeywordHighlighter<DirectiveTriviaSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            DirectiveTriviaSyntax directive, CancellationToken cancellationToken)
+        {
+			var conditionals = directive.GetMatchingConditionalDirectives(cancellationToken);
+            if (conditionals == null)
+            {
+                yield break;
+            }
+
+            foreach (var conditional in conditionals)
+            {
+                yield return TextSpan.FromBounds(
+                    conditional.HashToken.SpanStart,
+                    conditional.DirectiveNameToken.Span.End);
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/IfStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/IfStatementHighlighter.cs
new file mode 100644
index 0000000000..0063878bbc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/IfStatementHighlighter.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting
+{
+    internal class IfStatementHighlighter : AbstractKeywordHighlighter<IfStatementSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            IfStatementSyntax ifStatement, CancellationToken cancellationToken)
+        {
+            if (ifStatement.Parent.Kind() != SyntaxKind.ElseClause)
+            {
+                return ComputeSpans(ifStatement);
+            }
+
+            return Enumerable.Empty<TextSpan>();
+        }
+
+        private IEnumerable<TextSpan> ComputeSpans(
+            IfStatementSyntax ifStatement)
+        {
+            yield return ifStatement.IfKeyword.Span;
+
+            // Loop to get all the else if parts
+            while (ifStatement != null && ifStatement.Else != null)
+            {
+                // Check for 'else if' scenario' (the statement in the else clause is an if statement)
+                var elseKeyword = ifStatement.Else.ElseKeyword;
+                var elseIfStatement = ifStatement.Else.Statement as IfStatementSyntax;
+
+                if (elseIfStatement != null)
+                {
+                    if (OnlySpacesBetween(elseKeyword, elseIfStatement.IfKeyword))
+                    {
+                        // Highlight both else and if tokens if they are on the same line
+                        yield return TextSpan.FromBounds(
+                            elseKeyword.SpanStart,
+                            elseIfStatement.IfKeyword.Span.End);
+                    }
+                    else
+                    {
+                        // Highlight the else and if tokens separately
+                        yield return elseKeyword.Span;
+                        yield return elseIfStatement.IfKeyword.Span;
+                    }
+
+                    // Continue the enumeration looking for more else blocks
+                    ifStatement = elseIfStatement;
+                }
+                else
+                {
+                    // Highlight just the else and we're done
+                    yield return elseKeyword.Span;
+                    break;
+                }
+            }
+        }
+
+        public static bool OnlySpacesBetween(SyntaxToken first, SyntaxToken second)
+        {
+            return first.TrailingTrivia.AsString().All(c => c == ' ') &&
+                   second.LeadingTrivia.AsString().All(c => c == ' ');
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LockStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LockStatementHighlighter.cs
new file mode 100644
index 0000000000..217da2a1a2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LockStatementHighlighter.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class LockStatementHighlighter : AbstractKeywordHighlighter<LockStatementSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            LockStatementSyntax lockStatement, CancellationToken cancellationToken)
+        {
+            yield return lockStatement.LockKeyword.Span;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LoopHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LoopHighlighter.cs
new file mode 100644
index 0000000000..24e56c8c5c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/LoopHighlighter.cs
@@ -0,0 +1,118 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class LoopHighlighter : AbstractKeywordHighlighter<SyntaxNode>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            SyntaxNode node, CancellationToken cancellationToken)
+        {
+            var loop = node.GetAncestorsOrThis<SyntaxNode>()
+                           .FirstOrDefault(ancestor => ancestor.IsContinuableConstruct());
+
+            if (loop != null)
+            {
+                return KeywordHighlightsForLoop(loop);
+            }
+
+            return SpecializedCollections.EmptyEnumerable<TextSpan>();
+        }
+
+        private IEnumerable<TextSpan> KeywordHighlightsForLoop(SyntaxNode loopNode)
+        {
+            var spans = new List<TextSpan>();
+
+            switch (loopNode.Kind())
+            {
+                case SyntaxKind.DoStatement:
+                    HighlightDoStatement((DoStatementSyntax)loopNode, spans);
+                    break;
+                case SyntaxKind.ForStatement:
+                    HighlightForStatement((ForStatementSyntax)loopNode, spans);
+                    break;
+
+                case SyntaxKind.ForEachStatement:
+                    HighlightForEachStatement((ForEachStatementSyntax)loopNode, spans);
+                    break;
+
+                case SyntaxKind.WhileStatement:
+                    HighlightWhileStatement((WhileStatementSyntax)loopNode, spans);
+                    break;
+            }
+
+            HighlightRelatedKeywords(loopNode, spans, true, true);
+
+            return spans;
+        }
+
+        private void HighlightDoStatement(DoStatementSyntax statement, List<TextSpan> spans)
+        {
+            spans.Add(statement.DoKeyword.Span);
+            spans.Add(statement.WhileKeyword.Span);
+            spans.Add(EmptySpan(statement.SemicolonToken.Span.End));
+        }
+
+        private void HighlightForStatement(ForStatementSyntax statement, List<TextSpan> spans)
+        {
+            spans.Add(statement.ForKeyword.Span);
+        }
+
+        private void HighlightForEachStatement(ForEachStatementSyntax statement, List<TextSpan> spans)
+        {
+            spans.Add(statement.ForEachKeyword.Span);
+        }
+
+        private void HighlightWhileStatement(WhileStatementSyntax statement, List<TextSpan> spans)
+        {
+            spans.Add(statement.WhileKeyword.Span);
+        }
+
+        /// <summary>
+        /// Finds all breaks and continues that are a child of this node, and adds the appropriate spans to the spans list.
+        /// </summary>
+        private void HighlightRelatedKeywords(SyntaxNode node, List<TextSpan> spans, bool highlightBreaks, bool highlightContinues)
+        {
+            Debug.Assert(highlightBreaks || highlightContinues);
+
+            if (highlightBreaks && node is BreakStatementSyntax)
+            {
+                var statement = (BreakStatementSyntax)node;
+                spans.Add(statement.BreakKeyword.Span);
+                spans.Add(EmptySpan(statement.SemicolonToken.Span.End));
+            }
+            else if (highlightContinues && node is ContinueStatementSyntax)
+            {
+                var statement = (ContinueStatementSyntax)node;
+                spans.Add(statement.ContinueKeyword.Span);
+                spans.Add(EmptySpan(statement.SemicolonToken.Span.End));
+            }
+            else
+            {
+                foreach (var child in node.ChildNodes())
+                {
+                    var highlightBreaksForChild = highlightBreaks && !child.IsBreakableConstruct();
+                    var highlightContinuesForChild = highlightContinues && !child.IsContinuableConstruct();
+
+                    // Only recurse if we have anything to do
+                    if (highlightBreaksForChild || highlightContinuesForChild)
+                    {
+                        HighlightRelatedKeywords(child, spans, highlightBreaksForChild, highlightContinuesForChild);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/RegionHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/RegionHighlighter.cs
new file mode 100644
index 0000000000..07d918d95d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/RegionHighlighter.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class RegionHighlighter : AbstractKeywordHighlighter<DirectiveTriviaSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            DirectiveTriviaSyntax directive, CancellationToken cancellationToken)
+        {
+            var matchingDirective = directive.GetMatchingDirective(cancellationToken);
+            if (matchingDirective == null)
+            {
+                yield break;
+            }
+
+            yield return TextSpan.FromBounds(
+                directive.HashToken.SpanStart,
+                directive.DirectiveNameToken.Span.End);
+
+            yield return TextSpan.FromBounds(
+                matchingDirective.HashToken.SpanStart,
+                matchingDirective.DirectiveNameToken.Span.End);
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs
new file mode 100644
index 0000000000..d18660ebe5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using ICSharpCode.NRefactory6;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class ReturnStatementHighlighter : AbstractKeywordHighlighter<ReturnStatementSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            ReturnStatementSyntax returnStatement, CancellationToken cancellationToken)
+        {
+            var parent = returnStatement
+                             .GetAncestorsOrThis<SyntaxNode>()
+                             .FirstOrDefault(n => n.IsReturnableConstruct());
+
+            if (parent == null)
+            {
+                return SpecializedCollections.EmptyEnumerable<TextSpan>();
+            }
+
+            var spans = new List<TextSpan>();
+
+            HighlightRelatedKeywords(parent, spans);
+
+            return spans;
+        }
+
+        /// <summary>
+        /// Finds all returns that are children of this node, and adds the appropriate spans to the spans list.
+        /// </summary>
+        private void HighlightRelatedKeywords(SyntaxNode node, List<TextSpan> spans)
+        {
+            node.TypeSwitch(
+                (ReturnStatementSyntax statement) =>
+                {
+                    spans.Add(statement.ReturnKeyword.Span);
+                    spans.Add(EmptySpan(statement.SemicolonToken.Span.End));
+                },
+                _ =>
+                {
+                    foreach (var child in node.ChildNodes())
+                    {
+                        // Only recurse if we have anything to do
+                        if (!child.IsReturnableConstruct())
+                        {
+                            HighlightRelatedKeywords(child, spans);
+                        }
+                    }
+                });
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/SwitchStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/SwitchStatementHighlighter.cs
new file mode 100644
index 0000000000..a5258f7548
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/SwitchStatementHighlighter.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using ICSharpCode.NRefactory6;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class SwitchStatementHighlighter : AbstractKeywordHighlighter<SwitchStatementSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            SwitchStatementSyntax switchStatement, CancellationToken cancellationToken)
+        {
+            var spans = new List<TextSpan>();
+
+            spans.Add(switchStatement.SwitchKeyword.Span);
+
+            foreach (var switchSection in switchStatement.Sections)
+            {
+                foreach (var label in switchSection.Labels)
+                {
+                    spans.Add(label.Keyword.Span);
+                    spans.Add(EmptySpan(label.ColonToken.Span.End));
+                }
+
+                foreach (var statement in switchSection.Statements)
+                {
+                    HighlightRelatedKeywords(statement, spans);
+                }
+            }
+
+            return spans;
+        }
+
+        /// <summary>
+        /// Finds all breaks and continues that are a child of this node, and adds the appropriate spans to the spans
+        /// list.
+        /// </summary>
+        private void HighlightRelatedKeywords(SyntaxNode node, List<TextSpan> spans)
+        {
+            node.TypeSwitch(
+                (BreakStatementSyntax breakStatement) =>
+                {
+                    spans.Add(breakStatement.BreakKeyword.Span);
+                    spans.Add(EmptySpan(breakStatement.SemicolonToken.Span.End));
+                },
+                (GotoStatementSyntax gotoStatement) =>
+                {
+                    var start = gotoStatement.GotoKeyword.SpanStart;
+                    var end = !gotoStatement.CaseOrDefaultKeyword.IsKind(SyntaxKind.None)
+                        ? gotoStatement.CaseOrDefaultKeyword.Span.End
+                        : gotoStatement.GotoKeyword.Span.End;
+
+                    spans.Add(TextSpan.FromBounds(start, end));
+                    spans.Add(EmptySpan(gotoStatement.SemicolonToken.Span.End));
+                },
+                _ =>
+                {
+                    foreach (var child in node.ChildNodes())
+                    {
+                        // Only recurse if we have anything to do
+                        if (child.IsBreakableConstruct())
+                        {
+                            HighlightRelatedKeywords(child, spans);
+                        }
+                    }
+                });
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/TryStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/TryStatementHighlighter.cs
new file mode 100644
index 0000000000..f84041102c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/TryStatementHighlighter.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class TryStatementHighlighter : AbstractKeywordHighlighter<TryStatementSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            TryStatementSyntax tryStatement, CancellationToken cancellationToken)
+        {
+            yield return tryStatement.TryKeyword.Span;
+
+            foreach (var catchDeclaration in tryStatement.Catches)
+            {
+                yield return catchDeclaration.CatchKeyword.Span;
+
+                if (catchDeclaration.Filter != null)
+                {
+                    yield return catchDeclaration.Filter.WhenKeyword.Span;
+                }
+            }
+
+            if (tryStatement.Finally != null)
+            {
+                yield return tryStatement.Finally.FinallyKeyword.Span;
+            }
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UnsafeStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UnsafeStatementHighlighter.cs
new file mode 100644
index 0000000000..04834ab3cc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UnsafeStatementHighlighter.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class UnsafeStatementHighlighter : AbstractKeywordHighlighter<UnsafeStatementSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            UnsafeStatementSyntax unsafeStatement, CancellationToken cancellationToken)
+        {
+            yield return unsafeStatement.UnsafeKeyword.Span;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UsingStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UsingStatementHighlighter.cs
new file mode 100644
index 0000000000..c6ad88d613
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/UsingStatementHighlighter.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class UsingStatementHighlighter : AbstractKeywordHighlighter<UsingStatementSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            UsingStatementSyntax usingStatement, CancellationToken cancellationToken)
+        {
+            yield return usingStatement.UsingKeyword.Span;
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs
new file mode 100644
index 0000000000..5ccdce54e9
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using ICSharpCode.NRefactory6;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.KeywordHighlighting.KeywordHighlighters
+{
+    internal class YieldStatementHighlighter : AbstractKeywordHighlighter<YieldStatementSyntax>
+    {
+        protected override IEnumerable<TextSpan> GetHighlights(
+            YieldStatementSyntax yieldStatement, CancellationToken cancellationToken)
+        {
+            var parent = yieldStatement
+                             .GetAncestorsOrThis<SyntaxNode>()
+                             .FirstOrDefault(n => n.IsReturnableConstruct());
+
+            if (parent == null)
+            {
+                return SpecializedCollections.EmptyEnumerable<TextSpan>();
+            }
+
+            var spans = new List<TextSpan>();
+
+            HighlightRelatedKeywords(parent, spans);
+
+            return spans;
+        }
+
+        /// <summary>
+        /// Finds all returns that are children of this node, and adds the appropriate spans to the spans list.
+        /// </summary>
+        private void HighlightRelatedKeywords(SyntaxNode node, List<TextSpan> spans)
+        {
+            node.TypeSwitch(
+                (YieldStatementSyntax statement) =>
+                {
+                    spans.Add(
+                        TextSpan.FromBounds(
+                            statement.YieldKeyword.SpanStart,
+                            statement.ReturnOrBreakKeyword.Span.End));
+
+                    spans.Add(EmptySpan(statement.SemicolonToken.Span.End));
+                },
+                _ =>
+                {
+                    foreach (var child in node.ChildNodes())
+                    {
+                        // Only recurse if we have anything to do
+                        if (!child.IsReturnableConstruct())
+                        {
+                            HighlightRelatedKeywords(child, spans);
+                        }
+                    }
+                });
+        }
+    }
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs
index adf3c8ecb1..5c4f859919 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/MoveToUsagesHandler.cs
@@ -28,7 +28,7 @@ using MonoDevelop.Components.Commands;
 using System.Linq;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Content;
-using Mono.TextEditor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.CSharp.Highlighting
 {
@@ -63,10 +63,10 @@ namespace MonoDevelop.CSharp.Highlighting
 			if (ext.IsTimerOnQueue)
 				ext.ForceUpdate ();
 
-			var caretOffset = doc.Editor.Caret.Offset;
-			for (int i = 0; i < ext.UsagesSegments.Count; i++) {
-				if (ext.UsagesSegments [i].TextSegment.Contains (caretOffset))
-					MoveToNextUsageHandler.MoveToSegment (doc, ext.UsagesSegments [(i + ext.UsagesSegments.Count - 1) % ext.UsagesSegments.Count]);
+			var caretOffset = doc.Editor.CaretOffset;
+			for (int i = 0; i < ext.Markers.Count; i++) {
+				if (ext.Markers [i].Contains (caretOffset))
+					MoveToNextUsageHandler.MoveToSegment (doc, ext.Markers [(i + ext.Markers.Count - 1) % ext.Markers.Count]);
 			}
 		}
 	}
@@ -95,24 +95,23 @@ namespace MonoDevelop.CSharp.Highlighting
 			if (ext == null || ext.Markers.Count == 0)
 				return;
 			
-			var caretOffset = doc.Editor.Caret.Offset;
-			for (int i = 0; i < ext.UsagesSegments.Count; i++) {
-				if (ext.UsagesSegments [i].TextSegment.Contains (caretOffset))
-					MoveToNextUsageHandler.MoveToSegment (doc, ext.UsagesSegments [(i + 1) % ext.UsagesSegments.Count]);
+			var caretOffset = doc.Editor.CaretOffset;
+			for (int i = 0; i < ext.Markers.Count; i++) {
+				if (ext.Markers [i].Contains (caretOffset))
+					MoveToNextUsageHandler.MoveToSegment (doc, ext.Markers [(i + 1) % ext.Markers.Count]);
 			}
 		}
 		
-		public static void MoveToSegment (MonoDevelop.Ide.Gui.Document doc, TextSegment segment)
+		public static void MoveToSegment (MonoDevelop.Ide.Gui.Document doc, ISegment segment)
 		{
-			if (segment.IsInvalid || segment.IsEmpty)
+			if (segment == null || segment.Offset < 0 || segment.Length == 0)
 				return;
-			TextEditorData data = doc.Editor;
-			data.Caret.Offset = segment.Offset;
-			data.Parent.ScrollTo (segment.EndOffset);
-			
-			var loc = data.Document.OffsetToLocation (segment.EndOffset);
-			if (data.Parent.TextViewMargin.ColumnToX (data.Document.GetLine (loc.Line), loc.Column) < data.HAdjustment.PageSize)
-				data.HAdjustment.Value = 0;
+			var data = doc.Editor;
+			data.CaretOffset = segment.Offset;
+
+//			var loc = data.OffsetToLocation (segment.EndOffset);
+//			if (data.ColumnToX (data.GetLine (loc.Line), loc.Column) < data.HAdjustment.PageSize)
+//				data.HAdjustment.Value = 0;
 		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindBaseSymbolsHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindBaseSymbolsHandler.cs
new file mode 100644
index 0000000000..8024897ab8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindBaseSymbolsHandler.cs
@@ -0,0 +1,83 @@
+//
+// FindBaseSymbolsHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Navigation
+{
+	class FindBaseSymbolsHandler : CommandHandler
+	{
+		void FindSymbols (ISymbol sym)
+		{
+			if (sym == null)
+				return;
+			Task.Run (delegate {
+				using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+					var foundSymbol = sym.OverriddenMember ();
+					while (foundSymbol != null) {
+						foreach (var loc in foundSymbol.Locations)
+							monitor.ReportResult (new MemberReference (foundSymbol, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+						foundSymbol = foundSymbol.OverriddenMember ();
+					}
+				}
+			});
+		}
+
+		internal static async Task<ISymbol> GetSymbolAtCaret (Ide.Gui.Document doc)
+		{
+			if (doc == null)
+				return null;
+			var info = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor);
+			return info.Symbol ?? info.DeclaredSymbol;
+		}
+
+		protected override async void Update (CommandInfo info)
+		{
+			var sym = await GetSymbolAtCaret (IdeApp.Workbench.ActiveDocument);
+			info.Enabled = sym != null;
+			info.Bypass = !info.Enabled;
+		}
+
+		protected override async void Run ()
+		{
+			var sym = await GetSymbolAtCaret (IdeApp.Workbench.ActiveDocument);
+			if (sym != null)
+				FindSymbols (sym);
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindDerivedSymbolsHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindDerivedSymbolsHandler.cs
new file mode 100644
index 0000000000..44e0cded3a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindDerivedSymbolsHandler.cs
@@ -0,0 +1,125 @@
+//
+// FindDerivedSymbolsHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Ide.TypeSystem;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using MonoDevelop.Projects;
+using System.Threading;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.FindSymbols;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+using System.Runtime.CompilerServices;
+using System.Collections.Concurrent;
+using System.Collections.Immutable;
+using MonoDevelop.CSharp.Navigation;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class FindDerivedSymbolsHandler : CommandHandler
+	{
+		public static bool CanFindDerivedSymbols (ISymbol symbol, out string description)
+		{
+			if (symbol.Kind == SymbolKind.NamedType) {
+				var type = (ITypeSymbol)symbol;
+				description = type.TypeKind == TypeKind.Interface ? GettextCatalog.GetString ("Find Implementing Types") : GettextCatalog.GetString ("Find Derived Types");
+				return !type.IsStatic && !type.IsSealed;
+			}
+			if (symbol.ContainingType != null && symbol.ContainingType.TypeKind == TypeKind.Interface) {
+ 				description = GettextCatalog.GetString ("Find Implementing Symbols");
+			} else {
+ 				description = GettextCatalog.GetString ("Find Derived Symbols");
+			}
+			return symbol.IsVirtual || symbol.IsAbstract || symbol.IsOverride;
+		}
+
+		public static void FindDerivedSymbols (ISymbol symbol)
+		{
+			if (symbol == null)
+				return;
+			Task.Run (async delegate {
+				using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+					IEnumerable<ISymbol> result;
+					if (symbol.ContainingType != null && symbol.ContainingType.TypeKind == TypeKind.Interface) {
+						result = await SymbolFinder.FindImplementationsAsync (symbol, TypeSystemService.Workspace.CurrentSolution).ConfigureAwait (false); 
+					} else if (symbol.Kind == SymbolKind.NamedType) {
+						var type = (INamedTypeSymbol)symbol;
+						if (type.TypeKind == TypeKind.Interface) {
+							
+							result = (await SymbolFinder.FindImplementationsAsync (type, TypeSystemService.Workspace.CurrentSolution).ConfigureAwait (false)).Cast<ISymbol> ().Concat (
+								await FindInterfaceImplementaitonsAsync (type, TypeSystemService.Workspace.CurrentSolution).ConfigureAwait (false) 
+							);
+						} else {
+							result = (await SymbolFinder.FindDerivedClassesAsync (type, TypeSystemService.Workspace.CurrentSolution).ConfigureAwait (false)).Cast<ISymbol> ();
+						}
+					} else {
+						result = await SymbolFinder.FindOverridesAsync (symbol, TypeSystemService.Workspace.CurrentSolution).ConfigureAwait (false);
+					}
+					foreach (var foundSymbol in result) {
+						foreach (var loc in foundSymbol.Locations)
+							monitor.ReportResult (new MemberReference (foundSymbol, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+					}
+				}
+			});
+		}
+
+		static async Task<IEnumerable<ISymbol>> FindInterfaceImplementaitonsAsync (INamedTypeSymbol type, Microsoft.CodeAnalysis.Solution currentSolution, CancellationToken token = default(CancellationToken))
+		{
+			var result = new List<ISymbol> ();
+
+			foreach (var project in currentSolution.Projects) {
+				var comp = await project.GetCompilationAsync (token).ConfigureAwait (false);
+				foreach (var i in comp.GetAllTypesInMainAssembly (token).Where (t => t.TypeKind == TypeKind.Interface)) {
+					if (i.AllInterfaces.Any (t => t.InheritsFromOrEqualsIgnoringConstruction (type)))
+						result.Add (i);
+				}
+			}
+
+			return result;
+		}
+
+		protected override async void Update (CommandInfo info)
+		{
+			var sym = await FindBaseSymbolsHandler.GetSymbolAtCaret (IdeApp.Workbench.ActiveDocument);
+			info.Enabled = sym != null;
+			info.Bypass = !info.Enabled;
+		}
+
+		protected override async void Run (object dataItem)
+		{
+			var sym = await FindBaseSymbolsHandler.GetSymbolAtCaret (IdeApp.Workbench.ActiveDocument);
+			if (sym != null)
+				FindDerivedSymbols (sym);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindExtensionMethodsHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindExtensionMethodsHandler.cs
new file mode 100644
index 0000000000..e759081e67
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindExtensionMethodsHandler.cs
@@ -0,0 +1,90 @@
+//
+// FindExtensionMethodHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+using System.Collections;
+using System.Reflection;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Navigation
+{
+	class FindExtensionMethodsHandler : CommandHandler
+	{
+		protected override async void Update (CommandInfo info)
+		{
+			var sym = await GetNamedTypeAtCaret (IdeApp.Workbench.ActiveDocument);
+			info.Enabled = sym != null && sym.IsKind (SymbolKind.NamedType);
+			info.Bypass = !info.Enabled;
+		}
+
+		protected async override void Run ()
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			var sym = await GetNamedTypeAtCaret (doc);
+			if (sym != null)
+				FindExtensionMethods (await doc.GetCompilationAsync (), sym);
+		}
+
+		internal static async System.Threading.Tasks.Task<INamedTypeSymbol> GetNamedTypeAtCaret (Ide.Gui.Document doc)
+		{
+			if (doc == null)
+				return null;

+			var info = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor);
+			var sym = info.Symbol ?? info.DeclaredSymbol;
+			return sym as INamedTypeSymbol;
+		}
+
+		void FindExtensionMethods (Compilation compilation, ISymbol sym)
+		{
+			var symType = sym as ITypeSymbol;
+			if (symType == null)
+				return;
+			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+				foreach (var type in compilation.Assembly.GlobalNamespace.GetAllTypes ()) {
+					if (!type.MightContainExtensionMethods)
+						continue;
+
+					foreach (var extMethod in type.GetMembers ().OfType<IMethodSymbol> ().Where (method => method.IsExtensionMethod)) {
+						var reducedMethod = extMethod.ReduceExtensionMethod (symType);
+						if (reducedMethod != null) {
+							var loc = extMethod.Locations.First ();
+							monitor.ReportResult (new MemberReference (extMethod, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+						}
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindImplementingMembersHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindImplementingMembersHandler.cs
new file mode 100644
index 0000000000..d8830eed5f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindImplementingMembersHandler.cs
@@ -0,0 +1,104 @@
+//
+// FindImplementingMembersHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.FindInFiles;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.CSharp.Navigation
+{
+	class FindImplementingMembersHandler : CommandHandler
+	{
+		protected override async void Update (CommandInfo info)
+		{
+			var sym = await GetNamedTypeAtCaret (IdeApp.Workbench.ActiveDocument);
+			info.Enabled = sym != null;
+			info.Bypass = !info.Enabled;
+		}
+
+		protected async override void Run ()
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			var sym = await GetNamedTypeAtCaret (doc);
+			if (sym != null)
+				FindImplementingSymbols (await doc.GetCompilationAsync (), sym);
+		}
+
+		static async Task<RefactoringSymbolInfo> GetNamedTypeAtCaret (Ide.Gui.Document doc)
+		{
+			if (doc == null)
+				return null;
+			var info = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor);
+
+			if (info.Node?.Parent.IsKind (SyntaxKind.SimpleBaseType) != true)
+				return null;
+			    
+			return info;
+		}
+
+		void FindImplementingSymbols (Compilation compilation, RefactoringSymbolInfo info)
+		{
+			var interfaceType = info.Symbol as ITypeSymbol;
+			if (interfaceType == null)
+				return;
+
+			Task.Run (delegate {
+				using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+					var parentTypeNode = info.Node?.Parent?.Parent?.Parent;
+					if (parentTypeNode == null)
+						return;
+					var implementingType = info.Model.GetDeclaredSymbol (parentTypeNode) as INamedTypeSymbol;
+					if (implementingType == null)
+						return;
+					foreach (var interfaceMember in interfaceType.GetMembers ()) {
+						var impl = implementingType.FindImplementationForInterfaceMember (interfaceMember);
+						if (impl == null)
+							continue;
+						var loc = impl.Locations.First ();
+						monitor.ReportResult (new MemberReference (impl, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+					}
+					foreach (var iFace in interfaceType.AllInterfaces) {
+					
+						foreach (var interfaceMember in iFace.GetMembers ()) {
+							var impl = implementingType.FindImplementationForInterfaceMember (interfaceMember);
+							if (impl == null)
+								continue;
+							var loc = impl.Locations.First ();
+							monitor.ReportResult (new MemberReference (impl, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+						}
+					}
+						
+				}
+			});
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindMemberOverloadsHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindMemberOverloadsHandler.cs
new file mode 100644
index 0000000000..3b4dd9fbae
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Navigation/FindMemberOverloadsHandler.cs
@@ -0,0 +1,100 @@
+//
+// FindMemberOverloadsHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.FindInFiles;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Core;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Navigation
+{
+	class FindMemberOverloadsHandler : CommandHandler
+	{
+		public static bool CanFindMemberOverloads (ISymbol symbol, out string description)
+		{
+			switch (symbol.Kind) {
+			case SymbolKind.Method:
+				description = GettextCatalog.GetString ("Find Method Overloads");
+				return symbol.ContainingType.GetMembers (symbol.Name).OfType<IMethodSymbol> ().Count () > 1;
+			case SymbolKind.Property:
+				description = GettextCatalog.GetString ("Find Indexer Overloads");
+				return symbol.ContainingType.GetMembers ().OfType<IPropertySymbol> () .Where (p => p.IsIndexer).Count () > 1;
+			default:
+				description = null;
+				return false;
+			}
+		}
+
+		public static void FindOverloads (ISymbol symbol)
+		{
+			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+				switch (symbol.Kind) {
+				case SymbolKind.Method:
+					foreach (var method in symbol.ContainingType.GetMembers (symbol.Name).OfType<IMethodSymbol> ()) {
+						foreach (var loc in method.Locations)
+							monitor.ReportResult (new MemberReference (method, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+					}
+					break;
+				case SymbolKind.Property:
+					foreach (var property in symbol.ContainingType.GetMembers ().OfType<IPropertySymbol> () .Where (p => p.IsIndexer)) {
+						foreach (var loc in property.Locations)
+							monitor.ReportResult (new MemberReference (property, loc.SourceTree.FilePath, loc.SourceSpan.Start, loc.SourceSpan.Length));
+					}
+					break;
+
+				}
+			}
+		}
+
+		protected override async void Update (CommandInfo info)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null) {
+				info.Enabled = false;
+				return;
+			}
+			var symInfo = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor);
+			var sym = symInfo.Symbol ?? symInfo.DeclaredSymbol;
+			info.Enabled = sym != null && (sym.IsKind (SymbolKind.Method) || sym.IsKind (SymbolKind.Property) && ((IPropertySymbol)sym).IsIndexer);
+			info.Bypass = !info.Enabled;
+		}
+
+		protected async override void Run ()
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			var info = await RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor);
+			var sym = info.Symbol ?? info.DeclaredSymbol;
+			if (sym != null)
+				FindOverloads (sym);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpFoldingParser.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpFoldingParser.cs
index f87390b709..776abe4a87 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpFoldingParser.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpFoldingParser.cs
@@ -26,9 +26,7 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.CSharp.Parser
 {
@@ -94,14 +92,14 @@ namespace MonoDevelop.CSharp.Parser
 
 		public unsafe ParsedDocument Parse (string fileName, string content)
 		{
-			var regionStack = new Stack<Tuple<string, TextLocation>> ();
+			var regionStack = new Stack<Tuple<string, DocumentLocation>> ();
 			var result = new DefaultParsedDocument (fileName);
 			bool inSingleComment = false, inMultiLineComment = false;
 			bool inString = false, inVerbatimString = false;
 			bool inChar = false;
 			bool inLineStart = true, hasStartedAtLine = false;
 			int line = 1, column = 1;
-			var startLoc = TextLocation.Empty;
+			var startLoc = DocumentLocation.Empty;
 			
 			fixed (char* startPtr = content) {
 				char* endPtr = startPtr + content.Length;
@@ -116,7 +114,7 @@ namespace MonoDevelop.CSharp.Parser
 						ptr++;
 
 						if (StartsIdentifier (ptr, endPtr, "region")) {
-							var regionLocation = new TextLocation (line, column);
+							var regionLocation = new DocumentLocation (line, column);
 							column++;
 							ptr += "region".Length;
 							column += "region".Length;
@@ -131,7 +129,7 @@ namespace MonoDevelop.CSharp.Parser
 								var beginRegion = regionStack.Pop ();
 								result.Add (new FoldingRegion (
 									beginRegion.Item1, 
-									new DomRegion (beginRegion.Item2.Line, beginRegion.Item2.Column, line, column),
+									new DocumentRegion (beginRegion.Item2.Line, beginRegion.Item2.Column, line, column),
 									FoldType.UserRegion,
 									true));
 							}
@@ -150,14 +148,14 @@ namespace MonoDevelop.CSharp.Parser
 							if (nextCh == '/') {
 								hasStartedAtLine = inLineStart;
 								beginPtr = ptr + 2;
-								startLoc = new TextLocation (line, column);
+								startLoc = new DocumentLocation (line, column);
 								ptr++;
 								column++;
 								inSingleComment = true;
 							} else if (nextCh == '*') {
 								hasStartedAtLine = inLineStart;
 								beginPtr = ptr + 2;
-								startLoc = new TextLocation (line, column);
+								startLoc = new DocumentLocation (line, column);
 								ptr++;
 								column++;
 								inMultiLineComment = true;
@@ -175,7 +173,7 @@ namespace MonoDevelop.CSharp.Parser
 								column += 2;
 								inMultiLineComment = false;
 								result.Add (new MonoDevelop.Ide.TypeSystem.Comment () {
-									Region = new DomRegion (startLoc, new TextLocation (line, column)),
+									Region = new DocumentRegion (startLoc, new DocumentLocation (line, column)),
 									OpenTag = "/*",
 									CommentType = MonoDevelop.Ide.TypeSystem.CommentType.Block,
 									Text = content.Substring ((int)(beginPtr - startPtr), (int)(ptr - beginPtr)),
@@ -202,7 +200,7 @@ namespace MonoDevelop.CSharp.Parser
 								beginPtr++;
 							
 							result.Add (new MonoDevelop.Ide.TypeSystem.Comment () { 
-								Region = new DomRegion (startLoc, new TextLocation (line, column)),
+								Region = new DocumentRegion (startLoc, new DocumentLocation (line, column)),
 								CommentType = MonoDevelop.Ide.TypeSystem.CommentType.SingleLine, 
 								OpenTag = "//",
 								Text = content.Substring ((int)(beginPtr - startPtr), (int)(ptr - beginPtr)),
@@ -254,7 +252,7 @@ namespace MonoDevelop.CSharp.Parser
 					ptr++;
 				}
 			}
-			foreach (var fold in result.Comments.ToFolds ()) {
+			foreach (var fold in result.GetCommentsAsync().Result.ToFolds ()) {
 				result.Add (fold);
 			}
 			return result;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpParsedDocument.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpParsedDocument.cs
new file mode 100644
index 0000000000..6a0a9fda1b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/CSharpParsedDocument.cs
@@ -0,0 +1,484 @@
+//
+// CSharpParsedDocument.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Ide.Editor;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.CSharp.Parser
+{
+	class CSharpParsedDocument : ParsedDocument
+	{
+		static string[] tagComments;
+
+		internal SyntaxTree Unit {
+			get;
+			set;
+		}
+
+		static CSharpParsedDocument ()
+		{
+			UpdateTags ();
+			MonoDevelop.Ide.Tasks.CommentTag.SpecialCommentTagsChanged += delegate {
+				UpdateTags ();
+			};
+		}
+
+		static void UpdateTags ()
+		{
+			tagComments = MonoDevelop.Ide.Tasks.CommentTag.SpecialCommentTags.Select (t => t.Tag).ToArray ();
+		}
+
+		public CSharpParsedDocument (string fileName) : base (fileName)
+		{
+		}
+		
+
+		#region implemented abstract members of ParsedDocument
+
+		IReadOnlyList<Comment> comments;
+		object commentLock = new object ();
+
+		public override Task<IReadOnlyList<Comment>> GetCommentsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (comments == null) {
+				return Task.Run (delegate {
+					lock (commentLock) {
+						if (comments == null) {
+							var visitor = new CommentVisitor (cancellationToken);
+							if (Unit != null)
+								visitor.Visit (Unit.GetRoot (cancellationToken));
+							comments = visitor.Comments;
+						}
+					}
+					return comments;
+				});
+			}
+			return Task.FromResult (comments);
+		}
+
+
+		class CommentVisitor : CSharpSyntaxWalker
+		{
+			public readonly List<Comment> Comments = new List<Comment> ();
+
+			CancellationToken cancellationToken;
+
+			public CommentVisitor (CancellationToken cancellationToken) : base(SyntaxWalkerDepth.Trivia)
+			{
+				this.cancellationToken = cancellationToken;
+			}
+
+			static DocumentRegion GetRegion (SyntaxTrivia trivia)
+			{
+				var fullSpan = trivia.FullSpan;
+				var text = trivia.ToString ();
+				if (text.Length > 2) {
+					if (text [text.Length - 2] == '\r' && text [text.Length - 1] == '\n')
+						fullSpan = new Microsoft.CodeAnalysis.Text.TextSpan (fullSpan.Start, fullSpan.Length - 2);
+					else if (NewLine.IsNewLine (text [text.Length - 1]))
+						fullSpan = new Microsoft.CodeAnalysis.Text.TextSpan (fullSpan.Start, fullSpan.Length - 1);
+				}
+				try {
+					var lineSpan = trivia.SyntaxTree.GetLineSpan (fullSpan);
+					return (DocumentRegion)lineSpan;
+				} catch (Exception) {
+					return DocumentRegion.Empty;
+				}
+			}
+
+			public override void VisitBlock (BlockSyntax node)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				base.VisitBlock (node);
+			}
+
+			bool StartsLine (SyntaxTrivia trivia)
+			{
+				var sourceText = trivia.SyntaxTree.GetText (cancellationToken);
+				Microsoft.CodeAnalysis.Text.TextLine textLine;
+				try {
+					textLine = sourceText.Lines.GetLineFromPosition (trivia.SpanStart);
+				} catch (ArgumentOutOfRangeException) {
+					return false;
+				}
+				//We need start of trivia.FullSpan and not trivia.SpanStart
+				//because in case of documentation /// <summary...
+				//trivia.SpanStart is space after /// and not 1st /
+				//so with trivia.FullSpan.Start we get index of 1st /
+				var startSpan = trivia.FullSpan.Start;
+				for (int i = textLine.Start; i < startSpan; i++) {
+					char ch = sourceText [i];
+					if (!char.IsWhiteSpace (ch))
+						return false;
+				}
+				return true;
+			}
+
+			static string CropStart (string text, string crop)
+			{
+				text = text.Trim ();
+				if (text.StartsWith (crop))
+					return text.Substring (crop.Length).TrimStart ();
+				return text;
+			}
+
+			public override void VisitTrivia (SyntaxTrivia trivia)
+			{
+				base.VisitTrivia (trivia);
+				switch (trivia.Kind ()) {
+				case SyntaxKind.MultiLineCommentTrivia:
+				case SyntaxKind.MultiLineDocumentationCommentTrivia:
+					{
+						var cmt = new Comment (CropStart (trivia.ToString (), "/*"));
+						cmt.CommentStartsLine = StartsLine(trivia);
+						cmt.CommentType = CommentType.Block;
+						cmt.OpenTag = "/*";
+						cmt.ClosingTag = "*/";
+						cmt.Region = GetRegion (trivia);
+						Comments.Add (cmt);
+						break;
+					}
+				case SyntaxKind.SingleLineCommentTrivia:
+					{
+						var cmt = new Comment (CropStart (trivia.ToString (), "//"));
+						cmt.CommentStartsLine = StartsLine(trivia);
+						cmt.CommentType = CommentType.SingleLine;
+						cmt.OpenTag = "//";
+						cmt.Region = GetRegion (trivia);
+						Comments.Add (cmt);
+						break;
+					}
+				case SyntaxKind.SingleLineDocumentationCommentTrivia:
+					{
+						var cmt = new Comment (CropStart (trivia.ToString (), "///"));
+						cmt.CommentStartsLine = StartsLine(trivia);
+						cmt.IsDocumentation = true;
+						cmt.CommentType = CommentType.Documentation;
+						cmt.OpenTag = "///";
+						cmt.ClosingTag = "*/";
+						cmt.Region = GetRegion (trivia);
+						Comments.Add (cmt);
+						break;
+					}
+
+				}
+
+			}
+		}
+
+		IReadOnlyList<Tag> tags;
+		object tagLock = new object ();
+		public override Task<IReadOnlyList<Tag>> GetTagCommentsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (tags == null) {
+				return Task.Run (delegate {
+					lock (tagLock) {
+						if (tags == null) {
+							var visitor = new SemanticTagVisitor (cancellationToken);
+							if (Unit != null) {
+								try {
+									visitor.Visit (Unit.GetRoot (cancellationToken));
+								} catch {
+								}
+							}
+							tags = visitor.Tags;
+						}
+						return tags;
+					}
+				});
+			}
+			return Task.FromResult (tags);
+		}
+
+		sealed class SemanticTagVisitor : CSharpSyntaxWalker
+		{
+			public List<Tag> Tags =  new List<Tag> ();
+			CancellationToken cancellationToken;
+
+			public SemanticTagVisitor () : base (SyntaxWalkerDepth.Trivia)
+			{
+			}
+
+			public SemanticTagVisitor (CancellationToken cancellationToken) : base (SyntaxWalkerDepth.Trivia)
+			{
+				this.cancellationToken = cancellationToken;
+			}
+
+			public override void VisitBlock (BlockSyntax node)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				base.VisitBlock (node);
+			}
+
+			public override void VisitTrivia (SyntaxTrivia trivia)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				if (trivia.IsKind (SyntaxKind.SingleLineCommentTrivia) || 
+					trivia.IsKind (SyntaxKind.MultiLineCommentTrivia) || 
+					trivia.IsKind (SyntaxKind.SingleLineDocumentationCommentTrivia)) {
+					var trimmedContent = trivia.ToString ().TrimStart ('/', ' ', '*');
+					foreach (string tag in tagComments) {
+						if (!trimmedContent.StartsWith (tag, StringComparison.Ordinal))
+							continue;
+						var loc = trivia.GetLocation ().GetLineSpan ();
+						Tags.Add (new Tag (tag, trimmedContent, new DocumentRegion (loc.StartLinePosition, loc.EndLinePosition)));
+						break;
+					}
+				}
+			}
+
+			public override void VisitThrowStatement (Microsoft.CodeAnalysis.CSharp.Syntax.ThrowStatementSyntax node)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				base.VisitThrowStatement (node);
+				var createExpression = node.Expression as ObjectCreationExpressionSyntax;
+				if (createExpression == null)
+					return;
+				var st = createExpression.Type.ToString ();
+				if (st == "NotImplementedException" || st == "System.NotImplementedException") {
+					var loc = node.GetLocation ().GetLineSpan ();
+					if (createExpression.ArgumentList.Arguments.Count > 0) {
+						Tags.Add (new Tag ("High", GettextCatalog.GetString ("NotImplementedException({0}) thrown.", createExpression.ArgumentList.Arguments.First ().ToString ()), new DocumentRegion (loc.StartLinePosition, loc.EndLinePosition)));
+					} else {
+						Tags.Add (new Tag ("High", GettextCatalog.GetString ("NotImplementedException thrown."), new DocumentRegion (loc.StartLinePosition, loc.EndLinePosition)));
+					}
+				}
+			}
+		}
+
+		IReadOnlyList<FoldingRegion> foldings;
+		object foldingLock = new object ();
+
+		public override Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (foldings == null) {
+				return Task.Run (delegate {
+					lock (foldingLock) {
+						if (foldings == null)
+							foldings = GenerateFoldings (cancellationToken).ToList ();
+					}
+					return foldings;
+				});
+			}
+
+			return Task.FromResult (foldings);
+		}
+
+		IEnumerable<FoldingRegion> GenerateFoldings (CancellationToken cancellationToken)
+		{
+			foreach (var fold in GetCommentsAsync().Result.ToFolds ())
+				yield return fold;
+
+			var visitor = new FoldingVisitor (cancellationToken);
+			if (Unit != null) {
+				try {
+					visitor.Visit (Unit.GetRoot (cancellationToken));
+				} catch (Exception) { }
+			}
+			foreach (var fold in visitor.Foldings)
+				yield return fold;
+		}
+
+		class FoldingVisitor : CSharpSyntaxWalker
+		{
+			public readonly List<FoldingRegion> Foldings = new List<FoldingRegion> ();
+			CancellationToken cancellationToken;
+
+			public FoldingVisitor (CancellationToken cancellationToken) : base(SyntaxWalkerDepth.Trivia)
+			{
+				this.cancellationToken = cancellationToken;
+			}
+
+			void AddUsings (SyntaxNode parent)
+			{
+				SyntaxNode firstChild = null, lastChild = null;
+				foreach (var child in parent.ChildNodes ()) {
+					if (child is UsingDirectiveSyntax) {
+						if (firstChild == null) {
+							firstChild = child;
+						}
+						lastChild = child;
+						continue;
+					}
+					if (firstChild != null)
+						break;
+				}
+
+				if (firstChild != null && firstChild != lastChild) {
+					var first = firstChild.GetLocation ().GetLineSpan ();
+					var last = lastChild.GetLocation ().GetLineSpan ();
+
+					Foldings.Add (new FoldingRegion (new DocumentRegion (first.StartLinePosition, last.EndLinePosition), FoldType.Undefined));
+				}
+			}
+
+			public override void VisitCompilationUnit (Microsoft.CodeAnalysis.CSharp.Syntax.CompilationUnitSyntax node)
+			{
+				AddUsings (node);
+				base.VisitCompilationUnit (node);
+			}
+
+			void AddFolding (SyntaxToken openBrace, SyntaxToken closeBrace, FoldType type)
+			{
+				openBrace = openBrace.GetPreviousToken (false, false, true, true);
+
+				try {
+					var first = openBrace.GetLocation ().GetLineSpan ();
+					var last = closeBrace.GetLocation ().GetLineSpan ();
+
+					if (first.EndLinePosition.Line != last.EndLinePosition.Line)
+						Foldings.Add (new FoldingRegion (new DocumentRegion (first.EndLinePosition, last.EndLinePosition), type));
+				} catch (ArgumentOutOfRangeException) {}
+			}
+
+			Stack<SyntaxTrivia> regionStack = new Stack<SyntaxTrivia> ();
+			public override void VisitTrivia (SyntaxTrivia trivia)
+			{
+				base.VisitTrivia (trivia);
+				if (trivia.IsKind (SyntaxKind.RegionDirectiveTrivia)) {
+					regionStack.Push (trivia);
+				} else if (trivia.IsKind (SyntaxKind.EndRegionDirectiveTrivia)) {
+					if (regionStack.Count == 0)
+						return;
+					var regionStart = regionStack.Pop ();
+					try {
+						var first = regionStart.GetLocation ().GetLineSpan ();
+						var last = trivia.GetLocation ().GetLineSpan ();
+						var v = regionStart.ToString ();
+						v = v.Substring ("#region".Length).Trim ();
+						if (v.Length == 0)
+							v = "...";
+						Foldings.Add (new FoldingRegion(v, new DocumentRegion(first.StartLinePosition, last.EndLinePosition), FoldType.UserRegion, true));
+					} catch (ArgumentOutOfRangeException) { }
+				}
+			}
+
+			public override void VisitNamespaceDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.NamespaceDeclarationSyntax node)
+			{
+				AddUsings (node);
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken, FoldType.Undefined);
+				base.VisitNamespaceDeclaration (node);
+			}
+
+			public override void VisitClassDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.ClassDeclarationSyntax node)
+			{
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken, FoldType.Type);
+				base.VisitClassDeclaration (node);
+			}
+
+			public override void VisitStructDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.StructDeclarationSyntax node)
+			{
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken, FoldType.Type);
+				base.VisitStructDeclaration (node);
+			}
+
+			public override void VisitInterfaceDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.InterfaceDeclarationSyntax node)
+			{
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken, FoldType.Type);
+				base.VisitInterfaceDeclaration (node);
+			}
+
+			public override void VisitEnumDeclaration (Microsoft.CodeAnalysis.CSharp.Syntax.EnumDeclarationSyntax node)
+			{
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken, FoldType.Type);
+				base.VisitEnumDeclaration (node);
+			}
+
+			public override void VisitBlock (Microsoft.CodeAnalysis.CSharp.Syntax.BlockSyntax node)
+			{
+				cancellationToken.ThrowIfCancellationRequested ();
+				AddFolding (node.OpenBraceToken, node.CloseBraceToken, node.Parent is MemberDeclarationSyntax ? FoldType.Member : FoldType.Undefined);
+				base.VisitBlock (node);
+			}
+		}
+
+		static readonly IReadOnlyList<Error> emptyErrors = new Error[0];
+		IReadOnlyList<Error> errors;
+		object errorLock = new object ();
+
+		public override Task<IReadOnlyList<Error>> GetErrorsAsync (CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var model = GetAst<SemanticModel> ();
+			if (model == null)
+				return Task.FromResult (emptyErrors);
+			
+			if (errors == null) {
+				return Task.Run (delegate {
+					lock (errorLock) {
+						if (errors == null) {
+							try {
+								errors = model
+									.GetDiagnostics (null, cancellationToken)
+									.Where (diag => diag.Severity == DiagnosticSeverity.Error || diag.Severity == DiagnosticSeverity.Warning)
+									.Select ((Diagnostic diag) => new Error (GetErrorType (diag.Severity), diag.Id, diag.GetMessage (), GetRegion (diag)) { Tag = diag })
+									.ToList ();
+							} catch (OperationCanceledException) {
+								errors = emptyErrors;
+							} catch (Exception e) {
+								LoggingService.LogError ("Error while getting diagnostics.", e);
+								errors = emptyErrors;
+							}
+						}
+					}
+					return errors;
+				});
+			}
+			return Task.FromResult (errors);
+		}
+
+		static DocumentRegion GetRegion (Diagnostic diagnostic)
+		{
+			try {
+				var lineSpan = diagnostic.Location.GetLineSpan ();
+				return new DocumentRegion (lineSpan.StartLinePosition, lineSpan.EndLinePosition);
+			} catch (Exception) {
+				return DocumentRegion.Empty;
+			}
+		}
+
+		static ErrorType GetErrorType (DiagnosticSeverity severity)
+		{
+			switch (severity) {
+			case DiagnosticSeverity.Error:
+				return ErrorType.Error;
+			case DiagnosticSeverity.Warning:
+				return ErrorType.Warning;
+			}
+			return ErrorType.Unknown;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/McsParser.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/McsParser.cs
index 210c70a1df..7543432221 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/McsParser.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/McsParser.cs
@@ -39,7 +39,7 @@ using System.Linq;
 
 namespace MonoDevelop.CSharp.Parser
 {
-	public class McsParser : AbstractParser
+	class McsParser : AbstractParser
 	{
 		public override IExpressionFinder CreateExpressionFinder (ProjectDom dom)
 		{
@@ -55,7 +55,7 @@ namespace MonoDevelop.CSharp.Parser
 			return new NRefactoryResolver (dom, doc.CompilationUnit, ICSharpCode.OldNRefactory.SupportedLanguage.CSharp, doc.Editor, fileName);
 		}
 		
-		public class ErrorReportPrinter : ReportPrinter
+		class ErrorReportPrinter : ReportPrinter
 		{
 			public readonly List<Error> Errors = new List<Error> ();
 			
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
index 97df6557c4..af3b7e7e4d 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
@@ -25,375 +25,84 @@
 // THE SOFTWARE.
 using System;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Collections.Generic;
 using MonoDevelop.Projects;
 using MonoDevelop.CSharp.Project;
-using MonoDevelop.Ide.Tasks;
-using System.Linq;
-using ICSharpCode.NRefactory;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.MonoCSharp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.CSharp.Parser
 {
-	public class TypeSystemParser : MonoDevelop.Ide.TypeSystem.TypeSystemParser
+	sealed class TypeSystemParser : MonoDevelop.Ide.TypeSystem.TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, System.IO.TextReader content, MonoDevelop.Projects.Project project = null)
+		public override async System.Threading.Tasks.Task<ParsedDocument> Parse (MonoDevelop.Ide.TypeSystem.ParseOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
 		{
-			var parser = new ICSharpCode.NRefactory.CSharp.CSharpParser (GetCompilerArguments (project));
-			parser.GenerateTypeSystemMode = !storeAst;
-			var result = new ParsedDocumentDecorator ();
+			var fileName = options.FileName;
+			var project = options.Project;
+			var result = new CSharpParsedDocument (fileName);
 
 			if (project != null) {
+				
 				var projectFile = project.Files.GetFile (fileName);
 				if (projectFile != null && !TypeSystemParserNode.IsCompileBuildAction (projectFile.BuildAction))
 					result.Flags |= ParsedDocumentFlags.NonSerializable;
 			}
 
-			var tagComments = CommentTag.SpecialCommentTags.Select (t => t.Tag).ToArray ();
-			
-			parser.CompilationUnitCallback = delegate (CompilerCompilationUnit top) {
-				foreach (var special in top.SpecialsBag.Specials) {
-					var comment = special as SpecialsBag.Comment;
-					if (comment != null) {
-						VisitComment (result, comment, tagComments);
-					} else {
-						if (storeAst) {
-							var ppd = special as SpecialsBag.PreProcessorDirective;
-							if  (ppd != null)
-								VisitPreprocessorDirective (result, ppd);
-						}
-					}
-				}
-			};
-			
-			var unit = parser.Parse (content, fileName);
-			unit.Freeze ();
-			var pf = unit.ToTypeSystem ();
-			try {
-				pf.LastWriteTime = System.IO.File.GetLastWriteTimeUtc (fileName);
-			} catch (Exception) {
-				pf.LastWriteTime = DateTime.UtcNow;
-			}
-
-			result.LastWriteTimeUtc = pf.LastWriteTime.Value;
-			result.ParsedFile = pf;
-			result.Add (GetSemanticTags (unit));
-
-			result.CreateRefactoringContext = delegate (MonoDevelop.Ide.Gui.Document doc, System.Threading.CancellationToken token) {
-				var task = MDRefactoringContext.Create (doc, doc.Editor.Caret.Location, token);
-				try {
-					task.Wait (5000, token);
-				} catch (AggregateException ae) {
-					ae.Flatten ().Handle (aex => aex is OperationCanceledException);
-					return null;
-				} catch (OperationCanceledException) {
-					return null;
-				}
-				if (!task.IsCompleted)
-					return null;
-				return task.Result;
-			};
-			result.CreateRefactoringContextWithEditor = (data, resolver, token) => new MDRefactoringContext ((DotNetProject)project, data, result, (CSharpAstResolver)resolver, TextLocation.Empty, token);
-
-			if (storeAst) {
-				result.Ast = unit;
-				result.Add (GenerateFoldings (unit, result));
-			}
-			return result;
-		}
-		
-		IEnumerable<FoldingRegion> GenerateFoldings (SyntaxTree unit, ParsedDocument doc)
-		{
-			foreach (var fold in doc.ConditionalRegions.ToFolds ())
-				yield return fold;
-			
-			foreach (var fold in doc.Comments.ToFolds ())
-				yield return fold;
-			
-			var visitor = new FoldingVisitor ();
-			unit.AcceptVisitor (visitor, null);
-			foreach (var fold in visitor.Foldings)
-				yield return fold;
-		}
-
-		class FoldingVisitor : DepthFirstAstVisitor<object, object>
-		{
-			public readonly List<FoldingRegion> Foldings = new List<FoldingRegion> ();
+			SyntaxTree unit = null;
 
-			void AddUsings (AstNode parent)
-			{
-				var firstChild = parent.Children.FirstOrDefault (child => child is UsingDeclaration || child is UsingAliasDeclaration);
-				var node = firstChild;
-				while (node != null) {
-					var next = node.GetNextNode ();
-					if (next is UsingDeclaration || next is UsingAliasDeclaration) {
-						node = next;
-					} else {
-						break;
+			if (project != null) {
+				var curDoc = options.RoslynDocument;
+				if (curDoc == null) {
+					var curProject = TypeSystemService.GetCodeAnalysisProject (project);
+					if (curProject != null) {
+						var documentId = TypeSystemService.GetDocumentId (project, fileName);
+						if (documentId != null)
+							curDoc = curProject.GetDocument (documentId);
 					}
 				}
-				if (firstChild != node) {
-					Foldings.Add (new FoldingRegion (new DomRegion (firstChild.StartLocation, node.EndLocation), FoldType.Undefined));
-				}
-			}
-			public override object VisitSyntaxTree (SyntaxTree unit, object data)
-			{
-				AddUsings (unit);
-				return base.VisitSyntaxTree (unit, data);
-			}
-
-			static TextLocation CorrectEnd (AstNode token)
-			{
-				return new TextLocation (token.EndLocation.Line, token.EndLocation.Column + 1);
-			}
-
-			static bool LastToken(AstNode arg)
-			{
-				return !(arg.Role == Roles.NewLine || arg.Role == Roles.Whitespace || arg.Role == Roles.Comment);
-			}
-		
-			public override object VisitNamespaceDeclaration (NamespaceDeclaration namespaceDeclaration, object data)
-			{
-				AddUsings (namespaceDeclaration);
-				if (!namespaceDeclaration.RBraceToken.IsNull && namespaceDeclaration.LBraceToken.StartLocation.Line != namespaceDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (namespaceDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (namespaceDeclaration.RBraceToken)), FoldType.Undefined));
-				return base.VisitNamespaceDeclaration (namespaceDeclaration, data);
-			}
-			
-			public override object VisitTypeDeclaration (TypeDeclaration typeDeclaration, object data)
-			{
-				if (!typeDeclaration.RBraceToken.IsNull && typeDeclaration.LBraceToken.StartLocation.Line != typeDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (typeDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (typeDeclaration.RBraceToken)), FoldType.Type));
-				return base.VisitTypeDeclaration (typeDeclaration, data);
-			}
-			
-			public override object VisitMethodDeclaration (MethodDeclaration methodDeclaration, object data)
-			{
-				if (!methodDeclaration.Body.IsNull && methodDeclaration.Body.LBraceToken.StartLocation.Line != methodDeclaration.Body.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (methodDeclaration.Body.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (methodDeclaration.Body.RBraceToken)), FoldType.Member));
-				return base.VisitMethodDeclaration (methodDeclaration, data);
-			}
-			
-			public override object VisitConstructorDeclaration (ConstructorDeclaration constructorDeclaration, object data)
-			{
-				if (!constructorDeclaration.Body.IsNull && constructorDeclaration.Body.LBraceToken.StartLocation.Line != constructorDeclaration.Body.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (constructorDeclaration.Body.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (constructorDeclaration.Body.RBraceToken)), FoldType.Member));
-				return base.VisitConstructorDeclaration (constructorDeclaration, data);
-			}
-			
-			public override object VisitDestructorDeclaration (DestructorDeclaration destructorDeclaration, object data)
-			{
-				if (!destructorDeclaration.Body.IsNull && destructorDeclaration.Body.LBraceToken.StartLocation.Line != destructorDeclaration.Body.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (destructorDeclaration.Body.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (destructorDeclaration.Body.RBraceToken)), FoldType.Member));
-				return base.VisitDestructorDeclaration (destructorDeclaration, data);
-			}
-			
-			public override object VisitOperatorDeclaration (OperatorDeclaration operatorDeclaration, object data)
-			{
-				if (!operatorDeclaration.Body.IsNull && operatorDeclaration.Body.LBraceToken.StartLocation.Line != operatorDeclaration.Body.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (operatorDeclaration.Body.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (operatorDeclaration.Body.RBraceToken)), FoldType.Member));
-				return base.VisitOperatorDeclaration (operatorDeclaration, data);
-			}
-			
-			public override object VisitPropertyDeclaration (PropertyDeclaration propertyDeclaration, object data)
-			{
-				if (!propertyDeclaration.LBraceToken.IsNull && propertyDeclaration.LBraceToken.StartLocation.Line != propertyDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (propertyDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (propertyDeclaration.RBraceToken)), FoldType.Member));
-				return base.VisitPropertyDeclaration (propertyDeclaration, data);
-			}
-			
-			public override object VisitIndexerDeclaration (IndexerDeclaration indexerDeclaration, object data)
-			{
-				if (!indexerDeclaration.LBraceToken.IsNull && indexerDeclaration.LBraceToken.StartLocation.Line != indexerDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (indexerDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (indexerDeclaration.RBraceToken)), FoldType.Member));
-				return base.VisitIndexerDeclaration (indexerDeclaration, data);
-			}
-			
-			public override object VisitCustomEventDeclaration (CustomEventDeclaration eventDeclaration, object data)
-			{
-				if (!eventDeclaration.LBraceToken.IsNull && eventDeclaration.LBraceToken.StartLocation.Line != eventDeclaration.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (eventDeclaration.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (eventDeclaration.RBraceToken)), FoldType.Member));
-				return base.VisitCustomEventDeclaration (eventDeclaration, data);
-			}
-			
-			public override object VisitSwitchStatement (SwitchStatement switchStatement, object data)
-			{
-				if (!switchStatement.RBraceToken.IsNull && switchStatement.LBraceToken.StartLocation.Line != switchStatement.RBraceToken.StartLocation.Line)
-					Foldings.Add (new FoldingRegion (new DomRegion (switchStatement.LBraceToken.GetPrevNode (LastToken).EndLocation, CorrectEnd (switchStatement.RBraceToken)), FoldType.Member));
-				return base.VisitSwitchStatement (switchStatement, data);
-			}
-			
-			public override object VisitBlockStatement (BlockStatement blockStatement, object data)
-			{
-				if (!(blockStatement.Parent is EntityDeclaration) && blockStatement.EndLocation.Line - blockStatement.StartLocation.Line > 2) {
-					Foldings.Add (new FoldingRegion (new DomRegion (blockStatement.GetPrevNode (LastToken).EndLocation, CorrectEnd (blockStatement.RBraceToken)), FoldType.Undefined));
-				}
-				
-				return base.VisitBlockStatement (blockStatement, data);
-			}
-		}
-
-		static IEnumerable<Tag> GetSemanticTags (SyntaxTree unit)
-		{
-			var visitor = new SemanticTagVisitor ();
-			unit.AcceptVisitor (visitor);
-			foreach (var fold in visitor.Tags)
-				yield return fold;
-		}
-
-		public class SemanticTagVisitor : DepthFirstAstVisitor
-		{
-			public List<Tag> Tags =  new List<Tag> ();
-
-			public override void VisitThrowStatement (ThrowStatement throwStatement)
-			{
-				var createExpression = throwStatement.Expression as ObjectCreateExpression;
-				if (createExpression == null)
-					return;
-				var st = createExpression.Type as SimpleType;
-				var mt = createExpression.Type as MemberType;
-				if (st != null && st.Identifier == "NotImplementedException" ||
-				    mt != null && mt.MemberName == "NotImplementedException" && mt.Target.ToString () == "System") {
-
-					if (createExpression.Arguments.Any ()) {
-						Tags.Add (new Tag ("High", GettextCatalog.GetString ("NotImplementedException({0}) thrown.", createExpression.Arguments.First ().ToString ()), new DomRegion (throwStatement.StartLocation, throwStatement.EndLocation)));
-					} else {
-						Tags.Add (new Tag ("High", GettextCatalog.GetString ("NotImplementedException thrown."), new DomRegion (throwStatement.StartLocation, throwStatement.EndLocation)));
+				if (curDoc != null) {
+					try {
+						var model = await curDoc.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+						unit = model.SyntaxTree;
+						result.Ast = model;
+					} catch (AggregateException ae) {
+						ae.Flatten ().Handle (x => x is OperationCanceledException); 
+						return result;
+					} catch (OperationCanceledException) {
+						return result;
+					} catch (Exception e) {
+						LoggingService.LogError ("Error while getting the semantic model for " + fileName, e); 
 					}
 				}
 			}
-		}
 
-		void VisitMcsUnit ()
-		{
-		}
-		
-		void VisitComment (ParsedDocument result, SpecialsBag.Comment comment, string[] tagComments)
-		{
-			var cmt = new MonoDevelop.Ide.TypeSystem.Comment (comment.Content);
-			cmt.CommentStartsLine = comment.StartsLine;
-			switch (comment.CommentType) {
-			case SpecialsBag.CommentType.Multi:
-				cmt.CommentType = MonoDevelop.Ide.TypeSystem.CommentType.Block;
-				cmt.OpenTag = "/*";
-				cmt.ClosingTag = "*/";
-				break;
-			case SpecialsBag.CommentType.Single:
-				cmt.CommentType = MonoDevelop.Ide.TypeSystem.CommentType.SingleLine;
-				cmt.OpenTag = "//";
-				break;
-			case SpecialsBag.CommentType.Documentation:
-				cmt.CommentType = MonoDevelop.Ide.TypeSystem.CommentType.Documentation;
-				cmt.IsDocumentation = true;
-				cmt.OpenTag = "///";
-				break;
-			}
-			cmt.Region = new DomRegion (comment.Line, comment.Col, comment.EndLine, comment.EndCol);
-			result.Comments.Add (cmt);
-			var trimmedContent = comment.Content.TrimStart ();
-			foreach (string tag in tagComments) {
-				if (!trimmedContent.StartsWith (tag))
-					continue;
-				result.Add (new Tag (tag, comment.Content, cmt.Region));
-			}
-		}
-		
-		Stack<SpecialsBag.PreProcessorDirective> regions = new Stack<SpecialsBag.PreProcessorDirective> ();
-		Stack<SpecialsBag.PreProcessorDirective> ifBlocks = new Stack<SpecialsBag.PreProcessorDirective> ();
-		List<SpecialsBag.PreProcessorDirective> elifBlocks = new List<SpecialsBag.PreProcessorDirective> ();
-		SpecialsBag.PreProcessorDirective elseBlock = null;
-		
-		Stack<ConditionalRegion> conditionalRegions = new Stack<ConditionalRegion> ();
-		ConditionalRegion ConditionalRegion {
-			get {
-				return conditionalRegions.Count > 0 ? conditionalRegions.Peek () : null;
-			}
-		}
+			if (unit == null) {
+				var compilerArguments = GetCompilerArguments (project);
+				unit = CSharpSyntaxTree.ParseText (SourceText.From (options.Content.Text), compilerArguments, fileName);
+			} 
 
-		void CloseConditionBlock (TextLocation loc)
-		{
-			if (ConditionalRegion == null || ConditionalRegion.ConditionBlocks.Count == 0 || !ConditionalRegion.ConditionBlocks[ConditionalRegion.ConditionBlocks.Count - 1].End.IsEmpty)
-				return;
-			ConditionalRegion.ConditionBlocks[ConditionalRegion.ConditionBlocks.Count - 1].End = loc;
-		}
+			result.Unit = unit;
 
-		void AddCurRegion (ParsedDocument result, int line, int col)
-		{
-			if (ConditionalRegion == null)
-				return;
-			ConditionalRegion.End = new TextLocation (line, col);
-			result.Add (ConditionalRegion);
-			conditionalRegions.Pop ();
-		}
-		
-		void VisitPreprocessorDirective (ParsedDocument result, SpecialsBag.PreProcessorDirective directive)
-		{
-			TextLocation loc = new TextLocation (directive.Line, directive.Col);
-			switch (directive.Cmd) {
-			case Tokenizer.PreprocessorDirective.If:
-				conditionalRegions.Push (new ConditionalRegion (directive.Arg));
-				ifBlocks.Push (directive);
-				ConditionalRegion.Start = loc;
-				break;
-			case Tokenizer.PreprocessorDirective.Elif:
-				CloseConditionBlock (new TextLocation (directive.EndLine, directive.EndCol));
-				if (ConditionalRegion != null)
-					ConditionalRegion.ConditionBlocks.Add (new ConditionBlock (directive.Arg, loc));
-				break;
-			case Tokenizer.PreprocessorDirective.Else:
-				CloseConditionBlock (new TextLocation (directive.EndLine, directive.EndCol));
-				if (ConditionalRegion != null)
-					ConditionalRegion.ElseBlock = new DomRegion (loc, TextLocation.Empty);
-				break;
-			case Tokenizer.PreprocessorDirective.Endif:
-				TextLocation endLoc = new TextLocation (directive.EndLine, directive.EndCol);
-				CloseConditionBlock (endLoc);
-				if (ConditionalRegion != null && !ConditionalRegion.ElseBlock.Begin.IsEmpty)
-					ConditionalRegion.ElseBlock = new DomRegion (ConditionalRegion.ElseBlock.Begin, endLoc);
-				AddCurRegion (result, directive.EndLine, directive.EndCol);
-				if (ifBlocks.Count > 0) {
-					var ifBlock = ifBlocks.Pop ();
-					var ifRegion = new DomRegion (ifBlock.Line, ifBlock.Col, directive.EndLine, directive.EndCol);
-					result.Add (new FoldingRegion ("#if " + ifBlock.Arg.Trim (), ifRegion, FoldType.UserRegion, false));
-					foreach (var d in elifBlocks) {
-						var elIlfRegion = new DomRegion (d.Line, d.Col, directive.EndLine, directive.EndCol);
-						result.Add (new FoldingRegion ("#elif " + ifBlock.Arg.Trim (), elIlfRegion, FoldType.UserRegion, false));
-					}
-					if (elseBlock != null) {
-						var elseBlockRegion = new DomRegion (elseBlock.Line, elseBlock.Col, elseBlock.Line, elseBlock.Col);
-						result.Add (new FoldingRegion ("#else", elseBlockRegion, FoldType.UserRegion, false));
-					}
-				}
-				elseBlock = null;
-				break;
-			case Tokenizer.PreprocessorDirective.Define:
-				result.Add (new PreProcessorDefine (directive.Arg, loc));
-				break;
-			case Tokenizer.PreprocessorDirective.Region:
-				regions.Push (directive);
-				break;
-			case Tokenizer.PreprocessorDirective.Endregion:
-				if (regions.Count > 0) {
-					var start = regions.Pop ();
-					DomRegion dr = new DomRegion (start.Line, start.Col, directive.EndLine, directive.EndCol);
-					result.Add (new FoldingRegion (start.Arg, dr, FoldType.UserRegion, true));
-				}
-				break;
+			DateTime time;
+			try {
+				time = System.IO.File.GetLastWriteTimeUtc (fileName);
+			} catch (Exception) {
+				time = DateTime.UtcNow;
 			}
+			result.LastWriteTimeUtc = time;
+			return result;
 		}
 
-		public static ICSharpCode.NRefactory.CSharp.CompilerSettings GetCompilerArguments (MonoDevelop.Projects.Project project)
+		public static CSharpParseOptions GetCompilerArguments (MonoDevelop.Projects.Project project)
 		{
-			var compilerArguments = new ICSharpCode.NRefactory.CSharp.CompilerSettings ();
+			var compilerArguments = new CSharpParseOptions ();
 	//		compilerArguments.TabSize = 1;
 
 			if (project == null || MonoDevelop.Ide.IdeApp.Workspace == null) {
-				compilerArguments.AllowUnsafeBlocks = true;
+				// compilerArguments.AllowUnsafeBlocks = true;
 				return compilerArguments;
 			}
 
@@ -401,69 +110,54 @@ namespace MonoDevelop.CSharp.Parser
 			if (configuration == null)
 				return compilerArguments;
 
-			foreach (var sym in configuration.GetDefineSymbols ())
-				compilerArguments.ConditionalSymbols.Add (sym);
+			compilerArguments = compilerArguments.WithPreprocessorSymbols (configuration.GetDefineSymbols ());
 
 			var par = configuration.CompilationParameters as CSharpCompilerParameters;
 			if (par == null)
 				return compilerArguments;
-			
-			compilerArguments.AllowUnsafeBlocks = par.UnsafeCode;
-			compilerArguments.LanguageVersion = ConvertLanguageVersion (par.LangVersion);
-			compilerArguments.CheckForOverflow = par.GenerateOverflowChecks;
-			compilerArguments.WarningLevel = par.WarningLevel;
-			compilerArguments.TreatWarningsAsErrors = par.TreatWarningsAsErrors;
-			if (!string.IsNullOrEmpty (par.NoWarnings)) {
-				foreach (var warning in par.NoWarnings.Split (';', ',', ' ', '\t')) {
-					int w;
-					try {
-						w = int.Parse (warning);
-					} catch (Exception) {
-						continue;
-					}
-					compilerArguments.DisabledWarnings.Add (w);
-				}
-			}
+
+			 
+			// compilerArguments.AllowUnsafeBlocks = par.UnsafeCode;
+			compilerArguments = compilerArguments.WithLanguageVersion (ConvertLanguageVersion (par.LangVersion));
+//			compilerArguments.CheckForOverflow = par.GenerateOverflowChecks;
+
+//			compilerArguments.WarningLevel = par.WarningLevel;
+//			compilerArguments.TreatWarningsAsErrors = par.TreatWarningsAsErrors;
+//			if (!string.IsNullOrEmpty (par.NoWarnings)) {
+//				foreach (var warning in par.NoWarnings.Split (';', ',', ' ', '\t')) {
+//					int w;
+//					try {
+//						w = int.Parse (warning);
+//					} catch (Exception) {
+//						continue;
+//					}
+//					compilerArguments.DisabledWarnings.Add (w);
+//				}
+//			}
 			
 			return compilerArguments;
 		}
 		
-		internal static Version ConvertLanguageVersion (LangVersion ver)
+		internal static Microsoft.CodeAnalysis.CSharp.LanguageVersion ConvertLanguageVersion (LangVersion ver)
 		{
 			switch (ver) {
 			case LangVersion.ISO_1:
-				return new Version (1, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp1;
 			case LangVersion.ISO_2:
-				return new Version (2, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp2;
 			case LangVersion.Version3:
-				return new Version (3, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp3;
 			case LangVersion.Version4:
-				return new Version (4, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp4;
 			case LangVersion.Version5:
-				return new Version (5, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp5;
 			case LangVersion.Version6:
-				return new Version (6, 0, 0, 0);
+				return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp6;
 			case LangVersion.Default:
 				break;
 			}
-			return new Version (6, 0, 0, 0);;
+			return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp6;
 		}
 	}
-	
-	static class FoldingUtils
-	{
-		public static IEnumerable<FoldingRegion> ToFolds (this IEnumerable<ConditionalRegion> conditionalRegions)
-		{
-			foreach (ConditionalRegion region in conditionalRegions) {
-				yield return new FoldingRegion ("#if " + region.Flag, region.Region, FoldType.ConditionalDefine);
-				foreach (ConditionBlock block in region.ConditionBlocks) {
-					yield return new FoldingRegion ("#elif " + block.Flag, block.Region,
-					                                FoldType.ConditionalDefine);
-				}
-				if (!region.ElseBlock.IsEmpty)
-					yield return new FoldingRegion ("#else", region.ElseBlock, FoldType.ConditionalDefine);
-			}
-		}		
-	}
 }
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
index 88dcd74b8a..084ae9be42 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
@@ -33,6 +33,10 @@ using MonoDevelop.Core.Serialization;
 using MonoDevelop.Core;
 using Mono.Collections.Generic;
 using System.Linq;
+using MonoDevelop.Projects.MSBuild;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 
 namespace MonoDevelop.CSharp.Project
 {
@@ -49,18 +53,16 @@ namespace MonoDevelop.CSharp.Project
 	/// <summary>
 	/// This class handles project specific compiler parameters
 	/// </summary>
-	public class CSharpCompilerParameters: DotNetConfigurationParameters
+	public class CSharpCompilerParameters: DotNetCompilerParameters
 	{
 		// Configuration parameters
-		
-		[ItemProperty ("WarningLevel")]
-		int  warninglevel = 4;
+
+		int? warninglevel = 4;
 		
 		[ItemProperty ("NoWarn", DefaultValue = "")]
 		string noWarnings = String.Empty;
 		
-		[ItemProperty ("Optimize")]
-		bool optimize;
+		bool? optimize = false;
 		
 		[ItemProperty ("AllowUnsafeBlocks", DefaultValue = false)]
 		bool unsafecode = false;
@@ -89,63 +91,74 @@ namespace MonoDevelop.CSharp.Project
 		[ItemProperty("WarningsNotAsErrors", DefaultValue="")]
 		string warningsNotAsErrors = "";
 
-		[ItemProperty("DebugType", DefaultValue="")]
-		string debugType = "";
-		
-		#region Members required for backwards compatibility. Not used for anything else.
-		
-		[ItemProperty ("StartupObject", DefaultValue = null)]
-		internal string mainclass;
-		
-		[ProjectPathItemProperty ("ApplicationIcon", DefaultValue = null)]
-		internal string win32Icon;
+		protected override void Write (IPropertySet pset)
+		{
+			pset.SetPropertyOrder ("DebugSymbols", "DebugType", "Optimize", "OutputPath", "DefineConstants", "ErrorReport", "WarningLevel", "TreatWarningsAsErrors", "DocumentationFile");
 
-		[ProjectPathItemProperty ("Win32Resource", DefaultValue = null)]
-		internal string win32Resource;
-	
-		[ItemProperty ("CodePage", DefaultValue = null)]
-		internal string codePage;
+			base.Write (pset);
 
-		[ItemProperty ("GenerateDocumentation", DefaultValue = null)]
-		bool? generateXmlDocumentation = null;
-		
-		#endregion
-		
-		
-		protected override void OnEndLoad ()
+			if (optimize.HasValue)
+				pset.SetValue ("Optimize", optimize.Value);
+			if (warninglevel.HasValue)
+				pset.SetValue ("WarningLevel", warninglevel.Value);
+		}
+
+		protected override void Read (IPropertySet pset)
 		{
-			base.OnEndLoad ();
-			
-			// Backwards compatibility. Move parameters to the project parameters object
-			if (ParentConfiguration != null && ParentConfiguration.ProjectParameters != null) {
-				CSharpProjectParameters cparams = (CSharpProjectParameters) ParentConfiguration.ProjectParameters;
-				if (win32Icon != null) {
-					cparams.Win32Icon = win32Icon;
-					win32Icon = null;
-				}
-				if (win32Resource != null) {
-					cparams.Win32Resource = win32Resource;
-					win32Resource = null;
-				}
-				if (mainclass != null) {
-					cparams.MainClass = mainclass;
-					mainclass = null;
-				}
-				if (!string.IsNullOrEmpty (codePage)) {
-					cparams.CodePage = int.Parse (codePage);
-					codePage = null;
-				}
-			}
+			base.Read (pset);
 
-			if (generateXmlDocumentation.HasValue && ParentConfiguration != null) {
-				if (generateXmlDocumentation.Value)
+			var prop = pset.GetProperty ("GenerateDocumentation");
+			if (prop != null && documentationFile != null) {
+				if (prop.GetValue<bool> ())
 					documentationFile = ParentConfiguration.CompiledOutputName.ChangeExtension (".xml");
 				else
 					documentationFile = null;
-				generateXmlDocumentation = null;
 			}
+
+			optimize = pset.GetValue ("Optimize", (bool?)null);
+			warninglevel = pset.GetValue<int?> ("WarningLevel", null);
 		}
-	
+
+		public override CompilationOptions CreateCompilationOptions ()
+		{
+			var project = (CSharpProject) ParentProject;
+			return new CSharpCompilationOptions (
+				OutputKind.ConsoleApplication,
+				false,
+				null,
+				project.MainClass,
+				"Script",
+				null,
+				OptimizationLevel.Debug,
+				GenerateOverflowChecks,
+				UnsafeCode,
+				null,
+				ParentConfiguration.SignAssembly ? ParentConfiguration.AssemblyKeyFile : null,
+				ImmutableArray<byte>.Empty,
+				null,
+				Microsoft.CodeAnalysis.Platform.AnyCpu,
+				ReportDiagnostic.Default,
+				WarningLevel,
+				null,
+				false,
+				assemblyIdentityComparer: DesktopAssemblyIdentityComparer.Default,
+				strongNameProvider: new DesktopStrongNameProvider ()
+			);
+		}
+
+		public override Microsoft.CodeAnalysis.ParseOptions CreateParseOptions (DotNetProjectConfiguration configuration)
+		{
+			var symbols = GetDefineSymbols ();
+			if (configuration != null)
+				symbols = symbols.Concat (configuration.GetDefineSymbols ()).Distinct ();
+			return new Microsoft.CodeAnalysis.CSharp.CSharpParseOptions (
+				GetRoslynLanguageVersion (langVersion),
+				Microsoft.CodeAnalysis.DocumentationMode.Parse,
+				Microsoft.CodeAnalysis.SourceCodeKind.Regular,
+				ImmutableArray<string>.Empty.AddRange (symbols)
+			);
+		}
+
 
 		public LangVersion LangVersion {
 			get {
@@ -166,7 +179,6 @@ namespace MonoDevelop.CSharp.Project
 
 #region Code Generation
 
-		[Obsolete]
 		public override void AddDefineSymbol (string symbol)
 		{
 			var symbols = new List<string> (GetDefineSymbols ());
@@ -176,10 +188,9 @@ namespace MonoDevelop.CSharp.Project
 
 		public override IEnumerable<string> GetDefineSymbols ()
 		{
-			return definesymbols.Split (';', ',', ' ', '\t').Where (s => !string.IsNullOrWhiteSpace (s));
+			return definesymbols.Split (';', ',', ' ', '\t').Where (s => SyntaxFacts.IsValidIdentifier (s) && !string.IsNullOrWhiteSpace (s));
 		}
 
-		[Obsolete]
 		public override void RemoveDefineSymbol (string symbol)
 		{
 			var symbols = new List<string> (GetDefineSymbols ());
@@ -202,10 +213,11 @@ namespace MonoDevelop.CSharp.Project
 		
 		public bool Optimize {
 			get {
-				return optimize;
+				return optimize ?? false;
 			}
 			set {
-				optimize = value;
+				if (value != Optimize)
+					optimize = value;
 			}
 		}
 		
@@ -245,24 +257,20 @@ namespace MonoDevelop.CSharp.Project
 			}
 		}
 
-		public override string DebugType {
-			get {
-				return debugType;
-			}
-			set {
-				debugType = value;
-			}
-		}
-
 #endregion
 
 #region Errors and Warnings 
 		public int WarningLevel {
 			get {
-				return warninglevel;
+				return warninglevel ?? 4;
 			}
 			set {
-				warninglevel = value;
+				if (warninglevel.HasValue) {
+					warninglevel = value;
+				} else {
+					if (value != 4)
+						warninglevel = value; 
+				}
 			}
 		}
 		
@@ -317,6 +325,19 @@ namespace MonoDevelop.CSharp.Project
 			}
 		}
 
+		Microsoft.CodeAnalysis.CSharp.LanguageVersion GetRoslynLanguageVersion (string value)
+		{
+			switch (value) {
+			case "ISO-1": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp1;
+			case "ISO-2": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp2;
+			case "3": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp3;
+			case "4": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp4;
+			case "5": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp5;
+			case "6": return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp6;
+			default: return Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp6;
+			}
+		}
+
 		internal static string TryLangVersionToString (LangVersion value)
 		{
 			switch (value) {
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs
new file mode 100644
index 0000000000..8f87cc1e5a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectExtension.cs
@@ -0,0 +1,187 @@
+//
+// CSharpProjectExtension.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Projects;
+using MonoDevelop.Projects.MSBuild;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Serialization;
+using MonoDevelop.Projects.Extensions;
+using System.Collections.Generic;
+using MonoDevelop.Core.Instrumentation;
+
+namespace MonoDevelop.CSharp.Project
+{
+	class CSharpProject: DotNetProject, ICSharpProject
+	{
+		[ItemProperty ("StartupObject", DefaultValue = "")]
+		string mainclass = string.Empty;
+
+		[ProjectPathItemProperty ("ApplicationIcon", DefaultValue = "")]
+		string win32Icon = String.Empty;
+
+		[ProjectPathItemProperty ("Win32Resource", DefaultValue = "")]
+		string win32Resource = String.Empty;
+
+		[ItemProperty ("CodePage", DefaultValue = 0)]
+		int codePage;
+
+		// Keep the platforms combo of CodeGenerationPanelWidget in sync with this list
+		public static IList<string> SupportedPlatforms = new string[] { "anycpu", "x86", "x64", "itanium" };
+
+		static CSharpProject ()
+		{
+			ProjectSearchCategory.Init ();
+		}
+
+		public CSharpProject ()
+		{
+			Initialize (this);
+		}
+
+		protected override void OnInitialize ()
+		{
+			base.OnInitialize ();
+			SupportsRoslyn = true;
+			StockIcon = "md-csharp-project";
+		}
+
+		protected override void OnGetDefaultImports (List<string> imports)
+		{
+			base.OnGetDefaultImports (imports);
+			imports.Add ("$(MSBuildBinPath)\\Microsoft.CSharp.targets");
+		}
+
+		public string MainClass {
+			get {
+				return mainclass;
+			}
+			set {
+				mainclass = value ?? string.Empty;
+			}
+		}
+
+		public int CodePage {
+			get {
+				return codePage;
+			}
+			set {
+				codePage = value;
+			}
+		}
+
+		public string Win32Icon {
+			get {
+				return win32Icon;
+			}
+			set {
+				win32Icon = value ?? string.Empty;
+			}
+		}
+
+		public string Win32Resource {
+			get {
+				return win32Resource;
+			}
+			set {
+				win32Resource = value ?? string.Empty;
+			}
+		}
+
+		protected override void OnReadConfiguration (ProgressMonitor monitor, ProjectConfiguration config, IPropertySet pset)
+		{
+			base.OnReadConfiguration (monitor, config, pset);
+
+			// Backwards compatibility. Move parameters to the project parameters object
+
+			var prop = pset.GetProperty ("ApplicationIcon");
+			if (prop != null)
+				win32Icon = prop.GetPathValue ();
+
+			prop = pset.GetProperty ("Win32Resource");
+			if (prop != null)
+				win32Resource = prop.GetPathValue ();
+
+			prop = pset.GetProperty ("StartupObject");
+			if (prop != null)
+				mainclass = prop.Value;
+
+			prop = pset.GetProperty ("CodePage");
+			if (prop != null)
+				codePage = int.Parse (prop.Value);
+		}
+
+		protected override BuildResult OnCompileSources (ProjectItemCollection items, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, ProgressMonitor monitor)
+		{
+			return CSharpBindingCompilerManager.Compile (items, configuration, configSelector, monitor);
+		}
+
+		protected override DotNetCompilerParameters OnCreateCompilationParameters (DotNetProjectConfiguration config, ConfigurationKind kind)
+		{
+			var pars = new CSharpCompilerParameters ();
+			if (SupportedPlatforms.Contains (config.Platform))
+				pars.PlatformTarget = config.Platform;
+			
+			if (kind == ConfigurationKind.Debug)
+				pars.AddDefineSymbol ("DEBUG");
+			else if (kind == ConfigurationKind.Release)
+				pars.Optimize = true;
+			return pars;
+		}
+
+		protected override ClrVersion[] OnGetSupportedClrVersions ()
+		{
+			return new ClrVersion[] { 
+				ClrVersion.Net_1_1, 
+				ClrVersion.Net_2_0, 
+				ClrVersion.Clr_2_1,
+				ClrVersion.Net_4_0,
+				ClrVersion.Net_4_5
+			};
+		}
+
+		protected override string OnGetDefaultResourceId (ProjectFile projectFile)
+		{
+			return CSharpResourceIdBuilder.GetDefaultResourceId (projectFile) ?? base.OnGetDefaultResourceId (projectFile);
+		}
+	}
+
+	public interface ICSharpProject
+	{
+		string MainClass { get; set; }
+
+		int CodePage { get; set; }
+
+		string Win32Icon { get; set; }
+
+		string Win32Resource { get; set; }
+	}
+
+	internal static class Counters
+	{
+		public static Counter ResolveTime = InstrumentationService.CreateCounter ("Resolve Time", "Timing");
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectParameters.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectParameters.cs
deleted file mode 100644
index 7e010c0de6..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpProjectParameters.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// 
-// ProjectParameters.cs
-//  
-// Author:
-//       Lluis Sanchez Gual <lluis@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.CSharp.Project
-{
-	public class CSharpProjectParameters: ProjectParameters
-	{
-		[ItemProperty ("StartupObject", DefaultValue = "")]
-		string mainclass = string.Empty;
-		
-		[ProjectPathItemProperty ("ApplicationIcon", DefaultValue = "")]
-		string win32Icon = String.Empty;
-
-		[ProjectPathItemProperty ("Win32Resource", DefaultValue = "")]
-		string win32Resource = String.Empty;
-	
-		[ItemProperty ("CodePage", DefaultValue = 0)]
-		int codePage;
-		
-		public string MainClass {
-			get {
-				return mainclass;
-			}
-			set {
-				mainclass = value ?? string.Empty;
-			}
-		}
-		
-		public int CodePage {
-			get {
-				return codePage;
-			}
-			set {
-				codePage = value;
-			}
-		}
-		
-		public string Win32Icon {
-			get {
-				return win32Icon;
-			}
-			set {
-				win32Icon = value ?? string.Empty;
-			}
-		}
-		
-		public string Win32Resource {
-			get {
-				return win32Resource;
-			}
-			set {
-				win32Resource = value ?? string.Empty;
-			}
-		}
-		
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs
index bd673dcfb9..83ecac0135 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs
@@ -34,16 +34,16 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 using MonoDevelop.Projects.Extensions;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.CSharp.Project
 {
-	class CSharpResourceIdBuilder : MSBuildResourceHandler
+	class CSharpResourceIdBuilder
 	{
-		public override string GetDefaultResourceId (ProjectFile pf)
+		public static string GetDefaultResourceId (ProjectFile pf)
 		{
 			if (String.IsNullOrEmpty (pf.DependsOn) || !File.Exists (pf.DependsOn) || Path.GetExtension (pf.DependsOn).ToLower () != ".cs")
-				return base.GetDefaultResourceId (pf);
+				return null;
 
 			string ns = null;
 			string classname = null;
@@ -80,7 +80,7 @@ namespace MonoDevelop.CSharp.Project
 				}
 
 				if (classname == null)
-					return base.GetDefaultResourceId (pf);
+					return null;
 
 				string culture, extn, only_filename;
 				if (MSBuildProjectService.TrySplitResourceName (pf.ProjectVirtualPath, out only_filename, out culture, out extn))
@@ -101,7 +101,7 @@ namespace MonoDevelop.CSharp.Project
 		 * skips strings "foo", 
 		 * skips anything after a # , eg. #region, #if 
 		 * Won't handle #if false etc kinda blocks*/
-		string GetNextToken (StreamReader sr)
+		static string GetNextToken (StreamReader sr)
 		{
 			StringBuilder sb = new StringBuilder ();
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CodeGenerationPanel.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CodeGenerationPanel.cs
index d107103c88..46f4287f6d 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CodeGenerationPanel.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CodeGenerationPanel.cs
@@ -27,8 +27,8 @@
 //
 

 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Projects;
-using Gtk;
 using MonoDevelop.Ide.Gui.Dialogs;
 

 namespace MonoDevelop.CSharp.Project
@@ -61,12 +61,12 @@ namespace MonoDevelop.CSharp.Project
 			warningLevelSpinButton.Value               = compilerParameters.WarningLevel;
 			ignoreWarningsEntry.Text                   = compilerParameters.NoWarnings;
 			
-			int i = CSharpLanguageBinding.SupportedPlatforms.IndexOf (compilerParameters.PlatformTarget);
+			int i = CSharpProject.SupportedPlatforms.IndexOf (compilerParameters.PlatformTarget);
 			comboPlatforms.Active = i != -1 ? i : 0;
 
-			if (!configuration.DebugMode || string.Equals ("none", compilerParameters.DebugType, StringComparison.OrdinalIgnoreCase)) {
+			if (!configuration.DebugSymbols || string.Equals ("none", configuration.DebugType, StringComparison.OrdinalIgnoreCase)) {
 				comboDebug.Active = DEBUG_NONE;
-			} else if (string.Equals ("pdbonly", compilerParameters.DebugType, StringComparison.OrdinalIgnoreCase)) {
+			} else if (string.Equals ("pdbonly", configuration.DebugType, StringComparison.OrdinalIgnoreCase)) {
 				comboDebug.Active = DEBUG_PDB_ONLY;
 			} else {
 				comboDebug.Active = DEBUG_FULL;
@@ -91,23 +91,23 @@ namespace MonoDevelop.CSharp.Project
 			compilerParameters.TreatWarningsAsErrors  = warningsAsErrorsCheckButton.Active;
 			compilerParameters.WarningLevel           = warningLevelSpinButton.ValueAsInt;
 			compilerParameters.NoWarnings             = ignoreWarningsEntry.Text;
-			compilerParameters.PlatformTarget         = CSharpLanguageBinding.SupportedPlatforms [comboPlatforms.Active];
+			compilerParameters.PlatformTarget         = CSharpProject.SupportedPlatforms [comboPlatforms.Active];
 
 			switch (comboDebug.Active) {
 			case DEBUG_FULL:
-				configuration.DebugMode = true;
-				if (!string.Equals (compilerParameters.DebugType, "full", StringComparison.OrdinalIgnoreCase)) {
-					compilerParameters.DebugType = "";
+				configuration.DebugSymbols = true;
+				if (!string.Equals (configuration.DebugType, "full", StringComparison.OrdinalIgnoreCase)) {
+					configuration.DebugType = "";
 				}
 				break;
 			case DEBUG_PDB_ONLY:
-				configuration.DebugMode = true;
-				compilerParameters.DebugType = "pdbonly";
+				configuration.DebugSymbols = true;
+				configuration.DebugType = "pdbonly";
 				break;
 			case DEBUG_NONE:
-				configuration.DebugMode = false;
-				if (!string.Equals (compilerParameters.DebugType, "none", StringComparison.OrdinalIgnoreCase)) {
-					compilerParameters.DebugType = "";
+				configuration.DebugSymbols = false;
+				if (!string.Equals (configuration.DebugType, "none", StringComparison.OrdinalIgnoreCase)) {
+					configuration.DebugType = "";
 				}
 				break;
 			}
@@ -118,7 +118,7 @@ namespace MonoDevelop.CSharp.Project
 	{

 		CodeGenerationPanelWidget widget;

 		

-		public override Widget CreatePanelWidget()

+		public override Control CreatePanelWidget()

 		{

 			return widget = new  CodeGenerationPanelWidget ();

 		}

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
index 213c7025e0..26ebd30cca 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
@@ -30,13 +30,14 @@
 using System;
 using Gtk;
 
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Text;

 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.CSharp.Project
 {
@@ -53,7 +54,7 @@ namespace MonoDevelop.CSharp.Project
 			this.project = project;
 			DotNetProjectConfiguration configuration = (DotNetProjectConfiguration) project.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
 			CSharpCompilerParameters compilerParameters = (CSharpCompilerParameters) configuration.CompilationParameters;
-			CSharpProjectParameters projectParameters = (CSharpProjectParameters) configuration.ProjectParameters;
+			var csproject = (CSharpProject)project;
 			
 			ListStore store = new ListStore (typeof (string));

 			store.AppendValues (GettextCatalog.GetString ("Executable"));

@@ -75,7 +76,7 @@ namespace MonoDevelop.CSharp.Project
 				classListStore = new ListStore (typeof(string));

 				mainClassEntry.Model = classListStore;

 				mainClassEntry.TextColumn = 0;

-				((Entry)mainClassEntry.Child).Text = projectParameters.MainClass ?? string.Empty;
+				((Entry)mainClassEntry.Child).Text = csproject.MainClass ?? string.Empty;
 			
 				UpdateTarget ();
 			}
@@ -85,16 +86,16 @@ namespace MonoDevelop.CSharp.Project
 			foreach (TextEncoding e in TextEncoding.SupportedEncodings) {
 				if (e.CodePage == -1)
 					continue;
-				if (e.CodePage == projectParameters.CodePage)
+				if (e.CodePage == csproject.CodePage)
 					foundEncoding = e.Id;
 				codepageEntry.AppendText (e.Id);
 			}
 			if (foundEncoding != null)
 				codepageEntry.Entry.Text = foundEncoding;
-			else if (projectParameters.CodePage != 0)
-				codepageEntry.Entry.Text = projectParameters.CodePage.ToString ();
+			else if (csproject.CodePage != 0)
+				codepageEntry.Entry.Text = csproject.CodePage.ToString ();
 			
-			iconEntry.Path = projectParameters.Win32Icon;
+			iconEntry.Path = csproject.Win32Icon;
 			iconEntry.DefaultPath = project.BaseDirectory;
 			allowUnsafeCodeCheckButton.Active = compilerParameters.UnsafeCode;
 			noStdLibCheckButton.Active = compilerParameters.NoStdLib;
@@ -172,15 +173,15 @@ namespace MonoDevelop.CSharp.Project
 			
 			project.CompileTarget = compileTarget;
 			
-			CSharpProjectParameters projectParameters = (CSharpProjectParameters) project.LanguageParameters; 
+			var csproject = (CSharpProject)project; 
 			
-			projectParameters.CodePage = codePage;
+			csproject.CodePage = codePage;
 
 			if (iconEntry.Sensitive)
-				projectParameters.Win32Icon = iconEntry.Path;
+				csproject.Win32Icon = iconEntry.Path;
 			
 			if (mainClassEntry.Sensitive)
-				projectParameters.MainClass = mainClassEntry.Entry.Text;
+				csproject.MainClass = mainClassEntry.Entry.Text;
 			
 			foreach (DotNetProjectConfiguration configuration in configs) {
 				CSharpCompilerParameters compilerParameters = (CSharpCompilerParameters) configuration.CompilationParameters; 
@@ -209,16 +210,14 @@ namespace MonoDevelop.CSharp.Project
 		void FillClasses ()

 		{

 			try {
-				var ctx = TypeSystemService.GetCompilation (project);
+				var ctx = TypeSystemService.GetCompilationAsync (project).Result;
 				if (ctx == null)
 					// Project not found in parser database
 					return;
-				foreach (var c in ctx.GetAllTypeDefinitions ()) {

-					if (c.Methods != null) {

-						foreach (var m in c.Methods) {

-							if (m.IsStatic && m.Name == "Main")

-								classListStore.AppendValues (c.FullName);

-						}

+				foreach (var c in ctx.Assembly.GlobalNamespace.GetTypeMembers ()) {

+					foreach (var m in c.GetMembers().OfType<IMethodSymbol> ()) {

+						if (m.IsStatic && m.Name == "Main")

+							classListStore.AppendValues (c.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat));

 					}

 				}

 				classListFilled = true;

@@ -232,7 +231,7 @@ namespace MonoDevelop.CSharp.Project
 	{
 		CompilerOptionsPanelWidget widget;

 		

-		public override Widget CreatePanelWidget ()

+		public override Control CreatePanelWidget ()

 		{

 			return (widget = new CompilerOptionsPanelWidget ((DotNetProject) ConfiguredProject));

 		}

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs
new file mode 100644
index 0000000000..51f262cd4b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/PortableCSharpProjectFlavor.cs
@@ -0,0 +1,47 @@
+//
+// PortableCSharpProjectFlavor.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Projects;
+using MonoDevelop.Core;
+using MonoDevelop.Projects.MSBuild;
+
+namespace MonoDevelop.CSharp.Project
+{
+	class PortableCSharpProjectFlavor: PortableDotNetProjectFlavor
+	{
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+			Project.UseMSBuildEngine = true;
+		}
+
+		protected override void OnGetDefaultImports (System.Collections.Generic.List<string> imports)
+		{
+			imports.Add ("$(MSBuildExtensionsPath32)\\Microsoft\\Portable\\$(TargetFrameworkVersion)\\Microsoft.Portable.CSharp.targets");
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/ConvertToEnumAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/ConvertToEnumAction.cs
deleted file mode 100644
index 30a5296645..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/ConvertToEnumAction.cs
+++ /dev/null
@@ -1,503 +0,0 @@
-//  
-// Author:
-//       Luís Reis <luiscubal@gmail.com>
-// 
-// Copyright (c) 2013 Luís Reis
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using ICSharpCode.NRefactory.PatternMatching;
-using MonoDevelop.CodeActions;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.Decompiler.ILAst;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	/// <summary>
-	/// Generates an enumeration from const fields
-	/// </summary>
-	class ConvertToEnumAction : MonoDevelop.CodeActions.CodeActionProvider
-	{
-		public override IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions(MonoDevelop.Ide.Gui.Document document, object refactoringContext, TextLocation loc, CancellationToken cancellationToken)
-		{
-			var context = refactoringContext as MDRefactoringContext;
-
-			if (context == null || context.IsInvalid)
-				yield break;
-
-			VariableInitializer currentVariable = context.GetNode<VariableInitializer>();
-			if (currentVariable == null) {
-				yield break;
-			}
-
-			FieldDeclaration currentField = currentVariable.Parent as FieldDeclaration;
-			if (currentField == null) {
-				yield break;
-			}
-
-			if (!currentField.Modifiers.HasFlag(Modifiers.Const)) {
-				yield break;
-			}
-
-			PrimitiveType baseType = TypeToIntegerPrimitive(context, currentField.ReturnType);
-			if (baseType == null) {
-				//Can't make enums of these types
-				yield break;
-			}
-
-			TypeDeclaration containerType = currentVariable.GetParent<TypeDeclaration>();
-
-			//Get all the fields/variables that the enum can possibly cover
-			//Don't check the name just yet. That'll come later.
-
-			var constFields = containerType.Members.OfType<FieldDeclaration>()
-				.Where(field => field.GetParent<TypeDeclaration>() == containerType && field.HasModifier(Modifiers.Const)).ToList();
-
-			var constVariables = constFields.SelectMany(field => field.Variables).ToList();
-
-			//Now, it's time to check the name of the selected variable
-			//We'll use this to search for prefixes later
-
-			var names = constVariables.Select(variable => variable.Name).ToList();
-			string currentName = currentVariable.Name;
-
-			//Now, find the common name prefixes
-			//If the variable is called 'A_B_C_D', then 'A', 'A_B' and 'A_B_C' are
-			//the potentially available prefixes.
-			//Note that the common prefixes are the ones that more than one variable
-			//has.
-			//Each prefix has an associated action.
-
-			foreach (var prefix in GetCommonPrefixes (currentName, names)) {
-				string title = string.Format(GettextCatalog.GetString("Create enum '{0}'"), prefix);
-
-				yield return new DefaultCodeAction(title, (ctx, script) => {
-					PrepareToRunAction (prefix, baseType, containerType, constVariables, cancellationToken, ctx, script);
-				});
-			}
-		}
-
-		void PrepareToRunAction (string prefix, PrimitiveType baseType, TypeDeclaration containerType, List<VariableInitializer> variables, CancellationToken cancellationToken, RefactoringContext context, Script script)
-		{
-			List<string> names = variables.Select(variable => variable.Name).ToList();
-			Dictionary<string, string> newNames = names.ToDictionary(originalName => originalName, originalName => {
-				if (!originalName.StartsWith(prefix)) {
-					return originalName;
-				}
-				int startName = prefix.Length;
-				while (startName < originalName.Length - 1 && originalName[startName] == '_') {
-					++startName;
-				}
-				return originalName.Substring(startName);
-			});
-
-			string enumName;
-			using (var dialog = new ConvertToEnumDialog (prefix, variables, variables.Where(variable => variable.Name.StartsWith(prefix, StringComparison.InvariantCulture)
-			                                                                                               && VariableHasSpecifiedIntegerType(context, variable, baseType)).ToList(), newNames))
-			{
-				if (dialog.Run (/*MonoDevelop.Ide.IdeApp.Workbench.RootWindow*/) != Xwt.Command.Ok) {
-					return;
-				}
-				enumName = dialog.EnumName;
-				variables = dialog.SelectedVariables;
-				newNames = dialog.NewNames;
-			}
-
-			RunAction (context, baseType, enumName, newNames, containerType, variables, script);
-			
-		}
-
-		void RunAction(RefactoringContext context, AstType baseType, string enumName, Dictionary<string, string> newNames, TypeDeclaration containerTypeDeclaration, List<VariableInitializer> variables, Script script)
-		{
-			var names = variables.Select (variable => variable.Name).ToList ();
-			var containerType = (context.Resolve(containerTypeDeclaration) as TypeResolveResult).Type;
-
-			var fields = containerTypeDeclaration.Members.OfType<FieldDeclaration>().Where(field => field.Modifiers.HasFlag(Modifiers.Const)).ToList();
-			List<VariableInitializer> variableUnitsToRemove = new List<VariableInitializer>(variables);
-			List<FieldDeclaration> fieldsToRemove = new List<FieldDeclaration>();
-
-			foreach (var field in fields) {
-				if (field.Variables.All(variableUnitsToRemove.Contains)) {
-					fieldsToRemove.Add(field);
-
-					variableUnitsToRemove.RemoveAll(field.Variables.Contains);
-				}
-			}
-
-			var generatedEnum = CreateEnumDeclaration(baseType, enumName, variables, names, newNames);
-
-			AstNode root = GetRootNodeOf(containerTypeDeclaration);
-			var newRoot = root.Clone();
-
-			FixIdentifiers(context, enumName, variables, containerType, baseType, names, newNames, root, newRoot);
-			foreach (var member in root.Descendants.OfType<MemberReferenceExpression>().Where (member => names.Contains (member.MemberName))) {
-				if (variables.Any(variable => variable.Descendants.Contains(member))) {
-					//Already handled
-					continue;
-				}
-
-				var resolvedIdentifier = context.Resolve(member) as MemberResolveResult;
-				if (resolvedIdentifier == null) {
-					continue;
-				}
-
-				if (resolvedIdentifier.Type.Equals(containerType)) {
-					continue;
-				}
-
-				var equivalentMember = GetEquivalentNodeFor(root, newRoot, member);
-				MemberReferenceExpression memberToReplace = (MemberReferenceExpression)equivalentMember;
-
-				var replacement = CreateReplacementMemberReference(enumName, baseType, newNames, memberToReplace);
-				memberToReplace.ReplaceWith(replacement);
-			}
-
-			//Fix the file
-			InsertAfterEquivalent(root, newRoot, containerTypeDeclaration.LBraceToken, generatedEnum, Roles.TypeMemberRole);
-
-			foreach (var variableToRemove in variableUnitsToRemove) {
-				GetEquivalentNodeFor(root, newRoot, variableToRemove).Remove();
-			}
-			foreach (var fieldToRemove in fieldsToRemove) {
-				GetEquivalentNodeFor(root, newRoot, fieldToRemove).Remove();
-			}
-
-			script.Replace(root, newRoot);
-
-			ReplaceVariableReferences(context, root, baseType, enumName, script, newNames, variables);
-		}
-
-		static void ReplaceVariableReferences(RefactoringContext context, AstNode root, AstType baseType, string enumName, Script script, Dictionary<string, string> newNames, IEnumerable<VariableInitializer> variables)
-		{
-			var resolveResults = variables.Select(variable => (MemberResolveResult)context.Resolve(variable));
-			var resolvedFields = resolveResults.Select(resolveResult => resolveResult.Member);
-			script.DoGlobalOperationOn(resolvedFields, (newCtx, newScript, foundNodes) =>  {
-				foreach (var foundNode in foundNodes) {
-					TypeDeclaration newContainerType = foundNode.GetParent<TypeDeclaration>();
-					if (root.Descendants.OfType<TypeDeclaration>().Select(type => ((TypeResolveResult)context.Resolve(type)).Type.FullName).ToList().Contains(((TypeResolveResult)newCtx.Resolve(newContainerType)).Type.FullName)) {
-						//This file has already been fixed
-						return;
-					}
-					var identifierExpr = foundNode as IdentifierExpression;
-					if (identifierExpr != null) {
-						newScript.Replace(identifierExpr, CreateIdentifierReplacement(enumName, baseType, newNames, identifierExpr));
-						continue;
-					}
-					var memberRef = foundNode as MemberReferenceExpression;
-					if (memberRef != null) {
-						var replacement = CreateReplacementMemberReference(enumName, baseType, newNames, memberRef);
-						newScript.Replace(memberRef, replacement);
-					}
-				}
-			});
-		}
-
-		TypeDeclaration CreateEnumDeclaration(AstType baseType, string enumName, List<VariableInitializer> variables, List<string> names, Dictionary<string, string> newNames)
-		{
-			TypeDeclaration generatedEnum = new TypeDeclaration();
-			generatedEnum.ClassType = ClassType.Enum;
-			generatedEnum.BaseTypes.Add(baseType.Clone());
-			generatedEnum.Name = enumName;
-			generatedEnum.Modifiers = GetCombinedModifier((Modifiers)variables.Select(variable => ((FieldDeclaration)variable.Parent).Modifiers).Aggregate(0, (prev, newModifier) => prev | (int)newModifier));
-			foreach (var variable in variables) {
-				var generatedMember = new EnumMemberDeclaration();
-				generatedMember.Name = newNames[variable.Name];
-				var value = variable.Initializer.Clone();
-				foreach (var identifier in value.DescendantsAndSelf.OfType<IdentifierExpression>().Where(identifier => names.Contains(identifier.Identifier))) {
-					var newIdentifier = new IdentifierExpression(newNames[identifier.Identifier]);
-					if (identifier == value) {
-						value = newIdentifier;
-						break;
-					}
-					identifier.ReplaceWith(newIdentifier);
-				}
-				generatedMember.Initializer = value;
-				generatedEnum.Members.Add(generatedMember);
-			}
-			return generatedEnum;
-		}
-
-		/// <summary>
-		/// Determines whether the initialized variable has the specified primitive integer type
-		/// </summary>
-		/// <returns><c>true</c> if the initialized variable has the specified type; otherwise, <c>false</c>.</returns>
-		/// <param name="context">The context to use.</param>
-		/// <param name="variable">The variable initializer to check.</param>
-		/// <param name="type">The type to compare with.</param>
-		bool VariableHasSpecifiedIntegerType(RefactoringContext context, VariableInitializer variable, AstType type)
-		{
-			return TypeToIntegerPrimitive(context, variable.GetParent<FieldDeclaration>().ReturnType).Match(type).Success;
-		}
-
-		static Dictionary<string, PrimitiveType> primitiveTypes = new Dictionary<string, PrimitiveType>();
-
-		static ConvertToEnumAction()
-		{
-			primitiveTypes.Add(typeof(byte).FullName, new PrimitiveType("byte"));
-			primitiveTypes.Add(typeof(sbyte).FullName, new PrimitiveType("sbyte"));
-
-			primitiveTypes.Add(typeof(short).FullName, new PrimitiveType("short"));
-			primitiveTypes.Add(typeof(int).FullName, new PrimitiveType("int"));
-			primitiveTypes.Add(typeof(long).FullName, new PrimitiveType("long"));
-
-			primitiveTypes.Add(typeof(ushort).FullName, new PrimitiveType("ushort"));
-			primitiveTypes.Add(typeof(uint).FullName, new PrimitiveType("uint"));
-			primitiveTypes.Add(typeof(ulong).FullName, new PrimitiveType("ulong"));
-		}
-
-		/// <summary>
-		/// Gets a PrimitiveType instance from an AstType.
-		/// Only returns integer types (and never the char type)
-		/// </summary>
-		/// <returns>The integer primitive.</returns>
-		/// <param name="context">The context to use.</param>
-		/// <param name="type">The AstType to get the primitive from.</param>
-		PrimitiveType TypeToIntegerPrimitive(RefactoringContext context, AstType type)
-		{
-			var resolvedType = context.ResolveType(type) as DefaultResolvedTypeDefinition;
-
-			PrimitiveType primitiveType;
-			if (!primitiveTypes.TryGetValue(resolvedType.FullName, out primitiveType)) {
-				return null;
-			}
-
-			return primitiveType;
-		}
-
-		static Expression CreateReplacementMemberReference(string enumName, AstType baseType, Dictionary<string, string> newNames, MemberReferenceExpression memberToReplace)
-		{
-			return new ParenthesizedExpression(new CastExpression(baseType.Clone(), new MemberReferenceExpression(new MemberReferenceExpression(memberToReplace.Target.Clone(), enumName), newNames [memberToReplace.MemberName])));
-		}
-
-		void FixIdentifiers(RefactoringContext context, string enumName, List<VariableInitializer> variables, IType containerType, AstType baseType, List<string> names, Dictionary<string, string> newNames, AstNode root, AstNode newRoot)
-		{
-			foreach (var identifier in root.Descendants.OfType<IdentifierExpression> ().Where (identifier => names.Contains (identifier.Identifier))) {
-				if (variables.Any(variable => variable.Descendants.Contains(identifier))) {
-					//Already handled
-					continue;
-				}
-				var resolvedIdentifier = context.Resolve(identifier) as MemberResolveResult;
-				if (resolvedIdentifier == null) {
-					continue;
-				}
-				if (resolvedIdentifier.Type.Equals(containerType)) {
-					continue;
-				}
-				var replacement = CreateIdentifierReplacement(enumName, baseType, newNames, identifier);
-				GetEquivalentNodeFor(root, newRoot, identifier).ReplaceWith(replacement);
-			}
-		}
-
-		static ParenthesizedExpression CreateIdentifierReplacement(string enumName, AstType baseType, Dictionary<string, string> newNames, IdentifierExpression identifier)
-		{
-			var replacement = new ParenthesizedExpression(new CastExpression(baseType.Clone(), new MemberReferenceExpression(new IdentifierExpression(enumName), newNames [identifier.Identifier])));
-			return replacement;
-		}
-
-		/// <summary>
-		/// Finds the corresponding node in another ("new") AST.
-		/// Assumes entities have not been renamed and no statements have been removed.
-		/// </summary>
-		/// <returns>The equivalent node in the new AST.</returns>
-		/// <param name="root">The root of the first ("old") AST.</param>
-		/// <param name="newRoot">The root of the new AST.</param>
-		/// <param name="nodeToFind">Node (from the old AST) to find in the new one.</param>
-		AstNode GetEquivalentNodeFor(AstNode root, AstNode newRoot, AstNode nodeToFind)
-		{
-			if (nodeToFind == null) {
-				throw new ArgumentNullException("nodeToFind");
-			}
-
-			if (nodeToFind.Parent != root) {
-				AstNode foundRoot = GetEquivalentNodeFor(root, newRoot, nodeToFind.Parent);
-				if (foundRoot == null) {
-					//If the equivalent of the parent does not exist in the new AST,
-					//then neither does this node.
-					return null;
-				}
-				newRoot = foundRoot;
-				root = nodeToFind.Parent;
-			}
-
-			//At this point, the roots are the parents of the nodes to check
-			//root is the parent of the nodeToFind, and newRoot is the parent of the node to return
-
-			var block = root as BlockStatement;
-			if (block != null && nodeToFind.Role == BlockStatement.StatementRole) {
-				//This could be a problem if statements were removed in the new AST,
-				//but fortunately that's not the problem we're trying to solve.
-				return ((BlockStatement)newRoot).Statements.ElementAt(block.TakeWhile(statement => statement != nodeToFind).Count());
-			}
-
-			//First, we'll narrow down the search - the equivalent node *always* has the same type and role as nodeToFind
-			//The Role check will help e.g. in binary expressions (where there is a 'Left' and a 'Right' role)
-			var candidates = newRoot.Children.Where(child => child.GetType() == nodeToFind.GetType() && child.Role == nodeToFind.Role);
-			var entity = nodeToFind as EntityDeclaration;
-			if (entity != null) {
-				var field = nodeToFind as FieldDeclaration;
-				if (field != null) {
-					//Fields have to be treated separately because fields have no names
-					candidates = candidates.Where(candidate => IsEquivalentField((FieldDeclaration) candidate, field));
-				}
-				else {
-					//Some entities can be distinguished by name.
-					candidates = candidates.Where(candidate => ((EntityDeclaration)candidate).Name == entity.Name);
-
-					var method = nodeToFind as MethodDeclaration;
-					if (method != null) {
-						//Methods, however, can be overloaded - so their names aren't enough.
-						candidates = candidates.Where(candidate => CheckIfMethodsHaveSameParameters((MethodDeclaration) candidate, method));
-					}
-				}
-			}
-
-			var ns = nodeToFind as NamespaceDeclaration;
-			if (ns != null) {
-				candidates = candidates.Where(candidate => ((NamespaceDeclaration)candidate).Name == ns.Name).ToList();
-				if (candidates.Count() > 1) {
-					throw new NotImplementedException("Two or more namespace declarations with the same name are siblings. This case is not currently supported by this action.");
-				}
-			}
-
-			var initializer = nodeToFind as VariableInitializer;
-			if (initializer != null) {
-				candidates = candidates.Where(candidate => ((VariableInitializer)candidate).Name == initializer.Name);
-			}
-
-			var equivalentNode = candidates.SingleOrDefault();
-			return equivalentNode;
-		}
-
-		bool IsEquivalentField(FieldDeclaration field1, FieldDeclaration field2) {
-			return field1.Variables.Any(variable1 => {
-				return field2.Variables.Any(variable2 => variable1.Name == variable2.Name);
-			});
-		}
-
-		bool CheckIfMethodsHaveSameParameters(MethodDeclaration methodDeclaration, MethodDeclaration comparedMethod)
-		{
-			if (methodDeclaration.Parameters.Count != comparedMethod.Parameters.Count) {
-				return false;
-			}
-
-			ParameterDeclaration param1 = methodDeclaration.Parameters.FirstOrDefault();
-			ParameterDeclaration param2 = comparedMethod.Parameters.FirstOrDefault();
-
-			while (param1 != null) {
-				//If the names or initializers are different, this will still match.
-				//But if the type or order changes, this will complain
-				if (!param1.Type.Match(param2.Type).Success) {
-					return false;
-				}
-
-				param1 = (ParameterDeclaration) param1.GetNextSibling(node => node is ParameterDeclaration);
-				param2 = (ParameterDeclaration) param2.GetNextSibling(node => node is ParameterDeclaration);
-			}
-
-			return true;
-		}
-
-		void InsertAfterEquivalent<T>(AstNode root, AstNode newRoot, AstNode prevNode, T newNode, Role<T> role)
-			where T : AstNode
-		{
-			AstNode equivalentPrevNode = GetEquivalentNodeFor(root, newRoot, prevNode);
-			equivalentPrevNode.Parent.InsertChildAfter<T>(equivalentPrevNode, newNode, role);
-		}
-
-		/// <summary>
-		/// Gets the least permissive access modifier that still allows access to
-		/// fields or methods with the specified modifiers.
-		/// This will ignore all modifiers unrelated to access - such as const and readonly
-		/// </summary>
-		/// <returns>A modifier that is at least as permissive as all provided modifiers.</returns>
-		/// <param name="modifiers">The modifiers to use.</param>
-		Modifiers GetCombinedModifier(Modifiers modifiers)
-		{
-			if (modifiers.HasFlag(Modifiers.Public))
-				return Modifiers.Public;
-
-			Modifiers combinedModifier = 0;
-			if (modifiers.HasFlag(Modifiers.Protected)) {
-				combinedModifier |= Modifiers.Protected;
-			}
-			if (modifiers.HasFlag(Modifiers.Internal)) {
-				combinedModifier |= Modifiers.Internal;
-			}
-
-			//No modifier if the fields are all private.
-			return combinedModifier;
-		}
-
-		/// <summary>
-		/// Gets all prefixes that more than one name have.
-		/// </summary>
-		/// <returns>The common prefixes.</returns>
-		/// <param name="currentName">The name to use.</param>
-		/// <param name="names">The names to check.</param>
-		IEnumerable<string> GetCommonPrefixes(string currentName, IEnumerable<string> names)
-		{
-			//Find the indexes that 'split' words in the variable name
-			var boundariesForCurrentWord = GetWordsBoundaries(currentName);
-
-			//Get the candidate prefixes
-			List<string> proposedPrefixes = boundariesForCurrentWord.Select(boundary => currentName.Substring(0, boundary)).ToList();
-
-			//Return only the prefixes that more than one variable has.
-			return proposedPrefixes.Where(prefix => names.Count(name => name.StartsWith(prefix, StringComparison.InvariantCulture)) > 1);
-		}
-
-		List<int> GetWordsBoundaries(string name)
-		{
-			List<int> foundBoundaries = new List<int>();
-			for (int i = 1; i < name.Length - 1; ++i) {
-				char chr = name [i];
-				if (chr == '_') {
-					foundBoundaries.Add(i);
-					continue;
-				}
-
-				if (char.IsUpper(chr) && char.IsLower(name [i - 1])) {
-					foundBoundaries.Add(i);
-					continue;
-				}
-			}
-
-			return foundBoundaries;
-		}
-
-		AstNode GetRootNodeOf(AstNode node)
-		{
-			while (node.Parent != null) {
-				node = node.Parent;
-			}
-
-			return node;
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs
deleted file mode 100644
index bf1523421d..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// 
-// MoveTypeToFile.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.PatternMatching;
-using MonoDevelop.Core;
-using System.Collections.Generic;
-using Mono.TextEditor;
-using System.Linq;
-using MonoDevelop.Refactoring;
-using System.IO;
-using System.Text;
-using MonoDevelop.Ide.StandardHeader;
-using MonoDevelop.Core.ProgressMonitoring;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class MoveTypeToFile : MonoDevelop.CodeActions.CodeActionProvider
-	{
-		public override IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions (MonoDevelop.Ide.Gui.Document document, object refactoringContext, TextLocation loc, CancellationToken cancellationToken)
-		{
-			var context = refactoringContext as MDRefactoringContext;
-			if (context == null)
-				return Enumerable.Empty<MonoDevelop.CodeActions.CodeAction> ();
-			return GetActions (context);
-		}
-		protected IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions (MDRefactoringContext context)
-		{
-			if (context.IsInvalid)
-				yield break;
-			var type = GetTypeDeclaration (context);
-			if (type == null)
-				yield break;
-			if (Path.GetFileNameWithoutExtension (context.TextEditor.FileName) == type.Name)
-				yield break;
-			string title;
-			if (IsSingleType (context)) {
-				title = String.Format (GettextCatalog.GetString ("Rename file to '{0}'"), Path.GetFileName (GetCorrectFileName (context, type)));
-			} else {
-				title = String.Format (GettextCatalog.GetString ("Move type to file '{0}'"), Path.GetFileName (GetCorrectFileName (context, type)));
-			}
-			yield return new MonoDevelop.CodeActions.DefaultCodeAction (title, (c, s) => {
-				var ctx = (MDRefactoringContext) c;
-				var script = (Script) s;
-				string correctFileName = GetCorrectFileName (ctx, type);
-				if (IsSingleType (ctx)) {
-					FileService.RenameFile (ctx.TextEditor.FileName, correctFileName);
-					if (ctx.FileContainerProject != null)
-						ctx.FileContainerProject.Save (new NullProgressMonitor ());
-					return;
-				}
-				
-				CreateNewFile (ctx, type, correctFileName);
-				script.Remove (type);
-			});
-		}
-
-		static void CreateNewFile (MDRefactoringContext context, TypeDeclaration type, string correctFileName)
-		{
-			var content = context.TextEditor.Text;
-			
-			var types = new List<EntityDeclaration> (context.Unit.GetTypes ().Where (t => t.StartLocation != type.StartLocation));
-			types.Sort ((x, y) => y.StartLocation.CompareTo (x.StartLocation));
-
-			foreach (var removeType in types) {
-				var start = context.GetOffset (removeType.StartLocation);
-				var end = context.GetOffset (removeType.EndLocation);
-				content = content.Remove (start, end - start);
-			}
-			
-			if (context.FileContainerProject != null) {
-				string header = StandardHeaderService.GetHeader (context.FileContainerProject, correctFileName, true);
-				if (!string.IsNullOrEmpty (header))
-					content = header + context.TextEditor.EolMarker + StripHeader (content);
-			}
-			content = StripDoubleBlankLines (content);
-			
-			File.WriteAllText (correctFileName, content);
-			context.FileContainerProject.AddFile (correctFileName);
-			MonoDevelop.Ide.IdeApp.ProjectOperations.Save (context.FileContainerProject);
-		}
-
-		static bool IsBlankLine (TextDocument doc, int i)
-		{
-			var line = doc.GetLine (i);
-			return line.Length == line.GetIndentation (doc).Length;
-		}
-
-		static string StripDoubleBlankLines (string content)
-		{
-			var doc = new Mono.TextEditor.TextDocument (content);
-			for (int i = 1; i + 1 <= doc.LineCount; i++) {
-				if (IsBlankLine (doc, i) && IsBlankLine (doc, i + 1)) {
-					doc.Remove (doc.GetLine (i).SegmentIncludingDelimiter);
-					i--;
-					continue;
-				}
-			}
-			return doc.Text;
-		}
-
-		static string StripHeader (string content)
-		{
-			var doc = new Mono.TextEditor.TextDocument (content);
-			while (true) {
-				string lineText = doc.GetLineText (1);
-				if (lineText == null)
-					break;
-				if (lineText.StartsWith ("//")) {
-					doc.Remove (doc.GetLine (1).SegmentIncludingDelimiter);
-					continue;
-				}
-				break;
-			}
-			return doc.Text;
-		}
-		
-		bool IsSingleType (MDRefactoringContext context)
-		{
-			return context.Unit.GetTypes ().Count () == 1;
-		}
-		
-		TypeDeclaration GetTypeDeclaration (MDRefactoringContext context)
-		{
-			var result = context.GetNode<TypeDeclaration> ();
-			if (result == null || result.Parent is TypeDeclaration)
-				return null;
-			if (result != null && result.NameToken.Contains (context.Location))
-				return result;
-			return null;
-		}
-		
-		internal static string GetCorrectFileName (MDRefactoringContext context, EntityDeclaration type)
-		{
-			if (type == null)
-				return context.TextEditor.FileName;
-			return Path.Combine (Path.GetDirectoryName (context.TextEditor.FileName), type.Name + Path.GetExtension (context.TextEditor.FileName));
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/ContextActionExtensions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/ContextActionExtensions.cs
deleted file mode 100644
index a08ea332e3..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/ContextActionExtensions.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// 
-// ContextActionExtensions.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	static class ContextActionExtensions
-	{
-		public static int CalcIndentLevel (this MonoDevelop.Ide.Gui.Document doc, string indent)
-		{
-			int col = GetColumn (indent, 0, doc.Editor.Options.TabSize);
-			return System.Math.Max (0, col / doc.Editor.Options.TabSize);
-		}
-		
-		public static int GetColumn (string wrapper, int i, int tabSize)
-		{
-			int j = i;
-			int col = 0;
-			for (; j < wrapper.Length && (wrapper[j] == ' ' || wrapper[j] == '\t'); j++) {
-				if (wrapper[j] == ' ') {
-					col++;
-				} else {
-					col = GetNextTabstop (col, tabSize);
-				}
-			}
-			return col;
-		}
-		
-		static int GetNextTabstop (int currentColumn, int tabSize)
-		{
-			int result = currentColumn + tabSize;
-			return (result / tabSize) * tabSize;
-		}
-		
-		public static void FormatText (this AstNode node, MonoDevelop.Ide.Gui.Document doc)
-		{
-			doc.UpdateParseDocument ();
-			MonoDevelop.CSharp.Formatting.OnTheFlyFormatter.Format (doc, node.StartLocation);
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
deleted file mode 100644
index c8c7d60632..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-// 
-// MDRefactoringContext.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using MonoDevelop.Ide.Gui;
-using System.Diagnostics;
-using MonoDevelop.CSharp.Refactoring.CodeIssues;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.CSharp.Formatting;
-using System.Threading.Tasks;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	public class MDRefactoringContext : RefactoringContext, IRefactoringContext
-	{
-		MonoDevelop.Projects.Project fileContainerProject;
-
-		public TextEditorData TextEditor {
-			get;
-			private set;
-		}
-
-		public DotNetProject Project {
-			get;
-			private set;
-		}
-
-		public MonoDevelop.Projects.Project FileContainerProject {
-			get {
-				if (fileContainerProject == null)
-					fileContainerProject = FindProjectContainingFile () ?? Project;
-				return fileContainerProject;
-			}
-		}
-
-		MonoDevelop.Projects.Project FindProjectContainingFile ()
-		{
-			var file = TextEditor.FileName;
-			if (string.IsNullOrEmpty (file) || Project == null)
-				return null;
-
-			var pf = Project.GetProjectFile (file);
-			if (pf != null && (pf.Flags & ProjectItemFlags.Hidden) != 0) {
-				// The file is hidden in this project, so it may also be part of another project.
-				// Try to find a project in which this file is not hidden
-				foreach (var p in Project.ParentSolution.GetAllProjects ()) {
-					pf = p.GetProjectFile (file);
-					if (pf != null && (pf.Flags & ProjectItemFlags.Hidden) == 0)
-						return p;
-				}
-			}
-			return null;
-		}
-
-		public bool IsInvalid {
-			get {
-				if (Resolver == null || TextEditor == null)
-					return true;
-				return ParsedDocument == null;
-			}
-		}
-
-		public ParsedDocument ParsedDocument {
-			get;
-			private set;
-		}
-
-		public SyntaxTree Unit {
-			get {
-				Debug.Assert (!IsInvalid);
-				return Resolver.RootNode as SyntaxTree;
-			}
-		}
-
-		public override string DefaultNamespace {
-			get {
-				var p = FileContainerProject as IDotNetFileContainer;
-				if (p == null || TextEditor == null || string.IsNullOrEmpty (TextEditor.FileName))
-					return null;
-				return p.GetDefaultNamespace (TextEditor.FileName);
-			}
-		}
-
-		public override bool Supports (Version version)
-		{
-			var project = Project;
-			if (project == null)
-				return true;
-			switch (project.TargetFramework.ClrVersion) {
-			case ClrVersion.Net_1_1:
-				return version.Major > 1 || version.Major == 1 && version.Minor >= 1;
-			case ClrVersion.Net_2_0:
-				return version.Major >= 2;
-			case ClrVersion.Clr_2_1:
-				return version.Major > 2 || version.Major == 2 && version.Minor >= 1;
-			default:
-				return true;
-			}
-		}
-
-		public override ICSharpCode.NRefactory.CSharp.TextEditorOptions TextEditorOptions {
-			get {
-				return TextEditor.CreateNRefactoryTextEditorOptions ();
-			}
-		}
-
-		public override bool IsSomethingSelected { 
-			get {
-				return TextEditor.IsSomethingSelected;
-			}
-		}
-
-		public override string SelectedText {
-			get {
-				return TextEditor.SelectedText;
-			}
-		}
-
-		public override TextLocation SelectionStart {
-			get {
-				return TextEditor.MainSelection.Start;
-			}
-		}
-
-		public override TextLocation SelectionEnd { 
-			get {
-				return TextEditor.MainSelection.End;
-			}
-		}
-
-		public override int GetOffset (TextLocation location)
-		{
-			return TextEditor.LocationToOffset (location);
-		}
-
-		public override TextLocation GetLocation (int offset)
-		{
-			return TextEditor.OffsetToLocation (offset);
-		}
-
-		public override string GetText (int offset, int length)
-		{
-			return TextEditor.GetTextAt (offset, length);
-		}
-
-		public override string GetText (ICSharpCode.NRefactory.Editor.ISegment segment)
-		{
-			return TextEditor.GetTextAt (segment.Offset, segment.Length);
-		}
-
-		public override ICSharpCode.NRefactory.Editor.IDocumentLine GetLineByOffset (int offset)
-		{
-			return TextEditor.GetLineByOffset (offset);
-		}
-
-		readonly Document document;
-		TextLocation location;
-
-		public override TextLocation Location {
-			get {
-				return location;
-			}
-		}
-
-		internal void SetLocation (TextLocation loc)
-		{
-			if (document != null)
-				location = RefactoringService.GetCorrectResolveLocation (document, loc);
-			else
-				location = loc;
-		}
-
-		readonly CSharpFormattingOptions formattingOptions;
-
-		public CSharpFormattingOptions FormattingOptions {
-			get {
-				return formattingOptions;
-			}
-		}
-
-		public Script StartScript ()
-		{
-			return new MDRefactoringScript (this, formattingOptions);
-		}
-
-		public IDisposable CreateScript ()
-		{
-			return StartScript ();
-		}
-
-		internal static Task<MDRefactoringContext> Create (Document document, TextLocation loc, CancellationToken cancellationToken = default (CancellationToken))
-		{
-			var shared = document.GetSharedResolver ();
-			if (shared == null) {
-				var tcs = new TaskCompletionSource<MDRefactoringContext> ();
-				tcs.SetResult (null);
-				return tcs.Task;
-			}
-
-			return shared.ContinueWith (t => {
-				var sharedResolver = t.Result;
-				if (sharedResolver == null)
-					return null;
-				return new MDRefactoringContext (document, sharedResolver, loc, cancellationToken);
-				// Do not add TaskContinuationOptions.ExecuteSynchronously
-				// https://bugzilla.xamarin.com/show_bug.cgi?id=25065
-				// adding ExecuteSynchronously appears to create a deadlock situtation in TypeSystemParser.Parse()
-			});
-		}
-
-		internal MDRefactoringContext (Document document, CSharpAstResolver resolver, TextLocation loc, CancellationToken cancellationToken = default (CancellationToken)) : base (resolver, cancellationToken)
-		{
-			if (document == null)
-				throw new ArgumentNullException ("document");
-			this.document = document;
-			this.TextEditor = document.Editor;
-			this.ParsedDocument = document.ParsedDocument;
-			this.Project = document.Project as DotNetProject;
-			this.formattingOptions = document.GetFormattingOptions ();
-			this.location = loc;
-			var policy = document.HasProject ? document.Project.Policies.Get<NameConventionPolicy> () : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<NameConventionPolicy> ();
-			Services.AddService (typeof(NamingConventionService), policy.CreateNRefactoryService ());
-			Services.AddService (typeof(ICSharpCode.NRefactory.CSharp.CodeGenerationService), new CSharpCodeGenerationService());
-		}
-
-		public MDRefactoringContext (DotNetProject project, TextEditorData data, ParsedDocument parsedDocument, CSharpAstResolver resolver, TextLocation loc, CancellationToken cancellationToken = default (CancellationToken)) : base (resolver, cancellationToken)
-		{
-			this.TextEditor = data;
-			this.ParsedDocument = parsedDocument;
-			this.Project = project;
-			var policy = Project.Policies.Get<CSharpFormattingPolicy> ();
-			this.formattingOptions = policy.CreateOptions ();
-			this.location = loc;
-			var namingPolicy = Project.Policies.Get<NameConventionPolicy> ();
-			Services.AddService (typeof(NamingConventionService), namingPolicy.CreateNRefactoryService ());
-		}
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs
deleted file mode 100644
index 008f06c026..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs
+++ /dev/null
@@ -1,377 +0,0 @@
-// 
-// MDRefactoringScript.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Core;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Refactoring.Rename;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.IO;
-using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.Ide;
-using System.Threading.Tasks;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using MonoDevelop.Ide.Gui.Content;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class MDRefactoringScript : DocumentScript
-	{
-		readonly MDRefactoringContext context;
-		readonly IDisposable undoGroup;
-		readonly ICSharpCode.NRefactory.Editor.ITextSourceVersion startVersion;
-		int operationsRunning;
-
-		public MDRefactoringScript (MDRefactoringContext context, CSharpFormattingOptions formattingOptions) : base(context.TextEditor.Document, formattingOptions, context.TextEditor.CreateNRefactoryTextEditorOptions ())
-		{
-			this.context = context;
-			undoGroup  = this.context.TextEditor.OpenUndoGroup ();
-			this.startVersion = this.context.TextEditor.Version;
-
-		}
-
-		void Rollback ()
-		{
-			DisposeOnClose (true);
-			foreach (var ver in context.TextEditor.Version.GetChangesTo (startVersion)) {
-				context.TextEditor.Document.Replace (ver.Offset, ver.RemovalLength, ver.InsertedText.Text);
-			}
-		}
-
-		public override void Select (AstNode node)
-		{
-			var seg = GetSegment (node);
-			var startOffset = seg.Offset;
-			var endOffset   = seg.EndOffset;
-			while (startOffset < endOffset) {
-				char ch = context.TextEditor.GetCharAt (startOffset);
-				if (!char.IsWhiteSpace (ch))
-					break;
-				startOffset++;
-			}
-			while (startOffset < endOffset && endOffset > 0) {
-				char ch = context.TextEditor.GetCharAt (endOffset - 1);
-				if (!char.IsWhiteSpace (ch))
-					break;
-				endOffset--;
-			}
-
-			context.TextEditor.Caret.Offset = endOffset;
-			context.TextEditor.SelectionRange = new TextSegment (startOffset, endOffset - startOffset);
-		}
-
-		public override Task<Script> InsertWithCursor (string operation, InsertPosition defaultPosition, IList<AstNode> nodes)
-		{
-			var tcs = new TaskCompletionSource<Script> ();
-			var editor = context.TextEditor;
-			DocumentLocation loc = context.TextEditor.Caret.Location;
-			var declaringType = context.ParsedDocument.GetInnermostTypeDefinition (loc);
-			var mode = new InsertionCursorEditMode (
-				editor.Parent,
-				MonoDevelop.Ide.TypeSystem.CodeGenerationService.GetInsertionPoints (context.TextEditor, context.ParsedDocument, declaringType));
-			if (mode.InsertionPoints.Count == 0) {
-				MessageService.ShowError (
-					GettextCatalog.GetString ("No valid insertion point can be found in type '{0}'.", declaringType.Name)
-				);
-				return tcs.Task;
-			}
-			var helpWindow = new Mono.TextEditor.PopupWindow.InsertionCursorLayoutModeHelpWindow ();
-			helpWindow.TitleText = operation;
-			mode.HelpWindow = helpWindow;
-			
-			switch (defaultPosition) {
-			case InsertPosition.Start:
-				mode.CurIndex = 0;
-				break;
-			case InsertPosition.End:
-				mode.CurIndex = mode.InsertionPoints.Count - 1;
-				break;
-			case InsertPosition.Before:
-				for (int i = 0; i < mode.InsertionPoints.Count; i++) {
-					if (mode.InsertionPoints [i].Location < loc)
-						mode.CurIndex = i;
-				}
-				break;
-			case InsertPosition.After:
-				for (int i = 0; i < mode.InsertionPoints.Count; i++) {
-					if (mode.InsertionPoints [i].Location > loc) {
-						mode.CurIndex = i;
-						break;
-					}
-				}
-				break;
-			}
-			operationsRunning++;
-			mode.StartMode ();
-			mode.Exited += delegate(object s, InsertionCursorEventArgs iCArgs) {
-				if (iCArgs.Success) {
-					if (iCArgs.InsertionPoint.LineAfter == NewLineInsertion.None && 
-					    iCArgs.InsertionPoint.LineBefore == NewLineInsertion.None && nodes.Count () > 1) {
-						iCArgs.InsertionPoint.LineAfter = NewLineInsertion.BlankLine;
-					}
-					foreach (var node in nodes.Reverse ()) {
-						var output = OutputNode (MonoDevelop.Ide.TypeSystem.CodeGenerationService.CalculateBodyIndentLevel (declaringType), node);
-						var offset = context.TextEditor.LocationToOffset (iCArgs.InsertionPoint.Location);
-						var delta = iCArgs.InsertionPoint.Insert (editor, output.Text);
-						output.RegisterTrackedSegments (this, delta + offset);
-					}
-					tcs.SetResult (this);
-				} else {
-					Rollback ();
-				}
-				DisposeOnClose (); 
-			};
-			return tcs.Task;
-		}
-
-		readonly List<Script> startedScripts = new List<Script> ();
-
-		public override Task<Script> InsertWithCursor (string operation, ITypeDefinition parentType, Func<Script, RefactoringContext, IList<AstNode>> nodeCallback)
-		{
-			var tcs = new TaskCompletionSource<Script>();
-			if (parentType == null)
-				return tcs.Task;
-			var part = MonoDevelop.Ide.TypeSystem.CodeGenerationService.FindCurrentPart(parentType);
-			if (part == null)
-				return tcs.Task;
-
-			var loadedDocument = IdeApp.Workbench.OpenDocument (new FileOpenInformation (part.Region.FileName, null));
-			loadedDocument.RunWhenLoaded (delegate {
-				var editor = loadedDocument.Editor;
-				var loc = part.Region.Begin;
-				var parsedDocument = loadedDocument.UpdateParseDocument ();
-				var declaringType = parsedDocument.GetInnermostTypeDefinition (loc);
-				MDRefactoringScript script;
-
-				if (loadedDocument.Editor != context.TextEditor) {
-					script = new MDRefactoringScript (MDRefactoringContext.Create (loadedDocument, loc, context.CancellationToken).Result, FormattingOptions);
-					startedScripts.Add (script);
-				} else {
-					script = this;
-				}
-				var nodes = nodeCallback (script, script.context);
-				var mode = new InsertionCursorEditMode (
-					editor.Parent,
-					MonoDevelop.Ide.TypeSystem.CodeGenerationService.GetInsertionPoints (loadedDocument, declaringType));
-				if (mode.InsertionPoints.Count == 0) {
-					MessageService.ShowError (
-						GettextCatalog.GetString ("No valid insertion point can be found in type '{0}'.", declaringType.Name)
-					);
-					return;
-				}
-				if (declaringType.Kind == TypeKind.Enum) {
-					foreach (var node in nodes.Reverse ()) {
-						var output = OutputNode (MonoDevelop.Ide.TypeSystem.CodeGenerationService.CalculateBodyIndentLevel (declaringType), node);
-						var point = mode.InsertionPoints.First ();
-						var offset = loadedDocument.Editor.LocationToOffset (point.Location);
-						var text = output.Text + ",";
-						var delta = point.Insert (editor, text);
-						output.RegisterTrackedSegments (script, delta + offset);
-					}
-					tcs.SetResult (script);
-					return;
-				}
-
-				var helpWindow = new Mono.TextEditor.PopupWindow.InsertionCursorLayoutModeHelpWindow ();
-				helpWindow.TitleText = operation;
-				mode.HelpWindow = helpWindow;
-				
-				mode.CurIndex = 0;
-				operationsRunning++;
-				mode.StartMode ();
-				mode.Exited += delegate(object s, InsertionCursorEventArgs iCArgs) {
-					if (iCArgs.Success) {
-						if (iCArgs.InsertionPoint.LineAfter == NewLineInsertion.None && 
-						    iCArgs.InsertionPoint.LineBefore == NewLineInsertion.None && nodes.Count > 1) {
-							iCArgs.InsertionPoint.LineAfter = NewLineInsertion.BlankLine;
-						}
-						foreach (var node in nodes.Reverse ()) {
-							var output = OutputNode (MonoDevelop.Ide.TypeSystem.CodeGenerationService.CalculateBodyIndentLevel (declaringType), node);
-							var offset = loadedDocument.Editor.LocationToOffset (iCArgs.InsertionPoint.Location);
-							var text = output.Text;
-							var delta = iCArgs.InsertionPoint.Insert (editor, text);
-							output.RegisterTrackedSegments (script, delta + offset);
-						}
-						tcs.SetResult (script);
-					} else {
-						Rollback ();
-					}
-					DisposeOnClose (); 
-				};
-			});
-		
-			return tcs.Task;
-		}
-
-		public override Task Link (params AstNode[] nodes)
-		{
-			var tcs = new TaskCompletionSource<object> ();
-			var segments = new List<TextSegment> (nodes.Select (node => new TextSegment (GetSegment (node))).OrderBy (s => s.Offset));
-			
-			var link = new TextLink ("name");
-			segments.ForEach (link.AddLink);
-			var links = new List<TextLink> ();
-			links.Add (link);
-			var tle = new TextLinkEditMode (context.TextEditor.Parent, 0, links);
-			tle.SetCaretPosition = false;
-			if (tle.ShouldStartTextLinkMode) {
-				operationsRunning++;
-				context.TextEditor.Caret.Offset = segments [0].EndOffset;
-				tle.OldMode = context.TextEditor.CurrentMode;
-				tle.Cancel += (sender, e) => Rollback ();
-				tle.Exited += (sender, e) => DisposeOnClose (); 
-				tle.StartMode ();
-				context.TextEditor.CurrentMode = tle;
-				if (IdeApp.Workbench.ActiveDocument != null)
-					IdeApp.Workbench.ActiveDocument.ReparseDocument ();
-			}
-			return tcs.Task;
-		}
-
-		bool isDisposed;
-		void DisposeOnClose (bool force = false)
-		{
-			if (isDisposed)
-				return;
-			if (force)
-				operationsRunning = 0;
-			if (operationsRunning-- == 0) {
-				isDisposed = true;
-				undoGroup.Dispose ();
-				try {
-					base.Dispose ();
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while disposing refactoring script", e);
-				}
-			}
-			foreach (var script in startedScripts)
-				script.Dispose ();
-		}
-		
-		public override void Dispose ()
-		{
-			DisposeOnClose ();
-		}
-
-		public override void Rename (ISymbol symbol, string name = null)
-		{
-			if (symbol is IEntity) {
-				RenameRefactoring.Rename ((IEntity)symbol, name);
-			} else if (symbol is IVariable) {
-				RenameRefactoring.RenameVariable ((IVariable)symbol, name);
-			} else if (symbol is INamespace) {
-				RenameRefactoring.RenameNamespace ((INamespace)symbol, name);
-			} else if (symbol is ITypeParameter) {
-				RenameRefactoring.RenameTypeParameter ((ITypeParameter)symbol, name);
-			}
-		}
-
-		public override void DoGlobalOperationOn (IEnumerable<IEntity> entities, Action<RefactoringContext, Script, IEnumerable<AstNode>> callback, string operationName = null)
-		{
-			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (operationName ?? GettextCatalog.GetString ("Performing refactoring task..."), null)) {
-				var col = entities.SelectMany (entity => ReferenceFinder.FindReferences (entity, true, monitor)).OfType<CSharpReferenceFinder.CSharpMemberReference> ().GroupBy(reference => reference.FileName);
-
-				foreach (var r in col) {
-					string filename = r.Key;
-
-					bool isOpen;
-					System.Text.Encoding encoding;
-					bool hadBom;
-
-					var data = TextFileProvider.Instance.GetTextEditorData (filename, out hadBom, out encoding, out isOpen);
-
-					var firstReference = r.First ();
-
-					var project = firstReference.Project;
-
-					ParsedDocument parsedDocument;
-					using (var reader = new StreamReader (data.OpenStream ()))
-						parsedDocument = new MonoDevelop.CSharp.Parser.TypeSystemParser ().Parse (true, filename, reader, project);
-
-					var resolver = new CSharpAstResolver (TypeSystemService.GetCompilation (project), firstReference.SyntaxTree, parsedDocument.ParsedFile as CSharpUnresolvedFile);
-
-					var ctx = new MDRefactoringContext (project as DotNetProject, data, parsedDocument, resolver, firstReference.AstNode.StartLocation, context.CancellationToken);
-					var script = new MDRefactoringScript (ctx, FormattingOptions);
-
-					callback (ctx, script, r.Select (reference => reference.AstNode));
-
-					if (!isOpen) {
-						script.Dispose ();
-						Mono.TextEditor.Utils.TextFileUtility.WriteText (filename, data.Text, encoding, hadBom);
-					}
-				}
-			}
-		}
-
-		public override void CreateNewType (AstNode newType, NewTypeContext ntctx = NewTypeContext.CurrentNamespace)
-		{
-			if (newType == null)
-				throw new ArgumentNullException ("newType");
-			var correctFileName = MoveTypeToFile.GetCorrectFileName (context, (EntityDeclaration)newType);
-			
-			var content = context.TextEditor.Text;
-			
-			var types = new List<EntityDeclaration> (context.Unit.GetTypes ());
-			types.Sort ((x, y) => y.StartLocation.CompareTo (x.StartLocation));
-
-			foreach (var removeType in types) {
-				var start = context.GetOffset (removeType.StartLocation);
-				var end = context.GetOffset (removeType.EndLocation);
-				content = content.Remove (start, end - start);
-			}
-			
-			var insertLocation = types.Count > 0 ? context.GetOffset (types.Last ().StartLocation) : -1;
-			if (insertLocation < 0 || insertLocation > content.Length)
-				insertLocation = content.Length;
-			content = content.Substring (0, insertLocation) + newType.ToString (FormattingOptions) + content.Substring (insertLocation);
-
-			var project = context.FileContainerProject;
-			if (project != null) {
-				var policy = project.Policies.Get<CSharpFormattingPolicy> ();
-				var textPolicy = project.Policies.Get<TextStylePolicy> ();
-				content = MonoDevelop.CSharp.Formatting.CSharpFormatter.FormatText (policy, textPolicy, MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType, content, 0, content.Length);
-			}
-
-			File.WriteAllText (correctFileName, content);
-
-			if (project != null) {
-				project.AddFile (correctFileName);
-				IdeApp.ProjectOperations.Save (project);
-			}
-			IdeApp.Workbench.OpenDocument (correctFileName, project);
-		}
-
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeAction.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeAction.cs
deleted file mode 100644
index adec92c9d5..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeAction.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// 
-// NRefactoryCodeAction.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class NRefactoryCodeAction : MonoDevelop.CodeActions.CodeAction
-	{
-		readonly CodeAction act;
-		
-		public NRefactoryCodeAction (string id, string title, CodeAction act, object siblingKey = null)
-		{
-			this.IdString = id;
-			this.Title = title;
-			this.act = act;
-			this.SiblingKey = siblingKey;
-			this.Severity = act.Severity;
-			this.DocumentRegion = new Mono.TextEditor.DocumentRegion (act.Start, act.End);
-		}
-
-		public override void Run (IRefactoringContext context, object script)
-		{
-			act.Run ((Script) script);
-		}
-
-		/// <summary>
-		/// All the sibling actions of this action, ie those actions which represent the same kind
-		/// of fix. This list includes the current action. 
-		/// </summary>
-		/// <value>The sibling actions.</value>
-		public IList<MonoDevelop.CodeActions.CodeAction> SiblingActions { get; set; }
-		
-		public override bool SupportsBatchRunning {
-			get{
-				return SiblingActions != null;// && SiblingActions.Count > 1;
-			}
-		}
-		
-		public override void BatchRun (Document document, TextLocation loc)
-		{
-			base.BatchRun (document, loc);
-			var context = MDRefactoringContext.Create (document, loc).Result;
-			if (context == null)
-				return;
-			using (var script = context.StartScript ()) {
-				foreach (var action in SiblingActions) {
-					context.SetLocation (action.DocumentRegion.Begin);
-					action.Run (context, script);
-				}
-			}
-		}
-	}
-	
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionProvider.cs
deleted file mode 100644
index ec7ec5754e..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionProvider.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 
-// NRefactoryContextActionWrapper.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class NRefactoryCodeActionProvider : MonoDevelop.CodeActions.CodeActionProvider
-	{
-		readonly List<string> actionId = new List<string> ();
-		readonly CodeActionProvider provider;
-
-		public NRefactoryCodeActionProvider (CodeActionProvider provider, ContextActionAttribute attr)
-		{
-			if (provider == null)
-				throw new ArgumentNullException ("provider");
-			if (attr == null)
-				throw new ArgumentNullException ("attr");
-			this.provider = provider;
-			Title = GettextCatalog.GetString (attr.Title ?? "");
-			Description = GettextCatalog.GetString (attr.Description ?? "");
-			Category = GettextCatalog.GetString (attr.Category ?? "");
-			MimeType = "text/x-csharp";
-		}
-
-		public override IEnumerable<MonoDevelop.CodeActions.CodeAction> GetActions (Document document, object _context, TextLocation loc, CancellationToken cancellationToken)
-		{
-			if (cancellationToken.IsCancellationRequested)
-				yield break;
-			var context = _context as MDRefactoringContext;
-			if (context == null || context.IsInvalid || context.RootNode == null)
-				yield break;
-			var actions = provider.GetActions (context);
-			if (actions == null) {
-				LoggingService.LogWarning (provider + " returned null actions.");
-				yield break;
-			}
-			int num = 0;
-			foreach (var action_ in actions) {
-				var action = action_;
-				if (actionId.Count <= num) {
-					actionId.Add (provider.GetType ().FullName + "'" + num);
-				}
-				yield return new NRefactoryCodeAction (actionId[num], GettextCatalog.GetString (action.Description ?? ""), action);
-				num++;
-			}
-		}
-
-		public override string IdString {
-			get {
-				return provider.GetType ().FullName;
-			}
-		}
-
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionSource.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionSource.cs
deleted file mode 100644
index ba431c6e0f..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/NRefactoryCodeActionSource.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// 
-// NRefactoryCodeActionSource.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.CodeActions;
-using System.Collections.Generic;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeActions
-{
-	class NRefactoryCodeActionSource : ICodeActionProviderSource
-	{
-		#region ICodeActionProviderSource implementation
-		public IEnumerable<CodeActionProvider> GetProviders ()
-		{
-			foreach (var t in typeof (ICSharpCode.NRefactory.CSharp.Refactoring.AbstractAndVirtualConversionAction).Assembly.GetTypes ()) {
-				var attr = t.GetCustomAttributes (typeof(ICSharpCode.NRefactory.CSharp.ContextActionAttribute), false);
-				if (attr == null || attr.Length != 1)
-					continue;
-				if (t.Name == "AddUsingAction")
-					continue;
-				yield return new NRefactoryCodeActionProvider (
-					(ICSharpCode.NRefactory.CSharp.Refactoring.CodeActionProvider)Activator.CreateInstance (t),
-					(ICSharpCode.NRefactory.CSharp.ContextActionAttribute)attr [0]);
-			}
-		}
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/BaseNRefactoryIssueProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/BaseNRefactoryIssueProvider.cs
deleted file mode 100644
index 89b24c2087..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/BaseNRefactoryIssueProvider.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// 
-// NRefactoryIssueWrapper.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Ide.Gui;
-using System.Threading;
-using MonoDevelop.CodeIssues;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using MonoDevelop.Core;
-using Mono.TextEditor;
-using MonoDevelop.Core.Instrumentation;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	class BaseNRefactoryIssueProvider : BaseCodeIssueProvider
-	{
-		NRefactoryIssueProvider parentIssue;
-		SubIssueAttribute subIssue;
-		TimerCounter counter;
-
-		public override CodeIssueProvider Parent {
-			get {
-				return parentIssue;
-			}
-		}
-
-		public override string MimeType {
-			get {
-				return parentIssue.MimeType;
-			}
-		}
-
-		
-		/// <summary>
-		/// Gets the identifier string used as property ID tag.
-		/// </summary>
-		public override string IdString {
-			get {
-				return parentIssue.IdString + "." + subIssue.Title;
-			}
-		}
-
-		public BaseNRefactoryIssueProvider (NRefactoryIssueProvider parentIssue, SubIssueAttribute subIssue)
-		{
-			this.parentIssue = parentIssue;
-			this.subIssue = subIssue;
-			this.Title = subIssue.Title;
-			this.Description = subIssue.Description;
-
-			DefaultSeverity = subIssue.Severity.HasValue ? subIssue.Severity.Value : parentIssue.DefaultSeverity;
-			IsEnabledByDefault = subIssue.IsEnabledByDefault.HasValue ? subIssue.IsEnabledByDefault.Value : parentIssue.IsEnabledByDefault;
-			UpdateSeverity ();
-
-			counter = InstrumentationService.CreateTimerCounter (IdString, "CodeIssueProvider run times");
-		}
-
-		/// <summary>
-		/// Gets all the code issues inside a document.
-		/// </summary>
-		public override IEnumerable<CodeIssue> GetIssues (object ctx, CancellationToken cancellationToken)
-		{
-			var context = ctx as MDRefactoringContext;
-			if (context == null || context.IsInvalid || context.RootNode == null || context.ParsedDocument.HasErrors)
-				return new CodeIssue[0];
-			// Holds all the actions in a particular sibling group.
-			IList<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> issues;
-			using (var timer = counter.BeginTiming ()) {
-				// We need to enumerate here in order to time it. 
-				// This shouldn't be a problem since there are current very few (if any) lazy providers.
-				var _issues = parentIssue.IssueProvider.GetIssues (context, subIssue.Title);
-				issues = _issues as IList<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> ?? _issues.ToList ();
-			}
-			return parentIssue.ToMonoDevelopRepresentation (cancellationToken, context, issues);
-		}
-
-
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/Issues/MonoTODOIssue.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/Issues/MonoTODOIssue.cs
deleted file mode 100644
index 20a593d9a1..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/Issues/MonoTODOIssue.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// MonoTODOIssue.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using MonoDevelop.CodeIssues;
-using ICSharpCode.NRefactory.CSharp;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using System.Linq;
-
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	public class MonoTODOIssue : MonoDevelop.CodeIssues.CodeIssueProvider
-	{
-		public override bool HasSubIssues {
-			get {
-				return false;
-			}
-		}
-
-		public MonoTODOIssue ()
-		{
-			this.Title = "Mono TODO";
-			this.Description = "Find usages of mono todo items";
-			this.Category = IssueCategories.Notifications;
-			this.SetMimeType ("text/x-csharp");
-			this.IsEnabledByDefault = true;
-			this.SetSeverity (ICSharpCode.NRefactory.Refactoring.Severity.Warning); 
-			this.SetIsEnabled (true);
-		}
-
-		public override IEnumerable<CodeIssue> GetIssues (object refactoringContext, System.Threading.CancellationToken cancellationToken)
-		{
-			var context = refactoringContext as MDRefactoringContext;
-			if (context == null || context.IsInvalid || context.RootNode == null || context.ParsedDocument.HasErrors)
-				return new CodeIssue[0];
-			var visitor = new MonoTODOVisitor (this, context);
-			context.RootNode.AcceptVisitor (visitor);
-			return visitor.Issues;
-		}
-
-		class MonoTODOVisitor : DepthFirstAstVisitor
-		{
-			readonly MonoTODOIssue issue;
-			readonly MDRefactoringContext ctx;
-			public readonly List<CodeIssue> Issues = new List<CodeIssue> ();
-
-			public MonoTODOVisitor (MonoTODOIssue issue, MDRefactoringContext ctx)
-			{
-				this.issue = issue;
-				this.ctx = ctx;
-			}
-			static readonly Dictionary<string, string> attributes = new Dictionary<string, string> {
-				{ "MonoTODOAttribute", "Mono TODO" },
-				{ "MonoNotSupportedAttribute", "Mono NOT SUPPORTED" },
-				{ "MonoLimitationAttribute", "Mono LIMITATION" }
-			};
-			void Check (AstNode node, IMember member)
-			{
-				foreach (var attr in member.Attributes) {
-					if (attr.AttributeType.Namespace != "System")
-						continue;
-
-					string val;
-					if (attributes.TryGetValue (attr.AttributeType.Name, out val)) {
-						string msg = null;
-						var arg = attr.PositionalArguments.FirstOrDefault ();
-						if (arg != null)
-							msg = arg.ConstantValue != null ? arg.ConstantValue.ToString () : null;
-						Issues.Add (new CodeIssue (ICSharpCode.NRefactory.Refactoring.IssueMarker.WavedLine,
-							string.IsNullOrEmpty (msg) ? val : val + ": " + msg,
-							new DomRegion (node.StartLocation, node.EndLocation),
-							issue.IdString
-						)); 
-					}
-				}
-
-			}
-
-			public override void VisitMemberReferenceExpression (MemberReferenceExpression memberReferenceExpression)
-			{
-				base.VisitMemberReferenceExpression (memberReferenceExpression);
-				var rr = ctx.Resolve (memberReferenceExpression) as MemberResolveResult;
-				if (rr == null || rr.IsError)
-					return;
-				Check (memberReferenceExpression, rr.Member);
-			}
-
-			public override void VisitIdentifierExpression (IdentifierExpression identifierExpression)
-			{
-				base.VisitIdentifierExpression (identifierExpression);
-				var rr = ctx.Resolve (identifierExpression) as MemberResolveResult;
-				if (rr == null || rr.IsError)
-					return;
-				Check (identifierExpression, rr.Member);
-			}
-
-			public override void VisitInvocationExpression (InvocationExpression invocationExpression)
-			{
-				base.VisitInvocationExpression (invocationExpression);
-				var rr = ctx.Resolve (invocationExpression) as CSharpInvocationResolveResult;
-				if (rr == null || rr.IsError)
-					return;
-				Check (invocationExpression, rr.Member);
-			}
-
-			public override void VisitBlockStatement (BlockStatement blockStatement)
-			{
-				ctx.CancellationToken.ThrowIfCancellationRequested ();
-				base.VisitBlockStatement (blockStatement);
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryCodeIssueSource.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryCodeIssueSource.cs
deleted file mode 100644
index 678b3d4a66..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryCodeIssueSource.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// 
-// NRefactoryCodeIssueSource.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.CodeIssues;
-using System.Collections.Generic;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using ICSharpCode.NRefactory;
-using MonoDevelop.Ide.TypeSystem;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	class NRefactoryCodeIssueSource : ICodeIssueProviderSource
-	{
-		#region ICodeIssueProviderSource implementation
-		public IEnumerable<CodeIssueProvider> GetProviders ()
-		{
-			foreach (var t in typeof (ICSharpCode.NRefactory.CSharp.Refactoring.AbstractAndVirtualConversionAction).Assembly.GetTypes ()) {
-				var attr = t.GetCustomAttributes (typeof(ICSharpCode.NRefactory.CSharp.IssueDescriptionAttribute), false);
-				if (attr == null || attr.Length != 1)
-					continue;
-				yield return new NRefactoryIssueProvider (
-					(ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssueProvider)Activator.CreateInstance (t),
-					(ICSharpCode.NRefactory.CSharp.IssueDescriptionAttribute)attr [0]);
-			}
-		}
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs
deleted file mode 100644
index 61592e7e9b..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-// 
-// NRefactoryIssueWrapper.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Ide.Gui;
-using System.Threading;
-using MonoDevelop.CodeIssues;
-using MonoDevelop.CSharp.Refactoring.CodeActions;
-using MonoDevelop.Core;
-using Mono.TextEditor;
-using MonoDevelop.Core.Instrumentation;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	class NRefactoryIssueProvider : CodeIssueProvider
-	{
-		readonly ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssueProvider issueProvider;
-		readonly IssueDescriptionAttribute attr;
-		readonly string providerIdString;
-		readonly TimerCounter counter;
-
-		public override string IdString {
-			get {
-				return "refactoring.codeissues." + MimeType + "." + issueProvider.GetType ().FullName;
-			}
-		}
-
-		public override bool HasSubIssues {
-			get {
-				return issueProvider.HasSubIssues;
-			}
-		}
-
-		readonly List<BaseCodeIssueProvider> subIssues;
-		public override IEnumerable<BaseCodeIssueProvider> SubIssues {
-			get {
-				return subIssues;
-			}
-		}
-
-		public ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssueProvider IssueProvider {
-			get {
-				return issueProvider;
-			}
-		}
-
-		public string ProviderIdString {
-			get {
-				return providerIdString;
-			}
-		}
-
-		public NRefactoryIssueProvider (ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssueProvider issue, IssueDescriptionAttribute attr)
-		{
-			issueProvider = issue;
-			this.attr = attr;
-			providerIdString = issueProvider.GetType ().FullName;
-			Category = GettextCatalog.GetString (attr.Category ?? "");
-			Title = GettextCatalog.GetString (attr.Title ?? "");
-			Description = GettextCatalog.GetString (attr.Description ?? "");
-			DefaultSeverity = attr.Severity;
-			IsEnabledByDefault = attr.IsEnabledByDefault;
-			SetMimeType ("text/x-csharp");
-			subIssues = issueProvider.SubIssues.Select (subIssue => (BaseCodeIssueProvider)new BaseNRefactoryIssueProvider (this, subIssue)).ToList ();
-
-			counter = InstrumentationService.CreateTimerCounter (IdString, "CodeIssueProvider run times");
-		}
-
-		public override IEnumerable<CodeIssue> GetIssues (object ctx, CancellationToken cancellationToken)
-		{
-			var context = ctx as MDRefactoringContext;
-			if (context == null || context.IsInvalid || context.RootNode == null || context.ParsedDocument.HasErrors)
-				return new CodeIssue[0];
-				
-			// Holds all the actions in a particular sibling group.
-			IList<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> issues;
-			using (var timer = counter.BeginTiming ()) {
-				// We need to enumerate here in order to time it. 
-				// This shouldn't be a problem since there are current very few (if any) lazy providers.
-				var _issues = issueProvider.GetIssues (context);
-				issues = _issues as IList<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> ?? _issues.ToList ();
-			}
-			return ToMonoDevelopRepresentation (cancellationToken, context, issues);
-		}
-
-		IEnumerable<NRefactoryCodeAction> GetActions (ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue issue, MDRefactoringContext context)
-		{
-			foreach (var action in issue.Actions)
-				yield return new NRefactoryCodeAction (IdString, action.Description, action, action.SiblingKey);
-
-			if (issue.ActionProvider != null) {
-				foreach (var provider in issue.ActionProvider) {
-					var boundActionProvider = (ICSharpCode.NRefactory.CSharp.Refactoring.CodeActionProvider)Activator.CreateInstance (provider);
-					context.SetLocation (issue.Start);
-					foreach (var action in boundActionProvider.GetActions (context)) {
-						yield return new NRefactoryCodeAction (provider.FullName, action.Description, action, action.SiblingKey);
-					}
-				}
-			}
-		}
-
-		internal IEnumerable<CodeIssue> ToMonoDevelopRepresentation (CancellationToken cancellationToken, MDRefactoringContext context, IEnumerable<ICSharpCode.NRefactory.CSharp.Refactoring.CodeIssue> issues)
-		{
-			var actionGroups = new Dictionary<object, IList<MonoDevelop.CodeActions.CodeAction>> ();
-			foreach (var issue in issues) {
-				if (cancellationToken.IsCancellationRequested)
-					yield break;
-				if (issue.Actions == null) {
-					LoggingService.LogError ("NRefactory actions == null in :" + Title);
-					continue;
-				}
-				var actions = new List<NRefactoryCodeAction> ();
-				foreach (var nrefactoryCodeAction in GetActions(issue, context)) {
-					if (cancellationToken.IsCancellationRequested)
-						yield break;
-					if (nrefactoryCodeAction == null) {
-						LoggingService.LogError ("NRefactory issue action was null in :" + Title);
-						continue;
-					}
-					if (nrefactoryCodeAction.SiblingKey != null) {
-						// make sure the action has a list of its siblings
-						IList<MonoDevelop.CodeActions.CodeAction> siblingGroup;
-						if (!actionGroups.TryGetValue (nrefactoryCodeAction.SiblingKey, out siblingGroup)) {
-							siblingGroup = new List<MonoDevelop.CodeActions.CodeAction> ();
-							actionGroups.Add (nrefactoryCodeAction.SiblingKey, siblingGroup);
-						}
-						siblingGroup.Add (nrefactoryCodeAction);
-						nrefactoryCodeAction.SiblingActions = siblingGroup;
-					}
-					actions.Add (nrefactoryCodeAction);
-				}
-				yield return new CodeIssue (issue.IssueMarker, GettextCatalog.GetString (issue.Description ?? ""), context.TextEditor.FileName, issue.Start, issue.End, IdString, actions) {
-					ActionProvider = issue.ActionProvider
-				};
-			}
-		}	
-
-		public override bool CanDisableOnce { get { return !string.IsNullOrEmpty (attr.AnalysisDisableKeyword); } }
-
-		public override bool CanDisableAndRestore { get { return !string.IsNullOrEmpty (attr.AnalysisDisableKeyword); } }
-
-		public override bool CanDisableWithPragma { get { return attr.PragmaWarning > 0; } }
-
-		public override bool CanSuppressWithAttribute { get { return !string.IsNullOrEmpty (attr.SuppressMessageCheckId); } }
-
-		const string analysisDisableTag = "Analysis ";
-
-		public override void DisableOnce (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			document.Editor.Insert (
-				document.Editor.LocationToOffset (loc.BeginLine, 1), 
-				document.Editor.IndentationTracker.GetIndentationString (loc.Begin) + "// " + analysisDisableTag + "disable once " + attr.AnalysisDisableKeyword + document.Editor.EolMarker
-			); 
-		}
-
-		public override void DisableAndRestore (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			using (document.Editor.OpenUndoGroup ()) {
-				document.Editor.Insert (
-					document.Editor.LocationToOffset (loc.EndLine + 1, 1),
-					document.Editor.IndentationTracker.GetIndentationString (loc.End) + "// " + analysisDisableTag + "restore " + attr.AnalysisDisableKeyword + document.Editor.EolMarker
-				); 
-				document.Editor.Insert (
-					document.Editor.LocationToOffset (loc.BeginLine, 1),
-					document.Editor.IndentationTracker.GetIndentationString (loc.Begin) + "// " + analysisDisableTag + "disable " + attr.AnalysisDisableKeyword + document.Editor.EolMarker
-				); 
-			}
-		}
-
-		public override void DisableWithPragma (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			using (document.Editor.OpenUndoGroup ()) {
-				document.Editor.Insert (
-					document.Editor.LocationToOffset (loc.EndLine + 1, 1),
-					document.Editor.IndentationTracker.GetIndentationString (loc.End) + "#pragma warning restore " + attr.PragmaWarning + document.Editor.EolMarker
-				); 
-				document.Editor.Insert (
-					document.Editor.LocationToOffset (loc.BeginLine, 1),
-					document.Editor.IndentationTracker.GetIndentationString (loc.Begin) + "#pragma warning disable " + attr.PragmaWarning + document.Editor.EolMarker
-				); 
-			}
-		}
-
-		public override void SuppressWithAttribute (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			var member = document.ParsedDocument.GetMember (loc.End);
-			document.Editor.Insert (
-				document.Editor.LocationToOffset (member.Region.BeginLine, 1),
-				document.Editor.IndentationTracker.GetIndentationString (loc.Begin) + string.Format ("[SuppressMessage(\"{0}\", \"{1}\")]" + document.Editor.EolMarker, attr.SuppressMessageCategory, attr.SuppressMessageCheckId)
-			); 
-		}
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs
deleted file mode 100644
index 574f10de7b..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-// 
-// NamingConventionEditRuleDialog.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using System.Linq;
-using Gtk;
-using System.Collections.Generic;
-using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	partial class NameConventionEditRuleDialog : Gtk.Dialog
-	{
-		static readonly Dictionary<AffectedEntity, string> EntityName = new Dictionary<AffectedEntity, string> ();
-		static readonly Dictionary<Modifiers, string> AccessibilityName = new Dictionary<Modifiers, string> ();
-		
-		static NameConventionEditRuleDialog ()
-		{
-			EntityName [AffectedEntity.Namespace] = GettextCatalog.GetString ("Namespaces");
-
-			EntityName [AffectedEntity.Class] = GettextCatalog.GetString ("Classes");
-			EntityName [AffectedEntity.Struct] = GettextCatalog.GetString ("Structs");
-			EntityName [AffectedEntity.Enum] = GettextCatalog.GetString ("Enums");
-			EntityName [AffectedEntity.Interface] = GettextCatalog.GetString ("Interfaces");
-			EntityName [AffectedEntity.Delegate] = GettextCatalog.GetString ("Delegates");
-	
-			EntityName [AffectedEntity.CustomAttributes] = GettextCatalog.GetString ("Attributes");
-			EntityName [AffectedEntity.CustomEventArgs] = GettextCatalog.GetString ("Event Arguments");
-			EntityName [AffectedEntity.CustomExceptions] = GettextCatalog.GetString ("Exceptions");
-	
-			EntityName [AffectedEntity.Property] = GettextCatalog.GetString ("Properties");
-			EntityName [AffectedEntity.AsyncMethod] = GettextCatalog.GetString ("Async methods");
-			EntityName [AffectedEntity.Method] = GettextCatalog.GetString ("Methods");
-			EntityName [AffectedEntity.Field] = GettextCatalog.GetString ("Fields");
-			EntityName [AffectedEntity.ConstantField] = GettextCatalog.GetString ("Constant fields");
-			EntityName [AffectedEntity.ReadonlyField] = GettextCatalog.GetString ("Readonly fields");
-			EntityName [AffectedEntity.Event] = GettextCatalog.GetString ("Events");
-			EntityName [AffectedEntity.EnumMember] = GettextCatalog.GetString ("Enum Members");
-	
-			EntityName [AffectedEntity.Parameter] = GettextCatalog.GetString ("Parameters");
-			EntityName [AffectedEntity.TypeParameter] = GettextCatalog.GetString ("Type Parameters");
-	
-			// Unit test special case
-			EntityName [AffectedEntity.TestType] = GettextCatalog.GetString ("Test Types");
-			EntityName [AffectedEntity.TestMethod] = GettextCatalog.GetString ("Test Methods");
-	
-			// private entities
-			EntityName [AffectedEntity.LambdaParameter] = GettextCatalog.GetString ("Lambda Parameters");
-			EntityName [AffectedEntity.LocalVariable] = GettextCatalog.GetString ("Local Variables");
-			EntityName [AffectedEntity.LocalConstant] = GettextCatalog.GetString ("Local Constants");
-			EntityName [AffectedEntity.Label] = GettextCatalog.GetString ("Labels");
-
-			AccessibilityName [Modifiers.Public] = GettextCatalog.GetString ("Public");
-			AccessibilityName [Modifiers.Private] = GettextCatalog.GetString ("Private");
-			AccessibilityName [Modifiers.Internal] = GettextCatalog.GetString ("Internal");
-			AccessibilityName [Modifiers.Protected] = GettextCatalog.GetString ("Protected");
-		}
-
-		NameConventionRule rule;
-
-		ListStore entityStore       = new ListStore (typeof(string), typeof(AffectedEntity), typeof(bool));
-		ListStore accessibiltyStore = new ListStore (typeof(string), typeof(Modifiers), typeof(bool));
-
-		public NameConventionEditRuleDialog (NameConventionRule rule)
-		{
-			if (rule == null)
-				throw new System.ArgumentNullException ("rule");
-			this.rule = rule;
-			this.Build ();
-
-			var ct1 = new CellRendererToggle ();
-			ct1.Toggled += delegate(object o, Gtk.ToggledArgs args) {
-				TreeIter iter;
-				if (!entityStore.GetIterFromString (out iter, args.Path))
-					return;
-				entityStore.SetValue (iter, 2, !(bool)entityStore.GetValue (iter, 2));
-			};
-			treeviewEntities.AppendColumn ("IsChecked", ct1, "active", 2);
-			treeviewEntities.AppendColumn ("Entity", new CellRendererText (), "text", 0);
-			treeviewEntities.Model = entityStore;
-			
-			var ct2 = new CellRendererToggle ();
-			ct2.Toggled += delegate(object o, Gtk.ToggledArgs args) {
-				TreeIter iter;
-				if (!accessibiltyStore.GetIterFromString (out iter, args.Path))
-					return;
-				accessibiltyStore.SetValue (iter, 2, !(bool)accessibiltyStore.GetValue (iter, 2));
-			};
-			treeviewAccessibility.AppendColumn ("IsChecked", ct2, "active", 2);
-			treeviewAccessibility.AppendColumn ("Entity", new CellRendererText (), "text", 0);
-			treeviewAccessibility.Model = accessibiltyStore;
-			buttonOk.Clicked += (sender, e) => Apply ();
-
-			FillDialog ();
-		}
-
-		public void FillDialog ()
-		{
-			entryRuleName.Text = rule.Name ?? "";
-			if (rule.RequiredPrefixes != null)
-				entryPrefix.Text = rule.RequiredPrefixes.FirstOrDefault (); 
-			if (rule.AllowedPrefixes != null)
-				entryPrefixAllowed.Text = string.Join (", ", rule.AllowedPrefixes); 
-			if (rule.RequiredSuffixes != null)
-				entrySuffix.Text = rule.RequiredSuffixes.FirstOrDefault (); 
-			styleComboBox.AppendText ("PascalCase"); 
-			styleComboBox.AppendText ("CamelCase"); 
-			styleComboBox.AppendText ("ALLUPPER"); 
-			styleComboBox.AppendText ("alllower"); 
-			styleComboBox.AppendText ("Firstupper"); 
-			styleComboBox.AppendText ("PascalCase_underscoreTolerant"); 
-			styleComboBox.AppendText ("PascalCase_UnderscoreTolerant"); 
-			styleComboBox.AppendText ("CamelCase_underscoreTolerant"); 
-			styleComboBox.AppendText ("CamelCase_UnderscoreTolerant"); 
-
-			styleComboBox.Active = (int)rule.NamingStyle - 1;
-
-			foreach (AffectedEntity ae in Enum.GetValues (typeof (AffectedEntity))) {
-				if (!EntityName.ContainsKey (ae))
-					continue;
-				entityStore.AppendValues (EntityName [ae], ae, rule.AffectedEntity.HasFlag (ae));
-			}
-			
-			foreach (Modifiers mod in Enum.GetValues (typeof (Modifiers))) {
-				if (!AccessibilityName.ContainsKey (mod))
-					continue;
-				accessibiltyStore.AppendValues (AccessibilityName [mod], mod, rule.VisibilityMask.HasFlag (mod));
-			}
-
-			checkbuttonStatic.Active = rule.IncludeStaticEntities;
-			checkbuttonInstanceMembers.Active = rule.IncludeInstanceMembers;
-
-		}
-
-		public void Apply ()
-		{
-			rule.Name = entryRuleName.Text;
-			rule.NamingStyle = (NamingStyle)(1 + styleComboBox.Active);
-
-			var prefix = entryPrefix.Text.Trim ();
-			if (string.IsNullOrEmpty (prefix)) {
-				rule.RequiredPrefixes = null;
-			} else {
-				rule.RequiredPrefixes = new [] { prefix };
-			}
-			
-			var allowedPrefix = entryPrefixAllowed.Text.Trim ();
-			if (string.IsNullOrEmpty (allowedPrefix)) {
-				rule.AllowedPrefixes = null;
-			} else {
-				rule.AllowedPrefixes = allowedPrefix.Split (',', ';').Select (s => s.Trim ()).ToArray ();
-			}
-			
-			var suffix = entrySuffix.Text.Trim ();
-			if (string.IsNullOrEmpty (suffix)) {
-				rule.RequiredSuffixes = null;
-			} else {
-				rule.RequiredSuffixes = new [] { suffix };
-			}
-
-			var ae = AffectedEntity.None;
-			TreeIter iter;
-			if (entityStore.GetIterFirst (out iter)) {
-				do {
-					var entity = (AffectedEntity)entityStore.GetValue (iter, 1);
-					var include = (bool)entityStore.GetValue (iter, 2);
-					if (include)
-						ae |= entity;
-				} while (entityStore.IterNext (ref iter));
-			}
-			rule.AffectedEntity = ae;
-
-			var mod = Modifiers.None;
-			if (accessibiltyStore.GetIterFirst (out iter)) {
-				do {
-					var entity = (Modifiers)accessibiltyStore.GetValue (iter, 1);
-					var include = (bool)accessibiltyStore.GetValue (iter, 2);
-					if (include)
-						mod |= entity;
-				} while (accessibiltyStore.IterNext (ref iter));
-			}
-			rule.VisibilityMask = mod;
-			rule.IncludeStaticEntities = checkbuttonStatic.Active;
-			rule.IncludeInstanceMembers = checkbuttonInstanceMembers.Active;
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanel.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanel.cs
deleted file mode 100644
index a8c3f7c0b3..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanel.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// 
-// NamingConventionPanel.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.Ide.Gui.Dialogs;
-using Gtk;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	class NameConventionPanel : PolicyOptionsPanel<NameConventionPolicy>
-	{
-		NameConventionPanelWidget panel;
-		
-		static NameConventionPanel ()
-		{
-			// ensure that custom text editor shemes are loaded.
-			MonoDevelop.SourceEditor.SourceEditorDisplayBinding.InitSourceEditor ();
-		}
-		
-		protected override string PolicyTitleWithMnemonic {
-			get {
-				return GettextCatalog.GetString ("_Naming Style");
-			}
-		}
-
-		public override Widget CreatePanelWidget ()
-		{
-			panel = new NameConventionPanelWidget ();
-			panel.PolicyChanged += delegate {
-				UpdateSelectedNamedPolicy ();
-			};
-			return panel;
-		}
-		
-		protected override void LoadFrom (NameConventionPolicy policy)
-		{
-			panel.Policy = policy.Clone ();
-		}
-		
-		protected override NameConventionPolicy GetPolicy ()
-		{
-			// return cloned policy
-			panel.ApplyChanges ();
-			return panel.Policy;
-		}
-	}
-
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanelWidget.cs
deleted file mode 100644
index af5597e718..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPanelWidget.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-// 
-// NamingConventionPanelWidget.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using Gtk;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using System.Collections.Generic;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	[System.ComponentModel.ToolboxItem(true)]
-	partial class NameConventionPanelWidget : Gtk.Bin
-	{
-		TreeStore treeStore = new TreeStore (typeof(NameConventionRule));
-		NameConventionPolicy policy;
-
-		internal NameConventionPolicy Policy {
-			get {
-				return policy;
-			}
-			set {
-				policy = value;
-				FillRules (policy.Rules);
-			}
-		}
-
-		public NameConventionPanelWidget ()
-		{
-			Build ();	
-			Show ();
-
-			var ct1 = new CellRendererText ();
-			var col1 = treeviewConventions.AppendColumn (GettextCatalog.GetString ("Rule"), ct1);
-			col1.Expand = true;
-			col1.SetCellDataFunc (ct1, delegate (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter) {
-				var rule = (NameConventionRule)model.GetValue (iter, 0);
-				ct1.Text = rule.Name;
-			});
-			
-			
-			var ct2 = new CellRendererText ();
-			var col2 = treeviewConventions.AppendColumn (GettextCatalog.GetString ("Example"), ct2);
-			col2.Expand = true;
-			col2.SetCellDataFunc (ct2, delegate (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter) {
-				var rule = (NameConventionRule)model.GetValue (iter, 0);
-				ct2.Text = rule.GetPreview ();
-			});
-			
-			treeviewConventions.Model = treeStore;
-			treeviewConventions.Selection.Changed += HandleSelectionChanged;
-			treeviewConventions.RowActivated += (o, args) => EditSelectedEntry ();
-			buttonEdit.Clicked += (o, s) => EditSelectedEntry ();
-			buttonRemove.Clicked += (o, s) => RemoveSelectedEntry ();
-			buttonAdd.Clicked += (o, s) => AddEntry ();
-
-			HandleSelectionChanged (null, null);
-		}
-
-		void HandleSelectionChanged (object sender, EventArgs e)
-		{
-			TreeIter iter;
-			buttonEdit.Sensitive = treeviewConventions.Selection.GetSelected (out iter);
-		}
-
-		public void ApplyChanges ()
-		{
-			var rules = new List<NameConventionRule> ();
-			TreeIter iter;
-			if (treeStore.GetIterFirst (out iter)) {
-				do {
-					var rule = (NameConventionRule)treeStore.GetValue (iter, 0);
-					rules.Add (rule);
-				} while (treeStore.IterNext (ref iter));
-			}
-			policy.Rules = rules.ToArray ();
-			if (IdeApp.Workbench.ActiveDocument != null)
-				IdeApp.Workbench.ActiveDocument.UpdateParseDocument ();
-		}
-
-		void AddEntry ()
-		{
-			var newRule = new NameConventionRule ();
-			newRule.Name = "New Rule";
-			using (var diag = new NameConventionEditRuleDialog (newRule)) {
-				var result = MessageService.ShowCustomDialog (diag);
-				if (result == (int)ResponseType.Ok)
-					treeStore.AppendValues (newRule);
-				OnPolicyChanged (EventArgs.Empty);
-			}
-		}
-
-		void EditSelectedEntry ()
-		{
-			TreeIter iter;
-			if (!treeviewConventions.Selection.GetSelected (out iter))
-				return;
-			var rule = treeStore.GetValue (iter, 0) as NameConventionRule;
-			using (var diag = new NameConventionEditRuleDialog (rule)) {
-				int result = MessageService.ShowCustomDialog (diag);
-				treeviewConventions.QueueResize ();
-				if (result == (int)Gtk.ResponseType.Ok)
-					OnPolicyChanged (EventArgs.Empty);
-			}
-		}
-		
-		void RemoveSelectedEntry ()
-		{
-			TreeIter iter;
-			if (!treeviewConventions.Selection.GetSelected (out iter))
-				return;
-			treeStore.Remove (ref iter);
-			OnPolicyChanged (EventArgs.Empty);
-		}
-
-		void FillRules (IEnumerable<NameConventionRule> rules)
-		{
-			treeStore.Clear ();
-			foreach (var rule in rules) {
-				treeStore.AppendValues (rule);
-			}
-		}
-
-		protected virtual void OnPolicyChanged (EventArgs e)
-		{
-			var handler = PolicyChanged;
-			if (handler != null)
-				handler (this, e);
-		}
-
-		public event EventHandler PolicyChanged;
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPolicy.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPolicy.cs
deleted file mode 100644
index ac1fb31bde..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionPolicy.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// 
-// NamingConventions.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using MonoDevelop.Projects.Policies;
-using MonoDevelop.Core.Serialization;
-using ICS = ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	[PolicyType ("Naming Conventions Policy")]
-	class NameConventionPolicy : IEquatable<NameConventionPolicy>
-	{
-		NameConventionRule[] rules = new NameConventionRule[0];
-
-		[ItemProperty]
-		public NameConventionRule[] Rules {
-			get { return rules; }
-			set { rules = value; }
-		}
-
-		public NameConventionPolicy Clone ()
-		{
-			var result = new NameConventionPolicy ();
-			result.rules = new List<NameConventionRule> (rules.Select (r => r.Clone ())).ToArray ();
-			return result;
-		}
-
-		public NameConventionPolicy ()
-		{
-			rules = new List<NameConventionRule> (DefaultRules.GetFdgRules ().Select (r => new NameConventionRule (r))).ToArray ();
-		}
-
-		class NamingConventionService : ICSharpCode.NRefactory.CSharp.Refactoring.NamingConventionService
-		{
-			NameConventionPolicy policy;
-			ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule[] rules = null;
-			public override IEnumerable<ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule> Rules {
-				get {
-					if (rules == null) {
-						this.rules = policy.Rules.Select (r => r.GetNRefactoryRule ()).ToArray ();
-					}
-					return rules;
-				}
-			}
-
-			public NamingConventionService (MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPolicy policy)
-			{
-				this.policy = policy;
-			}
-			
-		}
-
-		public ICSharpCode.NRefactory.CSharp.Refactoring.NamingConventionService CreateNRefactoryService ()
-		{
-			return new NamingConventionService (this);
-		}
-
-		#region IEquatable implementation
-		public bool Equals (NameConventionPolicy other)
-		{
-			if (Rules.Length != other.Rules.Length) 
-				return false;
-			for (int i = 0; i < rules.Length; i++) {
-				if (!rules [i].Equals (other.Rules[i]))
-					return false;
-			}
-			return true;
-		}
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionRule.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionRule.cs
deleted file mode 100644
index 358b505fcd..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionRule.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// 
-// NamingRule.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Text;
-using MonoDevelop.Projects.Policies;
-using MonoDevelop.Core.Serialization;
-
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	[DataItem ("NamingRule")]
-	public class NameConventionRule
-	{
-		ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule wrappedRule = new ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule (ICSharpCode.NRefactory.CSharp.Refactoring.AffectedEntity.None);
-
-		[ItemProperty]
-		public string Name {
-			get { return wrappedRule.Name; } 
-			set { wrappedRule.Name = value;} 
-		}
-		
-		[ItemProperty]
-		public string[] RequiredPrefixes {
-			get { return wrappedRule.RequiredPrefixes; } 
-			set { wrappedRule.RequiredPrefixes = value;} 
-		}
-		
-		[ItemProperty]
-		public string[] AllowedPrefixes {
-			get { return wrappedRule.AllowedPrefixes; } 
-			set { wrappedRule.AllowedPrefixes = value;} 
-		}
-		
-		[ItemProperty]
-		public string[] RequiredSuffixes {
-			get { return wrappedRule.RequiredSuffixes; } 
-			set { wrappedRule.RequiredSuffixes = value;} 
-		}
-
-		[ItemProperty]
-		public string[] ForbiddenPrefixes {
-			get { return wrappedRule.ForbiddenPrefixes; } 
-			set { wrappedRule.ForbiddenPrefixes = value;} 
-		}
-
-		[ItemProperty]
-		public string[] ForbiddenSuffixes {
-			get { return wrappedRule.ForbiddenSuffixes; } 
-			set { wrappedRule.ForbiddenSuffixes = value;} 
-		}
-
-		[ItemProperty]
-		public ICSharpCode.NRefactory.CSharp.Refactoring.AffectedEntity AffectedEntity {
-			get { return wrappedRule.AffectedEntity; } 
-			set { wrappedRule.AffectedEntity = value;} 
-		}
-
-		[ItemProperty]
-		public ICSharpCode.NRefactory.CSharp.Modifiers VisibilityMask {
-			get { return wrappedRule.VisibilityMask; } 
-			set { wrappedRule.VisibilityMask = value;} 
-		}
-
-		[ItemProperty]
-		public ICSharpCode.NRefactory.CSharp.Refactoring.NamingStyle NamingStyle {
-			get { return wrappedRule.NamingStyle; } 
-			set { wrappedRule.NamingStyle = value;} 
-		}
-
-		[ItemProperty]
-		public bool IncludeInstanceMembers {
-			get { return wrappedRule.IncludeInstanceMembers; } 
-			set { wrappedRule.IncludeInstanceMembers = value;} 
-		}
-
-		[ItemProperty]
-		public bool IncludeStaticEntities {
-			get { return wrappedRule.IncludeStaticEntities; } 
-			set { wrappedRule.IncludeStaticEntities = value;} 
-		}
-
-		internal NameConventionRule (ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule wrappedRule)
-		{
-			this.wrappedRule = wrappedRule;
-		}
-		
-		public NameConventionRule ()
-		{
-		}
-
-		public NameConventionRule Clone ()
-		{
-			return new NameConventionRule () {
-				wrappedRule = this.wrappedRule.Clone ()
-			};
-		}
-
-		public string GetPreview ()
-		{
-			return wrappedRule.GetPreview ();
-		}
-
-		internal ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule GetNRefactoryRule ()
-		{
-			return wrappedRule;
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerationService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerationService.cs
index 18cb6df5f9..a28f8a3750 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerationService.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerationService.cs
@@ -1,62 +1,62 @@
+////
+//// CSharpCodeGenerationService.cs
+////
+//// Author:
+////       Mike Krüger <mkrueger@xamarin.com>
+////
+//// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+////
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+////
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+////
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//using System;
+//using ICSharpCode.NRefactory.CSharp;
+//using ICSharpCode.NRefactory.TypeSystem;
+//using ICSharpCode.NRefactory.CSharp.Refactoring;
+//using System.Linq;
+//using Atk;
+//using Gdk;
 //
-// CSharpCodeGenerationService.cs
+//namespace MonoDevelop.CSharp.Refactoring
+//{
+//	public class CSharpCodeGenerationService : DefaultCodeGenerationService
+//	{
+//		public override EntityDeclaration GenerateMemberImplementation (RefactoringContext context, IMember member, bool explicitImplementation)
+//		{
+//			var result = base.GenerateMemberImplementation (context, member, explicitImplementation);
+//			if (CSharpCodeGenerator.IsMonoTouchModelMember (member)) {
+//				var m = result as MethodDeclaration;
+//				if (m != null) {
+//					for (int i = CSharpCodeGenerator.MonoTouchComments.Length - 1; i >= 0; i--) {
+//						m.Body.InsertChildBefore (m.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
+//					}
+//				}
 //
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using System.Linq;
-using Atk;
-using Gdk;
-
-namespace MonoDevelop.CSharp.Refactoring
-{
-	public class CSharpCodeGenerationService : DefaultCodeGenerationService
-	{
-		public override EntityDeclaration GenerateMemberImplementation (RefactoringContext context, IMember member, bool explicitImplementation)
-		{
-			var result = base.GenerateMemberImplementation (context, member, explicitImplementation);
-			if (CSharpCodeGenerator.IsMonoTouchModelMember (member)) {
-				var m = result as MethodDeclaration;
-				if (m != null) {
-					for (int i = CSharpCodeGenerator.MonoTouchComments.Length - 1; i >= 0; i--) {
-						m.Body.InsertChildBefore (m.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
-					}
-				}
-
-				var p = result as PropertyDeclaration;
-				if (p != null) {
-					for (int i = CSharpCodeGenerator.MonoTouchComments.Length - 1; i >= 0; i--) {
-						if (!p.Getter.IsNull)
-							p.Getter.Body.InsertChildBefore (p.Getter.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
-						if (!p.Setter.IsNull)
-							p.Setter.Body.InsertChildBefore (p.Setter.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
-					}
-				}
-			}
-			return result;
-		}
-	}
-}
+//				var p = result as PropertyDeclaration;
+//				if (p != null) {
+//					for (int i = CSharpCodeGenerator.MonoTouchComments.Length - 1; i >= 0; i--) {
+//						if (!p.Getter.IsNull)
+//							p.Getter.Body.InsertChildBefore (p.Getter.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
+//						if (!p.Setter.IsNull)
+//							p.Setter.Body.InsertChildBefore (p.Setter.Body.Statements.First (), new Comment (CSharpCodeGenerator.MonoTouchComments [i]), Roles.Comment);
+//					}
+//				}
+//			}
+//			return result;
+//		}
+//	}
+//}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
index 5f6cd6b4f5..c1bff90270 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
@@ -1,5 +1,5 @@
 // 
-// CSharpCodecs
+// CSharpCodeGenerator.cs
 //  
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
@@ -23,85 +23,106 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+
 using System;
-using ICSharpCode.NRefactory.CSharp;
-using System.Text;
-using MonoDevelop.CSharp.Formatting;
-using System.Collections.Generic;
 using System.Linq;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
+using Microsoft.CodeAnalysis;
+using System.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide;
+using System.Collections.Generic;
+using MonoDevelop.CSharp.Formatting;
+using Microsoft.CodeAnalysis.Options;
+using MonoDevelop.CSharp.Completion;
+using System.Threading;
 using ICSharpCode.NRefactory;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using MonoDevelop.Projects.Policies;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-using ICSharpCode.Decompiler;
-using ICSharpCode.Decompiler.Ast;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-
 
 namespace MonoDevelop.CSharp.Refactoring
 {
 	class CSharpCodeGenerator : CodeGenerator
 	{
-		static CSharpAmbience ambience = new CSharpAmbience ();
-		
-		CSharpFormattingPolicy policy;
-		
-		public MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy Policy {
-			get {
-				if (policy == null) {
-					var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
-					if (PolicyParent != null)
-						policy = PolicyParent.Get<CSharpFormattingPolicy> (types);
-					if (policy == null) {
-						
-						policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types);
-					}
-				}
-				return this.policy;
-			}
-		}
-		
-		public override PolicyContainer PolicyParent {
-			get {
-				return base.PolicyParent;
-			}
-			set {
-				base.PolicyParent = value;
-				var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
-				policy = value.Get<CSharpFormattingPolicy> (types);
-			}
-		}
-		
-		
+		//		static CSharpAmbience ambience = new CSharpAmbience ();
+		//		
+		//		CSharpFormattingPolicy policy;
+		//		
+		//		public MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy Policy {
+		//			get {
+		//				if (policy == null) {
+		//					var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+		//					if (PolicyParent != null)
+		//						policy = PolicyParent.Get<CSharpFormattingPolicy> (types);
+		//					if (policy == null) {
+		//						
+		//						policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<CSharpFormattingPolicy> (types);
+		//					}
+		//				}
+		//				return this.policy;
+		//			}
+		//		}
+		//		
+		//		public override PolicyContainer PolicyParent {
+		//			get {
+		//				return base.PolicyParent;
+		//			}
+		//			set {
+		//				base.PolicyParent = value;
+		//				var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+		//				policy = value.Get<CSharpFormattingPolicy> (types);
+		//			}
+		//		}
+		//		
+		//		
 		class CodeGenerationOptions
 		{
 			public bool ExplicitDeclaration { get; set; }
-			public ITypeDefinition ImplementingType { get; set; }
-			public IUnresolvedTypeDefinition Part { get; set; }
+			public ITypeSymbol ImplementingType { get; set; }
+			public Location Part { get; set; }
+
+			public TextEditor Editor { get; set; }
+			public DocumentContext DocumentContext { get; set; }
+
+			public bool CreateProtocolMember { get; set; }
+
+			SemanticModel semanticModel;
+			public SemanticModel SemanticModel {
+				get {
+					if (semanticModel == null) {
+						var model = DocumentContext.ParsedDocument.GetAst<SemanticModel> ();
+						return model;
+					}
+					return semanticModel;
+				}
 
-			public MonoDevelop.Ide.Gui.Document Document { get; set; }
+				set {
+					semanticModel = value;
+				}
+			}
 
-			public string GetShortType (string ns, string name, int typeArguments = 0)
+			public string GetShortType(string ns, string name, int typeArguments = 0)
 			{
-				if (Document == null || Document.ParsedDocument == null)
+				if (DocumentContext == null || Editor == null || SemanticModel == null || DocumentContext.ParsedDocument == null)
 					return ns + "." + name;
-				var typeDef = new GetClassTypeReference (ns, name, typeArguments).Resolve (Document.Compilation.TypeResolveContext);
-				if (typeDef == null)
+
+				var model = DocumentContext.ParsedDocument.GetAst<SemanticModel>();
+
+				if (model == null)
+					return ns + "." + name;
+
+				var type = model.Compilation.GetTypeByMetadataName(ns + "." + name);
+				if (type == null)
 					return ns + "." + name;
-				var file = Document.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-				var csResolver = file.GetResolver (Document.Compilation, Document.Editor.Caret.Location);
-				var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
-				return OutputNode (Document, builder.ConvertType (typeDef));
+
+
+				return RoslynCompletionData.SafeMinimalDisplayString (type, model, Editor.CaretOffset, Ambience.LabelFormat);
 			}
 		}
-		
+
+		static void AppendLine(StringBuilder sb)
+		{
+			sb.AppendLine();
+		}
+
 		public override string WrapInRegions (string regionName, string text)
 		{
 			StringBuilder result = new StringBuilder ();
@@ -116,265 +137,305 @@ namespace MonoDevelop.CSharp.Refactoring
 			return result.ToString ();
 		}
 
-		void AppendObsoleteAttribute (StringBuilder result, CodeGenerationOptions options, IEntity entity)
+		static void AppendObsoleteAttribute(StringBuilder result, CodeGenerationOptions options, ISymbol entity)
 		{
-			string reason;
-			if (!entity.IsObsolete (out reason))
-				return;
-
-			var implementingType = options.Part;
-			var loc = implementingType.Region.End;
-			
-			var pf = implementingType.UnresolvedFile;
-			var file = pf as CSharpUnresolvedFile;
-
-			result.Append ("[");
-			var obsoleteRef = ReflectionHelper.ParseReflectionName ("System.ObsoleteAttribute");
-			var resolvedType = obsoleteRef.Resolve (options.ImplementingType.Compilation);
-			var shortType = resolvedType.Kind != TypeKind.Unknown ? CreateShortType (options.ImplementingType.Compilation, file, loc, resolvedType) : null;
-			var text = shortType != null ? shortType.ToString () : "System.Obsolete";
-			if (text.EndsWith ("Attribute", StringComparison.Ordinal))
-				text = text.Substring (0, text.Length - "Attribute".Length);
-			result.Append (text);
-			if (!string.IsNullOrEmpty (reason)) {
-				result.Append (" (\"");
-				result.Append (reason);
-				result.Append ("\")");
-			}
-			result.Append ("]");
-			result.AppendLine ();
+			// TODO: Roslyn port
+			//			string reason;
+			//			if (!entity.IsObsolete (out reason))
+			//				return;
+			//
+			//			var implementingType = options.Part;
+			//			var loc = implementingType.Region.End;
+			//			
+			//			var pf = implementingType.UnresolvedFile;
+			//			var file = pf as CSharpUnresolvedFile;
+			//
+			//			result.Append ("[");
+			//			var obsoleteRef = ReflectionHelper.ParseReflectionName ("System.ObsoleteAttribute");
+			//			var resolvedType = obsoleteRef.Resolve (options.ImplementingType.Compilation);
+			//			var shortType = resolvedType.Kind != TypeKind.Unknown ? CreateShortType (options.ImplementingType.Compilation, file, loc, resolvedType) : null;
+			//			var text = shortType != null ? shortType.ToString () : "System.Obsolete";
+			//			if (text.EndsWith ("Attribute", StringComparison.Ordinal))
+			//				text = text.Substring (0, text.Length - "Attribute".Length);
+			//			result.Append (text);
+			//			if (!string.IsNullOrEmpty (reason)) {
+			//				result.Append (" (\"");
+			//				result.Append (reason);
+			//				result.Append ("\")");
+			//			}
+			//			result.Append ("]");
+			//			result.AppendLine ();
 		}
-		
-		public override CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType,
-		                                                                      IUnresolvedTypeDefinition part,
-		                                                                      IUnresolvedMember member,
-		                                                                      bool explicitDeclaration)
+		//		
+		//		public override CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType,
+		//		                                                                      IUnresolvedTypeDefinition part,
+		//		                                                                      IUnresolvedMember member,
+		//		                                                                      bool explicitDeclaration)
+		//		{
+		//			SetIndentTo (part);
+		//			var options = new CodeGenerationOptions () {
+		//				ExplicitDeclaration = explicitDeclaration,
+		//				ImplementingType = implementingType,
+		//				Part = part
+		//			};
+		//			ITypeResolveContext ctx;
+		//
+		//			var doc = IdeApp.Workbench.GetDocument (part.Region.FileName);
+		//			ctx = new CSharpTypeResolveContext (implementingType.Compilation.MainAssembly, null, implementingType, null);
+		//			options.Document = doc;
+		//
+		//			if (member is IUnresolvedMethod)
+		//				return GenerateCode ((IMethod) ((IUnresolvedMethod)member).CreateResolved (ctx), options);
+		//			if (member is IUnresolvedProperty)
+		//				return GenerateCode ((IProperty) ((IUnresolvedProperty)member).CreateResolved (ctx), options);
+		//			if (member is IUnresolvedField)
+		//				return GenerateCode ((IField) ((IUnresolvedField)member).CreateResolved (ctx), options);
+		//			if (member is IUnresolvedEvent)
+		//				return GenerateCode ((IEvent) ((IUnresolvedEvent)member).CreateResolved (ctx), options);
+		//			throw new NotSupportedException ("member " +  member + " is not supported.");
+		//		}
+
+		public static CodeGeneratorMemberResult CreateOverridenMemberImplementation(DocumentContext document, TextEditor editor, ITypeSymbol implementingType, Location part, ISymbol member, bool explicitDeclaration, SemanticModel model)
 		{
-			SetIndentTo (part);
-			var options = new CodeGenerationOptions () {
+			var options = new CodeGenerationOptions {
 				ExplicitDeclaration = explicitDeclaration,
 				ImplementingType = implementingType,
-				Part = part
+				Part = part,
+				DocumentContext = document,
+				Editor = editor,
+				SemanticModel = model
 			};
-			ITypeResolveContext ctx;
-
-			var doc = IdeApp.Workbench.GetDocument (part.Region.FileName);
-			ctx = new CSharpTypeResolveContext (implementingType.Compilation.MainAssembly, null, implementingType, null);
-			options.Document = doc;
-
-			if (member is IUnresolvedMethod)
-				return GenerateCode ((IMethod) ((IUnresolvedMethod)member).CreateResolved (ctx), options);
-			if (member is IUnresolvedProperty)
-				return GenerateCode ((IProperty) ((IUnresolvedProperty)member).CreateResolved (ctx), options);
-			if (member is IUnresolvedField)
-				return GenerateCode ((IField) ((IUnresolvedField)member).CreateResolved (ctx), options);
-			if (member is IUnresolvedEvent)
-				return GenerateCode ((IEvent) ((IUnresolvedEvent)member).CreateResolved (ctx), options);
-			throw new NotSupportedException ("member " +  member + " is not supported.");
+
+			if (member is IMethodSymbol)
+				return GenerateCode ((IMethodSymbol)member, options);
+			if (member is IPropertySymbol)
+				return GenerateCode ((IPropertySymbol)member, options);
+			if (member is IFieldSymbol)
+				return GenerateCode ((IFieldSymbol)member, options);
+			if (member is IEventSymbol)
+				return GenerateCode ((IEventSymbol)member, options);
+			throw new NotSupportedException("member " + member + " is not supported.");
 		}
-		
-		public override CodeGeneratorMemberResult CreateMemberImplementation (ITypeDefinition implementingType,
-		                                                                      IUnresolvedTypeDefinition part,
-		                                                                      IMember member,
-		                                                                      bool explicitDeclaration)
+
+		public static CodeGeneratorMemberResult CreateProtocolMemberImplementation(DocumentContext document, TextEditor editor, ITypeSymbol implementingType, Location part, ISymbol member, bool explicitDeclaration, SemanticModel model)
 		{
-			SetIndentTo (part);
-			var options = new CodeGenerationOptions () {
+			//			SetIndentTo (part);
+			var options = new CodeGenerationOptions {
 				ExplicitDeclaration = explicitDeclaration,
 				ImplementingType = implementingType,
 				Part = part,
-				Document = IdeApp.Workbench.GetDocument (part.Region.FileName)
+				DocumentContext = document,
+				Editor = editor,
+				CreateProtocolMember = true,
+				SemanticModel = model
 			};
-			if (member is IMethod)
-				return GenerateCode ((IMethod)member, options);
-			if (member is IProperty)
-				return GenerateCode ((IProperty)member, options);
-			if (member is IField)
-				return GenerateCode ((IField)member, options);
-			if (member is IEvent)
-				return GenerateCode ((IEvent)member, options);
-			throw new NotSupportedException ("member " +  member + " is not supported.");
-		}
-		
-		void AppendBraceStart (StringBuilder result, BraceStyle braceStyle)
-		{
-			switch (braceStyle) {
-			case BraceStyle.BannerStyle:
-			case BraceStyle.EndOfLine:
-				result.Append (" {");
-				AppendLine (result);
-				break;
-			case BraceStyle.EndOfLineWithoutSpace:
-				result.Append ("{");
-				AppendLine (result);
-				break;
-			case BraceStyle.NextLine:
-				AppendLine (result);
-				AppendIndent (result);
-				result.Append ("{");
-				AppendLine (result);
-				break;
-			case BraceStyle.NextLineShifted:
-				AppendLine (result);
-				result.Append (GetIndent (IndentLevel + 1));
-				result.Append ("{");
-				AppendLine (result);
-				break;
-			case BraceStyle.NextLineShifted2:
-				AppendLine (result);
-				result.Append (GetIndent (IndentLevel + 1));
-				result.Append ("{");
-				AppendLine (result);
-				IndentLevel++;
-				break;
-			default:
-				goto case BraceStyle.NextLine;
-			}
-			IndentLevel++;
-		}
-		
-		void AppendBraceEnd (StringBuilder result, BraceStyle braceStyle)
-		{
-			switch (braceStyle) {
-			case BraceStyle.EndOfLineWithoutSpace:
-			case BraceStyle.NextLine:
-			case BraceStyle.EndOfLine:
-				IndentLevel --;
-				AppendIndent (result);
-				result.Append ("}");
-				break;
-			case BraceStyle.BannerStyle:
-			case BraceStyle.NextLineShifted:
-				AppendIndent (result);
-				result.Append ("}");
-				IndentLevel--;
-				break;
-			case BraceStyle.NextLineShifted2:
-				IndentLevel--;
-				AppendIndent (result);
-				result.Append ("}");
-				IndentLevel--;
-				break;
-			default:
-				goto case BraceStyle.NextLine;
-			}
+
+			if (member is IMethodSymbol)
+				return GenerateProtocolCode ((IMethodSymbol)member, options);
+			if (member is IPropertySymbol)
+				return GenerateCode ((IPropertySymbol)member, options);
+			if (member is IFieldSymbol)
+				return GenerateCode ((IFieldSymbol)member, options);
+			if (member is IEventSymbol)
+				return GenerateCode ((IEventSymbol)member, options);
+			throw new NotSupportedException("member " + member + " is not supported.");
 		}
-		
-		void AppendIndent (StringBuilder result)
+
+		public static CodeGeneratorMemberResult CreatePartialMemberImplementation(DocumentContext document, TextEditor editor, ITypeSymbol implementingType, Location part, ISymbol member, bool explicitDeclaration, SemanticModel model)
 		{
-			result.Append (GetIndent (IndentLevel));
+			var options = new CodeGenerationOptions {
+				ExplicitDeclaration = explicitDeclaration,
+				ImplementingType = implementingType,
+				Part = part,
+				DocumentContext = document,
+				Editor = editor,
+				SemanticModel = model
+			};
+
+			if (member is IMethodSymbol)
+				return GeneratePartialCode ((IMethodSymbol)member, options);
+			throw new NotSupportedException("member " + member + " is not supported.");
 		}
-		
-		void AppendReturnType (StringBuilder result, CodeGenerationOptions options, IType type)
+		//
+		//		void AppendBraceStart (StringBuilder result, BraceStyle braceStyle)
+		//		{
+		//			switch (braceStyle) {
+		//			case BraceStyle.BannerStyle:
+		//			case BraceStyle.EndOfLine:
+		//				result.Append (" {");
+		//				AppendLine (result);
+		//				break;
+		//			case BraceStyle.EndOfLineWithoutSpace:
+		//				result.Append ("{");
+		//				AppendLine (result);
+		//				break;
+		//			case BraceStyle.NextLine:
+		//				AppendLine (result);
+		//				AppendIndent (result);
+		//				result.Append ("{");
+		//				AppendLine (result);
+		//				break;
+		//			case BraceStyle.NextLineShifted:
+		//				AppendLine (result);
+		//				result.Append (GetIndent (IndentLevel + 1));
+		//				result.Append ("{");
+		//				AppendLine (result);
+		//				break;
+		//			case BraceStyle.NextLineShifted2:
+		//				AppendLine (result);
+		//				result.Append (GetIndent (IndentLevel + 1));
+		//				result.Append ("{");
+		//				AppendLine (result);
+		//				IndentLevel++;
+		//				break;
+		//			default:
+		//				goto case BraceStyle.NextLine;
+		//			}
+		//			IndentLevel++;
+		//		}
+		//		
+		//		void AppendBraceEnd (StringBuilder result, BraceStyle braceStyle)
+		//		{
+		//			switch (braceStyle) {
+		//			case BraceStyle.EndOfLineWithoutSpace:
+		//			case BraceStyle.NextLine:
+		//			case BraceStyle.EndOfLine:
+		//				IndentLevel --;
+		//				AppendIndent (result);
+		//				result.Append ("}");
+		//				break;
+		//			case BraceStyle.BannerStyle:
+		//			case BraceStyle.NextLineShifted:
+		//				AppendIndent (result);
+		//				result.Append ("}");
+		//				IndentLevel--;
+		//				break;
+		//			case BraceStyle.NextLineShifted2:
+		//				IndentLevel--;
+		//				AppendIndent (result);
+		//				result.Append ("}");
+		//				IndentLevel--;
+		//				break;
+		//			default:
+		//				goto case BraceStyle.NextLine;
+		//			}
+		//		}
+		//		
+		//		void AppendIndent (StringBuilder result)
+		//		{
+		//			result.Append (GetIndent (IndentLevel));
+		//		}
+		//		
+		static void AppendReturnType(StringBuilder result, CodeGenerationOptions options, ITypeSymbol type)
 		{
 			if (type == null)
-				throw new ArgumentNullException ("type");
-			var implementingType = options.Part;
-			var loc = implementingType.Region.End;
-			
-			var pf = implementingType.UnresolvedFile;
-			var file = pf as CSharpUnresolvedFile;
-			var resolved = type;
-			if (resolved.Kind == TypeKind.Unknown) {
-				result.Append (type.FullName);
-				return;
-			}
-			var def = type.GetDefinition ();
-			if (def != null) {
-				using (var stringWriter = new System.IO.StringWriter ()) {
-					var formatter = new TextWriterTokenWriter (stringWriter);
-					stringWriter.NewLine = EolMarker; 
-					var visitor = new CSharpOutputVisitor (formatter, FormattingOptionsFactory.CreateMono ());
-					var shortType = CreateShortType (def.Compilation, file, loc, resolved);
-					shortType.AcceptVisitor (visitor);
-					
-					var typeString = stringWriter.ToString ();
-					if (typeString.StartsWith ("global::"))
-						typeString = typeString.Substring ("global::".Length);
-					result.Append (typeString);
-				}
-			} else {
-				result.Append (new ICSharpCode.NRefactory.CSharp.CSharpAmbience ().ConvertType (type));
-			}
-		}
-		
-		/*
-		void ResolveReturnTypes ()
-		{
-			returnType = member.ReturnType;
-			foreach (IUsing u in unit.Usings) {
-				foreach (KeyValuePair<string, IReturnType> alias in u.Aliases) {
-					if (alias.Key == member.ReturnType.FullName) {
-						returnType = alias.Value;
-						return;
-					}
-				}
-			}
-		}*/
+				throw new ArgumentNullException("type");
+			result.Append(RoslynCompletionData.SafeMinimalDisplayString (type, options.SemanticModel, options.Part.SourceSpan.Start, Ambience.LabelFormat));
 
-		
-		CodeGeneratorMemberResult GenerateCode (IField field, CodeGenerationOptions options)
+			//			var implementingType = options.Part;
+			//			var loc = implementingType.Region.End;
+			//			
+			//			var pf = implementingType.UnresolvedFile;
+			//			var file = pf as CSharpUnresolvedFile;
+			//			var resolved = type;
+			//			if (resolved.Kind == TypeKind.Unknown) {
+			//				result.Append (type.FullName);
+			//				return;
+			//			}
+			//			var def = type.GetDefinition ();
+			//			if (def != null) {
+			//				using (var stringWriter = new System.IO.StringWriter ()) {
+			//					var formatter = new TextWriterTokenWriter (stringWriter);
+			//					stringWriter.NewLine = EolMarker; 
+			//					var visitor = new CSharpOutputVisitor (formatter, FormattingOptionsFactory.CreateMono ());
+			//					var shortType = CreateShortType (def.Compilation, file, loc, resolved);
+			//					shortType.AcceptVisitor (visitor);
+			//					
+			//					var typeString = stringWriter.ToString ();
+			//					if (typeString.StartsWith ("global::"))
+			//						typeString = typeString.Substring ("global::".Length);
+			//					result.Append (typeString);
+			//				}
+			//			} else {
+			//				result.Append (new ICSharpCode.NRefactory.CSharp.CSharpAmbience ().ConvertType (type));
+			//			}
+		}
+		//		
+		//		/*
+		//		void ResolveReturnTypes ()
+		//		{
+		//			returnType = member.ReturnType;
+		//			foreach (IUsing u in unit.Usings) {
+		//				foreach (KeyValuePair<string, IReturnType> alias in u.Aliases) {
+		//					if (alias.Key == member.ReturnType.FullName) {
+		//						returnType = alias.Value;
+		//						return;
+		//					}
+		//				}
+		//			}
+		//		}*/
+		//
+		//		
+		static CodeGeneratorMemberResult GenerateCode (IFieldSymbol field, CodeGenerationOptions options)
 		{
 			StringBuilder result = new StringBuilder ();
 			AppendIndent (result);
 			AppendModifiers (result, options, field);
 			result.Append (" ");
-			AppendReturnType (result, options, field.ReturnType);
+			AppendReturnType (result, options, field.Type);
 			result.Append (" ");
 			result.Append (CSharpAmbience.FilterName (field.Name));
 			result.Append (";");
 			return new CodeGeneratorMemberResult (result.ToString (), -1, -1);
 		}
-		
-		CodeGeneratorMemberResult GenerateCode (IEvent evt, CodeGenerationOptions options)
+
+		static void AppendIndent (StringBuilder result)
+		{
+
+		}
+
+		static CodeGeneratorMemberResult GenerateCode (IEventSymbol evt, CodeGenerationOptions options)
 		{
 			StringBuilder result = new StringBuilder ();
 			AppendObsoleteAttribute (result, options, evt);
 			AppendModifiers (result, options, evt);
-			
+
 			result.Append ("event ");
-			AppendReturnType (result, options, evt.ReturnType);
+			AppendReturnType (result, options, evt.Type);
 			result.Append (" ");
 			if (options.ExplicitDeclaration) {
-				result.Append (ambience.GetString (evt.DeclaringTypeDefinition, OutputFlags.IncludeGenerics));
+				AppendReturnType (result, options, evt.ContainingType);
 				result.Append (".");
 			}
+
 			result.Append (CSharpAmbience.FilterName (evt.Name));
 			if (options.ExplicitDeclaration) {
-				AppendBraceStart (result, Policy.EventBraceStyle);
+				result.Append ("{");
 				AppendIndent (result);
-				result.Append ("add");
-				AppendBraceStart (result, Policy.EventAddBraceStyle);
+				result.Append ("add {");
 				AppendIndent (result);
 				result.Append ("// TODO");
 				AppendLine (result);
-				AppendBraceEnd (result, Policy.EventAddBraceStyle);
-				
+				result.Append ("}");
+
 				AppendIndent (result);
-				result.Append ("remove");
-				AppendBraceStart (result, Policy.EventRemoveBraceStyle);
+				result.Append ("remove {");
 				AppendIndent (result);
 				result.Append ("// TODO");
 				AppendLine (result);
-				
-				AppendBraceEnd (result, Policy.EventRemoveBraceStyle);
-				AppendBraceEnd (result, Policy.EventBraceStyle);
+				result.Append ("}}");
 			} else {
 				result.Append (";");
 			}
 			return new CodeGeneratorMemberResult (result.ToString ());
 		}
-		
-		void AppendNotImplementedException (StringBuilder result, CodeGenerationOptions options,
-		                                           out int bodyStartOffset, out int bodyEndOffset)
+
+		static void AppendNotImplementedException (StringBuilder result, CodeGenerationOptions options, out int bodyStartOffset, out int bodyEndOffset)
 		{
 			AppendIndent (result);
 			bodyStartOffset = result.Length;
 			result.Append ("throw new ");
 			result.Append (options.GetShortType ("System", "NotImplementedException"));
-			//			AppendReturnType (result, options.ImplementingType, options.Ctx.GetTypeDefinition (typeof (System.NotImplementedException)));
-			if (Policy.BeforeMethodCallParentheses)
-				result.Append (" ");
 			result.Append ("();");
 			bodyEndOffset = result.Length;
 			AppendLine (result);
@@ -385,131 +446,124 @@ namespace MonoDevelop.CSharp.Refactoring
 			" see http://docs.xamarin.com/guides/ios/application_fundamentals/delegates,_protocols,_and_events"
 		};
 
-		void AppendMonoTouchTodo (StringBuilder result, CodeGenerationOptions options, out int bodyStartOffset, out int bodyEndOffset)
+		static void AppendMonoTouchTodo(StringBuilder result, CodeGenerationOptions options, out int bodyStartOffset, out int bodyEndOffset)
 		{
 			AppendIndent (result);
 			bodyStartOffset = result.Length;
 			foreach (var cmt in MonoTouchComments) {
-				result.AppendLine ("//" + cmt);
+				result.AppendLine("//" + cmt);
 				AppendIndent (result);
 			}
-			result.Append ("throw new ");
-			result.Append (options.GetShortType ("System", "NotImplementedException"));
-
-			if (Policy.BeforeMethodCallParentheses)
-				result.Append (" ");
-			result.Append ("();");
+			result.Append("throw new ");
+			result.Append(options.GetShortType("System", "NotImplementedException"));
+			result.Append("();");
 
 			bodyEndOffset = result.Length;
 			AppendLine (result);
 		}
-		
-		CodeGeneratorMemberResult GenerateCode (IMethod method, CodeGenerationOptions options)
+
+		static CodeGeneratorMemberResult GenerateCode(IMethodSymbol method, CodeGenerationOptions options)
 		{
 			int bodyStartOffset = -1, bodyEndOffset = -1;
-			StringBuilder result = new StringBuilder ();
+			var result = new StringBuilder();
 			AppendObsoleteAttribute (result, options, method);
 			AppendModifiers (result, options, method);
-			if (method.IsPartial)
-				result.Append ("partial ");
+			//			if (method.IsPartial)
+			//				result.Append ("partial ");
 			AppendReturnType (result, options, method.ReturnType);
 			result.Append (" ");
 			if (options.ExplicitDeclaration) {
-				AppendReturnType (result, options, method.DeclaringType);
-				result.Append (".");
+				AppendReturnType (result, options, method.ContainingType);
+				result.Append(".");
 			}
 
-			result.Append (CSharpAmbience.FilterName (method.Name));
-			if (method.TypeParameters.Count > 0) {
-				result.Append ("<");
-				for (int i = 0; i < method.TypeParameters.Count; i++) {
+			result.Append(CSharpAmbience.FilterName(method.Name));
+			if (method.TypeParameters.Length > 0) {
+				result.Append("<");
+				for (int i = 0; i < method.TypeParameters.Length; i++) {
 					if (i > 0)
-						result.Append (", ");
-					var p = method.TypeParameters [i];
-					result.Append (CSharpAmbience.FilterName (p.Name));
+						result.Append(", ");
+					var p = method.TypeParameters[i];
+					result.Append(CSharpAmbience.FilterName(p.Name));
 				}
-				result.Append (">");
+				result.Append(">");
 			}
-			if (Policy.BeforeMethodDeclarationParentheses)
-				result.Append (" ");
-			result.Append ("(");
-			AppendParameterList (result, options, method.Parameters);
-			result.Append (")");
-			
+			result.Append("(");
+			AppendParameterList (result, options, method.Parameters, true);
+			result.Append(")");
+
 			var typeParameters = method.TypeParameters;
-			
-			// This should also check the types are in the correct mscorlib
-			Func<IType, bool> validBaseType = t => t.FullName != "System.Object" && t.FullName != "System.ValueType";
 
-			bool isFromInterface = method.DeclaringType != null && method.DeclaringTypeDefinition.Kind == TypeKind.Interface;
+			//			// This should also check the types are in the correct mscorlib
+			//			Func<IType, bool> validBaseType = t => t.FullName != "System.Object" && t.FullName != "System.ValueType";
+			//
+			//			bool isFromInterface = method.DeclaringType != null && method.DeclaringTypeDefinition.Kind == TypeKind.Interface;
+			//
+			//			if (!options.ExplicitDeclaration && isFromInterface && typeParameters.Any (p => p.HasDefaultConstructorConstraint || p.HasReferenceTypeConstraint || p.HasValueTypeConstraint || p.DirectBaseTypes.Any (validBaseType))) {
+			//				result.Append (" where ");
+			//				int typeParameterCount = 0;
+			//				foreach (var p in typeParameters) {
+			//					if (typeParameterCount != 0)
+			//						result.Append (", ");
+			//					
+			//					typeParameterCount++;
+			//					result.Append (CSharpAmbience.FilterName (p.Name));
+			//					result.Append (" : ");
+			//					int constraintCount = 0;
+			//					
+			//					if (p.HasDefaultConstructorConstraint) {
+			//						result.Append ("new ()");
+			//						constraintCount++;
+			//					}
+			//					
+			//					if (p.HasValueTypeConstraint) {
+			//						if (constraintCount != 0)
+			//							result.Append (", ");
+			//						result.Append ("struct");
+			//						constraintCount++;
+			//					}
+			//					
+			//					if (p.HasReferenceTypeConstraint) {
+			//						if (constraintCount != 0)
+			//							result.Append (", ");
+			//						result.Append ("class");
+			//						constraintCount++;
+			//					}
+			//					//					bool hadInterfaces = false;
+			//					foreach (var c in p.DirectBaseTypes.Where (validBaseType)) {
+			//						if (constraintCount != 0)
+			//							result.Append (", ");
+			//						constraintCount++;
+			//						AppendReturnType (result, options, c);
+			//						//						if (c.Kind == TypeKind.Interface)
+			//						//							hadInterfaces = true;
+			//					}
+			//				}
+			//			}
 
-			if (!options.ExplicitDeclaration && isFromInterface && typeParameters.Any (p => p.HasDefaultConstructorConstraint || p.HasReferenceTypeConstraint || p.HasValueTypeConstraint || p.DirectBaseTypes.Any (validBaseType))) {
-				result.Append (" where ");
-				int typeParameterCount = 0;
-				foreach (var p in typeParameters) {
-					if (typeParameterCount != 0)
-						result.Append (", ");
-					
-					typeParameterCount++;
-					result.Append (CSharpAmbience.FilterName (p.Name));
-					result.Append (" : ");
-					int constraintCount = 0;
-					
-					if (p.HasDefaultConstructorConstraint) {
-						result.Append ("new ()");
-						constraintCount++;
-					}
-					
-					if (p.HasValueTypeConstraint) {
-						if (constraintCount != 0)
-							result.Append (", ");
-						result.Append ("struct");
-						constraintCount++;
-					}
-					
-					if (p.HasReferenceTypeConstraint) {
-						if (constraintCount != 0)
-							result.Append (", ");
-						result.Append ("class");
-						constraintCount++;
-					}
-					//					bool hadInterfaces = false;
-					foreach (var c in p.DirectBaseTypes.Where (validBaseType)) {
-						if (constraintCount != 0)
-							result.Append (", ");
-						constraintCount++;
-						AppendReturnType (result, options, c);
-						//						if (c.Kind == TypeKind.Interface)
-						//							hadInterfaces = true;
-					}
-				}
-			}
-			
-			if (options.ImplementingType.Kind == TypeKind.Interface) {
+			if (options.ImplementingType.TypeKind == TypeKind.Interface) {
 				result.Append (";");
 			} else {
-				AppendBraceStart (result, Policy.MethodBraceStyle);
-				if (method.Name == "ToString" && (method.Parameters == null || method.Parameters.Count == 0) && method.ReturnType != null/* && method.ReturnType.FullName == "System.String"*/) {
+				result.Append ("{");
+				if (method.Name == "ToString" && method.Parameters.Length == 0 && method.ReturnType != null/* && method.ReturnType.FullName == "System.String"*/) {
 					AppendIndent (result);
 					bodyStartOffset = result.Length;
 					result.Append ("return string.Format");
-					if (Policy.BeforeMethodDeclarationParentheses)
-						result.Append (" ");
 					result.Append ("(\"[");
 					result.Append (options.ImplementingType.Name);
-					if (options.ImplementingType.Properties.Any ()) 
+					if (options.ImplementingType.GetMembers ().OfType<IPropertySymbol> ().Any ())
 						result.Append (": ");
 					int i = 0;
-					var properties = new List<IProperty> ();
+					var properties = new List<IPropertySymbol> ();
 
-					foreach (IProperty property in options.ImplementingType.Properties) {
+					foreach (var property in options.ImplementingType.GetMembers ().OfType<IPropertySymbol> ()) {
 						if (properties.Any (p => p.Name == property.Name))
 							continue;
-						properties.Add (property); 
+						properties.Add (property);
 					}
 
-					foreach (IProperty property in properties) {
-						if (property.IsStatic || !property.IsPublic)
+					foreach (var property in properties) {
+						if (property.IsStatic || property.DeclaredAccessibility != Accessibility.Public)
 							continue;
 						if (i > 0)
 							result.Append (", ");
@@ -519,8 +573,8 @@ namespace MonoDevelop.CSharp.Refactoring
 						result.Append ("}");
 					}
 					result.Append ("]\"");
-					foreach (IProperty property in properties) {
-						if (property.IsStatic || !property.IsPublic)
+					foreach (var property in properties) {
+						if (property.IsStatic || property.DeclaredAccessibility != Accessibility.Public)
 							continue;
 						result.Append (", ");
 						result.Append (property.Name);
@@ -530,72 +584,60 @@ namespace MonoDevelop.CSharp.Refactoring
 					AppendLine (result);
 				} else if (IsMonoTouchModelMember (method)) {
 					AppendMonoTouchTodo (result, options, out bodyStartOffset, out bodyEndOffset);
-				} else if (method.IsAbstract || !(method.IsVirtual || method.IsOverride) || method.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+				} else if (method.IsAbstract || !(method.IsVirtual || method.IsOverride) || method.ContainingType.TypeKind == TypeKind.Interface) {
 					AppendNotImplementedException (result, options, out bodyStartOffset, out bodyEndOffset);
 				} else {
 					bool skipBody = false;
 					// Analyze if the body consists just of a single throw instruction
 					// See: Bug 1373 - overriding [Model] class methods shouldn't insert base.Methods
 					// TODO: Extend this to user defined code.
-					try {
-						if (method.Region.FileName == null) {
-							var asm = AssemblyDefinition.ReadAssembly (method.ParentAssembly.UnresolvedAssembly.Location);
-							foreach (var type in asm.MainModule.Types) {
-								if (type.FullName != method.DeclaringType.FullName)
-									continue;
-								foreach (var m  in type.Resolve ().Methods) {
-									if (m.HasBody && m.Name == method.Name) {
-										var context = new DecompilerContext (asm.MainModule);
-										
-										context.CurrentType = type;
-				
-										context.Settings = new DecompilerSettings () {
-											AnonymousMethods = true,
-											AutomaticEvents  = true,
-											AutomaticProperties = true,
-											ForEachStatement = true,
-											LockStatement = true
-										};
-				
-										var astBuilder = new AstBuilder (context);
-										astBuilder.AddMethod (m);
-										
-										astBuilder.RunTransformations (o => false);
-
-										var visitor = new ThrowsExceptionVisitor ();
-										astBuilder.SyntaxTree.AcceptVisitor (visitor);
-										skipBody = visitor.Throws;
-										if (skipBody)
-											break;
-									}
-								}
-								if (skipBody)
-									break;
-							}
-						}
-					} catch (Exception) {
-					}
+					//					try {
+					//						if (method.Region.FileName == null) {
+					//							var asm = AssemblyDefinition.ReadAssembly (method.ParentAssembly.UnresolvedAssembly.Location);
+					//							foreach (var type in asm.MainModule.Types) {
+					//								if (type.FullName != method.DeclaringType.FullName)
+					//									continue;
+					//								foreach (var m  in type.Resolve ().Methods) {
+					//									if (m.HasBody && m.Name == method.Name) {
+					//										var context = new DecompilerContext (asm.MainModule);
+					//										
+					//										context.CurrentType = type;
+					//				
+					//										context.Settings = new DecompilerSettings () {
+					//											AnonymousMethods = true,
+					//											AutomaticEvents  = true,
+					//											AutomaticProperties = true,
+					//											ForEachStatement = true,
+					//											LockStatement = true
+					//										};
+					//				
+					//										var astBuilder = new AstBuilder (context);
+					//										astBuilder.AddMethod (m);
+					//										
+					//										astBuilder.RunTransformations (o => false);
+					//
+					//										var visitor = new ThrowsExceptionVisitor ();
+					//										astBuilder.SyntaxTree.AcceptVisitor (visitor);
+					//										skipBody = visitor.Throws;
+					//										if (skipBody)
+					//											break;
+					//									}
+					//								}
+					//								if (skipBody)
+					//									break;
+					//							}
+					//						}
+					//					} catch (Exception) {
+					//					}
 					AppendIndent (result);
 					bodyStartOffset = result.Length;
 					if (!skipBody) {
-						if (method.ReturnType.ReflectionName != typeof(void).FullName)
+						if (method.ReturnType.SpecialType != SpecialType.System_Void)
 							result.Append ("return ");
 						result.Append ("base.");
 						result.Append (CSharpAmbience.FilterName (method.Name));
-						if (Policy.BeforeMethodCallParentheses)
-							result.Append (" ");
 						result.Append ("(");
-						for (int i = 0; i < method.Parameters.Count; i++) {
-							if (i > 0)
-								result.Append (", ");
-							
-							var p = method.Parameters [i];
-							if (p.IsOut)
-								result.Append ("out ");
-							if (p.IsRef)
-								result.Append ("ref ");
-							result.Append (CSharpAmbience.FilterName (p.Name));
-						}
+						AppendParameterList (result, options, method.Parameters, false);
 						result.Append (");");
 					} else {
 						result.Append ("throw new System.NotImplementedException ();");
@@ -603,172 +645,208 @@ namespace MonoDevelop.CSharp.Refactoring
 					bodyEndOffset = result.Length;
 					AppendLine (result);
 				}
-				AppendBraceEnd (result, Policy.MethodBraceStyle);
+				result.Append ("}");
 			}
-			return new CodeGeneratorMemberResult (result.ToString (), bodyStartOffset, bodyEndOffset);
+			return new CodeGeneratorMemberResult(result.ToString (), bodyStartOffset, bodyEndOffset);
 		}
-		
-		class ThrowsExceptionVisitor : DepthFirstAstVisitor
+
+
+		static CodeGeneratorMemberResult GeneratePartialCode(IMethodSymbol method, CodeGenerationOptions options)
 		{
-			public bool Throws = false;
-			
-			public override void VisitBlockStatement (BlockStatement blockStatement)
-			{
-				if (blockStatement.Statements.Count == 1 && blockStatement.Statements.First () is ThrowStatement)
-					Throws = true;
+			int bodyStartOffset = -1, bodyEndOffset = -1;
+			var result = new StringBuilder();
+			AppendObsoleteAttribute (result, options, method);
+			result.Append("partial ");
+			AppendReturnType (result, options, method.ReturnType);
+			result.Append(" ");
+			if (options.ExplicitDeclaration) {
+				AppendReturnType (result, options, method.ContainingType);
+				result.Append(".");
 			}
+
+			result.Append(CSharpAmbience.FilterName(method.Name));
+			if (method.TypeParameters.Length > 0) {
+				result.Append("<");
+				for (int i = 0; i < method.TypeParameters.Length; i++) {
+					if (i > 0)
+						result.Append(", ");
+					var p = method.TypeParameters[i];
+					result.Append(CSharpAmbience.FilterName(p.Name));
+				}
+				result.Append(">");
+			}
+			result.Append("(");
+			AppendParameterList (result, options, method.Parameters, true);
+			result.Append(")");
+
+			var typeParameters = method.TypeParameters;
+			result.AppendLine("{");
+			bodyStartOffset = result.Length;
+			AppendLine (result);
+			bodyEndOffset = result.Length;
+			result.AppendLine("}");
+			return new CodeGeneratorMemberResult(result.ToString(), bodyStartOffset, bodyEndOffset);
 		}
-		
-		void AppendParameterList (StringBuilder result, CodeGenerationOptions options, IList<IParameter> parameters)
+
+		//		class ThrowsExceptionVisitor : DepthFirstAstVisitor
+		//		{
+		//			public bool Throws = false;
+		//			
+		//			public override void VisitBlockStatement (BlockStatement blockStatement)
+		//			{
+		//				if (blockStatement.Statements.Count == 1 && blockStatement.Statements.First () is ThrowStatement)
+		//					Throws = true;
+		//			}
+		//		}
+
+		static void AppendParameterList (StringBuilder result, CodeGenerationOptions options, IList<IParameterSymbol> parameters, bool asParameterList)
 		{
 			for (int i = 0; i < parameters.Count; i++) {
 				if (i > 0)
 					result.Append (", ");
-				
-				var p = parameters[i];
-				if (p.IsOut)
+
+				var p = parameters [i];
+				if (p.RefKind == RefKind.Out)
 					result.Append ("out ");
-				if (p.IsRef)
+				if (p.RefKind == RefKind.Ref)
 					result.Append ("ref ");
-				if (p.IsParams)
-					result.Append ("params ");
-				AppendReturnType (result, options, p.Type);
-				result.Append (" ");
+				if (asParameterList) {
+					if (p.IsParams)
+						result.Append ("params ");
+					AppendReturnType (result, options, p.Type);
+					result.Append (" ");
+				}
 				result.Append (CSharpAmbience.FilterName (p.Name));
-				if (p.ConstantValue != null) {
+				if (asParameterList && p.HasExplicitDefaultValue) {
 					result.Append (" = ");
-					if (p.Type.Kind == TypeKind.Enum) {
-						bool found = false;
-						foreach (var literal in GetEnumLiterals(p.Type)) {
-							if (literal.ConstantValue.Equals (p.ConstantValue)) {
-								AppendReturnType (result, options, p.Type);
-								result.Append ("."+ literal.Name);
-								found = true;
-								break;
-							}
-						}
-						if (!found) {
+					if (p.ExplicitDefaultValue is Enum) {
+						var name = Enum.GetName (p.ExplicitDefaultValue.GetType (), p.ExplicitDefaultValue);
+						if (name != null) {
+							AppendReturnType (result, options, p.Type);
+							result.Append ("." + name);
+						} else {
 							result.Append ("(");
 							AppendReturnType (result, options, p.Type);
-							result.Append (")" + p.ConstantValue); 
+							result.Append (")" + p.ExplicitDefaultValue);
+						}
+					} else if (p.ExplicitDefaultValue is char) {
+						result.Append ("'" + p.ExplicitDefaultValue + "'");
+					} else if (p.ExplicitDefaultValue is string) {
+						result.Append ("\"" + CSharpTextEditorIndentation.ConvertToStringLiteral ((string)p.ExplicitDefaultValue) + "\"");
+					} else if (p.ExplicitDefaultValue is bool) {
+						result.Append ((bool)p.ExplicitDefaultValue ? "true" : "false");
+					} else if (p.ExplicitDefaultValue == null) {
+						if (p.Type.IsValueType && p.Type.SpecialType != SpecialType.System_String) {
+							result.Append ("default(" + p.Type.ToMinimalDisplayString (options.SemanticModel, options.Part.SourceSpan.Start) + ")");
+						} else {
+							result.Append ("null");
 						}
-					} else if (p.ConstantValue is char) {
-						result.Append ("'" + p.ConstantValue + "'");
-					} else if (p.ConstantValue is string)  {
-						result.Append ("\"" + CSharpTextEditorIndentation.ConvertToStringLiteral ((string)p.ConstantValue) + "\"");
-					} else if (p.ConstantValue is bool)  {
-						result.Append ((bool)p.ConstantValue ? "true" : "false");
 					} else {
-						result.Append (p.ConstantValue);
+						result.Append (p.ExplicitDefaultValue);
 					}
-				} 
+				}
 			}
 		}
 
-		public IEnumerable<IField> GetEnumLiterals(IType type)
+		public static IEnumerable<string> GetEnumLiterals (Type type)
 		{
-			if (type.Kind != TypeKind.Enum)
-				throw new ArgumentException ("Type is no enum.");
-			foreach (var field in type.GetFields (f => f.IsConst && f.IsPublic))
-				yield return field;
+			return Enum.GetNames (type);
 		}
-		
-		static string GetModifiers (ITypeDefinition implementingType, IUnresolvedTypeDefinition implementingPart, IMember member)
+
+		static string GetModifiers (ITypeSymbol implementingType, Location implementingPart, ISymbol member)
 		{
 			StringBuilder result = new StringBuilder ();
 
-			if (member.IsPublic || (member.DeclaringType != null && member.DeclaringTypeDefinition.Kind == TypeKind.Interface)) {
+			if (member.DeclaredAccessibility == Accessibility.Public || (member.ContainingType != null && member.ContainingType.TypeKind == TypeKind.Interface)) {
 				result.Append ("public ");
-			} else if (member.IsProtectedOrInternal) {
-				if (IdeApp.Workbench.ActiveDocument != null && member.DeclaringTypeDefinition.ParentAssembly != implementingType.ParentAssembly) {
+			} else if (member.DeclaredAccessibility == Accessibility.ProtectedOrInternal) {
+				if (IdeApp.Workbench.ActiveDocument != null && member.ContainingAssembly != implementingType.ContainingAssembly) {
 					result.Append ("protected ");
 				} else {
 					result.Append ("internal protected ");
 				}
-			} else if (member.IsProtectedAndInternal) {
-				if (IdeApp.Workbench.ActiveDocument != null && member.DeclaringTypeDefinition.ParentAssembly != implementingType.ParentAssembly) {
-					result.Append ("protected ");
-				} else {
-					result.Append ("protected internal ");
-				}
-			} else if (member.IsProtected) {
+			} else if (member.DeclaredAccessibility == Accessibility.Protected) {
 				result.Append ("protected ");
-			} else if (member.IsInternal) {
+			} else if (member.DeclaredAccessibility == Accessibility.Internal) {
 				result.Append ("internal ");
 			}
-				
-			if (member.IsStatic) 
+
+			if (member.IsStatic)
 				result.Append ("static ");
-			
+
 			return result.ToString ();
 		}
-		
-		void AppendModifiers (StringBuilder result, CodeGenerationOptions options, IMember member)
+
+		static void AppendModifiers (StringBuilder result, CodeGenerationOptions options, ISymbol member)
 		{
-			AppendIndent (result);
-			if (options.ExplicitDeclaration || options.ImplementingType.Kind == TypeKind.Interface)
-				return;
+			//AppendIndent (result);
+			//if (options.ExplicitDeclaration || options.ImplementingType.Kind == TypeKind.Interface)
+			//	return;
 			result.Append (GetModifiers (options.ImplementingType, options.Part, member));
-			bool isFromInterface = false;
-			if (member.DeclaringType != null && member.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
-				isFromInterface = true;
-// TODO: Type system conversion.
-//				if (options.ImplementingType != null) {
-//					foreach (var type in options.ImplementingType.BaseTypes) {
-//						if (type.Kind == TypeKind.Interface)
-//							continue;
-//						if (type.Members.Any (m => m.Name == member.Name && member.SymbolKind == m.SymbolKind /* && DomMethod.ParameterListEquals (member.Parameters, m.Parameters)*/ )) {
-//							isFromInterface = false;
-//							break;
-//						}
-//					}
-//				}
+			//bool isFromInterface = false;
+			if (member.ContainingType != null && member.ContainingType.TypeKind == TypeKind.Interface) {
+				//isFromInterface = true;
+				// TODO: Type system conversion.
+				//				if (options.ImplementingType != null) {
+				//					foreach (var type in options.ImplementingType.BaseTypes) {
+				//						if (type.Kind == TypeKind.Interface)
+				//							continue;
+				//						if (type.Members.Any (m => m.Name == member.Name && member.SymbolKind == m.SymbolKind /* && DomMethod.ParameterListEquals (member.Parameters, m.Parameters)*/ )) {
+				//							isFromInterface = false;
+				//							break;
+				//						}
+				//					}
+				//				}
+			}
+			if (member is IMethodSymbol) {
+				if (!options.CreateProtocolMember)
+					result.Append ("override ");
 			}
 
-			if (!isFromInterface && member.IsOverridable)
-				result.Append ("override ");
-			if (member is IMethod && ((IMethod)member).IsAsync)
-				result.Append ("async ");
+			if (member is IPropertySymbol) {
+				if (!options.CreateProtocolMember)
+					result.Append ("override ");
+			}
 		}
-		
-		CodeGeneratorMemberResult GenerateCode (IProperty property, CodeGenerationOptions options)
+
+		static CodeGeneratorMemberResult GenerateCode (IPropertySymbol property, CodeGenerationOptions options)
 		{
 			var regions = new List<CodeGeneratorBodyRegion> ();
 			var result = new StringBuilder ();
 			AppendObsoleteAttribute (result, options, property);
 			AppendModifiers (result, options, property);
-			AppendReturnType (result, options, property.ReturnType);
+			AppendReturnType (result, options, property.Type);
 			result.Append (" ");
 			if (property.IsIndexer) {
 				result.Append ("this[");
-				AppendParameterList (result, options, property.Parameters);
+				AppendParameterList (result, options, property.Parameters, true);
 				result.Append ("]");
 			} else {
-				if (options.ExplicitDeclaration) {
-					result.Append (ambience.GetString (property.DeclaringType, OutputFlags.IncludeGenerics));
-					result.Append (".");
-				}
+				//				if (options.ExplicitDeclaration) {
+				//					result.Append (ambience.GetString (property.DeclaringType, OutputFlags.IncludeGenerics));
+				//					result.Append (".");
+				//				}
 				result.Append (CSharpAmbience.FilterName (property.Name));
 			}
-			AppendBraceStart (result, Policy.PropertyBraceStyle);
-			if (property.CanGet) {
+			result.AppendLine (" {");
+			if (property.GetMethod != null) {
 				int bodyStartOffset, bodyEndOffset;
 				AppendIndent (result);
 				result.Append ("get");
-				if (options.ImplementingType.Kind == TypeKind.Interface) {
+				if (options.ImplementingType.TypeKind == TypeKind.Interface) {
 					result.AppendLine (";");
 				} else {
-					AppendBraceStart (result, Policy.PropertyGetBraceStyle);
+					result.AppendLine (" {");
 					if (IsMonoTouchModelMember (property)) {
 						AppendMonoTouchTodo (result, options, out bodyStartOffset, out bodyEndOffset);
-					} else if (property.IsAbstract || property.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+					} else if (property.IsAbstract || property.ContainingType.TypeKind == TypeKind.Interface) {
 						AppendNotImplementedException (result, options, out bodyStartOffset, out bodyEndOffset);
 					} else {
 						AppendIndent (result);
 						bodyStartOffset = result.Length;
-						if (property.SymbolKind == SymbolKind.Indexer) {
+						if (property.IsIndexer) {
 							result.Append ("return base[");
-							if (property.Parameters.Count > 0)
+							if (property.Parameters.Length > 0)
 								result.Append (CSharpAmbience.FilterName (property.Parameters.First ().Name));
 							result.Append ("];");
 						} else {
@@ -779,33 +857,33 @@ namespace MonoDevelop.CSharp.Refactoring
 						bodyEndOffset = result.Length;
 						AppendLine (result);
 					}
-					AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
+					result.Append ("}");
 					AppendLine (result);
 					regions.Add (new CodeGeneratorBodyRegion (bodyStartOffset, bodyEndOffset));
 				}
 			}
-			
-			if (property.CanSet) {
+
+			if (property.SetMethod != null) {
 				int bodyStartOffset, bodyEndOffset;
 				AppendIndent (result);
 				result.Append ("set");
-				if (options.ImplementingType.Kind == TypeKind.Interface) {
+				if (options.ImplementingType.TypeKind == TypeKind.Interface) {
 					result.AppendLine (";");
 				} else {
-					AppendBraceStart (result, Policy.PropertyGetBraceStyle);
+					result.AppendLine (" {");
 					if (IsMonoTouchModelMember (property)) {
 						AppendMonoTouchTodo (result, options, out bodyStartOffset, out bodyEndOffset);
-					} else if (property.IsAbstract || property.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
+					} else if (property.IsAbstract || property.ContainingType.TypeKind == TypeKind.Interface) {
 						AppendNotImplementedException (result, options, out bodyStartOffset, out bodyEndOffset);
 					} else {
 						AppendIndent (result);
 						bodyStartOffset = result.Length;
-						if (property.SymbolKind == SymbolKind.Indexer) {
+						if (property.IsIndexer) {
 							result.Append ("base[");
-							if (property.Parameters.Count > 0)
+							if (property.Parameters.Length > 0)
 								result.Append (CSharpAmbience.FilterName (property.Parameters.First ().Name));
 							result.Append ("] = value;");
-						} else { 
+						} else {
 							result.Append ("base.");
 							result.Append (CSharpAmbience.FilterName (property.Name));
 							result.Append (" = value;");
@@ -813,241 +891,183 @@ namespace MonoDevelop.CSharp.Refactoring
 						bodyEndOffset = result.Length;
 						AppendLine (result);
 					}
-					AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
+					result.Append ("}");
 					AppendLine (result);
 					regions.Add (new CodeGeneratorBodyRegion (bodyStartOffset, bodyEndOffset));
 				}
 			}
-			AppendBraceEnd (result, Policy.PropertyBraceStyle);
+			result.Append ("}");
 			return new CodeGeneratorMemberResult (result.ToString (), regions);
 		}
-		
-		internal static bool IsMonoTouchModelMember (IMember member)
+
+		internal static bool IsMonoTouchModelMember (ISymbol member)
 		{
-			if (member == null || member.DeclaringType == null)
+			if (member == null || member.ContainingType == null)
 				return false;
-			return member.DeclaringTypeDefinition.Attributes.Any (attr => attr.AttributeType != null && attr.AttributeType.ReflectionName == "MonoTouch.Foundation.ModelAttribute");
+			return member.ContainingType.GetAttributes ().Any (attr => attr.AttributeClass.MetadataName == "MonoTouch.Foundation.ModelAttribute");
 		}
-		
-		public override string CreateFieldEncapsulation (IUnresolvedTypeDefinition implementingType, IField field, string propertyName, Accessibility modifiers, bool readOnly)
-		{
-			SetIndentTo (implementingType);
-			StringBuilder result = new StringBuilder ();
-			AppendIndent (result);
-			
-//			if (modifiers != MonoDevelop.Projects.Dom.Modifiers.None) {
-//				switch (modifiers) {
-//				}
-//				result.Append (ambience.GetString (modifiers));
-//				result.Append (" ");
-//			}
-			var options = new CodeGenerationOptions () {
-				ImplementingType = field.DeclaringTypeDefinition,
-				Part = implementingType
-			};
-			result.Append ("public ");
-			AppendReturnType (result, options, field.ReturnType);
-			result.Append (" ");
-			result.Append (propertyName);
-			AppendBraceStart (result, Policy.PropertyBraceStyle);
-			AppendIndent (result);
-			
-			result.Append ("get");
-			AppendBraceStart (result, Policy.PropertyGetBraceStyle);
-			AppendIndent (result);
-			result.Append ("return this.");
-			result.Append (CSharpAmbience.FilterName (field.Name));
-			result.Append (";");
-			AppendLine (result);
-			AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
-			AppendLine (result);
 
-			if (!readOnly) {
-				AppendIndent (result);
-				result.Append ("set");
-				AppendBraceStart (result, Policy.PropertyGetBraceStyle);
-				AppendIndent (result);
-				result.Append (CSharpAmbience.FilterName (field.Name));
-				result.Append (" = value;");
-				AppendLine (result);
-				AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
-				AppendLine (result);
-			}
-			
-			AppendBraceEnd (result, Policy.PropertyBraceStyle);
-			return result.ToString ();
-		}
-		
-		int CountBlankLines (MonoDevelop.Ide.Gui.Document doc, int startLine)
-		{
-			int result = 0;
-			DocumentLine line;
-			while ((line = doc.Editor.GetLine (startLine + result)) != null && doc.Editor.GetLineIndent (line).Length == line.Length) {
-				result++;
-			}
-		
-			return result;
-		}
-		
-		static bool InsertUsingAfter (AstNode node)
-		{
-			return node is NewLineNode && IsCommentOrUsing (node.GetNextSibling (s => !(s is NewLineNode))) ||
-				IsCommentOrUsing (node) || (node is PreProcessorDirective);
-		}
+		////		public override string CreateFieldEncapsulation (IUnresolvedTypeDefinition implementingType, IField field, string propertyName, Accessibility modifiers, bool readOnly)
+		////		{
+		////			SetIndentTo (implementingType);
+		////			StringBuilder result = new StringBuilder ();
+		////			AppendIndent (result);
+		////			
+		//////			if (modifiers != MonoDevelop.Projects.Dom.Modifiers.None) {
+		//////				switch (modifiers) {
+		//////				}
+		//////				result.Append (ambience.GetString (modifiers));
+		//////				result.Append (" ");
+		//////			}
+		////			var options = new CodeGenerationOptions () {
+		////				ImplementingType = field.DeclaringTypeDefinition,
+		////				Part = implementingType
+		////			};
+		////			result.Append ("public ");
+		////			AppendReturnType (result, options, field.ReturnType);
+		////			result.Append (" ");
+		////			result.Append (propertyName);
+		////			AppendBraceStart (result, Policy.PropertyBraceStyle);
+		////			AppendIndent (result);
+		////			
+		////			result.Append ("get");
+		////			AppendBraceStart (result, Policy.PropertyGetBraceStyle);
+		////			AppendIndent (result);
+		////			result.Append ("return this.");
+		////			result.Append (CSharpAmbience.FilterName (field.Name));
+		////			result.Append (";");
+		////			AppendLine (result);
+		////			AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
+		////			AppendLine (result);
+		////
+		////			if (!readOnly) {
+		////				AppendIndent (result);
+		////				result.Append ("set");
+		////				AppendBraceStart (result, Policy.PropertyGetBraceStyle);
+		////				AppendIndent (result);
+		////				result.Append (CSharpAmbience.FilterName (field.Name));
+		////				result.Append (" = value;");
+		////				AppendLine (result);
+		////				AppendBraceEnd (result, Policy.PropertyGetBraceStyle);
+		////				AppendLine (result);
+		////			}
+		////			
+		////			AppendBraceEnd (result, Policy.PropertyBraceStyle);
+		////			return result.ToString ();
+		////		}
+		//		
+		//		int CountBlankLines (IReadonlyTextDocument doc, int startLine)
+		//		{
+		//			int result = 0;
+		//			IDocumentLine line;
+		//			while ((line = doc.GetLine (startLine + result)) != null && doc.GetLineIndent (line).Length == line.Length) {
+		//				result++;
+		//			}
+		//		
+		//			return result;
+		//		}
+		//		
+		//		static bool InsertUsingAfter (AstNode node)
+		//		{
+		//			return node is NewLineNode && IsCommentOrUsing (node.GetNextSibling (s => !(s is NewLineNode))) ||
+		//				IsCommentOrUsing (node) || (node is PreProcessorDirective);
+		//		}
+		//
+		//		static bool IsCommentOrUsing (AstNode node)
+		//		{
+		//			return node is ICSharpCode.NRefactory.CSharp.Comment ||
+		//				node is UsingDeclaration ||
+		//				node is UsingAliasDeclaration;
+		//		}
+		//		
 
-		static bool IsCommentOrUsing (AstNode node)
-		{
-			return node is ICSharpCode.NRefactory.CSharp.Comment ||
-				node is UsingDeclaration ||
-				node is UsingAliasDeclaration;
-		}
-		
-		static AstNode SearchUsingInsertionPoint (AstNode parent)
+		//		
+		//		static string OutputNode (TextEditor editor, DocumentContext context, AstNode node)
+		//		{
+		//			using (var stringWriter = new System.IO.StringWriter ()) {
+		////				formatter.Indentation = indentLevel;
+		//				var formatter = new TextWriterTokenWriter (stringWriter);
+		//				stringWriter.NewLine = editor.EolMarker;
+		//
+		//				var visitor = new CSharpOutputVisitor (formatter, null /* TODO: BROKEN DUE ROSLYN PORT (note: that code should be unused) */ );
+		//				node.AcceptVisitor (visitor);
+		//				return stringWriter.ToString ();
+		//			}
+		//		}
+		//		
+		//		
+		//		public AstType CreateShortType (ICompilation compilation, CSharpUnresolvedFile parsedFile, TextLocation loc, IType fullType)
+		//		{
+		//			var csResolver = parsedFile.GetResolver (compilation, loc);
+		//			var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
+		//			return builder.ConvertType (fullType);			
+		//		}
+		//
+
+		public override async void CompleteStatement (MonoDevelop.Ide.Gui.Document doc)
 		{
-			var node = parent.FirstChild;
-			while (true) {
-				var next = node.NextSibling;
-				if (!InsertUsingAfter (next))
-					break;
-				node = next;
+			var fixer = new ConstructFixer (doc.GetFormattingOptions ());
+			int newOffset = await fixer.TryFix (doc, doc.Editor.CaretOffset, default(CancellationToken));
+			if (newOffset != -1) {
+				doc.Editor.CaretOffset = newOffset;
 			}
-			return node;
 		}
-		
-		public override void AddGlobalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName)
+
+		static CodeGeneratorMemberResult GenerateProtocolCode(IMethodSymbol method, CodeGenerationOptions options)
 		{
-			var parsedDocument = doc.ParsedDocument;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
-				return;
-			
-			var policy = doc.Project != null ? doc.Project.Policies.Get <CSharpFormattingPolicy> () : null;
-			if (policy == null)
-				policy = Policy;
-			
-			var node = SearchUsingInsertionPoint (unit);
-			
-			var text = new StringBuilder ();
-			int lines = 0;
-			
-			if (InsertUsingAfter (node)) {
-				lines = policy.BlankLinesBeforeUsings + 1;
-				while (lines-- > 0) {
-					text.Append (doc.Editor.EolMarker);
-				}
-			}
-			
-			text.Append ("using ");
-			text.Append (nsName);
-			text.Append (";");
-			
-			int offset = 0;
-			if (node != null) {
-				var loc = InsertUsingAfter (node) ? node.EndLocation : node.StartLocation;
-				offset = Math.Max (0, doc.Editor.LocationToOffset (loc));
-			}
-			
-			lines = policy.BlankLinesAfterUsings;
-			lines -= CountBlankLines (doc, doc.Editor.OffsetToLineNumber (offset) + 1);
-			if (lines > 0)
-				text.Append (doc.Editor.EolMarker);
-			while (lines-- > 0) {
-				text.Append (doc.Editor.EolMarker);
+			int bodyStartOffset = -1, bodyEndOffset = -1;
+			var result = new StringBuilder();
+			var exportAttribute = method.GetAttributes ().FirstOrDefault (attr => attr.AttributeClass.Name == "ExportAttribute");
+			if (exportAttribute != null) {
+				result.Append ("[Export(\"");
+				result.Append (exportAttribute.ConstructorArguments.First ().Value.ToString ());
+				result.Append ("\")]");
+				result.AppendLine ();
 			}
-			doc.Editor.Insert (offset, text.ToString ());
-			doc.Editor.Document.CommitUpdateAll ();
-		}
-		
-		public override void AddLocalNamespaceImport (MonoDevelop.Ide.Gui.Document doc, string nsName, TextLocation caretLocation)
-		{
-			var parsedDocument = doc.ParsedDocument;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
-				return;
-			
-			var nsDecl = unit.GetNodeAt<NamespaceDeclaration> (caretLocation);
-			if (nsDecl == null) {
-				AddGlobalNamespaceImport (doc, nsName);
-				return;
+			AppendModifiers (result, options, method);
+
+			AppendReturnType (result, options, method.ReturnType);
+			result.Append (" ");
+			if (options.ExplicitDeclaration) {
+				AppendReturnType (result, options, method.ContainingType);
+				result.Append(".");
 			}
-			
-			var policy = doc.Project != null ? doc.Project.Policies.Get <CSharpFormattingPolicy> () : null;
-			if (policy == null)
-				policy = Policy;
-			
-			
-			var node = SearchUsingInsertionPoint (nsDecl);
-			
-			var text = new StringBuilder ();
-			int lines = 0;
-			
-			if (InsertUsingAfter (node)) {
-				lines = policy.BlankLinesBeforeUsings + 1;
-				while (lines-- > 0) {
-					text.Append (doc.Editor.EolMarker);
+
+			result.Append(CSharpAmbience.FilterName(method.Name));
+			if (method.TypeParameters.Length > 0) {
+				result.Append("<");
+				for (int i = 0; i < method.TypeParameters.Length; i++) {
+					if (i > 0)
+						result.Append(", ");
+					var p = method.TypeParameters[i];
+					result.Append(CSharpAmbience.FilterName(p.Name));
 				}
+				result.Append(">");
 			}
-			
-			string indent = doc.Editor.GetLineIndent (nsDecl.StartLocation.Line) + "\t";
-			text.Append (indent);
-			text.Append ("using ");
-			text.Append (nsName);
-			text.Append (";");
-			
-			int offset;
-			TextLocation loc;
-			if (node != null) {
-				loc = InsertUsingAfter (node) ? node.EndLocation : node.StartLocation;
-			} else {
-				loc = nsDecl.LBraceToken.EndLocation;
-			}
-			offset = doc.Editor.LocationToOffset (loc);
-			
-			lines = policy.BlankLinesAfterUsings;
-			lines -= CountBlankLines (doc, doc.Editor.OffsetToLineNumber (offset) + 1);
-			if (lines > 0)
-				text.Append (doc.Editor.EolMarker);
-			while (lines-- > 0) {
-				text.Append (doc.Editor.EolMarker);
-			}
-			
-			doc.Editor.Insert (offset, text.ToString ());
-		}
-		
-		public override string GetShortTypeString (MonoDevelop.Ide.Gui.Document doc, IType type)
-		{
-			var shortType = CreateShortType (doc.Compilation, doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile, doc.Editor.Caret.Location, type);
-			return OutputNode (doc, shortType);
-		}
-		
-		static string OutputNode (MonoDevelop.Ide.Gui.Document doc, AstNode node)
-		{
-			using (var stringWriter = new System.IO.StringWriter ()) {
-//				formatter.Indentation = indentLevel;
-				var formatter = new TextWriterTokenWriter (stringWriter);
-				stringWriter.NewLine = doc.Editor.EolMarker;
-				
-				var visitor = new CSharpOutputVisitor (formatter, doc.GetFormattingOptions ());
-				node.AcceptVisitor (visitor);
-				return stringWriter.ToString ();
-			}
+			result.Append("(");
+			AppendParameterList (result, options, method.Parameters, true);
+			result.Append(")");
+
+			var typeParameters = method.TypeParameters;
+
+			result.Append ("{");
+			AppendIndent (result);
+			bodyStartOffset = result.Length;
+			result.Append ("throw new System.NotImplementedException ();");
+			bodyEndOffset = result.Length;
+			AppendLine (result);
+			result.Append ("}");
+			return new CodeGeneratorMemberResult(result.ToString (), bodyStartOffset, bodyEndOffset);
 		}
-		
-		
-		public AstType CreateShortType (ICompilation compilation, CSharpUnresolvedFile parsedFile, TextLocation loc, IType fullType)
+
+		public override void AddGlobalNamespaceImport (TextEditor editor, DocumentContext context, string nsName)
 		{
-			var csResolver = parsedFile.GetResolver (compilation, loc);
-			var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
-			return builder.ConvertType (fullType);			
+			// not used anymore
 		}
-		
-		public override void CompleteStatement (MonoDevelop.Ide.Gui.Document doc)
+
+		public override void AddLocalNamespaceImport (TextEditor editor, DocumentContext context, string nsName, TextLocation caretLocation)
 		{
-			var fixer = new ConstructFixer (doc.GetFormattingOptions (), doc.Editor.CreateNRefactoryTextEditorOptions ());
-			int newOffset;
-			if (fixer.TryFix (doc.Editor.Document, doc.Editor.Caret.Offset, out newOffset)) {
-				doc.Editor.Caret.Offset = newOffset;
-			}
+			// not used anymore
 		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs
new file mode 100644
index 0000000000..59df3df062
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs
@@ -0,0 +1,144 @@
+// 
+// RenameTextEditorExtension.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Commands;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Core;
+using MonoDevelop.Refactoring.Rename;
+using ICSharpCode.NRefactory6.CSharp.Features.GotoDefinition;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Gui;
+using System.Collections.Generic;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	sealed class CSharpFeaturesTextEditorExtension : TextEditorExtension
+	{
+		static CSharpFeaturesTextEditorExtension ()
+		{
+			GoToDefinitionService.TryNavigateToSymbol = delegate (ISymbol symbol, Microsoft.CodeAnalysis.Project project, bool usePreviewTab) {
+				RefactoringService.RoslynJumpToDeclaration (symbol, TypeSystemService.GetMonoProject (project));
+				return true;
+			};
+
+			GoToDefinitionService.TryNavigateToSpan = delegate (Workspace workspace, DocumentId documentId, Microsoft.CodeAnalysis.Text.TextSpan textSpan, bool usePreviewTab) {
+				var project = workspace.CurrentSolution.GetProject (documentId.ProjectId);
+				if (project == null)
+					return false;
+				var fileName = project.GetDocument (documentId).FilePath;
+				var offset = textSpan.Start;
+				string projectedName;
+				int projectedOffset;
+				if (TypeSystemService.GetWorkspace (TypeSystemService.GetMonoProject(project).ParentSolution).TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) {
+					fileName = projectedName;
+					offset = projectedOffset;
+				}
+				IdeApp.Workbench.OpenDocument (new FileOpenInformation (fileName, TypeSystemService.GetMonoProject (project)) {
+					Offset = offset
+				});
+				return true;
+			};
+
+			GoToDefinitionService.DisplayMultiple = delegate (IEnumerable<Tuple<Solution, ISymbol, Location>> list) {
+				using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+					foreach (var part in list)
+						monitor.ReportResult (GotoDeclarationHandler.GetJumpTypePartSearchResult (part.Item2, part.Item3));
+				}
+			};
+		}
+
+
+		public override bool IsValidInContext (MonoDevelop.Ide.Editor.DocumentContext context)
+		{
+			return context.Name != null && context.Name.EndsWith (".cs", FilePath.PathComparison);
+		}
+
+		[CommandUpdateHandler (EditCommands.Rename)]
+		public void RenameCommand_Update (CommandInfo ci)
+		{
+			new RenameHandler ().UpdateCommandInfo (ci);
+		}
+
+		[CommandHandler (EditCommands.Rename)]
+		public async void RenameCommand ()
+		{
+			await new RenameHandler ().Run (Editor, DocumentContext);
+		}
+
+		[CommandUpdateHandler (RefactoryCommands.GotoDeclaration)]
+		public async void GotoDeclaration_Update (CommandInfo ci)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			if (doc.ParsedDocument == null || doc.ParsedDocument.GetAst<SemanticModel> () == null) {
+				ci.Enabled = false;
+				return;
+			}
+			var symbol = await GoToDefinitionService.FindSymbolAsync (base.DocumentContext.AnalysisDocument, Editor.CaretOffset, default(CancellationToken));
+			ci.Enabled = symbol != null;
+		}
+
+		[CommandHandler (RefactoryCommands.GotoDeclaration)]
+		public void GotoDeclaration ()
+		{
+			GoToDefinitionService.TryGoToDefinition (base.DocumentContext.AnalysisDocument, Editor.CaretOffset, default(CancellationToken));
+		}
+
+		static readonly FindReferencesHandler findReferencesHandler = new FindReferencesHandler ();
+		[CommandUpdateHandler (RefactoryCommands.FindReferences)]
+		public void FindReferences_Update (CommandInfo ci)
+		{
+			findReferencesHandler.Update (ci);
+		}
+
+		[CommandHandler (RefactoryCommands.FindReferences)]
+		public void FindReferences ()
+		{
+			findReferencesHandler.Run (null);
+		}
+
+		static readonly FindAllReferencesHandler findAllReferencesHandler = new FindAllReferencesHandler ();
+		[CommandUpdateHandler (RefactoryCommands.FindAllReferences)]
+		public void FindAllReferencesHandler_Update (CommandInfo ci)
+		{
+			findAllReferencesHandler.Update (ci);
+		}
+
+		[CommandHandler (RefactoryCommands.FindAllReferences)]
+		public void FindAllReferences ()
+		{
+			findAllReferencesHandler.Run (null);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs
new file mode 100644
index 0000000000..9ccbbe49af
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs
@@ -0,0 +1,290 @@
+//
+// CSharpFindReferencesProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Threading;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using MonoDevelop.Refactoring;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Ide.Tasks;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class CSharpFindReferencesProvider : FindReferencesProvider
+	{
+		internal class LookupResult
+		{
+			public static LookupResult Failure = new LookupResult ();
+
+			public bool Success  { get; private set; }
+			public ISymbol Symbol { get; private set; }
+			public Solution Solution { get; private set; }
+			public MonoDevelop.Projects.Project MonoDevelopProject { get; internal set; }
+			public Compilation Compilation { get; private set; }
+
+			public LookupResult ()
+			{
+			}
+
+			public LookupResult (ISymbol symbol, Solution solution, Compilation compilation)
+			{
+				this.Success = true;
+				this.Symbol = symbol;
+				this.Solution = solution;
+				this.Compilation = compilation;
+			}
+		}
+
+		static async Task<LookupResult> TryLookupSymbolInProject (Microsoft.CodeAnalysis.Project prj, string documentationCommentId, CancellationToken token)
+		{
+			if (string.IsNullOrEmpty (documentationCommentId))
+				return LookupResult.Failure;
+			bool searchNs = documentationCommentId[0] == 'N';
+			bool searchType = documentationCommentId[0] == 'T';
+			int reminderIndex = 2;
+			var comp = await prj.GetCompilationAsync (token).ConfigureAwait (false);
+			var current = LookupNamespace (documentationCommentId, ref reminderIndex, comp.GlobalNamespace);
+			if (current == null)
+				return LookupResult.Failure;
+			if (searchNs) {
+				if (current.GetDocumentationCommentId () == documentationCommentId)
+					return new LookupResult (current, prj.Solution, comp);
+				return LookupResult.Failure;
+			}
+			
+			INamedTypeSymbol type = null;
+			foreach (var t in current.GetAllTypes ()) {
+				type = LookupType (documentationCommentId, reminderIndex, t);
+				if (type != null) {
+					if (searchType) {
+						return new LookupResult(type, prj.Solution, comp);
+					}
+					break;
+				}
+			}
+			if (type == null)
+				return LookupResult.Failure;
+			foreach (var member in type.GetMembers ()) {
+				if (member.GetDocumentationCommentId () == documentationCommentId) {
+					return new LookupResult(member, prj.Solution, comp);
+				}
+			}
+			return LookupResult.Failure;
+		}
+
+		internal static async Task<LookupResult> TryLookupSymbol (string documentationCommentId, MonoDevelop.Projects.Project hintProject, CancellationToken token)
+		{
+			Microsoft.CodeAnalysis.Project codeAnalysisHintProject = null;
+			LookupResult result = LookupResult.Failure;
+
+			if (hintProject != null) {
+				codeAnalysisHintProject = TypeSystemService.GetCodeAnalysisProject (hintProject);
+				if (codeAnalysisHintProject != null) {
+					var curResult = await TryLookupSymbolInProject (codeAnalysisHintProject, documentationCommentId, token);
+					if (curResult.Success) {
+						curResult.MonoDevelopProject = hintProject;
+						result = curResult;
+					}
+				}
+			}
+			if (result.Success && result.Symbol.IsDefinedInSource ())
+				return result;
+			foreach (var ws in TypeSystemService.AllWorkspaces) {
+				foreach (var prj in ws.CurrentSolution.Projects) {
+					if (prj == codeAnalysisHintProject)
+						continue;
+					var curResult = await TryLookupSymbolInProject (prj, documentationCommentId, token);
+					if (curResult.Success) {
+						curResult.MonoDevelopProject = TypeSystemService.GetMonoProject (prj);
+						if (curResult.Symbol.IsDefinedInSource ())
+							return curResult;
+						result = curResult;
+					}
+				}
+			}
+
+			return result;
+		}
+
+		static INamedTypeSymbol LookupType (string documentationCommentId, int reminder, INamedTypeSymbol current)
+		{
+			var idx = documentationCommentId.IndexOf ('.', reminder);
+			var exact = idx < 0;
+			var typeId = current.GetDocumentationCommentId ();
+			if (exact) {
+				if (typeId == documentationCommentId)
+					return current;
+				return null;
+			}
+
+			if (typeId.Length < reminder)
+				return null;
+			if (string.CompareOrdinal (documentationCommentId, reminder, typeId, reminder, idx - reminder - 1) == 0) {
+				if (typeId.Length > idx)
+					return null;
+				foreach (var subType in current.GetTypeMembers ()) {
+					var child = LookupType (documentationCommentId, idx  + 1, subType);
+					if (child != null) {
+						return child;
+					}
+				}
+				return current;
+				
+			}
+			return null;
+		}
+
+		static INamespaceSymbol LookupNamespace (string documentationCommentId, ref int reminder, INamespaceSymbol current)
+		{
+			var exact = documentationCommentId.IndexOf ('.', reminder) < 0;
+
+			foreach (var subNamespace in current.GetNamespaceMembers ()) {
+				if (exact) {
+					if (subNamespace.Name.Length == documentationCommentId.Length - reminder &&
+					    string.CompareOrdinal (documentationCommentId, reminder, subNamespace.Name, 0, subNamespace.Name.Length) == 0)
+						return subNamespace;
+				} else {
+					if (subNamespace.Name.Length < documentationCommentId.Length - reminder - 1 &&
+						string.CompareOrdinal (documentationCommentId, reminder, subNamespace.Name, 0, subNamespace.Name.Length) == 0 &&
+						documentationCommentId [reminder + subNamespace.Name.Length] == '.') {
+						reminder += subNamespace.Name.Length + 1;
+						return LookupNamespace (documentationCommentId, ref reminder, subNamespace);
+					}
+				}
+			}
+
+			return current;
+		}
+
+		public override Task<IEnumerable<SearchResult>> FindReferences (string documentationCommentId, MonoDevelop.Projects.Project hintProject, CancellationToken token)
+		{
+			return Task.Run (async delegate {
+				var result = new List<SearchResult> ();
+				var antiDuplicatesSet = new HashSet<SearchResult> (new SearchResultComparer ());
+				foreach (var workspace in TypeSystemService.AllWorkspaces.OfType<MonoDevelopWorkspace> ()) {
+					LookupResult lookup = null;
+
+					foreach (var project in workspace.CurrentSolution.Projects) {
+						lookup = await TryLookupSymbolInProject (project, documentationCommentId, token);
+						if (lookup.Success)
+							break;
+					}
+
+					if (lookup == null || !lookup.Success) {
+						continue;
+					}
+
+					foreach (var loc in lookup.Symbol.Locations) {
+						if (!loc.IsInSource)
+							continue;
+						var fileName = loc.SourceTree.FilePath;
+						var offset = loc.SourceSpan.Start;
+						string projectedName;
+						int projectedOffset;
+						if (workspace.TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) {
+							fileName = projectedName;
+							offset = projectedOffset;
+						}
+						var sr = new SearchResult (new FileProvider (fileName), offset, loc.SourceSpan.Length);
+						antiDuplicatesSet.Add (sr);
+						result.Add (sr);
+					}
+
+					foreach (var mref in await SymbolFinder.FindReferencesAsync (lookup.Symbol, lookup.Solution).ConfigureAwait (false)) {
+						foreach (var loc in mref.Locations) {
+							var fileName = loc.Document.FilePath;
+							var offset = loc.Location.SourceSpan.Start;
+							string projectedName;
+							int projectedOffset;
+							if (workspace.TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) {
+								fileName = projectedName;
+								offset = projectedOffset;
+							}
+							var sr = new SearchResult (new FileProvider (fileName), offset, loc.Location.SourceSpan.Length);
+							if (antiDuplicatesSet.Add (sr)) {
+								result.Add (sr);
+							}
+						}
+					}
+				}
+				return (IEnumerable<SearchResult>)result;
+			});
+		}
+
+		public override Task<IEnumerable<SearchResult>> FindAllReferences (string documentationCommentId, MonoDevelop.Projects.Project hintProject, CancellationToken token)
+		{
+			var workspace = TypeSystemService.Workspace as MonoDevelopWorkspace;
+			if (workspace == null)
+				return Task.FromResult (Enumerable.Empty<SearchResult> ());
+			return Task.Run (async delegate {
+				var antiDuplicatesSet = new HashSet<SearchResult> (new SearchResultComparer ());
+				var result = new List<SearchResult> ();
+				var lookup = await TryLookupSymbol (documentationCommentId, hintProject, token);
+				if (!lookup.Success)
+					return result;
+
+				foreach (var simSym in SymbolFinder.FindSimilarSymbols (lookup.Symbol, lookup.Compilation)) {
+					foreach (var loc in simSym.Locations) {
+						if (!loc.IsInSource)
+							continue;
+						var sr = new SearchResult (new FileProvider (loc.SourceTree.FilePath), loc.SourceSpan.Start, loc.SourceSpan.Length);
+						if (antiDuplicatesSet.Add (sr)) {
+							result.Add (sr);
+						}
+					}
+
+					foreach (var mref in await SymbolFinder.FindReferencesAsync (simSym, lookup.Solution).ConfigureAwait (false)) {
+						foreach (var loc in mref.Locations) {
+							var fileName = loc.Document.FilePath;
+							var offset = loc.Location.SourceSpan.Start;
+							string projectedName;
+							int projectedOffset;
+							if (workspace.TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) {
+								fileName = projectedName;
+								offset = projectedOffset;
+							}
+
+							var sr = new SearchResult (new FileProvider (fileName), offset, loc.Location.SourceSpan.Length);
+							if (antiDuplicatesSet.Add (sr)) {
+								result.Add (sr);
+							}
+						}
+					}
+				}
+				return (IEnumerable<SearchResult>)result;
+			});
+		}
+	}
+	
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpJumpToDeclarationHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpJumpToDeclarationHandler.cs
new file mode 100644
index 0000000000..8ce24f29b8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpJumpToDeclarationHandler.cs
@@ -0,0 +1,45 @@
+//
+// CSharpJumpToDeclarationHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Threading.Tasks;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Ide;
+using System.Linq;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class CSharpJumpToDeclarationHandler : JumpToDeclarationHandler
+	{
+		public override async Task<bool> TryJumpToDeclarationAsync (string documentIdString, MonoDevelop.Projects.Project hintProject, System.Threading.CancellationToken token)
+		{
+			var lookup = await CSharpFindReferencesProvider.TryLookupSymbol (documentIdString, hintProject, token);
+			if (!lookup.Success || lookup.Symbol.Locations.First().IsInMetadata)
+				return false;
+			IdeApp.ProjectOperations.JumpToDeclaration (lookup.Symbol, lookup.MonoDevelopProject);
+			return true;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs
deleted file mode 100644
index 950209fcbf..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs
+++ /dev/null
@@ -1,359 +0,0 @@
-// 
-// CSharpReferenceFinder.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Xamarin Inc. (http://xamarin.com)
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.CSharp.Resolver;
-using MonoDevelop.Ide.FindInFiles;
-using System.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using System.IO;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.Threading;
-
-namespace MonoDevelop.CSharp.Refactoring
-{
-	using MonoDevelop.Projects;
-	class CSharpReferenceFinder : ReferenceFinder
-	{
-		ICSharpCode.NRefactory.CSharp.Resolver.FindReferences refFinder = new ICSharpCode.NRefactory.CSharp.Resolver.FindReferences ();
-		List<object> searchedMembers;
-		List<FilePath> files = new List<FilePath> ();
-		List<Tuple<FilePath, MonoDevelop.Ide.Gui.Document>> openDocuments = new List<Tuple<FilePath, MonoDevelop.Ide.Gui.Document>> ();
-		
-		string memberName;
-		string keywordName;
-		
-		public CSharpReferenceFinder ()
-		{
-			IncludeDocumentation = true;
-		}
-		
-		public void SetSearchedMembers (IEnumerable<object> members)
-		{
-			searchedMembers = new List<object> (members);
-			var firstMember = searchedMembers.FirstOrDefault ();
-			if (firstMember is INamedElement) {
-				var namedElement = (INamedElement)firstMember;
-				var name = namedElement.Name;
-				if (namedElement is IMethod && (((IMethod)namedElement).IsConstructor | ((IMethod)namedElement).IsDestructor))
-					name = ((IMethod)namedElement).DeclaringType.Name;
-				memberName = name;
-
-				keywordName = CSharpAmbience.NetToCSharpTypeName (namedElement.FullName);
-				if (keywordName == namedElement.FullName)
-					keywordName = null;
-			}
-			if (firstMember is string)
-				memberName = firstMember.ToString ();
-			if (firstMember is IVariable)
-				memberName = ((IVariable)firstMember).Name;
-			if (firstMember is ITypeParameter)
-				memberName = ((ITypeParameter)firstMember).Name;
-			if (firstMember is INamespace)
-				memberName = ((INamespace)firstMember).Name;
-		}
-		
-		void SetPossibleFiles (IEnumerable<FilePath> files)
-		{
-			foreach (var file in files) {
-				var openDocument = IdeApp.Workbench.GetDocument (file);
-				if (openDocument == null) {
-					this.files.Add (file);
-				} else {
-					this.openDocuments.Add (Tuple.Create (file, openDocument));
-				}
-			}
-		}
-		
-		MemberReference GetReference (Project project, ResolveResult result, AstNode node, SyntaxTree syntaxTree, string fileName, Mono.TextEditor.TextEditorData editor)
-		{
-			AstNode originalNode = node;
-			if (result == null)
-				return null;
-
-			object valid = null;
-			if (result is MethodGroupResolveResult) {
-				valid = ((MethodGroupResolveResult)result).Methods.FirstOrDefault (
-					m => searchedMembers.Any (member => member is IMethod && ((IMethod)member).Region == m.Region));
-			} else if (result is MemberResolveResult) {
-				var foundMember = ((MemberResolveResult)result).Member;
-				valid = searchedMembers.FirstOrDefault (
-					member => member is IMember && ((IMember)member).Region == foundMember.Region);
-			} else if (result is NamespaceResolveResult) {
-				var ns = ((NamespaceResolveResult)result).Namespace;
-				valid = searchedMembers.FirstOrDefault (n => n is INamespace && ns.FullName.StartsWith (((INamespace)n).FullName, StringComparison.Ordinal));
-				if (!(node is NamespaceDeclaration))
-					goto skip;
-			} else if (result is LocalResolveResult) {
-				var ns = ((LocalResolveResult)result).Variable;
-				valid = searchedMembers.FirstOrDefault (n => n is IVariable && ((IVariable)n).Region == ns.Region);
-			} else if (result is TypeResolveResult) {
-				valid = searchedMembers.FirstOrDefault (n => n is IType);
-			}
-			if (node is ConstructorInitializer)
-				return null;
-			if (node is ObjectCreateExpression)
-				node = ((ObjectCreateExpression)node).Type;
-			if (node is IndexerDeclaration)
-				node = ((IndexerDeclaration)node).ThisToken;
-
-			if (node is InvocationExpression)
-				node = ((InvocationExpression)node).Target;
-			
-			if (node is MemberReferenceExpression)
-				node = ((MemberReferenceExpression)node).MemberNameToken;
-			
-			if (node is SimpleType)
-				node = ((SimpleType)node).IdentifierToken;
-
-			if (node is MemberType)
-				node = ((MemberType)node).MemberNameToken;
-			
-			if (node is NamespaceDeclaration) {
-				var nsd = ((NamespaceDeclaration)node);
-				node = nsd.NamespaceName;
-				if (node == null)
-					return null;
-			}
-
-			if (node is TypeDeclaration && (searchedMembers.First () is IType)) 
-				node = ((TypeDeclaration)node).NameToken;
-			if (node is DelegateDeclaration) 
-				node = ((DelegateDeclaration)node).NameToken;
-
-			if (node is EntityDeclaration && (searchedMembers.First () is IMember)) 
-				node = ((EntityDeclaration)node).NameToken;
-			
-			if (node is ParameterDeclaration && (searchedMembers.First () is IParameter)) 
-				node = ((ParameterDeclaration)node).NameToken;
-			if (node is ConstructorDeclaration)
-				node = ((ConstructorDeclaration)node).NameToken;
-			if (node is DestructorDeclaration)
-				node = ((DestructorDeclaration)node).NameToken;
-			if (node is NamedArgumentExpression)
-				node = ((NamedArgumentExpression)node).NameToken;
-			if (node is NamedExpression)
-				node = ((NamedExpression)node).NameToken;
-			if (node is VariableInitializer)
-				node = ((VariableInitializer)node).NameToken;
-
-			if (node is IdentifierExpression) {
-				node = ((IdentifierExpression)node).IdentifierToken;
-			}
-
-		skip:
-
-			var region = new DomRegion (fileName, node.StartLocation, node.EndLocation);
-
-			var length = node is PrimitiveType ? keywordName.Length : node.EndLocation.Column - node.StartLocation.Column;
-			if (valid == null)
-				valid = searchedMembers.FirstOrDefault ();
-			var reference = new CSharpMemberReference (project, originalNode, syntaxTree, valid, region, editor.LocationToOffset (region.Begin), length);
-
-			reference.ReferenceUsageType = GetUsage (originalNode);
-			return reference;
-		}
-
-		// same logic than the extract method analyzation, unfortunately it's not reusable in this context 
-		// we need to do it bottom up here.
-		ReferenceUsageType GetUsage (AstNode node)
-		{
-			if (node.Parent is UnaryOperatorExpression) {
-				var unaryOperatorExpression = (UnaryOperatorExpression)node.Parent;
-				if (unaryOperatorExpression.Operator == UnaryOperatorType.Increment || 
-				    unaryOperatorExpression.Operator == UnaryOperatorType.Decrement ||
-					unaryOperatorExpression.Operator == UnaryOperatorType.PostIncrement || 
-				    unaryOperatorExpression.Operator == UnaryOperatorType.PostDecrement) {
-					return ReferenceUsageType.ReadWrite;
-				}
-			} else if (node.Parent is DirectionExpression) {
-				var de = (DirectionExpression)node.Parent;
-				if (de.FieldDirection == FieldDirection.Ref)
-					return ReferenceUsageType.ReadWrite;
-				if (de.FieldDirection == FieldDirection.Out)
-					return ReferenceUsageType.Write;
-			} else if (node.Parent is AssignmentExpression) {
-				var ae = (AssignmentExpression)node.Parent;
-				if (ae.Left == node)
-					return ReferenceUsageType.Write;
-			} else if (node is VariableInitializer) {
-				return ReferenceUsageType.Write;
-			} else if (node is ParameterDeclaration) {
-				return ReferenceUsageType.Write;
-			} else if (node.Parent is ForeachStatement) {
-				if (node.Role == Roles.Identifier)
-					return ReferenceUsageType.Write;
-			}
-			return ReferenceUsageType.Read;
-		}
-
-		public class CSharpMemberReference : MemberReference
-		{
-			public SyntaxTree SyntaxTree {
-				get;
-				private set;
-			}
-
-			public AstNode AstNode {
-				get;
-				private set;
-			}
-
-			public Project Project {
-				get;
-				private set;
-			}
-
-			public CSharpMemberReference (Project project, AstNode astNode, SyntaxTree syntaxTree,  object entity, DomRegion region, int offset, int length) : base (entity, region, offset, length)
-			{
-				this.Project = project;
-				this.AstNode = astNode;
-				this.SyntaxTree = syntaxTree;
-			}
-		}
-
-		bool IsNodeValid (object searchedMember, AstNode node)
-		{
-			if (searchedMember is IField && node is FieldDeclaration)
-				return false;
-			return true;
-		}
-		
-		public IEnumerable<MemberReference> FindInDocument (MonoDevelop.Ide.Gui.Document doc, CancellationToken token = default (CancellationToken))
-		{
-			if (string.IsNullOrEmpty (memberName))
-				return Enumerable.Empty<MemberReference> ();
-			var editor = doc.Editor;
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null)
-				return Enumerable.Empty<MemberReference> ();
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var file = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			var result = new List<MemberReference> ();
-			
-			foreach (var obj in searchedMembers) {
-				if (obj is IVariable && !(obj is IParameter) && !(obj is IField)) {
-					refFinder.FindLocalReferences ((IVariable)obj, file, unit, doc.Compilation, (astNode, r) => { 
-						if (IsNodeValid (obj, astNode))
-							result.Add (GetReference (doc.Project, r, astNode, unit, editor.FileName, editor));
-					}, token);
-				} else if (obj is ISymbol) {
-					var sym = (ISymbol)obj;
-
-					// May happen for anonymous types since empty constructors are always generated.
-					// But there is no declaring type definition for them - we filter out this case.
-					if (sym.SymbolKind == SymbolKind.Constructor && ((IEntity)sym).DeclaringTypeDefinition == null)
-						continue;
-					refFinder.FindReferencesInFile (refFinder.GetSearchScopes (sym), file, unit, doc.Compilation, (astNode, r) => {
-						if (IsNodeValid (obj, astNode))
-							result.Add (GetReference (doc.Project, r, astNode, unit, editor.FileName, editor)); 
-					}, token);
-				}
-			}
-			return result;
-		}
-		
-		public override IEnumerable<MemberReference> FindReferences (Project project, IProjectContent content, IEnumerable<FilePath> possibleFiles, IProgressMonitor monitor, IEnumerable<object> members)
-		{
-			if (content == null)
-				throw new ArgumentNullException ("content", "Project content not set.");
-			SetPossibleFiles (possibleFiles);
-			SetSearchedMembers (members);
-			var scopes = searchedMembers.Select (e => e is INamespace ? refFinder.GetSearchScopes ((INamespace)e) : refFinder.GetSearchScopes ((ISymbol)e));
-			var compilation = project != null ? TypeSystemService.GetCompilation (project) : content.CreateCompilation ();
-			List<MemberReference> refs = new List<MemberReference> ();
-			foreach (var opendoc in openDocuments) {
-				foreach (var newRef in FindInDocument (opendoc.Item2)) {
-					if (newRef == null || refs.Any (r => r.FileName == newRef.FileName && r.Region == newRef.Region))
-						continue;
-					refs.Add (newRef);
-				}
-			}
-			foreach (var file in files) {
-				if (monitor != null)
-					monitor.Step (1);
-				string text;
-				try {
-					if  (!File.Exists (file))
-						continue;
-					text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (file);
-				} catch (Exception e) {
-					LoggingService.LogError ("Exception while file reading.", e);
-					continue;
-				}
-				if (memberName != null && text.IndexOf (memberName, StringComparison.Ordinal) < 0 &&
-					(keywordName == null || text.IndexOf (keywordName, StringComparison.Ordinal) < 0))
-					continue;
-				using (var editor = TextEditorData.CreateImmutable (text)) {
-					editor.Document.FileName = file;
-					var unit = new CSharpParser ().Parse (editor);
-					if (unit == null)
-						continue;
-					
-					var storedFile = content.GetFile (file);
-					var parsedFile = storedFile as CSharpUnresolvedFile;
-					
-					if (parsedFile == null && storedFile is ParsedDocumentDecorator) {
-						parsedFile = ((ParsedDocumentDecorator)storedFile).ParsedFile as CSharpUnresolvedFile;
-					}
-					
-					if (parsedFile == null) {
-						// for fallback purposes - should never happen.
-						parsedFile = unit.ToTypeSystem ();
-						content = content.AddOrUpdateFiles (parsedFile);
-						compilation = content.CreateCompilation ();
-					}
-					foreach (var scope in scopes) {
-						refFinder.FindReferencesInFile (
-							scope,
-							parsedFile,
-							unit,
-							compilation,
-							(astNode, result) => {
-								var newRef = GetReference (project, result, astNode, unit, file, editor);
-								if (newRef == null || refs.Any (r => r.FileName == newRef.FileName && r.Region == newRef.Region))
-									return;
-								refs.Add (newRef);
-							},
-							CancellationToken.None
-						);
-					}
-				}
-			}
-			return refs;
-		}
-	}
-}
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs
new file mode 100644
index 0000000000..e441992bd1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CodeGenerationService.cs
@@ -0,0 +1,302 @@
+// 
+// CodeGenerationService.cs
+//  
+// Author:
+//       mkrueger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using MonoDevelop.Core;
+using System.CodeDom;
+using MonoDevelop.Projects;
+using System.CodeDom.Compiler;
+using MonoDevelop.Ide;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Simplification;
+using System.Threading;
+using Gtk;
+using MonoDevelop.Ide.CodeFormatting;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using MonoDevelop.CSharp.Formatting;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.Refactoring
+{
+	static class CodeGenerationService
+	{
+		//		public static IUnresolvedMember AddCodeDomMember (MonoDevelop.Projects.Project project, IUnresolvedTypeDefinition type, CodeTypeMember newMember)
+		//		{
+		//			bool isOpen;
+		//			var data = TextFileProvider.Instance.GetTextEditorData (type.Region.FileName, out isOpen);
+		//			var parsedDocument = TypeSystemService.ParseFile (data.FileName, data.MimeType, data.Text);
+		//			
+		//			var insertionPoints = GetInsertionPoints (data, parsedDocument, type);
+		//			
+		//			var suitableInsertionPoint = GetSuitableInsertionPoint (insertionPoints, type, newMember);
+		//			
+		//			var dotNetProject = project as DotNetProject;
+		//			if (dotNetProject == null) {
+		//				LoggingService.LogError ("Only .NET projects are supported.");
+		//				return null;
+		//			}
+		//			
+		//			var generator = dotNetProject.LanguageBinding.GetCodeDomProvider ();
+		//			StringWriter sw = new StringWriter ();
+		//			var options = new CodeGeneratorOptions ();
+		//			options.IndentString = data.GetLineIndent (type.Region.BeginLine) + "\t";
+		//			if (newMember is CodeMemberMethod)
+		//				options.BracingStyle = "C";
+		//			generator.GenerateCodeFromMember (newMember, sw, options);
+		//
+		//			var code = sw.ToString ();
+		//			if (!string.IsNullOrEmpty (code))
+		//				suitableInsertionPoint.Insert (data, code);
+		//			if (!isOpen) {
+		//				try {
+		//					File.WriteAllText (type.Region.FileName, data.Text);
+		//				} catch (Exception e) {
+		//					LoggingService.LogError (string.Format ("Failed to write file '{0}'.", type.Region.FileName), e);
+		//					MessageService.ShowError (GettextCatalog.GetString ("Failed to write file '{0}'.", type.Region.FileName));
+		//				}
+		//			}
+		//			var newDocument = TypeSystemService.ParseFile (data.FileName, data.MimeType, data.Text);
+		//			return newDocument.ParsedFile.GetMember (suitableInsertionPoint.Location.Line, int.MaxValue);
+		//		}
+
+		public static async Task AddNewMember (Projects.Project project, ITypeSymbol type, Location part, SyntaxNode newMember, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (project == null)
+				throw new ArgumentNullException (nameof (project));
+			if (type == null)
+				throw new ArgumentNullException (nameof (type));
+			if (newMember == null)
+				throw new ArgumentNullException (nameof (newMember));
+			if (!type.IsDefinedInSource ())
+				throw new ArgumentException ("The given type needs to be defined in source code.", nameof (type));
+
+
+			var ws = MonoDevelop.Ide.TypeSystem.TypeSystemService.GetWorkspace (project.ParentSolution);
+			var projectId = ws.GetProjectId (project);
+			var docId = ws.GetDocumentId (projectId, part.SourceTree.FilePath);
+
+			var document = ws.GetDocument (docId, cancellationToken);
+
+			var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+			var typeDecl = (ClassDeclarationSyntax)root.FindNode (part.SourceSpan);
+
+			// for some reason the reducer doesn't reduce this
+			var systemVoid = newMember.DescendantNodesAndSelf ().OfType<QualifiedNameSyntax> ().FirstOrDefault (ma => ma.ToString () == "System.Void");
+
+			if (systemVoid != null) newMember = newMember.ReplaceNode (systemVoid, SyntaxFactory.ParseTypeName ("void"));
+
+			var newRoot = root.ReplaceNode (typeDecl, typeDecl.AddMembers ((MemberDeclarationSyntax)newMember.WithAdditionalAnnotations (Simplifier.Annotation, Formatter.Annotation)));
+			document = document.WithSyntaxRoot (newRoot);
+			var policy = project.Policies.Get<CSharpFormattingPolicy> ("text/x-csharp");
+			var textPolicy = project.Policies.Get<TextStylePolicy> ("text/x-csharp");
+			var projectOptions = policy.CreateOptions (textPolicy);
+
+			document = await Formatter.FormatAsync (document, Formatter.Annotation, projectOptions, cancellationToken).ConfigureAwait (false);
+			document = await Simplifier.ReduceAsync (document, Simplifier.Annotation, projectOptions, cancellationToken).ConfigureAwait (false);
+			var text = await document.GetTextAsync (cancellationToken).ConfigureAwait (false);
+			var newSolution = ws.CurrentSolution.WithDocumentText (docId, text);
+			ws.TryApplyChanges (newSolution);
+		}
+
+		readonly static SyntaxAnnotation insertedMemberAnnotation = new SyntaxAnnotation ("INSERTION_ANNOTATAION");
+		public static async Task InsertMemberWithCursor (string operation, Projects.Project project, ITypeSymbol type, Location part, SyntaxNode newMember, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (operation == null)
+				throw new ArgumentNullException (nameof (operation));
+			if (project == null)
+				throw new ArgumentNullException (nameof (project));
+			if (type == null)
+				throw new ArgumentNullException (nameof (type));
+			if (newMember == null)
+				throw new ArgumentNullException (nameof (newMember));
+			var ws = MonoDevelop.Ide.TypeSystem.TypeSystemService.GetWorkspace (project.ParentSolution);
+			var projectId = ws.GetProjectId (project);
+			var docId = ws.GetDocumentId (projectId, part.SourceTree.FilePath);
+
+			var document = ws.GetDocument (docId, cancellationToken);
+
+			var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+			var typeDecl = (ClassDeclarationSyntax)root.FindNode (part.SourceSpan);
+
+			// for some reason the reducer doesn't reduce this
+			var systemVoid = newMember.DescendantNodesAndSelf ().OfType<QualifiedNameSyntax> ().FirstOrDefault (ma => ma.ToString () == "System.Void");
+
+			if (systemVoid != null) newMember = newMember.ReplaceNode (systemVoid, SyntaxFactory.ParseTypeName ("void"));
+
+			var newRoot = root.ReplaceNode (typeDecl, typeDecl.AddMembers ((MemberDeclarationSyntax)newMember.WithAdditionalAnnotations (Simplifier.Annotation, Formatter.Annotation, insertedMemberAnnotation)));
+			var doc = await IdeApp.Workbench.OpenDocument (part.SourceTree.FilePath, project, true);
+
+			var policy = project.Policies.Get<CSharpFormattingPolicy> ("text/x-csharp");
+			var textPolicy = project.Policies.Get<TextStylePolicy> ("text/x-csharp");
+			var projectOptions = policy.CreateOptions (textPolicy);
+
+			document = document.WithSyntaxRoot (newRoot);
+			document = await Formatter.FormatAsync (document, Formatter.Annotation, projectOptions, cancellationToken).ConfigureAwait (false);
+			document = await Simplifier.ReduceAsync (document, Simplifier.Annotation, projectOptions, cancellationToken).ConfigureAwait (false);
+
+			root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+
+			var node = root.GetAnnotatedNodes (insertedMemberAnnotation).Single ();
+
+			Application.Invoke (async delegate {
+				var insertionPoints = InsertionPointService.GetInsertionPoints (
+					doc.Editor,
+					await doc.UpdateParseDocument (),
+					type,
+					part.SourceSpan.Start
+				);
+				var options = new InsertionModeOptions (
+					operation,
+					insertionPoints,
+					point => {
+						if (!point.Success)
+							return;
+						var text = node.ToString ();
+						point.InsertionPoint.Insert (doc.Editor, doc, text);
+					}
+				);
+
+				doc.Editor.StartInsertionMode (options);
+			});
+		}
+
+		//public static Task<bool> InsertMemberWithCursor (string operation, ITypeSymbol type, Location part, SyntaxNode newMember, bool implementExplicit = false)
+		//{
+		//	//TODO: Add dialog for inserting position
+		//	AddNewMember (type, part, newMember, implementExplicit);
+		//	return Task.FromResult (true);
+		//}
+		//
+		//		public static int CalculateBodyIndentLevel (IUnresolvedTypeDefinition declaringType)
+		//		{
+		//			if (declaringType == null)
+		//				return 0;
+		//			int indentLevel = 1;
+		//			while (declaringType.DeclaringTypeDefinition != null) {
+		//				indentLevel++;
+		//				declaringType = declaringType.DeclaringTypeDefinition;
+		//			}
+		//			var file = declaringType.UnresolvedFile as CSharpUnresolvedFile;
+		//			if (file == null)
+		//				return indentLevel;
+		//			var scope = file.GetUsingScope (declaringType.Region.Begin);
+		//			while (scope != null && !string.IsNullOrEmpty (scope.NamespaceName)) {
+		//				indentLevel++;
+		//				// skip virtual scopes.
+		//				while (scope.Parent != null && scope.Parent.Region == scope.Region)
+		//					scope = scope.Parent;
+		//				scope = scope.Parent;
+		//			}
+		//			return indentLevel;
+		//		}
+		public static MonoDevelop.Ide.TypeSystem.CodeGenerator CreateCodeGenerator (this Ide.Gui.Document doc)
+		{
+			return MonoDevelop.Ide.TypeSystem.CodeGenerator.CreateGenerator (doc);
+		}
+
+
+		//		public static MonoDevelop.Ide.TypeSystem.CodeGenerator CreateCodeGenerator (this ITextDocument data, ICompilation compilation)
+		//		{
+		//			return MonoDevelop.Ide.TypeSystem.CodeGenerator.CreateGenerator (data, compilation);
+		//		}
+		//		
+		//		static IUnresolvedTypeDefinition GetMainPart (IType t)
+		//		{
+		//			return t.GetDefinition ().Parts.First ();
+		//		}
+
+
+		public static void AddAttribute (INamedTypeSymbol cls, string name, params object [] parameters)
+		{
+			if (cls == null)
+				throw new ArgumentNullException ("cls");
+			bool isOpen;
+			string fileName = cls.Locations.First ().SourceTree.FilePath;
+			var buffer = TextFileProvider.Instance.GetTextEditorData (fileName, out isOpen);
+
+
+			var code = new StringBuilder ();
+			int pos = cls.Locations.First ().SourceSpan.Start;
+			var line = buffer.GetLineByOffset (pos);
+			code.Append (buffer.GetLineIndent (line));
+			code.Append ("[");
+			code.Append (name);
+			if (parameters != null && parameters.Length > 0) {
+				code.Append ("(");
+				for (int i = 0; i < parameters.Length; i++) {
+					if (i > 0)
+						code.Append (", ");
+					code.Append (parameters [i]);
+				}
+				code.Append (")");
+			}
+			code.Append ("]");
+			code.AppendLine ();
+
+			buffer.InsertText (line.Offset, code.ToString ());
+
+			if (!isOpen) {
+				File.WriteAllText (fileName, buffer.Text);
+			}
+		}
+
+		public static ITypeSymbol AddType (DotNetProject project, string folder, string namspace, ClassDeclarationSyntax type)
+		{
+			if (project == null)
+				throw new ArgumentNullException (nameof (project));
+			if (folder == null)
+				throw new ArgumentNullException (nameof (folder));
+			if (namspace == null)
+				throw new ArgumentNullException (nameof (namspace));
+			if (type == null)
+				throw new ArgumentNullException (nameof (type));
+			var ns = SyntaxFactory.NamespaceDeclaration (SyntaxFactory.ParseName (namspace)).WithMembers (new SyntaxList<MemberDeclarationSyntax> () { type });
+
+			string fileName = project.LanguageBinding.GetFileName (Path.Combine (folder, type.Identifier.ToString ()));
+			using (var sw = new StreamWriter (fileName)) {
+				sw.WriteLine (ns.ToString ());
+			}
+			FileService.NotifyFileChanged (fileName);
+			var roslynProject = MonoDevelop.Ide.TypeSystem.TypeSystemService.GetCodeAnalysisProject (project);
+			var id = MonoDevelop.Ide.TypeSystem.TypeSystemService.GetDocumentId (roslynProject.Id, fileName);
+			if (id == null)
+				return null;
+			var model = roslynProject.GetDocument (id).GetSemanticModelAsync ().Result;
+			var typeSyntax = model.SyntaxTree.GetCompilationUnitRoot ().ChildNodes ().First ().ChildNodes ().First () as ClassDeclarationSyntax;
+			return model.GetDeclaredSymbol (typeSyntax);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ConstructFixer.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ConstructFixer.cs
new file mode 100644
index 0000000000..334031cb2b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ConstructFixer.cs
@@ -0,0 +1,208 @@
+//
+// ConstructFixer.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using ICSharpCode.NRefactory.Editor;
+using System.Text;
+using System.Reflection;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using Microsoft.CodeAnalysis.Options;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	abstract class ConstructCompleter
+	{
+		public abstract bool TryFix (ConstructFixer fixer, SyntaxNode syntaxTree, MonoDevelop.Ide.Gui.Document document, int location, ref int newOffset);
+
+	}
+
+	class InvocationCompleter : ConstructCompleter
+	{
+		public override bool TryFix (ConstructFixer fixer, SyntaxNode syntaxTree, Ide.Gui.Document document, int location, ref int newOffset)
+		{
+			foreach (var invocationExpression in syntaxTree.FindToken (location).Parent.AncestorsAndSelf ().OfType<InvocationExpressionSyntax> ()) {
+				if (invocationExpression != null) {
+					if (!invocationExpression.ArgumentList.OpenParenToken.IsMissing && invocationExpression.ArgumentList.CloseParenToken.IsMissing) {
+
+						var insertionOffset = invocationExpression.Span.End - 1;
+
+						newOffset = insertionOffset;
+
+						var text = ")";
+						newOffset++;
+						var expressionStatement = invocationExpression.Parent as ExpressionStatementSyntax;
+						if (expressionStatement != null) {
+							if (expressionStatement.SemicolonToken.IsMissing)
+								text = ");";
+							newOffset++;
+						}
+						document.Editor.InsertText (insertionOffset, text);
+						return true;
+					}
+
+				}
+			}
+			return false;
+		}
+	}
+
+
+	class BreakStatementCompleter : ConstructCompleter
+	{
+		public override bool TryFix (ConstructFixer fixer, SyntaxNode syntaxTree, Ide.Gui.Document document, int location, ref int newOffset)
+		{
+			foreach (var breakStatementSyntax in syntaxTree.FindToken (location).Parent.AncestorsAndSelf ().OfType<BreakStatementSyntax> ()) {
+				if (breakStatementSyntax.SemicolonToken.IsMissing) {
+					var insertionOffset = breakStatementSyntax.Span.End - 1;
+					newOffset = insertionOffset;
+					newOffset++;
+					document.Editor.InsertText (insertionOffset, ";");
+					return true;
+				}
+			}
+			foreach (var breakStatementSyntax in syntaxTree.FindToken (location).Parent.AncestorsAndSelf ().OfType<ContinueStatementSyntax> ()) {
+				if (breakStatementSyntax.SemicolonToken.IsMissing) {
+					var insertionOffset = breakStatementSyntax.Span.End - 1;
+					newOffset = insertionOffset;
+					newOffset++;
+					document.Editor.InsertText (insertionOffset, ";");
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+
+	class ExpressionStatementCompleter : ConstructCompleter
+	{
+		public override bool TryFix (ConstructFixer fixer, SyntaxNode syntaxTree, Ide.Gui.Document document, int location, ref int newOffset)
+		{
+			foreach (var expressionStatement in syntaxTree.FindToken (location).Parent.AncestorsAndSelf ().OfType<ExpressionStatementSyntax> ()) {
+				if (expressionStatement.SemicolonToken.IsMissing) {
+					var insertionOffset = expressionStatement.Span.End - 1;
+					newOffset = insertionOffset;
+					newOffset++;
+					document.Editor.InsertText (insertionOffset, ";");
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+
+	class ReturnStatementCompleter : ConstructCompleter
+	{
+		public override bool TryFix (ConstructFixer fixer, SyntaxNode syntaxTree, Ide.Gui.Document document, int location, ref int newOffset)
+		{
+			foreach (var throwStatement in syntaxTree.FindToken (location).Parent.AncestorsAndSelf ().OfType<ReturnStatementSyntax> ()) {
+				if (throwStatement.SemicolonToken.IsMissing) {
+					var insertionOffset = throwStatement.Span.End - 1;
+					newOffset = insertionOffset;
+					newOffset++;
+					document.Editor.InsertText (insertionOffset, ";");
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+
+	class YieldReturnStatementCompleter : ConstructCompleter
+	{
+		public override bool TryFix (ConstructFixer fixer, SyntaxNode syntaxTree, Ide.Gui.Document document, int location, ref int newOffset)
+		{
+			foreach (var yieldStatement in syntaxTree.FindToken (location).Parent.AncestorsAndSelf ().OfType<YieldStatementSyntax> ()) {
+				if (yieldStatement.SemicolonToken.IsMissing) {
+					var insertionOffset = yieldStatement.Span.End - 1;
+					newOffset = insertionOffset;
+					newOffset++;
+					document.Editor.InsertText (insertionOffset, ";");
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+
+	class ThrowStatementCompleter : ConstructCompleter
+	{
+		public override bool TryFix (ConstructFixer fixer, SyntaxNode syntaxTree, Ide.Gui.Document document, int location, ref int newOffset)
+		{
+			foreach (var throwStatement in syntaxTree.FindToken (location).Parent.AncestorsAndSelf ().OfType<ThrowStatementSyntax> ()) {
+				if (throwStatement.SemicolonToken.IsMissing) {
+					var insertionOffset = throwStatement.Span.End - 1;
+					newOffset = insertionOffset;
+					newOffset++;
+					document.Editor.InsertText (insertionOffset, ";");
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+
+
+	public class ConstructFixer
+	{
+		static readonly ConstructCompleter [] completer = {
+			new BreakStatementCompleter (),
+			new ThrowStatementCompleter (),
+			new ReturnStatementCompleter (),
+			new YieldReturnStatementCompleter (),
+
+			new InvocationCompleter (),
+			new ExpressionStatementCompleter ()
+		};
+
+		// readonly OptionSet options;
+
+		public ConstructFixer (OptionSet options)
+		{
+			// this.options = options;
+		}
+
+		public async Task<int> TryFix (MonoDevelop.Ide.Gui.Document document, int offset, CancellationToken token)
+		{
+			int newOffset = offset;
+
+			var syntaxTree = await document.AnalysisDocument.GetSyntaxRootAsync (token);
+
+			foreach (var c in completer) {
+				if (c.TryFix (this, syntaxTree, document, offset, ref newOffset)) {
+					return newOffset;
+				}
+			}
+			return -1;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ExtractMethodCommandHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ExtractMethodCommandHandler.cs
new file mode 100644
index 0000000000..37e0ab49fc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/ExtractMethodCommandHandler.cs
@@ -0,0 +1,114 @@
+//
+// ExtractMethodCommandHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Components.Commands;
+using ICSharpCode.NRefactory6.CSharp.ExtractMethod;
+using MonoDevelop.Ide;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using System.Linq;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class ExtractMethodCommandHandler : CommandHandler
+	{
+		public static async Task<bool> IsValid (MonoDevelop.Ide.Gui.Document doc, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (doc == null)
+				return false;
+			if (doc.Editor == null || !doc.Editor.IsSomethingSelected)
+				return false;
+			var ad = doc.AnalysisDocument;
+			if (ad == null)
+				return false;
+			var selectionRange = doc.Editor.SelectionRange;
+			try {
+				var selection = new CSharpSelectionValidator (await SemanticDocument.CreateAsync (ad, cancellationToken).ConfigureAwait (false), new TextSpan (selectionRange.Offset, selectionRange.Length), doc.GetOptionSet ());
+				var result = await selection.GetValidSelectionAsync (cancellationToken).ConfigureAwait (false);
+				return result.ContainsValidContext;
+			} catch (Exception) {
+				return false;
+			}
+		}
+
+		protected override void Update (CommandInfo info)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			info.Enabled = doc != null && doc.ParsedDocument != null && doc.ParsedDocument.GetAst<SemanticModel> () != null;
+		}
+
+		public async static Task Run (MonoDevelop.Ide.Gui.Document doc)
+		{
+			if (!doc.Editor.IsSomethingSelected)
+				return;
+			var ad = doc.AnalysisDocument;
+			if (ad == null || ! await IsValid (doc))
+				return;
+			try {
+				var selectionRange = doc.Editor.SelectionRange;
+				var token = default(CancellationToken);
+				var selection = new CSharpSelectionValidator (await SemanticDocument.CreateAsync (ad, token).ConfigureAwait (false), new TextSpan (selectionRange.Offset, selectionRange.Length), doc.GetOptionSet ());
+				var result = await selection.GetValidSelectionAsync (token).ConfigureAwait (false);
+				if (!result.ContainsValidContext)
+					return;
+				var extractor = new CSharpMethodExtractor ((CSharpSelectionResult)result);
+				var extractionResult = await extractor.ExtractMethodAsync (token).ConfigureAwait (false);
+				var changes = await extractionResult.Document.GetTextChangesAsync (ad, token);
+				using (var undo = doc.Editor.OpenUndoGroup ()) {
+					foreach (var change in changes.OrderByDescending (ts => ts.Span.Start)) {
+						doc.Editor.ReplaceText (change.Span.Start, change.Span.Length, change.NewText);
+					}
+					// hack to remove the redundant private modifier.
+					if (doc.Editor.GetTextAt (extractionResult.MethodDeclarationNode.SpanStart, "private ".Length) == "private ") {
+						doc.Editor.RemoveText (extractionResult.MethodDeclarationNode.SpanStart, "private ".Length);
+					}
+				}
+				await doc.UpdateParseDocument ();
+				var info = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, extractionResult.InvocationNameToken.Span.Start).Result;
+				var sym = info.DeclaredSymbol ?? info.Symbol;
+				if (sym != null)
+					await new MonoDevelop.Refactoring.Rename.RenameRefactoring ().Rename (sym);
+			}
+			catch (Exception e) {
+				LoggingService.LogError ("Error while extracting method", e);
+			}
+		}
+
+		protected async override void Run ()
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null)
+				return;
+			await Run (doc);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindProjectReferenceUsagesHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindProjectReferenceUsagesHandler.cs
new file mode 100644
index 0000000000..1c3bcf9f18
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindProjectReferenceUsagesHandler.cs
@@ -0,0 +1,112 @@
+//
+// FindProjectReferenceUsagesHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui.Pads.ProjectPad;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.TypeSystem;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	sealed class FindProjectReferenceUsagesHandler : CommandHandler
+	{
+		protected override void Update (CommandInfo info)
+		{
+			var currentProject = IdeApp.ProjectOperations.CurrentSelectedProject;
+			if (currentProject == null) {
+				info.Enabled = false;
+				return;
+			}
+			var analysisProject = TypeSystemService.GetCodeAnalysisProject (currentProject);
+			if (analysisProject == null) {
+				info.Enabled = false;
+				return;
+			}
+			var pad = IdeApp.Workbench.GetPad<ProjectSolutionPad> ().Content as ProjectSolutionPad;
+			var selectedNodes = pad.TreeView.GetSelectedNodes ();
+			if (selectedNodes == null || selectedNodes.Length != 1) {
+				info.Enabled = false;
+				return;
+			}
+			info.Enabled = true;
+		}
+
+		protected async override void Run ()
+		{
+			var currentProject = IdeApp.ProjectOperations.CurrentSelectedProject;
+			if (currentProject == null)
+				return;
+			var analysisProject = TypeSystemService.GetCodeAnalysisProject (currentProject);
+			if (analysisProject == null)
+				return;
+			var pad = IdeApp.Workbench.GetPad<ProjectSolutionPad> ().Content as ProjectSolutionPad;
+			var selectedNodes = pad.TreeView.GetSelectedNodes ();
+			if (selectedNodes == null || selectedNodes.Length != 1)
+				return;
+			var dataItem = selectedNodes[0].DataItem;
+
+			var projectRef = dataItem as ProjectReference;
+			if (projectRef != null) {
+				await Task.Run (delegate {
+					using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
+						monitor.BeginTask (GettextCatalog.GetString ("Analyzing project"), analysisProject.Documents.Count ());
+						Parallel.ForEach (analysisProject.Documents, async document => {
+							var model = await document.GetSemanticModelAsync ().ConfigureAwait (false);
+							var root = await model.SyntaxTree.GetRootAsync ().ConfigureAwait (false);
+							root.DescendantNodes (node => {
+								var expr = node as ExpressionSyntax;
+								if (expr != null) {
+									var info = model.GetSymbolInfo (expr);
+									if (info.Symbol == null || info.Symbol.ContainingAssembly == null)
+										return true;
+									if (projectRef.Reference.IndexOf (',') >= 0) {
+										if (!string.Equals (info.Symbol.ContainingAssembly.ToString (), projectRef.Reference, StringComparison.OrdinalIgnoreCase))
+											return true;
+									} else {
+										if (!info.Symbol.ContainingAssembly.ToString ().StartsWith (projectRef.Reference, StringComparison.OrdinalIgnoreCase))
+											return true;
+									}
+									monitor.ReportResult (new MemberReference (info.Symbol, document.FilePath, node.Span.Start, node.Span.Length));
+									return false;
+								}
+								return true;
+							}).Count ();
+							monitor.Step ();
+						});
+						monitor.EndTask ();
+					}
+				}).ConfigureAwait (false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindReferencesHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindReferencesHandler.cs
new file mode 100644
index 0000000000..bbd792a985
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/FindReferencesHandler.cs
@@ -0,0 +1,191 @@
+// 
+// FindReferencesHandler.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Threading;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using MonoDevelop.Refactoring;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Ide.Tasks;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class FindReferencesHandler
+	{
+		internal static void FindRefs (ISymbol symbol)
+		{
+			var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true);
+			var workspace = TypeSystemService.Workspace as MonoDevelopWorkspace;
+			if (workspace == null)
+				return;
+			var solution = workspace.CurrentSolution;
+			Task.Run (async delegate {
+				try {
+					var antiDuplicatesSet = new HashSet<SearchResult> (new SearchResultComparer ());
+					foreach (var loc in symbol.Locations) {
+						if (!loc.IsInSource)
+							continue;
+						var fileName = loc.SourceTree.FilePath;
+						var offset = loc.SourceSpan.Start;
+						string projectedName;
+						int projectedOffset;
+						if (workspace.TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) {
+							fileName = projectedName;
+							offset = projectedOffset;
+						}
+						var sr = new SearchResult (new FileProvider (fileName), offset, loc.SourceSpan.Length);
+						antiDuplicatesSet.Add (sr);
+						monitor.ReportResult (sr);
+					}
+
+					foreach (var mref in await SymbolFinder.FindReferencesAsync (symbol, solution).ConfigureAwait (false)) {
+						foreach (var loc in mref.Locations) {
+							var fileName = loc.Document.FilePath;
+							var offset = loc.Location.SourceSpan.Start;
+							string projectedName;
+							int projectedOffset;
+							if (workspace.TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) {
+								fileName = projectedName;
+								offset = projectedOffset;
+							}
+							var sr = new SearchResult (new FileProvider (fileName), offset, loc.Location.SourceSpan.Length);
+							if (antiDuplicatesSet.Add (sr)) {
+								monitor.ReportResult (sr);
+							}
+						}
+					}
+				} catch (Exception ex) {
+					if (monitor != null)
+						monitor.ReportError ("Error finding references", ex);
+					else
+						LoggingService.LogError ("Error finding references", ex);
+				} finally {
+					if (monitor != null)
+						monitor.Dispose ();
+				}
+			});
+		}
+
+		public void Update (CommandInfo info)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null) {
+				info.Enabled = false;
+				return;
+			}
+			var pd = doc.ParsedDocument.GetAst<SemanticModel> ();
+			info.Enabled = pd != null;
+		}
+
+		public void Run (object data)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+
+			var info = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor).Result;
+			var sym = info.Symbol ?? info.DeclaredSymbol;
+			if (sym != null) {
+				if (sym.Kind == SymbolKind.Local || sym.Kind == SymbolKind.Parameter || sym.Kind == SymbolKind.TypeParameter) {
+					FindRefs (sym);
+				} else {
+					RefactoringService.FindReferencesAsync (FilterSymbolForFindReferences (sym).GetDocumentationCommentId ());
+				}
+			}
+		}
+
+		internal static ISymbol FilterSymbolForFindReferences (ISymbol sym)
+		{
+			var meth = sym as IMethodSymbol;
+			if (meth != null && meth.IsReducedExtension ()) {
+				return meth.ReducedFrom;
+			}
+			return sym;
+		}
+	}
+
+	
+
+	class FindAllReferencesHandler
+	{
+
+		public void Update (CommandInfo info)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null) {
+				info.Enabled = false;
+				return;
+			}
+			var pd = doc.ParsedDocument.GetAst<SemanticModel> ();
+			info.Enabled = pd != null;
+		}
+
+		public void Run (object data)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			
+			var info = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor).Result;
+			var sym = info.Symbol ?? info.DeclaredSymbol;
+			if (sym != null) {
+				if (sym.Kind == SymbolKind.Local || sym.Kind == SymbolKind.Parameter || sym.Kind == SymbolKind.TypeParameter) {
+					FindReferencesHandler.FindRefs (sym);
+				} else {
+					RefactoringService.FindAllReferencesAsync (FindReferencesHandler.FilterSymbolForFindReferences (sym).GetDocumentationCommentId ());
+				}
+			}
+		}
+	}
+
+	class SearchResultComparer : IEqualityComparer<SearchResult>
+	{
+		public bool Equals (SearchResult x, SearchResult y)
+		{
+			return x.FileName == y.FileName &&
+				        x.Offset == y.Offset &&
+				        x.Length == y.Length;
+		}
+
+		public int GetHashCode (SearchResult obj)
+		{
+			int hash = 17;
+			hash = hash * 23 + obj.Offset.GetHashCode ();
+			hash = hash * 23 + obj.Length.GetHashCode ();
+			hash = hash * 23 + (obj.FileName ?? "").GetHashCode ();
+			return hash;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs
new file mode 100644
index 0000000000..fef916d350
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoBaseDeclarationHandler.cs
@@ -0,0 +1,112 @@
+//
+// GotoBaseDeclarationHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide;
+using System.Linq;
+using MonoDevelop.Core;
+using MonoDevelop.Refactoring;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	static class GotoBaseDeclarationHandler
+	{
+		public static string GetDescription (ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException ("symbol");
+			switch (symbol.Kind) {
+			case SymbolKind.NamedType:
+				return GettextCatalog.GetString ("Go to _Base Type");
+			case SymbolKind.Property:
+				var property = (IPropertySymbol)symbol;
+				return property.OverriddenProperty != null ? GettextCatalog.GetString ("Go to _Base Property") : GettextCatalog.GetString ("Go to _Interface Property");
+			case SymbolKind.Event:
+				var evt = (IEventSymbol)symbol;
+				return evt.OverriddenEvent != null ? GettextCatalog.GetString ("Go to _Base Event") : GettextCatalog.GetString ("Go to _Interface Event");
+			case SymbolKind.Method:
+				var method = (IMethodSymbol)symbol;
+				return method.OverriddenMethod != null ? GettextCatalog.GetString ("Go to _Base Method") : GettextCatalog.GetString ("Go to _Interface Method");
+			}
+			return GettextCatalog.GetString ("Go to _Base Symbol");
+		}
+
+		public static bool CanGotoBase (ISymbol symbol)
+		{
+			if (symbol == null)
+				return false;
+			switch (symbol.Kind) {
+			case SymbolKind.NamedType:
+				return true;
+			case SymbolKind.Property:
+				var property = (IPropertySymbol)symbol;
+				return property.OverriddenProperty != null || property.ExplicitInterfaceImplementations.Length > 0;
+			case SymbolKind.Event:
+				var evt = (IEventSymbol)symbol;
+				return evt.OverriddenEvent != null || evt.ExplicitInterfaceImplementations.Length > 0;
+			case SymbolKind.Method:
+				var method = (IMethodSymbol)symbol;
+				return method.OverriddenMethod != null || method.ExplicitInterfaceImplementations.Length > 0;
+			}
+			return false;
+		}
+
+		public static void GotoBase (MonoDevelop.Ide.Gui.Document doc, ISymbol symbol)
+		{
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			if (symbol == null)
+				throw new ArgumentNullException ("symbol");
+			switch (symbol.Kind) {
+			case SymbolKind.NamedType:
+				RefactoringService.RoslynJumpToDeclaration (((ITypeSymbol)symbol).BaseType, doc.Project);
+				break;
+			case SymbolKind.Property:
+				var property = (IPropertySymbol)symbol;
+				if (property.OverriddenProperty != null)
+					RefactoringService.RoslynJumpToDeclaration (property.OverriddenProperty, doc.Project);
+				else
+					RefactoringService.RoslynJumpToDeclaration (property.ExplicitInterfaceImplementations.First (), doc.Project);
+				break;
+			case SymbolKind.Event:
+				var evt = (IEventSymbol)symbol;
+				if (evt.OverriddenEvent != null)
+					RefactoringService.RoslynJumpToDeclaration (evt.OverriddenEvent, doc.Project);
+				else
+					RefactoringService.RoslynJumpToDeclaration (evt.ExplicitInterfaceImplementations.First (), doc.Project);
+				break;
+			case SymbolKind.Method:
+				var method = (IMethodSymbol)symbol;
+				if (method.OverriddenMethod != null)
+					RefactoringService.RoslynJumpToDeclaration (method.OverriddenMethod, doc.Project);
+				else
+					RefactoringService.RoslynJumpToDeclaration (method.ExplicitInterfaceImplementations.First (), doc.Project);
+				break;
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoDeclarationHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoDeclarationHandler.cs
new file mode 100644
index 0000000000..7ca54c08f6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/GotoDeclarationHandler.cs
@@ -0,0 +1,83 @@
+// 
+// GotoDeclarationHandler.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using System.Threading;
+using System;
+using Microsoft.CodeAnalysis.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Features.GotoDefinition;
+using Mono.Posix;
+using MonoDevelop.Ide.TypeSystem;
+using System.Collections.Generic;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class GotoDeclarationHandler : CommandHandler
+	{
+		internal static MonoDevelop.Ide.FindInFiles.SearchResult GetJumpTypePartSearchResult (Microsoft.CodeAnalysis.ISymbol part, Microsoft.CodeAnalysis.Location location)
+		{
+			var provider = new MonoDevelop.Ide.FindInFiles.FileProvider (location.SourceTree.FilePath);
+			var doc = TextEditorFactory.CreateNewDocument ();
+			doc.Text = provider.ReadString ();
+			int position = location.SourceSpan.Start;
+			while (position + part.Name.Length < doc.Length) {
+				if (doc.GetTextAt (position, part.Name.Length) == part.Name)
+					break;
+				position++;
+			}
+			return new MonoDevelop.Ide.FindInFiles.SearchResult (provider, position, part.Name.Length);
+		}
+
+		protected override void Run (object data)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			Run (doc);
+		}
+
+		public static void Run (MonoDevelop.Ide.Gui.Document doc)
+		{
+			GoToDefinitionService.TryGoToDefinition (doc.AnalysisDocument, doc.Editor.CaretOffset, default(CancellationToken));
+		}
+		
+		public static void JumpToDeclaration (MonoDevelop.Ide.Gui.Document doc, RefactoringSymbolInfo info)
+		{
+			if (info.Symbol != null)
+				RefactoringService.RoslynJumpToDeclaration (info.Symbol, doc.Project);
+			if (info.CandidateSymbols.Length > 0)
+				RefactoringService.RoslynJumpToDeclaration (info.CandidateSymbols[0], doc.Project);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs
index 17de3d3aaa..20374b3452 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs
@@ -1,76 +1,91 @@
-// 
-// HelperMethods.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2011 Xamarin Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Refactoring;
-
-namespace MonoDevelop.CSharp.Refactoring
-{
-	static class HelperMethods
-	{
-		public static TextReplaceChange GetRemoveNodeChange (this TextEditorData editor, AstNode n)
-		{
-			var change = new TextReplaceChange ();
-			change.FileName = editor.FileName;
-			change.Offset = editor.LocationToOffset (n.StartLocation);
-			change.RemovedChars = editor.LocationToOffset (n.EndLocation) - change.Offset;
-			
-			// remove EOL, when line is empty
-			var line = editor.GetLineByOffset (change.Offset);
-			if (line != null && line.Length == change.RemovedChars)
-				change.RemovedChars += line.DelimiterLength;
-			return change;
-		}
-
-		public static ICSharpCode.NRefactory.CSharp.TextEditorOptions CreateNRefactoryTextEditorOptions (this TextEditorData doc)
-		{
-			return new ICSharpCode.NRefactory.CSharp.TextEditorOptions () {
-				TabsToSpaces = doc.TabsToSpaces,
-				TabSize = doc.Options.TabSize,
-				IndentSize = doc.Options.IndentationSize,
-				ContinuationIndent = doc.Options.IndentationSize,
-				LabelIndent = -doc.Options.IndentationSize,
-				EolMarker = doc.EolMarker,
-				IndentBlankLines = doc.Options.IndentStyle != IndentStyle.Virtual,
-				WrapLineLength = doc.Options.RulerColumn
-			};
-		}
-
-		public static void RemoveNode (this TextEditorData editor, AstNode n)
-		{
-			var change = editor.GetRemoveNodeChange (n);
-			editor.Remove (change.Offset, change.RemovedChars);
-		}
-		public static void Replace (this TextEditorData editor, AstNode n, AstNode replaceWith)
-		{
-			var change = editor.GetRemoveNodeChange (n);
-			editor.Replace (change.Offset, change.RemovedChars, replaceWith.ToString ());
-		}
-	}
-}
-
+//// 
+//// HelperMethods.cs
+////  
+//// Author:
+////       Mike Krüger <mkrueger@xamarin.com>
+//// 
+//// Copyright (c) 2011 Xamarin Inc.
+//// 
+//// Permission is hereby granted, free of charge, to any person obtaining a copy
+//// of this software and associated documentation files (the "Software"), to deal
+//// in the Software without restriction, including without limitation the rights
+//// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//// copies of the Software, and to permit persons to whom the Software is
+//// furnished to do so, subject to the following conditions:
+//// 
+//// The above copyright notice and this permission notice shall be included in
+//// all copies or substantial portions of the Software.
+//// 
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//// THE SOFTWARE.
+//using System;
+//using ICSharpCode.NRefactory.CSharp;
+//using MonoDevelop.Ide.Gui;
+//using MonoDevelop.Refactoring;
+//using MonoDevelop.Ide.Editor;
+//
+//namespace MonoDevelop.CSharp.Refactoring
+//{
+//	static class HelperMethods
+//	{
+//		public static TextReplaceChange GetRemoveNodeChange (this IReadonlyTextDocument editor, AstNode n)
+//		{
+//			var change = new TextReplaceChange ();
+//			change.FileName = editor.FileName;
+//			change.Offset = editor.LocationToOffset (n.StartLocation);
+//			change.RemovedChars = editor.LocationToOffset (n.EndLocation) - change.Offset;
+//			
+//			// remove EOL, when line is empty
+//			var line = editor.GetLineByOffset (change.Offset);
+//			if (line != null && line.Length == change.RemovedChars)
+//				change.RemovedChars += line.DelimiterLength;
+//			return change;
+//		}
+//
+//		public static ICSharpCode.NRefactory.CSharp.TextEditorOptions CreateNRefactoryTextEditorOptions (this IReadonlyTextDocument doc, MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy policy, MonoDevelop.Ide.Gui.Content.TextStylePolicy textPolicy)
+//		{
+//			return new ICSharpCode.NRefactory.CSharp.TextEditorOptions () {
+//				TabsToSpaces = textPolicy.TabsToSpaces,
+//				TabSize = textPolicy.TabWidth,
+//				IndentSize = textPolicy.IndentWidth,
+//				ContinuationIndent = textPolicy.IndentWidth,
+//				LabelIndent = -textPolicy.IndentWidth,
+//				EolMarker = doc.GetEolMarker (),
+//				IndentBlankLines = DefaultSourceEditorOptions.Instance.IndentStyle != IndentStyle.Virtual,
+//				WrapLineLength = DefaultSourceEditorOptions.Instance.RulerColumn
+//			};
+//		}
+//
+//		public static ICSharpCode.NRefactory.CSharp.TextEditorOptions CreateNRefactoryTextEditorOptions (this TextEditor doc)
+//		{
+//			return new ICSharpCode.NRefactory.CSharp.TextEditorOptions () {
+//				TabsToSpaces = doc.Options.TabsToSpaces,
+//				TabSize = doc.Options.TabSize,
+//				IndentSize = doc.Options.IndentationSize,
+//				ContinuationIndent = doc.Options.IndentationSize,
+//				LabelIndent = -doc.Options.IndentationSize,
+//				EolMarker = doc.EolMarker,
+//				IndentBlankLines = doc.Options.IndentStyle != IndentStyle.Virtual,
+//				WrapLineLength = doc.Options.RulerColumn
+//			};
+//		}
+//
+//		public static void RemoveNode (this ITextDocument editor, AstNode n)
+//		{
+//			var change = editor.GetRemoveNodeChange (n);
+//			editor.RemoveText (change.Offset, change.RemovedChars);
+//		}
+//
+//		public static void Replace (this ITextDocument editor, AstNode n, AstNode replaceWith)
+//		{
+//			var change = editor.GetRemoveNodeChange (n);
+//			editor.ReplaceText (change.Offset, change.RemovedChars, replaceWith.ToString ());
+//		}
+//	}
+//}
+//
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/OrganizeImportsCommandHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/OrganizeImportsCommandHandler.cs
new file mode 100644
index 0000000000..7f40207999
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/OrganizeImportsCommandHandler.cs
@@ -0,0 +1,166 @@
+//
+// OrganizeImportsCommandHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Components.Commands;
+using ICSharpCode.NRefactory6.CSharp.ExtractMethod;
+using MonoDevelop.Ide;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using System.Linq;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Features.OrganizeImports;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory6.CSharp.Features.RemoveUnnecessaryImports;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	internal static partial class IWorkspaceExtensions
+	{
+		/// <summary>
+		/// Update the workspace so that the document with the Id of <paramref name="newDocument"/>
+		/// has the text of newDocument.  If the document is open, then this method will determine a
+		/// minimal set of changes to apply to the document.
+		/// </summary>
+		internal static void ApplyDocumentChanges (this Workspace workspace, Document newDocument, CancellationToken cancellationToken)
+		{
+			var oldSolution = workspace.CurrentSolution;
+			var oldDocument = oldSolution.GetDocument (newDocument.Id);
+			var changes = newDocument.GetTextChangesAsync (oldDocument, cancellationToken).WaitAndGetResult (cancellationToken);
+			var newSolution = oldSolution.UpdateDocument (newDocument.Id, changes, cancellationToken);
+			workspace.TryApplyChanges (newSolution);
+		}
+
+
+		internal static Solution UpdateDocument(this Solution solution, DocumentId id, IEnumerable<TextChange> textChanges, CancellationToken cancellationToken)
+		{
+			var oldDocument = solution.GetDocument(id);
+			var oldText = oldDocument.GetTextAsync(cancellationToken).WaitAndGetResult(cancellationToken);
+			var newText = oldText.WithChanges(textChanges);
+			return solution.WithDocumentText(id, newText, PreservationMode.PreserveIdentity);
+		}
+	}
+
+	class RemoveUnusedImportsCommandHandler : CommandHandler
+	{
+		internal static readonly CSharpRemoveUnnecessaryImportsService service = new CSharpRemoveUnnecessaryImportsService();
+
+		public async static Task Run (MonoDevelop.Ide.Gui.Document doc)
+		{
+			var ad = doc.AnalysisDocument;
+			if (ad == null)
+				return;
+			try {
+
+				var model = await ad.GetSemanticModelAsync (default (CancellationToken));
+				var root = model.SyntaxTree.GetRoot (default (CancellationToken));
+				var newDocument = service.RemoveUnnecessaryImports(ad, model, root, default (CancellationToken));
+				ad.Project.Solution.Workspace.ApplyDocumentChanges(newDocument, CancellationToken.None);
+
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while removing unused usings", e);
+			}
+		}
+
+		protected async override void Run ()
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null)
+				return;
+			await Run (doc);
+		}
+	}
+
+	class OrganizeImportsCommandHandler : CommandHandler
+	{
+		internal static readonly CSharpOrganizeImportsService service = new CSharpOrganizeImportsService ();
+
+		public async static Task Run (MonoDevelop.Ide.Gui.Document doc)
+		{
+			var ad = doc.AnalysisDocument;
+			if (ad == null)
+				return;
+			try {
+				Document newDocument = await SortUsingsAsync (ad, default (CancellationToken));
+				ad.Project.Solution.Workspace.ApplyDocumentChanges (newDocument, CancellationToken.None);
+
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while sotring usings", e);
+			}
+		}
+
+		internal static async Task<Document> SortUsingsAsync (Document ad, CancellationToken token)
+		{
+			var policy = IdeApp.Workbench.ActiveDocument.GetFormattingPolicy ();
+			Console.WriteLine (policy.PlaceSystemDirectiveFirst);
+			return await service.OrganizeImportsAsync (ad, policy != null ? policy.PlaceSystemDirectiveFirst : true, token);
+		}
+
+		protected async override void Run ()
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null)
+				return;
+			await Run (doc);
+		}
+	}
+
+	class SortAndRemoveImportsCommandHandler : CommandHandler
+	{
+		public async static Task Run (MonoDevelop.Ide.Gui.Document doc)
+		{
+			var ad = doc.AnalysisDocument;
+			if (ad == null)
+				return;
+			try {
+				Document newDocument = await SortAndRemoveAsync (ad, default (CancellationToken));
+				ad.Project.Solution.Workspace.ApplyDocumentChanges (newDocument, CancellationToken.None);
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while removing unused usings", e);
+			}
+		}
+
+		internal static async Task<Document> SortAndRemoveAsync (Document ad, CancellationToken token)
+		{
+			var model = await ad.GetSemanticModelAsync (token);
+			var root = model.SyntaxTree.GetRoot (token);
+			var newDocument = RemoveUnusedImportsCommandHandler.service.RemoveUnnecessaryImports (ad, model, root, token);
+			return await OrganizeImportsCommandHandler.SortUsingsAsync (newDocument, token);
+		}
+
+		protected async override void Run ()
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null)
+				return;
+			await Run (doc);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RefactoryCommands.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RefactoryCommands.cs
new file mode 100644
index 0000000000..f212a37b76
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RefactoryCommands.cs
@@ -0,0 +1,304 @@
+//
+// RefactoryCommands.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+using MonoDevelop.CodeIssues;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Refactoring;
+using Microsoft.CodeAnalysis.CodeFixes;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Diagnostics;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using MonoDevelop.CSharp.Navigation;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	sealed class CurrentRefactoryOperationsHandler : CommandHandler
+	{
+		protected override void Run (object dataItem)
+		{
+			var del = (Action) dataItem;
+			if (del != null)
+				del ();
+		}
+
+		static CommandInfoSet CreateFixMenu (TextEditor editor, DocumentContext ctx, SemanticModel semanticModel, CodeActionContainer container)
+		{
+			if (editor == null)
+				throw new ArgumentNullException (nameof (editor));
+			if (ctx == null)
+				throw new ArgumentNullException (nameof (ctx));
+			if (container == null)
+				throw new ArgumentNullException (nameof (container));
+			var result = new CommandInfoSet ();
+			result.Text = GettextCatalog.GetString ("Fix");
+			foreach (var diagnostic in container.CodeFixActions) {
+				var info = new CommandInfo (diagnostic.CodeAction.Title);
+				result.CommandInfos.Add (info, new Action (async () => await new CodeActionEditorExtension.ContextActionRunner (diagnostic.CodeAction, editor, ctx).Run ()));
+			}
+			bool firstDiagnosticOption = result.CommandInfos.Count != 0;
+
+			var warningsAtCaret = semanticModel
+				.GetDiagnostics (new TextSpan (editor.CaretOffset, 0))
+				.Where (diag => diag.Severity == DiagnosticSeverity.Warning).ToList ();
+			foreach (var warning in warningsAtCaret) {
+
+				if (firstDiagnosticOption) {
+					result.CommandInfos.AddSeparator ();
+					firstDiagnosticOption = false;
+				}
+
+				var label = GettextCatalog.GetString ("_Options for \"{0}\"", warning.Descriptor.Title);
+				var subMenu = new CommandInfoSet ();
+				subMenu.Text = label;
+
+				var info = new CommandInfo (GettextCatalog.GetString ("_Suppress with #pragma"));
+				subMenu.CommandInfos.Add (info, new Action (async delegate {
+
+					var fixes = await CSharpSuppressionFixProvider.Instance.GetSuppressionsAsync (ctx.AnalysisDocument, new TextSpan (editor.CaretOffset, 0), new [] { warning }, default (CancellationToken)).ConfigureAwait (false);
+					foreach (var f in fixes) {
+						CodeDiagnosticDescriptor.RunAction (ctx, f.Action, default (CancellationToken));
+					}
+				}));
+
+				result.CommandInfos.Add (subMenu);
+			}
+
+			foreach (var fix in container.DiagnosticsAtCaret) {
+				var inspector = BuiltInCodeDiagnosticProvider.GetCodeDiagnosticDescriptor (fix.Id);
+				if (inspector == null)
+					continue;
+
+				if (firstDiagnosticOption) {
+					result.CommandInfos.AddSeparator ();
+					firstDiagnosticOption = false;
+				}
+
+				var label = GettextCatalog.GetString ("_Options for \"{0}\"", fix.GetMessage ());
+				var subMenu = new CommandInfoSet ();
+				subMenu.Text = label;
+
+				//				if (inspector.CanSuppressWithAttribute) {
+				//					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with attribute"),
+				//						delegate {
+				//							
+				//							inspector.SuppressWithAttribute (Editor, DocumentContext, GetTextSpan (fix.Item2)); 
+				//						});
+				//					subMenu.Add (menuItem);
+				//				}
+
+				if (inspector.CanDisableWithPragma) {
+					var info = new CommandInfo (GettextCatalog.GetString ("_Suppress with #pragma"));
+					subMenu.CommandInfos.Add (info, new Action (() => inspector.DisableWithPragma (editor, ctx, fix)));
+
+					info = new CommandInfo (GettextCatalog.GetString ("_Suppress with file"));
+					subMenu.CommandInfos.Add (info, new Action (() => inspector.DisableWithFile (editor, ctx, fix)));
+				}
+
+				var configInfo = new CommandInfo (GettextCatalog.GetString ("_Configure Rule"));
+				subMenu.CommandInfos.Add (configInfo, new Action (() => {
+					IdeApp.Workbench.ShowGlobalPreferencesDialog (null, "C#", dialog => {
+						var panel = dialog.GetPanel<CodeIssuePanel> ("C#");
+						if (panel == null)
+							return;
+						panel.Widget.SelectCodeIssue (inspector.IdString);
+					});
+				}));
+
+				foreach (var fix2 in container.CodeFixActions) {
+
+					var provider = fix2.Diagnostic.GetCodeFixProvider ().GetFixAllProvider ();
+					if (provider == null)
+						continue;
+					if (!provider.GetSupportedFixAllScopes ().Contains (FixAllScope.Document))
+						continue;
+					var subMenu2 = new CommandInfoSet ();
+					subMenu2.Text = GettextCatalog.GetString ("Fix all");
+					var diagnosticAnalyzer = fix2.Diagnostic.GetCodeDiagnosticDescriptor (LanguageNames.CSharp).GetProvider ();
+					if (!diagnosticAnalyzer.SupportedDiagnostics.Contains (fix.Descriptor))
+						continue;
+
+					var info = new CommandInfo (GettextCatalog.GetString ("In _Document"));
+					subMenu2.CommandInfos.Add (info, new Action (async delegate {
+
+						var fixAllDiagnosticProvider = new CodeActionEditorExtension.FixAllDiagnosticProvider (diagnosticAnalyzer.SupportedDiagnostics.Select (d => d.Id).ToImmutableHashSet (), async (Microsoft.CodeAnalysis.Document doc, ImmutableHashSet<string> diagnostics, CancellationToken token) => {
+
+							var model = await doc.GetSemanticModelAsync (token);
+							var compilationWithAnalyzer = model.Compilation.WithAnalyzers (new [] { diagnosticAnalyzer }.ToImmutableArray (), null, token);
+
+							return await compilationWithAnalyzer.GetAnalyzerSemanticDiagnosticsAsync (model, null, token);
+						}, (arg1, arg2, arg3, arg4) => {
+							return Task.FromResult ((IEnumerable<Diagnostic>)new Diagnostic [] { });
+						});
+						var ctx2 = new FixAllContext (
+							ctx.AnalysisDocument,
+							fix2.Diagnostic.GetCodeFixProvider (),
+							FixAllScope.Document,
+							fix2.CodeAction.EquivalenceKey,
+							diagnosticAnalyzer.SupportedDiagnostics.Select (d => d.Id),
+							fixAllDiagnosticProvider,
+							default (CancellationToken)
+						);
+						var fixAll = await provider.GetFixAsync (ctx2);
+						using (var undo = editor.OpenUndoGroup ()) {
+							CodeDiagnosticDescriptor.RunAction (ctx, fixAll, default (CancellationToken));
+						}
+					}));
+					subMenu.CommandInfos.Add (subMenu2);
+				}
+				result.CommandInfos.Add (subMenu);
+			}
+
+			return result;
+		}
+
+		protected override void Update (CommandArrayInfo ainfo)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null)
+				return;
+			var semanticModel = doc.ParsedDocument.GetAst<SemanticModel> ();
+			if (semanticModel == null)
+				return;
+			var task = RefactoringSymbolInfo.GetSymbolInfoAsync (doc, doc.Editor);
+			if (!task.Wait (2000))
+				return;
+			var info = task.Result;
+			bool added = false;
+
+			var ext = doc.GetContent<CodeActionEditorExtension> ();
+
+			if (ext != null) {
+				var fixMenu = CreateFixMenu (doc.Editor, doc, semanticModel, ext.GetCurrentFixes ());
+				if (fixMenu.CommandInfos.Count > 0) {
+					ainfo.Add (fixMenu, null);
+					added = true;
+				}
+			}
+			var ciset = new CommandInfoSet ();
+			ciset.Text = GettextCatalog.GetString ("Refactor");
+
+			bool canRename = RenameHandler.CanRename (info.Symbol ?? info.DeclaredSymbol);
+			if (canRename) {
+				ciset.CommandInfos.Add (IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.EditCommands.Rename), new Action (async delegate {
+					await new MonoDevelop.Refactoring.Rename.RenameRefactoring ().Rename (info.Symbol ?? info.DeclaredSymbol);
+				}));
+				added = true;
+			}
+			bool first = true;
+			if (ext != null) {
+				foreach (var fix in ext.GetCurrentFixes ().CodeRefactoringActions) {
+					if (added & first && ciset.CommandInfos.Count > 0)
+						ciset.CommandInfos.AddSeparator ();
+					var info2 = new CommandInfo (fix.CodeAction.Title);
+					ciset.CommandInfos.Add (info2, new Action (async () => await new CodeActionEditorExtension.ContextActionRunner (fix.CodeAction, doc.Editor, doc).Run ()));
+					added = true;
+					first = false;
+				}
+			}
+
+			if (ciset.CommandInfos.Count > 0) {
+				ainfo.Add (ciset, null);
+				added = true;
+			}
+
+			var gotoDeclarationSymbol = info.Symbol;
+			if (gotoDeclarationSymbol == null && info.DeclaredSymbol != null && info.DeclaredSymbol.Locations.Length > 1)
+				gotoDeclarationSymbol = info.DeclaredSymbol;
+			if (IdeApp.ProjectOperations.CanJumpToDeclaration (gotoDeclarationSymbol) || gotoDeclarationSymbol == null && IdeApp.ProjectOperations.CanJumpToDeclaration (info.CandidateSymbols.FirstOrDefault ())) {
+				
+				var type = (gotoDeclarationSymbol ?? info.CandidateSymbols.FirstOrDefault ()) as INamedTypeSymbol;
+				if (type != null && type.Locations.Length > 1) {
+					var declSet = new CommandInfoSet ();
+					declSet.Text = GettextCatalog.GetString ("_Go to Declaration");
+					foreach (var part in type.Locations) {
+						var loc = part.GetLineSpan ();
+						declSet.CommandInfos.Add (string.Format (GettextCatalog.GetString ("{0}, Line {1}"), FormatFileName (part.SourceTree.FilePath), loc.StartLinePosition.Line + 1), new Action (() => IdeApp.ProjectOperations.JumpTo (type, part, doc.Project)));
+					}
+					ainfo.Add (declSet);
+				} else {
+					ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.GotoDeclaration), new Action (() => GotoDeclarationHandler.Run (doc)));
+				}
+				added = true;
+			}
+
+
+			if (info.DeclaredSymbol != null && GotoBaseDeclarationHandler.CanGotoBase (info.DeclaredSymbol)) {
+				ainfo.Add (GotoBaseDeclarationHandler.GetDescription (info.DeclaredSymbol), new Action (() => GotoBaseDeclarationHandler.GotoBase (doc, info.DeclaredSymbol)));
+				added = true;
+			}
+
+			var sym = info.Symbol ?? info.DeclaredSymbol;
+			if (doc.HasProject && sym != null) {
+				ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindReferences), new System.Action (() => {
+
+					if (sym.Kind == SymbolKind.Local || sym.Kind == SymbolKind.Parameter || sym.Kind == SymbolKind.TypeParameter) {
+						FindReferencesHandler.FindRefs (sym);
+					} else {
+						RefactoringService.FindReferencesAsync (FindReferencesHandler.FilterSymbolForFindReferences (sym).GetDocumentationCommentId ());
+					}
+
+				}));
+				try {
+					if (Microsoft.CodeAnalysis.FindSymbols.SymbolFinder.FindSimilarSymbols (sym, semanticModel.Compilation).Count () > 1)
+						ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindAllReferences), new System.Action (() => RefactoringService.FindAllReferencesAsync (FindReferencesHandler.FilterSymbolForFindReferences (sym).GetDocumentationCommentId ())));
+				} catch (Exception) {
+					// silently ignore roslyn bug.
+				}
+			}
+			added = true;
+
+		}
+
+		static string FormatFileName (string fileName)
+		{
+			if (fileName == null)
+				return null;
+			char[] seperators = { System.IO.Path.DirectorySeparatorChar, System.IO.Path.AltDirectorySeparatorChar };
+			int idx = fileName.LastIndexOfAny (seperators);
+			if (idx > 0) 
+				idx = fileName.LastIndexOfAny (seperators, idx - 1);
+			if (idx > 0) 
+				return "..." + fileName.Substring (idx);
+			return fileName;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs
new file mode 100644
index 0000000000..a59854a2e1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs
@@ -0,0 +1,96 @@
+// 
+// RenameHandler.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Refactoring.Rename;
+using MonoDevelop.Ide.TypeSystem;
+using System.Threading.Tasks;
+using System.Threading;
+
+namespace MonoDevelop.CSharp.Refactoring
+{
+	class RenameHandler : CommandHandler
+	{
+		public void UpdateCommandInfo (CommandInfo ci)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			ci.Enabled = doc.ParsedDocument != null && doc.ParsedDocument.GetAst<SemanticModel> () != null;
+		}
+
+		internal static bool CanRename (ISymbol symbol)
+		{
+			if (symbol == null || symbol.IsDefinedInMetadata ())
+				return false;
+			switch (symbol.Kind) {
+			case SymbolKind.Local:
+			case SymbolKind.Parameter:
+			case SymbolKind.NamedType:
+			case SymbolKind.Namespace:
+			case SymbolKind.Method:
+			case SymbolKind.Field:
+			case SymbolKind.Property:
+			case SymbolKind.Event:
+			case SymbolKind.Label:
+			case SymbolKind.TypeParameter:
+			case SymbolKind.RangeVariable:
+				return true;
+			}
+			return false;
+		}
+		
+		protected override async void Run (object data)
+		{
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null || doc.FileName == FilePath.Null)
+				return;
+			await Run (doc.Editor, doc);
+		}
+
+		internal async Task Run (TextEditor editor, DocumentContext ctx)
+		{
+			var cts = new CancellationTokenSource ();
+			var getSymbolTask = RefactoringSymbolInfo.GetSymbolInfoAsync (ctx, editor, cts.Token);
+			var message = GettextCatalog.GetString ("Resolving symbol…");
+			var info = await MessageService.ExecuteTaskAndShowWaitDialog (getSymbolTask, message, cts);
+			var sym = info.DeclaredSymbol ?? info.Symbol;
+			if (!CanRename (sym))
+				return;
+			await new RenameRefactoring ().Rename (sym);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/DebuggerExpressionResolver.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/DebuggerExpressionResolver.cs
new file mode 100644
index 0000000000..9ec0edec0f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/DebuggerExpressionResolver.cs
@@ -0,0 +1,171 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+//
+// DebuggerExpressionResolver.cs
+//
+// Author:
+//       David Karlaš <david.karlas@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Debugger;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.CSharp.Resolver
+{
+	static class DebuggerExpressionResolver
+	{
+		public static async Task<DebugDataTipInfo> ResolveAsync (IReadonlyTextDocument editor, DocumentContext document, int offset, CancellationToken cancellationToken)
+		{
+			var analysisDocument = document.AnalysisDocument;
+			DebugDataTipInfo result;
+			CompilationUnitSyntax compilationUnit = null;
+			if (analysisDocument == null) {
+				compilationUnit = SyntaxFactory.ParseCompilationUnit (editor.Text);
+				result = GetInfo (compilationUnit, null, offset, default(CancellationToken));
+			} else {
+				compilationUnit = await analysisDocument.GetCSharpSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+				var semantic = document.ParsedDocument?.GetAst<SemanticModel> ();
+				if (semantic == null) {
+					semantic = await analysisDocument.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+				}
+				result = GetInfo (compilationUnit, semantic, offset, default(CancellationToken));
+			}
+			if (result.IsDefault || !result.Span.Contains(offset)) {
+				return new DebugDataTipInfo (result.Span, null);
+			} else if (result.Text == null) {
+				return new DebugDataTipInfo (result.Span, compilationUnit.GetText ().ToString (result.Span));
+			} else {
+				return result;
+			}
+		}
+
+		static DebugDataTipInfo GetInfo (CompilationUnitSyntax root, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var token = root.FindToken (position);
+			string textOpt = null;
+
+			var expression = token.Parent as ExpressionSyntax;
+			if (expression == null) {
+				if (Microsoft.CodeAnalysis.CSharpExtensions.IsKind (token, SyntaxKind.IdentifierToken)) {
+					if (token.Parent is MethodDeclarationSyntax) {
+						return default(DebugDataTipInfo);
+					}
+					if (semanticModel != null) {
+						if (token.Parent is PropertyDeclarationSyntax) {
+							var propertySymbol = semanticModel.GetDeclaredSymbol ((PropertyDeclarationSyntax)token.Parent);
+							if (propertySymbol.IsStatic) {
+								textOpt = propertySymbol.ContainingType.GetFullName () + "." + propertySymbol.Name;
+							}
+						} else if (token.GetAncestor<FieldDeclarationSyntax> () != null) {
+							var fieldSymbol = semanticModel.GetDeclaredSymbol (token.GetAncestor<VariableDeclaratorSyntax> ());
+							if (fieldSymbol.IsStatic) {
+								textOpt = fieldSymbol.ContainingType.GetFullName () + "." + fieldSymbol.Name;
+							}
+						}
+					}
+
+					return new DebugDataTipInfo (token.Span, text: textOpt);
+				} else {
+					return default(DebugDataTipInfo);
+				}
+			}
+
+			if (expression.IsAnyLiteralExpression ()) {
+				// If the user hovers over a literal, give them a DataTip for the type of the
+				// literal they're hovering over.
+				// Partial semantics should always be sufficient because the (unconverted) type
+				// of a literal can always easily be determined.
+				var type = semanticModel?.GetTypeInfo (expression, cancellationToken).Type;
+				return type == null
+					? default(DebugDataTipInfo)
+						: new DebugDataTipInfo (expression.Span, type.GetFullName ());
+			}

+

+			// Check if we are invoking method and if we do return null so we don't invoke it

+			if (expression.Parent is InvocationExpressionSyntax ||
+				(semanticModel != null &&

+				  expression.Parent is MemberAccessExpressionSyntax &&

+				  expression.Parent.Parent is InvocationExpressionSyntax &&

+				  semanticModel.GetSymbolInfo (token).Symbol is IMethodSymbol))

+			{
+				return default(DebugDataTipInfo);
+			}
+
+			if (expression.IsRightSideOfDotOrArrow ()) {
+				var curr = expression;
+				while (true) {
+					var conditionalAccess = curr.GetParentConditionalAccessExpression ();
+					if (conditionalAccess == null) {
+						break;
+					}
+
+					curr = conditionalAccess;
+				}
+
+				if (curr == expression) {
+					// NB: Parent.Span, not Span as below.
+					return new DebugDataTipInfo (expression.Parent.Span, text: null);
+				}
+
+				// NOTE: There may not be an ExpressionSyntax corresponding to the range we want.
+				// For example, for input a?.$$B?.C, we want span [|a?.B|]?.C.
+				return new DebugDataTipInfo (TextSpan.FromBounds (curr.SpanStart, expression.Span.End), text: null);
+			}
+
+			var typeSyntax = expression as TypeSyntax;
+			if (typeSyntax != null && typeSyntax.IsVar) {
+				// If the user is hovering over 'var', then pass back the full type name that 'var'
+				// binds to.
+				var type = semanticModel?.GetTypeInfo (typeSyntax, cancellationToken).Type;
+				if (type != null) {
+					textOpt = type.GetFullName ();
+				}
+			}
+
+			if (semanticModel != null) {
+				if (expression is IdentifierNameSyntax) {
+					if (expression.Parent is ObjectCreationExpressionSyntax) {
+						textOpt = ((INamedTypeSymbol)semanticModel.GetSymbolInfo (expression).Symbol).GetFullName ();
+					} else if (expression.Parent is AssignmentExpressionSyntax && expression.Parent.Parent is InitializerExpressionSyntax) {
+						var variable = expression.GetAncestor<VariableDeclaratorSyntax> ();
+						if (variable != null) {
+							textOpt = variable.Identifier.Text + "." + ((IdentifierNameSyntax)expression).Identifier.Text;
+						}
+					}
+
+				}
+			}
+			return new DebugDataTipInfo (expression.Span, textOpt);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs
index e10e928eb4..9e74e510a1 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs
@@ -41,35 +41,30 @@ using MonoDevelop.Ide.CodeTemplates;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Refactoring;
 using MonoDevelop.CSharp.Parser;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Completion;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Components.PropertyGrid.PropertyEditors;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Options;
 
 namespace MonoDevelop.CSharp
 {
 	static class HelperMethods
 	{
-		public static void SetText (this CompletionData data, string text)
-		{
-			if (data is CompletionData) {
-				((CompletionData)data).CompletionText = text;
-			} else if (data is IEntityCompletionData) {
-				((IEntityCompletionData)data).CompletionText = text;
-			} else {
-				System.Console.WriteLine("Unknown completion data:" + data);
-			}
-		}
+//		public static void SetText (this CompletionData data, string text)
+//		{
+//			if (data is CompletionData) {
+//				((CompletionData)data).CompletionText = text;
+//			} else if (data is IEntityCompletionData) {
+//				((IEntityCompletionData)data).CompletionText = text;
+//			} else {
+//				System.Console.WriteLine("Unknown completion data:" + data);
+//			}
+//		}
 		
-		public static ICSharpCode.NRefactory.CSharp.SyntaxTree Parse (this ICSharpCode.NRefactory.CSharp.CSharpParser parser, TextEditorData data)
-		{
-			using (var stream = data.OpenStream ()) {
-				return parser.Parse (stream, data.Document.FileName);
-			}
-		}
+//		public static ICSharpCode.NRefactory.CSharp.SyntaxTree Parse (this ICSharpCode.NRefactory.CSharp.CSharpParser parser, IReadonlyTextDocument data)
+//		{
+//			return parser.Parse (new ICSharpCode.NRefactory.Editor.StringTextSource (data.Text), data.FileName);
+//		}
 		
 //		public static AstNode ParseSnippet (this ICSharpCode.NRefactory.CSharp.CSharpParser parser, TextEditorData data)
 //		{
@@ -90,51 +85,53 @@ namespace MonoDevelop.CSharp
 //			}
 //		}
 		
-		internal static MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy GetFormattingPolicy (this MonoDevelop.Ide.Gui.Document doc)
+		internal static MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy GetFormattingPolicy (this DocumentContext doc)
 		{
-			var policyParent = doc.Project != null ? doc.Project.Policies : null;
+			var policyParent = doc?.Project?.Policies;
 			var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
 			var codePolicy = policyParent != null ? policyParent.Get<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types) : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			return codePolicy;
 		}
 
-		public static CSharpFormattingOptions GetFormattingOptions (this MonoDevelop.Ide.Gui.Document doc)
+		public static OptionSet GetFormattingOptions (this DocumentContext doc)
 		{
-			return GetFormattingPolicy (doc).CreateOptions ();
+			return GetFormattingOptions (doc.Project);
 		}
 		
-		public static CSharpFormattingOptions GetFormattingOptions (this MonoDevelop.Projects.Project project)
+		public static OptionSet GetFormattingOptions (this MonoDevelop.Projects.Project project)
 		{
 			var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
 			var codePolicy = project != null ? project.Policies.Get<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types) :
 				MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
-			return codePolicy.CreateOptions ();
+			var textPolicy = project != null ? project.Policies.Get<TextStylePolicy> (types) :
+				MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
+			return codePolicy.CreateOptions (textPolicy);
 		}
 		
-		public static bool TryResolveAt (this Document doc, DocumentLocation loc, out ResolveResult result, out AstNode node)
-		{
-			if (doc == null)

-				throw new ArgumentNullException ("doc");
-			result = null;
-			node = null;
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null)
-				return false;
-
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			
-			if (unit == null || parsedFile == null)
-				return false;
-			try {
-				result = ResolveAtLocation.Resolve (new Lazy<ICompilation>(() => doc.Compilation), parsedFile, unit, loc, out node);
-				if (result == null || node is Statement)
-					return false;
-			} catch (Exception e) {
-				Console.WriteLine ("Got resolver exception:" + e);
-				return false;
-			}
-			return true;
-		}
+//		public static bool TryResolveAt (this DocumentContext documentContext, DocumentLocation loc, out ResolveResult result, out AstNode node)
+//		{
+//			if (documentContext == null)

+//				throw new ArgumentNullException ("documentContext");
+//			result = null;
+//			node = null;
+//			var parsedDocument = documentContext.ParsedDocument;
+//			if (parsedDocument == null)
+//				return false;
+//
+//			var unit = parsedDocument.GetAst<SyntaxTree> ();
+//			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
+//			
+//			if (unit == null || parsedFile == null)
+//				return false;
+//			try {
+//				result = ResolveAtLocation.Resolve (new Lazy<ICompilation>(() => documentContext.Compilation), parsedFile, unit, loc, out node);
+//				if (result == null || node is Statement)
+//					return false;
+//			} catch (Exception e) {
+//				Console.WriteLine ("Got resolver exception:" + e);
+//				return false;
+//			}
+//			return true;
+//		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs
index 1f73971a9f..b982b84224 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs
@@ -1,21 +1,21 @@
-// 
+//
 // TextEditorResolverProvider.cs
-//  
+//
 // Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
+//       David Karlaš <david.karlas@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,290 +23,66 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System;
 using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Core;
-using Mono.TextEditor;
-using System.Text;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.Editor;
 using System.Linq;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.Threading;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
 
 namespace MonoDevelop.CSharp.Resolver
 {
 	class TextEditorResolverProvider : ITextEditorResolverProvider
 	{
 		#region ITextEditorResolverProvider implementation
-		
-		public string GetExpression (Mono.TextEditor.TextEditorData data, int offset)
-		{
-			if (offset < 0)
-				return "";
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null)
-				return "";
-			var loc = RefactoringService.GetCorrectResolveLocation (doc, data.OffsetToLocation (offset));
-			var unit = doc.ParsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			var node       = unit.GetNodeAt<Expression> (loc.Line, loc.Column);
-			if (unit == null || parsedFile == null || node == null)
-				return "";
-			
-			return data.GetTextBetween (node.StartLocation, node.EndLocation);
-		}
-		
-		
-		public ResolveResult GetLanguageItem (MonoDevelop.Ide.Gui.Document doc, int offset, out DomRegion expressionRegion)
-		{
-			if (offset < 0) {
-				expressionRegion = DomRegion.Empty;
-				return null;
-			}
-			var loc = RefactoringService.GetCorrectResolveLocation (doc, doc.Editor.OffsetToLocation (offset));
-			ResolveResult result;
-			AstNode node;
 
-			if (!doc.TryResolveAt (loc, out result, out node)) {
-				expressionRegion = DomRegion.Empty;
-				return null;
-			}
-			expressionRegion = new DomRegion (node.StartLocation, node.EndLocation);
-			return result;
-		}
-		
-		public ResolveResult GetLanguageItem (MonoDevelop.Ide.Gui.Document doc, int offset, string expression)
+		public ISymbol GetLanguageItem (MonoDevelop.Ide.Gui.Document document, int offset, out DocumentRegion expressionRegion)
 		{
-			if (offset < 0) {
-				return null;
-			}
-
-			var parsedDocument = doc.ParsedDocument;
+			expressionRegion = DocumentRegion.Empty;
+			var parsedDocument = document.ParsedDocument;
 			if (parsedDocument == null)
 				return null;
-			var data = doc.Editor;
-			var loc = data.OffsetToLocation (offset);
-
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			
-			if (unit == null || parsedFile == null) {
+			var model = parsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
 				return null;
+			foreach (var symbol in model.LookupSymbols (offset)) {
+				var firstDeclaration = symbol.DeclaringSyntaxReferences.FirstOrDefault ();
+				if (firstDeclaration != null) {
+					expressionRegion = new DocumentRegion (
+						document.Editor.OffsetToLocation (firstDeclaration.Span.Start),
+						document.Editor.OffsetToLocation (firstDeclaration.Span.End));
+				}
+				return symbol;
 			}
-			var node = unit.GetNodeAt (loc);
-			if (node == null) {
-				return null;
-			}
-			
-			var resolver = new CSharpAstResolver (doc.Compilation, unit, parsedFile);
-			resolver.ApplyNavigator (new NodeListResolveVisitorNavigator (node), CancellationToken.None);
-			var state = resolver.GetResolverStateBefore (node, CancellationToken.None);
-
-			var list = new List<IType> ();
-			int indexOf = expression.IndexOf ('`');
-			if (indexOf != -1) {
-				var intType = new PrimitiveType ("int").ToTypeReference ().Resolve (doc.Compilation);
-				var num = expression.Substring (indexOf + 1);
-				int number = int.Parse (num);
-				for (int i = 0; i < number; i++)
-					list.Add (intType);
-				expression = expression.Remove (indexOf);
-			}
-			return state.LookupSimpleNameOrTypeName (expression, list, NameLookupMode.Expression);
-		}
-		
-		
-		static string paramStr = GettextCatalog.GetString ("Parameter");
-		static string localStr = GettextCatalog.GetString ("Local variable");
-		static string methodStr = GettextCatalog.GetString ("Method");
-
-		static string namespaceStr = GettextCatalog.GetString ("Namespace");		
-		static string GetString (IType type)
-		{
-			switch (type.Kind) {
-			case TypeKind.Class:
-				return GettextCatalog.GetString ("Class");
-			case TypeKind.Interface:
-				return GettextCatalog.GetString ("Interface");
-			case TypeKind.Struct:
-				return GettextCatalog.GetString ("Struct");
-			case TypeKind.Delegate:
-				return GettextCatalog.GetString ("Delegate");
-			case TypeKind.Enum:
-				return GettextCatalog.GetString ("Enum");
-			
-			case TypeKind.Dynamic:
-				return GettextCatalog.GetString ("Dynamic");
-			case TypeKind.TypeParameter:
-				return GettextCatalog.GetString ("Type parameter");
-			
-			case TypeKind.Array:
-				return GettextCatalog.GetString ("Array");
-			case TypeKind.Pointer:
-				return GettextCatalog.GetString ("Pointer");
-			}
-			
 			return null;
 		}
-		
-		static string GetString (IMember member)
-		{
-			switch (member.SymbolKind) {
-			case SymbolKind.Field:
-				var field = member as IField;
-				if (field.IsConst)
-					return GettextCatalog.GetString ("Constant");
-				return GettextCatalog.GetString ("Field");
-			case SymbolKind.Property:
-				return GettextCatalog.GetString ("Property");
-			case SymbolKind.Indexer:
-				return GettextCatalog.GetString ("Indexer");
-				
-			case SymbolKind.Event:
-				return GettextCatalog.GetString ("Event");
-			}
-			return GettextCatalog.GetString ("Member");
-		}
-		
-		string GetConst (object obj)
-		{
-			if (obj is string)
-				return '"' + obj.ToString () + '"';
-			if (obj is char)
-				return "'" + obj + "'";
-			return obj.ToString ();
-		}
-		static CSharpAmbience ambience = new CSharpAmbience ();
 
-		static TypeSystemAstBuilder CreateBuilder (MonoDevelop.Ide.Gui.Document doc, int offset, ICompilation compilation)
+		public ISymbol GetLanguageItem (MonoDevelop.Ide.Gui.Document document, int offset, string identifier)
 		{
-			var ctx = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			var state = ctx.GetResolver (doc.Compilation, doc.Editor.OffsetToLocation (offset));
-			var builder = new TypeSystemAstBuilder (state);
-			builder.AddTypeReferenceAnnotations = true;
-			var dt = state.CurrentTypeDefinition;
-			var declaring = dt != null ? dt.DeclaringTypeDefinition : null;
-			if (declaring != null) {
-				while (dt != null) {
-					if (dt.Equals (declaring)) {
-						builder.AlwaysUseShortTypeNames = true;
-						break;
-					}
-					dt = dt.DeclaringTypeDefinition;
-				}
-			}
-			return builder;
-		}
+			if (document.ParsedDocument == null)
+				return null;
+			var model = document.ParsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
+				return null;
 
-		internal static MonoDevelop.CSharp.Completion.MemberCompletionData.MyAmbience CreateAmbience (Document doc, int offset, ICompilation compilation)
-		{
-			return new MonoDevelop.CSharp.Completion.MemberCompletionData.MyAmbience (CreateBuilder (doc, offset, compilation));
-		}
+			int index = identifier.IndexOf ("`", System.StringComparison.Ordinal);
+			int arity = 0;
+			if (index != -1) {
+				arity = int.Parse (identifier.Substring (index + 1));
+				identifier = identifier.Remove (index);
+			}
 
-		public string CreateTooltip (MonoDevelop.Ide.Gui.Document doc, int offset, ResolveResult result, string errorInformations, Gdk.ModifierType modifierState)
-		{
-			try {
-				OutputSettings settings = new OutputSettings (OutputFlags.ClassBrowserEntries | OutputFlags.IncludeParameterName | OutputFlags.IncludeKeywords | OutputFlags.IncludeMarkup | OutputFlags.UseFullName);
-				// Approximate value for usual case
-				StringBuilder s = new StringBuilder (150);
-				string documentation = null;
-				if (result != null) {
-					if (result is UnknownIdentifierResolveResult) {
-						s.Append (String.Format (GettextCatalog.GetString ("Unresolved identifier '{0}'"), ((UnknownIdentifierResolveResult)result).Identifier));
-					} else if (result.IsError) {
-						s.Append (GettextCatalog.GetString ("Resolve error."));
-					} else if (result is LocalResolveResult) {
-						var lr = (LocalResolveResult)result;
-						s.Append ("<small><i>");
-						s.Append (lr.IsParameter ? paramStr : localStr);
-						s.Append ("</i></small>\n");
-						s.Append (ambience.GetString (lr.Variable.Type, settings));
-						s.Append (" ");
-						s.Append (lr.Variable.Name);
-					} else if (result is MethodGroupResolveResult) {
-						var mrr = (MethodGroupResolveResult)result;
-						s.Append ("<small><i>");
-						s.Append (methodStr);
-						s.Append ("</i></small>\n");
-						var allMethods = new List<IMethod> (mrr.Methods);
-						foreach (var l in mrr.GetExtensionMethods ()) {
-							allMethods.AddRange (l);
-						}
-						var method = allMethods.FirstOrDefault ();
-						if (method != null) {
-							s.Append (GLib.Markup.EscapeText (CreateAmbience (doc, offset, method.Compilation).ConvertEntity (method)));
-							if (allMethods.Count > 1) {
-								int overloadCount = allMethods.Count - 1;
-								s.Append (string.Format (GettextCatalog.GetPluralString (" (+{0} overload)", " (+{0} overloads)", overloadCount), overloadCount));
-							}
-							documentation = AmbienceService.GetSummaryMarkup (method);
-						}
-					} else if (result is MemberResolveResult) {
-						var member = ((MemberResolveResult)result).Member;
-						s.Append ("<small><i>");
-						s.Append (GetString (member));
-						s.Append ("</i></small>\n");
-						var field = member as IField;
-						if (field != null && field.IsConst) {
-							s.Append (GLib.Markup.EscapeText (CreateAmbience (doc, offset, field.Compilation).ConvertType (field.Type)));
-							s.Append (" ");
-							s.Append (field.Name);
-							s.Append (" = ");
-							s.Append (GetConst (field.ConstantValue));
-							s.Append (";");
-						} else {
-							s.Append (GLib.Markup.EscapeText (CreateAmbience (doc, offset, member.Compilation).ConvertEntity (member)));
-						}
-						documentation = AmbienceService.GetSummaryMarkup (member);
-					} else if (result is NamespaceResolveResult) {
-						s.Append ("<small><i>");
-						s.Append (namespaceStr);
-						s.Append ("</i></small>\n");
-						s.Append (ambience.GetString (((NamespaceResolveResult)result).NamespaceName, settings));
-					} else {
-						var tr = result;
-						var typeString = GetString (tr.Type);
-						if (!string.IsNullOrEmpty (typeString)) {
-							s.Append ("<small><i>");
-							s.Append (typeString);
-							s.Append ("</i></small>\n");
-						}
-						settings.OutputFlags |= OutputFlags.UseFullName;
-						s.Append (ambience.GetString (tr.Type, settings));
-						documentation = AmbienceService.GetSummaryMarkup (tr.Type.GetDefinition ());
-					}
-					
-					if (!string.IsNullOrEmpty (documentation)) {
-						s.Append ("\n<small>");
-						s.Append (documentation);
-						s.Append ("</small>");
-					}
+			foreach (var symbol in model.LookupSymbols (offset, name: identifier)) {
+				var typeSymbol = symbol as INamedTypeSymbol;
+				if (typeSymbol != null && (arity == 0 || arity == typeSymbol.Arity)) {
+					return symbol;
 				}
-				
-				if (!string.IsNullOrEmpty (errorInformations)) {
-					if (s.Length != 0)
-						s.Append ("\n\n");
-					s.Append ("<small>");
-					s.Append (errorInformations);
-					s.Append ("</small>");
+				var namespaceSymbol = symbol as INamespaceSymbol;

+				if (namespaceSymbol != null) {

+					return namespaceSymbol;

 				}
-				return s.ToString ();
-			} catch (Exception e){
-				return e.ToString ();
 			}
+			return null;
 		}
-		
+
 		#endregion
 	}
 }
-
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
index 619cb802d0..3a8919db6e 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
@@ -25,94 +25,58 @@
 //
 //
 using System;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
-using Gtk;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.Threading;
-using System.Text;
 using MonoDevelop.Core;
-using System.Collections.Generic;
-using System.Linq;
-using MonoDevelop.CSharp.Resolver;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.CSharp.Completion;
 using MonoDevelop.Components;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
 using MonoDevelop.Projects;
 using Mono.Cecil.Cil;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using Gtk;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.SourceEditor
 {
 	class LanguageItemTooltipProvider: TooltipProvider, IDisposable
 	{
-		public LanguageItemTooltipProvider ()
-		{
-		}
-
-		class ToolTipData
-		{
-			public SyntaxTree Unit;
-			public ResolveResult Result;
-			public AstNode Node;
-			public CSharpAstResolver Resolver;
-
-			public ToolTipData (ICSharpCode.NRefactory.CSharp.SyntaxTree unit, ICSharpCode.NRefactory.Semantics.ResolveResult result, ICSharpCode.NRefactory.CSharp.AstNode node, CSharpAstResolver file)
-			{
-				this.Unit = unit;
-				this.Result = result;
-				this.Node = node;
-				this.Resolver = file;
-			}
-		}
-
 		#region ITooltipProvider implementation 
-		
-		public override TooltipItem GetItem (Mono.TextEditor.TextEditor editor, int offset)
+		public override async Task<TooltipItem> GetItem (TextEditor editor, DocumentContext ctx, int offset, CancellationToken token = default(CancellationToken))
 		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.ParsedDocument == null)
+			if (ctx == null)
 				return null;
-			var unit = doc.ParsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
+			var analysisDocument = ctx.ParsedDocument;
+			if (analysisDocument == null)
 				return null;
-
-			var file = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (file == null)
+			var unit = analysisDocument.GetAst<SemanticModel> ();
+			if (unit == null)
 				return null;
 			
-			ResolveResult result;
-			AstNode node;
-			var loc = editor.OffsetToLocation (offset);
-			if (!doc.TryResolveAt (loc, out result, out node)) {
-				if (node is CSharpTokenNode) {
-					int startOffset2 = editor.LocationToOffset (node.StartLocation);
-					int endOffset2 = editor.LocationToOffset (node.EndLocation);
-
-					return new TooltipItem (new ToolTipData (unit, result, node, null), startOffset2, endOffset2 - startOffset2);
-				}
+			var root = unit.SyntaxTree.GetRoot (token);
+			SyntaxToken syntaxToken;
+			try {
+				syntaxToken = root.FindToken (offset);
+			} catch (ArgumentOutOfRangeException) {
 				return null;
 			}
-			if (node == lastNode)
-				return lastResult;
-			var resolver = new CSharpAstResolver (doc.Compilation, unit, file);
-			resolver.ApplyNavigator (new NodeListResolveVisitorNavigator (node), CancellationToken.None);
-
-			var hoverNode = node.GetNodeAt (loc) ?? node;
-
-			int startOffset = editor.LocationToOffset (hoverNode.StartLocation);
-			int endOffset = editor.LocationToOffset (hoverNode.EndLocation);
-			return lastResult = new TooltipItem (new ToolTipData (unit, result, node, resolver), startOffset, endOffset - startOffset);
+			if (!syntaxToken.Span.IntersectsWith (offset))
+				return null;
+			var symbolInfo = unit.GetSymbolInfo (syntaxToken.Parent, token);
+			var symbol = symbolInfo.Symbol ?? unit.GetDeclaredSymbol (syntaxToken.Parent, token);
+			var tooltipInformation = await CreateTooltip (symbol, syntaxToken, editor, ctx, offset);
+			if (tooltipInformation == null || string.IsNullOrEmpty (tooltipInformation.SignatureMarkup))
+				return null;
+			return new TooltipItem (tooltipInformation, syntaxToken.Span.Start, syntaxToken.Span.Length);
 		}
 		
-		AstNode lastNode = null;
 		static TooltipInformationWindow lastWindow = null;
-		TooltipItem lastResult;
 
 		static void DestroyLastTooltipWindow ()
 		{
@@ -124,287 +88,57 @@ namespace MonoDevelop.SourceEditor
 
 		#region IDisposable implementation
 
-		public void Dispose ()
+		public override void Dispose ()
 		{
+			if (IsDisposed)
+				return;
 			DestroyLastTooltipWindow ();
-			lastNode = null;
-			lastResult = null;
+			base.Dispose ();
 		}
 
 		#endregion
 
-		protected override Gtk.Window CreateTooltipWindow (Mono.TextEditor.TextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
+
+		public override Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Xwt.ModifierKeys modifierState)
 		{
-			var doc = IdeApp.Workbench.ActiveDocument;
+			var doc = ctx;
 			if (doc == null)
 				return null;
 
-			var titem = (ToolTipData)item.Item;
-
-			var tooltipInformation = CreateTooltip (titem, offset, null, modifierState);
-			if (tooltipInformation == null || string.IsNullOrEmpty (tooltipInformation.SignatureMarkup))
-				return null;
-
 			var result = new TooltipInformationWindow ();
 			result.ShowArrow = true;
-			result.AddOverload (tooltipInformation);
+			result.AddOverload ((TooltipInformation)item.Item);
 			result.RepositionWindow ();
 			return result;
 		}
 
-		public override Gtk.Window ShowTooltipWindow (TextEditor editor, int offset, Gdk.ModifierType modifierState, int mouseX, int mouseY, TooltipItem item)
+		async Task<TooltipInformation> CreateTooltip (ISymbol symbol, SyntaxToken token, TextEditor editor, DocumentContext doc, int offset)
 		{
-			var titem = (ToolTipData)item.Item;
-			if (lastNode != null && lastWindow != null && lastWindow.IsRealized && titem.Node != null && lastNode == titem.Node)
-				return lastWindow;
-			
-			DestroyLastTooltipWindow ();
-
-			var tipWindow = CreateTooltipWindow (editor, offset, modifierState, item) as TooltipInformationWindow;
-			if (tipWindow == null)
-				return null;
-
-			var hoverNode = titem.Node.GetNodeAt (editor.OffsetToLocation (offset)) ?? titem.Node;
-			var p1 = editor.LocationToPoint (hoverNode.StartLocation);
-			var p2 = editor.LocationToPoint (hoverNode.EndLocation);
-			var positionWidget = editor.TextArea;
-			var caret = new Gdk.Rectangle ((int)p1.X - positionWidget.Allocation.X, (int)p2.Y - positionWidget.Allocation.Y, (int)(p2.X - p1.X), (int)editor.LineHeight);
-
-			tipWindow.ShowPopup (positionWidget, caret, PopupPosition.Top);
-			tipWindow.EnterNotifyEvent += delegate {
-				editor.HideTooltip (false);
-			};
-			lastWindow = tipWindow;
-			lastNode = titem.Node;
-			return tipWindow;
-		}
-
-		TooltipInformation CreateTooltip (ToolTipData data, int offset, Ambience ambience, Gdk.ModifierType modifierState)
-		{
-			ResolveResult result = data.Result;
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null)
-				return null;
-			bool createFooter = (modifierState & Gdk.ModifierType.Mod1Mask) != 0;
-			var file = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (file == null)
-				return null;
 			try {
-
-				if (result is AliasNamespaceResolveResult) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetAliasedNamespaceTooltip ((AliasNamespaceResolveResult)result);
-				}
-				
-				if (result is AliasTypeResolveResult) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetAliasedTypeTooltip ((AliasTypeResolveResult)result);
-				}
+				TooltipInformation result;
+				var sig = new SignatureMarkupCreator (doc, offset);
+				sig.BreakLineAfterReturnType = false;
 				
-				if (data.Node is ThisReferenceExpression && result is ThisResolveResult) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					
-					return sig.GetKeywordTooltip ("this", data.Node);
-				}
-				
-				if (data.Node is TypeOfExpression) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetTypeOfTooltip ((TypeOfExpression)data.Node, result as TypeOfResolveResult);
-				}
-				if (data.Node is PrimitiveType && data.Node.Parent is Constraint) {
-					var t = (PrimitiveType)data.Node;
-					if (t.Keyword == "class" || t.Keyword == "new" || t.Keyword == "struct") {
-						var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-						var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-						sig.BreakLineAfterReturnType = false;
-						return sig.GetConstraintTooltip (t.Keyword);
-					}
-					return null;
-				}
-				if (data.Node is ExternAliasDeclaration) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetExternAliasTooltip ((ExternAliasDeclaration)data.Node, doc.Project as DotNetProject);
-				}
-				if (result == null && data.Node is CSharpTokenNode) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetKeywordTooltip (data.Node);
-				}
-				if (data.Node is PrimitiveType && ((PrimitiveType)data.Node).KnownTypeCode == KnownTypeCode.Void) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetKeywordTooltip ("void", null);
-				}
-				if (data.Node is NullReferenceExpression) {
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					return sig.GetKeywordTooltip ("null", null);
-				}
+				var typeOfExpression = token.Parent as TypeOfExpressionSyntax;
+				if (typeOfExpression != null && symbol is ITypeSymbol)
+					return sig.GetTypeOfTooltip (typeOfExpression, (ITypeSymbol)symbol);
 
-				if (result is UnknownIdentifierResolveResult) {
-					return new TooltipInformation () {
-						SignatureMarkup = string.Format ("error CS0103: The name `{0}' does not exist in the current context", ((UnknownIdentifierResolveResult)result).Identifier)
-					};
-				} else if (result is UnknownMemberResolveResult) {
-					var ur = (UnknownMemberResolveResult)result;
-					if (ur.TargetType.Kind != TypeKind.Unknown) {
-						return new TooltipInformation () {
-							SignatureMarkup = string.Format ("error CS0117: `{0}' does not contain a definition for `{1}'", ur.TargetType.FullName, ur.MemberName)
-						};
-					}
-				} else if (result.IsError) {
-					return new TooltipInformation () {
-						SignatureMarkup = "Unknown resolve error."
-					};
-				}
-				if (result is LocalResolveResult) {
-					var lr = (LocalResolveResult)result;
-					var tooltipInfo = new TooltipInformation ();
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					tooltipInfo.SignatureMarkup = sig.GetLocalVariableMarkup (lr.Variable);
-					return tooltipInfo;
-				} else if (result is MethodGroupResolveResult) {
-					var mrr = (MethodGroupResolveResult)result;
-					var allMethods = new List<IMethod> (mrr.Methods);
-					foreach (var l in mrr.GetExtensionMethods ()) {
-						allMethods.AddRange (l);
-					}
+				result = sig.GetKeywordTooltip (token); 
+				if (result != null)
+					return result;
 				
-					var method = allMethods.FirstOrDefault ();
-					if (method != null) {
-						return MemberCompletionData.CreateTooltipInformation (
-							doc.Compilation,
-							file,
-							doc.Editor,
-							doc.GetFormattingPolicy (),
-							method,
-							false,
-							createFooter);
-					}
-				} else if (result is CSharpInvocationResolveResult) {
-					var invocationResult = (CSharpInvocationResolveResult)result;
-					var member = (IMember)invocationResult.ReducedMethod ?? invocationResult.Member;
-					return MemberCompletionData.CreateTooltipInformation (
-						doc.Compilation,
-						file,
-						doc.Editor,
-						doc.GetFormattingPolicy (),
-						member, 
-						false,
-						createFooter);
-				} else if (result is MemberResolveResult) {
-					var member = ((MemberResolveResult)result).Member;
-					return MemberCompletionData.CreateTooltipInformation (
-						doc.Compilation,
-						file,
-						doc.Editor,
-						doc.GetFormattingPolicy (),
-						member, 
-						false,
-						createFooter);
-				} else if (result is NamespaceResolveResult) {
-					var tooltipInfo = new TooltipInformation ();
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					try {
-						tooltipInfo.SignatureMarkup = sig.GetMarkup (((NamespaceResolveResult)result).Namespace);
-					} catch (Exception e) {
-						LoggingService.LogError ("Got exception while creating markup for :" + ((NamespaceResolveResult)result).Namespace, e);
-						return new TooltipInformation ();
-					}
-					return tooltipInfo;
-				} else if (result is OperatorResolveResult) {
-					var or = result as OperatorResolveResult;
-					var tooltipInfo = new TooltipInformation ();
-					var resolver = file.GetResolver (doc.Compilation, doc.Editor.Caret.Location);
-					var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
-					sig.BreakLineAfterReturnType = false;
-					try {
-						var method = or.UserDefinedOperatorMethod;
-						if (method == null)
-							return null;
-						tooltipInfo.SignatureMarkup = sig.GetMarkup (method);
-					} catch (Exception e) {
-						LoggingService.LogError ("Got exception while creating markup for :" + result, e);
-						return new TooltipInformation ();
-					}
-					return tooltipInfo;
-				} else {
-					return MemberCompletionData.CreateTooltipInformation (
-						doc.Compilation,
-						file,
-						doc.Editor,
-						doc.GetFormattingPolicy (),
-						result.Type, 
-						false,
-						createFooter);
+				if (symbol != null) {
+					result = await RoslynSymbolCompletionData.CreateTooltipInformation (CancellationToken.None, editor, doc, symbol, false, true);
 				}
+				
+				return result;
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while creating tooltip.", e);
 				return null;
 			}
-		
-			return null;
 		}
-		class ErrorVisitor : DepthFirstAstVisitor
-		{
-			readonly CSharpAstResolver resolver;
-			readonly CancellationToken cancellationToken;
-			ResolveResult errorResolveResult;
 
-			public ResolveResult ErrorResolveResult {
-				get {
-					return errorResolveResult;
-				}
-			}
-
-			AstNode errorNode;
-
-			public AstNode ErrorNode {
-				get {
-					return errorNode;
-				}
-			}
-
-			public ErrorVisitor (CSharpAstResolver resolver, CancellationToken cancellationToken = default(CancellationToken))
-			{
-				this.resolver = resolver;
-				this.cancellationToken = cancellationToken;
-			}
-			
-			protected override void VisitChildren (AstNode node)
-			{
-				if (ErrorResolveResult != null || cancellationToken.IsCancellationRequested)
-					return;
-				if (node is Expression) {
-					var rr = resolver.Resolve (node, cancellationToken);
-					if (rr.IsError) {
-						errorResolveResult = rr;
-						errorNode = node;
-					}
-				}
-				base.VisitChildren (node);
-			}
-		}
-
-		
-		protected override void GetRequiredPosition (Mono.TextEditor.TextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
+		public override void GetRequiredPosition (TextEditor editor, Control tipWindow, out int requiredWidth, out double xalign)
 		{
 			var win = (TooltipInformationWindow)tipWindow;
 			requiredWidth = win.Allocation.Width;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs
new file mode 100644
index 0000000000..3b7e88390d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs
@@ -0,0 +1,76 @@
+//
+// CSharpNUnitSourceCodeLocationFinder.cs
+//
+// Author:
+//       mkrueger <>
+//
+// Copyright (c) 2016 mkrueger
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.UnitTesting;
+using MonoDevelop.Ide.TypeSystem;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.CSharp.UnitTests
+{
+	class CSharpNUnitSourceCodeLocationFinder : NUnitSourceCodeLocationFinder
+	{
+		public override async System.Threading.Tasks.Task<SourceCodeLocation> GetSourceCodeLocationAsync (MonoDevelop.Projects.Project project, string fixtureTypeNamespace, string fixtureTypeName, string testName, System.Threading.CancellationToken cancellationToken)
+		{
+			var ctx = await TypeSystemService.GetCompilationAsync (project, cancellationToken).ConfigureAwait (false);
+			var cls = ctx?.Assembly?.GetTypeByMetadataName (string.IsNullOrEmpty (fixtureTypeNamespace) ? fixtureTypeName : fixtureTypeNamespace + "." + fixtureTypeName);
+			if (cls == null)
+				return null;
+			if (cls.Name != testName) {
+				foreach (var met in cls.GetMembers ().OfType<IMethodSymbol> ()) {
+					if (met.Name == testName) {
+						var loc = met.Locations.FirstOrDefault (l => l.IsInSource);
+						return ConvertToSourceCodeLocation (loc);
+					}
+				}
+
+				int idx = testName != null ? testName.IndexOf ('(') : -1;
+				if (idx > 0) {
+					testName = testName.Substring (0, idx);
+					foreach (var met in cls.GetMembers ().OfType<IMethodSymbol> ()) {
+						if (met.Name == testName){
+							var loc = met.Locations.FirstOrDefault (l => l.IsInSource);
+							return ConvertToSourceCodeLocation (loc);
+						}
+					}
+				}
+			}
+			var classLoc = cls.Locations.FirstOrDefault (l => l.IsInSource);
+			return ConvertToSourceCodeLocation (classLoc);
+		}
+
+
+		SourceCodeLocation ConvertToSourceCodeLocation (Location loc)
+		{
+			var lineSpan = loc.GetLineSpan ();
+			return new SourceCodeLocation (loc.SourceTree.FilePath, lineSpan.StartLinePosition.Line, lineSpan.StartLinePosition.Character);
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs
index 759d23c430..ff091978dd 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/UnitTestTextEditorExtension.cs
@@ -24,74 +24,85 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp;
+using System.Linq;
 using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.CSharp.Resolver;
 using System.Collections.Generic;
-using MonoDevelop.NUnit;
+using MonoDevelop.UnitTesting;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
 
 namespace MonoDevelop.CSharp
 {
 	class UnitTestTextEditorExtension : AbstractUnitTestTextEditorExtension
 	{
-		public override IList<UnitTestLocation> GatherUnitTests ()
+		static readonly IList<UnitTestLocation> emptyList = new UnitTestLocation[0];
+		public override Task<IList<UnitTestLocation>> GatherUnitTests (IUnitTestMarkers[] unitTestMarkers, CancellationToken token)
 		{
-			var resolver = document.GetSharedResolver ();
-			if (resolver == null || resolver.Result == null)
-				return null;
-			var parsedDocument = document.ParsedDocument;
+			var parsedDocument = DocumentContext.ParsedDocument;
 			if (parsedDocument == null)
-				return null;
-			var syntaxTree = parsedDocument.GetAst<SyntaxTree> ();
-			if (syntaxTree == null)
-				return null;
+				return Task.FromResult (emptyList);
+			
+			var semanticModel = parsedDocument.GetAst<SemanticModel> ();
+			if (semanticModel == null)
+				return Task.FromResult (emptyList);
 
-			var visitor = new NUnitVisitor (resolver.Result);
+			var visitor = new NUnitVisitor (semanticModel, unitTestMarkers, token);
 			try {
-				visitor.VisitSyntaxTree (syntaxTree);
-			} catch (Exception ex) {
+				visitor.Visit (semanticModel.SyntaxTree.GetRoot (token));
+			} catch (OperationCanceledException) {
+				throw;
+			}catch (Exception ex) {
 				LoggingService.LogError ("Exception while analyzing ast for unit tests.", ex);
-				return null;
+				return Task.FromResult (emptyList);
 			}
-			return visitor.FoundTests;
+			return Task.FromResult (visitor.FoundTests);
 		}
 
-		class NUnitVisitor : DepthFirstAstVisitor
+		class NUnitVisitor : CSharpSyntaxWalker
 		{
-			readonly CSharpAstResolver resolver;
+			readonly SemanticModel semanticModel;
+			readonly CancellationToken token;
+			readonly IUnitTestMarkers [] unitTestMarkers;
 			List<UnitTestLocation> foundTests = new List<UnitTestLocation> ();
-
+			HashSet<ClassDeclarationSyntax> unitTestClasses = new HashSet<ClassDeclarationSyntax> ();
 			public IList<UnitTestLocation> FoundTests {
 				get {
 					return foundTests;
 				}
 			}
 
-			public NUnitVisitor (CSharpAstResolver resolver)
+			public NUnitVisitor (SemanticModel semanticModel, IUnitTestMarkers[] unitTestMarkers, CancellationToken token)
 			{
-				this.resolver = resolver;
+				this.semanticModel = semanticModel;
+				this.token = token;
+				this.unitTestMarkers = unitTestMarkers;
 			}
 
-			static string GetFullName (TypeDeclaration typeDeclaration)
+			static string GetFullName (ClassDeclarationSyntax typeDeclaration)
 			{
 				var parts = new List<string> ();
 				while (true) {
-					parts.Add (typeDeclaration.Name);
-					if (typeDeclaration.Parent is TypeDeclaration) {
-						typeDeclaration = (TypeDeclaration)typeDeclaration.Parent;
+					parts.Add (typeDeclaration.Identifier.ToString ());
+					if (typeDeclaration.Parent is ClassDeclarationSyntax) {
+						typeDeclaration = (ClassDeclarationSyntax)typeDeclaration.Parent;
 					}
 					else {
 						break;
 					}
 				}
 				;
-				var ns = typeDeclaration.Parent as NamespaceDeclaration;
+				var ns = typeDeclaration.Parent as NamespaceDeclarationSyntax;
 				if (ns != null)
-					parts.Add (ns.FullName);
+					parts.Add (ns.Name.ToString ());
 				parts.Reverse ();
 				return string.Join (".", parts);
 			}
@@ -109,77 +120,77 @@ namespace MonoDevelop.CSharp
 					sb.Append ('\"');
 			}
 
-			static string BuildArguments (IAttribute attr)
+			static string BuildArguments (AttributeData attr)
 			{
 				var sb = new StringBuilder ();
-				foreach (var arg in attr.PositionalArguments) {
+				foreach (var arg in attr.ConstructorArguments) {
 					if (sb.Length > 0)
 						sb.Append (", ");
-					var cr = arg as ConversionResolveResult;
-					if (cr != null) {
-						AppendConstant (sb, cr.Input.ConstantValue);
-						continue;
-					}
-					AppendConstant (sb, arg.ConstantValue);
+//					var cr = arg as ConversionResolveResult;
+//					if (cr != arg.Value) {
+//						AppendConstant (sb, cr.Input.ConstantValue);
+//						continue;
+//					}
+					AppendConstant (sb, arg.Value);
 				}
 				return sb.ToString ();
 			}
 
-			public override void VisitMethodDeclaration (MethodDeclaration methodDeclaration)
+			public override void VisitMethodDeclaration (MethodDeclarationSyntax node)
 			{
-				var result = resolver.Resolve (methodDeclaration) as MemberResolveResult;
-				if (result == null)
-					return;
-				var method = result.Member as IMethod;
+				var method = semanticModel.GetDeclaredSymbol (node);
 				if (method == null)
 					return;
-
+				var parentClass = node.Parent as ClassDeclarationSyntax;
+				if (parentClass == null)
+					return;
 				UnitTestLocation test = null;
-				foreach (var attr in method.Attributes) {
-					if (attr.AttributeType.ReflectionName == "NUnit.Framework.TestAttribute") {
+				IUnitTestMarkers markers = null;
+				foreach (var attr in method.GetAttributes ()) {
+					var cname = attr.AttributeClass.GetFullName ();
+					markers = unitTestMarkers.FirstOrDefault (m => m.TestMethodAttributeMarker == cname);
+					if (markers != null) {
 						if (test == null) {
-							test = new UnitTestLocation (methodDeclaration.NameToken.StartLocation.Line);
-							test.UnitTestIdentifier = GetFullName ((TypeDeclaration)methodDeclaration.Parent) + "." + methodDeclaration.Name;
+							TagClass (parentClass, markers);
+							test = new UnitTestLocation (node.Identifier.SpanStart);
+							test.UnitTestIdentifier = GetFullName (parentClass) + "." + method.Name;
 							foundTests.Add (test);
 						}
+						break;
 					}
 				}
 				if (test != null) {
-					foreach (var attr in method.Attributes) {
-						if (attr.AttributeType.ReflectionName == "NUnit.Framework.TestCaseAttribute") {
+					foreach (var attr in method.GetAttributes ()) {
+						if (attr.AttributeClass.GetFullName () == markers.TestCaseMethodAttributeMarker) {
 							test.TestCases.Add ("(" + BuildArguments (attr) + ")");
 						} else
-							test.IsIgnored |= attr.AttributeType.ReflectionName == "NUnit.Framework.IgnoreAttribute";
+							test.IsIgnored |= attr.AttributeClass.GetFullName () == markers.IgnoreTestMethodAttributeMarker;
 					}
 				}
 			}
 
-			public override void VisitTypeDeclaration (TypeDeclaration typeDeclaration)
+			void TagClass (ClassDeclarationSyntax c, IUnitTestMarkers markers)
 			{
-				if (typeDeclaration.HasModifier (Modifiers.Abstract))
+				if (unitTestClasses.Contains (c))
 					return;
-				var result = resolver.Resolve (typeDeclaration);
-				if (result == null || result.Type.GetDefinition () == null)
-					return;
-				UnitTestLocation unitTest = null;
-				bool isIgnored = false;
-				foreach (var attr in result.Type.GetDefinition ().GetAttributes ()) {
-					if (attr.AttributeType.ReflectionName == "NUnit.Framework.TestFixtureAttribute") {
-						unitTest = new UnitTestLocation (typeDeclaration.NameToken.StartLocation.Line);
-						unitTest.IsFixture = true;
-						unitTest.UnitTestIdentifier = GetFullName (typeDeclaration);
-						foundTests.Add (unitTest);
-					} else
-						isIgnored |= attr.AttributeType.ReflectionName == "NUnit.Framework.IgnoreAttribute";
-				}
-				if (unitTest != null) {
-					unitTest.IsIgnored = isIgnored;
-					base.VisitTypeDeclaration (typeDeclaration);
+				unitTestClasses.Add (c);
+
+				var type = semanticModel.GetDeclaredSymbol (c);
+				var test = new UnitTestLocation (c.Identifier.SpanStart);
+				test.IsFixture = true;
+				test.UnitTestIdentifier = GetFullName (c);
+				foundTests.Add (test);
+
+				if (test != null) {
+					foreach (var attr in type.GetAttributes ()) {
+						test.IsIgnored |= attr.AttributeClass.GetFullName () == markers.IgnoreTestClassAttributeMarker;
+					}
 				}
 			}
 
-			public override void VisitBlockStatement (BlockStatement blockStatement)
+			public override void VisitBlock (BlockSyntax node)
 			{
+				token.ThrowIfCancellationRequested ();
 			}
 		}
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs
index b03f260a13..fe36dd3134 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstAmbience.cs
@@ -24,82 +24,90 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using MonoDevelop.Core;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
 
 namespace MonoDevelop.CSharp
 {
 	class AstAmbience
 	{
-		CSharpFormattingOptions options;
+//		OptionSet options;
 		
-		public AstAmbience (ICSharpCode.NRefactory.CSharp.CSharpFormattingOptions options)
+		public AstAmbience (OptionSet options)
 		{
-			this.options = options;
+//			this.options = options;
 		}
 		
-		static bool IsObsolete (EntityDeclaration entity)
+		static bool IsObsolete (MemberDeclarationSyntax entity)
 		{
 			if (entity == null)
 				return false;
-			foreach (var section in entity.Attributes) {
-				foreach (var attr in section.Attributes) {
-					var attrText = attr.Type.ToString ();
-					if (attrText == "Obsolete" || attrText == "ObsoleteAttribute" || attrText == "System.Obsolete" || attrText == "System.ObsoleteAttribute" )
-						return true;
-				}
-			}
+			// TODO!
+//			foreach (var section in entity.Attributes) {
+//				foreach (var attr in section.Attributes) {
+//					var attrText = attr.Type.ToString ();
+//					if (attrText == "Obsolete" || attrText == "ObsoleteAttribute" || attrText == "System.Obsolete" || attrText == "System.ObsoleteAttribute" )
+//						return true;
+//				}
+//			}
 			return false;
 		}
 		
-		void AppendTypeParameter (StringBuilder sb, IEnumerable<TypeParameterDeclaration> parameters)
+		void AppendTypeParameter (StringBuilder sb, TypeParameterListSyntax parameters)
 		{
-			if (!parameters.Any ()) 
+			if (parameters == null || parameters.Parameters.Count == 0) 
 				return;
 			sb.Append ("&lt;");
 			bool first = true;
-			foreach (var param in parameters) {
+			foreach (var param in parameters.Parameters) {
 				if (!first) {
 					sb.Append (", ");
 				} else {
 					first = false;
 				}
-				AppendEscaped (sb, param.ToString (options));
+				AppendEscaped (sb, param.ToString ());
 			}
 			sb.Append ("&gt;");
 		}
 		
-		void AppendParameter (StringBuilder sb, IEnumerable<ParameterDeclaration> parameters)
+		void AppendParameter (StringBuilder sb, ParameterListSyntax parameters)
 		{
-			if (options.SpaceBeforeMethodDeclarationParentheses)
-				sb.Append (" ");
+			// Missing roslyn formatting option ?
+			//			if (options.GetOption (CSharpFormattingOptions.Spacing ???))
+			//	sb.Append (" ");
 			sb.Append ("(");
-			var hasParameters = parameters.Any ();
-			if (!hasParameters && options.SpaceBetweenEmptyMethodDeclarationParentheses) {
-				sb.Append (" )");
-				return;
-			}
-			if (hasParameters && options.SpaceWithinMethodDeclarationParentheses)
-				sb.Append (" ");
-			
+			var hasParameters = parameters != null && parameters.Parameters.Count > 0;
+
+			// Missing roslyn formatting option ?
+			//if (hasParameters && options.GetOption (SpaceWithinMethodDeclarationParentheses))
+			//	sb.Append (" ");
+
 			bool first = true;
-			foreach (var param in parameters) {
-				if (!first) {
-					if (options.SpaceBeforeMethodDeclarationParameterComma)
-						sb.Append (" ");
-					sb.Append (",");
-					if (options.SpaceAfterMethodDeclarationParameterComma)
+			if (hasParameters) {
+				foreach (var param in parameters.Parameters) {
+					if (!first) {
+						//if (options.SpaceBeforeMethodDeclarationParameterComma)
+						//	sb.Append (" ");
+						sb.Append (",");
+						//if (options.SpaceAfterMethodDeclarationParameterComma)
 						sb.Append (" ");
-				} else {
-					first = false;
+					} else {
+						first = false;
+					}
+					AppendEscaped (sb, param.ToString ());
 				}
-				AppendEscaped (sb, param.ToString (options));
 			}
-			if (hasParameters && options.SpaceWithinMethodDeclarationParentheses)
-				sb.Append (" ");
+
+			// Missing roslyn formatting option ?
+			//if (hasParameters && options.SpaceWithinMethodDeclarationParentheses)
+			//	sb.Append (" ");
 			sb.Append (")");
 		}
 		
@@ -131,128 +139,133 @@ namespace MonoDevelop.CSharp
 			}
 		}
 		
-		public string GetEntityMarkup (AstNode e)
+		public string GetEntityMarkup (SyntaxNode e)
 		{
 			var sb = new StringBuilder ();
-			if (e is TypeDeclaration) {
-				var type = e as TypeDeclaration;
-				sb.Append (type.Name);
-				AppendTypeParameter (sb, type.TypeParameters);
-			} else if (e is DelegateDeclaration) {
-				var del = e as DelegateDeclaration;
-				sb.Append (del.Name);
-				AppendTypeParameter (sb, del.TypeParameters);
-				AppendParameter (sb, del.Parameters);
-			} else if (e is Accessor) {
-				if (e.Role == PropertyDeclaration.GetterRole) {
+			if (e is NamespaceDeclarationSyntax) {
+				return ((NamespaceDeclarationSyntax)e).Name.ToString ();
+			}
+			if (e is TypeDeclarationSyntax) {
+				var type = e as TypeDeclarationSyntax;
+				sb.Append (type.Identifier);
+				AppendTypeParameter (sb, type.TypeParameterList);
+			} else if (e is DelegateDeclarationSyntax) {
+				var del = e as DelegateDeclarationSyntax;
+				sb.Append (del.Identifier);
+				AppendTypeParameter (sb, del.TypeParameterList);
+				AppendParameter (sb, del.ParameterList);
+			} else if (e is AccessorDeclarationSyntax) {
+				if (e.Kind () == SyntaxKind.GetAccessorDeclaration) {
 					sb.Append ("get");
-				} else if (e.Role == PropertyDeclaration.SetterRole) {
+				} else if (e.Kind () == SyntaxKind.SetAccessorDeclaration) {
 					sb.Append ("set");
-				} else if (e.Role == CustomEventDeclaration.AddAccessorRole) {
+				} else if (e.Kind () == SyntaxKind.AddAccessorDeclaration) {
 					sb.Append ("add");
-				} else if (e.Role == CustomEventDeclaration.RemoveAccessorRole) {
+				} else if (e.Kind () == SyntaxKind.RemoveAccessorDeclaration) {
 					sb.Append ("remove");
 				}
-			} else if (e is OperatorDeclaration) {
-				var op = e as OperatorDeclaration;
+			} else if (e is OperatorDeclarationSyntax) {
+				var op = (OperatorDeclarationSyntax)e;
+				sb.Append ("operator ");
+				AppendEscaped (sb, op.OperatorToken.ToString ());
+				AppendParameter (sb, op.ParameterList);
+			} else if (e is ConversionOperatorDeclarationSyntax) {
+				var op = (ConversionOperatorDeclarationSyntax)e;
+				sb.Append (op.ImplicitOrExplicitKeyword.IsKind (SyntaxKind.ImplicitKeyword) ? "implicit " : "explicit ");
 				sb.Append ("operator ");
-				if (!op.OperatorTypeToken.IsNull)
-					AppendEscaped (sb, op.OperatorTypeToken.ToString ());
-				AppendParameter (sb, op.Parameters);
-			} else if (e is MethodDeclaration) {
-				var method = e as MethodDeclaration;
-				if (!method.PrivateImplementationType.IsNull)
-					AppendEscaped (sb, method.PrivateImplementationType.ToString () + ".");
-				sb.Append (method.Name);
-				AppendTypeParameter (sb, method.TypeParameters);
-				AppendParameter (sb, method.Parameters);
-				if (method.Body.IsNull) {
+				AppendEscaped (sb, op.Type.ToString ());
+				AppendParameter (sb, op.ParameterList);
+			} else if (e is MethodDeclarationSyntax) {
+				var method = (MethodDeclarationSyntax)e;
+				if (method.ExplicitInterfaceSpecifier != null)
+					AppendEscaped (sb, method.ExplicitInterfaceSpecifier + ".");
+				sb.Append (method.Identifier);
+				AppendTypeParameter (sb, method.TypeParameterList);
+				AppendParameter (sb, method.ParameterList);
+				if (method.Body != null && !method.Body.IsMissing) {
 					string tag = null;
-					if (method.HasModifier (Modifiers.Abstract))
+					if (method.Modifiers.Any (m => m.Kind () == SyntaxKind.AbstractKeyword))
 						tag = GettextCatalog.GetString ("(abstract)");
-					if (method.HasModifier (Modifiers.Partial))
+					if (method.Modifiers.Any (m => m.Kind () == SyntaxKind.PartialKeyword))
 						tag = GettextCatalog.GetString ("(partial)");
 					if (tag != null)
 						sb.Append (" <small>" + tag + "</small>");
 				}
-			} else if (e is ConstructorDeclaration) {
-				var constructor = e as ConstructorDeclaration;
-				sb.Append (constructor.Name);
-				AppendParameter (sb, constructor.Parameters);
-			} else if (e is DestructorDeclaration) {
-				var destructror = e as DestructorDeclaration;
+			} else if (e is ConstructorDeclarationSyntax) {
+				var constructor = e as ConstructorDeclarationSyntax;
+				sb.Append (constructor.Identifier);
+				AppendParameter (sb, constructor.ParameterList);
+			} else if (e is DestructorDeclarationSyntax) {
+				var destructror = e as DestructorDeclarationSyntax;
 				sb.Append ("~");
-				sb.Append (destructror.Name);
-				if (options.SpaceBeforeMethodDeclarationParentheses)
-					sb.Append (" ");
+				sb.Append (destructror.Identifier);
+				//				if (options.SpaceBeforeMethodDeclarationParentheses)
+				//	sb.Append (" ");
 				sb.Append ("()");
-			} else if (e is IndexerDeclaration) {
-				var indexer = e as IndexerDeclaration;
+			} else if (e is IndexerDeclarationSyntax) {
+				var indexer = e as IndexerDeclarationSyntax;
 				sb.Append ("this");
-				if (options.SpaceBeforeIndexerDeclarationBracket)
-					sb.Append (" ");
+				//if (options.SpaceBeforeIndexerDeclarationBracket)
+				//	sb.Append (" ");
 				sb.Append ("[");
-				if (options.SpaceWithinIndexerDeclarationBracket)
-					sb.Append (" ");
+				//if (options.SpaceWithinIndexerDeclarationBracket)
+				//	sb.Append (" ");
 				
 				bool first = true;
-				foreach (var param in indexer.Parameters) {
+				foreach (var param in indexer.ParameterList.Parameters) {
 					if (!first) {
-						if (options.SpaceBeforeIndexerDeclarationParameterComma)
-							sb.Append (" ");
+						//if (options.SpaceBeforeIndexerDeclarationParameterComma)
+						//	sb.Append (" ");
 						sb.Append (",");
-						if (options.SpaceAfterIndexerDeclarationParameterComma)
-							sb.Append (" ");
+						//if (options.SpaceAfterIndexerDeclarationParameterComma)
+						//	sb.Append (" ");
 					} else {
 						first = false;
 					}
-					sb.Append (param.ToString (options));
+					sb.Append (param.ToString ());
 				}
-				if (options.SpaceWithinIndexerDeclarationBracket)
-					sb.Append (" ");
+				//if (options.SpaceWithinIndexerDeclarationBracket)
+				//	sb.Append (" ");
 				sb.Append ("]");
-			} else if (e is VariableInitializer) {
-				var initializer = (VariableInitializer)e;
-				sb.Append (initializer.Name);
-				if (IsObsolete (initializer.Parent as EntityDeclaration))
-					return "<s>" + sb.ToString () + "</s>";
-			} else if (e is FixedVariableInitializer) {
-				var initializer = (FixedVariableInitializer)e;
-				sb.Append (initializer.Name);
-				if (IsObsolete (initializer.Parent as EntityDeclaration))
+			} else if (e is VariableDeclaratorSyntax) {
+				var initializer = (VariableDeclaratorSyntax)e;
+				sb.Append (initializer.Identifier);
+				if (IsObsolete (initializer.Parent as MemberDeclarationSyntax))
 					return "<s>" + sb.ToString () + "</s>";
-			} else if (e is FieldDeclaration) {
-				var field = (FieldDeclaration)e;
-				if (!field.Variables.Any ())
+			} else if (e is FieldDeclarationSyntax) {
+				var field = (FieldDeclarationSyntax)e;
+				if (!field.Declaration.Variables.Any ())
 					return "";
-				sb.Append (field.Variables.First ().Name);
-			} else if (e is FixedFieldDeclaration) {
-				var field = (FixedFieldDeclaration)e;
-				if (!field.Variables.Any ())
+				sb.Append (field.Declaration.Variables.First ().Identifier);
+			} else if (e is EventFieldDeclarationSyntax) {
+				var evt = (EventFieldDeclarationSyntax)e;
+				if (!evt.Declaration.Variables.Any ())
 					return "";
-				sb.Append (field.Variables.First ().Name);
-			} else if (e is EventDeclaration) {
-				var evt = (EventDeclaration)e;
-				if (!evt.Variables.Any ())
-					return "";
-				sb.Append (evt.Variables.First ().Name);
-			} else if (e is PropertyDeclaration) {
-				var property = (PropertyDeclaration)e;
-				if (!property.PrivateImplementationType.IsNull)
-					AppendEscaped (sb, property.PrivateImplementationType.ToString () + ".");
-				sb.Append (property.Name);
-			} else if (e is CustomEventDeclaration) {
-				var customEvent = (CustomEventDeclaration)e;
-				if (!customEvent.PrivateImplementationType.IsNull)
-					AppendEscaped (sb, customEvent.PrivateImplementationType.ToString () + ".");
-				sb.Append (customEvent.Name);
-			} else if (e is EntityDeclaration) {
-				var entity = (EntityDeclaration)e;
-				sb.Append (entity.Name);
-			}
+				sb.Append (evt.Declaration.Variables.First ().Identifier);
+			} else if (e is PropertyDeclarationSyntax) {
+				var property = (PropertyDeclarationSyntax)e;
+				if (property.ExplicitInterfaceSpecifier != null)
+					AppendEscaped (sb, property.ExplicitInterfaceSpecifier + ".");
+				sb.Append (property.Identifier);
+			} else if (e is EventDeclarationSyntax) {
+				var customEvent = (EventDeclarationSyntax)e;
+				if (customEvent.ExplicitInterfaceSpecifier != null)
+					AppendEscaped (sb, customEvent.ExplicitInterfaceSpecifier + ".");
+				sb.Append (customEvent.Identifier);
+			} else if (e is EnumDeclarationSyntax) {
+				var enumDecl = (EnumDeclarationSyntax)e;
+				sb.Append (enumDecl.Identifier);
+			} else if (e is EnumMemberDeclarationSyntax) {
+				var enumMemberDecl = (EnumMemberDeclarationSyntax)e;
+				sb.Append (enumMemberDecl.Identifier);
+			} /*else if (e is MemberDeclarationSyntax) {
+				LoggingService.LogWarning ("can't display : " + e);
+				//				var entity = (MemberDeclarationSyntax)e;
+				// sb.Append (entity.Name);
+			}*/
 
 			string markup = sb.ToString ();
-			if (IsObsolete (e as EntityDeclaration))
+			if (IsObsolete (e as MemberDeclarationSyntax))
 				return "<s>" + markup + "</s>";
 			return markup;
 		}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs
index aec03f9f17..15216145e5 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs
@@ -25,10 +25,13 @@
 // THE SOFTWARE.
 
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Components.MainToolbar;
 
 namespace MonoDevelop.CSharp
 {
@@ -41,173 +44,205 @@ namespace MonoDevelop.CSharp
 		static readonly IconId Field = "md-field";
 		static readonly IconId Interface = "md-interface";
 		static readonly IconId Method = "md-method";
-		static readonly IconId ExtensionMethod = "md-extensionmethod";
 		static readonly IconId Property = "md-property";
 		static readonly IconId Struct = "md-struct";
 		static readonly IconId Delegate = "md-delegate";
+		// static readonly IconId Constant = "md-literal";
 		public static readonly IconId Namespace = "md-name-space";
 
-		static readonly IconId InternalClass = "md-internal-class";
-		static readonly IconId InternalDelegate = "md-internal-delegate";
-		static readonly IconId InternalEnum = "md-internal-enum";
-		static readonly IconId InternalEvent = "md-internal-event";
-		static readonly IconId InternalField = "md-internal-field";
-		static readonly IconId InternalInterface = "md-internal-interface";
-		static readonly IconId InternalMethod = "md-internal-method";
-		static readonly IconId InternalExtensionMethod = "md-internal-extensionmethod";
-		static readonly IconId InternalProperty = "md-internal-property";
-		static readonly IconId InternalStruct = "md-internal-struct";
-
-		static readonly IconId InternalAndProtectedClass = "md-InternalAndProtected-class";
-		static readonly IconId InternalAndProtectedDelegate = "md-InternalAndProtected-delegate";
-		static readonly IconId InternalAndProtectedEnum = "md-InternalAndProtected-enum";
-		static readonly IconId InternalAndProtectedEvent = "md-InternalAndProtected-event";
-		static readonly IconId InternalAndProtectedField = "md-InternalAndProtected-field";
-		static readonly IconId InternalAndProtectedInterface = "md-InternalAndProtected-interface";
-		static readonly IconId InternalAndProtectedMethod = "md-InternalAndProtected-method";
-		static readonly IconId InternalAndProtectedExtensionMethod = "md-InternalAndProtected-extensionmethod";
-		static readonly IconId InternalAndProtectedProperty = "md-InternalAndProtected-property";
-		static readonly IconId InternalAndProtectedStruct = "md-InternalAndProtected-struct";
-
-		static readonly IconId PrivateClass = "md-private-class";
-		static readonly IconId PrivateDelegate = "md-private-delegate";
-		static readonly IconId PrivateEnum = "md-private-enum";
-		static readonly IconId PrivateEvent = "md-private-event";
-		static readonly IconId PrivateField = "md-private-field";
-		static readonly IconId PrivateInterface = "md-private-interface";
-		static readonly IconId PrivateMethod = "md-private-method";
-		static readonly IconId PrivateExtensionMethod = "md-private-extensionmethod";
-		static readonly IconId PrivateProperty = "md-private-property";
-		static readonly IconId PrivateStruct = "md-private-struct";
-
-		static readonly IconId ProtectedClass = "md-protected-class";
-		static readonly IconId ProtectedDelegate = "md-protected-delegate";
-		static readonly IconId ProtectedEnum = "md-protected-enum";
-		static readonly IconId ProtectedEvent = "md-protected-event";
-		static readonly IconId ProtectedField = "md-protected-field";
-		static readonly IconId ProtectedInterface = "md-protected-interface";
-		static readonly IconId ProtectedMethod = "md-protected-method";
-		static readonly IconId ProtectedExtensionMethod = "md-protected-extensionmethod";
-		static readonly IconId ProtectedProperty = "md-protected-property";
-		static readonly IconId ProtectedStruct = "md-protected-struct";
-		
-		static readonly IconId ProtectedOrInternalClass = "md-ProtectedOrInternal-class";
-		static readonly IconId ProtectedOrInternalDelegate = "md-ProtectedOrInternal-delegate";
-		static readonly IconId ProtectedOrInternalEnum = "md-ProtectedOrInternal-enum";
-		static readonly IconId ProtectedOrInternalEvent = "md-ProtectedOrInternal-event";
-		static readonly IconId ProtectedOrInternalField = "md-ProtectedOrInternal-field";
-		static readonly IconId ProtectedOrInternalInterface = "md-ProtectedOrInternal-interface";
-		static readonly IconId ProtectedOrInternalMethod = "md-ProtectedOrInternal-method";
-		static readonly IconId ProtectedOrInternalExtensionMethod = "md-ProtectedOrInternal-extensionmethod";
-		static readonly IconId ProtectedOrInternalProperty = "md-ProtectedOrInternal-property";
-		static readonly IconId ProtectedOrInternalStruct = "md-ProtectedOrInternal-struct";
-		
-		static IconId[,] typeIconTable = new IconId[,] {
-			{Class,     PrivateClass,		Class,		ProtectedClass,     InternalClass,		ProtectedOrInternalClass, 		InternalAndProtectedClass},     // class
-			{Enum,      PrivateEnum,		Enum,		ProtectedEnum,      InternalEnum,		ProtectedOrInternalEnum, 		InternalAndProtectedEnum},      // enum
-			{Interface, PrivateInterface,	Interface,	ProtectedInterface, InternalInterface,	ProtectedOrInternalInterface,	InternalAndProtectedInterface}, // interface
-			{Struct,    PrivateStruct,		Struct,   	ProtectedStruct,    InternalStruct,		ProtectedOrInternalStruct,		InternalAndProtectedStruct},    // struct
-			{Delegate,  PrivateDelegate,	Delegate, 	ProtectedDelegate,  InternalDelegate,	ProtectedOrInternalDelegate,	InternalAndProtectedDelegate}   // delegate
-		};
-		static readonly IconId[] fieldIconTable = {
-			AstStockIcons.Field, AstStockIcons.PrivateField, AstStockIcons.Field, AstStockIcons.ProtectedField, AstStockIcons.InternalField, AstStockIcons.ProtectedOrInternalField, AstStockIcons.InternalAndProtectedField
-		};
-		static readonly IconId[] methodIconTable = {
-			AstStockIcons.Method, AstStockIcons.PrivateMethod, AstStockIcons.Method, AstStockIcons.ProtectedMethod, AstStockIcons.InternalMethod, AstStockIcons.ProtectedOrInternalMethod, AstStockIcons.InternalAndProtectedMethod
-		};
-		static readonly IconId[] extensionMethodIconTable = {
-			AstStockIcons.ExtensionMethod, AstStockIcons.PrivateExtensionMethod, AstStockIcons.ExtensionMethod, AstStockIcons.ProtectedExtensionMethod, AstStockIcons.InternalExtensionMethod, AstStockIcons.ProtectedOrInternalExtensionMethod, AstStockIcons.InternalAndProtectedExtensionMethod
-		};
-		static readonly IconId[] propertyIconTable = {
-			AstStockIcons.Property, AstStockIcons.PrivateProperty, AstStockIcons.Property, AstStockIcons.ProtectedProperty, AstStockIcons.InternalProperty, AstStockIcons.ProtectedOrInternalProperty, AstStockIcons.InternalAndProtectedProperty
-		};
-		static readonly IconId[] eventIconTable = {
-			AstStockIcons.Event, AstStockIcons.PrivateEvent, AstStockIcons.Event, AstStockIcons.ProtectedEvent, AstStockIcons.InternalEvent, AstStockIcons.ProtectedOrInternalEvent, AstStockIcons.InternalAndProtectedEvent
-		};
-
-		static bool GetAccessibility (EntityDeclaration element, out Accessibility acc)
+			
+		static void AdjustAccessibility (SyntaxTokenList modifiers, ref Accessibility acc, ref bool isStatic, ref bool result)
+		{
+			isStatic = modifiers.Any (mod => mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.StaticKeyword);
+			if (modifiers.Any (mod => mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.ProtectedKeyword) &&
+				modifiers.Any (mod => mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.InternalKeyword)) {
+				acc = Accessibility.ProtectedOrInternal;
+				result = true;
+				return;
+			}
+
+			foreach (var mod in modifiers) {
+				if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.PublicKeyword) {
+					acc = Accessibility.Public;
+					result = true;
+					return;
+				}
+				if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.PrivateKeyword) {
+					acc = Accessibility.Private;
+					result = true;
+					return;
+				}
+				if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.ProtectedKeyword) {
+					acc = Accessibility.Protected;
+					result = true;
+					return;
+				}
+				if (mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.InternalKeyword) {
+					acc = Accessibility.Internal;
+					result = true;
+					return;
+				}
+			}
+		}
+
+		static bool GetAccessibility (SyntaxNode element, out Accessibility acc, out bool isStatic)
 		{
-			if (element.Parent is TypeDeclaration && ((TypeDeclaration)element.Parent).ClassType == ClassType.Interface) {
+			isStatic = false;
+			if (element.Parent is TypeDeclarationSyntax && element.Parent is InterfaceDeclarationSyntax) {
 				acc = Accessibility.Public;
 				return true;
 			}
 			bool result = false;
 			acc = Accessibility.Private;
-			if (element is TypeDeclaration && !(element.Parent is TypeDeclaration))
+			if (element is TypeDeclarationSyntax && !(element.Parent is TypeDeclarationSyntax))
 				acc = Accessibility.Internal;
-			if (element.HasModifier (Modifiers.Public)) {
-				acc = Accessibility.Public;
-				result = true;
-			} else if (element.HasModifier (Modifiers.Private)) {
-				acc = Accessibility.Private;
-				result = true;
-			} else if (element.HasModifier (Modifiers.Protected | Modifiers.Internal)) {
-				acc = Accessibility.ProtectedOrInternal;
-				result = true;
-			} else if (element.HasModifier (Modifiers.Protected)) {
-				acc = Accessibility.Protected;
-				result = true;
-			} else if (element.HasModifier (Modifiers.Internal)) {
-				acc = Accessibility.Internal;
-				result = true;
-			} 
+
+			if (element is VariableDeclaratorSyntax)
+				element = element.Parent.Parent;
+			
+			if (element is TypeDeclarationSyntax)
+				AdjustAccessibility (((TypeDeclarationSyntax)element).Modifiers, ref acc, ref isStatic, ref result);
+			if (element is BaseFieldDeclarationSyntax)
+				AdjustAccessibility (((BaseFieldDeclarationSyntax)element).Modifiers, ref acc, ref isStatic, ref result);
+			if (element is BasePropertyDeclarationSyntax)
+				AdjustAccessibility (((BasePropertyDeclarationSyntax)element).Modifiers, ref acc, ref isStatic, ref result);
+			if (element is BaseMethodDeclarationSyntax)
+				AdjustAccessibility (((BaseMethodDeclarationSyntax)element).Modifiers, ref acc, ref isStatic, ref result);
+			if (element is EnumDeclarationSyntax)
+				AdjustAccessibility (((EnumDeclarationSyntax)element).Modifiers, ref acc, ref isStatic, ref result);
+			if (element is DelegateDeclarationSyntax)
+				AdjustAccessibility (((DelegateDeclarationSyntax)element).Modifiers, ref acc, ref isStatic, ref result);
+			
 			return result;
 		}
-		
-		
-		public static string GetStockIcon (this EntityDeclaration element)
+
+		static bool IsConst (SyntaxTokenList modifiers)
+		{
+			return modifiers.Any (mod => mod.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.ConstKeyword);
+		}
+
+		static bool IsConst (SyntaxNode element)
+		{
+			if (element is BaseFieldDeclarationSyntax)
+				return IsConst (((BaseFieldDeclarationSyntax)element).Modifiers);
+			if (element is LocalDeclarationStatementSyntax)
+				return IsConst (((LocalDeclarationStatementSyntax)element).Modifiers);
+			return false;
+		}
+		public static string GetStockIcon (this SyntaxNode element)
 		{
 			Accessibility acc = Accessibility.Public;
+			bool isStatic = false;
+			if (element is NamespaceDeclarationSyntax)
+				return Namespace;
+			
+			if (element is AccessorDeclarationSyntax) {
+				if (!GetAccessibility ((MemberDeclarationSyntax)element, out acc, out isStatic))
+					GetAccessibility (element.Parent as MemberDeclarationSyntax, out acc, out isStatic);
 
+				return "md-" + GetAccess (acc) + "method";
+			}
 			
-			if (element is Accessor) {
-				if (!GetAccessibility (element, out acc))
-					GetAccessibility (element.Parent as EntityDeclaration, out acc);
+			GetAccessibility (element, out acc, out isStatic);
 
-				return methodIconTable [(int) (acc)];
+			if (element is EnumDeclarationSyntax) {
+				return "md-" + GetAccess (acc) + "enum";
 			}
 
-			GetAccessibility (element, out acc);
-
-			if (element is TypeDeclaration) {
-				var type = element as TypeDeclaration;
-				
-				switch (type.ClassType) {
-				case ClassType.Class:
-					return typeIconTable [0, (int) (acc)];
-				case ClassType.Struct:
-					return typeIconTable [3, (int) (acc)];
-				case ClassType.Interface:
-					return typeIconTable [2, (int) (acc)];
-				case ClassType.Enum:
-					return typeIconTable [1, (int) (acc)];
+			if (element is TypeDeclarationSyntax) {
+				var type = element as TypeDeclarationSyntax;
+				switch (type.Keyword.Kind ()) {
+				case SyntaxKind.ClassKeyword:
+					return "md-" + GetAccess (acc) + "class";
+				case SyntaxKind.StructKeyword:
+					return "md-" + GetAccess (acc) + "struct";
+				case SyntaxKind.InterfaceKeyword:
+					return "md-" + GetAccess (acc) + "interface";
+				case SyntaxKind.EnumKeyword:
+					return "md-" + GetAccess (acc) + "enum";
 				default:
 					throw new ArgumentOutOfRangeException ();
 				}
 			}
-			if (element is DelegateDeclaration)
-				return typeIconTable [4, (int) (acc)];
+			if (element is DelegateDeclarationSyntax)
+				return "md-" + GetAccess (acc) + "delegate";
 
 			// member accessibility
-			GetAccessibility (element, out acc);
+			GetAccessibility (element, out acc, out isStatic);
+
+			if (element is BaseMethodDeclarationSyntax) {
+				// TODO!
+				// var method = element as MethodDeclarationSyntax;
+				//				if (method.ParameterList.Parameters.First ())
+				//	return extensionMethodIconTable [(int) (acc)];
 
-			if (element is MethodDeclaration) {
-				var method = element as MethodDeclaration;
-				if (method.IsExtensionMethod)
-					return extensionMethodIconTable [(int) (acc)];
-				return methodIconTable [(int) (acc)];
+
+				return "md-" + GetAccess (acc) + GetGlobal (isStatic) + "method";
 			}
-			if (element is OperatorDeclaration || element is ConstructorDeclaration || element is DestructorDeclaration || element is Accessor)
-				return methodIconTable [(int) (acc)];
-
-			if (element is PropertyDeclaration ||  element is IndexerDeclaration)
-				return propertyIconTable [(int) (acc)];
-			if (element is EventDeclaration || element is CustomEventDeclaration)
-				return eventIconTable [(int) (acc)];
-			 if (element.Parent is TypeDeclaration && ((TypeDeclaration)element.Parent).ClassType == ClassType.Enum)
-				acc = Accessibility.Public;
-			return fieldIconTable [(int) (acc)];
+
+			if (element is PropertyDeclarationSyntax || element is IndexerDeclarationSyntax)
+				return "md-" + GetAccess (acc) + GetGlobal (isStatic) + "property";
+			if (element is EventDeclarationSyntax || element is EventFieldDeclarationSyntax)
+				return "md-" + GetAccess (acc) + GetGlobal (isStatic) + "event";
+			if (element is EnumMemberDeclarationSyntax)
+				return "md-literal";
+			if (element?.Parent?.Parent is FieldDeclarationSyntax || element?.Parent?.Parent is LocalDeclarationStatementSyntax) {
+				if (IsConst (element.Parent.Parent))
+					return "md-" + GetAccess (acc) + "literal";
+			}
+
+			if (element is FieldDeclarationSyntax || element is LocalDeclarationStatementSyntax) {
+				if (IsConst (element))
+					return "md-" + GetAccess (acc) + "literal";
+			}
+
+			return "md-" + GetAccess (acc) + GetGlobal (isStatic) + "field";
+		}
+
+		static string GetGlobal (bool isStatic)
+		{
+			return isStatic ? "static-" : "";
+		}
+
+		static string GetAccess (Accessibility acc)
+		{
+			return MonoDevelop.Ide.TypeSystem.Stock.GetAccess (acc);
 		}
-	}
 
+		internal static IconId GetStockIconForSymbolInfo (this DeclaredSymbolInfo symbol)
+		{
+			switch (symbol.Kind) {
+			case DeclaredSymbolInfoKind.Class:
+				return AstStockIcons.Class;
+			case DeclaredSymbolInfoKind.Constant:
+				return AstStockIcons.Field;
+			case DeclaredSymbolInfoKind.Constructor:
+				return AstStockIcons.Method;
+			case DeclaredSymbolInfoKind.Delegate:
+				return AstStockIcons.Delegate;
+			case DeclaredSymbolInfoKind.Enum:
+				return AstStockIcons.Enum;
+			case DeclaredSymbolInfoKind.EnumMember:
+				return AstStockIcons.Field;
+			case DeclaredSymbolInfoKind.Event:
+				return AstStockIcons.Event;
+			case DeclaredSymbolInfoKind.Field:
+				return AstStockIcons.Field;
+			case DeclaredSymbolInfoKind.Indexer:
+				return AstStockIcons.Method;
+			case DeclaredSymbolInfoKind.Interface:
+				return AstStockIcons.Interface;
+			case DeclaredSymbolInfoKind.Method:
+				return AstStockIcons.Method;
+			case DeclaredSymbolInfoKind.Module:
+				return AstStockIcons.Method;
+			case DeclaredSymbolInfoKind.Property:
+				return AstStockIcons.Property;
+			case DeclaredSymbolInfoKind.Struct:
+				return AstStockIcons.Struct;
+			default:
+				throw new ArgumentOutOfRangeException ();
+			}
+		}
+	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
index 3536c9a86c..a4092e8883 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
@@ -32,16 +32,13 @@ using MonoDevelop.CSharp.Formatting;
 using MonoDevelop.Ide;
 using System.Collections.ObjectModel;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
 using System.IO;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MonoDevelop.CSharp
 {
-	class CSharpAmbience : Ambience
+	class CSharpAmbience : AmbienceTooltipProvider
 	{
 		static Dictionary<string, string> netToCSharpTypes = new Dictionary<string, string> ();
 		static HashSet<string> keywords = new HashSet<string> (new [] {
@@ -186,40 +183,33 @@ namespace MonoDevelop.CSharp
 			netToCSharpTypes ["System.Decimal"] = "decimal";
 			netToCSharpTypes ["System.String"] = "string";
 			
-			classTypes [TypeKind.Class] = "class";
-			classTypes [TypeKind.Enum] = "enum";
-			classTypes [TypeKind.Interface] = "interface";
-			classTypes [TypeKind.Struct] = "struct";
-			classTypes [TypeKind.Delegate] = "delegate";
+//			classTypes [TypeKind.Class] = "class";
+//			classTypes [TypeKind.Enum] = "enum";
+//			classTypes [TypeKind.Interface] = "interface";
+//			classTypes [TypeKind.Struct] = "struct";
+//			classTypes [TypeKind.Delegate] = "delegate";
 		}
-		
-		public CSharpAmbience () : base ("C#")
-		{
-		}
-		
-		static Dictionary<TypeKind, string> classTypes = new Dictionary<TypeKind, string> ();
-
-		public override MonoDevelop.Ide.CodeCompletion.TooltipInformation GetTooltip (IEntity entity)
+//		
+//		public CSharpAmbience () : base ("C#")
+//		{
+//		}
+//		
+//		static Dictionary<TypeKind, string> classTypes = new Dictionary<TypeKind, string> ();
+//
+		public override Task<MonoDevelop.Ide.CodeCompletion.TooltipInformation> GetTooltip (CancellationToken token, Microsoft.CodeAnalysis.ISymbol entity)
 		{
 			if (entity == null)
 				throw new ArgumentNullException ("entity");
-			return MonoDevelop.CSharp.Completion.MemberCompletionData.CreateTooltipInformation (
-				entity.Compilation,
-				null,
-				null,
-				new CSharpFormattingPolicy (),
-				entity,
-				false,
-				true);
+			return MonoDevelop.CSharp.Completion.RoslynSymbolCompletionData.CreateTooltipInformation (token, null, null, entity, false, true);
 		}
 
-		static string GetString (TypeKind classType)
-		{
-			string res;
-			if (classTypes.TryGetValue (classType, out res))
-				return res;
-			return string.Empty;
-		}
+//		static string GetString (TypeKind classType)
+//		{
+//			string res;
+//			if (classTypes.TryGetValue (classType, out res))
+//				return res;
+//			return string.Empty;
+//		}
 		
 		internal static string FilterName (string name)
 		{
@@ -235,334 +225,334 @@ namespace MonoDevelop.CSharp
 			return netTypeName;
 		}
 		
-		#region implemented abstract members of MonoDevelop.Ide.TypeSystem.Ambience
-		public override string GetIntrinsicTypeName (string reflectionName)
-		{
-			return NetToCSharpTypeName (reflectionName);
-		}
-
-		public override string SingleLineComment (string text)
-		{
-			return "// " + text;
-		}
-
-		public override string GetString (string nameSpace, OutputSettings settings)
-		{
-			var result = new StringBuilder ();
-			if (settings.IncludeKeywords)
-				result.Append (settings.EmitKeyword ("namespace"));
-			result.Append (Format (nameSpace));
-			return result.ToString ();
-		}
-		
-		public void AppendType (StringBuilder sb, IType type, OutputSettings settings)
-		{
-			if (type.Kind == TypeKind.Unknown) {
-				sb.Append (settings.IncludeMarkup ? settings.Markup (type.Name) : type.Name);
-				return;
-			}
-			if (type.Kind == TypeKind.TypeParameter) {
-				sb.Append (settings.IncludeMarkup ? settings.Markup (type.Name) : type.Name);
-				return;
-			}
-			if (type.DeclaringType != null) {
-				AppendType (sb, type.DeclaringType, settings);
-				sb.Append (settings.Markup ("."));
-			}
-			if (type.Namespace == "System" && type.TypeParameterCount == 0) {
-				switch (type.Name) {
-				case "Object":
-					sb.Append ("object");
-					return;
-				case "Boolean":
-					sb.Append ("bool");
-					return;
-				case "Char":
-					sb.Append ("char");
-					return;
-				case "SByte":
-					sb.Append ("sbyte");
-					return;
-				case "Byte":
-					sb.Append ("byte");
-					return;
-				case "Int16":
-					sb.Append ("short");
-					return;
-				case "UInt16":
-					sb.Append ("ushort");
-					return;
-				case "Int32":
-					sb.Append ("int");
-					return;
-				case "UInt32":
-					sb.Append ("uint");
-					return;
-				case "Int64":
-					sb.Append ("long");
-					return;
-				case "UInt64":
-					sb.Append ("ulong");
-					return;
-				case "Single":
-					sb.Append ("float");
-					return;
-				case "Double":
-					sb.Append ("double");
-					return;
-				case "Decimal":
-					sb.Append ("decimal");
-					return;
-				case "String":
-					sb.Append ("string");
-					return;
-				case "Void":
-					sb.Append ("void");
-					return;
-				}
-			}
-			
-			var typeWithElementType = type as TypeWithElementType;
-			if (typeWithElementType != null) {
-				AppendType (sb, typeWithElementType.ElementType, settings);
-				
-				if (typeWithElementType is PointerType) {
-					sb.Append (settings.Markup ("*"));
-				} 
-				
-				if (typeWithElementType is ArrayType) {
-					sb.Append (settings.Markup ("["));
-					sb.Append (settings.Markup (new string (',', ((ArrayType)type).Dimensions - 1)));
-					sb.Append (settings.Markup ("]"));
-				}
-				return;
-			}
-			
-			if (type.TypeArguments.Count > 0) {
-				if (type.Name == "Nullable" && type.Namespace == "System" && type.TypeParameterCount == 1) {
-					AppendType (sb, type.TypeArguments [0], settings);
-					sb.Append (settings.Markup ("?"));
-					return;
-				}
-				sb.Append (type.Name);
-				if (type.TypeParameterCount > 0) {
-					sb.Append (settings.Markup ("<"));
-					for (int i = 0; i < type.TypeParameterCount; i++) {
-						if (i > 0)
-							sb.Append (settings.Markup (", "));
-						AppendType (sb, type.TypeArguments [i], settings);
-					}
-					sb.Append (settings.Markup (">"));
-				}
-				return;
-			}
-			
-			var typeDef = type as ITypeDefinition ?? type.GetDefinition ();
-			if (typeDef != null) {
-				if (settings.UseFullName) {
-					sb.Append (settings.IncludeMarkup ? settings.Markup (typeDef.FullName) : typeDef.FullName);
-				} else {
-					sb.Append (settings.IncludeMarkup ? settings.Markup (typeDef.Name) : typeDef.Name);
-				}
-				
-				if (typeDef.TypeParameterCount > 0) {
-					sb.Append (settings.Markup ("<"));
-					for (int i = 0; i < typeDef.TypeParameterCount; i++) {
-						if (i > 0)
-							sb.Append (settings.Markup (", "));
-						AppendVariance (sb, typeDef.TypeParameters [i].Variance);
-						AppendType (sb, typeDef.TypeParameters [i], settings);
-					}
-					sb.Append (settings.Markup (">"));
-				}
-			}
-		}
-
-		static void AppendVariance (StringBuilder sb, VarianceModifier variance)
-		{
-			if (variance  == VarianceModifier.Contravariant) {
-				sb.Append ("in ");
-			} else if (variance  == VarianceModifier.Covariant) {
-				sb.Append ("out ");
-			}
-		}
-
-		protected override string GetTypeReferenceString (IType reference, OutputSettings settings)
-		{
-			if (reference == null)
-				return "null";
-			var type = reference;
-			if (type.Kind == TypeKind.Unknown) {
-				return settings.IncludeMarkup ? settings.Markup (reference.Name) : reference.Name;
-			}
-			
-			if (reference.Kind == TypeKind.TypeParameter)
-				return settings.IncludeMarkup ? settings.Markup (reference.Name) : reference.FullName;
-			
-			var sb = new StringBuilder ();
-			if (type is ITypeDefinition && ((ITypeDefinition)type).IsSynthetic && ((ITypeDefinition)type).Name == "$Anonymous$") {
-				sb.Append ("new {");
-				foreach (var property in ((ITypeDefinition)type).Properties) {
-					sb.AppendLine ();
-					sb.Append ("\t");
-					sb.Append (GetTypeReferenceString (property.ReturnType, settings) ?? "?");
-					sb.Append (" ");
-					sb.Append (settings.IncludeMarkup ? settings.Markup (property.Name) : property.Name);
-					sb.Append (";");
-				}
-				sb.AppendLine ();
-				sb.Append ("}");
-				return sb.ToString ();
-			}
-			
-			AppendType (sb, type, settings);
-			return sb.ToString ();
-		}
-
-		protected override string GetTypeString (IType t, OutputSettings settings)
-		{
-			if (t.Kind == TypeKind.Unknown) {
-				return settings.IncludeMarkup ? settings.Markup (t.Name) : t.Name;
-			}
-			
-			if (t.Kind == TypeKind.TypeParameter)
-				return settings.IncludeMarkup ? settings.Markup (t.FullName) : t.FullName;
-
-			var typeWithElementType = t as TypeWithElementType;
-			if (typeWithElementType != null) {
-				var sb = new StringBuilder ();
-			
-				if (typeWithElementType is PointerType) {
-					sb.Append (settings.Markup ("*"));
-				} 
-				AppendType (sb, typeWithElementType.ElementType, settings);
-				
-				if (typeWithElementType is ArrayType) {
-					sb.Append (settings.Markup ("["));
-					sb.Append (settings.Markup (new string (',', ((ArrayType)t).Dimensions - 1)));
-					sb.Append (settings.Markup ("]"));
-				}
-				return sb.ToString ();
-			}
-			
-			ITypeDefinition type = t.GetDefinition ();
-			if (type == null)
-				return "";
-			
-			if (!settings.UseNETTypeNames && type.Namespace == "System" && type.TypeParameterCount == 0) {
-				switch (type.Name) {
-				case "Object":
-					return "object";
-				case "Boolean":
-					return "bool";
-				case "Char":
-					return "char";
-				case "SByte":
-					return "sbyte";
-				case "Byte":
-					return "byte";
-				case "Int16":
-					return "short";
-				case "UInt16":
-					return "ushort";
-				case "Int32":
-					return "int";
-				case "UInt32":
-					return "uint";
-				case "Int64":
-					return "long";
-				case "UInt64":
-					return "ulong";
-				case "Single":
-					return "float";
-				case "Double":
-					return "double";
-				case "Decimal":
-					return "decimal";
-				case "String":
-					return "string";
-				case "Void":
-					return "void";
-				}
-			}
-			
-			// output anonymous type
-			if (type.IsSynthetic && type.Name == "$Anonymous$")
-				return GetTypeReferenceString (type, settings);
-			
-			var result = new StringBuilder ();
-
-
-			var def = type;
-			AppendModifiers (result, settings, def);
-			if (settings.IncludeKeywords)
-				result.Append (GetString (def.Kind));
-			if (result.Length > 0 && !result.ToString ().EndsWith (" "))
-				result.Append (settings.Markup (" "));
-			
-			
-			if (type.Kind == TypeKind.Delegate && settings.ReformatDelegates && settings.IncludeReturnType) {
-				var invoke = type.GetDelegateInvokeMethod ();
-				result.Append (GetTypeReferenceString (invoke.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (settings.UseFullName && !string.IsNullOrEmpty (type.Namespace)) 
-				result.Append ((settings.IncludeMarkup ? settings.Markup (t.Namespace) : type.Namespace) + ".");
-			
-			if (settings.UseFullInnerTypeName && type.DeclaringTypeDefinition != null) {
-				bool includeGenerics = settings.IncludeGenerics;
-				settings.OutputFlags |= OutputFlags.IncludeGenerics;
-				string typeString = GetTypeReferenceString (type.DeclaringTypeDefinition, settings);
-				if (!includeGenerics)
-					settings.OutputFlags &= ~OutputFlags.IncludeGenerics;
-				result.Append (typeString);
-				result.Append (settings.Markup ("."));
-			}
-			result.Append (settings.EmitName (type, settings.IncludeMarkup ? settings.Markup (t.Name) : type.Name));
-			if (settings.IncludeGenerics && type.TypeParameterCount > 0) {
-				result.Append (settings.Markup ("<"));
-				for (int i = 0; i < type.TypeParameterCount; i++) {
-					if (i > 0)
-						result.Append (settings.Markup (settings.HideGenericParameterNames ? "," : ", "));
-					if (!settings.HideGenericParameterNames) {
-						if (t.TypeArguments.Count > 0) {
-							result.Append (GetTypeReferenceString (t.TypeArguments [i], settings));
-						} else {
-							AppendVariance (result, type.TypeParameters [i].Variance);
-							result.Append (NetToCSharpTypeName (type.TypeParameters [i].FullName));
-						}
-					}
-				}
-				result.Append (settings.Markup (">"));
-			}
-			
-			if (t.Kind == TypeKind.Delegate && settings.ReformatDelegates) {
-//				var policy = GetPolicy (settings);
-//				if (policy.BeforeMethodCallParentheses)
-//					result.Append (settings.Markup (" "));
-				result.Append (settings.Markup ("("));
-				var invoke = type.GetDelegateInvokeMethod ();
-				if (invoke != null) 
-					AppendParameterList (result, settings, invoke.Parameters);
-				result.Append (settings.Markup (")"));
-				return result.ToString ();
-			}
-			
-			if (settings.IncludeBaseTypes && type.DirectBaseTypes.Any ()) {
-				bool first = true;
-				foreach (var baseType in type.DirectBaseTypes) {
-//				if (baseType.FullName == "System.Object" || baseType.FullName == "System.Enum")
-//					continue;
-					result.Append (settings.Markup (first ? " : " : ", "));
-					first = false;
-					result.Append (GetTypeReferenceString (baseType, settings));	
-				}
-				
-			}
-//		OutputConstraints (result, settings, type.TypeParameters);
-			return result.ToString ();
-		}
+//		#region implemented abstract members of MonoDevelop.Ide.TypeSystem.Ambience
+//		public override string GetIntrinsicTypeName (string reflectionName)
+//		{
+//			return NetToCSharpTypeName (reflectionName);
+//		}
+//
+//		public override string SingleLineComment (string text)
+//		{
+//			return "// " + text;
+//		}
+//
+//		public override string GetString (string nameSpace, OutputSettings settings)
+//		{
+//			var result = new StringBuilder ();
+//			if (settings.IncludeKeywords)
+//				result.Append (settings.EmitKeyword ("namespace"));
+//			result.Append (Format (nameSpace));
+//			return result.ToString ();
+//		}
+//		
+//		public void AppendType (StringBuilder sb, IType type, OutputSettings settings)
+//		{
+//			if (type.Kind == TypeKind.Unknown) {
+//				sb.Append (settings.IncludeMarkup ? settings.Markup (type.Name) : type.Name);
+//				return;
+//			}
+//			if (type.Kind == TypeKind.TypeParameter) {
+//				sb.Append (settings.IncludeMarkup ? settings.Markup (type.Name) : type.Name);
+//				return;
+//			}
+//			if (type.DeclaringType != null) {
+//				AppendType (sb, type.DeclaringType, settings);
+//				sb.Append (settings.Markup ("."));
+//			}
+//			if (type.Namespace == "System" && type.TypeParameterCount == 0) {
+//				switch (type.Name) {
+//				case "Object":
+//					sb.Append ("object");
+//					return;
+//				case "Boolean":
+//					sb.Append ("bool");
+//					return;
+//				case "Char":
+//					sb.Append ("char");
+//					return;
+//				case "SByte":
+//					sb.Append ("sbyte");
+//					return;
+//				case "Byte":
+//					sb.Append ("byte");
+//					return;
+//				case "Int16":
+//					sb.Append ("short");
+//					return;
+//				case "UInt16":
+//					sb.Append ("ushort");
+//					return;
+//				case "Int32":
+//					sb.Append ("int");
+//					return;
+//				case "UInt32":
+//					sb.Append ("uint");
+//					return;
+//				case "Int64":
+//					sb.Append ("long");
+//					return;
+//				case "UInt64":
+//					sb.Append ("ulong");
+//					return;
+//				case "Single":
+//					sb.Append ("float");
+//					return;
+//				case "Double":
+//					sb.Append ("double");
+//					return;
+//				case "Decimal":
+//					sb.Append ("decimal");
+//					return;
+//				case "String":
+//					sb.Append ("string");
+//					return;
+//				case "Void":
+//					sb.Append ("void");
+//					return;
+//				}
+//			}
+//			
+//			var typeWithElementType = type as TypeWithElementType;
+//			if (typeWithElementType != null) {
+//				AppendType (sb, typeWithElementType.ElementType, settings);
+//				
+//				if (typeWithElementType is PointerType) {
+//					sb.Append (settings.Markup ("*"));
+//				} 
+//				
+//				if (typeWithElementType is ArrayType) {
+//					sb.Append (settings.Markup ("["));
+//					sb.Append (settings.Markup (new string (',', ((ArrayType)type).Dimensions - 1)));
+//					sb.Append (settings.Markup ("]"));
+//				}
+//				return;
+//			}
+//			
+//			if (type.TypeArguments.Count > 0) {
+//				if (type.Name == "Nullable" && type.Namespace == "System" && type.TypeParameterCount == 1) {
+//					AppendType (sb, type.TypeArguments [0], settings);
+//					sb.Append (settings.Markup ("?"));
+//					return;
+//				}
+//				sb.Append (type.Name);
+//				if (type.TypeParameterCount > 0) {
+//					sb.Append (settings.Markup ("<"));
+//					for (int i = 0; i < type.TypeParameterCount; i++) {
+//						if (i > 0)
+//							sb.Append (settings.Markup (", "));
+//						AppendType (sb, type.TypeArguments [i], settings);
+//					}
+//					sb.Append (settings.Markup (">"));
+//				}
+//				return;
+//			}
+//			
+//			var typeDef = type as ITypeDefinition ?? type.GetDefinition ();
+//			if (typeDef != null) {
+//				if (settings.UseFullName) {
+//					sb.Append (settings.IncludeMarkup ? settings.Markup (typeDef.FullName) : typeDef.FullName);
+//				} else {
+//					sb.Append (settings.IncludeMarkup ? settings.Markup (typeDef.Name) : typeDef.Name);
+//				}
+//				
+//				if (typeDef.TypeParameterCount > 0) {
+//					sb.Append (settings.Markup ("<"));
+//					for (int i = 0; i < typeDef.TypeParameterCount; i++) {
+//						if (i > 0)
+//							sb.Append (settings.Markup (", "));
+//						AppendVariance (sb, typeDef.TypeParameters [i].Variance);
+//						AppendType (sb, typeDef.TypeParameters [i], settings);
+//					}
+//					sb.Append (settings.Markup (">"));
+//				}
+//			}
+//		}
+//
+//		static void AppendVariance (StringBuilder sb, VarianceModifier variance)
+//		{
+//			if (variance  == VarianceModifier.Contravariant) {
+//				sb.Append ("in ");
+//			} else if (variance  == VarianceModifier.Covariant) {
+//				sb.Append ("out ");
+//			}
+//		}
+//
+//		protected override string GetTypeReferenceString (IType reference, OutputSettings settings)
+//		{
+//			if (reference == null)
+//				return "null";
+//			var type = reference;
+//			if (type.Kind == TypeKind.Unknown) {
+//				return settings.IncludeMarkup ? settings.Markup (reference.Name) : reference.Name;
+//			}
+//			
+//			if (reference.Kind == TypeKind.TypeParameter)
+//				return settings.IncludeMarkup ? settings.Markup (reference.Name) : reference.FullName;
+//			
+//			var sb = new StringBuilder ();
+//			if (type is ITypeDefinition && ((ITypeDefinition)type).IsSynthetic && ((ITypeDefinition)type).Name == "$Anonymous$") {
+//				sb.Append ("new {");
+//				foreach (var property in ((ITypeDefinition)type).Properties) {
+//					sb.AppendLine ();
+//					sb.Append ("\t");
+//					sb.Append (GetTypeReferenceString (property.ReturnType, settings) ?? "?");
+//					sb.Append (" ");
+//					sb.Append (settings.IncludeMarkup ? settings.Markup (property.Name) : property.Name);
+//					sb.Append (";");
+//				}
+//				sb.AppendLine ();
+//				sb.Append ("}");
+//				return sb.ToString ();
+//			}
+//			
+//			AppendType (sb, type, settings);
+//			return sb.ToString ();
+//		}
+//
+//		protected override string GetTypeString (IType t, OutputSettings settings)
+//		{
+//			if (t.Kind == TypeKind.Unknown) {
+//				return settings.IncludeMarkup ? settings.Markup (t.Name) : t.Name;
+//			}
+//			
+//			if (t.Kind == TypeKind.TypeParameter)
+//				return settings.IncludeMarkup ? settings.Markup (t.FullName) : t.FullName;
+//
+//			var typeWithElementType = t as TypeWithElementType;
+//			if (typeWithElementType != null) {
+//				var sb = new StringBuilder ();
+//			
+//				if (typeWithElementType is PointerType) {
+//					sb.Append (settings.Markup ("*"));
+//				} 
+//				AppendType (sb, typeWithElementType.ElementType, settings);
+//				
+//				if (typeWithElementType is ArrayType) {
+//					sb.Append (settings.Markup ("["));
+//					sb.Append (settings.Markup (new string (',', ((ArrayType)t).Dimensions - 1)));
+//					sb.Append (settings.Markup ("]"));
+//				}
+//				return sb.ToString ();
+//			}
+//			
+//			ITypeDefinition type = t.GetDefinition ();
+//			if (type == null)
+//				return "";
+//			
+//			if (!settings.UseNETTypeNames && type.Namespace == "System" && type.TypeParameterCount == 0) {
+//				switch (type.Name) {
+//				case "Object":
+//					return "object";
+//				case "Boolean":
+//					return "bool";
+//				case "Char":
+//					return "char";
+//				case "SByte":
+//					return "sbyte";
+//				case "Byte":
+//					return "byte";
+//				case "Int16":
+//					return "short";
+//				case "UInt16":
+//					return "ushort";
+//				case "Int32":
+//					return "int";
+//				case "UInt32":
+//					return "uint";
+//				case "Int64":
+//					return "long";
+//				case "UInt64":
+//					return "ulong";
+//				case "Single":
+//					return "float";
+//				case "Double":
+//					return "double";
+//				case "Decimal":
+//					return "decimal";
+//				case "String":
+//					return "string";
+//				case "Void":
+//					return "void";
+//				}
+//			}
+//			
+//			// output anonymous type
+//			if (type.IsSynthetic && type.Name == "$Anonymous$")
+//				return GetTypeReferenceString (type, settings);
+//			
+//			var result = new StringBuilder ();
+//
+//
+//			var def = type;
+//			AppendModifiers (result, settings, def);
+//			if (settings.IncludeKeywords)
+//				result.Append (GetString (def.Kind));
+//			if (result.Length > 0 && !result.ToString ().EndsWith (" "))
+//				result.Append (settings.Markup (" "));
+//			
+//			
+//			if (type.Kind == TypeKind.Delegate && settings.ReformatDelegates && settings.IncludeReturnType) {
+//				var invoke = type.GetDelegateInvokeMethod ();
+//				result.Append (GetTypeReferenceString (invoke.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (settings.UseFullName && !string.IsNullOrEmpty (type.Namespace)) 
+//				result.Append ((settings.IncludeMarkup ? settings.Markup (t.Namespace) : type.Namespace) + ".");
+//			
+//			if (settings.UseFullInnerTypeName && type.DeclaringTypeDefinition != null) {
+//				bool includeGenerics = settings.IncludeGenerics;
+//				settings.OutputFlags |= OutputFlags.IncludeGenerics;
+//				string typeString = GetTypeReferenceString (type.DeclaringTypeDefinition, settings);
+//				if (!includeGenerics)
+//					settings.OutputFlags &= ~OutputFlags.IncludeGenerics;
+//				result.Append (typeString);
+//				result.Append (settings.Markup ("."));
+//			}
+//			result.Append (settings.EmitName (type, settings.IncludeMarkup ? settings.Markup (t.Name) : type.Name));
+//			if (settings.IncludeGenerics && type.TypeParameterCount > 0) {
+//				result.Append (settings.Markup ("<"));
+//				for (int i = 0; i < type.TypeParameterCount; i++) {
+//					if (i > 0)
+//						result.Append (settings.Markup (settings.HideGenericParameterNames ? "," : ", "));
+//					if (!settings.HideGenericParameterNames) {
+//						if (t.TypeArguments.Count > 0) {
+//							result.Append (GetTypeReferenceString (t.TypeArguments [i], settings));
+//						} else {
+//							AppendVariance (result, type.TypeParameters [i].Variance);
+//							result.Append (NetToCSharpTypeName (type.TypeParameters [i].FullName));
+//						}
+//					}
+//				}
+//				result.Append (settings.Markup (">"));
+//			}
+//			
+//			if (t.Kind == TypeKind.Delegate && settings.ReformatDelegates) {
+////				var policy = GetPolicy (settings);
+////				if (policy.BeforeMethodCallParentheses)
+////					result.Append (settings.Markup (" "));
+//				result.Append (settings.Markup ("("));
+//				var invoke = type.GetDelegateInvokeMethod ();
+//				if (invoke != null) 
+//					AppendParameterList (result, settings, invoke.Parameters);
+//				result.Append (settings.Markup (")"));
+//				return result.ToString ();
+//			}
+//			
+//			if (settings.IncludeBaseTypes && type.DirectBaseTypes.Any ()) {
+//				bool first = true;
+//				foreach (var baseType in type.DirectBaseTypes) {
+////				if (baseType.FullName == "System.Object" || baseType.FullName == "System.Enum")
+////					continue;
+//					result.Append (settings.Markup (first ? " : " : ", "));
+//					first = false;
+//					result.Append (GetTypeReferenceString (baseType, settings));	
+//				}
+//				
+//			}
+////		OutputConstraints (result, settings, type.TypeParameters);
+//			return result.ToString ();
+//		}
 		
 		internal static string GetOperator (string methodName)
 		{
@@ -623,336 +613,336 @@ namespace MonoDevelop.CSharp
 			}
 			return methodName;
 		}
-		
-		string InternalGetMethodString (IMethod method, OutputSettings settings, string methodName, bool getReturnType)
-		{
-			if (method == null)
-				return "";
-			var result = new StringBuilder ();
-			AppendModifiers (result, settings, method);
-			if (!settings.CompletionListFomat && settings.IncludeReturnType && getReturnType) {
-				result.Append (GetTypeReferenceString (method.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (method.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
-				result.Append (settings.Markup ("."));
-			}
-			AppendExplicitInterfaces (result, method, settings);
-			if (method.SymbolKind == SymbolKind.Operator) {
-				result.Append ("operator ");
-				result.Append (settings.Markup (GetOperator (methodName)));
-			} else {
-				result.Append (methodName);
-			}
-			
-			if (settings.IncludeGenerics) {
-				if (method.TypeParameters.Count > 0) {
-					result.Append (settings.Markup ("<"));
-					for (int i = 0; i < method.TypeParameters.Count; i++) {
-						if (i > 0)
-							result.Append (settings.Markup (settings.HideGenericParameterNames ? "," : ", "));
-						if (!settings.HideGenericParameterNames) {
-							AppendVariance (result, method.TypeParameters [i].Variance);
-							result.Append (NetToCSharpTypeName (method.TypeParameters [i].Name));
-						}
-					}
-					result.Append (settings.Markup (">"));
-				}
-			}
-			
-			if (settings.IncludeParameters) {
-//			CSharpFormattingPolicy policy = GetPolicy (settings);
-//			if (policy.BeforeMethodCallParentheses)
+//		
+//		string InternalGetMethodString (IMethod method, OutputSettings settings, string methodName, bool getReturnType)
+//		{
+//			if (method == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			AppendModifiers (result, settings, method);
+//			if (!settings.CompletionListFomat && settings.IncludeReturnType && getReturnType) {
+//				result.Append (GetTypeReferenceString (method.ReturnType, settings));
 //				result.Append (settings.Markup (" "));
-				result.Append (settings.Markup ("("));
-				AppendParameterList (result, settings, method.Parameters);
-				result.Append (settings.Markup (")"));
-			}
-			
-			if (settings.CompletionListFomat && settings.IncludeReturnType && getReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (method.ReturnType, settings));
-			}
-			
-//		OutputConstraints (result, settings, method.TypeParameters);
-			
-			return result.ToString ();			
-		}
-
-		protected override string GetMethodString (IMethod method, OutputSettings settings)
-		{
-			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.SymbolKind == SymbolKind.Constructor || method.SymbolKind == SymbolKind.Destructor ? method.DeclaringTypeDefinition.Name : method.Name))), true);
-		}
-
-		protected override string GetConstructorString (IMethod method, OutputSettings settings)
-		{
-			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.DeclaringTypeDefinition != null ? method.DeclaringTypeDefinition.Name : method.Name))), false);
-		}
-
-		protected override string GetDestructorString (IMethod method, OutputSettings settings)
-		{
-			return InternalGetMethodString (method, settings, settings.EmitName (method, settings.Markup ("~") + Format (FilterName (method.DeclaringTypeDefinition != null ? method.DeclaringTypeDefinition.Name : method.Name))), false);
-		}
-
-		protected override string GetOperatorString (IMethod method, OutputSettings settings)
-		{
-			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.Name))), true);
-		}
-
-		protected override string GetFieldString (IField field, OutputSettings settings)
-		{
-			if (field == null)
-				return "";
-			var result = new StringBuilder ();
-			bool isEnum = field.DeclaringTypeDefinition != null && field.DeclaringTypeDefinition.Kind == TypeKind.Enum;
-			AppendModifiers (result, settings, field);
-			
-			if (!settings.CompletionListFomat && settings.IncludeReturnType && !isEnum) {
-				result.Append (GetTypeReferenceString (field.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (field.DeclaringTypeDefinition, settings));
-				result.Append (settings.Markup ("."));
-			}
-			result.Append (settings.EmitName (field, FilterName (Format (field.Name))));
-			
-			if (settings.CompletionListFomat && settings.IncludeReturnType && !isEnum) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (field.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-
-		protected override string GetEventString (IEvent evt, OutputSettings settings)
-		{
-			if (evt == null)
-				return "";
-			var result = new StringBuilder ();
-			AppendModifiers (result, settings, evt);
-			if (settings.IncludeKeywords)
-				result.Append (settings.EmitKeyword ("event"));
-			if (!settings.CompletionListFomat && settings.IncludeReturnType) {
-				result.Append (GetTypeReferenceString (evt.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (evt.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
-				result.Append (settings.Markup ("."));
-			}
-			
-			AppendExplicitInterfaces (result, evt, settings);
-			result.Append (settings.EmitName (evt, Format (FilterName (evt.Name))));
-			
-			if (settings.CompletionListFomat && settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (evt.ReturnType, settings));
-			}
-			return result.ToString ();
-		}
-
-		protected override string GetPropertyString (IProperty property, OutputSettings settings)
-		{
-			if (property == null)
-				return "";
-			var result = new StringBuilder ();
-			AppendModifiers (result, settings, property);
-			if (!settings.CompletionListFomat && settings.IncludeReturnType) {
-				result.Append (GetTypeReferenceString (property.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (property.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
-				result.Append (settings.Markup ("."));
-			}
-			
-			AppendExplicitInterfaces (result, property, settings);
-			
-			if (property.SymbolKind == SymbolKind.Indexer) {
-				result.Append (settings.EmitName (property, "this"));
-			} else {
-				result.Append (settings.EmitName (property, Format (FilterName (property.Name))));
-			}
-			
-			if (settings.IncludeParameters && property.Parameters.Count > 0) {
-				result.Append (settings.Markup ("["));
-				AppendParameterList (result, settings, property.Parameters);
-				result.Append (settings.Markup ("]"));
-			}
-						
-			if (settings.CompletionListFomat && settings.IncludeReturnType) {
-				result.Append (settings.Markup (" : "));
-				result.Append (GetTypeReferenceString (property.ReturnType, settings));
-			}
-			
-			if (settings.IncludeAccessor) {
-				result.Append (settings.Markup (" {"));
-				if (property.CanGet)
-					result.Append (settings.Markup (" get;"));
-				if (property.CanSet)
-					result.Append (settings.Markup (" set;"));
-				result.Append (settings.Markup (" }"));
-			}
-			
-			return result.ToString ();
-		}
-
-		protected override string GetIndexerString (IProperty property, OutputSettings settings)
-		{
-			if (property == null)
-				return "";
-			var result = new StringBuilder ();
-			
-			AppendModifiers (result, settings, property);
-			
-			if (settings.IncludeReturnType) {
-				result.Append (GetTypeReferenceString (property.ReturnType, settings));
-				result.Append (settings.Markup (" "));
-			}
-			
-			if (!settings.IncludeReturnType && settings.UseFullName) {
-				result.Append (GetTypeReferenceString (property.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
-				result.Append (settings.Markup ("."));
-			}
-			
-			AppendExplicitInterfaces (result, property, settings);
-			
-			result.Append (settings.EmitName (property, Format ("this")));
-			
-			if (settings.IncludeParameters && property.Getter.Parameters.Count > 0) {
-				result.Append (settings.Markup ("["));
-				AppendParameterList (result, settings, property.Getter.Parameters);
-				result.Append (settings.Markup ("]"));
-			}
-			if (settings.IncludeAccessor) {
-				result.Append (settings.Markup (" {"));
-				if (property.CanGet)
-					result.Append (settings.Markup (" get;"));
-				if (property.CanSet)
-					result.Append (settings.Markup (" set;"));
-				result.Append (settings.Markup (" }"));
-			}
-			return result.ToString ();
-		}
-
-		protected override string GetParameterString (IParameterizedMember member, IParameter parameter, OutputSettings settings)
-		{
-			if (parameter == null)
-				return "";
-			var result = new StringBuilder ();
-			if (settings.IncludeParameterName) {
-				if (settings.IncludeModifiers) {
-					if (parameter.IsOut) {
-						result.Append (settings.EmitKeyword ("out"));
-					}
-					if (parameter.IsRef) {
-						result.Append (settings.EmitKeyword ("ref"));
-					}
-					if (parameter.IsParams) {
-						result.Append (settings.EmitKeyword ("params"));
-					}
-				}
-				
-				result.Append (GetTypeReferenceString (parameter.Type, settings));
-				result.Append (" ");
-
-				if (settings.HighlightName) {
-					result.Append (settings.EmitName (parameter, settings.Highlight (Format (FilterName (parameter.Name)))));
-				} else {
-					result.Append (settings.EmitName (parameter, Format (FilterName (parameter.Name))));
-				}
-			} else {
-				result.Append (GetTypeReferenceString (parameter.Type, settings));
-			}
-			return result.ToString ();
-		}
-
-		#endregion
-		
-		void AppendExplicitInterfaces (StringBuilder sb, IMember member, OutputSettings settings)
-		{
-			if (member == null || !member.IsExplicitInterfaceImplementation)
-				return;
-			foreach (var implementedInterfaceMember in member.ImplementedInterfaceMembers) {
-				if (settings.UseFullName) {
-					sb.Append (Format (implementedInterfaceMember.DeclaringTypeDefinition.FullName));
-				} else {
-					sb.Append (Format (implementedInterfaceMember.DeclaringTypeDefinition.Name));
-				}
-				sb.Append (settings.Markup ("."));
-			}
-		}
-
-		void AppendParameterList (StringBuilder result, OutputSettings settings, IEnumerable<IParameter> parameterList)
-		{
-			if (parameterList == null)
-				return;
-			
-			bool first = true;
-			foreach (var parameter in parameterList) {
-				if (!first)
-					result.Append (settings.Markup (", "));
-				AppendParameter (settings, result, parameter);
-				first = false;
-			}
-		}
-		
-		void AppendParameter (OutputSettings settings, StringBuilder result, IParameter parameter)
-		{
-			if (parameter == null)
-				return;
-			if (parameter.IsOut) {
-				result.Append (settings.Markup ("out"));
-				result.Append (settings.Markup (" "));
-			} else if (parameter.IsRef) {
-				result.Append (settings.Markup ("ref"));
-				result.Append (settings.Markup (" "));
-			} else if (parameter.IsParams) {
-				result.Append (settings.Markup ("params"));
-				result.Append (settings.Markup (" "));
-			}
-			result.Append (GetParameterString (null, parameter, settings));
-		}
-		
-		void AppendModifiers (StringBuilder result, OutputSettings settings, IEntity entity)
-		{
-			if (!settings.IncludeModifiers)
-				return;
-			if (entity.IsStatic)
-				result.Append (settings.EmitModifiers ("static"));
-			if (entity.IsSealed)
-				result.Append (settings.EmitModifiers ("sealed"));
-			if (entity.IsAbstract)
-				result.Append (settings.EmitModifiers ("abstract"));
-			if (entity.IsShadowing)
-				result.Append (settings.EmitModifiers ("new"));
-			
-			switch (entity.Accessibility) {
-			case Accessibility.Internal:
-				result.Append (settings.EmitModifiers ("internal"));
-				break;
-			case Accessibility.ProtectedAndInternal:
-				result.Append (settings.EmitModifiers ("protected internal"));
-				break;
-			case Accessibility.ProtectedOrInternal:
-				result.Append (settings.EmitModifiers ("internal protected"));
-				break;
-			case Accessibility.Protected:
-				result.Append (settings.EmitModifiers ("protected"));
-				break;
-			case Accessibility.Private:
-				result.Append (settings.EmitModifiers ("private"));
-				break;
-			case Accessibility.Public:
-				result.Append (settings.EmitModifiers ("public"));
-				break;
-			}
-		}
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (method.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
+//				result.Append (settings.Markup ("."));
+//			}
+//			AppendExplicitInterfaces (result, method, settings);
+//			if (method.SymbolKind == SymbolKind.Operator) {
+//				result.Append ("operator ");
+//				result.Append (settings.Markup (GetOperator (methodName)));
+//			} else {
+//				result.Append (methodName);
+//			}
+//			
+//			if (settings.IncludeGenerics) {
+//				if (method.TypeParameters.Count > 0) {
+//					result.Append (settings.Markup ("<"));
+//					for (int i = 0; i < method.TypeParameters.Count; i++) {
+//						if (i > 0)
+//							result.Append (settings.Markup (settings.HideGenericParameterNames ? "," : ", "));
+//						if (!settings.HideGenericParameterNames) {
+//							AppendVariance (result, method.TypeParameters [i].Variance);
+//							result.Append (NetToCSharpTypeName (method.TypeParameters [i].Name));
+//						}
+//					}
+//					result.Append (settings.Markup (">"));
+//				}
+//			}
+//			
+//			if (settings.IncludeParameters) {
+////			CSharpFormattingPolicy policy = GetPolicy (settings);
+////			if (policy.BeforeMethodCallParentheses)
+////				result.Append (settings.Markup (" "));
+//				result.Append (settings.Markup ("("));
+//				AppendParameterList (result, settings, method.Parameters);
+//				result.Append (settings.Markup (")"));
+//			}
+//			
+//			if (settings.CompletionListFomat && settings.IncludeReturnType && getReturnType) {
+//				result.Append (settings.Markup (" : "));
+//				result.Append (GetTypeReferenceString (method.ReturnType, settings));
+//			}
+//			
+////		OutputConstraints (result, settings, method.TypeParameters);
+//			
+//			return result.ToString ();			
+//		}
+//
+//		protected override string GetMethodString (IMethod method, OutputSettings settings)
+//		{
+//			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.SymbolKind == SymbolKind.Constructor || method.SymbolKind == SymbolKind.Destructor ? method.DeclaringTypeDefinition.Name : method.Name))), true);
+//		}
+//
+//		protected override string GetConstructorString (IMethod method, OutputSettings settings)
+//		{
+//			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.DeclaringTypeDefinition != null ? method.DeclaringTypeDefinition.Name : method.Name))), false);
+//		}
+//
+//		protected override string GetDestructorString (IMethod method, OutputSettings settings)
+//		{
+//			return InternalGetMethodString (method, settings, settings.EmitName (method, settings.Markup ("~") + Format (FilterName (method.DeclaringTypeDefinition != null ? method.DeclaringTypeDefinition.Name : method.Name))), false);
+//		}
+//
+//		protected override string GetOperatorString (IMethod method, OutputSettings settings)
+//		{
+//			return InternalGetMethodString (method, settings, settings.EmitName (method, Format (FilterName (method.Name))), true);
+//		}
+//
+//		protected override string GetFieldString (IField field, OutputSettings settings)
+//		{
+//			if (field == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			bool isEnum = field.DeclaringTypeDefinition != null && field.DeclaringTypeDefinition.Kind == TypeKind.Enum;
+//			AppendModifiers (result, settings, field);
+//			
+//			if (!settings.CompletionListFomat && settings.IncludeReturnType && !isEnum) {
+//				result.Append (GetTypeReferenceString (field.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (field.DeclaringTypeDefinition, settings));
+//				result.Append (settings.Markup ("."));
+//			}
+//			result.Append (settings.EmitName (field, FilterName (Format (field.Name))));
+//			
+//			if (settings.CompletionListFomat && settings.IncludeReturnType && !isEnum) {
+//				result.Append (settings.Markup (" : "));
+//				result.Append (GetTypeReferenceString (field.ReturnType, settings));
+//			}
+//			return result.ToString ();
+//		}
+//
+//		protected override string GetEventString (IEvent evt, OutputSettings settings)
+//		{
+//			if (evt == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			AppendModifiers (result, settings, evt);
+//			if (settings.IncludeKeywords)
+//				result.Append (settings.EmitKeyword ("event"));
+//			if (!settings.CompletionListFomat && settings.IncludeReturnType) {
+//				result.Append (GetTypeReferenceString (evt.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (evt.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
+//				result.Append (settings.Markup ("."));
+//			}
+//			
+//			AppendExplicitInterfaces (result, evt, settings);
+//			result.Append (settings.EmitName (evt, Format (FilterName (evt.Name))));
+//			
+//			if (settings.CompletionListFomat && settings.IncludeReturnType) {
+//				result.Append (settings.Markup (" : "));
+//				result.Append (GetTypeReferenceString (evt.ReturnType, settings));
+//			}
+//			return result.ToString ();
+//		}
+//
+//		protected override string GetPropertyString (IProperty property, OutputSettings settings)
+//		{
+//			if (property == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			AppendModifiers (result, settings, property);
+//			if (!settings.CompletionListFomat && settings.IncludeReturnType) {
+//				result.Append (GetTypeReferenceString (property.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (property.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
+//				result.Append (settings.Markup ("."));
+//			}
+//			
+//			AppendExplicitInterfaces (result, property, settings);
+//			
+//			if (property.SymbolKind == SymbolKind.Indexer) {
+//				result.Append (settings.EmitName (property, "this"));
+//			} else {
+//				result.Append (settings.EmitName (property, Format (FilterName (property.Name))));
+//			}
+//			
+//			if (settings.IncludeParameters && property.Parameters.Count > 0) {
+//				result.Append (settings.Markup ("["));
+//				AppendParameterList (result, settings, property.Parameters);
+//				result.Append (settings.Markup ("]"));
+//			}
+//						
+//			if (settings.CompletionListFomat && settings.IncludeReturnType) {
+//				result.Append (settings.Markup (" : "));
+//				result.Append (GetTypeReferenceString (property.ReturnType, settings));
+//			}
+//			
+//			if (settings.IncludeAccessor) {
+//				result.Append (settings.Markup (" {"));
+//				if (property.CanGet)
+//					result.Append (settings.Markup (" get;"));
+//				if (property.CanSet)
+//					result.Append (settings.Markup (" set;"));
+//				result.Append (settings.Markup (" }"));
+//			}
+//			
+//			return result.ToString ();
+//		}
+//
+//		protected override string GetIndexerString (IProperty property, OutputSettings settings)
+//		{
+//			if (property == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			
+//			AppendModifiers (result, settings, property);
+//			
+//			if (settings.IncludeReturnType) {
+//				result.Append (GetTypeReferenceString (property.ReturnType, settings));
+//				result.Append (settings.Markup (" "));
+//			}
+//			
+//			if (!settings.IncludeReturnType && settings.UseFullName) {
+//				result.Append (GetTypeReferenceString (property.DeclaringTypeDefinition, new OutputSettings (OutputFlags.UseFullName)));
+//				result.Append (settings.Markup ("."));
+//			}
+//			
+//			AppendExplicitInterfaces (result, property, settings);
+//			
+//			result.Append (settings.EmitName (property, Format ("this")));
+//			
+//			if (settings.IncludeParameters && property.Getter.Parameters.Count > 0) {
+//				result.Append (settings.Markup ("["));
+//				AppendParameterList (result, settings, property.Getter.Parameters);
+//				result.Append (settings.Markup ("]"));
+//			}
+//			if (settings.IncludeAccessor) {
+//				result.Append (settings.Markup (" {"));
+//				if (property.CanGet)
+//					result.Append (settings.Markup (" get;"));
+//				if (property.CanSet)
+//					result.Append (settings.Markup (" set;"));
+//				result.Append (settings.Markup (" }"));
+//			}
+//			return result.ToString ();
+//		}
+//
+//		protected override string GetParameterString (IParameterizedMember member, IParameter parameter, OutputSettings settings)
+//		{
+//			if (parameter == null)
+//				return "";
+//			var result = new StringBuilder ();
+//			if (settings.IncludeParameterName) {
+//				if (settings.IncludeModifiers) {
+//					if (parameter.IsOut) {
+//						result.Append (settings.EmitKeyword ("out"));
+//					}
+//					if (parameter.IsRef) {
+//						result.Append (settings.EmitKeyword ("ref"));
+//					}
+//					if (parameter.IsParams) {
+//						result.Append (settings.EmitKeyword ("params"));
+//					}
+//				}
+//				
+//				result.Append (GetTypeReferenceString (parameter.Type, settings));
+//				result.Append (" ");
+//
+//				if (settings.HighlightName) {
+//					result.Append (settings.EmitName (parameter, settings.Highlight (Format (FilterName (parameter.Name)))));
+//				} else {
+//					result.Append (settings.EmitName (parameter, Format (FilterName (parameter.Name))));
+//				}
+//			} else {
+//				result.Append (GetTypeReferenceString (parameter.Type, settings));
+//			}
+//			return result.ToString ();
+//		}
+//
+//		#endregion
+//		
+//		void AppendExplicitInterfaces (StringBuilder sb, IMember member, OutputSettings settings)
+//		{
+//			if (member == null || !member.IsExplicitInterfaceImplementation)
+//				return;
+//			foreach (var implementedInterfaceMember in member.ImplementedInterfaceMembers) {
+//				if (settings.UseFullName) {
+//					sb.Append (Format (implementedInterfaceMember.DeclaringTypeDefinition.FullName));
+//				} else {
+//					sb.Append (Format (implementedInterfaceMember.DeclaringTypeDefinition.Name));
+//				}
+//				sb.Append (settings.Markup ("."));
+//			}
+//		}
+//
+//		void AppendParameterList (StringBuilder result, OutputSettings settings, IEnumerable<IParameter> parameterList)
+//		{
+//			if (parameterList == null)
+//				return;
+//			
+//			bool first = true;
+//			foreach (var parameter in parameterList) {
+//				if (!first)
+//					result.Append (settings.Markup (", "));
+//				AppendParameter (settings, result, parameter);
+//				first = false;
+//			}
+//		}
+//		
+//		void AppendParameter (OutputSettings settings, StringBuilder result, IParameter parameter)
+//		{
+//			if (parameter == null)
+//				return;
+//			if (parameter.IsOut) {
+//				result.Append (settings.Markup ("out"));
+//				result.Append (settings.Markup (" "));
+//			} else if (parameter.IsRef) {
+//				result.Append (settings.Markup ("ref"));
+//				result.Append (settings.Markup (" "));
+//			} else if (parameter.IsParams) {
+//				result.Append (settings.Markup ("params"));
+//				result.Append (settings.Markup (" "));
+//			}
+//			result.Append (GetParameterString (null, parameter, settings));
+//		}
+//		
+//		void AppendModifiers (StringBuilder result, OutputSettings settings, IEntity entity)
+//		{
+//			if (!settings.IncludeModifiers)
+//				return;
+//			if (entity.IsStatic)
+//				result.Append (settings.EmitModifiers ("static"));
+//			if (entity.IsSealed)
+//				result.Append (settings.EmitModifiers ("sealed"));
+//			if (entity.IsAbstract)
+//				result.Append (settings.EmitModifiers ("abstract"));
+//			if (entity.IsShadowing)
+//				result.Append (settings.EmitModifiers ("new"));
+//			
+//			switch (entity.Accessibility) {
+//			case Accessibility.Internal:
+//				result.Append (settings.EmitModifiers ("internal"));
+//				break;
+//			case Accessibility.ProtectedAndInternal:
+//				result.Append (settings.EmitModifiers ("protected internal"));
+//				break;
+//			case Accessibility.ProtectedOrInternal:
+//				result.Append (settings.EmitModifiers ("internal protected"));
+//				break;
+//			case Accessibility.Protected:
+//				result.Append (settings.EmitModifiers ("protected"));
+//				break;
+//			case Accessibility.Private:
+//				result.Append (settings.EmitModifiers ("private"));
+//				break;
+//			case Accessibility.Public:
+//				result.Append (settings.EmitModifiers ("public"));
+//				break;
+//			}
+//		}
 	}
-		
+
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
index bccfa8df4d..e26077f81e 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
@@ -55,10 +55,10 @@ namespace MonoDevelop.CSharp
 			sb.AppendLine ();
 		}
 
-		public static BuildResult Compile (ProjectItemCollection projectItems, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, IProgressMonitor monitor)
+		public static BuildResult Compile (ProjectItemCollection projectItems, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, ProgressMonitor monitor)
 		{
 			var compilerParameters = (CSharpCompilerParameters)configuration.CompilationParameters ?? new CSharpCompilerParameters ();
-			var projectParameters = (CSharpProjectParameters)configuration.ProjectParameters ?? new CSharpProjectParameters ();
+			var projectParameters = (CSharpProject) configuration.ParentItem;
 			
 			FilePath outputName = configuration.CompiledOutputName;
 			string responseFileName = Path.GetTempFileName ();
@@ -127,7 +127,7 @@ namespace MonoDevelop.CSharp
 					var ownerProject = lib.OwnerProject;
 					if (ownerProject != null) {
 						var parentSolution = ownerProject.ParentSolution;
-						if (parentSolution != null && !(parentSolution.FindProjectByName (lib.Reference) is DotNetProject))
+						if (parentSolution != null && !(lib.ResolveProject (parentSolution) is DotNetProject))
 							continue;
 					}
 				} 
@@ -192,9 +192,9 @@ namespace MonoDevelop.CSharp
 					sb.AppendLine ("/delaySign");
 			}
 
-			var debugType = compilerParameters.DebugType;
+			var debugType = configuration.DebugType;
 			if (string.IsNullOrEmpty (debugType)) {
-				debugType = configuration.DebugMode ? "full" : "none";
+				debugType = configuration.DebugSymbols ? "full" : "none";
 			} else if (string.Equals (debugType, "pdbonly", StringComparison.OrdinalIgnoreCase)) {
 				//old Mono compilers don't support pdbonly
 				if (monoRuntime != null && !monoRuntime.HasMultitargetingMcs)
@@ -418,7 +418,7 @@ namespace MonoDevelop.CSharp
 			return result;
 		}
 		
-		static int DoCompilation (IProgressMonitor monitor, string compilerName, string compilerArgs, string working_dir, ExecutionEnvironment envVars, List<string> gacRoots, ref string output, ref string error)
+		static int DoCompilation (ProgressMonitor monitor, string compilerName, string compilerArgs, string working_dir, ExecutionEnvironment envVars, List<string> gacRoots, ref string output, ref string error)
 		{
 			output = Path.GetTempFileName ();
 			error = Path.GetTempFileName ();
@@ -448,9 +448,9 @@ namespace MonoDevelop.CSharp
 			pinfo.RedirectStandardOutput = true;
 			pinfo.RedirectStandardError = true;
 
-			MonoDevelop.Core.Execution.ProcessWrapper pw = Runtime.ProcessService.StartProcess (pinfo, outwr, errwr, null);
-			using (var mon = new AggregatedOperationMonitor (monitor, pw)) {
-				pw.WaitForOutput ();
+			ProcessWrapper pw = Runtime.ProcessService.StartProcess (pinfo, outwr, errwr, null);
+			using (monitor.CancellationToken.Register (pw.Cancel)) {
+				pw.Task.Wait ();
 			}
 			int exitCode = pw.ExitCode;
 			bool cancelRequested = pw.CancelRequested;

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBraceMatcher.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBraceMatcher.cs
new file mode 100644
index 0000000000..8c40777e35
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBraceMatcher.cs
@@ -0,0 +1,134 @@
+//
+// CSharpBraceMatcher.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CSharp.Formatting;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Core.Text;
+using MonoDevelop.CSharp.Completion;
+
+namespace MonoDevelop.CSharp
+{
+	sealed class CSharpBraceMatcher : AbstractBraceMatcher
+	{
+		readonly static AbstractBraceMatcher fallback = new DefaultBraceMatcher ();
+		readonly static SyntaxKind [] tokenPairs = {
+			SyntaxKind.OpenBraceToken, SyntaxKind.CloseBraceToken,
+			SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken,
+			SyntaxKind.LessThanToken, SyntaxKind.GreaterThanToken,
+			SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken
+		};
+
+		public override bool CanHandle (TextEditor editor)
+		{
+			return editor.MimeType == CSharpFormatter.MimeType;
+		}
+
+		public override async Task<BraceMatchingResult?> GetMatchingBracesAsync (IReadonlyTextDocument editor, DocumentContext context, int offset, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (context.ParsedDocument == null)
+				return await fallback.GetMatchingBracesAsync (editor, context, offset, cancellationToken);
+
+			var analysisDocument = context.AnalysisDocument;
+			if (analysisDocument == null)
+				return null;
+			var partialDoc = await CSharpCompletionTextEditorExtension.WithFrozenPartialSemanticsAsync (analysisDocument, cancellationToken).ConfigureAwait (false);
+			var root = await partialDoc.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+			if (offset < 0 || root.Span.End <= offset)
+				return null;
+			var token = root.FindToken (offset);
+			var tokenSpan = token.Span;
+			if (offset < tokenSpan.Start || offset >= tokenSpan.End)
+				return null;
+			for (int i = 0; i < tokenPairs.Length / 2; i++) {
+				var open = tokenPairs [i * 2];
+				var close = tokenPairs [i * 2 + 1];
+				SyntaxToken match;
+				if (token.IsKind (open)) {
+					if (TryFindMatchingToken (token, out match, open, close)) {
+						return new BraceMatchingResult (new TextSegment (tokenSpan.Start, tokenSpan.Length), new TextSegment (match.Span.Start, match.Span.Length), true);
+					}
+				} else if (token.IsKind (close)) {
+					if (TryFindMatchingToken (token, out match, open, close)) {
+						return new BraceMatchingResult (new TextSegment (match.Span.Start, match.Span.Length), new TextSegment (tokenSpan.Start, tokenSpan.Length), false);
+					}
+				}
+			}
+
+			if (token.IsKind (SyntaxKind.StringLiteralToken) && token.ToString().EndsWith ("\"", StringComparison.Ordinal)) {
+				if (token.IsVerbatimStringLiteral ()) {
+					if (offset <= tokenSpan.Start)
+						return new BraceMatchingResult (new TextSegment (tokenSpan.Start, 2), new TextSegment (tokenSpan.End - 1, 1), true);
+					if (offset >= tokenSpan.End - 1)
+						return new BraceMatchingResult (new TextSegment (tokenSpan.Start, 2), new TextSegment (tokenSpan.End - 1, 1), false);
+				} else {
+					if (offset <= tokenSpan.Start)
+						return new BraceMatchingResult (new TextSegment (tokenSpan.Start, 1), new TextSegment (tokenSpan.End - 1, 1), true);
+					if (offset >= tokenSpan.End - 1)
+						return new BraceMatchingResult (new TextSegment (tokenSpan.Start, 1), new TextSegment (tokenSpan.End - 1, 1), false);
+				}
+			}
+
+			if (token.IsKind (SyntaxKind.CharacterLiteralToken) && token.ToString().EndsWith ("\'", StringComparison.Ordinal)) {
+				if (offset <= tokenSpan.Start)
+					return new BraceMatchingResult (new TextSegment (tokenSpan.Start, 1), new TextSegment (tokenSpan.End - 1, 1), true);
+				if (offset >= tokenSpan.End - 1)
+					return new BraceMatchingResult (new TextSegment (tokenSpan.Start, 1), new TextSegment (tokenSpan.End - 1, 1), false);
+			}
+
+			return null;
+		}
+
+		bool TryFindMatchingToken (SyntaxToken token, out SyntaxToken match, SyntaxKind openKind, SyntaxKind closeKind)
+		{
+			var parent = token.Parent;
+
+			var braceTokens = parent
+				.ChildTokens ()
+				.Where (t => t.Span.Length > 0 && (t.IsKind (openKind) || t.IsKind (closeKind)))
+				.ToList ();
+
+			if (braceTokens.Count == 2 &&
+				braceTokens [0].IsKind (openKind) &&
+				braceTokens [1].IsKind (closeKind)) {
+				if (braceTokens [0] == token) {
+					match = braceTokens [1];
+					return true;
+				} else if (braceTokens [1] == token) {
+					match = braceTokens [0];
+					return true;
+				}
+			}
+
+			match = default(SyntaxToken);
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpLanguageBinding.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpLanguageBinding.cs
deleted file mode 100644
index 968bb4af36..0000000000
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpLanguageBinding.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-// 
-// CSharpBindingCompilerManager.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Diagnostics;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Resources;
-using System.Xml;
-using System.CodeDom.Compiler;
-using System.Threading;
-using Microsoft.CSharp;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Instrumentation;
-
-using MonoDevelop.CSharp.Parser;
-using ICSharpCode.NRefactory.CSharp;
-using MonoDevelop.CSharp.Formatting;
-using MonoDevelop.CSharp.Project;
-
-namespace MonoDevelop.CSharp
-{
-	class CSharpLanguageBinding : IDotNetLanguageBinding
-	{
-		CSharpCodeProvider provider;
-		
-		// Keep the platforms combo of CodeGenerationPanelWidget in sync with this list
-		public static IList<string> SupportedPlatforms = new string[] { "anycpu", "x86", "x64", "itanium" };
-	
-		public string Language {
-			get {
-				return "C#";
-			}
-		}
-		
-		public string ProjectStockIcon {
-			get { 
-				return "md-csharp-project";
-			}
-		}
-		
-		
-		public bool IsSourceCodeFile (FilePath fileName)
-		{
-			return StringComparer.OrdinalIgnoreCase.Equals (Path.GetExtension (fileName), ".cs");
-		}
-		
-		public BuildResult Compile (ProjectItemCollection projectItems, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, IProgressMonitor monitor)
-		{
-			return CSharpBindingCompilerManager.Compile (projectItems, configuration, configSelector, monitor);
-		}
-		
-		public ConfigurationParameters CreateCompilationParameters (XmlElement projectOptions)
-		{
-			CSharpCompilerParameters pars = new CSharpCompilerParameters ();
-			if (projectOptions != null) {
-				string platform = projectOptions.GetAttribute ("Platform");
-				if (SupportedPlatforms.Contains (platform))
-					pars.PlatformTarget = platform;
-				string debugAtt = projectOptions.GetAttribute ("DefineDebug");
-				if (string.Compare ("True", debugAtt, StringComparison.OrdinalIgnoreCase) == 0) {
-					pars.AddDefineSymbol ("DEBUG");
-					pars.DebugType = "full";
-				}
-				string releaseAtt = projectOptions.GetAttribute ("Release");
-				if (string.Compare ("True", releaseAtt, StringComparison.OrdinalIgnoreCase) == 0)
-					pars.Optimize = true;
-			}
-			return pars;
-		}
-	
-		public ProjectParameters CreateProjectParameters (XmlElement projectOptions)
-		{
-			return new CSharpProjectParameters ();
-		}
-		
-		public string SingleLineCommentTag { get { return "//"; } }
-		public string BlockCommentStartTag { get { return "/*"; } }
-		public string BlockCommentEndTag { get { return "*/"; } }
-		
-		public CodeDomProvider GetCodeDomProvider ()
-		{
-			if (provider == null)
-				provider = new CSharpEnhancedCodeProvider ();
-			return provider;
-		}
-		
-		public FilePath GetFileName (FilePath baseName)
-		{
-			return baseName + ".cs";
-		}
-		
-//		public IParser Parser {
-//			get { 
-//				return null; 
-//			}
-//		}
-//		
-//		CSharpRefactorer refactorer = new CSharpRefactorer ();
-//		public IRefactorer Refactorer {
-//			get { 
-//				return refactorer; 
-//			}
-//		}
-		
-		public ClrVersion[] GetSupportedClrVersions ()
-		{
-			return new ClrVersion[] { 
-				ClrVersion.Net_1_1, 
-				ClrVersion.Net_2_0, 
-				ClrVersion.Clr_2_1,
-				ClrVersion.Net_4_0,
-				ClrVersion.Net_4_5
-			};
-		}
-	}
-	
-	internal static class Counters
-	{
-		public static Counter ResolveTime = InstrumentationService.CreateCounter ("Resolve Time", "Timing");
-	}
-}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpNavigationTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpNavigationTextEditorExtension.cs
new file mode 100644
index 0000000000..901ac3677b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpNavigationTextEditorExtension.cs
@@ -0,0 +1,142 @@
+//
+// CSharpNavigationTextEditorExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor.Extension;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
+using MonoDevelop.Refactoring;
+
+namespace MonoDevelop.CSharp
+{
+	class CSharpNavigationTextEditorExtension : AbstractNavigationExtension
+	{
+		static List<NavigationSegment> emptyList = new List<NavigationSegment> ();
+
+		protected override async Task<IEnumerable<NavigationSegment>> RequestLinksAsync (int offset, int length, CancellationToken token)
+		{
+			var parsedDocument = DocumentContext.ParsedDocument;
+			if (parsedDocument == null)
+				return Enumerable.Empty<NavigationSegment> ();
+			var model = parsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
+				return Enumerable.Empty<NavigationSegment> ();
+			return await Task.Run (async delegate {
+				try {
+					var visitor = new NavigationVisitor (DocumentContext, model, new TextSpan (offset, length), token);
+					visitor.Visit (await model.SyntaxTree.GetRootAsync (token).ConfigureAwait (false));
+					return (IEnumerable<NavigationSegment>)visitor.result;
+				} catch (OperationCanceledException) {
+					return (IEnumerable<NavigationSegment>)emptyList;
+				}
+			});
+		}
+
+		class NavigationVisitor : CSharpSyntaxWalker
+		{
+			SemanticModel model;
+			internal List<NavigationSegment> result = new List<NavigationSegment> ();
+
+			TextSpan region;
+			DocumentContext documentContext;
+			CancellationToken token;
+
+			public NavigationVisitor (DocumentContext documentContext, SemanticModel model, TextSpan region, CancellationToken token)
+			{
+				this.documentContext = documentContext;
+				this.model = model;
+				this.region = region;
+				this.token = token;
+			}
+
+			public override void VisitCompilationUnit (CompilationUnitSyntax node)
+			{
+				var startNode = node.DescendantNodesAndSelf (n => region.Start <= n.SpanStart).FirstOrDefault ();
+				if (startNode == node || startNode == null) {
+					base.VisitCompilationUnit (node);
+				} else {
+					this.Visit (startNode);
+				}
+			}
+
+			public override void Visit (SyntaxNode node)
+			{
+				if (node.Span.End < region.Start)
+					return;
+				if (node.Span.Start > region.End)
+					return;
+				base.Visit(node);
+			}
+
+			public override void VisitIdentifierName (IdentifierNameSyntax node)
+			{
+				var info = model.GetSymbolInfo (node);
+				if (IsNavigatable (info)) {
+					result.Add (new NavigationSegment (node.Span.Start, node.Span.Length, delegate { 
+						GLib.Timeout.Add (50, delegate {
+							RefactoringService.RoslynJumpToDeclaration (info.Symbol, documentContext.Project);
+							return false;
+						});
+					}));
+				}
+			}
+
+			static bool IsNavigatable (SymbolInfo info)
+			{
+				return info.Symbol != null && info.Symbol.Kind != SymbolKind.Namespace;
+			}
+
+			public override void VisitMemberAccessExpression (MemberAccessExpressionSyntax node)
+			{
+				var info = model.GetSymbolInfo (node); 
+				if (IsNavigatable(info)) {
+					result.Add (new NavigationSegment (node.Name.Span.Start, node.Name.Span.Length, delegate {
+						GLib.Timeout.Add (50, delegate {
+							RefactoringService.RoslynJumpToDeclaration (info.Symbol, documentContext.Project);
+							return false;
+						});
+					})); 
+				}
+
+				base.VisitMemberAccessExpression (node);
+			}
+			 
+			public override void VisitBlock (BlockSyntax node)
+			{
+				token.ThrowIfCancellationRequested ();
+				base.VisitBlock (node);
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/DeclaredSymbolInfo.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/DeclaredSymbolInfo.cs
new file mode 100644
index 0000000000..49037adae3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/DeclaredSymbolInfo.cs
@@ -0,0 +1,560 @@
+//
+// DeclaredSymbolInfo.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Diagnostics;
+using System.Text;
+using System.Collections.Generic;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Core;
+using Gtk;
+using MonoDevelop.Ide;
+using MonoDevelop.CSharp;
+using MonoDevelop.Components.MainToolbar;
+using MonoDevelop.Refactoring;
+
+namespace MonoDevelop.CSharp
+{
+	static class DeclaredSymbolInfoHelpers
+	{
+		public static bool TryGetDeclaredSymbolInfo(this SyntaxNode node, out DeclaredSymbolInfo declaredSymbolInfo)
+		{
+			switch (node.Kind())
+			{
+				case SyntaxKind.ClassDeclaration:
+					       var classDecl = (ClassDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                        classDecl.Identifier.ValueText,
+					                                        // GetContainerDisplayName(node.Parent),
+					                                            GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.Class, classDecl.Identifier.Span);
+				return true;
+				case SyntaxKind.ConstructorDeclaration:
+					       var ctorDecl = (ConstructorDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(
+						node,
+						ctorDecl.Identifier.ValueText,
+						// GetContainerDisplayName(node.Parent),
+						GetFullyQualifiedContainerName(node.Parent),
+						DeclaredSymbolInfoKind.Constructor,
+						ctorDecl.Identifier.Span,
+						parameterCount: (ushort)(ctorDecl.ParameterList?.Parameters.Count ?? 0));
+				return true;
+				case SyntaxKind.DelegateDeclaration:
+					       var delegateDecl = (DelegateDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                        delegateDecl.Identifier.ValueText,
+					                                        // GetContainerDisplayName(node.Parent),
+					                                        GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.Delegate, delegateDecl.Identifier.Span);
+				return true;
+				case SyntaxKind.EnumDeclaration:
+					       var enumDecl = (EnumDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                        enumDecl.Identifier.ValueText,
+					                                        // GetContainerDisplayName(node.Parent),
+					                                        GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.Enum, enumDecl.Identifier.Span);
+				return true;
+				case SyntaxKind.EnumMemberDeclaration:
+					       var enumMember = (EnumMemberDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                        enumMember.Identifier.ValueText,
+					                                        // GetContainerDisplayName(node.Parent),
+					                                        GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.EnumMember, enumMember.Identifier.Span);
+				return true;
+				case SyntaxKind.EventDeclaration:
+					       var eventDecl = (EventDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                            ExpandExplicitInterfaceName(eventDecl.Identifier.ValueText, eventDecl.ExplicitInterfaceSpecifier),
+					                                        // GetContainerDisplayName(node.Parent),
+					                                        GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.Event, eventDecl.Identifier.Span);
+				return true;
+				case SyntaxKind.IndexerDeclaration:
+					       var indexerDecl = (IndexerDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                        WellKnownMemberNames.Indexer,
+					                                        // GetContainerDisplayName(node.Parent),
+					                                        GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.Indexer, indexerDecl.ThisKeyword.Span);
+				return true;
+				case SyntaxKind.InterfaceDeclaration:
+					       var interfaceDecl = (InterfaceDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                        interfaceDecl.Identifier.ValueText,
+					                                        // GetContainerDisplayName(node.Parent),
+					                                        GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.Interface, interfaceDecl.Identifier.Span);
+				return true;
+				case SyntaxKind.MethodDeclaration:
+					       var method = (MethodDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                        ExpandExplicitInterfaceName(method.Identifier.ValueText, method.ExplicitInterfaceSpecifier),
+					                                        // GetContainerDisplayName(node.Parent),
+					                                        GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.Method,
+					                                        method.Identifier.Span,
+					                                        parameterCount: (ushort)(method.ParameterList?.Parameters.Count ?? 0),
+					                                        typeParameterCount: (ushort)(method.TypeParameterList?.Parameters.Count ?? 0));
+				return true;
+				case SyntaxKind.PropertyDeclaration:
+					       var property = (PropertyDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                        ExpandExplicitInterfaceName(property.Identifier.ValueText, property.ExplicitInterfaceSpecifier),
+					                                        // GetContainerDisplayName(node.Parent),
+					                                        GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.Property, property.Identifier.Span);
+				return true;
+				case SyntaxKind.StructDeclaration:
+					       var structDecl = (StructDeclarationSyntax)node;
+					declaredSymbolInfo = new DeclaredSymbolInfo(node,
+					                                        structDecl.Identifier.ValueText,
+					                                        // GetContainerDisplayName(node.Parent),
+					                                        GetFullyQualifiedContainerName(node.Parent),
+					                                        DeclaredSymbolInfoKind.Struct, structDecl.Identifier.Span);
+				return true;
+				case SyntaxKind.VariableDeclarator:
+					       // could either be part of a field declaration or an event field declaration
+					       var variableDeclarator = (VariableDeclaratorSyntax)node;
+					var variableDeclaration = variableDeclarator.Parent as VariableDeclarationSyntax;
+					var fieldDeclaration = variableDeclaration?.Parent as BaseFieldDeclarationSyntax;
+					if (fieldDeclaration != null)
+					{
+						var kind = fieldDeclaration is EventFieldDeclarationSyntax
+							? DeclaredSymbolInfoKind.Event
+						                        : fieldDeclaration.Modifiers.Any(m => m.Kind() == SyntaxKind.ConstKeyword)
+						                        ? DeclaredSymbolInfoKind.Constant
+						                        : DeclaredSymbolInfoKind.Field;
+
+						declaredSymbolInfo = new DeclaredSymbolInfo(node,
+						                                        variableDeclarator.Identifier.ValueText,
+						                                        // GetContainerDisplayName(fieldDeclaration.Parent),
+						                                        GetFullyQualifiedContainerName(fieldDeclaration.Parent),
+						                                        kind, variableDeclarator.Identifier.Span);
+						return true;
+					}
+
+				break;
+			}
+
+			declaredSymbolInfo = default(DeclaredSymbolInfo);
+			return false;
+		}
+
+		private static string GetContainerDisplayName(SyntaxNode node)
+		{
+			return GetContainer(node, immediate: true);
+		}
+
+		private static string GetFullyQualifiedContainerName(SyntaxNode node)
+		{
+			return GetContainer(node, immediate: false);
+		}
+
+		private static string GetContainer(SyntaxNode node, bool immediate)
+		{
+			var name = GetNodeName(node, includeTypeParameters: immediate);
+			var names = new List<string> { name };
+
+			// check for nested classes and always add that to the container name.
+			var parent = node.Parent;
+			while (parent is TypeDeclarationSyntax)
+			{
+				var currentParent = (TypeDeclarationSyntax)parent;
+				names.Add(currentParent.Identifier.ValueText + (immediate ? ExpandTypeParameterList(currentParent.TypeParameterList) : ""));
+				parent = currentParent.Parent;
+			}
+
+			// If they're just asking for the immediate parent, then we're done. Otherwise keep 
+			// walking all the way to the root, adding the names.
+			if (!immediate)
+			{
+				while (parent != null && parent.Kind() != SyntaxKind.CompilationUnit)
+				{
+					names.Add(GetNodeName(parent, includeTypeParameters: false));
+					parent = parent.Parent;
+				}
+			}
+
+			names.Reverse();
+			return string.Join(".", names);
+		}
+
+		private static string GetNodeName(SyntaxNode node, bool includeTypeParameters)
+		{
+			string name;
+			TypeParameterListSyntax typeParameterList;
+			switch (node.Kind())
+			{
+				case SyntaxKind.ClassDeclaration:
+					       var classDecl = (ClassDeclarationSyntax)node;
+					name = classDecl.Identifier.ValueText;
+					typeParameterList = classDecl.TypeParameterList;
+				break;
+				case SyntaxKind.CompilationUnit:
+				return string.Empty;
+				case SyntaxKind.DelegateDeclaration:
+					       var delegateDecl = (DelegateDeclarationSyntax)node;
+					name = delegateDecl.Identifier.ValueText;
+					typeParameterList = delegateDecl.TypeParameterList;
+				break;
+				case SyntaxKind.EnumDeclaration:
+				return ((EnumDeclarationSyntax)node).Identifier.ValueText;
+				case SyntaxKind.IdentifierName:
+				return ((IdentifierNameSyntax)node).Identifier.ValueText;
+				case SyntaxKind.InterfaceDeclaration:
+					       var interfaceDecl = (InterfaceDeclarationSyntax)node;
+					name = interfaceDecl.Identifier.ValueText;
+					typeParameterList = interfaceDecl.TypeParameterList;
+				break;
+				case SyntaxKind.MethodDeclaration:
+					       var methodDecl = (MethodDeclarationSyntax)node;
+					name = methodDecl.Identifier.ValueText;
+					typeParameterList = methodDecl.TypeParameterList;
+				break;
+				case SyntaxKind.NamespaceDeclaration:
+				return GetNodeName(((NamespaceDeclarationSyntax)node).Name, includeTypeParameters: false);
+				case SyntaxKind.QualifiedName:
+					       var qualified = (QualifiedNameSyntax)node;
+				return GetNodeName(qualified.Left, includeTypeParameters: false) + "." + GetNodeName(qualified.Right, includeTypeParameters: false);
+				case SyntaxKind.StructDeclaration:
+					       var structDecl = (StructDeclarationSyntax)node;
+					name = structDecl.Identifier.ValueText;
+					typeParameterList = structDecl.TypeParameterList;
+				break;
+				default:
+					Debug.Assert(false, "Unexpected node type " + node.Kind());
+				return null;
+			}
+
+			return name + (includeTypeParameters ? ExpandTypeParameterList(typeParameterList) : "");
+		}
+
+		private static string ExpandTypeParameterList(TypeParameterListSyntax typeParameterList)
+		{
+			if (typeParameterList != null && typeParameterList.Parameters.Count > 0)
+			{
+				var builder = new StringBuilder();
+				builder.Append('<');
+				builder.Append(typeParameterList.Parameters[0].Identifier.ValueText);
+				for (int i = 1; i < typeParameterList.Parameters.Count; i++)
+				{
+					builder.Append(',');
+					builder.Append(typeParameterList.Parameters[i].Identifier.ValueText);
+				}
+
+				builder.Append('>');
+				return builder.ToString();
+			}
+			else
+			{
+				return null;
+			}
+		}
+
+		private static string ExpandExplicitInterfaceName(string identifier, ExplicitInterfaceSpecifierSyntax explicitInterfaceSpecifier)
+		{
+			if (explicitInterfaceSpecifier == null)
+			{
+				return identifier;
+			}
+			else
+			{
+				var builder = new StringBuilder();
+				ExpandTypeName(explicitInterfaceSpecifier.Name, builder);
+				builder.Append('.');
+				builder.Append(identifier);
+				return builder.ToString();
+			}
+		}
+
+		private static void ExpandTypeName(TypeSyntax type, StringBuilder builder)
+		{
+			switch (type.Kind())
+			{
+				case SyntaxKind.AliasQualifiedName:
+					       var alias = (AliasQualifiedNameSyntax)type;
+					builder.Append(alias.Alias.Identifier.ValueText);
+				break;
+				case SyntaxKind.ArrayType:
+					       var array = (ArrayTypeSyntax)type;
+					ExpandTypeName(array.ElementType, builder);
+					for (int i = 0; i < array.RankSpecifiers.Count; i++)
+					{
+						var rankSpecifier = array.RankSpecifiers[i];
+						builder.Append(rankSpecifier.OpenBracketToken.Text);
+						for (int j = 1; j < rankSpecifier.Sizes.Count; j++)
+						{
+							builder.Append(',');
+						}
+
+						builder.Append(rankSpecifier.CloseBracketToken.Text);
+					}
+
+				break;
+				case SyntaxKind.GenericName:
+					       var generic = (GenericNameSyntax)type;
+					builder.Append(generic.Identifier.ValueText);
+					if (generic.TypeArgumentList != null)
+					{
+						var arguments = generic.TypeArgumentList.Arguments;
+						builder.Append(generic.TypeArgumentList.LessThanToken.Text);
+						for (int i = 0; i < arguments.Count; i++)
+						{
+							if (i != 0)
+							{
+								builder.Append(',');
+							}
+
+							ExpandTypeName(arguments[i], builder);
+						}
+
+						builder.Append(generic.TypeArgumentList.GreaterThanToken.Text);
+					}
+
+				break;
+				case SyntaxKind.IdentifierName:
+					       var identifierName = (IdentifierNameSyntax)type;
+					builder.Append(identifierName.Identifier.ValueText);
+				break;
+				case SyntaxKind.NullableType:
+					       var nullable = (NullableTypeSyntax)type;
+					ExpandTypeName(nullable.ElementType, builder);
+					builder.Append(nullable.QuestionToken.Text);
+				break;
+				case SyntaxKind.OmittedTypeArgument:
+					       // do nothing since it was omitted, but don't reach the default block
+				break;
+				case SyntaxKind.PointerType:
+					       var pointer = (PointerTypeSyntax)type;
+					ExpandTypeName(pointer.ElementType, builder);
+					builder.Append(pointer.AsteriskToken.Text);
+				break;
+				case SyntaxKind.PredefinedType:
+					       var predefined = (PredefinedTypeSyntax)type;
+					builder.Append(predefined.Keyword.Text);
+				break;
+				case SyntaxKind.QualifiedName:
+					       var qualified = (QualifiedNameSyntax)type;
+					ExpandTypeName(qualified.Left, builder);
+					builder.Append(qualified.DotToken.Text);
+					ExpandTypeName(qualified.Right, builder);
+				break;
+				default:
+					Debug.Assert(false, "Unexpected type syntax " + type.Kind());
+				break;
+			}
+		}
+	}
+
+	enum DeclaredSymbolInfoKind : byte
+	{
+		Class,
+		Constant,
+		Constructor,
+		Delegate,
+		Enum,
+		EnumMember,
+		Event,
+		Field,
+		Indexer,
+		Interface,
+		Method,
+		Module,
+		Property,
+		Struct
+	}
+
+	struct DeclaredSymbolInfo
+	{
+		internal DocumentId DocumentId;
+
+		public string FilePath { get; }
+		public string Name { get; }
+//		public string ContainerDisplayName { get; }
+		public string FullyQualifiedContainerName { get; }
+		public DeclaredSymbolInfoKind Kind { get; }
+		public TextSpan Span { get; }
+		public ushort ParameterCount { get; }
+		public ushort TypeParameterCount { get; }
+
+
+		public DeclaredSymbolInfo(SyntaxNode node, string name, string fullyQualifiedContainerName, DeclaredSymbolInfoKind kind, TextSpan span, ushort parameterCount = 0, ushort typeParameterCount = 0)
+			: this()
+		{
+			this.FilePath = node.SyntaxTree.FilePath;
+			Name = string.Intern (name);
+//			ContainerDisplayName = string.Intern (containerDisplayName);
+			FullyQualifiedContainerName = fullyQualifiedContainerName;
+			Kind = kind;
+			Span = span;
+			ParameterCount = parameterCount;
+			TypeParameterCount = typeParameterCount;
+		}
+
+		public async Task<ISymbol> GetSymbolAsync(Document document, CancellationToken cancellationToken)
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var node = root.FindNode(Span);
+			var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			var symbol = semanticModel.GetDeclaredSymbol(node, cancellationToken);
+			return symbol;
+		}
+	}
+
+	class DeclaredSymbolInfoResult : SearchResult
+	{
+		bool useFullName;
+
+		DeclaredSymbolInfo type;
+
+		public override SearchResultType SearchResultType { get { return SearchResultType.Type; } }
+
+		public override string File {
+			get { return type.FilePath; }
+		}
+
+		public override Xwt.Drawing.Image Icon {
+			get {
+				return ImageService.GetIcon (type.GetStockIconForSymbolInfo(), IconSize.Menu);
+			}
+		}
+
+		public override int Offset {
+			get { return type.Span.Start; }
+		}
+
+		public override int Length {
+			get { return type.Span.Length; }
+		}
+
+		public override string PlainText {
+			get {
+				return type.Name;
+			}
+		}
+		Document GetDocument (CancellationToken token)
+		{
+			var doc = type.DocumentId;
+			if (doc == null) {
+				var docId = TypeSystemService.GetDocuments (type.FilePath).FirstOrDefault ();
+				if (docId == null)
+					return null;
+				return TypeSystemService.GetCodeAnalysisDocument (docId, token);
+			}
+			return TypeSystemService.GetCodeAnalysisDocument (type.DocumentId, token);
+		}
+
+		public override Task<TooltipInformation> GetTooltipInformation (CancellationToken token)
+		{
+			return Task.Run (async delegate {
+				var doc = GetDocument (token);
+				if (doc == null) {
+					return null;
+				}
+				var symbol = await type.GetSymbolAsync (doc, token);
+				return await Ambience.GetTooltip (token, symbol);
+			});
+		}
+
+		public override string Description {
+			get {
+				string loc;
+				//				if (type.TryGetSourceProject (out project)) {
+				//					loc = GettextCatalog.GetString ("project {0}", project.Name);
+				//				} else {
+				loc = GettextCatalog.GetString ("file {0}", File);
+				//				}
+
+				switch (type.Kind) {
+					case DeclaredSymbolInfoKind.Interface:
+					return GettextCatalog.GetString ("interface ({0})", loc);
+					case DeclaredSymbolInfoKind.Struct:
+					return GettextCatalog.GetString ("struct ({0})", loc);
+					case DeclaredSymbolInfoKind.Delegate:
+					return GettextCatalog.GetString ("delegate ({0})", loc);
+					case DeclaredSymbolInfoKind.Enum:
+					return GettextCatalog.GetString ("enumeration ({0})", loc);
+					case DeclaredSymbolInfoKind.Class:
+					return GettextCatalog.GetString ("class ({0})", loc);
+
+					case DeclaredSymbolInfoKind.Field:
+					return GettextCatalog.GetString ("field ({0})", loc);
+					case DeclaredSymbolInfoKind.Property:
+					return GettextCatalog.GetString ("property ({0})", loc);
+					case DeclaredSymbolInfoKind.Indexer:
+					return GettextCatalog.GetString ("indexer ({0})", loc);
+					case DeclaredSymbolInfoKind.Event:
+					return GettextCatalog.GetString ("event ({0})", loc);
+					case DeclaredSymbolInfoKind.Method:
+					return GettextCatalog.GetString ("method ({0})", loc);
+				}
+				return GettextCatalog.GetString ("symbol ({0})", loc);
+			}
+		}
+
+		public override string GetMarkupText (bool selected)
+		{
+			return HighlightMatch (useFullName ? type.FullyQualifiedContainerName : type.Name, match, selected);
+		}
+
+		public DeclaredSymbolInfoResult (string match, string matchedString, int rank, DeclaredSymbolInfo type, bool useFullName)  : base (match, matchedString, rank)
+		{
+			this.useFullName = useFullName;
+			this.type = type;
+		}
+
+		public override bool CanActivate {
+			get {
+				var doc = GetDocument (default (CancellationToken));
+				return doc != null;
+			}
+		}
+
+		public override async void Activate ()
+		{
+			var token = default (CancellationToken);
+			var doc = GetDocument (token);
+			if (doc != null) {
+				var symbol = await type.GetSymbolAsync (doc, token);
+				var project = TypeSystemService.GetMonoProject (doc.Id);
+				await RefactoringService.RoslynJumpToDeclaration (symbol, project);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ExpandSelectionHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ExpandSelectionHandler.cs
index a09c5ecf26..95595339d0 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ExpandSelectionHandler.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ExpandSelectionHandler.cs
@@ -24,10 +24,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.CSharp
 {
@@ -39,68 +39,99 @@ namespace MonoDevelop.CSharp
 	
 	class ExpandSelectionHandler : CommandHandler
 	{
+		internal class ExpandSelectionAnnotation
+		{
+			readonly MonoDevelop.Ide.Editor.TextEditor editor;
+
+			public Stack<SyntaxNode> Stack = new Stack<SyntaxNode> ();
+
+			public ExpandSelectionAnnotation (MonoDevelop.Ide.Editor.TextEditor editor)
+			{
+				this.editor = editor;
+				editor.CaretPositionChanged += Editor_CaretPositionChanged;
+			}
+
+			void Editor_CaretPositionChanged (object sender, EventArgs e)
+			{
+				editor.CaretPositionChanged -= Editor_CaretPositionChanged;
+				Stack = null;
+				editor.RemoveAnnotations<ExpandSelectionAnnotation> ();
+			}
+		}
+
+		internal static ExpandSelectionAnnotation GetSelectionAnnotation (MonoDevelop.Ide.Editor.TextEditor editor)
+		{
+			var result = editor.Annotation<ExpandSelectionAnnotation> ();
+			if (result == null) {
+				result = new ExpandSelectionAnnotation (editor);
+				editor.AddAnnotation (result);
+			}
+			return result;
+		}
+
 		protected override void Run ()
 		{
 			var doc = IdeApp.Workbench.ActiveDocument;
 			if (doc == null)
 				return;
+			var selectionRange = doc.Editor.SelectionRange;
 			var parsedDocument = doc.ParsedDocument;
 			if (parsedDocument == null)
 				return;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
+			var model = parsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
 				return;
-			var node = unit.GetNodeAt (doc.Editor.Caret.Location);
+			var unit = model.SyntaxTree.GetRoot ();
+			var node = unit.FindNode (Microsoft.CodeAnalysis.Text.TextSpan.FromBounds (selectionRange.Offset, selectionRange.EndOffset));
 			if (node == null)
 				return;
 			
 			if (doc.Editor.IsSomethingSelected) {
-				while (node != null && doc.Editor.MainSelection.IsSelected (node.StartLocation, node.EndLocation)) {
+				while (node != null && ShrinkSelectionHandler.IsSelected (doc.Editor, node.Span)) {
 					node = node.Parent;
 				}
 			}
-			
-			if (node != null)
-				doc.Editor.SetSelection (node.StartLocation, node.EndLocation);
+
+			if (node != null) {
+				var selectionAnnotation = GetSelectionAnnotation (doc.Editor);
+				selectionAnnotation.Stack.Push (node);
+				doc.Editor.SetSelection (node.SpanStart, node.Span.End);
+			}
 		}
 	}
 	
 	class ShrinkSelectionHandler : CommandHandler
 	{
-		protected override void Run ()
+		internal static bool IsSelected (MonoDevelop.Ide.Editor.TextEditor editor, Microsoft.CodeAnalysis.Text.TextSpan span)
+		{
+			var selection = editor.SelectionRange;
+			return selection.Offset == span.Start && selection.Length == span.Length;
+		}
+
+		protected async override void Run ()
 		{
 			var doc = IdeApp.Workbench.ActiveDocument;
-			var parsedDocument = doc.ParsedDocument;
+			if (doc == null)
+				return;
+			var selectionRange = doc.Editor.CaretOffset;
+			var analysisDocument = doc.AnalysisDocument;
+			if (analysisDocument == null)
+				return;
+			var parsedDocument = await analysisDocument.GetSyntaxTreeAsync ();
 			if (parsedDocument == null)
 				return;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
+			var unit = parsedDocument.GetRoot ();
 			if (unit == null)
 				return;
-			var node = unit.GetNodeAt (doc.Editor.Caret.Line, doc.Editor.Caret.Column);
-			if (node == null)
-				return;
-			var nodeStack = new Stack<AstNode> ();
-			nodeStack.Push (node);
-			if (doc.Editor.IsSomethingSelected) {
-				while (node != null && doc.Editor.MainSelection.IsSelected (node.StartLocation, node.EndLocation)) {
-					node = node.Parent;
-					if (node != null) {
-						if (nodeStack.Count > 0 && nodeStack.Peek ().StartLocation == node.StartLocation && nodeStack.Peek ().EndLocation == node.EndLocation)
-							nodeStack.Pop ();
-						nodeStack.Push (node);
-					}
-				}
-			}
-			
-			if (nodeStack.Count > 2) {
-				nodeStack.Pop (); // parent
-				nodeStack.Pop (); // current node
-				node = nodeStack.Pop (); // next children in which the caret is
-				doc.Editor.SetSelection (node.StartLocation, node.EndLocation);
+
+			var selectionAnnotation = ExpandSelectionHandler.GetSelectionAnnotation (doc.Editor);
+			selectionAnnotation.Stack.Pop ();
+			if (selectionAnnotation.Stack.Count > 0) {
+				var node = selectionAnnotation.Stack.Peek ();
+				doc.Editor.SetSelection (node.SpanStart, node.Span.End);
 			} else {
 				doc.Editor.ClearSelection ();
 			}
 		}
 	}
-}
-
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
index 02065b26d9..054888ca87 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
@@ -27,39 +27,87 @@ using System;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Components;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Ide.Gui;
 using MonoDevelop.Core;
 using MonoDevelop.CSharp.Completion;
 using System.Linq;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp;
 using System.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 using MonoDevelop.Projects;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using System.Threading.Tasks;
+using System.Threading;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.CSharp
 {
 	class PathedDocumentTextEditorExtension : TextEditorExtension, IPathedDocument
 	{
+		static PathedDocumentTextEditorExtension ()
+		{
+			MonoDevelopWorkspace.GetInsertionPoints = async delegate (TextEditor editor, int offset) {
+				var doc = IdeApp.Workbench.ActiveDocument;
+				if (doc == null || doc.AnalysisDocument == null)
+					return new List<InsertionPoint> ();
+				var semanticModel = await doc.AnalysisDocument.GetSemanticModelAsync ();
+				var declaringType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol> (offset, default(CancellationToken));
+				if (declaringType == null)
+					return new List<InsertionPoint> ();
+				return MonoDevelop.Refactoring.InsertionPointService.GetInsertionPoints (
+					editor,
+					semanticModel,
+					declaringType,
+					offset
+				);
+			};
+			MonoDevelopWorkspace.StartRenameSession = async (TextEditor editor, DocumentContext ctx, Core.Text.ITextSourceVersion version, SyntaxToken? token) => {
+				var latestDocument = ctx.AnalysisDocument;
+				var cancellationToken = default (CancellationToken);
+				var latestModel = await latestDocument.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+				var latestRoot = await latestDocument.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+				await Runtime.RunInMainThread (async delegate {
+					try {
+						var node = latestRoot.FindNode (token.Value.Parent.Span, false, false);
+						if (node == null)
+							return;
+						var info = latestModel.GetSymbolInfo (node);
+						var sym = info.Symbol ?? latestModel.GetDeclaredSymbol (node);
+						if (sym != null)
+							await new MonoDevelop.Refactoring.Rename.RenameRefactoring ().Rename (sym);
+					} catch (Exception ex) {
+						LoggingService.LogError ("Error while renaming " + token.Value.Parent, ex);
+					}
+				});
+			};
+		}
+
 		public override void Dispose ()
 		{
+			CancelDocumentParsedUpdate ();
+			CancelUpdatePathTimeout ();
+			CancelUpdatePath ();
+			Editor.TextChanging -= Editor_TextChanging;
+			DocumentContext.DocumentParsed -= DocumentContext_DocumentParsed; 
+			Editor.CaretPositionChanged -= Editor_CaretPositionChanged;
 			UntrackStartupProjectChanges ();
 
 			IdeApp.Workspace.FileAddedToProject -= HandleProjectChanged;
 			IdeApp.Workspace.FileRemovedFromProject -= HandleProjectChanged;
 			IdeApp.Workspace.WorkspaceItemUnloaded -= HandleWorkspaceItemUnloaded;
 			IdeApp.Workspace.WorkspaceItemLoaded -= HandleWorkspaceItemLoaded;
+			IdeApp.Workspace.ItemAddedToSolution -= HandleProjectChanged;
 			IdeApp.Workspace.ActiveConfigurationChanged -= HandleActiveConfigurationChanged;
 
-			if (caret != null) {
-				caret.PositionChanged -= UpdatePath;
-				caret = null;
-			}
 			if (ext != null) {
 				ext.TypeSegmentTreeUpdated -= HandleTypeSegmentTreeUpdated;
 				ext = null;
 			}
+
 			currentPath = null;
 			lastType = null;
 			lastMember = null;
@@ -67,39 +115,98 @@ namespace MonoDevelop.CSharp
 		}
 
 		bool isPathSet;
-		Mono.TextEditor.Caret caret;
 		CSharpCompletionTextEditorExtension ext;
 
 		List<DotNetProject> ownerProjects = new List<DotNetProject> ();
 
-		public override void Initialize ()
+		public override bool IsValidInContext (DocumentContext context)
+		{
+			return context.GetContent<CSharpCompletionTextEditorExtension> () != null;
+		}
+
+		protected override void Initialize ()
 		{
 			CurrentPath = new PathEntry[] { new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = null } };
 			isPathSet = false;
-			// Delay the execution of UpdateOwnerProjects since it may end calling Document.AttachToProject,
+			// Delay the execution of UpdateOwnerProjects since it may end calling DocumentContext.AttachToProject,
 			// which shouldn't be called while the extension chain is being initialized.
 			Gtk.Application.Invoke (delegate {
 				UpdateOwnerProjects ();
-				UpdatePath (null, null);
+				Editor_CaretPositionChanged (null, null);
 			});
-			caret = Document.Editor.Caret;
-			caret.PositionChanged += UpdatePath;
-			ext = Document.GetContent<CSharpCompletionTextEditorExtension> ();
+
+			Editor.TextChanging += Editor_TextChanging;
+			DocumentContext.DocumentParsed += DocumentContext_DocumentParsed; 
+			ext = DocumentContext.GetContent<CSharpCompletionTextEditorExtension> ();
 			ext.TypeSegmentTreeUpdated += HandleTypeSegmentTreeUpdated;
+
 			IdeApp.Workspace.FileAddedToProject += HandleProjectChanged;
 			IdeApp.Workspace.FileRemovedFromProject += HandleProjectChanged;
 			IdeApp.Workspace.WorkspaceItemUnloaded += HandleWorkspaceItemUnloaded;
 			IdeApp.Workspace.WorkspaceItemLoaded += HandleWorkspaceItemLoaded;
+			IdeApp.Workspace.ItemAddedToSolution += HandleProjectChanged;
 			IdeApp.Workspace.ActiveConfigurationChanged += HandleActiveConfigurationChanged;
+			SubscribeCaretPositionChange ();
+		}
+
+		void CancelUpdatePathTimeout ()
+		{
+			if (updatePathTimeoutId == 0)
+				return;
+			GLib.Source.Remove (updatePathTimeoutId);
+			updatePathTimeoutId = 0;
+		}
+
+		CancellationTokenSource documentParsedCancellationTokenSource = new CancellationTokenSource ();
+
+		void DocumentContext_DocumentParsed (object sender, EventArgs e)
+		{
+			SubscribeCaretPositionChange ();
+
+			// Fixes a potential memory leak see: https://bugzilla.xamarin.com/show_bug.cgi?id=38041
+			if (ownerProjects.Count > 1) {
+				var currentOwners = ownerProjects.Where (p => p != DocumentContext.Project).Select (p => TypeSystemService.GetCodeAnalysisProject (p)).ToList ();
+				CancelDocumentParsedUpdate ();
+				var token = documentParsedCancellationTokenSource.Token;
+				Task.Run (async delegate {
+					foreach (var otherProject in currentOwners) {
+						if (otherProject == null)
+							continue;
+						await otherProject.GetCompilationAsync (token).ConfigureAwait (false);
+					}
+				});
+			}
+		}
+
+		void CancelDocumentParsedUpdate ()
+		{
+			documentParsedCancellationTokenSource.Cancel ();
+			documentParsedCancellationTokenSource = new CancellationTokenSource ();
+		}
+
+		void SubscribeCaretPositionChange ()
+		{
+			if (caretPositionChangedSubscribed)
+				return;
+			caretPositionChangedSubscribed = true;
+			Editor.CaretPositionChanged += Editor_CaretPositionChanged;
+		}
+
+		void Editor_TextChanging (object sender, EventArgs e)
+		{
+			if (!caretPositionChangedSubscribed)
+				return;
+			caretPositionChangedSubscribed = false;
+			Editor.CaretPositionChanged -= Editor_CaretPositionChanged;
 		}
 
 		void HandleActiveConfigurationChanged (object sender, EventArgs e)
 		{
 			// If the current configuration changes and the project to which this document is bound is disabled in the
 			// new configuration, try to find another project
-			if (Document.Project != null && Document.Project.ParentSolution == IdeApp.ProjectOperations.CurrentSelectedSolution) {
-				var conf = Document.Project.ParentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
-				if (conf != null && !conf.BuildEnabledForItem (Document.Project))
+			if (DocumentContext.Project != null && DocumentContext.Project.ParentSolution == IdeApp.ProjectOperations.CurrentSelectedSolution) {
+				var conf = DocumentContext.Project.ParentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
+				if (conf != null && !conf.BuildEnabledForItem (DocumentContext.Project))
 					ResetOwnerProject ();
 			}
 		}
@@ -108,63 +215,73 @@ namespace MonoDevelop.CSharp
 		{
 			if (ownerProjects != null)
 				return;
-			UpdateOwnerProjects (e.Item.GetAllProjects ().OfType<DotNetProject> ());
+			UpdateOwnerProjects (e.Item.GetAllItems<DotNetProject> ());
 		}
 
 		void HandleWorkspaceItemUnloaded (object sender, WorkspaceItemEventArgs e)
 		{
 			if (ownerProjects == null)
 				return;
-			foreach (var p in e.Item.GetAllProjects ().OfType<DotNetProject> ()) {
+			foreach (var p in e.Item.GetAllItems<DotNetProject> ()) {
 				RemoveOwnerProject (p);
 			}
 			if (ownerProjects.Count == 0) {
 				ownerProjects = null;
-				Document.AttachToProject (null);
+				DocumentContext.AttachToProject (null);
 			}
 		}
 
-		void HandleProjectChanged (object sender, ProjectFileEventArgs e)
+		void HandleProjectChanged (object sender, EventArgs e)
 		{
 			UpdateOwnerProjects ();
-			UpdatePath (null, null);
+			Editor_CaretPositionChanged (null, null);
 		}
 
 		void HandleTypeSegmentTreeUpdated (object sender, EventArgs e)
 		{
-			UpdatePath (null, null);
+			Runtime.RunInMainThread (() => {
+				CancelUpdatePathTimeout ();
+				updatePathTimeoutId = GLib.Timeout.Add (updatePathTimeout, delegate {
+					Update ();
+					updatePathTimeoutId = 0;
+					return false;
+				});
+			});
 		}
 
 		void UpdateOwnerProjects (IEnumerable<DotNetProject> allProjects)
 		{
-			var projects = new HashSet<DotNetProject> (allProjects.Where (p => p.IsFileInProject (Document.FileName)));
+			if (DocumentContext == null) {
+				return;//This can happen if this object is disposed
+			}
+			var projects = new HashSet<DotNetProject> (allProjects.Where (p => p.IsFileInProject (DocumentContext.Name)));
 			if (ownerProjects == null || !projects.SetEquals (ownerProjects)) {
 				SetOwnerProjects (projects.OrderBy (p => p.Name).ToList ());
-				var dnp = Document.Project as DotNetProject;
+				var dnp = DocumentContext.Project as DotNetProject;
 				if (ownerProjects.Count > 0 && (dnp == null || !ownerProjects.Contains (dnp))) {
 					// If the project for the document is not a DotNetProject but there is a project containing this file
 					// in the current solution, then use that project
-					var pp = Document.Project != null ? FindBestDefaultProject (Document.Project.ParentSolution) : null;
+					var pp = DocumentContext.Project != null ? FindBestDefaultProject (DocumentContext.Project.ParentSolution) : null;
 					if (pp != null)
-						Document.AttachToProject (pp);
+						DocumentContext.AttachToProject (pp);
 				}
 			}
 		}
 
 		void UpdateOwnerProjects ()
 		{
-			UpdateOwnerProjects (IdeApp.Workspace.GetAllSolutionItems<DotNetProject> ());
-			if (Document.Project == null)
+			UpdateOwnerProjects (IdeApp.Workspace.GetAllItems<DotNetProject> ());
+			if (DocumentContext != null && DocumentContext.Project == null)
 				ResetOwnerProject ();
 		}
 
 		void ResetOwnerProject ()
 		{
 			if (ownerProjects.Count > 0)
-				Document.AttachToProject (FindBestDefaultProject ());
+				DocumentContext.AttachToProject (FindBestDefaultProject ());
 		}
 
-		DotNetProject FindBestDefaultProject (Solution solution = null)
+		DotNetProject FindBestDefaultProject (Projects.Solution solution = null)
 		{
 			// The best candidate to be selected as default project for this document is the startup project.
 			// If the startup project is not an owner, pick any project that is not disabled in the current configuration.
@@ -210,8 +327,10 @@ namespace MonoDevelop.CSharp
 		void UntrackStartupProjectChanges ()
 		{
 			if (ownerProjects != null) {
-				foreach (var sol in ownerProjects.Select (p => p.ParentSolution).Distinct ())
-					sol.StartupItemChanged -= HandleStartupProjectChanged;
+				foreach (var sol in ownerProjects.Select (p => p.ParentSolution).Distinct ()) {
+					if (sol != null)
+						sol.StartupItemChanged -= HandleStartupProjectChanged;
+				}
 			}
 		}
 
@@ -220,16 +339,15 @@ namespace MonoDevelop.CSharp
 			// If the startup project changes, and the new startup project is an owner of this document,
 			// then attach the document to that project
 
-			var sol = (Solution) sender;
+			var sol = (Projects.Solution) sender;
 			var p = sol.StartupItem as DotNetProject;
 			if (p != null && ownerProjects.Contains (p))
-				Document.AttachToProject (p);
+				DocumentContext.AttachToProject (p);
 		}
 
 		#region IPathedDocument implementation
 
 		public event EventHandler<DocumentPathChangedEventArgs> PathChanged;
-
 		protected virtual void OnPathChanged (DocumentPathChangedEventArgs e)
 		{
 			EventHandler<DocumentPathChangedEventArgs> handler = this.PathChanged;
@@ -241,7 +359,7 @@ namespace MonoDevelop.CSharp
 		{
 			readonly PathedDocumentTextEditorExtension ext;
 			object tag;
-			List<AstNode> memberList = new List<AstNode> ();
+			List<SyntaxNode> memberList = new List<SyntaxNode> ();
 
 			public DataProvider (PathedDocumentTextEditorExtension ext, object tag)
 			{
@@ -254,17 +372,22 @@ namespace MonoDevelop.CSharp
 
 			#region IListDataProvider implementation
 
-			void AddTypeToMemberList (TypeDeclaration type)
+			void AddTypeToMemberList (BaseTypeDeclarationSyntax btype)
 			{
+				var e = btype as EnumDeclarationSyntax;
+				if (e !=null){
+					foreach (var member in e.Members) {
+						memberList.Add (member);
+					}
+					return;
+				}
+				var type = btype as TypeDeclarationSyntax;
 				foreach (var member in type.Members) {
-					if (member is FieldDeclaration) {
-						foreach (var variable in ((FieldDeclaration)member).Variables)
-							memberList.Add (variable);
-					} else if (member is FixedFieldDeclaration) {
-						foreach (var variable in ((FixedFieldDeclaration)member).Variables)
+					if (member is FieldDeclarationSyntax) {
+						foreach (var variable in ((FieldDeclarationSyntax)member).Declaration.Variables)
 							memberList.Add (variable);
-					} else if (member is EventDeclaration) {
-						foreach (var variable in ((EventDeclaration)member).Variables)
+					} else if (member is EventFieldDeclarationSyntax) {
+						foreach (var variable in ((EventFieldDeclarationSyntax)member).Declaration.Variables)
 							memberList.Add (variable);
 					} else {
 						memberList.Add (member);
@@ -277,21 +400,20 @@ namespace MonoDevelop.CSharp
 				memberList.Clear ();
 				if (tag is SyntaxTree) {
 					var unit = tag as SyntaxTree;
-					memberList.AddRange (unit.GetTypes (true));
-				} else if (tag is TypeDeclaration) {
-					AddTypeToMemberList ((TypeDeclaration)tag);
-				} else if (tag is Accessor) {
-					var acc = (Accessor)tag;
-					var parent = (EntityDeclaration)acc.Parent;
-					memberList.AddRange (parent.Children.OfType<Accessor> ());
-				} else if (tag is EntityDeclaration) {
-					var entity = (EntityDeclaration)tag;
-					var type = entity.Parent as TypeDeclaration;
+					memberList.AddRange (unit.GetRoot ().DescendantNodes ().Where (IsType));
+				} else if (tag is BaseTypeDeclarationSyntax) {
+					AddTypeToMemberList ((BaseTypeDeclarationSyntax)tag);
+				} else if (tag is AccessorDeclarationSyntax) {
+					var acc = (AccessorDeclarationSyntax)tag;
+					var parent = (MemberDeclarationSyntax)acc.Parent;
+					memberList.AddRange (parent.ChildNodes ().OfType<AccessorDeclarationSyntax> ());
+				} else if (tag is MemberDeclarationSyntax) {
+					var entity = (MemberDeclarationSyntax)tag;
+					var type = entity.Parent as BaseTypeDeclarationSyntax;
 					if (type != null) {
 						AddTypeToMemberList (type);
 					}
 				}
-
 				memberList.Sort ((x, y) => {
 					var result = String.Compare (GetName (x), GetName (y), StringComparison.OrdinalIgnoreCase);
 					if (result == 0)
@@ -300,74 +422,84 @@ namespace MonoDevelop.CSharp
 						result = GetParameters (x).CompareTo (GetParameters (y));
 
 					// partial methods without body should come last
-					if (result == 0 && x is MethodDeclaration && y is MethodDeclaration) {
-						var mx = x as MethodDeclaration;
-						var my = y as MethodDeclaration;
-						if (mx.Body.IsNull && !my.Body.IsNull)
+					if (result == 0 && x is MethodDeclarationSyntax && y is MethodDeclarationSyntax) {
+						var mx = x as MethodDeclarationSyntax;
+						var my = y as MethodDeclarationSyntax;
+						if (mx.Body == null && my.Body != null)
 							return 1;
-						if (!mx.Body.IsNull && my.Body.IsNull)
+						if (mx.Body != null && my.Body == null)
 							return -1;
 					}
 					return result;
 				});
 			}
 
-			static int GetTypeParameters (AstNode x)
+			static int GetTypeParameters (SyntaxNode x)
 			{
-				return x.GetChildrenByRole (Roles.TypeParameter).Count ();
+				return 0; //x.GetChildrenByRole (Roles.TypeParameter).Count ();
 			}
 
-			static int GetParameters (AstNode x)
+			static int GetParameters (SyntaxNode x)
 			{
-				return x.GetChildrenByRole (Roles.Parameter).Count ();
+				return 0; // x.GetChildrenByRole (Roles.Parameter).Count ();
 			}
 
-			string GetName (AstNode node)
+			string GetName (SyntaxNode node)
 			{
 				if (tag is SyntaxTree) {
-					var type = node as TypeDeclaration;
+					var type = node as TypeDeclarationSyntax;
 					if (type != null) {
 						var sb = new StringBuilder ();
-						sb.Append (type.Name);
-						while (type.Parent is TypeDeclaration) {
-							type = type.Parent as TypeDeclaration;
-							sb.Insert (0, type.Name + ".");
+						sb.Append (type.Identifier.ToString ());
+						while (type.Parent is TypeDeclarationSyntax) {
+							type = type.Parent as TypeDeclarationSyntax;
+							sb.Insert (0, type.Identifier + ".");
 						}
 						return sb.ToString ();
 					}
-					var delegateDecl = node as DelegateDeclaration;
+					var delegateDecl = node as DelegateDeclarationSyntax;
 					if (delegateDecl != null) {
 						var sb = new StringBuilder ();
-						sb.Append (delegateDecl.Name);
-						var parentType = delegateDecl.Parent as TypeDeclaration;
+						sb.Append (delegateDecl.Identifier.ToString ());
+						var parentType = delegateDecl.Parent as TypeDeclarationSyntax;
 						while (parentType != null) {
-							sb.Insert (0, parentType.Name + ".");
-							parentType = parentType.Parent as TypeDeclaration;
+							sb.Insert (0, parentType.Identifier + ".");
+							parentType = parentType.Parent as TypeDeclarationSyntax;
 						}
 						return sb.ToString ();
 					}
 				}
-				
-				if (node is Accessor) {
-					if (node.Role == PropertyDeclaration.GetterRole)
+				var accessor = node as AccessorDeclarationSyntax;
+				if (accessor != null) {
+					if (accessor.Kind () == SyntaxKind.GetAccessorDeclaration)
 						return "get";
-					if (node.Role == PropertyDeclaration.SetterRole)
+					if (accessor.Kind () == SyntaxKind.SetAccessorDeclaration)
 						return "set";
-					if (node.Role == CustomEventDeclaration.AddAccessorRole)
+					if (accessor.Kind () == SyntaxKind.AddAccessorDeclaration)
 						return "add";
-					if (node.Role == CustomEventDeclaration.RemoveAccessorRole)
+					if (accessor.Kind () == SyntaxKind.RemoveAccessorDeclaration)
 						return "remove";
 					return node.ToString ();
 				}
-				if (node is OperatorDeclaration)
+				if (node is OperatorDeclarationSyntax)
 					return "operator";
-
-				if (node is EntityDeclaration)
-					return ((EntityDeclaration)node).Name;
-				if (node is FixedVariableInitializer) {
-					return ((FixedVariableInitializer)node).Name;
-				}
-				return ((VariableInitializer)node).Name;
+				if (node is PropertyDeclarationSyntax)
+					return ((PropertyDeclarationSyntax)node).Identifier.ToString ();
+				if (node is MethodDeclarationSyntax)
+					return ((MethodDeclarationSyntax)node).Identifier.ToString ();
+				if (node is ConstructorDeclarationSyntax)
+					return ((ConstructorDeclarationSyntax)node).Identifier.ToString ();
+				if (node is DestructorDeclarationSyntax)
+					return ((DestructorDeclarationSyntax)node).Identifier.ToString ();
+				if (node is BaseTypeDeclarationSyntax)
+					return ((BaseTypeDeclarationSyntax)node).Identifier.ToString ();
+
+//				if (node is fixeds) {
+//					return ((FixedVariableInitializer)node).Name;
+//				}
+				if (node is VariableDeclaratorSyntax)
+					return ((VariableDeclaratorSyntax)node).Identifier.ToString ();
+				return node.ToString ();
 			}
 
 			public string GetMarkup (int n)
@@ -382,7 +514,7 @@ namespace MonoDevelop.CSharp
 					if (type != null) {
 						var sb = new StringBuilder ();
 						sb.Append (ext.GetEntityMarkup (type));
-						while (type.Parent is TypeDeclaration) {
+						while (type.Parent is BaseTypeDeclarationSyntax) {
 							sb.Insert (0, ext.GetEntityMarkup (type.Parent) + ".");
 							type = type.Parent;
 						}
@@ -399,10 +531,12 @@ namespace MonoDevelop.CSharp
 					icon = ext.ownerProjects [n].StockIcon;
 				} else {
 					var node = memberList [n];
-					if (node is EntityDeclaration) {
-						icon = ((EntityDeclaration)node).GetStockIcon ();
+					if (node is MemberDeclarationSyntax) {
+						icon = ((MemberDeclarationSyntax)node).GetStockIcon ();
+					} else if (node is VariableDeclaratorSyntax) {
+						icon = node.Parent.Parent.GetStockIcon ();
 					} else {
-						icon = ((EntityDeclaration)node.Parent).GetStockIcon ();
+						icon = node.Parent.GetStockIcon ();
 					}
 				}
 				return ImageService.GetIcon (icon, Gtk.IconSize.Menu);
@@ -419,26 +553,20 @@ namespace MonoDevelop.CSharp
 			public void ActivateItem (int n)
 			{
 				if (tag is DotNetProject) {
-					ext.Document.AttachToProject (ext.ownerProjects [n]);
+					ext.DocumentContext.AttachToProject (ext.ownerProjects [n]);
 				} else {
 					var node = memberList [n];
-					var extEditor = ext.Document.GetContent<IExtensibleTextEditor> ();
+					var extEditor = ext.DocumentContext.GetContent<TextEditor> ();
 					if (extEditor != null) {
-						int line, col;
-						if (node is OperatorDeclaration) { 
-							line = Math.Max (1, ((OperatorDeclaration)node).OperatorToken.StartLocation.Line);
-							col = Math.Max (1, ((OperatorDeclaration)node).OperatorToken.StartLocation.Column);
-						} else if (node is IndexerDeclaration) { 
-							line = Math.Max (1, ((IndexerDeclaration)node).ThisToken.StartLocation.Line);
-							col = Math.Max (1, ((IndexerDeclaration)node).ThisToken.StartLocation.Column);
-						} else if (node is EntityDeclaration && !(node is Accessor)) {
-							line = Math.Max (1, ((EntityDeclaration)node).NameToken.StartLocation.Line);
-							col = Math.Max (1, ((EntityDeclaration)node).NameToken.StartLocation.Column);
+						int offset;
+						if (node is OperatorDeclarationSyntax) { 
+							offset = Math.Max (1, ((OperatorDeclarationSyntax)node).OperatorToken.SpanStart);
+						} else if (node is MemberDeclarationSyntax && !(node is AccessorDeclarationSyntax)) {
+							offset = Math.Max (1, ((MemberDeclarationSyntax)node).SpanStart);
 						} else {
-							line = node.StartLocation.Line;
-							col = node.StartLocation.Column;
+							offset = node.SpanStart;
 						}
-						extEditor.SetCaretTo (line, col);
+						extEditor.SetCaretLocation (extEditor.OffsetToLocation (offset), true);
 					}
 				}
 			}
@@ -458,14 +586,17 @@ namespace MonoDevelop.CSharp
 
 		class CompilationUnitDataProvider : DropDownBoxListWindow.IListDataProvider
 		{
-			Document Document {
+			TextEditor editor;
+
+			DocumentContext DocumentContext {
 				get;
 				set;
 			}
 
-			public CompilationUnitDataProvider (Document document)
+			public CompilationUnitDataProvider (TextEditor editor, DocumentContext documentContext)
 			{
-				this.Document = document;
+				this.editor = editor;
+				this.DocumentContext = documentContext;
 			}
 
 			#region IListDataProvider implementation
@@ -476,12 +607,12 @@ namespace MonoDevelop.CSharp
 
 			public string GetMarkup (int n)
 			{
-				return GLib.Markup.EscapeText (Document.ParsedDocument.UserRegions.ElementAt (n).Name);
+				return GLib.Markup.EscapeText (DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n).Name);
 			}
 			
 			internal static Xwt.Drawing.Image Pixbuf {
 				get {
-					return ImageService.GetIcon (Gtk.Stock.Add, Gtk.IconSize.Menu);
+					return ImageService.GetIcon (Ide.Gui.Stock.Region, Gtk.IconSize.Menu);
 				}
 			}
 			
@@ -492,22 +623,23 @@ namespace MonoDevelop.CSharp
 
 			public object GetTag (int n)
 			{
-				return Document.ParsedDocument.UserRegions.ElementAt (n);
+				return DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n);
 			}
 
 			public void ActivateItem (int n)
 			{
-				var reg = Document.ParsedDocument.UserRegions.ElementAt (n);
-				var extEditor = Document.GetContent<MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor> ();
-				if (extEditor != null)
-					extEditor.SetCaretTo (Math.Max (1, reg.Region.BeginLine), reg.Region.BeginColumn);
+				var reg = DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.ElementAt (n);
+				var extEditor = editor;
+				if (extEditor != null) {
+					extEditor.SetCaretLocation(Math.Max (1, reg.Region.BeginLine), reg.Region.BeginColumn, true);
+				}
 			}
 
 			public int IconCount {
 				get {
-					if (Document.ParsedDocument == null)
+					if (DocumentContext.ParsedDocument == null)
 						return 0;
-					return Document.ParsedDocument.UserRegions.Count ();
+					return DocumentContext.ParsedDocument.GetUserRegionsAsync().Result.Count ();
 				}
 			}
 
@@ -515,13 +647,13 @@ namespace MonoDevelop.CSharp
 
 		}
 
-		public Gtk.Widget CreatePathWidget (int index)
+		public Control CreatePathWidget (int index)
 		{
 			PathEntry[] path = CurrentPath;
 			if (path == null || index < 0 || index >= path.Length)
 				return null;
 			var tag = path [index].Tag;
-			var window = new DropDownBoxListWindow (tag == null ? (DropDownBoxListWindow.IListDataProvider)new CompilationUnitDataProvider (Document) : new DataProvider (this, tag));
+			var window = new DropDownBoxListWindow (tag == null ? (DropDownBoxListWindow.IListDataProvider)new CompilationUnitDataProvider (Editor, DocumentContext) : new DataProvider (this, tag));
 			window.FixedRowHeight = 22;
 			window.MaxVisibleRows = 14;
 			window.SelectItem (path [index].Tag);
@@ -540,17 +672,24 @@ namespace MonoDevelop.CSharp
 			}
 		}
 
-		static PathEntry GetRegionEntry (ParsedDocument unit, Mono.TextEditor.DocumentLocation loc)
+		async static Task<PathEntry> GetRegionEntry (ParsedDocument unit, DocumentLocation loc)
 		{
 			PathEntry entry;
-			if (!unit.UserRegions.Any ())
+			FoldingRegion reg;
+			try {
+				var regions = await unit.GetUserRegionsAsync ().ConfigureAwait (false);
+				if (unit == null || !regions.Any ())
+					return null;
+				reg = regions.LastOrDefault (r => r.Region.Contains (loc));
+			} catch (AggregateException) {
+				return null;
+			} catch (OperationCanceledException) {
 				return null;
-			var reg = unit.UserRegions.LastOrDefault (r => r.Region.IsInside (loc));
+			}
 			if (reg == null) {
 				entry = new PathEntry (GettextCatalog.GetString ("No region"));
 			} else {
-				entry = new PathEntry (CompilationUnitDataProvider.Pixbuf,
-				                       GLib.Markup.EscapeText (reg.Name));
+				entry = new PathEntry (CompilationUnitDataProvider.Pixbuf, GLib.Markup.EscapeText (reg.Name));
 			}
 			entry.Position = EntryPosition.Right;
 			return entry;
@@ -563,140 +702,187 @@ namespace MonoDevelop.CSharp
 			OnPathChanged (new DocumentPathChangedEventArgs (prev));	
 		}
 
-		EntityDeclaration lastType;
+		SyntaxNode lastType;
 		string lastTypeMarkup;
-		EntityDeclaration lastMember;
+		SyntaxNode lastMember;
 		string lastMemberMarkup;
 		MonoDevelop.Projects.Project lastProject;
 		AstAmbience amb;
+		CancellationTokenSource src = new CancellationTokenSource ();
+		bool caretPositionChangedSubscribed;
+		uint updatePathTimeoutId;
+		uint updatePathTimeout = 147;
 
-		string GetEntityMarkup (AstNode node)
+		string GetEntityMarkup (SyntaxNode node)
 		{
-			if (amb == null)
+			if (amb == null || node == null)
 				return "";
 			return amb.GetEntityMarkup (node);
 		}
 
-		void UpdatePath (object sender, Mono.TextEditor.DocumentLocationEventArgs e)
+
+		void Editor_CaretPositionChanged (object sender, EventArgs e)
+		{
+			CancelUpdatePathTimeout ();
+			Update ();
+		}
+
+		void Update()
 		{
-			var parsedDocument = Document.ParsedDocument;
-			if (parsedDocument == null || parsedDocument.ParsedFile == null)
+			if (DocumentContext == null)
 				return;
-			amb = new AstAmbience (document.GetFormattingOptions ());
-			
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
+			var parsedDocument = DocumentContext.ParsedDocument;
+			if (parsedDocument == null)
 				return;
+			var caretOffset = Editor.CaretOffset;
+			var model = parsedDocument.GetAst<SemanticModel>();
+			if (model == null)
+				return;
+			CancelUpdatePath ();
+			var cancellationToken = src.Token;
+			amb = new AstAmbience(TypeSystemService.Workspace.Options);
+			var loc = Editor.CaretLocation;
+			Task.Run(async delegate {
+				var unit = model.SyntaxTree;
+				SyntaxNode root;
+				SyntaxNode node;
+				try {
+					root = await unit.GetRootAsync(cancellationToken).ConfigureAwait(false);
+					if (root.FullSpan.Length <= caretOffset) {
+						return;
+					}
+					node = root.FindNode(TextSpan.FromBounds(caretOffset, caretOffset));
+					if (node.SpanStart != caretOffset)
+						node = root.SyntaxTree.FindTokenOnLeftOfPosition(caretOffset, cancellationToken).Parent;
+				} catch (Exception ex ) {
+					Console.WriteLine (ex);
+					return;
+				}
 
-			var loc = Document.Editor.Caret.Location;
-			var compExt = Document.GetContent<CSharpCompletionTextEditorExtension> ();
-			var caretOffset = Document.Editor.Caret.Offset;
-			var segType = compExt.GetTypeAt (caretOffset);
-			if (segType != null)
-				loc = segType.Region.Begin;
-
-			var curType = (EntityDeclaration)unit.GetNodeAt (loc, n => n is TypeDeclaration || n is DelegateDeclaration);
+				var curMember = node != null ? node.AncestorsAndSelf ().FirstOrDefault (m => m is VariableDeclaratorSyntax && m.Parent != null && !(m.Parent.Parent is LocalDeclarationStatementSyntax) || (m is MemberDeclarationSyntax && !(m is NamespaceDeclarationSyntax))) : null;
+				var curType = node != null ? node.AncestorsAndSelf ().FirstOrDefault (IsType) : null;
 
-			var curProject = ownerProjects != null && ownerProjects.Count > 1 ? Document.Project : null;
+				var curProject = ownerProjects != null && ownerProjects.Count > 1 ? DocumentContext.Project : null;
 
-			var segMember = compExt.GetMemberAt (caretOffset);
-			if (segMember != null) {
-				loc = segMember.Region.Begin;
-			} else {
-				loc = Document.Editor.Caret.Location;
-			}
+				if (curType == curMember || curType is DelegateDeclarationSyntax)
+					curMember = null;
+				if (isPathSet && curType == lastType && curMember == lastMember && curProject == lastProject) {
+					return;
+				}
+				var curTypeMakeup = GetEntityMarkup(curType);
+				var curMemberMarkup = GetEntityMarkup(curMember);
+				if (isPathSet && curType != null && lastType != null && curTypeMakeup == lastTypeMarkup &&
+					curMember != null && lastMember != null && curMemberMarkup == lastMemberMarkup && curProject == lastProject) {
+					return;
+				}
 
-			var curMember = unit.GetNodeAt<EntityDeclaration> (loc);
-			if (curType == curMember || curType is DelegateDeclaration)
-				curMember = null;
-			if (isPathSet && curType == lastType && curMember == lastMember && curProject == lastProject)
-				return;
 
-			var curTypeMakeup = GetEntityMarkup (curType);
-			var curMemberMarkup = GetEntityMarkup (curMember);
-			if (isPathSet && curType != null && lastType != null && curType.StartLocation == lastType.StartLocation && curTypeMakeup == lastTypeMarkup &&
-				curMember != null && lastMember != null && curMember.StartLocation == lastMember.StartLocation && curMemberMarkup == lastMemberMarkup && curProject == lastProject)
-				return;
+				var result = new List<PathEntry>();
 
-			lastType = curType;
-			lastTypeMarkup = curTypeMakeup;
+				if (curProject != null) {
+					// Current project if there is more than one 
+					result.Add (new PathEntry (ImageService.GetIcon (curProject.StockIcon, Gtk.IconSize.Menu), GLib.Markup.EscapeText (curProject.Name)) { Tag = curProject });
+				}
 
-			lastMember = curMember;
-			lastMemberMarkup = curMemberMarkup;
+				if (curType == null) {
+					if (CurrentPath != null && CurrentPath.Length == 1 && CurrentPath [0]?.Tag is CSharpSyntaxTree)
+						return;
+					if (CurrentPath != null && CurrentPath.Length == 2 && CurrentPath [1]?.Tag is CSharpSyntaxTree)
+						return;
+					var prevPath = CurrentPath;
+					result.Add (new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = unit });
+					Gtk.Application.Invoke (delegate {
+						if (cancellationToken.IsCancellationRequested)
+							return;
+
+						CurrentPath = result.ToArray ();
+						lastType = curType;
+						lastTypeMarkup = curTypeMakeup;
+
+						lastMember = curMember;
+						lastMemberMarkup = curMemberMarkup;
+
+						lastProject = curProject;
+						OnPathChanged (new DocumentPathChangedEventArgs (prevPath));
+					});
+					return;
+				}
+				var regionEntry = await GetRegionEntry (DocumentContext.ParsedDocument, loc).ConfigureAwait (false);
+
+				Gtk.Application.Invoke(delegate {
+					if (curType != null) {
+						var type = curType;
+						var pos = result.Count;
+						while (type != null) {
+							if (!(type is BaseTypeDeclarationSyntax))
+								break;
+							var tag = (object)type.Ancestors ().FirstOrDefault (IsType) ?? unit;
+							result.Insert (pos, new PathEntry (ImageService.GetIcon (type.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (type)) { Tag = tag });
+							type = type.Parent;
+						}
+					}
+					if (curMember != null) {
+						result.Add (new PathEntry (ImageService.GetIcon (curMember.GetStockIcon (), Gtk.IconSize.Menu), curMemberMarkup) { Tag = curMember });
+						if (curMember.Kind () == SyntaxKind.GetAccessorDeclaration ||
+						curMember.Kind () == SyntaxKind.SetAccessorDeclaration ||
+						curMember.Kind () == SyntaxKind.AddAccessorDeclaration ||
+						curMember.Kind () == SyntaxKind.RemoveAccessorDeclaration) {
+							var parent = curMember.Parent;
+							if (parent != null)
+								result.Insert (result.Count - 1, new PathEntry (ImageService.GetIcon (parent.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (parent)) { Tag = parent });
+						}
+					}
 
-			lastProject = curProject;
+					if (regionEntry != null)
+						result.Add(regionEntry);
 
-			var result = new List<PathEntry> ();
+					PathEntry noSelection = null;
+					if (curType == null) {
+						noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = unit };
+					} else if (curMember == null && !(curType is DelegateDeclarationSyntax)) {
+						noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = curType };
+					}
 
-			if (ownerProjects != null && ownerProjects.Count > 1) {
-				// Current project if there is more than one
-				result.Add (new PathEntry (ImageService.GetIcon (Document.Project.StockIcon, Gtk.IconSize.Menu), GLib.Markup.EscapeText (Document.Project.Name)) { Tag = Document.Project });
-			}
+					if (noSelection != null)
+						result.Add(noSelection);
+					var prev = CurrentPath;
+					if (prev != null && prev.Length == result.Count) {
+						bool equals = true;
+						for (int i = 0; i < prev.Length; i++) {
+							if (prev [i].Markup != result [i].Markup) {
+								equals = false;
+								break;
+							}
+						}
+						if (equals)
+							return;
+					}
+					if (cancellationToken.IsCancellationRequested)
+						return;
+					CurrentPath = result.ToArray();
+					lastType = curType;
+					lastTypeMarkup = curTypeMakeup;
 
-			if (curType == null) {
-				if (CurrentPath != null && CurrentPath.Length == 1 && CurrentPath [0].Tag is IUnresolvedFile)
-					return;
-				if (CurrentPath != null && CurrentPath.Length == 2 && CurrentPath [1].Tag is IUnresolvedFile)
-					return;
-				var prevPath = CurrentPath;
-				result.Add (new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = unit });
-				CurrentPath = result.ToArray ();
-				OnPathChanged (new DocumentPathChangedEventArgs (prevPath));	
-				return;
-			}
+					lastMember = curMember;
+					lastMemberMarkup = curMemberMarkup;
 
-			if (curType != null) {
-				var type = curType;
-				var pos = result.Count;
-				while (type != null) {
-					var declaringType = type.Parent as TypeDeclaration;
-					result.Insert (pos, new PathEntry (ImageService.GetIcon (type.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (type)) { Tag = (AstNode)declaringType ?? unit });
-					type = declaringType;
-				}
-			}
-				
-			if (curMember != null) {
-				result.Add (new PathEntry (ImageService.GetIcon (curMember.GetStockIcon (), Gtk.IconSize.Menu), curMemberMarkup) { Tag = curMember });
-				if (curMember is Accessor) {
-					var parent = curMember.Parent as EntityDeclaration;
-					if (parent != null)
-						result.Insert (result.Count - 1, new PathEntry (ImageService.GetIcon (parent.GetStockIcon (), Gtk.IconSize.Menu), GetEntityMarkup (parent)) { Tag = parent });
-				}
-			}
-				
-			var entry = GetRegionEntry (parsedDocument, loc);
-			if (entry != null)
-				result.Add (entry);
-				
-			PathEntry noSelection = null;
-			if (curType == null) {
-				noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = unit };
-			} else if (curMember == null && !(curType is DelegateDeclaration)) { 
-				noSelection = new PathEntry (GettextCatalog.GetString ("No selection")) { Tag = curType };
-			}
+					lastProject = curProject;
 
-			if (noSelection != null)
-				result.Add (noSelection);
+					OnPathChanged (new DocumentPathChangedEventArgs(prev));
+				});
+			});
+		}
 
-			var prev = CurrentPath;
-			if (prev != null && prev.Length == result.Count) {
-				bool equals = true;
-				for (int i = 0; i < prev.Length; i++) {
-					if (prev [i].Markup != result [i].Markup) {
-						equals = false;
-						break;
-					}
-				}
-				if (equals)
-					return;
-			}
-			//		Gtk.Application.Invoke (delegate {
-			CurrentPath = result.ToArray ();
-			OnPathChanged (new DocumentPathChangedEventArgs (prev));	
-			//		});
-			//	});
+		static bool IsType (SyntaxNode m)
+		{
+			return m is BaseTypeDeclarationSyntax || m is DelegateDeclarationSyntax;
 		}
 
+		void CancelUpdatePath ()
+		{
+			src.Cancel ();
+			src = new CancellationTokenSource ();
+		}
 		#endregion
 
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ProjectSearchCategory.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ProjectSearchCategory.cs
new file mode 100644
index 0000000000..b304f7d898
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/ProjectSearchCategory.cs
@@ -0,0 +1,442 @@
+// 
+// ProjectSearchCategory.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using MonoDevelop.Core;
+using System.Collections.Generic;
+using MonoDevelop.Core.Instrumentation;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Core.Text;
+using Gtk;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Collections.Concurrent;
+using MonoDevelop.Components.MainToolbar;
+
+namespace MonoDevelop.CSharp
+{
+	class ProjectSearchCategory : SearchCategory
+	{
+		internal static void Init ()
+		{
+			MonoDevelopWorkspace.LoadingFinished += async delegate {
+				await UpdateSymbolInfos ();
+			};
+			if (IdeApp.IsInitialized) {
+				IdeApp.Workspace.LastWorkspaceItemClosed += async delegate {
+					await DisposeSymbolInfoTask ();
+				};
+			}
+		}
+
+		public ProjectSearchCategory () : base (GettextCatalog.GetString ("Solution"))
+		{
+			sortOrder = FirstCategory;
+		}
+
+		public override void Initialize (Components.PopoverWindow popupWindow)
+		{
+			lastResult = new WorkerResult ();
+		}
+
+		internal static Task<SymbolCache> SymbolInfoTask;
+
+		static TimerCounter getTypesTimer = InstrumentationService.CreateTimerCounter ("Time to get all types", "NavigateToDialog");
+
+		static CancellationTokenSource symbolInfoTokenSrc = new CancellationTokenSource();
+		public static async Task UpdateSymbolInfos ()
+		{
+			await DisposeSymbolInfoTask ();
+			CancellationToken token = symbolInfoTokenSrc.Token;
+			SymbolInfoTask = Task.Run (delegate {
+				return GetSymbolInfos (token);
+			}, token);
+		}
+
+		static async Task DisposeSymbolInfoTask ()
+		{
+			symbolInfoTokenSrc.Cancel ();
+			if (SymbolInfoTask != null) {
+				try {
+					var old = await SymbolInfoTask;
+					if (old != null)
+						old.Dispose ();
+				} catch (OperationCanceledException) {
+					// Ignore
+				} catch (Exception ex) {
+					LoggingService.LogError ("UpdateSymbolInfos failed", ex);
+				}
+			}
+			symbolInfoTokenSrc = new CancellationTokenSource();
+			lastResult = new WorkerResult ();
+			SymbolInfoTask = null;
+		}
+
+		internal class SymbolCache : IDisposable
+		{
+			public static readonly SymbolCache Empty = new SymbolCache ();
+
+			List<Microsoft.CodeAnalysis.Workspace> workspaces = new List<Microsoft.CodeAnalysis.Workspace> ();
+			ConcurrentDictionary<Microsoft.CodeAnalysis.DocumentId, List<DeclaredSymbolInfo>> documentInfos = new ConcurrentDictionary<Microsoft.CodeAnalysis.DocumentId, List<DeclaredSymbolInfo>> ();
+
+			public void AddWorkspace (Microsoft.CodeAnalysis.Workspace ws, CancellationToken token)
+			{
+				workspaces.Add (ws);
+				ws.WorkspaceChanged += Ws_WorkspaceChanged;
+
+				foreach (var p in ws.CurrentSolution.Projects) {
+					if (p.FilePath.EndsWith ("csproj", StringComparison.Ordinal))
+						SearchAsync (documentInfos, p, token);
+				}
+			}
+
+			public List<DeclaredSymbolInfo> AllTypes {
+				get {
+					var result = new List<DeclaredSymbolInfo> ();
+					foreach (var infos in documentInfos.Values)
+						result.AddRange (infos);
+					return result;
+				}
+			}
+
+			static async void SearchAsync (ConcurrentDictionary<Microsoft.CodeAnalysis.DocumentId, List<DeclaredSymbolInfo>> result, Microsoft.CodeAnalysis.Project project, CancellationToken cancellationToken)
+			{
+				if (project == null)
+					throw new ArgumentNullException (nameof (project));
+				try {
+					foreach (var document in project.Documents) {
+						cancellationToken.ThrowIfCancellationRequested ();
+						await UpdateDocument (result, document, cancellationToken);
+					}
+				} catch (AggregateException ae) {
+					ae.Flatten ().Handle (ex => ex is OperationCanceledException);
+				} catch (OperationCanceledException) {
+				}
+			}
+
+			static async Task UpdateDocument (ConcurrentDictionary<DocumentId, List<DeclaredSymbolInfo>> result, Microsoft.CodeAnalysis.Document document, CancellationToken cancellationToken)
+			{
+				var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+				var infos = new List<DeclaredSymbolInfo> ();
+				foreach (var current in root.DescendantNodesAndSelf (CSharpSyntaxFactsService.DescentIntoSymbolForDeclarationSearch)) {
+					cancellationToken.ThrowIfCancellationRequested ();
+					DeclaredSymbolInfo declaredSymbolInfo;
+					if (current.TryGetDeclaredSymbolInfo (out declaredSymbolInfo)) {
+						declaredSymbolInfo.DocumentId = document.Id;
+						infos.Add (declaredSymbolInfo);
+					}
+				}
+				RemoveDocument (result, document.Id);
+				result.TryAdd (document.Id, infos);
+			}
+
+			static void RemoveDocument (ConcurrentDictionary<DocumentId, List<DeclaredSymbolInfo>> result, Microsoft.CodeAnalysis.DocumentId documentId)
+			{
+				if (result.ContainsKey (documentId)) {
+					List<DeclaredSymbolInfo> val;
+					result.TryRemove (documentId, out val);
+				}
+			}
+
+			public void Dispose ()
+			{
+				if (workspaces == null)
+					return;
+				foreach (var ws in workspaces)
+					ws.WorkspaceChanged -= Ws_WorkspaceChanged;
+				workspaces = null;
+				documentInfos = null;
+			}
+
+			async void Ws_WorkspaceChanged (object sender, WorkspaceChangeEventArgs e)
+			{
+				var ws = (Microsoft.CodeAnalysis.Workspace)sender;
+				var currentSolution = ws.CurrentSolution;
+				if (currentSolution == null)
+					return;
+				try {
+					switch (e.Kind) {
+					case WorkspaceChangeKind.ProjectAdded:
+						var project1 = currentSolution.GetProject (e.ProjectId);
+						if (project1 != null)
+							SearchAsync (documentInfos, project1, default (CancellationToken));
+						break;
+					case WorkspaceChangeKind.ProjectRemoved:
+						var project = currentSolution.GetProject (e.ProjectId);
+						if (project != null) {
+							foreach (var docId in project.DocumentIds)
+								RemoveDocument (documentInfos, docId);
+						}
+						break;
+					case WorkspaceChangeKind.DocumentAdded:
+						var document = currentSolution.GetDocument (e.DocumentId);
+						if (document != null)
+							await UpdateDocument (documentInfos, document, default (CancellationToken));
+						break;
+					case WorkspaceChangeKind.DocumentRemoved:
+						RemoveDocument (documentInfos, e.DocumentId);
+						break;
+					case WorkspaceChangeKind.DocumentChanged:
+						var doc = currentSolution.GetDocument (e.DocumentId);
+						if (doc != null) {
+							await Task.Run (async delegate {
+								await UpdateDocument (documentInfos, doc, default (CancellationToken));
+							}).ConfigureAwait (false);
+						}
+						break;
+					}
+				} catch (AggregateException ae) {
+					ae.Flatten ().Handle (ex => ex is OperationCanceledException);
+				} catch (OperationCanceledException) {
+				} catch (Exception ex) {
+					LoggingService.LogError ("Error while updating navigation symbol cache.", ex);
+				}
+			}
+		}
+
+		static SymbolCache GetSymbolInfos (CancellationToken token)
+		{
+			getTypesTimer.BeginTiming ();
+			try {
+				var result = new SymbolCache ();
+				foreach (var workspace in TypeSystemService.AllWorkspaces) {
+					result.AddWorkspace (workspace, token);
+				}
+				return result;
+			} catch (AggregateException ae) {
+				ae.Flatten ().Handle (ex => ex is OperationCanceledException);
+				return SymbolCache.Empty;
+			} catch (OperationCanceledException) {
+				return SymbolCache.Empty;
+			} finally {
+				getTypesTimer.EndTiming ();
+			}
+		}
+
+
+		static WorkerResult lastResult;
+		static readonly string[] typeTags = new [] { "type", "t", "class", "struct", "interface", "enum", "delegate" };
+		static readonly string[] memberTags = new [] { "member", "m", "method", "property", "field", "event" };
+		static readonly string[] tags = typeTags.Concat(memberTags).ToArray();
+
+		public override string[] Tags {
+			get {
+				return tags;
+			}
+		}
+
+		public override bool IsValidTag (string tag)
+		{
+			return typeTags.Any (t => t == tag) || memberTags.Any (t => t == tag);
+		}
+
+		public override Task GetResults (ISearchResultCallback searchResultCallback, SearchPopupSearchPattern searchPattern, CancellationToken token)
+		{
+			return Task.Run (async delegate {
+				if (searchPattern.Tag != null && !(typeTags.Contains (searchPattern.Tag) || memberTags.Contains (searchPattern.Tag)) || searchPattern.HasLineNumber)
+					return null;
+				try {
+					var newResult = new WorkerResult ();
+					newResult.pattern = searchPattern.Pattern;
+					newResult.Tag = searchPattern.Tag;
+					List<DeclaredSymbolInfo> allTypes;
+					if (SymbolInfoTask == null)
+						SymbolInfoTask = Task.FromResult (GetSymbolInfos (token));
+					var cache = await SymbolInfoTask.ConfigureAwait (false);
+					allTypes = cache.AllTypes;
+					string toMatch = searchPattern.Pattern;
+					newResult.matcher = StringMatcher.GetMatcher (toMatch, false);
+					newResult.FullSearch = toMatch.IndexOf ('.') > 0;
+					var oldLastResult = lastResult;
+					if (newResult.FullSearch && oldLastResult != null && !oldLastResult.FullSearch)
+						oldLastResult = new WorkerResult ();
+//					var now = DateTime.Now;
+
+					AllResults (searchResultCallback, oldLastResult, newResult, allTypes, token);
+					//newResult.results.SortUpToN (new DataItemComparer (token), resultsCount);
+					lastResult = newResult;
+//					Console.WriteLine ((now - DateTime.Now).TotalMilliseconds);
+					return (ISearchDataSource)newResult.results;
+				} catch {
+					token.ThrowIfCancellationRequested ();
+					throw;
+				}
+			}, token);
+		}
+
+		void AllResults (ISearchResultCallback searchResultCallback, WorkerResult lastResult, WorkerResult newResult, IReadOnlyList<DeclaredSymbolInfo> completeTypeList, CancellationToken token)
+		{
+			// Search Types
+			newResult.filteredSymbols = new List<DeclaredSymbolInfo> ();
+			bool startsWithLastFilter = lastResult.pattern != null && newResult.pattern.StartsWith (lastResult.pattern, StringComparison.Ordinal) && lastResult.filteredSymbols != null;
+			var allTypes = startsWithLastFilter ? lastResult.filteredSymbols : completeTypeList;
+			foreach (var type in allTypes) {
+				if (token.IsCancellationRequested) {
+					newResult.filteredSymbols = null;
+					return;
+				}
+
+				if (type.Kind == DeclaredSymbolInfoKind.Constructor ||
+				    type.Kind == DeclaredSymbolInfoKind.Module ||
+				    type.Kind == DeclaredSymbolInfoKind.Indexer)
+					continue;
+				
+				if (newResult.Tag != null) {
+					if ((newResult.Tag == "type" || newResult.Tag == "t") && type.Kind != DeclaredSymbolInfoKind.Class && type.Kind != DeclaredSymbolInfoKind.Struct && type.Kind != DeclaredSymbolInfoKind.Interface && type.Kind != DeclaredSymbolInfoKind.Enum && type.Kind != DeclaredSymbolInfoKind.Delegate)
+					    continue;
+					
+					if (newResult.Tag == "class" && type.Kind != DeclaredSymbolInfoKind.Class)
+						continue;
+				    if (newResult.Tag == "struct" && type.Kind != DeclaredSymbolInfoKind.Struct)
+						continue;
+				    if (newResult.Tag == "interface" && type.Kind != DeclaredSymbolInfoKind.Interface)
+						continue;
+				    if (newResult.Tag == "enum" && type.Kind != DeclaredSymbolInfoKind.Enum)
+						continue;
+				    if (newResult.Tag == "delegate" && type.Kind != DeclaredSymbolInfoKind.Delegate)
+						continue;
+
+					if ((newResult.Tag == "member" || newResult.Tag == "m") && type.Kind != DeclaredSymbolInfoKind.Method && type.Kind != DeclaredSymbolInfoKind.Property && type.Kind != DeclaredSymbolInfoKind.Field && type.Kind != DeclaredSymbolInfoKind.Event)
+					    continue;
+					if (newResult.Tag == "method" && type.Kind != DeclaredSymbolInfoKind.Method)
+						continue;
+					if (newResult.Tag == "property" && type.Kind != DeclaredSymbolInfoKind.Property)
+						continue;
+					if (newResult.Tag == "field" && type.Kind != DeclaredSymbolInfoKind.Field)
+						continue;
+					if (newResult.Tag == "event" && type.Kind != DeclaredSymbolInfoKind.Event)
+						continue;
+					
+				}
+				SearchResult curResult = newResult.CheckType (type);
+				if (curResult != null) {
+					newResult.filteredSymbols.Add (type);
+					newResult.results.AddResult (curResult);
+					searchResultCallback.ReportResult (curResult);
+				}
+			}
+		}
+
+		class WorkerResult
+		{
+			public string Tag {
+				get;
+				set;
+			}
+
+			public List<DeclaredSymbolInfo> filteredSymbols;
+
+			string pattern2;
+			char firstChar;
+			char[] firstChars;
+
+			public string pattern {
+				get {
+					return pattern2;
+				}
+				set {
+					pattern2 = value;
+					if (pattern2.Length == 1) {
+						firstChar = pattern2 [0];
+						firstChars = new [] { char.ToUpper (firstChar), char.ToLower (firstChar) };
+					} else {
+						firstChars = null;
+					}
+				}
+			}
+
+			public ResultsDataSource results;
+			public bool FullSearch;
+			public StringMatcher matcher;
+
+			public WorkerResult ()
+			{
+				results = new ResultsDataSource ();
+			}
+
+			internal SearchResult CheckType (DeclaredSymbolInfo symbol)
+			{
+				int rank;
+				var name = symbol.Name;
+				if (MatchName(name, out rank)) {
+//					if (type.ContainerDisplayName != null)
+//						rank--;
+					return new DeclaredSymbolInfoResult (pattern, symbol.Name, rank, symbol, false);
+				}
+				if (!FullSearch)
+					return null;
+				name = symbol.FullyQualifiedContainerName;
+				if (MatchName(name, out rank)) {
+//					if (type.ContainingType != null)
+//						rank--;
+					return new DeclaredSymbolInfoResult (pattern, name, rank, symbol, true);
+				}
+				return null;
+			}
+
+			Dictionary<string, MatchResult> savedMatches = new Dictionary<string, MatchResult> (StringComparer.Ordinal);
+
+			bool MatchName (string name, out int matchRank)
+			{
+				if (name == null) {
+					matchRank = -1;
+					return false;
+				}
+
+				MatchResult savedMatch;
+				if (!savedMatches.TryGetValue (name, out savedMatch)) {
+					bool doesMatch;
+					if (firstChars != null) {
+						int idx = name.IndexOfAny (firstChars);
+						doesMatch = idx >= 0;
+						if (doesMatch) {
+							matchRank = int.MaxValue - (name.Length - 1) * 10 - idx;
+							if (name [idx] != firstChar)
+								matchRank /= 2;
+							savedMatches [name] = savedMatch = new MatchResult (true, matchRank);
+							return true;
+						}
+						matchRank = -1;
+						savedMatches [name] = savedMatch = new MatchResult (false, -1);
+						return false;
+					}
+					doesMatch = matcher.CalcMatchRank (name, out matchRank);
+					savedMatches [name] = savedMatch = new MatchResult (doesMatch, matchRank);
+				}
+				
+				matchRank = savedMatch.Rank;
+				return savedMatch.Match;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
index 4938335f00..89cd40ade2 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
@@ -24,35 +24,41 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Ide.TypeSystem;
 using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
 using System.IO;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using System.Collections.Generic;
-using Mono.TextEditor.Highlighting;
-using Mono.TextEditor;
 using System.Linq;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.Semantics;
 using System.ComponentModel;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.CSharp.Formatting;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor.Highlighting;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.CSharp.Completion;
+using System.Threading;
 
 namespace MonoDevelop.CSharp
 {
 	class SignatureMarkupCreator
 	{
 		const double optionalAlpha = 0.7;
-		readonly CSharpResolver resolver;
-		readonly TypeSystemAstBuilder astBuilder;
-		readonly CSharpFormattingOptions formattingOptions;
+		readonly DocumentContext ctx;
+		readonly OptionSet options;
 		readonly ColorScheme colorStyle;
+		readonly int offset;
 
-		public bool BreakLineAfterReturnType {
+		public bool BreakLineAfterReturnType
+		{
 			get;
 			set;
 		}
@@ -68,129 +74,167 @@ namespace MonoDevelop.CSharp
 			}
 		}
 
-		public SignatureMarkupCreator (CSharpResolver resolver, CSharpFormattingOptions formattingOptions)
+		public SignatureMarkupCreator (DocumentContext ctx, int offset)
 		{
-			this.colorStyle = SyntaxModeService.GetColorStyle (MonoDevelop.Ide.IdeApp.Preferences.ColorScheme);
-
-			this.resolver = resolver;
-			this.astBuilder = new TypeSystemAstBuilder (resolver) {
-				ConvertUnboundTypeArguments = true,
-				UseAliases = false
-			};
-			this.formattingOptions = formattingOptions;
+			this.offset = offset;
+			this.colorStyle = SyntaxModeService.GetColorStyle (Ide.IdeApp.Preferences.ColorScheme);
+			if (!this.colorStyle.FitsIdeSkin (Ide.IdeApp.Preferences.UserInterfaceSkin))
+				this.colorStyle = SyntaxModeService.GetDefaultColorStyle (Ide.IdeApp.Preferences.UserInterfaceSkin);
+			this.ctx = ctx;
+			if (ctx != null) {
+				this.options = ctx.GetOptionSet ();
+			} else {
+				this.options = MonoDevelop.Ide.TypeSystem.TypeSystemService.Workspace.Options;
+			}
 		}
 
-		public string GetTypeReferenceString (IType type, bool highlight = true)
+		public string GetTypeReferenceString (ITypeSymbol type, bool highlight = true)
 		{
 			if (type == null)
-				throw new ArgumentNullException ("type");
-			if (type.Kind == TypeKind.Null)
-				return "?";
-			if (type.Kind == TypeKind.Array) {
-				var arrayType = (ArrayType)type;
-				return GetTypeReferenceString (arrayType.ElementType, highlight) + "[" + new string (',', arrayType.Dimensions - 1) + "]";
-			}
-			if (type.Kind == TypeKind.Pointer)
-				return GetTypeReferenceString (((PointerType)type).ElementType, highlight) + "*";
-			AstType astType;
-			try {
-				astType = astBuilder.ConvertType (type);
-			} catch (Exception e) {
-				var compilation = GetCompilation (type);
-				if (compilation == null) {
-					LoggingService.LogWarning ("type:" + type.GetType (), e);
-					return "?";
+				throw new ArgumentNullException (nameof (type));
+			if (type.TypeKind == TypeKind.Error) {
+				SemanticModel model = SemanticModel;
+				if (model == null) {
+					var parsedDocument = ctx.ParsedDocument;
+					if (parsedDocument != null) {
+						model = parsedDocument.GetAst<SemanticModel> () ?? ctx.AnalysisDocument?.GetSemanticModelAsync ().Result;
+					}
 				}
-				astType = new TypeSystemAstBuilder (new CSharpResolver (compilation)).ConvertType (type);
+				var typeSyntax = type.GenerateTypeSyntax ();
+				string generatedTypeSyntaxString;
+				try {
+					var oldDoc = ctx.AnalysisDocument;
+					var newDoc = oldDoc.WithSyntaxRoot (SyntaxFactory.ParseCompilationUnit (typeSyntax.ToString ()).WithAdditionalAnnotations (Simplifier.Annotation));
+					var reducedDoc = Simplifier.ReduceAsync (newDoc, options);
+					generatedTypeSyntaxString = Ambience.EscapeText (reducedDoc.Result.GetSyntaxRootAsync ().Result.ToString ());
+				} catch {
+					generatedTypeSyntaxString = typeSyntax != null ? Ambience.EscapeText (typeSyntax.ToString ()) : "?";
+				}
+				return highlight ? HighlightSemantically (generatedTypeSyntaxString, colorStyle.UserTypes) : generatedTypeSyntaxString;
 			}
-
-			if (astType is PrimitiveType) {
-				return Highlight (astType.ToString (formattingOptions), colorStyle.KeywordTypes);
+			if (type.TypeKind == TypeKind.Array) {
+				var arrayType = (IArrayTypeSymbol)type;
+				return GetTypeReferenceString (arrayType.ElementType, highlight) + "[" + new string (',', arrayType.Rank - 1) + "]";
 			}
-			var text = AmbienceService.EscapeText (astType.ToString (formattingOptions));
-			return highlight ? HighlightSemantically (text, colorStyle.UserTypes) : text;
-		}
-
-		static ICompilation GetCompilation (IType type)
-		{
-			var def = type.GetDefinition ();
-			if (def == null) {	
-				var t = type;
-				while (t is TypeWithElementType) {
-					t = ((TypeWithElementType)t).ElementType;
+			if (type.TypeKind == TypeKind.Pointer)
+				return GetTypeReferenceString (((IPointerTypeSymbol)type).PointedAtType, highlight) + "*";
+			string displayString;
+			if (ctx != null) {
+				SemanticModel model = SemanticModel;
+				if (model == null) {
+					var parsedDocument = ctx.ParsedDocument;
+					if (parsedDocument != null) {
+						model = parsedDocument.GetAst<SemanticModel> () ?? ctx.AnalysisDocument?.GetSemanticModelAsync ().Result;
+					}
 				}
-				if (t != null)
-					def = t.GetDefinition ();
+				//Math.Min (model.SyntaxTree.Length, offset)) is needed in case parsedDocument.GetAst<SemanticModel> () is outdated
+				//this is tradeoff between performance and consistency between editor text(offset) and model, since
+				//ToMinimalDisplayString can use little outdated model this is fine
+				//but in case of Sketches where user usually is at end of document when typing text this can throw exception
+				//because offset can be >= Length
+				displayString = model != null ? RoslynCompletionData.SafeMinimalDisplayString (type, model, Math.Min (model.SyntaxTree.Length - 1, offset), MonoDevelop.Ide.TypeSystem.Ambience.LabelFormat) : type.Name;
+			} else {
+				displayString = type.ToDisplayString (MonoDevelop.Ide.TypeSystem.Ambience.LabelFormat);
 			}
-			if (def != null)
-				return def.Compilation;
-			return null;
+			var text = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (displayString);
+			return highlight ? HighlightSemantically (text, colorStyle.UserTypes) : text;
 		}
 
-		public string GetMarkup (IType type)
+		//		static ICompilation GetCompilation (IType type)
+		//		{
+		//			var def = type.GetDefinition ();
+		//			if (def == null) {	
+		//				var t = type;
+		//				while (t is TypeWithElementType) {
+		//					t = ((TypeWithElementType)t).ElementType;
+		//				}
+		//				if (t != null)
+		//					def = t.GetDefinition ();
+		//			}
+		//			if (def != null)
+		//				return def.Compilation;
+		//			return null;
+		//		}
+
+		public string GetMarkup (ITypeSymbol type)
 		{
 			if (type == null)
 				throw new ArgumentNullException ("entity");
 			return GetTypeMarkup (type);
 		}
 
-		public string GetMarkup (IEntity entity)
+
+		public string GetMarkup (Microsoft.CodeAnalysis.ISymbol entity)
 		{
 			if (entity == null)
 				throw new ArgumentNullException ("entity");
 			string result;
-			switch (entity.SymbolKind) {
-			case SymbolKind.TypeDefinition:
-				result = GetTypeMarkup ((ITypeDefinition)entity);
-				break;
-			case SymbolKind.Field:
-				result = GetFieldMarkup ((IField)entity);
-				break;
-			case SymbolKind.Property:
-			case SymbolKind.Indexer:
-				result = GetPropertyMarkup ((IProperty)entity);
-				break;
-			case SymbolKind.Event:
-				result = GetEventMarkup ((IEvent)entity);
+			switch (entity.Kind) {
+				case Microsoft.CodeAnalysis.SymbolKind.ArrayType:
+				case Microsoft.CodeAnalysis.SymbolKind.PointerType:
+				case Microsoft.CodeAnalysis.SymbolKind.NamedType:
+				result = GetTypeMarkup ((ITypeSymbol)entity);
+				break;
+			case Microsoft.CodeAnalysis.SymbolKind.Field:
+				result = GetFieldMarkup ((IFieldSymbol)entity);
+				break;
+			case Microsoft.CodeAnalysis.SymbolKind.Property:
+				result = GetPropertyMarkup ((IPropertySymbol)entity);
+				break;
+			case Microsoft.CodeAnalysis.SymbolKind.Event:
+				result = GetEventMarkup ((IEventSymbol)entity);
+				break;
+			case Microsoft.CodeAnalysis.SymbolKind.Method:
+				var method = (IMethodSymbol)entity;
+				switch (method.MethodKind) {
+				case MethodKind.Constructor:
+					result = GetConstructorMarkup (method);
+					break;
+				case MethodKind.Destructor:
+					result = GetDestructorMarkup (method);
+					break;
+				default:
+					result = GetMethodMarkup (method);
+					break;
+				}
 				break;
-			case SymbolKind.Method:
-			case SymbolKind.Operator:
-				result = GetMethodMarkup ((IMethod)entity);
+			case Microsoft.CodeAnalysis.SymbolKind.Namespace:
+				result = GetNamespaceMarkup ((INamespaceSymbol)entity);
 				break;
-			case SymbolKind.Constructor:
-				result = GetConstructorMarkup ((IMethod)entity);
+			case Microsoft.CodeAnalysis.SymbolKind.Local:
+				result = GetLocalVariableMarkup ((ILocalSymbol)entity);
 				break;
-			case SymbolKind.Destructor:
-				result = GetDestructorMarkup ((IMethod)entity);
+			case Microsoft.CodeAnalysis.SymbolKind.Parameter:
+				result = GetParameterVariableMarkup ((IParameterSymbol)entity);
 				break;
 			default:
-				throw new ArgumentOutOfRangeException ();
-			}
-			string reason;
-			if (entity.IsObsolete (out reason)) {
-				var attr = reason == null ? "[Obsolete]" : "[Obsolete(\"" + reason + "\")]";
-				result = "<span size=\"smaller\">" + attr + "</span>" + Environment.NewLine + result;
+				Console.WriteLine (entity.Kind);
+				return null;
 			}
+			// TODO
+			//			if (entity.IsObsolete (out reason)) {
+			//				var attr = reason == null ? "[Obsolete]" : "[Obsolete(\"" + reason + "\")]";
+			//				result = "<span size=\"smaller\">" + attr + "</span>" + Environment.NewLine + result;
+			//			}
 			return result;
 		}
 
-		public string GetMarkup (INamespace ns)
+		string GetNamespaceMarkup (INamespaceSymbol ns)
 		{
 			var result = new StringBuilder ();
 			result.Append (Highlight ("namespace ", colorStyle.KeywordNamespace));
-			result.Append (ns.FullName);
+			result.Append (ns.Name);
 
 			return result.ToString ();
 		}
-
-		void AppendModifiers (StringBuilder result, IEntity entity)
+		void AppendModifiers (StringBuilder result, ISymbol entity)
 		{
-			if (entity.DeclaringType != null && entity.DeclaringType.Kind == TypeKind.Interface)
+			if (entity.ContainingType != null && entity.ContainingType.TypeKind == TypeKind.Interface)
 				return;
 
-			switch (entity.Accessibility) {
+			switch (entity.DeclaredAccessibility) {
 			case Accessibility.Internal:
-				if (entity.SymbolKind != SymbolKind.TypeDefinition)
+				if (entity.Kind != SymbolKind.NamedType)
 					result.Append (Highlight ("internal ", colorStyle.KeywordModifiers));
 				break;
 			case Accessibility.ProtectedAndInternal:
@@ -203,42 +247,48 @@ namespace MonoDevelop.CSharp
 				result.Append (Highlight ("protected ", colorStyle.KeywordModifiers));
 				break;
 			case Accessibility.Private:
-// private is the default modifier - no need to show that
-//				result.Append (Highlight (" private", colorStyle.KeywordModifiers));
+				// private is the default modifier - no need to show that
+				//				result.Append (Highlight (" private", colorStyle.KeywordModifiers));
 				break;
 			case Accessibility.Public:
 				result.Append (Highlight ("public ", colorStyle.KeywordModifiers));
 				break;
 			}
-			var field = entity as IField;
+			var field = entity as IFieldSymbol;
 
 			if (field != null) {
-				if (field.IsFixed) {
+				//  TODO!!!!
+				/*if (field.IsFixed) {
 					result.Append (Highlight ("fixed ", colorStyle.KeywordModifiers));
-				} else if (field.IsConst) {
+				} else*/
+				if (field.IsConst) {
 					result.Append (Highlight ("const ", colorStyle.KeywordModifiers));
 				}
 			} else if (entity.IsStatic) {
 				result.Append (Highlight ("static ", colorStyle.KeywordModifiers));
 			} else if (entity.IsSealed) {
-				if (!(entity is IType && ((IType)entity).Kind == TypeKind.Delegate))
+				if (!(entity is ITypeSymbol && ((ITypeSymbol)entity).TypeKind == TypeKind.Delegate))
 					result.Append (Highlight ("sealed ", colorStyle.KeywordModifiers));
 			} else if (entity.IsAbstract) {
-				if (!(entity is IType && ((IType)entity).Kind == TypeKind.Interface))
+				if (!(entity is ITypeSymbol && ((ITypeSymbol)entity).TypeKind == TypeKind.Interface))
 					result.Append (Highlight ("abstract ", colorStyle.KeywordModifiers));
 			}
 
+			//  TODO!!!!
+			//			if (entity.IsShadowing)
+			//				result.Append (Highlight ("new ", colorStyle.KeywordModifiers));
 
-			if (entity.IsShadowing)
-				result.Append (Highlight ("new ", colorStyle.KeywordModifiers));
-
-			var member = entity as IMember;
-			if (member != null) {
-				if (member.IsOverride) {
+			var method = entity as IMethodSymbol;
+			if (method != null) {
+				if (method.IsOverride) {
 					result.Append (Highlight ("override ", colorStyle.KeywordModifiers));
-				} else if (member.IsVirtual) {
+				} else if (method.IsVirtual) {
 					result.Append (Highlight ("virtual ", colorStyle.KeywordModifiers));
 				}
+				if (method.IsAsync)
+					result.Append (Highlight ("async ", colorStyle.KeywordModifiers));
+				if (method.PartialDefinitionPart != null || method.PartialImplementationPart != null)
+					result.Append (Highlight ("partial ", colorStyle.KeywordModifiers));
 			}
 			if (field != null) {
 				if (field.IsVolatile)
@@ -247,18 +297,11 @@ namespace MonoDevelop.CSharp
 					result.Append (Highlight ("readonly ", colorStyle.KeywordModifiers));
 			}
 
-			var method = entity as IMethod;
-			if (method != null) {
-				if (method.IsAsync)
-					result.Append (Highlight ("async ", colorStyle.KeywordModifiers));
-				if (method.IsPartial)
-					result.Append (Highlight ("partial ", colorStyle.KeywordModifiers));
-			}
 		}
 
-		void AppendAccessibility (StringBuilder result, IMethod entity)
+		void AppendAccessibility (StringBuilder result, IMethodSymbol entity)
 		{
-			switch (entity.Accessibility) {
+			switch (entity.DeclaredAccessibility) {
 			case Accessibility.Internal:
 				result.Append (Highlight ("internal", colorStyle.KeywordModifiers));
 				break;
@@ -309,13 +352,12 @@ namespace MonoDevelop.CSharp
 			return result;
 		}
 
-		static bool IsObjectOrValueType (IType type)
+		static bool IsObjectOrValueType (ITypeSymbol type)
 		{
-			var d = type.GetDefinition ();
-			return d != null && (d.KnownTypeCode == KnownTypeCode.Object || d.KnownTypeCode == KnownTypeCode.ValueType);
+			return type != null && (type.SpecialType == SpecialType.System_Object || type.IsValueType);
 		}
 
-		string GetTypeParameterMarkup (IType t)
+		string GetTypeParameterMarkup (ITypeSymbol t)
 		{
 			if (t == null)
 				throw new ArgumentNullException ("t");
@@ -324,12 +366,12 @@ namespace MonoDevelop.CSharp
 			result.Append (highlightedTypeName);
 
 			var color = AlphaBlend (colorStyle.PlainText.Foreground, colorStyle.PlainText.Background, optionalAlpha);
-			var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);
+			var colorString = MonoDevelop.Components.HelperMethods.GetColorString (color);
 
 			result.Append ("<span foreground=\"" + colorString + "\">" + " (type parameter)</span>");
-			var tp = t as ITypeParameter;
+			var tp = t as ITypeParameterSymbol;
 			if (tp != null) {
-				if (!tp.HasDefaultConstructorConstraint && !tp.HasReferenceTypeConstraint && !tp.HasValueTypeConstraint && tp.DirectBaseTypes.All (IsObjectOrValueType))
+				if (!tp.HasConstructorConstraint && !tp.HasReferenceTypeConstraint && !tp.HasValueTypeConstraint && tp.ConstraintTypes.All (IsObjectOrValueType))
 					return result.ToString ();
 				result.AppendLine ();
 				result.Append (Highlight (" where ", colorStyle.KeywordContext));
@@ -344,7 +386,7 @@ namespace MonoDevelop.CSharp
 					constraints++;
 					result.Append (Highlight ("struct", colorStyle.KeywordDeclaration));
 				}
-				foreach (var bt in tp.DirectBaseTypes) {
+				foreach (var bt in tp.ConstraintTypes) {
 					if (!IsObjectOrValueType (bt)) {
 						if (constraints > 0) {
 							result.Append (",");
@@ -357,7 +399,7 @@ namespace MonoDevelop.CSharp
 						result.Append (GetTypeReferenceString (bt));
 					}
 				}
-				if (tp.HasDefaultConstructorConstraint) {
+				if (tp.HasConstructorConstraint) {
 					if (constraints > 0)
 						result.Append (",");
 					result.Append (Highlight ("new", colorStyle.KeywordOperators));
@@ -367,62 +409,70 @@ namespace MonoDevelop.CSharp
 			return result.ToString ();
 		}
 
-		string GetNullableMarkup (IType t)
+		string GetNullableMarkup (ITypeSymbol t)
 		{
 			var result = new StringBuilder ();
 			result.Append (GetTypeReferenceString (t));
 			return result.ToString ();
 		}
 
-		void AppendTypeParameterList (StringBuilder result, ITypeDefinition def)
+		void AppendTypeParameterList (StringBuilder result, INamedTypeSymbol def)
 		{
-			IEnumerable<ITypeParameter> parameters = def.TypeParameters;
-			if (def.DeclaringTypeDefinition != null)
-				parameters = parameters.Skip (def.DeclaringTypeDefinition.TypeParameterCount);
+			var parameters = def.TypeParameters;
+			//			if (def.ContainingType != null)
+			//				parameters = parameters.Skip (def.DeclaringTypeDefinition.TypeParameterCount);
 			AppendTypeParameters (result, parameters);
 		}
 
-		void AppendTypeArgumentList (StringBuilder result, IType def)
+		void AppendTypeArgumentList (StringBuilder result, INamedTypeSymbol def)
 		{
-			IEnumerable<IType> parameters = def.TypeArguments;
-			if (def.DeclaringType != null)
-				parameters = parameters.Skip (def.DeclaringType.TypeParameterCount);
+			var parameters = def.TypeArguments;
+			//			if (def.DeclaringType != null)
+			//				parameters = parameters.Skip (def.DeclaringType.TypeParameterCount);
 			AppendTypeParameters (result, parameters);
 		}
 
-		string GetTypeNameWithParameters (IType t)
+		string GetTypeNameWithParameters (ITypeSymbol t)
 		{
 			StringBuilder result = new StringBuilder ();
 			result.Append (Highlight (FilterEntityName (t.Name), colorStyle.UserTypesTypeParameters));
-			if (t.TypeParameterCount > 0) {
-				if (t.TypeArguments.Count > 0) {
-					AppendTypeArgumentList (result, t);
-				} else {
-					AppendTypeParameterList (result, t.GetDefinition ());
+			var namedTypeSymbol = t as INamedTypeSymbol;
+			if (namedTypeSymbol != null) {
+				if (namedTypeSymbol.IsGenericType) {
+					AppendTypeParameterList (result, namedTypeSymbol);
+				} else if (namedTypeSymbol.IsUnboundGenericType) {
+					AppendTypeArgumentList (result, namedTypeSymbol);
 				}
 			}
 			return result.ToString ();
 		}
 
-		string GetTypeMarkup (IType t, bool includeDeclaringTypes = false)
+		public static bool IsNullableType (ITypeSymbol type)
+		{
+			var original = type.OriginalDefinition;
+			return original.SpecialType == SpecialType.System_Nullable_T;
+		}
+
+
+		string GetTypeMarkup (ITypeSymbol t, bool includeDeclaringTypes = false)
 		{
 			if (t == null)
 				throw new ArgumentNullException ("t");
-			if (t.Kind == TypeKind.Null)
+			if (t.TypeKind == TypeKind.Error)
 				return "Type can not be resolved.";
-			if (t.Kind == TypeKind.Delegate)
-				return GetDelegateMarkup (t);
-			if (t.Kind == TypeKind.TypeParameter)
+			if (t.TypeKind == TypeKind.Delegate)
+				return GetDelegateMarkup ((INamedTypeSymbol)t);
+			if (t.TypeKind == TypeKind.TypeParameter)
 				return GetTypeParameterMarkup (t);
-			if (t.Kind == TypeKind.Array || t.Kind == TypeKind.Pointer)
+			if (t.TypeKind == TypeKind.Array || t.TypeKind == TypeKind.Pointer)
 				return GetTypeReferenceString (t);
-			if (NullableType.IsNullable (t))
+			if (t.IsNullable ())
 				return GetNullableMarkup (t);
 			var result = new StringBuilder ();
-			if (t.GetDefinition () != null)
-				AppendModifiers (result, t.GetDefinition ());
+			if (IsNullableType (t))
+				AppendModifiers (result, t);
 
-			switch (t.Kind) {
+			switch (t.TypeKind) {
 			case TypeKind.Class:
 				result.Append (Highlight ("class ", colorStyle.KeywordDeclaration));
 				break;
@@ -442,7 +492,7 @@ namespace MonoDevelop.CSharp
 				var curType = t;
 				while (curType != null) {
 					typeNames.Add (GetTypeNameWithParameters (curType));
-					curType = curType.DeclaringType;
+					curType = curType.ContainingType;
 				}
 				typeNames.Reverse ();
 				result.Append (string.Join (".", typeNames));
@@ -450,21 +500,26 @@ namespace MonoDevelop.CSharp
 				result.Append (GetTypeNameWithParameters (t));
 			}
 
-			if (t.Kind == TypeKind.Array)
+			if (t.TypeKind == TypeKind.Array)
 				return result.ToString ();
 
 			bool first = true;
 			int maxLength = GetMarkupLength (result.ToString ());
 			int length = maxLength;
-			var sortedTypes = new List<IType> (t.DirectBaseTypes.Where (x => x.FullName != "System.Object"));
+			var sortedTypes = new List<INamedTypeSymbol> (t.Interfaces);
+
 			sortedTypes.Sort ((x, y) => GetTypeReferenceString (y).Length.CompareTo (GetTypeReferenceString (x).Length));
-			if (t.Kind != TypeKind.Enum) {
+
+			if (t.BaseType != null && t.BaseType.SpecialType != SpecialType.System_Object)
+				sortedTypes.Insert (0, t.BaseType);
+
+			if (t.TypeKind != TypeKind.Enum) {
 				foreach (var directBaseType in sortedTypes) {
 					if (first) {
 						result.AppendLine (" :");
 						result.Append ("  ");
 						length = 2;
-					} else {
+					} else { // 5.5. um 10:45
 						result.Append (", ");
 						length += 2;
 					}
@@ -480,9 +535,9 @@ namespace MonoDevelop.CSharp
 					length += GetMarkupLength (typeRef);
 					first = false;
 				}
-			} else { 
-				var enumBase = t.GetDefinition ().EnumUnderlyingType;
-				if (enumBase.Name != "Int32") {
+			} else {
+				var enumBase = t.BaseType;
+				if (enumBase.SpecialType != SpecialType.System_Int32) {
 					result.AppendLine (" :");
 					result.Append ("  ");
 					result.Append (GetTypeReferenceString (enumBase, false));
@@ -492,7 +547,7 @@ namespace MonoDevelop.CSharp
 			return result.ToString ();
 		}
 
-		void AppendTypeParameters (StringBuilder result, IEnumerable<ITypeParameter> typeParameters)
+		void AppendTypeParameters (StringBuilder result, ImmutableArray<ITypeParameterSymbol> typeParameters)
 		{
 			if (!typeParameters.Any ())
 				return;
@@ -514,7 +569,7 @@ namespace MonoDevelop.CSharp
 			result.Append ("&gt;");
 		}
 
-		void AppendTypeParameters (StringBuilder result, IEnumerable<IType> typeParameters)
+		void AppendTypeParameters (StringBuilder result, ImmutableArray<ITypeSymbol> typeParameters)
 		{
 			if (!typeParameters.Any ())
 				return;
@@ -529,8 +584,8 @@ namespace MonoDevelop.CSharp
 						result.Append (", ");
 					}
 				}
-				if (typeParameter is ITypeParameter)
-					AppendVariance (result, ((ITypeParameter)typeParameter).Variance);
+				if (typeParameter is ITypeParameterSymbol)
+					AppendVariance (result, ((ITypeParameterSymbol)typeParameter).Variance);
 				result.Append (GetTypeReferenceString (typeParameter, false));
 				i++;
 			}
@@ -539,17 +594,17 @@ namespace MonoDevelop.CSharp
 
 		static string FilterEntityName (string name)
 		{
-			return AmbienceService.EscapeText (CSharpAmbience.FilterName (name));
+			return MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (CSharpAmbience.FilterName (name));
 		}
 
-		public string GetDelegateInfo (IType type)
+		public string GetDelegateInfo (ITypeSymbol type)
 		{
 			if (type == null)
-				throw new ArgumentNullException ("returnType");
-			var t = type.GetDefinition ();
+				throw new ArgumentNullException ("type");
+			var t = type;
 
 			var result = new StringBuilder ();
-			
+
 			var method = t.GetDelegateInvokeMethod ();
 			result.Append (GetTypeReferenceString (method.ReturnType));
 			if (BreakLineAfterReturnType) {
@@ -557,99 +612,130 @@ namespace MonoDevelop.CSharp
 			} else {
 				result.Append (" ");
 			}
-			
-			
+
+
 			result.Append (FilterEntityName (t.Name));
-			
+
 			AppendTypeParameters (result, method.TypeParameters);
 
-			if (formattingOptions.SpaceBeforeDelegateDeclarationParentheses)
-				result.Append (" ");
-			
+			// TODO:
+			//			if (document.GetOptionSet ().GetOption (CSharpFormattingOptions.SpaceBeforeDelegateDeclarationParentheses))
+			//				result.Append (" ");
+
 			result.Append ('(');
-			AppendParameterList (result, method.Parameters, formattingOptions.SpaceBeforeDelegateDeclarationParameterComma, formattingOptions.SpaceAfterDelegateDeclarationParameterComma, false);
+			AppendParameterList (
+				result,
+				method.Parameters,
+				false /* formattingOptions.SpaceBeforeDelegateDeclarationParameterComma */,
+				true /* formattingOptions.SpaceAfterDelegateDeclarationParameterComma*/,
+				false
+			);
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		string GetDelegateMarkup (IType delegateType)
+		string GetDelegateMarkup (INamedTypeSymbol delegateType)
 		{
 			var result = new StringBuilder ();
-			
-			var method = delegateType.GetDelegateInvokeMethod ();
+			var type = delegateType.IsUnboundGenericType ? delegateType.OriginalDefinition : delegateType;
+			var method = type.GetDelegateInvokeMethod ();
 
-			if (delegateType.GetDefinition () != null)
-				AppendModifiers (result, delegateType.GetDefinition ());
+			AppendModifiers (result, type);
 			result.Append (Highlight ("delegate ", colorStyle.KeywordDeclaration));
-			result.Append (GetTypeReferenceString (method.ReturnType));
+			if (method != null)
+				result.Append (GetTypeReferenceString (method.ReturnType));
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
 			} else {
 				result.Append (" ");
 			}
-			
-			
-			result.Append (FilterEntityName (delegateType.Name));
 
-			if (delegateType.TypeArguments.Count > 0) {
-				AppendTypeArgumentList (result, delegateType);
+
+			result.Append (FilterEntityName (type.Name));
+
+			if (type.TypeArguments.Length > 0) {
+				AppendTypeArgumentList (result, type);
 			} else {
-				AppendTypeParameterList (result, delegateType.GetDefinition ());
+				AppendTypeParameterList (result, type);
 			}
+			//  TODO
+			//			if (formattingOptions.SpaceBeforeMethodDeclarationParameterComma)
+			//				result.Append (" ");
 
-			if (formattingOptions.SpaceBeforeMethodDeclarationParameterComma)
-				result.Append (" ");
-			
 			result.Append ('(');
-			AppendParameterList (result, method.Parameters, formattingOptions.SpaceBeforeDelegateDeclarationParameterComma, formattingOptions.SpaceAfterDelegateDeclarationParameterComma);
+			AppendParameterList (
+				result,
+				method.Parameters,
+				false /* formattingOptions.SpaceBeforeDelegateDeclarationParameterComma */,
+				false /* formattingOptions.SpaceAfterDelegateDeclarationParameterComma */);
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		public string GetLocalVariableMarkup (IVariable variable)
+		string GetLocalVariableMarkup (ILocalSymbol local)
 		{
-			if (variable == null)
-				throw new ArgumentNullException ("field");
-			
+			if (local == null)
+				throw new ArgumentNullException ("local");
+
 			var result = new StringBuilder ();
 
-			if (variable.IsConst)
+			if (local.IsConst)
 				result.Append (Highlight ("const ", colorStyle.KeywordModifiers));
 
-			result.Append (GetTypeReferenceString (variable.Type));
+			result.Append (GetTypeReferenceString (local.Type));
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
 			} else {
 				result.Append (" ");
 			}
-	
-			result.Append (FilterEntityName (variable.Name));
-			
-			if (variable.IsConst) {
-				if (formattingOptions.SpaceAroundAssignment) {
+
+			result.Append (FilterEntityName (local.Name));
+
+			if (local.IsConst) {
+				if (options.GetOption (CSharpFormattingOptions.SpacingAroundBinaryOperator) == BinaryOperatorSpacingOptions.Single) {
 					result.Append (" = ");
 				} else {
 					result.Append ("=");
 				}
-				AppendConstant (result, variable.Type, variable.ConstantValue);
+				AppendConstant (result, local.Type, local.ConstantValue);
 			}
-			
+
 			return result.ToString ();
 		}
 
+		string GetParameterVariableMarkup (IParameterSymbol parameter)
+		{
+			if (parameter == null)
+				throw new ArgumentNullException ("parameter");
 
-		string GetFieldMarkup (IField field)
+			var result = new StringBuilder ();
+			AppendParameter (result, parameter);
+
+			if (parameter.HasExplicitDefaultValue) {
+				if (options.GetOption (CSharpFormattingOptions.SpacingAroundBinaryOperator) == BinaryOperatorSpacingOptions.Single) {
+					result.Append (" = ");
+				} else {
+					result.Append ("=");
+				}
+				AppendConstant (result, parameter.Type, parameter.ExplicitDefaultValue);
+			}
+
+			return result.ToString ();
+		}
+
+
+		string GetFieldMarkup (IFieldSymbol field)
 		{
 			if (field == null)
 				throw new ArgumentNullException ("field");
 
 			var result = new StringBuilder ();
-			bool isEnum = field.DeclaringTypeDefinition != null && field.DeclaringTypeDefinition.Kind == TypeKind.Enum;
+			bool isEnum = field.ContainingType.TypeKind == TypeKind.Enum;
 			if (!isEnum) {
 				AppendModifiers (result, field);
-				result.Append (GetTypeReferenceString (field.ReturnType));
+				result.Append (GetTypeReferenceString (field.Type));
 			} else {
-				result.Append (GetTypeReferenceString (field.DeclaringType));
+				result.Append (GetTypeReferenceString (field.ContainingType));
 			}
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
@@ -659,34 +745,36 @@ namespace MonoDevelop.CSharp
 
 			result.Append (HighlightSemantically (FilterEntityName (field.Name), colorStyle.UserFieldDeclaration));
 
-			if (field.IsFixed) {
-				if (formattingOptions.SpaceBeforeArrayDeclarationBrackets) {
-					result.Append (" [");
-				} else {
-					result.Append ("[");
-				}
-				if (formattingOptions.SpacesWithinBrackets)
-					result.Append (" ");
-				AppendConstant (result, field.Type, field.ConstantValue);
-				if (formattingOptions.SpacesWithinBrackets)
-					result.Append (" ");
-				result.Append ("]");
-			} else if (field.IsConst) {
-				if (isEnum && !(field.DeclaringTypeDefinition.Attributes.Any (attr => attr.AttributeType.FullName == "System.FlagsAttribute"))) {
+			//			if (field.IsFixed) {
+			//				if (formattingOptions.SpaceBeforeArrayDeclarationBrackets) {
+			//					result.Append (" [");
+			//				} else {
+			//					result.Append ("[");
+			//				}
+			//				if (formattingOptions.SpacesWithinBrackets)
+			//					result.Append (" ");
+			//				AppendConstant (result, field.Type, field.ConstantValue);
+			//				if (formattingOptions.SpacesWithinBrackets)
+			//					result.Append (" ");
+			//				result.Append ("]");
+			//			} else 
+
+			if (field.IsConst) {
+				if (isEnum && !(field.ContainingType.GetAttributes ().Any ((AttributeData attr) => attr.AttributeClass.Name == "FlagsAttribute" && attr.AttributeClass.ContainingNamespace.Name == "System"))) {
 					return result.ToString ();
 				}
-				if (formattingOptions.SpaceAroundAssignment) {
+				if (options.GetOption (CSharpFormattingOptions.SpacingAroundBinaryOperator) == BinaryOperatorSpacingOptions.Single) {
 					result.Append (" = ");
 				} else {
 					result.Append ("=");
 				}
-				AppendConstant (result, field.Type, field.ConstantValue, field.DeclaringType.Kind == TypeKind.Enum);
+				AppendConstant (result, field.Type, field.ConstantValue, isEnum);
 			}
 
 			return result.ToString ();
 		}
 
-		string GetMethodMarkup (IMethod method)
+		string GetMethodMarkup (IMethodSymbol method)
 		{
 			if (method == null)
 				throw new ArgumentNullException ("method");
@@ -700,17 +788,17 @@ namespace MonoDevelop.CSharp
 				result.Append (" ");
 			}
 
-			AppendExplicitInterfaces (result, method);
+			AppendExplicitInterfaces (result, method.ExplicitInterfaceImplementations.Cast<ISymbol> ());
 
-			if (method.SymbolKind == SymbolKind.Operator) {
+			if (method.MethodKind == MethodKind.BuiltinOperator || method.MethodKind == MethodKind.UserDefinedOperator) {
 				result.Append ("operator ");
 				result.Append (CSharpAmbience.GetOperator (method.Name));
 			} else {
 				result.Append (HighlightSemantically (FilterEntityName (method.Name), colorStyle.UserMethodDeclaration));
 			}
-			if (method.TypeArguments.Count > 0) {
+			if (method.TypeArguments.Length > 0) {
 				result.Append ("&lt;");
-				for (int i = 0; i < method.TypeArguments.Count; i++) {
+				for (int i = 0; i < method.TypeArguments.Length; i++) {
 					if (i > 0)
 						result.Append (", ");
 					result.Append (HighlightSemantically (GetTypeReferenceString (method.TypeArguments [i], false), colorStyle.UserTypes));
@@ -719,18 +807,20 @@ namespace MonoDevelop.CSharp
 			} else {
 				AppendTypeParameters (result, method.TypeParameters);
 			}
-
-			if (formattingOptions.SpaceBeforeMethodDeclarationParentheses)
-				result.Append (" ");
+			// TODO!
+			//			if (formattingOptions.SpaceBeforeMethodDeclarationParentheses)
+			//				result.Append (" ");
 
 			result.Append ('(');
-			IList<IParameter> parameters = method.Parameters;
-			AppendParameterList (result, parameters, formattingOptions.SpaceBeforeMethodDeclarationParameterComma, formattingOptions.SpaceAfterMethodDeclarationParameterComma);
+			var parameters = method.Parameters;
+			AppendParameterList (result, parameters,
+				false /* formattingOptions.SpaceBeforeMethodDeclarationParameterComma*/,
+				false /* formattingOptions.SpaceAfterMethodDeclarationParameterComma*/);
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		string GetConstructorMarkup (IMethod method)
+		string GetConstructorMarkup (IMethodSymbol method)
 		{
 			if (method == null)
 				throw new ArgumentNullException ("method");
@@ -739,28 +829,32 @@ namespace MonoDevelop.CSharp
 			var result = new StringBuilder ();
 			AppendModifiers (result, method);
 
-			result.Append (FilterEntityName (method.DeclaringType.Name));
-
-			if (formattingOptions.SpaceBeforeConstructorDeclarationParentheses)
-				result.Append (" ");
+			result.Append (FilterEntityName (method.ContainingType.Name));
+			//
+			//			if (formattingOptions.SpaceBeforeConstructorDeclarationParentheses)
+			//				result.Append (" ");
 
 			result.Append ('(');
-			if (method.DeclaringType.Kind == TypeKind.Delegate) {
+			if (method.ContainingType.TypeKind == TypeKind.Delegate) {
 				result.Append (Highlight ("delegate", colorStyle.KeywordDeclaration) + " (");
-				AppendParameterList (result, method.DeclaringType.GetDelegateInvokeMethod ().Parameters, formattingOptions.SpaceBeforeConstructorDeclarationParameterComma, formattingOptions.SpaceAfterConstructorDeclarationParameterComma);
+				AppendParameterList (result, method.ContainingType.GetDelegateInvokeMethod ().Parameters,
+					false /* formattingOptions.SpaceBeforeConstructorDeclarationParameterComma */,
+					false /* formattingOptions.SpaceAfterConstructorDeclarationParameterComma */);
 				result.Append (")");
 			} else {
-				AppendParameterList (result, method.Parameters, formattingOptions.SpaceBeforeConstructorDeclarationParameterComma, formattingOptions.SpaceAfterConstructorDeclarationParameterComma);
+				AppendParameterList (result, method.Parameters,
+					false /* formattingOptions.SpaceBeforeConstructorDeclarationParameterComma */,
+					false /* formattingOptions.SpaceAfterConstructorDeclarationParameterComma */);
 			}
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		string GetDestructorMarkup (IMethod method)
+		string GetDestructorMarkup (IMethodSymbol method)
 		{
 			if (method == null)
 				throw new ArgumentNullException ("method");
-			
+
 			var result = new StringBuilder ();
 			AppendModifiers (result, method);
 			if (BreakLineAfterReturnType) {
@@ -768,70 +862,77 @@ namespace MonoDevelop.CSharp
 			} else {
 				result.Append (" ");
 			}
-			
+
 			result.Append ("~");
-			result.Append (FilterEntityName (method.DeclaringType.Name));
-			
-			if (formattingOptions.SpaceBeforeConstructorDeclarationParentheses)
-				result.Append (" ");
-			
+			result.Append (FilterEntityName (method.ContainingType.Name));
+
+			//			if (formattingOptions.SpaceBeforeConstructorDeclarationParentheses)
+			//				result.Append (" ");
+
 			result.Append ('(');
-			AppendParameterList (result, method.Parameters, formattingOptions.SpaceBeforeConstructorDeclarationParameterComma, formattingOptions.SpaceAfterConstructorDeclarationParameterComma);
+			AppendParameterList (result, method.Parameters,
+				false /* formattingOptions.SpaceBeforeConstructorDeclarationParameterComma */,
+				false /* formattingOptions.SpaceAfterConstructorDeclarationParameterComma */);
 			result.Append (')');
 			return result.ToString ();
 		}
 
-		bool IsAccessibleOrHasSourceCode (IEntity entity)
+		bool IsAccessibleOrHasSourceCode (ISymbol entity)
 		{
-			if (!entity.Region.Begin.IsEmpty)
+			if (entity.DeclaredAccessibility == Accessibility.Public)
 				return true;
-			var lookup = new MemberLookup (resolver.CurrentTypeDefinition, resolver.Compilation.MainAssembly);
-			return lookup.IsAccessible (entity, false);
+			return entity.IsDefinedInSource ();
+			//			if (!entity.Region.Begin.IsEmpty)
+			//				return true;
+			//			var lookup = new MemberLookup (resolver.CurrentTypeDefinition, resolver.Compilation.MainAssembly);
+			//			return lookup.IsAccessible (entity, false);
 		}
 
-		string GetPropertyMarkup (IProperty property)
+		string GetPropertyMarkup (IPropertySymbol property)
 		{
 			if (property == null)
 				throw new ArgumentNullException ("property");
 			var result = new StringBuilder ();
 			AppendModifiers (result, property);
-			result.Append (GetTypeReferenceString (property.ReturnType));
+			result.Append (GetTypeReferenceString (property.Type));
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
 			} else {
 				result.Append (" ");
 			}
 
-			AppendExplicitInterfaces (result, property);
-			
-			if (property.SymbolKind == SymbolKind.Indexer) {
+			AppendExplicitInterfaces (result, property.ExplicitInterfaceImplementations.Cast<ISymbol> ());
+
+			if (property.IsIndexer) {
 				result.Append (Highlight ("this", colorStyle.KeywordAccessors));
 			} else {
 				result.Append (HighlightSemantically (FilterEntityName (property.Name), colorStyle.UserPropertyDeclaration));
 			}
-			
-			if (property.Parameters.Count > 0) {
-				if (formattingOptions.SpaceBeforeIndexerDeclarationBracket)
-					result.Append (" ");
+
+			if (property.Parameters.Length > 0) {
+				//				if (formattingOptions.SpaceBeforeIndexerDeclarationBracket)
+				//					result.Append (" ");
 				result.Append ("[");
-				AppendParameterList (result, property.Parameters, formattingOptions.SpaceBeforeIndexerDeclarationParameterComma, formattingOptions.SpaceAfterIndexerDeclarationParameterComma);
+				AppendParameterList (result, property.Parameters,
+					false /*formattingOptions.SpaceBeforeIndexerDeclarationParameterComma*/,
+					false /*formattingOptions.SpaceAfterIndexerDeclarationParameterComma*/);
 				result.Append ("]");
 			}
-			
+
 			result.Append (" {");
-			if (property.CanGet && IsAccessibleOrHasSourceCode (property.Getter)) {
-				if (property.Getter.Accessibility != property.Accessibility) {
+			if (property.GetMethod != null && IsAccessibleOrHasSourceCode (property.GetMethod)) {
+				if (property.GetMethod.DeclaredAccessibility != property.DeclaredAccessibility) {
 
 					result.Append (" ");
-					AppendAccessibility (result, property.Getter);
+					AppendAccessibility (result, property.GetMethod);
 				}
 				result.Append (Highlight (" get", colorStyle.KeywordProperty) + ";");
 			}
 
-			if (property.CanSet && IsAccessibleOrHasSourceCode (property.Setter)) {
-				if (property.Setter.Accessibility != property.Accessibility) {
+			if (property.SetMethod != null && IsAccessibleOrHasSourceCode (property.SetMethod)) {
+				if (property.SetMethod.DeclaredAccessibility != property.DeclaredAccessibility) {
 					result.Append (" ");
-					AppendAccessibility (result, property.Setter);
+					AppendAccessibility (result, property.SetMethod);
 				}
 				result.Append (Highlight (" set", colorStyle.KeywordProperty) + ";");
 			}
@@ -840,18 +941,18 @@ namespace MonoDevelop.CSharp
 			return result.ToString ();
 		}
 
-		
-		public TooltipInformation GetExternAliasTooltip (ExternAliasDeclaration externAliasDeclaration, DotNetProject project)
+
+		public TooltipInformation GetExternAliasTooltip (ExternAliasDirectiveSyntax externAliasDeclaration, DotNetProject project)
 		{
 			var result = new TooltipInformation ();
-			result.SignatureMarkup = Highlight ("extern ", colorStyle.KeywordModifiers) + Highlight ("alias ", colorStyle.KeywordNamespace) + externAliasDeclaration.Name;
+			result.SignatureMarkup = Highlight ("extern ", colorStyle.KeywordModifiers) + Highlight ("alias ", colorStyle.KeywordNamespace) + externAliasDeclaration.Identifier;
 			if (project == null)
 				return result;
 			foreach (var r in project.References) {
 				if (string.IsNullOrEmpty (r.Aliases))
 					continue;
 				foreach (var alias in r.Aliases.Split (',', ';')) {
-					if (alias == externAliasDeclaration.Name)
+					if (alias == externAliasDeclaration.Identifier.ToFullString ())
 						result.AddCategory (GettextCatalog.GetString ("Reference"), r.StoredReference);
 				}
 			}
@@ -859,66 +960,61 @@ namespace MonoDevelop.CSharp
 			return result;
 		}
 
-		public TooltipInformation GetKeywordTooltip (AstNode node)
-		{
-			return GetKeywordTooltip (node.ToString (), node);
-		}
-
-		public TooltipInformation GetKeywordTooltip (string keyword, AstNode hintNode)
+		public TooltipInformation GetKeywordTooltip (SyntaxToken node)
 		{
 			var result = new TooltipInformation ();
 
 			var color = AlphaBlend (colorStyle.PlainText.Foreground, colorStyle.PlainText.Background, optionalAlpha);
-			var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);
-			
+			var colorString = MonoDevelop.Components.HelperMethods.GetColorString (color);
+
 			var keywordSign = "<span foreground=\"" + colorString + "\">" + " (keyword)</span>";
 
-			switch (keyword) {
-			case "abstract":
+			switch (node.Kind ()) {
+			case SyntaxKind.AbstractKeyword:
 				result.SignatureMarkup = Highlight ("abstract", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("abstract", colorStyle.KeywordModifiers) + " modifier can be used with classes, methods, properties, indexers, and events.";
 				break;
-			case "add":
+			case SyntaxKind.AddKeyword:
 				result.SignatureMarkup = Highlight ("add", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", "[modifiers] " + Highlight ("add", colorStyle.KeywordContext) + " { accessor-body }");
 				result.SummaryMarkup = "The " + Highlight ("add", colorStyle.KeywordContext) + " keyword is used to define a custom accessor for when an event is subscribed to. If supplied, a remove accessor must also be supplied.";
 				break;
-			case "ascending":
+			case SyntaxKind.AscendingKeyword:
 				result.SignatureMarkup = Highlight ("ascending", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("orderby", colorStyle.KeywordContext) + " ordering-statement " + Highlight ("ascending", colorStyle.KeywordContext));
 				result.SummaryMarkup = "The " + Highlight ("ascending", colorStyle.KeywordContext) + " keyword is used to set the sorting order from smallest to largest in a query expression. This is the default behaviour.";
 				break;
-			case "async":
+			case SyntaxKind.AsyncKeyword:
 				result.SignatureMarkup = Highlight ("async", colorStyle.KeywordContext) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("async", colorStyle.KeywordContext) + " modifier is used to specify that a class method, anonymous method, or lambda expression is asynchronous.";
 				break;
-			case "as":
+			case SyntaxKind.AsKeyword:
 				result.SignatureMarkup = Highlight ("as", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", "expression " + Highlight ("as", colorStyle.KeywordOperators) + " type");
 				result.SummaryMarkup = "The " + Highlight ("as", colorStyle.KeywordOperators) + " operator is used to perform conversions between compatible types. ";
 				break;
-			case "await":
+			case SyntaxKind.AwaitKeyword:
 				result.SignatureMarkup = Highlight ("await", colorStyle.KeywordContext) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("await", colorStyle.KeywordContext) + " operator is used to specify that an " + Highlight ("async", colorStyle.KeywordContext) + " method is to have its execution suspended until the " + Highlight ("await", colorStyle.KeywordContext) +
 				" task has completed.";
 				break;
-			case "base":
+			case SyntaxKind.BaseKeyword:
 				result.SignatureMarkup = Highlight ("base", colorStyle.KeywordAccessors) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("base", colorStyle.KeywordAccessors) + " keyword is used to access members of the base class from within a derived class.";
 				break;
-			case "break":
+			case SyntaxKind.BreakKeyword:
 				result.SignatureMarkup = Highlight ("break", colorStyle.KeywordJump) + keywordSign;
 				result.AddCategory ("Form", Highlight ("break", colorStyle.KeywordJump) + ";");
 				result.SummaryMarkup = "The " + Highlight ("break", colorStyle.KeywordJump) + " statement terminates the closest enclosing loop or switch statement in which it appears.";
 				break;
-			case "case":
+			case SyntaxKind.CaseKeyword:
 				result.SignatureMarkup = Highlight ("case", colorStyle.KeywordSelection) + keywordSign;
 				result.AddCategory ("Form", Highlight ("case", colorStyle.KeywordSelection) + " constant-expression:" + Environment.NewLine +
 				"  statement" + Environment.NewLine +
 				"  jump-statement");
 				result.SummaryMarkup = "";
 				break;
-			case "catch":
+			case SyntaxKind.CatchKeyword:
 				result.SignatureMarkup = Highlight ("catch", colorStyle.KeywordException) + keywordSign;
 				result.AddCategory ("Form", Highlight ("try", colorStyle.KeywordException) + " try-block" + Environment.NewLine +
 				"  " + Highlight ("catch", colorStyle.KeywordException) + " (exception-declaration-1) catch-block-1" + Environment.NewLine +
@@ -927,37 +1023,41 @@ namespace MonoDevelop.CSharp
 				Highlight ("try", colorStyle.KeywordException) + " try-block " + Highlight ("catch", colorStyle.KeywordException) + " catch-block");
 				result.SummaryMarkup = "";
 				break;
-			case "checked":
+			case SyntaxKind.CheckedKeyword:
 				result.SignatureMarkup = Highlight ("checked", colorStyle.KeywordOther) + keywordSign;
 				result.AddCategory ("Form", Highlight ("checked", colorStyle.KeywordOther) + " block" + Environment.NewLine +
 				"or" + Environment.NewLine +
 				Highlight ("checked", colorStyle.KeywordOther) + " (expression)");
 				result.SummaryMarkup = "The " + Highlight ("checked", colorStyle.KeywordOther) + " keyword is used to control the overflow-checking context for integral-type arithmetic operations and conversions. It can be used as an operator or a statement.";
 				break;
-			case "class":
+			case SyntaxKind.ClassKeyword:
 				result.SignatureMarkup = Highlight ("class", colorStyle.KeywordDeclaration) + keywordSign;
-				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("class", colorStyle.KeywordDeclaration) + " identifier [:base-list] { class-body }[;]");
-				result.SummaryMarkup = "Classes are declared using the keyword " + Highlight ("class", colorStyle.KeywordDeclaration) + ".";
+				if (node.Parent != null && node.Parent.IsKind (SyntaxKind.ConstructorConstraint)) {
+					result.SummaryMarkup = "The " + Highlight ("class", colorStyle.KeywordDeclaration) + " constraint specifies that the type argument must be a reference type; this applies also to any class, interface, delegate, or array type.";
+				} else {
+					result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("class", colorStyle.KeywordDeclaration) + " identifier [:base-list] { class-body }[;]");
+					result.SummaryMarkup = "Classes are declared using the keyword " + Highlight ("class", colorStyle.KeywordDeclaration) + ".";
+				}
 				break;
-			case "const":
+			case SyntaxKind.ConstKeyword:
 				result.SignatureMarkup = Highlight ("const", colorStyle.KeywordModifiers) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("const", colorStyle.KeywordModifiers) + " type declarators;");
 				result.SummaryMarkup = "The " + Highlight ("const", colorStyle.KeywordModifiers) + " keyword is used to modify a declaration of a field or local variable. It specifies that the value of the field or the local variable cannot be modified. ";
 				break;
-			case "continue":
+			case SyntaxKind.ContinueKeyword:
 				result.SignatureMarkup = Highlight ("continue", colorStyle.KeywordJump) + keywordSign;
 				result.AddCategory ("Form", Highlight ("continue", colorStyle.KeywordJump) + ";");
 				result.SummaryMarkup = "The " + Highlight ("continue", colorStyle.KeywordJump) + " statement passes control to the next iteration of the enclosing iteration statement in which it appears.";
 				break;
-			case "default":
+			case SyntaxKind.DefaultKeyword:
 				result.SignatureMarkup = Highlight ("default", colorStyle.KeywordSelection) + keywordSign;
 				result.SummaryMarkup = "";
-				if (hintNode != null) {
-					if (hintNode.Parent is DefaultValueExpression) {
+				if (node.Parent != null) {
+					if (node.Parent is DefaultExpressionSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("default", colorStyle.KeywordSelection) + " (Type)");
 						break;
-					} else if (hintNode.Parent is CaseLabel) {
+					} else if (node.Parent is SwitchStatementSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("switch", colorStyle.KeywordSelection) + " (expression) { " + Environment.NewLine +
 							"  " + Highlight ("case", colorStyle.KeywordSelection) + " constant-expression:" + Environment.NewLine +
@@ -972,36 +1072,43 @@ namespace MonoDevelop.CSharp
 				}
 				result.AddCategory ("Form",
 					Highlight ("default", colorStyle.KeywordSelection) + " (Type)" + Environment.NewLine + Environment.NewLine +
-						"or" + Environment.NewLine + Environment.NewLine +
+					"or" + Environment.NewLine + Environment.NewLine +
 					Highlight ("switch", colorStyle.KeywordSelection) + " (expression) { " + Environment.NewLine +
-						"  " + Highlight ("case", colorStyle.KeywordSelection) + " constant-expression:" + Environment.NewLine +
-						"    statement" + Environment.NewLine +
-						"    jump-statement" + Environment.NewLine +
-						"  [" + Highlight ("default", colorStyle.KeywordSelection) + ":" + Environment.NewLine +
-						"    statement" + Environment.NewLine +
-						"    jump-statement]" + Environment.NewLine +
-						"}");
-				break;
-			case "delegate":
+					"  " + Highlight ("case", colorStyle.KeywordSelection) + " constant-expression:" + Environment.NewLine +
+					"    statement" + Environment.NewLine +
+					"    jump-statement" + Environment.NewLine +
+					"  [" + Highlight ("default", colorStyle.KeywordSelection) + ":" + Environment.NewLine +
+					"    statement" + Environment.NewLine +
+					"    jump-statement]" + Environment.NewLine +
+					"}");
+				break;
+			case SyntaxKind.DelegateKeyword:
 				result.SignatureMarkup = Highlight ("delegate", colorStyle.KeywordDeclaration) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("delegate", colorStyle.KeywordDeclaration) + " result-type identifier ([formal-parameters]);");
 				result.SummaryMarkup = "A " + Highlight ("delegate", colorStyle.KeywordDeclaration) + " declaration defines a reference type that can be used to encapsulate a method with a specific signature.";
 				break;
-			case "dynamic":
-				result.SignatureMarkup = Highlight ("dynamic", colorStyle.KeywordContext) + keywordSign;
-				result.SummaryMarkup = "The " + Highlight ("dynamic", colorStyle.KeywordContext) + " type allows for an object to bypass compile-time type checking and resolve type checking during run-time.";
+			case SyntaxKind.IdentifierToken:
+				if (node.ToFullString () == "nameof" && node.Parent?.Parent?.Kind () == SyntaxKind.InvocationExpression)
+					goto case SyntaxKind.NameOfKeyword;
+
+				if (node.ToFullString () == "dynamic") {
+					result.SignatureMarkup = Highlight ("dynamic", colorStyle.KeywordContext) + keywordSign;
+					result.SummaryMarkup = "The " + Highlight ("dynamic", colorStyle.KeywordContext) + " type allows for an object to bypass compile-time type checking and resolve type checking during run-time.";
+				} else {
+					return null;
+				}
 				break;
-			case "descending":
+			case SyntaxKind.DescendingKeyword:
 				result.SignatureMarkup = Highlight ("descending", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("orderby", colorStyle.KeywordContext) + " ordering-statement " + Highlight ("descending", colorStyle.KeywordContext));
 				result.SummaryMarkup = "The " + Highlight ("descending", colorStyle.KeywordContext) + " keyword is used to set the sorting order from largest to smallest in a query expression.";
 				break;
-			case "do":
+			case SyntaxKind.DoKeyword:
 				result.SignatureMarkup = Highlight ("do", colorStyle.KeywordIteration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("do", colorStyle.KeywordIteration) + " statement " + Highlight ("while", colorStyle.KeywordIteration) + " (expression);");
 				result.SummaryMarkup = "The " + Highlight ("do", colorStyle.KeywordIteration) + " statement executes a statement or a block of statements repeatedly until a specified expression evaluates to false.";
 				break;
-			case "else":
+			case SyntaxKind.ElseKeyword:
 				result.SignatureMarkup = Highlight ("else", colorStyle.KeywordSelection) + keywordSign;
 				result.AddCategory ("Form", Highlight ("if", colorStyle.KeywordSelection) + " (expression)" + Environment.NewLine +
 					"  statement1" + Environment.NewLine +
@@ -1009,69 +1116,69 @@ namespace MonoDevelop.CSharp
 					"  statement2]");
 				result.SummaryMarkup = "";
 				break;
-			case "enum":
+			case SyntaxKind.EnumKeyword:
 				result.SignatureMarkup = Highlight ("enum", colorStyle.KeywordDeclaration) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("enum", colorStyle.KeywordDeclaration) + " identifier [:base-type] {enumerator-list} [;]");
 				result.SummaryMarkup = "The " + Highlight ("enum", colorStyle.KeywordDeclaration) + " keyword is used to declare an enumeration, a distinct type consisting of a set of named constants called the enumerator list.";
 				break;
-			case "event":
+			case SyntaxKind.EventKeyword:
 				result.SignatureMarkup = Highlight ("event", colorStyle.KeywordModifiers) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("event", colorStyle.KeywordModifiers) + " type declarator;" + Environment.NewLine +
 					"[attributes] [modifiers] " + Highlight ("event", colorStyle.KeywordModifiers) + " type member-name {accessor-declarations};");
 				result.SummaryMarkup = "Specifies an event.";
 				break;
-			case "explicit":
+			case SyntaxKind.ExplicitKeyword:
 				result.SignatureMarkup = Highlight ("explicit", colorStyle.KeywordOperatorDeclaration) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("explicit", colorStyle.KeywordOperatorDeclaration) + " keyword is used to declare an explicit user-defined type conversion operator.";
 				break;
-			case "extern":
+			case SyntaxKind.ExternKeyword:
 				result.SignatureMarkup = Highlight ("extern", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "Use the " + Highlight ("extern", colorStyle.KeywordModifiers) + " modifier in a method declaration to indicate that the method is implemented externally. A common use of the extern modifier is with the DllImport attribute.";
 				break;
-			case "finally":
+			case SyntaxKind.FinallyKeyword:
 				result.SignatureMarkup = Highlight ("finally", colorStyle.KeywordException) + keywordSign;
 				result.AddCategory ("Form", Highlight ("try", colorStyle.KeywordException) + " try-block " + Highlight ("finally", colorStyle.KeywordException) + " finally-block");
 				result.SummaryMarkup = "The " + Highlight ("finally", colorStyle.KeywordException) + " block is useful for cleaning up any resources allocated in the try block. Control is always passed to the finally block regardless of how the try block exits.";
 				break;
-			case "fixed":
+			case SyntaxKind.FixedKeyword:
 				result.SignatureMarkup = Highlight ("fixed", colorStyle.KeywordOther) + keywordSign;
 				result.AddCategory ("Form", Highlight ("fixed", colorStyle.KeywordOther) + " ( type* ptr = expr ) statement");
 				result.SummaryMarkup = "Prevents relocation of a variable by the garbage collector.";
 				break;
-			case "for":
+			case SyntaxKind.ForKeyword:
 				result.SignatureMarkup = Highlight ("for", colorStyle.KeywordIteration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("for", colorStyle.KeywordIteration) + " ([initializers]; [expression]; [iterators]) statement");
 				result.SummaryMarkup = "The " + Highlight ("for", colorStyle.KeywordIteration) + " loop executes a statement or a block of statements repeatedly until a specified expression evaluates to false.";
 				break;
-			case "foreach":
+			case SyntaxKind.ForEachKeyword:
 				result.SignatureMarkup = Highlight ("foreach", colorStyle.KeywordIteration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("foreach", colorStyle.KeywordIteration) + " (type identifier " + Highlight ("in", colorStyle.KeywordIteration) + " expression) statement");
 				result.SummaryMarkup = "The " + Highlight ("foreach", colorStyle.KeywordIteration) + " statement repeats a group of embedded statements for each element in an array or an object collection. ";
 				break;
-			case "from":
+			case SyntaxKind.FromKeyword:
 				result.SignatureMarkup = Highlight ("from", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", Highlight ("from", colorStyle.KeywordContext) + " range-variable " + Highlight ("in", colorStyle.KeywordIteration)
 				+ " data-source [query clauses] " + Highlight ("select", colorStyle.KeywordContext) + " product-expression");
 				result.SummaryMarkup = "The " + Highlight ("from", colorStyle.KeywordContext) + " keyword marks the beginning of a query expression and defines the data source and local variable to represent the elements in the sequence.";
 				break;
-			case "get":
+			case SyntaxKind.GetKeyword:
 				result.SignatureMarkup = Highlight ("get", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", "[modifiers] " + Highlight ("get", colorStyle.KeywordContext) + " [ { accessor-body } ]");
 				result.SummaryMarkup = "The " + Highlight ("get", colorStyle.KeywordContext) + " keyword is used to define an accessor method to retrieve the value of the property or indexer element.";
 				break;
-			case "global":
+			case SyntaxKind.GlobalKeyword:
 				result.SignatureMarkup = Highlight ("global", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", Highlight ("global", colorStyle.KeywordContext) + " :: type");
 				result.SummaryMarkup = "The " + Highlight ("global", colorStyle.KeywordContext) + " keyword is used to specify a type is within the global namespace.";
 				break;
-			case "goto":
+			case SyntaxKind.GotoKeyword:
 				result.SignatureMarkup = Highlight ("goto", colorStyle.KeywordJump) + keywordSign;
 				result.AddCategory ("Form", Highlight ("goto", colorStyle.KeywordJump) + " identifier;" + Environment.NewLine +
 				Highlight ("goto", colorStyle.KeywordJump) + " " + Highlight ("case", colorStyle.KeywordSelection) + " constant-expression;" + Environment.NewLine +
 				Highlight ("goto", colorStyle.KeywordJump) + " " + Highlight ("default", colorStyle.KeywordSelection) + ";");
 				result.SummaryMarkup = "The " + Highlight ("goto", colorStyle.KeywordJump) + " statement transfers the program control directly to a labeled statement. ";
 				break;
-			case "group":
+			case SyntaxKind.GroupKeyword:
 				result.SignatureMarkup = Highlight ("group", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("group", colorStyle.KeywordContext) + " range-variable " + Highlight ("by", colorStyle.KeywordContext) + "key-value"
 					+ Environment.NewLine + Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine +
@@ -1079,7 +1186,7 @@ namespace MonoDevelop.CSharp
 				result.SummaryMarkup = "The " + Highlight ("group", colorStyle.KeywordContext) + " keyword groups elements together from a query which match the key value and stores the result in an "
 					+ Highlight ("IGrouping&lt;TKey, TElement&gt;", colorStyle.KeywordTypes) + ". It can also be stored in a group for further use in the query with 'into'.";
 				break;
-			case "if":
+			case SyntaxKind.IfKeyword:
 				result.SignatureMarkup = Highlight ("if", colorStyle.KeywordSelection) + keywordSign;
 				result.AddCategory ("Form", Highlight ("if", colorStyle.KeywordSelection) + " (expression)" + Environment.NewLine +
 					"  statement1" + Environment.NewLine +
@@ -1087,29 +1194,29 @@ namespace MonoDevelop.CSharp
 					"  statement2]");
 				result.SummaryMarkup = "The " + Highlight ("if", colorStyle.KeywordSelection) + " statement selects a statement for execution based on the value of a Boolean expression. ";
 				break;
-			case "into":
+			case SyntaxKind.IntoKeyword:
 				result.SignatureMarkup = Highlight ("into", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("group", colorStyle.KeywordContext) + " range-variable " + Highlight ("by", colorStyle.KeywordContext) + " key-value " + Highlight ("into", colorStyle.KeywordContext) + " group-name ");
 				result.SummaryMarkup = "The " + Highlight ("into", colorStyle.KeywordContext) + " keyword stores the result of a group statement for further use in the query.";
 				break;
-			case "implicit":
+			case SyntaxKind.ImplicitKeyword:
 				result.SignatureMarkup = Highlight ("implicit", colorStyle.KeywordOperatorDeclaration) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("implicit", colorStyle.KeywordOperatorDeclaration) + " keyword is used to declare an implicit user-defined type conversion operator.";
 				break;
-			case "in":
+			case SyntaxKind.InKeyword:
 				result.SignatureMarkup = Highlight ("in", colorStyle.KeywordIteration) + keywordSign;
-				if (hintNode != null) {
-					if (hintNode.Parent is ForeachStatement) {
+				if (node.Parent != null) {
+					if (node.Parent is ForEachStatementSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("foreach", colorStyle.KeywordIteration) + " (type identifier " + Highlight ("in", colorStyle.KeywordIteration) + " expression) statement");
 						break;
 					}
-					if (hintNode.Parent is QueryFromClause) {
+					if (node.Parent is FromClauseSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("from", colorStyle.KeywordContext) + " range-variable " + Highlight ("in", colorStyle.KeywordIteration) + " data-source [query clauses] " + Highlight ("select", colorStyle.KeywordContext) + " product-expression");
 						break;
 					}
-					if (hintNode.Parent is TypeParameterDeclaration) {
+					if (node.Parent is TypeParameterConstraintClauseSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("interface", colorStyle.KeywordDeclaration) + " IMyInterface&lt;" + Highlight ("in", colorStyle.KeywordIteration) + " T&gt; {}");
 						break;
@@ -1122,52 +1229,56 @@ namespace MonoDevelop.CSharp
 				Highlight ("interface", colorStyle.KeywordDeclaration) + " IMyInterface&lt;" + Highlight ("in", colorStyle.KeywordIteration) + " T&gt; {}"
 				);
 				break;
-			case "interface":
+			case SyntaxKind.InterfaceKeyword:
 				result.SignatureMarkup = Highlight ("interface", colorStyle.KeywordDeclaration) + keywordSign;
 				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("interface", colorStyle.KeywordDeclaration) + " identifier [:base-list] {interface-body}[;]");
 				result.SummaryMarkup = "An interface defines a contract. A class or struct that implements an interface must adhere to its contract.";
 				break;
-			case "internal":
+			case SyntaxKind.InternalKeyword:
 				result.SignatureMarkup = Highlight ("internal", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("internal", colorStyle.KeywordModifiers) + " keyword is an access modifier for types and type members. Internal members are accessible only within files in the same assembly.";
 				break;
-			case "is":
+			case SyntaxKind.IsKeyword:
 				result.SignatureMarkup = Highlight ("is", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", "expression " + Highlight ("is", colorStyle.KeywordOperators) + " type");
 				result.SummaryMarkup = "The " + Highlight ("is", colorStyle.KeywordOperators) + " operator is used to check whether the run-time type of an object is compatible with a given type.";
 				break;
-			case "join":
+			case SyntaxKind.JoinKeyword:
 				result.SignatureMarkup = Highlight ("join", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("join", colorStyle.KeywordContext) + " range-variable2 " + Highlight ("in", colorStyle.KeywordContext) + " range2 " + Highlight ("on", colorStyle.KeywordContext)
 					+ " statement1 " + Highlight ("equals", colorStyle.KeywordContext) + " statement2 [ " + Highlight ("into", colorStyle.KeywordContext) + " group-name ]");
 				result.SummaryMarkup = "The " + Highlight ("join", colorStyle.KeywordContext) + " clause produces a new sequence of elements from two source sequences on a given equality condition.";
 				break;
-			case "let":
+			case SyntaxKind.LetKeyword:
 				result.SignatureMarkup = Highlight ("let", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("let", colorStyle.KeywordContext) + " range-variable = expression");
 				result.SummaryMarkup = "The " + Highlight ("let", colorStyle.KeywordContext) + " clause allows for a sub-expression to have its value stored in a new range variable for use later in the query.";
 				break;
-			case "lock":
+			case SyntaxKind.LockKeyword:
 				result.SignatureMarkup = Highlight ("lock", colorStyle.KeywordOther) + keywordSign;
 				result.AddCategory ("Form", Highlight ("lock", colorStyle.KeywordOther) + " (expression) statement_block");
 				result.SummaryMarkup = "The " + Highlight ("lock", colorStyle.KeywordOther) + " keyword marks a statement block as a critical section by obtaining the mutual-exclusion lock for a given object, executing a statement, and then releasing the lock. ";
 				break;
-			case "namespace":
+			case SyntaxKind.NamespaceKeyword:
 				result.SignatureMarkup = Highlight ("namespace", colorStyle.KeywordNamespace) + keywordSign;
 				result.AddCategory ("Form", Highlight ("namespace", colorStyle.KeywordNamespace) + " name[.name1] ...] {" + Environment.NewLine +
 					"type-declarations" + Environment.NewLine +
 					" }");
 				result.SummaryMarkup = "The " + Highlight ("namespace", colorStyle.KeywordNamespace) + " keyword is used to declare a scope. ";
 				break;
-			case "new":
+			case SyntaxKind.NewKeyword:
 				result.SignatureMarkup = Highlight ("new", colorStyle.KeywordOperators) + keywordSign;
-				result.SummaryMarkup = "The " + Highlight ("new", colorStyle.KeywordOperators) + " keyword can be used as an operator or as a modifier. The operator is used to create objects on the heap and invoke constructors. The modifier is used to hide an inherited member from a base class member.";
+				if (node.Parent != null && node.Parent.IsKind (SyntaxKind.ConstructorConstraint)) {
+					result.SummaryMarkup = "The " + Highlight ("new", colorStyle.KeywordOperators) + " constraint specifies that any type argument in a generic class declaration must have a public parameterless constructor. To use the new constraint, the type cannot be abstract.";
+				} else {
+					result.SummaryMarkup = "The " + Highlight ("new", colorStyle.KeywordOperators) + " keyword can be used as an operator or as a modifier. The operator is used to create objects on the heap and invoke constructors. The modifier is used to hide an inherited member from a base class member.";
+				}
 				break;
-			case "null":
+			case SyntaxKind.NullKeyword:
 				result.SignatureMarkup = Highlight ("null", colorStyle.KeywordConstants) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("null", colorStyle.KeywordConstants) + " keyword is a literal that represents a null reference, one that does not refer to any object. " + Highlight ("null", colorStyle.KeywordConstants) + " is the default value of reference-type variables.";
 				break;
-			case "operator":
+			case SyntaxKind.OperatorKeyword:
 				result.SignatureMarkup = Highlight ("operator", colorStyle.KeywordOperatorDeclaration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("public static ", colorStyle.KeywordModifiers) + "result-type " + Highlight ("operator", colorStyle.KeywordOperatorDeclaration) + " unary-operator ( op-type operand )" + Environment.NewLine +
 				Highlight ("public static ", colorStyle.KeywordModifiers) + "result-type " + Highlight ("operator", colorStyle.KeywordOperatorDeclaration) + " binary-operator (" + Environment.NewLine +
@@ -1179,20 +1290,20 @@ namespace MonoDevelop.CSharp
 				);
 				result.SummaryMarkup = "The " + Highlight ("operator", colorStyle.KeywordOperatorDeclaration) + " keyword is used to declare an operator in a class or struct declaration.";
 				break;
-			case "orderby":
+			case SyntaxKind.OrderByKeyword:
 				result.SignatureMarkup = Highlight ("orderby", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("orderby", colorStyle.KeywordContext) + " order-key1 [ " + Highlight ("ascending", colorStyle.KeywordContext) + "|" + Highlight ("descending", colorStyle.KeywordContext) + " , [order-key2, ...]");
 				result.SummaryMarkup = "The " + Highlight ("orderby", colorStyle.KeywordContext) + " clause specifies for the returned sequence to be sorted on a given element in either ascending or descending order.";
 				break;
-			case "out":
+			case SyntaxKind.OutKeyword:
 				result.SignatureMarkup = Highlight ("out", colorStyle.KeywordParameter) + keywordSign;
-				if (hintNode != null) {
-					if (hintNode.Parent is TypeParameterDeclaration) {
+				if (node.Parent != null) {
+					if (node.Parent is TypeParameterSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("interface", colorStyle.KeywordDeclaration) + " IMyInterface&lt;" + Highlight ("out", colorStyle.KeywordParameter) + " T&gt; {}");
 						break;
 					}
-					if (hintNode.Parent is ParameterDeclaration) {
+					if (node.Parent is ParameterSyntax) {
 						result.AddCategory ("Form",
 							Highlight ("out", colorStyle.KeywordParameter) + " parameter-name");
 						result.SummaryMarkup = "The " + Highlight ("out", colorStyle.KeywordParameter) + " method parameter keyword on a method parameter causes a method to refer to the same variable that was passed into the method.";
@@ -1200,28 +1311,28 @@ namespace MonoDevelop.CSharp
 					}
 				}
 
-				result.AddCategory ("Form", 
+				result.AddCategory ("Form",
 					Highlight ("out", colorStyle.KeywordParameter) + " parameter-name" + Environment.NewLine + Environment.NewLine +
 					"or" + Environment.NewLine + Environment.NewLine +
 					Highlight ("interface", colorStyle.KeywordDeclaration) + " IMyInterface&lt;" + Highlight ("out", colorStyle.KeywordParameter) + " T&gt; {}"
 				);
 				break;
-			case "override":
+			case SyntaxKind.OverrideKeyword:
 				result.SignatureMarkup = Highlight ("override", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("override", colorStyle.KeywordModifiers) + " modifier is used to override a method, a property, an indexer, or an event.";
 				break;
-			case "params":
+			case SyntaxKind.ParamKeyword:
 				result.SignatureMarkup = Highlight ("params", colorStyle.KeywordParameter) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("params", colorStyle.KeywordParameter) + " keyword lets you specify a method parameter that takes an argument where the number of arguments is variable.";
 				break;
-			case "partial":
+			case SyntaxKind.PartialKeyword:
 				result.SignatureMarkup = Highlight ("partial", colorStyle.KeywordContext) + keywordSign;
-				if (hintNode != null) {
-					if (hintNode.Parent is TypeDeclaration) {
+				if (node.Parent != null) {
+					if (node.Parent is TypeDeclarationSyntax) {
 						result.AddCategory ("Form", "[modifiers] " + Highlight ("partial", colorStyle.KeywordContext) + " type-declaration");
 						result.SummaryMarkup = "The " + Highlight ("partial", colorStyle.KeywordContext) + " keyword on a type declaration allows for the definition to be split into multiple files.";
 						break;
-					} else if (hintNode.Parent is MethodDeclaration) {
+					} else if (node.Parent is MethodDeclarationSyntax) {
 						result.AddCategory ("Form", Highlight ("partial", colorStyle.KeywordContext) + " method-declaration");
 						result.SummaryMarkup = "The " + Highlight ("partial", colorStyle.KeywordContext) + " keyword on a method declaration allows for the implementation of a method to be defined in another part of the partial class.";
 					}
@@ -1229,70 +1340,74 @@ namespace MonoDevelop.CSharp
 					result.AddCategory ("Form", "[modifiers] " + Highlight ("partial", colorStyle.KeywordContext) + " type-declaration" + Environment.NewLine + Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine +
 					Highlight ("partial", colorStyle.KeywordContext) + " method-declaration");
 				break;
-			case "private":
+			case SyntaxKind.PrivateKeyword:
 				result.SignatureMarkup = Highlight ("private", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("private", colorStyle.KeywordModifiers) + " keyword is a member access modifier. Private access is the least permissive access level. Private members are accessible only within the body of the class or the struct in which they are declared.";
 				break;
-			case "protected":
+			case SyntaxKind.ProtectedKeyword:
 				result.SignatureMarkup = Highlight ("protected", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("protected", colorStyle.KeywordModifiers) + " keyword is a member access modifier. A protected member is accessible from within the class in which it is declared, and from within any class derived from the class that declared this member.";
 				break;
-			case "public":
+			case SyntaxKind.PublicKeyword:
 				result.SignatureMarkup = Highlight ("public", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("public", colorStyle.KeywordModifiers) + " keyword is an access modifier for types and type members. Public access is the most permissive access level. There are no restrictions on accessing public members.";
 				break;
-			case "readonly":
+			case SyntaxKind.ReadOnlyKeyword:
 				result.SignatureMarkup = Highlight ("readonly", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("readonly", colorStyle.KeywordModifiers) + " keyword is a modifier that you can use on fields. When a field declaration includes a " + Highlight ("readonly", colorStyle.KeywordModifiers) + " modifier, assignments to the fields introduced by the declaration can only occur as part of the declaration or in a constructor in the same class.";
 				break;
-			case "ref":
+			case SyntaxKind.RefKeyword:
 				result.SignatureMarkup = Highlight ("ref", colorStyle.KeywordParameter) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("ref", colorStyle.KeywordParameter) + " method parameter keyword on a method parameter causes a method to refer to the same variable that was passed into the method.";
 				break;
-			case "remove":
+			case SyntaxKind.RemoveKeyword:
 				result.SignatureMarkup = Highlight ("remove", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", "[modifiers] " + Highlight ("remove", colorStyle.KeywordContext) + " { accessor-body }");
 				result.SummaryMarkup = "The " + Highlight ("remove", colorStyle.KeywordContext) + " keyword is used to define a custom accessor for when an event is unsubscribed from. If supplied, an add accessor must also be supplied.";
 				break;
-			case "return":
+			case SyntaxKind.ReturnKeyword:
 				result.SignatureMarkup = Highlight ("return", colorStyle.KeywordJump) + keywordSign;
 				result.AddCategory ("Form", Highlight ("return", colorStyle.KeywordJump) + " [expression];");
 				result.SummaryMarkup = "The " + Highlight ("return", colorStyle.KeywordJump) + " statement terminates execution of the method in which it appears and returns control to the calling method.";
 				break;
-			case "select":
+			case SyntaxKind.SelectKeyword:
 				result.SignatureMarkup = Highlight ("select", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Query Form", Highlight ("select", colorStyle.KeywordContext) + " return-type");
 				result.SummaryMarkup = "The " + Highlight ("select", colorStyle.KeywordContext) + " clause specifies the type of value to return from the query.";
 				break;
-			case "sealed":
+			case SyntaxKind.SealedKeyword:
 				result.SignatureMarkup = Highlight ("sealed", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "A sealed class cannot be inherited.";
 				break;
-			case "set":
+			case SyntaxKind.SetKeyword:
 				result.SignatureMarkup = Highlight ("set", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", "[modifiers] " + Highlight ("set", colorStyle.KeywordContext) + " [ { accessor-body } ]");
 				result.SummaryMarkup = "The " + Highlight ("set", colorStyle.KeywordContext) + " keyword is used to define an accessor method to assign to the value of the property or indexer element.";
 				break;
-			case "sizeof":
+			case SyntaxKind.SizeOfKeyword:
 				result.SignatureMarkup = Highlight ("sizeof", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", Highlight ("sizeof", colorStyle.KeywordOperators) + " (type)");
 				result.SummaryMarkup = "The " + Highlight ("sizeof", colorStyle.KeywordOperators) + " operator is used to obtain the size in bytes for a value type.";
 				break;
-			case "stackalloc":
+			case SyntaxKind.StackAllocKeyword:
 				result.SignatureMarkup = Highlight ("stackalloc", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", "type * ptr = " + Highlight ("stackalloc", colorStyle.KeywordOperators) + " type [ expr ];");
 				result.SummaryMarkup = "Allocates a block of memory on the stack.";
 				break;
-			case "static":
+			case SyntaxKind.StaticKeyword:
 				result.SignatureMarkup = Highlight ("static", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "Use the " + Highlight ("static", colorStyle.KeywordModifiers) + " modifier to declare a static member, which belongs to the type itself rather than to a specific object.";
 				break;
-			case "struct":
+			case SyntaxKind.StructKeyword:
 				result.SignatureMarkup = Highlight ("struct", colorStyle.KeywordDeclaration) + keywordSign;
-				result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("struct", colorStyle.KeywordDeclaration) + " identifier [:interfaces] body [;]");
-				result.SummaryMarkup = "A " + Highlight ("struct", colorStyle.KeywordDeclaration) + " type is a value type that can contain constructors, constants, fields, methods, properties, indexers, operators, events, and nested types. ";
+				if (node.Parent != null && node.Parent.IsKind (SyntaxKind.ConstructorConstraint)) {
+					result.SummaryMarkup = "The " + Highlight ("struct", colorStyle.KeywordDeclaration) + " constraint specifies that the type argument must be a value type. Any value type except Nullable can be specified.";
+				} else {
+					result.AddCategory ("Form", "[attributes] [modifiers] " + Highlight ("struct", colorStyle.KeywordDeclaration) + " identifier [:interfaces] body [;]");
+					result.SummaryMarkup = "A " + Highlight ("struct", colorStyle.KeywordDeclaration) + " type is a value type that can contain constructors, constants, fields, methods, properties, indexers, operators, events, and nested types. ";
+				}
 				break;
-			case "switch":
+			case SyntaxKind.SwitchKeyword:
 				result.SignatureMarkup = Highlight ("switch", colorStyle.KeywordSelection) + keywordSign;
 				result.AddCategory ("Form", Highlight ("switch", colorStyle.KeywordSelection) + " (expression)" + Environment.NewLine +
 					" {" + Environment.NewLine +
@@ -1305,16 +1420,16 @@ namespace MonoDevelop.CSharp
 					" }");
 				result.SummaryMarkup = "The " + Highlight ("switch", colorStyle.KeywordSelection) + " statement is a control statement that handles multiple selections by passing control to one of the " + Highlight ("case", colorStyle.KeywordSelection) + " statements within its body.";
 				break;
-			case "this":
+			case SyntaxKind.ThisKeyword:
 				result.SignatureMarkup = Highlight ("this", colorStyle.KeywordAccessors) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("this", colorStyle.KeywordAccessors) + " keyword refers to the current instance of the class.";
 				break;
-			case "throw":
+			case SyntaxKind.ThrowKeyword:
 				result.SignatureMarkup = Highlight ("throw", colorStyle.KeywordException) + keywordSign;
 				result.AddCategory ("Form", Highlight ("throw", colorStyle.KeywordException) + " [expression];");
 				result.SummaryMarkup = "The " + Highlight ("throw", colorStyle.KeywordException) + " statement is used to signal the occurrence of an anomalous situation (exception) during the program execution.";
 				break;
-			case "try":
+			case SyntaxKind.TryKeyword:
 				result.SignatureMarkup = Highlight ("try", colorStyle.KeywordException) + keywordSign;
 				result.AddCategory ("Form", Highlight ("try", colorStyle.KeywordException) + " try-block" + Environment.NewLine +
 					"  " + Highlight ("catch", colorStyle.KeywordException) + " (exception-declaration-1) catch-block-1 " + Environment.NewLine +
@@ -1323,48 +1438,48 @@ namespace MonoDevelop.CSharp
 					Highlight ("try", colorStyle.KeywordException) + " try-block " + Highlight ("catch", colorStyle.KeywordException) + " catch-block");
 				result.SummaryMarkup = "The try-catch statement consists of a " + Highlight ("try", colorStyle.KeywordException) + " block followed by one or more " + Highlight ("catch", colorStyle.KeywordException) + " clauses, which specify handlers for different exceptions.";
 				break;
-			case "typeof":
+			case SyntaxKind.TypeOfKeyword:
 				result.SignatureMarkup = Highlight ("typeof", colorStyle.KeywordOperators) + keywordSign;
 				result.AddCategory ("Form", Highlight ("typeof", colorStyle.KeywordOperators) + "(type)");
 				result.SummaryMarkup = "The " + Highlight ("typeof", colorStyle.KeywordOperators) + " operator is used to obtain the System.Type object for a type.";
 				break;
-			case "unchecked":
+			case SyntaxKind.UncheckedKeyword:
 				result.SignatureMarkup = Highlight ("unchecked", colorStyle.KeywordOther) + keywordSign;
 				result.AddCategory ("Form", Highlight ("unchecked", colorStyle.KeywordOther) + " block" + Environment.NewLine +
 				Highlight ("unchecked", colorStyle.KeywordOther) + " (expression)");
 				result.SummaryMarkup = "The " + Highlight ("unchecked", colorStyle.KeywordOther) + " keyword is used to control the overflow-checking context for integral-type arithmetic operations and conversions.";
 				break;
-			case "unsafe":
+			case SyntaxKind.UnsafeKeyword:
 				result.SignatureMarkup = Highlight ("unsafe", colorStyle.KeywordOther) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("unsafe", colorStyle.KeywordOther) + " keyword denotes an unsafe context, which is required for any operation involving pointers.";
 				break;
-			case "using":
+			case SyntaxKind.UsingKeyword:
 				result.SignatureMarkup = Highlight ("using", colorStyle.KeywordNamespace) + keywordSign;
 				result.AddCategory ("Form", Highlight ("using", colorStyle.KeywordNamespace) + " (expression | type identifier = initializer) statement" + Environment.NewLine +
 				Highlight ("using", colorStyle.KeywordNamespace) + " [alias = ]class_or_namespace;");
 				result.SummaryMarkup = "The " + Highlight ("using", colorStyle.KeywordNamespace) + " directive creates an alias for a namespace or imports types defined in other namespaces. The " + Highlight ("using", colorStyle.KeywordNamespace) + " statement defines a scope at the end of which an object will be disposed.";
 				break;
-			case "virtual":
+			case SyntaxKind.VirtualKeyword:
 				result.SignatureMarkup = Highlight ("virtual", colorStyle.KeywordModifiers) + keywordSign;
 				result.SummaryMarkup = "The " + Highlight ("virtual", colorStyle.KeywordModifiers) + " keyword is used to modify a method, property, indexer, or event declaration and allow for it to be overridden in a derived class.";
 				break;
-			case "volatile":
+			case SyntaxKind.VolatileKeyword:
 				result.SignatureMarkup = Highlight ("volatile", colorStyle.KeywordModifiers) + keywordSign;
 				result.AddCategory ("Form", Highlight ("volatile", colorStyle.KeywordModifiers) + " declaration");
 				result.SummaryMarkup = "The " + Highlight ("volatile", colorStyle.KeywordModifiers) + " keyword indicates that a field can be modified in the program by something such as the operating system, the hardware, or a concurrently executing thread.";
 				break;
-			case "void":
+			case SyntaxKind.VoidKeyword:
 				result.SignatureMarkup = Highlight ("void", colorStyle.KeywordTypes) + keywordSign;
 				break;
-			case "where":
+			case SyntaxKind.WhereKeyword:
 				result.SignatureMarkup = Highlight ("where", colorStyle.KeywordContext) + keywordSign;
-				if (hintNode != null) {
-					if (hintNode.Parent is QueryWhereClause) {
+				if (node.Parent != null) {
+					if (node.Parent is WhereClauseSyntax) {
 						result.AddCategory ("Query Form", Highlight ("where", colorStyle.KeywordContext) + " condition");
 						result.SummaryMarkup = "The " + Highlight ("where", colorStyle.KeywordContext) + " clause specifies which elements from the data source to be returned according to a given condition.";
 						break;
 					}
-					if (hintNode.Parent is Constraint) {
+					if (node.Parent is TypeConstraintSyntax) {
 						result.AddCategory ("Form", "generic-class-declaration " + Highlight ("where", colorStyle.KeywordContext) + " type-parameter : type-constraint");
 						result.SummaryMarkup = "The " + Highlight ("where", colorStyle.KeywordContext) + " clause constrains which types can be used as the type parameter in a generic declaration.";
 						break;
@@ -1375,41 +1490,48 @@ namespace MonoDevelop.CSharp
 					" condition" + " [query-clauses]");
 				}
 				break;
-			case "yield":
+			case SyntaxKind.YieldKeyword:
 				result.SignatureMarkup = Highlight ("yield", colorStyle.KeywordContext) + keywordSign;
 				result.AddCategory ("Form", Highlight ("yield", colorStyle.KeywordContext) + Highlight ("break", colorStyle.KeywordJump) + Environment.NewLine
 				+ Environment.NewLine + "or" + Environment.NewLine + Environment.NewLine
 				+ Highlight ("yield", colorStyle.KeywordContext) + Highlight ("return", colorStyle.KeywordJump) + " expression");
 				result.SummaryMarkup = "The " + Highlight ("yield", colorStyle.KeywordContext) + " keyword is used to indicate that a method, get accessor, or operator is an iterator.";
 				break;
-			case "while":
+			case SyntaxKind.WhileKeyword:
 				result.SignatureMarkup = Highlight ("while", colorStyle.KeywordIteration) + keywordSign;
 				result.AddCategory ("Form", Highlight ("while", colorStyle.KeywordIteration) + " (expression) statement");
 				result.SummaryMarkup = "The " + Highlight ("while", colorStyle.KeywordIteration) + " statement executes a statement or a block of statements until a specified expression evaluates to false. ";
 				break;
+				case SyntaxKind.NameOfKeyword:
+				result.SignatureMarkup = Highlight ("nameof", colorStyle.KeywordDeclaration) + keywordSign;
+				result.AddCategory ("Form", Highlight ("nameof", colorStyle.KeywordDeclaration) + "(identifier)");
+				result.SummaryMarkup = "Used to obtain the simple (unqualified) string name of a variable, type, or member.";
+				break;
+			default:
+				return null;
 			}
 			return result;
 		}
 
-		public TooltipInformation GetConstraintTooltip (string keyword)
+		public TooltipInformation GetConstraintTooltip (SyntaxToken keyword)
 		{
 			var result = new TooltipInformation ();
 
 			var color = AlphaBlend (colorStyle.PlainText.Foreground, colorStyle.PlainText.Background, optionalAlpha);
-			var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);
-			
+			var colorString = MonoDevelop.Components.HelperMethods.GetColorString (color);
+
 			var keywordSign = "<span foreground=\"" + colorString + "\">" + " (keyword)</span>";
 
-			result.SignatureMarkup = Highlight (keyword, colorStyle.KeywordTypes) + keywordSign;
+			result.SignatureMarkup = Highlight (keyword.ToFullString (), colorStyle.KeywordTypes) + keywordSign;
 
-			switch (keyword) {
-			case "class":
+			switch (keyword.Parent.Kind ()) {
+			case SyntaxKind.ClassConstraint:
 				result.AddCategory ("Constraint", "The type argument must be a reference type; this applies also to any class, interface, delegate, or array type.");
 				break;
-			case "new":
+			case SyntaxKind.ConstructorConstraint:
 				result.AddCategory ("Constraint", "The type argument must have a public parameterless constructor. When used together with other constraints, the new() constraint must be specified last.");
 				break;
-			case "struct":
+			case SyntaxKind.StructConstraint:
 				result.AddCategory ("Constraint", "The type argument must be a value type. Any value type except Nullable can be specified. See Using Nullable Types (C# Programming Guide) for more information.");
 				break;
 			}
@@ -1417,74 +1539,79 @@ namespace MonoDevelop.CSharp
 			return result;
 		}
 
-		public TooltipInformation GetTypeOfTooltip (TypeOfExpression typeOfExpression, TypeOfResolveResult resolveResult)
+		public TooltipInformation GetTypeOfTooltip (TypeOfExpressionSyntax typeOfExpression, ITypeSymbol resolveResult)
 		{
 			var result = new TooltipInformation ();
 			if (resolveResult == null) {
-				result.SignatureMarkup = AmbienceService.EscapeText (typeOfExpression.Type.ToString ());
+				result.SignatureMarkup = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (typeOfExpression.Type.ToString ());
 			} else {
-				result.SignatureMarkup = GetTypeMarkup (resolveResult.ReferencedType, true);
+				result.SignatureMarkup = GetTypeMarkup (resolveResult, true);
 			}
 			return result;
 		}
 
-		public TooltipInformation GetAliasedNamespaceTooltip (AliasNamespaceResolveResult resolveResult)
-		{
-			var result = new TooltipInformation ();
-			result.SignatureMarkup = GetMarkup (resolveResult.Namespace);
-			result.AddCategory (GettextCatalog.GetString ("Alias information"), GettextCatalog.GetString ("Resolved using alias '{0}'", resolveResult.Alias));
-			return result;
-		}
-
-		public TooltipInformation GetAliasedTypeTooltip (AliasTypeResolveResult resolveResult)
-		{
-			var result = new TooltipInformation ();
-			result.SignatureMarkup = GetTypeMarkup (resolveResult.Type, true);
-			result.AddCategory (GettextCatalog.GetString ("Alias information"), GettextCatalog.GetString ("Resolved using alias '{0}'", resolveResult.Alias));
-			return result;
-		}
-
-		string GetEventMarkup (IEvent evt)
+		//		public TooltipInformation GetAliasedNamespaceTooltip (AliasNamespaceResolveResult resolveResult)
+		//		{
+		//			var result = new TooltipInformation ();
+		//			result.SignatureMarkup = GetMarkup (resolveResult.Namespace);
+		//			result.AddCategory (GettextCatalog.GetString ("Alias information"), GettextCatalog.GetString ("Resolved using alias '{0}'", resolveResult.Alias));
+		//			return result;
+		//		}
+		//
+		//		public TooltipInformation GetAliasedTypeTooltip (AliasTypeResolveResult resolveResult)
+		//		{
+		//			var result = new TooltipInformation ();
+		//			result.SignatureMarkup = GetTypeMarkup (resolveResult.Type, true);
+		//			result.AddCategory (GettextCatalog.GetString ("Alias information"), GettextCatalog.GetString ("Resolved using alias '{0}'", resolveResult.Alias));
+		//			return result;
+		//		}
+
+		string GetEventMarkup (IEventSymbol evt)
 		{
 			if (evt == null)
 				throw new ArgumentNullException ("evt");
 			var result = new StringBuilder ();
 			AppendModifiers (result, evt);
 			result.Append (Highlight ("event ", colorStyle.KeywordModifiers));
-			result.Append (GetTypeReferenceString (evt.ReturnType));
+			result.Append (GetTypeReferenceString (evt.Type));
 			if (BreakLineAfterReturnType) {
 				result.AppendLine ();
 			} else {
 				result.Append (" ");
 			}
 
-			AppendExplicitInterfaces (result, evt);
+			AppendExplicitInterfaces (result, evt.ExplicitInterfaceImplementations.Cast<ISymbol> ());
 			result.Append (HighlightSemantically (FilterEntityName (evt.Name), colorStyle.UserEventDeclaration));
 			return result.ToString ();
 		}
 
 		bool grayOut;
 
-		bool GrayOut {
-			get {
+		bool GrayOut
+		{
+			get
+			{
 				return grayOut;
 			}
-			set {
+			set
+			{
 				grayOut = value;
 			}
 		}
 
-		void AppendParameterList (StringBuilder result, IList<IParameter> parameterList, bool spaceBefore, bool spaceAfter, bool newLine = true)
+		public SemanticModel SemanticModel { get; internal set; }
+
+		void AppendParameterList (StringBuilder result, ImmutableArray<IParameterSymbol> parameterList, bool spaceBefore, bool spaceAfter, bool newLine = true)
 		{
-			if (parameterList == null || parameterList.Count == 0)
+			if (parameterList == null || parameterList.Length == 0)
 				return;
 			if (newLine)
 				result.AppendLine ();
-			for (int i = 0; i < parameterList.Count; i++) {
+			for (int i = 0; i < parameterList.Length; i++) {
 				var parameter = parameterList [i];
 				if (newLine)
 					result.Append (new string (' ', 2));
-				var doHighightParameter = i == HighlightParameter || HighlightParameter >= i && i == parameterList.Count - 1 && parameter.IsParams;
+				var doHighightParameter = i == HighlightParameter || HighlightParameter >= i && i == parameterList.Length - 1 && parameter.IsParams;
 				if (doHighightParameter)
 					result.Append ("<u>");
 				/*				if (parameter.IsOptional) {
@@ -1495,18 +1622,18 @@ namespace MonoDevelop.CSharp
 				}*/
 				AppendParameter (result, parameter);
 				if (parameter.IsOptional) {
-					if (formattingOptions.SpaceAroundAssignment) {
+					if (options.GetOption (CSharpFormattingOptions.SpacingAroundBinaryOperator) == BinaryOperatorSpacingOptions.Single) {
 						result.Append (" = ");
 					} else {
 						result.Append ("=");
 					}
-					AppendConstant (result, parameter.Type, parameter.ConstantValue);
-//					GrayOut = false;
-//					result.Append ("</span>");
+					AppendConstant (result, parameter.Type, parameter.ExplicitDefaultValue);
+					//					GrayOut = false;
+					//					result.Append ("</span>");
 				}
 				if (doHighightParameter)
 					result.Append ("</u>");
-				if (i + 1 < parameterList.Count) {
+				if (i + 1 < parameterList.Length) {
 					if (spaceBefore)
 						result.Append (' ');
 					result.Append (',');
@@ -1522,13 +1649,13 @@ namespace MonoDevelop.CSharp
 				result.AppendLine ();
 		}
 
-		void AppendParameter (StringBuilder result, IParameter parameter)
+		void AppendParameter (StringBuilder result, IParameterSymbol parameter)
 		{
 			if (parameter == null)
 				return;
-			if (parameter.IsOut) {
+			if (parameter.RefKind == RefKind.Out) {
 				result.Append (Highlight ("out ", colorStyle.KeywordParameter));
-			} else if (parameter.IsRef) {
+			} else if (parameter.RefKind == RefKind.Ref) {
 				result.Append (Highlight ("ref ", colorStyle.KeywordParameter));
 			} else if (parameter.IsParams) {
 				result.Append (Highlight ("params ", colorStyle.KeywordParameter));
@@ -1538,32 +1665,30 @@ namespace MonoDevelop.CSharp
 			result.Append (FilterEntityName (parameter.Name));
 		}
 
-		void AppendExplicitInterfaces (StringBuilder sb, IMember member)
+		void AppendExplicitInterfaces (StringBuilder sb, IEnumerable<Microsoft.CodeAnalysis.ISymbol> member)
 		{
-			if (member == null || !member.IsExplicitInterfaceImplementation)
-				return;
-			foreach (var implementedInterfaceMember in member.ImplementedInterfaceMembers) {
-				sb.Append (GetTypeReferenceString (implementedInterfaceMember.DeclaringTypeDefinition));
+			foreach (var implementedInterfaceMember in member) {
+				sb.Append (GetTypeReferenceString (implementedInterfaceMember.ContainingType));
 				sb.Append (".");
 			}
 		}
 
 		static ulong GetUlong (string str)
 		{
-			try {	
+			try {
 				if (str [0] == '-')
 					return (ulong)long.Parse (str);
 				return ulong.Parse (str);
 			} catch (Exception e) {
-				LoggingService.LogError ("Error while converting " + str + " to a number.", e); 
+				LoggingService.LogError ("Error while converting " + str + " to a number.", e);
 				return 0;
 			}
 		}
 
-		void AppendConstant (StringBuilder sb, IType constantType, object constantValue, bool useNumericalEnumValue = false)
+		void AppendConstant (StringBuilder sb, ITypeSymbol constantType, object constantValue, bool useNumericalEnumValue = false)
 		{
 			if (constantValue is string) {
-				sb.Append (Highlight ("\"" + constantValue + "\"", colorStyle.String));
+				sb.Append (Highlight ("\"" + MonoDevelop.Ide.TypeSystem.Ambience.EscapeText ((string)constantValue) + "\"", colorStyle.String));
 				return;
 			}
 			if (constantValue is char) {
@@ -1576,7 +1701,7 @@ namespace MonoDevelop.CSharp
 			}
 
 			if (constantValue == null) {
-				if (constantType.Kind == TypeKind.Struct) {
+				if (constantType.IsValueType) {
 					// structs can never be == null, therefore it's the default value.
 					sb.Append (Highlight ("default", colorStyle.KeywordSelection) + "(" + GetTypeReferenceString (constantType) + ")");
 				} else {
@@ -1584,11 +1709,11 @@ namespace MonoDevelop.CSharp
 				}
 				return;
 			}
-
-			while (NullableType.IsNullable (constantType))
-				constantType = NullableType.GetUnderlyingType (constantType);
-			if (constantType.Kind == TypeKind.Enum) {
-				foreach (var field in constantType.GetFields ()) {
+			//			TODOδ
+			//			while (IsNullableType (constantType))
+			//				constantType = NullableType.GetUnderlyingType (constantType);
+			if (constantType.TypeKind == TypeKind.Enum) {
+				foreach (var field in constantType.GetMembers ().OfType<IFieldSymbol> ()) {
 					if (field.ConstantValue == constantValue) {
 						if (useNumericalEnumValue) {
 							sb.Append (Highlight (string.Format ("0x{0:X}", field.ConstantValue), colorStyle.Number));
@@ -1599,11 +1724,11 @@ namespace MonoDevelop.CSharp
 					}
 				}
 				// try to decompose flags
-				if (constantType.GetDefinition ().Attributes.Any (attr => attr.AttributeType.Name == "FlagsAttribute" && attr.AttributeType.Namespace == "System")) {
+				if (constantType.GetAttributes ().Any (attr => attr.AttributeClass.Name == "FlagsAttribute" && attr.AttributeClass.ContainingNamespace.Name == "System")) {
 					var val = GetUlong (constantValue.ToString ());
 					var outVal = 0UL;
-					var fields = new List<IField> ();
-					foreach (var field in constantType.GetFields ()) {
+					var fields = new List<IFieldSymbol> ();
+					foreach (var field in constantType.GetMembers ().OfType<IFieldSymbol> ()) {
 						if (field.ConstantValue == null)
 							continue;
 						var val2 = GetUlong (field.ConstantValue.ToString ());
@@ -1627,15 +1752,14 @@ namespace MonoDevelop.CSharp
 				sb.Append ("(" + GetTypeReferenceString (constantType) + ")" + Highlight (constantValue.ToString (), colorStyle.Number));
 				return;
 			}
-
-			sb.Append (Highlight (constantValue.ToString (), colorStyle.Number));
+			sb.Append (Highlight (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (constantValue.ToString ()), colorStyle.Number));
 		}
 
-		void AppendVariance (StringBuilder sb, VarianceModifier variance)
+		void AppendVariance (StringBuilder sb, VarianceKind variance)
 		{
-			if (variance == VarianceModifier.Contravariant) {
+			if (variance == VarianceKind.In) {
 				sb.Append (Highlight ("in ", colorStyle.KeywordParameter));
-			} else if (variance == VarianceModifier.Covariant) {
+			} else if (variance == VarianceKind.Out) {
 				sb.Append (Highlight ("out ", colorStyle.KeywordParameter));
 			}
 		}
@@ -1643,8 +1767,8 @@ namespace MonoDevelop.CSharp
 		Gdk.Color AlphaBlend (Gdk.Color color, Gdk.Color color2, double alpha)
 		{
 			return new Gdk.Color (
-				(byte)((alpha * color.Red + (1 - alpha) * color2.Red) / 256), 
-				(byte)((alpha * color.Green + (1 - alpha) * color2.Green) / 256), 
+				(byte)((alpha * color.Red + (1 - alpha) * color2.Red) / 256),
+				(byte)((alpha * color.Green + (1 - alpha) * color2.Green) / 256),
 				(byte)((alpha * color.Blue + (1 - alpha) * color2.Blue) / 256)
 			);
 		}
@@ -1654,7 +1778,12 @@ namespace MonoDevelop.CSharp
 			return AlphaBlend ((Gdk.Color)((HslColor)color), (Gdk.Color)((HslColor)color2), alpha);
 		}
 
-		public string GetArrayIndexerMarkup (ArrayType arrayType)
+		HslColor AlphaBlend (HslColor color, HslColor color2, double alpha)
+		{
+			return (HslColor)AlphaBlend ((Gdk.Color)color, (Gdk.Color)color2, alpha);
+		}
+
+		public string GetArrayIndexerMarkup (IArrayTypeSymbol arrayType)
 		{
 			if (arrayType == null)
 				throw new ArgumentNullException ("arrayType");
@@ -1667,7 +1796,7 @@ namespace MonoDevelop.CSharp
 			}
 			result.Append (Highlight ("this", colorStyle.KeywordAccessors));
 			result.Append ("[");
-			for (int i = 0; i < arrayType.Dimensions; i++) {
+			for (int i = 0; i < arrayType.Rank; i++) {
 				if (i > 0)
 					result.Append (", ");
 				var doHighightParameter = i == HighlightParameter;
@@ -1675,7 +1804,7 @@ namespace MonoDevelop.CSharp
 					result.Append ("<u>");
 
 				result.Append (Highlight ("int ", colorStyle.KeywordTypes));
-				result.Append (arrayType.Dimensions == 1 ? "index" : "i" + (i + 1));
+				result.Append (arrayType.Rank == 1 ? "index" : "i" + (i + 1));
 				if (doHighightParameter)
 					result.Append ("</u>");
 			}
@@ -1685,7 +1814,7 @@ namespace MonoDevelop.CSharp
 			result.Append (Highlight (" get", colorStyle.KeywordProperty) + ";");
 			result.Append (Highlight (" set", colorStyle.KeywordProperty) + ";");
 			result.Append (" }");
-			
+
 			return result.ToString ();
 		}
 
@@ -1698,51 +1827,60 @@ namespace MonoDevelop.CSharp
 				color = AlphaBlend (color, (Gdk.Color)((HslColor)colorStyle.PlainText.Background), optionalAlpha);
 			}
 
-			var colorString = Mono.TextEditor.HelperMethods.GetColorString (color);
+			var colorString = MonoDevelop.Components.HelperMethods.GetColorString (color);
 			return "<span foreground=\"" + colorString + "\">" + str + "</span>";
 		}
 
 		string HighlightSemantically (string str, ChunkStyle style)
 		{
-			if (!MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting)
+			if (!DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting)
 				return str;
 			return Highlight (str, style);
 		}
 
-		public string CreateFooter (IEntity entity)
+		public string CreateFooter (ISymbol entity)
 		{
-			var type = entity as IType;
-			if (type != null) {
-				var def = type.GetDefinition ();
-				if (def != null) {
-					if (!def.Region.IsEmpty) {
-						MonoDevelop.Projects.Project project;
-
-						if (def.TryGetSourceProject (out project)) {
-							var relPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, def.Region.FileName);
-							return (string.IsNullOrEmpty (def.Namespace) ? "" : "<small>" + GettextCatalog.GetString ("Namespace:\t{0}", AmbienceService.EscapeText (def.Namespace)) + "</small>" + Environment.NewLine) +
-								"<small>" + GettextCatalog.GetString ("Project:\t{0}", AmbienceService.EscapeText (def.ParentAssembly.AssemblyName)) + "</small>" + Environment.NewLine +
-								"<small>" + GettextCatalog.GetString ("File:\t\t{0} (line {1})", AmbienceService.EscapeText (relPath), def.Region.Begin.Line) + "</small>";
-						}
-					}
-					return (string.IsNullOrEmpty (def.Namespace) ? "" : "<small>" + GettextCatalog.GetString ("Namespace:\t{0}", AmbienceService.EscapeText (def.Namespace)) + "</small>" + Environment.NewLine) +
-						"<small>" + GettextCatalog.GetString ("Assembly:\t{0}", AmbienceService.EscapeText (def.ParentAssembly.AssemblyName)) + "</small>";
+			var type = entity as ITypeSymbol;
+			if (type != null && type.Locations.Any ()) {
+				var loc = type.Locations.First ();
+				if (loc.IsInSource) {// TODO:
+									 //					MonoDevelop.Projects.Project project;
+									 //					
+									 //					if (type.TryGetSourceProject (out project)) {
+									 //						var relPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, loc.SourceTree.FilePath);
+									 //						var line = loc.SourceTree.GetLineSpan (loc.SourceSpan, true).StartLinePosition.Line;
+									 //						
+									 //						return (type.ContainingNamespace.IsGlobalNamespace ? "" : "<small>" + GettextCatalog.GetString ("Namespace:\t{0}", AmbienceService.EscapeText (type.ContainingNamespace.Name)) + "</small>" + Environment.NewLine) +
+									 //							"<small>" + GettextCatalog.GetString ("Project:\t{0}", AmbienceService.EscapeText (type.ContainingAssembly.Name)) + "</small>" + Environment.NewLine +
+									 //							"<small>" + GettextCatalog.GetString ("File:\t\t{0} (line {1})", AmbienceService.EscapeText (relPath), line) + "</small>";
+									 //					}
 				}
-				return null;
-			} 
-
-			if (entity.DeclaringTypeDefinition != null) {
-				if (!entity.Region.IsEmpty) {
-					MonoDevelop.Projects.Project project;
-					if (entity.DeclaringTypeDefinition.TryGetSourceProject (out project)) {
-						var relPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, entity.Region.FileName);
-						return "<small>" + GettextCatalog.GetString ("Project:\t{0}", AmbienceService.EscapeText (project.Name)) + "</small>" + Environment.NewLine +
-							"<small>" + GettextCatalog.GetString ("From type:\t{0}", AmbienceService.EscapeText (entity.DeclaringTypeDefinition.FullName)) + "</small>" + Environment.NewLine +
-							"<small>" + GettextCatalog.GetString ("File:\t\t{0} (line {1})", AmbienceService.EscapeText (relPath), entity.Region.Begin.Line) + "</small>";
-					}
+				return (type.ContainingNamespace.IsGlobalNamespace ? "" : "<small>" + GettextCatalog.GetString ("Namespace:\t{0}", MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (type.ContainingNamespace.GetFullName ())) + "</small>" + Environment.NewLine) +
+					"<small>" + GettextCatalog.GetString ("Assembly:\t{0}", MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (type.ContainingAssembly.Name)) + "</small>";
+			}
+
+			var method = entity as IMethodSymbol;
+			if (method != null && (method.MethodKind == MethodKind.Constructor || method.MethodKind == MethodKind.StaticConstructor || method.MethodKind == MethodKind.Destructor)) {
+				return (method.ContainingNamespace.IsGlobalNamespace ? "" : "<small>" + GettextCatalog.GetString ("Namespace:\t{0}", MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (method.ContainingNamespace.GetFullName ())) + "</small>" + Environment.NewLine) +
+					"<small>" + GettextCatalog.GetString ("Assembly:\t{0}", MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (method.ContainingAssembly.Name)) + "</small>";
+			}
+
+
+			if (entity.ContainingType != null && entity.Locations.Any ()) {
+				var loc = entity.Locations.First ();
+				if (!loc.IsInSource) {
+					// TODO:
+					//					MonoDevelop.Projects.Project project;
+					//					if (entity.ContainingType.TryGetSourceProject (out project)) {
+					//						var relPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, loc.SourceTree.FilePath);
+					//						var line = loc.SourceTree.GetLineSpan (loc.SourceSpan, true).StartLinePosition.Line;
+					//						return "<small>" + GettextCatalog.GetString ("Project:\t{0}", AmbienceService.EscapeText (project.Name)) + "</small>" + Environment.NewLine +
+					//								"<small>" + GettextCatalog.GetString ("From type:\t{0}", AmbienceService.EscapeText (entity.ContainingType.Name)) + "</small>" + Environment.NewLine +
+					//								"<small>" + GettextCatalog.GetString ("File:\t\t{0} (line {1})", AmbienceService.EscapeText (relPath), line) + "</small>";
+					//					}
 				}
-				return "<small>" + GettextCatalog.GetString ("From type:\t{0}", AmbienceService.EscapeText (entity.DeclaringTypeDefinition.FullName)) + "</small>" + Environment.NewLine +
-					"<small>" + GettextCatalog.GetString ("Assembly:\t{0}", AmbienceService.EscapeText (entity.DeclaringTypeDefinition.ParentAssembly.AssemblyName)) + "</small>";
+				return "<small>" + GettextCatalog.GetString ("From type:\t{0}", MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (entity.ContainingType.Name)) + "</small>" + Environment.NewLine +
+					"<small>" + GettextCatalog.GetString ("Assembly:\t{0}", MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (entity.ContainingAssembly.Name)) + "</small>";
 			}
 			return null;
 		}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentEngine.cs b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentEngine.cs
new file mode 100644
index 0000000000..baedfa03c4
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentEngine.cs
@@ -0,0 +1,307 @@
+//
+// JSonTextEditorExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Text;
+using ICSharpCode.NRefactory6.CSharp;
+using ICSharpCode.NRefactory6;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.JSon
+{
+	class JSonIndentEngine : IStateMachineIndentEngine
+	{
+		TextEditor editor;
+		DocumentContext ctx;
+		int offset, line, column;
+		internal Indent thisLineIndent, nextLineIndent;
+		StringBuilder currentIndent;
+		// char previousNewline = '\0';
+		char previousChar = '\0';
+		bool isLineStart;
+		bool isInString;
+
+		public JSonIndentEngine (TextEditor editor, DocumentContext ctx)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (ctx == null)
+				throw new ArgumentNullException ("ctx");
+			this.editor = editor;
+			this.ctx = ctx;
+			Reset ();
+		}
+
+		JSonIndentEngine (JSonIndentEngine jSonIndentEngine)
+		{
+			this.editor = jSonIndentEngine.editor;
+			this.ctx = jSonIndentEngine.ctx;
+			this.offset = jSonIndentEngine.offset;
+			this.line = jSonIndentEngine.line;
+			this.column = jSonIndentEngine.column;
+			this.thisLineIndent = jSonIndentEngine.thisLineIndent.Clone ();
+			this.nextLineIndent = jSonIndentEngine.nextLineIndent.Clone ();
+			this.currentIndent = jSonIndentEngine.currentIndent != null ? new StringBuilder (jSonIndentEngine.currentIndent.ToString ()) : null;
+			this.previousChar = jSonIndentEngine.previousChar;
+			this.isLineStart = jSonIndentEngine.isLineStart;
+			this.isInString = jSonIndentEngine.isInString;
+		}
+
+		#region IStateMachineIndentEngine implementation
+
+		public IStateMachineIndentEngine Clone ()
+		{
+			return new JSonIndentEngine (this);
+		}
+
+		public bool IsInsidePreprocessorDirective {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsidePreprocessorComment {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsideStringLiteral {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsideVerbatimString {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsideCharacter {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsideString {
+			get {
+				return isInString;
+			}
+		}
+
+		public bool IsInsideLineComment {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsideMultiLineComment {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsideDocLineComment {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsideComment {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsideOrdinaryComment {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsInsideOrdinaryCommentOrString {
+			get {
+				return false;
+			}
+		}
+
+		public bool LineBeganInsideVerbatimString {
+			get {
+				return false;
+			}
+		}
+
+		public bool LineBeganInsideMultiLineComment {
+			get {
+				return false;
+			}
+		}
+
+		#endregion
+
+		#region IDocumentIndentEngine implementation
+
+		public void Push (char ch)
+		{
+			var isNewLine = NewLine.IsNewLine (ch);
+			if (!isNewLine) {
+				if (ch == '"')
+					isInString = !IsInsideString;
+				if (ch == '{' || ch == '[') {
+					nextLineIndent.Push (IndentType.Block);
+				} else if (ch == '}' || ch == ']') {
+					if (thisLineIndent.Count > 0)
+						thisLineIndent.Pop ();
+					if (nextLineIndent.Count > 0)
+						nextLineIndent.Pop ();
+				} 
+			} else {
+				if (ch == NewLine.LF && previousChar == NewLine.CR) {
+					offset++;
+					previousChar = ch;
+					return;
+				}
+			}
+
+			offset++;
+			if (!isNewLine) {
+				// previousNewline = '\0';
+
+				isLineStart &= char.IsWhiteSpace (ch);
+
+				if (isLineStart)
+					currentIndent.Append (ch);
+
+				if (ch == '\t') {
+					var nextTabStop = (column - 1 + editor.Options.IndentationSize) / editor.Options.IndentationSize;
+					column = 1 + nextTabStop * editor.Options.IndentationSize;
+				} else {
+					column++;
+				}
+			} else {
+				// previousNewline = ch;
+				currentIndent.Length = 0;
+				isLineStart = true;
+				column = 1;
+				line++;
+				thisLineIndent = nextLineIndent.Clone ();
+			}
+			previousChar = ch;
+		}
+
+		public void Reset ()
+		{
+			offset = 0;
+			line = column = 1;
+			thisLineIndent = new Indent (ctx.GetOptionSet ());
+			nextLineIndent = new Indent (ctx.GetOptionSet ());
+			currentIndent = new StringBuilder ();
+			// previousNewline = '\0';
+			previousChar = '\0';
+			isLineStart = true;
+			isInString = false;
+		}
+
+		public void Update (SourceText sourceText, int offset)
+		{
+			if (Offset > offset)
+				Reset ();
+
+			while (Offset < offset) {
+				Push (sourceText [Offset]);
+			}
+		}
+
+		IDocumentIndentEngine IDocumentIndentEngine.Clone ()
+		{
+			return Clone ();
+		}
+
+		SourceText sourceText;
+
+		public SourceText Document {
+			get {
+				return sourceText ?? (sourceText = new MonoDevelopSourceText (editor));
+			}
+		}
+
+		public string ThisLineIndent {
+			get {
+				return thisLineIndent.IndentString;
+			}
+		}
+
+		public string NextLineIndent {
+			get {
+				return nextLineIndent.IndentString;
+			}
+		}
+
+		public string CurrentIndent {
+			get {
+				return currentIndent.ToString ();
+			}
+		}
+
+		public bool NeedsReindent {
+			get {
+				return ThisLineIndent != CurrentIndent;
+			}
+		}
+
+		public int Offset {
+			get {
+				return offset;
+			}
+		}
+//
+//		public TextLocation Location {
+//			get {
+//				return new TextLocation (line, column);
+//			}
+//		}
+
+		public bool EnableCustomIndentLevels {
+			get;
+			set;
+		}
+
+		#endregion
+
+		#region ICloneable implementation
+
+		object ICloneable.Clone ()
+		{
+			return Clone ();
+		}
+
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentationTracker.cs b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentationTracker.cs
new file mode 100644
index 0000000000..a5a2d3402b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonIndentationTracker.cs
@@ -0,0 +1,70 @@
+//
+// JSonTextEditorExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using ICSharpCode.NRefactory6.CSharp;
+
+namespace MonoDevelop.JSon
+{
+	class JSonIndentationTracker : IndentationTracker
+	{
+		readonly TextEditor data;
+		readonly CacheIndentEngine stateTracker;
+
+		public JSonIndentationTracker(TextEditor data, CacheIndentEngine stateTracker)
+		{
+			this.data = data;
+			this.stateTracker = stateTracker;
+		}
+
+		string GetIndentationString (DocumentLocation loc)
+		{
+			var line = data.GetLine (loc.Line);
+			if (line == null)
+				return "";
+			// Get context to the end of the line w/o changing the main engine's state
+			var offset = line.Offset;
+			string curIndent = line.GetIndentation (data);
+			try {
+				stateTracker.Update (data, Math.Min (data.Length, offset + Math.Min (line.Length, loc.Column - 1)));
+				int nlwsp = curIndent.Length;
+				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && data.GetCharAt (offset + nlwsp) == '*'))
+					return stateTracker.ThisLineIndent;
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while indenting at "+ loc, e); 
+			}
+			return curIndent;
+		}
+
+		public override string GetIndentationString (int lineNumber)
+		{
+			return GetIndentationString (new DocumentLocation (lineNumber, 1));
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs
new file mode 100644
index 0000000000..1121e293ad
--- /dev/null
+++ b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs
@@ -0,0 +1,125 @@
+//
+// JSonTextEditorExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Editor.Extension;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.JSon
+{
+	class JSonTextEditorExtension : TextEditorExtension
+	{
+		CacheIndentEngine stateTracker;
+
+
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+			IStateMachineIndentEngine indentEngine;
+			indentEngine = new JSonIndentEngine (Editor, DocumentContext);
+			stateTracker = new CacheIndentEngine (indentEngine);
+			Editor.SetIndentationTracker (new JSonIndentationTracker (Editor, stateTracker));
+		}
+		public override bool KeyPress (KeyDescriptor descriptor)
+		{
+			var result = base.KeyPress (descriptor);
+
+			if (descriptor.SpecialKey == SpecialKey.Return) {
+				if (Editor.Options.IndentStyle == MonoDevelop.Ide.Editor.IndentStyle.Virtual) {
+					if (Editor.GetLine (Editor.CaretLine).Length == 0)
+						Editor.CaretColumn = Editor.GetVirtualIndentationColumn (Editor.CaretLine);
+				} else {
+					DoReSmartIndent ();
+				}
+			}
+
+			return result;
+		}
+
+		void DoReSmartIndent ()
+		{
+			DoReSmartIndent (Editor.CaretOffset);
+		}
+
+		void DoReSmartIndent (int cursor)
+		{
+			SafeUpdateIndentEngine (cursor);
+			if (stateTracker.LineBeganInsideVerbatimString || stateTracker.LineBeganInsideMultiLineComment)
+				return;
+			var line = Editor.GetLineByOffset (cursor);
+
+			// Get context to the end of the line w/o changing the main engine's state
+			var curTracker = stateTracker.Clone ();
+			try {
+				for (int max = cursor; max < line.EndOffset; max++) {
+					curTracker.Push (Editor.GetCharAt (max));
+				}
+			} catch (Exception e) {
+				LoggingService.LogError ("Exception during indentation", e);
+			}
+
+			int pos = line.Offset;
+			string curIndent = line.GetIndentation (Editor);
+			int nlwsp = curIndent.Length;
+			int offset = cursor > pos + nlwsp ? cursor - (pos + nlwsp) : 0;
+			if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && Editor.GetCharAt (line.Offset + nlwsp) == '*')) {
+				// Possibly replace the indent
+				string newIndent = curTracker.ThisLineIndent;
+				int newIndentLength = newIndent.Length;
+				if (newIndent != curIndent) {
+					if (CompletionWindowManager.IsVisible) {
+						if (pos < CompletionWindowManager.CodeCompletionContext.TriggerOffset)
+							CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp;
+					}
+
+					Editor.ReplaceText (pos, nlwsp, newIndent);
+					newIndentLength = newIndent.Length;
+					CompletionWindowManager.HideWindow ();
+				}
+				pos += newIndentLength;
+			} else {
+				pos += curIndent.Length;
+			}
+
+			pos += offset;
+
+			Editor.FixVirtualIndentation ();
+		}
+
+		internal void SafeUpdateIndentEngine (int offset)
+		{
+			try {
+				stateTracker.Update (Editor, offset);
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while updating the indentation engine", e);
+			}
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/Util/7BitEncodedInts.cs b/main/src/addins/CSharpBinding/Util/7BitEncodedInts.cs
new file mode 100644
index 0000000000..86750c74b7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/7BitEncodedInts.cs
@@ -0,0 +1,123 @@
+// Copyright (c) 2011 Daniel Grunwald
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+
+namespace ICSharpCode.NRefactory6.Utils
+{
+	/// <summary>
+	/// A binary reader that can read the output of BinaryWriterWith7BitEncodedInts.
+	/// </summary>
+	sealed class BinaryReaderWith7BitEncodedInts : BinaryReader
+	{
+		public BinaryReaderWith7BitEncodedInts(Stream stream) : base(stream)
+		{
+		}
+		
+		public override short ReadInt16()
+		{
+			return unchecked((short)(ushort)base.Read7BitEncodedInt());
+		}
+		
+		// [CLSCompliant(false)]
+		public override ushort ReadUInt16()
+		{
+			return unchecked((ushort)base.Read7BitEncodedInt());
+		}
+		
+		public override int ReadInt32()
+		{
+			return base.Read7BitEncodedInt();
+		}
+		
+		// [CLSCompliant(false)]
+		public override uint ReadUInt32()
+		{
+			return unchecked((uint)base.Read7BitEncodedInt());
+		}
+		
+		public override long ReadInt64()
+		{
+			return unchecked((long)this.ReadUInt64());
+		}
+		
+		// [CLSCompliant(false)]
+		public override ulong ReadUInt64()
+		{
+			ulong num = 0;
+			int shift = 0;
+			while (shift < 64) {
+				byte b = this.ReadByte();
+				num |= (ulong)(b & 127) << shift;
+				shift += 7;
+				if ((b & 128) == 0) {
+					return num;
+				}
+			}
+			throw new FormatException("Invalid 7-bit int64");
+		}
+	}
+
+	/// <summary>
+	/// A binary writer that encodes all integers as 7-bit-encoded-ints.
+	/// </summary>
+	public sealed class BinaryWriterWith7BitEncodedInts : BinaryWriter
+	{
+		public BinaryWriterWith7BitEncodedInts(Stream stream) : base(stream)
+		{
+		}
+		
+		public override void Write(short value)
+		{
+			base.Write7BitEncodedInt(unchecked((ushort)value));
+		}
+		
+		// [CLSCompliant(false)]
+		public override void Write(ushort value)
+		{
+			base.Write7BitEncodedInt(value);
+		}
+		
+		public override void Write(int value)
+		{
+			base.Write7BitEncodedInt(value);
+		}
+		
+		// [CLSCompliant(false)]
+		public override void Write(uint value)
+		{
+			base.Write7BitEncodedInt(unchecked((int)value));
+		}
+		
+		public override void Write(long value)
+		{
+			this.Write(unchecked((ulong)value));
+		}
+		
+		// [CLSCompliant(false)]
+		public override void Write(ulong value)
+		{
+			while (value >= 128) {
+				this.Write(unchecked((byte)(value | 128u)));
+				value >>= 7;
+			}
+			this.Write(unchecked((byte)value));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/AccessibilityUtilities.cs b/main/src/addins/CSharpBinding/Util/AccessibilityUtilities.cs
new file mode 100644
index 0000000000..f0c0560f3d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/AccessibilityUtilities.cs
@@ -0,0 +1,67 @@
+//
+// AccessibilityUtilities.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal static class AccessibilityUtilities
+	{
+		public static Accessibility Minimum(Accessibility accessibility1, Accessibility accessibility2)
+		{
+			if (accessibility1 == Accessibility.Private || accessibility2 == Accessibility.Private)
+			{
+				return Accessibility.Private;
+			}
+
+			if (accessibility1 == Accessibility.ProtectedAndInternal || accessibility2 == Accessibility.ProtectedAndInternal)
+			{
+				return Accessibility.ProtectedAndInternal;
+			}
+
+			if (accessibility1 == Accessibility.Protected || accessibility2 == Accessibility.Protected)
+			{
+				return Accessibility.Protected;
+			}
+
+			if (accessibility1 == Accessibility.Internal || accessibility2 == Accessibility.Internal)
+			{
+				return Accessibility.Internal;
+			}
+
+			if (accessibility1 == Accessibility.ProtectedOrInternal || accessibility2 == Accessibility.ProtectedOrInternal)
+			{
+				return Accessibility.ProtectedOrInternal;
+			}
+
+			return Accessibility.Public;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/AnnotationTable.cs b/main/src/addins/CSharpBinding/Util/AnnotationTable.cs
new file mode 100644
index 0000000000..e18bcb5529
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/AnnotationTable.cs
@@ -0,0 +1,275 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	/// An AnnotationTable helps you attach your own annotation types/instances to syntax.  
+	/// 
+	/// It maintains a map between your instances and actual SyntaxAnnotation's used to annotate the nodes
+	/// and offers an API that matches the true annotation API on SyntaxNode.
+	/// 
+	/// The table controls the lifetime of when you can find and retrieve your annotations. You won't be able to 
+	/// find your annotations via HasAnnotations/GetAnnotations unless you use the same annotation table for these operations
+	/// that you used for the WithAdditionalAnnotations operation.  
+	/// 
+	/// Your custom annotations are not serialized with the syntax tree, so they won't move across boundaries unless the 
+	/// same AnnotationTable is available on both ends.
+	/// 
+	/// also, note that this table is not thread safe.
+	/// </summary>
+	class AnnotationTable<TAnnotation> where TAnnotation : class
+	{
+		private int _globalId = 0;
+
+		private readonly Dictionary<TAnnotation, SyntaxAnnotation> _realAnnotationMap = new Dictionary<TAnnotation, SyntaxAnnotation>();
+		private readonly Dictionary<string, TAnnotation> _annotationMap = new Dictionary<string, TAnnotation>();
+
+		private readonly string _annotationKind;
+
+		public AnnotationTable(string annotationKind)
+		{
+			_annotationKind = annotationKind;
+		}
+
+		private IEnumerable<SyntaxAnnotation> GetOrCreateRealAnnotations(TAnnotation[] annotations)
+		{
+			foreach (var annotation in annotations)
+			{
+				yield return this.GetOrCreateRealAnnotation(annotation);
+			}
+		}
+
+		private SyntaxAnnotation GetOrCreateRealAnnotation(TAnnotation annotation)
+		{
+			SyntaxAnnotation realAnnotation;
+			if (!_realAnnotationMap.TryGetValue(annotation, out realAnnotation))
+			{
+				var id = Interlocked.Increment(ref _globalId);
+				var idString = id.ToString();
+
+				realAnnotation = new SyntaxAnnotation(_annotationKind, idString);
+				_annotationMap.Add(idString, annotation);
+				_realAnnotationMap.Add(annotation, realAnnotation);
+			}
+
+			return realAnnotation;
+		}
+
+		private IEnumerable<SyntaxAnnotation> GetRealAnnotations(TAnnotation[] annotations)
+		{
+			foreach (var annotation in annotations)
+			{
+				var realAnnotation = this.GetRealAnnotation(annotation);
+				if (realAnnotation != null)
+				{
+					yield return realAnnotation;
+				}
+			}
+		}
+
+		private SyntaxAnnotation GetRealAnnotation(TAnnotation annotation)
+		{
+			SyntaxAnnotation realAnnotation;
+			_realAnnotationMap.TryGetValue(annotation, out realAnnotation);
+			return realAnnotation;
+		}
+
+		public TSyntaxNode WithAdditionalAnnotations<TSyntaxNode>(TSyntaxNode node, params TAnnotation[] annotations) where TSyntaxNode : SyntaxNode
+		{
+			return node.WithAdditionalAnnotations(this.GetOrCreateRealAnnotations(annotations).ToArray());
+		}
+
+		public SyntaxToken WithAdditionalAnnotations(SyntaxToken token, params TAnnotation[] annotations)
+		{
+			return token.WithAdditionalAnnotations(this.GetOrCreateRealAnnotations(annotations).ToArray());
+		}
+
+		public SyntaxTrivia WithAdditionalAnnotations(SyntaxTrivia trivia, params TAnnotation[] annotations)
+		{
+			return trivia.WithAdditionalAnnotations(this.GetOrCreateRealAnnotations(annotations).ToArray());
+		}
+
+		public SyntaxNodeOrToken WithAdditionalAnnotations(SyntaxNodeOrToken nodeOrToken, params TAnnotation[] annotations)
+		{
+			return nodeOrToken.WithAdditionalAnnotations(this.GetOrCreateRealAnnotations(annotations).ToArray());
+		}
+
+		public TSyntaxNode WithoutAnnotations<TSyntaxNode>(TSyntaxNode node, params TAnnotation[] annotations) where TSyntaxNode : SyntaxNode
+		{
+			return node.WithoutAnnotations(GetRealAnnotations(annotations).ToArray());
+		}
+
+		public SyntaxToken WithoutAnnotations(SyntaxToken token, params TAnnotation[] annotations)
+		{
+			return token.WithoutAnnotations(GetRealAnnotations(annotations).ToArray());
+		}
+
+		public SyntaxTrivia WithoutAnnotations(SyntaxTrivia trivia, params TAnnotation[] annotations)
+		{
+			return trivia.WithoutAnnotations(GetRealAnnotations(annotations).ToArray());
+		}
+
+		public SyntaxNodeOrToken WithoutAnnotations(SyntaxNodeOrToken nodeOrToken, params TAnnotation[] annotations)
+		{
+			return nodeOrToken.WithoutAnnotations(GetRealAnnotations(annotations).ToArray());
+		}
+
+		private IEnumerable<TAnnotation> GetAnnotations(IEnumerable<SyntaxAnnotation> realAnnotations)
+		{
+			foreach (var ra in realAnnotations)
+			{
+				TAnnotation annotation;
+				if (_annotationMap.TryGetValue(ra.Data, out annotation))
+				{
+					yield return annotation;
+				}
+			}
+		}
+
+		public IEnumerable<TAnnotation> GetAnnotations(SyntaxNode node)
+		{
+			return GetAnnotations(node.GetAnnotations(_annotationKind));
+		}
+
+		public IEnumerable<TAnnotation> GetAnnotations(SyntaxToken token)
+		{
+			return GetAnnotations(token.GetAnnotations(_annotationKind));
+		}
+
+		public IEnumerable<TAnnotation> GetAnnotations(SyntaxTrivia trivia)
+		{
+			return GetAnnotations(trivia.GetAnnotations(_annotationKind));
+		}
+
+		public IEnumerable<TAnnotation> GetAnnotations(SyntaxNodeOrToken nodeOrToken)
+		{
+			return GetAnnotations(nodeOrToken.GetAnnotations(_annotationKind));
+		}
+
+		public IEnumerable<TSpecificAnnotation> GetAnnotations<TSpecificAnnotation>(SyntaxNode node) where TSpecificAnnotation : TAnnotation
+		{
+			return this.GetAnnotations(node).OfType<TSpecificAnnotation>();
+		}
+
+		public IEnumerable<TSpecificAnnotation> GetAnnotations<TSpecificAnnotation>(SyntaxToken token) where TSpecificAnnotation : TAnnotation
+		{
+			return this.GetAnnotations(token).OfType<TSpecificAnnotation>();
+		}
+
+		public IEnumerable<TSpecificAnnotation> GetAnnotations<TSpecificAnnotation>(SyntaxTrivia trivia) where TSpecificAnnotation : TAnnotation
+		{
+			return this.GetAnnotations(trivia).OfType<TSpecificAnnotation>();
+		}
+
+		public IEnumerable<TSpecificAnnotation> GetAnnotations<TSpecificAnnotation>(SyntaxNodeOrToken nodeOrToken) where TSpecificAnnotation : TAnnotation
+		{
+			return this.GetAnnotations(nodeOrToken).OfType<TSpecificAnnotation>();
+		}
+
+		public bool HasAnnotations(SyntaxNode node)
+		{
+			return node.HasAnnotations(_annotationKind);
+		}
+
+		public bool HasAnnotations(SyntaxToken token)
+		{
+			return token.HasAnnotations(_annotationKind);
+		}
+
+		public bool HasAnnotations(SyntaxTrivia trivia)
+		{
+			return trivia.HasAnnotations(_annotationKind);
+		}
+
+		public bool HasAnnotations(SyntaxNodeOrToken nodeOrToken)
+		{
+			return nodeOrToken.HasAnnotations(_annotationKind);
+		}
+
+		public bool HasAnnotations<TSpecificAnnotation>(SyntaxNode node) where TSpecificAnnotation : TAnnotation
+		{
+			return this.GetAnnotations(node).OfType<TSpecificAnnotation>().Any();
+		}
+
+		public bool HasAnnotations<TSpecificAnnotation>(SyntaxToken token) where TSpecificAnnotation : TAnnotation
+		{
+			return this.GetAnnotations(token).OfType<TSpecificAnnotation>().Any();
+		}
+
+		public bool HasAnnotations<TSpecificAnnotation>(SyntaxTrivia trivia) where TSpecificAnnotation : TAnnotation
+		{
+			return this.GetAnnotations(trivia).OfType<TSpecificAnnotation>().Any();
+		}
+
+		public bool HasAnnotations<TSpecificAnnotation>(SyntaxNodeOrToken nodeOrToken) where TSpecificAnnotation : TAnnotation
+		{
+			return this.GetAnnotations(nodeOrToken).OfType<TSpecificAnnotation>().Any();
+		}
+
+		public bool HasAnnotation(SyntaxNode node, TAnnotation annotation)
+		{
+			return node.HasAnnotation(this.GetRealAnnotation(annotation));
+		}
+
+		public bool HasAnnotation(SyntaxToken token, TAnnotation annotation)
+		{
+			return token.HasAnnotation(this.GetRealAnnotation(annotation));
+		}
+
+		public bool HasAnnotation(SyntaxTrivia trivia, TAnnotation annotation)
+		{
+			return trivia.HasAnnotation(this.GetRealAnnotation(annotation));
+		}
+
+		public bool HasAnnotation(SyntaxNodeOrToken nodeOrToken, TAnnotation annotation)
+		{
+			return nodeOrToken.HasAnnotation(this.GetRealAnnotation(annotation));
+		}
+
+		public IEnumerable<SyntaxNodeOrToken> GetAnnotatedNodesAndTokens(SyntaxNode node)
+		{
+			return node.GetAnnotatedNodesAndTokens(_annotationKind);
+		}
+
+		public IEnumerable<SyntaxNode> GetAnnotatedNodes(SyntaxNode node)
+		{
+			return node.GetAnnotatedNodesAndTokens(_annotationKind).Where(nt => nt.IsNode).Select(nt => nt.AsNode());
+		}
+
+		public IEnumerable<SyntaxToken> GetAnnotatedTokens(SyntaxNode node)
+		{
+			return node.GetAnnotatedNodesAndTokens(_annotationKind).Where(nt => nt.IsToken).Select(nt => nt.AsToken());
+		}
+
+		public IEnumerable<SyntaxTrivia> GetAnnotatedTrivia(SyntaxNode node)
+		{
+			return node.GetAnnotatedTrivia(_annotationKind);
+		}
+
+		public IEnumerable<SyntaxNodeOrToken> GetAnnotatedNodesAndTokens<TSpecificAnnotation>(SyntaxNode node) where TSpecificAnnotation : TAnnotation
+		{
+			return node.GetAnnotatedNodesAndTokens(_annotationKind).Where(nt => this.HasAnnotations<TSpecificAnnotation>(nt));
+		}
+
+		public IEnumerable<SyntaxNode> GetAnnotatedNodes<TSpecificAnnotation>(SyntaxNode node) where TSpecificAnnotation : TAnnotation
+		{
+			return node.GetAnnotatedNodesAndTokens(_annotationKind).Where(nt => nt.IsNode && this.HasAnnotations<TSpecificAnnotation>(nt)).Select(nt => nt.AsNode());
+		}
+
+		public IEnumerable<SyntaxToken> GetAnnotatedTokens<TSpecificAnnotation>(SyntaxNode node) where TSpecificAnnotation : TAnnotation
+		{
+			return node.GetAnnotatedNodesAndTokens(_annotationKind).Where(nt => nt.IsToken && this.HasAnnotations<TSpecificAnnotation>(nt)).Select(nt => nt.AsToken());
+		}
+
+		public IEnumerable<SyntaxTrivia> GetAnnotatedTrivia<TSpecificAnnotation>(SyntaxNode node) where TSpecificAnnotation : TAnnotation
+		{
+			return node.GetAnnotatedTrivia(_annotationKind).Where(tr => this.HasAnnotations<TSpecificAnnotation>(tr));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ArgumentSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/ArgumentSyntaxExtensions.cs
new file mode 100644
index 0000000000..9dd82a8ee3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ArgumentSyntaxExtensions.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class ArgumentSyntaxExtensions
+	{
+		public static SyntaxTokenList GenerateParameterModifiers(this ArgumentSyntax argument)
+		{
+			// If the argument was marked with ref or out, then do the same for the parameter.
+			if (argument.RefOrOutKeyword.Kind() == SyntaxKind.RefKeyword ||
+				argument.RefOrOutKeyword.Kind() == SyntaxKind.OutKeyword)
+			{
+				return SyntaxFactory.TokenList(SyntaxFactory.Token(argument.RefOrOutKeyword.Kind()));
+			}
+
+			return default(SyntaxTokenList);
+		}
+
+		public static RefKind GetRefKind(this ArgumentSyntax argument)
+		{
+			var refSyntaxKind = argument.RefOrOutKeyword.Kind();
+			return
+				refSyntaxKind == SyntaxKind.RefKeyword ? RefKind.Ref :
+				refSyntaxKind == SyntaxKind.OutKeyword ? RefKind.Out : RefKind.None;
+		}
+
+		/// <summary>
+		/// Returns the parameter to which this argument is passed. If <paramref name="allowParams"/>
+		/// is true, the last parameter will be returned if it is params parameter and the index of
+		/// the specified argument is greater than the number of parameters.
+		/// </summary>
+		public static IParameterSymbol DetermineParameter(
+			this ArgumentSyntax argument,
+			SemanticModel semanticModel,
+			bool allowParams = false,
+			CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var argumentList = argument.Parent as BaseArgumentListSyntax;
+			if (argumentList == null)
+			{
+				return null;
+			}
+
+			var invocableExpression = argumentList.Parent as ExpressionSyntax;
+			if (invocableExpression == null)
+			{
+				return null;
+			}
+
+			var symbol = semanticModel.GetSymbolInfo(invocableExpression, cancellationToken).Symbol;
+			if (symbol == null)
+			{
+				return null;
+			}
+
+			var parameters = symbol.GetParameters();
+
+			// Handle named argument
+			if (argument.NameColon != null && !argument.NameColon.IsMissing)
+			{
+				var name = argument.NameColon.Name.Identifier.ValueText;
+				return parameters.FirstOrDefault(p => p.Name == name);
+			}
+
+			// Handle positional argument
+			var index = argumentList.Arguments.IndexOf(argument);
+			if (index < 0)
+			{
+				return null;
+			}
+
+			if (index < parameters.Length)
+			{
+				return parameters[index];
+			}
+
+			if (allowParams)
+			{
+				var lastParameter = parameters.LastOrDefault();
+				if (lastParameter == null)
+				{
+					return null;
+				}
+
+				if (lastParameter.IsParams)
+				{
+					return lastParameter;
+				}
+			}
+
+			return null;
+		}
+
+		public static ITypeSymbol DetermineParameterType(
+			this ArgumentSyntax argument,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			// If a parameter appears to have a void return type, then just use 'object'
+			// instead.
+			var typeInfo = semanticModel.GetTypeInfo(argument.Expression, cancellationToken);
+			if (typeInfo.Type != null && typeInfo.Type.SpecialType == SpecialType.System_Void)
+			{
+				return semanticModel.Compilation.ObjectType;
+			}
+
+			return semanticModel.GetType(argument.Expression, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/CSharpSemanticFactsService.cs b/main/src/addins/CSharpBinding/Util/CSharpSemanticFactsService.cs
new file mode 100644
index 0000000000..fdb3b22f72
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CSharpSemanticFactsService.cs
@@ -0,0 +1,270 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Composition;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CSharpSemanticFactsService
+	{
+		public static bool SupportsImplicitInterfaceImplementation
+		{
+			get
+			{
+				return true;
+			}
+		}
+
+		public static bool ExposesAnonymousFunctionParameterNames
+		{
+			get
+			{
+				return false;
+			}
+		}
+
+		public static bool IsExpressionContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsExpressionContext(
+				position,
+				csharpModel.SyntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken),
+				attributes: true, cancellationToken: cancellationToken, semanticModelOpt: csharpModel);
+		}
+
+		public static bool IsStatementContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsStatementContext(
+				position, csharpModel.SyntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken), cancellationToken);
+		}
+
+		public static bool IsTypeContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsTypeContext(position, cancellationToken, csharpModel);
+		}
+
+		public static bool IsNamespaceContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsNamespaceContext(position, cancellationToken, csharpModel);
+		}
+
+		public static bool IsTypeDeclarationContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsTypeDeclarationContext(
+				position, csharpModel.SyntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken), cancellationToken);
+		}
+
+		public static bool IsMemberDeclarationContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsMemberDeclarationContext(
+				position, csharpModel.SyntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken), cancellationToken);
+		}
+
+		public static bool IsPreProcessorDirectiveContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsPreProcessorDirectiveContext(
+				position, csharpModel.SyntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken, includeDirectives: true), cancellationToken);
+		}
+
+		public static bool IsGlobalStatementContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsGlobalStatementContext(position, cancellationToken);
+		}
+
+		public static bool IsLabelContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsLabelContext(position, cancellationToken);
+		}
+
+		public static bool IsAttributeNameContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var csharpModel = (SemanticModel)semanticModel;
+			return csharpModel.SyntaxTree.IsAttributeNameContext(position, cancellationToken);
+		}
+
+		public static bool IsWrittenTo(this SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return (node as ExpressionSyntax).IsWrittenTo();
+		}
+
+		public static bool IsOnlyWrittenTo(this SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return (node as ExpressionSyntax).IsOnlyWrittenTo();
+		}
+
+		public static bool IsInOutContext(this SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return (node as ExpressionSyntax).IsInOutContext();
+		}
+
+		public static bool IsInRefContext(this SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return (node as ExpressionSyntax).IsInRefContext();
+		}
+
+		public static bool CanReplaceWithRValue(this SemanticModel semanticModel, SyntaxNode expression, CancellationToken cancellationToken)
+		{
+			return (expression as ExpressionSyntax).CanReplaceWithRValue(semanticModel, cancellationToken);
+		}
+
+		public static string GenerateNameForExpression(this SemanticModel semanticModel, SyntaxNode expression, bool capitalize = false)
+		{
+			return semanticModel.GenerateNameForExpression((ExpressionSyntax)expression, capitalize);
+		}
+
+		public static ISymbol GetDeclaredSymbol(this SemanticModel semanticModel, SyntaxToken token, CancellationToken cancellationToken)
+		{
+			var location = token.GetLocation();
+			var q = from node in token.GetAncestors<SyntaxNode>()
+				let symbol = semanticModel.GetDeclaredSymbol(node, cancellationToken)
+					where symbol != null && symbol.Locations.Contains(location)
+				select symbol;
+
+			return q.FirstOrDefault();
+		}
+
+		public static bool LastEnumValueHasInitializer(INamedTypeSymbol namedTypeSymbol)
+		{
+			var enumDecl = namedTypeSymbol.DeclaringSyntaxReferences.Select(r => r.GetSyntax()).OfType<EnumDeclarationSyntax>().FirstOrDefault();
+			if (enumDecl != null)
+			{
+				var lastMember = enumDecl.Members.LastOrDefault();
+				if (lastMember != null)
+				{
+					return lastMember.EqualsValue != null;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool SupportsParameterizedProperties
+		{
+			get
+			{
+				return false;
+			}
+		}
+
+		public static bool SupportsParameterizedEvents
+		{
+			get
+			{
+				return true;
+			}
+		}
+
+		public static bool TryGetSpeculativeSemanticModel(this SemanticModel oldSemanticModel, SyntaxNode oldNode, SyntaxNode newNode, out SemanticModel speculativeModel)
+		{
+			var model = oldSemanticModel;
+
+			// currently we only support method. field support will be added later.
+			var oldMethod = oldNode as BaseMethodDeclarationSyntax;
+			var newMethod = newNode as BaseMethodDeclarationSyntax;
+			if (oldMethod == null || newMethod == null || oldMethod.Body == null)
+			{
+				speculativeModel = null;
+				return false;
+			}
+
+			SemanticModel csharpModel;
+			bool success = model.TryGetSpeculativeSemanticModelForMethodBody(oldMethod.Body.OpenBraceToken.Span.End, newMethod, out csharpModel);
+			speculativeModel = csharpModel;
+			return success;
+		}
+
+//		public static ImmutableHashSet<string> GetAliasNameSet(this SemanticModel model, CancellationToken cancellationToken)
+//		{
+//			var original = (SemanticModel)model.GetOriginalSemanticModel();
+//			if (!original.SyntaxTree.HasCompilationUnitRoot)
+//			{
+//				return ImmutableHashSet.Create<string>();
+//			}
+//
+//			var root = original.SyntaxTree.GetCompilationUnitRoot(cancellationToken);
+//			var builder = ImmutableHashSet.CreateBuilder<string>(StringComparer.Ordinal);
+//
+//			AppendAliasNames(root.Usings, builder);
+//			AppendAliasNames(root.Members.OfType<NamespaceDeclarationSyntax>(), builder, cancellationToken);
+//
+//			return builder.ToImmutable();
+//		}
+//
+//		private static void AppendAliasNames(SyntaxList<UsingDirectiveSyntax> usings, ImmutableHashSet<string>.Builder builder)
+//		{
+//			foreach (var @using in usings)
+//			{
+//				if (@using.Alias == null || @using.Alias.Name == null)
+//				{
+//					continue;
+//				}
+//
+//				@using.Alias.Name.Identifier.ValueText.AppendToAliasNameSet(builder);
+//			}
+//		}
+//
+//		private void AppendAliasNames(IEnumerable<NamespaceDeclarationSyntax> namespaces, ImmutableHashSet<string>.Builder builder, CancellationToken cancellationToken)
+//		{
+//			foreach (var @namespace in namespaces)
+//			{
+//				cancellationToken.ThrowIfCancellationRequested();
+//
+//				AppendAliasNames(@namespace.Usings, builder);
+//				AppendAliasNames(@namespace.Members.OfType<NamespaceDeclarationSyntax>(), builder, cancellationToken);
+//			}
+//		}
+
+//		public static ForEachSymbols GetForEachSymbols(this SemanticModel semanticModel, SyntaxNode forEachStatement)
+//		{
+//			var csforEachStatement = forEachStatement as ForEachStatementSyntax;
+//			if (csforEachStatement != null)
+//			{
+//				var info = semanticModel.GetForEachStatementInfo(csforEachStatement);
+//				return new ForEachSymbols(
+//					info.GetEnumeratorMethod,
+//					info.MoveNextMethod,
+//					info.CurrentProperty,
+//					info.DisposeMethod,
+//					info.ElementType);
+//			}
+//			else
+//			{
+//				return default(ForEachSymbols);
+//			}
+//		}
+
+		public static bool IsAssignableTo(ITypeSymbol fromSymbol, ITypeSymbol toSymbol, Compilation compilation)
+		{
+			return fromSymbol != null &&
+				toSymbol != null &&
+				((CSharpCompilation)compilation).ClassifyConversion(fromSymbol, toSymbol).IsImplicit;
+		}
+
+		public static bool IsNameOfContext(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			return semanticModel.SyntaxTree.IsNameOfContext(position, semanticModel, cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/CSharpSyntaxContext.cs b/main/src/addins/CSharpBinding/Util/CSharpSyntaxContext.cs
new file mode 100644
index 0000000000..5e9780f70d
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CSharpSyntaxContext.cs
@@ -0,0 +1,572 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class ReflectionNamespaces
+	{
+		public const string WorkspacesAsmName = ", Microsoft.CodeAnalysis.Workspaces";
+		public const string CSWorkspacesAsmName = ", Microsoft.CodeAnalysis.CSharp.Workspaces";
+		public const string CAAsmName = ", Microsoft.CodeAnalysis";
+		public const string CACSharpAsmName = ", Microsoft.CodeAnalysis.CSharp";
+	}
+
+	class CSharpSyntaxContext
+	{
+		readonly static Type typeInfoCSharpSyntaxContext;
+		readonly static Type typeInfoAbstractSyntaxContext;
+		readonly static MethodInfo createContextMethod;
+		readonly static PropertyInfo leftTokenProperty;
+		readonly static PropertyInfo targetTokenProperty;
+		readonly static FieldInfo isIsOrAsTypeContextField;
+		readonly static FieldInfo isInstanceContextField;
+		readonly static FieldInfo isNonAttributeExpressionContextField;
+		readonly static FieldInfo isPreProcessorKeywordContextField;
+		readonly static FieldInfo isPreProcessorExpressionContextField;
+		readonly static FieldInfo containingTypeDeclarationField;
+		readonly static FieldInfo isGlobalStatementContextField;
+		readonly static FieldInfo isParameterTypeContextField;
+		readonly static PropertyInfo syntaxTreeProperty;
+
+
+		object instance;
+
+		public SyntaxToken LeftToken {
+			get {
+				return (SyntaxToken)leftTokenProperty.GetValue (instance);
+			}
+		}
+
+		public SyntaxToken TargetToken {
+			get {
+				return (SyntaxToken)targetTokenProperty.GetValue (instance);
+			}
+		}
+
+		public bool IsIsOrAsTypeContext {
+			get {
+				return (bool)isIsOrAsTypeContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsInstanceContext {
+			get {
+				return (bool)isInstanceContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsNonAttributeExpressionContext {
+			get {
+				return (bool)isNonAttributeExpressionContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsPreProcessorKeywordContext {
+			get {
+				return (bool)isPreProcessorKeywordContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsPreProcessorExpressionContext {
+			get {
+				return (bool)isPreProcessorExpressionContextField.GetValue (instance);
+			}
+		}
+
+		public TypeDeclarationSyntax ContainingTypeDeclaration {
+			get {
+				return (TypeDeclarationSyntax)containingTypeDeclarationField.GetValue (instance);
+			}
+		}
+
+		public bool IsGlobalStatementContext {
+			get {
+				return (bool)isGlobalStatementContextField.GetValue (instance);
+			}
+		}
+
+		public bool IsParameterTypeContext {
+			get {
+				return (bool)isParameterTypeContextField.GetValue (instance);
+			}
+		}
+
+		public SyntaxTree SyntaxTree {
+			get {
+				return (SyntaxTree)syntaxTreeProperty.GetValue (instance);
+			}
+		}
+
+
+		readonly static MethodInfo isMemberDeclarationContextMethod;
+
+		public bool IsMemberDeclarationContext (
+			ISet<SyntaxKind> validModifiers = null,
+			ISet<SyntaxKind> validTypeDeclarations = null,
+			bool canBePartial = false,
+			CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (bool)isMemberDeclarationContextMethod.Invoke (instance, new object[] {
+					validModifiers,
+					validTypeDeclarations,
+					canBePartial,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		readonly static MethodInfo isTypeDeclarationContextMethod;
+
+		public bool IsTypeDeclarationContext (
+			ISet<SyntaxKind> validModifiers = null,
+			ISet<SyntaxKind> validTypeDeclarations = null,
+			bool canBePartial = false,
+			CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (bool)isTypeDeclarationContextMethod.Invoke (instance, new object[] {
+					validModifiers,
+					validTypeDeclarations,
+					canBePartial,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		readonly static PropertyInfo isPreProcessorDirectiveContextProperty;
+
+		public bool IsPreProcessorDirectiveContext {
+			get {
+				return (bool)isPreProcessorDirectiveContextProperty.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isInNonUserCodeField;
+
+		public bool IsInNonUserCode {
+			get {
+				return (bool)isInNonUserCodeField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isIsOrAsContextField;
+
+		public bool IsIsOrAsContext {
+			get {
+				return (bool)isIsOrAsContextField.GetValue (instance);
+			}
+		}
+
+		readonly static MethodInfo isTypeAttributeContextMethod;
+
+		public bool IsTypeAttributeContext (CancellationToken cancellationToken)
+		{
+			try {
+				return (bool)isTypeAttributeContextMethod.Invoke (instance, new object[] { cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		readonly static PropertyInfo isAnyExpressionContextProperty;
+
+		public bool IsAnyExpressionContext {
+			get {
+				return (bool)isAnyExpressionContextProperty.GetValue (instance);
+			}
+		}
+
+		readonly static PropertyInfo isStatementContextProperty;
+
+		public bool IsStatementContext {
+			get {
+				return (bool)isStatementContextProperty.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isDefiniteCastTypeContextField;
+
+		public bool IsDefiniteCastTypeContext {
+			get {
+				return (bool)isDefiniteCastTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isObjectCreationTypeContextField;
+
+		public bool IsObjectCreationTypeContext {
+			get {
+				return (bool)isObjectCreationTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isGenericTypeArgumentContextField;
+
+		public bool IsGenericTypeArgumentContext {
+			get {
+				return (bool)isGenericTypeArgumentContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isLocalVariableDeclarationContextField;
+
+		public bool IsLocalVariableDeclarationContext {
+			get {
+				return (bool)isLocalVariableDeclarationContextField.GetValue (instance);
+			}
+		}
+
+
+		readonly static FieldInfo isFixedVariableDeclarationContextField;
+
+		public bool IsFixedVariableDeclarationContext {
+			get {
+				return (bool)isFixedVariableDeclarationContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isPossibleLambdaOrAnonymousMethodParameterTypeContextField;
+
+		public bool IsPossibleLambdaOrAnonymousMethodParameterTypeContext {
+			get {
+				return (bool)isPossibleLambdaOrAnonymousMethodParameterTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isImplicitOrExplicitOperatorTypeContextField;
+
+		public bool IsImplicitOrExplicitOperatorTypeContext {
+			get {
+				return (bool)isImplicitOrExplicitOperatorTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isPrimaryFunctionExpressionContextField;
+
+		public bool IsPrimaryFunctionExpressionContext {
+			get {
+				return (bool)isPrimaryFunctionExpressionContextField.GetValue (instance);
+			}
+		}
+
+
+		readonly static FieldInfo isCrefContextField;
+
+		public bool IsCrefContext {
+			get {
+				return (bool)isCrefContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isDelegateReturnTypeContextField;
+
+		public bool IsDelegateReturnTypeContext {
+			get {
+				return (bool)isDelegateReturnTypeContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isEnumBaseListContextField;
+
+		public bool IsEnumBaseListContext {
+			get {
+				return (bool)isEnumBaseListContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isConstantExpressionContextField;
+
+		public bool IsConstantExpressionContext {
+			get {
+				return (bool)isConstantExpressionContextField.GetValue (instance);
+			}
+		}
+
+		readonly static MethodInfo isMemberAttributeContextMethod;
+		public bool IsMemberAttributeContext(ISet<SyntaxKind> validTypeDeclarations, CancellationToken cancellationToken)
+		{
+			try {
+				return (bool)isMemberAttributeContextMethod.Invoke (instance, new object [] {
+					validTypeDeclarations,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+
+		}
+
+		readonly static FieldInfo precedingModifiersField;
+
+		public ISet<SyntaxKind> PrecedingModifiers {
+			get {
+				return (ISet<SyntaxKind>)precedingModifiersField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo isTypeOfExpressionContextField;
+
+		public bool IsTypeOfExpressionContext {
+			get {
+				return (bool)isTypeOfExpressionContextField.GetValue (instance);
+			}
+		}
+
+		readonly static FieldInfo containingTypeOrEnumDeclarationField;
+
+		public BaseTypeDeclarationSyntax ContainingTypeOrEnumDeclaration {
+			get {
+				return (BaseTypeDeclarationSyntax)containingTypeOrEnumDeclarationField.GetValue (instance);
+			}
+		}
+		static readonly PropertyInfo isAttributeNameContextProperty;
+
+		public bool IsAttributeNameContext {
+			get {
+				return (bool)isAttributeNameContextProperty.GetValue (instance);
+			}
+		}
+
+		static readonly PropertyInfo isInQueryProperty;
+		public bool IsInQuery {
+			get {
+				return (bool)isInQueryProperty.GetValue (instance);
+			}
+		}
+
+
+		static CSharpSyntaxContext ()
+		{
+			typeInfoAbstractSyntaxContext = Type.GetType("Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery.AbstractSyntaxContext" + ReflectionNamespaces.WorkspacesAsmName, true);
+			typeInfoCSharpSyntaxContext = Type.GetType ("Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery.CSharpSyntaxContext" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+
+			createContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("CreateContext", BindingFlags.Static | BindingFlags.Public);
+			leftTokenProperty = typeInfoAbstractSyntaxContext.GetProperty ("LeftToken");
+			targetTokenProperty = typeInfoAbstractSyntaxContext.GetProperty ("TargetToken");
+			isIsOrAsTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsIsOrAsTypeContext");
+			isInstanceContextField = typeInfoCSharpSyntaxContext.GetField ("IsInstanceContext");
+			isNonAttributeExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsNonAttributeExpressionContext");
+			isPreProcessorKeywordContextField = typeInfoCSharpSyntaxContext.GetField ("IsPreProcessorKeywordContext");
+			isPreProcessorExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsPreProcessorExpressionContext");
+			containingTypeDeclarationField = typeInfoCSharpSyntaxContext.GetField ("ContainingTypeDeclaration");
+			isGlobalStatementContextField = typeInfoCSharpSyntaxContext.GetField ("IsGlobalStatementContext");
+			isParameterTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsParameterTypeContext");
+			isMemberDeclarationContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("IsMemberDeclarationContext", BindingFlags.Instance | BindingFlags.Public);
+			isTypeDeclarationContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("IsTypeDeclarationContext", BindingFlags.Instance | BindingFlags.Public);
+			syntaxTreeProperty = typeInfoAbstractSyntaxContext.GetProperty ("SyntaxTree");
+			isPreProcessorDirectiveContextProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsPreProcessorDirectiveContext");
+			isInNonUserCodeField = typeInfoCSharpSyntaxContext.GetField ("IsInNonUserCode");
+			isIsOrAsContextField = typeInfoCSharpSyntaxContext.GetField ("IsIsOrAsContext");
+			isTypeAttributeContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("IsTypeAttributeContext", BindingFlags.Instance | BindingFlags.Public);
+			isAnyExpressionContextProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsAnyExpressionContext");
+			isStatementContextProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsStatementContext");
+			isDefiniteCastTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsDefiniteCastTypeContext");
+			isObjectCreationTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsObjectCreationTypeContext");
+			isGenericTypeArgumentContextField = typeInfoCSharpSyntaxContext.GetField ("IsGenericTypeArgumentContext");
+			isLocalVariableDeclarationContextField = typeInfoCSharpSyntaxContext.GetField ("IsLocalVariableDeclarationContext");
+			isFixedVariableDeclarationContextField = typeInfoCSharpSyntaxContext.GetField ("IsFixedVariableDeclarationContext");
+			isPossibleLambdaOrAnonymousMethodParameterTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsPossibleLambdaOrAnonymousMethodParameterTypeContext");
+			isImplicitOrExplicitOperatorTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsImplicitOrExplicitOperatorTypeContext");
+			isPrimaryFunctionExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsPrimaryFunctionExpressionContext");
+			isCrefContextField = typeInfoCSharpSyntaxContext.GetField ("IsCrefContext");
+			isDelegateReturnTypeContextField = typeInfoCSharpSyntaxContext.GetField ("IsDelegateReturnTypeContext");
+			isEnumBaseListContextField = typeInfoCSharpSyntaxContext.GetField ("IsEnumBaseListContext");
+			isConstantExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsConstantExpressionContext");
+			isMemberAttributeContextMethod = typeInfoCSharpSyntaxContext.GetMethod ("IsMemberAttributeContext", BindingFlags.Instance | BindingFlags.Public);
+			precedingModifiersField = typeInfoCSharpSyntaxContext.GetField ("PrecedingModifiers");
+			isTypeOfExpressionContextField = typeInfoCSharpSyntaxContext.GetField ("IsTypeOfExpressionContext");
+			containingTypeOrEnumDeclarationField = typeInfoCSharpSyntaxContext.GetField ("ContainingTypeOrEnumDeclaration");
+
+			isAttributeNameContextProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsAttributeNameContext");
+			isInQueryProperty = typeInfoAbstractSyntaxContext.GetProperty ("IsInQuery");
+		}
+
+		public SemanticModel SemanticModel {
+			get;
+			private set;
+		}
+
+		public int Position {
+			get;
+			private set;
+		}
+
+		CSharpSyntaxContext (object instance)
+		{
+			this.instance = instance;
+		}
+
+		public static CSharpSyntaxContext CreateContext (Workspace workspace, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			try {
+				return new CSharpSyntaxContext (createContextMethod.Invoke (null, new object[] {
+					workspace,
+					semanticModel,
+					position,
+					cancellationToken
+				})) {
+					SemanticModel = semanticModel,
+					Position = position
+				};
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+
+	class CSharpTypeInferenceService
+	{
+		readonly static Type typeInfo;
+		readonly static MethodInfo inferTypesMethod;
+		readonly static MethodInfo inferTypes2Method;
+		readonly object instance;
+
+		static CSharpTypeInferenceService ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CSharp.CSharpTypeInferenceService" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+
+			inferTypesMethod = typeInfo.GetMethod ("InferTypes", new[] {
+				typeof(SemanticModel),
+				typeof(int),
+				typeof(CancellationToken)
+			});
+			inferTypes2Method = typeInfo.GetMethod ("InferTypes", new[] {
+				typeof(SemanticModel),
+				typeof(SyntaxNode),
+				typeof(CancellationToken)
+			});
+		}
+
+		public CSharpTypeInferenceService ()
+		{
+			instance = Activator.CreateInstance (typeInfo);
+		}
+
+		public IEnumerable<ITypeSymbol> InferTypes (SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			try {
+				return (IEnumerable<ITypeSymbol>)inferTypesMethod.Invoke (instance, new object[] {
+					semanticModel,
+					position,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public IEnumerable<ITypeSymbol> InferTypes (SemanticModel semanticModel, SyntaxNode expression, CancellationToken cancellationToken)
+		{
+			try {
+				return (IEnumerable<ITypeSymbol>)inferTypes2Method.Invoke (instance, new object[] {
+					semanticModel,
+					expression,
+					cancellationToken
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		public ITypeSymbol InferType(
+			SemanticModel semanticModel,
+			SyntaxNode expression,
+			bool objectAsDefault,
+			CancellationToken cancellationToken)
+		{
+			var types = InferTypes(semanticModel, expression, cancellationToken)
+				.WhereNotNull();
+
+			if (!types.Any())
+			{
+				return objectAsDefault ? semanticModel.Compilation.ObjectType : null;
+			}
+
+			return types.FirstOrDefault();
+		}
+
+
+		public INamedTypeSymbol InferDelegateType(
+			SemanticModel semanticModel,
+			SyntaxNode expression,
+			CancellationToken cancellationToken)
+		{
+			var type = this.InferType(semanticModel, expression, objectAsDefault: false, cancellationToken: cancellationToken);
+			return type.GetDelegateType(semanticModel.Compilation);
+		}
+
+
+		public ITypeSymbol InferType(
+			SemanticModel semanticModel,
+			int position,
+			bool objectAsDefault,
+			CancellationToken cancellationToken)
+		{
+			var types = this.InferTypes(semanticModel, position, cancellationToken)
+				.WhereNotNull();
+
+			if (!types.Any())
+			{
+				return objectAsDefault ? semanticModel.Compilation.ObjectType : null;
+			}
+
+			return types.FirstOrDefault();
+		}
+
+	}
+
+	class CaseCorrector
+	{
+		readonly static Type typeInfo;
+		readonly static MethodInfo caseCorrectAsyncMethod;
+
+		static CaseCorrector ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CaseCorrection.CaseCorrector" + ReflectionNamespaces.WorkspacesAsmName, true);
+
+			Annotation = (SyntaxAnnotation)typeInfo.GetField ("Annotation", BindingFlags.Public | BindingFlags.Static).GetValue (null);
+
+			caseCorrectAsyncMethod = typeInfo.GetMethod ("CaseCorrectAsync", new[] {
+				typeof(Document),
+				typeof(SyntaxAnnotation),
+				typeof(CancellationToken)
+			});
+		}
+
+		public static readonly SyntaxAnnotation Annotation;
+
+		public static Task<Document> CaseCorrectAsync (Document document, SyntaxAnnotation annotation, CancellationToken cancellationToken)
+		{
+			try {
+				return (Task<Document>)caseCorrectAsyncMethod.Invoke (null, new object[] { document, annotation, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+
+
+}
diff --git a/main/src/addins/CSharpBinding/Util/CSharpSyntaxFactsService.cs b/main/src/addins/CSharpBinding/Util/CSharpSyntaxFactsService.cs
new file mode 100644
index 0000000000..1e14ae518a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CSharpSyntaxFactsService.cs
@@ -0,0 +1,1040 @@
+//
+// CSharpSyntaxFactsService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Diagnostics;
+using System.Text;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CSharpSyntaxFactsService
+	{
+		public static bool IsAwaitKeyword (this SyntaxToken token)
+		{
+			return token.IsKind (SyntaxKind.AwaitKeyword);
+		}
+
+		public static bool IsIdentifier (this SyntaxToken token)
+		{
+			return token.IsKind (SyntaxKind.IdentifierToken);
+		}
+
+		public static bool IsGlobalNamespaceKeyword (this SyntaxToken token)
+		{
+			return token.IsKind (SyntaxKind.GlobalKeyword);
+		}
+
+		public static bool IsVerbatimIdentifier (this SyntaxToken token)
+		{
+			return token.IsKind (SyntaxKind.IdentifierToken) && token.Text.Length > 0 && token.Text [0] == '@';
+		}
+
+		public static bool IsOperator (this SyntaxToken token)
+		{
+			var kind = token.Kind ();
+
+			return
+				(SyntaxFacts.IsAnyUnaryExpression (kind) &&
+				 (token.Parent is PrefixUnaryExpressionSyntax || token.Parent is PostfixUnaryExpressionSyntax)) ||
+				(SyntaxFacts.IsBinaryExpression (kind) && token.Parent is BinaryExpressionSyntax) ||
+				(SyntaxFacts.IsAssignmentExpressionOperatorToken (kind) && token.Parent is AssignmentExpressionSyntax);
+		}
+
+		public static bool IsKeyword (this SyntaxToken token)
+		{
+			var kind = (SyntaxKind)token.RawKind;
+			return
+				SyntaxFacts.IsKeywordKind (kind); // both contextual and reserved keywords
+		}
+		//
+		//		public bool IsContextualKeyword(SyntaxToken token)
+		//		{
+		//			var kind = (SyntaxKind)token.RawKind;
+		//			return
+		//				SyntaxFacts.IsContextualKeyword(kind);
+		//		}
+		//
+		//		public bool IsPreprocessorKeyword(SyntaxToken token)
+		//		{
+		//			var kind = (SyntaxKind)token.RawKind;
+		//			return
+		//				SyntaxFacts.IsPreprocessorKeyword(kind);
+		//		}
+		//
+		//		public bool IsHashToken(SyntaxToken token)
+		//		{
+		//			return (SyntaxKind)token.RawKind == SyntaxKind.HashToken;
+		//		}
+		//
+		//		public bool IsInInactiveRegion(SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		//		{
+		//			var csharpTree = syntaxTree as SyntaxTree;
+		//			if (csharpTree == null)
+		//			{
+		//				return false;
+		//			}
+		//
+		//			return csharpTree.IsInInactiveRegion(position, cancellationToken);
+		//		}
+		//
+		//		public bool IsInNonUserCode(SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		//		{
+		//			var csharpTree = syntaxTree as SyntaxTree;
+		//			if (csharpTree == null)
+		//			{
+		//				return false;
+		//			}
+		//
+		//			return csharpTree.IsInNonUserCode(position, cancellationToken);
+		//		}
+		//
+		//		public bool IsEntirelyWithinStringOrCharLiteral(SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		//		{
+		//			var csharpTree = syntaxTree as SyntaxTree;
+		//			if (csharpTree == null)
+		//			{
+		//				return false;
+		//			}
+		//
+		//			return csharpTree.IsEntirelyWithinStringOrCharLiteral(position, cancellationToken);
+		//		}
+		//
+		//		public bool IsDirective(SyntaxNode node)
+		//		{
+		//			return node is DirectiveTriviaSyntax;
+		//		}
+		//
+		//		public bool TryGetExternalSourceInfo(SyntaxNode node, out ExternalSourceInfo info)
+		//		{
+		//			var lineDirective = node as LineDirectiveTriviaSyntax;
+		//			if (lineDirective != null)
+		//			{
+		//				if (lineDirective.Line.Kind() == SyntaxKind.DefaultKeyword)
+		//				{
+		//					info = new ExternalSourceInfo(null, ends: true);
+		//					return true;
+		//				}
+		//				else if (lineDirective.Line.Kind() == SyntaxKind.NumericLiteralToken &&
+		//					lineDirective.Line.Value is int)
+		//				{
+		//					info = new ExternalSourceInfo((int)lineDirective.Line.Value, false);
+		//					return true;
+		//				}
+		//			}
+		//
+		//			info = default(ExternalSourceInfo);
+		//			return false;
+		//		}
+
+		public static bool IsRightSideOfQualifiedName (this SyntaxNode node)
+		{
+			var name = node as SimpleNameSyntax;
+			return name.IsRightSideOfQualifiedName ();
+		}
+
+		public static bool IsMemberAccessExpressionName (this SyntaxNode node)
+		{
+			var name = node as SimpleNameSyntax;
+			return name.IsMemberAccessExpressionName ();
+		}
+
+		public static bool IsObjectCreationExpressionType (this SyntaxNode node)
+		{
+			return node.IsParentKind (SyntaxKind.ObjectCreationExpression) &&
+					   ((ObjectCreationExpressionSyntax)node.Parent).Type == node;
+		}
+
+		public static bool IsAttributeName (this SyntaxNode node)
+		{
+			return SyntaxFacts.IsAttributeName (node);
+		}
+
+		//		public bool IsInvocationExpression(SyntaxNode node)
+		//		{
+		//			return node is InvocationExpressionSyntax;
+		//		}
+		//
+		//		public bool IsAnonymousFunction(SyntaxNode node)
+		//		{
+		//			return node is ParenthesizedLambdaExpressionSyntax ||
+		//				node is SimpleLambdaExpressionSyntax ||
+		//				node is AnonymousMethodExpressionSyntax;
+		//		}
+		//
+		//		public bool IsGenericName(SyntaxNode node)
+		//		{
+		//			return node is GenericNameSyntax;
+		//		}
+
+		public static bool IsNamedParameter (this SyntaxNode node)
+		{
+			return node.CheckParent<NameColonSyntax> (p => p.Name == node);
+		}
+
+		//		public bool IsSkippedTokensTrivia(SyntaxNode node)
+		//		{
+		//			return node is SkippedTokensTriviaSyntax;
+		//		}
+
+		public static bool HasIncompleteParentMember (this SyntaxNode node)
+		{
+			return node.IsParentKind (SyntaxKind.IncompleteMember);
+		}
+
+		//		public SyntaxToken GetIdentifierOfGenericName(SyntaxNode genericName)
+		//		{
+		//			var csharpGenericName = genericName as GenericNameSyntax;
+		//			return csharpGenericName != null
+		//				? csharpGenericName.Identifier
+		//					: default(SyntaxToken);
+		//		}
+		//
+		//		public bool IsCaseSensitive
+		//		{
+		//			get
+		//			{
+		//				return true;
+		//			}
+		//		}
+		//
+		//		public bool IsUsingDirectiveName(SyntaxNode node)
+		//		{
+		//			return
+		//				node.IsParentKind(SyntaxKind.UsingDirective) &&
+		//				((UsingDirectiveSyntax)node.Parent).Name == node;
+		//		}
+		//
+		//		public bool IsForEachStatement(SyntaxNode node)
+		//		{
+		//			return node is ForEachStatementSyntax;
+		//		}
+		//
+		//		public bool IsLockStatement(SyntaxNode node)
+		//		{
+		//			return node is LockStatementSyntax;
+		//		}
+		//
+		//		public bool IsUsingStatement(SyntaxNode node)
+		//		{
+		//			return node is UsingStatementSyntax;
+		//		}
+		//
+		//		public bool IsThisConstructorInitializer(SyntaxToken token)
+		//		{
+		//			return token.Parent.IsKind(SyntaxKind.ThisConstructorInitializer) &&
+		//				((ConstructorInitializerSyntax)token.Parent).ThisOrBaseKeyword == token;
+		//		}
+		//
+		//		public bool IsBaseConstructorInitializer(SyntaxToken token)
+		//		{
+		//			return token.Parent.IsKind(SyntaxKind.BaseConstructorInitializer) &&
+		//				((ConstructorInitializerSyntax)token.Parent).ThisOrBaseKeyword == token;
+		//		}
+		//
+		//		public bool IsQueryExpression(SyntaxNode node)
+		//		{
+		//			return node is QueryExpressionSyntax;
+		//		}
+		//
+		//		public bool IsPredefinedType(SyntaxToken token)
+		//		{
+		//			PredefinedType actualType;
+		//			return TryGetPredefinedType(token, out actualType) && actualType != PredefinedType.None;
+		//		}
+		//
+		//		public bool IsPredefinedType(SyntaxToken token, PredefinedType type)
+		//		{
+		//			PredefinedType actualType;
+		//			return TryGetPredefinedType(token, out actualType) && actualType == type;
+		//		}
+		//
+		//		public bool TryGetPredefinedType(SyntaxToken token, out PredefinedType type)
+		//		{
+		//			type = GetPredefinedType(token);
+		//			return type != PredefinedType.None;
+		//		}
+		//
+		//		private PredefinedType GetPredefinedType(SyntaxToken token)
+		//		{
+		//			switch ((SyntaxKind)token.RawKind)
+		//			{
+		//			case SyntaxKind.BoolKeyword:
+		//				return PredefinedType.Boolean;
+		//			case SyntaxKind.ByteKeyword:
+		//				return PredefinedType.Byte;
+		//			case SyntaxKind.SByteKeyword:
+		//				return PredefinedType.SByte;
+		//			case SyntaxKind.IntKeyword:
+		//				return PredefinedType.Int32;
+		//			case SyntaxKind.UIntKeyword:
+		//				return PredefinedType.UInt32;
+		//			case SyntaxKind.ShortKeyword:
+		//				return PredefinedType.Int16;
+		//			case SyntaxKind.UShortKeyword:
+		//				return PredefinedType.UInt16;
+		//			case SyntaxKind.LongKeyword:
+		//				return PredefinedType.Int64;
+		//			case SyntaxKind.ULongKeyword:
+		//				return PredefinedType.UInt64;
+		//			case SyntaxKind.FloatKeyword:
+		//				return PredefinedType.Single;
+		//			case SyntaxKind.DoubleKeyword:
+		//				return PredefinedType.Double;
+		//			case SyntaxKind.DecimalKeyword:
+		//				return PredefinedType.Decimal;
+		//			case SyntaxKind.StringKeyword:
+		//				return PredefinedType.String;
+		//			case SyntaxKind.CharKeyword:
+		//				return PredefinedType.Char;
+		//			case SyntaxKind.ObjectKeyword:
+		//				return PredefinedType.Object;
+		//			case SyntaxKind.VoidKeyword:
+		//				return PredefinedType.Void;
+		//			default:
+		//				return PredefinedType.None;
+		//			}
+		//		}
+		//
+		//		public bool IsPredefinedOperator(SyntaxToken token)
+		//		{
+		//			PredefinedOperator actualOperator;
+		//			return TryGetPredefinedOperator(token, out actualOperator) && actualOperator != PredefinedOperator.None;
+		//		}
+		//
+		//		public bool IsPredefinedOperator(SyntaxToken token, PredefinedOperator op)
+		//		{
+		//			PredefinedOperator actualOperator;
+		//			return TryGetPredefinedOperator(token, out actualOperator) && actualOperator == op;
+		//		}
+		//
+		//		public bool TryGetPredefinedOperator(SyntaxToken token, out PredefinedOperator op)
+		//		{
+		//			op = GetPredefinedOperator(token);
+		//			return op != PredefinedOperator.None;
+		//		}
+		//
+		//		private PredefinedOperator GetPredefinedOperator(SyntaxToken token)
+		//		{
+		//			switch ((SyntaxKind)token.RawKind)
+		//			{
+		//			case SyntaxKind.PlusToken:
+		//			case SyntaxKind.PlusEqualsToken:
+		//				return PredefinedOperator.Addition;
+		//
+		//			case SyntaxKind.MinusToken:
+		//			case SyntaxKind.MinusEqualsToken:
+		//				return PredefinedOperator.Subtraction;
+		//
+		//			case SyntaxKind.AmpersandToken:
+		//			case SyntaxKind.AmpersandEqualsToken:
+		//				return PredefinedOperator.BitwiseAnd;
+		//
+		//			case SyntaxKind.BarToken:
+		//			case SyntaxKind.BarEqualsToken:
+		//				return PredefinedOperator.BitwiseOr;
+		//
+		//			case SyntaxKind.MinusMinusToken:
+		//				return PredefinedOperator.Decrement;
+		//
+		//			case SyntaxKind.PlusPlusToken:
+		//				return PredefinedOperator.Increment;
+		//
+		//			case SyntaxKind.SlashToken:
+		//			case SyntaxKind.SlashEqualsToken:
+		//				return PredefinedOperator.Division;
+		//
+		//			case SyntaxKind.EqualsEqualsToken:
+		//				return PredefinedOperator.Equality;
+		//
+		//			case SyntaxKind.CaretToken:
+		//			case SyntaxKind.CaretEqualsToken:
+		//				return PredefinedOperator.ExclusiveOr;
+		//
+		//			case SyntaxKind.GreaterThanToken:
+		//				return PredefinedOperator.GreaterThan;
+		//
+		//			case SyntaxKind.GreaterThanEqualsToken:
+		//				return PredefinedOperator.GreaterThanOrEqual;
+		//
+		//			case SyntaxKind.ExclamationEqualsToken:
+		//				return PredefinedOperator.Inequality;
+		//
+		//			case SyntaxKind.LessThanLessThanToken:
+		//			case SyntaxKind.LessThanLessThanEqualsToken:
+		//				return PredefinedOperator.LeftShift;
+		//
+		//			case SyntaxKind.LessThanEqualsToken:
+		//				return PredefinedOperator.LessThanOrEqual;
+		//
+		//			case SyntaxKind.AsteriskToken:
+		//			case SyntaxKind.AsteriskEqualsToken:
+		//				return PredefinedOperator.Multiplication;
+		//
+		//			case SyntaxKind.PercentToken:
+		//			case SyntaxKind.PercentEqualsToken:
+		//				return PredefinedOperator.Modulus;
+		//
+		//			case SyntaxKind.ExclamationToken:
+		//			case SyntaxKind.TildeToken:
+		//				return PredefinedOperator.Complement;
+		//
+		//			case SyntaxKind.GreaterThanGreaterThanToken:
+		//			case SyntaxKind.GreaterThanGreaterThanEqualsToken:
+		//				return PredefinedOperator.RightShift;
+		//			}
+		//
+		//			return PredefinedOperator.None;
+		//		}
+		//
+		//		public string GetText(int kind)
+		//		{
+		//			return SyntaxFacts.GetText((SyntaxKind)kind);
+		//		}
+		//
+		//		public bool IsIdentifierStartCharacter(char c)
+		//		{
+		//			return SyntaxFacts.IsIdentifierStartCharacter(c);
+		//		}
+		//
+		//		public bool IsIdentifierPartCharacter(char c)
+		//		{
+		//			return SyntaxFacts.IsIdentifierPartCharacter(c);
+		//		}
+		//
+		//		public bool IsIdentifierEscapeCharacter(char c)
+		//		{
+		//			return c == '@';
+		//		}
+		//
+		//		public bool IsValidIdentifier(string identifier)
+		//		{
+		//			var token = SyntaxFactory.ParseToken(identifier);
+		//			return IsIdentifier(token) && !token.ContainsDiagnostics && token.ToString().Length == identifier.Length;
+		//		}
+		//
+		//		public bool IsVerbatimIdentifier(string identifier)
+		//		{
+		//			var token = SyntaxFactory.ParseToken(identifier);
+		//			return IsIdentifier(token) && !token.ContainsDiagnostics && token.ToString().Length == identifier.Length && token.IsVerbatimIdentifier();
+		//		}
+		//
+		//		public bool IsTypeCharacter(char c)
+		//		{
+		//			return false;
+		//		}
+		//
+		//		public bool IsStartOfUnicodeEscapeSequence(char c)
+		//		{
+		//			return c == '\\';
+		//		}
+		//
+		//		public bool IsLiteral(SyntaxToken token)
+		//		{
+		//			switch (token.Kind())
+		//			{
+		//			case SyntaxKind.NumericLiteralToken:
+		//			case SyntaxKind.CharacterLiteralToken:
+		//			case SyntaxKind.StringLiteralToken:
+		//			case SyntaxKind.NullKeyword:
+		//			case SyntaxKind.TrueKeyword:
+		//			case SyntaxKind.FalseKeyword:
+		//				return true;
+		//			}
+		//
+		//			return false;
+		//		}
+		//
+		//		public bool IsStringLiteral(SyntaxToken token)
+		//		{
+		//			return token.IsKind(SyntaxKind.StringLiteralToken);
+		//		}
+		//
+		//		public bool IsTypeNamedVarInVariableOrFieldDeclaration(SyntaxToken token, SyntaxNode parent)
+		//		{
+		//			var typedToken = token;
+		//			var typedParent = parent;
+		//
+		//			if (typedParent.IsKind(SyntaxKind.IdentifierName))
+		//			{
+		//				TypeSyntax declaredType = null;
+		//				if (typedParent.IsParentKind(SyntaxKind.VariableDeclaration))
+		//				{
+		//					declaredType = ((VariableDeclarationSyntax)typedParent.Parent).Type;
+		//				}
+		//				else if (typedParent.IsParentKind(SyntaxKind.FieldDeclaration))
+		//				{
+		//					declaredType = ((FieldDeclarationSyntax)typedParent.Parent).Declaration.Type;
+		//				}
+		//
+		//				return declaredType == typedParent && typedToken.ValueText == "var";
+		//			}
+		//
+		//			return false;
+		//		}
+		//
+		//		public bool IsTypeNamedDynamic(SyntaxToken token, SyntaxNode parent)
+		//		{
+		//			var typedParent = parent as ExpressionSyntax;
+		//
+		//			if (typedParent != null)
+		//			{
+		//				if (SyntaxFacts.IsInTypeOnlyContext(typedParent) &&
+		//					typedParent.IsKind(SyntaxKind.IdentifierName) &&
+		//					token.ValueText == "dynamic")
+		//				{
+		//					return true;
+		//				}
+		//			}
+		//
+		//			return false;
+		//		}
+		//
+		//		public bool IsBindableToken(SyntaxToken token)
+		//		{
+		//			if (this.IsWord(token) || this.IsLiteral(token) || this.IsOperator(token))
+		//			{
+		//				switch ((SyntaxKind)token.RawKind)
+		//				{
+		//				case SyntaxKind.DelegateKeyword:
+		//				case SyntaxKind.VoidKeyword:
+		//					return false;
+		//				}
+		//
+		//				return true;
+		//			}
+		//
+		//			return false;
+		//		}
+
+		public static bool IsMemberAccessExpression (this SyntaxNode node)
+		{
+			return node is MemberAccessExpressionSyntax &&
+				((MemberAccessExpressionSyntax)node).Kind () == SyntaxKind.SimpleMemberAccessExpression;
+		}
+
+		public static bool IsConditionalMemberAccessExpression (this SyntaxNode node)
+		{
+			return node is ConditionalAccessExpressionSyntax;
+		}
+
+		public static bool IsPointerMemberAccessExpression (this SyntaxNode node)
+		{
+			return node is MemberAccessExpressionSyntax &&
+				((MemberAccessExpressionSyntax)node).Kind () == SyntaxKind.PointerMemberAccessExpression;
+		}
+
+		public static void GetNameAndArityOfSimpleName (this SyntaxNode node, out string name, out int arity)
+		{
+			name = null;
+			arity = 0;
+
+			var simpleName = node as SimpleNameSyntax;
+			if (simpleName != null) {
+				name = simpleName.Identifier.ValueText;
+				arity = simpleName.Arity;
+			}
+		}
+
+		public static SyntaxNode GetExpressionOfMemberAccessExpression (this SyntaxNode node)
+		{
+			if (node.IsKind (SyntaxKind.MemberBindingExpression)) {
+				if (node.IsParentKind (SyntaxKind.ConditionalAccessExpression)) {
+					return GetExpressionOfConditionalMemberAccessExpression (node.Parent);
+				}
+				if (node.IsParentKind (SyntaxKind.InvocationExpression) &&
+					node.Parent.IsParentKind (SyntaxKind.ConditionalAccessExpression)) {
+					return GetExpressionOfConditionalMemberAccessExpression (node.Parent.Parent);
+				}
+			}
+
+			return (node as MemberAccessExpressionSyntax)?.Expression;
+		}
+
+		public static SyntaxNode GetExpressionOfConditionalMemberAccessExpression (this SyntaxNode node)
+		{
+			return (node as ConditionalAccessExpressionSyntax)?.Expression;
+		}
+
+
+		public static bool IsInNamespaceOrTypeContext (this SyntaxNode node)
+		{
+			return SyntaxFacts.IsInNamespaceOrTypeContext (node as ExpressionSyntax);
+		}
+
+		public static SyntaxNode GetExpressionOfArgument (this SyntaxNode node)
+		{
+			return ((ArgumentSyntax)node).Expression;
+		}
+
+		public static RefKind GetRefKindOfArgument (this SyntaxNode node)
+		{
+			return (node as ArgumentSyntax).GetRefKind ();
+		}
+
+		public static bool IsInConstantContext (this SyntaxNode node)
+		{
+			return (node as ExpressionSyntax).IsInConstantContext ();
+		}
+
+		public static bool IsInConstructor (this SyntaxNode node)
+		{
+			return node.GetAncestor<ConstructorDeclarationSyntax> () != null;
+		}
+
+		//		public bool IsUnsafeContext(SyntaxNode node)
+		//		{
+		//			return node.IsUnsafeContext();
+		//		}
+
+		public static SyntaxNode GetNameOfAttribute (this SyntaxNode node)
+		{
+			return ((AttributeSyntax)node).Name;
+		}
+
+		public static bool IsAttribute (this SyntaxNode node)
+		{
+			return node is AttributeSyntax;
+		}
+
+		public static bool IsAttributeNamedArgumentIdentifier (this SyntaxNode node)
+		{
+			var identifier = node as IdentifierNameSyntax;
+			return
+				identifier != null &&
+				identifier.IsParentKind (SyntaxKind.NameEquals) &&
+						  identifier.Parent.IsParentKind (SyntaxKind.AttributeArgument);
+		}
+
+		public static SyntaxNode GetContainingTypeDeclaration (this SyntaxNode root, int position)
+		{
+			if (root == null) {
+				throw new ArgumentNullException ("root");
+			}
+
+			if (position < 0 || position > root.Span.End) {
+				throw new ArgumentOutOfRangeException ("position");
+			}
+
+			return root
+				.FindToken (position)
+				.GetAncestors<SyntaxNode> ()
+				.FirstOrDefault (n => n is BaseTypeDeclarationSyntax || n is DelegateDeclarationSyntax);
+		}
+		//
+		//		public SyntaxNode GetContainingVariableDeclaratorOfFieldDeclaration(SyntaxNode node)
+		//		{
+		//			throw ExceptionUtilities.Unreachable;
+		//		}
+		//
+		//		public SyntaxToken FindTokenOnLeftOfPosition(
+		//			SyntaxNode node, int position, bool includeSkipped, bool includeDirectives, bool includeDocumentationComments)
+		//		{
+		//			return node.FindTokenOnLeftOfPosition(position, includeSkipped, includeDirectives, includeDocumentationComments);
+		//		}
+		//
+		//		public SyntaxToken FindTokenOnRightOfPosition(
+		//			SyntaxNode node, int position, bool includeSkipped, bool includeDirectives, bool includeDocumentationComments)
+		//		{
+		//			return node.FindTokenOnRightOfPosition(position, includeSkipped, includeDirectives, includeDocumentationComments);
+		//		}
+
+		public static bool IsObjectCreationExpression (this SyntaxNode node)
+		{
+			return node is ObjectCreationExpressionSyntax;
+		}
+
+		public static bool IsObjectInitializerNamedAssignmentIdentifier (this SyntaxNode node)
+		{
+			var identifier = node as IdentifierNameSyntax;
+			return
+				identifier != null &&
+				identifier.IsLeftSideOfAssignExpression () &&
+						  identifier.Parent.IsParentKind (SyntaxKind.ObjectInitializerExpression);
+		}
+
+		public static bool IsElementAccessExpression (this SyntaxNode node)
+		{
+			return node.Kind () == SyntaxKind.ElementAccessExpression;
+		}
+
+		//		public SyntaxToken ToIdentifierToken(string name)
+		//		{
+		//			return name.ToIdentifierToken();
+		//		}
+
+		public static SyntaxNode Parenthesize (this SyntaxNode expression, bool includeElasticTrivia = true)
+		{
+			return ((ExpressionSyntax)expression).Parenthesize (includeElasticTrivia);
+		}
+
+		//		public bool IsIndexerMemberCRef(SyntaxNode node)
+		//		{
+		//			return node.Kind() == SyntaxKind.IndexerMemberCref;
+		//		}
+		//
+		//		public SyntaxNode GetContainingMemberDeclaration(SyntaxNode root, int position)
+		//		{
+		//			Contract.ThrowIfNull(root, "root");
+		//			Contract.ThrowIfTrue(position < 0 || position > root.FullSpan.End, "position");
+		//
+		//			var end = root.FullSpan.End;
+		//			if (end == 0)
+		//			{
+		//				// empty file
+		//				return null;
+		//			}
+		//
+		//			// make sure position doesn't touch end of root
+		//			position = Math.Min(position, end - 1);
+		//
+		//			var node = root.FindToken(position).Parent;
+		//			while (node != null)
+		//			{
+		//				if (node is MemberDeclarationSyntax)
+		//				{
+		//					return node;
+		//				}
+		//
+		//				node = node.Parent;
+		//			}
+		//
+		//			return null;
+		//		}
+		//
+		//		public bool IsMethodLevelMember(SyntaxNode node)
+		//		{
+		//			return node is BaseMethodDeclarationSyntax || node is BasePropertyDeclarationSyntax || node is EnumMemberDeclarationSyntax || node is BaseFieldDeclarationSyntax;
+		//		}
+		//
+		//		public bool IsTopLevelNodeWithMembers(SyntaxNode node)
+		//		{
+		//			return node is NamespaceDeclarationSyntax ||
+		//				node is TypeDeclarationSyntax ||
+		//				node is EnumDeclarationSyntax;
+		//		}
+		//
+
+
+		public static bool DescentIntoSymbolForDeclarationSearch (SyntaxNode node)
+		{
+			var b = !(node is BlockSyntax);
+			return b;
+		}
+
+
+		//
+		//		public List<SyntaxNode> GetMethodLevelMembers(SyntaxNode root)
+		//		{
+		//			var list = new List<SyntaxNode>();
+		//			AppendMethodLevelMembers(root, list);
+		//			return list;
+		//		}
+		//
+		//		private void AppendMethodLevelMembers(SyntaxNode node, List<SyntaxNode> list)
+		//		{
+		//			foreach (var member in node.GetMembers())
+		//			{
+		//				if (IsTopLevelNodeWithMembers(member))
+		//				{
+		//					AppendMethodLevelMembers(member, list);
+		//					continue;
+		//				}
+		//
+		//				if (IsMethodLevelMember(member))
+		//				{
+		//					list.Add(member);
+		//				}
+		//			}
+		//		}
+		//
+		//		public TextSpan GetMemberBodySpanForSpeculativeBinding(SyntaxNode node)
+		//		{
+		//			if (node.Span.IsEmpty)
+		//			{
+		//				return default(TextSpan);
+		//			}
+		//
+		//			var member = GetContainingMemberDeclaration(node, node.SpanStart);
+		//			if (member == null)
+		//			{
+		//				return default(TextSpan);
+		//			}
+		//
+		//			// TODO: currently we only support method for now
+		//			var method = member as BaseMethodDeclarationSyntax;
+		//			if (method != null)
+		//			{
+		//				if (method.Body == null)
+		//				{
+		//					return default(TextSpan);
+		//				}
+		//
+		//				return GetBlockBodySpan(method.Body);
+		//			}
+		//
+		//			return default(TextSpan);
+		//		}
+		//
+		//		public bool ContainsInMemberBody(SyntaxNode node, TextSpan span)
+		//		{
+		//			var constructor = node as ConstructorDeclarationSyntax;
+		//			if (constructor != null)
+		//			{
+		//				return (constructor.Body != null && GetBlockBodySpan(constructor.Body).Contains(span)) ||
+		//					(constructor.Initializer != null && constructor.Initializer.Span.Contains(span));
+		//			}
+		//
+		//			var method = node as BaseMethodDeclarationSyntax;
+		//			if (method != null)
+		//			{
+		//				return method.Body != null && GetBlockBodySpan(method.Body).Contains(span);
+		//			}
+		//
+		//			var property = node as BasePropertyDeclarationSyntax;
+		//			if (property != null)
+		//			{
+		//				return property.AccessorList != null && property.AccessorList.Span.Contains(span);
+		//			}
+		//
+		//			var @enum = node as EnumMemberDeclarationSyntax;
+		//			if (@enum != null)
+		//			{
+		//				return @enum.EqualsValue != null && @enum.EqualsValue.Span.Contains(span);
+		//			}
+		//
+		//			var field = node as BaseFieldDeclarationSyntax;
+		//			if (field != null)
+		//			{
+		//				return field.Declaration != null && field.Declaration.Span.Contains(span);
+		//			}
+		//
+		//			return false;
+		//		}
+		//
+		//		private TextSpan GetBlockBodySpan(BlockSyntax body)
+		//		{
+		//			return TextSpan.FromBounds(body.OpenBraceToken.Span.End, body.CloseBraceToken.SpanStart);
+		//		}
+		//
+		//		public int GetMethodLevelMemberId(SyntaxNode root, SyntaxNode node)
+		//		{
+		//			Contract.Requires(root.SyntaxTree == node.SyntaxTree);
+		//
+		//			int currentId = 0;
+		//			SyntaxNode currentNode;
+		//			Contract.ThrowIfFalse(TryGetMethodLevelMember(root, (n, i) => n == node, ref currentId, out currentNode));
+		//
+		//			Contract.ThrowIfFalse(currentId >= 0);
+		//			CheckMemberId(root, node, currentId);
+		//			return currentId;
+		//		}
+		//
+		//		public SyntaxNode GetMethodLevelMember(SyntaxNode root, int memberId)
+		//		{
+		//			int currentId = 0;
+		//			SyntaxNode currentNode;
+		//			if (!TryGetMethodLevelMember(root, (n, i) => i == memberId, ref currentId, out currentNode))
+		//			{
+		//				return null;
+		//			}
+		//
+		//			Contract.ThrowIfNull(currentNode);
+		//			CheckMemberId(root, currentNode, memberId);
+		//			return currentNode;
+		//		}
+		//
+		//		private bool TryGetMethodLevelMember(
+		//			SyntaxNode node, Func<SyntaxNode, int, bool> predicate, ref int currentId, out SyntaxNode currentNode)
+		//		{
+		//			foreach (var member in node.GetMembers())
+		//			{
+		//				if (IsTopLevelNodeWithMembers(member))
+		//				{
+		//					if (TryGetMethodLevelMember(member, predicate, ref currentId, out currentNode))
+		//					{
+		//						return true;
+		//					}
+		//
+		//					continue;
+		//				}
+		//
+		//				if (IsMethodLevelMember(member))
+		//				{
+		//					if (predicate(member, currentId))
+		//					{
+		//						currentNode = member;
+		//						return true;
+		//					}
+		//
+		//					currentId++;
+		//				}
+		//			}
+		//
+		//			currentNode = null;
+		//			return false;
+		//		}
+		//
+		//		[Conditional("DEBUG")]
+		//		private void CheckMemberId(SyntaxNode root, SyntaxNode node, int memberId)
+		//		{
+		//			var list = GetMethodLevelMembers(root);
+		//			var index = list.IndexOf(node);
+		//
+		//			Contract.ThrowIfFalse(index == memberId);
+		//		}
+		//
+		//		public SyntaxNode GetBindableParent(SyntaxToken token)
+		//		{
+		//			var node = token.Parent;
+		//			while (node != null)
+		//			{
+		//				var parent = node.Parent;
+		//
+		//				// If this node is on the left side of a member access expression, don't ascend 
+		//				// further or we'll end up binding to something else.
+		//				var memberAccess = parent as MemberAccessExpressionSyntax;
+		//				if (memberAccess != null)
+		//				{
+		//					if (memberAccess.Expression == node)
+		//					{
+		//						break;
+		//					}
+		//				}
+		//
+		//				// If this node is on the left side of a qualified name, don't ascend 
+		//				// further or we'll end up binding to something else.
+		//				var qualifiedName = parent as QualifiedNameSyntax;
+		//				if (qualifiedName != null)
+		//				{
+		//					if (qualifiedName.Left == node)
+		//					{
+		//						break;
+		//					}
+		//				}
+		//
+		//				// If this node is on the left side of a alias-qualified name, don't ascend 
+		//				// further or we'll end up binding to something else.
+		//				var aliasQualifiedName = parent as AliasQualifiedNameSyntax;
+		//				if (aliasQualifiedName != null)
+		//				{
+		//					if (aliasQualifiedName.Alias == node)
+		//					{
+		//						break;
+		//					}
+		//				}
+		//
+		//				// If this node is the type of an object creation expression, return the
+		//				// object creation expression.
+		//				var objectCreation = parent as ObjectCreationExpressionSyntax;
+		//				if (objectCreation != null)
+		//				{
+		//					if (objectCreation.Type == node)
+		//					{
+		//						node = parent;
+		//						break;
+		//					}
+		//				}
+		//
+		//				// If this node is not parented by a name, we're done.
+		//				var name = parent as NameSyntax;
+		//				if (name == null)
+		//				{
+		//					break;
+		//				}
+		//
+		//				node = parent;
+		//			}
+		//
+		//			return node;
+		//		}
+		//
+		//		public IEnumerable<SyntaxNode> GetConstructors(SyntaxNode root, CancellationToken cancellationToken)
+		//		{
+		//			var compilationUnit = root as CompilationUnitSyntax;
+		//			if (compilationUnit == null)
+		//			{
+		//				return SpecializedCollections.EmptyEnumerable<SyntaxNode>();
+		//			}
+		//
+		//			var constructors = new List<SyntaxNode>();
+		//			AppendConstructors(compilationUnit.Members, constructors, cancellationToken);
+		//			return constructors;
+		//		}
+		//
+		//		private void AppendConstructors(SyntaxList<MemberDeclarationSyntax> members, List<SyntaxNode> constructors, CancellationToken cancellationToken)
+		//		{
+		//			foreach (var member in members)
+		//			{
+		//				cancellationToken.ThrowIfCancellationRequested();
+		//
+		//				var constructor = member as ConstructorDeclarationSyntax;
+		//				if (constructor != null)
+		//				{
+		//					constructors.Add(constructor);
+		//					continue;
+		//				}
+		//
+		//				var @namespace = member as NamespaceDeclarationSyntax;
+		//				if (@namespace != null)
+		//				{
+		//					AppendConstructors(@namespace.Members, constructors, cancellationToken);
+		//				}
+		//
+		//				var @class = member as ClassDeclarationSyntax;
+		//				if (@class != null)
+		//				{
+		//					AppendConstructors(@class.Members, constructors, cancellationToken);
+		//				}
+		//
+		//				var @struct = member as StructDeclarationSyntax;
+		//				if (@struct != null)
+		//				{
+		//					AppendConstructors(@struct.Members, constructors, cancellationToken);
+		//				}
+		//			}
+		//		}
+		//
+		//		public bool TryGetCorrespondingOpenBrace(SyntaxToken token, out SyntaxToken openBrace)
+		//		{
+		//			if (token.Kind() == SyntaxKind.CloseBraceToken)
+		//			{
+		//				var tuple = token.Parent.GetBraces();
+		//
+		//				openBrace = tuple.Item1;
+		//				return openBrace.Kind() == SyntaxKind.OpenBraceToken;
+		//			}
+		//
+		//			openBrace = default(SyntaxToken);
+		//			return false;
+		//		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/CSharpUtil.cs b/main/src/addins/CSharpBinding/Util/CSharpUtil.cs
new file mode 100644
index 0000000000..1784f099cf
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CSharpUtil.cs
@@ -0,0 +1,183 @@
+// 
+// CSharpUtil.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CSharpUtil
+	{
+		/// <summary>
+		/// Inverts a boolean condition. Note: The condition object can be frozen (from AST) it's cloned internally.
+		/// </summary>
+		/// <param name="condition">The condition to invert.</param>
+		public static ExpressionSyntax InvertCondition(ExpressionSyntax condition)
+		{
+			return InvertConditionInternal(condition);
+		}
+		
+		static ExpressionSyntax InvertConditionInternal(ExpressionSyntax condition)
+		{
+			if (condition is ParenthesizedExpressionSyntax) {
+				return SyntaxFactory.ParenthesizedExpression(InvertCondition(((ParenthesizedExpressionSyntax)condition).Expression));
+			}
+
+			if (condition is PrefixUnaryExpressionSyntax) {
+				var uOp = (PrefixUnaryExpressionSyntax)condition;
+				if (uOp.IsKind(SyntaxKind.LogicalNotExpression)) {
+					if (!(uOp.Parent is ExpressionSyntax))
+						return uOp.Operand.SkipParens();
+					return uOp.Operand;
+				}
+				return SyntaxFactory.PrefixUnaryExpression(SyntaxKind.LogicalNotExpression, uOp);
+			}
+			
+			if (condition is BinaryExpressionSyntax) {
+				var bOp = (BinaryExpressionSyntax)condition;
+
+				if (bOp.IsKind(SyntaxKind.LogicalAndExpression) || bOp.IsKind(SyntaxKind.LogicalOrExpression))
+					return SyntaxFactory.BinaryExpression(NegateConditionOperator(bOp.Kind()), InvertCondition(bOp.Left), InvertCondition(bOp.Right));
+
+				if (bOp.IsKind(SyntaxKind.EqualsExpression) ||
+					bOp.IsKind(SyntaxKind.NotEqualsExpression) ||
+					bOp.IsKind(SyntaxKind.GreaterThanExpression) ||
+					bOp.IsKind(SyntaxKind.GreaterThanOrEqualExpression) ||
+					bOp.IsKind(SyntaxKind.LessThanExpression) ||
+					bOp.IsKind(SyntaxKind.LessThanOrEqualExpression)) 
+					return SyntaxFactory.BinaryExpression(NegateRelationalOperator(bOp.Kind()), bOp.Left, bOp.Right);
+
+				return SyntaxFactory.PrefixUnaryExpression(SyntaxKind.LogicalNotExpression, SyntaxFactory.ParenthesizedExpression(condition));
+			}
+
+			if (condition is ConditionalExpressionSyntax) {
+				var cEx = condition as ConditionalExpressionSyntax;
+				return cEx.WithCondition(InvertCondition(cEx.Condition));
+			}
+
+			if (condition is LiteralExpressionSyntax) {
+				if (condition.Kind() == SyntaxKind.TrueLiteralExpression)
+					return SyntaxFactory.LiteralExpression(SyntaxKind.FalseLiteralExpression); 
+				if (condition.Kind() == SyntaxKind.FalseLiteralExpression)
+					return SyntaxFactory.LiteralExpression(SyntaxKind.TrueLiteralExpression); 
+			}
+
+			return SyntaxFactory.PrefixUnaryExpression(SyntaxKind.LogicalNotExpression, AddParensForUnaryExpressionIfRequired(condition));
+		}
+
+		/// <summary>
+		/// When negating an expression this is required, otherwise you would end up with
+		/// a or b -> !a or b
+		/// </summary>
+		public static ExpressionSyntax AddParensForUnaryExpressionIfRequired(ExpressionSyntax expression)
+		{
+			if ((expression is BinaryExpressionSyntax) ||
+			    (expression is AssignmentExpressionSyntax) ||
+				(expression is CastExpressionSyntax) ||
+				(expression is ParenthesizedLambdaExpressionSyntax) ||
+				(expression is SimpleLambdaExpressionSyntax) ||
+				(expression is ConditionalExpressionSyntax)) {
+				return SyntaxFactory.ParenthesizedExpression(expression);
+			}
+
+			return expression;
+		}
+
+		/// <summary>
+		/// Get negation of the specified relational operator
+		/// </summary>
+		/// <returns>
+		/// negation of the specified relational operator, or BinaryOperatorType.Any if it's not a relational operator
+		/// </returns>
+		public static SyntaxKind NegateRelationalOperator(SyntaxKind op)
+		{
+			switch (op) {
+				case SyntaxKind.EqualsExpression:
+					return SyntaxKind.NotEqualsExpression;
+				case SyntaxKind.NotEqualsExpression:
+					return SyntaxKind.EqualsExpression;
+				case SyntaxKind.GreaterThanExpression:
+					return SyntaxKind.LessThanOrEqualExpression;
+				case SyntaxKind.GreaterThanOrEqualExpression:
+					return SyntaxKind.LessThanExpression;
+				case SyntaxKind.LessThanExpression:
+					return SyntaxKind.GreaterThanOrEqualExpression;
+				case SyntaxKind.LessThanOrEqualExpression:
+					return SyntaxKind.GreaterThanExpression;
+				case SyntaxKind.LogicalOrExpression:
+					return SyntaxKind.LogicalAndExpression;
+				case SyntaxKind.LogicalAndExpression:
+					return SyntaxKind.LogicalOrExpression;
+			}
+			throw new ArgumentOutOfRangeException("op");
+		}
+
+		/// <summary>
+		/// Returns true, if the specified operator is a relational operator
+		/// </summary>
+		public static bool IsRelationalOperator(SyntaxKind op)
+		{
+			switch (op) {
+				case SyntaxKind.EqualsExpression:
+				case SyntaxKind.NotEqualsExpression:
+				case SyntaxKind.GreaterThanExpression:
+				case SyntaxKind.GreaterThanOrEqualExpression:
+				case SyntaxKind.LessThanExpression:
+				case SyntaxKind.LessThanOrEqualExpression:
+				case SyntaxKind.LogicalOrExpression:
+				case SyntaxKind.LogicalAndExpression:
+					return true;
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Get negation of the condition operator
+		/// </summary>
+		/// <returns>
+		/// negation of the specified condition operator, or BinaryOperatorType.Any if it's not a condition operator
+		/// </returns>
+		public static SyntaxKind NegateConditionOperator(SyntaxKind op)
+		{
+			switch (op) {
+				case SyntaxKind.LogicalOrExpression:
+					return SyntaxKind.LogicalAndExpression;
+				case SyntaxKind.LogicalAndExpression:
+					return SyntaxKind.LogicalOrExpression;
+			}
+			throw new ArgumentOutOfRangeException("op");
+		}
+	
+		public static bool AreConditionsEqual(ExpressionSyntax cond1, ExpressionSyntax cond2)
+		{
+			if (cond1 == null || cond2 == null)
+				return false;
+			return cond1.SkipParens().IsEquivalentTo(cond2.SkipParens(), true);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/Util/CastExpressionSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/CastExpressionSyntaxExtensions.cs
new file mode 100644
index 0000000000..62daf3ab81
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CastExpressionSyntaxExtensions.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using System;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CastExpressionSyntaxExtensions
+	{
+		readonly static MethodInfo isUnnecessaryCastMethod;
+
+		static CastExpressionSyntaxExtensions ()
+		{
+			var typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CSharp.Extensions.CastExpressionSyntaxExtensions" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			isUnnecessaryCastMethod = typeInfo.GetMethod ("IsUnnecessaryCast", BindingFlags.Static | BindingFlags.Public);
+		}
+
+		public static bool IsUnnecessaryCast(this CastExpressionSyntax cast, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			try {
+				return (bool)isUnnecessaryCastMethod.Invoke (null, new object[] { cast, semanticModel, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/CloneableStack.cs b/main/src/addins/CSharpBinding/Util/CloneableStack.cs
new file mode 100644
index 0000000000..cc8d3d27d1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CloneableStack.cs
@@ -0,0 +1,201 @@
+//
+// CloneableStack.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class CloneableStack<T> : IEnumerable<T>, ICollection<T>, ICloneable, IEquatable<CloneableStack<T>>
+	{
+		int count;
+		StackItem top;
+
+		#region IEnumerable[T] implementation
+		public IEnumerator<T> GetEnumerator ()
+		{
+			return new StackItemEnumerator (top);
+		}
+
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return new StackItemEnumerator (top);
+		}
+		#endregion
+
+		#region ICloneable implementation
+		public CloneableStack<T> Clone ()
+		{
+			CloneableStack<T> result = new CloneableStack<T> ();
+			result.count = count;
+			result.top   = top;
+			return result;
+		}
+
+		object ICloneable.Clone ()
+		{
+			return Clone();
+		}
+		#endregion
+
+		public void Clear ()
+		{
+			top = null;
+			count = 0;
+		}
+
+		public void Push (T item)
+		{
+			top = new StackItem (top, item);
+			count++;
+		}
+
+		public T Peek ()
+		{
+			return top.Item;
+		}
+
+		public T Pop ()
+		{
+			T result = top.Item;
+			top = top.Parent;
+			count--;
+			return result;
+		}
+
+		#region IEquatable[T] implementation
+		public bool Equals (CloneableStack<T> other)
+		{
+			return ReferenceEquals (top, other.top);
+		}
+		#endregion
+
+		#region ICollection[T] implementation
+		void ICollection<T>.Add (T item)
+		{
+			Push (item);
+		}
+
+		void ICollection<T>.Clear ()
+		{
+			top = null;
+			count = 0;
+		}
+
+		bool ICollection<T>.Contains (T item)
+		{
+			foreach (T t in this) {
+				if (t.Equals (item))
+					return true;
+			}
+			return false;
+		}
+
+		void ICollection<T>.CopyTo (T[] array, int arrayIndex)
+		{
+			int idx = arrayIndex;
+			foreach (T t in this) {
+				array[idx++] = t;
+			}
+		}
+
+		bool ICollection<T>.Remove (T item)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public int Count {
+			get {
+				return count;
+			}
+		}
+
+		bool ICollection<T>.IsReadOnly {
+			get {
+				return false;
+			}
+		}
+		#endregion
+
+		class StackItem
+		{
+			public readonly StackItem Parent;
+			public readonly T Item;
+
+			public StackItem (StackItem parent, T item)
+			{
+				Parent = parent;
+				Item = item;
+			}
+		}
+
+		class StackItemEnumerator : IEnumerator<T>
+		{
+			StackItem cur, first;
+
+			public StackItemEnumerator (StackItem cur)
+			{
+				this.cur = first = new StackItem (cur, default(T));
+			}
+
+			#region IDisposable implementation
+			void IDisposable.Dispose ()
+			{
+				cur = first = null;
+			}
+			#endregion
+
+			#region IEnumerator implementation
+			bool IEnumerator.MoveNext ()
+			{
+				if (cur == null)
+					return false;
+				cur = cur.Parent;
+				return cur != null;
+			}
+
+			void IEnumerator.Reset ()
+			{
+				cur = first;
+			}
+
+			object IEnumerator.Current {
+				get {
+					return cur.Item;
+				}
+			}
+			#endregion
+
+			#region IEnumerator[T] implementation
+			T IEnumerator<T>.Current {
+				get {
+					return cur.Item;
+				}
+			}
+			#endregion
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/Util/CodeFixContextExtensions.cs b/main/src/addins/CSharpBinding/Util/CodeFixContextExtensions.cs
new file mode 100644
index 0000000000..824b169071
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CodeFixContextExtensions.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+using Microsoft.CodeAnalysis.CodeFixes;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CodeActions;
+
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CodeFixContextExtensions
+	{
+		/// <summary>
+		/// Use this helper to register multiple fixes (<paramref name="actions"/>) each of which addresses / fixes the same supplied <paramref name="diagnostic"/>.
+		/// </summary>
+		public static void RegisterFixes(this CodeFixContext context, IEnumerable<CodeAction> actions, Diagnostic diagnostic)
+		{
+			foreach (var action in actions)
+			{
+				context.RegisterCodeFix(action, diagnostic);
+			}
+		}
+
+		/// <summary>
+		/// Use this helper to register multiple fixes (<paramref name="actions"/>) each of which addresses / fixes the same set of supplied <paramref name="diagnostics"/>.
+		/// </summary>
+		public static void RegisterFixes(this CodeFixContext context, IEnumerable<CodeAction> actions, ImmutableArray<Diagnostic> diagnostics)
+		{
+			foreach (var action in actions)
+			{
+				context.RegisterCodeFix(action, diagnostics);
+			}
+		}
+	}
+
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/CodeGenerationSymbolFactory.cs b/main/src/addins/CSharpBinding/Util/CodeGenerationSymbolFactory.cs
new file mode 100644
index 0000000000..a81ad838af
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CodeGenerationSymbolFactory.cs
@@ -0,0 +1,466 @@
+//
+// CodeGenerationSymbolFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis.Editing;
+using System.Runtime.ExceptionServices;
+
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	/// Generates symbols that describe declarations to be generated.
+	/// </summary>
+	static class CodeGenerationSymbolFactory
+	{
+		readonly static Type typeInfo;
+
+		static CodeGenerationSymbolFactory ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CodeGeneration.CodeGenerationSymbolFactory" + ReflectionNamespaces.WorkspacesAsmName, true);
+
+			isCodeGenerationSymbolMethod = typeInfo.GetMethod ("IsCodeGenerationSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(ISymbol) }, null);
+			if (isCodeGenerationSymbolMethod == null)
+				throw new InvalidOperationException ("IsCodeGenerationSymbol not found.");
+
+			createParameterSymbolMethod = typeInfo.GetMethods ().First (m => m.Name == "CreateParameterSymbol" && m.GetParameters ().Length == 8);
+
+			createTypeParameterSymbolMethod = typeInfo.GetMethod ("CreateTypeParameterSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(string), typeof(int) }, null);
+			if (createTypeParameterSymbolMethod == null)
+				throw new InvalidOperationException ("CreateTypeParameterSymbol not found.");
+
+			createTypeParameterMethod = typeInfo.GetMethod ("CreateTypeParameter", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(IList<AttributeData>), typeof(VarianceKind), typeof(string), typeof(ImmutableArray<ITypeSymbol>), typeof(bool), typeof(bool), typeof(bool), typeof(int) }, null);
+			if (createTypeParameterMethod == null)
+				throw new InvalidOperationException ("CreateTypeParameter not found.");
+
+			createMethodSymbolMethod = typeInfo.GetMethod ("CreateMethodSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(IList<AttributeData>), typeof(Accessibility), typeof(DeclarationModifiers), typeof(ITypeSymbol), typeof(IMethodSymbol), typeof(string), typeof(IList<ITypeParameterSymbol>), typeof(IList<IParameterSymbol>), typeof(IList<SyntaxNode>), typeof(IList<SyntaxNode>), typeof(IList<AttributeData>), typeof(MethodKind) }, null);
+			if (createMethodSymbolMethod == null)
+				throw new InvalidOperationException ("CreateMethodSymbol not found.");
+
+			createMethodSymbolMethod2 = typeInfo.GetMethod ("CreateMethodSymbol", BindingFlags.Static | BindingFlags.NonPublic, null, new [] { typeof(INamedTypeSymbol), typeof(IList<AttributeData>), typeof(Accessibility), typeof(DeclarationModifiers), typeof(ITypeSymbol), typeof(IMethodSymbol) , typeof(string), typeof(IList<ITypeParameterSymbol>), typeof(IList<IParameterSymbol>), typeof(IList<SyntaxNode>), typeof(IList<SyntaxNode>), typeof(IList<AttributeData>), typeof(MethodKind) }, null);
+			if (createMethodSymbolMethod2 == null)
+				throw new InvalidOperationException ("CreateMethodSymbol not found.");
+
+			createConstructorSymbolMethod = typeInfo.GetMethod ("CreateConstructorSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(IList<AttributeData>), typeof(Accessibility), typeof(DeclarationModifiers), typeof(string), typeof(IList<IParameterSymbol>), typeof(IList<SyntaxNode>), typeof(IList<SyntaxNode>), typeof(IList<SyntaxNode>) }, null);
+			if (createConstructorSymbolMethod == null)
+				throw new InvalidOperationException ("CreateConstructorSymbol not found.");
+			
+
+			createAccessorSymbolMethod = typeInfo.GetMethod ("CreateAccessorSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(IList<AttributeData>), typeof(Accessibility), typeof(IList<SyntaxNode>) }, null);
+			if (createAccessorSymbolMethod == null)
+				throw new InvalidOperationException ("CreateAccessorSymbol not found.");
+
+			createPropertySymbolMethod = typeInfo.GetMethod ("CreatePropertySymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(IList<AttributeData>), typeof(Accessibility), typeof(DeclarationModifiers), typeof(ITypeSymbol), typeof(IPropertySymbol), typeof(string), typeof(IList<IParameterSymbol>), typeof(IMethodSymbol), typeof(IMethodSymbol), typeof(bool) }, null);
+			if (createPropertySymbolMethod == null)
+				throw new InvalidOperationException ("CreatePropertySymbol not found.");
+
+			createFieldSymbolMethod = typeInfo.GetMethod ("CreateFieldSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(IList<AttributeData>), typeof(Accessibility), typeof(DeclarationModifiers), typeof(ITypeSymbol), typeof(string), typeof(bool), typeof(object), typeof(SyntaxNode) }, null);
+			if (createFieldSymbolMethod == null)
+				throw new InvalidOperationException ("CreateFieldSymbol not found.");
+
+			createPointerTypeSymbolMethod = typeInfo.GetMethod ("CreatePointerTypeSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(ITypeSymbol) }, null);
+			if (createPointerTypeSymbolMethod == null)
+				throw new InvalidOperationException ("CreatePointerTypeSymbol not found.");
+
+			createArrayTypeSymbolMethod = typeInfo.GetMethod ("CreateArrayTypeSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(ITypeSymbol), typeof(int) }, null);
+			if (createArrayTypeSymbolMethod == null)
+				throw new InvalidOperationException ("CreateArrayTypeSymbol not found.");
+
+			createNamespaceSymbolMethod = typeInfo.GetMethod ("CreateNamespaceSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(string), typeof(IList<ISymbol>), typeof(IList<INamespaceOrTypeSymbol>) }, null);
+			if (createNamespaceSymbolMethod == null)
+				throw new InvalidOperationException ("CreateNamespaceSymbol not found.");
+
+			createNamedTypeSymbolMethod = typeInfo.GetMethod ("CreateNamedTypeSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(IList<AttributeData>), typeof(Accessibility), typeof(DeclarationModifiers), typeof(TypeKind), typeof(string), typeof(IList<ITypeParameterSymbol>), typeof(INamedTypeSymbol), typeof(IList<INamedTypeSymbol>), typeof(SpecialType), typeof(IList<ISymbol>) }, null);
+			if (createNamedTypeSymbolMethod == null)
+				throw new InvalidOperationException ("CreateNamedTypeSymbol not found.");
+
+			createDelegateTypeSymbolMethod = typeInfo.GetMethod ("CreateDelegateTypeSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(IList<AttributeData>), typeof(Accessibility), typeof(DeclarationModifiers), typeof(ITypeSymbol), typeof(string), typeof(IList<ITypeParameterSymbol>), typeof(IList<IParameterSymbol>) }, null);
+			if (createDelegateTypeSymbolMethod == null)
+				throw new InvalidOperationException ("CreateDelegateTypeSymbol not found.");
+
+			createAttributeDataMethod = typeInfo.GetMethod ("CreateAttributeData", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(INamedTypeSymbol), typeof(ImmutableArray<TypedConstant>), typeof(ImmutableArray<KeyValuePair<string, TypedConstant>>) }, null);
+			if (createAttributeDataMethod == null)
+				throw new InvalidOperationException ("CreateAttributeData not found.");
+
+			createEventSymbol = typeInfo.GetMethod ("CreateEventSymbol", BindingFlags.Static | BindingFlags.Public, null, new [] { typeof(IList<AttributeData>), typeof(Accessibility), typeof(DeclarationModifiers), typeof(ITypeSymbol), typeof(IEventSymbol), typeof(string), typeof(IMethodSymbol), typeof(IMethodSymbol), typeof(IMethodSymbol), typeof(IList<IParameterSymbol>) }, null);
+			if (createEventSymbol == null)
+				throw new InvalidOperationException ("CreateEventSymbol not found.");
+			
+			createPropertySymbolMethod2 = typeInfo.GetMethod ("CreatePropertySymbol", BindingFlags.Static | BindingFlags.NonPublic, null, new [] { 
+				typeof(INamedTypeSymbol),
+				typeof(IList<AttributeData>),
+				typeof(Accessibility),
+				typeof(DeclarationModifiers),
+				typeof(ITypeSymbol),
+				typeof(IPropertySymbol),
+				typeof(string),
+				typeof(IList<IParameterSymbol>),
+				typeof(IMethodSymbol),
+				typeof(IMethodSymbol),
+				typeof(bool),
+				typeof(SyntaxNode) 
+			}, null);
+			if (createPropertySymbolMethod2 == null)
+				throw new InvalidOperationException ("CreatePropertySymbol2 not found.");
+			
+		}
+
+		static MethodInfo createPropertySymbolMethod2;
+
+		public static IPropertySymbol CreatePropertySymbol(
+			INamedTypeSymbol containingType,
+			IList<AttributeData> attributes,
+			Accessibility accessibility,
+			DeclarationModifiers modifiers,
+			ITypeSymbol type,
+			IPropertySymbol explicitInterfaceSymbol,
+			string name,
+			IList<IParameterSymbol> parameters,
+			IMethodSymbol getMethod,
+			IMethodSymbol setMethod,
+			bool isIndexer = false,
+			SyntaxNode initializer = null)
+		{
+			try {
+				return (IPropertySymbol)createPropertySymbolMethod2.Invoke (null, new object[] { containingType,
+					attributes,
+					accessibility,
+					modifiers,
+					type,
+					explicitInterfaceSymbol,
+					name,
+					parameters,
+					getMethod,
+					setMethod,
+					isIndexer,
+					initializer 
+				});	
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		static MethodInfo createEventSymbol;
+
+		public static IEventSymbol CreateEventSymbol(IList<AttributeData> attributes, Accessibility accessibility, DeclarationModifiers modifiers, ITypeSymbol type, IEventSymbol explicitInterfaceSymbol, string name, IMethodSymbol addMethod = null, IMethodSymbol removeMethod = null, IMethodSymbol raiseMethod = null, IList<IParameterSymbol> parameterList = null)
+		{
+			try {
+				return (IEventSymbol)createEventSymbol.Invoke (null, new object[] { attributes, accessibility, modifiers, type, explicitInterfaceSymbol, name, addMethod, removeMethod, raiseMethod, parameterList });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public static IEventSymbol CreateEventSymbol(
+			IEventSymbol @event,
+			IList<AttributeData> attributes = null,
+			Accessibility? accessibility = null,
+			DeclarationModifiers? modifiers = null,
+			IEventSymbol explicitInterfaceSymbol = null,
+			string name = null,
+			IMethodSymbol addMethod = null,
+			IMethodSymbol removeMethod = null)
+		{
+			return CodeGenerationSymbolFactory.CreateEventSymbol(
+				attributes,
+				accessibility ?? @event.DeclaredAccessibility,
+				modifiers ?? @event.GetSymbolModifiers(),
+				@event.Type,
+				explicitInterfaceSymbol,
+				name ?? @event.Name,
+				addMethod,
+				removeMethod);
+		}
+
+		public static IMethodSymbol CreateMethodSymbol(
+			IMethodSymbol method,
+			IList<AttributeData> attributes = null,
+			Accessibility? accessibility = null,
+			DeclarationModifiers? modifiers = null,
+			IMethodSymbol explicitInterfaceSymbol = null,
+			string name = null,
+			IList<SyntaxNode> statements = null)
+		{
+			return CodeGenerationSymbolFactory.CreateMethodSymbol(
+				attributes,
+				accessibility ?? method.DeclaredAccessibility,
+				modifiers ?? method.GetSymbolModifiers(),
+				method.ReturnType,
+				explicitInterfaceSymbol,
+				name ?? method.Name,
+				method.TypeParameters,
+				method.Parameters,
+				statements,
+				returnTypeAttributes: method.GetReturnTypeAttributes());
+		}
+
+		public static IPropertySymbol CreatePropertySymbol(
+			IPropertySymbol property,
+			IList<AttributeData> attributes = null,
+			Accessibility? accessibility = null,
+			DeclarationModifiers? modifiers = null,
+			IPropertySymbol explicitInterfaceSymbol = null,
+			string name = null,
+			bool? isIndexer = null,
+			IMethodSymbol getMethod = null,
+			IMethodSymbol setMethod = null)
+		{
+			return CodeGenerationSymbolFactory.CreatePropertySymbol(
+				attributes,
+				accessibility ?? property.DeclaredAccessibility,
+				modifiers ?? property.GetSymbolModifiers(),
+				property.Type,
+				explicitInterfaceSymbol,
+				name ?? property.Name,
+				property.Parameters,
+				getMethod,
+				setMethod,
+				isIndexer ?? property.IsIndexer);
+		}
+
+		public static IMethodSymbol CreateAccessorSymbol(
+			IMethodSymbol accessor,
+			IList<AttributeData> attributes = null,
+			Accessibility? accessibility = null,
+			IMethodSymbol explicitInterfaceSymbol = null,
+			IList<SyntaxNode> statements = null)
+		{
+			return CodeGenerationSymbolFactory.CreateMethodSymbol(
+				attributes,
+				accessibility ?? accessor.DeclaredAccessibility,
+				accessor.GetSymbolModifiers().WithIsAbstract(statements == null),
+				accessor.ReturnType,
+				explicitInterfaceSymbol ?? accessor.ExplicitInterfaceImplementations.FirstOrDefault(),
+				accessor.Name,
+				accessor.TypeParameters,
+				accessor.Parameters,
+				statements,
+				returnTypeAttributes: accessor.GetReturnTypeAttributes());
+		}
+
+
+		static MethodInfo createAttributeDataMethod;
+
+		public static AttributeData CreateAttributeData(
+			INamedTypeSymbol attributeClass,
+			ImmutableArray<TypedConstant> constructorArguments = default(ImmutableArray<TypedConstant>),
+			ImmutableArray<KeyValuePair<string, TypedConstant>> namedArguments = default(ImmutableArray<KeyValuePair<string, TypedConstant>>))
+		{
+			try {
+				return (AttributeData)createAttributeDataMethod.Invoke (null, new object[] { attributeClass, constructorArguments, namedArguments });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createNamedTypeSymbolMethod;
+		public static INamedTypeSymbol CreateNamedTypeSymbol(IList<AttributeData> attributes, Accessibility accessibility, DeclarationModifiers modifiers, TypeKind typeKind, string name, IList<ITypeParameterSymbol> typeParameters = null, INamedTypeSymbol baseType = null, IList<INamedTypeSymbol> interfaces = null, SpecialType specialType = SpecialType.None, IList<ISymbol> members = null)
+		{
+			try {
+				return (INamedTypeSymbol)createNamedTypeSymbolMethod.Invoke (null, new object[] { attributes, accessibility, modifiers, typeKind, name, typeParameters, baseType, interfaces,  specialType, members });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createDelegateTypeSymbolMethod;
+		public static INamedTypeSymbol CreateDelegateTypeSymbol(IList<AttributeData> attributes, Accessibility accessibility, DeclarationModifiers modifiers, ITypeSymbol returnType, string name, IList<ITypeParameterSymbol> typeParameters = null, IList<IParameterSymbol> parameters = null)
+		{
+			try {
+				return (INamedTypeSymbol)createDelegateTypeSymbolMethod.Invoke (null, new object[] { attributes, accessibility, modifiers, returnType, name, typeParameters, parameters });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createNamespaceSymbolMethod;
+
+		public static INamespaceSymbol CreateNamespaceSymbol(string name, IList<ISymbol> imports = null, IList<INamespaceOrTypeSymbol> members = null)
+		{
+			try {
+				return (INamespaceSymbol)createNamespaceSymbolMethod.Invoke (null, new object[] { name, imports, members });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static readonly MethodInfo isCodeGenerationSymbolMethod;
+		/// <summary>
+		/// Determines if the symbol is purely a code generation symbol.
+		/// </summary>
+		public static bool IsCodeGenerationSymbol(this ISymbol symbol)
+		{
+			try {
+				return (bool)isCodeGenerationSymbolMethod.Invoke (null, new object[] { symbol });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		static readonly MethodInfo createParameterSymbolMethod;
+		public static IParameterSymbol CreateParameterSymbol(ITypeSymbol type, string name)
+		{
+			return CreateParameterSymbol(attributes: null, refKind: RefKind.None, isParams: false, type: type, name: name, isOptional: false);
+		}
+
+		public static IParameterSymbol CreateParameterSymbol(IList<AttributeData> attributes, RefKind refKind, bool isParams, ITypeSymbol type, string name, bool isOptional = false, bool hasDefaultValue = false, object defaultValue = null)
+		{
+			try {
+				return (IParameterSymbol)createParameterSymbolMethod.Invoke (null, new object[] { attributes, refKind, isParams, type, name, isOptional, hasDefaultValue, defaultValue });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static readonly MethodInfo createTypeParameterSymbolMethod;
+		public static ITypeParameterSymbol CreateTypeParameterSymbol(string name, int ordinal = 0)
+		{
+			try {
+				return (ITypeParameterSymbol)createTypeParameterSymbolMethod.Invoke (null, new object[] { name, ordinal });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createTypeParameterMethod;
+		public static ITypeParameterSymbol CreateTypeParameter(IList<AttributeData> attributes, VarianceKind varianceKind, string name, ImmutableArray<ITypeSymbol> constraintTypes, bool hasConstructorConstraint = false, bool hasReferenceConstraint = false, bool hasValueConstraint = false, int ordinal = 0)
+		{
+			try {
+				return (ITypeParameterSymbol)createTypeParameterMethod.Invoke (null, new object[] { attributes, varianceKind, name, constraintTypes, hasConstructorConstraint, hasReferenceConstraint, hasValueConstraint, ordinal});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createMethodSymbolMethod;
+		public static IMethodSymbol CreateMethodSymbol(IList<AttributeData> attributes, Accessibility accessibility, DeclarationModifiers modifiers, ITypeSymbol returnType, IMethodSymbol explicitInterfaceSymbol, string name, IList<ITypeParameterSymbol> typeParameters, IList<IParameterSymbol> parameters, IList<SyntaxNode> statements = null, IList<SyntaxNode> handlesExpressions = null, IList<AttributeData> returnTypeAttributes = null, MethodKind methodKind = MethodKind.Ordinary)
+		{
+			try {
+				return (IMethodSymbol)createMethodSymbolMethod.Invoke (null, new object[] { attributes, accessibility, modifiers, returnType, explicitInterfaceSymbol, name, typeParameters, parameters, statements, handlesExpressions, returnTypeAttributes, methodKind });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createMethodSymbolMethod2;
+		public static IMethodSymbol CreateMethodSymbol(INamedTypeSymbol containingType, IList<AttributeData> attributes, Accessibility accessibility, DeclarationModifiers modifiers, ITypeSymbol returnType, IMethodSymbol explicitInterfaceSymbol, string name, IList<ITypeParameterSymbol> typeParameters, IList<IParameterSymbol> parameters, IList<SyntaxNode> statements = null, IList<SyntaxNode> handlesExpressions = null, IList<AttributeData> returnTypeAttributes = null, MethodKind methodKind = MethodKind.Ordinary)
+		{
+			try {
+				return (IMethodSymbol)createMethodSymbolMethod2.Invoke (null, new object[] { containingType, attributes, accessibility, modifiers, returnType, explicitInterfaceSymbol, name, typeParameters, parameters, statements, null, returnTypeAttributes, methodKind });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createPointerTypeSymbolMethod;
+		public static IPointerTypeSymbol CreatePointerTypeSymbol(ITypeSymbol pointedAtType)
+		{
+			try {
+				return (IPointerTypeSymbol)createPointerTypeSymbolMethod.Invoke (null, new object[] { pointedAtType });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createArrayTypeSymbolMethod;
+		public static IArrayTypeSymbol CreateArrayTypeSymbol(ITypeSymbol elementType, int rank = 1)
+		{
+			try {
+				return (IArrayTypeSymbol)createArrayTypeSymbolMethod.Invoke (null, new object[] { elementType, rank });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createConstructorSymbolMethod;
+		public static IMethodSymbol CreateConstructorSymbol(IList<AttributeData> attributes, Accessibility accessibility, DeclarationModifiers modifiers, string typeName, IList<IParameterSymbol> parameters, IList<SyntaxNode> statements = null, IList<SyntaxNode> baseConstructorArguments = null, IList<SyntaxNode> thisConstructorArguments = null)
+		{
+			try {
+				return (IMethodSymbol)createConstructorSymbolMethod.Invoke (null, new object[] { attributes, accessibility, modifiers, typeName, parameters, statements, baseConstructorArguments, thisConstructorArguments });	
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createAccessorSymbolMethod;
+		public static IMethodSymbol CreateAccessorSymbol(IList<AttributeData> attributes, Accessibility accessibility, IList<SyntaxNode> statements)
+		{
+			try {
+				return (IMethodSymbol)createAccessorSymbolMethod.Invoke (null, new object[] { attributes, accessibility, statements });	
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createPropertySymbolMethod;
+
+		/// <summary>
+		/// Creates a property symbol that can be used to describe a property declaration.
+		/// </summary>
+		public static IPropertySymbol CreatePropertySymbol(IList<AttributeData> attributes, Accessibility accessibility, DeclarationModifiers modifiers, ITypeSymbol type, IPropertySymbol explicitInterfaceSymbol, string name, IList<IParameterSymbol> parameters, IMethodSymbol getMethod, IMethodSymbol setMethod, bool isIndexer = false)
+		{
+			try {
+				return (IPropertySymbol)createPropertySymbolMethod.Invoke (null, new object[] { attributes, accessibility, modifiers, type, explicitInterfaceSymbol, name, parameters, getMethod, setMethod, isIndexer });	
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo createFieldSymbolMethod;
+
+		public static IFieldSymbol CreateFieldSymbol(IList<AttributeData> attributes, Accessibility accessibility, DeclarationModifiers modifiers, ITypeSymbol type, string name, bool hasConstantValue = false, object constantValue = null, SyntaxNode initializer = null)
+		{
+			try {
+				return (IFieldSymbol)createFieldSymbolMethod.Invoke (null, new object[] { attributes, accessibility, modifiers, type, name, hasConstantValue, constantValue, initializer });	
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/CodeRefactoringContextExtensions.cs b/main/src/addins/CSharpBinding/Util/CodeRefactoringContextExtensions.cs
new file mode 100644
index 0000000000..9a7608c8f8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CodeRefactoringContextExtensions.cs
@@ -0,0 +1,43 @@
+//
+// CodeRefactoringContextExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CodeActions;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CodeRefactoringContextExtensions
+	{
+		public static void RegisterRefactorings(this CodeRefactoringContext context, IEnumerable<CodeAction> actions)
+		{
+			foreach (var action in actions) {
+				context.RegisterRefactoring(action);
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/CommonAccessibilityUtilities.cs b/main/src/addins/CSharpBinding/Util/CommonAccessibilityUtilities.cs
new file mode 100644
index 0000000000..a143df376e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CommonAccessibilityUtilities.cs
@@ -0,0 +1,75 @@
+//
+// ITypeSymbolExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.ComponentModel;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using System.Reflection;
+using System.Collections.Generic;
+using System.Threading;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Threading.Tasks;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CommonAccessibilityUtilities
+	{
+		public static Accessibility Minimum(Accessibility accessibility1, Accessibility accessibility2)
+		{
+			if (accessibility1 == Accessibility.Private || accessibility2 == Accessibility.Private)
+			{
+				return Accessibility.Private;
+			}
+
+			if (accessibility1 == Accessibility.ProtectedAndInternal || accessibility2 == Accessibility.ProtectedAndInternal)
+			{
+				return Accessibility.ProtectedAndInternal;
+			}
+
+			if (accessibility1 == Accessibility.Protected || accessibility2 == Accessibility.Protected)
+			{
+				return Accessibility.Protected;
+			}
+
+			if (accessibility1 == Accessibility.Internal || accessibility2 == Accessibility.Internal)
+			{
+				return Accessibility.Internal;
+			}
+
+			if (accessibility1 == Accessibility.ProtectedOrInternal || accessibility2 == Accessibility.ProtectedOrInternal)
+			{
+				return Accessibility.ProtectedOrInternal;
+			}
+
+			return Accessibility.Public;
+		}
+	}
+
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/CommonLocationExtensions.cs b/main/src/addins/CSharpBinding/Util/CommonLocationExtensions.cs
new file mode 100644
index 0000000000..e5733fb93a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CommonLocationExtensions.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CommonLocationExtensions
+	{
+		public static SyntaxToken FindToken(this Location location, CancellationToken cancellationToken)
+		{
+			return location.SourceTree.GetRoot(cancellationToken).FindToken(location.SourceSpan.Start);
+		}
+
+		public static bool IsVisibleSourceLocation(this Location loc)
+		{
+			if (!loc.IsInSource)
+			{
+				return false;
+			}
+
+			var tree = loc.SourceTree;
+			return !(tree == null || tree.IsHiddenPosition(loc.SourceSpan.Start));
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/CommonSyntaxNodeOrTokenExtensions.cs b/main/src/addins/CSharpBinding/Util/CommonSyntaxNodeOrTokenExtensions.cs
new file mode 100644
index 0000000000..b99585496f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CommonSyntaxNodeOrTokenExtensions.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CommonSyntaxNodeOrTokenExtensions
+	{
+		public static IEnumerable<SyntaxNodeOrToken> DepthFirstTraversal(this SyntaxNodeOrToken node)
+		{
+			var stack = new Stack<SyntaxNodeOrToken>();
+			stack.Push(node);
+
+			while (!stack.IsEmpty())
+			{
+				var current = stack.Pop();
+
+				yield return current;
+
+				if (current.IsNode)
+				{
+					foreach (var child in current.ChildNodesAndTokens().Reverse())
+					{
+						stack.Push(child);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/CompilationExtensions.cs b/main/src/addins/CSharpBinding/Util/CompilationExtensions.cs
new file mode 100644
index 0000000000..39d7d56bf1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CompilationExtensions.cs
@@ -0,0 +1,67 @@
+//
+// CompilationExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CompilationExtensions
+	{
+		static INamespaceSymbol FindNamespace(INamespaceSymbol globalNamespace, string fullName, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (string.IsNullOrEmpty(fullName))
+				return globalNamespace;
+			var stack = new Stack<INamespaceSymbol>();
+			stack.Push(globalNamespace);
+
+			while (stack.Count > 0) {
+				if (cancellationToken.IsCancellationRequested)
+					return null;
+				var currentNs = stack.Pop();
+				if (currentNs.GetFullName() == fullName)
+					return currentNs;
+				foreach (var childNamespace in currentNs.GetNamespaceMembers())
+					stack.Push(childNamespace);
+			}
+			return null;
+		}
+		
+		public static ITypeSymbol GetTypeSymbol(this Compilation compilation, string ns, string name, int arity, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (compilation == null)
+				throw new ArgumentNullException("compilation");
+			var nsSymbol = FindNamespace (compilation.GlobalNamespace, ns, cancellationToken);
+			if (nsSymbol == null)
+				return null;
+			return nsSymbol.GetTypeMembers(name, arity).FirstOrDefault ();
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/CompilationUnitSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/CompilationUnitSyntaxExtensions.cs
new file mode 100644
index 0000000000..288720c479
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CompilationUnitSyntaxExtensions.cs
@@ -0,0 +1,202 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CompilationUnitSyntaxExtensions
+	{
+		public static bool CanAddUsingDirectives(this SyntaxNode contextNode, CancellationToken cancellationToken)
+		{
+			var usingDirectiveAncsestor = contextNode.GetAncestor<UsingDirectiveSyntax>();
+			if ((usingDirectiveAncsestor != null) && (usingDirectiveAncsestor.GetAncestor<NamespaceDeclarationSyntax>() == null))
+			{
+				// We are inside a top level using directive (i.e. one that's directly in the compilation unit).
+				return false;
+			}
+
+			if (contextNode.SyntaxTree.HasHiddenRegions())
+			{
+				var namespaceDeclaration = contextNode.GetInnermostNamespaceDeclarationWithUsings();
+				var root = contextNode.GetAncestorOrThis<CompilationUnitSyntax>();
+				var span = GetUsingsSpan(root, namespaceDeclaration);
+
+				if (contextNode.SyntaxTree.OverlapsHiddenPosition(span, cancellationToken))
+				{
+					return false;
+				}
+			}
+
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		private static TextSpan GetUsingsSpan(CompilationUnitSyntax root, NamespaceDeclarationSyntax namespaceDeclaration)
+		{
+			if (namespaceDeclaration != null)
+			{
+				var usings = namespaceDeclaration.Usings;
+				var start = usings.First().SpanStart;
+				var end = usings.Last().Span.End;
+				return TextSpan.FromBounds(start, end);
+			}
+			else
+			{
+				var rootUsings = root.Usings;
+				if (rootUsings.Any())
+				{
+					var start = rootUsings.First().SpanStart;
+					var end = rootUsings.Last().Span.End;
+					return TextSpan.FromBounds(start, end);
+				}
+				else
+				{
+					var start = 0;
+					var end = root.Members.Any()
+						? root.Members.First().GetFirstToken().Span.End
+						: root.Span.End;
+					return TextSpan.FromBounds(start, end);
+				}
+			}
+		}
+
+		public static CompilationUnitSyntax AddUsingDirective(
+			this CompilationUnitSyntax root,
+			UsingDirectiveSyntax usingDirective,
+			SyntaxNode contextNode,
+			bool placeSystemNamespaceFirst,
+			params SyntaxAnnotation[] annotations)
+		{
+			return root.AddUsingDirectives(new[] { usingDirective }, contextNode, placeSystemNamespaceFirst, annotations);
+		}
+
+		public static CompilationUnitSyntax AddUsingDirectives(
+			this CompilationUnitSyntax root,
+			IList<UsingDirectiveSyntax> usingDirectives,
+			SyntaxNode contextNode,
+			bool placeSystemNamespaceFirst,
+			params SyntaxAnnotation[] annotations)
+		{
+			if (!usingDirectives.Any())
+			{
+				return root;
+			}
+
+			var firstOuterNamespaceWithUsings = contextNode.GetInnermostNamespaceDeclarationWithUsings();
+
+			if (firstOuterNamespaceWithUsings == null)
+			{
+				return root.AddUsingDirectives(usingDirectives, placeSystemNamespaceFirst, annotations);
+			}
+			else
+			{
+				var newNamespace = firstOuterNamespaceWithUsings.AddUsingDirectives(usingDirectives, placeSystemNamespaceFirst, annotations);
+				return root.ReplaceNode(firstOuterNamespaceWithUsings, newNamespace);
+			}
+		}
+
+		public static CompilationUnitSyntax AddUsingDirectives(
+			this CompilationUnitSyntax root,
+			IList<UsingDirectiveSyntax> usingDirectives,
+			bool placeSystemNamespaceFirst,
+			params SyntaxAnnotation[] annotations)
+		{
+			if (usingDirectives.Count == 0)
+			{
+				return root;
+			}
+
+			var comparer = placeSystemNamespaceFirst
+				? UsingsAndExternAliasesDirectiveComparer.SystemFirstInstance
+				: UsingsAndExternAliasesDirectiveComparer.NormalInstance;
+
+			var usings = AddUsingDirectives(root, usingDirectives);
+
+			// If the user likes to have their Usings statements unsorted, allow them to
+			if (root.Usings.IsSorted(comparer))
+			{
+				usings.Sort(comparer);
+			}
+
+			// If any using we added was moved to the first location, then take the trivia from
+			// the start of the first token and add it to the using we added.  This way things
+			// like #define's and #r's will stay above the using.
+			var firstUsingChanged = root.Usings.Count == 0 || usings[0] != root.Usings[0];
+			if (firstUsingChanged && root.Externs.Count == 0)
+			{
+				var firstToken = root.GetFirstToken();
+
+				// Move the leading directives from the first directive to the new using.
+				var firstUsing = usings[0].WithLeadingTrivia(firstToken.LeadingTrivia.Where(t => !t.IsDocComment() && !t.IsElastic()));
+
+				// Remove the leading directives from the first token.
+				var newFirstToken = firstToken.WithLeadingTrivia(firstToken.LeadingTrivia.Where(t => t.IsDocComment() || t.IsElastic()));
+
+				// Remove the leading trivia from the first token from the tree.
+				root = root.ReplaceToken(firstToken, newFirstToken);
+
+				// Create the new list of usings.  
+				var finalUsings = new List<UsingDirectiveSyntax>();
+				finalUsings.Add(firstUsing);
+				finalUsings.AddRange(root.Usings);
+				finalUsings.AddRange(usingDirectives.Except(new[] { usings[0] }));
+				finalUsings.Sort(comparer);
+				usings = finalUsings;
+			}
+
+			usings = usings.Select(u => u.WithAdditionalAnnotations(annotations)).ToList();
+			return root.WithUsings(usings.ToSyntaxList());
+		}
+
+		private static List<UsingDirectiveSyntax> AddUsingDirectives(CompilationUnitSyntax root, IList<UsingDirectiveSyntax> usingDirectives)
+		{
+			// We need to try and not place the using inside of a directive if possible.
+			var usings = new List<UsingDirectiveSyntax>();
+			var endOfList = root.Usings.Count - 1;
+			int startOfLastDirective = -1;
+			int endOfLastDirective = -1;
+			for (int i = 0; i < root.Usings.Count; i++)
+			{
+				if (root.Usings[i].GetLeadingTrivia().Any(trivia => trivia.IsKind(SyntaxKind.IfDirectiveTrivia)))
+				{
+					startOfLastDirective = i;
+				}
+
+				if (root.Usings[i].GetLeadingTrivia().Any(trivia => trivia.IsKind(SyntaxKind.EndIfDirectiveTrivia)))
+				{
+					endOfLastDirective = i;
+				}
+			}
+
+			// if the entire using is in a directive or there is a using list at the end outside of the directive add the using at the end, 
+			// else place it before the last directive.
+			usings.AddRange(root.Usings);
+			if ((startOfLastDirective == 0 && (endOfLastDirective == endOfList || endOfLastDirective == -1)) ||
+				(startOfLastDirective == -1 && endOfLastDirective == -1) ||
+				(endOfLastDirective != endOfList && endOfLastDirective != -1))
+			{
+				usings.AddRange(usingDirectives);
+			}
+			else
+			{
+				usings.InsertRange(startOfLastDirective, usingDirectives);
+			}
+			return usings;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ConflictResolver.cs b/main/src/addins/CSharpBinding/Util/ConflictResolver.cs
new file mode 100644
index 0000000000..760c1757be
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ConflictResolver.cs
@@ -0,0 +1,114 @@
+//
+// ConflictResolver.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using System;
+using Microsoft.CodeAnalysis.Options;
+using System.Threading.Tasks;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class ConflictResolution 
+	{
+		//static Type typeInfo;
+		internal object instance;
+
+		static ConflictResolution ()
+		{
+			//typeInfo = Type.GetType ("Microsoft.CodeAnalysis.Rename.ConflictEngine.ConflictResolution" + ReflectionNamespaces.WorkspacesAsmName, true);
+
+		}
+
+		public ConflictResolution (object instance)
+		{
+			this.instance = instance;
+		}
+
+	}
+
+	class RenameLocations
+	{
+		//static Type typeInfo;
+		internal object instance;
+
+		static RenameLocations ()
+		{
+			//typeInfo = Type.GetType ("Microsoft.CodeAnalysis.Rename.RenameLocations" + ReflectionNamespaces.WorkspacesAsmName, true);
+
+		}
+
+		public RenameLocations (object instance)
+		{
+			this.instance = instance;
+		}
+
+	}
+
+
+	class ConflictResolver
+	{
+		static MethodInfo resolveConflictsAsyncMethod;
+		static Type typeInfo;
+
+		static ConflictResolver ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.Rename.ConflictEngine.ConflictResolver" + ReflectionNamespaces.WorkspacesAsmName, true);
+			resolveConflictsAsyncMethod = typeInfo.GetMethod ("ResolveConflictsAsync");
+
+		}
+
+		public static Task<ConflictResolution> ResolveConflictsAsync(
+			RenameLocations renameLocationSet,
+			string originalText,
+			string replacementText,
+			OptionSet optionSet,
+			Func<IEnumerable<ISymbol>, bool?> hasConflict,
+			CancellationToken cancellationToken)
+		{
+			try {
+				var task = resolveConflictsAsyncMethod.Invoke (null, new object [] { renameLocationSet.instance, originalText, replacementText, optionSet, hasConflict, cancellationToken });
+				var propertyInfo = task.GetType ().GetProperty ("Result");
+				return Task.FromResult (new ConflictResolution (propertyInfo.GetValue (task)));
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/CrefSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/CrefSyntaxExtensions.cs
new file mode 100644
index 0000000000..1d80af7b2f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/CrefSyntaxExtensions.cs
@@ -0,0 +1,136 @@
+//
+// CrefSyntaxExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Simplification;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Rename.ConflictEngine;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using System;
+using System.Reflection;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class CrefSyntaxExtensions
+	{
+		public static bool TryReduceOrSimplifyExplicitName(
+			this CrefSyntax crefSyntax,
+			SemanticModel semanticModel,
+			out CrefSyntax replacementNode,
+			out TextSpan issueSpan,
+			OptionSet optionSet,
+			CancellationToken cancellationToken)
+		{
+			replacementNode = null;
+			issueSpan = default(TextSpan);
+
+			// Currently Qualified Cref is the only CrefSyntax We are handling separately
+			if (crefSyntax.Kind() != SyntaxKind.QualifiedCref)
+			{
+				return false;
+			}
+
+			var qualifiedCrefSyntax = (QualifiedCrefSyntax)crefSyntax;
+			var memberCref = qualifiedCrefSyntax.Member;
+
+			// Currently we are dealing with only the NameMemberCrefs
+			if (optionSet.GetOption(SimplificationOptions.PreferIntrinsicPredefinedTypeKeywordInMemberAccess, LanguageNames.CSharp) &&
+				(memberCref.Kind() == SyntaxKind.NameMemberCref))
+			{
+				var nameMemberCref = ((NameMemberCrefSyntax)memberCref).Name;
+				var symbolInfo = semanticModel.GetSymbolInfo(nameMemberCref, cancellationToken);
+				var symbol = symbolInfo.Symbol;
+
+				if (symbol == null)
+				{
+					return false;
+				}
+
+				if (symbol is INamespaceOrTypeSymbol)
+				{
+					//var namespaceOrTypeSymbol = (INamespaceOrTypeSymbol)symbol;
+
+					// 1. Check for Predefined Types
+					if (symbol is INamedTypeSymbol)
+					{
+						var namedSymbol = (INamedTypeSymbol)symbol;
+						var keywordKind = ExpressionSyntaxExtensions.GetPredefinedKeywordKind(namedSymbol.SpecialType);
+
+						if (keywordKind != SyntaxKind.None)
+						{
+							replacementNode = SyntaxFactory.TypeCref(
+								SyntaxFactory.PredefinedType(
+									SyntaxFactory.Token(crefSyntax.GetLeadingTrivia(), keywordKind, crefSyntax.GetTrailingTrivia())));
+							replacementNode = crefSyntax.CopyAnnotationsTo(replacementNode);
+
+							// we want to show the whole name expression as unnecessary
+							issueSpan = crefSyntax.Span;
+
+							return true;
+						}
+					}
+				}
+			}
+
+			var oldSymbol = semanticModel.GetSymbolInfo(crefSyntax, cancellationToken).Symbol;
+			if (oldSymbol != null)
+			{
+				var speculativeBindingOption = SpeculativeBindingOption.BindAsExpression;
+				if (oldSymbol is INamespaceOrTypeSymbol)
+				{
+					speculativeBindingOption = SpeculativeBindingOption.BindAsTypeOrNamespace;
+				}
+
+				var newSymbol = semanticModel.GetSpeculativeSymbolInfo(crefSyntax.SpanStart, memberCref, speculativeBindingOption).Symbol;
+
+				if (newSymbol == oldSymbol)
+				{
+					// Copy Trivia and Annotations
+					memberCref = memberCref.WithLeadingTrivia(crefSyntax.GetLeadingTrivia());
+					memberCref = crefSyntax.CopyAnnotationsTo(memberCref);
+					issueSpan = qualifiedCrefSyntax.Container.Span;
+					replacementNode = memberCref;
+					return true;
+				}
+			}
+
+			return false;
+		}
+	}
+	
+}
diff --git a/main/src/addins/CSharpBinding/Util/DirectiveSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/DirectiveSyntaxExtensions.cs
new file mode 100644
index 0000000000..3bed8b6c58
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/DirectiveSyntaxExtensions.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.ExceptionServices;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal static partial class DirectiveSyntaxExtensions
+	{
+		readonly static MethodInfo getMatchingDirective;
+		readonly static MethodInfo getMatchingConditionalDirectives;
+
+		static DirectiveSyntaxExtensions()
+		{
+			var typeInfo = Type.GetType("Microsoft.CodeAnalysis.CSharp.Extensions.DirectiveSyntaxExtensions" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			if (typeInfo == null)
+				throw new InvalidOperationException ("DirectiveSyntaxExtensions not found.");
+			getMatchingDirective = typeInfo.GetMethod("GetMatchingDirective", BindingFlags.NonPublic | BindingFlags.Static);
+			if (getMatchingDirective == null)
+				throw new InvalidOperationException ("GetMatchingDirective not found.");
+			getMatchingConditionalDirectives = typeInfo.GetMethod("GetMatchingConditionalDirectives", BindingFlags.NonPublic | BindingFlags.Static);
+			if (getMatchingDirective == null)
+				throw new InvalidOperationException ("GetMatchingConditionalDirectives not found.");
+		}
+
+
+
+		internal static DirectiveTriviaSyntax GetMatchingDirective(this DirectiveTriviaSyntax directive, CancellationToken cancellationToken)
+		{
+			try {
+				return (DirectiveTriviaSyntax)getMatchingDirective.Invoke(null, new object[] { directive, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		internal static IReadOnlyList<DirectiveTriviaSyntax> GetMatchingConditionalDirectives(this DirectiveTriviaSyntax directive, CancellationToken cancellationToken)
+		{
+			try {
+				return (IReadOnlyList<DirectiveTriviaSyntax>)getMatchingConditionalDirectives.Invoke(null, new object[] { directive, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/Util/DocumentExtensions.cs b/main/src/addins/CSharpBinding/Util/DocumentExtensions.cs
new file mode 100644
index 0000000000..d61a6c9a79
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/DocumentExtensions.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.SemanticModelWorkspaceService;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using System;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static partial class DocumentExtensions
+	{
+		public static TLanguageService GetLanguageService<TLanguageService>(this Document document) where TLanguageService : class, ILanguageService
+		{
+			return document.Project.LanguageServices.GetService<TLanguageService>();
+		}
+
+		public static bool IsOpen(this Document document)
+		{
+			var workspace = document.Project.Solution.Workspace as Workspace;
+			return workspace != null && workspace.IsDocumentOpen(document.Id);
+		}
+
+		/// <summary>
+		/// this will return either regular semantic model or speculative semantic based on context. 
+		/// any feature that is involved in typing or run on UI thread should use this to take advantage of speculative semantic model 
+		/// whenever possible automatically.
+		/// 
+		/// when using this API, semantic model should only be used to ask node inside of the given span. 
+		/// otherwise, it might throw if semantic model returned by this API is a speculative semantic model.
+		/// 
+		/// also, symbols from the semantic model returned by this API might have out of date location information. 
+		/// if exact location (not relative location) is needed from symbol, regular GetSemanticModel should be used.
+		/// </summary>
+		public static async Task<SemanticModel> GetSemanticModelForSpanAsync(this Document document, TextSpan span, CancellationToken cancellationToken)
+		{
+//			var syntaxFactService = document.Project.LanguageServices.GetService<ISyntaxFactsService>();
+//			var semanticModelService = document.Project.Solution.Workspace.Services.GetService<ISemanticModelService>();
+//			if (semanticModelService == null || syntaxFactService == null)
+//			{
+				return await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+//			}
+//
+//			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+//			var token = root.FindToken(span.Start);
+//			if (token.Parent == null)
+//			{
+//				return await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+//			}
+//
+//			var node = token.Parent.AncestorsAndSelf().FirstOrDefault(a => a.FullSpan.Contains(span));
+//			return await GetSemanticModelForNodeAsync(semanticModelService, syntaxFactService, document, node, span, cancellationToken).ConfigureAwait(false);
+		}
+
+		/// <summary>
+		/// this will return either regular semantic model or speculative semantic based on context. 
+		/// any feature that is involved in typing or run on UI thread should use this to take advantage of speculative semantic model 
+		/// whenever possible automatically.
+		/// 
+		/// when using this API, semantic model should only be used to ask node inside of the given node except ones that belong to 
+		/// member signature. otherwise, it might throw if semantic model returned by this API is a speculative semantic model.
+		/// 
+		/// also, symbols from the semantic model returned by this API might have out of date location information. 
+		/// if exact location (not relative location) is needed from symbol, regular GetSemanticModel should be used.
+		/// </summary>
+		public static Task<SemanticModel> GetSemanticModelForNodeAsync(this Document document, SyntaxNode node, CancellationToken cancellationToken)
+		{
+//			var syntaxFactService = document.Project.LanguageServices.GetService<ISyntaxFactsService>();
+//			var semanticModelService = document.Project.Solution.Workspace.Services.GetService<ISemanticModelService>();
+//			if (semanticModelService == null || syntaxFactService == null || node == null)
+//			{
+				return document.GetSemanticModelAsync(cancellationToken);
+//			}
+//
+//			return GetSemanticModelForNodeAsync(semanticModelService, syntaxFactService, document, node, node.FullSpan, cancellationToken);
+		}
+
+		public static async Task<IEnumerable<T>> GetUnionResultsFromDocumentAndLinks<T>(
+			this Document document,
+			IEqualityComparer<T> comparer,
+			Func<Document, CancellationToken, Task<IEnumerable<T>>> getItemsWorker,
+			CancellationToken cancellationToken)
+		{
+			var linkedDocumentIds = document.GetLinkedDocumentIds();
+			var itemsForCurrentContext = await getItemsWorker(document, cancellationToken).ConfigureAwait(false) ?? SpecializedCollections.EmptyEnumerable<T>();
+			if (!linkedDocumentIds.Any())
+			{
+				return itemsForCurrentContext;
+			}
+
+			ISet<T> totalItems = itemsForCurrentContext.ToSet(comparer);
+			foreach (var linkedDocumentId in linkedDocumentIds)
+			{
+				var linkedDocument = document.Project.Solution.GetDocument(linkedDocumentId);
+				var items = await getItemsWorker(linkedDocument, cancellationToken).ConfigureAwait(false);
+				if (items != null)
+				{
+					foreach (var item in items)
+						totalItems.Add (item);
+				}
+			}
+
+			return totalItems;
+		}
+
+		public static bool ShouldHideAdvancedMembers(this Document document)
+		{
+			return false;
+//			var service = document.Project.Solution.Workspace.Services.GetService<IOptionService>();
+//			return service.GetOption(CompletionOptions.HideAdvancedMembers, document.Project.Language);
+		}
+
+		public static async Task<Document> ReplaceNodeAsync<TNode>(this Document document, TNode oldNode, TNode newNode, CancellationToken cancellationToken) where TNode : SyntaxNode
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var newRoot = root.ReplaceNode(oldNode, newNode);
+			return document.WithSyntaxRoot(newRoot);
+		}
+
+		public static async Task<Document> ReplaceNodesAsync(this Document document,
+			IEnumerable<SyntaxNode> nodes,
+			Func<SyntaxNode, SyntaxNode, SyntaxNode> computeReplacementNode,
+			CancellationToken cancellationToken)
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var newRoot = root.ReplaceNodes(nodes, computeReplacementNode);
+			return document.WithSyntaxRoot(newRoot);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/EnumValueUtilities.cs b/main/src/addins/CSharpBinding/Util/EnumValueUtilities.cs
new file mode 100644
index 0000000000..deb4b97893
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/EnumValueUtilities.cs
@@ -0,0 +1,57 @@
+//
+// EnumValueUtilities.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class EnumValueUtilities
+	{
+		readonly static Type typeInfo;
+
+		static EnumValueUtilities ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.Shared.Utilities.EnumValueUtilities" + ReflectionNamespaces.WorkspacesAsmName, true);
+			getNextEnumValueMethod = typeInfo.GetMethod ("GetNextEnumValue", BindingFlags.Static | BindingFlags.Public);
+		}
+
+		readonly static MethodInfo getNextEnumValueMethod;
+
+		public static object GetNextEnumValue(INamedTypeSymbol enumType, CancellationToken cancellationToken)
+		{
+			try {
+				return getNextEnumValueMethod.Invoke (null, new object[] { enumType, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/EnumerableExtensions.cs b/main/src/addins/CSharpBinding/Util/EnumerableExtensions.cs
new file mode 100644
index 0000000000..0d54dd99c0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/EnumerableExtensions.cs
@@ -0,0 +1,351 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static partial class EnumerableExtensions
+	{
+		public static IEnumerable<T> Do<T>(this IEnumerable<T> source, Action<T> action)
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			if (action == null)
+			{
+				throw new ArgumentNullException(nameof(action));
+			}
+
+			// perf optimization. try to not use enumerator if possible
+			var list = source as IList<T>;
+			if (list != null)
+			{
+				for (int i = 0, count = list.Count; i < count; i++)
+				{
+					action(list[i]);
+				}
+			}
+			else
+			{
+				foreach (var value in source)
+				{
+					action(value);
+				}
+			}
+
+			return source;
+		}
+
+		public static ReadOnlyCollection<T> ToReadOnlyCollection<T>(this IEnumerable<T> source)
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			return new ReadOnlyCollection<T>(source.ToList());
+		}
+
+		public static IEnumerable<T> Concat<T>(this IEnumerable<T> source, T value)
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			return source.ConcatWorker(value);
+		}
+
+		private static IEnumerable<T> ConcatWorker<T>(this IEnumerable<T> source, T value)
+		{
+			foreach (var v in source)
+			{
+				yield return v;
+			}
+
+			yield return value;
+		}
+
+		public static bool SetEquals<T>(this IEnumerable<T> source1, IEnumerable<T> source2, IEqualityComparer<T> comparer)
+		{
+			if (source1 == null)
+			{
+				throw new ArgumentNullException(nameof(source1));
+			}
+
+			if (source2 == null)
+			{
+				throw new ArgumentNullException(nameof(source2));
+			}
+
+			return source1.ToSet(comparer).SetEquals(source2);
+		}
+
+		public static bool SetEquals<T>(this IEnumerable<T> source1, IEnumerable<T> source2)
+		{
+			if (source1 == null)
+			{
+				throw new ArgumentNullException(nameof(source1));
+			}
+
+			if (source2 == null)
+			{
+				throw new ArgumentNullException(nameof(source2));
+			}
+
+			return source1.ToSet().SetEquals(source2);
+		}
+
+		public static ISet<T> ToSet<T>(this IEnumerable<T> source, IEqualityComparer<T> comparer)
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			return new HashSet<T>(source, comparer);
+		}
+
+		public static ISet<T> ToSet<T>(this IEnumerable<T> source)
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			return source as ISet<T> ?? new HashSet<T>(source);
+		}
+
+		public static T? FirstOrNullable<T>(this IEnumerable<T> source)
+			where T : struct
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			return source.Cast<T?>().FirstOrDefault();
+		}
+
+		public static T? FirstOrNullable<T>(this IEnumerable<T> source, Func<T, bool> predicate)
+			where T : struct
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			return source.Cast<T?>().FirstOrDefault(v => predicate(v.Value));
+		}
+
+		public static T? LastOrNullable<T>(this IEnumerable<T> source)
+			where T : struct
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			return source.Cast<T?>().LastOrDefault();
+		}
+
+		public static bool IsSingle<T>(this IEnumerable<T> list)
+		{
+			using (var enumerator = list.GetEnumerator())
+			{
+				return enumerator.MoveNext() && !enumerator.MoveNext();
+			}
+		}
+
+		public static bool IsEmpty<T>(this IEnumerable<T> source)
+		{
+			var readOnlyCollection = source as IReadOnlyCollection<T>;
+			if (readOnlyCollection != null)
+			{
+				return readOnlyCollection.Count == 0;
+			}
+
+			var genericCollection = source as ICollection<T>;
+			if (genericCollection != null)
+			{
+				return genericCollection.Count == 0;
+			}
+
+			var collection = source as ICollection;
+			if (collection != null)
+			{
+				return collection.Count == 0;
+			}
+
+			var str = source as string;
+			if (str != null)
+			{
+				return str.Length == 0;
+			}
+
+			foreach (var t in source)
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		public static bool IsEmpty<T>(this IReadOnlyCollection<T> source)
+		{
+			return source.Count == 0;
+		}
+
+		public static bool IsEmpty<T>(this ICollection<T> source)
+		{
+			return source.Count == 0;
+		}
+
+		public static bool IsEmpty(this string source)
+		{
+			return source.Length == 0;
+		}
+
+		/// <remarks>
+		/// This method is necessary to avoid an ambiguity between <see cref="IsEmpty{T}(IReadOnlyCollection{T})"/> and <see cref="IsEmpty{T}(ICollection{T})"/>.
+		/// </remarks>
+		public static bool IsEmpty<T>(this T[] source)
+		{
+			return source.Length == 0;
+		}
+
+		/// <remarks>
+		/// This method is necessary to avoid an ambiguity between <see cref="IsEmpty{T}(IReadOnlyCollection{T})"/> and <see cref="IsEmpty{T}(ICollection{T})"/>.
+		/// </remarks>
+		public static bool IsEmpty<T>(this List<T> source)
+		{
+			return source.Count == 0;
+		}
+
+		private static readonly Func<object, bool> s_notNullTest = x => x != null;
+
+		public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T> source)
+			where T : class
+		{
+			if (source == null)
+			{
+				return SpecializedCollections.EmptyEnumerable<T>();
+			}
+
+			return source.Where((Func<T, bool>)s_notNullTest);
+		}
+
+		public static bool All(this IEnumerable<bool> source)
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException(nameof(source));
+			}
+
+			foreach (var b in source)
+			{
+				if (!b)
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		public static IEnumerable<T> Flatten<T>(this IEnumerable<IEnumerable<T>> sequence)
+		{
+			if (sequence == null)
+			{
+				throw new ArgumentNullException(nameof(sequence));
+			}
+
+			return sequence.SelectMany(s => s);
+		}
+
+		public static IEnumerable<T> OrderBy<T>(this IEnumerable<T> source, IComparer<T> comparer)
+		{
+			return source.OrderBy(t => t, comparer);
+		}
+
+//		public static IEnumerable<T> OrderBy<T>(this IEnumerable<T> source, Comparison<T> compare)
+//		{
+//			return source.OrderBy(new ComparisonComparer<T>(compare));
+//		}
+
+//		public static IEnumerable<T> Order<T>(this IEnumerable<T> source) where T : IComparable<T>
+//		{
+//			return source.OrderBy((t1, t2) => t1.CompareTo(t2));
+//		}
+
+		public static bool IsSorted<T>(this IEnumerable<T> enumerable, IComparer<T> comparer)
+		{
+			using (var e = enumerable.GetEnumerator())
+			{
+				if (!e.MoveNext())
+				{
+					return true;
+				}
+
+				var previous = e.Current;
+				while (e.MoveNext())
+				{
+					if (comparer.Compare(previous, e.Current) > 0)
+					{
+						return false;
+					}
+
+					previous = e.Current;
+				}
+
+				return true;
+			}
+		}
+
+		public static bool SequenceEqual<T>(this IEnumerable<T> first, IEnumerable<T> second, Func<T, T, bool> comparer)
+		{
+			Debug.Assert(comparer != null);
+
+			if (first == second)
+			{
+				return true;
+			}
+
+			if (first == null || second == null)
+			{
+				return false;
+			}
+
+			using (var enumerator = first.GetEnumerator())
+			using (var enumerator2 = second.GetEnumerator())
+			{
+				while (enumerator.MoveNext())
+				{
+					if (!enumerator2.MoveNext() || !comparer(enumerator.Current, enumerator2.Current))
+					{
+						return false;
+					}
+				}
+
+				if (enumerator2.MoveNext())
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		public static bool Contains<T>(this IEnumerable<T> sequence, Func<T, bool> predicate)
+		{
+			return sequence.Any(predicate);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ExpressionSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/ExpressionSyntaxExtensions.cs
new file mode 100644
index 0000000000..5fce0d401b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ExpressionSyntaxExtensions.cs
@@ -0,0 +1,2380 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Extensions.ContextQuery;
+using Microsoft.CodeAnalysis.CSharp.Simplification;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Rename.ConflictEngine;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using System;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static partial class ExpressionSyntaxExtensions
+	{
+		static MethodInfo castIfPossibleMethod;
+
+
+		static ExpressionSyntaxExtensions ()
+		{
+			var typeInfo = Type.GetType("Microsoft.CodeAnalysis.CSharp.Extensions.ExpressionSyntaxExtensions" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			castIfPossibleMethod = typeInfo.GetMethod("CastIfPossible", BindingFlags.Static | BindingFlags.Public);
+			if (castIfPossibleMethod == null)
+				throw new Exception ("ExpressionSyntaxExtensions: CastIfPossible not found");
+			tryReduceOrSimplifyExplicitNameMethod = typeInfo.GetMethod("TryReduceOrSimplifyExplicitName", BindingFlags.Static | BindingFlags.Public);
+			if (tryReduceOrSimplifyExplicitNameMethod == null)
+				throw new Exception ("ExpressionSyntaxExtensions: TryReduceOrSimplifyExplicitName not found");
+		}
+
+		/// <summary>
+		/// Adds to <paramref name="targetType"/> if it does not contain an anonymous
+		/// type and binds to the same type at the given <paramref name="position"/>.
+		/// </summary>
+		public static ExpressionSyntax CastIfPossible(
+			this ExpressionSyntax expression,
+			ITypeSymbol targetType,
+			int position,
+			SemanticModel semanticModel)
+		{
+			try {
+				var args = new object [] { expression, targetType, position, semanticModel};
+				var result = (ExpressionSyntax)castIfPossibleMethod.Invoke (null, args);
+				return result;
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				throw ex;
+			}
+        }
+
+		public static ExpressionSyntax WalkUpParentheses(this ExpressionSyntax expression)
+		{
+			while (expression.IsParentKind(SyntaxKind.ParenthesizedExpression))
+			{
+				expression = (ExpressionSyntax)expression.Parent;
+			}
+
+			return expression;
+		}
+
+		public static ExpressionSyntax WalkDownParentheses(this ExpressionSyntax expression)
+		{
+			while (expression.IsKind(SyntaxKind.ParenthesizedExpression))
+			{
+				expression = ((ParenthesizedExpressionSyntax)expression).Expression;
+			}
+
+			return expression;
+		}
+
+		public static ExpressionSyntax Parenthesize(this ExpressionSyntax expression, bool includeElasticTrivia = true)
+		{
+			var leadingTrivia = expression.GetLeadingTrivia();
+			var trailingTrivia = expression.GetTrailingTrivia();
+			expression = expression.WithoutLeadingTrivia()
+				.WithoutTrailingTrivia();
+
+			if (includeElasticTrivia)
+			{
+				return SyntaxFactory.ParenthesizedExpression(expression)
+					.WithLeadingTrivia(leadingTrivia)
+					.WithTrailingTrivia(trailingTrivia)
+					.WithAdditionalAnnotations(Simplifier.Annotation);
+			}
+			else
+			{
+				return SyntaxFactory.ParenthesizedExpression(
+					SyntaxFactory.Token(SyntaxTriviaList.Empty, SyntaxKind.OpenParenToken, SyntaxTriviaList.Empty),
+					expression,
+					SyntaxFactory.Token(SyntaxTriviaList.Empty, SyntaxKind.CloseParenToken, SyntaxTriviaList.Empty))
+						.WithLeadingTrivia(leadingTrivia)
+						.WithTrailingTrivia(trailingTrivia)
+						.WithAdditionalAnnotations(Simplifier.Annotation);
+			}
+		}
+
+		public static CastExpressionSyntax Cast(
+			this ExpressionSyntax expression,
+			ITypeSymbol targetType)
+		{
+			return SyntaxFactory.CastExpression(
+				type: targetType.GenerateTypeSyntax(),
+				expression: expression.Parenthesize())
+					.WithAdditionalAnnotations(Simplifier.Annotation);
+		}
+
+		public static bool IsQualifiedCrefName(this ExpressionSyntax expression)
+		{
+			return expression.IsParentKind(SyntaxKind.NameMemberCref) && expression.Parent.IsParentKind(SyntaxKind.QualifiedCref);
+		}
+
+		public static bool IsMemberAccessExpressionName(this ExpressionSyntax expression)
+		{
+			return (expression.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) && ((MemberAccessExpressionSyntax)expression.Parent).Name == expression) ||
+				(IsMemberBindingExpressionName(expression));
+		}
+
+		public static bool IsAnyMemberAccessExpressionName(this ExpressionSyntax expression)
+		{
+			if (expression == null)
+			{
+				return false;
+			}
+
+			return expression == (expression.Parent as MemberAccessExpressionSyntax)?.Name ||
+				expression.IsMemberBindingExpressionName();
+		}
+
+		private static bool IsMemberBindingExpressionName(this ExpressionSyntax expression)
+		{
+			return expression.IsParentKind(SyntaxKind.MemberBindingExpression) &&
+				((MemberBindingExpressionSyntax)expression.Parent).Name == expression;
+		}
+
+		public static bool IsRightSideOfQualifiedName(this ExpressionSyntax expression)
+		{
+			return expression.IsParentKind(SyntaxKind.QualifiedName) && ((QualifiedNameSyntax)expression.Parent).Right == expression;
+		}
+
+		public static bool IsRightSideOfColonColon(this ExpressionSyntax expression)
+		{
+			return expression.IsParentKind(SyntaxKind.AliasQualifiedName) && ((AliasQualifiedNameSyntax)expression.Parent).Name == expression;
+		}
+
+		public static bool IsRightSideOfDot(this ExpressionSyntax name)
+		{
+			return IsMemberAccessExpressionName(name) || IsRightSideOfQualifiedName(name) || IsQualifiedCrefName(name);
+		}
+
+		public static bool IsRightSideOfDotOrArrow(this ExpressionSyntax name)
+		{
+			return IsAnyMemberAccessExpressionName(name) || IsRightSideOfQualifiedName(name);
+		}
+
+		public static bool IsRightSideOfDotOrColonColon(this ExpressionSyntax name)
+		{
+			return IsRightSideOfDot(name) || IsRightSideOfColonColon(name);
+		}
+
+		public static bool IsRightSideOfDotOrArrowOrColonColon(this ExpressionSyntax name)
+		{
+			return IsRightSideOfDotOrArrow(name) || IsRightSideOfColonColon(name);
+		}
+
+		public static bool IsRightOfCloseParen(this ExpressionSyntax expression)
+		{
+			var firstToken = expression.GetFirstToken();
+			return firstToken.Kind() != SyntaxKind.None
+				&& firstToken.GetPreviousToken().Kind() == SyntaxKind.CloseParenToken;
+		}
+
+		public static bool IsLeftSideOfDot(this ExpressionSyntax expression)
+		{
+			return
+				IsLeftSideOfQualifiedName(expression) ||
+				(expression.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) && ((MemberAccessExpressionSyntax)expression.Parent).Expression == expression);
+		}
+
+		public static bool IsLeftSideOfDotOrArrow(this ExpressionSyntax expression)
+		{
+			return
+				IsLeftSideOfQualifiedName(expression) ||
+				(expression.Parent is MemberAccessExpressionSyntax && ((MemberAccessExpressionSyntax)expression.Parent).Expression == expression);
+		}
+
+		public static bool IsLeftSideOfQualifiedName(this ExpressionSyntax expression)
+		{
+			return
+				expression.IsParentKind(SyntaxKind.QualifiedName) && ((QualifiedNameSyntax)expression.Parent).Left == expression;
+		}
+
+		public static bool IsExpressionOfInvocation(this ExpressionSyntax expression)
+		{
+			return
+				expression.IsParentKind(SyntaxKind.InvocationExpression) && ((InvocationExpressionSyntax)expression.Parent).Expression == expression;
+		}
+
+		public static bool TryGetNameParts(this ExpressionSyntax expression, out IList<string> parts)
+		{
+			var partsList = new List<string>();
+			if (!TryGetNameParts(expression, partsList))
+			{
+				parts = null;
+				return false;
+			}
+
+			parts = partsList;
+			return true;
+		}
+
+		public static bool TryGetNameParts(this ExpressionSyntax expression, List<string> parts)
+		{
+			if (expression.IsKind(SyntaxKind.SimpleMemberAccessExpression))
+			{
+				var memberAccess = (MemberAccessExpressionSyntax)expression;
+				if (!TryGetNameParts(memberAccess.Expression, parts))
+				{
+					return false;
+				}
+
+				return AddSimpleName(memberAccess.Name, parts);
+			}
+			else if (expression.IsKind(SyntaxKind.QualifiedName))
+			{
+				var qualifiedName = (QualifiedNameSyntax)expression;
+				if (!TryGetNameParts(qualifiedName.Left, parts))
+				{
+					return false;
+				}
+
+				return AddSimpleName(qualifiedName.Right, parts);
+			}
+			else if (expression is SimpleNameSyntax)
+			{
+				return AddSimpleName((SimpleNameSyntax)expression, parts);
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		private static bool AddSimpleName(SimpleNameSyntax simpleName, List<string> parts)
+		{
+			if (!simpleName.IsKind(SyntaxKind.IdentifierName))
+			{
+				return false;
+			}
+
+			parts.Add(simpleName.Identifier.ValueText);
+			return true;
+		}
+
+		public static bool IsAnyLiteralExpression(this ExpressionSyntax expression)
+		{
+			return
+				expression.IsKind(SyntaxKind.CharacterLiteralExpression) ||
+				expression.IsKind(SyntaxKind.FalseLiteralExpression) ||
+				expression.IsKind(SyntaxKind.NullLiteralExpression) ||
+				expression.IsKind(SyntaxKind.NumericLiteralExpression) ||
+				expression.IsKind(SyntaxKind.StringLiteralExpression) ||
+				expression.IsKind(SyntaxKind.TrueLiteralExpression);
+		}
+
+		public static bool IsInConstantContext(this ExpressionSyntax expression)
+		{
+			if (expression.GetAncestor<ParameterSyntax>() != null)
+			{
+				return true;
+			}
+
+			var attributeArgument = expression.GetAncestor<AttributeArgumentSyntax>();
+			if (attributeArgument != null)
+			{
+				if (attributeArgument.NameEquals == null ||
+					expression != attributeArgument.NameEquals.Name)
+				{
+					return true;
+				}
+			}
+
+			// TODO(cyrusn): Add more cases.
+			return false;
+		}
+
+		public static bool IsInOutContext(this ExpressionSyntax expression)
+		{
+			var argument = expression.Parent as ArgumentSyntax;
+			return
+				argument != null &&
+				argument.Expression == expression &&
+				argument.RefOrOutKeyword.Kind() == SyntaxKind.OutKeyword;
+		}
+
+		public static bool IsInRefContext(this ExpressionSyntax expression)
+		{
+			var argument = expression.Parent as ArgumentSyntax;
+			return
+				argument != null &&
+				argument.Expression == expression &&
+				argument.RefOrOutKeyword.Kind() == SyntaxKind.RefKeyword;
+		}
+
+		public static bool IsOnlyWrittenTo(this ExpressionSyntax expression)
+		{
+			if (expression.IsRightSideOfDotOrArrow())
+			{
+				expression = expression.Parent as ExpressionSyntax;
+			}
+
+			if (expression != null)
+			{
+				if (expression.IsInOutContext())
+				{
+					return true;
+				}
+
+				if (expression.Parent != null)
+				{
+					if (expression.IsLeftSideOfAssignExpression())
+					{
+						return true;
+					}
+
+					var nameEquals = expression.Parent as NameEqualsSyntax;
+					if (nameEquals != null && nameEquals.IsParentKind(SyntaxKind.AttributeArgument))
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsWrittenTo(this ExpressionSyntax expression)
+		{
+			if (expression.IsOnlyWrittenTo())
+			{
+				return true;
+			}
+
+			if (expression.IsRightSideOfDotOrArrow())
+			{
+				expression = expression.Parent as ExpressionSyntax;
+			}
+
+			if (expression != null)
+			{
+				if (expression.IsInRefContext())
+				{
+					return true;
+				}
+
+				// We're written if we're used in a ++, or -- expression.
+				if (expression.Parent != null)
+				{
+					switch (expression.Parent.Kind())
+					{
+					case SyntaxKind.PostIncrementExpression:
+					case SyntaxKind.PreIncrementExpression:
+					case SyntaxKind.PostDecrementExpression:
+					case SyntaxKind.PreDecrementExpression:
+						return true;
+					}
+
+					if (expression.IsLeftSideOfAnyAssignExpression())
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsNamedArgumentIdentifier(this ExpressionSyntax expression)
+		{
+			return expression is IdentifierNameSyntax && expression.Parent is NameColonSyntax;
+		}
+
+		public static bool IsInsideNameOf(this ExpressionSyntax expression)
+		{
+			return expression.SyntaxTree.IsNameOfContext(expression.SpanStart);
+		}
+
+		private static bool CanReplace(ISymbol symbol)
+		{
+			switch (symbol.Kind)
+			{
+			case SymbolKind.Field:
+			case SymbolKind.Local:
+			case SymbolKind.Method:
+			case SymbolKind.Parameter:
+			case SymbolKind.Property:
+			case SymbolKind.RangeVariable:
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool CanReplaceWithRValue(
+			this ExpressionSyntax expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			// An RValue can't be written into. 
+			// i.e. you can't replace "a" in "a = b" with "Foo() = b".
+			return
+				expression != null &&
+				!expression.IsWrittenTo() &&
+				CanReplaceWithLValue(expression, semanticModel, cancellationToken);
+		}
+
+		public static bool CanReplaceWithLValue(
+			this ExpressionSyntax expression, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			if (expression.IsKind(SyntaxKind.StackAllocArrayCreationExpression))
+			{
+				// Stack alloc is very interesting.  While it appears to be an expression, it is only
+				// such so it can appear in a variable decl.  It is not a normal expression that can
+				// go anywhere.
+				return false;
+			}
+
+			if (expression.IsKind(SyntaxKind.BaseExpression) ||
+				expression.IsKind(SyntaxKind.CollectionInitializerExpression) ||
+				expression.IsKind(SyntaxKind.ObjectInitializerExpression) ||
+				expression.IsKind(SyntaxKind.ComplexElementInitializerExpression))
+			{
+				return false;
+			}
+
+			// literal can be always replaced.
+			if (expression is LiteralExpressionSyntax && !expression.IsParentKind(SyntaxKind.UnaryMinusExpression))
+			{
+				return true;
+			}
+
+			if (!(expression is ObjectCreationExpressionSyntax) && !(expression is AnonymousObjectCreationExpressionSyntax))
+			{
+				var symbolInfo = semanticModel.GetSymbolInfo(expression, cancellationToken);
+				if (!symbolInfo.GetBestOrAllSymbols().All(CanReplace))
+				{
+					// If the expression is actually a reference to a type, then it can't be replaced
+					// with an arbitrary expression.
+					return false;
+				}
+			}
+
+			switch (expression.Parent.Kind())
+			{
+			case SyntaxKind.InvocationExpression:
+				// Technically, you could introduce an LValue for "Foo" in "Foo()" even if "Foo" binds
+				// to a method.  (i.e. by assigning to a Func<...> type).  However, this is so contrived
+				// and none of the features that use this extension consider this replaceable.
+				if (expression.IsKind(SyntaxKind.IdentifierName) || expression is MemberAccessExpressionSyntax)
+				{
+					// If it looks like a method then we don't allow it to be replaced if it is a
+					// method (or if it doesn't bind).
+
+					var symbolInfo = semanticModel.GetSymbolInfo(expression, cancellationToken);
+					return symbolInfo.GetBestOrAllSymbols().Any() && !symbolInfo.GetBestOrAllSymbols().Any(s => s is IMethodSymbol);
+				}
+				else
+				{
+					// It doesn't look like a method, we allow this to be replaced.
+					return true;
+				}
+
+			case SyntaxKind.IsExpression:
+			case SyntaxKind.AsExpression:
+				// Can't introduce a variable for the type portion of an is/as check.
+				var isOrAsExpression = (BinaryExpressionSyntax)expression.Parent;
+				return expression == isOrAsExpression.Left;
+			case SyntaxKind.EqualsValueClause:
+			case SyntaxKind.ExpressionStatement:
+			case SyntaxKind.ArrayInitializerExpression:
+			case SyntaxKind.CollectionInitializerExpression:
+			case SyntaxKind.ConditionalAccessExpression:
+			case SyntaxKind.Argument:
+			case SyntaxKind.AttributeArgument:
+			case SyntaxKind.AnonymousObjectMemberDeclarator:
+			case SyntaxKind.ArrowExpressionClause:
+			case SyntaxKind.AwaitExpression:
+			case SyntaxKind.ReturnStatement:
+			case SyntaxKind.YieldReturnStatement:
+			case SyntaxKind.ParenthesizedLambdaExpression:
+			case SyntaxKind.SimpleLambdaExpression:
+			case SyntaxKind.ParenthesizedExpression:
+			case SyntaxKind.ArrayRankSpecifier:
+			case SyntaxKind.ConditionalExpression:
+			case SyntaxKind.IfStatement:
+			case SyntaxKind.CatchFilterClause:
+			case SyntaxKind.WhileStatement:
+			case SyntaxKind.DoStatement:
+			case SyntaxKind.ThrowStatement:
+			case SyntaxKind.SwitchStatement:
+			// TODO: uncomment on roslyn update
+			//case SyntaxKind.InterpolatedStringExpression:
+			case SyntaxKind.ComplexElementInitializerExpression:
+			
+			// TODO: uncomment on roslyn update
+			// case SyntaxKind.Interpolation:
+				// Direct parent kind checks.
+				return true;
+			}
+
+			if (expression.Parent is PrefixUnaryExpressionSyntax)
+			{
+				if (!(expression is LiteralExpressionSyntax && expression.IsParentKind(SyntaxKind.UnaryMinusExpression)))
+				{
+					return true;
+				}
+			}
+
+			var parentNonExpression = expression.GetAncestors().SkipWhile(n => n is ExpressionSyntax).FirstOrDefault();
+			var topExpression = expression;
+			while (topExpression.Parent is TypeSyntax)
+			{
+				topExpression = (TypeSyntax)topExpression.Parent;
+			}
+
+			if (parentNonExpression != null &&
+				parentNonExpression.IsKind(SyntaxKind.FromClause) &&
+				topExpression != null &&
+				((FromClauseSyntax)parentNonExpression).Type == topExpression)
+			{
+				return false;
+			}
+
+			// Parent type checks.
+			if (expression.Parent is PostfixUnaryExpressionSyntax ||
+				expression.Parent is BinaryExpressionSyntax ||
+				expression.Parent is AssignmentExpressionSyntax ||
+				expression.Parent is QueryClauseSyntax ||
+				expression.Parent is SelectOrGroupClauseSyntax ||
+				expression.Parent is CheckedExpressionSyntax)
+			{
+				return true;
+			}
+
+			// Specific child checks.
+			if (expression.CheckParent<ForEachStatementSyntax>(f => f.Expression == expression) ||
+				expression.CheckParent<MemberAccessExpressionSyntax>(m => m.Expression == expression) ||
+				expression.CheckParent<CastExpressionSyntax>(c => c.Expression == expression))
+			{
+				return true;
+			}
+
+			// Misc checks.
+			if ((expression.IsParentKind(SyntaxKind.NameEquals) && expression.Parent.IsParentKind(SyntaxKind.AttributeArgument)) ||
+				expression.IsLeftSideOfAnyAssignExpression())
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+//		public static bool CanAccessInstanceAndStaticMembersOffOf(
+//			this ExpressionSyntax expression,
+//			SemanticModel semanticModel,
+//			CancellationToken cancellationToken)
+//		{
+//			// Check for the Color Color case.
+//			//
+//			// color color: if you bind "A" and you get a symbol and the type of that symbol is
+//			// Q; and if you bind "A" *again* as a type and you get type Q, then both A.static
+//			// and A.instance are permitted
+//			if (expression is IdentifierNameSyntax)
+//			{
+//				var instanceSymbol = semanticModel.GetSymbolInfo(expression, cancellationToken).GetAnySymbol();
+//
+//				if (!(instanceSymbol is INamespaceOrTypeSymbol))
+//				{
+//					var instanceType = instanceSymbol.GetSymbolType();
+//					if (instanceType != null)
+//					{
+//						var speculativeSymbolInfo = semanticModel.GetSpeculativeSymbolInfo(expression.SpanStart, expression, SpeculativeBindingOption.BindAsTypeOrNamespace);
+//						if (speculativeSymbolInfo.CandidateReason != CandidateReason.NotATypeOrNamespace)
+//						{
+//							var staticType = speculativeSymbolInfo.GetAnySymbol().GetSymbolType();
+//
+//							return SymbolEquivalenceComparer.Instance.Equals(instanceType, staticType);
+//						}
+//					}
+//				}
+//			}
+//
+//			return false;
+//		}
+
+		readonly static MethodInfo tryReduceOrSimplifyExplicitNameMethod;
+
+		public static bool TryReduceOrSimplifyExplicitName(
+			this ExpressionSyntax expression,
+			SemanticModel semanticModel,
+			out ExpressionSyntax replacementNode,
+			out TextSpan issueSpan,
+			OptionSet optionSet,
+			CancellationToken cancellationToken)
+		{
+			try {
+				var args = new object[] { expression, semanticModel, default(ExpressionSyntax), default(TextSpan), optionSet, cancellationToken };
+				var result = (bool)tryReduceOrSimplifyExplicitNameMethod.Invoke (null, args);
+				replacementNode = (ExpressionSyntax)args [2];
+				issueSpan = (TextSpan)args [3];
+				return result;
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				throw ex;
+			}
+		}
+
+//		public static bool TryReduceExplicitName(
+//			this ExpressionSyntax expression,
+//			SemanticModel semanticModel,
+//			out TypeSyntax replacementNode,
+//			out TextSpan issueSpan,
+//			OptionSet optionSet,
+//			CancellationToken cancellationToken)
+//		{
+//			replacementNode = null;
+//			issueSpan = default(TextSpan);
+//
+//			if (expression.ContainsInterleavedDirective(cancellationToken))
+//			{
+//				return false;
+//			}
+//
+//			if (expression.Kind() == SyntaxKind.SimpleMemberAccessExpression)
+//			{
+//				var memberAccess = (MemberAccessExpressionSyntax)expression;
+//				return memberAccess.TryReduce(semanticModel, out replacementNode, out issueSpan, optionSet, cancellationToken);
+//			}
+//			else if (expression is NameSyntax)
+//			{
+//				var name = (NameSyntax)expression;
+//				return name.TryReduce(semanticModel, out replacementNode, out issueSpan, optionSet, cancellationToken);
+//			}
+//			else if (expression is TypeSyntax)
+//			{
+//				var typeName = (TypeSyntax)expression;
+//				return typeName.IsReplacableByVar(semanticModel, out replacementNode, out issueSpan, optionSet, cancellationToken);
+//			}
+//
+//			return false;
+//		}
+//
+//		private static bool TryReduce(
+//			this MemberAccessExpressionSyntax memberAccess,
+//			SemanticModel semanticModel,
+//			out TypeSyntax replacementNode,
+//			out TextSpan issueSpan,
+//			OptionSet optionSet,
+//			CancellationToken cancellationToken)
+//		{
+//			replacementNode = null;
+//			issueSpan = default(TextSpan);
+//
+//			if (memberAccess.Name == null || memberAccess.Expression == null)
+//			{
+//				return false;
+//			}
+//
+//			if (optionSet.GetOption(SimplificationOptions.QualifyMemberAccessWithThisOrMe, semanticModel.Language) &&
+//				memberAccess.Expression.Kind() == SyntaxKind.ThisExpression)
+//			{
+//				return false;
+//			}
+//
+//			// if this node is annotated as being a specialtype, let's use this information.
+//			if (memberAccess.HasAnnotations(SpecialTypeAnnotation.Kind))
+//			{
+//				replacementNode = SyntaxFactory.PredefinedType(
+//					SyntaxFactory.Token(
+//						memberAccess.GetLeadingTrivia(),
+//						GetPredefinedKeywordKind(SpecialTypeAnnotation.GetSpecialType(memberAccess.GetAnnotations(SpecialTypeAnnotation.Kind).First())),
+//						memberAccess.GetTrailingTrivia()));
+//
+//				issueSpan = memberAccess.Span;
+//
+//				return true;
+//			}
+//
+//			// if this node is on the left side, we could simplify to aliases
+//			if (!memberAccess.IsRightSideOfDot())
+//			{
+//				// Check if we need to replace this syntax with an alias identifier
+//				IAliasSymbol aliasReplacement;
+//				if (memberAccess.TryReplaceWithAlias(semanticModel, optionSet.GetOption(SimplificationOptions.PreferAliasToQualification), cancellationToken, out aliasReplacement))
+//				{
+//					// get the token text as it appears in source code to preserve e.g. unicode character escaping
+//					var text = aliasReplacement.Name;
+//					var syntaxRef = aliasReplacement.DeclaringSyntaxReferences.FirstOrDefault();
+//
+//					if (syntaxRef != null)
+//					{
+//						var declIdentifier = ((UsingDirectiveSyntax)syntaxRef.GetSyntax(cancellationToken)).Alias.Name.Identifier;
+//						text = declIdentifier.IsVerbatimIdentifier() ? declIdentifier.ToString().Substring(1) : declIdentifier.ToString();
+//					}
+//
+//					replacementNode = SyntaxFactory.IdentifierName(
+//						memberAccess.Name.Identifier.CopyAnnotationsTo(SyntaxFactory.Identifier(
+//							memberAccess.GetLeadingTrivia(),
+//							SyntaxKind.IdentifierToken,
+//							text,
+//							aliasReplacement.Name,
+//							memberAccess.GetTrailingTrivia())));
+//
+//					replacementNode = memberAccess.CopyAnnotationsTo(replacementNode);
+//					replacementNode = memberAccess.Name.CopyAnnotationsTo(replacementNode);
+//
+//					issueSpan = memberAccess.Span;
+//
+//					// In case the alias name is the same as the last name of the alias target, we only include 
+//					// the left part of the name in the unnecessary span to Not confuse uses.
+//					if (memberAccess.Name.Identifier.ValueText == ((IdentifierNameSyntax)replacementNode).Identifier.ValueText)
+//					{
+//						issueSpan = memberAccess.Expression.Span;
+//					}
+//
+//					return true;
+//				}
+//
+//				// Check if the Expression can be replaced by Predefined Type keyword
+//				if (PreferPredefinedTypeKeywordInMemberAccess(memberAccess, optionSet, semanticModel))
+//				{
+//					var symbol = semanticModel.GetSymbolInfo(memberAccess, cancellationToken).Symbol;
+//					if (symbol != null && symbol.IsKind(SymbolKind.NamedType))
+//					{
+//						var keywordKind = GetPredefinedKeywordKind(((INamedTypeSymbol)symbol).SpecialType);
+//						if (keywordKind != SyntaxKind.None)
+//						{
+//							replacementNode = CreatePredefinedTypeSyntax(memberAccess, keywordKind);
+//
+//							issueSpan = memberAccess.Span; // we want to show the whole expression as unnecessary
+//
+//							return true;
+//						}
+//					}
+//				}
+//			}
+//
+//			replacementNode = memberAccess.Name.WithLeadingTrivia(memberAccess.GetLeadingTrivia()).WithTrailingTrivia(memberAccess.GetTrailingTrivia());
+//			issueSpan = memberAccess.Expression.Span;
+//
+//			if (replacementNode == null)
+//			{
+//				return false;
+//			}
+//
+//			return memberAccess.CanReplaceWithReducedName(replacementNode, semanticModel, cancellationToken);
+//		}
+
+		private static bool InsideCrefReference(ExpressionSyntax expr)
+		{
+			var crefAttribute = expr.FirstAncestorOrSelf<XmlCrefAttributeSyntax>();
+			return crefAttribute != null;
+		}
+
+		private static bool InsideNameOfExpression(ExpressionSyntax expr, SemanticModel semanticModel)
+		{
+			var nameOfInvocationExpr = expr.FirstAncestorOrSelf<InvocationExpressionSyntax>(
+				invocationExpr =>
+				{
+					var expression = invocationExpr.Expression as IdentifierNameSyntax;
+					return (expression != null) && (expression.Identifier.Text == "nameof") &&
+						semanticModel.GetConstantValue(invocationExpr).HasValue &&
+						(semanticModel.GetTypeInfo(invocationExpr).Type.SpecialType == SpecialType.System_String);
+				});
+
+			return nameOfInvocationExpr != null;
+		}
+
+		private static bool PreferPredefinedTypeKeywordInDeclarations(NameSyntax name, OptionSet optionSet, SemanticModel semanticModel)
+		{
+			return (name.Parent != null) && !(name.Parent is MemberAccessExpressionSyntax) &&
+				!InsideCrefReference(name) && !InsideNameOfExpression(name, semanticModel) &&
+				optionSet.GetOption(SimplificationOptions.PreferIntrinsicPredefinedTypeKeywordInDeclaration, LanguageNames.CSharp);
+		}
+
+		private static bool PreferPredefinedTypeKeywordInMemberAccess(ExpressionSyntax memberAccess, OptionSet optionSet, SemanticModel semanticModel)
+		{
+			return (((memberAccess.Parent != null) && (memberAccess.Parent is MemberAccessExpressionSyntax)) || InsideCrefReference(memberAccess)) &&
+				!InsideNameOfExpression(memberAccess, semanticModel) &&
+				optionSet.GetOption(SimplificationOptions.PreferIntrinsicPredefinedTypeKeywordInMemberAccess, LanguageNames.CSharp);
+		}
+
+		public static bool IsAliasReplaceableExpression(this ExpressionSyntax expression)
+		{
+			if (expression.Kind() == SyntaxKind.IdentifierName ||
+				expression.Kind() == SyntaxKind.QualifiedName ||
+				expression.Kind() == SyntaxKind.AliasQualifiedName)
+			{
+				return true;
+			}
+
+			if (expression.Kind() == SyntaxKind.SimpleMemberAccessExpression)
+			{
+				var memberAccess = (MemberAccessExpressionSyntax)expression;
+				return memberAccess.Expression != null && memberAccess.Expression.IsAliasReplaceableExpression();
+			}
+
+			return false;
+		}
+//
+//		private static bool TryReplaceWithAlias(this ExpressionSyntax node, SemanticModel semanticModel, bool preferAliasToQualifiedName, CancellationToken cancellationToken, out IAliasSymbol aliasReplacement)
+//		{
+//			aliasReplacement = null;
+//
+//			if (!node.IsAliasReplaceableExpression())
+//			{
+//				return false;
+//			}
+//
+//			var symbol = semanticModel.GetSymbolInfo(node, cancellationToken).Symbol;
+//
+//			// If the Symbol is a contrcutor get its containing type
+//			if (symbol.IsConstructor())
+//			{
+//				symbol = symbol.ContainingType;
+//			}
+//
+//			if (node is QualifiedNameSyntax || node is AliasQualifiedNameSyntax)
+//			{
+//				SyntaxAnnotation aliasAnnotationInfo = null;
+//
+//				// The following condition checks if the user has used alias in the original code and
+//				// if so the expression is replaced with the Alias
+//				if (node is QualifiedNameSyntax)
+//				{
+//					var qualifiedNameNode = (QualifiedNameSyntax)node;
+//					if (qualifiedNameNode.Right.Identifier.HasAnnotations(AliasAnnotation.Kind))
+//					{
+//						aliasAnnotationInfo = qualifiedNameNode.Right.Identifier.GetAnnotations(AliasAnnotation.Kind).Single();
+//					}
+//				}
+//
+//				if (node is AliasQualifiedNameSyntax)
+//				{
+//					var aliasQualifiedNameNode = (AliasQualifiedNameSyntax)node;
+//					if (aliasQualifiedNameNode.Name.Identifier.HasAnnotations(AliasAnnotation.Kind))
+//					{
+//						aliasAnnotationInfo = aliasQualifiedNameNode.Name.Identifier.GetAnnotations(AliasAnnotation.Kind).Single();
+//					}
+//				}
+//
+//				if (aliasAnnotationInfo != null)
+//				{
+//					var aliasName = AliasAnnotation.GetAliasName(aliasAnnotationInfo);
+//					var aliasIdentifier = SyntaxFactory.IdentifierName(aliasName);
+//
+//					var aliasTypeInfo = semanticModel.GetSpeculativeAliasInfo(node.SpanStart, aliasIdentifier, SpeculativeBindingOption.BindAsTypeOrNamespace);
+//
+//					if (aliasTypeInfo != null)
+//					{
+//						aliasReplacement = aliasTypeInfo;
+//						return ValidateAliasForTarget(aliasReplacement, semanticModel, node, symbol);
+//					}
+//				}
+//			}
+//
+//			if (node.Kind() == SyntaxKind.IdentifierName &&
+//				semanticModel.GetAliasInfo((IdentifierNameSyntax)node, cancellationToken) != null)
+//			{
+//				return false;
+//			}
+//
+//			// an alias can only replace a type or namespace
+//			if (symbol == null ||
+//				(symbol.Kind != SymbolKind.Namespace && symbol.Kind != SymbolKind.NamedType))
+//			{
+//				return false;
+//			}
+//
+//			if (node is QualifiedNameSyntax)
+//			{
+//				var qualifiedName = (QualifiedNameSyntax)node;
+//				if (!qualifiedName.Right.HasAnnotation(Simplifier.SpecialTypeAnnotation))
+//				{
+//					var type = semanticModel.GetTypeInfo(node, cancellationToken).Type;
+//					if (type != null)
+//					{
+//						var keywordKind = GetPredefinedKeywordKind(type.SpecialType);
+//						if (keywordKind != SyntaxKind.None)
+//						{
+//							preferAliasToQualifiedName = false;
+//						}
+//					}
+//				}
+//			}
+//
+//			if (node is AliasQualifiedNameSyntax)
+//			{
+//				var aliasQualifiedNameSyntax = (AliasQualifiedNameSyntax)node;
+//				if (!aliasQualifiedNameSyntax.Name.HasAnnotation(Simplifier.SpecialTypeAnnotation))
+//				{
+//					var type = semanticModel.GetTypeInfo(node, cancellationToken).Type;
+//					if (type != null)
+//					{
+//						var keywordKind = GetPredefinedKeywordKind(type.SpecialType);
+//						if (keywordKind != SyntaxKind.None)
+//						{
+//							preferAliasToQualifiedName = false;
+//						}
+//					}
+//				}
+//			}
+//
+//			aliasReplacement = GetAliasForSymbol((INamespaceOrTypeSymbol)symbol, node.GetFirstToken(), semanticModel, cancellationToken);
+//			if (aliasReplacement != null && preferAliasToQualifiedName)
+//			{
+//				return ValidateAliasForTarget(aliasReplacement, semanticModel, node, symbol);
+//			}
+//
+//			return false;
+//		}
+//
+		// We must verify that the alias actually binds back to the thing it's aliasing.
+		// It's possible there's another symbol with the same name as the alias that binds
+		// first
+		private static bool ValidateAliasForTarget(IAliasSymbol aliasReplacement, SemanticModel semanticModel, ExpressionSyntax node, ISymbol symbol)
+		{
+			var aliasName = aliasReplacement.Name;
+
+			var boundSymbols = semanticModel.LookupNamespacesAndTypes(node.SpanStart, name: aliasName);
+
+			if (boundSymbols.Length == 1)
+			{
+				var boundAlias = boundSymbols[0] as IAliasSymbol;
+				if (boundAlias != null && aliasReplacement.Target.Equals(symbol))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+//		public static IAliasSymbol GetAliasForSymbol(INamespaceOrTypeSymbol symbol, SyntaxToken token, SemanticModel semanticModel, CancellationToken cancellationToken)
+//		{
+//			var originalSemanticModel = (SemanticModel)semanticModel.GetOriginalSemanticModel();
+//			if (!originalSemanticModel.SyntaxTree.HasCompilationUnitRoot)
+//			{
+//				return null;
+//			}
+//
+//			IAliasSymbol aliasSymbol;
+//			var namespaceId = GetNamespaceIdForAliasSearch(semanticModel, token, cancellationToken);
+//			if (namespaceId < 0)
+//			{
+//				return null;
+//			}
+//
+//			if (!AliasSymbolCache.TryGetAliasSymbol(originalSemanticModel, namespaceId, symbol, out aliasSymbol))
+//			{
+//				// add cache
+//				AliasSymbolCache.AddAliasSymbols(originalSemanticModel, namespaceId, semanticModel.LookupNamespacesAndTypes(token.SpanStart).OfType<IAliasSymbol>());
+//
+//				// retry
+//				AliasSymbolCache.TryGetAliasSymbol(originalSemanticModel, namespaceId, symbol, out aliasSymbol);
+//			}
+//
+//			return aliasSymbol;
+//		}
+//
+//		private static SyntaxNode GetStartNodeForNamespaceId(SemanticModel semanticModel, SyntaxToken token, CancellationToken cancellationToken)
+//		{
+//			if (!semanticModel.IsSpeculativeSemanticModel)
+//			{
+//				return token.Parent;
+//			}
+//
+//			var originalSemanticMode = (SemanticModel)semanticModel.GetOriginalSemanticModel();
+//			token = originalSemanticMode.SyntaxTree.GetRoot(cancellationToken).FindToken(semanticModel.OriginalPositionForSpeculation);
+//
+//			return token.Parent;
+//		}
+
+//		private static int GetNamespaceIdForAliasSearch(SemanticModel semanticModel, SyntaxToken token, CancellationToken cancellationToken)
+//		{
+//			var startNode = GetStartNodeForNamespaceId(semanticModel, token, cancellationToken);
+//			if (!startNode.SyntaxTree.HasCompilationUnitRoot)
+//			{
+//				return -1;
+//			}
+//
+//			// NOTE: If we're currently in a block of usings, then we want to collect the
+//			// aliases that are higher up than this block.  Using aliases declared in a block of
+//			// usings are not usable from within that same block.
+//			var usingDirective = startNode.GetAncestorOrThis<UsingDirectiveSyntax>();
+//			if (usingDirective != null)
+//			{
+//				startNode = usingDirective.Parent.Parent;
+//				if (startNode == null)
+//				{
+//					return -1;
+//				}
+//			}
+//
+//			// check whether I am under a namespace
+//			var @namespace = startNode.GetAncestorOrThis<NamespaceDeclarationSyntax>();
+//			if (@namespace != null)
+//			{
+//				// since we have node inside of the root, root should be already there
+//				// search for namespace id should be quite cheap since normally there should be
+//				// only a few namespace defined in a source file if it is not 1. that is why it is
+//				// not cached.
+//				var startIndex = 1;
+//				return GetNamespaceId(startNode.SyntaxTree.GetRoot(cancellationToken), @namespace, ref startIndex);
+//			}
+//
+//			// no namespace, under compilation unit directly
+//			return 0;
+//		}
+//
+//		private static int GetNamespaceId(SyntaxNode container, NamespaceDeclarationSyntax target, ref int index)
+//		{
+//			var compilation = container as CompilationUnitSyntax;
+//			if (compilation != null)
+//			{
+//				return GetNamespaceId(compilation.Members, target, ref index);
+//			}
+//
+//			var @namespace = container as NamespaceDeclarationSyntax;
+//			if (@namespace != null)
+//			{
+//				return GetNamespaceId(@namespace.Members, target, ref index);
+//			}
+//
+//			return Contract.FailWithReturn<int>("shouldn't reach here");
+//		}
+//
+//		private static int GetNamespaceId(SyntaxList<MemberDeclarationSyntax> members, NamespaceDeclarationSyntax target, ref int index)
+//		{
+//			foreach (var member in members)
+//			{
+//				var childNamespace = member as NamespaceDeclarationSyntax;
+//				if (childNamespace == null)
+//				{
+//					continue;
+//				}
+//
+//				if (childNamespace == target)
+//				{
+//					return index;
+//				}
+//
+//				index++;
+//				var result = GetNamespaceId(childNamespace, target, ref index);
+//				if (result > 0)
+//				{
+//					return result;
+//				}
+//			}
+//
+//			return -1;
+//		}
+//
+//		private static bool TryReduce(
+//			this NameSyntax name,
+//			SemanticModel semanticModel,
+//			out TypeSyntax replacementNode,
+//			out TextSpan issueSpan,
+//			OptionSet optionSet,
+//			CancellationToken cancellationToken)
+//		{
+//			replacementNode = null;
+//			issueSpan = default(TextSpan);
+//
+//			if (name.IsVar)
+//			{
+//				return false;
+//			}
+//
+//			// we should not simplify a name of a namespace declaration
+//			if (IsPartOfNamespaceDeclarationName(name))
+//			{
+//				return false;
+//			}
+//
+//			// We can simplify Qualified names and AliasQualifiedNames. Generally, if we have 
+//			// something like "A.B.C.D", we only consider the full thing something we can simplify.
+//			// However, in the case of "A.B.C<>.D", then we'll only consider simplifying up to the 
+//			// first open name.  This is because if we remove the open name, we'll often change 
+//			// meaning as "D" will bind to C<T>.D which is different than C<>.D!
+//			if (name is QualifiedNameSyntax)
+//			{
+//				var left = ((QualifiedNameSyntax)name).Left;
+//				if (ContainsOpenName(left))
+//				{
+//					// Don't simplify A.B<>.C
+//					return false;
+//				}
+//			}
+//
+//			// 1. see whether binding the name binds to a symbol/type. if not, it is ambiguous and
+//			//    nothing we can do here.
+//			var symbol = SimplificationHelpers.GetOriginalSymbolInfo(semanticModel, name);
+//			if (symbol == null)
+//			{
+//				return false;
+//			}
+//
+//			// treat constructor names as types
+//			var method = symbol as IMethodSymbol;
+//			if (method.IsConstructor())
+//			{
+//				symbol = method.ContainingType;
+//			}
+//
+//			if (symbol.Kind == SymbolKind.Method && name.Kind() == SyntaxKind.GenericName)
+//			{
+//				// The option wants the generic method invocation name to be explicit, then quit the reduction
+//				if (!optionSet.GetOption(SimplificationOptions.PreferImplicitTypeInference))
+//				{
+//					return false;
+//				}
+//
+//				var genericName = (GenericNameSyntax)name;
+//				replacementNode = SyntaxFactory.IdentifierName(genericName.Identifier)
+//					.WithLeadingTrivia(genericName.GetLeadingTrivia())
+//					.WithTrailingTrivia(genericName.GetTrailingTrivia());
+//
+//				issueSpan = genericName.TypeArgumentList.Span;
+//				return name.CanReplaceWithReducedName(replacementNode, semanticModel, cancellationToken);
+//			}
+//
+//			if (!(symbol is INamespaceOrTypeSymbol))
+//			{
+//				return false;
+//			}
+//
+//			if (name.HasAnnotations(SpecialTypeAnnotation.Kind))
+//			{
+//				replacementNode = SyntaxFactory.PredefinedType(
+//					SyntaxFactory.Token(
+//						name.GetLeadingTrivia(),
+//						GetPredefinedKeywordKind(SpecialTypeAnnotation.GetSpecialType(name.GetAnnotations(SpecialTypeAnnotation.Kind).First())),
+//						name.GetTrailingTrivia()));
+//
+//				issueSpan = name.Span;
+//
+//				return name.CanReplaceWithReducedNameInContext(replacementNode, semanticModel, cancellationToken);
+//			}
+//			else
+//			{
+//				if (!name.IsRightSideOfDotOrColonColon())
+//				{
+//					IAliasSymbol aliasReplacement;
+//					if (name.TryReplaceWithAlias(semanticModel, optionSet.GetOption(SimplificationOptions.PreferAliasToQualification), cancellationToken, out aliasReplacement))
+//					{
+//						// get the token text as it appears in source code to preserve e.g. unicode character escaping
+//						var text = aliasReplacement.Name;
+//						var syntaxRef = aliasReplacement.DeclaringSyntaxReferences.FirstOrDefault();
+//
+//						if (syntaxRef != null)
+//						{
+//							var declIdentifier = ((UsingDirectiveSyntax)syntaxRef.GetSyntax(cancellationToken)).Alias.Name.Identifier;
+//							text = declIdentifier.IsVerbatimIdentifier() ? declIdentifier.ToString().Substring(1) : declIdentifier.ToString();
+//						}
+//
+//						var identifierToken = SyntaxFactory.Identifier(
+//							name.GetLeadingTrivia(),
+//							SyntaxKind.IdentifierToken,
+//							text,
+//							aliasReplacement.Name,
+//							name.GetTrailingTrivia());
+//
+//						identifierToken = CSharpSimplificationService.TryEscapeIdentifierToken(identifierToken, name, semanticModel);
+//						replacementNode = SyntaxFactory.IdentifierName(identifierToken);
+//
+//						// Merge annotation to new syntax node
+//						var annotatedNodesOrTokens = name.GetAnnotatedNodesAndTokens(RenameAnnotation.Kind);
+//						foreach (var annotatedNodeOrToken in annotatedNodesOrTokens)
+//						{
+//							if (annotatedNodeOrToken.IsToken)
+//							{
+//								identifierToken = annotatedNodeOrToken.AsToken().CopyAnnotationsTo(identifierToken);
+//							}
+//							else
+//							{
+//								replacementNode = annotatedNodeOrToken.AsNode().CopyAnnotationsTo(replacementNode);
+//							}
+//						}
+//
+//						annotatedNodesOrTokens = name.GetAnnotatedNodesAndTokens(AliasAnnotation.Kind);
+//						foreach (var annotatedNodeOrToken in annotatedNodesOrTokens)
+//						{
+//							if (annotatedNodeOrToken.IsToken)
+//							{
+//								identifierToken = annotatedNodeOrToken.AsToken().CopyAnnotationsTo(identifierToken);
+//							}
+//							else
+//							{
+//								replacementNode = annotatedNodeOrToken.AsNode().CopyAnnotationsTo(replacementNode);
+//							}
+//						}
+//
+//						replacementNode = ((SimpleNameSyntax)replacementNode).WithIdentifier(identifierToken);
+//						issueSpan = name.Span;
+//
+//						// In case the alias name is the same as the last name of the alias target, we only include 
+//						// the left part of the name in the unnecessary span to Not confuse uses.
+//						if (name.Kind() == SyntaxKind.QualifiedName)
+//						{
+//							QualifiedNameSyntax qualifiedName = (QualifiedNameSyntax)name;
+//
+//							if (qualifiedName.Right.Identifier.ValueText == identifierToken.ValueText)
+//							{
+//								issueSpan = qualifiedName.Left.Span;
+//							}
+//						}
+//
+//						// first check if this would be a valid reduction
+//						if (name.CanReplaceWithReducedNameInContext(replacementNode, semanticModel, cancellationToken))
+//						{
+//							// in case this alias name ends with "Attribute", we're going to see if we can also 
+//							// remove that suffix.
+//							TypeSyntax replacementNodeWithoutAttributeSuffix;
+//							TextSpan issueSpanWithoutAttributeSuffix;
+//							if (TryReduceAttributeSuffix(
+//								name,
+//								identifierToken,
+//								semanticModel,
+//								out replacementNodeWithoutAttributeSuffix,
+//								out issueSpanWithoutAttributeSuffix,
+//								cancellationToken))
+//							{
+//								if (name.CanReplaceWithReducedName(replacementNodeWithoutAttributeSuffix, semanticModel, cancellationToken))
+//								{
+//									replacementNode = replacementNode.CopyAnnotationsTo(replacementNodeWithoutAttributeSuffix);
+//									issueSpan = issueSpanWithoutAttributeSuffix;
+//								}
+//							}
+//
+//							return true;
+//						}
+//
+//						return false;
+//					}
+//
+//					var nameHasNoAlias = false;
+//
+//					if (name is SimpleNameSyntax)
+//					{
+//						var simpleName = (SimpleNameSyntax)name;
+//						if (!simpleName.Identifier.HasAnnotations(AliasAnnotation.Kind))
+//						{
+//							nameHasNoAlias = true;
+//						}
+//					}
+//
+//					if (name is QualifiedNameSyntax)
+//					{
+//						var qualifiedName = (QualifiedNameSyntax)name;
+//						if (!qualifiedName.Right.HasAnnotation(Simplifier.SpecialTypeAnnotation))
+//						{
+//							nameHasNoAlias = true;
+//						}
+//					}
+//
+//					if (name is AliasQualifiedNameSyntax)
+//					{
+//						var aliasQualifiedName = (AliasQualifiedNameSyntax)name;
+//						if (aliasQualifiedName.Name is SimpleNameSyntax &&
+//							!aliasQualifiedName.Name.Identifier.HasAnnotations(AliasAnnotation.Kind) &&
+//							!aliasQualifiedName.Name.HasAnnotation(Simplifier.SpecialTypeAnnotation))
+//						{
+//							nameHasNoAlias = true;
+//						}
+//					}
+//
+//					var aliasInfo = semanticModel.GetAliasInfo(name, cancellationToken);
+//					if (nameHasNoAlias && aliasInfo == null)
+//					{
+//						if (IsReplacableByVar(name, semanticModel, out replacementNode, out issueSpan, optionSet, cancellationToken))
+//						{
+//							return true;
+//						}
+//
+//						if (PreferPredefinedTypeKeywordInDeclarations(name, optionSet, semanticModel) ||
+//							PreferPredefinedTypeKeywordInMemberAccess(name, optionSet, semanticModel))
+//						{
+//							var type = semanticModel.GetTypeInfo(name, cancellationToken).Type;
+//							if (type != null)
+//							{
+//								var keywordKind = GetPredefinedKeywordKind(type.SpecialType);
+//								if (keywordKind != SyntaxKind.None)
+//								{
+//									return CanReplaceWithPredefinedTypeKeywordInContext(name, semanticModel, out replacementNode, ref issueSpan, keywordKind, cancellationToken);
+//								}
+//							}
+//							else
+//							{
+//								var typeSymbol = semanticModel.GetSymbolInfo(name, cancellationToken).Symbol;
+//								if (typeSymbol.IsKind(SymbolKind.NamedType))
+//								{
+//									var keywordKind = GetPredefinedKeywordKind(((INamedTypeSymbol)typeSymbol).SpecialType);
+//									if (keywordKind != SyntaxKind.None)
+//									{
+//										return CanReplaceWithPredefinedTypeKeywordInContext(name, semanticModel, out replacementNode, ref issueSpan, keywordKind, cancellationToken);
+//									}
+//								}
+//							}
+//						}
+//					}
+//
+//					// nullable rewrite: Nullable<int> -> int?
+//					// Don't rewrite in the case where Nullable<int> is part of some qualified name like Nullable<int>.Something
+//					if (!name.IsVar && (symbol.Kind == SymbolKind.NamedType) && !name.IsLeftSideOfQualifiedName())
+//					{
+//						var type = (INamedTypeSymbol)symbol;
+//						if (!type.IsUnboundGenericType && // Don't rewrite unbound generic type "Nullable<>"
+//							type.IsNullable() &&
+//							aliasInfo == null)
+//						{
+//							GenericNameSyntax genericName;
+//							if (name.Kind() == SyntaxKind.QualifiedName)
+//							{
+//								genericName = (GenericNameSyntax)((QualifiedNameSyntax)name).Right;
+//							}
+//							else
+//							{
+//								genericName = (GenericNameSyntax)name;
+//							}
+//
+//							var oldType = genericName.TypeArgumentList.Arguments.First();
+//							if (oldType.Kind() == SyntaxKind.OmittedTypeArgument)
+//							{
+//								return false;
+//							}
+//
+//							replacementNode = SyntaxFactory.NullableType(oldType)
+//								.WithLeadingTrivia(name.GetLeadingTrivia())
+//								.WithTrailingTrivia(name.GetTrailingTrivia());
+//							issueSpan = name.Span;
+//
+//							// we need to simplify the whole qualified name at once, because replacing the identifier on the left in
+//							// System.Nullable<int> alone would be illegal.
+//							// If this fails we want to continue to try at least to remove the System if possible.
+//							if (name.CanReplaceWithReducedNameInContext(replacementNode, semanticModel, cancellationToken))
+//							{
+//								return true;
+//							}
+//						}
+//					}
+//				}
+//
+//				SyntaxToken identifier;
+//				switch (name.Kind())
+//				{
+//				case SyntaxKind.AliasQualifiedName:
+//					var simpleName = ((AliasQualifiedNameSyntax)name).Name
+//						.WithLeadingTrivia(name.GetLeadingTrivia());
+//
+//					simpleName = simpleName.ReplaceToken(simpleName.Identifier,
+//						((AliasQualifiedNameSyntax)name).Name.Identifier.CopyAnnotationsTo(
+//							simpleName.Identifier.WithLeadingTrivia(
+//								((AliasQualifiedNameSyntax)name).Alias.Identifier.LeadingTrivia)));
+//
+//					replacementNode = simpleName;
+//
+//					issueSpan = ((AliasQualifiedNameSyntax)name).Alias.Span;
+//
+//					break;
+//
+//				case SyntaxKind.QualifiedName:
+//					replacementNode = ((QualifiedNameSyntax)name).Right.WithLeadingTrivia(name.GetLeadingTrivia());
+//					issueSpan = ((QualifiedNameSyntax)name).Left.Span;
+//
+//					break;
+//
+//				case SyntaxKind.IdentifierName:
+//					identifier = ((IdentifierNameSyntax)name).Identifier;
+//
+//					// we can try to remove the Attribute suffix if this is the attribute name
+//					TryReduceAttributeSuffix(name, identifier, semanticModel, out replacementNode, out issueSpan, cancellationToken);
+//					break;
+//				}
+//			}
+//
+//			if (replacementNode == null)
+//			{
+//				return false;
+//			}
+//
+//			return name.CanReplaceWithReducedName(replacementNode, semanticModel, cancellationToken);
+//		}
+//
+//		private static bool CanReplaceWithPredefinedTypeKeywordInContext(NameSyntax name, SemanticModel semanticModel, out TypeSyntax replacementNode, ref TextSpan issueSpan, SyntaxKind keywordKind, CancellationToken cancellationToken)
+//		{
+//			replacementNode = CreatePredefinedTypeSyntax(name, keywordKind);
+//
+//			issueSpan = name.Span; // we want to show the whole name expression as unnecessary
+//
+//			return name.CanReplaceWithReducedNameInContext(replacementNode, semanticModel, cancellationToken);
+//		}
+//
+//		private static TypeSyntax CreatePredefinedTypeSyntax(ExpressionSyntax expression, SyntaxKind keywordKind)
+//		{
+//			return SyntaxFactory.PredefinedType(SyntaxFactory.Token(expression.GetLeadingTrivia(), keywordKind, expression.GetTrailingTrivia()));
+//		}
+//
+//		private static bool TryReduceAttributeSuffix(
+//			NameSyntax name,
+//			SyntaxToken identifierToken,
+//			SemanticModel semanticModel,
+//			out TypeSyntax replacementNode,
+//			out TextSpan issueSpan,
+//			CancellationToken cancellationToken)
+//		{
+//			issueSpan = default(TextSpan);
+//			replacementNode = default(TypeSyntax);
+//
+//			// we can try to remove the Attribute suffix if this is the attribute name
+//			if (SyntaxFacts.IsAttributeName(name))
+//			{
+//				if (name.Parent.Kind() == SyntaxKind.Attribute || name.IsRightSideOfDotOrColonColon())
+//				{
+//					const string AttributeName = "Attribute";
+//
+//					// an attribute that should keep it (unnecessary "Attribute" suffix should be annotated with a DontSimplifyAnnotation
+//					if (identifierToken.ValueText != AttributeName && identifierToken.ValueText.EndsWith(AttributeName) && !identifierToken.HasAnnotation(SimplificationHelpers.DontSimplifyAnnotation))
+//					{
+//						// weird. the semantic model is able to bind attribute syntax like "[as()]" although it's not valid code.
+//						// so we need another check for keywords manually.
+//						var newAttributeName = identifierToken.ValueText.Substring(0, identifierToken.ValueText.Length - 9);
+//						if (SyntaxFacts.GetKeywordKind(newAttributeName) != SyntaxKind.None)
+//						{
+//							return false;
+//						}
+//
+//						// if this attribute name in source contained unicode escaping, we will loose it now
+//						// because there is no easy way to determine the substring from identifier->ToString() 
+//						// which would be needed to pass to SyntaxFactory.Identifier
+//						// The result is an unescaped unicode character in source.
+//
+//						// once we remove the Attribute suffix, we can't use an escaped identifier
+//						var newIdentifierToken = identifierToken.CopyAnnotationsTo(
+//							SyntaxFactory.Identifier(
+//								identifierToken.LeadingTrivia,
+//								newAttributeName,
+//								identifierToken.TrailingTrivia));
+//
+//						replacementNode = SyntaxFactory.IdentifierName(newIdentifierToken)
+//							.WithLeadingTrivia(name.GetLeadingTrivia());
+//						issueSpan = new TextSpan(identifierToken.Span.End - 9, 9);
+//
+//						return true;
+//					}
+//				}
+//			}
+//
+//			return false;
+//		}
+//
+//		/// <summary>
+//		/// Checks if the SyntaxNode is a name of a namespace declaration. To be a namespace name, the syntax
+//		/// must be parented by an namespace declaration and the node itself must be equal to the declaration's Name
+//		/// property.
+//		/// </summary>
+//		/// <param name="node"></param>
+//		/// <returns></returns>
+//		public static bool IsPartOfNamespaceDeclarationName(SyntaxNode node)
+//		{
+//			var parent = node;
+//
+//			while (parent != null)
+//			{
+//				switch (parent.Kind())
+//				{
+//				case SyntaxKind.IdentifierName:
+//				case SyntaxKind.QualifiedName:
+//					node = parent;
+//					parent = parent.Parent;
+//					break;
+//
+//				case SyntaxKind.NamespaceDeclaration:
+//					var namespaceDeclaration = (NamespaceDeclarationSyntax)parent;
+//					return object.Equals(namespaceDeclaration.Name, node);
+//
+//				default:
+//					return false;
+//				}
+//			}
+//
+//			return false;
+//		}
+//
+//		private static bool TrySimplify(
+//			this ExpressionSyntax expression,
+//			SemanticModel semanticModel,
+//			OptionSet optionSet,
+//			out ExpressionSyntax replacementNode,
+//			out TextSpan issueSpan)
+//		{
+//			replacementNode = null;
+//			issueSpan = default(TextSpan);
+//
+//			switch (expression.Kind())
+//			{
+//			case SyntaxKind.SimpleMemberAccessExpression:
+//				{
+//					var memberAccess = (MemberAccessExpressionSyntax)expression;
+//					ExpressionSyntax newLeft;
+//
+//					if (IsMemberAccessADynamicInvocation(memberAccess, semanticModel))
+//					{
+//						return false;
+//					}
+//
+//					if (TrySimplifyMemberAccessOrQualifiedName(memberAccess.Expression, memberAccess.Name, semanticModel, optionSet, out newLeft, out issueSpan))
+//					{
+//						// replacement node might not be in it's simplest form, so add simplify annotation to it.
+//						replacementNode = memberAccess.Update(newLeft, memberAccess.OperatorToken, memberAccess.Name)
+//							.WithAdditionalAnnotations(Simplifier.Annotation);
+//
+//						// Ensure that replacement doesn't change semantics.
+//						return !ReplacementChangesSemantics(memberAccess, replacementNode, semanticModel);
+//					}
+//
+//					return false;
+//				}
+//
+//			case SyntaxKind.QualifiedName:
+//				{
+//					var qualifiedName = (QualifiedNameSyntax)expression;
+//					ExpressionSyntax newLeft;
+//					if (TrySimplifyMemberAccessOrQualifiedName(qualifiedName.Left, qualifiedName.Right, semanticModel, optionSet, out newLeft, out issueSpan))
+//					{
+//						// replacement node might not be in it's simplest form, so add simplify annotation to it.
+//						replacementNode = qualifiedName.Update((NameSyntax)newLeft, qualifiedName.DotToken, qualifiedName.Right)
+//							.WithAdditionalAnnotations(Simplifier.Annotation);
+//
+//						// Ensure that replacement doesn't change semantics.
+//						return !ReplacementChangesSemantics(qualifiedName, replacementNode, semanticModel);
+//					}
+//
+//					return false;
+//				}
+//			}
+//
+//			return false;
+//		}
+//
+//		private static bool ReplacementChangesSemantics(ExpressionSyntax originalExpression, ExpressionSyntax replacedExpression, SemanticModel semanticModel)
+//		{
+//			var speculationAnalyzer = new SpeculationAnalyzer(originalExpression, replacedExpression, semanticModel, CancellationToken.None);
+//			return speculationAnalyzer.ReplacementChangesSemantics();
+//		}
+//
+//		// Note: The caller needs to verify that replacement doesn't change semantics of the original expression.
+//		private static bool TrySimplifyMemberAccessOrQualifiedName(
+//			ExpressionSyntax left,
+//			ExpressionSyntax right,
+//			SemanticModel semanticModel,
+//			OptionSet optionSet,
+//			out ExpressionSyntax replacementNode,
+//			out TextSpan issueSpan)
+//		{
+//			replacementNode = null;
+//			issueSpan = default(TextSpan);
+//
+//			if (left != null && right != null)
+//			{
+//				var leftSymbol = SimplificationHelpers.GetOriginalSymbolInfo(semanticModel, left);
+//				if (leftSymbol != null && (leftSymbol.Kind == SymbolKind.NamedType))
+//				{
+//					var rightSymbol = SimplificationHelpers.GetOriginalSymbolInfo(semanticModel, right);
+//					if (rightSymbol != null && (rightSymbol.IsStatic || rightSymbol.Kind == SymbolKind.NamedType))
+//					{
+//						// Static member access or nested type member access.
+//						INamedTypeSymbol containingType = rightSymbol.ContainingType;
+//
+//						var enclosingSymbol = semanticModel.GetEnclosingSymbol(left.SpanStart);
+//						List<ISymbol> enclosingTypeParametersInsideOut = new List<ISymbol>();
+//
+//						while (enclosingSymbol != null)
+//						{
+//							if (enclosingSymbol is IMethodSymbol)
+//							{
+//								var methodSymbol = (IMethodSymbol)enclosingSymbol;
+//								if (methodSymbol.TypeArguments.Length != 0)
+//								{
+//									enclosingTypeParametersInsideOut.AddRange(methodSymbol.TypeArguments);
+//								}
+//							}
+//
+//							if (enclosingSymbol is INamedTypeSymbol)
+//							{
+//								var namedTypeSymbol = (INamedTypeSymbol)enclosingSymbol;
+//								if (namedTypeSymbol.TypeArguments.Length != 0)
+//								{
+//									enclosingTypeParametersInsideOut.AddRange(namedTypeSymbol.TypeArguments);
+//								}
+//							}
+//
+//							enclosingSymbol = enclosingSymbol.ContainingSymbol;
+//						}
+//
+//						if (containingType != null && !containingType.Equals(leftSymbol))
+//						{
+//							var namedType = leftSymbol as INamedTypeSymbol;
+//							if (namedType != null)
+//							{
+//								if ((namedType.GetBaseTypes().Contains(containingType) &&
+//									!optionSet.GetOption(SimplificationOptions.AllowSimplificationToBaseType)) ||
+//									(!optionSet.GetOption(SimplificationOptions.AllowSimplificationToGenericType) &&
+//										containingType.TypeArguments.Count() != 0))
+//								{
+//									return false;
+//								}
+//							}
+//
+//							// We have a static member access or a nested type member access using a more derived type.
+//							// Simplify syntax so as to use accessed member's most immediate containing type instead of the derived type.
+//							replacementNode = containingType.GenerateTypeSyntax()
+//								.WithLeadingTrivia(left.GetLeadingTrivia())
+//								.WithTrailingTrivia(left.GetTrailingTrivia());
+//							issueSpan = left.Span;
+//							return true;
+//						}
+//					}
+//				}
+//			}
+//
+//			return false;
+//		}
+//
+//		/// <summary>
+//		/// Returns True if enclosingTypeParametersInsideOut contains a symbol with the same name as the candidateSymbol
+//		/// thereby saying that there exists a symbol which hides the candidate Symbol
+//		/// </summary>
+//		private static bool HidingTypeParameterSymbolExists(ISymbol candidateSymbol, List<ISymbol> enclosingTypeParametersInsideOut)
+//		{
+//			foreach (var enclosingTypeParameter in enclosingTypeParametersInsideOut)
+//			{
+//				ISymbol newCandidateSymbol = candidateSymbol;
+//				if (candidateSymbol.IsKind(SymbolKind.ArrayType))
+//				{
+//					newCandidateSymbol = ((IArrayTypeSymbol)candidateSymbol).ElementType;
+//				}
+//
+//				if (newCandidateSymbol.MetadataName == enclosingTypeParameter.MetadataName)
+//				{
+//					if (SymbolEquivalenceComparer.Instance.Equals(newCandidateSymbol.GetOriginalUnreducedDefinition(), enclosingTypeParameter.GetOriginalUnreducedDefinition()))
+//					{
+//						return false;
+//					}
+//
+//					return true;
+//				}
+//			}
+//
+//			return false;
+//		}
+
+//		private static bool CanReplaceWithReducedName(
+//			this MemberAccessExpressionSyntax memberAccess,
+//			ExpressionSyntax reducedName,
+//			SemanticModel semanticModel,
+//			CancellationToken cancellationToken)
+//		{
+//			if (!IsThisOrTypeOrNamespace(memberAccess, semanticModel))
+//			{
+//				return false;
+//			}
+//
+//			var speculationAnalyzer = new SpeculationAnalyzer(memberAccess, reducedName, semanticModel, cancellationToken);
+//			if (!speculationAnalyzer.SymbolsForOriginalAndReplacedNodesAreCompatible() ||
+//				speculationAnalyzer.ReplacementChangesSemantics())
+//			{
+//				return false;
+//			}
+//
+//			if (WillConflictWithExistingLocal(memberAccess, reducedName))
+//			{
+//				return false;
+//			}
+//
+//			if (IsMemberAccessADynamicInvocation(memberAccess, semanticModel))
+//			{
+//				return false;
+//			}
+//
+//			if (memberAccess.AccessMethodWithDynamicArgumentInsideStructConstructor(semanticModel))
+//			{
+//				return false;
+//			}
+//
+//			if (memberAccess.Expression.Kind() == SyntaxKind.BaseExpression)
+//			{
+//				var enclosingNamedType = semanticModel.GetEnclosingNamedType(memberAccess.SpanStart, cancellationToken);
+//				var symbol = semanticModel.GetSymbolInfo(memberAccess.Name, cancellationToken).Symbol;
+//				if (enclosingNamedType != null &&
+//					!enclosingNamedType.IsSealed &&
+//					symbol != null &&
+//					symbol.IsOverridable())
+//				{
+//					return false;
+//				}
+//			}
+//
+//			var invalidTransformation1 = ParserWouldTreatExpressionAsCast(reducedName, memberAccess);
+//
+//			return !invalidTransformation1;
+//		}
+
+		private static bool ParserWouldTreatExpressionAsCast(ExpressionSyntax reducedNode, MemberAccessExpressionSyntax originalNode)
+		{
+			SyntaxNode parent = originalNode;
+			while (parent != null)
+			{
+				if (parent.IsParentKind(SyntaxKind.SimpleMemberAccessExpression))
+				{
+					parent = parent.Parent;
+					continue;
+				}
+
+				if (!parent.IsParentKind(SyntaxKind.ParenthesizedExpression))
+				{
+					return false;
+				}
+
+				break;
+			}
+
+			var newExpression = parent.ReplaceNode(originalNode, reducedNode);
+
+			// detect cast ambiguities according to C# spec #7.7.6 
+			if (IsNameOrMemberAccessButNoExpression(newExpression))
+			{
+				var nextToken = parent.Parent.GetLastToken().GetNextToken();
+
+				return nextToken.Kind() == SyntaxKind.OpenParenToken ||
+					nextToken.Kind() == SyntaxKind.TildeToken ||
+					nextToken.Kind() == SyntaxKind.ExclamationToken ||
+					(SyntaxFacts.IsKeywordKind(nextToken.Kind()) && !(nextToken.Kind() == SyntaxKind.AsKeyword || nextToken.Kind() == SyntaxKind.IsKeyword));
+			}
+
+			return false;
+		}
+
+		private static bool IsNameOrMemberAccessButNoExpression(SyntaxNode node)
+		{
+			if (node.IsKind(SyntaxKind.SimpleMemberAccessExpression))
+			{
+				var memberAccess = (MemberAccessExpressionSyntax)node;
+
+				return memberAccess.Expression.IsKind(SyntaxKind.IdentifierName) ||
+					IsNameOrMemberAccessButNoExpression(memberAccess.Expression);
+			}
+
+			return node.IsKind(SyntaxKind.IdentifierName);
+		}
+
+		/// <summary>
+		/// Tells if the Member access is the starting part of a Dynamic Invocation
+		/// </summary>
+		/// <param name="memberAccess"></param>
+		/// <param name="semanticModel"></param>
+		/// <returns>Return true, if the member access is the starting point of a Dynamic Invocation</returns>
+		private static bool IsMemberAccessADynamicInvocation(MemberAccessExpressionSyntax memberAccess, SemanticModel semanticModel)
+		{
+			var ancestorInvocation = memberAccess.FirstAncestorOrSelf<InvocationExpressionSyntax>();
+
+			if (ancestorInvocation != null && ancestorInvocation.SpanStart == memberAccess.SpanStart)
+			{
+				var typeInfo = semanticModel.GetTypeInfo(ancestorInvocation);
+				if (typeInfo.Type != null &&
+					typeInfo.Type.Kind == SymbolKind.DynamicType)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		/*
+         * Name Reduction, to implicitly mean "this", is possible only after the initialization of all member variables but
+         * since the check for initialization of all member variable is a lot of work for this simplification we don't simplify
+         * even if all the member variables are initialized
+         */
+		private static bool AccessMethodWithDynamicArgumentInsideStructConstructor(this MemberAccessExpressionSyntax memberAccess, SemanticModel semanticModel)
+		{
+			var constructor = memberAccess.Ancestors().OfType<ConstructorDeclarationSyntax>().SingleOrDefault();
+
+			if (constructor == null || constructor.Parent.Kind() != SyntaxKind.StructDeclaration)
+			{
+				return false;
+			}
+
+			return semanticModel.GetSymbolInfo(memberAccess.Name).CandidateReason == CandidateReason.LateBound;
+		}
+
+//		private static bool CanReplaceWithReducedName(this NameSyntax name, TypeSyntax reducedName, SemanticModel semanticModel, CancellationToken cancellationToken)
+//		{
+//			var speculationAnalyzer = new SpeculationAnalyzer(name, reducedName, semanticModel, cancellationToken);
+//			if (speculationAnalyzer.ReplacementChangesSemantics())
+//			{
+//				return false;
+//			}
+//
+//			return CanReplaceWithReducedNameInContext(name, reducedName, semanticModel, cancellationToken);
+//		}
+//
+//		private static bool CanReplaceWithReducedNameInContext(this NameSyntax name, TypeSyntax reducedName, SemanticModel semanticModel, CancellationToken cancellationToken)
+//		{
+//			// Special case.  if this new minimal name parses out to a predefined type, then we
+//			// have to make sure that we're not in a using alias. That's the one place where the
+//			// language doesn't allow predefined types. You have to use the fully qualified name
+//			// instead.
+//			var invalidTransformation1 = IsNonNameSyntaxInUsingDirective(name, reducedName);
+//			var invalidTransformation2 = WillConflictWithExistingLocal(name, reducedName);
+//			var invalidTransformation3 = IsAmbiguousCast(name, reducedName);
+//			var invalidTransformation4 = IsNullableTypeInPointerExpression(name, reducedName);
+//			var isNotNullableReplacable = name.IsNotNullableReplacable(reducedName);
+//
+//			if (invalidTransformation1 || invalidTransformation2 || invalidTransformation3 || invalidTransformation4
+//				|| isNotNullableReplacable)
+//			{
+//				return false;
+//			}
+//
+//			return true;
+//		}
+
+		private static bool IsNotNullableReplacable(this NameSyntax name, TypeSyntax reducedName)
+		{
+			var isNotNullableReplacable = false;
+			// var isLeftSideOfDot = name.IsLeftSideOfDot();
+			// var isRightSideOfDot = name.IsRightSideOfDot();
+
+			if (reducedName.Kind() == SyntaxKind.NullableType)
+			{
+				if (((NullableTypeSyntax)reducedName).ElementType.Kind() == SyntaxKind.OmittedTypeArgument)
+				{
+					isNotNullableReplacable = true;
+				}
+				else
+				{
+					isNotNullableReplacable = name.IsLeftSideOfDot() || name.IsRightSideOfDot();
+				}
+			}
+
+			return isNotNullableReplacable;
+		}
+
+//		private static bool IsThisOrTypeOrNamespace(MemberAccessExpressionSyntax memberAccess, SemanticModel semanticModel)
+//		{
+//			if (memberAccess.Expression.Kind() == SyntaxKind.ThisExpression)
+//			{
+//				var previousToken = memberAccess.Expression.GetFirstToken().GetPreviousToken();
+//
+//				var symbol = semanticModel.GetSymbolInfo(memberAccess.Name).Symbol;
+//
+//				if (previousToken.Kind() == SyntaxKind.OpenParenToken &&
+//					previousToken.Parent.IsKind(SyntaxKind.ParenthesizedExpression) &&
+//					!previousToken.Parent.IsParentKind(SyntaxKind.ParenthesizedExpression) &&
+//					((ParenthesizedExpressionSyntax)previousToken.Parent).Expression.Kind() == SyntaxKind.SimpleMemberAccessExpression &&
+//					symbol != null && symbol.Kind == SymbolKind.Method)
+//				{
+//					return false;
+//				}
+//
+//				return true;
+//			}
+//
+//			var expressionInfo = semanticModel.GetSymbolInfo(memberAccess.Expression);
+//			if (SimplificationHelpers.IsValidSymbolInfo(expressionInfo.Symbol))
+//			{
+//				if (expressionInfo.Symbol is INamespaceOrTypeSymbol)
+//				{
+//					return true;
+//				}
+//
+//				if (expressionInfo.Symbol.IsThisParameter())
+//				{
+//					return true;
+//				}
+//			}
+//
+//			return false;
+//		}
+
+		private static bool IsReplacableByVar(
+			this TypeSyntax simpleName,
+			SemanticModel semanticModel,
+			out TypeSyntax replacementNode,
+			out TextSpan issueSpan,
+			OptionSet optionSet,
+			CancellationToken cancellationToken)
+		{
+			replacementNode = null;
+			issueSpan = default(TextSpan);
+
+			if (!optionSet.GetOption(SimplificationOptions.PreferImplicitTypeInLocalDeclaration))
+			{
+				return false;
+			}
+
+			// If it is already var
+			if (simpleName.IsVar)
+			{
+				return false;
+			}
+
+			var candidateReplacementNode = SyntaxFactory.IdentifierName("var")
+				.WithLeadingTrivia(simpleName.GetLeadingTrivia())
+				.WithTrailingTrivia(simpleName.GetTrailingTrivia());
+			var candidateIssueSpan = simpleName.Span;
+
+			// If there exists a Type called var , fail.
+			var checkSymbol = semanticModel.GetSpeculativeSymbolInfo(simpleName.SpanStart, candidateReplacementNode, SpeculativeBindingOption.BindAsTypeOrNamespace).Symbol;
+			if (checkSymbol != null && checkSymbol.IsKind(SymbolKind.NamedType) && ((INamedTypeSymbol)checkSymbol).TypeKind == TypeKind.Class && checkSymbol.Name == "var")
+			{
+				return false;
+			}
+
+			// If the simpleName is the type of the Variable Declaration Syntax belonging to LocalDeclaration, For Statement or Using statement
+			if (simpleName.IsParentKind(SyntaxKind.VariableDeclaration) &&
+				((VariableDeclarationSyntax)simpleName.Parent).Type == simpleName &&
+				simpleName.Parent.Parent.IsKind(SyntaxKind.LocalDeclarationStatement, SyntaxKind.ForStatement, SyntaxKind.UsingStatement))
+			{
+				if (simpleName.Parent.IsParentKind(SyntaxKind.LocalDeclarationStatement) &&
+					((LocalDeclarationStatementSyntax)simpleName.Parent.Parent).Modifiers.Any(n => n.Kind() == SyntaxKind.ConstKeyword))
+				{
+					return false;
+				}
+
+				var variableDeclaration = (VariableDeclarationSyntax)simpleName.Parent;
+
+				// Check the Initialized Value to see if it is allowed to be in the Var initialization
+				if (variableDeclaration.Variables.Count != 1 ||
+					!variableDeclaration.Variables.Single().Initializer.IsKind(SyntaxKind.EqualsValueClause))
+				{
+					return false;
+				}
+
+				var variable = variableDeclaration.Variables.Single();
+				var initializer = (EqualsValueClauseSyntax)variable.Initializer;
+				var identifier = variable.Identifier;
+
+				if (EqualsValueClauseNotSuitableForVar(identifier, simpleName, initializer, semanticModel, cancellationToken))
+				{
+					return false;
+				}
+
+				replacementNode = candidateReplacementNode;
+				issueSpan = candidateIssueSpan;
+				return true;
+			}
+
+			if (simpleName.IsParentKind(SyntaxKind.ForEachStatement) &&
+				((ForEachStatementSyntax)simpleName.Parent).Type == simpleName)
+			{
+				replacementNode = candidateReplacementNode;
+				issueSpan = candidateIssueSpan;
+				return true;
+			}
+
+			return false;
+		}
+
+		private static bool EqualsValueClauseNotSuitableForVar(
+			SyntaxToken identifier,
+			TypeSyntax simpleName,
+			EqualsValueClauseSyntax equalsValueClause,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			// var cannot be assigned null
+			if (equalsValueClause.IsKind(SyntaxKind.NullLiteralExpression))
+			{
+				return true;
+			}
+
+			var type = semanticModel.GetTypeInfo(simpleName, cancellationToken).Type;
+
+			// the variable cannot be initialized to a method group or an anonymous function
+			if (type != null &&
+				type.TypeKind == TypeKind.Delegate)
+			{
+				return true;
+			}
+
+			var initializerType = semanticModel.GetTypeInfo(equalsValueClause.Value, cancellationToken).Type;
+
+			if (!type.Equals(initializerType))
+			{
+				return true;
+			}
+
+			// The assign expression in the initializer cannot be the same symbol as the i
+			var possibleSameLocals = equalsValueClause.DescendantNodesAndSelf().Where(n => n.Kind() == SyntaxKind.IdentifierName && ((IdentifierNameSyntax)n).Identifier.ValueText.Equals(identifier.ValueText));
+			var anyUse = possibleSameLocals.Any(n =>
+				{
+					var symbol = semanticModel.GetSymbolInfo(n, cancellationToken).Symbol;
+					if (symbol != null && symbol.Kind == SymbolKind.Local)
+					{
+						return true;
+					}
+
+					return false;
+				});
+
+			if (anyUse)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		private static bool ContainsOpenName(NameSyntax name)
+		{
+			if (name is QualifiedNameSyntax)
+			{
+				var qualifiedName = (QualifiedNameSyntax)name;
+				return ContainsOpenName(qualifiedName.Left) || ContainsOpenName(qualifiedName.Right);
+			}
+			else if (name is GenericNameSyntax)
+			{
+				return ((GenericNameSyntax)name).IsUnboundGenericName;
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		private static bool IsNullableTypeInPointerExpression(ExpressionSyntax expression, ExpressionSyntax simplifiedNode)
+		{
+			// Note: nullable type syntax is not allowed in pointer type syntax
+			if (simplifiedNode.Kind() == SyntaxKind.NullableType &&
+				simplifiedNode.DescendantNodes().Any(n => n is PointerTypeSyntax))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		private static bool IsNonNameSyntaxInUsingDirective(ExpressionSyntax expression, ExpressionSyntax simplifiedNode)
+		{
+			return
+				expression.IsParentKind(SyntaxKind.UsingDirective) &&
+				!(simplifiedNode is NameSyntax);
+		}
+
+//		private static bool WillConflictWithExistingLocal(ExpressionSyntax expression, ExpressionSyntax simplifiedNode)
+//		{
+//			if (simplifiedNode.Kind() == SyntaxKind.IdentifierName && !SyntaxFacts.IsInNamespaceOrTypeContext(expression))
+//			{
+//				var identifierName = (IdentifierNameSyntax)simplifiedNode;
+//				var enclosingDeclarationSpace = FindImmediatelyEnclosingLocalVariableDeclarationSpace(expression);
+//				var enclosingMemberDeclaration = expression.FirstAncestorOrSelf<MemberDeclarationSyntax>();
+//				if (enclosingDeclarationSpace != null && enclosingMemberDeclaration != null)
+//				{
+//					var locals = enclosingMemberDeclaration.GetLocalDeclarationMap()[identifierName.Identifier.ValueText];
+//					foreach (var token in locals)
+//					{
+//						if (token.GetAncestors<SyntaxNode>().Contains(enclosingDeclarationSpace))
+//						{
+//							return true;
+//						}
+//					}
+//				}
+//			}
+//
+//			return false;
+//		}
+
+		private static bool IsAmbiguousCast(ExpressionSyntax expression, ExpressionSyntax simplifiedNode)
+		{
+			// Can't simplify a type name in a cast expression if it would then cause the cast to be
+			// parsed differently.  For example:  (Foo::Bar)+1  is a cast.  But if that simplifies to
+			// (Bar)+1  then that's an arithmetic expression.
+			if (expression.IsParentKind(SyntaxKind.CastExpression))
+			{
+				var castExpression = (CastExpressionSyntax)expression.Parent;
+				if (castExpression.Type == expression)
+				{
+					var newCastExpression = castExpression.ReplaceNode(castExpression.Type, simplifiedNode);
+					var reparsedCastExpression = SyntaxFactory.ParseExpression(newCastExpression.ToString());
+
+					if (!reparsedCastExpression.IsKind(SyntaxKind.CastExpression))
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		private static SyntaxNode FindImmediatelyEnclosingLocalVariableDeclarationSpace(SyntaxNode syntax)
+		{
+			for (var declSpace = syntax; declSpace != null; declSpace = declSpace.Parent)
+			{
+				switch (declSpace.Kind())
+				{
+				// These are declaration-space-defining syntaxes, by the spec:
+				case SyntaxKind.MethodDeclaration:
+				case SyntaxKind.IndexerDeclaration:
+				case SyntaxKind.OperatorDeclaration:
+				case SyntaxKind.ConstructorDeclaration:
+				case SyntaxKind.Block:
+				case SyntaxKind.ParenthesizedLambdaExpression:
+				case SyntaxKind.SimpleLambdaExpression:
+				case SyntaxKind.AnonymousMethodExpression:
+				case SyntaxKind.SwitchStatement:
+				case SyntaxKind.ForEachKeyword:
+				case SyntaxKind.ForStatement:
+				case SyntaxKind.UsingStatement:
+
+					// SPEC VIOLATION: We also want to stop walking out if, say, we are in a field
+					// initializer. Technically according to the wording of the spec it should be
+					// legal to use a simple name inconsistently inside a field initializer because
+					// it does not define a local variable declaration space. In practice of course
+					// we want to check for that. (As the native compiler does as well.)
+
+				case SyntaxKind.FieldDeclaration:
+					return declSpace;
+				}
+			}
+
+			return null;
+		}
+
+		/// <summary>
+		/// Returns the predefined keyword kind for a given specialtype.
+		/// </summary>
+		/// <param name="specialType">The specialtype of this type.</param>
+		/// <returns>The keyword kind for a given special type, or SyntaxKind.None if the type name is not a predefined type.</returns>
+		public static SyntaxKind GetPredefinedKeywordKind(SpecialType specialType)
+		{
+			switch (specialType)
+			{
+			case SpecialType.System_Boolean:
+				return SyntaxKind.BoolKeyword;
+			case SpecialType.System_Byte:
+				return SyntaxKind.ByteKeyword;
+			case SpecialType.System_SByte:
+				return SyntaxKind.SByteKeyword;
+			case SpecialType.System_Int32:
+				return SyntaxKind.IntKeyword;
+			case SpecialType.System_UInt32:
+				return SyntaxKind.UIntKeyword;
+			case SpecialType.System_Int16:
+				return SyntaxKind.ShortKeyword;
+			case SpecialType.System_UInt16:
+				return SyntaxKind.UShortKeyword;
+			case SpecialType.System_Int64:
+				return SyntaxKind.LongKeyword;
+			case SpecialType.System_UInt64:
+				return SyntaxKind.ULongKeyword;
+			case SpecialType.System_Single:
+				return SyntaxKind.FloatKeyword;
+			case SpecialType.System_Double:
+				return SyntaxKind.DoubleKeyword;
+			case SpecialType.System_Decimal:
+				return SyntaxKind.DecimalKeyword;
+			case SpecialType.System_String:
+				return SyntaxKind.StringKeyword;
+			case SpecialType.System_Char:
+				return SyntaxKind.CharKeyword;
+			case SpecialType.System_Object:
+				return SyntaxKind.ObjectKeyword;
+			case SpecialType.System_Void:
+				return SyntaxKind.VoidKeyword;
+			default:
+				return SyntaxKind.None;
+			}
+		}
+
+		public static NameSyntax GetRightmostName(this ExpressionSyntax node)
+		{
+			var memberAccess = node as MemberAccessExpressionSyntax;
+			if (memberAccess != null && memberAccess.Name != null)
+			{
+				return memberAccess.Name;
+			}
+
+			var qualified = node as QualifiedNameSyntax;
+			if (qualified != null && qualified.Right != null)
+			{
+				return qualified.Right;
+			}
+
+			var simple = node as SimpleNameSyntax;
+			if (simple != null)
+			{
+				return simple;
+			}
+
+			var conditional = node as ConditionalAccessExpressionSyntax;
+			if (conditional != null)
+			{
+				return conditional.WhenNotNull.GetRightmostName();
+			}
+
+			return null;
+		}
+
+		public static OperatorPrecedence GetOperatorPrecedence(this ExpressionSyntax expression)
+		{
+			switch (expression.Kind())
+			{
+			case SyntaxKind.SimpleMemberAccessExpression:
+			case SyntaxKind.InvocationExpression:
+			case SyntaxKind.ElementAccessExpression:
+			case SyntaxKind.PostIncrementExpression:
+			case SyntaxKind.PostDecrementExpression:
+			case SyntaxKind.ObjectCreationExpression:
+			case SyntaxKind.TypeOfExpression:
+			case SyntaxKind.DefaultExpression:
+			case SyntaxKind.CheckedExpression:
+			case SyntaxKind.UncheckedExpression:
+			case SyntaxKind.AnonymousMethodExpression:
+				// From C# spec, 7.3.1:
+				// Primary: x.y  f(x)  a[x]  x++  x--  new  typeof  default  checked  unchecked  delegate
+
+				return OperatorPrecedence.Primary;
+
+			case SyntaxKind.UnaryPlusExpression:
+			case SyntaxKind.UnaryMinusExpression:
+			case SyntaxKind.LogicalNotExpression:
+			case SyntaxKind.BitwiseNotExpression:
+			case SyntaxKind.PreIncrementExpression:
+			case SyntaxKind.PreDecrementExpression:
+			case SyntaxKind.CastExpression:
+				// From C# spec, 7.3.1:
+				// Unary: +  -  !  ~  ++x  --x  (T)x
+
+				return OperatorPrecedence.Unary;
+
+			case SyntaxKind.MultiplyExpression:
+			case SyntaxKind.DivideExpression:
+			case SyntaxKind.ModuloExpression:
+				// From C# spec, 7.3.1:
+				// Multiplicative: *  /  %
+
+				return OperatorPrecedence.Multiplicative;
+
+			case SyntaxKind.AddExpression:
+			case SyntaxKind.SubtractExpression:
+				// From C# spec, 7.3.1:
+				// Additive: +  -
+
+				return OperatorPrecedence.Additive;
+
+			case SyntaxKind.LeftShiftExpression:
+			case SyntaxKind.RightShiftExpression:
+				// From C# spec, 7.3.1:
+				// Shift: <<  >>
+
+				return OperatorPrecedence.Shift;
+
+			case SyntaxKind.LessThanExpression:
+			case SyntaxKind.GreaterThanExpression:
+			case SyntaxKind.LessThanOrEqualExpression:
+			case SyntaxKind.GreaterThanOrEqualExpression:
+			case SyntaxKind.IsExpression:
+			case SyntaxKind.AsExpression:
+				// From C# spec, 7.3.1:
+				// Relational and type testing: <  >  <=  >=  is  as
+
+				return OperatorPrecedence.RelationalAndTypeTesting;
+
+			case SyntaxKind.EqualsExpression:
+			case SyntaxKind.NotEqualsExpression:
+				// From C# spec, 7.3.1:
+				// Equality: ==  !=
+
+				return OperatorPrecedence.Equality;
+
+			case SyntaxKind.BitwiseAndExpression:
+				// From C# spec, 7.3.1:
+				// Logical AND: &
+
+				return OperatorPrecedence.LogicalAnd;
+
+			case SyntaxKind.ExclusiveOrExpression:
+				// From C# spec, 7.3.1:
+				// Logical XOR: ^
+
+				return OperatorPrecedence.LogicalXor;
+
+			case SyntaxKind.BitwiseOrExpression:
+				// From C# spec, 7.3.1:
+				// Logical OR: |
+
+				return OperatorPrecedence.LogicalOr;
+
+			case SyntaxKind.LogicalAndExpression:
+				// From C# spec, 7.3.1:
+				// Conditional AND: &&
+
+				return OperatorPrecedence.ConditionalAnd;
+
+			case SyntaxKind.LogicalOrExpression:
+				// From C# spec, 7.3.1:
+				// Conditional AND: ||
+
+				return OperatorPrecedence.ConditionalOr;
+
+			case SyntaxKind.CoalesceExpression:
+				// From C# spec, 7.3.1:
+				// Null coalescing: ??
+
+				return OperatorPrecedence.NullCoalescing;
+
+			case SyntaxKind.ConditionalExpression:
+				// From C# spec, 7.3.1:
+				// Conditional: ?:
+
+				return OperatorPrecedence.Conditional;
+
+			case SyntaxKind.SimpleAssignmentExpression:
+			case SyntaxKind.MultiplyAssignmentExpression:
+			case SyntaxKind.DivideAssignmentExpression:
+			case SyntaxKind.ModuloAssignmentExpression:
+			case SyntaxKind.AddAssignmentExpression:
+			case SyntaxKind.SubtractAssignmentExpression:
+			case SyntaxKind.LeftShiftAssignmentExpression:
+			case SyntaxKind.RightShiftAssignmentExpression:
+			case SyntaxKind.AndAssignmentExpression:
+			case SyntaxKind.ExclusiveOrAssignmentExpression:
+			case SyntaxKind.OrAssignmentExpression:
+			case SyntaxKind.SimpleLambdaExpression:
+			case SyntaxKind.ParenthesizedLambdaExpression:
+				// From C# spec, 7.3.1:
+				// Conditional: ?:
+
+				return OperatorPrecedence.AssignmentAndLambdaExpression;
+
+			default:
+				return OperatorPrecedence.None;
+			}
+		}
+	}
+
+	/// <summary>
+	/// Operator precedence classes from section 7.3.1 of the C# language specification.
+	/// </summary>
+	enum OperatorPrecedence
+	{
+		None = 0,
+		AssignmentAndLambdaExpression,
+		Conditional,
+		NullCoalescing,
+		ConditionalOr,
+		ConditionalAnd,
+		LogicalOr,
+		LogicalXor,
+		LogicalAnd,
+		Equality,
+		RelationalAndTypeTesting,
+		Shift,
+		Additive,
+		Multiplicative,
+		Unary,
+		Primary
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/FastSerializer.cs b/main/src/addins/CSharpBinding/Util/FastSerializer.cs
new file mode 100644
index 0000000000..1216f712de
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/FastSerializer.cs
@@ -0,0 +1,1371 @@
+// Copyright (c) 2011 Daniel Grunwald
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.Serialization;
+
+namespace ICSharpCode.NRefactory6.Utils
+{
+	class FastSerializer
+	{
+		#region Properties
+		/// <summary>
+		/// Gets/Sets the serialization binder that is being used.
+		/// The default value is null, which will cause the FastSerializer to use the
+		/// full assembly and type names.
+		/// </summary>
+		public SerializationBinder SerializationBinder { get; set; }
+		
+		/// <summary>
+		/// Can be used to set several 'fixed' instances.
+		/// When serializing, such instances will not be included; and any references to a fixed instance
+		/// will be stored as the index in this array.
+		/// When deserializing, the same (or equivalent) instances must be specified, and the deserializer
+		/// will use them in place of the fixed instances.
+		/// </summary>
+		public object[] FixedInstances { get; set; }
+		#endregion
+		
+		#region Constants
+		const int magic = 0x71D28A5E;
+		
+		const byte Type_ReferenceType = 1;
+		const byte Type_ValueType = 2;
+		const byte Type_SZArray = 3;
+		const byte Type_ParameterizedType = 4;
+		#endregion
+		
+		#region Serialization
+		sealed class SerializationType
+		{
+			public readonly int ID;
+			public readonly Type Type;
+			
+			public SerializationType(int iD, Type type)
+			{
+				this.ID = iD;
+				this.Type = type;
+			}
+			
+			public ObjectScanner Scanner;
+			public ObjectWriter Writer;
+			public string TypeName;
+			public int AssemblyNameID;
+		}
+		
+		sealed class SerializationContext
+		{
+			readonly Dictionary<object, int> objectToID = new Dictionary<object, int>(ReferenceComparer.Instance);
+			readonly List<object> instances = new List<object>(); // index: object ID
+			readonly List<SerializationType> objectTypes = new List<SerializationType>(); // index: object ID
+			SerializationType stringType;
+			
+			readonly Dictionary<Type, SerializationType> typeMap = new Dictionary<Type, SerializationType>();
+			readonly List<SerializationType> types = new List<SerializationType>();
+			
+			readonly Dictionary<string, int> assemblyNameToID = new Dictionary<string, int>();
+			readonly List<string> assemblyNames = new List<string>();
+			
+			readonly FastSerializer fastSerializer;
+			public readonly BinaryWriter writer;
+			int fixedInstanceCount;
+			
+			internal SerializationContext(FastSerializer fastSerializer, BinaryWriter writer)
+			{
+				this.fastSerializer = fastSerializer;
+				this.writer = writer;
+				instances.Add(null); // use object ID 0 for null
+				objectTypes.Add(null);
+			}
+			
+			#region Scanning
+			public void MarkFixedInstances(object[] fixedInstances)
+			{
+				if (fixedInstances == null)
+					return;
+				foreach (object obj in fixedInstances) {
+					if (!objectToID.ContainsKey(obj)) {
+						objectToID.Add(obj, instances.Count);
+						instances.Add(obj);
+						fixedInstanceCount++;
+					}
+				}
+			}
+			
+			/// <summary>
+			/// Marks an instance for future scanning.
+			/// </summary>
+			public void Mark(object instance)
+			{
+				if (instance == null || objectToID.ContainsKey(instance))
+					return;
+				Log(" Mark {0}", instance.GetType().Name);
+				
+				objectToID.Add(instance, instances.Count);
+				instances.Add(instance);
+			}
+			
+			internal void Scan()
+			{
+				Log("Scanning...");
+				// starting from 1, because index 0 is null
+				// Also, do not scan any of the 'fixed instances'.
+				for (int i = 1 + fixedInstanceCount; i < instances.Count; i++) {
+					object instance = instances[i];
+					ISerializable serializable = instance as ISerializable;
+					Type type = instance.GetType();
+					Log("Scan #{0}: {1}", i, type.Name);
+					SerializationType sType = MarkType(type);
+					objectTypes.Add(sType);
+					if (serializable != null) {
+						SerializationInfo info = new SerializationInfo(type, fastSerializer.formatterConverter);
+						serializable.GetObjectData(info, fastSerializer.streamingContext);
+						instances[i] = info;
+						foreach (SerializationEntry entry in info) {
+							Mark(entry.Value);
+						}
+						sType.Writer = serializationInfoWriter;
+					} else {
+						ObjectScanner objectScanner = sType.Scanner;
+						if (objectScanner == null) {
+							objectScanner = fastSerializer.GetScanner(type);
+							sType.Scanner = objectScanner;
+							sType.Writer = fastSerializer.GetWriter(type);
+						}
+						objectScanner(this, instance);
+					}
+				}
+			}
+			#endregion
+			
+			#region Scan Types
+			SerializationType MarkType(Type type)
+			{
+				SerializationType sType;
+				if (!typeMap.TryGetValue(type, out sType)) {
+					string assemblyName = null;
+					string typeName = null;
+					if (type.HasElementType) {
+						Debug.Assert(type.IsArray);
+						MarkType(type.GetElementType());
+					} else if (type.IsGenericType && !type.IsGenericTypeDefinition) {
+						MarkType(type.GetGenericTypeDefinition());
+						foreach (Type typeArg in type.GetGenericArguments())
+							MarkType(typeArg);
+					} else if (type.IsGenericParameter) {
+						throw new NotSupportedException();
+					} else {
+						var serializationBinder = fastSerializer.SerializationBinder;
+						if (serializationBinder != null) {
+							serializationBinder.BindToName(type, out assemblyName, out typeName);
+						} else {
+							assemblyName = type.Assembly.FullName;
+							typeName = type.FullName;
+							Debug.Assert(typeName != null);
+						}
+					}
+					
+					sType = new SerializationType(typeMap.Count, type);
+					sType.TypeName = typeName;
+					if (assemblyName != null) {
+						if (!assemblyNameToID.TryGetValue(assemblyName, out sType.AssemblyNameID)) {
+							sType.AssemblyNameID = assemblyNames.Count;
+							assemblyNameToID.Add(assemblyName, sType.AssemblyNameID);
+							assemblyNames.Add(assemblyName);
+							Log("Registered assembly #{0}: {1}", sType.AssemblyNameID, assemblyName);
+						}
+					}
+					typeMap.Add(type, sType);
+					types.Add(sType);
+					Log("Registered type %{0}: {1}", sType.ID, type);
+					if (type == typeof(string)) {
+						stringType = sType;
+					}
+				}
+				return sType;
+			}
+			
+			internal void ScanTypes()
+			{
+				for (int i = 0; i < types.Count; i++) {
+					Type type = types[i].Type;
+					if (type.IsGenericTypeDefinition || type.HasElementType)
+						continue;
+					if (typeof(ISerializable).IsAssignableFrom(type))
+						continue;
+					foreach (FieldInfo field in GetSerializableFields(type)) {
+						MarkType(field.FieldType);
+					}
+				}
+			}
+			#endregion
+			
+			#region Writing
+			public void WriteObjectID(object instance)
+			{
+				int id = (instance == null) ? 0 : objectToID[instance];
+				if (instances.Count <= ushort.MaxValue)
+					writer.Write((ushort)id);
+				else
+					writer.Write(id);
+			}
+			
+			void WriteTypeID(Type type)
+			{
+				Debug.Assert(typeMap.ContainsKey(type));
+				int typeID = typeMap[type].ID;
+				if (types.Count <= ushort.MaxValue)
+					writer.Write((ushort)typeID);
+				else
+					writer.Write(typeID);
+			}
+			
+			internal void Write()
+			{
+				Log("Writing...");
+				writer.Write(magic);
+				// Write out type information
+				writer.Write(instances.Count);
+				writer.Write(types.Count);
+				writer.Write(assemblyNames.Count);
+				writer.Write(fixedInstanceCount);
+				
+				foreach (string assemblyName in assemblyNames) {
+					writer.Write(assemblyName);
+				}
+				
+				foreach (SerializationType sType in types) {
+					Type type = sType.Type;
+					if (type.HasElementType) {
+						if (type.IsArray) {
+							if (type.GetArrayRank() == 1)
+								writer.Write(Type_SZArray);
+							else
+								throw new NotSupportedException();
+						} else {
+							throw new NotSupportedException();
+						}
+						WriteTypeID(type.GetElementType());
+					} else if (type.IsGenericType && !type.IsGenericTypeDefinition) {
+						writer.Write(Type_ParameterizedType);
+						WriteTypeID(type.GetGenericTypeDefinition());
+						foreach (Type typeArg in type.GetGenericArguments()) {
+							WriteTypeID(typeArg);
+						}
+					} else {
+						if (type.IsValueType) {
+							writer.Write(Type_ValueType);
+						} else {
+							writer.Write(Type_ReferenceType);
+						}
+						if (assemblyNames.Count <= ushort.MaxValue)
+							writer.Write((ushort)sType.AssemblyNameID);
+						else
+							writer.Write(sType.AssemblyNameID);
+						writer.Write(sType.TypeName);
+					}
+				}
+				foreach (SerializationType sType in types) {
+					Type type = sType.Type;
+					if (type.IsGenericTypeDefinition || type.HasElementType)
+						continue;
+					writer.Write(FastSerializerVersionAttribute.GetVersionNumber(type));
+					if (type.IsPrimitive || typeof(ISerializable).IsAssignableFrom(type)) {
+						writer.Write(byte.MaxValue);
+					} else {
+						var fields = GetSerializableFields(type);
+						if (fields.Count >= byte.MaxValue)
+							throw new SerializationException("Too many fields.");
+						writer.Write((byte)fields.Count);
+						foreach (var field in fields) {
+							WriteTypeID(field.FieldType);
+							writer.Write(field.Name);
+						}
+					}
+				}
+				
+				// Write out information necessary to create the instances
+				// starting from 1, because index 0 is null
+				for (int i = 1 + fixedInstanceCount; i < instances.Count; i++) {
+					SerializationType sType = objectTypes[i];
+					if (types.Count <= ushort.MaxValue)
+						writer.Write((ushort)sType.ID);
+					else
+						writer.Write(sType.ID);
+					if (sType == stringType) {
+						// Strings are written to the output immediately
+						// - we can't create an empty string and fill it later
+						writer.Write((string)instances[i]);
+					} else if (sType.Type.IsArray) {
+						// For arrays, write down the length, because we need that to create the array instance
+						writer.Write(((Array)instances[i]).Length);
+					}
+				}
+				// Write out information necessary to fill data into the instances
+				for (int i = 1 + fixedInstanceCount; i < instances.Count; i++) {
+					Log("0x{2:x6}, Write #{0}: {1}", i, objectTypes[i].Type.Name, writer.BaseStream.Position);
+					objectTypes[i].Writer(this, instances[i]);
+				}
+				Log("Serialization done.");
+			}
+			#endregion
+		}
+		
+		#region Object Scanners
+		delegate void ObjectScanner(SerializationContext context, object instance);
+		
+		static readonly MethodInfo mark = typeof(SerializationContext).GetMethod("Mark", new[] { typeof(object) });
+		static readonly FieldInfo writerField = typeof(SerializationContext).GetField("writer");
+		
+		Dictionary<Type, ObjectScanner> scanners = new Dictionary<Type, ObjectScanner>();
+		
+		ObjectScanner GetScanner(Type type)
+		{
+			ObjectScanner scanner;
+			if (!scanners.TryGetValue(type, out scanner)) {
+				scanner = CreateScanner(type);
+				scanners.Add(type, scanner);
+			}
+			return scanner;
+		}
+		
+		ObjectScanner CreateScanner(Type type)
+		{
+			bool isArray = type.IsArray;
+			if (isArray) {
+				if (type.GetArrayRank() != 1)
+					throw new NotSupportedException();
+				type = type.GetElementType();
+				if (!type.IsValueType) {
+					return delegate (SerializationContext context, object array) {
+						foreach (object val in (object[])array) {
+							context.Mark(val);
+						}
+					};
+				}
+			}
+			for (Type baseType = type; baseType != null; baseType = baseType.BaseType) {
+				if (!baseType.IsSerializable)
+					throw new SerializationException("Type " + baseType + " is not [Serializable].");
+			}
+			List<FieldInfo> fields = GetSerializableFields(type);
+			fields.RemoveAll(f => !IsReferenceOrContainsReferences(f.FieldType));
+			if (fields.Count == 0) {
+				// The scanner has nothing to do for this object.
+				return delegate { };
+			}
+			
+			DynamicMethod dynamicMethod = new DynamicMethod(
+				(isArray ? "ScanArray_" : "Scan_") + type.Name,
+				typeof(void), new [] { typeof(SerializationContext), typeof(object) },
+				true);
+			ILGenerator il = dynamicMethod.GetILGenerator();
+			
+			
+			if (isArray) {
+				var instance = il.DeclareLocal(type.MakeArrayType());
+				il.Emit(OpCodes.Ldarg_1);
+				il.Emit(OpCodes.Castclass, type.MakeArrayType());
+				il.Emit(OpCodes.Stloc, instance); // instance = (type[])arg_1;
+				
+				// for (int i = 0; i < instance.Length; i++) scan instance[i];
+				var loopStart = il.DefineLabel();
+				var loopHead = il.DefineLabel();
+				var loopVariable = il.DeclareLocal(typeof(int));
+				il.Emit(OpCodes.Ldc_I4_0);
+				il.Emit(OpCodes.Stloc, loopVariable); // loopVariable = 0
+				il.Emit(OpCodes.Br, loopHead); // goto loopHead;
+				
+				il.MarkLabel(loopStart);
+				
+				il.Emit(OpCodes.Ldloc, instance); // instance
+				il.Emit(OpCodes.Ldloc, loopVariable); // instance, loopVariable
+				il.Emit(OpCodes.Ldelem, type); // &instance[loopVariable]
+				EmitScanValueType(il, type);
+				
+				
+				il.Emit(OpCodes.Ldloc, loopVariable); // loopVariable
+				il.Emit(OpCodes.Ldc_I4_1); // loopVariable, 1
+				il.Emit(OpCodes.Add); // loopVariable+1
+				il.Emit(OpCodes.Stloc, loopVariable); // loopVariable++;
+				
+				il.MarkLabel(loopHead);
+				il.Emit(OpCodes.Ldloc, loopVariable); // loopVariable
+				il.Emit(OpCodes.Ldloc, instance); // loopVariable, instance
+				il.Emit(OpCodes.Ldlen); // loopVariable, instance.Length
+				il.Emit(OpCodes.Conv_I4);
+				il.Emit(OpCodes.Blt, loopStart); // if (loopVariable < instance.Length) goto loopStart;
+			} else if (type.IsValueType) {
+				// boxed value type
+				il.Emit(OpCodes.Ldarg_1);
+				il.Emit(OpCodes.Unbox_Any, type);
+				EmitScanValueType(il, type);
+			} else {
+				// reference type
+				var instance = il.DeclareLocal(type);
+				il.Emit(OpCodes.Ldarg_1);
+				il.Emit(OpCodes.Castclass, type);
+				il.Emit(OpCodes.Stloc, instance); // instance = (type)arg_1;
+				
+				foreach (FieldInfo field in fields) {
+					EmitScanField(il, instance, field); // scan instance.Field
+				}
+			}
+			il.Emit(OpCodes.Ret);
+			return (ObjectScanner)dynamicMethod.CreateDelegate(typeof(ObjectScanner));
+		}
+
+		/// <summary>
+		/// Emit 'scan instance.Field'.
+		/// Stack transition: ... => ...
+		/// </summary>
+		void EmitScanField(ILGenerator il, LocalBuilder instance, FieldInfo field)
+		{
+			if (field.FieldType.IsValueType) {
+				il.Emit(OpCodes.Ldloc, instance); // instance
+				il.Emit(OpCodes.Ldfld, field); // instance.field
+				EmitScanValueType(il, field.FieldType);
+			} else {
+				il.Emit(OpCodes.Ldarg_0); // context
+				il.Emit(OpCodes.Ldloc, instance); // context, instance
+				il.Emit(OpCodes.Ldfld, field); // context, instance.field
+				il.Emit(OpCodes.Call, mark); // context.Mark(instance.field);
+			}
+		}
+
+		/// <summary>
+		/// Stack transition: ..., value => ...
+		/// </summary>
+		void EmitScanValueType(ILGenerator il, Type valType)
+		{
+			var fieldRef = il.DeclareLocal(valType);
+			il.Emit(OpCodes.Stloc, fieldRef);
+			
+			foreach (FieldInfo field in GetSerializableFields(valType)) {
+				if (IsReferenceOrContainsReferences(field.FieldType)) {
+					EmitScanField(il, fieldRef, field);
+				}
+			}
+		}
+
+		static List<FieldInfo> GetSerializableFields(Type type)
+		{
+			List<FieldInfo> fields = new List<FieldInfo>();
+			for (Type baseType = type; baseType != null; baseType = baseType.BaseType) {
+				FieldInfo[] declFields = baseType.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly);
+				Array.Sort(declFields, (a,b) => string.Compare(a.Name, b.Name, StringComparison.Ordinal));
+				fields.AddRange(declFields);
+			}
+			fields.RemoveAll(f => f.IsNotSerialized);
+			return fields;
+		}
+
+		static bool IsReferenceOrContainsReferences(Type type)
+		{
+			if (!type.IsValueType)
+				return true;
+			if (type.IsPrimitive)
+				return false;
+			foreach (FieldInfo field in GetSerializableFields(type)) {
+				if (IsReferenceOrContainsReferences(field.FieldType))
+					return true;
+			}
+			return false;
+		}
+		#endregion
+
+		#region Object Writers
+		delegate void ObjectWriter(SerializationContext context, object instance);
+
+		static readonly MethodInfo writeObjectID = typeof(SerializationContext).GetMethod("WriteObjectID", new[] { typeof(object) });
+
+		static readonly MethodInfo writeByte = typeof(BinaryWriter).GetMethod("Write", new[] { typeof(byte) });
+		static readonly MethodInfo writeShort = typeof(BinaryWriter).GetMethod("Write", new[] { typeof(short) });
+		static readonly MethodInfo writeInt = typeof(BinaryWriter).GetMethod("Write", new[] { typeof(int) });
+		static readonly MethodInfo writeLong = typeof(BinaryWriter).GetMethod("Write", new[] { typeof(long) });
+		static readonly MethodInfo writeFloat = typeof(BinaryWriter).GetMethod("Write", new[] { typeof(float) });
+		static readonly MethodInfo writeDouble = typeof(BinaryWriter).GetMethod("Write", new[] { typeof(double) });
+		OpCode callVirt = OpCodes.Callvirt;
+
+		static readonly ObjectWriter serializationInfoWriter = delegate(SerializationContext context, object instance) {
+			BinaryWriter writer = context.writer;
+			SerializationInfo info = (SerializationInfo)instance;
+			writer.Write(info.MemberCount);
+			foreach (SerializationEntry entry in info) {
+				writer.Write(entry.Name);
+				context.WriteObjectID(entry.Value);
+			}
+		};
+
+		Dictionary<Type, ObjectWriter> writers = new Dictionary<Type, ObjectWriter>();
+
+		ObjectWriter GetWriter(Type type)
+		{
+			ObjectWriter writer;
+			if (!writers.TryGetValue(type, out writer)) {
+				writer = CreateWriter(type);
+				writers.Add(type, writer);
+			}
+			return writer;
+		}
+
+		ObjectWriter CreateWriter(Type type)
+		{
+			if (type == typeof(string)) {
+				// String contents are written in the object creation section,
+				// not into the field value section.
+				return delegate {};
+			}
+			bool isArray = type.IsArray;
+			if (isArray) {
+				if (type.GetArrayRank() != 1)
+					throw new NotSupportedException();
+				type = type.GetElementType();
+				if (!type.IsValueType) {
+					return delegate (SerializationContext context, object array) {
+						foreach (object val in (object[])array) {
+							context.WriteObjectID(val);
+						}
+					};
+				} else if (type == typeof(byte)) {
+					return delegate (SerializationContext context, object array) {
+						context.writer.Write((byte[])array);
+					};
+				}
+			}
+			List<FieldInfo> fields = GetSerializableFields(type);
+			if (fields.Count == 0) {
+				// The writer has nothing to do for this object.
+				return delegate { };
+			}
+			
+			
+			DynamicMethod dynamicMethod = new DynamicMethod(
+				(isArray ? "WriteArray_" : "Write_") + type.Name,
+				typeof(void), new [] { typeof(SerializationContext), typeof(object) },
+				true);
+			ILGenerator il = dynamicMethod.GetILGenerator();
+			
+			var writer = il.DeclareLocal(typeof(BinaryWriter));
+			
+			il.Emit(OpCodes.Ldarg_0);
+			il.Emit(OpCodes.Ldfld, writerField);
+			il.Emit(OpCodes.Stloc, writer); // writer = context.writer;
+			
+			if (isArray) {
+				var instance = il.DeclareLocal(type.MakeArrayType());
+				il.Emit(OpCodes.Ldarg_1);
+				il.Emit(OpCodes.Castclass, type.MakeArrayType());
+				il.Emit(OpCodes.Stloc, instance); // instance = (type[])arg_1;
+				
+				// for (int i = 0; i < instance.Length; i++) write instance[i];
+				
+				var loopStart = il.DefineLabel();
+				var loopHead = il.DefineLabel();
+				var loopVariable = il.DeclareLocal(typeof(int));
+				il.Emit(OpCodes.Ldc_I4_0);
+				il.Emit(OpCodes.Stloc, loopVariable); // loopVariable = 0
+				il.Emit(OpCodes.Br, loopHead); // goto loopHead;
+				
+				il.MarkLabel(loopStart);
+				
+				if (type.IsEnum || type.IsPrimitive) {
+					if (type.IsEnum) {
+						type = type.GetEnumUnderlyingType();
+					}
+					Debug.Assert(type.IsPrimitive);
+					il.Emit(OpCodes.Ldloc, writer); // writer
+					il.Emit(OpCodes.Ldloc, instance); // writer, instance
+					il.Emit(OpCodes.Ldloc, loopVariable); // writer, instance, loopVariable
+					switch (Type.GetTypeCode(type)) {
+						case TypeCode.Boolean:
+						case TypeCode.SByte:
+						case TypeCode.Byte:
+							il.Emit(OpCodes.Ldelem_I1); // writer, instance[loopVariable]
+							il.Emit(callVirt, writeByte); // writer.Write(instance[loopVariable]);
+							break;
+						case TypeCode.Char:
+						case TypeCode.Int16:
+						case TypeCode.UInt16:
+							il.Emit(OpCodes.Ldelem_I2); // writer, instance[loopVariable]
+							il.Emit(callVirt, writeShort); // writer.Write(instance[loopVariable]);
+							break;
+						case TypeCode.Int32:
+						case TypeCode.UInt32:
+							il.Emit(OpCodes.Ldelem_I4);  // writer, instance[loopVariable]
+							il.Emit(callVirt, writeInt); // writer.Write(instance[loopVariable]);
+							break;
+						case TypeCode.Int64:
+						case TypeCode.UInt64:
+							il.Emit(OpCodes.Ldelem_I8);  // writer, instance[loopVariable]
+							il.Emit(callVirt, writeLong); // writer.Write(instance[loopVariable]);
+							break;
+						case TypeCode.Single:
+							il.Emit(OpCodes.Ldelem_R4);  // writer, instance[loopVariable]
+							il.Emit(callVirt, writeFloat); // writer.Write(instance[loopVariable]);
+							break;
+						case TypeCode.Double:
+							il.Emit(OpCodes.Ldelem_R8);  // writer, instance[loopVariable]
+							il.Emit(callVirt, writeDouble); // writer.Write(instance[loopVariable]);
+							break;
+						default:
+							throw new NotSupportedException("Unknown primitive type " + type);
+					}
+				} else {
+					il.Emit(OpCodes.Ldloc, instance); // instance
+					il.Emit(OpCodes.Ldloc, loopVariable); // instance, loopVariable
+					il.Emit(OpCodes.Ldelem, type); // instance[loopVariable]
+					EmitWriteValueType(il, writer, type);
+				}
+				
+				il.Emit(OpCodes.Ldloc, loopVariable); // loopVariable
+				il.Emit(OpCodes.Ldc_I4_1); // loopVariable, 1
+				il.Emit(OpCodes.Add); // loopVariable+1
+				il.Emit(OpCodes.Stloc, loopVariable); // loopVariable++;
+				
+				il.MarkLabel(loopHead);
+				il.Emit(OpCodes.Ldloc, loopVariable); // loopVariable
+				il.Emit(OpCodes.Ldloc, instance); // loopVariable, instance
+				il.Emit(OpCodes.Ldlen); // loopVariable, instance.Length
+				il.Emit(OpCodes.Conv_I4);
+				il.Emit(OpCodes.Blt, loopStart); // if (loopVariable < instance.Length) goto loopStart;
+			} else if (type.IsValueType) {
+				// boxed value type
+				if (type.IsEnum || type.IsPrimitive) {
+					il.Emit(OpCodes.Ldloc, writer);
+					il.Emit(OpCodes.Ldarg_1);
+					il.Emit(OpCodes.Unbox_Any, type);
+					WritePrimitiveValue(il, type);
+				} else {
+					il.Emit(OpCodes.Ldarg_1);
+					il.Emit(OpCodes.Unbox_Any, type);
+					EmitWriteValueType(il, writer, type);
+				}
+			} else {
+				// reference type
+				var instance = il.DeclareLocal(type);
+				il.Emit(OpCodes.Ldarg_1);
+				il.Emit(OpCodes.Castclass, type);
+				il.Emit(OpCodes.Stloc, instance); // instance = (type)arg_1;
+				
+				foreach (FieldInfo field in fields) {
+					EmitWriteField(il, writer, instance, field); // write instance.Field
+				}
+			}
+			il.Emit(OpCodes.Ret);
+			return (ObjectWriter)dynamicMethod.CreateDelegate(typeof(ObjectWriter));
+		}
+
+		/// <summary>
+		/// Emit 'write instance.Field'.
+		/// Stack transition: ... => ...
+		/// </summary>
+		void EmitWriteField(ILGenerator il, LocalBuilder writer, LocalBuilder instance, FieldInfo field)
+		{
+			Type fieldType = field.FieldType;
+			if (fieldType.IsValueType) {
+				if (fieldType.IsPrimitive || fieldType.IsEnum) {
+					il.Emit(OpCodes.Ldloc, writer); // writer
+					il.Emit(OpCodes.Ldloc, instance); // writer, instance
+					il.Emit(OpCodes.Ldfld, field); // writer, instance.field
+					WritePrimitiveValue(il, fieldType);
+				} else {
+					il.Emit(OpCodes.Ldloc, instance); // instance
+					il.Emit(OpCodes.Ldfld, field); // instance.field
+					EmitWriteValueType(il, writer, fieldType);
+				}
+			} else {
+				il.Emit(OpCodes.Ldarg_0); // context
+				il.Emit(OpCodes.Ldloc, instance); // context, instance
+				il.Emit(OpCodes.Ldfld, field); // context, instance.field
+				il.Emit(OpCodes.Call, writeObjectID); // context.WriteObjectID(instance.field);
+			}
+		}
+		
+		/// <summary>
+		/// Writes a primitive value of the specified type.
+		/// Stack transition: ..., writer, value => ...
+		/// </summary>
+		void WritePrimitiveValue(ILGenerator il, Type fieldType)
+		{
+			if (fieldType.IsEnum) {
+				fieldType = fieldType.GetEnumUnderlyingType();
+				Debug.Assert(fieldType.IsPrimitive);
+			}
+			switch (Type.GetTypeCode(fieldType)) {
+				case TypeCode.Boolean:
+				case TypeCode.SByte:
+				case TypeCode.Byte:
+					il.Emit(callVirt, writeByte); // writer.Write(value);
+					break;
+				case TypeCode.Char:
+				case TypeCode.Int16:
+				case TypeCode.UInt16:
+					il.Emit(callVirt, writeShort); // writer.Write(value);
+					break;
+				case TypeCode.Int32:
+				case TypeCode.UInt32:
+					il.Emit(callVirt, writeInt); // writer.Write(value);
+					break;
+				case TypeCode.Int64:
+				case TypeCode.UInt64:
+					il.Emit(callVirt, writeLong); // writer.Write(value);
+					break;
+				case TypeCode.Single:
+					il.Emit(callVirt, writeFloat); // writer.Write(value);
+					break;
+				case TypeCode.Double:
+					il.Emit(callVirt, writeDouble); // writer.Write(value);
+					break;
+				default:
+					throw new NotSupportedException("Unknown primitive type " + fieldType);
+			}
+		}
+
+		/// <summary>
+		/// Stack transition: ..., value => ...
+		/// </summary>
+		void EmitWriteValueType(ILGenerator il, LocalBuilder writer, Type valType)
+		{
+			Debug.Assert(valType.IsValueType);
+			Debug.Assert(!(valType.IsEnum || valType.IsPrimitive));
+			
+			var fieldVal = il.DeclareLocal(valType);
+			il.Emit(OpCodes.Stloc, fieldVal);
+			
+			foreach (FieldInfo field in GetSerializableFields(valType)) {
+				EmitWriteField(il, writer, fieldVal, field);
+			}
+		}
+		#endregion
+
+		StreamingContext streamingContext = new StreamingContext(StreamingContextStates.All);
+		FormatterConverter formatterConverter = new FormatterConverter();
+
+		public void Serialize(Stream stream, object instance)
+		{
+			Serialize(new BinaryWriterWith7BitEncodedInts(stream), instance);
+		}
+
+		public void Serialize(BinaryWriter writer, object instance)
+		{
+			SerializationContext context = new SerializationContext(this, writer);
+			context.MarkFixedInstances(this.FixedInstances);
+			context.Mark(instance);
+			context.Scan();
+			context.ScanTypes();
+			context.Write();
+			context.WriteObjectID(instance);
+		}
+
+		delegate void TypeSerializer(object instance, SerializationContext context);
+		#endregion
+
+		#region Deserialization
+		sealed class DeserializationContext
+		{
+			public Type[] Types; // index: type ID
+			
+			public object[] Objects; // index: object ID
+			
+			public BinaryReader Reader;
+			
+			public object ReadObject()
+			{
+				if (this.Objects.Length <= ushort.MaxValue)
+					return this.Objects[Reader.ReadUInt16()];
+				else
+					return this.Objects[Reader.ReadInt32()];
+			}
+			
+			#region DeserializeTypeDescriptions
+			internal int ReadTypeID()
+			{
+				if (this.Types.Length <= ushort.MaxValue)
+					return Reader.ReadUInt16();
+				else
+					return Reader.ReadInt32();
+			}
+			
+			internal void DeserializeTypeDescriptions()
+			{
+				for (int i = 0; i < this.Types.Length; i++) {
+					Type type = this.Types[i];
+					if (type.IsGenericTypeDefinition || type.HasElementType)
+						continue;
+					int versionNumber = Reader.ReadInt32();
+					if (versionNumber != FastSerializerVersionAttribute.GetVersionNumber(type))
+						throw new SerializationException("Type '" + type.FullName + "' was serialized with version " + versionNumber + ", but is version " + FastSerializerVersionAttribute.GetVersionNumber(type));
+					
+					bool isCustomSerialization = typeof(ISerializable).IsAssignableFrom(type);
+					bool typeIsSpecial = type.IsPrimitive || isCustomSerialization;
+					
+					byte serializedFieldCount = Reader.ReadByte();
+					if (serializedFieldCount == byte.MaxValue) {
+						// special type
+						if (!typeIsSpecial)
+							throw new SerializationException("Type '" + type.FullName + "' was serialized as special type, but isn't special now.");
+					} else {
+						if (typeIsSpecial)
+							throw new SerializationException("Type '" + type.FullName + "' wasn't serialized as special type, but is special now.");
+						
+						var availableFields = GetSerializableFields(this.Types[i]);
+						if (availableFields.Count != serializedFieldCount)
+							throw new SerializationException("Number of fields on " + type.FullName + " has changed.");
+						for (int j = 0; j < serializedFieldCount; j++) {
+							int fieldTypeID = ReadTypeID();
+							
+							string fieldName = Reader.ReadString();
+							FieldInfo fieldInfo = availableFields[j];
+							if (fieldInfo.Name != fieldName)
+								throw new SerializationException("Field mismatch on type " + type.FullName);
+							if (fieldInfo.FieldType != this.Types[fieldTypeID])
+								throw new SerializationException(type.FullName + "." + fieldName + " was serialized as " + this.Types[fieldTypeID] + ", but now is " + fieldInfo.FieldType);
+						}
+					}
+				}
+			}
+			#endregion
+		}
+		
+		delegate void ObjectReader(DeserializationContext context, object instance);
+		
+		public object Deserialize(Stream stream)
+		{
+			return Deserialize(new BinaryReaderWith7BitEncodedInts(stream));
+		}
+		
+		public object Deserialize(BinaryReader reader)
+		{
+			if (reader.ReadInt32() != magic)
+				throw new SerializationException("The data cannot be read by FastSerializer (unknown magic value)");
+			
+			DeserializationContext context = new DeserializationContext();
+			context.Reader = reader;
+			context.Objects = new object[reader.ReadInt32()];
+			context.Types = new Type[reader.ReadInt32()];
+			string[] assemblyNames = new string[reader.ReadInt32()];
+			int fixedInstanceCount = reader.ReadInt32();
+			
+			if (fixedInstanceCount != 0) {
+				if (this.FixedInstances == null || this.FixedInstances.Length != fixedInstanceCount)
+					throw new SerializationException("Number of fixed instances doesn't match");
+				for (int i = 0; i < fixedInstanceCount; i++) {
+					context.Objects[i + 1] = this.FixedInstances[i];
+				}
+			}
+			
+			for (int i = 0; i < assemblyNames.Length; i++) {
+				assemblyNames[i] = reader.ReadString();
+			}
+			int stringTypeID = -1;
+			for (int i = 0; i < context.Types.Length; i++) {
+				byte typeKind = reader.ReadByte();
+				switch (typeKind) {
+					case Type_ReferenceType:
+					case Type_ValueType:
+						int assemblyID;
+						if (assemblyNames.Length <= ushort.MaxValue)
+							assemblyID = reader.ReadUInt16();
+						else
+							assemblyID = reader.ReadInt32();
+						string assemblyName = assemblyNames[assemblyID];
+						string typeName = reader.ReadString();
+						Type type;
+						if (SerializationBinder != null) {
+							type = SerializationBinder.BindToType(assemblyName, typeName);
+						} else {
+							type = Assembly.Load(assemblyName).GetType(typeName);
+						}
+						if (type == null)
+							throw new SerializationException("Could not find '" + typeName + "' in '" + assemblyName + "'");
+						if (typeKind == Type_ValueType && !type.IsValueType)
+							throw new SerializationException("Expected '" + typeName + "' to be a value type, but it is reference type");
+						if (typeKind == Type_ReferenceType && type.IsValueType)
+							throw new SerializationException("Expected '" + typeName + "' to be a reference type, but it is value type");
+						context.Types[i] = type;
+						if (type == typeof(string))
+							stringTypeID = i;
+						break;
+					case Type_SZArray:
+						context.Types[i] = context.Types[context.ReadTypeID()].MakeArrayType();
+						break;
+					case Type_ParameterizedType:
+						Type genericType = context.Types[context.ReadTypeID()];
+						int typeParameterCount = genericType.GetGenericArguments().Length;
+						Type[] typeArguments = new Type[typeParameterCount];
+						for (int j = 0; j < typeArguments.Length; j++) {
+							typeArguments[j] = context.Types[context.ReadTypeID()];
+						}
+						context.Types[i] = genericType.MakeGenericType(typeArguments);
+						break;
+					default:
+						throw new SerializationException("Unknown type kind");
+				}
+			}
+			context.DeserializeTypeDescriptions();
+			int[] typeIDByObjectID = new int[context.Objects.Length];
+			for (int i = 1 + fixedInstanceCount; i < context.Objects.Length; i++) {
+				int typeID = context.ReadTypeID();
+				
+				object instance;
+				if (typeID == stringTypeID) {
+					instance = reader.ReadString();
+				} else {
+					Type type = context.Types[typeID];
+					if (type.IsArray) {
+						int length = reader.ReadInt32();
+						instance = Array.CreateInstance(type.GetElementType(), length);
+					} else {
+						instance = FormatterServices.GetUninitializedObject(type);
+					}
+				}
+				context.Objects[i] = instance;
+				typeIDByObjectID[i] = typeID;
+			}
+			List<CustomDeserialization> customDeserializatons = new List<CustomDeserialization>();
+			ObjectReader[] objectReaders = new ObjectReader[context.Types.Length]; // index: type ID
+			for (int i = 1 + fixedInstanceCount; i < context.Objects.Length; i++) {
+				object instance = context.Objects[i];
+				int typeID = typeIDByObjectID[i];
+				Log("0x{2:x6} Read #{0}: {1}", i, context.Types[typeID].Name, reader.BaseStream.Position);
+				ISerializable serializable = instance as ISerializable;
+				if (serializable != null) {
+					Type type = context.Types[typeID];
+					SerializationInfo info = new SerializationInfo(type, formatterConverter);
+					int count = reader.ReadInt32();
+					for (int j = 0; j < count; j++) {
+						string name = reader.ReadString();
+						object val = context.ReadObject();
+						info.AddValue(name, val);
+					}
+					CustomDeserializationAction action = GetCustomDeserializationAction(type);
+					customDeserializatons.Add(new CustomDeserialization(instance, info, action));
+				} else {
+					ObjectReader objectReader = objectReaders[typeID];
+					if (objectReader == null) {
+						objectReader = GetReader(context.Types[typeID]);
+						objectReaders[typeID] = objectReader;
+					}
+					objectReader(context, instance);
+				}
+			}
+			Log("File was read successfully, now running {0} custom deserializations...", customDeserializatons.Count);
+			foreach (CustomDeserialization customDeserializaton in customDeserializatons) {
+				customDeserializaton.Run(streamingContext);
+			}
+			for (int i = 1 + fixedInstanceCount; i < context.Objects.Length; i++) {
+				IDeserializationCallback dc = context.Objects[i] as IDeserializationCallback;
+				if (dc != null)
+					dc.OnDeserialization(null);
+			}
+			
+			return context.ReadObject();
+		}
+		
+		#region Object Reader
+		static readonly FieldInfo readerField = typeof(DeserializationContext).GetField("Reader");
+		static readonly MethodInfo readObject = typeof(DeserializationContext).GetMethod("ReadObject");
+		
+		static readonly MethodInfo readByte = typeof(BinaryReader).GetMethod("ReadByte");
+		static readonly MethodInfo readShort = typeof(BinaryReader).GetMethod("ReadInt16");
+		static readonly MethodInfo readInt = typeof(BinaryReader).GetMethod("ReadInt32");
+		static readonly MethodInfo readLong = typeof(BinaryReader).GetMethod("ReadInt64");
+		static readonly MethodInfo readFloat = typeof(BinaryReader).GetMethod("ReadSingle");
+		static readonly MethodInfo readDouble = typeof(BinaryReader).GetMethod("ReadDouble");
+		
+		Dictionary<Type, ObjectReader> readers = new Dictionary<Type, ObjectReader>();
+
+		ObjectReader GetReader(Type type)
+		{
+			ObjectReader reader;
+			if (!readers.TryGetValue(type, out reader)) {
+				reader = CreateReader(type);
+				readers.Add(type, reader);
+			}
+			return reader;
+		}
+		
+		ObjectReader CreateReader(Type type)
+		{
+			if (type == typeof(string)) {
+				// String contents are written in the object creation section,
+				// not into the field value section; so there's nothing to read here.
+				return delegate {};
+			}
+			bool isArray = type.IsArray;
+			if (isArray) {
+				if (type.GetArrayRank() != 1)
+					throw new NotSupportedException();
+				type = type.GetElementType();
+				if (!type.IsValueType) {
+					return delegate (DeserializationContext context, object arrayInstance) {
+						object[] array = (object[])arrayInstance;
+						for (int i = 0; i < array.Length; i++) {
+							array[i] = context.ReadObject();
+						}
+					};
+				} else if (type == typeof(byte)) {
+					return delegate (DeserializationContext context, object arrayInstance) {
+						byte[] array = (byte[])arrayInstance;
+						BinaryReader binaryReader = context.Reader;
+						int pos = 0;
+						int bytesRead;
+						do {
+							bytesRead = binaryReader.Read(array, pos, array.Length - pos);
+							pos += bytesRead;
+						} while (bytesRead > 0);
+						if (pos != array.Length)
+							throw new EndOfStreamException();
+					};
+				}
+			}
+			var fields = GetSerializableFields(type);
+			if (fields.Count == 0) {
+				// The reader has nothing to do for this object.
+				return delegate { };
+			}
+			
+			DynamicMethod dynamicMethod = new DynamicMethod(
+				(isArray ? "ReadArray_" : "Read_") + type.Name,
+				MethodAttributes.Public | MethodAttributes.Static,
+				CallingConventions.Standard,
+				typeof(void), new [] { typeof(DeserializationContext), typeof(object) },
+				type,
+				true);
+			ILGenerator il = dynamicMethod.GetILGenerator();
+			
+			var reader = il.DeclareLocal(typeof(BinaryReader));
+			
+			il.Emit(OpCodes.Ldarg_0);
+			il.Emit(OpCodes.Ldfld, readerField);
+			il.Emit(OpCodes.Stloc, reader); // reader = context.reader;
+			
+			if (isArray) {
+				var instance = il.DeclareLocal(type.MakeArrayType());
+				il.Emit(OpCodes.Ldarg_1);
+				il.Emit(OpCodes.Castclass, type.MakeArrayType());
+				il.Emit(OpCodes.Stloc, instance); // instance = (type[])arg_1;
+				
+				// for (int i = 0; i < instance.Length; i++) read &instance[i];
+				
+				var loopStart = il.DefineLabel();
+				var loopHead = il.DefineLabel();
+				var loopVariable = il.DeclareLocal(typeof(int));
+				il.Emit(OpCodes.Ldc_I4_0);
+				il.Emit(OpCodes.Stloc, loopVariable); // loopVariable = 0
+				il.Emit(OpCodes.Br, loopHead); // goto loopHead;
+				
+				il.MarkLabel(loopStart);
+				
+				if (type.IsEnum || type.IsPrimitive) {
+					if (type.IsEnum) {
+						type = type.GetEnumUnderlyingType();
+					}
+					Debug.Assert(type.IsPrimitive);
+					il.Emit(OpCodes.Ldloc, instance); // instance
+					il.Emit(OpCodes.Ldloc, loopVariable); // instance, loopVariable
+					ReadPrimitiveValue(il, reader, type); // instance, loopVariable, value
+					switch (Type.GetTypeCode(type)) {
+						case TypeCode.Boolean:
+						case TypeCode.SByte:
+						case TypeCode.Byte:
+							il.Emit(OpCodes.Stelem_I1); // instance[loopVariable] = value;
+							break;
+						case TypeCode.Char:
+						case TypeCode.Int16:
+						case TypeCode.UInt16:
+							il.Emit(OpCodes.Stelem_I2); // instance[loopVariable] = value;
+							break;
+						case TypeCode.Int32:
+						case TypeCode.UInt32:
+							il.Emit(OpCodes.Stelem_I4); // instance[loopVariable] = value;
+							break;
+						case TypeCode.Int64:
+						case TypeCode.UInt64:
+							il.Emit(OpCodes.Stelem_I8); // instance[loopVariable] = value;
+							break;
+						case TypeCode.Single:
+							il.Emit(OpCodes.Stelem_R4); // instance[loopVariable] = value;
+							break;
+						case TypeCode.Double:
+							il.Emit(OpCodes.Stelem_R8); // instance[loopVariable] = value;
+							break;
+						default:
+							throw new NotSupportedException("Unknown primitive type " + type);
+					}
+				} else {
+					il.Emit(OpCodes.Ldloc, instance); // instance
+					il.Emit(OpCodes.Ldloc, loopVariable); // instance, loopVariable
+					il.Emit(OpCodes.Ldelema, type); // instance[loopVariable]
+					EmitReadValueType(il, reader, type);
+				}
+				
+				il.Emit(OpCodes.Ldloc, loopVariable); // loopVariable
+				il.Emit(OpCodes.Ldc_I4_1); // loopVariable, 1
+				il.Emit(OpCodes.Add); // loopVariable+1
+				il.Emit(OpCodes.Stloc, loopVariable); // loopVariable++;
+				
+				il.MarkLabel(loopHead);
+				il.Emit(OpCodes.Ldloc, loopVariable); // loopVariable
+				il.Emit(OpCodes.Ldloc, instance); // loopVariable, instance
+				il.Emit(OpCodes.Ldlen); // loopVariable, instance.Length
+				il.Emit(OpCodes.Conv_I4);
+				il.Emit(OpCodes.Blt, loopStart); // if (loopVariable < instance.Length) goto loopStart;
+			} else if (type.IsValueType) {
+				// boxed value type
+				il.Emit(OpCodes.Ldarg_1); // instance
+				il.Emit(OpCodes.Unbox, type); // &(Type)instance
+				if (type.IsEnum || type.IsPrimitive) {
+					if (type.IsEnum) {
+						type = type.GetEnumUnderlyingType();
+					}
+					Debug.Assert(type.IsPrimitive);
+					ReadPrimitiveValue(il, reader, type); // &(Type)instance, value
+					switch (Type.GetTypeCode(type)) {
+						case TypeCode.Boolean:
+						case TypeCode.SByte:
+						case TypeCode.Byte:
+							il.Emit(OpCodes.Stind_I1);
+							break;
+						case TypeCode.Char:
+						case TypeCode.Int16:
+						case TypeCode.UInt16:
+							il.Emit(OpCodes.Stind_I2);
+							break;
+						case TypeCode.Int32:
+						case TypeCode.UInt32:
+							il.Emit(OpCodes.Stind_I4);
+							break;
+						case TypeCode.Int64:
+						case TypeCode.UInt64:
+							il.Emit(OpCodes.Stind_I8);
+							break;
+						case TypeCode.Single:
+							il.Emit(OpCodes.Stind_R4);
+							break;
+						case TypeCode.Double:
+							il.Emit(OpCodes.Stind_R8);
+							break;
+						default:
+							throw new NotSupportedException("Unknown primitive type " + type);
+					}
+				} else {
+					EmitReadValueType(il, reader, type);
+				}
+			} else {
+				// reference type
+				var instance = il.DeclareLocal(type);
+				il.Emit(OpCodes.Ldarg_1);
+				il.Emit(OpCodes.Castclass, type);
+				il.Emit(OpCodes.Stloc, instance); // instance = (type)arg_1;
+				
+				foreach (FieldInfo field in fields) {
+					EmitReadField(il, reader, instance, field); // read instance.Field
+				}
+			}
+			il.Emit(OpCodes.Ret);
+			return (ObjectReader)dynamicMethod.CreateDelegate(typeof(ObjectReader));
+		}
+
+		void EmitReadField(ILGenerator il, LocalBuilder reader, LocalBuilder instance, FieldInfo field)
+		{
+			Type fieldType = field.FieldType;
+			if (fieldType.IsValueType) {
+				if (fieldType.IsPrimitive || fieldType.IsEnum) {
+					il.Emit(OpCodes.Ldloc, instance); // instance
+					ReadPrimitiveValue(il, reader, fieldType); // instance, value
+					il.Emit(OpCodes.Stfld, field); // instance.field = value;
+				} else {
+					il.Emit(OpCodes.Ldloc, instance); // instance
+					il.Emit(OpCodes.Ldflda, field); // &instance.field
+					EmitReadValueType(il, reader, fieldType);
+				}
+			} else {
+				il.Emit(OpCodes.Ldloc, instance); // instance
+				il.Emit(OpCodes.Ldarg_0); // instance, context
+				il.Emit(OpCodes.Call, readObject); // instance, context.ReadObject()
+				il.Emit(OpCodes.Castclass, fieldType);
+				il.Emit(OpCodes.Stfld, field); // instance.field = (fieldType) context.ReadObject();
+			}
+		}
+
+		/// <summary>
+		/// Reads a primitive value of the specified type.
+		/// Stack transition: ... => ..., value
+		/// </summary>
+		void ReadPrimitiveValue(ILGenerator il, LocalBuilder reader, Type fieldType)
+		{
+			if (fieldType.IsEnum) {
+				fieldType = fieldType.GetEnumUnderlyingType();
+				Debug.Assert(fieldType.IsPrimitive);
+			}
+			il.Emit(OpCodes.Ldloc, reader);
+			switch (Type.GetTypeCode(fieldType)) {
+				case TypeCode.Boolean:
+				case TypeCode.SByte:
+				case TypeCode.Byte:
+					il.Emit(callVirt, readByte);
+					break;
+				case TypeCode.Char:
+				case TypeCode.Int16:
+				case TypeCode.UInt16:
+					il.Emit(callVirt, readShort);
+					break;
+				case TypeCode.Int32:
+				case TypeCode.UInt32:
+					il.Emit(callVirt, readInt);
+					break;
+				case TypeCode.Int64:
+				case TypeCode.UInt64:
+					il.Emit(callVirt, readLong);
+					break;
+				case TypeCode.Single:
+					il.Emit(callVirt, readFloat);
+					break;
+				case TypeCode.Double:
+					il.Emit(callVirt, readDouble);
+					break;
+				default:
+					throw new NotSupportedException("Unknown primitive type " + fieldType);
+			}
+		}
+
+		/// <summary>
+		/// Stack transition: ..., field-ref => ...
+		/// </summary>
+		void EmitReadValueType(ILGenerator il, LocalBuilder reader, Type valType)
+		{
+			Debug.Assert(valType.IsValueType);
+			Debug.Assert(!(valType.IsEnum || valType.IsPrimitive));
+			
+			var fieldRef = il.DeclareLocal(valType.MakeByRefType());
+			il.Emit(OpCodes.Stloc, fieldRef);
+			
+			foreach (FieldInfo field in GetSerializableFields(valType)) {
+				EmitReadField(il, reader, fieldRef, field);
+			}
+		}
+		#endregion
+		
+		#region Custom Deserialization
+		struct CustomDeserialization
+		{
+			readonly object instance;
+			readonly SerializationInfo serializationInfo;
+			readonly CustomDeserializationAction action;
+			
+			public CustomDeserialization(object instance, SerializationInfo serializationInfo, CustomDeserializationAction action)
+			{
+				this.instance = instance;
+				this.serializationInfo = serializationInfo;
+				this.action = action;
+			}
+			
+			public void Run(StreamingContext context)
+			{
+				action(instance, serializationInfo, context);
+			}
+		}
+		
+		delegate void CustomDeserializationAction(object instance, SerializationInfo info, StreamingContext context);
+		
+		Dictionary<Type, CustomDeserializationAction> customDeserializationActions = new Dictionary<Type, CustomDeserializationAction>();
+		
+		CustomDeserializationAction GetCustomDeserializationAction(Type type)
+		{
+			CustomDeserializationAction action;
+			if (!customDeserializationActions.TryGetValue(type, out action)) {
+				action = CreateCustomDeserializationAction(type);
+				customDeserializationActions.Add(type, action);
+			}
+			return action;
+		}
+		
+		static CustomDeserializationAction CreateCustomDeserializationAction(Type type)
+		{
+			ConstructorInfo ctor = type.GetConstructor(
+				BindingFlags.DeclaredOnly | BindingFlags.ExactBinding | BindingFlags.Instance
+				| BindingFlags.NonPublic | BindingFlags.Public,
+				null,
+				new Type [] { typeof(SerializationInfo), typeof(StreamingContext) },
+				null);
+			if (ctor == null)
+				throw new SerializationException("Could not find deserialization constructor for " + type.FullName);
+			
+			DynamicMethod dynamicMethod = new DynamicMethod(
+				"CallCtor_" + type.Name,
+				MethodAttributes.Public | MethodAttributes.Static,
+				CallingConventions.Standard,
+				typeof(void), new [] { typeof(object), typeof(SerializationInfo), typeof(StreamingContext) },
+				type,
+				true);
+			ILGenerator il = dynamicMethod.GetILGenerator();
+			il.Emit(OpCodes.Ldarg_0);
+			il.Emit(OpCodes.Ldarg_1);
+			il.Emit(OpCodes.Ldarg_2);
+			il.Emit(OpCodes.Call, ctor);
+			il.Emit(OpCodes.Ret);
+			return (CustomDeserializationAction)dynamicMethod.CreateDelegate(typeof(CustomDeserializationAction));
+		}
+		#endregion
+		#endregion
+		
+		[Conditional("DEBUG_SERIALIZER")]
+		static void Log(string format, params object[] args)
+		{
+			Debug.WriteLine(format, args);
+		}
+	}
+	
+	/// <summary>
+	/// Specifies the version of the class.
+	/// The <see cref="FastSerializer"/> will refuse to deserialize an instance that was stored by
+	/// a different version of the class than the current one.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum)]
+	class FastSerializerVersionAttribute : Attribute
+	{
+		readonly int versionNumber;
+		
+		public FastSerializerVersionAttribute(int versionNumber)
+		{
+			this.versionNumber = versionNumber;
+		}
+		
+		public int VersionNumber {
+			get {
+				return versionNumber;
+			}
+		}
+		
+		internal static int GetVersionNumber(Type type)
+		{
+			var arr = type.GetCustomAttributes(typeof(FastSerializerVersionAttribute), false);
+			if (arr.Length == 0)
+				return 0;
+			else
+				return ((FastSerializerVersionAttribute)arr[0]).VersionNumber;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/FindTokenHelper.cs b/main/src/addins/CSharpBinding/Util/FindTokenHelper.cs
new file mode 100644
index 0000000000..327f990410
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/FindTokenHelper.cs
@@ -0,0 +1,141 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal static class FindTokenHelper
+	{
+		/// <summary>
+		/// If the position is inside of token, return that token; otherwise, return the token to the right.
+		/// </summary>
+		public static SyntaxToken FindTokenOnRightOfPosition<TRoot>(
+			SyntaxNode root,
+			int position,
+			Func<SyntaxTriviaList, int, SyntaxToken> skippedTokenFinder,
+			bool includeSkipped = false,
+			bool includeDirectives = false,
+			bool includeDocumentationComments = false)
+			where TRoot : SyntaxNode
+		{
+			var findSkippedToken = skippedTokenFinder ?? ((l, p) => default(SyntaxToken));
+
+			var token = GetInitialToken<TRoot>(root, position, includeSkipped, includeDirectives, includeDocumentationComments);
+
+			if (position < token.SpanStart)
+			{
+				var skippedToken = findSkippedToken(token.LeadingTrivia, position);
+				token = skippedToken.RawKind != 0 ? skippedToken : token;
+			}
+			else if (token.Span.End <= position)
+			{
+				do
+				{
+					var skippedToken = findSkippedToken(token.TrailingTrivia, position);
+					token = skippedToken.RawKind != 0
+						? skippedToken
+						: token.GetNextToken(includeZeroWidth: false, includeSkipped: includeSkipped, includeDirectives: includeDirectives, includeDocumentationComments: includeDocumentationComments);
+				}
+				while (token.RawKind != 0 && token.Span.End <= position && token.Span.End <= root.FullSpan.End);
+			}
+
+			if (token.Span.Length == 0)
+			{
+				token = token.GetNextToken();
+			}
+
+			return token;
+		}
+
+		/// <summary>
+		/// If the position is inside of token, return that token; otherwise, return the token to the left.
+		/// </summary>
+		public static SyntaxToken FindTokenOnLeftOfPosition<TRoot>(
+			SyntaxNode root,
+			int position,
+			Func<SyntaxTriviaList, int, SyntaxToken> skippedTokenFinder,
+			bool includeSkipped = false,
+			bool includeDirectives = false,
+			bool includeDocumentationComments = false)
+			where TRoot : SyntaxNode
+		{
+			var findSkippedToken = skippedTokenFinder ?? ((l, p) => default(SyntaxToken));
+
+			var token = GetInitialToken<TRoot>(root, position, includeSkipped, includeDirectives, includeDocumentationComments);
+
+			if (position <= token.SpanStart)
+			{
+				do
+				{
+					var skippedToken = findSkippedToken(token.LeadingTrivia, position);
+					token = skippedToken.RawKind != 0
+						? skippedToken
+						: token.GetPreviousToken(includeZeroWidth: false, includeSkipped: includeSkipped, includeDirectives: includeDirectives, includeDocumentationComments: includeDocumentationComments);
+				}
+				while (position <= token.SpanStart && root.FullSpan.Start < token.SpanStart);
+			}
+			else if (token.Span.End < position)
+			{
+				var skippedToken = findSkippedToken(token.TrailingTrivia, position);
+				token = skippedToken.RawKind != 0 ? skippedToken : token;
+			}
+
+			if (token.Span.Length == 0)
+			{
+				token = token.GetPreviousToken();
+			}
+
+			return token;
+		}
+
+		private static SyntaxToken GetInitialToken<TRoot>(
+			SyntaxNode root,
+			int position,
+			bool includeSkipped = false,
+			bool includeDirectives = false,
+			bool includeDocumentationComments = false)
+			where TRoot : SyntaxNode
+		{
+			var token = (position < root.FullSpan.End || !(root is TRoot))
+				? root.FindToken(position, includeSkipped || includeDirectives || includeDocumentationComments)
+				: root.GetLastToken(includeZeroWidth: true, includeSkipped: true, includeDirectives: true, includeDocumentationComments: true)
+				.GetPreviousToken(includeZeroWidth: false, includeSkipped: includeSkipped, includeDirectives: includeDirectives, includeDocumentationComments: includeDocumentationComments);
+			return token;
+		}
+
+		/// <summary>
+		/// Look inside a trivia list for a skipped token that contains the given position.
+		/// </summary>
+		public static SyntaxToken FindSkippedTokenBackward(IEnumerable<SyntaxToken> skippedTokenList, int position)
+		{
+			// the given skipped token list is already in order
+			var skippedTokenContainingPosition = skippedTokenList.LastOrDefault(skipped => skipped.Span.Length > 0 && skipped.SpanStart <= position);
+			if (skippedTokenContainingPosition != default(SyntaxToken))
+			{
+				return skippedTokenContainingPosition;
+			}
+
+			return default(SyntaxToken);
+		}
+
+		/// <summary>
+		/// Look inside a trivia list for a skipped token that contains the given position.
+		/// </summary>
+		public static SyntaxToken FindSkippedTokenForward(IEnumerable<SyntaxToken> skippedTokenList, int position)
+		{
+			// the given token list is already in order
+			var skippedTokenContainingPosition = skippedTokenList.FirstOrDefault(skipped => skipped.Span.Length > 0 && position <= skipped.Span.End);
+			if (skippedTokenContainingPosition != default(SyntaxToken))
+			{
+				return skippedTokenContainingPosition;
+			}
+
+			return default(SyntaxToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/FormatStringHelper.cs b/main/src/addins/CSharpBinding/Util/FormatStringHelper.cs
new file mode 100644
index 0000000000..563525da3e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/FormatStringHelper.cs
@@ -0,0 +1,98 @@
+//
+// FormatStringHelper.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Threading;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class FormatStringHelper
+	{
+		static readonly string[] parameterNames = { "format", "frmt", "fmt" };
+		
+		public static bool TryGetFormattingParameters(
+			SemanticModel semanticModel,
+			InvocationExpressionSyntax invocationExpression,
+		    out ExpressionSyntax formatArgument, out IList<ExpressionSyntax> arguments,
+			Func<IParameterSymbol, ExpressionSyntax, bool> argumentFilter,
+			CancellationToken cancellationToken = default (CancellationToken))
+		{
+			if (semanticModel == null)
+				throw new ArgumentNullException("semanticModel");
+			if (invocationExpression == null)
+				throw new ArgumentNullException("invocationExpression");
+			var symbolInfo = semanticModel.GetSymbolInfo(invocationExpression.Expression, cancellationToken);
+			if (argumentFilter == null)
+				argumentFilter = (p, e) => true;
+			
+			var symbol = symbolInfo.Symbol;
+			formatArgument = null;
+			arguments = new List<ExpressionSyntax>();
+			var method = symbol as IMethodSymbol;
+
+			if (method == null || method.Kind != SymbolKind.Method)
+				return false;
+
+			// Serach for method of type: void Name(string format, params object[] args);
+			IList<IMethodSymbol> methods = method.ContainingType.GetMembers (method.Name).OfType<IMethodSymbol>().ToList();
+			if (!methods.Any(m => m.Parameters.Length == 2 && 
+				m.Parameters[0].Type.SpecialType == SpecialType.System_String && parameterNames.Contains(m.Parameters[0].Name) && 
+				m.Parameters[1].IsParams))
+				return false;
+
+			//var argumentToParameterMap = invocationResolveResult.GetArgumentToParameterMap();
+			//var resolvedParameters = invocationResolveResult.Member.Parameters;
+			var allArguments = invocationExpression.ArgumentList.Arguments.ToArray();
+			for (int i = 0; i < allArguments.Length; i++) {
+				var parameterIndex = i; //argumentToParameterMap[i];
+				if (parameterIndex < 0 || parameterIndex >= method.Parameters.Length) {
+					// No valid mapping for this argument, skip it
+					continue;
+				}
+				var parameter = method.Parameters[parameterIndex];
+				var argument = allArguments[i];
+				if (i == 0 && parameter.Type.SpecialType == SpecialType.System_String && parameterNames.Contains(parameter.Name)) {
+					formatArgument = argument.Expression;
+				} /*else if (formatArgument != null && parameter.IsParams && !invocationResolveResult.IsExpandedForm) {
+					var ace = argument as ArrayCreateExpression;
+					if (ace == null || ace.Initializer.IsNull)
+						return false;
+					foreach (var element in ace.Initializer.Elements) {
+						if (argumentFilter(parameter, element))
+							arguments.Add(argument);
+					}
+				} else*/ if (formatArgument != null && argumentFilter(parameter, argument.Expression)) {
+					arguments.Add(argument.Expression);
+				}
+			}
+			return formatArgument != null;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/GeneratedCodeRecognitionService.cs b/main/src/addins/CSharpBinding/Util/GeneratedCodeRecognitionService.cs
new file mode 100644
index 0000000000..7bae6c2031
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/GeneratedCodeRecognitionService.cs
@@ -0,0 +1,92 @@
+//
+// GeneratedCodeRecognitionService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.IO;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class GeneratedCodeRecognitionService
+	{
+		public static bool IsFileNameForGeneratedCode(string fileName)
+		{
+			if (fileName.StartsWith("TemporaryGeneratedFile_", StringComparison.OrdinalIgnoreCase))
+			{
+				return true;
+			}
+
+			string extension = Path.GetExtension(fileName);
+			if (extension != string.Empty)
+			{
+				fileName = Path.GetFileNameWithoutExtension(fileName);
+
+				if (fileName.EndsWith("AssemblyInfo", StringComparison.OrdinalIgnoreCase) ||
+					fileName.EndsWith(".designer", StringComparison.OrdinalIgnoreCase) ||
+					fileName.EndsWith(".generated", StringComparison.OrdinalIgnoreCase) ||
+					fileName.EndsWith(".g", StringComparison.OrdinalIgnoreCase) ||
+					fileName.EndsWith(".g.i", StringComparison.OrdinalIgnoreCase) ||
+					fileName.EndsWith(".AssemblyAttributes", StringComparison.OrdinalIgnoreCase))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		private static IEnumerable<Location> GetPreferredSourceLocations(ISymbol symbol)
+		{
+			var locations = symbol.Locations;
+
+			// First return visible source locations if we have them.  Else, go to the non-visible 
+			// source locations.  
+			var visibleSourceLocations = locations.Where(loc => loc.IsVisibleSourceLocation());
+			return visibleSourceLocations.Any()
+				? visibleSourceLocations
+					: locations.Where(loc => loc.IsInSource);
+		}
+
+		public static IEnumerable<Location> GetPreferredSourceLocations(Solution solution, ISymbol symbol)
+		{
+			// Prefer non-generated source locations over generated ones.
+
+			var sourceLocations = GetPreferredSourceLocations(symbol);
+
+			var candidateLocationGroups = from c in sourceLocations
+				let doc = solution.GetDocument(c.SourceTree)
+					where doc != null
+				group c by IsFileNameForGeneratedCode(doc.FilePath);
+
+			var generatedSourceLocations = candidateLocationGroups.SingleOrDefault(g => g.Key) ?? SpecializedCollections.EmptyEnumerable<Location>();
+			var nonGeneratedSourceLocations = candidateLocationGroups.SingleOrDefault(g => !g.Key) ?? SpecializedCollections.EmptyEnumerable<Location>();
+
+			return nonGeneratedSourceLocations.Any() ? nonGeneratedSourceLocations : generatedSourceLocations;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/Glyph.cs b/main/src/addins/CSharpBinding/Util/Glyph.cs
new file mode 100644
index 0000000000..912aa81f84
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/Glyph.cs
@@ -0,0 +1,130 @@
+//
+// Glyph.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal enum Glyph
+	{
+		Assembly,
+
+		BasicFile,
+		BasicProject,
+
+		ClassPublic,
+		ClassProtected,
+		ClassPrivate,
+		ClassInternal,
+
+		CSharpFile,
+		CSharpProject,
+
+		ConstantPublic,
+		ConstantProtected,
+		ConstantPrivate,
+		ConstantInternal,
+
+		DelegatePublic,
+		DelegateProtected,
+		DelegatePrivate,
+		DelegateInternal,
+
+		EnumPublic,
+		EnumProtected,
+		EnumPrivate,
+		EnumInternal,
+
+		EnumMember,
+
+		Error,
+
+		EventPublic,
+		EventProtected,
+		EventPrivate,
+		EventInternal,
+
+		ExtensionMethodPublic,
+		ExtensionMethodProtected,
+		ExtensionMethodPrivate,
+		ExtensionMethodInternal,
+
+		FieldPublic,
+		FieldProtected,
+		FieldPrivate,
+		FieldInternal,
+
+		InterfacePublic,
+		InterfaceProtected,
+		InterfacePrivate,
+		InterfaceInternal,
+
+		Intrinsic,
+
+		Keyword,
+
+		Label,
+
+		Local,
+
+		Namespace,
+
+		MethodPublic,
+		MethodProtected,
+		MethodPrivate,
+		MethodInternal,
+
+		ModulePublic,
+		ModuleProtected,
+		ModulePrivate,
+		ModuleInternal,
+
+		OpenFolder,
+
+		Operator,
+
+		Parameter,
+
+		PropertyPublic,
+		PropertyProtected,
+		PropertyPrivate,
+		PropertyInternal,
+
+		RangeVariable,
+
+		Reference,
+
+		StructurePublic,
+		StructureProtected,
+		StructurePrivate,
+		StructureInternal,
+
+		TypeParameter,
+
+		Snippet,
+
+		CompletionWarning
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/Hash.cs b/main/src/addins/CSharpBinding/Util/Hash.cs
new file mode 100644
index 0000000000..e6a2fa4ef0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/Hash.cs
@@ -0,0 +1,350 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class Hash
+	{
+		/// <summary>
+		/// This is how VB Anonymous Types combine hash values for fields.
+		/// </summary>
+		internal static int Combine(int newKey, int currentKey)
+		{
+			return unchecked((currentKey * (int)0xA5555529) + newKey);
+		}
+
+		internal static int Combine(bool newKeyPart, int currentKey)
+		{
+			return Combine(currentKey, newKeyPart ? 1 : 0);
+		}
+
+		/// <summary>
+		/// This is how VB Anonymous Types combine hash values for fields.
+		/// PERF: Do not use with enum types because that involves multiple
+		/// unnecessary boxing operations.  Unfortunately, we can't constrain
+		/// T to "non-enum", so we'll use a more restrictive constraint.
+		/// </summary>
+		internal static int Combine<T>(T newKeyPart, int currentKey) where T : class
+		{
+			int hash = unchecked(currentKey * (int)0xA5555529);
+
+			if (newKeyPart != null)
+			{
+				return unchecked(hash + newKeyPart.GetHashCode());
+			}
+
+			return hash;
+		}
+
+		internal static int CombineValues<T>(IEnumerable<T> values, int maxItemsToHash = int.MaxValue)
+		{
+			if (values == null)
+			{
+				return 0;
+			}
+
+			var hashCode = 0;
+			var count = 0;
+			foreach (var value in values)
+			{
+				if (count++ >= maxItemsToHash)
+				{
+					break;
+				}
+
+				// Should end up with a constrained virtual call to object.GetHashCode (i.e. avoid boxing where possible).
+				if (value != null)
+				{
+					hashCode = Hash.Combine(value.GetHashCode(), hashCode);
+				}
+			}
+
+			return hashCode;
+		}
+
+		internal static int CombineValues<T>(T[] values, int maxItemsToHash = int.MaxValue)
+		{
+			if (values == null)
+			{
+				return 0;
+			}
+
+			var maxSize = Math.Min(maxItemsToHash, values.Length);
+			var hashCode = 0;
+
+			for (int i = 0; i < maxSize; i++)
+			{
+				T value = values[i];
+
+				// Should end up with a constrained virtual call to object.GetHashCode (i.e. avoid boxing where possible).
+				if (value != null)
+				{
+					hashCode = Hash.Combine(value.GetHashCode(), hashCode);
+				}
+			}
+
+			return hashCode;
+		}
+
+		internal static int CombineValues<T>(ImmutableArray<T> values, int maxItemsToHash = int.MaxValue)
+		{
+			if (values.IsDefaultOrEmpty)
+			{
+				return 0;
+			}
+
+			var hashCode = 0;
+			var count = 0;
+			foreach (var value in values)
+			{
+				if (count++ >= maxItemsToHash)
+				{
+					break;
+				}
+
+				// Should end up with a constrained virtual call to object.GetHashCode (i.e. avoid boxing where possible).
+				if (value != null)
+				{
+					hashCode = Hash.Combine(value.GetHashCode(), hashCode);
+				}
+			}
+
+			return hashCode;
+		}
+
+		internal static int CombineValues(IEnumerable<string> values, StringComparer stringComparer, int maxItemsToHash = int.MaxValue)
+		{
+			if (values == null)
+			{
+				return 0;
+			}
+
+			var hashCode = 0;
+			var count = 0;
+			foreach (var value in values)
+			{
+				if (count++ >= maxItemsToHash)
+				{
+					break;
+				}
+
+				if (value != null)
+				{
+					hashCode = Hash.Combine(stringComparer.GetHashCode(value), hashCode);
+				}
+			}
+
+			return hashCode;
+		}
+
+		/// <summary>
+		/// The offset bias value used in the FNV-1a algorithm
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		internal const int FnvOffsetBias = unchecked((int)2166136261);
+
+		/// <summary>
+		/// The generative factor used in the FNV-1a algorithm
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		internal const int FnvPrime = 16777619;
+
+		/// <summary>
+		/// Compute the FNV-1a hash of a sequence of bytes
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		/// <param name="data">The sequence of bytes</param>
+		/// <returns>The FNV-1a hash of <paramref name="data"/></returns>
+		internal static int GetFNVHashCode(byte[] data)
+		{
+			int hashCode = Hash.FnvOffsetBias;
+
+			for (int i = 0; i < data.Length; i++)
+			{
+				hashCode = unchecked((hashCode ^ data[i]) * Hash.FnvPrime);
+			}
+
+			return hashCode;
+		}
+
+		/// <summary>
+		/// Compute the FNV-1a hash of a sequence of bytes and determines if the byte
+		/// sequence is valid ASCII and hence the hash code matches a char sequence
+		/// encoding the same text.
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		/// <param name="data">The sequence of bytes that are likely to be ASCII text.</param>
+		/// <param name="length">The length of the sequence.</param>
+		/// <param name="isAscii">True if the sequence contains only characters in the ASCII range.</param>
+		/// <returns>The FNV-1a hash of <paramref name="data"/></returns>
+		internal static unsafe int GetFNVHashCode(byte* data, int length, out bool isAscii)
+		{
+			int hashCode = Hash.FnvOffsetBias;
+
+			byte asciiMask = 0;
+
+			for (int i = 0; i < length; i++)
+			{
+				byte b = data[i];
+				asciiMask |= b;
+				hashCode = unchecked((hashCode ^ b) * Hash.FnvPrime);
+			}
+
+			isAscii = (asciiMask & 0x80) == 0;
+			return hashCode;
+		}
+
+		/// <summary>
+		/// Compute the FNV-1a hash of a sequence of bytes
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		/// <param name="data">The sequence of bytes</param>
+		/// <returns>The FNV-1a hash of <paramref name="data"/></returns>
+		internal static int GetFNVHashCode(ImmutableArray<byte> data)
+		{
+			int hashCode = Hash.FnvOffsetBias;
+
+			for (int i = 0; i < data.Length; i++)
+			{
+				hashCode = unchecked((hashCode ^ data[i]) * Hash.FnvPrime);
+			}
+
+			return hashCode;
+		}
+
+		/// <summary>
+		/// Compute the hashcode of a sub-string using FNV-1a
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// Note: FNV-1a was developed and tuned for 8-bit sequences. We're using it here
+		/// for 16-bit Unicode chars on the understanding that the majority of chars will
+		/// fit into 8-bits and, therefore, the algorithm will retain its desirable traits
+		/// for generating hash codes.
+		/// </summary>
+		/// <param name="text">The input string</param>
+		/// <param name="start">The start index of the first character to hash</param>
+		/// <param name="length">The number of characters, beginning with <paramref name="start"/> to hash</param>
+		/// <returns>The FNV-1a hash code of the substring beginning at <paramref name="start"/> and ending after <paramref name="length"/> characters.</returns>
+		internal static int GetFNVHashCode(string text, int start, int length)
+		{
+			int hashCode = Hash.FnvOffsetBias;
+			int end = start + length;
+
+			for (int i = start; i < end; i++)
+			{
+				hashCode = unchecked((hashCode ^ text[i]) * Hash.FnvPrime);
+			}
+
+			return hashCode;
+		}
+
+		/// <summary>
+		/// Compute the hashcode of a sub-string using FNV-1a
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		/// <param name="text">The input string</param>
+		/// <param name="start">The start index of the first character to hash</param>
+		/// <returns>The FNV-1a hash code of the substring beginning at <paramref name="start"/> and ending at the end of the string.</returns>
+		internal static int GetFNVHashCode(string text, int start)
+		{
+			return GetFNVHashCode(text, start, length: text.Length - start);
+		}
+
+		/// <summary>
+		/// Compute the hashcode of a string using FNV-1a
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		/// <param name="text">The input string</param>
+		/// <returns>The FNV-1a hash code of <paramref name="text"/></returns>
+		internal static int GetFNVHashCode(string text)
+		{
+			return CombineFNVHash(Hash.FnvOffsetBias, text);
+		}
+
+		/// <summary>
+		/// Compute the hashcode of a string using FNV-1a
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		/// <param name="text">The input string</param>
+		/// <returns>The FNV-1a hash code of <paramref name="text"/></returns>
+		internal static int GetFNVHashCode(System.Text.StringBuilder text)
+		{
+			int hashCode = Hash.FnvOffsetBias;
+			int end = text.Length;
+
+			for (int i = 0; i < end; i++)
+			{
+				hashCode = unchecked((hashCode ^ text[i]) * Hash.FnvPrime);
+			}
+
+			return hashCode;
+		}
+
+		/// <summary>
+		/// Compute the hashcode of a sub string using FNV-1a
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		/// <param name="text">The input string as a char array</param>
+		/// <param name="start">The start index of the first character to hash</param>
+		/// <param name="length">The number of characters, beginning with <paramref name="start"/> to hash</param>
+		/// <returns>The FNV-1a hash code of the substring beginning at <paramref name="start"/> and ending after <paramref name="length"/> characters.</returns>
+		internal static int GetFNVHashCode(char[] text, int start, int length)
+		{
+			int hashCode = Hash.FnvOffsetBias;
+			int end = start + length;
+
+			for (int i = start; i < end; i++)
+			{
+				hashCode = unchecked((hashCode ^ text[i]) * Hash.FnvPrime);
+			}
+
+			return hashCode;
+		}
+
+		/// <summary>
+		/// Compute the hashcode of a single character using the FNV-1a algorithm
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// Note: In general, this isn't any more useful than "char.GetHashCode". However,
+		/// it may be needed if you need to generate the same hash code as a string or
+		/// substring with just a single character.
+		/// </summary>
+		/// <param name="ch">The character to hash</param>
+		/// <returns>The FNV-1a hash code of the character.</returns>
+		internal static int GetFNVHashCode(char ch)
+		{
+			return Hash.CombineFNVHash(Hash.FnvOffsetBias, ch);
+		}
+
+		/// <summary>
+		/// Combine a string with an existing FNV-1a hash code
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		/// <param name="hashCode">The accumulated hash code</param>
+		/// <param name="text">The string to combine</param>
+		/// <returns>The result of combining <paramref name="hashCode"/> with <paramref name="text"/> using the FNV-1a algorithm</returns>
+		internal static int CombineFNVHash(int hashCode, string text)
+		{
+			foreach (char ch in text)
+			{
+				hashCode = unchecked((hashCode ^ ch) * Hash.FnvPrime);
+			}
+
+			return hashCode;
+		}
+
+		/// <summary>
+		/// Combine a char with an existing FNV-1a hash code
+		/// See http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
+		/// </summary>
+		/// <param name="hashCode">The accumulated hash code</param>
+		/// <param name="ch">The new character to combine</param>
+		/// <returns>The result of combining <paramref name="hashCode"/> with <paramref name="ch"/> using the FNV-1a algorithm</returns>
+		internal static int CombineFNVHash(int hashCode, char ch)
+		{
+			return unchecked((hashCode ^ ch) * Hash.FnvPrime);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/HelpLink.cs b/main/src/addins/CSharpBinding/Util/HelpLink.cs
new file mode 100644
index 0000000000..6800e8c384
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/HelpLink.cs
@@ -0,0 +1,38 @@
+//
+// HelpLink.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class HelpLink
+	{
+		internal static string CreateFor (string diagnosticId)
+		{
+			return NRefactory6Host.GetHelpLinkForDiagnostic (diagnosticId);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/Util/IAssemblySymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/IAssemblySymbolExtensions.cs
new file mode 100644
index 0000000000..7b5b2e1efe
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/IAssemblySymbolExtensions.cs
@@ -0,0 +1,84 @@
+//
+// IAssemblySymbolExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class IAssemblySymbolExtensions
+	{
+		private const string AttributeSuffix = "Attribute";
+
+		public static bool ContainsNamespaceName(
+			this List<IAssemblySymbol> assemblies,
+			string namespaceName)
+		{
+			// PERF: Expansion of "assemblies.Any(a => a.NamespaceNames.Contains(namespaceName))"
+			// to avoid allocating a lambda.
+			foreach (var a in assemblies)
+			{
+				if (a.NamespaceNames.Contains(namespaceName))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool ContainsTypeName(this List<IAssemblySymbol> assemblies, string typeName, bool tryWithAttributeSuffix = false)
+		{
+			if (!tryWithAttributeSuffix)
+			{
+				// PERF: Expansion of "assemblies.Any(a => a.TypeNames.Contains(typeName))"
+				// to avoid allocating a lambda.
+				foreach (var a in assemblies)
+				{
+					if (a.TypeNames.Contains(typeName))
+					{
+						return true;
+					}
+				}
+			}
+			else
+			{
+				var attributeName = typeName + AttributeSuffix;
+				foreach (var a in assemblies)
+				{
+					var typeNames = a.TypeNames;
+					if (typeNames.Contains(typeName) || typeNames.Contains(attributeName))
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/ICodeDefinitionFactoryExtensions.cs b/main/src/addins/CSharpBinding/Util/ICodeDefinitionFactoryExtensions.cs
new file mode 100644
index 0000000000..781c4aecaa
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ICodeDefinitionFactoryExtensions.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Reflection;
+using System.Threading;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editing;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Runtime.ExceptionServices;
+
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class ICodeDefinitionFactoryExtensions
+	{
+		readonly static Type typeInfo;
+
+		static ICodeDefinitionFactoryExtensions ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.Shared.Extensions.ICodeDefinitionFactoryExtensions" + ReflectionNamespaces.WorkspacesAsmName, true);
+			createFieldDelegatingConstructorMethod = typeInfo.GetMethod ("CreateFieldDelegatingConstructor", BindingFlags.Static | BindingFlags.Public);
+			createFieldsForParametersMethod = typeInfo.GetMethod ("CreateFieldsForParameters", BindingFlags.Static | BindingFlags.Public);
+			createAssignmentStatementMethod = typeInfo.GetMethod ("CreateAssignmentStatements", BindingFlags.Static | BindingFlags.Public);
+			createThrowNotImplementStatementMethod = typeInfo.GetMethod ("CreateThrowNotImplementStatement", new [] { typeof (SyntaxGenerator), typeof(Compilation) });
+
+		}
+
+		public static IList<SyntaxNode> CreateThrowNotImplementedStatementBlock(
+			this SyntaxGenerator codeDefinitionFactory,
+			Compilation compilation)
+		{
+			return new[] { CreateThrowNotImplementStatement(codeDefinitionFactory, compilation) };
+		}
+
+
+		static MethodInfo createThrowNotImplementStatementMethod;
+		public static SyntaxNode CreateThrowNotImplementStatement(
+			this SyntaxGenerator codeDefinitionFactory,
+			Compilation compilation)
+		{
+			try {
+				return (SyntaxNode)createThrowNotImplementStatementMethod.Invoke (null, new object[] { codeDefinitionFactory, compilation });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		readonly static MethodInfo createFieldDelegatingConstructorMethod;
+
+		public static IEnumerable<ISymbol> CreateFieldDelegatingConstructor(
+			this SyntaxGenerator factory,
+			string typeName,
+			INamedTypeSymbol containingTypeOpt,
+			IList<IParameterSymbol> parameters,
+			IDictionary<string, ISymbol> parameterToExistingFieldMap,
+			IDictionary<string, string> parameterToNewFieldMap,
+			CancellationToken cancellationToken)
+		{
+			try {
+				return (IEnumerable<ISymbol>)createFieldDelegatingConstructorMethod.Invoke (null, new object[] {
+					factory,
+					typeName,
+					containingTypeOpt,
+					parameters,
+					parameterToExistingFieldMap,
+					parameterToNewFieldMap,
+					cancellationToken 
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		readonly static MethodInfo createFieldsForParametersMethod;
+
+		public static IEnumerable<IFieldSymbol> CreateFieldsForParameters(
+			this SyntaxGenerator factory,
+			IList<IParameterSymbol> parameters,
+			IDictionary<string, string> parameterToNewFieldMap)
+		{
+			try {
+				return (IEnumerable<IFieldSymbol>)createFieldsForParametersMethod.Invoke (null, new object[] {
+					factory,
+					parameters,
+					parameterToNewFieldMap 
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		readonly static MethodInfo createAssignmentStatementMethod;
+	
+		public static IEnumerable<SyntaxNode> CreateAssignmentStatements(
+			this SyntaxGenerator factory,
+			IList<IParameterSymbol> parameters,
+			IDictionary<string, ISymbol> parameterToExistingFieldMap,
+			IDictionary<string, string> parameterToNewFieldMap)
+		{
+			try {
+				return (IEnumerable<SyntaxNode>)createAssignmentStatementMethod.Invoke (null, new object[] {
+					factory,
+					parameters,
+					parameterToExistingFieldMap,
+					parameterToNewFieldMap 
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public static IList<SyntaxNode> CreateArguments(
+			this SyntaxGenerator factory,
+			ImmutableArray<IParameterSymbol> parameters)
+		{
+			return parameters.Select(p => CreateArgument(factory, p)).ToList();
+		}
+
+		private static SyntaxNode CreateArgument(
+			this SyntaxGenerator factory,
+			IParameterSymbol parameter)
+		{
+			return factory.Argument(parameter.RefKind, factory.IdentifierName(parameter.Name));
+		}
+
+		public static IMethodSymbol CreateBaseDelegatingConstructor(
+			this SyntaxGenerator factory,
+			IMethodSymbol constructor,
+			string typeName)
+		{
+			return CodeGenerationSymbolFactory.CreateConstructorSymbol(
+				attributes: null,
+				accessibility: Accessibility.Public,
+				modifiers: new DeclarationModifiers(),
+				typeName: typeName,
+				parameters: constructor.Parameters,
+				statements: null,
+				baseConstructorArguments: constructor.Parameters.Length == 0 ? null : factory.CreateArguments(constructor.Parameters));
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ICompilationExtensions.cs b/main/src/addins/CSharpBinding/Util/ICompilationExtensions.cs
new file mode 100644
index 0000000000..28d70bbea1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ICompilationExtensions.cs
@@ -0,0 +1,124 @@
+//
+// ICompilationExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class ICompilationExtensions
+	{
+		public static INamedTypeSymbol AttributeType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Attribute");
+		}
+
+		public static INamedTypeSymbol ExceptionType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Exception");
+		}
+
+		public static INamedTypeSymbol DesignerCategoryAttributeType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.ComponentModel.DesignerCategoryAttribute");
+		}
+
+		public static INamedTypeSymbol DesignerGeneratedAttributeType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("Microsoft.VisualBasic.CompilerServices.DesignerGeneratedAttribute");
+		}
+
+		public static INamedTypeSymbol HideModuleNameAttribute(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("Microsoft.VisualBasic.HideModuleNameAttribute");
+		}
+
+		public static INamedTypeSymbol EventArgsType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.EventArgs");
+		}
+
+		public static INamedTypeSymbol NotImplementedExceptionType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.NotImplementedException");
+		}
+
+		public static INamedTypeSymbol EqualityComparerOfTType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Collections.Generic.EqualityComparer`1");
+		}
+
+		public static INamedTypeSymbol ActionType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Action");
+		}
+
+		public static INamedTypeSymbol ExpressionOfTType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Linq.Expressions.Expression`1");
+		}
+
+		public static INamedTypeSymbol EditorBrowsableAttributeType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.ComponentModel.EditorBrowsableAttribute");
+		}
+
+		public static INamedTypeSymbol EditorBrowsableStateType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.ComponentModel.EditorBrowsableState");
+		}
+
+		public static INamedTypeSymbol TaskType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Threading.Tasks.Task");
+		}
+
+		public static INamedTypeSymbol TaskOfTType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Threading.Tasks.Task`1");
+		}
+
+		public static INamedTypeSymbol SerializableAttributeType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.SerializableAttribute");
+		}
+
+		public static INamedTypeSymbol CoClassType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Runtime.InteropServices.CoClassAttribute");
+		}
+
+		public static INamedTypeSymbol ComAliasNameAttributeType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Runtime.InteropServices.ComAliasNameAttribute");
+		}
+
+		public static INamedTypeSymbol SuppressMessageAttributeType(this Compilation compilation)
+		{
+			return compilation.GetTypeByMetadataName("System.Diagnostics.CodeAnalysis.SuppressMessageAttribute");
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/IDictionaryExtensions.cs b/main/src/addins/CSharpBinding/Util/IDictionaryExtensions.cs
new file mode 100644
index 0000000000..264f8b85f0
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/IDictionaryExtensions.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class IDictionaryExtensions
+	{
+		// Copied from ConcurrentDictionary since IDictionary doesn't have this useful method
+		public static V GetOrAdd<K, V>(this IDictionary<K, V> dictionary, K key, Func<K, V> function)
+		{
+			V value;
+			if (!dictionary.TryGetValue(key, out value))
+			{
+				value = function(key);
+				dictionary.Add(key, value);
+			}
+
+			return value;
+		}
+
+		public static TValue GetValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)
+		{
+			TValue value;
+			if (dictionary.TryGetValue(key, out value))
+			{
+				return value;
+			}
+
+			return default(TValue);
+		}
+
+		public static bool DictionaryEquals<K, V>(this IDictionary<K, V> left, IDictionary<K, V> right, IEqualityComparer<KeyValuePair<K, V>> comparer = null)
+		{
+			comparer = comparer ?? EqualityComparer<KeyValuePair<K, V>>.Default;
+
+			// two dictionaries should have same number of entries
+			if (left.Count != right.Count)
+			{
+				return false;
+			}
+
+			// check two dictionaries have same key/value pairs
+			return left.All(pair => comparer.Equals(pair));
+		}
+
+		public static void MultiAdd<TKey, TValue, TCollection>(this IDictionary<TKey, TCollection> dictionary, TKey key, TValue value)
+			where TCollection : ICollection<TValue>, new()
+		{
+			TCollection collection;
+			if (!dictionary.TryGetValue(key, out collection))
+			{
+				collection = new TCollection();
+				dictionary.Add(key, collection);
+			}
+
+			collection.Add(value);
+		}
+
+		public static void MultiRemove<TKey, TValue, TCollection>(this IDictionary<TKey, TCollection> dictionary, TKey key, TValue value)
+			where TCollection : ICollection<TValue>
+		{
+			TCollection collection;
+			if (dictionary.TryGetValue(key, out collection))
+			{
+				collection.Remove(value);
+
+				if (collection.Count == 0)
+				{
+					dictionary.Remove(key);
+				}
+			}
+		}
+
+		public static void MultiAddRange<TKey, TValue, TCollection>(this IDictionary<TKey, TCollection> dictionary, TKey key, IEnumerable<TValue> values)
+			where TCollection : ICollection<TValue>, new()
+		{
+			TCollection collection;
+			if (!dictionary.TryGetValue(key, out collection))
+			{
+				collection = new TCollection();
+				dictionary.Add(key, collection);
+			}
+			foreach (var val in values)
+				collection.Add (val);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/IDocumentExtensions.cs b/main/src/addins/CSharpBinding/Util/IDocumentExtensions.cs
new file mode 100644
index 0000000000..00e100ee8e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/IDocumentExtensions.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class IDocumentExtensions
+	{
+		public static async Task<CompilationUnitSyntax> GetCSharpSyntaxRootAsync(this Document document, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			return (CompilationUnitSyntax)root;
+		}
+
+		public static Task<SyntaxTree> GetCSharpSyntaxTreeAsync(this Document document, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return document.GetSyntaxTreeAsync(cancellationToken);
+		}
+
+		public static Task<SemanticModel> GetCSharpSemanticModelAsync(this Document document, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return document.GetSemanticModelAsync(cancellationToken);
+		}
+
+		public static Task<SemanticModel> GetCSharpSemanticModelForNodeAsync(this Document document, SyntaxNode node, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return document.GetSemanticModelForNodeAsync(node, cancellationToken);
+		}
+
+		public static Task<SemanticModel> GetCSharpSemanticModelForSpanAsync(this Document document, TextSpan span, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return document.GetSemanticModelForSpanAsync(span, cancellationToken);
+		}
+
+		public static Task<Compilation> GetCSharpCompilationAsync(this Document document, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			return document.Project.GetCompilationAsync(cancellationToken);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/IMethodSymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/IMethodSymbolExtensions.cs
new file mode 100644
index 0000000000..cdb3788d4f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/IMethodSymbolExtensions.cs
@@ -0,0 +1,325 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Roslyn.Utilities;
+using System.Reflection;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class IMethodSymbolExtensions
+	{
+//		public static bool CompatibleSignatureToDelegate(this IMethodSymbol method, INamedTypeSymbol delegateType)
+//		{
+//			//Contract.ThrowIfFalse(delegateType.TypeKind == TypeKind.Delegate);
+//
+//			var invoke = delegateType.DelegateInvokeMethod;
+//			if (invoke == null)
+//			{
+//				// It's possible to get events with no invoke method from metadata.  We will assume
+//				// that no method can be an event handler for one.
+//				return false;
+//			}
+//
+//			if (method.Parameters.Length != invoke.Parameters.Length)
+//			{
+//				return false;
+//			}
+//
+//			if (method.ReturnsVoid != invoke.ReturnsVoid)
+//			{
+//				return false;
+//			}
+//
+//			if (!method.ReturnType.InheritsFromOrEquals(invoke.ReturnType))
+//			{
+//				return false;
+//			}
+//
+//			for (int i = 0; i < method.Parameters.Length; i++)
+//			{
+//				if (!invoke.Parameters[i].Type.InheritsFromOrEquals(method.Parameters[i].Type))
+//				{
+//					return false;
+//				}
+//			}
+//
+//			return true;
+//		}
+//
+		public static IMethodSymbol RenameTypeParameters(this IMethodSymbol method, IList<string> newNames)
+		{
+			if (method.TypeParameters.Select(t => t.Name).SequenceEqual(newNames))
+			{
+				return method;
+			}
+
+			var typeGenerator = new TypeGenerator();
+			var updatedTypeParameters = RenameTypeParameters(
+				method.TypeParameters, newNames, typeGenerator);
+
+			var mapping = new Dictionary<ITypeSymbol, ITypeSymbol>();
+			for (int i = 0; i < method.TypeParameters.Length; i++)
+			{
+				mapping.Add(method.TypeParameters[i], updatedTypeParameters[i]);
+			}
+
+			return CodeGenerationSymbolFactory.CreateMethodSymbol(
+				method.ContainingType,
+				method.GetAttributes(),
+				method.DeclaredAccessibility,
+				method.GetSymbolModifiers(),
+				method.ReturnType.SubstituteTypes(mapping, typeGenerator),
+				method.ExplicitInterfaceImplementations.FirstOrDefault(),
+				method.Name,
+				updatedTypeParameters,
+				method.Parameters.Select(p =>
+					CodeGenerationSymbolFactory.CreateParameterSymbol(p.GetAttributes(), p.RefKind, p.IsParams, p.Type.SubstituteTypes(mapping, typeGenerator), p.Name, p.IsOptional,
+						p.HasExplicitDefaultValue, p.HasExplicitDefaultValue ? p.ExplicitDefaultValue : null)).ToList());
+		}
+
+		public static IMethodSymbol RenameParameters(this IMethodSymbol method, IList<string> parameterNames)
+		{
+			var parameterList = method.Parameters;
+			if (parameterList.Select(p => p.Name).SequenceEqual(parameterNames))
+			{
+				return method;
+			}
+
+			var parameters = parameterList.RenameParameters(parameterNames);
+
+			return CodeGenerationSymbolFactory.CreateMethodSymbol(
+				method.ContainingType,
+				method.GetAttributes(),
+				method.DeclaredAccessibility,
+				method.GetSymbolModifiers(),
+				method.ReturnType,
+				method.ExplicitInterfaceImplementations.FirstOrDefault(),
+				method.Name,
+				method.TypeParameters,
+				parameters);
+		}
+
+		private static IList<ITypeParameterSymbol> RenameTypeParameters(
+			IList<ITypeParameterSymbol> typeParameters,
+			IList<string> newNames,
+			TypeGenerator typeGenerator)
+		{
+			// We generate the type parameter in two passes.  The first creates the new type
+			// parameter.  The second updates the constraints to point at this new type parameter.
+			var newTypeParameters = new List<CodeGenerationTypeParameterSymbol>();
+			var mapping = new Dictionary<ITypeSymbol, ITypeSymbol>();
+			for (int i = 0; i < typeParameters.Count; i++)
+			{
+				var typeParameter = typeParameters[i];
+
+				var newTypeParameter = new CodeGenerationTypeParameterSymbol(
+					typeParameter.ContainingType,
+					typeParameter.GetAttributes(),
+					typeParameter.Variance,
+					newNames[i],
+					typeParameter.ConstraintTypes,
+					typeParameter.HasConstructorConstraint,
+					typeParameter.HasReferenceTypeConstraint,
+					typeParameter.HasValueTypeConstraint,
+					typeParameter.Ordinal);
+
+				newTypeParameters.Add(newTypeParameter);
+				mapping.Add(typeParameter, (ITypeSymbol)newTypeParameter.Instance);
+			}
+
+			// Now we update the constraints.
+			foreach (var newTypeParameter in newTypeParameters)
+			{
+				newTypeParameter.ConstraintTypes = ImmutableArray.CreateRange(newTypeParameter.ConstraintTypes, t => t.SubstituteTypes(mapping, typeGenerator));
+			}
+
+			return newTypeParameters.Cast<ITypeParameterSymbol>().ToList();
+		}
+
+		public static IMethodSymbol EnsureNonConflictingNames(
+			this IMethodSymbol method, INamedTypeSymbol containingType, CancellationToken cancellationToken)
+		{
+			// The method's type parameters may conflict with the type parameters in the type
+			// we're generating into.  In that case, rename them.
+			var parameterNames = NameGenerator.EnsureUniqueness(
+				method.Parameters.Select(p => p.Name).ToList(), isCaseSensitive: true);
+
+			var outerTypeParameterNames =
+				containingType.GetAllTypeParameters()
+					.Select(tp => tp.Name)
+					.Concat(method.Name)
+					.Concat(containingType.Name);
+
+			var unusableNames = parameterNames.Concat(outerTypeParameterNames).ToSet(StringComparer.Ordinal);
+
+			var newTypeParameterNames = NameGenerator.EnsureUniqueness(
+				method.TypeParameters.Select(tp => tp.Name).ToList(),
+				n => !unusableNames.Contains(n));
+
+			var updatedMethod = method.RenameTypeParameters(newTypeParameterNames);
+			return updatedMethod.RenameParameters(parameterNames);
+		}
+
+		public static IMethodSymbol RemoveAttributeFromParametersAndReturnType(
+			this IMethodSymbol method, INamedTypeSymbol attributeType,
+			IList<SyntaxNode> statements = null, IList<SyntaxNode> handlesExpressions = null)
+		{
+			if (attributeType == null)
+			{
+				return method;
+			}
+
+			var someParameterHasAttribute = method.Parameters
+				.Any(m => m.GetAttributes().Any(a => a.AttributeClass.Equals(attributeType)));
+
+			var returnTypeHasAttribute = method.GetReturnTypeAttributes()
+				.Any(a => a.AttributeClass.Equals(attributeType));
+
+			if (!someParameterHasAttribute && !returnTypeHasAttribute)
+			{
+				return method;
+			}
+
+			return CodeGenerationSymbolFactory.CreateMethodSymbol(
+				method.ContainingType,
+				method.GetAttributes(),
+				method.DeclaredAccessibility,
+				method.GetSymbolModifiers(),
+				method.ReturnType,
+				method.ExplicitInterfaceImplementations.FirstOrDefault(),
+				method.Name,
+				method.TypeParameters,
+				method.Parameters.Select(p =>
+					CodeGenerationSymbolFactory.CreateParameterSymbol(
+						p.GetAttributes().Where(a => !a.AttributeClass.Equals(attributeType)).ToList(),
+						p.RefKind, p.IsParams, p.Type, p.Name, p.IsOptional,
+						p.HasExplicitDefaultValue, p.HasExplicitDefaultValue ? p.ExplicitDefaultValue : null)).ToList(),
+				statements,
+				handlesExpressions,
+				method.GetReturnTypeAttributes().Where(a => !a.AttributeClass.Equals(attributeType)).ToList());
+		}
+
+		public static bool? IsMoreSpecificThan(this IMethodSymbol method1, IMethodSymbol method2)
+		{
+			var p1 = method1.Parameters;
+			var p2 = method2.Parameters;
+
+			// If the methods don't have the same parameter count, then method1 can't be more or 
+			// less specific htan method2.
+			if (p1.Length != p2.Length)
+			{
+				return null;
+			}
+
+			// If the methods' parameter types differ, or they have different names, then one can't
+			// be more specific htan the other.
+			if (!SignatureComparer.HaveSameSignature(method1.Parameters, method2.Parameters) ||
+				!method1.Parameters.Select(p => p.Name).SequenceEqual(method2.Parameters.Select(p => p.Name)))
+			{
+				return null;
+			}
+
+			// Ok.  We have two methods that look extremely similar to each other.  However, one might
+			// be more specific if, for example, it was actually written with concrete types (like 'int') 
+			// versus the other which may have been instantiated from a type parameter.   i.e.
+			//
+			// class C<T> { void Foo(T t); void Foo(int t); }
+			//
+			// THe latter Foo is more specific when comparing "C<int>.Foo(int t)" (method1) vs 
+			// "C<int>.Foo(int t)" (method2).
+			p1 = method1.OriginalDefinition.Parameters;
+			p2 = method2.OriginalDefinition.Parameters;
+			return p1.Select(p => p.Type).ToList().AreMoreSpecificThan(p2.Select(p => p.Type).ToList());
+		}
+
+		public static bool TryGetPredefinedComparisonOperator(this IMethodSymbol symbol, out PredefinedOperator op)
+		{
+			if (symbol.MethodKind == MethodKind.BuiltinOperator)
+			{
+				op = symbol.GetPredefinedOperator();
+				switch (op)
+				{
+				case PredefinedOperator.Equality:
+				case PredefinedOperator.Inequality:
+				case PredefinedOperator.GreaterThanOrEqual:
+				case PredefinedOperator.LessThanOrEqual:
+				case PredefinedOperator.GreaterThan:
+				case PredefinedOperator.LessThan:
+					return true;
+				}
+			}
+			else
+			{
+				op = PredefinedOperator.None;
+			}
+
+			return false;
+		}
+
+		public static PredefinedOperator GetPredefinedOperator(this IMethodSymbol symbol)
+		{
+			switch (symbol.Name)
+			{
+			case "op_Addition":
+			case "op_UnaryPlus":
+				return PredefinedOperator.Addition;
+			case "op_BitwiseAnd":
+				return PredefinedOperator.BitwiseAnd;
+			case "op_BitwiseOr":
+				return PredefinedOperator.BitwiseOr;
+			case "op_Concatenate":
+				return PredefinedOperator.Concatenate;
+			case "op_Decrement":
+				return PredefinedOperator.Decrement;
+			case "op_Division":
+				return PredefinedOperator.Division;
+			case "op_Equality":
+				return PredefinedOperator.Equality;
+			case "op_ExclusiveOr":
+				return PredefinedOperator.ExclusiveOr;
+			case "op_Exponent":
+				return PredefinedOperator.Exponent;
+			case "op_GreaterThan":
+				return PredefinedOperator.GreaterThan;
+			case "op_GreaterThanOrEqual":
+				return PredefinedOperator.GreaterThanOrEqual;
+			case "op_Increment":
+				return PredefinedOperator.Increment;
+			case "op_Inequality":
+				return PredefinedOperator.Inequality;
+			case "op_IntegerDivision":
+				return PredefinedOperator.IntegerDivision;
+			case "op_LeftShift":
+				return PredefinedOperator.LeftShift;
+			case "op_LessThan":
+				return PredefinedOperator.LessThan;
+			case "op_LessThanOrEqual":
+				return PredefinedOperator.LessThanOrEqual;
+			case "op_Like":
+				return PredefinedOperator.Like;
+			case "op_LogicalNot":
+			case "op_OnesComplement":
+				return PredefinedOperator.Complement;
+			case "op_Modulus":
+				return PredefinedOperator.Modulus;
+			case "op_Multiply":
+				return PredefinedOperator.Multiplication;
+			case "op_RightShift":
+				return PredefinedOperator.RightShift;
+			case "op_Subtraction":
+			case "op_UnaryNegation":
+				return PredefinedOperator.Subtraction;
+			default:
+				return PredefinedOperator.None;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/INamedTypeSymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/INamedTypeSymbolExtensions.cs
new file mode 100644
index 0000000000..bce6cb39df
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/INamedTypeSymbolExtensions.cs
@@ -0,0 +1,518 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.FindSymbols;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static partial class INamedTypeSymbolExtensions
+	{
+		public static IEnumerable<INamedTypeSymbol> GetBaseTypesAndThis(this INamedTypeSymbol namedType)
+		{
+			var current = namedType;
+			while (current != null)
+			{
+				yield return current;
+				current = current.BaseType;
+			}
+		}
+
+//		public static Task<IEnumerable<INamedTypeSymbol>> FindDerivedClassesAsync(
+//			this INamedTypeSymbol type,
+//			Solution solution,
+//			CancellationToken cancellationToken)
+//		{
+//			return FindDerivedClassesAsync(type, solution, null, cancellationToken);
+//		}
+
+//		public static Task<IEnumerable<INamedTypeSymbol>> FindDerivedClassesAsync(
+//			this INamedTypeSymbol type,
+//			Solution solution,
+//			IImmutableSet<Project> projects,
+//			CancellationToken cancellationToken)
+//		{
+//			return DependentTypeFinder.FindDerivedClassesAsync(type, solution, projects, cancellationToken);
+//		}
+//
+//		public static Task<IEnumerable<INamedTypeSymbol>> FindDerivedInterfacesAsync(
+//			this INamedTypeSymbol type,
+//			Solution solution,
+//			CancellationToken cancellationToken)
+//		{
+//			return FindDerivedInterfacesAsync(type, solution, null, cancellationToken);
+//		}
+//
+//		public static Task<IEnumerable<INamedTypeSymbol>> FindDerivedInterfacesAsync(
+//			this INamedTypeSymbol type,
+//			Solution solution,
+//			IImmutableSet<Project> projects,
+//			CancellationToken cancellationToken)
+//		{
+//			return DependentTypeFinder.FindDerivedInterfacesAsync(type, solution, projects, cancellationToken);
+//		}
+//
+//		public static Task<IEnumerable<INamedTypeSymbol>> FindImplementingTypesAsync(
+//			this INamedTypeSymbol type,
+//			Solution solution,
+//			IImmutableSet<Project> projects,
+//			CancellationToken cancellationToken)
+//		{
+//			return DependentTypeFinder.FindImplementingTypesAsync(type, solution, projects, cancellationToken);
+//		}
+
+		public static IEnumerable<ITypeParameterSymbol> GetAllTypeParameters(this INamedTypeSymbol symbol)
+		{
+			var stack = GetContainmentStack(symbol);
+			return stack.SelectMany(n => n.TypeParameters);
+		}
+
+		public static IEnumerable<ITypeSymbol> GetAllTypeArguments(this INamedTypeSymbol symbol)
+		{
+			var stack = GetContainmentStack(symbol);
+			return stack.SelectMany(n => n.TypeArguments);
+		}
+
+		private static Stack<INamedTypeSymbol> GetContainmentStack(INamedTypeSymbol symbol)
+		{
+			var stack = new Stack<INamedTypeSymbol>();
+			for (var current = symbol; current != null; current = current.ContainingType)
+			{
+				stack.Push(current);
+			}
+
+			return stack;
+		}
+
+		public static bool IsContainedWithin(this INamedTypeSymbol symbol, INamedTypeSymbol outer)
+		{
+			// TODO(cyrusn): Should we be using OriginalSymbol here?
+			for (var current = symbol; current != null; current = current.ContainingType)
+			{
+				if (current.Equals(outer))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static ISymbol FindImplementationForAbstractMember(this INamedTypeSymbol type, ISymbol symbol)
+		{
+			if (symbol.IsAbstract)
+			{
+				return type.GetBaseTypesAndThis().SelectMany(t => t.GetMembers(symbol.Name))
+					.FirstOrDefault(s => symbol.Equals(GetOverriddenMember(s)));
+			}
+
+			return null;
+		}
+
+		private static ISymbol GetOverriddenMember(ISymbol symbol)
+		{
+			return symbol.TypeSwitch(
+				(IMethodSymbol method) => (ISymbol)method.OverriddenMethod,
+				(IPropertySymbol property) => property.OverriddenProperty,
+				(IEventSymbol @event) => @event.OverriddenEvent);
+		}
+
+		private static bool ImplementationExists(INamedTypeSymbol classOrStructType, ISymbol member)
+		{
+			return classOrStructType.FindImplementationForInterfaceMember(member) != null;
+		}
+
+		private static bool IsImplemented(
+			this INamedTypeSymbol classOrStructType,
+			ISymbol member,
+			Func<INamedTypeSymbol, ISymbol, bool> isValidImplementation,
+			CancellationToken cancellationToken)
+		{
+			if (member.ContainingType.TypeKind == TypeKind.Interface)
+			{
+				if (member.Kind == SymbolKind.Property)
+				{
+					return IsInterfacePropertyImplemented(classOrStructType, (IPropertySymbol)member, cancellationToken);
+				}
+				else
+				{
+					return isValidImplementation(classOrStructType, member);
+				}
+			}
+
+			if (member.IsAbstract)
+			{
+				if (member.Kind == SymbolKind.Property)
+				{
+					return IsAbstractPropertyImplemented(classOrStructType, (IPropertySymbol)member, cancellationToken);
+				}
+				else
+				{
+					return classOrStructType.FindImplementationForAbstractMember(member) != null;
+				}
+			}
+
+			return true;
+		}
+
+		private static bool IsInterfacePropertyImplemented(INamedTypeSymbol classOrStructType, IPropertySymbol propertySymbol, CancellationToken cancellationToken)
+		{
+			// A property is only fully implemented if both it's setter and getter is implemented.
+			if (propertySymbol.GetMethod != null)
+			{
+				if (classOrStructType.FindImplementationForInterfaceMember(propertySymbol.GetMethod) == null)
+				{
+					return false;
+				}
+			}
+
+			if (propertySymbol.SetMethod != null)
+			{
+				if (classOrStructType.FindImplementationForInterfaceMember(propertySymbol.SetMethod) == null)
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		private static bool IsAbstractPropertyImplemented(INamedTypeSymbol classOrStructType, IPropertySymbol propertySymbol, CancellationToken cancellationToken)
+		{
+			// A property is only fully implemented if both it's setter and getter is implemented.
+			if (propertySymbol.GetMethod != null)
+			{
+				if (classOrStructType.FindImplementationForAbstractMember(propertySymbol.GetMethod) == null)
+				{
+					return false;
+				}
+			}
+
+			if (propertySymbol.SetMethod != null)
+			{
+				if (classOrStructType.FindImplementationForAbstractMember(propertySymbol.SetMethod) == null)
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		private static bool IsExplicitlyImplemented(
+			this INamedTypeSymbol classOrStructType,
+			ISymbol member,
+			Func<INamedTypeSymbol, ISymbol, bool> isValid,
+			CancellationToken cancellationToken)
+		{
+			var implementation = classOrStructType.FindImplementationForInterfaceMember(member);
+			return implementation.TypeSwitch(
+				(IEventSymbol @event) => @event.ExplicitInterfaceImplementations.Length > 0,
+				(IMethodSymbol method) => method.ExplicitInterfaceImplementations.Length > 0,
+				(IPropertySymbol property) => property.ExplicitInterfaceImplementations.Length > 0);
+		}
+
+		public static IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> GetAllUnimplementedMembers(
+			this INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> interfacesOrAbstractClasses,
+			CancellationToken cancellationToken)
+		{
+			return classOrStructType.GetAllUnimplementedMembers(
+				interfacesOrAbstractClasses,
+				IsImplemented,
+				ImplementationExists,
+				GetMembers,
+				allowReimplementation: false,
+				cancellationToken: cancellationToken);
+		}
+
+		public static IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> GetAllUnimplementedMembersInThis(
+			this INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> interfacesOrAbstractClasses,
+			CancellationToken cancellationToken)
+		{
+			return classOrStructType.GetAllUnimplementedMembers(
+				interfacesOrAbstractClasses,
+				IsImplemented,
+				(t, m) =>
+				{
+					var implementation = classOrStructType.FindImplementationForInterfaceMember(m);
+					return implementation != null && implementation.ContainingType == classOrStructType;
+				},
+				GetMembers,
+				allowReimplementation: true,
+				cancellationToken: cancellationToken);
+		}
+
+		public static IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> GetAllUnimplementedMembersInThis(
+			this INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> interfacesOrAbstractClasses,
+			Func<INamedTypeSymbol, ISymbol, ImmutableArray<ISymbol>> interfaceMemberGetter,
+			CancellationToken cancellationToken)
+		{
+			return classOrStructType.GetAllUnimplementedMembers(
+				interfacesOrAbstractClasses,
+				IsImplemented,
+				(t, m) =>
+				{
+					var implementation = classOrStructType.FindImplementationForInterfaceMember(m);
+					return implementation != null && implementation.ContainingType == classOrStructType;
+				},
+				interfaceMemberGetter,
+				allowReimplementation: true,
+				cancellationToken: cancellationToken);
+		}
+
+		public static IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> GetAllUnimplementedMembers(
+			this INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> interfacesOrAbstractClasses,
+			Func<INamedTypeSymbol, ISymbol, ImmutableArray<ISymbol>> interfaceMemberGetter,
+			CancellationToken cancellationToken)
+		{
+			return classOrStructType.GetAllUnimplementedMembers(
+				interfacesOrAbstractClasses,
+				IsImplemented,
+				ImplementationExists,
+				interfaceMemberGetter,
+				allowReimplementation: false,
+				cancellationToken: cancellationToken);
+		}
+
+		public static IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> GetAllUnimplementedExplicitMembers(
+			this INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> interfaces,
+			CancellationToken cancellationToken)
+		{
+			return classOrStructType.GetAllUnimplementedMembers(
+				interfaces,
+				IsExplicitlyImplemented,
+				ImplementationExists,
+				GetMembers,
+				allowReimplementation: false,
+				cancellationToken: cancellationToken);
+		}
+
+		public static IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> GetAllUnimplementedExplicitMembers(
+			this INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> interfaces,
+			Func<INamedTypeSymbol, ISymbol, ImmutableArray<ISymbol>> interfaceMemberGetter,
+			CancellationToken cancellationToken)
+		{
+			return classOrStructType.GetAllUnimplementedMembers(
+				interfaces,
+				IsExplicitlyImplemented,
+				ImplementationExists,
+				interfaceMemberGetter,
+				allowReimplementation: false,
+				cancellationToken: cancellationToken);
+		}
+
+		private static IList<Tuple<INamedTypeSymbol, IList<ISymbol>>> GetAllUnimplementedMembers(
+			this INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> interfacesOrAbstractClasses,
+			Func<INamedTypeSymbol, ISymbol, Func<INamedTypeSymbol, ISymbol, bool>, CancellationToken, bool> isImplemented,
+			Func<INamedTypeSymbol, ISymbol, bool> isValidImplementation,
+			Func<INamedTypeSymbol, ISymbol, ImmutableArray<ISymbol>> interfaceMemberGetter,
+			bool allowReimplementation,
+			CancellationToken cancellationToken)
+		{
+//			Contract.ThrowIfNull(classOrStructType);
+//			Contract.ThrowIfNull(interfacesOrAbstractClasses);
+//			Contract.ThrowIfNull(isImplemented);
+
+			if (classOrStructType.TypeKind != TypeKind.Class && classOrStructType.TypeKind != TypeKind.Struct)
+			{
+				return SpecializedCollections.EmptyList<Tuple<INamedTypeSymbol, IList<ISymbol>>>();
+			}
+
+			if (!interfacesOrAbstractClasses.Any())
+			{
+				return SpecializedCollections.EmptyList<Tuple<INamedTypeSymbol, IList<ISymbol>>>();
+			}
+
+			if (!interfacesOrAbstractClasses.All(i => i.TypeKind == TypeKind.Interface) &&
+				!interfacesOrAbstractClasses.All(i => i.IsAbstractClass()))
+			{
+				return SpecializedCollections.EmptyList<Tuple<INamedTypeSymbol, IList<ISymbol>>>();
+			}
+
+			var typesToImplement = GetTypesToImplement(classOrStructType, interfacesOrAbstractClasses, allowReimplementation, cancellationToken);
+			return typesToImplement.Select(s => Tuple.Create(s, GetUnimplementedMembers(classOrStructType, s, isImplemented, isValidImplementation, interfaceMemberGetter, cancellationToken)))
+				.Where(t => t.Item2.Count > 0)
+				.ToList();
+		}
+
+		private static IList<INamedTypeSymbol> GetTypesToImplement(
+			INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> interfacesOrAbstractClasses,
+			bool allowReimplementation,
+			CancellationToken cancellationToken)
+		{
+			return interfacesOrAbstractClasses.First().TypeKind == TypeKind.Interface
+				? GetInterfacesToImplement(classOrStructType, interfacesOrAbstractClasses, allowReimplementation, cancellationToken)
+					: GetAbstractClassesToImplement(classOrStructType, interfacesOrAbstractClasses, cancellationToken);
+		}
+
+		private static IList<INamedTypeSymbol> GetAbstractClassesToImplement(
+			INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> abstractClasses,
+			CancellationToken cancellationToken)
+		{
+			return abstractClasses.SelectMany(a => a.GetBaseTypesAndThis())
+				.Where(t => t.IsAbstractClass())
+				.ToList();
+		}
+
+		private static IList<INamedTypeSymbol> GetInterfacesToImplement(
+			INamedTypeSymbol classOrStructType,
+			IEnumerable<INamedTypeSymbol> interfaces,
+			bool allowReimplementation,
+			CancellationToken cancellationToken)
+		{
+			// We need to not only implement the specified interface, but also everything it
+			// inherits from.
+			cancellationToken.ThrowIfCancellationRequested();
+			var interfacesToImplement = new List<INamedTypeSymbol>(
+				interfaces.SelectMany(i => i.GetAllInterfacesIncludingThis()).Distinct());
+
+			// However, there's no need to reimplement any interfaces that our base types already
+			// implement.  By definition they must contain all the necessary methods.
+			var baseType = classOrStructType.BaseType;
+			var alreadyImplementedInterfaces = baseType == null || allowReimplementation
+				? SpecializedCollections.EmptyEnumerable<INamedTypeSymbol>()
+				: baseType.AllInterfaces;
+
+			cancellationToken.ThrowIfCancellationRequested();
+			foreach (var i in alreadyImplementedInterfaces)
+				interfacesToImplement.Remove (i);
+			return interfacesToImplement;
+		}
+
+		private static IList<ISymbol> GetUnimplementedMembers(
+			this INamedTypeSymbol classOrStructType,
+			INamedTypeSymbol interfaceType,
+			Func<INamedTypeSymbol, ISymbol, Func<INamedTypeSymbol, ISymbol, bool>, CancellationToken, bool> isImplemented,
+			Func<INamedTypeSymbol, ISymbol, bool> isValidImplementation,
+			Func<INamedTypeSymbol, ISymbol, ImmutableArray<ISymbol>> interfaceMemberGetter,
+			CancellationToken cancellationToken)
+		{
+			var q = from m in interfaceMemberGetter(interfaceType, classOrStructType)
+					where m.Kind != SymbolKind.NamedType
+					where m.Kind != SymbolKind.Method || ((IMethodSymbol)m).MethodKind == MethodKind.Ordinary
+					where m.Kind != SymbolKind.Property || ((IPropertySymbol)m).IsIndexer || ((IPropertySymbol)m).CanBeReferencedByName
+					where m.Kind != SymbolKind.Event || ((IEventSymbol)m).CanBeReferencedByName
+					where !isImplemented(classOrStructType, m, isValidImplementation, cancellationToken)
+				select m;
+
+			return q.ToList();
+		}
+
+		public static IEnumerable<ISymbol> GetAttributeNamedParameters(
+			this INamedTypeSymbol attributeSymbol,
+			Compilation compilation,
+			ISymbol within)
+		{
+			var systemAttributeType = compilation.AttributeType();
+
+			foreach (var type in attributeSymbol.GetBaseTypesAndThis())
+			{
+				if (type.Equals(systemAttributeType))
+				{
+					break;
+				}
+
+				foreach (var member in type.GetMembers())
+				{
+					var namedParameter = IsAttributeNamedParameter(member, within ?? compilation.Assembly);
+					if (namedParameter != null)
+					{
+						yield return namedParameter;
+					}
+				}
+			}
+		}
+
+		private static ISymbol IsAttributeNamedParameter(
+			ISymbol symbol,
+			ISymbol within)
+		{
+			if (!symbol.CanBeReferencedByName ||
+				!symbol.IsAccessibleWithin(within))
+			{
+				return null;
+			}
+
+			switch (symbol.Kind)
+			{
+			case SymbolKind.Field:
+				var fieldSymbol = (IFieldSymbol)symbol;
+				if (!fieldSymbol.IsConst &&
+					!fieldSymbol.IsReadOnly &&
+					!fieldSymbol.IsStatic)
+				{
+					return fieldSymbol;
+				}
+
+				break;
+
+			case SymbolKind.Property:
+				var propertySymbol = (IPropertySymbol)symbol;
+				if (!propertySymbol.IsReadOnly &&
+					!propertySymbol.IsWriteOnly &&
+					!propertySymbol.IsStatic &&
+					propertySymbol.GetMethod != null &&
+					propertySymbol.SetMethod != null &&
+					propertySymbol.GetMethod.IsAccessibleWithin(within) &&
+					propertySymbol.SetMethod.IsAccessibleWithin(within))
+				{
+					return propertySymbol;
+				}
+
+				break;
+			}
+
+			return null;
+		}
+
+		private static ImmutableArray<ISymbol> GetMembers(INamedTypeSymbol type, ISymbol within)
+		{
+			return type.GetMembers();
+		}
+
+		public static INamespaceOrTypeSymbol GenerateRootNamespaceOrType(this INamedTypeSymbol namedType, string[] containers)
+		{
+			INamespaceOrTypeSymbol currentSymbol = namedType;
+			for (int i = containers.Length - 1; i >= 0; i--)
+			{
+				currentSymbol = CodeGenerationSymbolFactory.CreateNamespaceSymbol(containers[i], members: new[] { currentSymbol });
+			}
+
+			return currentSymbol;
+		}
+	
+		public static bool LastEnumValueHasInitializer(this INamedTypeSymbol namedTypeSymbol)
+		{
+			var enumDecl = namedTypeSymbol.DeclaringSyntaxReferences.Select(r => r.GetSyntax()).OfType<EnumDeclarationSyntax>().FirstOrDefault();
+			if (enumDecl != null)
+			{
+				var lastMember = enumDecl.Members.LastOrDefault();
+				if (lastMember != null)
+				{
+					return lastMember.EqualsValue != null;
+				}
+			}
+
+			return false;
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/INamespaceOrTypeSymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/INamespaceOrTypeSymbolExtensions.cs
new file mode 100644
index 0000000000..8d82d1473e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/INamespaceOrTypeSymbolExtensions.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static partial class INamespaceOrTypeSymbolExtensions
+	{
+		private static readonly ConditionalWeakTable<INamespaceOrTypeSymbol, List<string>> s_namespaceOrTypeToNameMap =
+			new ConditionalWeakTable<INamespaceOrTypeSymbol, List<string>>();
+
+		private static readonly SymbolDisplayFormat s_shortNameFormat = new SymbolDisplayFormat(
+			miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes | SymbolDisplayMiscellaneousOptions.ExpandNullable);
+
+		public static readonly Comparison<INamespaceOrTypeSymbol> CompareNamespaceOrTypeSymbols = CompareTo;
+
+		public static string GetShortName(this INamespaceOrTypeSymbol symbol)
+		{
+			return symbol.ToDisplayString(s_shortNameFormat);
+		}
+
+		public static IEnumerable<IPropertySymbol> GetIndexers(this INamespaceOrTypeSymbol symbol)
+		{
+			return symbol == null
+				? SpecializedCollections.EmptyEnumerable<IPropertySymbol>()
+					: symbol.GetMembers(WellKnownMemberNames.Indexer).OfType<IPropertySymbol>().Where(p => p.IsIndexer);
+		}
+
+		public static int CompareTo(this INamespaceOrTypeSymbol n1, INamespaceOrTypeSymbol n2)
+		{
+			var names1 = s_namespaceOrTypeToNameMap.GetValue(n1, GetNameParts);
+			var names2 = s_namespaceOrTypeToNameMap.GetValue(n2, GetNameParts);
+
+			for (var i = 0; i < Math.Min(names1.Count, names2.Count); i++)
+			{
+				var comp = names1[i].CompareTo(names2[i]);
+				if (comp != 0)
+				{
+					return comp;
+				}
+			}
+
+			return names1.Count - names2.Count;
+		}
+
+		private static List<string> GetNameParts(INamespaceOrTypeSymbol namespaceSymbol)
+		{
+			var result = new List<string>();
+			GetNameParts(namespaceSymbol, result);
+			return result;
+		}
+
+		private static void GetNameParts(INamespaceOrTypeSymbol namespaceOrTypeSymbol, List<string> result)
+		{
+			if (namespaceOrTypeSymbol == null || (namespaceOrTypeSymbol.IsNamespace && ((INamespaceSymbol)namespaceOrTypeSymbol).IsGlobalNamespace))
+			{
+				return;
+			}
+
+			GetNameParts(namespaceOrTypeSymbol.ContainingNamespace, result);
+			result.Add(namespaceOrTypeSymbol.Name);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/IParameterSymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/IParameterSymbolExtensions.cs
new file mode 100644
index 0000000000..daddbf02a3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/IParameterSymbolExtensions.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class IParameterSymbolExtensions
+	{
+		public static bool IsRefOrOut(this IParameterSymbol symbol)
+		{
+			return symbol.RefKind != RefKind.None;
+		}
+
+		public static IParameterSymbol RenameParameter(this IParameterSymbol parameter, string parameterName)
+		{
+			return parameter.Name == parameterName
+				? parameter
+					: CodeGenerationSymbolFactory.CreateParameterSymbol(
+						parameter.GetAttributes(),
+						parameter.RefKind,
+						parameter.IsParams,
+						parameter.Type,
+						parameterName,
+						parameter.IsOptional,
+						parameter.HasExplicitDefaultValue,
+						parameter.HasExplicitDefaultValue ? parameter.ExplicitDefaultValue : null);
+		}
+
+		public static IList<IParameterSymbol> RenameParameters(this IList<IParameterSymbol> parameters, IList<string> parameterNames)
+		{
+			var result = new List<IParameterSymbol>();
+			for (int i = 0; i < parameterNames.Count; i++)
+			{
+				result.Add(parameters[i].RenameParameter(parameterNames[i]));
+			}
+
+			return result;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/IPropertySymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/IPropertySymbolExtensions.cs
new file mode 100644
index 0000000000..9ca69b2f10
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/IPropertySymbolExtensions.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class IPropertySymbolExtensions
+	{
+		public static IPropertySymbol RenameParameters(this IPropertySymbol property, IList<string> parameterNames)
+		{
+			var parameterList = property.Parameters;
+			if (parameterList.Select(p => p.Name).SequenceEqual(parameterNames))
+			{
+				return property;
+			}
+
+			var parameters = parameterList.RenameParameters(parameterNames);
+
+			return CodeGenerationSymbolFactory.CreatePropertySymbol(
+				property.ContainingType,
+				property.GetAttributes(),
+				property.DeclaredAccessibility,
+				property.GetSymbolModifiers(),
+				property.Type,
+				property.ExplicitInterfaceImplementations.FirstOrDefault(),
+				property.Name,
+				parameters,
+				property.GetMethod,
+				property.SetMethod,
+				property.IsIndexer);
+		}
+
+		public static IPropertySymbol RemoveAttributeFromParameters(
+			this IPropertySymbol property, INamedTypeSymbol attributeType)
+		{
+			if (attributeType == null)
+			{
+				return property;
+			}
+
+			var someParameterHasAttribute = property.Parameters
+				.Any(p => p.GetAttributes().Any(a => a.AttributeClass.Equals(attributeType)));
+			if (!someParameterHasAttribute)
+			{
+				return property;
+			}
+
+			return CodeGenerationSymbolFactory.CreatePropertySymbol(
+				property.ContainingType,
+				property.GetAttributes(),
+				property.DeclaredAccessibility,
+				property.GetSymbolModifiers(),
+				property.Type,
+				property.ExplicitInterfaceImplementations.FirstOrDefault(),
+				property.Name,
+				property.Parameters.Select(p =>
+					CodeGenerationSymbolFactory.CreateParameterSymbol(
+						p.GetAttributes().Where(a => !a.AttributeClass.Equals(attributeType)).ToList(),
+						p.RefKind, p.IsParams, p.Type, p.Name, p.IsOptional,
+						p.HasExplicitDefaultValue, p.HasExplicitDefaultValue ? p.ExplicitDefaultValue : null)).ToList(),
+				property.GetMethod,
+				property.SetMethod,
+				property.IsIndexer);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ISymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/ISymbolExtensions.cs
new file mode 100644
index 0000000000..29bd917a4b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ISymbolExtensions.cs
@@ -0,0 +1,49 @@
+//
+// ISymbolExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editing;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class ISymbolExtensions
+	{
+		public static DeclarationModifiers GetSymbolModifiers(this ISymbol symbol)
+		{
+			// ported from roslyn source - why they didn't use DeclarationModifiers.From (symbol) ?
+			return DeclarationModifiers.None
+				.WithIsStatic (symbol.IsStatic)
+				.WithIsAbstract (symbol.IsAbstract)
+				.WithIsUnsafe (symbol.IsUnsafe ())
+				.WithIsVirtual (symbol.IsVirtual)
+				.WithIsOverride (symbol.IsOverride)
+				.WithIsSealed (symbol.IsSealed);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/ITypeParameterSymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/ITypeParameterSymbolExtensions.cs
new file mode 100644
index 0000000000..86b28def3a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ITypeParameterSymbolExtensions.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class ITypeParameterSymbolExtensions
+	{
+		public static INamedTypeSymbol GetNamedTypeSymbolConstraint(this ITypeParameterSymbol typeParameter)
+		{
+			return typeParameter.ConstraintTypes.Select(GetNamedTypeSymbol).WhereNotNull().FirstOrDefault();
+		}
+
+		private static INamedTypeSymbol GetNamedTypeSymbol(ITypeSymbol type)
+		{
+			return type is INamedTypeSymbol
+				? (INamedTypeSymbol)type
+					: type is ITypeParameterSymbol
+				? GetNamedTypeSymbolConstraint((ITypeParameterSymbol)type)
+					: null;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ITypeSymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/ITypeSymbolExtensions.cs
new file mode 100644
index 0000000000..ff226ddfe1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ITypeSymbolExtensions.cs
@@ -0,0 +1,1108 @@
+//
+// ITypeSymbolExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.ComponentModel;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
+using System.Reflection;
+using System.Collections.Generic;
+using System.Threading;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Runtime.ExceptionServices;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	[EditorBrowsableAttribute (EditorBrowsableState.Never)]
+	static class ITypeSymbolExtensions
+	{
+		readonly static MethodInfo generateTypeSyntax;
+		readonly static MethodInfo inheritsFromOrEqualsIgnoringConstructionMethod;
+
+		static ITypeSymbolExtensions()
+		{
+			var typeInfo = Type.GetType("Microsoft.CodeAnalysis.CSharp.Extensions.ITypeSymbolExtensions" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			generateTypeSyntax = typeInfo.GetMethod("GenerateTypeSyntax", new[] { typeof(ITypeSymbol) });
+			containingTypesOrSelfHasUnsafeKeywordMethod = typeInfo.GetMethod("ContainingTypesOrSelfHasUnsafeKeyword", BindingFlags.Public | BindingFlags.Static);
+
+			typeInfo = Type.GetType("Microsoft.CodeAnalysis.Shared.Extensions.ITypeSymbolExtensions" + ReflectionNamespaces.WorkspacesAsmName, true);
+			inheritsFromOrEqualsIgnoringConstructionMethod = typeInfo.GetMethod("InheritsFromOrEqualsIgnoringConstruction");
+			removeUnavailableTypeParametersMethod = typeInfo.GetMethod("RemoveUnavailableTypeParameters");
+			removeUnnamedErrorTypesMethod = typeInfo.GetMethod("RemoveUnnamedErrorTypes");
+			replaceTypeParametersBasedOnTypeConstraintsMethod = typeInfo.GetMethod("ReplaceTypeParametersBasedOnTypeConstraints");
+			foreach (var m in typeInfo.GetMethods (BindingFlags.Public | BindingFlags.Static)) { 
+				if (m.Name != "SubstituteTypes")
+					continue;
+				var parameters = m.GetParameters ();
+				if (parameters.Length != 3)
+					continue;
+
+				if (parameters [2].Name == "typeGenerator") {
+					substituteTypesMethod2 = m;
+				} else if (parameters [2].Name == "compilation"){
+					substituteTypesMethod = m;
+				}
+				break;
+			}
+		}
+
+		public static TypeSyntax GenerateTypeSyntax (this ITypeSymbol typeSymbol)
+		{
+			return (TypeSyntax)generateTypeSyntax.Invoke (null, new [] { typeSymbol });
+		}
+
+		readonly static MethodInfo containingTypesOrSelfHasUnsafeKeywordMethod;
+		public static bool ContainingTypesOrSelfHasUnsafeKeyword(this ITypeSymbol containingType)
+		{
+			return (bool)containingTypesOrSelfHasUnsafeKeywordMethod.Invoke (null, new object[] { containingType });
+		}
+
+
+
+		private const string DefaultParameterName = "p";
+		private const string DefaultBuiltInParameterName = "v";
+
+		public static IList<INamedTypeSymbol> GetAllInterfacesIncludingThis(this ITypeSymbol type)
+		{
+			var allInterfaces = type.AllInterfaces;
+			var namedType = type as INamedTypeSymbol;
+			if (namedType != null && namedType.TypeKind == TypeKind.Interface && !allInterfaces.Contains(namedType))
+			{
+				var result = new List<INamedTypeSymbol>(allInterfaces.Length + 1);
+				result.Add(namedType);
+				result.AddRange(allInterfaces);
+				return result;
+			}
+
+			return allInterfaces;
+		}
+
+		public static bool IsAbstractClass(this ITypeSymbol symbol)
+		{
+			return symbol?.TypeKind == TypeKind.Class && symbol.IsAbstract;
+		}
+
+		public static bool IsSystemVoid(this ITypeSymbol symbol)
+		{
+			return symbol?.SpecialType == SpecialType.System_Void;
+		}
+
+		public static bool IsNullable(this ITypeSymbol symbol)
+		{
+			return symbol?.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T;
+		}
+
+		public static bool IsErrorType(this ITypeSymbol symbol)
+		{
+			return symbol?.TypeKind == TypeKind.Error;
+		}
+
+		public static bool IsModuleType(this ITypeSymbol symbol)
+		{
+			return symbol?.TypeKind == TypeKind.Module;
+		}
+
+		public static bool IsInterfaceType(this ITypeSymbol symbol)
+		{
+			return symbol?.TypeKind == TypeKind.Interface;
+		}
+
+		public static bool IsDelegateType(this ITypeSymbol symbol)
+		{
+			return symbol?.TypeKind == TypeKind.Delegate;
+		}
+
+		public static bool IsAnonymousType(this INamedTypeSymbol symbol)
+		{
+			return symbol?.IsAnonymousType == true;
+		}
+
+//		public static ITypeSymbol RemoveNullableIfPresent(this ITypeSymbol symbol)
+//		{
+//			if (symbol.IsNullable())
+//			{
+//				return symbol.GetTypeArguments().Single();
+//			}
+//
+//			return symbol;
+//		}
+
+//		/// <summary>
+//		/// Returns the corresponding symbol in this type or a base type that implements 
+//		/// interfaceMember (either implicitly or explicitly), or null if no such symbol exists
+//		/// (which might be either because this type doesn't implement the container of
+//		/// interfaceMember, or this type doesn't supply a member that successfully implements
+//		/// interfaceMember).
+//		/// </summary>
+//		public static IEnumerable<ISymbol> FindImplementationsForInterfaceMember(
+//			this ITypeSymbol typeSymbol,
+//			ISymbol interfaceMember,
+//			Workspace workspace,
+//			CancellationToken cancellationToken)
+//		{
+//			// This method can return multiple results.  Consider the case of:
+//			// 
+//			// interface IFoo<X> { void Foo(X x); }
+//			//
+//			// class C : IFoo<int>, IFoo<string> { void Foo(int x); void Foo(string x); }
+//			//
+//			// If you're looking for the implementations of IFoo<X>.Foo then you want to find both
+//			// results in C.
+//
+//			// TODO(cyrusn): Implement this using the actual code for
+//			// TypeSymbol.FindImplementationForInterfaceMember
+//
+//			if (typeSymbol == null || interfaceMember == null)
+//			{
+//				yield break;
+//			}
+//
+//			if (interfaceMember.Kind != SymbolKind.Event &&
+//				interfaceMember.Kind != SymbolKind.Method &&
+//				interfaceMember.Kind != SymbolKind.Property)
+//			{
+//				yield break;
+//			}
+//
+//			// WorkItem(4843)
+//			//
+//			// 'typeSymbol' has to at least implement the interface containing the member.  note:
+//			// this just means that the interface shows up *somewhere* in the inheritance chain of
+//			// this type.  However, this type may not actually say that it implements it.  For
+//			// example:
+//			//
+//			// interface I { void Foo(); }
+//			//
+//			// class B { } 
+//			//
+//			// class C : B, I { }
+//			//
+//			// class D : C { }
+//			//
+//			// D does implement I transitively through C.  However, even if D has a "Foo" method, it
+//			// won't be an implementation of I.Foo.  The implementation of I.Foo must be from a type
+//			// that actually has I in it's direct interface chain, or a type that's a base type of
+//			// that.  in this case, that means only classes C or B.
+//			var interfaceType = interfaceMember.ContainingType;
+//			if (!typeSymbol.ImplementsIgnoringConstruction(interfaceType))
+//			{
+//				yield break;
+//			}
+//
+//			// We've ascertained that the type T implements some constructed type of the form I<X>.
+//			// However, we're not precisely sure which constructions of I<X> are being used.  For
+//			// example, a type C might implement I<int> and I<string>.  If we're searching for a
+//			// method from I<X> we might need to find several methods that implement different
+//			// instantiations of that method.
+//			var originalInterfaceType = interfaceMember.ContainingType.OriginalDefinition;
+//			var originalInterfaceMember = interfaceMember.OriginalDefinition;
+//			var constructedInterfaces = typeSymbol.AllInterfaces.Where(i =>
+//				SymbolEquivalenceComparer.Instance.Equals(i.OriginalDefinition, originalInterfaceType));
+//
+//			foreach (var constructedInterface in constructedInterfaces)
+//			{
+//				cancellationToken.ThrowIfCancellationRequested();
+//				var constructedInterfaceMember = constructedInterface.GetMembers().FirstOrDefault(m =>
+		//					SymbolEquivalenceComparer.Instance.Equals(m.OriginalDefinition, originalInterfaceMember));
+//
+//				if (constructedInterfaceMember == null)
+//				{
+//					continue;
+//				}
+//
+//				// Now we need to walk the base type chain, but we start at the first type that actually
+//				// has the interface directly in its interface hierarchy.
+//				var seenTypeDeclaringInterface = false;
+//				for (var currentType = typeSymbol; currentType != null; currentType = currentType.BaseType)
+//				{
+//					seenTypeDeclaringInterface = seenTypeDeclaringInterface ||
+//						currentType.GetOriginalInterfacesAndTheirBaseInterfaces().Contains(interfaceType.OriginalDefinition);
+//
+//					if (seenTypeDeclaringInterface)
+//					{
+//						var result = constructedInterfaceMember.TypeSwitch(
+//							(IEventSymbol eventSymbol) => FindImplementations(currentType, eventSymbol, workspace, e => e.ExplicitInterfaceImplementations),
+//							(IMethodSymbol methodSymbol) => FindImplementations(currentType, methodSymbol, workspace, m => m.ExplicitInterfaceImplementations),
+//							(IPropertySymbol propertySymbol) => FindImplementations(currentType, propertySymbol, workspace, p => p.ExplicitInterfaceImplementations));
+//
+//						if (result != null)
+//						{
+//							yield return result;
+//							break;
+//						}
+//					}
+//				}
+//			}
+//		}
+//
+//		private static HashSet<INamedTypeSymbol> GetOriginalInterfacesAndTheirBaseInterfaces(
+//			this ITypeSymbol type,
+//			HashSet<INamedTypeSymbol> symbols = null)
+//		{
+//			symbols = symbols ?? new HashSet<INamedTypeSymbol>(SymbolEquivalenceComparer.Instance);
+//
+//			foreach (var interfaceType in type.Interfaces)
+//			{
+//				symbols.Add(interfaceType.OriginalDefinition);
+//				symbols.AddRange(interfaceType.AllInterfaces.Select(i => i.OriginalDefinition));
+//			}
+//
+//			return symbols;
+//		}
+
+//		private static ISymbol FindImplementations<TSymbol>(
+//			ITypeSymbol typeSymbol,
+//			TSymbol interfaceSymbol,
+//			Workspace workspace,
+//			Func<TSymbol, ImmutableArray<TSymbol>> getExplicitInterfaceImplementations) where TSymbol : class, ISymbol
+//		{
+//			// Check the current type for explicit interface matches.  Otherwise, check
+//			// the current type and base types for implicit matches.
+//			var explicitMatches =
+//				from member in typeSymbol.GetMembers().OfType<TSymbol>()
+//					where getExplicitInterfaceImplementations(member).Length > 0
+//				from explicitInterfaceMethod in getExplicitInterfaceImplementations(member)
+//					where SymbolEquivalenceComparer.Instance.Equals(explicitInterfaceMethod, interfaceSymbol)
+//				select member;
+//
+//			var provider = workspace.Services.GetLanguageServices(typeSymbol.Language);
+//			var semanticFacts = provider.GetService<ISemanticFactsService>();
+//
+//			// Even if a language only supports explicit interface implementation, we
+//			// can't enforce it for types from metadata. For example, a VB symbol
+//			// representing System.Xml.XmlReader will say it implements IDisposable, but
+//			// the XmlReader.Dispose() method will not be an explicit implementation of
+//			// IDisposable.Dispose()
+//			if (!semanticFacts.SupportsImplicitInterfaceImplementation &&
+//				typeSymbol.Locations.Any(location => location.IsInSource))
+//			{
+//				return explicitMatches.FirstOrDefault();
+//			}
+//
+//			var syntaxFacts = provider.GetService<ISyntaxFactsService>();
+//			var implicitMatches =
+//				from baseType in typeSymbol.GetBaseTypesAndThis()
+//				from member in baseType.GetMembers(interfaceSymbol.Name).OfType<TSymbol>()
+//					where member.DeclaredAccessibility == Accessibility.Public &&
+//				!member.IsStatic &&
+//				SignatureComparer.Instance.HaveSameSignatureAndConstraintsAndReturnTypeAndAccessors(member, interfaceSymbol, syntaxFacts.IsCaseSensitive)
+//				select member;
+//
+//			return explicitMatches.FirstOrDefault() ?? implicitMatches.FirstOrDefault();
+//		}
+
+		public static IEnumerable<ITypeSymbol> GetContainingTypesAndThis(this ITypeSymbol type)
+		{
+			var current = type;
+			while (current != null)
+			{
+				yield return current;
+				current = current.ContainingType;
+			}
+		}
+
+		public static IEnumerable<INamedTypeSymbol> GetContainingTypes(this ITypeSymbol type)
+		{
+			var current = type.ContainingType;
+			while (current != null)
+			{
+				yield return current;
+				current = current.ContainingType;
+			}
+		}
+
+//		// Determine if "type" inherits from "baseType", ignoring constructed types, and dealing
+//		// only with original types.
+//		public static bool InheritsFromOrEquals(
+//			this ITypeSymbol type, ITypeSymbol baseType)
+//		{
+//			return type.GetBaseTypesAndThis().Contains(t => SymbolEquivalenceComparer.Instance.Equals(t, baseType));
+//		}
+//
+		// Determine if "type" inherits from "baseType", ignoring constructed types, and dealing
+		// only with original types.
+		public static bool InheritsFromOrEqualsIgnoringConstruction(
+			this ITypeSymbol type, ITypeSymbol baseType)
+		{
+			return (bool)inheritsFromOrEqualsIgnoringConstructionMethod.Invoke (null, new [] { type, baseType });
+		}
+//
+//		// Determine if "type" inherits from "baseType", ignoring constructed types, and dealing
+//		// only with original types.
+//		public static bool InheritsFromIgnoringConstruction(
+//			this ITypeSymbol type, ITypeSymbol baseType)
+//		{
+//			var originalBaseType = baseType.OriginalDefinition;
+//
+//			// We could just call GetBaseTypes and foreach over it, but this
+//			// is a hot path in Find All References. This avoid the allocation
+//			// of the enumerator type.
+//			var currentBaseType = type.BaseType;
+//			while (currentBaseType != null)
+//			{
+//				if (SymbolEquivalenceComparer.Instance.Equals(currentBaseType.OriginalDefinition, originalBaseType))
+//				{
+//					return true;
+//				}
+//
+//				currentBaseType = currentBaseType.BaseType;
+//			}
+//
+//			return false;
+//		}
+
+//		public static bool ImplementsIgnoringConstruction(
+//			this ITypeSymbol type, ITypeSymbol interfaceType)
+//		{
+//			var originalInterfaceType = interfaceType.OriginalDefinition;
+//			if (type is INamedTypeSymbol && type.TypeKind == TypeKind.Interface)
+//			{
+//				// Interfaces don't implement other interfaces. They extend them.
+//				return false;
+//			}
+//
+//			return type.AllInterfaces.Any(t => SymbolEquivalenceComparer.Instance.Equals(t.OriginalDefinition, originalInterfaceType));
+//		}
+//
+//		public static bool Implements(
+//			this ITypeSymbol type, ITypeSymbol interfaceType)
+//		{
+//			return type.AllInterfaces.Contains(t => SymbolEquivalenceComparer.Instance.Equals(t, interfaceType));
+//		}
+//
+		public static bool IsAttribute(this ITypeSymbol symbol)
+		{
+			for (var b = symbol.BaseType; b != null; b = b.BaseType)
+			{
+				if (b.MetadataName == "Attribute" &&
+					b.ContainingType == null &&
+					b.ContainingNamespace != null &&
+					b.ContainingNamespace.Name == "System" &&
+					b.ContainingNamespace.ContainingNamespace != null &&
+					b.ContainingNamespace.ContainingNamespace.IsGlobalNamespace)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+		readonly static MethodInfo removeUnavailableTypeParametersMethod;
+
+		public static ITypeSymbol RemoveUnavailableTypeParameters(
+			this ITypeSymbol type,
+			Compilation compilation,
+			IEnumerable<ITypeParameterSymbol> availableTypeParameters)
+		{
+			try {
+				return (ITypeSymbol)removeUnavailableTypeParametersMethod.Invoke (null, new object[] { type, compilation, availableTypeParameters });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		public static ITypeSymbol RemoveAnonymousTypes(
+			this ITypeSymbol type,
+			Compilation compilation)
+		{
+			return type?.Accept(new AnonymousTypeRemover(compilation));
+		}
+
+		private class AnonymousTypeRemover : SymbolVisitor<ITypeSymbol>
+		{
+			private readonly Compilation _compilation;
+
+			public AnonymousTypeRemover(Compilation compilation)
+			{
+				_compilation = compilation;
+			}
+
+			public override ITypeSymbol DefaultVisit(ISymbol node)
+			{
+				throw new NotImplementedException();
+			}
+
+			public override ITypeSymbol VisitDynamicType(IDynamicTypeSymbol symbol)
+			{
+				return symbol;
+			}
+
+			public override ITypeSymbol VisitArrayType(IArrayTypeSymbol symbol)
+			{
+				var elementType = symbol.ElementType.Accept(this);
+				if (elementType != null && elementType.Equals(symbol.ElementType))
+				{
+					return symbol;
+				}
+
+				return _compilation.CreateArrayTypeSymbol(elementType, symbol.Rank);
+			}
+
+			public override ITypeSymbol VisitNamedType(INamedTypeSymbol symbol)
+			{
+				if (symbol.IsNormalAnonymousType() ||
+					symbol.IsAnonymousDelegateType())
+				{
+					return _compilation.ObjectType;
+				}
+
+				var arguments = symbol.TypeArguments.Select(t => t.Accept(this)).ToArray();
+				if (arguments.SequenceEqual(symbol.TypeArguments))
+				{
+					return symbol;
+				}
+
+				return symbol.ConstructedFrom.Construct(arguments.ToArray());
+			}
+
+			public override ITypeSymbol VisitPointerType(IPointerTypeSymbol symbol)
+			{
+				var elementType = symbol.PointedAtType.Accept(this);
+				if (elementType != null && elementType.Equals(symbol.PointedAtType))
+				{
+					return symbol;
+				}
+
+				return _compilation.CreatePointerTypeSymbol(elementType);
+			}
+
+			public override ITypeSymbol VisitTypeParameter(ITypeParameterSymbol symbol)
+			{
+				return symbol;
+			}
+		}
+
+		readonly static MethodInfo replaceTypeParametersBasedOnTypeConstraintsMethod;
+		public static ITypeSymbol ReplaceTypeParametersBasedOnTypeConstraints(
+			this ITypeSymbol type,
+			Compilation compilation,
+			IEnumerable<ITypeParameterSymbol> availableTypeParameters,
+			Solution solution,
+			CancellationToken cancellationToken)
+		{
+			try {
+				return (ITypeSymbol)replaceTypeParametersBasedOnTypeConstraintsMethod.Invoke (null, new object[] { type, compilation, availableTypeParameters, solution, cancellationToken});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		readonly static MethodInfo removeUnnamedErrorTypesMethod;
+		public static ITypeSymbol RemoveUnnamedErrorTypes(
+			this ITypeSymbol type,
+			Compilation compilation)
+		{
+			try {
+				return (ITypeSymbol)removeUnnamedErrorTypesMethod.Invoke (null, new object[] { type, compilation });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		public static IList<ITypeParameterSymbol> GetReferencedMethodTypeParameters(
+			this ITypeSymbol type, IList<ITypeParameterSymbol> result = null)
+		{
+			result = result ?? new List<ITypeParameterSymbol>();
+			type?.Accept(new CollectTypeParameterSymbolsVisitor(result, onlyMethodTypeParameters: true));
+			return result;
+		}
+
+		public static IList<ITypeParameterSymbol> GetReferencedTypeParameters(
+			this ITypeSymbol type, IList<ITypeParameterSymbol> result = null)
+		{
+			result = result ?? new List<ITypeParameterSymbol>();
+			type?.Accept(new CollectTypeParameterSymbolsVisitor(result, onlyMethodTypeParameters: false));
+			return result;
+		}
+
+		private class CollectTypeParameterSymbolsVisitor : SymbolVisitor
+		{
+			private readonly HashSet<ISymbol> _visited = new HashSet<ISymbol>();
+			private readonly bool _onlyMethodTypeParameters;
+			private readonly IList<ITypeParameterSymbol> _typeParameters;
+
+			public CollectTypeParameterSymbolsVisitor(
+				IList<ITypeParameterSymbol> typeParameters,
+				bool onlyMethodTypeParameters)
+			{
+				_onlyMethodTypeParameters = onlyMethodTypeParameters;
+				_typeParameters = typeParameters;
+			}
+
+			public override void DefaultVisit(ISymbol node)
+			{
+				throw new NotImplementedException();
+			}
+
+			public override void VisitDynamicType(IDynamicTypeSymbol symbol)
+			{
+			}
+
+			public override void VisitArrayType(IArrayTypeSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return;
+				}
+
+				symbol.ElementType.Accept(this);
+			}
+
+			public override void VisitNamedType(INamedTypeSymbol symbol)
+			{
+				if (_visited.Add(symbol))
+				{
+					foreach (var child in symbol.GetAllTypeArguments())
+					{
+						child.Accept(this);
+					}
+				}
+			}
+
+			public override void VisitPointerType(IPointerTypeSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return;
+				}
+
+				symbol.PointedAtType.Accept(this);
+			}
+
+			public override void VisitTypeParameter(ITypeParameterSymbol symbol)
+			{
+				if (_visited.Add(symbol))
+				{
+					if (symbol.TypeParameterKind == TypeParameterKind.Method || !_onlyMethodTypeParameters)
+					{
+						if (!_typeParameters.Contains(symbol))
+						{
+							_typeParameters.Add(symbol);
+						}
+					}
+
+					foreach (var constraint in symbol.ConstraintTypes)
+					{
+						constraint.Accept(this);
+					}
+				}
+			}
+		}
+
+		readonly static MethodInfo substituteTypesMethod;
+		public static ITypeSymbol SubstituteTypes<TType1, TType2>(
+			this ITypeSymbol type,
+			IDictionary<TType1, TType2> mapping,
+			Compilation compilation)
+			where TType1 : ITypeSymbol
+			where TType2 : ITypeSymbol
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type");
+			try {
+				return (ITypeSymbol)substituteTypesMethod.MakeGenericMethod (typeof(TType1), typeof(TType2)).Invoke (null, new object[] { type, mapping, compilation });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		readonly static MethodInfo substituteTypesMethod2;
+		public static ITypeSymbol SubstituteTypes<TType1, TType2>(
+			this ITypeSymbol type,
+			IDictionary<TType1, TType2> mapping,
+			TypeGenerator typeGenerator)
+			where TType1 : ITypeSymbol
+			where TType2 : ITypeSymbol
+		{
+			try {
+				return (ITypeSymbol)substituteTypesMethod2.MakeGenericMethod (typeof(TType1), typeof(TType2)).Invoke (null, new object[] { type, mapping, typeGenerator.Instance });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+
+		public static bool IsUnexpressableTypeParameterConstraint(this ITypeSymbol typeSymbol)
+		{
+			if (typeSymbol.IsSealed || typeSymbol.IsValueType)
+			{
+				return true;
+			}
+
+			switch (typeSymbol.TypeKind)
+			{
+			case TypeKind.Array:
+			case TypeKind.Delegate:
+				return true;
+			}
+
+			switch (typeSymbol.SpecialType)
+			{
+			case SpecialType.System_Array:
+			case SpecialType.System_Delegate:
+			case SpecialType.System_MulticastDelegate:
+			case SpecialType.System_Enum:
+			case SpecialType.System_ValueType:
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsNumericType(this ITypeSymbol type)
+		{
+			if (type != null)
+			{
+				switch (type.SpecialType)
+				{
+				case SpecialType.System_Byte:
+				case SpecialType.System_SByte:
+				case SpecialType.System_Int16:
+				case SpecialType.System_UInt16:
+				case SpecialType.System_Int32:
+				case SpecialType.System_UInt32:
+				case SpecialType.System_Int64:
+				case SpecialType.System_UInt64:
+				case SpecialType.System_Single:
+				case SpecialType.System_Double:
+				case SpecialType.System_Decimal:
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static Accessibility DetermineMinimalAccessibility(this ITypeSymbol typeSymbol)
+		{
+			return typeSymbol.Accept(MinimalAccessibilityVisitor.Instance);
+		}
+		private class MinimalAccessibilityVisitor : SymbolVisitor<Accessibility>
+		{
+			public static readonly SymbolVisitor<Accessibility> Instance = new MinimalAccessibilityVisitor();
+
+			public override Accessibility DefaultVisit(ISymbol node)
+			{
+				throw new NotImplementedException();
+			}
+
+			public override Accessibility VisitAlias(IAliasSymbol symbol)
+			{
+				return symbol.Target.Accept(this);
+			}
+
+			public override Accessibility VisitArrayType(IArrayTypeSymbol symbol)
+			{
+				return symbol.ElementType.Accept(this);
+			}
+
+			public override Accessibility VisitDynamicType(IDynamicTypeSymbol symbol)
+			{
+				return Accessibility.Public;
+			}
+
+			public override Accessibility VisitNamedType(INamedTypeSymbol symbol)
+			{
+				var accessibility = symbol.DeclaredAccessibility;
+
+				foreach (var arg in symbol.TypeArguments)
+				{
+					accessibility = CommonAccessibilityUtilities.Minimum(accessibility, arg.Accept(this));
+				}
+
+				if (symbol.ContainingType != null)
+				{
+					accessibility = CommonAccessibilityUtilities.Minimum(accessibility, symbol.ContainingType.Accept(this));
+				}
+
+				return accessibility;
+			}
+
+			public override Accessibility VisitPointerType(IPointerTypeSymbol symbol)
+			{
+				return symbol.PointedAtType.Accept(this);
+			}
+
+			public override Accessibility VisitTypeParameter(ITypeParameterSymbol symbol)
+			{
+				// TODO(cyrusn): Do we have to consider the constraints?
+				return Accessibility.Public;
+			}
+		}
+		public static bool ContainsAnonymousType(this ITypeSymbol symbol)
+		{
+			return symbol.TypeSwitch(
+				(IArrayTypeSymbol a) => ContainsAnonymousType(a.ElementType),
+				(IPointerTypeSymbol p) => ContainsAnonymousType(p.PointedAtType),
+				(INamedTypeSymbol n) => ContainsAnonymousType(n),
+				_ => false);
+		}
+
+		private static bool ContainsAnonymousType(INamedTypeSymbol type)
+		{
+			if (type.IsAnonymousType)
+			{
+				return true;
+			}
+
+			foreach (var typeArg in type.GetAllTypeArguments())
+			{
+				if (ContainsAnonymousType(typeArg))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static string CreateParameterName(this ITypeSymbol type, bool capitalize = false)
+		{
+			while (true)
+			{
+				var arrayType = type as IArrayTypeSymbol;
+				if (arrayType != null)
+				{
+					type = arrayType.ElementType;
+					continue;
+				}
+
+				var pointerType = type as IPointerTypeSymbol;
+				if (pointerType != null)
+				{
+					type = pointerType.PointedAtType;
+					continue;
+				}
+
+				break;
+			}
+
+			var shortName = GetParameterName(type);
+			return capitalize ? shortName.ToPascalCase() : shortName.ToCamelCase();
+		}
+
+		private static string GetParameterName(ITypeSymbol type)
+		{
+			if (type == null || type.IsAnonymousType())
+			{
+				return DefaultParameterName;
+			}
+
+			if (type.IsSpecialType() || type.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T)
+			{
+				return DefaultBuiltInParameterName;
+			}
+
+			var shortName = type.GetShortName();
+			return shortName.Length == 0
+				? DefaultParameterName
+					: shortName;
+		}
+
+		private static bool IsSpecialType(this ITypeSymbol symbol)
+		{
+			if (symbol != null)
+			{
+				switch (symbol.SpecialType)
+				{
+				case SpecialType.System_Object:
+				case SpecialType.System_Void:
+				case SpecialType.System_Boolean:
+				case SpecialType.System_SByte:
+				case SpecialType.System_Byte:
+				case SpecialType.System_Decimal:
+				case SpecialType.System_Single:
+				case SpecialType.System_Double:
+				case SpecialType.System_Int16:
+				case SpecialType.System_Int32:
+				case SpecialType.System_Int64:
+				case SpecialType.System_Char:
+				case SpecialType.System_String:
+				case SpecialType.System_UInt16:
+				case SpecialType.System_UInt32:
+				case SpecialType.System_UInt64:
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool CanSupportCollectionInitializer(this ITypeSymbol typeSymbol)
+		{
+			if (typeSymbol.AllInterfaces.Any (i => i.SpecialType == SpecialType.System_Collections_IEnumerable)) {
+				var curType = typeSymbol;
+				while (curType != null) {
+					if (HasAddMethod (curType))
+						return true;
+					curType = curType.BaseType;
+				}
+			}
+			return false;
+		}
+
+		static bool HasAddMethod (ITypeSymbol typeSymbol)
+		{
+			return typeSymbol
+				.GetMembers (WellKnownMemberNames.CollectionInitializerAddMethodName)
+				.OfType<IMethodSymbol> ().Any (m => m.Parameters.Any ());
+		}
+
+		public static INamedTypeSymbol GetDelegateType(this ITypeSymbol typeSymbol, Compilation compilation)
+		{
+			if (typeSymbol != null)
+			{
+				var expressionOfT = compilation.ExpressionOfTType();
+				if (typeSymbol.OriginalDefinition.Equals(expressionOfT))
+				{
+					var typeArgument = ((INamedTypeSymbol)typeSymbol).TypeArguments[0];
+					return typeArgument as INamedTypeSymbol;
+				}
+
+				if (typeSymbol.IsDelegateType())
+				{
+					return typeSymbol as INamedTypeSymbol;
+				}
+			}
+
+			return null;
+		}
+
+		public static IEnumerable<T> GetAccessibleMembersInBaseTypes<T>(this ITypeSymbol containingType, ISymbol within) where T : class, ISymbol
+		{
+			if (containingType == null)
+			{
+				return SpecializedCollections.EmptyEnumerable<T>();
+			}
+
+			var types = containingType.GetBaseTypes();
+			return types.SelectMany(x => x.GetMembers().OfType<T>().Where(m => m.IsAccessibleWithin(within)));
+		}
+
+		public static IEnumerable<T> GetAccessibleMembersInThisAndBaseTypes<T>(this ITypeSymbol containingType, ISymbol within) where T : class, ISymbol
+		{
+			if (containingType == null)
+			{
+				return SpecializedCollections.EmptyEnumerable<T>();
+			}
+
+			var types = containingType.GetBaseTypesAndThis();
+			return types.SelectMany(x => x.GetMembers().OfType<T>().Where(m => m.IsAccessibleWithin(within)));
+		}
+
+		public static bool? AreMoreSpecificThan(this IList<ITypeSymbol> t1, IList<ITypeSymbol> t2)
+		{
+			if (t1.Count != t2.Count)
+			{
+				return null;
+			}
+
+			// For t1 to be more specific than t2, it has to be not less specific in every member,
+			// and more specific in at least one.
+
+			bool? result = null;
+			for (int i = 0; i < t1.Count; ++i)
+			{
+				var r = t1[i].IsMoreSpecificThan(t2[i]);
+				if (r == null)
+				{
+					// We learned nothing. Do nothing.
+				}
+				else if (result == null)
+				{
+					// We have found the first more specific type. See if
+					// all the rest on this side are not less specific.
+					result = r;
+				}
+				else if (result != r)
+				{
+					// We have more specific types on both left and right, so we 
+					// cannot succeed in picking a better type list. Bail out now.
+					return null;
+				}
+			}
+
+			return result;
+		}
+
+		private static bool? IsMoreSpecificThan(this ITypeSymbol t1, ITypeSymbol t2)
+		{
+			// SPEC: A type parameter is less specific than a non-type parameter. 
+
+			var isTypeParameter1 = t1 is ITypeParameterSymbol;
+			var isTypeParameter2 = t2 is ITypeParameterSymbol;
+
+			if (isTypeParameter1 && !isTypeParameter2)
+			{
+				return false;
+			}
+
+			if (!isTypeParameter1 && isTypeParameter2)
+			{
+				return true;
+			}
+
+			if (isTypeParameter1)
+			{
+				Debug.Assert(isTypeParameter2);
+				return null;
+			}
+
+			if (t1.TypeKind != t2.TypeKind)
+			{
+				return null;
+			}
+
+			// There is an identity conversion between the types and they are both substitutions on type parameters.
+			// They had better be the same kind.
+
+			// UNDONE: Strip off the dynamics.
+
+			// SPEC: An array type is more specific than another
+			// SPEC: array type (with the same number of dimensions) 
+			// SPEC: if the element type of the first is
+			// SPEC: more specific than the element type of the second.
+
+			if (t1 is IArrayTypeSymbol)
+			{
+				var arr1 = (IArrayTypeSymbol)t1;
+				var arr2 = (IArrayTypeSymbol)t2;
+
+				// We should not have gotten here unless there were identity conversions
+				// between the two types.
+
+				return arr1.ElementType.IsMoreSpecificThan(arr2.ElementType);
+			}
+
+			// SPEC EXTENSION: We apply the same rule to pointer types. 
+
+			if (t1 is IPointerTypeSymbol)
+			{
+				var p1 = (IPointerTypeSymbol)t1;
+				var p2 = (IPointerTypeSymbol)t2;
+				return p1.PointedAtType.IsMoreSpecificThan(p2.PointedAtType);
+			}
+
+			// SPEC: A constructed type is more specific than another
+			// SPEC: constructed type (with the same number of type arguments) if at least one type
+			// SPEC: argument is more specific and no type argument is less specific than the
+			// SPEC: corresponding type argument in the other. 
+
+			var n1 = t1 as INamedTypeSymbol;
+			var n2 = t2 as INamedTypeSymbol;
+
+			if (n1 == null)
+			{
+				return null;
+			}
+
+			// We should not have gotten here unless there were identity conversions between the
+			// two types.
+
+			var allTypeArgs1 = n1.GetAllTypeArguments().ToList();
+			var allTypeArgs2 = n2.GetAllTypeArguments().ToList();
+
+			return allTypeArgs1.AreMoreSpecificThan(allTypeArgs2);
+		}
+
+		public static bool IsOrDerivesFromExceptionType(this ITypeSymbol type, Compilation compilation)
+		{
+			if (type != null)
+			{
+				foreach (var baseType in type.GetBaseTypesAndThis())
+				{
+					if (baseType.Equals(compilation.ExceptionType()))
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsEnumType(this ITypeSymbol type)
+		{
+			return type.IsValueType && type.TypeKind == TypeKind.Enum;
+		}
+
+
+		public static async Task<ISymbol> FindApplicableAlias(this ITypeSymbol type, int position, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			if (semanticModel.IsSpeculativeSemanticModel)
+			{
+				position = semanticModel.OriginalPositionForSpeculation;
+				semanticModel = semanticModel.ParentModel;
+			}
+
+			var root = await semanticModel.SyntaxTree.GetRootAsync(cancellationToken).ConfigureAwait(false);
+
+			IEnumerable<UsingDirectiveSyntax> applicableUsings = GetApplicableUsings(position, root as CompilationUnitSyntax);
+			foreach (var applicableUsing in applicableUsings)
+			{
+				var alias = semanticModel.GetOriginalSemanticModel().GetDeclaredSymbol(applicableUsing, cancellationToken) as IAliasSymbol;
+
+				if (alias != null && alias.Target == type)
+				{
+					return alias;
+				}
+			}
+
+			return null;
+		}
+
+		private static IEnumerable<UsingDirectiveSyntax> GetApplicableUsings(int position, SyntaxNode root)
+		{
+			var namespaceUsings = root.FindToken(position).Parent.GetAncestors<NamespaceDeclarationSyntax>().SelectMany(n => n.Usings);
+			var allUsings = root is CompilationUnitSyntax
+				? ((CompilationUnitSyntax)root).Usings.Concat(namespaceUsings)
+				: namespaceUsings;
+			return allUsings.Where(u => u.Alias != null);
+		}
+
+		public static ITypeSymbol RemoveNullableIfPresent(this ITypeSymbol symbol)
+		{
+			if (symbol.IsNullable())
+			{
+				return symbol.GetTypeArguments().Single();
+			}
+
+			return symbol;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/ImmutableArrayExtensions.cs b/main/src/addins/CSharpBinding/Util/ImmutableArrayExtensions.cs
new file mode 100644
index 0000000000..559c626422
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ImmutableArrayExtensions.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class ImmutableArrayExtensions
+	{
+		public static ImmutableArray<T> ToImmutableArrayOrEmpty<T>(this IEnumerable<T> items)
+		{
+			if (items == null)
+			{
+				return ImmutableArray.Create<T>();
+			}
+
+			return ImmutableArray.CreateRange<T>(items);
+		}
+
+		public static ImmutableArray<T> ToImmutableArrayOrEmpty<T>(this ImmutableArray<T> items)
+		{
+			if (items.IsDefault)
+			{
+				return ImmutableArray.Create<T>();
+			}
+
+			return items;
+		}
+
+		// same as Array.BinarySearch but the ability to pass arbitrary value to the comparer without allocation
+		public static int BinarySearch<TElement, TValue>(this ImmutableArray<TElement> array, TValue value, Func<TElement, TValue, int> comparer)
+		{
+			int low = 0;
+			int high = array.Length - 1;
+
+			while (low <= high)
+			{
+				int middle = low + ((high - low) >> 1);
+				int comparison = comparer(array[middle], value);
+
+				if (comparison == 0)
+				{
+					return middle;
+				}
+
+				if (comparison > 0)
+				{
+					high = middle - 1;
+				}
+				else
+				{
+					low = middle + 1;
+				}
+			}
+
+			return ~low;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/LinkedListExtension.cs b/main/src/addins/CSharpBinding/Util/LinkedListExtension.cs
new file mode 100644
index 0000000000..af02a85afb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/LinkedListExtension.cs
@@ -0,0 +1,50 @@
+//
+// LinkedListExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class LinkedListExtensions
+	{
+		public static void AddRangeAtHead<T>(this LinkedList<T> list, IEnumerable<T> values)
+		{
+			var currentNode = default(LinkedListNode<T>);
+			foreach (var value in values)
+			{
+				if (currentNode == null)
+				{
+					currentNode = list.AddFirst(value);
+				}
+				else
+				{
+					currentNode = list.AddAfter(currentNode, value);
+				}
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/Matcher.cs b/main/src/addins/CSharpBinding/Util/Matcher.cs
new file mode 100644
index 0000000000..4a0c90db95
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/Matcher.cs
@@ -0,0 +1,188 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using Microsoft.CodeAnalysis.Text;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	abstract class Matcher<T>
+	{
+		// Tries to match this matcher against the provided sequence at the given index.  If the
+		// match succeeds, 'true' is returned, and 'index' points to the location after the match
+		// ends.  If the match fails, then false it returned and index remains the same.  Note: the
+		// matcher does not need to consume to the end of the sequence to succeed.
+		public abstract bool TryMatch(IList<T> sequence, ref int index);
+
+		internal static Matcher<T> Repeat(Matcher<T> matcher)
+		{
+			return new RepeatMatcher(matcher);
+		}
+
+		internal static Matcher<T> OneOrMore(Matcher<T> matcher)
+		{
+			// m+ is the same as (m m*)
+			return Sequence(matcher, Repeat(matcher));
+		}
+
+		internal static Matcher<T> Choice(Matcher<T> matcher1, Matcher<T> matcher2)
+		{
+			return new ChoiceMatcher(matcher1, matcher2);
+		}
+
+		internal static Matcher<T> Sequence(params Matcher<T>[] matchers)
+		{
+			return new SequenceMatcher(matchers);
+		}
+
+		internal static Matcher<T> Single(Func<T, bool> predicate, string description)
+		{
+			return new SingleMatcher(predicate, description);
+		}
+		private class ChoiceMatcher : Matcher<T>
+		{
+			private readonly Matcher<T> _matcher1;
+			private readonly Matcher<T> _matcher2;
+
+			public ChoiceMatcher(Matcher<T> matcher1, Matcher<T> matcher2)
+			{
+				_matcher1 = matcher1;
+				_matcher2 = matcher2;
+			}
+
+			public override bool TryMatch(IList<T> sequence, ref int index)
+			{
+				return
+					_matcher1.TryMatch(sequence, ref index) ||
+					_matcher2.TryMatch(sequence, ref index);
+			}
+
+			public override string ToString()
+			{
+				return string.Format("({0}|{1})", _matcher1, _matcher2);
+			}
+		}
+		private class RepeatMatcher : Matcher<T>
+		{
+			private readonly Matcher<T> _matcher;
+
+			public RepeatMatcher(Matcher<T> matcher)
+			{
+				_matcher = matcher;
+			}
+
+			public override bool TryMatch(IList<T> sequence, ref int index)
+			{
+				while (_matcher.TryMatch(sequence, ref index))
+				{
+				}
+
+				return true;
+			}
+
+			public override string ToString()
+			{
+				return string.Format("({0}*)", _matcher);
+			}
+		}
+		private class SequenceMatcher : Matcher<T>
+		{
+			private readonly Matcher<T>[] _matchers;
+
+			public SequenceMatcher(params Matcher<T>[] matchers)
+			{
+				_matchers = matchers;
+			}
+
+			public override bool TryMatch(IList<T> sequence, ref int index)
+			{
+				var currentIndex = index;
+				foreach (var matcher in _matchers)
+				{
+					if (!matcher.TryMatch(sequence, ref currentIndex))
+					{
+						return false;
+					}
+				}
+
+				index = currentIndex;
+				return true;
+			}
+
+			public override string ToString()
+			{
+				return string.Format("({0})", string.Join(",", (object[])_matchers));
+			}
+		}
+		private class SingleMatcher : Matcher<T>
+		{
+			private readonly Func<T, bool> _predicate;
+			private readonly string _description;
+
+			public SingleMatcher(Func<T, bool> predicate, string description)
+			{
+				_predicate = predicate;
+				_description = description;
+			}
+
+			public override bool TryMatch(IList<T> sequence, ref int index)
+			{
+				if (index < sequence.Count && _predicate(sequence[index]))
+				{
+					index++;
+					return true;
+				}
+
+				return false;
+			}
+
+			public override string ToString()
+			{
+				return _description;
+			}
+		}
+	}
+
+	class Matcher
+	{
+		/// <summary>
+		/// Matcher equivalent to (m*)
+		/// </summary>
+		public static Matcher<T> Repeat<T>(Matcher<T> matcher)
+		{
+			return Matcher<T>.Repeat(matcher);
+		}
+
+		/// <summary>
+		/// Matcher equivalent to (m+)
+		/// </summary>
+		public static Matcher<T> OneOrMore<T>(Matcher<T> matcher)
+		{
+			return Matcher<T>.OneOrMore(matcher);
+		}
+
+		/// <summary>
+		/// Matcher equivalent to (m_1|m_2)
+		/// </summary>
+		public static Matcher<T> Choice<T>(Matcher<T> matcher1, Matcher<T> matcher2)
+		{
+			return Matcher<T>.Choice(matcher1, matcher2);
+		}
+
+		/// <summary>
+		/// Matcher equivalent to (m_1 ... m_n)
+		/// </summary>
+		public static Matcher<T> Sequence<T>(params Matcher<T>[] matchers)
+		{
+			return Matcher<T>.Sequence(matchers);
+		}
+
+		/// <summary>
+		/// Matcher that matches an element if the provide predicate returns true.
+		/// </summary>
+		public static Matcher<T> Single<T>(Func<T, bool> predicate, string description)
+		{
+			return Matcher<T>.Single(predicate, description);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/MemberDeclarationSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/MemberDeclarationSyntaxExtensions.cs
new file mode 100644
index 0000000000..2b48ad393b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/MemberDeclarationSyntaxExtensions.cs
@@ -0,0 +1,341 @@
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static partial class MemberDeclarationSyntaxExtensions
+	{
+//		private static readonly ConditionalWeakTable<MemberDeclarationSyntax, Dictionary<string, ImmutableArray<SyntaxToken>>> s_declarationCache =
+//			new ConditionalWeakTable<MemberDeclarationSyntax, Dictionary<string, ImmutableArray<SyntaxToken>>>();
+//		private static readonly ConditionalWeakTable<MemberDeclarationSyntax, Dictionary<string, ImmutableArray<SyntaxToken>>>.CreateValueCallback s_createLocalDeclarationMap = CreateLocalDeclarationMap;
+//
+//		public static Microsoft.CodeAnalysis.CSharp.Extensions.MemberDeclarationSyntaxExtensions.LocalDeclarationMap GetLocalDeclarationMap(this MemberDeclarationSyntax member)
+//		{
+//			var result = s_declarationCache.GetValue(member, s_createLocalDeclarationMap);
+//			return new Microsoft.CodeAnalysis.CSharp.Extensions.MemberDeclarationSyntaxExtensions.LocalDeclarationMap(result);
+//		}
+
+//		private static Dictionary<string, ImmutableArray<SyntaxToken>> CreateLocalDeclarationMap(MemberDeclarationSyntax member)
+//		{
+//			var dictionary = DeclarationFinder.GetAllDeclarations(member);
+//			return dictionary.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.AsImmutable<SyntaxToken>());
+//		}
+
+		public static SyntaxList<AttributeListSyntax> GetAttributes(this MemberDeclarationSyntax member)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.EnumDeclaration:
+					return ((EnumDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.EnumMemberDeclaration:
+					return ((EnumMemberDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.ClassDeclaration:
+				case SyntaxKind.InterfaceDeclaration:
+				case SyntaxKind.StructDeclaration:
+					return ((TypeDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.FieldDeclaration:
+					return ((FieldDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.EventFieldDeclaration:
+					return ((EventFieldDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.ConstructorDeclaration:
+					return ((ConstructorDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.DestructorDeclaration:
+					return ((DestructorDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.PropertyDeclaration:
+					return ((PropertyDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.EventDeclaration:
+					return ((EventDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.IndexerDeclaration:
+					return ((IndexerDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.OperatorDeclaration:
+					return ((OperatorDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.ConversionOperatorDeclaration:
+					return ((ConversionOperatorDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).AttributeLists;
+				case SyntaxKind.IncompleteMember:
+					return ((IncompleteMemberSyntax)member).AttributeLists;
+				}
+			}
+
+			return SyntaxFactory.List<AttributeListSyntax>();
+		}
+
+		public static SyntaxToken GetNameToken(this MemberDeclarationSyntax member)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.EnumDeclaration:
+					return ((EnumDeclarationSyntax)member).Identifier;
+				case SyntaxKind.ClassDeclaration:
+				case SyntaxKind.InterfaceDeclaration:
+				case SyntaxKind.StructDeclaration:
+					return ((TypeDeclarationSyntax)member).Identifier;
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).Identifier;
+				case SyntaxKind.FieldDeclaration:
+					return ((FieldDeclarationSyntax)member).Declaration.Variables.First().Identifier;
+				case SyntaxKind.EventFieldDeclaration:
+					return ((EventFieldDeclarationSyntax)member).Declaration.Variables.First().Identifier;
+				case SyntaxKind.PropertyDeclaration:
+					return ((PropertyDeclarationSyntax)member).Identifier;
+				case SyntaxKind.EventDeclaration:
+					return ((EventDeclarationSyntax)member).Identifier;
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).Identifier;
+				}
+			}
+
+			// Constructors, destructors, indexers and operators don't have names.
+			return default(SyntaxToken);
+		}
+
+		public static int GetArity(this MemberDeclarationSyntax member)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.ClassDeclaration:
+				case SyntaxKind.InterfaceDeclaration:
+				case SyntaxKind.StructDeclaration:
+					return ((TypeDeclarationSyntax)member).Arity;
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).Arity;
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).Arity;
+				}
+			}
+
+			return 0;
+		}
+
+		public static TypeParameterListSyntax GetTypeParameterList(this MemberDeclarationSyntax member)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.ClassDeclaration:
+				case SyntaxKind.InterfaceDeclaration:
+				case SyntaxKind.StructDeclaration:
+					return ((TypeDeclarationSyntax)member).TypeParameterList;
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).TypeParameterList;
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).TypeParameterList;
+				}
+			}
+
+			return null;
+		}
+
+		public static BaseParameterListSyntax GetParameterList(this MemberDeclarationSyntax member)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).ParameterList;
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).ParameterList;
+				case SyntaxKind.ConstructorDeclaration:
+					return ((ConstructorDeclarationSyntax)member).ParameterList;
+				case SyntaxKind.IndexerDeclaration:
+					return ((IndexerDeclarationSyntax)member).ParameterList;
+				case SyntaxKind.OperatorDeclaration:
+					return ((OperatorDeclarationSyntax)member).ParameterList;
+				case SyntaxKind.ConversionOperatorDeclaration:
+					return ((ConversionOperatorDeclarationSyntax)member).ParameterList;
+				}
+			}
+
+			return null;
+		}
+
+		public static MemberDeclarationSyntax WithParameterList(
+			this MemberDeclarationSyntax member,
+			BaseParameterListSyntax parameterList)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).WithParameterList((ParameterListSyntax)parameterList);
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).WithParameterList((ParameterListSyntax)parameterList);
+				case SyntaxKind.ConstructorDeclaration:
+					return ((ConstructorDeclarationSyntax)member).WithParameterList((ParameterListSyntax)parameterList);
+				case SyntaxKind.IndexerDeclaration:
+					return ((IndexerDeclarationSyntax)member).WithParameterList((BracketedParameterListSyntax)parameterList);
+				case SyntaxKind.OperatorDeclaration:
+					return ((OperatorDeclarationSyntax)member).WithParameterList((ParameterListSyntax)parameterList);
+				case SyntaxKind.ConversionOperatorDeclaration:
+					return ((ConversionOperatorDeclarationSyntax)member).WithParameterList((ParameterListSyntax)parameterList);
+				}
+			}
+
+			return null;
+		}
+
+		public static MemberDeclarationSyntax AddAttributeLists(
+			this MemberDeclarationSyntax member,
+			params AttributeListSyntax[] attributeLists)
+		{
+			return member.WithAttributeLists(member.GetAttributes().AddRange(attributeLists));
+		}
+
+		public static MemberDeclarationSyntax WithAttributeLists(
+			this MemberDeclarationSyntax member,
+			SyntaxList<AttributeListSyntax> attributeLists)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.EnumDeclaration:
+					return ((EnumDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.EnumMemberDeclaration:
+					return ((EnumMemberDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.ClassDeclaration:
+				case SyntaxKind.InterfaceDeclaration:
+				case SyntaxKind.StructDeclaration:
+					return ((TypeDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.FieldDeclaration:
+					return ((FieldDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.EventFieldDeclaration:
+					return ((EventFieldDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.ConstructorDeclaration:
+					return ((ConstructorDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.DestructorDeclaration:
+					return ((DestructorDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.PropertyDeclaration:
+					return ((PropertyDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.EventDeclaration:
+					return ((EventDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.IndexerDeclaration:
+					return ((IndexerDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.OperatorDeclaration:
+					return ((OperatorDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.ConversionOperatorDeclaration:
+					return ((ConversionOperatorDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).WithAttributeLists(attributeLists);
+				case SyntaxKind.IncompleteMember:
+					return ((IncompleteMemberSyntax)member).WithAttributeLists(attributeLists);
+				}
+			}
+
+			return null;
+		}
+
+		public static TypeSyntax GetMemberType(this MemberDeclarationSyntax member)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).ReturnType;
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).ReturnType;
+				case SyntaxKind.OperatorDeclaration:
+					return ((OperatorDeclarationSyntax)member).ReturnType;
+				case SyntaxKind.PropertyDeclaration:
+					return ((PropertyDeclarationSyntax)member).Type;
+				case SyntaxKind.IndexerDeclaration:
+					return ((IndexerDeclarationSyntax)member).Type;
+				case SyntaxKind.EventDeclaration:
+					return ((EventDeclarationSyntax)member).Type;
+				case SyntaxKind.EventFieldDeclaration:
+					return ((EventFieldDeclarationSyntax)member).Declaration.Type;
+				case SyntaxKind.FieldDeclaration:
+					return ((FieldDeclarationSyntax)member).Declaration.Type;
+				}
+			}
+
+			return null;
+		}
+
+		public static bool HasMethodShape(this MemberDeclarationSyntax memberDeclaration)
+		{
+			if (memberDeclaration != null)
+			{
+				switch (memberDeclaration.Kind())
+				{
+				case SyntaxKind.MethodDeclaration:
+				case SyntaxKind.OperatorDeclaration:
+				case SyntaxKind.ConversionOperatorDeclaration:
+				case SyntaxKind.ConstructorDeclaration:
+				case SyntaxKind.DestructorDeclaration:
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static BlockSyntax GetBody(this MemberDeclarationSyntax memberDeclaration)
+		{
+			if (memberDeclaration != null)
+			{
+				switch (memberDeclaration.Kind())
+				{
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)memberDeclaration).Body;
+				case SyntaxKind.OperatorDeclaration:
+					return ((OperatorDeclarationSyntax)memberDeclaration).Body;
+				case SyntaxKind.ConversionOperatorDeclaration:
+					return ((ConversionOperatorDeclarationSyntax)memberDeclaration).Body;
+				case SyntaxKind.ConstructorDeclaration:
+					return ((ConstructorDeclarationSyntax)memberDeclaration).Body;
+				case SyntaxKind.DestructorDeclaration:
+					return ((DestructorDeclarationSyntax)memberDeclaration).Body;
+				}
+			}
+
+			return null;
+		}
+
+		public static MemberDeclarationSyntax WithBody(
+			this MemberDeclarationSyntax memberDeclaration,
+			BlockSyntax body)
+		{
+			if (memberDeclaration != null)
+			{
+				switch (memberDeclaration.Kind())
+				{
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)memberDeclaration).WithBody(body);
+				case SyntaxKind.OperatorDeclaration:
+					return ((OperatorDeclarationSyntax)memberDeclaration).WithBody(body);
+				case SyntaxKind.ConversionOperatorDeclaration:
+					return ((ConversionOperatorDeclarationSyntax)memberDeclaration).WithBody(body);
+				case SyntaxKind.ConstructorDeclaration:
+					return ((ConstructorDeclarationSyntax)memberDeclaration).WithBody(body);
+				case SyntaxKind.DestructorDeclaration:
+					return ((DestructorDeclarationSyntax)memberDeclaration).WithBody(body);
+				}
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/NRefactory6Host.cs b/main/src/addins/CSharpBinding/Util/NRefactory6Host.cs
new file mode 100644
index 0000000000..95889820c3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/NRefactory6Host.cs
@@ -0,0 +1,39 @@
+//
+// NRefactoryHost.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	/// <summary>
+	/// Needs to be implemented from IDE/host side.
+	/// </summary>
+	static class NRefactory6Host
+	{
+		public static Func<string, string> GetLocalizedString = s => s;
+		public static Func<string, string> GetHelpLinkForDiagnostic = id => null;
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/NameGenerator.cs b/main/src/addins/CSharpBinding/Util/NameGenerator.cs
new file mode 100644
index 0000000000..60331fd7f2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/NameGenerator.cs
@@ -0,0 +1,159 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class NameGenerator
+	{
+		public static IList<string> EnsureUniqueness(
+			IList<string> names,
+			Func<string, bool> canUse = null)
+		{
+			return EnsureUniqueness(names, names.Select(_ => false).ToList(), canUse);
+		}
+
+		/// <summary>
+		/// Ensures that any 'names' is unique and does not collide with any other name.  Names that
+		/// are marked as IsFixed can not be touched.  This does mean that if there are two names
+		/// that are the same, and both are fixed that you will end up with non-unique names at the
+		/// end.
+		/// </summary>
+		public static IList<string> EnsureUniqueness(
+			IList<string> names,
+			IList<bool> isFixed,
+			Func<string, bool> canUse = null,
+			bool isCaseSensitive = true)
+		{
+			var copy = names.ToList();
+			EnsureUniquenessInPlace(copy, isFixed, canUse, isCaseSensitive);
+			return copy;
+		}
+
+		public static IList<string> EnsureUniqueness(IList<string> names, bool isCaseSensitive)
+		{
+			return EnsureUniqueness(names, names.Select(_ => false).ToList(), isCaseSensitive: isCaseSensitive);
+		}
+
+		/// <summary>
+		/// Transforms baseName into a name that does not conflict with any name in 'reservedNames'
+		/// </summary>
+		public static string EnsureUniqueness(
+			string baseName,
+			IEnumerable<string> reservedNames,
+			bool isCaseSensitive = true)
+		{
+			var names = new List<string> { baseName };
+			var isFixed = new List<bool> { false };
+
+			names.AddRange(reservedNames.Distinct());
+			isFixed.AddRange(Enumerable.Repeat(true, names.Count - 1));
+
+			var result = EnsureUniqueness(names, isFixed, isCaseSensitive: isCaseSensitive);
+			return result.First();
+		}
+
+		private static void EnsureUniquenessInPlace(
+			IList<string> names,
+			IList<bool> isFixed,
+			Func<string, bool> canUse,
+			bool isCaseSensitive = true)
+		{
+			canUse = canUse ?? (s => true);
+
+			// Don't enumerate as we will be modifying the collection in place.
+			for (var i = 0; i < names.Count; i++)
+			{
+				var name = names[i];
+				var collisionIndices = GetCollisionIndices(names, name, isCaseSensitive);
+
+				if (canUse(name) && collisionIndices.Count < 2)
+				{
+					// no problems with this parameter name, move onto the next one.
+					continue;
+				}
+
+				HandleCollisions(isFixed, names, name, collisionIndices, canUse, isCaseSensitive);
+			}
+		}
+
+		private static void HandleCollisions(
+			IList<bool> isFixed,
+			IList<string> names,
+			string name,
+			List<int> collisionIndices,
+			Func<string, bool> canUse,
+			bool isCaseSensitive = true)
+		{
+			var suffix = 1;
+			var comparer = isCaseSensitive ? StringComparer.Ordinal : StringComparer.OrdinalIgnoreCase;
+			for (var i = 0; i < collisionIndices.Count; i++)
+			{
+				var collisionIndex = collisionIndices[i];
+				if (isFixed[collisionIndex])
+				{
+					// can't do anything about this name.
+					continue;
+				}
+
+				while (true)
+				{
+					var newName = name + suffix++;
+					if (!names.Contains(newName, comparer) && canUse(newName))
+					{
+						// Found a name that doesn't conflict with anything else.
+						names[collisionIndex] = newName;
+						break;
+					}
+				}
+			}
+		}
+
+		private static List<int> GetCollisionIndices(
+			IList<string> names,
+			string name,
+			bool isCaseSensitive = true)
+		{
+			var comparer = isCaseSensitive ? StringComparer.Ordinal : StringComparer.OrdinalIgnoreCase;
+			var collisionIndices =
+				names.Select((currentName, index) => new { currentName, index })
+					.Where(t => comparer.Equals(t.currentName, name))
+					.Select(t => t.index)
+					.ToList();
+			return collisionIndices;
+		}
+
+		public static string GenerateUniqueName(string baseName, Func<string, bool> canUse)
+		{
+			return GenerateUniqueName(baseName, string.Empty, canUse);
+		}
+
+		public static string GenerateUniqueName(string baseName, ISet<string> names, StringComparer comparer)
+		{
+			return GenerateUniqueName(baseName, x => !names.Contains(x, comparer));
+		}
+
+		public static string GenerateUniqueName(string baseName, string extension, Func<string, bool> canUse)
+		{
+			if (!string.IsNullOrEmpty(extension) && !extension.StartsWith("."))
+			{
+				extension = "." + extension;
+			}
+
+			var name = baseName + extension;
+			var index = 1;
+
+			// Check for collisions
+			while (!canUse(name))
+			{
+				name = baseName + index + extension;
+				index++;
+			}
+
+			return name;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/NameSyntaxComparer.cs b/main/src/addins/CSharpBinding/Util/NameSyntaxComparer.cs
new file mode 100644
index 0000000000..9808e524a5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/NameSyntaxComparer.cs
@@ -0,0 +1,177 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal class NameSyntaxComparer : IComparer<NameSyntax>
+	{
+		private readonly IComparer<SyntaxToken> _tokenComparer;
+		internal TypeSyntaxComparer TypeComparer;
+
+		internal NameSyntaxComparer(IComparer<SyntaxToken> tokenComparer)
+		{
+			_tokenComparer = tokenComparer;
+		}
+
+		public static IComparer<NameSyntax> Create()
+		{
+			return Create(TokenComparer.NormalInstance);
+		}
+
+		public static IComparer<NameSyntax> Create(IComparer<SyntaxToken> tokenComparer)
+		{
+			var nameComparer = new NameSyntaxComparer(tokenComparer);
+			var typeComparer = new TypeSyntaxComparer(tokenComparer);
+
+			nameComparer.TypeComparer = typeComparer;
+			typeComparer.NameComparer = nameComparer;
+
+			return nameComparer;
+		}
+
+		public int Compare(NameSyntax x, NameSyntax y)
+		{
+			if (x == y)
+			{
+				return 0;
+			}
+
+			if (x.IsMissing && y.IsMissing)
+			{
+				return 0;
+			}
+
+			if (x.IsMissing)
+			{
+				return -1;
+			}
+			else if (y.IsMissing)
+			{
+				return 1;
+			}
+
+			// If we have a basic name, then it's simple to compare.  Just
+			// check that token versus whatever the other name has as the
+			// first token.
+			if (x is IdentifierNameSyntax && y is IdentifierNameSyntax)
+			{
+				return _tokenComparer.Compare(x.GetFirstToken(includeSkipped: true), y.GetFirstToken());
+			}
+			else if (x is GenericNameSyntax && y is GenericNameSyntax)
+			{
+				// if both names are generic, then use a specialized routine
+				// that will check the names *and* the arguments.
+				return Compare((GenericNameSyntax)x, (GenericNameSyntax)y);
+			}
+			else if (x is IdentifierNameSyntax && y is GenericNameSyntax)
+			{
+				int compare = _tokenComparer.Compare(x.GetFirstToken(includeSkipped: true), y.GetFirstToken());
+				if (compare != 0)
+				{
+					return compare;
+				}
+
+				// Foo goes before Foo<T>
+				return -1;
+			}
+			else if (x is GenericNameSyntax && y is IdentifierNameSyntax)
+			{
+				int compare = _tokenComparer.Compare(x.GetFirstToken(includeSkipped: true), y.GetFirstToken());
+				if (compare != 0)
+				{
+					return compare;
+				}
+
+				// Foo<T> goes after Foo
+				return 1;
+			}
+
+			// At this point one or both of the nodes is a dotted name or
+			// aliased name.  Break them apart into individual pieces and
+			// compare those.
+
+			var xNameParts = DecomposeNameParts(x);
+			var yNameParts = DecomposeNameParts(y);
+
+			for (int i = 0; i < xNameParts.Count && i < yNameParts.Count; i++)
+			{
+				int compare = Compare(xNameParts[i], yNameParts[i]);
+				if (compare != 0)
+				{
+					return compare;
+				}
+			}
+
+			// they matched up to this point.  The shorter one should come
+			// first.
+			return xNameParts.Count - yNameParts.Count;
+		}
+
+		private IList<SimpleNameSyntax> DecomposeNameParts(NameSyntax name)
+		{
+			var result = new List<SimpleNameSyntax>();
+			DecomposeNameParts(name, result);
+			return result;
+		}
+
+		private void DecomposeNameParts(NameSyntax name, List<SimpleNameSyntax> result)
+		{
+			switch (name.Kind())
+			{
+			case SyntaxKind.QualifiedName:
+				var dottedName = (QualifiedNameSyntax)name;
+				DecomposeNameParts(dottedName.Left, result);
+				DecomposeNameParts(dottedName.Right, result);
+				break;
+			case SyntaxKind.AliasQualifiedName:
+				var aliasedName = (AliasQualifiedNameSyntax)name;
+				result.Add(aliasedName.Alias);
+				DecomposeNameParts(aliasedName.Name, result);
+				break;
+			case SyntaxKind.IdentifierName:
+				result.Add((IdentifierNameSyntax)name);
+				break;
+			case SyntaxKind.GenericName:
+				result.Add((GenericNameSyntax)name);
+				break;
+			}
+		}
+
+		private int Compare(GenericNameSyntax x, GenericNameSyntax y)
+		{
+			int compare = _tokenComparer.Compare(x.Identifier, y.Identifier);
+			if (compare != 0)
+			{
+				return compare;
+			}
+
+			// The one with less type params comes first.
+			compare = x.Arity - y.Arity;
+			if (compare != 0)
+			{
+				return compare;
+			}
+
+			// Same name, same parameter count.  Compare each parameter.
+			for (int i = 0; i < x.Arity; i++)
+			{
+				var xArg = x.TypeArgumentList.Arguments[i];
+				var yArg = y.TypeArgumentList.Arguments[i];
+
+				compare = TypeComparer.Compare(xArg, yArg);
+				if (compare != 0)
+				{
+					return compare;
+				}
+			}
+
+			return 0;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/NameSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/NameSyntaxExtensions.cs
new file mode 100644
index 0000000000..7236ebf2b6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/NameSyntaxExtensions.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class NameSyntaxExtensions
+	{
+		public static IList<NameSyntax> GetNameParts(this NameSyntax nameSyntax)
+		{
+			return new NameSyntaxIterator(nameSyntax).ToList();
+		}
+
+		public static NameSyntax GetLastDottedName(this NameSyntax nameSyntax)
+		{
+			var parts = nameSyntax.GetNameParts();
+			return parts[parts.Count - 1];
+		}
+
+		public static SyntaxToken GetNameToken(this NameSyntax nameSyntax)
+		{
+			while (true)
+			{
+				if (nameSyntax.Kind() == SyntaxKind.IdentifierName)
+				{
+					return ((IdentifierNameSyntax)nameSyntax).Identifier;
+				}
+				else if (nameSyntax.Kind() == SyntaxKind.QualifiedName)
+				{
+					nameSyntax = ((QualifiedNameSyntax)nameSyntax).Right;
+				}
+				else if (nameSyntax.Kind() == SyntaxKind.GenericName)
+				{
+					return ((GenericNameSyntax)nameSyntax).Identifier;
+				}
+				else if (nameSyntax.Kind() == SyntaxKind.AliasQualifiedName)
+				{
+					nameSyntax = ((AliasQualifiedNameSyntax)nameSyntax).Name;
+				}
+				else
+				{
+					throw new NotSupportedException();
+				}
+			}
+		}
+
+		public static bool CanBeReplacedWithAnyName(this NameSyntax nameSyntax)
+		{
+			if (nameSyntax.IsParentKind(SyntaxKind.AliasQualifiedName) ||
+				nameSyntax.IsParentKind(SyntaxKind.NameColon) ||
+				nameSyntax.IsParentKind(SyntaxKind.NameEquals) ||
+				nameSyntax.IsParentKind(SyntaxKind.TypeParameterConstraintClause))
+			{
+				return false;
+			}
+
+			if (nameSyntax.CheckParent<QualifiedNameSyntax>(q => q.Right == nameSyntax) ||
+				nameSyntax.CheckParent<MemberAccessExpressionSyntax>(m => m.Name == nameSyntax))
+			{
+				return false;
+			}
+
+			// TODO(cyrusn): Add more cases as the language changes.
+			return true;
+		}
+	}
+
+	internal class NameSyntaxIterator : IEnumerable<NameSyntax>
+	{
+		private readonly NameSyntax _name;
+
+		public NameSyntaxIterator(NameSyntax name)
+		{
+			if (name == null)
+			{
+				throw new ArgumentNullException(@"name");
+			}
+
+			_name = name;
+		}
+
+		public IEnumerator<NameSyntax> GetEnumerator()
+		{
+			var nodes = new LinkedList<NameSyntax>();
+
+			var currentNode = _name;
+			while (true)
+			{
+				if (currentNode.Kind() == SyntaxKind.QualifiedName)
+				{
+					var qualifiedName = currentNode as QualifiedNameSyntax;
+					nodes.AddFirst(qualifiedName.Right);
+					currentNode = qualifiedName.Left;
+				}
+				else
+				{
+					nodes.AddFirst(currentNode);
+					break;
+				}
+			}
+
+			return nodes.GetEnumerator();
+		}
+
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/NamespaceDeclarationSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/NamespaceDeclarationSyntaxExtensions.cs
new file mode 100644
index 0000000000..de5cf065f5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/NamespaceDeclarationSyntaxExtensions.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class NamespaceDeclarationSyntaxExtensions
+	{
+		public static NamespaceDeclarationSyntax AddUsingDirectives(
+			this NamespaceDeclarationSyntax namespaceDeclaration,
+			IList<UsingDirectiveSyntax> usingDirectives,
+			bool placeSystemNamespaceFirst,
+			params SyntaxAnnotation[] annotations)
+		{
+			if (!usingDirectives.Any())
+			{
+				return namespaceDeclaration;
+			}
+
+			var specialCaseSystem = placeSystemNamespaceFirst;
+			var comparer = specialCaseSystem
+				? UsingsAndExternAliasesDirectiveComparer.SystemFirstInstance
+				: UsingsAndExternAliasesDirectiveComparer.NormalInstance;
+
+			var usings = new List<UsingDirectiveSyntax>();
+			usings.AddRange(namespaceDeclaration.Usings);
+			usings.AddRange(usingDirectives);
+
+			if (namespaceDeclaration.Usings.IsSorted(comparer))
+			{
+				usings.Sort(comparer);
+			}
+
+			usings = usings.Select(u => u.WithAdditionalAnnotations(annotations)).ToList();
+			var newNamespace = namespaceDeclaration.WithUsings(usings.ToSyntaxList());
+
+			return newNamespace;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ObjectExtensions.cs b/main/src/addins/CSharpBinding/Util/ObjectExtensions.cs
new file mode 100644
index 0000000000..cf055ed025
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ObjectExtensions.cs
@@ -0,0 +1,7667 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6
+{
+	static partial class ObjectExtensions
+	{
+		
+
+		#region TypeSwitch on Action
+
+		public static void TypeSwitch<TBaseType, TDerivedType1>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TBaseType> defaultAction = null) where TDerivedType1 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TDerivedType25> matchAction25, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				matchAction25((TDerivedType25)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TDerivedType25> matchAction25, Action<TDerivedType26> matchAction26, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				matchAction25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				matchAction26((TDerivedType26)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TDerivedType25> matchAction25, Action<TDerivedType26> matchAction26, Action<TDerivedType27> matchAction27, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				matchAction25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				matchAction26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				matchAction27((TDerivedType27)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TDerivedType25> matchAction25, Action<TDerivedType26> matchAction26, Action<TDerivedType27> matchAction27, Action<TDerivedType28> matchAction28, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				matchAction25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				matchAction26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				matchAction27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				matchAction28((TDerivedType28)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TDerivedType25> matchAction25, Action<TDerivedType26> matchAction26, Action<TDerivedType27> matchAction27, Action<TDerivedType28> matchAction28, Action<TDerivedType29> matchAction29, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				matchAction25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				matchAction26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				matchAction27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				matchAction28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				matchAction29((TDerivedType29)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TDerivedType25> matchAction25, Action<TDerivedType26> matchAction26, Action<TDerivedType27> matchAction27, Action<TDerivedType28> matchAction28, Action<TDerivedType29> matchAction29, Action<TDerivedType30> matchAction30, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				matchAction25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				matchAction26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				matchAction27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				matchAction28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				matchAction29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				matchAction30((TDerivedType30)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TDerivedType25> matchAction25, Action<TDerivedType26> matchAction26, Action<TDerivedType27> matchAction27, Action<TDerivedType28> matchAction28, Action<TDerivedType29> matchAction29, Action<TDerivedType30> matchAction30, Action<TDerivedType31> matchAction31, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				matchAction25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				matchAction26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				matchAction27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				matchAction28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				matchAction29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				matchAction30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				matchAction31((TDerivedType31)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TDerivedType25> matchAction25, Action<TDerivedType26> matchAction26, Action<TDerivedType27> matchAction27, Action<TDerivedType28> matchAction28, Action<TDerivedType29> matchAction29, Action<TDerivedType30> matchAction30, Action<TDerivedType31> matchAction31, Action<TDerivedType32> matchAction32, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				matchAction25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				matchAction26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				matchAction27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				matchAction28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				matchAction29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				matchAction30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				matchAction31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				matchAction32((TDerivedType32)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		public static void TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TDerivedType33>(this TBaseType obj, Action<TDerivedType1> matchAction1, Action<TDerivedType2> matchAction2, Action<TDerivedType3> matchAction3, Action<TDerivedType4> matchAction4, Action<TDerivedType5> matchAction5, Action<TDerivedType6> matchAction6, Action<TDerivedType7> matchAction7, Action<TDerivedType8> matchAction8, Action<TDerivedType9> matchAction9, Action<TDerivedType10> matchAction10, Action<TDerivedType11> matchAction11, Action<TDerivedType12> matchAction12, Action<TDerivedType13> matchAction13, Action<TDerivedType14> matchAction14, Action<TDerivedType15> matchAction15, Action<TDerivedType16> matchAction16, Action<TDerivedType17> matchAction17, Action<TDerivedType18> matchAction18, Action<TDerivedType19> matchAction19, Action<TDerivedType20> matchAction20, Action<TDerivedType21> matchAction21, Action<TDerivedType22> matchAction22, Action<TDerivedType23> matchAction23, Action<TDerivedType24> matchAction24, Action<TDerivedType25> matchAction25, Action<TDerivedType26> matchAction26, Action<TDerivedType27> matchAction27, Action<TDerivedType28> matchAction28, Action<TDerivedType29> matchAction29, Action<TDerivedType30> matchAction30, Action<TDerivedType31> matchAction31, Action<TDerivedType32> matchAction32, Action<TDerivedType33> matchAction33, Action<TBaseType> defaultAction = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+			where TDerivedType33 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				matchAction1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				matchAction2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				matchAction3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				matchAction4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				matchAction5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				matchAction6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				matchAction7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				matchAction8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				matchAction9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				matchAction10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				matchAction11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				matchAction12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				matchAction13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				matchAction14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				matchAction15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				matchAction16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				matchAction17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				matchAction18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				matchAction19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				matchAction20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				matchAction21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				matchAction22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				matchAction23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				matchAction24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				matchAction25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				matchAction26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				matchAction27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				matchAction28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				matchAction29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				matchAction30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				matchAction31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				matchAction32((TDerivedType32)obj);
+			}
+			else if (obj is TDerivedType33)
+			{
+				matchAction33((TDerivedType33)obj);
+			}
+			else if (defaultAction != null)
+			{
+				defaultAction(obj);
+			}
+		}
+
+		#endregion
+
+		#region TypeSwitch on Func<T>
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TBaseType, TResult> defaultFunc = null) where TDerivedType1 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TDerivedType32, TResult> matchFunc32, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				return matchFunc32((TDerivedType32)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TDerivedType33, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TDerivedType32, TResult> matchFunc32, Func<TDerivedType33, TResult> matchFunc33, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+			where TDerivedType33 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				return matchFunc32((TDerivedType32)obj);
+			}
+			else if (obj is TDerivedType33)
+			{
+				return matchFunc33((TDerivedType33)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TDerivedType33, TDerivedType34, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TDerivedType32, TResult> matchFunc32, Func<TDerivedType33, TResult> matchFunc33, Func<TDerivedType34, TResult> matchFunc34, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+			where TDerivedType33 : TBaseType
+			where TDerivedType34 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				return matchFunc32((TDerivedType32)obj);
+			}
+			else if (obj is TDerivedType33)
+			{
+				return matchFunc33((TDerivedType33)obj);
+			}
+			else if (obj is TDerivedType34)
+			{
+				return matchFunc34((TDerivedType34)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TDerivedType33, TDerivedType34, TDerivedType35, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TDerivedType32, TResult> matchFunc32, Func<TDerivedType33, TResult> matchFunc33, Func<TDerivedType34, TResult> matchFunc34, Func<TDerivedType35, TResult> matchFunc35, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+			where TDerivedType33 : TBaseType
+			where TDerivedType34 : TBaseType
+			where TDerivedType35 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				return matchFunc32((TDerivedType32)obj);
+			}
+			else if (obj is TDerivedType33)
+			{
+				return matchFunc33((TDerivedType33)obj);
+			}
+			else if (obj is TDerivedType34)
+			{
+				return matchFunc34((TDerivedType34)obj);
+			}
+			else if (obj is TDerivedType35)
+			{
+				return matchFunc35((TDerivedType35)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TDerivedType33, TDerivedType34, TDerivedType35, TDerivedType36, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TDerivedType32, TResult> matchFunc32, Func<TDerivedType33, TResult> matchFunc33, Func<TDerivedType34, TResult> matchFunc34, Func<TDerivedType35, TResult> matchFunc35, Func<TDerivedType36, TResult> matchFunc36, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+			where TDerivedType33 : TBaseType
+			where TDerivedType34 : TBaseType
+			where TDerivedType35 : TBaseType
+			where TDerivedType36 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				return matchFunc32((TDerivedType32)obj);
+			}
+			else if (obj is TDerivedType33)
+			{
+				return matchFunc33((TDerivedType33)obj);
+			}
+			else if (obj is TDerivedType34)
+			{
+				return matchFunc34((TDerivedType34)obj);
+			}
+			else if (obj is TDerivedType35)
+			{
+				return matchFunc35((TDerivedType35)obj);
+			}
+			else if (obj is TDerivedType36)
+			{
+				return matchFunc36((TDerivedType36)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TDerivedType33, TDerivedType34, TDerivedType35, TDerivedType36, TDerivedType37, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TDerivedType32, TResult> matchFunc32, Func<TDerivedType33, TResult> matchFunc33, Func<TDerivedType34, TResult> matchFunc34, Func<TDerivedType35, TResult> matchFunc35, Func<TDerivedType36, TResult> matchFunc36, Func<TDerivedType37, TResult> matchFunc37, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+			where TDerivedType33 : TBaseType
+			where TDerivedType34 : TBaseType
+			where TDerivedType35 : TBaseType
+			where TDerivedType36 : TBaseType
+			where TDerivedType37 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				return matchFunc32((TDerivedType32)obj);
+			}
+			else if (obj is TDerivedType33)
+			{
+				return matchFunc33((TDerivedType33)obj);
+			}
+			else if (obj is TDerivedType34)
+			{
+				return matchFunc34((TDerivedType34)obj);
+			}
+			else if (obj is TDerivedType35)
+			{
+				return matchFunc35((TDerivedType35)obj);
+			}
+			else if (obj is TDerivedType36)
+			{
+				return matchFunc36((TDerivedType36)obj);
+			}
+			else if (obj is TDerivedType37)
+			{
+				return matchFunc37((TDerivedType37)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TDerivedType33, TDerivedType34, TDerivedType35, TDerivedType36, TDerivedType37, TDerivedType38, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TDerivedType32, TResult> matchFunc32, Func<TDerivedType33, TResult> matchFunc33, Func<TDerivedType34, TResult> matchFunc34, Func<TDerivedType35, TResult> matchFunc35, Func<TDerivedType36, TResult> matchFunc36, Func<TDerivedType37, TResult> matchFunc37, Func<TDerivedType38, TResult> matchFunc38, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+			where TDerivedType33 : TBaseType
+			where TDerivedType34 : TBaseType
+			where TDerivedType35 : TBaseType
+			where TDerivedType36 : TBaseType
+			where TDerivedType37 : TBaseType
+			where TDerivedType38 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				return matchFunc32((TDerivedType32)obj);
+			}
+			else if (obj is TDerivedType33)
+			{
+				return matchFunc33((TDerivedType33)obj);
+			}
+			else if (obj is TDerivedType34)
+			{
+				return matchFunc34((TDerivedType34)obj);
+			}
+			else if (obj is TDerivedType35)
+			{
+				return matchFunc35((TDerivedType35)obj);
+			}
+			else if (obj is TDerivedType36)
+			{
+				return matchFunc36((TDerivedType36)obj);
+			}
+			else if (obj is TDerivedType37)
+			{
+				return matchFunc37((TDerivedType37)obj);
+			}
+			else if (obj is TDerivedType38)
+			{
+				return matchFunc38((TDerivedType38)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TDerivedType33, TDerivedType34, TDerivedType35, TDerivedType36, TDerivedType37, TDerivedType38, TDerivedType39, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TDerivedType32, TResult> matchFunc32, Func<TDerivedType33, TResult> matchFunc33, Func<TDerivedType34, TResult> matchFunc34, Func<TDerivedType35, TResult> matchFunc35, Func<TDerivedType36, TResult> matchFunc36, Func<TDerivedType37, TResult> matchFunc37, Func<TDerivedType38, TResult> matchFunc38, Func<TDerivedType39, TResult> matchFunc39, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+			where TDerivedType33 : TBaseType
+			where TDerivedType34 : TBaseType
+			where TDerivedType35 : TBaseType
+			where TDerivedType36 : TBaseType
+			where TDerivedType37 : TBaseType
+			where TDerivedType38 : TBaseType
+			where TDerivedType39 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				return matchFunc32((TDerivedType32)obj);
+			}
+			else if (obj is TDerivedType33)
+			{
+				return matchFunc33((TDerivedType33)obj);
+			}
+			else if (obj is TDerivedType34)
+			{
+				return matchFunc34((TDerivedType34)obj);
+			}
+			else if (obj is TDerivedType35)
+			{
+				return matchFunc35((TDerivedType35)obj);
+			}
+			else if (obj is TDerivedType36)
+			{
+				return matchFunc36((TDerivedType36)obj);
+			}
+			else if (obj is TDerivedType37)
+			{
+				return matchFunc37((TDerivedType37)obj);
+			}
+			else if (obj is TDerivedType38)
+			{
+				return matchFunc38((TDerivedType38)obj);
+			}
+			else if (obj is TDerivedType39)
+			{
+				return matchFunc39((TDerivedType39)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+
+		public static TResult TypeSwitch<TBaseType, TDerivedType1, TDerivedType2, TDerivedType3, TDerivedType4, TDerivedType5, TDerivedType6, TDerivedType7, TDerivedType8, TDerivedType9, TDerivedType10, TDerivedType11, TDerivedType12, TDerivedType13, TDerivedType14, TDerivedType15, TDerivedType16, TDerivedType17, TDerivedType18, TDerivedType19, TDerivedType20, TDerivedType21, TDerivedType22, TDerivedType23, TDerivedType24, TDerivedType25, TDerivedType26, TDerivedType27, TDerivedType28, TDerivedType29, TDerivedType30, TDerivedType31, TDerivedType32, TDerivedType33, TDerivedType34, TDerivedType35, TDerivedType36, TDerivedType37, TDerivedType38, TDerivedType39, TDerivedType40, TResult>(this TBaseType obj, Func<TDerivedType1, TResult> matchFunc1, Func<TDerivedType2, TResult> matchFunc2, Func<TDerivedType3, TResult> matchFunc3, Func<TDerivedType4, TResult> matchFunc4, Func<TDerivedType5, TResult> matchFunc5, Func<TDerivedType6, TResult> matchFunc6, Func<TDerivedType7, TResult> matchFunc7, Func<TDerivedType8, TResult> matchFunc8, Func<TDerivedType9, TResult> matchFunc9, Func<TDerivedType10, TResult> matchFunc10, Func<TDerivedType11, TResult> matchFunc11, Func<TDerivedType12, TResult> matchFunc12, Func<TDerivedType13, TResult> matchFunc13, Func<TDerivedType14, TResult> matchFunc14, Func<TDerivedType15, TResult> matchFunc15, Func<TDerivedType16, TResult> matchFunc16, Func<TDerivedType17, TResult> matchFunc17, Func<TDerivedType18, TResult> matchFunc18, Func<TDerivedType19, TResult> matchFunc19, Func<TDerivedType20, TResult> matchFunc20, Func<TDerivedType21, TResult> matchFunc21, Func<TDerivedType22, TResult> matchFunc22, Func<TDerivedType23, TResult> matchFunc23, Func<TDerivedType24, TResult> matchFunc24, Func<TDerivedType25, TResult> matchFunc25, Func<TDerivedType26, TResult> matchFunc26, Func<TDerivedType27, TResult> matchFunc27, Func<TDerivedType28, TResult> matchFunc28, Func<TDerivedType29, TResult> matchFunc29, Func<TDerivedType30, TResult> matchFunc30, Func<TDerivedType31, TResult> matchFunc31, Func<TDerivedType32, TResult> matchFunc32, Func<TDerivedType33, TResult> matchFunc33, Func<TDerivedType34, TResult> matchFunc34, Func<TDerivedType35, TResult> matchFunc35, Func<TDerivedType36, TResult> matchFunc36, Func<TDerivedType37, TResult> matchFunc37, Func<TDerivedType38, TResult> matchFunc38, Func<TDerivedType39, TResult> matchFunc39, Func<TDerivedType40, TResult> matchFunc40, Func<TBaseType, TResult> defaultFunc = null)
+			where TDerivedType1 : TBaseType
+			where TDerivedType2 : TBaseType
+			where TDerivedType3 : TBaseType
+			where TDerivedType4 : TBaseType
+			where TDerivedType5 : TBaseType
+			where TDerivedType6 : TBaseType
+			where TDerivedType7 : TBaseType
+			where TDerivedType8 : TBaseType
+			where TDerivedType9 : TBaseType
+			where TDerivedType10 : TBaseType
+			where TDerivedType11 : TBaseType
+			where TDerivedType12 : TBaseType
+			where TDerivedType13 : TBaseType
+			where TDerivedType14 : TBaseType
+			where TDerivedType15 : TBaseType
+			where TDerivedType16 : TBaseType
+			where TDerivedType17 : TBaseType
+			where TDerivedType18 : TBaseType
+			where TDerivedType19 : TBaseType
+			where TDerivedType20 : TBaseType
+			where TDerivedType21 : TBaseType
+			where TDerivedType22 : TBaseType
+			where TDerivedType23 : TBaseType
+			where TDerivedType24 : TBaseType
+			where TDerivedType25 : TBaseType
+			where TDerivedType26 : TBaseType
+			where TDerivedType27 : TBaseType
+			where TDerivedType28 : TBaseType
+			where TDerivedType29 : TBaseType
+			where TDerivedType30 : TBaseType
+			where TDerivedType31 : TBaseType
+			where TDerivedType32 : TBaseType
+			where TDerivedType33 : TBaseType
+			where TDerivedType34 : TBaseType
+			where TDerivedType35 : TBaseType
+			where TDerivedType36 : TBaseType
+			where TDerivedType37 : TBaseType
+			where TDerivedType38 : TBaseType
+			where TDerivedType39 : TBaseType
+			where TDerivedType40 : TBaseType
+		{
+			if (obj is TDerivedType1)
+			{
+				return matchFunc1((TDerivedType1)obj);
+			}
+			else if (obj is TDerivedType2)
+			{
+				return matchFunc2((TDerivedType2)obj);
+			}
+			else if (obj is TDerivedType3)
+			{
+				return matchFunc3((TDerivedType3)obj);
+			}
+			else if (obj is TDerivedType4)
+			{
+				return matchFunc4((TDerivedType4)obj);
+			}
+			else if (obj is TDerivedType5)
+			{
+				return matchFunc5((TDerivedType5)obj);
+			}
+			else if (obj is TDerivedType6)
+			{
+				return matchFunc6((TDerivedType6)obj);
+			}
+			else if (obj is TDerivedType7)
+			{
+				return matchFunc7((TDerivedType7)obj);
+			}
+			else if (obj is TDerivedType8)
+			{
+				return matchFunc8((TDerivedType8)obj);
+			}
+			else if (obj is TDerivedType9)
+			{
+				return matchFunc9((TDerivedType9)obj);
+			}
+			else if (obj is TDerivedType10)
+			{
+				return matchFunc10((TDerivedType10)obj);
+			}
+			else if (obj is TDerivedType11)
+			{
+				return matchFunc11((TDerivedType11)obj);
+			}
+			else if (obj is TDerivedType12)
+			{
+				return matchFunc12((TDerivedType12)obj);
+			}
+			else if (obj is TDerivedType13)
+			{
+				return matchFunc13((TDerivedType13)obj);
+			}
+			else if (obj is TDerivedType14)
+			{
+				return matchFunc14((TDerivedType14)obj);
+			}
+			else if (obj is TDerivedType15)
+			{
+				return matchFunc15((TDerivedType15)obj);
+			}
+			else if (obj is TDerivedType16)
+			{
+				return matchFunc16((TDerivedType16)obj);
+			}
+			else if (obj is TDerivedType17)
+			{
+				return matchFunc17((TDerivedType17)obj);
+			}
+			else if (obj is TDerivedType18)
+			{
+				return matchFunc18((TDerivedType18)obj);
+			}
+			else if (obj is TDerivedType19)
+			{
+				return matchFunc19((TDerivedType19)obj);
+			}
+			else if (obj is TDerivedType20)
+			{
+				return matchFunc20((TDerivedType20)obj);
+			}
+			else if (obj is TDerivedType21)
+			{
+				return matchFunc21((TDerivedType21)obj);
+			}
+			else if (obj is TDerivedType22)
+			{
+				return matchFunc22((TDerivedType22)obj);
+			}
+			else if (obj is TDerivedType23)
+			{
+				return matchFunc23((TDerivedType23)obj);
+			}
+			else if (obj is TDerivedType24)
+			{
+				return matchFunc24((TDerivedType24)obj);
+			}
+			else if (obj is TDerivedType25)
+			{
+				return matchFunc25((TDerivedType25)obj);
+			}
+			else if (obj is TDerivedType26)
+			{
+				return matchFunc26((TDerivedType26)obj);
+			}
+			else if (obj is TDerivedType27)
+			{
+				return matchFunc27((TDerivedType27)obj);
+			}
+			else if (obj is TDerivedType28)
+			{
+				return matchFunc28((TDerivedType28)obj);
+			}
+			else if (obj is TDerivedType29)
+			{
+				return matchFunc29((TDerivedType29)obj);
+			}
+			else if (obj is TDerivedType30)
+			{
+				return matchFunc30((TDerivedType30)obj);
+			}
+			else if (obj is TDerivedType31)
+			{
+				return matchFunc31((TDerivedType31)obj);
+			}
+			else if (obj is TDerivedType32)
+			{
+				return matchFunc32((TDerivedType32)obj);
+			}
+			else if (obj is TDerivedType33)
+			{
+				return matchFunc33((TDerivedType33)obj);
+			}
+			else if (obj is TDerivedType34)
+			{
+				return matchFunc34((TDerivedType34)obj);
+			}
+			else if (obj is TDerivedType35)
+			{
+				return matchFunc35((TDerivedType35)obj);
+			}
+			else if (obj is TDerivedType36)
+			{
+				return matchFunc36((TDerivedType36)obj);
+			}
+			else if (obj is TDerivedType37)
+			{
+				return matchFunc37((TDerivedType37)obj);
+			}
+			else if (obj is TDerivedType38)
+			{
+				return matchFunc38((TDerivedType38)obj);
+			}
+			else if (obj is TDerivedType39)
+			{
+				return matchFunc39((TDerivedType39)obj);
+			}
+			else if (obj is TDerivedType40)
+			{
+				return matchFunc40((TDerivedType40)obj);
+			}
+			else if (defaultFunc != null)
+			{
+				return defaultFunc(obj);
+			}
+			else
+			{
+				return default(TResult);
+			}
+		}
+		#endregion
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/PredefinedOperator.cs b/main/src/addins/CSharpBinding/Util/PredefinedOperator.cs
new file mode 100644
index 0000000000..794f8f25c4
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/PredefinedOperator.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	enum PredefinedOperator
+	{
+		None = 0,
+		Addition = 1,
+		BitwiseAnd = 1 << 1,
+		BitwiseOr = 1 << 2,
+		Complement = 1 << 3,  // ~ or ! in C#, 'Not' in VB.
+		Concatenate = 1 << 4,
+		Decrement = 1 << 5,
+		Division = 1 << 6,
+		Equality = 1 << 7,
+		ExclusiveOr = 1 << 8,
+		Exponent = 1 << 9,
+		GreaterThan = 1 << 10,
+		GreaterThanOrEqual = 1 << 11,
+		Increment = 1 << 12,
+		Inequality = 1 << 13,
+		IntegerDivision = 1 << 14,
+		LeftShift = 1 << 15,
+		LessThan = 1 << 16,
+		LessThanOrEqual = 1 << 17,
+		Like = 1 << 18,
+		Modulus = 1 << 19,
+		Multiplication = 1 << 20,
+		RightShift = 1 << 21,
+		Subtraction = 1 << 22,
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/QueryExpressionSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/QueryExpressionSyntaxExtensions.cs
new file mode 100644
index 0000000000..ade55d10ae
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/QueryExpressionSyntaxExtensions.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class QueryExpressionSyntaxExtensions
+	{
+		public static IList<SyntaxNode> GetAllClauses(this QueryExpressionSyntax query)
+		{
+			var result = new List<SyntaxNode>();
+			result.Add(query.FromClause);
+			result.AddRange(query.Body.Clauses);
+			result.Add(query.Body.SelectOrGroup);
+			return result;
+		}
+
+		public static IList<SyntaxNode> GetAllClauses(this QueryBodySyntax body)
+		{
+			var result = new List<SyntaxNode>();
+			result.AddRange(body.Clauses);
+			result.Add(body.SelectOrGroup);
+			return result;
+		}
+
+		public static QueryExpressionSyntax WithAllClauses(
+			this QueryExpressionSyntax query,
+			IList<SyntaxNode> allClauses)
+		{
+			var fromClause = (FromClauseSyntax)allClauses.First();
+			return query.WithFromClause(fromClause).WithBody(query.Body.WithAllClauses(allClauses.Skip(1)));
+		}
+
+		public static QueryBodySyntax WithAllClauses(
+			this QueryBodySyntax body,
+			IEnumerable<SyntaxNode> allClauses)
+		{
+			var clauses = SyntaxFactory.List(allClauses.Take(allClauses.Count() - 1).Cast<QueryClauseSyntax>());
+			var selectOrGroup = (SelectOrGroupClauseSyntax)allClauses.Last();
+			return body.WithClauses(clauses).WithSelectOrGroup(selectOrGroup);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/RefactoringHelpers.cs b/main/src/addins/CSharpBinding/Util/RefactoringHelpers.cs
new file mode 100644
index 0000000000..561f73c241
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/RefactoringHelpers.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using MonoDevelop.CSharp.Completion;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class RefactoringHelpers
+	{
+		public static TypeSyntax ConvertType(SemanticModel model, int position, ITypeSymbol type)
+		{
+			return SyntaxFactory.ParseTypeName(RoslynCompletionData.SafeMinimalDisplayString (type, model, position));
+		}
+
+		static string GetNameProposal(string eventName)
+		{
+			return "On" + char.ToUpper(eventName[0]) + eventName.Substring(1);
+		}
+
+		static string CreateBaseNameFromString(string str)
+		{
+			if (string.IsNullOrEmpty(str)) {
+				return "empty";
+			}
+			var sb = new StringBuilder();
+			bool firstLetter = true, wordStart = false;
+			foreach (char ch in str) {
+				if (char.IsWhiteSpace(ch)) {
+					wordStart = true;
+					continue;
+				}
+				if (!char.IsLetter(ch))
+					continue;
+				if (firstLetter) {
+					sb.Append(char.ToLower(ch));
+					firstLetter = false;
+					continue;
+				}
+				if (wordStart) {
+					sb.Append(char.ToUpper(ch));
+					wordStart = false;
+					continue;
+				}
+				sb.Append(ch);
+			}
+			return sb.Length == 0 ? "str" : sb.ToString();
+		}
+
+		public static string CreateBaseName(SyntaxNode node, ITypeSymbol type)
+		{
+			string name = null;
+
+			if (node.IsKind(SyntaxKind.Argument))
+				node = ((ArgumentSyntax)node).Expression;
+
+			if (node.IsKind(SyntaxKind.NullLiteralExpression))
+				return "o";
+			if (node.IsKind(SyntaxKind.InvocationExpression))
+				return CreateBaseName(((InvocationExpressionSyntax)node).Expression, type);
+			if (node.IsKind(SyntaxKind.IdentifierName)) {
+				name = node.ToString();
+			} else if (node is MemberAccessExpressionSyntax) {
+				name = ((MemberAccessExpressionSyntax)node).Name.ToString();
+			} else if (node is LiteralExpressionSyntax) {
+				var pe = (LiteralExpressionSyntax)node;
+				if (pe.IsKind(SyntaxKind.StringLiteralExpression)) {
+					name = CreateBaseNameFromString(pe.Token.ToString());
+				} else {
+					return char.ToLower(type.Name[0]).ToString();
+				}
+			} else if (node is ArrayCreationExpressionSyntax) {
+				name = "arr";
+			} else {
+				if (type.TypeKind == TypeKind.Error)
+					return "par";
+				name = GuessNameFromType(type);
+			}
+			var sb = new StringBuilder();
+			sb.Append(char.ToLower(name[0]));
+			for (int i = 1; i < name.Length; i++) {
+				var ch = name[i];
+				if (char.IsLetterOrDigit(ch) || ch == '_')
+					sb.Append(ch);
+			}
+			return sb.ToString();
+		}
+
+		internal static string GuessNameFromType(ITypeSymbol returnType)
+		{
+			switch (returnType.SpecialType) {
+			case SpecialType.System_Object:
+				return "obj";
+			case SpecialType.System_Boolean:
+				return "b";
+			case SpecialType.System_Char:
+				return "ch";
+			case SpecialType.System_SByte:
+			case SpecialType.System_Byte:
+				return "b";
+			case SpecialType.System_Int16:
+			case SpecialType.System_UInt16:
+			case SpecialType.System_Int32:
+			case SpecialType.System_UInt32:
+			case SpecialType.System_Int64:
+			case SpecialType.System_UInt64:
+				return "i";
+			case SpecialType.System_Decimal:
+				return "d";
+			case SpecialType.System_Single:
+				return "f";
+			case SpecialType.System_Double:
+				return "d";
+			case SpecialType.System_String:
+				return "str";
+			case SpecialType.System_IntPtr:
+			case SpecialType.System_UIntPtr:
+				return "ptr";
+			case SpecialType.System_DateTime:
+				return "date";
+			}
+			if (returnType.TypeKind == TypeKind.Array)
+				return "arr";
+			switch (returnType.GetFullName()) {
+			case "System.Exception":
+				return "e";
+			case "System.Object":
+			case "System.Func":
+			case "System.Action":
+				return "action";
+			}
+			return string.IsNullOrEmpty(returnType.Name) ? "obj" : returnType.Name;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ReferenceComparer.cs b/main/src/addins/CSharpBinding/Util/ReferenceComparer.cs
new file mode 100644
index 0000000000..56e2352f66
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ReferenceComparer.cs
@@ -0,0 +1,39 @@
+// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace ICSharpCode.NRefactory6.Utils
+{
+	sealed class ReferenceComparer : IEqualityComparer<object>
+	{
+		public readonly static ReferenceComparer Instance = new ReferenceComparer();
+		
+		public new bool Equals(object x, object y)
+		{
+			return x == y;
+		}
+		
+		public int GetHashCode(object obj)
+		{
+			return RuntimeHelpers.GetHashCode(obj);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ReflectionCompatibilityExtensions.cs b/main/src/addins/CSharpBinding/Util/ReflectionCompatibilityExtensions.cs
new file mode 100644
index 0000000000..c9de6159e5
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ReflectionCompatibilityExtensions.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	[Flags]
+	internal enum BindingFlags
+	{
+		Default = 0,
+		Instance = 1,
+		Static = 2,
+		Public = 4,
+		NonPublic = 8,
+	}
+
+	internal static class ReflectionCompatibilityExtensions
+	{
+		public static object[] GetCustomAttributes(this Type type, bool inherit)
+		{
+			return type.GetTypeInfo().GetCustomAttributes(inherit).ToArray();
+		}
+
+		public static MethodInfo GetMethod(this Type type, string name)
+		{
+			return type.GetTypeInfo().DeclaredMethods.FirstOrDefault(m => m.Name == name);
+		}
+
+		public static MethodInfo GetMethod(this Type type, string name, BindingFlags bindingFlags)
+		{
+			return type.GetTypeInfo().DeclaredMethods.FirstOrDefault(m => (m.Name == name) && IsConformWithBindingFlags(m, bindingFlags));
+		}
+
+		public static MethodInfo GetMethod(this Type type, string name, Type[] types)
+		{
+			return type.GetTypeInfo().DeclaredMethods.FirstOrDefault(
+				m => (m.Name == name) && TypesAreEqual(m.GetParameters().Select(p => p.ParameterType).ToArray(), types));
+		}
+
+		public static MethodInfo GetMethod(this Type type, string name, BindingFlags bindingFlags, object binder, Type[] types, object modifiers)
+		{
+			return type.GetTypeInfo().DeclaredMethods.FirstOrDefault(
+				m => (m.Name == name) && IsConformWithBindingFlags(m, bindingFlags) && TypesAreEqual(m.GetParameters().Select(p => p.ParameterType).ToArray(), types));
+		}
+
+		public static IEnumerable<MethodInfo> GetMethods(this Type type)
+		{
+			return type.GetTypeInfo().DeclaredMethods;
+		}
+
+		public static IEnumerable<MethodInfo> GetMethods(this Type type, string name)
+		{
+			return type.GetTypeInfo().DeclaredMethods.Where(m => m.Name == name);
+		}
+
+		public static IEnumerable<MethodInfo> GetMethods(this Type type, BindingFlags bindingFlags)
+		{
+			return type.GetTypeInfo().DeclaredMethods.Where(m => IsConformWithBindingFlags(m, bindingFlags));
+		}
+
+		public static FieldInfo GetField(this Type type, string name)
+		{
+			return type.GetTypeInfo().DeclaredFields.FirstOrDefault(f => f.Name == name);
+		}
+
+		public static FieldInfo GetField(this Type type, string name, BindingFlags bindingFlags)
+		{
+			return type.GetTypeInfo().DeclaredFields.FirstOrDefault(f => (f.Name == name) && IsConformWithBindingFlags(f, bindingFlags));
+		}
+
+		public static PropertyInfo GetProperty(this Type type, string name)
+		{
+			return type.GetTypeInfo().DeclaredProperties.FirstOrDefault(p => p.Name == name);
+		}
+
+		public static IEnumerable<PropertyInfo> GetProperties(this Type type)
+		{
+			return type.GetTypeInfo().DeclaredProperties;
+		}
+
+		private static bool TypesAreEqual(Type[] memberTypes, Type[] searchedTypes)
+		{
+			if (((memberTypes == null) || (searchedTypes == null)) && (memberTypes != searchedTypes))
+				return false;
+
+			if (memberTypes.Length != searchedTypes.Length)
+				return false;
+
+			for (int i = 0; i < memberTypes.Length; i++)
+			{
+				if (memberTypes[i] != searchedTypes[i])
+					return false;
+			}
+
+			return true;
+		}
+
+		private static bool IsConformWithBindingFlags(MethodBase method, BindingFlags bindingFlags)
+		{
+			if (method.IsPublic && !bindingFlags.HasFlag(BindingFlags.Public))
+				return false;
+			if (method.IsPrivate && !bindingFlags.HasFlag(BindingFlags.NonPublic))
+				return false;
+			if (method.IsStatic && !bindingFlags.HasFlag(BindingFlags.Static))
+				return false;
+			if (!method.IsStatic && !bindingFlags.HasFlag(BindingFlags.Instance))
+				return false;
+
+			return true;
+		}
+
+		private static bool IsConformWithBindingFlags(FieldInfo method, BindingFlags bindingFlags)
+		{
+			if (method.IsPublic && !bindingFlags.HasFlag(BindingFlags.Public))
+				return false;
+			if (method.IsPrivate && !bindingFlags.HasFlag(BindingFlags.NonPublic))
+				return false;
+			if (method.IsStatic && !bindingFlags.HasFlag(BindingFlags.Static))
+				return false;
+			if (!method.IsStatic && !bindingFlags.HasFlag(BindingFlags.Instance))
+				return false;
+
+			return true;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SemanticDocument.cs b/main/src/addins/CSharpBinding/Util/SemanticDocument.cs
new file mode 100644
index 0000000000..b4d251aa51
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SemanticDocument.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class SemanticDocument : SyntacticDocument
+	{
+		public readonly SemanticModel SemanticModel;
+
+		private SemanticDocument(Document document, SourceText text, SyntaxTree tree, SyntaxNode root, SemanticModel semanticModel)
+			: base(document, text, tree, root)
+		{
+			this.SemanticModel = semanticModel;
+		}
+
+		public static new async Task<SemanticDocument> CreateAsync(Document document, CancellationToken cancellationToken)
+		{
+			var text = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			return new SemanticDocument(document, text, root.SyntaxTree, root, model);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SemanticEquivalence.cs b/main/src/addins/CSharpBinding/Util/SemanticEquivalence.cs
new file mode 100644
index 0000000000..82da9dc7bb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SemanticEquivalence.cs
@@ -0,0 +1,69 @@
+//
+// SemanticEquivalence.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using System.Runtime.ExceptionServices;
+using System.ComponentModel.Design;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SemanticEquivalence
+	{
+		readonly static Type typeInfo;
+
+		static SemanticEquivalence ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.Shared.Extensions.SemanticEquivalence" + ReflectionNamespaces.WorkspacesAsmName, true);
+			areSemanticallyEquivalentMethod = typeInfo.GetMethod ("AreSemanticallyEquivalent", BindingFlags.Static | BindingFlags.Public);
+		}
+
+		static readonly MethodInfo areSemanticallyEquivalentMethod;
+
+		public static bool AreSemanticallyEquivalent(
+			SemanticModel semanticModel1,
+			SemanticModel semanticModel2,
+			SyntaxNode node1,
+			SyntaxNode node2,
+			Func<SyntaxNode, bool> predicate = null)
+        {
+			try {
+				return (bool)areSemanticallyEquivalentMethod.Invoke (null, new object[] { 
+					semanticModel1,
+					semanticModel2,
+					node1,
+					node2,
+					predicate
+				});
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+        }
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/SemanticMap.cs b/main/src/addins/CSharpBinding/Util/SemanticMap.cs
new file mode 100644
index 0000000000..ee69eb9fe6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SemanticMap.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	partial class SemanticMap
+	{
+		private readonly Dictionary<SyntaxNode, SymbolInfo> _expressionToInfoMap =
+			new Dictionary<SyntaxNode, SymbolInfo>();
+
+		private readonly Dictionary<SyntaxToken, SymbolInfo> _tokenToInfoMap =
+			new Dictionary<SyntaxToken, SymbolInfo>();
+
+		private SemanticMap()
+		{
+		}
+
+		internal static SemanticMap From(SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			var map = new SemanticMap();
+			var walker = new Walker(semanticModel, map, cancellationToken);
+			walker.Visit(node);
+			return map;
+		}
+
+		public IEnumerable<ISymbol> AllReferencedSymbols
+		{
+			get
+			{
+				return _expressionToInfoMap.Values.Concat(_tokenToInfoMap.Values).Select(info => info.Symbol).Distinct();
+			}
+		}
+
+		private class Walker : SyntaxWalker
+		{
+			private readonly SemanticModel _semanticModel;
+			private readonly SemanticMap _map;
+			private readonly CancellationToken _cancellationToken;
+
+			public Walker(SemanticModel semanticModel, SemanticMap map, CancellationToken cancellationToken) :
+			base(SyntaxWalkerDepth.Token)
+			{
+				_semanticModel = semanticModel;
+				_map = map;
+				_cancellationToken = cancellationToken;
+			}
+
+			public override void Visit(SyntaxNode node)
+			{
+				var info = _semanticModel.GetSymbolInfo(node);
+				if (!IsNone(info))
+				{
+					_map._expressionToInfoMap.Add(node, info);
+				}
+
+				base.Visit(node);
+			}
+
+			protected override void VisitToken(SyntaxToken token)
+			{
+				var info = _semanticModel.GetSymbolInfo(token, _cancellationToken);
+				if (!IsNone(info))
+				{
+					_map._tokenToInfoMap.Add(token, info);
+				}
+
+				base.VisitToken(token);
+			}
+
+			private bool IsNone(SymbolInfo info)
+			{
+				return info.Symbol == null && info.CandidateSymbols.Length == 0;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SemanticModelExtensions.cs b/main/src/addins/CSharpBinding/Util/SemanticModelExtensions.cs
new file mode 100644
index 0000000000..02c950ce07
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SemanticModelExtensions.cs
@@ -0,0 +1,622 @@
+//
+// SemanticModelExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SemanticModelExtensions
+	{
+		public static IEnumerable<ITypeSymbol> LookupTypeRegardlessOfArity(
+			this SemanticModel semanticModel,
+			SyntaxToken name,
+			CancellationToken cancellationToken)
+		{
+			var expression = name.Parent as ExpressionSyntax;
+			if (expression != null)
+			{
+				var results = semanticModel.LookupName(expression, namespacesAndTypesOnly: true, cancellationToken: cancellationToken);
+				if (results.Length > 0)
+				{
+					return results.OfType<ITypeSymbol>();
+				}
+			}
+
+			return SpecializedCollections.EmptyEnumerable<ITypeSymbol>();
+		}
+
+		public static ImmutableArray<ISymbol> LookupName(
+			this SemanticModel semanticModel,
+			SyntaxToken name,
+			bool namespacesAndTypesOnly,
+			CancellationToken cancellationToken)
+		{
+			var expression = name.Parent as ExpressionSyntax;
+			if (expression != null)
+			{
+				return semanticModel.LookupName(expression, namespacesAndTypesOnly, cancellationToken);
+			}
+
+			return ImmutableArray.Create<ISymbol>();
+		}
+
+		/// <summary>
+		/// Decomposes a name or member access expression into its component parts.
+		/// </summary>
+		/// <param name="expression">The name or member access expression.</param>
+		/// <param name="qualifier">The qualifier (or left-hand-side) of the name expression. This may be null if there is no qualifier.</param>
+		/// <param name="name">The name of the expression.</param>
+		/// <param name="arity">The number of generic type parameters.</param>
+		private static void DecomposeName(ExpressionSyntax expression, out ExpressionSyntax qualifier, out string name, out int arity)
+		{
+			switch (expression.Kind())
+			{
+			case SyntaxKind.SimpleMemberAccessExpression:
+			case SyntaxKind.PointerMemberAccessExpression:
+				var max = (MemberAccessExpressionSyntax)expression;
+				qualifier = max.Expression;
+				name = max.Name.Identifier.ValueText;
+				arity = max.Name.Arity;
+				break;
+			case SyntaxKind.QualifiedName:
+				var qn = (QualifiedNameSyntax)expression;
+				qualifier = qn.Left;
+				name = qn.Right.Identifier.ValueText;
+				arity = qn.Arity;
+				break;
+			case SyntaxKind.AliasQualifiedName:
+				var aq = (AliasQualifiedNameSyntax)expression;
+				qualifier = aq.Alias;
+				name = aq.Name.Identifier.ValueText;
+				arity = aq.Name.Arity;
+				break;
+			case SyntaxKind.GenericName:
+				var gx = (GenericNameSyntax)expression;
+				qualifier = null;
+				name = gx.Identifier.ValueText;
+				arity = gx.Arity;
+				break;
+			case SyntaxKind.IdentifierName:
+				var nx = (IdentifierNameSyntax)expression;
+				qualifier = null;
+				name = nx.Identifier.ValueText;
+				arity = 0;
+				break;
+			default:
+				qualifier = null;
+				name = null;
+				arity = 0;
+				break;
+			}
+		}
+
+		public static ImmutableArray<ISymbol> LookupName(
+			this SemanticModel semanticModel,
+			ExpressionSyntax expression,
+			bool namespacesAndTypesOnly,
+			CancellationToken cancellationToken)
+		{
+			var expr = SyntaxFactory.GetStandaloneExpression(expression);
+
+			ExpressionSyntax qualifier;
+			string name;
+			int arity;
+			DecomposeName(expr, out qualifier, out name, out arity);
+
+			INamespaceOrTypeSymbol symbol = null;
+			if (qualifier != null)
+			{
+				var typeInfo = semanticModel.GetTypeInfo(qualifier, cancellationToken);
+				var symbolInfo = semanticModel.GetSymbolInfo(qualifier, cancellationToken);
+				if (typeInfo.Type != null)
+				{
+					symbol = typeInfo.Type;
+				}
+				else if (symbolInfo.Symbol != null)
+				{
+					symbol = symbolInfo.Symbol as INamespaceOrTypeSymbol;
+				}
+			}
+
+			return semanticModel.LookupSymbols(expr.SpanStart, container: symbol, name: name, includeReducedExtensionMethods: true);
+		}
+
+		public static SymbolInfo GetSymbolInfo(this SemanticModel semanticModel, SyntaxToken token)
+		{
+			if (!CanBindToken(token))
+			{
+				return default(SymbolInfo);
+			}
+
+			var expression = token.Parent as ExpressionSyntax;
+			if (expression != null)
+			{
+				return semanticModel.GetSymbolInfo(expression);
+			}
+
+			var attribute = token.Parent as AttributeSyntax;
+			if (attribute != null)
+			{
+				return semanticModel.GetSymbolInfo(attribute);
+			}
+
+			var constructorInitializer = token.Parent as ConstructorInitializerSyntax;
+			if (constructorInitializer != null)
+			{
+				return semanticModel.GetSymbolInfo(constructorInitializer);
+			}
+
+			return default(SymbolInfo);
+		}
+
+		private static bool CanBindToken(SyntaxToken token)
+		{
+			// Add more token kinds if necessary;
+			switch (token.Kind())
+			{
+			case SyntaxKind.CommaToken:
+			case SyntaxKind.DelegateKeyword:
+				return false;
+			}
+
+			return true;
+		}
+
+		/// <summary>
+		/// Given an argument node, tries to generate an appropriate name that can be used for that
+		/// argument.
+		/// </summary>
+		public static string GenerateNameForArgument(
+			this SemanticModel semanticModel, ArgumentSyntax argument)
+		{
+			// If it named argument then we use the name provided.
+			if (argument.NameColon != null)
+			{
+				return argument.NameColon.Name.Identifier.ValueText;
+			}
+
+			return semanticModel.GenerateNameForExpression(argument.Expression);
+		}
+
+		public static string GenerateNameForArgument(
+			this SemanticModel semanticModel, AttributeArgumentSyntax argument)
+		{
+			// If it named argument then we use the name provided.
+			if (argument.NameEquals != null)
+			{
+				return argument.NameEquals.Name.Identifier.ValueText;
+			}
+
+			return semanticModel.GenerateNameForExpression(argument.Expression);
+		}
+
+		/// <summary>
+		/// Given an expression node, tries to generate an appropriate name that can be used for
+		/// that expression. 
+		/// </summary>
+		public static string GenerateNameForExpression(
+			this SemanticModel semanticModel, ExpressionSyntax expression, bool capitalize = false)
+		{
+			// Try to find a usable name node that we can use to name the
+			// parameter.  If we have an expression that has a name as part of it
+			// then we try to use that part.
+			var current = expression;
+			while (true)
+			{
+				current = current.WalkDownParentheses();
+
+				if (current.Kind() == SyntaxKind.IdentifierName)
+				{
+					return ((IdentifierNameSyntax)current).Identifier.ValueText.ToCamelCase();
+				}
+				else if (current is MemberAccessExpressionSyntax)
+				{
+					return ((MemberAccessExpressionSyntax)current).Name.Identifier.ValueText.ToCamelCase();
+				}
+				else if (current is MemberBindingExpressionSyntax)
+				{
+					return ((MemberBindingExpressionSyntax)current).Name.Identifier.ValueText.ToCamelCase();
+				}
+				else if (current is ConditionalAccessExpressionSyntax)
+				{
+					current = ((ConditionalAccessExpressionSyntax)current).WhenNotNull;
+				}
+				else if (current is CastExpressionSyntax)
+				{
+					current = ((CastExpressionSyntax)current).Expression;
+				}
+				else
+				{
+					break;
+				}
+			}
+
+			// Otherwise, figure out the type of the expression and generate a name from that
+			// isntead.
+			var info = semanticModel.GetTypeInfo(expression);
+
+			// If we can't determine the type, then fallback to some placeholders.
+			var type = info.Type;
+			return type.CreateParameterName(capitalize);
+		}
+
+		public static IList<string> GenerateParameterNames(
+			this SemanticModel semanticModel,
+			ArgumentListSyntax argumentList)
+		{
+			return semanticModel.GenerateParameterNames(argumentList.Arguments);
+		}
+
+		public static IList<string> GenerateParameterNames(
+			this SemanticModel semanticModel,
+			AttributeArgumentListSyntax argumentList)
+		{
+			return semanticModel.GenerateParameterNames(argumentList.Arguments);
+		}
+
+		public static IList<string> GenerateParameterNames(
+			this SemanticModel semanticModel,
+			IEnumerable<ArgumentSyntax> arguments,
+			IList<string> reservedNames = null)
+		{
+			reservedNames = reservedNames ?? SpecializedCollections.EmptyList<string>();
+
+			// We can't change the names of named parameters.  Any other names we're flexible on.
+			var isFixed = reservedNames.Select(s => true).Concat(
+				arguments.Select(a => a.NameColon != null)).ToList();
+
+			var parameterNames = reservedNames.Concat(
+				arguments.Select(a => semanticModel.GenerateNameForArgument(a))).ToList();
+
+			return NameGenerator.EnsureUniqueness(parameterNames, isFixed).Skip(reservedNames.Count).ToList();
+		}
+
+		public static IList<string> GenerateParameterNames(
+			this SemanticModel semanticModel,
+			IEnumerable<AttributeArgumentSyntax> arguments,
+			IList<string> reservedNames = null)
+		{
+			reservedNames = reservedNames ?? SpecializedCollections.EmptyList<string>();
+
+			// We can't change the names of named parameters.  Any other names we're flexible on.
+			var isFixed = reservedNames.Select(s => true).Concat(
+				arguments.Select(a => a.NameEquals != null)).ToList();
+
+			var parameterNames = reservedNames.Concat(
+				arguments.Select(a => semanticModel.GenerateNameForArgument(a))).ToList();
+
+			return NameGenerator.EnsureUniqueness(parameterNames, isFixed).Skip(reservedNames.Count).ToList();
+		}
+
+		public static ISet<INamespaceSymbol> GetUsingNamespacesInScope(this SemanticModel semanticModel, SyntaxNode location)
+		{
+			// Avoiding linq here for perf reasons. This is used heavily in the AddImport service
+			HashSet<INamespaceSymbol> result = null;
+
+			foreach (var @using in location.GetEnclosingUsingDirectives())
+			{
+				if (@using.Alias == null)
+				{
+					var symbolInfo = semanticModel.GetSymbolInfo(@using.Name);
+					if (symbolInfo.Symbol != null && symbolInfo.Symbol.Kind == SymbolKind.Namespace)
+					{
+						result = result ?? new HashSet<INamespaceSymbol>();
+						result.Add((INamespaceSymbol)symbolInfo.Symbol);
+					}
+				}
+			}
+
+			return result ?? SpecializedCollections.EmptySet<INamespaceSymbol>();
+		}
+
+		public static Accessibility DetermineAccessibilityConstraint(
+			this SemanticModel semanticModel,
+			TypeSyntax type,
+			CancellationToken cancellationToken)
+		{
+			if (type == null)
+			{
+				return Accessibility.Private;
+			}
+
+			type = GetOutermostType(type);
+
+			// Interesting cases based on 3.5.4 Accessibility constraints in the language spec.
+			// If any of the below hold, then we will override the default accessibility if the
+			// constraint wants the type to be more accessible. i.e. if by default we generate
+			// 'internal', but a constraint makes us 'public', then be public.
+
+			// 1) The direct base class of a class type must be at least as accessible as the
+			//    class type itself.
+			//
+			// 2) The explicit base interfaces of an interface type must be at least as accessible
+			//    as the interface type itself.
+			if (type != null)
+			{
+				if (type.Parent is BaseTypeSyntax && type.Parent.IsParentKind(SyntaxKind.BaseList) && ((BaseTypeSyntax)type.Parent).Type == type)
+				{
+					var containingType = semanticModel.GetDeclaredSymbol(type.GetAncestor<BaseTypeDeclarationSyntax>(), cancellationToken) as INamedTypeSymbol;
+					if (containingType != null && containingType.TypeKind == TypeKind.Interface)
+					{
+						return containingType.DeclaredAccessibility;
+					}
+					else if (((BaseListSyntax)type.Parent.Parent).Types[0] == type.Parent)
+					{
+						return containingType.DeclaredAccessibility;
+					}
+				}
+			}
+
+			// 4) The type of a constant must be at least as accessible as the constant itself.
+			// 5) The type of a field must be at least as accessible as the field itself.
+			if (type.IsParentKind(SyntaxKind.VariableDeclaration) &&
+				type.Parent.IsParentKind(SyntaxKind.FieldDeclaration))
+			{
+				var variableDeclaration = (VariableDeclarationSyntax)type.Parent;
+				return ((ISymbol)semanticModel.GetDeclaredSymbol(
+					variableDeclaration.Variables[0], cancellationToken)).DeclaredAccessibility;
+			}
+
+			// 3) The return type of a delegate type must be at least as accessible as the
+			//    delegate type itself.
+			// 6) The return type of a method must be at least as accessible as the method
+			//    itself.
+			// 7) The type of a property must be at least as accessible as the property itself.
+			// 8) The type of an event must be at least as accessible as the event itself.
+			// 9) The type of an indexer must be at least as accessible as the indexer itself.
+			// 10) The return type of an operator must be at least as accessible as the operator
+			//     itself.
+			if (type.IsParentKind(SyntaxKind.DelegateDeclaration) ||
+				type.IsParentKind(SyntaxKind.MethodDeclaration) ||
+				type.IsParentKind(SyntaxKind.PropertyDeclaration) ||
+				type.IsParentKind(SyntaxKind.EventDeclaration) ||
+				type.IsParentKind(SyntaxKind.IndexerDeclaration) ||
+				type.IsParentKind(SyntaxKind.OperatorDeclaration))
+			{
+				return semanticModel.GetDeclaredSymbol(
+					type.Parent, cancellationToken).DeclaredAccessibility;
+			}
+
+			// 3) The parameter types of a delegate type must be at least as accessible as the
+			//    delegate type itself.
+			// 6) The parameter types of a method must be at least as accessible as the method
+			//    itself.
+			// 9) The parameter types of an indexer must be at least as accessible as the
+			//    indexer itself.
+			// 10) The parameter types of an operator must be at least as accessible as the
+			//     operator itself.
+			// 11) The parameter types of an instance constructor must be at least as accessible
+			//     as the instance constructor itself.
+			if (type.IsParentKind(SyntaxKind.Parameter) && type.Parent.IsParentKind(SyntaxKind.ParameterList))
+			{
+				if (type.Parent.Parent.IsParentKind(SyntaxKind.DelegateDeclaration) ||
+					type.Parent.Parent.IsParentKind(SyntaxKind.MethodDeclaration) ||
+					type.Parent.Parent.IsParentKind(SyntaxKind.IndexerDeclaration) ||
+					type.Parent.Parent.IsParentKind(SyntaxKind.OperatorDeclaration))
+				{
+					return semanticModel.GetDeclaredSymbol(
+						type.Parent.Parent.Parent, cancellationToken).DeclaredAccessibility;
+				}
+
+				if (type.Parent.Parent.IsParentKind(SyntaxKind.ConstructorDeclaration))
+				{
+					var symbol = semanticModel.GetDeclaredSymbol(type.Parent.Parent.Parent, cancellationToken);
+					if (!symbol.IsStatic)
+					{
+						return symbol.DeclaredAccessibility;
+					}
+				}
+			}
+
+			// 8) The type of an event must be at least as accessible as the event itself.
+			if (type.IsParentKind(SyntaxKind.VariableDeclaration) &&
+				type.Parent.IsParentKind(SyntaxKind.EventFieldDeclaration))
+			{
+				var variableDeclaration = (VariableDeclarationSyntax)type.Parent;
+				var symbol = semanticModel.GetDeclaredSymbol(variableDeclaration.Variables[0], cancellationToken);
+				if (symbol != null)
+				{
+					return ((ISymbol)symbol).DeclaredAccessibility;
+				}
+			}
+
+			return Accessibility.Private;
+		}
+
+		private static TypeSyntax GetOutermostType(TypeSyntax type)
+		{
+			return type.GetAncestorsOrThis<TypeSyntax>().Last();
+		}
+
+		public static SemanticMap GetSemanticMap(this SemanticModel semanticModel, SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return SemanticMap.From(semanticModel, node, cancellationToken);
+		}
+
+		/// <summary>
+		/// Gets semantic information, such as type, symbols, and diagnostics, about the parent of a token.
+		/// </summary>
+		/// <param name="semanticModel">The SemanticModel object to get semantic information
+		/// from.</param>
+		/// <param name="token">The token to get semantic information from. This must be part of the
+		/// syntax tree associated with the binding.</param>
+		/// <param name="cancellationToken">A cancellation token.</param>
+		public static SymbolInfo GetSymbolInfo(this SemanticModel semanticModel, SyntaxToken token, CancellationToken cancellationToken)
+		{
+			return semanticModel.GetSymbolInfo(token.Parent, cancellationToken);
+		}
+
+		public static ISymbol GetEnclosingNamedTypeOrAssembly(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			return semanticModel.GetEnclosingSymbol<INamedTypeSymbol>(position, cancellationToken) ??
+				(ISymbol)semanticModel.Compilation.Assembly;
+		}
+
+		public static INamespaceSymbol GetEnclosingNamespace(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			return semanticModel.GetEnclosingSymbol<INamespaceSymbol>(position, cancellationToken);
+		}
+
+		public static ITypeSymbol GetType(
+			this SemanticModel semanticModel,
+			SyntaxNode expression,
+			CancellationToken cancellationToken)
+		{
+			var typeInfo = semanticModel.GetTypeInfo(expression, cancellationToken);
+			var symbolInfo = semanticModel.GetSymbolInfo(expression, cancellationToken);
+			return typeInfo.Type ?? symbolInfo.GetAnySymbol().ConvertToType(semanticModel.Compilation);
+		}
+
+//		public static IEnumerable<ISymbol> GetSymbols(
+//			this SemanticModel semanticModel,
+//			SyntaxToken token,
+//			Workspace workspace,
+//			bool bindLiteralsToUnderlyingType,
+//			CancellationToken cancellationToken)
+//		{
+//			var languageServices = workspace.Services.GetLanguageServices(token.Language);
+//			var syntaxFacts = languageServices.GetService<ISyntaxFactsService>();
+//			if (!syntaxFacts.IsBindableToken(token))
+//			{
+//				return SpecializedCollections.EmptyEnumerable<ISymbol>();
+//			}
+//
+//			var semanticFacts = languageServices.GetService<ISemanticFactsService>();
+//
+//			return GetSymbolsEnumerable(
+//				semanticModel, semanticFacts, syntaxFacts,
+//				token, bindLiteralsToUnderlyingType, cancellationToken)
+//					.WhereNotNull()
+//					.Select(MapSymbol);
+//		}
+
+		private static ISymbol MapSymbol(ISymbol symbol)
+		{
+			return symbol.IsConstructor() && symbol.ContainingType.IsAnonymousType
+				? symbol.ContainingType
+					: symbol;
+		}
+
+//		private static IEnumerable<ISymbol> GetSymbolsEnumerable(
+//			SemanticModel semanticModel,
+//			ISemanticFactsService semanticFacts,
+//			ISyntaxFactsService syntaxFacts,
+//			SyntaxToken token,
+//			bool bindLiteralsToUnderlyingType,
+//			CancellationToken cancellationToken)
+//		{
+//			var declaredSymbol = semanticFacts.GetDeclaredSymbol(semanticModel, token, cancellationToken);
+//			if (declaredSymbol != null)
+//			{
+//				yield return declaredSymbol;
+//				yield break;
+//			}
+//
+//			var aliasInfo = semanticModel.GetAliasInfo(token.Parent, cancellationToken);
+//			if (aliasInfo != null)
+//			{
+//				yield return aliasInfo;
+//			}
+//
+//			var bindableParent = syntaxFacts.GetBindableParent(token);
+//			var allSymbols = semanticModel.GetSymbolInfo(bindableParent, cancellationToken).GetBestOrAllSymbols().ToList();
+//			var type = semanticModel.GetTypeInfo(bindableParent, cancellationToken).Type;
+//
+//			if (type != null && allSymbols.Count == 0)
+//			{
+//				if ((bindLiteralsToUnderlyingType && syntaxFacts.IsLiteral(token)) ||
+//					syntaxFacts.IsAwaitKeyword(token))
+//				{
+//					yield return type;
+//				}
+//
+//				if (type.Kind == SymbolKind.NamedType)
+//				{
+//					var namedType = (INamedTypeSymbol)type;
+//					if (namedType.TypeKind == TypeKind.Delegate ||
+//						namedType.AssociatedSymbol != null)
+//					{
+//						yield return type;
+//					}
+//				}
+//			}
+//
+//			foreach (var symbol in allSymbols)
+//			{
+//				if (symbol.IsThisParameter() && type != null)
+//				{
+//					yield return type;
+//				}
+//				else if (symbol.IsFunctionValue())
+//				{
+//					var method = symbol.ContainingSymbol as IMethodSymbol;
+//
+//					if (method != null)
+//					{
+//						if (method.AssociatedSymbol != null)
+//						{
+//							yield return method.AssociatedSymbol;
+//						}
+//						else
+//						{
+//							yield return method;
+//						}
+//					}
+//					else
+//					{
+//						yield return symbol;
+//					}
+//				}
+//				else
+//				{
+//					yield return symbol;
+//				}
+//			}
+//		}
+
+		public static SemanticModel GetOriginalSemanticModel(this SemanticModel semanticModel)
+		{
+			if (!semanticModel.IsSpeculativeSemanticModel)
+			{
+				return semanticModel;
+			}
+
+//			Contract.ThrowIfNull(semanticModel.ParentModel);
+//			Contract.ThrowIfTrue(semanticModel.ParentModel.IsSpeculativeSemanticModel);
+//			Contract.ThrowIfTrue(semanticModel.ParentModel.ParentModel != null);
+			return semanticModel.ParentModel;
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/SignatureComparer.cs b/main/src/addins/CSharpBinding/Util/SignatureComparer.cs
new file mode 100644
index 0000000000..4f9e4c02a7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SignatureComparer.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SignatureComparer
+	{
+		readonly static Type typeInfo;
+		readonly static object instance;
+		readonly static MethodInfo haveSameSignatureMethod;
+		readonly static MethodInfo haveSameSignature2Method;
+		readonly static MethodInfo haveSameSignature3Method;
+		readonly static MethodInfo haveSameSignature4Method;
+		readonly static MethodInfo haveSameSignature5Method;
+
+		static SignatureComparer()
+		{
+			typeInfo = Type.GetType("Microsoft.CodeAnalysis.Shared.Utilities.SignatureComparer" + ReflectionNamespaces.WorkspacesAsmName, true);
+
+			instance = typeInfo.GetField("Instance", BindingFlags.Public | BindingFlags.Static).GetValue(null);
+
+			haveSameSignatureMethod = typeInfo.GetMethod("HaveSameSignature", new[] { typeof(IList<IParameterSymbol>), typeof(IList<IParameterSymbol>) });
+			haveSameSignature2Method = typeInfo.GetMethod("HaveSameSignature", new[] { typeof(IPropertySymbol), typeof(IPropertySymbol), typeof(bool) });
+			haveSameSignature3Method = typeInfo.GetMethod("HaveSameSignature", new[] { typeof(ISymbol), typeof(ISymbol), typeof(bool) });
+			haveSameSignature4Method = typeInfo.GetMethod("HaveSameSignature", new[] { typeof(IMethodSymbol), typeof(IMethodSymbol), typeof(bool), typeof(bool), typeof(bool) });
+			haveSameSignature5Method = typeInfo.GetMethod("HaveSameSignature", new[] { typeof(IList<IParameterSymbol>), typeof(IList<IParameterSymbol>), typeof(bool), typeof(bool) });
+			haveSameSignatureAndConstraintsAndReturnTypeAndAccessorsMethod = typeInfo.GetMethod ("HaveSameSignatureAndConstraintsAndReturnTypeAndAccessors", BindingFlags.Public | BindingFlags.Instance);
+		}
+
+		public static bool HaveSameSignature (IList<IParameterSymbol> parameters1, IList<IParameterSymbol> parameters2)
+		{
+			try {
+				return (bool)haveSameSignatureMethod.Invoke (instance, new object [] { parameters1, parameters2 });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		public static bool HaveSameSignature (IPropertySymbol property1, IPropertySymbol property2, bool caseSensitive)
+		{
+			try {
+				return (bool)haveSameSignature2Method.Invoke(instance, new object[] { property1, property2, caseSensitive });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		public static bool HaveSameSignature (ISymbol symbol1, ISymbol symbol2, bool caseSensitive)
+		{
+			try {
+				return (bool)haveSameSignature3Method.Invoke(instance, new object[] { symbol1, symbol2, caseSensitive });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		public static bool HaveSameSignature (IMethodSymbol method1, IMethodSymbol method2, bool caseSensitive, bool compareParameterName = false, bool isParameterCaseSensitive = false)
+		{
+			try {
+				return (bool)haveSameSignature4Method.Invoke(instance, new object[] { method1, method2, caseSensitive, compareParameterName, isParameterCaseSensitive });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		public static bool HaveSameSignature (IList<IParameterSymbol> parameters1, IList<IParameterSymbol> parameters2, bool compareParameterName, bool isCaseSensitive)
+		{
+			try {
+				return (bool)haveSameSignature5Method.Invoke(instance, new object[] { parameters1, parameters2, compareParameterName, isCaseSensitive });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		readonly static MethodInfo haveSameSignatureAndConstraintsAndReturnTypeAndAccessorsMethod;
+		public static bool HaveSameSignatureAndConstraintsAndReturnTypeAndAccessors(ISymbol symbol1, ISymbol symbol2, bool caseSensitive)
+		{
+			try {
+				return (bool)haveSameSignatureAndConstraintsAndReturnTypeAndAccessorsMethod.Invoke(instance, new object[] { symbol1, symbol2, caseSensitive });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/Util/SimpleNameSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/SimpleNameSyntaxExtensions.cs
new file mode 100644
index 0000000000..f129328f64
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SimpleNameSyntaxExtensions.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SimpleNameSyntaxExtensions
+	{
+		public static ExpressionSyntax GetLeftSideOfDot(this SimpleNameSyntax name)
+		{
+			if (name.IsMemberAccessExpressionName())
+			{
+				return ((MemberAccessExpressionSyntax)name.Parent).Expression;
+			}
+			else if (name.IsRightSideOfQualifiedName())
+			{
+				return ((QualifiedNameSyntax)name.Parent).Left;
+			}
+			else
+			{
+				return ((QualifiedCrefSyntax)name.Parent.Parent).Container;
+			}
+		}
+
+		// Returns true if this looks like a possible type name that is on it's own (i.e. not after
+		// a dot).  This function is not exhaustive and additional checks may be added if they are
+		// beleived to be valuable.
+		public static bool LooksLikeStandaloneTypeName(this SimpleNameSyntax simpleName)
+		{
+			if (simpleName == null)
+			{
+				return false;
+			}
+
+			// Isn't stand-alone if it's on the right of a dot/arrow
+			if (simpleName.IsRightSideOfDotOrArrow())
+			{
+				return false;
+			}
+
+			// type names can't be invoked.
+			if (simpleName.IsParentKind(SyntaxKind.InvocationExpression) &&
+				((InvocationExpressionSyntax)simpleName.Parent).Expression == simpleName)
+			{
+				return false;
+			}
+
+			// type names can't be indexed into.
+			if (simpleName.IsParentKind(SyntaxKind.ElementAccessExpression) &&
+				((ElementAccessExpressionSyntax)simpleName.Parent).Expression == simpleName)
+			{
+				return false;
+			}
+
+			// Looks good.  However, feel free to add additional checks if this funciton is too
+			// lenient in some circumstances.
+			return true;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SourceTextExtensions.cs b/main/src/addins/CSharpBinding/Util/SourceTextExtensions.cs
new file mode 100644
index 0000000000..94bd2c4e6a
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SourceTextExtensions.cs
@@ -0,0 +1,191 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal static class SourceTextExtensions
+	{
+		/// <summary>
+		/// Returns the leading whitespace of the line located at the specified position in the given snapshot.
+		/// </summary>
+		public static string GetLeadingWhitespaceOfLineAtPosition(this SourceText text, int position)
+		{
+		//	Contract.ThrowIfNull(text);
+
+			var line = text.Lines.GetLineFromPosition(position);
+			var linePosition = line.GetFirstNonWhitespacePosition();
+			if (!linePosition.HasValue)
+			{
+				return line.ToString();
+			}
+
+			var lineText = line.ToString();
+			return lineText.Substring(0, linePosition.Value - line.Start);
+		}
+
+		public static void GetLineAndOffset(this SourceText text, int position, out int lineNumber, out int offset)
+		{
+			var line = text.Lines.GetLineFromPosition(position);
+
+			lineNumber = line.LineNumber;
+			offset = position - line.Start;
+		}
+
+		public static void GetLinesAndOffsets(
+			this SourceText text,
+			TextSpan textSpan,
+			out int startLineNumber,
+			out int startOffset,
+			out int endLineNumber,
+			out int endOffset)
+		{
+			text.GetLineAndOffset(textSpan.Start, out startLineNumber, out startOffset);
+			text.GetLineAndOffset(textSpan.End, out endLineNumber, out endOffset);
+		}
+
+		public static bool OverlapsHiddenPosition(
+			this SourceText text, TextSpan span, Func<int, CancellationToken, bool> isPositionHidden, CancellationToken cancellationToken)
+		{
+			var result = TryOverlapsHiddenPosition(text, span, isPositionHidden, cancellationToken);
+			cancellationToken.ThrowIfCancellationRequested();
+			return result;
+		}
+
+		/// <summary>
+		/// Same as OverlapsHiddenPosition but doesn't throw on cancellation.  Instead, returns false
+		/// in that case.
+		/// </summary>
+		public static bool TryOverlapsHiddenPosition(
+			this SourceText text, TextSpan span, Func<int, CancellationToken, bool> isPositionHidden,
+			CancellationToken cancellationToken)
+		{
+			var startLineNumber = text.Lines.IndexOf(span.Start);
+			var endLineNumber = text.Lines.IndexOf(span.End);
+
+			// NOTE(cyrusn): It's safe to examine the start of a line because you can't have a line
+			// with both a pp directive and code on it.  so, for example, if a node crosses a region
+			// then it must be the case that the start of some line from the start of the node to
+			// the end is hidden.  i.e.:
+			#if false
+			'           class C
+			'           {
+			'#line hidden
+			'           }
+			'#line default
+			#endif
+			// The start of the line with the } on it is hidden, and thus the node overlaps a hidden
+			// region.
+
+			for (var lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++)
+			{
+				if (cancellationToken.IsCancellationRequested)
+				{
+					break;
+				}
+
+				var linePosition = text.Lines[lineNumber].Start;
+				var isHidden = isPositionHidden(linePosition, cancellationToken);
+				if (isHidden)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static TextChangeRange GetEncompassingTextChangeRange(this SourceText newText, SourceText oldText)
+		{
+			var ranges = newText.GetChangeRanges(oldText);
+			if (ranges.Count == 0)
+			{
+				return default(TextChangeRange);
+			}
+
+			// simple case.
+			if (ranges.Count == 1)
+			{
+				return ranges[0];
+			}
+
+			return TextChangeRange.Collapse(ranges);
+		}
+
+		public static int IndexOf(this SourceText text, string value, int startIndex, bool caseSensitive)
+		{
+			var length = text.Length - value.Length;
+			var normalized = caseSensitive ? value : value.ToLowerInvariant();
+
+			for (var i = startIndex; i <= length; i++)
+			{
+				var match = true;
+				for (var j = 0; j < normalized.Length; j++)
+				{
+					// just use indexer of source text. perf of indexer depends on actual implementation of SourceText.
+					// * all of our implementation at editor layer should provide either O(1) or O(logn).
+					//
+					// only one implementation we have that could have bad indexer perf is CompositeText with heavily modified text
+					// at compiler layer but I believe that being used in find all reference will be very rare if not none.
+					if (!Match(normalized[j], text[i + j], caseSensitive))
+					{
+						match = false;
+						break;
+					}
+				}
+
+				if (match)
+				{
+					return i;
+				}
+			}
+
+			return -1;
+		}
+
+		public static int LastIndexOf(this SourceText text, string value, int startIndex, bool caseSensitive)
+		{
+			var normalized = caseSensitive ? value : value.ToLowerInvariant();
+			startIndex = startIndex + normalized.Length > text.Length
+				? text.Length - normalized.Length
+				: startIndex;
+
+			for (var i = startIndex; i >= 0; i--)
+			{
+				var match = true;
+				for (var j = 0; j < normalized.Length; j++)
+				{
+					// just use indexer of source text. perf of indexer depends on actual implementation of SourceText.
+					// * all of our implementation at editor layer should provide either O(1) or O(logn).
+					//
+					// only one implementation we have that could have bad indexer perf is CompositeText with heavily modified text
+					// at compiler layer but I believe that being used in find all reference will be very rare if not none.
+					if (!Match(normalized[j], text[i + j], caseSensitive))
+					{
+						match = false;
+						break;
+					}
+				}
+
+				if (match)
+				{
+					return i;
+				}
+			}
+
+			return -1;
+		}
+
+		private static readonly TextInfo s_invariantTextInfo = CultureInfo.InvariantCulture.TextInfo;
+
+		private static bool Match(char nomalizedLeft, char right, bool caseSensitive)
+		{
+			return caseSensitive ? nomalizedLeft == right : nomalizedLeft == s_invariantTextInfo.ToLower(right);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SpecializedCollections.cs b/main/src/addins/CSharpBinding/Util/SpecializedCollections.cs
new file mode 100644
index 0000000000..18160000b6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SpecializedCollections.cs
@@ -0,0 +1,673 @@
+//
+// SpecializedCollections.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static partial class SpecializedCollections
+	{
+		public static readonly byte[] EmptyBytes = EmptyArray<byte>();
+		public static readonly object[] EmptyObjects = EmptyArray<object>();
+
+		public static T[] EmptyArray<T>()
+		{
+			return Empty.Array<T>.Instance;
+		}
+
+		public static IEnumerator<T> EmptyEnumerator<T>()
+		{
+			return Empty.Enumerator<T>.Instance;
+		}
+
+		public static IEnumerable<T> EmptyEnumerable<T>()
+		{
+			return Empty.List<T>.Instance;
+		}
+
+		public static ICollection<T> EmptyCollection<T>()
+		{
+			return Empty.List<T>.Instance;
+		}
+
+		public static IList<T> EmptyList<T>()
+		{
+			return Empty.List<T>.Instance;
+		}
+
+		public static IReadOnlyList<T> EmptyReadOnlyList<T>()
+		{
+			return Empty.List<T>.Instance;
+		}
+
+		public static ISet<T> EmptySet<T>()
+		{
+			return Empty.Set<T>.Instance;
+		}
+
+		public static IDictionary<TKey, TValue> EmptyDictionary<TKey, TValue>()
+		{
+			return Empty.Dictionary<TKey, TValue>.Instance;
+		}
+
+		public static IEnumerable<T> SingletonEnumerable<T>(T value)
+		{
+			return new Singleton.Collection<T>(value);
+		}
+
+		public static ICollection<T> SingletonCollection<T>(T value)
+		{
+			return new Singleton.Collection<T>(value);
+		}
+
+		public static IEnumerator<T> SingletonEnumerator<T>(T value)
+		{
+			return new Singleton.Enumerator<T>(value);
+		}
+
+		public static IEnumerable<T> ReadOnlyEnumerable<T>(IEnumerable<T> values)
+		{
+			return new ReadOnly.Enumerable<IEnumerable<T>, T>(values);
+		}
+
+		public static ICollection<T> ReadOnlyCollection<T>(ICollection<T> collection)
+		{
+			return collection == null || collection.Count == 0
+				? EmptyCollection<T>()
+					: new ReadOnly.Collection<ICollection<T>, T>(collection);
+		}
+
+		public static ISet<T> ReadOnlySet<T>(ISet<T> set)
+		{
+			return set == null || set.Count == 0
+				? EmptySet<T>()
+					: new ReadOnly.Set<ISet<T>, T>(set);
+		}
+
+		public static ISet<T> ReadOnlySet<T>(IEnumerable<T> values)
+		{
+			if (values is ISet<T>)
+			{
+				return ReadOnlySet((ISet<T>)values);
+			}
+
+			HashSet<T> result = null;
+			foreach (var item in values)
+			{
+				result = result ?? new HashSet<T>();
+				result.Add(item);
+			}
+
+			return ReadOnlySet(result);
+		}
+
+		private partial class Empty
+		{
+			internal class Array<T>
+			{
+				public static readonly T[] Instance = new T[0];
+			}
+		
+			internal class Collection<T> : Enumerable<T>, ICollection<T>
+			{
+				public static readonly ICollection<T> Instance = new Collection<T>();
+
+				protected Collection()
+				{
+				}
+
+				public void Add(T item)
+				{
+					throw new NotSupportedException();
+				}
+
+				public void Clear()
+				{
+				}
+
+				public bool Contains(T item)
+				{
+					return false;
+				}
+
+				public void CopyTo(T[] array, int arrayIndex)
+				{
+				}
+
+				public int Count
+				{
+					get
+					{
+						return 0;
+					}
+				}
+
+				public bool IsReadOnly
+				{
+					get
+					{
+						return true;
+					}
+				}
+
+				public bool Remove(T item)
+				{
+					throw new NotSupportedException();
+				}
+			}
+		
+			internal class Dictionary<TKey, TValue> : Collection<KeyValuePair<TKey, TValue>>, IDictionary<TKey, TValue>
+			{
+				public static readonly new IDictionary<TKey, TValue> Instance = new Dictionary<TKey, TValue>();
+
+				private Dictionary()
+				{
+				}
+
+				public void Add(TKey key, TValue value)
+				{
+					throw new NotSupportedException();
+				}
+
+				public bool ContainsKey(TKey key)
+				{
+					return false;
+				}
+
+				public ICollection<TKey> Keys
+				{
+					get
+					{
+						return Collection<TKey>.Instance;
+					}
+				}
+
+				public bool Remove(TKey key)
+				{
+					throw new NotSupportedException();
+				}
+
+				public bool TryGetValue(TKey key, out TValue value)
+				{
+					value = default(TValue);
+					return false;
+				}
+
+				public ICollection<TValue> Values
+				{
+					get
+					{
+						return Collection<TValue>.Instance;
+					}
+				}
+
+				public TValue this[TKey key]
+				{
+					get
+					{
+						throw new NotSupportedException();
+					}
+
+					set
+					{
+						throw new NotSupportedException();
+					}
+				}
+
+			}
+		
+			internal class Enumerable<T> : IEnumerable<T>
+			{
+				// PERF: cache the instance of enumerator. 
+				// accessing a generic static field is kinda slow from here,
+				// but since empty enumerables are singletons, there is no harm in having 
+				// one extra instance field
+				private readonly IEnumerator<T> _enumerator = Enumerator<T>.Instance;
+
+				public IEnumerator<T> GetEnumerator()
+				{
+					return _enumerator;
+				}
+
+				System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+				{
+					return GetEnumerator();
+				}
+			}
+		
+			internal class Enumerator : IEnumerator
+			{
+				public static readonly IEnumerator Instance = new Enumerator();
+
+				protected Enumerator()
+				{
+				}
+
+				public object Current
+				{
+					get
+					{
+						throw new InvalidOperationException();
+					}
+				}
+
+				public bool MoveNext()
+				{
+					return false;
+				}
+
+				public void Reset()
+				{
+					throw new InvalidOperationException();
+				}
+			}
+
+			internal class Enumerator<T> : Enumerator, IEnumerator<T>
+			{
+				public static new readonly IEnumerator<T> Instance = new Enumerator<T>();
+
+				protected Enumerator()
+				{
+				}
+
+				public new T Current
+				{
+					get
+					{
+						throw new InvalidOperationException();
+					}
+				}
+
+				public void Dispose()
+				{
+				}
+			}
+
+			internal class List<T> : Collection<T>, IList<T>, IReadOnlyList<T>
+			{
+				public static readonly new List<T> Instance = new List<T>();
+
+				protected List()
+				{
+				}
+
+				public int IndexOf(T item)
+				{
+					return -1;
+				}
+
+				public void Insert(int index, T item)
+				{
+					throw new NotSupportedException();
+				}
+
+				public void RemoveAt(int index)
+				{
+					throw new NotSupportedException();
+				}
+
+				public T this[int index]
+				{
+					get
+					{
+						throw new ArgumentOutOfRangeException("index");
+					}
+
+					set
+					{
+						throw new NotSupportedException();
+					}
+				}
+			}
+
+			internal class Set<T> : Collection<T>, ISet<T>
+			{
+				public static readonly new ISet<T> Instance = new Set<T>();
+
+				protected Set()
+				{
+				}
+
+				public new bool Add(T item)
+				{
+					throw new NotImplementedException();
+				}
+
+				public void ExceptWith(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public void IntersectWith(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public bool IsProperSubsetOf(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public bool IsProperSupersetOf(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public bool IsSubsetOf(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public bool IsSupersetOf(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public bool Overlaps(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public bool SetEquals(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public void SymmetricExceptWith(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public void UnionWith(IEnumerable<T> other)
+				{
+					throw new NotImplementedException();
+				}
+
+				public new System.Collections.IEnumerator GetEnumerator()
+				{
+					return Set<T>.Instance.GetEnumerator();
+				}
+			}
+		}
+	
+		private static partial class ReadOnly
+		{
+			internal class Collection<TUnderlying, T> : Enumerable<TUnderlying, T>, ICollection<T>
+				where TUnderlying : ICollection<T>
+			{
+				public Collection(TUnderlying underlying)
+					: base(underlying)
+				{
+				}
+
+				public void Add(T item)
+				{
+					throw new NotSupportedException();
+				}
+
+				public void Clear()
+				{
+					throw new NotSupportedException();
+				}
+
+				public bool Contains(T item)
+				{
+					return this.Underlying.Contains(item);
+				}
+
+				public void CopyTo(T[] array, int arrayIndex)
+				{
+					this.Underlying.CopyTo(array, arrayIndex);
+				}
+
+				public int Count
+				{
+					get
+					{
+						return this.Underlying.Count;
+					}
+				}
+
+				public bool IsReadOnly
+				{
+					get
+					{
+						return true;
+					}
+				}
+
+				public bool Remove(T item)
+				{
+					throw new NotSupportedException();
+				}
+			}
+		
+			internal class Enumerable<TUnderlying> : IEnumerable
+				where TUnderlying : IEnumerable
+			{
+				protected readonly TUnderlying Underlying;
+
+				public Enumerable(TUnderlying underlying)
+				{
+					this.Underlying = underlying;
+				}
+
+				public IEnumerator GetEnumerator()
+				{
+					return this.Underlying.GetEnumerator();
+				}
+			}
+
+			internal class Enumerable<TUnderlying, T> : Enumerable<TUnderlying>, IEnumerable<T>
+				where TUnderlying : IEnumerable<T>
+			{
+				public Enumerable(TUnderlying underlying)
+					: base(underlying)
+				{
+				}
+
+				public new IEnumerator<T> GetEnumerator()
+				{
+					return this.Underlying.GetEnumerator();
+				}
+			}
+
+			internal class Set<TUnderlying, T> : Collection<TUnderlying, T>, ISet<T>
+				where TUnderlying : ISet<T>
+			{
+				public Set(TUnderlying underlying)
+					: base(underlying)
+				{
+				}
+
+				public new bool Add(T item)
+				{
+					throw new NotSupportedException();
+				}
+
+				public void ExceptWith(IEnumerable<T> other)
+				{
+					throw new NotSupportedException();
+				}
+
+				public void IntersectWith(IEnumerable<T> other)
+				{
+					throw new NotSupportedException();
+				}
+
+				public bool IsProperSubsetOf(IEnumerable<T> other)
+				{
+					return Underlying.IsProperSubsetOf(other);
+				}
+
+				public bool IsProperSupersetOf(IEnumerable<T> other)
+				{
+					return Underlying.IsProperSupersetOf(other);
+				}
+
+				public bool IsSubsetOf(IEnumerable<T> other)
+				{
+					return Underlying.IsSubsetOf(other);
+				}
+
+				public bool IsSupersetOf(IEnumerable<T> other)
+				{
+					return Underlying.IsSupersetOf(other);
+				}
+
+				public bool Overlaps(IEnumerable<T> other)
+				{
+					return Underlying.Overlaps(other);
+				}
+
+				public bool SetEquals(IEnumerable<T> other)
+				{
+					return Underlying.SetEquals(other);
+				}
+
+				public void SymmetricExceptWith(IEnumerable<T> other)
+				{
+					throw new NotSupportedException();
+				}
+
+				public void UnionWith(IEnumerable<T> other)
+				{
+					throw new NotSupportedException();
+				}
+			}
+
+
+		}
+
+		private static partial class Singleton
+		{
+			internal sealed class Collection<T> : ICollection<T>, IReadOnlyCollection<T>
+			{
+				private T _loneValue;
+
+				public Collection(T value)
+				{
+					_loneValue = value;
+				}
+
+				public void Add(T item)
+				{
+					throw new NotSupportedException();
+				}
+
+				public void Clear()
+				{
+					throw new NotSupportedException();
+				}
+
+				public bool Contains(T item)
+				{
+					return EqualityComparer<T>.Default.Equals(_loneValue, item);
+				}
+
+				public void CopyTo(T[] array, int arrayIndex)
+				{
+					array[arrayIndex] = _loneValue;
+				}
+
+				public int Count
+				{
+					get { return 1; }
+				}
+
+				public bool IsReadOnly
+				{
+					get { return true; }
+				}
+
+				public bool Remove(T item)
+				{
+					throw new NotSupportedException();
+				}
+
+				public IEnumerator<T> GetEnumerator()
+				{
+					return new Enumerator<T>(_loneValue);
+				}
+
+				IEnumerator IEnumerable.GetEnumerator()
+				{
+					return GetEnumerator();
+				}
+			}
+			internal class Enumerator<T> : IEnumerator<T>
+			{
+				private T _loneValue;
+				private bool _moveNextCalled;
+
+				public Enumerator(T value)
+				{
+					_loneValue = value;
+					_moveNextCalled = false;
+				}
+
+				public T Current
+				{
+					get
+					{
+						return _loneValue;
+					}
+				}
+
+				object IEnumerator.Current
+				{
+					get
+					{
+						return _loneValue;
+					}
+				}
+
+				public void Dispose()
+				{
+				}
+
+				public bool MoveNext()
+				{
+					if (!_moveNextCalled)
+					{
+						_moveNextCalled = true;
+						return true;
+					}
+
+					return false;
+				}
+
+				public void Reset()
+				{
+					_moveNextCalled = false;
+				}
+			}
+		
+		}
+	
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/Util/SpeculationAnalyzer.cs b/main/src/addins/CSharpBinding/Util/SpeculationAnalyzer.cs
new file mode 100644
index 0000000000..cbca2f38cd
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SpeculationAnalyzer.cs
@@ -0,0 +1,137 @@
+//
+// SpeculationAnalyzer.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class SpeculationAnalyzer
+	{
+		readonly static Type typeInfo;
+		readonly static MethodInfo symbolsForOriginalAndReplacedNodesAreCompatibleMethod;
+		readonly static MethodInfo replacementChangesSemanticsMethod;
+		readonly object instance;
+
+		static SpeculationAnalyzer ()
+		{
+			Type[] abstractSpeculationAnalyzerGenericParams = new[] {
+				Type.GetType ("Microsoft.CodeAnalysis.SyntaxNode" + ReflectionNamespaces.CAAsmName, true),
+				Type.GetType ("Microsoft.CodeAnalysis.CSharp.Syntax.ExpressionSyntax" + ReflectionNamespaces.CACSharpAsmName, true),
+				Type.GetType ("Microsoft.CodeAnalysis.CSharp.Syntax.TypeSyntax" + ReflectionNamespaces.CACSharpAsmName, true),
+				Type.GetType ("Microsoft.CodeAnalysis.CSharp.Syntax.AttributeSyntax" + ReflectionNamespaces.CACSharpAsmName, true),
+				Type.GetType ("Microsoft.CodeAnalysis.CSharp.Syntax.ArgumentSyntax" + ReflectionNamespaces.CACSharpAsmName, true),
+				Type.GetType ("Microsoft.CodeAnalysis.CSharp.Syntax.ForEachStatementSyntax" + ReflectionNamespaces.CACSharpAsmName, true),
+				Type.GetType ("Microsoft.CodeAnalysis.CSharp.Syntax.ThrowStatementSyntax" + ReflectionNamespaces.CACSharpAsmName, true),
+				Type.GetType ("Microsoft.CodeAnalysis.SemanticModel" + ReflectionNamespaces.CAAsmName, true),
+				Type.GetType ("Microsoft.CodeAnalysis.CSharp.Conversion" + ReflectionNamespaces.CACSharpAsmName, true)
+			};
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.Shared.Utilities.AbstractSpeculationAnalyzer`9" + ReflectionNamespaces.WorkspacesAsmName, true)
+				.MakeGenericType (abstractSpeculationAnalyzerGenericParams);
+
+			symbolsForOriginalAndReplacedNodesAreCompatibleMethod = typeInfo.GetMethod ("SymbolsForOriginalAndReplacedNodesAreCompatible", BindingFlags.Public | BindingFlags.Instance);
+			replacementChangesSemanticsMethod = typeInfo.GetMethod ("ReplacementChangesSemantics", BindingFlags.Public | BindingFlags.Instance);
+			symbolInfosAreCompatibleMethod = typeInfo.GetMethod ("SymbolInfosAreCompatible", BindingFlags.Public | BindingFlags.Static);
+
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CSharp.Utilities.SpeculationAnalyzer" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			createSpeculativeSemanticModelForNodeMethod =  typeInfo.GetMethod ("CreateSpeculativeSemanticModelForNode", BindingFlags.Public | BindingFlags.Static, null, new [] {typeof (SyntaxNode), typeof (SyntaxNode), typeof (SemanticModel)}, null);
+		}
+
+		public SpeculationAnalyzer (ExpressionSyntax expression, ExpressionSyntax newExpression, SemanticModel semanticModel, CancellationToken cancellationToken, bool skipVerificationForReplacedNode = false, bool failOnOverloadResolutionFailuresInOriginalCode = false)
+		{
+			instance = Activator.CreateInstance (typeInfo, new object[] {
+				expression,
+				newExpression,
+				semanticModel,
+				cancellationToken,
+				skipVerificationForReplacedNode,
+				failOnOverloadResolutionFailuresInOriginalCode
+			});
+		}
+
+		static MethodInfo symbolInfosAreCompatibleMethod;
+
+		public static bool SymbolInfosAreCompatible(SymbolInfo originalSymbolInfo, SymbolInfo newSymbolInfo, bool performEquivalenceCheck, bool requireNonNullSymbols = false)
+		{
+			try {
+				return (bool)symbolInfosAreCompatibleMethod.Invoke (null, new object [] { originalSymbolInfo, newSymbolInfo, performEquivalenceCheck, requireNonNullSymbols });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		public bool SymbolsForOriginalAndReplacedNodesAreCompatible ()
+		{
+			try {
+				return (bool)symbolsForOriginalAndReplacedNodesAreCompatibleMethod.Invoke (instance, new object[0]);
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		public bool ReplacementChangesSemantics ()
+		{
+			try {
+				return (bool)replacementChangesSemanticsMethod.Invoke (instance, new object[0]);
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		readonly static MethodInfo createSpeculativeSemanticModelForNodeMethod;
+
+		public static SemanticModel CreateSpeculativeSemanticModelForNode(SyntaxNode originalNode, SyntaxNode nodeToSpeculate, SemanticModel semanticModel)
+		{
+			return (SemanticModel)createSpeculativeSemanticModelForNodeMethod.Invoke (null, new object[] {originalNode, nodeToSpeculate, semanticModel });
+		}
+
+		public static bool CanSpeculateOnNode(SyntaxNode node)
+		{
+			return (node is StatementSyntax && node.Kind() != SyntaxKind.Block) ||
+				node is TypeSyntax ||
+				node is CrefSyntax ||
+				node.Kind() == SyntaxKind.Attribute ||
+				node.Kind() == SyntaxKind.ThisConstructorInitializer ||
+				node.Kind() == SyntaxKind.BaseConstructorInitializer ||
+				node.Kind() == SyntaxKind.EqualsValueClause ||
+				node.Kind() == SyntaxKind.ArrowExpressionClause;
+		}
+
+	}
+
+}
diff --git a/main/src/addins/CSharpBinding/Util/StringExtensions.cs b/main/src/addins/CSharpBinding/Util/StringExtensions.cs
new file mode 100644
index 0000000000..29cf7ed7f1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/StringExtensions.cs
@@ -0,0 +1,551 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Immutable;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using System.Diagnostics;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class StringExtensions
+	{
+		public static int? GetFirstNonWhitespaceOffset(this string line)
+		{
+			// Contract.ThrowIfNull(line);
+
+			for (int i = 0; i < line.Length; i++)
+			{
+				if (!char.IsWhiteSpace(line[i]))
+				{
+					return i;
+				}
+			}
+
+			return null;
+		}
+
+		public static string GetLeadingWhitespace(this string lineText)
+		{
+			// Contract.ThrowIfNull(lineText);
+
+			var firstOffset = lineText.GetFirstNonWhitespaceOffset();
+
+			return firstOffset.HasValue
+				? lineText.Substring(0, firstOffset.Value)
+					: lineText;
+		}
+
+		public static int GetTextColumn(this string text, int tabSize, int initialColumn)
+		{
+			var lineText = text.GetLastLineText();
+			if (text != lineText)
+			{
+				return lineText.GetColumnFromLineOffset(lineText.Length, tabSize);
+			}
+
+			return text.ConvertTabToSpace(tabSize, initialColumn, text.Length) + initialColumn;
+		}
+
+		public static int ConvertTabToSpace(this string textSnippet, int tabSize, int initialColumn, int endPosition)
+		{
+			// Contract.Requires(tabSize > 0);
+			// Contract.Requires(endPosition >= 0 && endPosition <= textSnippet.Length);
+
+			int column = initialColumn;
+
+			// now this will calculate indentation regardless of actual content on the buffer except TAB
+			for (int i = 0; i < endPosition; i++)
+			{
+				if (textSnippet[i] == '\t')
+				{
+					column += tabSize - column % tabSize;
+				}
+				else
+				{
+					column++;
+				}
+			}
+
+			return column - initialColumn;
+		}
+
+		public static int IndexOf(this string text, Func<char, bool> predicate)
+		{
+			if (text == null)
+			{
+				return -1;
+			}
+
+			for (int i = 0; i < text.Length; i++)
+			{
+				if (predicate(text[i]))
+				{
+					return i;
+				}
+			}
+
+			return -1;
+		}
+
+		public static string GetFirstLineText(this string text)
+		{
+			var lineBreak = text.IndexOf('\n');
+			if (lineBreak < 0)
+			{
+				return text;
+			}
+
+			return text.Substring(0, lineBreak + 1);
+		}
+
+		public static string GetLastLineText(this string text)
+		{
+			var lineBreak = text.LastIndexOf('\n');
+			if (lineBreak < 0)
+			{
+				return text;
+			}
+
+			return text.Substring(lineBreak + 1);
+		}
+
+		public static bool ContainsLineBreak(this string text)
+		{
+			foreach (char ch in text)
+			{
+				if (ch == '\n' || ch == '\r')
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static int GetNumberOfLineBreaks(this string text)
+		{
+			int lineBreaks = 0;
+			for (int i = 0; i < text.Length; i++)
+			{
+				if (text[i] == '\n')
+				{
+					lineBreaks++;
+				}
+				else if (text[i] == '\r')
+				{
+					if (i + 1 == text.Length || text[i + 1] != '\n')
+					{
+						lineBreaks++;
+					}
+				}
+			}
+
+			return lineBreaks;
+		}
+
+		public static bool ContainsTab(this string text)
+		{
+			// PERF: Tried replacing this with "text.IndexOf('\t')>=0", but that was actually slightly slower
+			foreach (char ch in text)
+			{
+				if (ch == '\t')
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static ImmutableArray<SymbolDisplayPart> ToSymbolDisplayParts(this string text)
+		{
+			return ImmutableArray.Create<SymbolDisplayPart>(new SymbolDisplayPart(SymbolDisplayPartKind.Text, null, text));
+		}
+
+		public static int GetColumnOfFirstNonWhitespaceCharacterOrEndOfLine(this string line, int tabSize)
+		{
+			var firstNonWhitespaceChar = line.GetFirstNonWhitespaceOffset();
+
+			if (firstNonWhitespaceChar.HasValue)
+			{
+				return line.GetColumnFromLineOffset(firstNonWhitespaceChar.Value, tabSize);
+			}
+			else
+			{
+				// It's all whitespace, so go to the end
+				return line.GetColumnFromLineOffset(line.Length, tabSize);
+			}
+		}
+
+		public static int GetColumnFromLineOffset(this string line, int endPosition, int tabSize)
+		{
+//			Contract.ThrowIfNull(line);
+//			Contract.ThrowIfFalse(0 <= endPosition && endPosition <= line.Length);
+//			Contract.ThrowIfFalse(tabSize > 0);
+
+			return ConvertTabToSpace(line, tabSize, 0, endPosition);
+		}
+
+		public static int GetLineOffsetFromColumn(this string line, int column, int tabSize)
+		{
+//			Contract.ThrowIfNull(line);
+//			Contract.ThrowIfFalse(column >= 0);
+//			Contract.ThrowIfFalse(tabSize > 0);
+
+			var currentColumn = 0;
+
+			for (int i = 0; i < line.Length; i++)
+			{
+				if (currentColumn >= column)
+				{
+					return i;
+				}
+
+				if (line[i] == '\t')
+				{
+					currentColumn += tabSize - (currentColumn % tabSize);
+				}
+				else
+				{
+					currentColumn++;
+				}
+			}
+
+			// We're asking for a column past the end of the line, so just go to the end.
+			return line.Length;
+		}
+
+//		public static void AppendToAliasNameSet(this string alias, ImmutableHashSet<string>.Builder builder)
+//		{
+//			if (string.IsNullOrWhiteSpace(alias))
+//			{
+//				return;
+//			}
+//
+//			builder.Add(alias);
+//
+//			var caseSensitive = builder.KeyComparer == StringComparer.Ordinal;
+//		//	Contract.Requires(builder.KeyComparer == StringComparer.Ordinal || builder.KeyComparer == StringComparer.OrdinalIgnoreCase);
+//
+//			string aliasWithoutAttribute;
+//			if (alias.TryGetWithoutAttributeSuffix(caseSensitive, out aliasWithoutAttribute))
+//			{
+//				builder.Add(aliasWithoutAttribute);
+//				return;
+//			}
+//
+//			builder.Add(alias.GetWithSingleAttributeSuffix(caseSensitive));
+//		}
+
+
+		private static ImmutableArray<string> s_lazyNumerals;
+
+		internal static string GetNumeral(int number)
+		{
+			var numerals = s_lazyNumerals;
+			if (numerals.IsDefault)
+			{
+				numerals = ImmutableArray.Create("0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
+				ImmutableInterlocked.InterlockedInitialize(ref s_lazyNumerals, numerals);
+			}
+
+			Debug.Assert(number >= 0);
+			return (number < numerals.Length) ? numerals[number] : number.ToString();
+		}
+
+		public static string Join(this IEnumerable<string> source, string separator)
+		{
+			if (source == null)
+			{
+				throw new ArgumentNullException("source");
+			}
+
+			if (separator == null)
+			{
+				throw new ArgumentNullException("separator");
+			}
+
+			return string.Join(separator, source);
+		}
+
+		public static bool LooksLikeInterfaceName(this string name)
+		{
+			return name.Length >= 3 && name[0] == 'I' && char.IsUpper(name[1]) && char.IsLower(name[2]);
+		}
+
+		public static bool LooksLikeTypeParameterName(this string name)
+		{
+			return name.Length >= 3 && name[0] == 'T' && char.IsUpper(name[1]) && char.IsLower(name[2]);
+		}
+
+		private static readonly Func<char, char> s_toLower = char.ToLower;
+		private static readonly Func<char, char> s_toUpper = char.ToUpper;
+
+		public static string ToPascalCase(
+			this string shortName,
+			bool trimLeadingTypePrefix = true)
+		{
+			return ConvertCase(shortName, trimLeadingTypePrefix, s_toUpper);
+		}
+
+		public static string ToCamelCase(
+			this string shortName,
+			bool trimLeadingTypePrefix = true)
+		{
+			return ConvertCase(shortName, trimLeadingTypePrefix, s_toLower);
+		}
+
+		private static string ConvertCase(
+			this string shortName,
+			bool trimLeadingTypePrefix,
+			Func<char, char> convert)
+		{
+			// Special case the common .net pattern of "IFoo" as a type name.  In this case we
+			// want to generate "foo" as the parameter name.  
+			if (!string.IsNullOrEmpty(shortName))
+			{
+				if (trimLeadingTypePrefix && (shortName.LooksLikeInterfaceName() || shortName.LooksLikeTypeParameterName()))
+				{
+					return convert(shortName[1]) + shortName.Substring(2);
+				}
+
+				if (convert(shortName[0]) != shortName[0])
+				{
+					return convert(shortName[0]) + shortName.Substring(1);
+				}
+			}
+
+			return shortName;
+		}
+
+		internal static bool IsValidClrTypeName(this string name)
+		{
+			return !string.IsNullOrEmpty(name) && name.IndexOf('\0') == -1;
+		}
+
+		/// <summary>
+		/// Checks if the given name is a sequence of valid CLR names separated by a dot.
+		/// </summary>
+		internal static bool IsValidClrNamespaceName(this string name)
+		{
+			if (string.IsNullOrEmpty(name))
+			{
+				return false;
+			}
+
+			char lastChar = '.';
+			foreach (char c in name)
+			{
+				if (c == '\0' || (c == '.' && lastChar == '.'))
+				{
+					return false;
+				}
+
+				lastChar = c;
+			}
+
+			return lastChar != '.';
+		}
+
+		internal static string GetWithSingleAttributeSuffix(
+			this string name,
+			bool isCaseSensitive)
+		{
+			string cleaned = name;
+			while ((cleaned = GetWithoutAttributeSuffix(cleaned, isCaseSensitive)) != null)
+			{
+				name = cleaned;
+			}
+
+			return name + "Attribute";
+		}
+
+		internal static bool TryGetWithoutAttributeSuffix(
+			this string name,
+			out string result)
+		{
+			return TryGetWithoutAttributeSuffix(name, isCaseSensitive: true, result: out result);
+		}
+
+		internal static string GetWithoutAttributeSuffix(
+			this string name,
+			bool isCaseSensitive)
+		{
+			string result;
+			return TryGetWithoutAttributeSuffix(name, isCaseSensitive, out result) ? result : null;
+		}
+
+		internal static bool TryGetWithoutAttributeSuffix(
+			this string name,
+			bool isCaseSensitive,
+			out string result)
+		{
+			const string AttributeSuffix = "Attribute";
+			var comparison = isCaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
+			if (name.Length > AttributeSuffix.Length && name.EndsWith(AttributeSuffix, comparison))
+			{
+				result = name.Substring(0, name.Length - AttributeSuffix.Length);
+				return true;
+			}
+
+			result = null;
+			return false;
+		}
+
+		internal static bool IsValidUnicodeString(this string str)
+		{
+			int i = 0;
+			while (i < str.Length)
+			{
+				char c = str[i++];
+
+				// (high surrogate, low surrogate) makes a valid pair, anything else is invalid:
+				if (char.IsHighSurrogate(c))
+				{
+					if (i < str.Length && char.IsLowSurrogate(str[i]))
+					{
+						i++;
+					}
+					else
+					{
+						// high surrogate not followed by low surrogate
+						return false;
+					}
+				}
+				else if (char.IsLowSurrogate(c))
+				{
+					// previous character wasn't a high surrogate
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		/// <summary>
+		/// Remove one set of leading and trailing double quote characters, if both are present.
+		/// </summary>
+		internal static string Unquote(this string arg)
+		{
+			bool quoted;
+			return Unquote(arg, out quoted);
+		}
+
+		internal static string Unquote(this string arg, out bool quoted)
+		{
+			if (arg.Length > 1 && arg[0] == '"' && arg[arg.Length - 1] == '"')
+			{
+				quoted = true;
+				return arg.Substring(1, arg.Length - 2);
+			}
+			else
+			{
+				quoted = false;
+				return arg;
+			}
+		}
+
+		internal static int IndexOfBalancedParenthesis(this string str, int openingOffset, char closing)
+		{
+			char opening = str[openingOffset];
+
+			int depth = 1;
+			for (int i = openingOffset + 1; i < str.Length; i++)
+			{
+				var c = str[i];
+				if (c == opening)
+				{
+					depth++;
+				}
+				else if (c == closing)
+				{
+					depth--;
+					if (depth == 0)
+					{
+						return i;
+					}
+				}
+			}
+
+			return -1;
+		}
+
+		// String isn't IEnumerable<char> in the current Portable profile. 
+		internal static char First(this string arg)
+		{
+			return arg[0];
+		}
+
+		// String isn't IEnumerable<char> in the current Portable profile. 
+		internal static char Last(this string arg)
+		{
+			return arg[arg.Length - 1];
+		}
+
+		// String isn't IEnumerable<char> in the current Portable profile. 
+		internal static bool All(this string arg, Predicate<char> predicate)
+		{
+			foreach (char c in arg)
+			{
+				if (!predicate(c))
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		public static string EscapeIdentifier(
+            this string identifier,
+            bool isQueryContext = false)
+        {
+            var nullIndex = identifier.IndexOf('\0');
+            if (nullIndex >= 0)
+            {
+                identifier = identifier.Substring(0, nullIndex);
+            }
+
+            var needsEscaping = SyntaxFacts.GetKeywordKind(identifier) != SyntaxKind.None;
+
+            // Check if we need to escape this contextual keyword
+			needsEscaping = needsEscaping || (isQueryContext && SyntaxFacts.IsQueryContextualKeyword(SyntaxFacts.GetContextualKeywordKind(identifier)));
+
+            return needsEscaping ? "@" + identifier : identifier;
+        }
+
+		public static SyntaxToken ToIdentifierToken (
+			this string identifier,
+			bool isQueryContext = false)
+		{
+			var escaped = identifier.EscapeIdentifier (isQueryContext);
+
+			if (escaped.Length == 0 || escaped [0] != '@') {
+				return SyntaxFactory.Identifier (escaped);
+			}
+
+			var unescaped = identifier.StartsWith ("@", StringComparison.Ordinal)
+									  ? identifier.Substring (1)
+									  : identifier;
+
+			var token = SyntaxFactory.Identifier (
+				default(SyntaxTriviaList), SyntaxKind.None, "@" + unescaped, unescaped, default(SyntaxTriviaList));
+
+			if (!identifier.StartsWith ("@", StringComparison.Ordinal)) {
+				token = token.WithAdditionalAnnotations (Simplifier.Annotation);
+			}
+
+			return token;
+		}
+
+		public static IdentifierNameSyntax ToIdentifierName (this string identifier)
+		{
+			return SyntaxFactory.IdentifierName (identifier.ToIdentifierToken ());
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/StringPclExtensions.cs b/main/src/addins/CSharpBinding/Util/StringPclExtensions.cs
new file mode 100644
index 0000000000..f0ea6b01b1
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/StringPclExtensions.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class StringPclExtensions
+	{
+		public static bool Any(this string source, Func<char, bool> predicate)
+		{
+			foreach (char ch in source)
+			{
+				if (predicate(ch))
+					return true;
+			}
+			return false;
+		}
+
+		public static IEnumerable<char> Take(this string source, int count)
+		{
+			if (count > source.Length)
+				count = source.Length;
+			for (int i = 0; i < count; i++)
+			{
+				yield return source[i];
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SymbolEquivalenceComparer.cs b/main/src/addins/CSharpBinding/Util/SymbolEquivalenceComparer.cs
new file mode 100644
index 0000000000..81f4ad6d3e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SymbolEquivalenceComparer.cs
@@ -0,0 +1,49 @@
+//
+// SymbolEquivalenceComparer.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using System.Reflection;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SymbolEquivalenceComparer
+	{
+		public static readonly IEqualityComparer<ISymbol> Instance;
+		public static readonly IEqualityComparer<ISymbol> IgnoreAssembliesInstance;
+
+		static SymbolEquivalenceComparer ()
+		{
+			var typeInfo = Type.GetType("Microsoft.CodeAnalysis.Shared.Utilities.SymbolEquivalenceComparer" + ReflectionNamespaces.WorkspacesAsmName, true);
+			var instanceField = typeInfo.GetField ("Instance", BindingFlags.Static | BindingFlags.Public);
+			Instance = (IEqualityComparer<ISymbol> )instanceField.GetValue (null);
+
+			var ignoreAssembliesInstanceField = typeInfo.GetField ("IgnoreAssembliesInstance", BindingFlags.Static | BindingFlags.Public);
+			IgnoreAssembliesInstance = (IEqualityComparer<ISymbol> )ignoreAssembliesInstanceField.GetValue (null);
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/SymbolExtensions.cs b/main/src/addins/CSharpBinding/Util/SymbolExtensions.cs
new file mode 100644
index 0000000000..c6d108853b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SymbolExtensions.cs
@@ -0,0 +1,1382 @@
+//
+// SymbolExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SymbolExtensions
+	{
+		//		public static string GetDocumentationId (this ISymbol symbol)
+		//		{
+		//			if (symbol.GetType().FullName != "Microsoft.CodeAnalysis.CSharp.Symbol")
+		//				return null;
+		//			var mi = symbol.GetType().GetMethod("GetDocumentationCommentId", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+		//			if (mi == null)
+		//				return null;
+		//			return (string)mi.Invoke(symbol, null);
+		//		}
+		
+		/// <summary>
+		/// Gets the EditorBrowsableState of an entity.
+		/// </summary>
+		/// <returns>
+		/// The editor browsable state.
+		/// </returns>
+		/// <param name='symbol'>
+		/// Entity.
+		/// </param>
+		public static System.ComponentModel.EditorBrowsableState GetEditorBrowsableState(this ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException("symbol");
+			var browsableState = symbol.GetAttributes().FirstOrDefault(attr => attr.AttributeClass.Name == "EditorBrowsableAttribute" && attr.AttributeClass.ContainingNamespace.MetadataName == "System.ComponentModel");
+			if (browsableState != null && browsableState.ConstructorArguments.Length == 1) {
+				try {
+					return (System.ComponentModel.EditorBrowsableState)browsableState.ConstructorArguments [0].Value;
+				} catch {
+				}
+			}
+			return System.ComponentModel.EditorBrowsableState.Always;
+		}
+
+		/// <summary>
+		/// Determines if an entity should be shown in the code completion window. This is the same as:
+		/// <c>GetEditorBrowsableState (entity) != System.ComponentModel.EditorBrowsableState.Never</c>
+		/// </summary>
+		/// <returns>
+		/// <c>true</c> if the entity should be shown; otherwise, <c>false</c>.
+		/// </returns>
+		/// <param name='symbol'>
+		/// The entity.
+		/// </param>
+		public static bool IsEditorBrowsable(this ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException("symbol");
+			return GetEditorBrowsableState(symbol) != System.ComponentModel.EditorBrowsableState.Never;
+		}
+		public static ImmutableArray<IParameterSymbol> GetParameters(this ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException("symbol");
+			var method = symbol as IMethodSymbol;
+			if (method != null)
+				return method.Parameters;
+			var property = symbol as IPropertySymbol;
+			if (property != null)
+				return property.Parameters;
+			return ImmutableArray<IParameterSymbol>.Empty;
+		}
+
+		public static ImmutableArray<ITypeParameterSymbol> GetTypeParameters(this ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException("symbol");
+			var type = symbol as INamedTypeSymbol;
+			if (type != null)
+				return type.TypeParameters;
+			var method = symbol as IMethodSymbol;
+			if (method != null)
+				return method.TypeParameters;
+			return ImmutableArray<ITypeParameterSymbol>.Empty;
+		}
+
+		public static bool IsAnyConstructor(this ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException("symbol");
+			var method = symbol as IMethodSymbol;
+			return method != null && (method.MethodKind == MethodKind.Constructor || method.MethodKind == MethodKind.StaticConstructor);
+		}
+
+		public static bool IsConstructor(this ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException("symbol");
+			return symbol is IMethodSymbol && ((IMethodSymbol)symbol).MethodKind == MethodKind.Constructor;
+		}
+
+		public static bool IsStaticConstructor(this ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException("symbol");
+			return symbol is IMethodSymbol && ((IMethodSymbol)symbol).MethodKind == MethodKind.StaticConstructor;
+		}
+
+		public static bool IsDestructor(this ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException("symbol");
+			return symbol is IMethodSymbol && ((IMethodSymbol)symbol).MethodKind == MethodKind.Destructor;
+		}
+
+		public static bool IsDelegateType(this ISymbol symbol)
+		{
+			if (symbol == null)
+				throw new ArgumentNullException("symbol");
+			return symbol is ITypeSymbol && ((ITypeSymbol)symbol).TypeKind == TypeKind.Delegate;
+		}
+
+		public static ParameterSyntax GenerateParameterSyntax (this IParameterSymbol symbol)
+		{
+			var result = SyntaxFactory.Parameter (SyntaxFactory.Identifier (symbol.Name));
+			result = result.WithType (symbol.Type.GenerateTypeSyntax ());
+			if (symbol.IsThis)
+				result = result.WithModifiers(SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.ThisKeyword)));
+			if (symbol.IsParams)
+				result = result.WithModifiers(SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.ParamsKeyword)));
+			if (symbol.RefKind == RefKind.Out)
+				result = result.WithModifiers(SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.OutKeyword)));
+			if (symbol.RefKind == RefKind.Ref)
+				result = result.WithModifiers(SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.RefKeyword)));
+			return result;
+		}
+
+		public static bool IsType(this ISymbol symbol)
+		{
+			var typeSymbol = symbol as ITypeSymbol;
+			return typeSymbol != null && typeSymbol.IsType;
+		}
+
+		public static bool IsAccessorMethod(this ISymbol symbol)
+		{
+			var accessorSymbol = symbol as IMethodSymbol;
+			return accessorSymbol != null &&
+				(accessorSymbol.MethodKind == MethodKind.PropertySet || accessorSymbol.MethodKind == MethodKind.PropertyGet ||
+					accessorSymbol.MethodKind == MethodKind.EventRemove || accessorSymbol.MethodKind == MethodKind.EventAdd);
+		}
+
+		public static bool IsPublic(this ISymbol symbol)
+		{
+			return symbol.DeclaredAccessibility == Accessibility.Public;
+		}
+
+		public static bool IsErrorType(this ISymbol symbol)
+		{
+			return
+				symbol is ITypeSymbol &&
+				((ITypeSymbol)symbol).TypeKind == TypeKind.Error;
+		}
+
+
+		public static bool IsIndexer(this ISymbol symbol)
+		{
+			return (symbol as IPropertySymbol)?.IsIndexer == true;
+		}
+
+		public static bool IsUserDefinedOperator(this ISymbol symbol)
+		{
+			return (symbol as IMethodSymbol)?.MethodKind == MethodKind.UserDefinedOperator;
+		}
+
+		public static SymbolVisibility GetResultantVisibility(this ISymbol symbol)
+		{
+			// Start by assuming it's visible.
+			var visibility = SymbolVisibility.Public;
+
+			switch (symbol.Kind)
+			{
+			case SymbolKind.Alias:
+				// Aliases are uber private.  They're only visible in the same file that they
+				// were declared in.
+				return SymbolVisibility.Private;
+
+			case SymbolKind.Parameter:
+				// Parameters are only as visible as their containing symbol
+				return GetResultantVisibility(symbol.ContainingSymbol);
+
+			case SymbolKind.TypeParameter:
+				// Type Parameters are private.
+				return SymbolVisibility.Private;
+			}
+
+			while (symbol != null && symbol.Kind != SymbolKind.Namespace)
+			{
+				switch (symbol.DeclaredAccessibility)
+				{
+				// If we see anything private, then the symbol is private.
+				case Accessibility.NotApplicable:
+				case Accessibility.Private:
+					return SymbolVisibility.Private;
+
+					// If we see anything internal, then knock it down from public to
+					// internal.
+				case Accessibility.Internal:
+				case Accessibility.ProtectedAndInternal:
+					visibility = SymbolVisibility.Internal;
+					break;
+
+					// For anything else (Public, Protected, ProtectedOrInternal), the
+					// symbol stays at the level we've gotten so far.
+				}
+
+				symbol = symbol.ContainingSymbol;
+			}
+
+			return visibility;
+		}
+
+		public static bool IsAnonymousType(this ISymbol symbol)
+		{
+			return symbol is INamedTypeSymbol && ((INamedTypeSymbol)symbol).IsAnonymousType;
+		}
+
+//		public static SymbolVisibility GetResultantVisibility(this ISymbol symbol)
+//		{
+//			// Start by assuming it's visible.
+//			var visibility = SymbolVisibility.Public;
+//
+//			switch (symbol.Kind)
+//			{
+//			case SymbolKind.Alias:
+//				// Aliases are uber private.  They're only visible in the same file that they
+//				// were declared in.
+//				return SymbolVisibility.Private;
+//
+//			case SymbolKind.Parameter:
+//				// Parameters are only as visible as their containing symbol
+//				return GetResultantVisibility(symbol.ContainingSymbol);
+//
+//			case SymbolKind.TypeParameter:
+//				// Type Parameters are private.
+//				return SymbolVisibility.Private;
+//			}
+//
+//			while (symbol != null && symbol.Kind != SymbolKind.Namespace)
+//			{
+//				switch (symbol.DeclaredAccessibility)
+//				{
+//				// If we see anything private, then the symbol is private.
+//				case Accessibility.NotApplicable:
+//				case Accessibility.Private:
+//					return SymbolVisibility.Private;
+//
+//					// If we see anything internal, then knock it down from public to
+//					// internal.
+//				case Accessibility.Internal:
+//				case Accessibility.ProtectedAndInternal:
+//					visibility = SymbolVisibility.Internal;
+//					break;
+//
+//					// For anything else (Public, Protected, ProtectedOrInternal), the
+//					// symbol stays at the level we've gotten so far.
+//				}
+//
+//				symbol = symbol.ContainingSymbol;
+//			}
+//
+//			return visibility;
+//		}
+
+		public static ISymbol OverriddenMember(this ISymbol symbol)
+		{
+			switch (symbol.Kind)
+			{
+			case SymbolKind.Event:
+				return ((IEventSymbol)symbol).OverriddenEvent;
+
+			case SymbolKind.Method:
+				return ((IMethodSymbol)symbol).OverriddenMethod;
+
+			case SymbolKind.Property:
+				return ((IPropertySymbol)symbol).OverriddenProperty;
+			
+			case SymbolKind.NamedType:
+				return ((INamedTypeSymbol)symbol).BaseType;
+			}
+
+			return null;
+		}
+
+		public static ImmutableArray<ISymbol> ExplicitInterfaceImplementations(this ISymbol symbol)
+		{
+			return symbol.TypeSwitch(
+				(IEventSymbol @event) => @event.ExplicitInterfaceImplementations.As<ISymbol>(),
+				(IMethodSymbol method) => method.ExplicitInterfaceImplementations.As<ISymbol>(),
+				(IPropertySymbol property) => property.ExplicitInterfaceImplementations.As<ISymbol>(),
+				_ => ImmutableArray.Create<ISymbol>());
+		}
+
+		public static bool IsOverridable(this ISymbol symbol)
+		{
+			return
+				symbol != null &&
+				symbol.ContainingType != null &&
+				symbol.ContainingType.TypeKind == TypeKind.Class &&
+				(symbol.IsVirtual || symbol.IsAbstract || symbol.IsOverride) &&
+				!symbol.IsSealed;
+		}
+
+		public static bool IsImplementable(this ISymbol symbol)
+		{
+			if (symbol != null &&
+				symbol.ContainingType != null &&
+				symbol.ContainingType.TypeKind == TypeKind.Interface)
+			{
+				if (symbol.Kind == SymbolKind.Event)
+				{
+					return true;
+				}
+
+				if (symbol.Kind == SymbolKind.Property)
+				{
+					return true;
+				}
+
+				if (symbol.Kind == SymbolKind.Method && ((IMethodSymbol)symbol).MethodKind == MethodKind.Ordinary)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static INamedTypeSymbol GetContainingTypeOrThis(this ISymbol symbol)
+		{
+			if (symbol is INamedTypeSymbol)
+			{
+				return (INamedTypeSymbol)symbol;
+			}
+
+			return symbol.ContainingType;
+		}
+
+		public static bool IsPointerType(this ISymbol symbol)
+		{
+			return symbol is IPointerTypeSymbol;
+		}
+
+		public static bool IsModuleType(this ISymbol symbol)
+		{
+			return (symbol as ITypeSymbol)?.IsModuleType() == true;
+		}
+
+		public static bool IsInterfaceType(this ISymbol symbol)
+		{
+			return (symbol as ITypeSymbol)?.IsInterfaceType() == true;
+		}
+
+		public static bool IsArrayType(this ISymbol symbol)
+		{
+			return symbol?.Kind == SymbolKind.ArrayType;
+		}
+
+		public static bool IsAnonymousFunction(this ISymbol symbol)
+		{
+			return (symbol as IMethodSymbol)?.MethodKind == MethodKind.AnonymousFunction;
+		}
+
+		public static bool IsKind(this ISymbol symbol, SymbolKind kind)
+		{
+			return symbol.MatchesKind(kind);
+		}
+
+		public static bool MatchesKind(this ISymbol symbol, SymbolKind kind)
+		{
+			return symbol?.Kind == kind;
+		}
+
+		public static bool MatchesKind(this ISymbol symbol, SymbolKind kind1, SymbolKind kind2)
+		{
+			return symbol != null
+				&& (symbol.Kind == kind1 || symbol.Kind == kind2);
+		}
+
+		public static bool MatchesKind(this ISymbol symbol, SymbolKind kind1, SymbolKind kind2, SymbolKind kind3)
+		{
+			return symbol != null
+				&& (symbol.Kind == kind1 || symbol.Kind == kind2 || symbol.Kind == kind3);
+		}
+
+		public static bool MatchesKind(this ISymbol symbol, params SymbolKind[] kinds)
+		{
+			return symbol != null
+				&& kinds.Contains(symbol.Kind);
+		}
+
+		public static bool IsReducedExtension(this ISymbol symbol)
+		{
+			return symbol is IMethodSymbol && ((IMethodSymbol)symbol).MethodKind == MethodKind.ReducedExtension;
+		}
+
+		public static bool IsExtensionMethod(this ISymbol symbol)
+		{
+			return symbol.Kind == SymbolKind.Method && ((IMethodSymbol)symbol).IsExtensionMethod;
+		}
+
+		public static bool IsModuleMember(this ISymbol symbol)
+		{
+			return symbol != null && symbol.ContainingSymbol is INamedTypeSymbol && symbol.ContainingType.TypeKind == TypeKind.Module;
+		}
+
+
+		public static bool IsConversion(this ISymbol symbol)
+		{
+			return (symbol as IMethodSymbol)?.MethodKind == MethodKind.Conversion;
+		}
+
+		public static bool IsOrdinaryMethod(this ISymbol symbol)
+		{
+			return (symbol as IMethodSymbol)?.MethodKind == MethodKind.Ordinary;
+		}
+
+
+		public static bool IsNormalAnonymousType(this ISymbol symbol)
+		{
+			return symbol.IsAnonymousType() && !symbol.IsDelegateType();
+		}
+
+		public static bool IsAnonymousDelegateType(this ISymbol symbol)
+		{
+			return symbol.IsAnonymousType() && symbol.IsDelegateType();
+		}
+
+		public static bool IsAnonymousTypeProperty(this ISymbol symbol)
+		{
+			return symbol is IPropertySymbol && symbol.ContainingType.IsNormalAnonymousType();
+		}
+
+
+		public static bool IsWriteableFieldOrProperty(this ISymbol symbol)
+		{
+			var fieldSymbol = symbol as IFieldSymbol;
+			if (fieldSymbol != null)
+			{
+				return !fieldSymbol.IsReadOnly
+					&& !fieldSymbol.IsConst;
+			}
+
+			var propertySymbol = symbol as IPropertySymbol;
+			if (propertySymbol != null)
+			{
+				return !propertySymbol.IsReadOnly;
+			}
+
+			return false;
+		}
+
+		public static ITypeSymbol GetMemberType(this ISymbol symbol)
+		{
+			switch (symbol.Kind)
+			{
+			case SymbolKind.Field:
+				return ((IFieldSymbol)symbol).Type;
+			case SymbolKind.Property:
+				return ((IPropertySymbol)symbol).Type;
+			case SymbolKind.Method:
+				return ((IMethodSymbol)symbol).ReturnType;
+			case SymbolKind.Event:
+				return ((IEventSymbol)symbol).Type;
+			}
+
+			return null;
+		}
+
+		public static int GetArity(this ISymbol symbol)
+		{
+			switch (symbol.Kind)
+			{
+			case SymbolKind.NamedType:
+				return ((INamedTypeSymbol)symbol).Arity;
+			case SymbolKind.Method:
+				return ((IMethodSymbol)symbol).Arity;
+			default:
+				return 0;
+			}
+		}
+
+		public static ISymbol GetOriginalUnreducedDefinition(this ISymbol symbol)
+		{
+			if (symbol.IsReducedExtension())
+			{
+				// note: ReducedFrom is only a method definition and includes no type arguments.
+				symbol = ((IMethodSymbol)symbol).GetConstructedReducedFrom();
+			}
+
+			if (symbol.IsFunctionValue())
+			{
+				var method = symbol.ContainingSymbol as IMethodSymbol;
+				if (method != null)
+				{
+					symbol = method;
+
+					if (method.AssociatedSymbol != null)
+					{
+						symbol = method.AssociatedSymbol;
+					}
+				}
+			}
+
+			if (symbol.IsNormalAnonymousType() || symbol.IsAnonymousTypeProperty())
+			{
+				return symbol;
+			}
+
+			var parameter = symbol as IParameterSymbol;
+			if (parameter != null)
+			{
+				var method = parameter.ContainingSymbol as IMethodSymbol;
+				if (method?.IsReducedExtension() == true)
+				{
+					symbol = method.GetConstructedReducedFrom().Parameters[parameter.Ordinal + 1];
+				}
+			}
+
+			return symbol?.OriginalDefinition;
+		}
+
+		public static bool IsFunctionValue(this ISymbol symbol)
+		{
+			return symbol is ILocalSymbol && ((ILocalSymbol)symbol).IsFunctionValue;
+		}
+
+		public static bool IsThisParameter(this ISymbol symbol)
+		{
+			return symbol != null && symbol.Kind == SymbolKind.Parameter && ((IParameterSymbol)symbol).IsThis;
+		}
+
+		public static ISymbol ConvertThisParameterToType(this ISymbol symbol)
+		{
+			if (symbol.IsThisParameter())
+			{
+				return ((IParameterSymbol)symbol).Type;
+			}
+
+			return symbol;
+		}
+
+		public static bool IsParams(this ISymbol symbol)
+		{
+			var parameters = symbol.GetParameters();
+			return parameters.Length > 0 && parameters[parameters.Length - 1].IsParams;
+		}
+
+		public static ImmutableArray<ITypeSymbol> GetTypeArguments(this ISymbol symbol)
+		{
+			return symbol.TypeSwitch(
+				(IMethodSymbol m) => m.TypeArguments,
+				(INamedTypeSymbol nt) => nt.TypeArguments,
+				_ => ImmutableArray.Create<ITypeSymbol>());
+		}
+
+		public static ImmutableArray<ITypeSymbol> GetAllTypeArguments(this ISymbol symbol)
+		{
+			var results = new List<ITypeSymbol>(symbol.GetTypeArguments());
+
+			var containingType = symbol.ContainingType;
+			while (containingType != null)
+			{
+				results.AddRange(containingType.GetTypeArguments());
+				containingType = containingType.ContainingType;
+			}
+
+			return ImmutableArray.CreateRange(results);
+		}
+
+		public static bool IsAttribute(this ISymbol symbol)
+		{
+			return (symbol as ITypeSymbol)?.IsAttribute() == true;
+		}
+
+		/// <summary>
+		/// Returns true if this symbol contains anything unsafe within it.  for example
+		/// List&lt;int*[]&gt; is unsafe, as it "int* Foo { get; }"
+		/// </summary>
+		public static bool IsUnsafe(this ISymbol member)
+		{
+			// TODO(cyrusn): Defer to compiler code to handle this once it can.
+			return member?.Accept(new IsUnsafeVisitor()) == true;
+		}
+
+		private class IsUnsafeVisitor : SymbolVisitor<bool>
+		{
+			private readonly HashSet<ISymbol> _visited = new HashSet<ISymbol>();
+
+			public IsUnsafeVisitor()
+			{
+			}
+
+			public override bool DefaultVisit(ISymbol node)
+			{
+				throw new NotImplementedException();
+			}
+
+			public override bool VisitArrayType(IArrayTypeSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return symbol.ElementType.Accept(this);
+			}
+
+			public override bool VisitDynamicType(IDynamicTypeSymbol symbol)
+			{
+				// The dynamic type is never unsafe (well....you know what I mean
+				return false;
+			}
+
+			public override bool VisitField(IFieldSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return symbol.Type.Accept(this);
+			}
+
+			public override bool VisitNamedType(INamedTypeSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return symbol.GetAllTypeArguments().Any(ts => ts.Accept(this));
+			}
+
+			public override bool VisitPointerType(IPointerTypeSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return true;
+			}
+
+			public override bool VisitProperty(IPropertySymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return
+					symbol.Type.Accept(this) ||
+					symbol.Parameters.Any(p => p.Accept(this));
+			}
+
+			public override bool VisitTypeParameter(ITypeParameterSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return symbol.ConstraintTypes.Any(ts => ts.Accept(this));
+			}
+
+			public override bool VisitMethod(IMethodSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return
+					symbol.ReturnType.Accept(this) ||
+					symbol.Parameters.Any(p => p.Accept(this)) ||
+					symbol.TypeParameters.Any(tp => tp.Accept(this));
+			}
+
+			public override bool VisitParameter(IParameterSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return symbol.Type.Accept(this);
+			}
+
+			public override bool VisitEvent(IEventSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return symbol.Type.Accept(this);
+			}
+
+			public override bool VisitAlias(IAliasSymbol symbol)
+			{
+				if (!_visited.Add(symbol))
+				{
+					return false;
+				}
+
+				return symbol.Target.Accept(this);
+			}
+		}
+
+		public static ITypeSymbol ConvertToType(
+			this ISymbol symbol,
+			Compilation compilation,
+			bool extensionUsedAsInstance = false)
+		{
+			var type = symbol as ITypeSymbol;
+			if (type != null)
+			{
+				return type;
+			}
+
+			var method = (IMethodSymbol)symbol;
+			if (method != null && !method.Parameters.Any(p => p.RefKind != RefKind.None))
+			{
+				// Convert the symbol to Func<...> or Action<...>
+				if (method.ReturnsVoid)
+				{
+					var count = extensionUsedAsInstance ? method.Parameters.Length - 1 : method.Parameters.Length;
+					var skip = extensionUsedAsInstance ? 1 : 0;
+					count = Math.Max(0, count);
+					if (count == 0)
+					{
+						// Action
+						return compilation.ActionType();
+					}
+					else
+					{
+						// Action<TArg1, ..., TArgN>
+						var actionName = "System.Action`" + count;
+						var actionType = compilation.GetTypeByMetadataName(actionName);
+
+						if (actionType != null)
+						{
+							var types = method.Parameters
+								.Skip(skip)
+								.Select(p =>
+									(object)p.Type == null ?
+									compilation.GetSpecialType(SpecialType.System_Object) :
+									p.Type)
+								.ToArray();
+							return actionType.Construct(types);
+						}
+					}
+				}
+				else
+				{
+					// Func<TArg1,...,TArgN,TReturn>
+					//
+					// +1 for the return type.
+					var count = extensionUsedAsInstance ? method.Parameters.Length - 1 : method.Parameters.Length;
+					var skip = extensionUsedAsInstance ? 1 : 0;
+					var functionName = "System.Func`" + (count + 1);
+					var functionType = compilation.GetTypeByMetadataName(functionName);
+
+					if (functionType != null)
+					{
+						var types = method.Parameters
+							.Skip(skip)
+							.Select(p => p.Type)
+							.Concat(method.ReturnType)
+							.Select(t =>
+								(object)t == null ?
+								compilation.GetSpecialType(SpecialType.System_Object) :
+								t)
+							.ToArray();
+						return functionType.Construct(types);
+					}
+				}
+			}
+
+			// Otherwise, just default to object.
+			return compilation.ObjectType;
+		}
+
+		public static bool IsDeprecated(this ISymbol symbol)
+		{
+			// TODO(cyrusn): Implement this
+			return false;
+		}
+
+		public static bool IsStaticType(this ISymbol symbol)
+		{
+			return symbol != null && symbol.Kind == SymbolKind.NamedType && symbol.IsStatic;
+		}
+
+		public static bool IsNamespace(this ISymbol symbol)
+		{
+			return symbol?.Kind == SymbolKind.Namespace;
+		}
+
+//		public static bool IsOrContainsAccessibleAttribute(this ISymbol symbol, ISymbol withinType, IAssemblySymbol withinAssembly)
+//		{
+//			var alias = symbol as IAliasSymbol;
+//			if (alias != null)
+//			{
+//				symbol = alias.Target;
+//			}
+//
+//			var namespaceOrType = symbol as INamespaceOrTypeSymbol;
+//			if (namespaceOrType == null)
+//			{
+//				return false;
+//			}
+//
+//			if (namespaceOrType.IsAttribute() && namespaceOrType.IsAccessibleWithin(withinType ?? withinAssembly))
+//			{
+//				return true;
+//			}
+//
+//			return namespaceOrType.GetMembers().Any(nt => nt.IsOrContainsAccessibleAttribute(withinType, withinAssembly));
+//		}
+
+		public static IEnumerable<IPropertySymbol> GetValidAnonymousTypeProperties(this ISymbol symbol)
+		{
+			// Contract.ThrowIfFalse(symbol.IsNormalAnonymousType());
+			return ((INamedTypeSymbol)symbol).GetMembers().OfType<IPropertySymbol>().Where(p => p.CanBeReferencedByName);
+		}
+
+		public static Accessibility ComputeResultantAccessibility(this ISymbol symbol, ITypeSymbol finalDestination)
+		{
+			if (symbol == null)
+			{
+				return Accessibility.Private;
+			}
+
+			switch (symbol.DeclaredAccessibility)
+			{
+			default:
+				return symbol.DeclaredAccessibility;
+			case Accessibility.ProtectedAndInternal:
+				return symbol.ContainingAssembly.GivesAccessTo(finalDestination.ContainingAssembly)
+					? Accessibility.ProtectedAndInternal
+						: Accessibility.Internal;
+			case Accessibility.ProtectedOrInternal:
+				return symbol.ContainingAssembly.GivesAccessTo(finalDestination.ContainingAssembly)
+					? Accessibility.ProtectedOrInternal
+						: Accessibility.Protected;
+			}
+		}
+
+		/// <returns>
+		/// Returns true if symbol is a local variable and its declaring syntax node is 
+		/// after the current position, false otherwise (including for non-local symbols)
+		/// </returns>
+		public static bool IsInaccessibleLocal(this ISymbol symbol, int position)
+		{
+			if (symbol.Kind != SymbolKind.Local)
+			{
+				return false;
+			}
+
+			// Implicitly declared locals (with Option Explicit Off in VB) are scoped to the entire
+			// method and should always be considered accessible from within the same method.
+			if (symbol.IsImplicitlyDeclared)
+			{
+				return false;
+			}
+
+			var declarationSyntax = symbol.DeclaringSyntaxReferences.Select(r => r.GetSyntax()).FirstOrDefault();
+			return declarationSyntax != null && position < declarationSyntax.SpanStart;
+		}
+
+//		/// <summary>
+//		/// Checks a given symbol for browsability based on its declaration location, attributes 
+//		/// explicitly limiting browsability, and whether showing of advanced members is enabled. 
+//		/// The optional attribute constructor parameters may be used to specify the symbols of the
+//		/// constructors of the various browsability limiting attributes because finding these 
+//		/// repeatedly over a large list of symbols can be slow. If providing these constructor 
+//		/// symbols, they should be in the format provided by 
+//		/// EditorBrowsableHelpers.GetSpecial*AttributeConstructor(). If these are not provided,
+//		/// they will be found in the compilation.
+//		/// </summary>
+//		public static bool IsEditorBrowsable(
+//			this ISymbol symbol,
+//			bool hideAdvancedMembers,
+//			Compilation compilation,
+//			IMethodSymbol editorBrowsableAttributeConstructor = null,
+//			List<IMethodSymbol> typeLibTypeAttributeConstructors = null,
+//			List<IMethodSymbol> typeLibFuncAttributeConstructors = null,
+//			List<IMethodSymbol> typeLibVarAttributeConstructors = null,
+//			INamedTypeSymbol hideModuleNameAttribute = null)
+//		{
+//			// Namespaces can't have attributes, so just return true here.  This also saves us a 
+//			// costly check if this namespace has any locations in source (since a merged namespace
+//			// needs to go collect all the locations).
+//			if (symbol.Kind == SymbolKind.Namespace)
+//			{
+//				return true;
+//			}
+//
+//			// check for IsImplicitlyDeclared so we don't spend time examining VB's embedded types.
+//			// This saves a few percent in typing scenarios.  An implicitly declared symbol can't
+//			// have attributes, so it can't be hidden by them.
+//			if (symbol.IsImplicitlyDeclared)
+//			{
+//				return true;
+//			}
+//
+//			// Ignore browsability limiting attributes if the symbol is declared in source.
+//			// Check all locations since some of VB's embedded My symbols are declared in 
+//			// both source and the MyTemplateLocation.
+//			if (symbol.Locations.All(loc => loc.IsInSource))
+//			{
+//				// The HideModuleNameAttribute still applies to Modules defined in source
+//				return !IsBrowsingProhibitedByHideModuleNameAttribute(symbol, compilation, hideModuleNameAttribute);
+//			}
+//
+//			return !IsBrowsingProhibited(
+//				symbol,
+//				hideAdvancedMembers,
+//				compilation,
+//				editorBrowsableAttributeConstructor,
+//				typeLibTypeAttributeConstructors,
+//				typeLibFuncAttributeConstructors,
+//				typeLibVarAttributeConstructors,
+//				hideModuleNameAttribute);
+//		}
+//
+//		private static bool IsBrowsingProhibited(
+//			ISymbol symbol,
+//			bool hideAdvancedMembers,
+//			Compilation compilation,
+//			IMethodSymbol editorBrowsableAttributeConstructor,
+//			List<IMethodSymbol> typeLibTypeAttributeConstructors,
+//			List<IMethodSymbol> typeLibFuncAttributeConstructors,
+//			List<IMethodSymbol> typeLibVarAttributeConstructors,
+//			INamedTypeSymbol hideModuleNameAttribute)
+//		{
+//			var attributes = symbol.GetAttributes();
+//			if (attributes.Length == 0)
+//			{
+//				return false;
+//			}
+//
+//			return IsBrowsingProhibitedByEditorBrowsableAttribute(symbol, attributes, hideAdvancedMembers, compilation, editorBrowsableAttributeConstructor)
+//				|| IsBrowsingProhibitedByTypeLibTypeAttribute(symbol, attributes, compilation, typeLibTypeAttributeConstructors)
+//				|| IsBrowsingProhibitedByTypeLibFuncAttribute(symbol, attributes, compilation, typeLibFuncAttributeConstructors)
+//				|| IsBrowsingProhibitedByTypeLibVarAttribute(symbol, attributes, compilation, typeLibVarAttributeConstructors)
+//				|| IsBrowsingProhibitedByHideModuleNameAttribute(symbol, compilation, hideModuleNameAttribute, attributes);
+//		}
+//
+//		private static bool IsBrowsingProhibitedByHideModuleNameAttribute(
+//			ISymbol symbol, Compilation compilation, INamedTypeSymbol hideModuleNameAttribute, ImmutableArray<AttributeData> attributes = default(ImmutableArray<AttributeData>))
+//		{
+//			if (!symbol.IsModuleType())
+//			{
+//				return false;
+//			}
+//
+//			attributes = attributes.IsDefault ? symbol.GetAttributes() : attributes;
+//			hideModuleNameAttribute = hideModuleNameAttribute ?? compilation.HideModuleNameAttribute();
+//			foreach (var attribute in attributes)
+//			{
+//				if (attribute.AttributeClass == hideModuleNameAttribute)
+//				{
+//					return true;
+//				}
+//			}
+//
+//			return false;
+//		}
+//
+//		private static bool IsBrowsingProhibitedByEditorBrowsableAttribute(
+//			ISymbol symbol, ImmutableArray<AttributeData> attributes, bool hideAdvancedMembers, Compilation compilation, IMethodSymbol constructor)
+//		{
+//			constructor = constructor ?? EditorBrowsableHelpers.GetSpecialEditorBrowsableAttributeConstructor(compilation);
+//			if (constructor == null)
+//			{
+//				return false;
+//			}
+//
+//			foreach (var attribute in attributes)
+//			{
+//				if (attribute.AttributeConstructor == constructor &&
+//					attribute.ConstructorArguments.Length == 1 &&
+//					attribute.ConstructorArguments.First().Value is int)
+//				{
+//					var state = (EditorBrowsableState)attribute.ConstructorArguments.First().Value;
+//
+//					if (EditorBrowsableState.Never == state ||
+//						(hideAdvancedMembers && EditorBrowsableState.Advanced == state))
+//					{
+//						return true;
+//					}
+//				}
+//			}
+//
+//			return false;
+//		}
+//
+//		private static bool IsBrowsingProhibitedByTypeLibTypeAttribute(
+//			ISymbol symbol, ImmutableArray<AttributeData> attributes, Compilation compilation, List<IMethodSymbol> constructors)
+//		{
+//			return IsBrowsingProhibitedByTypeLibAttributeWorker(
+//				symbol,
+//				attributes,
+//				constructors ?? EditorBrowsableHelpers.GetSpecialTypeLibTypeAttributeConstructors(compilation),
+//				TypeLibTypeFlagsFHidden);
+//		}
+//
+//		private static bool IsBrowsingProhibitedByTypeLibFuncAttribute(
+//			ISymbol symbol, ImmutableArray<AttributeData> attributes, Compilation compilation, List<IMethodSymbol> constructors)
+//		{
+//			return IsBrowsingProhibitedByTypeLibAttributeWorker(
+//				symbol,
+//				attributes,
+//				constructors ?? EditorBrowsableHelpers.GetSpecialTypeLibFuncAttributeConstructors(compilation),
+//				TypeLibFuncFlagsFHidden);
+//		}
+//
+//		private static bool IsBrowsingProhibitedByTypeLibVarAttribute(
+//			ISymbol symbol, ImmutableArray<AttributeData> attributes, Compilation compilation, List<IMethodSymbol> constructors)
+//		{
+//			return IsBrowsingProhibitedByTypeLibAttributeWorker(
+//				symbol,
+//				attributes,
+//				constructors ?? EditorBrowsableHelpers.GetSpecialTypeLibVarAttributeConstructors(compilation),
+//				TypeLibVarFlagsFHidden);
+//		}
+
+		private const int TypeLibTypeFlagsFHidden = 0x0010;
+		private const int TypeLibFuncFlagsFHidden = 0x0040;
+		private const int TypeLibVarFlagsFHidden = 0x0040;
+
+		private static bool IsBrowsingProhibitedByTypeLibAttributeWorker(
+			ISymbol symbol, ImmutableArray<AttributeData> attributes, List<IMethodSymbol> attributeConstructors, int hiddenFlag)
+		{
+			foreach (var attribute in attributes)
+			{
+				if (attribute.ConstructorArguments.Length == 1)
+				{
+					foreach (var constructor in attributeConstructors)
+					{
+						if (attribute.AttributeConstructor == constructor)
+						{
+							var actualFlags = 0;
+
+							// Check for both constructor signatures. The constructor that takes a TypeLib*Flags reports an int argument.
+							var argumentValue = attribute.ConstructorArguments.First().Value;
+
+							if (argumentValue is int)
+							{
+								actualFlags = (int)argumentValue;
+							}
+							else if (argumentValue is short)
+							{
+								actualFlags = (short)argumentValue;
+							}
+							else
+							{
+								continue;
+							}
+
+							if ((actualFlags & hiddenFlag) == hiddenFlag)
+							{
+								return true;
+							}
+						}
+					}
+				}
+			}
+
+			return false;
+		}
+
+//		public static bool IsAccessor(this ISymbol symbol)
+//		{
+//			return symbol.IsPropertyAccessor() || symbol.IsEventAccessor();
+//		}
+//
+//		public static bool IsPropertyAccessor(this ISymbol symbol)
+//		{
+//			return (symbol as IMethodSymbol)?.MethodKind.IsPropertyAccessor() == true;
+//		}
+
+		public static bool IsEventAccessor(this ISymbol symbol)
+		{
+			var method = symbol as IMethodSymbol;
+			return method != null &&
+				(method.MethodKind == MethodKind.EventAdd ||
+					method.MethodKind == MethodKind.EventRaise ||
+					method.MethodKind == MethodKind.EventRemove);
+		}
+
+		public static ITypeSymbol GetSymbolType(this ISymbol symbol)
+		{
+			var localSymbol = symbol as ILocalSymbol;
+			if (localSymbol != null)
+			{
+				return localSymbol.Type;
+			}
+
+			var fieldSymbol = symbol as IFieldSymbol;
+			if (fieldSymbol != null)
+			{
+				return fieldSymbol.Type;
+			}
+
+			var propertySymbol = symbol as IPropertySymbol;
+			if (propertySymbol != null)
+			{
+				return propertySymbol.Type;
+			}
+
+			var parameterSymbol = symbol as IParameterSymbol;
+			if (parameterSymbol != null)
+			{
+				return parameterSymbol.Type;
+			}
+
+			var aliasSymbol = symbol as IAliasSymbol;
+			if (aliasSymbol != null)
+			{
+				return aliasSymbol.Target as ITypeSymbol;
+			}
+
+			return symbol as ITypeSymbol;
+		}
+
+		/// <summary>
+		/// If the <paramref name="symbol"/> is a method symbol, returns True if the method's return type is "awaitable".
+		/// If the <paramref name="symbol"/> is a type symbol, returns True if that type is "awaitable".
+		/// An "awaitable" is any type that exposes a GetAwaiter method which returns a valid "awaiter". This GetAwaiter method may be an instance method or an extension method.
+		/// </summary>
+		public static bool IsAwaitable(this ISymbol symbol, SemanticModel semanticModel, int position)
+		{
+			IMethodSymbol methodSymbol = symbol as IMethodSymbol;
+			ITypeSymbol typeSymbol = null;
+
+			if (methodSymbol == null)
+			{
+				typeSymbol = symbol as ITypeSymbol;
+				if (typeSymbol == null)
+				{
+					return false;
+				}
+			}
+			else
+			{
+				if (methodSymbol.ReturnType == null)
+				{
+					return false;
+				}
+
+				// dynamic
+				if (methodSymbol.ReturnType.TypeKind == TypeKind.Dynamic &&
+					methodSymbol.MethodKind != MethodKind.BuiltinOperator)
+				{
+					return true;
+				}
+			}
+
+			// otherwise: needs valid GetAwaiter
+			var potentialGetAwaiters = semanticModel.LookupSymbols(position,
+				container: typeSymbol ?? methodSymbol.ReturnType.OriginalDefinition,
+				name: WellKnownMemberNames.GetAwaiter,
+				includeReducedExtensionMethods: true);
+			var getAwaiters = potentialGetAwaiters.OfType<IMethodSymbol>().Where(x => !x.Parameters.Any());
+			return getAwaiters.Any(VerifyGetAwaiter);
+		}
+
+		private static bool VerifyGetAwaiter(IMethodSymbol getAwaiter)
+		{
+			var returnType = getAwaiter.ReturnType;
+			if (returnType == null)
+			{
+				return false;
+			}
+
+			// bool IsCompleted { get }
+			if (!returnType.GetMembers().OfType<IPropertySymbol>().Any(p => p.Name == WellKnownMemberNames.IsCompleted && p.Type.SpecialType == SpecialType.System_Boolean && p.GetMethod != null))
+			{
+				return false;
+			}
+
+			var methods = returnType.GetMembers().OfType<IMethodSymbol>();
+
+			// NOTE: (vladres) The current version of C# Spec, §7.7.7.3 'Runtime evaluation of await expressions', requires that
+			// NOTE: the interface method INotifyCompletion.OnCompleted or ICriticalNotifyCompletion.UnsafeOnCompleted is invoked
+			// NOTE: (rather than any OnCompleted method conforming to a certain pattern).
+			// NOTE: Should this code be updated to match the spec?
+
+			// void OnCompleted(Action) 
+			// Actions are delegates, so we'll just check for delegates.
+			if (!methods.Any(x => x.Name == WellKnownMemberNames.OnCompleted && x.ReturnsVoid && x.Parameters.Length == 1 && x.Parameters.First().Type.TypeKind == TypeKind.Delegate))
+			{
+				return false;
+			}
+
+			// void GetResult() || T GetResult()
+			return methods.Any(m => m.Name == WellKnownMemberNames.GetResult && !m.Parameters.Any());
+		}
+
+		public static IList<SymbolDisplayPart> ToAwaitableParts(this ISymbol symbol, string awaitKeyword, string initializedVariableName, SemanticModel semanticModel, int position)
+		{
+			var spacePart = new SymbolDisplayPart(SymbolDisplayPartKind.Space, null, " ");
+			var parts = new List<SymbolDisplayPart>();
+
+			parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Text, null, "\r\nUsage:\r\n  "));
+
+			var returnType = symbol.InferAwaitableReturnType(semanticModel, position);
+			returnType = returnType != null && returnType.SpecialType != SpecialType.System_Void ? returnType : null;
+			if (returnType != null)
+			{
+				if (semanticModel.Language == "C#")
+				{
+					parts.AddRange(returnType.ToMinimalDisplayParts(semanticModel, position));
+					parts.Add(spacePart);
+					parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.LocalName, null, initializedVariableName));
+				}
+				else
+				{
+					parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Keyword, null, "Dim"));
+					parts.Add(spacePart);
+					parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.LocalName, null, initializedVariableName));
+					parts.Add(spacePart);
+					parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Keyword, null, "as"));
+					parts.Add(spacePart);
+					parts.AddRange(returnType.ToMinimalDisplayParts(semanticModel, position));
+				}
+
+				parts.Add(spacePart);
+				parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Punctuation, null, "="));
+				parts.Add(spacePart);
+			}
+
+			parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Keyword, null, awaitKeyword));
+			parts.Add(spacePart);
+			parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.MethodName, symbol, symbol.Name));
+			parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Punctuation, null, "("));
+			parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Punctuation, null, symbol.GetParameters().Any() ? "..." : ""));
+			parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Punctuation, null, ")"));
+			parts.Add(new SymbolDisplayPart(SymbolDisplayPartKind.Punctuation, null, semanticModel.Language == "C#" ? ";" : ""));
+
+			return parts;
+		}
+
+		public static ITypeSymbol InferAwaitableReturnType(this ISymbol symbol, SemanticModel semanticModel, int position)
+		{
+			var methodSymbol = symbol as IMethodSymbol;
+			if (methodSymbol == null)
+			{
+				return null;
+			}
+
+			var returnType = methodSymbol.ReturnType;
+			if (returnType == null)
+			{
+				return null;
+			}
+
+			var potentialGetAwaiters = semanticModel.LookupSymbols(position, container: returnType, name: WellKnownMemberNames.GetAwaiter, includeReducedExtensionMethods: true);
+			var getAwaiters = potentialGetAwaiters.OfType<IMethodSymbol>().Where(x => !x.Parameters.Any());
+			if (!getAwaiters.Any())
+			{
+				return null;
+			}
+
+			var getResults = getAwaiters.SelectMany(g => semanticModel.LookupSymbols(position, container: g.ReturnType, name: WellKnownMemberNames.GetResult));
+
+			var getResult = getResults.OfType<IMethodSymbol>().FirstOrDefault(g => !g.IsStatic);
+			if (getResult == null)
+			{
+				return null;
+			}
+
+			return getResult.ReturnType;
+		}
+
+		/// <summary>
+		/// First, remove symbols from the set if they are overridden by other symbols in the set.
+		/// If a symbol is overridden only by symbols outside of the set, then it is not removed. 
+		/// This is useful for filtering out symbols that cannot be accessed in a given context due
+		/// to the existence of overriding members. Second, remove remaining symbols that are
+		/// unsupported (e.g. pointer types in VB) or not editor browsable based on the EditorBrowsable
+		/// attribute.
+		/// </summary>
+//		public static IEnumerable<T> FilterToVisibleAndBrowsableSymbols<T>(this IEnumerable<T> symbols, bool hideAdvancedMembers, Compilation compilation) where T : ISymbol
+//		{
+//			symbols = symbols.RemoveOverriddenSymbolsWithinSet();
+//
+//			// Since all symbols are from the same compilation, find the required attribute
+//			// constructors once and reuse.
+//
+//			var editorBrowsableAttributeConstructor = EditorBrowsableHelpers.GetSpecialEditorBrowsableAttributeConstructor(compilation);
+//			var typeLibTypeAttributeConstructors = EditorBrowsableHelpers.GetSpecialTypeLibTypeAttributeConstructors(compilation);
+//			var typeLibFuncAttributeConstructors = EditorBrowsableHelpers.GetSpecialTypeLibFuncAttributeConstructors(compilation);
+//			var typeLibVarAttributeConstructors = EditorBrowsableHelpers.GetSpecialTypeLibVarAttributeConstructors(compilation);
+//			var hideModuleNameAttribute = compilation.HideModuleNameAttribute();
+//
+//			// PERF: HasUnsupportedMetadata may require recreating the syntax tree to get the base class, so first
+//			// check to see if we're referencing a symbol defined in source.
+//			Func<Location, bool> isSymbolDefinedInSource = l => l.IsInSource;
+//			return symbols.Where(s =>
+//				(s.Locations.Any(isSymbolDefinedInSource) || !s.HasUnsupportedMetadata) &&
+//				!s.IsDestructor() &&
+//				s.IsEditorBrowsable(
+//					hideAdvancedMembers,
+//					compilation,
+//					editorBrowsableAttributeConstructor,
+//					typeLibTypeAttributeConstructors,
+//					typeLibFuncAttributeConstructors,
+//					typeLibVarAttributeConstructors,
+//					hideModuleNameAttribute));
+//		}
+
+		private static IEnumerable<T> RemoveOverriddenSymbolsWithinSet<T>(this IEnumerable<T> symbols) where T : ISymbol
+		{
+			HashSet<ISymbol> overriddenSymbols = new HashSet<ISymbol>();
+
+			foreach (var symbol in symbols)
+			{
+				if (symbol.OverriddenMember() != null && !overriddenSymbols.Contains(symbol.OverriddenMember()))
+				{
+					overriddenSymbols.Add(symbol.OverriddenMember());
+				}
+			}
+
+			return symbols.Where(s => !overriddenSymbols.Contains(s));
+		}
+
+//		public static IEnumerable<T> FilterToVisibleAndBrowsableSymbolsAndNotUnsafeSymbols<T>(this IEnumerable<T> symbols, bool hideAdvancedMembers, Compilation compilation) where T : ISymbol
+//		{
+//			return symbols.FilterToVisibleAndBrowsableSymbols(hideAdvancedMembers, compilation).Where(s => !s.IsUnsafe());
+//		}
+	}
+
+	enum SymbolVisibility
+	{
+		Public,
+		Internal,
+		Private,
+	}
+
+}
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/Util/SymbolInfoExtensions.cs b/main/src/addins/CSharpBinding/Util/SymbolInfoExtensions.cs
new file mode 100644
index 0000000000..9e652103c7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SymbolInfoExtensions.cs
@@ -0,0 +1,73 @@
+//
+// SymbolInfoExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SymbolInfoExtensions
+	{
+		public static IEnumerable<ISymbol> GetAllSymbols(this SymbolInfo info)
+		{
+			return GetAllSymbolsWorker(info).Distinct();
+		}
+
+		private static IEnumerable<ISymbol> GetAllSymbolsWorker(this SymbolInfo info)
+		{
+			if (info.Symbol != null)
+			{
+				yield return info.Symbol;
+			}
+
+			foreach (var symbol in info.CandidateSymbols)
+			{
+				yield return symbol;
+			}
+		}
+
+		public static ISymbol GetAnySymbol(this SymbolInfo info)
+		{
+			return info.GetAllSymbols().FirstOrDefault();
+		}
+
+		public static IEnumerable<ISymbol> GetBestOrAllSymbols(this SymbolInfo info)
+		{
+			if (info.Symbol != null)
+			{
+				return SpecializedCollections.SingletonEnumerable(info.Symbol);
+			}
+			else if (info.CandidateSymbols.Length > 0)
+			{
+				return info.CandidateSymbols;
+			}
+
+			return SpecializedCollections.EmptyEnumerable<ISymbol>();
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/SymbolKeyExtensions.cs b/main/src/addins/CSharpBinding/Util/SymbolKeyExtensions.cs
new file mode 100644
index 0000000000..c190298089
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SymbolKeyExtensions.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading;
+using System;
+using Microsoft.CodeAnalysis;
+using System.Reflection;
+using System.Collections.Immutable;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class SymbolKey
+	{
+		readonly static Type typeInfo;
+
+		readonly object instance;
+
+		static SymbolKey ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.SymbolKey" + ReflectionNamespaces.WorkspacesAsmName, true);
+			resolveMethod = typeInfo.GetMethod ("Resolve", BindingFlags.Instance | BindingFlags.Public);
+			createMethod = typeInfo.GetMethod ("Create", BindingFlags.Static | BindingFlags.NonPublic);
+		}
+
+		SymbolKey (object instance)
+		{
+			this.instance = instance;
+		}
+
+		static MethodInfo createMethod;
+
+		/// <summary>
+		/// <para>
+		/// This entry point should only be called from the actual Symbol classes. It should not be
+		/// used internally inside this type.  Instead, any time we need to get the <see cref="SymbolKey"/> for a
+		/// related symbol (i.e. the containing namespace of a namespace) we should call
+		/// GetOrCreate.  The benefit of this is twofold.  First of all, it keeps the size of the
+		/// <see cref="SymbolKey"/> small by allowing up to reuse parts we've already created.  For example, if we
+		/// have the <see cref="SymbolKey"/> for <c>Foo(int, int)</c>, then we will reuse the <see cref="SymbolKey"/>s for both <c>int</c>s.
+		/// Second, this allows us to deal with the recursive nature of MethodSymbols and
+		/// TypeParameterSymbols.  Specifically, a MethodSymbol is defined by its signature.  However,
+		/// it's signature may refer to type parameters of that method.  Unfortunately, the type
+		/// parameters depend on their containing method.
+		/// </para>
+		/// <para>
+		/// For example, if there is <c><![CDATA[Foo<T>(T t)]]></c>, then we must avoid the situation where we:
+		/// <list type="number">
+		/// <item>try to get the symbol ID for the type parameter <c>T</c>, which in turn</item>
+		/// <item>tries to get the symbol ID for the method <c>T</c>, which in turn</item>
+		/// <item>tries to get the symbol IDs for the parameter types, which in turn</item>
+		/// <item>tries to get the symbol ID for the type parameter <c>T</c>, which leads back to 1 and infinitely loops.</item>
+		/// </list>
+		/// </para>
+		/// <para>
+		/// In order to break this circularity we do not create the SymbolIDs for a method's type
+		/// parameters directly in the visitor.  Instead, we create the SymbolID for the method
+		/// itself.  When the MethodSymbolId is created it will directly instantiate the SymbolIDs
+		/// for the type parameters, and directly assign the type parameter's method ID to itself.
+		/// It will also then directly store the mapping from the type parameter to its SymbolID in
+		/// the visitor cache.  Then when we try to create the symbol IDs for the parameter types,
+		/// any reference to the type parameters can be found in the cache.
+		/// </para>
+		/// <para>
+		/// It is for this reason that it is essential that all calls to get related symbol IDs goes
+		/// through GetOrCreate and not Create.
+		/// </para>
+		/// </summary>
+		internal static SymbolKey Create(ISymbol symbol, Compilation compilation = null, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				var instance = createMethod.Invoke (null, new object [] { symbol, compilation, cancellationToken });
+				return new SymbolKey (instance);
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		static MethodInfo resolveMethod;
+
+		public SymbolKeyResolution Resolve(Compilation compilation, bool ignoreAssemblyKey = false, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return new SymbolKeyResolution (resolveMethod.Invoke (instance, new object[] { compilation, ignoreAssemblyKey, cancellationToken }));
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+
+	class SymbolKeyResolution
+	{
+		readonly static Type typeInfo;
+		readonly static PropertyInfo symbolProperty;
+		readonly static PropertyInfo candidateSymbolsProperty;
+		readonly static PropertyInfo candidateReasonProperty;
+
+		readonly object instance;
+
+
+		public ISymbol Symbol
+		{
+			get { return (ISymbol)symbolProperty.GetValue (instance); }
+		}
+
+		public ImmutableArray<ISymbol> CandidateSymbols
+		{
+			get { return (ImmutableArray<ISymbol>)candidateSymbolsProperty.GetValue (instance); }
+		}
+
+		public CandidateReason CandidateReason
+		{
+			get { return (CandidateReason)candidateReasonProperty.GetValue (instance); }
+		}
+
+		static SymbolKeyResolution ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.SymbolKeyResolution" + ReflectionNamespaces.WorkspacesAsmName, true);
+
+			symbolProperty = typeInfo.GetProperty ("Symbol");
+			candidateSymbolsProperty = typeInfo.GetProperty ("CandidateSymbols");
+			candidateReasonProperty = typeInfo.GetProperty ("CandidateReason");
+
+		}
+
+		public SymbolKeyResolution (object instance)
+		{
+			this.instance = instance;
+		}
+
+
+	}
+
+	static class SymbolKeyExtensions
+	{
+		public static SymbolKey GetSymbolKey(this ISymbol symbol)
+		{
+			return SymbolKey.Create(symbol, null, CancellationToken.None);
+		}
+
+		#if false
+		internal static SymbolKey GetSymbolKey(this ISymbol symbol, Compilation compilation, CancellationToken cancellationToken)
+		{
+		return SymbolKey.Create(symbol, compilation, cancellationToken);
+		}
+		#endif
+
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SymbolKeyResolutionExtensions.cs b/main/src/addins/CSharpBinding/Util/SymbolKeyResolutionExtensions.cs
new file mode 100644
index 0000000000..6440394c02
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SymbolKeyResolutionExtensions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SymbolKeyResolutionExtensions
+	{
+		public static ISymbol GetAnySymbol(this SymbolKeyResolution resolution)
+		{
+			if (resolution.Symbol != null)
+			{
+				return resolution.Symbol;
+			}
+
+			if (resolution.CandidateSymbols.Length > 0)
+			{
+				return resolution.CandidateSymbols[0];
+			}
+
+			return null;
+		}
+
+		public static IEnumerable<ISymbol> GetAllSymbols(this SymbolKeyResolution resolution)
+		{
+			return GetAllSymbolsWorker(resolution).Distinct();
+		}
+
+		private static IEnumerable<ISymbol> GetAllSymbolsWorker(SymbolKeyResolution resolution)
+		{
+			if (resolution.Symbol != null)
+			{
+				yield return resolution.Symbol;
+			}
+
+			foreach (var symbol in resolution.CandidateSymbols)
+			{
+				yield return symbol;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SyntacticDocument.cs b/main/src/addins/CSharpBinding/Util/SyntacticDocument.cs
new file mode 100644
index 0000000000..2d23878be4
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntacticDocument.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class SyntacticDocument
+	{
+		public readonly Document Document;
+		public readonly SourceText Text;
+		public readonly SyntaxTree SyntaxTree;
+		public readonly SyntaxNode Root;
+
+		protected SyntacticDocument(Document document, SourceText text, SyntaxTree tree, SyntaxNode root)
+		{
+			this.Document = document;
+			this.Text = text;
+			this.SyntaxTree = tree;
+			this.Root = root;
+		}
+
+		public Project Project
+		{
+			get { return this.Document.Project; }
+		}
+
+		public static async Task<SyntacticDocument> CreateAsync(Document document, CancellationToken cancellationToken)
+		{
+			var text = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
+			var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+			return new SyntacticDocument(document, text, root.SyntaxTree, root);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SyntaxContext.cs b/main/src/addins/CSharpBinding/Util/SyntaxContext.cs
new file mode 100644
index 0000000000..caa230fddc
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntaxContext.cs
@@ -0,0 +1,180 @@
+//
+// SyntaxContext.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class SyntaxContext
+	{
+		readonly CSharpSyntaxContext ctx;
+		readonly List<ITypeSymbol> inferredTypes;
+
+		public CSharpSyntaxContext CSharpSyntaxContext {
+			get {
+				return ctx;
+			}
+		}
+
+
+		public SemanticModel SemanticModel { get; internal set; }
+
+		public List<ITypeSymbol> InferredTypes {
+			get {
+				return inferredTypes;
+			}
+		}
+		
+		public SyntaxToken LeftToken {
+			get {
+				return ctx.LeftToken;
+			}
+		}
+		
+		public SyntaxToken TargetToken {
+			get {
+				return ctx.TargetToken;
+			}
+		}
+
+		public bool IsIsOrAsTypeContext {
+			get {
+				return ctx.IsIsOrAsTypeContext;
+			}
+		}
+
+		public bool IsInstanceContext {
+			get {
+				return ctx.IsInstanceContext;
+			}
+		}
+
+		public bool IsNonAttributeExpressionContext {
+			get {
+				return ctx.IsNonAttributeExpressionContext;
+			}
+		}
+
+		public bool IsPreProcessorKeywordContext {
+			get {
+				return ctx.IsPreProcessorKeywordContext;
+			}
+		}
+
+		public bool IsPreProcessorExpressionContext {
+			get {
+				return ctx.IsPreProcessorExpressionContext;
+			}
+		}
+
+		public TypeDeclarationSyntax ContainingTypeDeclaration {
+			get {
+				return ctx.ContainingTypeDeclaration;
+			}
+		}
+
+		public bool IsGlobalStatementContext {
+			get {
+				return ctx.IsGlobalStatementContext;
+			}
+		}
+
+		public bool IsParameterTypeContext {
+			get {
+				return ctx.IsParameterTypeContext;
+			}
+		}
+		
+		public SyntaxTree SyntaxTree {
+			get {
+				return ctx.SyntaxTree;
+			}
+		}
+
+		public bool IsInsideNamingContext (bool isRightAfterIdentifier)
+		{
+			var parent = ctx.TargetToken.Parent;
+			if (isRightAfterIdentifier) {
+				return parent.IsKind(SyntaxKind.IdentifierName) ||
+					parent.IsKind(SyntaxKind.PredefinedType);
+			}
+			if (parent.IsKind(SyntaxKind.NamespaceDeclaration)) {
+				return !ctx.TargetToken.IsKind(SyntaxKind.OpenBraceToken);
+			}
+			return parent.IsKind(SyntaxKind.IdentifierName) && (
+			    parent.Parent.IsKind(SyntaxKind.Parameter) ||
+			    parent.Parent.IsKind(SyntaxKind.ArrayType) ||
+				parent.Parent.IsKind(SyntaxKind.VariableDeclaration) ||
+				parent.Parent.IsKind(SyntaxKind.ForEachStatement)
+			);
+		}
+
+		SyntaxContext(CSharpSyntaxContext ctx, List<ITypeSymbol> inferredTypes)
+		{
+			this.inferredTypes = inferredTypes;
+			this.ctx = ctx;
+		}
+
+		static readonly CSharpTypeInferenceService inferenceService = new CSharpTypeInferenceService ();
+
+		public static CSharpTypeInferenceService InferenceService {
+			get {
+				return inferenceService;
+			}
+		}
+
+		public static SyntaxContext Create(Workspace workspace, Document document, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			return new SyntaxContext(
+				CSharpSyntaxContext.CreateContext(workspace, semanticModel, position, cancellationToken),
+				inferenceService.InferTypes(semanticModel, position, cancellationToken).ToList()
+			);
+		}
+
+		public ITypeSymbol GetCurrentType(SemanticModel semanticModel)
+		{
+			foreach (var f in semanticModel.Compilation.GlobalNamespace.GetMembers()) {
+				foreach (var loc in f.Locations) {
+					if (loc.SourceTree.FilePath == SyntaxTree.FilePath) {
+						if (loc.SourceSpan == ContainingTypeDeclaration.Identifier.Span) {
+							return f as ITypeSymbol;
+						}
+					}
+				}
+			}
+			return null;
+		}
+
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/SyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/SyntaxExtensions.cs
new file mode 100644
index 0000000000..1b378e9479
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntaxExtensions.cs
@@ -0,0 +1,550 @@
+//
+// SyntaxExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Simplification;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp.Utilities;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Rename.ConflictEngine;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Simplification;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using System;
+using System.Reflection;
+using System.Collections.Immutable;
+using System.Runtime.ExceptionServices;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SyntaxExtensions
+	{
+		readonly static MethodInfo canRemoveParenthesesMethod;
+//		readonly static MethodInfo isLeftSideOfDotMethod;
+//		readonly static MethodInfo isRightSideOfDotMethod;
+//		readonly static MethodInfo getEnclosingNamedTypeMethod;
+		readonly static MethodInfo getLocalDeclarationMapMethod;
+		readonly static PropertyInfo localDeclarationMapIndexer;
+		readonly static MethodInfo getAncestorsMethod;
+
+		static SyntaxExtensions()
+		{
+			var typeInfo = Type.GetType("Microsoft.CodeAnalysis.CSharp.Extensions.ParenthesizedExpressionSyntaxExtensions" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			canRemoveParenthesesMethod = typeInfo.GetMethod("CanRemoveParentheses", new[] { typeof(ParenthesizedExpressionSyntax) });
+
+//			typeInfo = Type.GetType("Microsoft.CodeAnalysis.CSharp.Extensions.ExpressionSyntaxExtensions" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+//			isLeftSideOfDotMethod = typeInfo.GetMethod("IsLeftSideOfDot", new[] { typeof(ExpressionSyntax) });
+//			isRightSideOfDotMethod = typeInfo.GetMethod("IsRightSideOfDot", new[] { typeof(ExpressionSyntax) });
+//
+//			typeInfo = Type.GetType("Microsoft.CodeAnalysis.Shared.Extensions.SemanticModelExtensions" + ReflectionNamespaces.WorkspacesAsmName, true);
+//			getEnclosingNamedTypeMethod = typeInfo.GetMethod("GetEnclosingNamedType", new[] { typeof(SemanticModel), typeof(int), typeof(CancellationToken) });
+//
+			typeInfo = Type.GetType("Microsoft.CodeAnalysis.CSharp.Extensions.MemberDeclarationSyntaxExtensions" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			getLocalDeclarationMapMethod = typeInfo.GetMethod("GetLocalDeclarationMap", new[] { typeof(MemberDeclarationSyntax) });
+
+			typeInfo = Type.GetType("Microsoft.CodeAnalysis.CSharp.Extensions.MemberDeclarationSyntaxExtensions+LocalDeclarationMap" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			localDeclarationMapIndexer = typeInfo.GetProperties().Single(p => p.GetIndexParameters().Any());
+
+			typeInfo = Type.GetType("Microsoft.CodeAnalysis.Shared.Extensions.SyntaxTokenExtensions" + ReflectionNamespaces.WorkspacesAsmName, true);
+			getAncestorsMethod = typeInfo.GetMethods().Single(m => m.Name == "GetAncestors" && m.IsGenericMethod && m.GetParameters().Length == 1);
+		}
+
+
+		/// <summary>
+		/// Look inside a trivia list for a skipped token that contains the given position.
+		/// </summary>
+		private static readonly Func<SyntaxTriviaList, int, SyntaxToken> s_findSkippedTokenBackward =
+			(l, p) => FindTokenHelper.FindSkippedTokenBackward(GetSkippedTokens(l), p);
+
+		/// <summary>
+		/// return only skipped tokens
+		/// </summary>
+		private static IEnumerable<SyntaxToken> GetSkippedTokens(SyntaxTriviaList list)
+		{
+			return list.Where(trivia => trivia.RawKind == (int)SyntaxKind.SkippedTokensTrivia)
+				.SelectMany(t => ((SkippedTokensTriviaSyntax)t.GetStructure()).Tokens);
+		}
+
+		/// <summary>
+		/// If the position is inside of token, return that token; otherwise, return the token to the left.
+		/// </summary>
+		public static SyntaxToken FindTokenOnLeftOfPosition(
+			this SyntaxNode root,
+			int position,
+			bool includeSkipped = true,
+			bool includeDirectives = false,
+			bool includeDocumentationComments = false)
+		{
+			var skippedTokenFinder = includeSkipped ? s_findSkippedTokenBackward : (Func<SyntaxTriviaList, int, SyntaxToken>)null;
+
+			return FindTokenHelper.FindTokenOnLeftOfPosition<CompilationUnitSyntax>(
+				root, position, skippedTokenFinder, includeSkipped, includeDirectives, includeDocumentationComments);
+		}
+
+
+
+//		public static bool IntersectsWith(this SyntaxToken token, int position)
+//		{
+//			return token.Span.IntersectsWith(position);
+//		}
+
+//		public static bool IsLeftSideOfDot(this ExpressionSyntax syntax)
+//		{
+//			return (bool)isLeftSideOfDotMethod.Invoke(null, new object[] { syntax });
+//		}
+//
+//		public static bool IsRightSideOfDot(this ExpressionSyntax syntax)
+//		{
+//			return (bool)isRightSideOfDotMethod.Invoke(null, new object[] { syntax });
+//		}
+
+//		public static INamedTypeSymbol GetEnclosingNamedType(this SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+//		{
+//			return (INamedTypeSymbol)getEnclosingNamedTypeMethod.Invoke(null, new object[] { semanticModel, position, cancellationToken });
+//		}
+//
+		static ImmutableArray<SyntaxToken> GetLocalDeclarationMap(this MemberDeclarationSyntax member, string localName)
+		{
+			try {
+				object map = getLocalDeclarationMapMethod.Invoke(null, new object[] { member });
+				return (ImmutableArray<SyntaxToken>)localDeclarationMapIndexer.GetValue(map, new object[] { localName });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return ImmutableArray<SyntaxToken>.Empty;
+			}
+		}
+
+		static IEnumerable<T> GetAncestors<T>(this SyntaxToken token) where T : SyntaxNode
+		{
+			try {
+				return (IEnumerable<T>)getAncestorsMethod.MakeGenericMethod(typeof(T)).Invoke(null, new object[] { token });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public static ExpressionSyntax SkipParens(this ExpressionSyntax expression)
+		{
+			if (expression == null)
+				return null;
+			while (expression != null && expression.IsKind(SyntaxKind.ParenthesizedExpression)) {
+				expression = ((ParenthesizedExpressionSyntax)expression).Expression;
+			}
+			return expression;
+		}
+
+		public static SyntaxNode SkipArgument(this SyntaxNode expression)
+		{
+			if (expression is ArgumentSyntax)
+				return ((ArgumentSyntax)expression).Expression;
+			return expression;
+		}
+
+		public static bool CanRemoveParentheses(this ParenthesizedExpressionSyntax node)
+		{
+			try {
+				return (bool)canRemoveParenthesesMethod.Invoke(null, new object[] { node }); 
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return false;
+			}
+		}
+
+		public static bool IsParentKind(this SyntaxNode node, SyntaxKind kind)
+		{
+			return node != null && node.Parent.IsKind(kind);
+		}
+
+		public static bool IsParentKind(this SyntaxToken node, SyntaxKind kind)
+		{
+			return node.Parent != null && node.Parent.IsKind(kind);
+		}
+
+		public static bool CanReplaceWithReducedName(
+			this MemberAccessExpressionSyntax memberAccess,
+			ExpressionSyntax reducedName,
+			SemanticModel semanticModel,
+			CancellationToken cancellationToken)
+		{
+			if (!IsThisOrTypeOrNamespace(memberAccess, semanticModel)) {
+				return false;
+			}
+
+			var speculationAnalyzer = new SpeculationAnalyzer(memberAccess, reducedName, semanticModel, cancellationToken);
+			if (!speculationAnalyzer.SymbolsForOriginalAndReplacedNodesAreCompatible() ||
+			    speculationAnalyzer.ReplacementChangesSemantics()) {
+				return false;
+			}
+
+			if (WillConflictWithExistingLocal(memberAccess, reducedName)) {
+				return false;
+			}
+
+			if (IsMemberAccessADynamicInvocation(memberAccess, semanticModel)) {
+				return false;
+			}
+
+			if (memberAccess.AccessMethodWithDynamicArgumentInsideStructConstructor(semanticModel)) {
+				return false;
+			}
+
+			if (memberAccess.Expression.Kind() == SyntaxKind.BaseExpression) {
+				var enclosingNamedType = semanticModel.GetEnclosingNamedType(memberAccess.SpanStart, cancellationToken);
+				var symbol = semanticModel.GetSymbolInfo(memberAccess.Name).Symbol;
+				if (enclosingNamedType != null &&
+				    !enclosingNamedType.IsSealed &&
+				    symbol != null &&
+					symbol.IsOverridable()) {
+					return false;
+				}
+			}
+
+			var invalidTransformation1 = ParserWouldTreatExpressionAsCast(reducedName, memberAccess);
+
+			return !invalidTransformation1;
+		}
+
+		internal static bool IsValidSymbolInfo(ISymbol symbol)
+		{
+			// name bound to only one symbol is valid
+			return symbol != null && !symbol.IsErrorType ();
+		}
+
+		private static bool IsThisOrTypeOrNamespace(MemberAccessExpressionSyntax memberAccess, SemanticModel semanticModel)
+		{
+			if (memberAccess.Expression.Kind() == SyntaxKind.ThisExpression) {
+				var previousToken = memberAccess.Expression.GetFirstToken().GetPreviousToken();
+
+				var symbol = semanticModel.GetSymbolInfo(memberAccess.Name).Symbol;
+
+				if (previousToken.Kind() == SyntaxKind.OpenParenToken &&
+				    previousToken.IsParentKind(SyntaxKind.ParenthesizedExpression) &&
+				    !previousToken.Parent.IsParentKind(SyntaxKind.ParenthesizedExpression) &&
+				    ((ParenthesizedExpressionSyntax)previousToken.Parent).Expression.Kind() == SyntaxKind.SimpleMemberAccessExpression &&
+				    symbol != null && symbol.Kind == SymbolKind.Method) {
+					return false;
+				}
+
+				return true;
+			}
+
+			var expressionInfo = semanticModel.GetSymbolInfo(memberAccess.Expression);
+			if (IsValidSymbolInfo(expressionInfo.Symbol)) {
+				if (expressionInfo.Symbol is INamespaceOrTypeSymbol) {
+					return true;
+				}
+
+				if (expressionInfo.Symbol.IsThisParameter()) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		private static bool WillConflictWithExistingLocal(ExpressionSyntax expression, ExpressionSyntax simplifiedNode)
+		{
+			if (simplifiedNode.Kind() == SyntaxKind.IdentifierName && !SyntaxFacts.IsInNamespaceOrTypeContext(expression)) {
+				var identifierName = (IdentifierNameSyntax)simplifiedNode;
+				var enclosingDeclarationSpace = FindImmediatelyEnclosingLocalVariableDeclarationSpace(expression);
+				var enclosingMemberDeclaration = expression.FirstAncestorOrSelf<MemberDeclarationSyntax>();
+				if (enclosingDeclarationSpace != null && enclosingMemberDeclaration != null) {
+					var locals = enclosingMemberDeclaration.GetLocalDeclarationMap(identifierName.Identifier.ValueText);
+					foreach (var token in locals) {
+						if (GetAncestors<SyntaxNode>(token).Contains(enclosingDeclarationSpace)) {
+							return true;
+						}
+					}
+				}
+			}
+
+			return false;
+		}
+
+		private static SyntaxNode FindImmediatelyEnclosingLocalVariableDeclarationSpace(SyntaxNode syntax)
+		{
+			for (var declSpace = syntax; declSpace != null; declSpace = declSpace.Parent) {
+				switch (declSpace.Kind()) {
+				// These are declaration-space-defining syntaxes, by the spec:
+					case SyntaxKind.MethodDeclaration:
+					case SyntaxKind.IndexerDeclaration:
+					case SyntaxKind.OperatorDeclaration:
+					case SyntaxKind.ConstructorDeclaration:
+					case SyntaxKind.Block:
+					case SyntaxKind.ParenthesizedLambdaExpression:
+					case SyntaxKind.SimpleLambdaExpression:
+					case SyntaxKind.AnonymousMethodExpression:
+					case SyntaxKind.SwitchStatement:
+					case SyntaxKind.ForEachKeyword:
+					case SyntaxKind.ForStatement:
+					case SyntaxKind.UsingStatement:
+
+						// SPEC VIOLATION: We also want to stop walking out if, say, we are in a field
+						// initializer. Technically according to the wording of the spec it should be
+						// legal to use a simple name inconsistently inside a field initializer because
+						// it does not define a local variable declaration space. In practice of course
+						// we want to check for that. (As the native compiler does as well.)
+
+					case SyntaxKind.FieldDeclaration:
+						return declSpace;
+				}
+			}
+
+			return null;
+		}
+
+		private static bool ParserWouldTreatExpressionAsCast(ExpressionSyntax reducedNode, MemberAccessExpressionSyntax originalNode)
+		{
+			SyntaxNode parent = originalNode;
+			while (parent != null) {
+				if (parent.IsParentKind(SyntaxKind.SimpleMemberAccessExpression)) {
+					parent = parent.Parent;
+					continue;
+				}
+
+				if (!parent.IsParentKind(SyntaxKind.ParenthesizedExpression)) {
+					return false;
+				}
+
+				break;
+			}
+
+			var newExpression = parent.ReplaceNode((SyntaxNode)originalNode, reducedNode);
+
+			// detect cast ambiguities according to C# spec #7.7.6 
+			if (IsNameOrMemberAccessButNoExpression(newExpression)) {
+				var nextToken = parent.Parent.GetLastToken().GetNextToken();
+
+				return nextToken.Kind() == SyntaxKind.OpenParenToken ||
+				nextToken.Kind() == SyntaxKind.TildeToken ||
+				nextToken.Kind() == SyntaxKind.ExclamationToken ||
+				(SyntaxFacts.IsKeywordKind(nextToken.Kind()) && !(nextToken.Kind() == SyntaxKind.AsKeyword || nextToken.Kind() == SyntaxKind.IsKeyword));
+			}
+
+			return false;
+		}
+
+		private static bool IsMemberAccessADynamicInvocation(MemberAccessExpressionSyntax memberAccess, SemanticModel semanticModel)
+		{
+			var ancestorInvocation = memberAccess.FirstAncestorOrSelf<InvocationExpressionSyntax>();
+
+			if (ancestorInvocation != null && ancestorInvocation.SpanStart == memberAccess.SpanStart) {
+				var typeInfo = semanticModel.GetTypeInfo(ancestorInvocation);
+				if (typeInfo.Type != null &&
+				    typeInfo.Type.Kind == SymbolKind.DynamicType) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		private static bool IsNameOrMemberAccessButNoExpression(SyntaxNode node)
+		{
+			if (node.IsKind(SyntaxKind.SimpleMemberAccessExpression)) {
+				var memberAccess = (MemberAccessExpressionSyntax)node;
+
+				return memberAccess.Expression.IsKind(SyntaxKind.IdentifierName) ||
+				IsNameOrMemberAccessButNoExpression(memberAccess.Expression);
+			}
+
+			return node.IsKind(SyntaxKind.IdentifierName);
+		}
+
+		private static bool AccessMethodWithDynamicArgumentInsideStructConstructor(this MemberAccessExpressionSyntax memberAccess, SemanticModel semanticModel)
+		{
+			var constructor = memberAccess.Ancestors().OfType<ConstructorDeclarationSyntax>().SingleOrDefault();
+
+			if (constructor == null || constructor.Parent.Kind() != SyntaxKind.StructDeclaration) {
+				return false;
+			}
+
+			return semanticModel.GetSymbolInfo(memberAccess.Name).CandidateReason == CandidateReason.LateBound;
+		}
+
+
+		public static bool CanReplaceWithReducedName(this NameSyntax name, TypeSyntax reducedName, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			var speculationAnalyzer = new SpeculationAnalyzer(name, reducedName, semanticModel, cancellationToken);
+			if (speculationAnalyzer.ReplacementChangesSemantics())
+			{
+				return false;
+			}
+
+			return CanReplaceWithReducedNameInContext(name, reducedName, semanticModel, cancellationToken);
+		}
+
+		private static bool CanReplaceWithReducedNameInContext(this NameSyntax name, TypeSyntax reducedName, SemanticModel semanticModel, CancellationToken cancellationToken)
+		{
+			// Special case.  if this new minimal name parses out to a predefined type, then we
+			// have to make sure that we're not in a using alias. That's the one place where the
+			// language doesn't allow predefined types. You have to use the fully qualified name
+			// instead.
+			var invalidTransformation1 = IsNonNameSyntaxInUsingDirective(name, reducedName);
+			var invalidTransformation2 = WillConflictWithExistingLocal(name, reducedName);
+			var invalidTransformation3 = IsAmbiguousCast(name, reducedName);
+			var invalidTransformation4 = IsNullableTypeInPointerExpression(name, reducedName);
+			var isNotNullableReplacable = name.IsNotNullableReplacable(reducedName);
+
+			if (invalidTransformation1 || invalidTransformation2 || invalidTransformation3 || invalidTransformation4
+				|| isNotNullableReplacable)
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		private static bool IsNullableTypeInPointerExpression(ExpressionSyntax expression, ExpressionSyntax simplifiedNode)
+		{
+			// Note: nullable type syntax is not allowed in pointer type syntax
+			if (simplifiedNode.Kind() == SyntaxKind.NullableType &&
+				simplifiedNode.DescendantNodes().Any(n => n is PointerTypeSyntax))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		private static bool IsAmbiguousCast(ExpressionSyntax expression, ExpressionSyntax simplifiedNode)
+		{
+			// Can't simplify a type name in a cast expression if it would then cause the cast to be
+			// parsed differently.  For example:  (Foo::Bar)+1  is a cast.  But if that simplifies to
+			// (Bar)+1  then that's an arithmetic expression.
+			if (expression.IsParentKind(SyntaxKind.CastExpression))
+			{
+				var castExpression = (CastExpressionSyntax)expression.Parent;
+				if (castExpression.Type == expression)
+				{
+					var newCastExpression = castExpression.ReplaceNode((SyntaxNode)castExpression.Type, simplifiedNode);
+					var reparsedCastExpression = SyntaxFactory.ParseExpression(newCastExpression.ToString());
+
+					if (!reparsedCastExpression.IsKind(SyntaxKind.CastExpression))
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+		private static bool IsNonNameSyntaxInUsingDirective(ExpressionSyntax expression, ExpressionSyntax simplifiedNode)
+		{
+			return
+				expression.IsParentKind(SyntaxKind.UsingDirective) &&
+				!(simplifiedNode is NameSyntax);
+		}
+
+		private static bool IsNotNullableReplacable(this NameSyntax name, TypeSyntax reducedName)
+		{
+			var isNotNullableReplacable = false;
+			// var isLeftSideOfDot = name.IsLeftSideOfDot();
+			// var isRightSideOfDot = name.IsRightSideOfDot();
+
+			if (reducedName.Kind() == SyntaxKind.NullableType)
+			{
+				if (((NullableTypeSyntax)reducedName).ElementType.Kind() == SyntaxKind.OmittedTypeArgument)
+				{
+					isNotNullableReplacable = true;
+				}
+				else
+				{
+					isNotNullableReplacable = name.IsLeftSideOfDot() || name.IsRightSideOfDot();
+				}
+			}
+
+			return isNotNullableReplacable;
+		}
+
+		public static SyntaxTokenList GetModifiers (this MemberDeclarationSyntax member)
+		{
+			if (member == null)
+				throw new ArgumentNullException("member");
+			var method = member as BaseMethodDeclarationSyntax;
+			if (method != null)
+				return method.Modifiers;
+			var property = member as BasePropertyDeclarationSyntax;
+			if (property != null)
+				return property.Modifiers;
+			var field = member as BaseFieldDeclarationSyntax;
+			if (field != null)
+				return field.Modifiers;
+			return new SyntaxTokenList ();
+		}
+
+		public static ExplicitInterfaceSpecifierSyntax GetExplicitInterfaceSpecifierSyntax (this MemberDeclarationSyntax member)
+		{
+			if (member == null)
+				throw new ArgumentNullException("member");
+			var method = member as MethodDeclarationSyntax;
+			if (method != null)
+				return method.ExplicitInterfaceSpecifier;
+			var property = member as BasePropertyDeclarationSyntax;
+			if (property != null)
+				return property.ExplicitInterfaceSpecifier;
+			var evt = member as EventDeclarationSyntax;
+			if (evt != null)
+				return evt.ExplicitInterfaceSpecifier;
+			return null;
+		}
+//		public static bool IsKind(this SyntaxToken token, SyntaxKind kind)
+//		{
+//			return token.RawKind == (int)kind;
+//		}
+//
+//		public static bool IsKind(this SyntaxTrivia trivia, SyntaxKind kind)
+//		{
+//			return trivia.RawKind == (int)kind;
+//		}
+//
+//		public static bool IsKind(this SyntaxNode node, SyntaxKind kind)
+//		{
+//			return node?.RawKind == (int)kind;
+//		}
+//
+//		public static bool IsKind(this SyntaxNodeOrToken nodeOrToken, SyntaxKind kind)
+//		{
+//			return nodeOrToken.RawKind == (int)kind;
+//		}
+//
+
+//		public static SyntaxNode GetParent(this SyntaxNode node)
+//		{
+//			return node != null ? node.Parent : null;
+//		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/SyntaxKindSet.cs b/main/src/addins/CSharpBinding/Util/SyntaxKindSet.cs
new file mode 100644
index 0000000000..158a7dea36
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntaxKindSet.cs
@@ -0,0 +1,112 @@
+//
+// SyntaxKindSet.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Collections.Generic;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SyntaxKindSet
+	{
+		public static readonly ISet<SyntaxKind> AllTypeModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+		{
+			SyntaxKind.AbstractKeyword,
+			SyntaxKind.InternalKeyword,
+			SyntaxKind.NewKeyword,
+			SyntaxKind.PublicKeyword,
+			SyntaxKind.PrivateKeyword,
+			SyntaxKind.ProtectedKeyword,
+			SyntaxKind.SealedKeyword,
+			SyntaxKind.StaticKeyword,
+			SyntaxKind.UnsafeKeyword
+		};
+
+		public static readonly ISet<SyntaxKind> AllMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+		{
+			SyntaxKind.AbstractKeyword,
+			SyntaxKind.AsyncKeyword,
+			SyntaxKind.ExternKeyword,
+			SyntaxKind.InternalKeyword,
+			SyntaxKind.NewKeyword,
+			SyntaxKind.OverrideKeyword,
+			SyntaxKind.PublicKeyword,
+			SyntaxKind.PrivateKeyword,
+			SyntaxKind.ProtectedKeyword,
+			SyntaxKind.ReadOnlyKeyword,
+			SyntaxKind.SealedKeyword,
+			SyntaxKind.StaticKeyword,
+			SyntaxKind.UnsafeKeyword,
+			SyntaxKind.VirtualKeyword,
+			SyntaxKind.VolatileKeyword,
+		};
+
+		public static readonly ISet<SyntaxKind> AllGlobalMemberModifiers = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+		{
+			SyntaxKind.ExternKeyword,
+			SyntaxKind.InternalKeyword,
+			SyntaxKind.NewKeyword,
+			SyntaxKind.OverrideKeyword,
+			SyntaxKind.PublicKeyword,
+			SyntaxKind.PrivateKeyword,
+			SyntaxKind.ReadOnlyKeyword,
+			SyntaxKind.StaticKeyword,
+			SyntaxKind.UnsafeKeyword,
+			SyntaxKind.VolatileKeyword,
+		};
+
+		public static readonly ISet<SyntaxKind> AllTypeDeclarations = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+		{
+			SyntaxKind.InterfaceDeclaration,
+			SyntaxKind.ClassDeclaration,
+			SyntaxKind.StructDeclaration,
+			SyntaxKind.EnumDeclaration
+		};
+
+		public static readonly ISet<SyntaxKind> ClassInterfaceStructTypeDeclarations = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+		{
+			SyntaxKind.InterfaceDeclaration,
+			SyntaxKind.ClassDeclaration,
+			SyntaxKind.StructDeclaration,
+		};
+
+		public static readonly ISet<SyntaxKind> ClassStructTypeDeclarations = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+		{
+			SyntaxKind.ClassDeclaration,
+			SyntaxKind.StructDeclaration,
+		};
+
+		public static readonly ISet<SyntaxKind> ClassOnlyTypeDeclarations = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+		{
+			SyntaxKind.ClassDeclaration,
+		};
+
+		public static readonly ISet<SyntaxKind> StructOnlyTypeDeclarations = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer)
+		{
+			SyntaxKind.StructDeclaration,
+		};
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/SyntaxListExtension.cs b/main/src/addins/CSharpBinding/Util/SyntaxListExtension.cs
new file mode 100644
index 0000000000..034fb840f7
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntaxListExtension.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SyntaxListExtensions
+	{
+		public static SyntaxList<T> RemoveRange<T>(this SyntaxList<T> syntaxList, int index, int count) where T : SyntaxNode
+		{
+			var result = new List<T>(syntaxList);
+			result.RemoveRange(index, count);
+			return SyntaxFactory.List(result);
+		}
+
+		public static SyntaxList<T> ToSyntaxList<T>(this IEnumerable<T> sequence) where T : SyntaxNode
+		{
+			return SyntaxFactory.List(sequence);
+		}
+
+		public static SyntaxList<T> Insert<T>(this SyntaxList<T> list, int index, T item) where T : SyntaxNode
+		{
+			return list.Take(index).Concat(new T[] { item } ).Concat(list.Skip(index)).ToSyntaxList();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SyntaxNodeExtensions.cs b/main/src/addins/CSharpBinding/Util/SyntaxNodeExtensions.cs
new file mode 100644
index 0000000000..dba318122c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntaxNodeExtensions.cs
@@ -0,0 +1,1721 @@
+//
+// SyntaxNodeExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Collections;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Threading.Tasks;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static partial class SyntaxNodeExtensions
+	{
+		public static IEnumerable<SyntaxNodeOrToken> DepthFirstTraversal(this SyntaxNode node)
+		{
+			return CommonSyntaxNodeOrTokenExtensions.DepthFirstTraversal(node);
+		}
+
+		public static IEnumerable<SyntaxNode> GetAncestors(this SyntaxNode node)
+		{
+			var current = node.Parent;
+
+			while (current != null)
+			{
+				yield return current;
+
+				current = current is IStructuredTriviaSyntax
+					? ((IStructuredTriviaSyntax)current).ParentTrivia.Token.Parent
+					: current.Parent;
+			}
+		}
+
+		public static IEnumerable<TNode> GetAncestors<TNode>(this SyntaxNode node)
+			where TNode : SyntaxNode
+		{
+			var current = node.Parent;
+			while (current != null)
+			{
+				if (current is TNode)
+				{
+					yield return (TNode)current;
+				}
+
+				current = current is IStructuredTriviaSyntax
+					? ((IStructuredTriviaSyntax)current).ParentTrivia.Token.Parent
+					: current.Parent;
+			}
+		}
+
+		public static TNode GetAncestor<TNode>(this SyntaxNode node)
+			where TNode : SyntaxNode
+		{
+			if (node == null)
+			{
+				return default(TNode);
+			}
+
+			return node.GetAncestors<TNode>().FirstOrDefault();
+		}
+
+		public static TNode GetAncestorOrThis<TNode>(this SyntaxNode node)
+			where TNode : SyntaxNode
+		{
+			if (node == null)
+			{
+				return default(TNode);
+			}
+
+			return node.GetAncestorsOrThis<TNode>().FirstOrDefault();
+		}
+
+		public static IEnumerable<TNode> GetAncestorsOrThis<TNode>(this SyntaxNode node)
+			where TNode : SyntaxNode
+		{
+			var current = node;
+			while (current != null)
+			{
+				if (current is TNode)
+				{
+					yield return (TNode)current;
+				}
+
+				current = current is IStructuredTriviaSyntax
+					? ((IStructuredTriviaSyntax)current).ParentTrivia.Token.Parent
+					: current.Parent;
+			}
+		}
+
+		public static bool HasAncestor<TNode>(this SyntaxNode node)
+			where TNode : SyntaxNode
+		{
+			return node.GetAncestors<TNode>().Any();
+		}
+
+		public static IEnumerable<TSyntaxNode> Traverse<TSyntaxNode>(
+			this SyntaxNode node, TextSpan searchSpan, Func<SyntaxNode, bool> predicate)
+			where TSyntaxNode : SyntaxNode
+		{
+		//	Contract.ThrowIfNull(node);
+
+			var nodes = new LinkedList<SyntaxNode>();
+			nodes.AddFirst(node);
+
+			while (nodes.Count > 0)
+			{
+				var currentNode = nodes.First.Value;
+				nodes.RemoveFirst();
+
+				if (currentNode != null && searchSpan.Contains(currentNode.FullSpan) && predicate(currentNode))
+				{
+					if (currentNode is TSyntaxNode)
+					{
+						yield return (TSyntaxNode)currentNode;
+					}
+
+					nodes.AddRangeAtHead(currentNode.ChildNodes());
+				}
+			}
+		}
+
+		public static bool CheckParent<T>(this SyntaxNode node, Func<T, bool> valueChecker) where T : SyntaxNode
+		{
+			if (node == null)
+			{
+				return false;
+			}
+
+			var parentNode = node.Parent as T;
+			if (parentNode == null)
+			{
+				return false;
+			}
+
+			return valueChecker(parentNode);
+		}
+
+		/// <summary>
+		/// Returns true if is a given token is a child token of of a certain type of parent node.
+		/// </summary>
+		/// <typeparam name="TParent">The type of the parent node.</typeparam>
+		/// <param name="node">The node that we are testing.</param>
+		/// <param name="childGetter">A function that, when given the parent node, returns the child token we are interested in.</param>
+		public static bool IsChildNode<TParent>(this SyntaxNode node, Func<TParent, SyntaxNode> childGetter)
+			where TParent : SyntaxNode
+		{
+			var ancestor = node.GetAncestor<TParent>();
+			if (ancestor == null)
+			{
+				return false;
+			}
+
+			var ancestorNode = childGetter(ancestor);
+
+			return node == ancestorNode;
+		}
+
+		/// <summary>
+		/// Returns true if this node is found underneath the specified child in the given parent.
+		/// </summary>
+		public static bool IsFoundUnder<TParent>(this SyntaxNode node, Func<TParent, SyntaxNode> childGetter)
+			where TParent : SyntaxNode
+		{
+			var ancestor = node.GetAncestor<TParent>();
+			if (ancestor == null)
+			{
+				return false;
+			}
+
+			var child = childGetter(ancestor);
+
+			// See if node passes through child on the way up to ancestor.
+			return node.GetAncestorsOrThis<SyntaxNode>().Contains(child);
+		}
+
+		public static SyntaxNode GetCommonRoot(this SyntaxNode node1, SyntaxNode node2)
+		{
+			//Contract.ThrowIfTrue(node1.RawKind == 0 || node2.RawKind == 0);
+
+			// find common starting node from two nodes.
+			// as long as two nodes belong to same tree, there must be at least one common root (Ex, compilation unit)
+			var ancestors = node1.GetAncestorsOrThis<SyntaxNode>();
+			var set = new HashSet<SyntaxNode>(node2.GetAncestorsOrThis<SyntaxNode>());
+
+			return ancestors.First(set.Contains);
+		}
+
+		public static int Width(this SyntaxNode node)
+		{
+			return node.Span.Length;
+		}
+
+		public static int FullWidth(this SyntaxNode node)
+		{
+			return node.FullSpan.Length;
+		}
+
+		public static SyntaxNode FindInnermostCommonNode(
+			this IEnumerable<SyntaxNode> nodes,
+			Func<SyntaxNode, bool> predicate)
+		{
+			IEnumerable<SyntaxNode> blocks = null;
+			foreach (var node in nodes)
+			{
+				blocks = blocks == null
+					? node.AncestorsAndSelf().Where(predicate)
+					: blocks.Intersect(node.AncestorsAndSelf().Where(predicate));
+			}
+
+			return blocks == null ? null : blocks.First();
+		}
+
+		public static TSyntaxNode FindInnermostCommonNode<TSyntaxNode>(this IEnumerable<SyntaxNode> nodes)
+			where TSyntaxNode : SyntaxNode
+		{
+			return (TSyntaxNode)nodes.FindInnermostCommonNode(n => n is TSyntaxNode);
+		}
+
+		/// <summary>
+		/// create a new root node from the given root after adding annotations to the tokens
+		/// 
+		/// tokens should belong to the given root
+		/// </summary>
+		public static SyntaxNode AddAnnotations(this SyntaxNode root, IEnumerable<Tuple<SyntaxToken, SyntaxAnnotation>> pairs)
+		{
+//			Contract.ThrowIfNull(root);
+//			Contract.ThrowIfNull(pairs);
+
+			var tokenMap = pairs.GroupBy(p => p.Item1, p => p.Item2).ToDictionary(g => g.Key, g => g.ToArray());
+			return root.ReplaceTokens(tokenMap.Keys, (o, n) => o.WithAdditionalAnnotations(tokenMap[o]));
+		}
+
+		/// <summary>
+		/// create a new root node from the given root after adding annotations to the nodes
+		/// 
+		/// nodes should belong to the given root
+		/// </summary>
+		public static SyntaxNode AddAnnotations(this SyntaxNode root, IEnumerable<Tuple<SyntaxNode, SyntaxAnnotation>> pairs)
+		{
+//			Contract.ThrowIfNull(root);
+//			Contract.ThrowIfNull(pairs);
+
+			var tokenMap = pairs.GroupBy(p => p.Item1, p => p.Item2).ToDictionary(g => g.Key, g => g.ToArray());
+			return root.ReplaceNodes(tokenMap.Keys, (o, n) => o.WithAdditionalAnnotations(tokenMap[o]));
+		}
+
+		public static TextSpan GetContainedSpan(this IEnumerable<SyntaxNode> nodes)
+		{
+//			Contract.ThrowIfNull(nodes);
+//			Contract.ThrowIfFalse(nodes.Any());
+
+			TextSpan fullSpan = nodes.First().Span;
+			foreach (var node in nodes)
+			{
+				fullSpan = TextSpan.FromBounds(
+					Math.Min(fullSpan.Start, node.SpanStart),
+					Math.Max(fullSpan.End, node.Span.End));
+			}
+
+			return fullSpan;
+		}
+
+		public static IEnumerable<TextSpan> GetContiguousSpans(
+			this IEnumerable<SyntaxNode> nodes, Func<SyntaxNode, SyntaxToken> getLastToken = null)
+		{
+			SyntaxNode lastNode = null;
+			TextSpan? textSpan = null;
+			foreach (var node in nodes)
+			{
+				if (lastNode == null)
+				{
+					textSpan = node.Span;
+				}
+				else
+				{
+					var lastToken = getLastToken == null
+						? lastNode.GetLastToken()
+						: getLastToken(lastNode);
+					if (lastToken.GetNextToken(includeDirectives: true) == node.GetFirstToken())
+					{
+						// Expand the span
+						textSpan = TextSpan.FromBounds(textSpan.Value.Start, node.Span.End);
+					}
+					else
+					{
+						// Return the last span, and start a new one
+						yield return textSpan.Value;
+						textSpan = node.Span;
+					}
+				}
+
+				lastNode = node;
+			}
+
+			if (textSpan.HasValue)
+			{
+				yield return textSpan.Value;
+			}
+		}
+
+		public static bool OverlapsHiddenPosition(this SyntaxNode node, CancellationToken cancellationToken)
+		{
+			return node.OverlapsHiddenPosition(node.Span, cancellationToken);
+		}
+
+		public static bool OverlapsHiddenPosition(this SyntaxNode node, TextSpan span, CancellationToken cancellationToken)
+		{
+			return node.SyntaxTree.OverlapsHiddenPosition(span, cancellationToken);
+		}
+
+		public static bool OverlapsHiddenPosition(this SyntaxNode declaration, SyntaxNode startNode, SyntaxNode endNode, CancellationToken cancellationToken)
+		{
+			var start = startNode.Span.End;
+			var end = endNode.SpanStart;
+
+			var textSpan = TextSpan.FromBounds(start, end);
+			return declaration.OverlapsHiddenPosition(textSpan, cancellationToken);
+		}
+
+		public static IEnumerable<T> GetAnnotatedNodes<T>(this SyntaxNode node, SyntaxAnnotation syntaxAnnotation) where T : SyntaxNode
+		{
+			return node.GetAnnotatedNodesAndTokens(syntaxAnnotation).Select(n => n.AsNode()).OfType<T>();
+		}
+
+		/// <summary>
+		/// Creates a new tree of nodes from the existing tree with the specified old nodes replaced with a newly computed nodes.
+		/// </summary>
+		/// <param name="root">The root of the tree that contains all the specified nodes.</param>
+		/// <param name="nodes">The nodes from the tree to be replaced.</param>
+		/// <param name="computeReplacementAsync">A function that computes a replacement node for
+		/// the argument nodes. The first argument is one of the original specified nodes. The second argument is
+		/// the same node possibly rewritten with replaced descendants.</param>
+		/// <param name="cancellationToken"></param>
+		public static Task<TRootNode> ReplaceNodesAsync<TRootNode>(
+			this TRootNode root,
+			IEnumerable<SyntaxNode> nodes,
+			Func<SyntaxNode, SyntaxNode, CancellationToken, Task<SyntaxNode>> computeReplacementAsync,
+			CancellationToken cancellationToken) where TRootNode : SyntaxNode
+		{
+			return root.ReplaceSyntaxAsync(
+				nodes: nodes, computeReplacementNodeAsync: computeReplacementAsync,
+				tokens: null, computeReplacementTokenAsync: null,
+				trivia: null, computeReplacementTriviaAsync: null,
+				cancellationToken: cancellationToken);
+		}
+
+//		/// <summary>
+//		/// Creates a new tree of tokens from the existing tree with the specified old tokens replaced with a newly computed tokens.
+//		/// </summary>
+//		/// <param name="root">The root of the tree that contains all the specified tokens.</param>
+//		/// <param name="tokens">The tokens from the tree to be replaced.</param>
+//		/// <param name="computeReplacementAsync">A function that computes a replacement token for
+//		/// the argument tokens. The first argument is one of the originally specified tokens. The second argument is
+//		/// the same token possibly rewritten with replaced trivia.</param>
+//		/// <param name="cancellationToken"></param>
+//		public static Task<TRootNode> ReplaceTokensAsync<TRootNode>(
+//			this TRootNode root,
+//			IEnumerable<SyntaxToken> tokens,
+//			Func<SyntaxToken, SyntaxToken, CancellationToken, Task<SyntaxToken>> computeReplacementAsync,
+//			CancellationToken cancellationToken) where TRootNode : SyntaxNode
+//		{
+//			return root.ReplaceSyntaxAsync(
+//				nodes: null, computeReplacementNodeAsync: null,
+//				tokens: tokens, computeReplacementTokenAsync: computeReplacementAsync,
+//				trivia: null, computeReplacementTriviaAsync: null,
+//				cancellationToken: cancellationToken);
+//		}
+//
+//		public static Task<TRoot> ReplaceTriviaAsync<TRoot>(
+//			this TRoot root,
+//			IEnumerable<SyntaxTrivia> trivia,
+//			Func<SyntaxTrivia, SyntaxTrivia, CancellationToken, Task<SyntaxTrivia>> computeReplacementAsync,
+//			CancellationToken cancellationToken) where TRoot : SyntaxNode
+//		{
+//			return root.ReplaceSyntaxAsync(
+//				nodes: null, computeReplacementNodeAsync: null,
+//				tokens: null, computeReplacementTokenAsync: null,
+//				trivia: trivia, computeReplacementTriviaAsync: computeReplacementAsync,
+//				cancellationToken: cancellationToken);
+//		}
+
+		public static async Task<TRoot> ReplaceSyntaxAsync<TRoot>(
+			this TRoot root,
+			IEnumerable<SyntaxNode> nodes,
+			Func<SyntaxNode, SyntaxNode, CancellationToken, Task<SyntaxNode>> computeReplacementNodeAsync,
+			IEnumerable<SyntaxToken> tokens,
+			Func<SyntaxToken, SyntaxToken, CancellationToken, Task<SyntaxToken>> computeReplacementTokenAsync,
+			IEnumerable<SyntaxTrivia> trivia,
+			Func<SyntaxTrivia, SyntaxTrivia, CancellationToken, Task<SyntaxTrivia>> computeReplacementTriviaAsync,
+			CancellationToken cancellationToken)
+			where TRoot : SyntaxNode
+		{
+			// index all nodes, tokens and trivia by the full spans they cover
+			var nodesToReplace = nodes != null ? nodes.ToDictionary(n => n.FullSpan) : new Dictionary<TextSpan, SyntaxNode>();
+			var tokensToReplace = tokens != null ? tokens.ToDictionary(t => t.FullSpan) : new Dictionary<TextSpan, SyntaxToken>();
+			var triviaToReplace = trivia != null ? trivia.ToDictionary(t => t.FullSpan) : new Dictionary<TextSpan, SyntaxTrivia>();
+
+			var nodeReplacements = new Dictionary<SyntaxNode, SyntaxNode>();
+			var tokenReplacements = new Dictionary<SyntaxToken, SyntaxToken>();
+			var triviaReplacements = new Dictionary<SyntaxTrivia, SyntaxTrivia>();
+
+			var retryAnnotations = new AnnotationTable<object>("RetryReplace");
+
+			var spans = new List<TextSpan>(nodesToReplace.Count + tokensToReplace.Count + triviaToReplace.Count);
+			spans.AddRange(nodesToReplace.Keys);
+			spans.AddRange(tokensToReplace.Keys);
+			spans.AddRange(triviaToReplace.Keys);
+
+			while (spans.Count > 0)
+			{
+				// sort the spans of the items to be replaced so we can tell if any overlap
+				spans.Sort((x, y) =>
+					{
+						// order by end offset, and then by length
+						var d = x.End - y.End;
+
+						if (d == 0)
+						{
+							d = x.Length - y.Length;
+						}
+
+						return d;
+					});
+
+				// compute replacements for all nodes that will go in the same batch
+				// only spans that do not overlap go in the same batch.                
+				TextSpan previous = default(TextSpan);
+				foreach (var span in spans)
+				{
+					// only add to replacement map if we don't intersect with the previous node. This taken with the sort order
+					// should ensure that parent nodes are not processed in the same batch as child nodes.
+					if (previous == default(TextSpan) || !previous.IntersectsWith(span))
+					{
+						SyntaxNode currentNode;
+						SyntaxToken currentToken;
+						SyntaxTrivia currentTrivia;
+
+						if (nodesToReplace.TryGetValue(span, out currentNode))
+						{
+							var original = (SyntaxNode)retryAnnotations.GetAnnotations(currentNode).SingleOrDefault() ?? currentNode;
+							var newNode = await computeReplacementNodeAsync(original, currentNode, cancellationToken).ConfigureAwait(false);
+							nodeReplacements[currentNode] = newNode;
+						}
+						else if (tokensToReplace.TryGetValue(span, out currentToken))
+						{
+							var original = (SyntaxToken)retryAnnotations.GetAnnotations(currentToken).SingleOrDefault();
+							if (original == default(SyntaxToken))
+							{
+								original = currentToken;
+							}
+
+							var newToken = await computeReplacementTokenAsync(original, currentToken, cancellationToken).ConfigureAwait(false);
+							tokenReplacements[currentToken] = newToken;
+						}
+						else if (triviaToReplace.TryGetValue(span, out currentTrivia))
+						{
+							var original = (SyntaxTrivia)retryAnnotations.GetAnnotations(currentTrivia).SingleOrDefault();
+							if (original == default(SyntaxTrivia))
+							{
+								original = currentTrivia;
+							}
+
+							var newTrivia = await computeReplacementTriviaAsync(original, currentTrivia, cancellationToken).ConfigureAwait(false);
+							triviaReplacements[currentTrivia] = newTrivia;
+						}
+					}
+
+					previous = span;
+				}
+
+				bool retryNodes = false;
+				bool retryTokens = false;
+				bool retryTrivia = false;
+
+				// replace nodes in batch
+				// submit all nodes so we can annotate the ones we don't replace
+				root = root.ReplaceSyntax(
+					nodes: nodesToReplace.Values,
+					computeReplacementNode: (original, rewritten) =>
+					{
+						SyntaxNode replaced;
+						if (rewritten != original || !nodeReplacements.TryGetValue(original, out replaced))
+						{
+							// the subtree did change, or we didn't have a replacement for it in this batch
+							// so we need to add an annotation so we can find this node again for the next batch.
+							replaced = retryAnnotations.WithAdditionalAnnotations(rewritten, original);
+							retryNodes = true;
+						}
+
+						return replaced;
+					},
+					tokens: tokensToReplace.Values,
+					computeReplacementToken: (original, rewritten) =>
+					{
+						SyntaxToken replaced;
+						if (rewritten != original || !tokenReplacements.TryGetValue(original, out replaced))
+						{
+							// the subtree did change, or we didn't have a replacement for it in this batch
+							// so we need to add an annotation so we can find this node again for the next batch.
+							replaced = retryAnnotations.WithAdditionalAnnotations(rewritten, original);
+							retryTokens = true;
+						}
+
+						return replaced;
+					},
+					trivia: triviaToReplace.Values,
+					computeReplacementTrivia: (original, rewritten) =>
+					{
+						SyntaxTrivia replaced;
+						if (!triviaReplacements.TryGetValue(original, out replaced))
+						{
+							// the subtree did change, or we didn't have a replacement for it in this batch
+							// so we need to add an annotation so we can find this node again for the next batch.
+							replaced = retryAnnotations.WithAdditionalAnnotations(rewritten, original);
+							retryTrivia = true;
+						}
+
+						return replaced;
+					});
+
+				nodesToReplace.Clear();
+				tokensToReplace.Clear();
+				triviaToReplace.Clear();
+				spans.Clear();
+
+				// prepare next batch out of all remaining annotated nodes
+				if (retryNodes)
+				{
+					nodesToReplace = retryAnnotations.GetAnnotatedNodes(root).ToDictionary(n => n.FullSpan);
+					spans.AddRange(nodesToReplace.Keys);
+				}
+
+				if (retryTokens)
+				{
+					tokensToReplace = retryAnnotations.GetAnnotatedTokens(root).ToDictionary(t => t.FullSpan);
+					spans.AddRange(tokensToReplace.Keys);
+				}
+
+				if (retryTrivia)
+				{
+					triviaToReplace = retryAnnotations.GetAnnotatedTrivia(root).ToDictionary(t => t.FullSpan);
+					spans.AddRange(triviaToReplace.Keys);
+				}
+			}
+
+			return root;
+		}
+
+
+		public static bool IsKind(this SyntaxNode node, SyntaxKind kind1, SyntaxKind kind2)
+		{
+			if (node == null)
+			{
+				return false;
+			}
+
+			var csharpKind = node.Kind();
+			return csharpKind == kind1 || csharpKind == kind2;
+		}
+
+		public static bool IsKind(this SyntaxNode node, SyntaxKind kind1, SyntaxKind kind2, SyntaxKind kind3)
+		{
+			if (node == null)
+			{
+				return false;
+			}
+
+			var csharpKind = node.Kind();
+			return csharpKind == kind1 || csharpKind == kind2 || csharpKind == kind3;
+		}
+
+		public static bool IsKind(this SyntaxNode node, SyntaxKind kind1, SyntaxKind kind2, SyntaxKind kind3, SyntaxKind kind4)
+		{
+			if (node == null)
+			{
+				return false;
+			}
+
+			var csharpKind = node.Kind();
+			return csharpKind == kind1 || csharpKind == kind2 || csharpKind == kind3 || csharpKind == kind4;
+		}
+
+		public static bool IsKind(this SyntaxNode node, SyntaxKind kind1, SyntaxKind kind2, SyntaxKind kind3, SyntaxKind kind4, SyntaxKind kind5)
+		{
+			if (node == null)
+			{
+				return false;
+			}
+
+			var csharpKind = node.Kind();
+			return csharpKind == kind1 || csharpKind == kind2 || csharpKind == kind3 || csharpKind == kind4 || csharpKind == kind5;
+		}
+
+		/// <summary>
+		/// Returns the list of using directives that affect <paramref name="node"/>. The list will be returned in
+		/// top down order.  
+		/// </summary>
+		public static IEnumerable<UsingDirectiveSyntax> GetEnclosingUsingDirectives(this SyntaxNode node)
+		{
+			return node.GetAncestorOrThis<CompilationUnitSyntax>().Usings
+				.Concat(node.GetAncestorsOrThis<NamespaceDeclarationSyntax>()
+					.Reverse()
+					.SelectMany(n => n.Usings));
+		}
+
+		public static bool IsUnsafeContext(this SyntaxNode node)
+		{
+			if (node.GetAncestor<UnsafeStatementSyntax>() != null)
+			{
+				return true;
+			}
+
+			return node.GetAncestors<MemberDeclarationSyntax>().Any(
+				m => m.GetModifiers().Any(SyntaxKind.UnsafeKeyword));
+		}
+
+		public static bool IsInStaticContext(this SyntaxNode node)
+		{
+			// this/base calls are always static.
+			if (node.FirstAncestorOrSelf<ConstructorInitializerSyntax>() != null)
+			{
+				return true;
+			}
+
+			var memberDeclaration = node.FirstAncestorOrSelf<MemberDeclarationSyntax>();
+			if (memberDeclaration == null)
+			{
+				return false;
+			}
+
+			switch (memberDeclaration.Kind())
+			{
+			case SyntaxKind.MethodDeclaration:
+			case SyntaxKind.ConstructorDeclaration:
+			case SyntaxKind.PropertyDeclaration:
+			case SyntaxKind.EventDeclaration:
+			case SyntaxKind.IndexerDeclaration:
+				return memberDeclaration.GetModifiers().Any(SyntaxKind.StaticKeyword);
+
+			case SyntaxKind.FieldDeclaration:
+				// Inside a field one can only access static members of a type.
+				return true;
+
+			case SyntaxKind.DestructorDeclaration:
+				return false;
+			}
+
+			// Global statements are not a static context.
+			if (node.FirstAncestorOrSelf<GlobalStatementSyntax>() != null)
+			{
+				return false;
+			}
+
+			// any other location is considered static
+			return true;
+		}
+
+		public static NamespaceDeclarationSyntax GetInnermostNamespaceDeclarationWithUsings(this SyntaxNode contextNode)
+		{
+			var usingDirectiveAncsestor = contextNode.GetAncestor<UsingDirectiveSyntax>();
+			if (usingDirectiveAncsestor == null)
+			{
+				return contextNode.GetAncestorsOrThis<NamespaceDeclarationSyntax>().FirstOrDefault(n => n.Usings.Count > 0);
+			}
+			else
+			{
+				// We are inside a using directive. In this case, we should find and return the first 'parent' namespace with usings.
+				var containingNamespace = usingDirectiveAncsestor.GetAncestor<NamespaceDeclarationSyntax>();
+				if (containingNamespace == null)
+				{
+					// We are inside a top level using directive (i.e. one that's directly in the compilation unit).
+					return null;
+				}
+				else
+				{
+					return containingNamespace.GetAncestors<NamespaceDeclarationSyntax>().FirstOrDefault(n => n.Usings.Count > 0);
+				}
+			}
+		}
+
+		// Matches the following:
+		//
+		// (whitespace* newline)+ 
+		private static readonly Matcher<SyntaxTrivia> s_oneOrMoreBlankLines;
+
+		// Matches the following:
+		// 
+		// (whitespace* (single-comment|multi-comment) whitespace* newline)+ OneOrMoreBlankLines
+		private static readonly Matcher<SyntaxTrivia> s_bannerMatcher;
+
+		static SyntaxNodeExtensions()
+		{
+			var whitespace = Matcher.Repeat(Match(SyntaxKind.WhitespaceTrivia, "\\b"));
+			var endOfLine = Match(SyntaxKind.EndOfLineTrivia, "\\n");
+			var singleBlankLine = Matcher.Sequence(whitespace, endOfLine);
+
+			var singleLineComment = Match(SyntaxKind.SingleLineCommentTrivia, "//");
+			var multiLineComment = Match(SyntaxKind.MultiLineCommentTrivia, "/**/");
+			var anyCommentMatcher = Matcher.Choice(singleLineComment, multiLineComment);
+
+			var commentLine = Matcher.Sequence(whitespace, anyCommentMatcher, whitespace, endOfLine);
+
+			s_oneOrMoreBlankLines = Matcher.OneOrMore(singleBlankLine);
+			s_bannerMatcher =
+				Matcher.Sequence(
+					Matcher.OneOrMore(commentLine),
+					s_oneOrMoreBlankLines);
+
+			var typeInfo = Type.GetType("Microsoft.CodeAnalysis.CSharp.Extensions.SyntaxNodeExtensions" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			containsInterleavedDirectiveMethod = typeInfo.GetMethod("ContainsInterleavedDirective", new[] { typeof(SyntaxNode), typeof (CancellationToken) });
+		}
+
+		private static Matcher<SyntaxTrivia> Match(SyntaxKind kind, string description)
+		{
+			return Matcher.Single<SyntaxTrivia>(t => t.Kind() == kind, description);
+		}
+
+		/// <summary>
+		/// Returns all of the trivia to the left of this token up to the previous token (concatenates
+		/// the previous token's trailing trivia and this token's leading trivia).
+		/// </summary>
+		public static IEnumerable<SyntaxTrivia> GetAllPrecedingTriviaToPreviousToken(this SyntaxToken token)
+		{
+			var prevToken = token.GetPreviousToken(includeSkipped: true);
+			if (prevToken.Kind() == SyntaxKind.None)
+			{
+				return token.LeadingTrivia;
+			}
+
+			return prevToken.TrailingTrivia.Concat(token.LeadingTrivia);
+		}
+
+		public static bool IsBreakableConstruct(this SyntaxNode node)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.DoStatement:
+			case SyntaxKind.WhileStatement:
+			case SyntaxKind.SwitchStatement:
+			case SyntaxKind.ForStatement:
+			case SyntaxKind.ForEachStatement:
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsContinuableConstruct(this SyntaxNode node)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.DoStatement:
+			case SyntaxKind.WhileStatement:
+			case SyntaxKind.ForStatement:
+			case SyntaxKind.ForEachStatement:
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsReturnableConstruct(this SyntaxNode node)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.AnonymousMethodExpression:
+			case SyntaxKind.SimpleLambdaExpression:
+			case SyntaxKind.ParenthesizedLambdaExpression:
+			case SyntaxKind.MethodDeclaration:
+			case SyntaxKind.ConstructorDeclaration:
+			case SyntaxKind.DestructorDeclaration:
+			case SyntaxKind.GetAccessorDeclaration:
+			case SyntaxKind.SetAccessorDeclaration:
+			case SyntaxKind.OperatorDeclaration:
+			case SyntaxKind.AddAccessorDeclaration:
+			case SyntaxKind.RemoveAccessorDeclaration:
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool SpansPreprocessorDirective<TSyntaxNode>(
+			this IEnumerable<TSyntaxNode> list)
+			where TSyntaxNode : SyntaxNode
+		{
+			if (list == null || !list.Any())
+			{
+				return false;
+			}
+
+			var tokens = list.SelectMany(n => n.DescendantTokens());
+
+			// todo: we need to dive into trivia here.
+			return tokens.SpansPreprocessorDirective();
+		}
+
+		public static T WithPrependedLeadingTrivia<T>(
+			this T node,
+			params SyntaxTrivia[] trivia) where T : SyntaxNode
+		{
+			if (trivia.Length == 0)
+			{
+				return node;
+			}
+
+			return node.WithPrependedLeadingTrivia((IEnumerable<SyntaxTrivia>)trivia);
+		}
+
+		public static T WithPrependedLeadingTrivia<T>(
+			this T node,
+			SyntaxTriviaList trivia) where T : SyntaxNode
+		{
+			if (trivia.Count == 0)
+			{
+				return node;
+			}
+
+			return node.WithLeadingTrivia(trivia.Concat(node.GetLeadingTrivia()));
+		}
+
+		public static T WithPrependedLeadingTrivia<T>(
+			this T node,
+			IEnumerable<SyntaxTrivia> trivia) where T : SyntaxNode
+		{
+			return node.WithPrependedLeadingTrivia(trivia.ToSyntaxTriviaList());
+		}
+
+		public static T WithAppendedTrailingTrivia<T>(
+			this T node,
+			params SyntaxTrivia[] trivia) where T : SyntaxNode
+		{
+			if (trivia.Length == 0)
+			{
+				return node;
+			}
+
+			return node.WithAppendedTrailingTrivia((IEnumerable<SyntaxTrivia>)trivia);
+		}
+
+		public static T WithAppendedTrailingTrivia<T>(
+			this T node,
+			SyntaxTriviaList trivia) where T : SyntaxNode
+		{
+			if (trivia.Count == 0)
+			{
+				return node;
+			}
+
+			return node.WithTrailingTrivia(node.GetTrailingTrivia().Concat(trivia));
+		}
+
+		public static T WithAppendedTrailingTrivia<T>(
+			this T node,
+			IEnumerable<SyntaxTrivia> trivia) where T : SyntaxNode
+		{
+			return node.WithAppendedTrailingTrivia(trivia.ToSyntaxTriviaList());
+		}
+
+		public static T With<T>(
+			this T node,
+			IEnumerable<SyntaxTrivia> leadingTrivia,
+			IEnumerable<SyntaxTrivia> trailingTrivia) where T : SyntaxNode
+		{
+			return node.WithLeadingTrivia(leadingTrivia).WithTrailingTrivia(trailingTrivia);
+		}
+
+		public static TNode ConvertToSingleLine<TNode>(this TNode node)
+			where TNode : SyntaxNode
+		{
+			if (node == null)
+			{
+				return node;
+			}
+
+			var rewriter = new SingleLineRewriter();
+			return (TNode)rewriter.Visit(node);
+		}
+
+		internal class SingleLineRewriter : CSharpSyntaxRewriter
+        {
+            private bool _lastTokenEndedInWhitespace;
+
+            public override SyntaxToken VisitToken(SyntaxToken token)
+            {
+                if (_lastTokenEndedInWhitespace)
+                {
+                    token = token.WithLeadingTrivia(Enumerable.Empty<SyntaxTrivia>());
+                }
+                else if (token.LeadingTrivia.Count > 0)
+                {
+                    token = token.WithLeadingTrivia(SyntaxFactory.Space);
+                }
+
+                if (token.TrailingTrivia.Count > 0)
+                {
+                    token = token.WithTrailingTrivia(SyntaxFactory.Space);
+                    _lastTokenEndedInWhitespace = true;
+                }
+                else
+                {
+                    _lastTokenEndedInWhitespace = false;
+                }
+
+                return token;
+            }
+        }
+
+		public static bool IsAnyArgumentList(this SyntaxNode node)
+		{
+			return node.IsKind(SyntaxKind.ArgumentList) ||
+				node.IsKind(SyntaxKind.AttributeArgumentList) ||
+				node.IsKind(SyntaxKind.BracketedArgumentList) ||
+				node.IsKind(SyntaxKind.TypeArgumentList);
+		}
+
+		public static bool IsAnyLambda(this SyntaxNode node)
+		{
+			return
+				node.IsKind(SyntaxKind.ParenthesizedLambdaExpression) ||
+				node.IsKind(SyntaxKind.SimpleLambdaExpression);
+		}
+
+		public static bool IsAnyLambdaOrAnonymousMethod(this SyntaxNode node)
+		{
+			return node.IsAnyLambda() || node.IsKind(SyntaxKind.AnonymousMethodExpression);
+		}
+
+		readonly static MethodInfo containsInterleavedDirectiveMethod;
+
+		/// <summary>
+		/// Returns true if the passed in node contains an interleaved pp directive.
+		/// 
+		/// i.e. The following returns false:
+		/// 
+		///   void Foo() {
+		/// #if true
+		/// #endif
+		///   }
+		/// 
+		/// #if true
+		///   void Foo() {
+		///   }
+		/// #endif
+		/// 
+		/// but these return true:
+		/// 
+		/// #if true
+		///   void Foo() {
+		/// #endif
+		///   }
+		/// 
+		///   void Foo() {
+		/// #if true
+		///   }
+		/// #endif
+		/// 
+		/// #if true
+		///   void Foo() {
+		/// #else
+		///   }
+		/// #endif
+		/// 
+		/// i.e. the method returns true if it contains a PP directive that belongs to a grouping
+		/// constructs (like #if/#endif or #region/#endregion), but the grouping construct isn't
+		/// entirely contained within the span of the node.
+		/// </summary>
+		public static bool ContainsInterleavedDirective(
+			this SyntaxNode syntaxNode,
+			CancellationToken cancellationToken)
+		{
+			return (bool)containsInterleavedDirectiveMethod.Invoke (null, new object[] { syntaxNode, cancellationToken });
+		}
+
+
+//		/// <summary>
+//		/// Breaks up the list of provided nodes, based on how they are interspersed with pp
+//		/// directives, into groups.  Within these groups nodes can be moved around safely, without
+//		/// breaking any pp constructs.
+//		/// </summary>
+//		public static IList<IList<TSyntaxNode>> SplitNodesOnPreprocessorBoundaries<TSyntaxNode>(
+//			this IEnumerable<TSyntaxNode> nodes,
+//			CancellationToken cancellationToken)
+//			where TSyntaxNode : SyntaxNode
+//		{
+//			var result = new List<IList<TSyntaxNode>>();
+//
+//			var currentGroup = new List<TSyntaxNode>();
+//			foreach (var node in nodes)
+//			{
+//				var hasUnmatchedInteriorDirective = node.ContainsInterleavedDirective(cancellationToken);
+//				var hasLeadingDirective = node.GetLeadingTrivia().Any(t => SyntaxFacts.IsPreprocessorDirective(t.Kind()));
+//
+//				if (hasUnmatchedInteriorDirective)
+//				{
+//					// we have a #if/#endif/#region/#endregion/#else/#elif in
+//					// this node that belongs to a span of pp directives that
+//					// is not entirely contained within the node.  i.e.:
+//					//
+//					//   void Foo() {
+//					//      #if ...
+//					//   }
+//					//
+//					// This node cannot be moved at all.  It is in a group that
+//					// only contains itself (and thus can never be moved).
+//
+//					// add whatever group we've built up to now. And reset the 
+//					// next group to empty.
+//					result.Add(currentGroup);
+//					currentGroup = new List<TSyntaxNode>();
+//
+//					result.Add(new List<TSyntaxNode> { node });
+//				}
+//				else if (hasLeadingDirective)
+//				{
+//					// We have a PP directive before us.  i.e.:
+//					// 
+//					//   #if ...
+//					//      void Foo() {
+//					//
+//					// That means we start a new group that is contained between
+//					// the above directive and the following directive.
+//
+//					// add whatever group we've built up to now. And reset the 
+//					// next group to empty.
+//					result.Add(currentGroup);
+//					currentGroup = new List<TSyntaxNode>();
+//
+//					currentGroup.Add(node);
+//				}
+//				else
+//				{
+//					// simple case.  just add ourselves to the current group
+//					currentGroup.Add(node);
+//				}
+//			}
+//
+//			// add the remainder of the final group.
+//			result.Add(currentGroup);
+//
+//			// Now, filter out any empty groups.
+//			result = result.Where(group => !group.IsEmpty()).ToList();
+//			return result;
+//		}
+//
+//		public static IEnumerable<SyntaxTrivia> GetLeadingBlankLines<TSyntaxNode>(
+//			this TSyntaxNode node)
+//			where TSyntaxNode : SyntaxNode
+//		{
+//			IEnumerable<SyntaxTrivia> blankLines;
+//			node.GetNodeWithoutLeadingBlankLines(out blankLines);
+//			return blankLines;
+//		}
+//
+//		public static TSyntaxNode GetNodeWithoutLeadingBlankLines<TSyntaxNode>(
+//			this TSyntaxNode node)
+//			where TSyntaxNode : SyntaxNode
+//		{
+//			IEnumerable<SyntaxTrivia> blankLines;
+//			return node.GetNodeWithoutLeadingBlankLines(out blankLines);
+//		}
+//
+//		public static TSyntaxNode GetNodeWithoutLeadingBlankLines<TSyntaxNode>(
+//			this TSyntaxNode node, out IEnumerable<SyntaxTrivia> strippedTrivia)
+//			where TSyntaxNode : SyntaxNode
+//		{
+//			var leadingTriviaToKeep = new List<SyntaxTrivia>(node.GetLeadingTrivia());
+//
+//			var index = 0;
+//			s_oneOrMoreBlankLines.TryMatch(leadingTriviaToKeep, ref index);
+//
+//			strippedTrivia = new List<SyntaxTrivia>(leadingTriviaToKeep.Take(index));
+//
+//			return node.WithLeadingTrivia(leadingTriviaToKeep.Skip(index));
+//		}
+
+		public static IEnumerable<SyntaxTrivia> GetLeadingBannerAndPreprocessorDirectives<TSyntaxNode>(
+			this TSyntaxNode node)
+			where TSyntaxNode : SyntaxNode
+		{
+			IEnumerable<SyntaxTrivia> leadingTrivia;
+			node.GetNodeWithoutLeadingBannerAndPreprocessorDirectives(out leadingTrivia);
+			return leadingTrivia;
+		}
+
+		public static TSyntaxNode GetNodeWithoutLeadingBannerAndPreprocessorDirectives<TSyntaxNode>(
+			this TSyntaxNode node)
+			where TSyntaxNode : SyntaxNode
+		{
+			IEnumerable<SyntaxTrivia> strippedTrivia;
+			return node.GetNodeWithoutLeadingBannerAndPreprocessorDirectives(out strippedTrivia);
+		}
+
+		public static TSyntaxNode GetNodeWithoutLeadingBannerAndPreprocessorDirectives<TSyntaxNode>(
+			this TSyntaxNode node, out IEnumerable<SyntaxTrivia> strippedTrivia)
+			where TSyntaxNode : SyntaxNode
+		{
+			var leadingTrivia = node.GetLeadingTrivia();
+
+			// Rules for stripping trivia: 
+			// 1) If there is a pp directive, then it (and all preceding trivia) *must* be stripped.
+			//    This rule supersedes all other rules.
+			// 2) If there is a doc comment, it cannot be stripped.  Even if there is a doc comment,
+			//    followed by 5 new lines, then the doc comment still must stay with the node.  This
+			//    rule does *not* supersede rule 1.
+			// 3) Single line comments in a group (i.e. with no blank lines between them) belong to
+			//    the node *iff* there is no blank line between it and the following trivia.
+
+			List<SyntaxTrivia> leadingTriviaToStrip, leadingTriviaToKeep;
+
+			int ppIndex = -1;
+			for (int i = leadingTrivia.Count - 1; i >= 0; i--)
+			{
+				if (SyntaxFacts.IsPreprocessorDirective(leadingTrivia[i].Kind()))
+				{
+					ppIndex = i;
+					break;
+				}
+			}
+
+			if (ppIndex != -1)
+			{
+				// We have a pp directive.  it (and all all previous trivia) must be stripped.
+				leadingTriviaToStrip = new List<SyntaxTrivia>(leadingTrivia.Take(ppIndex + 1));
+				leadingTriviaToKeep = new List<SyntaxTrivia>(leadingTrivia.Skip(ppIndex + 1));
+			}
+			else
+			{
+				leadingTriviaToKeep = new List<SyntaxTrivia>(leadingTrivia);
+				leadingTriviaToStrip = new List<SyntaxTrivia>();
+			}
+
+			// Now, consume as many banners as we can.
+			var index = 0;
+			while (
+				s_oneOrMoreBlankLines.TryMatch(leadingTriviaToKeep, ref index) ||
+				s_bannerMatcher.TryMatch(leadingTriviaToKeep, ref index))
+			{
+			}
+
+			leadingTriviaToStrip.AddRange(leadingTriviaToKeep.Take(index));
+
+			strippedTrivia = leadingTriviaToStrip;
+			return node.WithLeadingTrivia(leadingTriviaToKeep.Skip(index));
+		}
+
+		public static bool IsAnyAssignExpression(this SyntaxNode node)
+		{
+			return SyntaxFacts.IsAssignmentExpression(node.Kind());
+		}
+
+		public static bool IsCompoundAssignExpression(this SyntaxNode node)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.AddAssignmentExpression:
+			case SyntaxKind.SubtractAssignmentExpression:
+			case SyntaxKind.MultiplyAssignmentExpression:
+			case SyntaxKind.DivideAssignmentExpression:
+			case SyntaxKind.ModuloAssignmentExpression:
+			case SyntaxKind.AndAssignmentExpression:
+			case SyntaxKind.ExclusiveOrAssignmentExpression:
+			case SyntaxKind.OrAssignmentExpression:
+			case SyntaxKind.LeftShiftAssignmentExpression:
+			case SyntaxKind.RightShiftAssignmentExpression:
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsLeftSideOfAssignExpression(this SyntaxNode node)
+		{
+			return node.IsParentKind(SyntaxKind.SimpleAssignmentExpression) &&
+				((AssignmentExpressionSyntax)node.Parent).Left == node;
+		}
+
+		public static bool IsLeftSideOfAnyAssignExpression(this SyntaxNode node)
+		{
+			return node.Parent.IsAnyAssignExpression() &&
+				((AssignmentExpressionSyntax)node.Parent).Left == node;
+		}
+
+		public static bool IsRightSideOfAnyAssignExpression(this SyntaxNode node)
+		{
+			return node.Parent.IsAnyAssignExpression() &&
+				((AssignmentExpressionSyntax)node.Parent).Right == node;
+		}
+
+		public static bool IsVariableDeclaratorValue(this SyntaxNode node)
+		{
+			return
+				node.IsParentKind(SyntaxKind.EqualsValueClause) &&
+				node.Parent.IsParentKind(SyntaxKind.VariableDeclarator) &&
+				((EqualsValueClauseSyntax)node.Parent).Value == node;
+		}
+
+		public static BlockSyntax FindInnermostCommonBlock(this IEnumerable<SyntaxNode> nodes)
+		{
+			return nodes.FindInnermostCommonNode<BlockSyntax>();
+		}
+
+		public static IEnumerable<SyntaxNode> GetAncestorsOrThis(this SyntaxNode node, Func<SyntaxNode, bool> predicate)
+		{
+			var current = node;
+			while (current != null)
+			{
+				if (predicate(current))
+				{
+					yield return current;
+				}
+
+				current = current.Parent;
+			}
+		}
+
+		/// <summary>
+		/// Look inside a trivia list for a skipped token that contains the given position.
+		/// </summary>
+		private static readonly Func<SyntaxTriviaList, int, SyntaxToken> s_findSkippedTokenForward =
+			(l, p) => FindTokenHelper.FindSkippedTokenForward(GetSkippedTokens(l), p);
+
+		private static IEnumerable<SyntaxToken> GetSkippedTokens(SyntaxTriviaList list)
+		{
+			return list.Where(trivia => trivia.RawKind == (int)SyntaxKind.SkippedTokensTrivia)
+				.SelectMany(t => ((SkippedTokensTriviaSyntax)t.GetStructure()).Tokens);
+		}
+
+		/// <summary>
+		/// If the position is inside of token, return that token; otherwise, return the token to the right.
+		/// </summary>
+		public static SyntaxToken FindTokenOnRightOfPosition(
+			this SyntaxNode root,
+			int position,
+			bool includeSkipped = true,
+			bool includeDirectives = false,
+			bool includeDocumentationComments = false)
+		{
+			var skippedTokenFinder = includeSkipped ? s_findSkippedTokenForward : (Func<SyntaxTriviaList, int, SyntaxToken>)null;
+
+			return FindTokenHelper.FindTokenOnRightOfPosition<CompilationUnitSyntax>(
+				root, position, skippedTokenFinder, includeSkipped, includeDirectives, includeDocumentationComments);
+		}
+
+//		/// <summary>
+//		/// If the position is inside of token, return that token; otherwise, return the token to the left.
+//		/// </summary>
+//		public static SyntaxToken FindTokenOnLeftOfPosition(
+//			this SyntaxNode root,
+//			int position,
+//			bool includeSkipped = true,
+//			bool includeDirectives = false,
+//			bool includeDocumentationComments = false)
+//		{
+//			var skippedTokenFinder = includeSkipped ? s_findSkippedTokenBackward : (Func<SyntaxTriviaList, int, SyntaxToken>)null;
+//
+//			return FindTokenHelper.FindTokenOnLeftOfPosition<CompilationUnitSyntax>(
+//				root, position, skippedTokenFinder, includeSkipped, includeDirectives, includeDocumentationComments);
+//		}
+
+		/// <summary>
+		/// Returns child node or token that contains given position.
+		/// </summary>
+		/// <remarks>
+		/// This is a copy of <see cref="SyntaxNode.ChildThatContainsPosition"/> that also returns the index of the child node.
+		/// </remarks>
+		internal static SyntaxNodeOrToken ChildThatContainsPosition(this SyntaxNode self, int position, out int childIndex)
+		{
+			var childList = self.ChildNodesAndTokens();
+
+			int left = 0;
+			int right = childList.Count - 1;
+
+			while (left <= right)
+			{
+				int middle = left + ((right - left) / 2);
+				SyntaxNodeOrToken node = childList.ElementAt(middle);
+
+				var span = node.FullSpan;
+				if (position < span.Start)
+				{
+					right = middle - 1;
+				}
+				else if (position >= span.End)
+				{
+					left = middle + 1;
+				}
+				else
+				{
+					childIndex = middle;
+					return node;
+				}
+			}
+
+			// we could check up front that index is within FullSpan,
+			// but we wan to optimize for the common case where position is valid.
+			Debug.Assert(!self.FullSpan.Contains(position), "Position is valid. How could we not find a child?");
+			throw new ArgumentOutOfRangeException("position");
+		}
+
+		public static SyntaxNode GetParent(this SyntaxNode node)
+		{
+			return node != null ? node.Parent : null;
+		}
+
+		public static ValueTuple<SyntaxToken, SyntaxToken> GetBraces(this SyntaxNode node)
+		{
+			var namespaceNode = node as NamespaceDeclarationSyntax;
+			if (namespaceNode != null)
+			{
+				return ValueTuple.Create(namespaceNode.OpenBraceToken, namespaceNode.CloseBraceToken);
+			}
+
+			var baseTypeNode = node as BaseTypeDeclarationSyntax;
+			if (baseTypeNode != null)
+			{
+				return ValueTuple.Create(baseTypeNode.OpenBraceToken, baseTypeNode.CloseBraceToken);
+			}
+
+			var accessorListNode = node as AccessorListSyntax;
+			if (accessorListNode != null)
+			{
+				return ValueTuple.Create(accessorListNode.OpenBraceToken, accessorListNode.CloseBraceToken);
+			}
+
+			var blockNode = node as BlockSyntax;
+			if (blockNode != null)
+			{
+				return ValueTuple.Create(blockNode.OpenBraceToken, blockNode.CloseBraceToken);
+			}
+
+			var switchStatementNode = node as SwitchStatementSyntax;
+			if (switchStatementNode != null)
+			{
+				return ValueTuple.Create(switchStatementNode.OpenBraceToken, switchStatementNode.CloseBraceToken);
+			}
+
+			var anonymousObjectCreationExpression = node as AnonymousObjectCreationExpressionSyntax;
+			if (anonymousObjectCreationExpression != null)
+			{
+				return ValueTuple.Create(anonymousObjectCreationExpression.OpenBraceToken, anonymousObjectCreationExpression.CloseBraceToken);
+			}
+
+			var initializeExpressionNode = node as InitializerExpressionSyntax;
+			if (initializeExpressionNode != null)
+			{
+				return ValueTuple.Create(initializeExpressionNode.OpenBraceToken, initializeExpressionNode.CloseBraceToken);
+			}
+
+			return new ValueTuple<SyntaxToken, SyntaxToken>();
+		}
+
+		public static ValueTuple<SyntaxToken, SyntaxToken> GetParentheses(this SyntaxNode node)
+		{
+			return node.TypeSwitch(
+				(ParenthesizedExpressionSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(MakeRefExpressionSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(RefTypeExpressionSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(RefValueExpressionSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(CheckedExpressionSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(DefaultExpressionSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(TypeOfExpressionSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(SizeOfExpressionSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(ArgumentListSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(CastExpressionSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(WhileStatementSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(DoStatementSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(ForStatementSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(ForEachStatementSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(UsingStatementSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(FixedStatementSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(LockStatementSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(IfStatementSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(SwitchStatementSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(CatchDeclarationSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(AttributeArgumentListSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(ConstructorConstraintSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(ParameterListSyntax n) => ValueTuple.Create(n.OpenParenToken, n.CloseParenToken),
+				(SyntaxNode n) => default(ValueTuple<SyntaxToken, SyntaxToken>));
+		}
+
+		public static ValueTuple<SyntaxToken, SyntaxToken> GetBrackets(this SyntaxNode node)
+		{
+			return node.TypeSwitch(
+				(ArrayRankSpecifierSyntax n) => ValueTuple.Create(n.OpenBracketToken, n.CloseBracketToken),
+				(BracketedArgumentListSyntax n) => ValueTuple.Create(n.OpenBracketToken, n.CloseBracketToken),
+				(ImplicitArrayCreationExpressionSyntax n) => ValueTuple.Create(n.OpenBracketToken, n.CloseBracketToken),
+				(AttributeListSyntax n) => ValueTuple.Create(n.OpenBracketToken, n.CloseBracketToken),
+				(BracketedParameterListSyntax n) => ValueTuple.Create(n.OpenBracketToken, n.CloseBracketToken),
+				(SyntaxNode n) => default(ValueTuple<SyntaxToken, SyntaxToken>));
+		}
+
+		public static bool IsEmbeddedStatementOwner(this SyntaxNode node)
+		{
+			return node is IfStatementSyntax ||
+				node is ElseClauseSyntax ||
+				node is WhileStatementSyntax ||
+				node is ForStatementSyntax ||
+				node is ForEachStatementSyntax ||
+				node is UsingStatementSyntax ||
+				node is DoStatementSyntax;
+		}
+
+		public static StatementSyntax GetEmbeddedStatement(this SyntaxNode node)
+		{
+			return node.TypeSwitch(
+				(IfStatementSyntax n) => n.Statement,
+				(ElseClauseSyntax n) => n.Statement,
+				(WhileStatementSyntax n) => n.Statement,
+				(ForStatementSyntax n) => n.Statement,
+				(ForEachStatementSyntax n) => n.Statement,
+				(UsingStatementSyntax n) => n.Statement,
+				(DoStatementSyntax n) => n.Statement,
+				(SyntaxNode n) => null);
+		}
+
+		public static SyntaxTokenList GetModifiers(this SyntaxNode member)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.EnumDeclaration:
+					return ((EnumDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.ClassDeclaration:
+				case SyntaxKind.InterfaceDeclaration:
+				case SyntaxKind.StructDeclaration:
+					return ((TypeDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.FieldDeclaration:
+					return ((FieldDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.EventFieldDeclaration:
+					return ((EventFieldDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.ConstructorDeclaration:
+					return ((ConstructorDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.DestructorDeclaration:
+					return ((DestructorDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.PropertyDeclaration:
+					return ((PropertyDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.EventDeclaration:
+					return ((EventDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.IndexerDeclaration:
+					return ((IndexerDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.OperatorDeclaration:
+					return ((OperatorDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.ConversionOperatorDeclaration:
+					return ((ConversionOperatorDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).Modifiers;
+				case SyntaxKind.GetAccessorDeclaration:
+				case SyntaxKind.SetAccessorDeclaration:
+				case SyntaxKind.AddAccessorDeclaration:
+				case SyntaxKind.RemoveAccessorDeclaration:
+					return ((AccessorDeclarationSyntax)member).Modifiers;
+				}
+			}
+
+			return default(SyntaxTokenList);
+		}
+
+		public static SyntaxNode WithModifiers(this SyntaxNode member, SyntaxTokenList modifiers)
+		{
+			if (member != null)
+			{
+				switch (member.Kind())
+				{
+				case SyntaxKind.EnumDeclaration:
+					return ((EnumDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.ClassDeclaration:
+				case SyntaxKind.InterfaceDeclaration:
+				case SyntaxKind.StructDeclaration:
+					return ((TypeDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.DelegateDeclaration:
+					return ((DelegateDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.FieldDeclaration:
+					return ((FieldDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.EventFieldDeclaration:
+					return ((EventFieldDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.ConstructorDeclaration:
+					return ((ConstructorDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.DestructorDeclaration:
+					return ((DestructorDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.PropertyDeclaration:
+					return ((PropertyDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.EventDeclaration:
+					return ((EventDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.IndexerDeclaration:
+					return ((IndexerDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.OperatorDeclaration:
+					return ((OperatorDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.ConversionOperatorDeclaration:
+					return ((ConversionOperatorDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.MethodDeclaration:
+					return ((MethodDeclarationSyntax)member).WithModifiers(modifiers);
+				case SyntaxKind.GetAccessorDeclaration:
+				case SyntaxKind.SetAccessorDeclaration:
+				case SyntaxKind.AddAccessorDeclaration:
+				case SyntaxKind.RemoveAccessorDeclaration:
+					return ((AccessorDeclarationSyntax)member).WithModifiers(modifiers);
+				}
+			}
+
+			return null;
+		}
+
+		public static bool CheckTopLevel(this SyntaxNode node, TextSpan span)
+		{
+			var block = node as BlockSyntax;
+			if (block != null)
+			{
+				return block.ContainsInBlockBody(span);
+			}
+
+			var field = node as FieldDeclarationSyntax;
+			if (field != null)
+			{
+				foreach (var variable in field.Declaration.Variables)
+				{
+					if (variable.Initializer != null && variable.Initializer.Span.Contains(span))
+					{
+						return true;
+					}
+				}
+			}
+
+			var global = node as GlobalStatementSyntax;
+			if (global != null)
+			{
+				return true;
+			}
+
+			var constructorInitializer = node as ConstructorInitializerSyntax;
+			if (constructorInitializer != null)
+			{
+				return constructorInitializer.ContainsInArgument(span);
+			}
+
+			return false;
+		}
+
+		public static bool ContainsInArgument(this ConstructorInitializerSyntax initializer, TextSpan textSpan)
+		{
+			if (initializer == null)
+			{
+				return false;
+			}
+
+			return initializer.ArgumentList.Arguments.Any(a => a.Span.Contains(textSpan));
+		}
+
+		public static bool ContainsInBlockBody(this BlockSyntax block, TextSpan textSpan)
+		{
+			if (block == null)
+			{
+				return false;
+			}
+
+			var blockSpan = TextSpan.FromBounds(block.OpenBraceToken.Span.End, block.CloseBraceToken.SpanStart);
+			return blockSpan.Contains(textSpan);
+		}
+
+		public static IEnumerable<MemberDeclarationSyntax> GetMembers(this SyntaxNode node)
+		{
+			var compilation = node as CompilationUnitSyntax;
+			if (compilation != null)
+			{
+				return compilation.Members;
+			}
+
+			var @namespace = node as NamespaceDeclarationSyntax;
+			if (@namespace != null)
+			{
+				return @namespace.Members;
+			}
+
+			var type = node as TypeDeclarationSyntax;
+			if (type != null)
+			{
+				return type.Members;
+			}
+
+			var @enum = node as EnumDeclarationSyntax;
+			if (@enum != null)
+			{
+				return @enum.Members;
+			}
+
+			return SpecializedCollections.EmptyEnumerable<MemberDeclarationSyntax>();
+		}
+
+		public static IEnumerable<SyntaxNode> GetBodies(this SyntaxNode node)
+		{
+			var constructor = node as ConstructorDeclarationSyntax;
+			if (constructor != null)
+			{
+				var result = SpecializedCollections.SingletonEnumerable<SyntaxNode>(constructor.Body).WhereNotNull();
+				var initializer = constructor.Initializer;
+				if (initializer != null)
+				{
+					result = result.Concat(initializer.ArgumentList.Arguments.Select(a => (SyntaxNode)a.Expression).WhereNotNull());
+				}
+
+				return result;
+			}
+
+			var method = node as BaseMethodDeclarationSyntax;
+			if (method != null)
+			{
+				return SpecializedCollections.SingletonEnumerable<SyntaxNode>(method.Body).WhereNotNull();
+			}
+
+			var property = node as BasePropertyDeclarationSyntax;
+			if (property != null)
+			{
+				return property.AccessorList.Accessors.Select(a => a.Body).WhereNotNull();
+			}
+
+			var @enum = node as EnumMemberDeclarationSyntax;
+			if (@enum != null)
+			{
+				if (@enum.EqualsValue != null)
+				{
+					return SpecializedCollections.SingletonEnumerable(@enum.EqualsValue.Value).WhereNotNull();
+				}
+			}
+
+			var field = node as BaseFieldDeclarationSyntax;
+			if (field != null)
+			{
+				return field.Declaration.Variables.Where(v => v.Initializer != null).Select(v => v.Initializer.Value).WhereNotNull();
+			}
+
+			return SpecializedCollections.EmptyEnumerable<SyntaxNode>();
+		}
+
+		public static ConditionalAccessExpressionSyntax GetParentConditionalAccessExpression(this SyntaxNode node)
+		{
+			var parent = node.Parent;
+			while (parent != null)
+			{
+				// Because the syntax for conditional access is right associate, we cannot
+				// simply take the first ancestor ConditionalAccessExpression. Instead, we 
+				// must walk upward until we find the ConditionalAccessExpression whose
+				// OperatorToken appears left of the MemberBinding.
+				if (parent.IsKind(SyntaxKind.ConditionalAccessExpression) &&
+					((ConditionalAccessExpressionSyntax)parent).OperatorToken.Span.End <= node.SpanStart)
+				{
+					return (ConditionalAccessExpressionSyntax)parent;
+				}
+
+				parent = parent.Parent;
+			}
+
+			return null;
+		}
+
+		public static bool IsDelegateOrConstructorOrMethodParameterList(this SyntaxNode node)
+		{
+			if (!node.IsKind(SyntaxKind.ParameterList))
+			{
+				return false;
+			}
+
+			return
+				node.IsParentKind(SyntaxKind.MethodDeclaration) ||
+				node.IsParentKind(SyntaxKind.ConstructorDeclaration) ||
+				node.IsParentKind(SyntaxKind.DelegateDeclaration);
+		}
+
+		public static ConditionalAccessExpressionSyntax GetInnerMostConditionalAccessExpression(this SyntaxNode node)
+		{
+			if (!(node is ConditionalAccessExpressionSyntax))
+			{
+				return null;
+			}
+
+			var result = (ConditionalAccessExpressionSyntax)node;
+			while (result.WhenNotNull is ConditionalAccessExpressionSyntax)
+			{
+				result = (ConditionalAccessExpressionSyntax)result.WhenNotNull;
+			}
+
+			return result;
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SyntaxTokenExtensions.cs b/main/src/addins/CSharpBinding/Util/SyntaxTokenExtensions.cs
new file mode 100644
index 0000000000..ad7e7ac08e
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntaxTokenExtensions.cs
@@ -0,0 +1,1111 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.Text;
+using System.Threading;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SyntaxTokenExtensions
+	{
+		public static SyntaxNode GetAncestor(this SyntaxToken token, Func<SyntaxNode, bool> predicate)
+		{
+			return token.GetAncestor<SyntaxNode>(predicate);
+		}
+
+		public static T GetAncestor<T>(this SyntaxToken token, Func<T, bool> predicate = null)
+			where T : SyntaxNode
+		{
+			return token.Parent != null
+				? token.Parent.FirstAncestorOrSelf(predicate)
+					: default(T);
+		}
+
+		public static IEnumerable<T> GetAncestors<T>(this SyntaxToken token)
+			where T : SyntaxNode
+		{
+			return token.Parent != null
+				? token.Parent.AncestorsAndSelf ().OfType<T> ()
+					: Enumerable.Empty<T> ();
+		}
+
+		public static IEnumerable<SyntaxNode> GetAncestors(this SyntaxToken token, Func<SyntaxNode, bool> predicate)
+		{
+			return token.Parent != null
+				? token.Parent.AncestorsAndSelf().Where(predicate)
+					: Enumerable.Empty<SyntaxNode>();
+		}
+
+		public static SyntaxNode GetCommonRoot(this SyntaxToken token1, SyntaxToken token2)
+		{
+			// Contract.ThrowIfTrue(token1.RawKind == 0 || token2.RawKind == 0);
+
+			// find common starting node from two tokens.
+			// as long as two tokens belong to same tree, there must be at least on common root (Ex, compilation unit)
+			if (token1.Parent == null || token2.Parent == null)
+			{
+				return null;
+			}
+
+			return token1.Parent.GetCommonRoot(token2.Parent);
+		}
+
+		public static bool CheckParent<T>(this SyntaxToken token, Func<T, bool> valueChecker) where T : SyntaxNode
+		{
+			var parentNode = token.Parent as T;
+			if (parentNode == null)
+			{
+				return false;
+			}
+
+			return valueChecker(parentNode);
+		}
+
+		public static int Width(this SyntaxToken token)
+		{
+			return token.Span.Length;
+		}
+
+		public static int FullWidth(this SyntaxToken token)
+		{
+			return token.FullSpan.Length;
+		}
+
+		public static SyntaxToken FindTokenFromEnd(this SyntaxNode root, int position, bool includeZeroWidth = true, bool findInsideTrivia = false)
+		{
+			var token = root.FindToken(position, findInsideTrivia);
+			var previousToken = token.GetPreviousToken(
+				includeZeroWidth, findInsideTrivia, findInsideTrivia, findInsideTrivia);
+
+			if (token.SpanStart == position &&
+				previousToken.RawKind != 0 &&
+				previousToken.Span.End == position)
+			{
+				return previousToken;
+			}
+
+			return token;
+		}
+
+		public static bool IsUsingOrExternKeyword(this SyntaxToken token)
+		{
+			return
+				token.Kind() == SyntaxKind.UsingKeyword ||
+				token.Kind() == SyntaxKind.ExternKeyword;
+		}
+
+		public static bool IsUsingKeywordInUsingDirective(this SyntaxToken token)
+		{
+			if (token.IsKind(SyntaxKind.UsingKeyword))
+			{
+				var usingDirective = token.GetAncestor<UsingDirectiveSyntax>();
+				if (usingDirective != null &&
+					usingDirective.UsingKeyword == token)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsStaticKeywordInUsingDirective(this SyntaxToken token)
+		{
+			if (token.IsKind(SyntaxKind.StaticKeyword))
+			{
+				var usingDirective = token.GetAncestor<UsingDirectiveSyntax>();
+				if (usingDirective != null &&
+					usingDirective.StaticKeyword == token)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsBeginningOfStatementContext(this SyntaxToken token)
+		{
+			// cases:
+			//    {
+			//      |
+
+			// }
+			// |
+
+			// Note, the following is *not* a legal statement context: 
+			//    do { } |
+
+			// ...;
+			// |
+
+			// case 0:
+			//   |
+
+			// default:
+			//   |
+
+			// label:
+			//   |
+
+			// if (foo)
+			//   |
+
+			// while (true)
+			//   |
+
+			// do
+			//   |
+
+			// for (;;)
+			//   |
+
+			// foreach (var v in c)
+			//   |
+
+			// else
+			//   |
+
+			// using (expr)
+			//   |
+
+			// lock (expr)
+			//   |
+
+			// for ( ; ; Foo(), |
+
+			if (token.Kind() == SyntaxKind.OpenBraceToken &&
+				token.Parent.IsKind(SyntaxKind.Block))
+			{
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.SemicolonToken)
+			{
+				var statement = token.GetAncestor<StatementSyntax>();
+				if (statement != null && !statement.IsParentKind(SyntaxKind.GlobalStatement) &&
+					statement.GetLastToken(includeZeroWidth: true) == token)
+				{
+					return true;
+				}
+			}
+
+			if (token.Kind() == SyntaxKind.CloseBraceToken &&
+				token.Parent.IsKind(SyntaxKind.Block))
+			{
+				if (token.Parent.Parent is StatementSyntax)
+				{
+					// Most blocks that are the child of statement are places
+					// that we can follow with another statement.  i.e.:
+					// if { }
+					// while () { }
+					// There are two exceptions.
+					// try {}
+					// do {}
+					if (!token.Parent.IsParentKind(SyntaxKind.TryStatement) &&
+						!token.Parent.IsParentKind(SyntaxKind.DoStatement))
+					{
+						return true;
+					}
+				}
+				else if (
+					token.Parent.IsParentKind(SyntaxKind.ElseClause) ||
+					token.Parent.IsParentKind(SyntaxKind.FinallyClause) ||
+					token.Parent.IsParentKind(SyntaxKind.CatchClause) ||
+					token.Parent.IsParentKind(SyntaxKind.SwitchSection))
+				{
+					return true;
+				}
+			}
+
+			if (token.Kind() == SyntaxKind.CloseBraceToken &&
+				token.Parent.IsKind(SyntaxKind.SwitchStatement))
+			{
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.ColonToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.CaseSwitchLabel, SyntaxKind.DefaultSwitchLabel, SyntaxKind.LabeledStatement))
+				{
+					return true;
+				}
+			}
+
+			if (token.Kind() == SyntaxKind.DoKeyword &&
+				token.Parent.IsKind(SyntaxKind.DoStatement))
+			{
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.CloseParenToken)
+			{
+				var parent = token.Parent;
+				if (parent.IsKind(SyntaxKind.ForStatement) ||
+					parent.IsKind(SyntaxKind.ForEachStatement) ||
+					parent.IsKind(SyntaxKind.WhileStatement) ||
+					parent.IsKind(SyntaxKind.IfStatement) ||
+					parent.IsKind(SyntaxKind.LockStatement) ||
+					parent.IsKind(SyntaxKind.UsingStatement))
+				{
+					return true;
+				}
+			}
+
+			if (token.Kind() == SyntaxKind.ElseKeyword)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsBeginningOfGlobalStatementContext(this SyntaxToken token)
+		{
+			// cases:
+			// }
+			// |
+
+			// ...;
+			// |
+
+			// extern alias Foo;
+			// using System;
+			// |
+
+			// [assembly: Foo]
+			// |
+
+			if (token.Kind() == SyntaxKind.CloseBraceToken)
+			{
+				var memberDeclaration = token.GetAncestor<MemberDeclarationSyntax>();
+				if (memberDeclaration != null && memberDeclaration.GetLastToken(includeZeroWidth: true) == token &&
+					memberDeclaration.IsParentKind(SyntaxKind.CompilationUnit))
+				{
+					return true;
+				}
+			}
+
+			if (token.Kind() == SyntaxKind.SemicolonToken)
+			{
+				var globalStatement = token.GetAncestor<GlobalStatementSyntax>();
+				if (globalStatement != null && globalStatement.GetLastToken(includeZeroWidth: true) == token)
+				{
+					return true;
+				}
+
+				var memberDeclaration = token.GetAncestor<MemberDeclarationSyntax>();
+				if (memberDeclaration != null && memberDeclaration.GetLastToken(includeZeroWidth: true) == token &&
+					memberDeclaration.IsParentKind(SyntaxKind.CompilationUnit))
+				{
+					return true;
+				}
+
+				var compUnit = token.GetAncestor<CompilationUnitSyntax>();
+				if (compUnit != null)
+				{
+					if (compUnit.Usings.Count > 0 && compUnit.Usings.Last().GetLastToken(includeZeroWidth: true) == token)
+					{
+						return true;
+					}
+
+					if (compUnit.Externs.Count > 0 && compUnit.Externs.Last().GetLastToken(includeZeroWidth: true) == token)
+					{
+						return true;
+					}
+				}
+			}
+
+			if (token.Kind() == SyntaxKind.CloseBracketToken)
+			{
+				var compUnit = token.GetAncestor<CompilationUnitSyntax>();
+				if (compUnit != null)
+				{
+					if (compUnit.AttributeLists.Count > 0 && compUnit.AttributeLists.Last().GetLastToken(includeZeroWidth: true) == token)
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsAfterPossibleCast(this SyntaxToken token)
+		{
+			if (token.Kind() == SyntaxKind.CloseParenToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.CastExpression))
+				{
+					return true;
+				}
+
+				if (token.Parent.IsKind(SyntaxKind.ParenthesizedExpression))
+				{
+					var parenExpr = token.Parent as ParenthesizedExpressionSyntax;
+					var expr = parenExpr.Expression;
+
+					if (expr is TypeSyntax)
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsLastTokenOfNode<T>(this SyntaxToken token)
+			where T : SyntaxNode
+		{
+			var node = token.GetAncestor<T>();
+			return node != null && token == node.GetLastToken(includeZeroWidth: true);
+		}
+
+		public static bool IsLastTokenOfQueryClause(this SyntaxToken token)
+		{
+			if (token.IsLastTokenOfNode<QueryClauseSyntax>())
+			{
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.IdentifierToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.IntoKeyword)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsPreProcessorExpressionContext(this SyntaxToken targetToken)
+		{
+			// cases:
+			//   #if |
+			//   #if foo || |
+			//   #if foo && |
+			//   #if ( |
+			//   #if ! |
+			// Same for elif
+
+			if (targetToken.GetAncestor<ConditionalDirectiveTriviaSyntax>() == null)
+			{
+				return false;
+			}
+
+			// #if
+			// #elif
+			if (targetToken.Kind() == SyntaxKind.IfKeyword ||
+				targetToken.Kind() == SyntaxKind.ElifKeyword)
+			{
+				return true;
+			}
+
+			// ( |
+			if (targetToken.Kind() == SyntaxKind.OpenParenToken &&
+				targetToken.Parent.IsKind(SyntaxKind.ParenthesizedExpression))
+			{
+				return true;
+			}
+
+			// ! |
+			if (targetToken.Parent is PrefixUnaryExpressionSyntax)
+			{
+				var prefix = targetToken.Parent as PrefixUnaryExpressionSyntax;
+				return prefix.OperatorToken == targetToken;
+			}
+
+			// a &&
+			// a ||
+			if (targetToken.Parent is BinaryExpressionSyntax)
+			{
+				var binary = targetToken.Parent as BinaryExpressionSyntax;
+				return binary.OperatorToken == targetToken;
+			}
+
+			return false;
+		}
+
+		public static bool IsOrderByDirectionContext(this SyntaxToken targetToken)
+		{
+			// cases:
+			//   orderby a |
+			//   orderby a a|
+			//   orderby a, b |
+			//   orderby a, b a|
+
+			if (!targetToken.IsKind(SyntaxKind.IdentifierToken, SyntaxKind.CloseParenToken, SyntaxKind.CloseBracketToken))
+			{
+				return false;
+			}
+
+			var ordering = targetToken.GetAncestor<OrderingSyntax>();
+			if (ordering == null)
+			{
+				return false;
+			}
+
+			// orderby a |
+			// orderby a, b |
+			var lastToken = ordering.Expression.GetLastToken(includeSkipped: true);
+
+			if (targetToken == lastToken)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsSwitchLabelContext(this SyntaxToken targetToken)
+		{
+			// cases:
+			//   case X: |
+			//   default: |
+			//   switch (e) { |
+			//
+			//   case X: Statement(); |
+
+			if (targetToken.Kind() == SyntaxKind.OpenBraceToken &&
+				targetToken.Parent.IsKind(SyntaxKind.SwitchStatement))
+			{
+				return true;
+			}
+
+			if (targetToken.Kind() == SyntaxKind.ColonToken)
+			{
+				if (targetToken.Parent.IsKind(SyntaxKind.CaseSwitchLabel, SyntaxKind.DefaultSwitchLabel))
+				{
+					return true;
+				}
+			}
+
+			if (targetToken.Kind() == SyntaxKind.SemicolonToken ||
+				targetToken.Kind() == SyntaxKind.CloseBraceToken)
+			{
+				var section = targetToken.GetAncestor<SwitchSectionSyntax>();
+				if (section != null)
+				{
+					foreach (var statement in section.Statements)
+					{
+						if (targetToken == statement.GetLastToken(includeSkipped: true))
+						{
+							return true;
+						}
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsXmlCrefParameterModifierContext(this SyntaxToken targetToken)
+		{
+			return targetToken.IsKind(SyntaxKind.CommaToken, SyntaxKind.OpenParenToken)
+				&& targetToken.Parent.IsKind(SyntaxKind.CrefBracketedParameterList, SyntaxKind.CrefParameterList);
+		}
+
+		public static bool IsConstructorOrMethodParameterArgumentContext(this SyntaxToken targetToken)
+		{
+			// cases:
+			//   Foo( |
+			//   Foo(expr, |
+			//   Foo(bar: |
+			//   new Foo( |
+			//   new Foo(expr, |
+			//   new Foo(bar: |
+			//   Foo : base( |
+			//   Foo : base(bar: |
+			//   Foo : this( |
+			//   Foo : ths(bar: |
+
+			// Foo(bar: |
+			if (targetToken.Kind() == SyntaxKind.ColonToken &&
+				targetToken.Parent.IsKind(SyntaxKind.NameColon) &&
+				targetToken.Parent.IsParentKind(SyntaxKind.Argument) &&
+				targetToken.Parent.GetParent().IsParentKind(SyntaxKind.ArgumentList))
+			{
+				var owner = targetToken.Parent.GetParent().GetParent().GetParent();
+				if (owner.IsKind(SyntaxKind.InvocationExpression) ||
+					owner.IsKind(SyntaxKind.ObjectCreationExpression) ||
+					owner.IsKind(SyntaxKind.BaseConstructorInitializer) ||
+					owner.IsKind(SyntaxKind.ThisConstructorInitializer))
+				{
+					return true;
+				}
+			}
+
+			if (targetToken.Kind() == SyntaxKind.OpenParenToken ||
+				targetToken.Kind() == SyntaxKind.CommaToken)
+			{
+				if (targetToken.Parent.IsKind(SyntaxKind.ArgumentList))
+				{
+					if (targetToken.Parent.IsParentKind(SyntaxKind.InvocationExpression) ||
+						targetToken.Parent.IsParentKind(SyntaxKind.ObjectCreationExpression) ||
+						targetToken.Parent.IsParentKind(SyntaxKind.BaseConstructorInitializer) ||
+						targetToken.Parent.IsParentKind(SyntaxKind.ThisConstructorInitializer))
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsUnaryOperatorContext(this SyntaxToken targetToken)
+		{
+			if (targetToken.Kind() == SyntaxKind.OperatorKeyword &&
+				targetToken.GetPreviousToken(includeSkipped: true).IsLastTokenOfNode<TypeSyntax>())
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsUnsafeContext(this SyntaxToken targetToken)
+		{
+			return
+				targetToken.GetAncestors<StatementSyntax>().Any(s => s.IsKind(SyntaxKind.UnsafeStatement)) ||
+				targetToken.GetAncestors<MemberDeclarationSyntax>().Any(m => m.GetModifiers().Any(SyntaxKind.UnsafeKeyword));
+		}
+
+		public static bool IsAfterYieldKeyword(this SyntaxToken targetToken)
+		{
+			// yield |
+			// yield r|
+
+			if (targetToken.IsKindOrHasMatchingText(SyntaxKind.YieldKeyword))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsAccessorDeclarationContext<TMemberNode>(this SyntaxToken targetToken, int position, SyntaxKind kind = SyntaxKind.None)
+			where TMemberNode : SyntaxNode
+		{
+			if (!IsAccessorDeclarationContextWorker(targetToken))
+			{
+				return false;
+			}
+
+			var list = targetToken.GetAncestor<AccessorListSyntax>();
+			if (list == null)
+			{
+				return false;
+			}
+
+			// Check if we already have this accessor.  (however, don't count it
+			// if the user is *on* that accessor.
+			var existingAccessor = list.Accessors
+				.Select(a => a.Keyword)
+				.FirstOrDefault(a => !a.IsMissing && a.IsKindOrHasMatchingText(kind));
+
+			if (existingAccessor.Kind() != SyntaxKind.None)
+			{
+				var existingAccessorSpan = existingAccessor.Span;
+				if (!existingAccessorSpan.IntersectsWith(position))
+				{
+					return false;
+				}
+			}
+
+			var decl = targetToken.GetAncestor<TMemberNode>();
+			return decl != null;
+		}
+
+		private static bool IsAccessorDeclarationContextWorker(SyntaxToken targetToken)
+		{
+			// cases:
+			//   int Foo { |
+			//   int Foo { private |
+			//   int Foo { set { } |
+			//   int Foo { set; |
+			//   int Foo { [Bar]|
+
+			// Consume all preceding access modifiers
+			while (targetToken.Kind() == SyntaxKind.InternalKeyword ||
+				targetToken.Kind() == SyntaxKind.PublicKeyword ||
+				targetToken.Kind() == SyntaxKind.ProtectedKeyword ||
+				targetToken.Kind() == SyntaxKind.PrivateKeyword)
+			{
+				targetToken = targetToken.GetPreviousToken(includeSkipped: true);
+			}
+
+			// int Foo { |
+			// int Foo { private |
+			if (targetToken.Kind() == SyntaxKind.OpenBraceToken &&
+				targetToken.Parent.IsKind(SyntaxKind.AccessorList))
+			{
+				return true;
+			}
+
+			// int Foo { set { } |
+			// int Foo { set { } private |
+			if (targetToken.Kind() == SyntaxKind.CloseBraceToken &&
+				targetToken.Parent.IsKind(SyntaxKind.Block) &&
+				targetToken.Parent.GetParent() is AccessorDeclarationSyntax)
+			{
+				return true;
+			}
+
+			// int Foo { set; |
+			if (targetToken.Kind() == SyntaxKind.SemicolonToken &&
+				targetToken.Parent is AccessorDeclarationSyntax)
+			{
+				return true;
+			}
+
+			// int Foo { [Bar]|
+			if (targetToken.Kind() == SyntaxKind.CloseBracketToken &&
+				targetToken.Parent.IsKind(SyntaxKind.AttributeList) &&
+				targetToken.Parent.GetParent() is AccessorDeclarationSyntax)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		private static bool IsGenericInterfaceOrDelegateTypeParameterList(SyntaxNode node)
+		{
+			if (node.IsKind(SyntaxKind.TypeParameterList))
+			{
+				if (node.IsParentKind(SyntaxKind.InterfaceDeclaration))
+				{
+					var decl = node.Parent as TypeDeclarationSyntax;
+					return decl.TypeParameterList == node;
+				}
+				else if (node.IsParentKind(SyntaxKind.DelegateDeclaration))
+				{
+					var decl = node.Parent as DelegateDeclarationSyntax;
+					return decl.TypeParameterList == node;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsTypeParameterVarianceContext(this SyntaxToken targetToken)
+		{
+			// cases:
+			// interface IFoo<|
+			// interface IFoo<A,|
+			// interface IFoo<[Bar]|
+
+			// deletate X D<|
+			// deletate X D<A,|
+			// deletate X D<[Bar]|
+			if (targetToken.Kind() == SyntaxKind.LessThanToken &&
+				IsGenericInterfaceOrDelegateTypeParameterList(targetToken.Parent))
+			{
+				return true;
+			}
+
+			if (targetToken.Kind() == SyntaxKind.CommaToken &&
+				IsGenericInterfaceOrDelegateTypeParameterList(targetToken.Parent))
+			{
+				return true;
+			}
+
+			if (targetToken.Kind() == SyntaxKind.CloseBracketToken &&
+				targetToken.Parent.IsKind(SyntaxKind.AttributeList) &&
+				targetToken.Parent.IsParentKind(SyntaxKind.TypeParameter) &&
+				IsGenericInterfaceOrDelegateTypeParameterList(targetToken.Parent.GetParent().GetParent()))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsMandatoryNamedParameterPosition(this SyntaxToken token)
+		{
+			if (token.Kind() == SyntaxKind.CommaToken && token.Parent is BaseArgumentListSyntax)
+			{
+				var argumentList = (BaseArgumentListSyntax)token.Parent;
+
+				foreach (var item in argumentList.Arguments.GetWithSeparators())
+				{
+					if (item.IsToken && item.AsToken() == token)
+					{
+						return false;
+					}
+
+					if (item.IsNode)
+					{
+						var node = item.AsNode() as ArgumentSyntax;
+						if (node != null && node.NameColon != null)
+						{
+							return true;
+						}
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsKindOrHasMatchingText(this SyntaxToken token, SyntaxKind kind)
+		{
+			return token.Kind() == kind || token.HasMatchingText(kind);
+		}
+
+		public static bool HasMatchingText(this SyntaxToken token, SyntaxKind kind)
+		{
+			return token.ToString() == SyntaxFacts.GetText(kind);
+		}
+
+		public static bool IsKind(this SyntaxToken token, SyntaxKind kind1, SyntaxKind kind2)
+		{
+			return token.Kind() == kind1
+				|| token.Kind() == kind2;
+		}
+
+		public static bool IsKind(this SyntaxToken token, SyntaxKind kind1, SyntaxKind kind2, SyntaxKind kind3)
+		{
+			return token.Kind() == kind1
+				|| token.Kind() == kind2
+				|| token.Kind() == kind3;
+		}
+
+		public static bool IsKind(this SyntaxToken token, params SyntaxKind[] kinds)
+		{
+			return kinds.Contains(token.Kind());
+		}
+
+		public static bool IsKind(this SyntaxToken token, SyntaxKind kind)
+		{
+			return token.Kind() == kind;
+		}
+
+		public static bool IsLiteral(this SyntaxToken token)
+		{
+			switch (token.Kind())
+			{
+			case SyntaxKind.CharacterLiteralToken:
+			case SyntaxKind.FalseKeyword:
+			case SyntaxKind.NumericLiteralToken:
+			case SyntaxKind.StringLiteralToken:
+			case SyntaxKind.TrueKeyword:
+				return true;
+
+			default:
+				return false;
+			}
+		}
+
+		public static bool IntersectsWith(this SyntaxToken token, int position)
+		{
+			return token.Span.IntersectsWith(position);
+		}
+
+		public static SyntaxToken GetPreviousTokenIfTouchingWord(this SyntaxToken token, int position)
+		{
+			return token.IntersectsWith(position) && IsWord(token)
+				? token.GetPreviousToken(includeSkipped: true)
+					: token;
+		}
+
+		public static bool IsWord(this SyntaxToken token)
+		{
+			return token.IsKind(SyntaxKind.IdentifierToken)
+				|| SyntaxFacts.IsKeywordKind(token.Kind())
+				|| SyntaxFacts.IsContextualKeyword(token.Kind())
+				|| SyntaxFacts.IsPreprocessorKeyword(token.Kind());
+		}
+
+		public static SyntaxToken GetNextNonZeroWidthTokenOrEndOfFile(this SyntaxToken token)
+		{
+			return token.GetNextTokenOrEndOfFile();
+		}
+
+		public static SyntaxToken GetNextTokenOrEndOfFile(
+			this SyntaxToken token,
+			bool includeZeroWidth = false,
+			bool includeSkipped = false,
+			bool includeDirectives = false,
+			bool includeDocumentationComments = false)
+		{
+			var nextToken = token.GetNextToken(includeZeroWidth, includeSkipped, includeDirectives, includeDocumentationComments);
+
+			return nextToken.Kind() == SyntaxKind.None
+				? token.GetAncestor<CompilationUnitSyntax>().EndOfFileToken
+					: nextToken;
+		}
+
+		public static SyntaxToken With(this SyntaxToken token, SyntaxTriviaList leading, SyntaxTriviaList trailing)
+		{
+			return token.WithLeadingTrivia(leading).WithTrailingTrivia(trailing);
+		}
+
+		/// <summary>
+		/// Determines whether the given SyntaxToken is the first token on a line in the specified SourceText.
+		/// </summary>
+		public static bool IsFirstTokenOnLine(this SyntaxToken token, SourceText text)
+		{
+			var previousToken = token.GetPreviousToken(includeSkipped: true, includeDirectives: true, includeDocumentationComments: true);
+			if (previousToken.Kind() == SyntaxKind.None)
+			{
+				return true;
+			}
+
+			var tokenLine = text.Lines.IndexOf(token.SpanStart);
+			var previousTokenLine = text.Lines.IndexOf(previousToken.SpanStart);
+			return tokenLine > previousTokenLine;
+		}
+
+		public static bool SpansPreprocessorDirective(this IEnumerable<SyntaxToken> tokens)
+		{
+			// we want to check all leading trivia of all tokens (except the 
+			// first one), and all trailing trivia of all tokens (except the
+			// last one).
+
+			var first = true;
+			var previousToken = default(SyntaxToken);
+
+			foreach (var token in tokens)
+			{
+				if (first)
+				{
+					first = false;
+				}
+				else
+				{
+					// check the leading trivia of this token, and the trailing trivia
+					// of the previous token.
+					if (SpansPreprocessorDirective(token.LeadingTrivia) ||
+						SpansPreprocessorDirective(previousToken.TrailingTrivia))
+					{
+						return true;
+					}
+				}
+
+				previousToken = token;
+			}
+
+			return false;
+		}
+
+		private static bool SpansPreprocessorDirective(SyntaxTriviaList list)
+		{
+			return list.Any(t => t.GetStructure() is DirectiveTriviaSyntax);
+		}
+
+		public static SyntaxToken WithoutTrivia(
+			this SyntaxToken token,
+			params SyntaxTrivia[] trivia)
+		{
+			if (!token.LeadingTrivia.Any() && !token.TrailingTrivia.Any())
+			{
+				return token;
+			}
+
+			return token.With(new SyntaxTriviaList(), new SyntaxTriviaList());
+		}
+
+		public static SyntaxToken WithPrependedLeadingTrivia(
+			this SyntaxToken token,
+			params SyntaxTrivia[] trivia)
+		{
+			if (trivia.Length == 0)
+			{
+				return token;
+			}
+
+			return token.WithPrependedLeadingTrivia((IEnumerable<SyntaxTrivia>)trivia);
+		}
+
+		public static SyntaxToken WithPrependedLeadingTrivia(
+			this SyntaxToken token,
+			SyntaxTriviaList trivia)
+		{
+			if (trivia.Count == 0)
+			{
+				return token;
+			}
+
+			return token.WithLeadingTrivia(trivia.Concat(token.LeadingTrivia));
+		}
+
+		public static SyntaxToken WithPrependedLeadingTrivia(
+			this SyntaxToken token,
+			IEnumerable<SyntaxTrivia> trivia)
+		{
+			return token.WithPrependedLeadingTrivia(trivia.ToSyntaxTriviaList());
+		}
+
+		public static SyntaxToken WithAppendedTrailingTrivia(
+			this SyntaxToken token,
+			IEnumerable<SyntaxTrivia> trivia)
+		{
+			return token.WithTrailingTrivia(token.TrailingTrivia.Concat(trivia));
+		}
+
+		/// <summary>
+		/// Retrieves all trivia after this token, including it's trailing trivia and
+		/// the leading trivia of the next token.
+		/// </summary>
+		public static IEnumerable<SyntaxTrivia> GetAllTrailingTrivia(this SyntaxToken token)
+		{
+			foreach (var trivia in token.TrailingTrivia)
+			{
+				yield return trivia;
+			}
+
+			var nextToken = token.GetNextTokenOrEndOfFile(includeZeroWidth: true, includeSkipped: true, includeDirectives: true, includeDocumentationComments: true);
+
+			foreach (var trivia in nextToken.LeadingTrivia)
+			{
+				yield return trivia;
+			}
+		}
+
+		public static bool TryParseGenericName(this SyntaxToken genericIdentifier, CancellationToken cancellationToken, out GenericNameSyntax genericName)
+		{
+			if (genericIdentifier.GetNextToken(includeSkipped: true).Kind() == SyntaxKind.LessThanToken)
+			{
+				var lastToken = genericIdentifier.FindLastTokenOfPartialGenericName();
+
+				var syntaxTree = genericIdentifier.SyntaxTree;
+				var name = SyntaxFactory.ParseName(syntaxTree.GetText(cancellationToken).ToString(TextSpan.FromBounds(genericIdentifier.SpanStart, lastToken.Span.End)));
+
+				genericName = name as GenericNameSyntax;
+				return genericName != null;
+			}
+
+			genericName = null;
+			return false;
+		}
+
+		/// <summary>
+		/// Lexically, find the last token that looks like it's part of this generic name.
+		/// </summary>
+		/// <param name="genericIdentifier">The "name" of the generic identifier, last token before
+		/// the "&amp;"</param>
+		/// <returns>The last token in the name</returns>
+		/// <remarks>This is related to the code in <see cref="SyntaxTreeExtensions.IsInPartiallyWrittenGeneric(SyntaxTree, int, CancellationToken)"/></remarks>
+		public static SyntaxToken FindLastTokenOfPartialGenericName(this SyntaxToken genericIdentifier)
+		{
+			//Contract.ThrowIfFalse(genericIdentifier.Kind() == SyntaxKind.IdentifierToken);
+
+			// advance to the "<" token
+			var token = genericIdentifier.GetNextToken(includeSkipped: true);
+			//Contract.ThrowIfFalse(token.Kind() == SyntaxKind.LessThanToken);
+
+			int stack = 0;
+
+			do
+			{
+				// look forward one token
+				{
+					var next = token.GetNextToken(includeSkipped: true);
+					if (next.Kind() == SyntaxKind.None)
+					{
+						return token;
+					}
+
+					token = next;
+				}
+
+				if (token.Kind() == SyntaxKind.GreaterThanToken)
+				{
+					if (stack == 0)
+					{
+						return token;
+					}
+					else
+					{
+						stack--;
+						continue;
+					}
+				}
+
+				switch (token.Kind())
+				{
+				case SyntaxKind.LessThanLessThanToken:
+					stack++;
+					goto case SyntaxKind.LessThanToken;
+
+					// fall through
+				case SyntaxKind.LessThanToken:
+					stack++;
+					break;
+
+				case SyntaxKind.AsteriskToken:      // for int*
+				case SyntaxKind.QuestionToken:      // for int?
+				case SyntaxKind.ColonToken:         // for global::  (so we don't dismiss help as you type the first :)
+				case SyntaxKind.ColonColonToken:    // for global::
+				case SyntaxKind.CloseBracketToken:
+				case SyntaxKind.OpenBracketToken:
+				case SyntaxKind.DotToken:
+				case SyntaxKind.IdentifierToken:
+				case SyntaxKind.CommaToken:
+					break;
+
+					// If we see a member declaration keyword, we know we've gone too far
+				case SyntaxKind.ClassKeyword:
+				case SyntaxKind.StructKeyword:
+				case SyntaxKind.InterfaceKeyword:
+				case SyntaxKind.DelegateKeyword:
+				case SyntaxKind.EnumKeyword:
+				case SyntaxKind.PrivateKeyword:
+				case SyntaxKind.PublicKeyword:
+				case SyntaxKind.InternalKeyword:
+				case SyntaxKind.ProtectedKeyword:
+				case SyntaxKind.VoidKeyword:
+					return token.GetPreviousToken(includeSkipped: true);
+
+				default:
+					// user might have typed "in" on the way to typing "int"
+					// don't want to disregard this genericname because of that
+					if (SyntaxFacts.IsKeywordKind(token.Kind()))
+					{
+						break;
+					}
+
+					// anything else and we're sunk. Go back to the token before.
+					return token.GetPreviousToken(includeSkipped: true);
+				}
+			}
+			while (true);
+		}
+
+		public static bool IsRegularStringLiteral(this SyntaxToken token)
+		{
+			return token.Kind() == SyntaxKind.StringLiteralToken && !token.IsVerbatimStringLiteral();
+		}
+
+		public static bool IsValidAttributeTarget(this SyntaxToken token)
+		{
+			switch (token.Kind())
+			{
+			case SyntaxKind.AssemblyKeyword:
+			case SyntaxKind.ModuleKeyword:
+			case SyntaxKind.FieldKeyword:
+			case SyntaxKind.EventKeyword:
+			case SyntaxKind.MethodKeyword:
+			case SyntaxKind.ParamKeyword:
+			case SyntaxKind.PropertyKeyword:
+			case SyntaxKind.ReturnKeyword:
+			case SyntaxKind.TypeKeyword:
+				return true;
+
+			default:
+				return false;
+			}
+		}
+
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SyntaxTreeExtensions.cs b/main/src/addins/CSharpBinding/Util/SyntaxTreeExtensions.cs
new file mode 100644
index 0000000000..cb556b3996
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntaxTreeExtensions.cs
@@ -0,0 +1,3322 @@
+//
+// SyntaxTreeExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SyntaxTreeExtensions
+	{
+//		/// <summary>
+//		/// Returns the identifier, keyword, contextual keyword or preprocessor keyword touching this
+//		/// position, or a token of Kind = None if the caret is not touching either.
+//		/// </summary>
+//		public static SyntaxToken GetTouchingWord(
+//			this SyntaxTree syntaxTree,
+//			int position,
+//			ISyntaxFactsService syntaxFacts,
+//			CancellationToken cancellationToken,
+//			bool findInsideTrivia = false)
+//		{
+//			return GetTouchingToken(syntaxTree, position, syntaxFacts.IsWord, cancellationToken, findInsideTrivia);
+//		}
+
+		public static SyntaxToken GetTouchingToken(
+			this SyntaxTree syntaxTree,
+			int position,
+			CancellationToken cancellationToken,
+			bool findInsideTrivia = false)
+		{
+			return GetTouchingToken(syntaxTree, position, _ => true, cancellationToken, findInsideTrivia);
+		}
+
+		public static SyntaxToken GetTouchingToken(
+			this SyntaxTree syntaxTree,
+			int position,
+			Predicate<SyntaxToken> predicate,
+			CancellationToken cancellationToken,
+			bool findInsideTrivia = false)
+		{
+			// Contract.ThrowIfNull(syntaxTree);
+
+			if (position >= syntaxTree.Length)
+			{
+				return default(SyntaxToken);
+			}
+
+			var token = syntaxTree.GetRoot(cancellationToken).FindToken(position, findInsideTrivia);
+
+			if ((token.Span.Contains(position) || token.Span.End == position) && predicate(token))
+			{
+				return token;
+			}
+
+			token = token.GetPreviousToken();
+
+			if (token.Span.End == position && predicate(token))
+			{
+				return token;
+			}
+
+			// SyntaxKind = None
+			return default(SyntaxToken);
+		}
+
+		public static bool OverlapsHiddenPosition(this SyntaxTree tree, TextSpan span, CancellationToken cancellationToken)
+		{
+			if (tree == null)
+			{
+				return false;
+			}
+
+			var text = tree.GetText(cancellationToken);
+
+			return text.OverlapsHiddenPosition(span, (position, cancellationToken2) =>
+				{
+					// implements the ASP.Net IsHidden rule
+					var lineVisibility = tree.GetLineVisibility(position, cancellationToken2);
+					return lineVisibility == LineVisibility.Hidden || lineVisibility == LineVisibility.BeforeFirstLineDirective;
+				},
+				cancellationToken);
+		}
+
+		public static bool IsEntirelyHidden(this SyntaxTree tree, TextSpan span, CancellationToken cancellationToken)
+		{
+			if (!tree.HasHiddenRegions())
+			{
+				return false;
+			}
+
+			var text = tree.GetText(cancellationToken);
+			var startLineNumber = text.Lines.IndexOf(span.Start);
+			var endLineNumber = text.Lines.IndexOf(span.End);
+
+			for (var lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++)
+			{
+				cancellationToken.ThrowIfCancellationRequested();
+
+				var linePosition = text.Lines[lineNumber].Start;
+				if (!tree.IsHiddenPosition(linePosition, cancellationToken))
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		/// <summary>
+		/// Returns <c>true</c> if the provided position is in a hidden region inaccessible to the user.
+		/// </summary>
+		public static bool IsHiddenPosition(this SyntaxTree tree, int position, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (!tree.HasHiddenRegions())
+			{
+				return false;
+			}
+
+			var lineVisibility = tree.GetLineVisibility(position, cancellationToken);
+			return lineVisibility == LineVisibility.Hidden || lineVisibility == LineVisibility.BeforeFirstLineDirective;
+		}
+
+		public static bool IsInteractiveOrScript(this SyntaxTree syntaxTree)
+		{
+			return syntaxTree.Options.Kind != SourceCodeKind.Regular;
+		}
+
+		public static ISet<SyntaxKind> GetPrecedingModifiers(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			var result = new HashSet<SyntaxKind>(SyntaxFacts.EqualityComparer);
+			while (true)
+			{
+				switch (token.Kind())
+				{
+				case SyntaxKind.PublicKeyword:
+				case SyntaxKind.InternalKeyword:
+				case SyntaxKind.ProtectedKeyword:
+				case SyntaxKind.PrivateKeyword:
+				case SyntaxKind.SealedKeyword:
+				case SyntaxKind.AbstractKeyword:
+				case SyntaxKind.StaticKeyword:
+				case SyntaxKind.VirtualKeyword:
+				case SyntaxKind.ExternKeyword:
+				case SyntaxKind.NewKeyword:
+				case SyntaxKind.OverrideKeyword:
+				case SyntaxKind.ReadOnlyKeyword:
+				case SyntaxKind.VolatileKeyword:
+				case SyntaxKind.UnsafeKeyword:
+				case SyntaxKind.AsyncKeyword:
+					result.Add(token.Kind());
+					token = token.GetPreviousToken(includeSkipped: true);
+					continue;
+				case SyntaxKind.IdentifierToken:
+					if (token.HasMatchingText(SyntaxKind.AsyncKeyword))
+					{
+						result.Add(SyntaxKind.AsyncKeyword);
+						token = token.GetPreviousToken(includeSkipped: true);
+						continue;
+					}
+
+					break;
+				}
+
+				break;
+			}
+
+			return result;
+		}
+
+		public static TypeDeclarationSyntax GetContainingTypeDeclaration(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			return syntaxTree.GetContainingTypeDeclarations(position, cancellationToken).FirstOrDefault();
+		}
+
+		public static BaseTypeDeclarationSyntax GetContainingTypeOrEnumDeclaration(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			return syntaxTree.GetContainingTypeOrEnumDeclarations(position, cancellationToken).FirstOrDefault();
+		}
+
+		public static IEnumerable<TypeDeclarationSyntax> GetContainingTypeDeclarations(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+
+			return token.GetAncestors<TypeDeclarationSyntax>().Where(t =>
+				{
+					return BaseTypeDeclarationContainsPosition(t, position);
+				});
+		}
+
+		private static bool BaseTypeDeclarationContainsPosition(BaseTypeDeclarationSyntax declaration, int position)
+		{
+			if (position <= declaration.OpenBraceToken.SpanStart)
+			{
+				return false;
+			}
+
+			if (declaration.CloseBraceToken.IsMissing)
+			{
+				return true;
+			}
+
+			return position <= declaration.CloseBraceToken.SpanStart;
+		}
+
+		public static IEnumerable<BaseTypeDeclarationSyntax> GetContainingTypeOrEnumDeclarations(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+
+			return token.GetAncestors<BaseTypeDeclarationSyntax>().Where(t => BaseTypeDeclarationContainsPosition(t, position));
+		}
+
+//		/// <summary>
+//		/// If the position is inside of token, return that token; otherwise, return the token to the right.
+//		/// </summary>
+//		public static SyntaxToken FindTokenOnRightOfPosition(
+//			this SyntaxTree syntaxTree,
+//			int position,
+//			CancellationToken cancellationToken,
+//			bool includeSkipped = true,
+//			bool includeDirectives = false,
+//			bool includeDocumentationComments = false)
+//		{
+//			return syntaxTree.GetRoot(cancellationToken).FindTokenOnRightOfPosition(
+//				position, includeSkipped, includeDirectives, includeDocumentationComments);
+//		}
+
+		/// <summary>
+		/// If the position is inside of token, return that token; otherwise, return the token to the left.
+		/// </summary>
+		public static SyntaxToken FindTokenOnLeftOfPosition(
+			this SyntaxTree syntaxTree,
+			int position,
+			CancellationToken cancellationToken,
+			bool includeSkipped = true,
+			bool includeDirectives = false,
+			bool includeDocumentationComments = false)
+		{
+			return syntaxTree.GetRoot(cancellationToken).FindTokenOnLeftOfPosition(
+				position, includeSkipped, includeDirectives, includeDocumentationComments);
+		}
+
+		private static readonly Func<SyntaxKind, bool> s_isDotOrArrow = k => k == SyntaxKind.DotToken || k == SyntaxKind.MinusGreaterThanToken;
+		private static readonly Func<SyntaxKind, bool> s_isDotOrArrowOrColonColon =
+			k => k == SyntaxKind.DotToken || k == SyntaxKind.MinusGreaterThanToken || k == SyntaxKind.ColonColonToken;
+
+		public static bool IsNamespaceDeclarationNameContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			var namespaceName = token.GetAncestor<NamespaceDeclarationSyntax>();
+			if (namespaceName == null)
+			{
+				return false;
+			}
+
+			return namespaceName.Name.Span.IntersectsWith(position);
+		}
+
+		public static bool IsRightOfDotOrArrowOrColonColon(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			return syntaxTree.IsRightOf(position, s_isDotOrArrowOrColonColon, cancellationToken);
+		}
+
+		public static bool IsRightOfDotOrArrow(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			return syntaxTree.IsRightOf(position, s_isDotOrArrow, cancellationToken);
+		}
+
+		private static bool IsRightOf(
+			this SyntaxTree syntaxTree, int position, Func<SyntaxKind, bool> predicate, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.None)
+			{
+				return false;
+			}
+
+			return predicate(token.Kind());
+		}
+
+		public static bool IsRightOfNumericLiteral(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			return token.Kind() == SyntaxKind.NumericLiteralToken;
+		}
+
+		public static bool IsPrimaryFunctionExpressionContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			return
+				syntaxTree.IsTypeOfExpressionContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsDefaultExpressionContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsSizeOfExpressionContext(position, tokenOnLeftOfPosition, cancellationToken);
+		}
+
+		public static bool IsAfterKeyword(this SyntaxTree syntaxTree, int position, SyntaxKind kind, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			return token.Kind() == kind;
+		}
+
+		public static bool IsInNonUserCode(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			return
+				syntaxTree.IsEntirelyWithinNonUserCodeComment(position, cancellationToken) ||
+				syntaxTree.IsEntirelyWithinStringOrCharLiteral(position, cancellationToken) ||
+				syntaxTree.IsInInactiveRegion(position, cancellationToken);
+		}
+
+		public static bool IsEntirelyWithinNonUserCodeComment(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var inNonUserSingleLineDocComment =
+				syntaxTree.IsEntirelyWithinSingleLineDocComment(position, cancellationToken) && !syntaxTree.IsEntirelyWithinCrefSyntax(position, cancellationToken);
+			return
+				syntaxTree.IsEntirelyWithinTopLevelSingleLineComment(position, cancellationToken) ||
+				syntaxTree.IsEntirelyWithinPreProcessorSingleLineComment(position, cancellationToken) ||
+				syntaxTree.IsEntirelyWithinMultiLineComment(position, cancellationToken) ||
+				syntaxTree.IsEntirelyWithinMultiLineDocComment(position, cancellationToken) ||
+				inNonUserSingleLineDocComment;
+		}
+
+		public static bool IsEntirelyWithinComment(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			return
+				syntaxTree.IsEntirelyWithinTopLevelSingleLineComment(position, cancellationToken) ||
+				syntaxTree.IsEntirelyWithinPreProcessorSingleLineComment(position, cancellationToken) ||
+				syntaxTree.IsEntirelyWithinMultiLineComment(position, cancellationToken) ||
+				syntaxTree.IsEntirelyWithinMultiLineDocComment(position, cancellationToken) ||
+				syntaxTree.IsEntirelyWithinSingleLineDocComment(position, cancellationToken);
+		}
+
+		public static bool IsCrefContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken, includeDocumentationComments: true);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Parent is XmlCrefAttributeSyntax)
+			{
+				var attribute = (XmlCrefAttributeSyntax)token.Parent;
+				return token == attribute.StartQuoteToken;
+			}
+
+			return false;
+		}
+
+		public static bool IsEntirelyWithinCrefSyntax(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			if (syntaxTree.IsCrefContext(position, cancellationToken))
+			{
+				return true;
+			}
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken, includeDocumentationComments: true);
+			return token.GetAncestor<CrefSyntax>() != null;
+		}
+
+		public static bool IsEntirelyWithinSingleLineDocComment(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var root = syntaxTree.GetRoot(cancellationToken) as CompilationUnitSyntax;
+			var trivia = root.FindTrivia(position);
+
+			// If we ask right at the end of the file, we'll get back nothing.
+			// So move back in that case and ask again.
+			var eofPosition = root.FullWidth();
+			if (position == eofPosition)
+			{
+				var eof = root.EndOfFileToken;
+				if (eof.HasLeadingTrivia)
+				{
+					trivia = eof.LeadingTrivia.Last();
+				}
+			}
+
+			if (trivia.IsSingleLineDocComment())
+			{
+				var span = trivia.Span;
+				var fullSpan = trivia.FullSpan;
+				var endsWithNewLine = trivia.GetStructure().GetLastToken(includeSkipped: true).Kind() == SyntaxKind.XmlTextLiteralNewLineToken;
+
+				if (endsWithNewLine)
+				{
+					if (position > fullSpan.Start && position < fullSpan.End)
+					{
+						return true;
+					}
+				}
+				else
+				{
+					if (position > fullSpan.Start && position <= fullSpan.End)
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsEntirelyWithinMultiLineDocComment(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var trivia = syntaxTree.GetRoot(cancellationToken).FindTrivia(position);
+
+			if (trivia.IsMultiLineDocComment())
+			{
+				var span = trivia.FullSpan;
+
+				if (position > span.Start && position < span.End)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsEntirelyWithinMultiLineComment(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var trivia = FindTriviaAndAdjustForEndOfFile(syntaxTree, position, cancellationToken);
+
+			if (trivia.IsMultiLineComment())
+			{
+				var span = trivia.FullSpan;
+
+				return trivia.IsCompleteMultiLineComment()
+					? position > span.Start && position < span.End
+						: position > span.Start && position <= span.End;
+			}
+
+			return false;
+		}
+
+		public static bool IsEntirelyWithinTopLevelSingleLineComment(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var trivia = FindTriviaAndAdjustForEndOfFile(syntaxTree, position, cancellationToken);
+
+			if (trivia.Kind() == SyntaxKind.EndOfLineTrivia)
+			{
+				// Check if we're on the newline right at the end of a comment
+				trivia = trivia.GetPreviousTrivia(syntaxTree, cancellationToken);
+			}
+
+			if (trivia.IsSingleLineComment())
+			{
+				var span = trivia.FullSpan;
+
+				if (position > span.Start && position <= span.End)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsEntirelyWithinPreProcessorSingleLineComment(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			// Search inside trivia for directives to ensure that we recognize
+			// single-line comments at the end of preprocessor directives.
+			var trivia = FindTriviaAndAdjustForEndOfFile(syntaxTree, position, cancellationToken, findInsideTrivia: true);
+
+			if (trivia.Kind() == SyntaxKind.EndOfLineTrivia)
+			{
+				// Check if we're on the newline right at the end of a comment
+				trivia = trivia.GetPreviousTrivia(syntaxTree, cancellationToken, findInsideTrivia: true);
+			}
+
+			if (trivia.IsSingleLineComment())
+			{
+				var span = trivia.FullSpan;
+
+				if (position > span.Start && position <= span.End)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		private static SyntaxTrivia FindTriviaAndAdjustForEndOfFile(
+			SyntaxTree syntaxTree, int position, CancellationToken cancellationToken, bool findInsideTrivia = false)
+		{
+			var root = syntaxTree.GetRoot(cancellationToken) as CompilationUnitSyntax;
+			var trivia = root.FindTrivia(position, findInsideTrivia);
+
+			// If we ask right at the end of the file, we'll get back nothing.
+			// We handle that case specially for now, though SyntaxTree.FindTrivia should
+			// work at the end of a file.
+			if (position == root.FullWidth())
+			{
+				var endOfFileToken = root.EndOfFileToken;
+				if (endOfFileToken.HasLeadingTrivia)
+				{
+					trivia = endOfFileToken.LeadingTrivia.Last();
+				}
+				else
+				{
+					var token = endOfFileToken.GetPreviousToken(includeSkipped: true);
+					if (token.HasTrailingTrivia)
+					{
+						trivia = token.TrailingTrivia.Last();
+					}
+				}
+			}
+
+			return trivia;
+		}
+
+		private static bool AtEndOfIncompleteStringOrCharLiteral(SyntaxToken token, int position, char lastChar)
+		{
+			if (!token.IsKind(SyntaxKind.StringLiteralToken, SyntaxKind.CharacterLiteralToken))
+			{
+				throw new ArgumentException("Expected string or char literal.", "token");
+			}
+
+			int startLength = 1;
+			if (token.IsVerbatimStringLiteral())
+			{
+				startLength = 2;
+			}
+
+			return position == token.Span.End &&
+				(token.Span.Length == startLength || (token.Span.Length > startLength && token.ToString().Cast<char>().LastOrDefault() != lastChar));
+		}
+
+		public static bool IsEntirelyWithinStringOrCharLiteral(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			return
+				syntaxTree.IsEntirelyWithinStringLiteral(position, cancellationToken) ||
+				syntaxTree.IsEntirelyWithinCharLiteral(position, cancellationToken);
+		}
+
+		public static bool IsEntirelyWithinStringLiteral(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.GetRoot(cancellationToken).FindToken(position, findInsideTrivia: true);
+
+			// If we ask right at the end of the file, we'll get back nothing. We handle that case
+			// specially for now, though SyntaxTree.FindToken should work at the end of a file.
+			if (token.IsKind(SyntaxKind.EndOfDirectiveToken, SyntaxKind.EndOfFileToken))
+			{
+				token = token.GetPreviousToken(includeSkipped: true, includeDirectives: true);
+			}
+
+			if (token.IsKind(SyntaxKind.StringLiteralToken))
+			{
+				var span = token.Span;
+
+				// cases:
+				// "|"
+				// "|  (e.g. incomplete string literal)
+				return (position > span.Start && position < span.End)
+					|| AtEndOfIncompleteStringOrCharLiteral(token, position, '"');
+			}
+
+			// TODO: Uncomment InterpolatedStringTextToken on roslyn update !!!
+			if (token.IsKind(SyntaxKind.InterpolatedStringStartToken, /* SyntaxKind.InterpolatedStringTextToken, */SyntaxKind.InterpolatedStringEndToken))
+			{
+				return token.SpanStart < position && token.Span.End > position;
+			}
+
+			return false;
+		}
+
+		public static bool IsEntirelyWithinCharLiteral(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var root = syntaxTree.GetRoot(cancellationToken) as CompilationUnitSyntax;
+			var token = root.FindToken(position, findInsideTrivia: true);
+
+			// If we ask right at the end of the file, we'll get back nothing.
+			// We handle that case specially for now, though SyntaxTree.FindToken should
+			// work at the end of a file.
+			if (position == root.FullWidth())
+			{
+				token = root.EndOfFileToken.GetPreviousToken(includeSkipped: true, includeDirectives: true);
+			}
+
+			if (token.Kind() == SyntaxKind.CharacterLiteralToken)
+			{
+				var span = token.Span;
+
+				// cases:
+				// '|'
+				// '|  (e.g. incomplete char literal)
+				return (position > span.Start && position < span.End)
+					|| AtEndOfIncompleteStringOrCharLiteral(token, position, '\'');
+			}
+
+			return false;
+		}
+
+		public static bool IsInInactiveRegion(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			// Contract.ThrowIfNull(syntaxTree);
+
+			// cases:
+			// $ is EOF
+
+			// #if false
+			//    |
+
+			// #if false
+			//    |$
+
+			// #if false
+			// |
+
+			// #if false
+			// |$
+
+			if (syntaxTree.IsPreProcessorKeywordContext(position, cancellationToken))
+			{
+				return false;
+			}
+
+			// The latter two are the hard cases we don't actually have an 
+			// DisabledTextTrivia yet. 
+			var trivia = syntaxTree.GetRoot(cancellationToken).FindTrivia(position, findInsideTrivia: false);
+			if (trivia.Kind() == SyntaxKind.DisabledTextTrivia)
+			{
+				return true;
+			}
+
+			var token = syntaxTree.FindTokenOrEndToken(position, cancellationToken);
+			var text = syntaxTree.GetText(cancellationToken);
+			var lineContainingPosition = text.Lines.IndexOf(position);
+			if (token.Kind() == SyntaxKind.EndOfFileToken)
+			{
+				var triviaList = token.LeadingTrivia;
+				foreach (var triviaTok in triviaList.Reverse())
+				{
+					if (triviaTok.HasStructure)
+					{
+						var structure = triviaTok.GetStructure();
+						if (structure is BranchingDirectiveTriviaSyntax)
+						{
+							var triviaLine = text.Lines.IndexOf(triviaTok.SpanStart);
+							if (triviaLine < lineContainingPosition)
+							{
+								var branch = (BranchingDirectiveTriviaSyntax)structure;
+								return !branch.IsActive || !branch.BranchTaken;
+							}
+						}
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsBeforeFirstToken(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var firstToken = syntaxTree.GetRoot(cancellationToken).GetFirstToken(includeZeroWidth: true, includeSkipped: true);
+
+			return position <= firstToken.SpanStart;
+		}
+
+		public static SyntaxToken FindTokenOrEndToken(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			// Contract.ThrowIfNull(syntaxTree);
+
+			var root = syntaxTree.GetRoot(cancellationToken) as CompilationUnitSyntax;
+			var result = root.FindToken(position, findInsideTrivia: true);
+			if (result.Kind() != SyntaxKind.None)
+			{
+				return result;
+			}
+
+			// Special cases.  See if we're actually at the end of a:
+			// a) doc comment
+			// b) pp directive
+			// c) file
+
+			var triviaList = root.EndOfFileToken.LeadingTrivia;
+			foreach (var trivia in triviaList.Reverse())
+			{
+				if (trivia.HasStructure)
+				{
+					var token = trivia.GetStructure().GetLastToken(includeZeroWidth: true);
+					if (token.Span.End == position)
+					{
+						return token;
+					}
+				}
+			}
+
+			if (position == root.FullSpan.End)
+			{
+				return root.EndOfFileToken;
+			}
+
+			return default(SyntaxToken);
+		}
+
+		public static IList<MemberDeclarationSyntax> GetMembersInSpan(
+			this SyntaxTree syntaxTree,
+			TextSpan textSpan,
+			CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.GetRoot(cancellationToken).FindToken(textSpan.Start);
+			var firstMember = token.GetAncestors<MemberDeclarationSyntax>().FirstOrDefault();
+			if (firstMember != null)
+			{
+				var containingType = firstMember.Parent as TypeDeclarationSyntax;
+				if (containingType != null)
+				{
+					var members = GetMembersInSpan(textSpan, containingType, firstMember);
+					if (members != null)
+					{
+						return members;
+					}
+				}
+			}
+
+			return SpecializedCollections.EmptyList<MemberDeclarationSyntax>();
+		}
+
+		private static List<MemberDeclarationSyntax> GetMembersInSpan(
+			TextSpan textSpan,
+			TypeDeclarationSyntax containingType,
+			MemberDeclarationSyntax firstMember)
+		{
+			List<MemberDeclarationSyntax> selectedMembers = null;
+
+			var members = containingType.Members;
+			var fieldIndex = members.IndexOf(firstMember);
+			if (fieldIndex < 0)
+			{
+				return null;
+			}
+
+			for (var i = fieldIndex; i < members.Count; i++)
+			{
+				var member = members[i];
+				if (textSpan.Contains(member.Span))
+				{
+					selectedMembers = selectedMembers ?? new List<MemberDeclarationSyntax>();
+					selectedMembers.Add(member);
+				}
+				else if (textSpan.OverlapsWith(member.Span))
+				{
+					return null;
+				}
+				else
+				{
+					break;
+				}
+			}
+
+			return selectedMembers;
+		}
+
+		public static bool IsInPartiallyWrittenGeneric(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			SyntaxToken genericIdentifier;
+			SyntaxToken lessThanToken;
+			return syntaxTree.IsInPartiallyWrittenGeneric(position, cancellationToken, out genericIdentifier, out lessThanToken);
+		}
+
+		public static bool IsInPartiallyWrittenGeneric(
+			this SyntaxTree syntaxTree,
+			int position,
+			CancellationToken cancellationToken,
+			out SyntaxToken genericIdentifier)
+		{
+			SyntaxToken lessThanToken;
+			return syntaxTree.IsInPartiallyWrittenGeneric(position, cancellationToken, out genericIdentifier, out lessThanToken);
+		}
+
+		public static bool IsInPartiallyWrittenGeneric(
+			this SyntaxTree syntaxTree,
+			int position,
+			CancellationToken cancellationToken,
+			out SyntaxToken genericIdentifier,
+			out SyntaxToken lessThanToken)
+		{
+			genericIdentifier = default(SyntaxToken);
+			lessThanToken = default(SyntaxToken);
+			int index = 0;
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			if (token.Kind() == SyntaxKind.None)
+			{
+				return false;
+			}
+
+			// check whether we are under type or member decl
+			if (token.GetAncestor<TypeParameterListSyntax>() != null)
+			{
+				return false;
+			}
+
+			int stack = 0;
+			while (true)
+			{
+				switch (token.Kind())
+				{
+				case SyntaxKind.LessThanToken:
+					if (stack == 0)
+					{
+						// got here so we read successfully up to a < now we have to read the
+						// name before that and we're done!
+						lessThanToken = token;
+						token = token.GetPreviousToken(includeSkipped: true);
+						if (token.Kind() == SyntaxKind.None)
+						{
+							return false;
+						}
+
+						// ok
+						// so we've read something like:
+						// ~~~~~~~~~<a,b,...
+						// but we need to know the simple name that precedes the <
+						// it could be
+						// ~~~~~~foo<a,b,...
+						if (token.Kind() == SyntaxKind.IdentifierToken)
+						{
+							// okay now check whether it is actually partially written
+							if (IsFullyWrittenGeneric(token, lessThanToken))
+							{
+								return false;
+							}
+
+							genericIdentifier = token;
+							return true;
+						}
+
+						return false;
+					}
+					else
+					{
+						stack--;
+						break;
+					}
+
+				case SyntaxKind.GreaterThanGreaterThanToken:
+					stack++;
+					goto case SyntaxKind.GreaterThanToken;
+
+					// fall through
+				case SyntaxKind.GreaterThanToken:
+					stack++;
+					break;
+
+				case SyntaxKind.AsteriskToken:      // for int*
+				case SyntaxKind.QuestionToken:      // for int?
+				case SyntaxKind.ColonToken:         // for global::  (so we don't dismiss help as you type the first :)
+				case SyntaxKind.ColonColonToken:    // for global::
+				case SyntaxKind.CloseBracketToken:
+				case SyntaxKind.OpenBracketToken:
+				case SyntaxKind.DotToken:
+				case SyntaxKind.IdentifierToken:
+					break;
+
+				case SyntaxKind.CommaToken:
+					if (stack == 0)
+					{
+						index++;
+					}
+
+					break;
+
+				default:
+					// user might have typed "in" on the way to typing "int"
+					// don't want to disregard this genericname because of that
+					if (SyntaxFacts.IsKeywordKind(token.Kind()))
+					{
+						break;
+					}
+
+					// anything else and we're sunk.
+					return false;
+				}
+
+				// look backward one token, include skipped tokens, because the parser frequently
+				// does skip them in cases like: "Func<A, B", which get parsed as: expression
+				// statement "Func<A" with missing semicolon, expression statement "B" with missing
+				// semicolon, and the "," is skipped.
+				token = token.GetPreviousToken(includeSkipped: true);
+				if (token.Kind() == SyntaxKind.None)
+				{
+					return false;
+				}
+			}
+		}
+
+		private static bool IsFullyWrittenGeneric(SyntaxToken token, SyntaxToken lessThanToken)
+		{
+			var genericName = token.Parent as GenericNameSyntax;
+
+			return genericName != null && genericName.TypeArgumentList != null &&
+				genericName.TypeArgumentList.LessThanToken == lessThanToken && !genericName.TypeArgumentList.GreaterThanToken.IsMissing;
+		}
+
+
+		public static bool IsAttributeNameContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			// cases:
+			//   [ |
+			if (token.Kind() == SyntaxKind.OpenBracketToken &&
+				token.Parent.IsKind(SyntaxKind.AttributeList))
+			{
+				return true;
+			}
+
+			// cases:
+			//   [Foo(1), |
+			if (token.Kind() == SyntaxKind.CommaToken &&
+				token.Parent.IsKind(SyntaxKind.AttributeList))
+			{
+				return true;
+			}
+
+			// cases:
+			//   [specifier: |
+			if (token.Kind() == SyntaxKind.ColonToken &&
+				token.Parent.IsKind(SyntaxKind.AttributeTargetSpecifier))
+			{
+				return true;
+			}
+
+			// cases:
+			//   [Namespace.|
+			if (token.Parent.IsKind(SyntaxKind.QualifiedName) &&
+				token.Parent.IsParentKind(SyntaxKind.Attribute))
+			{
+				return true;
+			}
+
+			// cases:
+			//   [global::|
+			if (token.Parent.IsKind(SyntaxKind.AliasQualifiedName) &&
+				token.Parent.IsParentKind(SyntaxKind.Attribute))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsGlobalMemberDeclarationContext(
+			this SyntaxTree syntaxTree,
+			int position,
+			ISet<SyntaxKind> validModifiers,
+			CancellationToken cancellationToken)
+		{
+			if (!syntaxTree.IsInteractiveOrScript())
+			{
+				return false;
+			}
+
+			var tokenOnLeftOfPosition = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			var token = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord(position);
+
+			var modifierTokens = syntaxTree.GetPrecedingModifiers(position, tokenOnLeftOfPosition, cancellationToken);
+			if (!modifierTokens.Any())
+			{
+				return false;
+			}
+
+			if (modifierTokens.IsSubsetOf(validModifiers))
+			{
+				// the parent is the member
+				// the grandparent is the container of the member
+				// in interactive, it's possible that there might be an intervening "incomplete" member for partially
+				// typed declarations that parse ambiguously. For example, "internal e".
+				if (token.Parent.IsKind(SyntaxKind.CompilationUnit) ||
+					(token.Parent.IsKind(SyntaxKind.IncompleteMember) && token.Parent.IsParentKind(SyntaxKind.CompilationUnit)))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsMemberDeclarationContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			// cases:
+			// class C {
+			//   |
+
+			// class C {
+			//   void Foo() {
+			//   }
+			//   |
+
+			// class C {
+			//   int i;
+			//   |
+
+			// class C {
+			//   public |
+
+			// class C {
+			//   [Foo]
+			//   |
+
+			var originalToken = tokenOnLeftOfPosition;
+			var token = originalToken;
+
+			// If we're touching the right of an identifier, move back to
+			// previous token.
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenBraceToken)
+			{
+				if (token.Parent is BaseTypeDeclarationSyntax)
+				{
+					return true;
+				}
+			}
+
+			// class C {
+			//   int i;
+			//   |
+			if (token.Kind() == SyntaxKind.SemicolonToken)
+			{
+				if (token.Parent is MemberDeclarationSyntax &&
+					token.Parent.GetParent() is BaseTypeDeclarationSyntax)
+				{
+					return true;
+				}
+			}
+
+			// class A {
+			//   class C {}
+			//   |
+
+			// class C {
+			//    void Foo() {
+			//    }
+			//    |
+			if (token.Kind() == SyntaxKind.CloseBraceToken)
+			{
+				if (token.Parent is BaseTypeDeclarationSyntax &&
+					token.Parent.GetParent() is BaseTypeDeclarationSyntax)
+				{
+					// after a nested type
+					return true;
+				}
+				else if (token.Parent is AccessorListSyntax)
+				{
+					// after a property
+					return true;
+				}
+				else if (
+					token.Parent.IsKind(SyntaxKind.Block) &&
+					token.Parent.GetParent() is MemberDeclarationSyntax)
+				{
+					// after a method/operator/etc.
+					return true;
+				}
+			}
+
+			// namespace Foo {
+			//   [Bar]
+			//   |
+
+			if (token.Kind() == SyntaxKind.CloseBracketToken &&
+				token.Parent.IsKind(SyntaxKind.AttributeList))
+			{
+				// attributes belong to a member which itself is in a
+				// container.
+
+				// the parent is the attribute
+				// the grandparent is the owner of the attribute
+				// the great-grandparent is the container that the owner is in
+				var container = token.Parent.GetParent().GetParent();
+				if (container is BaseTypeDeclarationSyntax)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsMemberDeclarationContext(
+			this SyntaxTree syntaxTree,
+			int position,
+			CSharpSyntaxContext contextOpt,
+			ISet<SyntaxKind> validModifiers,
+			ISet<SyntaxKind> validTypeDeclarations,
+			bool canBePartial,
+			CancellationToken cancellationToken)
+		{
+			var typeDecl = contextOpt != null
+				? contextOpt.ContainingTypeOrEnumDeclaration
+				: syntaxTree.GetContainingTypeOrEnumDeclaration(position, cancellationToken);
+
+			if (typeDecl == null)
+			{
+				return false;
+			}
+
+			if (!validTypeDeclarations.Contains(typeDecl.Kind()))
+			{
+				return false;
+			}
+
+			validTypeDeclarations = validTypeDeclarations ?? SpecializedCollections.EmptySet<SyntaxKind>();
+
+			// Check many of the simple cases first.
+			var leftToken = contextOpt != null
+				? contextOpt.LeftToken
+				: syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+
+			if (syntaxTree.IsMemberDeclarationContext(position, leftToken, cancellationToken))
+			{
+				return true;
+			}
+
+			var token = contextOpt != null
+				? contextOpt.TargetToken
+				: leftToken.GetPreviousTokenIfTouchingWord(position);
+
+			// A member can also show up after certain types of modifiers
+			if (canBePartial &&
+				token.IsKindOrHasMatchingText(SyntaxKind.PartialKeyword))
+			{
+				return true;
+			}
+
+			var modifierTokens = contextOpt != null
+				? contextOpt.PrecedingModifiers
+				: syntaxTree.GetPrecedingModifiers(position, leftToken, cancellationToken);
+
+			if (!modifierTokens.Any())
+			{
+				return false;
+			}
+
+			validModifiers = validModifiers ?? SpecializedCollections.EmptySet<SyntaxKind>();
+
+			if (modifierTokens.IsSubsetOf(validModifiers))
+			{
+				var member = token.Parent;
+				if (token.HasMatchingText(SyntaxKind.AsyncKeyword))
+				{
+					// second appearance of "async", not followed by modifier: treat it as type
+					if (syntaxTree.GetPrecedingModifiers(token.SpanStart, token, cancellationToken).Any(x => x == SyntaxKind.AsyncKeyword))
+					{
+						return false;
+					}
+
+					// rule out async lambdas inside a method
+					if (token.GetAncestor<StatementSyntax>() == null)
+					{
+						member = token.GetAncestor<MemberDeclarationSyntax>();
+					}
+				}
+
+				// cases:
+				// public |
+				// async |
+				// public async |
+				return member != null &&
+					member.Parent is BaseTypeDeclarationSyntax;
+			}
+
+			return false;
+		}
+
+		public static bool IsTypeDeclarationContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			// cases:
+			// root: |
+
+			// extern alias a;
+			// |
+
+			// using Foo;
+			// |
+
+			// using Foo = Bar;
+			// |
+
+			// namespace N {}
+			// |
+
+			// namespace N {
+			// |
+
+			// class C {}
+			// |
+
+			// class C {
+			// |
+
+			// class C {
+			//   void Foo() {
+			//   }
+			//   |
+
+			// class C {
+			//   int i;
+			//   |
+
+			// class C {
+			//   public |
+
+			// class C {
+			//   [Foo]
+			//   |
+
+			var originalToken = tokenOnLeftOfPosition;
+			var token = originalToken;
+
+			// If we're touching the right of an identifier, move back to
+			// previous token.
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			// a type decl can't come before usings/externs
+			if (originalToken.GetNextToken(includeSkipped: true).IsUsingOrExternKeyword())
+			{
+				return false;
+			}
+
+			// root: |
+			if (token.Kind() == SyntaxKind.None)
+			{
+				// root namespace
+
+				// a type decl can't come before usings/externs
+				var compilationUnit = syntaxTree.GetRoot(cancellationToken) as CompilationUnitSyntax;
+				if (compilationUnit != null &&
+					(compilationUnit.Externs.Count > 0 ||
+						compilationUnit.Usings.Count > 0))
+				{
+					return false;
+				}
+
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.OpenBraceToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.ClassDeclaration, SyntaxKind.StructDeclaration))
+				{
+					return true;
+				}
+				else if (token.Parent.IsKind(SyntaxKind.NamespaceDeclaration))
+				{
+					return true;
+				}
+			}
+
+			// extern alias a;
+			// |
+
+			// using Foo;
+			// |
+
+			// class C {
+			//   int i;
+			//   |
+			if (token.Kind() == SyntaxKind.SemicolonToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.ExternAliasDirective, SyntaxKind.UsingDirective))
+				{
+					return true;
+				}
+				else if (token.Parent is MemberDeclarationSyntax)
+				{
+					return true;
+				}
+			}
+
+			// class C {}
+			// |
+
+			// namespace N {}
+			// |
+
+			// class C {
+			//    void Foo() {
+			//    }
+			//    |
+			if (token.Kind() == SyntaxKind.CloseBraceToken)
+			{
+				if (token.Parent is BaseTypeDeclarationSyntax)
+				{
+					return true;
+				}
+				else if (token.Parent.IsKind(SyntaxKind.NamespaceDeclaration))
+				{
+					return true;
+				}
+				else if (token.Parent is AccessorListSyntax)
+				{
+					return true;
+				}
+				else if (
+					token.Parent.IsKind(SyntaxKind.Block) &&
+					token.Parent.GetParent() is MemberDeclarationSyntax)
+				{
+					return true;
+				}
+			}
+
+			// namespace Foo {
+			//   [Bar]
+			//   |
+
+			if (token.Kind() == SyntaxKind.CloseBracketToken &&
+				token.Parent.IsKind(SyntaxKind.AttributeList))
+			{
+				// assembly attributes belong to the containing compilation unit
+				if (token.Parent.IsParentKind(SyntaxKind.CompilationUnit))
+				{
+					return true;
+				}
+
+				// other attributes belong to a member which itself is in a
+				// container.
+
+				// the parent is the attribute
+				// the grandparent is the owner of the attribute
+				// the great-grandparent is the container that the owner is in
+				var container = token.Parent.GetParent().GetParent();
+				if (container.IsKind(SyntaxKind.CompilationUnit) ||
+					container.IsKind(SyntaxKind.NamespaceDeclaration) ||
+					container.IsKind(SyntaxKind.ClassDeclaration) ||
+					container.IsKind(SyntaxKind.StructDeclaration))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsTypeDeclarationContext(
+			this SyntaxTree syntaxTree,
+			int position,
+			CSharpSyntaxContext contextOpt,
+			ISet<SyntaxKind> validModifiers,
+			ISet<SyntaxKind> validTypeDeclarations,
+			bool canBePartial,
+			CancellationToken cancellationToken)
+		{
+			// We only allow nested types inside a class or struct, not inside a
+			// an interface or enum.
+			var typeDecl = contextOpt != null
+				? contextOpt.ContainingTypeDeclaration
+				: syntaxTree.GetContainingTypeDeclaration(position, cancellationToken);
+
+			validTypeDeclarations = validTypeDeclarations ?? SpecializedCollections.EmptySet<SyntaxKind>();
+
+			if (typeDecl != null)
+			{
+				if (!validTypeDeclarations.Contains(typeDecl.Kind()))
+				{
+					return false;
+				}
+			}
+
+			// Check many of the simple cases first.
+			var leftToken = contextOpt != null
+				? contextOpt.LeftToken
+				: syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+
+			if (syntaxTree.IsTypeDeclarationContext(position, leftToken, cancellationToken))
+			{
+				return true;
+			}
+
+			// If we're touching the right of an identifier, move back to
+			// previous token.
+			var token = contextOpt != null
+				? contextOpt.TargetToken
+				: leftToken.GetPreviousTokenIfTouchingWord(position);
+
+			// A type can also show up after certain types of modifiers
+			if (canBePartial &&
+				token.IsKindOrHasMatchingText(SyntaxKind.PartialKeyword))
+			{
+				return true;
+			}
+
+			// using static | is never a type declaration context
+			if (token.IsStaticKeywordInUsingDirective())
+			{
+				return false;
+			}
+
+			var modifierTokens = contextOpt != null
+				? contextOpt.PrecedingModifiers
+				: syntaxTree.GetPrecedingModifiers(position, leftToken, cancellationToken);
+
+			if (!modifierTokens.Any())
+			{
+				return false;
+			}
+
+			validModifiers = validModifiers ?? SpecializedCollections.EmptySet<SyntaxKind>();
+
+			if (modifierTokens.IsProperSubsetOf(validModifiers))
+			{
+				// the parent is the member
+				// the grandparent is the container of the member
+				var container = token.Parent.GetParent();
+				if (container.IsKind(SyntaxKind.CompilationUnit) ||
+					container.IsKind(SyntaxKind.NamespaceDeclaration) ||
+					container.IsKind(SyntaxKind.ClassDeclaration) ||
+					container.IsKind(SyntaxKind.StructDeclaration))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsNamespaceContext(
+			this SyntaxTree syntaxTree,
+			int position,
+			CancellationToken cancellationToken,
+			SemanticModel semanticModelOpt = null)
+		{
+			// first do quick exit check
+			if (syntaxTree.IsInNonUserCode(position, cancellationToken) ||
+				syntaxTree.IsRightOfDotOrArrow(position, cancellationToken))
+			{
+				return false;
+			}
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken)
+				.GetPreviousTokenIfTouchingWord(position);
+
+			// global::
+			if (token.Kind() == SyntaxKind.ColonColonToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.GlobalKeyword)
+			{
+				return true;
+			}
+
+			// using |
+			// but not:
+			// using | = Bar
+
+			// Note: we take care of the using alias case in the IsTypeContext
+			// call below.
+
+			if (token.Kind() == SyntaxKind.UsingKeyword)
+			{
+				var usingDirective = token.GetAncestor<UsingDirectiveSyntax>();
+				if (usingDirective != null)
+				{
+					if (token.GetNextToken(includeSkipped: true).Kind() != SyntaxKind.EqualsToken &&
+						usingDirective.Alias == null)
+					{
+						return true;
+					}
+				}
+			}
+
+			// using static |
+			if (token.IsStaticKeywordInUsingDirective())
+			{
+				return true;
+			}
+
+			// if it is not using directive location, most of places where 
+			// type can appear, namespace can appear as well
+			return syntaxTree.IsTypeContext(position, cancellationToken, semanticModelOpt);
+		}
+
+		public static bool IsDefinitelyNotTypeContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			return
+				syntaxTree.IsInNonUserCode(position, cancellationToken) ||
+				syntaxTree.IsRightOfDotOrArrow(position, cancellationToken);
+		}
+
+		public static bool IsTypeContext(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken, SemanticModel semanticModelOpt = null)
+		{
+			// first do quick exit check
+			if (syntaxTree.IsDefinitelyNotTypeContext(position, cancellationToken))
+			{
+				return false;
+			}
+
+			// okay, now it is a case where we can't use parse tree (valid or error recovery) to
+			// determine whether it is a right place to put type. use lex based one Cyrus created.
+
+			var tokenOnLeftOfPosition = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			return
+				syntaxTree.IsAfterKeyword(position, SyntaxKind.ConstKeyword, cancellationToken) ||
+				syntaxTree.IsAfterKeyword(position, SyntaxKind.CaseKeyword, cancellationToken) ||
+				syntaxTree.IsAfterKeyword(position, SyntaxKind.EventKeyword, cancellationToken) ||
+				syntaxTree.IsAfterKeyword(position, SyntaxKind.StackAllocKeyword, cancellationToken) ||
+				syntaxTree.IsAttributeNameContext(position, cancellationToken) ||
+				syntaxTree.IsBaseClassOrInterfaceContext(position, cancellationToken) ||
+				syntaxTree.IsCatchVariableDeclarationContext(position, cancellationToken) ||
+				syntaxTree.IsDefiniteCastTypeContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsDelegateReturnTypeContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsExpressionContext(position, tokenOnLeftOfPosition, attributes: true, cancellationToken: cancellationToken, semanticModelOpt: semanticModelOpt) ||
+				syntaxTree.IsPrimaryFunctionExpressionContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsGenericTypeArgumentContext(position, tokenOnLeftOfPosition, cancellationToken, semanticModelOpt) ||
+				syntaxTree.IsFixedVariableDeclarationContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsImplicitOrExplicitOperatorTypeContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsIsOrAsTypeContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsLocalVariableDeclarationContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsObjectCreationTypeContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsParameterTypeContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsPossibleLambdaOrAnonymousMethodParameterTypeContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsStatementContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsTypeParameterConstraintContext(position, tokenOnLeftOfPosition, cancellationToken) ||
+				syntaxTree.IsUsingAliasContext(position, cancellationToken) ||
+				syntaxTree.IsUsingStaticContext(position, cancellationToken) ||
+				syntaxTree.IsGlobalMemberDeclarationContext(position, SyntaxKindSet.AllGlobalMemberModifiers, cancellationToken) ||
+				syntaxTree.IsMemberDeclarationContext(
+					position,
+					contextOpt: null,
+					validModifiers: SyntaxKindSet.AllMemberModifiers,
+					validTypeDeclarations: SyntaxKindSet.ClassInterfaceStructTypeDeclarations,
+					canBePartial: false,
+					cancellationToken: cancellationToken);
+		}
+
+		public static bool IsBaseClassOrInterfaceContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			// class C : |
+			// class C : Bar, |
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.ColonToken ||
+				token.Kind() == SyntaxKind.CommaToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.BaseList))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsUsingAliasContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			// using Foo = |
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.EqualsToken &&
+				token.GetAncestor<UsingDirectiveSyntax>() != null)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsUsingStaticContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			// using static |
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			return token.IsStaticKeywordInUsingDirective();
+		}
+
+		public static bool IsTypeArgumentOfConstraintClause(
+			this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			// cases:
+			//   where |
+			//   class Foo<T> : Object where |
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.WhereKeyword &&
+				token.Parent.IsKind(SyntaxKind.TypeParameterConstraintClause))
+			{
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.IdentifierToken &&
+				token.HasMatchingText(SyntaxKind.WhereKeyword) &&
+				token.Parent.IsKind(SyntaxKind.IdentifierName) &&
+				token.Parent.IsParentKind(SyntaxKind.SimpleBaseType) &&
+				token.Parent.Parent.IsParentKind(SyntaxKind.BaseList))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsTypeParameterConstraintStartContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			// cases:
+			//   where T : |
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.ColonToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.IdentifierToken &&
+				token.GetPreviousToken(includeSkipped: true).GetPreviousToken().Kind() == SyntaxKind.WhereKeyword)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsTypeParameterConstraintContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			if (syntaxTree.IsTypeParameterConstraintStartContext(position, tokenOnLeftOfPosition, cancellationToken))
+			{
+				return true;
+			}
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			// Can't come after new()
+			//
+			//    where T : |
+			//    where T : class, |
+			//    where T : struct, |
+			//    where T : Foo, |
+			if (token.Kind() == SyntaxKind.CommaToken &&
+				token.Parent.IsKind(SyntaxKind.TypeParameterConstraintClause))
+			{
+				var constraintClause = token.Parent as TypeParameterConstraintClauseSyntax;
+
+				// Check if there's a 'new()' constraint.  If there isn't, or we're before it, then
+				// this is a type parameter constraint context. 
+				var firstConstructorConstraint = constraintClause.Constraints.FirstOrDefault(t => t is ConstructorConstraintSyntax);
+				if (firstConstructorConstraint == null || firstConstructorConstraint.SpanStart > token.Span.End)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsTypeOfExpressionContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenParenToken && token.Parent.IsKind(SyntaxKind.TypeOfExpression))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsDefaultExpressionContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenParenToken && token.Parent.IsKind(SyntaxKind.DefaultExpression))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsSizeOfExpressionContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenParenToken && token.Parent.IsKind(SyntaxKind.SizeOfExpression))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsGenericTypeArgumentContext(
+			this SyntaxTree syntaxTree,
+			int position,
+			SyntaxToken tokenOnLeftOfPosition,
+			CancellationToken cancellationToken,
+			SemanticModel semanticModelOpt = null)
+		{
+			// cases: 
+			//    Foo<|
+			//    Foo<Bar,|
+			//    Foo<Bar<Baz<int[],|
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() != SyntaxKind.LessThanToken && token.Kind() != SyntaxKind.CommaToken)
+			{
+				return false;
+			}
+
+			if (token.Parent is TypeArgumentListSyntax)
+			{
+				// Easy case, it was known to be a generic name, so this is a type argument context.
+				return true;
+			}
+
+			SyntaxToken nameToken;
+			if (!syntaxTree.IsInPartiallyWrittenGeneric(position, cancellationToken, out nameToken))
+			{
+				return false;
+			}
+
+			var name = nameToken.Parent as NameSyntax;
+			if (name == null)
+			{
+				return false;
+			}
+
+			// Looks viable!  If they provided a binding, then check if it binds properly to
+			// an actual generic entity.
+			if (semanticModelOpt == null)
+			{
+				// No binding.  Just make the decision based on the syntax tree.
+				return true;
+			}
+
+			// '?' is syntactically ambiguous in incomplete top-level statements:
+			//
+			// T ? foo<| 
+			//
+			// Might be an incomplete conditional expression or an incomplete declaration of a method returning a nullable type.
+			// Bind T to see if it is a type. If it is we don't show signature help.
+			if (name.IsParentKind(SyntaxKind.LessThanExpression) &&
+				name.Parent.IsParentKind(SyntaxKind.ConditionalExpression) &&
+				name.Parent.Parent.IsParentKind(SyntaxKind.ExpressionStatement) &&
+				name.Parent.Parent.Parent.IsParentKind(SyntaxKind.GlobalStatement))
+			{
+				var conditionOrType = semanticModelOpt.GetSymbolInfo(
+					((ConditionalExpressionSyntax)name.Parent.Parent).Condition, cancellationToken);
+				if (conditionOrType.GetBestOrAllSymbols().FirstOrDefault() != null &&
+					conditionOrType.GetBestOrAllSymbols().FirstOrDefault().Kind == SymbolKind.NamedType)
+				{
+					return false;
+				}
+			}
+
+			var symbols = semanticModelOpt.LookupName(nameToken, namespacesAndTypesOnly: SyntaxFacts.IsInNamespaceOrTypeContext(name), cancellationToken: cancellationToken);
+			return symbols.Any(s =>
+				s.TypeSwitch(
+					(INamedTypeSymbol nt) => nt.Arity > 0,
+					(IMethodSymbol m) => m.Arity > 0));
+		}
+
+		public static bool IsParameterModifierContext(
+			this SyntaxTree syntaxTree,
+			int position,
+			SyntaxToken tokenOnLeftOfPosition,
+			CancellationToken cancellationToken,
+			int? allowableIndex = null)
+		{
+			// cases:
+			//   Foo(|
+			//   Foo(int i, |
+			//   Foo([Bar]|
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.Parent.IsDelegateOrConstructorOrMethodParameterList())
+			{
+				if (allowableIndex.HasValue)
+				{
+					if (allowableIndex.Value != 0)
+					{
+						return false;
+					}
+				}
+
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.CommaToken &&
+				token.Parent.IsDelegateOrConstructorOrMethodParameterList())
+			{
+				if (allowableIndex.HasValue)
+				{
+					var parameterList = token.GetAncestor<ParameterListSyntax>();
+					var commaIndex = parameterList.Parameters.GetWithSeparators().IndexOf(token);
+					var index = commaIndex / 2 + 1;
+					if (index != allowableIndex.Value)
+					{
+						return false;
+					}
+				}
+
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.CloseBracketToken &&
+				token.Parent.IsKind(SyntaxKind.AttributeList) &&
+				token.Parent.IsParentKind(SyntaxKind.Parameter) &&
+				token.Parent.GetParent().GetParent().IsDelegateOrConstructorOrMethodParameterList())
+			{
+				if (allowableIndex.HasValue)
+				{
+					var parameter = token.GetAncestor<ParameterSyntax>();
+					var parameterList = parameter.GetAncestorOrThis<ParameterListSyntax>();
+
+					int parameterIndex = parameterList.Parameters.IndexOf(parameter);
+					if (allowableIndex.Value != parameterIndex)
+					{
+						return false;
+					}
+				}
+
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsDelegateReturnTypeContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.DelegateKeyword &&
+				token.Parent.IsKind(SyntaxKind.DelegateDeclaration))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsImplicitOrExplicitOperatorTypeContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OperatorKeyword)
+			{
+				if (token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.ImplicitKeyword ||
+					token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.ExplicitKeyword)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsParameterTypeContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.RefKeyword ||
+				token.Kind() == SyntaxKind.OutKeyword ||
+				token.Kind() == SyntaxKind.ParamsKeyword ||
+				token.Kind() == SyntaxKind.ThisKeyword)
+			{
+				position = token.SpanStart;
+				tokenOnLeftOfPosition = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			}
+
+			if (syntaxTree.IsParameterModifierContext(position, tokenOnLeftOfPosition, cancellationToken))
+			{
+				return true;
+			}
+
+			// int this[ |
+			// int this[int i, |
+			if (token.Kind() == SyntaxKind.OpenParenToken ||
+				token.Kind() == SyntaxKind.OpenBracketToken ||
+				token.Kind() == SyntaxKind.CommaToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.ParameterList, SyntaxKind.BracketedParameterList))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsPossibleLambdaParameterModifierContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenParenToken ||
+				token.Kind() == SyntaxKind.CommaToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.ParameterList) &&
+					token.Parent.IsParentKind(SyntaxKind.ParenthesizedLambdaExpression))
+				{
+					return true;
+				}
+
+				// TODO(cyrusn): Tie into semantic analysis system to only 
+				// consider this a lambda if this is a location where the
+				// lambda's type would be inferred because of a delegate
+				// or Expression<T> type.
+				if (token.Parent.IsKind(SyntaxKind.ParenthesizedExpression))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsAnonymousMethodParameterModifierContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenParenToken ||
+				token.Kind() == SyntaxKind.CommaToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.ParameterList) &&
+					token.Parent.IsParentKind(SyntaxKind.AnonymousMethodExpression))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsPossibleLambdaOrAnonymousMethodParameterTypeContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.RefKeyword ||
+				token.Kind() == SyntaxKind.OutKeyword)
+			{
+				position = token.SpanStart;
+				tokenOnLeftOfPosition = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			}
+
+			if (IsAnonymousMethodParameterModifierContext(syntaxTree, position, tokenOnLeftOfPosition, cancellationToken) ||
+				IsPossibleLambdaParameterModifierContext(syntaxTree, position, tokenOnLeftOfPosition, cancellationToken))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsValidContextForFromClause(
+			this SyntaxTree syntaxTree,
+			int position,
+			SyntaxToken tokenOnLeftOfPosition,
+			CancellationToken cancellationToken,
+			SemanticModel semanticModelOpt = null)
+		{
+			if (syntaxTree.IsExpressionContext(position, tokenOnLeftOfPosition, attributes: false, cancellationToken: cancellationToken, semanticModelOpt: semanticModelOpt) &&
+				!syntaxTree.IsConstantExpressionContext(position, tokenOnLeftOfPosition, cancellationToken))
+			{
+				return true;
+			}
+
+			// cases:
+			//   var q = |
+			//   var q = f|
+			//
+			//   var q = from x in y
+			//           |
+			//
+			//   var q = from x in y
+			//           f|
+			//
+			// this list is *not* exhaustive.
+			// the first two are handled by 'IsExpressionContext'
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			// var q = from x in y
+			//         |
+			if (!token.IntersectsWith(position) &&
+				token.IsLastTokenOfQueryClause())
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsValidContextForJoinClause(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			// var q = from x in y
+			//         |
+			if (!token.IntersectsWith(position) &&
+				token.IsLastTokenOfQueryClause())
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsDeclarationExpressionContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			// cases:
+			//  M(out var
+			//  var x = var
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.IsKind (SyntaxKind.OutKeyword) &&
+				token.Parent.IsKind(SyntaxKind.Argument))
+			{
+				return true;
+			}
+
+			if (token.IsKind(SyntaxKind.EqualsToken) &&
+				token.Parent.IsKind(SyntaxKind.EqualsValueClause) &&
+				token.Parent.IsParentKind(SyntaxKind.VariableDeclarator))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsLocalVariableDeclarationContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			// cases:
+			//  const var
+			//  for (var
+			//  foreach (var
+			//  using (var
+			//  from var
+			//  join var
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.ConstKeyword &&
+				token.Parent.IsKind(SyntaxKind.LocalDeclarationStatement))
+			{
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.OpenParenToken)
+			{
+				var previous = token.GetPreviousToken(includeSkipped: true);
+				if (previous.Kind() == SyntaxKind.ForKeyword ||
+					previous.Kind() == SyntaxKind.ForEachKeyword ||
+					previous.Kind() == SyntaxKind.UsingKeyword)
+				{
+					return true;
+				}
+			}
+
+			var tokenOnLeftOfStart = syntaxTree.FindTokenOnLeftOfPosition(token.SpanStart, cancellationToken);
+			if (token.IsKindOrHasMatchingText(SyntaxKind.FromKeyword) &&
+				syntaxTree.IsValidContextForFromClause(token.SpanStart, tokenOnLeftOfStart, cancellationToken))
+			{
+				return true;
+			}
+
+			if (token.IsKind(SyntaxKind.JoinKeyword) &&
+				syntaxTree.IsValidContextForJoinClause(token.SpanStart, tokenOnLeftOfStart, cancellationToken))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsFixedVariableDeclarationContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			// cases:
+			//  fixed (var
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.FixedKeyword)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsCatchVariableDeclarationContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			// cases:
+			//  catch (var
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.CatchKeyword)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsIsOrAsTypeContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.IsKeyword ||
+				token.Kind() == SyntaxKind.AsKeyword)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsObjectCreationTypeContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.NewKeyword)
+			{
+				// we can follow a 'new' if it's the 'new' for an expression.
+				var start = token.SpanStart;
+				var tokenOnLeftOfStart = syntaxTree.FindTokenOnLeftOfPosition(start, cancellationToken);
+				return
+					IsNonConstantExpressionContext(syntaxTree, token.SpanStart, tokenOnLeftOfStart, cancellationToken) ||
+					syntaxTree.IsStatementContext(token.SpanStart, tokenOnLeftOfStart, cancellationToken) ||
+					syntaxTree.IsGlobalStatementContext(token.SpanStart, cancellationToken);
+			}
+
+			return false;
+		}
+
+		private static bool IsNonConstantExpressionContext(SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			return
+				syntaxTree.IsExpressionContext(position, tokenOnLeftOfPosition, attributes: true, cancellationToken: cancellationToken) &&
+				!syntaxTree.IsConstantExpressionContext(position, tokenOnLeftOfPosition, cancellationToken);
+		}
+
+		public static bool IsPreProcessorDirectiveContext(this SyntaxTree syntaxTree, int position, SyntaxToken preProcessorTokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = preProcessorTokenOnLeftOfPosition;
+			var directive = token.GetAncestor<DirectiveTriviaSyntax>();
+
+			// Directives contain the EOL, so if the position is within the full span of the
+			// directive, then it is on that line, the only exception is if the directive is on the
+			// last line, the position at the end if technically not contained by the directive but
+			// its also not on a new line, so it should be considered part of the preprocessor
+			// context.
+			if (directive == null)
+			{
+				return false;
+			}
+
+			return
+				directive.FullSpan.Contains(position) ||
+				directive.FullSpan.End == syntaxTree.GetRoot(cancellationToken).FullSpan.End;
+		}
+
+		public static bool IsPreProcessorDirectiveContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var leftToken = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken, includeDirectives: true);
+
+			return syntaxTree.IsPreProcessorDirectiveContext(position, leftToken, cancellationToken);
+		}
+
+		public static bool IsPreProcessorKeywordContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			return IsPreProcessorKeywordContext(
+				syntaxTree, position,
+				syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken, includeDirectives: true),
+				cancellationToken);
+		}
+
+		public static bool IsPreProcessorKeywordContext(this SyntaxTree syntaxTree, int position, SyntaxToken preProcessorTokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			// cases:
+			//  #|
+			//  #d|
+			//  # |
+			//  # d|
+
+			// note: comments are not allowed between the # and item.
+			var token = preProcessorTokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.HashToken)
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsStatementContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			#if false
+			// we're in a statement if the thing that comes before allows for
+			// statements to follow.  Or if we're on a just started identifier
+			// in the first position where a statement can go.
+			if (syntaxTree.IsInPreprocessorDirectiveContext(position, cancellationToken))
+			{
+			return false;
+			}
+			#endif
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			return token.IsBeginningOfStatementContext();
+		}
+
+		public static bool IsGlobalStatementContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			if (!syntaxTree.IsInteractiveOrScript())
+			{
+				return false;
+			}
+
+			#if false
+			if (syntaxTree.IsInPreprocessorDirectiveContext(position, cancellationToken))
+			{
+			return false;
+			}
+			#endif
+
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken)
+				.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.None)
+			{
+				// global statements can't come before usings/externs
+				var compilationUnit = syntaxTree.GetRoot(cancellationToken) as CompilationUnitSyntax;
+				if (compilationUnit != null &&
+					(compilationUnit.Externs.Count > 0 ||
+						compilationUnit.Usings.Count > 0))
+				{
+					return false;
+				}
+
+				return true;
+			}
+
+			return token.IsBeginningOfGlobalStatementContext();
+		}
+
+		public static bool IsInstanceContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			#if false
+			if (syntaxTree.IsInPreprocessorDirectiveContext(position, cancellationToken))
+			{
+			return false;
+			}
+			#endif
+
+			var token = tokenOnLeftOfPosition;
+
+			// We're in an instance context if we're in the body of an instance member
+			var containingMember = token.GetAncestor<MemberDeclarationSyntax>();
+			if (containingMember == null)
+			{
+				return false;
+			}
+
+			var modifiers = containingMember.GetModifiers();
+			if (modifiers.Any(SyntaxKind.StaticKeyword))
+			{
+				return false;
+			}
+
+			// Must be a property or something method-like.
+			if (containingMember.HasMethodShape())
+			{
+				var body = containingMember.GetBody();
+				return IsInBlock(body, position);
+			}
+
+			var accessor = token.GetAncestor<AccessorDeclarationSyntax>();
+			if (accessor != null)
+			{
+				return IsInBlock(accessor.Body, position);
+			}
+
+			return false;
+		}
+
+		private static bool IsInBlock(BlockSyntax bodyOpt, int position)
+		{
+			if (bodyOpt == null)
+			{
+				return false;
+			}
+
+			return bodyOpt.OpenBraceToken.Span.End <= position &&
+				(bodyOpt.CloseBraceToken.IsMissing || position <= bodyOpt.CloseBraceToken.SpanStart);
+		}
+
+		public static bool IsPossibleCastTypeContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.IsKind(SyntaxKind.OpenParenToken) &&
+				syntaxTree.IsExpressionContext(token.SpanStart, syntaxTree.FindTokenOnLeftOfPosition(token.SpanStart, cancellationToken), false, cancellationToken))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsDefiniteCastTypeContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.Parent.IsKind(SyntaxKind.CastExpression))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsConstantExpressionContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord(position);
+
+			// case |
+			if (token.Kind() == SyntaxKind.CaseKeyword &&
+				token.Parent.IsKind(SyntaxKind.CaseSwitchLabel))
+			{
+				return true;
+			}
+
+			// goto case |
+			if (token.Kind() == SyntaxKind.CaseKeyword &&
+				token.Parent.IsKind(SyntaxKind.GotoCaseStatement))
+			{
+				return true;
+			}
+
+			if (token.Kind() == SyntaxKind.EqualsToken &&
+				token.Parent.IsKind(SyntaxKind.EqualsValueClause))
+			{
+				var equalsValue = (EqualsValueClauseSyntax)token.Parent;
+
+				if (equalsValue.IsParentKind(SyntaxKind.VariableDeclarator) &&
+					equalsValue.Parent.IsParentKind(SyntaxKind.VariableDeclaration))
+				{
+					// class C { const int i = |
+					var fieldDeclaration = equalsValue.GetAncestor<FieldDeclarationSyntax>();
+					if (fieldDeclaration != null)
+					{
+						return fieldDeclaration.Modifiers.Any(SyntaxKind.ConstKeyword);
+					}
+
+					// void M() { const int i = |
+					var localDeclaration = equalsValue.GetAncestor<LocalDeclarationStatementSyntax>();
+					if (localDeclaration != null)
+					{
+						return localDeclaration.Modifiers.Any(SyntaxKind.ConstKeyword);
+					}
+				}
+
+				// enum E { A = |
+				if (equalsValue.IsParentKind(SyntaxKind.EnumMemberDeclaration))
+				{
+					return true;
+				}
+
+				// void M(int i = |
+				if (equalsValue.IsParentKind(SyntaxKind.Parameter))
+				{
+					return true;
+				}
+			}
+
+			// [Foo( |
+			// [Foo(x, |
+			if (token.Parent.IsKind(SyntaxKind.AttributeArgumentList) &&
+				(token.Kind() == SyntaxKind.CommaToken ||
+					token.Kind() == SyntaxKind.OpenParenToken))
+			{
+				return true;
+			}
+
+			// [Foo(x: |
+			if (token.Kind() == SyntaxKind.ColonToken &&
+				token.Parent.IsKind(SyntaxKind.NameColon) &&
+				token.Parent.IsParentKind(SyntaxKind.AttributeArgument))
+			{
+				return true;
+			}
+
+			// [Foo(X = |
+			if (token.Kind() == SyntaxKind.EqualsToken &&
+				token.Parent.IsKind(SyntaxKind.NameEquals) &&
+				token.Parent.IsParentKind(SyntaxKind.AttributeArgument))
+			{
+				return true;
+			}
+
+			// TODO: Fixed-size buffer declarations
+
+			return false;
+		}
+
+		public static bool IsLabelContext(this SyntaxTree syntaxTree, int position, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+
+			var gotoStatement = token.GetAncestor<GotoStatementSyntax>();
+			if (gotoStatement != null)
+			{
+				if (gotoStatement.GotoKeyword == token)
+				{
+					return true;
+				}
+
+				if (gotoStatement.Expression != null &&
+					!gotoStatement.Expression.IsMissing &&
+					gotoStatement.Expression is IdentifierNameSyntax &&
+					((IdentifierNameSyntax)gotoStatement.Expression).Identifier == token &&
+					token.IntersectsWith(position))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsExpressionContext(
+			this SyntaxTree syntaxTree,
+			int position,
+			SyntaxToken tokenOnLeftOfPosition,
+			bool attributes,
+			CancellationToken cancellationToken,
+			SemanticModel semanticModelOpt = null)
+		{
+			// cases:
+			//   var q = |
+			//   var q = a|
+			// this list is *not* exhaustive.
+
+			var token = tokenOnLeftOfPosition.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.GetAncestor<ConditionalDirectiveTriviaSyntax>() != null)
+			{
+				return false;
+			}
+
+			if (!attributes)
+			{
+				if (token.GetAncestor<AttributeListSyntax>() != null)
+				{
+					return false;
+				}
+			}
+
+			if (syntaxTree.IsConstantExpressionContext(position, tokenOnLeftOfPosition, cancellationToken))
+			{
+				return true;
+			}
+
+			// no expressions after .   ::   ->
+			if (token.Kind() == SyntaxKind.DotToken ||
+				token.Kind() == SyntaxKind.ColonColonToken ||
+				token.Kind() == SyntaxKind.MinusGreaterThanToken)
+			{
+				return false;
+			}
+
+			// Normally you can have any sort of expression after an equals. However, this does not
+			// apply to a "using Foo = ..." situation.
+			if (token.Kind() == SyntaxKind.EqualsToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.NameEquals) &&
+					token.Parent.IsParentKind(SyntaxKind.UsingDirective))
+				{
+					return false;
+				}
+			}
+
+			// q = |
+			// q -= |
+			// q *= |
+			// q += |
+			// q /= |
+			// q ^= |
+			// q %= |
+			// q &= |
+			// q |= |
+			// q <<= |
+			// q >>= |
+			if (token.Kind() == SyntaxKind.EqualsToken ||
+				token.Kind() == SyntaxKind.MinusEqualsToken ||
+				token.Kind() == SyntaxKind.AsteriskEqualsToken ||
+				token.Kind() == SyntaxKind.PlusEqualsToken ||
+				token.Kind() == SyntaxKind.SlashEqualsToken ||
+				token.Kind() == SyntaxKind.ExclamationEqualsToken ||
+				token.Kind() == SyntaxKind.CaretEqualsToken ||
+				token.Kind() == SyntaxKind.AmpersandEqualsToken ||
+				token.Kind() == SyntaxKind.BarEqualsToken ||
+				token.Kind() == SyntaxKind.PercentEqualsToken ||
+				token.Kind() == SyntaxKind.LessThanLessThanEqualsToken ||
+				token.Kind() == SyntaxKind.GreaterThanGreaterThanEqualsToken)
+			{
+				return true;
+			}
+
+			// ( |
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.Parent.IsKind(SyntaxKind.ParenthesizedExpression))
+			{
+				return true;
+			}
+
+			// - |
+			// + |
+			// ~ |
+			// ! |
+			if (token.Parent is PrefixUnaryExpressionSyntax)
+			{
+				var prefix = token.Parent as PrefixUnaryExpressionSyntax;
+				return prefix.OperatorToken == token;
+			}
+
+			// not sure about these:
+			//   ++ |
+			//   -- |
+			#if false
+			token.Kind == SyntaxKind.PlusPlusToken ||
+			token.Kind == SyntaxKind.DashDashToken)
+			#endif
+			// await |
+			if (token.Parent is AwaitExpressionSyntax)
+			{
+				var awaitExpression = token.Parent as AwaitExpressionSyntax;
+				return awaitExpression.AwaitKeyword == token;
+			}
+
+			// Check for binary operators.
+			// Note:
+			//   - We handle < specially as it can be ambiguous with generics.
+			//   - We handle * specially because it can be ambiguous with pointer types.
+
+			// a *
+			// a /
+			// a %
+			// a +
+			// a -
+			// a <<
+			// a >>
+			// a <
+			// a >
+			// a &&
+			// a ||
+			// a &
+			// a |
+			// a ^
+			if (token.Parent is BinaryExpressionSyntax)
+			{
+				// If the client provided a binding, then check if this is actually generic.  If so,
+				// then this is not an expression context. i.e. if we have "Foo < |" then it could
+				// be an expression context, or it could be a type context if Foo binds to a type or
+				// method.
+				if (semanticModelOpt != null && syntaxTree.IsGenericTypeArgumentContext(position, tokenOnLeftOfPosition, cancellationToken, semanticModelOpt))
+				{
+					return false;
+				}
+
+				var binary = token.Parent as BinaryExpressionSyntax;
+				if (binary.OperatorToken == token)
+				{
+					// If this is a multiplication expression and a semantic model was passed in,
+					// check to see if the expression to the left is a type name. If it is, treat
+					// this as a pointer type.
+					if (token.Kind() == SyntaxKind.AsteriskToken && semanticModelOpt != null)
+					{
+						var type = binary.Left as TypeSyntax;
+						if (type != null && type.IsPotentialTypeName(semanticModelOpt, cancellationToken))
+						{
+							return false;
+						}
+					}
+
+					return true;
+				}
+			}
+
+			// Special case:
+			//    Foo * bar
+			//    Foo ? bar
+			// This parses as a local decl called bar of type Foo* or Foo?
+			if (tokenOnLeftOfPosition.IntersectsWith(position) &&
+				tokenOnLeftOfPosition.Kind() == SyntaxKind.IdentifierToken)
+			{
+				var previousToken = tokenOnLeftOfPosition.GetPreviousToken(includeSkipped: true);
+				if (previousToken.Kind() == SyntaxKind.AsteriskToken ||
+					previousToken.Kind() == SyntaxKind.QuestionToken)
+				{
+					if (previousToken.Parent.IsKind(SyntaxKind.PointerType) ||
+						previousToken.Parent.IsKind(SyntaxKind.NullableType))
+					{
+						var type = previousToken.Parent as TypeSyntax;
+						if (type.IsParentKind(SyntaxKind.VariableDeclaration) &&
+							type.Parent.IsParentKind(SyntaxKind.LocalDeclarationStatement))
+						{
+							// var declStatement = type.Parent.Parent as LocalDeclarationStatementSyntax;
+
+							// note, this doesn't apply for cases where we know it 
+							// absolutely is not multiplcation or a conditional expression.
+							var underlyingType = type is PointerTypeSyntax
+								? ((PointerTypeSyntax)type).ElementType
+								: ((NullableTypeSyntax)type).ElementType;
+
+							if (!underlyingType.IsPotentialTypeName(semanticModelOpt, cancellationToken))
+							{
+								return true;
+							}
+						}
+					}
+				}
+			}
+
+			// new int[|
+			// new int[expr, |
+			if (token.Kind() == SyntaxKind.OpenBracketToken ||
+				token.Kind() == SyntaxKind.CommaToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.ArrayRankSpecifier))
+				{
+					return true;
+				}
+			}
+
+			// foo ? |
+			if (token.Kind() == SyntaxKind.QuestionToken &&
+				token.Parent.IsKind(SyntaxKind.ConditionalExpression))
+			{
+				// If the condition is simply a TypeSyntax that binds to a type, treat this as a nullable type.
+				var conditionalExpression = (ConditionalExpressionSyntax)token.Parent;
+				var type = conditionalExpression.Condition as TypeSyntax;
+
+				return type == null
+					|| !type.IsPotentialTypeName(semanticModelOpt, cancellationToken);
+			}
+
+			// foo ? bar : |
+			if (token.Kind() == SyntaxKind.ColonToken &&
+				token.Parent.IsKind(SyntaxKind.ConditionalExpression))
+			{
+				return true;
+			}
+
+			// typeof(|
+			// default(|
+			// sizeof(|
+			if (token.Kind() == SyntaxKind.OpenParenToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.TypeOfExpression, SyntaxKind.DefaultExpression, SyntaxKind.SizeOfExpression))
+				{
+					return false;
+				}
+			}
+
+			// Foo(|
+			// Foo(expr, |
+			// this[|
+			if (token.Kind() == SyntaxKind.OpenParenToken ||
+				token.Kind() == SyntaxKind.OpenBracketToken ||
+				token.Kind() == SyntaxKind.CommaToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.ArgumentList, SyntaxKind.BracketedArgumentList))
+				{
+					return true;
+				}
+			}
+
+			// [Foo(|
+			// [Foo(expr, |
+			if (attributes)
+			{
+				if (token.Kind() == SyntaxKind.OpenParenToken ||
+					token.Kind() == SyntaxKind.CommaToken)
+				{
+					if (token.Parent.IsKind(SyntaxKind.AttributeArgumentList))
+					{
+						return true;
+					}
+				}
+			}
+
+			// Foo(ref |
+			// Foo(bar |
+			if (token.Kind() == SyntaxKind.RefKeyword ||
+				token.Kind() == SyntaxKind.OutKeyword)
+			{
+				if (token.Parent.IsKind(SyntaxKind.Argument))
+				{
+					return true;
+				}
+			}
+
+			// Foo(bar: |
+			if (token.Kind() == SyntaxKind.ColonToken &&
+				token.Parent.IsKind(SyntaxKind.NameColon) &&
+				token.Parent.IsParentKind(SyntaxKind.Argument))
+			{
+				return true;
+			}
+
+			// a => |
+			if (token.Kind() == SyntaxKind.EqualsGreaterThanToken)
+			{
+				return true;
+			}
+
+			// new List<int> { |
+			// new List<int> { expr, |
+			if (token.Kind() == SyntaxKind.OpenBraceToken ||
+				token.Kind() == SyntaxKind.CommaToken)
+			{
+				if (token.Parent is InitializerExpressionSyntax)
+				{
+					// The compiler treats the ambiguous case as an object initializer, so we'll say
+					// expressions are legal here
+					if (token.Parent.Kind() == SyntaxKind.ObjectInitializerExpression && token.Kind() == SyntaxKind.OpenBraceToken)
+					{
+						// In this position { a$$ =, the user is trying to type an object initializer.
+						if (!token.IntersectsWith(position) && token.GetNextToken().GetNextToken().Kind() == SyntaxKind.EqualsToken)
+						{
+							return false;
+						}
+
+						return true;
+					}
+
+					// Perform a semantic check to determine whether or not the type being created
+					// can support a collection initializer. If not, this must be an object initializer
+					// and can't be an expression context.
+					if (semanticModelOpt != null &&
+						token.Parent.IsParentKind(SyntaxKind.ObjectCreationExpression))
+					{
+						var objectCreation = (ObjectCreationExpressionSyntax)token.Parent.Parent;
+						var type = semanticModelOpt.GetSymbolInfo(objectCreation.Type, cancellationToken).Symbol as ITypeSymbol;
+						if (type != null && !type.CanSupportCollectionInitializer())
+						{
+							return false;
+						}
+					}
+
+					return true;
+				}
+			}
+
+			// for (; |
+			// for (; ; |
+			if (token.Kind() == SyntaxKind.SemicolonToken &&
+				token.Parent.IsKind(SyntaxKind.ForStatement))
+			{
+				var forStatement = (ForStatementSyntax)token.Parent;
+				if (token == forStatement.FirstSemicolonToken ||
+					token == forStatement.SecondSemicolonToken)
+				{
+					return true;
+				}
+			}
+
+			// for ( |
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.Parent.IsKind(SyntaxKind.ForStatement))
+			{
+				var forStatement = (ForStatementSyntax)token.Parent;
+				if (token == forStatement.OpenParenToken)
+				{
+					return true;
+				}
+			}
+
+			// for (; ; Foo(), | 
+			// for ( Foo(), |
+			if (token.Kind() == SyntaxKind.CommaToken &&
+				token.Parent.IsKind(SyntaxKind.ForStatement))
+			{
+				return true;
+			}
+
+			// foreach (var v in |
+			// from a in |
+			// join b in |
+			if (token.Kind() == SyntaxKind.InKeyword)
+			{
+				if (token.Parent.IsKind(SyntaxKind.ForEachStatement, SyntaxKind.FromClause, SyntaxKind.JoinClause))
+				{
+					return true;
+				}
+			}
+
+			// join x in y on |
+			// join x in y on a equals |
+			if (token.Kind() == SyntaxKind.OnKeyword ||
+				token.Kind() == SyntaxKind.EqualsKeyword)
+			{
+				if (token.Parent.IsKind(SyntaxKind.JoinClause))
+				{
+					return true;
+				}
+			}
+
+			// where |
+			if (token.Kind() == SyntaxKind.WhereKeyword &&
+				token.Parent.IsKind(SyntaxKind.WhereClause))
+			{
+				return true;
+			}
+
+			// orderby |
+			// orderby a, |
+			if (token.Kind() == SyntaxKind.OrderByKeyword ||
+				token.Kind() == SyntaxKind.CommaToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.OrderByClause))
+				{
+					return true;
+				}
+			}
+
+			// select |
+			if (token.Kind() == SyntaxKind.SelectKeyword &&
+				token.Parent.IsKind(SyntaxKind.SelectClause))
+			{
+				return true;
+			}
+
+			// group |
+			// group expr by |
+			if (token.Kind() == SyntaxKind.GroupKeyword ||
+				token.Kind() == SyntaxKind.ByKeyword)
+			{
+				if (token.Parent.IsKind(SyntaxKind.GroupClause))
+				{
+					return true;
+				}
+			}
+
+			// return |
+			// yield return |
+			// but not: [return |
+			if (token.Kind() == SyntaxKind.ReturnKeyword)
+			{
+				if (token.GetPreviousToken(includeSkipped: true).Kind() != SyntaxKind.OpenBracketToken)
+				{
+					return true;
+				}
+			}
+
+			// throw |
+			if (token.Kind() == SyntaxKind.ThrowKeyword)
+			{
+				return true;
+			}
+
+			// while ( |
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.WhileKeyword)
+			{
+				return true;
+			}
+
+			// todo: handle 'for' cases.
+
+			// using ( |
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.UsingKeyword)
+			{
+				return true;
+			}
+
+			// lock ( |
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.LockKeyword)
+			{
+				return true;
+			}
+
+			// lock ( |
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.IfKeyword)
+			{
+				return true;
+			}
+
+			// switch ( |
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.SwitchKeyword)
+			{
+				return true;
+			}
+
+			// checked ( |
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.CheckedKeyword)
+			{
+				return true;
+			}
+
+			// unchecked ( |
+			if (token.Kind() == SyntaxKind.OpenParenToken &&
+				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.UncheckedKeyword)
+			{
+				return true;
+			}
+
+			// TODO: Uncomment on roslyn update when keyord currently missing.
+			// when ( |
+//			if (token.Kind() == SyntaxKind.OpenParenToken &&
+//				token.GetPreviousToken(includeSkipped: true).Kind() == SyntaxKind.WhenKeyword)
+//			{
+//				return true;
+//			}
+
+			// (SomeType) |
+			if (token.IsAfterPossibleCast())
+			{
+				return true;
+			}
+
+			// In anonymous type initializer.
+			//
+			// new { | We allow new inside of anonymous object member declarators, so that the user
+			// can dot into a member afterward. For example:
+			//
+			// var a = new { new C().Foo };
+			if (token.Kind() == SyntaxKind.OpenBraceToken || token.Kind() == SyntaxKind.CommaToken)
+			{
+				if (token.Parent.IsKind(SyntaxKind.AnonymousObjectCreationExpression))
+				{
+					return true;
+				}
+			}
+
+			// $"{ |
+			// $@"{ |
+			// $"{x} { |
+			// $@"{x} { |
+			// TODO: Uncomment on roslyn update.
+//			if (token.Kind() == SyntaxKind.OpenBraceToken)
+//			{
+//				return token.Parent.IsKind(SyntaxKind.Interpolation)
+//					&& ((InterpolationSyntax)token.Parent).OpenBraceToken == token;
+//			}
+//
+			return false;
+		}
+
+		public static bool IsNameOfContext(this SyntaxTree syntaxTree, int position, SemanticModel semanticModelOpt = null, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			// nameof(Foo.|
+			// nameof(Foo.Bar.|
+			// Locate the open paren.
+			if (token.IsKind(SyntaxKind.DotToken))
+			{
+				// Could have been parsed as member access
+				if (token.Parent.IsKind(SyntaxKind.SimpleMemberAccessExpression))
+				{
+					var parentMemberAccess = token.Parent;
+					while (parentMemberAccess.IsParentKind(SyntaxKind.SimpleMemberAccessExpression))
+					{
+						parentMemberAccess = parentMemberAccess.Parent;
+					}
+
+					if (parentMemberAccess.IsParentKind(SyntaxKind.Argument) &&
+						parentMemberAccess.Parent.IsChildNode<ArgumentListSyntax>(a => a.Arguments.FirstOrDefault()))
+					{
+						token = ((ArgumentListSyntax)parentMemberAccess.Parent.Parent).OpenParenToken;
+					}
+				}
+
+				// Could have been parsed as a qualified name.
+				if (token.Parent.IsKind(SyntaxKind.QualifiedName))
+				{
+					var parentQualifiedName = token.Parent;
+					while (parentQualifiedName.IsParentKind(SyntaxKind.QualifiedName))
+					{
+						parentQualifiedName = parentQualifiedName.Parent;
+					}
+
+					if (parentQualifiedName.IsParentKind(SyntaxKind.Argument) &&
+						parentQualifiedName.Parent.IsChildNode<ArgumentListSyntax>(a => a.Arguments.FirstOrDefault()))
+					{
+						token = ((ArgumentListSyntax)parentQualifiedName.Parent.Parent).OpenParenToken;
+					}
+				}
+			}
+
+			ExpressionSyntax parentExpression = null;
+
+			// if the nameof expression has a missing close paren, it is parsed as an invocation expression.
+			if (token.Parent.IsKind(SyntaxKind.ArgumentList) &&
+				token.Parent.IsParentKind(SyntaxKind.InvocationExpression))
+			{
+				var invocationExpression = (InvocationExpressionSyntax)token.Parent.Parent;
+				if (!invocationExpression.IsParentKind(SyntaxKind.ConditionalAccessExpression) &&
+					!invocationExpression.IsParentKind(SyntaxKind.SimpleMemberAccessExpression) &&
+					!invocationExpression.IsParentKind(SyntaxKind.PointerMemberAccessExpression) &&
+					invocationExpression.Expression.IsKind(SyntaxKind.IdentifierName) &&
+					((IdentifierNameSyntax)invocationExpression.Expression).Identifier.IsKindOrHasMatchingText(SyntaxKind.NameOfKeyword))
+				{
+					parentExpression = invocationExpression;
+				}
+			}
+
+			if (parentExpression != null)
+			{
+				if (semanticModelOpt == null)
+				{
+					return true;
+				}
+
+				return semanticModelOpt.GetSymbolInfo(parentExpression, cancellationToken).Symbol == null;
+			}
+
+			return false;
+		}
+
+		public static bool IsIsOrAsContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			// cases:
+			//    expr |
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.GetAncestor<BlockSyntax>() == null)
+			{
+				return false;
+			}
+
+			// is/as are valid after expressions.
+			if (token.IsLastTokenOfNode<ExpressionSyntax>())
+			{
+				// However, many names look like expressions.  For example:
+				//    foreach (var |
+				// ('var' is a TypeSyntax which is an expression syntax.
+
+				var type = token.GetAncestors<TypeSyntax>().LastOrDefault();
+				if (type == null)
+				{
+					return true;
+				}
+
+				if (type.IsKind(SyntaxKind.GenericName) ||
+					type.IsKind(SyntaxKind.AliasQualifiedName) ||
+					type.IsKind(SyntaxKind.PredefinedType))
+				{
+					return false;
+				}
+
+				ExpressionSyntax nameExpr = type;
+				if (IsRightSideName(nameExpr))
+				{
+					nameExpr = (ExpressionSyntax)nameExpr.Parent;
+				}
+
+				// If this name is the start of a local variable declaration context, we
+				// shouldn't show is or as. For example: for(var |
+				if (syntaxTree.IsLocalVariableDeclarationContext(token.SpanStart, syntaxTree.FindTokenOnLeftOfPosition(token.SpanStart, cancellationToken), cancellationToken))
+				{
+					return false;
+				}
+
+				// Not on the left hand side of an object initializer
+				if (token.IsKind(SyntaxKind.IdentifierToken) &&
+					token.Parent.IsKind(SyntaxKind.IdentifierName) &&
+					(token.Parent.IsParentKind(SyntaxKind.ObjectInitializerExpression) || token.Parent.IsParentKind(SyntaxKind.CollectionInitializerExpression)))
+				{
+					return false;
+				}
+
+				// Not after an 'out' declaration expression. For example: M(out var |
+				if (token.IsKind(SyntaxKind.IdentifierToken) &&
+					token.Parent.IsKind(SyntaxKind.IdentifierName))
+				{
+					if (token.Parent.IsParentKind(SyntaxKind.Argument) &&
+						((ArgumentSyntax)token.Parent.Parent).RefOrOutKeyword.IsKind(SyntaxKind.OutKeyword))
+					{
+						return false;
+					}
+				}
+
+				// Now, make sure the name was actually in a location valid for
+				// an expression.  If so, then we know we can follow it.
+				if (syntaxTree.IsExpressionContext(nameExpr.SpanStart, syntaxTree.FindTokenOnLeftOfPosition(nameExpr.SpanStart, cancellationToken), attributes: false, cancellationToken: cancellationToken))
+				{
+					return true;
+				}
+
+				return false;
+			}
+
+			return false;
+		}
+
+		private static bool IsRightSideName(ExpressionSyntax name)
+		{
+			if (name.Parent != null)
+			{
+				switch (name.Parent.Kind())
+				{
+				case SyntaxKind.QualifiedName:
+					return ((QualifiedNameSyntax)name.Parent).Right == name;
+				case SyntaxKind.AliasQualifiedName:
+					return ((AliasQualifiedNameSyntax)name.Parent).Name == name;
+				case SyntaxKind.SimpleMemberAccessExpression:
+					return ((MemberAccessExpressionSyntax)name.Parent).Name == name;
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsCatchOrFinallyContext(
+			this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			// cases:
+			// try { 
+			// } |
+
+			// try {
+			// } c|
+
+			// try {
+			// } catch {
+			// } |
+
+			// try {
+			// } catch {
+			// } c|
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.Kind() == SyntaxKind.CloseBraceToken)
+			{
+				var block = token.GetAncestor<BlockSyntax>();
+
+				if (block != null && token == block.GetLastToken(includeSkipped: true))
+				{
+					if (block.IsParentKind(SyntaxKind.TryStatement) ||
+						block.IsParentKind(SyntaxKind.CatchClause))
+					{
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		public static bool IsCatchFilterContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition)
+		{
+			// cases:
+			//  catch |
+			//  catch i|
+			//  catch (declaration) |
+			//  catch (declaration) i|
+
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			if (token.IsKind(SyntaxKind.CatchKeyword))
+			{
+				return true;
+			}
+
+			if (token.IsKind(SyntaxKind.CloseParenToken) &&
+				token.Parent.IsKind(SyntaxKind.CatchDeclaration))
+			{
+				return true;
+			}
+
+			return false;
+		}
+
+		public static bool IsEnumBaseListContext(this SyntaxTree syntaxTree, int position, SyntaxToken tokenOnLeftOfPosition, CancellationToken cancellationToken)
+		{
+			var token = tokenOnLeftOfPosition;
+			token = token.GetPreviousTokenIfTouchingWord(position);
+
+			// Options:
+			//  enum E : |
+			//  enum E : i|
+
+			return
+				token.Kind() == SyntaxKind.ColonToken &&
+				token.Parent.IsKind(SyntaxKind.BaseList) &&
+				token.Parent.IsParentKind(SyntaxKind.EnumDeclaration);
+		}
+
+		public static bool IsEnumTypeMemberAccessContext(this SyntaxTree syntaxTree, SemanticModel semanticModel, int position, CancellationToken cancellationToken)
+		{
+			var token = syntaxTree
+				.FindTokenOnLeftOfPosition(position, cancellationToken)
+				.GetPreviousTokenIfTouchingWord(position);
+
+			if (!token.IsKind(SyntaxKind.DotToken) ||
+				!token.Parent.IsKind(SyntaxKind.SimpleMemberAccessExpression))
+			{
+				return false;
+			}
+
+			var memberAccess = (MemberAccessExpressionSyntax)token.Parent;
+			var leftHandBinding = semanticModel.GetSymbolInfo(memberAccess.Expression, cancellationToken);
+			var symbol = leftHandBinding.GetBestOrAllSymbols().FirstOrDefault();
+
+			if (symbol == null)
+			{
+				return false;
+			}
+
+			switch (symbol.Kind)
+			{
+			case SymbolKind.NamedType:
+				return ((INamedTypeSymbol)symbol).TypeKind == TypeKind.Enum;
+			case SymbolKind.Alias:
+				var target = ((IAliasSymbol)symbol).Target;
+				return target.IsType && ((ITypeSymbol)target).TypeKind == TypeKind.Enum;
+			}
+
+			return false;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/SyntaxTriviaExtensions.cs b/main/src/addins/CSharpBinding/Util/SyntaxTriviaExtensions.cs
new file mode 100644
index 0000000000..6cf5554eee
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntaxTriviaExtensions.cs
@@ -0,0 +1,209 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class SyntaxTriviaExtensions
+	{
+		public static int Width(this SyntaxTrivia trivia)
+		{
+			return trivia.Span.Length;
+		}
+
+		public static int FullWidth(this SyntaxTrivia trivia)
+		{
+			return trivia.FullSpan.Length;
+		}
+
+		public static bool IsElastic(this SyntaxTrivia trivia)
+		{
+			return trivia.HasAnnotation(SyntaxAnnotation.ElasticAnnotation);
+		}
+
+		public static bool MatchesKind(this SyntaxTrivia trivia, SyntaxKind kind)
+		{
+			return trivia.Kind() == kind;
+		}
+
+		public static bool MatchesKind(this SyntaxTrivia trivia, SyntaxKind kind1, SyntaxKind kind2)
+		{
+			var triviaKind = trivia.Kind();
+			return triviaKind == kind1 || triviaKind == kind2;
+		}
+
+		public static bool MatchesKind(this SyntaxTrivia trivia, params SyntaxKind[] kinds)
+		{
+			return kinds.Contains(trivia.Kind());
+		}
+
+		public static bool IsRegularComment(this SyntaxTrivia trivia)
+		{
+			return trivia.IsSingleLineComment() || trivia.IsMultiLineComment();
+		}
+
+		public static bool IsRegularOrDocComment(this SyntaxTrivia trivia)
+		{
+			return trivia.IsSingleLineComment() || trivia.IsMultiLineComment() || trivia.IsDocComment();
+		}
+
+		public static bool IsSingleLineComment(this SyntaxTrivia trivia)
+		{
+			return trivia.Kind() == SyntaxKind.SingleLineCommentTrivia;
+		}
+
+		public static bool IsMultiLineComment(this SyntaxTrivia trivia)
+		{
+			return trivia.Kind() == SyntaxKind.MultiLineCommentTrivia;
+		}
+
+		public static bool IsCompleteMultiLineComment(this SyntaxTrivia trivia)
+		{
+			if (trivia.Kind() != SyntaxKind.MultiLineCommentTrivia)
+			{
+				return false;
+			}
+
+			var text = trivia.ToFullString();
+			return text.Length >= 4
+				&& text[text.Length - 1] == '/'
+				&& text[text.Length - 2] == '*';
+		}
+
+		public static bool IsDocComment(this SyntaxTrivia trivia)
+		{
+			return trivia.IsSingleLineDocComment() || trivia.IsMultiLineDocComment();
+		}
+
+		public static bool IsSingleLineDocComment(this SyntaxTrivia trivia)
+		{
+			return trivia.Kind() == SyntaxKind.SingleLineDocumentationCommentTrivia;
+		}
+
+		public static bool IsMultiLineDocComment(this SyntaxTrivia trivia)
+		{
+			return trivia.Kind() == SyntaxKind.MultiLineDocumentationCommentTrivia;
+		}
+
+		public static string GetCommentText(this SyntaxTrivia trivia)
+		{
+			var commentText = trivia.ToString();
+			if (trivia.Kind() == SyntaxKind.SingleLineCommentTrivia)
+			{
+				if (commentText.StartsWith("//"))
+				{
+					commentText = commentText.Substring(2);
+				}
+
+				return commentText.TrimStart(null);
+			}
+			else if (trivia.Kind() == SyntaxKind.MultiLineCommentTrivia)
+			{
+				var textBuilder = new StringBuilder();
+
+				if (commentText.EndsWith("*/"))
+				{
+					commentText = commentText.Substring(0, commentText.Length - 2);
+				}
+
+				if (commentText.StartsWith("/*"))
+				{
+					commentText = commentText.Substring(2);
+				}
+
+				commentText = commentText.Trim();
+
+				var newLine = Environment.NewLine;
+				var lines = commentText.Split(new[] { newLine }, StringSplitOptions.None);
+				foreach (var line in lines)
+				{
+					var trimmedLine = line.Trim();
+
+					// Note: we trim leading '*' characters in multi-line comments.
+					// If the '*' was intentional, sorry, it's gone.
+					if (trimmedLine.StartsWith("*"))
+					{
+						trimmedLine = trimmedLine.TrimStart('*');
+						trimmedLine = trimmedLine.TrimStart(null);
+					}
+
+					textBuilder.AppendLine(trimmedLine);
+				}
+
+				// remove last line break
+				textBuilder.Remove(textBuilder.Length - newLine.Length, newLine.Length);
+
+				return textBuilder.ToString();
+			}
+			else
+			{
+				throw new InvalidOperationException();
+			}
+		}
+
+		public static string AsString(this IEnumerable<SyntaxTrivia> trivia)
+		{
+			//Contract.ThrowIfNull(trivia);
+
+			if (trivia.Any())
+			{
+				var sb = new StringBuilder();
+				trivia.Select(t => t.ToFullString()).Do((s) => sb.Append(s));
+				return sb.ToString();
+			}
+			else
+			{
+				return string.Empty;
+			}
+		}
+
+		public static int GetFullWidth(this IEnumerable<SyntaxTrivia> trivia)
+		{
+			//Contract.ThrowIfNull(trivia);
+			return trivia.Sum(t => t.FullWidth());
+		}
+
+		public static SyntaxTriviaList AsTrivia(this string s)
+		{
+			return SyntaxFactory.ParseLeadingTrivia(s ?? string.Empty);
+		}
+
+		public static bool IsWhitespaceOrEndOfLine(this SyntaxTrivia trivia)
+		{
+			return trivia.Kind() == SyntaxKind.WhitespaceTrivia || trivia.Kind() == SyntaxKind.EndOfLineTrivia;
+		}
+
+		public static SyntaxTrivia GetPreviousTrivia(
+			this SyntaxTrivia trivia, SyntaxTree syntaxTree, CancellationToken cancellationToken, bool findInsideTrivia = false)
+		{
+			var span = trivia.FullSpan;
+			if (span.Start == 0)
+			{
+				return default(SyntaxTrivia);
+			}
+
+			return syntaxTree.GetRoot(cancellationToken).FindTrivia(span.Start - 1, findInsideTrivia);
+		}
+
+		#if false
+		public static int Width(this SyntaxTrivia trivia)
+		{
+		return trivia.Span.Length;
+		}
+
+		public static int FullWidth(this SyntaxTrivia trivia)
+		{
+		return trivia.FullSpan.Length;
+		}
+		#endif
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/SyntaxTriviaListExtensions.cs b/main/src/addins/CSharpBinding/Util/SyntaxTriviaListExtensions.cs
new file mode 100644
index 0000000000..b3c0723bcb
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/SyntaxTriviaListExtensions.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal static class SyntaxTriviaListExtensions
+	{
+		public static bool Any(this SyntaxTriviaList triviaList, params SyntaxKind[] kinds)
+		{
+			foreach (var trivia in triviaList)
+			{
+				if (trivia.MatchesKind(kinds))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		public static SyntaxTrivia? GetFirstNewLine(this SyntaxTriviaList triviaList)
+		{
+			return triviaList
+				.Where(t => t.Kind() == SyntaxKind.EndOfLineTrivia)
+				.FirstOrNullable();
+		}
+
+		public static SyntaxTrivia? GetLastComment(this SyntaxTriviaList triviaList)
+		{
+			return triviaList
+				.Where(t => t.MatchesKind(SyntaxKind.SingleLineCommentTrivia, SyntaxKind.MultiLineCommentTrivia))
+				.LastOrNullable();
+		}
+
+		public static IEnumerable<SyntaxTrivia> SkipInitialWhitespace(this SyntaxTriviaList triviaList)
+		{
+			return triviaList.SkipWhile(t => t.Kind() == SyntaxKind.WhitespaceTrivia);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/TaskExtensions.cs b/main/src/addins/CSharpBinding/Util/TaskExtensions.cs
new file mode 100644
index 0000000000..0b0ae8f69f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/TaskExtensions.cs
@@ -0,0 +1,363 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.ErrorReporting;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	[SuppressMessage("ApiDesign", "RS0011", Justification = "Matching TPL Signatures")]
+	static partial class TaskExtensions
+	{
+		public static T WaitAndGetResult<T>(this Task<T> task, CancellationToken cancellationToken)
+		{
+			#if false  // eventually this will go live for check-in
+			#if DEBUG
+			if (Microsoft.CodeAnalysis.Workspace.PrimaryWorkspace != null &&  // only care if we are in a UI situation.. this keeps normal unit tests from failing                                
+			Thread.CurrentThread.IsThreadPoolThread)
+			{
+			// This check is meant to catch improper waits on background threads when integration tests are run.
+			System.Diagnostics.Debug.Fail("WaitAndGetResult called from thread pool thread.");
+			}
+			#endif
+			#endif
+			task.Wait(cancellationToken);
+			return task.Result;
+		}
+
+		// NOTE(cyrusn): Once we switch over to .Net 4.5 we can make our SafeContinueWith overloads
+		// simply call into task.ContinueWith(..., TaskContinuationOptions.LazyCancellation, ...) as
+		// that will have the semantics that we want.  From the TPL guys:
+		//
+		//   In this situation:
+		#if false
+		Task A = Task.Run(...);
+		Task B = A.ContinueWith(..., cancellationToken);
+		Task C = B.ContinueWith(...);
+		#endif
+		// If "cancellationToken" is signaled, B completes immediately (if it has not yet started).
+		// Which means that C can start before A completes, which would seem to violate the rules of
+		// the dependency chain.
+		//
+		// We've added TaskContinuationOptions.LazyCancellation option to signify "this continuation
+		// will not complete due to cancellation until its antecedent has completed".  We considered
+		// simply changing the default underlying behavior, but rejected that idea because there was
+		// a good chance that existing users had already drawn a dependency on the current behavior.
+
+		public static Task SafeContinueWith(
+			this Task task,
+			Action<Task> continuationAction,
+			CancellationToken cancellationToken,
+			TaskContinuationOptions continuationOptions,
+			TaskScheduler scheduler)
+		{
+			Func<Task, bool> continuationFunction = antecedent =>
+			{
+				continuationAction(antecedent);
+				return true;
+			};
+
+			return task.SafeContinueWith(continuationFunction, cancellationToken, continuationOptions, scheduler);
+		}
+
+		public static Task<TResult> SafeContinueWith<TInput, TResult>(
+			this Task<TInput> task,
+			Func<Task<TInput>, TResult> continuationFunction,
+			CancellationToken cancellationToken,
+			TaskScheduler scheduler)
+		{
+			return SafeContinueWith<TInput, TResult>(
+				task, continuationFunction, cancellationToken, TaskContinuationOptions.None, scheduler);
+		}
+
+		public static Task<TResult> SafeContinueWith<TInput, TResult>(
+			this Task<TInput> task,
+			Func<Task<TInput>, TResult> continuationFunction,
+			CancellationToken cancellationToken,
+			TaskContinuationOptions continuationOptions,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith<TResult>(
+				(Task antecedent) => continuationFunction((Task<TInput>)antecedent), cancellationToken, continuationOptions, scheduler);
+		}
+
+		public static Task SafeContinueWith<TInput>(
+			this Task<TInput> task,
+			Action<Task<TInput>> continuationAction,
+			CancellationToken cancellationToken,
+			TaskContinuationOptions continuationOptions,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(
+				(Task antecedent) => continuationAction((Task<TInput>)antecedent), cancellationToken, continuationOptions, scheduler);
+		}
+
+		public static Task<TResult> SafeContinueWith<TResult>(
+			this Task task,
+			Func<Task, TResult> continuationFunction,
+			CancellationToken cancellationToken,
+			TaskContinuationOptions continuationOptions,
+			TaskScheduler scheduler)
+		{
+			// So here's the deal.  Say you do the following:
+			#if false
+			// CancellationToken ct1 = ..., ct2 = ...;
+
+			// Task A = Task.Factory.StartNew(..., ct1);
+			// Task B = A.ContinueWith(..., ct1);
+			// Task C = B.ContinueWith(..., ct2);
+			#endif
+			// If ct1 is cancelled then the following may occur: 
+			// 1) Task A can still be running (as it hasn't responded to the cancellation request
+			//    yet).
+			// 2) Task C can start running.  How?  Well if B hasn't started running, it may
+			//    immediately transition to the 'Cancelled/Completed' state.  Moving to that state will
+			//    immediately trigger C to run.
+			//
+			// We do not want this, so we pass the LazyCancellation flag to the TPL which implements
+			// the behavior we want.
+
+			Func<Task, TResult> outerFunction = t =>
+			{
+				try
+				{
+					return continuationFunction(t);
+				}
+				catch (Exception) //when (FatalError.ReportUnlessCanceled(e))
+				{
+					throw new InvalidOperationException ();
+				}
+			};
+
+			// This is the only place in the code where we're allowed to call ContinueWith.
+			return task.ContinueWith(outerFunction, cancellationToken, continuationOptions | TaskContinuationOptions.LazyCancellation, scheduler);
+		}
+
+		public static Task<TResult> SafeContinueWith<TResult>(
+			this Task task,
+			Func<Task, TResult> continuationFunction,
+			CancellationToken cancellationToken,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(continuationFunction, cancellationToken, TaskContinuationOptions.None, scheduler);
+		}
+
+		public static Task SafeContinueWith(
+			this Task task,
+			Action<Task> continuationAction,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(continuationAction, CancellationToken.None, TaskContinuationOptions.None, scheduler);
+		}
+
+		public static Task SafeContinueWith<TInput>(
+			this Task<TInput> task,
+			Action<Task<TInput>> continuationFunction,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(continuationFunction, CancellationToken.None, TaskContinuationOptions.None, scheduler);
+		}
+
+		public static Task<TResult> SafeContinueWith<TInput, TResult>(
+			this Task<TInput> task,
+			Func<Task<TInput>, TResult> continuationFunction,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(continuationFunction, CancellationToken.None, TaskContinuationOptions.None, scheduler);
+		}
+
+		public static Task SafeContinueWith(
+			this Task task,
+			Action<Task> continuationAction,
+			CancellationToken cancellationToken,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(continuationAction, cancellationToken, TaskContinuationOptions.None, scheduler);
+		}
+
+		// Code provided by Stephen Toub.
+		public static Task<TResult> ContinueWithAfterDelay<TInput, TResult>(
+			this Task<TInput> task,
+			Func<Task<TInput>, TResult> continuationFunction,
+			CancellationToken cancellationToken,
+			int millisecondsDelay,
+			TaskContinuationOptions taskContinuationOptions,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(t =>
+				Task.Delay(millisecondsDelay, cancellationToken).SafeContinueWith(
+					_ => continuationFunction(t), cancellationToken, TaskContinuationOptions.None, scheduler),
+				cancellationToken, taskContinuationOptions, scheduler).Unwrap();
+		}
+
+		public static Task<TNResult> ContinueWithAfterDelay<TNResult>(
+			this Task task,
+			Func<Task, TNResult> continuationFunction,
+			CancellationToken cancellationToken,
+			int millisecondsDelay,
+			TaskContinuationOptions taskContinuationOptions,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(t =>
+				Task.Delay(millisecondsDelay, cancellationToken).SafeContinueWith(
+					_ => continuationFunction(t), cancellationToken, TaskContinuationOptions.None, scheduler),
+				cancellationToken, taskContinuationOptions, scheduler).Unwrap();
+		}
+
+		public static Task ContinueWithAfterDelay(
+			this Task task,
+			Action continuationAction,
+			CancellationToken cancellationToken,
+			int millisecondsDelay,
+			TaskContinuationOptions taskContinuationOptions,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(t =>
+				Task.Delay(millisecondsDelay, cancellationToken).SafeContinueWith(
+					_ => continuationAction(), cancellationToken, TaskContinuationOptions.None, scheduler),
+				cancellationToken, taskContinuationOptions, scheduler).Unwrap();
+		}
+
+		public static Task<TResult> SafeContinueWithFromAsync<TInput, TResult>(
+			this Task<TInput> task,
+			Func<Task<TInput>, Task<TResult>> continuationFunction,
+			CancellationToken cancellationToken,
+			TaskContinuationOptions continuationOptions,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWithFromAsync<TResult>(
+				(Task antecedent) => continuationFunction((Task<TInput>)antecedent), cancellationToken, continuationOptions, scheduler);
+		}
+
+		public static Task<TResult> SafeContinueWithFromAsync<TResult>(
+			this Task task,
+			Func<Task, Task<TResult>> continuationFunction,
+			CancellationToken cancellationToken,
+			TaskContinuationOptions continuationOptions,
+			TaskScheduler scheduler)
+		{
+			// So here's the deal.  Say you do the following:
+			#if false
+			// CancellationToken ct1 = ..., ct2 = ...;
+
+			// Task A = Task.Factory.StartNew(..., ct1);
+			// Task B = A.ContinueWith(..., ct1);
+			// Task C = B.ContinueWith(..., ct2);
+			#endif
+			// If ct1 is cancelled then the following may occur: 
+			// 1) Task A can still be running (as it hasn't responded to the cancellation request
+			//    yet).
+			// 2) Task C can start running.  How?  Well if B hasn't started running, it may
+			//    immediately transition to the 'Cancelled/Completed' state.  Moving to that state will
+			//    immediately trigger C to run.
+			//
+			// We do not want this, so we pass the LazyCancellation flag to the TPL which implements
+			// the behavior we want.
+			// This is the only place in the code where we're allowed to call ContinueWith.
+			var nextTask = task.ContinueWith(continuationFunction, cancellationToken, continuationOptions | TaskContinuationOptions.LazyCancellation, scheduler).Unwrap();
+
+			nextTask.ContinueWith(ReportFatalError, continuationFunction,
+				CancellationToken.None,
+				TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
+				TaskScheduler.Default);
+
+			return nextTask;
+		}
+
+		public static Task SafeContinueWithFromAsync(
+			this Task task,
+			Func<Task, Task> continuationFunction,
+			CancellationToken cancellationToken,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWithFromAsync(continuationFunction, cancellationToken, TaskContinuationOptions.None, scheduler);
+		}
+
+		public static Task SafeContinueWithFromAsync(
+			this Task task,
+			Func<Task, Task> continuationFunction,
+			CancellationToken cancellationToken,
+			TaskContinuationOptions continuationOptions,
+			TaskScheduler scheduler)
+		{
+			// So here's the deal.  Say you do the following:
+			#if false
+			// CancellationToken ct1 = ..., ct2 = ...;
+
+			// Task A = Task.Factory.StartNew(..., ct1);
+			// Task B = A.ContinueWith(..., ct1);
+			// Task C = B.ContinueWith(..., ct2);
+			#endif
+			// If ct1 is cancelled then the following may occur: 
+			// 1) Task A can still be running (as it hasn't responded to the cancellation request
+			//    yet).
+			// 2) Task C can start running.  How?  Well if B hasn't started running, it may
+			//    immediately transition to the 'Cancelled/Completed' state.  Moving to that state will
+			//    immediately trigger C to run.
+			//
+			// We do not want this, so we pass the LazyCancellation flag to the TPL which implements
+			// the behavior we want.
+			// This is the only place in the code where we're allowed to call ContinueWith.
+			var nextTask = task.ContinueWith(continuationFunction, cancellationToken, continuationOptions | TaskContinuationOptions.LazyCancellation, scheduler).Unwrap();
+			ReportFatalError(nextTask, continuationFunction);
+			return nextTask;
+		}
+
+		public static Task<TNResult> ContinueWithAfterDelayFromAsync<TNResult>(
+			this Task task,
+			Func<Task, Task<TNResult>> continuationFunction,
+			CancellationToken cancellationToken,
+			int millisecondsDelay,
+			TaskContinuationOptions taskContinuationOptions,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(t =>
+				Task.Delay(millisecondsDelay, cancellationToken).SafeContinueWithFromAsync(
+					_ => continuationFunction(t), cancellationToken, TaskContinuationOptions.None, scheduler),
+				cancellationToken, taskContinuationOptions, scheduler).Unwrap();
+		}
+
+		public static Task ContinueWithAfterDelayFromAsync(
+			this Task task,
+			Func<Task, Task> continuationFunction,
+			CancellationToken cancellationToken,
+			int millisecondsDelay,
+			TaskContinuationOptions taskContinuationOptions,
+			TaskScheduler scheduler)
+		{
+			return task.SafeContinueWith(t =>
+				Task.Delay(millisecondsDelay, cancellationToken).SafeContinueWithFromAsync(
+					_ => continuationFunction(t), cancellationToken, TaskContinuationOptions.None, scheduler),
+				cancellationToken, taskContinuationOptions, scheduler).Unwrap();
+		}
+
+		internal static void ReportFatalError(Task task, object continuationFunction)
+		{
+			task.ContinueWith(ReportFatalErrorWorker, continuationFunction,
+				CancellationToken.None,
+				TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously,
+				TaskScheduler.Default);
+		}
+
+		[MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
+		private static void ReportFatalErrorWorker(Task task, object continuationFunction)
+		{
+			var exception = task.Exception;
+			var methodInfo = ((Delegate)continuationFunction).GetMethodInfo();
+			exception.Data["ContinuationFunction"] = methodInfo.DeclaringType.FullName + "::" + methodInfo.Name;
+
+			// In case of a crash with ExecutionEngineException w/o call stack it might be possible to get the stack trace using WinDbg:
+			// > !threads // find thread with System.ExecutionEngineException
+			//   ...
+			//   67   65 4760 692b5d60   1029220 Preemptive  CD9AE70C:FFFFFFFF 012ad0f8 0     MTA (Threadpool Worker) System.ExecutionEngineException 03c51108 
+			//   ...
+			// > ~67s     // switch to thread 67
+			// > !dso     // dump stack objects
+			//FatalError.Report(exception);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/TextLineExtension.cs b/main/src/addins/CSharpBinding/Util/TextLineExtension.cs
new file mode 100644
index 0000000000..513df8fa98
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/TextLineExtension.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal static class TextLineExtensions
+	{
+		/// <summary>
+		/// Returns the first non-whitespace position on the given line, or null if 
+		/// the line is empty or contains only whitespace.
+		/// </summary>
+		public static int? GetFirstNonWhitespacePosition(this TextLine line)
+		{
+			var firstNonWhitespaceOffset = line.GetFirstNonWhitespaceOffset();
+
+			return firstNonWhitespaceOffset.HasValue
+				? firstNonWhitespaceOffset + line.Start
+					: null;
+		}
+
+		/// <summary>
+		/// Returns the first non-whitespace position on the given line as an offset
+		/// from the start of the line, or null if the line is empty or contains only
+		/// whitespace.
+		/// </summary>
+		public static int? GetFirstNonWhitespaceOffset(this TextLine line)
+		{
+			return line.ToString().GetFirstNonWhitespaceOffset();
+		}
+
+		public static string GetLeadingWhitespace(this TextLine line)
+		{
+			return line.ToString().GetLeadingWhitespace();
+		}
+
+		/// <summary>
+		/// Determines whether the specified line is empty or contains whitespace only.
+		/// </summary>
+		public static bool IsEmptyOrWhitespace(this TextLine line)
+		{
+			return string.IsNullOrWhiteSpace(line.ToString());
+		}
+
+		public static int GetColumnOfFirstNonWhitespaceCharacterOrEndOfLine(this TextLine line, int tabSize)
+		{
+			return line.ToString().GetColumnOfFirstNonWhitespaceCharacterOrEndOfLine(tabSize);
+		}
+
+		public static int GetColumnFromLineOffset(this TextLine line, int lineOffset, int tabSize)
+		{
+			return line.ToString().GetColumnFromLineOffset(lineOffset, tabSize);
+		}
+
+		public static int GetLineOffsetFromColumn(this TextLine line, int column, int tabSize)
+		{
+			return line.ToString().GetLineOffsetFromColumn(column, tabSize);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/TokenComparer.cs b/main/src/addins/CSharpBinding/Util/TokenComparer.cs
new file mode 100644
index 0000000000..2fe8d6f412
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/TokenComparer.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Globalization;
+using Microsoft.CodeAnalysis.CSharp.Extensions;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal class TokenComparer : IComparer<SyntaxToken>
+	{
+		private const string SystemNamespace = "System";
+
+		public static readonly IComparer<SyntaxToken> NormalInstance = new TokenComparer(specialCaseSystem: false);
+		public static readonly IComparer<SyntaxToken> SystemFirstInstance = new TokenComparer(specialCaseSystem: true);
+
+		private readonly bool _specialCaseSystem;
+
+		private TokenComparer(bool specialCaseSystem)
+		{
+			_specialCaseSystem = specialCaseSystem;
+		}
+
+		private static bool IsSystem(string s)
+		{
+			return s == SystemNamespace;
+		}
+
+		public int Compare(SyntaxToken x, SyntaxToken y)
+		{
+			if (_specialCaseSystem &&
+				x.GetPreviousToken(includeSkipped: true).IsKind(SyntaxKind.UsingKeyword, SyntaxKind.StaticKeyword) &&
+				y.GetPreviousToken(includeSkipped: true).IsKind(SyntaxKind.UsingKeyword, SyntaxKind.StaticKeyword))
+			{
+				var token1IsSystem = IsSystem(x.ValueText);
+				var token2IsSystem = IsSystem(y.ValueText);
+
+				if (token1IsSystem && !token2IsSystem)
+				{
+					return -1;
+				}
+				else if (!token1IsSystem && token2IsSystem)
+				{
+					return 1;
+				}
+			}
+
+			return CompareWorker(x, y);
+		}
+
+		private int CompareWorker(SyntaxToken x, SyntaxToken y)
+		{
+			if (x == y)
+			{
+				return 0;
+			}
+
+			// By using 'ValueText' we get the value that is normalized.  i.e.
+			// @class will be 'class', and unicode escapes will be converted
+			// to actual unicode.  This allows sorting to work properly across
+			// tokens that have different source representations, but which
+			// mean the same thing.
+			var string1 = x.ValueText;
+			var string2 = y.ValueText;
+
+			// First check in a case insensitive manner.  This will put 
+			// everything that starts with an 'a' or 'A' above everything
+			// that starts with a 'b' or 'B'.
+			var compare = CultureInfo.InvariantCulture.CompareInfo.Compare(string1, string2,
+				CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace | CompareOptions.IgnoreWidth);
+			if (compare != 0)
+			{
+				return compare;
+			}
+
+			// Now, once we've grouped such that 'a' words and 'A' words are
+			// together, sort such that 'a' words come before 'A' words.
+			return CultureInfo.InvariantCulture.CompareInfo.Compare(string1, string2,
+				CompareOptions.IgnoreNonSpace | CompareOptions.IgnoreWidth);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/TypeDeclarationSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/TypeDeclarationSyntaxExtensions.cs
new file mode 100644
index 0000000000..ee70daad0c
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/TypeDeclarationSyntaxExtensions.cs
@@ -0,0 +1,321 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp;
+using System;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class TypeDeclarationSyntaxExtensions
+	{
+		public static TypeDeclarationSyntax AddMembers(
+			this TypeDeclarationSyntax node, params MemberDeclarationSyntax[] members)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).AddMembers(members);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).AddMembers(members);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).AddMembers(members);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static TypeDeclarationSyntax WithMembers(
+			this TypeDeclarationSyntax node, SyntaxList<MemberDeclarationSyntax> members)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).WithMembers(members);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).WithMembers(members);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).WithMembers(members);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static TypeDeclarationSyntax WithAttributeLists(
+			this TypeDeclarationSyntax node, SyntaxList<AttributeListSyntax> attributes)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).WithAttributeLists(attributes);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).WithAttributeLists(attributes);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).WithAttributeLists(attributes);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static TypeDeclarationSyntax WithIdentifier(
+			this TypeDeclarationSyntax node, SyntaxToken identifier)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).WithIdentifier(identifier);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).WithIdentifier(identifier);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).WithIdentifier(identifier);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static TypeDeclarationSyntax WithModifiers(
+			this TypeDeclarationSyntax node, SyntaxTokenList modifiers)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).WithModifiers(modifiers);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).WithModifiers(modifiers);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).WithModifiers(modifiers);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static TypeDeclarationSyntax WithTypeParameterList(
+			this TypeDeclarationSyntax node, TypeParameterListSyntax list)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).WithTypeParameterList(list);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).WithTypeParameterList(list);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).WithTypeParameterList(list);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static TypeDeclarationSyntax WithBaseList(
+			this TypeDeclarationSyntax node, BaseListSyntax list)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).WithBaseList(list);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).WithBaseList(list);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).WithBaseList(list);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static TypeDeclarationSyntax WithConstraintClauses(
+			this TypeDeclarationSyntax node, SyntaxList<TypeParameterConstraintClauseSyntax> constraintClauses)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).WithConstraintClauses(constraintClauses);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).WithConstraintClauses(constraintClauses);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).WithConstraintClauses(constraintClauses);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static TypeDeclarationSyntax WithOpenBraceToken(
+			this TypeDeclarationSyntax node, SyntaxToken openBrace)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).WithOpenBraceToken(openBrace);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).WithOpenBraceToken(openBrace);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).WithOpenBraceToken(openBrace);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static TypeDeclarationSyntax WithCloseBraceToken(
+			this TypeDeclarationSyntax node, SyntaxToken closeBrace)
+		{
+			switch (node.Kind())
+			{
+			case SyntaxKind.ClassDeclaration:
+				return ((ClassDeclarationSyntax)node).WithCloseBraceToken(closeBrace);
+			case SyntaxKind.InterfaceDeclaration:
+				return ((InterfaceDeclarationSyntax)node).WithCloseBraceToken(closeBrace);
+			case SyntaxKind.StructDeclaration:
+				return ((StructDeclarationSyntax)node).WithCloseBraceToken(closeBrace);
+			}
+
+			throw new InvalidOperationException ();
+		}
+
+		public static IList<bool> GetInsertionIndices(this TypeDeclarationSyntax destination, CancellationToken cancellationToken)
+		{
+			var members = destination.Members;
+
+			var indices = new List<bool>();
+			if (members.Count == 0)
+			{
+				var start = destination.OpenBraceToken.Span.End;
+				var end = GetEndToken(destination).SpanStart;
+
+				indices.Add(!destination.OverlapsHiddenPosition(TextSpan.FromBounds(start, end), cancellationToken));
+			}
+			else
+			{
+				var start = destination.OpenBraceToken.Span.End;
+				var end = destination.Members.First().SpanStart;
+				indices.Add(!destination.OverlapsHiddenPosition(TextSpan.FromBounds(start, end), cancellationToken));
+
+				for (int i = 0; i < members.Count - 1; i++)
+				{
+					var member1 = members[i];
+					var member2 = members[i + 1];
+
+					indices.Add(!destination.OverlapsHiddenPosition(member1, member2, cancellationToken));
+				}
+
+				start = members.Last().Span.End;
+				end = GetEndToken(destination).SpanStart;
+				indices.Add(!destination.OverlapsHiddenPosition(TextSpan.FromBounds(start, end), cancellationToken));
+			}
+
+			return indices;
+		}
+
+		private static SyntaxToken GetEndToken(SyntaxNode node)
+		{
+			var lastToken = node.GetLastToken(includeZeroWidth: true, includeSkipped: true);
+
+			if (lastToken.IsMissing)
+			{
+				var nextToken = lastToken.GetNextToken(includeZeroWidth: true, includeSkipped: true);
+				if (nextToken.RawKind != 0)
+				{
+					return nextToken;
+				}
+			}
+
+			return lastToken;
+		}
+
+		public static IEnumerable<BaseTypeSyntax> GetAllBaseListTypes(this TypeDeclarationSyntax typeNode, SemanticModel model, CancellationToken cancellationToken)
+		{
+
+			IEnumerable<BaseTypeSyntax> baseListTypes = SpecializedCollections.EmptyEnumerable<BaseTypeSyntax>();
+
+			var isPartialType = typeNode.Modifiers.Any(m => m.Kind() == SyntaxKind.PartialKeyword);
+			if (isPartialType)
+			{
+				var typeSymbol = model.GetDeclaredSymbol(typeNode, cancellationToken);
+				if (typeSymbol != null)
+				{
+					foreach (var syntaxRef in typeSymbol.DeclaringSyntaxReferences)
+					{
+						var typeDecl = syntaxRef.GetSyntax(cancellationToken) as TypeDeclarationSyntax;
+						if (typeDecl != null && typeDecl.BaseList != null)
+						{
+							baseListTypes = baseListTypes.Concat(typeDecl.BaseList.Types);
+						}
+					}
+				}
+			}
+			else if (typeNode.BaseList != null)
+			{
+				return typeNode.BaseList.Types;
+			}
+
+			return baseListTypes;
+		}
+
+		private static SyntaxToken EnsureToken(SyntaxToken token, bool prependNewLineIfMissing = false, bool appendNewLineIfMissing = false)
+		{
+			if (token.IsMissing)
+			{
+				var leadingTrivia = prependNewLineIfMissing ? token.LeadingTrivia.Insert(0, SyntaxFactory.CarriageReturnLineFeed) : token.LeadingTrivia;
+				var trailingTrivia = appendNewLineIfMissing ? token.TrailingTrivia.Insert(0, SyntaxFactory.CarriageReturnLineFeed) : token.TrailingTrivia;
+				return SyntaxFactory.Token(leadingTrivia, token.Kind(), trailingTrivia).WithAdditionalAnnotations(Formatter.Annotation);
+			}
+
+			return token;
+		}
+
+		private static void EnsureAndGetBraceTokens(
+			BaseTypeDeclarationSyntax typeDeclaration,
+			bool hasMembers,
+			out SyntaxToken openBrace,
+			out SyntaxToken closeBrace)
+		{
+			openBrace = EnsureToken(typeDeclaration.OpenBraceToken);
+			closeBrace = EnsureToken(typeDeclaration.CloseBraceToken, appendNewLineIfMissing: true);
+
+			if (!hasMembers)
+			{
+				// Bug 539673: If there are no members, take any trivia that
+				// belongs to the end brace and attach it to the opening brace.
+				int index = -1;
+				var leadingTrivia = closeBrace.LeadingTrivia;
+				for (int i = leadingTrivia.Count - 1; i >= 0; i--)
+				{
+					if (!leadingTrivia[i].IsWhitespaceOrEndOfLine())
+					{
+						index = i;
+						break;
+					}
+				}
+
+				if (index != -1)
+				{
+					openBrace = openBrace.WithTrailingTrivia(
+						openBrace.TrailingTrivia.Concat(closeBrace.LeadingTrivia.Take(index + 1)));
+					closeBrace = closeBrace.WithLeadingTrivia(
+						closeBrace.LeadingTrivia.Skip(index + 1));
+				}
+			}
+		}
+
+		public static TypeDeclarationSyntax EnsureOpenAndCloseBraceTokens(
+			this TypeDeclarationSyntax typeDeclaration)
+		{
+			SyntaxToken openBrace, closeBrace;
+			EnsureAndGetBraceTokens(typeDeclaration, typeDeclaration.Members.Count > 0, out openBrace, out closeBrace);
+			return typeDeclaration.WithOpenBraceToken(openBrace).WithCloseBraceToken(closeBrace);
+		}
+
+		public static EnumDeclarationSyntax EnsureOpenAndCloseBraceTokens(
+			this EnumDeclarationSyntax typeDeclaration)
+		{
+			SyntaxToken openBrace, closeBrace;
+			EnsureAndGetBraceTokens(typeDeclaration, typeDeclaration.Members.Count > 0, out openBrace, out closeBrace);
+			return typeDeclaration.WithOpenBraceToken(openBrace).WithCloseBraceToken(closeBrace);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/TypeExtensions.cs b/main/src/addins/CSharpBinding/Util/TypeExtensions.cs
new file mode 100644
index 0000000000..05f23948a3
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/TypeExtensions.cs
@@ -0,0 +1,154 @@
+//
+// TypeExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Simplification;
+using System.Threading.Tasks;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Text;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+using MonoDevelop.Ide.TypeSystem;
+using System.Runtime.CompilerServices;
+using System.Collections.Concurrent;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class TypeExtensions
+	{
+		readonly static MethodInfo generateTypeSyntaxMethod;
+		readonly static MethodInfo findImplementingTypesAsync;
+
+		static TypeExtensions()
+		{
+			var typeInfo = Type.GetType("Microsoft.CodeAnalysis.CSharp.Extensions.ITypeSymbolExtensions" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+			generateTypeSyntaxMethod = typeInfo.GetMethod("GenerateTypeSyntax", new[] { typeof(ITypeSymbol) });
+
+			typeInfo = Type.GetType("Microsoft.CodeAnalysis.FindSymbols.DependentTypeFinder" + ReflectionNamespaces.WorkspacesAsmName, true);
+			findImplementingTypesAsync = typeInfo.GetMethod("FindImplementingTypesAsync", new[] { typeof(INamedTypeSymbol), typeof(Solution), typeof(IImmutableSet<Project>), typeof(CancellationToken) });
+			if (findImplementingTypesAsync == null)
+				throw new Exception ("Can't find FindImplementingTypesAsync");
+		}
+
+		public static TypeSyntax GenerateTypeSyntax(this ITypeSymbol typeSymbol, SyntaxAnnotation simplifierAnnotation = null)
+		{
+			var typeSyntax = (TypeSyntax)generateTypeSyntaxMethod.Invoke(null, new object[] { typeSymbol });
+			if (simplifierAnnotation != null)
+				return typeSyntax.WithAdditionalAnnotations(simplifierAnnotation);
+			return typeSyntax;
+		}
+		
+		#region GetDelegateInvokeMethod
+		/// <summary>
+		/// Gets the invoke method for a delegate type.
+		/// </summary>
+		/// <remarks>
+		/// Returns null if the type is not a delegate type; or if the invoke method could not be found.
+		/// </remarks>
+		public static IMethodSymbol GetDelegateInvokeMethod(this ITypeSymbol type)
+		{
+			if (type == null)
+				throw new ArgumentNullException("type");
+			if (type.TypeKind == TypeKind.Delegate)
+				return type.GetMembers ("Invoke").OfType<IMethodSymbol>().FirstOrDefault(m => m.MethodKind == MethodKind.DelegateInvoke);
+			return null;
+		}
+		#endregion
+
+		public static Task<IEnumerable<INamedTypeSymbol>> FindImplementingTypesAsync (this INamedTypeSymbol type, Solution solution, IImmutableSet<Project> projects = null, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			try {
+				return (Task<IEnumerable<INamedTypeSymbol>>)findImplementingTypesAsync.Invoke(null, new object[] { type, solution, projects, cancellationToken });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public static bool IsNullableType(this ITypeSymbol type)
+		{
+			var original = type.OriginalDefinition;
+			return original.SpecialType == SpecialType.System_Nullable_T;
+		}
+
+		public static ITypeSymbol GetNullableUnderlyingType(this ITypeSymbol type)
+		{
+			if (!IsNullableType(type))
+				return null;
+			return ((INamedTypeSymbol)type).TypeArguments[0];
+		}
+
+		/// <summary>
+		/// Gets all base classes and interfaces.
+		/// </summary>
+		/// <returns>All classes and interfaces.</returns>
+		/// <param name="type">Type.</param>
+		public static IEnumerable<INamedTypeSymbol> GetAllBaseClassesAndInterfaces (this INamedTypeSymbol type, bool includeSuperType = false)
+		{
+			if (!includeSuperType)
+				type = type.BaseType;
+			var curType = type;
+			while (curType != null) {
+				yield return curType;
+				curType = curType.BaseType;
+			}
+
+			foreach (var inter in type.AllInterfaces) {
+				yield return inter;
+			}
+		}
+
+		/// <summary>
+		/// Determines if derived from baseType. Includes itself, all base classes and all interfaces.
+		/// </summary>
+		/// <returns><c>true</c> if is derived from the specified type baseType; otherwise, <c>false</c>.</returns>
+		/// <param name="type">Type.</param>
+		/// <param name="baseType">Base type.</param>
+		public static bool IsDerivedFromClassOrInterface(this INamedTypeSymbol type, INamedTypeSymbol baseType)
+		{
+			//NR5 is returning true also for same type
+			for (; type != null; type = type.BaseType) {
+				if (type == baseType) {
+					return true;
+				}
+			}
+			//And interfaces
+			foreach (var inter in type.AllInterfaces) {
+				if (inter == baseType) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/TypeGenerator.cs b/main/src/addins/CSharpBinding/Util/TypeGenerator.cs
new file mode 100644
index 0000000000..6df4a4dd66
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/TypeGenerator.cs
@@ -0,0 +1,104 @@
+//
+// TypeGenerator.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Shared.Utilities;
+using Roslyn.Utilities;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class TypeGenerator 
+	{
+		readonly static Type typeInfo;
+
+		object instance;
+
+		readonly static MethodInfo createArrayTypeSymbolMethod;
+		readonly static MethodInfo createPointerTypeSymbolMethod;
+		readonly static MethodInfo constructMethod;
+
+		internal object Instance {
+			get {
+				return instance;
+			}
+		}
+
+		static TypeGenerator()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CodeGeneration.TypeGenerator" + ReflectionNamespaces.WorkspacesAsmName, true);
+
+			createArrayTypeSymbolMethod = typeInfo.GetMethod ("CreateArrayTypeSymbol");
+			createPointerTypeSymbolMethod = typeInfo.GetMethod ("CreatePointerTypeSymbol");
+			constructMethod = typeInfo.GetMethod ("Construct");
+
+		}
+
+		public TypeGenerator ()
+		{
+			instance = Activator.CreateInstance (typeInfo);
+		}
+
+		public ITypeSymbol CreateArrayTypeSymbol(ITypeSymbol elementType, int rank)
+		{
+			try {
+				return (ITypeSymbol)createArrayTypeSymbolMethod.Invoke(instance, new object[] { elementType, rank });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public ITypeSymbol CreatePointerTypeSymbol(ITypeSymbol pointedAtType)
+		{
+			try {
+				return (ITypeSymbol)createPointerTypeSymbolMethod.Invoke(instance, new object[] { pointedAtType });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+
+		public ITypeSymbol Construct(INamedTypeSymbol namedType, ITypeSymbol[] typeArguments)
+		{
+			try {
+				return (ITypeSymbol)constructMethod.Invoke(instance, new object[] { namedType, typeArguments });
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+				return null;
+			}
+		}
+	}
+	
+}
diff --git a/main/src/addins/CSharpBinding/Util/TypeSyntaxComparer.cs b/main/src/addins/CSharpBinding/Util/TypeSyntaxComparer.cs
new file mode 100644
index 0000000000..ec46567e7f
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/TypeSyntaxComparer.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Symbols;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	internal class TypeSyntaxComparer : IComparer<TypeSyntax>
+	{
+		private readonly IComparer<SyntaxToken> _tokenComparer;
+		internal IComparer<NameSyntax> NameComparer;
+
+		internal TypeSyntaxComparer(IComparer<SyntaxToken> tokenComparer)
+		{
+			_tokenComparer = tokenComparer;
+		}
+
+		public int Compare(TypeSyntax x, TypeSyntax y)
+		{
+			if (x == y)
+			{
+				return 0;
+			}
+
+			x = UnwrapType(x);
+			y = UnwrapType(y);
+
+			if (x is NameSyntax && y is NameSyntax)
+			{
+				return NameComparer.Compare((NameSyntax)x, (NameSyntax)y);
+			}
+
+			// we have two predefined types, or a predefined type and a normal C# name.  We only need
+			// to compare the first tokens here.
+			return _tokenComparer.Compare(x.GetFirstToken(includeSkipped: true), y.GetFirstToken());
+		}
+
+		private TypeSyntax UnwrapType(TypeSyntax type)
+		{
+			while (true)
+			{
+				switch (type.Kind())
+				{
+				case SyntaxKind.ArrayType:
+					type = ((ArrayTypeSyntax)type).ElementType;
+					break;
+				case SyntaxKind.PointerType:
+					type = ((PointerTypeSyntax)type).ElementType;
+					break;
+				case SyntaxKind.NullableType:
+					type = ((NullableTypeSyntax)type).ElementType;
+					break;
+				default:
+					return type;
+				}
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/TypeSyntaxExtensions.cs b/main/src/addins/CSharpBinding/Util/TypeSyntaxExtensions.cs
new file mode 100644
index 0000000000..4f47c1d8d2
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/TypeSyntaxExtensions.cs
@@ -0,0 +1,114 @@
+//
+// TypeSyntaxExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using System.Threading;
+using System.Linq;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class TypeSyntaxExtensions
+	{
+		public static bool IsPartial(this TypeSyntax typeSyntax)
+		{
+			return typeSyntax is IdentifierNameSyntax &&
+				((IdentifierNameSyntax)typeSyntax).Identifier.IsKind(SyntaxKind.PartialKeyword);
+		}
+
+		public static bool IsPotentialTypeName(this TypeSyntax typeSyntax, SemanticModel semanticModelOpt, CancellationToken cancellationToken)
+		{
+			if (typeSyntax == null)
+			{
+				return false;
+			}
+
+			if (typeSyntax is PredefinedTypeSyntax ||
+				typeSyntax is ArrayTypeSyntax ||
+				typeSyntax is GenericNameSyntax ||
+				typeSyntax is PointerTypeSyntax ||
+				typeSyntax is NullableTypeSyntax)
+			{
+				return true;
+			}
+
+			if (semanticModelOpt == null)
+			{
+				return false;
+			}
+
+			var nameSyntax = typeSyntax as NameSyntax;
+			if (nameSyntax == null)
+			{
+				return false;
+			}
+
+			var nameToken = nameSyntax.GetNameToken();
+
+			var symbols = semanticModelOpt.LookupName(nameToken, namespacesAndTypesOnly: true, cancellationToken: cancellationToken);
+			var firstSymbol = symbols.FirstOrDefault();
+
+			var typeSymbol = firstSymbol != null && firstSymbol.Kind == SymbolKind.Alias
+				? (firstSymbol as IAliasSymbol).Target
+				: firstSymbol as ITypeSymbol;
+
+			return typeSymbol != null
+				&& !typeSymbol.IsErrorType();
+		}
+
+		/// <summary>
+		/// Determines whether the specified TypeSyntax is actually 'var'.
+		/// </summary>
+		public static bool IsTypeInferred(this TypeSyntax typeSyntax, SemanticModel semanticModel)
+		{
+			if (!typeSyntax.IsVar)
+			{
+				return false;
+			}
+
+			if (semanticModel.GetAliasInfo(typeSyntax) != null)
+			{
+				return false;
+			}
+
+			var type = semanticModel.GetTypeInfo(typeSyntax).Type;
+			if (type == null)
+			{
+				return false;
+			}
+
+			if (type.Name == "var")
+			{
+				return false;
+			}
+
+			return true;
+		}
+	}
+
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/UsingsAndExternAliasesDirectiveComparer.cs b/main/src/addins/CSharpBinding/Util/UsingsAndExternAliasesDirectiveComparer.cs
new file mode 100644
index 0000000000..f7f3c623a8
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/UsingsAndExternAliasesDirectiveComparer.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Roslyn.Utilities;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	class UsingsAndExternAliasesDirectiveComparer : IComparer<SyntaxNode>
+	{
+		public static readonly IComparer<SyntaxNode> NormalInstance = new UsingsAndExternAliasesDirectiveComparer(
+			NameSyntaxComparer.Create(TokenComparer.NormalInstance),
+			TokenComparer.NormalInstance);
+
+		public static readonly IComparer<SyntaxNode> SystemFirstInstance = new UsingsAndExternAliasesDirectiveComparer(
+			NameSyntaxComparer.Create(TokenComparer.SystemFirstInstance),
+			TokenComparer.SystemFirstInstance);
+
+		private readonly IComparer<NameSyntax> _nameComparer;
+		private readonly IComparer<SyntaxToken> _tokenComparer;
+
+		private UsingsAndExternAliasesDirectiveComparer(
+			IComparer<NameSyntax> nameComparer,
+			IComparer<SyntaxToken> tokenComparer)
+		{
+			_nameComparer = nameComparer;
+			_tokenComparer = tokenComparer;
+		}
+
+		public int Compare(SyntaxNode directive1, SyntaxNode directive2)
+		{
+			if (directive1 == directive2)
+			{
+				return 0;
+			}
+
+			var using1 = directive1 as UsingDirectiveSyntax;
+			var using2 = directive2 as UsingDirectiveSyntax;
+			var extern1 = directive1 as ExternAliasDirectiveSyntax;
+			var extern2 = directive2 as ExternAliasDirectiveSyntax;
+
+			var directive1IsExtern = extern1 != null;
+			var directive2IsExtern = extern2 != null;
+
+			var directive1IsNamespace = using1 != null && using1.Alias == null && !using1.StaticKeyword.IsKind(SyntaxKind.StaticKeyword);
+			var directive2IsNamespace = using2 != null && using2.Alias == null && !using2.StaticKeyword.IsKind(SyntaxKind.StaticKeyword);
+
+			var directive1IsUsingStatic = using1 != null && using1.StaticKeyword.IsKind(SyntaxKind.StaticKeyword);
+			var directive2IsUsingStatic = using2 != null && using2.StaticKeyword.IsKind(SyntaxKind.StaticKeyword);
+
+			var directive1IsAlias = using1 != null && using1.Alias != null;
+			var directive2IsAlias = using2 != null && using2.Alias != null;
+
+			// different types of usings get broken up into groups.
+			//  * externs
+			//  * usings
+			//  * using statics
+			//  * aliases
+
+			if (directive1IsExtern && !directive2IsExtern)
+			{
+				return -1;
+			}
+			else if (directive2IsExtern && !directive1IsExtern)
+			{
+				return 1;
+			}
+			else if (directive1IsNamespace && !directive2IsNamespace)
+			{
+				return -1;
+			}
+			else if (directive2IsNamespace && !directive1IsNamespace)
+			{
+				return 1;
+			}
+			else if (directive1IsUsingStatic && !directive2IsUsingStatic)
+			{
+				return -1;
+			}
+			else if (directive2IsUsingStatic && !directive1IsUsingStatic)
+			{
+				return 1;
+			}
+			else if (directive1IsAlias && !directive2IsAlias)
+			{
+				return -1;
+			}
+			else if (directive2IsAlias && !directive1IsAlias)
+			{
+				return 1;
+			}
+
+			// ok, it's the same type of using now.
+			if (directive1IsExtern)
+			{
+				// they're externs, sort by the alias
+				return _tokenComparer.Compare(extern1.Identifier, extern2.Identifier);
+			}
+			else if (directive1IsAlias)
+			{
+				var aliasComparisonResult = _tokenComparer.Compare(using1.Alias.Name.Identifier, using2.Alias.Name.Identifier);
+
+				if (aliasComparisonResult == 0)
+				{
+					// They both use the same alias, so compare the names.
+					return _nameComparer.Compare(using1.Name, using2.Name);
+				}
+				else
+				{
+					return aliasComparisonResult;
+				}
+			}
+			else
+			{
+				return _nameComparer.Compare(using1.Name, using2.Name);
+			}
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/UsingsAndExternAliasesOrganizer.cs b/main/src/addins/CSharpBinding/Util/UsingsAndExternAliasesOrganizer.cs
new file mode 100644
index 0000000000..a4896cad84
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/UsingsAndExternAliasesOrganizer.cs
@@ -0,0 +1,63 @@
+//
+// UsingsAndExternAliasesOrganizer.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Runtime.ExceptionServices;
+using System.Reflection;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class UsingsAndExternAliasesOrganizer
+	{
+		static UsingsAndExternAliasesOrganizer ()
+		{
+			var typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CSharp.Utilities.UsingsAndExternAliasesOrganizer" + ReflectionNamespaces.CSWorkspacesAsmName, true);
+
+			organizeMethod = typeInfo.GetMethod ("Organize");
+		}
+
+		readonly static System.Reflection.MethodInfo organizeMethod;
+
+		public static void Organize(
+			SyntaxList<ExternAliasDirectiveSyntax> externAliasList,
+			SyntaxList<UsingDirectiveSyntax> usingList,
+			bool placeSystemNamespaceFirst,
+			out SyntaxList<ExternAliasDirectiveSyntax> organizedExternAliasList,
+			out SyntaxList<UsingDirectiveSyntax> organizedUsingList)
+		{
+			try {
+				var args = new object[] { externAliasList, usingList, placeSystemNamespaceFirst, default(SyntaxList<ExternAliasDirectiveSyntax>), default(SyntaxList<UsingDirectiveSyntax>)};
+				organizeMethod.Invoke (null, args);
+				organizedExternAliasList = (SyntaxList<ExternAliasDirectiveSyntax>)args [3];
+				organizedUsingList = (SyntaxList<UsingDirectiveSyntax>)args [4];
+			} catch (TargetInvocationException ex) {
+				ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/Util/ValueTuple.cs b/main/src/addins/CSharpBinding/Util/ValueTuple.cs
new file mode 100644
index 0000000000..aedf5bca99
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ValueTuple.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	// tuple factory
+	static class ValueTuple
+	{
+		public static ValueTuple<T1, T2> Create<T1, T2>(T1 item1, T2 item2)
+		{
+			return new ValueTuple<T1, T2>(item1, item2);
+		}
+
+//		public static ValueTuple<T1, T2, T3> Create<T1, T2, T3>(T1 item1, T2 item2, T3 item3)
+//		{
+//			return new ValueTuple<T1, T2, T3>(item1, item2, item3);
+//		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/ValueTuple`2.cs b/main/src/addins/CSharpBinding/Util/ValueTuple`2.cs
new file mode 100644
index 0000000000..96fcb2eb4b
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/ValueTuple`2.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	// struct with two values
+	struct ValueTuple<T1, T2> : IEquatable<ValueTuple<T1, T2>>
+	{
+		private static readonly EqualityComparer<T1> s_comparer1 = EqualityComparer<T1>.Default;
+		private static readonly EqualityComparer<T2> s_comparer2 = EqualityComparer<T2>.Default;
+
+		public readonly T1 Item1;
+		public readonly T2 Item2;
+
+		public ValueTuple(T1 item1, T2 item2)
+		{
+			this.Item1 = item1;
+			this.Item2 = item2;
+		}
+
+		public bool Equals(ValueTuple<T1, T2> other)
+		{
+			return s_comparer1.Equals(this.Item1, other.Item1)
+				&& s_comparer2.Equals(this.Item2, other.Item2);
+		}
+
+		public override bool Equals(object obj)
+		{
+			if (obj is ValueTuple<T1, T2>)
+			{
+				var other = (ValueTuple<T1, T2>)obj;
+				return this.Equals(other);
+			}
+
+			return false;
+		}
+
+		public override int GetHashCode()
+		{
+			return Hash.Combine(s_comparer1.GetHashCode(Item1), s_comparer2.GetHashCode(Item2));
+		}
+
+		public static bool operator ==(ValueTuple<T1, T2> left, ValueTuple<T1, T2> right)
+		{
+			return left.Equals(right);
+		}
+
+		public static bool operator !=(ValueTuple<T1, T2> left, ValueTuple<T1, T2> right)
+		{
+			return !left.Equals(right);
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/Util/WordParser.cs b/main/src/addins/CSharpBinding/Util/WordParser.cs
new file mode 100644
index 0000000000..34f70d3caa
--- /dev/null
+++ b/main/src/addins/CSharpBinding/Util/WordParser.cs
@@ -0,0 +1,71 @@
+// 
+// WordParser.cs
+//  
+// Author:
+//       Michael Hutchinson <mhutch@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace ICSharpCode.NRefactory6.CSharp
+{
+	static class WordParser
+	{
+		public static List<string> BreakWords (string identifier)
+		{
+			var words = new List<string> ();
+			int wordStart = 0;
+			bool lastWasLower = false, lastWasUpper = false;
+			for (int i = 0; i < identifier.Length; i++) {
+				char c = identifier[i];
+				var category = CharUnicodeInfo.GetUnicodeCategory (c);
+				if (category == System.Globalization.UnicodeCategory.LowercaseLetter) {
+					if (lastWasUpper && (i - wordStart) > 2) {
+						words.Add (identifier.Substring (wordStart, i - wordStart - 1));
+						wordStart = i - 1;
+					}
+					lastWasLower = true;
+					lastWasUpper = false;
+				} else if (category == System.Globalization.UnicodeCategory.UppercaseLetter) {
+					if (lastWasLower) {
+						words.Add (identifier.Substring (wordStart, i - wordStart));
+						wordStart = i;
+					}
+					lastWasLower = false;
+					lastWasUpper = true;
+				} else {
+					if (c == '_') {
+						if ((i - wordStart) > 0)
+							words.Add(identifier.Substring(wordStart, i - wordStart));
+						wordStart = i + 1;
+						lastWasLower = lastWasUpper = false;
+					}
+				}
+			}
+			if (wordStart < identifier.Length)
+				words.Add (identifier.Substring (wordStart));
+			return words;
+		}
+	}
+}
+
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.cs
new file mode 100644
index 0000000000..1dda3f6bac
--- /dev/null
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.cs
@@ -0,0 +1,94 @@
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace MonoDevelop.CSharp.ClassOutline
+{
+	internal partial class OutlineSortingPreferencesDialog
+	{
+		private global::Gtk.VBox vbox2;
+		
+		private global::Gtk.Label label;
+		
+		private global::MonoDevelop.Ide.Gui.Components.PriorityList priorityList;
+		
+		private global::Gtk.Button buttonCancel;
+		
+		private global::Gtk.Button buttonOk;
+
+		protected virtual void Build ()
+		{
+			global::Stetic.Gui.Initialize (this);
+			// Widget MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog
+			this.Name = "MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog";
+			this.Title = global::Mono.Unix.Catalog.GetString ("Document Outline Preferences");
+			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
+			this.Modal = true;
+			this.DestroyWithParent = true;
+			// Internal child MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.VBox
+			global::Gtk.VBox w1 = this.VBox;
+			w1.Name = "dialog1_VBox";
+			w1.BorderWidth = ((uint)(2));
+			// Container child dialog1_VBox.Gtk.Box+BoxChild
+			this.vbox2 = new global::Gtk.VBox ();
+			this.vbox2.Name = "vbox2";
+			this.vbox2.Spacing = 6;
+			this.vbox2.BorderWidth = ((uint)(6));
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.label = new global::Gtk.Label ();
+			this.label.WidthRequest = 400;
+			this.label.Name = "label";
+			this.label.LabelProp = global::Mono.Unix.Catalog.GetString ("Group sorting order when grouping is enabled:");
+			this.label.Wrap = true;
+			this.vbox2.Add (this.label);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label]));
+			w2.Position = 0;
+			w2.Expand = false;
+			w2.Fill = false;
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.priorityList = new global::MonoDevelop.Ide.Gui.Components.PriorityList ();
+			this.priorityList.Name = "priorityList";
+			this.vbox2.Add (this.priorityList);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.priorityList]));
+			w3.Position = 1;
+			w1.Add (this.vbox2);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
+			w4.Position = 0;
+			// Internal child MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog.ActionArea
+			global::Gtk.HButtonBox w5 = this.ActionArea;
+			w5.Name = "dialog1_ActionArea";
+			w5.Spacing = 10;
+			w5.BorderWidth = ((uint)(5));
+			w5.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonCancel = new global::Gtk.Button ();
+			this.buttonCancel.CanDefault = true;
+			this.buttonCancel.CanFocus = true;
+			this.buttonCancel.Name = "buttonCancel";
+			this.buttonCancel.UseStock = true;
+			this.buttonCancel.UseUnderline = true;
+			this.buttonCancel.Label = "gtk-cancel";
+			this.AddActionWidget (this.buttonCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w6 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5 [this.buttonCancel]));
+			w6.Expand = false;
+			w6.Fill = false;
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonOk = new global::Gtk.Button ();
+			this.buttonOk.CanDefault = true;
+			this.buttonOk.CanFocus = true;
+			this.buttonOk.Name = "buttonOk";
+			this.buttonOk.UseStock = true;
+			this.buttonOk.UseUnderline = true;
+			this.buttonOk.Label = "gtk-ok";
+			this.AddActionWidget (this.buttonOk, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w7 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5 [this.buttonOk]));
+			w7.Position = 1;
+			w7.Expand = false;
+			w7.Fill = false;
+			if ((this.Child != null)) {
+				this.Child.ShowAll ();
+			}
+			this.DefaultWidth = 424;
+			this.DefaultHeight = 367;
+			this.Hide ();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.cs
new file mode 100644
index 0000000000..bf5870fd72
--- /dev/null
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.cs
@@ -0,0 +1,394 @@
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
+{
+	internal partial class NameConventionEditRuleDialog
+	{
+		private global::Gtk.VBox vbox3;
+		
+		private global::Gtk.HBox hbox3;
+		
+		private global::Gtk.Label label4;
+		
+		private global::Gtk.Entry entryRuleName;
+		
+		private global::Gtk.HBox hbox1;
+		
+		private global::Gtk.Table table1;
+		
+		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+		
+		private global::Gtk.TreeView treeviewEntities;
+		
+		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
+		
+		private global::Gtk.TreeView treeviewAccessibility;
+		
+		private global::Gtk.Label label5;
+		
+		private global::Gtk.Label label6;
+		
+		private global::Gtk.Table table2;
+		
+		private global::Gtk.Entry entryPrefix;
+		
+		private global::Gtk.Entry entryPrefixAllowed;
+		
+		private global::Gtk.Entry entrySuffix;
+		
+		private global::Gtk.Label label1;
+		
+		private global::Gtk.Label label2;
+		
+		private global::Gtk.Label label3;
+		
+		private global::Gtk.Label label8;
+		
+		private global::Gtk.ComboBox styleComboBox;
+		
+		private global::Gtk.VBox vbox1;
+		
+		private global::Gtk.CheckButton checkbuttonStatic;
+		
+		private global::Gtk.CheckButton checkbuttonInstanceMembers;
+		
+		private global::Gtk.VBox vbox5;
+		
+		private global::Gtk.Label label9;
+		
+		private global::Gtk.Button buttonCancel;
+		
+		private global::Gtk.Button buttonOk;
+
+		protected virtual void Build ()
+		{
+			global::Stetic.Gui.Initialize (this);
+			// Widget MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog
+			this.WidthRequest = 640;
+			this.HeightRequest = 480;
+			this.Name = "MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog";
+			this.Title = global::Mono.Unix.Catalog.GetString ("Edit Naming Rule");
+			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
+			this.Modal = true;
+			this.Resizable = false;
+			this.DestroyWithParent = true;
+			this.SkipPagerHint = true;
+			this.SkipTaskbarHint = true;
+			// Internal child MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.VBox
+			global::Gtk.VBox w1 = this.VBox;
+			w1.Name = "dialog1_VBox";
+			w1.Spacing = 6;
+			w1.BorderWidth = ((uint)(2));
+			// Container child dialog1_VBox.Gtk.Box+BoxChild
+			this.vbox3 = new global::Gtk.VBox ();
+			this.vbox3.Name = "vbox3";
+			this.vbox3.Spacing = 6;
+			this.vbox3.BorderWidth = ((uint)(6));
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3.Name = "hbox3";
+			this.hbox3.Spacing = 6;
+			// Container child hbox3.Gtk.Box+BoxChild
+			this.label4 = new global::Gtk.Label ();
+			this.label4.Name = "label4";
+			this.label4.Xalign = 1F;
+			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("_Rule:");
+			this.label4.UseUnderline = true;
+			this.hbox3.Add (this.label4);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label4]));
+			w2.Position = 0;
+			w2.Expand = false;
+			w2.Fill = false;
+			w2.Padding = ((uint)(6));
+			// Container child hbox3.Gtk.Box+BoxChild
+			this.entryRuleName = new global::Gtk.Entry ();
+			this.entryRuleName.CanFocus = true;
+			this.entryRuleName.Name = "entryRuleName";
+			this.entryRuleName.IsEditable = true;
+			this.entryRuleName.InvisibleChar = '●';
+			this.hbox3.Add (this.entryRuleName);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.entryRuleName]));
+			w3.Position = 1;
+			this.vbox3.Add (this.hbox3);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox3]));
+			w4.Position = 0;
+			w4.Expand = false;
+			w4.Fill = false;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1.Name = "hbox1";
+			this.hbox1.Spacing = 6;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(2)), false);
+			this.table1.Name = "table1";
+			this.table1.RowSpacing = ((uint)(6));
+			this.table1.ColumnSpacing = ((uint)(6));
+			this.table1.BorderWidth = ((uint)(6));
+			// Container child table1.Gtk.Table+TableChild
+			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
+			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
+			this.treeviewEntities = new global::Gtk.TreeView ();
+			this.treeviewEntities.WidthRequest = 0;
+			this.treeviewEntities.CanFocus = true;
+			this.treeviewEntities.Name = "treeviewEntities";
+			this.treeviewEntities.HeadersVisible = false;
+			this.GtkScrolledWindow.Add (this.treeviewEntities);
+			this.table1.Add (this.GtkScrolledWindow);
+			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow]));
+			w6.TopAttach = ((uint)(1));
+			w6.BottomAttach = ((uint)(2));
+			w6.RightAttach = ((uint)(2));
+			w6.YPadding = ((uint)(6));
+			w6.XOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow1.Name = "GtkScrolledWindow1";
+			this.GtkScrolledWindow1.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow1.Gtk.Container+ContainerChild
+			this.treeviewAccessibility = new global::Gtk.TreeView ();
+			this.treeviewAccessibility.CanFocus = true;
+			this.treeviewAccessibility.Name = "treeviewAccessibility";
+			this.treeviewAccessibility.HeadersVisible = false;
+			this.GtkScrolledWindow1.Add (this.treeviewAccessibility);
+			this.table1.Add (this.GtkScrolledWindow1);
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow1]));
+			w8.TopAttach = ((uint)(3));
+			w8.BottomAttach = ((uint)(4));
+			w8.XPadding = ((uint)(6));
+			w8.YPadding = ((uint)(6));
+			// Container child table1.Gtk.Table+TableChild
+			this.label5 = new global::Gtk.Label ();
+			this.label5.Name = "label5";
+			this.label5.Xalign = 0F;
+			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("_Affected entities:");
+			this.label5.UseUnderline = true;
+			this.table1.Add (this.label5);
+			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5]));
+			w9.XOptions = ((global::Gtk.AttachOptions)(4));
+			w9.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.label6 = new global::Gtk.Label ();
+			this.label6.Name = "label6";
+			this.label6.Xalign = 0F;
+			this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("_Accessibility:");
+			this.label6.UseUnderline = true;
+			this.table1.Add (this.label6);
+			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.label6]));
+			w10.TopAttach = ((uint)(2));
+			w10.BottomAttach = ((uint)(3));
+			w10.XOptions = ((global::Gtk.AttachOptions)(4));
+			w10.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.table2 = new global::Gtk.Table (((uint)(5)), ((uint)(2)), false);
+			this.table2.Name = "table2";
+			this.table2.RowSpacing = ((uint)(6));
+			this.table2.ColumnSpacing = ((uint)(6));
+			// Container child table2.Gtk.Table+TableChild
+			this.entryPrefix = new global::Gtk.Entry ();
+			this.entryPrefix.CanFocus = true;
+			this.entryPrefix.Name = "entryPrefix";
+			this.entryPrefix.IsEditable = true;
+			this.entryPrefix.InvisibleChar = '●';
+			this.table2.Add (this.entryPrefix);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryPrefix]));
+			w11.TopAttach = ((uint)(1));
+			w11.BottomAttach = ((uint)(2));
+			w11.LeftAttach = ((uint)(1));
+			w11.RightAttach = ((uint)(2));
+			w11.XOptions = ((global::Gtk.AttachOptions)(4));
+			w11.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.entryPrefixAllowed = new global::Gtk.Entry ();
+			this.entryPrefixAllowed.CanFocus = true;
+			this.entryPrefixAllowed.Name = "entryPrefixAllowed";
+			this.entryPrefixAllowed.IsEditable = true;
+			this.entryPrefixAllowed.InvisibleChar = '●';
+			this.table2.Add (this.entryPrefixAllowed);
+			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryPrefixAllowed]));
+			w12.TopAttach = ((uint)(2));
+			w12.BottomAttach = ((uint)(3));
+			w12.LeftAttach = ((uint)(1));
+			w12.RightAttach = ((uint)(2));
+			w12.XOptions = ((global::Gtk.AttachOptions)(4));
+			w12.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.entrySuffix = new global::Gtk.Entry ();
+			this.entrySuffix.CanFocus = true;
+			this.entrySuffix.Name = "entrySuffix";
+			this.entrySuffix.IsEditable = true;
+			this.entrySuffix.InvisibleChar = '●';
+			this.table2.Add (this.entrySuffix);
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table2 [this.entrySuffix]));
+			w13.TopAttach = ((uint)(3));
+			w13.BottomAttach = ((uint)(4));
+			w13.LeftAttach = ((uint)(1));
+			w13.RightAttach = ((uint)(2));
+			w13.XOptions = ((global::Gtk.AttachOptions)(4));
+			w13.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.label1 = new global::Gtk.Label ();
+			this.label1.Name = "label1";
+			this.label1.Xalign = 1F;
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Prefix:");
+			this.table2.Add (this.label1);
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table2 [this.label1]));
+			w14.TopAttach = ((uint)(1));
+			w14.BottomAttach = ((uint)(2));
+			w14.XOptions = ((global::Gtk.AttachOptions)(4));
+			w14.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.label2 = new global::Gtk.Label ();
+			this.label2.Name = "label2";
+			this.label2.Xalign = 1F;
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Style:");
+			this.table2.Add (this.label2);
+			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table2 [this.label2]));
+			w15.XOptions = ((global::Gtk.AttachOptions)(4));
+			w15.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.label3 = new global::Gtk.Label ();
+			this.label3.Name = "label3";
+			this.label3.Xalign = 1F;
+			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Suffix:");
+			this.table2.Add (this.label3);
+			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table2 [this.label3]));
+			w16.TopAttach = ((uint)(3));
+			w16.BottomAttach = ((uint)(4));
+			w16.XOptions = ((global::Gtk.AttachOptions)(4));
+			w16.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.label8 = new global::Gtk.Label ();
+			this.label8.Name = "label8";
+			this.label8.Xalign = 1F;
+			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Optional Prefixes:");
+			this.table2.Add (this.label8);
+			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table2 [this.label8]));
+			w17.TopAttach = ((uint)(2));
+			w17.BottomAttach = ((uint)(3));
+			w17.XOptions = ((global::Gtk.AttachOptions)(4));
+			w17.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.styleComboBox = global::Gtk.ComboBox.NewText ();
+			this.styleComboBox.Name = "styleComboBox";
+			this.table2.Add (this.styleComboBox);
+			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table2 [this.styleComboBox]));
+			w18.LeftAttach = ((uint)(1));
+			w18.RightAttach = ((uint)(2));
+			w18.XOptions = ((global::Gtk.AttachOptions)(4));
+			w18.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1.Name = "vbox1";
+			this.vbox1.Spacing = 6;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.checkbuttonStatic = new global::Gtk.CheckButton ();
+			this.checkbuttonStatic.CanFocus = true;
+			this.checkbuttonStatic.Name = "checkbuttonStatic";
+			this.checkbuttonStatic.Label = global::Mono.Unix.Catalog.GetString ("_Static member and types");
+			this.checkbuttonStatic.Active = true;
+			this.checkbuttonStatic.DrawIndicator = true;
+			this.checkbuttonStatic.UseUnderline = true;
+			this.vbox1.Add (this.checkbuttonStatic);
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.checkbuttonStatic]));
+			w19.Position = 0;
+			w19.Expand = false;
+			w19.Fill = false;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.checkbuttonInstanceMembers = new global::Gtk.CheckButton ();
+			this.checkbuttonInstanceMembers.CanFocus = true;
+			this.checkbuttonInstanceMembers.Name = "checkbuttonInstanceMembers";
+			this.checkbuttonInstanceMembers.Label = global::Mono.Unix.Catalog.GetString ("_Instance members and locals");
+			this.checkbuttonInstanceMembers.Active = true;
+			this.checkbuttonInstanceMembers.DrawIndicator = true;
+			this.checkbuttonInstanceMembers.UseUnderline = true;
+			this.vbox1.Add (this.checkbuttonInstanceMembers);
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.checkbuttonInstanceMembers]));
+			w20.Position = 1;
+			w20.Expand = false;
+			w20.Fill = false;
+			this.table2.Add (this.vbox1);
+			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2 [this.vbox1]));
+			w21.TopAttach = ((uint)(4));
+			w21.BottomAttach = ((uint)(5));
+			w21.LeftAttach = ((uint)(1));
+			w21.RightAttach = ((uint)(2));
+			w21.XOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5.Name = "vbox5";
+			this.vbox5.Spacing = 6;
+			// Container child vbox5.Gtk.Box+BoxChild
+			this.label9 = new global::Gtk.Label ();
+			this.label9.Name = "label9";
+			this.label9.Xalign = 0F;
+			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Static/Non Static");
+			this.vbox5.Add (this.label9);
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.label9]));
+			w22.Position = 0;
+			w22.Expand = false;
+			w22.Fill = false;
+			this.table2.Add (this.vbox5);
+			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2 [this.vbox5]));
+			w23.TopAttach = ((uint)(4));
+			w23.BottomAttach = ((uint)(5));
+			w23.XOptions = ((global::Gtk.AttachOptions)(4));
+			this.table1.Add (this.table2);
+			global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table1 [this.table2]));
+			w24.TopAttach = ((uint)(2));
+			w24.BottomAttach = ((uint)(4));
+			w24.LeftAttach = ((uint)(1));
+			w24.RightAttach = ((uint)(2));
+			w24.XOptions = ((global::Gtk.AttachOptions)(4));
+			w24.YOptions = ((global::Gtk.AttachOptions)(0));
+			this.hbox1.Add (this.table1);
+			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.table1]));
+			w25.Position = 0;
+			this.vbox3.Add (this.hbox1);
+			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox1]));
+			w26.Position = 1;
+			w1.Add (this.vbox3);
+			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox3]));
+			w27.Position = 0;
+			w27.Padding = ((uint)(6));
+			// Internal child MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog.ActionArea
+			global::Gtk.HButtonBox w28 = this.ActionArea;
+			w28.Name = "dialog1_ActionArea";
+			w28.Spacing = 10;
+			w28.BorderWidth = ((uint)(5));
+			w28.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonCancel = new global::Gtk.Button ();
+			this.buttonCancel.CanDefault = true;
+			this.buttonCancel.CanFocus = true;
+			this.buttonCancel.Name = "buttonCancel";
+			this.buttonCancel.UseStock = true;
+			this.buttonCancel.UseUnderline = true;
+			this.buttonCancel.Label = "gtk-cancel";
+			this.AddActionWidget (this.buttonCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w29 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w28 [this.buttonCancel]));
+			w29.Expand = false;
+			w29.Fill = false;
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonOk = new global::Gtk.Button ();
+			this.buttonOk.CanDefault = true;
+			this.buttonOk.CanFocus = true;
+			this.buttonOk.Name = "buttonOk";
+			this.buttonOk.UseStock = true;
+			this.buttonOk.UseUnderline = true;
+			this.buttonOk.Label = "gtk-ok";
+			this.AddActionWidget (this.buttonOk, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w30 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w28 [this.buttonOk]));
+			w30.Position = 1;
+			w30.Expand = false;
+			w30.Fill = false;
+			if ((this.Child != null)) {
+				this.Child.ShowAll ();
+			}
+			this.DefaultWidth = 804;
+			this.DefaultHeight = 508;
+			this.Show ();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget.cs
new file mode 100644
index 0000000000..ca3e1675e6
--- /dev/null
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget.cs
@@ -0,0 +1,95 @@
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace MonoDevelop.CSharp.Diagnostics.InconsistentNaming
+{
+	internal partial class NameConventionPanelWidget
+	{
+		private global::Gtk.HBox hbox3;
+		
+		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+		
+		private global::Gtk.TreeView treeviewConventions;
+		
+		private global::Gtk.VBox vbox3;
+		
+		private global::Gtk.Button buttonEdit;
+		
+		private global::Gtk.Button buttonAdd;
+		
+		private global::Gtk.Button buttonRemove;
+
+		protected virtual void Build ()
+		{
+			global::Stetic.Gui.Initialize (this);
+			// Widget MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget
+			global::Stetic.BinContainer.Attach (this);
+			this.Name = "MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget";
+			// Container child MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget.Gtk.Container+ContainerChild
+			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3.Name = "hbox3";
+			this.hbox3.Spacing = 6;
+			// Container child hbox3.Gtk.Box+BoxChild
+			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
+			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
+			this.treeviewConventions = new global::Gtk.TreeView ();
+			this.treeviewConventions.CanFocus = true;
+			this.treeviewConventions.Name = "treeviewConventions";
+			this.GtkScrolledWindow.Add (this.treeviewConventions);
+			this.hbox3.Add (this.GtkScrolledWindow);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.GtkScrolledWindow]));
+			w2.Position = 0;
+			// Container child hbox3.Gtk.Box+BoxChild
+			this.vbox3 = new global::Gtk.VBox ();
+			this.vbox3.Name = "vbox3";
+			this.vbox3.Spacing = 6;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.buttonEdit = new global::Gtk.Button ();
+			this.buttonEdit.CanFocus = true;
+			this.buttonEdit.Name = "buttonEdit";
+			this.buttonEdit.UseStock = true;
+			this.buttonEdit.UseUnderline = true;
+			this.buttonEdit.Label = "gtk-edit";
+			this.vbox3.Add (this.buttonEdit);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.buttonEdit]));
+			w3.Position = 0;
+			w3.Expand = false;
+			w3.Fill = false;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.buttonAdd = new global::Gtk.Button ();
+			this.buttonAdd.CanFocus = true;
+			this.buttonAdd.Name = "buttonAdd";
+			this.buttonAdd.UseStock = true;
+			this.buttonAdd.UseUnderline = true;
+			this.buttonAdd.Label = "gtk-add";
+			this.vbox3.Add (this.buttonAdd);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.buttonAdd]));
+			w4.Position = 1;
+			w4.Expand = false;
+			w4.Fill = false;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.buttonRemove = new global::Gtk.Button ();
+			this.buttonRemove.CanFocus = true;
+			this.buttonRemove.Name = "buttonRemove";
+			this.buttonRemove.UseStock = true;
+			this.buttonRemove.UseUnderline = true;
+			this.buttonRemove.Label = "gtk-remove";
+			this.vbox3.Add (this.buttonRemove);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.buttonRemove]));
+			w5.Position = 2;
+			w5.Expand = false;
+			w5.Fill = false;
+			this.hbox3.Add (this.vbox3);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.vbox3]));
+			w6.Position = 1;
+			w6.Expand = false;
+			w6.Fill = false;
+			this.Add (this.hbox3);
+			if ((this.Child != null)) {
+				this.Child.ShowAll ();
+			}
+			this.Hide ();
+		}
+	}
+}
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanelWidget.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanelWidget.cs
index 323a37ccd6..cb4e5efaa8 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingPolicyPanelWidget.cs
@@ -2,12 +2,16 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.CSharp.Formatting
 {
-	internal partial class CSharpFormattingPolicyPanelWidget
+	partial class CSharpFormattingPolicyPanelWidget
 	{
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.Button buttonEdit;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow1;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs
index a44402e53d..77a4416fad 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.cs
@@ -5,55 +5,59 @@ namespace MonoDevelop.CSharp.Formatting
 	internal partial class CSharpFormattingProfileDialog
 	{
 		private global::Gtk.VBox vbox5;
+		
 		private global::Gtk.HPaned hpaned1;
+		
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.HBox hbox4;
+		
 		private global::Gtk.Label label12;
+		
 		private global::Gtk.ComboBox comboboxCategories;
+		
 		private global::Gtk.Notebook notebookCategories;
+		
 		private global::Gtk.VBox vbox8;
+		
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+		
 		private global::Gtk.TreeView treeviewIndentOptions;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
-		private global::Gtk.TreeView treeviewBracePositions;
+		
+		private global::Gtk.TreeView treeviewNewLines;
+		
 		private global::Gtk.Label label9;
-		private global::Gtk.Table table4;
-		private global::Gtk.Entry entryAfterUsings;
-		private global::Gtk.Entry entryAroundRegion;
-		private global::Gtk.Entry entryBeforeFirstDeclaration;
-		private global::Gtk.Entry entryBeforUsings;
-		private global::Gtk.Entry entryBetweenEvents;
-		private global::Gtk.Entry entryBetweenFields;
-		private global::Gtk.Entry entryBetweenMembers;
-		private global::Gtk.Entry entryBetweenTypes;
-		private global::Gtk.Entry entryInsideRegion;
-		private global::Gtk.Label GtkLabel8;
-		private global::Gtk.Label GtkLabel9;
-		private global::Gtk.Label label1;
-		private global::Gtk.Label label15;
-		private global::Gtk.Label label16;
-		private global::Gtk.Label label19;
-		private global::Gtk.Label label20;
-		private global::Gtk.Label label21;
-		private global::Gtk.Label label22;
-		private global::Gtk.Label label23;
-		private global::Gtk.Label label24;
-		private global::Gtk.Label label25;
+		
+		private global::Gtk.ScrolledWindow GtkScrolledWindow5;
+		
+		private global::Gtk.TreeView treeviewSpacing;
+		
 		private global::Gtk.Label label14;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow3;
-		private global::Gtk.TreeView treeviewWrappingCategory;
-		private global::Gtk.Label label2;
+		
 		private global::Gtk.ScrolledWindow GtkScrolledWindow2;
-		private global::Gtk.TreeView treeviewInsertWhiteSpaceCategory;
+		
+		private global::Gtk.TreeView treeviewWrapping;
+		
 		private global::Gtk.Label label10;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow4;
-		private global::Gtk.TreeView treeviewNewLines;
-		private global::Gtk.Label label11;
+		
+		private global::Gtk.ScrolledWindow GtkScrolledWindow3;
+		
+		private global::Gtk.TreeView treeviewStyle;
+		
+		private global::Gtk.Label label2;
+		
 		private global::Gtk.VBox vbox6;
+		
 		private global::Gtk.Label label13;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow;
+		
 		private global::Gtk.Button buttonCancel;
+		
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
@@ -131,7 +135,7 @@ namespace MonoDevelop.CSharp.Formatting
 			// Notebook tab
 			this.label8 = new global::Gtk.Label ();
 			this.label8.Name = "label8";
-			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("page1");
+			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Indentation");
 			this.notebookCategories.SetTabLabel (this.vbox8, this.label8);
 			this.label8.ShowAll ();
 			// Container child notebookCategories.Gtk.Notebook+NotebookChild
@@ -139,363 +143,79 @@ namespace MonoDevelop.CSharp.Formatting
 			this.GtkScrolledWindow1.Name = "GtkScrolledWindow1";
 			this.GtkScrolledWindow1.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow1.Gtk.Container+ContainerChild
-			this.treeviewBracePositions = new global::Gtk.TreeView ();
-			this.treeviewBracePositions.CanFocus = true;
-			this.treeviewBracePositions.Name = "treeviewBracePositions";
-			this.GtkScrolledWindow1.Add (this.treeviewBracePositions);
+			this.treeviewNewLines = new global::Gtk.TreeView ();
+			this.treeviewNewLines.CanFocus = true;
+			this.treeviewNewLines.Name = "treeviewNewLines";
+			this.GtkScrolledWindow1.Add (this.treeviewNewLines);
 			this.notebookCategories.Add (this.GtkScrolledWindow1);
 			global::Gtk.Notebook.NotebookChild w9 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow1]));
 			w9.Position = 1;
 			// Notebook tab
 			this.label9 = new global::Gtk.Label ();
 			this.label9.Name = "label9";
-			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("page2");
+			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("NewLines");
 			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow1, this.label9);
 			this.label9.ShowAll ();
 			// Container child notebookCategories.Gtk.Notebook+NotebookChild
-			this.table4 = new global::Gtk.Table (((uint)(12)), ((uint)(3)), false);
-			this.table4.Name = "table4";
-			this.table4.RowSpacing = ((uint)(6));
-			this.table4.ColumnSpacing = ((uint)(6));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryAfterUsings = new global::Gtk.Entry ();
-			this.entryAfterUsings.CanFocus = true;
-			this.entryAfterUsings.Name = "entryAfterUsings";
-			this.entryAfterUsings.IsEditable = true;
-			this.entryAfterUsings.WidthChars = 5;
-			this.entryAfterUsings.InvisibleChar = '●';
-			this.table4.Add (this.entryAfterUsings);
-			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryAfterUsings]));
-			w10.TopAttach = ((uint)(2));
-			w10.BottomAttach = ((uint)(3));
-			w10.LeftAttach = ((uint)(1));
-			w10.RightAttach = ((uint)(2));
-			w10.XOptions = ((global::Gtk.AttachOptions)(2));
-			w10.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryAroundRegion = new global::Gtk.Entry ();
-			this.entryAroundRegion.CanFocus = true;
-			this.entryAroundRegion.Name = "entryAroundRegion";
-			this.entryAroundRegion.IsEditable = true;
-			this.entryAroundRegion.WidthChars = 5;
-			this.entryAroundRegion.InvisibleChar = '●';
-			this.table4.Add (this.entryAroundRegion);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryAroundRegion]));
-			w11.TopAttach = ((uint)(10));
-			w11.BottomAttach = ((uint)(11));
-			w11.LeftAttach = ((uint)(1));
-			w11.RightAttach = ((uint)(2));
-			w11.XOptions = ((global::Gtk.AttachOptions)(0));
-			w11.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBeforeFirstDeclaration = new global::Gtk.Entry ();
-			this.entryBeforeFirstDeclaration.CanFocus = true;
-			this.entryBeforeFirstDeclaration.Name = "entryBeforeFirstDeclaration";
-			this.entryBeforeFirstDeclaration.IsEditable = true;
-			this.entryBeforeFirstDeclaration.WidthChars = 5;
-			this.entryBeforeFirstDeclaration.InvisibleChar = '●';
-			this.table4.Add (this.entryBeforeFirstDeclaration);
-			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBeforeFirstDeclaration]));
-			w12.TopAttach = ((uint)(4));
-			w12.BottomAttach = ((uint)(5));
-			w12.LeftAttach = ((uint)(1));
-			w12.RightAttach = ((uint)(2));
-			w12.XOptions = ((global::Gtk.AttachOptions)(0));
-			w12.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBeforUsings = new global::Gtk.Entry ();
-			this.entryBeforUsings.CanFocus = true;
-			this.entryBeforUsings.Name = "entryBeforUsings";
-			this.entryBeforUsings.IsEditable = true;
-			this.entryBeforUsings.WidthChars = 5;
-			this.entryBeforUsings.InvisibleChar = '●';
-			this.table4.Add (this.entryBeforUsings);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBeforUsings]));
-			w13.TopAttach = ((uint)(1));
-			w13.BottomAttach = ((uint)(2));
-			w13.LeftAttach = ((uint)(1));
-			w13.RightAttach = ((uint)(2));
-			w13.XOptions = ((global::Gtk.AttachOptions)(2));
-			w13.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBetweenEvents = new global::Gtk.Entry ();
-			this.entryBetweenEvents.CanFocus = true;
-			this.entryBetweenEvents.Name = "entryBetweenEvents";
-			this.entryBetweenEvents.IsEditable = true;
-			this.entryBetweenEvents.WidthChars = 5;
-			this.entryBetweenEvents.InvisibleChar = '●';
-			this.table4.Add (this.entryBetweenEvents);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBetweenEvents]));
-			w14.TopAttach = ((uint)(8));
-			w14.BottomAttach = ((uint)(9));
-			w14.LeftAttach = ((uint)(1));
-			w14.RightAttach = ((uint)(2));
-			w14.XOptions = ((global::Gtk.AttachOptions)(0));
-			w14.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBetweenFields = new global::Gtk.Entry ();
-			this.entryBetweenFields.CanFocus = true;
-			this.entryBetweenFields.Name = "entryBetweenFields";
-			this.entryBetweenFields.IsEditable = true;
-			this.entryBetweenFields.WidthChars = 5;
-			this.entryBetweenFields.InvisibleChar = '●';
-			this.table4.Add (this.entryBetweenFields);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBetweenFields]));
-			w15.TopAttach = ((uint)(7));
-			w15.BottomAttach = ((uint)(8));
-			w15.LeftAttach = ((uint)(1));
-			w15.RightAttach = ((uint)(2));
-			w15.XOptions = ((global::Gtk.AttachOptions)(0));
-			w15.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBetweenMembers = new global::Gtk.Entry ();
-			this.entryBetweenMembers.CanFocus = true;
-			this.entryBetweenMembers.Name = "entryBetweenMembers";
-			this.entryBetweenMembers.IsEditable = true;
-			this.entryBetweenMembers.WidthChars = 5;
-			this.entryBetweenMembers.InvisibleChar = '●';
-			this.table4.Add (this.entryBetweenMembers);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBetweenMembers]));
-			w16.TopAttach = ((uint)(9));
-			w16.BottomAttach = ((uint)(10));
-			w16.LeftAttach = ((uint)(1));
-			w16.RightAttach = ((uint)(2));
-			w16.XOptions = ((global::Gtk.AttachOptions)(0));
-			w16.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryBetweenTypes = new global::Gtk.Entry ();
-			this.entryBetweenTypes.CanFocus = true;
-			this.entryBetweenTypes.Name = "entryBetweenTypes";
-			this.entryBetweenTypes.IsEditable = true;
-			this.entryBetweenTypes.WidthChars = 5;
-			this.entryBetweenTypes.InvisibleChar = '●';
-			this.table4.Add (this.entryBetweenTypes);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryBetweenTypes]));
-			w17.TopAttach = ((uint)(5));
-			w17.BottomAttach = ((uint)(6));
-			w17.LeftAttach = ((uint)(1));
-			w17.RightAttach = ((uint)(2));
-			w17.XOptions = ((global::Gtk.AttachOptions)(0));
-			w17.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.entryInsideRegion = new global::Gtk.Entry ();
-			this.entryInsideRegion.CanFocus = true;
-			this.entryInsideRegion.Name = "entryInsideRegion";
-			this.entryInsideRegion.IsEditable = true;
-			this.entryInsideRegion.WidthChars = 5;
-			this.entryInsideRegion.InvisibleChar = '●';
-			this.table4.Add (this.entryInsideRegion);
-			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryInsideRegion]));
-			w18.TopAttach = ((uint)(11));
-			w18.BottomAttach = ((uint)(12));
-			w18.LeftAttach = ((uint)(1));
-			w18.RightAttach = ((uint)(2));
-			w18.XOptions = ((global::Gtk.AttachOptions)(0));
-			w18.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.GtkLabel8 = new global::Gtk.Label ();
-			this.GtkLabel8.Name = "GtkLabel8";
-			this.GtkLabel8.Xalign = 0F;
-			this.GtkLabel8.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Minimum blank lines in namespaces</b>");
-			this.GtkLabel8.UseMarkup = true;
-			this.table4.Add (this.GtkLabel8);
-			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table4 [this.GtkLabel8]));
-			w19.TopAttach = ((uint)(3));
-			w19.BottomAttach = ((uint)(4));
-			w19.RightAttach = ((uint)(3));
-			w19.XOptions = ((global::Gtk.AttachOptions)(4));
-			w19.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.GtkLabel9 = new global::Gtk.Label ();
-			this.GtkLabel9.Name = "GtkLabel9";
-			this.GtkLabel9.Xalign = 0F;
-			this.GtkLabel9.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Minimum blank lines in types</b>");
-			this.GtkLabel9.UseMarkup = true;
-			this.table4.Add (this.GtkLabel9);
-			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table4 [this.GtkLabel9]));
-			w20.TopAttach = ((uint)(6));
-			w20.BottomAttach = ((uint)(7));
-			w20.RightAttach = ((uint)(3));
-			w20.XOptions = ((global::Gtk.AttachOptions)(4));
-			w20.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Minimum blank lines in compilation unit</b>");
-			this.label1.UseMarkup = true;
-			this.table4.Add (this.label1);
-			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table4 [this.label1]));
-			w21.RightAttach = ((uint)(3));
-			w21.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label15 = new global::Gtk.Label ();
-			this.label15.Name = "label15";
-			this.label15.Xalign = 1F;
-			this.label15.LabelProp = global::Mono.Unix.Catalog.GetString ("Before using declaration:");
-			this.table4.Add (this.label15);
-			global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table4 [this.label15]));
-			w22.TopAttach = ((uint)(1));
-			w22.BottomAttach = ((uint)(2));
-			w22.XOptions = ((global::Gtk.AttachOptions)(4));
-			w22.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label16 = new global::Gtk.Label ();
-			this.label16.Name = "label16";
-			this.label16.Xalign = 1F;
-			this.label16.LabelProp = global::Mono.Unix.Catalog.GetString ("After using declaration:");
-			this.table4.Add (this.label16);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table4 [this.label16]));
-			w23.TopAttach = ((uint)(2));
-			w23.BottomAttach = ((uint)(3));
-			w23.XOptions = ((global::Gtk.AttachOptions)(4));
-			w23.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label19 = new global::Gtk.Label ();
-			this.label19.Name = "label19";
-			this.label19.Xalign = 1F;
-			this.label19.LabelProp = global::Mono.Unix.Catalog.GetString ("Between type declarations:");
-			this.table4.Add (this.label19);
-			global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table4 [this.label19]));
-			w24.TopAttach = ((uint)(5));
-			w24.BottomAttach = ((uint)(6));
-			w24.XOptions = ((global::Gtk.AttachOptions)(4));
-			w24.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label20 = new global::Gtk.Label ();
-			this.label20.Name = "label20";
-			this.label20.Xalign = 1F;
-			this.label20.LabelProp = global::Mono.Unix.Catalog.GetString ("Before first declaration:");
-			this.table4.Add (this.label20);
-			global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.table4 [this.label20]));
-			w25.TopAttach = ((uint)(4));
-			w25.BottomAttach = ((uint)(5));
-			w25.XOptions = ((global::Gtk.AttachOptions)(4));
-			w25.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label21 = new global::Gtk.Label ();
-			this.label21.Name = "label21";
-			this.label21.Xalign = 1F;
-			this.label21.LabelProp = global::Mono.Unix.Catalog.GetString ("Between field declarations:");
-			this.table4.Add (this.label21);
-			global::Gtk.Table.TableChild w26 = ((global::Gtk.Table.TableChild)(this.table4 [this.label21]));
-			w26.TopAttach = ((uint)(7));
-			w26.BottomAttach = ((uint)(8));
-			w26.XOptions = ((global::Gtk.AttachOptions)(4));
-			w26.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label22 = new global::Gtk.Label ();
-			this.label22.Name = "label22";
-			this.label22.Xalign = 1F;
-			this.label22.LabelProp = global::Mono.Unix.Catalog.GetString ("Between other member declarations:");
-			this.table4.Add (this.label22);
-			global::Gtk.Table.TableChild w27 = ((global::Gtk.Table.TableChild)(this.table4 [this.label22]));
-			w27.TopAttach = ((uint)(9));
-			w27.BottomAttach = ((uint)(10));
-			w27.XOptions = ((global::Gtk.AttachOptions)(4));
-			w27.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label23 = new global::Gtk.Label ();
-			this.label23.Name = "label23";
-			this.label23.Xalign = 1F;
-			this.label23.LabelProp = global::Mono.Unix.Catalog.GetString ("Between simple event declarations:");
-			this.table4.Add (this.label23);
-			global::Gtk.Table.TableChild w28 = ((global::Gtk.Table.TableChild)(this.table4 [this.label23]));
-			w28.TopAttach = ((uint)(8));
-			w28.BottomAttach = ((uint)(9));
-			w28.XOptions = ((global::Gtk.AttachOptions)(4));
-			w28.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label24 = new global::Gtk.Label ();
-			this.label24.Name = "label24";
-			this.label24.Xalign = 1F;
-			this.label24.LabelProp = global::Mono.Unix.Catalog.GetString ("Around region:");
-			this.table4.Add (this.label24);
-			global::Gtk.Table.TableChild w29 = ((global::Gtk.Table.TableChild)(this.table4 [this.label24]));
-			w29.TopAttach = ((uint)(10));
-			w29.BottomAttach = ((uint)(11));
-			w29.XOptions = ((global::Gtk.AttachOptions)(4));
-			w29.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table4.Gtk.Table+TableChild
-			this.label25 = new global::Gtk.Label ();
-			this.label25.Name = "label25";
-			this.label25.Xalign = 1F;
-			this.label25.LabelProp = global::Mono.Unix.Catalog.GetString ("Inside region:");
-			this.table4.Add (this.label25);
-			global::Gtk.Table.TableChild w30 = ((global::Gtk.Table.TableChild)(this.table4 [this.label25]));
-			w30.TopAttach = ((uint)(11));
-			w30.BottomAttach = ((uint)(12));
-			w30.XOptions = ((global::Gtk.AttachOptions)(4));
-			w30.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.notebookCategories.Add (this.table4);
-			global::Gtk.Notebook.NotebookChild w31 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.table4]));
-			w31.Position = 2;
+			this.GtkScrolledWindow5 = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow5.Name = "GtkScrolledWindow5";
+			this.GtkScrolledWindow5.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow5.Gtk.Container+ContainerChild
+			this.treeviewSpacing = new global::Gtk.TreeView ();
+			this.treeviewSpacing.CanFocus = true;
+			this.treeviewSpacing.Name = "treeviewSpacing";
+			this.GtkScrolledWindow5.Add (this.treeviewSpacing);
+			this.notebookCategories.Add (this.GtkScrolledWindow5);
+			global::Gtk.Notebook.NotebookChild w11 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow5]));
+			w11.Position = 2;
 			// Notebook tab
 			this.label14 = new global::Gtk.Label ();
 			this.label14.Name = "label14";
-			this.label14.LabelProp = global::Mono.Unix.Catalog.GetString ("page5");
-			this.notebookCategories.SetTabLabel (this.table4, this.label14);
+			this.label14.LabelProp = global::Mono.Unix.Catalog.GetString ("Spacing");
+			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow5, this.label14);
 			this.label14.ShowAll ();
 			// Container child notebookCategories.Gtk.Notebook+NotebookChild
-			this.GtkScrolledWindow3 = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow3.Name = "GtkScrolledWindow3";
-			this.GtkScrolledWindow3.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow3.Gtk.Container+ContainerChild
-			this.treeviewWrappingCategory = new global::Gtk.TreeView ();
-			this.treeviewWrappingCategory.CanFocus = true;
-			this.treeviewWrappingCategory.Name = "treeviewWrappingCategory";
-			this.GtkScrolledWindow3.Add (this.treeviewWrappingCategory);
-			this.notebookCategories.Add (this.GtkScrolledWindow3);
-			global::Gtk.Notebook.NotebookChild w33 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow3]));
-			w33.Position = 3;
-			// Notebook tab
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("page6");
-			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow3, this.label2);
-			this.label2.ShowAll ();
-			// Container child notebookCategories.Gtk.Notebook+NotebookChild
 			this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow2.Name = "GtkScrolledWindow2";
 			this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow2.Gtk.Container+ContainerChild
-			this.treeviewInsertWhiteSpaceCategory = new global::Gtk.TreeView ();
-			this.treeviewInsertWhiteSpaceCategory.CanFocus = true;
-			this.treeviewInsertWhiteSpaceCategory.Name = "treeviewInsertWhiteSpaceCategory";
-			this.GtkScrolledWindow2.Add (this.treeviewInsertWhiteSpaceCategory);
+			this.treeviewWrapping = new global::Gtk.TreeView ();
+			this.treeviewWrapping.CanFocus = true;
+			this.treeviewWrapping.Name = "treeviewWrapping";
+			this.GtkScrolledWindow2.Add (this.treeviewWrapping);
 			this.notebookCategories.Add (this.GtkScrolledWindow2);
-			global::Gtk.Notebook.NotebookChild w35 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow2]));
-			w35.Position = 4;
+			global::Gtk.Notebook.NotebookChild w13 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow2]));
+			w13.Position = 3;
 			// Notebook tab
 			this.label10 = new global::Gtk.Label ();
 			this.label10.Name = "label10";
-			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("page3");
+			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("Wrapping");
 			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow2, this.label10);
 			this.label10.ShowAll ();
 			// Container child notebookCategories.Gtk.Notebook+NotebookChild
-			this.GtkScrolledWindow4 = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow4.Name = "GtkScrolledWindow4";
-			this.GtkScrolledWindow4.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow4.Gtk.Container+ContainerChild
-			this.treeviewNewLines = new global::Gtk.TreeView ();
-			this.treeviewNewLines.CanFocus = true;
-			this.treeviewNewLines.Name = "treeviewNewLines";
-			this.GtkScrolledWindow4.Add (this.treeviewNewLines);
-			this.notebookCategories.Add (this.GtkScrolledWindow4);
-			global::Gtk.Notebook.NotebookChild w37 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow4]));
-			w37.Position = 5;
+			this.GtkScrolledWindow3 = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow3.Name = "GtkScrolledWindow3";
+			this.GtkScrolledWindow3.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow3.Gtk.Container+ContainerChild
+			this.treeviewStyle = new global::Gtk.TreeView ();
+			this.treeviewStyle.CanFocus = true;
+			this.treeviewStyle.Name = "treeviewStyle";
+			this.GtkScrolledWindow3.Add (this.treeviewStyle);
+			this.notebookCategories.Add (this.GtkScrolledWindow3);
+			global::Gtk.Notebook.NotebookChild w15 = ((global::Gtk.Notebook.NotebookChild)(this.notebookCategories [this.GtkScrolledWindow3]));
+			w15.Position = 4;
 			// Notebook tab
-			this.label11 = new global::Gtk.Label ();
-			this.label11.Name = "label11";
-			this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("page4");
-			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow4, this.label11);
-			this.label11.ShowAll ();
+			this.label2 = new global::Gtk.Label ();
+			this.label2.Name = "label2";
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Style");
+			this.notebookCategories.SetTabLabel (this.GtkScrolledWindow3, this.label2);
+			this.label2.ShowAll ();
 			this.vbox2.Add (this.notebookCategories);
-			global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebookCategories]));
-			w38.Position = 1;
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebookCategories]));
+			w16.Position = 1;
 			this.hpaned1.Add (this.vbox2);
-			global::Gtk.Paned.PanedChild w39 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.vbox2]));
-			w39.Resize = false;
+			global::Gtk.Paned.PanedChild w17 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.vbox2]));
+			w17.Resize = false;
 			// Container child hpaned1.Gtk.Paned+PanedChild
 			this.vbox6 = new global::Gtk.VBox ();
 			this.vbox6.Name = "vbox6";
@@ -506,31 +226,31 @@ namespace MonoDevelop.CSharp.Formatting
 			this.label13.Xalign = 0F;
 			this.label13.LabelProp = global::Mono.Unix.Catalog.GetString ("Preview:");
 			this.vbox6.Add (this.label13);
-			global::Gtk.Box.BoxChild w40 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label13]));
-			w40.Position = 0;
-			w40.Expand = false;
-			w40.Fill = false;
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label13]));
+			w18.Position = 0;
+			w18.Expand = false;
+			w18.Fill = false;
 			// Container child vbox6.Gtk.Box+BoxChild
 			this.scrolledwindow = new global::Gtk.ScrolledWindow ();
 			this.scrolledwindow.CanFocus = true;
 			this.scrolledwindow.Name = "scrolledwindow";
 			this.scrolledwindow.ShadowType = ((global::Gtk.ShadowType)(1));
 			this.vbox6.Add (this.scrolledwindow);
-			global::Gtk.Box.BoxChild w41 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.scrolledwindow]));
-			w41.Position = 1;
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.scrolledwindow]));
+			w19.Position = 1;
 			this.hpaned1.Add (this.vbox6);
 			this.vbox5.Add (this.hpaned1);
-			global::Gtk.Box.BoxChild w43 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hpaned1]));
-			w43.Position = 0;
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hpaned1]));
+			w21.Position = 0;
 			w1.Add (this.vbox5);
-			global::Gtk.Box.BoxChild w44 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5]));
-			w44.Position = 0;
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5]));
+			w22.Position = 0;
 			// Internal child MonoDevelop.CSharp.Formatting.CSharpFormattingProfileDialog.ActionArea
-			global::Gtk.HButtonBox w45 = this.ActionArea;
-			w45.Name = "dialog1_ActionArea";
-			w45.Spacing = 10;
-			w45.BorderWidth = ((uint)(5));
-			w45.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			global::Gtk.HButtonBox w23 = this.ActionArea;
+			w23.Name = "dialog1_ActionArea";
+			w23.Spacing = 10;
+			w23.BorderWidth = ((uint)(5));
+			w23.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonCancel = new global::Gtk.Button ();
 			this.buttonCancel.CanDefault = true;
@@ -540,9 +260,9 @@ namespace MonoDevelop.CSharp.Formatting
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w46 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w45 [this.buttonCancel]));
-			w46.Expand = false;
-			w46.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w24 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w23 [this.buttonCancel]));
+			w24.Expand = false;
+			w24.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonOk = new global::Gtk.Button ();
 			this.buttonOk.CanDefault = true;
@@ -552,10 +272,10 @@ namespace MonoDevelop.CSharp.Formatting
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
 			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w47 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w45 [this.buttonOk]));
-			w47.Position = 1;
-			w47.Expand = false;
-			w47.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w25 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w23 [this.buttonOk]));
+			w25.Position = 1;
+			w25.Expand = false;
+			w25.Fill = false;
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.NewFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.NewFormattingProfileDialog.cs
index 6dc530487f..a7544ac463 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.NewFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Formatting.NewFormattingProfileDialog.cs
@@ -2,14 +2,20 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.CSharp.Formatting
 {
-	internal partial class NewFormattingProfileDialog
+	partial class NewFormattingProfileDialog
 	{
 		private global::Gtk.VBox vbox4;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.Entry entryProfileName;
+		
 		private global::Gtk.Label label4;
+		
 		private global::Gtk.ComboBox comboboxInitFrom;
+		
 		private global::Gtk.Button buttonCancel;
+		
 		private global::Gtk.Button buttonOk;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs
index 954a522bf3..73bb6d6a87 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs
@@ -5,36 +5,67 @@ namespace MonoDevelop.CSharp.Project
 	internal partial class CodeGenerationPanelWidget
 	{
 		private global::Gtk.VBox vbox62;
+		
 		private global::Gtk.Label label82;
+		
 		private global::Gtk.HBox hbox56;
+		
 		private global::Gtk.Label label81;
+		
 		private global::Gtk.VBox vbox65;
+		
 		private global::Gtk.Table table1;
+		
 		private global::Gtk.CheckButton enableOptimizationCheckButton;
+		
 		private global::Gtk.CheckButton generateOverflowChecksCheckButton;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.ComboBox comboPlatforms;
+		
 		private global::Gtk.HBox hbox2;
+		
 		private global::Gtk.ComboBox comboDebug;
+		
 		private global::Gtk.HBox hbox4;
+		
 		private global::Gtk.CheckButton generateXmlOutputCheckButton;
+		
 		private global::MonoDevelop.Components.FileEntry xmlDocsEntry;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.Label label87;
+		
 		private global::Gtk.Entry symbolsEntry;
+		
 		private global::Gtk.Label label93;
+		
 		private global::Gtk.HBox hbox48;
+		
 		private global::Gtk.Label label73;
+		
 		private global::Gtk.VBox vbox67;
+		
 		private global::Gtk.HBox hbox60;
+		
 		private global::Gtk.Label label85;
+		
 		private global::Gtk.SpinButton warningLevelSpinButton;
+		
 		private global::Gtk.HBox hbox3;
+		
 		private global::Gtk.Label label86;
+		
 		private global::Gtk.Entry ignoreWarningsEntry;
+		
 		private global::Gtk.CheckButton warningsAsErrorsCheckButton;
+		
 		private global::Gtk.HBox hbox5;
+		
 		private global::Gtk.Label label74;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs
index 25f72f18b7..9c54345a54 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget.cs
@@ -2,32 +2,56 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.CSharp.Project
 {
-	public partial class CompilerOptionsPanelWidget
+	partial class CompilerOptionsPanelWidget
 	{
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.Label label82;
+		
 		private global::Gtk.HBox hbox5;
+		
 		private global::Gtk.Label label76;
+		
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.Table table7;
+		
 		private global::Gtk.ComboBoxEntry codepageEntry;
+		
 		private global::Gtk.HBox hbox57;
+		
 		private global::Gtk.ComboBox compileTargetCombo;
+		
 		private global::MonoDevelop.Components.FileEntry iconEntry;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.Label label86;
+		
 		private global::Gtk.Label label88;
+		
 		private global::Gtk.ComboBoxEntry mainClassEntry;
+		
 		private global::Gtk.CheckButton noStdLibCheckButton;
+		
 		private global::Gtk.Label label83;
+		
 		private global::Gtk.Label label75;
+		
 		private global::Gtk.HBox hbox7;
+		
 		private global::Gtk.Label label74;
+		
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.Table table2;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.ComboBox langVerCombo;
+		
 		private global::Gtk.CheckButton allowUnsafeCodeCheckButton;
 
 		protected virtual void Build ()
@@ -104,6 +128,7 @@ namespace MonoDevelop.CSharp.Project
 			// Container child table7.Gtk.Table+TableChild
 			this.iconEntry = new global::MonoDevelop.Components.FileEntry ();
 			this.iconEntry.Name = "iconEntry";
+			this.iconEntry.DisplayAsRelativePath = false;
 			this.table7.Add (this.iconEntry);
 			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table7 [this.iconEntry]));
 			w6.TopAttach = ((uint)(2));
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs
deleted file mode 100644
index e1b750e4a6..0000000000
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	internal partial class NameConventionEditRuleDialog
-	{
-		private global::Gtk.VBox vbox3;
-		private global::Gtk.HBox hbox3;
-		private global::Gtk.Label label4;
-		private global::Gtk.Entry entryRuleName;
-		private global::Gtk.HBox hbox1;
-		private global::Gtk.Table table1;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow;
-		private global::Gtk.TreeView treeviewEntities;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
-		private global::Gtk.TreeView treeviewAccessibility;
-		private global::Gtk.Label label5;
-		private global::Gtk.Label label6;
-		private global::Gtk.Table table2;
-		private global::Gtk.Entry entryPrefix;
-		private global::Gtk.Entry entryPrefixAllowed;
-		private global::Gtk.Entry entrySuffix;
-		private global::Gtk.Label label1;
-		private global::Gtk.Label label2;
-		private global::Gtk.Label label3;
-		private global::Gtk.Label label8;
-		private global::Gtk.ComboBox styleComboBox;
-		private global::Gtk.VBox vbox1;
-		private global::Gtk.CheckButton checkbuttonStatic;
-		private global::Gtk.CheckButton checkbuttonInstanceMembers;
-		private global::Gtk.VBox vbox5;
-		private global::Gtk.Label label9;
-		private global::Gtk.Button buttonCancel;
-		private global::Gtk.Button buttonOk;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog
-			this.WidthRequest = 640;
-			this.HeightRequest = 480;
-			this.Name = "MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Edit Naming Rule");
-			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
-			this.Modal = true;
-			this.Resizable = false;
-			this.DestroyWithParent = true;
-			this.SkipPagerHint = true;
-			this.SkipTaskbarHint = true;
-			// Internal child MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.VBox
-			global::Gtk.VBox w1 = this.VBox;
-			w1.Name = "dialog1_VBox";
-			w1.Spacing = 6;
-			w1.BorderWidth = ((uint)(2));
-			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			this.vbox3.BorderWidth = ((uint)(6));
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.hbox3 = new global::Gtk.HBox ();
-			this.hbox3.Name = "hbox3";
-			this.hbox3.Spacing = 6;
-			// Container child hbox3.Gtk.Box+BoxChild
-			this.label4 = new global::Gtk.Label ();
-			this.label4.Name = "label4";
-			this.label4.Xalign = 1F;
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("_Rule:");
-			this.label4.UseUnderline = true;
-			this.hbox3.Add (this.label4);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label4]));
-			w2.Position = 0;
-			w2.Expand = false;
-			w2.Fill = false;
-			w2.Padding = ((uint)(6));
-			// Container child hbox3.Gtk.Box+BoxChild
-			this.entryRuleName = new global::Gtk.Entry ();
-			this.entryRuleName.CanFocus = true;
-			this.entryRuleName.Name = "entryRuleName";
-			this.entryRuleName.IsEditable = true;
-			this.entryRuleName.InvisibleChar = '●';
-			this.hbox3.Add (this.entryRuleName);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.entryRuleName]));
-			w3.Position = 1;
-			this.vbox3.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox3]));
-			w4.Position = 0;
-			w4.Expand = false;
-			w4.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(2)), false);
-			this.table1.RowSpacing = ((uint)(6));
-			this.table1.ColumnSpacing = ((uint)(6));
-			this.table1.BorderWidth = ((uint)(6));
-			// Container child table1.Gtk.Table+TableChild
-			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
-			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-			this.treeviewEntities = new global::Gtk.TreeView ();
-			this.treeviewEntities.WidthRequest = 0;
-			this.treeviewEntities.CanFocus = true;
-			this.treeviewEntities.Name = "treeviewEntities";
-			this.treeviewEntities.HeadersVisible = false;
-			this.GtkScrolledWindow.Add (this.treeviewEntities);
-			this.table1.Add (this.GtkScrolledWindow);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow]));
-			w6.TopAttach = ((uint)(1));
-			w6.BottomAttach = ((uint)(2));
-			w6.RightAttach = ((uint)(2));
-			w6.YPadding = ((uint)(6));
-			w6.XOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow1.Name = "GtkScrolledWindow1";
-			this.GtkScrolledWindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow1.Gtk.Container+ContainerChild
-			this.treeviewAccessibility = new global::Gtk.TreeView ();
-			this.treeviewAccessibility.CanFocus = true;
-			this.treeviewAccessibility.Name = "treeviewAccessibility";
-			this.treeviewAccessibility.HeadersVisible = false;
-			this.GtkScrolledWindow1.Add (this.treeviewAccessibility);
-			this.table1.Add (this.GtkScrolledWindow1);
-			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow1]));
-			w8.TopAttach = ((uint)(3));
-			w8.BottomAttach = ((uint)(4));
-			w8.XPadding = ((uint)(6));
-			w8.YPadding = ((uint)(6));
-			// Container child table1.Gtk.Table+TableChild
-			this.label5 = new global::Gtk.Label ();
-			this.label5.Name = "label5";
-			this.label5.Xalign = 0F;
-			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("_Affected entities:");
-			this.label5.UseUnderline = true;
-			this.table1.Add (this.label5);
-			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5]));
-			w9.XOptions = ((global::Gtk.AttachOptions)(4));
-			w9.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.label6 = new global::Gtk.Label ();
-			this.label6.Name = "label6";
-			this.label6.Xalign = 0F;
-			this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("_Accessibility:");
-			this.label6.UseUnderline = true;
-			this.table1.Add (this.label6);
-			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.label6]));
-			w10.TopAttach = ((uint)(2));
-			w10.BottomAttach = ((uint)(3));
-			w10.XOptions = ((global::Gtk.AttachOptions)(4));
-			w10.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table1.Gtk.Table+TableChild
-			this.table2 = new global::Gtk.Table (((uint)(5)), ((uint)(2)), false);
-			this.table2.Name = "table2";
-			this.table2.RowSpacing = ((uint)(6));
-			this.table2.ColumnSpacing = ((uint)(6));
-			// Container child table2.Gtk.Table+TableChild
-			this.entryPrefix = new global::Gtk.Entry ();
-			this.entryPrefix.CanFocus = true;
-			this.entryPrefix.Name = "entryPrefix";
-			this.entryPrefix.IsEditable = true;
-			this.entryPrefix.InvisibleChar = '●';
-			this.table2.Add (this.entryPrefix);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryPrefix]));
-			w11.TopAttach = ((uint)(1));
-			w11.BottomAttach = ((uint)(2));
-			w11.LeftAttach = ((uint)(1));
-			w11.RightAttach = ((uint)(2));
-			w11.XOptions = ((global::Gtk.AttachOptions)(4));
-			w11.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.entryPrefixAllowed = new global::Gtk.Entry ();
-			this.entryPrefixAllowed.CanFocus = true;
-			this.entryPrefixAllowed.Name = "entryPrefixAllowed";
-			this.entryPrefixAllowed.IsEditable = true;
-			this.entryPrefixAllowed.InvisibleChar = '●';
-			this.table2.Add (this.entryPrefixAllowed);
-			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryPrefixAllowed]));
-			w12.TopAttach = ((uint)(2));
-			w12.BottomAttach = ((uint)(3));
-			w12.LeftAttach = ((uint)(1));
-			w12.RightAttach = ((uint)(2));
-			w12.XOptions = ((global::Gtk.AttachOptions)(4));
-			w12.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.entrySuffix = new global::Gtk.Entry ();
-			this.entrySuffix.CanFocus = true;
-			this.entrySuffix.Name = "entrySuffix";
-			this.entrySuffix.IsEditable = true;
-			this.entrySuffix.InvisibleChar = '●';
-			this.table2.Add (this.entrySuffix);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table2 [this.entrySuffix]));
-			w13.TopAttach = ((uint)(3));
-			w13.BottomAttach = ((uint)(4));
-			w13.LeftAttach = ((uint)(1));
-			w13.RightAttach = ((uint)(2));
-			w13.XOptions = ((global::Gtk.AttachOptions)(4));
-			w13.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.Xalign = 1F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Prefix:");
-			this.table2.Add (this.label1);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table2 [this.label1]));
-			w14.TopAttach = ((uint)(1));
-			w14.BottomAttach = ((uint)(2));
-			w14.XOptions = ((global::Gtk.AttachOptions)(4));
-			w14.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.Xalign = 1F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Style:");
-			this.table2.Add (this.label2);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table2 [this.label2]));
-			w15.XOptions = ((global::Gtk.AttachOptions)(4));
-			w15.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.Xalign = 1F;
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Suffix:");
-			this.table2.Add (this.label3);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table2 [this.label3]));
-			w16.TopAttach = ((uint)(3));
-			w16.BottomAttach = ((uint)(4));
-			w16.XOptions = ((global::Gtk.AttachOptions)(4));
-			w16.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.label8 = new global::Gtk.Label ();
-			this.label8.Name = "label8";
-			this.label8.Xalign = 1F;
-			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Optional Prefixes:");
-			this.table2.Add (this.label8);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table2 [this.label8]));
-			w17.TopAttach = ((uint)(2));
-			w17.BottomAttach = ((uint)(3));
-			w17.XOptions = ((global::Gtk.AttachOptions)(4));
-			w17.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.styleComboBox = global::Gtk.ComboBox.NewText ();
-			this.styleComboBox.Name = "styleComboBox";
-			this.table2.Add (this.styleComboBox);
-			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table2 [this.styleComboBox]));
-			w18.LeftAttach = ((uint)(1));
-			w18.RightAttach = ((uint)(2));
-			w18.XOptions = ((global::Gtk.AttachOptions)(4));
-			w18.YOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.vbox1 = new global::Gtk.VBox ();
-			this.vbox1.Name = "vbox1";
-			this.vbox1.Spacing = 6;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.checkbuttonStatic = new global::Gtk.CheckButton ();
-			this.checkbuttonStatic.CanFocus = true;
-			this.checkbuttonStatic.Name = "checkbuttonStatic";
-			this.checkbuttonStatic.Label = global::Mono.Unix.Catalog.GetString ("_Static member and types");
-			this.checkbuttonStatic.Active = true;
-			this.checkbuttonStatic.DrawIndicator = true;
-			this.checkbuttonStatic.UseUnderline = true;
-			this.vbox1.Add (this.checkbuttonStatic);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.checkbuttonStatic]));
-			w19.Position = 0;
-			w19.Expand = false;
-			w19.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.checkbuttonInstanceMembers = new global::Gtk.CheckButton ();
-			this.checkbuttonInstanceMembers.CanFocus = true;
-			this.checkbuttonInstanceMembers.Name = "checkbuttonInstanceMembers";
-			this.checkbuttonInstanceMembers.Label = global::Mono.Unix.Catalog.GetString ("_Instance members and locals");
-			this.checkbuttonInstanceMembers.Active = true;
-			this.checkbuttonInstanceMembers.DrawIndicator = true;
-			this.checkbuttonInstanceMembers.UseUnderline = true;
-			this.vbox1.Add (this.checkbuttonInstanceMembers);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.checkbuttonInstanceMembers]));
-			w20.Position = 1;
-			w20.Expand = false;
-			w20.Fill = false;
-			this.table2.Add (this.vbox1);
-			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2 [this.vbox1]));
-			w21.TopAttach = ((uint)(4));
-			w21.BottomAttach = ((uint)(5));
-			w21.LeftAttach = ((uint)(1));
-			w21.RightAttach = ((uint)(2));
-			w21.XOptions = ((global::Gtk.AttachOptions)(4));
-			// Container child table2.Gtk.Table+TableChild
-			this.vbox5 = new global::Gtk.VBox ();
-			this.vbox5.Name = "vbox5";
-			this.vbox5.Spacing = 6;
-			// Container child vbox5.Gtk.Box+BoxChild
-			this.label9 = new global::Gtk.Label ();
-			this.label9.Name = "label9";
-			this.label9.Xalign = 0F;
-			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Static/Non Static");
-			this.vbox5.Add (this.label9);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.label9]));
-			w22.Position = 0;
-			w22.Expand = false;
-			w22.Fill = false;
-			this.table2.Add (this.vbox5);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2 [this.vbox5]));
-			w23.TopAttach = ((uint)(4));
-			w23.BottomAttach = ((uint)(5));
-			w23.XOptions = ((global::Gtk.AttachOptions)(4));
-			this.table1.Add (this.table2);
-			global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table1 [this.table2]));
-			w24.TopAttach = ((uint)(2));
-			w24.BottomAttach = ((uint)(4));
-			w24.LeftAttach = ((uint)(1));
-			w24.RightAttach = ((uint)(2));
-			w24.XOptions = ((global::Gtk.AttachOptions)(4));
-			w24.YOptions = ((global::Gtk.AttachOptions)(0));
-			this.hbox1.Add (this.table1);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.table1]));
-			w25.Position = 0;
-			this.vbox3.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox1]));
-			w26.Position = 1;
-			w1.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox3]));
-			w27.Position = 0;
-			w27.Padding = ((uint)(6));
-			// Internal child MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.ActionArea
-			global::Gtk.HButtonBox w28 = this.ActionArea;
-			w28.Name = "dialog1_ActionArea";
-			w28.Spacing = 10;
-			w28.BorderWidth = ((uint)(5));
-			w28.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
-			this.buttonCancel.CanDefault = true;
-			this.buttonCancel.CanFocus = true;
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.UseStock = true;
-			this.buttonCancel.UseUnderline = true;
-			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w29 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w28 [this.buttonCancel]));
-			w29.Expand = false;
-			w29.Fill = false;
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w30 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w28 [this.buttonOk]));
-			w30.Position = 1;
-			w30.Expand = false;
-			w30.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.DefaultWidth = 804;
-			this.DefaultHeight = 508;
-			this.Show ();
-		}
-	}
-}
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget.cs
deleted file mode 100644
index c508c70e70..0000000000
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.CSharp.Refactoring.CodeIssues
-{
-	public partial class NameConventionPanelWidget
-	{
-		private global::Gtk.HBox hbox3;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow;
-		private global::Gtk.TreeView treeviewConventions;
-		private global::Gtk.VBox vbox3;
-		private global::Gtk.Button buttonEdit;
-		private global::Gtk.Button buttonAdd;
-		private global::Gtk.Button buttonRemove;
-
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget";
-			// Container child MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget.Gtk.Container+ContainerChild
-			this.hbox3 = new global::Gtk.HBox ();
-			this.hbox3.Name = "hbox3";
-			this.hbox3.Spacing = 6;
-			// Container child hbox3.Gtk.Box+BoxChild
-			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
-			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-			this.treeviewConventions = new global::Gtk.TreeView ();
-			this.treeviewConventions.CanFocus = true;
-			this.treeviewConventions.Name = "treeviewConventions";
-			this.GtkScrolledWindow.Add (this.treeviewConventions);
-			this.hbox3.Add (this.GtkScrolledWindow);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.GtkScrolledWindow]));
-			w2.Position = 0;
-			// Container child hbox3.Gtk.Box+BoxChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.buttonEdit = new global::Gtk.Button ();
-			this.buttonEdit.CanFocus = true;
-			this.buttonEdit.Name = "buttonEdit";
-			this.buttonEdit.UseStock = true;
-			this.buttonEdit.UseUnderline = true;
-			this.buttonEdit.Label = "gtk-edit";
-			this.vbox3.Add (this.buttonEdit);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.buttonEdit]));
-			w3.Position = 0;
-			w3.Expand = false;
-			w3.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.buttonAdd = new global::Gtk.Button ();
-			this.buttonAdd.CanFocus = true;
-			this.buttonAdd.Name = "buttonAdd";
-			this.buttonAdd.UseStock = true;
-			this.buttonAdd.UseUnderline = true;
-			this.buttonAdd.Label = "gtk-add";
-			this.vbox3.Add (this.buttonAdd);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.buttonAdd]));
-			w4.Position = 1;
-			w4.Expand = false;
-			w4.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.buttonRemove = new global::Gtk.Button ();
-			this.buttonRemove.CanFocus = true;
-			this.buttonRemove.Name = "buttonRemove";
-			this.buttonRemove.UseStock = true;
-			this.buttonRemove.UseUnderline = true;
-			this.buttonRemove.Label = "gtk-remove";
-			this.vbox3.Add (this.buttonRemove);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.buttonRemove]));
-			w5.Position = 2;
-			w5.Expand = false;
-			w5.Fill = false;
-			this.hbox3.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.vbox3]));
-			w6.Position = 1;
-			w6.Expand = false;
-			w6.Fill = false;
-			this.Add (this.hbox3);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Hide ();
-		}
-	}
-}
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs
index 8654054487..47844e948e 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs
@@ -2,12 +2,16 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.CodeGeneration
 {
-	public partial class GenerateCodeWindow
+	partial class GenerateCodeWindow
 	{
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow1;
+		
 		private global::Gtk.Label labelDescription;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow2;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/CSharpBinding/gtk-gui/generated.cs b/main/src/addins/CSharpBinding/gtk-gui/generated.cs
index 3285e87c05..a89ced9baf 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/generated.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/generated.cs
@@ -1,3 +1,4 @@
+#pragma warning disable 436
 
 // This file has been generated by the GUI designer. Do not modify.
 namespace Stetic
@@ -6,9 +7,10 @@ namespace Stetic
 	{
 		private static bool initialized;
 
-		internal static void Initialize (Gtk.Widget iconRenderer)
+		internal static void Initialize(Gtk.Widget iconRenderer)
 		{
-			if ((Stetic.Gui.initialized == false)) {
+			if ((Stetic.Gui.initialized == false))
+			{
 				Stetic.Gui.initialized = true;
 			}
 		}
diff --git a/main/src/addins/CSharpBinding/gtk-gui/gui.stetic b/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
index ea86d2e379..ad4c8e592a 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
+++ b/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
@@ -6,9 +6,7 @@
   </configuration>
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
-    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" />
     <widget-library name="../../../../build/AddIns/NUnit/MonoDevelop.NUnit.dll" />
     <widget-library name="../../../../build/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll" internal="true" />
@@ -514,6 +512,7 @@ None</property>
   </widget>
   <widget class="Gtk.Bin" id="MonoDevelop.CSharp.Project.CompilerOptionsPanelWidget" design-size="471 438">
     <property name="MemberName" />
+    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.VBox" id="vbox1">
         <property name="MemberName" />
@@ -1196,7 +1195,7 @@ None</property>
                         <child>
                           <widget class="Gtk.Label" id="label8">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page1</property>
+                            <property name="LabelProp" translatable="yes">Indentation</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
@@ -1207,7 +1206,7 @@ None</property>
                             <property name="MemberName" />
                             <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.TreeView" id="treeviewBracePositions">
+                              <widget class="Gtk.TreeView" id="treeviewNewLines">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
                                 <property name="ShowScrollbars">True</property>
@@ -1221,525 +1220,18 @@ None</property>
                         <child>
                           <widget class="Gtk.Label" id="label9">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page2</property>
+                            <property name="LabelProp" translatable="yes">NewLines</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="Gtk.Table" id="table4">
-                            <property name="MemberName" />
-                            <property name="NRows">12</property>
-                            <property name="NColumns">3</property>
-                            <property name="RowSpacing">6</property>
-                            <property name="ColumnSpacing">6</property>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <placeholder />
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryAfterUsings">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">2</property>
-                                <property name="BottomAttach">3</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">Shrink</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">True</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryAroundRegion">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">10</property>
-                                <property name="BottomAttach">11</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBeforeFirstDeclaration">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">4</property>
-                                <property name="BottomAttach">5</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBeforUsings">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">1</property>
-                                <property name="BottomAttach">2</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">Shrink</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">True</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBetweenEvents">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">8</property>
-                                <property name="BottomAttach">9</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBetweenFields">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">7</property>
-                                <property name="BottomAttach">8</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBetweenMembers">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">9</property>
-                                <property name="BottomAttach">10</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryBetweenTypes">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">5</property>
-                                <property name="BottomAttach">6</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Entry" id="entryInsideRegion">
-                                <property name="MemberName" />
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">True</property>
-                                <property name="WidthChars">5</property>
-                                <property name="InvisibleChar">●</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">11</property>
-                                <property name="BottomAttach">12</property>
-                                <property name="LeftAttach">1</property>
-                                <property name="RightAttach">2</property>
-                                <property name="AutoSize">False</property>
-                                <property name="XOptions">0</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">False</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="GtkLabel8">
-                                <property name="MemberName" />
-                                <property name="Xalign">0</property>
-                                <property name="LabelProp" translatable="yes">&lt;b&gt;Minimum blank lines in namespaces&lt;/b&gt;</property>
-                                <property name="UseMarkup">True</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">3</property>
-                                <property name="BottomAttach">4</property>
-                                <property name="RightAttach">3</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="GtkLabel9">
-                                <property name="MemberName" />
-                                <property name="Xalign">0</property>
-                                <property name="LabelProp" translatable="yes">&lt;b&gt;Minimum blank lines in types&lt;/b&gt;</property>
-                                <property name="UseMarkup">True</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">6</property>
-                                <property name="BottomAttach">7</property>
-                                <property name="RightAttach">3</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label1">
-                                <property name="MemberName" />
-                                <property name="Xalign">0</property>
-                                <property name="LabelProp" translatable="yes">&lt;b&gt;Minimum blank lines in compilation unit&lt;/b&gt;</property>
-                                <property name="UseMarkup">True</property>
-                              </widget>
-                              <packing>
-                                <property name="RightAttach">3</property>
-                                <property name="AutoSize">False</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">True</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label15">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Before using declaration:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">1</property>
-                                <property name="BottomAttach">2</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label16">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">After using declaration:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">2</property>
-                                <property name="BottomAttach">3</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label19">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Between type declarations:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">5</property>
-                                <property name="BottomAttach">6</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label20">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Before first declaration:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">4</property>
-                                <property name="BottomAttach">5</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label21">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Between field declarations:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">7</property>
-                                <property name="BottomAttach">8</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label22">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Between other member declarations:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">9</property>
-                                <property name="BottomAttach">10</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label23">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Between simple event declarations:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">8</property>
-                                <property name="BottomAttach">9</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label24">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Around region:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">10</property>
-                                <property name="BottomAttach">11</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="Gtk.Label" id="label25">
-                                <property name="MemberName" />
-                                <property name="Xalign">1</property>
-                                <property name="LabelProp" translatable="yes">Inside region:</property>
-                              </widget>
-                              <packing>
-                                <property name="TopAttach">11</property>
-                                <property name="BottomAttach">12</property>
-                                <property name="AutoSize">True</property>
-                                <property name="XOptions">Fill</property>
-                                <property name="YOptions">Fill</property>
-                                <property name="XExpand">False</property>
-                                <property name="XFill">True</property>
-                                <property name="XShrink">False</property>
-                                <property name="YExpand">False</property>
-                                <property name="YFill">True</property>
-                                <property name="YShrink">False</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="Position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Label" id="label14">
-                            <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page5</property>
-                          </widget>
-                          <packing>
-                            <property name="type">tab</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow3">
+                          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow5">
                             <property name="MemberName" />
                             <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.TreeView" id="treeviewWrappingCategory">
+                              <widget class="Gtk.TreeView" id="treeviewSpacing">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
                                 <property name="ShowScrollbars">True</property>
@@ -1747,13 +1239,13 @@ None</property>
                             </child>
                           </widget>
                           <packing>
-                            <property name="Position">3</property>
+                            <property name="Position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="Gtk.Label" id="label2">
+                          <widget class="Gtk.Label" id="label14">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page6</property>
+                            <property name="LabelProp" translatable="yes">Spacing</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
@@ -1764,7 +1256,7 @@ None</property>
                             <property name="MemberName" />
                             <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.TreeView" id="treeviewInsertWhiteSpaceCategory">
+                              <widget class="Gtk.TreeView" id="treeviewWrapping">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
                                 <property name="ShowScrollbars">True</property>
@@ -1772,24 +1264,24 @@ None</property>
                             </child>
                           </widget>
                           <packing>
-                            <property name="Position">4</property>
+                            <property name="Position">3</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="Gtk.Label" id="label10">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page3</property>
+                            <property name="LabelProp" translatable="yes">Wrapping</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow4">
+                          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow3">
                             <property name="MemberName" />
                             <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.TreeView" id="treeviewNewLines">
+                              <widget class="Gtk.TreeView" id="treeviewStyle">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
                                 <property name="ShowScrollbars">True</property>
@@ -1797,13 +1289,13 @@ None</property>
                             </child>
                           </widget>
                           <packing>
-                            <property name="Position">5</property>
+                            <property name="Position">4</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="Gtk.Label" id="label11">
+                          <widget class="Gtk.Label" id="label2">
                             <property name="MemberName" />
-                            <property name="LabelProp" translatable="yes">page4</property>
+                            <property name="LabelProp" translatable="yes">Style</property>
                           </widget>
                           <packing>
                             <property name="type">tab</property>
@@ -1916,9 +1408,10 @@ None</property>
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionPanelWidget" design-size="300 300">
+  <widget class="Gtk.Bin" id="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionPanelWidget" design-size="300 300">
     <property name="MemberName" />
     <property name="Visible">False</property>
+    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.HBox" id="hbox3">
         <property name="MemberName" />
@@ -2085,7 +1578,7 @@ None</property>
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog" design-size="804 508">
+  <widget class="Gtk.Dialog" id="MonoDevelop.CSharp.Diagnostics.InconsistentNaming.NameConventionEditRuleDialog" design-size="804 508">
     <property name="MemberName" />
     <property name="WidthRequest">640</property>
     <property name="HeightRequest">480</property>
@@ -2609,4 +2102,190 @@ None</property>
       </widget>
     </child>
   </widget>
+  <widget class="Gtk.Dialog" id="MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog" design-size="424 367">
+    <property name="MemberName" />
+    <property name="Visible">False</property>
+    <property name="GeneratePublic">False</property>
+    <property name="Title" translatable="yes">Document Outline Preferences</property>
+    <property name="WindowPosition">CenterOnParent</property>
+    <property name="Modal">True</property>
+    <property name="DestroyWithParent">True</property>
+    <property name="Buttons">2</property>
+    <property name="HelpButton">False</property>
+    <child internal-child="VBox">
+      <widget class="Gtk.VBox" id="dialog1_VBox">
+        <property name="MemberName" />
+        <property name="BorderWidth">2</property>
+        <child>
+          <widget class="Gtk.VBox" id="vbox2">
+            <property name="MemberName" />
+            <property name="Spacing">6</property>
+            <property name="BorderWidth">6</property>
+            <child>
+              <widget class="Gtk.Label" id="label">
+                <property name="MemberName" />
+                <property name="WidthRequest">400</property>
+                <property name="LabelProp" translatable="yes">Group sorting order when grouping is enabled:</property>
+                <property name="Wrap">True</property>
+              </widget>
+              <packing>
+                <property name="Position">0</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="MonoDevelop.Ide.Gui.Components.PriorityList" id="priorityList">
+                <property name="MemberName" />
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+                <property name="AutoSize">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+    <child internal-child="ActionArea">
+      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
+        <property name="MemberName" />
+        <property name="Spacing">10</property>
+        <property name="BorderWidth">5</property>
+        <property name="Size">2</property>
+        <property name="LayoutStyle">End</property>
+        <child>
+          <widget class="Gtk.Button" id="buttonCancel">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="UseStock">True</property>
+            <property name="Type">StockItem</property>
+            <property name="StockId">gtk-cancel</property>
+            <property name="ResponseId">-6</property>
+            <property name="label">gtk-cancel</property>
+          </widget>
+          <packing>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Button" id="buttonOk">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="UseStock">True</property>
+            <property name="Type">StockItem</property>
+            <property name="StockId">gtk-ok</property>
+            <property name="ResponseId">-5</property>
+            <property name="label">gtk-ok</property>
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="Gtk.Dialog" id="MonoDevelop.CSharp.ClassOutline.OutlineSortingPreferencesDialog" design-size="424 367">
+    <property name="MemberName" />
+    <property name="Visible">False</property>
+    <property name="GeneratePublic">False</property>
+    <property name="Title" translatable="yes">Document Outline Preferences</property>
+    <property name="WindowPosition">CenterOnParent</property>
+    <property name="Modal">True</property>
+    <property name="DestroyWithParent">True</property>
+    <property name="Buttons">2</property>
+    <property name="HelpButton">False</property>
+    <child internal-child="VBox">
+      <widget class="Gtk.VBox" id="dialog1_VBox">
+        <property name="MemberName" />
+        <property name="BorderWidth">2</property>
+        <child>
+          <widget class="Gtk.VBox" id="vbox2">
+            <property name="MemberName" />
+            <property name="Spacing">6</property>
+            <property name="BorderWidth">6</property>
+            <child>
+              <widget class="Gtk.Label" id="label">
+                <property name="MemberName" />
+                <property name="WidthRequest">400</property>
+                <property name="LabelProp" translatable="yes">Group sorting order when grouping is enabled:</property>
+                <property name="Wrap">True</property>
+              </widget>
+              <packing>
+                <property name="Position">0</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="MonoDevelop.Ide.Gui.Components.PriorityList" id="priorityList">
+                <property name="MemberName" />
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+                <property name="AutoSize">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">0</property>
+            <property name="AutoSize">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+    <child internal-child="ActionArea">
+      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
+        <property name="MemberName" />
+        <property name="Spacing">10</property>
+        <property name="BorderWidth">5</property>
+        <property name="Size">2</property>
+        <property name="LayoutStyle">End</property>
+        <child>
+          <widget class="Gtk.Button" id="buttonCancel">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="UseStock">True</property>
+            <property name="Type">StockItem</property>
+            <property name="StockId">gtk-cancel</property>
+            <property name="ResponseId">-6</property>
+            <property name="label">gtk-cancel</property>
+          </widget>
+          <packing>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Button" id="buttonOk">
+            <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="CanFocus">True</property>
+            <property name="UseStock">True</property>
+            <property name="Type">StockItem</property>
+            <property name="StockId">gtk-ok</property>
+            <property name="ResponseId">-5</property>
+            <property name="label">gtk-ok</property>
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </stetic-interface>
\ No newline at end of file
diff --git a/main/src/addins/CSharpBinding/templates/AssemblyInfo.xft.xml b/main/src/addins/CSharpBinding/templates/AssemblyInfo.xft.xml
index 699f2f2e79..e63409d17b 100644
--- a/main/src/addins/CSharpBinding/templates/AssemblyInfo.xft.xml
+++ b/main/src/addins/CSharpBinding/templates/AssemblyInfo.xft.xml
@@ -8,7 +8,7 @@
 	<TemplateConfiguration>
 		<_Name>Assembly Information</_Name>
 		<_Category>Misc</_Category>
-		<Icon>md-file-source</Icon>
+		<Icon>md-file-information</Icon>
 		<LanguageName>C#</LanguageName>
 		<DefaultFilename IsFixed="True">AssemblyInfo.cs</DefaultFilename>
 		<_Description>A file defining assembly information attributes.</_Description>
diff --git a/main/src/addins/CSharpBinding/templates/PortableLibrary.xpt.xml b/main/src/addins/CSharpBinding/templates/PortableLibrary.xpt.xml
index f09a65c7f1..dd2b17ed3d 100644
--- a/main/src/addins/CSharpBinding/templates/PortableLibrary.xpt.xml
+++ b/main/src/addins/CSharpBinding/templates/PortableLibrary.xpt.xml
@@ -12,6 +12,7 @@
 		<LanguageName>C#</LanguageName>
 		<_Description>Creates a C# library that can be used in Windows, Mac, Silverlight, Windows Phone, Xamarin.iOS and Xamarin.Android.</_Description>
 		<DefaultFilename>PortableLibrary</DefaultFilename>
+		<GroupId>md-project-portable-library</GroupId>
 	</TemplateConfiguration>
 	
 	<!-- Actions -->
@@ -25,7 +26,7 @@
 			<StartupProject>${ProjectName}</StartupProject>
 		</Options>
 		
-		<Project name = "${ProjectName}" directory = "." type = "PortableDotNet">
+		<Project name = "${ProjectName}" directory = "." type="C#PortableLibrary">
 			<Options Target = "Library" TargetFrameworkVersion = ".NETPortable,Version=v4.5,Profile=Profile78"/>
 			<References>
 			</References>
diff --git a/main/src/addins/CSharpBinding/templates/SharedAssetsProject.xpt.xml b/main/src/addins/CSharpBinding/templates/SharedAssetsProject.xpt.xml
index 6f2f0a7584..1a9bdef4a5 100644
--- a/main/src/addins/CSharpBinding/templates/SharedAssetsProject.xpt.xml
+++ b/main/src/addins/CSharpBinding/templates/SharedAssetsProject.xpt.xml
@@ -11,6 +11,7 @@
 		<Image id="md-shared-project" />
 		<_Description>Creates a project that allows sharing files between projects</_Description>
 		<DefaultFilename>Shared</DefaultFilename>
+		<GroupId>md-project-shared-library</GroupId>
 		<LanguageName>C#</LanguageName>
 	</TemplateConfiguration>
 	
diff --git a/main/src/addins/ChangeLog b/main/src/addins/ChangeLog
deleted file mode 100644
index 2b4c0b8ec8..0000000000
--- a/main/src/addins/ChangeLog
+++ /dev/null
@@ -1,183 +0,0 @@
-2010-06-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am: Adding DocFood to the solution/build system.
-
-2010-06-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DocFood: Checked in doc food addin.
-
-2010-02-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Moved diff widget and algorithm to
-	  MonoDevelop.Components.
-
-2009-11-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am: Added hex editor display binding.
-
-2009-11-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.HexEditor: Added hex editor display binding.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Wire the soft debug addin into the build.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft: Moved soft debug addin from
-	  extras.
-
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* TextTemplating: Include the ASP.NET MVC and TextTemplating
-	  addins in the main solution and build.
-
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am, AspNetAddin, AspNet: Move ASP.NET into a 
-	  subdirectory and rename, in preparation for adding the MVC addin.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Fix build order.
-
-2009-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am: Fixed makefile.
-
-2009-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am: Corrected makefile.
-
-2009-07-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am: Moved refactoring support to an own assembly.
-
-2009-07-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring: Moved refactoring support to an own
-	  assembly.
-
-2009-06-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Fix build order. Version control now depends on
-	  the source editor.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* Mono.Texteditor:
-	* Mono.Texteditor/Styles:
-	* Mono.Texteditor/gtk-gui:
-	* Mono.Texteditor/ChangeLog:
-	* Mono.Texteditor/Makefile.am:
-	* Mono.Texteditor/SyntaxModes:
-	* Mono.Texteditor/AssemblyInfo.cs:
-	* Mono.Texteditor/Mono.TextEditor:
-	* Mono.Texteditor/gtk-gui/gui.stetic:
-	* Mono.Texteditor/Mono.TextEditor.Vi:
-	* Mono.Texteditor/Styles/C64Style.xml:
-	* Mono.Texteditor/gtk-gui/objects.xml:
-	* Mono.Texteditor/gtk-gui/generated.cs:
-	* Mono.Texteditor/Styles/BrownStyle.xml:
-	* Mono.Texteditor/Mono.TextEditor.csproj:
-	* Mono.Texteditor/ChangelogSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/Caret.cs:
-	* Mono.Texteditor/Styles/OblivionStyle.xml:
-	* Mono.Texteditor/Mono.TextEditor/Margin.cs:
-	* Mono.Texteditor/Styles/TangoLightStyle.xml:
-	* Mono.Texteditor/Mono.TextEditor/IBuffer.cs:
-	* Mono.Texteditor/Mono.TextEditor/Segment.cs:
-	* Mono.Texteditor/Mono.TextEditor/EditMode.cs:
-	* Mono.Texteditor/SyntaxModes/CSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/ISegment.cs:
-	* Mono.Texteditor/Mono.TextEditor/Document.cs:
-	* Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting:
-	* Mono.Texteditor/Styles/VisualStudioStyle.xml:
-	* Mono.Texteditor/Mono.TextEditor/GapBuffer.cs:
-	* Mono.Texteditor/Mono.TextEditor/TextEditor.cs:
-	* Mono.Texteditor/SyntaxModes/CPPSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/IconMargin.cs:
-	* Mono.Texteditor/Mono.TextEditor/TextMarker.cs:
-	* Mono.Texteditor/SyntaxModes/BooSyntaxMode.xml:
-	* Mono.Texteditor/SyntaxModes/XmlSyntaxMode.xml:
-	* Mono.Texteditor/SyntaxModes/DiffSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/FoldingType.cs:
-	* Mono.Texteditor/Mono.TextEditor/FoldSegment.cs:
-	* Mono.Texteditor/SyntaxModes/ValaSyntaxMode.xml:
-	* Mono.Texteditor/SyntaxModes/JavaSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/LineSegment.cs:
-	* Mono.Texteditor/Mono.TextEditor/RedBlackTree.cs:
-	* Mono.Texteditor/Mono.TextEditor/SearchResult.cs:
-	* Mono.Texteditor/Mono.TextEditor.Vi/ViActions.cs:
-	* Mono.Texteditor/SyntaxModes/VBNetSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/GutterMargin.cs:
-	* Mono.Texteditor/Mono.TextEditor/LineSplitter.cs:
-	* Mono.Texteditor/Mono.TextEditor/HelperMethods.cs:
-	* Mono.Texteditor/SyntaxModes/PythonSyntaxMode.xml:
-	* Mono.Texteditor/SyntaxModes/CSharpSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/LinkEventArgs.cs:
-	* Mono.Texteditor/Mono.TextEditor/DeleteActions.cs:
-	* Mono.Texteditor/Mono.TextEditor/LineEventArgs.cs:
-	* Mono.Texteditor/Mono.TextEditor/SearchRequest.cs:
-	* Mono.Texteditor/Mono.TextEditor/ISearchEngine.cs:
-	* Mono.Texteditor/SyntaxModes/AspNetSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/TextEditorData.cs:
-	* Mono.Texteditor/Mono.TextEditor/SimpleEditMode.cs:
-	* Mono.Texteditor/Mono.TextEditor/BookmarkMarker.cs:
-	* Mono.Texteditor/Mono.TextEditor/TextViewMargin.cs:
-	* Mono.Texteditor/Mono.TextEditor/LineSegmentTree.cs:
-	* Mono.Texteditor/Mono.TextEditor.Vi/ViActionMaps.cs:
-	* Mono.Texteditor/SyntaxModes/MakefileSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/BookmarkActions.cs:
-	* Mono.Texteditor/Mono.TextEditor/ReplaceEventArgs.cs:
-	* Mono.Texteditor/SyntaxModes/ChangeLogSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/ITooltipProvider.cs:
-	* Mono.Texteditor/Mono.TextEditor/DocumentLocation.cs:
-	* Mono.Texteditor/Mono.TextEditor/CaretMoveActions.cs:
-	* Mono.Texteditor/Mono.TextEditor/FoldMarkerMargin.cs:
-	* Mono.Texteditor/Mono.TextEditor/ClipboardActions.cs:
-	* Mono.Texteditor/Mono.TextEditor/SelectionActions.cs:
-	* Mono.Texteditor/SyntaxModes/JavascriptSyntaxMode.xml:
-	* Mono.Texteditor/Mono.TextEditor/IWordFindStrategy.cs:
-	* Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/Rule.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/Span.cs:
-	* Mono.Texteditor/Mono.TextEditor/DefaultEditActions.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/Style.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/Match.cs:
-	* Mono.Texteditor/Mono.TextEditor/BufferedTextReader.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/Chunk.cs:
-	* Mono.Texteditor/Mono.TextEditor/ITextEditorOptions.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/Marker.cs:
-	* Mono.Texteditor/Mono.TextEditor/EmacsWordFindStrategy.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/Keywords.cs:
-	* Mono.Texteditor/Mono.TextEditor/DocumentUpdateRequest.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/ChunkStyle.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs:
-	* Mono.Texteditor/Mono.TextEditor/CodeSegmentPreviewWindow.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/IXmlProvider.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/WorkerThread.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/DefaultStyle.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/SemanticRule.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/XmlReadHelper.cs:
-	* Mono.Texteditor/Mono.TextEditor/SharpDevelopWordFindStrategy.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/MarkupSyntaxMode.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs:
-	* Mono.Texteditor/Mono.TextEditor.Highlighting/ReferencedChunkStyle.cs:
-	  Moved text editor to core
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Addins.mds: Migrated to MSBuild file format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MacPlatform/AssemblyInfo.cs:
-	* WindowsPlatform/AssemblyInfo.cs:
-	* MacPlatform/MacPlatform.addin.xml:
-	* WindowsPlatform/WindowsPlatform.addin.xml: Bump MD version.
-
diff --git a/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs b/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
index 9b96e905d6..46985bc20e 100644
--- a/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
+++ b/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
@@ -35,7 +35,7 @@ using MonoDevelop.Ide.Fonts;
 
 namespace MonoDevelop.ChangeLogAddIn
 {
-	partial class AddLogEntryDialog : Dialog
+	partial class AddLogEntryDialog : Gtk.Dialog
 	{
 		readonly ListStore store;
 		readonly Dictionary<ChangeLogEntry, string> changes = new Dictionary<ChangeLogEntry, string> ();
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLog b/main/src/addins/ChangeLogAddIn/ChangeLog
deleted file mode 100644
index 3e7009bade..0000000000
--- a/main/src/addins/ChangeLogAddIn/ChangeLog
+++ /dev/null
@@ -1,665 +0,0 @@
-2010-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ChangeLogAddIn.cs:
-	* ProjectOptionPanelWidget.cs:
-	* CommitDialogExtensionWidget.cs: Track api changes.
-
-2010-07-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CommitDialogExtensionWidget.cs: Track api changes.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CommitDialogExtensionWidget.cs: Clean up dialog placement.
-
-2010-05-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Policies.xml: Added attribute to explicitly allow
-	  differential serialization for a policy (which is disabled
-	  by default).
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ChangeLogAddIn.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* ChangeLogAddIn.cs:
-	* gtk-gui/gui.stetic:
-	* ChangeLogService.cs:
-	* AddLogEntryDialog.cs:
-	* ChangeLogAddIn.csproj:
-	* ProjectOptionPanel.cs:
-	* ChangeLogAddIn.addin.xml:
-	* ProjectOptionPanelWidget.cs:
-	* CommitDialogExtensionWidget.cs: Merged MD.Projects into
-	  MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components
-	  into MD.Ide.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AddLogEntryDialog.cs: Track api changes.
-
-2010-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* AddLogEntryDialog.cs: Track API changes for lazy loading
-	  images.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs:
-	  Flush.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ChangeLogAddIn.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* ChangeLogAddIn.csproj:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs:
-	  Flush.
-
-2009-10-13  Ankit Jain  <jankit@novell.com>
-
-	* ChangeLogAddIn.csproj: Import md.targets .
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ChangeLogAddIn.addin.xml: Update license.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ChangeLogAddIn.addin.xml: Bump MD version.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ChangeLogAddIn.csproj: Updated dependencies. We now depend
-	  on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CommitDialogExtensionWidget.cs: Ellipsize path names. Fixes
-	  bug #532661 - Changelog names in commit dialog should wrap.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs:
-	  Flush.
-
-2009-06-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* OldChangeLogData.cs: Track api changes.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AddLogEntryDialog.cs: Use the new DesktopService instead of
-	  PlatformService.
-
-2009-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* OldChangeLogData.cs: Track api changes.
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* AssemblyInfo.cs: Changed assembly info.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* AddLogEntryDialog.cs: Renamed PixbufService to ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* AddLogEntryDialog.cs: Track API changes.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* ChangeLogAddIn.csproj: don't require specific gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ChangeLogAddIn.addin.xml: Bump MD version.
-
-2009-03-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* OldChangeLogData.cs: Don't set value for commit message
-	  style. Fix whether solution already has a policy. Fixes "Bug
-	  486756 - Regression in changelog addin".
-
-2009-03-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* OldChangeLogData.cs:
-	* ChangeLogService.cs:
-	* ProjectOptionPanel.cs:
-	* ChangeLogAddIn.csproj:
-	* ChangeLogAddIn.addin.xml: Migrate MD1 changelog settings to
-	  the policy system. Fixes "Bug 471285 - Project ChangeLog
-	  settings lost".
-
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs:
-	  Flush.
-
-2009-03-13  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs:
-	  Making some strings not translatable.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ChangeLogService.cs: Rename 'dir', as csc doesn't like
-	  multiple locals with the same name in a switch.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ChangeLogAddIn.mds:
-	* ChangeLogAddIn.mdp:
-	* ChangeLogAddIn.csproj: Migrated to MSBuild file format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ChangeLogAddIn.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ChangeLogService.cs: Fix nullref.
-
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs:
-	  Flush.
-
-2009-02-02    <>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs: Fix
-	typo.
-
-2009-02-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ChangeLogPolicy.cs: Change default date formatting from
-	  yy/MM/dd to yyyy-MM-dd.
-
-2009-02-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Policies.xml: Use - instead of / in Mono date format.
-
-	* CommitDialogExtensionWidget.cs: Appned 2 newlines to
-	  ChangeLog message.
-	
-	Fixes Bug 471286 - "ChangeLog integration now uses wrong 
-    date format and messed up my ChangeLog".
-
-2009-01-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ChangeLogAddIn.addin.xml: Register policy panel as a default policy
-	panel.
-
-2009-01-29  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Policies.xml:
-	* ChangeLogAddIn.cs:
-	* ChangeLogPolicy.cs:
-	* ProjectOptionPanelWidget.cs:
-	* CommitDialogExtensionWidget.cs: Rename UserInformation to
-	AuthorInformation, and change other strings correspondingly.
-
-2009-01-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Policies.xml:
-	* gtk-gui/gui.stetic:
-	* ChangeLogPolicy.cs:
-	* ChangeLogAddIn.mdp:
-	* ChangeLogService.cs:
-	* ChangeLogAddIn.addin.xml:
-	* ProjectOptionPanelWidget.cs:
-	* CommitDialogExtensionWidget.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs: Added
-	message style to changelog policy
-
-2009-01-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ChangeLogService.cs:
-	* CommitDialogExtensionWidget.cs: Implement support for per-project
-	policies VcsIntegration.RequireEntry/Enabled/None.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ChangeLogAddIn.mdp: Flush project format changes.
-
-2009-01-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* ChangeLogAddIn.mdp:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ChangeLogAddInOptionPanelWidget.cs:
-	Removed unused panel widget.
-
-2009-01-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* ChangeLogPolicy.cs:
-	* ChangeLogService.cs:
-	* ProjectOptionPanel.cs:
-	* ProjectOptionPanelWidget.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs: Move
-	ChangeLog integration options to the policies storage.
-
-	* ChangeLogData.cs:
-	* ChangeLogAddInOptionsPanel.cs:
-	* ChangeLogAddInOptionPanelWidget.cs: Unused; remove.
-
-	* ChangeLogAddIn.cs: Use UserInformation API. Fix error on insertion of
-	entries into new/empty ChangeLogs.  Fix spaces->tabs formatting.
-
-	* ChangeLogAddIn.addin.xml: Remove old data types and panels, and
-	register ChangeLogPolicy type as a policy.
-
-	* Makefile.am:
-	* ChangeLogAddIn.mdp: Updated.
-
-	* CommitDialogExtensionWidget.cs: Use UserInformation API.
-
-2009-01-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CommitDialogExtensionWidget.cs: Show a warning if there are some files
-	without a comment.
-
-2009-01-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ChangeLogAddIn.cs:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* CommitDialogExtensionWidget.cs:
-	* ChangeLogAddInOptionPanelWidget.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs:
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ChangeLogAddInOptionPanelWidget.cs:
-	Fix bug #440957 - Version Control/Changelog addin no longer gives
-	warning when name is not set.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ChangeLogAddIn.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ChangeLogAddIn.mdp: Don't require a specific version of Mono.Addins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build dependencies.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ChangeLogAddIn.addin.xml: Bump MD version.
-
-2008-10-07  Aaron Bockover  <abockover@novell.com>
-
-	* CommitDialogExtensionWidget.cs: Updated to use ChangeLogMessageStyle
-	  instead of the WriteHeader bool
-
-2008-10-07  Aaron Bockover  <abockover@novell.com>
-
-	* ChangeLogAddIn.cs:
-	* CommitDialogExtensionWidget.cs: Make the addin use the new
-	  ChangeLogWriter
-
-	* AddLogEntryDialog.cs: Make tabs 4 characters wide instead of the
-	  default 8; use the default monospace font as provided by
-	  PlatformService; set some other properties; make the widget at least
-	  80 characters wide for better preview/editing of ChangeLogs by hand
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.ChangeLogAddInOptionPanelWidget.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs: Updated
-	  generated code.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogData.cs: Moved serialization engine to MonoDevelop.Core. Use
-	  new syntax for specifying attribute scope.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Bump MD version.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Show the options dialog only for solution
-	  items and solutions.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Merged the extension points for project and
-	  solution option panels into a single extension point. A single
-	  extension point will now be used for all kinds of items. Extension
-	  conditions can be used to make panels visible only for some
-	  specific item types.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ProjectOptionPanel.cs, ChangeLogData.cs, ProjectOptionPanelWidget.cs,
-	  ChangeLogAddIn.addin.xml, ChangeLogAddIn.mdp, gtk-gui/gui.stetic,
-	  Makefile.am, ChangeLogService.cs: New project model changes.
-
-2008-03-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddInOptionsPanel.cs, ChangeLogAddIn.addin.xml,
-	  ChangeLogAddInOptionPanelWidget.cs: Use new options dialog
-	  infrastructure.
-	* CommitDialogExtensionWidget.cs: Reduce width of comments, so it fits
-	  in 80 cols with tabsize 8.
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Update MD version.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Updated add-in category and description.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* ChangeLogAddInOptionPanelWidget.cs: Make strings translatable.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.mdp: Updated project files. The order of extended
-	  properties won't change anymore.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.ChangeLogAddInOptionPanelWidget.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs: Regenerated
-	  gui.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.mdp, Makefile.am: Directory reorganization.
-
-2007-11-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.cs: If no file is open but one is selected in the tree, use
-	  it as reference file for the new entry. Fixes bug #339272.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* ChangeLogService.cs, CommitDialogExtensionWidget.cs: Track LoggingService
-	  API changes.
-
-2007-10-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogService.cs: Fix ChangeLog location problem in
-	  single-changelog-per-project mode.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Bump MD version.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.mdp: Project file names updated by change in MD path
-	  functions.
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* ChangeLogService.cs, CommitDialogExtensionWidget.cs: Applied changes that
-	  were neccassary for to the new FileService.
-
-2007-09-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Add missing identifier for the add-in
-	  preferences dialog.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Added an Other section in the MD property dialog
-	  and moved some options there to avoid too many branches.
-
-2007-09-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CommitDialogExtensionWidget.cs: Regenerate changelog entries after
-	  changing the user name and mail options. Fixes bug #82745.
-
-2007-09-04  Michael Hutchinson <MHutchinson@novell.com>
-
-	* ChangeLogAddInOptionPanelWidget.cs: Fix compiler warning.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* ProjectOptionPanel.cs, ChangeLogAddIn.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs,
-	  ChangeLogAddInOptionPanelWidget.cs, CommitDialogExtensionWidget.cs:
-	  Changes due to new property infrastructure.
-
-2007-08-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AddLogEntryDialog.cs: When changing selection, get the text from the
-	  changes table, if it has changed. Fixes bug #82437.
-
-2007-08-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.mdp, gtk-gui/gui.stetic, Makefile.am: Updated.
-	* ChangeLogService.cs: Fix nullref exception.
-	* CommitDialogExtensionWidget.cs: Fix warning.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml, ChangeLogAddIn.mdp, Makefile.am: Reorganized the
-	  extension point hierarchy. Embedded all add-in manifests as resources.
-
-2007-08-06  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* ChangeLogAddin.cs: Fixed #82322. 
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.ChangeLogAddIn.ProjectOptionPanelWidget.cs: Added
-	  missing file.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ProjectOptionPanel.cs, ChangeLogData.cs, ProjectOptionPanelWidget.cs,
-	  ChangeLogAddInOptionsPanel.cs, ChangeLogAddIn.cs, AddLogEntryDialog.cs,
-	  ChangeLogAddIn.addin.xml, ChangeLogAddIn.mdp, gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs,
-	  gtk-gui/gui.stetic, ChangeLogAddInOptionPanelWidget.cs, Makefile.am,
-	  ChangeLogService.cs, CommitDialogExtensionWidget.cs: Allow updating
-	  multiple changelog files at the same time. Updated licenses. Based on a
-	  patch by Jacob Ilsø Christensen.
-
-2007-07-03  Mike Krüger <mkrueger@novell.com> 
-
-	* ChangeLogAddIn.cs: Changed a bit because of the removal of custom
-	  collections in the Ide project.
-
-2007-06-22  Jacob Ilsø Christensen <jacobilsoe@gmail.com> 
-
-	* ChangeLogAddIn.mdp: Included ChangeLog file.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.mdp, Makefile.am: Reference shared assemblies from the
-	  correct location.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml, ChangeLogAddIn.mdp,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs,
-	  gtk-gui/gui.stetic, Makefile.am: Migration to Mono.Addins.
-
-2007-03-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml, ChangeLogAddIn.cs: Simplified a little bit the
-	  ChangeLogAddin. Just one command "Insert ChageLog Entry", an header is
-	  automatically added if missing or if the top-most header is different
-	  from the one we're about to add. The command can be issued from anywhere
-	  and the add-in looks for the right ChangeLog file and even creates one
-	  if necessary. Patch by Federico Di Gregorio.
-
-	* AddLogEntryDialog.cs, gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs,
-	  CommitDialogExtensionWidget.cs: Use new the partial class model.
-	* ChangeLogAddIn.mdp: Update.
-	* ChangeLogAddInOptionsPanel.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.ChangeLogAddInOptionPanelWidget.cs,
-	  gtk-gui/gui.stetic, ChangeLogAddInOptionPanelWidget.cs: Implemented the
-	  option panel using stetic.
-	* Makefile.am: Added new files.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Change add-in versions to 0.13.
-	* ChangeLogAddIn.mdp: Updated.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.mdp, Makefile.am: Synchronized the MD project and the
-	  Makefile
-
-2007-02-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	i18n fixes.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.cs: Track api changes in Document class.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.mdp, gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs,
-	  gtk-gui/gui.stetic, Makefile.am: Split Stetic generated code in
-	  files.
-
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CommitDialogExtensionWidget.cs: Use the FileService for copying and
-	  deleting files.
-
-2006-12-01  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* Makefile.am: Only build if VersionControl AddIn is enabled, 
-	  because this AddIn depends on it.
-
-2006-11-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.mdp, Makefile.am: Updated references to version
-	  control add-in.
-	* gtk-gui/generated.cs, gtk-gui/gui.stetic: Updated.
-	* CommitDialogExtensionWidget.cs: Don't try to commit the ChangeLog
-	  file if it is not really committable.
-
-2006-11-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AddLogEntryDialog.cs: New dialog that shows a new entry to be added
-	  to a ChangeLog file.
-	* ChangeLogAddIn.addin.xml: Added dependency to VersionControl.
-	  Registered extension to the commit dialog. 
-	* ChangeLogAddIn.mdp, Makefile.am: Updated.
-	* ChangeLogAddInOptionsPanel.cs: Save the properties after changing
-	  user data.
-	* gtk-gui/generated.cs, gtk-gui/gui.stetic: New gui files.
-	* CommitDialogExtensionWidget.cs: New extension of the commit dialog.
-
-2006-09-19 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* ChangeLogAddIn.mdp: Updated.
-	* .: Added svn:ignore for ChangeLogAddIn.pidb
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Updated versions.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ChangeLogAddIn.addin.xml: Updated versions.
-	* ChangeLogAddIn.mdp: Updated.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ChangeLogAddIn.addin.xml: Updated references.
-
-2006-03-24 Grzegorz Sobanski  <silk@boktor.net>  
-
-	* Makefile.am: removed unneeded references to nunit.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* ChangeLogAddIn.mdp: Updated.
-	* Makefile.am: Use an unified format. Patch by Matze Braun.
-	* ChangeLogAddIn.addin.xml: Updated add-in versions.
-
-2006-02-28  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-	* ChangeLogAddIn.addin.xml:
-	* ChangeLogAddInOptionsPanel.cs:
-	* ChangeLogAddIn.cs:
-	Fixed spelling.
-
-2006-01-29  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* ChangeLogAddIn.cs:
-	* ChangeLogAddInOptionsPanel.cs:
-	Added copyright comment.
-
-2006-01-25  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* ChangeLogAddIn.addin.xml: Fixed spelling of add-in.
-
-2005-12-15  Jacob Ilsø Christensen <jacobilsoe@gmail.com> 
-
-	* Makefile.am: Added AssemblyInfo.cs
-	* AssemblyInfo.cs: Added version info.
-	
-2005-12-15  Jacob Ilsø Christensen <jacobilsoe@gmail.com> 
-
-	* ChangeLogAddIn.cs: Fixed indention.
-
-2005-12-15  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* *:
-	Initial version.
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml
index 226b186130..1af14056ce 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml
+++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.addin.xml
@@ -17,7 +17,7 @@
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/VersionControl">

 		<ComplexCondition>

 			<Or>

-				<Condition id="ItemType" value="SolutionItem" />

+				<Condition id="ItemType" value="SolutionFolderItem" />

 				<Condition id="ItemType" value="Solution" />

 			</Or>

 			<Section id = "ChangeLogIntegration" _label = "ChangeLog Integration" fill="true" class="MonoDevelop.ChangeLogAddIn.ProjectOptionPanel" />

diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
index af7840f2b4..4b6aefb313 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
+++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
@@ -35,6 +35,8 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Gui.Pads.ProjectPad;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.ChangeLogAddIn
 {
@@ -45,9 +47,9 @@ namespace MonoDevelop.ChangeLogAddIn
 
 	public class InsertEntryHandler : CommandHandler
 	{
-		protected override void Run()
+		protected override async void Run()
 		{
-			Document document = GetActiveChangeLogDocument();
+			Document document = await GetActiveChangeLogDocument();
 			if (document == null) return;
 			
 			if (InsertHeader(document))
@@ -80,7 +82,7 @@ namespace MonoDevelop.ChangeLogAddIn
 		
 		static void InsertEntry(Document document)
 		{
-			IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();					
+			var textBuffer = document.GetContent<TextEditor>();					
 			if (textBuffer == null) return;
 
 			string changeLogFileName = document.FileName;
@@ -98,16 +100,16 @@ namespace MonoDevelop.ChangeLogAddIn
 				textBuffer.InsertText (insertPos, text);
 				
 				insertPos += text.Length;
-				textBuffer.Select (insertPos, insertPos);
-				textBuffer.CursorPosition = insertPos;
-				
+				textBuffer.CaretOffset = insertPos;
+				textBuffer.SetSelection (insertPos, insertPos);
+
 				document.Select ();
 			}
 		}
 		
 		static bool InsertHeader (Document document)
 		{
-			IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();					
+			var textBuffer = document.Editor;					
 			if (textBuffer == null) return false;
 			
 			AuthorInformation userInfo = document.Project != null ? document.Project.AuthorInformation : AuthorInformation.Default;
@@ -126,25 +128,25 @@ namespace MonoDevelop.ChangeLogAddIn
 			// Read the first line and compare it with the header: if they are
 			// the same don't insert a new header.
 			int pos = GetHeaderEndPosition(document);
-			if (pos < 0 || (pos + 2 > textBuffer.Length) || textBuffer.GetText (0, pos + 2) != text)
+			if (pos < 0 || (pos + 2 > textBuffer.Length) || textBuffer.GetTextAt (0, pos + 2) != text)
 				textBuffer.InsertText (0, text);
 			return true;
 		}
         
 		static int GetHeaderEndPosition(Document document)
 		{
-			IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();					
+			var textBuffer = document.Editor;				
 			if (textBuffer == null) return 0;
 			
 			// This is less than optimal, we simply read 1024 chars hoping to
 			// find a newline there: if we don't find it we just return 0.
-			string text = textBuffer.GetText (0, Math.Min (textBuffer.Length, 1023));
+			string text = textBuffer.GetTextAt (0, Math.Min (textBuffer.Length, 1023));
 			string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
 			
 			return text.IndexOf (eol + eol, StringComparison.Ordinal);
 		}
         
-		static Document GetActiveChangeLogDocument()
+		static async Task<Document> GetActiveChangeLogDocument()
 		{
 			string file = GetSelectedFile ();
 			if (file == null)
@@ -159,7 +161,7 @@ namespace MonoDevelop.ChangeLogAddIn
 				return null;
 			
 			if (File.Exists (clog))
-				return IdeApp.Workbench.OpenDocument (clog, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
+				return await IdeApp.Workbench.OpenDocument (clog, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
 			
 			Document document = IdeApp.Workbench.NewDocument (clog, "text/plain", "");
 			document.Save();
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj
index d3edc7350f..c8b18f7435 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj
+++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.csproj
@@ -54,21 +54,11 @@
       <Name>MonoDevelop.VersionControl</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogService.cs b/main/src/addins/ChangeLogAddIn/ChangeLogService.cs
index 587bb5db7c..25581a2cf2 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLogService.cs
+++ b/main/src/addins/ChangeLogAddIn/ChangeLogService.cs
@@ -38,7 +38,7 @@ namespace MonoDevelop.ChangeLogAddIn
 		// Returns the path of the ChangeLog where changes of the provided file have to be logged.
 		// Returns null if no ChangeLog could be found.
 		// Returns an empty string if changes don't have to be logged.
-		public static string GetChangeLogForFile (string baseCommitPath, FilePath file, out SolutionItem parentEntry, out ChangeLogPolicy policy)
+		public static string GetChangeLogForFile (string baseCommitPath, FilePath file, out SolutionFolderItem parentEntry, out ChangeLogPolicy policy)
 		{
 			parentEntry = null;
 			policy = null;
@@ -50,7 +50,7 @@ namespace MonoDevelop.ChangeLogAddIn
 			string bestPath = null;
 			file = file.CanonicalPath;
 			
-			foreach (SolutionItem e in IdeApp.Workspace.GetAllSolutionItems ()) {
+			foreach (SolutionFolderItem e in IdeApp.Workspace.GetAllSolutionItems ()) {
 				if (e is Project && ((Project)e).Files.GetFile (file) != null) {
 					parentEntry = e;
 					break;
@@ -108,18 +108,18 @@ namespace MonoDevelop.ChangeLogAddIn
 		
 		public static string GetChangeLogForFile (string baseCommitPath, string file)
 		{
-			SolutionItem parentEntry;
+			SolutionFolderItem parentEntry;
 			ChangeLogPolicy policy;
 			return GetChangeLogForFile (baseCommitPath, file, out parentEntry, out policy);
 		}
 		
-		public static CommitMessageStyle GetMessageStyle (SolutionItem item)
+		public static CommitMessageStyle GetMessageStyle (SolutionFolderItem item)
 		{
 			ChangeLogPolicy policy = item != null ? GetPolicy (item) : new ChangeLogPolicy ();
 			return policy.MessageStyle;
 		}
 		
-		static ChangeLogPolicy GetPolicy (SolutionItem item)
+		static ChangeLogPolicy GetPolicy (SolutionFolderItem item)
 		{
 			return item.Policies.Get<ChangeLogPolicy> ();
 		}
diff --git a/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs b/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
index d23236c134..c2831dfbfe 100644
--- a/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
+++ b/main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
@@ -156,7 +156,7 @@ namespace MonoDevelop.ChangeLogAddIn
 					}
 					if (!cset.ContainsFile (ce.File)) {
 						if (!cset.Repository.GetVersionInfo (ce.File).IsVersioned)
-							cset.Repository.Add (ce.File, false, new MonoDevelop.Core.ProgressMonitoring.NullProgressMonitor ());
+							cset.Repository.Add (ce.File, false, new MonoDevelop.Core.ProgressMonitor ());
 						cset.AddFile (ce.File);
 					}
 				}
@@ -226,7 +226,7 @@ namespace MonoDevelop.ChangeLogAddIn
 			requireComment = false;
 			
 			foreach (ChangeSetItem item in cset.Items) {
-				SolutionItem parentItem;
+				SolutionFolderItem parentItem;
 				ChangeLogPolicy policy;
 				string logf = ChangeLogService.GetChangeLogForFile (cset.BaseLocalPath, item.LocalPath,
 				                                                    out parentItem, out policy);
diff --git a/main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs b/main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
index 12a02a3337..43acbf321f 100644
--- a/main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
+++ b/main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
@@ -25,7 +25,7 @@
 //
 //
 
-using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Dialogs;
@@ -36,7 +36,7 @@ namespace MonoDevelop.ChangeLogAddIn
 	{
 		ProjectOptionPanelWidget widget;
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			return widget = new ProjectOptionPanelWidget (this);
 		}
diff --git a/main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs b/main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
index 1492307f2b..777de0e1e4 100644
--- a/main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
+++ b/main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.ChangeLogAddIn
 			format.MaxColumns = 70;
 			format.Style = style;
 			
-			SolutionItem item = null;
+			SolutionFolderItem item = null;
 			if (parent.ConfiguredSolutionItem != null)
 				item = parent.ConfiguredSolutionItem;
 			else if (parent.ConfiguredSolution != null)
diff --git a/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs b/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs
index e88f8540d9..f71b2fb618 100644
--- a/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs
+++ b/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs
@@ -5,28 +5,49 @@ namespace MonoDevelop.ChangeLogAddIn
 	internal partial class AddLogEntryDialog
 	{
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.VPaned vpaned1;
+		
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow2;
+		
 		private global::Gtk.TreeView fileList;
+		
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow1;
+		
 		private global::Gtk.TextView textview;
+		
 		private global::Gtk.HBox boxNewFile;
-		private global::Gtk.Image image36;
+		
+		private global::MonoDevelop.Components.ImageView image36;
+		
 		private global::Gtk.Label label7;
+		
 		private global::Gtk.HBox boxNoFile;
-		private global::Gtk.Image image37;
+		
+		private global::MonoDevelop.Components.ImageView image37;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.HBox hbox3;
+		
 		private global::Gtk.VBox vbox4;
-		private global::Gtk.Image image38;
+		
+		private global::MonoDevelop.Components.ImageView image38;
+		
 		private global::Gtk.Label label9;
+		
 		private global::Gtk.Button button7;
-		private global::Gtk.Button button119;
 		
+		private global::Gtk.Button button119;
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -119,9 +140,10 @@ namespace MonoDevelop.ChangeLogAddIn
 			this.boxNewFile.Name = "boxNewFile";
 			this.boxNewFile.Spacing = 6;
 			// Container child boxNewFile.Gtk.Box+BoxChild
-			this.image36 = new global::Gtk.Image ();
+			this.image36 = new global::MonoDevelop.Components.ImageView ();
 			this.image36.Name = "image36";
-			this.image36.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", global::Gtk.IconSize.SmallToolbar);
+			this.image36.IconId = "gtk-new";
+			this.image36.IconSize = ((global::Gtk.IconSize)(2));
 			this.boxNewFile.Add (this.image36);
 			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.boxNewFile [this.image36]));
 			w11.Position = 0;
@@ -149,9 +171,10 @@ namespace MonoDevelop.ChangeLogAddIn
 			this.boxNoFile.Name = "boxNoFile";
 			this.boxNoFile.Spacing = 6;
 			// Container child boxNoFile.Gtk.Box+BoxChild
-			this.image37 = new global::Gtk.Image ();
+			this.image37 = new global::MonoDevelop.Components.ImageView ();
 			this.image37.Name = "image37";
-			this.image37.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.SmallToolbar);
+			this.image37.IconId = "gtk-dialog-warning";
+			this.image37.IconSize = ((global::Gtk.IconSize)(2));
 			this.boxNoFile.Add (this.image37);
 			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.boxNoFile [this.image37]));
 			w14.Position = 0;
@@ -184,9 +207,10 @@ namespace MonoDevelop.ChangeLogAddIn
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.image38 = new global::Gtk.Image ();
+			this.image38 = new global::MonoDevelop.Components.ImageView ();
 			this.image38.Name = "image38";
-			this.image38.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-info", global::Gtk.IconSize.SmallToolbar);
+			this.image38.IconId = "gtk-dialog-info";
+			this.image38.IconSize = ((global::Gtk.IconSize)(2));
 			this.vbox4.Add (this.image38);
 			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.image38]));
 			w17.Position = 0;
diff --git a/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs b/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs
index 36abc51341..75935e2e55 100644
--- a/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs
+++ b/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs
@@ -14,40 +14,6 @@ namespace Stetic
 		}
 	}
 
-	internal class IconLoader
-	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
-		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
-				return res;
-			} else {
-				int sz;
-				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-					}
-				}
-			}
-		}
-	}
-
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
diff --git a/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic b/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic
index cc2a22e669..16bc54996d 100644
--- a/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic
+++ b/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic
@@ -8,6 +8,8 @@
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
     <widget-library name="../../../../build/AddIns/VersionControl/MonoDevelop.VersionControl.dll" />
     <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
+    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
+    <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
     <widget-library name="../../../../build/AddIns/ChangeLogAddIn/ChangeLogAddIn.dll" internal="true" />
   </import>
   <widget class="Gtk.Dialog" id="MonoDevelop.ChangeLogAddIn.AddLogEntryDialog" design-size="573 510">
@@ -125,9 +127,10 @@
                 <property name="Visible">False</property>
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.Image" id="image36">
+                  <widget class="MonoDevelop.Components.ImageView" id="image36">
                     <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-new SmallToolbar</property>
+                    <property name="IconId">gtk-new</property>
+                    <property name="IconSize">SmallToolbar</property>
                   </widget>
                   <packing>
                     <property name="Position">0</property>
@@ -165,9 +168,10 @@
                 <property name="Visible">False</property>
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.Image" id="image37">
+                  <widget class="MonoDevelop.Components.ImageView" id="image37">
                     <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-dialog-warning SmallToolbar</property>
+                    <property name="IconId">gtk-dialog-warning</property>
+                    <property name="IconSize">SmallToolbar</property>
                   </widget>
                   <packing>
                     <property name="Position">0</property>
@@ -209,9 +213,10 @@
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.Image" id="image38">
+                      <widget class="MonoDevelop.Components.ImageView" id="image38">
                         <property name="MemberName" />
-                        <property name="Pixbuf">stock:gtk-dialog-info SmallToolbar</property>
+                        <property name="IconId">gtk-dialog-info</property>
+                        <property name="IconSize">SmallToolbar</property>
                       </widget>
                       <packing>
                         <property name="Position">0</property>
diff --git a/main/src/addins/Deployment/ChangeLog b/main/src/addins/Deployment/ChangeLog
deleted file mode 100644
index b309d9eca6..0000000000
--- a/main/src/addins/Deployment/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Deployment.mds: Migrated to MSBuild file format.
-
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/AddinInfo.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/AddinInfo.cs
index b3d738acc3..e7dc673155 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/AddinInfo.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/AddinInfo.cs
@@ -6,7 +6,14 @@ using Mono.Addins.Description;
 [assembly:Addin ("Deployment.Linux", 
 	Namespace = "MonoDevelop",
 	Version = MonoDevelop.BuildInfo.Version,
-	Category = "Deployment")]
+	Category = "Deployment",
+	EnabledByDefault =
+	#if GNOME
+		true
+	#else
+		false
+	#endif
+)]
 
 [assembly:AddinName ("Deployment Services for Linux")]
 [assembly:AddinDescription ("Provides basic deployment services for Linux")]
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
deleted file mode 100644
index 24818592e6..0000000000
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
+++ /dev/null
@@ -1,517 +0,0 @@
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs: Fix
-	  incorrect use of ShowCustomDialog/RunCustomDialog.
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs: More
-	  dialog placing.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs:
-	  Flush.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Deployment.Linux/DotDesktopView.cs: IViewContent
-	  widgets are now destroyed by the workspace window.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.Linux.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Deployment.Linux.csproj:
-	* MonoDevelop.Deployment.Linux.addin.xml:
-	* MonoDevelop.Deployment.Linux/BasicOptionPanel.cs:
-	* MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs:
-	* MonoDevelop.Deployment.Linux/LinuxDeploymentSetup.cs: Merged
-	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
-	  and MD.Components into MD.Ide.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs:
-	* MonoDevelop.Deployment.Linux/LinuxIntegrationProjectFeature.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.BasicOptionPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs:
-	  Flush.
-
-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment.Linux/DotDesktopDisplayBinding.cs:
-	  Track DisplayBinding API.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs:
-	  Track api changes.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs:
-	  Introduced the ConfigurationSelector class to all methods
-	  that previously took a configuration name as string. This
-	  eliminates the ambiguity between solution configuration
-	  names and project configuration names.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.Linux.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Deployment.Linux.csproj:
-	* gtk-gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.BasicOptionPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs:
-	  Flush.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.Linux.addin.xml: Bump MD version.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs: Set dialog
-	  transient for the root window.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux.csproj: Updated dependencies.
-	  We now depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs:
-	  Flush.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs: Use
-	  the new DesktopService instead of PlatformService.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs:
-	* MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs:
-	  Track api changes.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Deployment.Linux/DotDesktopDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Deployment.Linux/DotDesktopDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.Deployment.Linux.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.Linux.addin.xml: Bump MD version.
-
-2009-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs: If
-	  version number is not set in the project, get the version
-	  from the solution.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment.Linux.csproj: Flush MD's removal of
-	  newline at end of file that was introduced by manually
-	  editing with gedit.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment.Linux.csproj: Remove invalid
-	  ApplicationIcon value that broke the build in VS.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux.mdp:
-	* MonoDevelop.Deployment.Linux.csproj: Migrated to MSBuild
-	  file format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.Linux.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Linux.BasicOptionPanelWidget.cs:
-	*
-	  gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs:
-	  Flush.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment.Linux.mdp: Flush project format changes.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build dependencies.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Linux.addin.xml: Bump MD version.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs: Track API.
-	* MonoDevelop.Deployment.Linux/LinuxDeploymentSetup.cs: Added quick
-	  property for enabling translation of files. Supports multi-select.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/DesktopPanelWidget.cs,
-	  MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs,
-	  MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.BasicOptionPanelWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs,
-	  gtk-gui/objects.xml,
-	  gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs:
-	  Updated generated code.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp: Removed some parts of the
-	  documentation service.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/LinuxDeployData.cs: Moved serialization
-	  engine to MonoDevelop.Core. Use new syntax for specifying attribute
-	  scope.
-
-2008-06-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/gui.stetic: Fix required gtk version.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml: Bump MD version.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml: Merged the extension points
-	  for project and solution option panels into a single extension
-	  point. A single extension point will now be used for all kinds of
-	  items. Extension conditions can be used to make panels visible only
-	  for some specific item types.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml,
-	  MonoDevelop.Deployment.Linux.mdp,
-	  MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs,
-	  MonoDevelop.Deployment.Linux/LinuxDeploymentSetup.cs,
-	  MonoDevelop.Deployment.Linux/LinuxDeployData.cs,
-	  MonoDevelop.Deployment.Linux/LinuxIntegrationProjectFeature.cs,
-	  MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs,
-	  MonoDevelop.Deployment.Linux/BasicOptionPanel.cs: New project model
-	  changes.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp, gtk-gui/gui.stetic, Makefile.am: Removed
-	  some unused glade and gnome-sharp references (only the unused). But I'll
-	  continue to remove glade, we need to lower the dependency tree a bit.
-
-2008-02-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/DotDesktopView.cs: Fixed nullref.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml: Update MD version.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml: Updated add-in category and
-	  description.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* app.desktop.xft.xml: Make template categories translatable.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp: Updated project files. The order of
-	  extended properties won't change anymore.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs: Moved
-	  PlatformService to MD.Core.Gui. Removed old FileIconService class, which
-	  is now implemented in PlatformService.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs,
-	  gtk-gui/gui.stetic: Flush.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs,
-	  gtk-gui/gui.stetic,
-	  gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs:
-	  Updated.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml: Bump add-in versions.
-
-2007-12-06  Geoff Norton  <gnorton@novell.com>
-
-	* MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs: Use 
-	  PlatformService to get mime information instead of Gnome.Vfs directly
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp, Makefile.am: Directory reorganization.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/LinuxDeploymentSetup.cs,
-	  MonoDevelop.Deployment.Linux/MenuCategorySelectorDialog.cs: Track
-	  LoggingService API changes.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml: Bump MD version.
-
-2007-10-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml, MonoDevelop.Deployment.Linux.mdp,
-	  MonoDevelop.Deployment.Linux/LinuxDeploymentSetup.cs,
-	  MonoDevelop.Deployment.Linux/LinuxDeployData.cs, app.desktop.xft.xml,
-	  Makefile.am: Added new file template for creating .desktop files. When a
-	  .desktop file is added to a project, set the deploy options so it is
-	  deployed to the .desktop app folder.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs: Use the project
-	  description when generating .pc files, if available. Patch by Federico
-	  Di Gregorio.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/DotDesktopView.cs: Destroy the view widget
-	  when the view is disposed.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/LinuxIntegrationProjectFeature.cs: Track api
-	  changes. Add description property.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp: Project file names updated by change in
-	  MD path functions.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.BasicOptionPanelWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs:
-	  Regenerated gui files.
-
-2007-09-15  Andrés G. Aragoneses <knocte@gmail.com>
-
-	* MonoDevelop.Deployment.Linux/DesktopInfo.xml: fix typo.
-	* gtk-gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs:
-	* gtk-gui/gui.stetic: Don't translate "page#" texts.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/BasicOptionPanel.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs: Changes
-	  due to new property infrastructure.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am, MonoDevelop.Deployment.Linux.mdp: Don't exclude the .addin
-	  file from the makefile.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml, MonoDevelop.Deployment.Linux.mdp,
-	  Makefile.am: Reorganized the extension point hierarchy. Embedded all
-	  add-in manifests as resources.
-
-2007-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp,
-	  gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs,
-	  gtk-gui/gui.stetic: Updated.
-
-2007-07-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/MenuCategorySelectorDialog.cs: Fix
-	  build.
-
-2007-07-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/MenuCategorySelectorDialog.cs: Use the
-	  log service for logging errors.
-
-2007-07-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs: In the
-	  generated launch script, transfer script parameters to mono.
-	* gtk-gui/objects.xml: Updated.
-
-2007-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/MenuCategorySelectorDialog.cs: Always
-	  select a "main" category when selecting a subcategory.
-
-2007-05-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/LinuxDeployData.cs: Don't set the
-	  ScriptName property by default, just return the name of the project
-	  when not set.
-	* gtk-gui/MonoDevelop.Deployment.Linux.DesktopPanelWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs,
-	  gtk-gui/gui.stetic: Updated.
-
-2007-05-13  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs,
-	  MonoDevelop.Deployment.Linux/MenuCategorySelectorDialog.cs: Make
-	  strings translatable.
-
-2007-05-12  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs: Fixed typo.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp: Don't copy project references.
-
-2007-05-10  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp: Add 
-	  MonoDevelop.Deployment.Linux.addin.xml back to the file list, 
-	  but exclude from makefile synching.
-
-2007-05-09  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* Makefile.am: Eliminate duplication of 
-	  MonoDevelop.Deployment.Linux.addin.xml target.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp, Makefile.am: Reference shared
-	  assemblies from the correct location.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml,
-	  MonoDevelop.Deployment.Linux.mdp,
-	  gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs,
-	  Makefile.am: Migration to Mono.Addins.
-
-2007-04-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/LinuxDeployData.cs: Added package name
-	  property.
-	* MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs: Rename
-	  app.desktop files to <package-name>.desktop when deploying.
-
-2007-04-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.addin.xml: Register new project feature
-	  editor. Place the .desktop editor before the default editor.
-	* MonoDevelop.Deployment.Linux.mdp, Makefile.am: Added new file.
-	* MonoDevelop.Deployment.Linux/DesktopEntry.cs: Write the [Desktop
-	  Entry] group name when a new file is created.
-	* MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs,
-	  MonoDevelop.Deployment.Linux/BasicOptionPanel.cs: Generate the
-	  .desktop file if that option is selected.
-	* MonoDevelop.Deployment.Linux/LinuxIntegrationProjectFeature.cs:
-	  Implemented a project feature which allows setting unix integration
-	  options.
-	* gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs,
-	  gtk-gui/gui.stetic: Updated.
-
-2007-04-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs,
-	  MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs: Show library
-	  options for exes compiled as dll.
-	* gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Linux.MenuCategorySelectorDialog.cs:
-	  Updated.
-
-2007-04-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Linux.mdp: Updated.
-	* MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs: Provide the
-	  source project and a description for generated .pc and script
-	  files.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com>
-
-	New unix deployment add-in.
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
index f2396223f0..1d48c4a813 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
@@ -3,9 +3,6 @@
 	<Extension path = "/MonoDevelop/Ide/Commands">
 	</Extension>	
 
-	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
-	</Extension>
-
 	<Extension path = "/MonoDevelop/Deployment/DeployDirectoryResolvers">
 	</Extension>
 
@@ -13,11 +10,6 @@
 		<Class id="Deployment.Linux" insertbefore="PrepareDeploy" class = "MonoDevelop.Deployment.Linux.LinuxDeployExtension" />
 	</Extension>
 	
-	<Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
-<!--		<ItemProperty class = "MonoDevelop.Projects.ProjectFile"
-			name = "DeployService.TargetDirectoryId" type = "System.String" />
--->	</Extension>
-
 	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
 <!--		<NodeBuilder class = "MonoDevelop.Deployment.NodeBuilders.PackagingProjectNodeBuilder"/>
 		<NodeBuilder class = "MonoDevelop.Deployment.NodeBuilders.PackageNodeBuilder"/>
@@ -49,11 +41,6 @@
 		</Condition>
 	</Extension>
 
-	<Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
-		<ItemProperty class = "MonoDevelop.Projects.SolutionItem"
-			name = "Deployment.LinuxDeployData" type = "MonoDevelop.Deployment.Linux.LinuxDeployData" />
-	</Extension>
-
 	<Extension path = "/MonoDevelop/Deployment/DeployDirectories">
 		<Condition id="Platform" value="linux">
 			<DeployDirectory id="Linux.PkgConfig" _label="pkg-config folder" />
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj
index 795bf7eab9..e9a5783a2e 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj
@@ -40,6 +40,36 @@
     <NoWarn>1591;1573</NoWarn>
     <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.Deployment\MonoDevelop.Deployment.Linux.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.Deployment</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+    <DefineConstants>DEBUG;GNOME</DefineConstants>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.Deployment\MonoDevelop.Deployment.Linux.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.Deployment</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>GNOME</DefineConstants>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.Deployment\MonoDevelop.Deployment.Linux.xml</DocumentationFile>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
       <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanel.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanel.cs
index a042798746..64a564bcff 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanel.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanel.cs
@@ -1,6 +1,7 @@
 
- 
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
+using MonoDevelop.Projects;
 
 namespace MonoDevelop.Deployment.Linux
 {
@@ -12,9 +13,9 @@ namespace MonoDevelop.Deployment.Linux
 		{
 		}
 		
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
-			return (widget = new BasicOptionPanelWidget (ConfiguredSolutionItem, false));
+			return (widget = new BasicOptionPanelWidget ((Project) ConfiguredSolutionItem, false));
 		}
 		
 		public override void ApplyChanges ()
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs
index dd9d2e72cc..c1464cdb01 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/BasicOptionPanelWidget.cs
@@ -10,9 +10,9 @@ namespace MonoDevelop.Deployment.Linux
 	[System.ComponentModel.ToolboxItem(true)]
 	public partial class BasicOptionPanelWidget : Gtk.Bin
 	{
-		SolutionItem entry;
+		SolutionFolderItem entry;
 		
-		public BasicOptionPanelWidget (SolutionItem entry, bool creatingProject)
+		public BasicOptionPanelWidget (Project entry, bool creatingProject)
 		{
 			this.Build();
 			
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopDisplayBinding.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopDisplayBinding.cs
index 1b33518c28..c965434b68 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopDisplayBinding.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopDisplayBinding.cs
@@ -16,7 +16,7 @@ namespace MonoDevelop.Deployment.Linux
 				|| (mimeType != null && mimeType == "application/x-desktop");
 		}
 		
-		public IViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
+		public ViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
 		{
 			return new DotDesktopView ();
 		}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs
index 939f8b75df..6a3e10d45d 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopView.cs
@@ -1,10 +1,12 @@
 
 using System;
+using MonoDevelop.Components;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.Gui;
 
 namespace MonoDevelop.Deployment.Linux
 {
-	public class DotDesktopView: AbstractViewContent
+	public class DotDesktopView: ViewContent
 	{
 		DotDesktopViewWidget widget;
 		DesktopEntry entry;
@@ -25,20 +27,22 @@ namespace MonoDevelop.Deployment.Linux
 			}
 		}
 		
-		public override void Load (string fileName)
+		public override Task Load (FileOpenInformation fileOpenInformation)
 		{
-			ContentName = fileName;
-			entry.Load (fileName);
+			ContentName = fileOpenInformation.FileName;
+			entry.Load (fileOpenInformation.FileName);
 			widget.DesktopEntry = entry;
+			return Task.FromResult (true);
 		}
 		
-		public override void Save (string fileName)
+		public override Task Save (FileSaveInformation fileSaveInformation)
 		{
-			entry.Save (fileName);
+			entry.Save (fileSaveInformation.FileName);
 			IsDirty = false;
+			return Task.FromResult (true);
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get { return widget; }
 		}
 	}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
index 255b54257b..aed6187f73 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
@@ -2,9 +2,13 @@
 using System;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
+using System.Xml;
+using System.IO;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Deployment.Linux
 {
+	[DataItem ("Deployment.LinuxDeployData")]
 	public class LinuxDeployData
 	{
 		[ItemProperty (DefaultValue=true)]
@@ -22,10 +26,9 @@ namespace MonoDevelop.Deployment.Linux
 		[ItemProperty (DefaultValue=true)]
 		bool generatePcFile = true;
 		
-		SolutionItem entry;
-		bool connected;
-		
-		internal LinuxDeployData (SolutionItem entry)
+		Project entry;
+
+		internal LinuxDeployData (Project entry)
 		{
 			this.entry = entry;
 		}
@@ -34,44 +37,39 @@ namespace MonoDevelop.Deployment.Linux
 		{
 		}
 		
-		public static LinuxDeployData GetLinuxDeployData (SolutionItem entry)
+		public static LinuxDeployData GetLinuxDeployData (Project entry)
 		{
 			LinuxDeployData data = (LinuxDeployData) entry.ExtendedProperties ["Deployment.LinuxDeployData"];
-			if (data != null) {
-				if (data.entry == null) {
-					data.Bind (entry);
-					data.connected = true;
-				}
-				return data;
-			}
-			
-			data = (LinuxDeployData) entry.ExtendedProperties ["Temp.Deployment.LinuxDeployData"];
 			if (data != null)
 				return data;
 			
-			data = CreateDefault (entry);
-			entry.ExtendedProperties ["Temp.Deployment.LinuxDeployData"] = data;
-			data.Bind (entry);
+			var elem = entry.MSBuildProject.GetMonoDevelopProjectExtension ("Deployment.LinuxDeployData");
+			if (elem != null) {
+				XmlDataSerializer ser = new XmlDataSerializer (new DataContext ());
+				data = (LinuxDeployData) ser.Deserialize (new XmlNodeReader (elem), typeof(LinuxDeployData));
+			} else {
+				data = CreateDefault (entry);
+			}
+			data.entry = entry;
+			entry.ExtendedProperties ["Deployment.LinuxDeployData"] = data;
 			return data;
 		}
 		
-		internal static LinuxDeployData CreateDefault (SolutionItem entry)
+		internal static LinuxDeployData CreateDefault (Project entry)
 		{
 			return new LinuxDeployData (entry);
 		}
 		
-		void Bind (SolutionItem entry)
-		{
-			this.entry = entry;
-		}
-		
 		void UpdateEntry ()
 		{
-			if (connected)
-				return;
-			entry.ExtendedProperties ["Deployment.LinuxDeployData"] = this;
-			entry.ExtendedProperties.Remove ("Temp.Deployment.LinuxDeployData");
-			connected = true;
+			var ser = new DataSerializer (new DataContext ());
+			var data = ser.Serialize (this);
+
+			XmlDocument doc = new XmlDocument ();
+			var writer = new XmlConfigurationWriter { Namespace = MSBuildProject.Schema };
+			var elem = writer.Write (doc, data);
+
+			entry.MSBuildProject.SetMonoDevelopProjectExtension ("Deployment.LinuxDeployData", elem);
 		}
 		
 		public string PackageName {
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/AddinInfo.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/AddinInfo.cs
index db9f908173..990811ac25 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/AddinInfo.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/AddinInfo.cs
@@ -6,7 +6,14 @@ using Mono.Addins.Description;
 [assembly:Addin ("Deployment", 
 	Namespace = "MonoDevelop",
 	Version = MonoDevelop.BuildInfo.Version,
-	Category = "Deployment")]
+    Category = "Deployment",
+    EnabledByDefault =
+	#if GNOME
+		true
+	#else
+		false
+	#endif
+	)]
 
 [assembly:AddinName ("Deployment Services Core")]
 [assembly:AddinDescription ("Provides basic deployment services")]
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog b/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog
deleted file mode 100644
index bd3996b701..0000000000
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog
+++ /dev/null
@@ -1,1092 +0,0 @@
-2010-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment/DefaultDeployServiceExtension.cs: Get
-	  the output file list using the new Project.GetOutputFiles
-	  method. This includes the output assembly, but also the
-	  debug info file and satellite assemblies.
-
-2010-06-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/PackagingProject.xpt.xml: Don't include the
-	  assembly name in the project type name since it doesn't work
-	  well when running on .NET
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Commands/Commands.cs:
-	* MonoDevelop.Deployment.Gui/DeployOperations.cs: Fix
-	  incorrect use of ShowCustomDialog/RunCustomDialog.
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment.Commands/Commands.cs:
-	* MonoDevelop.Deployment.Gui/DeployOperations.cs: More dialog
-	  placing.
-
-2010-04-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs:
-	  Track api changes.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Deployment.csproj:
-	* MonoDevelop.Deployment.addin.xml:
-	* MonoDevelop.Deployment/PackageBuilder.cs:
-	* MonoDevelop.Deployment.Gui/DeployDialog.cs:
-	* MonoDevelop.Deployment.Commands/Commands.cs:
-	* MonoDevelop.Deployment.Gui/DeployOperations.cs:
-	* MonoDevelop.Deployment.Gui/EditPackageDialog.cs:
-	* MonoDevelop.Deployment.Gui/EntrySelectionTree.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs:
-	* MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs:
-	* MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs:
-	* MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment/DeployProperties.cs: Track
-	  ProjectFile Link API.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Gui/PackagingFeature.cs: Track api
-	  changes.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.InstallDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.EntrySelectionTree.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.PackagingFeatureWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.CommandDeployEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.LocalFileCopyConfigurationEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.SshFuseFileCopyConfigurationEditorWidget.cs:
-	  Flush.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/PackagingProject.xpt.xml: Move to Other category.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment/IDeployable.cs:
-	* MonoDevelop.Deployment/DeployService.cs:
-	* MonoDevelop.Deployment/PackageBuilder.cs:
-	* MonoDevelop.Deployment/InstallResolver.cs:
-	* MonoDevelop.Deployment/PackagingProject.cs:
-	* MonoDevelop.Deployment.Gui/DeployOperations.cs:
-	* MonoDevelop.Deployment/DeployServiceExtension.cs:
-	* MonoDevelop.Deployment.Gui/DeployFileListWidget.cs:
-	* MonoDevelop.Deployment/DefaultDeployServiceExtension.cs:
-	* MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs:
-	  Introduced the ConfigurationSelector class to all methods
-	  that previously took a configuration name as string. This
-	  eliminates the ambiguity between solution configuration
-	  names and project configuration names.
-
-2009-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment/DefaultDeployServiceExtension.cs: Use
-	  a runtime-dependent method for getting the debug info file
-	  of an assembly.
-
-2009-11-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment/DefaultDeployServiceExtension.cs: Fix
-	  .mdb filenames.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.addin.xml: Bump MD version.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment\DefaultDeployServiceExtension.cs:
-	  When targetting MS.NET, deploy .pdb files instead of .mdb.
-
-	* MonoDevelop.Deployment.Gui\DialogFileReplacePolicy.cs: Use
-	  better method for making a sync call in the gui thread.
-	  Fixes bug #550806.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Deployment.csproj:
-	* gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.InstallDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.EntrySelectionTree.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.PackagingFeatureWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.CommandDeployEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.LocalFileCopyConfigurationEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.SshFuseFileCopyConfigurationEditorWidget.cs:
-	  Flush.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.addin.xml: Bump MD version.
-
-2009-09-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Gui/DeployFileListWidget.cs: Fix
-	  FilePath conversion issue.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.Deployment.Commands/Commands.cs: Set dialog transient
-	  for the root window.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment/PackageBuilder.cs: When running on
-	  command line, don't try to get the opened solution.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs:
-	  Improve error reporting.
-
-2009-08-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.addin.xml: Enable serialization of
-	  the "Deploy" property. Fixes bug #521374.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs:
-	  Flush.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs:
-	  Use the new api for removing projects from a solution.
-
-	* MonoDevelop.Deployment.csproj: Don't use a specific version
-	  for SharpZipLib.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.InstallDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs:
-	  Flush.
-
-2009-07-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment/DeployDirectoryInfo.cs:
-	* MonoDevelop.Deployment.Gui/DeployDirectoryInfoEditor.cs:
-	  Track api changes.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs:
-	* MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs:
-	  Use the new DesktopService instead of PlatformService.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment\DeployFile.cs: Use the new FilePath
-	  class for handling file and directory paths.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Deployment.Gui/DeployDialog.cs:
-	* MonoDevelop.Deployment.Gui/EditPackageDialog.cs: Renamed
-	  PixbufService to ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Deployment.Gui/DeployDialog.cs:
-	* MonoDevelop.Deployment.Gui/EditPackageDialog.cs: Track API
-	  changes.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.Deployment.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Deployment.Gui/EntrySelectionTree.cs: Removed
-	  project service.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.addin.xml: Bump MD version.
-
-2009-03-13  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* MonoDevelop.Deployment.Targets/SshFuseFileCopyHandler.cs:
-	  Making some strings not translatable.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Deployment.Gui/PropertyProvider.cs: Worked on
-	  propertygrid localization.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.addin.xml: Track merge of the project
-	  pad context menu.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.mdp:
-	* MonoDevelop.Deployment.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Deployment.addin.xml: Bump MD version.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment.mdp: Flush project format changes.
-
-2009-01-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Deployment.mdp:
-	* gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.InstallDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.EntrySelectionTree.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.PackagingFeatureWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.CommandDeployEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.LocalFileCopyConfigurationEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Deployment.Gui.SshFuseFileCopyConfigurationEditorWidget.cs:
-	Updated generated code and removed objects.xml, which is not required
-	anymore.
-
-2008-12-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.addin.xml: Fix label.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.mdp: No specific version of Mono.Addins is
-	required.
-
-2008-12-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.addin.xml: Hide/protect add-ins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Deployment.Gui/DeployFileListWidget.cs: Null check to
-	prevent NRE.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build dependencies.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Deployment.addin.xml: Bump MD version.
-
-2008-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment/MD1Serializer.cs: Another shot at BuildAction
-	  mapping, with comments.
-
-2008-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment/MD1Serializer.cs: Add missing deploy key,
-	  remove unused variable.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml, MonoDevelop.Deployment.mdp,
-	  MonoDevelop.Deployment/MD1Serializer.cs,
-	  MonoDevelop.Deployment/DefaultDeployServiceExtension.cs,
-	  MonoDevelop.Deployment/DeployProjectServiceExtension.cs,
-	  MonoDevelop.Deployment/DeployContext.cs,
-	  MonoDevelop.Deployment/DeployProperties.cs,
-	  MonoDevelop.Deployment.Gui/PropertyProvider.cs, md1format.xml,
-	  MonoDevelop.Deployment.Targets/LocalFileCopyHandler.cs: Integrate
-	  deployment with the new "local copy" features in core. MD1 format
-	  compatibility is a little ugly.
-	* Makefile.am: Added quick property for enabling translation of files.
-	  Supports multi-select.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.mdp: Updated projects.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Add icon for Create Package
-	  command.
-	* MonoDevelop.Deployment/DefaultDeployServiceExtension.cs: Fix bug
-	  #422764 - Support "App.config" as well as "app.config" (lowercase)
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Deployment.Gui.InstallDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EntrySelectionTree.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.LocalFileCopyConfigurationEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs,
-	  gtk-gui/objects.xml,
-	  gtk-gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.PackagingFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.CommandDeployEditorWidget.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.SshFuseFileCopyConfigurationEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/EntrySelectionTree.cs,
-	  MonoDevelop.Deployment.Gui/BinariesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/DeployFileListWidget.cs,
-	  MonoDevelop.Deployment.Gui/FileCopyConfigurationSelector.cs,
-	  MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs: Updated
-	  generated code.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs,
-	  MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs: Moved
-	  the extensible tree view to its own directory.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Deployment.mdp: Removed some parts of the documentation
-	  service.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* md1format.xml,
-	  MonoDevelop.Deployment.Targets/BaseFuseFileCopyConfiguration.cs,
-	  MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/LocalFileCopyConfiguration.cs,
-	  MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs,
-	  MonoDevelop.Deployment/DeployService.cs,
-	  MonoDevelop.Deployment/FileCopyConfiguration.cs,
-	  MonoDevelop.Deployment/InstallResolver.cs,
-	  MonoDevelop.Deployment/MD1Serializer.cs,
-	  MonoDevelop.Deployment/Package.cs,
-	  MonoDevelop.Deployment/PackageBuilder.cs,
-	  MonoDevelop.Deployment/PackageCollection.cs,
-	  MonoDevelop.Deployment/PackagingProject.cs,
-	  MonoDevelop.Deployment/UnknownFileCopyConfiguration.cs,
-	  MonoDevelop.Deployment/UnknownPackageBuilder.cs: Moved
-	  serialization engine to MonoDevelop.Core. Use new syntax for
-	  specifying attribute scope.
-
-2008-06-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Add missing serializable type.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/DefaultDeployServiceExtension.cs,
-	  MonoDevelop.Deployment/DeployProjectServiceExtension.cs: Some
-	  parameter renames to make it more explicit that configuration names
-	  refer to solution configurations, not project configurations.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Bump MD version.
-
-2008-06-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Gui/DeployFileListWidget.cs,
-	  MonoDevelop.Deployment.Gui/DeployDirectoryInfoEditor.cs: Use the
-	  OnDestroyed event instead of Dispose, since with the latest changes
-	  in gtk#, Dispose is not called anymore when a widget is destroyed.
-
-2008-05-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/DeployProjectServiceExtension.cs: Don't deploy
-	  files if the build failed.
-
-2008-05-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs: Track api
-	  changes.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Merged the extension points for
-	  project and solution option panels into a single extension point. A
-	  single extension point will now be used for all kinds of items.
-	  Extension conditions can be used to make panels visible only for
-	  some specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/PackagingProject.cs,
-	  MonoDevelop.Deployment/DeployProjectServiceExtension.cs,
-	  MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs:
-	  Replaced ICompilerResult/DefaultCompilerResult/CompilerResults by a
-	  new BuildResult class, which has owner information at error level,
-	  so it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml,
-	  MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs,
-	  MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs,
-	  MonoDevelop.Deployment.mdp,
-	  MonoDevelop.Deployment/MD1Serializer.cs,
-	  MonoDevelop.Deployment/PackagingProject.cs,
-	  MonoDevelop.Deployment/DeployService.cs,
-	  MonoDevelop.Deployment/DefaultDeployServiceExtension.cs,
-	  MonoDevelop.Deployment/UnknownPackageBuilder.cs,
-	  MonoDevelop.Deployment/InstallResolver.cs,
-	  MonoDevelop.Deployment/IDeployable.cs,
-	  MonoDevelop.Deployment/DeployFile.cs,
-	  MonoDevelop.Deployment/DeployProjectServiceExtension.cs,
-	  MonoDevelop.Deployment/PackageBuilder.cs,
-	  MonoDevelop.Deployment/DeployServiceExtension.cs,
-	  MonoDevelop.Deployment.Commands/Commands.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.Deployment.Gui/DeployDialog.cs,
-	  MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/EditPackageDialog.cs,
-	  MonoDevelop.Deployment.Gui/InstallDialog.cs,
-	  MonoDevelop.Deployment.Gui/EntrySelectionTree.cs,
-	  MonoDevelop.Deployment.Gui/BinariesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/DeployFileListWidget.cs,
-	  MonoDevelop.Deployment.Gui/DeployOperations.cs,
-	  MonoDevelop.Deployment.Gui/PackagingFeature.cs,
-	  MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs, Makefile.am,
-	  md1format.xml,
-	  MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs: New
-	  project model changes.
-
-2008-05-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Removed obsolete attributes.
-
-2008-04-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment.Targets/LocalFileCopyHandler.cs: Remove extra
-	  copy operation, thereby avoiding re-copying entire file every 1 kb,
-	  and vastly improving performance on large files. Thanks to
-	  firegrass on #MonoDevelop IRC for catching this bug.
-
-2008-03-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs: Message
-	  service is no longer GUI-thread synched, so handle that here
-	  instead.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs,
-	  MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs, gtk-gui/gui.stetic,
-	  MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs,
-	  MonoDevelop.Deployment.Gui/DeployDialog.cs,
-	  MonoDevelop.Deployment.Gui/EditPackageDialog.cs: Worked on gnome hig
-	  compliant alerts.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Deployment.mdp, Makefile.am: Removed some unused glade and
-	  gnome-sharp references (only the unused). But I'll continue to remove
-	  glade, we need to lower the dependency tree a bit.
-
-2008-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs,
-	  MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs:
-	  Handle the delete key in TreeViewPad, so it will work event if the
-	  shortcut is not defined.
-
-2008-02-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Structured main menu.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Update MD version.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/objects.xml, gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.Deployment.Gui/EditDeployTargetDialog.cs: Code cleanup.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Updated add-in category and description.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/PackagingProject.xpt.xml: Make template categories translatable.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.mdp: Updated project files. The order of extended
-	  properties won't change anymore.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs, gtk-gui/gui.stetic,
-	  MonoDevelop.Deployment.Gui/FileCopyConfigurationSelector.cs: FileCopy*
-	  classes need to be public.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml,
-	  MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs,
-	  MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs,
-	  MonoDevelop.Deployment.mdp, MonoDevelop.Deployment/DeployData.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EntrySelectionTree.cs,
-	  gtk-gui/objects.xml,
-	  gtk-gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs,
-	  gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.SshFuseFileCopyConfigurationEditorWidget.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.Deployment.Gui/SshFuseFileCopyConfigurationEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/LocalFileCopyConfigurationEditor.cs,
-	  MonoDevelop.Deployment.Gui/LocalFileCopyConfigurationEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/BinariesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/PackagingFeature.cs,
-	  MonoDevelop.Deployment.Gui/FileCopyConfigurationSelector.cs,
-	  MonoDevelop.Deployment.Gui/DeployDirectoryInfoEditor.cs,
-	  MonoDevelop.Deployment.Gui/CommandDeployEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs,
-	  MonoDevelop.Deployment.Gui/SshFuseFileCopyConfigurationEditor.cs,
-	  Makefile.am,
-	  MonoDevelop.Deployment.Targets/LocalFileCopyConfiguration.cs,
-	  MonoDevelop.Deployment.Targets/BaseFuseFileCopyConfiguration.cs,
-	  MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/LocalFileCopyHandler.cs,
-	  MonoDevelop.Deployment.Targets/BaseFuseFileCopyHandler.cs,
-	  MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/SshFuseFileCopyHandler.cs: API cleanup.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/DeployDirectoryNodeType.cs,
-	  MonoDevelop.Deployment/DeployPlatformNodeType.cs: Fix warning.
-	* gtk-gui/objects.xml, gtk-gui/gui.stetic: Updated.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml, MonoDevelop.Deployment.mdp,
-	  gtk-gui/gui.stetic, Makefile.am: Directory reorganization.
-
-2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/DeployDirectoryNodeType.cs,
-	  MonoDevelop.Deployment/DeployPlatformNodeType.cs: Make some attributes
-	  localizable.
-	* MonoDevelop.Deployment/PackageBuilder.cs: Added some null checks.
-	* gtk-gui/objects.xml: Updated.
-	* MonoDevelop.Deployment.Gui/EntrySelectionTree.cs: Avoid nullref when
-	  creating the project.
-	* MonoDevelop.Deployment.Gui/PackagingFeature.cs,
-	  MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs: Show the packaging
-	  feature widget when creating a new packaging project.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment/DeployContext.cs,
-	  MonoDevelop.Deployment.Targets/SshFuseFileCopyHandler.cs,
-	  MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs: Track LoggingService
-	  API changes.
-
-2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.Gui/DeployDialog.cs,
-	  MonoDevelop.Deployment.Gui/EntrySelectionTree.cs,
-	  MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs,
-	  MonoDevelop.Deployment/PackageBuilder.cs: Use RootCombine instead of
-	  CurrentOpenCombine when possible.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Bump MD version.
-
-2007-10-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml, MonoDevelop.Deployment.mdp,
-	  gtk-gui/objects.xml, Makefile.am, icons/packaging-project-16.png,
-	  icons/packaging-32.png, icons/packaging-16.png,
-	  icons/packaging-project-32.png, templates/PackagingProject.xpt.xml:
-	  Updated project icons. Use the base project icon with an overlay to show
-	  the type.
-	* MonoDevelop.Deployment.Gui/EntrySelectionTree.cs: Track api changes.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/objects.xml, gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs,
-	  gtk-gui/gui.stetic: Updated.
-	* MonoDevelop.Deployment.Gui/PackagingFeature.cs: Track api changes. Add
-	  description property.
-	* MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs: If the only option
-	  is to create a new packaging project, don't show a checkbox, a label is
-	  enough.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.mdp: Project file names updated by change in MD
-	  path functions.
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Deployment/InstallResolver.cs,
-	  MonoDevelop.Deployment/DeployFile.cs,
-	  MonoDevelop.Deployment/DeployProjectServiceExtension.cs,
-	  MonoDevelop.Deployment/PackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs: Applied
-	  changes that were neccassary for to the new FileService.
-
-2007-10-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml, MonoDevelop.Deployment.mdp,
-	  gtk-gui/objects.xml, gtk-gui/gui.stetic, Makefile.am: Updated.
-	* gtk-gui/MonoDevelop.Deployment.Gui.SshFuseFileCopyConfigurationEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/SshFuseFileCopyConfigurationEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/SshFuseFileCopyConfigurationEditor.cs: New
-	  widget for editing SSH FUSE copy config.
-	* MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs: Remove old code.
-	* MonoDevelop.Deployment.Gui/LocalFileCopyConfigurationEditor.cs,
-	  MonoDevelop.Deployment.Targets/LocalFileCopyConfiguration.cs,
-	  MonoDevelop.Deployment.Targets/BaseFuseFileCopyConfiguration.cs,
-	  MonoDevelop.Deployment.Targets/LocalFileCopyHandler.cs,
-	  MonoDevelop.Deployment.Targets/BaseFuseFileCopyHandler.cs: Base work to
-	  support FUSE file copiers.
-	* MonoDevelop.Deployment.Targets/SshFuseFileCopyHandler.cs: New file deploy
-	  handler that copies files over an SSH FUSE connection to a remote
-	  computer.
-
-2007-09-28  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Deployment.mdp,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EntrySelectionTree.cs,
-	  gtk-gui/objects.xml, gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs,
-	  gtk-gui/gui.stetic, Makefile.am: Updated.
-	* MonoDevelop.Deployment/DeployService.cs: Actually register to handle file
-	  copier extensions.
-	* MonoDevelop.Deployment/IFileCopyHandler.cs,
-	  MonoDevelop.Deployment/FileCopyHandler.cs: Pass DeployContext in
-	  CopyFiles operation so that directories can be resolved.
-	* MonoDevelop.Deployment/UnknownFileCopyConfiguration.cs: New
-	  FriendlyLocation property that specifies how the location should be
-	  shown to the user.
-	* MonoDevelop.Deployment/FileCopyConfiguration.cs: Implement
-	  FriendlyLocation. Track API change in CopyFiles.
-	* MonoDevelop.Deployment/IFileReplacePolicy.cs: Name FileReplaceMode = 0 as
-	  NotSet.
-	* gtk-gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs,
-	  MonoDevelop.Deployment.Gui/FileCopyConfigurationSelector.cs: Make
-	  public.
-	* gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs,
-	  MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs,
-	  MonoDevelop.Deployment.Gui/FileReplaceDialog.cs: Much, much better
-	  dialog IFileReplacePolicy implementation.
-	* MonoDevelop.Deployment.Targets/LocalFileCopyConfiguration.cs: Implement
-	  FriendlyLocation. Make TargetLocation virtual so that inheriting classes
-	  can override it in order that it's handled correctly by the
-	  LocalFileCopyHandler.
-	* MonoDevelop.Deployment.Targets/LocalFileCopyHandler.cs: Update handler so
-	  it can report progress to monitor, and also gives much better feedback
-	  on problems. Use DeployContext to look up target directories.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml, gtk-gui/gui.stetic: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.PackagingFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.InstallDialog.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.CommandDeployEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EntrySelectionTree.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.LocalFileCopyConfigurationEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs: Regenerated gui
-	  files.
-
-2007-09-15  Andrés G. Aragoneses <knocte@gmail.com>
-
-	* gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs:
-	* gtk-gui/gui.stetic: Don't translate "page#" texts.
-
-2007-09-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Cosmetic fix in command label.
-
-2007-08-23  Marcos David Marín Amador <MarcosMarin@gmail.com>
-
-	* MonoDevelop.Deployment/InstallResolver.cs: Added support for
-	  targets Include and IncludeRoot.
-
-	* MonoDevelop.Deployment/TargetDirectory.cs: Added targets Include
-	  and IncludeRoot.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Removed the CommandService class.
-	  Everything is done directly with CommandManager. Moved all extension
-	  node types to MD.Components.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml,
-	  MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs,
-	  MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs,
-	  MonoDevelop.Deployment.mdp, MonoDevelop.Deployment/DeployService.cs,
-	  gtk-gui/objects.xml,
-	  MonoDevelop.Deployment.Gui/FileCopyConfigurationSelector.cs,
-	  MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs, Makefile.am:
-	  Reorganized the extension point hierarchy. Embedded all add-in manifests
-	  as resources.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs,
-	  MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs:
-	  Converted DispatchService to a static class.
-
-2007-07-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/DeployContext.cs: Fix build.
-
-2007-07-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/DeployContext.cs,
-	  MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs: Use the log
-	  service for logging errors.
-
-2007-07-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/InstallResolver.cs,
-	  MonoDevelop.Deployment/DeployFile.cs,
-	  MonoDevelop.Deployment/DeployProperties.cs,
-	  MonoDevelop.Deployment.Gui/PropertyProvider.cs: Added property for
-	  specifying the attributes that the deployed file will have.
-	* gtk-gui/objects.xml, gtk-gui/gui.stetic: Updated.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/objects.xml,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs,
-	  gtk-gui/gui.stetic: Updated.
-
-2007-06-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/objects.xml, gtk-gui/gui.stetic: Updated.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Deployment.Gui.FileCopyConfigurationSelector.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.PackagingFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.InstallDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.CommandDeployEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EntrySelectionTree.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.LocalFileCopyConfigurationEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.BinariesZipEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.SourcesZipEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs: Made
-	  private gui components internal.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/DeployService.cs: Handle add-in unloading.
-	* gtk-gui/gui.stetic, MonoDevelop.Deployment.Gui/DeployDialog.cs,
-	  MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/EditPackageDialog.cs,
-	  MonoDevelop.Deployment.Gui/InstallDialog.cs,
-	  MonoDevelop.Deployment.Gui/EntrySelectionTree.cs,
-	  MonoDevelop.Deployment.Gui/LocalFileCopyConfigurationEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/BinariesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/DeployFileListWidget.cs,
-	  MonoDevelop.Deployment.Gui/FileCopyConfigurationSelector.cs,
-	  MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs,
-	  MonoDevelop.Deployment.Gui/CommandDeployEditorWidget.cs: Made gui
-	  classes internal.
-
-2007-05-22  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.Deployment.Gui/DeployOperations.cs (Install):
-	Destroy dialog in finally block.
-	(ShowPackageSettings): Likewise.
-
-2007-05-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Register the new property.
-
-2007-05-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/DeployProperties.cs: Added
-	  UseProjecRelativePath property. When set, the file will be deployed
-	  to the same relative path it has in the project.
-	* MonoDevelop.Deployment.Gui/PropertyProvider.cs: Use a custom type
-	  descriptor. Disable the deploy properties when the file is not set
-	  for deployment.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.mdp: Don't copy project references.
-
-2007-05-10  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.Deployment.mdp: Add MonoDevelop.Deployment.addin.xml
-	  back to the file list, but exclude from makefile synching.
-
-2007-05-09  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.Deployment/Makefile.am: Eliminate duplication of 
-	MonoDevelop.Deployment.addin.xml target.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml: Added missing dependency.
-	* MonoDevelop.Deployment.mdp, Makefile.am: Reference shared assemblies
-	  from the correct location.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/DeployProjectServiceExtension.cs: Avoid
-	  copying files when the target destination is the same file.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml, MonoDevelop.Deployment.mdp,
-	  MonoDevelop.Deployment/DeployService.cs,
-	  MonoDevelop.Deployment/DeployDirectoryNodeType.cs,
-	  MonoDevelop.Deployment/DeployPlatformNodeType.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.InstallDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.Deployment.Gui/FileCopyConfigurationSelector.cs,
-	  MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs, Makefile.am:
-	  Migration to Mono.Addins.
-
-2007-04-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml, MonoDevelop.Deployment.mdp,
-	  MonoDevelop.Deployment/DeployService.cs,
-	  MonoDevelop.Deployment/DeployProjectServiceExtension.cs,
-	  Makefile.am: After building a project, copy to the output directory
-	  all files marked with the deploy flag.
-	* MonoDevelop.Deployment/DefaultDeployServiceExtension.cs: Rename
-	  app.config files to <assembly-name>.config when deploying.
-
-2007-04-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/PackageBuilder.cs: Avoid including duplicated
-	  entries to the package builder.
-	* MonoDevelop.Deployment.Gui/DeployDialog.cs: Minor fix.
-	* MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs: Properly select
-	  the default format (comparison is done now by name, since the file
-	  formant instances may be different).
-	* MonoDevelop.Deployment.Gui/EntrySelectionTree.cs: Don't explicitely
-	  exclude PackagingProjects. The package builders will do it.
-	* MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs: Include the
-	  parent combine in new packages.
-	* MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs: Don't
-	  allow including PackagingProjects in the archive. Compile the
-	  project before generating the package.
-	* MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs: Use the
-	  file format of the source project by default.
-
-2007-04-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.addin.xml,
-	  gtk-gui/MonoDevelop.Deployment.Gui.PackagingFeatureWidget.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.Deployment.Gui/PackagingFeature.cs,
-	  MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs: Implemented a
-	  project feature which allows creating packages for new projects.
-	* MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs: Show the
-	  package type name if it is different from the package name.
-	* MonoDevelop.Deployment.mdp, Makefile.am: Added new files.
-	* MonoDevelop.Deployment/DeployService.cs: Added method for getting the
-	  extension of an archive.
-	* MonoDevelop.Deployment/PackageBuilder.cs: Added DefaultName and
-	  CreateDefaultBuilders(). Implemented method for add-in new combine
-	  entries to the builder.
-	* gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/objects.xml: Updated.
-	* MonoDevelop.Deployment.Gui/DeployDialog.cs: Minor fixes.
-	* MonoDevelop.Deployment.Gui/EntrySelectionTree.cs: Moved common
-	  combine selection code to PackageBuilder.
-	* MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs:
-	  Implemented DefaultName and CreateDefaultBuilders().
-	* BinariesZipEditorWidget.cs: Moved to GUI directory.
-
-2007-04-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment/PackagingProject.cs,
-	  MonoDevelop.Deployment.Commands/Commands.cs: Provide the package
-	  name when creating a new package.
-	* MonoDevelop.Deployment/DeployService.cs: In GetDeployFiles, remove
-	  files excluded by the deploy context.
-	* MonoDevelop.Deployment/DefaultDeployServiceExtension.cs: Clone the
-	  file list returned by IDeployable, since the list is going to be
-	  modified.
-	* MonoDevelop.Deployment/DeployFile.cs: Added copy constructor.
-	* MonoDevelop.Deployment/DeployContext.cs: Added method which allows
-	  filtering the deploy file list.
-	* MonoDevelop.Deployment/PackageBuilder.cs: Added property which allows
-	  specifying files which have to be excluded from the package. If a
-	  combine is open in the IDE, try to get combine entries to package
-	  from it.
-	* MonoDevelop.Deployment/DeployProperties.cs: TargetDirectory now
-	  returns ProgramFiles by default.
-	* gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs: Removed the
-	  Add button.
-	* gtk-gui/objects.xml: Updated.
-	* gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.Deployment.Gui/EditPackageDialog.cs,
-	  MonoDevelop.Deployment.Gui/EntrySelectionTree.cs: Added a page for
-	  selecting the combine entries to deploy.
-	* MonoDevelop.Deployment.Gui/DeployFileListWidget.cs: Allow selecting
-	  the files to deploy.
-	* MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs: Track
-	  api changes.
-	* MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs: Source
-	  package don't need a deploy context.
-
-2007-04-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Deployment.mdp, Makefile.am: Updated.
-	* MonoDevelop.Deployment/PackagingProject.cs,
-	  MonoDevelop.Deployment/Package.cs,
-	  MonoDevelop.Deployment/PackageBuilder.cs: Store the path to the
-	  entry to package in the package builder. Allow specifying a list of
-	  child entries to be included in the package, in this way it is
-	  possible to create packages which include only some of the
-	  projects.
-	* MonoDevelop.Deployment/DeployService.cs,
-	  MonoDevelop.Deployment/DeployServiceExtension.cs,
-	  MonoDevelop.Deployment.Commands/Commands.cs,
-	  MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs,
-	  MonoDevelop.Deployment.Gui/IPackageBuilderEditor.cs,
-	  MonoDevelop.Deployment.Gui/PackageBuilderEditor.cs,
-	  MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs,
-	  MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs: The
-	  combine entry to package (and the child entries to include) are now
-	  part of the package builder configuration.
-	* MonoDevelop.Deployment/DefaultDeployServiceExtension.cs: Provide the
-	  source project in the deploy file constructor.
-	* MonoDevelop.Deployment/UnknownPackageBuilder.cs,
-	  MonoDevelop.Deployment/InstallResolver.cs,
-	  BinariesZipEditorWidget.cs: Track api changes.
-	* MonoDevelop.Deployment/DeployFile.cs: Added SourceCombineEntry, which
-	  returns the combine entry which generated this file, and
-	  DisplayName, which is a descriptive name of the file.
-	* gtk-gui/MonoDevelop.Deployment.Gui.InstallDialog.cs,
-	  gtk-gui/MonoDevelop.Deployment.DeployFileListWidget.cs,
-	  gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs,
-	  gtk-gui/objects.xml,
-	  gtk-gui/MonoDevelop.Deployment.Gui.EditPackageDialog.cs,
-	  gtk-gui/gui.stetic: Implemented new deploy file list widget.
-	  Changed order of steps in the package creation wizard.
-	* MonoDevelop.Deployment.Gui/DeployDialog.cs: Changed the order of some
-	  steps. The first step is now selecting the package type, and the
-	  second step is selecting the projects/solutions to include in the
-	  package.
-	* MonoDevelop.Deployment.Gui/EditPackageDialog.cs,
-	  MonoDevelop.Deployment.Gui/DeployFileListWidget.cs: Added a new
-	  view which shows the list of files to be deployed.
-	* MonoDevelop.Deployment.Gui/EntrySelectionTree.cs: Allow selecting
-	  multiple projects/solutions.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com>
-
-	New deployment add-in. Some classes have been moved from MonoDevelop.Projects.
-
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs
index 0664524e34..175c6b5905 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs
@@ -18,7 +18,7 @@ namespace MonoDevelop.Deployment
 	{
 		protected override void Run ()
 		{
-			SolutionItem entry = IdeApp.ProjectOperations.CurrentSelectedSolutionItem;
+			SolutionFolderItem entry = IdeApp.ProjectOperations.CurrentSelectedSolutionItem;
 			DeployDialog dlg = new DeployDialog (entry, false);
 			try {
 				if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
@@ -33,11 +33,11 @@ namespace MonoDevelop.Deployment
 							project.FileName = Path.Combine (dlg.NewProjectSolution.BaseDirectory, project.Name + ".mdse");
 							project.Packages.Add (p);
 							dlg.NewProjectSolution.Items.Add (project);
-							IdeApp.ProjectOperations.Save (dlg.NewProjectSolution.ParentSolution);
+							IdeApp.ProjectOperations.SaveAsync (dlg.NewProjectSolution.ParentSolution);
 						}
 						else {
 							dlg.ExistingPackagingProject.Packages.Add (p);
-							IdeApp.ProjectOperations.Save (dlg.ExistingPackagingProject);
+							IdeApp.ProjectOperations.SaveAsync (dlg.ExistingPackagingProject);
 						}
 					}
 					Package pkg = new Package (dlg.PackageBuilder);
@@ -64,7 +64,7 @@ namespace MonoDevelop.Deployment
 			try {
 				if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
 					project.AddPackage (dlg.NewPackageName, dlg.PackageBuilder);
-					IdeApp.ProjectOperations.Save (project);
+					IdeApp.ProjectOperations.SaveAsync (project);
 				}
 			} finally {
 				dlg.Destroy ();
@@ -82,7 +82,7 @@ namespace MonoDevelop.Deployment
 	{
 		protected override void Run ()
 		{
-			SolutionItem entry = IdeApp.ProjectOperations.CurrentSelectedSolutionItem;
+			SolutionFolderItem entry = IdeApp.ProjectOperations.CurrentSelectedSolutionItem;
 			DeployOperations.Install (entry, IdeApp.Workspace.ActiveConfiguration);
 		}
 		
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDialog.cs
index 7fa3039562..4fbe017f7b 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployDialog.cs
@@ -7,6 +7,7 @@ using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Components;
+using System.Linq;
 
 namespace MonoDevelop.Deployment.Gui
 {
@@ -16,11 +17,11 @@ namespace MonoDevelop.Deployment.Gui
 		List<PackageBuilder> builders = new List<PackageBuilder> ();
 		PackageBuilder currentBuilder;
 		Gtk.Widget currentEditor;
-		ReadOnlyCollection<SolutionFolder> combineList;
-		ReadOnlyCollection<PackagingProject> projectsList;
-		SolutionItem defaultEntry;
+		List<SolutionFolder> combineList;
+		List<PackagingProject> projectsList;
+		SolutionFolderItem defaultEntry;
 		
-		public DeployDialog (SolutionItem defaultEntry, bool createBuilderOnly)
+		public DeployDialog (SolutionFolderItem defaultEntry, bool createBuilderOnly)
 		{
 			this.Build();
 			notebook.ShowTabs = false;
@@ -104,7 +105,7 @@ namespace MonoDevelop.Deployment.Gui
 		{
 			// Fill the combine list
 			int n=0, sel=-1;
-			combineList = IdeApp.ProjectOperations.CurrentSelectedSolution.GetAllSolutionItems<SolutionFolder> ();
+			combineList = IdeApp.ProjectOperations.CurrentSelectedSolution.GetAllItems<SolutionFolder> ().ToList ();
 			foreach (SolutionFolder c in combineList) {
 				string name = c.Name;
 				SolutionFolder co = c;
@@ -121,7 +122,7 @@ namespace MonoDevelop.Deployment.Gui
 				comboCreateProject.Active = 0;
 			
 			// Fill the packaging project list
-			projectsList = IdeApp.ProjectOperations.CurrentSelectedSolution.GetAllSolutionItems<PackagingProject> ();
+			projectsList = IdeApp.ProjectOperations.CurrentSelectedSolution.GetAllItems<PackagingProject> ().ToList();
 			if (projectsList.Count == 0) {
 				radioAddProject.Sensitive = false;
 			}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
index be535a78bc..d3ee220353 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
@@ -3,14 +3,15 @@ using System.Collections;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Projects;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Deployment.Gui
 {
 	public static class DeployOperations
 	{
-		public static void Install (SolutionItem entry, ConfigurationSelector configuration)
+		public static void Install (SolutionFolderItem entry, ConfigurationSelector configuration)
 		{
-			using (IProgressMonitor mon = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor ()) {
+			using (ProgressMonitor mon = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor ()) {
 				InstallDialog dlg = new InstallDialog (entry);
 				try {
 					if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok)
@@ -22,36 +23,29 @@ namespace MonoDevelop.Deployment.Gui
 			}
 		}
 		
-		public static IAsyncOperation BuildPackages (PackagingProject project)
+		public static Task BuildPackages (PackagingProject project)
 		{
 			return BuildPackages (project.Packages);
 		}
 		
-		static IAsyncOperation BuildPackages (ICollection packages)
+		static async Task BuildPackages (ICollection packages)
 		{
-			IProgressMonitor mon = IdeApp.Workbench.ProgressMonitors.GetToolOutputProgressMonitor (true);
+			ProgressMonitor mon = IdeApp.Workbench.ProgressMonitors.GetToolOutputProgressMonitor (true);
 
 			// Run the deploy command in a background thread to avoid
 			// deadlocks with the gui thread
 			
-			System.Threading.Thread t = new System.Threading.Thread (
-				delegate () {
-				using (mon) {
-					mon.BeginTask ("Creating packages", packages.Count);
-					foreach (Package p in packages) {
-						DeployService.BuildPackage (mon, p);
-						mon.Step (1);
-					}
-					mon.EndTask ();
+			using (mon) {
+				mon.BeginTask ("Creating packages", packages.Count);
+				foreach (Package p in packages) {
+					await DeployService.BuildPackage (mon, p);
+					mon.Step (1);
 				}
-			});
-			t.IsBackground = true;
-			t.Start ();
-
-			return mon.AsyncOperation;
+				mon.EndTask ();
+			}
 		}
 		
-		public static IAsyncOperation BuildPackage (Package package)
+		public static Task BuildPackage (Package package)
 		{
 			return BuildPackages (new object[] { package });
 		}
@@ -60,7 +54,7 @@ namespace MonoDevelop.Deployment.Gui
 		{
 			using (EditPackageDialog dlg = new EditPackageDialog (package)) {
 				if (MessageService.ShowCustomDialog (dlg) == (int)Gtk.ResponseType.Ok)
-					IdeApp.ProjectOperations.Save (package.ParentProject);
+					IdeApp.ProjectOperations.SaveAsync (package.ParentProject);
 			}
 		}
 	}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs
index 3d9f2fda4e..1552b656cb 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs
@@ -27,7 +27,7 @@
 //
 
 using System;
-
+using MonoDevelop.Core;
 using MonoDevelop.Deployment;
 using MonoDevelop.Ide;
 
@@ -58,10 +58,10 @@ namespace MonoDevelop.Deployment.Gui
 			
 			//IFileReplacePolicy is not likely to be running in the GUI thread
 			//so use some DispatchService magic to synchronously call the dialog in the GUI thread
-			DispatchService.GuiSyncDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				using (var dialog = new FileReplaceDialog (response, source, sourceModified.ToString (), target, targetModified.ToString ()))
 					response = (FileReplaceDialog.ReplaceResponse) MessageService.ShowCustomDialog (dialog);
-			});
+			}).Wait ();
 			
 			switch (response) {
 			case FileReplaceDialog.ReplaceResponse.Replace:
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EditPackageDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EditPackageDialog.cs
index 7c2b81062e..58049d30d0 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EditPackageDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EditPackageDialog.cs
@@ -54,7 +54,7 @@ namespace MonoDevelop.Deployment.Gui
 
 		protected virtual void OnEntrySelectorSelectionChanged(object sender, System.EventArgs e)
 		{
-			SolutionItem ce = entrySelector.GetSelectedEntry ();
+			SolutionFolderItem ce = entrySelector.GetSelectedEntry ();
 			if (ce != null)
 				target.SetSolutionItem (ce, entrySelector.GetSelectedChildren ());
 		}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EntrySelectionTree.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EntrySelectionTree.cs
index d5e531f3b8..662d2da34f 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EntrySelectionTree.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/EntrySelectionTree.cs
@@ -7,6 +7,7 @@ using System.Collections.ObjectModel;
 using MonoDevelop.Ide;
 using MonoDevelop.Projects;
 using MonoDevelop.Components;
+using System.Linq;
 
 namespace MonoDevelop.Deployment.Gui
 {
@@ -15,7 +16,7 @@ namespace MonoDevelop.Deployment.Gui
 	internal partial class EntrySelectionTree : Gtk.Bin
 	{
 		TreeStore store;
-		Dictionary<SolutionItem,SolutionItem> selectedEntries = new Dictionary<SolutionItem,SolutionItem> ();
+		Dictionary<SolutionFolderItem,SolutionFolderItem> selectedEntries = new Dictionary<SolutionFolderItem,SolutionFolderItem> ();
 		PackageBuilder builder;
 		Solution solution;
 		
@@ -44,13 +45,13 @@ namespace MonoDevelop.Deployment.Gui
 			tree.AppendColumn (col);
 		}
 		
-		public void Fill (PackageBuilder builder, SolutionItem selection)
+		public void Fill (PackageBuilder builder, SolutionFolderItem selection)
 		{
 			store.Clear ();
 			
 			this.builder = builder;
 			if (selection is SolutionFolder) {
-				foreach (SolutionItem e in ((SolutionFolder)selection).GetAllItems ()) {
+				foreach (SolutionFolderItem e in ((SolutionFolder)selection).GetAllItems ()) {
 					if (builder.CanBuild (e))
 						selectedEntries [e] = e;
 				}
@@ -64,17 +65,15 @@ namespace MonoDevelop.Deployment.Gui
 			else {
 				solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
 				if (solution == null) {
-					ReadOnlyCollection<Solution> items = IdeApp.ProjectOperations.CurrentSelectedWorkspaceItem.GetAllSolutions ();
-					if (items.Count > 0)
-						solution = items [0];
-					else
+					solution = IdeApp.ProjectOperations.CurrentSelectedWorkspaceItem.GetAllItems<Solution> ().FirstOrDefault();
+					if (solution == null)
 						return;
 				}
 			}
 			AddEntry (TreeIter.Zero, solution.RootFolder);
 		}
 		
-		void AddEntry (TreeIter iter, SolutionItem entry)
+		void AddEntry (TreeIter iter, SolutionFolderItem entry)
 		{
 			string icon;
 			if (entry.ParentFolder == null)
@@ -101,49 +100,49 @@ namespace MonoDevelop.Deployment.Gui
 				tree.ExpandToPath (store.GetPath (iter));
 			
 			if (entry is SolutionFolder) {
-				foreach (SolutionItem ce in ((SolutionFolder)entry).Items) {
+				foreach (SolutionFolderItem ce in ((SolutionFolder)entry).Items) {
 					AddEntry (iter, ce);
 				}
 			}
 		}
 		
-		public void SetSelection (SolutionItem rootEntry, SolutionItem[] childEntries)
+		public void SetSelection (SolutionFolderItem rootEntry, SolutionFolderItem[] childEntries)
 		{
 			selectedEntries.Clear ();
 			selectedEntries [rootEntry] = rootEntry;
-			foreach (SolutionItem e in childEntries)
+			foreach (SolutionFolderItem e in childEntries)
 				selectedEntries [e] = e;
 			UpdateSelectionChecks (TreeIter.Zero, true);
 		}
 		
-		public SolutionItem GetSelectedEntry ()
+		public SolutionFolderItem GetSelectedEntry ()
 		{
 			return GetCommonSolutionItem ();
 		}
 		
-		public SolutionItem[] GetSelectedChildren ()
+		public SolutionFolderItem[] GetSelectedChildren ()
 		{
 			// The first entry is the root entry
-			SolutionItem common = GetCommonSolutionItem ();
+			SolutionFolderItem common = GetCommonSolutionItem ();
 			if (common == null)
 				return null;
 			ArrayList list = new ArrayList ();
-			foreach (SolutionItem e in selectedEntries.Keys)
+			foreach (SolutionFolderItem e in selectedEntries.Keys)
 				if (e != common)
 					list.Add (e);
-			return (SolutionItem[]) list.ToArray (typeof(SolutionItem));
+			return (SolutionFolderItem[]) list.ToArray (typeof(SolutionFolderItem));
 		}
 		
 		void OnToggled (object sender, Gtk.ToggledArgs args)
 		{
 			TreeIter iter;
 			store.GetIterFromString (out iter, args.Path);
-			SolutionItem ob = (SolutionItem) store.GetValue (iter, 2);
+			SolutionFolderItem ob = (SolutionFolderItem) store.GetValue (iter, 2);
 			if (selectedEntries.ContainsKey (ob)) {
 				selectedEntries.Remove (ob);
 				store.SetValue (iter, 3, false);
 				if (ob is SolutionFolder) {
-					foreach (SolutionItem e in ((SolutionFolder)ob).GetAllItems ())
+					foreach (SolutionFolderItem e in ((SolutionFolder)ob).GetAllItems ())
 						selectedEntries.Remove (e);
 					UpdateSelectionChecks (TreeIter.Zero, false);
 				}
@@ -151,13 +150,13 @@ namespace MonoDevelop.Deployment.Gui
 				selectedEntries [ob] = ob;
 				store.SetValue (iter, 3, true);
 				if (ob is SolutionFolder) {
-					foreach (SolutionItem e in ((SolutionFolder)ob).GetAllItems ()) {
+					foreach (SolutionFolderItem e in ((SolutionFolder)ob).GetAllItems ()) {
 						if (builder.CanBuild (e))
 							selectedEntries [e] = e;
 					}
 					UpdateSelectionChecks (TreeIter.Zero, false);
 				}
-				SelectCommonCombine ((SolutionItem)ob);
+				SelectCommonCombine ((SolutionFolderItem)ob);
 			}
 			if (SelectionChanged != null)
 				SelectionChanged (this, EventArgs.Empty);
@@ -174,7 +173,7 @@ namespace MonoDevelop.Deployment.Gui
 					return;
 			}
 			do {
-				bool sel = selectedEntries.ContainsKey ((SolutionItem) store.GetValue (iter, 2));
+				bool sel = selectedEntries.ContainsKey ((SolutionFolderItem) store.GetValue (iter, 2));
 				store.SetValue (iter, 3, sel);
 				if (sel)
 					tree.ExpandToPath (store.GetPath (iter));
@@ -183,16 +182,16 @@ namespace MonoDevelop.Deployment.Gui
 			while (store.IterNext (ref iter));
 		}
 		
-		void SelectCommonCombine (SolutionItem e)
+		void SelectCommonCombine (SolutionFolderItem e)
 		{
-			SolutionItem common = GetCommonSolutionItem ();
+			SolutionFolderItem common = GetCommonSolutionItem ();
 			if (common == null)
 				return;
 			selectedEntries [common] = common;
-			SolutionItem[] entries = new SolutionItem [selectedEntries.Count];
+			SolutionFolderItem[] entries = new SolutionFolderItem [selectedEntries.Count];
 			selectedEntries.Keys.CopyTo (entries, 0);
-			foreach (SolutionItem se in entries) {
-				SolutionItem ce = se;
+			foreach (SolutionFolderItem se in entries) {
+				SolutionFolderItem ce = se;
 				while (ce != null && ce != common) {
 					selectedEntries [ce] = ce;
 					ce = ce.ParentFolder;
@@ -201,7 +200,7 @@ namespace MonoDevelop.Deployment.Gui
 			UpdateSelectionChecks (TreeIter.Zero, false);
 		}
 		
-		SolutionItem GetCommonSolutionItem ()
+		SolutionFolderItem GetCommonSolutionItem ()
 		{
 			return PackageBuilder.GetCommonSolutionItem (selectedEntries.Keys);
 		}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/InstallDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/InstallDialog.cs
index 921eab2bb2..e82e53a0d9 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/InstallDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/InstallDialog.cs
@@ -6,7 +6,7 @@ namespace MonoDevelop.Deployment.Gui
 {
 	internal partial class InstallDialog : Gtk.Dialog
 	{
-		public InstallDialog (SolutionItem entry)
+		public InstallDialog (SolutionFolderItem entry)
 		{
 			this.Build();
 			nameEntry.Text = entry.Name;
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs
index 75a45746c2..9f3b43045b 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/PackagingFeatureWidget.cs
@@ -4,6 +4,7 @@ using System.Collections;
 using System.Collections.ObjectModel;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
+using System.Linq;
 
 namespace MonoDevelop.Deployment.Gui
 {
@@ -11,22 +12,22 @@ namespace MonoDevelop.Deployment.Gui
 	[System.ComponentModel.ToolboxItem(true)]
 	internal partial class PackagingFeatureWidget : Gtk.Bin
 	{
-		SolutionItem entry;
+		SolutionFolderItem entry;
 		SolutionFolder parentFolder;
 		ArrayList packages = new ArrayList ();
 		PackagingProject newPackProject;
 		bool creatingPackProject;
 		
-		public PackagingFeatureWidget (SolutionFolder parentFolder, SolutionItem entry)
+		public PackagingFeatureWidget (SolutionFolder parentFolder, SolutionFolderItem entry)
 		{
 			this.Build();
 			this.entry = entry;
 			this.parentFolder = parentFolder;
-			
+
 			creatingPackProject = entry is PackagingProject;
 			
 			if (!creatingPackProject) {
-				ReadOnlyCollection<PackagingProject> packProjects = parentFolder.ParentSolution.GetAllSolutionItems<PackagingProject> ();
+				var packProjects = parentFolder.ParentSolution.GetAllItems<PackagingProject> ().ToList ();
 				newPackProject = new PackagingProject ();
 			
 				string label = GettextCatalog.GetString ("Create packages for this project in a new Packaging Project");
@@ -146,12 +147,12 @@ namespace MonoDevelop.Deployment.Gui
 				if (creatingPackProject) {
 					pb.SetSolutionItem (parentFolder.ParentSolution.RootFolder);
 					// Add all compatible projects
-					foreach (SolutionItem e in parentFolder.ParentSolution.GetAllSolutionItems ()) {
+					foreach (SolutionFolderItem e in parentFolder.ParentSolution.GetAllSolutionItems ()) {
 						if (pb.CanBuild (e))
 							pb.AddEntry (e);
 					}
 				} else {
-					pb.SetSolutionItem (parentFolder, new SolutionItem [] { entry });
+					pb.SetSolutionItem (parentFolder, new SolutionFolderItem [] { entry });
 				}
 				
 				PackageBuilder[] defp = pb.CreateDefaultBuilders ();
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs
index 11422d8478..fd428d98ef 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs
@@ -4,6 +4,8 @@ using System.Collections;
 using System.IO;
 using MonoDevelop.Projects;
 using MonoDevelop.Deployment.Targets;
+using MonoDevelop.Projects.MSBuild;
+using System.Linq;
 
 namespace MonoDevelop.Deployment.Gui
 {
@@ -11,20 +13,20 @@ namespace MonoDevelop.Deployment.Gui
 	[System.ComponentModel.ToolboxItem(true)]
 	internal partial class SourcesZipEditorWidget : Gtk.Bin
 	{
-		FileFormat[] formats;
+		MSBuildFileFormat[] formats;
 		SourcesZipPackageBuilder target;
 		bool loading;
 		
-		public SourcesZipEditorWidget (PackageBuilder target, FileFormat selectedFormat)
+		public SourcesZipEditorWidget (PackageBuilder target, MSBuildFileFormat selectedFormat)
 		{
 			this.Build();
 			this.target = (SourcesZipPackageBuilder) target;
 			loading = true;
 			
 			if (target.RootSolutionItem is SolutionFolder)
-				formats = Services.ProjectService.FileFormats.GetFileFormatsForObject (target.Solution);
+				formats = MSBuildFileFormat.GetSupportedFormats (target.Solution).ToArray ();
 			else
-				formats = Services.ProjectService.FileFormats.GetFileFormatsForObject (target.RootSolutionItem);
+				formats = MSBuildFileFormat.GetSupportedFormats ((SolutionItem)target.RootSolutionItem).ToArray ();
 			
 			if (selectedFormat == null) selectedFormat = this.target.FileFormat;
 			if (selectedFormat == null)
@@ -77,7 +79,7 @@ namespace MonoDevelop.Deployment.Gui
 			UpdateTarget ();
 		}
 		
-		public FileFormat Format {
+		public MSBuildFileFormat Format {
 			get { return formats [comboFormat.Active]; }
 		}
 		
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs
index 9ac26fb2c2..07ee6b9f76 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs
@@ -39,13 +39,6 @@ namespace MonoDevelop.Deployment.NodeBuilders
 {
 	internal class PackageNodeBuilder: TypeNodeBuilder
 	{
-		EventHandler configsChanged;
-		
-		public PackageNodeBuilder ()
-		{
-			configsChanged = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnConfigurationsChanged));
-		}
-		
 		public override Type CommandHandlerType {
 			get { return typeof(PackageNodeCommandHandler); }
 		}
@@ -81,13 +74,13 @@ namespace MonoDevelop.Deployment.NodeBuilders
 		public override void OnNodeAdded (object dataObject)
 		{
 			Package package = dataObject as Package;
-			package.Changed += configsChanged;
+			package.Changed += OnConfigurationsChanged;
 		}
 		
 		public override void OnNodeRemoved (object dataObject)
 		{
 			Package package = dataObject as Package;
-			package.Changed -= configsChanged;
+			package.Changed -= OnConfigurationsChanged;
 		}
 		
 		public void OnConfigurationsChanged (object sender, EventArgs args)
@@ -123,7 +116,7 @@ namespace MonoDevelop.Deployment.NodeBuilders
 			Package package = CurrentNode.DataItem as Package;
 			if (MessageService.AskQuestion (GettextCatalog.GetString ("Are you sure you want to delete the package '{0}'?", package.Name), AlertButton.Cancel, AlertButton.Delete) == AlertButton.Delete) {
 				package.ParentProject.Packages.Remove (package);
-				IdeApp.ProjectOperations.Save (package.ParentProject);
+				IdeApp.ProjectOperations.SaveAsync (package.ParentProject);
 			}
 		}
 		
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs
index 001fcccd4f..2bb36a5d35 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs
@@ -38,13 +38,6 @@ namespace MonoDevelop.Deployment.NodeBuilders
 {
 	internal class PackagingProjectNodeBuilder: TypeNodeBuilder
 	{
-		EventHandler configsChanged;
-		
-		public PackagingProjectNodeBuilder ()
-		{
-			configsChanged = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnConfigurationsChanged));
-		}
-		
 		public override Type CommandHandlerType {
 			get { return typeof(PackagingProjectNodeCommandHandler); }
 		}
@@ -72,9 +65,7 @@ namespace MonoDevelop.Deployment.NodeBuilders
 		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
 		{
 			PackagingProject project = dataObject as PackagingProject;
-				
-			foreach (Package p in project.Packages)
-				builder.AddChild (p);
+			builder.AddChildren (project.Packages);
 		}
 
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
@@ -86,13 +77,13 @@ namespace MonoDevelop.Deployment.NodeBuilders
 		public override void OnNodeAdded (object dataObject)
 		{
 			PackagingProject project = dataObject as PackagingProject;
-			project.PackagesChanged += configsChanged;
+			project.PackagesChanged += OnConfigurationsChanged;
 		}
 		
 		public override void OnNodeRemoved (object dataObject)
 		{
 			PackagingProject project = dataObject as PackagingProject;
-			project.PackagesChanged -= configsChanged;
+			project.PackagesChanged -= OnConfigurationsChanged;
 		}
 		
 		public void OnConfigurationsChanged (object sender, EventArgs args)
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/BaseFuseFileCopyHandler.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/BaseFuseFileCopyHandler.cs
index b93a173858..dfaca87060 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/BaseFuseFileCopyHandler.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/BaseFuseFileCopyHandler.cs
@@ -44,7 +44,7 @@ namespace MonoDevelop.Deployment.Targets
 			get { throw new NotImplementedException ("Inheriting classes must override this."); }
 		}
 		
-		public override void CopyFiles (IProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection deployFiles, DeployContext context)
+		public override void CopyFiles (ProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection deployFiles, DeployContext context)
 		{
 			DirectoryInfo tempDir = null;
 			try {
@@ -93,9 +93,9 @@ namespace MonoDevelop.Deployment.Targets
 				tempDir.Delete ();
 		}
 		
-		public abstract void MountTempDirectory (IProgressMonitor monitor, FileCopyConfiguration copyConfig, string tempPath);
+		public abstract void MountTempDirectory (ProgressMonitor monitor, FileCopyConfiguration copyConfig, string tempPath);
 		
-		protected void RunFuseCommand (IProgressMonitor monitor, string command, string args)
+		protected void RunFuseCommand (ProgressMonitor monitor, string command, string args)
 		{
 			LoggingService.LogInfo ("Running FUSE command: {0} {1}", command, args);
 			var log = new StringWriter ();
@@ -104,13 +104,12 @@ namespace MonoDevelop.Deployment.Targets
 				RedirectStandardOutput = true,
 				UseShellExecute = false,
 			};
-			using (var opMon = new AggregatedOperationMonitor (monitor)) {
-				using (var pWrapper = MonoDevelop.Core.Runtime.ProcessService.StartProcess (psi, log, log, null)) {
-					opMon.AddOperation (pWrapper);
-					pWrapper.WaitForOutput ();
-					if (pWrapper.ExitCode != 0)
-						throw new Exception (log.ToString ());
-				}
+
+			using (var pWrapper = Runtime.ProcessService.StartProcess (psi, log, log, null))
+			using (monitor.CancellationToken.Register (pWrapper.Cancel)) {
+				pWrapper.WaitForOutput ();
+				if (pWrapper.ExitCode != 0)
+					throw new Exception (log.ToString ());
 			}
 		}
 
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs
index b663c990b9..2149ea019b 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/BinariesZipPackageBuilder.cs
@@ -39,7 +39,7 @@ namespace MonoDevelop.Deployment.Targets
 			get { return "Archive of Binaries"; }
 		}
 		
-		public override void InitializeSettings (SolutionItem entry)
+		public override void InitializeSettings (SolutionFolderItem entry)
 		{
 			targetFile = Path.Combine (entry.BaseDirectory, entry.Name) + ".tar.gz";
 			if (entry.ParentSolution != null)
@@ -51,7 +51,7 @@ namespace MonoDevelop.Deployment.Targets
 			return configuration != null ? new string [] { configuration } : new string [0];
 		}
 		
-		public override bool CanBuild (SolutionItem entry)
+		public override bool CanBuild (SolutionFolderItem entry)
 		{
 			// Can build anything but PackagingProject
 			return !(entry is PackagingProject);
@@ -62,18 +62,21 @@ namespace MonoDevelop.Deployment.Targets
 			return new DeployContext (this, platform, null);
 		}
 		
-		protected override bool OnBuild (IProgressMonitor monitor, DeployContext ctx)
+		protected override bool OnBuild (ProgressMonitor monitor, DeployContext ctx)
 		{
 			string tmpFolder = null;
-			
+
 			try {
 				SolutionConfigurationSelector conf = (SolutionConfigurationSelector) configuration;
-				BuildResult res = RootSolutionItem.Build (monitor, conf);
-				if (res.ErrorCount > 0) {
-					foreach (BuildError e in res.Errors)
-						monitor.ReportError (e.ToString (), null);
-					monitor.ReportError (GettextCatalog.GetString ("The source project failed to build."), null);
-					return false;
+				var bt = RootSolutionItem as IBuildTarget;
+				if (bt != null) {
+					BuildResult res = bt.Build (monitor, conf).Result;
+					if (res.ErrorCount > 0) {
+						foreach (BuildError e in res.Errors)
+							monitor.ReportError (e.ToString (), null);
+						monitor.ReportError (GettextCatalog.GetString ("The source project failed to build."), null);
+						return false;
+					}
 				}
 				
 				tmpFolder = FileService.CreateTempDirectory ();
@@ -107,8 +110,7 @@ namespace MonoDevelop.Deployment.Targets
 				if (tmpFolder != null)
 					Directory.Delete (tmpFolder, true);
 			}
-			if (monitor.AsyncOperation.Success)
-				monitor.Log.WriteLine (GettextCatalog.GetString ("Created file: {0}", targetFile));
+			monitor.Log.WriteLine (GettextCatalog.GetString ("Created file: {0}", targetFile));
 			return true;
 		}
 		
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs
index 353331931a..d6e22cf712 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
+using System.Threading;
 
 namespace MonoDevelop.Deployment.Targets
 {
@@ -49,7 +50,7 @@ namespace MonoDevelop.Deployment.Targets
 		}
 		
 		public override string Icon {
-			get { return "gtk-execute"; }
+			get { return MonoDevelop.Ide.Gui.Stock.RunProgramIcon; }
 		}
 		
 		[ItemProperty]
@@ -88,12 +89,12 @@ namespace MonoDevelop.Deployment.Targets
 			}
 		}
 		
-		protected override bool OnBuild (IProgressMonitor monitor, DeployContext ctx)
+		protected override bool OnBuild (ProgressMonitor monitor, DeployContext ctx)
 		{
 			string consMsg;
-			IConsole cons;
+			OperationConsole cons;
 			if (ExternalConsole) {
-				cons = ExternalConsoleFactory.Instance.CreateConsole (CloseConsoleWhenDone);
+				cons = ExternalConsoleFactory.Instance.CreateConsole (CloseConsoleWhenDone, monitor.CancellationToken);
 				consMsg = GettextCatalog.GetString ("(in external terminal)");
 			} else {
 				cons = new MonitorConsole (monitor);
@@ -101,9 +102,9 @@ namespace MonoDevelop.Deployment.Targets
 			}
 			
 			monitor.Log.WriteLine (GettextCatalog.GetString ("Executing: {0} {1} {2}", Command, Arguments, consMsg));
-			IProcessAsyncOperation process = Runtime.ProcessService.StartConsoleProcess (Command, Arguments, workingDirectory, cons, null);
+			ProcessAsyncOperation process = Runtime.ProcessService.StartConsoleProcess (Command, Arguments, workingDirectory, cons);
 			
-			process.WaitForCompleted ();
+			process.Task.Wait ();
 			
 			if (cons is MonitorConsole) {
 				((MonitorConsole)cons).Dispose ();
@@ -112,29 +113,24 @@ namespace MonoDevelop.Deployment.Targets
 		}
 	}
 	
-	class MonitorConsole: IConsole
+	class MonitorConsole: OperationConsole
 	{
 		StringReader nullReader;
-		IProgressMonitor monitor;
+		ProgressMonitor monitor;
+		CancellationTokenRegistration tr;
 		
-		public MonitorConsole (IProgressMonitor monitor)
+		public MonitorConsole (ProgressMonitor monitor)
 		{
 			this.monitor = monitor;
-			monitor.CancelRequested += OnCancel;
+			tr = monitor.CancellationToken.Register (CancellationSource.Cancel);
 		}
 		
-		public void Dispose ()
+		public override void Dispose ()
 		{
-			monitor.CancelRequested -= OnCancel;
+			tr.Dispose ();
 		}
 		
-		void OnCancel (IProgressMonitor monitor)
-		{
-			if (CancelRequested != null)
-				CancelRequested (this, EventArgs.Empty);
-		}
-		
-		public TextReader In {
+		public override TextReader In {
 			get {
 				if (nullReader == null)
 					nullReader = new StringReader ("");
@@ -142,22 +138,16 @@ namespace MonoDevelop.Deployment.Targets
 			}
 		}
 		
-		public TextWriter Out {
+		public override TextWriter Out {
 			get { return monitor.Log; }
 		}
 		
-		public TextWriter Error {
+		public override TextWriter Error {
 			get { return monitor.Log; }
 		}
 		
-		public TextWriter Log {
+		public override TextWriter Log {
 			get { return Out; }
 		}
-		
-		public bool CloseOnDispose {
-			get { return false; }
-		}
-		
-		public event EventHandler CancelRequested;
 	}	
 }
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/LocalFileCopyHandler.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/LocalFileCopyHandler.cs
index f961d05edf..e143d62d39 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/LocalFileCopyHandler.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/LocalFileCopyHandler.cs
@@ -51,12 +51,12 @@ namespace MonoDevelop.Deployment.Targets
 			return new LocalFileCopyConfiguration ();
 		}
 		
-		public virtual void CopyFiles (IProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection deployFiles, DeployContext context)
+		public virtual void CopyFiles (ProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection deployFiles, DeployContext context)
 		{
 			InternalCopyFiles (monitor, replacePolicy, copyConfig, deployFiles, context, null);
 		}
 		
-		internal void InternalCopyFiles (IProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection deployFiles, DeployContext context, string realPrefix)
+		internal void InternalCopyFiles (ProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection deployFiles, DeployContext context, string realPrefix)
 		{
 			string targetDirectory = ((LocalFileCopyConfiguration) copyConfig).TargetDirectory;
 			
@@ -111,7 +111,7 @@ namespace MonoDevelop.Deployment.Targets
 			long carry = 0; 
 			monitor.BeginTask (copyConfig.FriendlyLocation, progressBarLength);
 			CopyReportCallback copyCallback = delegate (long bytes) {
-				if (monitor.IsCancelRequested)
+				if (monitor.CancellationToken.IsCancellationRequested)
 					return false;
 				int steps = (int) (bytes / stepSize);
 				carry += bytes % stepSize;
@@ -127,7 +127,7 @@ namespace MonoDevelop.Deployment.Targets
 			//now the actual copy
 			foreach (DeployFileConf file in files) {
 				//abort the copy if cancelling
-				if (monitor.IsCancelRequested)
+				if (monitor.CancellationToken.IsCancellationRequested)
 					break;
 				
 				EnsureDirectoryExists (Path.GetDirectoryName (file.InternalTargetFile));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs
index 83c06ffc2d..1fa649f2ee 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs
@@ -7,6 +7,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.ProgressMonitoring;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Deployment.Targets
 {
@@ -18,24 +19,24 @@ namespace MonoDevelop.Deployment.Targets
 		[ItemProperty]
 		string format;
 		
-		FileFormat fileFormat;
+		MSBuildFileFormat fileFormat;
 		
 		public override string Description {
 			get { return "Archive of Sources"; }
 		}
 		
-		public override bool CanBuild (SolutionItem entry)
+		public override bool CanBuild (SolutionFolderItem entry)
 		{
-			return entry is SolutionFolder || entry is SolutionEntityItem;
+			return entry is SolutionFolder || entry is SolutionItem;
 		}
 
 		
-		public FileFormat FileFormat {
+		public MSBuildFileFormat FileFormat {
 			get {
 				if (fileFormat == null) {
 					if (string.IsNullOrEmpty (format))
 						return null;
-					foreach (FileFormat f in Services.ProjectService.FileFormats.GetAllFileFormats ()) {
+					foreach (var f in MSBuildFileFormat.GetSupportedFormats ()) {
 						if (f.GetType ().FullName == format) {
 							fileFormat = f;
 							break;
@@ -58,17 +59,17 @@ namespace MonoDevelop.Deployment.Targets
 			set { targetFile = value; }
 		}
 		
-		protected override bool OnBuild (IProgressMonitor monitor, DeployContext ctx)
+		protected override bool OnBuild (ProgressMonitor monitor, DeployContext ctx)
 		{
 			string sourceFile;
-			SolutionItem entry = RootSolutionItem;
+			SolutionFolderItem entry = RootSolutionItem;
 			if (entry is SolutionFolder)
 				sourceFile = entry.ParentSolution.FileName;
 			else
-				sourceFile = ((SolutionEntityItem)entry).FileName;
+				sourceFile = ((SolutionItem)entry).FileName;
 			
 			AggregatedProgressMonitor mon = new AggregatedProgressMonitor ();
-			mon.AddSlaveMonitor (monitor, MonitorAction.WriteLog|MonitorAction.ReportError|MonitorAction.ReportWarning|MonitorAction.ReportSuccess);
+			mon.AddFollowerMonitor (monitor, MonitorAction.WriteLog|MonitorAction.ReportError|MonitorAction.ReportWarning|MonitorAction.ReportSuccess);
 			
 			string tmpFolder = FileService.CreateTempDirectory ();
 			
@@ -81,13 +82,13 @@ namespace MonoDevelop.Deployment.Targets
 				
 				// Export the project
 				
-				SolutionItem[] ents = GetChildEntries ();
+				SolutionFolderItem[] ents = GetChildEntries ();
 				string[] epaths = new string [ents.Length];
 				for (int n=0; n<ents.Length; n++)
 					epaths [n] = ents [n].ItemId;
 				
-				Services.ProjectService.Export (mon, sourceFile, epaths, folder, FileFormat);
-				if (!mon.AsyncOperation.Success)
+				var r = Services.ProjectService.Export (mon, sourceFile, epaths, folder, FileFormat).Result;
+				if (string.IsNullOrEmpty (r))
 					return false;
 				
 				// Create the archive
@@ -99,12 +100,11 @@ namespace MonoDevelop.Deployment.Targets
 			finally {
 				Directory.Delete (tmpFolder, true);
 			}
-			if (monitor.AsyncOperation.Success)
-				monitor.Log.WriteLine (GettextCatalog.GetString ("Created file: {0}", targetFile));
+			monitor.Log.WriteLine (GettextCatalog.GetString ("Created file: {0}", targetFile));
 			return true;
 		}
 		
-		public override void InitializeSettings (SolutionItem entry)
+		public override void InitializeSettings (SolutionFolderItem entry)
 		{
 			targetFile = Path.Combine (entry.BaseDirectory, entry.Name) + ".tar.gz";
 			if (entry.ParentSolution != null)
@@ -147,14 +147,15 @@ namespace MonoDevelop.Deployment.Targets
 		public override PackageBuilder[] CreateDefaultBuilders ()
 		{
 			List<PackageBuilder> list = new List<PackageBuilder> ();
-			
-			foreach (FileFormat format in Services.ProjectService.FileFormats.GetFileFormatsForObject (RootSolutionItem)) {
+
+			IMSBuildFileObject root = RootSolutionItem is SolutionItem ? (IMSBuildFileObject)RootSolutionItem : (IMSBuildFileObject) RootSolutionItem.ParentSolution;
+			foreach (MSBuildFileFormat format in MSBuildFileFormat.GetSupportedFormats (root)) {
 				SourcesZipPackageBuilder pb = (SourcesZipPackageBuilder) Clone ();
 				pb.FileFormat = format;
 				
 				// The suffix for the archive will be the extension of the file format.
 				// If there is no extension, use the whole file name.
-				string fname = format.GetValidFileName (RootSolutionItem, RootSolutionItem.ParentSolution.FileName);
+				string fname = format.GetValidFormatName (RootSolutionItem, RootSolutionItem.ParentSolution.FileName);
 				string suffix = Path.GetExtension (fname);
 				if (suffix.Length > 0)
 					suffix = suffix.Substring (1).ToLower (); // Remove the initial dot
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SshFuseFileCopyHandler.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SshFuseFileCopyHandler.cs
index fef148d5c1..4029434912 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SshFuseFileCopyHandler.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SshFuseFileCopyHandler.cs
@@ -42,7 +42,7 @@ namespace MonoDevelop.Deployment.Targets
 			get { return "SSH (FUSE)"; }
 		}
 		
-		public override void MountTempDirectory (IProgressMonitor monitor, FileCopyConfiguration copyConfig, string tempPath)
+		public override void MountTempDirectory (ProgressMonitor monitor, FileCopyConfiguration copyConfig, string tempPath)
 		{
 			SshFuseFileCopyConfiguration config = (SshFuseFileCopyConfiguration) copyConfig;
 			string fuseArgs = string.Format ("{0} {1} {2}", config.TargetDirectory, tempPath, config.ExtraMountArguments);
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
index 35e725d92f..7fcdefd213 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
@@ -4,7 +4,6 @@
 		<Category _name = "Deployment" id = "Deployment">
 		<Command id = "MonoDevelop.Deployment.Commands.CreatePackage"
 				defaultHandler = "MonoDevelop.Deployment.CreatePackageHandler"
-				icon = "md-package"
 				_label = "Create Package..." />
 		<Command id = "MonoDevelop.Deployment.Commands.AddPackage"
 				defaultHandler = "MonoDevelop.Deployment.AddPackageHandler"
@@ -117,21 +116,8 @@
 		<Class class = "MonoDevelop.Deployment.Gui.PropertyProvider"/>
 	</Extension>
 
-	<Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
-		<ItemProperty class = "MonoDevelop.Projects.ProjectFile"
-			name = "DeployService.Deploy" type = "System.Boolean" />
-		<ItemProperty class = "MonoDevelop.Projects.ProjectFile"
-			name = "DeployService.TargetDirectoryId" type = "System.String" />
-		<ItemProperty class = "MonoDevelop.Projects.ProjectFile"
-			name = "DeployService.RelativeDeployPath" type = "System.String" />
-		<ItemProperty class = "MonoDevelop.Projects.ProjectFile"
-			name = "DeployService.HasPathReferences" type = "System.Boolean" />
-		<ItemProperty class = "MonoDevelop.Projects.ProjectFile"
-			name = "DeployService.UseProjectRelativePath" type = "System.Boolean" />
-	</Extension>
-
 	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
-		<ProjectTemplate id = "PackagingProject" resource = "PackagingProject.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.PackagingProject" resource = "PackagingProject.xpt.xml"/>
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
index 6950d93dc2..5369de6b67 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
@@ -40,6 +40,36 @@
     <NoWarn>1591;1573</NoWarn>
     <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.Deployment\MonoDevelop.Deployment.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' ">
+    <DebugSymbols>True</DebugSymbols>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.Deployment</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+    <DefineConstants>DEBUG;GNOME</DefineConstants>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.Deployment\MonoDevelop.Deployment.xml</DocumentationFile>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.Deployment</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>GNOME</DefineConstants>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\..\build\AddIns\MonoDevelop.Deployment\MonoDevelop.Deployment.xml</DocumentationFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
@@ -173,18 +203,72 @@
     <EmbeddedResource Include="icons\package-16%402x.png">
       <LogicalName>package-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-16~dark.png">
+      <LogicalName>package-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-16~dark%402x.png">
+      <LogicalName>package-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-16~sel.png">
+      <LogicalName>package-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-16~sel%402x.png">
+      <LogicalName>package-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-16~dark~sel.png">
+      <LogicalName>package-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-16~dark~sel%402x.png">
+      <LogicalName>package-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\package-32.png">
       <LogicalName>package-32.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\package-32%402x.png">
       <LogicalName>package-32@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-32~dark.png">
+      <LogicalName>package-32~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-32~dark%402x.png">
+      <LogicalName>package-32~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-32~sel.png">
+      <LogicalName>package-32~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-32~sel%402x.png">
+      <LogicalName>package-32~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-32~dark~sel.png">
+      <LogicalName>package-32~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-32~dark~sel%402x.png">
+      <LogicalName>package-32~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\package-48.png">
       <LogicalName>package-48.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\package-48%402x.png">
       <LogicalName>package-48@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~dark.png">
+      <LogicalName>package-48~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~dark%402x.png">
+      <LogicalName>package-48~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~sel.png">
+      <LogicalName>package-48~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~sel%402x.png">
+      <LogicalName>package-48~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~dark~sel.png">
+      <LogicalName>package-48~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~dark~sel%402x.png">
+      <LogicalName>package-48~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
       <LogicalName>gui.stetic</LogicalName>
     </EmbeddedResource>
@@ -200,6 +284,12 @@
     <EmbeddedResource Include="templates\images\packaging-project%402x.png">
       <LogicalName>packaging-project@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="templates\images\packaging-project~dark.png">
+      <LogicalName>packaging-project~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="templates\images\packaging-project~dark%402x.png">
+      <LogicalName>packaging-project~dark@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DefaultDeployServiceExtension.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DefaultDeployServiceExtension.cs
index 52715746d0..3b6554e7be 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DefaultDeployServiceExtension.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DefaultDeployServiceExtension.cs
@@ -8,7 +8,7 @@ namespace MonoDevelop.Deployment
 {
 	class DefaultDeployServiceExtension: DeployServiceExtension
 	{
-		public override DeployFileCollection GetDeployFiles (DeployContext ctx, SolutionItem entry, ConfigurationSelector configuration)
+		public override DeployFileCollection GetDeployFiles (DeployContext ctx, SolutionFolderItem entry, ConfigurationSelector configuration)
 		{
 			if (entry is IDeployable)
 				return new DeployFileCollection (((IDeployable)entry).GetDeployFiles (configuration));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployFile.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployFile.cs
index b8287104a5..e03eb8b89d 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployFile.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployFile.cs
@@ -44,7 +44,7 @@ namespace MonoDevelop.Deployment
 		string targetDirectoryID;
 		DeployContext deployContext;
 		bool isTemplate;
-		SolutionItem sourceSolutionItem;
+		SolutionFolderItem sourceSolutionItem;
 		string displayName;
 		DeployFileAttributes attributes;
 		
@@ -60,12 +60,12 @@ namespace MonoDevelop.Deployment
 			sourceSolutionItem = pfile.Project;
 		}

 

-		public DeployFile (SolutionItem sourceSolutionItem, FilePath sourcePath, FilePath relativeTargetPath)
+		public DeployFile (SolutionFolderItem sourceSolutionItem, FilePath sourcePath, FilePath relativeTargetPath)
 		 : this (sourceSolutionItem, sourcePath, relativeTargetPath, TargetDirectory.ProgramFiles)
 		{
 		}

 

-		public DeployFile (SolutionItem sourceSolutionItem, FilePath sourcePath, FilePath relativeTargetPath, string targetDirectoryID)
+		public DeployFile (SolutionFolderItem sourceSolutionItem, FilePath sourcePath, FilePath relativeTargetPath, string targetDirectoryID)
 		{
 			this.targetDirectoryID = targetDirectoryID;
 			this.sourcePath = sourcePath;
@@ -78,7 +78,7 @@ namespace MonoDevelop.Deployment
 			this.deployContext = deployContext;
 		}
 		
-		public SolutionItem SourceSolutionItem {
+		public SolutionFolderItem SourceSolutionItem {
 			get { return sourceSolutionItem; }
 		}
 		
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployProperties.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployProperties.cs
index 02fe988fd7..47db17e6ad 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployProperties.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployProperties.cs
@@ -18,16 +18,12 @@ namespace MonoDevelop.Deployment
 			get {
 				if (MarkedCopyToOutput)
 					return true;
-				
-				object val = file.ExtendedProperties ["DeployService.Deploy"];
-				return val != null && (bool) val;
+
+				return file.Metadata.GetValue<bool> ("DeployService.Deploy", false);
 			}
 			set {
 				AssertNotCopyToOutput ();
-				if (!value)
-					file.ExtendedProperties.Remove ("DeployService.Deploy");
-				else
-					file.ExtendedProperties ["DeployService.Deploy"] = true;
+				file.Metadata.SetValue ("DeployService.Deploy", value, false);
 			}
 		
 		}
@@ -36,19 +32,13 @@ namespace MonoDevelop.Deployment
 			get {
 				if (MarkedCopyToOutput)
 					return MonoDevelop.Deployment.TargetDirectory.ProgramFiles;
-				
-				string d = file.ExtendedProperties ["DeployService.TargetDirectoryId"] as string;
-				if (string.IsNullOrEmpty (d))
-					return MonoDevelop.Deployment.TargetDirectory.ProgramFiles;
-				else
-					return d;
+				return file.Metadata.GetValue ("DeployService.TargetDirectoryId", MonoDevelop.Deployment.TargetDirectory.ProgramFiles);
 			}
 			set {
 				AssertNotCopyToOutput ();
-				if (string.IsNullOrEmpty (value) || value == MonoDevelop.Deployment.TargetDirectory.ProgramFiles)
-					file.ExtendedProperties.Remove ("DeployService.TargetDirectoryId");
-				else
-					file.ExtendedProperties ["DeployService.TargetDirectoryId"] = value;
+				if (string.IsNullOrEmpty (value))
+					value = MonoDevelop.Deployment.TargetDirectory.ProgramFiles;
+				file.Metadata.SetValue ("DeployService.TargetDirectoryId", value, MonoDevelop.Deployment.TargetDirectory.ProgramFiles);
 			}
 		}
 		
@@ -59,18 +49,14 @@ namespace MonoDevelop.Deployment
 				
 				if (UseProjectRelativePath)
 					return file.ProjectVirtualPath;
-				string s = file.ExtendedProperties ["DeployService.RelativeDeployPath"] as string;
-				if (string.IsNullOrEmpty (s))
-					return Path.GetFileName (file.Name);
-				else
-					return s;
+				return file.Metadata.GetValue ("DeployService.RelativeDeployPath", Path.GetFileName (file.Name));
 			}
 			set {
 				AssertNotCopyToOutput ();
-				if (string.IsNullOrEmpty (value) || value == Path.GetFileName (file.Name))
-					file.ExtendedProperties.Remove ("DeployService.RelativeDeployPath");
-				else
-					file.ExtendedProperties ["DeployService.RelativeDeployPath"] = value;
+				var defname = Path.GetFileName (file.Name);
+				if (string.IsNullOrEmpty (value))
+					value = defname;
+				file.Metadata.SetValue ("DeployService.RelativeDeployPath", value, defname);
 			}
 		}
 		
@@ -78,16 +64,11 @@ namespace MonoDevelop.Deployment
 			get {
 				if (MarkedCopyToOutput)
 					return false;
-				
-				object val = file.ExtendedProperties ["DeployService.HasPathReferences"];
-				return val != null && (bool) val;
+				return file.Metadata.GetValue ("DeployService.HasPathReferences", false);
 			}
 			set {
 				AssertNotCopyToOutput ();
-				if (!value)
-					file.ExtendedProperties.Remove ("DeployService.HasPathReferences");
-				else
-					file.ExtendedProperties ["DeployService.HasPathReferences"] = true;
+				file.Metadata.SetValue ("DeployService.HasPathReferences", value, false);
 			}
 		}
 		
@@ -97,17 +78,13 @@ namespace MonoDevelop.Deployment
 				if (MarkedCopyToOutput)
 					return false;
 				
-				object val = file.ExtendedProperties ["DeployService.UseProjectRelativePath"];
-				return val != null && (bool) val;
+				return file.Metadata.GetValue ("DeployService.UseProjectRelativePath", false);
 			}
 			set {
 				AssertNotCopyToOutput ();
-				if (!value)
-					file.ExtendedProperties.Remove ("DeployService.UseProjectRelativePath");
-				else {
+				if (value)
 					RelativeDeployPath = "";
-					file.ExtendedProperties ["DeployService.UseProjectRelativePath"] = true;
-				}
+				file.Metadata.SetValue ("DeployService.UseProjectRelativePath", value, false);
 			}
 		}
 		
@@ -115,16 +92,12 @@ namespace MonoDevelop.Deployment
 			get {
 				if (MarkedCopyToOutput)
 					return DeployFileAttributes.None;
-				
-				object val = file.ExtendedProperties ["DeployService.FileAttributes"];
-				return val != null ? (DeployFileAttributes) val : DeployFileAttributes.None;
+
+				return file.Metadata.GetValue ("DeployService.FileAttributes", DeployFileAttributes.None);
 			}
 			set {
 				AssertNotCopyToOutput ();
-				if (value == DeployFileAttributes.None)
-					file.ExtendedProperties.Remove ("DeployService.FileAttributes");
-				else
-					file.ExtendedProperties ["DeployService.FileAttributes"] = value;
+				file.Metadata.SetValue ("DeployService.FileAttributes", value, DeployFileAttributes.None);
 			}
 		}
 		
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployService.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployService.cs
index b6f9695245..51fbdf8329 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployService.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployService.cs
@@ -48,6 +48,7 @@ using ICSharpCode.SharpZipLib.Zip;
 using System.Reflection;

 using Mono.Unix.Native;

 using Mono.Unix;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Deployment
 {
@@ -90,7 +91,7 @@ namespace MonoDevelop.Deployment
 			return props;
 		}
 		
-		public static PackageBuilder[] GetSupportedPackageBuilders (SolutionItem entry)
+		public static PackageBuilder[] GetSupportedPackageBuilders (SolutionFolderItem entry)
 		{
 			object[] builders = AddinManager.GetExtensionObjects ("/MonoDevelop/DeployService/PackageBuilders", false);
 			ArrayList list = new ArrayList ();
@@ -110,13 +111,13 @@ namespace MonoDevelop.Deployment
 			return (PackageBuilder[]) AddinManager.GetExtensionObjects ("/MonoDevelop/DeployService/PackageBuilders", typeof(PackageBuilder), false);
 		}
 		
-		public static void Install (IProgressMonitor monitor, SolutionItem entry, string prefix, string appName, ConfigurationSelector configuration)
+		public static void Install (ProgressMonitor monitor, SolutionFolderItem entry, string prefix, string appName, ConfigurationSelector configuration)
 		{
 			InstallResolver res = new InstallResolver ();
 			res.Install (monitor, entry, appName, prefix, configuration);
 		}
 		
-		public static void CreateArchive (IProgressMonitor mon, string folder, string targetFile)
+		public static void CreateArchive (ProgressMonitor mon, string folder, string targetFile)
 		{
 			string tf = Path.GetFileNameWithoutExtension (targetFile);
 			if (tf.EndsWith (".tar")) tf = Path.GetFileNameWithoutExtension (tf);
@@ -235,27 +236,29 @@ namespace MonoDevelop.Deployment
 			return null;
 		}
 		
-		public static bool BuildPackage (IProgressMonitor mon, Package package)
+		public static Task<bool> BuildPackage (ProgressMonitor mon, Package package)
 		{
 			return BuildPackage (mon, package.PackageBuilder);
 		}
 		
-		public static bool BuildPackage (IProgressMonitor mon, PackageBuilder builder)
+		public static Task<bool> BuildPackage (ProgressMonitor mon, PackageBuilder builder)
 		{
-			DeployServiceExtension extensionChain = GetExtensionChain ();
-			return extensionChain.BuildPackage (mon, builder);
+			return Task<bool>.Factory.StartNew (delegate {
+				DeployServiceExtension extensionChain = GetExtensionChain ();
+				return extensionChain.BuildPackage (mon, builder);
+			});
 		}
 		
-		public static DeployFileCollection GetDeployFiles (DeployContext ctx, SolutionItem[] entries, ConfigurationSelector configuration)
+		public static DeployFileCollection GetDeployFiles (DeployContext ctx, SolutionFolderItem[] entries, ConfigurationSelector configuration)
 		{
 			DeployFileCollection col = new DeployFileCollection ();
-			foreach (SolutionItem e in entries) {
+			foreach (SolutionFolderItem e in entries) {
 				col.AddRange (GetDeployFiles (ctx, e, configuration));
 			}
 			return col;
 		}
 		
-		public static DeployFileCollection GetDeployFiles (DeployContext ctx, SolutionItem entry, ConfigurationSelector configuration)
+		public static DeployFileCollection GetDeployFiles (DeployContext ctx, SolutionFolderItem entry, ConfigurationSelector configuration)
 		{
 			ArrayList todel = new ArrayList ();
 			
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployServiceExtension.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployServiceExtension.cs
index ef9335b420..4359230f6b 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployServiceExtension.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/DeployServiceExtension.cs
@@ -9,7 +9,7 @@ namespace MonoDevelop.Deployment
 	{
 		internal DeployServiceExtension Next;
 		
-		public virtual bool BuildPackage (IProgressMonitor monitor, PackageBuilder builder)
+		public virtual bool BuildPackage (ProgressMonitor monitor, PackageBuilder builder)
 		{
 			if (Next != null)
 				return Next.BuildPackage (monitor, builder);
@@ -17,7 +17,7 @@ namespace MonoDevelop.Deployment
 				return builder.Build (monitor);
 		}
 		
-		public virtual DeployFileCollection GetDeployFiles (DeployContext ctx, SolutionItem entry, ConfigurationSelector configuration)
+		public virtual DeployFileCollection GetDeployFiles (DeployContext ctx, SolutionFolderItem entry, ConfigurationSelector configuration)
 		{
 			if (entry is SolutionFolder)
 				return GetCombineDeployFiles (ctx, (SolutionFolder) entry, configuration);
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/FileCopyConfiguration.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/FileCopyConfiguration.cs
index 0149d1040d..53c916d787 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/FileCopyConfiguration.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/FileCopyConfiguration.cs
@@ -69,7 +69,7 @@ namespace MonoDevelop.Deployment
 			get;
 		}
 		
-		public void CopyFiles (IProgressMonitor monitor, IFileReplacePolicy replacePolicy, DeployFileCollection files, DeployContext context)
+		public void CopyFiles (ProgressMonitor monitor, IFileReplacePolicy replacePolicy, DeployFileCollection files, DeployContext context)
 		{
 			Handler.CopyFiles (monitor, replacePolicy, this, files, context);
 		}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/FileCopyHandler.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/FileCopyHandler.cs
index 38108b7ded..7b1f3c2f00 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/FileCopyHandler.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/FileCopyHandler.cs
@@ -59,7 +59,7 @@ namespace MonoDevelop.Deployment
 			return c;
 		}
 		
-		internal void CopyFiles (IProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection files, DeployContext context)
+		internal void CopyFiles (ProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection files, DeployContext context)
 		{
 			handler.CopyFiles (monitor, replacePolicy, copyConfig, files, context);
 		}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/IFileCopyHandler.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/IFileCopyHandler.cs
index 58f41c36c7..1aabddc49e 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/IFileCopyHandler.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/IFileCopyHandler.cs
@@ -40,6 +40,6 @@ namespace MonoDevelop.Deployment
 		string Id { get; }
 		string Name { get; }
 		FileCopyConfiguration CreateConfiguration ();
-		void CopyFiles (IProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection files, DeployContext context);
+		void CopyFiles (ProgressMonitor monitor, IFileReplacePolicy replacePolicy, FileCopyConfiguration copyConfig, DeployFileCollection files, DeployContext context);
 	}
 }
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/InstallResolver.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/InstallResolver.cs
index 50e1ca8951..778eb928ee 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/InstallResolver.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/InstallResolver.cs
@@ -40,7 +40,7 @@ namespace MonoDevelop.Deployment
 	{
 		string appName;
 		
-		public void Install (IProgressMonitor monitor, SolutionItem entry, string appName, string prefix, ConfigurationSelector configuration)
+		public void Install (ProgressMonitor monitor, SolutionFolderItem entry, string appName, string prefix, ConfigurationSelector configuration)
 		{
 			this.appName = appName;
 			
@@ -49,9 +49,9 @@ namespace MonoDevelop.Deployment
 			}
 		}
 		
-		void InstallEntry (IProgressMonitor monitor, DeployContext ctx, SolutionItem entry, ConfigurationSelector configuration)
+		void InstallEntry (ProgressMonitor monitor, DeployContext ctx, SolutionFolderItem entry, ConfigurationSelector configuration)
 		{
-			foreach (DeployFile df in DeployService.GetDeployFiles (ctx, new SolutionItem[] { entry }, configuration)) {
+			foreach (DeployFile df in DeployService.GetDeployFiles (ctx, new SolutionFolderItem[] { entry }, configuration)) {
 				string targetPath = df.ResolvedTargetFile;
 				if (targetPath == null) {
 					monitor.ReportWarning ("Could not copy file '" + df.RelativeTargetPath + "': Unknown target directory.");
@@ -64,7 +64,7 @@ namespace MonoDevelop.Deployment
 			SolutionFolder c = entry as SolutionFolder;
 			if (c != null) {
 				monitor.BeginTask ("Installing solution '" + c.Name + "'", c.Items.Count);
-				foreach (SolutionItem ce in c.Items) {
+				foreach (SolutionFolderItem ce in c.Items) {
 					InstallEntry (monitor, ctx, ce, configuration);
 					monitor.Step (1);
 				}
@@ -72,7 +72,7 @@ namespace MonoDevelop.Deployment
 			}
 		}
 		
-		void CopyFile (IProgressMonitor monitor, string src, string dest, DeployFileAttributes atts)
+		void CopyFile (ProgressMonitor monitor, string src, string dest, DeployFileAttributes atts)
 		{
 			dest = FileService.GetFullPath (dest);
 			monitor.Log.WriteLine (GettextCatalog.GetString ("Deploying file {0}.", dest));
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/Package.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/Package.cs
index 8eeac21c76..13911d12a6 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/Package.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/Package.cs
@@ -6,6 +6,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.ProgressMonitoring;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Deployment
 {
@@ -46,11 +47,11 @@ namespace MonoDevelop.Deployment
 			set { builder = value; NotifyChanged (); }
 		}
 		
-		public bool Build (IProgressMonitor monitor)
+		public async Task<bool> Build (ProgressMonitor monitor)
 		{
-			DeployService.BuildPackage (monitor, this);
+			var res = await DeployService.BuildPackage (monitor, this);
 			needsBuilding = false;
-			return true;
+			return res;
 		}
 		
 		public bool NeedsBuilding {
@@ -62,13 +63,14 @@ namespace MonoDevelop.Deployment
 			}
 		}
 		
-		public void Clean (IProgressMonitor monitor)
+		public void Clean (ProgressMonitor monitor)
 		{
 			needsBuilding = true;
 		}
 		
 		void NotifyChanged ()
 		{
+			Runtime.AssertMainThread ();
 			if (Changed != null)
 				Changed (this, EventArgs.Empty);
 		}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackageBuilder.cs
index 3df5f51486..6a06ad615b 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackageBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackageBuilder.cs
@@ -34,6 +34,8 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.ProgressMonitoring;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide;
+using System.Threading.Tasks;
+using System.Linq;
 
 namespace MonoDevelop.Deployment
 {
@@ -50,8 +52,8 @@ namespace MonoDevelop.Deployment
 		[ItemProperty ("RootEntry")]
 		SolutionItemReference rootEntry;
 		
-		List<SolutionItem> childCombineEntries;
-		SolutionItem rootSolutionItem;
+		List<SolutionFolderItem> childCombineEntries;
+		SolutionFolderItem rootSolutionItem;
 		
 		public PackageBuilder ()
 		{
@@ -76,7 +78,7 @@ namespace MonoDevelop.Deployment
 			return null;
 		}
 		
-		internal bool Build (IProgressMonitor monitor)
+		internal bool Build (ProgressMonitor monitor)
 		{
 			monitor.BeginTask ("Package: " + Description, 1);
 			DeployContext ctx = null;
@@ -85,13 +87,11 @@ namespace MonoDevelop.Deployment
 				if (ctx != null)
 					ctx.FileFilter = this;
 				if (!OnBuild (monitor, ctx)) {
-					monitor.AsyncOperation.Cancel ();
 					return false;
 				}
 			} catch (Exception ex) {
 				monitor.ReportError ("Package creation failed", ex);
 				LoggingService.LogError ("Package creation failed", ex);
-				monitor.AsyncOperation.Cancel ();
 				return false;
 			} finally {
 				monitor.EndTask ();
@@ -101,12 +101,12 @@ namespace MonoDevelop.Deployment
 			return true;
 		}
 		
-		public virtual bool CanBuild (SolutionItem entry)
+		public virtual bool CanBuild (SolutionFolderItem entry)
 		{
 			return true;
 		}
 		
-		public virtual void InitializeSettings (SolutionItem entry)
+		public virtual void InitializeSettings (SolutionFolderItem entry)
 		{
 		}
 		
@@ -123,7 +123,7 @@ namespace MonoDevelop.Deployment
 			rootEntry = other.rootEntry;
 
 			if (other.childCombineEntries != null)
-				childCombineEntries = new List<SolutionItem> (other.childCombineEntries);
+				childCombineEntries = new List<SolutionFolderItem> (other.childCombineEntries);
 			else
 				childCombineEntries = null;
 			if (other.excludedFiles != null)
@@ -138,7 +138,7 @@ namespace MonoDevelop.Deployment
 			return new PackageBuilder [0];
 		}
 		
-		protected virtual bool OnBuild (IProgressMonitor monitor, DeployContext ctx)
+		protected virtual bool OnBuild (ProgressMonitor monitor, DeployContext ctx)
 		{
 			return true;
 		}
@@ -158,15 +158,15 @@ namespace MonoDevelop.Deployment
 			return new DeployContext (this, DeployService.CurrentPlatform, null);
 		}
 		
-		public void SetSolutionItem (SolutionItem entry)
+		public void SetSolutionItem (SolutionFolderItem entry)
 		{
 			SetSolutionItem (entry, null);
 		}
 		
-		public void SetSolutionItem (SolutionItem rootSolutionItem, IEnumerable<SolutionItem> childEntries)
+		public void SetSolutionItem (SolutionFolderItem rootSolutionItem, IEnumerable<SolutionFolderItem> childEntries)
 		{
 			this.rootSolutionItem = rootSolutionItem;
-			childCombineEntries = new List<SolutionItem> ();
+			childCombineEntries = new List<SolutionFolderItem> ();
 			
 			if (childEntries != null)
 			    childCombineEntries.AddRange (childEntries);
@@ -187,11 +187,11 @@ namespace MonoDevelop.Deployment
 		{
 			this.rootEntry = new SolutionItemReference (rootSolutionItem);
 			this.childEntries.Clear ();
-			foreach (SolutionItem e in childCombineEntries)
+			foreach (SolutionFolderItem e in childCombineEntries)
 				childEntries.Add (new SolutionItemReference (e));
 		}
 		
-		public SolutionItem RootSolutionItem {
+		public SolutionFolderItem RootSolutionItem {
 			get {
 				if (rootSolutionItem == null && rootEntry != null)
 					rootSolutionItem = GetEntry (rootEntry);
@@ -205,7 +205,7 @@ namespace MonoDevelop.Deployment
 			}
 		}
 		
-		public void AddEntry (SolutionItem entry)
+		public void AddEntry (SolutionFolderItem entry)
 		{
 			SolutionItemReference fp = new SolutionItemReference (entry);
 			foreach (SolutionItemReference s in childEntries)
@@ -215,7 +215,7 @@ namespace MonoDevelop.Deployment
 			if (rootEntry == fp)
 				return;
 			
-			List<SolutionItem> list = new List<SolutionItem> ();
+			List<SolutionFolderItem> list = new List<SolutionFolderItem> ();
 			if (RootSolutionItem != null)
 				list.Add (RootSolutionItem);
 			list.AddRange (GetChildEntries());
@@ -224,8 +224,8 @@ namespace MonoDevelop.Deployment
 			rootSolutionItem = GetCommonSolutionItem (list);
 			list.Remove (rootSolutionItem);
 			
-			foreach (SolutionItem e in list.ToArray ()) {
-				SolutionItem ce = e.ParentFolder;
+			foreach (SolutionFolderItem e in list.ToArray ()) {
+				SolutionFolderItem ce = e.ParentFolder;
 				while (ce != rootSolutionItem) {
 					if (!list.Contains (ce))
 						list.Add (ce);
@@ -236,36 +236,36 @@ namespace MonoDevelop.Deployment
 			UpdateEntryNames ();
 		}
 		
-		public SolutionItem[] GetChildEntries ()
+		public SolutionFolderItem[] GetChildEntries ()
 		{
 			if (childCombineEntries != null)
 				return childCombineEntries.ToArray ();
 			
-			childCombineEntries = new List<SolutionItem> ();
+			childCombineEntries = new List<SolutionFolderItem> ();
 			
 			foreach (SolutionItemReference en in childEntries) {
-				SolutionItem re = GetEntry (en);
+				SolutionFolderItem re = GetEntry (en);
 				if (re != null && !(re is UnknownSolutionItem))
 					childCombineEntries.Add (re);
 			}
 			return childCombineEntries.ToArray ();
 		}
 		
-		public SolutionItem[] GetAllEntries ()
+		public SolutionFolderItem[] GetAllEntries ()
 		{
-			List<SolutionItem> list = new List<SolutionItem> ();
+			List<SolutionFolderItem> list = new List<SolutionFolderItem> ();
 			if (RootSolutionItem != null)
 				list.Add (RootSolutionItem);
 			list.AddRange (GetChildEntries ());
 			return list.ToArray ();
 		}
 		
-		SolutionItem GetEntry (SolutionItemReference reference)
+		SolutionFolderItem GetEntry (SolutionItemReference reference)
 		{
 			if (IdeApp.IsInitialized)
-				return Services.ProjectService.ReadSolutionItem (new NullProgressMonitor (), reference, IdeApp.Workspace.Items.ToArray ());
+				return Services.ProjectService.ReadSolutionItem (new ProgressMonitor (), reference, IdeApp.Workspace.Items.ToArray ()).Result;
 			else
-				return Services.ProjectService.ReadSolutionItem (new NullProgressMonitor (), reference);
+				return Services.ProjectService.ReadSolutionItem (new ProgressMonitor (), reference).Result;
 		}
 		
 		public virtual DeployFileCollection GetDeployFiles (DeployContext ctx, ConfigurationSelector configuration)
@@ -307,10 +307,10 @@ namespace MonoDevelop.Deployment
 		}
 		
 		
-		internal static SolutionItem GetCommonSolutionItem (IEnumerable<SolutionItem> entries)
+		internal static SolutionFolderItem GetCommonSolutionItem (IEnumerable<SolutionFolderItem> entries)
 		{
-			SolutionItem common = null;
-			foreach (SolutionItem it in entries) {
+			SolutionFolderItem common = null;
+			foreach (SolutionFolderItem it in entries) {
 				if (common == null)
 					common = it;
 				else
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs
index 184b2dee9f..ebb504dd5b 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs
@@ -5,10 +5,11 @@ using System.Collections.Generic;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Serialization;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Deployment
 {
-	public class PackagingProject: SolutionEntityItem
+	public class PackagingProject: Project
 	{
 		PackageCollection packages;
 		
@@ -16,6 +17,7 @@ namespace MonoDevelop.Deployment
 		
 		public PackagingProject()
 		{
+			Initialize (this);
 			packages = new PackageCollection (this);
 		}
 		
@@ -33,28 +35,24 @@ namespace MonoDevelop.Deployment
 			get { return packages; }
 		}
 		
-		public override SolutionItemConfiguration CreateConfiguration (string name)
+		protected override SolutionItemConfiguration OnCreateConfiguration (string id, ConfigurationKind kind)
 		{
-			PackagingProjectConfiguration conf = new PackagingProjectConfiguration ();
-			conf.Name = name;
-			return conf;
+			return new PackagingProjectConfiguration (id);
 		}
 		
-		protected override void OnClean (IProgressMonitor monitor, ConfigurationSelector configuration)
+		protected override Task<BuildResult> OnClean (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext)
 		{
 			foreach (Package p in packages)
 				p.Clean (monitor);
+			return Task.FromResult (BuildResult.CreateSuccess ());
 		}
 		
-		protected override BuildResult OnBuild (IProgressMonitor monitor, ConfigurationSelector configuration)
+		protected async override Task<BuildResult> OnBuild (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext)
 		{
 			foreach (Package p in packages)
-				p.Build (monitor);
-			return null;
-		}
-		
-		protected override void OnExecute (IProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
-		{
+				if (!await p.Build (monitor))
+					break;
+			return BuildResult.CreateSuccess ();
 		}
 		
 		protected override bool OnGetNeedsBuilding (ConfigurationSelector configuration)
@@ -65,14 +63,9 @@ namespace MonoDevelop.Deployment
 			return false;
 		}
 		
-		protected override void OnSetNeedsBuilding (bool val, ConfigurationSelector configuration)
-		{
-			foreach (Package p in packages)
-				p.NeedsBuilding = val;
-		}
-		
 		internal void NotifyPackagesChanged ()
 		{
+			AssertMainThread ();
 			if (PackagesChanged != null)
 				PackagesChanged (this, EventArgs.Empty);
 		}
@@ -80,5 +73,8 @@ namespace MonoDevelop.Deployment
 	
 	public class PackagingProjectConfiguration : SolutionItemConfiguration
 	{
+		public PackagingProjectConfiguration (string id) : base (id)
+		{
+		}
 	}
 }
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/UnknownPackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/UnknownPackageBuilder.cs
index 04d3e92770..72b356dc5d 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/UnknownPackageBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/UnknownPackageBuilder.cs
@@ -54,7 +54,7 @@ namespace MonoDevelop.Deployment
 			}
 		}
 		
-		protected override bool OnBuild (IProgressMonitor monitor, DeployContext ctx)
+		protected override bool OnBuild (ProgressMonitor monitor, DeployContext ctx)
 		{
 			monitor.ReportError ("Unknown package type. The package can't be generated.", null);
 			return false;
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs
index 2ef71e78f3..4064b84ff4 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs
@@ -5,44 +5,81 @@ namespace MonoDevelop.Deployment
 	public partial class FileReplaceDialog
 	{
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.Label label7;
-		private global::Gtk.Image image1;
+		
+		private global::MonoDevelop.Components.ImageView image1;
+		
 		private global::Gtk.Label label5;
+		
 		private global::Gtk.Label label6;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.HBox hbox2;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.VBox vbox4;
+		
 		private global::Gtk.HBox hbox3;
+		
 		private global::Gtk.RadioButton radioReplace;
+		
 		private global::Gtk.VBox vbox5;
+		
 		private global::Gtk.Label replaceLabel;
+		
 		private global::Gtk.HBox hbox6;
+		
 		private global::Gtk.Label label25;
+		
 		private global::Gtk.Label sourceName;
+		
 		private global::Gtk.HBox hbox7;
+		
 		private global::Gtk.Label label26;
+		
 		private global::Gtk.Label sourceModified;
+		
 		private global::Gtk.HBox hbox4;
+		
 		private global::Gtk.RadioButton radioKeep;
+		
 		private global::Gtk.VBox vbox6;
+		
 		private global::Gtk.Label keepLabel;
+		
 		private global::Gtk.HBox hbox8;
+		
 		private global::Gtk.Label label27;
+		
 		private global::Gtk.Label targetName;
+		
 		private global::Gtk.HBox hbox9;
+		
 		private global::Gtk.Label label28;
+		
 		private global::Gtk.Label targetModified;
+		
 		private global::Gtk.HBox hbox5;
+		
 		private global::Gtk.RadioButton radioNewest;
+		
 		private global::Gtk.VBox vbox7;
+		
 		private global::Gtk.Label newestLabel;
+		
 		private global::Gtk.Label label20;
+		
 		private global::Gtk.CheckButton applyAll;
+		
 		private global::Gtk.Label label11;
+		
 		private global::Gtk.Button cancelButton;
-		private global::Gtk.Button okButton;
 		
+		private global::Gtk.Button okButton;
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -70,9 +107,10 @@ namespace MonoDevelop.Deployment
 			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label7]));
 			w2.Position = 0;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.image1 = new global::Gtk.Image ();
+			this.image1 = new global::MonoDevelop.Components.ImageView ();
 			this.image1.Name = "image1";
-			this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.Dialog);
+			this.image1.IconId = "gtk-dialog-warning";
+			this.image1.IconSize = ((global::Gtk.IconSize)(6));
 			this.hbox1.Add (this.image1);
 			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.image1]));
 			w3.Position = 1;
@@ -390,26 +428,11 @@ namespace MonoDevelop.Deployment
 			this.cancelButton.CanFocus = true;
 			this.cancelButton.Name = "cancelButton";
 			this.cancelButton.UseUnderline = true;
-			// Container child cancelButton.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w39 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w40 = new global::Gtk.HBox ();
-			w40.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w41 = new global::Gtk.Image ();
-			w41.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-cancel", global::Gtk.IconSize.Button);
-			w40.Add (w41);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w43 = new global::Gtk.Label ();
-			w43.LabelProp = global::Mono.Unix.Catalog.GetString ("_Cancel deployment");
-			w43.UseUnderline = true;
-			w40.Add (w43);
-			w39.Add (w40);
-			this.cancelButton.Add (w39);
+			this.cancelButton.Label = global::Mono.Unix.Catalog.GetString ("_Cancel deployment");
 			this.AddActionWidget (this.cancelButton, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w47 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w38 [this.cancelButton]));
-			w47.Expand = false;
-			w47.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w39 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w38 [this.cancelButton]));
+			w39.Expand = false;
+			w39.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.okButton = new global::Gtk.Button ();
 			this.okButton.CanDefault = true;
@@ -419,10 +442,10 @@ namespace MonoDevelop.Deployment
 			this.okButton.UseUnderline = true;
 			this.okButton.Label = "gtk-ok";
 			this.AddActionWidget (this.okButton, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w48 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w38 [this.okButton]));
-			w48.Position = 1;
-			w48.Expand = false;
-			w48.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w40 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w38 [this.okButton]));
+			w40.Position = 1;
+			w40.Expand = false;
+			w40.Fill = false;
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs
index 504f5d72d3..29affc7b0e 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs
@@ -5,57 +5,109 @@ namespace MonoDevelop.Deployment.Gui
 	internal partial class DeployDialog
 	{
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.VBox vbox2;
-		private global::Gtk.Image image2;
+		
+		private global::MonoDevelop.Components.ImageView image2;
+		
 		private global::Gtk.Notebook notebook;
+		
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.Label labelTitle;
+		
 		private global::Gtk.HSeparator hseparator2;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow2;
+		
 		private global::Gtk.TreeView targetsTree;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.VBox pageSelectProject;
+		
 		private global::Gtk.Label labelTitle1;
+		
 		private global::Gtk.HSeparator hseparator4;
+		
 		private global::Gtk.Label label4;
+		
 		private global::MonoDevelop.Deployment.Gui.EntrySelectionTree entryTree;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.VBox vbox4;
+		
 		private global::Gtk.Label label5;
+		
 		private global::Gtk.HSeparator hseparator3;
+		
 		private global::Gtk.EventBox editorBox;
+		
 		private global::Gtk.HSeparator saveSeparator;
+		
 		private global::Gtk.HBox hbox2;
+		
 		private global::Gtk.CheckButton checkSave;
+		
 		private global::Gtk.Label label6;
+		
 		private global::Gtk.VBox pageSave;
+		
 		private global::Gtk.Label label7;
+		
 		private global::Gtk.HSeparator hseparator5;
+		
 		private global::Gtk.VBox vbox7;
+		
 		private global::Gtk.Label label14;
+		
 		private global::Gtk.HBox hbox4;
+		
 		private global::Gtk.Label label13;
+		
 		private global::Gtk.Entry entrySaveName;
+		
 		private global::Gtk.VBox vboxSaveProject;
+		
 		private global::Gtk.HSeparator hseparator6;
+		
 		private global::Gtk.Label label15;
+		
 		private global::Gtk.RadioButton radioCreateProject;
+		
 		private global::Gtk.HBox hbox5;
+		
 		private global::Gtk.Label label9;
+		
 		private global::Gtk.Table tableNewProject;
+		
 		private global::Gtk.ComboBox comboCreateProject;
+		
 		private global::Gtk.Entry entryProjectName;
+		
 		private global::Gtk.Label label11;
+		
 		private global::Gtk.Label label16;
+		
 		private global::Gtk.RadioButton radioAddProject;
+		
 		private global::Gtk.HBox boxAddProject;
+		
 		private global::Gtk.Label label10;
+		
 		private global::Gtk.Label label12;
+		
 		private global::Gtk.ComboBox comboSelProject;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.Button buttonCancel;
+		
 		private global::Gtk.Button buttonBack;
+		
 		private global::Gtk.Button buttonNext;
 
 		protected virtual void Build ()
@@ -80,9 +132,10 @@ namespace MonoDevelop.Deployment.Gui
 			this.vbox2 = new global::Gtk.VBox ();
 			this.vbox2.Name = "vbox2";
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.image2 = new global::Gtk.Image ();
+			this.image2 = new global::MonoDevelop.Components.ImageView ();
 			this.image2.Name = "image2";
-			this.image2.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("package-48.png");
+			this.image2.IconId = "md-package";
+			this.image2.IconSize = ((global::Gtk.IconSize)(6));
 			this.vbox2.Add (this.image2);
 			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.image2]));
 			w2.Position = 0;
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/generated.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/generated.cs
index 5cdc11900b..3285e87c05 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/generated.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/generated.cs
@@ -67,40 +67,6 @@ namespace Stetic
 		}
 	}
 
-	internal class IconLoader
-	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
-		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
-				return res;
-			} else {
-				int sz;
-				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-					}
-				}
-			}
-		}
-	}
-
 	internal class ActionGroups
 	{
 		public static Gtk.ActionGroup GetActionGroup (System.Type type)
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic
index 7d5838219c..76b23ed078 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <stetic-interface>
   <configuration>
     <images-root-path>..</images-root-path>
@@ -237,9 +237,10 @@
               <widget class="Gtk.VBox" id="vbox2">
                 <property name="MemberName" />
                 <child>
-                  <widget class="Gtk.Image" id="image2">
+                  <widget class="MonoDevelop.Components.ImageView" id="image2">
                     <property name="MemberName" />
-                    <property name="Pixbuf">resource:package-48.png</property>
+                    <property name="IconId">md-package</property>
+                    <property name="IconSize">Dialog</property>
                   </widget>
                   <packing>
                     <property name="Position">0</property>
@@ -1849,9 +1850,10 @@
               </packing>
             </child>
             <child>
-              <widget class="Gtk.Image" id="image1">
+              <widget class="MonoDevelop.Components.ImageView" id="image1">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:gtk-dialog-warning Dialog</property>
+                <property name="IconId">gtk-dialog-warning</property>
+                <property name="IconSize">Dialog</property>
               </widget>
               <packing>
                 <property name="Position">1</property>
@@ -2274,8 +2276,7 @@
           <widget class="Gtk.Button" id="cancelButton">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
-            <property name="Type">TextAndIcon</property>
-            <property name="Icon">stock:gtk-cancel Button</property>
+            <property name="Type">TextOnly</property>
             <property name="Label" translatable="yes">_Cancel deployment</property>
             <property name="UseUnderline">True</property>
             <property name="ResponseId">-6</property>
@@ -2467,4 +2468,4 @@
       </widget>
     </child>
   </widget>
-</stetic-interface>
+</stetic-interface>
\ No newline at end of file
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16.png
index be53353283..8519a6420d 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16@2x.png
index 6f21d7aa77..9708a1eded 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16@2x.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark.png
new file mode 100644
index 0000000000..25d4814e13
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark@2x.png
new file mode 100644
index 0000000000..6b099dbfbc
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel.png
new file mode 100644
index 0000000000..9eeaade789
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel@2x.png
new file mode 100644
index 0000000000..e58ff00899
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel.png
new file mode 100644
index 0000000000..9eeaade789
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel@2x.png
new file mode 100644
index 0000000000..e58ff00899
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32.png
index 6f21d7aa77..9708a1eded 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32@2x.png
index 8b687efa3d..56b0c40ada 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32@2x.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark.png
new file mode 100644
index 0000000000..6b099dbfbc
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark@2x.png
new file mode 100644
index 0000000000..70b6d95f29
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel.png
new file mode 100644
index 0000000000..e58ff00899
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel@2x.png
new file mode 100644
index 0000000000..ddb889f387
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel.png
new file mode 100644
index 0000000000..e58ff00899
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel@2x.png
new file mode 100644
index 0000000000..ddb889f387
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48.png
index 81a5324fce..6dbcbea034 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48@2x.png
index 3862bac535..0484944163 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48@2x.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark.png
new file mode 100644
index 0000000000..2fb74b25c1
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark@2x.png
new file mode 100644
index 0000000000..07520b847c
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel.png
new file mode 100644
index 0000000000..7fec138598
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel@2x.png
new file mode 100644
index 0000000000..e134ffbf43
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel.png
new file mode 100644
index 0000000000..7fec138598
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel@2x.png
new file mode 100644
index 0000000000..e134ffbf43
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project.png
index 976dbfb101..a8e3546967 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project@2x.png
index d30d817102..9750e76184 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project@2x.png
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project@2x.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark.png
new file mode 100644
index 0000000000..7083d65998
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark.png
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark@2x.png
new file mode 100644
index 0000000000..2205268213
--- /dev/null
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark@2x.png
diff --git a/main/src/addins/GnomePlatform/ChangeLog b/main/src/addins/GnomePlatform/ChangeLog
deleted file mode 100644
index 4456b3ffb9..0000000000
--- a/main/src/addins/GnomePlatform/ChangeLog
+++ /dev/null
@@ -1,236 +0,0 @@
-2010-06-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* GnomePlatform.cs: Implemented
-	  CanOpenTerminal/OpenInTerminal.
-
-2010-04-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* GnomePlatform.cs: Track StartConsoleProcess API.
-
-2010-04-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.cs: External console processes are now wrapped
-	  by a IProcessAsyncOperation interface, instead of a Process
-	  instance. In this way it is possible to create external
-	  consoles which are not directly bound to a process.
-
-2010-03-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.cs: Moved external console creation to the
-	  platform service.
-
-2010-03-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.cs: If getting the mime type using gio fails
-	  for some reason, fallback to vfs.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* GnomePlatform.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gio.cs:
-	* Makefile.am:
-	* GnomePlatform.cs:
-	* GnomePlatform.csproj:
-	* GnomePlatform.addin.xml: Merged MD.Projects into MD.Core,
-	  and MD.Projects.Gui, MD.Core.Gui and MD.Components into
-	  MD.Ide.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.csproj: Add missing reference.
-
-2010-02-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* GnomePlatform.cs: Tidy up GIO vs. GnomeVFS a bit.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* GnomePlatform.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.csproj: Flush.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* GnomePlatform.csproj: Mark gtk-sharp/pango-sharp with
-	SpecificVersion=false. Add 'GnomePlatform.dll.config' to
-	the project, this is already there in the makefile.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* GnomePlatform.addin.xml: Bump MD version.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.csproj: Updated dependencies. We now depend on
-	  gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-06-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.cs: Fallback to Vfs if Gio doesn't have mime
-	  type info for a file.
-
-2009-04-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.csproj: Don't require a specific gtk# version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* GnomePlatform.addin.xml: Bump MD version.
-
-2009-02-26  Mike Kestner  <mkestner@novell.com>
-
-	* Gio.cs: remove an unref that can cause double frees, even
-	though the docs say the GFileInfo should be unref'd.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* GnomePlatform.csproj: Remove more inadvertent local copying
-	  of references.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.csproj: Flush.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.mdp:
-	* GnomePlatform.csproj: Migrated to MSBuild file format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* GnomePlatform.addin.xml: Bump MD version.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* GnomePlatform.mdp: Flush project format changes.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* GnomePlatform.mdp: Fix project file.
-
-	* GnomePlatform.cs: Remove unused code.
-
-2008-12-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.addin.xml: Hide/protect add-ins.
-
-2008-12-04  Mike Kestner  <mkestner@novell.com>
-
-	* GnomePlatform.cs: still need to initialize gnomevfs for the icon
-	lookup.
-
-2008-12-04  Mike Kestner  <mkestner@novell.com>
-
-	* GnomePlatform.cs: add gio hooks.
-	* GnomePlatform.dll.config: pinvoke-fu.
-	* Gio.cs: gio-based mime lookup code.
-	* Makefile.am: new files and config file magic.
-	[Fixes #400642]
- 
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* GnomePlatform.mdp: Add AssemblyInfo.cs files that are autogenerated
-	from the addin manifests.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build dependencies.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GnomePlatform.addin.xml: Bump MD version.
-
-2008-07-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.cs: Escape file names when querying the mime type.
-
-2008-07-15  Mike Krüger <mkrueger@novell.com> 
-
-	* GnomePlatform.cs: Fixed possible null reference exception.
-
-2008-06-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.mdp: Fix runtime version.
-	* GnomePlatform.cs: Gnome.Icon.LookupSync crashes in old gnome versions
-	  if the file doesn't exist. Fixed this case in OnGetPixbufForFile.
-	  Fixes bug #400297.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.addin.xml: Bump MD version.
-
-2008-06-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.mdp: Some fixes in project files.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am, GnomePlatform.mdp: New project model changes.
-
-2008-05-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* GnomePlatform.cs: Moved the code here that uses the gedit file
-	  association to check whether a file is text.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.mdp: Remove unneeded reference.
-	* GnomePlatform.cs: Track api changes.
-
-2008-03-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* GnomePlatform.cs: Try to use the base implementation of GetMimeTypeForUri
-	  to get a useful value, before falling back to GnomeVFS. Allows finding
-	  mimetypes not registered on the system.
-
-2008-02-14  Geoff Norton  <gnorton@novell.com>
-
-	* GnomePlatform.cs: Expose the Name property.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.addin.xml: Update MD version.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.addin.xml: Updated add-in category and description.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.addin.xml, Makefile.am, GnomePlatform.mdp, GnomePlatform.cs:
-	  Moved PlatformService to MD.Core.Gui. Removed old FileIconService class,
-	  which is now implemented in PlatformService.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.addin.xml: Fix typo.
-	* Makefile.am, GnomePlatform.mdp: Added MD project.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GnomePlatform.addin.xml: Bump add-in versions.
-
-2007-12-06  Geoff Norton  <gnorton@novell.com>
-
-	* Initial check-in for the Gnome backend to the PlatformService
diff --git a/main/src/addins/GnomePlatform/GnomePlatform.cs b/main/src/addins/GnomePlatform/GnomePlatform.cs
index beb5f8e4c0..72ceff795f 100644
--- a/main/src/addins/GnomePlatform/GnomePlatform.cs
+++ b/main/src/addins/GnomePlatform/GnomePlatform.cs
@@ -208,7 +208,7 @@ namespace MonoDevelop.Platform
 		TerminalRunnerHandler runner;
 		TerminalOpenFolderRunnerHandler openDirectoryRunner;
 		
-		public override IProcessAsyncOperation StartConsoleProcess (string command, string arguments, string workingDirectory,
+		public override ProcessAsyncOperation StartConsoleProcess (string command, string arguments, string workingDirectory,
 		                                                            IDictionary<string, string> environmentVariables, 
 		                                                            string title, bool pauseWhenFinished)
 		{
@@ -225,7 +225,7 @@ namespace MonoDevelop.Platform
 			ProcessWrapper proc = new ProcessWrapper ();
 			proc.StartInfo = psi;
 			proc.Start ();
-			return proc;
+			return proc.ProcessAsyncOperation;
 		}
 		
 #region Terminal runner implementations
diff --git a/main/src/addins/ILAsmBinding/ChangeLog b/main/src/addins/ILAsmBinding/ChangeLog
deleted file mode 100644
index 7929182082..0000000000
--- a/main/src/addins/ILAsmBinding/ChangeLog
+++ /dev/null
@@ -1,468 +0,0 @@
-2010-06-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmCompilerManager.cs: Track api changes.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ILAsmBinding.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* ILAsmBinding.csproj:
-	* ILAsmBinding.addin.xml:
-	* Gui/CompilerParametersPanelWidget.cs: Merged MD.Projects
-	  into MD.Core, and MD.Projects.Gui, MD.Core.Gui and
-	  MD.Components into MD.Ide.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/ILAsmBinding.CompilerParametersPanelWidget.cs:
-	  Flush.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmLanguageBinding.cs:
-	* ILAsmCompilerManager.cs: Introduced the
-	  ConfigurationSelector class to all methods that previously
-	  took a configuration name as string. This eliminates the
-	  ambiguity between solution configuration names and project
-	  configuration names.
-
-2009-11-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmCompilerManager.cs: Minor fix in error parsing.
-
-2009-11-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmConsoleProject.xpt.xml: Add mscorlib reference to the
-	  template.
-
-2009-11-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmCompilerManager.cs: Make the error parsing regex work
-	  on ms.net.
-
-2009-11-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmCompilerManager.cs: Show an error message when ilasm is
-	  not found.
-
-2009-11-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmCompilerManager.cs: Get the ilasm path using the target
-	  runtime. Should fix bug #553536 - IL Console project
-	  completely broken on windows.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ILAsmBinding.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmBinding.csproj:
-	* gtk-gui/generated.cs:
-	* gtk-gui/ILAsmBinding.CompilerParametersPanelWidget.cs:
-	  Flush.
-
-2009-10-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmConsoleProject.xpt.xml: Track language binding id
-	  change.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ILAsmBinding.addin.xml: Bump MD version.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* ILAsmCompilerManager.cs: Fixed warning.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmBinding.csproj: Updated dependencies. We now depend on
-	  gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmCompilerManager.cs: Track api changes.
-
-2009-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* gtk-gui/ILAsmBinding.CompilerParametersPanelWidget.cs:
-	  Checked in gtk-gui
-
-2009-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* ILAsmBinding.csproj:
-	* ILAsmBinding.addin.xml:
-	* ILAsmLanguageBinding.cs:
-	* ILAsmCompilerManager.cs:
-	* Gui/CompilerParametersPanel.cs:
-	* Project/ILAsmCompilerParameters.cs:
-	* Gui/CompilerParametersPanelWidget.cs: Worked on IL binding.
-
-2009-04-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ILAsmLanguageBinding.cs: Track comment tag API.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* ILAsmBinding.csproj: don't require specific gtk-sharp version.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* ILAsmLanguageBinding.cs: Removed icon service.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ILAsmBinding.addin.xml: Bump MD version.
-
-2009-02-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmLanguageBinding.cs:
-	* Project/ILAsmCompilerParameters.cs: Track api changes.
-
-2009-02-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmLanguageBinding.cs:
-	* ILAsmCompilerManager.cs: Track API changes. Use the new
-	  ProjectItem collection.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* ILAsmBinding.csproj: Make implicit references explicit. Csc
-	  is much pickier about these.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmBinding.mdp:
-	* ILAsmBinding.csproj: Migrated to MSBuild file format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* ILAsmBinding.addin.xml: Bump MD version.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* ILAsmBinding.mdp: Flush project format changes.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmBinding.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmBinding.mdp: Don't require a specific version of Mono.Addins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmBinding.addin.xml: Bump MD version.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* ILAsmCompilerManager.cs: Track API.
-
-2008-08-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Register the project guid for msbuild. Fixes
-	  bug #405480.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* ILAsmLanguageBinding.cs: Translated old code to new dom.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/ILAsmCompilerParameters.cs: Moved serialization engine to
-	  MonoDevelop.Core. Use new syntax for specifying attribute scope.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Bump MD version.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Merged the extension points for project and
-	  solution option panels into a single extension point. A single
-	  extension point will now be used for all kinds of items. Extension
-	  conditions can be used to make panels visible only for some
-	  specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmCompilerManager.cs, ILAsmLanguageBinding.cs: Replaced
-	  ICompilerResult/DefaultCompilerResult/CompilerResults by a new
-	  BuildResult class, which has owner information at error level, so
-	  it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.mdp, Gui/CompilerParametersPanel.cs,
-	  ILAsmLanguageBinding.cs, Makefile.am, ILAsmBinding.addin.xml: New
-	  project model changes.
-
-2008-02-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmCompilerManager.cs: Properly detect and report compiler errors. Fixes
-	  bug #358360.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Update MD version.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* ILAsmConsoleProject.xpt.xml: Make template categories translatable.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.mdp, Makefile.am: Directory reorganization.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Bump MD version.
-
-2007-10-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.mdp, ILAsmConsoleProject.xpt.xml, Makefile.am,
-	  icons/ILAsm.Project.DOSProject: Updated project icons. Use the base
-	  project icon with an overlay to show the type.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.mdp: Project file names updated by change in MD path
-	  functions.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Bump MD version.
-
-2007-09-04  Michael Hutchinson <MHutchinson@novell.com> 
-
-	* Gui/CompilerParametersPanel.cs: Fix compiler warning.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CompilerParametersPanel.cs: Changes due to new property
-	  infrastructure.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.mdp, Makefile.am, ILAsmBinding.addin.xml: Reorganized the
-	  extension point hierarchy. Embedded all add-in manifests as resources.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.mdp: Copy the .addins.xml file to the output dir.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.mdp, Makefile.am: Reference shared assemblies from the
-	  correct location.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.mdp, Gui/CompilerParametersPanel.cs, Makefile.am,
-	  ILAsmBinding.addin.xml: Migration to Mono.Addins.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.mdp: Don't copy referenced assemblies.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AssemblyInfo.cs: Removed version auto-increment.
-	* ILAsmBinding.mdp, Makefile.am: Synchronized the MD project and the
-	  Makefile
-
-2006-12-07 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* ILAsmBinding.mdp: Updated to ensure it can be
-	built from MonoDevelop.
-
-2006-09-18 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* ILAsmBinding.mdp: Updated.
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Updated versions.
-
-2006-06-15 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmBinding.addin.xml: Use the DataType element instead fof Class
-	  to declare serializable types.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmBinding.addin.xml: Updated versions.
-	* ILAsmBinding.mdp: Updated.
-
-2006-04-21 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* ILAsmLanguageBinding.cs: Implement GetSupportedClrVersions.
-
-2006-04-07  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* ILAsmBinding.addin.xml: renamed attribute in FileFilter Extension
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am:
-	* ILAsmBinding.addin.xml: Updated references.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* ILAsmBinding.mdp: Updated.
-	* Makefile.am: Use an unified format. Patch by Matze Braun.
-	* ILAsmBinding.addin.xml: Updated add-in versions.
-
-2005-12-13  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* ILAsmLanguageBinding.cs: Implemented the new methods in
-	IDotNetLanguageBinding.
-
-2005-10-11  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Fixed addin header information.
-	Use "id" attribuet instead of "name" to identify addins.
-
-2005-10-06  John Luke  <john.luke@gmail.com>
-
-	* ILAsmCompilerManager.cs: remove unused fileUtilityService
-	* Gui/CompilerParametersPanel.cs: comment out unused code that
-	caused a warning
-
-2005-10-06  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml:
-	* ILAsmLanguageBinding.cs: Register serializable types in the addin
-	configuration file.
-
-2005-10-04  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* ILAsmBinding.addin.xml: Added addin dependencies.
-
-2005-08-12  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* ILAsmConsoleProject.xpt.xml: Properly reference resource icons.
-	* ILAsmBinding.addin.xml:
-	* Makefile.am: Embed icon and templates as resources.
-
-2005-08-10  Ben Motmans  <ben.motmans@gmail.com>
-
-	* ILAsmBinding.mdp: references update
-
-2005-07-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/ILAsmCompilerParameters.cs: Implement ICloneable.
-	* ILAsmLanguageBinding.cs: CreateCompilationParameters now returns an
-	ICloneable.
-
-2005-04-17  John Luke  <john.luke@gmail.com>
-
-	* Makefile.am: fix distcheck
-
-2005-02-16  Ben Motmans  <ben.motmans@gmail.com>
-
-	* ILAsmConsoleProject.xpt.xml: Consistent naming
-
-2005-01-24  John Luke  <john.luke@gmail.com>
-
-	* ILAsmCompilerManager.cs: update to work like CSharpBinding
-	and add some primitive error parsing
-
-2005-01-24  John Luke  <john.luke@gmail.com>
-
-	* ILAsmCompilerManager.cs: remove unused lines and fix 2 warnings
-
-2005-01-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmLanguageBinding.cs:
-	* ILAsmCompilerManager.cs: Use the new progress monitor API.
-
-2005-01-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmCompilerManager.cs:
-	* Gui/CompilerParametersPanel.cs:
-	* ILAsmBinding.addin.xml:
-	* ILAsmLanguageBinding.cs: Follow architecture changes.
-	
-	* Project/ILAsmProject.cs: Removed. Not needed any more.
-	* Project/ILAsmCompilerParameters.cs: All parameters have been moved to
-	DotNetProjectConfiguration.
-	* Project/CompilationTarget.cs: Moved to Monodevelop.Base.
-	* Makefile.am: Updated.
-	
-2004-12-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ILAsmCompilerManager.cs: StatusBarService.ProgressMonitor is not a
-	StatusBar widget any more.
-
-2004-12-07  Alexandre Gomes <alexmipego@hotmail.com>
-
-	* ILAsmLanguageBinding.cs: Added CommentTag to be used by (Un)CommentCode
-
-2004-06-08  John Luke  <jluke@cfl.rr.com>
-
-	* ILAsmCompilerManager.cs:
-	* ILAsmExecutionManager.cs: use (cmd, args) overload of ProcessStartInfo
-	constructor so I can compile and run hello world on Beta2
-
-2004-05-25  Todd Berman  <tberman@sevenl.net>
-
-	* ILAsmLanguageBinding.cs: sigchange for GenerateMakefile
-
-2004-04-28  Todd Berman  <tberman@sevenl.net>
-
-	* ILAsmLanguageBinding.cs: stubbing GenerateMakefile
-
-
-2004-04-26  John Luke  <jluke@cfl.rr.com>
-
-	* *.cs: ILAsmBinding namespace
-	* ILAsmCompilerManager.cs: change it to work like the Java one
-	* Project/CompilationParameters.cs: use /exe and /dll
-
-
-
-
-	import from SD svn
-	not yet working and untested
-
diff --git a/main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs b/main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs
index fca18554b9..e4fa67756f 100644
--- a/main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs
+++ b/main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using Gtk;
@@ -53,13 +54,13 @@ namespace ILAsmBinding
 			this.project       = project;
 			this.configuration = configuration;
 			compileTargetCombo.Active          = configuration.CompileTarget == CompileTarget.Exe ? 0 : 1;
-			checkbuttonIncludeDebugInfo.Active = configuration.DebugMode;
+			checkbuttonIncludeDebugInfo.Active = configuration.DebugSymbols;
 		}
 		
 		public void Store ()
 		{
 			project.CompileTarget = compileTargetCombo.Active == 0 ? CompileTarget.Exe : CompileTarget.Library;
-			configuration.DebugMode = checkbuttonIncludeDebugInfo.Active;
+			configuration.DebugSymbols = checkbuttonIncludeDebugInfo.Active;
 		}
 	}
 	
@@ -67,7 +68,7 @@ namespace ILAsmBinding
 	{
 		CompilerParametersPanelWidget widget;
 		
-		public override Widget CreatePanelWidget()
+		public override Control CreatePanelWidget()
 		{
 			return widget = new CompilerParametersPanelWidget ();
 		}
diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml b/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml
index 6ddaeb5f90..f40c5d46d7 100644
--- a/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml
+++ b/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml
@@ -1,28 +1,29 @@
 <ExtensionModel>
 
 	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
-		<ProjectTemplate id = "ILAsmConsoleProject" resource = "ILAsmConsoleProject.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.IL.ConsoleProject" resource = "ILAsmConsoleProject.xpt.xml"/>
 	</Extension>
 	<Extension path = "/MonoDevelop/Ide/FileFilters">
 		<FileFilter id = "ILAsm Files" _label = "ILAsm Files" extensions = "*.il"/>
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build">
-		<Condition id="ActiveLanguage" value = "IL">
+		<Condition id="ProjectTypeId" value = "IL">
 			<Section id = "ILAsmCompilerParametersPanel" _label = "Compiler" class = "ILAsmBinding.CompilerParametersPanel"/>
 		</Condition>
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectModel/LanguageBindings">
-		<LanguageBinding id = "ILAsm" supportedextensions = ".il" class = "ILAsmBinding.ILAsmLanguageBinding"/>
+		<LanguageBinding id = "IL" extensions = ".il" singleLineCommentTag = "//" blockCommentStartTag = "/*" blockCommentEndTag = "*/" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
-		<DataType class = "ILAsmBinding.ILAsmCompilerParameters" />
-	</Extension>
-	
 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
-		<DotNetProject  language="IL" extension="ilproj" guid="{B4EC64DC-6D44-11DD-AAB0-C9A155D89593}"/>
+		<DotNetProjectType 
+			language="IL"
+			extension="ilproj"
+			guid="{B4EC64DC-6D44-11DD-AAB0-C9A155D89593}"
+			type="ILAsmBinding.ILAsmProject" 
+			msbuildSupport="NotSupported" />
 	</Extension>
 	
 </ExtensionModel>
diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj
index 62a3fff13c..7eb5d92e8c 100644
--- a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj
+++ b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj
@@ -90,11 +90,11 @@
     <Compile Include="Project\ILAsmCompilerParameters.cs" />
     <Compile Include="ILAsmCompilerManager.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="ILAsmLanguageBinding.cs" />
     <Compile Include="Gui\CompilerParametersPanelWidget.cs" />
     <Compile Include="gtk-gui\generated.cs" />
     <Compile Include="gtk-gui\ILAsmBinding.CompilerParametersPanelWidget.cs" />
     <Compile Include="AddinInfo.cs" />
+    <Compile Include="ILAsmProject.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs b/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
index ca951872d9..941bf906a0 100644
--- a/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
+++ b/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
@@ -48,7 +48,7 @@ namespace ILAsmBinding
 			sb.Append ("\" ");
 		}
 		
-		public static BuildResult Compile (ProjectItemCollection projectItems, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, IProgressMonitor monitor)
+		public static BuildResult Compile (ProjectItemCollection projectItems, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, ProgressMonitor monitor)
 		{
 //			ILAsmCompilerParameters compilerParameters = (ILAsmCompilerParameters)configuration.CompilationParameters ?? new ILAsmCompilerParameters ();
 			string outputName       = configuration.CompiledOutputName;
@@ -69,7 +69,7 @@ namespace ILAsmBinding
 					break;
 			}
 			
-			if (configuration.DebugMode)
+			if (configuration.DebugSymbols)
 				sb.Append ("/debug ");
 			
 			foreach (ProjectFile finfo in projectItems.GetAll<ProjectFile> ()) {
diff --git a/main/src/addins/ILAsmBinding/ILAsmLanguageBinding.cs b/main/src/addins/ILAsmBinding/ILAsmLanguageBinding.cs
deleted file mode 100644
index c45ea65c3f..0000000000
--- a/main/src/addins/ILAsmBinding/ILAsmLanguageBinding.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// 
-// ILAsmLanguageBinding.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Xml;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-
-namespace ILAsmBinding
-{
-	class ILAsmLanguageBinding : IDotNetLanguageBinding
-	{
-		public string Language {
-			get {
-				return "IL";
-			}
-		}
-		
-		public string ProjectStockIcon {
-			get { 
-				return "md-project";
-			}
-		}
-		
-		public bool IsSourceCodeFile (FilePath fileName)
-		{
-			return String.Compare (Path.GetExtension (fileName), ".il", StringComparison.OrdinalIgnoreCase) == 0;
-		}
-		
-		public BuildResult Compile (ProjectItemCollection projectItems, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, IProgressMonitor monitor)
-		{
-			return ILAsmCompilerManager.Compile (projectItems, configuration, configSelector, monitor);
-		}
-		
-		public ConfigurationParameters CreateCompilationParameters (XmlElement projectOptions)
-		{
-			return new ILAsmCompilerParameters();
-		}
-	
-		public ProjectParameters CreateProjectParameters (XmlElement projectOptions)
-		{
-			return null;
-		}
-		
-		public string SingleLineCommentTag { get { return "//"; } }
-		public string BlockCommentStartTag { get { return "/*"; } }
-		public string BlockCommentEndTag { get { return "*/"; } }
-		
-		public System.CodeDom.Compiler.CodeDomProvider GetCodeDomProvider ()
-		{
-			return null;
-		}
-		
-		public FilePath GetFileName (FilePath baseName)
-		{
-			return baseName + ".il";
-		}
-		
-		public ClrVersion[] GetSupportedClrVersions ()
-		{
-			return new [] { 
-				ClrVersion.Net_1_1, 
-				ClrVersion.Net_2_0,
-				ClrVersion.Clr_2_1,
-				ClrVersion.Net_4_0,
-				ClrVersion.Net_4_5,
-			};
-		}
-	}
-}
diff --git a/main/src/addins/ILAsmBinding/ILAsmProject.cs b/main/src/addins/ILAsmBinding/ILAsmProject.cs
new file mode 100644
index 0000000000..da8ba321f0
--- /dev/null
+++ b/main/src/addins/ILAsmBinding/ILAsmProject.cs
@@ -0,0 +1,56 @@
+//
+// ILAsmProject.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Projects;
+using MonoDevelop.Core;
+
+namespace ILAsmBinding
+{
+	public class ILAsmProject: DotNetProject
+	{
+		protected override BuildResult OnCompileSources (ProjectItemCollection items, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, ProgressMonitor monitor)
+		{
+			return ILAsmCompilerManager.Compile (items, configuration, configSelector, monitor);
+		}
+
+		protected override DotNetCompilerParameters OnCreateCompilationParameters (DotNetProjectConfiguration config, ConfigurationKind kind)
+		{
+			return new ILAsmCompilerParameters();
+		}
+
+		protected override ClrVersion[] OnGetSupportedClrVersions ()
+		{
+			return new [] { 
+				ClrVersion.Net_1_1, 
+				ClrVersion.Net_2_0,
+				ClrVersion.Clr_2_1,
+				ClrVersion.Net_4_0,
+				ClrVersion.Net_4_5,
+			};
+		}
+	}
+}
+
diff --git a/main/src/addins/ILAsmBinding/Project/ILAsmCompilerParameters.cs b/main/src/addins/ILAsmBinding/Project/ILAsmCompilerParameters.cs
index 80c1af76db..9b509a6112 100644
--- a/main/src/addins/ILAsmBinding/Project/ILAsmCompilerParameters.cs
+++ b/main/src/addins/ILAsmBinding/Project/ILAsmCompilerParameters.cs
@@ -26,7 +26,7 @@
 
 namespace ILAsmBinding
 {
-	class ILAsmCompilerParameters : MonoDevelop.Projects.ConfigurationParameters
+	class ILAsmCompilerParameters : MonoDevelop.Projects.DotNetCompilerParameters
 	{
 	}
 }
diff --git a/main/src/addins/MacPlatform/ChangeLog b/main/src/addins/MacPlatform/ChangeLog
deleted file mode 100644
index 9b29d2c928..0000000000
--- a/main/src/addins/MacPlatform/ChangeLog
+++ /dev/null
@@ -1,861 +0,0 @@
-2010-07-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MacPlatform.cs: Better fix for Bug 617276 - MonoDevelop
-	  crashes when clicking on a script error in Unity3d.
-
-2010-06-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MacPlatform.cs: Quote paths when opening files.
-
-2010-06-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MacPlatform.cs: Implemented CanOpenTerminal/OpenInTerminal.
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Updater/UpdateService.cs: Fix incorrect use of
-	  ShowCustomDialog/RunCustomDialog.
-
-2010-05-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Menus/OSXMenu.cs: Add a Return glyph mapping.
-
-2010-05-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MacPlatform.cs: More Macification.
-
-2010-05-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MacPlatform.cs: Macify some command names.
-
-2010-05-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Menus/OSXMenu.cs: Attempt to fix keyval->menu accel mapping
-	  for non-English keyboards.
-
-2010-05-11  Levi Bard  <levi@unity3d.com>
-
-	* Framework/AppleEvent.cs: Off-by-one.
-
-2010-05-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Menus/OSXMenu.cs: Track api changes.
-
-2010-05-04  Jonathan Pobst  <monkey@jpobst.com>

-

-	* Framework/AppleScript.cs: csc can't do Enum->Struct cast,

-	make it an Enum->int->Struct cast.

-

-2010-04-28  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* MacPlatform.cs:

-	* MacPlatform.csproj:

-	* Framework/AppleScript.cs:

-	* ExternalConsoleProcess.cs: Implemented Mac external console,

-	  somewhat hackily.

-

-2010-04-28  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs:

-	* Menus/OSXMenu.cs: Cleaner OpenUrl implementation.

-

-2010-04-27  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* MacPlatform.cs:

-	* MacPlatform.csproj: Call 'open' directly when opening urls

-	  to avoid the -W argument that mono adds, which leaves us

-	  with lots of zombie 'open' processes.

-

-2010-04-25  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework/Carbon.cs:

-	* Framework/AppleEvent.cs:

-	* Framework/AppleScript.cs: Moved all the AE stuff from Carbon

-	  to AppleEvents.

-

-2010-04-25  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework/Carbon.cs:

-	* Framework/AppleEvent.cs:

-	* Framework/AppleScript.cs:

-	* Framework/ComponentManager.cs: Finally, working support for

-	  running AppleScript directly.

-

-2010-04-23  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* MacPlatform.csproj:

-	* Framework/Carbon.cs:

-	* Framework/NavDialog.cs:

-	* Framework/AppleEvent.cs:

-	* Framework/AppleScript.cs:

-	* Framework/ComponentManager.cs: Bind some OSA/AppleScript

-	  stuff.

-

-2010-04-22  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Track API.

-

-2010-04-19  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Remove debug code.

-

-2010-04-18  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Pass source type to command dispatch. Use

-	  command dispatch event to flash menubar when commands are

-	  triggered from a keybinding.

-

-	* MacPlatform.cs: Convert enum command IDs to strings in a

-	  compatible way so they can be matched against the values we

-	  get from the command service.

-

-	* Framework/HIToolbox.cs: Add P/Invoke sigs.

-

-2010-03-27  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs:

-	* Framework/Carbon.cs:

-	* Framework/ApplicationEvents.cs: Don't crash when the user

-	  cancels quitting.

-

-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* AssemblyInfo.cs:

-	* MacPlatform.addin.xml: Bumped MD version.

-

-2010-03-18  Levi Bard  <levi@unity3d.com>

-

-	* MacPlatform.cs: Track API changes.

-

-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* Makefile.am:

-	* Commands.cs:

-	* MacPlatform.cs:

-	* Menus/OSXMenu.cs:

-	* MacPlatform.csproj:

-	* gtk-gui/gui.stetic:

-	* MacPlatform.addin.xml:

-	* Updater/UpdateResult.cs:

-	* Updater/UpdateDialog.cs:

-	* Updater/UpdateService.cs: Merged MD.Projects into MD.Core,

-	  and MD.Projects.Gui, MD.Core.Gui and MD.Components into

-	  MD.Ide.

-

-2010-03-16  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Unbreak the OpenDocuments handler - the

-	  position handling changes stopped it from working when

-	  starting MD and when opening solutions.

-

-2010-03-16  Levi Bard  <levi@unity3d.com>

-

-	* MacPlatform/MacPlatform.cs

-	* MacPlatform/Framework/Carbon.cs

-	* MacPlatform/Framework/ApplicationEvents.cs: Enable position 

-	  to be passed in OpenDocuments call.

-

-2010-02-23  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* MacPlatform.csproj:

-	* Framework/NavDialog.cs:

-	* Framework/HIToolbox.cs:

-	* Framework/AppleEvent.cs:

-	* Framework/CoreFoundation.cs:

-	* MacSelectFileDialogHandler.cs: More work on native dialogs.

-

-2010-02-22  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.addin.xml: Fix extensions.

-

-	* MacSelectFileDialogHandler.cs: Stub other dialog handlers.

-

-2010-02-22  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework/Carbon.cs: Better errors in exceptions.

-

-2010-02-22  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* MacPlatform.csproj:

-	* Framework/Carbon.cs:

-	* MacPlatform.addin.xml:

-	* Framework/NavDialog.cs:

-	* MacSelectFileDialogHandler.cs: First shot at implementing

-	  Mac native dialogs.

-

-2010-01-28  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateService.cs: Send env flags to the update

-	  server.

-

-2010-01-28  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateDialog.cs: Colorize betas and alphas in the

-	  update dialog.

-

-2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateResult.cs: Fix property initialization.

-

-	* Updater/UpdateDialog.cs: Remove unused field.

-

-	* Updater/UpdateService.cs: Fix attribute name.

-

-2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateDialog.cs: Fix threading issue.

-

-2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* gtk-gui/gui.stetic:

-	* gtk-gui/generated.cs:

-	* Updater/UpdateResult.cs:

-	* Updater/UpdateDialog.cs:

-	* Updater/UpdateService.cs:

-	* gtk-gui/MonoDevelop.Platform.Updater.UpdateDialog.cs: Add

-	  new alpha channel and clean up GUI for switching channels.

-

-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateDialog.cs: Remove stray ShowAll call.

-

-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateDialog.cs: Tidy up updater GUI a little more.

-

-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateDialog.cs: Improve update GUI a bit more.

-

-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateDialog.cs: Tidy up the update list a little.

-

-2010-01-21  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework/Carbon.cs:

-	* Framework/ApplicationEvents.cs: Fix HandleOpenUrls event

-	  class and string marshalling. Also fix event uninstallation.

-

-2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework/ApplicationEvents.cs: Fix event IDs. Use

-	  GetUrlListFromEventRef.

-

-	* Framework/Carbon.cs: New GetUrlListFromEventRef and

-	  GetStringFromAEPtr methods.

-

-2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs:

-	* Framework/ApplicationEvents.cs: Remove OpenContents event

-	  since it didn't really work.

-

-2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework/ApplicationEvents.cs: Fix locking.

-

-2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* MacPlatform.cs:

-	* MacPlatform.csproj:

-	* Framework/Carbon.cs:

-	* Framework/ApplicationEvents.cs: Refactor out

-	  ApplicationEvents code.

-

-2010-01-14  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateDialog.cs: Cache the stable/unstable result so

-	  we don't re-request on every toggle.

-

-2010-01-13  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateDialog.cs:

-	* Updater/UpdateService.cs: Let the server handle the logic of

-	  showing stable updates to users with unstable versions when

-	  they opt back out of the unstable channel.

-

-2010-01-13  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater/UpdateDialog.cs:

-	* Updater/UpdateResult.cs:

-	* Updater/UpdateService.cs: Filter and flag unstable updates.

-

-2010-01-13  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* gtk-gui/gui.stetic:

-	* Updater/UpdateDialog.cs:

-	* gtk-gui/MonoDevelop.Platform.Updater.UpdateDialog.cs: Tweak

-	  layout. Show message when fetching unstable updates.

-

-2010-01-13  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Updater:

-	* Makefile.am:

-	* Commands.cs:

-	* MacUpdater.cs:

-	* UpdateDialog.cs:

-	* MacPlatform.csproj:

-	* gtk-gui/gui.stetic:

-	* Updater/Commands.cs:

-	* MacPlatform.addin.xml:

-	* Updater/UpdateResult.cs:

-	* Updater/UpdateDialog.cs:

-	* Updater/UpdateService.cs:

-	* gtk-gui/MonoDevelop.Platform.UpdateDialog.cs:

-	* gtk-gui/MonoDevelop.Platform.Updater.UpdateDialog.cs:

-	  Refactor the updater code into something a bit more

-	  reusable. Make update dialog singleton. Allow checking for

-	  unstable updates, when the web service allows it. Present

-	  errors in the updater dialog iteself.

-

-2009-12-16  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Use new Workbench.HasToplevelFocus

-	  property so that the main menu is enabled when focus is in

-	  floating pad.

-

-2009-12-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacUpdater.cs: Add the updateinfo for MonoTouch source.

-

-2009-12-03  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs:

-	* Framework/Carbon.cs: Try to set the process name using

-	  private carbon API, to make sure that the main menu displays

-	  correctly, even on 2.6 previews and when started from a

-	  launch script directly.

-

-2009-12-03  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Check that apache mime DB exists before

-	  trying to read it.

-

-2009-12-03  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Don't return an invalid application from

-	  GetAllApplications. Fixes "Bug 552403 - Right clicking Open

-	  With -> List of programs to open with on a file results in

-	  an exception".

-

-2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.addin.xml: Fix author.

-

-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* AssemblyInfo.cs:

-	* MacPlatform.addin.xml: Bump MD version.

-

-2009-10-13  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Oops, fix menu item index. With last few

-	  commits, fixes Bug 545151 - Dynamic submenus in Mac main

-	  menu don't work.

-

-2009-10-13  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Set the refcon in dynamic submenus, so the

-	  command can be run.

-

-2009-10-13  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Handle array separators, try 3.

-

-2009-10-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Fix separators in arrays commands, try 2.

-

-2009-10-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Fix separators in dynamic submenus.

-

-2009-10-07  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacUpdater.cs: Add csdk updateinfo file. Remove the hack for

-	  forcing Mono updateinfos as it won't work with the

-	  architectural variations of the Mono packages.

-

-2009-10-07  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Commands.cs:

-	* MacUpdater.cs:

-	* UpdateDialog.cs: Add workaround for updating older versions

-	  of Mono that don't have updateinfo file. Clean up API.

-

-2009-10-07  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacUpdater.cs: Tidy up.

-

-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* AssemblyInfo.cs:

-	* MacPlatform.addin.xml: Bump MD version.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* UpdateDialog.cs: Fix closure capturing var from loop. Tweak

-	  spacing.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* gtk-gui/gui.stetic:

-	* gtk-gui/MonoDevelop.Platform.UpdateDialog.cs: Fix label

-	  alignment.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* UpdateDialog.cs: Make textviews noneditable. Fix margins and

-	  wrapping.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* UpdateDialog.cs: Tweak presentation of release notes.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacUpdater.cs:

-	* UpdateDialog.cs: Better presentation of older releases.

-	  Tweak packing.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* UpdateDialog.cs:

-	* gtk-gui/gui.stetic:

-	* gtk-gui/MonoDevelop.Platform.UpdateDialog.cs: Tweak frames.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* UpdateDialog.cs: Add frames around the updates.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* UpdateDialog.cs:

-	* gtk-gui/gui.stetic:

-	* gtk-gui/MonoDevelop.Platform.UpdateDialog.cs: Restore the

-	  info label.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Commands.cs:

-	* MacPlatform.cs:

-	* MacPlatform.addin.xml: Use a proper startup command handler.

-

-	* MacUpdater.cs:

-	* UpdateDialog.cs:

-	* gtk-gui/gui.stetic:

-	* gtk-gui/MonoDevelop.Platform.UpdateDialog.cs: Simplify

-	  dialog and show it down there are no updates.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* UpdateDialog.cs:

-	* gtk-gui/MonoDevelop.Platform.UpdateDialog.cs: Prettify

-	  update dialog.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Commands.cs: Hide command when no updateable packages exist.

-

-	* MacUpdater.cs: Fix update paths.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* UpdateDialog.cs: Add missing ShowAll call.

-

-	* MacUpdater.cs: If explictly checking for updates, tell the

-	  user if there are none.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.addin.xml: Fix command handler name.

-

-2009-10-01  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Commands.cs:

-	* MacPlatform.addin.xml: Add command for checking for updates.

-

-	* Makefile.am:

-	* MacPlatform.csproj: Updated.

-

-	* MacUpdater.cs:

-	* UpdateDialog.cs: Add updater dialog.

-

-	* gtk-gui:

-	* gtk-gui/gui.stetic:

-	* gtk-gui/generated.cs:

-	* gtk-gui/MonoDevelop.Platform.UpdateDialog.cs: Add generated

-	  files.

-

-2009-09-30  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* MacUpdater.cs:

-	* MacPlatform.cs:

-	* MacPlatform.csproj: Add mostly-implemented Mac updater.

-

-2009-09-09  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Commands.cs:

-	* Framework/Carbon.cs: ProcessHICommand takes command by ref.

-

-2009-09-09  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Commands.cs:

-	* Framework/Carbon.cs: Send the commands from the menu.

-

-2009-09-09  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.addin.xml: Fix command names.

-

-2009-09-09  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Commands.cs:

-	* Framework/Carbon.cs:

-	* MacPlatform.addin.xml: Add command handlers for Hide Window

-	  and Hide Others.

-

-2009-09-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.addin.xml: Fix casing of addin attribute.

-

-2009-09-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.addin.xml: Depend on the Ide addin.

-

-2009-09-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.addin.xml: Put the command in the menu.

-

-2009-09-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Commands.cs:

-	* Makefile.am:

-	* MacPlatform.csproj:

-	* MacPlatform.addin.xml: Add a Minimize command.

-

-2009-09-07  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Change default font to Monaco now that the

-	  text editor offset bug is fixed.

-

-2009-09-02  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Bump GTK+ requirement to 2.17.9 to require

-	  client-side windows, which greatly reduces rendering

-	  glitches.

-

-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* MacPlatform.csproj: Updated dependencies. We now depend on

-	  gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.

-

-2009-08-05  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Implement simple GMarkup stripping for

-	  command strings.

-

-2009-07-30  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Fix unhiding of menu items.

-

-2009-05-05  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Tweaks to display some glyphs correctly.

-

-2009-04-28  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Check GTK# version. Fix default font string.

-

-	* Framework/Carbon.cs: Fix build.

-

-2009-04-27  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Use Osaka Regular-Mono font as a workaround

-	  for kerning-related text selection issues with other

-	  Monospace fonts on Mac.

-

-2009-04-23  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework/Carbon.cs: More bindings.

-

-2009-04-20  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework/Carbon.cs: In-progress wrappers for file dialog

-	  APIs.

-

-2009-04-16  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Open files when the open-documents event

-	  comes in.

-

-	* Framework/Carbon.cs: Add a note about path length.

-

-2009-04-16  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework/Carbon.cs: Added P/Invokes and structure/enum

-	  definitions for AEDesc and FSRef manipulation.

-

-	* MacPlatform.cs: Register for file open events, and extract

-	  the filenames. Staticify some global stuff.

-

-2009-04-15  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Add some notes. Don't show accelerators

-	  with modifiers we can't display.

-

-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* AssemblyInfo.cs:

-	* MacPlatform.addin.xml: Bump MD version.

-

-2009-04-14  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Implement support for link commands. Tidy

-	  up errors and warnings.

-

-2009-04-13  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: When array commands have no items, leave

-	  an invisible item in the list so it can still get updated

-	  later.

-

-	* Framework/HIToolbox.cs: More P/Invokes.

-

-2009-04-13  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* MacPlatform.csproj: Updated.

-

-	* Ige:

-	* Ige/IgeMacDock.cs:

-	* Ige/IgeMacMenu.cs:

-	* Ige/IgeMacBundle.cs:

-	* Ige/ObjectManager.cs:

-	* Ige/IgeMacMenuGroup.cs:

-	* Ige/IgeMacAttentionType.cs:

-	* Ige/IgeMacAttentionRequest.cs: Remove IGE, as it's no longer

-	  used.

-

-	* Menus/OSXMenu.cs: Make comment clearer.

-

-	* MacPlatform.cs: Remove IGE. Add dock quit and click support.

-	  Stub doc open support.

-

-	* Framework/Carbon.cs: Add some more definitions.

-

-2009-04-10  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Implement support for array commands and

-	  dynamically populated submenus.

-

-	* Framework/HIToolbox.cs: More P/Invokes and enums.

-

-2009-04-10  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Keep commands ID mappings around

-	  permanently, so that recreation is cleaner. Fixes app menu

-	  commands after recreation.

-

-	* MacPlatform.cs: Hide quit command from file menu, since it's

-	  in app menu. Track API.

-

-2009-04-10  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Lots of refactoring. Handle updating text,

-	  accelerators, visibility, sensitivity. Hide unnecessary

-	  separators. Disable menus when MD root window doesn't have

-	  toplevel focus so that it can't interfere with modal

-	  dialogs. Map commands to standard command IDs when possible.

-	  Dispatch commands after returning from handler. Avoid

-	  command ID 0 since it's used when there's no command ID. Add

-	  an API for handling the app menu.

-

-	* MacPlatform.cs: Install app menu items without using IGE.

-	  Enable Mac menu since it mostly works now.

-

-	* Framework/Carbon.cs: More bindings. Fix Handled/NotHandled

-	  values (MWF had them the wrong way round).

-

-	* Framework/HIToolbox.cs: More bindings.

-

-2009-04-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* MacPlatform.csproj: Add System.Core ref.

-

-	* Menus/OSXMenu.cs: Implement command enabled/disable

-	  updating.

-

-	* Framework/Carbon.cs: Add command enums values.

-

-	* Framework/HIToolbox.cs: More P/Invokes.

-

-	* MacPlatform.cs: Track API. Hide commands that're in the app

-	  menu.

-

-2009-04-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Track API. Update menu when the command set

-	  changes.

-

-	* Framework/Carbon.cs: Wrap Install*EventHandler in nicer API.

-

-	* Framework/HIToolbox.cs: Add ClearMenuBar and DeleteMenu

-	  P/Invokes, and wrap CreateMenu in nicer API.

-

-	* Menus/OSXMenu.cs: Heavy refactoring. Make static, since

-	  there is only ever one global menu. Handle

-	  destorying/recreating menu. Track P/Invokes API wrapper

-	  changes.

-

-2009-04-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Menus/OSXMenu.cs: Don't use instance methods as callbacks,

-	  as the managed objects are currently GC'd. We can now handle

-	  the menu open events and writeline the menu names.

-

-	* Framework/Carbon.cs: Add a GetEventParameter overload for

-	  IntPtr.

-

-	* Framework/HIToolbox.cs: ToString overload for

-	  CarbonMenuException.

-

-2009-04-07  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Framework:

-	* Makefile.am:

-	* MacPlatform.csproj:

-	* Framework/Carbon.cs:

-	* Framework/HIToolbox.cs:

-	* Framework/CoreFoundation.cs: Move the P/Invokes and wrappers

-	  into a separate framework namespace.

-

-	* Menus/OSXMenu.cs: Add an event handler so that the commands

-	  are run when the menu's clicked. Move P/Invokes and wrappers

-	  into another namespace.

-

-2009-04-06  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Use the OSXMenu wrapper instead of IGE.

-	  Currently disabled.

-

-	* Menus:

-	* Makefile.am:

-	* Menus/OSXMenu.cs:

-	* MacPlatform.csproj: Add Miguel's first pass at wrapping the

-	  OS X menus.

-

-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* MacPlatform.csproj: Flush.

-

-2009-02-23  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.csproj: Remove unwanted local copies.

-

-2009-02-20  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.csproj: Enable makefile integration.

-

-	* Makefile.am: Update.

-

-2009-02-20  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Add working main menu support, but disable,

-	  because the menus don't display correctly. Add Mac-like

-	  close window, quit, etc behaviour. Add App menu commands.

-

-2009-02-19  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.csproj: Embed the addin manifest.

-

-2009-02-19  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.csproj: Updated.

-

-	* Ige:

-	* Ige/IgeMacDock.cs:

-	* Ige/IgeMacMenu.cs:

-	* Ige/IgeMacBundle.cs:

-	* Ige/ObjectManager.cs:

-	* Ige/IgeMacMenuGroup.cs:

-	* Ige/IgeMacAttentionType.cs:

-	* Ige/IgeMacAttentionRequest.cs: Add local copy of Mac

-	  integration binding.

-

-	* MacPlatform.cs: Implement main menu and Dock Quit

-	  integration. Untested.

-

-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.csproj: Remove more inadvertent local copying of

-	  references.

-

-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.csproj: Add project file for MacPlatform addin.

-

-2009-01-15  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* MacPlatform.cs: Fix spelling of default font's name.

-

-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* Makefile.am: Make it work for parallel build.

-

-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from

-	the addin manifests.

-

-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am: Fix build dependencies.

-

-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* MacPlatform.addin.xml: Bump MD version.

-

-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 

-

-	* MacPlatform.addin.xml: Bump MD version.

-

-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 

-

-	* MacPlatform.cs: Track api changes.

-

-2008-02-14  Geoff Norton  <gnorton@novell.com>

-

-	* MacPlatform.cs:  Expose the Name property.

-

-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 

-

-	* MacPlatform.addin.xml: Update MD version.

-

-2007-12-17  Geoff Norton  <gnorton@novell.com>

-

-	* Makefile.am: Fix the build on the Mac profile

-

-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 

-

-	* MacPlatform.addin.xml, MacPlatform.cs: Moved PlatformService to

-	  MD.Core.Gui. Removed old FileIconService class, which is now implemented

-	  in PlatformService.

-

-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 

-

-	* MacPlatform.addin.xml: Bump add-in versions.

-

-2007-12-06  Geoff Norton  <gnorton@novell.com>

-	

-	* Initial check in of the Mac PlatformService that provides

-	Mac equivalents to the Gnome calls in Gnome.Vfs

diff --git a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs
index 6dae47989f..51cbec79bf 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs
@@ -46,6 +46,7 @@ namespace MonoDevelop.MacIntegration
 		{
 			using (var alert = new NSAlert ()) {
 				alert.Window.Title = data.Title ?? BrandingService.ApplicationName;
+				IdeTheme.ApplyTheme (alert.Window);
 
 				bool stockIcon;
 				if (data.Message.Icon == MonoDevelop.Ide.Gui.Stock.Error || data.Message.Icon == Gtk.Stock.DialogError) {
@@ -61,7 +62,13 @@ namespace MonoDevelop.MacIntegration
 
 				if (!stockIcon && !string.IsNullOrEmpty (data.Message.Icon)) {
 					var img = ImageService.GetIcon (data.Message.Icon, Gtk.IconSize.Dialog);
-					alert.Icon = img.ToNSImage ();
+					// HACK: VK The icon is not rendered in dark style correctly
+					//       Use light variant and reder it here
+					//       as long as NSAppearance.NameVibrantDark is broken
+					if (IdeTheme.UserInterfaceSkin == Skin.Dark)
+						alert.Icon = img.WithStyles ("-dark").ToBitmap (GtkWorkarounds.GetScaleFactor ()).ToNSImage ();
+					else
+						alert.Icon = img.ToNSImage ();
 				} else {
 					//for some reason the NSAlert doesn't pick up the app icon by default
 					alert.Icon = NSApplication.SharedApplication.ApplicationIconImage;
@@ -149,7 +156,9 @@ namespace MonoDevelop.MacIntegration
 				}
 				
 				if (!data.Message.CancellationToken.IsCancellationRequested) {
+
 					var result = (int)alert.RunModal () - (long)(int)NSAlertButtonReturn.First;
+					
 					completed = true;
 					if (result >= 0 && result < buttons.Count) {
 						data.ResultButton = buttons [(int)result];
@@ -171,7 +180,9 @@ namespace MonoDevelop.MacIntegration
 				
 				if (applyToAllCheck != null && applyToAllCheck.State != 0)
 					data.ApplyToAll = true;
-				
+
+
+
 				GtkQuartz.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
 			}
 			
diff --git a/main/src/addins/MacPlatform/Dialogs/MacExceptionDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacExceptionDialogHandler.cs
deleted file mode 100644
index 44670fe2ed..0000000000
--- a/main/src/addins/MacPlatform/Dialogs/MacExceptionDialogHandler.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-// 
-// MacErrorDialogHandler.cs
-//  
-// Author:
-//       Alan McGovern <alan@xamarin.com>
-// 
-// Copyright 2011 Xamarin, Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-
-using Foundation;
-using CoreGraphics;
-using AppKit;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.Components.Extensions;
-using MonoDevelop.MacInterop;
-	
-namespace MonoDevelop.MacIntegration
-{
-	class MacExceptionDialogHandler : IExceptionDialogHandler
-	{
-		class MyTextView : NSTextView
-		{
-			public MyTextView (CGRect frame)
-				: base (frame)
-			{
-
-			}
-
-			public override void KeyDown (NSEvent theEvent)
-			{
-				if (theEvent.ModifierFlags.HasFlag (NSEventModifierMask.CommandKeyMask)) {
-					switch (theEvent.Characters) {
-					case "x":
-						Cut (this);
-						break;
-					case "c":
-						NSRange range = SelectedRange;
-						if (range.Length == 0)
-							SelectAll (this);
-						Copy (this);
-						break;
-					case "a":
-						SelectAll (this);
-						break;
-					}
-				}
-				
-				base.KeyDown (theEvent);
-			}
-		}
-		
-		public bool Run (ExceptionDialogData data)
-		{
-			using (var alert = new NSAlert { AlertStyle = NSAlertStyle.Critical }) {
-				alert.Icon = NSApplication.SharedApplication.ApplicationIconImage;
-				
-				alert.MessageText = data.Title ?? GettextCatalog.GetString ("Error");
-				
-				if (!string.IsNullOrEmpty (data.Message)) {
-					alert.InformativeText = data.Message;
-				}
-
-				List<AlertButton> buttons = null;
-				if (data.Buttons != null && data.Buttons.Length > 0)
-					buttons = data.Buttons.Reverse ().ToList ();
-
-				if (buttons != null) {
-					foreach (var button in buttons) {
-						var label = button.Label;
-						if (button.IsStockButton)
-							label = Gtk.Stock.Lookup (label).Label;
-						label = label.Replace ("_", "");
-
-						//this message seems to be a standard Mac message since alert handles it specially
-						if (button == AlertButton.CloseWithoutSave)
-							label = GettextCatalog.GetString ("Don't Save");
-
-						alert.AddButton (label);
-					}
-				}
-
-				if (data.Exception != null) {
-					var scrollSize = new CGSize (400, 130);
-					const float spacing = 4;
-					
-					string title = GettextCatalog.GetString ("View details");
-					string altTitle = GettextCatalog.GetString ("Hide details");
-					
-					var buttonFrame = new CGRect (0, 0, 0, 0);
-					var button = new NSButton (buttonFrame) {
-						BezelStyle = NSBezelStyle.Disclosure,
-						Title = "",
-						AlternateTitle = "",
-					};
-					button.SetButtonType (NSButtonType.OnOff);
-					button.SizeToFit ();
-					
-					var label = new MDClickableLabel (title) {
-						Alignment = NSTextAlignment.Left,
-					};
-					label.SizeToFit ();
-					
-					button.SetFrameSize (new CGSize (button.Frame.Width, NMath.Max (button.Frame.Height, label.Frame.Height)));
-					label.SetFrameOrigin (new CGPoint (button.Frame.Width + 5, button.Frame.Y));
-					
-					var text = new MyTextView (new CGRect (0, 0, float.MaxValue, float.MaxValue)) {
-						HorizontallyResizable = true,
-					};
-					text.TextContainer.ContainerSize = new CGSize (float.MaxValue, float.MaxValue);
-					text.TextContainer.WidthTracksTextView = true;
-					text.InsertText (new NSString (data.Exception.ToString ()));
-					text.Editable = false;
-
-					var scrollView = new NSScrollView (new CGRect (CGPoint.Empty, CGSize.Empty)) {
-						HasHorizontalScroller = true,
-						HasVerticalScroller = true,
-					};
-					
-					var accessory = new NSView (new CGRect (0, 0, scrollSize.Width, button.Frame.Height));
-					accessory.AddSubview (scrollView);
-					accessory.AddSubview (button);
-					accessory.AddSubview (label);
-					
-					alert.AccessoryView = accessory;
-					
-					button.Activated += delegate {
-						nfloat change;
-						if (button.State == NSCellStateValue.On) {
-							change = scrollSize.Height + spacing;
-							label.StringValue = altTitle;
-							scrollView.Hidden = false;
-							scrollView.Frame = new CGRect (CGPoint.Empty, scrollSize);
-							scrollView.DocumentView = text;
-						} else {
-							change = -(scrollSize.Height + spacing);
-							label.StringValue = title;
-							scrollView.Hidden = true;
-							scrollView.Frame = new CGRect (CGPoint.Empty, CGSize.Empty);
-						}
-						var f = accessory.Frame;
-						f.Height += change;
-						accessory.Frame = f;
-						var lf = label.Frame;
-						lf.Y += change;
-						label.Frame = lf;
-						var bf = button.Frame;
-						bf.Y += change;
-						button.Frame = bf;
-						label.SizeToFit ();
-						var panel = alert.Window;
-						var pf = panel.Frame;
-						pf.Height += change;
-						pf.Y -= change;
-						panel.SetFrame (pf, true, true);
-						//unless we assign the icon again, it starts nesting old icon into the warning icon
-						alert.Icon = NSApplication.SharedApplication.ApplicationIconImage;
-						alert.Layout ();
-					};
-					label.OnMouseUp += (sender, e) => button.PerformClick (e.Event);
-				}
-
-				var result = (int)(nint)alert.RunModal () - (int)(long)NSAlertButtonReturn.First;
-				data.ResultButton = buttons != null ? buttons [result] : null;
-				GtkQuartz.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
-			}
-			
-			return true;
-		}
-		
-		class MDClickableLabel: MDLabel
-		{
-			public MDClickableLabel (string text) : base (text)
-			{
-			}
-			
-			public override void MouseDown (NSEvent theEvent)
-			{
-				if (OnMouseDown != null)
-					OnMouseDown (this, new NSEventArgs (theEvent));
-				else
-					base.MouseDown (theEvent);
-			}
-			
-			public event EventHandler<NSEventArgs> OnMouseDown;
-			
-			public override void MouseUp (NSEvent theEvent)
-			{
-				if (OnMouseUp != null)
-					OnMouseUp (this, new NSEventArgs (theEvent));
-				else
-					base.MouseUp (theEvent);
-			}
-			
-			public event EventHandler<NSEventArgs> OnMouseUp;
-			
-			public override void MouseEntered (NSEvent theEvent)
-			{
-				if (OnMouseEntered != null)
-					OnMouseEntered (this, new NSEventArgs (theEvent));
-				else
-					base.MouseEntered (theEvent);
-			}
-			
-			public event EventHandler<NSEventArgs> OnMouseEntered;
-			
-			public override void MouseExited (NSEvent theEvent)
-			{
-				if (OnMouseExited != null)
-					OnMouseExited (this, new NSEventArgs (theEvent));
-				else
-					base.MouseExited (theEvent);
-			}
-			
-			public event EventHandler<NSEventArgs> OnMouseExited;
-			
-			public override void MouseMoved (NSEvent theEvent)
-			{
-				if (OnMouseMoved != null)
-					OnMouseMoved (this, new NSEventArgs (theEvent));
-				else
-					base.MouseMoved (theEvent);
-			}
-			
-			public event EventHandler<NSEventArgs> OnMouseMoved;
-		}
-		
-		class NSEventArgs : EventArgs
-		{
-			public NSEventArgs (NSEvent evt)
-			{
-				this.Event = evt;
-			}
-			
-			public NSEvent Event { get; private set; }
-		}
-	}
-}
diff --git a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs
index 5dca5957c8..4f01020f21 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs
@@ -34,6 +34,7 @@ using AppKit;
 using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Extensions;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.MacInterop;
@@ -56,7 +57,7 @@ namespace MonoDevelop.MacIntegration
 						CanChooseFiles = (data.Action & FileChooserAction.FileFlags) != 0,
 					};
 				}
-				
+
 				MacSelectFileDialogHandler.SetCommonPanelProperties (data, panel);
 				
 				SelectEncodingPopUpButton encodingSelector = null;
@@ -216,7 +217,8 @@ namespace MonoDevelop.MacIntegration
 				if (closeSolutionButton != null)
 					closeSolutionButton.State = NSCellStateValue.On;
 				
-				selected = 0;
+				if (!CanBeOpenedInAssemblyBrowser (filename))
+					selected = 0;
 				hasWorkbenchViewer = true;
 				i++;
 			}
@@ -241,6 +243,11 @@ namespace MonoDevelop.MacIntegration
 			return hasWorkbenchViewer;
 		}
 
+		static bool CanBeOpenedInAssemblyBrowser (FilePath filename)
+		{
+			return filename.Extension.ToLower () == ".exe" || filename.Extension.ToLower () == ".dll";
+		}
+
 		static void CenterAccessoryView (MDBox box)
 		{
 			box.Layout ();
diff --git a/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs
index fa9914aab5..578f2dbb85 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs
@@ -55,6 +55,7 @@ namespace MonoDevelop.MacIntegration
 					panel = new NSOpenPanel {
 						CanChooseDirectories = (data.Action & FileChooserAction.FolderFlags) != 0,
 						CanChooseFiles = (data.Action & FileChooserAction.FileFlags) != 0,
+						CanCreateDirectories = (data.Action & FileChooserAction.CreateFolder) != 0,
 						ResolvesAliases = false,
 					};
 				}
diff --git a/main/src/addins/MacPlatform/Dialogs/SelectEncodingPopUpButton.cs b/main/src/addins/MacPlatform/Dialogs/SelectEncodingPopUpButton.cs
index c8787d809f..5483cbbd78 100644
--- a/main/src/addins/MacPlatform/Dialogs/SelectEncodingPopUpButton.cs
+++ b/main/src/addins/MacPlatform/Dialogs/SelectEncodingPopUpButton.cs
@@ -32,6 +32,7 @@ using AppKit;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Projects.Text;
+using System.Linq;
 
 namespace MonoDevelop.MacIntegration
 {
diff --git a/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs b/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs
index b65f0debb0..4781869e98 100644
--- a/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs
+++ b/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs
@@ -33,7 +33,7 @@ using Xwt.GtkBackend;
 
 namespace MonoDevelop.MacIntegration
 {
-	class ExtendedTitleBarDialogBackend: Xwt.GtkBackend.DialogBackend, IExtendedTitleBarDialogBackend
+	class ExtendedTitleBarDialogBackend: ThemedGtkDialogBackend, IExtendedTitleBarDialogBackend
 	{
 		CustomToolbar toolbar;
 
@@ -44,7 +44,7 @@ namespace MonoDevelop.MacIntegration
 				WidgetFlags |= Gtk.WidgetFlags.AppPaintable;
 			}
 
-			public Cairo.ImageSurface Background {
+			public Gdk.Pixbuf Background {
 				get;
 				set;
 			}
@@ -67,10 +67,12 @@ namespace MonoDevelop.MacIntegration
 					context.LineWidth = 1;
 					if (Background != null && Background.Width > 0) {
 						for (int x=0; x < Allocation.Width; x += Background.Width) {
-							Background.Show (context, x, -TitleBarHeight);
+							Gdk.CairoHelper.SetSourcePixbuf (context, Background, x, -TitleBarHeight);
+							context.Paint ();
 						}
 					} else {
 						context.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+
 						using (var lg = new Cairo.LinearGradient (0, 0, 0, Allocation.Height)) {
 							lg.AddColorStop (0, Style.Light (Gtk.StateType.Normal).ToCairoColor ());
 							lg.AddColorStop (1, Style.Mid (Gtk.StateType.Normal).ToCairoColor ());
@@ -79,14 +81,10 @@ namespace MonoDevelop.MacIntegration
 						context.Fill ();
 
 					}
-					context.MoveTo (0, Allocation.Height - 0.5);
-					context.RelLineTo (Allocation.Width, 0);
-					context.SetSourceColor (MonoDevelop.Ide.Gui.Styles.ToolbarBottomBorderColor);
-					context.Stroke ();
 
-					context.MoveTo (0, Allocation.Height - 1.5);
+					context.MoveTo (0, Allocation.Height - 0.5);
 					context.RelLineTo (Allocation.Width, 0);
-					context.SetSourceColor (MonoDevelop.Ide.Gui.Styles.ToolbarBottomGlowColor);
+					context.SetSourceColor (Ide.Gui.Styles.ToolbarBottomBorderColor.ToCairoColor ());
 					context.Stroke ();
 
 				}
@@ -102,18 +100,17 @@ namespace MonoDevelop.MacIntegration
 		{
 			base.Initialize ();
 
-			var resource = "maintoolbarbg.png";
+			var image = Xwt.Drawing.Image.FromResource (typeof(MacPlatformService).Assembly, "maintoolbarbg.png");
 
 			Window.Realized += delegate {
 				NSWindow w = GtkQuartz.GetWindow (Window);
 				w.IsOpaque = false;
-				NSImage img = MacPlatformService.LoadImage (resource);
-				w.BackgroundColor = NSColor.FromPatternImage (img);
+				w.BackgroundColor = NSColor.FromPatternImage (image.ToBitmap().ToNSImage());
 				w.StyleMask |= NSWindowStyle.TexturedBackground;
 			};
 
 			toolbar = new CustomToolbar ();
-			toolbar.Background = MonoDevelop.Components.CairoExtensions.LoadImage (typeof(MacPlatformService).Assembly, resource);
+			toolbar.Background = (Gdk.Pixbuf)Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).GetNativeImage (image);
 			toolbar.TitleBarHeight = MacPlatformService.GetTitleBarHeight ();
 			MainBox.PackStart (toolbar, false, false, 0);
 			((Gtk.Box.BoxChild)MainBox [toolbar]).Position = 0;
diff --git a/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs b/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs
index d6dc9051d1..efa431d912 100644
--- a/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs
+++ b/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs
@@ -33,7 +33,7 @@ using Xwt.GtkBackend;
 
 namespace MonoDevelop.MacIntegration
 {
-	class ExtendedTitleBarWindowBackend: Xwt.GtkBackend.WindowBackend, IExtendedTitleBarWindowBackend
+	class ExtendedTitleBarWindowBackend: ThemedGtkWindowBackend, IExtendedTitleBarWindowBackend
 	{
 		CustomToolbar toolbar;
 
@@ -44,7 +44,7 @@ namespace MonoDevelop.MacIntegration
 				WidgetFlags |= Gtk.WidgetFlags.AppPaintable;
 			}
 
-			public Cairo.ImageSurface Background {
+			public Gdk.Pixbuf Background {
 				get;
 				set;
 			}
@@ -67,10 +67,13 @@ namespace MonoDevelop.MacIntegration
 					context.LineWidth = 1;
 					if (Background != null && Background.Width > 0) {
 						for (int x=0; x < Allocation.Width; x += Background.Width) {
-							Background.Show (context, x, -TitleBarHeight);
+							Gdk.CairoHelper.SetSourcePixbuf (context, Background, x, -TitleBarHeight);
+							context.Paint ();
 						}
 					} else {
 						context.Rectangle (0, 0, Allocation.Width, Allocation.Height);
+
+						// FIXME: VV: Remove gradient features
 						using (var lg = new Cairo.LinearGradient (0, 0, 0, Allocation.Height)) {
 							lg.AddColorStop (0, Style.Light (Gtk.StateType.Normal).ToCairoColor ());
 							lg.AddColorStop (1, Style.Mid (Gtk.StateType.Normal).ToCairoColor ());
@@ -79,14 +82,10 @@ namespace MonoDevelop.MacIntegration
 						context.Fill ();
 
 					}
-					context.MoveTo (0, Allocation.Height - 0.5);
-					context.RelLineTo (Allocation.Width, 0);
-					context.SetSourceColor (MonoDevelop.Ide.Gui.Styles.ToolbarBottomBorderColor);
-					context.Stroke ();
 
-					context.MoveTo (0, Allocation.Height - 1.5);
+					context.MoveTo (0, Allocation.Height - 0.5);
 					context.RelLineTo (Allocation.Width, 0);
-					context.SetSourceColor (MonoDevelop.Ide.Gui.Styles.ToolbarBottomGlowColor);
+					context.SetSourceColor (Ide.Gui.Styles.ToolbarBottomBorderColor.ToCairoColor ());
 					context.Stroke ();
 
 				}
@@ -102,18 +101,17 @@ namespace MonoDevelop.MacIntegration
 		{
 			base.Initialize ();
 
-			var resource = "maintoolbarbg.png";
+			var image = Xwt.Drawing.Image.FromResource (typeof(MacPlatformService).Assembly, "maintoolbarbg.png");
 
 			Window.Realized += delegate {
 				NSWindow w = GtkQuartz.GetWindow (Window);
 				w.IsOpaque = false;
-				NSImage img = MacPlatformService.LoadImage (resource);
-				w.BackgroundColor = NSColor.FromPatternImage (img);
+				w.BackgroundColor = NSColor.FromPatternImage (image.ToBitmap().ToNSImage());
 				w.StyleMask |= NSWindowStyle.TexturedBackground;
 			};
 
 			toolbar = new CustomToolbar ();
-			toolbar.Background = MonoDevelop.Components.CairoExtensions.LoadImage (typeof(MacPlatformService).Assembly, resource);
+			toolbar.Background = (Gdk.Pixbuf)Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).GetNativeImage (image);
 			toolbar.TitleBarHeight = MacPlatformService.GetTitleBarHeight ();
 			MainBox.PackStart (toolbar, false, false, 0);
 			((Gtk.Box.BoxChild)MainBox [toolbar]).Position = 0;
diff --git a/main/src/addins/MacPlatform/MacExternalConsoleProcess.cs b/main/src/addins/MacPlatform/MacExternalConsoleProcess.cs
index dcafe4127f..dd88c7128b 100644
--- a/main/src/addins/MacPlatform/MacExternalConsoleProcess.cs
+++ b/main/src/addins/MacPlatform/MacExternalConsoleProcess.cs
@@ -33,10 +33,12 @@ using System.Collections.Generic;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.MacInterop;
+using System.Threading.Tasks;
+using System.IO;
 
 namespace MonoDevelop.MacIntegration
 {
-	internal class MacExternalConsoleProcess : IProcessAsyncOperation
+	internal class MacExternalConsoleProcess : ProcessAsyncOperation
 	{
 /*
 NOTES ON CONTROLLING A TERMINAL WITH APPLESCRIPT	 
@@ -79,25 +81,37 @@ where running an explicit exec causes it to quit after the exec runs, so we can'
 bash pause on exit trick
 */ 
 		string tabId, windowId;
-		bool cancelled;
-		
+
 		public MacExternalConsoleProcess (string command, string arguments, string workingDirectory,
 			IDictionary<string, string> environmentVariables,
 			string title, bool pauseWhenFinished)
 		{
-			RunTerminal (
+			CancellationTokenSource = new CancellationTokenSource ();
+			CancellationTokenSource.Token.Register (CloseTerminal);
+
+			// FIXME set value of ProcessId, if possible
+
+			var intTask = RunTerminal (
 				command, arguments, workingDirectory, environmentVariables, title, pauseWhenFinished,
-				out tabId, out windowId
+				out tabId, out windowId, CancellationTokenSource.Token
 			);
+			intTask.ContinueWith (delegate {
+				ExitCode = intTask.Result;
+			});
+			Task = intTask;
 		}
 
 		#region AppleScript terminal manipulation
 
-		internal static void RunTerminal (
+		internal static Task<int> RunTerminal (
 			string command, string arguments, string workingDirectory,
 			IDictionary<string, string> environmentVariables,
-			string title, bool pauseWhenFinished, out string tabId, out string windowId)
+			string title, bool pauseWhenFinished, out string tabId, out string windowId, CancellationToken cancelToken = default(CancellationToken))
 		{
+			TaskCompletionSource<int> taskSource = new TaskCompletionSource<int> ();
+			cancelToken.Register (delegate {
+				taskSource.SetCanceled ();
+			});
 			//build the sh command
 			var sb = new StringBuilder ("clear; ");
 			if (!string.IsNullOrEmpty (workingDirectory))
@@ -112,6 +126,19 @@ bash pause on exit trick
 			}
 			if (command != null) {
 				sb.AppendFormat ("\"{0}\" {1}", Escape (command), arguments);
+				var tempFileName = Path.GetTempFileName ();
+				sb.Append ($"; echo $? > {tempFileName}");
+				var fileWatcher = new FileSystemWatcher (Path.GetDirectoryName (tempFileName), Path.GetFileName (tempFileName));
+				fileWatcher.EnableRaisingEvents = true;
+				fileWatcher.Changed += delegate {
+					lock(taskSource) {
+						if (taskSource.Task.IsCompleted)
+							return;
+						taskSource.SetResult (int.Parse (File.ReadAllText (tempFileName)));
+						File.Delete (tempFileName);
+					}
+				};
+				
 				if (pauseWhenFinished)
 					sb.Append ("; echo; read -p 'Press any key to continue...' -n1");
 				sb.Append ("; exit");
@@ -135,9 +162,10 @@ bash pause on exit trick
 
 			try {
 				AppleScript.Run (sb.ToString ());
-			} catch (AppleScriptException) {
-				//it may already have closed
+			} catch (Exception ex) {
+				taskSource.SetException (ex);
 			}
+			return taskSource.Task;
 		}
 		
 		//FIXME: make escaping work properly
@@ -168,67 +196,14 @@ end tell", tabId, windowId);
 
 		#endregion
 
-		#region IProcessAsyncOperation implementation
-
-		public void Dispose ()
-		{
-		}
-		
-		public int ExitCode {
-			get {
-				//FIXME: implement. is it possible?
-				return 0;
-			}
-		}
-		
-		public int ProcessId {
-			get {
-				//FIXME: implement. is it possible?
-				return 0;
-			}
-		}
-		
-		#endregion
-		
 		#region IAsyncOperation implementation
 		
-		public event OperationHandler Completed;
-		
-		public void Cancel ()
+		void CloseTerminal ()
 		{
-			cancelled = true;
 			//FIXME: try to kill the process without closing the window, if pauseWhenFinished is true
 			CloseTerminalWindow (tabId, windowId);
 		}
-		
-		public void WaitForCompleted ()
-		{
-			while (!IsCompleted) {
-				Thread.Sleep (1000);
-			}
-		}
-		
-		public bool IsCompleted {
-			get {
-				//FIXME: get the status of the process, not the whole script
-				return !TabExists (tabId, windowId);
-			}
-		}
-		
-		public bool Success {
-			get {
-				//FIXME: any way to get the real result?
-				return !cancelled;
-			}
-		}
-		
-		
-		public bool SuccessWithWarnings {
-			get {
-				return Success;
-			}
-		}
-		
+
 		#endregion
 	}
 }
\ No newline at end of file
diff --git a/main/src/addins/MacPlatform/MacInterop/CoreFoundation.cs b/main/src/addins/MacPlatform/MacInterop/CoreFoundation.cs
index 5937356f09..e2d4ab8949 100644
--- a/main/src/addins/MacPlatform/MacInterop/CoreFoundation.cs
+++ b/main/src/addins/MacPlatform/MacInterop/CoreFoundation.cs
@@ -64,7 +64,7 @@ namespace MonoDevelop.MacInterop
 		
 		[DllImport (CFLib, CharSet=CharSet.Unicode)]
 		extern static IntPtr CFStringGetCharacters (IntPtr handle, CFRange range, IntPtr buffer);
-		
+
 		public static string FetchString (IntPtr handle)
 		{
 			if (handle == IntPtr.Zero)
@@ -151,7 +151,7 @@ namespace MonoDevelop.MacInterop
 			All = 0xFFFFFFFF
 		}
 		
-		static IntPtr CreatePathUrl (string path)
+		public static IntPtr CreatePathUrl (string path)
 		{
 			IntPtr str = IntPtr.Zero;
 			IntPtr url = IntPtr.Zero;
diff --git a/main/src/addins/MacPlatform/MacInterop/Keychain.cs b/main/src/addins/MacPlatform/MacInterop/Keychain.cs
index a3717ebeb2..42afd88a92 100644
--- a/main/src/addins/MacPlatform/MacInterop/Keychain.cs
+++ b/main/src/addins/MacPlatform/MacInterop/Keychain.cs
@@ -210,11 +210,11 @@ namespace MonoDevelop.MacInterop
 		#region CFRange
 
 		struct CFRange {
-			public int Location, Length;
+			public IntPtr Location, Length;
 			public CFRange (int l, int len)
 			{
-				Location = l;
-				Length = len;
+				Location = (IntPtr) l;
+				Length = (IntPtr) len;
 			}
 		}
 
diff --git a/main/src/addins/MacPlatform/MacInterop/LaunchServices.cs b/main/src/addins/MacPlatform/MacInterop/LaunchServices.cs
index cba21f5a40..18cbe899e6 100644
--- a/main/src/addins/MacPlatform/MacInterop/LaunchServices.cs
+++ b/main/src/addins/MacPlatform/MacInterop/LaunchServices.cs
@@ -27,7 +27,11 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
+using System.Linq;
+
+using MonoDevelop.Core;
 using Foundation;
+using AppKit;
 
 namespace MonoDevelop.MacInterop
 {
@@ -89,119 +93,79 @@ namespace MonoDevelop.MacInterop
 	
 	public static class LaunchServices
 	{
-		const string APP_SERVICES = "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices";
-		const string CFLIB = "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
-		
-		[DllImport (APP_SERVICES)]
-		static extern OSStatus LSOpenApplication (ref LSApplicationParameters appParams, out ProcessSerialNumber psn);
-		
-		public static ProcessSerialNumber OpenApplication (string application)
+		public static int OpenApplication (string application)
 		{
 			return OpenApplication (new ApplicationStartInfo (application));
 		}
-			
-		public static ProcessSerialNumber OpenApplication (ApplicationStartInfo application)
+
+		// This function can be replaced by NSWorkspace.LaunchApplication but it currently doesn't work
+		// https://bugzilla.xamarin.com/show_bug.cgi?id=32540
+
+		[DllImport ("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")]
+		static extern IntPtr IntPtr_objc_msgSend_IntPtr_UInt32_IntPtr_IntPtr (IntPtr receiver, IntPtr selector, IntPtr url, UInt32 options, IntPtr configuration, out IntPtr error);
+		static readonly IntPtr launchApplicationAtURLOptionsConfigurationErrorSelector = ObjCRuntime.Selector.GetHandle ("launchApplicationAtURL:options:configuration:error:");
+		public static int OpenApplication (ApplicationStartInfo application)
 		{
 			if (application == null)
 				throw new ArgumentNullException ("application");
-			
+
 			if (string.IsNullOrEmpty (application.Application) || !System.IO.Directory.Exists (application.Application))
 				throw new ArgumentException ("Application is not valid");
-			
-			var appParams = new LSApplicationParameters ();
-			if (application.NewInstance)
-				appParams.flags |= LSLaunchFlags.NewInstance;
-			if (application.Async)
-				appParams.flags |= LSLaunchFlags.Async;
-			
-			NSArray argv = null;
+
+			NSUrl appUrl = NSUrl.FromFilename (application.Application);
+
+			// TODO: Once the above bug is fixed, we can replace the code below with
+			//NSRunningApplication app = NSWorkspace.SharedWorkspace.LaunchApplication (appUrl, 0, new NSDictionary (), null);
+
+			var config = new NSMutableDictionary ();
 			if (application.Args != null && application.Args.Length > 0) {
-				var args = application.Args;
-				NSObject[] arr = new NSObject[args.Length];
-				for (int i = 0; i < args.Length; i++)
-					arr[i] = new NSString (args[i]);
-				argv = NSArray.FromNSObjects (arr);
-				appParams.argv = argv.Handle;
-			}
-			
-			NSDictionary dict = null;
-			if (application.Environment.Count > 0) {
-				dict = new NSMutableDictionary ();
-				foreach (var kvp in application.Environment)
-					dict.SetValueForKey (new NSString (kvp.Value), new NSString (kvp.Key));
-				appParams.environment = dict.Handle;
+				var args = new NSMutableArray ();
+				foreach (string arg in application.Args) {
+					args.Add (new NSString (arg));
+				}
+				config.Add (new NSString ("NSWorkspaceLaunchConfigurationArguments"), args);
 			}
-			
-			var cfUrl = global::CoreFoundation.CFUrl.FromFile (application.Application);
-			ProcessSerialNumber psn;
-			
-			try {
-				appParams.application = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (FSRef)));
-			
-				if (!CoreFoundation.CFURLGetFSRef (cfUrl.Handle, appParams.application))
-					throw new Exception ("Could not create FSRef from CFUrl");
-				
-				var status = LSOpenApplication (ref appParams, out psn);
-				if (status != OSStatus.Ok)
-					throw new LaunchServicesException ((int)status);
-			} finally {
-				if (appParams.application != IntPtr.Zero)
-					Marshal.FreeHGlobal (appParams.application);
-				appParams.application = IntPtr.Zero;
-				if (dict != null)
-					dict.Dispose (); //also ensures the NSDictionary is kept alive for the params
-				if (argv != null)
-					argv.Dispose (); //also ensures the NSArray is kept alive for the params
+
+			if (application.Environment != null && application.Environment.Count > 0) {
+				var envValueStrings = application.Environment.Values.Select (t => new NSString (t)).ToArray ();
+				var envKeyStrings = application.Environment.Keys.Select (t => new NSString (t)).ToArray ();
+
+				var envDict = new NSMutableDictionary ();
+				for (int i = 0; i < envValueStrings.Length; i++) {
+					envDict.Add (envKeyStrings[i], envValueStrings[i]);
+				}
+
+				config.Add (new NSString ("NSWorkspaceLaunchConfigurationEnvironment"), envDict);
 			}
-			
-			return psn;
-		}
-		
-		struct LSApplicationParameters
-		{
-			public IntPtr version; // CFIndex, must be 0
-			public LSLaunchFlags flags;
-			public IntPtr application; //FSRef *
-			public IntPtr asyncLaunchRefCon; // void *
-			public IntPtr environment; // CFDictionaryRef
-			public IntPtr argv; // CFArrayRef
-			public IntPtr initialEvent; // AppleEvent *
+
+			UInt32 options = 0;
+
+			if (application.Async)
+				options |= (UInt32) LaunchOptions.NSWorkspaceLaunchAsync;
+			if (application.NewInstance)
+				options |= (UInt32) LaunchOptions.NSWorkspaceLaunchNewInstance;
+
+			IntPtr error;
+			var appHandle = IntPtr_objc_msgSend_IntPtr_UInt32_IntPtr_IntPtr (NSWorkspace.SharedWorkspace.Handle, launchApplicationAtURLOptionsConfigurationErrorSelector, appUrl.Handle, options, config.Handle, out error);
+			NSRunningApplication app = (NSRunningApplication)ObjCRuntime.Runtime.GetNSObject (appHandle);
+
+			return app.ProcessIdentifier;
 		}
-		
+
 		[Flags]
-		public enum LSLaunchFlags : uint
-		{
-			Defaults = 0x00000001,
-			AndPrint = 0x00000002,
-			AndDisplayErrors = 0x00000040,
-			InhibitBGOnly = 0x00000080,
-			DontAddToRecents = 0x00000100,
-			DontSwitch = 0x00000200,
-			NoParams = 0x00000800,
-			Async = 0x00010000,
-			StartClassic = 0x00020000,
-			InClassic = 0x00040000,
-			NewInstance = 0x00080000,
-			AndHide = 0x00100000,
-			AndHideOthers = 0x00200000,
-			HasUntrustedContents = 0x00400000
-		}
-		
-		static class CoreFoundation
-		{
-			[DllImport (CFLIB)]
-			public static extern bool CFURLGetFSRef (IntPtr urlPtr, IntPtr fsRefPtr);
-		}
-		
-		//this is an 80-byte opaque object
-		[StructLayout(LayoutKind.Sequential, Size = 80)]
-		struct FSRef
-		{
-		}
-		
-		enum OSStatus
-		{
-			Ok = 0
-		}
+		enum LaunchOptions {
+			NSWorkspaceLaunchAndPrint = 0x00000002,
+			NSWorkspaceLaunchWithErrorPresentation = 0x00000040,
+			NSWorkspaceLaunchInhibitingBackgroundOnly = 0x00000080,
+			NSWorkspaceLaunchWithoutAddingToRecents = 0x00000100,
+			NSWorkspaceLaunchWithoutActivation = 0x00000200,
+			NSWorkspaceLaunchAsync = 0x00010000,
+			NSWorkspaceLaunchAllowingClassicStartup = 0x00020000,
+			NSWorkspaceLaunchPreferringClassic = 0x00040000,
+			NSWorkspaceLaunchNewInstance = 0x00080000,
+			NSWorkspaceLaunchAndHide = 0x00100000,
+			NSWorkspaceLaunchAndHideOthers = 0x00200000,
+			NSWorkspaceLaunchDefault = NSWorkspaceLaunchAsync | NSWorkspaceLaunchAllowingClassicStartup
+		};
 	}
 }
diff --git a/main/src/addins/MacPlatform/MacInterop/ProcessManager.cs b/main/src/addins/MacPlatform/MacInterop/ProcessManager.cs
index ac047eeacb..1de2daa783 100644
--- a/main/src/addins/MacPlatform/MacInterop/ProcessManager.cs
+++ b/main/src/addins/MacPlatform/MacInterop/ProcessManager.cs
@@ -27,6 +27,8 @@
 using System;
 using System.Runtime.InteropServices;
 
+using AppKit;
+
 namespace MonoDevelop.MacInterop
 {
 	public static class ProcessManager
@@ -46,12 +48,27 @@ namespace MonoDevelop.MacInterop
 				return pid;
 			return -1;
 		}
-		
+
+		[Obsolete ("Use KillProcess (int pid) instead")]
 		public static bool KillProcess (ProcessSerialNumber psn)
 		{
 			return KillProcess (ref psn) == OSStatus.Ok;
 		}
-		
+
+		public static bool KillProcess (int pid)
+		{
+			NSRunningApplication runningApp = NSRunningApplication.GetRunningApplication (pid);
+			if (runningApp == null)
+				return false;
+
+			return runningApp.Terminate ();
+		}
+
+		public static bool IsRunning (int pid)
+		{
+			return NSRunningApplication.GetRunningApplication (pid) != null;
+		}
+
 		enum OSStatus
 		{
 			Ok = 0
diff --git a/main/src/addins/MacPlatform/MacPlatform.addin.xml b/main/src/addins/MacPlatform/MacPlatform.addin.xml
index bc7dd76041..75534803db 100644
--- a/main/src/addins/MacPlatform/MacPlatform.addin.xml
+++ b/main/src/addins/MacPlatform/MacPlatform.addin.xml
@@ -64,7 +64,6 @@
 			<Class class="MonoDevelop.MacIntegration.MacAddFileDialogHandler" />
 			<Class class="MonoDevelop.MacIntegration.MacOpenFileDialogHandler" />
 			<Class class="MonoDevelop.MacIntegration.MacAlertDialogHandler" />
-			<Class class="MonoDevelop.MacIntegration.MacExceptionDialogHandler" />
 		</Condition>
 	</Extension>
 
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
index 203f239de5..2deadd3935 100644
--- a/main/src/addins/MacPlatform/MacPlatform.cs
+++ b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -65,11 +65,22 @@ namespace MonoDevelop.MacIntegration
 
 		Lazy<Dictionary<string, string>> mimemap;
 
+		static string applicationMenuName;
+
+		public static string ApplicationMenuName {
+			get {
+				return applicationMenuName ?? BrandingService.ApplicationName;
+			}
+			set {
+				if (applicationMenuName != value) {
+					applicationMenuName = value;
+					OnApplicationMenuNameChanged ();
+				}
+			}
+		}
+
 		public MacPlatformService ()
 		{
-			if (IntPtr.Size == 8)
-				throw new Exception ("Mac integration is not yet 64-bit safe");
-
 			if (initedGlobal)
 				throw new Exception ("Only one MacPlatformService instance allowed");
 			initedGlobal = true;
@@ -183,17 +194,8 @@ namespace MonoDevelop.MacIntegration
 
 			mimeTimer.BeginTiming ();
 			try {
-				using (var file = File.OpenRead ("/etc/apache2/mime.types")) {
-					using (var reader = new StreamReader (file)) {
-						var mime = new Regex ("([a-zA-Z]+/[a-zA-z0-9+-_.]+)\t+([a-zA-Z]+)", RegexOptions.Compiled);
-						string line;
-						while ((line = reader.ReadLine ()) != null) {
-							Match m = mime.Match (line);
-							if (m.Success)
-								map ["." + m.Groups [2].Captures [0].Value] = m.Groups [1].Captures [0].Value;
-						}
-					}
-				}
+				var loader = new MimeMapLoader (map);
+				loader.LoadMimeMap ("/etc/apache2/mime.types");
 			} catch (Exception ex){
 				LoggingService.LogError ("Could not load Apache mime database", ex);
 			}
@@ -265,9 +267,9 @@ namespace MonoDevelop.MacIntegration
 			//mac-ify these command names
 			commandManager.GetCommand (EditCommands.MonodevelopPreferences).Text = GettextCatalog.GetString ("Preferences...");
 			commandManager.GetCommand (EditCommands.DefaultPolicies).Text = GettextCatalog.GetString ("Custom Policies...");
-			commandManager.GetCommand (HelpCommands.About).Text = GettextCatalog.GetString ("About {0}", BrandingService.ApplicationName);
-			commandManager.GetCommand (MacIntegrationCommands.HideWindow).Text = GettextCatalog.GetString ("Hide {0}", BrandingService.ApplicationName);
-			commandManager.GetCommand (ToolCommands.AddinManager).Text = GettextCatalog.GetString ("Add-in Manager...");
+			commandManager.GetCommand (HelpCommands.About).Text = GetAboutCommandText ();
+			commandManager.GetCommand (MacIntegrationCommands.HideWindow).Text = GetHideWindowCommandText ();
+			commandManager.GetCommand (ToolCommands.AddinManager).Text = GettextCatalog.GetString ("Add-ins...");
 
 			initedApp = true;
 
@@ -281,47 +283,77 @@ namespace MonoDevelop.MacIntegration
 			}
 
 			PatchGtkTheme ();
+			NSNotificationCenter.DefaultCenter.AddObserver (NSCell.ControlTintChangedNotification, notif => Runtime.RunInMainThread (
+				delegate {
+					Styles.LoadStyle();
+					PatchGtkTheme();
+				}));
+			
+			// FIXME: Immediate theme switching disabled, until NSAppearance issues are fixed 
+			//IdeApp.Preferences.UserInterfaceTheme.Changed += (s,a) => PatchGtkTheme ();
 		}
 
-		// This will dynamically generate a gtkrc for certain widgets using system control colors.
-		void PatchGtkTheme ()
+		static string GetAboutCommandText ()
 		{
-			string color_hex, text_hex;
+			return GettextCatalog.GetString ("About {0}", ApplicationMenuName);
+		}
 
-			if (MonoDevelop.Core.Platform.OSVersion >= MonoDevelop.Core.MacSystemInformation.Yosemite) {
-				NSControlTint tint = NSColor.CurrentControlTint;
-				NSColor text = NSColor.SelectedMenuItemText.UsingColorSpace (NSColorSpace.GenericRGBColorSpace);
-				NSColor color = tint == NSControlTint.Blue ? NSColor.SelectedMenuItem.UsingColorSpace (NSColorSpace.GenericRGBColorSpace) : NSColor.SelectedMenuItem.UsingColorSpace (NSColorSpace.DeviceWhite);
+		static string GetHideWindowCommandText ()
+		{
+			return GettextCatalog.GetString ("Hide {0}", ApplicationMenuName);
+		}
 
-				color_hex = ConvertColorToHex (color);
-				text_hex = ConvertColorToHex (text);
-			} else {
-				color_hex = "#c5d4e0";
-				text_hex = "#000";
-			}
+		static void OnApplicationMenuNameChanged ()
+		{
+			Command aboutCommand = IdeApp.CommandService.GetCommand (HelpCommands.About);
+			if (aboutCommand != null)
+				aboutCommand.Text = GetAboutCommandText ();
 
-			string gtkrc = String.Format (@"
-				style ""treeview"" = ""default"" {{
-					GtkTreeView::odd-row-color = ""#f5f5f5""
-
-					base[SELECTED] = ""{0}""
-					base[ACTIVE] = ""{0}""
-					text[SELECTED] = ""{1}""
-					text[ACTIVE] = ""{1}""
-					engine ""xamarin"" {{
-						roundness = 0
-						gradient_shades = {{ 1.0, 0.95, 0.95, 0.90 }}
-						glazestyle = 1
-					}}
-				}}
-
-				widget_class ""*.<GtkTreeView>*"" style ""treeview""
-				",
-				color_hex,
-				text_hex
-			);
+			Command hideCommand = IdeApp.CommandService.GetCommand (MacIntegrationCommands.HideWindow);
+			if (hideCommand != null)
+				hideCommand.Text = GetHideWindowCommandText ();
+
+			Carbon.SetProcessName (ApplicationMenuName);
+		}
 
-			Gtk.Rc.ParseString (gtkrc);
+		// VV/VK: Disable tint based color generation
+		// This will dynamically generate a gtkrc for certain widgets using system control colors.
+		void PatchGtkTheme ()
+		{
+//			string color_hex, text_hex;
+//
+//			if (MonoDevelop.Core.Platform.OSVersion >= MonoDevelop.Core.MacSystemInformation.Yosemite) {
+//				NSControlTint tint = NSColor.CurrentControlTint;
+//				NSColor text = NSColor.SelectedMenuItemText.UsingColorSpace (NSColorSpace.GenericRGBColorSpace);
+//				NSColor color = tint == NSControlTint.Blue ? NSColor.SelectedMenuItem.UsingColorSpace (NSColorSpace.GenericRGBColorSpace) : NSColor.SelectedMenuItem.UsingColorSpace (NSColorSpace.DeviceWhite);
+//
+//				color_hex = ConvertColorToHex (color);
+//				text_hex = ConvertColorToHex (text);
+//			} else {
+//				color_hex = "#c5d4e0";
+//				text_hex = "#000";
+//			}
+//
+//			string gtkrc = String.Format (@"
+//				style ""treeview"" = ""default"" {{
+//					base[SELECTED] = ""{0}""
+//					base[ACTIVE] = ""{0}""
+//					text[SELECTED] = ""{1}""
+//					text[ACTIVE] = ""{1}""
+//					engine ""xamarin"" {{
+//						roundness = 0
+//						gradient_shades = {{ 1.01, 1.01, 1.01, 1.01 }}
+//						glazestyle = 1
+//					}}
+//				}}
+//
+//				widget_class ""*.<GtkTreeView>*"" style ""treeview""
+//				",
+//				color_hex,
+//				text_hex
+//			);
+//
+//			Gtk.Rc.ParseString (gtkrc);
 		}
 
 		void GlobalSetup ()
@@ -406,6 +438,8 @@ namespace MonoDevelop.MacIntegration
 				//if not running inside an app bundle (at dev time), need to do some additional setup
 				if (NSBundle.MainBundle.InfoDictionary ["CFBundleIdentifier"] == null) {
 					SetupWithoutBundle ();
+				} else {
+					SetupDockIcon ();
 				}
 			} catch (Exception ex) {
 				LoggingService.LogError ("Could not install app event handlers", ex);
@@ -413,27 +447,26 @@ namespace MonoDevelop.MacIntegration
 			}
 		}
 
-		static void SetupWithoutBundle ()
+		static void SetupDockIcon ()
 		{
-			// set a bundle IDE to prevent NSProgress crash
-			// https://bugzilla.xamarin.com/show_bug.cgi?id=8850
-			NSBundle.MainBundle.InfoDictionary ["CFBundleIdentifier"] = new NSString ("com.xamarin.monodevelop");
+			NSObject initialBundleIconFileValue;
+
+			// Don't do anything if we're inside an app bundle.
+			if (NSBundle.MainBundle.InfoDictionary.TryGetValue (new NSString ("CFBundleIconFile"), out initialBundleIconFileValue)) {
+				return;
+			}
 
+			// Setup without bundle.
 			FilePath exePath = System.Reflection.Assembly.GetExecutingAssembly ().Location;
-			string iconFile;
-			iconFile = BrandingService.GetString ("ApplicationIcon");
-			if (iconFile != null) {
-				iconFile = BrandingService.GetFile (iconFile);
+			string iconName = BrandingService.GetString ("ApplicationIcon");
+			string iconFile = null;
+
+			if (iconName != null) {
+				iconFile = BrandingService.GetFile (iconName);
 			} else {
-				var bundleRoot = GetAppBundleRoot (exePath);
-				if (bundleRoot.IsNotNull) {
-					//running from inside an app bundle, use its icon
-					iconFile = bundleRoot.Combine ("Contents", "Resources", "monodevelop.icns");
-				} else {
-					// assume running from build directory
-					var mdSrcMain = exePath.ParentDirectory.ParentDirectory.ParentDirectory;
-					iconFile = mdSrcMain.Combine ("theme-icons", "Mac", "monodevelop.icns");
-				}
+				// assume running from build directory
+				var mdSrcMain = exePath.ParentDirectory.ParentDirectory.ParentDirectory;
+				iconFile = mdSrcMain.Combine ("theme-icons", "Mac", "monodevelop.icns");
 			}
 
 			if (File.Exists (iconFile)) {
@@ -441,6 +474,15 @@ namespace MonoDevelop.MacIntegration
 			}
 		}
 
+		static void SetupWithoutBundle ()
+		{
+			// set a bundle IDE to prevent NSProgress crash
+			// https://bugzilla.xamarin.com/show_bug.cgi?id=8850
+			NSBundle.MainBundle.InfoDictionary ["CFBundleIdentifier"] = new NSString ("com.xamarin.monodevelop");
+
+			SetupDockIcon ();
+		}
+
 		static FilePath GetAppBundleRoot (FilePath path)
 		{
 			do {
@@ -562,7 +604,7 @@ namespace MonoDevelop.MacIntegration
 			return res != null ? res.ToXwtImage () : base.OnGetIconForFile (filename);
 		}
 
-		public override IProcessAsyncOperation StartConsoleProcess (string command, string arguments, string workingDirectory,
+		public override ProcessAsyncOperation StartConsoleProcess (string command, string arguments, string workingDirectory,
 		                                                            IDictionary<string, string> environmentVariables,
 		                                                            string title, bool pauseWhenFinished)
 		{
@@ -635,11 +677,12 @@ namespace MonoDevelop.MacIntegration
 			}
 		}
 
-		public override Gdk.Rectangle GetUsableMonitorGeometry (Gdk.Screen screen, int monitor)
+		public override Xwt.Rectangle GetUsableMonitorGeometry (int screenNumber, int monitorNumber)
 		{
-			Gdk.Rectangle ygeometry = screen.GetMonitorGeometry (monitor);
+			var screen = Gdk.Display.Default.GetScreen (screenNumber);
+			Gdk.Rectangle ygeometry = screen.GetMonitorGeometry (monitorNumber);
 			Gdk.Rectangle xgeometry = screen.GetMonitorGeometry (0);
-			NSScreen nss = NSScreen.Screens[monitor];
+			NSScreen nss = NSScreen.Screens[monitorNumber];
 			var visible = nss.VisibleFrame;
 			var frame = nss.Frame;
 
@@ -671,10 +714,10 @@ namespace MonoDevelop.MacIntegration
 			width = NMath.Min (visible.Width, frame.Width);
 			x = NMath.Max (visible.X, frame.X);
 
-			return new Gdk.Rectangle ((int) x, (int) y, (int) width, (int) height);
+			return new Xwt.Rectangle ((int) x, (int) y, (int) width, (int) height);
 		}
 
-		public override void GrabDesktopFocus (Gtk.Window window)
+		internal override void GrabDesktopFocus (Gtk.Window window)
 		{
 			window.Present ();
 			NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
@@ -731,6 +774,7 @@ namespace MonoDevelop.MacIntegration
 			NSWindow w = GtkQuartz.GetWindow (window);
 			w.IsOpaque = true;
 			w.StyleMask |= NSWindowStyle.UnifiedTitleAndToolbar;
+			IdeTheme.ApplyTheme (w);
 		}
 
 		internal override void RemoveWindowShadow (Gtk.Window window)
@@ -762,7 +806,7 @@ namespace MonoDevelop.MacIntegration
 			return new FdoRecentFiles (UserProfile.Current.LocalConfigDir.Combine ("RecentlyUsed.xml"));
 		}
 
-		public override bool GetIsFullscreen (Gtk.Window window)
+		public override bool GetIsFullscreen (Window window)
 		{
 			if (MacSystemInformation.OsVersion < MacSystemInformation.Lion) {
 				return base.GetIsFullscreen (window);
@@ -772,7 +816,7 @@ namespace MonoDevelop.MacIntegration
 			return (nswin.StyleMask & NSWindowStyle.FullScreenWindow) != 0;
 		}
 
-		public override void SetIsFullscreen (Gtk.Window window, bool isFullscreen)
+		public override void SetIsFullscreen (Window window, bool isFullscreen)
 		{
 			if (MacSystemInformation.OsVersion < MacSystemInformation.Lion) {
 				base.SetIsFullscreen (window, isFullscreen);
@@ -788,19 +832,11 @@ namespace MonoDevelop.MacIntegration
 		{
 			var toplevels = GtkQuartz.GetToplevels ();
 
-			// When we're looking for modal windows that don't belong to GTK, exclude
-			// NSStatusBarWindow (which is visible on Mavericks when we're in fullscreen) and
-			// NSToolbarFullscreenWindow (which is visible on Yosemite in fullscreen).
-			// _NSFullScreenTileDividerWindow (which is visible on El Capitan when two apps share the same fullscreen).
-			return toplevels.Any (t => t.Key.IsVisible && (t.Value == null || t.Value.Modal) &&
-				!(t.Key.DebugDescription.StartsWith("<NSStatusBarWindow", StringComparison.Ordinal) ||
-					t.Key.DebugDescription.StartsWith ("<NSToolbarFullScreenWindow", StringComparison.Ordinal) ||
-					t.Key.DebugDescription.StartsWith ("<NSCarbonMenuWindow", StringComparison.Ordinal) ||
-					t.Key.DebugDescription.StartsWith ("<_NSFullScreenTileDividerWindow", StringComparison.Ordinal)
-				));
+			// Check GtkWindow's Modal flag or for a visible NSPanel
+			return toplevels.Any (t => (t.Value != null && t.Value.Modal && t.Value.Visible) || (t.Key.IsVisible && (t.Key is NSPanel)));
 		}
 
-		public override void AddChildWindow (Gtk.Window parent, Gtk.Window child)
+		internal override void AddChildWindow (Gtk.Window parent, Gtk.Window child)
 		{
 			NSWindow w = GtkQuartz.GetWindow (parent);
 			child.Realize ();
@@ -809,7 +845,7 @@ namespace MonoDevelop.MacIntegration
 			w.AddChildWindow (overlay, NSWindowOrderingMode.Above);
 		}
 
-		public override void PlaceWindow (Gtk.Window window, int x, int y, int width, int height)
+		internal override void PlaceWindow (Gtk.Window window, int x, int y, int width, int height)
 		{
 			if (window.GdkWindow == null)
 				return; // Not yet realized
diff --git a/main/src/addins/MacPlatform/MacPlatform.csproj b/main/src/addins/MacPlatform/MacPlatform.csproj
index 0603aa73b6..be4b802c65 100644
--- a/main/src/addins/MacPlatform/MacPlatform.csproj
+++ b/main/src/addins/MacPlatform/MacPlatform.csproj
@@ -119,7 +119,6 @@
     <Compile Include="MacExternalConsoleProcess.cs" />
     <Compile Include="MacInterop\Carbon.cs" />
     <Compile Include="MacInterop\AppleEvents\Native.cs" />
-    <Compile Include="Dialogs\MacExceptionDialogHandler.cs" />
     <Compile Include="MacMenu\MDLinkMenuItem.cs" />
     <Compile Include="MacMenu\MDMenu.cs" />
     <Compile Include="MacMenu\MDMenuItem.cs" />
@@ -135,9 +134,13 @@
     <Compile Include="MainToolbar\ButtonBar.cs" />
     <Compile Include="MainToolbar\SelectorView.cs" />
     <Compile Include="MainToolbar\StatusBar.cs" />
-    <Compile Include="MainToolbar\CenteringSpace.cs" />
-    <Compile Include="MainToolbar\CALayerExtensions.cs" />
     <Compile Include="MainToolbar\VerticallyCenteredTextFieldCell.cs" />
+    <Compile Include="MainToolbar\AwesomeBar.cs" />
+    <Compile Include="MainToolbar\ButtonBarContainer.cs" />
+    <Compile Include="MainToolbar\Styles.cs" />
+    <Compile Include="MainToolbar\MultiResImage.cs" />
+    <Compile Include="MimeMapLoader.cs" />
+    <Compile Include="ScreenMonitor.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
@@ -156,30 +159,66 @@
     <EmbeddedResource Include="icons\build%402x.png">
       <LogicalName>build@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\build~dark.png">
+      <LogicalName>build~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\build~dark%402x.png">
+      <LogicalName>build~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\continue.png">
       <LogicalName>continue.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\continue%402x.png">
       <LogicalName>continue@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\continue~dark.png">
+      <LogicalName>continue~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\continue~dark%402x.png">
+      <LogicalName>continue~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\device.png">
       <LogicalName>device.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\device%402x.png">
       <LogicalName>device@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\device~dark.png">
+      <LogicalName>device~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\device~dark%402x.png">
+      <LogicalName>device~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\project.png">
       <LogicalName>project.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\project%402x.png">
       <LogicalName>project@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\project~dark.png">
+      <LogicalName>project~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project~dark%402x.png">
+      <LogicalName>project~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\stop.png">
       <LogicalName>stop.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\stop%402x.png">
       <LogicalName>stop@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\stop~dark.png">
+      <LogicalName>stop~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stop~dark%402x.png">
+      <LogicalName>stop~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="maintoolbarbg~dark.png">
+      <LogicalName>maintoolbarbg~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="maintoolbarbg~dark%402x.png">
+      <LogicalName>maintoolbarbg~dark@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Dialogs\" />
diff --git a/main/src/addins/MacPlatform/MacProxyCredentialProvider.cs b/main/src/addins/MacPlatform/MacProxyCredentialProvider.cs
index 9ccc5d79d7..8b929b78d9 100644
--- a/main/src/addins/MacPlatform/MacProxyCredentialProvider.cs
+++ b/main/src/addins/MacPlatform/MacProxyCredentialProvider.cs
@@ -98,7 +98,7 @@ namespace MonoDevelop.MacIntegration
 		{
 			NetworkCredential result = null;
 
-			DispatchService.GuiSyncDispatch (() => {
+			Runtime.RunInMainThread (() => {
 
 				using (var ns = new NSAutoreleasePool ()) {
 					var message = credentialType == CredentialType.ProxyCredentials
@@ -163,7 +163,7 @@ namespace MonoDevelop.MacIntegration
 					var password = passwordInput.StringValue;
 					result = new NetworkCredential (username, password);
 				}
-			});
+			}).Wait ();
 
 			// store the obtained credentials in the keychain
 			// but don't store for the root url since it may have other credentials
diff --git a/main/src/addins/MacPlatform/MainToolbar/AwesomeBar.cs b/main/src/addins/MacPlatform/MainToolbar/AwesomeBar.cs
new file mode 100644
index 0000000000..9ccbb431ce
--- /dev/null
+++ b/main/src/addins/MacPlatform/MainToolbar/AwesomeBar.cs
@@ -0,0 +1,188 @@
+//
+// AwesomeBar.cs
+//
+// Author:
+//       iain <iain@xamarin.com>
+//
+// Copyright (c) 2015 Copyright © 2015 Xamarin, Inc
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+using AppKit;
+using CoreGraphics;
+using Foundation;
+using MonoDevelop.Core;
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.MacIntegration.MainToolbar
+{
+	public class AwesomeBar : NSView
+	{
+		internal RunButton RunButton { get; set; }
+		internal SelectorView SelectorView { get; set; }
+		internal StatusBar StatusBar { get; set; }
+		internal SearchBar SearchBar { get; set; }
+		internal ButtonBarContainer ButtonBarContainer { get; private set; }
+
+		public AwesomeBar ()
+		{
+			RunButton = new RunButton ();
+			AddSubview (RunButton);
+
+			SelectorView = new SelectorView ();
+			SelectorView.SizeChanged += (object sender, EventArgs e) => UpdateLayout ();
+			AddSubview (SelectorView);
+
+			ButtonBarContainer = new ButtonBarContainer ();
+			ButtonBarContainer.SizeChanged += (object sender, EventArgs e) => UpdateLayout ();
+			AddSubview (ButtonBarContainer);
+
+			StatusBar = new StatusBar ();
+			AddSubview (StatusBar);
+
+			SearchBar = new SearchBar ();
+			AddSubview (SearchBar);
+
+			Ide.Gui.Styles.Changed +=  (o, e) => UpdateLayout ();
+		}
+
+		const float toolbarPadding = 8.0f;
+		const float maxSearchBarWidth = 270.0f;
+		const float minSearchBarWidth = 150.0f;
+		const float maxStatusBarWidth = 700.0f;
+		const float minStatusBarWidth = 220.0f;
+		const float runButtonWidth = 38.0f;
+		public static float ToolbarWidgetHeight {
+			get {
+				return MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 24.0f : 22.0f;
+			}
+		}
+
+		NSObject superviewFrameChangeObserver;
+		public override void ViewWillMoveToSuperview (NSView newSuperview)
+		{
+			if (Superview != null && superviewFrameChangeObserver != null) {
+				NSNotificationCenter.DefaultCenter.RemoveObserver (superviewFrameChangeObserver);
+				superviewFrameChangeObserver = null;
+
+				Superview.PostsFrameChangedNotifications = false;
+			}
+
+			base.ViewWillMoveToSuperview (newSuperview);
+		}
+
+		public override void ViewDidMoveToSuperview ()
+		{
+			base.ViewDidMoveToSuperview ();
+
+			if (Superview != null) {
+				Superview.PostsFrameChangedNotifications = true;
+				superviewFrameChangeObserver = NSNotificationCenter.DefaultCenter.AddObserver (NSView.FrameChangedNotification, (note) => {
+					// Centre vertically in superview frame
+					Frame = new CGRect (0, Superview.Frame.Y + (Superview.Frame.Height - ToolbarWidgetHeight) / 2, Superview.Frame.Width, ToolbarWidgetHeight);
+				}, Superview);
+			}
+		}
+
+		void UpdateLayout ()
+		{
+			RunButton.Frame = new CGRect (toolbarPadding, 0, runButtonWidth, ToolbarWidgetHeight);
+			var statusbarWidth = Math.Max (Math.Min (Math.Round ( Frame.Width * 0.3), maxStatusBarWidth), minStatusBarWidth);
+			var searchbarWidth = maxSearchBarWidth;
+			if (statusbarWidth < searchbarWidth) {
+				searchbarWidth = minSearchBarWidth;
+			}
+
+			// We only need to work out the width on the left side of the window because the statusbar is centred
+			// Gap + RunButton.Width + Gap + ButtonBar.Width + Gap + Half of StatusBar.Width
+			var spaceLeft = (Frame.Width / 2) - (toolbarPadding + runButtonWidth + toolbarPadding + ButtonBarContainer.Frame.Width + toolbarPadding + (statusbarWidth / 2));
+
+			StatusBar.Frame = new CGRect (Math.Round((Frame.Width - statusbarWidth) / 2), 0, statusbarWidth - 2, ToolbarWidgetHeight);
+
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) {
+				SearchBar.Frame = new CGRect (Frame.Width - searchbarWidth, 0, searchbarWidth, ToolbarWidgetHeight);
+			} else {
+				nfloat elcapYOffset = 0;
+				nfloat elcapHOffset = 0;
+
+				if (MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan) {
+					nfloat scaleFactor = 1;
+
+					if (Window != null && Window.Screen != null) {
+						scaleFactor = Window.Screen.BackingScaleFactor;
+					}
+					elcapYOffset = scaleFactor == 2 ? -0.5f : -1;
+					elcapHOffset = 1.0f;
+				}
+				SearchBar.Frame = new CGRect (Frame.Width - searchbarWidth, 0 + elcapYOffset, searchbarWidth, ToolbarWidgetHeight + elcapHOffset);
+			}
+
+			var selectorSize = SelectorView.SizeThatFits (new CGSize (spaceLeft, ToolbarWidgetHeight));
+
+			SelectorView.Frame = new CGRect (toolbarPadding + runButtonWidth + toolbarPadding, 0, Math.Round (selectorSize.Width), ToolbarWidgetHeight);
+			ButtonBarContainer.SetFrameOrigin (new CGPoint(SelectorView.Frame.GetMaxX () + toolbarPadding, -2));
+
+			// Finally check if the StatusBar overlaps the ButtonBarContainer (and its padding) and adjust is accordingly
+			if (StatusBar.Frame.IntersectsWith (ButtonBarContainer.Frame.Inset (-toolbarPadding, 0))) {
+				StatusBar.SetFrameOrigin (new CGPoint (ButtonBarContainer.Frame.GetMaxX () + toolbarPadding, StatusBar.Frame.Y));
+			}
+		}
+
+		public override void MouseDown (NSEvent theEvent)
+		{
+			base.MouseDown (theEvent);
+
+			var locationInSV = Superview.ConvertPointFromView (theEvent.LocationInWindow, null);
+			if (theEvent.ClickCount == 2 && HitTest (locationInSV) == this) {
+				bool miniaturise = false;
+
+				if (MacSystemInformation.OsVersion < MacSystemInformation.ElCapitan) {
+					miniaturise = NSUserDefaults.StandardUserDefaults.BoolForKey ("AppleMiniaturizeOnDoubleClick");
+				} else {
+					var action = NSUserDefaults.StandardUserDefaults.StringForKey ("AppleActionOnDoubleClick");
+					if (action == "None") {
+						return;
+					} else if (action == "Minimize") {
+						miniaturise = true;
+					}
+				}
+
+				if (miniaturise) {
+					Window.Miniaturize (this);
+				} else {
+					Window.Zoom (this);
+				}
+			}
+		}
+
+		public override CGRect Frame {
+			get {
+				return base.Frame;
+			}
+			set {
+				base.Frame = value;
+				UpdateLayout ();
+			}
+		}
+    }
+}
+
diff --git a/main/src/addins/MacPlatform/MainToolbar/ButtonBar.cs b/main/src/addins/MacPlatform/MainToolbar/ButtonBar.cs
index 9b05f2b679..5c9766f166 100644
--- a/main/src/addins/MacPlatform/MainToolbar/ButtonBar.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/ButtonBar.cs
@@ -27,23 +27,67 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using AppKit;
+using CoreGraphics;
 using Foundation;
 using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
+using MonoDevelop.Components.Mac;
 using MonoDevelop.Components.MainToolbar;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 
-namespace MonoDevelop.MacIntegration
+namespace MonoDevelop.MacIntegration.MainToolbar
 {
 	[Register]
 	class ButtonBar : NSSegmentedControl
 	{
+		class DarkSkinSegmentedCell : NSSegmentedCell
+		{
+			public override void DrawWithFrame (CGRect cellFrame, NSView inView)
+			{
+				if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) {
+					var inset = cellFrame.Inset (0.25f, 0.25f);
+					inset = new CGRect (inset.X, inset.Y + 2, inset.Width, inset.Height - 2);
+
+					var path = NSBezierPath.FromRoundedRect (inset, 3, 3);
+					path.LineWidth = 0.5f;
+					Styles.DarkBorderColor.ToNSColor ().SetStroke ();
+					path.Stroke ();
+
+					inset = new CGRect (inset.X + 3, inset.Y, inset.Width, inset.Height);
+					DrawInteriorWithFrame (inset, inView);
+
+					path = new NSBezierPath ();
+
+					// Draw the separators
+					for (int segment = 1; segment < SegmentCount; segment++) {
+						nfloat x = inset.X + (33 * segment);
+						path.MoveTo (new CGPoint (x, 0));
+						path.LineTo (new CGPoint (x, inset.Y + inset.Height));
+					}
+					path.LineWidth = 0.5f;
+					path.Stroke ();
+				} else {
+					base.DrawWithFrame (cellFrame, inView);
+				}
+			}
+
+			public override void DrawSegment (nint segment, CGRect frame, NSView controlView)
+			{
+				var img = base.GetImageForSegment (segment);
+				var rect = new CGRect (Math.Round (frame.X + ((frame.Width / 2) - (img.Size.Width  / 2))), Math.Round (frame.Y + ((frame.Height / 2) - (img.Size.Height  / 2))), img.Size.Width, img.Size.Height);
+
+				img.Draw (rect);
+			}
+		}
+
 		readonly Dictionary<IButtonBarButton, int> indexMap = new Dictionary<IButtonBarButton, int> ();
 		readonly IReadOnlyList<IButtonBarButton> buttons;
 
 		public ButtonBar (IEnumerable<IButtonBarButton> buttons)
 		{
+			Cell = new DarkSkinSegmentedCell ();
+
 			this.buttons = buttons.ToList ();
 
 			foreach (var button in buttons) {
@@ -51,12 +95,13 @@ namespace MonoDevelop.MacIntegration
 				button.ImageChanged += (o, e) => {
 					if (!indexMap.ContainsKey (_button))
 						return;
-					SetImage (ImageService.GetIcon (_button.Image, Gtk.IconSize.Menu).ToNSImage (), indexMap [_button]);
+					LoadIcon (_button);
 					SetNeedsDisplay ();
 				};
 				button.EnabledChanged += (o, e) => {
 					if (!indexMap.ContainsKey (_button))
 						return;
+					LoadIcon (_button);
 					SetEnabled (_button.Enabled, indexMap [_button]);
 					SetNeedsDisplay ();
 				};
@@ -74,6 +119,18 @@ namespace MonoDevelop.MacIntegration
 			Cell.TrackingMode = NSSegmentSwitchTracking.Momentary;
 		}
 
+		void LoadIcon (IButtonBarButton button)
+		{
+			if (!indexMap.ContainsKey (button))
+				return;
+			NSImage img;
+			if (button.Enabled)
+				img = ImageService.GetIcon (button.Image, Gtk.IconSize.Menu).ToNSImage ();
+			else
+				img = ImageService.GetIcon (button.Image, Gtk.IconSize.Menu).WithStyles ("disabled").ToNSImage ();
+			SetImage (img, indexMap [button]);
+		}
+
 		public override nint SegmentCount {
 			get { return base.SegmentCount; }
 			set {
@@ -109,17 +166,12 @@ namespace MonoDevelop.MacIntegration
 
 		void UpdateButton (IButtonBarButton button, int idx)
 		{
-			var img = ImageService.GetIcon (button.Image, Gtk.IconSize.Menu);
-			if (img.ToNSImage () != GetImage (idx)) {
-				SetImage (ImageService.GetIcon (button.Image, Gtk.IconSize.Menu).ToNSImage (), idx);
-				SetNeedsDisplay ();
-			}
-			if (button.Enabled != IsEnabled (idx)) {
+			LoadIcon (button);
+			if (button.Enabled != IsEnabled (idx))
 				SetEnabled (button.Enabled, idx);
-				SetNeedsDisplay ();
-			}
 			if (button.Tooltip != Cell.GetToolTip (idx))
 				Cell.SetToolTip (button.Tooltip, idx);
+			SetNeedsDisplay ();
 		}
 
 		public event EventHandler ResizeRequested;
diff --git a/main/src/addins/MacPlatform/MainToolbar/ButtonBarContainer.cs b/main/src/addins/MacPlatform/MainToolbar/ButtonBarContainer.cs
new file mode 100644
index 0000000000..c26018205f
--- /dev/null
+++ b/main/src/addins/MacPlatform/MainToolbar/ButtonBarContainer.cs
@@ -0,0 +1,105 @@
+//
+// ButtonBarContainer.cs
+//
+// Author:
+//       iain holmes <iain@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using AppKit;
+using CoreGraphics;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.MacIntegration.MainToolbar
+{
+	public class ButtonBarContainer : NSView
+	{
+		internal event EventHandler<EventArgs> SizeChanged;
+
+		List<ButtonBar> buttonBars;
+		internal List<ButtonBar> ButtonBars {
+			get {
+				return buttonBars;
+			}
+
+			set {
+				if (buttonBars != null) {
+					foreach (var bar in buttonBars) {
+						bar.ResizeRequested -= ResizeRequested;
+						bar.RemoveFromSuperview ();
+					}
+				}
+
+				buttonBars = value;
+				foreach (var bar in buttonBars) {
+					bar.ResizeRequested += ResizeRequested;
+					AddSubview (bar);
+				}
+
+				LayoutButtonBars ();
+			}
+		}
+
+		public ButtonBarContainer ()
+		{
+			Ide.Gui.Styles.Changed += (o, e) => LayoutButtonBars ();
+		}
+
+		const float segmentWidth = 33.0f;
+		const float buttonBarSpacing = 8.0f;
+		const float extraPadding = 6.0f;
+
+		void ResizeRequested (object sender, EventArgs e)
+		{
+			LayoutButtonBars ();
+		}
+
+		void LayoutButtonBars ()
+		{
+			nfloat nextX = 0;
+			nfloat y = 0;
+			nfloat height = AwesomeBar.ToolbarWidgetHeight;
+
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) {
+				y = 2;
+				height += 2;
+			} else {
+				height += 5;
+				y = -1;
+			}
+
+			foreach (ButtonBar bar in buttonBars) {
+				var frame = new CGRect (nextX, y, extraPadding + (bar.SegmentCount * segmentWidth), height);
+				bar.Frame = frame;
+
+				nextX = frame.GetMaxX () + buttonBarSpacing;
+			}
+
+			SetFrameSize (new CGSize (nextX - buttonBarSpacing, height));
+
+			if (SizeChanged != null) {
+				SizeChanged (this, EventArgs.Empty);
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MacPlatform/MainToolbar/CALayerExtensions.cs b/main/src/addins/MacPlatform/MainToolbar/CALayerExtensions.cs
deleted file mode 100644
index 2a6544de02..0000000000
--- a/main/src/addins/MacPlatform/MainToolbar/CALayerExtensions.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// CALayerExtensions.cs
-//
-// Author:
-//       Marius Ungureanu <marius.ungureanu@xamarin.com>
-//
-// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using CoreAnimation;
-using MonoDevelop.Components;
-using CoreGraphics;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.MacIntegration.MainToolbar
-{
-	static class CALayerExtensions
-	{
-		internal static void SetImage (this CALayer layer, string resource, nfloat scale)
-		{
-			SetImage (layer, ImageService.GetIcon (resource, Gtk.IconSize.Menu), scale);
-		}
-
-		internal static void SetImage (this CALayer layer, Xwt.Drawing.Image xwtImage, nfloat scale)
-		{
-			var image = xwtImage.ToNSImage ();
-			layer.ContentsScale = scale;
-			var layerContents = image.GetLayerContentsForContentsScale (layer.ContentsScale);
-
-			void_objc_msgSend_IntPtr (layer.Handle, setContentsSelector, layerContents.Handle);
-			layer.Bounds = new CGRect (0, 0, image.Size.Width, image.Size.Height);
-		}
-
-		static readonly IntPtr setContentsSelector = ObjCRuntime.Selector.GetHandle ("setContents:");
-		const string LIBOBJC_DYLIB = "/usr/lib/libobjc.dylib";
-		[System.Runtime.InteropServices.DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")]
-		public extern static void void_objc_msgSend_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg);
-	}
-}
-
diff --git a/main/src/addins/MacPlatform/MainToolbar/CenteringSpace.cs b/main/src/addins/MacPlatform/MainToolbar/CenteringSpace.cs
deleted file mode 100644
index 4684c43565..0000000000
--- a/main/src/addins/MacPlatform/MainToolbar/CenteringSpace.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// CenteringSpace.cs
-//
-// Author:
-//       Marius Ungureanu <marius.ungureanu@xamarin.com>
-//
-// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using AppKit;
-using CoreGraphics;
-using Foundation;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.MacIntegration.MainToolbar
-{
-	[Register]
-	class CenteringSpaceView : NSView
-	{
-		internal CenteringSpaceToolbarItem toolbarItem;
-		public override bool AcceptsFirstMouse (NSEvent theEvent)
-		{
-			return false;
-		}
-
-		public override void ViewDidMoveToWindow ()
-		{
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResizeNotification, notif =>
-				DispatchService.GuiDispatch (toolbarItem.UpdateWidth));
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.WillEnterFullScreenNotification, notif =>
-				CenteringSpaceToolbarItem.WindowFullscreening = true);
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidEnterFullScreenNotification, notif => {
-				CenteringSpaceToolbarItem.WindowFullscreening = false;
-				DispatchService.GuiDispatch (toolbarItem.UpdateWidth);
-			});
-
-			base.ViewDidMoveToWindow ();
-		}
-	}
-
-	[Register]
-	class CenteringSpaceToolbarItem : NSToolbarItem
-	{
-		internal static bool WindowFullscreening;
-		public CenteringSpaceToolbarItem ()
-		{
-			Initialize ();
-		}
-
-		public CenteringSpaceToolbarItem (IntPtr handle) : base (handle)
-		{
-			Initialize ();
-		}
-
-		public CenteringSpaceToolbarItem (string itemIdentifier) : base (itemIdentifier)
-		{
-			Initialize ();
-		}
-
-		void Initialize ()
-		{
-			Label = "";
-			View = new CenteringSpaceView {
-				toolbarItem = this,
-				Frame = new CGRect (0, 0, 1, 1),
-			};
-		}
-
-		public override CGSize MinSize {
-			get {
-				// Do NOT let this calculate any values while the window is fullscreening.
-				// Everything changes, and the size might end up with bogus values and cause a native crash
-				// that is totally unrelated. See BXC 29261.
-				if (WindowFullscreening)
-					return base.MinSize;
-
-				NSToolbarItem[] items = Toolbar.Items;
-				int index = Array.IndexOf (items, this);
-
-				if (index != -1 && View.Superview != null) {
-					CGRect frame = View.Superview.Frame;
-					if (frame.Left > 0) {
-						nfloat space = 0;
-						// There is a next item.
-						if (items.Length > index + 1) {
-							NSView nextItem = items [index + 1].View.Superview;
-							if (nextItem != null) {
-								CGRect nextFrame = nextItem.Frame;
-								CGRect toolbarFrame = nextItem.Superview.Frame;
-
-								// nextFrame is in center of the toolbar.
-								// so Left + space = toolbarFrame / 2 - nextFrame.Width / 2.
-								space = (toolbarFrame.Width - nextFrame.Width) / 2 - frame.Left;
-								if (space < 0)
-									space = 0;
-							}
-						}
-
-						base.MinSize = new CGSize (space, base.MinSize.Height);
-						base.MaxSize = new CGSize (space, base.MaxSize.Height);
-					}
-				}
-				return base.MinSize;
-			}
-			set { base.MinSize = value; }
-		}
-
-		internal void UpdateWidth ()
-		{
-			// Trigger updates.
-			MinSize = MinSize;
-		}
-	}
-}
-
diff --git a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs
index cd14af52ea..7f568c27cf 100644
--- a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs
@@ -33,6 +33,7 @@ using AppKit;
 using CoreGraphics;
 using Foundation;
 using MonoDevelop.Ide;
+using MonoDevelop.MacIntegration;
 using Xwt;
 
 namespace MonoDevelop.MacIntegration.MainToolbar
@@ -40,191 +41,35 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 	class MainToolbar : IMainToolbarView
 	{
 		const string MainToolbarId = "XSMainToolbar";
-		const string RunButtonId = "RunToolbarItem";
-		const string ButtonBarId = "ButtonBarToolbarItem";
-		const string SelectorId = "SelectorToolbarItem";
-		const string SearchBarId = "SearchBarToolbarItem";
-		const string StatusBarId = "StatusBarToolbarItem";
-		const string CenteringSpaceId = "CenteringSpaceToolbarItem";
+		const string AwesomeBarId = "AwesomeBarToolbarItem";
 
 		internal NSToolbar widget;
 		internal Gtk.Window gtkWindow;
 
-		int runButtonIdx;
-		RunButton runButton {
-			get { return (RunButton)widget.Items[runButtonIdx].View; }
-		}
+		AwesomeBar awesomeBar;
 
-		int buttonBarStartIdx, buttonBarCount;
-
-		CenteringSpaceToolbarItem centeringSpace {
-			get { return (CenteringSpaceToolbarItem)widget.Items[buttonBarStartIdx + buttonBarCount]; }
+		RunButton runButton {
+			get { return awesomeBar.RunButton; }
 		}
 
-		int statusBarIdx;
 		StatusBar statusBar {
-			get { return (StatusBar)widget.Items[statusBarIdx + buttonBarCount].View; }
+			get { return awesomeBar.StatusBar; }
 		}
 
-		int selectorIdx;
 		SelectorView selector {
-			get { return (SelectorView)widget.Items[selectorIdx].View; }
+			get { return awesomeBar.SelectorView; }
 		}
 
 		SelectorView.PathSelectorView selectorView {
-			get { return (SelectorView.PathSelectorView)widget.Items[selectorIdx].View.Subviews [0]; }
+			get { return awesomeBar.SelectorView.RealSelectorView; }
 		}
 
-		int searchEntryIdx;
 		SearchBar searchEntry {
-			get { return (SearchBar)widget.Items[searchEntryIdx + buttonBarCount].View; }
-		}
-
-		// TODO: Remove this when XamMac 2.2 goes stable.
-		static HashSet<object> viewCache = new HashSet<object> ();
-		static HashSet<ButtonBar> buttonBarCache = new HashSet<ButtonBar> ();
-
-		NSToolbarItem CreateRunToolbarItem ()
-		{
-			var button = new RunButton ();
-			viewCache.Add (button);
-			button.Activated += (o, e) => {
-				if (RunButtonClicked != null)
-					RunButtonClicked (o, e);
-			};
-
-			var item = new NSToolbarItem (RunButtonId) {
-				View = button,
-				MinSize = new CGSize (button.FittingSize.Width + 12, button.FittingSize.Height),
-				MaxSize = new CGSize (button.FittingSize.Width + 12, button.FittingSize.Height),
-			};
-			return item;
-		}
-
-		OverflowInfoEventArgs FillOverflowInfo (OverflowInfoEventArgs e)
-		{
-			var visibleItems = widget.VisibleItems;
-			var allItems = widget.Items;
-
-			e.WindowWidth = gtkWindow.Allocation.Width;
-			foreach (var iter in allItems) {
-				e.AllItemsWidth += iter.MinSize.Width;
-				if (!visibleItems.Contains (iter))
-					e.ItemsInOverflowWidth += iter.MinSize.Width;
-			}
-			// Add spacings.
-			nfloat spacing = (allItems.Length - 1) * 16;
-			e.AllItemsWidth += spacing;
-
-			return e;
-		}
-
-		bool IsCorrectNotification (NSView view, NSObject notifObject)
-		{
-			var window = selector.Window;
-
-			// Skip updates with a null Window. Only crashes on Mavericks.
-			// The View gets updated once again when the window resize finishes.
-			// We're getting notified about all windows in the application (for example, NSPopovers) that change size when really we only care about
-			// the window the bar is in.
-			return window != null && notifObject == window;
-		}
-
-		NSToolbarItem CreateSelectorToolbarItem ()
-		{
-			var selector = new SelectorView ();
-			viewCache.Add (selector);
-			var item = new NSToolbarItem (SelectorId) {
-				View = selector,
-				MinSize = new CGSize (150, 25),
-				MaxSize = new CGSize (150, 25),
-			};
-			selector.ResizeRequested += (o, e) => {
-				item.MinSize = item.MaxSize = e.Size;
-				centeringSpace.UpdateWidth ();
-			};
-			selector.OverflowInfoRequested += (o, e) => {
-				FillOverflowInfo (e);
-			};
-
-			IDisposable resizeTimer = null;
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.WillStartLiveResizeNotification, notif => DispatchService.GuiDispatch (() => {
-				if (!IsCorrectNotification (selector, notif.Object))
-					return;
-
-				if (resizeTimer != null)
-					resizeTimer.Dispose ();
-
-				resizeTimer = Application.TimeoutInvoke (100, () => {
-					if (widget.Items.Length != widget.VisibleItems.Length)
-						selector.RequestResize ();
-					return true;
-				});
-			}));
-
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResizeNotification, notif => DispatchService.GuiDispatch (() => {
-				if (!IsCorrectNotification (selector, notif.Object))
-					return;
-
-				// Don't check difference in overflow menus. This could cause issues since we're doing resizing of widgets and the views might go in front
-				// or behind while we're doing the resize request.
-				selector.RequestResize ();
-			}));
-
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidEndLiveResizeNotification, notif => DispatchService.GuiDispatch (() => {
-				if (!IsCorrectNotification (selector, notif.Object))
-					return;
-
-				if (resizeTimer != null)
-					resizeTimer.Dispose ();
-
-				resizeTimer = Application.TimeoutInvoke (300, selector.RequestResize);
-			}));
-
-			var pathSelector = (SelectorView.PathSelectorView)selector.Subviews [0];
-			pathSelector.ConfigurationChanged += (sender, e) => {
-				if (ConfigurationChanged != null)
-					ConfigurationChanged (sender, e);
-			};
-			pathSelector.RuntimeChanged += (sender, ea) => {
-				if (RuntimeChanged != null)
-					RuntimeChanged (sender, ea);
-			};
-			return item;
-		}
-
-		NSToolbarItem CreateButtonBarToolbarItem ()
-		{
-			var bar = new ButtonBar (barItems);
-			buttonBarCache.Add (bar);
-
-			// Note: We're leaving a 1 dead pixel size here because Apple bug
-			// on Yosemite. Segmented controls have 3px padding on left and right
-			// on Mavericks.
-			nfloat size = 6 + 33 * bar.SegmentCount;
-
-			// By default, Cocoa doesn't want to duplicate items in the toolbar.
-			// Use different Ids to prevent this and not have to subclass.
-			var item = new NSToolbarItem (ButtonBarId + buttonBarCount) {
-				View = bar,
-				MinSize = new CGSize (size, bar.FittingSize.Height),
-				MaxSize = new CGSize (size, bar.FittingSize.Height),
-			};
-			bar.ResizeRequested += (o, e) => {
-				nfloat resize = 6 + 33 * bar.SegmentCount;
-				item.MinSize = new CGSize (resize, bar.FittingSize.Height);
-				item.MaxSize = new CGSize (resize, bar.FittingSize.Height);
-				selector.RequestResize ();
-				centeringSpace.UpdateWidth ();
-			};
-			return item;
+			get { return awesomeBar.SearchBar; }
 		}
 
 		void AttachToolbarEvents (SearchBar bar)
 		{
-			if (bar.EventsAttached)
-				return;
-
 			bar.Changed += (o, e) => {
 				if (SearchEntryChanged != null)
 					SearchEntryChanged (o, e);
@@ -237,109 +82,79 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 				if (SearchEntryLostFocus != null)
 					SearchEntryLostFocus (o, e);
 			};
-			bar.Activated += (o, e) => {
+			bar.SelectionActivated += (o, e) => {
 				if (SearchEntryActivated != null)
 					SearchEntryActivated (o, e);
 			};
-			bar.EventsAttached = true;
 		}
 
-		NSToolbarItem CreateSearchBarToolbarItem ()
+		public MainToolbar (Gtk.Window window)
 		{
-			var bar = new SearchBar ();
+			gtkWindow = window;
+			widget = new NSToolbar (MainToolbarId) {
+				DisplayMode = NSToolbarDisplayMode.Icon,
+			};
+
+			awesomeBar = new AwesomeBar ();
+			awesomeBar.RunButton.Activated += (o, e) => {
+				if (RunButtonClicked != null)
+					RunButtonClicked (o, e);
+			};
 
 			// Remove the focus from the Gtk system when Cocoa has focus
 			// Fixes BXC #29601
-			bar.GainedFocus += (o, e) => IdeApp.Workbench.RootWindow.Focus = null;
+			awesomeBar.SearchBar.GainedFocus += (o, e) => IdeApp.Workbench.RootWindow.Focus = null;
 
-			viewCache.Add (bar);
-			var item = new NSToolbarItem (SearchBarId) {
-				View = bar,
-				MinSize = new CGSize (150, bar.FittingSize.Height),
-				MaxSize = new CGSize (270, bar.FittingSize.Height),
+			AttachToolbarEvents (awesomeBar.SearchBar);
+
+			selectorView.ConfigurationChanged += (sender, e) => {
+				if (ConfigurationChanged != null)
+					ConfigurationChanged (sender, e);
 			};
-			AttachToolbarEvents (bar);
-			return item;
-		}
 
-		NSToolbarItem CreateStatusBarToolbarItem ()
-		{
-			var bar = new StatusBar ();
-			viewCache.Add (bar);
-			var item = new NSToolbarItem (StatusBarId) {
-				View = bar,
-				// Place some temporary values in there.
-				MinSize = new CGSize (360, 22),
-				MaxSize = new CGSize (360, 22),
+			selectorView.RuntimeChanged += (sender, ea) => {
+				if (RuntimeChanged != null)
+					RuntimeChanged (sender, ea);
 			};
 
-			Action<NSNotification> resizeAction = notif => DispatchService.GuiDispatch (() => {
-				// Skip updates with a null Window. Only crashes on Mavericks.
-				// The View gets updated once again when the window resize finishes.
-				if (bar.Window == null)
-					return;
+			widget.WillInsertItem = (tool, id, send) => {
+				switch (id) {
+				case AwesomeBarId:
+					return new NSToolbarItem (AwesomeBarId) {
+						View = awesomeBar,
+						MinSize = new CGSize (1024, AwesomeBar.ToolbarWidgetHeight),
+						MaxSize = new CGSize (1024, AwesomeBar.ToolbarWidgetHeight)
+					};
+
+				default:
+					throw new NotImplementedException ();
+				}
+			};
 
-				// We're getting notified about all windows in the application (for example, NSPopovers) that change size when really we only care about
-				// the window the bar is in.
-				if (notif.Object != bar.Window)
+			Action<NSNotification> resizeAction = notif => Runtime.RunInMainThread (() => {
+				var win = awesomeBar.Window;
+				if (win == null) {
 					return;
+				}
 
-				double maxSize = Math.Round (bar.Window.Frame.Width * 0.30f);
-				double minSize = Math.Round (bar.Window.Frame.Width * 0.25f);
-				item.MinSize = new CGSize ((nfloat)Math.Max (220, minSize), 22);
-				item.MaxSize = new CGSize ((nfloat)Math.Min (700, maxSize), 22);
-				bar.RepositionStatusLayers ();
-			});
+				var item = widget.Items[0];
 
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResizeNotification, resizeAction);
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidEndLiveResizeNotification, resizeAction);
-			return item;
-		}
+				var abFrameInWindow = awesomeBar.ConvertRectToView (awesomeBar.Frame, null);
+				var awesomebarHeight = AwesomeBar.ToolbarWidgetHeight;
+				var size = new CGSize (win.Frame.Width - abFrameInWindow.X - 4, awesomebarHeight);
 
-		NSToolbarItem CreateCenteringSpaceItem ()
-		{
-			var item = new CenteringSpaceToolbarItem (CenteringSpaceId);
-			viewCache.Add (item.View);
-			return item;
-		}
+				item.MinSize = size;
+				item.MaxSize = size;
+			});
 
-		public MainToolbar (Gtk.Window window)
-		{
-			gtkWindow = window;
-			widget = new NSToolbar (MainToolbarId) {
-				DisplayMode = NSToolbarDisplayMode.Icon,
-			};
-			widget.WillInsertItem = (tool, id, send) => {
-				switch (id) {
-				case RunButtonId:
-					return CreateRunToolbarItem ();
-				case ButtonBarId:
-					return CreateButtonBarToolbarItem ();
-				case SearchBarId:
-					return CreateSearchBarToolbarItem ();
-				case SelectorId:
-					return CreateSelectorToolbarItem ();
-				case StatusBarId:
-					return CreateStatusBarToolbarItem ();
-				case CenteringSpaceId:
-					return CreateCenteringSpaceItem ();
-				}
-				throw new NotImplementedException ();
-			};
+			NSWindow nswin = GtkMacInterop.GetNSWindow (window);
+			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResizeNotification, resizeAction, nswin);
+			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidEndLiveResizeNotification, resizeAction, nswin);
 		}
 
 		internal void Initialize ()
 		{
-			int total = -1;
-			widget.InsertItem (RunButtonId, runButtonIdx = ++total);
-			widget.InsertItem (SelectorId, selectorIdx = ++total);
-			widget.InsertItem (CenteringSpaceId, buttonBarStartIdx = ++total);
-			widget.InsertItem (StatusBarId, statusBarIdx = ++total);
-			widget.InsertItem (NSToolbar.NSToolbarFlexibleSpaceItemIdentifier, ++total);
-			widget.InsertItem (SearchBarId, searchEntryIdx = ++total);
-
-			// NSButton -> NSToolbarItemViewer -> _NSToolbarClipView -> NSToolbarView -> NSToolbarClippedItemsIndicator
-			viewCache.Add (runButton.Superview.Superview.Superview);
+			widget.InsertItem (AwesomeBarId, 0);
 		}
 
 		#region IMainToolbarView implementation
@@ -358,26 +173,28 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			searchEntry.Focus ();
 
 			var entry = searchEntry;
-			entry.SelectText (entry);
+			if (!string.IsNullOrEmpty (entry.StringValue)) {
+				entry.SelectText (entry);
+			}
 		}
 
-		List<IButtonBarButton> barItems = new List<IButtonBarButton> ();
 		public void RebuildToolbar (IEnumerable<IButtonBarButton> buttons)
 		{
-			buttonBarCache.Clear ();
-			while (buttonBarCount > 0) {
-				widget.RemoveItem (buttonBarStartIdx);
-				--buttonBarCount;
-			}
+			List<IButtonBarButton> barItems = new List<IButtonBarButton> ();
+			List<ButtonBar> buttonBars = new List<ButtonBar> ();
 
 			foreach (var item in buttons) {
 				if (item.IsSeparator) {
-					widget.InsertItem (ButtonBarId, buttonBarStartIdx + buttonBarCount++);
+					var bar = new ButtonBar (barItems);
+					buttonBars.Add (bar);
+
 					barItems.Clear ();
 				} else {
 					barItems.Add (item);
 				}
 			}
+
+			awesomeBar.ButtonBarContainer.ButtonBars = buttonBars;
 		}
 
 		public bool RunButtonSensitivity {
@@ -430,8 +247,9 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 		public bool ButtonBarSensitivity {
 			set {
-				for (int start = buttonBarStartIdx; start < buttonBarStartIdx + buttonBarCount; ++start)
-					((ButtonBar)widget.Items [start].View).Enabled = value;
+				foreach (var bar in awesomeBar.ButtonBarContainer.ButtonBars) {
+					bar.Enabled = value;
+				}
 			}
 		}
 
@@ -442,7 +260,6 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 				};
 				foreach (var item in value)
 					menu.AddItem (new NSMenuItem (item.DisplayString, (o, e) => item.NotifyActivated ()));
-
 				searchEntry.SearchMenuTemplate = menu;
 			}
 		}
@@ -470,9 +287,14 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 				var entry = searchEntry;
 				var widget = entry.gtkWidget;
 				var window = GtkMacInterop.GetGtkWindow (entry.Window);
+
+				// window will be null if the app is fullscreen.
 				if (window != null) {
 					widget.GdkWindow = window.GdkWindow;
-					widget.Allocation = new Gdk.Rectangle ((int)entry.Superview.Frame.X, (int)entry.Superview.Frame.Y, (int)entry.Superview.Frame.Width, 0);
+
+					// We need to adjust the position of the frame so the popup will line up correctly
+					var abFrameInWindow = awesomeBar.ConvertRectToView (awesomeBar.Frame, null);
+					widget.Allocation = new Gdk.Rectangle ((int)(entry.Frame.X + abFrameInWindow.X - 8), (int)entry.Frame.Y, (int)entry.Frame.Width, 0);
 				} else {
 					// Reset the Gtk Widget each time since we can't set the GdkWindow to null.
 					widget.Dispose ();
@@ -481,15 +303,11 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 					var nsWindows = NSApplication.SharedApplication.Windows;
 					var fullscreenToolbarNsWindow = nsWindows.FirstOrDefault (nswin =>
 						nswin.IsVisible && nswin.Description.StartsWith ("<NSToolbarFullScreenWindow", StringComparison.Ordinal));
-					var workbenchNsWindow = nsWindows.FirstOrDefault (nswin =>
-						GtkMacInterop.GetGtkWindow (nswin) is MonoDevelop.Ide.Gui.DefaultWorkbench);
-
-					// Gtk and Cocoa coordinates are not the same. Offset by left and top screens to get the correct
-					// coordinate for the popup window based on Cocoa coordinates which offset left/top from current desktop.
-					nfloat xOffset = -NSScreen.Screens.Min (screen => screen.Frame.Left);
-					nfloat yOffset = NSScreen.Screens.Max (screen => screen.Frame.Bottom);
-					widget.Allocation = new Gdk.Rectangle (0, (int)(yOffset - workbenchNsWindow.Frame.Height),
-						(int)(xOffset + fullscreenToolbarNsWindow.Frame.Width), 0);
+
+					CGPoint gdkOrigin = ScreenMonitor.GdkPointForNSScreen (searchEntry.Window.Screen);
+
+					widget.Allocation = new Gdk.Rectangle (0, (int)(gdkOrigin.Y + fullscreenToolbarNsWindow.Frame.Height - 20),
+						(int)(gdkOrigin.X + fullscreenToolbarNsWindow.Frame.Width - 16), 0);
 				}
 				return widget;
 			}
@@ -497,7 +315,9 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 		public string SearchPlaceholderMessage {
 			// Analysis disable once ValueParameterNotUsed
-			set { }
+			set {
+				searchEntry.PlaceholderText = value;
+			}
 		}
 
 		public MonoDevelop.Ide.StatusBar StatusBar {
diff --git a/main/src/addins/MacPlatform/MainToolbar/MultiResImage.cs b/main/src/addins/MacPlatform/MainToolbar/MultiResImage.cs
new file mode 100644
index 0000000000..d4221451f7
--- /dev/null
+++ b/main/src/addins/MacPlatform/MainToolbar/MultiResImage.cs
@@ -0,0 +1,103 @@
+//
+// MultiResImage.cs
+//
+// Author:
+//       iain holmes <iain@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin, Inc
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Reflection;
+using AppKit;
+using Foundation;
+
+using MonoDevelop.Ide;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.MacIntegration.MainToolbar
+{
+	public static class MultiResImage
+	{
+		public static NSImage CreateMultiResImage (string filename, string style)
+		{
+			var image = new NSImage ();
+
+			var image1x = NSImageFromResource (MakeResName (filename, style));
+			var image2x = NSImageFromResource (MakeResName (filename, style, true));
+
+			if (image1x != null) {
+				image.AddRepresentations (image1x.Representations ());
+			}
+
+			if (image2x != null) {
+				image.AddRepresentations (image2x.Representations ());
+			}
+
+			image.Size = new CoreGraphics.CGSize (0, 0);
+			return image;
+		}
+
+		static string MakeResName (string filename, string style, bool retina = false)
+		{
+			bool dark = IdeApp.Preferences.UserInterfaceSkin == Skin.Dark;
+
+			if (!string.IsNullOrEmpty (style)) {
+				style = "~" + style;
+			}
+
+			string resname = string.Format ("{0}{1}{2}{3}.png", filename, dark ? "~dark" : "", style, retina ? "@2x" : "");
+			if (Assembly.GetCallingAssembly ().GetManifestResourceInfo (resname) != null) {
+				return resname;
+			}
+
+			resname = string.Format ("{0}{1}{2}.png", filename, dark ? "~dark" : "", retina ? "@2x" : "");
+			if (Assembly.GetCallingAssembly ().GetManifestResourceInfo (resname) != null) {
+				return resname;
+			}
+
+			resname = string.Format ("{0}{1}.png", filename, retina ? "@2x" : "");
+			if (Assembly.GetCallingAssembly ().GetManifestResourceInfo (resname) != null) {
+				return resname;
+			}
+
+			// If all those failed, try again, but without retina
+			if (retina) {
+				LoggingService.LogWarning ("{0} {1} missing @2x", filename, style);
+				return MakeResName (filename, style);
+			}
+
+			return null;
+		}
+
+		static NSImage NSImageFromResource (string res)
+		{
+			if (string.IsNullOrEmpty (res)) {
+				return null;
+			}
+
+			var stream = Assembly.GetCallingAssembly ().GetManifestResourceStream (res);
+			using (stream)
+			using (NSData data = NSData.FromStream (stream)) {
+				return new NSImage (data);
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MacPlatform/MainToolbar/RunButton.cs b/main/src/addins/MacPlatform/MainToolbar/RunButton.cs
index 262387e9af..c3b404922a 100644
--- a/main/src/addins/MacPlatform/MainToolbar/RunButton.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/RunButton.cs
@@ -26,37 +26,76 @@
 using System;
 using AppKit;
 using Foundation;
+using CoreGraphics;
 using MonoDevelop.Components.MainToolbar;
 using MonoDevelop.Ide;
 using MonoDevelop.Components;
+using Xwt.Mac;
+using CoreImage;
 
 namespace MonoDevelop.MacIntegration.MainToolbar
 {
 	[Register]
 	class RunButton : NSButton
 	{
+		NSImage stopIcon, continueIcon, buildIcon;
+
+
 		public RunButton ()
 		{
+			UpdateIcons ();
+
+			Ide.Gui.Styles.Changed +=  (o, e) => UpdateCell ();
+
+			Cell = new ColoredButtonCell ();
+
 			icon = OperationIcon.Run;
-			Image = GetIcon ();
 			ImagePosition = NSCellImagePosition.ImageOnly;
 			BezelStyle = NSBezelStyle.TexturedRounded;
+
 			Enabled = false;
 		}
 
+		void UpdateIcons (object sender = null, EventArgs e = null)
+		{
+			stopIcon = MultiResImage.CreateMultiResImage ("stop", "");
+			continueIcon = MultiResImage.CreateMultiResImage ("continue", "");
+			buildIcon = MultiResImage.CreateMultiResImage ("build", "");
+
+			// We can use Template images supported by NSButton, thus no reloading
+			// on theme/skin change is required.
+			stopIcon.Template = continueIcon.Template = buildIcon.Template = true;
+		}
+
+		void UpdateCell ()
+		{
+			Appearance = NSAppearance.GetAppearance (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark ? NSAppearance.NameVibrantDark : NSAppearance.NameAqua);
+			NeedsDisplay = true;
+		}
+
 		NSImage GetIcon ()
 		{
 			switch (icon) {
 			case OperationIcon.Stop:
-				return ImageService.GetIcon ("stop").ToNSImage ();
+				return stopIcon;
 			case OperationIcon.Run:
-				return ImageService.GetIcon ("continue").ToNSImage ();
+				return continueIcon;
 			case OperationIcon.Build:
-				return ImageService.GetIcon ("build").ToNSImage ();
+				return buildIcon;
 			}
 			throw new InvalidOperationException ();
 		}
 
+		public override bool Enabled {
+			get {
+				return base.Enabled;
+			}
+			set {
+				base.Enabled = value;
+				Image = GetIcon ();
+			}
+		}
+
 		OperationIcon icon;
 		public OperationIcon Icon {
 			get { return icon; }
@@ -67,6 +106,46 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 				Image = GetIcon ();
 			}
 		}
+
+		public override CGSize IntrinsicContentSize {
+			get {
+				return new CGSize (38, 25);
+			}
+		}
+	}
+
+	class ColoredButtonCell : NSButtonCell
+	{
+		public override void DrawBezelWithFrame (CGRect frame, NSView controlView)
+		{
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) {
+				var inset = frame.Inset (0.25f, 0.25f);
+
+				var path = NSBezierPath.FromRoundedRect (inset, 3, 3);
+				path.LineWidth = 0.5f;
+
+				// The first time the view is drawn it has a filter of some sort attached so that the colours set here
+				// are made lighter onscreen.
+				// NSColor.FromRgba (0.244f, 0.247f, 0.245f, 1).SetStroke ();
+				// would make the initial colour actually be .56,.56,.56
+				//
+				// However after switching theme this filter is removed and the colour set here is the actual colour
+				// displayed onscreen.
+				Styles.DarkBorderBrokenColor.ToNSColor ().SetStroke ();
+				path.Stroke ();
+			} else {
+				if (controlView.Window?.Screen?.BackingScaleFactor == 2) {
+					frame = new CGRect (frame.X, frame.Y + 0.5f, frame.Width, frame.Height);
+				}
+				base.DrawBezelWithFrame (frame, controlView);
+			}
+		}
+
+		public override void DrawInteriorWithFrame (CGRect cellFrame, NSView inView)
+		{
+			cellFrame = new CGRect (cellFrame.X, cellFrame.Y + 0.5f, cellFrame.Width, cellFrame.Height);
+			base.DrawInteriorWithFrame (cellFrame, inView);
+		}
 	}
 }
 
diff --git a/main/src/addins/MacPlatform/MainToolbar/SearchBar.cs b/main/src/addins/MacPlatform/MainToolbar/SearchBar.cs
index 9e3f902190..00f7149c79 100644
--- a/main/src/addins/MacPlatform/MainToolbar/SearchBar.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/SearchBar.cs
@@ -26,8 +26,10 @@
 using System;
 using AppKit;
 using Foundation;
+using CoreGraphics;
 using Gtk;
-using MonoDevelop.Components.Mac;
+using MonoDevelop.Core;
+
 using MonoDevelop.Ide;
 using Xwt.Mac;
 
@@ -36,39 +38,184 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 	[Register]
 	class SearchBar : NSSearchField
 	{
+		bool debugSearchbar;
 		internal Widget gtkWidget;
 		internal event EventHandler<Xwt.KeyEventArgs> KeyPressed;
 		internal event EventHandler LostFocus;
-		new internal event EventHandler Activated;
+		internal event EventHandler SelectionActivated;
 		public event EventHandler GainedFocus;
 
-		/// <summary>
-		/// This tells whether events have been attached when created from the menu.
-		/// </summary>
-		internal bool EventsAttached;
+		// To only draw the border, NSSearchFieldCell needs to be subclassed. Unfortunately this stops the 
+		// animation on activation working. I suspect this is implemented inside the NSSearchField rather
+		// than the NSSearchFieldCell which can't do animation.
+		class DarkSkinSearchFieldCell : NSSearchFieldCell
+		{
+			public override void DrawWithFrame (CGRect cellFrame, NSView inView)
+			{
+				if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) {
+					var inset = cellFrame.Inset (0.25f, 0.25f);
+					if (!ShowsFirstResponder) {
+						var path = NSBezierPath.FromRoundedRect (inset, 3, 3);
+						path.LineWidth = 0.5f;
+
+						Styles.DarkBorderColor.ToNSColor ().SetStroke ();
+						path.Stroke ();
+					}
+
+					// Can't just call base.DrawInteriorWithFrame because it draws the placeholder text
+					// with a strange emboss effect when it the view is not first responder.
+					// Again, probably because the NSSearchField handles the not first responder state itself
+					// rather than using NSSearchFieldCell
+					//base.DrawInteriorWithFrame (inset, inView);
+
+					// So instead, draw the various extra cells and text in the correct places
+					SearchButtonCell.DrawWithFrame (SearchButtonRectForBounds (inset), inView);
+
+					if (!ShowsFirstResponder) {
+						PlaceholderAttributedString.DrawInRect (SearchTextRectForBounds (inset));
+					}
+
+					if (!string.IsNullOrEmpty (StringValue)) {
+						CancelButtonCell.DrawWithFrame (CancelButtonRectForBounds (inset), inView);
+					}
+				} else {
+					if (inView.Window?.Screen?.BackingScaleFactor == 2) {
+						nfloat yOffset = 0f;
+						nfloat hOffset = 0f;
+
+						if (MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan) {
+							if (inView.Window.IsKeyWindow) {
+								yOffset = 0.5f;
+								hOffset = -0.5f;
+							} else {
+								yOffset = 0f;
+								hOffset = 1.0f;
+							}
+						} else {
+							yOffset = 1f;
+							hOffset = -1f;
+						}
+						cellFrame = new CGRect (cellFrame.X, cellFrame.Y + yOffset, cellFrame.Width, cellFrame.Height + hOffset);
+					} else {
+						nfloat yOffset = 0f;
+						nfloat hOffset = 0f;
+
+						cellFrame = new CGRect (cellFrame.X, cellFrame.Y + yOffset, cellFrame.Width, cellFrame.Height + hOffset);
+					}
+					base.DrawWithFrame (cellFrame, inView);
+				}
+			}
+
+			// This is the rect for the placeholder text, not the text field entry
+			public override CGRect SearchTextRectForBounds (CGRect rect)
+			{
+				if (ShowsFirstResponder) {
+					rect = new CGRect (rect.X + 26, 0, rect.Width - 52, 22);
+				} else {
+					nfloat y = MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3;
+					rect = new CGRect (rect.X + 28, y, rect.Width - 56, 22);
+				}
+
+				return rect;
+			}
+
+			// The rect for the search icon
+			public override CGRect SearchButtonRectForBounds (CGRect rect)
+			{
+				rect = new CGRect (0, 0, 26, rect.Height);
+				return rect;
+			}
+
+			// The rect for the cancel button
+			public override CGRect CancelButtonRectForBounds (CGRect rect)
+			{
+				rect = new CGRect (rect.X + rect.Width - 26.0, 0, 26, rect.Height);
+
+				return rect;
+			}
+
+			// When customising the NSCell these are the methods which determine
+			// where the editing and selecting text appears
+			public override void EditWithFrame (CGRect aRect, NSView inView, NSText editor, NSObject delegateObject, NSEvent theEvent)
+			{
+				aRect = new CGRect (aRect.X, aRect.Y + 10, aRect.Width - 66, aRect.Height);
+				base.EditWithFrame (aRect, inView, editor, delegateObject, theEvent);
+			}
+
+			public override void SelectWithFrame (CGRect aRect, NSView inView, NSText editor, NSObject delegateObject, nint selStart, nint selLength)
+			{
+				nfloat xOffset = 0;
+				if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) {
+					xOffset = -1.5f;
+				}
+				// y does not appear to affect anything. Whatever value is set here for y will always be 1px below the
+				// placeholder text
+				aRect = new CGRect (aRect.X + xOffset, aRect.Y, aRect.Width, aRect.Height);
+				base.SelectWithFrame (aRect, inView, editor, delegateObject, selStart, selLength);
+			}
+		}
+
+		static string FirstResponderPlaceholder {
+			get {
+				return GettextCatalog.GetString ("Search");
+			}
+		}
+
+		string placeholderText;
+		public string PlaceholderText {
+			get {
+				return placeholderText ?? FirstResponderPlaceholder;
+			}
+			set {
+				placeholderText = value ?? FirstResponderPlaceholder;
+				PlaceholderAttributedString = MakePlaceholderString (placeholderText);
+			}
+		}
 
 		public SearchBar ()
 		{
-			Cell.Scrollable = true;
+			Cell = new DarkSkinSearchFieldCell ();
+
 			Initialize ();
+			var debugFilePath = System.IO.Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".xs-searchbar-debug");
+			debugSearchbar = System.IO.File.Exists (debugFilePath);
+
+			Ide.Gui.Styles.Changed +=  (o, e) => UpdateLayout ();
+			UpdateLayout ();
 		}
 
-		public SearchBar (IntPtr ptr) : base (ptr)
+		NSAttributedString MakePlaceholderString (string t)
 		{
-			Initialize ();
+			return new NSAttributedString (t, foregroundColor: NSColor.FromRgba (0.63f, 0.63f, 0.63f, 1.0f));
+		}
+
+		void UpdateLayout ()
+		{
+			Bezeled = true;
+			BezelStyle = NSTextFieldBezelStyle.Rounded;
+			Editable = true;
+			Cell.Scrollable = true;
+			Selectable = true;
+
+			PlaceholderAttributedString = MakePlaceholderString (PlaceholderText);
 		}
 
 		void Initialize ()
 		{
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResignKeyNotification, notification => DispatchService.GuiDispatch (() => {
-				if (notification.Object == Window)
+			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResignKeyNotification, notification => Runtime.RunInMainThread (() => {
+				var other = (NSWindow)notification.Object;
+
+				if (notification.Object == Window) {
 					if (LostFocus != null)
 						LostFocus (this, null);
+				}
 			}));
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResizeNotification, notification => DispatchService.GuiDispatch (() => {
-				if (notification.Object == Window)
+			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidResizeNotification, notification => Runtime.RunInMainThread (() => {
+				var other = (NSWindow)notification.Object;
+				if (notification.Object == Window) {
 					if (LostFocus != null)
 						LostFocus (this, null);
+				}
 			}));
 		}
 
@@ -82,13 +229,24 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 		public override bool PerformKeyEquivalent (NSEvent theEvent)
 		{
-			return SendKeyPressed (theEvent.ToXwtKeyEventArgs ()) || base.PerformKeyEquivalent (theEvent);
+			var popupHandled = SendKeyPressed (theEvent.ToXwtKeyEventArgs ());
+			if (popupHandled)
+				return true;
+			return base.PerformKeyEquivalent (theEvent);;
 		}
 
+		bool ignoreEndEditing = false;
 		public override void DidEndEditing (NSNotification notification)
 		{
 			base.DidEndEditing (notification);
 
+			if (ignoreEndEditing) {
+				ignoreEndEditing = false;
+				return;
+			}
+
+			PlaceholderAttributedString = MakePlaceholderString (PlaceholderText);
+
 			nint value = ((NSNumber)notification.UserInfo.ValueForKey ((NSString)"NSTextMovement")).LongValue;
 			if (value == (nint)(long)NSTextMovement.Tab) {
 				SelectText (this);
@@ -96,15 +254,16 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			}
 
 			if (value == (nint)(long)NSTextMovement.Return) {
-				if (Activated != null)
-					Activated (this, null);
+				if (SelectionActivated != null)
+					SelectionActivated (this, null);
 				return;
 			}
 
 			// This means we've reached a focus loss event.
 			var replacedWith = notification.UserInfo.ValueForKey ((NSString)"_NSFirstResponderReplacingFieldEditor");
-			if (replacedWith != this && LostFocus != null)
+			if (replacedWith != this && LostFocus != null) {
 				LostFocus (this, null);
+			}
 		}
 
 		public override void ViewDidMoveToWindow ()
@@ -112,22 +271,26 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			base.ViewDidMoveToWindow ();
 
 			// Needs to be grabbed after it's parented.
-			gtkWidget = GtkMacInterop.NSViewToGtkWidget (this);
+			gtkWidget = Components.Mac.GtkMacInterop.NSViewToGtkWidget (this);
 		}
 
 		public override bool BecomeFirstResponder ()
 		{
 			bool firstResponder = base.BecomeFirstResponder ();
-			if (firstResponder)
-				Focus ();
+			if (firstResponder) {
+				ignoreEndEditing = true;
+				PlaceholderAttributedString = MakePlaceholderString (FirstResponderPlaceholder);
+				ignoreEndEditing = false;
+
+				GainedFocus?.Invoke (this, EventArgs.Empty);
+			}
 
 			return firstResponder;
 		}
 
 		public void Focus ()
 		{
-			if (GainedFocus != null)
-				GainedFocus (this, EventArgs.Empty);
+			Window.MakeFirstResponder (this);
 		}
 	}
 }
diff --git a/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs b/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs
index 21b7f938d0..318b849118 100644
--- a/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs
@@ -30,6 +30,7 @@ using AppKit;
 using CoreGraphics;
 using Foundation;
 using MonoDevelop.Components;
+using MonoDevelop.Components.Mac;
 using MonoDevelop.Components.MainToolbar;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
@@ -55,47 +56,64 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 	[Register]
 	class SelectorView : NSButton
 	{
-		public event EventHandler<SizeRequestedEventArgs> ResizeRequested;
-		public event EventHandler<OverflowInfoEventArgs> OverflowInfoRequested;
+		public event EventHandler<EventArgs> SizeChanged;
 		internal const int ConfigurationIdx = 0;
 		internal const int RuntimeIdx = 1;
 
+		internal PathSelectorView RealSelectorView { get; private set; }
+
 		public SelectorView ()
 		{
-			Title = "";
+			Cell = new ColoredButtonCell ();
 			BezelStyle = NSBezelStyle.TexturedRounded;
-			var pathSelectorView = new PathSelectorView (new CGRect (6, 0, 1, 1));
-			pathSelectorView.UnregisterDraggedTypes ();
-			AddSubview (pathSelectorView);
+			Title = "";
+
+			RealSelectorView = new PathSelectorView (new CGRect (6, 0, 1, 1));
+			RealSelectorView.UnregisterDraggedTypes ();
+			AddSubview (RealSelectorView);
 		}
 
-		public bool RequestResize ()
+		public override CGSize SizeThatFits (CGSize size)
 		{
-			var p = (PathSelectorView)Subviews [0];
-			var overflowInfo = new OverflowInfoEventArgs ();
-			if (OverflowInfoRequested != null)
-				OverflowInfoRequested (this, overflowInfo);
+			var fitSize = RealSelectorView.SizeThatFits (size);
 
-			var size = new CGSize (p.ResizeIfNeeded (overflowInfo), Frame.Height);
+			return new CGSize (Math.Round (fitSize.Width) + 12.0, size.Height);
+		}
 
-			if (size != Frame.Size) {
-				if (ResizeRequested != null)
-					ResizeRequested (this, new SizeRequestedEventArgs (size));
+		public override void SetFrameSize (CGSize newSize)
+		{
+			base.SetFrameSize (newSize);
+			RealSelectorView.SetFrameSize (newSize);
+		}
 
-				SetFrameSize (size);
-				p.SetFrameSize (size);
+		public override void ViewDidMoveToWindow ()
+		{
+			base.ViewDidMoveToWindow ();
+			UpdateLayout ();
+		}
 
-				SetNeedsDisplay ();
-				p.SetNeedsDisplay ();
-				return true;
+		void UpdateLayout ()
+		{
+			// Correct the offset position for the screen
+			nfloat yOffset = 1f;
+			if (Window?.Screen?.BackingScaleFactor == 2) {
+				yOffset = 0.5f;
 			}
-			return false;
+
+			RealSelectorView.Frame = new CGRect (RealSelectorView.Frame.X, yOffset, RealSelectorView.Frame.Width, RealSelectorView.Frame.Height);
 		}
 
-		public override void ViewWillDraw ()
+		public override void DidChangeBackingProperties ()
 		{
-			RequestResize ();
-			base.ViewWillDraw ();
+			base.DidChangeBackingProperties ();
+			UpdateLayout ();
+		}
+
+		internal void OnSizeChanged ()
+		{
+			if (SizeChanged != null) {
+				SizeChanged (this, EventArgs.Empty);
+			}
 		}
 
 		#region PathSelectorView
@@ -115,57 +133,73 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			static readonly string RuntimePlaceholder = GettextCatalog.GetString ("Default");
 			CellState state = CellState.AllShown;
 
-			nfloat UpdatePathCellForSize (int idx, nfloat remaining, CellState newStateIfEnoughSize)
+			public override CGSize SizeThatFits (CGSize size)
 			{
-				var cell = PathComponentCells [idx];
-				string text;
-				if (idx == ConfigurationIdx) {
-					if (ActiveConfiguration != null)
-						text = ActiveConfiguration.DisplayString;
-					else
-						text = ConfigurationPlaceholder;
-				} else {
-					if (ActiveRuntime != null) {
-						using (var mutableModel = ActiveRuntime.GetMutableModel ())
-							text = mutableModel.FullDisplayString;
-					} else
-						text = RuntimePlaceholder;
+				nfloat rtWidth, cWidth;
+
+				WidthsForPathCells (out cWidth, out rtWidth);
+
+				if (10 + cWidth + rtWidth < size.Width) {
+					state = CellState.AllShown;
+					UpdatePathText (ConfigurationIdx, TextForActiveConfiguration);
+					UpdatePathText (RuntimeIdx, TextForRuntimeConfiguration);
+					return new CGSize (10 + cWidth + rtWidth, size.Height);
 				}
-				var size = new NSAttributedString (text, new NSStringAttributes { Font = cell.Font }).Size.Width + 20;
-				if (size < remaining) {
-					state |= newStateIfEnoughSize;
-					UpdatePathText (idx, text);
+
+				if (10 + 28 + cWidth < size.Width) {
+					state = CellState.ConfigurationShown;
+					UpdatePathText (ConfigurationIdx, TextForActiveConfiguration);
+					UpdatePathText (RuntimeIdx, string.Empty);
+					return new CGSize (10 + 28 + cWidth, size.Height);
 				}
-				return remaining - size;
+
+				state = CellState.AllHidden;
+				UpdatePathText (ConfigurationIdx, string.Empty);
+				UpdatePathText (RuntimeIdx, string.Empty);
+				return new CGSize (10 + 52.0, size.Height);
 			}
 
-			internal nfloat ResizeIfNeeded (OverflowInfoEventArgs args)
+			string EllipsizeString (string s)
 			{
-				var remaining = args.WindowWidth - args.AllItemsWidth;
-				if (remaining < 0 || args.ItemsInOverflowWidth > 0) {
-					var cell = PathComponentCells [RuntimeIdx];
-					var size = new NSAttributedString (cell.Title, new NSStringAttributes { Font = cell.Font }).Size.Width;
-					remaining += size;
-					args.ItemsInOverflowWidth -= size;
-					if ((state & CellState.RuntimeShown) != 0) {
-						state &= ~CellState.RuntimeShown;
-						UpdatePathText (RuntimeIdx, string.Empty);
-					}
-					if ((remaining < 0 || args.ItemsInOverflowWidth > 0) && (state & CellState.ConfigurationShown) != 0) {
-						state &= ~CellState.ConfigurationShown;
-						UpdatePathText (ConfigurationIdx, string.Empty);
-					}
+				if (s.Length > 50) {
+					var start = s.Substring (0, 20);
+					var end = s.Substring (s.Length - 20, 20);
+
+					return start + "…" + end;
 				} else {
-					remaining = remaining - args.ItemsInOverflowWidth;
-					if ((state & CellState.ConfigurationShown) == 0)
-						remaining = UpdatePathCellForSize (ConfigurationIdx, remaining, CellState.ConfigurationShown);
-					if ((state & CellState.RuntimeShown) == 0)
-						UpdatePathCellForSize (RuntimeIdx, remaining, CellState.RuntimeShown);
+					return s;
 				}
+			}
 
-				return 10 +
-					PathComponentCells [ConfigurationIdx].CellSize.Width +
-					PathComponentCells [RuntimeIdx].CellSize.Width + Frame.Left;
+			string TextForActiveConfiguration {
+				get {
+					return EllipsizeString (ActiveConfiguration != null ? ActiveConfiguration.DisplayString : ConfigurationPlaceholder);
+				}
+			}
+
+			string TextForRuntimeConfiguration {
+				get {
+					if (ActiveRuntime != null) {
+						using (var mutableModel = ActiveRuntime.GetMutableModel ())
+							return EllipsizeString (mutableModel.FullDisplayString);
+					} else {
+						return EllipsizeString (RuntimePlaceholder);
+					}
+				}
+			}
+
+			void WidthsForPathCells (out nfloat configWidth, out nfloat runtimeWidth)
+			{
+				string text;
+				NSPathComponentCell cell;
+
+				text = TextForActiveConfiguration;
+				cell = PathComponentCells [ConfigurationIdx];
+				configWidth = new NSAttributedString (text, new NSStringAttributes { Font = cell.Font }).Size.Width + 28;
+
+				text = TextForRuntimeConfiguration;
+				cell = PathComponentCells [RuntimeIdx];
+				runtimeWidth = new NSAttributedString (text, new NSStringAttributes { Font = cell.Font }).Size.Width + 28;
 			}
 
 			NSMenu CreateSubMenuForRuntime (IRuntimeModel runtime)
@@ -183,7 +217,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 				return menu;
 			}
 
-			void CreateMenuItem (NSMenu menu, IRuntimeModel runtime)
+			NSMenuItem CreateMenuItem (NSMenu menu, IRuntimeModel runtime)
 			{
 				NSMenuItem menuItem;
 				string runtimeFullDisplayString;
@@ -231,95 +265,149 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 					};
 				}
 				menu.AddItem (menuItem);
+				return menuItem;
 			}
 
-
 			public PathSelectorView (CGRect frameRect) : base (frameRect)
 			{
 				PathComponentCells = new [] {
 					new NSPathComponentCell {
-						Image = ImageService.GetIcon ("project").ToNSImage (),
-						Title = ConfigurationPlaceholder,
+						Image = MultiResImage.CreateMultiResImage ("project", "disabled"),
+						Title = TextForActiveConfiguration,
 						Enabled = false,
-						TextColor = NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1),
 					},
 					new NSPathComponentCell {
-						Image = ImageService.GetIcon ("device").ToNSImage (),
-						Title = RuntimePlaceholder,
+						Image = MultiResImage.CreateMultiResImage ("device", "disabled"),
+						Title = TextForRuntimeConfiguration,
 						Enabled = false,
-						TextColor = NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1),
 					}
 				};
+				UpdateStyle ();
 
 				BackgroundColor = NSColor.Clear;
 				FocusRingType = NSFocusRingType.None;
-				Activated += (sender, e) => {
-					var item = ClickedPathComponentCell;
-					if (item == null)
+
+				Ide.Gui.Styles.Changed += UpdateStyle;
+			}
+
+			int IndexOfCellAtX (nfloat x)
+			{
+				nfloat rWidth, cWidth;
+				WidthsForPathCells (out cWidth, out rWidth);
+
+				if (x >= 0 && x <= cWidth) {
+					return ConfigurationIdx;
+				} else if (x > cWidth && x <= cWidth + 10) {
+					// The > in the middle
+					return -1;
+				} else {
+					return RuntimeIdx;
+				}
+			}
+
+			public override void MouseDown (NSEvent theEvent)
+			{
+				if (!Enabled)
+					return;
+
+				var locationInView = ConvertPointFromView (theEvent.LocationInWindow, null);
+
+				var cellIdx = IndexOfCellAtX (locationInView.X);
+				if (cellIdx == -1) {
+					return;
+				}
+
+				var item = PathComponentCells [cellIdx];
+				if (item == null || !item.Enabled)
+					return;
+
+				var componentRect = ((NSPathCell)Cell).GetRect (item, Frame, this);
+				int idx = -1;
+				int i = 0;
+
+				NSMenuItem selectedItem = null;
+				var menu = new NSMenu {
+					AutoEnablesItems = false,
+					ShowsStateColumn = false,
+					Font = NSFont.MenuFontOfSize (12),
+				};
+				if (cellIdx == ConfigurationIdx) {
+					if (ActiveConfiguration == null)
 						return;
 
-					var componentRect = ((NSPathCell)Cell).GetRect (item, Frame, this);
-					int idx = -1;
-					int i = 0;
+					foreach (var configuration in ConfigurationModel) {
 
-					var menu = new NSMenu {
-						AutoEnablesItems = false,
-						ShowsStateColumn = false,
-						Font = NSFont.MenuFontOfSize (12),
-					};
-					if (object.ReferenceEquals (ClickedPathComponentCell, PathComponentCells [ConfigurationIdx])) {
-						if (ActiveConfiguration == null)
-							return;
-						
-						foreach (var configuration in ConfigurationModel) {
-							if (idx == -1 && configuration.OriginalId == ActiveConfiguration.OriginalId)
-								idx = i;
-
-							var _configuration = configuration;
-							menu.AddItem (new NSMenuItem (configuration.DisplayString, (o2, e2) => {
-								ActiveConfiguration = configurationModel.First (c => c.OriginalId == _configuration.OriginalId);
-								if (ConfigurationChanged != null)
-									ConfigurationChanged (o2, e2);
-								UpdatePathText (ConfigurationIdx, _configuration.DisplayString);
-							}) {
-								Enabled = true,
-								IndentationLevel = 1,
-							});
-							++i;
-						}
-					} else if (object.ReferenceEquals (ClickedPathComponentCell, PathComponentCells [RuntimeIdx])) {
-						if (ActiveRuntime == null)
-							return;
-						
-						using (var activeMutableModel = ActiveRuntime.GetMutableModel ()) {
-							foreach (var runtime in RuntimeModel) {
-								using (var mutableModel = runtime.GetMutableModel ()) {
-									if (idx == -1 && mutableModel.DisplayString == activeMutableModel.DisplayString)
-										idx = i;
-								}
-
-								if (runtime.HasParent)
-									continue;
-
-								if (runtime.IsSeparator)
-									menu.AddItem (NSMenuItem.SeparatorItem);
-								else
-									CreateMenuItem (menu, runtime);
-								++i;
+						var _configuration = configuration;
+						var menuitem = new NSMenuItem (configuration.DisplayString, (o2, e2) => {
+							ActiveConfiguration = configurationModel.First (c => c.OriginalId == _configuration.OriginalId);
+						}) {
+							Enabled = true,
+							IndentationLevel = 1,
+						};
+
+						menu.AddItem (menuitem);
+
+						if (selectedItem == null && configuration.OriginalId == ActiveConfiguration.OriginalId)
+							selectedItem = menuitem;
+					}
+				} else if (cellIdx == RuntimeIdx) {
+					if (ActiveRuntime == null)
+						return;
+
+					using (var activeMutableModel = ActiveRuntime.GetMutableModel ()) {
+						foreach (var runtime in RuntimeModel) {
+							if (runtime.HasParent)
+								continue;
+
+							NSMenuItem menuitem = null;
+							if (runtime.IsSeparator)
+								menu.AddItem (NSMenuItem.SeparatorItem);
+							else
+								menuitem = CreateMenuItem (menu, runtime);
+
+							using (var mutableModel = runtime.GetMutableModel ()) {
+								if (selectedItem == null && menuitem != null && mutableModel.DisplayString == activeMutableModel.DisplayString)
+									selectedItem = menuitem;
 							}
+
+							++i;
 						}
-					} else
-						throw new NotSupportedException ();
+					}
+				} else
+					throw new NotSupportedException ();
 
-					if (menu.Count > 1) {
-						var offs = new CGPoint (componentRect.Left + 3, componentRect.Top + 3);
+				if (menu.Count > 1) {
+					var offs = new CGPoint (componentRect.Left + 3, componentRect.Top + 3);
 
-						if (Window.Screen.BackingScaleFactor == 2)
-							offs.Y += 0.5f; // fine tune menu position on retinas
+					if (Window?.Screen?.BackingScaleFactor == 2)
+						offs.Y += 0.5f; // fine tune menu position on retinas
 
-						menu.PopUpMenu (null, offs, this);
-					}
-				};
+					menu.PopUpMenu (selectedItem, offs, this);
+				}
+			}
+
+			public override void DidChangeBackingProperties ()
+			{
+				base.DidChangeBackingProperties ();
+
+				// Force a redraw because NSPathControl does not redraw itself when switching to a different resolution
+				// and the icons need redrawn
+				NeedsDisplay = true;
+			}
+
+			void UpdateStyle (object sender = null, EventArgs e = null)
+			{
+				PathComponentCells [ConfigurationIdx].TextColor = Styles.BaseForegroundColor.ToNSColor ();
+				PathComponentCells [RuntimeIdx].TextColor = Styles.BaseForegroundColor.ToNSColor ();
+
+				UpdateImages ();
+			}
+
+			protected override void Dispose (bool disposing)
+			{
+				if (disposing)
+					Ide.Gui.Styles.Changed -= UpdateStyle;
+				base.Dispose (disposing);
 			}
 
 			public override void ViewDidMoveToWindow ()
@@ -327,7 +415,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 				base.ViewDidMoveToWindow ();
 
 				NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidChangeBackingPropertiesNotification,
-					notification => DispatchService.GuiDispatch (RealignTexts));
+				                                                notification => Runtime.RunInMainThread ((Action) RealignTexts));
 				RealignTexts ();
 			}
 
@@ -344,22 +432,47 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 			void UpdatePathText (int idx, string text)
 			{
-				bool showText = (idx == ConfigurationIdx && (state & CellState.ConfigurationShown) != 0) || (idx == RuntimeIdx && (state & CellState.RuntimeShown) != 0);
-				PathComponentCells [idx].Title = showText ? text : "\u00A0";
-				PathComponentCells [ConfigurationIdx].Image = ImageService.GetIcon ("project").ToNSImage ();
-				PathComponentCells [RuntimeIdx].Image = ImageService.GetIcon ("device").ToNSImage ();
+				PathComponentCells [idx].Title = text;
+				UpdateImages ();
+			}
 
+			void UpdateImages ()
+			{
+				string projectStyle = "";
+				string deviceStyle = "";
+				if (!PathComponentCells [ConfigurationIdx].Enabled)
+					projectStyle = "disabled";
+
+				if (!PathComponentCells [ConfigurationIdx].Enabled)
+					deviceStyle = "disabled";
+
+				// HACK
+				// For some reason NSPathControl does not like the images that ImageService provides. To use them it requires
+				// ToBitmap() to be called first. But a second problem is that ImageService only seems to provide a single resolution
+				// for its icons. It may be related to the images being initially loaded through the Gtk backend and then converted to NSImage
+				// at a later date.
+				// For whatever reason, we custom load the images here through NSImage, providing both 1x and 2x image reps.
+				PathComponentCells [ConfigurationIdx].Image = MultiResImage.CreateMultiResImage ("project", deviceStyle);
+				PathComponentCells [RuntimeIdx].Image = MultiResImage.CreateMultiResImage ("device", deviceStyle);
 				RealignTexts ();
 			}
 
+			void OnSizeChanged ()
+			{
+				var sview = (SelectorView)Superview;
+				sview.OnSizeChanged ();
+			}
+
 			IConfigurationModel activeConfiguration;
 			public IConfigurationModel ActiveConfiguration {
 				get { return activeConfiguration; }
 				set {
 					activeConfiguration = value;
 					state |= CellState.ConfigurationShown;
+					if (ConfigurationChanged != null)
+						ConfigurationChanged (this, EventArgs.Empty);
 					UpdatePathText (ConfigurationIdx, value.DisplayString);
-					((SelectorView)Superview).RequestResize ();
+					OnSizeChanged ();
 				}
 			}
 
@@ -371,7 +484,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 					using (var mutableModel = value.GetMutableModel ()) {
 						state |= CellState.RuntimeShown;
 						UpdatePathText (RuntimeIdx, mutableModel.FullDisplayString);
-						((SelectorView)Superview).RequestResize ();
+						OnSizeChanged ();
 					}
 				}
 			}
@@ -385,9 +498,10 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 					if (count == 0) {
 						state |= CellState.ConfigurationShown;
 						UpdatePathText (ConfigurationIdx, ConfigurationPlaceholder);
-						((SelectorView)Superview).RequestResize ();
+						activeConfiguration = null;
 					}
 					PathComponentCells [ConfigurationIdx].Enabled = count > 1;
+					OnSizeChanged ();
 				}
 			}
 
@@ -400,14 +514,29 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 					if (count == 0) {
 						state |= CellState.RuntimeShown;
 						UpdatePathText (RuntimeIdx, RuntimePlaceholder);
-						((SelectorView)Superview).RequestResize ();
+						activeRuntime = null;
 					}
 					PathComponentCells [RuntimeIdx].Enabled = count > 1;
+					OnSizeChanged ();
 				}
 			}
 
 			public event EventHandler ConfigurationChanged;
 			public event EventHandler<HandledEventArgs> RuntimeChanged;
+
+			public override bool Enabled {
+				get {
+					return base.Enabled;
+				}
+				set {
+					base.Enabled = value;
+
+					if (value) {
+						PathComponentCells [RuntimeIdx].Enabled = runtimeModel.Count () > 1;
+						PathComponentCells [ConfigurationIdx].Enabled = configurationModel.Count () > 1;
+					}
+				}
+			}
 		}
 		#endregion
 	}
diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs
index 2331b24551..4078703c30 100644
--- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs
@@ -26,6 +26,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Timers;
 using AppKit;
 using Foundation;
 using CoreAnimation;
@@ -37,19 +38,34 @@ using MonoDevelop.Components.MainToolbar;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide.Tasks;
+using MonoDevelop.Components.Mac;
 
 namespace MonoDevelop.MacIntegration.MainToolbar
 {
-	class StatusIcon : StatusBarIcon
+	class StatusIcon : NSView, StatusBarIcon
 	{
 		StatusBar bar;
-		CALayer layer;
+		NSImageView imageView;
 
-		public StatusIcon (StatusBar bar, CALayer layer, NSTrackingArea trackingArea)
+		public StatusIcon (StatusBar bar) : base (CGRect.Empty)
 		{
+			imageView = new NSImageView (CGRect.Empty);
+			AddSubview (imageView);
+
+			var trackingArea = new NSTrackingArea (CGRect.Empty, NSTrackingAreaOptions.ActiveInKeyWindow | NSTrackingAreaOptions.InVisibleRect | NSTrackingAreaOptions.MouseEnteredAndExited, this, null);
+			AddTrackingArea (trackingArea);
+
 			this.bar = bar;
-			this.layer = layer;
-			TrackingArea = trackingArea;
+		}
+
+		public override CGRect Frame {
+			get {
+				return base.Frame;
+			}
+			set {
+				base.Frame = value;
+				imageView.Frame = new CGRect (0, 0, value.Width, value.Height);
+			}
 		}
 
 		public void SetAlertMode (int seconds)
@@ -57,18 +73,14 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			// Create fade-out fade-in animation.
 		}
 
-		public void Dispose ()
+		public new void Dispose ()
 		{
-			layer.RemoveFromSuperLayer ();
-			bar.RemoveStatusLayer (layer);
-		}
-
-		public string ToolTip {
-			get;
-			set;
+			bar.RemoveStatusIcon (this);
+			RemoveFromSuperview ();
+			base.Dispose ();
 		}
 
-		internal NSTrackingArea TrackingArea {
+		public new string ToolTip {
 			get;
 			set;
 		}
@@ -78,10 +90,30 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			get { return image; }
 			set {
 				image = value;
-				layer.SetImage (value, bar.Window.BackingScaleFactor);
+				imageView.Image = value.ToNSImage ();
+				SetFrameSize (new CGSize (image.Width, image.Height));
 			}
 		}
 
+		public override void MouseEntered (NSEvent theEvent)
+		{
+			if (Entered != null) {
+				Entered (this, EventArgs.Empty);
+			}
+		}
+
+		public override void MouseExited (NSEvent theEvent)
+		{
+			if (Exited != null) {
+				Exited (this, EventArgs.Empty);
+			}
+		}
+
+		public override void MouseUp (NSEvent theEvent)
+		{
+			NotifyClicked (StatusBar.NSEventButtonToXwt (theEvent));
+		}
+
 		internal void NotifyClicked (Xwt.PointerButton button)
 		{
 			if (Clicked != null)
@@ -91,37 +123,247 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 		}
 
 		public event EventHandler<StatusBarIconClickedEventArgs> Clicked;
+		public event EventHandler<EventArgs> Entered;
+		public event EventHandler<EventArgs> Exited;
+	}
+
+	class BuildResultsView : NSView
+	{
+		NSAttributedString resultString;
+		int resultCount;
+		public int ResultCount { 
+			get {
+				return resultCount;
+			}
+			set {
+				resultCount = value;
+				resultString = new NSAttributedString (value.ToString (), foregroundColor: Styles.BaseForegroundColor.ToNSColor (),
+					font: NSFont.SystemFontOfSize (NSFont.SmallSystemFontSize - 1));
+				ResizeToFit ();
+			}
+		}
+
+		NSImage iconImage;
+		public NSImage IconImage {
+			get {
+				return iconImage;
+			}
+			set {
+				iconImage = value;
+				ResizeToFit ();
+			}
+		}
+
+		public BuildResultsView () : base (new CGRect (0, 0, 0, 0))
+		{
+		}
+
+		public override void DrawRect (CGRect dirtyRect)
+		{
+			if (iconImage == null || resultString == null) {
+				return;
+			}
+
+			iconImage.Draw (new CGRect (0, (Frame.Size.Height - iconImage.Size.Height) / 2, iconImage.Size.Width, iconImage.Size.Height));
+			resultString.DrawAtPoint (new CGPoint (iconImage.Size.Width, (Frame.Size.Height - resultString.Size.Height) / 2));
+		}
+
+		void ResizeToFit ()
+		{
+			if (iconImage == null || resultString == null) {
+				return;
+			}
+
+			var stringSize = resultString.GetSize ();
+			Frame = new CGRect (Frame.X, Frame.Y, iconImage.Size.Width + stringSize.Width, Frame.Height);
+			NeedsDisplay = true;
+		}
+
+		public override void MouseDown (NSEvent theEvent)
+		{
+			IdeApp.Workbench.GetPad<MonoDevelop.Ide.Gui.Pads.ErrorListPad> ().BringToFront ();
+		}
+	}
+
+	// We need a separate layer backed view to put over the NSTextFields because the NSTextField draws itself differently
+	// if it is layer backed so we can't make it or its superview layer backed.
+	class ProgressView : NSView
+	{
+		const string ProgressLayerFadingId = "ProgressLayerFading";
+		const string growthAnimationKey = "bounds";
+
+		CALayer progressLayer;
+		Stack<double> progressMarks = new Stack<double> ();
+		bool inProgress;
+		double oldFraction;
+
+		const int barHeight = 2;
+
+		public ProgressView ()
+		{
+			WantsLayer = true;
+			Layer.CornerRadius = MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 3 : 4;
+
+			progressLayer = new CALayer ();
+			Layer.AddSublayer (progressLayer);
+			Layer.BorderWidth = 0;
+
+			var xamBlue = NSColor.FromRgba (52f / 255, 152f / 255, 219f / 255, 1f);
+			progressLayer.BackgroundColor = xamBlue.CGColor;
+			progressLayer.BorderWidth = 0;
+			progressLayer.FillMode = CAFillMode.Forwards;
+			progressLayer.Frame = new CGRect (0, 0, 0, barHeight);
+			progressLayer.AnchorPoint = new CGPoint (0, 0);
+		}
+
+		public void BeginProgress ()
+		{
+			oldFraction = 0.0;
+			progressLayer.Hidden = false;
+			progressLayer.Opacity = 1;
+			progressLayer.Frame = new CGRect (0, 0, 0, barHeight);
+		}
+
+		public void SetProgressFraction (double work)
+		{
+			progressMarks.Push (work);
+			if (!inProgress) {
+				inProgress = true;
+				StartProgress (progressMarks.Peek ());
+			}
+		}
+
+		public void EndProgress ()
+		{
+			progressMarks.Clear ();
+			if (progressLayer != null) {
+				progressLayer.RemoveAnimation (growthAnimationKey);
+				progressLayer.Hidden = true;
+			}
+			inProgress = false;
+		}
+
+		CAAnimation CreateMoveAndGrowAnimation (CALayer progress, double growToFraction)
+		{
+			CAAnimationGroup grp = CAAnimationGroup.CreateAnimation ();
+			grp.Duration = 0.2;
+			grp.FillMode = CAFillMode.Forwards;
+			grp.RemovedOnCompletion = false;
+
+			CABasicAnimation grow = CABasicAnimation.FromKeyPath ("bounds");
+			grow.From = NSValue.FromCGRect (new CGRect (0, 0, Frame.Width * (nfloat)oldFraction, barHeight));
+			grow.To = NSValue.FromCGRect (new CGRect (0, 0, Frame.Width * (nfloat)growToFraction, barHeight));
+			grp.Animations = new [] {
+				grow,
+			};
+			return grp;
+		}
+
+		CAAnimation CreateAutoPulseAnimation ()
+		{
+			CABasicAnimation move = CABasicAnimation.FromKeyPath ("position.x");
+			move.From = NSNumber.FromDouble (-frameAutoPulseWidth);
+			move.To = NSNumber.FromDouble (Frame.Width + frameAutoPulseWidth);
+			move.RepeatCount = float.PositiveInfinity;
+			move.RemovedOnCompletion = false;
+			move.Duration = 4;
+			return move;
+		}
+
+		void AttachFadeoutAnimation (CALayer progress, CAAnimation animation, Func<bool> fadeoutVerifier)
+		{
+			animation.AnimationStopped += (sender, e) => {
+				if (!fadeoutVerifier ())
+					return;
+
+				CABasicAnimation fadeout = CABasicAnimation.FromKeyPath ("opacity");
+				fadeout.From = NSNumber.FromDouble (1);
+				fadeout.To = NSNumber.FromDouble (0);
+				fadeout.Duration = 0.5;
+				fadeout.FillMode = CAFillMode.Forwards;
+				fadeout.RemovedOnCompletion = false;
+				fadeout.AnimationStopped += (sender2, e2) => {
+					if (!e2.Finished)
+						return;
+
+					inProgress = false;
+					progress.Opacity = 0;
+					progress.RemoveAllAnimations ();
+				};
+				progress.Name = ProgressLayerFadingId;
+				progress.AddAnimation (fadeout, "opacity");
+			};
+			progress.AddAnimation (animation, growthAnimationKey);
+		}
+
+		public void StartProgress (double newFraction)
+		{
+			progressMarks.Clear ();
+			var grp = CreateMoveAndGrowAnimation (progressLayer, newFraction);
+			oldFraction = newFraction;
+
+			AttachFadeoutAnimation (progressLayer, grp, () => {
+				if (oldFraction < 1 && inProgress) {
+					if (progressMarks.Count != 0) {
+						StartProgress (progressMarks.Peek ());
+					} else {
+						inProgress = false;
+					}
+					return false;
+				}
+				return true;
+			});
+		}
+
+		const double frameAutoPulseWidth = 100;
+		public void StartProgressAutoPulse ()
+		{
+			var move = CreateAutoPulseAnimation ();
+			AttachFadeoutAnimation (progressLayer, move, () => true);
+		}
 	}
 
 	[Register]
-	class StatusBar : NSTextField, MonoDevelop.Ide.StatusBar
+	class StatusBar : NSButton, MonoDevelop.Ide.StatusBar
 	{
-		const string ProgressLayerId = "ProgressLayer";
+		public enum MessageType
+		{
+			Ready,
+			Information,
+			Warning,
+			Error,
+		}
+
 		const string ProgressLayerFadingId = "ProgressLayerFading";
-		const string StatusIconPrefixId = "StatusLayer";
-		const string BuildIconLayerId = "BuildIconLayer";
-		const string BuildTextLayerId = "BuildTextLayer";
-		const string SeparatorLayerId = "SeparatorLayer";
 		const string growthAnimationKey = "bounds";
 		StatusBarContextHandler ctxHandler;
 		Stack<double> progressMarks = new Stack<double> ();
 		bool currentTextIsMarkup;
 		string text;
+		MessageType messageType;
 		NSColor textColor;
 		NSImage image;
 		IconId icon;
 		AnimatedIcon iconAnimation;
 		IDisposable xwtAnimation;
+		readonly BuildResultsView buildResults;
 
 		NSAttributedString GetStatusString (string text, NSColor color)
 		{
+			nfloat fontSize = NSFont.SystemFontSize;
+			if (Window != null && Window.Screen != null) {
+				fontSize -= Window.Screen.BackingScaleFactor == 2 ? 2 : 1;
+			} else {
+				fontSize -= 1;
+			}
+
 			return new NSAttributedString (text, new NSStringAttributes {
 				ForegroundColor = color,
 				ParagraphStyle = new NSMutableParagraphStyle {
 					HeadIndent = imageView.Frame.Width,
 					LineBreakMode = NSLineBreakMode.TruncatingMiddle,
 				},
-				Font = NSFont.SystemFontOfSize (NSFont.SystemFontSize - 2),
+				Font = NSFont.SystemFontOfSize (fontSize),
 			});
 		}
 
@@ -138,57 +380,56 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			Editable = false,
 			Selectable = false,
 		};
+		NSTrackingArea textFieldArea;
+		ProgressView progressView;
 
 		TaskEventHandler updateHandler;
 		public StatusBar ()
 		{
-			AllowsEditingTextAttributes = Selectable = Editable = false;
+			Cell = new ColoredButtonCell ();
+			BezelStyle = NSBezelStyle.TexturedRounded;
+			Title = "";
+			Enabled = false;
 
-			textField.Cell = new VerticallyCenteredTextFieldCell (yOffset: -0.5f);
+			LoadStyles ();
+
+			// We don't need to resize the Statusbar here as a style change will trigger a complete relayout of the Awesomebar
+			Ide.Gui.Styles.Changed += LoadStyles;
+
+			textField.Cell = new VerticallyCenteredTextFieldCell (0f);
 			textField.Cell.StringValue = "";
-			textField.Cell.PlaceholderAttributedString = GetStatusString (BrandingService.ApplicationName, NSColor.DisabledControlText);
+			UpdateApplicationNamePlaceholderText ();
+
+			// The rect is empty because we use InVisibleRect to track the whole of the view.
+			textFieldArea = new NSTrackingArea (CGRect.Empty, NSTrackingAreaOptions.MouseEnteredAndExited | NSTrackingAreaOptions.ActiveInKeyWindow | NSTrackingAreaOptions.InVisibleRect, this, null);
+			textField.AddTrackingArea (textFieldArea);
+
+			imageView.Frame = new CGRect (0.5, 0, 0, 0);
 			imageView.Image = ImageService.GetIcon (Stock.StatusSteady).ToNSImage ();
 
-			// Fixes a render glitch of a whiter bg than the others.
-			if (MacSystemInformation.OsVersion >= MacSystemInformation.Yosemite)
-				BezelStyle = NSTextFieldBezelStyle.Rounded;
+			buildResults = new BuildResultsView ();
+			buildResults.Hidden = true;
 
-			WantsLayer = true;
-			Layer.CornerRadius = MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 6 : 4;
 			ctxHandler = new StatusBarContextHandler (this);
 
 			updateHandler = delegate {
-				int ec=0, wc=0;
+				int ec = 0, wc = 0;
 
-				foreach (Task t in TaskService.Errors) {
+				foreach (var t in TaskService.Errors) {
 					if (t.Severity == TaskSeverity.Error)
 						ec++;
 					else if (t.Severity == TaskSeverity.Warning)
 						wc++;
 				}
 
-				DispatchService.GuiDispatch (delegate {
-					if (ec > 0) {
-						buildResultVisible = true;
-						buildResultText.AttributedString = new NSAttributedString (ec.ToString (), foregroundColor: NSColor.Text,
-							font: NSFont.SystemFontOfSize (NSFont.SmallSystemFontSize - 1));
-						buildResultText.ContentsScale = Window.BackingScaleFactor;
-						buildResultIcon.SetImage (buildImageId = "md-status-error-count", Window.BackingScaleFactor);
-					} else if (wc > 0) {
-						buildResultVisible = true;
-						buildResultText.AttributedString = new NSAttributedString (wc.ToString (), foregroundColor: NSColor.Text,
-							font: NSFont.SystemFontOfSize (NSFont.SmallSystemFontSize - 1));
-						buildResultText.ContentsScale = Window.BackingScaleFactor;
-						buildResultIcon.SetImage (buildImageId = "md-status-warning-count", Window.BackingScaleFactor);
-					} else
-						buildResultVisible = false;
-
-					CATransaction.DisableActions = true;
-					nfloat buildResultPosition = DrawBuildResults ();
-					CATransaction.DisableActions = false;
-					if (buildResultPosition == nfloat.PositiveInfinity)
-						return;
-					textField.SetFrameSize (new CGSize (buildResultPosition - 6 - textField.Frame.Left, Frame.Height));
+				Runtime.RunInMainThread (delegate {
+					buildResults.Hidden = (ec == 0 && wc == 0);
+					buildResults.ResultCount = ec > 0 ? ec : wc;
+
+					buildImageId = ec > 0 ? "md-status-error-count" : "md-status-warning-count";
+					buildResults.IconImage = ImageService.GetIcon (buildImageId, Gtk.IconSize.Menu).ToNSImage ();
+
+					RepositionStatusIcons ();
 				});
 			};
 
@@ -196,208 +437,168 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 			TaskService.Errors.TasksAdded += updateHandler;
 			TaskService.Errors.TasksRemoved += updateHandler;
+			BrandingService.ApplicationNameChanged += ApplicationNameChanged;
 
-			NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidChangeBackingPropertiesNotification, notif => DispatchService.GuiDispatch (() => {
-				if (Window == null)
-					return;
-
-				ReconstructString (updateTrackingAreas: true);
-				foreach (var layer in Layer.Sublayers) {
-					if (layer.Name != null && layer.Name.StartsWith (StatusIconPrefixId, StringComparison.Ordinal))
-						layer.SetImage (layerToStatus [layer.Name].Image, Window.BackingScaleFactor);
-				}
-				if (buildResultVisible) {
-					buildResultIcon.SetImage (buildImageId, Window.BackingScaleFactor);
-					buildResultText.ContentsScale = Window.BackingScaleFactor;
-				}
-			}));
-
+			AddSubview (buildResults);
 			AddSubview (imageView);
 			AddSubview (textField);
+
+			progressView = new ProgressView ();
+			AddSubview (progressView);
 		}
 
-		public override void DrawRect (CGRect dirtyRect)
+		void UpdateApplicationNamePlaceholderText ()
 		{
-			if (imageView.Frame.Location == CGPoint.Empty)
-				imageView.Frame = new CGRect (6, 0, 16, Frame.Height);
-			if (textField.Frame.Location == CGPoint.Empty)
-				textField.Frame = new CGRect (imageView.Frame.Right, 0, Frame.Width - 16, Frame.Height);
+			textField.Cell.PlaceholderAttributedString = GetStatusString (BrandingService.ApplicationLongName, ColorForType (MessageType.Ready));
+		}
 
-			base.DrawRect (dirtyRect);
+		void ApplicationNameChanged (object sender, EventArgs e)
+		{
+			UpdateApplicationNamePlaceholderText ();
+		}
+
+		public override void DidChangeBackingProperties ()
+		{
+			base.DidChangeBackingProperties ();
+			ReconstructString ();
+			RepositionContents ();
+		}
+
+		void LoadStyles (object sender = null, EventArgs args = null)
+		{
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) {
+				Appearance = NSAppearance.GetAppearance (NSAppearance.NameVibrantDark);
+			} else {
+				Appearance = NSAppearance.GetAppearance (NSAppearance.NameAqua);
+			}
+
+			UpdateApplicationNamePlaceholderText ();
+			textColor = ColorForType (messageType);
+			ReconstructString ();
 		}
 
 		protected override void Dispose (bool disposing)
 		{
 			TaskService.Errors.TasksAdded -= updateHandler;
 			TaskService.Errors.TasksRemoved -= updateHandler;
+			Ide.Gui.Styles.Changed -= LoadStyles;
+			BrandingService.ApplicationNameChanged -= ApplicationNameChanged;
 			base.Dispose (disposing);
 		}
 
-		NSTrackingArea textFieldArea;
-		void ReconstructString (bool updateTrackingAreas)
+		public override void DrawRect (CGRect dirtyRect)
+		{
+			base.DrawRect (dirtyRect);
+
+			if (statusIcons.Count == 0 || buildResults.Hidden) {
+				return;
+			}
+
+			var x = LeftMostStatusItemX ();
+			var sepRect = new CGRect (x - 6.5, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, 1, 16);
+			if (!sepRect.IntersectsWith (dirtyRect)) {
+				return;
+			}
+
+			NSColor.LightGray.SetFill ();
+			NSBezierPath.FillRect (sepRect);
+		}
+
+		public override void ViewDidMoveToWindow ()
+		{
+			base.ViewDidMoveToWindow ();
+			ReconstructString ();
+			RepositionContents ();
+		}
+
+		void ReconstructString ()
 		{
 			if (string.IsNullOrEmpty (text)) {
 				textField.AttributedStringValue = new NSAttributedString ("");
+				UpdateApplicationNamePlaceholderText ();
 				imageView.Image = ImageService.GetIcon (Stock.StatusSteady).ToNSImage ();
 			} else {
 				textField.AttributedStringValue = GetStatusString (text, textColor);
 				imageView.Image = image;
 			}
-
-			var width = textField.AttributedStringValue.BoundingRectWithSize (new CGSize (nfloat.MaxValue, textField.Frame.Height),
-				NSStringDrawingOptions.UsesFontLeading | NSStringDrawingOptions.UsesLineFragmentOrigin).Width;
-
-			if (!updateTrackingAreas)
-				return;
-			
-			if (textFieldArea != null) {
-				RemoveTrackingArea (textFieldArea);
-				DestroyPopover ();
-			}
-
-			if (width > textField.Frame.Width) {
-				textFieldArea = new NSTrackingArea (textField.Frame, NSTrackingAreaOptions.MouseEnteredAndExited | NSTrackingAreaOptions.ActiveInKeyWindow, this, null);
-				AddTrackingArea (textFieldArea);
-			} else
-				textFieldArea = null;
 		}
 
-		CALayer ProgressLayer {
-			get { return Layer.Sublayers.FirstOrDefault (l => l.Name == ProgressLayerId); }
-		}
+		readonly List<StatusIcon> statusIcons = new List<StatusIcon> ();
 
-		readonly Dictionary<string, StatusIcon> layerToStatus = new Dictionary<string, StatusIcon> ();
-		internal void RemoveStatusLayer (CALayer statusLayer)
+		internal void RemoveStatusIcon (StatusIcon icon)
 		{
-			RemoveTrackingArea (layerToStatus [statusLayer.Name].TrackingArea);
-			layerToStatus.Remove (statusLayer.Name);
-			RepositionStatusLayers ();
+			statusIcons.Remove (icon);
+
+			icon.Entered -= ShowPopoverForIcon;
+			icon.Exited -= DestroyPopover;
+			icon.Clicked -= DestroyPopover;
+
+			RepositionStatusIcons ();
 		}
 
 		nfloat LeftMostStatusItemX ()
 		{
-			if (Layer.Sublayers == null)
-				return Layer.Frame.Width;
-
-			var left = Layer.Sublayers.Min<CALayer, nfloat> (layer => {
-				if (layer.Name == null)
-					return nfloat.PositiveInfinity;
+			if (statusIcons.Count == 0) {
+				return Frame.Width;
+			}
 
-				if (layer.Name.StartsWith (StatusIconPrefixId, StringComparison.Ordinal))
-					return layer.Frame.Left;
-				return nfloat.PositiveInfinity;
-			});
-			return left == nfloat.PositiveInfinity ? Layer.Frame.Width : left;
+			return statusIcons.Last ().Frame.X;
 		}
 
 		nfloat DrawSeparatorIfNeeded (nfloat right)
 		{
-			CALayer layer = Layer.Sublayers.FirstOrDefault (l => l.Name == SeparatorLayerId);
-			if (layerToStatus.Count == 0) {
-				if (layer != null)
-					layer.RemoveFromSuperLayer ();
+			NeedsDisplay = true;
+
+			if (statusIcons.Count == 0) {
 				return right;
 			}
 
-			right -= 9;
-			if (layer != null) {
-				layer.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, 1, 16);
-				layer.SetNeedsDisplay ();
-			} else {
-				layer = CALayer.Create ();
-				layer.Name = SeparatorLayerId;
-				layer.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, 1, 16);
-				layer.BackgroundColor = NSColor.LightGray.CGColor;
-				Layer.AddSublayer (layer);
-			}
-			return right - 3;
+			return right - 12;
 		}
 
-		bool buildResultVisible;
-		readonly CATextLayer buildResultText = new CATextLayer {
-			Name = BuildTextLayerId,
-		};
 		IconId buildImageId;
-		readonly CALayer buildResultIcon = new CALayer {
-			Name = BuildIconLayerId,
-		};
-		nfloat DrawBuildResults ()
-		{
-			if (!buildResultVisible) {
-				if (Layer.Sublayers != null) {
-					CALayer layer;
-					layer = Layer.Sublayers.FirstOrDefault (l => l.Name != null && l.Name.StartsWith (BuildIconLayerId, StringComparison.Ordinal));
-					if (layer != null)
-						layer.RemoveFromSuperLayer ();
-
-					layer = Layer.Sublayers.FirstOrDefault (l => l.Name != null && l.Name.StartsWith (BuildTextLayerId, StringComparison.Ordinal));
-					if (layer != null)
-						layer.RemoveFromSuperLayer ();
-
-					layer = Layer.Sublayers.FirstOrDefault (l => l.Name != null && l.Name.StartsWith (SeparatorLayerId, StringComparison.Ordinal));
-					if (layer != null)
-						layer.RemoveFromSuperLayer ();
-				}
-				return nfloat.PositiveInfinity;
-			}
-
-			nfloat right = DrawSeparatorIfNeeded (LeftMostStatusItemX ());
-			CGSize size = buildResultText.AttributedString.Size;
-			right = right - 6 - size.Width;
-			buildResultText.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 6 : 5, size.Width, size.Height);
-			if (buildResultText.SuperLayer == null)
-				Layer.AddSublayer (buildResultText);
-			buildResultText.SetNeedsDisplay ();
-			right -= buildResultIcon.Bounds.Width;
-			buildResultIcon.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, buildResultIcon.Bounds.Width, buildResultIcon.Bounds.Height);
-			if (buildResultIcon.SuperLayer == null)
-				Layer.AddSublayer (buildResultIcon);
 
-			return right;
+		void PositionBuildResults (nfloat right)
+		{
+			right = DrawSeparatorIfNeeded (right);
+			right -= buildResults.Frame.Width;
+			buildResults.SetFrameOrigin (new CGPoint (right, buildResults.Frame.Y));
 		}
 
-		internal void RepositionStatusLayers ()
+		internal void RepositionStatusIcons ()
 		{
-			nfloat right = Layer.Frame.Width;
-			CATransaction.DisableActions = true;
-			foreach (var item in Layer.Sublayers) {
-				if (item.Name != null && item.Name.StartsWith (StatusIconPrefixId, StringComparison.Ordinal)) {
-					var icon = layerToStatus [item.Name];
-					if (icon.TrackingArea != null)
-						RemoveTrackingArea (icon.TrackingArea);
+			nfloat right = Frame.Width - 6;
 
-					right -= item.Bounds.Width + 6;
-					item.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, item.Bounds.Width, item.Bounds.Height);
+			foreach (var item in statusIcons) {
+				right -= item.Bounds.Width + 1;
+				item.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, item.Bounds.Width, item.Bounds.Height);
+			}
 
-					var area = new NSTrackingArea (item.Frame, NSTrackingAreaOptions.MouseEnteredAndExited | NSTrackingAreaOptions.ActiveInKeyWindow, this, null);
-					AddTrackingArea (area);
+			PositionBuildResults (right);
 
-					icon.TrackingArea = area;
-				}
-			}
+			right -= 2;
 
-			nfloat buildResultPosition = DrawBuildResults ();
-			CATransaction.DisableActions = false;
-			if (buildResultPosition < right) { // We have a build result layer.
-				textField.SetFrameSize (new CGSize (buildResultPosition - 6 - textField.Frame.Left, Frame.Height));
+			if (!buildResults.Hidden) { // We have a build result layer.
+				textField.SetFrameSize (new CGSize (buildResults.Frame.X - 3 - textField.Frame.Left, Frame.Height));
 			} else
-				textField.SetFrameSize (new CGSize (right - 6 - textField.Frame.Left, Frame.Height));
+				textField.SetFrameSize (new CGSize (right - 3 - textField.Frame.Left, Frame.Height));
 		}
 
-		long statusCounter;
 		public StatusBarIcon ShowStatusIcon (Xwt.Drawing.Image pixbuf)
 		{
-			var layer = CALayer.Create ();
-			layer.Name = StatusIconPrefixId + (++statusCounter);
-			layer.Bounds = new CGRect (0, 0, (nfloat)pixbuf.Width, (nfloat)pixbuf.Height);
-			var statusIcon = new StatusIcon (this, layer, null) {
+			var statusIcon = new StatusIcon (this) {
 				Image = pixbuf,
 			};
-			layerToStatus [layer.Name] = statusIcon;
+			statusIcons.Add (statusIcon);
+
+			statusIcon.Entered += ShowPopoverForIcon;
+			statusIcon.Exited += DestroyPopover;
 
-			Layer.AddSublayer (layer);
+			// We need to destroy the popover otherwise the window doesn't come up correctly
+			statusIcon.Clicked += DestroyPopover;
 
-			RepositionStatusLayers ();
+			AddSubview (statusIcon);
+			RepositionStatusIcons ();
 
 			return statusIcon;
 		}
@@ -409,7 +610,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 		public void ShowReady ()
 		{
-			ShowMessage (null, "", false, NSColor.DisabledControlText);
+			ShowMessage (null, "", false, MessageType.Ready);
 		}
 
 		static Pad sourcePad;
@@ -420,45 +621,46 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 		public void ShowError (string error)
 		{
-			ShowMessage (Stock.StatusError, error, false, NSColor.FromDeviceRgba (228f / 255, 84f / 255, 55f / 255, 1));
+			ShowMessage (Stock.StatusError, error, false, MessageType.Error);
+
 		}
 
 		public void ShowWarning (string warning)
 		{
-			ShowMessage (Stock.StatusWarning, warning, false, NSColor.FromDeviceRgba (235f / 255, 161f / 255, 7f / 255, 1));
+			ShowMessage (Stock.StatusWarning, warning, false, MessageType.Warning);
 		}
 
 		public void ShowMessage (string message)
 		{
-			ShowMessage (null, message, false, NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1));
+			ShowMessage (null, message, false, MessageType.Information);
 		}
 
 		public void ShowMessage (string message, bool isMarkup)
 		{
-			ShowMessage (null, message, true, NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1));
+			ShowMessage (null, message, true, MessageType.Information);
 		}
 
 		public void ShowMessage (IconId image, string message)
 		{
-			ShowMessage (image, message, false, NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1));
+			ShowMessage (image, message, false, MessageType.Information);
 		}
 
 		public void ShowMessage (IconId image, string message, bool isMarkup)
 		{
-			ShowMessage (image, message, isMarkup, NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1));
+			ShowMessage (image, message, isMarkup, MessageType.Information);
 		}
 
-		public void ShowMessage (IconId image, string message, bool isMarkup, NSColor color)
+		public void ShowMessage (IconId image, string message, bool isMarkup, MessageType statusType)
 		{
-			DispatchService.AssertGuiThread ();
+			Runtime.AssertMainThread ();
 
-			bool changed = LoadText (message, isMarkup, color);
+			bool changed = LoadText (message, isMarkup, statusType);
 			LoadPixbuf (image);
 			if (changed)
-				ReconstructString (updateTrackingAreas: true);
+				ReconstructString ();
 		}
 
-		bool LoadText (string message, bool isMarkup, NSColor color)
+		bool LoadText (string message, bool isMarkup, MessageType statusType)
 		{
 			message = message ?? "";
 			message = message.Replace (Environment.NewLine, " ").Replace ("\n", " ").Trim ();
@@ -468,11 +670,26 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 			text = message;
 			currentTextIsMarkup = isMarkup;
-			textColor = color;
+			messageType = statusType;
+			textColor = ColorForType (statusType);
 
 			return true;
 		}
 
+		NSColor ColorForType (MessageType messageType)
+		{
+			switch (messageType) {
+				case MessageType.Error:
+					return Styles.StatusErrorTextColor.ToNSColor ();
+				case MessageType.Warning:
+					return Styles.StatusWarningTextColor.ToNSColor ();
+				case MessageType.Ready:
+					return Styles.StatusReadyTextColor.ToNSColor ();
+				default:
+					return Styles.BaseForegroundColor.ToNSColor ();
+			}
+		}
+
 		static bool iconLoaded;
 		void LoadPixbuf (IconId iconId)
 		{
@@ -499,7 +716,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 				image = iconAnimation.FirstFrame.ToNSImage ();
 				xwtAnimation = iconAnimation.StartAnimation (p => {
 					image = p.ToNSImage ();
-					ReconstructString (updateTrackingAreas: false);
+					ReconstructString ();
 				});
 			} else {
 				image = ImageService.GetIcon (iconId).ToNSImage ();
@@ -510,48 +727,29 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 		public void BeginProgress (string name)
 		{
-			EndProgress ();
-			ShowMessage (name);
-			oldFraction = 0;
-
-			if (AutoPulse)
-				StartProgressAutoPulse ();
+			BeginProgress (null, name);
 		}
 
 		public void BeginProgress (IconId image, string name)
 		{
 			EndProgress ();
 			ShowMessage (image, name);
-			oldFraction = 0;
 
 			if (AutoPulse)
-				StartProgressAutoPulse ();
+				progressView.StartProgressAutoPulse ();
+			else
+				progressView.BeginProgress ();
 		}
 
-		bool inProgress;
-		double oldFraction;
+
 		public void SetProgressFraction (double work)
 		{
-			if (AutoPulse)
-				return;
-
-			progressMarks.Push (work);
-			if (!inProgress) {
-				inProgress = true;
-				StartProgress (progressMarks.Peek ());
-			}
+			progressView.SetProgressFraction (work);
 		}
 
 		public void EndProgress ()
 		{
-			progressMarks.Clear ();
-			if (ProgressLayer != null) {
-				ProgressLayer.RemoveAnimation (growthAnimationKey);
-				if (inProgress == false)
-					ProgressLayer.RemoveFromSuperLayer ();
-			}
-			inProgress = false;
-			AutoPulse = false;
+			progressView.EndProgress ();
 		}
 
 		public void Pulse ()
@@ -570,117 +768,6 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			set;
 		}
 
-		static CGColor xamBlue = new CGColor (52f / 255, 152f / 255, 219f / 255);
-		static nfloat verticalOffset = MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 2 : 0;
-		CALayer CreateProgressBarLayer (double width)
-		{
-			CALayer progress = ProgressLayer;
-			if (progress == null) {
-				progress = CALayer.Create ();
-				progress.Name = ProgressLayerId;
-				progress.BackgroundColor = xamBlue;
-				progress.BorderColor = xamBlue;
-				progress.FillMode = CAFillMode.Forwards;
-				progress.Frame = new CGRect (0, Frame.Height - barHeight - verticalOffset, (nfloat)width, barHeight);
-			}
-			return progress;
-		}
-
-		CAAnimation CreateMoveAndGrowAnimation (CALayer progress, double growToFraction)
-		{
-			CAAnimationGroup grp = CAAnimationGroup.CreateAnimation ();
-			grp.Duration = 0.2;
-			grp.FillMode = CAFillMode.Forwards;
-			grp.RemovedOnCompletion = false;
-
-			CABasicAnimation move = CABasicAnimation.FromKeyPath ("position.x");
-			double oldOffset = (progress.Frame.Width / 2) * oldFraction;
-			double newOffset = (progress.Frame.Width / 2) * growToFraction;
-			move.From = NSNumber.FromDouble (oldOffset);
-			move.To = NSNumber.FromDouble (newOffset);
-
-			CABasicAnimation grow = CABasicAnimation.FromKeyPath ("bounds");
-			grow.From = NSValue.FromCGRect (new CGRect (0, 0, progress.Frame.Width * (nfloat)oldFraction, barHeight));
-			grow.To = NSValue.FromCGRect (new CGRect (0, 0, progress.Frame.Width * (nfloat)growToFraction, barHeight));
-			grp.Animations = new [] {
-				move,
-				grow,
-			};
-			return grp;
-		}
-
-		CAAnimation CreateAutoPulseAnimation ()
-		{
-			CABasicAnimation move = CABasicAnimation.FromKeyPath ("position.x");
-			move.From = NSNumber.FromDouble (-frameAutoPulseWidth);
-			move.To = NSNumber.FromDouble (Layer.Frame.Width + frameAutoPulseWidth);
-			move.RepeatCount = float.PositiveInfinity;
-			move.RemovedOnCompletion = false;
-			move.Duration = 4;
-			return move;
-		}
-
-		void AttachFadeoutAnimation (CALayer progress, CAAnimation animation, Func<bool> fadeoutVerifier)
-		{
-			animation.AnimationStopped += (sender, e) => {
-				if (!fadeoutVerifier ())
-					return;
-
-				CABasicAnimation fadeout = CABasicAnimation.FromKeyPath ("opacity");
-				fadeout.From = NSNumber.FromDouble (1);
-				fadeout.To = NSNumber.FromDouble (0);
-				fadeout.Duration = 0.5;
-				fadeout.FillMode = CAFillMode.Forwards;
-				fadeout.RemovedOnCompletion = false;
-				fadeout.AnimationStopped += (sender2, e2) => {
-					if (!e2.Finished)
-						return;
-
-					inProgress = false;
-					progress.Opacity = 0;
-					progress.RemoveAllAnimations ();
-					progress.RemoveFromSuperLayer ();
-				};
-				progress.Name = ProgressLayerFadingId;
-				progress.AddAnimation (fadeout, "opacity");
-			};
-			progress.AddAnimation (animation, growthAnimationKey);
-			var oldLayer = ProgressLayer;
-			if (oldLayer == null)
-				Layer.AddSublayer (progress);
-
-			UpdateLayer ();
-		}
-
-		const int barHeight = 2;
-		void StartProgress (double newFraction)
-		{
-			progressMarks.Clear ();
-			var progress = CreateProgressBarLayer (Layer.Frame.Width);
-			var grp = CreateMoveAndGrowAnimation (progress, newFraction);
-			oldFraction = newFraction;
-
-			AttachFadeoutAnimation (progress, grp, () => {
-				if (oldFraction < 1 && inProgress) {
-					if (progressMarks.Count != 0) {
-						StartProgress (progressMarks.Peek ());
-					} else {
-						inProgress = false;
-					}
-					return false;
-				}
-				return true;
-			});
-		}
-
-		const double frameAutoPulseWidth = 100;
-		void StartProgressAutoPulse ()
-		{
-			var progress = CreateProgressBarLayer (frameAutoPulseWidth);
-			var move = CreateAutoPulseAnimation ();
-			AttachFadeoutAnimation (progress, move, () => true);
-		}
-
 		static NSAttributedString GetPopoverString (string text)
 		{
 			return new NSAttributedString (text, new NSStringAttributes {
@@ -715,9 +802,9 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			((NSTextField)popover.ContentViewController.View).AttributedStringValue = attrString;
 		}
 
-		bool CreatePopoverForLayer (CALayer layer)
+		bool CreatePopoverForIcon (StatusBarIcon icon)
 		{
-			string tooltip = layerToStatus [layer.Name].ToolTip;
+			string tooltip = icon.ToolTip;
 			if (tooltip == null)
 				return false;
 
@@ -730,18 +817,17 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			CreatePopoverCommon (Frame.Width, textField.AttributedStringValue.Value);
 		}
 
-		void ShowPopoverForLayer (CALayer layer)
+		void ShowPopoverForIcon (object sender, EventArgs args)
 		{
 			if (popover != null)
 				return;
 
-			if (!layerToStatus.ContainsKey (layer.Name))
-				return;
+			var icon = (StatusIcon) sender;
 
-			if (!CreatePopoverForLayer (layer))
+			if (!CreatePopoverForIcon (icon))
 				return;
 
-			popover.Show (layer.Frame, this, NSRectEdge.MinYEdge);
+			popover.Show (icon.Frame, this, NSRectEdge.MinYEdge);
 		}
 
 		void ShowPopoverForStatusBar ()
@@ -753,59 +839,46 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			popover.Show (textField.Frame, this, NSRectEdge.MinYEdge);
 		}
 
-		void DestroyPopover ()
+		void DestroyPopover (object sender, EventArgs args)
 		{
-			oldLayer = null;
 			if (popover != null)
 				popover.Close ();
 			popover = null;
 		}
-
-		bool InTextField (CGPoint location)
-		{
-			return textField.IsMouseInRect (location, textField.Frame);
-		}
-
-		CALayer LayerForPoint (CGPoint location)
-		{
-			CALayer layer = Layer.PresentationLayer.HitTest (location);
-			return layer != null ? layer.ModelLayer : null;
-		}
-
-		string oldLayer;
+			
 		public override void MouseEntered (NSEvent theEvent)
 		{
 			base.MouseEntered (theEvent);
 
-			CGPoint location = ConvertPointFromView (theEvent.LocationInWindow, null);
-
-			if (InTextField (location)) {
+			var width = textField.AttributedStringValue.BoundingRectWithSize (new CGSize (nfloat.MaxValue, textField.Frame.Height),
+				NSStringDrawingOptions.UsesFontLeading | NSStringDrawingOptions.UsesLineFragmentOrigin).Width;
+			if (width > textField.Frame.Width) {
 				ShowPopoverForStatusBar ();
-				return;
-			}
-
-			var layer = LayerForPoint (location);
-			if (layer == null)
-				return;
-
-			if (layer.Name == oldLayer) {
-				StatusIcon icon;
-				if (!layerToStatus.TryGetValue (layer.Name, out icon))
-					return;
-
-				if (string.IsNullOrEmpty (icon.ToolTip))
-					return;
 			}
-
-			oldLayer = layer.Name;
-			ShowPopoverForLayer (layer);
 		}
 
 		public override void MouseExited (NSEvent theEvent)
 		{
 			base.MouseExited (theEvent);
+			DestroyPopover (null, null);
+		}
+
+		internal static Xwt.PointerButton NSEventButtonToXwt (NSEvent theEvent)
+		{
+			Xwt.PointerButton button = Xwt.PointerButton.Left;
+			switch ((NSEventType)(long)theEvent.ButtonNumber) {
+			case NSEventType.LeftMouseDown:
+				button = Xwt.PointerButton.Left;
+				break;
+			case NSEventType.RightMouseDown:
+				button = Xwt.PointerButton.Right;
+				break;
+			case NSEventType.OtherMouseDown:
+				button = Xwt.PointerButton.Middle;
+				break;
+			}
 
-			DestroyPopover ();
+			return button;
 		}
 
 		public override void MouseDown (NSEvent theEvent)
@@ -813,41 +886,35 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			base.MouseDown (theEvent);
 
 			CGPoint location = ConvertPointFromView (theEvent.LocationInWindow, null);
-			var layer = LayerForPoint (location);
-			if (layer != null && layer.Name != null) {
-				Xwt.PointerButton button = Xwt.PointerButton.Left;
-				switch ((NSEventType)(long)theEvent.ButtonNumber) {
-				case NSEventType.LeftMouseDown:
-					button = Xwt.PointerButton.Left;
-					break;
-				case NSEventType.RightMouseDown:
-					button = Xwt.PointerButton.Right;
-					break;
-				case NSEventType.OtherMouseDown:
-					button = Xwt.PointerButton.Middle;
-					break;
-				}
-
-				if (layerToStatus.ContainsKey (layer.Name)) {
-					DestroyPopover ();
-					layerToStatus [layer.Name].NotifyClicked (button);
-					return;
-				}
-
-				if (layer.Name == BuildIconLayerId || layer.Name == BuildTextLayerId) { // We clicked error icon.
-					IdeApp.Workbench.GetPad<MonoDevelop.Ide.Gui.Pads.ErrorListPad> ().BringToFront ();
-					return;
-				}
+			if (textField.IsMouseInRect (location, textField.Frame) && sourcePad != null) {
+				sourcePad.BringToFront (true);
 			}
+		}
 
-			if (sourcePad != null)
-				sourcePad.BringToFront (true);
+		public override CGRect Frame {
+			get {
+				return base.Frame;
+			}
+			set {
+				base.Frame = value;
+				RepositionContents ();
+			}
 		}
 
-		public override void ViewDidEndLiveResize ()
+		void RepositionContents ()
 		{
-			base.ViewDidEndLiveResize ();
-			RepositionStatusLayers ();
+			nfloat yOffset = 0f;
+			if (Window != null && Window.Screen != null && Window.Screen.BackingScaleFactor == 2) {
+				yOffset = 0.5f;
+			}
+
+			imageView.Frame = new CGRect (6, 0, 16, Frame.Height);
+			textField.Frame = new CGRect (imageView.Frame.Right, yOffset, Frame.Width - 16, Frame.Height);
+
+			buildResults.Frame = new CGRect (buildResults.Frame.X, buildResults.Frame.Y, buildResults.Frame.Width, Frame.Height);
+			RepositionStatusIcons ();
+
+			progressView.Frame = new CGRect (0.5f, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 1f : 2f, Frame.Width - 2, Frame.Height - 2);
 		}
 	}
 }
diff --git a/main/src/addins/MacPlatform/MainToolbar/Styles.cs b/main/src/addins/MacPlatform/MainToolbar/Styles.cs
new file mode 100644
index 0000000000..0c4878aac4
--- /dev/null
+++ b/main/src/addins/MacPlatform/MainToolbar/Styles.cs
@@ -0,0 +1,79 @@
+//
+// Styles.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Ide;
+using Xwt.Drawing;
+
+namespace MonoDevelop.MacIntegration.MainToolbar
+{
+	public static class Styles
+	{
+		public static Color BaseBackgroundColor { get; private set; }
+		public static Color BaseForegroundColor { get; private set; }
+		public static Color DisabledForegroundColor { get; private set; }
+
+		public static Color StatusErrorTextColor { get; private set; }
+		public static Color StatusWarningTextColor { get; private set; }
+		public static Color StatusReadyTextColor { get; private set; }
+
+		// Dark workaround colors
+		public static Color DarkBorderColor { get; private set; }
+		public static Color DarkBorderBrokenColor { get; private set; }
+
+		static Styles ()
+		{
+			LoadStyles ();
+			Ide.Gui.Styles.Changed +=  (o, e) => LoadStyles ();
+		}
+
+		public static void LoadStyles ()
+		{
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) {
+				BaseBackgroundColor = Ide.Gui.Styles.BaseBackgroundColor;
+				BaseForegroundColor = Ide.Gui.Styles.BaseForegroundColor;
+				DisabledForegroundColor = Xwt.Mac.Util.ToXwtColor (AppKit.NSColor.DisabledControlText); //Ide.Gui.Styles.DimTextColor;
+				StatusErrorTextColor = Color.FromName ("#fa5433");
+				StatusWarningTextColor = Color.FromName ("#e8bd0d");
+				StatusReadyTextColor = Color.FromName ("#7f7f7f");
+			} else {
+				BaseBackgroundColor = Color.FromName ("#000000");
+				BaseForegroundColor = Color.FromName ("#ffffff");
+				DisabledForegroundColor = Color.FromName ("#e1e1e1");
+				StatusErrorTextColor = Color.FromName ("#fa5433");
+				StatusWarningTextColor = Color.FromName ("#e8bd0d");
+				StatusReadyTextColor = Color.FromName ("#7f7f7f");
+
+				DarkBorderColor = Color.FromName ("#8f8f8f");
+
+				// With the NSAppearance.NameVibrantDark appearance the first time a NSButtonCell
+				// is drawn it has a filter of some sort attached so that the colours are made lighter onscreen.
+				// To get the DarkBorderColor we need to use a workaround.
+				// See comment in ColoredButtonCell.DrawBezelWithFrame (RunButton.cs)
+				DarkBorderBrokenColor = Color.FromName ("#3e3e3e");
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MacPlatform/MimeMapLoader.cs b/main/src/addins/MacPlatform/MimeMapLoader.cs
new file mode 100644
index 0000000000..2ffb9b5c40
--- /dev/null
+++ b/main/src/addins/MacPlatform/MimeMapLoader.cs
@@ -0,0 +1,72 @@
+//
+// MimeMapLoader.cs
+//
+// Author:
+//   Geoff Norton  <gnorton@novell.com>
+//   Michael Hutchinson <m.j.hutchinson@gmail.com
+//   Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (C) 2007-2011 Novell, Inc (http://www.novell.com)
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace MonoDevelop.MacIntegration
+{
+	class MimeMapLoader
+	{
+		static char [] splitChars = new char [] { ' ' };
+		Dictionary<string, string> map;
+
+		public MimeMapLoader (Dictionary<string, string> map)
+		{
+			this.map = map;
+		}
+
+		public void LoadMimeMap (string fileName)
+		{
+			using (var file = File.OpenRead (fileName)) {
+				using (var reader = new StreamReader (file)) {
+					LoadMimeMap (reader);
+				}
+			}
+		}
+
+		public void LoadMimeMap (TextReader reader)
+		{
+			var mime = new Regex ("([a-zA-Z]+/[a-zA-z0-9+-_.]+)\t+([a-zA-Z0-9 ]+)", RegexOptions.Compiled);
+			string line;
+			while ((line = reader.ReadLine ()) != null) {
+				Match m = mime.Match (line);
+				if (m.Success) {
+					string extensions = m.Groups [2].Captures [0].Value;
+					foreach (string extension in extensions.Split (splitChars, StringSplitOptions.RemoveEmptyEntries)) {
+						map ["." + extension] = m.Groups [1].Captures [0].Value;
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MacPlatform/ScreenMonitor.cs b/main/src/addins/MacPlatform/ScreenMonitor.cs
new file mode 100644
index 0000000000..ce0361ce90
--- /dev/null
+++ b/main/src/addins/MacPlatform/ScreenMonitor.cs
@@ -0,0 +1,101 @@
+//
+// ScreenMonitor.cs
+//
+// Author:
+//       iain <iain@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin, Inc
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+
+using AppKit;
+using CoreGraphics;
+using Foundation;
+
+namespace MonoDevelop.MacIntegration
+{
+	public static class ScreenMonitor
+	{
+		// Maps NSScreens to the coordinates they have in GdkScreen space.
+		//
+		// [ Monitor1: 1024x800 ] [ Laptop: 2046x1600 ] | [ Monitor2: 1024x800]
+		//
+		// In Cocoa the main screen is 0,0 and all other screens are given coordinates relative
+		// to that screen, so in this example Laptop would be the main screen and the screenspace coordinates are
+		// relative to it.
+		// Monitor1: -1024, 0
+		// Laptop: 0, 0
+		// Monitor2: 2046, 0
+		//
+		// But GdkScreen is different, it creates a giant rectangle encompassing all the screens
+		// and coordinates in that screenspace are relative to the top left corner
+		// Monitor1: 0, 0
+		// Laptop: 1024, 0
+		// Monitor2: 3070, 0
+		//
+		static Dictionary<NSScreen, CGPoint> screenToGdk = null;
+
+		static ScreenMonitor ()
+		{
+			screenToGdk = UpdateScreenLayout ();
+			NSNotificationCenter.DefaultCenter.AddObserver (NSApplication.DidChangeScreenParametersNotification, (obj) => {
+				screenToGdk = UpdateScreenLayout ();
+			});
+		}
+
+		public static CGPoint GdkPointForNSScreen (NSScreen screen)
+		{
+			return screenToGdk [screen];
+		}
+
+		static Dictionary<NSScreen, CGPoint> UpdateScreenLayout ()
+		{
+			var screenMap = new Dictionary<NSScreen, CGPoint> ();
+
+			var screens = NSScreen.Screens;
+			if (screens == null) {
+				return screenMap;
+			}
+
+			nfloat lowestLeft = 0.0f, highestBottom = 0.0f;
+			foreach (var screen in screens) {
+				if (screen.Frame.Left < lowestLeft) {
+					lowestLeft = screen.Frame.Left;
+				}
+
+				if (screen.Frame.Bottom > highestBottom) {
+					highestBottom = screen.Frame.Bottom;
+				}
+			}
+
+			// Now we know that the GdkScreen origin is lowestLeft,highestBottom in NSScreen space
+			screens = NSScreen.Screens;
+			foreach (var screen in screens) {
+				var gdkOrigin = new CGPoint (screen.Frame.Left - lowestLeft, highestBottom - screen.Frame.Bottom);
+
+				screenMap [screen] = gdkOrigin;
+			}
+
+			return screenMap;
+		}
+	}
+}
+
diff --git a/main/src/addins/MacPlatform/icons/build.png b/main/src/addins/MacPlatform/icons/build.png
index 60db083214..ac14af146a 100644
--- a/main/src/addins/MacPlatform/icons/build.png
+++ b/main/src/addins/MacPlatform/icons/build.png
diff --git a/main/src/addins/MacPlatform/icons/build@2x.png b/main/src/addins/MacPlatform/icons/build@2x.png
index 7dfb19221b..3508ce49e3 100644
--- a/main/src/addins/MacPlatform/icons/build@2x.png
+++ b/main/src/addins/MacPlatform/icons/build@2x.png
diff --git a/main/src/addins/MacPlatform/icons/build~dark.png b/main/src/addins/MacPlatform/icons/build~dark.png
new file mode 100644
index 0000000000..1da2895e09
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/build~dark.png
diff --git a/main/src/addins/MacPlatform/icons/build~dark@2x.png b/main/src/addins/MacPlatform/icons/build~dark@2x.png
new file mode 100644
index 0000000000..e0f1da6ecf
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/build~dark@2x.png
diff --git a/main/src/addins/MacPlatform/icons/continue.png b/main/src/addins/MacPlatform/icons/continue.png
index 9d8db8c1cb..ce03a6208b 100644
--- a/main/src/addins/MacPlatform/icons/continue.png
+++ b/main/src/addins/MacPlatform/icons/continue.png
diff --git a/main/src/addins/MacPlatform/icons/continue@2x.png b/main/src/addins/MacPlatform/icons/continue@2x.png
index 1a74564c7d..2f2e41cfc5 100644
--- a/main/src/addins/MacPlatform/icons/continue@2x.png
+++ b/main/src/addins/MacPlatform/icons/continue@2x.png
diff --git a/main/src/addins/MacPlatform/icons/continue~dark.png b/main/src/addins/MacPlatform/icons/continue~dark.png
new file mode 100644
index 0000000000..42f0572c2a
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/continue~dark.png
diff --git a/main/src/addins/MacPlatform/icons/continue~dark@2x.png b/main/src/addins/MacPlatform/icons/continue~dark@2x.png
new file mode 100644
index 0000000000..f4537f3453
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/continue~dark@2x.png
diff --git a/main/src/addins/MacPlatform/icons/device.png b/main/src/addins/MacPlatform/icons/device.png
index 51690547be..f31a0b3395 100644
--- a/main/src/addins/MacPlatform/icons/device.png
+++ b/main/src/addins/MacPlatform/icons/device.png
diff --git a/main/src/addins/MacPlatform/icons/device@2x.png b/main/src/addins/MacPlatform/icons/device@2x.png
index a045e0817c..a1996aae86 100644
--- a/main/src/addins/MacPlatform/icons/device@2x.png
+++ b/main/src/addins/MacPlatform/icons/device@2x.png
diff --git a/main/src/addins/MacPlatform/icons/device~dark.png b/main/src/addins/MacPlatform/icons/device~dark.png
new file mode 100644
index 0000000000..659a8524ed
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/device~dark.png
diff --git a/main/src/addins/MacPlatform/icons/device~dark@2x.png b/main/src/addins/MacPlatform/icons/device~dark@2x.png
new file mode 100644
index 0000000000..2c116ae133
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/device~dark@2x.png
diff --git a/main/src/addins/MacPlatform/icons/project.png b/main/src/addins/MacPlatform/icons/project.png
index f25fdbfb2e..8bcf80e198 100644
--- a/main/src/addins/MacPlatform/icons/project.png
+++ b/main/src/addins/MacPlatform/icons/project.png
diff --git a/main/src/addins/MacPlatform/icons/project@2x.png b/main/src/addins/MacPlatform/icons/project@2x.png
index e5e08d504f..c105ae6dad 100644
--- a/main/src/addins/MacPlatform/icons/project@2x.png
+++ b/main/src/addins/MacPlatform/icons/project@2x.png
diff --git a/main/src/addins/MacPlatform/icons/project~dark.png b/main/src/addins/MacPlatform/icons/project~dark.png
new file mode 100644
index 0000000000..b7e415813e
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/project~dark.png
diff --git a/main/src/addins/MacPlatform/icons/project~dark@2x.png b/main/src/addins/MacPlatform/icons/project~dark@2x.png
new file mode 100644
index 0000000000..4ff49d2d73
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/project~dark@2x.png
diff --git a/main/src/addins/MacPlatform/icons/stop.png b/main/src/addins/MacPlatform/icons/stop.png
index 62501d3cab..6af6b394c7 100644
--- a/main/src/addins/MacPlatform/icons/stop.png
+++ b/main/src/addins/MacPlatform/icons/stop.png
diff --git a/main/src/addins/MacPlatform/icons/stop@2x.png b/main/src/addins/MacPlatform/icons/stop@2x.png
index 3870bc446d..a7d453d517 100644
--- a/main/src/addins/MacPlatform/icons/stop@2x.png
+++ b/main/src/addins/MacPlatform/icons/stop@2x.png
diff --git a/main/src/addins/MacPlatform/icons/stop~dark.png b/main/src/addins/MacPlatform/icons/stop~dark.png
new file mode 100644
index 0000000000..c93648fc0a
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/stop~dark.png
diff --git a/main/src/addins/MacPlatform/icons/stop~dark@2x.png b/main/src/addins/MacPlatform/icons/stop~dark@2x.png
new file mode 100644
index 0000000000..e6c46dad8c
--- /dev/null
+++ b/main/src/addins/MacPlatform/icons/stop~dark@2x.png
diff --git a/main/src/addins/MacPlatform/maintoolbarbg~dark.png b/main/src/addins/MacPlatform/maintoolbarbg~dark.png
new file mode 100644
index 0000000000..3baa390e31
--- /dev/null
+++ b/main/src/addins/MacPlatform/maintoolbarbg~dark.png
diff --git a/main/src/addins/MacPlatform/maintoolbarbg~dark@2x.png b/main/src/addins/MacPlatform/maintoolbarbg~dark@2x.png
new file mode 100644
index 0000000000..edc2ef3803
--- /dev/null
+++ b/main/src/addins/MacPlatform/maintoolbarbg~dark@2x.png
diff --git a/main/src/addins/Makefile.am b/main/src/addins/Makefile.am
index 2baa722c8e..6dd237dad5 100644
--- a/main/src/addins/Makefile.am
+++ b/main/src/addins/Makefile.am
@@ -17,14 +17,14 @@ SUBDIRS = \
 	AspNet \

 	CSharpBinding \

 	ILAsmBinding \

-	NUnit \

+	MonoDevelop.UnitTesting \

+	MonoDevelop.UnitTesting.NUnit \

 	MonoDeveloperExtensions \

 	VBNetBinding \

 	MonoDevelop.GtkCore \

 	ChangeLogAddIn \

 	MonoDevelop.WebReferences \

 	MonoDevelop.RegexToolkit \

-	CBinding \

 	MonoDevelop.AssemblyBrowser \

 	MonoDevelop.Debugger.Soft \

 	WindowsPlatform \

diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/ChangeLog b/main/src/addins/MonoDevelop.AssemblyBrowser/ChangeLog
deleted file mode 100644
index 54645d74a6..0000000000
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/ChangeLog
+++ /dev/null
@@ -1,1122 +0,0 @@
-2010-04-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DisplayBinding.cs: Fix bug #Bug
-	  593622 - assembly browser conflix with wine.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AssemblyBrowser.addin.xml: Bumped MD version.
-
-2010-03-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.addin.xml: Remove unrequired
-	  assembly import.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.AssemblyBrowser.csproj:
-	* MonoDevelop.AssemblyBrowser/DisplayBinding.cs:
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ErrorNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ResourceNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserView.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/BaseTypeFolderNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ResourceFolderNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ModuleReferenceNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.csproj: Don't local-copy project
-	  refs, as it duplicates assemblies and breaks running on
-	  .NET.
-
-2010-03-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs: Nicer
-	  error message and kill console spew.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs: Fixed
-	  'Bug 583515 - No code completion for set-only properties'.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs: Delegates
-	  are now formatted like c# in c# mode.
-
-2010-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.AssemblyBrowser/DocumentationPanel.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  Fixed 'Bug 583017 - Wrong font in the Assembly Browser.' /
-	  applied patch from Alexander Cherniuk <ts33kr@gmail.com>
-
-
-2010-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.addin.xml:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserView.cs: Added
-	  FindDerivedClasses command.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  Flush.
-
-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.addin.xml:
-	* MonoDevelop.AssemblyBrowser/DisplayBinding.cs: Track
-	  DisplayBinding API.
-
-2010-01-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AssemblyBrowser.csproj: Fix project reference.
-
-2010-01-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs: fixed
-	  'Bug 571177 - Assembly browser text widget issues'.
-
-2010-01-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs: fixed
-	  'Bug 571178 - Assembly browser should show protected
-	  members'.
-
-2010-01-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AssemblyBrowser.csproj:
-	* MonoDevelop.AssemblyBrowser.addin.xml: Fix the Cecil
-	  decompiler in the build. Make building MD with Makefiles
-	  work again, and puts the decompiler properly in its own dll
-	  instead of merging it into a franken-Cecil.
-
-2010-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AssemblyBrowser.csproj:
-	* MonoDevelop.AssemblyBrowser/Decompiler.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs: Now
-	  using the cecil decompiler.
-
-2010-01-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs:
-	  Implemented go to base type.
-
-2010-01-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  Reduce spacing and tweak borders.
-
-2009-12-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  Remove the cancel-search button, because it duplicates the
-	  function clear-textbox button.
-
-2009-12-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* MonoDevelop.AssemblyBrowser.csproj:
-	* MonoDevelop.AssemblyBrowser/SearchEntry.cs:
-	* MonoDevelop.AssemblyBrowser/HoverImageButton.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  Moved the SearchEntry to MonoDevelop.Components.
-
-2009-12-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  Fix layout of the navigation bar.
-
-2009-12-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.AssemblyBrowser.csproj:
-	* MonoDevelop.AssemblyBrowser/SearchEntry.cs:
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/HoverImageButton.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DocumentationPanel.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  Overworked the assembly browser GUI.
-
-2009-11-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/Decompiler.cs: Fixed 'Bug 554836
-	  - error in assembly browser while showing C# code'.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AssemblyBrowser.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.AssemblyBrowser.csproj:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  Flush.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  moved toolbar.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.csproj: Use \ instead of '/'
-	in the Import.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.csproj: Mark the Refactoring
-	project reference as Private.
-
-2009-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: set
-	  correct inspect widget.
-
-2009-10-07  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* MonoDevelop.AssemblyBrowser/DisplayBinding.cs:
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/BaseTypeFolderNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserTypeNodeBuilder.cs:
-	  Worked on memory leaks.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AssemblyBrowser.addin.xml: Bump MD version.
-
-2009-10-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserView.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: cancel
-	  search worken on destroy.
-
-2009-10-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Track
-	  API changes.
-
-2009-10-07  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/objects.xml: 
-
-	* Makefile.am:
-	* MonoDevelop.AssemblyBrowser.csproj:
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/BaseTypeFolderNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserTypeNodeBuilder.cs:
-	  Worked on assembly browser.
-
-2009-10-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AssemblyBrowser.csproj:
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DocumentationPanel.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs:
-	  Added documentation panel.
-
-2009-10-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/BaseTypeFolder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: turned
-	  off tree disposing.
-
-2009-10-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/Namespace.cs: took out type
-	  dispose.
-
-2009-10-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: took
-	  out dom dispose chain.
-
-2009-10-05  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic: 
-
-	* MonoDevelop.AssemblyBrowser/Namespace.cs:
-	* MonoDevelop.AssemblyBrowser/BaseTypeFolder.cs:
-	* MonoDevelop.AssemblyBrowser/ResourceFolder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolder.cs:
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserView.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/BaseTypeFolderNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ResourceFolderNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
-	  Added dispose chain.
-
-2009-09-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs: Renamed
-	  IDomVisitable -> INode
-
-2009-08-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.addin.xml: Don't use the text
-	  editor display binding id as reference for registering the
-	  designer view. Removed unused supportedFormats attribute.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs: fixed
-	  typo.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/Error.cs:
-	* MonoDevelop.AssemblyBrowser/Namespace.cs:
-	* MonoDevelop.AssemblyBrowser/BaseTypeFolder.cs:
-	* MonoDevelop.AssemblyBrowser/ResourceFolder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolder.cs:
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Worked
-	  on assembly browser.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Fixed
-	  compiler warnings.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.csproj: Updated dependencies. We
-	  now depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
-	  Use the new AssemblyContext class to query and resolve
-	  assemblies.
-
-2009-08-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.AssemblyBrowser.csproj:
-	* MonoDevelop.AssemblyBrowser.addin.xml:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserView.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Added
-	  find references command to the assembly browser context
-	  menu.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2009-06-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: fixed
-	  "Bug 517032 - Crash when using search in assembly browser".
-
-2009-06-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Fixed
-	  "Bug 512533 - Assembly browser sometimes crashes".
-
-2009-06-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Fixed
-	  crash case reported in "Bug 513383 - Going to declaration of
-	  extension method of System.Drawing.Bitmap crashes MD badly".
-
-2009-06-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
-	  Track assembly lookup APIs.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DisplayBinding.cs: Track API
-	  changes.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DisplayBinding.cs: Track API
-	  changes.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs:
-	  Renamed PixbufService to ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs: Track
-	  API changes.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AssemblyBrowser.addin.xml: Bump MD version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
-	  Track api changes to support multiple target runtimes.
-
-2009-03-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs: fixed
-	  some output issues in ilasm view.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.csproj: Don't local-copy project
-	  refs.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.csproj: Moved text editor to
-	  core
-
-2009-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	  Constructors are not longer filtered out.
-
-2009-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Worked
-	  on 'Bug 479976 - Links in assembly browser are only shown
-	  for intrinsic types'.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.csproj: Flush.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	  Changed override Destroy --> override OnDestroyed.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserView.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Worked
-	  on ressource de-allocation.
-
-2009-02-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: open
-	  is now done with a timeout handler.
-
-2009-02-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.AssemblyBrowser.csproj: Enable building without
-	  make. Add System.Core reference, as it's not implicit in MD
-	  builds.
-
-2009-02-20  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic: 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs:
-	  implmented forward/backward navigation. shift+click/middle
-	  click now opens a reference in a new window.
-
-2009-02-20  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic: 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs:
-	  module node now gets expanded + module "decompiliation view"
-	  now shows a list of all containing namespaces.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
-	  Track api changes.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.csproj: Remove more inadvertent
-	  local copying of references.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.mdp:
-	* MonoDevelop.AssemblyBrowser.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs: Track
-	  renamings.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.AssemblyBrowser.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2009-02-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Track
-	  TextEditorOptions API changes.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.AssemblyBrowser.mdp: Flush project format changes.
-
-2009-01-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs: Assembly
-	browser now shows custom attributes.
-
-2009-01-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Remove property
-	changed event handler on dispose.
-
-2009-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs: Show constructors
-	in type view.
-
-2009-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/Decompiler.cs:
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Worked on
-	assembly browser output now looks like syntax highlighting &
-	clickable types. (fixing Bug 456306 - "Assembly Browser: types should
-	be clickable.")
-
-2009-01-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Added loading of
-	references when clicking on types that are not loaded.
-
-2009-01-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs: Types are
-	now clickable.
-
-2009-01-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs: fixed "Bug
-	456308 - Assembly Browser: namespace browser".
-
-2009-01-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs: Added
-	link support (Loading of referenced links still missing).
-
-2009-01-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs: Track api changes.
-
-2009-01-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DisplayBinding.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserView.cs: Only "one" browser
-	now can be open.
-
-2009-01-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Added support
-	for generic help urls.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.mdp: All projects now require fx 3.5.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DisplayBinding.cs: In
-	CanCreateContentForFile, return true for assemblies.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs: renamed
-	emitmarkup.
-
-2008-11-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs: Changed postprocess
-	synopsis.
-
-2008-11-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs: Worked on
-	assembly browser.
-
-2008-11-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/Decompiler.cs:
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs: Worked on
-	assembly browser.
-
-2008-11-11  Mike Krüger  <mike@icsharpcode.net>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: removed the
-	documentation tab out of the assembly browser.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.AssemblyBrowser.addin.xml: Bump MD version.
-
-2008-10-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/Reference.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs: Worked on
-	reference loading.
-
-2008-10-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs:
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs: Worked
-	on assembly browser
-
-2008-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserView.cs:
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs:
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs: Worked on
-	assembly browser.
-
-2008-09-24  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/Decompiler.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DisplayBinding.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs: Worked
-	  on assembly browser, removed debug messages.
-
-2008-09-24  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs,
-	  gtk-gui/gui.stetic: Removed unnecessary label.
-
-2008-09-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs: fixed 'Bug
-	  412704 - Assembly browser does not escape type names, breaking
-	  markup'.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser.mdp: Updated generated code.
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Changed
-	  compilation unit/document meta information interface.
-
-2008-09-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs: some changed
-	  due dom changes.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Renamed
-	  MonoDevelopTreeView to ExtensibleTreeView.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/objects.xml,
-	  MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ModuleReferenceNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/BaseTypeFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ResourceFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ResourceNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ErrorNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs: Moved
-	  the extensible tree view to its own directory.
-
-2008-08-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Fixing
-	  compilation error.
-
-2008-07-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs: Worked on code
-	  completion/new dom.
-
-2008-07-17  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Worked on
-	  documentation view.
-
-2008-07-15  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs: some dom
-	  changes.
-
-2008-07-08  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs: API
-	  change.
-
-2008-06-06  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilCompilationUnit.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilMethod.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilParameter.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilType.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilEvent.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilReturnType.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilField.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilAttribute.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilProperty.cs,
-	  MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ModuleReferenceNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/Decompiler.cs,
-	  MonoDevelop.AssemblyBrowser/BaseTypeFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ResourceFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ResourceNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ErrorNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
-	  Refactored dom cecil layer.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.addin.xml: Bump MD version.
-
-2008-05-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilCompilationUnit.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilMethod.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilParameter.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilType.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilEvent.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilReturnType.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilField.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilAttribute.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilProperty.cs,
-	  MonoDevelop.AssemblyBrowser.mdp,
-	  MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ModuleReferenceNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/BaseTypeFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/Namespace.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ResourceFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ResourceNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ErrorNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/BaseTypeFolder.cs: Added new dom & new
-	  class browser.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.mdp: New project model changes.
-
-2008-04-08  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.addin.xml: Updated assembly browser for
-	  the managed editor.
-
-2008-03-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs: fixed warning.
-
-2008-03-02  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Workaraound a bug in
-	  mono 1.2.4 where anonymous delegates ignore usings.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: worked on search
-	  feature.
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Added progress bar
-	  for search operations.
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/Decompiler.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs: Added search in
-	  disassembler/decompiler feature (helpful for compiler writers).
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: added some gettext
-	  calls.
-
-2008-02-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilCompilationUnit.cs,
-	  MonoDevelop.AssemblyBrowser/BaseTypeFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs: Worked on
-	  assembly browser (search types & members)
-
-2008-02-24  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserView.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs: Worked on assembly
-	  browser.
-
-2008-02-24  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilMethod.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilType.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilEvent.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilField.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilProperty.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs: Worked on
-	  assembly browser.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/Decompiler.cs: Added new decompiler changes
-	  from Andrea. (most opcodes should work (however switch ... case doesn't
-	  work yet))
-
-2008-02-16  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/Decompiler.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs: Added basic c#
-	  decompiler (Very BASIC).
-
-2008-02-15  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilType.cs: Changed dom.
-
-2008-02-07  Zach Lute <zach.lute@gmail.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Fix to use a full
-	  qualifier in an anonymous delegate so things would build in Mono 1.2.4.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs: Formated the IL
-	  output a bit nicer.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilParameter.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilEvent.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilField.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilAttribute.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilProperty.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs: Fixed some compile
-	  warnings.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.mdp, Makefile.am: Added assembly browser to
-	  the build.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.mdp, Makefile.am: Added makefile.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilType.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilReturnType.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilAttribute.cs,
-	  MonoDevelop.AssemblyBrowser.mdp,
-	  MonoDevelop.AssemblyBrowser/ModuleDefinitionNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/ModuleReferenceNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs: Worked on
-	  assembly browser.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Changed pane
-	  positioning.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilType.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs: Dom output is
-	  now used for all nodes.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Changed disassembler
-	  colors & font.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs: Assembly browser can
-	  now be used to open referenced assemblies.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilMethod.cs,
-	  MonoDevelop.AssemblyBrowser.mdp,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/NamespaceBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs: Worked on
-	  assembly browser.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.AssemblyBrowser.Dom/DomCecilMethod.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilParameter.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilType.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilEvent.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilReturnType.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilField.cs,
-	  MonoDevelop.AssemblyBrowser.Dom/DomCecilProperty.cs,
-	  MonoDevelop.AssemblyBrowser/BaseTypeFolderNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs,
-	  MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomReturnTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomTypeNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs,
-	  MonoDevelop.AssemblyBrowser/BaseTypeFolder.cs: Worked on assembly
-	  browser (Now using dom output).
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	
-
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml
index b8ef864ae9..8c01141657 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.addin.xml
@@ -10,7 +10,7 @@
 	<Extension path = "/MonoDevelop/Ide/Commands">
 		<Command id = "MonoDevelop.AssemblyBrowser.ShowAssemblyBrowser"
 		         defaultHandler = "MonoDevelop.AssemblyBrowser.AssemblyBrowserHandler"
-		         _label = "_Assembly browser" />
+		         _label = "_Assembly Browser" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/DisplayBindings">
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
index b0beb0d94c..6efa20747e 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
@@ -46,7 +46,6 @@
   <ItemGroup>
     <Reference Include="Mono.Posix" />
     <Reference Include="System" />
-    <Reference Include="System.Xml" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -64,6 +63,20 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -76,11 +89,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
@@ -96,11 +104,6 @@
       <Name>ICSharpCode.Decompiler</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
@@ -169,6 +172,9 @@
     <Compile Include="XmlDocIdLib\OperatorType.cs" />
     <Compile Include="XmlDocIdLib\XmlDocIdGenerator.cs" />
     <Compile Include="AddinInfo.cs" />
+    <Compile Include="MonoDevelop.AssemblyBrowser\NRefactoryStock.cs" />
+    <Compile Include="MonoDevelop.AssemblyBrowser\HelpExtensions.cs" />
+    <Compile Include="MonoDevelop.AssemblyBrowser\AssemblyBrowserNavigationPoint.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserNavigationPoint.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserNavigationPoint.cs
new file mode 100644
index 0000000000..f62d47d205
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserNavigationPoint.cs
@@ -0,0 +1,103 @@
+//
+// AssemblyBrowserNavigationPoint.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Navigation;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.AssemblyBrowser
+{
+	class AssemblyBrowserNavigationPoint : NavigationPoint
+	{
+		List<AssemblyLoader> definitions;
+		string idString;
+
+		public AssemblyBrowserNavigationPoint (List<AssemblyLoader> definitions, string idString)
+		{
+			this.definitions = definitions;
+			this.idString = idString;
+		}
+
+		Document DoShow ()
+		{
+			Document result = null;
+			foreach (var view in Ide.IdeApp.Workbench.Documents) {
+				if (view.GetContent<AssemblyBrowserViewContent> () != null) {
+					view.Window.SelectWindow ();
+					result = view;
+					break;
+				}
+			}
+
+			if (result == null) {
+				var binding = DisplayBindingService.GetBindings<AssemblyBrowserDisplayBinding> ().FirstOrDefault ();
+				var assemblyBrowserView = binding != null ? binding.GetViewContent () : new AssemblyBrowserViewContent ();
+				assemblyBrowserView.FillWidget ();
+				result = Ide.IdeApp.Workbench.OpenDocument (assemblyBrowserView, true);
+			}
+			if (idString != null) {
+				var view = result.GetContent<AssemblyBrowserViewContent> ();
+				view.Widget.suspendNavigation = true;
+				view.EnsureDefinitionsLoaded (definitions);
+				view.Open (idString, expandNode: false);
+			}
+			return result;
+		}
+
+		public override bool Equals (object obj)
+		{
+			var other = obj as AssemblyBrowserNavigationPoint;
+			if (other == null)
+				return false;
+			return other.idString.Equals (idString);
+		}
+
+		public override int GetHashCode ()
+		{
+			return idString.GetHashCode ();
+		}
+
+		#region implemented abstract members of NavigationPoint
+
+		public override Task<Document> ShowDocument ()
+		{
+			return Task.FromResult (DoShow ());
+		}
+
+		public override string DisplayName {
+			get {
+				return GettextCatalog.GetString ("Assembly Browser");
+			}
+		}
+
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
index c6ab4132c6..8c24cc2b07 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
@@ -27,33 +27,33 @@
 //
 
 using MonoDevelop.Ide.Gui;
-using MonoDevelop.Refactoring;
 using System;
 using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Navigation;
 using MonoDevelop.Projects;
-using System.Linq;
-using MonoDevelop.Ide;
+using System.Collections.Generic;

+using System.Threading.Tasks;
 
 namespace MonoDevelop.AssemblyBrowser
 {
-	class AssemblyBrowserViewContent : AbstractViewContent, IOpenNamedElementHandler, INavigable
+	class AssemblyBrowserViewContent : ViewContent, IOpenNamedElementHandler, INavigable
 	{
 		readonly static string[] defaultAssemblies = new string[] { "mscorlib", "System", "System.Core", "System.Xml" };
 		AssemblyBrowserWidget widget;
 		
-		protected override void OnWorkbenchWindowChanged (EventArgs e)
+		protected override void OnWorkbenchWindowChanged ()
 		{
-			base.OnWorkbenchWindowChanged (e);
+			base.OnWorkbenchWindowChanged ();
 			if (WorkbenchWindow != null) {
 				var toolbar = WorkbenchWindow.GetToolbar (this);
 				widget.SetToolbar (toolbar);
 			}
 		}
 
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return widget;
 			}
@@ -72,12 +72,18 @@ namespace MonoDevelop.AssemblyBrowser
 			IsDisposed = false;
 		}
 		
-		public override void Load (string fileName)
+		public override Task Load (FileOpenInformation fileOpenInformation)
 		{
 			ContentName = GettextCatalog.GetString ("Assembly Browser");
-			widget.AddReferenceByFileName (fileName);
+			widget.AddReferenceByFileName (fileOpenInformation.FileName);
+			return Task.FromResult (true);
 		}
-		
+
+		internal void EnsureDefinitionsLoaded (List<AssemblyLoader> definitions)
+		{
+			widget.EnsureDefinitionsLoaded (definitions);
+		}
+
 		public override bool IsFile {
 			get {
 				return false;
@@ -94,44 +100,38 @@ namespace MonoDevelop.AssemblyBrowser
 			IsDisposed = true;
 			base.Dispose ();
 			widget = null;
-			GC.Collect ();
+			if (Disposed != null)
+				Disposed (this, EventArgs.Empty);
 		}
 
+		internal event EventHandler Disposed;
+
 		#region INavigable implementation 
 		
 		public NavigationPoint BuildNavigationPoint ()
 		{
-			return new AssemblyBrowserNavigationPoint ();
+			return widget.BuildNavigationPoint ();
 		}
 		
 		#endregion
 
 		#region IUrlHandler implementation 
 		
-		public void Open (INamedElement element)
+		public void Open (Microsoft.CodeAnalysis.ISymbol element, bool expandNode = true)
 		{
-			var member = element as IUnresolvedEntity;
-			if (member == null) {
-				var entity = element as IMember;
-				if (entity != null)
-					member = entity.UnresolvedMember;
+			var url = element.OriginalDefinition.GetDocumentationCommentId ();//AssemblyBrowserWidget.GetIdString (member); 
+			if (element.DeclaredAccessibility != Microsoft.CodeAnalysis.Accessibility.Public)
+				widget.PublicApiOnly = false;
+			widget.Open (url, expandNode: expandNode);
+		}
 
-			}
-			if (member == null) {
-				var entity = element as IType;
-				if (entity != null)
-					member = entity.GetDefinition ().Parts [0];
-			}
-			if (member == null)
-				return;
-			var url = AssemblyBrowserWidget.GetIdString (member);
-			try {
-				widget.Open (url);
-			} catch (Exception e) {
-				MessageService.ShowError (GettextCatalog.GetString ("{0} could not be opened", url), e);
-			}
+		public void Open (string documentationCommentId, bool openInPublicOnlyMode = true, bool expandNode = true)
+		{
+			if (!openInPublicOnlyMode)
+				widget.PublicApiOnly = false;
+			widget.Open (documentationCommentId, expandNode: expandNode);
 		}
-		
+
 		#endregion 
 
 		[MonoDevelop.Components.Commands.CommandHandler(MonoDevelop.Refactoring.RefactoryCommands.FindReferences)]
@@ -140,7 +140,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var member = widget.ActiveMember as IMember;
 			if (member == null)
 				return;
-			FindReferencesHandler.FindRefs (member);
+			// FindReferencesHandler.FindRefs (member);
 		}
 		
 		[MonoDevelop.Components.Commands.CommandHandler(MonoDevelop.Refactoring.RefactoryCommands.FindDerivedClasses)]
@@ -149,10 +149,10 @@ namespace MonoDevelop.AssemblyBrowser
 			var type = widget.ActiveMember as ITypeDefinition;
 			if (type == null)
 				return;
-			FindDerivedClassesHandler.FindDerivedClasses (type);
+			//FindDerivedClassesHandler.FindDerivedClasses (type);
 		}
 
-		public void FillWidget ()
+		public async void FillWidget ()
 		{
 			if (Ide.IdeApp.ProjectOperations.CurrentSelectedSolution == null) {
 				foreach (var assembly in defaultAssemblies) {
@@ -165,7 +165,7 @@ namespace MonoDevelop.AssemblyBrowser
 					var netProject = project as DotNetProject;
 					if (netProject == null)
 						continue;
-					foreach (string file in netProject.GetReferencedAssemblies (ConfigurationSelector.Default, false)) {
+					foreach (string file in await netProject.GetReferencedAssemblies (ConfigurationSelector.Default, false)) {
 						if (!System.IO.File.Exists (file))
 							continue;
 						Widget.AddReferenceByFileName (file); 
@@ -175,37 +175,5 @@ namespace MonoDevelop.AssemblyBrowser
 		}
 	}
 
-	class AssemblyBrowserNavigationPoint : NavigationPoint
-	{
-		static Document DoShow ()
-		{
-			foreach (var view in Ide.IdeApp.Workbench.Documents) {
-				if (view.GetContent<AssemblyBrowserViewContent> () != null) {
-					view.Window.SelectWindow ();
-					return view;
-				}
-			}
-
-			var binding = DisplayBindingService.GetBindings<AssemblyBrowserDisplayBinding> ().FirstOrDefault ();
-			var assemblyBrowserView = binding != null ? binding.GetViewContent () : new AssemblyBrowserViewContent ();
-			assemblyBrowserView.FillWidget ();
-
-			return Ide.IdeApp.Workbench.OpenDocument (assemblyBrowserView, true);
-		}
-
-		#region implemented abstract members of NavigationPoint
-
-		public override Document ShowDocument ()
-		{
-			return DoShow ();
-		}
-
-		public override string DisplayName {
-			get {
-				return GettextCatalog.GetString ("Assembly Browser");
-			}
-		}
 
-		#endregion
-	}
 }
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
index c1401c7094..ebbdb39a3a 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
@@ -40,28 +40,32 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.Commands;
 using MonoDevelop.Ide.Gui.Components;
 using System.Linq;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.Documentation;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Projects;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using Mono.TextEditor.Theatrics;
-using MonoDevelop.SourceEditor;
 using XmlDocIdLib;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components;
 using System.Threading.Tasks;
 using System.Threading;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Navigation;
+using MonoDevelop.Ide.Gui.Content;
+using System.IO;
 
 namespace MonoDevelop.AssemblyBrowser
 {
+	enum SearchMemberState {
+		TypesAndMembers,
+		Types,
+		Members
+	}
 	[System.ComponentModel.Category("MonoDevelop.AssemblyBrowser")]
 	[System.ComponentModel.ToolboxItem(true)]
 	partial class AssemblyBrowserWidget : Gtk.Bin
 	{
-		Gtk.Button buttonBack;
-		Gtk.Button buttonForeward;
 		Gtk.ComboBox comboboxVisibilty;
 		MonoDevelop.Components.SearchEntry searchentry1;
 		Gtk.ComboBox languageCombobox;
@@ -75,11 +79,9 @@ namespace MonoDevelop.AssemblyBrowser
 			get {
 				return TreeView.PublicApiOnly;
 			}
-		}
-		
-		Ambience ambience = AmbienceService.GetAmbience ("text/x-csharp");
-		public Ambience Ambience {
-			get { return ambience; }
+			set {
+				comboboxVisibilty.Active = value ? 0 : 1;
+			}
 		}
 		
 		DocumentationPanel documentationPanel = new DocumentationPanel ();
@@ -111,23 +113,93 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 		}
 
-		public AssemblyBrowserWidget ()
+		static string GetLink (ReferenceSegment referencedSegment, out bool? isNotPublic)
 		{
-			this.Build ();
+			isNotPublic = null;
+			if (referencedSegment == null)
+				return null;
+
+			var td = referencedSegment.Reference as TypeDefinition;
+			if (td != null) {
+				isNotPublic = !td.IsPublic;
+				return new XmlDocIdGenerator ().GetXmlDocPath ((TypeDefinition)referencedSegment.Reference);
+			}
+			var md = referencedSegment.Reference as MethodDefinition;
+			if (md != null) {
+				isNotPublic = !md.IsPublic;
+				return new XmlDocIdGenerator ().GetXmlDocPath ((MethodDefinition)referencedSegment.Reference);
+			}
 
-			buttonBack = new Gtk.Button (ImageService.GetImage ("md-breadcrumb-prev", Gtk.IconSize.Menu));
-			buttonBack.Clicked += OnNavigateBackwardActionActivated;
+			var pd = referencedSegment.Reference as PropertyDefinition;
+			if (pd != null) {
+				isNotPublic = (pd.GetMethod == null || !pd.GetMethod.IsPublic) &&  
+					(pd.SetMethod == null || !pd.SetMethod.IsPublic);
+				return new XmlDocIdGenerator ().GetXmlDocPath ((PropertyDefinition)referencedSegment.Reference);
+			}
 
-			buttonForeward = new Gtk.Button (ImageService.GetImage ("md-breadcrumb-next", Gtk.IconSize.Menu));
-			buttonForeward.Clicked += OnNavigateForwardActionActivated;
+			var fd = referencedSegment.Reference as FieldDefinition;
+			if (fd != null) {
+				isNotPublic = !fd.IsPublic;
+				return new XmlDocIdGenerator ().GetXmlDocPath ((FieldDefinition)referencedSegment.Reference);
+			}
+
+			var ed = referencedSegment.Reference as EventDefinition;
+			if (ed != null) {
+				return new XmlDocIdGenerator ().GetXmlDocPath ((EventDefinition)referencedSegment.Reference);
+			}
+
+			var tref = referencedSegment.Reference as MemberReference;
+			if (tref != null) {
+				return new XmlDocIdGenerator ().GetXmlDocPath (tref);
+			}
+
+			return referencedSegment.Reference.ToString ();
+		}
+
+		class FastNonInterningProvider : InterningProvider
+		{
+			Dictionary<string, string> stringDict = new Dictionary<string, string>();
+
+			public override string Intern (string text)
+			{
+				if (text == null)
+					return null;
+
+				string output;
+				if (stringDict.TryGetValue(text, out output))
+					return output;
+				stringDict [text] = text;
+				return text;
+			}
+
+			public override ISupportsInterning Intern (ISupportsInterning obj)
+			{
+				return obj;
+			}
+
+			public override IList<T> InternList<T>(IList<T> list)
+			{
+				return list;
+			}
+
+			public override object InternValue (object obj)
+			{
+				return obj;
+			}
+		}
+
+		public AssemblyBrowserWidget ()
+		{
+			this.Build ();
 
 			comboboxVisibilty = ComboBox.NewText ();
 			comboboxVisibilty.InsertText (0, GettextCatalog.GetString ("Only public members"));
 			comboboxVisibilty.InsertText (1, GettextCatalog.GetString ("All members"));
-			comboboxVisibilty.Active = 0;
+			comboboxVisibilty.Active = Math.Min (1, Math.Max (0, PropertyService.Get ("AssemblyBrowser.MemberSelection", 0)));
 			comboboxVisibilty.Changed += delegate {
 				TreeView.PublicApiOnly = comboboxVisibilty.Active == 0;
-				FillInspectLabel ();
+				PropertyService.Set ("AssemblyBrowser.MemberSelection", comboboxVisibilty.Active);
+				FillInspectLabel (); 
 			};
 
 			searchentry1 = new MonoDevelop.Components.SearchEntry ();
@@ -135,36 +207,58 @@ namespace MonoDevelop.AssemblyBrowser
 			searchentry1.HasFrame = true;
 			searchentry1.WidthRequest = 200;
 			searchentry1.Visible = true;
-			searchentry1.EmptyMessage = GettextCatalog.GetString ("Search for types or members");
+			UpdateSearchEntryMessage ();
 			searchentry1.InnerEntry.Changed += SearchEntryhandleChanged;
 
-			CheckMenuItem checkMenuItem = this.searchentry1.AddFilterOption (0, GettextCatalog.GetString ("Types"));
-			checkMenuItem.Active = true;
+			CheckMenuItem checkMenuItem = this.searchentry1.AddFilterOption (0, GettextCatalog.GetString ("Types and Members"));
+			checkMenuItem.Active = PropertyService.Get ("AssemblyBrowser.SearchMemberState", SearchMemberState.TypesAndMembers) == SearchMemberState.TypesAndMembers;
 			checkMenuItem.Toggled += delegate {
 				if (checkMenuItem.Active) {
+					searchMode = AssemblyBrowserWidget.SearchMode.TypeAndMembers;
+					CreateColumns ();
+					StartSearch ();
+				}
+				if (checkMenuItem.Active)
+					PropertyService.Set ("AssemblyBrowser.SearchMemberState", SearchMemberState.TypesAndMembers);
+				UpdateSearchEntryMessage ();
+			};
+
+			CheckMenuItem checkMenuItem2 = this.searchentry1.AddFilterOption (0, GettextCatalog.GetString ("Types"));
+			checkMenuItem2.Active = PropertyService.Get ("AssemblyBrowser.SearchMemberState", SearchMemberState.TypesAndMembers) == SearchMemberState.Types;
+			checkMenuItem2.Toggled += delegate {
+				if (checkMenuItem2.Active) {
 					searchMode = AssemblyBrowserWidget.SearchMode.Type;
 					CreateColumns ();
 					StartSearch ();
 				}
+				if (checkMenuItem.Active)
+					PropertyService.Set ("AssemblyBrowser.SearchMemberState", SearchMemberState.Types);
+				UpdateSearchEntryMessage ();
 			};
 			
 			CheckMenuItem checkMenuItem1 = this.searchentry1.AddFilterOption (1, GettextCatalog.GetString ("Members"));
+			checkMenuItem.Active = PropertyService.Get ("AssemblyBrowser.SearchMemberState", SearchMemberState.TypesAndMembers) == SearchMemberState.Members;
 			checkMenuItem1.Toggled += delegate {
 				if (checkMenuItem1.Active) {
 					searchMode = AssemblyBrowserWidget.SearchMode.Member;
 					CreateColumns ();
 					StartSearch ();
 				}
+				if (checkMenuItem.Active)
+					PropertyService.Set ("AssemblyBrowser.SearchMemberState", SearchMemberState.Members);
+				UpdateSearchEntryMessage ();
+
 			};
 
 			languageCombobox = Gtk.ComboBox.NewText ();
 			languageCombobox.AppendText (GettextCatalog.GetString ("Summary"));
 			languageCombobox.AppendText (GettextCatalog.GetString ("IL"));
 			languageCombobox.AppendText (GettextCatalog.GetString ("C#"));
-			languageCombobox.Active = Math.Min (0, PropertyService.Get ("AssemblyBrowser.Language", 0));
+			languageCombobox.Active = Math.Min (2, Math.Max (0, PropertyService.Get ("AssemblyBrowser.Language", 0)));
 			languageCombobox.Changed += LanguageComboboxhandleChanged;
-
+#pragma warning disable 618
 			loader = new CecilLoader (true);
+			loader.InterningProvider = new FastNonInterningProvider ();
 			loader.IncludeInternalMembers = true;
 			TreeView = new AssemblyBrowserTreeView (new NodeBuilder[] { 
 				new ErrorNodeBuilder (),
@@ -184,12 +278,9 @@ namespace MonoDevelop.AssemblyBrowser
 				new BaseTypeFolderNodeBuilder (this),
 				new BaseTypeNodeBuilder (this)
 				}, new TreePadOption [0]);
-			TreeView.Tree.Selection.Mode = Gtk.SelectionMode.Single;
-			TreeView.Tree.CursorChanged += HandleCursorChanged;
-			TreeView.ShadowType = ShadowType.None;
-			TreeView.BorderWidth = 1;
-			TreeView.ShowBorderLine = false;
-			TreeView.Zoom = 1.0;
+			TreeView.PublicApiOnly = comboboxVisibilty.Active == 0;
+			TreeView.AllowsMultipleSelection = false;
+			TreeView.SelectionChanged += HandleCursorChanged;
 
 			treeViewPlaceholder.Add (TreeView);
 
@@ -198,48 +289,17 @@ namespace MonoDevelop.AssemblyBrowser
 //			this.documentationLabel.ModifyBg (Gtk.StateType.Normal, new Gdk.Color (255, 255, 225));
 //			this.documentationLabel.Wrap = true;
 			
-			var options = new MonoDevelop.Ide.Gui.CommonTextEditorOptions () {
-				ShowFoldMargin = false,
-				ShowIconMargin = false,
-				ShowLineNumberMargin = false,
-				HighlightCaretLine = true,
-			};
-			inspectEditor = new TextEditor (new TextDocument (), options);
-			inspectEditor.ButtonPressEvent += HandleInspectEditorButtonPressEvent;
+
+			inspectEditor = TextEditorFactory.CreateNewEditor ();
+			inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+
+			//inspectEditor.ButtonPressEvent += HandleInspectEditorButtonPressEvent;
 			
-			this.inspectEditor.Document.ReadOnly = true;
+			this.inspectEditor.IsReadOnly = true;
 //			this.inspectEditor.Document.SyntaxMode = new Mono.TextEditor.Highlighting.MarkupSyntaxMode ();
-			this.inspectEditor.TextViewMargin.GetLink = delegate(Mono.TextEditor.MarginMouseEventArgs arg) {
-				var loc = inspectEditor.PointToLocation (arg.X, arg.Y);
-				int offset = inspectEditor.LocationToOffset (loc);
-				var referencedSegment = ReferencedSegments != null ? ReferencedSegments.FirstOrDefault (seg => seg.Segment.Contains (offset)) : null;
-				if (referencedSegment == null)
-					return null;
-				if (referencedSegment.Reference is TypeDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((TypeDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is MethodDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((MethodDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is PropertyDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((PropertyDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is FieldDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((FieldDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is EventDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((EventDefinition)referencedSegment.Reference);
-				
-				if (referencedSegment.Reference is FieldDefinition)
-					return new XmlDocIdGenerator ().GetXmlDocPath ((FieldDefinition)referencedSegment.Reference);
+//			this.inspectEditor.LinkRequest += InspectEditorhandleLinkRequest;
 
-				if (referencedSegment.Reference is TypeReference) {
-					return new XmlDocIdGenerator ().GetXmlDocPath ((TypeReference)referencedSegment.Reference);
-				}
-				return referencedSegment.Reference.ToString ();
-			};
-			this.inspectEditor.LinkRequest += InspectEditorhandleLinkRequest;
-			documentationScrolledWindow.Add (inspectEditor);
+			documentationScrolledWindow.PackStart (inspectEditor, true, true, 0);
 
 			this.hpaned1.ExposeEvent += HPaneExpose;
 			hpaned1 = hpaned1.ReplaceWithWidget (new HPanedThin (), true);
@@ -270,14 +330,26 @@ namespace MonoDevelop.AssemblyBrowser
 			this.ShowAll ();
 		}
 
-		internal void SetToolbar (DocumentToolbar toolbar)
+		void UpdateSearchEntryMessage ()
 		{
-			toolbar.Add (buttonBack);
-
-			toolbar.Add (buttonForeward);
+			switch (PropertyService.Get ("AssemblyBrowser.SearchMemberState", SearchMemberState.TypesAndMembers)) {
+			case SearchMemberState.TypesAndMembers:
+				searchentry1.EmptyMessage = GettextCatalog.GetString ("Search for types and members");
+				break;
+			case SearchMemberState.Types:
+				searchentry1.EmptyMessage = GettextCatalog.GetString ("Search for types");
+				break;
+			case SearchMemberState.Members:
+				searchentry1.EmptyMessage = GettextCatalog.GetString ("Search for members");
+				break;
+			default:
+				throw new ArgumentOutOfRangeException ();
+			}
 
-			toolbar.Add (new VSeparator ());
+		}
 
+		internal void SetToolbar (DocumentToolbar toolbar)
+		{
 			Gtk.Label la = new Label (GettextCatalog.GetString ("Visibility"));
 			toolbar.Add (la);
 
@@ -299,13 +371,13 @@ namespace MonoDevelop.AssemblyBrowser
 		[CommandHandler (EditCommands.Copy)]
 		protected void OnCopyCommand ()
 		{
-			inspectEditor.RunAction (Mono.TextEditor.ClipboardActions.Copy);
+			EditActions.ClipboardCopy (inspectEditor);
 		}
 		
 		[CommandHandler (EditCommands.SelectAll)]
 		protected void OnSelectAllCommand ()
 		{
-			inspectEditor.RunAction (Mono.TextEditor.SelectionActions.SelectAll);
+			EditActions.SelectAll (inspectEditor);
 		}
 		
 		void HandleInspectEditorButtonPressEvent (object o, ButtonPressEventArgs args)
@@ -322,8 +394,8 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			TreeIter selectedIter;
 			if (searchTreeview.Selection.GetSelected (out selectedIter)) {
-				var member = (IUnresolvedEntity)(searchMode != SearchMode.Type ? memberListStore.GetValue (selectedIter, 4) : typeListStore.GetValue (selectedIter, 4));
-				
+				var member = (IUnresolvedEntity)(searchMode == SearchMode.Member ? memberListStore.GetValue (selectedIter, 4) : typeListStore.GetValue (selectedIter, 4));
+
 				var nav = SearchMember (member);
 				if (nav != null) {
 					notebook1.Page = 0;
@@ -343,22 +415,7 @@ namespace MonoDevelop.AssemblyBrowser
 			FillInspectLabel ();
 		}
 
-		void InspectEditorhandleLinkRequest (object sender, Mono.TextEditor.LinkEventArgs args)
-		{
-			var loader = (AssemblyLoader)this.TreeView.GetSelectedNode ().GetParentDataItem (typeof(AssemblyLoader), true);
 
-			if (args.Button == 2 || (args.Button == 1 && (args.ModifierState & Gdk.ModifierType.ShiftMask) == Gdk.ModifierType.ShiftMask)) {
-				AssemblyBrowserViewContent assemblyBrowserView = new AssemblyBrowserViewContent ();
-				foreach (var cu in definitions) {
-					assemblyBrowserView.Load (cu.UnresolvedAssembly.AssemblyName);
-				}
-				IdeApp.Workbench.OpenDocument (assemblyBrowserView, true);
-				((AssemblyBrowserWidget)assemblyBrowserView.Control).Open (args.Link);
-			} else {
-				this.Open (args.Link, loader);
-			}
-		}
-		
 		public IEntity ActiveMember  {
 			get;
 			set;
@@ -370,20 +427,20 @@ namespace MonoDevelop.AssemblyBrowser
 			TreeView.GrabFocus ();
 		}
 		
-		ITreeNavigator SearchMember (IUnresolvedEntity member)
+		ITreeNavigator SearchMember (IUnresolvedEntity member, bool expandNode = true)
 		{
-			return SearchMember (GetIdString (member));
+			return SearchMember (GetIdString (member), expandNode);
 		}
 			
-		ITreeNavigator SearchMember (string helpUrl)
+		ITreeNavigator SearchMember (string helpUrl, bool expandNode = true)
 		{
-			var nav = SearchMember (TreeView.GetRootNode (), helpUrl);
+			var nav = SearchMember (TreeView.GetRootNode (), helpUrl, expandNode);
 			if (nav != null)
 				return nav;
 			// Constructor may be a generated default without implementation.
 			var ctorIdx = helpUrl.IndexOf (".#ctor", StringComparison.Ordinal);
 			if (helpUrl.StartsWith ("M:", StringComparison.Ordinal) && ctorIdx > 0) {
-				return SearchMember ("T" + helpUrl.Substring (1, ctorIdx - 1));
+				return SearchMember ("T" + helpUrl.Substring (1, ctorIdx - 1), expandNode);
 			}
 			return null;
 		}
@@ -441,9 +498,9 @@ namespace MonoDevelop.AssemblyBrowser
 					if (p == null)
 						continue;
 					AppendTypeReference (result, p.Type);
-					if (p.IsRef)
+					if (p.IsOut)
 						result.Append ("&");
-					if (p.IsOut) {
+					if (p.IsRef) {
 						result.Append ("@");
 					}
 				}
@@ -456,7 +513,7 @@ namespace MonoDevelop.AssemblyBrowser
 			StringBuilder sb;
 			
 			switch (member.SymbolKind) {
-			case SymbolKind.TypeDefinition:
+			case ICSharpCode.NRefactory.TypeSystem.SymbolKind.TypeDefinition:
 				var type = member as IUnresolvedTypeDefinition;
 				if (type.TypeParameters.Count == 0)
 					return "T:" + type.FullName;
@@ -583,7 +640,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return false;
 		}
 		
-		ITreeNavigator SearchMember (ITreeNavigator nav, string helpUrl)
+		ITreeNavigator SearchMember (ITreeNavigator nav, string helpUrl, bool expandNode = true)
 		{
 			if (nav == null)
 				return null;
@@ -592,13 +649,18 @@ namespace MonoDevelop.AssemblyBrowser
 				if (IsMatch (nav, helpUrl, searchType)) {
 					inspectEditor.ClearSelection ();
 					nav.ExpandToNode ();
-					nav.Selected = nav.Expanded = true;
-					nav.ScrollToNode ();
+					if (expandNode) {
+						nav.Selected = nav.Expanded = true;
+						nav.ScrollToNode ();
+					} else {
+						nav.Selected = true;
+						nav.ScrollToNode ();
+					}
 					return nav;
 				}
 				if (!SkipChildren (nav, helpUrl, searchType) && nav.HasChildren ()) {
 					nav.MoveToFirstChild ();
-					ITreeNavigator result = SearchMember (nav, helpUrl);
+					ITreeNavigator result = SearchMember (nav, helpUrl, expandNode);
 					if (result != null)
 						return result;
 					
@@ -608,7 +670,7 @@ namespace MonoDevelop.AssemblyBrowser
 					try {
 						if (nav.DataItem is TypeDefinition && PublicApiOnly) {
 							nav.MoveToFirstChild ();
-							result = SearchMember (nav, helpUrl);
+							result = SearchMember (nav, helpUrl, expandNode);
 							if (result != null)
 								return result;
 							nav.MoveToParent ();
@@ -625,7 +687,8 @@ namespace MonoDevelop.AssemblyBrowser
 			Type   = 0,
 			Member = 1,
 			Disassembler = 2,
-			Decompiler = 3
+			Decompiler = 3,
+			TypeAndMembers = 4
 		}
 		
 		SearchMode searchMode = SearchMode.Type;
@@ -651,14 +714,40 @@ namespace MonoDevelop.AssemblyBrowser
 				col.PackStart (crt, true);
 				col.AddAttribute (crp, "image", 0);
 				col.AddAttribute (crt, "text", 1);
+				col.SortColumnId = 1;
 				searchTreeview.AppendColumn (col);
 				col.Resizable = true;
 				col = searchTreeview.AppendColumn (GettextCatalog.GetString ("Declaring Type"), new Gtk.CellRendererText (), "text", 2);
+				col.SortColumnId = 2;
 				col.Resizable = true;
 				col = searchTreeview.AppendColumn (GettextCatalog.GetString ("Assembly"), new Gtk.CellRendererText (), "text", 3);
+				col.SortColumnId = 3;
 				col.Resizable = true;
 				searchTreeview.Model = memberListStore;
 				break;
+			case SearchMode.TypeAndMembers:
+				col = new TreeViewColumn ();
+				col.Title = GettextCatalog.GetString ("Results");
+				crp = new CellRendererImage ();
+				crt = new Gtk.CellRendererText ();
+				col.PackStart (crp, false);
+				col.PackStart (crt, true);
+				col.AddAttribute (crp, "image", 0);
+				col.AddAttribute (crt, "text", 1);
+				col.SortColumnId = 1;
+
+				searchTreeview.AppendColumn (col);
+				col.Resizable = true;
+				col = searchTreeview.AppendColumn (GettextCatalog.GetString ("Parent"), new Gtk.CellRendererText (), "text", 2);
+				col.SortColumnId = 2;
+
+				col.Resizable = true;
+				col = searchTreeview.AppendColumn (GettextCatalog.GetString ("Assembly"), new Gtk.CellRendererText (), "text", 3);
+				col.SortColumnId = 3;
+
+				col.Resizable = true;
+				searchTreeview.Model = typeListStore;
+				break;
 			case SearchMode.Type:
 				col = new TreeViewColumn ();
 				col.Title = GettextCatalog.GetString ("Type");
@@ -668,11 +757,16 @@ namespace MonoDevelop.AssemblyBrowser
 				col.PackStart (crt, true);
 				col.AddAttribute (crp, "image", 0);
 				col.AddAttribute (crt, "text", 1);
+				col.SortColumnId = 1;
 				searchTreeview.AppendColumn (col);
 				col.Resizable = true;
+
 				col = searchTreeview.AppendColumn (GettextCatalog.GetString ("Namespace"), new Gtk.CellRendererText (), "text", 2);
+				col.SortColumnId = 2;
 				col.Resizable = true;
+
 				col = searchTreeview.AppendColumn (GettextCatalog.GetString ("Assembly"), new Gtk.CellRendererText (), "text", 3);
+				col.SortColumnId = 3;
 				col.Resizable = true;
 				searchTreeview.Model = typeListStore;
 				break;
@@ -706,6 +800,9 @@ namespace MonoDevelop.AssemblyBrowser
 			case SearchMode.Type:
 				IdeApp.Workbench.StatusBar.BeginProgress (GettextCatalog.GetString ("Searching type..."));
 				break;
+				case SearchMode.TypeAndMembers:
+		       	IdeApp.Workbench.StatusBar.BeginProgress (GettextCatalog.GetString ("Searching types and members..."));
+				break;
 			}
 			memberListStore.Clear ();
 			typeListStore.Clear ();
@@ -723,6 +820,7 @@ namespace MonoDevelop.AssemblyBrowser
 	
 		void SearchDoWork (object sender, DoWorkEventArgs e)
 		{
+			var publicOnly = PublicApiOnly;
 			BackgroundWorker worker = sender as BackgroundWorker;
 			try {
 				string pattern = e.Argument.ToString ().ToUpper ();
@@ -738,10 +836,14 @@ namespace MonoDevelop.AssemblyBrowser
 						foreach (var type in unit.UnresolvedAssembly.TopLevelTypeDefinitions) {
 							if (worker.CancellationPending)
 								return;
+							if (!type.IsPublic && publicOnly)
+								continue;
 							curType++;
 							foreach (var member in type.Members) {
 								if (worker.CancellationPending)
 									return;
+								if (!member.IsPublic && publicOnly)
+									continue;
 								if (member.Name.ToUpper ().Contains (pattern)) {
 									members.Add (member);
 								}
@@ -837,7 +939,9 @@ namespace MonoDevelop.AssemblyBrowser
 						foreach (var type in unit.UnresolvedAssembly.TopLevelTypeDefinitions) {
 							if (worker.CancellationPending)
 								return;
-							if (type.FullName.ToUpper ().IndexOf (pattern) >= 0)
+							if (!type.IsPublic && publicOnly)
+								continue;
+							if (type.FullName.ToUpper ().IndexOf (pattern, StringComparison.Ordinal) >= 0)
 								typeList.Add (type);
 						}
 						typeDict [unit] = typeList;
@@ -857,10 +961,54 @@ namespace MonoDevelop.AssemblyBrowser
 					});
 					
 					break;
+				case SearchMode.TypeAndMembers:
+					var typeDict2 = new Dictionary<AssemblyLoader, List<Tuple<IUnresolvedEntity, string>>> ();
+					foreach (var unit in this.definitions) {
+						var typeList = new List<Tuple<IUnresolvedEntity, string>> ();
+						foreach (var type in unit.UnresolvedAssembly.TopLevelTypeDefinitions) {
+							if (worker.CancellationPending)
+								return;
+							if (!type.IsPublic && publicOnly)
+								continue;
+							var parent = type.FullName;
+							if (parent.ToUpper ().IndexOf (pattern, StringComparison.Ordinal) >= 0)
+								typeList.Add (Tuple.Create ((IUnresolvedEntity)type, type.Namespace));
+							
+							foreach (var member in type.Members) {
+								if (worker.CancellationPending)
+									return;
+								if (!member.IsPublic && publicOnly)
+									continue;
+								if (member.Name.ToUpper ().Contains (pattern)) {
+									typeList.Add (Tuple.Create ((IUnresolvedEntity)member, parent));
+								}
+							}
+
+						}
+						typeDict2 [unit] = typeList;
+					}
+
+					Gtk.Application.Invoke (delegate {
+						foreach (var kv in typeDict2) {
+							foreach (var tuple in kv.Value) {
+								if (worker.CancellationPending)
+									return;
+								var type = tuple.Item1;
+								typeListStore.AppendValues (ImageService.GetIcon (type.GetStockIcon (), Gtk.IconSize.Menu),
+								                        type.Name,
+								                        tuple.Item2,
+														kv.Key.Assembly.FullName,
+								                        type);
+							}
+						}
+					});
+
+					break;
 				}
 			} finally {
 				Gtk.Application.Invoke (delegate {
 					IdeApp.Workbench.StatusBar.EndProgress ();
+					IdeApp.Workbench.StatusBar.ShowReady ();
 				});
 			}
 		}
@@ -1066,34 +1214,62 @@ namespace MonoDevelop.AssemblyBrowser
 			
 			return result.ToString ();
 		}
-		
+	 
 		List<ReferenceSegment> ReferencedSegments = new List<ReferenceSegment>();
-		List<UnderlineMarker> underlineMarkers = new List<UnderlineMarker> ();
+		List<ITextSegmentMarker> underlineMarkers = new List<ITextSegmentMarker> ();
 		
 		public void ClearReferenceSegment ()
 		{
 			ReferencedSegments = null;
-			underlineMarkers.ForEach (m => inspectEditor.Document.RemoveMarker (m));
+			underlineMarkers.ForEach (m => inspectEditor.RemoveMarker (m));
 			underlineMarkers.Clear ();
 		}
 		
-		public void SetReferencedSegments (List<ReferenceSegment> refs)
+		internal void SetReferencedSegments (List<ReferenceSegment> refs)
 		{
 			ReferencedSegments = refs;
 			if (ReferencedSegments == null)
 				return;
-			foreach (var seg in refs) {
-				DocumentLine line = inspectEditor.GetLineByOffset (seg.Offset);
+			foreach (var _seg in refs) {
+				var seg = _seg;
+				var line = inspectEditor.GetLineByOffset (seg.Offset);
 				if (line == null)
 					continue;
 				// FIXME: ILSpy sometimes gives reference segments for punctuation. See http://bugzilla.xamarin.com/show_bug.cgi?id=2918
-				string text = inspectEditor.GetTextAt (seg);
+				string text = inspectEditor.GetTextAt (seg.Offset, seg.Length);
 				if (text != null && text.Length == 1 && !(char.IsLetter (text [0]) || text [0] == '…'))
 					continue;
-				var marker = new UnderlineMarker (new Cairo.Color (0, 0, 1.0), 1 + seg.Offset - line.Offset, 1 + seg.EndOffset - line.Offset);
-				marker.Wave = false;
+				var marker = TextMarkerFactory.CreateLinkMarker (inspectEditor, seg.Offset, seg.Length, delegate (LinkRequest request) {
+					bool? isNotPublic;
+					var link = GetLink (seg, out isNotPublic);
+					if (link == null)
+						return;
+					if (isNotPublic.HasValue) {
+						if (isNotPublic.Value) {
+							PublicApiOnly = false;
+						}
+					} else {
+						// unable to determine if the member is public or not (in case of member references) -> try to search
+						var nav = SearchMember (link, false);
+						if (nav == null)
+							PublicApiOnly = false;
+					}
+					var loader = (AssemblyLoader)this.TreeView.GetSelectedNode ().GetParentDataItem (typeof(AssemblyLoader), true);
+					// args.Button == 2 || (args.Button == 1 && (args.ModifierState & Gdk.ModifierType.ShiftMask) == Gdk.ModifierType.ShiftMask)
+					if (request == LinkRequest.RequestNewView) {
+						AssemblyBrowserViewContent assemblyBrowserView = new AssemblyBrowserViewContent ();
+						foreach (var cu in definitions) {
+							assemblyBrowserView.Load (cu.UnresolvedAssembly.AssemblyName);
+						}
+						IdeApp.Workbench.OpenDocument (assemblyBrowserView, true);
+						((AssemblyBrowserWidget)assemblyBrowserView.Control).Open (link);
+					} else {
+						this.Open (link, loader);
+					}
+				});
+				marker.OnlyShowLinkOnHover = true;
 				underlineMarkers.Add (marker);
-				inspectEditor.Document.AddMarker (line, marker);
+				inspectEditor.AddMarker (marker);
 			}
 		}
 
@@ -1104,34 +1280,33 @@ namespace MonoDevelop.AssemblyBrowser
 				return;
 			IAssemblyBrowserNodeBuilder builder = nav.TypeNodeBuilder as IAssemblyBrowserNodeBuilder;
 			if (builder == null) {
-				this.inspectEditor.Document.Text = "";
+				this.inspectEditor.Text = "";
 				return;
 			}
 			
 			ClearReferenceSegment ();
-			inspectEditor.Document.ClearFoldSegments ();
+			inspectEditor.SetFoldings (Enumerable.Empty<IFoldSegment> ());
 			switch (this.languageCombobox.Active) {
 			case 0:
-				inspectEditor.Options.ShowFoldMargin = true;
-				this.inspectEditor.Document.MimeType = "text/x-csharp";
-				SetReferencedSegments (builder.GetSummary (inspectEditor.GetTextEditorData (), nav, PublicApiOnly));
+				inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+				this.inspectEditor.MimeType = "text/x-csharp";
+				SetReferencedSegments (builder.GetSummary (inspectEditor, nav, PublicApiOnly));
 				break;
 			case 1:
-				inspectEditor.Options.ShowFoldMargin = true;
-				this.inspectEditor.Document.MimeType = "text/x-ilasm";
-				SetReferencedSegments (builder.Disassemble (inspectEditor.GetTextEditorData (), nav));
+				inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+				this.inspectEditor.MimeType = "text/x-ilasm";
+				SetReferencedSegments (builder.Disassemble (inspectEditor, nav));
 				break;
 			case 2:
-				inspectEditor.Options.ShowFoldMargin = true;
-				this.inspectEditor.Document.MimeType = "text/x-csharp";
-				SetReferencedSegments (builder.Decompile (inspectEditor.GetTextEditorData (), nav, PublicApiOnly));
+				inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+				this.inspectEditor.MimeType = "text/x-csharp";
+				SetReferencedSegments (builder.Decompile (inspectEditor, nav, PublicApiOnly));
 				break;
 			default:
-				inspectEditor.Options.ShowFoldMargin = false;
-				this.inspectEditor.Document.Text = "Invalid combobox value: " + this.languageCombobox.Active;
+				inspectEditor.Options = DefaultSourceEditorOptions.PlainEditor;
+				this.inspectEditor.Text = "Invalid combobox value: " + this.languageCombobox.Active;
 				break;
 			}
-			this.inspectEditor.QueueDraw ();
 		}
 			
 		void CreateOutput ()
@@ -1187,11 +1362,12 @@ namespace MonoDevelop.AssemblyBrowser
 			this.hpaned1.Position = Math.Min (350, this.Allocation.Width * 2 / 3);
 		}
 		
-		public void Open (string url, AssemblyLoader currentAssembly = null)
+		internal void Open (string url, AssemblyLoader currentAssembly = null, bool expandNode = true)
 		{
 			Task.WhenAll (this.definitions.Select (d => d.LoadingTask).ToArray ()).ContinueWith (d => {
 				Application.Invoke (delegate {
-					ITreeNavigator nav = SearchMember (url);
+					suspendNavigation = false;
+					ITreeNavigator nav = SearchMember (url, expandNode);
 					if (definitions == null) // we've been disposed
 						return;
 					if (nav != null)
@@ -1209,7 +1385,7 @@ namespace MonoDevelop.AssemblyBrowser
 			});
 		}
 
-		void OpenFromAssembly (string url, AssemblyLoader currentAssembly)
+		void OpenFromAssembly (string url, AssemblyLoader currentAssembly, bool expandNode = true)
 		{
 			var cecilObject = loader.GetCecilObject (currentAssembly.UnresolvedAssembly);
 			if (cecilObject == null)
@@ -1231,11 +1407,10 @@ namespace MonoDevelop.AssemblyBrowser
 				}
 				var result = AddReferenceByFileName (fileName);
 				result.LoadingTask.ContinueWith (t2 => {
-					t2.Wait ();
 					if (definitions == null) // disposed
 						return;
 					Application.Invoke (delegate {
-						var nav = SearchMember (url);
+						var nav = SearchMember (url, expandNode);
 						if (nav == null) {
 							if (++i == references.Count)
 								LoggingService.LogError ("Assembly browser: Can't find: " + url + ".");
@@ -1345,7 +1520,7 @@ namespace MonoDevelop.AssemblyBrowser
 			
 			if (this.TreeView != null) {
 				//	Dispose (TreeView.GetRootNode ());
-				TreeView.Tree.CursorChanged -= HandleCursorChanged;
+				TreeView.SelectionChanged -= HandleCursorChanged;
 				this.TreeView.Clear ();
 				this.TreeView = null;
 			}
@@ -1372,11 +1547,11 @@ namespace MonoDevelop.AssemblyBrowser
 				documentationPanel.Destroy ();
 				documentationPanel = null;
 			}
-			if (inspectEditor != null) {
-				inspectEditor.TextViewMargin.GetLink = null;
-				inspectEditor.LinkRequest -= InspectEditorhandleLinkRequest;
-				inspectEditor.Destroy ();
-			}
+//			if (inspectEditor != null) {
+//				inspectEditor.TextViewMargin.GetLink = null;
+//				inspectEditor.LinkRequest -= InspectEditorhandleLinkRequest;
+//				inspectEditor.Destroy ();
+//			}
 			
 			if (this.UIManager != null) {
 				this.UIManager.Dispose ();
@@ -1389,15 +1564,6 @@ namespace MonoDevelop.AssemblyBrowser
 //			this.searchEntry.Changed -= SearchEntryhandleChanged;
 			this.searchTreeview.RowActivated -= SearchTreeviewhandleRowActivated;
 			hpaned1.ExposeEvent -= HPaneExpose;
-			if (NavigateBackwardAction != null) {
-				this.NavigateBackwardAction.Dispose ();
-				this.NavigateBackwardAction = null;
-			}
-
-			if (NavigateForwardAction != null) {
-				this.NavigateForwardAction.Dispose ();
-				this.NavigateForwardAction = null;
-			}
 			base.OnDestroyed ();
 		}
 		
@@ -1420,12 +1586,12 @@ namespace MonoDevelop.AssemblyBrowser
 		List<AssemblyLoader> definitions = new List<AssemblyLoader> ();
 		List<Project> projects = new List<Project> ();
 		
-		public AssemblyLoader AddReferenceByAssemblyName (AssemblyNameReference reference)
+		internal AssemblyLoader AddReferenceByAssemblyName (AssemblyNameReference reference)
 		{
 			return AddReferenceByAssemblyName (reference.Name);
 		}
 		
-		public AssemblyLoader AddReferenceByAssemblyName (string assemblyFullName)
+		internal AssemblyLoader AddReferenceByAssemblyName (string assemblyFullName)
 		{
 			string assemblyFile = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation (assemblyFullName, null);
 			if (assemblyFile == null || !System.IO.File.Exists (assemblyFile)) {
@@ -1441,7 +1607,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return AddReferenceByFileName (assemblyFile);
 		}
 		
-		public AssemblyLoader AddReferenceByFileName (string fileName)
+		internal AssemblyLoader AddReferenceByFileName (string fileName)
 		{
 			var result = definitions.FirstOrDefault (d => d.FileName == fileName);
 			if (result != null) {
@@ -1457,6 +1623,8 @@ namespace MonoDevelop.AssemblyBrowser
 
 				return result;
 			}
+			if (!File.Exists (fileName))
+				return null;
 			result = new AssemblyLoader (this, fileName);
 			
 			definitions.Add (result);
@@ -1471,8 +1639,7 @@ namespace MonoDevelop.AssemblyBrowser
 						} else {
 							builder = TreeView.AddChild (result);
 						}
-						TreeIter iter;
-						if (!TreeView.Tree.Selection.GetSelected (out iter))
+						if (TreeView.GetSelectedNode () == null)
 							builder.Selected = builder.Expanded = true;
 					} catch (Exception e) {
 						LoggingService.LogError ("Error while adding assembly to the assembly list", e);
@@ -1510,131 +1677,47 @@ namespace MonoDevelop.AssemblyBrowser
 			builder.Selected = builder.Expanded = selectReference;
 		}
 
-		[CommandHandler (SearchCommands.FindNext)]
-		public void FindNext ()
-		{
-			SearchAndReplaceWidget.FindNext (this.inspectEditor);
-		}
+		//MonoDevelop.Components.RoundedFrame popupWidgetFrame;
 
-		[CommandHandler (SearchCommands.FindPrevious)]
-		public void FindPrevious ()
-		{
-			SearchAndReplaceWidget.FindPrevious (this.inspectEditor);
-		}
-		
-		[CommandHandler (SearchCommands.Find)]
-		public void ShowSearchWidget ()
-		{
-			if (searchAndReplaceWidget == null) {
-				popupWidgetFrame = new MonoDevelop.Components.RoundedFrame ();
-				//searchAndReplaceWidgetFrame.SetFillColor (MonoDevelop.Components.CairoExtensions.GdkColorToCairoColor (widget.TextEditor.ColorStyle.Default.BackgroundColor));
-				popupWidgetFrame.SetFillColor (MonoDevelop.Components.CairoExtensions.GdkColorToCairoColor (Style.Background (StateType.Normal)));
-				popupWidgetFrame.Show ();
-				
-				popupWidgetFrame.Child = searchAndReplaceWidget = new SearchAndReplaceWidget (inspectEditor, popupWidgetFrame);
-				searchAndReplaceWidget.Destroyed += (sender, e) => {
-					DestroyFrames ();
-					if (inspectEditor.IsRealized)
-						inspectEditor.GrabFocus ();
-				};
-				searchAndReplaceWidget.UpdateSearchPattern ();
-				inspectEditor.AddAnimatedWidget (popupWidgetFrame, 300, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Blocking.Downstage, inspectEditor.Allocation.Width - 400, -searchAndReplaceWidget.Allocation.Height);
-				searchAndReplaceWidget.IsReplaceMode = false;
-			}
-			
-			searchAndReplaceWidget.Focus ();
-		}
-
-		MonoDevelop.Components.RoundedFrame popupWidgetFrame;
-
-		GotoLineNumberWidget gotoLineNumberWidget;
-		SearchAndReplaceWidget searchAndReplaceWidget;
-		void DestroyFrames ()
-		{
-			if (popupWidgetFrame != null) {
-				popupWidgetFrame.Destroy ();
-				popupWidgetFrame = null;
-				gotoLineNumberWidget = null;
-				searchAndReplaceWidget = null;
-			}
-		}
-
-		[CommandHandler (SearchCommands.GotoLineNumber)]
-		public void ShowGotoLineNumberWidget ()
-		{
-			if (gotoLineNumberWidget == null) {
-				DestroyFrames ();
-				popupWidgetFrame = new MonoDevelop.Components.RoundedFrame ();
-				//searchAndReplaceWidgetFrame.SetFillColor (MonoDevelop.Components.CairoExtensions.GdkColorToCairoColor (widget.TextEditor.ColorStyle.Default.BackgroundColor));
-				popupWidgetFrame.SetFillColor (MonoDevelop.Components.CairoExtensions.GdkColorToCairoColor (Style.Background (StateType.Normal)));
-				popupWidgetFrame.Show ();
-				
-				popupWidgetFrame.Child = gotoLineNumberWidget = new GotoLineNumberWidget (inspectEditor, popupWidgetFrame);
-				gotoLineNumberWidget.Destroyed += (sender, e) => {
-					DestroyFrames ();
-					if (inspectEditor.IsRealized)
-						inspectEditor.GrabFocus ();
-				};
-				inspectEditor.AddAnimatedWidget (popupWidgetFrame, 300, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Blocking.Downstage, inspectEditor.Allocation.Width - 400, -gotoLineNumberWidget.Allocation.Height);
-			}
-			
-			gotoLineNumberWidget.Focus ();
-		}
-
-	
 		#region NavigationHistory
-		Stack<ITreeNavigator> navigationBackwardHistory = new Stack<ITreeNavigator> ();
-		Stack<ITreeNavigator> navigationForwardHistory = new Stack<ITreeNavigator> ();
-		ITreeNavigator currentItem = null;
-		bool inNavigationOperation = false;
+		internal bool suspendNavigation;
 		void HandleCursorChanged (object sender, EventArgs e)
 		{
-			if (!inNavigationOperation) {
-				if (currentItem != null)
-					navigationBackwardHistory.Push (currentItem);
-				currentItem = TreeView.GetSelectedNode ();
-				ActiveMember = currentItem.DataItem as IEntity;
-				navigationForwardHistory.Clear ();
+			if (!suspendNavigation) {
+				var selectedEntity = TreeView.GetSelectedNode ()?.DataItem as IUnresolvedEntity;
+				if (selectedEntity != null)
+					NavigationHistoryService.LogActiveDocument ();
 			}
 			notebook1.Page = 0;
-			UpdateNavigationActions ();
 			CreateOutput ();
 		}
-		
-		void UpdateNavigationActions ()
-		{
-			if (buttonBack != null) {
-				buttonBack.Sensitive = navigationBackwardHistory.Count != 0;
-				buttonForeward.Sensitive = navigationForwardHistory.Count != 0;
-			}
-		}
-		
-		protected virtual void OnNavigateBackwardActionActivated (object sender, System.EventArgs e)
+
+		public NavigationPoint BuildNavigationPoint ()
 		{
-			if (navigationBackwardHistory.Count == 0)
-				return;
-			inNavigationOperation = true;
-			ITreeNavigator item = navigationBackwardHistory.Pop ();
-			item.Selected = true;
-			navigationForwardHistory.Push (currentItem);
-			currentItem = item;
-			inNavigationOperation = false;
-			UpdateNavigationActions ();
+			var selectedEntity = TreeView.GetSelectedNode ()?.DataItem as IUnresolvedEntity;
+			if (selectedEntity == null)
+				return null;
+			return new AssemblyBrowserNavigationPoint (definitions, GetIdString (selectedEntity));
 		}
-	
-		protected virtual void OnNavigateForwardActionActivated (object sender, System.EventArgs e)
+		#endregion
+
+		internal void EnsureDefinitionsLoaded (List<AssemblyLoader> definitions)
 		{
-			if (navigationForwardHistory.Count == 0)
-				return;
-			inNavigationOperation = true;
-			ITreeNavigator item = navigationForwardHistory.Pop ();
-			item.Selected = true;
-			navigationBackwardHistory.Push (currentItem);
-			currentItem = item;
-			inNavigationOperation = false;
-			UpdateNavigationActions ();
+			if (definitions == null)
+				throw new ArgumentNullException (nameof (definitions));
+			foreach (var def in definitions) {
+				if (!this.definitions.Contains (def)) {
+					this.definitions.Add (def);
+					Application.Invoke (delegate {
+						if (definitions.Count + projects.Count == 1) {
+							TreeView.LoadTree (def.LoadingTask.Result);
+						} else {
+							TreeView.AddChild (def.LoadingTask.Result);
+						}
+					});
+				}
+			}
 		}
-		#endregion
 	}
 }
 
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
index d5859582ac..58f80337fa 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
@@ -43,9 +43,9 @@ namespace MonoDevelop.AssemblyBrowser
 			private set;
 		}
 		
-		Task<AssemblyDefinition> assemblyLoaderTask;
+		Task<Tuple<AssemblyDefinition, IUnresolvedAssembly>> assemblyLoaderTask;
 
-		public Task<AssemblyDefinition> LoadingTask {
+		public Task<Tuple<AssemblyDefinition, IUnresolvedAssembly>> LoadingTask {
 			get {
 				return assemblyLoaderTask;
 			}
@@ -56,46 +56,39 @@ namespace MonoDevelop.AssemblyBrowser
 
 		public AssemblyDefinition Assembly {
 			get {
-				return assemblyLoaderTask.Result;
+				return assemblyLoaderTask.Result?.Item1;
 			}
 		}
-		
-		readonly Lazy<IUnresolvedAssembly> unresolvedAssembly;
+
 		public IUnresolvedAssembly UnresolvedAssembly {
 			get {
-				return unresolvedAssembly.Value;
+				return assemblyLoaderTask.Result.Item2;
 			}
 		}
 		
 		public AssemblyLoader (AssemblyBrowserWidget widget, string fileName)
 		{
 			if (widget == null)
-				throw new ArgumentNullException ("widget");
+				throw new ArgumentNullException (nameof (widget));
 			if (fileName == null)
-				throw new ArgumentNullException ("fileName");
+				throw new ArgumentNullException (nameof (fileName));
 			this.widget = widget;
-			this.FileName = fileName;
+			FileName = fileName;
 			if (!File.Exists (fileName))
-				throw new ArgumentException ("File doesn't exist.", "fileName");
-			this.assemblyLoaderTask = Task.Factory.StartNew<AssemblyDefinition> (() => {
+				throw new ArgumentException ("File doesn't exist.", nameof (fileName));
+			assemblyLoaderTask = Task.Run (async () => {
 				try {
-					return AssemblyDefinition.ReadAssembly (FileName, new ReaderParameters {
+					var asm = AssemblyDefinition.ReadAssembly (FileName, new ReaderParameters {
 						AssemblyResolver = this
 					});
+					var loadedAssembley = await Runtime.RunInMainThread (() => widget.CecilLoader.LoadAssembly (asm));
+
+					return Tuple.Create (asm, loadedAssembley);
 				} catch (Exception e) {
 					LoggingService.LogError ("Error while reading assembly " + FileName, e);
 					return null;
 				}
 			}, src.Token);
-			
-			this.unresolvedAssembly = new Lazy<IUnresolvedAssembly> (delegate {
-				try {
-					return widget.CecilLoader.LoadAssembly (Assembly);
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while loading assembly", e);
-					return new ICSharpCode.NRefactory.TypeSystem.Implementation.DefaultUnresolvedAssembly (FileName);
-				}
-			});
 		}
 		
 		#region IAssemblyResolver implementation
@@ -127,7 +120,7 @@ namespace MonoDevelop.AssemblyBrowser
 		public string LookupAssembly (string fullAssemblyName)
 		{
 			var assemblyFile = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation (fullAssemblyName, null);
-			if (assemblyFile != null && System.IO.File.Exists (assemblyFile))
+			if (assemblyFile != null && File.Exists (assemblyFile))
 				return assemblyFile;
 			
 			var name = AssemblyNameReference.Parse (fullAssemblyName);
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyReferenceFolder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyReferenceFolder.cs
index 36912b98df..d0266fe485 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyReferenceFolder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyReferenceFolder.cs
@@ -34,7 +34,6 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using ICSharpCode.NRefactory.TypeSystem;
 
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
index 05d9a3fbfc..e63acbb988 100755
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
@@ -28,9 +28,10 @@ using ICSharpCode.NRefactory;
 using System;
 using System.Text;
 using ICSharpCode.Decompiler;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using System.Linq;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -80,13 +81,13 @@ namespace MonoDevelop.AssemblyBrowser
 	class ColoredCSharpFormatter : ICSharpCode.Decompiler.ITextOutput
 	{
 		public StringBuilder sb = new StringBuilder();
-		TextDocument doc;
+		TextEditor doc;
 		bool write_indent;
 		int indent;
-		public List<FoldSegment>      FoldSegments       = new List<FoldSegment>();
+		public List<IFoldSegment>     FoldSegments       = new List<IFoldSegment>();
 		public List<ReferenceSegment> ReferencedSegments = new List<ReferenceSegment>();
 		
-		public ColoredCSharpFormatter (TextDocument doc)
+		public ColoredCSharpFormatter (TextEditor doc)
 		{
 			this.doc = doc;
 		}
@@ -94,7 +95,7 @@ namespace MonoDevelop.AssemblyBrowser
 		public void SetDocumentData ()
 		{
 			doc.Text = sb.ToString ();
-			doc.UpdateFoldSegments (FoldSegments, false);
+			doc.SetFoldings (FoldSegments);
 		}
 		
 		#region ITextOutput implementation
@@ -105,9 +106,9 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 		}
 		
-		public TextLocation Location {
+		public ICSharpCode.NRefactory.TextLocation Location {
 			get {
-				return new TextLocation (currentLine, 1);
+				return new ICSharpCode.NRefactory.TextLocation (currentLine, 1);
 			}
 		}
 		
@@ -193,9 +194,8 @@ namespace MonoDevelop.AssemblyBrowser
 		public void MarkFoldEnd ()
 		{
 			var curFold = foldSegmentStarts.Pop ();
-			FoldSegments.Add (new FoldSegment (doc, curFold.Item2 ,curFold.Item1, sb.Length - curFold.Item1, FoldingType.None) {
-				IsFolded = curFold.Item3
-			});
+			var seg = FoldSegmentFactory.CreateFoldSegment (doc, curFold.Item1, sb.Length - curFold.Item1, curFold.Item3, curFold.Item2);
+			FoldSegments.Add (seg);
 		}
 		#endregion
 		
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs
index 71ded99d16..f992060d7e 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DisplayBinding.cs
@@ -53,14 +53,14 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			if (viewContent == null || viewContent.IsDisposed) {
 				viewContent = new AssemblyBrowserViewContent ();
-				viewContent.Control.Destroyed += HandleDestroyed;
+				viewContent.Disposed += HandleDestroyed;
 			}
 			return viewContent;
 		}
 
 		void HandleDestroyed (object sender, EventArgs e)
 		{
-			((Gtk.Widget)sender).Destroyed -= HandleDestroyed;
+			((AssemblyBrowserViewContent)sender).Disposed -= HandleDestroyed;
 			this.viewContent = null;
 		}
 		
@@ -71,7 +71,7 @@ namespace MonoDevelop.AssemblyBrowser
 				|| mimeType == "application/x-msdownload";
 		}
 		
-		public IViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
+		public ViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
 		{
 			return GetViewContent ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DocumentationPanel.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DocumentationPanel.cs
index a7dabd0e11..b7191c7738 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DocumentationPanel.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DocumentationPanel.cs
@@ -46,7 +46,7 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			layout = new Pango.Layout (PangoContext);
 			layout.Wrap = Pango.WrapMode.Word;
-			layout.FontDescription = Pango.FontDescription.FromString (PropertyService.Get<string> ("FontName"));
+			//layout.FontDescription = Pango.FontDescription.FromString (PropertyService.Get<string> ("FontName"));
 		}
 		
 		protected override void OnDestroyed ()
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/HelpExtensions.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/HelpExtensions.cs
new file mode 100644
index 0000000000..34b3838425
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/HelpExtensions.cs
@@ -0,0 +1,168 @@
+//
+// HelpExtensions.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using Monodoc;
+using System.Threading;
+using MonoDevelop.Core;
+using Mono.Addins;
+using System.IO;
+using System.Collections.Generic;
+using MonoDevelop.Projects.Extensions;
+using System.Text;
+using System.Xml;
+using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Projects;
+using ICSharpCode.NRefactory.Documentation;
+
+namespace MonoDevelop.AssemblyBrowser
+{
+	static class HelpExtension
+	{
+		static void AppendTypeReference (StringBuilder result, ITypeReference type)
+		{
+			if (type is ArrayTypeReference) {
+				var array = (ArrayTypeReference)type;
+				AppendTypeReference (result, array.ElementType);
+				result.Append ("[");
+				result.Append (new string (',', array.Dimensions));
+				result.Append ("]");
+				return;
+			}
+					
+			if (type is PointerTypeReference) {
+				var ptr = (PointerTypeReference)type;
+				AppendTypeReference (result, ptr.ElementType);
+				result.Append ("*");
+				return;
+			}
+					
+			if (type is IType)
+				result.Append (((IType)type).FullName);
+		}
+
+				
+		static void AppendHelpParameterList (StringBuilder result, IList<IParameter> parameters)
+		{
+			result.Append ('(');
+			if (parameters != null) {
+				for (int i = 0; i < parameters.Count; i++) {
+					if (i > 0)
+						result.Append (',');
+					var p = parameters [i];
+					if (p == null)
+						continue;
+					if (p.IsRef || p.IsOut)
+						result.Append ("&");
+					AppendTypeReference (result, p.Type.ToTypeReference ());
+				}
+			}
+			result.Append (')');
+		}
+
+		static void AppendHelpParameterList (StringBuilder result, IList<IUnresolvedParameter> parameters)
+		{
+			result.Append ('(');
+			if (parameters != null) {
+				for (int i = 0; i < parameters.Count; i++) {
+					if (i > 0)
+						result.Append (',');
+					var p = parameters [i];
+					if (p == null)
+						continue;
+					if (p.IsRef || p.IsOut)
+						result.Append ("&");
+					AppendTypeReference (result, p.Type);
+				}
+			}
+			result.Append (')');
+		}
+
+		static XmlNode FindMatch (IMethod method, XmlNodeList nodes)
+		{
+			foreach (XmlNode node in nodes) {
+				XmlNodeList paramList = node.SelectNodes ("Parameters/*");
+				if (method.Parameters.Count == 0 && paramList.Count == 0)
+					return node;
+				if (method.Parameters.Count != paramList.Count)
+					continue;
+						
+				/*				bool matched = true;
+						for (int i = 0; i < p.Count; i++) {
+							if (p [i].ReturnType.FullName != paramList [i].Attributes ["Type"].Value) {
+								matched = false;
+								break;
+							}
+						}
+						if (matched)*/
+				return node;
+			}
+			return null;
+		}
+#pragma warning disable 618
+		public static XmlNode GetMonodocDocumentation (this IEntity member)
+		{
+			if (member.SymbolKind == SymbolKind.TypeDefinition) {
+				var helpXml = HelpService.HelpTree != null ? HelpService.HelpTree.GetHelpXml (IdStringProvider.GetIdString (member)) : null;
+				if (helpXml == null)
+					return null;
+				return helpXml.SelectSingleNode ("/Type/Docs");
+			}
+					
+			var declaringXml = HelpService.HelpTree != null && member.DeclaringTypeDefinition != null ? HelpService.HelpTree.GetHelpXml (member.DeclaringTypeDefinition.GetIdString ()) : null;
+			if (declaringXml == null)
+				return null;
+					
+			switch (member.SymbolKind) {
+			case SymbolKind.Method:
+				{
+					var nodes = declaringXml.SelectNodes ("/Type/Members/Member[@MemberName='" + member.Name + "']");
+					XmlNode node = nodes.Count == 1 ? nodes [0] : FindMatch ((IMethod)member, nodes);
+					if (node != null) {
+						System.Xml.XmlNode result = node.SelectSingleNode ("Docs");
+						return result;
+					}
+					return null;
+				}
+			case SymbolKind.Constructor:
+				{
+					var nodes = declaringXml.SelectNodes ("/Type/Members/Member[@MemberName='.ctor']");
+					XmlNode node = nodes.Count == 1 ? nodes [0] : FindMatch ((IMethod)member, nodes);
+					if (node != null) {
+						System.Xml.XmlNode result = node.SelectSingleNode ("Docs");
+						return result;
+					}
+					return null;
+				}
+			default:
+				return declaringXml.SelectSingleNode ("/Type/Members/Member[@MemberName='" + member.Name + "']/Docs");
+			}
+		}
+
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs
index 7a13a020b6..2355c9897c 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/IAssemblyBrowserNodeBuilder.cs
@@ -29,16 +29,16 @@
 using System;
 using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
 	interface IAssemblyBrowserNodeBuilder
 	{
 		string GetDocumentationMarkup (ITreeNavigator navigator);
-		List<ReferenceSegment> Disassemble (TextEditorData data, ITreeNavigator navigator);
-		List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly);
-		List<ReferenceSegment> GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly);
+		List<ReferenceSegment> Disassemble (TextEditor data, ITreeNavigator navigator);
+		List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly);
+		List<ReferenceSegment> GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly);
 	}
 }
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs
new file mode 100644
index 0000000000..661e52c07d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/NRefactoryStock.cs
@@ -0,0 +1,232 @@
+//
+// NRefactoryStock.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace MonoDevelop.AssemblyBrowser
+{
+	static class NRefactoryStock
+	{
+		static readonly IconId Field = "md-field";
+		public static readonly IconId Namespace = "md-name-space";
+
+		public static IconId GetStockIcon (this INamedElement element)
+		{
+			if (element is IType)
+				return ((IType)element).GetStockIcon ();
+			if (element is ITypeParameter)
+				return ((ITypeParameter)element).GetStockIcon ();
+			if (element is IUnresolvedEntity)
+				return ((IUnresolvedEntity)element).GetStockIcon ();
+			return ((IEntity)element).GetStockIcon ();
+		}
+
+		public static IconId GetStockIcon (this ITypeDefinition entity)
+		{
+			return GetStockIcon ((IType)entity);
+		}
+
+		public static IconId GetStockIcon (this IField field)
+		{
+			return GetStockIcon ((IEntity)field);
+		}
+
+		public static IconId GetStockIcon (this IVariable variable)
+		{
+			return Field;
+		}
+
+		public static IconId GetStockIcon (this IParameter parameter)
+		{
+			return Field;
+		}
+
+		public static IconId GetStockIcon (this IUnresolvedTypeParameter parameter)
+		{
+			return Field;
+		}
+
+		public static IconId GetStockIcon (this IEntity entity, bool showAccessibility = true)
+		{
+			return "md-" + GetAccess (entity) + GetGlobal (entity) + GetSource (entity);
+		}
+
+		static string GetAccess (IEntity entity)
+		{
+			switch (entity.Accessibility) {
+				case Accessibility.None:
+				return "";
+				case Accessibility.Private:
+				return "private-";
+				case Accessibility.Public:
+				return "";
+				case Accessibility.Protected:
+				return "protected-";
+				case Accessibility.Internal:
+				return "internal-";
+				case Accessibility.ProtectedOrInternal:
+				case Accessibility.ProtectedAndInternal:
+				return "ProtectedOrInternal-";
+				default:
+				throw new ArgumentOutOfRangeException ();
+			}
+		}
+
+		static string GetGlobal (IEntity entity)
+		{
+			switch (entity.SymbolKind) {
+			case SymbolKind.Field:
+				if (((IField)entity).IsConst)
+					return "";
+				return entity.IsStatic ? "static-" : "";
+			case SymbolKind.Method:
+			case SymbolKind.Constructor:
+			case SymbolKind.Destructor:
+			case SymbolKind.Operator:
+			case SymbolKind.Property:
+			case SymbolKind.Indexer:
+				return entity.IsStatic ? "static-" : "";
+			}
+			return "";
+
+		}
+
+		static string GetSource (IEntity entity)
+		{
+			switch (entity.SymbolKind) {
+			case SymbolKind.TypeDefinition:
+				var type = (IType)entity;
+				switch (type.Kind) {
+				case TypeKind.Class:
+					return "class";
+				case TypeKind.Interface:
+					return "interface";
+				case TypeKind.Struct:
+					return "struct";
+				case TypeKind.Delegate:
+					return "delegate";
+				case TypeKind.Enum:
+					return "enum";
+				}
+				return "class";
+			case SymbolKind.Field:
+				if (((IField)entity).IsConst)
+					return "literal";
+				return "field";
+			case SymbolKind.Event:
+				return "event";
+			case SymbolKind.Method:
+			case SymbolKind.Constructor:
+			case SymbolKind.Destructor:
+			case SymbolKind.Operator:
+				return "method";
+			case SymbolKind.Property:
+			case SymbolKind.Indexer:
+				return "property";
+			}
+			return "";
+		}
+
+		public static IconId GetStockIcon (this IUnresolvedEntity entity, bool showAccessibility = true)
+		{
+			return "md-" + GetAccess (entity) + GetGlobal (entity) + GetSource (entity);
+		}
+
+		static string GetAccess (IUnresolvedEntity entity)
+		{
+			switch (entity.Accessibility) {
+				case Accessibility.None:
+				return "";
+				case Accessibility.Private:
+				return "private-";
+				case Accessibility.Public:
+				return "";
+				case Accessibility.Protected:
+				return "protected-";
+				case Accessibility.Internal:
+				return "internal-";
+				case Accessibility.ProtectedOrInternal:
+				case Accessibility.ProtectedAndInternal:
+				return "ProtectedOrInternal-";
+				default:
+				throw new ArgumentOutOfRangeException ();
+			}
+		}
+
+		static string GetGlobal (IUnresolvedEntity entity)
+		{
+			switch (entity.SymbolKind) {
+			case SymbolKind.Field:
+				var field = (IUnresolvedField)entity;
+				return field.IsStatic && !field.IsConst ? "static-" : "";
+			case SymbolKind.Method:
+			case SymbolKind.Constructor:
+			case SymbolKind.Destructor:
+			case SymbolKind.Operator:
+			case SymbolKind.Property:
+			case SymbolKind.Indexer:
+				return entity.IsStatic ? "static-" : "";
+			}
+			return "";
+		}
+
+		static string GetSource (IUnresolvedEntity entity)
+		{
+			switch (entity.SymbolKind) {
+			case SymbolKind.TypeDefinition:
+				var type = (IUnresolvedTypeDefinition)entity;
+				switch (type.Kind) {
+				case TypeKind.Class:
+					return "class";
+				case TypeKind.Interface:
+					return "interface";
+				case TypeKind.Struct:
+					return "struct";
+				case TypeKind.Delegate:
+					return "delegate";
+				case TypeKind.Enum:
+					return "enum";
+				}
+				return "class";
+			case SymbolKind.Field:
+				var field = (IUnresolvedField)entity;
+				return field.IsConst ? "literal" : "field";
+			case SymbolKind.Event:
+				return "event";
+			case SymbolKind.Method:
+			case SymbolKind.Constructor:
+			case SymbolKind.Destructor:
+			case SymbolKind.Operator:
+				return "method";
+			case SymbolKind.Property:
+			case SymbolKind.Indexer:
+				return "property";
+			}
+			return "";
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyBrowserTypeNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyBrowserTypeNodeBuilder.cs
index 99f4050b9c..683c8b04a1 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyBrowserTypeNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyBrowserTypeNodeBuilder.cs
@@ -32,6 +32,7 @@ using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -41,10 +42,11 @@ namespace MonoDevelop.AssemblyBrowser
 			get; 
 			private set; 
 		}
-		
-		protected MonoDevelop.Ide.TypeSystem.Ambience Ambience {
+		readonly static CSharpAmbience ambience = new CSharpAmbience ();
+
+		protected CSharpAmbience Ambience {
 			get {
-				return Widget.Ambience; 
+				return ambience; 
 			}
 		}
 		
@@ -104,9 +106,11 @@ namespace MonoDevelop.AssemblyBrowser
 				var simpleCompilation = new SimpleCompilation (mainAssembly);
 				return new SimpleTypeResolveContext (simpleCompilation.MainAssembly);
 			}
-			var project = (Project)treeBuilder.GetParentDataItem (typeof(Project), true);
-			var compilation = TypeSystemService.GetCompilation (project);
-			return new SimpleTypeResolveContext (compilation.MainAssembly);
+			// TODO: roslyn port ?
+			// var project = (Project)treeBuilder.GetParentDataItem (typeof(Project), true);
+			// var compilation = TypeSystemService.GetCompilation (project);
+			// return new SimpleTypeResolveContext (compilation.MainAssembly);
+			return null;
 		}
 		
 		protected IMember Resolve (ITreeNavigator treeBuilder, IUnresolvedMember member, ITypeDefinition currentType = null)
@@ -122,9 +126,11 @@ namespace MonoDevelop.AssemblyBrowser
 				var simpleCompilation = new SimpleCompilation (mainAssembly);
 				return type.Resolve (new SimpleTypeResolveContext (simpleCompilation.MainAssembly));
 			}
-			var project = (Project)treeBuilder.GetParentDataItem (typeof(Project), true);
-			var ctx = TypeSystemService.GetCompilation (project);
-			return ctx.MainAssembly.GetTypeDefinition (type.Namespace, type.Name, type.TypeParameters.Count);
+			// TODO: roslyn port ?
+			// var project = (Project)treeBuilder.GetParentDataItem (typeof(Project), true);
+			// var ctx = TypeSystemService.GetCompilation (project);
+			// return ctx.MainAssembly.GetTypeDefinition (type.Namespace, type.Name, type.TypeParameters.Count);
+			return null;
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs
index a9dd6a68ba..ed73ec940b 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyNodeBuilder.cs
@@ -34,12 +34,10 @@ using Mono.Cecil;
 
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.IO;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -67,17 +65,18 @@ namespace MonoDevelop.AssemblyBrowser
 			nodeInfo.Icon = Context.GetIcon (Stock.Reference);
 		}
 		
-		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
+		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
 		{
 			var compilationUnit = (AssemblyLoader)dataObject;
-			
+			if (compilationUnit.Assembly == null)
+				return;
 			var references = new AssemblyReferenceFolder (compilationUnit.Assembly);
 			if (references.AssemblyReferences.Any () || references.ModuleReferences.Any ())
-				builder.AddChild (references);
+				treeBuilder.AddChild (references);
 			
 			var resources = new AssemblyResourceFolder (compilationUnit.Assembly);
 			if (resources.Resources.Any ())
-				builder.AddChild (resources);
+				treeBuilder.AddChild (resources);
 			
 			var namespaces = new Dictionary<string, Namespace> ();
 			bool publicOnly = Widget.PublicApiOnly;
@@ -90,18 +89,14 @@ namespace MonoDevelop.AssemblyBrowser
 				var ns = namespaces [namespaceName];
 				ns.Types.Add (type);
 			}
-			
-			foreach (var ns in namespaces.Values) {
-				if (publicOnly && !ns.Types.Any (t => t.IsPublic))
-					continue;
-				builder.AddChild (ns);
-			}
+
+			treeBuilder.AddChildren (namespaces.Values.Where (ns => !publicOnly || ns.Types.Any (t => t.IsPublic)));
 		}
 		
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
 		{
 			var compilationUnit = (AssemblyLoader)dataObject;
-			return compilationUnit.Assembly.MainModule.HasTypes;
+			return compilationUnit?.Assembly?.MainModule.HasTypes == true;
 		}
 		
 		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
@@ -114,12 +109,12 @@ namespace MonoDevelop.AssemblyBrowser
 				
 				if (e1 == null && e2 == null)
 					return 0;
-				if (e1 == null)
+				if (e1 == null || e1.Assembly == null)
 					return 1;
-				if (e2 == null)
+				if (e2 == null || e2.Assembly == null)
 					return -1;
 				
-				return e1.Assembly.Name.Name.CompareTo (e2.Assembly.Name.Name);
+				return string.Compare (e1.Assembly.Name.Name, e2.Assembly.Name.Name, StringComparison.Ordinal);
 			} catch (Exception e) {
 				LoggingService.LogError ("Exception in assembly browser sort function.", e);
 				return -1;
@@ -130,10 +125,10 @@ namespace MonoDevelop.AssemblyBrowser
 		void PrintAssemblyHeader (StringBuilder result, AssemblyDefinition assemblyDefinition)
 		{
 			result.Append ("<span style=\"comment\">");
-			result.Append (Ambience.SingleLineComment (
-                               String.Format (GettextCatalog.GetString ("Assembly <b>{0}</b>, Version {1}"),
+			result.Append ("// " +
+							   string.Format (GettextCatalog.GetString ("Assembly <b>{0}</b>, Version {1}"),
 			                                  assemblyDefinition.Name.Name,
-			                                  assemblyDefinition.Name.Version)));
+			                                  assemblyDefinition.Name.Version));
 			result.Append ("</span>");
 			result.AppendLine ();
 		}
@@ -151,7 +146,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return GettextCatalog.GetString ("Unknown");
 		}
 		
-		public List<ReferenceSegment> Disassemble (TextEditorData data, ITreeNavigator navigator)
+		public List<ReferenceSegment> Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			var assembly = ((AssemblyLoader)navigator.DataItem).UnresolvedAssembly;
 			var compilationUnit = Widget.CecilLoader.GetCecilObject (assembly);
@@ -163,7 +158,7 @@ namespace MonoDevelop.AssemblyBrowser
 		}
 		
 		
-		public List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		public List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			var assembly = ((AssemblyLoader)navigator.DataItem).UnresolvedAssembly;
 			var compilationUnit = Widget.CecilLoader.GetCecilObject (assembly);
@@ -177,7 +172,7 @@ namespace MonoDevelop.AssemblyBrowser
 			});
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			var assembly = ((AssemblyLoader)navigator.DataItem).UnresolvedAssembly;
 			var compilationUnit = Widget.CecilLoader.GetCecilObject (assembly);
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyReferenceFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyReferenceFolderNodeBuilder.cs
index 283b5c6e54..bf90fb52c7 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyReferenceFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyReferenceFolderNodeBuilder.cs
@@ -72,10 +72,8 @@ namespace MonoDevelop.AssemblyBrowser
 					//	ctx.AddChild (new Error (MonoDevelop.Core.GettextCatalog.GetString ("Error while loading:") + assemblyNameReference.FullName + "/" + e.Message));

 				}

 			}

-			

-			foreach (ModuleReference moduleRef in referenceFolder.ModuleReferences) {

-				ctx.AddChild (moduleRef);

-			}

+

+			ctx.AddChildren (referenceFolder.ModuleReferences);

 		}

 		

 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)

diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyResourceFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyResourceFolderNodeBuilder.cs
index 2eb286fa19..f699a83fe6 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyResourceFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/AssemblyResourceFolderNodeBuilder.cs
@@ -54,9 +54,7 @@ namespace MonoDevelop.AssemblyBrowser
 		public override void BuildChildNodes (ITreeBuilder ctx, object dataObject)
 		{
 			var resourceFolder = (AssemblyResourceFolder)dataObject;
-			foreach (object resource in resourceFolder.Resources) {
-				ctx.AddChild (resource);
-			}
+			ctx.AddChildren (resourceFolder.Resources);
 		}
 		
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/BaseTypeFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/BaseTypeFolderNodeBuilder.cs
index 497e590111..acf0f19327 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/BaseTypeFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/BaseTypeFolderNodeBuilder.cs
@@ -100,9 +100,7 @@ namespace MonoDevelop.AssemblyBrowser
 		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
 		{
 			var baseTypeFolder = (BaseTypeFolder)dataObject;
-			foreach (var type in baseTypeFolder.Type.BaseTypes) {
-				builder.AddChild (type);
-			}
+			builder.AddChildren (baseTypeFolder.Type.BaseTypes);
 		}
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
 		{
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomEventNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomEventNodeBuilder.cs
index e84b5022c2..c03962bf13 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomEventNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomEventNodeBuilder.cs
@@ -34,12 +34,13 @@ using MonoDevelop.Ide;
 using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Mono.Cecil;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Ide.Editor;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -64,7 +65,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var evt = (IUnresolvedEvent)dataObject;
 			try {
 				var resolved = Resolve (treeBuilder, evt);
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.CompletionListFomat);
+				nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved));
 			} catch (Exception) {
 				nodeInfo.Label = evt.Name;
 			}
@@ -90,7 +91,7 @@ namespace MonoDevelop.AssemblyBrowser
 		}
 		
 		#region IAssemblyBrowserNodeBuilder
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditorData data, ITreeNavigator navigator)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -98,7 +99,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Disassemble (data, rd => rd.DisassembleEvent (evt));
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -108,7 +109,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), evt.DeclaringType, b => b.AddEvent (evt));
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -124,17 +125,12 @@ namespace MonoDevelop.AssemblyBrowser
 			var resolved = Resolve (navigator, evt);
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
-			
-			var options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
 			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
+
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomFieldNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomFieldNodeBuilder.cs
index 136f27b442..fcdd6b8672 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomFieldNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomFieldNodeBuilder.cs
@@ -34,12 +34,12 @@ using MonoDevelop.Ide;
 using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Mono.Cecil;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -65,7 +65,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var field = (IUnresolvedField)dataObject;
 			try {
 				var resolved = Resolve (treeBuilder, field);
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.CompletionListFomat);
+				nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved));
 			} catch (Exception) {
 				nodeInfo.Label = field.Name;
 			}
@@ -77,7 +77,7 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		#region IAssemblyBrowserNodeBuilder
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditorData data, ITreeNavigator navigator)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -87,7 +87,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Disassemble (data, rd => rd.DisassembleField (field));
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -97,7 +97,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), field.DeclaringType, b => b.AddField (field));
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -113,17 +113,11 @@ namespace MonoDevelop.AssemblyBrowser
 			var resolved = Resolve (navigator, field);
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
-			
-			var options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
-			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
+
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomMethodNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomMethodNodeBuilder.cs
index 1a9b29e791..841aafac55 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomMethodNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomMethodNodeBuilder.cs
@@ -40,13 +40,14 @@ using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
 using ICSharpCode.Decompiler.Disassembler;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using System.IO;
 using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Projects;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -78,8 +79,9 @@ namespace MonoDevelop.AssemblyBrowser
 			var method = (IUnresolvedMethod)dataObject;
 			var dt = new DefaultResolvedTypeDefinition (GetContext (treeBuilder), method.DeclaringTypeDefinition);
 			var resolved = (DefaultResolvedMethod)Resolve (treeBuilder, method, dt);
+			var ambience = new CSharpAmbience ();
 			try {
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.CompletionListFomat);
+				nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (ambience.ConvertSymbol (resolved));
 			} catch (Exception) {
 				nodeInfo.Label = method.Name;
 			}
@@ -119,16 +121,16 @@ namespace MonoDevelop.AssemblyBrowser
 			return (ModuleDefinition)nav.DataItem;
 		}
 
-		public static List<ReferenceSegment> Decompile (TextEditorData data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData)
+		public static List<ReferenceSegment> Decompile (TextEditor data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData)
 		{
-			var types = DesktopService.GetMimeTypeInheritanceChain (data.Document.MimeType);
+			var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
 			var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			var settings = DomTypeNodeBuilder.CreateDecompilerSettings (false, codePolicy);
 			return Decompile (data, module, currentType, setData, settings);
 		}
 
 
-		public static List<ReferenceSegment> Decompile (TextEditorData data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData, DecompilerSettings settings)
+		public static List<ReferenceSegment> Decompile (TextEditor data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData, DecompilerSettings settings)
 		{
 			var context = new DecompilerContext (module);
 			var source = new CancellationTokenSource ();
@@ -140,7 +142,7 @@ namespace MonoDevelop.AssemblyBrowser
 				setData (astBuilder);
 				astBuilder.RunTransformations (o => false);
 				GeneratedCodeSettings.Default.Apply (astBuilder.SyntaxTree);
-				var output = new ColoredCSharpFormatter (data.Document);
+				var output = new ColoredCSharpFormatter (data);
 				astBuilder.GenerateCode (output);
 				output.SetDocumentData ();
 				return output.ReferencedSegments;
@@ -152,10 +154,10 @@ namespace MonoDevelop.AssemblyBrowser
 					setData (astBuilder);
 					astBuilder.RunTransformations (o => false);
 					GeneratedCodeSettings.Default.Apply (astBuilder.SyntaxTree);
-					var output = new ColoredCSharpFormatter (data.Document);
+					var output = new ColoredCSharpFormatter (data);
 					astBuilder.GenerateCode (output);
 					output.SetDocumentData ();
-					data.Document.Insert (data.Document.TextLength, "/* body decompilation failed: \n" + e + " */"); 
+					data.InsertText (data.Length, "/* body decompilation failed: \n" + e + " */"); 
 				} catch (Exception e2) {
 					data.Text = "/* fallback decompilation failed: \n" + e2 +"*/";
 				}
@@ -163,15 +165,15 @@ namespace MonoDevelop.AssemblyBrowser
 			return null;
 		}
 
-		public static List<ReferenceSegment> GetSummary (TextEditorData data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData)
+		public static List<ReferenceSegment> GetSummary (TextEditor data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData)
 		{
-			var types = DesktopService.GetMimeTypeInheritanceChain (data.Document.MimeType);
+			var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
 			var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			var settings = DomTypeNodeBuilder.CreateDecompilerSettings (false, codePolicy);
 			return GetSummary (data, module, currentType, setData, settings);
 		}
 
-		public static List<ReferenceSegment> GetSummary (TextEditorData data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData, DecompilerSettings settings)
+		public static List<ReferenceSegment> GetSummary (TextEditor data, ModuleDefinition module, TypeDefinition currentType, Action<AstBuilder> setData, DecompilerSettings settings)
 		{
 			var context = new DecompilerContext (module);
 			var source = new CancellationTokenSource ();
@@ -184,7 +186,7 @@ namespace MonoDevelop.AssemblyBrowser
 				setData (astBuilder);
 				astBuilder.RunTransformations (o => false);
 				GeneratedCodeSettings.Default.Apply (astBuilder.SyntaxTree);
-				var output = new ColoredCSharpFormatter (data.Document);
+				var output = new ColoredCSharpFormatter (data);
 				astBuilder.GenerateCode (output);
 				output.SetDocumentData ();
 				return output.ReferencedSegments;
@@ -194,20 +196,22 @@ namespace MonoDevelop.AssemblyBrowser
 			return null;
 		}
 
-		internal static string GetAttributes (Ambience ambience, IEnumerable<IAttribute> attributes)
+		internal static string GetAttributes (IEnumerable<IAttribute> attributes)
 		{
-			StringBuilder result = new StringBuilder ();
+			var result = new StringBuilder ();
+			//var ambience = new CSharpAmbience ();
+
 			foreach (var attr in attributes) {
 				if (result.Length > 0)
 					result.AppendLine ();
-	//			result.Append (ambience.GetString (attr, OutputFlags.AssemblyBrowserDescription));
+				// result.Append (ambience.ConvertSymbol (attr));
 			}
 			if (result.Length > 0)
 				result.AppendLine ();
 			return result.ToString ();
 		}
 		
-		public List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		public List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			var method = (IUnresolvedMethod)navigator.DataItem;
 			if (HandleSourceCodeEntity (navigator, data)) 
@@ -218,7 +222,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), cecilMethod.DeclaringType, b => b.AddMethod (cecilMethod));
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			var method = (IUnresolvedMethod)navigator.DataItem;
 			if (HandleSourceCodeEntity (navigator, data)) 
@@ -238,29 +242,29 @@ namespace MonoDevelop.AssemblyBrowser
 			sb.Append ("</a></u></span>");
 		}
 		
-		public static List<ReferenceSegment> Disassemble (TextEditorData data, Action<ReflectionDisassembler> setData)
+		public static List<ReferenceSegment> Disassemble (TextEditor data, Action<ReflectionDisassembler> setData)
 		{
 			var source = new CancellationTokenSource ();
-			var output = new ColoredCSharpFormatter (data.Document);
+			var output = new ColoredCSharpFormatter (data);
 			var disassembler = new ReflectionDisassembler (output, true, source.Token);
 			setData (disassembler);
 			output.SetDocumentData ();
 			return output.ReferencedSegments;
 		}
 		
-		internal static bool HandleSourceCodeEntity (ITreeNavigator navigator, TextEditorData data)
+		internal static bool HandleSourceCodeEntity (ITreeNavigator navigator, TextEditor data)
 		{
 			if (IsFromAssembly (navigator))
 				return false;
 			
 			var method = (IUnresolvedEntity)navigator.DataItem;
-			data.Text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (method.Region.FileName);
-			data.Caret.Location = method.Region.Begin;
-			data.CenterToCaret ();
+			var source = StringTextSource.ReadFrom (method.Region.FileName);
+			data.Text = source.Text;
+			data.CaretLocation = new MonoDevelop.Ide.Editor.DocumentLocation (method.Region.BeginLine, method.Region.BeginColumn);
 			return true;
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditorData data, ITreeNavigator navigator)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			var method = (IUnresolvedMethod)navigator.DataItem;
 			if (HandleSourceCodeEntity (navigator, data)) 
@@ -276,21 +280,15 @@ namespace MonoDevelop.AssemblyBrowser
 			var method = (IUnresolvedMethod)navigator.DataItem;
 			var resolved = Resolve (navigator, method);
 			if (GetMainAssembly (navigator) == null) {
-				return Mono.TextEditor.Utils.TextFileUtility.ReadAllText (method.Region.FileName);
+				return StringTextSource.ReadFrom (method.Region.FileName).Text;
 			}
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription | OutputFlags.IncludeConstraints));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
-			
-			AmbienceService.DocumentationFormatOptions options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
-			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
+
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomPropertyNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomPropertyNodeBuilder.cs
index 1ef796d40c..9c69994a8c 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomPropertyNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomPropertyNodeBuilder.cs
@@ -35,12 +35,12 @@ using MonoDevelop.Projects.Text;
 using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Mono.Cecil;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -66,7 +66,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var property = (IUnresolvedProperty)dataObject;
 			try {
 				var resolved = Resolve (treeBuilder, property);
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.CompletionListFomat);
+				nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved));
 			} catch (Exception) {
 				nodeInfo.Label = property.Name;
 			}
@@ -87,7 +87,7 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		#region IAssemblyBrowserNodeBuilder
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditorData data, ITreeNavigator navigator)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -107,7 +107,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return result;
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -117,7 +117,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), property.DeclaringType, b => b.AddProperty (property));
 		}
 		
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -133,17 +133,11 @@ namespace MonoDevelop.AssemblyBrowser
 			var resolved = Resolve (navigator, property);
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertSymbol (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
-			
-			AmbienceService.DocumentationFormatOptions options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
-			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
+
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved, AmbienceService.GetDocumentation (resolved), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomTypeNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomTypeNodeBuilder.cs
index 35ba03ed84..4bfa9b4ecc 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomTypeNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/DomTypeNodeBuilder.cs
@@ -30,19 +30,20 @@ using System;
 using System.Text;
 using System.Linq;
 using Mono.Cecil;
-
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor.Highlighting;
 using MonoDevelop.Ide;
 using ICSharpCode.Decompiler.Ast;
 using ICSharpCode.Decompiler;
 using System.Threading;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Ide.Gui.Content;
+using ICSharpCode.NRefactory.CSharp;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -58,51 +59,8 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		public DomTypeNodeBuilder (AssemblyBrowserWidget widget) : base (widget)
 		{
-			
 		}
-		
-		internal static OutputSettings settings;
-		static SyntaxMode mode = SyntaxModeService.GetSyntaxMode (null, "text/x-csharp");
 
-		internal static string MarkupKeyword (string text)
-		{
-			foreach (Keywords words in mode.Keywords) {
-				foreach (string word in words.Words) {
-					if (word == text) {
-						return "<span style=\"" + words.Color +  "\">" + text + "</span>";
-					}
-				}
-			}
-			return text;
-		}
-		
-		static DomTypeNodeBuilder ()
-		{
-			DomTypeNodeBuilder.settings = new OutputSettings (OutputFlags.AssemblyBrowserDescription);
-			
-			DomTypeNodeBuilder.settings.MarkupCallback += delegate (string text) {
-				return "<span style=\"text\">" + text + "</span>";
-			};
-			DomTypeNodeBuilder.settings.EmitModifiersCallback = delegate (string text) {
-				return "<span style=\"keyword.modifier\">" + text + "</span>";
-			};
-			DomTypeNodeBuilder.settings.EmitKeywordCallback = delegate (string text) {
-				return MarkupKeyword (text);
-			};
-//			DomTypeNodeBuilder.settings.EmitNameCallback = delegate (IEntity domVisitable, ref string outString) {
-//				if (domVisitable is IType) {
-//					outString = "<span style=\"text.link\"><u><a ref=\"" + ((IType)domVisitable).HelpUrl + "\">" + outString + "</a></u></span>";
-//				} else {
-//					outString = "<span style=\"text\">" + outString + "</span>";
-//				}
-//			};
-//			DomTypeNodeBuilder.settings.PostProcessCallback = delegate (IEntity domVisitable, ref string outString) {
-//				if (domVisitable is IReturnType) {
-//					outString = "<span style=\"text.link\"><u><a ref=\"" + ((IReturnType)domVisitable).HelpUrl + "\">" + outString + "</a></u></span>";
-//				}
-//			};
-		}
-		
 		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
 		{
 			var type = (IUnresolvedTypeDefinition)dataObject;
@@ -114,7 +72,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var type = (IUnresolvedTypeDefinition)dataObject;
 			try {
 				var resolved = Resolve (treeBuilder, type);
-				nodeInfo.Label = Ambience.GetString (resolved, OutputFlags.ClassBrowserEntries | OutputFlags.IncludeMarkup | OutputFlags.UseNETTypeNames);
+				nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertType (resolved));
 			} catch (Exception) {
 				nodeInfo.Label = type.Name;
 			}
@@ -161,7 +119,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var resolved = Resolve (navigator, type);
 			StringBuilder result = new StringBuilder ();
 			result.Append ("<span font_family=\"monospace\">");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertType (resolved)));
 			result.Append ("</span>");
 			result.AppendLine ();
 			result.Append (String.Format (GettextCatalog.GetString ("<b>Name:</b>\t{0}"), type.FullName));
@@ -170,7 +128,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return result.ToString ();
 		}
 		
-		public List<ReferenceSegment> Disassemble (TextEditorData data, ITreeNavigator navigator)
+		public List<ReferenceSegment> Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
@@ -193,19 +151,19 @@ namespace MonoDevelop.AssemblyBrowser
 				LockStatement = true,
 				AsyncAwait = true,
 				ShowXmlDocumentation = true,
-				CSharpFormattingOptions = codePolicy.CreateOptions (),
+				CSharpFormattingOptions = FormattingOptionsFactory.CreateMono (),
 				HideNonPublicMembers = publicOnly
 			};
 		}
 
-		public List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		public List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
 			var type = CecilLoader.GetCecilObject ((IUnresolvedTypeDefinition)navigator.DataItem);
 			if (type == null)
 				return null;
-			var types = DesktopService.GetMimeTypeInheritanceChain (data.Document.MimeType);
+			var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
 			var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			var settings = CreateDecompilerSettings (publicOnly, codePolicy);
 			return DomMethodNodeBuilder.Decompile (data, DomMethodNodeBuilder.GetModule (navigator), type, builder => {
@@ -213,14 +171,14 @@ namespace MonoDevelop.AssemblyBrowser
 			}, settings);
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			if (DomMethodNodeBuilder.HandleSourceCodeEntity (navigator, data)) 
 				return null;
 			var type = CecilLoader.GetCecilObject ((IUnresolvedTypeDefinition)navigator.DataItem);
 			if (type == null)
 				return null;
-			var types = DesktopService.GetMimeTypeInheritanceChain (data.Document.MimeType);
+			var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
 			var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			var settings = CreateDecompilerSettings (publicOnly, codePolicy);
 			return DomMethodNodeBuilder.GetSummary (data, DomMethodNodeBuilder.GetModule (navigator), type, builder => {
@@ -228,24 +186,17 @@ namespace MonoDevelop.AssemblyBrowser
 			}, settings);
 		}
 
-
 		string IAssemblyBrowserNodeBuilder.GetDocumentationMarkup (ITreeNavigator navigator)
 		{
 			var type = (IUnresolvedTypeDefinition)navigator.DataItem;
 			var resolved = Resolve (navigator, type);
 			var result = new StringBuilder ();
 			result.Append ("<big>");
-			result.Append (Ambience.GetString (resolved, OutputFlags.AssemblyBrowserDescription));
+			result.Append (MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (Ambience.ConvertType (resolved)));
 			result.Append ("</big>");
 			result.AppendLine ();
 			
-			AmbienceService.DocumentationFormatOptions options = new AmbienceService.DocumentationFormatOptions ();
-			options.MaxLineLength = -1;
-			options.BigHeadings = true;
-			options.Ambience = Ambience;
-			result.AppendLine ();
-			
-			result.Append (AmbienceService.GetDocumentationMarkup (resolved.GetDefinition (), AmbienceService.GetDocumentation (resolved.GetDefinition ()), options));
+			//result.Append (AmbienceService.GetDocumentationMarkup (resolved.GetDefinition (), AmbienceService.GetDocumentation (resolved.GetDefinition ()), options));
 			
 			return result.ToString ();
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ErrorNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ErrorNodeBuilder.cs
index 5956529f81..ed9c4f4614 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ErrorNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ErrorNodeBuilder.cs
@@ -51,7 +51,7 @@ namespace MonoDevelop.AssemblyBrowser
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
 			Error error = (Error)dataObject;
-			nodeInfo.Label = error.Message;
+			nodeInfo.Label = MonoDevelop.Ide.TypeSystem.Ambience.EscapeText (error.Message);
 			nodeInfo.Icon = Context.GetIcon (Stock.Error);
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/NamespaceBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/NamespaceBuilder.cs
index e19351f894..dd0854bd00 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/NamespaceBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/NamespaceBuilder.cs
@@ -31,9 +31,9 @@ using System.Text;
 using System.Linq;
 
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -98,7 +98,7 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		#region IAssemblyBrowserNodeBuilder
 
-		public List<ReferenceSegment> Disassemble (TextEditorData data, ITreeNavigator navigator)
+		public List<ReferenceSegment> Disassemble (TextEditor data, ITreeNavigator navigator)
 		{
 		//	bool publicOnly = Widget.PublicApiOnly;
 			Namespace ns = (Namespace)navigator.DataItem;
@@ -107,12 +107,12 @@ namespace MonoDevelop.AssemblyBrowser
 			return null;
 		}
 		
-		public List<ReferenceSegment> Decompile (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		public List<ReferenceSegment> Decompile (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			return Disassemble (data, navigator);
 		}
 
-		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditorData data, ITreeNavigator navigator, bool publicOnly)
+		List<ReferenceSegment> IAssemblyBrowserNodeBuilder.GetSummary (TextEditor data, ITreeNavigator navigator, bool publicOnly)
 		{
 			return Disassemble (data, navigator);
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ProjectNodeBuilder.cs
index 21269962f9..cd01bb0bf4 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ProjectNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ProjectNodeBuilder.cs
@@ -34,7 +34,6 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Pads;
 using MonoDevelop.Ide.Gui.Components;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using ICSharpCode.NRefactory.TypeSystem;
 using System.IO;
@@ -69,40 +68,42 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			var project = (Project)dataObject;
 			
-			nodeInfo.Label = project.Name;
+			nodeInfo.Label = Ambience.EscapeText (project.Name);
 			nodeInfo.Icon = Context.GetIcon (project.StockIcon);
 		}
 		
 		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
 		{
-			var project = (Project)dataObject;
-			var ctx = TypeSystemService.GetProjectContext (project);
-			if (ctx == null)
-				return;
-			
-			var namespaces = new Dictionary<string, Namespace> ();
-
-			foreach (var type in ctx.TopLevelTypeDefinitions) {
-				string namespaceName = string.IsNullOrEmpty (type.Namespace) ? "-" : type.Namespace;
-				if (!namespaces.ContainsKey (namespaceName))
-					namespaces [namespaceName] = new Namespace (namespaceName);
-				
-				var ns = namespaces [namespaceName];
-				ns.Types.Add (type);
-			}
-			
-			foreach (var ns in namespaces.Values) {
-				builder.AddChild (ns);
-			}
+			//var project = (Project)dataObject;
+			// TODO: Roslyn port.
+//			var ctx = TypeSystemService.GetProjectContext (project);
+//			if (ctx == null)
+//				return;
+//			
+//			var namespaces = new Dictionary<string, Namespace> ();
+//
+//			foreach (var type in ctx.TopLevelTypeDefinitions) {
+//				string namespaceName = string.IsNullOrEmpty (type.Namespace) ? "-" : type.Namespace;
+//				if (!namespaces.ContainsKey (namespaceName))
+//					namespaces [namespaceName] = new Namespace (namespaceName);
+//				
+//				var ns = namespaces [namespaceName];
+//				ns.Types.Add (type);
+//			}
+//			
+//			foreach (var ns in namespaces.Values) {
+//				builder.AddChild (ns);
+//			}
 		}
 		
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
 		{
-			var project = (Project)dataObject;
-			var ctx = TypeSystemService.GetProjectContext (project);
-			if (ctx == null)
+			//var project = (Project)dataObject;
+			// TODO: Roslyn port.
+			//var ctx = TypeSystemService.GetProjectContext (project);
+			//if (ctx == null)
 				return false;
-			return ctx.TopLevelTypeDefinitions.Any ();
+			// return ctx.TopLevelTypeDefinitions.Any ();
 		}
 		
 		public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode)
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ResourceNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ResourceNodeBuilder.cs
index 41c6c1a998..a9b6fae962 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ResourceNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/ResourceNodeBuilder.cs
@@ -49,7 +49,7 @@ namespace MonoDevelop.AssemblyBrowser
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
 			Mono.Cecil.Resource resource = (Mono.Cecil.Resource)dataObject;
-			nodeInfo.Label = resource.Name;
+			nodeInfo.Label = Ide.TypeSystem.Ambience.EscapeText (resource.Name);
 			nodeInfo.Icon = Context.GetIcon (Stock.ResourceFileIcon);
 		}
 		
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs
index c4437e568d..558d0c08e9 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs
@@ -7,7 +7,7 @@ using Mono.Cecil;
 namespace XmlDocIdLib
 {
     #region XmlDocIdGenerator
-    class XmlDocIdGenerator
+	class XmlDocIdGenerator
     {
         #region Constructors
         public XmlDocIdGenerator()
@@ -256,9 +256,9 @@ namespace XmlDocIdLib
                     CurrPath.Add("}");
                 }
             }
-            else if (Member is MethodDefinition)
+			else if (Member is MethodReference)
             {
-                MethodDefinition thisMethodDef = Member as MethodDefinition;
+				var thisMethodDef = Member as MethodReference;
 
                 // method, get type's path firstAppend
                 CurrPath.Add("M:");
@@ -269,11 +269,11 @@ namespace XmlDocIdLib
                 // check whether this is constructor method, or explicitly implemented method
                 strExplicitPath = GetXmlDocExplicitIfaceImplPath(Member);
 
-                if (thisMethodDef.IsStatic && thisMethodDef.IsConstructor)
-                    stbTempPath.Append(".#cctor");
-                if (!thisMethodDef.IsStatic && thisMethodDef.IsConstructor)
-                    stbTempPath.Append(".#ctor");
-                else if (strExplicitPath.Length > 0)
+                //if (thisMethodDef.IsStatic && thisMethodDef.IsConstructor)
+                //    stbTempPath.Append(".#cctor");
+                //if (!thisMethodDef.IsStatic && thisMethodDef.IsConstructor)
+                //    stbTempPath.Append(".#ctor");
+                if (strExplicitPath.Length > 0)
                     stbTempPath.Append("." + strExplicitPath);
                 else
                     stbTempPath.Append("." + thisMethodDef.Name);
@@ -299,22 +299,22 @@ namespace XmlDocIdLib
 
                 // check whether this is a conversion operator (implicit or explicit)
                 // if so, we have to read return type and add "~" char.
-                if (IsOperator(thisMethodDef))
-                {
-                    OperatorType OpType = GetOperatorType(thisMethodDef);
-
-                    if (OpType == OperatorType.op_Implicit || OpType == OperatorType.op_Explicit)
-                    {
-                        // add return type parameter path
-                        stbTempPath.Append("~");
-                        stbTempPath.Append(GetXmlDocParameterPath(thisMethodDef.ReturnType, false));
-                    }
-                }
+                //if (IsOperator(thisMethodDef))
+                //{
+                //    OperatorType OpType = GetOperatorType(thisMethodDef);
+
+                //    if (OpType == OperatorType.op_Implicit || OpType == OperatorType.op_Explicit)
+                //    {
+                //        // add return type parameter path
+                //        stbTempPath.Append("~");
+                //        stbTempPath.Append(GetXmlDocParameterPath(thisMethodDef.ReturnType, false));
+                //    }
+                //}
 
                 // add to path
                 CurrPath.Add(stbTempPath.ToString());
             }
-            else if (Member is FieldDefinition)
+			else if (Member is FieldReference)
             {
                 // field, get type's path name
                 CurrPath.Add("F:");
@@ -324,7 +324,7 @@ namespace XmlDocIdLib
                 // field's path
                 CurrPath.Add("." + Member.Name);
             }
-            else if (Member is PropertyDefinition)
+			else if (Member is PropertyReference)
             {
                 // property or indexer, get declaring type's path 
                 CurrPath.Add("P:");
@@ -359,7 +359,7 @@ namespace XmlDocIdLib
 
                 CurrPath.Add(stbTempPath.ToString());
             }
-            else if (Member is EventDefinition)
+			else if (Member is EventReference)
             {
                 // event, get type's path firstAppend
                 CurrPath.Add("E:");
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs
index 5ebb678ab8..1c632f10b1 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs
@@ -2,102 +2,102 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.AssemblyBrowser
 {
-	internal partial class AssemblyBrowserWidget
+	public partial class AssemblyBrowserWidget
 	{
 		private global::Gtk.UIManager UIManager;
-		private global::Gtk.Action NavigateBackwardAction;
-		private global::Gtk.Action NavigateForwardAction;
+
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.HPaned hpaned1;
+
 		private global::Gtk.Alignment treeViewPlaceholder;
+
 		private global::Gtk.VBox vbox3;
+
 		private global::Gtk.Notebook notebook1;
-		private global::MonoDevelop.Components.CompactScrolledWindow documentationScrolledWindow;
+
+		private global::Gtk.HBox documentationScrolledWindow;
+
 		private global::Gtk.VBox searchWidget;
+
 		private global::Gtk.ScrolledWindow scrolledwindow1;
+
 		private global::Gtk.TreeView searchTreeview;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+#pragma warning disable 436
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget
-			Stetic.BinContainer w1 = global::Stetic.BinContainer.Attach (this);
-			this.UIManager = new global::Gtk.UIManager ();
-			global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup ("Default");
-			this.NavigateBackwardAction = new global::Gtk.Action ("NavigateBackwardAction", global::Mono.Unix.Catalog.GetString ("Navigate backward"), null, "gtk-go-back");
-			this.NavigateBackwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Navigate backward");
-			w2.Add (this.NavigateBackwardAction, null);
-			this.NavigateForwardAction = new global::Gtk.Action ("NavigateForwardAction", global::Mono.Unix.Catalog.GetString ("Navigate forward"), null, "gtk-go-forward");
-			this.NavigateForwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Navigate forward");
-			w2.Add (this.NavigateForwardAction, null);
-			this.UIManager.InsertActionGroup (w2, 0);
+			Stetic.BinContainer w1 = global::Stetic.BinContainer.Attach(this);
+			this.UIManager = new global::Gtk.UIManager();
+			global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup("Default");
+			this.UIManager.InsertActionGroup(w2, 0);
 			this.Name = "MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget";
 			// Container child MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 2;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.hpaned1 = new global::Gtk.HPaned ();
+			this.hpaned1 = new global::Gtk.HPaned();
 			this.hpaned1.CanFocus = true;
 			this.hpaned1.Name = "hpaned1";
 			this.hpaned1.Position = 271;
 			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.treeViewPlaceholder = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.treeViewPlaceholder = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.treeViewPlaceholder.Name = "treeViewPlaceholder";
-			this.hpaned1.Add (this.treeViewPlaceholder);
-			global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.treeViewPlaceholder]));
+			this.hpaned1.Add(this.treeViewPlaceholder);
+			global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.treeViewPlaceholder]));
 			w3.Resize = false;
 			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.vbox3 = new global::Gtk.VBox ();
+			this.vbox3 = new global::Gtk.VBox();
 			this.vbox3.Name = "vbox3";
 			this.vbox3.Spacing = 6;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.notebook1 = new global::Gtk.Notebook ();
+			this.notebook1 = new global::Gtk.Notebook();
 			this.notebook1.CanFocus = true;
 			this.notebook1.Name = "notebook1";
 			this.notebook1.CurrentPage = 0;
 			this.notebook1.ShowBorder = false;
 			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.documentationScrolledWindow = new global::MonoDevelop.Components.CompactScrolledWindow ();
-			this.documentationScrolledWindow.CanFocus = true;
+			this.documentationScrolledWindow = new global::Gtk.HBox();
 			this.documentationScrolledWindow.Name = "documentationScrolledWindow";
-			this.documentationScrolledWindow.ShowBorderLine = false;
-			this.notebook1.Add (this.documentationScrolledWindow);
+			this.documentationScrolledWindow.Spacing = 6;
+			this.notebook1.Add(this.documentationScrolledWindow);
 			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.searchWidget = new global::Gtk.VBox ();
+			this.searchWidget = new global::Gtk.VBox();
 			this.searchWidget.Name = "searchWidget";
 			this.searchWidget.Spacing = 6;
 			// Container child searchWidget.Gtk.Box+BoxChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
+			this.scrolledwindow1 = new global::Gtk.ScrolledWindow();
 			this.scrolledwindow1.CanFocus = true;
 			this.scrolledwindow1.Name = "scrolledwindow1";
 			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			this.searchTreeview = new global::Gtk.TreeView ();
+			this.searchTreeview = new global::Gtk.TreeView();
 			this.searchTreeview.CanFocus = true;
 			this.searchTreeview.Name = "searchTreeview";
-			this.scrolledwindow1.Add (this.searchTreeview);
-			this.searchWidget.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.searchWidget [this.scrolledwindow1]));
+			this.scrolledwindow1.Add(this.searchTreeview);
+			this.searchWidget.Add(this.scrolledwindow1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.searchWidget[this.scrolledwindow1]));
 			w6.Position = 0;
-			this.notebook1.Add (this.searchWidget);
-			global::Gtk.Notebook.NotebookChild w7 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.searchWidget]));
+			this.notebook1.Add(this.searchWidget);
+			global::Gtk.Notebook.NotebookChild w7 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1[this.searchWidget]));
 			w7.Position = 1;
-			this.vbox3.Add (this.notebook1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.notebook1]));
+			this.vbox3.Add(this.notebook1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.notebook1]));
 			w8.Position = 0;
-			this.hpaned1.Add (this.vbox3);
-			this.vbox1.Add (this.hpaned1);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hpaned1]));
+			this.hpaned1.Add(this.vbox3);
+			this.vbox1.Add(this.hpaned1);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hpaned1]));
 			w10.Position = 0;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			w1.SetUiManager (UIManager);
-			this.Hide ();
-			this.NavigateBackwardAction.Activated += new global::System.EventHandler (this.OnNavigateBackwardActionActivated);
-			this.NavigateForwardAction.Activated += new global::System.EventHandler (this.OnNavigateForwardActionActivated);
+			w1.SetUiManager(UIManager);
+			this.Hide();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs
index 75935e2e55..8bc1a8b869 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs
@@ -1,3 +1,4 @@
+#pragma warning disable 436
 
 // This file has been generated by the GUI designer. Do not modify.
 namespace Stetic
@@ -6,9 +7,10 @@ namespace Stetic
 	{
 		private static bool initialized;
 
-		internal static void Initialize (Gtk.Widget iconRenderer)
+		internal static void Initialize(Gtk.Widget iconRenderer)
 		{
-			if ((Stetic.Gui.initialized == false)) {
+			if ((Stetic.Gui.initialized == false))
+			{
 				Stetic.Gui.initialized = true;
 			}
 		}
@@ -17,49 +19,55 @@ namespace Stetic
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
+
 		private Gtk.UIManager uimanager;
 
-		public static BinContainer Attach (Gtk.Bin bin)
+		public static BinContainer Attach(Gtk.Bin bin)
 		{
-			BinContainer bc = new BinContainer ();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
-			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
-			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
+			BinContainer bc = new BinContainer();
+			bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
+			bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
+			bin.Added += new Gtk.AddedHandler(bc.OnAdded);
 			return bc;
 		}
 
-		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
+		private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
 		{
-			if ((this.child != null)) {
-				args.Requisition = this.child.SizeRequest ();
+			if ((this.child != null))
+			{
+				args.Requisition = this.child.SizeRequest();
 			}
 		}
 
-		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
+		private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
 		{
-			if ((this.child != null)) {
+			if ((this.child != null))
+			{
 				this.child.Allocation = args.Allocation;
 			}
 		}
 
-		private void OnAdded (object sender, Gtk.AddedArgs args)
+		private void OnAdded(object sender, Gtk.AddedArgs args)
 		{
 			this.child = args.Widget;
 		}
 
-		public void SetUiManager (Gtk.UIManager uim)
+		public void SetUiManager(Gtk.UIManager uim)
 		{
 			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
+			this.child.Realized += new System.EventHandler(this.OnRealized);
 		}
 
-		private void OnRealized (object sender, System.EventArgs args)
+		private void OnRealized(object sender, System.EventArgs args)
 		{
-			if ((this.uimanager != null)) {
+			if ((this.uimanager != null))
+			{
 				Gtk.Widget w;
 				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
-					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
+				if (((w != null)
+							&& typeof(Gtk.Window).IsInstanceOfType(w)))
+				{
+					((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
 					this.uimanager = null;
 				}
 			}
@@ -68,12 +76,12 @@ namespace Stetic
 
 	internal class ActionGroups
 	{
-		public static Gtk.ActionGroup GetActionGroup (System.Type type)
+		public static Gtk.ActionGroup GetActionGroup(System.Type type)
 		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
+			return Stetic.ActionGroups.GetActionGroup(type.FullName);
 		}
 
-		public static Gtk.ActionGroup GetActionGroup (string name)
+		public static Gtk.ActionGroup GetActionGroup(string name)
 		{
 			return null;
 		}
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
index 3eef8c0c9a..689f8cf582 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
@@ -6,32 +6,15 @@
   </configuration>
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" />
     <widget-library name="../../../../build/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll" />
-    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
+    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/AddIns/DisplayBindings/AssemblyBrowser/MonoDevelop.AssemblyBrowser.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget" design-size="702 482">
-    <action-group name="Default">
-      <action id="NavigateBackwardAction">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Navigate backward</property>
-        <property name="ShortLabel" translatable="yes">Navigate backward</property>
-        <property name="StockId">gtk-go-back</property>
-        <signal name="Activated" handler="OnNavigateBackwardActionActivated" />
-      </action>
-      <action id="NavigateForwardAction">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Navigate forward</property>
-        <property name="ShortLabel" translatable="yes">Navigate forward</property>
-        <property name="StockId">gtk-go-forward</property>
-        <signal name="Activated" handler="OnNavigateForwardActionActivated" />
-      </action>
-    </action-group>
+    <action-group name="Default" />
     <property name="MemberName" />
     <property name="Visible">False</property>
-    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.VBox" id="vbox1">
         <property name="MemberName" />
@@ -63,10 +46,12 @@
                     <property name="CurrentPage">0</property>
                     <property name="ShowBorder">False</property>
                     <child>
-                      <widget class="MonoDevelop.Components.CompactScrolledWindow" id="documentationScrolledWindow">
+                      <widget class="Gtk.HBox" id="documentationScrolledWindow">
                         <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShowBorderLine">False</property>
+                        <property name="Spacing">6</property>
+                        <child>
+                          <placeholder />
+                        </child>
                       </widget>
                     </child>
                     <child>
diff --git a/main/src/addins/MonoDevelop.Autotools/AutotoolsContext.cs b/main/src/addins/MonoDevelop.Autotools/AutotoolsContext.cs
index 2b5465c414..99b3f1d937 100644
--- a/main/src/addins/MonoDevelop.Autotools/AutotoolsContext.cs
+++ b/main/src/addins/MonoDevelop.Autotools/AutotoolsContext.cs
@@ -45,7 +45,7 @@ namespace MonoDevelop.Autotools
 		Set<SystemPackage> commonPackages;
 		Set<string> globalFilesReferences = new Set<string>();
 		Set<string> compilers = new Set<string> ();
-		Set<SolutionItem> builtProjects = new Set<SolutionItem> ();
+		Set<SolutionFolderItem> builtProjects = new Set<SolutionFolderItem> ();
 
 		// Useful for cleaning up in case of a problem in generation
 		List<string> generatedFiles = new List<string> ();
@@ -190,12 +190,12 @@ namespace MonoDevelop.Autotools
 			globalFilesReferences.Add (filePath);
 		}
 		
-		public void RegisterBuiltProject (SolutionItem item)
+		public void RegisterBuiltProject (SolutionFolderItem item)
 		{
 			builtProjects.Add (item);
 		}
 		
-		public IEnumerable<SolutionItem> GetBuiltProjects ()
+		public IEnumerable<SolutionFolderItem> GetBuiltProjects ()
 		{
 			return builtProjects;
 		}
@@ -292,7 +292,7 @@ namespace MonoDevelop.Autotools
 		
 		// TODO: add an extension point with which addins can implement 
 		// autotools functionality.
-		public static IMakefileHandler GetMakefileHandler (SolutionItem entry, MakefileType mt)
+		public static IMakefileHandler GetMakefileHandler (SolutionFolderItem entry, MakefileType mt)
 		{
 			foreach (IMakefileHandler mh in AddinManager.GetExtensionObjects ("/MonoDevelop/Autotools/MakefileHandlers", typeof(IMakefileHandler), true)) {
 				if (mh.CanDeploy (entry, mt))
diff --git a/main/src/addins/MonoDevelop.Autotools/ChangeLog b/main/src/addins/MonoDevelop.Autotools/ChangeLog
deleted file mode 100644
index 398f8bf091..0000000000
--- a/main/src/addins/MonoDevelop.Autotools/ChangeLog
+++ /dev/null
@@ -1,1742 +0,0 @@
-2010-06-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AutotoolsContext.cs:
-	* SolutionDeployer.cs:
-	* SolutionMakefileHandler.cs: Don't allow spaces in paths.
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Commands.cs: Fix incorrect use of
-	  ShowCustomDialog/RunCustomDialog.
-
-2010-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* TarballBuilderEditorWidget.cs: Use ShowCustomDialog (which
-	  destroys the dialog when done) instead of RunCustomDialog
-	  (which doesn't).
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Commands.cs:
-	* TarballBuilderEditorWidget.cs: More dialog placing.
-
-2010-03-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SimpleProjectMakefileHandler.cs: Removed unnecessary
-	  ToMakefilePath call (it is already called when adding paths
-	  to extraFiles).
-
-	* MakefileData.cs: Properly escape spaces.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Autotools.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Commands.cs:
-	* MakefileData.cs:
-	* gtk-gui/gui.stetic:
-	* MakefileOptionPanel.cs:
-	* ImportMakefileDialog.cs:
-	* GenerateMakefilesDialog.cs:
-	* FileNodeBuilderExtension.cs:
-	* MakefileOptionPanelWidget.cs:
-	* MonoDevelop.Autotools.csproj:
-	* MonoDevelop.Autotools.addin.xml: Merged MD.Projects into
-	  MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components
-	  into MD.Ide.
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MakefileData.cs:
-	* SimpleProjectMakefileHandler.cs: Track ProjectFile Link API.
-
-2010-03-03  Levi Bard  <levi@unity3d.com>
-
-	* MakefileData.cs:
-	* gtk-gui/gui.stetic:
-	* MakefileOptionPanelWidget.cs:
-	* MakefileProjectServiceExtension.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs:
-	  Add option for number of parallel build processes.
-
-2010-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs: Fix assembly resolution issue when loading
-	  a project.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MakefileReaderExtension.cs:
-	* MonoDevelop.Autotools.csproj: Remove usnused extension.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileIntegrationFeature.cs: Track api changes.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileSwitchEditor.cs:
-	* gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileSwitchEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileIntegrationFeatureWidget.cs:
-	  Flush.
-
-2010-01-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SolutionDeployer.cs: Fix Bug 572048 - Spelling mistake in
-	  Packaging Output.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Handler.cs:
-	* MakefileData.cs:
-	* ConfigSection.cs:
-	* GenerateMakefilesDialog.cs:
-	* SolutionMakefileHandler.cs:
-	* SimpleProjectMakefileHandler.cs:
-	* MakefileProjectServiceExtension.cs: Introduced the
-	  ConfigurationSelector class to all methods that previously
-	  took a configuration name as string. This eliminates the
-	  ambiguity between solution configuration names and project
-	  configuration names.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Autotools.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileOptionPanelWidget.cs: Improve error handling.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileSwitchEditor.cs:
-	* gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileSwitchEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileIntegrationFeatureWidget.cs:
-	  Flush.
-
-2009-10-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Autotools.csproj: Flush.
-
-	* MonoDevelop.Autotools.addin.xml: Disable autotools features
-	  on windows.
-
-2009-10-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Autotools.addin.xml: Disabled autotools and
-	  makefile generation on windows.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Autotools.addin.xml: Bump MD version.
-
-2009-10-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs: Absolute or relative paths should not be
-	  considered for package reference. Fixes bug #510595.
-
-2009-10-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MakefileData.cs: Handled the required packages references.
-
-2009-10-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SimpleProjectMakefileHandler.cs: Avoid variable name
-	  colisions for files to be deployed. Fixes bug #537497 -
-	  Generated Makefiles should use relative paths for rule names
-	  instead of just filenames for content files.
-
-2009-09-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MakefileData.cs: Makefiles are no longer changed, when a
-	  package is included that is already included using a package
-	  requirement.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MakefileReaderExtension.cs: Make dialog transient to the
-	  root monodevelop window.
-
-2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SimpleProjectMakefileHandler.cs: Include Content files to
-	  the list of files to deploy. Fixes bug #502111 - Generated
-	  tarballs do not include .desktop files.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Autotools.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/Makefile.am.project.template:
-	* templates/Makefile.noauto.project.template: Fix issue that
-	  prevented generated makefiles from working in parallel
-	  builds. Patch by Bertrand Lorentz. Closes bug #531349 -
-	  Generated Makefile.am does not properly support parallel
-	  make.
-
-2009-08-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Handler.cs: Store TargetDirectory as a relative path. Fixes
-	  bug #532295 - TargetDirectory for a packaging project should
-	  be relative to the project.
-
-2009-08-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs:
-	* CustomMakefile.cs: Track api changes.
-
-2009-08-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs: Track api changes.
-
-2009-08-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs:
-	* MakefileOptionPanelWidget.cs: Use the new AssemblyContext
-	  class to query and resolve assemblies.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs:
-	  Fix layout of Edit Switches button.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2009-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs:
-	* MakefileOptionPanelWidget.cs: Removed
-	  CorePackageAssemblyNames because it doesn't really support
-	  multiple frameworks. The GetAssemblyFullName method already
-	  does the job of converting assembly names to full names.
-
-2009-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SolutionDeployer.cs: Fix nullref.
-
-2009-07-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SimpleProjectMakefileHandler.cs: Fix nullref.
-
-2009-06-23  Jérémie Laval  <jeremie.laval@gmail.com>
-	* MonoDevelop.Autotools.csproj:
-	* Makefile.am: Added the new files
-	
-	* Switch.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileSwitchEditor.cs
-	* gtk-gui/MonoDevelop.Autotools.MakefileSwitchEditorWidget.cs:
-	* MakefileSwitchEditorWidget.cs:
-	* MakefileSwitchEditor.cs: new switch editor code
-	
-	* gtk-gui/objects.xml:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs:
-	* SimpleProjectMakefileHandler.cs:
-	* Handler.cs:
-	* SolutionDeployer.cs:
-	* AutotoolsContext.cs:
-	* TarballBuilderEditorWidget.cs: Added switch editor support code
-
-2009-06-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MakefileData.cs: Track assembly lookup APIs.
-
-2009-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs:
-	* MakefileProjectServiceExtension.cs: Disable makefile
-	  integration on windows for now.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs:
-	* AutotoolsContext.cs:
-	* SimpleProjectMakefileHandler.cs:
-	* MakefileProjectServiceExtension.cs: Use the new FilePath
-	  class for handling file and directory paths.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.Autotools.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs:
-	* SolutionDeployer.cs:
-	* AutotoolsContext.cs:
-	* SimpleProjectMakefileHandler.cs: Moved SystemAssemblyService
-	  and related classes to the namespace
-	  MonoDevelop.Core.Assemblies.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Autotools.addin.xml: Bump MD version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs:
-	* SimpleProjectMakefileHandler.cs: Track api changes to
-	  support multiple target runtimes.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* PropertyProvider.cs: Worked on propertygrid localization.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Autotools.addin.xml: Track merge of the project
-	  pad context menu.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs:
-	* SimpleProjectMakefileHandler.cs: Track api changes.
-
-2009-02-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/configure.ac.template: Fix for bug #465118 -
-	  AM_MAINTANER_MODE missing from generated configure.ac.
-
-2009-02-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/Makefile.include: Added targets for installing
-	  satellite assemblies.
-
-2009-02-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AutotoolsContext.cs:
-	* SolutionDeployer.cs: Read templates from the right
-	  directory.
-
-	* MakefileData.cs: Track api changes.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Autotools.addin.xml: Move template file location
-	  to a subdirectory to match the location MSBuild and MD copy
-	  them.
-
-	* MonoDevelop.Autotools.csproj: Copy templates to output only
-	  if newer.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Autotools.mdp:
-	* MonoDevelop.Autotools.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Autotools.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs:
-	* gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs:
-	*
-	  gtk-gui/MonoDevelop.Autotools.MakefileIntegrationFeatureWidget.cs:
-	  Flush.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CustomMakefile.cs: Make some regex static.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Autotools.mdp: Flush project format changes.
-
-2009-01-19  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MakefileData.cs: Update vala error regex to catch gcc errors as well.
-
-2009-01-15  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MakefileOptionPanelWidget.cs: Don't overwrite saved targets.
-
-2009-01-14  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MakefileData.cs: Add vala error regexes.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Autotools.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileData.cs:
-	* SimpleProjectMakefileHandler.cs: Track API changes.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Autotools.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileOptionPanelWidget.cs: Avoid asking for creating makefiles when
-	switching pages.
-
-2008-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Commands.cs:
-	* MakefileOptionPanelWidget.cs: When enabling makefile integration, if
-	no makefiles are found in the project directory, show a message
-	offering generating them.
-
-2008-11-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MakefileProjectServiceExtension.cs: Allow executing when a makefile
-	execution target is defined.
-
-	* Makefile.am: Fix parallel build issues.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build dependencies.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Autotools.addin.xml: Bump MD version.
-
-2008-11-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SimpleProjectMakefileHandler.cs: Fix naming of satellite assemblies.
-	Base name must be the name of the original assembly, not the default
-	namespace. 
-
-	* MakefileProjectServiceExtension.cs: Include referenced configure.in
-	file in the item's list.
-
-	* MakefileData.cs: Fix string formatting.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml, FileNodeBuilderExtension.cs: Added
-	  quick property for enabling inclusion in makefiles synching.
-	  Supports multi-select.
-	* SimpleProjectMakefileHandler.cs, MakefileData.cs: Track API.
-
-2008-09-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs: If an assembly is going to be
-	  signed, make sure the key is distributed.
-
-2008-09-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/Makefile.include: Set MONO_IOMAP=drive when running resgen
-	  since resx files may contain Windows style paths. Fixes bug
-	  #398812.
-	* gtk-gui/objects.xml: Update.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.mdp: Updated projects.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileIntegrationFeatureWidget.cs, gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Autotools.MakefileIntegrationFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs,
-	  gtk-gui/objects.xml,
-	  gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs,
-	  gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs: Updated
-	  generated code.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* FileNodeBuilderExtension.cs, Commands.cs: Moved the extensible tree
-	  view to its own directory.
-
-2008-08-15  Dean Brettle <dean@brettle.com>
-
-	* SimpleProjectMakefileHandler.cs: 
-	Fixed bug 417791 by using "resgen1" (for ClrVersion.Net_1_1 )
-	and "resgen2" for ClrVersion.Net_2_0, but only when the current
-	runtime major version is greater than 1.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Autotools.mdp: Removed some parts of the documentation
-	  service.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Handler.cs, MakefileData.cs, MakefileVar.cs,
-	  SimpleProjectMakefileHandler.cs, SolutionDeployer.cs: Moved
-	  serialization engine to MonoDevelop.Core. Use new syntax for
-	  specifying attribute scope.
-
-2008-06-10  Andres G. Aragoneses <aaragoneses@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs: Implement feature to allow unmanaged
-	  project references in a managed project (bug#397490).
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs: GetOutputFileName now requires a
-	  solution configuration, not a project configuration.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Bump MD version.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Merged the extension points for
-	  project and solution option panels into a single extension point. A
-	  single extension point will now be used for all kinds of items.
-	  Extension conditions can be used to make panels visible only for
-	  some specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileProjectServiceExtension.cs: Replaced
-	  ICompilerResult/DefaultCompilerResult/CompilerResults by a new
-	  BuildResult class, which has owner information at error level, so
-	  it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileGeneratorTool.cs, IMakefileHandler.cs,
-	  MonoDevelop.Autotools.addin.xml, ImportMakefileDialog.cs,
-	  MakefileOptionPanelWidget.cs, MakefileReaderExtension.cs,
-	  MakefileProject.cs, SolutionMakefileHandler.cs,
-	  SimpleProjectMakefileHandler.cs, Handler.cs, SolutionDeployer.cs,
-	  MakefileProjectServiceExtension.cs, MakefileOptionPanel.cs,
-	  FileNodeBuilderExtension.cs, templates/autogen.sh.template,
-	  templates/rules.make, GenerateMakefilesDialog.cs,
-	  MakefileIntegrationFeature.cs, AutotoolsContext.cs, Commands.cs,
-	  gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs,
-	  gtk-gui/gui.stetic, TarballBuilderEditorWidget.cs, MakefileData.cs,
-	  CustomMakefile.cs: New project model changes.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs: Updated.
-	* MakefileData.cs: Added regex for boo messages.
-
-2008-03-27  Ankit Jain  <jankit@novell.com>
-
-	* templates/Makefile.solution.template:
-	* templates/make-dist.targets:
-	* templates/rules.make: Remove evil bash arrays.
-	Fixes from Raja Harinath.
-
-2008-03-26  Ankit Jain  <jankit@novell.com>
-
-	Add support for handling paths containing spaces.
-	Fix bug #353979.
-	* SimpleMakefileHandler.cs (EscapeSpace): New.
-	Escape and quote paths appropriately.
-	* SolutionMakefileHandler.cs: Include Makefile.include also.
-	* templates/Makefile.noauto.project.template:
-	* templates/Makefile.am.project.template: Use emit_resgen_targets macro.
-	Use '$(shell dirname ' instead of '$(dir ' as it can't handle paths with
-	spaces.
-	* templates/Makefile.include:
-	* templates/make-dist.targets:
-	* templates/Makefile.solution.template:
-	* templates/rules.make: Add the necessary changes for the support.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* ImportMakefileDialog.cs, MakefileOptionPanelWidget.cs, Commands.cs,
-	  gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs,
-	  gtk-gui/gui.stetic, MakefileData.cs: Worked on gnome hig compliant
-	  alerts.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Autotools.mdp, Makefile.am: Removed some unused glade and
-	  gnome-sharp references (only the unused). But I'll continue to remove
-	  glade, we need to lower the dependency tree a bit.
-
-2008-02-05  Michael Hutchinson <mhutchinson@novell.com>
-
-	* MonoDevelop.Autotools.addin.xml: Track main menu layout changes.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Update MD version.
-
-2008-01-24  Ankit Jain  <jankit@novell.com>
-	Raja R Harinath  <harinath@gmail.com>
-
-	Fix bugs #333847.
-	* SimpleProjectMakefileHandler.cs:
-	* SolutionDeployer.cs:
-	* templates/Makefile.am.project.template:
-	* templates/Makefile.include:
-	* templates/Makefile.noauto.project.template:
-	Add support for generating satellite assemblies.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Updated add-in category and description.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml, MonoDevelop.Autotools.mdp,
-	  SimpleProjectMakefileHandler.cs, Handler.cs, SolutionDeployer.cs,
-	  templates/expansions.m4, templates/configure.template,
-	  templates/configure.ac.template, Makefile.am: Properly implement support
-	  for libdir, bindir and datadir in both autotools and simple makefiles.
-	  Fixes bug #354128.
-
-2008-01-20  Ankit Jain  <jankit@novell.com>
-
-	* Change Console.WriteLines to LoggingService calls.
-
-2008-01-19  Ankit Jain  <jankit@novell.com>
-
-	* SimpleProjectMakefileHandler.cs: Ensure that custom-hooks.make is
-	included after the first target (all:). If the file exists then add it
-	to EXTRA_DIST.
-	Track change in emit-deploy-wrapper macro.
-	* SolutionDeployer.cs: Emit sed script to generate wrapper only for
-	simple makefiles.
-	* SolutionMakefileHandler.cs: Use AppendToVariable for EXTRA_DIST, to
-	allow a project to add to EXTRA_DIST.
-	* templates/Makefile.include: sed is not required for autotools based
-	makefiles.
-	* templates/Makefile.auto.project.template: Add INCLUDE_CUSTOM_HOOKS
-	after 'all:' target.
-
-2008-01-16  Ankit Jain  <jankit@novell.com>
-
-	* SolutionDeployer.cs: Sort the list of common and required packages
-	emitted in the configure script.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MakefileData.cs: Improve grammar/formatting for translatable strings.
-	  Replace console writes with logging.
-	* MakefileOptionPanelWidget.cs, SimpleProjectMakefileHandler.cs: Improve
-	  formatting of translatable strings.
-
-2007-12-31  Ankit Jain  <jankit@novell.com>
-
-	* SimpleProjectMakefileHandler.cs: Use macros for emitting deploy
-	targets. Saves lot of redundant lines.
-	Honor dir structure of the source deploy file (eg. f1/f2/foo.txt should
-	be deployed to BUILD_DIR/f1/f2/foo.txt). Do this for install/uninstall
-	targets also.
-	* templates/Makefile.include: Add macros for emitting deploy targets.
-	* templates/Makefile.am.project.template: Fix positioning of include
-	Makefile.include to fix macros for autotools based makefiles.
-
-2007-12-21  Miguel de Icaza <miguel@novell.com> 
-
-	
-
-2007-12-20  Ankit Jain  <jankit@novell.com>
-
-	* MakefileGeneratorTool.cs: Use GettextCatalog.GetString for
-	user-visible strings.
-
-2007-12-18  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #349419
-	* SimpleProjectMakefileHandler.cs: Honor DESTDIR.
-	* templates/Makefile.solution.template: Make sure exit_codes work
-	(escape shell so $$final_exit means something)
-	* templates/make-dist.targets: Remove spurious spaces.
-	Based on patches by Wade Berrier.
-
-2007-12-17  Ankit Jain  <jankit@novell.com>
-
-	* Minor fixes like use String.Empty instead of "" etc.
-
-2007-12-14  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs: Re-init Build vars when the owner project gets set.
-
-2007-12-14  Ankit Jain  <jankit@novell.com>
-
-	* SolutionDeployer.cs: Remove dead code.
-
-2007-12-14  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #347649
-	* AutotoolsContext.cs (AddRequiredPackages): Allow packages to be
-	specified per config.
-	(GetRequiredPackages): Per config.
-	(GetCommonRequiredPackages): Packages common to all configs.
-	* Set.cs (Intersect): New.
-	(Count): New.
-	(ToString): Override.
-	* SimpleProjectMakefileHandler.cs: Keep track of packages per config.
-	* SolutionDeployer.cs: Emit package requirements per config in
-	configure.ac and the configure script.
-	* templates/configure.ac.template: Update.
-	* templates/configure.template: Update to check per config packages.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.mdp: Updated project files. The order of extended
-	  properties won't change anymore.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/configure.template: Applied some fixes from the MD config
-	  script.
-	* gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs: Updated.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Bump add-in versions.
-
-2007-12-11  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs: Use LoggingService.
-
-2007-12-07  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #344837.
-	* MakefileOptionPanelWidget.cs: Improve error message.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.mdp, gtk-gui/gui.stetic, Makefile.am: Directory
-	  reorganization.
-
-2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs: Fix warnings.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* TemplateEngine.cs, MakefileData.cs: Track LoggingService API changes.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Bump MD version.
-
-2007-10-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Autotools.MakefileIntegrationFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs,
-	  gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs,
-	  gtk-gui/gui.stetic, TarballBuilderEditorWidget.cs: Cosmetic fixes in the
-	  tarball options dialog. Use a radio button instead of a checkbox to
-	  choose between simple and autotools based makefile.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileIntegrationFeature.cs: Track api changes. Add description
-	  property.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.mdp: Project file names updated by change in MD path
-	  functions.
-
-2007-10-16  Ankit Jain  <jankit@novell.com>
-
-	* SimpleProjectMakefileHandler.cs (Deploy): Add support for emitting
-	custom commands for simple makefiles.
-	(EmitCustomCommandTargets): New.
-	* templates/Makefile.noauto.project.template: Insert calls to *Build targets.
-	* templates/rules.make: Insert calls to *Clean targets and add empty default
-	targets for the custom commands.
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* SolutionMakefileHandler.cs, SimpleProjectMakefileHandler.cs, Handler.cs,
-	  SolutionDeployer.cs, AutotoolsContext.cs, MakefileData.cs: Applied
-	  changes that were neccassary for to the new FileService.
-
-2007-09-28  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #325674.
-	* MakefileOptionPanelWidget.cs: Use FocusChildSet event instead of
-	FocusoutEvent for the makefile entry widget.
-
-2007-09-28  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MakefileData.cs (InitCompilerMessageRegex): Cosmetic fix.
-
-2007-09-28  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MakefileData.cs: Update standard gcc regex to also match column info.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Bump MD version.
-
-2007-09-04  Michael Hutchinson <MHutchinson@novell.com> 
-
-	* MakefileOptionPanelWidget.cs, MakefileOptionPanel.cs: Fix some compile
-	  warnings.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MakefileOptionPanelWidget.cs, MakefileOptionPanel.cs: Changes due to new
-	  property infrastructure.
-
-2007-08-23  Marcos David Marín Amador <MarcosMarin@gmail.com>
-
-	* Handler.cs: Added support for Include and IncludeRoot targets.
-
-2007-08-22  Ankit Jain  <jankit@novell.com>
-
-	* templates/*: Add invocation for various hooks.
-	* SimpleProjectMakefileHandler.cs: Include custom-hooks.make .
-	* SolutionMakefileHandler.cs: Include custom-hooks.make . Emit
-	invocation for hooks.
-
-2007-08-22  Ankit Jain  <jankit@novell.com>
-
-	* templates/Makefile.solution.template: Replace all *-recursive targets
-	with a single %-recursive target.
-	* templates/*: minor updates.
-	* SimpleProjectMakefileHandler.cs: Update.
-
-2007-08-22  Ankit Jain  <jankit@novell.com>
-
-	* templates/*: Improve generated makefiles to support '-k'.
-
-2007-08-21  Ankit Jain  <jankit@novell.com>
-
-	* ConfigSection.cs: New.
-	* SimpleProjectMakefileHandler.cs: Refactor to support correctly
-	building multiple configurations. Referenced assembly names/paths can depend
-	on the config (Eg. for project references).
-	* TemplateEngine.cs: Update to use typed Dictionary instead of
-	hashtable.
-	* templates/Makefile.am.project.template: 
-	* templates/Makefile.noauto.project.template: $(ASSEMBLY).mdb might not
-	be available in all configs.
-	* templates/Makefile.solution.template: Exit if build/install for a
-	subdir fails.
-	* templates/make-dist.targets: Subdir could be multilevel, so use
-	absolute paths for 'dist'.
-	* templates/rules.make: Likewise.
-
-	* SolutionDeployer.cs (GenerateFiles): Emit exception stack trace also.
-
-2007-08-21  Ankit Jain  <jankit@novell.com>
-
-	* MakefileGeneratorTool.cs: Add short option "-s" for
-	--simple-makefiles.
-
-2007-08-14  Ankit Jain  <jankit@novell.com>
-
-	Add uninstall target.
-	* SimpleProjectMakefileHandler.cs: Emit uninstall rules.
-	* SolutionMakefileHandler.cs: Emit uninstall target.
-	* templates/Makefile.noauto.project.template:
-	* templates/Makefile.solution.template: Add uninstall target.
-
-2007-08-10  Ankit Jain  <jankit@novell.com>
-
-	* templates/*: Update to support generating partial classes with xamlg.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.mdp, Makefile.am: Don't exclude the addin.xml file
-	  from the makefile.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* IMakefileHandler.cs, MonoDevelop.Autotools.addin.xml,
-	  MonoDevelop.Autotools.mdp, SolutionMakefileHandler.cs,
-	  SimpleProjectMakefileHandler.cs, SolutionDeployer.cs,
-	  AutotoolsContext.cs, Makefile.am: Added an extension point for
-	  registering new IMakefileHandlers.
-	* TemplateEngine.cs: Removed log4net dependency.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am: Add missing resoruce.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml, MonoDevelop.Autotools.mdp,
-	  SimpleProjectMakefileHandler.cs,
-	  gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs,
-	  gtk-gui/gui.stetic, Makefile.am: Reorganized the extension point
-	  hierarchy. Embedded all add-in manifests as resources.
-
-2007-08-03  Ankit Jain  <jankit@novell.com>
-
-	Fix bug#82254.
-	* Commands.cs (NodeExtension.CanBuildNode): Allow for CombineEntry also.
-	(AutotoolsCommandHandler.OnGenerate): Handle command for projects.
-	* MonoDevelop.Autotools.addin.xml: Add GenerateFiles to project's context
-	menu.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileReaderExtension.cs, Makefile.am: Converted DispatchService to a
-	  static class.
-
-2007-08-02  Ankit Jain  <jankit@novell.com>
-
-	* templates/make-dist.targets: Forgot to commit this!
-
-2007-08-02  Ankit Jain  <jankit@novell.com>
-
-	* AutotoolsContext.cs (TargetCombine): New. Combine on which 'Generate
-	makefiles' command was invoked.
-	* SolutionDeployer.cs: Set TargetCombine.
-	* SimpleProjectMakefileHandler.cs: Update to use TargetCombine instead
-	of RootCombine.
-
-	Fixes to handle nested solutions.
-	* SolutionMakefileHandler.cs (Deploy):
-	* templates/Makefile.solution.template:
-	* templates/rules.make:
-	* templates/make-dist.targets: New.
-
-2007-07-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SolutionOptionsPanel.cs: Removed unused file.
-
-2007-07-31  Ankit Jain  <jankit@novell.com>
-
-       * MakefileGeneratorTool.cs:
-       * MonoDevelop.Autotools.addin.xml: New. Tool for generating makefiles.
-       * Makefile.am: Update.
-       * MonoDevelop.Autotools.mdp: Update.
-
-2007-07-30  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs (ConfiguredPackagesManager.ReadPackagesList): Handle
-	[] used for quoting m4 strings.
-
-2007-07-30  Ankit Jain  <jankit@novell.com>
-
-	* SimpleProjectMakefileHandler.cs (Deploy): Make prefix for REFERENCES
-	variable consistent with other ref variables.
-	Fix emitted path for DLL_REFERENCES to be compatible with makefile integration.
-	* SolutionDeployer.cs (CreateConfigureDotAC): Use @defaultConf.	
-	* templates/Makefile.include: Update to add prefix for REFERENCES (when required).
-	* templates/configure.template: Small fix.
-
-2007-07-25  Ankit Jain  <jankit@novell.com>
-
-	* templates/configure.template: Don't use "\n" or "\t" in echo-s, sh doesn't
-	seem to be able to handle them.
-
-2007-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml, MonoDevelop.Autotools.mdp,
-	  gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs,
-	  gtk-gui/gui.stetic: Cosmetic fixes.
-
-2007-07-25  Ankit Jain  <jankit@novell.com>
-
-	* SimpleProjectMakefileHandler.cs (Deploy): 'chmod +x' exe-wrappers.
-	Ensure that .in files are regen'ed on configure.
-
-2007-07-25  Ankit Jain  <jankit@novell.com>
-
-	* GenerateMakefilesDialog.cs:
-	* gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs:
-	* gtk-gui/gui.stetic:
-	Use radio buttons instead of a checkbox.
-	* templates/configure.template: Improve message.
-
-2007-07-24  Ankit Jain  <jankit@novell.com>
-
-	* templates/Makefile.noauto.project.template:
-	* templates/Makefile.solution.template:
-	* templates/configure.template:
-	* templates/rules.make:
-	Missed these too :(
-
-2007-07-24  Ankit Jain  <jankit@novell.com>
-
-	* GenerateMakefilesDialog.cs:
-	* gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs:
-	Oops, forgot to commit!
-
-2007-07-24  Ankit Jain  <jankit@novell.com>
-
-	Add support for generating non-autotools (simple) makefiles.
-
-	* SolutionDeployer.cs: Update to use new templates for simple
-	makefiles and generate those.
-	* SolutionMakefileHandler.cs: Likewise.
-	* SimpleProjectMakefileHandler.cs: Likewise.
-
-	* AutotoolsContext.cs (TemplateDir): New.
-	(GetConfigurations): New.
-	(AddGeneratedFile): New.
-	(GetGeneratedFiles): New.
-	* Commands.cs: Ask user whether to generate simple makefiles with
-	GenerateMakefilesDialog.
-	* Handler.cs (GenerateAutotools): New.
-
-	* GenerateMakefilesDialog.cs: New.
-	* gtk-gui/MonoDevelop.Autotools.GenerateMakefilesDialog.cs: New.
-	* TarballBuilderEditorWidget.cs: Add a checkbox for 'Autotools files'.
-	* gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs: New.
-	* gtk-gui/Gui.stetic: Updated.
-
-	* templates/Makefile.am.project.template: Update.
-	* templates/Makefile.noauto.project.template: New. Makefile template for
-	projects.
-	* templates/Makefile.solution.template: New. Simple makefile for top
-	level solution.
-	* templates/configure.template: New. Configure script.
-	* templates/rules.make: New.
-
-	* Makefile.am: Update to include the new files.
-	* MonoDevelop.Autotools.mdp: Likewise.
-	* MonoDevelop.Autotools.addin.xml: Update menu item from 'Generate
-	autotools files' to 'Generate makefiles'.
-
-2007-07-17  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs (PackagedAssemblyNames): Rename to ..
-	(CorePackageAssemblyNames): .. this. This has entries for assemblies
-	from the 'core' package only.
-	* MakefileOptionPanelWidget.cs (CheckRefs): Track changes in api.
-
-2007-07-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SolutionMakefileHandler.cs, AutotoolsContext.cs: Keep track of the
-	  project build sequence in AutotoolsContext. In CalculateSubDirOrder
-	  ignore references to projects built earlier in the build sequence.
-	  Fixes bug #80588. Also, track changes in the Set class.
-	* SimpleProjectMakefileHandler.cs, Set.cs: Set is now a generic class.
-
-2007-07-11  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs (FindConfigureScript): New.
-	(GuessVariables): Try to look for configure.(in|ac) script.
-	(ResetAll): Reset the configure script related widgets also.
-
-2007-07-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileOptionPanelWidget.cs, MakefileData.cs: Load configure.ac in
-	  place of configure.in if it exist.
-	* gtk-gui/objects.xml: Updated.
-
-2007-06-18  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs: On loading a new makefile, try to guess
-	possible variables and prefixes for various lists like files, references etc.
-	If guess'ing fails, then try some usual variable names.
-	When a variable is selected in the combo by the user, try to guess the
-	prefix.
-
-2007-06-18  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs (PackagedAssemblyNames): New. Table for mapping short
-	assembly names (like System.Xml) to their full names.
-	(ParseReferenceAsGac): Use the new PackagedAssemblyNames table. This will
-	help avoid doing Assembly.Load to find full names for names
-	like System.Xml . Speeds up loading for large projects.
-
-2007-06-14  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs (PkgManagerTable): New. A global table to keep weak
-	references to ConfiguredPackagesManager objects.
-	(UpdateProject): Use the new PkgManagerTable.
-	(ConfiguredPackagesManager.LastWriteTime): New.
-
-2007-06-07  Ankit Jain  <jankit@novell.com>
-
-	* AutotoolsContext.cs (NormalizeRelativePath): Moved to Runtime.FileService .
-	Track api change.
-	* SimpleProjectMakefileHandler.cs: Track api change.
-	* SolutionDeployer.cs: Track api change.
-
-2007-05-31  Ankit Jain  <jankit@novell.com>
-
-	* SimpleProjectMakefileHandler.cs: Comment out all .pc file generation
-	related code. It is handled by the deployment infrastructure.
-	* SolutionDeployer.cs (GenerateFiles): Remove code related to .pc file
-	generation.
-
-	SolutionOptionsPanel.cs is not used now.
-	* Makefile.am: Remove SolutionOptionsPanel.cs from the list of files.
-	* MonoDevelop.Autotools.mdp: Likewise
-	* MonoDevelop.Autotools.addin.xml: Remove extensions related to
-	SolutionOptionsPanel.
-
-2007-05-29  Ankit Jain  <jankit@novell.com>
-
-	* SimpleProjectMakefileHandler.cs (Deploy): GetDeployFiles can return
-	duplicates, ignore them. Update code for change in GetProjectConfig.
-	(GetProjectConfig): Look for project's config in ParentCombine's
-	configs.
-
-2007-05-29  Ankit Jain  <jankit@novell.com>
-
-	* SimpleProjectMakefileHandler.cs (Deploy): Enumerate solution level
-	configs, and use the corresponding project config for emitting Makefile.am
-	(GetProjectConfig): New.
-	* AutotoolsContext.cs (EscapeStringForAutoconf): Escape '|' .
-
-2007-05-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.mdp,
-	  gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs,
-	  gtk-gui/gui.stetic: Updated.
-	* Handler.cs: Report an error when the project can't be exported. This
-	  fixes bug #81755.
-	* TarballBuilderEditorWidget.cs: Make it work when the selected root
-	  entry is not a combine.
-
-2007-05-24  Ankit Jain  <jankit@novell.com>
-
-	* SolutionMakefileHandler.cs (Deploy): Emit an empty initializer for
-	EXTRA_DIST in makefiles for projects which have their own directory.
-	Include project specific makefile only if required.
-	* SimpleProjectMakefileHandler.cs (Deploy): Don't emit a project
-	specific *.make file.
-
-	* templates/Makefile.include (EXTRA_DIST): Use = instead of +=.
-	* templates/Project.make.template: Remove the file and move contents .. 
-	* templates/Makefile.am.project.template: .. here.
-	* Makefile.am: Update.
-	* MonoDevelop.Autotools.mdp: Update.
-
-2007-05-24  Ankit Jain  <jankit@novell.com>
-	    Raja R Harinath  <rharinath@novell.com>
-	
-	* SolutionMakefileHandler.cs (Deploy): If a project is in the same
-	directory as the solution, then directly "include" the project specific
-	makefile in the solution's Makefile.am .
-	* SimpleProjectMakefileHandler.cs (Deploy): Treat all assembly
-	references as globalReferencedFiles. Emit path relative to $(BUILD_DIR).
-	Emit deploy-files path relative to project's directory.
-	Emit project specific makefiles.
-	* SolutionDeployer.cs: Normalize paths emitted.
-
-	* AutotoolsContext.cs (AddGlobalReferencedFile): New.
-	* Makefile.cs (Write): Write variables before the "content".
-	* Makefile.am: Add new Project.make.template .
-	* MonoDevelop.Autotools.mdp: Update.
-
-	* templates/Makefile.include (EXTRA_DIST): Use += .
-	(DISTCLEANFILES): Add $(BUILD_DIR)/* . 
-	* templates/Makefile.am.project.template: Add placeholder for including
-	project specific makefile. Move older contents to ..
-	* templates/Project.make.template: .. here.
-
-2007-05-22  Ankit Jain  <jankit@novell.com>
-	    Raja R Harinath  <rharinath@novell.com>
-
-	* SimpleProjectMakefileHandler.cs (Deploy): Emit resgen script name.
-	Emit resourceId if required.
-	* templates/Makefile.include, templates/Makefile.am: Several improvements.
-	Added support for compiling resx resources with custom resource ids.
-
-2007-05-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Removed empty extension element.
-	* PropertyProvider.cs: Added a more complete description of the
-	  IncludeInMakefile property.
-
-2007-05-16  Ankit Jain  <jankit@novell.com>
-
-	* AutotoolsContext.cs (EscapeAndUpperConfigName): New.
-	(EscapeStringForAutoconf): Escape ' ' also.
-	* SolutionMakefileHandler.cs: Use EscapeAndUpperConfigName when emitting
-	config name.
-	* SimpleProjectMakefileHandler.cs: Likewise.
-	* SolutionDeployer.cs: Likewise.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.mdp: Don't copy project references.
-	* Makefile.am: Updated.
-
-2007-05-10  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.Autotools.mdp: Add MonoDevelop.Autotools.addin.xml
-	  back to the file list, but exclude from makefile synching.
-
-2007-05-09  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.Autotools/Makefile.am: Eliminate duplication of 
-	MonoDevelop.Autotools.addin.xml target.
-	Fix dependencies for DATA_FILE_BUILD.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Added missing dependency.
-	* MonoDevelop.Autotools.mdp, Makefile.am: Updated assembly references.
-	* MakefileData.cs: Use top_srcdir to reference files not generated at
-	  build time.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Mono.Addins.mdp: Updated.
-	* Mono.Addins/ExtensionContext.cs: Fixed GetExtensionObjects overload
-	  which was not using the correct reuseCachedInstance value.
-	* Mono.Addins/ExtensionTree.cs: Improved error message. When looking
-	  for a type in an assembly, avoid throwing an exception too early,
-	  since it may be found in other assemblies.
-	* Mono.Addins.Database/AddinDatabase.cs: In the addin info cache, also
-	  store information about unsuccessful lookups, to avoid looking for
-	  an add-in again if we found that it doesn't exist. In Update(),
-	  don't use verbose output by default.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml, MonoDevelop.Autotools.mdp,
-	  SimpleProjectMakefileHandler.cs, gtk-gui/objects.xml, Makefile.am:
-	  Migration to Mono.Addins.
-
-2007-04-28  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MakefileData.cs: Use InvariantCulture for string sorting to stop 
-	  reordering of file lists on different systems.
-
-2007-04-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SolutionMakefileHandler.cs: Make sure that makefiles are generated in
-	  the same order in which they will be built, since there is some
-	  data collected by the context that it is important to get in the
-	  correct order (e.g. list of built files).
-	* Set.cs: Avoid unneeded boxing.
-
-2007-04-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs, SolutionDeployer.cs,
-	  templates/Makefile.include, templates/Makefile.am.project.template,
-	  AutotoolsContext.cs: Fixed several problems in the autotools file
-	  generation. Files to be deployed are now copied to the build
-	  directory (doing the change name if necessary), and they are
-	  installed from there. Fixes bug #81470.
-
-2007-04-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Handler.cs, SolutionDeployer.cs: Fixed CanBuild method. Any combine
-	  entry for which there is a IMakefileHandler can be deployed.
-
-2007-04-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml, MonoDevelop.Autotools.mdp,
-	  MakefileIntegrationFeatureWidget.cs, Handler.cs,
-	  MakefileIntegrationFeature.cs,
-	  gtk-gui/MonoDevelop.Autotools.MakefileIntegrationFeatureWidget.cs,
-	  gtk-gui/objects.xml, gtk-gui/gui.stetic, Makefile.am: Added classes
-	  for supporting a makefile integration project feature, but it is
-	  not yet enabled.
-
-2007-04-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.mdp, Makefile.am: Synchronized project with
-	  makefile.
-	* Handler.cs, SolutionDeployer.cs: Allow creating a tarball from
-	  autotools files already generated, instead of always generating new
-	  files.
-	* MakefileProjectServiceExtension.cs: Include referenced makefiles when
-	  exporting a project.
-	* TarballBuilderEditorWidget.cs, TarballTargetEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Autotools.TarballBuilderEditorWidget.cs,
-	  gtk-gui/gui.stetic: Implemented the tarball configuration editor
-	  using stetic.
-	* gtk-gui/objects.xml: Updated.
-	* MakefileData.cs: Fixed warning.
-
-2007-04-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs, TarballTargetEditorWidget.cs: Track
-	  api changes.
-	* Handler.cs: Track api changes. Added support for exporting a
-	  selection of projects from a solution.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml, Commands.cs,
-	  TarballTargetEditorWidget.cs: Track api changes in deployment api.
-	* MonoDevelop.Autotools.mdp, gtk-gui/gui.stetic, Makefile.am: Added
-	  dependency to MonoDevelop.Deployment.
-	* SolutionMakefileHandler.cs: Allow generating makefiles a combine even
-	  if it contains unsupported projects. Those will be ignored.
-	* SimpleProjectMakefileHandler.cs, Handler.cs, SolutionDeployer.cs,
-	  templates/Makefile.include: Use the new deployment api to get the
-	  list of files to deploy.
-	* FileNodeBuilderExtension.cs, MakefileData.cs: Moved makefile
-	  integration check to MakefileData.
-	* AutotoolsContext.cs: Keep a list of directories to deploy. Store the
-	  DeployContext in a field.
-	* PropertyProvider.cs: New property provider which allows setting the
-	  makefile integration flag for each file.
-	* gtk-gui/objects.xml: Updated.
-
-2007-03-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Handler.cs: Remove unused namespace.
-
-2007-03-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Handler.cs, MonoDevelop.Autotools.addin.xml: Track API changes.
-	* MonoDevelop.Autotools.mdp: Don't local-copy references.
-
-2007-03-29  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs: Ensure reference combos are disabled for
-	non-dotnet projects even when enabling for the first time.
-
-2007-03-28  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs: Disable References combos etc for
-	non-dotnet projects.
-
-2007-03-28  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs (FillCombos): Sort list of variables.
-
-2007-03-28  Ankit Jain  <jankit@novell.com>
-
-	* CustomMakefile.cs (InitVarToValuesDict): Skip blank entries.
-	* MakefileData.cs: Replace StartsWith with direct comparisons for small
-	strings. For references, ignore empty entries.
-	(ParseReference):
-	(GacRefToString): Catch specific exceptions for AssemblyName.GetAssemblyName
-
-2007-03-21  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs (PkgCheckModulesRegex): Fix regex to correctly handle
-	strings like 'PKG_CHECK_MODULES(FOO,foo0 >= 2.4 foo1 foo2)', this should
-	give 3 packages : foo0, foo1 and foo2.
-
-2007-03-04  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* MonoDevelop.Autotools/Handler.cs: make strings translatable.
-
-2007-03-04  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs,
-	* gtk-gui/gui.stetic: make all strings in option panel translatable.
-
-2007-02-28  Ankit Jain <jankit@novell.com> 
-
-	* MakefileData.cs (WriteFiles): Ignore directory entries.
-
-2007-02-22  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs: Disable the AssemblyName and OutputDir
-	combos, as they are not being used right now.
-	* gtk-gui/*: Update.
-
-2007-02-21  Ankit Jain  <jankit@novell.com>
-
-	* CustomMakefile.cs: Avoid adding extra spaces for empty variables.
-
-2007-02-20  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs: Support escaping filenames. Escaping only '\' and '#'
-	currently.
-
-2007-02-20  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs: Ensure that entry boxes for make targets
-	are activated only if required when loading the gui. These should be
-	activated only if a valid makefile is specified.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Autotools.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileProjectServiceExtension.cs: Don't run make if the build
-	  target is not specified.
-	* MonoDevelop.Autotools.addin.xml, FileNodeBuilderExtension.cs,
-	  Commands.cs, MakefileData.cs: Allow excluding a file from the
-	  makefile integration. Added menu option for enabling/disabling the
-	  exclusion.
-	* MakefileOptionPanelWidget.cs,
-	  gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs,
-	  gtk-gui/gui.stetic: Added checkboxes for enabling/disabling
-	  makefile targets.
-	* MonoDevelop.Autotools.mdp, Makefile.am: Added new file.
-
-2007-02-13  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs: Add support for custom regexes for compiler messages.
-	* MakefileOptionPanelWidget.cs: Add widgets for custom regex.
-	* MakefileProjectServiceExtension.cs: Use the new custom regexes
-	MakefileData.
-
-2007-02-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs: Fix spelling.
-
-2007-02-09  Ankit Jain <jankit@novell.com> 
-
-	* MakefileData.cs: Avoid unnecessary add/remove for references.
-
-2007-02-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* CustomMakefile.cs: Avoid adding or removing blank lines around
-	  variables.
-
-2007-02-09  Ankit Jain <jankit@novell.com> 
-
-	* MakefileOptionPanelWidget.cs: Add a null check.
-	* MakefileData.cs: Refactor encodeValues into a property. Initiliaze it
-	  outside UpdateProject.
-
-2007-02-09  Ankit Jain <jankit@novell.com> 
-
-	* MakefileData.cs: Keep the list of references sorted in the makefile.
-	* CustomMakefile.cs: Write to the makefile only if something changed.
-
-2007-02-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileProjectServiceExtension.cs: After reading a project, reset
-	  the needs building flag (to ignore changes done while loading)
-	* Makefile.am: distckeck fixes.
-
-2007-02-08  Ankit Jain <jankit@novell.com> 
-
-	* MakefileData.cs: OutputFileName can be null for generic projects.
-
-2007-02-08  Ankit Jain <jankit@novell.com> 
-
-	* CustomMakefile.cs: Make Regex for makefile variables static.
-
-2007-02-08  Ankit Jain  <jankit@novell.com>
-
-	* MakefileProjectServiceExtension.cs (Load): Resolve project references
-	once the top-level combine has loaded.
-	* MakefileData.cs: Cache gac refererences to prevent repeats. Remove
-	repeats from the project file, if any. Save the makefile after resolving
-	project references.
-	Add only valid assemblies as Gac refs, others could be project references.
-	Prevent repeats for assembly/project references.
-
-2007-02-08  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs (.ctor): Don't set .Sensitive for
-	fileEntryMakefilePath.
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileProjectServiceExtension.cs: Reset the needs building flag
-	  after successfully building a project.
-	* MakefileData.cs: Cosmetic fixes. Remove "./" from relative names, and
-	  keep file lists sorted.
-
-2007-02-07  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs (Store): Save 'disabled' state.
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileProjectServiceExtension.cs: Track api changes. In
-	  GetNeedsBuilding, return what the default implementation provides.
-	* MonoDevelop.Autotools.addin.xml: Unregistered the makefile reader.
-	* MonoDevelop.Autotools.mdp: Minor update.
-
-2007-02-07  Ankit Jain  <jankit@novell.com>
-
-	* CustomMakefile.cs: Fix regex to allow empty variables.
-
-2007-02-07  Ankit Jain  <jankit@novell.com>
-
-	* MakefileData.cs (encodeValues): New. Dictionary to keep track of which
-	variables to encode when emitting.
-	(UpdateProject): Initialize encodeValues.
-	(ReadFilesActual): Keep track of whether encoding is required or not.
-	(ParseReference): Likewise. Alter signature to take a MakefileVar param.
-	(ResolveBuildVars): Add a ref param 'varFound'
-	(WriteFiles): EncodeFilename only if required.
-	(AsmRefToString): Likewise.
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileData.cs: Write the resource id to the makefile only when
-	  really necessary.
-
-2007-02-07  Ankit Jain  <jankit@novell.com>
-
-	* MakefileProjectServiceExtension.cs (ParseOutput): Add a 'baseDir'
-	param.
-	(CreateCompilerErrorFromString): Use baseDir to convert relative paths
-	to absolute.
-
-2007-02-06  Ankit Jain  <jankit@novell.com>
-
-	* MakefileProjectServiceExtension.cs (Execute): New.
-	* MakefileOptionPanelWidget.cs: Add ExecuteTargetName and update.
-	Trim () strings from entry boxes.
-	* gtk-gui/*: Update.
-	* MakefileData.cs (.ctor): Set default value for buildTargetName to "all".
-
-2007-02-06  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanel.cs (CheckNonEmptyFileVar): Remove. Has been moved
-	to MakefileOptionPanelWidget.cs 
-	* MakefileData.cs: Emit resourceId while writing only if atleast one of
-	the resources had it when reading.
-	* CustomMakefile.cs (Save): Remove dead code. Use StreamWriter.Write
-	instead of StreamWriter.WriteLine
-
-2007-02-06  Ankit Jain  <jankit@novell.com>
-
-	* MakefileOptionPanelWidget.cs: Combo boxes for file variables should
-	react to change in 'Sync' checkbox.
-	* gtk-gui/*: Updated.
-
-2007-02-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MakefileOptionPanel.cs, MakefileOptionPanelWidget.cs: Moved all
-	  validation code from MakefileOptionPanel to
-	  MakefileOptionPanelWidget, so it can be reused by the import
-	  dialog.
-	* ImportMakefileDialog.cs: New dialog for importing makefiles.
-	* MonoDevelop.Autotools.addin.xml: Registered new extension.
-	* MonoDevelop.Autotools.mdp, Makefile.am: Added new files.
-	* MakefileReaderExtension.cs: Extension for importing makefiles into
-	  projects.
-	* gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs,
-	  gtk-gui/gui.stetic: Updated.
-	* MakefileProject.cs: New project class.
-
-2007-02-05  Ankit Jain  <jankit@novell.com>
-
-	* MakefileProjectServiceExtension.cs: New.
-	* MakefileData.cs: New.
-	* MakefileVar.cs: New.
-	* CustomMakefile.cs: New.
-	* MakefileOptionPanel.cs: New.
-	* MakefileOptionPanelWidget.cs: New.
-	* gtk-gui/*: New.
-	Initial implementation of support for limited Makefile Integration.
-
-	* Makefile.am: Update.
-	* MonoDevelop.Autotools.addin.xml: Update.
-	* MonoDevelop.Autotools.mdp: Update.
-
-2007-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Handler.cs: Track api changes.
-
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs, SolutionDeployer.cs: Use the
-	  FileService for copying and deleting files.
-
-2006-11-24  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SolutionDeployer.cs: 
-	* AutotoolsContext.cs:
-	escape for periods for autoconf variables besides the version
-	(fixes #79857)
-	* templates/configure.ac.template: add a line to end of file to
-	avoid bug http://www.mail-archive.com/bug-m4@gnu.org/msg01841.html
-
-2006-09-28  Matej Urbas <matej.urbas@gmail.com>
-
-	* SolutionDeployer.cs: fixed the case of autotooling empty projects
-	  i.e. projects with no active configuration.
-	* MonoDevelop.Autotools.mdp: Added...
-
-2006-08-31 Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* SimpleProjectMakefileHandler.cs: Win32 pathing vs autotools fixes.
-	* SolutionDeployer.cs: Win32 pathing vs autotools fixes, syscall workaround.
-	* SolutionMakefileHandler.cs: Win32 pathing fixes.
-
-2006-08-19  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SimpleProjectMakefileHandler.cs: 
-	* SolutionMakefileHandler.cs:
-	don't handle configurations which are not in the top-level deployed
-	solution
-	* SolutionDeployer.cs: provide combine configurations to AutotoolsContext.
-	always provide _LIB autoconf variables
-	* AutotoolsContext.cs: store supported configurations
-	* templates/exe.wrapper.in.template: cd into installed directory
-
-2006-08-14  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SolutionDeployer.cs: 
-	* SimpleProjectMakefileHandler.cs: 
-	* MonoDevelop.Autotools.addin.xml:
-	* templates/Makefile.include:
-	* SolutionOptionsPanel.cs:
-	add support for creating pc files per library
-
-2006-08-04 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs:
-	* templates/Makefile.include:
-	* templates/Makefile.am.project.template: Add support for project files
-	  with the FileCopy build action.
-
-2006-07-17 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* SimpleProjectMakefileHandler.cs: Track changes in the SystemAssemblyService
-	  class.
-
-2006-07-12  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SolutionDeployer.cs: 
-	* templates/package.pc.template: 
-	add Libraries variable
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Handler.cs: Track changes in the deployment api.
-	* MonoDevelop.Autotools.addin.xml: Updated versions.
-
-2006-06-28  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* Makefile.cs: can append values to variables
-	* SolutionDeployer.cs: implement pkgconfig stuff
-	* MonoDevelop.Autotools.addin.xml: add option panel and store pref
-	* templates/package.pc.template: template for pc file
-	* Makefile.am: add new files
-	* SolutionOptionsPanel.cs: new option panel
-
-2006-06-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* TarballTargetEditorWidget.cs: Added null check. Fix the build for
-	  gtk# 2.4.
-
-2006-06-20  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* AutotoolsContext.cs:
-	* templates/Makefile.am.project.template:
-	* SimpleProjectMakefileHandler.cs: copy resources outside of
-	autotools hierarchy into project directory
-	* templates/Makefile.include: include files of 
-	BuildAction.Nothing in distribution
-
-2006-06-19  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SimpleProjectMakefileHandler.cs: 
-	* AutotoolsContext.cs: 
-	* SolutionDeployer.cs: 
-	use the new CombineEntry.Version property
-	* TarballTargetEditorWidget.cs: default to active config
-
-2006-06-16  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SolutionDeployer.cs: Deploy and GenerateFiles can now
-	take a configuration parameter
-	* Makefile.am: added new file.
-	* TarballTargetEditorWidget.cs:
-	* Handler.cs:
-	Add option to set a default configuration at deployment.
-
-2006-06-15  Scott Ellington  <scott.ellington@gmail.com> 
-	
-	* SolutionDeployer.cs: always run autogen.sh on Deploy
-	* templates/Makefile.include: clean up
-
-2006-06-15  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SimpleProjectMakefileHandler.cs:
-	* templates/exe.wrapper.in.template:
-	pass runtime parameters on to exe wrapper
-	* Handler.cs:
-	* SolutionDeployer.cs:
-	* MonoDevelop.Autotools.addin.xml:
-	* Commands.cs:
-	Moved 'make dist' functionality into SolutionDeployer to
-	be consumed by the new IDeployHandler interface and removed
-	'Create Distributable' command.	
-	* Makefile.am: rename DeployHandler to Commands and
-	removed a trailing space.
-
-2006-06-15 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Handler.cs: Implemented a basic IDeployHandler and the
-	  needed support classes.
-	* MonoDevelop.Autotools.addin.xml: Registered the new deploy
-	  handler to the deploy service.
-	* Makefile.am: Added Handler.cs and updated references.
-	
-2006-06-15  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SimpleProjectMakefileHandler.cs:
-	* SolutionDeployer.cs:
-	* templates/Makefile.include:
-	* templates/Makefile.am.project.template:
-	* templates/configure.ac.template:
-	* ISimpleAutotoolsSetup.cs:
-	* AutotoolsContext.cs:
-	* SolutionMakefileHandler.cs:
-	Handle project configurations
-
-2006-06-13  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SimpleProjectMakefileHandler.cs: 
-	remove Console.WriteLine
-	* SolutionDeployer.cs:
-	* MonoDevelop.Autotools.addin.xml:
-	* DeployHandler.cs:
-	* Makefile.am:
-	Add new functionality which wraps 'make dist'
-	and other changes
-
-2006-06-09  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* SimpleProjectMakefileHandler.cs:
-	* SolutionDeployer.cs:
-	* IMakefileHandler.cs:
-	* DeployHandler.cs:
-	* templates/Makefile.include:
-	* templates/Makefile.am.project.template:
-	* Set.cs:
-	* AutotoolsContext.cs:
-	* SolutionMakefileHandler.cs:
-	Add a IProgressMonitor and fixes for various project types.
-
-2006-06-08  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* AutotoolsContext.cs: fix loading of templates to allow readonly
-
-2006-06-07  Scott Ellington  <scott.ellington@gmail.com> 
-
-	* Makefile.am: removed CSharpBinding dll ref
-
-2006-06-05  Scott Ellington  <scott.ellington@gmail.com> 
-
-	Added Autotools Addin.
diff --git a/main/src/addins/MonoDevelop.Autotools/Commands.cs b/main/src/addins/MonoDevelop.Autotools/Commands.cs
index b8c020daf9..556ed2fc07 100644
--- a/main/src/addins/MonoDevelop.Autotools/Commands.cs
+++ b/main/src/addins/MonoDevelop.Autotools/Commands.cs
@@ -39,7 +39,7 @@ namespace MonoDevelop.Autotools
 	{
 		public override bool CanBuildNode (Type dataType)
 		{
-			return typeof (Solution).IsAssignableFrom (dataType) || typeof (SolutionItem).IsAssignableFrom (dataType);
+			return typeof (Solution).IsAssignableFrom (dataType) || typeof (SolutionFolderItem).IsAssignableFrom (dataType);
 		}
 		
 		public override Type CommandHandlerType {
@@ -52,25 +52,25 @@ namespace MonoDevelop.Autotools
 		[CommandHandler (Commands.GenerateFiles)]
 		protected void OnGenerate()
 		{
-			SolutionItem entry = CurrentNode.DataItem as SolutionItem;
+			SolutionFolderItem entry = CurrentNode.DataItem as SolutionFolderItem;
 			Solution solution = CurrentNode.DataItem as Solution;
 			GenerateMakefiles (entry, solution);
 		}
 		
-		internal static void GenerateMakefiles (SolutionItem entry, Solution solution)
+		internal static void GenerateMakefiles (SolutionFolderItem entry, Solution solution)
 		{
 			if (solution == null) {
 				AlertButton generateMakefilesButton = new AlertButton (GettextCatalog.GetString ("_Generate Makefiles"));
 				if (MessageService.AskQuestion (GettextCatalog.GetString ("Generating Makefiles is not supported for single projects. Do you want to generate them for the full solution - '{0}' ?", entry.ParentSolution.Name),
 				                                AlertButton.Cancel,
 				                                generateMakefilesButton) == generateMakefilesButton) 
-					solution = ((SolutionItem)entry).ParentSolution;
+					solution = ((SolutionFolderItem)entry).ParentSolution;
 				else
 					return;
 			}
 
 			DeployContext ctx = null;
-			IProgressMonitor monitor = null;
+			ProgressMonitor monitor = null;
 
 			GenerateMakefilesDialog dialog = new GenerateMakefilesDialog (solution);
 			try {
diff --git a/main/src/addins/MonoDevelop.Autotools/FileNodeBuilderExtension.cs b/main/src/addins/MonoDevelop.Autotools/FileNodeBuilderExtension.cs
index c586f3681e..882ea0a81e 100644
--- a/main/src/addins/MonoDevelop.Autotools/FileNodeBuilderExtension.cs
+++ b/main/src/addins/MonoDevelop.Autotools/FileNodeBuilderExtension.cs
@@ -22,8 +22,6 @@ namespace MonoDevelop.Autotools
 	
 	class FileNodeCommandHandler: NodeCommandHandler
 	{
-		const string infoProperty = "MonoDevelop.Autotools.MakefileInfo";
-		
 		[CommandHandler (Commands.SynchWithMakefile)]
 		[AllowMultiSelection]
 		public void OnExclude ()
@@ -34,7 +32,7 @@ namespace MonoDevelop.Autotools
 			foreach (ITreeNavigator node in CurrentNodes) {
 				ProjectFile file = (ProjectFile) node.DataItem;
 				if (file.Project != null) {
-					MakefileData data = file.Project.ExtendedProperties [infoProperty] as MakefileData;
+					MakefileData data = file.Project.GetMakefileData ();
 					if (data != null && data.IsFileIntegrationEnabled (file.BuildAction)) {
 						if (data.IsFileExcluded (file.FilePath)) {
 							allChecked = false;
@@ -44,20 +42,20 @@ namespace MonoDevelop.Autotools
 				}
 			}
 			
-			Set<SolutionEntityItem> projects = new Set<SolutionEntityItem> ();
+			Set<SolutionItem> projects = new Set<SolutionItem> ();
 			
 			foreach (ITreeNavigator node in CurrentNodes) {
 				ProjectFile file = (ProjectFile) node.DataItem;
 				if (file.Project != null) {
 					projects.Add (file.Project);
-					MakefileData data = file.Project.ExtendedProperties [infoProperty] as MakefileData;
+					MakefileData data = file.Project.GetMakefileData ();
 					if (data != null && data.IntegrationEnabled) {
 						data.SetFileExcluded (file.FilePath, allChecked);
 					}
 				}
 			}
 				
-			IdeApp.ProjectOperations.Save (projects);
+			IdeApp.ProjectOperations.SaveAsync (projects);
 		}
 		
 		[CommandUpdateHandler (Commands.SynchWithMakefile)]
@@ -71,7 +69,7 @@ namespace MonoDevelop.Autotools
 			foreach (ITreeNavigator node in CurrentNodes) {
 				ProjectFile file = (ProjectFile) node.DataItem;
 				if (file.Project != null) {
-					MakefileData data = file.Project.ExtendedProperties [infoProperty] as MakefileData;
+					MakefileData data = file.Project.GetMakefileData ();
 					if (data != null && data.IsFileIntegrationEnabled (file.BuildAction)) {
 						anyEnabled = true;
 						if (!data.IsFileExcluded (file.FilePath)) {
diff --git a/main/src/addins/MonoDevelop.Autotools/Handler.cs b/main/src/addins/MonoDevelop.Autotools/Handler.cs
index ccf029a7bd..a8622a6c59 100644
--- a/main/src/addins/MonoDevelop.Autotools/Handler.cs
+++ b/main/src/addins/MonoDevelop.Autotools/Handler.cs
@@ -76,18 +76,18 @@ namespace MonoDevelop.Autotools
 			set { defaultConfig = value; }
 		}
 
-		public override bool CanBuild (SolutionItem entry)
+		public override bool CanBuild (SolutionFolderItem entry)
 		{
 			SolutionDeployer deployer = new SolutionDeployer (generateAutotools);
 			return deployer.CanDeploy ( entry );
 		}
 		
-		public override void InitializeSettings (SolutionItem entry)
+		public override void InitializeSettings (SolutionFolderItem entry)
 		{
 			if (string.IsNullOrEmpty (targetDir))
 				targetDir = entry.BaseDirectory;
 			if (string.IsNullOrEmpty (defaultConfig)) {
-				SolutionEntityItem se = entry as SolutionEntityItem;
+				SolutionItem se = entry as SolutionItem;
 				defaultConfig = se != null ? se.GetConfigurations () [0] : null;
 			}
 			if (File.Exists (Path.Combine (entry.BaseDirectory, "autogen.sh")) ||
@@ -99,18 +99,18 @@ namespace MonoDevelop.Autotools
 		}
 
 		
-		protected override bool OnBuild (IProgressMonitor monitor, DeployContext ctx)
+		protected override bool OnBuild (ProgressMonitor monitor, DeployContext ctx)
 		{
 			string tmpFolder = FileService.CreateTempDirectory ();
 			Solution solution = null;
-			SolutionItem entry = RootSolutionItem;
+			SolutionFolderItem entry = RootSolutionItem;
 			
 			try {
 				if (generateFiles) {
 					List<string> childEntries = new List<string> ();
 					if (entry is SolutionFolder) {
-						SolutionItem[] ents = GetChildEntries ();
-						foreach (SolutionItem it in ents)
+						SolutionFolderItem[] ents = GetChildEntries ();
+						foreach (SolutionFolderItem it in ents)
 							childEntries.Add (it.ItemId);
 					}
 					else {
@@ -123,22 +123,21 @@ namespace MonoDevelop.Autotools
 					if (entry is SolutionFolder)
 						sourceFile = entry.ParentSolution.FileName;
 					else
-						sourceFile = ((SolutionEntityItem)entry).FileName;
+						sourceFile = ((SolutionItem)entry).FileName;
 					
-					string efile = Services.ProjectService.Export (new FilteredProgressMonitor (monitor), sourceFile, childEntries.ToArray (), tmpFolder, null);
+					string efile = Services.ProjectService.Export (new FilteredProgressMonitor (monitor), sourceFile, childEntries.ToArray (), tmpFolder, null).Result;
 					if (efile == null) {
 						monitor.ReportError (GettextCatalog.GetString ("The project could not be exported."), null);
 						return false;
 					}
-					solution = Services.ProjectService.ReadWorkspaceItem (new NullProgressMonitor (), efile) as Solution;
+					solution = Services.ProjectService.ReadWorkspaceItem (new ProgressMonitor (), efile).Result as Solution;
 				}
 				else {
 					solution = entry.ParentSolution;
 				}
 				
-				solution.Build (monitor, (SolutionConfigurationSelector) defaultConfig);
-			
-				if (monitor.IsCancelRequested || !monitor.AsyncOperation.Success)
+				var res = solution.Build (monitor, (SolutionConfigurationSelector) defaultConfig).Result;
+				if (res.HasErrors || monitor.CancellationToken.IsCancellationRequested)
 					return false;
 			
 				SolutionDeployer deployer = new SolutionDeployer (generateAutotools);
diff --git a/main/src/addins/MonoDevelop.Autotools/IMakefileHandler.cs b/main/src/addins/MonoDevelop.Autotools/IMakefileHandler.cs
index ac4a8ed108..31c6b18ccc 100644
--- a/main/src/addins/MonoDevelop.Autotools/IMakefileHandler.cs
+++ b/main/src/addins/MonoDevelop.Autotools/IMakefileHandler.cs
@@ -29,9 +29,9 @@ namespace MonoDevelop.Autotools
 {
 	public interface IMakefileHandler
 	{
-		bool CanDeploy (SolutionItem entry, MakefileType type);
+		bool CanDeploy (SolutionFolderItem entry, MakefileType type);
 
-		Makefile Deploy (AutotoolsContext ctx, SolutionItem entry, IProgressMonitor monitor);
+		Makefile Deploy (AutotoolsContext ctx, SolutionFolderItem entry, ProgressMonitor monitor);
 	}
 	
 	public enum MakefileType
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
index 8101bcfe67..a11cb8d733 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
@@ -38,10 +38,12 @@ using MonoDevelop.Core.Serialization;
 using MonoDevelop.Projects;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Ide;
+using System.Xml;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Autotools
 {
-	[DataItem ("MakefileInfo")]
+	[DataItem ("MonoDevelop.Autotools.MakefileInfo")]
 	public class MakefileData : ICloneable
 	{
 		bool integrationEnabled;
@@ -70,6 +72,25 @@ namespace MonoDevelop.Autotools
 			if (assemblyContext == null)
 				integrationEnabled = false;
 		}
+
+		public static MakefileData Read (XmlElement ext)
+		{
+			XmlDataSerializer ser = new XmlDataSerializer (new DataContext ());
+			return (MakefileData) ser.Deserialize (new XmlNodeReader (ext), typeof(MakefileData));
+		}
+
+		public XmlElement Write ()
+		{
+			XmlDataSerializer ser = new XmlDataSerializer (new DataContext ());
+			ser.Namespace = MSBuildProject.Schema;
+			var sw = new StringWriter ();
+			ser.Serialize (new XmlTextWriter (sw), this);
+			XmlDocument doc = new XmlDocument ();
+			doc.LoadXml (sw.ToString ());
+			var elem = doc.DocumentElement;
+			doc.RemoveChild (elem);
+			return elem;
+		}
 		
 		internal static IAssemblyContext GetMonoRuntimeContext ()
 		{
@@ -613,7 +634,7 @@ namespace MonoDevelop.Autotools
 			return customRegex [index];
 		}
 
-		IProgressMonitor monitor = null;
+		ProgressMonitor monitor = null;
 
 		// VarName -> Encode filenames Eg. $(srcdir)
 		Dictionary<string, bool> encodeValues;
@@ -651,7 +672,7 @@ namespace MonoDevelop.Autotools
 		}
 
 		//use events.. 
-		public void UpdateProject (IProgressMonitor monitor, bool promptForRemoval)
+		public void UpdateProject (ProgressMonitor monitor, bool promptForRemoval)
 		{
 			if (!IntegrationEnabled)
 				return;
@@ -1170,14 +1191,14 @@ namespace MonoDevelop.Autotools
 
 		ProjectReference AddNewPackageReference (DotNetProject project, SystemAssembly sa)
 		{
-			ProjectReference pref = new ProjectReference (sa);
+			ProjectReference pref = ProjectReference.CreateAssemblyReference (sa);
 			project.References.Add (pref);
 			newPackageRefs [sa.Location] = pref;
 
 			return pref;
 		}
 
-		public static void ResolveProjectReferences (SolutionFolder folder, IProgressMonitor monitor)
+		public static void ResolveProjectReferences (SolutionFolder folder, ProgressMonitor monitor)
 		{
 			Dictionary<string, DotNetProject> projects = new Dictionary<string, DotNetProject> ();
 			foreach (DotNetProject p in folder.GetAllItems<DotNetProject> ()) {
@@ -1188,7 +1209,7 @@ namespace MonoDevelop.Autotools
 			}
 
 			foreach (DotNetProject sproj in projects.Values) {
-				MakefileData mdata = sproj.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;
+				MakefileData mdata = sproj.GetMakefileData ();
 				if (mdata == null)
 					continue;
 
@@ -1216,7 +1237,7 @@ namespace MonoDevelop.Autotools
 						} else {
 							// Try as a project ref
 							if (projects.ContainsKey (refstr)) {
-								sproj.References.Add (new ProjectReference (projects [refstr]));
+								sproj.References.Add (ProjectReference.CreateProjectReference (projects [refstr]));
 								toRemove.Add (refstr);
 							}
 						}
@@ -1227,7 +1248,7 @@ namespace MonoDevelop.Autotools
 
 					// Add all remaining unresolved refs as Assembly refs
 					foreach (string s in mdata.UnresolvedReferences.Keys)
-						sproj.References.Add (new ProjectReference (ReferenceType.Assembly, s));
+						sproj.References.Add (ProjectReference.CreateAssemblyFileReference (s));
 						
 					// Remove asm/project refs not found in UnresolvedReferences
 					foreach (ProjectReference pr in asmProjectRefs.Values)
@@ -1325,7 +1346,7 @@ namespace MonoDevelop.Autotools
 
 		//Writing methods
 
-		public void UpdateMakefile (IProgressMonitor monitor)
+		public void UpdateMakefile (ProgressMonitor monitor)
 		{
 			//FIXME: AssemblyName & OutputDir
 
@@ -1839,4 +1860,20 @@ namespace MonoDevelop.Autotools
 			this.Name = name;
 		}
 	}
+
+	internal static class MakefileDataExtension
+	{
+		public static MakefileData GetMakefileData (this Project project)
+		{
+			var ex = project.GetService<MakefileProjectExtension> ();
+			return ex != null ? ex.MakefileData : null;
+		}
+
+		public static void SetMakefileData (this Project project, MakefileData data)
+		{
+			var ex = project.GetService<MakefileProjectExtension> ();
+			if (ex != null)
+				ex.MakefileData = data;
+		}
+	}
 }
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileGeneratorTool.cs b/main/src/addins/MonoDevelop.Autotools/MakefileGeneratorTool.cs
index 8c483aff93..efa1f2e142 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileGeneratorTool.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileGeneratorTool.cs
@@ -4,6 +4,7 @@ using MonoDevelop.Core.ProgressMonitoring;
 using MonoDevelop.Core;
 using MonoDevelop.Deployment;
 using MonoDevelop.Projects;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Autotools
 {
@@ -13,7 +14,7 @@ namespace MonoDevelop.Autotools
 		string defaultConfig = null;
 		string filename = null;
 
-		public int Run (string [] arguments)
+		public async Task<int> Run (string [] arguments)
 		{
 			Console.WriteLine ("MonoDevelop Makefile generator");
 			if (arguments.Length == 0) {
@@ -50,7 +51,7 @@ namespace MonoDevelop.Autotools
 			Console.WriteLine (GettextCatalog.GetString ("Loading solution file {0}", filename));
 			ConsoleProgressMonitor monitor = new ConsoleProgressMonitor ();
 			
-			Solution solution = Services.ProjectService.ReadWorkspaceItem (monitor, filename) as Solution;
+			Solution solution = await Services.ProjectService.ReadWorkspaceItem (monitor, filename) as Solution;
 			if (solution == null) {
 				Console.WriteLine (GettextCatalog.GetString ("Error: Makefile generation supported only for solutions.\n"));
 				return 1;
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanel.cs b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanel.cs
index aad187c6ef..598bcd1d1d 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanel.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanel.cs
@@ -1,5 +1,5 @@
 
-using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Projects;
 
@@ -13,10 +13,10 @@ namespace MonoDevelop.Autotools
 		{
 		}
 
-		public override Widget CreatePanelWidget()
+		public override Control CreatePanelWidget()
 		{
 			Project project = ConfiguredProject;
-			MakefileData data = project.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;
+			MakefileData data = project.GetMakefileData ();
 
 			MakefileData tmpData = null;
 			if (data != null) {
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
index 58a156eaef..2b8e9474df 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
@@ -205,7 +205,7 @@ namespace MonoDevelop.Autotools
 			
 			// Data validation
 
-			MakefileData oldData = project.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;
+			MakefileData oldData = project.GetMakefileData ();
 			MakefileData tmpData = data;
 
 			if (tmpData.IntegrationEnabled) {
@@ -266,9 +266,9 @@ namespace MonoDevelop.Autotools
 				}
 
 				//FIXME: Do this only if there are changes b/w tmpData and Data
-				project.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] = tmpData;
+				project.SetMakefileData (tmpData);
 
-				using (IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (
+				using (ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (
 					GettextCatalog.GetString ("Updating project"), "gtk-run", true)) {
 
 					tmpData.UpdateProject (monitor, oldData == null || (!oldData.IntegrationEnabled && tmpData.IntegrationEnabled));
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileProject.cs b/main/src/addins/MonoDevelop.Autotools/MakefileProject.cs
index 91dd984bd9..f2fb5fec65 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileProject.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileProject.cs
@@ -11,20 +11,22 @@ namespace MonoDevelop.Autotools
 		{
 		}
 		
-		public override SolutionItemConfiguration CreateConfiguration (string name)
+		protected override SolutionItemConfiguration OnCreateConfiguration (string id, ConfigurationKind kind)
 		{
-			MakefileProjectConfiguration conf = new MakefileProjectConfiguration ();
-			conf.Name = name;
-			return conf;
+			return new MakefileProjectConfiguration (id);
 		}
-		
-		public override IEnumerable<string> GetProjectTypes ()
+
+		protected override void OnGetTypeTags (HashSet<string> types)
 		{
-			yield return "MakefileProject";
+			base.OnGetTypeTags (types);
+			types.Add ("MakefileProject");
 		}
 	}
 	
 	public class MakefileProjectConfiguration: ProjectConfiguration
 	{
+		public MakefileProjectConfiguration (string id) : base (id)
+		{
+		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
index 5c71be9a49..7c39600a08 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
@@ -38,89 +38,96 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Autotools
 {
-	public class MakefileProjectServiceExtension : ProjectServiceExtension
+	public class MakefileProjectServiceExtension : SolutionExtension
 	{
-		public override WorkspaceItem LoadWorkspaceItem (IProgressMonitor monitor, string fileName)
+		protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.SlnFile file)
 		{
-			WorkspaceItem item = base.LoadWorkspaceItem (monitor, fileName);
-			
-			Solution sol = item as Solution;
-			if (sol != null) {
-				//Resolve project references
-				try {
-					MakefileData.ResolveProjectReferences (sol.RootFolder, monitor);
-				} catch (Exception e) {
-					LoggingService.LogError (GettextCatalog.GetString (
-						"Error resolving Makefile based project references for solution {0}", sol.Name), e);
-					monitor.ReportError (GettextCatalog.GetString (
-						"Error resolving Makefile based project references for solution {0}", sol.Name), e);
-				}
+			base.OnReadSolution (monitor, file);
+
+			//Resolve project references
+			try {
+				MakefileData.ResolveProjectReferences (Solution.RootFolder, monitor);
+			} catch (Exception e) {
+				LoggingService.LogError (GettextCatalog.GetString (
+					"Error resolving Makefile based project references for solution {0}", Solution.Name), e);
+				monitor.ReportError (GettextCatalog.GetString (
+					"Error resolving Makefile based project references for solution {0}", Solution.Name), e);
 			}
-			
-			return item;
+
+			// All done, dispose myself
+			Dispose ();
 		}
+	}
 
-		
-		protected override SolutionEntityItem LoadSolutionItem (IProgressMonitor monitor, string fileName)
+	public class MakefileProjectExtension: ProjectExtension
+	{
+		MakefileData data;
+
+		public MakefileProjectExtension ()
 		{
-			SolutionEntityItem entry = base.LoadSolutionItem (monitor, fileName);
-			if (entry == null)
-				return null;
-			
-			Project project = entry as Project;
-			if (project == null)
-				return entry;
+		}
 
-			//Project
-			MakefileData data = entry.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;
+		public MakefileData MakefileData {
+			get { return data; }
+			set { data = value; }
+		}
+
+		protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
+		{
+			base.OnReadProject (monitor, msproject);
+			var ext = msproject.GetMonoDevelopProjectExtension ("MonoDevelop.Autotools.MakefileInfo");
+			if (ext == null)
+				return;
+
+			data = MakefileData.Read (ext);
 			if (data == null)
-				return entry;
+				return;
 
 			monitor.BeginTask (GettextCatalog.GetString ("Updating project from Makefile"), 1);
 			try { 
-				data.OwnerProject = project;

+				data.OwnerProject = Project;
 				if (data.SupportsIntegration)
 					data.UpdateProject (monitor, false);
 				monitor.Step (1);
 			} catch (Exception e) {
 				monitor.ReportError (GettextCatalog.GetString (
-					"Error loading Makefile for project {0}", project.Name), e);
+					"\tError loading Makefile for project {0}", Project.Name), e);
 			} finally {
 				monitor.EndTask ();
 			}
-			return entry;
 		}
 
-		public override void Save (IProgressMonitor monitor, SolutionEntityItem entry)
+		protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
 		{
-			base.Save (monitor, entry);
-			
-			Project project = entry as Project;
-			if (project == null)
-				return;
-				
-			MakefileData data = project.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;

-			if (data == null || !data.SupportsIntegration)
+			base.OnWriteProject (monitor, msproject);
+
+			if (data == null)
 				return;
 
+			msproject.SetMonoDevelopProjectExtension ("MonoDevelop.Autotools.MakefileInfo", data.Write ());
+
+			if (!data.SupportsIntegration)
+				return;
+			
 			try {
 				data.UpdateMakefile (monitor);
 			} catch (Exception e) {
 				LoggingService.LogError (GettextCatalog.GetString ("Error saving to Makefile ({0}) for project {1}",
-					data.AbsoluteMakefileName, project.Name, e));
+					data.AbsoluteMakefileName, Project.Name, e));
 				monitor.ReportError (GettextCatalog.GetString (
-					"Error saving to Makefile ({0}) for project {1}", data.AbsoluteMakefileName, project.Name), e);
+					"Error saving to Makefile ({0}) for project {1}", data.AbsoluteMakefileName, Project.Name), e);
 			}
 		}

 

-		public override List<FilePath> GetItemFiles (SolutionEntityItem entry, bool includeReferencedFiles)
+		protected override IEnumerable<FilePath> OnGetItemFiles (bool includeReferencedFiles)
 		{

-			List<FilePath> col = base.GetItemFiles (entry, includeReferencedFiles);
+			List<FilePath> col = base.OnGetItemFiles (includeReferencedFiles).ToList ();
 			
-			MakefileData data = entry.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;

 			if (data == null || !data.SupportsIntegration || string.IsNullOrEmpty (data.AbsoluteMakefileName))
 				return col;
 			
@@ -136,31 +143,20 @@ namespace MonoDevelop.Autotools
 		}
 
 
-		//TODO
-		protected override bool GetNeedsBuilding (SolutionEntityItem entry, ConfigurationSelector configuration)
-		{
-			return base.GetNeedsBuilding (entry, configuration);
-		}
-
 		//FIXME: Check whether autogen.sh is required or not
-		protected override BuildResult Build (IProgressMonitor monitor, SolutionEntityItem entry, ConfigurationSelector configuration)
+		protected async override Task<BuildResult> OnBuild (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext)
 		{
-			Project project = entry as Project;
-			if (project == null)
-				return base.Build (monitor, entry, configuration);
-
-			MakefileData data = project.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;

 			if (data == null || !data.SupportsIntegration || String.IsNullOrEmpty (data.BuildTargetName))
-				return base.Build (monitor, entry, configuration);
+				return await base.OnBuild (monitor, configuration, operationContext);
 
 			//FIXME: Gen autofoo ? autoreconf?
 
 			string output = String.Empty;
 			int exitCode = 0;
-			monitor.BeginTask (GettextCatalog.GetString ("Building {0}", project.Name), 1);
+			monitor.BeginTask (GettextCatalog.GetString ("Building {0}", Project.Name), 1);
 			try
 			{
-				string baseDir = project.BaseDirectory;
+				string baseDir = Project.BaseDirectory;
 				string args = string.Format ("-j {0} {1}", data.ParallelProcesses, data.BuildTargetName);
 	
 				using (var swOutput = new StringWriter ()) {
@@ -174,7 +170,8 @@ namespace MonoDevelop.Autotools
 								chainedOutput, 
 								chainedOutput,
 							null)) {
-							process.WaitForOutput ();
+
+							await process.Task;
 
 							chainedOutput.UnchainWriter (monitor.Log);
 							chainedOutput.UnchainWriter (swOutput);
@@ -200,7 +197,7 @@ namespace MonoDevelop.Autotools
 			Regex regexError = data.GetErrorRegex (false);
 			Regex regexWarning = data.GetWarningRegex (false);
 
-			BuildResult cr = ParseOutput (tf, output, project.BaseDirectory, regexError, regexWarning);
+			BuildResult cr = ParseOutput (tf, output, Project.BaseDirectory, regexError, regexWarning);
 			if (exitCode != 0 && cr.FailedBuildCount == 0)
 				cr.AddError (GettextCatalog.GetString ("Build failed. See Build Output panel."));
 
@@ -330,24 +327,16 @@ namespace MonoDevelop.Autotools
 				return null;
 		}
 
-		protected override void Clean (IProgressMonitor monitor, SolutionEntityItem entry, ConfigurationSelector configuration)
+		protected async override Task<BuildResult> OnClean (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext)
 		{
-			Project proj = entry as Project;
-			if (proj == null) {
-				base.Clean (monitor, entry, configuration);
-				return;
-			}
-
-			MakefileData data = proj.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;

 			if (data == null || !data.SupportsIntegration || String.IsNullOrEmpty (data.CleanTargetName)) {
-				base.Clean (monitor, entry, configuration); 
-				return;
+				return await base.OnClean (monitor, configuration, operationContext); 
 			}
 
 			monitor.BeginTask ( GettextCatalog.GetString( "Cleaning project"), 1);
 			try
 			{
-				string baseDir = proj.BaseDirectory;
+				string baseDir = Project.BaseDirectory;
 	
 				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make", 
 						data.CleanTargetName,
@@ -355,7 +344,8 @@ namespace MonoDevelop.Autotools
 						monitor.Log, 
 						monitor.Log, 
 						null );
-				process.WaitForOutput ();
+
+				await process.Task;
 
 				if ( process.ExitCode > 0 )
 					throw new Exception ( GettextCatalog.GetString ("An unspecified error occurred while running '{0}'", "make " + data.CleanTargetName) );
@@ -365,52 +355,45 @@ namespace MonoDevelop.Autotools
 			catch ( Exception e )
 			{
 				monitor.ReportError ( GettextCatalog.GetString ("Project could not be cleaned: "), e );
-				return;
+				var res = new BuildResult ();
+				res.AddError (GettextCatalog.GetString ("Project could not be cleaned: ") + e.Message);
+				return res;
 			}
 			finally 
 			{
 				monitor.EndTask ();
 			}
 			monitor.ReportSuccess ( GettextCatalog.GetString ( "Project successfully cleaned"));
+			return BuildResult.CreateSuccess ();
 		}
 
-		protected override bool CanExecute (SolutionEntityItem item, ExecutionContext context, ConfigurationSelector configuration)
+		protected override bool OnGetCanExecute (ExecutionContext context, ConfigurationSelector configuration)
 		{
-			Project project = item as Project;
-			if (project != null) {
-				MakefileData data = project.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;

-				if (data != null && data.SupportsIntegration && !String.IsNullOrEmpty (data.ExecuteTargetName))
-					return true;
-			}
-			return base.CanExecute (item, context, configuration);
+			if (data != null && data.SupportsIntegration && !String.IsNullOrEmpty (data.ExecuteTargetName))
+				return true;
+			return base.OnGetCanExecute (context, configuration);
 		}
 
 
-		protected override void Execute (IProgressMonitor monitor, SolutionEntityItem entry, ExecutionContext context, ConfigurationSelector configuration)
+		protected async override Task OnExecute (ProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
 		{
-			Project project = entry as Project;
-			if (project == null) {
-				base.Execute (monitor, entry, context, configuration);
-				return;
-			}
-
-			MakefileData data = project.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;

 			if (data == null || !data.SupportsIntegration || String.IsNullOrEmpty (data.ExecuteTargetName)) {
-				base.Execute (monitor, entry, context, configuration);
+				await base.OnExecute (monitor, context, configuration);
 				return;
 			}
 
-			IConsole console = context.ConsoleFactory.CreateConsole (true);
-			monitor.BeginTask (GettextCatalog.GetString ("Executing {0}", project.Name), 1);
+			OperationConsole console = context.ConsoleFactory.CreateConsole ();
+			monitor.BeginTask (GettextCatalog.GetString ("Executing {0}", Project.Name), 1);
 			try
 			{
 				ProcessWrapper process = Runtime.ProcessService.StartProcess ("make",
-						data.ExecuteTargetName,
-						project.BaseDirectory,
-						console.Out,
-						console.Error,
-						null);
-				process.WaitForOutput ();
+					data.ExecuteTargetName,
+					Project.BaseDirectory,
+					console.Out,
+					console.Error,
+					null);
+
+				await process.Task;
 
 				monitor.Log.WriteLine (GettextCatalog.GetString ("The application exited with code: {0}", process.ExitCode));
 				monitor.Step (1);
diff --git a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml
index adf5f61704..c79817c2a0 100644
--- a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml
+++ b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml
@@ -23,9 +23,10 @@
 		<NodeBuilder id = "AutotoolNodeExtension" class = "MonoDevelop.Autotools.NodeExtension"/>
 	</Extension>
 
-	<Extension path = "/MonoDevelop/ProjectModel/ProjectServiceExtensions">
+	<Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions">
 		<Condition id="Platform" value="!windows">
-			<Class class = "MonoDevelop.Autotools.MakefileProjectServiceExtension" id="MakefileProjectServiceExtension" insertafter="FinalStep"/>
+			<Class class = "MonoDevelop.Autotools.MakefileProjectServiceExtension" insertafter="FinalStep"/>
+			<Class class = "MonoDevelop.Autotools.MakefileProjectExtension" insertafter="FinalStep"/>
 		</Condition>
 	</Extension>
 
@@ -99,11 +100,6 @@
 		</Condition>
 	</Extension>
 
-	<Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
-		<ItemProperty class = "MonoDevelop.Projects.Project"
-			name = "MonoDevelop.Autotools.MakefileInfo" type = "MonoDevelop.Autotools.MakefileData" />
-	</Extension>
-
 	<Extension path = "/MonoDevelop/DesignerSupport/PropertyProviders">
 		<Condition id="Platform" value="!windows">
 			<Class class = "MonoDevelop.Autotools.PropertyProvider"/>
diff --git a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj
index b36b6287f8..4250661754 100644
--- a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj
+++ b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.csproj
@@ -85,6 +85,7 @@
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
diff --git a/main/src/addins/MonoDevelop.Autotools/PropertyProvider.cs b/main/src/addins/MonoDevelop.Autotools/PropertyProvider.cs
index ef96d97d0f..368ce87e2f 100644
--- a/main/src/addins/MonoDevelop.Autotools/PropertyProvider.cs
+++ b/main/src/addins/MonoDevelop.Autotools/PropertyProvider.cs
@@ -12,7 +12,7 @@ namespace MonoDevelop.Autotools
 		{
 			ProjectFile file = obj as ProjectFile;
 			if (file != null && file.Project != null) {
-				MakefileData data = file.Project.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;
+				MakefileData data = file.Project.GetMakefileData ();
 				if (data != null && data.IsFileIntegrationEnabled (file.BuildAction))
 					return true;
 			}
@@ -33,7 +33,7 @@ namespace MonoDevelop.Autotools
 		public ProjectFileWrapper (ProjectFile file)
 		{
 			this.file = file;
-			data = file.Project.ExtendedProperties ["MonoDevelop.Autotools.MakefileInfo"] as MakefileData;
+			data = file.Project.GetMakefileData ();
 		}
 		
 		[LocalizedCategory ("Makefile Integration")]
diff --git a/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs b/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
index 6f4d39496f..74f91b4895 100644
--- a/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
+++ b/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
@@ -71,7 +71,7 @@ namespace MonoDevelop.Autotools
 		// store all refs for easy access
 		Set<SystemPackage> pkgs;
 
-		public bool CanDeploy (SolutionItem entry, MakefileType type)
+		public bool CanDeploy (SolutionFolderItem entry, MakefileType type)
 		{
 			Project project = entry as Project;
 			if ( project == null ) return false;
@@ -89,7 +89,7 @@ namespace MonoDevelop.Autotools
 			return null;
 		}
 
-		public Makefile Deploy (AutotoolsContext ctx, SolutionItem entry, IProgressMonitor monitor)
+		public Makefile Deploy (AutotoolsContext ctx, SolutionFolderItem entry, ProgressMonitor monitor)
 		{
 			generateAutotools = ctx.MakefileType == MakefileType.AutotoolsMakefile;
 			
@@ -268,7 +268,7 @@ namespace MonoDevelop.Autotools
 					configSection.BuildVariablesBuilder.AppendFormat ("ASSEMBLY = {0}\n",
 						AutotoolsContext.EscapeStringForAutomake (assembly));
 					configSection.BuildVariablesBuilder.AppendFormat ("ASSEMBLY_MDB = {0}\n",
-						config.DebugMode ? "$(ASSEMBLY).mdb" : String.Empty);
+						config.DebugSymbols ? "$(ASSEMBLY).mdb" : String.Empty);
 
 					string target;
 					switch (config.CompileTarget)
@@ -297,8 +297,10 @@ namespace MonoDevelop.Autotools
 					{
 						if (reference.ReferenceType != ReferenceType.Project)
 							continue;
-						Project refp = GetProjectFromName (reference.Reference, ctx.TargetSolution);
-
+						Project refp = reference.ResolveProject (ctx.TargetSolution);
+						if (refp == null) {
+							throw new Exception (GettextCatalog.GetString ("Couldn't find referenced project '{0}'", reference.Reference));
+						}
 						if (!(refp is DotNetProject))
 							continue;
 						
@@ -324,7 +326,7 @@ namespace MonoDevelop.Autotools
 						ctx.AddBuiltFile (Path.Combine (config.OutputDirectory, bfile));
 
 					DeployFileCollection deployFiles = DeployService.GetDeployFiles (
-							ctx.DeployContext, new SolutionItem[] { project }, config.Selector);
+							ctx.DeployContext, new SolutionFolderItem[] { project }, config.Selector);
 
 					ProcessDeployFilesForConfig (deployFiles, project, configSection, ctx, config);
 					configSections.Add (configSection);
@@ -343,7 +345,7 @@ namespace MonoDevelop.Autotools
 
 					// Register files generated by the compiler
 					ctx.AddBuiltFile (project.GetOutputFileName (combineConfig.Selector));
-					if (config.DebugMode)
+					if (config.DebugSymbols)
 						ctx.AddBuiltFile (project.GetOutputFileName (combineConfig.Selector) + ".mdb");
 
 					if (config.SignAssembly) {
@@ -677,7 +679,7 @@ endif", s.SwitchName.Replace ('-', '_').ToUpperInvariant (), s.Define));
 			return dir;
 		}
 
-		void EmitCustomCommandTargets (CustomCommandCollection commands, Project project, StringBuilder builder, string configName, CustomCommandType[] types, IProgressMonitor monitor)
+		void EmitCustomCommandTargets (CustomCommandCollection commands, Project project, StringBuilder builder, string configName, CustomCommandType[] types, ProgressMonitor monitor)
 		{
 			bool warned = false;
 			configName = configName.ToUpper ();
@@ -735,7 +737,7 @@ endif", s.SwitchName.Replace ('-', '_').ToUpperInvariant (), s.Define));
 		}
 
 		// Get the Project config corresponding to its @parentConfig
-		internal static SolutionItemConfiguration GetProjectConfig (string parentConfig, SolutionEntityItem entry, out bool enabled)
+		internal static SolutionItemConfiguration GetProjectConfig (string parentConfig, SolutionItem entry, out bool enabled)
 		{
 			enabled = false;
 			SolutionConfiguration solutionConfig = entry.ParentSolution.Configurations [parentConfig] as SolutionConfiguration;
@@ -772,18 +774,6 @@ endif", s.SwitchName.Replace ('-', '_').ToUpperInvariant (), s.Define));
 			dict [extName] = filePath;
 			return extName;
 		}
-
-		Project GetProjectFromName (string name, Solution targetSolution)
-		{
-			Project refp = null;
-			if (targetSolution != null) refp = targetSolution.FindProjectByName (name);
-
-			if (refp == null)
-				throw new Exception ( GettextCatalog.GetString ("Couldn't find referenced project '{0}'", 
-							name ) );
-			
-			return refp;
-		}
 	}
 	
 	class DeployFileData
diff --git a/main/src/addins/MonoDevelop.Autotools/SolutionDeployer.cs b/main/src/addins/MonoDevelop.Autotools/SolutionDeployer.cs
index c8388d61c5..52b20478f1 100644
--- a/main/src/addins/MonoDevelop.Autotools/SolutionDeployer.cs
+++ b/main/src/addins/MonoDevelop.Autotools/SolutionDeployer.cs
@@ -71,14 +71,14 @@ namespace MonoDevelop.Autotools
 			}
 		}
 		
-		public bool CanDeploy (SolutionItem entry)
+		public bool CanDeploy (SolutionFolderItem entry)
 		{
 			MakefileType mt = generateAutotools ? MakefileType.AutotoolsMakefile : MakefileType.SimpleMakefile;
 			IMakefileHandler handler = AutotoolsContext.GetMakefileHandler (entry, mt);
 			return handler != null;
 		}
 
-		public bool GenerateFiles (DeployContext ctx, Solution solution, string defaultConf, IProgressMonitor monitor )
+		public bool GenerateFiles (DeployContext ctx, Solution solution, string defaultConf, ProgressMonitor monitor )
 		{
 			string filesString = generateAutotools ? "Autotools files" : "Makefiles";
 			monitor.BeginTask ( GettextCatalog.GetString ("Generating {0} for Solution {1}", filesString, solution.Name), 1 );
@@ -153,7 +153,7 @@ namespace MonoDevelop.Autotools
 			return true;
 		}
 
-		public bool Deploy ( DeployContext ctx, Solution solution, string defaultConf, string targetDir, bool generateFiles, IProgressMonitor monitor  )
+		public bool Deploy ( DeployContext ctx, Solution solution, string defaultConf, string targetDir, bool generateFiles, ProgressMonitor monitor  )
 		{
 			if (generateFiles) {
 				if ( !GenerateFiles ( ctx, solution, defaultConf, monitor ) ) 
@@ -231,7 +231,7 @@ namespace MonoDevelop.Autotools
 				if ( File.Exists ( file ) ) FileService.DeleteFile ( file );
 		}
 
-		void AddTopLevelMakefileVars ( Makefile makefile, IProgressMonitor monitor)
+		void AddTopLevelMakefileVars ( Makefile makefile, ProgressMonitor monitor)
 		{
 			monitor.Log.WriteLine ( GettextCatalog.GetString ("Adding variables to top-level Makefile") );
 
@@ -251,7 +251,7 @@ namespace MonoDevelop.Autotools
 //			makefile.AppendToVariable ( "pkglib_DATA", "$(DLL_REFERENCES)" );
 		}
 
-		void CreateAutoGenDotSH (AutotoolsContext context, IProgressMonitor monitor)
+		void CreateAutoGenDotSH (AutotoolsContext context, ProgressMonitor monitor)
 		{
 			monitor.Log.WriteLine ( GettextCatalog.GetString ("Creating autogen.sh") );
 
@@ -274,7 +274,7 @@ namespace MonoDevelop.Autotools
 				Syscall.chmod ( fileName , FilePermissions.S_IXOTH | FilePermissions.S_IROTH | FilePermissions.S_IRWXU | FilePermissions.S_IRWXG );
 		}
 
-		void CreateConfigureDotAC (Solution solution, string defaultConf, IProgressMonitor monitor, AutotoolsContext context)
+		void CreateConfigureDotAC (Solution solution, string defaultConf, ProgressMonitor monitor, AutotoolsContext context)
 		{
 			monitor.Log.WriteLine ( GettextCatalog.GetString ("Creating configure.ac") );
 			TemplateEngine templateEngine = new TemplateEngine();			
@@ -390,7 +390,7 @@ AM_CONDITIONAL(ENABLE_{3}, test x$enable_{2} = xyes)",
 			context.AddGeneratedFile (configureFileName);
 		}
 
-		void CreateConfigureScript (Solution solution, string defaultConf, AutotoolsContext ctx, IProgressMonitor monitor)
+		void CreateConfigureScript (Solution solution, string defaultConf, AutotoolsContext ctx, ProgressMonitor monitor)
 		{
 			monitor.Log.WriteLine ( GettextCatalog.GetString ("Creating configure script") );
 
@@ -465,7 +465,7 @@ AM_CONDITIONAL(ENABLE_{3}, test x$enable_{2} = xyes)",
 			return builder.ToString ();
 		}
 
-		void CreateMakefileInclude (AutotoolsContext context, IProgressMonitor monitor)
+		void CreateMakefileInclude (AutotoolsContext context, ProgressMonitor monitor)
 		{
 			monitor.Log.WriteLine ( GettextCatalog.GetString ("Creating Makefile.include") );
 			
diff --git a/main/src/addins/MonoDevelop.Autotools/SolutionMakefileHandler.cs b/main/src/addins/MonoDevelop.Autotools/SolutionMakefileHandler.cs
index b31e5ddba0..ab70a6472d 100644
--- a/main/src/addins/MonoDevelop.Autotools/SolutionMakefileHandler.cs
+++ b/main/src/addins/MonoDevelop.Autotools/SolutionMakefileHandler.cs
@@ -33,12 +33,12 @@ namespace MonoDevelop.Autotools
 		bool generateAutotools = true;
 
 		// Recurses into children and tests if they are deployable.
-		public bool CanDeploy (SolutionItem entry, MakefileType type)
+		public bool CanDeploy (SolutionFolderItem entry, MakefileType type)
 		{
 			return entry is SolutionFolder;
 		}
 
-		public Makefile Deploy (AutotoolsContext ctx, SolutionItem entry, IProgressMonitor monitor)
+		public Makefile Deploy (AutotoolsContext ctx, SolutionFolderItem entry, ProgressMonitor monitor)
 		{
 			generateAutotools = ctx.MakefileType == MakefileType.AutotoolsMakefile;
 			
@@ -78,10 +78,10 @@ namespace MonoDevelop.Autotools
 
 					subdirs.Append (" SUBDIRS = ");
 					
-					foreach (SolutionItem ce in CalculateSubDirOrder (ctx, solutionFolder, config))
+					foreach (SolutionFolderItem ce in CalculateSubDirOrder (ctx, solutionFolder, config))
 					{
 						string baseDirectory;
-						if (!(ce is SolutionEntityItem) && !(ce is SolutionFolder))
+						if (!(ce is SolutionItem) && !(ce is SolutionFolder))
 							continue;
 						
 						// Ignore projects which can't be deployed
@@ -118,7 +118,7 @@ namespace MonoDevelop.Autotools
 				string includedProject = null;
 
 				// deploy recursively
-				foreach (SolutionItem ce in children)
+				foreach (SolutionFolderItem ce in children)
 				{
 					IMakefileHandler handler = AutotoolsContext.GetMakefileHandler ( ce, ctx.MakefileType );
 					Makefile makefile;
@@ -206,11 +206,11 @@ namespace MonoDevelop.Autotools
 		}
 		
 		// utility function for finding the correct order to process directories
-		List<SolutionItem> CalculateSubDirOrder (AutotoolsContext ctx, SolutionFolder folder, SolutionConfiguration config)
+		List<SolutionFolderItem> CalculateSubDirOrder (AutotoolsContext ctx, SolutionFolder folder, SolutionConfiguration config)
 		{
-			List<SolutionItem> resultOrder = new List<SolutionItem>();
-			Set<SolutionItem> dependenciesMet = new Set<SolutionItem>();
-			Set<SolutionItem> inResult = new Set<SolutionItem>();
+			List<SolutionFolderItem> resultOrder = new List<SolutionFolderItem>();
+			Set<SolutionFolderItem> dependenciesMet = new Set<SolutionFolderItem>();
+			Set<SolutionFolderItem> inResult = new Set<SolutionFolderItem>();
 			
 			// We don't have to worry about projects built in parent combines
 			dependenciesMet.Union (ctx.GetBuiltProjects ());
@@ -222,24 +222,24 @@ namespace MonoDevelop.Autotools
 				added = false;
 				notMet = null;
 				
-				List<SolutionItem> items = new List<SolutionItem> ();
+				List<SolutionFolderItem> items = new List<SolutionFolderItem> ();
 				GetSubItems (items, folder);
 
-				foreach (SolutionItem item in items) 
+				foreach (SolutionFolderItem item in items) 
 				{
-					Set<SolutionItem> references, provides;
+					Set<SolutionFolderItem> references, provides;
 					
 					if (inResult.Contains (item))
 						continue;
 					
-					if (item is SolutionEntityItem)
+					if (item is SolutionItem)
 					{
-						SolutionEntityItem entry = (SolutionEntityItem) item;
+						SolutionItem entry = (SolutionItem) item;
 						if (!config.BuildEnabledForItem (entry))
 							continue;
 						
-						references = new Set<SolutionItem> ();
-						provides = new Set<SolutionItem>();
+						references = new Set<SolutionFolderItem> ();
+						provides = new Set<SolutionFolderItem>();
 						references.Union (entry.GetReferencedItems (config.Selector));
 						provides.Add (entry);
 					}
@@ -266,12 +266,12 @@ namespace MonoDevelop.Autotools
 			return resultOrder;
 		}
 		
-		void GetSubItems (List<SolutionItem> list, SolutionFolder folder)
+		void GetSubItems (List<SolutionFolderItem> list, SolutionFolder folder)
 		{
 			// This method returns the subitems of a folder.
 			// If a folder does not match a phisical folder, it will be ignored.
 			
-			foreach (SolutionItem item in folder.Items) {
+			foreach (SolutionFolderItem item in folder.Items) {
 				if (item is SolutionFolder) {
 					if (item.BaseDirectory != folder.BaseDirectory)
 						list.Add (item);
@@ -290,25 +290,25 @@ namespace MonoDevelop.Autotools
 		 * returns a set of projects that a combine contains and a set of projects
 		 * that are referenced from combine projects but not part of the combine
 		 */
-		void GetAllProjects (SolutionFolder folder, SolutionConfiguration config, out Set<SolutionItem> projects, out Set<SolutionItem> references)
+		void GetAllProjects (SolutionFolder folder, SolutionConfiguration config, out Set<SolutionFolderItem> projects, out Set<SolutionFolderItem> references)
 		{
-			List<SolutionItem> subitems = new List<SolutionItem> ();
+			List<SolutionFolderItem> subitems = new List<SolutionFolderItem> ();
 			GetSubItems (subitems, folder);
 
-			projects = (Set<SolutionItem>) combineProjects [folder];
+			projects = (Set<SolutionFolderItem>) combineProjects [folder];
 			if (projects != null) {
-				references = (Set<SolutionItem>) combineReferences [folder];
+				references = (Set<SolutionFolderItem>) combineReferences [folder];
 				return;
 			}
 
-			projects = new Set<SolutionItem>();
-			references = new Set<SolutionItem>();
+			projects = new Set<SolutionFolderItem>();
+			references = new Set<SolutionFolderItem>();
 			
-			foreach (SolutionItem item in subitems) 
+			foreach (SolutionFolderItem item in subitems) 
 			{
-				if (item is SolutionEntityItem)
+				if (item is SolutionItem)
 				{
-					SolutionEntityItem entry = (SolutionEntityItem) item;
+					SolutionItem entry = (SolutionItem) item;
 					if (!config.BuildEnabledForItem (entry))
 						continue;
 					projects.Add (entry);
@@ -316,8 +316,8 @@ namespace MonoDevelop.Autotools
 				}
 				else if (item is SolutionFolder) 
 				{
-					Set<SolutionItem> subProjects;
-					Set<SolutionItem> subReferences;
+					Set<SolutionFolderItem> subProjects;
+					Set<SolutionFolderItem> subReferences;
 					GetAllProjects ((SolutionFolder)item, config, out subProjects, out subReferences);
 					projects.Union (subProjects);
 					references.Union (subReferences);
diff --git a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs
index ac60b13b23..cbfea0d795 100644
--- a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs
@@ -17,7 +17,7 @@ namespace MonoDevelop.Autotools
 			alignment1.Xscale = 0.04f;
 			
 			this.target = target;
-			SolutionItem targetCombine = target.RootSolutionItem;
+			SolutionFolderItem targetCombine = target.RootSolutionItem;
 			folderEntry.Path = target.TargetDir;
 			
 			if (string.IsNullOrEmpty (target.DefaultConfiguration)) {
diff --git a/main/src/addins/MonoDevelop.CodeMetrics/ChangeLog b/main/src/addins/MonoDevelop.CodeMetrics/ChangeLog
deleted file mode 100644
index 4698064fc0..0000000000
--- a/main/src/addins/MonoDevelop.CodeMetrics/ChangeLog
+++ /dev/null
@@ -1,265 +0,0 @@
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: Track API
-	  changes.
-
-2010-07-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: Replaced
-	  custom workerthread with
-	  system.compontentmodel.backgroundworker.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeMetrics/CodeMetricsView.cs: IViewContent
-	  widgets are now destroyed by the workspace window.
-
-2010-04-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.CodeMetrics.csproj: Add system.core reference.
-
-2010-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am: Fixed build.
-
-2010-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.CodeMetrics.csproj:
-	* MonoDevelop.CodeMetrics/Commands.cs:
-	* MonoDevelop.CodeMetrics/Cohesion.cs:
-	* MonoDevelop.CodeMetrics/Coupling.cs:
-	* MonoDevelop.CodeMetrics/ASTVisitor.cs:
-	* MonoDevelop.CodeMetrics/LOCEvaluate.cs:
-	* MonoDevelop.CodeMetrics/IProperties.cs:
-	* MonoDevelop.CodeMetrics/MetricsContext.cs:
-	* MonoDevelop.CodeMetrics/EnumProperties.cs:
-	* MonoDevelop.CodeMetrics/FieldProperties.cs:
-	* MonoDevelop.CodeMetrics/InheritanceTree.cs:
-	* MonoDevelop.CodeMetrics/CodeMetricsView.cs:
-	* MonoDevelop.CodeMetrics/ClassProperties.cs:
-	* MonoDevelop.CodeMetrics/StructProperties.cs:
-	* MonoDevelop.CodeMetrics/MethodProperties.cs:
-	* MonoDevelop.CodeMetrics/ComplexityMetrics.cs:
-	* MonoDevelop.CodeMetrics/ProjectProperties.cs:
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs:
-	* MonoDevelop.CodeMetrics/DelegateProperties.cs:
-	* MonoDevelop.CodeMetrics/NamespaceProperties.cs:
-	* MonoDevelop.CodeMetrics/InterfaceProperties.cs:
-	* MonoDevelop.CodeMetrics/CodeMetricsServices.cs:
-	* MonoDevelop.CodeMetrics/ObjectOrientedMetrics.cs:
-	* MonoDevelop.CodeMetrics/CodeMetricsNodeExtension.cs:
-	* MonoDevelop.CodeMetrics/AssociationBetweenClasses.cs: Added
-	  the code metrics addin from 'nikhil sarda
-	  <diff.operator@gmail.com>'.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.CodeMetrics.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.CodeMetrics.csproj:
-	* MonoDevelop.CodeMetrics.addin.xml:
-	* MonoDevelop.CodeMetrics/Commands.cs:
-	* MonoDevelop.CodeMetrics/CodeMetricsView.cs:
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs:
-	* MonoDevelop.CodeMetrics/CodeMetricsNodeExtension.cs: Merged
-	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
-	  and MD.Components into MD.Ide.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.CodeMetrics.CodeMetricsWidget.cs: Flush.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.CodeMetrics.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.CodeMetrics.csproj:
-	* gtk-gui/MonoDevelop.CodeMetrics.CodeMetricsWidget.cs: Flush.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.CodeMetrics.addin.xml: Bump MD version.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: Fixed warning.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CodeMetrics.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.CodeMetrics.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.CodeMetrics.addin.xml: Bump MD version.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CodeMetrics.csproj: Don't local-copy project
-	  refs.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeMetrics.csproj: Moved text editor to core
-
-2009-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs:
-	* MonoDevelop.CodeMetrics/CodeMetricsNodeExtension.cs: fixed
-	  bug in code metrics.
-
-2009-02-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.CodeMetrics.csproj: Fix output path.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic: 
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: Changed
-	  override Destroy --> override OnDestroyed.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeMetrics/CodeMetricsView.cs:
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: Worked on
-	  ressource de-allocation.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CodeMetrics.addin.xml:
-	* MonoDevelop.CodeMetrics/CodeMetricsNodeExtension.cs: Track
-	  merge of the project pad context menu.
-
-2009-02-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: fixed
-	  warnings.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CodeMetrics.mdp:
-	* MonoDevelop.CodeMetrics.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.CodeMetrics.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.CodeMetrics.CodeMetricsWidget.cs:
-	  Flush.
-
-2009-01-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: Comment out license
-	detection, as standard headers are not guaranteed to be licenses.
-	Also, standard header API has changed.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.CodeMetrics.mdp: Flush project format changes.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CodeMetrics.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CodeMetrics.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CodeMetrics.addin.xml: Bump MD version.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.CodeMetrics.mdp,
-	  gtk-gui/MonoDevelop.CodeMetrics.CodeMetricsWidget.cs,
-	  gtk-gui/generated.cs: Updated generated code.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.CodeMetrics/CodeMetricsNodeExtension.cs: Moved the
-	  extensible tree view to its own directory.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.CodeMetrics.mdp: Updated.
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: Make the main column
-	  resizable.
-
-2008-06-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: fixed 'Bug 388247 -
-	  Code Metrics Quick Fix'.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.CodeMetrics.addin.xml: Bump MD version.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.CodeMetrics.addin.xml, MonoDevelop.CodeMetrics.mdp,
-	  MonoDevelop.CodeMetrics/CodeMetricsView.cs,
-	  MonoDevelop.CodeMetrics/Commands.cs,
-	  MonoDevelop.CodeMetrics/CodeMetricsNodeExtension.cs,
-	  MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: New project model
-	  changes.
-
-2008-03-14  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: Workaround bug in mono 1.2.4
-	  where usings are ignored inside anonymous methods.
-
-2008-03-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: fixed warning.
-
-2008-03-07  Mike Krüger <mkrueger@novell.com> 
-
-	
-
-2008-03-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.CodeMetrics/CodeMetricsWidget.cs: Added getstring call.
-
diff --git a/main/src/addins/MonoDevelop.Debugger.Gdb/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Gdb/ChangeLog
deleted file mode 100644
index ce5286dfe1..0000000000
--- a/main/src/addins/MonoDevelop.Debugger.Gdb/ChangeLog
+++ /dev/null
@@ -1,365 +0,0 @@
-2010-06-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure: Bump MD version.
-
-2010-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure: Bump MD version.
-
-2010-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbBacktrace.cs: Track api changes.
-
-2010-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbBacktrace.cs: Track api changes.
-
-2010-05-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbSession.cs: Increased console creation timeout.
-
-2010-04-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbSession.cs: Track api changes.
-
-2010-04-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbBacktrace.cs: Track api changes.
-
-	* MonoDevelop.Debugger.csproj: Flush.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure:
-	* AssemblyInfo.cs:
-	* Manifest.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Flush.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Merged MD.Projects into
-	  MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components
-	  into MD.Ide.
-
-2010-03-15  David Makovský  <yakeen@sannyas-on.net>
-
-	* GdbBacktrace.cs: fixes for C++ structures (thx Martin Vejnár
-	  <avakar@ratatanek.cz>)
-
-2010-03-08  Jonathan Pryor  <jpryor@novell.com>
-
-	* configure: Create a $(CSC) make variable.
-	* MonoDevelop.Debugger.Gdb.make: Set $(ASSEMBLY_COMPILER_COMMAND) to
-	  $(CSC).  This allows a top-level CSC override to be used within this
-	  module (e.g. top-level `make CSC=dmcs` for a v4 build).
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* GdbSession.cs: Name the reader thread.
-
-2010-03-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Gdb.sln: The invariant policy can't be
-	  used anymore as base policy set.
-
-2010-02-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbBacktrace.cs: Track api changes.
-
-2010-02-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbBacktrace.cs: Add missing method.
-
-2010-02-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbBacktrace.cs: Track api changes.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Manifest.addin.xml:
-	* GdbSessionFactory.cs: Track api changes. Some engine info is
-	  now taken from extension node metadata.
-
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.Gdb.sln: Flush.
-
-	* GdbSession.cs: Expressions are now printed by the debugging
-	  service.
-
-2009-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbBacktrace.cs: Track api changes.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbSessionFactory.cs: Implement Id property.
-
-2009-11-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbBacktrace.cs: Track api changes.
-
-2009-11-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbEvent.cs: Reason can be an array. Handle this case.
-
-	* MonoDevelop.Debugger.csproj: Flush.
-
-	* GdbSession.cs: If there is an error while initializing,
-	  report that the process has exited.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure:
-	* AssemblyInfo.cs:
-	* Manifest.addin.xml: Bump MD version.
-
-2009-10-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* GdbSession.cs: Fix Pocess/Process spelling.
-
-2009-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* GdbSessionFactory.cs: Fix spelling of GetAttachableProcesses
-	  API.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure:
-	* AssemblyInfo.cs:
-	* Manifest.addin.xml: Bump MD version.
-
-2009-10-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbSession.cs:
-	* GdbBacktrace.cs: Use long for thread and process id.
-
-2009-10-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Gdb.sln: 
-
-	* GdbSession.cs: Don't crash if a breakpoint can't be set.
-
-2009-08-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.Gdb.sln: Updated.
-
-	* GdbSession.cs: Quote file names when needed.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Flush.
-
-2009-04-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbSessionFactory.cs:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.Gdb.make: Track api changes.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure:
-	* AssemblyInfo.cs:
-	* Manifest.addin.xml: Bump MD version.
-
-2009-03-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbSessionFactory.cs: Removed unused CanDebugPlatform and
-	  rename CanDebugFile to CanDebugCommand.
-
-2009-03-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GdbSessionFactory.cs: Changed the way execution handlers
-	  work. We are not using platform ids anymore. Instead, we use
-	  command strings when looking for execution handlers.
-	  IExecutionHandlerFactory has been removed and now everything
-	  is handled by IExecutionHandler, which has a new CanExecute
-	  method. This model is more simple and more generic.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Gdb.sln: Flush.
-
-2009-02-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Gdb.sln: Set policies. Remove unused
-	  name attribute.
-
-2009-02-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Updated references.
-
-2009/02/06  Lluis Sanchez Gual  <lluis@novell.com>
-
- * MonoDevelop.Debugger.mdp:
- * MonoDevelop.Debugger.mds:
- * MonoDevelop.Debugger.csproj:
- * MonoDevelop.Debugger.Gdb.mds:
- * MonoDevelop.Debugger.Gdb.sln: Migrated to MSBuild file format.
-
-2009/02/03  Lluis Sanchez Gual  <lluis@novell.com>
-
- * configure:
- * AssemblyInfo.cs:
- * Manifest.addin.xml: Bump MD version.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.mdp: Flush project format changes.
-
-2008-12-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.mdp: Updated.
-
-	* GdbBacktrace.cs: Track api changes.
-
-2008-12-09  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* GdbSession.cs: Fallback to relative source file path.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Manifest.addin.xml: Set correct add-in category.
-
-	* GdbSession.cs:
-	* GdbSessionFactory.cs:
-	* MonoDevelop.Debugger.mdp: Track api changes.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Manifest.addin.xml: Change addin version number to match
-	configure/tarball version number.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-12-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.mdp:
-	* MonoDevelop.Debugger.Gdb.make: Remove .pc file. It's not required.
-
-2008-11-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Manifest.addin.xml: Track api changes.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure:
-	* Manifest.addin.xml: Bump MD version.
-
-2008-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* configure: Fix tarball name.
-
-2008-09-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbBacktrace.cs, GdbSession.cs: When debugging a mono process, try to
-	  get managed method names for unknown stack frames.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.mdp: Updated projects.
-
-2008-09-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbSession.cs: Track api changes.
-
-2008-08-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Manifest.addin.xml, MonoDevelop.Debugger.mdp: Extension point
-	  location has changed.
-
-2008-08-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.mdp: Fix reference to Mono.TextEditor. The
-	  incorrect add-in version number causes problems in the makefile
-	  synchronization.
-
-2008-08-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbSession.cs: Implemented support for conditions, trace expressions
-	  and hit counts.
-
-2008-08-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbSession.cs: Track api changes.
-
-2008-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbBacktrace.cs: Implement GetAllLocals.
-
-2008-07-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbSession.cs: Track api changes.
-
-2008-07-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbSessionFactory.cs: Fix construction process command line string.
-	* GdbSession.cs: Track api changes.
-
-2008-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.Gdb.make: Install the assemblies to the correct
-	  directory.
-
-2008-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbSession.cs: Track api changes.
-
-2008-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbBacktrace.cs: Added support for code completion.
-
-2008-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbBacktrace.cs: Track api changes.
-	* GdbSession.cs: Clean temporary variables.
-
-2008-07-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbBacktrace.cs: Track api changes.
-
-2008-07-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbBacktrace.cs: Support modifying variable values.
-	* GdbSession.cs: Implemented support for disassembling files.
-
-2008-07-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbSession.cs: Track api changes.
-
-2008-06-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbBacktrace.cs, GdbSession.cs: Allow setting the active thread.
-	  Implemented GetThreads and GetProcesses.
-	* ResultData.cs: Handle weird case where a tuple can have several
-	  values for a property.
-
-2008-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbSession.cs: Implemented detach.
-
-2008-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GdbSessionFactory.cs, GdbBacktrace.cs, GdbSession.cs, ResultData.cs:
-	  Implemented process attaching, variable query, disassemble.
-
-2008-06-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.Gdb.make, configure, MonoDevelop.Debugger.mdp,
-	  MonoDevelop.Debugger.mds, Makefile.include, rules.make,
-	  monodevelop.debugger.gdb.pc.in, Makefile: Added missing build
-	  files.
-
-2008-06-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AssemblyInfo.cs, GdbBacktrace.cs, GdbEvent.cs, GdbSession.cs,
-	  CommandStatus.cs, GdbSessionFactory.cs, ResultData.cs,
-	  GdbCommandResult.cs, Manifest.addin.xml: Initial support for gdb
-	  integration.
-
diff --git a/main/src/addins/MonoDevelop.Debugger.Gdb/GdbSession.cs b/main/src/addins/MonoDevelop.Debugger.Gdb/GdbSession.cs
index f7ad8dfa67..44dc1f91e1 100644
--- a/main/src/addins/MonoDevelop.Debugger.Gdb/GdbSession.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Gdb/GdbSession.cs
@@ -45,7 +45,7 @@ namespace MonoDevelop.Debugger.Gdb
 		Process proc;
 		StreamReader sout;
 		StreamWriter sin;
-		IProcessAsyncOperation console;
+		ProcessAsyncOperation console;
 		GdbCommandResult lastResult;
 		bool running;
 		Thread thread;
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Soft/ChangeLog
deleted file mode 100644
index 6f0aab0bcb..0000000000
--- a/main/src/addins/MonoDevelop.Debugger.Soft/ChangeLog
+++ /dev/null
@@ -1,59 +0,0 @@
-2010-02-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Soft.IPhone/IPhoneDebuggerSession.cs:
-	  Use the new namespace for the soft debugger. Updated the sdb
-	  client library.
-
-2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* Mono.Debugging.Soft: Split out a new dll Mono.Debugging.Soft
-	  from the soft debugger addin. It has the bits that have with
-	  no MD deps apart from Mono.Debugging, and it's strongnamed
-	  so MonoVS can use it.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Wire the soft debug addin into the build.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.sln:
-	* MonoDevelop.Debugger.Soft.IPhone:
-	* MonoDevelop.Debugger.Soft.IPhone/ChangeLog:
-	* MonoDevelop.Debugger.Soft.IPhone/Manifest.addin.xml:
-	* MonoDevelop.Debugger.Soft.IPhone/IPhoneDebuggerSession.cs:
-	* MonoDevelop.Debugger.Soft.IPhone/IPhoneSoftDebuggerEngine.cs:
-	* MonoDevelop.Debugger.Soft.IPhone/MonoDevelop.Debugger.Soft.IPhone.csproj:
-	Move the IPhone soft debugger addin to the IPhone sln.
-
-2009-11-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.sln: Tweak policy.
-
-2009-11-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.sln: Set default policies.
-
-2009-11-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile: make the "clean" target work without mdtool.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* configure: Bump MD version.
-
-2009-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.sln:
-	* MonoDevelop.Debugger.Soft.IPhone: Stubbed. Not working yet.
-
-2009-10-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile:
-	* configure: Patch into the extras configure system.
-
-2009-09-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* .temp-addin-registry: Remove temp dir.
-
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
index 61ea302cb4..045f907c8f 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/AspNetSoftDebuggerEngine.cs
@@ -75,6 +75,11 @@ namespace MonoDevelop.Debugger.Soft.AspNet
 				if (!evars.ContainsKey (v.Key))
 					evars.Add (v.Key, v.Value);
 			}
+
+			//HACK: work around Mono trying to create registry in non-writable location
+			if (cmd.TargetRuntime is MonoTargetRuntime && !Platform.IsWindows) {
+				evars ["MONO_REGISTRY_PATH"] = UserProfile.Current.TempDir.Combine ("aspnet-registry");
+			}
 			
 			var startInfo = new SoftDebuggerStartInfo (runtime.Prefix, evars) {
 				WorkingDirectory = cmd.BaseDirectory,
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/ChangeLog
deleted file mode 100644
index 492a9e91c9..0000000000
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/ChangeLog
+++ /dev/null
@@ -1,78 +0,0 @@
-2010-06-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AspNetSoftDebuggerEngine.cs: On windows, xsp is placed under
-	  a winhack dir. Fixes bug #594193 - [sdb] Can't debug web
-	  apps on Windows.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Manifest.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.Soft.AspNet.csproj: Merged MD.Projects
-	  into MD.Core, and MD.Projects.Gui, MD.Core.Gui and
-	  MD.Components into MD.Ide.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Manifest.addin.xml:
-	* AspNetSoftDebuggerEngine.cs: Track api changes. Some engine
-	  info is now taken from extension node metadata.
-
-2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AspNetSoftDebuggerEngine.cs:
-	* MonoDevelop.Debugger.Soft.AspNet.csproj: Fix deps to track
-	  the dll split.
-
-2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AspNetSoftDebuggerEngine.cs: Set UserAssemblyPaths.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AspNetSoftDebuggerEngine.cs: Implement ID member.
-
-2009-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AspNetSoftDebuggerEngine.cs: Use new async launch/listen
-	  APIs. Add proper support for parallel runtimes.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.AspNet.csproj: Add makefiles to
-	  project files.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.AspNet.csproj: Don't local-copy
-	  project refs.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.Soft.AspNet.csproj: Wire the soft debug
-	  addin into the build.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.AspNet.csproj: Moved soft debug
-	  addin from extras.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.AspNet.csproj: Updated.
-
-2009-11-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AspNetSoftDebuggerSession.cs: Unneeded.
-
-	* AspNetSoftDebuggerEngine.cs: Implement support for debugging
-	xsp.
-
-	* MonoDevelop.Debugger.Soft.AspNet.csproj: Remove unneeded
-	file.
-
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/ChangeLog
deleted file mode 100644
index 40c398e8e4..0000000000
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/ChangeLog
+++ /dev/null
@@ -1,90 +0,0 @@
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Manifest.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.Soft.Moonlight.csproj: Merged
-	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
-	  and MD.Components into MD.Ide.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Manifest.addin.xml:
-	* MoonlightSoftDebuggerEngine.cs: Track api changes. Some
-	  engine info is now taken from extension node metadata.
-
-2010-02-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MoonlightSoftDebuggerSession.cs: Use the new namespace for
-	  the soft debugger. Updated the sdb client library.
-
-2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.Soft.Moonlight.csproj: Fix deps to
-	  track the dll split.
-
-2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MoonlightSoftDebuggerSession.cs: Create the
-	  monodevelop-moonlight-debug Firefox profile if necessary.
-
-2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MoonlightSoftDebuggerEngine.cs: Set UserAssemblyPaths.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MoonlightSoftDebuggerEngine.cs: Implement ID member.
-
-2009-11-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MoonlightSoftDebuggerEngine.cs: Fix OS check.
-
-2009-11-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MoonlightSoftDebuggerEngine.cs:
-	* MoonlightSoftDebuggerSession.cs: Track AppName API, and fix
-	  the moonlight app name.
-
-2009-11-12  Geoff Norton  <gnorton@novell.com>
-
-	* MoonlightSoftDebuggerEngine.cs: Dont try to hook up a 
-	Console output.
-	* MoonlightSoftDebuggerSession.cs: UseShellExecute = false is
-	required to redirect the stdout and stderr.  Don't try to 
-	Kill an exited process.  Fix a typo in Substring
-
-2009-11-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MoonlightSoftDebuggerEngine.cs:
-	* MoonlightSoftDebuggerSession.cs: First stab at implementing
-	  the Moonlight debug session.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.Moonlight.csproj: Add makefiles to
-	  project files.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.Moonlight.csproj: Don't local-copy
-	  project refs.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.Soft.Moonlight.csproj: Wire the soft
-	  debug addin into the build.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.Moonlight.csproj: Moved soft debug
-	  addin from extras.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.Moonlight.csproj: Updated.
-
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ChangeLog
deleted file mode 100644
index f4a793a605..0000000000
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/ChangeLog
+++ /dev/null
@@ -1,639 +0,0 @@
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* RemoteSoftDebuggerSession.cs: Fix incorrect use of
-	  ShowCustomDialog/RunCustomDialog.
-
-2010-04-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerEngine.cs: Track API changes.
-
-2010-04-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerEngine.cs: External console processes are now
-	  wrapped by a IProcessAsyncOperation interface, instead of a
-	  Process instance. In this way it is possible to create
-	  external consoles which are not directly bound to a process.
-
-2010-03-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerEngine.cs: Fix external console support again.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* Manifest.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* SoftDebuggerEngine.cs:
-	* RemoteSoftDebuggerSession.cs:
-	* MonoDevelop.Debugger.Soft.csproj: Merged MD.Projects into
-	  MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components
-	  into MD.Ide.
-
-2010-03-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs: Track logging API.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Manifest.addin.xml:
-	* SoftDebuggerEngine.cs: Track api changes. Some engine info
-	  is now taken from extension node metadata.
-
-2010-02-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* RemoteSoftDebuggerSession.cs: Use the new namespace for the
-	  soft debugger. Updated the sdb client library.
-
-2010-01-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* ArrayAdaptor.cs:
-	* SoftDebuggerEngine.cs:
-	* SoftDebuggerSession.cs:
-	* SoftDebuggerAdaptor.cs:
-	* FieldValueReference.cs:
-	* Mono.Debugger.Soft.dll:
-	* SoftDebuggerBacktrace.cs:
-	* SoftEvaluationContext.cs:
-	* VariableValueReference.cs:
-	* PropertyValueReference.cs:
-	* Mono.Debugger.Soft.dll.mdb:
-	* RemoteSoftDebuggerSession.cs:
-	* MonoDevelop.Debugger.Soft.csproj: Split out a new dll
-	  Mono.Debugging.Soft from the soft debugger addin. It has the
-	  bits that have with no MD deps apart from Mono.Debugging,
-	  and it's strongnamed so MonoVS can use it.
-
-2010-01-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerAdaptor.cs: In the log message for failed
-	  invokes, include info about the object and method.
-
-2010-01-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Fix the error calling ToString when
-	  inspecting structs that don't override it.
-
-2009-12-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Fixed ToString call for structs.
-	  Improve casting between primitive types and enums. Add some
-	  missing null checks.
-
-	* FieldValueReference.cs: Allow getting struct and primitive
-	  value fields.
-
-	* VariableValueReference.cs: Return correct origin flag.
-
-2009-12-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Flag 'external' assemblies as such
-	  in the log.
-
-2009-12-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Ignore VMDisconnectedException when
-	  exiting/disposing. Log errors instead of console.writeline.
-
-2009-12-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Add an environment variable for
-	  enabling sdb logging.
-
-2009-12-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs:
-	* SoftDebuggerSession.cs:
-	* RemoteSoftDebuggerSession.cs: Pass the message along to the
-	  debugger log output about missing user assemblies or errors
-	  getting assembly name.
-
-2009-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Implement TryConvert.
-
-2009-12-10  Geoff Norton  <gnorton@novell.com>
-
-	* RemoteSoftDebuggerSession.cs: Only redirect the output when
-	asked to do so.
-
-2009-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Hide abstract properties. There is
-	  nothing we can do with them.
-
-2009-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Convert StructMirrors of type IntPtr
-	  to real IntPtr objects.
-
-2009-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerSession.cs: Add support for external console.
-
-2009-12-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.Debugger.Soft.dll:
-	* Mono.Debugger.Soft.dll.mdb: Updated.
-
-2009-12-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs:
-	* RemoteSoftDebuggerSession.cs: Add an OnConnected virtual
-	  method that subclasses can use to hook into when the app is
-	  successfully started.
-
-2009-12-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Pass isError to OnTargetOutput.
-
-2009-12-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs:
-	* RemoteSoftDebuggerSession.cs: Add a fallback to try to kill
-	  hung debugger processes.
-
-2009-12-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: When pausing and picking a frame to
-	  display, pick one with user code.
-
-2009-12-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.Debugger.Soft.dll:
-	* Mono.Debugger.Soft.dll.mdb: Updated.
-
-2009-12-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* FieldValueReference.cs:
-	* SoftDebuggerAdaptor.cs:
-	* PropertyValueReference.cs: Allow modifying field values on
-	  structs. Track api changes.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.Debugger.Soft.dll: Updated, fixes debugger keeping 
-	  socket open after cancellation.
-	* Mono.Debugger.Soft.dll.mdb:
-	* Makefile.am: Include the debugger mdb file.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Name threads to make debugging
-	  easier.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Avoid NREs disposing session that
-	  never connected.
-
-2009-12-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* FieldValueReference.cs:
-	* PropertyValueReference.cs: Don't allow setting field or
-	  property values on structs. It is not supported for now.
-
-2009-12-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Properly handle boxed primitive
-	  values.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* RemoteSoftDebuggerSession.cs: Revert the previous change, as
-	  it's no longer necessary after making the base
-	  DebuggerSession terminate the session if Run throws.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* RemoteSoftDebuggerSession.cs: If we get an exception while
-	  connecting, kill the session, or it doesn't exit and the
-	  thread pads start throwing NREs on a null vm.
-
-2009-12-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerSession.cs: Run CancelAsyncOperations in a
-	  background thread, since it can block and cause a deadlock
-	  with the main session lock. Fixes bug #558273.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Don't show the socket exception
-	  that's caused by cancelling the session.
-
-2009-12-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs:
-	* SoftDebuggerSession.cs: Implemented IsExternalType.
-
-2009-12-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Implement GetBaseType. Hide members
-	  that have the CompilerGenerated attribute.
-
-	* FieldValueReference.cs:
-	* PropertyValueReference.cs: Implement DeclaringType. Set the
-	  correct flags for fields and properties.
-
-2009-12-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Properly handle properties with
-	  private accessors.
-
-	* PropertyValueReference.cs: Set the ReadOnly flag if the
-	  property is read-only.
-
-2009-11-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* PropertyValueReference.cs: Allow getting and setting
-	  nonpublic properties.
-
-2009-11-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Don't NRE in
-	  MethodCall.WaitForCompleted if it was never invoked, or if
-	  there was an exception in Invoke.
-
-2009-11-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Don't call ToString when it doesn't
-	  have been overriden.
-
-2009-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Fix picking a default thread 
-	  to position to when pausing. The current_thread value 
-	  had been nulled on resume to fix BP queuing, so 
-	  introduce a new recent_thread field. Also, make
-	  a better attempt to find a non-ended thread if the 
-	  recent_thread has ended.
-
-2009-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: When disabling or removing 
-	  breakpoints or catchpoints, flush any queued occurrences of 
-	  them on other threads.
-
-2009-11-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerSession.cs: Fix potential null ref.
-
-2009-11-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs:
-	* SoftDebuggerBacktrace.cs: Mark frames that are external
-	  code.
-
-2009-11-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerBacktrace.cs: Include the type name in the
-	  method name. Fixes bug #556941.
-
-2009-11-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerEngine.cs:
-	* SoftDebuggerSession.cs: Add support for tracepoints and
-	  conditional breakpoints.
-
-2009-11-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Track API.
-	* Mono.Debugger.Soft.dll: Updated.
-
-2009-11-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerSession.cs: The stepping request should always
-	  be disabled when stopping for whatever reason.
-
-2009-11-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Manifest.addin.xml: Declare dep on Mono.Debugger.Soft.dll.
-
-2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.Debugger.Soft.dll: Updated.
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.Soft.csproj: Ref Cecil.
-
-	* SoftDebuggerEngine.cs:
-	* SoftDebuggerSession.cs:
-	* RemoteSoftDebuggerSession.cs: Implement support for assembly
-	  filters.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerEngine.cs: Implement ID member.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: In GetMember, look for members in
-	  parent types.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerSession.cs: Fix disposing code.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Properly implement
-	  MethodCall.Shutdown.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs:
-	* SoftDebuggerSession.cs:
-	* SoftEvaluationContext.cs:
-	* SoftDebuggerBacktrace.cs: Track api changes. Moved some code
-	  to Mono.Debugging.
-
-2009-11-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Fix race in async eval. We didn't
-	  actually need a callback, since we're just wrapping one
-	  async API in another.
-
-2009-11-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Make MethodCall class more readable.
-
-2009-11-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Use the async eval API instead of
-	  creating a thread.
-
-2009-11-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Fix invocation options.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftEvaluationContext.cs: Minor fix.
-
-2009-11-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerAdaptor.cs:
-	* SoftEvaluationContext.cs:
-	* SoftDebuggerBacktrace.cs:
-	* PropertyValueReference.cs: Track api changes. Call
-	  ToString() to convert objects to values, when that option is
-	  enabled.
-
-2009-11-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs:
-	* SoftDebuggerSession.cs:
-	* RemoteSoftDebuggerSession.cs: Use the user modules as
-	  assembly filters for stepping, if the startinfo has them (it
-	  doesn't yet).
-
-2009-11-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Fix the active thread object.
-
-2009-11-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerAdaptor.cs: Make invokes single-threaded and
-	  ignoring breakpoints.
-
-2009-11-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs:
-	* RemoteSoftDebuggerSession.cs: Empty the process info cache
-	  when we resume, so that the process and thread lists get
-	  updated.
-
-2009-11-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftEvaluationContext.cs:
-	* SoftDebuggerBacktrace.cs: Use the new options object.
-
-	* SoftDebuggerSession.cs: Propagate busy state changes.
-	  Dispose the vm in a background thread, to avoid unnecessary
-	  waits. Cancel evaluation operations before continuing
-	  execution.
-
-	* SoftDebuggerAdaptor.cs: Improve support for
-	  AllowTargetInvoke flag. Don't try to abort target invokes.
-	  That's not yet supported.
-
-2009-11-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.Debugger.Soft.dll: Updated.
-
-	* SoftDebuggerSession.cs: Queue stop events when more than one
-	  come in at once, and dequeue them when resuming.
-
-2009-11-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* RemoteSoftDebuggerSession.cs: Unify the AppName handling for
-	  remote sessions.
-
-2009-11-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Refactor to tidy up the main event
-	  handler.
-
-2009-11-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerSession.cs:
-	* SoftEvaluationContext.cs: After an evaluation in the target,
-	  the current frame may be invalidated, so it has to be
-	  queried again.
-
-	* SoftDebuggerAdaptor.cs: Misc value conversion fixes.
-
-	* VariableValueReference.cs: Implement local variable
-	  assignment.
-
-2009-11-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerSession.cs: Add missing call to base dispose.
-
-	* RemoteSoftDebuggerSession.cs: Fix warning.
-
-2009-11-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerSession.cs: Avoid IDE crash when an exception is
-	  thrown in the event handler.
-
-2009-11-12  Geoff Norton  <gnorton@novell.com>
-
-	* RemoteSoftDebuggerSession.cs: Not all Listen() events redirect
-	the console as well.
-
-2009-11-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Catch exceptions when getting
-	  process name. Works around Mono bug with symlinked runtimes.
-
-2009-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Fix bad state check.
-
-2009-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs:
-	* SoftDebuggerSession.cs:
-	* Mono.Debugger.Soft.dll:
-	* RemoteSoftDebuggerSession.cs: Use new async launch/listen
-	  APIs. Add proper support for parallel runtimes.
-
-2009-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fixed bad copy.
-
-2009-11-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs: Don't try to parse version number.
-	  Instead check for presence of Mono.Debugger.Soft.dll.
-
-2009-11-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* RemoteSoftDebuggerSession.cs: Make GetListenMessage virtual
-	  instead of abstract.
-
-2009-11-09  Geoff Norton  <gnorton@novell.com>
-
-	* SoftDebuggerSession.cs: Don't handle disconnects or 
-	VMDeath, as we will (erroneously) try to resume a dead
-	vm
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.csproj: Add makefiles to project
-	  files.
-
-	* Makefile.am: Install the Mono.Debugger.Soft assembly.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.csproj: Don't local-copy project
-	  refs.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.Soft.csproj: Wire the soft debug addin
-	  into the build.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.csproj: Moved soft debug addin
-	  from extras.
-
-2009-11-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SoftDebuggerSession.cs: Redirect errors. Improve handling of
-	  vm disconnection.
-
-2009-11-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.csproj: Added refs to GTK.
-
-	* SoftDebuggerSession.cs: Remove unneeded option.
-
-	* RemoteSoftDebuggerSession.cs: Abstracted out listening code
-	from the iPhone debugger session.
-
-2009-11-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs: Stub out support for targetting
-	different Mono runtimes. Expose a static CanDebugRuntime
-	method.
-
-2009-11-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Better handling of the sim process
-	  exiting while listen dialog is open.
-
-2009-11-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Fix the dispatch dervice deadlock in
-	  the debugger start.
-
-2009-11-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: In progress.
-
-2009-11-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs: Disable for runtime < 2.8
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* Manifest.addin.xml: Bump MD version.
-
-2009-10-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs: Disable sdb for Mono 2.4/2.5/2.6.
-
-2009-10-23  Geoff Norton  <gnorton@novell.com>
-
-	* SoftDebuggerSession.cs: Add a ConnectOutput call that is
-	protected for other consumers.
-	* Mono.Debugger.dll: Updated
-
-2009-10-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Make exiting more robust.
-
-2009-10-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs:
-	* SoftDebuggerSession.cs: Add preliminary support for
-	  catchpoints.
-
-2009-10-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.Debugger.dll: Updated.
-
-	* SoftDebuggerSession.cs: Stop at most recent thread when
-	  stopping.
-
-2009-10-21  Geoff Norton  <gnorton@novell.com>
-
-	* SoftDebuggerSession.cs: Fix the formatting in the output pad.
-	Dont call .Enable() directly as this could result in duplicate
-	entries in the target.
-
-2009-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerSession.cs: Expose some API for subclasses to
-	  override.
-
-2009-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.Soft.csproj: Don't require specific
-	  versions of refs.
-
-2009-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SoftDebuggerEngine.cs: Fix spelling of
-	  GetAttachableProcesses API.
-
-2009-10-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs:
-	* Manifest.addin.xml: Fixed description.
-
-	* MonoDevelop.Debugger.Soft.csproj: Patch into the extras
-	  configure system.
-
-2009-10-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ArrayAdaptor.cs:
-	* Mono.Debugger.dll:
-	* SoftDebuggerAdaptor.cs:
-	* SoftDebuggerSession.cs: Ongoing work.
-
-2009-09-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ArrayAdaptor.cs:
-	* SoftDebuggerSession.cs:
-	* SoftDebuggerAdaptor.cs: Ongoing work.
-
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs
index 682b68eab9..65ad712d29 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/CustomSoftDebuggerEngine.cs
@@ -80,7 +80,7 @@ namespace MonoDevelop.Debugger.Soft
 		
 		static T InvokeSynch<T> (Func<T> func)
 		{
-			if (MonoDevelop.Ide.DispatchService.IsGuiThread)
+			if (Runtime.IsMainThread)
 				return func ();
 			
 			var ev = new System.Threading.ManualResetEvent (false);
@@ -103,7 +103,7 @@ namespace MonoDevelop.Debugger.Soft
 		
 		class CustomSoftDebuggerSession : SoftDebuggerSession
 		{
-			IProcessAsyncOperation process;
+			ProcessAsyncOperation process;
 			bool usingExternalConsole;
 			
 			protected override void OnRun (DebuggerStartInfo startInfo)
@@ -133,8 +133,7 @@ namespace MonoDevelop.Debugger.Soft
 					usingExternalConsole = true;
 					var console = ExternalConsoleFactory.Instance.CreateConsole (info.CloseExternalConsoleOnExit);
 					process = Runtime.ProcessService.StartConsoleProcess (
-						info.Command, info.Arguments, info.WorkingDirectory, info.EnvironmentVariables,
-						console, null);
+						info.Command, info.Arguments, info.WorkingDirectory, console, info.EnvironmentVariables);
 				} else {
 					var psi = new ProcessStartInfo (info.Command, info.Arguments) {
 						WorkingDirectory = info.WorkingDirectory,
@@ -143,7 +142,7 @@ namespace MonoDevelop.Debugger.Soft
 					foreach (KeyValuePair<string,string> kvp in info.EnvironmentVariables)
 						psi.EnvironmentVariables [kvp.Key] = kvp.Value;
 					
-					process = Runtime.ProcessService.StartProcess (psi, ProcessOutput, ProcessError, null);
+					process = Runtime.ProcessService.StartProcess (psi, ProcessOutput, ProcessError, null).ProcessAsyncOperation;
 				}
 			}
 			
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerEngine.cs
index acdfd4e14a..fbdcd76b24 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerEngine.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/SoftDebuggerEngine.cs
@@ -35,6 +35,7 @@ using Mono.Debugging.Client;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.Core.Assemblies;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Debugger.Soft
 {
@@ -72,12 +73,13 @@ namespace MonoDevelop.Debugger.Soft
 		{
 			var cmd = (DotNetExecutionCommand) c;
 			var runtime = (MonoTargetRuntime)cmd.TargetRuntime;
-			var dsi = new SoftDebuggerStartInfo (runtime.Prefix, runtime.EnvironmentVariables) {
+			var dsi = new SoftDebuggerStartInfo (null, runtime.EnvironmentVariables) {
 				Command = cmd.Command,
 				Arguments = cmd.Arguments,
 				WorkingDirectory = cmd.WorkingDirectory,
 			};
-			
+			((SoftDebuggerLaunchArgs)dsi.StartArgs).MonoExecutableFileName = runtime.GetMonoExecutableForAssembly (cmd.Command);
+
 			SetUserAssemblyNames (dsi, cmd.UserAssemblyPaths);
 			
 			foreach (KeyValuePair<string,string> var in cmd.EnvironmentVariables)
@@ -86,9 +88,9 @@ namespace MonoDevelop.Debugger.Soft
 			var varsCopy = new Dictionary<string, string> (cmd.EnvironmentVariables);
 			var startArgs = (SoftDebuggerLaunchArgs) dsi.StartArgs;
 			startArgs.ExternalConsoleLauncher = delegate (System.Diagnostics.ProcessStartInfo info) {
-				IProcessAsyncOperation oper;
+				ProcessAsyncOperation oper;
 				oper = Runtime.ProcessService.StartConsoleProcess (info.FileName, info.Arguments, info.WorkingDirectory,
-					varsCopy, ExternalConsoleFactory.Instance.CreateConsole (dsi.CloseExternalConsoleOnExit), null);
+					ExternalConsoleFactory.Instance.CreateConsole (dsi.CloseExternalConsoleOnExit), varsCopy);
 				return new ProcessAdapter (oper, Path.GetFileName (info.FileName));
 			};
 
@@ -169,17 +171,17 @@ namespace MonoDevelop.Debugger.Soft
 	
 	class ProcessAdapter: Mono.Debugger.Soft.ITargetProcess
 	{
-		IProcessAsyncOperation oper;
+		ProcessAsyncOperation oper;
 		string name;
 		
-		public ProcessAdapter (IProcessAsyncOperation oper, string name)
+		public ProcessAdapter (ProcessAsyncOperation oper, string name)
 		{
 			this.oper = oper;
 			this.name = name;
-			oper.Completed += delegate {
+			oper.Task.ContinueWith (t => {
 				if (Exited != null)
 					Exited (this, EventArgs.Empty);
-			};
+			}, Runtime.MainTaskScheduler);
 		}
 		
 		#region IProcess implementation
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/ChangeLog
deleted file mode 100644
index 6b8c824978..0000000000
--- a/main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2010-04-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Metadata\CorMetadata.cs:
-	* Metadata\MetadataType.cs: The Make*Type methods are now
-	public.
-
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/AddinInfo.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/AddinInfo.cs
index be6398819e..3ad32e24e5 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/AddinInfo.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/AddinInfo.cs
@@ -14,4 +14,4 @@ using Mono.Addins.Description;
 [assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("Debugger", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("AspNet", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("AspNet", MonoDevelop.BuildInfo.Version)]
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/ChangeLog b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/ChangeLog
deleted file mode 100644
index ccbb1ba699..0000000000
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/ChangeLog
+++ /dev/null
@@ -1,49 +0,0 @@
-2010-04-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CorEvaluationContext.cs: New helper property.
-
-	* CorObjectAdaptor.cs: Improved CallToString. Fixed enum
-	conversions. Implemented some missing overrideables:
-	CreateTypeObject, GetEnumMembers, GetIndexerReference.
-
-	* CorDebuggerSession.cs: Improved implementation of
-	GetTypeInfo. It now supports primitive, generic and array
-	types.
-
-	* FieldReference.cs: When getting enum members, convert the
-	integer value to an enum value
-
-	* PropertyReference.cs: Improved implementation of indexers.
-	Properly box primitive values when setting/getting the
-	property.
-
-	* MonoDevelop.Debugger.Win32.csproj: Updated.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Win32.addin.xml: Bumped MD version.
-
-2009-12-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CorObjectAdaptor.cs: 
-
-2009-12-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CorObjectAdaptor.cs: Track api changes.
-
-2009-12-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* FieldReference.cs:
-	* CorObjectAdaptor.cs:
-	* PropertyReference.cs: Implement GetBaseType and
-	DeclaringType. Honor the DeclareOnly flag.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Win32.addin.xml: Bump MD version.
-
-2009-10-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* CorDebuggerEngine.cs:
-	* CorDebuggerSession.cs: Fix Pocess/Process spelling.
-
diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerEngine.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerEngine.cs
index 9d1d77f225..db58871ac4 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerEngine.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerEngine.cs
@@ -4,7 +4,9 @@ using System.IO;
 using Mono.Debugging.Client;

 using MonoDevelop.Core;

 using MonoDevelop.Core.Execution;

+#if ASPNET

 using MonoDevelop.AspNet.Execution;

+#endif

 

 namespace MonoDevelop.Debugger.Win32

 {

@@ -17,9 +19,11 @@ namespace MonoDevelop.Debugger.Win32
 			DotNetExecutionCommand cmd = command as DotNetExecutionCommand;

 			if (cmd != null)

 				return (cmd.TargetRuntime == null || cmd.TargetRuntime.RuntimeId == "MS.NET");

+#if ASPNET

 			var acmd = command as AspNetExecutionCommand;

 			if (acmd != null)

 				return (acmd.TargetRuntime == null || acmd.TargetRuntime.RuntimeId == "MS.NET");

+#endif

 			return false;

 		}

 

@@ -37,7 +41,7 @@ namespace MonoDevelop.Debugger.Win32
 				}

 				return startInfo;

 			}

-

+#if ASPNET

 			var acmd = command as AspNetExecutionCommand;

 			if (acmd != null) {

 				DebuggerStartInfo startInfo = new DebuggerStartInfo ();

@@ -56,12 +60,13 @@ namespace MonoDevelop.Debugger.Win32
 				startInfo.EnvironmentVariables["DEVPATH"] = Path.GetDirectoryName (xspPath);

 				return startInfo;

 			}

+#endif

 			throw new NotSupportedException ();

 		}

 

 		public DebuggerSession CreateSession ( )

 		{

-			return new CorDebuggerSession ();

+			return MtaThread.Run(() => new CorDebuggerSession());

 		}

 

 		public ProcessInfo[] GetAttachableProcesses ( )

diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs
index dc4a4e5969..8d31ebd7a8 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs
@@ -1217,8 +1217,8 @@ namespace MonoDevelop.Debugger.Win32
 		{

 			CorValue obj = GetRealObject (ctx, objr);

 

-			if ((obj is CorReferenceValue) && ((CorReferenceValue) obj).IsNull)

-				return new EvaluationResult ("(null)");

+			if ((obj is CorReferenceValue) && ((CorReferenceValue)obj).IsNull)

+				return null;

 

 			CorStringValue stringVal = obj as CorStringValue;

 			if (stringVal != null) {

diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj
index 951b9df5ba..4dc0f0fbb3 100644
--- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj
+++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj
@@ -38,7 +38,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.Debugger.Win32</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;ASPNET</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -47,7 +47,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.Debugger.Win32</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;ASPNET</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
diff --git a/main/src/addins/MonoDevelop.Debugger/ChangeLog b/main/src/addins/MonoDevelop.Debugger/ChangeLog
deleted file mode 100644
index c2254df404..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/ChangeLog
+++ /dev/null
@@ -1,1439 +0,0 @@
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/DebugCommands.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs: Track API changes.
-
-2010-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API
-	  changes.
-
-2010-07-13  Levi Bard  <levi@unity3d.com>
-
-	* MonoDevelop.Debugger/ExceptionCaughtDialog.cs:
-	  Unescape exception message.
-
-2010-07-07  Levi Bard  <levi@unity3d.com>
-
-	* MonoDevelop.Debugger/LocalsPad.cs:
-	  Persist local pad tree state while single-stepping within the same function.
-
-2010-06-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* icons/debug-overlay-24.png:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml: Fix icon composition
-	  warning.
-
-2010-06-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/DisassemblyView.cs: Track API changes.
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Fix incorrect use
-	  of ShowCustomDialog/RunCustomDialog.
-
-2010-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Use
-	  ShowCustomDialog (which destroys the dialog when done)
-	  instead of RunCustomDialog (which doesn't).
-
-2010-05-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/DebugCommands.cs: More dialog placement
-	  cleanup.
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: More dialog
-	  placing.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/DebugCommands.cs: Clean up dialog
-	  placement.
-
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	  Flush.
-
-2010-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Show the
-	  exception information when double clicking on it in the
-	  locals or watch pads.
-
-	* MonoDevelop.Debugger/ExceptionCaughtDialog.cs: Don't crash
-	  if there is a change event after the dialog is closed.
-
-2010-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ExceptionCaughtDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionCaughtDialog.cs:
-	  Improved exception dialog. It now shows the stack trace.
-	  Track api changes.
-
-2010-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API
-	  changes.
-
-2010-05-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Unsubscribe all
-	  events from the session when stopping the debugger. Ensures
-	  that the old session is completely disconnected from the
-	  debugging service, so if something goes wrong while shutting
-	  down, it will not interfere with a new session. This might
-	  be a fix for bug #602476.
-
-2010-05-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/BusyEvaluatorDialog.cs: Dont re-show
-	  the busy dialog if the user clicks on Keep Waiting. Instead,
-	  show it when the user tries to continue debugging. Also show
-	  a flashing status icon while in busy mode.
-
-2010-05-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Remove unused icon sizes.
-
-2010-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ImmediatePad.cs: Really fix not
-	  supported expression error reporting.
-
-2010-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ImmediatePad.cs: Improve error message
-	  when an expression is not supported.
-
-2010-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValuePad.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger.Visualizer/TextVisualizer.cs:
-	* MonoDevelop.Debugger.Visualizer/PixbufVisualizer.cs: Track
-	  api changes. When evaluation options change, update the
-	  value pads.
-
-2010-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs:
-	* MonoDevelop.Debugger/ExceptionCaughtDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionCaughtDialog.cs:
-	  Exception dialog fixes. Wrap the exception message. Don't
-	  show new lines in the value column.
-
-2010-05-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Flush.
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Properly update
-	  expanders visibility when refreshing a row.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/DisassemblyView.cs: ViewContent widgets
-	  are now destroyed by the workspace window.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API
-	  changes.
-
-2010-04-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs: Make
-	  IProcessAsyncOperation IDisposable.
-
-2010-04-23  Carlo Kok  <ck@remobjects.com>
-	
-	* MakeFile.am:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ExpressionEvaluatorExtensionNode.cs:
-	* MonoDevelop.Debugger/LocalsPad.cs:
-      Allow for custom debug expression evaluator plugins.
-	  
-2010-04-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Improved column
-	  size handling.
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs:
-	  Changed default size for evaluator dialog.
-
-2010-04-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Reduce size of
-	  refresh and visualizer buttons. Moved refresh button to the
-	  front of the column.
-
-	* MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs: Allow
-	  expanding.
-
-2010-04-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger.Visualizer:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs:
-	* MonoDevelop.Debugger.Visualizer/TextVisualizer.cs:
-	* MonoDevelop.Debugger.Visualizer/PixbufVisualizer.cs:
-	* MonoDevelop.Debugger.Visualizer/IValueVisualizer.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionCaughtDialog.cs:
-	* MonoDevelop.Debugger.Visualizer/ValueVisualizerDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.Viewers.ValueVisualizerDialog.cs:
-	  Add basic support for custom visualizers.
-
-	* MonoDevelop.Debugger/PinnedWatch.cs: Set the correct
-	  expression name.
-
-2010-04-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/BreakpointPropertiesDialog.cs: Added
-	  new test suite for StackFrame. Reorganized a bit the
-	  namespaces. Added tests for bug #580994.
-
-2010-04-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/BreakpointPropertiesDialog.cs: When
-	  checking if some breakpoint features are supported, check it
-	  for the startup project too, since the current project may
-	  be a library and not executable.
-
-2010-04-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/BreakpointPad.cs: Use the delete key
-	  command to bind the delete key.
-
-2010-04-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/WatchPad.cs:
-	* MonoDevelop.Debugger/DebugCommands.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Added a context
-	  menu to ObjectValueTreeView, which includes a command which
-	  allows adding a value to the watch pad.
-
-2010-04-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Don't set
-	  change the pin icon while editing.
-
-2010-04-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	  Remove dead space at bottom of dialog.
-
-2010-03-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	  Flush.
-
-	* MonoDevelop.Debugger/StackTracePad.cs: Alloy copying the
-	  call stack to the clipboard. Added context menu.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/DebugCommands.cs: Fixed some command
-	  descriptions.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Debugger.addin.xml: Bumped MD version.
-
-2010-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Set the default location for
-	  debug pads. Register a new Debug layout.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/WatchPad.cs:
-	* MonoDevelop.Debugger/LocalsPad.cs:
-	* MonoDevelop.Debugger/Extensions.cs:
-	* MonoDevelop.Debugger/ThreadsPad.cs:
-	* MonoDevelop.Debugger/Initializer.cs:
-	* MonoDevelop.Debugger/ImmediatePad.cs:
-	* MonoDevelop.Debugger/StackTracePad.cs:
-	* MonoDevelop.Debugger/DebugCommands.cs:
-	* MonoDevelop.Debugger/BreakpointPad.cs:
-	* MonoDevelop.Debugger/ObjectValuePad.cs:
-	* MonoDevelop.Debugger/ExceptionsDialog.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs:
-	* MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs:
-	* MonoDevelop.Debugger/BreakpointPropertiesDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ImmediatePad.cs: Show the clear button
-	  in the dock item toolbar.
-
-2010-03-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ThreadsPad.cs:
-	* MonoDevelop.Debugger/StackTracePad.cs: Icons are set in the
-	  extension node.
-
-	* MonoDevelop.Debugger/BreakpointPad.cs: Remove unrequired
-	  shadow.
-
-2010-03-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger/BreakpointPad.cs: Use the new
-	  DockItemToolbar class for showing toolbar commands.
-
-2010-03-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Added target for running the tests.
-
-2010-03-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Clean the
-	  breakpoint list when closing the solution.
-
-2010-02-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ExceptionsDialog.cs: Fix bug #579754 -
-	  Duplicate exception names in debugger exception dialog
-
-2010-02-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ExceptionCaughtDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionCaughtDialog.cs: Added
-	  new dialog which is shown when an exception is caught.
-
-	* MonoDevelop.Debugger/ImmediatePad.cs: Use new expression
-	  validation method.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ThreadsPad.cs:
-	* MonoDevelop.Debugger/StackTracePad.cs:
-	* MonoDevelop.Debugger/BreakpointPad.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track api
-	  changes.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggerEngine.cs: Properly initialize
-	  the engine.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/Extensions.cs:
-	* MonoDevelop.Debugger/DebuggerEngine.cs:
-	* MonoDevelop.Debugger/IDebuggerEngine.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/DebugExecutionModeSet.cs:
-	* MonoDevelop.Debugger/AttachToProcessDialog.cs:
-	* MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs:
-	* MonoDevelop.Debugger/DebuggerEngineExtensionNode.cs:
-	* MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs: Added
-	  support for lazy loading of add-ins
-
-2010-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ThreadsPad.cs:
-	* MonoDevelop.Debugger/StackTracePad.cs:
-	* MonoDevelop.Debugger/BreakpointPad.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API
-	  changes for lazy loading images.
-
-2010-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/ExceptionsDialog.cs: Include
-	  System.Exception in exceptions list.
-
-2010-02-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: init pinned
-	  watch coordinates to -1.
-
-2010-02-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger/PinnedWatch.cs:
-	* MonoDevelop.Debugger/PinnedWatchStore.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs:
-	  Implemented infrastructure for supporting persistent pinned
-	  watches.
-
-2010-02-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebugCommands.cs: Warn the user when
-	  trying to debug an outdated exe. Fixes bug #540979.
-
-2010-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API
-	  changes.
-
-2010-01-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Made GetIcon
-	  public.
-
-2010-01-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionsDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.BusyEvaluatorDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.AddTracePointDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.AttachToProcessDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs:
-	  Flush.
-
-2010-01-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Implement a type
-	  resolver. Helps fixing bug #570855 - Poor type resolution in
-	  debugger.
-
-2010-01-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API
-	  changes.
-
-2009-12-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Tests:
-	* MonoDevelop.Debugger.Tests.TestApp: Added new testing
-	  projects.
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Allow using the
-	  debugging service when the Ide is not initialized.
-
-2009-12-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Ensure that soft
-	  debugger is prioritised over newly installed debuggers.
-
-2009-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.csproj:
-	* icons/view-debug-watch-16.png:
-	* icons/view-debug-locals-16.png:
-	* MonoDevelop.Debugger.addin.xml:
-	* icons/view-debug-threads-16.png:
-	* icons/view-debug-call-stack-16.png:
-	* icons/view-debug-breakpoints-16.png: Added some new icons.
-
-2009-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Use the new
-	  DisplayValue property.
-
-2009-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Pass along the
-	  external console option.
-
-2009-12-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Use
-	  Workbench.Present so that we can special-case for different
-	  platforms.
-
-2009-12-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs:
-	  Added new grouping options to the options panel.
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Moved all options
-	  properties to a single object.
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Show the new
-	  static member icons.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Fix shortcut conflict.
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs:
-	  Evaluate expression when pressing enter in the expression
-	  evaluator dialog.
-
-2009-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Remove FIXME that
-	  was fixed.
-
-2009-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/StackTracePad.cs: Don't prevent the
-	  user from jumping to frames if source exists, even if
-	  they're not user code.
-
-2009-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/Initializer.cs: Take external code 
-	  into account when picking frame to show when stopping.
-
-2009-11-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebugTextMarker.cs: New marker for
-	  tracepoints.
-
-2009-11-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/StackTracePad.cs: Don't jump to
-	  external frames.
-
-2009-11-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/StackTracePad.cs: Make frames that are
-	  external code italic.
-
-	* MonoDevelop.Debugger/Initializer.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs: Only display the
-	  current visible frame, not external code frames.
-
-2009-11-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/DebugCommands.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/AddTracePointDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.AddTracePointDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	  Implemented Add Tracepoint command.
-
-2009-11-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Add a call for
-	  accessing the next "visible" stack frame.
-
-	* MonoDevelop.Debugger/Initializer.cs: Track API.
-
-	* MonoDevelop.Debugger/DebugTextMarker.cs: New marker.
-
-2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs:
-	  Add setting for user-code-only debugging.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger/IDebuggerEngine.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs:
-	  Added options panel for setting debugger engine selection
-	  priority.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Add support for
-	  the new EvaluatingGroup value type.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Remove debug code.
-
-2009-11-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger/ImmediatePad.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs:
-	* MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs:
-	  Add support for refreshing values. Added option for enabling
-	  ToString evaluation. Track api changes.
-
-2009-11-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs: Added
-	  options panel for the debugger options.
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Debugger.csproj:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionsDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.BusyEvaluatorDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.AttachToProcessDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	  Updated.
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Use the options
-	  entered by the user for timeout and target evaluation. Show
-	  the busy dialog when the debugger is busy.
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Use the default
-	  timeout when evaluating expressions.
-
-	* MonoDevelop.Debugger/BusyEvaluatorDialog.cs: New dialog
-	  shown when the debugger is busy executing target methods.
-
-2009-11-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Fix bug #549886 -
-	  Pressing Enter at the end of a line with a breakpoint moves
-	  the breakpoint down a line.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Debugger.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.csproj: Reference the mono-cairo
-	  package.
-
-	* MonoDevelop.Debugger/Initializer.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs: Properly check
-	  debugger features while in a debug session.
-
-	* MonoDevelop.Debugger/ThreadsPad.cs: Improve error handling.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionsDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.AttachToProcessDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	  Flush.
-
-2009-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Fixed 'Bug 550179
-	  - Caret should not pulse when debugger stepping'.
-
-2009-10-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Add Mac shortcuts.
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger.csproj: Flush.
-
-2009-10-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/ThreadsPad.cs: Fix Pocess/Process
-	  spelling.
-
-2009-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/IDebuggerEngine.cs:
-	* MonoDevelop.Debugger/AttachToProcessDialog.cs: Fix spelling
-	  of GetAttachableProcesses API.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Added new event to
-	  disable conditional compilation for a document.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Debugger.addin.xml: Bump MD version.
-
-2009-10-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/AttachToProcessDialog.cs: Track api
-	  changes.
-
-2009-10-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Avoid deadlock by
-	  delaying the display of error dialogs.
-
-2009-09-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/Initializer.cs: Don't show the
-	  disassembly window if not supported.
-
-2009-09-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/DebugCommands.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs: Implemented Show
-	  Current Execution Line command.
-
-2009-09-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Added null check.
-
-2009-09-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Report debugger
-	  exceptions in a dialog.
-
-	* MonoDevelop.Debugger/BreakpointPad.cs: Disable the
-	  breakpoints pad if the breakpoint store is read-only while
-	  running.
-
-	* MonoDevelop.Debugger/DebugCommands.cs: Disable breakpoint
-	  commands when the breakpoint store is read-only.
-
-2009-09-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger\DebuggingService.cs: Fire the stopped
-	  event after disposing the session.
-
-2009-09-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ImmediatePad.cs: Added a toolbar with a
-	  clean button.
-
-2009-09-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API
-	  changes.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: 
-	* MonoDevelop.Debugger/DebugCommands.cs: Make windows transient
-	  for the root monodevelop window.
-
-2009-09-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track api
-	  changes.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/BreakpointPad.cs: Fix issue with
-	  context menu. Fixes bug #480535.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger\StackTracePad.cs: Improve stack frame
-	  formatting.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API
-	  changes.
-
-2009-08-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Try some different Mac
-	  keyboard mappings for build and run commands.
-
-2009-08-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Don't make local copies of
-	  project references.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	  Flush.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.Debugger.ExceptionsDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.AttachToProcessDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs:
-	  Flush.
-
-2009-07-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/DebugCommands.cs: Run has now "Run
-	  again" functionality when no debugger is installed.
-
-2009-07-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API
-	  changes.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track api
-	  changes.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ImmediatePad.cs: Use the new
-	  DesktopService instead of PlatformService.
-
-2009-06-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/ImmediatePad.cs: Added immediate pad.
-
-2009-05-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger\ThreadsPad.cs: Don't try to get the
-	  list of threads if the debugger is running.
-
-	* MonoDevelop.Debugger\DebugCommands.cs: Fix logic for
-	  checking if debugging is supported.
-
-2009-05-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger\ThreadsPad.cs:
-	* MonoDevelop.Debugger\StackTracePad.cs: Don't render a
-	  border. The dock item already provides one.
-
-2009-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger\Initializer.cs:
-	* MonoDevelop.Debugger\DebuggingService.cs: Use FilePath for
-	  representing paths.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/Extensions.cs:
-	* MonoDevelop.Debugger/DebugCommands.cs: Workaround for what
-	  seems to be a mcs bug. Looks like it can't properly resolve
-	  the implicit conversion of null to string.
-
-2009-05-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: More Mac shortcuts.
-
-2009-04-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger/IDebuggerEngine.cs: Moved
-	  IDebuggerEngine from Mono.Debugging.
-
-	* MonoDevelop.Debugger/DebuggingService.cs: IDebuggerEngine
-	  now takes an ExecutionCommand as parameter.
-
-2009-04-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/DebugExecutionModeSet.cs: Created an
-	  execution mode set for debuggers.
-
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs: Track
-	  api changes done in IExecutionHandler.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.Debugger.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/WatchPad.cs: Changed IMementoCapable
-	  interface.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Debugger.addin.xml: Bump MD version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ExceptionsDialog.cs: Track api changes
-	  to support multiple target runtimes.
-
-2009-04-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track api
-	  changes (Made the 'undo' of code completion operations more
-	  intelligent.)
-
-2009-03-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger/DisassemblyView.cs:
-	* MonoDevelop.Debugger/DebugTextMarker.cs: Fixed compilation
-	  error.
-
-2009-03-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track api
-	  changes.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Don't local-copy project refs.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Moved text editor to core
-
-2009-03-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Fix bug #478331
-	  - Adding second (third, etc) variable to watch pad takes
-	  type of first variable.
-
-2009-03-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: Removed unused
-	  CanDebugPlatform and rename CanDebugFile to CanDebugCommand.
-
-2009-03-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/Extensions.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs:
-	  Changed the way execution handlers work. We are not using
-	  platform ids anymore. Instead, we use command strings when
-	  looking for execution handlers. IExecutionHandlerFactory has
-	  been removed and now everything is handled by
-	  IExecutionHandler, which has a new CanExecute method. This
-	  model is more simple and more generic.
-
-2009-03-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/BreakpointPropertiesDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs:
-	  Moved breakpoint properties dialog from MD.Ide. Disable
-	  conditional and tracepoint options if they are not supported
-	  by the project.
-
-2009-03-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/Extensions.cs: Fixed NRE when the
-	  current view does not have a file name. Fixes bug #480823 -
-	  NRE when closing solution.
-
-2009-03-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: commented out
-	  debug message.
-
-2009-02-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/ThreadsPad.cs:
-	* MonoDevelop.Debugger/StackTracePad.cs: Added translatable
-	  strings. Patch from Bálint Kriván.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Flush.
-
-2009-02-23  Scott Ellington  <scott.ellington@gmail.com>
-
-	* Makefile.am:
-	* icons/step-out-24.png:
-	* icons/step-into-24.png:
-	* icons/step-over-24.png:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml: add 24 px icons and debug
-	  toolbar
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Track merge of the project
-	  pad context menu.
-
-2009-02-20  Scott Ellington  <scott.ellington@gmail.com>
-
-	* Makefile.am:
-	* icons/step-out-22.png:
-	* icons/step-out-16.png:
-	* icons/step-over-22.png:
-	* icons/step-over-16.png:
-	* icons/step-into-16.png:
-	* icons/step-into-22.png:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml: add step icons
-
-2009-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/WatchPad.cs: When restoring the watch
-	  pad state, clear the old state.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ExceptionsDialog.cs: Track api changes.
-
-2009-02-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/LocalsPad.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Add locals all
-	  at once to the list.
-
-	* MonoDevelop.Debugger/DebugCommands.cs: Allow editing the
-	  exceptions even when the debugger is not running.
-
-2009-02-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* icons:
-	* Makefile.am:
-	* icons/debug-overlay-32.png:
-	* icons/debug-overlay-22.png:
-	* icons/debug-overlay-16.png:
-	* MonoDevelop.Debugger.csproj:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/DebugCommands.cs: Added icon for debug
-	  command. Make sure the run command is visible in the toolbar
-	  even when there are no debuggers installed.
-
-2009-02-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/ThreadsPad.cs:
-	* MonoDevelop.Debugger/StackTracePad.cs:
-	* MonoDevelop.Debugger/BreakpointPad.cs:
-	* MonoDevelop.Debugger/ObjectValuePad.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Use pad font.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Don't require a specific
-	  version of Mono.Addins.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Flush MD's removal of newline
-	  at end of file that was introduced by manually editing with
-	  gedit.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.csproj: Make debug configuration build
-	  debug symbols.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.mdp:
-	* MonoDevelop.Debugger.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/DisassemblyView.cs: track api changes.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Debugger.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionsDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.AttachToProcessDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs:
-	  Flush.
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.mdp: Updated Mono.Cairo reference.
-
-2009-02-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/DisassemblyView.cs: Track
-	  TextEditorOptions API changes.
-
-2009-02-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Track changes in MD's assembly handling.
-	  Mono.Cairo is no longer considered to be a "system"
-	  assembly.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger.mdp: Flush project format changes.
-
-2008-12-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Use the new async
-	evaluation feature.
-
-	* MonoDevelop.Debugger/StackTracePad.cs:
-	* MonoDevelop.Debugger/ObjectValuePad.cs: Make sure the pad is updated
-	only when it is visible.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.mdp: All projects now require fx 3.5.
-
-2008-12-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: When cleaning up the
-	session, dispose it as last step, since it may be slow, and it might
-	delay all other cleanup operations.
-
-2008-12-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/DebuggingService.cs: If something goes wrong when
-	starting the debugger, cleanup the session.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/Initializer.cs:
-	* MonoDevelop.Debugger/DebugCommands.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/AttachToProcessDialog.cs: Hide debugger commands
-	which are not supported by the installed debuggers. 
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Updated key bindings to match VS.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Changed default label of debug command
-	for projects since to avoid it being confused with the global debug
-	command in the key bindings panel.
-
-	* MonoDevelop.Debugger/Extensions.cs: Honor the RunWithWarning and
-	BuildBeforeExecuting preferences.
-
-	* MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs: Track api
-	changes.
-
-	* MonoDevelop.Debugger/DebugCommands.cs: Honor the RunWithWarning and
-	BuildBeforeExecuting preferences. If no debugger is installed, the
-	Debug command will work as a regular Run command.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-12-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Allow editing by pressing
-	F2.
-
-2008-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Fix command names.
-
-2008-11-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Debugger.mdp:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/DebugCommands.cs:
-	* MonoDevelop.Debugger/ExceptionsDialog.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionsDialog.cs:
-	* MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExpressionEvaluatorDialog.cs: Implemented
-	exceptions dialog and expression evaluation dialog.
-
-2008-11-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Debugger.mdp:
-	* MonoDevelop.Debugger.addin.xml:
-	* MonoDevelop.Debugger/LocalsPad.cs:
-	* MonoDevelop.Debugger/Extensions.cs:
-	* MonoDevelop.Debugger/ThreadsPad.cs:
-	* MonoDevelop.Debugger/Initializer.cs:
-	* MonoDevelop.Debugger/StackTracePad.cs:
-	* MonoDevelop.Debugger/DebugCommands.cs:
-	* MonoDevelop.Debugger/BreakpointPad.cs:
-	* MonoDevelop.Debugger/ObjectValuePad.cs:
-	* MonoDevelop.Debugger/DisassemblyView.cs:
-	* MonoDevelop.Debugger/ExceptionsDialog.cs:
-	* MonoDevelop.Debugger/DebuggingService.cs:
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs:
-	* MonoDevelop.Debugger/AttachToProcessDialog.cs:
-	* gtk-gui/MonoDevelop.Debugger.ExceptionsDialog.cs:
-	* MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs:
-	* gtk-gui/MonoDevelop.Debugger.AttachToProcessDialog.cs: Moved here all
-	debug commands previously implemented in MD.Ide.
-
-2008-11-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Debugger.mdp: Updated.
-
-2008-11-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/Initializer.cs:
-	* MonoDevelop.Debugger/DisasemblyView.cs:
-	* MonoDevelop.Debugger/DisassemblyView.cs: Fix spelling.
-
-2008-11-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Debugger/DebugTextMarker.cs: fixed compilation error.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build dependencies.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.addin.xml: Bump MD version.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track APIs.
-
-2008-10-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track CompletionData API.
-
-2008-10-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Remove ambiguity.
-
-2008-10-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track API.
-
-2008-09-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: implemented IComparable.
-
-2008-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Really fix.
-
-2008-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Track api changes.
-
-2008-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/ObjectValuePad.cs: Fix nullref.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.mdp: Updated projects.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs: Updated generated code.
-
-2008-08-20  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Debugger/DisasemblyView.cs: made some changes caused by
-	  text editor changes.
-
-2008-08-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.Debugger.mdp, Makefile.am,
-	  MonoDevelop.Debugger/BreakpointPropertiesDialog.cs,
-	  MonoDevelop.Debugger/BreakpointPad.cs: Moved breakpoint properties
-	  dialog to MD.Ide.
-	* MonoDevelop.Debugger/DebugTextMarker.cs: Track api changes.
-
-2008-08-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui, gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.Debugger.mdp, Makefile.am,
-	  MonoDevelop.Debugger/BreakpointPropertiesDialog.cs,
-	  MonoDevelop.Debugger/BreakpointPad.cs: Improved breakpoints pad.
-	  Implemented the breakpoint properties dialog.
-
-2008-08-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.addin.xml, MonoDevelop.Debugger.mdp,
-	  Makefile.am, MonoDevelop.Debugger/ThreadsPad.cs: Added threads pad.
-	  Based on the work by Alfonso Santos Luaces.
-	* MonoDevelop.Debugger/BreakpointPad.cs: Properly unsubscribe debug
-	  service events.
-
-2008-08-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/DisasemblyView.cs: Track api changes.
-
-2008-07-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/ObjectValuePad.cs: Remove debug code.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Debugger.mdp: Removed some parts of the documentation
-	  service.
-
-2008-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.addin.xml, MonoDevelop.Debugger.mdp,
-	  Makefile.am, MonoDevelop.Debugger/WatchPad.cs,
-	  MonoDevelop.Debugger/LocalsPad.cs,
-	  MonoDevelop.Debugger/BreakpointPad.cs,
-	  MonoDevelop.Debugger/ObjectValuePad.cs: Implemented LocalsPad.
-	  Moved all logic shared with the WatchPad to ObjectValuePad.
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Highlight values that
-	  have changed since the last time the debugger was stopped.
-
-2008-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.addin.xml, MonoDevelop.Debugger.mdp,
-	  Makefile.am, MonoDevelop.Debugger/BreakpointPad.cs: Initial
-	  implementation of the breakpoints pad by Alfonso Santos Luaces.
-
-2008-07-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/WatchPad.cs: Make sure the value tree is
-	  properly initialized the first time it is shown.
-
-2008-07-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Makefile.am, MonoDevelop.Debugger.mdp: Fix automake build paths. Add
-	  System.Xml reference and don't local copy refs, for build within
-	  MD.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Remove ellupsizing.
-	  Doesn't work well with the debug tooltip.
-
-2008-07-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs,
-	  MonoDevelop.Debugger/WatchPad.cs: Store watch pad expressions into
-	  the user preferences when closing a solution.
-
-2008-07-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Make columns resizable.
-
-2008-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Show icons for Type and
-	  Namespace values.
-
-2008-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.mdp, Makefile.am,
-	  MonoDevelop.Debugger/WatchPad.cs,
-	  MonoDevelop.Debugger/ObjectValueTreeView.cs: Added support for code
-	  completion.
-
-2008-07-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/WatchPad.cs: Don't update the tree if there is
-	  no current frame, since it will reset the current expansion state.
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Added events which are
-	  fired when value editing starts/ends. Fixes some text escaping
-	  issues.
-
-2008-07-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/WatchPad.cs,
-	  MonoDevelop.Debugger/ObjectValueTreeView.cs: Show member icons in
-	  the watch pad. Support a new compact mode to be used in the debug
-	  tooltips.
-
-2008-07-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Debugger/DebugTextMarker.cs,
-	  MonoDevelop.Debugger/DisasemblyView.cs: debug markers are now using
-	  color styles instead of hard coded colors.
-
-2008-07-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger/DebugTextMarker.cs: Improved colors.
-	* MonoDevelop.Debugger/ObjectValueTreeView.cs: Allow editing variable
-	  values.
-	* MonoDevelop.Debugger/Initializer.cs: Implement ShowDisassembly
-	  command.
-	* MonoDevelop.Debugger/DisasemblyView.cs: Implemented support for mixed
-	  assembler/source code view.
-
-2008-07-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.addin.xml: Fix add-in id.
-
-2008-07-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.mdp, Makefile.am,
-	  MonoDevelop.Debugger/DebugTextMarker.cs: Implemented markers for
-	  breakpoint and current execution line.
-	* MonoDevelop.Debugger/DisasemblyView.cs: Use new current line marker.
-
-2008-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.addin.xml, MonoDevelop.Debugger.mdp,
-	  Makefile.am, MonoDevelop.Debugger/WatchPad.cs,
-	  MonoDevelop.Debugger/ObjectValueTreeView.cs,
-	  MonoDevelop.Debugger/Initializer.cs,
-	  MonoDevelop.Debugger/DisasemblyView.cs,
-	  MonoDevelop.Debugger/StackTracePad.cs: Improved call stack view.
-	  Implemented disassemble view.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.addin.xml: Bump MD version.
-
-2008-05-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Debugger.addin.xml, MonoDevelop.Debugger.mdp,
-	  Makefile.am, MonoDevelop.Debugger/WatchPad.cs,
-	  MonoDevelop.Debugger/ObjectValueTreeView.cs,
-	  MonoDevelop.Debugger/StackTracePad.cs: Implemented initial watch
-	  pad.
-
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs
index 604979ad5e..00fa8d0e8b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs
@@ -27,6 +27,7 @@ using System;
 using MonoDevelop.Components;
 using Mono.Debugging.Client;
 using Gtk;
+using MonoDevelop.Ide.Fonts;
 
 namespace MonoDevelop.Debugger.PreviewVisualizers
 {
@@ -42,23 +43,16 @@ namespace MonoDevelop.Debugger.PreviewVisualizers
 		public override Control GetVisualizerWidget (ObjectValue val)
 		{
 			string value = val.Value;
-			Gdk.Color col = new Gdk.Color (85, 85, 85);
+			Gdk.Color col = Styles.PreviewVisualizerTextColor.ToGdkColor ();
 
 			if (!val.IsNull && (val.TypeName == "string" || val.TypeName == "char[]"))
 				value = '"' + GetString (val) + '"';
 			if (DebuggingService.HasInlineVisualizer (val))
 				value = DebuggingService.GetInlineVisualizer (val).InlineVisualize (val);
 
-			var label = new Gtk.Label (value);
-			var font = label.Style.FontDescription.Copy ();
-
-			if (font.SizeIsAbsolute) {
-				font.AbsoluteSize = font.Size - 1;
-			} else {
-				font.Size -= (int)(Pango.Scale.PangoScale);
-			}
-
-			label.ModifyFont (font);
+			var label = new Gtk.Label ();
+			label.Text = value;
+			label.ModifyFont (FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11));
 			label.ModifyFg (StateType.Normal, col);
 			label.SetPadding (4, 4);
 
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
index a3bd79b733..5a2bb447e7 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
@@ -31,6 +31,7 @@ using Gdk;
 using Gtk;
 using MonoDevelop.Ide;
 using MonoDevelop.Debugger.PreviewVisualizers;
+using MonoDevelop.Ide.Fonts;
 
 namespace MonoDevelop.Debugger
 {
@@ -44,7 +45,7 @@ namespace MonoDevelop.Debugger
 				this.Modal = true;
 			TransientFor = (Gtk.Window) invokingWidget.Toplevel;
 
-			Theme.SetFlatColor (new Cairo.Color (245 / 256.0, 245 / 256.0, 245 / 256.0));
+			Theme.SetBackgroundColor (Styles.PreviewVisualizerBackgroundColor.ToCairoColor ());
 			Theme.Padding = 3;
 			ShowArrow = true;
 			var mainBox = new VBox ();
@@ -64,8 +65,8 @@ namespace MonoDevelop.Debugger
 			headerTable.Attach (hb, 0, 1, 0, 1);
 
 			var headerTitle = new Label ();
-			headerTitle.ModifyFg (StateType.Normal, new Color (36, 36, 36));
-			var font = headerTitle.Style.FontDescription.Copy ();
+			headerTitle.ModifyFg (StateType.Normal, Styles.PreviewVisualizerHeaderTextColor.ToGdkColor ());
+			var font = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12);
 			font.Weight = Pango.Weight.Bold;
 			headerTitle.ModifyFont (font);
 			headerTitle.Text = val.TypeName;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/ChangeLog b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/ChangeLog
deleted file mode 100644
index a7cef8394d..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-2010-04-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Main.cs: Added new test suite for StackFrame. Reorganized a
-	  bit the namespaces. Added tests for bug #580994.
-
-2010-04-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Main.cs: Add unit test for bug 595270: Flags enums in
-	  debugger show the zero value.
-
-2010-03-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Main.cs: Added boxing tests. Disable assignment tests for
-	  MDB only, they now work with SDB.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Tests.TestApp.csproj: Flush.
-
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/TestEvaluation.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/TestEvaluation.cs
index 13b590023a..d227d6dc48 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/TestEvaluation.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/TestEvaluation.cs
@@ -34,19 +34,56 @@ using System.Threading.Tasks;
 
 namespace MonoDevelop.Debugger.Tests.TestApp
 {
+	interface IFoo
+	{
+		int this[int index] { get; }
+		int Prop { get; }
+	}
+	interface IBar
+	{
+		int this[int index] { get; }
+		int Prop { get; }
+	}
+	class Bo
+	{
+		public int Prop { get { return 4; } }
+	}
+	class FooBar : Bo, IFoo, IBar
+	{
+		int IBar.Prop { get { return 1; } }
+		int IFoo.Prop { get { return 2; } }
+		public int Prop { get { return 3; } }
+
+		int IFoo.this[int index]
+		{
+			get
+			{
+				return index;
+			}
+		}
+
+		int IBar.this[int index]
+		{
+			get
+			{
+				return -index;
+			}
+		}
+	}
+
 	class TestEvaluationParent
 	{
 		public int TestMethodBase ()
 		{
 			float c = 4;
-			return 1;
+			return 2;
 		}
 
 		protected string ProtectedStringProperty{ get; set; }
 
 		public virtual int TestMethodBase (string a)
 		{
-			return int.Parse (a) + 1;
+			return int.Parse (a) + 2;
 		}
 
 		protected int TestMethodBase (int a)
@@ -188,11 +225,19 @@ namespace MonoDevelop.Debugger.Tests.TestApp
 				}
 			}
 
+			FooBar = new FooBar ();
+			Foo = new FooBar ();
+			Bar = new FooBar ();
+
 			var testEvaluationChild = new TestEvaluationChild ();
 
 			Console.WriteLine (n); /*break*/
 		}
 
+		public FooBar FooBar { get; set; }
+		public IBar Bar { get; set; }
+		public IFoo Foo { get; set; }
+
 		public string TestCastingArgument (myNint nint)
 		{
 			return nint.v.ToString ();
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/BreakpointsAndSteppingTests.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/BreakpointsAndSteppingTests.cs
index f6140c6ce9..a1d16e178a 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/BreakpointsAndSteppingTests.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/BreakpointsAndSteppingTests.cs
@@ -444,6 +444,12 @@ namespace MonoDevelop.Debugger.Tests
 		[Test]

 		public void DebuggerStepperBoundaryMethod2ProjectAssembliesOnly ()

 		{

+			IgnoreSoftDebugger ("Fix me");

+			//SDB Ignore: DebuggerStepperBoundary is stupid and pretty much uselss attribute anyway

+			//Problem that we have here is that DebuggerStepperBoundary is handled on IDE side

+			//and if method that has DebuggerStepperBoundary also has DebuggerNonUserCode IDE

+			//is never notified about entering such method since runtime handles DebuggerNonUserCode

+			//hence bug

 			InitializeTest ();

 			Session.Options.ProjectAssembliesOnly = true;

 			AddBreakpoint ("f3a22b38-596a-4463-a562-20b342fdec12");

@@ -874,6 +880,7 @@ namespace MonoDevelop.Debugger.Tests
 		public void CatchPointTest2 ()

 		{

 			IgnoreSoftDebugger ("I'm having problem testing this because. There is error nonstop happening in framework about CurrentCulture featching.");

+			IgnoreCorDebugger ("Randomly fails");

 

 			InitializeTest ();

 			AddCatchpoint ("System.Exception", true);

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/ChangeLog b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/ChangeLog
deleted file mode 100644
index 920c56f624..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/ChangeLog
+++ /dev/null
@@ -1,44 +0,0 @@
-2010-04-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* StackFrameTests.cs:
-	* MdbStackFrameTests.cs:
-	* SdbEvaluationTests.cs:
-	* SdbStackFrameTests.cs:
-	* MdbEvaluationTests.cs:
-	* MonoDevelop.Debugger.Tests.csproj: Added new test suite for
-	  StackFrame. Reorganized a bit the namespaces. Added tests
-	  for bug #580994.
-
-2010-04-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* EvaluationTests.cs: Make some tests work on windows.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Tests.csproj: Merged MD.Projects into
-	  MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components
-	  into MD.Ide.
-
-2010-03-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* EvaluationTests.cs:
-	* MdbEvaluationTests.cs: Fix tests. Formatting rules have
-	  changed.
-
-2010-03-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* DebugTests.cs:
-	* EvaluationTests.cs:
-	* MdbEvaluationTests.cs: Added boxing tests. Disable
-	  assignment tests for MDB only, they now work with SDB.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Tests.csproj: Flush.
-
-	* DebugTests.cs: Added support for lazy loading of add-ins
-
-2009-12-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Debugger.Tests.csproj: Add missing file.
-
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/DebugTests.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/DebugTests.cs
index 6b2e752541..fafb2b96c6 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/DebugTests.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/DebugTests.cs
@@ -139,7 +139,7 @@ namespace MonoDevelop.Debugger.Tests
 				return;
 			}
 
-			Console.WriteLine ("Target Runtime: " + runtime.DisplayRuntimeName + " " + runtime.Version);
+			Console.WriteLine ("Target Runtime: " + runtime.DisplayRuntimeName + " " + runtime.Version + " " + (IntPtr.Size == 8 ? "64bit" : "32bit"));
 
 			// main/build/tests
 			FilePath path = Path.GetDirectoryName (GetType ().Assembly.Location);
@@ -204,9 +204,16 @@ namespace MonoDevelop.Debugger.Tests
 			};
 
 			Session.TargetStopped += (sender, e) => {
-				Frame = e.Backtrace.GetFrame (0);
-				lastStoppedPosition = Frame.SourceLocation;
-				targetStoppedEvent.Set ();
+				//This can be null in case of ForcedStop
+				//which is called when exception is thrown
+				//when Continue & Stepping is executed
+				if (e.Backtrace != null) {
+					Frame = e.Backtrace.GetFrame (0);
+					lastStoppedPosition = Frame.SourceLocation;
+					targetStoppedEvent.Set ();
+				} else {
+					Console.WriteLine ("e.Backtrace is null");
+				}
 			};
 
 			var targetExited = new ManualResetEvent (false);
@@ -215,6 +222,10 @@ namespace MonoDevelop.Debugger.Tests
 			};
 
 			Session.Run (dsi, ops);
+			Session.ExceptionHandler = (ex) => {
+				Console.WriteLine ("Session.ExceptionHandler:" + Environment.NewLine + ex.ToString ());
+				return true;
+			};
 			switch (WaitHandle.WaitAny (new WaitHandle[]{ done, targetExited }, 30000)) {
 			case 0:
 				//Breakpoint is hit good... run tests now
@@ -295,7 +306,7 @@ namespace MonoDevelop.Debugger.Tests
 
 		public bool CheckPosition (string guid, int offset = 0, string statement = null, bool silent = false)
 		{
-			if (!targetStoppedEvent.WaitOne (3000)) {
+			if (!targetStoppedEvent.WaitOne (6000)) {
 				if (!silent)
 					Assert.Fail ("CheckPosition failure: Target stop timeout");
 				return false;
@@ -427,7 +438,7 @@ namespace MonoDevelop.Debugger.Tests
 
 			lock (locker) {
 				while (val.IsEvaluating) {
-					if (!Monitor.Wait (locker, 4000))
+					if (!Monitor.Wait (locker, 8000))
 						throw new Exception ("Timeout while waiting for value evaluation");
 				}
 			}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
index 4f06ceae1d..5451a66b67 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
@@ -78,6 +78,12 @@ namespace MonoDevelop.Debugger.Tests
 				return "MonoDevelop";
 			case "SomeEnum":
 				return "SomeEnum";
+			case "IFoo":
+				return "MonoDevelop.Debugger.Tests.TestApp.IFoo";
+			case "IBar":
+				return "MonoDevelop.Debugger.Tests.TestApp.IBar";
+			case "Bo":
+				return "MonoDevelop.Debugger.Tests.TestApp.Bo";
 			}
 			return null;
 		}
@@ -488,23 +494,34 @@ namespace MonoDevelop.Debugger.Tests
 				val = val.Sync ();
 			}
 			Assert.AreEqual ("\"AbstractImplementation\"", val.Value);
+			Assert.AreEqual ("string", val.TypeName);

+
+			IgnoreCorDebugger("TODO: CorDebugger support explicit interfaces");
+
+			val = Eval ("((IInterfaceWithMethodA)objWithMethodA).MethodA()");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("\"InterfaceImplementation\"", val.Value);
 			Assert.AreEqual ("string", val.TypeName);
 
-			// FIXME: failing on CorDebugger
-			if (Session is SoftDebuggerSession) {
-				val = Eval ("true.ToString()");
-				if (!AllowTargetInvokes) {
-					var options = Session.Options.EvaluationOptions.Clone ();
-					options.AllowTargetInvoke = true;
-
-					Assert.IsTrue (val.IsNotSupported);
-					val.Refresh (options);
-					val = val.Sync ();
-				}
+			val = Eval ("true.ToString()");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
 
-				Assert.AreEqual ("\"True\"", val.Value);
-				Assert.AreEqual ("string", val.TypeName);
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
 			}
+
+			Assert.AreEqual ("\"True\"", val.Value);
+			Assert.AreEqual ("string", val.TypeName);
 		}
 
 		[Test]
@@ -596,15 +613,15 @@ namespace MonoDevelop.Debugger.Tests
 			ObjectValue val = Eval ("numbers[0]");
 			Assert.AreEqual ("\"one\"", val.Value);
 			Assert.AreEqual ("string", val.TypeName);
-			
+
 			val = Eval ("numbers[1]");
 			Assert.AreEqual ("\"two\"", val.Value);
 			Assert.AreEqual ("string", val.TypeName);
-			
+
 			val = Eval ("numbers[2]");
 			Assert.AreEqual ("\"three\"", val.Value);
 			Assert.AreEqual ("string", val.TypeName);
-			
+
 			val = Eval ("staticString[2]");
 			if (!AllowTargetInvokes) {
 				var options = Session.Options.EvaluationOptions.Clone ();
@@ -616,7 +633,7 @@ namespace MonoDevelop.Debugger.Tests
 			}
 			Assert.AreEqual ("'m'", val.Value);
 			Assert.AreEqual ("char", val.TypeName);
-			
+
 			val = Eval ("alist[0]");
 			if (!AllowTargetInvokes) {
 				var options = Session.Options.EvaluationOptions.Clone ();
@@ -628,7 +645,7 @@ namespace MonoDevelop.Debugger.Tests
 			}
 			Assert.AreEqual ("1", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
-			
+
 			val = Eval ("alist[1]");
 			if (!AllowTargetInvokes) {
 				var options = Session.Options.EvaluationOptions.Clone ();
@@ -640,7 +657,7 @@ namespace MonoDevelop.Debugger.Tests
 			}
 			Assert.AreEqual ("\"two\"", val.Value);
 			Assert.AreEqual ("string", val.TypeName);
-			
+
 			val = Eval ("alist[2]");
 			if (!AllowTargetInvokes) {
 				var options = Session.Options.EvaluationOptions.Clone ();
@@ -652,6 +669,57 @@ namespace MonoDevelop.Debugger.Tests
 			}
 			Assert.AreEqual ("3", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
+
+			IgnoreCorDebugger("TODO: CorDebugger support explicit interfaces");
+
+			val = Eval ("FooBar[2]");
+			Assert.IsTrue (val.IsUnknown);
+			//We have IFoo and IBar implementation but without typecasting and determening which implementation user wants
+			//we have to return error/Unknown instead of random implementation(FooBar[2] is not compilable anyway)
+			val = Eval ("((IFoo)FooBar)[2]");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("int", val.TypeName);
+			Assert.AreEqual ("2", val.Value);
+			val = Eval ("((IBar)FooBar)[2]");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("int", val.TypeName);
+			Assert.AreEqual ("-2", val.Value);
+			val = Eval ("Bar[3]");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("int", val.TypeName);
+			Assert.AreEqual ("-3", val.Value);
+			val = Eval ("Foo[3]");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("int", val.TypeName);
+			Assert.AreEqual ("3", val.Value);
 		}
 
 		void CheckValue (string expected, string actual, bool isSimpleProperty)
@@ -874,7 +942,73 @@ namespace MonoDevelop.Debugger.Tests
 				val = val.Sync ();
 			}
 			Assert.AreEqual ("3", val.Value);
+			Assert.AreEqual ("int", val.TypeName);

+
+			IgnoreCorDebugger("TODO: CorDebugger support explicit interfaces");
+
+			val = Eval ("Bar.Prop");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("int", val.TypeName);
+			Assert.AreEqual ("1", val.Value);
+			val = Eval ("Foo.Prop");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("int", val.TypeName);
+			Assert.AreEqual ("2", val.Value);
+			val = Eval ("FooBar.Prop");
 			Assert.AreEqual ("int", val.TypeName);
+			Assert.AreEqual ("3", val.Value);
+			val = Eval ("((Bo)FooBar).Prop");
+			Assert.AreEqual ("int", val.TypeName);
+			Assert.AreEqual ("4", val.Value);
+			val = Eval ("FooBar");
+			richChildren = val.GetAllChildrenSync ();
+			Assert.AreEqual ("Prop (MonoDevelop.Debugger.Tests.TestApp.FooBar)", richChildren [0].Name);
+			Assert.AreEqual ("int", richChildren [0].TypeName);
+			Assert.AreEqual ("3", richChildren [0].Value);
+			Assert.AreEqual ("Prop (MonoDevelop.Debugger.Tests.TestApp.Bo)", richChildren [1].Name);
+			Assert.AreEqual ("int", richChildren [1].TypeName);
+			Assert.AreEqual ("4", richChildren [1].Value);
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (richChildren [2].IsNotSupported);
+				richChildren [2].Refresh (options);
+				richChildren [2] = richChildren [2].Sync ();
+				Assert.IsTrue (richChildren [3].IsNotSupported);
+				richChildren [3].Refresh (options);
+				richChildren [3] = richChildren [3].Sync ();
+			}
+			//TODO: Include interface names into sorting
+			if ("Prop (MonoDevelop.Debugger.Tests.TestApp.IFoo)" == richChildren [2].Name) {
+				Assert.AreEqual ("Prop (MonoDevelop.Debugger.Tests.TestApp.IFoo)", richChildren [2].Name);
+				Assert.AreEqual ("int", richChildren [2].TypeName);
+				Assert.AreEqual ("2", richChildren [2].Value);
+				Assert.AreEqual ("Prop (MonoDevelop.Debugger.Tests.TestApp.IBar)", richChildren [3].Name);
+				Assert.AreEqual ("int", richChildren [3].TypeName);
+				Assert.AreEqual ("1", richChildren [3].Value);
+			} else {
+				Assert.AreEqual ("Prop (MonoDevelop.Debugger.Tests.TestApp.IFoo)", richChildren [3].Name);
+				Assert.AreEqual ("int", richChildren [3].TypeName);
+				Assert.AreEqual ("2", richChildren [3].Value);
+				Assert.AreEqual ("Prop (MonoDevelop.Debugger.Tests.TestApp.IBar)", richChildren [2].Name);
+				Assert.AreEqual ("int", richChildren [2].TypeName);
+				Assert.AreEqual ("1", richChildren [2].Value);
+			}
 		}
 
 		[Test]
@@ -1520,7 +1654,7 @@ namespace MonoDevelop.Debugger.Tests
 		public void FormatArray ()
 		{
 			ObjectValue val;
-			
+
 			val = Eval ("numbers");
 			Assert.AreEqual ("{string[3]}", val.Value);
 			Assert.AreEqual ("string[]", val.TypeName);
@@ -1529,19 +1663,22 @@ namespace MonoDevelop.Debugger.Tests
 			Assert.AreEqual ("{int[2][]}", val.Value);
 			Assert.AreEqual ("int[][]", val.TypeName);
 
+			IgnoreCorDebugger ("Randomly fails");
+
+			val = Eval ("arrayWithLowerBounds");
+			Assert.AreEqual ("int[,,]", val.TypeName);
+			Assert.AreEqual ("{int[3,4,5]}", val.Value);
+
 			val = Eval ("numbersMulti");
 			Assert.AreEqual ("{int[3,4,5]}", val.Value);
 			Assert.AreEqual ("int[,,]", val.TypeName);
 			Assert.IsFalse (val.IsNull);
 
+			IgnoreSoftDebugger ("Randomly fails, tracked as Bug 36712");
 			val = Eval ("nulledByteArray");
 			Assert.AreEqual ("(null)", val.Value);
 			Assert.AreEqual ("byte[]", val.TypeName);
 			Assert.IsTrue (val.IsNull);
-
-			val = Eval ("arrayWithLowerBounds");
-			Assert.AreEqual ("int[,,]", val.TypeName);
-			Assert.AreEqual ("{int[3,4,5]}", val.Value);
 		}
 
 		[Test]
@@ -1654,21 +1791,6 @@ namespace MonoDevelop.Debugger.Tests
 		{
 			ObjectValue val;
 
-			//When fixed put into Inheriting test
-			val = Eval ("b.TestMethod ()");
-			Assert.AreEqual ("2", val.Value);
-			Assert.AreEqual ("int", val.TypeName);
-
-			//When fixed put into Inheriting test
-			val = Eval ("b.TestMethod (42)");
-			Assert.AreEqual ("44", val.Value);
-			Assert.AreEqual ("int", val.TypeName);
-
-			//When fixed put into Inheriting test
-			val = Eval ("base.TestMethodBase ()");
-			Assert.AreEqual ("2", val.Value);
-			Assert.AreEqual ("int", val.TypeName);
-
 			val = Eval ("base.TestMethodBase (\"23\")");
 			Assert.AreEqual ("25", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
@@ -1677,10 +1799,6 @@ namespace MonoDevelop.Debugger.Tests
 			Assert.AreEqual ("44", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
 
-			val = Eval ("base.TestMethodBaseNotOverrided ()");
-			Assert.AreEqual ("1", val.Value);
-			Assert.AreEqual ("int", val.TypeName);
-
 			//When fixed put into TypeReferenceGeneric
 			val = Eval ("Dictionary<string,NestedClass>");
 			Assert.AreEqual ("System.Collections.Generic.Dictionary<string,MonoDevelop.Debugger.Tests.TestApp.TestEvaluation.NestedClass>", val.Value);
@@ -1693,18 +1811,6 @@ namespace MonoDevelop.Debugger.Tests
 			Assert.AreEqual ("<type>", val.TypeName);
 			Assert.AreEqual (ObjectValueFlags.Type, val.Flags & ObjectValueFlags.OriginMask);
 
-			//When fixed put into MethodInvoke(failing also on CorDebugger)
-			val = Eval ("((IInterfaceWithMethodA)objWithMethodA).MethodA()");
-			if (!AllowTargetInvokes) {
-				var options = Session.Options.EvaluationOptions.Clone ();
-				options.AllowTargetInvoke = true;
-
-				Assert.IsTrue (val.IsNotSupported);
-				val.Refresh (options);
-				val = val.Sync ();
-			}
-			Assert.AreEqual ("\"InterfaceImplementation\"", val.Value);
-			Assert.AreEqual ("string", val.TypeName);
 		}
 
 		[Test]
@@ -1855,6 +1961,9 @@ namespace MonoDevelop.Debugger.Tests
 			Assert.AreEqual ("43", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
 
+			if (soft != null && soft.ProtocolVersion < new Version (2, 40))
+				Assert.Ignore ("A newer version of the Mono runtime is required.");
+
 			val = Eval ("b.Prop");
 			if (!AllowTargetInvokes) {
 				var options = Session.Options.EvaluationOptions.Clone ();
@@ -1867,7 +1976,7 @@ namespace MonoDevelop.Debugger.Tests
 			Assert.AreEqual ("2", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
 
-			val = Eval ("b.PropNoVirt1");
+			val = Eval ("((B)b).PropNoVirt1");
 			if (!AllowTargetInvokes && soft == null) {
 				var options = Session.Options.EvaluationOptions.Clone ();
 				options.AllowTargetInvoke = true;
@@ -1879,7 +1988,7 @@ namespace MonoDevelop.Debugger.Tests
 			Assert.AreEqual ("2", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
 
-			val = Eval ("b.PropNoVirt2");
+			val = Eval ("((B)b).PropNoVirt2");
 			if (!AllowTargetInvokes && soft == null) {
 				var options = Session.Options.EvaluationOptions.Clone ();
 				options.AllowTargetInvoke = true;
@@ -1891,7 +2000,7 @@ namespace MonoDevelop.Debugger.Tests
 			Assert.AreEqual ("2", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
 
-			val = Eval ("b.IntField");
+			val = Eval ("((B)b).IntField");
 			Assert.AreEqual ("2", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
 
@@ -1991,9 +2100,6 @@ namespace MonoDevelop.Debugger.Tests
 			Assert.AreEqual ("1", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
 
-			if (soft != null && soft.ProtocolVersion < new Version (2, 40))
-				Assert.Ignore ("A newer version of the Mono runtime is required.");
-
 			val = Eval ("b.TestMethod (\"23\")");
 			if (!AllowTargetInvokes) {
 				var options = Session.Options.EvaluationOptions.Clone ();
@@ -2006,25 +2112,102 @@ namespace MonoDevelop.Debugger.Tests
 			Assert.AreEqual ("25", val.Value);
 			Assert.AreEqual ("int", val.TypeName);
 
-			if (Session is SoftDebuggerSession) {
-				val = Eval ("System.Text.Encoding.UTF8.GetPreamble ()");
-				if (!AllowTargetInvokes) {
-					var options = Session.Options.EvaluationOptions.Clone ();
-					options.AllowTargetInvoke = true;
-
-					Assert.IsTrue (val.IsNotSupported);
-					val.Refresh (options);
-					val = val.Sync ();
-				}
-				Assert.AreEqual ("byte[]", val.TypeName);
-				Assert.AreEqual ("{byte[3]}", val.Value);
-				var bytes = ((RawValueArray)val.GetRawValue ()).ToArray ();
-				Assert.AreEqual (239, bytes.GetValue (0));
-				Assert.AreEqual (187, bytes.GetValue (1));
-				Assert.AreEqual (191, bytes.GetValue (2));
-			} else {
-				Assert.Ignore ("Not working on CorDebugger");
+			val = Eval ("base.TestMethodBaseNotOverrided ()");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("1", val.Value);
+			Assert.AreEqual ("int", val.TypeName);
+
+			val = Eval("base.TestMethodBase ()");
+			if (!AllowTargetInvokes)

+			{
+				var options = Session.Options.EvaluationOptions.Clone();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue(val.IsNotSupported);
+				val.Refresh(options);
+				val = val.Sync();
 			}
+			Assert.AreEqual("2", val.Value);
+			Assert.AreEqual("int", val.TypeName);
+
+			IgnoreCorDebugger("Not working on CorDebugger");
+
+			val = Eval("b.PropNoVirt2");
+			if (!AllowTargetInvokes)

+			{
+				var options = Session.Options.EvaluationOptions.Clone();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue(val.IsNotSupported);
+				val.Refresh(options);
+				val = val.Sync();
+			}
+			Assert.AreEqual("1", val.Value);
+			Assert.AreEqual("int", val.TypeName);
+
+			val = Eval("b.IntField");
+			Assert.AreEqual("1", val.Value);
+			Assert.AreEqual("int", val.TypeName);

+

+			val = Eval("b.PropNoVirt1");
+			if (!AllowTargetInvokes && soft == null)

+			{
+				var options = Session.Options.EvaluationOptions.Clone();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue(val.IsNotSupported);
+				val.Refresh(options);
+				val = val.Sync();
+			}
+			Assert.AreEqual("1", val.Value);
+			Assert.AreEqual("int", val.TypeName);
+
+			val = Eval ("System.Text.Encoding.UTF8.GetPreamble ()");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("byte[]", val.TypeName);
+			Assert.AreEqual ("{byte[3]}", val.Value);
+			var bytes = ((RawValueArray)val.GetRawValue ()).ToArray ();
+			Assert.AreEqual (239, bytes.GetValue (0));
+			Assert.AreEqual (187, bytes.GetValue (1));
+			Assert.AreEqual (191, bytes.GetValue (2));
+
+			val = Eval ("b.TestMethod ()");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("1", val.Value);
+			Assert.AreEqual ("int", val.TypeName);
+
+			val = Eval ("b.TestMethod (42)");
+			if (!AllowTargetInvokes) {
+				var options = Session.Options.EvaluationOptions.Clone ();
+				options.AllowTargetInvoke = true;
+
+				Assert.IsTrue (val.IsNotSupported);
+				val.Refresh (options);
+				val = val.Sync ();
+			}
+			Assert.AreEqual ("43", val.Value);
+			Assert.AreEqual ("int", val.TypeName);
 		}
 
 		[Test]
@@ -2060,14 +2243,11 @@ namespace MonoDevelop.Debugger.Tests
 				Assert.AreEqual ("\"b\"", children [1].Value);
 			} else {
 				// when AllowTargetInvokes is disabled, it also disables debugger proxies
-				Assert.AreEqual (7, children.Length);
+				Assert.AreEqual (18, children.Length);
 				Assert.AreEqual ("Comparer", children [0].Name);
-				Assert.AreEqual ("Count", children [1].Name);
-				Assert.AreEqual ("Keys", children [2].Name);
-				Assert.AreEqual ("Values", children [3].Name);
-				Assert.AreEqual ("Static members", children [4].Name);
-				Assert.AreEqual ("Non-public members", children [5].Name);
-				Assert.AreEqual ("IEnumerator", children [6].Name);
+				Assert.AreEqual ("Static members", children [15].Name);
+				Assert.AreEqual ("Non-public members", children [16].Name);
+				Assert.AreEqual ("IEnumerator", children [17].Name);
 			}
 
 			val = Eval ("stringList");
@@ -2085,12 +2265,11 @@ namespace MonoDevelop.Debugger.Tests
 				Assert.AreEqual ("\"ccc\"", children [2].Value);
 			} else {
 				// when AllowTargetInvokes is disabled, it also disables debugger proxies
-				Assert.AreEqual (5, children.Length);
+				Assert.AreEqual (10, children.Length);
 				Assert.AreEqual ("Capacity", children [0].Name);
-				Assert.AreEqual ("Count", children [1].Name);
-				Assert.AreEqual ("Static members", children [2].Name);
-				Assert.AreEqual ("Non-public members", children [3].Name);
-				Assert.AreEqual ("IEnumerator", children [4].Name);
+				Assert.AreEqual ("Static members", children [7].Name);
+				Assert.AreEqual ("Non-public members", children [8].Name);
+				Assert.AreEqual ("IEnumerator", children [9].Name);
 			}
 
 			val = Eval ("alist");
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
index 25bf813d8d..b1212633d0 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
@@ -60,11 +60,6 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
       <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
       <Name>MonoDevelop.Ide</Name>
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
index 78c001deee..806bbfd00f 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
@@ -30,12 +30,12 @@
 	</ExtensionPoint>
 	<Extension path = "/MonoDevelop/Ide/Pads">
 		<Category id="Debug" _name="Debug Windows">
-			<Pad id = "MonoDevelop.Debugger.WatchPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-watch" class = "MonoDevelop.Debugger.WatchPad" _label="Watch" />
-			<Pad id = "MonoDevelop.Debugger.LocalsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-locals" class = "MonoDevelop.Debugger.LocalsPad" _label="Locals" />
 			<Pad id = "MonoDevelop.Debugger.BreakpointPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-breakpoints" class = "MonoDevelop.Debugger.BreakpointPad" _label="Breakpoints" />
-			<Pad id = "MonoDevelop.Debugger.ThreadsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-threads" class = "MonoDevelop.Debugger.ThreadsPad" _label="Threads" />
-			<Pad id = "MonoDevelop.Debugger.StackTracePad" defaultLayout="Debug" defaultPlacement = "MonoDevelop.Debugger.WatchPad/Right Bottom" icon="md-view-debug-call-stack" class = "MonoDevelop.Debugger.StackTracePad" _label="Call Stack" />
+			<Pad id = "MonoDevelop.Debugger.LocalsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-locals" class = "MonoDevelop.Debugger.LocalsPad" _label="Locals" />
+			<Pad id = "MonoDevelop.Debugger.WatchPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-watch" class = "MonoDevelop.Debugger.WatchPad" _label="Watch" />
 			<Pad id = "MonoDevelop.Debugger.ImmediatePad" defaultLayout="Debug" defaultPlacement = "MonoDevelop.Debugger.StackTracePad/Center Bottom" icon="md-view-debug-immediate" class = "MonoDevelop.Debugger.ImmediatePad" _label="Immediate" />
+			<Pad id = "MonoDevelop.Debugger.StackTracePad" defaultLayout="Debug" defaultPlacement = "MonoDevelop.Debugger.WatchPad/Right Bottom" icon="md-view-debug-call-stack" class = "MonoDevelop.Debugger.StackTracePad" _label="Call Stack" />
+			<Pad id = "MonoDevelop.Debugger.ThreadsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-threads" class = "MonoDevelop.Debugger.ThreadsPad" _label="Threads" />
 		</Category>
 	</Extension>
 
@@ -56,14 +56,14 @@
 	<Extension path = "/MonoDevelop/Ide/Commands/Project">
 		<Command id = "MonoDevelop.Debugger.DebugCommands.Debug"
 				defaultHandler = "MonoDevelop.Debugger.DebugHandler"
-				icon = "md-execute-debug"
+				icon = "md-bug"
 				shortcut = "F5"
 				macShortcut = "Meta|Return"
 				_description = "Start debugging"
 				_label = "Start _Debugging" />
 		<Command id = "MonoDevelop.Debugger.DebugCommands.DebugEntry"
 				defaultHandler = "MonoDevelop.Debugger.DebugEntryHandler"
-				icon = "md-execute-debug"
+				icon = "md-bug"
 				_description = "Debug current project"
 				_label = "Start D_ebugging Item" />
 	</Extension>
@@ -124,7 +124,7 @@
 		<Command id = "MonoDevelop.Debugger.DebugCommands.NewCatchpoint"
 				defaultHandler = "MonoDevelop.Debugger.NewCatchpointHandler"
 				_label = "New Exception Catchpoint"
-				icon = "md-breakpoint-new" />
+				icon = "md-catchpoint-new" />
 		<Command id = "MonoDevelop.Debugger.DebugCommands.ShowBreakpoints"
 				defaultHandler = "MonoDevelop.Debugger.ShowBreakpointsHandler"
 				_label = "View Breakpoints"
@@ -164,6 +164,7 @@
 				defaultHandler = "MonoDevelop.Debugger.ExpressionEvaluatorCommand" />
 		<Command id = "MonoDevelop.Debugger.DebugCommands.ShowCurrentExecutionLine"
 				_label = "Show Current Execution Line"
+				icon = "md-go-to-line"
 				shortcut = "Alt|*"
 				defaultHandler = "MonoDevelop.Debugger.ShowCurrentExecutionLineCommand" />
 		<Command id = "MonoDevelop.Debugger.DebugCommands.AddWatch"
@@ -230,15 +231,12 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Core/StockIcons">
-		<StockIcon stockid = "md-execute-debug" icon = "gtk-execute|res:debug-overlay-16.png" size = "Menu"/>
-		<StockIcon stockid = "md-execute-debug" icon = "gtk-execute|res:debug-overlay-22.png" size = "SmallToolbar"/>
-		<StockIcon stockid = "md-execute-debug" icon = "gtk-execute|res:debug-overlay-24.png" size = "LargeToolbar"/>
 		<StockIcon stockid = "md-continue-debug" resource = "continue-16.png" size = "Menu"/>
 		<StockIcon stockid = "md-pause-debug" resource = "pause-16.png" size = "Menu"/>
 		<StockIcon stockid = "md-step-into-debug" resource = "step-in-16.png" size = "Menu"/>
 		<StockIcon stockid = "md-step-out-debug" resource = "step-out-16.png" size = "Menu"/>
 		<StockIcon stockid = "md-step-over-debug" resource = "step-over-16.png" size = "Menu"/>
-		<StockIcon stockid = "md-view-debug-breakpoints" resource = "breakpoint-16.png" size="Menu" />
+		<StockIcon stockid = "md-view-debug-breakpoints" resource = "pad-breakpoints-16.png" size="Menu" />
 		<StockIcon stockid = "md-view-debug-call-stack" resource = "pad-call-stack-16.png" size="Menu" />
 		<StockIcon stockid = "md-view-debug-locals" resource = "pad-locals-16.png" size="Menu" />
 		<StockIcon stockid = "md-view-debug-threads" resource = "pad-threads-16.png" size="Menu" />
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
index b90a0b4dd1..3bece5c534 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
@@ -91,6 +91,26 @@
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -103,11 +123,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
@@ -136,7 +151,6 @@
     <Compile Include="MonoDevelop.Debugger\WatchPad.cs" />
     <Compile Include="MonoDevelop.Debugger\Initializer.cs" />
     <Compile Include="MonoDevelop.Debugger\DisassemblyView.cs" />
-    <Compile Include="MonoDevelop.Debugger\DebugTextMarker.cs" />
     <Compile Include="MonoDevelop.Debugger\BreakpointPad.cs" />
     <Compile Include="MonoDevelop.Debugger\LocalsPad.cs" />
     <Compile Include="MonoDevelop.Debugger\ObjectValuePad.cs" />
@@ -186,6 +200,7 @@
     <Compile Include="MonoDevelop.Debugger\SourceCodeLookup.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Debugger.DebugApplicationDialog.cs" />
     <Compile Include="MonoDevelop.Debugger\DebugApplicationDialog.cs" />
+    <Compile Include="MonoDevelop.Debugger\Styles.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDevelop.Debugger.addin.xml">
@@ -194,35 +209,53 @@
     <EmbeddedResource Include="gtk-gui\gui.stetic">
       <LogicalName>gui.stetic</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\debug-overlay-16.png">
-      <LogicalName>debug-overlay-16.png</LogicalName>
+    <EmbeddedResource Include="icons\breakpoint-16.png">
+      <LogicalName>breakpoint-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\breakpoint-16%402x.png">
+      <LogicalName>breakpoint-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\debug-overlay-16%402x.png">
-      <LogicalName>debug-overlay-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\breakpoint-16~dark.png">
+      <LogicalName>breakpoint-16~dark.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\debug-overlay-22.png">
-      <LogicalName>debug-overlay-22.png</LogicalName>
+    <EmbeddedResource Include="icons\breakpoint-16~dark%402x.png">
+      <LogicalName>breakpoint-16~dark@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\debug-overlay-22%402x.png">
-      <LogicalName>debug-overlay-22@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\breakpoint-16~disabled.png">
+      <LogicalName>breakpoint-16~disabled.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\debug-overlay-24.png">
-      <LogicalName>debug-overlay-24.png</LogicalName>
+    <EmbeddedResource Include="icons\breakpoint-16~disabled%402x.png">
+      <LogicalName>breakpoint-16~disabled@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\debug-overlay-24%402x.png">
-      <LogicalName>debug-overlay-24@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\breakpoint-16~dark~disabled.png">
+      <LogicalName>breakpoint-16~dark~disabled.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\debug-overlay-32.png">
-      <LogicalName>debug-overlay-32.png</LogicalName>
+    <EmbeddedResource Include="icons\breakpoint-16~dark~disabled%402x.png">
+      <LogicalName>breakpoint-16~dark~disabled@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\debug-overlay-32%402x.png">
-      <LogicalName>debug-overlay-32@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\pad-breakpoints-16.png">
+      <LogicalName>pad-breakpoints-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\breakpoint-16.png">
-      <LogicalName>breakpoint-16.png</LogicalName>
+    <EmbeddedResource Include="icons\pad-breakpoints-16%402x.png">
+      <LogicalName>pad-breakpoints-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\breakpoint-16%402x.png">
-      <LogicalName>breakpoint-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\pad-breakpoints-16~dark.png">
+      <LogicalName>pad-breakpoints-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-breakpoints-16~dark%402x.png">
+      <LogicalName>pad-breakpoints-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-breakpoints-16~sel.png">
+      <LogicalName>pad-breakpoints-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-breakpoints-16~sel%402x.png">
+      <LogicalName>pad-breakpoints-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-breakpoints-16~dark~sel.png">
+      <LogicalName>pad-breakpoints-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-breakpoints-16~dark~sel%402x.png">
+      <LogicalName>pad-breakpoints-16~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-call-stack-16.png">
       <LogicalName>pad-call-stack-16.png</LogicalName>
@@ -230,84 +263,246 @@
     <EmbeddedResource Include="icons\pad-call-stack-16%402x.png">
       <LogicalName>pad-call-stack-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-call-stack-16~dark.png">
+      <LogicalName>pad-call-stack-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-call-stack-16~dark%402x.png">
+      <LogicalName>pad-call-stack-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-call-stack-16~sel.png">
+      <LogicalName>pad-call-stack-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-call-stack-16~sel%402x.png">
+      <LogicalName>pad-call-stack-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-call-stack-16~dark~sel.png">
+      <LogicalName>pad-call-stack-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-call-stack-16~dark~sel%402x.png">
+      <LogicalName>pad-call-stack-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-locals-16.png">
       <LogicalName>pad-locals-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-locals-16%402x.png">
       <LogicalName>pad-locals-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-locals-16~dark.png">
+      <LogicalName>pad-locals-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-locals-16~dark%402x.png">
+      <LogicalName>pad-locals-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-locals-16~sel.png">
+      <LogicalName>pad-locals-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-locals-16~sel%402x.png">
+      <LogicalName>pad-locals-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-locals-16~dark~sel.png">
+      <LogicalName>pad-locals-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-locals-16~dark~sel%402x.png">
+      <LogicalName>pad-locals-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-threads-16.png">
       <LogicalName>pad-threads-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-threads-16%402x.png">
       <LogicalName>pad-threads-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-threads-16~dark.png">
+      <LogicalName>pad-threads-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-threads-16~dark%402x.png">
+      <LogicalName>pad-threads-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-threads-16~sel.png">
+      <LogicalName>pad-threads-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-threads-16~sel%402x.png">
+      <LogicalName>pad-threads-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-threads-16~dark~sel.png">
+      <LogicalName>pad-threads-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-threads-16~dark~sel%402x.png">
+      <LogicalName>pad-threads-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-watch-16.png">
       <LogicalName>pad-watch-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-watch-16%402x.png">
       <LogicalName>pad-watch-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-watch-16~dark.png">
+      <LogicalName>pad-watch-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-watch-16~dark%402x.png">
+      <LogicalName>pad-watch-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-watch-16~sel.png">
+      <LogicalName>pad-watch-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-watch-16~sel%402x.png">
+      <LogicalName>pad-watch-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-watch-16~dark~sel.png">
+      <LogicalName>pad-watch-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-watch-16~dark~sel%402x.png">
+      <LogicalName>pad-watch-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-debugger-16.png">
       <LogicalName>prefs-debugger-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-debugger-16%402x.png">
       <LogicalName>prefs-debugger-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-debugger-16~dark.png">
+      <LogicalName>prefs-debugger-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-debugger-16~dark%402x.png">
+      <LogicalName>prefs-debugger-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-debugger-16~sel.png">
+      <LogicalName>prefs-debugger-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-debugger-16~sel%402x.png">
+      <LogicalName>prefs-debugger-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-debugger-16~dark~sel.png">
+      <LogicalName>prefs-debugger-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-debugger-16~dark~sel%402x.png">
+      <LogicalName>prefs-debugger-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\lightning-16.png">
       <LogicalName>lightning-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\lightning-16%402x.png">
       <LogicalName>lightning-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\lightning-16~dark.png">
+      <LogicalName>lightning-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lightning-16~dark%402x.png">
+      <LogicalName>lightning-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lightning-16~disabled.png">
+      <LogicalName>lightning-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lightning-16~disabled%402x.png">
+      <LogicalName>lightning-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lightning-16~dark~disabled.png">
+      <LogicalName>lightning-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lightning-16~dark~disabled%402x.png">
+      <LogicalName>lightning-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\exception-48~dark.png">
+      <LogicalName>exception-48~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\exception-48~dark%402x.png">
+      <LogicalName>exception-48~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-breakpoint-15.png">
       <LogicalName>gutter-breakpoint-15.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-breakpoint-15%402x.png">
       <LogicalName>gutter-breakpoint-15@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-breakpoint-15~dark.png">
+      <LogicalName>gutter-breakpoint-15~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-breakpoint-15~dark%402x.png">
+      <LogicalName>gutter-breakpoint-15~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-breakpoint-disabled-15.png">
       <LogicalName>gutter-breakpoint-disabled-15.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-breakpoint-disabled-15%402x.png">
       <LogicalName>gutter-breakpoint-disabled-15@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-breakpoint-disabled-15~dark.png">
+      <LogicalName>gutter-breakpoint-disabled-15~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-breakpoint-disabled-15~dark%402x.png">
+      <LogicalName>gutter-breakpoint-disabled-15~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-breakpoint-invalid-15.png">
       <LogicalName>gutter-breakpoint-invalid-15.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-breakpoint-invalid-15%402x.png">
       <LogicalName>gutter-breakpoint-invalid-15@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-breakpoint-invalid-15~dark.png">
+      <LogicalName>gutter-breakpoint-invalid-15~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-breakpoint-invalid-15~dark%402x.png">
+      <LogicalName>gutter-breakpoint-invalid-15~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-execution-15.png">
       <LogicalName>gutter-execution-15.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-execution-15%402x.png">
       <LogicalName>gutter-execution-15@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-execution-15~dark.png">
+      <LogicalName>gutter-execution-15~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-execution-15~dark%402x.png">
+      <LogicalName>gutter-execution-15~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-stack-15.png">
       <LogicalName>gutter-stack-15.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-stack-15%402x.png">
       <LogicalName>gutter-stack-15@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-stack-15~dark.png">
+      <LogicalName>gutter-stack-15~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-stack-15~dark%402x.png">
+      <LogicalName>gutter-stack-15~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-tracepoint-15.png">
       <LogicalName>gutter-tracepoint-15.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-tracepoint-15%402x.png">
       <LogicalName>gutter-tracepoint-15@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-tracepoint-15~dark.png">
+      <LogicalName>gutter-tracepoint-15~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-tracepoint-15~dark%402x.png">
+      <LogicalName>gutter-tracepoint-15~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-tracepoint-disabled-15.png">
       <LogicalName>gutter-tracepoint-disabled-15.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-tracepoint-disabled-15%402x.png">
       <LogicalName>gutter-tracepoint-disabled-15@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-tracepoint-disabled-15~dark.png">
+      <LogicalName>gutter-tracepoint-disabled-15~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-tracepoint-disabled-15~dark%402x.png">
+      <LogicalName>gutter-tracepoint-disabled-15~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-tracepoint-invalid-15.png">
       <LogicalName>gutter-tracepoint-invalid-15.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-tracepoint-invalid-15%402x.png">
       <LogicalName>gutter-tracepoint-invalid-15@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-tracepoint-invalid-15~dark.png">
+      <LogicalName>gutter-tracepoint-invalid-15~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-tracepoint-invalid-15~dark%402x.png">
+      <LogicalName>gutter-tracepoint-invalid-15~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\stack-pointer-16.png">
       <LogicalName>stack-pointer-16.png</LogicalName>
     </EmbeddedResource>
@@ -326,6 +521,24 @@
     <EmbeddedResource Include="icons\exception-outline-16%402x.png">
       <LogicalName>exception-outline-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\stack-pointer-16~dark.png">
+      <LogicalName>stack-pointer-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stack-pointer-16~dark%402x.png">
+      <LogicalName>stack-pointer-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stack-pointer-16~disabled.png">
+      <LogicalName>stack-pointer-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stack-pointer-16~disabled%402x.png">
+      <LogicalName>stack-pointer-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stack-pointer-16~dark~disabled.png">
+      <LogicalName>stack-pointer-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stack-pointer-16~dark~disabled%402x.png">
+      <LogicalName>stack-pointer-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)' != 'DebugMac' AND '$(Configuration)' != 'ReleaseMac' ">
     <EmbeddedResource Include="icons\pause-16.png">
@@ -334,62 +547,158 @@
     <EmbeddedResource Include="icons\pause-16%402x.png">
       <LogicalName>pause-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\pause-16~dark.png">
+      <LogicalName>pause-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pause-16~dark%402x.png">
+      <LogicalName>pause-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\step-in-16.png">
       <LogicalName>step-in-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\step-in-16%402x.png">
       <LogicalName>step-in-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\step-in-16~dark.png">
+      <LogicalName>step-in-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\step-in-16~dark%402x.png">
+      <LogicalName>step-in-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\step-out-16.png">
       <LogicalName>step-out-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\step-out-16%402x.png">
       <LogicalName>step-out-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\step-out-16~dark.png">
+      <LogicalName>step-out-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\step-out-16~dark%402x.png">
+      <LogicalName>step-out-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\step-over-16.png">
       <LogicalName>step-over-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\step-over-16%402x.png">
       <LogicalName>step-over-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\step-over-16~dark.png">
+      <LogicalName>step-over-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\step-over-16~dark%402x.png">
+      <LogicalName>step-over-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\continue-16.png">
       <LogicalName>continue-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\continue-16%402x.png">
       <LogicalName>continue-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\continue-16~dark.png">
+      <LogicalName>continue-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\continue-16~dark%402x.png">
+      <LogicalName>continue-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' ">
-    <EmbeddedResource Include="icons\mac\pause.png">
+    <EmbeddedResource Include="icons\mac\pause-16.png">
       <LogicalName>pause-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\mac\pause%402x.png">
+    <EmbeddedResource Include="icons\mac\pause-16%402x.png">
       <LogicalName>pause-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\pause-16~dark.png">
+      <LogicalName>pause-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\pause-16~dark%402x.png">
+      <LogicalName>pause-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\continue-16.png">
       <LogicalName>continue-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\continue-16%402x.png">
       <LogicalName>continue-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\continue-16~dark.png">
+      <LogicalName>continue-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\continue-16~dark%402x.png">
+      <LogicalName>continue-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\step-in-16%402x.png">
       <LogicalName>step-in-16@2x.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\step-in-16.png">
       <LogicalName>step-in-16.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-in-16~disabled.png">
+      <LogicalName>step-in-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-in-16~disabled%402x.png">
+      <LogicalName>step-in-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-in-16~dark.png">
+      <LogicalName>step-in-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-in-16~dark%402x.png">
+      <LogicalName>step-in-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-in-16~disabled~dark.png">
+      <LogicalName>step-in-16~disabled~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-in-16~disabled~dark%402x.png">
+      <LogicalName>step-in-16~disabled~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\step-out-16.png">
       <LogicalName>step-out-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\step-out-16%402x.png">
       <LogicalName>step-out-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-out-16~disabled.png">
+      <LogicalName>step-out-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-out-16~disabled%402x.png">
+      <LogicalName>step-out-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-out-16~dark.png">
+      <LogicalName>step-out-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-out-16~dark%402x.png">
+      <LogicalName>step-out-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-out-16~disabled~dark.png">
+      <LogicalName>step-out-16~disabled~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-out-16~disabled~dark%402x.png">
+      <LogicalName>step-out-16~disabled~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\step-over-16.png">
       <LogicalName>step-over-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\mac\step-over-16%402x.png">
       <LogicalName>step-over-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-over-16~disabled.png">
+      <LogicalName>step-over-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-over-16~disabled%402x.png">
+      <LogicalName>step-over-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-over-16~dark.png">
+      <LogicalName>step-over-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-over-16~dark%402x.png">
+      <LogicalName>step-over-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-over-16~disabled~dark.png">
+      <LogicalName>step-over-16~disabled~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\mac\step-over-16~disabled~dark%402x.png">
+      <LogicalName>step-over-16~disabled~dark@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs
index fe65568897..9c395b5889 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs
@@ -40,7 +40,7 @@ using MonoDevelop.Ide;
 
 namespace MonoDevelop.Debugger
 {
-	public class BreakpointPad : IPadContent
+	public class BreakpointPad : PadContent
 	{
 		BreakpointStore breakpoints;
 		
@@ -51,11 +51,6 @@ namespace MonoDevelop.Debugger
 		CommandEntrySet menuSet;
 		TreeViewState treeState;
 		
-		EventHandler<BreakpointEventArgs> breakpointUpdatedHandler;
-		EventHandler<BreakpointEventArgs> breakpointRemovedHandler;
-		EventHandler<BreakpointEventArgs> breakpointAddedHandler;
-		EventHandler breakpointChangedHandler;
-		
 		enum Columns
 		{
 			Icon,
@@ -74,12 +69,13 @@ namespace MonoDevelop.Debugger
 			Properties
 		}
 		
-		public void Initialize (IPadWindow window)
+		protected override void Initialize (IPadWindow window)
 		{
+			Id = "MonoDevelop.Debugger.BreakpointPad";
 			// Toolbar and menu definitions
 			
 			ActionCommand gotoCmd = new ActionCommand (LocalCommands.GoToFile, GettextCatalog.GetString ("Go to File"));
-			ActionCommand propertiesCmd = new ActionCommand (LocalCommands.Properties, GettextCatalog.GetString ("Properties"), Gtk.Stock.Properties);
+			ActionCommand propertiesCmd = new ActionCommand (LocalCommands.Properties, GettextCatalog.GetString ("Properties"), Stock.Properties);
 			
 			menuSet = new CommandEntrySet ();
 			menuSet.Add (gotoCmd);
@@ -99,8 +95,8 @@ namespace MonoDevelop.Debugger
 			toolbarSet.AddSeparator ();
 			toolbarSet.Add (propertiesCmd);
 			toolbarSet.AddSeparator ();
-			toolbarSet.Add (new CommandEntry (DebugCommands.NewFunctionBreakpoint){ DispayType = CommandEntryDisplayType.IconAndText });
-			toolbarSet.Add (new CommandEntry (DebugCommands.NewCatchpoint){ DispayType = CommandEntryDisplayType.IconAndText });
+			toolbarSet.Add (new CommandEntry (DebugCommands.NewFunctionBreakpoint){ DisplayType = CommandEntryDisplayType.IconAndText });
+			toolbarSet.Add (new CommandEntry (DebugCommands.NewCatchpoint){ DisplayType = CommandEntryDisplayType.IconAndText });
 			
 			// The breakpoint list
 			
@@ -162,15 +158,10 @@ namespace MonoDevelop.Debugger
 			
 			UpdateDisplay ();
 
-			breakpointUpdatedHandler = DispatchService.GuiDispatch<EventHandler<BreakpointEventArgs>> (OnBreakpointUpdated);
-			breakpointRemovedHandler = DispatchService.GuiDispatch<EventHandler<BreakpointEventArgs>> (OnBreakpointRemoved);
-			breakpointAddedHandler = DispatchService.GuiDispatch<EventHandler<BreakpointEventArgs>> (OnBreakpointAdded);
-			breakpointChangedHandler = DispatchService.GuiDispatch<EventHandler> (OnBreakpointChanged);
-			
-			breakpoints.BreakpointAdded += breakpointAddedHandler;
-			breakpoints.BreakpointRemoved += breakpointRemovedHandler;
-			breakpoints.Changed += breakpointChangedHandler;
-			breakpoints.BreakpointUpdated += breakpointUpdatedHandler;
+			breakpoints.BreakpointAdded += OnBreakpointAdded;
+			breakpoints.BreakpointRemoved += OnBreakpointRemoved;
+			breakpoints.Changed += OnBreakpointChanged;
+			breakpoints.BreakpointUpdated += OnBreakpointUpdated;
 			
 			DebuggingService.PausedEvent += OnDebuggerStatusCheck;
 			DebuggingService.ResumedEvent += OnDebuggerStatusCheck;
@@ -178,21 +169,22 @@ namespace MonoDevelop.Debugger
 			
 			tree.RowActivated += OnRowActivated;
 			
-			DockItemToolbar toolbar = window.GetToolbar (PositionType.Top);
+			DockItemToolbar toolbar = window.GetToolbar (DockPositionType.Top);
 			toolbar.Add (toolbarSet, sw);
 			toolbar.ShowAll ();
 		}
 		
-		public void Dispose ()
+		public override void Dispose ()
 		{
-			breakpoints.BreakpointAdded -= breakpointAddedHandler;
-			breakpoints.BreakpointRemoved -= breakpointRemovedHandler;
-			breakpoints.Changed -= breakpointChangedHandler;
-			breakpoints.BreakpointUpdated -= breakpointUpdatedHandler;
+			breakpoints.BreakpointAdded -= OnBreakpointAdded;
+			breakpoints.BreakpointRemoved -= OnBreakpointRemoved;
+			breakpoints.Changed -= OnBreakpointChanged;
+			breakpoints.BreakpointUpdated -= OnBreakpointUpdated;
 			
 			DebuggingService.PausedEvent -= OnDebuggerStatusCheck;
 			DebuggingService.ResumedEvent -= OnDebuggerStatusCheck;
 			DebuggingService.StoppedEvent -= OnDebuggerStatusCheck;
+			base.Dispose ();
 		}
 
 		void ShowPopup (Gdk.EventButton evt)
@@ -226,7 +218,7 @@ namespace MonoDevelop.Debugger
 		[CommandHandler (DebugCommands.EnableDisableBreakpoint)]
 		protected void OnEnableDisable ()
 		{
-			breakpoints.Changed -= breakpointChangedHandler;
+			breakpoints.Changed -= OnBreakpointChanged;
 
 			try {
 				bool enable = false;
@@ -258,7 +250,7 @@ namespace MonoDevelop.Debugger
 					store.SetValue (iter, (int) Columns.Selected, enable);
 				}
 			} finally {
-				breakpoints.Changed += breakpointChangedHandler;
+				breakpoints.Changed += OnBreakpointChanged;
 			}
 		}
 		
@@ -282,7 +274,7 @@ namespace MonoDevelop.Debugger
 		{
 			bool deleted = false;
 
-			breakpoints.BreakpointRemoved -= breakpointRemovedHandler;
+			breakpoints.BreakpointRemoved -= OnBreakpointRemoved;
 
 			try {
 				// Note: since we'll be modifying the list of breakpoints, we need to sort
@@ -302,7 +294,7 @@ namespace MonoDevelop.Debugger
 					deleted = true;
 				}
 			} finally {
-				breakpoints.BreakpointRemoved += breakpointRemovedHandler;
+				breakpoints.BreakpointRemoved += OnBreakpointRemoved;
 			}
 
 			return deleted;
@@ -369,7 +361,7 @@ namespace MonoDevelop.Debugger
 		
 		void ItemToggled (object o, ToggledArgs args)
 		{
-			breakpoints.Changed -= breakpointChangedHandler;
+			breakpoints.Changed -= OnBreakpointChanged;
 			
 			try {
 				TreeIter iter;
@@ -382,7 +374,7 @@ namespace MonoDevelop.Debugger
 					store.SetValue (iter, (int) Columns.Selected, bp.Enabled);
 				}
 			} finally {
-				breakpoints.Changed += breakpointChangedHandler;
+				breakpoints.Changed += OnBreakpointChanged;
 			}
 		}
 		
@@ -430,36 +422,38 @@ namespace MonoDevelop.Debugger
 		
 		void OnBreakpointUpdated (object s, BreakpointEventArgs args)
 		{
-			TreeIter it;
-
-			if (!store.GetIterFirst (out it))
-				return;
-
-			do {
-				var bp = (BreakEvent) store.GetValue (it, (int) Columns.Breakpoint);
-				if (bp == args.Breakpoint) {
-					string hitCount = bp.HitCountMode != HitCountMode.None ? bp.CurrentHitCount.ToString () : "";
-					string traceVal = (bp.HitAction & HitAction.PrintExpression) != HitAction.None ? bp.LastTraceValue : "";
-					store.SetValue (it, (int) Columns.HitCount, hitCount);
-					store.SetValue (it, (int) Columns.LastTrace, traceVal);
-					break;
-				}
-			} while (store.IterNext (ref it));
+			Runtime.RunInMainThread (() => {
+				TreeIter it;
+
+				if (!store.GetIterFirst (out it))
+					return;
+
+				do {
+					var bp = (BreakEvent) store.GetValue (it, (int) Columns.Breakpoint);
+					if (bp == args.Breakpoint) {
+						string hitCount = bp.HitCountMode != HitCountMode.None ? bp.CurrentHitCount.ToString () : "";
+						string traceVal = (bp.HitAction & HitAction.PrintExpression) != HitAction.None ? bp.LastTraceValue : "";
+						store.SetValue (it, (int) Columns.HitCount, hitCount);
+						store.SetValue (it, (int) Columns.LastTrace, traceVal);
+						break;
+					}
+				} while (store.IterNext (ref it));
+			});
 		}
 		
 		protected void OnBreakpointAdded (object o, EventArgs args)
 		{
-			UpdateDisplay ();	
+			Runtime.RunInMainThread ((System.Action)UpdateDisplay);
 		}
 		
 		protected void OnBreakpointRemoved (object o, EventArgs args)
 		{
-			UpdateDisplay ();	
+			Runtime.RunInMainThread ((System.Action)UpdateDisplay);
 		}
 		
 		protected void OnBreakpointChanged (object o, EventArgs args)
 		{
-			UpdateDisplay ();	
+			Runtime.RunInMainThread ((System.Action)UpdateDisplay);
 		}
 		
 		void OnDebuggerStatusCheck (object s, EventArgs a)
@@ -473,25 +467,16 @@ namespace MonoDevelop.Debugger
 			OnBpJumpTo ();
 		}
 		
-		public Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return control;
 			}
 		}
 
-		public string Id {
-			get { return "MonoDevelop.Debugger.BreakpointPad"; }
-		}
-
 		public string DefaultPlacement {
 			get { return "Bottom"; }
 		}
 
-		public void RedrawContent ()
-		{
-			UpdateDisplay ();
-		}
-		
 		protected void OnDeleteClicked (object o, EventArgs args)
 		{
 			OnDeleted ();
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
index 8e11088ce8..225366c8c1 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
@@ -36,6 +36,7 @@ using Xwt;
 using Xwt.Drawing;
 using System.Linq;
 using System.IO;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Debugger
 {
@@ -203,7 +204,7 @@ namespace MonoDevelop.Debugger
 		public BreakpointPropertiesDialog (BreakEvent be, BreakpointType breakpointType)
 		{
 			this.be = be;
-			LoadExceptionList ();
+			Task.Run (LoadExceptionList);
 			Initialize ();
 			SetInitialData ();
 			SetLayout ();
@@ -351,7 +352,7 @@ namespace MonoDevelop.Debugger
 
 			if (project != null) {
 				// Check the startup project of the solution too, since the current project may be a library
-				SolutionEntityItem startup = project.ParentSolution.StartupItem;
+				SolutionItem startup = project.ParentSolution.StartupItem;
 				entryConditionalExpression.Sensitive = DebuggingService.IsFeatureSupported (project, DebuggerFeatures.ConditionalBreakpoints) ||
 				DebuggingService.IsFeatureSupported (startup, DebuggerFeatures.ConditionalBreakpoints);
 
@@ -419,8 +420,8 @@ namespace MonoDevelop.Debugger
 				    IdeApp.Workbench.ActiveDocument.Editor != null &&
 				    IdeApp.Workbench.ActiveDocument.FileName != FilePath.Null) {
 					breakpointLocation.Update (IdeApp.Workbench.ActiveDocument.FileName,
-						IdeApp.Workbench.ActiveDocument.Editor.Caret.Line,
-						IdeApp.Workbench.ActiveDocument.Editor.Caret.Column);
+						IdeApp.Workbench.ActiveDocument.Editor.CaretLine,
+						IdeApp.Workbench.ActiveDocument.Editor.CaretColumn);
 					entryLocationFile.Text = breakpointLocation.ToString ();
 					stopOnLocation.Active = true;
 				}
@@ -441,7 +442,7 @@ namespace MonoDevelop.Debugger
 			public void Update (string location)
 			{
 				if (string.IsNullOrWhiteSpace (location)) {
-					Warning = GettextCatalog.GetString ("Enter location");
+					Warning = GettextCatalog.GetString ("Enter location.");
 					return;
 				}
 				var splitted = location.Split (':');
@@ -455,22 +456,22 @@ namespace MonoDevelop.Debugger
 						}
 						splitted = newSplitted;
 					} else {
-						Warning = GettextCatalog.GetString ("File does not exist");
+						Warning = GettextCatalog.GetString ("File does not exist.");
 						return;
 					}
 				}
 				if (splitted.Length < 2) {
-					Warning = GettextCatalog.GetString ("Missing ':' for line declaration");
+					Warning = GettextCatalog.GetString ("Missing ':' for line declaration.");
 					return;
 				}
 				FileName = splitted [0];
 				if (!int.TryParse (splitted [1], out line)) {
-					Warning = GettextCatalog.GetString ("Line is not a number");
+					Warning = GettextCatalog.GetString ("Line is not a number.");
 					return;
 				}
 
 				if (splitted.Length > 2 && !int.TryParse (splitted [2], out column)) {
-					Warning = GettextCatalog.GetString ("Column is not a number");
+					Warning = GettextCatalog.GetString ("Column is not a number.");
 					return;
 				} else {
 					column = 1;
@@ -486,7 +487,7 @@ namespace MonoDevelop.Debugger
 			public void Update (string filePath, int line, int column)
 			{
 				if (!System.IO.File.Exists (filePath)) {
-					Warning = GettextCatalog.GetString ("File does not exist");
+					Warning = GettextCatalog.GetString ("File does not exist.");
 				} else {
 					Warning = "";
 				}
@@ -617,7 +618,7 @@ namespace MonoDevelop.Debugger
 
 			if (breakpointActionPrint.Active && string.IsNullOrWhiteSpace (entryPrintExpression.Text)) {
 				warningPrintExpression.Show ();
-				warningPrintExpression.ToolTip = GettextCatalog.GetString ("Trace expression not specified");
+				warningPrintExpression.ToolTip = GettextCatalog.GetString ("Enter trace expression.");
 				result = false;
 			}
 
@@ -627,13 +628,13 @@ namespace MonoDevelop.Debugger
 				if (stopOnFunction.Active) {
 					if (text.Length == 0) {
 						warningFunction.Show ();
-						warningFunction.ToolTip = GettextCatalog.GetString ("Function name not specified");
+						warningFunction.ToolTip = GettextCatalog.GetString ("Enter function name.");
 						result = false;
 					}
 
 					if (!TryParseFunction (text, out parsedFunction, out parsedParamTypes)) {
 						warningFunction.Show ();
-						warningFunction.ToolTip = GettextCatalog.GetString ("Invalid function syntax");
+						warningFunction.ToolTip = GettextCatalog.GetString ("Invalid function syntax.");
 						result = false;
 					}
 				}
@@ -645,10 +646,16 @@ namespace MonoDevelop.Debugger
 					result = false;
 				}
 			} else if (stopOnException.Active) {
-				if (!classes.Contains (entryExceptionType.Text)) {
+				if (string.IsNullOrWhiteSpace (entryExceptionType.Text)) {
 					warningException.Show ();
-					warningException.ToolTip = GettextCatalog.GetString ("Exception not identified");
+					warningException.ToolTip = GettextCatalog.GetString ("Enter exception type.");
 					result = false;
+				} else if (!classes.Contains (entryExceptionType.Text)) {
+					warningException.Show ();
+					warningException.ToolTip = GettextCatalog.GetString ("Exception not identified in exception list generated from currently selected project.");
+					//We might be missing some exceptions that are loaded at runtime from outside our project
+					//or we don't have project at all, hence show warning but still allow user to close window
+					result = true;
 				}
 			}
 			return result;
@@ -684,24 +691,35 @@ namespace MonoDevelop.Debugger
 			return true;
 		}
 
-		void LoadExceptionList ()
+		async Task LoadExceptionList ()
 		{
 			classes.Add ("System.Exception");
-			if (IdeApp.ProjectOperations.CurrentSelectedProject != null) {
-				var dom = TypeSystemService.GetCompilation (IdeApp.ProjectOperations.CurrentSelectedProject);
-				foreach (var t in dom.FindType (typeof (Exception)).GetSubTypeDefinitions ())
-					classes.Add (t.ReflectionName);
-			} else {
-				// no need to unload this assembly context, it's not cached.
-				var unresolvedAssembly = TypeSystemService.LoadAssemblyContext (Runtime.SystemAssemblyService.CurrentRuntime, MonoDevelop.Core.Assemblies.TargetFramework.Default, typeof(Uri).Assembly.Location);
-				var mscorlib = TypeSystemService.LoadAssemblyContext (Runtime.SystemAssemblyService.CurrentRuntime, MonoDevelop.Core.Assemblies.TargetFramework.Default, typeof(object).Assembly.Location);
-				if (unresolvedAssembly != null && mscorlib != null) {
-					var dom = new ICSharpCode.NRefactory.TypeSystem.Implementation.SimpleCompilation (unresolvedAssembly, mscorlib);
-					foreach (var t in dom.FindType (typeof (Exception)).GetSubTypeDefinitions ())
-						classes.Add (t.ReflectionName);
+			try {
+				Microsoft.CodeAnalysis.Compilation compilation = null;
+				Microsoft.CodeAnalysis.ProjectId dummyProjectId = null;
+				if (IdeApp.ProjectOperations.CurrentSelectedProject != null) {
+					compilation = await TypeSystemService.GetCompilationAsync (IdeApp.ProjectOperations.CurrentSelectedProject);
+				}
+				if (compilation == null) {
+					//no need to unload this assembly context, it's not cached.
+					dummyProjectId = Microsoft.CodeAnalysis.ProjectId.CreateNewId ("GetExceptionsProject");
+					compilation = Microsoft.CodeAnalysis.CSharp.CSharpCompilation.Create ("GetExceptions")
+											   .AddReferences (MetadataReferenceCache.LoadReference (dummyProjectId, System.Reflection.Assembly.GetAssembly (typeof (object)).Location))//corlib
+											   .AddReferences (MetadataReferenceCache.LoadReference (dummyProjectId, System.Reflection.Assembly.GetAssembly (typeof (Uri)).Location));//System.dll
 				}
+				var exceptionClass = compilation.GetTypeByMetadataName ("System.Exception");
+				foreach (var t in compilation.GlobalNamespace.GetAllTypes ().Where ((arg) => arg.IsDerivedFromClass (exceptionClass))) {
+					classes.Add (t.GetFullMetadataName ());
+				}
+				if (dummyProjectId != null) {
+					MetadataReferenceCache.RemoveReferences (dummyProjectId);
+				}
+			} catch (Exception e) {
+				LoggingService.LogError ("Failed to obtain exceptions list in breakpoint dialog.", e);
 			}
-			entryExceptionType.SetCodeCompletionList (classes.ToList ());
+			await Runtime.RunInMainThread (() => {
+				entryExceptionType.SetCodeCompletionList (classes.ToList ());
+			});
 		}
 
 		public BreakEvent GetBreakEvent ()
@@ -824,4 +842,4 @@ namespace MonoDevelop.Debugger
 			base.Dispose (disposing);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BusyEvaluatorDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BusyEvaluatorDialog.cs
index d82779bcbc..48bdacad81 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BusyEvaluatorDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BusyEvaluatorDialog.cs
@@ -26,27 +26,46 @@
 
 using System;
 using Mono.Debugging.Client;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.Debugger
 {
-	public partial class BusyEvaluatorDialog : Gtk.Dialog
+	class BusyEvaluator
 	{
-		public BusyEvaluatorDialog ()
-		{
-			this.Build ();
-			//Prevent closing dialog via X button, user can either wait with
-			//dialog open or press "Stop Debugger" button
-			DeleteEvent += (o, args) => args.RetVal = true;
+		public BusyEvaluatorDialog Dialog {
+			get;
+			private set;
 		}
 
 		public void UpdateBusyState (BusyStateEventArgs args)
 		{
 			if (!args.IsBusy) {
-				Hide ();
+				if (Dialog != null) {

+					Dialog.Destroy ();

+					Dialog.Dispose ();

+					Dialog = null;
+				}
 			} else {
-				Show ();
+				if (Dialog == null)
+					Dialog = new BusyEvaluatorDialog ();
+				
+				Dialog.Show ();
 			}
 		}
+	}
+
+	public partial class BusyEvaluatorDialog : Gtk.Dialog
+	{
+		public BusyEvaluatorDialog ()
+		{
+			this.Build ();
+			//Prevent closing dialog via X button, user can either wait with
+			//dialog open or press "Stop Debugger" button
+			DeleteEvent += (o, args) => args.RetVal = true;
+			Modal = true;
+			TransientFor = MessageService.RootWindow;
+			DestroyWithParent = true;
+		}
 
 		protected virtual void OnButtonCancelClicked (object sender, System.EventArgs e)
 		{
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
index 7eb9ee537d..cb282f2f2b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs
@@ -79,40 +79,18 @@ namespace MonoDevelop.Debugger
 				IdeApp.ProjectOperations.CurrentSelectedBuildTarget;
 		}
 
-		internal static void BuildAndDebug ()
+		internal async static void BuildAndDebug ()
 		{
 			if (!DebuggingService.IsDebuggingSupported && !IdeApp.ProjectOperations.CurrentRunOperation.IsCompleted) {
 				MonoDevelop.Ide.Commands.StopHandler.StopBuildOperations ();
-				IdeApp.ProjectOperations.CurrentRunOperation.WaitForCompleted ();
+				await IdeApp.ProjectOperations.CurrentRunOperation.Task;
 			}
 
 			if (IdeApp.Workspace.IsOpen) {
 				var it = GetRunTarget ();
-				var op = IdeApp.ProjectOperations.CheckAndBuildForExecute (it);
-				op.Completed += delegate {
-					if (op.Success)
-						ExecuteSolution (it);
-				};
+				ExecuteSolution (it);
 				return;
 			}
-
-			Document doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null)
-				return;
-
-			if (!IdeApp.Preferences.BuildBeforeExecuting) {
-				ExecuteDocument (doc);
-				return;
-			}
-
-			doc.Save ();
-			IAsyncOperation docOp = doc.Build ();
-			docOp.Completed += delegate {
-				if (docOp.SuccessWithWarnings && !IdeApp.Preferences.RunWithWarnings)
-					return;
-				if (docOp.Success)
-					ExecuteDocument (doc);
-			};
 		}
 
 		static void ExecuteSolution (IBuildTarget target)
@@ -123,14 +101,6 @@ namespace MonoDevelop.Debugger
 				IdeApp.ProjectOperations.Execute (target);
 		}
 
-		static void ExecuteDocument (Document doc)
-		{
-			if (doc.CanDebug ())
-				doc.Debug ();
-			else
-				doc.Run ();
-		}
-
 		protected override void Run ()
 		{
 			if (DebuggingService.IsPaused) {
@@ -159,7 +129,7 @@ namespace MonoDevelop.Debugger
 			// just run, so the label has to be changed accordingly.
 			if (!DebuggingService.IsDebuggingSupported) {
 				info.Text = IdeApp.ProjectOperations.CurrentRunOperation.IsCompleted ? GettextCatalog.GetString ("Start Without Debugging") : GettextCatalog.GetString ("Restart Without Debugging");
-				info.Icon = "gtk-execute";
+				info.Icon = Stock.RunProgramIcon;
 			}
 
 			if (IdeApp.Workspace.IsOpen) {
@@ -171,23 +141,18 @@ namespace MonoDevelop.Debugger
 
 				info.Enabled = canExecute && (IdeApp.ProjectOperations.CurrentRunOperation.IsCompleted || !DebuggingService.IsDebuggingSupported);
 			} else {
-				Document doc = IdeApp.Workbench.ActiveDocument;
-				info.Enabled = (doc != null && doc.IsBuildTarget) && (doc.CanRun () || doc.CanDebug ());
+				info.Enabled = false;
 			}
 		}
 	}
 	
 	class DebugEntryHandler: CommandHandler
 	{
-		protected override void Run ()
+		protected async override void Run ()
 		{
 			IBuildTarget entry = IdeApp.ProjectOperations.CurrentSelectedBuildTarget;
 
-			var op = IdeApp.ProjectOperations.CheckAndBuildForExecute (entry);
-			op.Completed += delegate {
-				if (op.Success)
-					IdeApp.ProjectOperations.Debug (entry);
-			};
+			await IdeApp.ProjectOperations.Debug (entry).Task;
 		}
 		
 		protected override void Update (CommandInfo info)
@@ -386,13 +351,13 @@ namespace MonoDevelop.Debugger
 			Breakpoint bp;
 
 			lock (breakpoints)
-				bp = breakpoints.Toggle (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line, IdeApp.Workbench.ActiveDocument.Editor.Caret.Column);
+				bp = breakpoints.Toggle (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine, IdeApp.Workbench.ActiveDocument.Editor.CaretColumn);
 			
 			// If the breakpoint could not be inserted in the caret location, move the caret
 			// to the real line of the breakpoint, so that if the Toggle command is run again,
 			// this breakpoint will be removed
-			if (bp != null && bp.Line != IdeApp.Workbench.ActiveDocument.Editor.Caret.Line)
-				IdeApp.Workbench.ActiveDocument.Editor.Caret.Line = bp.Line;
+			if (bp != null && bp.Line != IdeApp.Workbench.ActiveDocument.Editor.CaretLine)
+				IdeApp.Workbench.ActiveDocument.Editor.CaretLine = bp.Line;
 		}
 		
 		protected override void Update (CommandInfo info)
@@ -404,7 +369,7 @@ namespace MonoDevelop.Debugger
 					!DebuggingService.Breakpoints.IsReadOnly;
 		}
 	}
-	
+
 	class EnableDisableBreakpointHandler: CommandHandler
 	{
 		protected override void Run ()
@@ -412,7 +377,7 @@ namespace MonoDevelop.Debugger
 			var breakpoints = DebuggingService.Breakpoints;
 
 			lock (breakpoints) {
-				foreach (var bp in breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line))
+				foreach (var bp in breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine))
 					bp.Enabled = !bp.Enabled;
 			}
 		}
@@ -427,7 +392,7 @@ namespace MonoDevelop.Debugger
 			    IdeApp.Workbench.ActiveDocument.FileName != FilePath.Null &&
 			    !breakpoints.IsReadOnly) {
 				lock (breakpoints)
-					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line).Count > 0;
+					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine).Count > 0;
 			} else {
 				info.Enabled = false;
 			}
@@ -487,7 +452,7 @@ namespace MonoDevelop.Debugger
 			lock (breakpoints) {
 				IEnumerable<Breakpoint> brs = breakpoints.GetBreakpointsAtFileLine (
 					IdeApp.Workbench.ActiveDocument.FileName,
-					IdeApp.Workbench.ActiveDocument.Editor.Caret.Line);
+					IdeApp.Workbench.ActiveDocument.Editor.CaretLine);
 
 				List<Breakpoint> list = new List<Breakpoint> (brs);
 				foreach (Breakpoint bp in list)
@@ -505,7 +470,7 @@ namespace MonoDevelop.Debugger
 			    IdeApp.Workbench.ActiveDocument.FileName != FilePath.Null &&
 			    !breakpoints.IsReadOnly) {
 				lock (breakpoints)
-					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line).Count > 0;
+					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine).Count > 0;
 			} else {
 				info.Enabled = false;
 			}
@@ -590,11 +555,11 @@ namespace MonoDevelop.Debugger
 			var doc = IdeApp.Workbench.ActiveDocument;
 
 			if (DebuggingService.IsPaused) {
-				DebuggingService.RunToCursor (doc.FileName, doc.Editor.Caret.Line, doc.Editor.Caret.Column);
+				DebuggingService.RunToCursor (doc.FileName, doc.Editor.CaretLine, doc.Editor.CaretColumn);
 				return;
 			}
 
-			var bp = new RunToCursorBreakpoint (doc.FileName, doc.Editor.Caret.Line, doc.Editor.Caret.Column);
+			var bp = new RunToCursorBreakpoint (doc.FileName, doc.Editor.CaretLine, doc.Editor.CaretColumn);
 			DebuggingService.Breakpoints.Add (bp);
 			DebugHandler.BuildAndDebug ();
 		}
@@ -616,7 +581,7 @@ namespace MonoDevelop.Debugger
 
 					info.Enabled =  target != null && IdeApp.ProjectOperations.CanDebug (target);
 				} else {
-					info.Enabled = doc.IsBuildTarget && doc.CanDebug ();
+					info.Enabled = false;
 				}
 			} else {
 				info.Enabled = false;
@@ -634,7 +599,7 @@ namespace MonoDevelop.Debugger
 			lock (breakpoints) {
 				brs = breakpoints.GetBreakpointsAtFileLine (
 					IdeApp.Workbench.ActiveDocument.FileName,
-					IdeApp.Workbench.ActiveDocument.Editor.Caret.Line);
+					IdeApp.Workbench.ActiveDocument.Editor.CaretLine);
 			}
 
 			if (brs.Count > 0) {
@@ -653,7 +618,7 @@ namespace MonoDevelop.Debugger
 			    IdeApp.Workbench.ActiveDocument.FileName != FilePath.Null &&
 			    !breakpoints.IsReadOnly) {
 				lock (breakpoints)
-					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.Caret.Line).Count > 0;
+					info.Enabled = breakpoints.GetBreakpointsAtFileLine (IdeApp.Workbench.ActiveDocument.FileName, IdeApp.Workbench.ActiveDocument.Editor.CaretLine).Count > 0;
 			} else {
 				info.Enabled = false;
 			}
@@ -721,7 +686,7 @@ namespace MonoDevelop.Debugger
 			var doc = IdeApp.Workbench.ActiveDocument;
 
 			try {
-				DebuggingService.SetNextStatement (doc.FileName, doc.Editor.Caret.Line, doc.Editor.Caret.Column);
+				DebuggingService.SetNextStatement (doc.FileName, doc.Editor.CaretLine, doc.Editor.CaretColumn);
 			} catch (Exception e) {
 				if (e is NotSupportedException || e.InnerException is NotSupportedException) {
 					MessageService.ShowError ("Unable to set the next statement to this location.");
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs
index 55cc770269..fb30399b30 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugExecutionHandlerFactory.cs
@@ -34,6 +34,7 @@ using MonoDevelop.Core.Execution;
 using Mono.Debugging.Client;
 using MonoDevelop.Ide.Gui;
 using Mono.Debugging;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Debugger
 {
@@ -44,103 +45,42 @@ namespace MonoDevelop.Debugger
 			return DebuggingService.CanDebugCommand (command);
 		}
 
-		public IProcessAsyncOperation Execute (ExecutionCommand command, IConsole console)
+		public ProcessAsyncOperation Execute (ExecutionCommand command, OperationConsole console)
 		{
 			if (!CanExecute (command))
 			    return null;
-			DebugExecutionHandler h = new DebugExecutionHandler (null);
-			return h.Execute (command, console);
+			return DebuggingService.Run (command, console);
 		}
 	}
-	
-	class DebugExecutionHandler: IProcessAsyncOperation
+
+	class DebugAsyncOperation: ProcessAsyncOperation
 	{
-		bool done;
-		ManualResetEvent stopEvent;
-		DebuggerEngine factory;
-		
-		public DebugExecutionHandler (DebuggerEngine factory)
-		{
-			this.factory = factory;
-			DebuggingService.StoppedEvent += new EventHandler (OnStopDebug);
-		}
-		
-		public IProcessAsyncOperation Execute (ExecutionCommand command, IConsole console)
-		{
-			DebuggingService.InternalRun (command, factory, console);
-			return this;
-		}
-		
-		public void Cancel ()
+		TaskCompletionSource<int> taskSource;
+
+		public DebugAsyncOperation ()
 		{
-			DebuggingService.Stop ();
+			taskSource = new TaskCompletionSource<int> ();
+			DebuggingService.StoppedEvent += OnStopDebug;
+			CancellationTokenSource = new CancellationTokenSource ();
+			CancellationTokenSource.Token.Register (DebuggingService.Stop);
+			Task = taskSource.Task;
 		}
-		
-		public void WaitForCompleted ()
+
+		public void Cleanup ()
 		{
-			lock (this) {
-				if (done) return;
-				if (stopEvent == null)
-					stopEvent = new ManualResetEvent (false);
+			if (taskSource != null) {
+				taskSource.SetResult (0);
+				taskSource = null;
 			}
-			stopEvent.WaitOne ();
-		}
-		
-		public int ExitCode {
-			get { return 0; }
-		}
-		
-		public bool IsCompleted {
-			get { return done; }
-		}
-		
-		public bool Success {
-			get { return true; }
-		}
-
-		public bool SuccessWithWarnings {
-			get { return true; }
+			DebuggingService.StoppedEvent -= OnStopDebug;
 		}
 
 		void OnStopDebug (object sender, EventArgs args)
 		{
-			lock (this) {
-				done = true;
-				if (stopEvent != null)
-					stopEvent.Set ();
-				if (completedEvent != null)
-					completedEvent (this);
-			}
-
-			DebuggingService.StoppedEvent -= new EventHandler (OnStopDebug);
-		}
-		
-		event OperationHandler IAsyncOperation.Completed {
-			add {
-				bool raiseNow = false;
-				lock (this) {
-					if (done)
-						raiseNow = true;
-					else
-						completedEvent += value;
-				}
-				if (raiseNow)
-					value (this);
+			if (taskSource != null) {
+				taskSource.SetResult (0);
+				taskSource = null;
 			}
-			remove {
-				lock (this) {
-					completedEvent -= value;
-				}
-			}
-		}
-		
-		//FIXME:
-		public int ProcessId {
-			get { return -1; }
 		}
-		
-		event OperationHandler completedEvent;
-		
-		void IDisposable.Dispose () {}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugTextMarker.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugTextMarker.cs
deleted file mode 100644
index 6bd1bcd4d8..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugTextMarker.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-// DebugTextMarker.cs
-//
-// Authors: Lluis Sanchez Gual <lluis@novell.com>
-//          Jeffrey Stedfast <jeff@xamarin.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.Linq;
-
-using Mono.TextEditor;
-using Mono.TextEditor.Highlighting;
-
-using MonoDevelop.Components;
-
-using Xwt.Drawing;
-
-namespace MonoDevelop.Debugger
-{
-	public abstract class DebugTextMarker : MarginMarker
-	{
-		protected DebugTextMarker (TextEditor editor)
-		{
-			Editor = editor;
-		}
-
-		protected abstract Cairo.Color BackgroundColor {
-			get;
-		}
-		
-		protected abstract Cairo.Color BorderColor {
-			get;
-		}
-		
-		protected Cairo.Color GetBorderColor (AmbientColor color) 
-		{
-			if (color.HasBorderColor)
-				return color.BorderColor;
-			return color.Color;
-		}
-
-		protected TextEditor Editor {
-			get; private set;
-		}
-
-		public override bool CanDrawBackground (Margin margin)
-		{
-			return margin is TextViewMargin;
-		}
-
-		public override bool CanDrawForeground (Margin margin)
-		{
-			return margin is IconMargin;
-		}
-
-		public override bool DrawBackground (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
-		{
-			// check, if a message bubble is active in that line.
-			if (LineSegment != null && LineSegment.Markers.Any (m => m != this && (m is IExtendingTextLineMarker)))
-				return false;
-
-			var sidePadding = 4;
-			var rounding = editor.LineHeight / 2 - 1;
-
-			var d = metrics.TextRenderEndPosition - metrics.TextRenderStartPosition;
-			if (d > 0) {
-				cr.LineWidth = 1;
-				cr.RoundedRectangle (metrics.TextRenderStartPosition, Math.Floor (y) + 0.5, d + sidePadding, metrics.LineHeight - 1, rounding);
-				cr.SetSourceColor (BackgroundColor); 
-				cr.FillPreserve ();
-				cr.SetSourceColor (BorderColor); 
-				cr.Stroke ();
-			}
-
-			return base.DrawBackground (editor, cr, y, metrics);
-		}
-
-		public override void DrawForeground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
-		{
-			double size = metrics.Margin.Width;
-			double borderLineWidth = cr.LineWidth;
-
-			double x = Math.Floor (metrics.Margin.XOffset - borderLineWidth / 2);
-			double y = Math.Floor (metrics.Y + (metrics.Height - size) / 2);
-
-			DrawMarginIcon (cr, x, y, size);
-		}
-
-		protected virtual void SetForegroundColor (ChunkStyle style)
-		{
-		}
-
-		public override ChunkStyle GetStyle (ChunkStyle baseStyle)
-		{
-			if (baseStyle == null)
-				return null;
-
-			var style = new ChunkStyle (baseStyle);
-			//			style.Background = BackgroundColor;
-			SetForegroundColor (style);
-
-			return style;
-		}
-
-		protected void DrawImage (Cairo.Context cr, Image image, double x, double y, double size)
-		{
-			var deltaX = size / 2 - image.Width / 2 + 0.5f;
-			var deltaY = size / 2 - image.Height / 2 + 0.5f;
-
-			cr.DrawImage (Editor, image, Math.Round (x + deltaX), Math.Round (y + deltaY));
-		}
-
-		protected virtual void DrawMarginIcon (Cairo.Context cr, double x, double y, double size)
-		{
-		}
-	}
-
-	public class BreakpointTextMarker : DebugTextMarker
-	{
-		static readonly Image breakpoint = Image.FromResource ("gutter-breakpoint-15.png");
-		static readonly Image tracepoint = Image.FromResource ("gutter-tracepoint-15.png");
-
-		public BreakpointTextMarker (TextEditor editor, bool tracepoint) : base (editor)
-		{
-			IsTracepoint = tracepoint;
-		}
-
-		public bool IsTracepoint {
-			get; private set;
-		}
-
-		protected override Cairo.Color BackgroundColor {
-			get { return Editor.ColorStyle.BreakpointMarker.Color; }
-		}
-		
-		protected override Cairo.Color BorderColor {
-			get { return GetBorderColor (Editor.ColorStyle.BreakpointMarker); }
-		}
-
-		protected override void SetForegroundColor (ChunkStyle style)
-		{
-			style.Foreground = Editor.ColorStyle.BreakpointText.Foreground;
-		}
-
-		protected override void DrawMarginIcon (Cairo.Context cr, double x, double y, double size)
-		{
-			DrawImage (cr, IsTracepoint ? tracepoint : breakpoint, x, y, size);
-		}
-	}
-
-	public class DisabledBreakpointTextMarker : DebugTextMarker
-	{
-		static readonly Image breakpoint = Image.FromResource ("gutter-breakpoint-disabled-15.png");
-		static readonly Image tracepoint = Image.FromResource ("gutter-tracepoint-disabled-15.png");
-
-		public DisabledBreakpointTextMarker (TextEditor editor, bool tracepoint) : base (editor)
-		{
-			IsTracepoint = tracepoint;
-		}
-
-		public bool IsTracepoint {
-			get; private set;
-		}
-
-		protected override Cairo.Color BackgroundColor {
-			get { return Editor.ColorStyle.BreakpointMarkerDisabled.Color; }
-		}
-		
-		protected override Cairo.Color BorderColor {
-			get { return GetBorderColor (Editor.ColorStyle.BreakpointMarkerDisabled); }
-		}
-
-		protected override void DrawMarginIcon (Cairo.Context cr, double x, double y, double size)
-		{
-			DrawImage (cr, IsTracepoint ? tracepoint : breakpoint, x, y, size);
-		}
-	}
-
-	public class InvalidBreakpointTextMarker : DebugTextMarker
-	{
-		static readonly Image breakpoint = Image.FromResource ("gutter-breakpoint-invalid-15.png");
-		static readonly Image tracepoint = Image.FromResource ("gutter-tracepoint-invalid-15.png");
-
-		public InvalidBreakpointTextMarker (TextEditor editor, bool tracepoint) : base (editor)
-		{
-			IsTracepoint = tracepoint;
-		}
-
-		public bool IsTracepoint {
-			get; private set;
-		}
-
-		protected override Cairo.Color BackgroundColor {
-			get { return Editor.ColorStyle.BreakpointMarkerInvalid.Color; }
-		}
-		
-		protected override Cairo.Color BorderColor {
-			get { return GetBorderColor (Editor.ColorStyle.BreakpointMarkerInvalid); }
-		}
-
-		protected override void DrawMarginIcon (Cairo.Context cr, double x, double y, double size)
-		{
-			DrawImage (cr, IsTracepoint ? tracepoint : breakpoint, x, y, size);
-		}
-	}
-
-	public class CurrentDebugLineTextMarker : DebugTextMarker
-	{
-		static readonly Image currentLine = Image.FromResource ("gutter-execution-15.png");
-
-		public CurrentDebugLineTextMarker (TextEditor editor) : base (editor)
-		{
-		}
-
-		protected override Cairo.Color BackgroundColor {
-			get { return Editor.ColorStyle.DebuggerCurrentLineMarker.Color; }
-		}
-
-		protected override Cairo.Color BorderColor {
-			get { return GetBorderColor (Editor.ColorStyle.DebuggerCurrentLineMarker); }
-		}
-
-		protected override void SetForegroundColor (ChunkStyle style)
-		{
-			style.Foreground = Editor.ColorStyle.DebuggerCurrentLine.Foreground;
-		}
-
-		protected override void DrawMarginIcon (Cairo.Context cr, double x, double y, double size)
-		{
-			DrawImage (cr, currentLine, x, y, size);
-		}
-	}
-
-	public class DebugStackLineTextMarker : DebugTextMarker
-	{
-		static readonly Image stackLine = Image.FromResource ("gutter-stack-15.png");
-
-		public DebugStackLineTextMarker (TextEditor editor) : base (editor)
-		{
-		}
-
-		protected override Cairo.Color BackgroundColor {
-			get { return Editor.ColorStyle.DebuggerStackLineMarker.Color; }
-		}
-		
-		protected override Cairo.Color BorderColor {
-			get { return GetBorderColor (Editor.ColorStyle.DebuggerStackLineMarker); }
-		}
-
-		protected override void SetForegroundColor (ChunkStyle style)
-		{
-			style.Foreground = Editor.ColorStyle.DebuggerStackLine.Foreground;
-		}
-
-		protected override void DrawMarginIcon (Cairo.Context cr, double x, double y, double size)
-		{
-			DrawImage (cr, stackLine, x, y, size);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerConsoleView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerConsoleView.cs
index f67ee7864a..8c4e058e05 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerConsoleView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerConsoleView.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using MonoDevelop.Ide;
 using MonoDevelop.Components;
 using MonoDevelop.Ide.CodeCompletion;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Debugger
 {
@@ -51,7 +52,7 @@ namespace MonoDevelop.Debugger
 			TextView.KeyReleaseEvent += OnEditKeyRelease;
 			TextView.FocusOutEvent += TextView_FocusOutEvent;
 
-			IdeApp.Preferences.CustomOutputPadFontChanged += OnCustomOutputPadFontChanged;
+			IdeApp.Preferences.CustomOutputPadFont.Changed += OnCustomOutputPadFontChanged;
 			CompletionWindowManager.WindowClosed += OnCompletionWindowClosed;
 		}
 
@@ -274,7 +275,7 @@ namespace MonoDevelop.Debugger
 			if (keyHandled)
 				return;
 
-			CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifier);
+			CompletionWindowManager.PostProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 			PopupCompletion ();
 		}
 
@@ -292,7 +293,7 @@ namespace MonoDevelop.Debugger
 			}
 
 			if (currentCompletionData != null) {
-				if ((keyHandled = CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifier)))
+				if ((keyHandled = CompletionWindowManager.PreProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier))))
 					return true;
 			}
 
@@ -331,6 +332,9 @@ namespace MonoDevelop.Debugger
 
 		int Position {
 			get { return Cursor.Offset - TokenBegin.Offset; }
+			set { 
+				throw new NotSupportedException ();
+			}
 		}
 
 		#region ICompletionWidget implementation
@@ -370,6 +374,15 @@ namespace MonoDevelop.Debugger
 			get {
 				return Position;
 			}
+			set {
+				Position = value;
+			}
+		}
+
+		double ICompletionWidget.ZoomLevel {
+			get {
+				return 1;
+			}
 		}
 
 		char ICompletionWidget.GetChar (int offset)
@@ -457,7 +470,7 @@ namespace MonoDevelop.Debugger
 
 		protected override void OnDestroyed ()
 		{
-			IdeApp.Preferences.CustomOutputPadFontChanged -= OnCustomOutputPadFontChanged;
+			IdeApp.Preferences.CustomOutputPadFont.Changed -= OnCustomOutputPadFontChanged;
 			CompletionWindowManager.WindowClosed -= OnCompletionWindowClosed;
 			CompletionWindowManager.HideWindow ();
 			TextView.FocusOutEvent -= TextView_FocusOutEvent;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs
index 85c5ef476b..ec6d84fafd 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggerOptionsPanelWidget.cs
@@ -26,6 +26,7 @@
 
 using System;
 using Mono.Debugging.Client;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 using Xwt;
 using MonoDevelop.Core;
@@ -36,7 +37,7 @@ namespace MonoDevelop.Debugger
 	{
 		DebuggerOptionsPanelWidget w;
 
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			w = new DebuggerOptionsPanelWidget ();
 
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index 3422b1cf87..22d0c1fc1f 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -38,8 +38,6 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Projects;
 using MonoDevelop.Debugger.Viewers;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.TypeSystem;
 
 /*
  * Some places we should be doing some error handling we used to toss
@@ -47,6 +45,8 @@ using ICSharpCode.NRefactory.TypeSystem;
  */
 using MonoDevelop.Ide.TextEditing;
 using System.Linq;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.Debugger
 {
@@ -62,7 +62,8 @@ namespace MonoDevelop.Debugger
 		static readonly BreakpointStore breakpoints = new BreakpointStore ();
 		static readonly DebugExecutionHandlerFactory executionHandlerFactory;
 		
-		static IConsole console;
+		static OperationConsole console;
+		static IDisposable cancelRegistration;
 
 		static Dictionary<long, SourceLocation> nextStatementLocations = new Dictionary<long, SourceLocation> ();
 		static DebuggerEngine currentEngine;
@@ -72,10 +73,12 @@ namespace MonoDevelop.Debugger
 		
 		static ExceptionCaughtMessage exceptionDialog;
 		
-		static BusyEvaluatorDialog busyDialog;
+		static BusyEvaluator busyEvaluator;
 		static StatusBarIcon busyStatusIcon;
 		static bool isBusy;
 
+		static DebugAsyncOperation currentDebugOperation = new DebugAsyncOperation ();
+
 		static public event EventHandler DebugSessionStarted;
 		static public event EventHandler PausedEvent;
 		static public event EventHandler ResumedEvent;
@@ -97,10 +100,7 @@ namespace MonoDevelop.Debugger
 				IdeApp.Workspace.StoringUserPreferences += OnStoreUserPrefs;
 				IdeApp.Workspace.LoadingUserPreferences += OnLoadUserPrefs;
 				IdeApp.Workspace.LastWorkspaceItemClosed += OnSolutionClosed;
-				busyDialog = new BusyEvaluatorDialog ();
-				busyDialog.Modal = true;
-				busyDialog.TransientFor = MessageService.RootWindow;
-				busyDialog.DestroyWithParent = true;
+				busyEvaluator = new BusyEvaluator ();
 			};
 			AddinManager.AddExtensionNodeHandler (FactoriesPath, delegate {
 				// Refresh the engines list
@@ -138,7 +138,8 @@ namespace MonoDevelop.Debugger
 			if (liveUpdate) {
 				var bp = new Breakpoint (watch.File, watch.Line);
 				bp.TraceExpression = "{" + watch.Expression + "}";
-				bp.HitAction |= HitAction.PrintExpression;
+				bp.HitAction = HitAction.PrintExpression;
+				bp.NonUserBreakpoint = true;
 				lock (breakpoints)
 					breakpoints.Add (bp);
 				pinnedWatches.Bind (watch, bp);
@@ -378,10 +379,11 @@ namespace MonoDevelop.Debugger
 			session.ConnectionDialogCreator = delegate {
 				return new StatusBarConnectionDialog ();
 			};
+			currentDebugOperation = new DebugAsyncOperation ();
 
-			console.CancelRequested += OnCancelRequested;
+			cancelRegistration = console.CancellationToken.Register (Stop);
 			
-			DispatchService.GuiDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				if (DebugSessionStarted != null)
 					DebugSessionStarted (null, EventArgs.Empty);
 				NotifyLocationChanged ();
@@ -394,7 +396,7 @@ namespace MonoDevelop.Debugger
 		{
 			DebuggerSession currentSession;
 			StatusBarIcon currentIcon;
-			IConsole currentConsole;
+			OperationConsole currentConsole;
 
 			lock (cleanup_lock) {
 				if (!IsDebugging)
@@ -423,13 +425,14 @@ namespace MonoDevelop.Debugger
 			currentSession.TypeResolverHandler = null;
 			currentSession.OutputWriter = null;
 			currentSession.LogWriter = null;
-			
+			currentDebugOperation.Cleanup ();
+
 			if (currentConsole != null) {
-				currentConsole.CancelRequested -= OnCancelRequested;
+				cancelRegistration.Dispose ();
 				currentConsole.Dispose ();
 			}
 			
-			DispatchService.GuiDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				HideExceptionCaughtDialog ();
 
 				if (currentIcon != null) {
@@ -452,23 +455,23 @@ namespace MonoDevelop.Debugger
 		static void UnsetDebugLayout ()
 		{
 			// Dispatch synchronously to avoid start/stop races
-			DispatchService.GuiSyncDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				IdeApp.Workbench.HideCommandBar ("Debug");
 				if (IdeApp.Workbench.CurrentLayout == "Debug") {
 					IdeApp.Workbench.CurrentLayout = oldLayout ?? "Solution";
 				}
 				oldLayout = null;
-			});
+			}).Wait ();
 		}
 
 		static void SetDebugLayout ()
 		{
 			// Dispatch synchronously to avoid start/stop races
-			DispatchService.GuiSyncDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				oldLayout = IdeApp.Workbench.CurrentLayout;
 				IdeApp.Workbench.CurrentLayout = "Debug";
 				IdeApp.Workbench.ShowCommandBar ("Debug");
-			});
+			}).Wait ();
 		}
 
 		public static bool IsDebugging {
@@ -502,6 +505,7 @@ namespace MonoDevelop.Debugger
 
 		public static void Resume ()
 		{
+			Runtime.AssertMainThread ();
 			if (CheckIsBusy ())
 				return;
 
@@ -511,6 +515,7 @@ namespace MonoDevelop.Debugger
 
 		public static void RunToCursor (string fileName, int line, int column)
 		{
+			Runtime.AssertMainThread ();
 			if (CheckIsBusy ())
 				return;
 
@@ -523,6 +528,7 @@ namespace MonoDevelop.Debugger
 
 		public static void SetNextStatement (string fileName, int line, int column)
 		{
+			Runtime.AssertMainThread ();
 			if (!IsDebugging || IsRunning || CheckIsBusy ())
 				return;
 
@@ -533,14 +539,14 @@ namespace MonoDevelop.Debugger
 			NotifyLocationChanged ();
 		}
 
-		public static IProcessAsyncOperation Run (string file, IConsole console)
+		public static ProcessAsyncOperation Run (string file, OperationConsole console)
 		{
-			return Run (file, null, null, null, console);
+			var cmd = Runtime.ProcessService.CreateCommand (file);
+			return Run (cmd, console);
 		}
 
-		public static IProcessAsyncOperation Run (string file, string args, string workingDir, IDictionary<string,string> envVars, IConsole console)
+		public static ProcessAsyncOperation Run (string file, string args, string workingDir, IDictionary<string,string> envVars, OperationConsole console)
 		{
-			var h = new DebugExecutionHandler (null);
 			var cmd = Runtime.ProcessService.CreateCommand (file);
 			if (args != null) 
 				cmd.Arguments = args;
@@ -548,24 +554,29 @@ namespace MonoDevelop.Debugger
 				cmd.WorkingDirectory = workingDir;
 			if (envVars != null)
 				cmd.EnvironmentVariables = envVars;
+			return Run (cmd, console);
+		}
 
-			return h.Execute (cmd, console);
+		public static ProcessAsyncOperation Run (ExecutionCommand cmd, OperationConsole console, DebuggerEngine engine = null)
+		{
+			InternalRun (cmd, engine, console);
+			return currentDebugOperation;
 		}
 		
-		public static IAsyncOperation AttachToProcess (DebuggerEngine debugger, ProcessInfo proc)
+		public static AsyncOperation AttachToProcess (DebuggerEngine debugger, ProcessInfo proc)
 		{
 			currentEngine = debugger;
 			session = debugger.CreateSession ();
 			session.ExceptionHandler = ExceptionHandler;
-			IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor ();
-			console = monitor as IConsole;
+			var monitor = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor ();
+			console = monitor.Console;
 			SetupSession ();
 			session.TargetExited += delegate {
 				monitor.Dispose ();
 			};
 			SetDebugLayout ();
 			session.AttachToProcess (proc, GetUserOptions ());
-			return monitor.AsyncOperation;
+			return currentDebugOperation;
 		}
 		
 		public static DebuggerSessionOptions GetUserOptions ()
@@ -610,7 +621,7 @@ namespace MonoDevelop.Debugger
 				DisassemblyRequested (null, EventArgs.Empty);
 		}
 		
-		internal static void InternalRun (ExecutionCommand cmd, DebuggerEngine factory, IConsole c)
+		internal static void InternalRun (ExecutionCommand cmd, DebuggerEngine factory, OperationConsole c)
 		{
 			if (factory == null) {
 				factory = GetFactoryForCommand (cmd);
@@ -623,7 +634,8 @@ namespace MonoDevelop.Debugger
 
 			DebuggerStartInfo startInfo = factory.CreateDebuggerStartInfo (cmd);
 			startInfo.UseExternalConsole = c is ExternalConsole;
-			startInfo.CloseExternalConsoleOnExit = c.CloseOnDispose;
+			if (startInfo.UseExternalConsole)
+				startInfo.CloseExternalConsoleOnExit = ((ExternalConsole)c).CloseOnDispose;
 			currentEngine = factory;
 			session = factory.CreateSession ();
 			session.ExceptionHandler = ExceptionHandler;
@@ -631,7 +643,7 @@ namespace MonoDevelop.Debugger
 			// When using an external console, create a new internal console which will be used
 			// to show the debugger log
 			if (startInfo.UseExternalConsole)
-				console = (IConsole) IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor ();
+				console = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor ().Console;
 			else
 				console = c;
 			
@@ -671,19 +683,9 @@ namespace MonoDevelop.Debugger
 		static void DebugWriter (int level, string category, string message)
 		{
 			var logger = console;
-			var debugLogger = logger as IDebugConsole;
 
-			if (logger != null) {
-				if (debugLogger != null) {
-					debugLogger.Debug (level, category, message);
-				} else {
-					if (level == 0 && string.IsNullOrEmpty (category)) {
-						logger.Log.Write (message);
-					} else {
-						logger.Log.Write (string.Format ("[{0}:{1}] {2}", level, category, message));
-					}
-				}
-			}
+			if (logger != null)
+				logger.Debug (level, category, message);
 		}
 
 		static void OutputWriter (bool iserr, string text)
@@ -698,33 +700,37 @@ namespace MonoDevelop.Debugger
 			}
 		}
 
-		static void OnBusyStateChanged (object s, BusyStateEventArgs args)
+		static async void OnBusyStateChanged (object s, BusyStateEventArgs args)
 		{
 			isBusy = args.IsBusy;
-			DispatchService.GuiDispatch (delegate {
-				busyDialog.UpdateBusyState (args);
+			await Runtime.RunInMainThread (delegate {
+				busyEvaluator.UpdateBusyState (args);
 				if (args.IsBusy) {
 					if (busyStatusIcon == null) {
-						busyStatusIcon = IdeApp.Workbench.StatusBar.ShowStatusIcon (ImageService.GetIcon ("md-execute-debug", Gtk.IconSize.Menu));
+						busyStatusIcon = IdeApp.Workbench.StatusBar.ShowStatusIcon (ImageService.GetIcon ("md-bug", Gtk.IconSize.Menu));
 						busyStatusIcon.SetAlertMode (100);
 						busyStatusIcon.ToolTip = GettextCatalog.GetString ("The debugger runtime is not responding. You can wait for it to recover, or stop debugging.");
-						busyStatusIcon.Clicked += delegate {
-							MessageService.PlaceDialog (busyDialog, MessageService.RootWindow);
-						};
+						busyStatusIcon.Clicked += OnBusyStatusIconClicked;
 					}
 				} else {
 					if (busyStatusIcon != null) {
+						busyStatusIcon.Clicked -= OnBusyStatusIconClicked;
 						busyStatusIcon.Dispose ();
 						busyStatusIcon = null;
 					}
 				}
 			});
 		}
+
+		static void OnBusyStatusIconClicked (object sender, StatusBarIconClickedEventArgs args)
+		{
+			MessageService.PlaceDialog (busyEvaluator.Dialog, MessageService.RootWindow);
+		}
 		
 		static bool CheckIsBusy ()
 		{
-			if (isBusy && !busyDialog.Visible)
-				MessageService.PlaceDialog (busyDialog, MessageService.RootWindow);
+			if (isBusy && !busyEvaluator.Dialog.Visible)
+				MessageService.PlaceDialog (busyEvaluator.Dialog, MessageService.RootWindow);
 			return isBusy;
 		}
 		
@@ -733,7 +739,7 @@ namespace MonoDevelop.Debugger
 			nextStatementLocations.Clear ();
 			currentBacktrace = null;
 
-			DispatchService.GuiDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				HideExceptionCaughtDialog ();
 				if (ResumedEvent != null)
 					ResumedEvent (null, a);
@@ -781,7 +787,7 @@ namespace MonoDevelop.Debugger
 
 		static void NotifyPaused ()
 		{
-			DispatchService.GuiDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				if (PausedEvent != null)
 					PausedEvent (null, EventArgs.Empty);
 				NotifyLocationChanged ();
@@ -792,7 +798,7 @@ namespace MonoDevelop.Debugger
 		static void NotifyException (TargetEventArgs args)
 		{
 			if (args.Type == TargetEventType.UnhandledException || args.Type == TargetEventType.ExceptionThrown) {
-				DispatchService.GuiDispatch (delegate {
+				Runtime.RunInMainThread (delegate {
 					if (CurrentFrame != null) {
 						ShowExceptionCaughtDialog ();
 					}
@@ -802,6 +808,7 @@ namespace MonoDevelop.Debugger
 		
 		static void NotifyLocationChanged ()
 		{
+			Runtime.AssertMainThread ();
 			if (ExecutionLocationChanged != null)
 				ExecutionLocationChanged (null, EventArgs.Empty);
 		}
@@ -820,11 +827,6 @@ namespace MonoDevelop.Debugger
 				CallStackChanged (null, EventArgs.Empty);
 		}
 		
-		static void OnCancelRequested (object sender, EventArgs args)
-		{
-			Stop ();
-		}
-
 		public static void Stop ()
 		{
 			if (!IsDebugging)
@@ -836,6 +838,8 @@ namespace MonoDevelop.Debugger
 
 		public static void StepInto ()
 		{
+			Runtime.AssertMainThread ();
+
 			if (!IsDebugging || IsRunning || CheckIsBusy ())
 				return;
 
@@ -845,6 +849,8 @@ namespace MonoDevelop.Debugger
 
 		public static void StepOver ()
 		{
+			Runtime.AssertMainThread ();
+
 			if (!IsDebugging || IsRunning || CheckIsBusy ())
 				return;
 
@@ -854,6 +860,8 @@ namespace MonoDevelop.Debugger
 
 		public static void StepOut ()
 		{
+			Runtime.AssertMainThread ();
+
 			if (!IsDebugging || IsRunning || CheckIsBusy ())
 				return;
 
@@ -907,7 +915,7 @@ namespace MonoDevelop.Debugger
 			set {
 				if (currentBacktrace != null && value < currentBacktrace.FrameCount) {
 					currentFrame = value;
-					DispatchService.GuiDispatch (delegate {
+					Runtime.RunInMainThread (delegate {
 						NotifyCurrentFrameChanged ();
 					});
 				}
@@ -934,30 +942,32 @@ namespace MonoDevelop.Debugger
 			else
 				currentFrame = -1;
 
-			DispatchService.GuiDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				NotifyCallStackChanged ();
 				NotifyCurrentFrameChanged ();
 				NotifyLocationChanged ();
 			});
 		}
 		
-		public static void ShowCurrentExecutionLine ()
+		public static async void ShowCurrentExecutionLine ()
 		{
+			Runtime.AssertMainThread ();
 			if (currentBacktrace != null) {
 				var sf = GetCurrentVisibleFrame ();
 				if (sf != null && !string.IsNullOrEmpty (sf.SourceLocation.FileName) && System.IO.File.Exists (sf.SourceLocation.FileName) && sf.SourceLocation.Line != -1) {
-					Document document = IdeApp.Workbench.OpenDocument (sf.SourceLocation.FileName, null, sf.SourceLocation.Line, 1, OpenDocumentOptions.Debugger);
+					Document document = await IdeApp.Workbench.OpenDocument (sf.SourceLocation.FileName, null, sf.SourceLocation.Line, 1, OpenDocumentOptions.Debugger);
 					OnDisableConditionalCompilation (new DocumentEventArgs (document));
 				}
 			}
 		}
 
-		public static void ShowNextStatement ()
+		public static async void ShowNextStatement ()
 		{
+			Runtime.AssertMainThread ();
 			var location = NextStatementLocation;
 
 			if (location != null && System.IO.File.Exists (location.FileName)) {
-				Document document = IdeApp.Workbench.OpenDocument (location.FileName, null, location.Line, 1, OpenDocumentOptions.Debugger);
+				Document document = await IdeApp.Workbench.OpenDocument (location.FileName, null, location.Line, 1, OpenDocumentOptions.Debugger);
 				OnDisableConditionalCompilation (new DocumentEventArgs (document));
 			} else {
 				ShowCurrentExecutionLine ();
@@ -1038,7 +1048,7 @@ namespace MonoDevelop.Debugger
 			args.Properties.SetValue ("MonoDevelop.Ide.DebuggingService.PinnedWatches", pinnedWatches);
 		}
 		
-		static void OnLoadUserPrefs (object s, UserPreferencesEventArgs args)
+		static Task OnLoadUserPrefs (object s, UserPreferencesEventArgs args)
 		{
 			var elem = args.Properties.GetValue<XmlElement> ("MonoDevelop.Ide.DebuggingService.Breakpoints") ?? args.Properties.GetValue<XmlElement> ("MonoDevelop.Ide.DebuggingService");
 
@@ -1053,6 +1063,8 @@ namespace MonoDevelop.Debugger
 
 			lock (breakpoints)
 				pinnedWatches.BindAll (breakpoints);
+			
+			return Task.FromResult (true);
 		}
 		
 		static void OnSolutionClosed (object s, EventArgs args)
@@ -1067,13 +1079,18 @@ namespace MonoDevelop.Debugger
 			if (doc != null) {
 				ITextEditorResolver textEditorResolver = doc.GetContent <ITextEditorResolver> ();
 				if (textEditorResolver != null) {
-					var rr = textEditorResolver.GetLanguageItem (doc.Editor.Document.LocationToOffset (location.Line, 1), identifier);
-					var ns = rr as NamespaceResolveResult;
+					var rr = textEditorResolver.GetLanguageItem (doc.Editor.LocationToOffset (location.Line, 1), identifier);
+					var ns = rr as Microsoft.CodeAnalysis.INamespaceSymbol;
 					if (ns != null)
-						return ns.NamespaceName;
-					var result = rr as TypeResolveResult;
-					if (result != null && !result.IsError && !(result.Type.Kind == TypeKind.Dynamic && result.Type.FullName == "dynamic"))
-						return result.Type.FullName;
+						return ns.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.CSharpErrorMessageFormat);
+					var result = rr as Microsoft.CodeAnalysis.INamedTypeSymbol;
+					if (result != null && !(result.TypeKind == Microsoft.CodeAnalysis.TypeKind.Dynamic && result.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.CSharpErrorMessageFormat) == "dynamic")) {
+						return result.ToDisplayString (new Microsoft.CodeAnalysis.SymbolDisplayFormat (
+							typeQualificationStyle: Microsoft.CodeAnalysis.SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+							miscellaneousOptions:
+							Microsoft.CodeAnalysis.SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+							Microsoft.CodeAnalysis.SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
+					}
 				}
 			}
 			return null;
@@ -1107,7 +1124,7 @@ namespace MonoDevelop.Debugger
 			return SupportedFeatures != DebuggerFeatures.None;
 		}
 
-		public IProcessAsyncOperation Execute (ExecutionCommand cmd, IConsole console)
+		public ProcessAsyncOperation Execute (ExecutionCommand cmd, OperationConsole console)
 		{
 			// Never called
 			throw new NotImplementedException ();
@@ -1128,10 +1145,9 @@ namespace MonoDevelop.Debugger
 			return engine.CanDebugCommand (command);
 		}
 
-		public IProcessAsyncOperation Execute (ExecutionCommand command, IConsole console)
+		public ProcessAsyncOperation Execute (ExecutionCommand command, OperationConsole console)
 		{
-			var h = new DebugExecutionHandler (engine);
-			return h.Execute (command, console);
+			return DebuggingService.Run (command, console, engine);
 		}
 	}
 
@@ -1142,7 +1158,7 @@ namespace MonoDevelop.Debugger
 		public void SetMessage (DebuggerStartInfo dsi, string message, bool listening, int attemptNumber)
 		{
 			Gtk.Application.Invoke (delegate {
-				IdeApp.Workbench.StatusBar.ShowMessage (Stock.StatusConnecting, message);
+				IdeApp.Workbench.StatusBar.ShowMessage (Ide.Gui.Stock.StatusConnecting, message);
 			});
 		}
 
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
index 890d216812..fbd0d511a3 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs
@@ -35,20 +35,19 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Commands;
-using TextEditor = Mono.TextEditor.TextEditor;
-using Mono.TextEditor;
 using Mono.Debugging.Client;
-using Mono.TextEditor.Highlighting;
+using MonoDevelop.Ide.Editor;
 using Gtk;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide;
 using System.Security.Cryptography;
 using Gdk;
 using MonoDevelop.Components;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Debugger
 {
-	public class DisassemblyView: AbstractViewContent, IClipboardHandler
+	public class DisassemblyView: ViewContent, IClipboardHandler
 	{
 		Gtk.ScrolledWindow sw;
 		TextEditor editor;
@@ -56,10 +55,10 @@ namespace MonoDevelop.Debugger
 		int lastLine;
 		Dictionary<string,int> addressLines = new Dictionary<string,int> ();
 		bool autoRefill;
-		CurrentDebugLineTextMarker currentDebugLineMarker;
+		ICurrentDebugLineTextMarker currentDebugLineMarker;
 		bool dragging;
 		FilePath currentFile;
-		AsmLineMarker asmMarker = new AsmLineMarker ();
+		ITextLineMarker asmMarker;
 		
 		List<AssemblyLine> cachedLines = new List<AssemblyLine> ();
 		string cachedLinesAddrSpace;
@@ -70,12 +69,11 @@ namespace MonoDevelop.Debugger
 		{
 			ContentName = GettextCatalog.GetString ("Disassembly");
 			sw = new Gtk.ScrolledWindow ();
-			editor = new TextEditor ();
-			editor.Document.ReadOnly = true;
-			
-			editor.Options = new CommonTextEditorOptions {
-				ShowLineNumberMargin = false,
-			};
+			editor = TextEditorFactory.CreateNewEditor ();
+			editor.IsReadOnly = true;
+			asmMarker = TextMarkerFactory.CreateAsmLineMarker (editor);
+
+			editor.Options = DefaultSourceEditorOptions.PlainEditor;
 			
 			sw.Add (editor);
 			sw.HscrollbarPolicy = Gtk.PolicyType.Automatic;
@@ -88,27 +86,26 @@ namespace MonoDevelop.Debugger
 			sw.ShadowType = Gtk.ShadowType.In;
 			
 			sw.Sensitive = false;
-			
-			currentDebugLineMarker = new CurrentDebugLineTextMarker (editor);
+
 			DebuggingService.StoppedEvent += OnStop;
 		}
-		
 
-		OverlayMessageWindow messageOverlayWindow;
+		HBox messageOverlayContent;
 
 		void ShowLoadSourceFile (StackFrame sf)
 		{
-			if (messageOverlayWindow != null) {
-				messageOverlayWindow.Destroy ();
-				messageOverlayWindow = null;
+			if (messageOverlayContent != null) {
+				editor.RemoveOverlay (messageOverlayContent);
+				messageOverlayContent = null;
 			}
-			messageOverlayWindow = new OverlayMessageWindow ();
+			messageOverlayContent = new HBox ();
 
 			var hbox = new HBox ();
 			hbox.Spacing = 8;
 			var label = new Label (string.Format ("{0} not found. Find source file at alternative location.", Path.GetFileName (sf.SourceLocation.FileName)));
 			hbox.TooltipText = sf.SourceLocation.FileName;
-			var color = (HslColor)editor.ColorStyle.NotificationText.Foreground;
+
+			var color = (HslColor)editor.Options.GetColorStyle ().NotificationText.Foreground;
 			label.ModifyFg (StateType.Normal, color);
 
 			int w, h;
@@ -119,13 +116,10 @@ namespace MonoDevelop.Debugger
 			openButton.WidthRequest = 60;
 			hbox.PackEnd (openButton, false, false, 0); 
 
-			var container = new HBox ();
 			const int containerPadding = 8;
-			container.PackStart (hbox, true, true, containerPadding); 
-			messageOverlayWindow.Child = container; 
-			messageOverlayWindow.ShowOverlay (editor);
+			messageOverlayContent.PackStart (hbox, true, true, containerPadding);
+			editor.AddOverlay (messageOverlayContent,() => openButton.SizeRequest ().Width + w + hbox.Spacing * 5 + containerPadding * 2);
 
-			messageOverlayWindow.SizeFunc = () => openButton.SizeRequest ().Width + w + hbox.Spacing * 5 + containerPadding * 2;
 			openButton.Clicked += delegate {
 				var dlg = new OpenFileDialog (GettextCatalog.GetString ("File to Open"), MonoDevelop.Components.FileChooserAction.Open) {
 					TransientFor = IdeApp.Workbench.RootWindow,
@@ -161,15 +155,11 @@ namespace MonoDevelop.Debugger
 			}
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return sw;
 			}
 		}
-		
-		public override void Load (string fileName)
-		{
-		}
 
 		public override bool IsFile {
 			get {
@@ -180,13 +170,15 @@ namespace MonoDevelop.Debugger
 		public void Update ()
 		{
 			autoRefill = false;
-			
-			editor.Document.RemoveMarker (currentDebugLineMarker);
+			if (currentDebugLineMarker != null) {
+				editor.RemoveMarker (currentDebugLineMarker);
+				currentDebugLineMarker = null;
+			}
 			
 			if (DebuggingService.CurrentFrame == null) {
-				if (messageOverlayWindow != null) {
-					messageOverlayWindow.Destroy ();
-					messageOverlayWindow = null;
+				if (messageOverlayContent != null) {
+					editor.RemoveOverlay (messageOverlayContent);
+					messageOverlayContent = null;
 				}
 				sw.Sensitive = false;
 				return;
@@ -197,9 +189,9 @@ namespace MonoDevelop.Debugger
 			if (!string.IsNullOrWhiteSpace (sf.SourceLocation.FileName) && sf.SourceLocation.Line != -1 && sf.SourceLocation.FileHash != null) {
 				ShowLoadSourceFile (sf);
 			} else {
-				if (messageOverlayWindow != null) {
-					messageOverlayWindow.Destroy ();
-					messageOverlayWindow = null;
+				if (messageOverlayContent != null) {
+					editor.RemoveOverlay (messageOverlayContent);
+					messageOverlayContent = null;
 				}
 			}
 			if (!string.IsNullOrEmpty (sf.SourceLocation.FileName) && File.Exists (sf.SourceLocation.FileName))
@@ -223,7 +215,7 @@ namespace MonoDevelop.Debugger
 				}
 				currentFile = sf.SourceLocation.FileName;
 				addressLines.Clear ();
-				editor.Document.Text = string.Empty;
+				editor.Text = string.Empty;
 				StreamReader sr = new StreamReader (sf.SourceLocation.FileName);
 				string line;
 				int sourceLine = 1;
@@ -239,9 +231,9 @@ namespace MonoDevelop.Debugger
 					}
 					sourceLine++;
 				}
-				editor.Document.Text = sb.ToString ();
+				editor.Text = sb.ToString ();
 				foreach (int li in asmLineNums)
-					editor.Document.AddMarker (li, asmMarker);
+					editor.AddMarker (li, asmMarker);
 			}
 			int aline;
 			if (!addressLines.TryGetValue (GetAddrId (sf.Address, sf.AddressSpace), out aline))
@@ -287,8 +279,8 @@ namespace MonoDevelop.Debugger
 			firstLine = -150;
 			lastLine = 150;
 			
-			editor.Document.MimeType = "text/plain";
-			editor.Document.Text = string.Empty;
+			editor.MimeType = "text/plain";
+			editor.Text = string.Empty;
 			InsertLines (0, firstLine, lastLine, out firstLine, out lastLine);
 			
 			autoRefill = true;
@@ -298,19 +290,23 @@ namespace MonoDevelop.Debugger
 		
 		void UpdateCurrentLineMarker (bool moveCaret)
 		{
-			editor.Document.RemoveMarker (currentDebugLineMarker);
+			if (currentDebugLineMarker != null) {
+				editor.RemoveMarker (currentDebugLineMarker);
+				currentDebugLineMarker = null;
+			}
 			StackFrame sf = DebuggingService.CurrentFrame;
 			int line;
 			if (addressLines.TryGetValue (GetAddrId (sf.Address, sf.AddressSpace), out line)) {
-				editor.Document.AddMarker (line, currentDebugLineMarker);
+				var docLine = editor.GetLine (line);
+				currentDebugLineMarker = TextMarkerFactory.CreateCurrentDebugLineTextMarker (editor, docLine.Offset, docLine.Length);
+				editor.AddMarker (line, currentDebugLineMarker);
 				if (moveCaret) {
-					editor.Caret.Line = line;
+					editor.CaretLine = line;
 					GLib.Timeout.Add (100, delegate {
 						editor.CenterToCaret ();
 						return false;
 					});
 				}
-				editor.QueueDraw ();
 			}
 		}
 		
@@ -332,8 +328,9 @@ namespace MonoDevelop.Debugger
 			if (!autoRefill || dragging)
 				return;
 			
-			DocumentLocation loc = editor.PointToLocation (0, 0);
-			DocumentLocation loc2 = editor.PointToLocation (0, editor.Allocation.Height);
+			var loc = editor.PointToLocation (0, 0);
+			Gtk.Widget widget = editor;
+			var loc2 = editor.PointToLocation (0, widget.Allocation.Height);
 			//bool moveCaret = editor.Caret.Line >= loc.Line && editor.Caret.Line <= loc2.Line;
 			
 			if (firstLine != int.MinValue && loc.Line < FillMarginLines) {
@@ -348,17 +345,17 @@ namespace MonoDevelop.Debugger
 				addressLines = newLines;
 				
 				//if (moveCaret)
-					editor.Caret.Line += num;
+					editor.CaretLine += num;
 				
 				double hinc = num * editor.LineHeight;
 				sw.Vadjustment.Value += hinc;
 				
 				UpdateCurrentLineMarker (false);
 			}
-			if (lastLine != int.MinValue && loc2.Line >= editor.Document.LineCount - FillMarginLines) {
-				int num = (loc2.Line - (editor.Document.LineCount - FillMarginLines) + 1) * 2;
+			if (lastLine != int.MinValue && loc2.Line >= editor.LineCount - FillMarginLines) {
+				int num = (loc2.Line - (editor.LineCount - FillMarginLines) + 1) * 2;
 				int newFirst;
-				InsertLines (editor.Document.TextLength, lastLine + 1, lastLine + num, out newFirst, out lastLine);
+				InsertLines (editor.Length, lastLine + 1, lastLine + num, out newFirst, out lastLine);
 			}
 		}
 		
@@ -383,15 +380,16 @@ namespace MonoDevelop.Debugger
 			lines.RemoveRange (j + 1, lines.Count - j - 1);
 			
 			int lineCount = 0;
-			int editorLine = editor.GetTextEditorData ().OffsetToLineNumber (offset);
+			int editorLine = editor.OffsetToLineNumber (offset);
 			foreach (AssemblyLine li in lines) {
 				if (li.IsOutOfRange)
 					continue;
 				InsertAssemblerLine (sb, editorLine++, li);
 				lineCount++;
 			}
-			editor.Insert (offset, sb.ToString ());
-			editor.Document.CommitUpdateAll ();
+			editor.IsReadOnly = false;
+			editor.InsertText (offset, sb.ToString ());
+			editor.IsReadOnly = true;
 			if (offset == 0)
 				this.cachedLines.InsertRange (0, lines);
 			else
@@ -403,13 +401,13 @@ namespace MonoDevelop.Debugger
 		{
 			addressLines.Clear ();
 			currentFile = null;
-			if (messageOverlayWindow != null) {
-				messageOverlayWindow.Destroy ();
-				messageOverlayWindow = null;
+			if (messageOverlayContent != null) {
+				editor.RemoveOverlay (messageOverlayContent);
+				messageOverlayContent = null;
 			}
 			sw.Sensitive = false;
 			autoRefill = false;
-			editor.Document.Text = string.Empty;
+			editor.Text = string.Empty;
 			cachedLines.Clear ();
 		}
 		
@@ -453,7 +451,7 @@ namespace MonoDevelop.Debugger
 
 		void IClipboardHandler.Copy ()
 		{
-			editor.RunAction (ClipboardActions.Copy);
+			editor.EditorActionHost.ClipboardCopy ();
 		}
 
 		void IClipboardHandler.Paste ()
@@ -468,7 +466,7 @@ namespace MonoDevelop.Debugger
 
 		void IClipboardHandler.SelectAll ()
 		{
-			editor.RunAction (SelectionActions.SelectAll);
+			editor.EditorActionHost.SelectAll ();
 		}
 
 		bool IClipboardHandler.EnableCut {
@@ -476,7 +474,7 @@ namespace MonoDevelop.Debugger
 		}
 
 		bool IClipboardHandler.EnableCopy {
-			get { return !editor.SelectionRange.IsEmpty; }
+			get { return !editor.IsSomethingSelected; }
 		}
 
 		bool IClipboardHandler.EnablePaste {
@@ -493,107 +491,4 @@ namespace MonoDevelop.Debugger
 
 		#endregion
 	}
-	
-	class AsmLineMarker: TextLineMarker
-	{
-		public override ChunkStyle GetStyle (ChunkStyle baseStyle)
-		{
-			ChunkStyle st = new ChunkStyle (baseStyle);
-			st.Foreground = new Cairo.Color (125, 125, 125);
-			return st;
-		}
-	}
-
-	//Copy pasted from SourceEditor
-	class OverlayMessageWindow : Gtk.EventBox
-	{
-		const int border = 8;
-
-		public Func<int> SizeFunc;
-
-		TextEditor textEditor;
-
-		public OverlayMessageWindow ()
-		{
-			AppPaintable = true;
-		}
-
-		public void ShowOverlay (TextEditor textEditor)
-		{
-			this.textEditor = textEditor;
-			this.ShowAll ();
-			textEditor.AddTopLevelWidget (this, 0, 0);
-			textEditor.SizeAllocated += HandleSizeAllocated;
-			var child = (TextEditor.EditorContainerChild)textEditor [this];
-			child.FixedPosition = true;
-		}
-
-		protected override void OnDestroyed ()
-		{
-			base.OnDestroyed ();
-			if (textEditor != null) {
-				textEditor.SizeAllocated -= HandleSizeAllocated;
-				textEditor = null;
-			}
-		}
-
-		protected override void OnSizeRequested (ref Requisition requisition)
-		{
-			base.OnSizeRequested (ref requisition);
-
-			if (wRequest > 0) {
-				requisition.Width = wRequest;
-			}
-		}
-
-		protected override void OnSizeAllocated (Gdk.Rectangle allocation)
-		{
-			base.OnSizeAllocated (allocation);
-			Resize (allocation);
-		}
-
-		int wRequest = -1;
-
-		void HandleSizeAllocated (object o, Gtk.SizeAllocatedArgs args)
-		{
-			if (SizeFunc != null) {
-				var req = Math.Min (SizeFunc (), textEditor.Allocation.Width - border * 2);
-				if (req != wRequest) {
-					wRequest = req;
-					QueueResize ();
-				}
-			} else {
-				if (Allocation.Width > textEditor.Allocation.Width - border * 2) {
-					if (textEditor.Allocation.Width - border * 2 > 0) {
-						QueueResize ();
-					}
-				}
-			}
-			Resize (Allocation);
-		}
-
-		void Resize (Gdk.Rectangle alloc)
-		{
-			textEditor.MoveTopLevelWidget (this, (textEditor.Allocation.Width - alloc.Width) / 2, textEditor.Allocation.Height - alloc.Height - 8);
-		}
-
-		protected override bool OnExposeEvent (Gdk.EventExpose evnt)
-		{
-			using (var cr = CairoHelper.Create (evnt.Window)) {
-				cr.LineWidth = 1;
-				cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
-				cr.SetSourceColor (textEditor.ColorStyle.NotificationText.Background);
-				cr.Fill ();
-				cr.RoundedRectangle (0, 0, Allocation.Width, Allocation.Height, 3);
-				cr.SetSourceColor (textEditor.ColorStyle.NotificationText.Background);
-				cr.FillPreserve ();
-
-				cr.SetSourceColor (textEditor.ColorStyle.NotificationBorder.Color);
-				cr.Stroke ();
-			}
-
-			return base.OnExposeEvent (evnt);
-		}
-
-	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
index 779c3da033..da38a4f745 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
@@ -38,12 +38,12 @@ using MonoDevelop.Core;
 using MonoDevelop.Components;
 using MonoDevelop.Ide.TextEditing;
 using MonoDevelop.Ide.Gui.Content;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor.Extension;
 using MonoDevelop.Ide.Fonts;
 
 namespace MonoDevelop.Debugger
 {
-	class ExceptionCaughtDialog : Dialog
+	class ExceptionCaughtDialog : Gtk.Dialog
 	{
 		static readonly Xwt.Drawing.Image WarningIconPixbuf = Xwt.Drawing.Image.FromResource ("toolbar-icon.png");
 		static readonly Xwt.Drawing.Image WarningIconPixbufInner = Xwt.Drawing.Image.FromResource ("exception-outline-16.png");
@@ -74,6 +74,7 @@ namespace MonoDevelop.Debugger
 		public ExceptionCaughtDialog (ExceptionInfo ex, ExceptionCaughtMessage msg)
 		{
 			this.Name = "wizard_dialog";
+			this.ApplyTheme ();
 			selected = exception = ex;
 			message = msg;
 
@@ -132,6 +133,7 @@ namespace MonoDevelop.Debugger
 		{
 			ExceptionValueTreeView = new ObjectValueTreeView ();
 			ExceptionValueTreeView.Frame = DebuggingService.CurrentFrame;
+			ExceptionValueTreeView.ModifyBase (StateType.Normal, Styles.ExceptionCaughtDialog.TreeBackgroundColor.ToGdkColor ());
 			ExceptionValueTreeView.AllowPopupMenu = false;
 			ExceptionValueTreeView.AllowExpanding = true;
 			ExceptionValueTreeView.AllowPinning = false;
@@ -794,7 +796,7 @@ namespace MonoDevelop.Debugger
 			dlg.Line = Line;
 		}
 
-		public override Widget CreateWidget ()
+		public override Control CreateWidget ()
 		{
 			var icon = Xwt.Drawing.Image.FromResource ("lightning-16.png");
 			var image = new Xwt.ImageView (icon).ToGtkWidget ();
@@ -888,7 +890,7 @@ namespace MonoDevelop.Debugger
 			dlg.Line = Line;
 		}
 
-		public override Widget CreateWidget ()
+		public override Control CreateWidget ()
 		{
 			var box = new EventBox ();
 			box.VisibleWindow = false;
@@ -908,17 +910,17 @@ namespace MonoDevelop.Debugger
 
 	class ExceptionCaughtTextEditorExtension : TextEditorExtension
 	{
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			if (key == Gdk.Key.Escape && DebuggingService.ExceptionCaughtMessage != null &&
+			if (descriptor.SpecialKey == SpecialKey.Escape && DebuggingService.ExceptionCaughtMessage != null &&
 			    !DebuggingService.ExceptionCaughtMessage.IsMinimized &&
-			    DebuggingService.ExceptionCaughtMessage.File.CanonicalPath == Document.FileName.CanonicalPath) {
+				DebuggingService.ExceptionCaughtMessage.File.CanonicalPath == new FilePath(DocumentContext.Name).CanonicalPath) {
 
 				DebuggingService.ExceptionCaughtMessage.ShowMiniButton ();
 				return true;
 			}
 
-			return base.KeyPress (key, keyChar, modifier);
+			return base.KeyPress (descriptor);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs
index 2a2f7e93dd..f35088bf82 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExpressionEvaluatorDialog.cs
@@ -28,6 +28,7 @@
 using System;
 using MonoDevelop.Ide.CodeCompletion;
 using Gtk;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Debugger
 {
@@ -112,7 +113,7 @@ namespace MonoDevelop.Debugger
 			if (keyHandled)
 				return;
 
-			CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifier);
+			CompletionWindowManager.PostProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 			PopupCompletion ((Entry) sender);
 		}
 
@@ -131,7 +132,7 @@ namespace MonoDevelop.Debugger
 			}
 
 			if (currentCompletionData != null)
-				args.RetVal = keyHandled = CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifier);
+				args.RetVal = keyHandled = CompletionWindowManager.PreProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 		}
 
 		void OnEditFocusOut (object sender, FocusOutEventArgs args)
@@ -181,6 +182,9 @@ namespace MonoDevelop.Debugger
 			get {
 				return entry.Position;
 			}
+			set {
+				entry.Position = value;
+			}
 		}
 		
 		char ICompletionWidget.GetChar (int offset)
@@ -255,6 +259,12 @@ namespace MonoDevelop.Debugger
 				return entry.Style;
 			}
 		}
+
+		double ICompletionWidget.ZoomLevel {
+			get {
+				return 1;
+			}
+		}
 		#endregion 
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs
index 8ce3fe3f98..c1a7fac6ae 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Extensions.cs
@@ -32,6 +32,7 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Projects;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Debugger
 {
@@ -39,50 +40,51 @@ namespace MonoDevelop.Debugger
 	{
 		public static bool CanDebug (this ProjectOperations opers, IBuildTarget entry)
 		{
-			ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
+			ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors.ConsoleFactory, IdeApp.Workspace.ActiveExecutionTarget);
 			return opers.CanExecute (entry, context);
 		}
 
-		public static IAsyncOperation Debug (this ProjectOperations opers, IBuildTarget entry)
+		public static AsyncOperation Debug (this ProjectOperations opers, IBuildTarget entry, bool buildBeforeExecuting = true)
 		{
 			if (opers.CurrentRunOperation != null && !opers.CurrentRunOperation.IsCompleted)
 				return opers.CurrentRunOperation;
 
-			ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
+			ExecutionContext context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors.ConsoleFactory, IdeApp.Workspace.ActiveExecutionTarget);
 
-			IAsyncOperation op = opers.Execute (entry, context);
+			AsyncOperation op = opers.Execute (entry, context, buildBeforeExecuting);
 			return op;
 		}
 
 		public static bool CanDebugFile (this ProjectOperations opers, string file)
 		{
-			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
+			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors.ConsoleFactory, IdeApp.Workspace.ActiveExecutionTarget);
 			return opers.CanExecuteFile (file, context);
 		}
 
-		public static IAsyncOperation DebugFile (this ProjectOperations opers, string file)
+		public static AsyncOperation DebugFile (this ProjectOperations opers, string file)
 		{
-			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors, IdeApp.Workspace.ActiveExecutionTarget);
+			var context = new ExecutionContext (DebuggingService.GetExecutionHandler (), IdeApp.Workbench.ProgressMonitors.ConsoleFactory, IdeApp.Workspace.ActiveExecutionTarget);
 			return opers.ExecuteFile (file, context);
 		}
 
-		public static IAsyncOperation DebugApplication (this ProjectOperations opers, string executableFile, string args, string workingDir, IDictionary<string,string> envVars)
+		public static AsyncOperation DebugApplication (this ProjectOperations opers, string executableFile, string args, string workingDir, IDictionary<string,string> envVars)
 		{
 			if (opers.CurrentRunOperation != null && !opers.CurrentRunOperation.IsCompleted)
 				return opers.CurrentRunOperation;
 
 			var monitor = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor ();
 
-			var oper = DebuggingService.Run (executableFile, args, workingDir, envVars, (IConsole) monitor);
-			oper.Completed += delegate {
+			var oper = DebuggingService.Run (executableFile, args, workingDir, envVars, monitor.Console);
+			opers.CurrentRunOperation = oper;
+
+			oper.Task.ContinueWith (t => {
 				monitor.Dispose ();
-			};
+			});
 
-			opers.CurrentRunOperation = monitor.AsyncOperation;
-			return opers.CurrentRunOperation;
+			return oper;
 		}
 
-		public static IAsyncOperation AttachToProcess (this ProjectOperations opers, DebuggerEngine debugger, ProcessInfo proc)
+		public static AsyncOperation AttachToProcess (this ProjectOperations opers, DebuggerEngine debugger, ProcessInfo proc)
 		{
 			if (opers.CurrentRunOperation != null && !opers.CurrentRunOperation.IsCompleted)
 				return opers.CurrentRunOperation;
@@ -92,15 +94,5 @@ namespace MonoDevelop.Debugger
 			opers.CurrentRunOperation = oper;
 			return opers.CurrentRunOperation;
 		}
-
-		public static IAsyncOperation Debug (this Document doc)
-		{
-			return IdeApp.ProjectOperations.DebugFile (doc.FileName);
-		}
-
-		public static bool CanDebug (this Document doc)
-		{
-			return doc.FileName != FilePath.Null && IdeApp.ProjectOperations.CanDebugFile (doc.FileName);
-		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerExpressionResolver.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerExpressionResolver.cs
index 5844aa54ae..a2009111f0 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerExpressionResolver.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/IDebuggerExpressionResolver.cs
@@ -26,13 +26,33 @@
 
 using System;
 
-using Mono.TextEditor;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using System.Threading;
 
 namespace MonoDevelop.Debugger
 {
+	public struct DebugDataTipInfo
+	{
+		public readonly TextSpan Span;
+		public readonly string Text;
+
+		public DebugDataTipInfo (TextSpan span, string text)
+		{
+			this.Span = span;
+			this.Text = text;
+		}
+
+		public bool IsDefault
+		{
+			get { return Span.Length == 0 && Span.Start == 0 && Text == null; }
+		}
+	}
+
 	public interface IDebuggerExpressionResolver
 	{
-		string ResolveExpression (TextEditorData editor, Document doc, int offset, out int startOffset);
+		Task<DebugDataTipInfo> ResolveExpressionAsync (IReadonlyTextDocument editor, DocumentContext doc, int offset, CancellationToken cancellationToken);
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ImmediatePad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ImmediatePad.cs
index dd5ac17ce9..1b5489e8f8 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ImmediatePad.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ImmediatePad.cs
@@ -37,13 +37,13 @@ using MonoDevelop.Components;
 
 namespace MonoDevelop.Debugger
 {
-	public class ImmediatePad: IPadContent
+	public class ImmediatePad: PadContent
 	{
 		static readonly object mutex = new object();
 		DebuggerConsoleView view;
 		readonly List<uint> timersList = new List<uint>();
 		
-		public void Initialize (IPadWindow container)
+		protected override void Initialize (IPadWindow container)
 		{
 			view = new DebuggerConsoleView ();
 			view.ConsoleInput += OnViewConsoleInput;
@@ -263,21 +263,18 @@ namespace MonoDevelop.Debugger
 			});
 		}	
 
-		public void RedrawContent ()
-		{
-		}
-		
-		public Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return view;
 			}
 		}
 
-		public void Dispose ()
+		public override void Dispose ()
 		{
 			DebuggingService.PausedEvent -= DebuggerPaused;
 			DebuggingService.ResumedEvent -= DebuggerResumed;
 			DebuggingService.StoppedEvent -= DebuggerStopped;
+			base.Dispose ();
 		}
 
 		void DebuggerResumed (object sender, EventArgs e)
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs
index ca2cebd26b..882f54980b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs
@@ -1,33 +1,34 @@
-//
-// InfoFrame.cs
-//
-// Author:
-//       Jeffrey Stedfast <jeff@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
+//

+// InfoFrame.cs

+//

+// Author:

+//       Jeffrey Stedfast <jeff@xamarin.com>

+//

+// Copyright (c) 2013 Xamarin Inc.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

 using System;
 
 using Gtk;
-
+using MonoDevelop.Components;

+

 namespace MonoDevelop.Debugger
 {
 	[System.ComponentModel.ToolboxItem (true)]
@@ -49,10 +50,10 @@ namespace MonoDevelop.Debugger
 				cr.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
 				cr.ClipPreserve ();
 
-				cr.SetSourceRGB (1.00, 0.98, 0.91);
+				cr.SetSourceColor (Styles.ExceptionCaughtDialog.InfoFrameBackgroundColor.ToCairoColor ());
 				cr.FillPreserve ();
 
-				cr.SetSourceRGB (0.87, 0.83, 0.74);
+				cr.SetSourceColor (Styles.ExceptionCaughtDialog.InfoFrameBorderColor.ToCairoColor ());
 				cr.LineWidth = 2;
 				cr.Stroke ();
 			}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs
index 530207a977..34a83ac4ab 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs
@@ -126,8 +126,10 @@ namespace MonoDevelop.Debugger
 					if (!sf.IsExternalCode &&
 					    sf.SourceLocation.Line != -1 &&
 					    !string.IsNullOrEmpty (sf.SourceLocation.FileName) &&
-						//Uncomment condition below once logic for ProjectOnlyCode in runtime is fixed
-						(/*DebuggingService.CurrentSessionSupportsFeature (DebuggerFeatures.Disassembly) ||*/ System.IO.File.Exists (sf.SourceLocation.FileName))) {
+					    //Uncomment condition below once logic for ProjectOnlyCode in runtime is fixed
+					    (/*DebuggingService.CurrentSessionSupportsFeature (DebuggerFeatures.Disassembly) ||*/
+					        System.IO.File.Exists (sf.SourceLocation.FileName) ||
+					        SourceCodeLookup.FindSourceFile (sf.SourceLocation.FileName, sf.SourceLocation.FileHash).IsNotNull)) {
 						if (n != DebuggingService.CurrentFrameIndex)
 							DebuggingService.CurrentFrameIndex = n;
 						break;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/LocalsPad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/LocalsPad.cs
index feb6d9c0c3..e0c66098b2 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/LocalsPad.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/LocalsPad.cs
@@ -49,7 +49,7 @@ namespace MonoDevelop.Debugger
 			if (frame == null)
 				return;
 
-			tree.ClearAll ();
+			tree.ClearValues ();
 			tree.AddValues (frame.GetAllLocals ().Where (l => !string.IsNullOrWhiteSpace (l.Name) && l.Name != "?").ToArray ());
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValuePad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValuePad.cs
index 1a5f3dcf5e..eb6217ecec 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValuePad.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValuePad.cs
@@ -29,20 +29,20 @@ using System;
 using Gtk;
 using MonoDevelop.Ide.Gui;
 using Mono.Debugging.Client;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.Debugger
 {
-	public class ObjectValuePad: IPadContent
+	public class ObjectValuePad: PadContent
 	{
 		protected ObjectValueTreeView tree;
 		readonly ScrolledWindow scrolled;
 		bool needsUpdate;
-		IPadWindow container;
 		bool initialResume;
 		StackFrame lastFrame;
 		PadFontChanger fontChanger;
 		
-		public Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return scrolled;
 			}
@@ -76,7 +76,7 @@ namespace MonoDevelop.Debugger
 			initialResume = !DebuggingService.IsDebugging;
 		}
 
-		public void Dispose ()
+		public override void Dispose ()
 		{
 			if (fontChanger == null)
 				return;
@@ -88,21 +88,17 @@ namespace MonoDevelop.Debugger
 			DebuggingService.ResumedEvent -= OnDebuggerResumed;
 			DebuggingService.StoppedEvent -= OnDebuggerStopped;
 			DebuggingService.EvaluationOptionsChanged -= OnEvaluationOptionsChanged;
+			base.Dispose ();
 		}
 
-		public void Initialize (IPadWindow container)
+		protected override void Initialize (IPadWindow container)
 		{
-			this.container = container;
 			container.PadContentShown += delegate {
 				if (needsUpdate)
 					OnUpdateList ();
 			};
 		}
 
-		public void RedrawContent ()
-		{
-		}
-		
 		public virtual void OnUpdateList ()
 		{
 			needsUpdate = false;
@@ -113,7 +109,7 @@ namespace MonoDevelop.Debugger
 		
 		protected virtual void OnFrameChanged (object s, EventArgs a)
 		{
-			if (container != null && container.ContentVisible)
+			if (Window != null && Window.ContentVisible)
 				OnUpdateList ();
 			else
 				needsUpdate = true;
@@ -144,7 +140,7 @@ namespace MonoDevelop.Debugger
 		{
 			if (!DebuggingService.IsRunning) {
 				lastFrame = null;
-				if (container != null && container.ContentVisible)
+				if (Window != null && Window.ContentVisible)
 					OnUpdateList ();
 				else
 					needsUpdate = true;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
index da3940e4b1..5a864961fd 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
@@ -39,9 +39,9 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Commands;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor.Extension;
 using System.Linq;
-
+using MonoDevelop.Ide.Fonts;
 
 namespace MonoDevelop.Debugger
 {
@@ -90,10 +90,6 @@ namespace MonoDevelop.Debugger
 		readonly TreeViewColumn typeCol;
 		readonly TreeViewColumn pinCol;
 		
-		const string errorColor = "red";
-		const string modifiedColor = "blue";
-		const string disabledColor = "gray";
-		
 		static readonly CommandEntrySet menuSet;
 		
 		const int NameColumn = 0;
@@ -168,7 +164,7 @@ namespace MonoDevelop.Debugger
 				if (!icon.IsNull) {
 					using (var ctx = Gdk.CairoHelper.Create (window)) {
 						using (var layout = new Pango.Layout (widget.PangoContext)) {
-							layout.FontDescription = FontDesc.Copy ();
+							layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
 							layout.FontDescription.Family = Family;
 							layout.SetText (Text);
 							int w, h;
@@ -192,7 +188,7 @@ namespace MonoDevelop.Debugger
 					Uri uri;
 					if (value != null && Uri.TryCreate (value.Trim ('"', '{', '}'), UriKind.Absolute, out uri) && (uri.Scheme == "http" || uri.Scheme == "https")) {
 						Underline = Pango.Underline.Single;
-						Foreground = "#197CEF";
+						Foreground = Ide.Gui.Styles.LinkForegroundColor.ToHexString (false);
 					} else {
 						Underline = Pango.Underline.None;
 					}
@@ -256,9 +252,9 @@ namespace MonoDevelop.Debugger
 							cell_area.Height - TopBottomPadding * 2 - 1,
 							(cell_area.Height - (TopBottomPadding * 2)) / 2);
 						cr.LineWidth = 1;
-						cr.SetSourceRGB (233 / 255.0, 242 / 255.0, 252 / 255.0);
+						cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonBackground.ToCairoColor ());
 						cr.FillPreserve ();
-						cr.SetSourceRGB (82 / 255.0, 148 / 255.0, 235 / 255.0);
+						cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonBorder.ToCairoColor ());
 						cr.Stroke ();
 
 						int YOffset = (cell_area.Height - h) / 2;
@@ -267,7 +263,7 @@ namespace MonoDevelop.Debugger
 						window.DrawLayoutWithColors (widget.Style.TextGC (StateType.Normal),
 							cell_area.X + (cell_area.Height - TopBottomPadding * 2 + 1) / 2 + xpad,
 							cell_area.Y + YOffset,
-							layout, new Gdk.Color (82, 148, 235), new Gdk.Color (233, 242, 252));
+							layout, Styles.ObjectValueTreeValuesButtonText.ToGdkColor(), Styles.ObjectValueTreeValuesButtonBackground.ToGdkColor());
 					}
 				}
 			}
@@ -302,11 +298,10 @@ namespace MonoDevelop.Debugger
 			Selection.Mode = Gtk.SelectionMode.Multiple;
 			Selection.Changed += HandleSelectionChanged;
 			ResetColumnSizes ();
-			
-			Pango.FontDescription newFont = Style.FontDescription.Copy ();
-			newFont.Size = (newFont.Size * 8) / 10;
 
-			liveIcon = ImageService.GetIcon (Stock.Execute, IconSize.Menu);
+			Pango.FontDescription newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
+
+			liveIcon = ImageService.GetIcon ("md-live", IconSize.Menu);
 			noLiveIcon = liveIcon.WithAlpha (0.5);
 			
 			expCol = new TreeViewColumn ();
@@ -474,8 +469,6 @@ namespace MonoDevelop.Debugger
 			}
 		}
 
-		Dictionary<TreeIter, bool> evalSpinnersIcons = new Dictionary<TreeIter, bool>();
-
 		void HandleSelectionChanged (object sender, EventArgs e)
 		{
 			if (!currentHoverIter.Equals (TreeIter.Zero) && store.IterIsValid (currentHoverIter)) {
@@ -485,25 +478,21 @@ namespace MonoDevelop.Debugger
 					SetPreviewButtonIcon (iconBeforeSelected, currentHoverIter);
 				}
 			}
-			foreach (var s in evalSpinnersIcons.ToArray()) {
-				if (store.IterIsValid (s.Key) && Selection.IterIsSelected (s.Key)) {
-					if (!s.Value) {
-						store.LoadIcon (s.Key, EvaluateStatusIconColumn, "md-spinner-selected-16", IconSize.Menu);
-						evalSpinnersIcons [s.Key] = true;
-					}
-				} else {
-					if (s.Value) {
-						store.LoadIcon (s.Key, EvaluateStatusIconColumn, "md-spinner-normal-16", IconSize.Menu);
-						evalSpinnersIcons [s.Key] = false;
-					}
-				}
-			}
 		}
 
+		Adjustment oldHadjustment;
+		Adjustment oldVadjustment;
+		//Don't convert this event handler to override OnSetScrollAdjustments as it causes problems
 		void HandleScrollAdjustmentsSet (object o, ScrollAdjustmentsSetArgs args)
 		{
-			Hadjustment.ValueChanged += UpdatePreviewPosition;
-			Vadjustment.ValueChanged += UpdatePreviewPosition;
+			if (oldHadjustment != null) {
+				oldHadjustment.ValueChanged -= UpdatePreviewPosition;
+				oldVadjustment.ValueChanged -= UpdatePreviewPosition;
+			}
+			oldHadjustment = Hadjustment;
+			oldVadjustment = Vadjustment;
+			oldHadjustment.ValueChanged += UpdatePreviewPosition;
+			oldVadjustment.ValueChanged += UpdatePreviewPosition;
 		}
 
 		void UpdatePreviewPosition (object sender, EventArgs e)
@@ -560,8 +549,13 @@ namespace MonoDevelop.Debugger
 			valueCol.RemoveNotification ("width", OnColumnWidthChanged);
 			expCol.RemoveNotification ("width", OnColumnWidthChanged);
 
-			Hadjustment.ValueChanged -= UpdatePreviewPosition;
-			Vadjustment.ValueChanged -= UpdatePreviewPosition;
+			ScrollAdjustmentsSet -= HandleScrollAdjustmentsSet;
+			if (oldHadjustment != null) {
+				oldHadjustment.ValueChanged -= UpdatePreviewPosition;
+				oldVadjustment.ValueChanged -= UpdatePreviewPosition;
+				oldHadjustment = null;
+				oldVadjustment = null;
+			}
 
 			values.Clear ();
 			valueNames.Clear ();
@@ -747,12 +741,11 @@ namespace MonoDevelop.Debugger
 				compact = value;
 				Pango.FontDescription newFont;
 				if (compact) {
-					newFont = Style.FontDescription.Copy ();
-					newFont.Size = (newFont.Size * 8) / 10;
+					newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
 					valueCol.MaxWidth = 800;
 					crpViewer.Image = ImageService.GetIcon (Stock.Edit).WithSize (12,12);
 				} else {
-					newFont = Style.FontDescription;
+					newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12);
 					valueCol.MaxWidth = int.MaxValue;
 				}
 				typeCol.Visible = !compact;
@@ -888,7 +881,7 @@ namespace MonoDevelop.Debugger
 				ShowExpanders = true;
 			
 			if (AllowAdding)
-				store.AppendValues (createMsg, "", "", null, true, true, null, disabledColor, disabledColor);
+				store.AppendValues (createMsg, "", "", null, true, true, null, Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText), Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText));
 
 			LoadState ();
 		}
@@ -1135,7 +1128,7 @@ namespace MonoDevelop.Debugger
 			if (val.IsUnknown) {
 				if (frame != null) {
 					strval = GettextCatalog.GetString ("The name '{0}' does not exist in the current context.", val.Name);
-					nameColor = disabledColor;
+					nameColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText);
 					canEdit = false;
 				} else {
 					canEdit = !val.IsReadOnly;
@@ -1148,27 +1141,22 @@ namespace MonoDevelop.Debugger
 				int i = strval.IndexOf ('\n');
 				if (i != -1)
 					strval = strval.Substring (0, i);
-				valueColor = errorColor;
+				valueColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueErrorText);
 				canEdit = false;
 			} else if (val.IsNotSupported) {
 				strval = "";//val.Value; with new "Show Value" button we don't want to display message "Implicit evaluation is disabled"
-				valueColor = disabledColor;
+				valueColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText);
 				if (val.CanRefresh)
 					valueButton = GettextCatalog.GetString ("Show Value");
 				canEdit = false;
 			} else if (val.IsEvaluating) {
 				strval = GettextCatalog.GetString ("Evaluating...");
 
-				if (Selection.IterIsSelected (it)) {
-					evalSpinnersIcons [it] = true;
-					evaluateStatusIcon = "md-spinner-selected-16";
-				} else {
-					evalSpinnersIcons [it] = false;
-					evaluateStatusIcon = "md-spinner-normal-16";
-				}
-				valueColor = disabledColor;
+				evaluateStatusIcon = "md-spinner-16";
+
+				valueColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText);
 				if (val.IsEvaluatingGroup) {
-					nameColor = disabledColor;
+					nameColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText);
 					name = val.Name;
 				}
 				canEdit = false;
@@ -1193,7 +1181,7 @@ namespace MonoDevelop.Debugger
 					strval = val.DisplayValue ?? "(null)";
 				}
 				if (oldValue != null && strval != oldValue)
-					nameColor = valueColor = modifiedColor;
+					nameColor = valueColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueModifiedText);
 			}
 
 			strval = strval.Replace ("\r\n", " ").Replace ("\n", " ");
@@ -1209,9 +1197,6 @@ namespace MonoDevelop.Debugger
 			store.SetValue (it, IconColumn, icon);
 			store.SetValue (it, NameColorColumn, nameColor);
 			store.SetValue (it, ValueColorColumn, valueColor);
-			if (evaluateStatusIcon != "md-spinner-normal-16" && evaluateStatusIcon != "md-spinner-selected-16") {
-				evalSpinnersIcons.Remove (it);
-			}
 			store.SetValue (it, EvaluateStatusIconVisibleColumn, evaluateStatusIcon != null);
 			store.LoadIcon (it, EvaluateStatusIconColumn, evaluateStatusIcon, IconSize.Menu);
 			store.SetValue (it, ValueButtonVisibleColumn, valueButton != null);
@@ -1496,7 +1481,7 @@ namespace MonoDevelop.Debugger
 			string oldValue;
 			if (oldValues.TryGetValue (valPath, out oldValue)) {
 				if (oldValue != val.Value)
-					newColor = modifiedColor;
+					newColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueModifiedText);
 			}
 			
 			store.SetValue (it, NameColorColumn, newColor);
@@ -1533,7 +1518,7 @@ namespace MonoDevelop.Debugger
 		void OnEditKeyRelease (object sender, EventArgs e)
 		{
 			if (!wasHandled) {
-				CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifierState);
+				CompletionWindowManager.PostProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifierState));
 				PopupCompletion ((Entry) sender);
 			}
 		}
@@ -1555,7 +1540,7 @@ namespace MonoDevelop.Debugger
 			keyValue = args.Event.KeyValue;
 
 			if (currentCompletionData != null) {
-				wasHandled  = CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifierState);
+				wasHandled  = CompletionWindowManager.PreProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifierState));
 				args.RetVal = wasHandled;
 			}
 		}
@@ -1738,10 +1723,10 @@ namespace MonoDevelop.Debugger
 		
 		void CleanPinIcon ()
 		{
-			if (!lastPinIter.Equals (TreeIter.Zero)) {
+			if (!lastPinIter.Equals (TreeIter.Zero) && store.IterIsValid (lastPinIter)) {
 				store.SetValue (lastPinIter, PinIconColumn, null);
-				lastPinIter = TreeIter.Zero;
 			}
+			lastPinIter = TreeIter.Zero;
 		}
 		
 		protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing evnt)
@@ -1853,9 +1838,8 @@ namespace MonoDevelop.Debugger
 			TreePath path;
 			bool closePreviewWindow = true;
 			
-			if (CanQueryDebugger && evnt.Button == 1 && GetCellAtPos ((int)evnt.X, (int)evnt.Y, out path, out col, out cr)) {
-				TreeIter it;
-				store.GetIter (out it, path);
+			TreeIter it;
+			if (CanQueryDebugger && evnt.Button == 1 && GetCellAtPos ((int)evnt.X, (int)evnt.Y, out path, out col, out cr) && store.GetIter (out it, path)) {
 				if (cr == crpViewer) {
 					var val = (ObjectValue)store.GetValue (it, ObjectColumn);
 					DebuggingService.ShowValueVisualizer (val);
@@ -2245,7 +2229,13 @@ namespace MonoDevelop.Debugger
 				return ((ICompletionWidget)this).CreateCodeCompletionContext (editEntry.Position);
 			}
 		}
-		
+
+		public double ZoomLevel {
+			get {
+				return 1;
+			}
+		}
+
 		public event EventHandler CompletionContextChanged;
 
 		protected virtual void OnCompletionContextChanged (EventArgs e)
@@ -2280,6 +2270,9 @@ namespace MonoDevelop.Debugger
 			get {
 				return editEntry.Position;
 			}
+			set {
+				editEntry.Position = value;
+			}
 		}
 		
 		char ICompletionWidget.GetChar (int offset)
@@ -2352,6 +2345,7 @@ namespace MonoDevelop.Debugger
 				return editEntry.Style;
 			}
 		}
+
 		#endregion 
 
 		ObjectValue[] GetValues (string[] names)
@@ -2401,8 +2395,9 @@ namespace MonoDevelop.Debugger
 		}
 	}
 	
-	class DebugCompletionDataList: List<ICSharpCode.NRefactory.Completion.ICompletionData>, ICompletionDataList
+	class DebugCompletionDataList: List<MonoDevelop.Ide.CodeCompletion.CompletionData>, ICompletionDataList
 	{
+		public int TriggerWordLength { get; set; }
 		public bool IsSorted { get; set; }
 		public DebugCompletionDataList (Mono.Debugging.Client.CompletionData data)
 		{
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/PinnedWatchStore.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/PinnedWatchStore.cs
index 4d9bc48f2f..52ac37e34e 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/PinnedWatchStore.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/PinnedWatchStore.cs
@@ -272,7 +272,7 @@ namespace MonoDevelop.Debugger
 					batchChanged.Add (watch);
 				return;
 			}
-			DispatchService.GuiDispatch (() => {
+			Runtime.RunInMainThread (() => {
 				if (WatchChanged != null)
 					WatchChanged (this, new PinnedWatchEventArgs (watch));
 			});
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs
index 97164a0ca5..3e46fd0f6d 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs
@@ -45,7 +45,29 @@ using System.Linq;
 
 namespace MonoDevelop.Debugger
 {
-	public class StackTracePad : ScrolledWindow, IPadContent
+	public class StackTracePad : PadContent
+	{
+		StackTracePadWidget control;
+
+		public StackTracePad ()
+		{
+			Id = "MonoDevelop.Debugger.StackTracePad";
+			control = new StackTracePadWidget ();
+		}
+
+		protected override void Initialize (IPadWindow window)
+		{
+			control.Initialize (window);
+		}
+
+		public override Control Control {
+			get {
+				return control;
+			}
+		}
+	}
+
+	public class StackTracePadWidget : ScrolledWindow
 	{
 		const int IconColumn = 0;
 		const int MethodColumn = 1;
@@ -62,9 +84,9 @@ namespace MonoDevelop.Debugger
 		IPadWindow window;
 		bool needsUpdate;
 
-		static Xwt.Drawing.Image pointerImage = Xwt.Drawing.Image.FromResource ("stack-pointer-16.png");
+		static Xwt.Drawing.Image pointerImage = ImageService.GetIcon ("md-stack-pointer", IconSize.Menu);
 
-		public StackTracePad ()
+		public StackTracePadWidget ()
 		{
 			this.ShadowType = ShadowType.None;
 
@@ -189,7 +211,7 @@ namespace MonoDevelop.Debugger
 			return !value.Contains (key);
 		}
 
-		void IPadContent.Initialize (IPadWindow window)
+		public void Initialize (IPadWindow window)
 		{
 			this.window = window;
 			window.PadContentShown += delegate {
@@ -344,25 +366,6 @@ namespace MonoDevelop.Debugger
 			ActivateFrame ();
 		}
 
-		public Widget Control {
-			get {
-				return this;
-			}
-		}
-
-		public string Id {
-			get { return "MonoDevelop.Debugger.StackTracePad"; }
-		}
-
-		public string DefaultPlacement {
-			get { return "Bottom"; }
-		}
-
-		public void RedrawContent ()
-		{
-			UpdateDisplay ();
-		}
-
 		void ShowPopup (Gdk.EventButton evt)
 		{
 			var context_menu = new ContextMenu ();
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Styles.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Styles.cs
new file mode 100644
index 0000000000..d4f4f51226
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Styles.cs
@@ -0,0 +1,104 @@
+//
+// Styles.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Ide;
+using Xwt.Drawing;
+
+namespace MonoDevelop.Debugger
+{
+	public static class Styles
+	{
+		public static Color ObjectValueTreeValuesButtonBackground { get; internal set; }
+		public static Color ObjectValueTreeValuesButtonText { get; internal set; }
+		public static Color ObjectValueTreeValuesButtonBorder { get; internal set; }
+		public static Color ObjectValueTreeValueErrorText { get; internal set; }
+		public static Color ObjectValueTreeValueDisabledText { get; internal set; }
+		public static Color ObjectValueTreeValueModifiedText { get; internal set; }
+		public static Color PreviewVisualizerBackgroundColor { get; internal set; }
+		public static Color PreviewVisualizerTextColor { get; internal set; }
+		public static Color PreviewVisualizerHeaderTextColor { get; internal set; }
+
+		public static ExceptionCaughtDialogStyle ExceptionCaughtDialog { get; internal set; }
+
+		public class ExceptionCaughtDialogStyle
+		{
+			public Color TreeBackgroundColor { get; internal set; }
+			public Color InfoFrameBackgroundColor { get; internal set; }
+			public Color InfoFrameBorderColor { get; internal set; }
+			public Color LineNumberBackgroundColor { get; internal set; }
+			public Color LineNumberInUserCodeBackgroundColor { get; internal set; }
+			public Color LineNumberTextColor { get; internal set; }
+		}
+
+		static Styles ()
+		{
+			LoadStyles ();
+			Ide.Gui.Styles.Changed +=  (o, e) => LoadStyles ();
+		}
+
+		public static void LoadStyles ()
+		{
+			ExceptionCaughtDialog = new ExceptionCaughtDialogStyle ();
+
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) {
+				ObjectValueTreeValuesButtonBackground = Color.FromName ("#e9f2fc");
+				ObjectValueTreeValuesButtonText = Color.FromName ("#5294eb");
+				ObjectValueTreeValuesButtonBorder = Color.FromName ("#5294eb");
+				ObjectValueTreeValueDisabledText = Color.FromName ("#7f7f7f");
+				ObjectValueTreeValueModifiedText = Color.FromName ("#1FAECE");
+
+				ExceptionCaughtDialog.InfoFrameBackgroundColor = Color.FromName ("#fbefce");
+				ExceptionCaughtDialog.InfoFrameBorderColor = Color.FromName ("#f0e4c2");
+				ExceptionCaughtDialog.LineNumberBackgroundColor = Color.FromName ("#c4c4c4");
+				ExceptionCaughtDialog.LineNumberInUserCodeBackgroundColor = Color.FromName ("#e599de");
+				ExceptionCaughtDialog.LineNumberTextColor = Color.FromName ("#ffffff");
+			} else {
+				ObjectValueTreeValuesButtonBackground = Color.FromName ("#7c8695");
+				ObjectValueTreeValuesButtonText = Color.FromName ("#cbe5ff");
+				ObjectValueTreeValuesButtonBorder = Color.FromName ("#a4bbd5");
+				ObjectValueTreeValueDisabledText = Color.FromName ("#5a5a5a");
+				ObjectValueTreeValueModifiedText = Color.FromName ("#4FCAE6");
+
+				ExceptionCaughtDialog.InfoFrameBackgroundColor = Color.FromName ("#675831");
+				ExceptionCaughtDialog.InfoFrameBorderColor = Color.FromName ("#7a6a3d");
+				ExceptionCaughtDialog.LineNumberBackgroundColor = Color.FromName ("#c4c4c4");
+				ExceptionCaughtDialog.LineNumberInUserCodeBackgroundColor = Color.FromName ("#e599de");
+				ExceptionCaughtDialog.LineNumberTextColor = Color.FromName ("#222222");
+			}
+
+			// Shared
+
+			ObjectValueTreeValueErrorText = Ide.Gui.Styles.WarningForegroundColor;
+
+			PreviewVisualizerBackgroundColor = Ide.Gui.Styles.PopoverWindow.DefaultBackgroundColor;
+			PreviewVisualizerTextColor = Ide.Gui.Styles.PopoverWindow.DefaultTextColor;
+			PreviewVisualizerHeaderTextColor = Ide.Gui.Styles.PopoverWindow.DefaultTextColor;
+
+			ExceptionCaughtDialog.TreeBackgroundColor = Ide.Gui.Styles.PrimaryBackgroundColor;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TextEntryWithCodeCompletion.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TextEntryWithCodeCompletion.cs
index 8d78436425..108ea39c90 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TextEntryWithCodeCompletion.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/TextEntryWithCodeCompletion.cs
@@ -27,6 +27,7 @@ using System;
 using Xwt;
 using MonoDevelop.Ide.CodeCompletion;
 using System.Collections.Generic;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Debugger
 {
@@ -51,6 +52,12 @@ namespace MonoDevelop.Debugger
 			CompletionWindowManager.WindowClosed += HandleWindowClosed;
 		}
 
+		protected override void Dispose (bool disposing)

+		{
+			CompletionWindowManager.WindowClosed -= HandleWindowClosed;

+			base.Dispose (disposing);

+		}
+
 		void HandleWindowClosed (object sender, EventArgs e)
 		{
 			ctx = null;
@@ -73,7 +80,7 @@ namespace MonoDevelop.Debugger
 			}
 
 			if (list != null)
-				args.RetVal = keyHandled = CompletionWindowManager.PreProcessKeyEvent (key, keyChar, modifier);
+				args.RetVal = keyHandled = CompletionWindowManager.PreProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 		}
 
 		void HandleKeyReleaseEvent (object o, Gtk.KeyReleaseEventArgs args)
@@ -83,7 +90,7 @@ namespace MonoDevelop.Debugger
 
 			string text = ctx == null ? Text : Text.Substring (Math.Max (0, Math.Min (ctx.TriggerOffset, Text.Length)));
 			CompletionWindowManager.UpdateWordSelection (text);
-			CompletionWindowManager.PostProcessKeyEvent (key, keyChar, modifier);
+			CompletionWindowManager.PostProcessKeyEvent (KeyDescriptor.FromGtk (key, keyChar, modifier));
 			PopupCompletion ();
 		}
 
@@ -116,19 +123,19 @@ namespace MonoDevelop.Debugger
 		{
 			#region ICompletionKeyHandler implementation
 
-			public bool PreProcessKey (CompletionListWindow listWindow, Gdk.Key key, char keyChar, Gdk.ModifierType modifier, out KeyActions keyAction)
+			public bool PreProcessKey (CompletionListWindow listWindow, KeyDescriptor descriptor, out KeyActions keyAction)
 			{
 				keyAction = KeyActions.None;
-				if (keyChar == '.') {
+				if (descriptor.KeyChar == '.') {
 					return true;
 				}
 				return false;
 			}
 
-			public bool PostProcessKey (CompletionListWindow listWindow, Gdk.Key key, char keyChar, Gdk.ModifierType modifier, out KeyActions keyAction)
+			public bool PostProcessKey (CompletionListWindow listWindow, KeyDescriptor descriptor, out KeyActions keyAction)
 			{
 				keyAction = KeyActions.None;
-				if (keyChar == '.') {
+				if (descriptor.KeyChar == '.') {
 					return true;
 				}
 				return false;
@@ -150,6 +157,11 @@ namespace MonoDevelop.Debugger
 			return Text.Substring (startOffset, endOffset - startOffset);
 		}
 
+		public void AddSkipChar (int cursorPosition, char c)
+		{
+			// ignore
+		}
+
 		public char GetChar (int offset)
 		{
 			if (offset >= Text.Length)
@@ -214,6 +226,9 @@ namespace MonoDevelop.Debugger
 			get {
 				return gtkEntry.Position;
 			}
+			set {
+				gtkEntry.Position = value;
+			}
 		}
 
 		public int TextLength {
@@ -234,6 +249,11 @@ namespace MonoDevelop.Debugger
 			}
 		}
 
+		double ICompletionWidget.ZoomLevel {
+			get {
+				return 1;
+			}
+		}
 		#endregion
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs
index 073c65ba75..9fa65e2afc 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs
@@ -41,7 +41,24 @@ using MonoDevelop.Ide;
 
 namespace MonoDevelop.Debugger
 {
-	public class ThreadsPad : Gtk.ScrolledWindow, IPadContent
+	public class ThreadsPad: PadContent
+	{
+		ThreadsPadWidget control = new ThreadsPadWidget ();
+
+		protected override void Initialize (IPadWindow window)
+		{
+			Id = "MonoDevelop.Debugger.ThreadsPad";
+			control.Initialize (window);
+		}
+
+		public override Control Control {
+			get {
+				return control;
+			}
+		}
+	}
+
+	public class ThreadsPadWidget : Gtk.ScrolledWindow
 	{
 		TreeViewState treeViewState;
 		PadTreeView tree;
@@ -59,7 +76,7 @@ namespace MonoDevelop.Debugger
 			Location
 		}
 		
-		public ThreadsPad ()
+		public ThreadsPadWidget ()
 		{
 			this.ShadowType = ShadowType.None;
 
@@ -127,7 +144,7 @@ namespace MonoDevelop.Debugger
 			UpdateDisplay ();
 		}
 		
-		void IPadContent.Initialize (IPadWindow window)
+		public void Initialize (IPadWindow window)
 		{
 			this.window = window;
 			window.PadContentShown += delegate {
@@ -234,7 +251,7 @@ namespace MonoDevelop.Debugger
 		
 		void OnRowActivated (object s, RowActivatedArgs args)
 		{
-			TreeIter iter, selected;
+			TreeIter selected;
 
 			if (!tree.Selection.GetSelected (out selected))
 				return;
@@ -254,23 +271,6 @@ namespace MonoDevelop.Debugger
 			}
 		}
 
-		public Widget Control {
-			get { return this; }
-		}
-
-		public string Id {
-			get { return "MonoDevelop.Debugger.ThreadsPad"; }
-		}
-
-		public string DefaultPlacement {
-			get { return "Bottom"; }
-		}
-
-		public void RedrawContent ()
-		{
-			UpdateDisplay ();
-		}
-		
 		void OnDebuggerPaused (object s, EventArgs a)
 		{
 			UpdateDisplay ();
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16.png
index c0c017eb32..b9a52a2203 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16@2x.png
index 9f68a52e2f..e9c7987cef 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark.png
new file mode 100644
index 0000000000..de38a0fb46
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark@2x.png
new file mode 100644
index 0000000000..040f23e224
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled.png
new file mode 100644
index 0000000000..2c4c08f2d9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..a411a244df
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled.png
new file mode 100644
index 0000000000..40138ca93c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled@2x.png
new file mode 100644
index 0000000000..0aa16e9590
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/continue-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/continue-16~dark.png
new file mode 100644
index 0000000000..55be4cd553
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/continue-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/continue-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/continue-16~dark@2x.png
new file mode 100644
index 0000000000..e537469f3e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/continue-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16.png
deleted file mode 100644
index f26e32207e..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16@2x.png
deleted file mode 100644
index 158308d290..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22.png
deleted file mode 100644
index 610440161f..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22@2x.png
deleted file mode 100644
index fae72407dd..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24.png
deleted file mode 100644
index 80cd6238a2..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24@2x.png
deleted file mode 100644
index ef83576302..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32.png
deleted file mode 100644
index e17cb11f60..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32@2x.png
deleted file mode 100644
index 07f213f055..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/exception-48.png b/main/src/addins/MonoDevelop.Debugger/icons/exception-48.png
new file mode 100644
index 0000000000..c4c6a89206
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/exception-48.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/exception-48@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/exception-48@2x.png
new file mode 100644
index 0000000000..f0aedb903c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/exception-48@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark.png
new file mode 100644
index 0000000000..f51108466b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark@2x.png
new file mode 100644
index 0000000000..ad0ac47266
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15.png
index 20ecca2fc7..66e56539b2 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15@2x.png
index 872a5ff363..f93311be73 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark.png
new file mode 100644
index 0000000000..9264ccc01e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark@2x.png
new file mode 100644
index 0000000000..86c904bca7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15.png
index ada1ad3fb5..b6a2c3ed16 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15@2x.png
index a56d3aef2d..415b83ec16 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark.png
new file mode 100644
index 0000000000..7b8522627b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark@2x.png
new file mode 100644
index 0000000000..69a9ea9df7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15.png
index bfaf88cf34..e35a7fe46a 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15@2x.png
index cbf06776a2..8516777e7b 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark.png
new file mode 100644
index 0000000000..3e17554ad6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark@2x.png
new file mode 100644
index 0000000000..e69eb688e6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15.png
index d66862ca68..4aff120d7f 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15@2x.png
index 493c4c5647..2d6626b35b 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark.png
new file mode 100644
index 0000000000..75d029e290
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark@2x.png
new file mode 100644
index 0000000000..d80113c471
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15.png
index 04730ee9f5..10f0020062 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15@2x.png
index d731b20293..8db6d07582 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark.png
new file mode 100644
index 0000000000..838d428b56
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark@2x.png
new file mode 100644
index 0000000000..b136fe4252
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15.png
index e17b374a94..b8d8dee132 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15@2x.png
index dc4002600d..58ae8d61a5 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark.png
new file mode 100644
index 0000000000..7c3b36e74a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark@2x.png
new file mode 100644
index 0000000000..b4709dcc77
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15.png
index d06ef8747f..51093a409f 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15@2x.png
index 66f4d95b84..e82a46c94c 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark.png
new file mode 100644
index 0000000000..e9bb5e5067
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark@2x.png
new file mode 100644
index 0000000000..df49804f20
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15.png
index 4f126b81b3..5d1692454e 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15@2x.png
index e100e3de2c..2337f90cb7 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark.png
new file mode 100644
index 0000000000..fa41eef150
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark@2x.png
new file mode 100644
index 0000000000..d7660a1ed0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16.png
index f55eaee908..4d329b86de 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16@2x.png
index 172998cd35..6ee71a6ad6 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark.png
new file mode 100644
index 0000000000..a30a6b829d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark@2x.png
new file mode 100644
index 0000000000..3231ab61b1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled.png
new file mode 100644
index 0000000000..5fe3aea858
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..e847c5bf2f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled.png
new file mode 100644
index 0000000000..0c142aece1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled@2x.png
new file mode 100644
index 0000000000..2d6e69fac9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png
index 70960c9a1d..4d3bc37de5 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png
index a1d9ab2387..ed0aba7675 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark.png
new file mode 100644
index 0000000000..479a5dcc25
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark@2x.png
new file mode 100644
index 0000000000..058843874b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16.png
new file mode 100644
index 0000000000..442624355f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16@2x.png
new file mode 100644
index 0000000000..c6cb9c762b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark.png
new file mode 100644
index 0000000000..3caf33cd7e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark@2x.png
new file mode 100644
index 0000000000..d559606f8f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause.png
deleted file mode 100644
index 6603c0d1cf..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause@2x.png
deleted file mode 100644
index f1cd97e5ae..0000000000
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png
index 9dcded3b92..4d4936779b 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png
index 5e455c726e..58797d6652 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark.png
new file mode 100644
index 0000000000..265152a27f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark@2x.png
new file mode 100644
index 0000000000..2fbe610a91
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled.png
new file mode 100644
index 0000000000..9de59a516c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled@2x.png
new file mode 100644
index 0000000000..1b3044a2be
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark.png
new file mode 100644
index 0000000000..85a3ff79df
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark@2x.png
new file mode 100644
index 0000000000..fcfae41a39
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png
index 67eed7f9da..10cff84795 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png
index eb9aa52862..b6fdedfe42 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark.png
new file mode 100644
index 0000000000..89041ced27
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark@2x.png
new file mode 100644
index 0000000000..d95df3d982
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled.png
new file mode 100644
index 0000000000..c3e39ecec0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled@2x.png
new file mode 100644
index 0000000000..06704e58d4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark.png
new file mode 100644
index 0000000000..f451ea5798
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark@2x.png
new file mode 100644
index 0000000000..e5525d478b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png
index bcdacbb88b..8d69d17061 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png
index 0a7b96e9ce..7e040e8dbf 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark.png
new file mode 100644
index 0000000000..f2da4e883e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark@2x.png
new file mode 100644
index 0000000000..be282f1dd1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled.png
new file mode 100644
index 0000000000..d10925a213
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled@2x.png
new file mode 100644
index 0000000000..9168634ddc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark.png
new file mode 100644
index 0000000000..9d1563efdb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark@2x.png
new file mode 100644
index 0000000000..aeb917d31b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16.png
new file mode 100644
index 0000000000..879d553aca
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16@2x.png
new file mode 100644
index 0000000000..5778c526cc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark.png
new file mode 100644
index 0000000000..7ade180b2a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark@2x.png
new file mode 100644
index 0000000000..d04fcbaa44
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel.png
new file mode 100644
index 0000000000..4805daf179
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel@2x.png
new file mode 100644
index 0000000000..e1cb0c72ea
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel.png
new file mode 100644
index 0000000000..4805daf179
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel@2x.png
new file mode 100644
index 0000000000..e1cb0c72ea
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16.png
index ee336018f8..a3441895de 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16@2x.png
index 04577e051a..06e6ec4268 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark.png
new file mode 100644
index 0000000000..910478d160
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark@2x.png
new file mode 100644
index 0000000000..89082d5735
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel.png
new file mode 100644
index 0000000000..50bf3900bf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel@2x.png
new file mode 100644
index 0000000000..139f3cc034
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel.png
new file mode 100644
index 0000000000..50bf3900bf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel@2x.png
new file mode 100644
index 0000000000..139f3cc034
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16.png
index bd7976085e..cd3124c76c 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16@2x.png
index b88716e4b9..7e6f661afe 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark.png
new file mode 100644
index 0000000000..4eedc51b5a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark@2x.png
new file mode 100644
index 0000000000..0ba8d38c46
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel.png
new file mode 100644
index 0000000000..829a25877b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel@2x.png
new file mode 100644
index 0000000000..9182a875cb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel.png
new file mode 100644
index 0000000000..829a25877b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel@2x.png
new file mode 100644
index 0000000000..9182a875cb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16.png
index 7a77d14929..7256ded2cf 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16@2x.png
index dfd9e9f12e..71d19442d5 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark.png
new file mode 100644
index 0000000000..efeff10ce7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark@2x.png
new file mode 100644
index 0000000000..b2c40af2a5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel.png
new file mode 100644
index 0000000000..9bdc6e66f1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel@2x.png
new file mode 100644
index 0000000000..fb0259fb85
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel.png
new file mode 100644
index 0000000000..9bdc6e66f1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel@2x.png
new file mode 100644
index 0000000000..fb0259fb85
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16.png
index bfb4cd5e3b..a69ea1fc49 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16@2x.png
index 63120d12ce..8ae68592ed 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark.png
new file mode 100644
index 0000000000..6f0b38f989
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark@2x.png
new file mode 100644
index 0000000000..6c9424c687
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel.png
new file mode 100644
index 0000000000..fa35a1ecd9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel@2x.png
new file mode 100644
index 0000000000..2d5c8dbc0d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel.png
new file mode 100644
index 0000000000..fa35a1ecd9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel@2x.png
new file mode 100644
index 0000000000..2d5c8dbc0d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pause-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pause-16~dark.png
new file mode 100644
index 0000000000..7964ea8283
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pause-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pause-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pause-16~dark@2x.png
new file mode 100644
index 0000000000..d2feceaeb9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/pause-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16.png
index f26e32207e..c00254dd9f 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16@2x.png
index b8681ba963..4c1654ebfd 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark.png
new file mode 100644
index 0000000000..dbd2c9da8f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark@2x.png
new file mode 100644
index 0000000000..d03a48d630
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel.png
new file mode 100644
index 0000000000..9f98c3062b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel@2x.png
new file mode 100644
index 0000000000..0b660d7edc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel.png
new file mode 100644
index 0000000000..9f98c3062b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel@2x.png
new file mode 100644
index 0000000000..0b660d7edc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16.png
index a9c99d7ea1..3c0b36c9c6 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16@2x.png
index 2379b82339..6a0e1eb227 100644
--- a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16@2x.png
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark.png
new file mode 100644
index 0000000000..d94d819df0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark@2x.png
new file mode 100644
index 0000000000..0e16ba3d8a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled.png
new file mode 100644
index 0000000000..388ec23b6c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..9fd925bd50
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled.png
new file mode 100644
index 0000000000..b90f6cfd67
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled@2x.png
new file mode 100644
index 0000000000..74fd0875d0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/step-in-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/step-in-16~dark.png
new file mode 100644
index 0000000000..9f77c395f5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/step-in-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/step-in-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/step-in-16~dark@2x.png
new file mode 100644
index 0000000000..5e82ea7766
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/step-in-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/step-out-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/step-out-16~dark.png
new file mode 100644
index 0000000000..9c5471918d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/step-out-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/step-out-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/step-out-16~dark@2x.png
new file mode 100644
index 0000000000..8b34d302f3
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/step-out-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/step-over-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/step-over-16~dark.png
new file mode 100644
index 0000000000..8813df49da
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/step-over-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/step-over-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/step-over-16~dark@2x.png
new file mode 100644
index 0000000000..2a4035681a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/step-over-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog b/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
deleted file mode 100644
index ce289cd2ae..0000000000
--- a/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
+++ /dev/null
@@ -1,2074 +0,0 @@
-2010-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport/BindingService.cs:
-	* MonoDevelop.DesignerSupport/OpenDocumentFileProvider.cs: Use
-	  the file provider from monodevelop.ide.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Track API changes.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/TextToolboxNode.cs:
-	  Track API changes.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Track API changes.
-
-2010-07-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.addin.xml: Borrow a keybinding
-	  from Xcode for "Switch between related files".
-
-2010-07-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/WrapperDesignView.cs: Track API
-	  changes.
-
-2010-07-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs:
-	  Swapped gradient.
-
-2010-07-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs:
-	  Removed inner border around the toolbox widget.
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Fix incorrect
-	  use of ShowCustomDialog/RunCustomDialog.
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: More dialog
-	  placing.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs:
-	  Clean up dialog placement.
-
-2010-05-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/TextToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ITextToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/TemplateToolboxNode.cs:
-	  Give text toolbox nodes more control over how they insert
-	  text into the document. 
-
-2010-05-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport/SwapCodeBehindCommand.cs:
-	* MonoDevelop.DesignerSupport/SwitchBetweenRelatedFilesCommand.cs:
-	  Rename file to match class.
-
-2010-05-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport.addin.xml:
-	* MonoDevelop.DesignerSupport/Commands.cs:
-	* MonoDevelop.DesignerSupport/CodeBehind.cs:
-	* MonoDevelop.DesignerSupport/SwapCodeBehindCommand.cs:
-	  Implemented a command for cycling between grouped files,
-	  based on a patch from Curtis Wensley
-	  <curtis.wensley@gmail.com>.
-
-2010-05-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Reduce
-	  the number of unnecessary redraws.
-
-2010-05-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Fix crash in
-	  toolbox. Fixes bug #586776 - Toolbox search widget broken.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: moved code
-	  from Dispose -> OnDestroyed
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/WrapperDesignView.cs:
-	  ViewContent widgets are now destroyed by the workspace
-	  window.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs:
-	  removed unnecessary dispose call.
-
-2010-04-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/DocumentOutlinePad.cs:
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Fixed 'GLib.MissingIntPtrCtorException: GLib.Object subclass
-	  MonoDevelop.Components.CompactScrolledWindow must provide a
-	  protected or public IntPtr ctor to support wrapping of
-	  native object handles.' exception.
-
-
-2010-04-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Free up wasted space between scrollbars and treeview
-	  contents.
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Free up
-	  wasted space between scrollbars and contents.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.DesignerSupport.addin.xml: Bumped MD version.
-
-2010-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.addin.xml: Set the default
-	  location for designer pads. Register a new Visual Design
-	  layout.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport.addin.xml:
-	* MonoDevelop.DesignerSupport/BindingService.cs:
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs:
-	* MonoDevelop.DesignerSupport/CodeBehindWriter.cs:
-	* MonoDevelop.DesignerSupport/WrapperDesignView.cs:
-	* MonoDevelop.DesignerSupport/DocumentOutlinePad.cs:
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs:
-	* MonoDevelop.DesignerSupport/OpenDocumentFileProvider.cs:
-	* MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs:
-	* MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs:
-	* MonoDevelop.DesignerSupport.Projects/SolutionItemDescriptor.cs:
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs:
-	* MonoDevelop.DesignerSupport.Projects/WorkspaceItemDescriptor.cs:
-	* MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs:
-	* MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport/ToolboxPad.cs:
-	* MonoDevelop.DesignerSupport/PropertyPad.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Use the new
-	  DockItemToolbar class for showing toolbar commands.
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs:
-	  Display CustomTool/CustomToolNamespace.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  changed update delay to 1s.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Refresh sooner than the 5sec timer, if the document wasn't
-	  parsed at the start.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.csproj: Flush.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs:
-	  Track api changes.
-
-2010-02-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.addin.xml: Set correct
-	  serializable type name.
-
-2010-02-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Add tooltips
-	  to toolbar items.
-
-2010-02-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Use the
-	  image service to get icons.
-
-2010-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs:
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Track API changes for lazy loading images.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs:
-	  Flush.
-
-2010-01-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs:
-	  Added an accessor for the Generator property.
-
-2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs:
-	  Set icon for template items.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Use the correct Mono.Cairo reference.
-
-2009-11-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs: Remove
-	  ancient reflection code now we depend on a reasonable GTK#
-	  version.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.DesignerSupport.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj: Reference mono-cairo
-	  package.
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs:
-	  Flush.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.DesignerSupport.addin.xml: Bump MD version.
-
-2009-09-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj: Eliminate the property
-	  grid's System.Windows.Forms dependency, because it hurts Mac
-	  cold startup time.
-
-2009-09-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  Use reflection only when running on ms.net.
-
-2009-09-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Tweak remove
-	  message wording. Refine the GTK# item filtering hack a bit.
-
-2009-09-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Fixed Bug 538072 - NullRef in the background (not causing
-	  crash).
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Set the dialog
-	  transient to the root ide window.
-
-2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs:
-	  Fix bu #535825 - Property pad should be disabled when
-	  multiple items selected.
-
-2009-08-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Fixed Bug
-	  373203 - Add widget to toolbox could be beefed up & Bug
-	  373202 - Ask before removing widgets from toolbox.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.csproj: Updated dependencies. We
-	  now depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/CodeBehind.cs: Fix checking for
-	  parent - don't return nonexistent file.
-
-2009-08-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  Track api changes.
-
-2009-08-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  Use the new AssemblyContext class to query and resolve
-	  assemblies.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs:
-	  Flush.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxLoader.cs: Track
-	  api changes.
-
-2009-07-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Projects/SolutionItemDescriptor.cs:
-	* MonoDevelop.DesignerSupport.Projects/WorkspaceItemDescriptor.cs:
-	  Use the new api for renaming projects and solutions.
-
-2009-07-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport.PropertyGrid:
-	* MonoDevelop.DesignerSupport/PropertyPad.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors:
-	* MonoDevelop.DesignerSupport/PropertyPadVisitor.cs:
-	* MonoDevelop.DesignerSupport/IPropertyPadProvider.cs:
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/EditorManager.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/IntRange.cs:
-	* MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/EventPropertyTab.cs:
-	* icons/MonoDevelop.DesignerSupport.PropertyGrid.SortByCat.png:
-	* MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditor.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/FloatRange.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/DefaultPropertyTab.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyEditorCell.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyPadVisitor.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/EventEditor.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/IPropertyPadProvider.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/DefaultEditor.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TimeSpanEditor.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/DateTimeEditor.cs:
-	* icons/MonoDevelop.DesignerSupport.PropertyGrid.EventPropertyTab.svg:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/ColorEditorCell.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/FlagsEditorCell.cs:
-	* icons/MonoDevelop.DesignerSupport.PropertyGrid.EventPropertyTab.bmp:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditorDialog.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/CollectionEditor.cs:
-	* icons/MonoDevelop.DesignerSupport.PropertyGrid.DefaultPropertyTab.svg:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/BooleanEditorCell.cs:
-	* icons/MonoDevelop.DesignerSupport.PropertyGrid.DefaultPropertyTab.bmp:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/CharPropertyEditor.cs:
-	* MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyEditorTypeAttribute.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/FlagsSelectorDialog.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/EnumerationEditorCell.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyValueChangedEventArgs.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/ExpandableObjectEditor.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/SurrogateUITypeEditorAttribute.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyValueChangedEventHandler.cs:
-	  Moved property grid to MD.Components.
-
-2009-07-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport/CodeBehindWriter.cs: Move
-	  CodeBehindWriter from MonoDevelop.AspNet to
-	  MonoDevelop.DesignerSupport.
-
-2009-07-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs:
-	  Added property for showing/hiding the toolbar.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs:
-	  Use the new DesktopService instead of PlatformService.
-
-2009-06-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Track
-	  assembly lookup APIs.
-
-2009-05-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs:
-	  Cosmetic fix.
-
-2009-05-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs:
-	  Don't copy fonts from the widget style to the layout. It is
-	  problematic on windows. Not sure what this was needed for.
-
-2009-05-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.PropertyGrid\PropertyGrid.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid\PropertyGridTree.cs:
-	  Removed the borders. Let the dock manager handle that.
-
-2009-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.PropertyGrid\PropertyGridTree.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors\CollectionEditor.cs:
-	  Don't use Gtk.TreeIter.Equals since it is broken. Use
-	  TreePath instead.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Workaround
-	  for what seems to be a mcs bug. Looks like it can't properly
-	  resolve the implicit conversion of null to string.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport\CodeBehind.cs:
-	* MonoDevelop.DesignerSupport\OpenDocumentFileProvider.cs: Use
-	  the new FilePath class for handling file and directory
-	  paths.
-
-2009-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.csproj: Disable overflow
-	  checking.
-
-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Load
-	  the default toolbox items in the background, to avoid delays
-	  the first time the toolbox is shown.
-
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxLoader.cs: Don't
-	  create a toolbox service instance in the external process,
-	  since it may recursively create other external processes.
-	  Fixes bug #498685 - MD Locks up when toolbox is opened.
-
-2009-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.csproj: 
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Track API changes.
-
-2009-04-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/WrapperDesignView.cs: Removed
-	  unused namespace.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Renamed PixbufService to ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Track API changes.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.DesignerSupport.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxLoader.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  Moved SystemAssemblyService and related classes to the
-	  namespace MonoDevelop.Core.Assemblies.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.DesignerSupport.addin.xml: Bump MD version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxLoader.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/CecilToolboxItemLoader.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  Add support for multiple target runtimes.
-
-2009-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.csproj:
-	* MonoDevelop.DesignerSupport.Toolbox/TextToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/TemplateToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs:
-	  "fixed Bug 487736 - Clipboard ring and code snippets not
-	  shown anymore in the toolbox".
-
-2009-03-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs:
-	  Fix build.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs:
-	* MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs:
-	* MonoDevelop.DesignerSupport.Projects/SolutionItemDescriptor.cs:
-	* MonoDevelop.DesignerSupport.Projects/WorkspaceItemDescriptor.cs:
-	  Added explicit "Misc" category for localization.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs:
-	  Worked on property pad translation.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/TextToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs:
-	* MonoDevelop.DesignerSupport.Projects/SolutionItemDescriptor.cs:
-	* MonoDevelop.DesignerSupport.Projects/WorkspaceItemDescriptor.cs:
-	* MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs:
-	  Worked on propertygrid localization.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Track api
-	  changes.
-
-	* MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs:
-	  Show the source package of the reference.
-
-2009-02-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs:
-	  Dispose Gdk cursors, else finalisers destroy them outside of
-	  the GUI thread and often crash MD due to X asserts resulting
-	  in _XCBUnlockDisplay errors.
-
-2009-02-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Use pad
-	  font.
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs:
-	  Handling font size and style propagation.
-
-2009-02-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Use Pad font.
-
-2009-02-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs: Fix
-	  warning number.
-
-2009-02-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs:
-	  Indentation.
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Implement
-	  method for converting CodeMemberMethod to an IMethod.
-
-2009-02-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs: Revert
-	  Mike's commenting of unused method; it was in fact reflected
-	  at runtime.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.csproj: Don't local-copy other
-	  addins' dlls.
-
-2009-02-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport/BindingService.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs:
-	* MonoDevelop.DesignerSupport/ErrorInFileException.cs:
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs:
-	  Fixed compiler warnings.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.mdp:
-	* MonoDevelop.DesignerSupport.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Improve
-	  method matching; it now finds methods with broader parameter
-	  types. Tweak event/method matching API. Use ordinal string
-	  compares.
-
-2009-02-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Require a
-	  parent project for several methods, since getting it from
-	  the IType was unreliable.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.DesignerSupport.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.mdp: Use the system Mono.Cairo.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	*
-	  gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs:
-	  Flush.
-
-2009-02-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Track changes in MD's assembly handling.
-	  Mono.Cairo is no longer considered to be a "system"
-	  assembly.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.mdp: Flush project format changes.
-
-2009-01-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/DocumentOutlinePad.cs: Clean up widget
-	management.
-
-2009-01-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs:
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs: Make sure
-	the list is the first widget to be focused when presenting the pad.
-
-2008-12-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: TooltipWindow
-	has been moved to MD.Components.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Track API changes.
-
-2008-12-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/DocumentOutlinePad.cs: Track changes in
-	the active view as well as the active document. Fixes Bug 450238 -
-	Document outline should show source when in source view. Alsouse
-	Alignment widget instead of custom InvisibleFrame.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs:
-	Allow setting the SpecificVersion flag.
-
-2008-12-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs: Track
-	api changes.
-
-2008-12-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.addin.xml: Hide/protect add-ins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* MonoDevelop.DesignerSupport.mdp: Add AssemblyInfo.cs files that are
-	autogenerated from the addin manifests.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport.addin.xml: Bump MD version.
-
-2008-11-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs: Fix
-	bug #430494 - When adding components, there is no way to stop the
-	process.
-
-2008-10-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.mdp: Updated.
-
-	* MonoDevelop.DesignerSupport/CodeBehind.cs: Moved designer/codebehind
-	lookup from MonoDevelop.AspNet.
-
-2008-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Null checks in case
-	event's ReturnType is null or unresolvable.
-
-2008-10-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Remove lock, and add a
-	GUI thread assertion so we can find the rogue thread that's causing
-	Bug 434065.
-
-2008-10-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Added lock for
-	refresh.
-
-2008-10-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport/DesignerSupportService.cs: Use a simple
-	  lazy singleton instead of an IService.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditor.cs,
-	  MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs: Add
-	  support for using property grid to set arbitrary build actions.
-
-2008-09-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs: Track
-	  API, fix .ctor display formatting.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp: Updated projects.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs:
-	  Updated generated code.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Track api changes.
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Changed compilation unit/document meta information interface.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs: Moved
-	  the extensible tree view to its own directory.
-
-2008-08-22  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs: Make
-	  property grid groups default to expanded.
-
-2008-08-18  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditor.cs: Add
-	  support for standard values and exclusive values if the converter
-	  supports/provides them. Supply an ITypeDescriptorContext to the
-	  TypeConverter.
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/EnumerationEditorCell.cs:
-	  Don't allow text caret, since the values are not editable.
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyEditorCell.cs:
-	  Implement ITypeDescriptorContext on EditorSession, so that cell
-	  editors can easily provide one to the TypeConverter.
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs: Change
-	  some "as" casts to real casts -- InvalidCastException is more
-	  informative than NRE.
-
-2008-07-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
-	  Restore class outline functionality.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs,
-	  MonoDevelop.DesignerSupport/WrapperDesignView.cs: Translated old
-	  code to new dom.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport/TypeNotFoundException.cs,
-	  MonoDevelop.DesignerSupport/MemberExistsException.cs,
-	  MonoDevelop.DesignerSupport/BindingService.cs,
-	  MonoDevelop.DesignerSupport/ErrorInFileException.cs: Changes for
-	  converted refactoring infrastructure.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxConfiguration.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxList.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/TypeToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/UnknownToolboxNode.cs,
-	  MonoDevelop.DesignerSupport/ToolboxService.cs: Moved serialization
-	  engine to MonoDevelop.Core. Use new syntax for specifying attribute
-	  scope.
-
-2008-07-18  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs: Add button
-	  to enable/disable help pane in property grid.
-
-2008-06-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Require a specific
-	  class part when creating members.
-
-2008-06-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Make
-	  IdentifierExistsInClass public again.
-
-2008-06-23  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs: Group
-	  members in regions. Reduce frequency of updates to 0.2Hz.
-
-2008-06-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/MemberExistsException.cs: Improve
-	  translatability.
-	* MonoDevelop.DesignerSupport/BindingService.cs: Fix a possible NRE.
-	  Check base classes when looking for conflicting identifiers.
-
-2008-06-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs: Cache
-	  precendence selection results in IEnumerable merger.
-
-2008-06-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs: List
-	  members in the order they're present in the file.
-
-2008-06-13  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs,
-	  Makefile.am: Implement document outline for .NET source files.
-
-2008-06-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport/DesignerSupportService.cs,
-	  MonoDevelop.DesignerSupport/CodeBehindService.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindMissingClassBuilder.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindDisplayBinding.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindProjectFileExtension.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/ICodeBehindProvider.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindClassEventArgs.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindClass.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindViewContent.cs,
-	  Makefile.am: Remove old CodeBehind grouping mechanism.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml: Bump MD version.
-
-2008-06-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/EnumerationEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/FlagsEditorCell.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Use the
-	  OnDestroyed event instead of Dispose, since with the latest changes
-	  in gtk#, Dispose is not called anymore when a widget is destroyed.
-
-2008-05-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/CecilToolboxItemLoader.cs: Fix
-	  warning.
-
-2008-05-27  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs: Fix exception
-	  catching from GTK thread.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am,
-	  MonoDevelop.DesignerSupport.Projects/WorkspaceItemDescriptor.cs,
-	  MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs: Add
-	  support for solution and workspaces.
-	* MonoDevelop.DesignerSupport.Projects/SolutionItemPropertyProvider.cs,
-	  MonoDevelop.DesignerSupport.Projects/SolutionItemDescriptor.cs:
-	  Renamed.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Projects/CombineEntryDescriptor.cs: Allow
-	  editing the root folder.
-
-2008-05-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Update the toolbox
-	  when project properties change.
-
-2008-05-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  Detect the runtime that the assembly references and pass it on to
-	  the node builder. Catch and log more errors.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport/BindingService.cs,
-	  MonoDevelop.DesignerSupport/CodeBehindService.cs,
-	  MonoDevelop.DesignerSupport.Projects/CombineEntryDescriptor.cs,
-	  MonoDevelop.DesignerSupport.Projects/CombineEntryPropertyProvider.cs,
-	  MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs,
-	  MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs,
-	  MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs:
-	  New project model changes.
-
-2008-05-20  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: fixed 'Bug 389065 -
-	  Toolbox tooltips show while a drag taking place and do not hide'
-
-2008-05-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/TextToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ITextToolboxNode.cs: Change
-	  ITextToolboxNode API so that nodes have more control over when
-	  they're shown.
-
-2008-05-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport.mdp, gtk-gui/gui.stetic, Makefile.am:
-	  Updated.
-	* MonoDevelop.DesignerSupport/ToolboxService.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/IToolboxProvider.cs: Track API.
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditor.cs: Use
-	  string.Empty instead of "".
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/TextToolboxNode.cs: Remove dead
-	  code. Mark up for property grid. Fix filtering. Fix comparisons.
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs: Fix
-	  Equals.
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Fix filtering. Remove
-	  old API usage. Implement IPropertyPadProvider for the toolpad.
-	* MonoDevelop.DesignerSupport.Toolbox/BaseToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/CategoryToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxStore.cs: Remove dead
-	  code.
-	* MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs:
-	  Fix logic. Remove cursor insertion marker.
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Remove use of
-	  deprecated API. Need to fix the Droptarget/Iconise/Sort properties
-	  of the categories.
-	* MonoDevelop.DesignerSupport.Toolbox/CecilToolboxItemLoader.cs:
-	  Abstract toolbox loader that uses Cecil to reflect for attributes.
-	* MonoDevelop.DesignerSupport.Toolbox/TypeToolboxNode.cs: Fix Equals
-	  (calls to Equals on ItemToolboxNode were resolving to base-specific
-	  overloads, which weren't calling the overridden children).
-	* MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs: Mark up for
-	  property grid. 
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  Refactor to work better as a base class for loaders.
-	* MonoDevelop.DesignerSupport.Toolbox/CecilTypeResolver.cs: Copied from
-	  the Cecil linker.
-	* MonoDevelop.DesignerSupport.PropertyGrid/EditorManager.cs: Make
-	  expanding properties work with subclasses of ExpandableObject
-	  typeconverter.
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs: Make
-	  expanding properties work with subclasses of ExpandableObject
-	  typeconverter. Use string.Empty instead of "".
-
-2008-05-12  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs:
-	  Fix compilation.
-
-2008-05-12  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs,
-	  Makefile.am: Add toolbox snippet provider that shows valid snippets
-	  for text files.
-
-2008-05-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Updated.
-
-2008-05-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Use tooltip
-	  window base class.
-
-2008-05-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml: Removed default ToolboxItem
-	  loader.
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Updated.
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Catch exceptions in
-	  drag handlers so that they don't prevent the drag from completing.
-	  Allow toolbox consumers to fully override filtering.
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxConsumer.cs: Add new
-	  ICustomFilteringToolboxConsumer interface for consumers that want
-	  to override the filtering completely.
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs: Make
-	  ItemFilters generic.
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs:
-	  Reqimplemented Equals. Fixes a NRE.
-	* MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs: Add convenience
-	  method for getting a ProjectReference.
-	* MonoDevelop.DesignerSupport.Toolbox/TextToolboxNode.cs: Implement
-	  ITextToolboxNode.
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs: Make
-	  this a convenience base class.
-	* MonoDevelop.DesignerSupport.Toolbox/ITextToolboxNode.cs: Add
-	  interface for toolbox items that can provide text to a text editor,
-	  filtered by file extension or mimetype.
-
-2008-05-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/CodeBehindService.cs: Remove unneeded
-	  code; the parser service seems to handle parsing at startup.
-
-2008-05-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.CodeBehind/ICodeBehindProvider.cs,
-	  MonoDevelop.DesignerSupport/CodeBehindService.cs,
-	  MonoDevelop.DesignerSupport/DesignerSupportService.cs,
-	  MonoDevelop.DesignerSupport.addin.xml: Change CodeBehind grouping
-	  API so that it now uses parser service instread of an extension
-	  point.
-
-2008-04-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport/IOutlinedDocument.cs,
-	  MonoDevelop.DesignerSupport/DocumentOutlinePad.cs, Makefile.am,
-	  icons/pad-document-outline-16.png: Add document outline pad that
-	  will display an outline widget from documents that implement
-	  IOutlinedDocument.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs: Show
-	  mime type description in the properties pad.
-
-2008-04-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Add methods for
-	  getting CodeMemberMethod signatures from MD's parser DOM.
-
-2008-03-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Properly handle
-	  the leave event. Should fix bug #366131.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs: Worked
-	  on gnome hig compliant alerts.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: fixes tooltip bug.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Ctrl+F1 work now in
-	  the toolbox.
-
-2008-02-28  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/CategoryToolboxNode.cs: Fixed "Bug
-	  365624 - Widget toolbox are shown unsorted".
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs: Fixed comparer bug
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/CategoryToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/IToolboxProvider.cs: Worked on
-	  category support for the toolbox service.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Fixed
-	  nullrefexception.
-
-2008-02-24  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Label is now taken
-	  as tooltip, when Description is not set.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Removed some unused glade
-	  and gnome-sharp references (only the unused). But I'll continue to
-	  remove glade, we need to lower the dependency tree a bit.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Fixed toolbar widget
-	  scrolling bug.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Added no tools
-	  available message.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Added some support for
-	  view dynamic providers.
-
-2008-02-21  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Added resize in toolbox
-	  refresh.
-
-2008-02-21  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Fixed little dnd bug.
-
-2008-02-21  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs: Replaced old
-	  toolbox with a new one.
-
-2008-02-09  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml: Removed source editor dependency.
-
-2008-02-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: If no specific part is
-	  specified when adding a member to a class, add it to the first part.
-	  Fixes an error in the ASP.NET designer (and anything else using the
-	  binding service without explicitly specifying class parts).
-
-2008-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml, MonoDevelop.DesignerSupport.mdp,
-	  Makefile.am, icons/toolbox-pad-16.png, icons/properties-pad-16.png: New
-	  tango icons by Vinicius Depizzol.
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/BooleanEditorCell.cs:
-	  Properly draw checkboxes.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml: Update MD version.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Use the correct class to
-	  get the node_hash private field.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs: Use a smaller
-	  toolbar.
-
-2008-01-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/CodeBehindService.cs: Improve error reporting
-	  for invalid IClasses.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp: Updated project files. The order of
-	  extended properties won't change anymore.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: The ide is not yet fully
-	  initialized when the toolbox service is created.
-
-2007-12-12  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/CompactToolboxView.cs: Don't draw
-	  shadows in pads (the new docking library does that already). Haven't
-	  fixed property pad as it doesn't seem to be possible to remove the
-	  borders from the Vpaned.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Make sure Gtk is properly
-	  initialized in the process that looks for components. Added some missing
-	  check.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml: Bump add-in versions.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Make sure the toolbox is
-	  filled the first time it is shown.
-	* gtk-gui/gui.stetic: Updated.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Directory reorganization.
-
-2007-11-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml, MonoDevelop.DesignerSupport.mdp,
-	  Makefile.am,
-	  MonoDevelop.DesignerSupport.Projects/CombineEntryDescriptor.cs,
-	  MonoDevelop.DesignerSupport.Projects/CombineEntryPropertyProvider.cs,
-	  MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs,
-	  MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs,
-	  MonoDevelop.DesignerSupport.Projects/ProjectItemPropertyProvider.cs,
-	  MonoDevelop.DesignerSupport.Projects/ProjectsPropertyProvider.cs: Added
-	  some property descriptors for references and CombineEntry.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/CodeBehindService.cs,
-	  MonoDevelop.DesignerSupport/ToolboxService.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Track LoggingService API
-	  changes.
-
-2007-11-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs: Use a more
-	  convenient color for grup headers.
-
-2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Use RootCombine instead of
-	  CurrentOpenCombine when possible.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml: Bump MD version.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp: Project file names updated by change in
-	  MD path functions.
-
-2007-10-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Updated.
-	* MonoDevelop.DesignerSupport/TypeNotFoundException.cs,
-	  MonoDevelop.DesignerSupport/MemberExistsException.cs,
-	  MonoDevelop.DesignerSupport/BindingService.cs,
-	  MonoDevelop.DesignerSupport/ErrorInFileException.cs: Better error
-	  reporting, including filename/line number.
-
-2007-10-12  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/BindingService.cs,
-	  MonoDevelop.DesignerSupport/MemberExistsException.cs: Improve error
-	  output when Codebehind generation fails.
-
-2007-10-12  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Walk down into base classes
-	  when checking if compatible members are present in a class. If members
-	  with same name exist, check type compatibility down through the class
-	  hierarchy.
-
-2007-10-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  Initialize Gtk before trying to load the toolbox item. Needed since this
-	  is done out of process.
-
-2007-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs: Implement
-	  IComparable so that the ToolboxService's array sort doesn't break on
-	  non-GTK#-component toolbox nodes. Fixes AspNetEdit.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml: Bump MD version.
-
-2007-09-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.CodeBehind/CodeBehindProjectFileExtension.cs:
-	  In BuildChildNodes, don't assume that HasChildNodes is false, because
-	  other extensions may have added children to this node.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs,
-	  gtk-gui/gui.stetic: Regenerated GUI files.
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Added NodeView subclass
-	  and overrided OnDragDataDelete. This is necessary to avoid a GTK warning
-	  about the need to override drag_data_delete.
-
-2007-09-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport/BindingService.cs,
-	  MonoDevelop.DesignerSupport/OpenDocumentFileProvider.cs, Makefile.am:
-	  Make OpenDocumentFileProvider publicly accessible so it can be used
-	  elsewhere.
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport/CodeBehindService.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindMissingClassBuilder.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindProjectFileExtension.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindClassEventArgs.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindClass.cs, Makefile.am:
-	  In CodeBehind service, track class names rather than IClasses, as
-	  IClasses can change. Now much more careful to trigger only the
-	  rebuilding of nodes which need to be rebuilt. May still be some
-	  performance issues on large projects (from linear lookups of class
-	  names, and requirement for CodeBehind parent parsing to happen at
-	  project load time).
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport/CodeBehindService.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindMissingClassBuilder.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindClassBuilder.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindProjectFileExtension.cs:
-	  Audit and restructure the CodeBehind grouping so that it updates
-	  correctly and handles partial classes.
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am, gtk-gui/gui.stetic: Updated
-	  & fix GTK# version at 2.8.
-	* MonoDevelop.DesignerSupport.CodeBehind/CodeBehindDisplayBinding.cs:
-	  Disable fully, as it doesn't work properly. Needs some core work to make
-	  it workable.
-
-2007-09-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/IPropertyPadProvider.cs: Added
-	  some documentation.
-
-2007-09-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml, MonoDevelop.DesignerSupport.mdp,
-	  Makefile.am,
-	  MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs:
-	  When the focus is in the text editor, show the properties of the file in
-	  the property pad. Fixes bug #82255.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs,
-	  MonoDevelop.DesignerSupport/ToolboxService.cs,
-	  MonoDevelop.DesignerSupport/PropertyPad.cs,
-	  MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid/IPropertyPadProvider.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid/PropertyPadVisitor.cs: Changes
-	  due to new property infrastructure.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs: Add missing null
-	  check.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport/DesignerSupportService.cs: Removed the
-	  CommandService class. Everything is done directly with CommandManager.
-	  Moved all extension node types to MD.Components.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml, MonoDevelop.DesignerSupport.mdp,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs,
-	  Makefile.am: Reorganized the extension point hierarchy. Embedded all
-	  add-in manifests as resources.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.CodeBehind/CodeBehindProjectFileExtension.cs:
-	  Converted DispatchService to a static class.
-
-2007-07-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/PropertyPad.cs: Assign the property pad
-	  to the service only when it is completely initialized.
-
-2007-07-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Sort toolbox items.
-
-2007-07-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs: When the
-	  property pad is show, initialize it with the data of the latest
-	  provider found. Fixes bug #82166.
-
-2007-07-24  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/CompactToolboxView.cs: Fixed
-	  Bug 82104:Toolbox White Using Dark Theme.
-
-2007-07-19  Ben Motmans <ben.motmans@gmail.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: overwrite the
-	node_hash field with a standard hashtable [fixes #81942]
-
-2007-07-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/CompactToolboxView.cs: Improve
-	  tooltip look.
-
-2007-07-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport/Commands.cs,
-	  MonoDevelop.DesignerSupport/ToolboxService.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs, Makefile.am: Added
-	  a context menu to the toolbox, which allows adding/removing items.
-	* MonoDevelop.DesignerSupport.Toolbox/CompactToolboxView.cs: Show the
-	  tooltip centered. Avoid the selection to be cleared when clicking
-	  on an item. Redraw the widget when the item list changes.
-
-2007-07-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport/ToolboxService.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs,
-	  Makefile.am: Implemented an index of components, which can be used
-	  by the user to select which components have to be shown in the
-	  toolbar.
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs: Toolbox
-	  configuration loading/saving is now handled by the toolbox service.
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditor.cs: Fix
-	  warning.
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxConsumer.cs: Removed
-	  TODO.
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxConfiguration.cs: New
-	  class that stores toolbox information.
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxList.cs: Moved
-	  serialization code to ToolboxConfiguration.
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxProvider.cs:
-	  Implementations of IToolboxDefaultProviders can now return a file
-	  that implements toolbox items and all of them will be loaded by
-	  default in the toolbox. It is not necessary to specify all default
-	  items one by one, although it can still be done.
-
-2007-07-02  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/CompactToolboxView.cs: Worked
-	  on toolbox view (tooltips, sizing and some behavior issues).
-
-2007-06-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/CompactToolboxView.cs: Fix size
-	  request calculation.
-
-2007-06-28  Mike Krüger <mkrueger@novell.com> 
-
-	* icons/md-design-listboxtoggle.png: Added an icon for the toolbox
-	  listbox toggle.
-
-2007-06-28  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/CompactToolboxView.cs: Removed
-	  some debugging code.
-
-2007-06-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/CompactToolboxView.cs: Worked on
-	  tooltips & scrolling.
-
-2007-06-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/CompactToolboxView.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/CategoryToolboxNode.cs: Worked
-	  on a more compact owner drawn toolbox view.
-
-2007-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Avoid adding
-	  duplicated widgets.
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Catch exception
-	  thrown when dragging items.
-
-2007-06-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport/PropertyPad.cs: Default pad placement
-	  is now specified in the xml file.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs: Don't
-	  use the CurrentNode property in the OnChanged event since it may
-	  not be properly initialized when the event is fired.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml: Changed add-in category.
-
-2007-05-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport/CustomDescriptor.cs, Makefile.am: Added
-	  default implementation of ICustomTypeDescriptor.
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/CollectionEditor.cs:
-	  Removed debug code.
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/EnumerationEditorCell.cs:
-	  If an enum member has a Description attribute applied to it, use it
-	  as display name.
-	* MonoDevelop.DesignerSupport.Projects/ProjectsPropertyProvider.cs:
-	  Added more complete descriptions of the properties. Disable the
-	  ResourceId property if the file is not a resource.
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs: When
-	  the value of a property changes, update all other properties, since
-	  their values may also change, or they may be enabled/disabled.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp: Deploy the addin.xml file.
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs: Added some
-	  null checks.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Reference shared
-	  assemblies from the correct location.
-
-2007-03-07  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/EditorManager.cs: Avoid 
-	  some invalid PropertyEditorCell casts.
-	
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs: Tweaks to aid 
-	  in tracking down exceptions. The error display should really be moved 
-	  into the MD thread so that the entire designer process can go down,
-	  or we risk having loose ends. 
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport.mdp,
-	  MonoDevelop.DesignerSupport/DesignerSupportService.cs,
-	  MonoDevelop.DesignerSupport/CodeBehindService.cs,
-	  MonoDevelop.DesignerSupport/ToolboxService.cs, Makefile.am:
-	  Migration to Mono.Addins.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml,
-	  MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs,
-	  MonoDevelop.DesignerSupport.Projects/ProjectsPropertyProvider.cs:
-	  Implemented property providers for the Project and Class pad.
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Updated.
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs,
-	  MonoDevelop.DesignerSupport/IPropertyProvider.cs,
-	  MonoDevelop.DesignerSupport/PropertyPad.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs:
-	  Implemented support for multiple property providers for a
-	  component. Property providers can add properties to be shown in the
-	  property pad for a specific type of object. Add-ins can register
-	  new property providers in a new extension point.
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/FloatRange.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/ColorEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/BooleanEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/TimeSpanEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/EventEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/CharPropertyEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/EnumerationEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/FlagsEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/DateTimeEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/IntRange.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid/PropertyPadVisitor.cs:
-	  Track api changes.
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyEditorCell.cs: When
-	  initializing a cell, provide the EditSession instead of the
-	  PropertyDescriptor. In this way the cell can have more control over
-	  the property editing session.
-	* MonoDevelop.DesignerSupport.PropertyGrid/IPropertyPadProvider.cs:
-	  Added method which allows providing the object from which to get
-	  and set properties, which can now be different from the real
-	  component (it can be for example a wrapper). Also added methods
-	  which are called when the edit session ends.
-	* MonoDevelop.DesignerSupport.PropertyGrid/EditorManager.cs: Allow
-	  specifying cell editors using the EditorAttribute.
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs: Fire
-	  Changed and EndEditing events.
-
-2007-03-07 Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Clean up 
-	  CreateAndShowMember. Jump to selected member. Remove GUI 
-	  threadsafety code -- consumers should handle this.
-
-2007-03-07 Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Makefile.am: Remove ENABLE_DESIGNERSUPP check as it should always 
-	  be built now.
-
-2007-03-07  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs:
-	  Only restart GUI thread if it was stopped by an exception. This 
-	  means that the GUI thread will now be able to stop, so there 
-	  won't be lots of orphaned mdhost processes left around.
-
-2007-03-06  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/EventEditor.cs:
-	  Initialize override should call base, so display text gets set.
-
-2007-03-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Updated.
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs: Added methods
-	  for changing the content of the property pad.
-	* MonoDevelop.DesignerSupport/MemberExistsException.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindDisplayBinding.cs,
-	  MonoDevelop.DesignerSupport.CodeBehind/CodeBehindViewContent.cs:
-	  Fix warnings.
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Implement support for
-	  drag&drop and track changes in dynamic item providers.
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/EnumEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/StringEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/BaseEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/ColorEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/NumberEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/BoolEditor.cs:
-	  Removed old editors.
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditorDialog.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/FlagsSelectorDialog.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/FloatRange.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/ColorEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/BooleanEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/TimeSpanEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/EventEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/CharPropertyEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/TextEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/DefaultEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/EnumerationEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/ExpandableObjectEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/CollectionEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/FlagsEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/DateTimeEditor.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid.Editors/IntRange.cs:
-	  Implemented editors for the new TreeView based property grid.
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxConsumer.cs: Added
-	  support for drag&drop.
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/TypeToolboxNode.cs,
-	  MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs: Implement
-	  GetHashCode().
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Add support for
-	  drag&drop. Use smaller icons for the toolbar.
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxProvider.cs: Added event
-	  to update the toolbox items of a dynamic provider.
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyEditorCell.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs,
-	  MonoDevelop.DesignerSupport.PropertyGrid/PropertyGridTree.cs:
-	  Implemented TreeView based property grid.
-	* MonoDevelop.DesignerSupport.PropertyGrid/GridRow.cs: Removed, not
-	  needed anymore.
-	* MonoDevelop.DesignerSupport.PropertyGrid/IPropertyPadProvider.cs: New
-	  interfaces for providing custom property pad content.
-	* MonoDevelop.DesignerSupport.PropertyGrid/EditorManager.cs: New
-	  manager for the TreeView based property grid.
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyPadVisitor.cs: New
-	  command target visitor for getting the currently selected
-	  component.
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyValueChangedEventArgs.cs:
-	  Track api changes.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.addin.xml: Change add-in versions to
-	  0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp, Makefile.am: Synchronized the MD
-	  project and the Makefile
-
-2007-02-06  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs,
-	* MonoDevelop.DesignerSupport.PropertyGrid/EventPropertyTab.cs,
-	* MonoDevelop.DesignerSupport.PropertyGrid/DefaultPropertyTab.cs,
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: make strings translatable
-
-2006-02-01  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/TypeToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs:
-	* Makefile.am:
-	  Split class into separate file. Improve comments.
-	  
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs:
-	* MonoDevelop.DesignerSupport/CodeBehindService.cs:
-	  Added an Initialise method to CodeBehindService so that it can 
-	  subscribe to project events.
-	  
-	* MonoDevelop.DesignerSupport.CodeBehind/ICodeBehindProvider.cs:
-	  Completely changed the way the Codebehind bindings are provided.
-	  
-	* MonoDevelop.DesignerSupport/CodeBehindService.cs:
-	  Keep a list of CodeBehind bindings and update it as file change and 
-	  class change events come in.
-	  Fire CodeBehind change events when anything is updated.
-	  
-	* MonoDevelop.DesignerSupport.CodeBehind/CodeBehindClassBuilder.cs:
-	  If CodeBehind class cannot be found, display a notice to that effect.
-	  
-	* MonoDevelop.DesignerSupport.CodeBehind/CodeBehindProjectFileExtension.cs:
-	  Only hide class files if they just contain a single codebehind file.
-	  Use events from CodeBehindService to rebuild nodes selectively.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/WrapperDesignView.cs: Use the new
-	  GetContent method instead of casting the view to the required
-	  interface.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport.mdp: Updated.
-	* MonoDevelop.DesignerSupport/BindingService.cs,
-	  MonoDevelop.DesignerSupport/WrapperDesignView.cs: Track api changes
-	  in Document class.
-
-2006-11-14  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.mdp: Updated.
-	
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs:
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs: Renamed
-	  ToolboxService.(Load|Save)Contents to (Load|Save)SaveUserToolbox.
-	
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxProvider.cs: New file.
-	* MonoDevelop.DesignerSupport.addin.xml: 
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	  New IToolboxDefaultProvider and IToolboxDynamicProvider extension 
-	  points so that AddIns can provide default and dynamic toolbox items.
-	
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Split allItems source 
-	  of toolbox items. It now sources from userItems, defaultItems and 
-	  dynamicProviders.
-	
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxList.cs: New file. 
-	  Expanded ToolboxList to handle loading/saving functionality.
-	  
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxConsumer.cs: Removed 
-	  GetDynamicItems method; this functionality can now be implemented 
-	  separately as a dynamic toolbox provider.
-	  
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/TypeToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs:
-	  Proper Equals implementation, so that we can avoid node duplication.
-	
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  New overload for Load using an Assembly instead of a filename.
-
-2006-10-21  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	  Record the assembly location if it did not come from the GAC.
-	* MonoDevelop.DesignerSupport.Toolbox/TypeToolboxNode.cs:
-	  Avoid trying to load from GAC when we actually have the assembly 
-	  location, so avoiding an exception.
-	  Together these are part 2 of getting custom controls to load.
-	
-	* MonoDevelop.DesignerSupport.Toolbox/TypeToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs:
-	  Helper constructors for recording assembly location for types that 
-	  come from non-GAC assemblies.
-
-2006-09-16  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.DesignerSupport/BindingService.cs: Refactor a lot of code 
-	  from AddMemberToClass into GetCompatibleMemberInClass, because it's 
-	  useful separately.
-
-2006-08-31 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml:
-	  Updated add-in dependencies.
-
-2006-08-21  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.DesignerSupport.CodeBehind/CodeBehindDisplayBinding.cs:
-	  Disable CodeBehind display binding. Needs some works on Core to make 
-	  it work properly. 
-
-2006-08-05  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxPad.cs:
-	  Clean up namespace alias.
-	  
-	* MonoDevelop.DesignerSupport/BindingService.cs:
-	  Add a lot of methods to support AspNetEdit event binding.
-	  Make static, because there's nothing large to initialise.
-	  Enable refactoring of open files (broken for secondary ViewContents).
-	  
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs:
-	  Fix exception handling and GUI threading.
-	  
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs:
-	  Remove Binding service; it's now static.
-	  
-	* MonoDevelop.DesignerSupport/WrapperDesignView.cs:
-	  Dispose child ViewContent content.
-	  
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxConsumer.cs:
-	  Support for displaying dynamic items provided by current consumer.
-	  Rename Use method to ConsumeItem.
-	  Hide UnknownToolboxNodes.
-	
-	* MonoDevelop.DesignerSupport.CodeBehind/CodeBehindDisplayBinding.cs:
-	  Load file into child view. No idea why this was working before.
-	  
-	* MonoDevelop.DesignerSupport/ToolboxPad.cs:
-	* MonoDevelop.DesignerSupport/BindingService.cs:
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs:
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs:
-	* MonoDevelop.DesignerSupport/CodeBehindService.cs:
-	* MonoDevelop.DesignerSupport/MemberExistsException.cs:
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	* MonoDevelop.DesignerSupport/PropertyPad.cs:
-	* MonoDevelop.DesignerSupport.CodeBehind/CodeBehindDisplayBinding.cs:
-	* MonoDevelop.DesignerSupport.CodeBehind/ICodeBehindProvider.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxConsumer.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/UnknownToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxLoader.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/IToolboxLoader.cs:
-	  Add missing copyright information.
-
-2006-08-04 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.DesignerSupport/WrapperDesignView.cs: Add support
-	  for IEncodedTextContent.
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs: Fix build for
-	  gtk# 2.4.
-
-2006-07-29  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs:
-	  More flexible exception handling, and display errors.
-	
-	* MonoDevelop.DesignerSupport/WrapperDesignView.cs:
-	  Add a means of adding a 'bar' to the top of the view.
-	* MonoDevelop.DesignerSupport.CodeBehind/CodeBehindViewContent.cs:
-	  Move file name from tab to top 'bar'.
-	  
-	* MonoDevelop.DesignerSupport/ToolboxService.cs:
-	  Rename OnToolboxChanged to OnToolboxContentChanged to remove ambiguity.
-	  Re-enable contextual filtering.
-	  Use project service's DataContext for serialisation.
-	  
-	* MonoDevelop.DesignerSupport/PropertyPad.cs:
-	  Remove shadow from frame.
-	  
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/TypeToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/BaseToolboxNode.cs:
-	  Fix serialisation, both for persisting toolbox and for remoting 
-	  toolbox nodes.
-	  
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs:
-	Track OnToolboxChanged name change.
-	  
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs:
-	  Reduce height of help pane.
-	  Make sure that image resource comes from correct assembly when remoting.
-
-2006-07-25  Matej Urbas <matej.urbas@gmail.com>
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Prevent null 
-	  exception when all documents are closed. 
-
-2006-07-25  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport.mdp:
-	* Makefile.am: Add files to build.
-	  
-	* MonoDevelop.DesignerSupport/BindingService.cs:
-	* MonoDevelop.DesignerSupport/MemberExistsException.cs:
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs:
-	  New service, assists with adding CodeBehind memebers. Incomplete.
-	
-	* MonoDevelop.DesignerSupport/RemoteDesignerProcess.cs: Base class for 
-	  remoted designer, handles Gtk.Sockets and the Gtk# thread.
-	
-	* MonoDevelop.DesignerSupport/WrapperDesignView.cs: Override base member
-	  instead of hiding it.
-	
-	* MonoDevelop.DesignerSupport/PropertyPad.cs:
-	  Fix widget reparenting.
-
-2006-07-25  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport/ToolboxService.cs: Close file after 
-	deserialising toolbox.
-
-2006-07-21  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport/DesignerSupportService.cs: 
-	Store toolbox data in the correct location.
-	* ChangeLog: add missing entries.
-
-2006-07-21  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/*:
-	* MonoDevelop.DesignerSupport.PropertyGrid/*:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/*:
-	* MonoDevelop.DesignerSupport/*:
-	* MonoDevelop.DesignerSupport.CodeBehind/*:
-	* Makefile.am:
-	* MonoDevelop.DesignerSupport.addin.xml:
-	* MonoDevelop.DesignerSupport.mdp:
-	* icons/*:
-	Import the Designer Support addin.
-
-2006-07-21  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/*:
-	* MonoDevelop.DesignerSupport.PropertyGrid/*:
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/*:
-	Import AspNetEdit property grid and toolbox.
-
-2006-04-27  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/CategoryToolboxNode.cs: 
-	Make sure we cover all items in filtering loop.
-
-2006-04-27  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs: 
-	  Accessor for ToolboxItem.
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxStore.cs:
-	  Don't rebuild after blank filter.
-	* MonoDevelop.DesignerSupport.Toolbox/CategoryToolboxNode.cs:
-	  Add Clear () method to remove all children.
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs:
-	  Get categories from ToolboxService, and maintain expansion 
-	  and selection state where possible.
-	
-2006-04-26  Michael Hutchinson <m.j.hutchinson@gmail.com> 
-
-	* MonoDevelop.DesignerSupport.Toolbox/BaseToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/CategoryToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/TextToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxItemToolboxNode.cs:
-	* MonoDevelop.DesignerSupport.Toolbox/ToolboxStore.cs: 
-	  Add new NodeStore-based Toolbox.
-
-	* MonoDevelop.DesignerSupport.PropertyGrid/PropertyGrid.cs:	
-	  Add Refresh method as interim workaround for not being
-	  able to track externally changed values of properties.
-
-2006-01-16 Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.DesignerSupport.PropertyGrid.Editors/StringEditor.cs: 
-	  Write helpful trace message after swallowing PropertyConverter failure.
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs
index 2505bd214e..eec13371ac 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ComponentNodeBuilder.cs
@@ -42,9 +42,9 @@ namespace MonoDevelop.DesignerSupport.Projects
 			// Don't use the CurrentNode property here since it may not be properly initialized when the event is fired.
 			ITreeNavigator nav = Tree.GetNodeAtObject (obj);
 			if (nav != null) {
-				IWorkspaceFileObject ce = (IWorkspaceFileObject) nav.GetParentDataItem (typeof(IWorkspaceFileObject), true);
+				var ce = nav.GetParentDataItem<WorkspaceObject> (true);
 				if (ce != null) {
-					IdeApp.ProjectOperations.Save (ce);
+					IdeApp.ProjectOperations.SaveAsync (ce);
 					return;
 				}
 			}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs
index d97b8c2284..356dcaf632 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/PropertyPadTextEditorExtension.cs
@@ -28,6 +28,7 @@
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.DesignerSupport.Projects
 {
@@ -42,9 +43,9 @@ namespace MonoDevelop.DesignerSupport.Projects
 		{
 			// Return the ProjectFile object of the file being edited
 			
-			if (Document.HasProject) {
-				string file = Document.FileName;
-				return Document.Project.Files.GetFile (file);
+			if (DocumentContext.HasProject) {
+				string file = DocumentContext.Name;
+				return DocumentContext.Project.Files.GetFile (file);
 			}
 			else
 				return null;
@@ -61,8 +62,8 @@ namespace MonoDevelop.DesignerSupport.Projects
 
 		public void OnChanged (object obj)
 		{
-			if (Document.HasProject)
-				IdeApp.ProjectOperations.Save (Document.Project);
+			if (DocumentContext.HasProject)
+				IdeApp.ProjectOperations.SaveAsync (DocumentContext.Project);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/SolutionItemDescriptor.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/SolutionItemDescriptor.cs
index 95721e4e71..54c19f43e9 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/SolutionItemDescriptor.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/SolutionItemDescriptor.cs
@@ -33,9 +33,9 @@ namespace MonoDevelop.DesignerSupport.Projects
 {
 	class SolutionItemDescriptor: CustomDescriptor
 	{
-		SolutionItem entry;
+		SolutionFolderItem entry;
 		
-		public SolutionItemDescriptor (SolutionItem entry)
+		public SolutionItemDescriptor (SolutionFolderItem entry)
 		{
 			this.entry = entry;
 		}
@@ -58,8 +58,8 @@ namespace MonoDevelop.DesignerSupport.Projects
 		[LocalizedDescription ("File path of the solution item.")]
 		public string FilePath {
 			get {
-				if (entry is SolutionEntityItem)
-					return ((SolutionEntityItem) entry).FileName; 
+				if (entry is SolutionItem)
+					return ((SolutionItem) entry).FileName; 
 				else
 					return "";
 			}
@@ -77,5 +77,14 @@ namespace MonoDevelop.DesignerSupport.Projects
 					entry.BaseDirectory = value;
 			}
 		}
+
+		[LocalizedCategory ("Misc")]
+		[LocalizedDisplayName ("File Format")]
+		[LocalizedDescription ("File format of the project file.")]
+		public string FileFormat {
+			get {
+				return entry.ParentSolution.FileFormat.ProductDescription;
+			}
+		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/SolutionItemPropertyProvider.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/SolutionItemPropertyProvider.cs
index bfa8ea1faf..2753614d1a 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/SolutionItemPropertyProvider.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/SolutionItemPropertyProvider.cs
@@ -38,12 +38,12 @@ namespace MonoDevelop.DesignerSupport.Projects
 			if (obj is WorkspaceItem)
 				return new WorkspaceItemDescriptor ((WorkspaceItem)obj);
 			else
-				return new SolutionItemDescriptor ((SolutionItem)obj);
+				return new SolutionItemDescriptor ((SolutionFolderItem)obj);
 		}
 
 		public bool SupportsObject (object obj)
 		{
-			return obj is SolutionItem || obj is WorkspaceItem;
+			return obj is SolutionFolderItem || obj is WorkspaceItem;
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/WorkspaceItemDescriptor.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/WorkspaceItemDescriptor.cs
index d742398ef3..df8ff31114 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/WorkspaceItemDescriptor.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/WorkspaceItemDescriptor.cs
@@ -77,7 +77,7 @@ namespace MonoDevelop.DesignerSupport.Projects
 		[LocalizedDescription ("File format of the project file.")]
 		public string FileFormat {
 			get {
-				return item.FileFormat.Name;
+				return item is Solution ? ((Solution)item).FileFormat.ProductDescription : "";
 			}
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs
index bb48770836..5f2514e67b 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/CodeTemplateToolboxProvider.cs
@@ -29,6 +29,8 @@
 using System;
 using MonoDevelop.Ide.CodeTemplates;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.DesignerSupport.Toolbox
 {
@@ -40,11 +42,9 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 
 		public System.Collections.Generic.IEnumerable<ItemToolboxNode> GetDynamicItems (IToolboxConsumer consumer)
 		{
-			
-			MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor editor 
-				= consumer as MonoDevelop.Ide.Gui.Content.IExtensibleTextEditor;
+			var editor = consumer as IReadonlyTextDocument;
 			if (editor != null) {
-				foreach (CodeTemplate ct in CodeTemplateService.GetCodeTemplatesForFile (editor.Name)) {
+				foreach (CodeTemplate ct in CodeTemplateService.GetCodeTemplatesForFile (editor.FileName)) {
 					if (ct.CodeTemplateContext != CodeTemplateContext.Standard)
 						continue;
 					yield return new TemplateToolboxNode (ct) {
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs
index a257f5a9ca..2d32c17973 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs
@@ -57,10 +57,11 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		
 		public ComponentSelectorDialog (IToolboxConsumer currentConsumer)
 		{
-			using (IProgressMonitor monitor = new MessageDialogProgressMonitor (true, true, false, true)) {
+			using (ProgressMonitor monitor = new MessageDialogProgressMonitor (true, true, false, true)) {
 				index = DesignerSupport.Service.ToolboxService.GetComponentIndex (monitor);
 			}
-			
+
+			this.ApplyTheme ();
 			this.Build();
 			
 			store = new TreeStore (typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(Xwt.Drawing.Image), typeof(ItemToolboxNode), typeof(bool), typeof(int));
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/IToolboxLoader.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/IToolboxLoader.cs
index f7fad29038..f5e8edc5b8 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/IToolboxLoader.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/IToolboxLoader.cs
@@ -64,7 +64,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			
 			ExternalLoader eloader;
 			if (!externalLoaders.TryGetValue (runtime, out eloader)) {
-				eloader = (ExternalLoader) Runtime.ProcessService.CreateExternalProcessObject (typeof(ExternalLoader), runtime);
+				eloader = (ExternalLoader) Runtime.ProcessService.CreateExternalProcessObject (typeof(ExternalLoader), runtime.GetExecutionHandler ());
 				externalLoaders [runtime] = eloader;
 				values [counter++] = eloader;
 			} else {
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs
index f719a3468b..263f31f300 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs
@@ -58,7 +58,10 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		string category = "";
 		
 		[ItemProperty ("description")]
-		string description = "";
+		string description = "";

+

+		[ItemProperty ("source")]

+		string source = "";
 		
 		List <ToolboxItemFilterAttribute> itemFilters = new List <ToolboxItemFilterAttribute> ();
 		
@@ -94,6 +97,11 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		public virtual string Description {
 			get { return description; }
 			set { description = value; }
+		}

+

+		public virtual string Source {

+			get { return source; }

+			set { source = value; }

 		}
 		
 		[Browsable(false)]
@@ -113,13 +121,14 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		public virtual bool Filter (string keyword)
 		{
 			return ((Name != null) && (Name.IndexOf (keyword, StringComparison.InvariantCultureIgnoreCase) >= 0))
-			    || ((Description != null) && (Description.IndexOf (keyword, StringComparison.InvariantCultureIgnoreCase) >= 0));
+			    || ((Description != null) && (Description.IndexOf (keyword, StringComparison.InvariantCultureIgnoreCase) >= 0))

+			    || ((Source != null) && (Source.IndexOf (keyword, StringComparison.InvariantCultureIgnoreCase) >= 0));
 		}
 		
 		public override bool Equals (object o)
 		{
 			ItemToolboxNode node = o as ItemToolboxNode;
-			return (node != null) && (node.Name == this.Name) && (node.Category == this.Category) && (node.Description == this.Description);
+			return (node != null) && (node.Name == this.Name) && (node.Category == this.Category) && (node.Description == this.Description) && (node.Source == this.Source);
 		}
 		
 		public override int GetHashCode ()
@@ -131,6 +140,8 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 				code ^= Category.GetHashCode ();

 			if (Description != null)

 				code ^= Description.GetHashCode ();

+			if (Source != null)

+				code ^= Source.GetHashCode ();

 			return code;
 		}
 		

diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs
index 0a8b4f495a..bda69169b5 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs
@@ -38,7 +38,6 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Components.Docking;
 using MonoDevelop.Ide;
-using Mono.TextEditor;
 using MonoDevelop.Components;
 
 namespace MonoDevelop.DesignerSupport.Toolbox
@@ -67,7 +66,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			this.container = container;
 			
 			#region Toolbar
-			DockItemToolbar toolbar = container.GetToolbar (PositionType.Top);
+			DockItemToolbar toolbar = container.GetToolbar (DockPositionType.Top);
 		
 			filterEntry = new SearchEntry();
 			filterEntry.Ready = true;
@@ -79,7 +78,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			toolbar.Add (filterEntry, true);
 			
 			catToggleButton = new ToggleButton ();
-			catToggleButton.Image = new Image (Ide.Gui.Stock.GroupByCategory, IconSize.Menu);
+			catToggleButton.Image = new ImageView (Ide.Gui.Stock.GroupByCategory, IconSize.Menu);
 			catToggleButton.Toggled += new EventHandler (toggleCategorisation);
 			catToggleButton.TooltipText = GettextCatalog.GetString ("Show categories");
 			toolbar.Add (catToggleButton);
@@ -90,7 +89,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			compactModeToggleButton.TooltipText = GettextCatalog.GetString ("Use compact display");
 			toolbar.Add (compactModeToggleButton);
 	
-			toolboxAddButton = new Button (new Gtk.Image (Ide.Gui.Stock.Add, IconSize.Menu));
+			toolboxAddButton = new Button (new ImageView (Ide.Gui.Stock.Add, IconSize.Menu));
 			toolbar.Add (toolboxAddButton);
 			toolboxAddButton.TooltipText = GettextCatalog.GetString ("Add toolbox items");
 			toolboxAddButton.Clicked += new EventHandler (toolboxAddButton_Clicked);
@@ -229,7 +228,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		public void Refresh ()
 		{
 			// GUI assert here is to catch Bug 434065 - Exception while going to the editor
-			DispatchService.AssertGuiThread ();
+			Runtime.AssertMainThread ();
 			
 			if (toolboxService.Initializing) {
 				toolboxWidget.CustomMessage = GettextCatalog.GetString ("Initializing...");
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
index d15045ffbc..15e5dcc830 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs
@@ -32,7 +32,6 @@ using System.Collections.ObjectModel;
 using Gtk;
 using Pango;
 using Gdk;
-using Mono.TextEditor;
 using MonoDevelop.Ide;
 using MonoDevelop.Components;
 
@@ -205,11 +204,6 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		const int ItemIconTextItemSpacing = 4;
 		const int IconModePadding = 2;
 
-		static readonly Cairo.Color CategoryBackgroundGradientStartColor = new Cairo.Color (248d/255d, 248d/255d, 248d/255d);
-		static readonly Cairo.Color CategoryBackgroundGradientEndColor = new Cairo.Color (240d/255d, 240d/255d, 240d/255d);
-		static readonly Cairo.Color CategoryBorderColor = new Cairo.Color (217d/255d, 217d/255d, 217d/255d);
-		static readonly Cairo.Color CategoryLabelColor = new Cairo.Color (128d/255d, 128d/255d, 128d/255d);
-
 		protected override bool OnExposeEvent (Gdk.EventExpose e)
 		{
 			Cairo.Context cr = Gdk.CairoHelper.Create (e.Window);
@@ -253,24 +247,21 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 				if (!area.IntersectsWith (new Gdk.Rectangle (new Gdk.Point (xpos, ypos), itemDimension)))
 					return true;
 				cr.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
-				using (var pat = new Cairo.LinearGradient (xpos, ypos, xpos, ypos + itemDimension.Height)) {
-					pat.AddColorStop (0, CategoryBackgroundGradientStartColor);
-					pat.AddColorStop (1, CategoryBackgroundGradientEndColor);
-					cr.SetSource (pat);
-					cr.Fill ();
-				}
+				cr.SetSourceColor (Ide.Gui.Styles.PadCategoryBackgroundColor.ToCairoColor ());
+				cr.Fill ();
+
 				if (lastCategory == null || lastCategory.IsExpanded || lastCategory.AnimatingExpand) {
 					cr.MoveTo (xpos, ypos + 0.5);
 					cr.LineTo (itemDimension.Width, ypos + 0.5);
 				}
 				cr.MoveTo (0, ypos + itemDimension.Height - 0.5);
 				cr.LineTo (xpos + Allocation.Width, ypos + itemDimension.Height - 0.5);
-				cr.SetSourceColor (CategoryBorderColor);
+				cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryBorderColor.ToCairoColor ());
 				cr.Stroke ();
 
-				headerLayout.SetText (category.Text);
+				headerLayout.SetMarkup (category.Text);
 				int width, height;
-				cr.SetSourceColor (CategoryLabelColor);
+				cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryLabelColor.ToCairoColor ());
 				layout.GetPixelSize (out width, out height);
 				cr.MoveTo (xpos + CategoryLeftPadding, ypos + (double)(Math.Round ((double)(itemDimension.Height - height) / 2)));
 				Pango.CairoHelper.ShowLayout (cr, headerLayout);
@@ -285,22 +276,24 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			}, delegate (Category curCategory, Item item, Gdk.Size itemDimension) {
 				if (!area.IntersectsWith (new Gdk.Rectangle (new Gdk.Point (xpos, ypos), itemDimension)))
 					return true;
-				
+
+				var icon = item.Icon;
 				if (item == SelectedItem) {
+					icon = icon.WithStyles ("sel");
 					cr.SetSourceColor (Style.Base (StateType.Selected).ToCairoColor ());
 					cr.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height);
 					cr.Fill ();
 				}
 				if (listMode || !curCategory.CanIconizeItems)  {
-					cr.DrawImage (this, item.Icon, xpos + ItemLeftPadding, ypos + Math.Round ((itemDimension.Height - item.Icon.Height) / 2));
-					layout.SetText (item.Text);
+					cr.DrawImage (this, icon, xpos + ItemLeftPadding, ypos + Math.Round ((itemDimension.Height - icon.Height) / 2));
+					layout.SetMarkup (item.Text);
 					int width, height;
 					layout.GetPixelSize (out width, out height);
 					cr.SetSourceColor (Style.Text (item != this.SelectedItem ? StateType.Normal : StateType.Selected).ToCairoColor ());
 					cr.MoveTo (xpos + ItemLeftPadding + IconSize.Width + ItemIconTextItemSpacing, ypos + (double)(Math.Round ((double)(itemDimension.Height - height) / 2)));
 					Pango.CairoHelper.ShowLayout (cr, layout);
 				} else {
-					cr.DrawImage (this, item.Icon, xpos + Math.Round ((itemDimension.Width  - item.Icon.Width) / 2), ypos + Math.Round ((itemDimension.Height - item.Icon.Height) / 2));
+					cr.DrawImage (this, icon, xpos + Math.Round ((itemDimension.Width  - icon.Width) / 2), ypos + Math.Round ((itemDimension.Height - icon.Height) / 2));
 				}
 					
 				if (item == mouseOverItem) {
@@ -318,7 +311,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 				// Closing line when animating the last group of the toolbox
 				cr.MoveTo (area.X, ypos + 0.5);
 				cr.RelLineTo (area.Width, 0);
-				cr.SetSourceColor (CategoryBorderColor);
+				cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryBorderColor.ToCairoColor ());
 				cr.Stroke ();
 			}
 
@@ -836,7 +829,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 					int x, y = item.ItemHeight;
 
 					if (y == 0) {
-						layout.SetText (item.Text);
+						layout.SetMarkup (item.Text);
 						layout.GetPixelSize (out x, out y);
 						y = Math.Max (IconSize.Height, y);
 						y += ItemTopBottomPadding * 2;
@@ -876,7 +869,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 					int x, y = category.ItemHeight;
 
 					if (y == 0) {
-						layout.SetText (category.Text);
+						layout.SetMarkup (category.Text);
 						layout.GetPixelSize (out x, out y);
 						y += CategoryTopBottomPadding * 2;
 						category.ItemHeight = y;
@@ -1135,8 +1128,14 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		
 		public string Text {
 			get {
-				if (node != null)
-					return node.Name;
+				if (node != null) {
+					var t = GLib.Markup.EscapeText (node.Name);
+					if (!string.IsNullOrEmpty (node.Source)) {
+						var c = MonoDevelop.Ide.Gui.Styles.DimTextColor.ToHexString ().Substring (0, 7);
+						t += string.Format (" <span size=\"smaller\" color=\"{1}\">{0}</span>", node.Source, c);
+					}
+					return t;
+				}
 				return text;
 			}
 		}
@@ -1183,7 +1182,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		public Item (Xwt.Drawing.Image icon, string text, string tooltip, object tag)
 		{
 			this.icon    = icon;
-			this.text    = text;
+			this.text    = GLib.Markup.EscapeText (text);
 			this.tooltip = tooltip;
 			this.tag     = tag;
 		}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs
index 2cde0bbec1..74fb08fe4c 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs
@@ -155,13 +155,9 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		public MonoDevelop.Projects.ProjectReference GetProjectReference ()
 		{
 			if (string.IsNullOrEmpty (assemblyLocation)) {
-				return new MonoDevelop.Projects.ProjectReference (
-				    MonoDevelop.Projects.ReferenceType.Package,
-				    assemblyName);
+				return MonoDevelop.Projects.ProjectReference.CreateAssemblyReference (assemblyName);
 			} else {
-				return new MonoDevelop.Projects.ProjectReference (
-				    MonoDevelop.Projects.ReferenceType.Assembly,
-				    assemblyLocation);
+				return MonoDevelop.Projects.ProjectReference.CreateAssemblyFileReference (assemblyLocation);
 			}
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
index 47bd4434ec..da0c3b2c3f 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
@@ -115,7 +115,6 @@
 
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
 		<Class class = "MonoDevelop.DesignerSupport.Projects.PropertyPadTextEditorExtension" />
-		<Class class = "MonoDevelop.DesignerSupport.ClassOutlineTextEditorExtension" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/DesignerSupport/ToolboxProviders">
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
index 39b8165b52..330da725d4 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
@@ -63,6 +63,18 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -75,26 +87,11 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -143,7 +140,6 @@
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\CodeTemplateToolboxProvider.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\CecilToolboxItemLoader.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\CecilTypeResolver.cs" />
-    <Compile Include="MonoDevelop.DesignerSupport\ClassOutlineTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.DesignerSupport\CodeBehind.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\TemplateToolboxNode.cs" />
@@ -159,10 +155,6 @@
     <Compile Include="MonoDevelop.DesignerSupport\IPropertyPadProvider.cs" />
     <Compile Include="MonoDevelop.DesignerSupport\CodeBehindWriter.cs" />
     <Compile Include="MonoDevelop.DesignerSupport\SwitchBetweenRelatedFilesCommand.cs" />
-    <Compile Include="MonoDevelop.DesignerSupport\ClassOutlineNodeComparer.cs" />
-    <Compile Include="MonoDevelop.DesignerSupport\ClassOutlineSortingPreferencesDialog.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.cs" />
-    <Compile Include="MonoDevelop.DesignerSupport\ClassOutlineSettings.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Toolbox\IToolboxCustomizer.cs" />
     <Compile Include="AddinInfo.cs" />
     <Compile Include="MonoDevelop.DesignerSupport.Projects\ImplicitFrameworkAssemblyReferenceDescriptor.cs" />
@@ -180,24 +172,84 @@
     <EmbeddedResource Include="icons\compact-display-16%402x.png">
       <LogicalName>compact-display-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\compact-display-16~dark.png">
+      <LogicalName>compact-display-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\compact-display-16~dark%402x.png">
+      <LogicalName>compact-display-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-properties-16.png">
       <LogicalName>pad-properties-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-properties-16%402x.png">
       <LogicalName>pad-properties-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-properties-16~dark.png">
+      <LogicalName>pad-properties-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-properties-16~dark%402x.png">
+      <LogicalName>pad-properties-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-properties-16~sel.png">
+      <LogicalName>pad-properties-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-properties-16~sel%402x.png">
+      <LogicalName>pad-properties-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-properties-16~dark~sel.png">
+      <LogicalName>pad-properties-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-properties-16~dark~sel%402x.png">
+      <LogicalName>pad-properties-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-toolbox-16.png">
       <LogicalName>pad-toolbox-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-toolbox-16%402x.png">
       <LogicalName>pad-toolbox-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-toolbox-16~dark.png">
+      <LogicalName>pad-toolbox-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-toolbox-16~dark%402x.png">
+      <LogicalName>pad-toolbox-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-toolbox-16~sel.png">
+      <LogicalName>pad-toolbox-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-toolbox-16~sel%402x.png">
+      <LogicalName>pad-toolbox-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-toolbox-16~dark~sel.png">
+      <LogicalName>pad-toolbox-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-toolbox-16~dark~sel%402x.png">
+      <LogicalName>pad-toolbox-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-document-outline-16.png">
       <LogicalName>pad-document-outline-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\pad-document-outline-16%402x.png">
       <LogicalName>pad-document-outline-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-document-outline-16~dark.png">
+      <LogicalName>pad-document-outline-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-document-outline-16~dark%402x.png">
+      <LogicalName>pad-document-outline-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-document-outline-16~sel.png">
+      <LogicalName>pad-document-outline-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-document-outline-16~sel%402x.png">
+      <LogicalName>pad-document-outline-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-document-outline-16~dark~sel.png">
+      <LogicalName>pad-document-outline-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pad-document-outline-16~dark~sel%402x.png">
+      <LogicalName>pad-document-outline-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs
index 86d068d441..445685d6b9 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs
@@ -29,18 +29,18 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+// TODO: Roslyn port. (Maybe move to the ASP.NET binding).
 using System;
 using System.CodeDom;
 using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
+using Microsoft.CodeAnalysis;
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using System.Linq;
 using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.DesignerSupport
@@ -51,165 +51,165 @@ namespace MonoDevelop.DesignerSupport
 	{
 		//TODO: currently case-sensitive, so some languages may not like this
 		const bool ignoreCase = false;
-		
-		public static IUnresolvedMember GetCompatibleMemberInClass (ICompilation ctx, ITypeDefinition cls, CodeTypeMember member)
-		{
-			// TODO Type system conversion
-//			//check for identical property names
-//			foreach (var prop in cls.Properties) {
-//				if (string.Compare (prop.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
-//					string rt = prop.ReturnType.ReflectionName;
-//					EnsureClassExists (ctx, rt, GetValidRegion (prop));
-//					CodeMemberProperty memProp = member as CodeMemberProperty;
-//					if (memProp == null || !IsTypeCompatible (ctx, rt, memProp.Type.BaseType))
-//						throw new MemberExistsException (cls.FullName, MemberType.Property, member, GetValidRegion (prop), cls.Region.FileName);
-//					return prop;
-//				}
-//			}
-//				
-//			//check for identical method names
-//			foreach (var meth in cls.Methods) {
-//				if (string.Compare (meth.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
-//					string rt = meth.ReturnType.ReflectionName;
-//					EnsureClassExists (ctx, rt, GetValidRegion (meth));
-//					CodeMemberMethod memMeth = member as CodeMemberMethod;
-//					if (memMeth == null || !IsTypeCompatible (ctx, rt, memMeth.ReturnType.BaseType))
-//						throw new MemberExistsException (cls.FullName, MemberType.Method, member, GetValidRegion (meth), cls.Region.FileName);
-//					return meth;
-//				}
-//			}
+
+//		public static IUnresolvedMember GetCompatibleMemberInClass (ICompilation ctx, ITypeDefinition cls, CodeTypeMember member)
+//		{
+//			// TODO Type system conversion
+////			//check for identical property names
+////			foreach (var prop in cls.Properties) {
+////				if (string.Compare (prop.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
+////					string rt = prop.ReturnType.ReflectionName;
+////					EnsureClassExists (ctx, rt, GetValidRegion (prop));
+////					CodeMemberProperty memProp = member as CodeMemberProperty;
+////					if (memProp == null || !IsTypeCompatible (ctx, rt, memProp.Type.BaseType))
+////						throw new MemberExistsException (cls.FullName, MemberType.Property, member, GetValidRegion (prop), cls.Region.FileName);
+////					return prop;
+////				}
+////			}
+////				
+////			//check for identical method names
+////			foreach (var meth in cls.Methods) {
+////				if (string.Compare (meth.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
+////					string rt = meth.ReturnType.ReflectionName;
+////					EnsureClassExists (ctx, rt, GetValidRegion (meth));
+////					CodeMemberMethod memMeth = member as CodeMemberMethod;
+////					if (memMeth == null || !IsTypeCompatible (ctx, rt, memMeth.ReturnType.BaseType))
+////						throw new MemberExistsException (cls.FullName, MemberType.Method, member, GetValidRegion (meth), cls.Region.FileName);
+////					return meth;
+////				}
+////			}
+////			
+////			//check for identical event names
+////			foreach (var ev in cls.Events) {
+////				if (string.Compare (ev.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
+////					string rt = ev.ReturnType.ReflectionName;
+////					EnsureClassExists (ctx, rt, GetValidRegion (ev));
+////					CodeMemberEvent memEv = member as CodeMemberEvent;
+////					if (memEv == null || !IsTypeCompatible (ctx, rt, memEv.Type.BaseType))
+////						throw new MemberExistsException (cls.FullName, MemberType.Event, member, GetValidRegion (ev), cls.Region.FileName);
+////					return ev;
+////				}
+////			}
+////				
+////			//check for identical field names
+////			foreach (var field in cls.Fields) {
+////				if (string.Compare (field.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
+////					string rt = field.ReturnType.ReflectionName;
+////					EnsureClassExists (ctx, rt, GetValidRegion (field));
+////					CodeMemberField memField = member as CodeMemberField;
+////					if (memField == null || !IsTypeCompatible (ctx, rt, memField.Type.BaseType))
+////						throw new MemberExistsException (cls.FullName, MemberType.Field, member, GetValidRegion (field), cls.Region.FileName);
+////					return field;
+////				}
+////			}
+////			
+////			//walk down into base classes, if any
+////			foreach (var baseType in cls.GetAllBaseTypeDefinitions ()) {
+////				IMember mem = GetCompatibleMemberInClass (ctx, baseType, member);
+////				if (mem != null)
+////					return mem;
+////			}
 //			
-//			//check for identical event names
-//			foreach (var ev in cls.Events) {
-//				if (string.Compare (ev.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
-//					string rt = ev.ReturnType.ReflectionName;
-//					EnsureClassExists (ctx, rt, GetValidRegion (ev));
-//					CodeMemberEvent memEv = member as CodeMemberEvent;
-//					if (memEv == null || !IsTypeCompatible (ctx, rt, memEv.Type.BaseType))
-//						throw new MemberExistsException (cls.FullName, MemberType.Event, member, GetValidRegion (ev), cls.Region.FileName);
-//					return ev;
-//				}
-//			}
-//				
-//			//check for identical field names
-//			foreach (var field in cls.Fields) {
-//				if (string.Compare (field.Name, member.Name, StringComparison.OrdinalIgnoreCase) == 0) {
-//					string rt = field.ReturnType.ReflectionName;
-//					EnsureClassExists (ctx, rt, GetValidRegion (field));
-//					CodeMemberField memField = member as CodeMemberField;
-//					if (memField == null || !IsTypeCompatible (ctx, rt, memField.Type.BaseType))
-//						throw new MemberExistsException (cls.FullName, MemberType.Field, member, GetValidRegion (field), cls.Region.FileName);
-//					return field;
-//				}
+//			//return null if no match
+//			return null;
+//		}
+//		
+//		static DomRegion GetValidRegion (IMember member)
+//		{
+//			if (member.BodyRegion.IsEmpty || member.DeclaringTypeDefinition.Region.FileName == FilePath.Null)
+//				return member.DeclaringTypeDefinition.Region;
+//			return member.BodyRegion;
+//		}
+//		
+//		static DomRegion GetValidRegion (IUnresolvedMember member)
+//		{
+//			if (member.BodyRegion.IsEmpty || member.DeclaringTypeDefinition.Region.FileName == FilePath.Null)
+//				return member.DeclaringTypeDefinition.Region;
+//			return member.BodyRegion;
+//		}
+//		
+//		static IType EnsureClassExists (ICompilation ctx, string className, DomRegion location)
+//		{
+//			string ns;
+//			string name;
+//			int idx = className.LastIndexOf (".");
+//			if (idx < 0) {
+//				ns = "";
+//				name = className;
+//			} else {
+//				ns = className.Substring (0, idx);
+//				name = className.Substring (idx + 1);
 //			}
-//			
-//			//walk down into base classes, if any
+//			var cls = ctx.MainAssembly.GetTypeDefinition (ns, name, 0);
+//			if (cls == null)
+//				throw new TypeNotFoundException (className, location, null);
+//			return cls;
+//		}
+//		
+//		static bool IsTypeCompatible (ICompilation ctx, string existingType, string checkType)
+//		{
+//			if (existingType == checkType)
+//				return true;
+//			IType cls = EnsureClassExists (ctx, checkType, DomRegion.Empty);
 //			foreach (var baseType in cls.GetAllBaseTypeDefinitions ()) {
-//				IMember mem = GetCompatibleMemberInClass (ctx, baseType, member);
-//				if (mem != null)
-//					return mem;
+//				if (IsTypeCompatible (ctx, existingType, baseType.FullName))
+//				    return true;
 //			}
-			
-			//return null if no match
-			return null;
-		}
-		
-		static DomRegion GetValidRegion (IMember member)
-		{
-			if (member.BodyRegion.IsEmpty || member.DeclaringTypeDefinition.Region.FileName == FilePath.Null)
-				return member.DeclaringTypeDefinition.Region;
-			return member.BodyRegion;
-		}
-		
-		static DomRegion GetValidRegion (IUnresolvedMember member)
-		{
-			if (member.BodyRegion.IsEmpty || member.DeclaringTypeDefinition.Region.FileName == FilePath.Null)
-				return member.DeclaringTypeDefinition.Region;
-			return member.BodyRegion;
-		}
-		
-		static IType EnsureClassExists (ICompilation ctx, string className, DomRegion location)
-		{
-			string ns;
-			string name;
-			int idx = className.LastIndexOf (".");
-			if (idx < 0) {
-				ns = "";
-				name = className;
-			} else {
-				ns = className.Substring (0, idx);
-				name = className.Substring (idx + 1);
-			}
-			var cls = ctx.MainAssembly.GetTypeDefinition (ns, name, 0);
-			if (cls == null)
-				throw new TypeNotFoundException (className, location, null);
-			return cls;
-		}
-		
-		static bool IsTypeCompatible (ICompilation ctx, string existingType, string checkType)
-		{
-			if (existingType == checkType)
-				return true;
-			IType cls = EnsureClassExists (ctx, checkType, DomRegion.Empty);
-			foreach (var baseType in cls.GetAllBaseTypeDefinitions ()) {
-				if (IsTypeCompatible (ctx, existingType, baseType.FullName))
-				    return true;
-			}
-			return false;
-		}
-		
-		public static INamedElement AddMemberToClass (Project project, ITypeDefinition cls, IUnresolvedTypeDefinition specificPartToAffect, CodeTypeMember member, bool throwIfExists)
-		{
-			bool isChildClass = false;
-			foreach (var c in cls.Parts)
-				if (c == specificPartToAffect)
-					isChildClass = true;
-			if (!isChildClass)
-				throw new ArgumentException ("Class specificPartToAffect is not a part of class cls");
-			
-			var dom = TypeSystemService.GetCompilation (project);
-			var existingMember = GetCompatibleMemberInClass (dom, cls, member);
-			
-			if (existingMember == null)
-				return CodeGenerationService.AddCodeDomMember (project, specificPartToAffect, member);
-			
-			
-			if (throwIfExists)
-				throw new MemberExistsException (cls.Name, member, MemberType.Method, existingMember.BodyRegion, cls.Region.FileName);
-			
-			return existingMember;
-		}
-		
-//		public static CodeRefactorer GetCodeGenerator (Project project)
-//		{			
-//			CodeRefactorer cr = new CodeRefactorer (project.ParentSolution);
-//			cr.TextFileProvider = MonoDevelop.Ide.TextFileProvider.Instance;
-//			return cr;
+//			return false;
+//		}
+//		
+//		public static void AddMemberToClass (Project project, INamedTypeSymbol cls, Location specificPartToAffect, CodeTypeMember member, bool throwIfExists)
+//		{
+//			bool isChildClass = false;
+//			foreach (var c in cls.Locations)
+//				if (c == specificPartToAffect)
+//					isChildClass = true;
+//			if (!isChildClass)
+//				throw new ArgumentException ("Class specificPartToAffect is not a part of class cls");
+//			
+//			var dom = TypeSystemService.GetCompilation (project);
+//			var existingMember = GetCompatibleMemberInClass (dom, cls, member);
+//			
+//			if (existingMember == null)
+//				return CodeGenerationService.AddCodeDomMember (project, specificPartToAffect, member);
+//			
+//			
+//			if (throwIfExists)
+//				throw new MemberExistsException (cls.Name, member, MemberType.Method, existingMember.BodyRegion, cls.Region.FileName);
+//			
+//			return existingMember;
 //		}
+//		
+////		public static CodeRefactorer GetCodeGenerator (Project project)
+////		{			
+////			CodeRefactorer cr = new CodeRefactorer (project.ParentSolution);
+////			cr.TextFileProvider = MonoDevelop.Ide.TextFileProvider.Instance;
+////			return cr;
+////		}
 		
-		public static IEnumerable<IMethod> GetCompatibleMethodsInClass (IType cls, IEvent eve)
+		public static IEnumerable<IMethodSymbol> GetCompatibleMethodsInClass (ITypeSymbol cls, IEventSymbol eve)
 		{
-			IMethod eveMeth = GetMethodSignature (eve);
+			IMethodSymbol eveMeth = GetMethodSignature (eve);
 			if (eveMeth == null)
-				return new IMethod[0];
+				return new IMethodSymbol[0];
 			return GetCompatibleMethodsInClass (cls, eveMeth);
 		}
 		
 		//TODO: check accessibility
-		public static IEnumerable<IMethod> GetCompatibleMethodsInClass (IType cls, IMethod matchMeth)
+		public static IEnumerable<IMethodSymbol> GetCompatibleMethodsInClass (ITypeSymbol cls, IMethodSymbol matchMeth)
 		{
-			IType[] pars = new IType[matchMeth.Parameters.Count];
-			List<IType>[] baseTypes = new List<IType>[matchMeth.Parameters.Count];
-			for (int i = 0; i < matchMeth.Parameters.Count; i++) {
+			ITypeSymbol[] pars = new ITypeSymbol[matchMeth.Parameters.Length];
+			List<ITypeSymbol>[] baseTypes = new List<ITypeSymbol>[matchMeth.Parameters.Length];
+			for (int i = 0; i < matchMeth.Parameters.Length; i++) {
 				pars[i] = matchMeth.Parameters[i].Type;
-				baseTypes[i] = new List<IType> (pars[i].GetAllBaseTypes ());
+				baseTypes[i] = new List<ITypeSymbol> (pars[i].GetBaseTypes ());
 			}
-			
+
 			var matchMethType = matchMeth.ReturnType;
 			
-			foreach (IMethod method in cls.GetMethods ()) {
-				if (method.IsPrivate || method.Parameters.Count != pars.Length || !method.ReturnType.Equals (matchMethType) 
-				    || method.IsInternal)
+			foreach (IMethodSymbol method in cls.GetAccessibleMembersInThisAndBaseTypes<IMethodSymbol> (cls)) {
+				if (method.DeclaredAccessibility == Accessibility.Private || method.Parameters.Length != pars.Length || !method.ReturnType.Equals (matchMethType) 
+					|| method.DeclaredAccessibility == Accessibility.Internal)
 					continue;
 				
 				bool allCompatible = true;
@@ -229,12 +229,12 @@ namespace MonoDevelop.DesignerSupport
 			}
 		}
 		
-		public static bool IdentifierExistsInClass (IType cls, string identifier)
+		public static bool IdentifierExistsInClass (ITypeSymbol cls, string identifier)
 		{
 			return cls.GetMembers ().Any (m => m.Name == identifier);
 		}
 		
-		public static string GenerateIdentifierUniqueInClass (IType cls, string trialIdentifier)
+		public static string GenerateIdentifierUniqueInClass (ITypeSymbol cls, string trialIdentifier)
 		{
 			string trialValue = trialIdentifier;
 			
@@ -249,156 +249,156 @@ namespace MonoDevelop.DesignerSupport
 			throw new Exception ("Tried identifiers up to " + trialValue + " and all already existed");
 		}
 		
-		static DomRegion GetRegion (INamedElement el)
-		{
-			if (el is IEntity)
-				return ((IEntity)el).BodyRegion;
-			return ((IUnresolvedEntity)el).BodyRegion;
-		}
-		//opens the code view with the desired method, creating it if it doesn't already exist
-		public static void CreateAndShowMember (Project project, ITypeDefinition cls, IUnresolvedTypeDefinition specificPartToAffect, CodeTypeMember member)
-		{
-			//only adds the method if it doesn't already exist
-			var mem = AddMemberToClass (project, cls, specificPartToAffect, member, false);
-			
-			//some tests in case code refactorer returns bad values
-			int beginline = specificPartToAffect.BodyRegion.BeginLine;
-			var region = GetRegion (mem);
-			if (!region.IsEmpty && region.BeginLine >= beginline && region.BeginLine <= specificPartToAffect.BodyRegion.EndLine)
-				beginline = region.BeginLine;
-			
-			//jump to the member or class
-			IdeApp.Workbench.OpenDocument (specificPartToAffect.Region.FileName, beginline, 1);
-		}
-		
-		public static System.CodeDom.CodeTypeMember ReflectionToCodeDomMember (MemberInfo memberInfo)
-		{
-			if (memberInfo is MethodInfo)
-				return ReflectionToCodeDomMethod ((MethodInfo) memberInfo);
-			
-			throw new NotImplementedException ();
-		}
-		
-		public static System.CodeDom.CodeMemberMethod ReflectionToCodeDomMethod (MethodInfo mi)
-		{
-			CodeMemberMethod newMethod = new CodeMemberMethod ();
-			newMethod.Name = mi.Name;
-			newMethod.ReturnType = new System.CodeDom.CodeTypeReference (mi.ReturnType.FullName);
-			
-			newMethod.Attributes = System.CodeDom.MemberAttributes.Private;
-			switch (mi.Attributes) {
-				case System.Reflection.MethodAttributes.Assembly:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.Assembly;
-					break;
-				case System.Reflection.MethodAttributes.FamANDAssem:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.FamilyAndAssembly;
-					break;
-				case System.Reflection.MethodAttributes.Family:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.Family;
-					break;
-				case System.Reflection.MethodAttributes.FamORAssem:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.FamilyAndAssembly;
-					break;
-				case System.Reflection.MethodAttributes.Public:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.Public;
-					break;
-				case System.Reflection.MethodAttributes.Static:
-					newMethod.Attributes |= System.CodeDom.MemberAttributes.Static;
-					break;
-			}
-			
-			ParameterInfo[] pinfos = mi.GetParameters ();
-			foreach (ParameterInfo pi in pinfos) {
-				CodeParameterDeclarationExpression newPar = new CodeParameterDeclarationExpression (pi.ParameterType.FullName, pi.Name);
-				if (pi.IsIn) newPar.Direction = FieldDirection.In;
-				else if (pi.IsOut) newPar.Direction = FieldDirection.Out;
-				newMethod.Parameters.Add (newPar);
-			}
-			
-			return newMethod;
-		}
+//		static DomRegion GetRegion (INamedElement el)
+//		{
+//			if (el is IEntity)
+//				return ((IEntity)el).BodyRegion;
+//			return ((IUnresolvedEntity)el).BodyRegion;
+//		}
+//		//opens the code view with the desired method, creating it if it doesn't already exist
+//		public static void CreateAndShowMember (Project project, ITypeDefinition cls, IUnresolvedTypeDefinition specificPartToAffect, CodeTypeMember member)
+//		{
+//			//only adds the method if it doesn't already exist
+//			var mem = AddMemberToClass (project, cls, specificPartToAffect, member, false);
+//			
+//			//some tests in case code refactorer returns bad values
+//			int beginline = specificPartToAffect.BodyRegion.BeginLine;
+//			var region = GetRegion (mem);
+//			if (!region.IsEmpty && region.BeginLine >= beginline && region.BeginLine <= specificPartToAffect.BodyRegion.EndLine)
+//				beginline = region.BeginLine;
+//			
+//			//jump to the member or class
+//			IdeApp.Workbench.OpenDocument (specificPartToAffect.Region.FileName, beginline, 1);
+//		}
+//		
+//		public static System.CodeDom.CodeTypeMember ReflectionToCodeDomMember (MemberInfo memberInfo)
+//		{
+//			if (memberInfo is MethodInfo)
+//				return ReflectionToCodeDomMethod ((MethodInfo) memberInfo);
+//			
+//			throw new NotImplementedException ();
+//		}
+//		
+//		public static System.CodeDom.CodeMemberMethod ReflectionToCodeDomMethod (MethodInfo mi)
+//		{
+//			CodeMemberMethod newMethod = new CodeMemberMethod ();
+//			newMethod.Name = mi.Name;
+//			newMethod.ReturnType = new System.CodeDom.CodeTypeReference (mi.ReturnType.FullName);
+//			
+//			newMethod.Attributes = System.CodeDom.MemberAttributes.Private;
+//			switch (mi.Attributes) {
+//				case System.Reflection.MethodAttributes.Assembly:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.Assembly;
+//					break;
+//				case System.Reflection.MethodAttributes.FamANDAssem:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.FamilyAndAssembly;
+//					break;
+//				case System.Reflection.MethodAttributes.Family:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.Family;
+//					break;
+//				case System.Reflection.MethodAttributes.FamORAssem:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.FamilyAndAssembly;
+//					break;
+//				case System.Reflection.MethodAttributes.Public:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.Public;
+//					break;
+//				case System.Reflection.MethodAttributes.Static:
+//					newMethod.Attributes |= System.CodeDom.MemberAttributes.Static;
+//					break;
+//			}
+//			
+//			ParameterInfo[] pinfos = mi.GetParameters ();
+//			foreach (ParameterInfo pi in pinfos) {
+//				CodeParameterDeclarationExpression newPar = new CodeParameterDeclarationExpression (pi.ParameterType.FullName, pi.Name);
+//				if (pi.IsIn) newPar.Direction = FieldDirection.In;
+//				else if (pi.IsOut) newPar.Direction = FieldDirection.Out;
+//				newMethod.Parameters.Add (newPar);
+//			}
+//			
+//			return newMethod;
+//		}
 		
-		public static IMethod GetMethodSignature (IEvent ev)
+		public static IMethodSymbol GetMethodSignature (IEventSymbol ev)
 		{
-			if (ev.ReturnType == null)
+			if (ev.Type == null)
 				return null;
-			IType cls = ev.ReturnType;
-			if (cls.Kind == TypeKind.Unknown)
+			ITypeSymbol cls = ev.Type;
+			if (cls.TypeKind == TypeKind.Unknown)
 				return null;
-			foreach (var m in cls.GetMethods ())
+			foreach (var m in cls.GetAccessibleMembersInThisAndBaseTypes<IMethodSymbol> (cls))
 				if (m.Name == "Invoke")
 					return m;
 			return null;
 		}
 		
-		//TODO: handle generics
-		public static IUnresolvedMethod CodeDomToMDDomMethod (CodeMemberMethod method)
-		{
-			var meth = new DefaultUnresolvedMethod (null, method.Name);
-			meth.ReturnType = new DefaultUnresolvedTypeDefinition (method.ReturnType.BaseType);
-			
-			CodeDomModifiersToMDDom (meth, method.Attributes);
-			
-			foreach (CodeParameterDeclarationExpression dec in method.Parameters) {
-				var paramType = new DefaultUnresolvedTypeDefinition (dec.Type.BaseType);
-				var par = new  DefaultUnresolvedParameter (paramType, dec.Name);
-				if (dec.Direction == FieldDirection.Ref)
-					par.IsRef = true;
-				else if (dec.Direction == FieldDirection.Out)
-					par.IsOut = true;
-				meth.Parameters.Add (par);
-			}
-			
-			return meth;
-		}
-		
-		public static CodeMemberMethod MDDomToCodeDomMethod (IEvent eve)
+//		//TODO: handle generics
+//		public static IUnresolvedMethod CodeDomToMDDomMethod (CodeMemberMethod method)
+//		{
+//			var meth = new DefaultUnresolvedMethod (null, method.Name);
+//			meth.ReturnType = new DefaultUnresolvedTypeDefinition (method.ReturnType.BaseType);
+//			
+//			CodeDomModifiersToMDDom (meth, method.Attributes);
+//			
+//			foreach (CodeParameterDeclarationExpression dec in method.Parameters) {
+//				var paramType = new DefaultUnresolvedTypeDefinition (dec.Type.BaseType);
+//				var par = new  DefaultUnresolvedParameter (paramType, dec.Name);
+//				if (dec.Direction == FieldDirection.Ref)
+//					par.IsRef = true;
+//				else if (dec.Direction == FieldDirection.Out)
+//					par.IsOut = true;
+//				meth.Parameters.Add (par);
+//			}
+//			
+//			return meth;
+//		}
+
+		public static CodeMemberMethod MDDomToCodeDomMethod (IEventSymbol eve)
 		{
-			IMethod meth = GetMethodSignature (eve);
+			IMethodSymbol meth = GetMethodSignature (eve);
 			return meth != null ? MDDomToCodeDomMethod (meth) : null;
 		}
 		
-		static void CodeDomModifiersToMDDom (DefaultUnresolvedMethod method, MemberAttributes modifiers)
-		{
-			if ((modifiers & MemberAttributes.FamilyOrAssembly) != 0) {
-				method.Accessibility = Accessibility.ProtectedOrInternal;
-			}
-			else if ((modifiers & MemberAttributes.FamilyOrAssembly) != 0) {
-				method.Accessibility = Accessibility.ProtectedAndInternal;
-			}
-			else if ((modifiers & MemberAttributes.Family) != 0) {
-				method.Accessibility = Accessibility.Protected;
-			}
-			else if ((modifiers & MemberAttributes.Assembly) != 0) {
-				method.Accessibility = Accessibility.Internal;
-			}
-			else if ((modifiers & MemberAttributes.Public) != 0) {
-				method.Accessibility = Accessibility.Public;
-			}
-			else  if ((modifiers & MemberAttributes.Private) != 0) {
-				method.Accessibility = Accessibility.Private;
-			}
-			
-			if ((modifiers & MemberAttributes.Abstract) != 0) {
-				method.IsAbstract = true;
-			}
-			else if ((modifiers & MemberAttributes.Final) != 0) {
-				method.IsSealed = true;
-			}
-			else if ((modifiers & MemberAttributes.Static) != 0) {
-				method.IsStatic = true;
-			}
-			else if ((modifiers & MemberAttributes.Override) != 0) {
-				method.IsOverride = true;
-			}
-//			else if ((modifiers & MemberAttributes.Const) != 0) { // methods are never const.
-//				initialState = (initialState & ~ScopeMask) | Modifiers.Const;
+//		static void CodeDomModifiersToMDDom (DefaultUnresolvedMethod method, MemberAttributes modifiers)
+//		{
+//			if ((modifiers & MemberAttributes.FamilyOrAssembly) != 0) {
+//				method.Accessibility = Accessibility.ProtectedOrInternal;
 //			}
-		}
+//			else if ((modifiers & MemberAttributes.FamilyOrAssembly) != 0) {
+//				method.Accessibility = Accessibility.ProtectedAndInternal;
+//			}
+//			else if ((modifiers & MemberAttributes.Family) != 0) {
+//				method.Accessibility = Accessibility.Protected;
+//			}
+//			else if ((modifiers & MemberAttributes.Assembly) != 0) {
+//				method.Accessibility = Accessibility.Internal;
+//			}
+//			else if ((modifiers & MemberAttributes.Public) != 0) {
+//				method.Accessibility = Accessibility.Public;
+//			}
+//			else  if ((modifiers & MemberAttributes.Private) != 0) {
+//				method.Accessibility = Accessibility.Private;
+//			}
+//			
+//			if ((modifiers & MemberAttributes.Abstract) != 0) {
+//				method.IsAbstract = true;
+//			}
+//			else if ((modifiers & MemberAttributes.Final) != 0) {
+//				method.IsSealed = true;
+//			}
+//			else if ((modifiers & MemberAttributes.Static) != 0) {
+//				method.IsStatic = true;
+//			}
+//			else if ((modifiers & MemberAttributes.Override) != 0) {
+//				method.IsOverride = true;
+//			}
+////			else if ((modifiers & MemberAttributes.Const) != 0) { // methods are never const.
+////				initialState = (initialState & ~ScopeMask) | Modifiers.Const;
+////			}
+//		}
 		
-		static MemberAttributes ApplyMDDomModifiersToCodeDom (IEntity entity, MemberAttributes initialState)
+		static MemberAttributes ApplyMDDomModifiersToCodeDom (ISymbol entity, MemberAttributes initialState)
 		{
-			switch (entity.Accessibility) {
+			switch (entity.DeclaredAccessibility) {
 			case Accessibility.ProtectedOrInternal:
 				initialState = (initialState & ~MemberAttributes.AccessMask) | MemberAttributes.FamilyOrAssembly;
 				break;
@@ -429,11 +429,11 @@ namespace MonoDevelop.DesignerSupport
 			else if (entity.IsStatic) {
 				initialState = (initialState & ~MemberAttributes.ScopeMask) | MemberAttributes.Static;
 			}
-			else if (entity.IsShadowing) {
+			else if (entity.IsOverride) {
 				initialState = (initialState & ~MemberAttributes.ScopeMask) | MemberAttributes.Override;
 			}
-			if (entity is IField) {
-				var f = (IField)entity;
+			if (entity is IFieldSymbol) {
+				var f = (IFieldSymbol)entity;
 				if (f.IsReadOnly && f.IsStatic)
 					initialState = (initialState & ~MemberAttributes.ScopeMask) | MemberAttributes.Const;
 			}
@@ -442,19 +442,19 @@ namespace MonoDevelop.DesignerSupport
 		}
 		
 		
-		public static System.CodeDom.CodeMemberMethod MDDomToCodeDomMethod (IMethod mi)
+		public static System.CodeDom.CodeMemberMethod MDDomToCodeDomMethod (IMethodSymbol mi)
 		{
 			CodeMemberMethod newMethod = new CodeMemberMethod ();
 			newMethod.Name = mi.Name;
-			string returnType = mi.ReturnType.ReflectionName ?? "System.Void";
+			string returnType = mi.ReturnType.GetFullMetadataName () ?? "System.Void";
 			newMethod.ReturnType = new System.CodeDom.CodeTypeReference (returnType);
 			newMethod.Attributes = ApplyMDDomModifiersToCodeDom (mi, newMethod.Attributes);
 			
-			foreach (IParameter p in mi.Parameters) {
+			foreach (IParameterSymbol p in mi.Parameters) {
 				var newPar = new CodeParameterDeclarationExpression (returnType, p.Name);
-				if (p.IsRef)
+				if (p.RefKind == RefKind.Ref)
 					newPar.Direction = FieldDirection.Ref;
-				else if (p.IsOut)
+				else if (p.RefKind == RefKind.Out)
 					newPar.Direction = FieldDirection.Out;
 				else
 					newPar.Direction = FieldDirection.In;
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs
deleted file mode 100755
index c6bc863697..0000000000
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-//
-// ClassOutlineNodeComparer.cs
-//
-// Authors:
-//  Helmut Duregger <helmutduregger@gmx.at>
-//
-// Copyright (c) 2010 Helmut Duregger
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-
-using Gtk;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace MonoDevelop.DesignerSupport
-{
-	/// <remarks>
-	/// This implementation uses a primary sort key (int based on node's group) and
-	/// a secondary sort key (string based on node's name) for comparison.
-	/// </remarks>
-	/// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineSettings"/>
-	class ClassOutlineNodeComparer : IComparer<TreeIter>
-	{
-		const string DEFAULT_REGION_NAME = "region";
-		
-		Ambience ambience;
-		TreeModel model;
-		ClassOutlineSettings settings;
-		int[] groupTable;
-
-		/// <param name="ambience">
-		/// The ambience used on retrieval of node names.
-		/// </param>
-		/// <param name="settings">
-		/// The properties used on retrieval of node sort keys and sorting settings.
-		/// </param>
-		/// <param name="model">
-		/// The model containing the nodes to compare.
-		/// </param>
-		public ClassOutlineNodeComparer (Ambience ambience, ClassOutlineSettings settings, TreeModel model)
-		{
-			this.ambience = ambience;
-			this.settings = settings;
-			this.model = model;
-			BuildGroupTable ();
-		}
-
-		public int Compare (TreeIter a, TreeIter b)
-		{
-			return CompareNodes (model, a, b);
-		}
-
-		/// <summary>
-		/// Compares nodes by primary (group) and secondary (name) sort keys depending on
-		/// sort properties.
-		/// </summary>
-		/// <remarks>
-		/// For methods, constructors and destructors are sorted at the top.
-		/// </remarks>
-		/// <param name="model">
-		/// The TreeModel that the iterators refer to.
-		/// </param>
-		/// <param name="node1">
-		/// The first tree node that will be compared.
-		/// </param>
-		/// <param name="node2">
-		/// The second tree node that will be compared.
-		/// </param>
-		/// <returns>
-		/// Less than zero if nodeA &lt; nodeB
-		/// Zero if nodeA == nodeB.
-		/// Greater than zero if nodeA &gt; nodeB.
-		/// </returns>
-		public int CompareNodes (TreeModel model, TreeIter node1, TreeIter node2)
-		{
-			object o1 = model.GetValue (node1, 0);
-			object o2 = model.GetValue (node2, 0);
-			if (o1 == null) {
-				return o2 == null? 0 : 1;
-			} else if (o2 == null) {
-				return -1;
-			}
-			
-			if (settings.IsGrouped) {
-				int groupOrder = GetGroupPriority (o1) - GetGroupPriority (o2);
-				if (groupOrder != 0)
-					return groupOrder;
-				
-				IMethod m1 = o1 as IMethod;
-				if (m1 != null)
-					return CompareMethods (m1, (IMethod)o2, settings.IsSorted);
-			}
-			
-			if (settings.IsSorted)
-				return CompareName (o1, o2);
-			
-			return CompareRegion (o1, o2);
-		}
-
-		int CompareName (object o1, object o2)
-		{
-			var sort = string.Compare (
-				GetSortName (o1),
-				GetSortName (o2),
-				System.Globalization.CultureInfo.CurrentCulture,
-				System.Globalization.CompareOptions.IgnoreSymbols);
-			if (sort == 0)
-				return CompareRegion (o1, o2);
-			return sort;
-		}
-
-		int CompareMethods (IMethod m1, IMethod m2, bool isSortingAlphabetically)
-		{
-			// Here we sort constructors before finalizers before other methods.
-			// Remember that two constructors have the same name.
-
-			// Sort constructors at top.
-			
-			bool isCtor1 = m1.IsConstructor;
-			bool isCtor2 = m2.IsConstructor;
-
-			if (isCtor1) {
-				if (isCtor2)
-					return CompareRegion (m1, m2);
-				else
-					return -1;
-			} else if (isCtor2) {
-				return 1;
-			}
-			
-			// Sort finalizers after constructors.
-			//
-			// Sorting two finalizers even though this is not valid C#. This gives a correct
-			// outline during editing.
-			
-			bool isFinalizer1 = IsFinalizer (m1);
-			bool isFinalizer2 = IsFinalizer (m2);
-			
-			if (isFinalizer1) {
-				if (isFinalizer2)
-					return CompareRegion (m1, m2);
-				else
-					return -1;
-			} else if (isFinalizer2) {
-				return 1;
-			}
-			
-			if (isSortingAlphabetically)
-				return CompareName (m1, m2);
-			else
-				return CompareRegion (m1, m2);
-		}
-
-		bool IsConstructor (object node)
-		{
-			if (node is IMethod) {
-				return ((IMethod) node).IsConstructor;
-			}
-
-			return false;
-		}
-
-		bool IsFinalizer (object node)
-		{
-			if (node is IMethod) {
-				return ((IMethod) node).IsDestructor;
-			}
-
-			return false;
-		}
-		
-		const int GROUP_INDEX_REGIONS = 0;
-		const int GROUP_INDEX_NAMESPACES = 1;
-		const int GROUP_INDEX_TYPES = 2;
-		const int GROUP_INDEX_FIELDS = 3;
-		const int GROUP_INDEX_PROPERTIES = 4;
-		const int GROUP_INDEX_EVENTS = 5;
-		const int GROUP_INDEX_METHODS = 6;
-		
-		void BuildGroupTable ()
-		{
-			groupTable = new int[7];
-			int i = -10;
-			foreach (var g in settings.GroupOrder) {
-				switch (g) {
-				case ClassOutlineSettings.GroupRegions:
-					groupTable[GROUP_INDEX_REGIONS] = i++;
-					break;
-				case ClassOutlineSettings.GroupNamespaces:
-					groupTable[GROUP_INDEX_NAMESPACES] = i++;
-					break;
-				case ClassOutlineSettings.GroupTypes:
-					groupTable[GROUP_INDEX_TYPES] = i++;
-					break;
-				case ClassOutlineSettings.GroupFields:
-					groupTable[GROUP_INDEX_FIELDS] = i++;
-					break;
-				case ClassOutlineSettings.GroupProperties:
-					groupTable[GROUP_INDEX_PROPERTIES] = i++;
-					break;
-				case ClassOutlineSettings.GroupEvents:
-					groupTable[GROUP_INDEX_EVENTS] = i++;
-					break;
-				case ClassOutlineSettings.GroupMethods:
-					groupTable[GROUP_INDEX_METHODS] = i++;
-					break;
-				}
-			}
-		}
-
-		int GetGroupPriority (object node)
-		{
-			if (node is FoldingRegion)
-				return groupTable[GROUP_INDEX_REGIONS];
-			if (node is string)
-				return groupTable[GROUP_INDEX_NAMESPACES];
-			if (node is IType)
-				return groupTable[GROUP_INDEX_TYPES];
-			if (node is IField)
-				return groupTable[GROUP_INDEX_FIELDS];
-			if (node is IProperty)
-				return groupTable[GROUP_INDEX_PROPERTIES];
-			if (node is IEvent)
-				return groupTable[GROUP_INDEX_EVENTS];
-			if (node is IMethod)
-				return groupTable[GROUP_INDEX_METHODS];
-			return 0;
-		}
-
-		/// <summary>
-		/// Returns the name of the node that should be used as a secondary sort key.
-		/// </summary>
-		/// <param name="node">
-		/// A node in the tree. Expected to be either an IMember or a FoldingRegion.
-		/// </param>
-		/// <returns>
-		/// A string representing the secondary sort key.
-		/// The empty string if node is neither an IMember nor a FoldingRegion.
-		/// </returns>
-		string GetSortName (object node)
-		{
-			if (node is IEntity) {
-				// Return the name without type or parameters
-				return ambience.GetString ((IEntity)node, 0);
-			}
-		
-			if (node is FoldingRegion) {
-				// Return trimmed region name or fallback
-				string name = ((FoldingRegion)node).Name.Trim ();
-				
-				// ClassOutlineTextEditorExtension uses a fallback name for regions
-				// so we do the same here with a slighty different name.
-				if (name.Length == 0)
-					name = DEFAULT_REGION_NAME;
-				
-				return name;
-			}
-			
-			return string.Empty;
-		}
-		
-		internal static DomRegion GetRegion (object o)
-		{
-			var m = o as IEntity;
-			if (m != null)
-				return m.BodyRegion.IsEmpty ? m.Region : m.BodyRegion;
-			var m2 = o as IUnresolvedEntity;
-			if (m2 != null)
-				return m2.BodyRegion.IsEmpty ? m2.Region : m2.BodyRegion;
-			if (o is FoldingRegion)
-				return ((FoldingRegion)o).Region;
-			return DomRegion.Empty;
-		}
-		
-		internal static int CompareRegion (object o1, object o2)
-		{
-			return GetRegion (o1).Begin.CompareTo (GetRegion (o2).Begin);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSettings.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSettings.cs
deleted file mode 100644
index f928255b7e..0000000000
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSettings.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// ClassOutlineSortingProperties.cs
-//
-// Authors:
-//  Helmut Duregger <helmutduregger@gmx.at>
-//
-// Copyright (c) 2010 Helmut Duregger
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Xml.Serialization;
-using System.Linq;
-
-using MonoDevelop.Core;
-
-namespace MonoDevelop.DesignerSupport
-{
-	/// <summary>
-	/// Stores sorting status and is serialized to configuration properties.
-	/// </summary>
-	/// <remarks>
-	/// Stores the sorting configuration, e.g. if the class outline is currently sorted
-	/// or what primary sort key values the individual node groups have. This class is
-	/// serialized to the configuration file MonoDevelopProperties.xml.
-	/// </remarks>
-	/// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineTextEditorExtension"/>
-	class ClassOutlineSettings
-	{
-		const string KEY_GROUP_ORDER = "MonoDevelop.DesignerSupport.ClassOutline.GroupOrder";
-		const string KEY_IS_GROUPED = "MonoDevelop.DesignerSupport.ClassOutline.IsGrouped";
-		const string KEY_IS_SORTED  = "MonoDevelop.DesignerSupport.ClassOutline.IsSorted";
-		
-		public const string GroupRegions = "Regions";
-		public const string GroupNamespaces = "Namespaces";
-		public const string GroupTypes = "Types";
-		public const string GroupFields = "Fields";
-		public const string GroupProperties = "Properties";
-		public const string GroupEvents = "Events";
-		public const string GroupMethods = "Methods";
-		
-		static Dictionary<string,string> groupNames = new Dictionary<string, string> {
-			{ GroupRegions,    GettextCatalog.GetString ("Regions") },
-			{ GroupNamespaces, GettextCatalog.GetString ("Namespaces") },
-			{ GroupTypes,      GettextCatalog.GetString ("Types") },
-			{ GroupProperties, GettextCatalog.GetString ("Properties") },
-			{ GroupFields,     GettextCatalog.GetString ("Fields") },
-			{ GroupEvents,     GettextCatalog.GetString ("Events") },
-			{ GroupMethods,    GettextCatalog.GetString ("Methods") },
-		};
-		
-		ClassOutlineSettings ()
-		{
-		}
-		
-		public static ClassOutlineSettings Load ()
-		{
-			var cs = new ClassOutlineSettings ();
-			cs.IsGrouped = PropertyService.Get (KEY_IS_GROUPED, false);
-			cs.IsSorted = PropertyService.Get (KEY_IS_SORTED, false);
-			
-			string s = PropertyService.Get (KEY_GROUP_ORDER, "");
-			if (s.Length == 0) {
-				cs.GroupOrder = groupNames.Keys.ToArray ();
-			} else {
-				cs.GroupOrder = s.Split (new char[] {','}, StringSplitOptions.RemoveEmptyEntries);
-			}
-			return cs;
-		}
-		
-		public void Save ()
-		{
-			PropertyService.Set (KEY_IS_GROUPED, IsGrouped);
-			PropertyService.Set (KEY_IS_SORTED, IsSorted);
-			PropertyService.Set (KEY_GROUP_ORDER, string.Join (",", GroupOrder));
-		}
-		
-		public static string GetGroupName (string group)
-		{
-			return groupNames [group];
-		}
-		
-		public IList<string> GroupOrder { get; set; }
-		public bool IsGrouped { get; set; }
-		public bool IsSorted { get; set; }
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSortingPreferencesDialog.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSortingPreferencesDialog.cs
deleted file mode 100644
index 170e1d7929..0000000000
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineSortingPreferencesDialog.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// SortingPreferencesDialog.cs
-//
-// Authors:
-//  Helmut Duregger <helmutduregger@gmx.at>
-//
-// Copyright (c) 2011 Helmut Duregger
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Gtk;
-
-using MonoDevelop.Core;
-
-
-namespace MonoDevelop.DesignerSupport
-{
-	/// <summary>
-	/// Provides a priority list of the groups that items in the class outline can be grouped in.
-	/// </summary>
-	/// <remarks>
-	/// The user can sort the list with button presses and thereby change the order of groups
-	/// in the outline, while grouping is active.
-	/// </remarks>
-	partial class ClassOutlineSortingPreferencesDialog : Dialog
-	{
-		ClassOutlineSettings settings;
-		
-		public ClassOutlineSortingPreferencesDialog (ClassOutlineSettings settings)
-		{
-			this.Build ();
-
-			priorityList.Model = new ListStore (typeof (string), typeof (string));
-			priorityList.AppendColumn ("", new CellRendererText (), "text", 1);
-			
-			priorityList.Model.Clear ();
-			foreach (string g in settings.GroupOrder) {
-				priorityList.Model.AppendValues (g, ClassOutlineSettings.GetGroupName (g));
-			}
-			
-			this.settings = settings;
-		}
-		
-		public void SaveSettings ()
-		{
-			TreeIter iter;
-			if (priorityList.Model.GetIterFirst (out iter)) {
-				var order = new List<string> ();
-				do {
-					order.Add ((string) priorityList.Model.GetValue (iter, 0));
-				} while (priorityList.Model.IterNext (ref iter));
-				settings.GroupOrder = order; 
-			}
-			settings.Save ();
-		}
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs
deleted file mode 100644
index 1956f5b4f8..0000000000
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs
+++ /dev/null
@@ -1,443 +0,0 @@
-//
-// ClassOutlineTextEditorExtension.cs
-//
-// Author:
-//   Michael Hutchinson <mhutchinson@novell.com>
-//
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using Gtk;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide;
-using MonoDevelop.Components;
-using MonoDevelop.Components.Docking;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.DesignerSupport
-{
-	/// <summary>
-	/// Displays a types and members outline of the current document.
-	/// </summary>
-	/// <remarks>
-	/// Document types and members are displayed in a tree view.
-	/// The displayed nodes can be sorted by changing the sorting properties state.
-	/// The sort behaviour is serialized into MonoDevelopProperties.xml.
-	/// Nodes with lower sortKey value will be sorted before nodes with higher value.
-	/// Nodes with equal sortKey will be sorted by string comparison of the name of the nodes.
-	/// The string comparison ignores symbols (e.g. sort 'Foo()' next to '~Foo()').
-	/// </remarks>
-	/// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineNodeComparer"/>
-	/// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineSettings"/>
-	public class ClassOutlineTextEditorExtension : TextEditorExtension, IOutlinedDocument
-	{
-		ParsedDocument lastCU = null;
-
-		MonoDevelop.Ide.Gui.Components.PadTreeView outlineTreeView;
-		TreeStore outlineTreeStore;
-		TreeModelSort outlineTreeModelSort;
-		Widget[] toolbarWidgets;
-
-		ClassOutlineNodeComparer comparer;
-		ClassOutlineSettings settings;
-
-		bool refreshingOutline;
-		bool disposed;
-		bool outlineReady;
-
-		public override bool ExtendsEditor (Document doc, IEditableTextBuffer editor)
-		{
-			var binding = LanguageBindingService.GetBindingPerFileName (doc.Name);
-			return binding != null && binding is IDotNetLanguageBinding;
-		}
-
-		public override void Initialize ()
-		{
-			base.Initialize ();
-			if (Document != null)
-				Document.DocumentParsed += UpdateDocumentOutline;
-		}
-
-		public override void Dispose ()
-		{
-			if (disposed)
-				return;
-			disposed = true;
-			if (Document != null)
-				Document.DocumentParsed -= UpdateDocumentOutline;
-			RemoveRefillOutlineStoreTimeout ();
-			lastCU = null;
-			settings = null;
-			comparer = null;
-			base.Dispose ();
-		}
-
-		Widget MonoDevelop.DesignerSupport.IOutlinedDocument.GetOutlineWidget ()
-		{
-			if (outlineTreeView != null)
-				return outlineTreeView;
-
-			outlineTreeStore = new TreeStore (typeof(object));
-			outlineTreeModelSort = new TreeModelSort (outlineTreeStore);
-			
-			settings = ClassOutlineSettings.Load ();
-			comparer = new ClassOutlineNodeComparer (GetAmbience (), settings, outlineTreeModelSort);
-
-			outlineTreeModelSort.SetSortFunc (0, comparer.CompareNodes);
-			outlineTreeModelSort.SetSortColumnId (0, SortType.Ascending);
-
-			outlineTreeView = new MonoDevelop.Ide.Gui.Components.PadTreeView (outlineTreeStore);
-
-			var pixRenderer = new CellRendererImage ();
-			pixRenderer.Xpad = 0;
-			pixRenderer.Ypad = 0;
-
-			outlineTreeView.TextRenderer.Xpad = 0;
-			outlineTreeView.TextRenderer.Ypad = 0;
-
-			TreeViewColumn treeCol = new TreeViewColumn ();
-			treeCol.PackStart (pixRenderer, false);
-
-			treeCol.SetCellDataFunc (pixRenderer, new TreeCellDataFunc (OutlineTreeIconFunc));
-			treeCol.PackStart (outlineTreeView.TextRenderer, true);
-
-			treeCol.SetCellDataFunc (outlineTreeView.TextRenderer, new TreeCellDataFunc (OutlineTreeTextFunc));
-			outlineTreeView.AppendColumn (treeCol);
-
-			outlineTreeView.HeadersVisible = false;
-
-			outlineTreeView.Selection.Changed += delegate {
-				JumpToDeclaration (false);
-			};
-			
-			outlineTreeView.RowActivated += delegate {
-				JumpToDeclaration (true);
-			};
-
-			this.lastCU = Document.ParsedDocument;
-
-			outlineTreeView.Realized += delegate { RefillOutlineStore (); };
-			UpdateSorting ();
-
-			var sw = new CompactScrolledWindow ();
-			sw.Add (outlineTreeView);
-			sw.ShowAll ();
-			return sw;
-		}
-		
-		IEnumerable<Widget> MonoDevelop.DesignerSupport.IOutlinedDocument.GetToolbarWidgets ()
-		{
-			if (toolbarWidgets != null)
-				return toolbarWidgets;
-			
-			var groupToggleButton = new ToggleButton () {
-				Image = new Image (Ide.Gui.Stock.GroupByCategory, IconSize.Menu),
-				TooltipText = GettextCatalog.GetString ("Group entries by type"),
-				Active = settings.IsGrouped,
-			};	
-			groupToggleButton.Toggled += delegate {
-				if (groupToggleButton.Active == settings.IsGrouped)
-					return;
-				settings.IsGrouped = groupToggleButton.Active;
-				UpdateSorting ();
-			};
-
-			var sortAlphabeticallyToggleButton = new ToggleButton () {
-				Image = new Image (Ide.Gui.Stock.SortAlphabetically, IconSize.Menu),
-				TooltipText = GettextCatalog.GetString ("Sort entries alphabetically"),
-				Active = settings.IsSorted,
-			};	
-			sortAlphabeticallyToggleButton.Toggled += delegate {
-				if (sortAlphabeticallyToggleButton.Active == settings.IsSorted)
-					return;
-				settings.IsSorted = sortAlphabeticallyToggleButton.Active;
-				UpdateSorting ();
-			};
-
-			var preferencesButton = new DockToolButton (Ide.Gui.Stock.Options) {
-				TooltipText = GettextCatalog.GetString ("Open preferences dialog"),
-			};
-			preferencesButton.Clicked += delegate {
-				using (var dialog = new ClassOutlineSortingPreferencesDialog (settings)) {
-					if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog) == (int)Gtk.ResponseType.Ok) {
-						dialog.SaveSettings ();
-						comparer = new ClassOutlineNodeComparer (GetAmbience (), settings, outlineTreeModelSort);
-						UpdateSorting ();
-					}
-				}
-			};
-			
-			return toolbarWidgets = new Widget[] {
-				groupToggleButton,
-				sortAlphabeticallyToggleButton,
-				new VSeparator (),
-				preferencesButton,
-			};
-		}
-		
-		void JumpToDeclaration (bool focusEditor)
-		{
-			if (!outlineReady)
-				return;
-			TreeIter iter;
-			if (!outlineTreeView.Selection.GetSelected (out iter))
-				return;
-
-			object o;
-
-			if (IsSorting ()) {
-				o = outlineTreeStore.GetValue (outlineTreeModelSort.ConvertIterToChildIter (iter), 0);
-			}
-			else {
-				o = outlineTreeStore.GetValue (iter, 0);
-			}
-				
-			IdeApp.ProjectOperations.JumpToDeclaration (o as IEntity);
-			if (focusEditor)
-				IdeApp.Workbench.ActiveDocument.Select ();
-		}
-
-		void OutlineTreeIconFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
-		{
-			var pixRenderer = (CellRendererImage)cell;
-			object o = model.GetValue (iter, 0);
-			if (o is IEntity) {
-				pixRenderer.Image = ImageService.GetIcon (((IEntity)o).GetStockIcon (), IconSize.Menu);
-			} else if (o is FoldingRegion) {
-				pixRenderer.Image = ImageService.GetIcon (Ide.Gui.Stock.Add, IconSize.Menu);
-			}
-		}
-
-		void OutlineTreeTextFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
-		{
-			CellRendererText txtRenderer = (CellRendererText)cell;
-			object o = model.GetValue (iter, 0);
-			Ambience am = GetAmbience ();
-			if (o is IEntity) {
-				txtRenderer.Text = am.GetString ((IEntity)o, OutputFlags.ClassBrowserEntries);
-			} else if (o is FoldingRegion) {
-				string name = ((FoldingRegion)o).Name.Trim ();
-				if (string.IsNullOrEmpty (name))
-					name = "#region";
-				txtRenderer.Text = name;
-			}
-		}
-
-		void MonoDevelop.DesignerSupport.IOutlinedDocument.ReleaseOutlineWidget ()
-		{
-			if (outlineTreeView == null)
-				return;
-			var w = (ScrolledWindow)outlineTreeView.Parent;
-			w.Destroy ();
-			if (outlineTreeModelSort != null) {
-				outlineTreeModelSort.Dispose ();
-				outlineTreeModelSort = null;
-			}
-			if (outlineTreeStore != null) {
-				outlineTreeStore.Dispose ();
-				outlineTreeStore = null;
-			}
-			outlineTreeView = null;
-			settings = null;
-			foreach (var tw in toolbarWidgets)
-				tw.Destroy ();
-			toolbarWidgets = null;
-			comparer = null;
-		}
-
-		void RemoveRefillOutlineStoreTimeout ()
-		{
-			if (refillOutlineStoreId == 0)
-				return;
-			GLib.Source.Remove (refillOutlineStoreId);
-			refillOutlineStoreId = 0;
-		}
-
-		uint refillOutlineStoreId;
-		void UpdateDocumentOutline (object sender, EventArgs args)
-		{
-			lastCU = Document.ParsedDocument;
-			//limit update rate to 3s
-			if (!refreshingOutline) {
-				refreshingOutline = true;
-				refillOutlineStoreId = GLib.Timeout.Add (3000, RefillOutlineStore);
-			}
-		}
-
-		bool RefillOutlineStore ()
-		{
-			DispatchService.AssertGuiThread ();
-			Gdk.Threads.Enter ();
-			refreshingOutline = false;
-			if (outlineTreeStore == null || !outlineTreeView.IsRealized) {
-				refillOutlineStoreId = 0;
-				return false;
-			}
-			
-			outlineReady = false;
-			outlineTreeStore.Clear ();
-			if (lastCU != null) {
-				BuildTreeChildren (outlineTreeStore, TreeIter.Zero, lastCU);
-				TreeIter it;
-				if (IsSorting ()) {
-					if (outlineTreeModelSort.GetIterFirst (out it))
-						outlineTreeView.Selection.SelectIter (it);
-				} else {
-					if (outlineTreeStore.GetIterFirst (out it))
-						outlineTreeView.Selection.SelectIter (it);
-				}
-
-				outlineTreeView.ExpandAll ();
-			}
-			outlineReady = true;
-
-			Gdk.Threads.Leave ();
-
-			//stop timeout handler
-			refillOutlineStoreId = 0;
-			return false;
-		}
-
-		void BuildTreeChildren (TreeStore store, TreeIter parent, ParsedDocument parsedDocument)
-		{
-			if (parsedDocument == null)
-				return;
-			
-			foreach (var unresolvedCls in parsedDocument.TopLevelTypeDefinitions) {
-				var cls = document.Compilation.MainAssembly.GetTypeDefinition (unresolvedCls.FullTypeName);
-				if (cls == null)
-					continue;
-				TreeIter childIter;
-				if (!parent.Equals (TreeIter.Zero))
-					childIter = store.AppendValues (parent, cls);
-				else
-					childIter = store.AppendValues (cls);
-
-				AddTreeClassContents (store, childIter, parsedDocument, cls, unresolvedCls);
-			}
-		}
-
-		static void AddTreeClassContents (TreeStore store, TreeIter parent, ParsedDocument parsedDocument, ITypeDefinition cls, IUnresolvedTypeDefinition part)
-		{
-			List<object> items = new List<object> ();
-			if (cls.Kind != TypeKind.Delegate) {
-				foreach (var o in cls.GetMembers (m => part.Region.FileName == m.Region.FileName && part.Region.IsInside (m.Region.Begin))) {
-					items.Add (o);
-				}
-				foreach (var o in cls.GetNestedTypes (m => part.Region.FileName == m.Region.FileName && part.Region.IsInside (m.Region.Begin))) {
-					if (o.DeclaringType == cls)
-						items.Add (o);
-				}
-				foreach (var o in cls.GetConstructors (m => part.Region.FileName == m.Region.FileName && part.Region.IsInside (m.Region.Begin))) {
-					if (o.IsSynthetic)
-						continue;
-					items.Add (o);
-				}
-			}
-			items.Sort (ClassOutlineNodeComparer.CompareRegion);
-			List<FoldingRegion> regions = new List<FoldingRegion> ();
-			foreach (FoldingRegion fr in parsedDocument.UserRegions)
-				//check regions inside class
-				if (cls.BodyRegion.IsInside (fr.Region.Begin) && cls.BodyRegion.IsInside (fr.Region.End))
-					regions.Add (fr);
-			regions.Sort (delegate(FoldingRegion x, FoldingRegion y) { return x.Region.Begin.CompareTo (y.Region.Begin); });
-			 
-			IEnumerator<FoldingRegion> regionEnumerator = regions.GetEnumerator ();
-			if (!regionEnumerator.MoveNext ())
-				regionEnumerator = null;
-			
-			FoldingRegion currentRegion = null;
-			TreeIter currentParent = parent;
-			foreach (object item in items) {
-
-				//no regions left; quick exit
-				if (regionEnumerator != null) {
-					DomRegion itemRegion = ClassOutlineNodeComparer.GetRegion (item);
-
-					//advance to a region that could potentially contain this member
-					while (regionEnumerator != null && !OuterEndsAfterInner (regionEnumerator.Current.Region, itemRegion))
-						if (!regionEnumerator.MoveNext ())
-							regionEnumerator = null;
-
-					//if member is within region, make sure it's the current parent.
-					//If not, move target iter back to class parent
-					if (regionEnumerator != null && regionEnumerator.Current.Region.IsInside (itemRegion.Begin)) {
-						if (currentRegion != regionEnumerator.Current) {
-							currentParent = store.AppendValues (parent, regionEnumerator.Current);
-							currentRegion = regionEnumerator.Current;
-						}
-					} else {
-						currentParent = parent;
-					}
-				}
-				
-				TreeIter childIter = store.AppendValues (currentParent, item);
-				if (item is ITypeDefinition)
-					AddTreeClassContents (store, childIter, parsedDocument, (ITypeDefinition)item, part);
-					
-			} 
-		}
-
-		static DomRegion GetRegion (object o)
-		{
-			if (o is IEntity) {
-				var m = (IEntity)o;
-				return m.Region; //m.BodyRegion.IsEmpty ? new DomRegion (m.Location, m.Location) : m.BodyRegion;
-			}
-			throw new InvalidOperationException (o.GetType ().ToString ());
-		}
-
-		static bool OuterEndsAfterInner (DomRegion outer, DomRegion inner)
-		{
-			return ((outer.End.Line > 1 && outer.End.Line > inner.End.Line)
-				|| (outer.End.Line == inner.End.Line && outer.End.Column > inner.End.Column));
-		}
-
-		void UpdateSorting ()
-		{
-			if (IsSorting ()) {
-				// Sort the model, sort keys may have changed.
-				// Only setting the column again does not re-sort so we set the function instead.
-				outlineTreeModelSort.SetSortFunc (0, comparer.CompareNodes);
-				outlineTreeView.Model = outlineTreeModelSort;
-			} else {
-				outlineTreeView.Model = outlineTreeStore;
-			}
-
-			// Because sorting the tree by setting the sort function also collapses the tree view we expand
-			// the whole tree.
-			outlineTreeView.ExpandAll ();
-		}
-
-		bool IsSorting ()
-		{
-			return settings.IsGrouped || settings.IsSorted;
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehind.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehind.cs
index 7ab9a0288d..02e18d5ef7 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehind.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehind.cs
@@ -29,10 +29,11 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Globalization;
 
+using Microsoft.CodeAnalysis;
 using MonoDevelop.Projects;
-using System.Globalization;
-using ICSharpCode.NRefactory.TypeSystem;
+using System.Linq;
 
 namespace MonoDevelop.DesignerSupport
 {
@@ -102,30 +103,32 @@ namespace MonoDevelop.DesignerSupport
 			return null;
 		}
 		
-		public static IUnresolvedTypeDefinition GetDesignerClass (IType cls)
-		{
-			if (cls.GetDefinition ().Parts.Count == 1)
-				return null;
-			
-			string designerEnding = ".designer" + Path.GetExtension (cls.GetDefinition ().Region.FileName);
-			
-			foreach (var c in cls.GetDefinition ().Parts)
-				if (c.Region.FileName.EndsWith (designerEnding, StringComparison.OrdinalIgnoreCase))
-				    return c;
-			
-			return null;
-		}
-		
-		public static IUnresolvedTypeDefinition GetNonDesignerClass (IType cls)
+//		public static IUnresolvedTypeDefinition GetDesignerClass (IType cls)
+//		{
+//			if (cls.GetDefinition ().Parts.Count == 1)
+//				return null;
+//			
+//			string designerEnding = ".designer" + Path.GetExtension (cls.GetDefinition ().Region.FileName);
+//			
+//			foreach (var c in cls.GetDefinition ().Parts)
+//				if (c.Region.FileName.EndsWith (designerEnding, StringComparison.OrdinalIgnoreCase))
+//				    return c;
+//			
+//			return null;
+//		}
+
+		public static Location GetNonDesignerClassLocation (ITypeSymbol cls)
 		{
-			if (cls.GetDefinition ().Parts.Count == 1)
+			if (cls.Locations.Length == 1)
 				return null;
+
+			var foo = cls.ContainingType;
 			
-			string designerEnding = ".designer" + Path.GetExtension (cls.GetDefinition ().Region.FileName);
+			string designerEnding = ".designer" + Path.GetExtension (cls.Locations.First ().SourceTree.FilePath);
 			
-			foreach (var c in cls.GetDefinition ().Parts)
-				if (!c.Region.FileName.EndsWith (designerEnding, StringComparison.OrdinalIgnoreCase))
-				    return c;
+			foreach (var location in cls.Locations)
+				if (!location.SourceTree.FilePath.EndsWith (designerEnding, StringComparison.OrdinalIgnoreCase))
+					return location;
 			
 			return null;
 		}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindWriter.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindWriter.cs
index 44d2c1bc8f..3f8fbdeb1c 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindWriter.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindWriter.cs
@@ -44,7 +44,7 @@ namespace MonoDevelop.DesignerSupport
 		List<KeyValuePair<FilePath,string>> filesToWrite = new List<KeyValuePair<FilePath,string>> ();
 		CodeDomProvider provider;
 		CodeGeneratorOptions options;
-		IProgressMonitor monitor;
+		ProgressMonitor monitor;
 		
 		public CodeDomProvider Provider { get { return provider; } }
 		public CodeGeneratorOptions GeneratorOptions { get { return options; } }
@@ -59,14 +59,14 @@ namespace MonoDevelop.DesignerSupport
 		{
 		}
 		
-		CodeBehindWriter (IProgressMonitor monitor, CodeDomProvider provider, CodeGeneratorOptions options)
+		CodeBehindWriter (ProgressMonitor monitor, CodeDomProvider provider, CodeGeneratorOptions options)
 		{
 			this.provider = provider;
 			this.options = options;
 			this.monitor = monitor;
 		}
 		
-		public static CodeBehindWriter CreateForProject (IProgressMonitor monitor, DotNetProject project)
+		public static CodeBehindWriter CreateForProject (ProgressMonitor monitor, DotNetProject project)
 		{
 			var pol = project.Policies.Get<TextStylePolicy> ();
 			var options = new CodeGeneratorOptions () {
@@ -84,11 +84,11 @@ namespace MonoDevelop.DesignerSupport
 					openFiles = new List<string> ();
 					if (!IdeApp.IsInitialized)
 						return openFiles;
-					DispatchService.GuiSyncDispatch (delegate {
+					Runtime.RunInMainThread (delegate {
 						foreach (var doc in IdeApp.Workbench.Documents)
-						if (doc.GetContent<IEditableTextBuffer> () != null)
-							openFiles.Add (doc.FileName);
-					});
+							if (doc.Editor != null)
+								openFiles.Add (doc.FileName);
+					}).Wait ();
 				}
 				return openFiles;
 			}
@@ -116,9 +116,15 @@ namespace MonoDevelop.DesignerSupport
 				});
 				WrittenCount++;
 			} catch (IOException ex) {
-				monitor.ReportError (GettextCatalog.GetString ("Failed to write file '{0}'.", path), ex);
+				if (monitor != null)
+					monitor.ReportError (GettextCatalog.GetString ("Failed to write file '{0}'.", path), ex);
+				else
+					LoggingService.LogError ("CodeBehindWriter failed", ex);
 			} catch (Exception ex) {
-				monitor.ReportError (GettextCatalog.GetString ("Failed to generate code for file '{0}'.", path), ex);
+				if (monitor != null)
+					monitor.ReportError (GettextCatalog.GetString ("Failed to generate code for file '{0}'.", path), ex);
+				else
+					LoggingService.LogError ("CodeBehindWriter failed", ex);
 			}
 		}
 
@@ -145,9 +151,15 @@ namespace MonoDevelop.DesignerSupport
 				});
 				WrittenCount++;
 			} catch (IOException ex) {
-				monitor.ReportError (GettextCatalog.GetString ("Failed to write file '{0}'.", path), ex);
+				if (monitor != null)
+					monitor.ReportError (GettextCatalog.GetString ("Failed to write file '{0}'.", path), ex);
+				else
+					LoggingService.LogError ("CodeBehindWriter failed", ex);
 			} catch (Exception ex) {
-				monitor.ReportError (GettextCatalog.GetString ("Failed to generate code for file '{0}'.", path), ex);
+				if (monitor != null)
+					monitor.ReportError (GettextCatalog.GetString ("Failed to generate code for file '{0}'.", path), ex);
+				else
+					LoggingService.LogError ("CodeBehindWriter failed", ex);
 			}
 		}
 		
@@ -163,14 +175,14 @@ namespace MonoDevelop.DesignerSupport
 			}
 			
 			//these documents are open, so needs to run in GUI thread
-			DispatchService.GuiSyncDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				foreach (KeyValuePair<FilePath, string> item in filesToWrite) {
 					try {
 						
 						bool updated = false;
 						foreach (MonoDevelop.Ide.Gui.Document doc in IdeApp.Workbench.Documents) {
 							if (doc.FileName == item.Key) {
-								var textFile = doc.GetContent<MonoDevelop.Projects.Text.IEditableTextFile> ();
+								var textFile = doc.GetContent<MonoDevelop.Ide.Editor.TextEditor> ();
 								if (textFile == null)
 									continue;
 								
@@ -195,12 +207,13 @@ namespace MonoDevelop.DesignerSupport
 						WrittenCount++;
 						
 					} catch (IOException ex) {
-						monitor.ReportError (
-							GettextCatalog.GetString ("Failed to write file '{0}'.", item.Key),
-							ex);
+						if (monitor != null)
+							monitor.ReportError (GettextCatalog.GetString ("Failed to write file '{0}'.", item.Key), ex);
+						else
+							LoggingService.LogError ("CodeBehindWriter failed", ex);
 					}
 				}
-			});
+			}).Wait ();
 			
 			filesToWrite = null;
 		}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DocumentOutlinePad.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DocumentOutlinePad.cs
index fb87b62f38..b86f6f6ac1 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DocumentOutlinePad.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DocumentOutlinePad.cs
@@ -34,12 +34,13 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.DesignerSupport
 {
 
 
-	public class DocumentOutlinePad : AbstractPadContent
+	public class DocumentOutlinePad : PadContent
 	{
 		Alignment box;
 		IOutlinedDocument currentOutlineDoc;
@@ -54,12 +55,12 @@ namespace MonoDevelop.DesignerSupport
 			box.ShowAll ();
 		}
 
-		public override void Initialize (IPadWindow window)
+		protected override void Initialize (IPadWindow window)
 		{
 			base.Initialize (window);
 			IdeApp.Workbench.ActiveDocumentChanged += DocumentChangedHandler;
 			CurrentDoc = IdeApp.Workbench.ActiveDocument;
-			toolbar = window.GetToolbar (PositionType.Top);
+			toolbar = window.GetToolbar (DockPositionType.Top);
 			toolbar.Visible = false;
 			Update ();
 		}
@@ -85,7 +86,7 @@ namespace MonoDevelop.DesignerSupport
 			}
 		}
 
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get { return box; }
 		}
 
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ErrorInFileException.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ErrorInFileException.cs
index ca6f701e0c..7db1a0bbc0 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ErrorInFileException.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ErrorInFileException.cs
@@ -27,7 +27,7 @@
 //
 
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.DesignerSupport
 {
@@ -38,10 +38,10 @@ namespace MonoDevelop.DesignerSupport
 		int column = 0;
 		string fileName = null;
 		
-		public ErrorInFileException (DomRegion region, string fileName)
+		public ErrorInFileException (DocumentLocation region, string fileName)
 		{
-			this.line = region.BeginLine;
-			this.column = region.BeginColumn;
+			this.line = region.Line;
+			this.column = region.Column;
 			this.fileName = fileName;
 		}
 		
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MemberExistsException.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MemberExistsException.cs
index 7da3385ae6..d4d89d58b0 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MemberExistsException.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/MemberExistsException.cs
@@ -1,128 +1,128 @@
+////
+//// MemberExistsException.cs: Thrown if identifier already exists when 
+////    binding CodeBehind members.
+////
+//// Authors:
+////   Michael Hutchinson <m.j.hutchinson@gmail.com>
+////
+//// Copyright (C) 2006 Michael Hutchinson
+////
+////
+//// This source code is licenced under The MIT License:
+////
+//// Permission is hereby granted, free of charge, to any person obtaining
+//// a copy of this software and associated documentation files (the
+//// "Software"), to deal in the Software without restriction, including
+//// without limitation the rights to use, copy, modify, merge, publish,
+//// distribute, sublicense, and/or sell copies of the Software, and to
+//// permit persons to whom the Software is furnished to do so, subject to
+//// the following conditions:
+//// 
+//// The above copyright notice and this permission notice shall be
+//// included in all copies or substantial portions of the Software.
+//// 
+//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+////
 //
-// MemberExistsException.cs: Thrown if identifier already exists when 
-//    binding CodeBehind members.
+//using System;
+//using ICSharpCode.NRefactory.TypeSystem;
 //
-// Authors:
-//   Michael Hutchinson <m.j.hutchinson@gmail.com>
-//
-// Copyright (C) 2006 Michael Hutchinson
-//
-//
-// This source code is licenced under The MIT License:
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace MonoDevelop.DesignerSupport
-{	
-	public class MemberExistsException : ErrorInFileException
-	{
-		string className;
-		string memberName;
-		
-		MemberType existingMemberType = MemberType.Member;
-		MemberType newMemberType = MemberType.Member;
-		
-		public MemberExistsException (string className, string memberName)
-			: base (DomRegion.Empty, null)
-		{
-			this.className = className;
-			this.memberName = memberName;
-		}
-		
-		public MemberExistsException (string className, string memberName, MemberType existingMemberType, MemberType newMemberType, DomRegion errorLocation, string fileName)
-			: base (errorLocation, fileName)
-		{
-			this.className = className;
-			this.memberName = memberName;
-			this.existingMemberType = existingMemberType;
-			this.newMemberType = newMemberType;
-		}
-		
-		public MemberExistsException (string className, MemberType newMemberType, System.CodeDom.CodeTypeMember existingMember, DomRegion errorLocation, string fileName)
-			: this (className, existingMember.Name, newMemberType, GetMemberTypeFromCodeTypeMember (existingMember), errorLocation, fileName)
-		{
-		}
-		
-		public MemberExistsException (string className, System.CodeDom.CodeTypeMember newMember, MemberType existingMemberType, DomRegion errorLocation, string fileName)
-			: this (className, newMember.Name, GetMemberTypeFromCodeTypeMember (newMember), existingMemberType, errorLocation, fileName)
-		{
-		}
-		
-		protected static MemberType GetMemberTypeFromCodeTypeMember (System.CodeDom.CodeTypeMember mem)
-		{
-			if (mem is System.CodeDom.CodeMemberEvent)
-				return MemberType.Event;
-			else if (mem is System.CodeDom.CodeMemberProperty)
-				return MemberType.Property;
-			else if (mem is System.CodeDom.CodeMemberField)
-				return MemberType.Field;
-			else if (mem is System.CodeDom.CodeMemberMethod)
-				return MemberType.Method;
-			return MemberType.Member;
-		}
-		
-		public string ClassName {
-			get { return className; }
-			set { className = value; }
-		}
-		
-		public string MemberName {
-			get { return memberName; }
-			set { memberName = value; }
-		}
-		
-		public MemberType ExistingMemberType {
-			get { return existingMemberType; }
-			set { existingMemberType = value; }
-		}
-		
-		public MemberType NewMemberType {
-			get { return newMemberType; }
-			set { newMemberType = value; }
-		}
-		
-		public override string ToString ()
-		{
-			string str;
-			if (NewMemberType == ExistingMemberType)
-				str = MonoDevelop.Core.GettextCatalog.GetString ("Cannot add {0} '{1}' to class '{2}', " + 
-					"because there is already a {3} with that name with an incompatible return type.");
-			else
-				str = MonoDevelop.Core.GettextCatalog.GetString ("Cannot add {0} '{1}' to class '{2}', " + 
-					"because there is already a {3} with that name.");
-			
-			return string.Format (str, newMemberType.ToString ().ToLower (), memberName, className, 
-				existingMemberType.ToString ().ToLower ());
-		}
-	}
-	
-	public enum MemberType
-	{
-		Member,
-		Field,
-		Property,
-		Method,
-		Event
-	}
-}
+//namespace MonoDevelop.DesignerSupport
+//{	
+//	public class MemberExistsException : ErrorInFileException
+//	{
+//		string className;
+//		string memberName;
+//		
+//		MemberType existingMemberType = MemberType.Member;
+//		MemberType newMemberType = MemberType.Member;
+//		
+//		public MemberExistsException (string className, string memberName)
+//			: base (DomRegion.Empty, null)
+//		{
+//			this.className = className;
+//			this.memberName = memberName;
+//		}
+//		
+//		public MemberExistsException (string className, string memberName, MemberType existingMemberType, MemberType newMemberType, DomRegion errorLocation, string fileName)
+//			: base (errorLocation, fileName)
+//		{
+//			this.className = className;
+//			this.memberName = memberName;
+//			this.existingMemberType = existingMemberType;
+//			this.newMemberType = newMemberType;
+//		}
+//		
+//		public MemberExistsException (string className, MemberType newMemberType, System.CodeDom.CodeTypeMember existingMember, DomRegion errorLocation, string fileName)
+//			: this (className, existingMember.Name, newMemberType, GetMemberTypeFromCodeTypeMember (existingMember), errorLocation, fileName)
+//		{
+//		}
+//		
+//		public MemberExistsException (string className, System.CodeDom.CodeTypeMember newMember, MemberType existingMemberType, DomRegion errorLocation, string fileName)
+//			: this (className, newMember.Name, GetMemberTypeFromCodeTypeMember (newMember), existingMemberType, errorLocation, fileName)
+//		{
+//		}
+//		
+//		protected static MemberType GetMemberTypeFromCodeTypeMember (System.CodeDom.CodeTypeMember mem)
+//		{
+//			if (mem is System.CodeDom.CodeMemberEvent)
+//				return MemberType.Event;
+//			else if (mem is System.CodeDom.CodeMemberProperty)
+//				return MemberType.Property;
+//			else if (mem is System.CodeDom.CodeMemberField)
+//				return MemberType.Field;
+//			else if (mem is System.CodeDom.CodeMemberMethod)
+//				return MemberType.Method;
+//			return MemberType.Member;
+//		}
+//		
+//		public string ClassName {
+//			get { return className; }
+//			set { className = value; }
+//		}
+//		
+//		public string MemberName {
+//			get { return memberName; }
+//			set { memberName = value; }
+//		}
+//		
+//		public MemberType ExistingMemberType {
+//			get { return existingMemberType; }
+//			set { existingMemberType = value; }
+//		}
+//		
+//		public MemberType NewMemberType {
+//			get { return newMemberType; }
+//			set { newMemberType = value; }
+//		}
+//		
+//		public override string ToString ()
+//		{
+//			string str;
+//			if (NewMemberType == ExistingMemberType)
+//				str = MonoDevelop.Core.GettextCatalog.GetString ("Cannot add {0} '{1}' to class '{2}', " + 
+//					"because there is already a {3} with that name with an incompatible return type.");
+//			else
+//				str = MonoDevelop.Core.GettextCatalog.GetString ("Cannot add {0} '{1}' to class '{2}', " + 
+//					"because there is already a {3} with that name.");
+//			
+//			return string.Format (str, newMemberType.ToString ().ToLower (), memberName, className, 
+//				existingMemberType.ToString ().ToLower ());
+//		}
+//	}
+//	
+//	public enum MemberType
+//	{
+//		Member,
+//		Field,
+//		Property,
+//		Method,
+//		Event
+//	}
+//}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPad.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPad.cs
index 690aa67385..fb18f70238 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPad.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPad.cs
@@ -41,11 +41,12 @@ using System.Collections.Generic;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Commands;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.DesignerSupport
 {
 	
-	public class PropertyPad : AbstractPadContent, ICommandDelegator
+	public class PropertyPad : PadContent, ICommandDelegator
 	{
 		pg.PropertyGrid grid;
 		InvisibleFrame frame;
@@ -64,10 +65,10 @@ namespace MonoDevelop.DesignerSupport
 			frame.ShowAll ();
 		}
 		
-		public override void Initialize (IPadWindow container)
+		protected override void Initialize (IPadWindow container)
 		{
 			base.Initialize (container);
-			toolbarProvider.Attach (container.GetToolbar (Gtk.PositionType.Top));
+			toolbarProvider.Attach (container.GetToolbar (DockPositionType.Top));
 			grid.SetToolbarProvider (toolbarProvider);
 			this.container = container;
 			DesignerSupport.Service.SetPad (this);
@@ -79,13 +80,14 @@ namespace MonoDevelop.DesignerSupport
 		
 		#region AbstractPadContent implementations
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get { return frame; }
 		}
 		
 		public override void Dispose()
 		{
 			DesignerSupport.Service.SetPad (null);
+			base.Dispose ();
 		}
 		
 		#endregion
@@ -118,7 +120,7 @@ namespace MonoDevelop.DesignerSupport
 					customWidget = false;
 					frame.Remove (frame.Child);
 					frame.Add (grid);
-					toolbarProvider.Attach (container.GetToolbar (Gtk.PositionType.Top));
+					toolbarProvider.Attach (container.GetToolbar (DockPositionType.Top));
 				}
 				
 				return grid;
@@ -138,7 +140,7 @@ namespace MonoDevelop.DesignerSupport
 		void ClearToolbar ()
 		{
 			if (container != null) {
-				var toolbar = container.GetToolbar (Gtk.PositionType.Top);
+				var toolbar = container.GetToolbar (DockPositionType.Top);
 				foreach (var w in toolbar.Children)
 					toolbar.Remove (w);
 			}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs
index 8ba3317a35..e3431daaa1 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs
@@ -83,6 +83,10 @@ namespace MonoDevelop.DesignerSupport
 			if (ob == ((DefaultWorkbench)IdeApp.Workbench.RootWindow).ActiveWorkbenchWindow)
 				visitedCurrentDoc = true;
 
+			if (ob is MonoDevelop.Components.Docking.AutoHideBox) {
+				found = true;
+				return true;
+			}
 			if (ob is PropertyPad) {
 				// Don't change the property grid selection when the focus is inside the property grid itself
 				found = true;
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxPad.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxPad.cs
index e6abccb836..f27049ed61 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxPad.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxPad.cs
@@ -35,11 +35,12 @@ using MonoDevelop.Ide.Gui;
 
 using MonoDevelop.DesignerSupport;
 using MonoDevelop.DesignerSupport.Toolbox;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.DesignerSupport
 {
 	
-	public class ToolboxPad : AbstractPadContent
+	public class ToolboxPad : PadContent
 	{
 		Toolbox.Toolbox toolbox;
 		
@@ -47,7 +48,7 @@ namespace MonoDevelop.DesignerSupport
 		{
 		}
 		
-		public override void Initialize (IPadWindow container)
+		protected override void Initialize (IPadWindow container)
 		{
 			base.Initialize (container);
 			toolbox = new Toolbox.Toolbox (DesignerSupport.Service.ToolboxService, container);
@@ -56,7 +57,7 @@ namespace MonoDevelop.DesignerSupport
 		
 		#region AbstractPadContent implementations
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get { return toolbox; }
 		}
 		
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
index f69e96ea71..68c6ddf7f8 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
@@ -184,7 +184,7 @@ namespace MonoDevelop.DesignerSupport
 							ctx.Dispose ();
 					}
 
-					DispatchService.GuiDispatch (delegate {
+					Runtime.RunInMainThread (delegate {
 						AddUserItems (nodes);
 						initializing--;
 						SaveConfiguration ();
@@ -541,7 +541,7 @@ namespace MonoDevelop.DesignerSupport
 			throw new InvalidOperationException ("Unexpected ToolboxItemFilterType value.");
 		}
 		
-		internal ComponentIndex GetComponentIndex (IProgressMonitor monitor)
+		internal ComponentIndex GetComponentIndex (ProgressMonitor monitor)
 		{
 			// Returns an index of all components that can be added to the toolbox.
 			
@@ -558,7 +558,7 @@ namespace MonoDevelop.DesignerSupport
 					todelete.Add (ia);
 				if (ia.NeedsUpdate)
 					toupdate.Add (ia);
-				if (monitor.IsCancelRequested)
+				if (monitor.CancellationToken.IsCancellationRequested)
 					return index;
 			}
 			
@@ -571,7 +571,7 @@ namespace MonoDevelop.DesignerSupport
 						index.Files.Add (c);
 						toupdate.Add (c);
 					}
-					if (monitor.IsCancelRequested)
+					if (monitor.CancellationToken.IsCancellationRequested)
 						return index;
 				}
 			}
@@ -587,7 +587,7 @@ namespace MonoDevelop.DesignerSupport
 					foreach (ComponentIndexFile ia in toupdate) {
 						ia.Update (ctx);
 						monitor.Step (1);
-						if (monitor.IsCancelRequested)
+						if (monitor.CancellationToken.IsCancellationRequested)
 							return index;
 					}
 				} finally {
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/TypeNotFoundException.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/TypeNotFoundException.cs
index eae3b3b743..1427f6a311 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/TypeNotFoundException.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/TypeNotFoundException.cs
@@ -28,7 +28,7 @@
 
 using System;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.DesignerSupport
 {
@@ -36,7 +36,7 @@ namespace MonoDevelop.DesignerSupport
 	{
 		string className;
 		
-		public TypeNotFoundException (string className, DomRegion location, string fileName)
+		public TypeNotFoundException (string className, DocumentLocation location, string fileName)
 			: base (location, fileName)
 		{
 			this.ClassName = className;
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
index 3f047bb62b..8de2800c5f 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/WrapperDesignView.cs
@@ -1,5 +1,5 @@
 //
-// WrapperDesignView.cs: base class for wrapping an IViewContent. Heavily based on 
+// WrapperDesignView.cs: base class for wrapping an ViewContent. Heavily based on 
 //         MonoDevelop.GtkCore.GuiBuilder.CombinedDesignView
 //
 // Author:
@@ -31,28 +31,30 @@
 
 using System;
 
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.DesignerSupport
 {
 	
-	public class WrapperDesignView : AbstractViewContent
+	public class WrapperDesignView : ViewContent
 	{
-		IViewContent content;
+		ViewContent content;
 		Gtk.VBox contentBox;
 		Gtk.Widget topBar;
 		
-		public WrapperDesignView  (IViewContent content)
+		public WrapperDesignView  (ViewContent content)
 		{
 			this.content = content;
 			this.contentBox = new Gtk.VBox ();
 			this.contentBox.PackEnd (content.Control, true, true, 0);
 			this.contentBox.ShowAll ();
 			
-			content.ContentChanged += new EventHandler (OnTextContentChanged);
 			content.DirtyChanged += new EventHandler (OnTextDirtyChanged);
-			
+
 			IdeApp.Workbench.ActiveDocumentChanged += new EventHandler (OnActiveDocumentChanged);
 		}
 		
@@ -76,50 +78,53 @@ namespace MonoDevelop.DesignerSupport
 			}
 		}
 		
-		protected IViewContent Content {
+		protected ViewContent Content {
 			get { return content; }
 		}
 		
-		public override MonoDevelop.Projects.Project Project {
-			get { return base.Project; }
-			set { 
-				base.Project = value; 
-				content.Project = value; 
+		protected override void OnSetProject (MonoDevelop.Projects.Project project)
+		{
+			base.OnSetProject (project);
+			content.Project = project;
+		}
+
+		public override ProjectReloadCapability ProjectReloadCapability {
+			get {
+				return content.ProjectReloadCapability;
 			}
 		}
 		
-		protected override void OnWorkbenchWindowChanged (EventArgs e)
+		protected override void OnWorkbenchWindowChanged ()
 		{
-			base.OnWorkbenchWindowChanged (e);
+			base.OnWorkbenchWindowChanged ();
 			content.WorkbenchWindow = WorkbenchWindow;
 		}
 		
 		public override void Dispose ()
 		{
-			content.ContentChanged -= new EventHandler (OnTextContentChanged);
 			content.DirtyChanged -= new EventHandler (OnTextDirtyChanged);
 			IdeApp.Workbench.ActiveDocumentChanged -= new EventHandler (OnActiveDocumentChanged);
 			base.Dispose ();
 		}
 		
-		public override void Load (string fileName)
+		public override Task Load (FileOpenInformation fileOpenInformation)
 		{
-			ContentName = fileName;
-			content.Load (fileName);
+			ContentName = fileOpenInformation.FileName;
+			return content.Load (ContentName);
 		}
 		
-		public override void LoadNew (System.IO.Stream content, string mimeType)
+		public override Task LoadNew (System.IO.Stream content, string mimeType)
 		{
-			this.content.LoadNew (content, mimeType);
+			return this.content.LoadNew (content, mimeType);
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get { return contentBox; }
 		}
 		
-		public override void Save (string fileName)
+		public override Task Save (FileSaveInformation fileSaveInformation)
 		{
-			content.Save (fileName);
+			return content.Save (fileSaveInformation);
 		}
 		
 		public override bool IsDirty {
@@ -138,19 +143,15 @@ namespace MonoDevelop.DesignerSupport
 			}
 		}
 		
-		public override string ContentName {
-			get { return content.ContentName; }
-			set { content.ContentName = value; }
-		}
-				
-		void OnTextContentChanged (object s, EventArgs args)
+		protected override void OnContentNameChanged ()
 		{
-			OnContentChanged (args);
+			base.OnContentNameChanged ();
+			content.ContentName = ContentName;
 		}
-		
+
 		void OnTextDirtyChanged (object s, EventArgs args)
 		{
-			OnDirtyChanged (args);
+			OnDirtyChanged ();
 		}
 		
 		void OnActiveDocumentChanged (object s, EventArgs args)
@@ -163,10 +164,10 @@ namespace MonoDevelop.DesignerSupport
 		protected virtual void OnDocumentActivated ()
 		{
 		}
-		
-		public override object GetContent (Type type)
+
+		protected override IEnumerable<object> OnGetContents (Type type)
 		{
-			return base.GetContent (type) ?? content.GetContent (type);
+			return base.OnGetContents (type).Concat (content.GetContents (type));
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.cs b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.cs
deleted file mode 100644
index debf11a674..0000000000
--- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.DesignerSupport
-{
-	internal partial class ClassOutlineSortingPreferencesDialog
-	{
-		private global::Gtk.VBox vbox2;
-		private global::Gtk.Label label;
-		private global::MonoDevelop.Ide.Gui.Components.PriorityList priorityList;
-		private global::Gtk.Button buttonCancel;
-		private global::Gtk.Button buttonOk;
-		
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog
-			this.Name = "MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Document Outline Preferences");
-			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
-			this.Modal = true;
-			this.DestroyWithParent = true;
-			// Internal child MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.VBox
-			global::Gtk.VBox w1 = this.VBox;
-			w1.Name = "dialog1_VBox";
-			w1.BorderWidth = ((uint)(2));
-			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.vbox2 = new global::Gtk.VBox ();
-			this.vbox2.Name = "vbox2";
-			this.vbox2.Spacing = 6;
-			this.vbox2.BorderWidth = ((uint)(6));
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.label = new global::Gtk.Label ();
-			this.label.WidthRequest = 400;
-			this.label.Name = "label";
-			this.label.LabelProp = global::Mono.Unix.Catalog.GetString ("Group sorting order when grouping is enabled:");
-			this.label.Wrap = true;
-			this.vbox2.Add (this.label);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label]));
-			w2.Position = 0;
-			w2.Expand = false;
-			w2.Fill = false;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.priorityList = new global::MonoDevelop.Ide.Gui.Components.PriorityList ();
-			this.priorityList.Name = "priorityList";
-			this.vbox2.Add (this.priorityList);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.priorityList]));
-			w3.Position = 1;
-			w1.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
-			w4.Position = 0;
-			// Internal child MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog.ActionArea
-			global::Gtk.HButtonBox w5 = this.ActionArea;
-			w5.Name = "dialog1_ActionArea";
-			w5.Spacing = 10;
-			w5.BorderWidth = ((uint)(5));
-			w5.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
-			this.buttonCancel.CanDefault = true;
-			this.buttonCancel.CanFocus = true;
-			this.buttonCancel.Name = "buttonCancel";
-			this.buttonCancel.UseStock = true;
-			this.buttonCancel.UseUnderline = true;
-			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w6 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5 [this.buttonCancel]));
-			w6.Expand = false;
-			w6.Fill = false;
-			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
-			this.buttonOk.CanDefault = true;
-			this.buttonOk.CanFocus = true;
-			this.buttonOk.Name = "buttonOk";
-			this.buttonOk.UseStock = true;
-			this.buttonOk.UseUnderline = true;
-			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w7 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5 [this.buttonOk]));
-			w7.Position = 1;
-			w7.Expand = false;
-			w7.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.DefaultWidth = 424;
-			this.DefaultHeight = 367;
-			this.Hide ();
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs
index ad3979a16d..2aa3075445 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs
@@ -5,17 +5,33 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 	internal partial class ComponentSelectorDialog
 	{
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.ComboBox comboType;
+		
 		private global::Gtk.VSeparator vseparator1;
+		
 		private global::Gtk.Button button24;
+		
+		private global::Gtk.HBox hbox2;
+		
+		private global::MonoDevelop.Components.ImageView imageview1;
+		
+		private global::Gtk.Label label2;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow1;
+		
 		private global::Gtk.TreeView listView;
+		
 		private global::Gtk.CheckButton checkGroupByCat;
+		
 		private global::Gtk.Button buttonCancel;
-		private global::Gtk.Button buttonOk;
 		
+		private global::Gtk.Button buttonOk;
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -64,33 +80,40 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			this.button24 = new global::Gtk.Button ();
 			this.button24.CanFocus = true;
 			this.button24.Name = "button24";
-			this.button24.UseUnderline = true;
 			// Container child button24.Gtk.Container+ContainerChild
-			global::Gtk.Alignment w5 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
-			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			global::Gtk.HBox w6 = new global::Gtk.HBox ();
-			w6.Spacing = 2;
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Image w7 = new global::Gtk.Image ();
-			w7.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-add", global::Gtk.IconSize.Menu);
-			w6.Add (w7);
-			// Container child GtkHBox.Gtk.Container+ContainerChild
-			global::Gtk.Label w9 = new global::Gtk.Label ();
-			w9.LabelProp = global::Mono.Unix.Catalog.GetString ("Add Assembly...");
-			w9.UseUnderline = true;
-			w6.Add (w9);
-			w5.Add (w6);
-			this.button24.Add (w5);
+			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2.Name = "hbox2";
+			this.hbox2.Spacing = 2;
+			// Container child hbox2.Gtk.Box+BoxChild
+			this.imageview1 = new global::MonoDevelop.Components.ImageView ();
+			this.imageview1.Name = "imageview1";
+			this.imageview1.IconId = "gtk-add";
+			this.imageview1.IconSize = ((global::Gtk.IconSize)(1));
+			this.hbox2.Add (this.imageview1);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.imageview1]));
+			w5.Position = 0;
+			w5.Expand = false;
+			w5.Fill = false;
+			// Container child hbox2.Gtk.Box+BoxChild
+			this.label2 = new global::Gtk.Label ();
+			this.label2.Name = "label2";
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Add Assembly...");
+			this.label2.UseUnderline = true;
+			this.hbox2.Add (this.label2);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label2]));
+			w6.Position = 1;
+			w6.Expand = false;
+			w6.Fill = false;
+			this.button24.Add (this.hbox2);
 			this.hbox1.Add (this.button24);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.button24]));
-			w13.Position = 3;
-			w13.Expand = false;
-			w13.Fill = false;
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.button24]));
+			w8.Position = 3;
+			w8.Expand = false;
 			this.vbox2.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
-			w14.Position = 0;
-			w14.Expand = false;
-			w14.Fill = false;
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
+			w9.Position = 0;
+			w9.Expand = false;
+			w9.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
 			this.scrolledwindow1.CanFocus = true;
@@ -102,8 +125,8 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			this.listView.Name = "listView";
 			this.scrolledwindow1.Add (this.listView);
 			this.vbox2.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.scrolledwindow1]));
-			w16.Position = 1;
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.scrolledwindow1]));
+			w11.Position = 1;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.checkGroupByCat = new global::Gtk.CheckButton ();
 			this.checkGroupByCat.CanFocus = true;
@@ -112,19 +135,19 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			this.checkGroupByCat.DrawIndicator = true;
 			this.checkGroupByCat.UseUnderline = true;
 			this.vbox2.Add (this.checkGroupByCat);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.checkGroupByCat]));
-			w17.Position = 2;
-			w17.Expand = false;
-			w17.Fill = false;
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.checkGroupByCat]));
+			w12.Position = 2;
+			w12.Expand = false;
+			w12.Fill = false;
 			w1.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
-			w18.Position = 0;
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
+			w13.Position = 0;
 			// Internal child MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.ActionArea
-			global::Gtk.HButtonBox w19 = this.ActionArea;
-			w19.Name = "dialog1_ActionArea";
-			w19.Spacing = 10;
-			w19.BorderWidth = ((uint)(5));
-			w19.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			global::Gtk.HButtonBox w14 = this.ActionArea;
+			w14.Name = "dialog1_ActionArea";
+			w14.Spacing = 10;
+			w14.BorderWidth = ((uint)(5));
+			w14.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonCancel = new global::Gtk.Button ();
 			this.buttonCancel.CanDefault = true;
@@ -134,9 +157,9 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w20 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w19 [this.buttonCancel]));
-			w20.Expand = false;
-			w20.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14 [this.buttonCancel]));
+			w15.Expand = false;
+			w15.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonOk = new global::Gtk.Button ();
 			this.buttonOk.CanDefault = true;
@@ -145,11 +168,11 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 			this.buttonOk.UseStock = true;
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
-			w19.Add (this.buttonOk);
-			global::Gtk.ButtonBox.ButtonBoxChild w21 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w19 [this.buttonOk]));
-			w21.Position = 1;
-			w21.Expand = false;
-			w21.Fill = false;
+			w14.Add (this.buttonOk);
+			global::Gtk.ButtonBox.ButtonBoxChild w16 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14 [this.buttonOk]));
+			w16.Position = 1;
+			w16.Expand = false;
+			w16.Fill = false;
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/generated.cs
index d608548128..9ef3363981 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/generated.cs
@@ -14,40 +14,6 @@ namespace Stetic
 		}
 	}
 
-	internal class IconLoader
-	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
-		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
-				return res;
-			} else {
-				int sz;
-				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-					}
-				}
-			}
-		}
-	}
-
 	internal class ActionGroups
 	{
 		public static Gtk.ActionGroup GetActionGroup (System.Type type)
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic
index 37f2b3a0bf..be5dc01e5f 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic
@@ -70,17 +70,48 @@
                   <widget class="Gtk.Button" id="button24">
                     <property name="MemberName" />
                     <property name="CanFocus">True</property>
-                    <property name="Type">TextAndIcon</property>
-                    <property name="Icon">stock:gtk-add Menu</property>
-                    <property name="Label" translatable="yes">Add Assembly...</property>
-                    <property name="UseUnderline">True</property>
+                    <property name="Type">Custom</property>
                     <signal name="Clicked" handler="OnButton24Clicked" />
+                    <child>
+                      <widget class="Gtk.HBox" id="hbox2">
+                        <property name="MemberName" />
+                        <property name="Spacing">2</property>
+                        <child>
+                          <widget class="MonoDevelop.Components.ImageView" id="imageview1">
+                            <property name="MemberName" />
+                            <property name="IconId">gtk-add</property>
+                            <property name="IconSize">Menu</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.Label" id="label2">
+                            <property name="MemberName" />
+                            <property name="LabelProp" translatable="yes">Add Assembly...</property>
+                            <property name="UseUnderline">True</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder />
+                        </child>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                     <property name="Position">3</property>
-                    <property name="AutoSize">True</property>
+                    <property name="AutoSize">False</property>
                     <property name="Expand">False</property>
-                    <property name="Fill">False</property>
                   </packing>
                 </child>
               </widget>
@@ -177,97 +208,4 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.DesignerSupport.ClassOutlineSortingPreferencesDialog" design-size="424 367">
-    <property name="MemberName" />
-    <property name="Visible">False</property>
-    <property name="GeneratePublic">False</property>
-    <property name="Title" translatable="yes">Document Outline Preferences</property>
-    <property name="WindowPosition">CenterOnParent</property>
-    <property name="Modal">True</property>
-    <property name="DestroyWithParent">True</property>
-    <property name="Buttons">2</property>
-    <property name="HelpButton">False</property>
-    <child internal-child="VBox">
-      <widget class="Gtk.VBox" id="dialog1_VBox">
-        <property name="MemberName" />
-        <property name="BorderWidth">2</property>
-        <child>
-          <widget class="Gtk.VBox" id="vbox2">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <property name="BorderWidth">6</property>
-            <child>
-              <widget class="Gtk.Label" id="label">
-                <property name="MemberName" />
-                <property name="WidthRequest">400</property>
-                <property name="LabelProp" translatable="yes">Group sorting order when grouping is enabled:</property>
-                <property name="Wrap">True</property>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="MonoDevelop.Ide.Gui.Components.PriorityList" id="priorityList">
-                <property name="MemberName" />
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="ActionArea">
-      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
-        <property name="MemberName" />
-        <property name="Spacing">10</property>
-        <property name="BorderWidth">5</property>
-        <property name="Size">2</property>
-        <property name="LayoutStyle">End</property>
-        <child>
-          <widget class="Gtk.Button" id="buttonCancel">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-cancel</property>
-            <property name="ResponseId">-6</property>
-            <property name="label">gtk-cancel</property>
-          </widget>
-          <packing>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="buttonOk">
-            <property name="MemberName" />
-            <property name="CanDefault">True</property>
-            <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-ok</property>
-            <property name="ResponseId">-5</property>
-            <property name="label">gtk-ok</property>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
 </stetic-interface>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16.png
index c29fc8585c..38a0e09dca 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16.png
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16@2x.png
index 13bbf3cf71..4406a7a500 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16@2x.png
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark.png
new file mode 100644
index 0000000000..d125fbd522
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark@2x.png
new file mode 100644
index 0000000000..c41db4ed17
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16.png
index 49172a9f53..d8d188576e 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16.png
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16@2x.png
index 5b677d5c08..23b95dcd43 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16@2x.png
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark.png
new file mode 100644
index 0000000000..e3911c83ba
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark@2x.png
new file mode 100644
index 0000000000..ebf9d91493
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel.png
new file mode 100644
index 0000000000..2a6db9b28a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel@2x.png
new file mode 100644
index 0000000000..e2f82cc6ee
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel.png
new file mode 100644
index 0000000000..2a6db9b28a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel@2x.png
new file mode 100644
index 0000000000..e2f82cc6ee
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16.png
index bff9c389c1..a455c12131 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16.png
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16@2x.png
index e061e98cae..7a52394201 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16@2x.png
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark.png
new file mode 100644
index 0000000000..a4a3d47159
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark@2x.png
new file mode 100644
index 0000000000..9fae72d0d1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel.png
new file mode 100644
index 0000000000..d6b7b2652d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel@2x.png
new file mode 100644
index 0000000000..128cc11f7b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel.png
new file mode 100644
index 0000000000..d6b7b2652d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel@2x.png
new file mode 100644
index 0000000000..128cc11f7b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16.png
index feb26140d4..499a330b7e 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16.png
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16@2x.png
index 743318a76e..2c71672555 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16@2x.png
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark.png
new file mode 100644
index 0000000000..fa5dd18620
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark@2x.png
new file mode 100644
index 0000000000..829495f647
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel.png
new file mode 100644
index 0000000000..90190f2cee
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel@2x.png
new file mode 100644
index 0000000000..f5281dbc84
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel.png
new file mode 100644
index 0000000000..90190f2cee
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel.png
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel@2x.png
new file mode 100644
index 0000000000..f5281dbc84
--- /dev/null
+++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.DocFood/ChangeLog b/main/src/addins/MonoDevelop.DocFood/ChangeLog
deleted file mode 100644
index cf83291dc7..0000000000
--- a/main/src/addins/MonoDevelop.DocFood/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DocFood/Commands.cs:
-	* MonoDevelop.DocFood/DocFoodTextEditorExtension.cs: Track API
-	  changes.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.DocFood/DocFoodTextEditorExtension.cs: Track
-	  ProjectDomService/Parser API.
-
-2010-07-08  Levi Bard  <levi@unity3d.com>
-
-	* MonoDevelop.DocFood/DocFoodTextEditorExtension.cs:
-	  Prevent array overrun.
-
-2010-06-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.DocFood.csproj: Added texteditor reference.
-
-2010-06-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.DocFood/DocGenerator.cs: Assume that method
-	  sentences start with a verb.
-
-2010-06-17  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui:
-	* Main.cs:
-	* ChangeLog:
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* DocFood.addin.xml:
-	* DocFood.config.xml:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.DocFood:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.DocFood.csproj:
-	* MonoDevelop.DocFood.Options:
-	* MonoDevelop.DocFood/Node.cs:
-	* MonoDevelop.DocFood/Section.cs:
-	* MonoDevelop.DocFood/Commands.cs:
-	* MonoDevelop.DocFood/DocConfig.cs:
-	* MonoDevelop.DocFood/IfStatement.cs:
-	* MonoDevelop.DocFood/DocGenerator.cs:
-	* MonoDevelop.DocFood/MemberVisitor.cs:
-	* MonoDevelop.DocFood/IfNotStatement.cs:
-	* MonoDevelop.DocFood/SwitchStatement.cs:
-	* MonoDevelop.DocFood.Options/RulesPanelWidget.cs:
-	* MonoDevelop.DocFood/DocFoodTextEditorExtension.cs:
-	* MonoDevelop.DocFood.Options/OptionsPanelWidget.cs:
-	* MonoDevelop.DocFood.Options/AcronymsPanelWidget.cs:
-	* MonoDevelop.DocFood.Options/ExpansionsPanelWidget.cs:
-	* MonoDevelop.DocFood.Options/OfTheReorderingWidget.cs:
-	* MonoDevelop.DocFood.Options/NoTheReorderingWidget.cs:
-	* gtk-gui/MonoDevelop.DocFood.Options.RulesPanelWidget.cs:
-	* gtk-gui/MonoDevelop.DocFood.Options.OptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.DocFood.Options.AcronymsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.DocFood.Options.NoTheReorderingWidget.cs:
-	* gtk-gui/MonoDevelop.DocFood.Options.ExpansionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.DocFood.Options.OfTheReorderingWidget.cs:
-	  Checked in doc food addin.
-
diff --git a/main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml b/main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml
index 609679061f..7178a45275 100644
--- a/main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml
+++ b/main/src/addins/MonoDevelop.DocFood/DocFood.addin.xml
@@ -10,7 +10,7 @@
 		         _label = "Document this" /> -->
 		<Command id = "MonoDevelop.DocFood.Commands.DocumentBuffer"
 		         defaultHandler = "MonoDevelop.DocFood.DocumentBufferHandler"
-		         _label = "Document buffer" />
+		         _label = "Document Buffer" />
 	</Extension>
 	
 
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/AcronymsPanelWidget.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/AcronymsPanelWidget.cs
index 056df0d5fb..1e9ba38bae 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/AcronymsPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/AcronymsPanelWidget.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.DocFood.Options
@@ -44,7 +45,7 @@ namespace MonoDevelop.DocFood.Options
 	{
 		AcronymsPanelWidget panel;
 		
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			panel = new AcronymsPanelWidget (DocConfig.Instance);
 			return panel;
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/ExpansionsPanelWidget.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/ExpansionsPanelWidget.cs
index ef67d760f9..537a6c973b 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/ExpansionsPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/ExpansionsPanelWidget.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.DocFood.Options
@@ -54,7 +55,7 @@ namespace MonoDevelop.DocFood.Options
 		/// <returns>
 		/// The panel widget.
 		/// </returns>
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			panel = new ExpansionsPanelWidget (DocConfig.Instance);
 			return panel;
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/NoTheReorderingWidget.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/NoTheReorderingWidget.cs
index d8f9bd3f9d..e6d6613f9a 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/NoTheReorderingWidget.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/NoTheReorderingWidget.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.DocFood.Options
@@ -44,7 +45,7 @@ namespace MonoDevelop.DocFood.Options
 	{
 		NoTheReorderingWidget panel;
 		
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			panel = new NoTheReorderingWidget (DocConfig.Instance);
 			return panel;
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/OfTheReorderingWidget.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/OfTheReorderingWidget.cs
index 7a9e9f9012..a654d53e17 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/OfTheReorderingWidget.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/OfTheReorderingWidget.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.DocFood.Options
@@ -44,7 +45,7 @@ namespace MonoDevelop.DocFood.Options
 	{
 		OfTheReorderingWidget panel;
 		
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			panel = new OfTheReorderingWidget (DocConfig.Instance);
 			return panel;
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/OptionsPanelWidget.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/OptionsPanelWidget.cs
index 8bc50381fc..4ebfbd8e80 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/OptionsPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/OptionsPanelWidget.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.DocFood.Options
@@ -44,7 +45,7 @@ namespace MonoDevelop.DocFood.Options
 	{
 		OptionsPanelWidget panel;
 		
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			panel = new OptionsPanelWidget (DocConfig.Instance);
 			return panel;
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/RulesPanelWidget.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/RulesPanelWidget.cs
index 0de058c177..7bee353ab2 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/RulesPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.Options/RulesPanelWidget.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.DocFood.Options
@@ -44,7 +45,7 @@ namespace MonoDevelop.DocFood.Options
 	{
 		RulesPanelWidget panel;
 		
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			panel = new RulesPanelWidget (DocConfig.Instance);
 			return panel;
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj
index f97eff30ac..89dad2b139 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood.csproj
@@ -49,6 +49,26 @@
     <Reference Include="Mono.Posix" />
     <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -114,16 +134,6 @@
       <Name>Mono.TextEditor</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
       <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
       <Name>MonoDevelop.SourceEditor</Name>
@@ -149,5 +159,10 @@
       <Name>Mono.Addins</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\CSharpBinding\CSharpBinding.csproj">
+      <Project>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</Project>
+      <Name>CSharpBinding</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs
index d21033a71d..e83619fdf9 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs
@@ -28,9 +28,9 @@ using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
 using System.Text;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
+using Microsoft.CodeAnalysis;
+using System.Linq;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.DocFood
 {
@@ -45,7 +45,7 @@ namespace MonoDevelop.DocFood
 		{
 			info.Enabled = IdeApp.Workbench.ActiveDocument != null && 
 				IdeApp.Workbench.ActiveDocument.Editor != null &&
-				IdeApp.Workbench.ActiveDocument.Editor.Document.MimeType == "text/x-csharp";
+				IdeApp.Workbench.ActiveDocument.Editor.MimeType == "text/x-csharp";
 			base.Update (info);
 		}
 		
@@ -61,77 +61,78 @@ namespace MonoDevelop.DocFood
 		{
 			info.Enabled = IdeApp.Workbench.ActiveDocument != null && 
 				IdeApp.Workbench.ActiveDocument.Editor != null &&
-				IdeApp.Workbench.ActiveDocument.Editor.Document.MimeType == "text/x-csharp";
+				IdeApp.Workbench.ActiveDocument.Editor.MimeType == "text/x-csharp";
 			base.Update (info);
 		}
 		
 		protected override void Run ()
 		{
-			var document = IdeApp.Workbench.ActiveDocument;
-			if (document == null)
-				return;
-			var unit = document.ParsedDocument;
-			if (unit == null)
-				return;
-			TextEditorData data = IdeApp.Workbench.ActiveDocument.Editor;
-			var types = new Stack<IUnresolvedTypeDefinition> (unit.TopLevelTypeDefinitions);
-			var docs = new List<KeyValuePair<int, string>> ();
-			while (types.Count > 0) {
-				var curType = types.Pop ();
-				foreach (var member in curType.Members) {
-					if (member is IUnresolvedTypeDefinition) {
-						types.Push ((IUnresolvedTypeDefinition)member);
-						continue;
-					}
-					if (!member.IsPublic) {
-						if (member.DeclaringTypeDefinition != null && member.DeclaringTypeDefinition.Kind != TypeKind.Interface)
-							continue;
-					}
-					if (!NeedsDocumentation (data, member))
-						continue;
-					int offset;
-					var ctx = (unit.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (document.Compilation, member.Region.Begin);
-					var resolvedMember = member.CreateResolved (ctx);
-					string indent = GetIndent (data, resolvedMember, out offset);
-					string documentation = GenerateDocumentation (data, resolvedMember, indent);
-					if (documentation.Trim ().Length == 0)
-						continue;
-					docs.Add (new KeyValuePair <int, string> (offset, documentation));
-				}
-			}
-			docs.Sort ((a, b) => b.Key.CompareTo (a.Key));
-			using (var undo = data.OpenUndoGroup ()) {
-				docs.ForEach (doc => data.Insert (doc.Key, doc.Value));
-			}
+//			var document = IdeApp.Workbench.ActiveDocument;
+//			if (document == null)
+//				return;
+//			var unit = document.ParsedDocument;
+//			if (unit == null)
+//				return;
+//			TextEditorData data = IdeApp.Workbench.ActiveDocument.Editor;
+//			var types = new Stack<IUnresolvedTypeDefinition> (unit.TopLevelTypeDefinitions);
+//			var docs = new List<KeyValuePair<int, string>> ();
+//			while (types.Count > 0) {
+//				var curType = types.Pop ();
+//				foreach (var member in curType.Members) {
+//					if (member is IUnresolvedTypeDefinition) {
+//						types.Push ((IUnresolvedTypeDefinition)member);
+//						continue;
+//					}
+//					if (!member.IsPublic) {
+//						if (member.DeclaringTypeDefinition != null && member.DeclaringTypeDefinition.Kind != TypeKind.Interface)
+//							continue;
+//					}
+//					if (!NeedsDocumentation (data, member))
+//						continue;
+//					int offset;
+//					var ctx = (unit.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (document.Compilation, member.Region.Begin);
+//					var resolvedMember = member.CreateResolved (ctx);
+//					string indent = GetIndent (data, resolvedMember, out offset);
+//					string documentation = GenerateDocumentation (data, resolvedMember, indent);
+//					if (documentation.Trim ().Length == 0)
+//						continue;
+//					docs.Add (new KeyValuePair <int, string> (offset, documentation));
+//				}
+//			}
+//			docs.Sort ((a, b) => b.Key.CompareTo (a.Key));
+//			using (var undo = data.OpenUndoGroup ()) {
+//				docs.ForEach (doc => data.Insert (doc.Key, doc.Value));
+//			}
 		}
 		
-		static bool NeedsDocumentation (TextEditorData data, IUnresolvedEntity member)
+		static bool NeedsDocumentation (IReadonlyTextDocument data, ISymbol member)
 		{
-			int lineNr = member.Region.BeginLine - 1;
-			DocumentLine line;
+			int lineNr = data.OffsetToLineNumber (member.Locations.First().SourceSpan.Start) - 1;
+			IDocumentLine line;
+
 			do {
-				line = data.Document.GetLine (lineNr--);
-			} while (lineNr > 0 && data.Document.GetLineIndent (line).Length == line.Length);
-			return !data.Document.GetTextAt (line).TrimStart ().StartsWith ("///", StringComparison.Ordinal);
+				line = data.GetLine (lineNr--);
+			} while (lineNr > 0 && data.GetLineIndent (line).Length == line.Length);
+			return !data.GetTextAt (line).TrimStart ().StartsWith ("///", StringComparison.Ordinal);
 		}
 		
-		static string GetIndent (TextEditorData data, IEntity member, out int offset)
+		static string GetIndent (IReadonlyTextDocument data, ISymbol member, out int offset)
 		{
-			DocumentLine line = data.Document.GetLine (member.Region.BeginLine);
+			var line = data.GetLineByOffset (member.Locations.First().SourceSpan.Start);
 			offset = line.Offset;
-			return data.Document.GetLineIndent (line);
+			return data.GetLineIndent (line);
 		}
 		
-		internal static string GenerateDocumentation (TextEditorData data, IEntity member, string indent)
+		internal static string GenerateDocumentation (IReadonlyTextDocument data, ISymbol member, string indent)
 		{
 			return GenerateDocumentation (data, member, indent, "/// ");
 		}
 		
-		internal static string GenerateDocumentation (TextEditorData data, IEntity member, string indent, string prefix)
+		internal static string GenerateDocumentation (IReadonlyTextDocument data, ISymbol member, string indent, string prefix)
 		{
 			StringBuilder result = new StringBuilder ();
 			
-			DocGenerator generator = new DocGenerator (data);
+			var generator = new DocGenerator (data);
 			generator.GenerateDoc (member);
 			
 			bool first = true;
@@ -217,7 +218,7 @@ namespace MonoDevelop.DocFood
 			return result.ToString ();
 		}
 		
-		internal static string GenerateEmptyDocumentation (TextEditorData data, IEntity member, string indent)
+		internal static string GenerateEmptyDocumentation (IReadonlyTextDocument data, ISymbol member, string indent)
 		{
 			StringBuilder result = new StringBuilder ();
 			
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs
index 8ab889cb73..7ccb5b775d 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs
@@ -1,6 +1,6 @@
 // 
 // TextEditorExtension.cs
-//  
+//  =
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
 // 
@@ -24,91 +24,84 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Ide.Gui.Content;
-using Mono.TextEditor;
-using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.DocFood
 {
 	class DocFoodTextEditorExtension : TextEditorExtension
 	{
-		TextEditorData textEditorData {
-			get {
-				return Document.Editor;
-			}
-		}
-		
-		string GenerateDocumentation (IEntity member, string indent)
+		string GenerateDocumentation (ISymbol member, string indent)
 		{
-			string doc = DocumentBufferHandler.GenerateDocumentation (textEditorData, member, indent);
+			string doc = DocumentBufferHandler.GenerateDocumentation (Editor, member, indent);
 			int trimStart = (Math.Min (doc.Length - 1, indent.Length + "//".Length));
 			return doc.Substring (trimStart).TrimEnd ('\n', '\r');
 		}
 		
-		string GenerateEmptyDocumentation (IEntity member, string indent)
+		string GenerateEmptyDocumentation (ISymbol member, string indent)
 		{
-			string doc = DocumentBufferHandler.GenerateEmptyDocumentation (textEditorData, member, indent);
+			string doc = DocumentBufferHandler.GenerateEmptyDocumentation (Editor, member, indent);
 			int trimStart = (Math.Min (doc.Length - 1, indent.Length + "//".Length));
 			return doc.Substring (trimStart).TrimEnd ('\n', '\r');
 		}
 
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			if (keyChar != '/')
-				return base.KeyPress (key, keyChar, modifier);
+			if (descriptor.KeyChar != '/')
+				return base.KeyPress (descriptor);
 			
-			var line = textEditorData.Document.GetLine (textEditorData.Caret.Line);
-			string text = textEditorData.Document.GetTextAt (line.Offset, line.Length);
+			var line = Editor.GetLine (Editor.CaretLine);
+			string text = Editor.GetTextAt (line.Offset, line.Length);
 			
-			if (!text.EndsWith ("//"))
-				return base.KeyPress (key, keyChar, modifier);
+			if (!text.EndsWith ("//", StringComparison.Ordinal))
+				return base.KeyPress (descriptor);
 
 			// check if there is doc comment above or below.
 			var l = line.PreviousLine;
 			while (l != null && l.Length == 0)
 				l = l.PreviousLine;
-			if (l != null && textEditorData.GetTextAt (l).TrimStart ().StartsWith ("///"))
-				return base.KeyPress (key, keyChar, modifier);
+			if (l != null && Editor.GetTextAt (l).TrimStart ().StartsWith ("///", StringComparison.Ordinal))
+				return base.KeyPress (descriptor);
 
 			l = line.NextLine;
 			while (l != null && l.Length == 0)
 				l = l.NextLine;
-			if (l != null && textEditorData.GetTextAt (l).TrimStart ().StartsWith ("///"))
-				return base.KeyPress (key, keyChar, modifier);
+			if (l != null && Editor.GetTextAt (l).TrimStart ().StartsWith ("///", StringComparison.Ordinal))
+				return base.KeyPress (descriptor);
 
 			var member = GetMemberToDocument ();
 			if (member == null)
-				return base.KeyPress (key, keyChar, modifier);
+				return base.KeyPress (descriptor);
 			
-			string documentation = GenerateDocumentation (member, textEditorData.Document.GetLineIndent (line));
+			string documentation = GenerateDocumentation (member, Editor.GetLineIndent (line));
 			if (string.IsNullOrEmpty (documentation))
-				return base.KeyPress (key, keyChar, modifier);
+				return base.KeyPress (descriptor);
 			
-			string documentationEmpty = GenerateEmptyDocumentation (member, textEditorData.Document.GetLineIndent (line));
+			string documentationEmpty = GenerateEmptyDocumentation (member, Editor.GetLineIndent (line));
 			
-			int offset = textEditorData.Caret.Offset;
+			int offset = Editor.CaretOffset;
 			
 			int insertedLength;
 			
 			// Insert key (3rd undo step)
-			textEditorData.Insert (offset, "/");
-			
-			using (var undo = textEditorData.OpenUndoGroup ()) {
-				insertedLength = textEditorData.Replace (offset, 1, documentationEmpty);
+			Editor.InsertText (offset, "/");
+			using (var undo = Editor.OpenUndoGroup ()) {
+				documentationEmpty = Editor.FormatString (offset, documentationEmpty); 
+				insertedLength = documentationEmpty.Length;
+				Editor.ReplaceText (offset, 1, documentationEmpty);
 				// important to set the caret position here for the undo step
-				textEditorData.Caret.Offset = offset + insertedLength;
+				Editor.CaretOffset = offset + insertedLength;
 			}
 			
-			using (var undo = textEditorData.OpenUndoGroup ()) {
-				insertedLength = textEditorData.Replace (offset, insertedLength, documentation);
+			using (var undo = Editor.OpenUndoGroup ()) {
+				documentation = Editor.FormatString (offset, documentation); 
+				Editor.ReplaceText (offset, insertedLength, documentation);
+				insertedLength = documentation.Length;
 				if (SelectSummary (offset, insertedLength, documentation) == false)
-					textEditorData.Caret.Offset = offset + insertedLength;
+					Editor.CaretOffset = offset + insertedLength;
 			}
 			return false;
 		}
@@ -136,63 +129,65 @@ namespace MonoDevelop.DocFood
 
 			const string summaryStart = "<summary>";
 			const string summaryEnd = "</summary>";
-			int start = documentation.IndexOf (summaryStart);
-			int end = documentation.IndexOf (summaryEnd);
+			int start = documentation.IndexOf (summaryStart, StringComparison.Ordinal);
+			int end = documentation.IndexOf (summaryEnd, StringComparison.Ordinal);
 			if (start < 0 || end < 0)
 				return false;
 			start += summaryStart.Length;
 			string summaryText = documentation.Substring (start, end - start).Trim (new char[] {' ', '\t', '\r', '\n', '/'});
-			start = documentation.IndexOf (summaryText, start);
+			start = documentation.IndexOf (summaryText, start, StringComparison.Ordinal);
 			if (start < 0)
 				return false;
-			textEditorData.Caret.Offset = offset + start;
-			textEditorData.SetSelection (offset + start, offset + start + summaryText.Length);
+			Editor.CaretOffset = offset + start;
+			Editor.SetSelection (offset + start, offset + start + summaryText.Length);
 			return true;
 		}
 
 		bool IsEmptyBetweenLines (int start, int end)
 		{
 			for (int i = start + 1; i < end - 1; i++) {
-				DocumentLine lineSegment = textEditorData.GetLine (i);
+				var lineSegment = Editor.GetLine (i);
 				if (lineSegment == null)
 					break;
-				if (lineSegment.Length != textEditorData.GetLineIndent (lineSegment).Length)
+				if (lineSegment.Length != Editor.GetLineIndent (lineSegment).Length)
 					return false;
 				
 			}
 			return true;
 		}	
 		
-		IEntity GetMemberToDocument ()
+		ISymbol GetMemberToDocument ()
 		{
-			var parsedDocument = Document.UpdateParseDocument ();
-			
-			var type = parsedDocument.GetInnermostTypeDefinition (textEditorData.Caret.Location);
-			if (type == null) {
-				foreach (var t in parsedDocument.TopLevelTypeDefinitions) {
-					if (t.Region.BeginLine > textEditorData.Caret.Line) {
-						var ctx = (parsedDocument.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (Document.Compilation, t.Region.Begin);
-						return t.Resolve (ctx).GetDefinition ();
-					}
-				}
+			var parsedDocument = DocumentContext.ParsedDocument;
+			if (parsedDocument == null)
 				return null;
-			}
-			
-			IEntity result = null;
-			foreach (var member in type.Members) {
-				if (member.Region.Begin > new TextLocation (textEditorData.Caret.Line, textEditorData.Caret.Column) && (result == null || member.Region.Begin < result.Region.Begin) && IsEmptyBetweenLines (textEditorData.Caret.Line, member.Region.BeginLine)) {
-					var ctx = (parsedDocument.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (Document.Compilation, member.Region.Begin);
-					result = member.CreateResolved (ctx);
+			var semanticModel = parsedDocument.GetAst<SemanticModel> ();
+			if (semanticModel == null)
+				return null;
+			var caretOffset = Editor.CaretOffset;
+			var offset = caretOffset;
+			var root = semanticModel.SyntaxTree.GetRoot ();
+			while (offset < Editor.Length) {
+				var node = root.FindNode (TextSpan.FromBounds (offset, offset));
+				if (node == null || node.GetLastToken ().SpanStart < caretOffset) {
+					offset++;
+					continue;
+				}
+                var fieldDeclarationSyntax = node as FieldDeclarationSyntax;
+                if (fieldDeclarationSyntax != null) {
+					node = fieldDeclarationSyntax.Declaration.Variables.First ();
 				}
-			}
 
-			foreach (var member in type.NestedTypes) {
-				if (member.Region.Begin > new TextLocation (textEditorData.Caret.Line, textEditorData.Caret.Column) && (result == null || member.Region.Begin < result.Region.Begin) && IsEmptyBetweenLines (textEditorData.Caret.Line, member.Region.BeginLine)) {
-					var ctx = (parsedDocument.ParsedFile as CSharpUnresolvedFile).GetTypeResolveContext (Document.Compilation, member.Region.Begin);
-					result = member.Resolve (ctx).GetDefinition ();
+				var eventDeclaration = node as EventFieldDeclarationSyntax;
+				if (eventDeclaration != null) {
+					node = eventDeclaration.Declaration.Variables.First ();
 				}
+				var declaredSymbol = semanticModel.GetDeclaredSymbol (node); 
+				if (declaredSymbol != null)
+					return declaredSymbol;
+				offset = node.FullSpan.End + 1;
 			}
-			return result;
+			return null;
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocGenerator.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocGenerator.cs
index 5f3d13dbbc..22dfccc500 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocGenerator.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocGenerator.cs
@@ -28,10 +28,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml;
-using Mono.TextEditor;
 using MonoDevelop.Core;
 using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.DocFood
@@ -47,37 +48,38 @@ namespace MonoDevelop.DocFood
 			
 		}
 		
-		public DocGenerator (TextEditorData data)
+		public DocGenerator (IReadonlyTextDocument data)
 		{
 //			this.data = data;
 		}
 		
-		public static string GetBaseDocumentation (IEntity member)
+		public static string GetBaseDocumentation (ISymbol member)
 		{
-			if (member.DeclaringTypeDefinition == null)
+			if (member.ContainingType == null)
 				return null;
-			if (member is IMethod && (((IMethod)member).IsConstructor || ((IMethod)member).IsDestructor))
-				return null;
-			foreach (var type in member.DeclaringTypeDefinition.GetAllBaseTypeDefinitions ()) {
-				if (type.Equals (member.DeclaringTypeDefinition))
-					continue;
-				IMember documentMember = null;
-				foreach (var searchedMember in type.Members.Where (m => m.Name == member.Name)) {
-					if (searchedMember.SymbolKind == member.SymbolKind && searchedMember.Name == member.Name) {
-						if ((searchedMember is IParameterizedMember) && ((IParameterizedMember)searchedMember).Parameters.Count != ((IParameterizedMember)member).Parameters.Count)
-							continue;
-						if (searchedMember.Accessibility != member.Accessibility)
-							continue;
-						documentMember = searchedMember;
-						break;
-					}
-				}
-				if (documentMember != null) {
-					string documentation = AmbienceService.GetDocumentation (documentMember);
-					if (documentation != null)
-						return documentation;
-				}
-			}
+			// TODO: Roslyn port!
+//			if (member is IMethodSymbol && (((IMethodSymbol)member).IsConstructor || ((IMethodSymbol)member).IsDestructor))
+//				return null;
+//			foreach (var type in member.ContainingType.GetAllBaseTypeDefinitions ()) {
+//				if (type.Equals (member.ContainingType))
+//					continue;
+//				IMember documentMember = null;
+//				foreach (var searchedMember in type.Members.Where (m => m.Name == member.Name)) {
+//					if (searchedMember.SymbolKind == member.SymbolKind && searchedMember.Name == member.Name) {
+//						if ((searchedMember is IParameterizedMember) && ((IParameterizedMember)searchedMember).Parameters.Count != ((IParameterizedMember)member).Parameters.Count)
+//							continue;
+//						if (searchedMember.Accessibility != member.Accessibility)
+//							continue;
+//						documentMember = searchedMember;
+//						break;
+//					}
+//				}
+//				if (documentMember != null) {
+//					string documentation = AmbienceService.GetDocumentation (documentMember);
+//					if (documentation != null)
+//						return documentation;
+//				}
+//			}
 			return null;
 		}
 
@@ -124,34 +126,38 @@ namespace MonoDevelop.DocFood
 			}
 		}
 
-		public INamedElement member;
+		public ISymbol member;
 //		MemberVisitor visitor = new MemberVisitor ();
 		string currentType;
 		int wordCount;
 		
-		static string GetType (IEntity member)
+		static string GetType (ISymbol member)
 		{
-			switch (member.SymbolKind) {
+			switch (member.Kind) {
 			case SymbolKind.Event:
 				return "event";
 			case SymbolKind.Field:
 				return "field";
-			case SymbolKind.Constructor:
-				return "constructor";
-			case SymbolKind.Destructor:
-				return "destructor";
-			case SymbolKind.Operator:
-				return "operator";
 			case SymbolKind.Method:
+				switch (((IMethodSymbol)member).MethodKind) {
+				case MethodKind.StaticConstructor:
+				case MethodKind.Constructor:
+					return "constructor";
+				case MethodKind.Destructor:
+					return "destructor";
+				case MethodKind.UserDefinedOperator:
+				case MethodKind.BuiltinOperator:
+					return "operator";
+				}
 				return "method";
-//			case MemberType.Parameter:
-//				return "parameter";
-			case SymbolKind.Indexer:
-				return "indexer";
+			case SymbolKind.Parameter:
+				return "parameter";
 			case SymbolKind.Property:
+				if (((IPropertySymbol)member).IsIndexer)
+					return "indexer";
 				return "property";
-			case SymbolKind.TypeDefinition:
-				switch (((ITypeDefinition)member).Kind) {
+			case SymbolKind.NamedType:
+				switch (((INamedTypeSymbol)member).TypeKind) {
 				case TypeKind.Class:
 					return "class";
 				case TypeKind.Delegate:
@@ -228,14 +234,12 @@ namespace MonoDevelop.DocFood
 			return null;
 		}
 
-		static string GetName (object member)
+		static string GetName (ISymbol member)
 		{
-			if (member is IParameter)
-				return ((IParameter)member).Name;
-			return ((INamedElement)member).Name;
+			return member.Name;
 		}
 		
-		public bool EvaluateCondition (List<KeyValuePair<string, string>> conditions, object member)
+		public bool EvaluateCondition (List<KeyValuePair<string, string>> conditions, ISymbol member)
 		{
 			foreach (var condition in conditions) {
 				bool result = false;
@@ -245,42 +249,38 @@ namespace MonoDevelop.DocFood
 						result |= val == currentType;
 						break;
 					case "modifier":
-						if (member is IMember) {
-							if (val.ToUpperInvariant () == "STATIC"){
-								result |= ((IMember)member).IsStatic;
-							} else {
-								try {
-									var mod = (Accessibility)Enum.Parse (typeof(Accessibility), val);
-									result |=  ((IMember)member).Accessibility == mod;
-								} catch (Exception) {
-								}
+						if (val.ToUpperInvariant () == "STATIC"){
+							result |= member.IsStatic;
+						} else {
+							try {
+								var mod = (Accessibility)Enum.Parse (typeof(Accessibility), val);
+								result |=  member.DeclaredAccessibility == mod;
+							} catch (Exception) {
 							}
 						}
 						break;
 					case "paramCount":
-						if (member is IParameterizedMember)
-							result |= Int32.Parse (val) == ((IParameterizedMember)member).Parameters.Count;
+						var parameters = member.GetParameters ();
+						result |= Int32.Parse (val) == parameters.Length;
 						break;
 					case "parameter":
-						if (!(member is IParameterizedMember))
-							break;
+						parameters = member.GetParameters ();
 						string[] par = val.Split(':');
 						int idx = Int32.Parse (par[0]);
 						string name = par[1];
-						result |= idx < ((IParameterizedMember)member).Parameters.Count && name == ((IParameterizedMember)member).Parameters[idx].Name;
+						result |= idx < parameters.Length && name == parameters[idx].Name;
 						break;
 					case "returns":
-						if (member is IParameter) {
-							result |= val == ((IParameter)member).Type.ToString ();
+						if (member is IParameterSymbol) {
+							result |= val == ((IParameterSymbol)member).Type.ToString ();
 							break;
 						}
-						if ((member as IMember) == null)
-							break;
-						result |= val == ((IMember)member).ReturnType.ToString ();
+
+						result |= val == member.GetReturnType ().ToString ();
 						break;
 					case "name":
-						IMethod method = member as IMethod;
-						if (method != null && method.IsSynthetic) {
+						var method = member as IMethodSymbol;
+						if (method != null && method.MethodKind == MethodKind.UserDefinedOperator) {
 							string op = GetOperator (method.Name);
 							if (op != null) {
 								result |= val == op;
@@ -293,17 +293,18 @@ namespace MonoDevelop.DocFood
 					case "endsWith":
 						if (member == null)
 							break;
-						result |= GetName (member).EndsWith (val);
+						result |= GetName (member).EndsWith (val, StringComparison.Ordinal);
 						break;
 					case "startsWith":
 						if (member == null)
 							break;
-						result |= GetName (member).StartsWith (val);
+						result |= GetName (member).StartsWith (val, StringComparison.Ordinal);
 						break;
 					case "startsWithWord":
 						if (member == null)
 							break;
-						result |= GetName (member).StartsWith (val);
+						var name2 = SeparateWords (GetName (member));
+						result |= name2.StartsWith (val + " ");
 						break;
 					case "wordCount":
 						result |= Int32.Parse (val) == wordCount;
@@ -319,7 +320,7 @@ namespace MonoDevelop.DocFood
 		}
 		
 		internal string curName;
-		public void GenerateDoc (IEntity member)
+		public void GenerateDoc (ISymbol member)
 		{
 			Init (member);
 			
@@ -327,9 +328,9 @@ namespace MonoDevelop.DocFood
 			this.currentType = GetType (member);
 			DocConfig.Instance.Rules.ForEach (r => r.Run (this, member));
 			
-			if (member is IParameterizedMember) {
+			if (member is IPropertySymbol || member is IMethodSymbol) {
 				this.currentType = "parameter";
-				foreach (var p in ((IParameterizedMember)member).Parameters) {
+				foreach (var p in member.GetParameters ()) {
 					curName = p.Name;
 					this.member = member;
 					SplitWords (p, p.Name);
@@ -337,8 +338,8 @@ namespace MonoDevelop.DocFood
 				}
 			}
 			
-			if (member is IMethod) {
-				IMethod method = (IMethod)member;
+			if (member is IMethodSymbol) {
+				var method = (IMethodSymbol)member;
 				int count = 1;
 				foreach (var param in method.TypeParameters) {
 					this.currentType = "typeparam";
@@ -398,7 +399,7 @@ namespace MonoDevelop.DocFood
 //			}
 		}
 
-		void Init (IEntity member)
+		void Init (ISymbol member)
 		{
 			if (member == null)
 				throw new ArgumentNullException ("member");
@@ -414,9 +415,9 @@ namespace MonoDevelop.DocFood
 			foreach (var macro in DocConfig.Instance.Macros) {
 				tags.Add (macro.Key, macro.Value);
 			}
-			if (member.DeclaringTypeDefinition != null) {
-				tags ["DeclaringType"] = "<see cref=\"" + member.DeclaringTypeDefinition.ReflectionName + "\"/>";
-				switch (member.DeclaringTypeDefinition.Kind) {
+			if (member.ContainingType != null) {
+				tags ["DeclaringType"] = "<see cref=\"" + member.ContainingType.GetDocumentationCommentId () + "\"/>";
+				switch (member.ContainingType.TypeKind) {
 				case TypeKind.Class:
 					tags ["DeclaringTypeKind"] = "class";
 					break;
@@ -434,13 +435,14 @@ namespace MonoDevelop.DocFood
 					break;
 				}
 			}
-			if (member is IMember)
-				tags ["ReturnType"] = ((IMember)member).ReturnType != null ? "<see cref=\"" + ((IMember)member).ReturnType + "\"/>" : "";
+			var returnType = member.GetReturnType ();
+			tags ["ReturnType"] = returnType != null ? "<see cref=\"" + returnType.GetDocumentationCommentId () + "\"/>" : "";
 			tags ["Member"] = "<see cref=\"" + member.Name + "\"/>";
 
 			
-			if (member is IParameterizedMember) {
-				List<string> parameterNames = new List<string> (from p in ((IParameterizedMember)member).Parameters select p.Name);
+			if (member is IPropertySymbol || member is IMethodSymbol) {
+				var parameters = member.GetParameters ();
+				var parameterNames = new List<string> (from p in parameters select p.Name);
 				tags ["ParameterSentence"] = string.Join (" ", parameterNames.ToArray ());
 				StringBuilder paramList = new StringBuilder ();
 				for (int i = 0; i < parameterNames.Count; i++) {
@@ -454,25 +456,25 @@ namespace MonoDevelop.DocFood
 					paramList.Append (parameterNames [i]);
 				}
 				tags ["ParameterList"] = paramList.ToString ();
-				for (int i = 0; i < ((IParameterizedMember)member).Parameters.Count; i++) {
-					tags ["Parameter" + i + ".Type"] = ((IParameterizedMember)member).Parameters [i].Type != null ? "<see cref=\"" + ((IParameterizedMember)member).Parameters [i].Type + "\"/>" : "";
-					tags ["Parameter" + i + ".Name"] = "<c>" + ((IParameterizedMember)member).Parameters [i].Name + "</c>";
+				for (int i = 0; i < parameters.Length; i++) {
+					tags ["Parameter" + i + ".Type"] = parameters [i].Type != null ? "<see cref=\"" + parameters [i].Type + "\"/>" : "";
+					tags ["Parameter" + i + ".Name"] = "<c>" + parameters [i].Name + "</c>";
 				}
 				
-				var property = member as IProperty;
+				var property = member as IPropertySymbol;
 				if (property != null) {
-					var hasPublicGetter = property.Getter != null && property.Getter.Accessibility != Accessibility.Private;
-					var hasPublicSetter = property.Setter != null && property.Setter.Accessibility != Accessibility.Private;
+					var hasPublicGetter = property.GetMethod != null && property.GetMethod.DeclaredAccessibility != Accessibility.Private;
+					var hasPublicSetter = property.SetMethod != null && property.SetMethod.DeclaredAccessibility != Accessibility.Private;
 
-					if (property.CanGet && property.CanSet && hasPublicGetter && hasPublicSetter) {
+					if (property.GetMethod != null && property.SetMethod != null && hasPublicGetter && hasPublicSetter) {
 						tags ["AccessText"] = "Gets or sets";
-					} else if (property.CanGet && hasPublicGetter) {
+					} else if (property.GetMethod != null && hasPublicGetter) {
 						tags ["AccessText"] = "Gets";
 					} else if (hasPublicSetter) {
 						tags ["AccessText"] = "Sets";
-					} else if (property.CanGet && property.CanSet) {
+					} else if (property.GetMethod != null && property.SetMethod != null) {
 						tags ["AccessText"] = "Gets or sets";
-					} else if (property.CanGet) {
+					} else if (property.GetMethod != null) {
 						tags ["AccessText"] = "Gets";
 					} else {
 						tags ["AccessText"] = "Sets";
@@ -875,90 +877,112 @@ namespace MonoDevelop.DocFood
 		
 		void SplitWords (object obj, string name)
 		{
-			StringBuilder result = new StringBuilder ();
-			bool wasUnderscore = false;
-			for (int i = 0; i < name.Length; i++) {
-				char ch = name [i];
-				if (ch == '_') {
-					wasUnderscore = true;
-					continue;
+			if (obj is ITypeSymbol){
+				var type = (ITypeSymbol)obj;
+				if (type.TypeKind == TypeKind.Interface && name.Length > 1 && name[0] == 'I' && char.IsUpper (name[1])) {
+					name = name.Substring (1);
 				}
-				if (char.IsUpper (ch) || wasUnderscore) {
-					wasUnderscore = false;
-					if (result.Length > 0)
-						result.Append (" ");
-					if (i + 1 < name.Length && char.IsUpper (name[i + 1])) {
-						while (i + 1 < name.Length && char.IsUpper (name[i + 1])) {
-							result.Append (name[i]);
-							i++;
-						}
-						if (i + 1 < name.Length) {
-							result.Append (" ");
-							result.Append (char.ToLower (name[i]));
-						}
-						continue;
-					}
-				}
-				wasUnderscore = false;
-				result.Append (char.ToLower (ch));
 			}
-			
-			List<string> words = new List<string> (result.ToString ().Split (' '));
+
+			List<string> words = new List<string> (SeparateWords (name).Split (' '));
 			wordCount = words.Count;
 			for (int i = 0; i < words.Count; i++) {
-				string lowerWord = words[i].ToLower ();
+				string lowerWord = words [i].ToLower ();
 				if (DocConfig.Instance.WordExpansions.ContainsKey (lowerWord)) {
-					words[i] = DocConfig.Instance.WordExpansions[lowerWord];
-				} else if (DocConfig.Instance.WordLists["acronyms"].Contains (words[i].ToUpper ())) {
-					words[i] = words[i].ToUpper ();
+					words [i] = DocConfig.Instance.WordExpansions [lowerWord];
+				} else if (DocConfig.Instance.WordLists ["acronyms"].Contains (words [i].ToUpper ())) {
+					words [i] = words [i].ToUpper ();
 				}
 			}
-			tags["First"] = words[0];
-			tags["AllWords"] = string.Join (" ", words.ToArray ());
-			tags["AllWordsExceptFirst"] = string.Join (" ", words.ToArray (), 1, words.Count - 1);
-			
+			tags ["First"] = words [0];
+			tags ["AllWords"] = string.Join (" ", words.ToArray ());
+			tags ["AllWordsExceptFirst"] = string.Join (" ", words.ToArray (), 1, words.Count - 1);
+
 			int theIndex = 0;
 			int ofTheIndex = 0;
-			if (obj is IMethod) {
+			if (obj is IMethodSymbol) {
 				theIndex = ofTheIndex = 1;
 			}
-			
-			if (ofTheIndex < words.Count && DocConfig.Instance.WordLists["prefixThe"].Contains (words[ofTheIndex].ToLower ()))
+
+			if (ofTheIndex < words.Count && DocConfig.Instance.WordLists ["prefixThe"].Contains (words [ofTheIndex].ToLower ()))
 				ofTheIndex++;
-			
+
 			int ofIndex = words.Count - 1;
-			if (ofTheIndex + 1 < words.Count && DocConfig.Instance.WordLists["ofThe"].Contains (words[ofIndex].ToLower ())) {
-				string word = words[ofIndex];
+			if (ofTheIndex + 1 < words.Count && DocConfig.Instance.WordLists ["ofThe"].Contains (words [ofIndex].ToLower ())) {
+				string word = words [ofIndex];
 				words.RemoveAt (ofIndex);
 				words.Insert (ofTheIndex, "the");
 				words.Insert (ofTheIndex, "of");
 				words.Insert (ofTheIndex, word);
-			} 
+			}
 
-			tags["FirstAsVerbPastParticiple"] = GetPastParticipleVerb (words[0]);
-			if (obj is IMethod && words.Count > 1) {
-				if (words[0].EndsWith("s")) {
-					words[0] += "es";
-				} else if (words[0].EndsWith("y")) {
-					words[0] = words[0].Substring (0, words[0].Length - 1) + "ies";
+			tags ["FirstAsVerbPastParticiple"] = GetPastParticipleVerb (words [0]);
+			if (obj is IMethodSymbol && words.Count > 1) {
+				if (words [0].EndsWith ("s")) {
+					words [0] += "es";
+				} else if (words [0].EndsWith ("y")) {
+					words [0] = words [0].Substring (0, words [0].Length - 1) + "ies";
 				} else {
-					words[0] += "s";
+					words [0] += "s";
 				}
 				theIndex = 1;
 			}
-			
-			tags["FirstAsVerb"] = words[0];
-			
-			if (theIndex < words.Count && !DocConfig.Instance.WordLists["noThe"].Contains (words[theIndex].ToLower ()))
+
+			tags ["FirstAsVerb"] = words [0];
+
+			if (theIndex < words.Count && !DocConfig.Instance.WordLists ["noThe"].Contains (words [theIndex].ToLower ()))
 				words.Insert (theIndex, "the");
-			
-			tags["Sentence"] = string.Join (" ", words.ToArray ());
+
+			tags ["Sentence"] = string.Join (" ", words.ToArray ());
 		}
-		
+
+		static string SeparateWords (string name)
+		{
+			var result = new StringBuilder ();
+			bool wasUnderscore = false;
+			for (int i = 0; i < name.Length; i++) {
+				char ch = name [i];
+				if (ch == '_') {
+					wasUnderscore = true;
+					continue;
+				}
+				if (char.IsUpper (ch) || wasUnderscore) {
+					wasUnderscore = false;
+					if (result.Length > 0)
+						result.Append (" ");
+					if (i + 1 < name.Length && char.IsUpper (name [i + 1])) {
+						int j = i;
+						while (i < name.Length && char.IsUpper (name [i])) {
+							i++;
+						}
+						if (i >= name.Length || name [i] == '_') {
+							if (i != j)
+								result.Append (name.Substring (j, i - j).ToLower ());
+							continue;
+						}
+						if (i != j)
+							result.Append (name.Substring (j, i - j));
+						if (i + 1 < name.Length) {
+							result.Append (" ");
+							result.Append (char.ToLower (name [i]));
+						}
+						continue;
+					}
+				}
+				wasUnderscore = false;
+				result.Append (char.ToLower (ch));
+			}
+
+			return result.ToString ();
+		}
+
+
 		public void Set (string name, string parameterName, string doc)
 		{
-			if (name.StartsWith ("param") && name.Length > "param".Length) {
-				parameterName = ((IParameterizedMember)member).Parameters[int.Parse (name.Substring("param".Length))].Name;
+			if (name.StartsWith ("param", StringComparison.Ordinal) && name.Length > "param".Length) {
+				var parameters = member.GetParameters ();
+				var idx = int.Parse (name.Substring ("param".Length));
+				parameterName = idx < parameters.Length ? parameters [idx].Name : "unknown";
 				name = "param";
 			}
 			Section newSection = new Section (name);
@@ -981,7 +1005,7 @@ namespace MonoDevelop.DocFood
 		}
 		
 		#region implemented abstract members of MonoDevelop.Projects.Text.DocGenerator
-		public override string GenerateDocumentation (IMember member, string linePrefix)
+		public override string GenerateDocumentation (ISymbol member, string linePrefix)
 		{
 			return DocumentBufferHandler.GenerateDocumentation (null, member, "", linePrefix);
 		}
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfNotStatement.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfNotStatement.cs
index 4112858c7a..08dfc750f7 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfNotStatement.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfNotStatement.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using System.Xml;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.DocFood
 {
@@ -32,7 +33,7 @@ namespace MonoDevelop.DocFood
 	{
 		public const string XmlTag = "IfNot";
 		
-		public override void Run (DocGenerator generator, object member)
+		public override void Run (DocGenerator generator, ISymbol member)
 		{
 			if (!generator.EvaluateCondition (Attributes, member))
 				Children.ForEach (child => child.Run (generator, member));
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfStatement.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfStatement.cs
index d9c30a53df..022242e8b9 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfStatement.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/IfStatement.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using System.Xml;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.DocFood
 {
@@ -32,7 +33,7 @@ namespace MonoDevelop.DocFood
 	{
 		public const string XmlTag = "If";
 		
-		public override void Run (DocGenerator generator, object member)
+		public override void Run (DocGenerator generator, ISymbol member)
 		{
 			if (generator.EvaluateCondition (Attributes, member))
 				Children.ForEach (child => child.Run (generator, member));
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/MemberVisitor.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/MemberVisitor.cs
index 74afb6872e..d3e79c295a 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/MemberVisitor.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/MemberVisitor.cs
@@ -24,22 +24,21 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using ICSharpCode.NRefactory.CSharp;
 using System.Collections.Generic;
 
 namespace MonoDevelop.DocFood
 {
-	class MemberVisitor : DepthFirstAstVisitor<object, object>
-	{
-		public List<AstType> Exceptions = new List<AstType> ();
-		
-		public override object VisitThrowStatement (ThrowStatement throwStatement, object data)
-		{
-			var oce = throwStatement.Expression as ObjectCreateExpression;
-			if (oce != null)
-				Exceptions.Add (oce.Type);
-			return null;
-		}
-	}
+//	class MemberVisitor : DepthFirstAstVisitor<object, object>
+//	{
+//		public List<AstType> Exceptions = new List<AstType> ();
+//		
+//		public override object VisitThrowStatement (ThrowStatement throwStatement, object data)
+//		{ 
+//			var oce = throwStatement.Expression as ObjectCreateExpression;
+//			if (oce != null)
+//				Exceptions.Add (oce.Type);
+//			return null;
+//		}
+//	}
 }
 
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Node.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Node.cs
index cb67dfea17..0897c0e43b 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Node.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Node.cs
@@ -27,6 +27,7 @@ using System;
 using System.Collections.Generic;
 using System.Xml;
 using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.DocFood
 {
@@ -39,12 +40,12 @@ namespace MonoDevelop.DocFood
 		
 		public List<Node> Children = new List<Node> ();
 		
-		public Node ()
+		protected Node ()
 		{
 			Attributes = new List<KeyValuePair<string, string>> ();
 		}
 		
-		public abstract void Run (DocGenerator generator, object member);
+		public abstract void Run (DocGenerator generator, ISymbol member);
 		
 		public void SetAttribute (string name, string value)
 		{
@@ -63,7 +64,7 @@ namespace MonoDevelop.DocFood
 		
 		public static List<Node> ReadNodeList (XmlReader reader, string tag)
 		{
-			List<Node> result = new List<Node> ();
+			var result = new List<Node> ();
 			XmlReadHelper.ReadList (reader, tag, delegate () {
 				switch (reader.LocalName) {
 				case Section.XmlTag:
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Section.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Section.cs
index 75ef11856f..0fbf9c19f4 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Section.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Section.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Xml;
 using MonoDevelop.Core;
 using System.Linq;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.DocFood
 {
@@ -54,7 +55,7 @@ namespace MonoDevelop.DocFood
 			this.Name = name;
 		}
 		
-		public override void Run (DocGenerator generator, object member)
+		public override void Run (DocGenerator generator, ISymbol member)
 		{
 			string str = StringParserService.Parse (Documentation, generator.tags).Trim ();
 			if (!char.IsUpper (str[0]))
diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/SwitchStatement.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/SwitchStatement.cs
index 3170e35215..e50140d17d 100644
--- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/SwitchStatement.cs
+++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/SwitchStatement.cs
@@ -27,6 +27,9 @@ using System;
 using System.Collections.Generic;
 using System.Xml;
 using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+
+
 namespace MonoDevelop.DocFood
 {
 	class SwitchStatement : Node
@@ -43,7 +46,7 @@ namespace MonoDevelop.DocFood
 			CaseSections = new List<Node> ();
 		}
 		
-		public override void Run (DocGenerator generator, object member)
+		public override void Run (DocGenerator generator, ISymbol member)
 		{
 			if (!generator.EvaluateCondition (Attributes, member))
 				return;
@@ -73,7 +76,7 @@ namespace MonoDevelop.DocFood
 		
 		public static SwitchStatement Read (XmlReader reader)
 		{
-			SwitchStatement result = new SwitchStatement ();
+			var result = new SwitchStatement ();
 			if (reader.MoveToFirstAttribute ()) {
 				do {
 					result.SetAttribute (reader.LocalName, reader.Value);
@@ -94,11 +97,11 @@ namespace MonoDevelop.DocFood
 			return result;
 		}
 		
-		public class CaseStatement : Node
+		class CaseStatement : Node
 		{
 			public const string XmlTag = "Case";
 			
-			public override void Run (DocGenerator generator, object member)
+			public override void Run (DocGenerator generator, ISymbol member)
 			{
 				if (generator.EvaluateCondition (Attributes, member))
 					Children.ForEach (child => child.Run (generator, member));
diff --git a/main/src/addins/MonoDevelop.DocFood/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.DocFood/gtk-gui/generated.cs
index 75935e2e55..c75fb5f90c 100644
--- a/main/src/addins/MonoDevelop.DocFood/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.DocFood/gtk-gui/generated.cs
@@ -1,3 +1,4 @@
+#pragma warning disable 436
 
 // This file has been generated by the GUI designer. Do not modify.
 namespace Stetic
diff --git a/main/src/addins/MonoDevelop.Gettext/ChangeLog b/main/src/addins/MonoDevelop.Gettext/ChangeLog
deleted file mode 100644
index 77c63490fd..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/ChangeLog
+++ /dev/null
@@ -1,1512 +0,0 @@
-2010-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext/Catalog.cs: Track api changes.
-
-2010-07-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Replaced
-	  custom workerthread with
-	  system.compontentmodel.backgroundworker.
-
-2010-06-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext.addin.xml: Fix icon size names.
-
-2010-06-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/TranslationProject.xpt.xml: Don't include the
-	  assembly name in the project type name since it doesn't work
-	  well when running on .NET
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext/GettextFeatureWidget.cs:
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	  Fix incorrect use of ShowCustomDialog/RunCustomDialog.
-
-2010-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	  Use ShowCustomDialog (which destroys the dialog when done)
-	  instead of RunCustomDialog (which doesn't).
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext/GettextFeatureWidget.cs:
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	  More dialog placing.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs: ViewContent
-	  widgets are now destroyed by the workspace window.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: call destroy
-	  instead of dispose.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Gettext.addin.xml: Bumped MD version.
-
-2010-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Use the new
-	  status bar model.
-
-	* gtk-gui/objects.xml: Flush.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Commands.cs:
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* MonoDevelop.Gettext.csproj:
-	* MonoDevelop.Gettext.addin.xml:
-	* MonoDevelop.Gettext/Catalog.cs:
-	* MonoDevelop.Gettext/TranslationProject.cs:
-	* MonoDevelop.Gettext/GettextFeatureWidget.cs:
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs:
-	* MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs:
-	* MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs:
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	* MonoDevelop.Gettext.NodeBuilders/ProjectFileNodeBuilderExtension.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Alexander
-	  Cherniuk <ts33kr@gmail.com>: Make the font inside the editor
-	  to be configurable, rather that being hardcoded.
-
-2010-03-09  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs: Improved
-	  gettext addin gui.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Track api
-	  changes.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.addin.xml:
-	* templates/TranslationProject.xpt.xml:
-	* MonoDevelop.Gettext/TranslationService.cs: Removed useless
-	  startup handler.
-
-2010-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Track API
-	  changes for lazy loading images.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext/GettextFeature.cs: Track api changes.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs:
-	* gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs:
-	  Flush.
-
-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs:
-	  Track DisplayBinding API.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext/Translation.cs:
-	* MonoDevelop.Gettext/TranslationProject.cs: Introduced the
-	  ConfigurationSelector class to all methods that previously
-	  took a configuration name as string. This eliminates the
-	  ambiguity between solution configuration names and project
-	  configuration names.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Gettext.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Gettext.csproj:
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs:
-	* gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs:
-	  Flush.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Gettext.addin.xml: Bump MD version.
-
-2009-10-01  David Makovský  <yakeen@sannyas-on.net>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: fixed
-	  translatable string typo
-
-2009-09-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Optimized
-	  gettext editor.
-
-2009-09-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Force reset of
-	  scrollbars when changing text.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs: 
-	* MonoDevelop.Gettext/GettextFeatureWidget.cs: Make dialogs transient
-	  for the root window.
-
-2009-09-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Fixed progress
-	  bar status message.
-
-2009-09-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Show file icon
-	  in found in list.
-
-2009-08-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.addin.xml: Don't use the text editor
-	  display binding id as reference for registering the gettext
-	  view. Use DefaultDisplayBinding instead. Removed unused
-	  supportedextensions attribute.
-
-2009-08-28  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs:
-	  Fixed Bug 481221 - Translation editor doesn't show
-	  whitespaces & Bug 481222 - Original translatable string is
-	  vertically centered.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: fixed
-	  tooltips.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext/Catalog.cs: Handled same bug in
-	  different method.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext/Catalog.cs: Handled possible exception
-	  (I think I've encountered a mono bug).
-
-2009-08-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Fix build
-	  error.
-
-2009-08-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.Editor\POEditorWidget.cs: Track api
-	  changes.
-
-2009-08-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext/Translation.cs:
-	* MonoDevelop.Gettext/TranslationProject.cs: Quote filenames
-	  when invoking msmerge and msgfmt. Fixes bug #529200.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs:
-	* gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs:
-	  Flush.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	  Use the new api from removing projects from a solution.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Use the new
-	  DesktopService instead of PlatformService.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext\Translation.cs:
-	* MonoDevelop.Gettext\TranslationProject.cs: Use the new
-	  FilePath class for handling file and directory paths.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.addin.xml: Ensure that the display
-	  binding is inserted before the text editor
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Added rule for
-	  '_' in translation, but not original string.
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Added new
-	  translation rule - translation should end with ' ' when
-	  original string ends with ' '.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.Gettext.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.addin.xml:
-	* MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs:
-	  Removed icon service.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Gettext.addin.xml: Bump MD version.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext.csproj: Don't local-copy project refs.
-
-2009-03-13  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs:
-	  Making some strings not translatable.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.csproj: Moved text editor to core
-
-2009-03-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs:
-	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs: Added
-	  undo/redo support to the gettext editor.
-
-2009-03-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: fixed "Bug
-	  480125 - Gettext editor's filter is buggy".
-
-2009-03-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Removed some
-	  debug messages.
-
-2009-03-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* icons/silk_error.png:
-	* icons/silk_accept.png:
-	* MonoDevelop.Gettext.csproj:
-	* icons/silk_exclamation.png:
-	* MonoDevelop.Gettext.addin.xml:
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs: Added silk
-	  icons to replace the old fuzzy/missing/valid icons. (But I'm
-	  still unsure what to take)
-
-2009-03-06  Mike Krüger  <mkrueger@novell.com>
-
-	* icons/translation-fuzzy-16.png:
-	* icons/translation-valid-16.png:
-	* icons/translation-missing-16.png: Worked on icons.
-
-2009-03-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Gettext.csproj:
-	* MonoDevelop.Gettext.addin.xml:
-	* icons/translation-valid-16.png:
-	* icons/translation-fuzzy-16.png:
-	* icons/translation-missing-16.png:
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs: Now using
-	  custom icons for fuzzy/missing/valid translations instead of
-	  abusing system icons.
-
-2009-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Fixed gettext
-	  options menu.
-
-2009-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: fixed "Bug
-	  481217 - Translation editor is unusable with dark themes".
-
-2009-02-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Translation
-	  fixes. Patch from Kriván Bálint.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.csproj: Flush.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.addin.xml:
-	* MonoDevelop.Gettext/PropertyProvider.cs:
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Worked on
-	  propertygrid localization.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* MonoDevelop.Gettext.csproj:
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs:
-	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs: Fixed "Bug
-	  479376 - remove extra error check in Gettext addin".
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Changed
-	  override Destroy --> override OnDestroyed.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/objects.xml: 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs:
-	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs: Worked on
-	  ressource de-allocation.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.addin.xml:
-	* MonoDevelop.Gettext/Translation.cs:
-	* MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs:
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	  Track merge of the project pad context menu.
-
-2009-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: fixed "Bug
-	  478442 - Really hard to edit PO files because of slowness"
-
-2009-02-19  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml: 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: fixed "Bug
-	  477062 - Sorting on status column of translation view causes
-	  hang".
-
-2009-02-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext/Catalog.cs: Don't write newlines into
-	  empty (untranslated) messages, as this breaks msgfmt. Add a
-	  log message instead of silently swallowing an exception.
-
-2009-02-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext/GettextTool.cs: Handle general solution
-	  files, not just mds.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext.csproj: Exorcise more unwanted local
-	  copy.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext.csproj: Flush MD's removal of newline at
-	  end of file that was introduced by manually editing with
-	  gedit.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext.csproj: Remove invalid ApplicationIcon
-	  value that broke the build in VS.
-
-2009-02-06  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/objects.xml: 
-
-	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs: fixed
-	  catalog editor view
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.mdp:
-	* MonoDevelop.Gettext.csproj: Migrated to MSBuild file format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Gettext.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs:
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs:
-	*
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs:
-	  Flush.
-
-2009-01-29  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext/Catalog.cs: Rename UserInformation to
-	AuthorInformation, and change other strings correspondingly.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext.mdp: Flush project format changes.
-
-2009-01-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext/Catalog.cs:
-	* MonoDevelop.Gettext/CatalogParser.cs:
-	* MonoDevelop.Gettext/TranslationProject.cs:
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs:
-	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs:
-	* MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs: Use the
-	UserInformation API, which requires a parent SolutionItem.
-
-2008-12-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/objects.xml: TooltipWindow has been moved to MD.Components.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Gettext/RegexFileScanner.cs: Remove debug writelines.
-
-2008-11-24  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: set labels on the
-	valid/missing/fuzzy filter buttons. Use a MenuButton to ensure 
-	proper menu placement on the options button.  Fixes #367274.
-
-2008-11-24  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.Gettext.Editor/CatalogHeadersWidget.cs: some null
-	guarding for a couple strings.
-
-2008-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* icons/locale.svg:
-	* MonoDevelop.Gettext.mdp:
-	* MonoDevelop.Gettext.addin.xml: Removed the locale.svg file.
-	PixbufLoader does not support svg in all platforms.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build dependencies.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Gettext.addin.xml: Bump MD version.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml,
-	  MonoDevelop.Gettext.NodeBuilders/ProjectFileNodeBuilderExtension.cs,
-	  MonoDevelop.Gettext.mdp, Commands.cs, Makefile.am: Added quick
-	  property for enabling translation of files. Supports multi-select.
-
-2008-09-24  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs: fixed some minor
-	  issues in the po editor.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.mdp: Updated projects.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs:
-	  Updated generated code.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	  Moved the extensible tree view to its own directory.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Don't set the dirty flag
-	  when a translation is added while loading the project.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.mdp,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/gui.stetic: Updated.
-	* MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/Translation.cs: Properly check if a translation
-	  needs to be built.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* GettextProjectBinding.cs, MonoDevelop.Gettext/Translation.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: Moved serialization
-	  engine to MonoDevelop.Core. Use new syntax for specifying attribute
-	  scope.
-
-2008-06-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs: fixed bug in
-	  options dialog.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Bump MD version.
-
-2008-06-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs, gtk-gui/gui.stetic: Use
-	  the OnDestroyed event instead of Dispose, since with the latest
-	  changes in gtk#, Dispose is not called anymore when a widget is
-	  destroyed.
-
-2008-06-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Track api changes.
-
-2008-05-30  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs,
-	  MonoDevelop.Gettext.Editor/CatalogEditorView.cs: Fixed bug (gettext
-	  addin didn't work).
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Replaced
-	  ICompilerResult/DefaultCompilerResult/CompilerResults by a new
-	  BuildResult class, which has owner information at error level, so
-	  it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext.mdp,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs,
-	  gtk-gui/gui.stetic, Makefile.am,
-	  MonoDevelop.Gettext/MakefileHandler.cs,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs,
-	  MonoDevelop.Gettext/GettextTool.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/Translation.cs,
-	  MonoDevelop.Gettext/GettextFeature.cs,
-	  MonoDevelop.Gettext/GettextFeatureWidget.cs,
-	  MonoDevelop.Gettext/TranslationCollection.cs: New project model
-	  changes.
-
-2008-05-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Set "isText" attribute on the mimetype
-	  definitions.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Use the new mime type extension to
-	  register new file types.
-
-2008-03-18  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: POEditor has a new rule
-	  (checks for {0}, {1}, {*} mismatch). Rules are now threaded.
-
-2008-03-14  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs,
-	  gtk-gui/gui.stetic: Worked on gettext addin.
-
-2008-03-13  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/gui.stetic: Made the language chooser dialog gnome compliant.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs: Worked on
-	  gnome hig compliant alerts.
-
-2008-03-02  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Workaraound a bug in mono
-	  1.2.4 where anonymous delegates ignore usings.
-
-2008-03-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Filter is not preserved
-	  anymore (this was more annoying than helpful).
-
-2008-03-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs: Added some filter
-	  options.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  Commands.cs, MonoDevelop.Gettext/TranslationProject.cs: Added command to
-	  update a single translation.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Added many shortcuts.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs: Fixed bug in po editor.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  MonoDevelop.Gettext/Catalog.cs: Not longer using Thread.Abort
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: filter updates more nicely.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs: Refactored status bar.
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Untranslated <--> translated
-	  update now works in entry list.
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/CatalogParser.cs: Fixed plural message bug.
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Columns are now resizeable.
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs: Improved ui: original
-	  strings are now selectable.Fixed ui glitch: original string in the
-	  entrylist is now in gettext format too.
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  MonoDevelop.Gettext/StringEscaping.cs,
-	  MonoDevelop.Gettext/PluralForms.cs: Now using the gettext format for
-	  text input instead of the plain text (otherwise the translation of some
-	  strings is impossible and I assume that the translators are used to the
-	  \n, \r, \t escape sequences).
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  MonoDevelop.Gettext.Editor/CatalogHeadersWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  MonoDevelop.Gettext/CatalogParser.cs,
-	  MonoDevelop.Gettext/CatalogEntry.cs,
-	  MonoDevelop.Gettext/CatalogHeaders.cs, MonoDevelop.Gettext/Catalog.cs:
-	  Refactored gettext addin, fixed bug in headers widget.
-
-2008-02-26  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs,
-	  MonoDevelop.Gettext.Editor/CatalogEditorView.cs,
-	  MonoDevelop.Gettext.Editor/CatalogEditor.cs,
-	  MonoDevelop.Gettext.Editor/CatalogHeadersWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs,
-	  MonoDevelop.Gettext/CatalogHeaders.cs, MonoDevelop.Gettext/Catalog.cs:
-	  Fixed bug in header editor. Added feature to ensure that no line end is
-	  forgotton or accidentally added.
-
-2008-02-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Made the update operation a
-	  lot faster.
-
-2008-02-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/StringEscaping.cs: Fixed bug in FromGettextFormat.
-
-2008-02-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Added shortcuts to menu items.
-
-2008-02-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/CatalogParser.cs: Fixed multiline bug.
-
-2008-02-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  MonoDevelop.Gettext/StringEscaping.cs,
-	  MonoDevelop.Gettext/CatalogDeletedEntry.cs,
-	  MonoDevelop.Gettext/RegexFileScanner.cs,
-	  MonoDevelop.Gettext/CatalogParser.cs,
-	  MonoDevelop.Gettext/CatalogEntry.cs, MonoDevelop.Gettext/Catalog.cs:
-	  Fixed some gettext issues (at least for monodevelop/german it works now)
-
-2008-02-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: gettext pad now updates the
-	  changes in the translated message list.
-
-2008-02-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs: Added
-	  some tooltips for the description button
-
-2008-02-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs,
-	  MonoDevelop.Gettext/StringEscaping.cs: Added filter & sort functions to
-	  the gettext editor.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.mdp, gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  MonoDevelop.Gettext/TranslationService.cs: Removed reference to
-	  gnome-vfs-sharp and fixed 2 warnings.
-
-2008-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	  Handle the delete key in TreeViewPad, so it will work event if the
-	  shortcut is not defined.
-
-2008-02-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Include .po files in the list
-	  of exportable files of the project. Fixes bug #362567.
-
-2008-01-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml, MonoDevelop.Gettext/RegexFileScanner.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/IncludeExtensionNode.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/RegexScannerExtensionNode.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/XmlRegexScannerExtensionNode.cs:
-	  Rework unescaping of C# and XML translatable strings.
-	* MonoDevelop.Gettext.mdp, Makefile.am: Updated.
-	* MonoDevelop.Gettext/StringEscaping.cs: Helper class for
-	  escaping/unescaping text.
-	* MonoDevelop.Gettext/Catalog.cs: Rework escaping of strings.
-	
-	Fixes "Bug 355967 - Translation issues with regex toolkit descriptions".
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Update MD version.
-
-2008-01-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/Makefile.am.template: CLEANFILES must be set before including
-	  Makefile.include.
-
-2008-01-23  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Gettext/RegexFileScanner.cs: Remove debug code.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Performance improvement.
-
-2008-01-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs: Make
-	  string translatable.
-	* MonoDevelop.Gettext/TranslationProject.cs: Wait for child process's output
-	  before writing completion message.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/TranslationProject.xpt.xml: Make template categories
-	  translatable.
-
-2008-01-04  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Handle simple concatenated strings in C#.
-	  Allows line breaks when specifying long strings.
-	* MonoDevelop.Gettext/RegexFileScanner.cs: Apply transforms to plural
-	  strings as well. Add the capability to specify regex options.
-	* MonoDevelop.Gettext.ExtensionNodes/TransformExtensionNode.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/ExcludeRegex.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/IncludeExtensionNode.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/RegexScannerExtensionNode.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/XmlRegexScannerExtensionNode.cs: Add
-	  the capability to specify regex options.
-
-2008-01-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Plural string regexes needed to capture
-	  first string. Partial fix for "Bug 351017 - Gettext addin is extracting
-	  some translation messages wrongly".
-
-2007-12-31  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* gtk-gui/gui.stetic,
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs: Fixed typo in initialization string.
-
-2007-12-19  Ankit Jain  <jankit@novell.com>
-
-	* MakefileHandler.cs: Set top_srcdir and all_target correctly.
-	* TranslationProject.cs: Set the default value for RelPath
-	to empty string instead of null.
-	Remove AbsPath.
-	* MonoDevelop.Gettext/TranslationProjectOptionsDialog: Update.
-	* templates/Makefile.template: Make top_srcdir and all_target template
-	variables to allow setting from MakefileHandler.
-
-2007-12-18  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #349419.
-	* templates/Makefile.template: Remove EXTRA_DIST, it gets generated.
-	* MakefileHandler.cs: Honor DESTDIR for INSTALL_DIR.
-	Based on patch by Wade Berrier.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.mdp: Updated project files. The order of extended
-	  properties won't change anymore.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Moved PlatformService to
-	  MD.Core.Gui. Removed old FileIconService class, which is now implemented
-	  in PlatformService.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: API cleanup.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/gui.stetic: Updated.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Bump add-in versions.
-
-2007-12-06  Geoff Norton  <gnorton@novell.com>
-
-	* MonoDevelop.Gettext/GetTextTool.cs:
-	* MonoDevelop.Gettext/TranslationProject.cs: Do not call Gnome.Vfs directly;
-	  utilize the PlatformService to get mime information.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.mdp, Makefile.am: Directory reorganization.
-
-2007-12-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/Catalog.cs: Fix build.
-
-2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/Translation.cs: Added properties for getting the Po
-	  and Out files.
-	* Makefile.am, MonoDevelop.Gettext.addin.xml,
-	  MonoDevelop.Gettext.ExtensionNodes/ExcludeRegex.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/IncludeExtensionNode.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/RegexScannerExtensionNode.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/TransformExtensionNode.cs,
-	  MonoDevelop.Gettext.ExtensionNodes/XmlRegexScannerExtensionNode.cs,
-	  MonoDevelop.Gettext.mdp, MonoDevelop.Gettext/Catalog.cs,
-	  MonoDevelop.Gettext/IFileScanner.cs,
-	  MonoDevelop.Gettext/RegexFileScanner.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  templates/TranslationProject.xpt.xml: Added an extension point for
-	  specifying regular expressions to use for scanning files. Fixed some old
-	  regexes. Moved some properties from TranslationProjectConfiguration to
-	  TranslationProject, since it is not really useful to handle that info
-	  per-config.
-	* MonoDevelop.Gettext/MakefileHandler.cs, templates/Makefile.template: Set
-	  the correct install dir depending on the project output type.
-
-2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/GettextFeature.cs,
-	  MonoDevelop.Gettext/GettextFeatureWidget.cs: Show the gettext feature
-	  when creating new Packaging projects.
-
-2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs: Run the
-	  translation update in a background thread.
-	* MonoDevelop.Gettext/GettextTool.cs: New command line tool for updating
-	  translation projects.
-	* gtk-gui/gui.stetic,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs:
-	  Updated.
-
-2007-11-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  Makefile.am, MonoDevelop.Gettext.mdp,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/Catalog.cs: Now message strings are extracted using
-	  regexes instead of xgettext.
-
-2007-11-20  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Process output is now written
-	  to the monitor.Log.
-
-2007-11-20  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: gettext addin now only scans
-	  code files for translations.
-
-2007-11-16  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/Catalog.cs: Added some gui update code.
-
-2007-11-16  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/CatalogParser.cs: The gettext addin now uses
-	  xgettext and msgmerge command line tools instead of custom routines.
-	  Fixed some bugs in the po editor and catalog parser.
-
-2007-11-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/gui.stetic: Updated.
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs: Moved
-	  code for updating translation to TranslationProject.
-	* MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/Catalog.cs,
-	  MonoDevelop.Gettext.Editor/CatalogEditor.cs: Use progress monitors to
-	  report errors.
-	* MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs: Create a new
-	  configuration if none exist.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationService.cs, MonoDevelop.Gettext/Catalog.cs:
-	  Track LoggingService API changes.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Bump MD version.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Set correct target directory
-	  path.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs: Updated
-	  project icons. Use the base project icon with an overlay to show the
-	  type.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Track changes in the Icon extension node.
-
-2007-10-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/CatalogParser.cs, MonoDevelop.Gettext/Catalog.cs:
-	  Fixed some parsing/generationg errors in the catalog.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/CatalogEditor.cs: Destroy the view widget when
-	  the view is disposed.
-
-2007-10-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/GtkSpell.cs,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/CatalogEntry.cs, MonoDevelop.Gettext/Catalog.cs:
-	  Speed optimized the update process.
-
-2007-10-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml, MonoDevelop.Gettext.mdp, Makefile.am,
-	  MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs,
-	  icons/md-gettext-project_16.png, icons/gettext-overlay-32.png,
-	  icons/gettext-overlay-16.png, icons/md-gettext-project_22.png,
-	  icons/md-gettext-project_32.png, templates/TranslationProject.xpt.xml:
-	  Updated project icons. Use the base project icon with an overlay to show
-	  the type.
-
-2007-10-24  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/CatalogEntry.cs, MonoDevelop.Gettext/Catalog.cs:
-	  Fixed re opened "Bug 335326 - Gettext addin breaks zh_CN.po".
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs, gtk-gui/gui.stetic,
-	  MonoDevelop.Gettext/GettextFeature.cs: Cosmetic changes in the feature
-	  widget. Don't show scrollbars, just grow the list as new items are
-	  added.
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs: Cosmetic
-	  fix.
-	* MonoDevelop.Gettext.mdp: Updated.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.mdp: Project file names updated by change in MD path
-	  functions.
-
-2007-10-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/CatalogEntry.cs: Optimized the speed a bit.
-
-2007-10-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/gui.stetic, MonoDevelop.Gettext.mdp: Updated.
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs: Some
-	  cosmetic fixes.
-	* MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs: Show all cell
-	  renderers in a single column. Fixes some alignment issues in the tree.
-
-2007-10-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext/TranslationService.cs: Fixed "Bug 335335 - Gettext
-	  addin: updating the translations of MD takes forever".
-
-2007-10-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	  Updating translations is now done async.
-
-2007-10-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/CatalogParser.cs, MonoDevelop.Gettext/Catalog.cs:
-	  Fixed "Bug 335326 - Gettext addin breaks zh_CN.po".
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: Applied changes that were
-	  neccassary for to the new FileService.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs, gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs:
-	  Regenerated GUI files.
-
-2007-09-06  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Fixed 82693: Rebuild not
-	  working.
-
-2007-09-06  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Fixed 82693: Rebuild not
-	  working.
-
-2007-08-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/gui.stetic, MonoDevelop.Gettext.addin.xml,
-	  MonoDevelop.Gettext.mdp, Makefile.am,
-	  MonoDevelop.Gettext/MakefileHandler.cs, templates/Makefile.am.template,
-	  templates/Makefile.template: Added support for makefile generation.
-
-2007-08-09  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Changed addin path.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext/GettextFeatureWidget.cs: Workaround to mcs bug.
-
-2007-08-09  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.GettextFeatureWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  MonoDevelop.Gettext/GettextFeature.cs,
-	  MonoDevelop.Gettext/GettextFeatureWidget.cs: Fixed 82340: Gettext
-	  addin: translation project creation should be available as a
-	  'project feature'.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Removed the CommandService class.
-	  Everything is done directly with CommandManager. Moved all extension
-	  node types to MD.Components.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.Gettext.addin.xml,
-	  MonoDevelop.Gettext.mdp, Makefile.am: Reorganized the extension point
-	  hierarchy. Embedded all add-in manifests as resources.
-
-2007-08-09  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext/PropertyProvider.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: Fixed bug 82334: Gettext
-	  addin: can't choose which files to translate. It's now possible to
-	  choose, if a file can be translated in the file properties. 
-
-2007-08-09  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs:
-	  Fixed Bug 82341: Gettext addin: Language selection combo too big.
-
-2007-08-08  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs:
-	  Fixed 82337: Gettext addin: usability issues in the PO editor
-
-2007-08-08  Mike Krüger <mkrueger@novell.com> 
-   * MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs: Removed
-   some debug code.
-
-2007-08-08  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs,
-	  MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs: Fixed
-	  82336:Gettext addin: Translation project options dialog not HIG
-	  compliant.
-
-2007-08-08  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: Fixed 82335: Gettext
-	  addin: can't choose which projects to translate.
-
-2007-08-06  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: added bugfix from
-	  Rafael Teixeira. Plural descriptions are now taken from
-	  Catalog.PluralFormsDescription.
-
-2007-08-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs: Editor now supports
-	  n plural forms instead of 2.
-
-2007-08-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/GtkSpell.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs: Added spellchecking
-	  to original string (hardcoded currently to "en" - maybe shoul add
-	  an option to the translationproject for this ?). Fixed spellcheck
-	  updating bug.
-
-2007-08-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/GtkSpell.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs: Fixed gtk spell
-	  support.
-
-2007-07-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.mdp, Makefile.am: Makefile fixes.
-
-2007-07-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.Gettext.Translator.LanguageChooserDialog.cs,
-	  gtk-gui/MonoDevelop.Gettext.Editor.CatalogHeadersWidget.cs: Add
-	  missing files.
-
-2007-07-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: Workaround for bug in
-	  the compiler. Looks like gmcs gets confused when using anon
-	  delegates in a partial class, and it will fail unless classes are
-	  referenced using the full name.
-	* MonoDevelop.Gettext.mdp, Makefile.am: Added makefile.
-
-2007-07-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/CatalogEditor.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  MonoDevelop.Gettext/Catalog.cs: added remove entry function to
-	  delete unused translation strings.
-
-2007-07-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
-	  updated some translation strings.
-
-2007-07-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs, Commands.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/Catalog.cs: Added manual udate command, missing
-	  messages are now recognized.
-
-2007-07-20  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationProject.cs: Worked on gettext
-	  deployment.
-
-2007-07-20  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: Improved update code.
-
-2007-07-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: New Translations are now
-	  containing a list of all translation strings.
-
-2007-07-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: Translations can now be
-	  removed.
-
-2007-07-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/CatalogEntry.cs,
-	  MonoDevelop.Gettext.Editor/CatalogEditor.cs,
-	  MonoDevelop.Gettext.Editor/CatalogDeletedEntry.cs,
-	  MonoDevelop.Gettext.Editor/GtkSpell.cs,
-	  MonoDevelop.Gettext.Editor/CatalogEditorWidget.cs,
-	  MonoDevelop.Gettext.Editor/CatalogHeaders.cs,
-	  MonoDevelop.Gettext.Editor/PluralForms.cs,
-	  MonoDevelop.Gettext.Editor/CatalogParser.cs,
-	  MonoDevelop.Gettext.Editor/CatalogEntryEditorWidget.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  MonoDevelop.Gettext.Editor/Catalog.cs,
-	  MonoDevelop.Gettext.Translator/TranslationFileDescriptionTemplate.cs,
-	  MonoDevelop.Gettext.Translator/PropertyProvider.cs,
-	  MonoDevelop.Gettext.Translator/TranslationProjectInfo.cs,
-	  MonoDevelop.Gettext.Translator/TranslatorCoreService.cs,
-	  MonoDevelop.Gettext.Translator/TranslatorInfo.cs,
-	  MonoDevelop.Gettext.Translator/TranslationProject.cs, Commands.cs,
-	  MonoDevelop.Gettext.addin.xml, gtk-gui/gui.stetic,
-	  MonoDevelop.Gettext.mdp, MonoDevelop.Gettext/CatalogEntry.cs,
-	  MonoDevelop.Gettext/CatalogDeletedEntry.cs,
-	  MonoDevelop.Gettext/CatalogHeaders.cs,
-	  MonoDevelop.Gettext/PluralForms.cs,
-	  MonoDevelop.Gettext/CatalogParser.cs,
-	  MonoDevelop.Gettext/IsoCodes.cs, MonoDevelop.Gettext/Catalog.cs,
-	  IsoCodes.cs: Restructured/Refactored the project.
-
-2007-07-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/POEditorWidget.cs: changed formatting.
-
-2007-07-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.Editor/CatalogEntry.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: Improved reference
-	  update code. Fixed comment handling and some translation editor
-	  behavior issues.
-
-2007-07-18  Mike Krüger <mike@icsharpcode.net> 
-
-	* MonoDevelop.Gettext.Editor/CatalogEntry.cs,
-	  MonoDevelop.Gettext.Editor/CatalogEditor.cs,
-	  MonoDevelop.Gettext.Editor/CatalogDeletedEntry.cs,
-	  MonoDevelop.Gettext.Editor/CatalogHeaders.cs,
-	  MonoDevelop.Gettext.Editor/CatalogParser.cs,
-	  MonoDevelop.Gettext.Editor/POEditorWidget.cs,
-	  MonoDevelop.Gettext.Editor/Catalog.cs,
-	  gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: Worked on gettext addin.
-	  New (stetic based) editor, some fixes.
-
-2007-07-13  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs: Worked on translation
-	  addin.
-
-2007-07-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml,
-	  gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs,
-	  MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs,
-	  MonoDevelop.Gettext/TranslationService.cs,
-	  MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs,
-	  MonoDevelop.Gettext/TranslationProject.cs,
-	  templates/TranslationProject.xpt.xml: Worked on translation project
-	  options.
-
-2007-07-11  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.Gettext.TranslationProjectOptionsDialog.cs,
-	MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs,
-	MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs,
-	MonoDevelop.Gettext/TranslationService.cs,
-	MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs: Fixed 
-	little bug. Added options dialog.
-
-2007-07-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: worked on translation addin.
-
-2007-07-10  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.Gettext.addin.xml: Worked on translation.
-
-2007-07-06  Mike Krüger <mkrueger@novell.com> 
-
-	* .: Adding the localization addin. Already worked on the translation
-	  system.
-
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs
index a8b406d6fd..d33b7ec7be 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/CatalogEditorView.cs
@@ -32,13 +32,15 @@ using System;
 using System.Collections.Generic;
 using Gtk;
 using Gdk;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Gui.Content;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Gettext.Editor
 {
-	class CatalogEditorView : AbstractViewContent, IUndoHandler
+	class CatalogEditorView : ViewContent, IUndoHandler
 	{
 		Catalog catalog;
 		POEditorWidget poEditorWidget;
@@ -52,8 +54,9 @@ namespace MonoDevelop.Gettext.Editor
 			};
 		}
 		
-		public override void Load (string fileName)

+		public override Task Load (FileOpenInformation fileOpenInformation)

 		{
+			var fileName = fileOpenInformation.FileName;
 //			using (IProgressMonitor mon = IdeApp.Workbench.ProgressMonitors.GetLoadProgressMonitor (true)) {
 			catalog.Load (null, fileName);
 //			}
@@ -63,21 +66,17 @@ namespace MonoDevelop.Gettext.Editor
 			
 			this.ContentName = fileName;
 			this.IsDirty = false;
+			return Task.FromResult (true);
 		}
 		
-		public override void Save (string fileName)

+		public override Task Save (FileSaveInformation fileSaveInformation)

 		{
-			OnBeforeSave (EventArgs.Empty);
-			catalog.Save (fileName);
-			ContentName = fileName;
-			IsDirty = false;

+			catalog.Save (fileSaveInformation.FileName);
+			ContentName = fileSaveInformation.FileName;
+			IsDirty = false;
+			return Task.FromResult (true);

 		}
 		
-		public override void Save ()

-		{
-			Save (this.ContentName);

-		}
-	
 		#region IUndoHandler implementation
 		void IUndoHandler.Undo ()
 		{
@@ -107,7 +106,7 @@ namespace MonoDevelop.Gettext.Editor
 		}
 		#endregion
 	
-		public override Widget Control
+		public override Control Control
 		{
 			get { return poEditorWidget; }
 		}
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs
index 9a7d402c95..0f9d629cfd 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GettextEditorDisplayBinding.cs
@@ -47,9 +47,9 @@ namespace MonoDevelop.Gettext
 			return filePath.IsNotNull && filePath.HasExtension (".po");
 		}
 		
-		public IViewContent CreateContent (FilePath filePath, string mimeType, Project project)
+		public ViewContent CreateContent (FilePath filePath, string mimeType, Project project)
 		{
-			foreach (TranslationProject tp in IdeApp.Workspace.GetAllSolutionItems<TranslationProject>  ())
+			foreach (TranslationProject tp in IdeApp.Workspace.GetAllItems<TranslationProject>  ())
 				if (tp.BaseDirectory == Path.GetDirectoryName (filePath))
 					return new Editor.CatalogEditorView (tp, filePath);
 			
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
index 007bacc01c..3063b00c27 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
@@ -38,12 +38,14 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Tasks;
 using MonoDevelop.Gettext.Editor;
-using Mono.TextEditor;
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide;
 using System.ComponentModel;
 using System.Threading;
 using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Gui;
 
 namespace MonoDevelop.Gettext
 {
@@ -55,9 +57,8 @@ namespace MonoDevelop.Gettext
 		ListStore foundInStore;
 		Catalog catalog;
 		string  poFileName;
-		Mono.TextEditor.TextEditorOptions options = new Mono.TextEditor.TextEditorOptions ();
-		Mono.TextEditor.TextEditor texteditorOriginal = new Mono.TextEditor.TextEditor ();
-		Mono.TextEditor.TextEditor texteditorPlural = new Mono.TextEditor.TextEditor ();
+		TextEditor texteditorOriginal = TextEditorFactory.CreateNewEditor ();
+		TextEditor texteditorPlural = TextEditorFactory.CreateNewEditor ();
 		
 		static List<POEditorWidget> widgets = new List<POEditorWidget> (); 
 		
@@ -186,7 +187,7 @@ namespace MonoDevelop.Gettext
 					lineNr = 1 + int.Parse (line);
 				} catch {
 				}
-				IdeApp.Workbench.OpenDocument (file, lineNr, 1);
+				IdeApp.Workbench.OpenDocument (new FileOpenInformation (file, project, lineNr, 1, OpenDocumentOptions.Default));
 			};
 			this.notebookTranslated.RemovePage (0);
 			this.searchEntryFilter.Entry.Text = "";
@@ -239,22 +240,26 @@ namespace MonoDevelop.Gettext
 			widgets.Add (this);
 			
 			checkbuttonWhiteSpaces.Toggled += CheckbuttonWhiteSpacesToggled;
-			options.ShowLineNumberMargin = false;
-			options.ShowFoldMargin = false;
-			options.ShowIconMargin = false;
-			options.ColorScheme = IdeApp.Preferences.ColorScheme;
-			options.FontName = PropertyService.Get<string> ("FontName");
-			
+
 			this.scrolledwindowOriginal.Child = this.texteditorOriginal;
 			this.scrolledwindowPlural.Child = this.texteditorPlural;
-			this.texteditorOriginal.Show ();
-			this.texteditorPlural.Show ();
-			texteditorOriginal.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Insensitive));
-			texteditorPlural.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Insensitive));
-			this.texteditorOriginal.Options = options;
-			this.texteditorPlural.Options = options;
-			this.texteditorOriginal.Document.ReadOnly = true;
-			this.texteditorPlural.Document.ReadOnly = true;
+			this.scrolledwindowOriginal.Child.Show ();
+			this.scrolledwindowPlural.Child.Show ();
+			scrolledwindowOriginal.Child.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Insensitive));
+			scrolledwindowPlural.Child.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Insensitive));
+			this.texteditorOriginal.Options = DefaultSourceEditorOptions.PlainEditor;
+			this.texteditorPlural.Options = DefaultSourceEditorOptions.PlainEditor;
+			this.texteditorOriginal.IsReadOnly = true;
+			this.texteditorPlural.IsReadOnly = true;
+			toolbarPages.ModifyBg (StateType.Normal, Styles.POEditor.TabBarBackgroundColor);
+
+			MonoDevelop.Ide.Gui.Styles.Changed += HandleStylesChanged;
+		}
+
+		void HandleStylesChanged (object sender, EventArgs e)
+		{
+			UpdateFromCatalog ();
+			toolbarPages.ModifyBg (StateType.Normal, Styles.POEditor.TabBarBackgroundColor);
 		}
 
 		void HandleCellRendFuzzyToggled (object sender, ToggledArgs args)
@@ -299,13 +304,6 @@ namespace MonoDevelop.Gettext
 		
 		void CheckbuttonWhiteSpacesToggled (object sender, EventArgs e)
 		{
-			texteditorOriginal.QueueDraw ();
-			texteditorPlural.QueueDraw ();
-			for (int i = this.notebookTranslated.NPages - 1; i >= 0; i--) {
-				Mono.TextEditor.TextEditor view = GetTextView (i);
-				if (view != null)
-					view.QueueDraw ();
-			}
 		}
 		
 		#region Options
@@ -328,25 +326,25 @@ namespace MonoDevelop.Gettext
 			searchIn        = PropertyService.Get ("GettetAddin.Search.SearchIn", SearchIn.Both);
 		}
 		
-		static bool IsCaseSensitive {

-			get {

-				return isCaseSensitive;

+		static bool IsCaseSensitive {
+			get {
+				return isCaseSensitive;
 			}
 			set {
 				PropertyService.Set ("GettetAddin.Search.IsCaseSensitive", value);
 				isCaseSensitive = value;
-			}

+			}
 		}
 		
-		static bool IsWholeWordOnly {

-			get {

-				return isWholeWordOnly;

-			}

+		static bool IsWholeWordOnly {
+			get {
+				return isWholeWordOnly;
+			}
 			set {
 				PropertyService.Set ("GettetAddin.Search.IsWholeWordOnly", value);
 				isWholeWordOnly = value;
-			}

-		}

+			}
+		}
 		
 		static bool RegexSearch {
 			get {
@@ -467,13 +465,10 @@ namespace MonoDevelop.Gettext
 			this.Catalog = newCatalog;
 			UpdateTasks ();
 		}
-		
-		Mono.TextEditor.TextEditor GetTextView (int index)
+		List<TextEditor> notebookTranslatedEditors = new List<TextEditor> ();
+		TextEditor GetTextView (int index)
 		{
-			ScrolledWindow window = this.notebookTranslated.GetNthPage (index) as ScrolledWindow;
-			if (window != null)
-				return window.Child as Mono.TextEditor.TextEditor;
-			return null;
+			return notebookTranslatedEditors[index];
 		}
 		
 		void ClearTextview ()
@@ -485,24 +480,23 @@ namespace MonoDevelop.Gettext
 		void AddTextview (int index)
 		{
 			ScrolledWindow window = new ScrolledWindow ();
-			Mono.TextEditor.TextEditor textView = new Mono.TextEditor.TextEditor ();
+			var textView = TextEditorFactory.CreateNewEditor ();
 			window.Child = textView;
-			textView.Options = options;
-			textView.Document.TextReplaced += delegate {
+			textView.TextChanged += delegate {
 				if (this.isUpdating)
 					return;
 				try {
 					if (this.currentEntry != null) {
-						string escapedText = textView.Document.Text;
+						string escapedText = textView.Text;
 						string oldText     = this.currentEntry.GetTranslation (index);
 						this.currentEntry.SetTranslation (escapedText, index);
 						AddChange (this.currentEntry, oldText, escapedText, index);
 					}
 					IdeApp.Workbench.StatusBar.ShowReady ();
-					textView.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Normal));
+					window.Child.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Normal));
 				} catch (System.Exception e) {
 					IdeApp.Workbench.StatusBar.ShowError (e.Message);
-					textView.ModifyBase (Gtk.StateType.Normal, errorColor);
+					window.Child.ModifyBase (Gtk.StateType.Normal, errorColor);
 				}
 				treeviewEntries.QueueDraw ();
 				UpdateProgressBar ();
@@ -513,6 +507,7 @@ namespace MonoDevelop.Gettext
 			label.Text = this.Catalog.PluralFormsDescriptions [index];
 			window.ShowAll ();
 			this.notebookTranslated.AppendPage (window, label);
+			notebookTranslatedEditors.Add (textView);
 		}
 		
 		void ShowPopup (EventButton evt)
@@ -601,14 +596,15 @@ namespace MonoDevelop.Gettext
 		void RemoveTextViewsFrom (int index)
 		{
 			for (int i = this.notebookTranslated.NPages - 1; i >= index; i--) {
-				Mono.TextEditor.TextEditor view = GetTextView (i);
+				var view = GetTextView (i);
 				if (view == null)
 					continue;
 //				if (gtkSpellSet.ContainsKey (view)) {
 //					GtkSpell.Detach (view);
 //					gtkSpellSet.Remove (view);
 //				}
-				this.notebookTranslated.RemovePage (i);
+				notebookTranslated.RemovePage (i);
+				notebookTranslatedEditors.RemoveAt (i); 
 			}
 		}
 		
@@ -617,9 +613,9 @@ namespace MonoDevelop.Gettext
 			this.isUpdating = true;
 			try {
 				currentEntry = entry;
-				this.texteditorOriginal.Caret.Location = new DocumentLocation (1, 1);
-				this.texteditorOriginal.Document.Text = entry != null ? entry.String : "";
-				this.texteditorOriginal.VAdjustment.Value = this.texteditorOriginal.HAdjustment.Value = 0;
+				this.texteditorOriginal.CaretLocation = new DocumentLocation (1, 1);
+				this.texteditorOriginal.Text = entry != null ? entry.String : "";
+				//this.texteditorOriginal.VAdjustment.Value = this.texteditorOriginal.HAdjustment.Value = 0;
 				
 //				if (GtkSpell.IsSupported && !gtkSpellSet.ContainsKey (this.textviewOriginal)) {
 //					GtkSpell.Attach (this.textviewOriginal, "en");
@@ -630,9 +626,9 @@ namespace MonoDevelop.Gettext
 				this.notebookTranslated.ShowTabs = entry != null && entry.HasPlural;
 				
 				if (entry != null && entry.HasPlural) {
-					this.texteditorPlural.Caret.Location = new DocumentLocation (1, 1);
-					this.texteditorPlural.Document.Text = entry.PluralString;
-					this.texteditorPlural.VAdjustment.Value = this.texteditorPlural.HAdjustment.Value = 0;
+					this.texteditorPlural.CaretLocation = new DocumentLocation (1, 1);
+					this.texteditorPlural.Text = entry.PluralString;
+					//this.texteditorPlural.VAdjustment.Value = this.texteditorPlural.HAdjustment.Value = 0;
 //					if (GtkSpell.IsSupported && !gtkSpellSet.ContainsKey (this.textviewOriginalPlural)) {
 //						GtkSpell.Attach (this.textviewOriginalPlural, "en");
 //						this.gtkSpellSet[this.textviewOriginalPlural] = true;
@@ -649,14 +645,12 @@ namespace MonoDevelop.Gettext
 					}
 					
 					for (int i = 0; i < entry.NumberOfTranslations; i++) {
-						Mono.TextEditor.TextEditor textView = GetTextView (i);
+						var textView = GetTextView (i);
 						if (textView == null)
 							continue;
 						textView.ClearSelection ();
-						textView.Document.Text = entry != null ?  entry.GetTranslation (i) : "";
-						textView.Caret.Offset = textView.Document.Text.Length;
-						textView.VAdjustment.Value = textView.HAdjustment.Value = 0;
-						textView.Document.CommitUpdateAll ();
+						textView.Text = entry != null ?  entry.GetTranslation (i) : "";
+						EditActions.MoveCaretToDocumentEnd (textView);
 					}
 					
 					foreach (string reference in entry.References) {
@@ -703,26 +697,21 @@ namespace MonoDevelop.Gettext
 			return entry.IsFuzzy ? iconFuzzy : entry.IsTranslated ? iconValid : iconMissing;
 		}
 		
-		static string iconFuzzy   = "error-16.png";// "md-translation-fuzzy";
-		static string iconValid   = "done-16.png";//"md-translation-valid";
-		static string iconMissing = "warning-16.png";//"md-translation-missing";
-		
-//		static Color translated   = new Color (255, 255, 255);
-		static Color untranslated = new Color (234, 232, 227);
-		static Color fuzzy        = new Color (237, 226, 187);
-		static Color missing      = new Color (237, 167, 167);
+		static string iconFuzzy   = "md-error";// "md-translation-fuzzy";
+		static string iconValid   = "md-done";//"md-translation-valid";
+		static string iconMissing = "md-warning";//"md-translation-missing";
 		
 		Color GetRowColorForEntry (CatalogEntry entry)
 		{
 			if (entry.References.Length == 0)
-				return missing;
-			return entry.IsFuzzy ? fuzzy : entry.IsTranslated ? Style.Base (StateType.Normal) : untranslated;
+				return Styles.POEditor.EntryMissingBackgroundColor;
+			return entry.IsFuzzy ? Styles.POEditor.EntryFuzzyBackgroundColor : entry.IsTranslated ? Style.Base (StateType.Normal) : Styles.POEditor.EntryUntranslatedBackgroundColor;
 		}
 		
 		Color GetForeColorForEntry (CatalogEntry entry)
 		{
 			if (entry.References.Length == 0)
-				return missing;
+				return Styles.POEditor.EntryMissingBackgroundColor;
 			return entry.IsFuzzy ? Style.Black : entry.IsTranslated ? Style.Text (StateType.Normal) : Style.Black;
 		}
 		
@@ -810,7 +799,7 @@ namespace MonoDevelop.Gettext
 		}
 		
 		string filter = "";
-		Regex  regex = new Regex ("");
+		System.Text.RegularExpressions.Regex  regex = new System.Text.RegularExpressions.Regex ("");
 		
 		void UpdateFromCatalog ()
 		{
@@ -822,14 +811,16 @@ namespace MonoDevelop.Gettext
 					RegexOptions options = RegexOptions.Compiled;
 					if (!IsCaseSensitive)
 						options |= RegexOptions.IgnoreCase;
-					regex = new Regex (filter, options);
+					regex = new System.Text.RegularExpressions.Regex (filter, options);
 				} catch (Exception e) {
 					IdeApp.Workbench.StatusBar.ShowError (e.Message);
 					this.searchEntryFilter.Entry.ModifyBase (StateType.Normal, errorColor);
+					this.searchEntryFilter.QueueDraw ();
 					return;
 				}
 			}
 			this.searchEntryFilter.Entry.ModifyBase (StateType.Normal, Style.Base (StateType.Normal));
+			this.searchEntryFilter.QueueDraw ();
 			
 			int found = 0;
 			ListStore newStore = new ListStore (typeof(CatalogEntry));
@@ -891,7 +882,7 @@ namespace MonoDevelop.Gettext
 			TreeIter iter;
 			if (store.GetIterFirst (out iter)) {
 				do {
-					CatalogEntry curEntry = store.GetValue (iter, 4) as CatalogEntry;
+					CatalogEntry curEntry = store.GetValue (iter, 0) as CatalogEntry;
 					if (entry == curEntry) {
 						this.treeviewEntries.Selection.SelectIter (iter);
 						TreePath iterPath = store.GetPath (iter);
@@ -958,6 +949,7 @@ namespace MonoDevelop.Gettext
 		
 		protected override void OnDestroyed ()
 		{
+			MonoDevelop.Ide.Gui.Styles.Changed -= HandleStylesChanged;
 			StopTaskWorkerThread ();
 		
 			if (store != null) {
@@ -976,7 +968,7 @@ namespace MonoDevelop.Gettext
 			base.OnDestroyed ();
 		}
 #region Tasks
-		public class TranslationTask : Task
+		public class TranslationTask : TaskListEntry
 		{
 			POEditorWidget widget;
 			CatalogEntry entry;
@@ -1000,7 +992,7 @@ namespace MonoDevelop.Gettext
 			TaskService.Errors.ClearByOwner (this);
 		}
 		
-		static bool CompareTasks (List<Task> list1, List<Task> list2)
+		static bool CompareTasks (List<TaskListEntry> list1, List<TaskListEntry> list2)
 		{
 			if (list1.Count != list2.Count)
 				return false;
@@ -1110,7 +1102,7 @@ namespace MonoDevelop.Gettext
 		{
 			public override bool EntryFails (CatalogEntry entry)
 			{
-				foreach (System.Text.RegularExpressions.Match match in Regex.Matches (entry.String, @"\{.\}", RegexOptions.None))  {
+				foreach (System.Text.RegularExpressions.Match match in System.Text.RegularExpressions.Regex.Matches (entry.String, @"\{.\}", RegexOptions.None))  {
 					if (!entry.GetTranslation (0).Contains (match.Value)) 
 						return true;
 				}
@@ -1119,7 +1111,7 @@ namespace MonoDevelop.Gettext
 			
 			public override string FailReason (CatalogEntry entry)
 			{
-				foreach (System.Text.RegularExpressions.Match match in Regex.Matches (entry.String, @"\{.\}", RegexOptions.None))  {
+				foreach (System.Text.RegularExpressions.Match match in System.Text.RegularExpressions.Regex.Matches (entry.String, @"\{.\}", RegexOptions.None))  {
 					if (!entry.GetTranslation (0).Contains (match.Value)) 
 						return GettextCatalog.GetString ("Original string '{0}' contains '{1}', translation doesn't.", entry.String, match.Value);
 				}
@@ -1128,7 +1120,7 @@ namespace MonoDevelop.Gettext
 		}
 		
 		
-		List<Task> currentTasks = new List<Task> ();
+		List<TaskListEntry> currentTasks = new List<TaskListEntry> ();
 		
 		BackgroundWorker updateTaskThread = null;
 		
@@ -1140,7 +1132,7 @@ namespace MonoDevelop.Gettext
 				return;
 			}
 			
-			List<Task> tasks = new List<Task> ();
+			List<TaskListEntry> tasks = new List<TaskListEntry> ();
 			try {
 				foreach (CatalogEntryRule rule in rules) {
 					foreach (CatalogEntry entry in catalog) {
@@ -1223,9 +1215,9 @@ namespace MonoDevelop.Gettext
 			{
 				widget.inUndoOperation = true;
 				widget.SelectEntry (Entry);
-				Mono.TextEditor.TextEditor textView = widget.GetTextView (Index);
+				var textView = widget.GetTextView (Index);
 				if (textView != null)
-					textView.Document.Text = OldText;
+					textView.Text = OldText;
 				widget.inUndoOperation = false;
 			}
 			
@@ -1233,9 +1225,9 @@ namespace MonoDevelop.Gettext
 			{
 				widget.inUndoOperation = true;
 				widget.SelectEntry (Entry);
-				Mono.TextEditor.TextEditor textView = widget.GetTextView (Index);
+				var textView = widget.GetTextView (Index);
 				if (textView != null)
-					textView.Document.Text = Text;
+					textView.Text = Text;
 				widget.inUndoOperation = false;
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/Styles.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/Styles.cs
new file mode 100644
index 0000000000..60d41c71b3
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/Styles.cs
@@ -0,0 +1,66 @@
+//
+// Styles.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Ide;
+using Xwt.Drawing;
+
+namespace MonoDevelop.Gettext
+{
+	public static class Styles
+	{
+		public static POEditorStyle POEditor { get; internal set; }
+
+		public class POEditorStyle
+		{
+			public Gdk.Color EntryUntranslatedBackgroundColor { get; internal set; }
+			public Gdk.Color EntryMissingBackgroundColor { get; internal set; }
+			public Gdk.Color EntryFuzzyBackgroundColor { get; internal set; }
+			public Gdk.Color TabBarBackgroundColor { get; internal set; }
+		}
+
+		static Styles ()
+		{
+			LoadStyles ();
+			MonoDevelop.Ide.Gui.Styles.Changed +=  (o, e) => LoadStyles ();
+		}
+
+		public static void LoadStyles ()
+		{
+			POEditor = new POEditorStyle ();
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) {
+				POEditor.EntryUntranslatedBackgroundColor = new Gdk.Color (234, 232, 227);
+				POEditor.EntryMissingBackgroundColor = new Gdk.Color (237, 226, 187);
+				POEditor.EntryFuzzyBackgroundColor = new Gdk.Color (255, 199, 186);
+				POEditor.TabBarBackgroundColor = new Gdk.Color (241, 241, 241);
+			} else {
+				POEditor.EntryUntranslatedBackgroundColor = new Gdk.Color (255, 238, 194);
+				POEditor.EntryMissingBackgroundColor = new Gdk.Color (255, 0, 255); // TODO: VV
+				POEditor.EntryFuzzyBackgroundColor = new Gdk.Color (255, 195, 183);
+				POEditor.TabBarBackgroundColor = new Gdk.Color (51, 51, 51);
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/ProjectFileNodeBuilderExtension.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/ProjectFileNodeBuilderExtension.cs
index 4d051544cb..510eb1e294 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/ProjectFileNodeBuilderExtension.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/ProjectFileNodeBuilderExtension.cs
@@ -60,27 +60,21 @@ namespace MonoDevelop.Gettext.NodeBuilders
 			bool allChecked = true;
 			foreach (ITreeNavigator node in CurrentNodes) {
 				ProjectFile file = (ProjectFile) node.DataItem;
-				object prop = file.ExtendedProperties [scanForTranslationsProperty];
-				bool val = prop == null? true : (bool) prop;
-				if (!val) {
+				if (!file.Metadata.GetValue (scanForTranslationsProperty, true)) {
 					allChecked = false;
 					break;
 				}
 			}
 			
-			Set<SolutionEntityItem> projects = new Set<SolutionEntityItem> ();
+			Set<SolutionItem> projects = new Set<SolutionItem> ();
 			
 			foreach (ITreeNavigator node in CurrentNodes) {
 				ProjectFile file = (ProjectFile) node.DataItem;
 				projects.Add (file.Project);
-				if (allChecked) {
-					file.ExtendedProperties [scanForTranslationsProperty] = false;
-				} else {
-					file.ExtendedProperties.Remove (scanForTranslationsProperty);
-				}
+				file.Metadata.SetValue (scanForTranslationsProperty, !allChecked, true);
 			}
 				
-			IdeApp.ProjectOperations.Save (projects);
+			IdeApp.ProjectOperations.SaveAsync (projects);
 		}
 		
 		[CommandUpdateHandler (Commands.ScanForTranslations)]
@@ -88,9 +82,7 @@ namespace MonoDevelop.Gettext.NodeBuilders
 		{
 			foreach (ITreeNavigator node in CurrentNodes) {
 				ProjectFile file = (ProjectFile) node.DataItem;
-				object prop = file.ExtendedProperties [scanForTranslationsProperty];
-				bool val = prop == null? true : (bool) prop;
-				if (val) {
+				if (file.Metadata.GetValue (scanForTranslationsProperty, true)) {
 					cinfo.Checked = true;
 				} else if (cinfo.Checked) {
 					cinfo.CheckedInconsistent = true;
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs
index 029efd19d4..b8bfda44ad 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationNodeBuilder.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Gettext.NodeBuilders
 {
@@ -80,7 +81,7 @@ namespace MonoDevelop.Gettext.NodeBuilders
 			} else {
 				nodeInfo.Label = "(" + translation.IsoCode + ")";
 			}			
-			nodeInfo.Icon = Context.GetIcon ("md-gettext-locale");
+			nodeInfo.Icon = Context.GetIcon ("md-po-file");
 		}
 		
 		class TranslationNodeCommandHandler : NodeCommandHandler
@@ -91,7 +92,7 @@ namespace MonoDevelop.Gettext.NodeBuilders
 				Translation        translation = CurrentNode.DataItem as Translation;
 				if (project == null || translation == null)
 					return;
-				IdeApp.Workbench.OpenDocument (Path.Combine (project.BaseDirectory, translation.FileName));
+				IdeApp.Workbench.OpenDocument (Path.Combine (project.BaseDirectory, translation.FileName), project);
 			}
 			
 			public override void DeleteItem ()
@@ -111,7 +112,7 @@ namespace MonoDevelop.Gettext.NodeBuilders
 					}
 					
 					project.RemoveTranslation (translation.IsoCode);
-					IdeApp.ProjectOperations.Save (project);
+					IdeApp.ProjectOperations.SaveAsync (project);
 				}
 			}
 			
@@ -125,14 +126,10 @@ namespace MonoDevelop.Gettext.NodeBuilders
 				UpdateTranslations (project, translation);
 			}
 			
-			static IAsyncOperation currentUpdateTranslationOperation = MonoDevelop.Core.ProgressMonitoring.NullAsyncOperation.Success;
+			static Task currentUpdateTranslationOperation = Task.FromResult (0);
 			
-			void UpdateTranslationsAsync (object ob)
+			void UpdateTranslationsAsync (ProgressMonitor monitor, TranslationProject project, Translation translation)
 			{
-				object[] data = (object[]) ob;
-				IProgressMonitor monitor = (IProgressMonitor) data [0];
-				TranslationProject project = (TranslationProject) data [1];
-				Translation        translation = (Translation) data [2];
 				try {
 					project.UpdateTranslations (monitor, translation);
 					Gtk.Application.Invoke (delegate {
@@ -151,9 +148,8 @@ namespace MonoDevelop.Gettext.NodeBuilders
 			{
 				if (currentUpdateTranslationOperation != null && !currentUpdateTranslationOperation.IsCompleted) 
 					return;
-				IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBuildProgressMonitor ();
-				currentUpdateTranslationOperation = monitor.AsyncOperation;
-				DispatchService.BackgroundDispatch (new StatefulMessageHandler (UpdateTranslationsAsync), new object[] {monitor, project, translation});
+				ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBuildProgressMonitor ();
+				currentUpdateTranslationOperation = Task.Run (() => UpdateTranslationsAsync (monitor, project, translation));
 			}
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
index 172b831ef5..687dd4558d 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
@@ -32,6 +32,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Gettext.NodeBuilders
 {
@@ -92,9 +93,8 @@ namespace MonoDevelop.Gettext.NodeBuilders
 			TranslationProject project = dataObject as TranslationProject;
 			if (project == null)
 				return;
-				
-			foreach (Translation translation in project.Translations)
-				builder.AddChild (translation);
+
+			builder.AddChildren (project.Translations);
 		}
 
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
@@ -121,9 +121,10 @@ namespace MonoDevelop.Gettext.NodeBuilders
 				TranslationProject project = CurrentNode.DataItem as TranslationProject;
 				if (project == null)
 					return;
+				
 				using (var dlg = new TranslationProjectOptionsDialog (project))
 					MessageService.ShowCustomDialog (dlg);
-				IdeApp.Workspace.Save ();
+				IdeApp.Workspace.SaveAsync ();
 			}
 			
 			[CommandUpdateHandler (Commands.AddTranslation)]
@@ -145,7 +146,7 @@ namespace MonoDevelop.Gettext.NodeBuilders
 					if (MessageService.RunCustomDialog (chooser) == (int)ResponseType.Ok) {
 						string language = chooser.Language + (chooser.HasCountry ? "_" + chooser.Country : "");
 					
-						using (IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor (monitorTitle, "md-package", true, true)) {
+						using (ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor (monitorTitle, "md-package", true, true)) {
 							project.AddNewTranslation (language, monitor);
 							UpdateTranslations (project);
 						}
@@ -156,14 +157,10 @@ namespace MonoDevelop.Gettext.NodeBuilders
 					chooser.Dispose ();
 				}
 			}
-			static IAsyncOperation currentUpdateTranslationOperation = MonoDevelop.Core.ProgressMonitoring.NullAsyncOperation.Success;
+			static Task currentUpdateTranslationOperation = Task.FromResult (0);
 			
-			void UpdateTranslationsAsync (object ob)
+			void UpdateTranslationsAsync (ProgressMonitor monitor, TranslationProject project)
 			{
-				object[] data = (object[]) ob;
-				IProgressMonitor monitor = (IProgressMonitor) data [0];
-				TranslationProject project = (TranslationProject) data [1];
-				
 				try {
 					project.UpdateTranslations (monitor);
 					Gtk.Application.Invoke (delegate {
@@ -182,9 +179,8 @@ namespace MonoDevelop.Gettext.NodeBuilders
 			{
 				if (currentUpdateTranslationOperation != null && !currentUpdateTranslationOperation.IsCompleted) 
 					return;
-				IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBuildProgressMonitor ();
-				currentUpdateTranslationOperation = monitor.AsyncOperation;
-				DispatchService.BackgroundDispatch (new StatefulMessageHandler (UpdateTranslationsAsync), new object[] {monitor, project});
+				ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBuildProgressMonitor ();
+				currentUpdateTranslationOperation = Task.Run (() => UpdateTranslationsAsync (monitor, project));
 			}
 			
 			[CommandHandler (Commands.UpdateTranslations)]
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml
index 06e3c02ece..a65c81440e 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml
@@ -40,19 +40,12 @@
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/Core/StockIcons">
-		<StockIcon stockid = "md-gettext-locale" resource = "locale_22x22.png" />
-		<StockIcon stockid = "md-gettext-locale" resource = "locale_16x16.png" size = "Menu" />
-		<StockIcon stockid = "md-gettext-locale" resource = "locale_22x22.png" size = "Button" />
-		<StockIcon stockid = "md-gettext-locale" resource = "locale_32x32.png" size = "Dnd" />
-		<StockIcon stockid = "md-gettext-project" icon = "md-project|res:gettext-overlay-16.png" size = "Menu" />
-		<StockIcon stockid = "md-gettext-project" icon = "md-project|res:gettext-overlay-32.png" size = "Dnd"/>
-		<StockIcon stockid = "md-po-file" resource = "locale_22x22.png" />
-		<StockIcon stockid = "md-po-file" resource = "locale_16x16.png" size = "Menu" />
-		<StockIcon stockid = "md-po-file" resource = "locale_22x22.png" size = "Button" />
-		<StockIcon stockid = "md-po-file" resource = "locale_32x32.png" size = "Dnd" />
-		<StockIcon stockid = "silk_accept" resource = "done-16.png" size = "Menu"/>
-		<StockIcon stockid = "silk_error" resource = "error-16.png" size = "Menu"/>
-		<StockIcon stockid = "silk_exclamation" resource = "warning-16.png" size = "Menu"/>
+		<StockIcon stockid = "md-gettext-locale" resource = "locale-16.png" size = "Menu" />
+		<StockIcon stockid = "md-gettext-project" resource = "project-locale-16.png" size = "Menu" />
+		<StockIcon stockid = "md-po-file" resource = "file-locale-16.png" size = "Menu" />
+		<StockIcon stockid = "md-po-file" resource = "file-locale-32.png" size = "Dnd" />
+		<StockIcon stockid = "md-locale-overlay" resource="project-locale-overlay-32.png" size="Dnd" />
+		<StockIcon stockid = "md-project-locale" icon="md-project|md-locale-overlay" size="Dnd" />
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/Core/MimeTypes">
@@ -93,7 +86,11 @@
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
-		<ProjectTemplate id = "MonoDevelop.Gettext.TranslationInfo" resource = "TranslationProject.xpt.xml" />
+		<ProjectTemplate id = "MonoDevelop.Gettext.TranslationProject" resource = "TranslationProject.xpt.xml" />
+	</Extension>
+	
+	<Extension path = "/MonoDevelop/Ide/TemplateImages">
+		<Image id = "md-locale-project" resource = "locale-project.png" />
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
@@ -105,11 +102,6 @@
 	<Extension path = "/MonoDevelop/DesignerSupport/PropertyProviders">
 		<Class class = "MonoDevelop.Gettext.PropertyProvider"/>
 	</Extension>
-	
-	<Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
-		<ItemProperty class = "MonoDevelop.Projects.ProjectFile"
-			name = "Gettext.ScanForTranslations" type = "System.Boolean" />
-	</Extension>
 
 	<Extension path = "/MonoDevelop/Autotools/MakefileHandlers">
 		<Class class = "MonoDevelop.Gettext.MakefileHandler"/>
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
index ba1b944522..e33a277af4 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
@@ -59,6 +59,18 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -86,16 +98,6 @@
       <Name>MonoDevelop.Deployment</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -149,6 +151,7 @@
     <Compile Include="MonoDevelop.Gettext\TranslationCollection.cs" />
     <Compile Include="MonoDevelop.Gettext.NodeBuilders\ProjectFileNodeBuilderExtension.cs" />
     <Compile Include="AddinInfo.cs" />
+    <Compile Include="MonoDevelop.Gettext.Editor\Styles.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -157,14 +160,125 @@
     <EmbeddedResource Include="MonoDevelop.Gettext.addin.xml">
       <LogicalName>MonoDevelop.Gettext.addin.xml</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\locale_22x22.png">
-      <LogicalName>locale_22x22.png</LogicalName>
+    <EmbeddedResource Include="icons\locale-16.png">
+      <LogicalName>locale-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locale-16%402x.png">
+      <LogicalName>locale-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locale-16~dark.png">
+      <LogicalName>locale-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locale-16~dark%402x.png">
+      <LogicalName>locale-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locale-16~sel.png">
+      <LogicalName>locale-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locale-16~sel%402x.png">
+      <LogicalName>locale-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locale-16~dark~sel.png">
+      <LogicalName>locale-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locale-16~dark~sel%402x.png">
+      <LogicalName>locale-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-16.png">
+      <LogicalName>project-locale-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-16%402x.png">
+      <LogicalName>project-locale-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-16~dark.png">
+      <LogicalName>project-locale-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-16~dark%402x.png">
+      <LogicalName>project-locale-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-16~sel.png">
+      <LogicalName>project-locale-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-16~sel%402x.png">
+      <LogicalName>project-locale-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-16~dark~sel.png">
+      <LogicalName>project-locale-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-16~dark~sel%402x.png">
+      <LogicalName>project-locale-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-overlay-32.png">
+      <LogicalName>project-locale-overlay-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-overlay-32%402x.png">
+      <LogicalName>project-locale-overlay-32@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-overlay-32~dark.png">
+      <LogicalName>project-locale-overlay-32~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-overlay-32~dark%402x.png">
+      <LogicalName>project-locale-overlay-32~dark@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\locale_16x16.png">
-      <LogicalName>locale_16x16.png</LogicalName>
+    <EmbeddedResource Include="icons\project-locale-overlay-32~sel.png">
+      <LogicalName>project-locale-overlay-32~sel.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\locale_32x32.png">
-      <LogicalName>locale_32x32.png</LogicalName>
+    <EmbeddedResource Include="icons\project-locale-overlay-32~sel%402x.png">
+      <LogicalName>project-locale-overlay-32~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-overlay-32~dark~sel.png">
+      <LogicalName>project-locale-overlay-32~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\project-locale-overlay-32~dark~sel%402x.png">
+      <LogicalName>project-locale-overlay-32~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-16.png">
+      <LogicalName>file-locale-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-16%402x.png">
+      <LogicalName>file-locale-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-16~dark.png">
+      <LogicalName>file-locale-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-16~dark%402x.png">
+      <LogicalName>file-locale-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-16~sel.png">
+      <LogicalName>file-locale-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-16~sel%402x.png">
+      <LogicalName>file-locale-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-16~dark~sel.png">
+      <LogicalName>file-locale-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-16~dark~sel%402x.png">
+      <LogicalName>file-locale-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-32.png">
+      <LogicalName>file-locale-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-32%402x.png">
+      <LogicalName>file-locale-32@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-32~dark.png">
+      <LogicalName>file-locale-32~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-32~dark%402x.png">
+      <LogicalName>file-locale-32~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-32~sel.png">
+      <LogicalName>file-locale-32~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-32~sel%402x.png">
+      <LogicalName>file-locale-32~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-32~dark~sel.png">
+      <LogicalName>file-locale-32~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\file-locale-32~dark~sel%402x.png">
+      <LogicalName>file-locale-32~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="templates\TranslationProject.xpt.xml">
       <LogicalName>TranslationProject.xpt.xml</LogicalName>
@@ -175,35 +289,41 @@
     <EmbeddedResource Include="templates\Makefile.am.template">
       <LogicalName>Makefile.am.template</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\gettext-overlay-16.png">
-      <LogicalName>gettext-overlay-16.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-language-16.png">
+      <LogicalName>prefs-language-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-language-16%402x.png">
+      <LogicalName>prefs-language-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\gettext-overlay-32.png">
-      <LogicalName>gettext-overlay-32.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-language-16~dark.png">
+      <LogicalName>prefs-language-16~dark.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\done-16.png">
-      <LogicalName>done-16.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-language-16~dark%402x.png">
+      <LogicalName>prefs-language-16~dark@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\done-16%402x.png">
-      <LogicalName>done-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-language-16~dark~sel.png">
+      <LogicalName>prefs-language-16~dark~sel.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\error-16.png">
-      <LogicalName>error-16.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-language-16~dark~sel%402x.png">
+      <LogicalName>prefs-language-16~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\error-16%402x.png">
-      <LogicalName>error-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-language-16~sel.png">
+      <LogicalName>prefs-language-16~sel.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\warning-16.png">
-      <LogicalName>warning-16.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-language-16~sel%402x.png">
+      <LogicalName>prefs-language-16~sel@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\warning-16%402x.png">
-      <LogicalName>warning-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\locale-project.png">
+      <LogicalName>locale-project.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-language-16.png">
-      <LogicalName>prefs-language-16.png</LogicalName>
+    <EmbeddedResource Include="icons\locale-project%402x.png">
+      <LogicalName>locale-project@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-language-16%402x.png">
-      <LogicalName>prefs-language-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\locale-project~dark.png">
+      <LogicalName>locale-project~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locale-project~dark%402x.png">
+      <LogicalName>locale-project~dark@2x.png</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Catalog.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Catalog.cs
index e661be4572..55cd1613cf 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Catalog.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Catalog.cs
@@ -201,7 +201,7 @@ namespace MonoDevelop.Gettext
 		/// <summary>
 		/// Loads catalog from .po file.
 		/// </summary>
-		public bool Load (IProgressMonitor monitor, string poFile)
+		public bool Load (ProgressMonitor monitor, string poFile)
 		{
 			Clear ();
 			isOk = false;
@@ -439,7 +439,7 @@ namespace MonoDevelop.Gettext
 		}
 		
 		// Updates the catalog from POT file.
-		public bool UpdateFromPOT (IProgressMonitor mon, string potFile, bool summary)
+		public bool UpdateFromPOT (ProgressMonitor mon, string potFile, bool summary)
 		{
 			if (! isOk)
 				return false;
@@ -685,7 +685,7 @@ namespace MonoDevelop.Gettext
 		// (in the sense of msgmerge -- this catalog is old one with
 		// translations, \a refcat is reference catalog created by Update().)
 		// return true if the merge was successfull, false otherwise.
-		public bool Merge (IProgressMonitor mon, Catalog refCat)
+		public bool Merge (ProgressMonitor mon, Catalog refCat)
 		{
 			// TODO: implement via monitor, not in a GUI thread...
 			// But mind about it as it would be used during build.
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs
index a6fc5751f3..00d5f9ded3 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs
@@ -31,7 +31,7 @@ using Gtk;
 
 using MonoDevelop.Projects;
 using MonoDevelop.Gettext.Translator;
-using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Core;
 using MonoDevelop.Ide;
 
 namespace MonoDevelop.Gettext
@@ -75,7 +75,7 @@ namespace MonoDevelop.Gettext
 			};
 		}
 		
-		public void ApplyFeature (SolutionFolder parentCombine, SolutionItem entry)
+		public void ApplyFeature (SolutionFolder parentCombine, SolutionFolderItem entry)
 		{
 			TranslationProject newProject;
 			if (entry is TranslationProject)
@@ -94,7 +94,7 @@ namespace MonoDevelop.Gettext
 			if (store.GetIterFirst (out iter)) {
 				do {
 					string code = (string)store.GetValue (iter, 1);
-					newProject.AddNewTranslation (code, new NullProgressMonitor ());
+					newProject.AddNewTranslation (code, new ProgressMonitor ());
 				} while (store.IterNext (ref iter));
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
index 96bf769a7a..c2848375cc 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using MonoDevelop.Core.ProgressMonitoring;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Gettext
 {
@@ -40,7 +41,7 @@ namespace MonoDevelop.Gettext
 		string file;
 		string project;
 		
-		public int Run (string[] arguments)
+		public async Task<int> Run (string[] arguments)
 		{
 			Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Gettext Update Tool"));
 			foreach (string s in arguments)
@@ -74,7 +75,7 @@ namespace MonoDevelop.Gettext
 			ConsoleProgressMonitor monitor = new ConsoleProgressMonitor ();
 			monitor.IgnoreLogMessages = true;
 			
-			WorkspaceItem centry = Services.ProjectService.ReadWorkspaceItem (monitor, file);
+			WorkspaceItem centry = await Services.ProjectService.ReadWorkspaceItem (monitor, file);
 			monitor.IgnoreLogMessages = false;
 			
 			Solution solution = centry as Solution;
@@ -84,7 +85,7 @@ namespace MonoDevelop.Gettext
 			}
 			
 			if (project != null) {
-				SolutionEntityItem item = solution.FindProjectByName (project);
+				SolutionItem item = solution.FindProjectByName (project);
 				
 				if (item == null) {
 					Console.WriteLine ("The project '" + project + "' could not be found in " + file);
@@ -98,7 +99,7 @@ namespace MonoDevelop.Gettext
 				tp.UpdateTranslations (monitor);
 			}
 			else {
-				foreach (TranslationProject p in solution.GetAllSolutionItems <TranslationProject>())
+				foreach (TranslationProject p in solution.GetAllItems <TranslationProject>())
 					p.UpdateTranslations (monitor);
 			}
 			
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/IFileScanner.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/IFileScanner.cs
index 3f722b7b16..fabcabb70e 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/IFileScanner.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/IFileScanner.cs
@@ -33,6 +33,6 @@ namespace MonoDevelop.Gettext
 	interface IFileScanner
 	{
 		bool CanScan (TranslationProject project, Catalog catalog, string fileName, string mimeType);
-		void UpdateCatalog (TranslationProject project, Catalog catalog, IProgressMonitor monitor, string fileName);	
+		void UpdateCatalog (TranslationProject project, Catalog catalog, ProgressMonitor monitor, string fileName);	
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/MakefileHandler.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/MakefileHandler.cs
index baca1511d0..72ddc7c24e 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/MakefileHandler.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/MakefileHandler.cs
@@ -39,12 +39,12 @@ namespace MonoDevelop.Gettext
 {
 	class MakefileHandler: IMakefileHandler
 	{
-		public bool CanDeploy (SolutionItem entry, MakefileType type)
+		public bool CanDeploy (SolutionFolderItem entry, MakefileType type)
 		{
 			return entry is TranslationProject;
 		}
 
-		public Makefile Deploy (AutotoolsContext ctx, SolutionItem entry, IProgressMonitor monitor)
+		public Makefile Deploy (AutotoolsContext ctx, SolutionFolderItem entry, ProgressMonitor monitor)
 		{
 			Makefile mkfile = new Makefile ();
 			TranslationProject project = (TranslationProject) entry;
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/PropertyProvider.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/PropertyProvider.cs
index e8646605bc..5fc09b234b 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/PropertyProvider.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/PropertyProvider.cs
@@ -61,15 +61,10 @@ namespace MonoDevelop.Gettext
 			[LocalizedDescription ("Include this file in the translation scan.")]
 			public bool ScanForTranslations {
 				get {
-					object result = file.ExtendedProperties [scanForTranslationsProperty];
-					return result == null ? true : (bool)result;
+					return file.Metadata.GetValue (scanForTranslationsProperty, true);
 				}
 				set {
-					if (value) {
-						file.ExtendedProperties.Remove (scanForTranslationsProperty);
-					} else {
-						file.ExtendedProperties [scanForTranslationsProperty] = value;
-					}
+					file.Metadata.SetValue (scanForTranslationsProperty, value, true);
 				}
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/RegexFileScanner.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/RegexFileScanner.cs
index 0e84bc1ee1..144d1b69c1 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/RegexFileScanner.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/RegexFileScanner.cs
@@ -118,7 +118,7 @@ namespace MonoDevelop.Gettext
 			return r;
 		}
 		
-		public virtual void UpdateCatalog (TranslationProject project, Catalog catalog, IProgressMonitor monitor, string fileName)
+		public virtual void UpdateCatalog (TranslationProject project, Catalog catalog, ProgressMonitor monitor, string fileName)
 		{
 			string text = File.ReadAllText (fileName);
 			string relativeFileName = MonoDevelop.Core.FileService.AbsoluteToRelativePath (project.BaseDirectory, fileName);
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/StringEscaping.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/StringEscaping.cs
index 8ae6882391..efe8b973e1 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/StringEscaping.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/StringEscaping.cs
@@ -237,11 +237,21 @@ namespace MonoDevelop.Gettext
 					sb.Append ('\t');
 					break;
 				case 'U':
-					//FIXME UNICODE
-					//break;
+					uint Uc;
+					if (!TryParseHex (text, i + 1, 8, out Uc) || NeedsEscaping (Uc)) {
+						throw new FormatException ("Invalid escape '\\" + text.Substring (i, 9) + "' in translatable string.");
+					}
+					sb.Append (char.ConvertFromUtf32 ((int)Uc));
+					i += 8;
+					break;
 				case 'u':
-					//FIXME unicode
-					//break;
+					uint uc;
+					if (!TryParseHex (text, i + 1, 4, out uc) || NeedsEscaping (uc)) {
+						throw new FormatException ("Invalid escape '\\" + text.Substring (i, 5) + "' in translatable string.");
+					}
+					sb.Append ((char)uc);
+					i += 4;
+					break;
 				case 'x':
 					//FIXME hex unicode
 					//break;
@@ -259,6 +269,44 @@ namespace MonoDevelop.Gettext
 			}
 			return sb.ToString ();
 		}
+
+		static bool NeedsEscaping (uint c)
+		{
+			//TODO: there are other chars we should error on?
+			if (c > char.MaxValue)
+				return false;
+			return char.IsControl ((char)c);
+		}
+
+		static bool TryParseHex (string str, int offset, int length, out uint val)
+		{
+			val = 0x0;
+
+			for (int i = offset; i < offset + length; i++) {
+				uint bits;
+				switch (str[i]) {
+					case '0': bits = 0; break;
+					case '1': bits = 1; break;
+					case '2': bits = 2; break;
+					case '3': bits = 3; break;
+					case '4': bits = 4; break;
+					case '5': bits = 5; break;
+					case '6': bits = 6; break;
+					case '7': bits = 7; break;
+					case '8': bits = 8; break;
+					case '9': bits = 9; break;
+					case 'A': case 'a': bits = 10; break;
+					case 'B': case 'b': bits = 11; break;
+					case 'C': case 'c': bits = 12; break;
+					case 'D': case 'd': bits = 13; break;
+					case 'E': case 'e': bits = 14; break;
+					case 'F': case 'f': bits = 15; break;
+					default: return false;
+				}
+				val = (val << 4) | bits;
+			}
+			return true;
+		}
 		
 		public enum EscapeMode
 		{
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Translation.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Translation.cs
index 84a8ecf5cd..178a069000 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Translation.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Translation.cs
@@ -84,7 +84,7 @@ namespace MonoDevelop.Gettext
 			return Path.Combine (moDirectory, parentProject.PackageName + ".mo");
 		}
 		
-		public BuildResult Build (IProgressMonitor monitor, ConfigurationSelector configuration)
+		public BuildResult Build (ProgressMonitor monitor, ConfigurationSelector configuration)
 		{
 			BuildResult results = new BuildResult ("", 0, 0);
 			
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs
index fcef46a792..14e4396528 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs
@@ -38,10 +38,12 @@ using MonoDevelop.Core.Serialization;
 using MonoDevelop.Deployment;
 using MonoDevelop.Ide;
 using MonoDevelop.Core.Execution;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Gettext
 {	
-	class TranslationProject : SolutionEntityItem, IDeployable
+	class TranslationProject : Project, IDeployable
 	{
 		[ItemProperty("packageName")]
 		string packageName = null;
@@ -85,18 +87,13 @@ namespace MonoDevelop.Gettext
 		
 		public TranslationProject ()
 		{
+			Initialize (this);
 			translations = new TranslationCollection (this);
-			
-			//NOTE: we don't really need multiple configurations for this project type, since nothing actually uses them
-			//but it makes the solution configuration mapping look more consistent
-			//Perhaps in future there will be some per-config settings
-			foreach (string config in new [] { "Debug", "Release"})
-				Configurations.Add (new TranslationProjectConfiguration (config));
 		}
-		
-		protected override List<FilePath> OnGetItemFiles (bool includeReferencedFiles)
+
+		protected override IEnumerable<FilePath> OnGetItemFiles (bool includeReferencedFiles)
 		{

-			List<FilePath> col = base.OnGetItemFiles (includeReferencedFiles);
+			List<FilePath> col = base.OnGetItemFiles (includeReferencedFiles).ToList();
 			if (includeReferencedFiles) {
 				foreach (Translation tr in translations)
 					col.Add (tr.PoFile);
@@ -104,7 +101,7 @@ namespace MonoDevelop.Gettext
 			return col;
 		}
 		
-		public TranslationProjectInformation GetProjectInformation (SolutionItem entry, bool force)
+		public TranslationProjectInformation GetProjectInformation (SolutionFolderItem entry, bool force)
 		{
 			foreach (TranslationProjectInformation info in this.projectInformations) {
 				if (info.ProjectName == entry.Name)
@@ -118,7 +115,7 @@ namespace MonoDevelop.Gettext
 			return null;
 		}
 		
-		public bool IsIncluded (SolutionItem entry)
+		public bool IsIncluded (SolutionFolderItem entry)
 		{
 			TranslationProjectInformation info = GetProjectInformation (entry, false);
 			if (info != null)
@@ -126,8 +123,14 @@ namespace MonoDevelop.Gettext
 			return true;
 		}
 		
-		public override void InitializeFromTemplate (XmlElement template)
+		protected override void OnInitializeFromTemplate (ProjectCreateInformation projectCreateInfo, XmlElement template)
 		{
+			//NOTE: we don't really need multiple configurations for this project type, since nothing actually uses them
+			//but it makes the solution configuration mapping look more consistent
+			//Perhaps in future there will be some per-config settings
+			foreach (string config in new [] { "Debug", "Release"})
+				Configurations.Add (new TranslationProjectConfiguration (config));
+
 			OutputType  = (TranslationOutputType)Enum.Parse (typeof(TranslationOutputType), template.GetAttribute ("outputType"));
 			PackageName = template.GetAttribute ("packageName");
 			RelPath     = template.GetAttribute ("relPath");
@@ -169,7 +172,7 @@ namespace MonoDevelop.Gettext
 		}
 		
 
-		public Translation AddNewTranslation (string isoCode, IProgressMonitor monitor)
+		public Translation AddNewTranslation (string isoCode, ProgressMonitor monitor)
 		{
 			try {
 				Translation tr = new Translation (this, isoCode);
@@ -182,7 +185,7 @@ namespace MonoDevelop.Gettext
 				
 				monitor.ReportSuccess (String.Format (GettextCatalog.GetString ("Language '{0}' successfully added."), isoCode));
 				monitor.Step (1);
-				this.Save (monitor);
+				SaveAsync (monitor);
 				return tr;
 			} catch (Exception e) {
 				monitor.ReportError (String.Format ( GettextCatalog.GetString ("Language '{0}' could not be added: "), isoCode), e);
@@ -221,7 +224,7 @@ namespace MonoDevelop.Gettext
 			OnTranslationRemoved (EventArgs.Empty);
 		}
 		
-		public override SolutionItemConfiguration CreateConfiguration (string name)
+		protected override SolutionItemConfiguration OnCreateConfiguration (string name, ConfigurationKind kind)
 		{
 			return new TranslationProjectConfiguration (name);
 		}
@@ -236,7 +239,7 @@ namespace MonoDevelop.Gettext
 			return Path.Combine (this.ParentSolution.StartupItem.BaseDirectory, RelPath);
 		}
 		
-		void CreateDefaultCatalog (IProgressMonitor monitor)
+		void CreateDefaultCatalog (ProgressMonitor monitor)
 		{
 			IFileScanner[] scanners = TranslationService.GetFileScanners ();
 			
@@ -259,19 +262,19 @@ namespace MonoDevelop.Gettext
 						}
 					}
 				}
-				if (monitor.IsCancelRequested)
+				if (monitor.CancellationToken.IsCancellationRequested)
 					return;
 				monitor.Step (1);
 			}
 			catalog.Save (Path.Combine (this.BaseDirectory, "messages.po"));
 		}
 		
-		public void UpdateTranslations (IProgressMonitor monitor)
+		public void UpdateTranslations (ProgressMonitor monitor)
 		{
 			UpdateTranslations (monitor, translations.ToArray ());
 		}
 		
-		public void UpdateTranslations (IProgressMonitor monitor, params Translation[] translations)
+		public void UpdateTranslations (ProgressMonitor monitor, params Translation[] translations)
 		{
 			monitor.BeginTask (null, Translations.Count + 1);
 			
@@ -288,7 +291,7 @@ namespace MonoDevelop.Gettext
 				monitor.EndTask ();
 				monitor.Step (1);
 			}
-			if (monitor.IsCancelRequested) {
+			if (monitor.CancellationToken.IsCancellationRequested) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Operation cancelled."));
 				return;
 			}
@@ -324,7 +327,7 @@ namespace MonoDevelop.Gettext
 					monitor.EndTask ();
 					monitor.Step (1);
 				}
-				if (monitor.IsCancelRequested) {
+				if (monitor.CancellationToken.IsCancellationRequested) {
 					monitor.Log.WriteLine (GettextCatalog.GetString ("Operation cancelled."));
 					return;
 				}
@@ -335,7 +338,7 @@ namespace MonoDevelop.Gettext
 			foreach (Translation translation in this.Translations) {
 				string poFileName  = translation.PoFile;
 				Catalog catalog = new Catalog (this);
-				catalog.Load (new MonoDevelop.Core.ProgressMonitoring.NullProgressMonitor (), poFileName);
+				catalog.Load (new MonoDevelop.Core.ProgressMonitor (), poFileName);
 				CatalogEntry entry = catalog.FindItem (msgstr);
 				if (entry != null) {
 					catalog.RemoveItem (entry);
@@ -344,40 +347,43 @@ namespace MonoDevelop.Gettext
 			}
 		}
 		
-		protected override BuildResult OnBuild (IProgressMonitor monitor, ConfigurationSelector configuration)
+		protected async override Task<BuildResult> OnBuild (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext)
 		{
+			var toBuild = Translations.Where (t => t.NeedsBuilding(configuration)).ToArray ();
 			BuildResult results = new BuildResult ("", 1, 0);
 			string outputDirectory = GetOutputDirectory (configuration);
 			if (!string.IsNullOrEmpty (outputDirectory)) {
-				foreach (Translation translation in this.Translations) {
-					if (translation.NeedsBuilding (configuration)) {
-						BuildResult res = translation.Build (monitor, configuration);
-						results.Append (res);
+				await Task.Run (delegate {
+					foreach (Translation translation in toBuild) {
+						if (translation.NeedsBuilding (configuration)) {
+							BuildResult res = translation.Build (monitor, configuration);
+							results.Append (res);
+						}
 					}
-				}
-				isDirty = false;
+					isDirty = false;
+				});
 			}
 			return results;
 		}
 		
-		protected override void OnClean (IProgressMonitor monitor, ConfigurationSelector configuration)
+		protected async override Task<BuildResult> OnClean (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext)
 		{
 			isDirty = true;
 			monitor.Log.WriteLine (GettextCatalog.GetString ("Removing all .mo files."));
 			string outputDirectory = GetOutputDirectory (configuration);
 			if (string.IsNullOrEmpty (outputDirectory))
-				return;
-			foreach (Translation translation in this.Translations) {
-				string moFileName  = translation.GetOutFile (configuration);
-				if (File.Exists (moFileName)) 
-					File.Delete (moFileName);
-			}
-		}
-		
-		protected override void OnExecute (IProgressMonitor monitor, MonoDevelop.Projects.ExecutionContext context, ConfigurationSelector configuration)
-		{
+				return BuildResult.CreateSuccess ();
+
+			var toClean = Translations.Select (t => t.GetOutFile (configuration)).ToArray ();
+			await Task.Run (delegate {
+				foreach (string moFileName in toClean) {
+					if (File.Exists (moFileName))
+						File.Delete (moFileName);
+				}
+			});
+			return BuildResult.CreateSuccess ();
 		}
-		
+
 #region Deployment
 		public DeployFileCollection GetDeployFiles (ConfigurationSelector configuration)
 		{
@@ -410,11 +416,6 @@ namespace MonoDevelop.Gettext
 			return false;
 		}
 		
-		protected override void OnSetNeedsBuilding (bool val, ConfigurationSelector configuration)
-		{
-			isDirty = val;
-		}
-		
 		protected virtual void OnTranslationAdded (EventArgs e)
 		{
 			if (TranslationAdded != null)
@@ -437,13 +438,9 @@ namespace MonoDevelop.Gettext
 		SystemPath
 	}
 	
-	class TranslationProjectConfiguration : SolutionItemConfiguration
+	class TranslationProjectConfiguration : ProjectConfiguration
 	{
-		public TranslationProjectConfiguration ()
-		{
-		}
-		
-		public TranslationProjectConfiguration (string name): base (name)
+		public TranslationProjectConfiguration (string id): base (id)
 		{
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs
index 185e521dc7..b1199da866 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProjectOptionsDialog.cs
@@ -67,7 +67,7 @@ namespace MonoDevelop.Gettext
 				this.Destroy ();
 			};
 			
-			store = new TreeStore (typeof(string), typeof(bool), typeof(string), typeof(SolutionItem), typeof(bool));
+			store = new TreeStore (typeof(string), typeof(bool), typeof(string), typeof(SolutionFolderItem), typeof(bool));
 			treeviewProjectList.Model = store;
 			treeviewProjectList.HeadersVisible = false;
 			
@@ -98,7 +98,7 @@ namespace MonoDevelop.Gettext
 			TreeIter iter;
 			if (store.GetIterFromString (out iter, e.Path)) {
 				bool         isTogglod = (bool)store.GetValue (iter, 1);
-				SolutionItem entry     = (SolutionItem)store.GetValue (iter, 3);
+				SolutionFolderItem entry     = (SolutionFolderItem)store.GetValue (iter, 3);
 				if (entry is Project) {
 					TranslationProjectInformation info = project.GetProjectInformation (entry, true);
 					info.IsIncluded = !isTogglod;
@@ -108,7 +108,7 @@ namespace MonoDevelop.Gettext
 		}
 		
 		TreeStore store;
-		string GetIcon (SolutionItem entry)
+		string GetIcon (SolutionFolderItem entry)
 		{
 			if (entry is SolutionFolder)
 				return MonoDevelop.Ide.Gui.Stock.Solution;
@@ -119,10 +119,10 @@ namespace MonoDevelop.Gettext
 			return MonoDevelop.Ide.Gui.Stock.Project;
 		}
 		
-		bool IsIncluded (SolutionItem entry)
+		bool IsIncluded (SolutionFolderItem entry)
 		{
 			if (entry is SolutionFolder) {
-				foreach (SolutionItem childEntry in ((SolutionFolder)entry).Items)
+				foreach (SolutionFolderItem childEntry in ((SolutionFolder)entry).Items)
 					if (!IsIncluded (childEntry))
 						return false;
 				return true;
@@ -134,7 +134,7 @@ namespace MonoDevelop.Gettext
 			return true;
 		}
 			
-		void FillTree (TreeIter iter, SolutionItem entry)
+		void FillTree (TreeIter iter, SolutionFolderItem entry)
 		{
 			TreeIter curIter;
 			if (!iter.Equals (TreeIter.Zero)) {
@@ -144,10 +144,10 @@ namespace MonoDevelop.Gettext
 			}
 			if (entry is SolutionFolder) {
 				// Add solutions first, then projects
-				foreach (SolutionItem childEntry in ((SolutionFolder)entry).Items)
+				foreach (SolutionFolderItem childEntry in ((SolutionFolder)entry).Items)
 					if (childEntry is SolutionFolder)
 						FillTree (curIter, childEntry);
-				foreach (SolutionItem childEntry in ((SolutionFolder)entry).Items)
+				foreach (SolutionFolderItem childEntry in ((SolutionFolder)entry).Items)
 					if (!(childEntry is TranslationProject) && (childEntry is Project))
 						FillTree (curIter, childEntry);
 			}
diff --git a/main/src/addins/MonoDevelop.Gettext/gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs
index c91ffde2da..3d99d3fd00 100644
--- a/main/src/addins/MonoDevelop.Gettext/gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs
@@ -5,42 +5,97 @@ namespace MonoDevelop.Gettext
 	internal partial class POEditorWidget
 	{
 		private global::Gtk.UIManager UIManager;
+		
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.Notebook notebookPages;
+		
 		private global::Gtk.VBox vbox7;
+		
 		private global::Gtk.HBox hbox2;
+		
 		private global::Gtk.Label label2;
+		
 		private global::MonoDevelop.Components.SearchEntry searchEntryFilter;
+		
 		private global::Gtk.ToggleButton togglebuttonOk;
+		
+		private global::Gtk.HBox togglebuttonOkHbox;
+		
+		private global::MonoDevelop.Components.ImageView togglebuttonOkIcon;
+		
+		private global::Gtk.Label togglebuttonOkLabel;
+		
 		private global::Gtk.ToggleButton togglebuttonMissing;
+		
+		private global::Gtk.HBox togglebuttonMissingHbox;
+		
+		private global::MonoDevelop.Components.ImageView togglebuttonMissingIcon;
+		
+		private global::Gtk.Label togglebuttonMissingLabel;
+		
 		private global::Gtk.ToggleButton togglebuttonFuzzy;
+		
+		private global::Gtk.HBox togglebuttonFuzzyHbox;
+		
+		private global::MonoDevelop.Components.ImageView togglebuttonFuzzyIcon;
+		
+		private global::Gtk.Label togglebuttonFuzzyLabel;
+		
 		private global::Gtk.VPaned vpaned2;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow1;
+		
 		private global::Gtk.TreeView treeviewEntries;
+		
 		private global::Gtk.Table table1;
+		
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.Label label6;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow3;
+		
 		private global::Gtk.TextView textviewComments;
+		
 		private global::Gtk.VBox vbox4;
+		
 		private global::Gtk.Label label7;
+		
 		private global::Gtk.Notebook notebookTranslated;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.VBox vbox5;
+		
 		private global::Gtk.HBox hbox3;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.CheckButton checkbuttonWhiteSpaces;
+		
 		private global::Gtk.ScrolledWindow scrolledwindowOriginal;
+		
 		private global::Gtk.VBox vbox8;
+		
 		private global::Gtk.Label label9;
+		
 		private global::Gtk.ScrolledWindow scrolledwindowPlural;
+		
 		private global::Gtk.VBox vbox6;
+		
 		private global::Gtk.Label label4;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow2;
+		
 		private global::Gtk.TreeView treeviewFoundIn;
+		
 		private global::Gtk.Label label5;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.Toolbar toolbarPages;
+		
 		private global::Gtk.ProgressBar progressbar1;
 
 		protected virtual void Build ()
@@ -98,49 +153,109 @@ namespace MonoDevelop.Gettext
 			this.togglebuttonOk = new global::Gtk.ToggleButton ();
 			this.togglebuttonOk.CanFocus = true;
 			this.togglebuttonOk.Name = "togglebuttonOk";
-			this.togglebuttonOk.UseUnderline = true;
-			this.togglebuttonOk.Label = global::Mono.Unix.Catalog.GetString ("Valid");
-			global::Gtk.Image w5 = new global::Gtk.Image ();
-			w5.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("done-16.png");
-			this.togglebuttonOk.Image = w5;
-			this.hbox2.Add (this.togglebuttonOk);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonOk]));
-			w6.Position = 2;
+			// Container child togglebuttonOk.Gtk.Container+ContainerChild
+			this.togglebuttonOkHbox = new global::Gtk.HBox ();
+			this.togglebuttonOkHbox.Name = "togglebuttonOkHbox";
+			this.togglebuttonOkHbox.Spacing = 2;
+			// Container child togglebuttonOkHbox.Gtk.Box+BoxChild
+			this.togglebuttonOkIcon = new global::MonoDevelop.Components.ImageView ();
+			this.togglebuttonOkIcon.Name = "togglebuttonOkIcon";
+			this.togglebuttonOkIcon.IconId = "md-done";
+			this.togglebuttonOkIcon.IconSize = ((global::Gtk.IconSize)(1));
+			this.togglebuttonOkHbox.Add (this.togglebuttonOkIcon);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.togglebuttonOkHbox [this.togglebuttonOkIcon]));
+			w5.Position = 0;
+			w5.Expand = false;
+			w5.Fill = false;
+			// Container child togglebuttonOkHbox.Gtk.Box+BoxChild
+			this.togglebuttonOkLabel = new global::Gtk.Label ();
+			this.togglebuttonOkLabel.Name = "togglebuttonOkLabel";
+			this.togglebuttonOkLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Valid");
+			this.togglebuttonOkLabel.UseUnderline = true;
+			this.togglebuttonOkHbox.Add (this.togglebuttonOkLabel);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.togglebuttonOkHbox [this.togglebuttonOkLabel]));
+			w6.Position = 1;
 			w6.Expand = false;
 			w6.Fill = false;
+			this.togglebuttonOk.Add (this.togglebuttonOkHbox);
+			this.hbox2.Add (this.togglebuttonOk);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonOk]));
+			w8.Position = 2;
+			w8.Expand = false;
+			w8.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
 			this.togglebuttonMissing = new global::Gtk.ToggleButton ();
 			this.togglebuttonMissing.CanFocus = true;
 			this.togglebuttonMissing.Name = "togglebuttonMissing";
-			this.togglebuttonMissing.UseUnderline = true;
-			this.togglebuttonMissing.Label = global::Mono.Unix.Catalog.GetString ("Missing");
-			global::Gtk.Image w7 = new global::Gtk.Image ();
-			w7.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("warning-16.png");
-			this.togglebuttonMissing.Image = w7;
+			// Container child togglebuttonMissing.Gtk.Container+ContainerChild
+			this.togglebuttonMissingHbox = new global::Gtk.HBox ();
+			this.togglebuttonMissingHbox.Name = "togglebuttonMissingHbox";
+			this.togglebuttonMissingHbox.Spacing = 2;
+			// Container child togglebuttonMissingHbox.Gtk.Box+BoxChild
+			this.togglebuttonMissingIcon = new global::MonoDevelop.Components.ImageView ();
+			this.togglebuttonMissingIcon.Name = "togglebuttonMissingIcon";
+			this.togglebuttonMissingIcon.IconId = "md-warning";
+			this.togglebuttonMissingIcon.IconSize = ((global::Gtk.IconSize)(1));
+			this.togglebuttonMissingHbox.Add (this.togglebuttonMissingIcon);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.togglebuttonMissingHbox [this.togglebuttonMissingIcon]));
+			w9.Position = 0;
+			w9.Expand = false;
+			w9.Fill = false;
+			// Container child togglebuttonMissingHbox.Gtk.Box+BoxChild
+			this.togglebuttonMissingLabel = new global::Gtk.Label ();
+			this.togglebuttonMissingLabel.Name = "togglebuttonMissingLabel";
+			this.togglebuttonMissingLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Missing");
+			this.togglebuttonMissingLabel.UseUnderline = true;
+			this.togglebuttonMissingHbox.Add (this.togglebuttonMissingLabel);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.togglebuttonMissingHbox [this.togglebuttonMissingLabel]));
+			w10.Position = 1;
+			w10.Expand = false;
+			w10.Fill = false;
+			this.togglebuttonMissing.Add (this.togglebuttonMissingHbox);
 			this.hbox2.Add (this.togglebuttonMissing);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonMissing]));
-			w8.Position = 3;
-			w8.Expand = false;
-			w8.Fill = false;
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonMissing]));
+			w12.Position = 3;
+			w12.Expand = false;
+			w12.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
 			this.togglebuttonFuzzy = new global::Gtk.ToggleButton ();
 			this.togglebuttonFuzzy.CanFocus = true;
 			this.togglebuttonFuzzy.Name = "togglebuttonFuzzy";
-			this.togglebuttonFuzzy.UseUnderline = true;
-			this.togglebuttonFuzzy.Label = global::Mono.Unix.Catalog.GetString ("Fuzzy");
-			global::Gtk.Image w9 = new global::Gtk.Image ();
-			w9.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("error-16.png");
-			this.togglebuttonFuzzy.Image = w9;
+			// Container child togglebuttonFuzzy.Gtk.Container+ContainerChild
+			this.togglebuttonFuzzyHbox = new global::Gtk.HBox ();
+			this.togglebuttonFuzzyHbox.Name = "togglebuttonFuzzyHbox";
+			this.togglebuttonFuzzyHbox.Spacing = 2;
+			// Container child togglebuttonFuzzyHbox.Gtk.Box+BoxChild
+			this.togglebuttonFuzzyIcon = new global::MonoDevelop.Components.ImageView ();
+			this.togglebuttonFuzzyIcon.Name = "togglebuttonFuzzyIcon";
+			this.togglebuttonFuzzyIcon.IconId = "md-error";
+			this.togglebuttonFuzzyIcon.IconSize = ((global::Gtk.IconSize)(1));
+			this.togglebuttonFuzzyHbox.Add (this.togglebuttonFuzzyIcon);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.togglebuttonFuzzyHbox [this.togglebuttonFuzzyIcon]));
+			w13.Position = 0;
+			w13.Expand = false;
+			w13.Fill = false;
+			// Container child togglebuttonFuzzyHbox.Gtk.Box+BoxChild
+			this.togglebuttonFuzzyLabel = new global::Gtk.Label ();
+			this.togglebuttonFuzzyLabel.Name = "togglebuttonFuzzyLabel";
+			this.togglebuttonFuzzyLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Fuzzy");
+			this.togglebuttonFuzzyLabel.UseUnderline = true;
+			this.togglebuttonFuzzyHbox.Add (this.togglebuttonFuzzyLabel);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.togglebuttonFuzzyHbox [this.togglebuttonFuzzyLabel]));
+			w14.Position = 1;
+			w14.Expand = false;
+			w14.Fill = false;
+			this.togglebuttonFuzzy.Add (this.togglebuttonFuzzyHbox);
 			this.hbox2.Add (this.togglebuttonFuzzy);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonFuzzy]));
-			w10.Position = 4;
-			w10.Expand = false;
-			w10.Fill = false;
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonFuzzy]));
+			w16.Position = 4;
+			w16.Expand = false;
+			w16.Fill = false;
 			this.vbox7.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.hbox2]));
-			w11.Position = 0;
-			w11.Expand = false;
-			w11.Fill = false;
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.hbox2]));
+			w17.Position = 0;
+			w17.Expand = false;
+			w17.Fill = false;
 			// Container child vbox7.Gtk.Box+BoxChild
 			this.vpaned2 = new global::Gtk.VPaned ();
 			this.vpaned2.CanFocus = true;
@@ -157,8 +272,8 @@ namespace MonoDevelop.Gettext
 			this.treeviewEntries.Name = "treeviewEntries";
 			this.scrolledwindow1.Add (this.treeviewEntries);
 			this.vpaned2.Add (this.scrolledwindow1);
-			global::Gtk.Paned.PanedChild w13 = ((global::Gtk.Paned.PanedChild)(this.vpaned2 [this.scrolledwindow1]));
-			w13.Resize = false;
+			global::Gtk.Paned.PanedChild w19 = ((global::Gtk.Paned.PanedChild)(this.vpaned2 [this.scrolledwindow1]));
+			w19.Resize = false;
 			// Container child vpaned2.Gtk.Paned+PanedChild
 			this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), true);
 			this.table1.Name = "table1";
@@ -175,10 +290,10 @@ namespace MonoDevelop.Gettext
 			this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("_Comments:");
 			this.label6.UseUnderline = true;
 			this.vbox3.Add (this.label6);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label6]));
-			w14.Position = 0;
-			w14.Expand = false;
-			w14.Fill = false;
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label6]));
+			w20.Position = 0;
+			w20.Expand = false;
+			w20.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
 			this.scrolledwindow3 = new global::Gtk.ScrolledWindow ();
 			this.scrolledwindow3.CanFocus = true;
@@ -191,15 +306,15 @@ namespace MonoDevelop.Gettext
 			this.textviewComments.AcceptsTab = false;
 			this.scrolledwindow3.Add (this.textviewComments);
 			this.vbox3.Add (this.scrolledwindow3);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.scrolledwindow3]));
-			w16.Position = 1;
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.scrolledwindow3]));
+			w22.Position = 1;
 			this.table1.Add (this.vbox3);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox3]));
-			w17.TopAttach = ((uint)(1));
-			w17.BottomAttach = ((uint)(2));
-			w17.LeftAttach = ((uint)(1));
-			w17.RightAttach = ((uint)(2));
-			w17.XOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox3]));
+			w23.TopAttach = ((uint)(1));
+			w23.BottomAttach = ((uint)(2));
+			w23.LeftAttach = ((uint)(1));
+			w23.RightAttach = ((uint)(2));
+			w23.XOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
 			this.vbox4 = new global::Gtk.VBox ();
 			this.vbox4.Name = "vbox4";
@@ -211,33 +326,33 @@ namespace MonoDevelop.Gettext
 			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("_Translated (msgstr):");
 			this.label7.UseUnderline = true;
 			this.vbox4.Add (this.label7);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label7]));
-			w18.Position = 0;
-			w18.Expand = false;
-			w18.Fill = false;
+			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label7]));
+			w24.Position = 0;
+			w24.Expand = false;
+			w24.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
 			this.notebookTranslated = new global::Gtk.Notebook ();
 			this.notebookTranslated.CanFocus = true;
 			this.notebookTranslated.Name = "notebookTranslated";
 			this.notebookTranslated.CurrentPage = 0;
 			// Notebook tab
-			global::Gtk.Label w19 = new global::Gtk.Label ();
-			w19.Visible = true;
-			this.notebookTranslated.Add (w19);
+			global::Gtk.Label w25 = new global::Gtk.Label ();
+			w25.Visible = true;
+			this.notebookTranslated.Add (w25);
 			this.label1 = new global::Gtk.Label ();
 			this.label1.Name = "label1";
 			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("page1");
-			this.notebookTranslated.SetTabLabel (w19, this.label1);
+			this.notebookTranslated.SetTabLabel (w25, this.label1);
 			this.label1.ShowAll ();
 			this.vbox4.Add (this.notebookTranslated);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.notebookTranslated]));
-			w20.Position = 1;
+			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.notebookTranslated]));
+			w26.Position = 1;
 			this.table1.Add (this.vbox4);
-			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox4]));
-			w21.TopAttach = ((uint)(1));
-			w21.BottomAttach = ((uint)(2));
-			w21.XOptions = ((global::Gtk.AttachOptions)(4));
-			w21.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w27 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox4]));
+			w27.TopAttach = ((uint)(1));
+			w27.BottomAttach = ((uint)(2));
+			w27.XOptions = ((global::Gtk.AttachOptions)(4));
+			w27.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
 			this.vbox5 = new global::Gtk.VBox ();
 			this.vbox5.Name = "vbox5";
@@ -252,8 +367,8 @@ namespace MonoDevelop.Gettext
 			this.label8.Xalign = 0F;
 			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Original (msgid):");
 			this.hbox3.Add (this.label8);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label8]));
-			w22.Position = 0;
+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label8]));
+			w28.Position = 0;
 			// Container child hbox3.Gtk.Box+BoxChild
 			this.checkbuttonWhiteSpaces = new global::Gtk.CheckButton ();
 			this.checkbuttonWhiteSpaces.CanFocus = true;
@@ -262,22 +377,22 @@ namespace MonoDevelop.Gettext
 			this.checkbuttonWhiteSpaces.DrawIndicator = true;
 			this.checkbuttonWhiteSpaces.UseUnderline = true;
 			this.hbox3.Add (this.checkbuttonWhiteSpaces);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.checkbuttonWhiteSpaces]));
-			w23.Position = 1;
-			w23.Expand = false;
+			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.checkbuttonWhiteSpaces]));
+			w29.Position = 1;
+			w29.Expand = false;
 			this.vbox5.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3]));
-			w24.Position = 0;
-			w24.Expand = false;
-			w24.Fill = false;
+			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3]));
+			w30.Position = 0;
+			w30.Expand = false;
+			w30.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
 			this.scrolledwindowOriginal = new global::Gtk.ScrolledWindow ();
 			this.scrolledwindowOriginal.CanFocus = true;
 			this.scrolledwindowOriginal.Name = "scrolledwindowOriginal";
 			this.scrolledwindowOriginal.ShadowType = ((global::Gtk.ShadowType)(1));
 			this.vbox5.Add (this.scrolledwindowOriginal);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.scrolledwindowOriginal]));
-			w25.Position = 1;
+			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.scrolledwindowOriginal]));
+			w31.Position = 1;
 			// Container child vbox5.Gtk.Box+BoxChild
 			this.vbox8 = new global::Gtk.VBox ();
 			this.vbox8.Name = "vbox8";
@@ -288,21 +403,21 @@ namespace MonoDevelop.Gettext
 			this.label9.Xalign = 0F;
 			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Original plural (msgid_plural):");
 			this.vbox8.Add (this.label9);
-			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox8 [this.label9]));
-			w26.Position = 0;
-			w26.Expand = false;
-			w26.Fill = false;
+			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.vbox8 [this.label9]));
+			w32.Position = 0;
+			w32.Expand = false;
+			w32.Fill = false;
 			// Container child vbox8.Gtk.Box+BoxChild
 			this.scrolledwindowPlural = new global::Gtk.ScrolledWindow ();
 			this.scrolledwindowPlural.CanFocus = true;
 			this.scrolledwindowPlural.Name = "scrolledwindowPlural";
 			this.scrolledwindowPlural.ShadowType = ((global::Gtk.ShadowType)(1));
 			this.vbox8.Add (this.scrolledwindowPlural);
-			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox8 [this.scrolledwindowPlural]));
-			w27.Position = 1;
+			global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.vbox8 [this.scrolledwindowPlural]));
+			w33.Position = 1;
 			this.vbox5.Add (this.vbox8);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.vbox8]));
-			w28.Position = 2;
+			global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.vbox8]));
+			w34.Position = 2;
 			this.table1.Add (this.vbox5);
 			// Container child table1.Gtk.Table+TableChild
 			this.vbox6 = new global::Gtk.VBox ();
@@ -315,10 +430,10 @@ namespace MonoDevelop.Gettext
 			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("F_ound in:");
 			this.label4.UseUnderline = true;
 			this.vbox6.Add (this.label4);
-			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label4]));
-			w30.Position = 0;
-			w30.Expand = false;
-			w30.Fill = false;
+			global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label4]));
+			w36.Position = 0;
+			w36.Expand = false;
+			w36.Fill = false;
 			// Container child vbox6.Gtk.Box+BoxChild
 			this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
 			this.scrolledwindow2.CanFocus = true;
@@ -330,20 +445,20 @@ namespace MonoDevelop.Gettext
 			this.treeviewFoundIn.Name = "treeviewFoundIn";
 			this.scrolledwindow2.Add (this.treeviewFoundIn);
 			this.vbox6.Add (this.scrolledwindow2);
-			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.scrolledwindow2]));
-			w32.Position = 1;
+			global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.scrolledwindow2]));
+			w38.Position = 1;
 			this.table1.Add (this.vbox6);
-			global::Gtk.Table.TableChild w33 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox6]));
-			w33.LeftAttach = ((uint)(1));
-			w33.RightAttach = ((uint)(2));
-			w33.XOptions = ((global::Gtk.AttachOptions)(4));
-			w33.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w39 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox6]));
+			w39.LeftAttach = ((uint)(1));
+			w39.RightAttach = ((uint)(2));
+			w39.XOptions = ((global::Gtk.AttachOptions)(4));
+			w39.YOptions = ((global::Gtk.AttachOptions)(4));
 			this.vpaned2.Add (this.table1);
-			global::Gtk.Paned.PanedChild w34 = ((global::Gtk.Paned.PanedChild)(this.vpaned2 [this.table1]));
-			w34.Resize = false;
+			global::Gtk.Paned.PanedChild w40 = ((global::Gtk.Paned.PanedChild)(this.vpaned2 [this.table1]));
+			w40.Resize = false;
 			this.vbox7.Add (this.vpaned2);
-			global::Gtk.Box.BoxChild w35 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.vpaned2]));
-			w35.Position = 1;
+			global::Gtk.Box.BoxChild w41 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.vpaned2]));
+			w41.Position = 1;
 			this.notebookPages.Add (this.vbox7);
 			// Notebook tab
 			this.label5 = new global::Gtk.Label ();
@@ -352,8 +467,8 @@ namespace MonoDevelop.Gettext
 			this.notebookPages.SetTabLabel (this.vbox7, this.label5);
 			this.label5.ShowAll ();
 			this.vbox2.Add (this.notebookPages);
-			global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebookPages]));
-			w37.Position = 0;
+			global::Gtk.Box.BoxChild w43 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebookPages]));
+			w43.Position = 0;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.hbox1 = new global::Gtk.HBox ();
 			this.hbox1.Name = "hbox1";
@@ -366,19 +481,19 @@ namespace MonoDevelop.Gettext
 			this.toolbarPages.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
 			this.toolbarPages.IconSize = ((global::Gtk.IconSize)(3));
 			this.hbox1.Add (this.toolbarPages);
-			global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.toolbarPages]));
-			w38.Position = 0;
+			global::Gtk.Box.BoxChild w44 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.toolbarPages]));
+			w44.Position = 0;
 			// Container child hbox1.Gtk.Box+BoxChild
 			this.progressbar1 = new global::Gtk.ProgressBar ();
 			this.progressbar1.Name = "progressbar1";
 			this.hbox1.Add (this.progressbar1);
-			global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.progressbar1]));
-			w39.Position = 1;
+			global::Gtk.Box.BoxChild w45 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.progressbar1]));
+			w45.Position = 1;
 			this.vbox2.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w40 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
-			w40.Position = 1;
-			w40.Expand = false;
-			w40.Fill = false;
+			global::Gtk.Box.BoxChild w46 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
+			w46.Position = 1;
+			w46.Expand = false;
+			w46.Fill = false;
 			this.Add (this.vbox2);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
diff --git a/main/src/addins/MonoDevelop.Gettext/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.Gettext/gtk-gui/generated.cs
index 75935e2e55..886fd2e124 100644
--- a/main/src/addins/MonoDevelop.Gettext/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.Gettext/gtk-gui/generated.cs
@@ -17,6 +17,7 @@ namespace Stetic
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
+		
 		private Gtk.UIManager uimanager;
 
 		public static BinContainer Attach (Gtk.Bin bin)
@@ -58,7 +59,8 @@ namespace Stetic
 			if ((this.uimanager != null)) {
 				Gtk.Widget w;
 				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
+				if (((w != null)
+				    && typeof(Gtk.Window).IsInstanceOfType (w))) {
 					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
 					this.uimanager = null;
 				}
diff --git a/main/src/addins/MonoDevelop.Gettext/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Gettext/gtk-gui/gui.stetic
index b9c986485f..9c7797d417 100644
--- a/main/src/addins/MonoDevelop.Gettext/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Gettext/gtk-gui/gui.stetic
@@ -617,7 +617,7 @@
     <property name="Events">ButtonPressMask</property>
     <property name="GeneratePublic">False</property>
     <property name="Title" translatable="yes">Create New Localization</property>
-    <property name="Icon">resource:locale_16x16.png</property>
+    <property name="Icon">resource:locale-16.png</property>
     <property name="TypeHint">Dialog</property>
     <property name="WindowPosition">CenterOnParent</property>
     <property name="Modal">True</property>
@@ -1320,10 +1320,39 @@
                       <widget class="Gtk.ToggleButton" id="togglebuttonOk">
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
-                        <property name="Type">TextAndIcon</property>
-                        <property name="Icon">resource:silk_accept.png</property>
-                        <property name="Label" translatable="yes">Valid</property>
-                        <property name="UseUnderline">True</property>
+                        <property name="Type">Custom</property>
+                        <child>
+                          <widget class="Gtk.HBox" id="togglebuttonOkHbox">
+                            <property name="MemberName" />
+                            <property name="Spacing">2</property>
+                            <child>
+                              <widget class="MonoDevelop.Components.ImageView" id="togglebuttonOkIcon">
+                                <property name="MemberName" />
+                                <property name="IconId">md-done</property>
+                                <property name="IconSize">Menu</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Label" id="togglebuttonOkLabel">
+                                <property name="MemberName" />
+                                <property name="LabelProp" translatable="yes">Valid</property>
+                                <property name="UseUnderline">True</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
                         <property name="Position">2</property>
@@ -1336,10 +1365,39 @@
                       <widget class="Gtk.ToggleButton" id="togglebuttonMissing">
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
-                        <property name="Type">TextAndIcon</property>
-                        <property name="Icon">resource:silk_exclamation.png</property>
-                        <property name="Label" translatable="yes">Missing</property>
-                        <property name="UseUnderline">True</property>
+                        <property name="Type">Custom</property>
+                        <child>
+                          <widget class="Gtk.HBox" id="togglebuttonMissingHbox">
+                            <property name="MemberName" />
+                            <property name="Spacing">2</property>
+                            <child>
+                              <widget class="MonoDevelop.Components.ImageView" id="togglebuttonMissingIcon">
+                                <property name="MemberName" />
+                                <property name="IconId">md-warning</property>
+                                <property name="IconSize">Menu</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Label" id="togglebuttonMissingLabel">
+                                <property name="MemberName" />
+                                <property name="LabelProp" translatable="yes">Missing</property>
+                                <property name="UseUnderline">True</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
                         <property name="Position">3</property>
@@ -1352,10 +1410,39 @@
                       <widget class="Gtk.ToggleButton" id="togglebuttonFuzzy">
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
-                        <property name="Type">TextAndIcon</property>
-                        <property name="Icon">resource:silk_error.png</property>
-                        <property name="Label" translatable="yes">Fuzzy</property>
-                        <property name="UseUnderline">True</property>
+                        <property name="Type">Custom</property>
+                        <child>
+                          <widget class="Gtk.HBox" id="togglebuttonFuzzyHbox">
+                            <property name="MemberName" />
+                            <property name="Spacing">2</property>
+                            <child>
+                              <widget class="MonoDevelop.Components.ImageView" id="togglebuttonFuzzyIcon">
+                                <property name="MemberName" />
+                                <property name="IconId">md-error</property>
+                                <property name="IconSize">Menu</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Label" id="togglebuttonFuzzyLabel">
+                                <property name="MemberName" />
+                                <property name="LabelProp" translatable="yes">Fuzzy</property>
+                                <property name="UseUnderline">True</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
                         <property name="Position">4</property>
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/done-16.png b/main/src/addins/MonoDevelop.Gettext/icons/done-16.png
deleted file mode 100644
index 7799066c43..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/done-16.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/done-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/done-16@2x.png
deleted file mode 100644
index c63d3974d1..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/done-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/error-16.png b/main/src/addins/MonoDevelop.Gettext/icons/error-16.png
deleted file mode 100644
index 30b5da6e9b..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/error-16.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/error-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/error-16@2x.png
deleted file mode 100644
index adfd2b7b19..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/error-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16.png
new file mode 100644
index 0000000000..b1bd5ba34e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16@2x.png
new file mode 100644
index 0000000000..fe4f9501c5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark.png
new file mode 100644
index 0000000000..d2262d4db0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark@2x.png
new file mode 100644
index 0000000000..727ba616af
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark~sel.png
new file mode 100644
index 0000000000..40022bb616
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark~sel@2x.png
new file mode 100644
index 0000000000..8581ac664e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~sel.png
new file mode 100644
index 0000000000..df213b8ce3
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~sel@2x.png
new file mode 100644
index 0000000000..5d4cc57947
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32.png
new file mode 100644
index 0000000000..fe4f9501c5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32@2x.png
new file mode 100644
index 0000000000..81c72637be
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark.png
new file mode 100644
index 0000000000..727ba616af
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark@2x.png
new file mode 100644
index 0000000000..1475f47e80
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark~sel.png
new file mode 100644
index 0000000000..8581ac664e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark~sel@2x.png
new file mode 100644
index 0000000000..1d028da49c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~sel.png
new file mode 100644
index 0000000000..5d4cc57947
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~sel@2x.png
new file mode 100644
index 0000000000..34a8ad6b78
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/file-locale-32~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-16.png b/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-16.png
deleted file mode 100644
index 728c2a3e96..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-16.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-32.png b/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-32.png
deleted file mode 100644
index 9fc3638ad5..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-32.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-16.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-16.png
new file mode 100644
index 0000000000..55c0d46d39
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-16.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-16@2x.png
new file mode 100644
index 0000000000..300f1af1b9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark.png
new file mode 100644
index 0000000000..b3e94dcae9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark@2x.png
new file mode 100644
index 0000000000..b2fe7e006e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark~sel.png
new file mode 100644
index 0000000000..4f3888b3b2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark~sel@2x.png
new file mode 100644
index 0000000000..df2816f8b2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-16~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~sel.png
new file mode 100644
index 0000000000..4f3888b3b2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-16~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~sel@2x.png
new file mode 100644
index 0000000000..df2816f8b2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-project.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-project.png
new file mode 100644
index 0000000000..c031aa8bf6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-project.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-project@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-project@2x.png
new file mode 100644
index 0000000000..b5c0bb6b6a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-project@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-project~dark.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-project~dark.png
new file mode 100644
index 0000000000..366bea4021
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-project~dark.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale-project~dark@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/locale-project~dark@2x.png
new file mode 100644
index 0000000000..4c9297d0ff
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/locale-project~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale_16x16.png b/main/src/addins/MonoDevelop.Gettext/icons/locale_16x16.png
deleted file mode 100644
index 6479612f33..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/locale_16x16.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale_22x22.png b/main/src/addins/MonoDevelop.Gettext/icons/locale_22x22.png
deleted file mode 100644
index 38b36b48c3..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/locale_22x22.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/locale_32x32.png b/main/src/addins/MonoDevelop.Gettext/icons/locale_32x32.png
deleted file mode 100644
index 608a0b1e95..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/locale_32x32.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16.png
index 19f2663360..87f2953c12 100644
--- a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16.png
+++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16@2x.png
index 1e4d00deb6..d5e0271f66 100644
--- a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16@2x.png
+++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark.png
new file mode 100644
index 0000000000..778eac0789
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark@2x.png
new file mode 100644
index 0000000000..7ac3c2cd5a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel.png
new file mode 100644
index 0000000000..6038f48200
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel@2x.png
new file mode 100644
index 0000000000..b2fb37ecd9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel.png
new file mode 100644
index 0000000000..6038f48200
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel@2x.png
new file mode 100644
index 0000000000..b2fb37ecd9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16.png
new file mode 100644
index 0000000000..3f7b1d0dec
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16@2x.png
new file mode 100644
index 0000000000..10d033c51d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark.png
new file mode 100644
index 0000000000..8dfe4e7979
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark@2x.png
new file mode 100644
index 0000000000..f0a7407bcd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark~sel.png
new file mode 100644
index 0000000000..8bc5219cdd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark~sel@2x.png
new file mode 100644
index 0000000000..5b7cc657e1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~sel.png
new file mode 100644
index 0000000000..8bc5219cdd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~sel@2x.png
new file mode 100644
index 0000000000..5b7cc657e1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32.png
new file mode 100644
index 0000000000..e8865b78d7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32@2x.png
new file mode 100644
index 0000000000..1ad3730d21
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark.png
new file mode 100644
index 0000000000..03370c8a93
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark@2x.png
new file mode 100644
index 0000000000..e372e05d81
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark~sel.png
new file mode 100644
index 0000000000..8d7eec7d91
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark~sel@2x.png
new file mode 100644
index 0000000000..698371647b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~sel.png
new file mode 100644
index 0000000000..8d7eec7d91
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~sel.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~sel@2x.png
new file mode 100644
index 0000000000..698371647b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Gettext/icons/project-locale-overlay-32~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/warning-16.png b/main/src/addins/MonoDevelop.Gettext/icons/warning-16.png
deleted file mode 100644
index 36e3484d08..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/warning-16.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/icons/warning-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/warning-16@2x.png
deleted file mode 100644
index c457998b0a..0000000000
--- a/main/src/addins/MonoDevelop.Gettext/icons/warning-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Gettext/templates/TranslationProject.xpt.xml b/main/src/addins/MonoDevelop.Gettext/templates/TranslationProject.xpt.xml
index b2abd26391..05613c9a30 100644
--- a/main/src/addins/MonoDevelop.Gettext/templates/TranslationProject.xpt.xml
+++ b/main/src/addins/MonoDevelop.Gettext/templates/TranslationProject.xpt.xml
@@ -5,7 +5,8 @@
 	<TemplateConfiguration>
 		<_Name>Translation Project</_Name>
 		<Category>other/misc/generic</Category>
-		<Icon>md-project|res:gettext-overlay-32.png</Icon>
+		<Icon>md-project-locale</Icon>
+		<Image id="md-locale-project" />
 		<_Description>Creates a translation project.</_Description>
 		<DefaultFilename>TranslationProject</DefaultFilename>
 		<FileExtension>.mdproj</FileExtension>
diff --git a/main/src/addins/MonoDevelop.GtkCore/ChangeLog b/main/src/addins/MonoDevelop.GtkCore/ChangeLog
deleted file mode 100644
index a2652e2c37..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore/ChangeLog
+++ /dev/null
@@ -1,2796 +0,0 @@
-2010-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.csproj: Added System.Core reference for
-	  windows.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  Track ProjectDomService/Parser API.
-
-2010-07-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Track
-	  API changes.
-
-2010-06-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Don't offer
-	  the gtk feature if gtk# is not installed in the active
-	  runtime. Fixes bug #608052 - The New Solution wizard throws
-	  an exception after choosing project features.
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
-	  More dialog placing.
-
-2010-05-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	  Converted some static fields which don't need to be static
-	  into local vars.
-
-2010-05-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track
-	  API.
-
-2010-04-29  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track
-	  AddFilesToProject API.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	  ViewContent widgets are now destroyed by the workspace
-	  window.
-
-
-2010-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: call
-	  destroy on the container vbox during
-
-2010-04-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: Found better work
-	  around for the "gnome-sharp" reference issue.
-
-2010-04-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: Fixed 'Bug 599335 -
-	  Error CS0433: The imported type `Gtk.DeleteEventArgs' is
-	  defined multiple times (CS0433)'.
-
-2010-03-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added
-	  null check.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bumped MD version.
-
-2010-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Use the
-	  stock Visual Design layout as layout for stetic.
-
-2010-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fix
-	  race in SteticApp initialization.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.GtkCore.csproj:
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs:
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs:
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs:
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs:
-	* MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	  Track api changes.
-
-2010-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	  Track API changes for lazy loading images.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Track api
-	  changes.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs:
-	  Flush.
-
-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  Track DisplayBinding API.
-
-2010-01-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.csproj:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Format
-	  generated files using the MD formatter to ensure that the
-	  generated text is the same for al platforms and
-	  environments.
-
-	* gtk-gui/gui.stetic: Use global:: for type references in
-	  generated code. 
-
-2009-12-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Implement SupportsItem.
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When
-	  adding a stock gtk widget to a window there is no need to
-	  update the references. Fixes bug #565492.
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs:
-	  Flush.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Introduced the ConfigurationSelector class to all methods
-	  that previously took a configuration name as string. This
-	  eliminates the ambiguity between solution configuration
-	  names and project configuration names.
-
-2009-11-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders\WindowsFolder.cs:
-	  Implemented Equals/GetHashCode. Fixes bug #549902 - MD
-	  crashes when adding a new gtk form.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2009-10-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.GtkCore.csproj:
-	* gtk-gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs:
-	  Flush.
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Use
-	  typed collection instead of ArrayList.
-
-2009-10-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs:
-	  Handled icon loading failures.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2009-09-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Route
-	  commands to the text editor view. Fixes bug #536740 -
-	  Expression evaluator unnecessarily in context menu.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* libstetic/editor/Accelerator.cs: 
-	* libstetic/editor/GroupPicker.cs: 
-	* libstetic/editor/TextEditor.cs: 
-	* libstetic/editor/SelectImageDialog.cs: 
-	* libstetic/editor/NonContainerWarningDialog.cs: 
-	* libstetic/editor/TextEditorDialog.cs: 
-	* libstetic/editor/EditIconDialog.cs: 
-	* libstetic/editor/IconSelectorMenu.cs: 
-	* libstetic/editor/Image.cs: 
-	* libstetic/editor/ActionGroupEditor.cs: 
-	* libstetic/editor/StringArray.cs: 
-	* libstetic/editor/EditIconFactoryDialog.cs: 
-	* libstetic/editor/SelectIconDialog.cs: 
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs: 
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: 
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixes to
-	  make windows and dialogs Transient to either their parent
-	  window/dialog or the MD root window (when applicable).
-
-2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Use real
-	  resource Ids instead of file names. Fixes bug #528309 -
-	  Button Icons are not displayed.
-
-2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Store the
-	  GuiBuilderProject on which the ChangedEvent was subscribed,
-	  and use that reference when unsubscribing on Dispose. This
-	  is required because the GuiBuilderProject bound to a project
-	  may change. Fixes bug #525421 - Removing gtk-sharp reference
-	  from a project causes it to not function properly.
-
-2009-08-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Don't use the text editor
-	  display binding id as reference for registering the designer
-	  view. Use DefaultDisplayBinding instead. Removed unused
-	  supportedFormats attribute.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	  Added support for saving and restoring the status of the
-	  designer, including the undo queue. This allows implenting
-	  ISupportsProjectReload.
-
-2009-08-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/FolderNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/GuiBuilderProjectNodeBuilder.cs:
-	  Remove unused files.
-
-2009-08-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Use the
-	  new AssemblyContext class to query and resolve assemblies.
-
-2009-08-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.csproj:
-	* MonoDevelop.GtkCore/Counters.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added
-	  some performance counters.
-
-2009-07-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs:
-	  Track api changes.
-
-2009-07-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: No more
-	  missing IntPtr constructor exceptions.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Use the
-	  new DesktopService instead of PlatformService.
-
-2009-06-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track
-	  assembly lookup APIs.
-
-2009-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore\ProjectResourceProvider.cs:
-	  GetMimeTypeForUri doesn't really support uris.
-
-2009-06-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	  GetGtkAssemblyVersion is expected to return the version and
-	  token, not only the version.
-
-2009-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore\ReferenceManager.cs: Don't get the
-	  package version from the gtk# package. Instead, get it from
-	  the first version numbers of the gtk-sharp assembly. That's
-	  necessary because in windows there is no gtk# package.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	  Workaround for what seems to be a mcs bug. Looks like it
-	  can't properly resolve the implicit conversion of null to
-	  string.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore\GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder\GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder\GuiBuilderProject.cs: Use the
-	  new FilePath class for handling file and directory paths.
-
-2009-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't
-	  create a new drop target list. Use the one defined by
-	  Stetic.
-
-2009-04-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Don't require a specific gtk#
-	  version.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: gui designer is now before
-	  the text editor (wrong text editor id).
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: Remove vte-sharp
-	  from the gnome libs list, since it now has its own package.
-
-2009-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Track
-	  API changes.
-
-2009-04-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	  Removed unused namespace.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	  Renamed PixbufService to ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	  Track API changes.
-
-2009-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: Moved
-	  SystemAssemblyService and related classes to the namespace
-	  MonoDevelop.Core.Assemblies.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Add
-	  support for multiple target runtimes.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	  Track API changes.
-
-2009-03-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: When the stetic files
-	  are generated for the first time, ensure that their write
-	  date is < the write date of the .stetic file, otherwise they
-	  won't be regenerated when building. Fixes bug #483970 -
-	  [Regression] Default C# Gtk# app no longer builds.
-
-2009-03-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2009-03-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Don't try to generate files when not building inside the
-	  IDE.
-
-2009-02-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: In
-	  ForceCodeGenerationOnBuild, force a rebuild of the project
-	  too. Fixes bug #472683.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Flush.
-
-2009-02-26  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/ProjectResourcesProvider.cs: lookup mime
-	type and use more specific ResourceInfo ctor. [Fixes #475820]
-
-2009-02-26  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/WidgetDesignerBackend.cs: implement Delete key 
-	support.  [Fixes #470637]
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Added
-	  explicit "Misc" category for localization.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Worked on
-	  propertygrid localization.
-
-2009-02-25  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/ApplicationBackend.cs: Reload the registry libraries
-	in LoadLibraries, since adding a library doesn't necessarily refresh
-	an out-of-date previously registered library.
-	* libsteticui/CecilWidgetLibrary.cs: enhance NeedsReload check to 
-	use a cache refresh and the new change notification so that the
-	library stays 'dirty' until it's reloaded.
-	* libsteticui/LibraryCache.cs: add change notification for cache items.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: do an update
-	of the steticapp libs even if the list hasn't changed in case the 
-	contents of any of them have changed.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: check for 
-	'dirty' references when regenerating code. [Fixes #472683]
-
-2009-02-24  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: only touch the design file
-	when forcing rebuilds.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: don't regen
-	if design file and generated files have equal timestamps to avoid
-	regenerations on fresh checkouts. [#478894]
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs:
-	  Track merge of the project pad context menu.
-
-2009-02-18  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/ScrolledWindow.cs: when the child viewport itself
-	is being replaced, don't try to remove the viewport from itself.
-	* libstetic/wrapper/Viewport.cs: add case for when placeholders are
-	being replaced by scrollable widgets to insert the new child directly
-	into the parent scrolled window. [Fixes #404861]
-
-2009-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Fix
-	  crash when the project's gtk# is not installed.
-
-2009-02-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Set correct resource name for
-	  DrawingArea template.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track api
-	  changes.
-
-2009-02-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build. Looks like the makefiles can't cope 
-	  with resources with IDs.
-
-2009-02-13  Mike Kestner <mkestner@novell.com> 
-
-	* Makefile.am: add template resource
-	* MonoDevelop.GtkCore.addin.xml: ditto.
-	* templates/DrawingArea.xft.xml: new DrawingArea subclass template
-	with stubs for OnExposeEvent, OnButtonPressEvent, OnSizeRequested,
-	OnSizeAllocated, and ctor. Helps speed up the development of custom
-	drawn widgets.  [Fixes #472665]
-
-2009-02-11  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/Registry.cs: account for reloading of the coreLib,
-	since this can happen when dogfooding MD. [Fixes #365983]
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Remove a local-copy ref.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.mds:
-	* MonoDevelop.GtkCore.mdp:
-	* MonoDevelop.GtkCore.csproj: Migrated to MSBuild file format.
-
-2009-02-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.GtkCore.mdp:
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs:
-	  Added option for enabling/disabling auto-switch of the GUI
-	  builder layout. Disabled from now on by default.
-
-2009-02-04  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/objects.xml: explicit default values for Table
-	NRows and NCols values so they don't default to 1.  Fixes #471242.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2009-02-02  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/PropertyDescriptor.cs: null guard the ValueToString
-	formatting for string arrays.
-
-2009-02-02  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/PropertyDescriptor.cs: handle empty string lists
-	* libstetic/wrapper/ComboBox.cs: some more null guarding for Items.
-	[Fixes #471244]
-
-2009-01-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Propagate a
-	policy parent SolutionItem through project/file creation so that
-	policies can always be resolved correctly.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.mdp:
-	* libsteticui/libsteticui.mdp: Flush project format changes.
-
-2009-01-26  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/ActionTree.cs: guard against removing unsaved
-	actions.  [Fixes #443472]
-
-2009-01-22  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/editor/StringArray.cs: display "(Collection)" in the
-	label instead of a joined list on \n which displays garbage chars.
-	This approach is consistent with another very popular IDE. ;-)
-	* libstetic/wrapper/objects.xml: use Editor.StringArray for the Items
-	property of ComboBox.
-	* libstetic/wrapper/ComboBox.cs: switch Items to a string[].  Luckily
-	this is backwards compat since we currently saved string[] as a newline
-	join of the member strings.  [Fixes #405396]
-
-2009-01-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Don't serialize the GtkDesignInfo
-	element when it is empty.
-
-2009-01-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added missing
-	nullref check.
-
-2009-01-13  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: adds a
-	FileAddedToProject handler which scans the file for classes and
-	checks the deleted-designs cache for matches to restore to the
-	project.
-
-2009-01-13  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/ProjectBackend.cs (RemoveWidget): export the widget
-	to a deleted-designs dir for later recovery if necessary. Should
-	also decide on some cleanup mechanism to remove old designs and
-	automate recovery in the move case if possible.  Or we can wait for
-	1wpf which should solve the move case more cleanly.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: reenable
-	OnFileRemovedFromProject handler.  Revamp to use a ParseDocument of
-	the removed file to scan for removed classes to kill.
-	[Fixes #366392]
-
-2009-01-09  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/Project.cs: forward isInternal to the backend in
-	AddWidgetLibrary.
-
-2009-01-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui/LibraryCache.cs: Don't ignore internal classes when
-	looking for widgets. If a widget is internal, set the "internal" flag
-	to true. Don't abort AddObjects if there is an assembly resolution
-	error.
-
-2009-01-08  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/LibraryCache.cs : delay cache directory creation until
-	files are going to be written to it.
-
-2009-01-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui/CecilWidgetLibrary.cs: Don't try to resolve full assembly
-	paths.
-
-2008-12-18  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/editor/Flags.cs : fix cs0030 under new mcs.
-	* libstetic/editor/FlagsSelectionDialog.cs : fix cs0030 under new mcs.
-	* libstetic/editor/ResponseId.cs : fix cs0030 under new mcs.
-
-2008-12-13  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/Container.cs: generate tooltips based on the target
-	version, using the new Tooltip API for >= 2.12.  Fixes #372015.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetParser.cs: Properly search for subclasses of
-	Gtk.Widget.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.mdp:
-	* libsteticui/libsteticui.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Remove the mono
-	version number comment from the generated files.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: Track API changes.
-
-2008-12-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs: Use an
-	Alignment as the concrete Bin instead of custom InvisibleFrame.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetParser.cs: Optimized GetToolboxItems.
-
-2008-12-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetParser.cs:
-	* MonoDevelop.GtkCore/ObjectsDocument.cs: Getting the list of widgets is
-	an expensive operation. It shouldn't be a property.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.mdp: Add AssemblyInfo.cs files that are
-	autogenerated from the addin manifests.
-
-2008-12-01  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/objects.xml: move ToggleButton ahead of CheckButton
-	and add ToggleButton signal item group to CheckButton.  Remove toggled
-	signal from RadioButton since it inherits it from CheckButton.
-	[Fixes #450237]
-
-2008-11-25  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: refactor the default and 
-	supported version checks into the ReferenceManager, with all the other
-	package and assembly code.
-	* MonoDevelop.GtkCore/ReferenceManager.cs: refactored default and 
-	supported version properties. 
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: use new api.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: use new api.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: use new api.
-
-2008-11-23  Mike Kestner <mkestner@novell.com> 
-
-	* *: I've typed lib/stetic/libstetic(ui) a few too many times.
-
-2008-11-18  Mike Kestner <mkestner@novell.com> 
-
-	* */Makefile.am: break the gnome/gconf-sharp dependencies.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: set up
-	callbacks to the PlatformService for MIME resolution and showing
-	urls.
-
-2008-11-11  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: use the 
-	new ForceUpdate method on the ProjectDom returned by GetParserContext
-	to ensure a fully updated database.
-
-2008-11-11  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: null guarding for
-	all the things that can possibly go wrong with the parse in 
-	GetClass.
-
-2008-11-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Create the
-	formInfos list when the project is loaded. This is necessary since
-	the list is destroyed when the project is unloaded. Fixes bug #Bug
-	431723 - Cannot build GTK applications with sln format.
-
-2008-11-06  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	revert the context menu changes. Don't show them if the project has no
-	gtk-sharp ref, only add the templates to the dialog, per Lluis.
-
-2008-11-06  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	show Add Widget|Window|Dialog|ActionGroup template items in the context
-	menu and Add File dialog even when the project has no Gtk# reference.
-
-2008-11-05  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: needed to revert
-	the >= to <= change from the 440435 fix since the refmgr is now 
-	reporting TargetGtkVersion without Version=.  oops.
-
-2008-11-05  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: strip Version= out of
-	TargetGtkVersion.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2008-10-30  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: 
-	switch to a x.y TargetGtkVersion obtained by parsing the gtk-sharp
-	reference version. Invert the version comparison in the toolboxitem
-	filter.  We want toolbox items that are less than the project target
-	version, not greater.  Fixes #440435.
-
-2008-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Don't notify the
-	file has changed unless the changes are saved to disk. Fixes bug
-	#430497 - Widget names created in Stetic not available for
-	autocomplete.
-
-2008-10-29  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs (ShowPage): only
-	regenerate the dummy structure when switching to the source page.
-
-2008-10-28  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: switch default updating
-	to use the current assembly StoredReference version.  Avoids problems
-	when the stored version has no corresponding installed package.
-	Fixes #436246.
-
-2008-10-27  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: don't store
-	configuration on Project Save.  Avoids a crash due to file availability
-	when saving config while loading and it's extraneous since we store
-	the config on app exit and it contains no project specific props.
-
-2008-10-22  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs (HasDesignedObjects): guard
-	against null projects.
-
-2008-10-21  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs (HasDesignedObjects): don't
-	instantiate just to get the SteticFile. Avoids project file garbage.
-	[Fixes #436201]
-
-2008-10-21  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: guard against null
-	documents returned from parse.  I think this is related to the old
-	ErrorsDuringCompile check that was commented with the new parser port.
-	[Fixes #436998]
-
-2008-10-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: fixed TODO.
-
-2008-10-03  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding:
-	rework GetWindow method. now uses the ParsedDocument for a requested 
-	file to check if any of its types have a GuiBuilderWindow.
-	The existing method of walking the project windows list and using 
-	the ProjectDom database to lookup their file locations is susceptible
-	to timing problems due to imcomplete parse databases.  This method is
-	probably slightly more efficient as well.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/ProjectResourceProvider.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track API.
-
-2008-09-23  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: bandaid to
-	avoid exceptions when removing non-existent buttons.  Fixes #377414.
-
-2008-09-23  Mike Kestner <mkestner@novell.com> 
-
-	* lib/stetic/libsteticui/CecilWidgetLibrary.cs: don't hold assembly
-	reference beyond load operation.  Recreate it on each load so we are
-	always accessing the current assembly instance.  Only access cache 
-	using filename.  Ensure Class description lookups cause spew to 
-	console.
-	* lib/stetic/libsteticui/LibraryCache.cs: enhance the path lookup
-	logic in Refresh to avoid some churn on named lookups.
-	* lib/stetic/libsteticui/ProjectBackend.cs: reload library if 
-	necessary before getting component types.  Fixes #427334.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated projects.
-
-2008-09-15  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCode.GuiBuilder/GtkProjectServiceExtension.cs:
-	add the project stetic file to any generation warnings produced.
-	Fixes #373244.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.mdp, lib/libstetic.mdp, lib/gtk-gui/generated.cs,
-	  gtk-gui/generated.cs: Updated generated code.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore/WidgetParser.cs: Track api changes.
-
-2008-09-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Changes caused by
-	  interface changes.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Moved
-	  the extensible tree view to its own directory.
-
-2008-08-27  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDesciptionTemplate.cs: perform a 
-	project save after the file insertions and updates.  This seems
-	suboptimal, since it would probably be better to mark the project
-	dirty and let the user save the project, but until we switch to
-	one-widget-per-design-file, we probably need to save the project
-	automatically to avoid problems.
-	Fixes #385712.
-
-2008-08-27  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	Restrict to DotNetProjects and verify ProjectFolders are for DNPs.
-	Fixes #412448.
-
-2008-08-22  Mike Kestner <mkestner@novell.com> 
-
-	Fixes bug #413275 and delays more GtkDesignInfo-related project file 
-	churn.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: init the refmgr on startup.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Remove targetVersion field and
-	associated prop.  Move reference updating logic to Ref Manager. Target
-	Version is now exclusively tracked via reference version by the
-	ReferenceManager.
-	* MonoDevelop.GtkCore/ReferenceManager.cs: new class to encapsulate all
-	reference management behaviors, from responding to user add removes to
-	automated updates for designer projects.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: only show feature
-	for projects which support refactoring, since it advertises designer
-	support and that's not available without refactoring yet. Use refmgr
-	for version updates.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionsPanel.cs: use refmgr 
-	for version info and suppress gettext options if no designed objects
-	exist.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: use refmgr for 
-	target version. 
-
-2008-08-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Remove
-	  the "resources folder" feature. Resources are now shown in the
-	  solution tree like any other files. For a detailed explanation see
-	  "Bug 381430 - [PATCH] Display resource files in main project tree".
-
-2008-08-19  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: revert a silly
-	change that was causing explicit paths to be inserted into gui.stetic
-	files for gac references.  [Fixes #412960]
-
-2008-08-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: fixed issue in
-	  GetSourceCodeFile.
-
-2008-08-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: fixed some
-	  possible nullrefs.
-
-2008-08-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp: re-set project
-	  references (fix some libstetic.dll not found issue,  localcopy ==
-	  true was missing).
-
-2008-08-18  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: make HasDesignedObjects
-	and SupportsDesigner static so that we can defer a few more instance
-	creation scenarios.
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: 
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: 
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: 
-	  Update to new static API.
-
-2008-08-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Add a null
-	  check.
-
-2008-08-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: fixed possible
-	  null references in the unload method.
-
-2008-08-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Fix crash when looking for
-	  designed objects in a project that doesn't support it.
-
-2008-07-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed some
-	  issues.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Translated
-	  old code to new dom.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/ObjectsDocument.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Changes for converted
-	  refactoring infrastructure.
-
-2008-07-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/WidgetParser.cs,
-	  MonoDevelop.GtkCore/ObjectsDocument.cs,
-	  MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Worked on code
-	  completion/new dom.
-
-2008-07-24  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: get paths
-	for gac references to simplify the lookup in stetic.
-
-2008-07-23  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	Use HasDesignedObjects not SupportsDesigner.
-
-2008-07-23  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: delay creation of guifolder
-	until GuiBuilderProject is accessed. Refactor Bind into a Project
-	property to gather all the connect/disconnects together. Add new
-	HasDesignedObjects prop for when SupportsDesigner doesn't cut it.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: use new
-	HasDesignedObjects prop.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs:
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: don't 
-	need to update the folder for these options any more.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: get
-	GuiBuilderProject from design info directly. 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: kill 
-	BeforeCompile handler and GetGuiBuilderProject method. Use new
-	HasDesignedObjects to control code generation.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: kill 
-	GenerateSteticCode field. It was always set to true. Use new
-	HasDesignedObjects prop to control generation.
-
-2008-07-22  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Connect to project file
-	events and trigger objects.xml updates. Translate a confirm button
-	label.  Require AddAttribute refactoring.
-	* MonoDevelop.GtkCore/ObjectsDocument.cs: new class reinstating some
-	old document updating code and adding some new.  Inserts ToolBoxItem
-	and Category attrs into sources for a first-time "upgrade" to enable 
-	the attr-sync feature now controlled by a root attribute on the 
-	document.
-	* MonoDevelop.GtkCore/WidgetParser.cs: new class reinstating some
-	old parsing code and adding some new.  This will become the home
-	for all source parsing in the addin. Refactoring to come...
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Add WidgetParser
-	prop.  Remove Debug spew.
-	
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs: Moved serialization engine to
-	  MonoDevelop.Core. Use new syntax for specifying attribute scope.
-
-2008-07-15  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: add an updatingVersion 
-	state to prevent warning when we are adjusting reference versions.
-
-2008-07-15  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: add a user confirmation for
-	disabling the designer on reference removal.  Leave the stetic.gui
-	and objects.xml files on disk, though we still remove them from the 
-	project.
-
-2008-07-14  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed possible
-	  null reference.
-
-2008-07-10  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs (FromProject): return an 
-	empty instance for non-DotNetProjects which will report false
-	on SupportsDesigner.
-
-2008-07-10  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Gutted.  Moved everything
-	that took a Project parameter to GtkDesignInfo. Removed all the 
-	enable/disable/get info methods replaced by GtkDesignInfo.FromProject.
-	Killed all the objects file updating. Moved designer support checks
-	to DesignInfo.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Add FromProject static
-	method to replace GtkCoreService.GetGtkInfo. Remove ExportedWidgets
-	and IsWidgetLibrary functionality. Enable and disable designer based
-	on presence of gtk-sharp reference on projects. Refactor/move code 
-	generation to GuiBuilderProject from UpdateGtkFolder. Kill 
-	GeneratePartialClasses since it's a simple project property access 
-	and all users of GtkDesignInfo access it via the project. Moved 
-	Refactory checks from GtkCoreService to encapsulate SupportsDesigner.
-	Fix Reference updating checks for Mono.Posix, since the 
-	StoredReference returns a simple name for it.
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: switched to 
-	FromProject api.  Killed ExportedWidget handling.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: removed widget
-	library checkbox. s/Gtk#/GTK# for consistency. Updated to new
-	DesignInfo API.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: removed
-	all the Exported Widgets and WidgetLibrary tab stuff, simplified to
-	a vbox and hand-written to remove glade taint.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: 
-	switched to new DesignInfo API.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: 
-	switched to new DesignInfo API. moved gui folder file generation
-	here instead of DesignInfo iterating over builder properties.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: 
-	Added category mangling for ToolboxItems so that they are placed
-	by project.
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: 
-	switched to new DesignInfo api.
-	* templates/Widget.xft.xml: add ToolboxItem attr.
-	* templates/WidgetPartial.xft.xml: add ToolboxItem attr.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2008-05-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Explicitly set the resource ids
-	  for gui.stetic and objects.xml, since msbuild uses different
-	  default ids.
-
-2008-05-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Track api
-	  changes.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Merged the extension points for
-	  project and solution option panels into a single extension point. A
-	  single extension point will now be used for all kinds of items.
-	  Extension conditions can be used to make panels visible only for
-	  some specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Replaced ICompilerResult/DefaultCompilerResult/CompilerResults by a
-	  new BuildResult class, which has owner information at error level,
-	  so it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore/ProjectResourceProvider.cs,
-	  MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs,
-	  MonoDevelop.GtkCore.mds, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: New project
-	  model changes.
-
-2008-05-20  Mike Kestner <mkestner@novell.com> 
-
-	* templates/Widget.xft.xml:
-	* templates/WidgetPartial.xft.xml:
-	Mark the custom widgets Visible=false to conform to the Gtk convention
-	of widgets being shown explicitly.  [Fixes #364985]
-
-2008-05-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Track API. Mark up
-	  for property grid.
-
-2008-05-13  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: use new
-	Stetic.ApplicationFactory api.
-
-2008-05-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Track API.
-
-2008-04-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, gtk-gui,
-	  gtk-gui/generated.cs, gtk-gui/gui.stetic, Makefile.am,
-	  icons/pad-widget-tree-16.png,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Implement
-	  IOutlinedDocument instead of custom pad. Set GTK# version to 2.8.
-
-2008-03-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Removed unneeded dependency.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: fixed bugfix (thanks
-	  ankit)
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Fixed possible null
-	  reference exception.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Worked on gnome hig
-	  compliant alerts.
-
-2008-03-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed null ref.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Refactored content
-	  interfaces
-
-2008-02-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.mdp: Set correct makefile ver for files.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Worked on category
-	  support for the toolbox service.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp: Removed some unused glade
-	  and gnome-sharp references (only the unused). But I'll continue to
-	  remove glade, we need to lower the dependency tree a bit.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added IViewContent
-	  switching logic (but should be done centrally using the secondaryview
-	  paradigmn).
-
-2008-02-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Workaround for mono bug
-	  #350432.
-
-2008-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Handle the delete
-	  key in TreeViewPad, so it will work event if the shortcut is not
-	  defined.
-
-2008-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  icons/pad-widget-tree-16.png: Added widget tree icon.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Update MD version.
-
-2008-01-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Made internal
-	  some classes that don't need to be public.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Notify file changes
-	  through the FileService.
-
-2008-01-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Stetic code must be
-	  generated in the GUI thread. Should fix bug #349505.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Feed default layout
-	  name to Gettext for translation.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/ActionGroupPartial.xft.xml,
-	  templates/Window.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Make template
-	  categories translatable.
-
-2008-01-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Added null check on the
-	  result of UpdateFile. Should fix bug #352194.
-
-2008-01-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Handle
-	  projects which don't support the GTK# designer. Window and widget
-	  generation options are hidden, and code is never generated. Fixes bug
-	  #350632.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Don't update bindings if the
-	  file has syntax errors. May fix bug #347590.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump add-in versions.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am: Update after build reorg.
-
-2007-12-06  Geoff Norton  <gnorton@novell.com>
-
-	* Makefile.am: Only build the GtkCore addin if we have gnome-sharp 
-	  available.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  Makefile.am: Directory reorganization.
-
-2007-11-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: Removed
-	  Gnome.FileEntry.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Track
-	  LoggingService API changes.
-
-2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Use RootCombine
-	  instead of CurrentOpenCombine when possible.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fix nullref. Happens
-	  when removing a project from a solution while one of the windows of that
-	  project is open.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/ActionGroup.xft.xml, templates/ActionGroupPartial.xft.xml,
-	  templates/Dialog.xft.xml, templates/DialogPartial.xft.xml,
-	  templates/Widget.xft.xml, templates/WidgetPartial.xft.xml,
-	  templates/Window.xft.xml, templates/WindowPartial.xft.xml: Use tango
-	  file icons. Removed obsolete icons.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Track api changes. Added
-	  Description property.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.mdp, lib/libstetic.mdp: Project file names updated by
-	  change in MD path functions.
-
-2007-10-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mds, Makefile.am: Added custom command for updating
-	  the Stetic sources.
-
-2007-10-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Set a more meaningful category name for
-	  addin commands.
-	* MonoDevelop.GtkCore.mdp, MonoDevelop.GtkCore.mds: Updated.
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: If the current selection
-	  can't be deleted, just ignore the delete command, so the default handler
-	  will be executed. Fixes bug #325440.
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.mdp: Fix required gtk# version.
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Applied changes that
-	  were neccassary for to the new FileService.
-
-2007-10-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Changed calls for
-	  the new StringParser.
-
-2007-10-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: In Bind(), don't subscribe the
-	  NameChanged event at every call.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: The designer needs to
-	  be explicitely destroyed.
-
-2007-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: No need to implement
-	  IComparable; it's done in the base class now.
-
-2007-09-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Assign the selected
-	  target gtk# version to the new project.
-
-2007-09-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Use ProjectReference.StoredReference
-	  rather than ProjectReference.Reference, in order to refer to the actual
-	  stored reference string rather than a temporarily bumped version.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Implemented an
-	  assembly resolver for the stetic app, so assembly widgets registered
-	  with .pc files can be found.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: If a widget dll belongs
-	  to a package, store it as a package reference in the toolbox index.
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Allow setting TargetGtkVersion to
-	  DefaultGtkVersion when current value is null.
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Don't touch GTK# assembly versions
-	  when a target version is not set. Don't use gtkVersion=null to represent
-	  default version.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Set TargetGtkVersion on new
-	  projects. Bump default version to 2.8.
-
-2007-09-17  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  lib/Makefile.am, MonoDevelop.GtkCore.mds, Makefile.am: Use projects for
-	  imported stetic libraries.
-
-2007-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Removed access to
-	  Component object.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Remove unused method.
-
-2007-09-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: Fix warnings.
-
-2007-09-13  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* lib/stetic, Makefile.am, lib/Makefile.am: Build stetic from 
-	  svn:externals.
-	* lib/libsteticui.dll.config, lib/libstetic.dll.config,
-	  lib/libstetic.dll, lib/libsteticui.dll: Removed.
-
-2007-09-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Remove
-	  deprecated FileOptions element from templates.
-
-2007-09-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Changed the way to
-	  set the active designer (the api changed). Fixed some renaming issues.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Track api changes.
-
-2007-09-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/Window.xft.xml: Oops, PartialTypeSupport should be set to
-	  Disabled for non-partial window.
-
-2007-09-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs: Use DotNetProject.UsePartialTypes
-	  instead of custom setting.
-	* MonoDevelop.GtkCore/WidgetFileTemplatePartialClass.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplateFullClass.cs: No longer needed.
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Use
-	  PartialTypes condition instead of custom file template.
-
-2007-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fixes for bugs #82671, #82527, #82476, #81763 and #81238.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs: Changes due to new
-	  property infrastructure.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs: By default use the project name
-	  as category name for new custom widgets.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Don't show the full
-	  name of widgets in the toolbar.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: In FindClass, make
-	  sure the getUserClass parameter is taken into account when the found
-	  class is not a multi-part class. Fixes bug #82258.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Removed the CommandService class.
-	  Everything is done directly with CommandManager. Moved all extension
-	  node types to MD.Components.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp, Makefile.am: Reorganized the extension point
-	  hierarchy. Embedded all add-in manifests as resources.
-	* lib/libstetic.dll: Updated from stetic module.
-
-2007-08-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Improved error
-	  reporting.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Converted
-	  DispatchService to a static class.
-
-2007-08-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated.
-
-2007-07-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed some
-	  problems with the target gtk version. It was not assigned to the
-	  stetic project. Also fixed some stock icon rendering issues in
-	  Stetic.
-
-2007-07-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes a nullref fix.
-
-2007-07-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Layout switch
-	  delay is not needed anymore.
-
-2007-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Fix nullref
-	  when gtk support is not enabled. Patch by Chris Howie.
-
-2007-07-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Don't try to use the CurrentNode property after adding the file,
-	  since it may have changed. Should fix bug #82123.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	  Fixes bugs #81846 and #82144.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix window
-	  source file lookup.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Use the new methods
-	  for checking clipboard operations on the current selection.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Include the
-	  current project in the list of libraries to show in the toolbox.
-	  Fixes bug #82125.
-
-2007-07-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated. Fixes bugs 81977,
-	  81810 and 82052.
-
-2007-07-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Properly rename
-	  fields when the widget name is changed. Fixes bug #81976.
-
-2007-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Update the
-	  properties pad when the focus is on the widget tree pad. Fixes bug
-	  #81971.
-
-2007-07-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added null
-	  check.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track api changes
-	  in DesignerSupport. When adding a project reference to a widget
-	  library, take into account that widgets may be implemented in a
-	  library different from the one providing the widget list.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: In
-	  GetDynamicItems, only return widgets provided by libraries
-	  referenced by the project. Don't return widgets from libstetic
-	  since those are already included by default in the toolbox.
-	  Implemented IToolboxDefaultProvider.
-
-2007-07-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Changed a bit
-	  because of the removal of custom collections in the Ide project.
-
-2007-06-30 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* gui.glade: Fixed capitalization.
-
-2007-06-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: Don't show windows
-	  in the toolbox.
-	* lib/libstetic.dll, lib/libsteticui.dll: Updated from Stetic module.
-
-2007-06-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Allow selecting
-	  the target GTK# version of the project.
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Implemented a
-	  toolbox loader, which allows registering assemblies in the toolbox.
-	  When a widget from a toolbox is dropped to a window, MD will now
-	  add a reference to the required assembly.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll: One last update.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Set the import
-	  file callback when editing project stock icons.
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: The GetResources
-	  method only returns resource files now.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-06-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Default pad
-	  placement is now specified in the xml file.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: In GetBaseType, use
-	  Project.GetWidgetTypes to get all registered wiget types, including
-	  base widget types (which were not provided by GetComponentTypes).
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fix for bug #81785.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Don't include non-public
-	  members to the objects.xml file.
-
-2007-05-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Fix feature message.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	  Includes fixes for bugs #81761, #81758 and #81762.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	  (UpdateLibraries) Properly check for library changes.
-
-2007-05-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Fixes bugs #80783 and #81683.
-
-2007-05-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Added new dependency.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn. Fixes bug
-	  #81590.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When selecting an
-	  image file in the widget designer, import the file into the
-	  project.
-
-2007-05-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added some delay
-	  in the code that changes the workbench layout when selecting the
-	  designer. Fixes bug #80963.
-
-2007-05-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPalettePad.cs: Removed old
-	  palette pad.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Set the 'internal' flag for
-	  widgets implemented by private classes.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn module.
-	  Fixes bugs #80875, #81261, #81365.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: If the project
-	  is a library, add itself as an internal widget library, so widgets
-	  with internal visibility will be shown.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: When saving a window,
-	  use the visibility of the class to set the visibility of the
-	  component. Together with all changes done in stetic, fixes bug
-	  #80875.
-
-2007-05-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Track api changes in
-	  Stetic.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Delay
-	  library updating until really necessary.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Copy the .addins.xml file to the output dir.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Copy stetic dlls together with the assembly.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Reference shared assemblies
-	  from the correct location.
-
-2007-05-04  Wade Berrier  <wberrier@novell.com> 
-	* lib/libstetic.dll.config:
-	* lib/libsteticui.dll.config:
-	Fix os attribute formats (mono-config.c separates oses by comma, 
-	and ignores or includes the whole string.)
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am:
-	  Migration to Mono.Addins.
-
-2007-04-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs, Makefile.am:
-	  Implemented project feature for enabling gtk# support in new
-	  projects.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Use
-	  Menu icon size in the project pad.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-04-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show a
-	  relative path in the window delete confirm dialog, since the
-	  absolute path may take too much space.
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Add
-	  Ok/Cancel buttons by default in new dialogs.
-
-2007-03-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fixes for bugs 81033, 81086, 81239, 81143, 81014 and
-	  81015.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Allow pasting when
-	  a placeholder is selected. Fixes bug #81246.
-
-2007-03-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp, Makefile.am, icons/image-x-generic.png:
-	  Show a "Stock Icons" node in the User Interface folder. It's easier
-	  to discover than the context menu option.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.Commands/GladeCommands.cs: Added menu option
-	  for opening the gtk# settings.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Don't crash if
-	  the gtk-gui folder doesn't exist. Fixes bug #81152.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Hide the border
-	  of the combined view notebook.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated from stetic module. Fixes NRE crash.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Fix null ref.
-
-2007-03-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Register a new toolbox loader. Removed
-	  old properties pads.
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Added reference to
-	  MonoDevelop.DesignerSupport.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Integrate Stetic
-	  widgets in the main toolbox.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Implement
-	  ICustomPropertyPadProvider and return the Stetic property pad.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Renamed.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Fix warning.
-
-2007-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	Updated from Stetic module. Includes fix for bug #80864.
-
-2007-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from SVN. Fixes some
-	  memory leaks and bug #79453.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Explicitely
-	  destroy notebook children, since notebook doesnt do it because of a
-	  gtk bug.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Some fixes in the
-	  dispose code.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Use
-	  ProjectOperations.SaveProject to save projects.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix nullref.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Log
-	  error message.
-	* Makefile.am, MonoDevelop.GtkCore.mdp: Synchronized MD project and
-	  makefile.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Avoid throwing
-	  delayed events after the project has been disposed.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added missing
-	  null check.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Ask for user
-	  confirmation when reloading a designer only when the designer has
-	  unsaved changes.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Detect external
-	  changes in the gui.stetic files, and reload it when it changes.
-	  Take into account that the load of gui.stetic can fail. Added
-	  several workarounds for this case.
-
-2007-02-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from SVN. Includes
-	  fixes for bugs #80722, #79427 and #80127.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Store some
-	  Stetic configuration in the MD properties.
-
-2007-02-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added options
-	  for enabling/disabling gtk support, and for gettext support.
-	* MonoDevelop.GtkCore.addin.xml: Change options panel name.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Make sure the
-	  MD project is saved together with the stetic project, if necessary.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Avoid saving
-	  the MD project twice.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: If gtk
-	  integration status changes for a project, refresh the tree.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Null check.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for gettext and
-	  gettext class options for generated code.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Added events for notifying
-	  when the gtk integration status changes for a project.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am: distcheck fixes
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When a designer
-	  project is disposed, hide the designer view in the editor.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Factorized some code into GtkDesignInfo.
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Make sure the code generation
-	  extension is executed before the last step.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Hide the add window commands when the project is not DotNet
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.dll, lib/libstetic.dll:
-	  Updated.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Intercept calls
-	  to the IPositionable interface, and show the editor page when
-	  jumping to a line.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: When looking for
-	  the window class, avoid returning the generated partial class.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Show the editor
-	  page when jumping to a signal handler.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Warn the user if
-	  the gtk-sharp-2 package can't be found. Some distros don't include
-	  the .pc file in the gtk# package, only in the -devel package.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-01-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll.config, lib/libsteticui.dll, lib/libstetic.dll,
-	  lib/libsteticui.dll.config: Updated from Stetic module.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Track api
-	  changes in Document class.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated form Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Removed
-	  implementation of all text editor interfaces. Now the view
-	  overrides GetContent and calls editor.GetContent when a requested
-	  interface is not found.
-
-2007-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Removed unused namespace.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Use the new base-type property
-	  to describe custom widgets. When looking for properties and events,
-	  look in the base classes as well as in the widget class.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectSignalDescriptor.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectPropertyDescriptor.cs:
-	  Removed unused files. All widget library functionality has been
-	  moved to stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Removed all
-	  widget library management, which has been moved to Stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Added some null checks.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Use the new way
-	  of managing dependencies in projects.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml: The
-	  window constructor now takes the window type.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Some gui
-	  improvements and added some null checks.
-
-2007-01-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't crash if the
-	  designer can't be loaded for some reason.
-
-2007-01-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplatePartialClass.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplateFullClass.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs,
-	  templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml,
-	  templates/ActionGroup.xft.xml, templates/DialogPartial.xft.xml,
-	  templates/Dialog.xft.xml: Implemented support for generating code
-	  in partial classes.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Use the
-	  correct method for saving the project.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Refresh the user
-	  interface folder when the gui project is reloaded.
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for partial
-	  classes. In the GuiBuilderProject property, don't update the
-	  gtk-gui folder since this call may change the contents of the
-	  project, and weird things happen when called by the project pad to
-	  fill the tree.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am: Added new files.
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	  Make it work even when the assembly it references has been deleted
-	  (maybe as a result of cleaning a project). In this case the widget
-	  library is shown as empty.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added support
-	  for Loading/Unloading a project, to optimize use of memory for
-	  solutions with many gui projects. Implemented support for
-	  generating code in partial classes.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Implemented
-	  support for generating code in partial classes. Implemented support
-	  for UNDO/REDO.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Generation of gui code is now done from the Build method of a
-	  project service extension. Fixes some issues when building a
-	  project which contains custom components.
-
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Track API changes in
-	  FileService.
-
-2006-12-13 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Don't
-	generate stetic code if CurrentOpenCombine is null.
-
-2006-12-07 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* MonoDevelop.GtkCore.mdp: Updated to it can be
-	built from MonoDevelop.
-
-2006-11-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Simplified the
-	  code by using global events from the Ide, instead of combine
-	  events.
-
-2006-10-18 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added RemoveExportedWidget method.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: track
-	  API changes.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: If the name of a
-	  widget changes and it is being exported, update it in the objects.xml
-	  file. Fixes bug #79656.
-
-2006-09-23 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module. It provides a redesigned API
-	  which will allow running designers in a separate process.
-	
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs:
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPalettePad.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs:
-	  Track api changes.
-	
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs: Make sure
-	  parse information is up to date before loading an assembly library.
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Make sure this object
-	  is always alive when remoted.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added null check.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Not needed anymore.
-	* MonoDevelop.GtkCore.addin.xml: Removed build step. Code generation
-	  is done now before compiling.
-	  
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectWidgetLibrary.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/CachedProjectWidgetLibrary.cs:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: ProjectWidgetLibrary is not used
-	  anymore. All libraries are now handled by AssemblyReferenceWidgetLibrary.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
-	  Moved to Stetic.
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-09-23 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track api changes.
-
-2006-09-19 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* .: Added svn:ignore for MonoDevelop.GtkCore.pidb
-
-2006-09-01 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from stetic module. Includes fix for bug #79247.
-	
-2006-09-01 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from stetic module.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Save the project after editing the icons.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Set the
-	  ResourceProvider for the main stetic project. Added null check.
-
-2006-08-30 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fixed bug about 
-	  adding the wrong widget as action designer page.
-
-2006-08-30 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Only export properties which
-	  return primitive types. Fixes bug #79195.
-	* lib/*: Updated from stetic module.
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: Unsubscribe close
-	  event when done.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Handle designer
-	  commands in its own tab page.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Explicitely dispose
-	  custom widgets to avoid memory leaks.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Track api changes.
-	
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-08-18 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* gui.glade: Minor fix.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Track api
-	  changes.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Stetic files don't need
-	  to be added as resource to projects.
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: Make it
-	  work for action groups.
-	* lib/*: several fixes.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added method
-	  for removing an action group.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track API changes
-	  in Stetic. Properly bound edit commands from the main menu.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.addin.xml: Implemented Open and Delete
-	  commands for global action groups.
-	  
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-08-11 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module. Includes fixes for
-	  bugs #79043, #79044 and #79045
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Don't
-	  crash if something goes wrong when binding a class.
-	  Fixed nullref.
-
-2006-08-04 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  CreateContentForFile should not load the file, just create
-	  the view.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Add
-	  support for IEncodedTextContent.
-
-2006-08-01 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	  Set the resource provider before loading the project.
-	  Fixes bug #78966.
-	  
-	* libs/*: Updated from Stetic module. Fixes several bugs:
-	  78938, 78916, 78909, 78956, and 78867.
-
-2006-07-27 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs:
-	  Added null check.
-	  
-	* MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	  Get the parser context using the assembly file name, not the full
-	  assembly name.
-
-2006-07-25 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Factorized several
-	  more or less duplicate methods into GuiBuilderProject, specially
-	  methods for locating the class bound to a window. GuiBuilderProject
-	  now will explicitelly update the parser database the first time it
-	  needs to locate a class, so it will work even if the parser service
-	  is busy parsing assemblies.
-
-2006-07-24 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated from stetic module. Fixes a bug
-	  in the table wrapper which may cause an endless loop.
-
-2006-07-05 Matej Urbas <matej.urbas@gmail.com>
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs: Updated to use
-	  ReturnType as BaseTypes in IClass instances.
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fixed automatic
-	  layout switch policy.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fix showing of
-	  action group view.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Properly
-	  bind actions when pressing "BindToField".
-	  
-	* MonoDevelop.GtkCore.addin.xml: Updated versions. 
-
-2006-06-29  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Only display WidgetBuilderOptionPanel 
-	for "DotNet" projects.
-
-2006-06-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Switch to the
-	  designer workbench layout when selecting an action group file.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Support jumping
-	  to signal hanlder when double-clicking it in the signals editor.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Removed debug code.
-	
-	* templates/ActionGroup.xft.xml:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: 
-	  Fix code generation of action groups.
-
-2006-06-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: If a member has a [Browsable(false)]
-	  attribute, don't add it to the objects.xml file. Also don't add
-	  read-only properties.
-	* lib/*: Updated from stetic module. Fixes bugs #78622 and #78620.
-	  Adds an icon for expander and fixes a bug in ColorButton (fix by ml)
-
-2006-06-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/libsteticui.dll:
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs:
-	  Track changes in the api.
-
-2006-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Several improvements.
-	  Also fixes bug #78160.
-	
-2006-05-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	  Added DisplayName property.
-
-2006-05-29  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: reverted interface changes - missing file change
-	
-2006-05-29  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: reverted interface changes
-
-2006-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Adds support for toolbars.
-
-2006-05-23  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: track api changes
-	
-2006-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Commands/GladeCommands.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.addin.xml: Added commands for creating
-	  an action group and editing the project icons.
-	  
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show local
-	  action groups as children of the window node.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Moved
-	  some event subscriptions to WindowsFolder.cs
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Open the
-	  corresponding file when clicking on local action groups.
-	  
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Added action group template.
-	
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Added support for
-	  action group file templates.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Notify changes in
-	  local action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show the actions
-	  tab until there is at least one action group.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Don't show
-	  properties or signals for global actions.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added virtual method
-	  OnActiveDocumentChanged, which is called when the view is brought to front.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Use the new MemberName
-	  field when binding fields.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Several minor fixes.
-	  
-	* lib/*: Updated.
-	  
-
-2006-05-12 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Initial support for the menu editor. Still very unstable!!
-	
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.addin.xml: Register a node builder and and
-	  display binding for action groups.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Update
-	  the folder when action groups change.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Fix nullref.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Factorized
-	  some code into CodeBinder.cs
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Factorized some
-	  code into CombinedDesignView.cs.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: New node
-	  builder for action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: New display
-	  binding for editing global action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs: Moved from
-	  GuiBuilderView.cs.
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs: A new
-	  toolbar for the action group designer.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: A view for editing
-	  global action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Moved here some code
-	  from GuiBuilderEditSession.cs.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Moved here some
-	  code from GuiBuilderView.cs.
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Added new files.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track api changes.
-	
-2006-05-05 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/libstetic.dll: Updated from Stetic module. Includes
-	  a fix for bug #78307.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Updated versions.
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-05-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from Stetic module. Includes fixes for
-	  bugs #78266, #78240 and #78276.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track changes
-	  in the Stetic API.
-
-2006-04-24 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Don't
-	  crash if a stetic project can't be loaded. Fixes bug #78169.
-	* lib/libstetic.dll: Updated from Stetic module. Fixes bug #78167.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Fixed construction of
-	  scales and scrollbars.
-
-2006-04-19 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs: When
-	  creating a widget from a widget design, remove the signals since
-	  those signals reference handlers in the widget class, not the
-	  widget container class.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Fix nullref in some themes.
-
-2006-04-10 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Fix typo.
-	* libs/*: Fix for #78111, #78092 and #78090.
-
-2006-04-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Save the project
-	  after adding or removing a resource.
-
-2006-04-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated.
-
-2006-03-31 Lluis Sanchez Gual <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Get open
-	  combine events in the GUI thread.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Properly
-	  delete signals for which there isn't a handler. Half fixed field
-	  renaming.
-	* lib/*: Updated.
-
-2006-03-31 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml: Fix ID and
-	  description. Added stetic config files to add-in package.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Updated references.
-
-2006-03-29 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	  Don't crash if no parse info is available for the file
-	  being edited. Should fix #77885.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show
-	  the bind to field button for the root container.
-	* lib/*: Updated.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Makefile.am: Use an unified format. Patch by Matze Braun.
-	* MonoDevelop.GtkCore.addin.xml: Updated add-in versions.
-
-2006-03-22 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore.mdp: Removed GladeFileDisplayBinding.
-	* lib/*: Updated.
-	* Makefile.am: Updated. Some files have been moved to Stetic.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fixed
-	  layout switching. Don't show the widget tree pad by default,
-	  since it is already available as a combo in the designer.
-	* MonoDevelop.GtkCore.GuiBuilder/GladeFileDisplayBinding.cs: Removed.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: use
-	  the new property tree instead of the grid.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: The designer
-	  toolbar has been moved to Stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Changed
-	  default placement.
-
-2006-03-19  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* .: Added Makefile.in and Makefile to svn:ignore.
-
-2006-03-15 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Updated.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for using
-	  resource images in the designer.
-	  
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Check if the objects.xml
-	  file exists before loading it.
-	* MonoDevelop.GtkCore/GeneratorBuildStep.cs: Don't generate code
-	  if the stetic file has not been modified since the last
-	  generation.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: If Gtk
-	  support is not enabled, don't enable it if no widgets have
-	  been selected.
-	* lib/libstetic.dll: Updated.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Mapped some
-	  commands.
-	* templates/Window.xft.xml: The constructor of Gtk.Window requires
-	  the title of the window.
-
-2006-03-04 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Updated.
-	* MonoDevelop.GtkCore/GeneratorBuildStep.cs: When generating
-	  code for a project that exports widgets, include the own
-	  project library to the generation, since there can be
-	  widgets that contain other widgets defined in the project.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs:
-	  removed some IdeApp dependencies.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectWidgetLibrary.cs:
-	  added method for getting the class information from
-	  a project.
-	* CachedProjectWidgetLibrary.cs: New widget library class
-	  which takes class information from a collection of 
-	  ProjectClassInfo objects.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectPropertyDescriptor.cs:
-	  Consider all properties runtime-properties, since they have 
-	  been created from class properties.
-	* lib/*: Updated.
-
-2006-03-03 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* Makefile.am: removed debug files.
-
-2006-03-02 Lluis Sanchez Gual  <lluis@novell.com>    
- 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Propagate
-	  project changes to the editor.
- 
-2006-03-02 Lluis Sanchez Gual  <lluis@novell.com>   
- 
-	Initial implementation of the Stetic add-in.
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs
index cce24542b0..41f1b27042 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs
@@ -26,7 +26,7 @@
 
 using System;
 using MonoDevelop.GtkCore.GuiBuilder;
-using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.GtkCore.Dialogs
@@ -35,7 +35,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 	{
 		GtkDesignerOptionsPanelWidget widget;
 
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			widget = new GtkDesignerOptionsPanelWidget ();
 			widget.AutoSwitchLayout = GuiBuilderService.AutoSwitchGuiLayout;
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
index 68c127d053..0b74290fe3 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
@@ -32,10 +32,10 @@ using Gtk;
 using Gdk;
 using Glade;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Components;
-
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.GtkCore.Dialogs
 {
@@ -45,7 +45,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 		[Glade.Widget] protected Gtk.TreeView treeClasses;
 		ListStore store;
 		
-		public SelectRenamedClassDialog (IEnumerable<IType> classes)
+		public SelectRenamedClassDialog (IEnumerable<INamedTypeSymbol> classes)
 		{
 			XML glade = new XML (null, "gui.glade", "SelectRenamedClassDialog", null);
 			glade.Autoconnect (this);
@@ -67,7 +67,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 			
 			foreach (var cls in classes) {
 				var pic = ImageService.GetIcon (cls.GetStockIcon ());
-				store.AppendValues (pic, cls.FullName);
+				store.AppendValues (pic, cls.GetFullName ());
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs
index 4fb717ece7..794b08476b 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs
@@ -29,7 +29,8 @@
 
 
 using Gtk;
-	
+
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui.Dialogs;
@@ -121,7 +122,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 		
 		WidgetBuilderOptionPanelWidget widget;
 
-		public override Widget CreatePanelWidget()
+		public override Control CreatePanelWidget()
 		{
 			return (widget = new WidgetBuilderOptionPanelWidget (ConfiguredProject));
 		}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs
index 84f42d5050..5eae8f19fd 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs
@@ -35,8 +35,16 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Projects;
 using MonoDevelop.GtkCore.Dialogs;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using ICSharpCode.NRefactory6.CSharp;
+using System.Linq;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Refactoring;
 
 
 namespace MonoDevelop.GtkCore.GuiBuilder
@@ -53,7 +61,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			get { return true; }
 		}
 		
-		public bool CanHandle (FilePath fileName, string mimeType, Project ownerProject)
+		public bool CanHandle (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject)
 		{
 			if (excludeThis)
 				return false;
@@ -73,7 +81,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			return db != null;
 		}
 		
-		public IViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
+		public ViewContent CreateContent (FilePath fileName, string mimeType, MonoDevelop.Projects.Project ownerProject)
 		{
 			excludeThis = true;
 			var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject);
@@ -87,14 +95,14 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		Stetic.ActionGroupInfo GetActionGroup (string file)
 		{
-			Project project = IdeApp.Workspace.GetProjectContainingFile (file);
+			var project = IdeApp.Workspace.GetProjectsContainingFile (file).FirstOrDefault ();
 			if (!GtkDesignInfo.HasDesignedObjects (project))
 				return null;
 				
 			return GtkDesignInfo.FromProject (project).GuiBuilderProject.GetActionGroupForFile (file);
 		}
 		
-		internal static string BindToClass (Project project, Stetic.ActionGroupInfo group)
+		internal static string BindToClass (MonoDevelop.Projects.Project project, Stetic.ActionGroupInfo group)
 		{
 			GuiBuilderProject gproject = GtkDesignInfo.FromProject (project).GuiBuilderProject;
 			string file = gproject.GetSourceCodeFile (group);
@@ -105,9 +113,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			
 			ArrayList list = new ArrayList ();
 			var ctx = gproject.GetParserContext ();
-			foreach (var cls in ctx.MainAssembly.GetAllTypeDefinitions ())
+			foreach (var cls in ctx.GetAllTypesInMainAssembly ())
 				if (IsValidClass (cls))
-					list.Add (cls.FullName);
+					list.Add (cls.GetFullName ());
 		
 			// Ask what to do
 			
@@ -124,44 +132,63 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			return gproject.GetSourceCodeFile (group);
 		}
 		
-		static IUnresolvedTypeDefinition CreateClass (Project project, Stetic.ActionGroupComponent group, string name, string namspace, string folder)
+		static ITypeSymbol CreateClass (MonoDevelop.Projects.Project project, Stetic.ActionGroupComponent group, string name, string namspace, string folder)
 		{
 			string fullName = namspace.Length > 0 ? namspace + "." + name : name;
 			
-			var type = new CodeTypeDeclaration ();
-			type.Name = name;
-			type.IsClass = true;
-			type.BaseTypes.Add (new CodeTypeReference ("Gtk.ActionGroup"));
+			var type = SyntaxFactory.ClassDeclaration (name)
+				.AddBaseListTypes (SyntaxFactory.SimpleBaseType (SyntaxFactory.ParseTypeName ("Gtk.ActionGroup")));
 			
 			// Generate the constructor. It contains the call that builds the widget.
+			var members = new SyntaxList<MemberDeclarationSyntax> ();
 			
-			var ctor = new CodeConstructor ();
-			ctor.Attributes = MemberAttributes.Public | MemberAttributes.Final;
-			ctor.BaseConstructorArgs.Add (new CodePrimitiveExpression (fullName));
-			
-			var call = new CodeMethodInvokeExpression (
-				new CodeMethodReferenceExpression (
-					new CodeTypeReferenceExpression ("Stetic.Gui"),
-					"Build"
-				),
-				new CodeThisReferenceExpression (),
-				new CodeTypeOfExpression (fullName)
+			var ctor = SyntaxFactory.ConstructorDeclaration (
+				new SyntaxList<AttributeListSyntax> (),
+				SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.PublicKeyword)),
+				SyntaxFactory.Identifier (name),
+				SyntaxFactory.ParameterList (),
+				SyntaxFactory.ConstructorInitializer (SyntaxKind.BaseKeyword, SyntaxFactory.ArgumentList (new SeparatedSyntaxList<ArgumentSyntax> { SyntaxFactory.Argument (SyntaxFactory.ParseExpression (fullName)) } )),
+				SyntaxFactory.Block (
+					SyntaxFactory.ExpressionStatement (
+						SyntaxFactory.InvocationExpression (
+							SyntaxFactory.ParseExpression ("Stetic.Gui.Build"),
+							SyntaxFactory.ArgumentList (
+								new SeparatedSyntaxList<ArgumentSyntax> {
+									SyntaxFactory.Argument (SyntaxFactory.ThisExpression ()),
+									SyntaxFactory.Argument (SyntaxFactory.ParseExpression (fullName))
+								}
+							)
+						) 
+					)
+				)
 			);
-			ctor.Statements.Add (call);
-			type.Members.Add (ctor);
+			
+			type = type.AddMembers (ctor);
 			
 			// Add signal handlers
 			foreach (Stetic.ActionComponent action in group.GetActions ()) {
 				foreach (Stetic.Signal signal in action.GetSignals ()) {
-					CodeMemberMethod met = new CodeMemberMethod ();
-					met.Name = signal.Handler;
-					met.Attributes = MemberAttributes.Family;
-					met.ReturnType = new CodeTypeReference (signal.SignalDescriptor.HandlerReturnTypeName);
 					
-					foreach (Stetic.ParameterDescriptor pinfo in signal.SignalDescriptor.HandlerParameters)
-						met.Parameters.Add (new CodeParameterDeclarationExpression (pinfo.TypeName, pinfo.Name));
+					var parameters = new SeparatedSyntaxList<ParameterSyntax> ();
+					foreach (var p in signal.SignalDescriptor.HandlerParameters) {
+						parameters = parameters.Add (SyntaxFactory.Parameter (new SyntaxList<AttributeListSyntax> (), SyntaxFactory.TokenList (), SyntaxFactory.ParseTypeName (p.TypeName), SyntaxFactory.Identifier (p.Name), null)); 
+					}
+					
+					var met = SyntaxFactory.MethodDeclaration (
+				          new SyntaxList<AttributeListSyntax> (),
+				          SyntaxFactory.TokenList (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword)),
+				          SyntaxFactory.ParseTypeName (signal.SignalDescriptor.HandlerReturnTypeName),
+				          null,
+				          SyntaxFactory.Identifier (signal.Handler),
+				          null,
+				          SyntaxFactory.ParameterList (parameters),
+				          new SyntaxList<TypeParameterConstraintClauseSyntax> (),
+				          SyntaxFactory.Block (),
+				          null
+			          );
+					
 						
-					type.Members.Add (met);
+					type = type.AddMembers (met);
 				}
 			}
 			
@@ -169,17 +196,13 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			return CodeGenerationService.AddType ((DotNetProject)project, folder, namspace, type);
 		}
 		
-		internal static bool IsValidClass (IType cls)
+		internal static bool IsValidClass (ITypeSymbol cls)
 		{
-			foreach (var bt in cls.DirectBaseTypes) {
-				if (bt.ReflectionName == "Gtk.ActionGroup")
-					return true;
-				
-				var baseCls = bt;
-				if (baseCls != null && IsValidClass (baseCls))
-					return true;
-			}
-			return false;
+			if (cls.SpecialType == SpecialType.System_Object)
+				return false;
+			if (cls.BaseType.GetFullName () == "Gtk.ActionGroup")
+				return true;
+			return IsValidClass (cls.BaseType);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
index f0d9cb95e6..9bd11bc1f6 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs
@@ -27,7 +27,7 @@
 //
 
 using System;
-using System.Collections;
+using System.Linq;
 
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
@@ -35,8 +35,10 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Commands;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.DesignerSupport;
-using ICSharpCode.NRefactory.TypeSystem;
-
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide;
+using System.Threading.Tasks;
+using MonoDevelop.Refactoring;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
@@ -49,7 +51,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		Stetic.ActionGroupInfo groupInfo;
 		string groupName;
 		
-		public ActionGroupView (IViewContent content, Stetic.ActionGroupInfo group, GuiBuilderProject project): base (content)
+		public ActionGroupView (ViewContent content, Stetic.ActionGroupInfo group, GuiBuilderProject project): base (content)
 		{
 			groupName = group.Name;
 			this.project = project;
@@ -139,15 +141,15 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			codeBinder.TargetObject = designer.RootComponent;
 		}
 		
-		public override void Save (string fileName)
+		public override async Task Save (FileSaveInformation fileSaveInformation)
 		{
 			string oldBuildFile = GuiBuilderService.GetBuildCodeFileName (project.Project, groupInfo.Name);
 			
-			base.Save (fileName);
+			await base.Save (fileSaveInformation);
 			if (designer == null)
 				return;
 
-			codeBinder.UpdateBindings (fileName);
+			codeBinder.UpdateBindings (fileSaveInformation.FileName);
 			
 			designer.Save ();
 			
@@ -179,19 +181,15 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		public override void JumpToSignalHandler (Stetic.Signal signal)
 		{
 			var cls = codeBinder.GetClass ();
-			foreach (var met in cls.Methods) {
-				if (met.Name == signal.Handler) {
-					ShowPage (1);
-					JumpTo (met.Region.BeginLine, met.Region.BeginColumn);
-					break;
-				}
+			var met = cls.GetMembers (signal.Handler).OfType<IMethodSymbol> ().FirstOrDefault ();
+			if (met != null) { 
+				ShowPage (1);
+				RefactoringService.RoslynJumpToDeclaration(met);
 			}
 		}
 		
 		void OnGroupModified (object s, EventArgs a)
 		{
-			if (designer.Modified)
-				OnContentChanged (a);
 			IsDirty = designer.Modified;
 		}
 		
@@ -200,15 +198,15 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			codeBinder.BindSignal (a.Signal);
 		}
 		
-		void OnSignalChanged (object s, Stetic.ComponentSignalEventArgs a)
+		async void OnSignalChanged (object s, Stetic.ComponentSignalEventArgs a)
 		{
-			codeBinder.UpdateSignal (a.OldSignal, a.Signal);
+			await codeBinder.UpdateSignal (a.OldSignal, a.Signal);
 		}
 		
-		void OnBindField (object s, EventArgs args)
+		async void OnBindField (object s, EventArgs args)
 		{
 			if (designer.SelectedAction != null) {
-				codeBinder.BindToField (designer.SelectedAction);
+				await codeBinder.BindToField (designer.SelectedAction);
 			}
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs
index 15ad4bc0ca..8c5d0a5462 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs
@@ -30,32 +30,31 @@ using Gtk;
 using System;
 using System.Collections;
 using System.CodeDom;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
 	internal class ClassUtils
 	{
-		public static IField FindWidgetField (ITypeDefinition cls, string name)
+		public static IFieldSymbol FindWidgetField (ITypeSymbol cls, string name)
 		{
-			foreach (IField field in cls.Fields) {
+			foreach (var field in cls.GetMembers ().OfType<IFieldSymbol> ()) {
 				if (name == GetWidgetFieldName (field))
 					return field;
 			}
 			return null;
 		}
 		
-		public static string GetWidgetFieldName (IField field)
+		public static string GetWidgetFieldName (IFieldSymbol field)
 		{
-			foreach (IAttribute att in field.Attributes)	{
-				var type = att.AttributeType;
-				if (type.ReflectionName == "Glade.Widget" || type.ReflectionName == "Widget" || type.ReflectionName == "Glade.WidgetAttribute" || type.ReflectionName == "WidgetAttribute") {
-					var pArgs = att.PositionalArguments;
-					if (pArgs != null && pArgs.Count > 0) {
-						var exp = pArgs[0] as ConstantResolveResult;
+			foreach (AttributeData att in field.GetAttributes ())	{
+				var type = att.AttributeClass;
+				if (type.Name == "Widget" ||  type.Name == "WidgetAttribute") {
+					var pArgs = att.ConstructorArguments;
+					if (pArgs != null && pArgs.Length > 0) {
+						var exp = pArgs[0].Value;
 						if (exp != null)
-							return exp.ConstantValue.ToString ();
+							return exp.ToString ();
 					} else {
 						return field.Name;
 					}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
index 7e4e54a0b6..bff4e49428 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
@@ -37,10 +37,17 @@ using MonoDevelop.Projects.Text;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.GtkCore.Dialogs;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide.FindInFiles;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Refactoring;
+using System.Xml.XPath;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
@@ -55,12 +62,12 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 	{
 		ITextFileProvider textFileProvider;
 		Stetic.Component targetObject;
-		Project project;
+		MonoDevelop.Projects.Project project;
 		GuiBuilderProject gproject;
 		string className;
 		string classFile;
 		
-		public CodeBinder (Project project, ITextFileProvider textFileProvider, Stetic.Component targetObject)
+		public CodeBinder (MonoDevelop.Projects.Project project, ITextFileProvider textFileProvider, Stetic.Component targetObject)
 		{
 			this.project = project;
 			this.textFileProvider = textFileProvider;
@@ -77,8 +84,8 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				if (targetObject != null) {
 					var cls = gproject.FindClass (GetClassName (targetObject));
 					if (cls != null) {
-						className = cls.FullName;
-						classFile = cls.Region.FileName;
+						className = cls.GetFullName ();
+						classFile = cls.Locations.First ().SourceTree.FilePath;
 					}
 				}
 			}
@@ -89,20 +96,17 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		{
 			if (targetObject == null)
 				return;
-			
-			var doc = TypeSystemService.ParseFile (project, fileName);
+			FileService.NotifyFileChanged (fileName);
 			classFile = fileName;
 			
-			if (doc != null) {
-				var cls = GetClass ();
+			var cls = GetClass ();
+			if (cls != null) {
 				UpdateBindings (targetObject, cls);
-			
-				if (cls != null)
-					targetObject.GeneratePublic = cls.IsPublic;
+				targetObject.GeneratePublic = cls.DeclaredAccessibility == Accessibility.Public;
 			}
 		}
 		
-		void UpdateBindings (Stetic.Component obj, IUnresolvedTypeDefinition cls)
+		void UpdateBindings (Stetic.Component obj, ITypeSymbol cls)
 		{
 			if (targetObject == null || cls == null)
 				return;
@@ -113,9 +117,8 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (objectSignals != null) {
 				Stetic.Signal[] signals = new Stetic.Signal [objectSignals.Count];
 				objectSignals.CopyTo (signals, 0);
-				var resolved = cls.Resolve (project);
 				foreach (Stetic.Signal signal in signals) {
-					if (FindSignalHandler (resolved, signal) == null) {
+					if (FindSignalHandler (cls, signal) == null) {
 						obj.RemoveSignal (signal);
 					}
 				}
@@ -127,17 +130,12 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				UpdateBindings (ob, cls);
 		}
 		
-		IMethod FindSignalHandler (IType cls, Stetic.Signal signal)
+		static IMethodSymbol FindSignalHandler (ITypeSymbol cls, Stetic.Signal signal)
 		{
-			foreach (var met in cls.GetMethods ()) {
-				if (met.Name == signal.Handler) {
-					return met;
-				}
-			}
-			return null;
+			return cls.GetMembers (signal.Handler).OfType<IMethodSymbol> ().FirstOrDefault ();
 		}
 
-		public void UpdateField (Stetic.Component obj, string oldName)
+		public async Task UpdateField (Stetic.Component obj, string oldName)
 		{
 			if (targetObject == null)
 				return;
@@ -152,9 +150,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				return;
 			
 			if (cls != null) {
-				var f = ClassUtils.FindWidgetField (cls.Resolve (project).GetDefinition (), oldName);
+				var f = ClassUtils.FindWidgetField (cls, oldName);
 				if (f != null) {
-					MonoDevelop.Refactoring.Rename.RenameRefactoring.Rename (f, newName);
+					await MonoDevelop.Refactoring.Rename.RenameRefactoring.Rename (f, newName);
 				}
 			}
 		}
@@ -168,21 +166,36 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			var cls = GetClass ();
 			if (cls == null)
 				return;
-			
-			if (FindSignalHandler (cls.Resolve (project), signal) != null)
+
+			if (FindSignalHandler (cls, signal) != null)
 				return;
-			
-			var met = new DefaultUnresolvedMethod (cls, signal.Handler) {
-				Accessibility = Accessibility.Protected,
-				ReturnType = ReflectionHelper.ParseReflectionName (signal.SignalDescriptor.HandlerReturnTypeName)
-			};
+
+			var met = SyntaxFactory.MethodDeclaration (SyntaxFactory.ParseTypeName (signal.SignalDescriptor.HandlerReturnTypeName),
+			                                           signal.Handler)
+								   .WithBody (SyntaxFactory.Block ())
+								   .AddModifiers (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword));
+
+			var parameters = new List<ParameterSyntax> ();
 			foreach (Stetic.ParameterDescriptor pinfo in signal.SignalDescriptor.HandlerParameters)
-				met.Parameters.Add (new DefaultUnresolvedParameter (ReflectionHelper.ParseReflectionName (pinfo.TypeName), pinfo.Name));
-			var resolvedCls = cls.Resolve (project).GetDefinition ();
-			CodeGenerationService.AddNewMember (resolvedCls, cls, met);
+				parameters.Add (SyntaxFactory.Parameter (new SyntaxList<AttributeListSyntax> (), new SyntaxTokenList (), SyntaxFactory.ParseTypeName (pinfo.TypeName), SyntaxFactory.Identifier (pinfo.Name), null));
+			met = met.AddParameterListParameters (parameters.ToArray ());
+
+			CodeGenerationService.AddNewMember (project, cls, GetSourceLocation (cls), met);
 		}
-		
-		public void UpdateSignal (Stetic.Signal oldSignal, Stetic.Signal newSignal)
+
+		static Location GetSourceLocation (INamedTypeSymbol cls)
+		{
+			foreach (var loc in cls.Locations) {
+				if (loc.IsInSource) {
+					if (!Path.GetDirectoryName (loc.SourceTree.FilePath).EndsWith ("gtk-gui", FilePath.PathComparison))
+						return loc;
+				}
+			}
+			
+			return cls.Locations.First ();
+		}
+
+		public async Task UpdateSignal (Stetic.Signal oldSignal, Stetic.Signal newSignal)
 		{
 			if (targetObject == null)
 				return;
@@ -193,14 +206,14 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			var cls = GetClass ();
 			if (cls == null)
 				return;
-			IMethod met = FindSignalHandler (cls.Resolve (project), oldSignal);
+			var met = FindSignalHandler (cls, oldSignal);
 			if (met == null)
 				return;
-			MonoDevelop.Refactoring.Rename.RenameRefactoring.Rename (met, newSignal.Handler);
+			await MonoDevelop.Refactoring.Rename.RenameRefactoring.Rename (met, newSignal.Handler);
 		}
 
 		/// Adds a field to the class
-		public void BindToField (Stetic.Component obj)
+		public async Task BindToField (Stetic.Component obj)
 		{
 			if (targetObject == null)
 				return;
@@ -208,40 +221,45 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			string name = GetMemberName (obj);
 			var cls = GetClass ();
 			
-			if (FindField (cls.Resolve (project), name) != null)
+			if (FindField (cls, name) != null)
 				return;
 
-			Document doc = IdeApp.Workbench.OpenDocument (cls.Region.FileName, true);
+			var location = GetSourceLocation(cls);
+			var doc = await IdeApp.Workbench.OpenDocument (location.SourceTree.FilePath, project, true);
 			
-			IEditableTextFile editor = doc.GetContent<IEditableTextFile> ();
+			var editor = doc.Editor;
 			if (editor != null) {
-				var resolvedCls = cls.Resolve (project).GetDefinition ();
-				CodeGenerationService.AddNewMember (resolvedCls, cls, GetFieldCode (cls, obj, name));
+				await CodeGenerationService.AddNewMember (project, cls, cls.Locations.First (), GetFieldCode (cls, obj, name));
 			}
 		}
 		
-		IUnresolvedField GetFieldCode (IUnresolvedTypeDefinition cls, Stetic.Component obj, string name)
+		FieldDeclarationSyntax GetFieldCode (ITypeSymbol cls, Stetic.Component obj, string name)
 		{
-			return new DefaultUnresolvedField (cls, name) {
-				ReturnType = ReflectionHelper.ParseReflectionName (obj.Type.ClassName),
-				Accessibility = Accessibility.Protected
-		};
-	}
+			return SyntaxFactory.FieldDeclaration (
+				SyntaxFactory.VariableDeclaration (
+					SyntaxFactory.ParseTypeName (obj.Type.ClassName),
+					new SeparatedSyntaxList<VariableDeclaratorSyntax> {
+						SyntaxFactory.VariableDeclarator (name)
+					}
+				)
+			).AddModifiers (SyntaxFactory.Token (SyntaxKind.ProtectedKeyword));
+		}
+	
 		
-		IField FindField (IType cls, string name)
+		static IFieldSymbol FindField (ITypeSymbol cls, string name)
 		{
-			foreach (IField field in cls.GetFields ())
-				if (field.Name == name)
-					return field;
-			return null;
+			return cls
+				.GetMembers (name)
+				.OfType<IFieldSymbol> ()
+				.FirstOrDefault ();
 		}
 		
-		public IUnresolvedTypeDefinition GetClass ()
+		public INamedTypeSymbol GetClass ()
 		{
 			return GetClass (true);
 		}
 		
-		public IUnresolvedTypeDefinition GetClass (bool getUserClass)
+		public INamedTypeSymbol GetClass (bool getUserClass)
 		{
 			if (targetObject == null)
 				return null;
@@ -251,62 +269,59 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				return cls;
 				
 			// The class name may have changed. Try to guess the new name.
-			
-			var matches = new List<IUnresolvedTypeDefinition> ();
-			ParsedDocument unit = null;
-			var ctx = gproject.GetParserContext ();
-			var doc = TypeSystemService.ParseFile (project, classFile);
-			if (doc != null) {
-				unit = doc;
-				foreach (var fcls in unit.TopLevelTypeDefinitions) {
-					if (IsValidClass (fcls.Resolve (project), targetObject))
-						matches.Add (fcls);
-				}
-			}
-			
-			// If found the class, just return it
-			if (matches.Count == 1) {
-				cls = matches [0];
-				className = cls.FullName;
-				targetObject.Name = className;
-				gproject.SaveWindow (true, targetObject.Name);
-				return cls;
-			}
-			
-			// If not found, warn the user.
-			
-			if (unit != null && unit.TopLevelTypeDefinitions.Count > 0) {
-				using (SelectRenamedClassDialog dialog = new SelectRenamedClassDialog (unit.TopLevelTypeDefinitions.Select (c => c.Resolve (project)))) {
-					if (dialog.Run ()) {
-						className = dialog.SelectedClass;
-						if (className == null)
-							return null;
-						else {
-							targetObject.Name = className;
-							gproject.SaveWindow (true, targetObject.Name);
-							return gproject.FindClass (className);
-						}
-					}
-				}
-			} else {
-				MessageService.ShowError (GettextCatalog.GetString ("The class bound to the component '{0}' could not be found. This may be due to syntax errors in the source code file.", GetObjectName(targetObject)));
-			}
+//			TODO (roslyn port) - is that really required ? 
+//			var matches = new List<INamedTypeSymbol> ();
+//			ParsedDocument unit = null;
+//			var ctx = gproject.GetParserContext ();
+//			var doc = TypeSystemService.ParseFile (project, classFile);
+//			if (doc != null) {
+//				unit = doc;
+//				foreach (var fcls in unit.TopLevelTypeDefinitions) {
+//					if (IsValidClass (fcls, targetObject))
+//						matches.Add (fcls);
+//				}
+//			}
+//			
+//			// If found the class, just return it
+//			if (matches.Count == 1) {
+//				cls = matches [0];
+//				className = cls.GetFullName ();
+//				targetObject.Name = className;
+//				gproject.SaveWindow (true, targetObject.Name);
+//				return cls;
+//			}
+//			
+//			// If not found, warn the user.
+//			
+//			if (unit != null && unit.TopLevelTypeDefinitions.Count > 0) {
+//				using (var dialog = new SelectRenamedClassDialog (unit.TopLevelTypeDefinitions.Select (c => c.Resolve (project)))) {
+//					if (dialog.Run ()) {
+//						className = dialog.SelectedClass;
+//						if (className == null)
+//							return null;
+//						else {
+//							targetObject.Name = className;
+//							gproject.SaveWindow (true, targetObject.Name);
+//							return gproject.FindClass (className);
+//						}
+//					}
+//				}
+//			} else {
+//				MessageService.ShowError (GettextCatalog.GetString ("The class bound to the component '{0}' could not be found. This may be due to syntax errors in the source code file.", GetObjectName(targetObject)));
+//			}
 			
 			return null;
 		}
 		
-		static bool IsValidClass (IType cls, Stetic.Component obj)
+		static bool IsValidClass (ITypeSymbol cls, Stetic.Component obj)
 		{
+			if (cls.BaseType.SpecialType == SpecialType.System_Object)
+				return false;
 			string typeName = obj.Type.ClassName;
 			
-			foreach (var bt in cls.DirectBaseTypes) {
-				if (bt.FullName == typeName)
-					return true;
-				
-				if (IsValidClass (bt, obj))
-					return true;
-			}
-			return false;
+			if (cls.BaseType.GetFullName () == typeName)
+				return true;
+			return IsValidClass (cls.BaseType, obj);
 		}
 		
 		internal static string GetClassName (Stetic.Component obj)
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
index 551760fe69..eb93b3efe0 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs
@@ -30,22 +30,25 @@
 using System;
 using System.Linq;
 using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
-	public class CombinedDesignView : AbstractViewContent
+	public class CombinedDesignView : ViewContent
 	{
-		IViewContent content;
+		ViewContent content;
 		Gtk.Widget control;
 		List<TabView> tabs = new List<TabView> ();
 		
-		public CombinedDesignView (IViewContent content)
+		public CombinedDesignView (ViewContent content)
 		{
 			this.content = content;
 	/* This code causes that chagnes in a version control view always select the source code view.
@@ -54,7 +57,6 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 					ShowPage (0);
 				};
 			}*/
-			content.ContentChanged += new EventHandler (OnTextContentChanged);
 			content.DirtyChanged += new EventHandler (OnTextDirtyChanged);
 			
 			CommandRouterContainer crc = new CommandRouterContainer (content.Control, content, true);
@@ -86,7 +88,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		public bool HasPage (Gtk.Widget page)
 		{
-			return tabs.Any (p => p.Control == page);
+			return tabs.Any (p => p.Control.GetNativeWidget<Gtk.Widget> () == page);
 		}
 		
 		public void RemoveButton (Gtk.Widget page)
@@ -107,18 +109,23 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			ShowPage (0);*/
 		}
 		
-		public override MonoDevelop.Projects.Project Project {
-			get { return base.Project; }
-			set { 
-				base.Project = value; 
-				content.Project = value; 
+		protected override void OnSetProject (Projects.Project project)
+		{
+			base.OnSetProject (project);
+			content.Project = project; 
+		}
+
+		public override ProjectReloadCapability ProjectReloadCapability {
+			get {
+				return content.ProjectReloadCapability;
 			}
 		}
 		
-		protected override void OnWorkbenchWindowChanged (EventArgs e)
+		protected override void OnWorkbenchWindowChanged ()
 		{
-			base.OnWorkbenchWindowChanged (e);
-			content.WorkbenchWindow = WorkbenchWindow;
+			base.OnWorkbenchWindowChanged ();
+			if (content != null)
+				content.WorkbenchWindow = WorkbenchWindow;
 			if (WorkbenchWindow != null) {
 				foreach (TabView view in tabs) {
 					view.WorkbenchWindow = WorkbenchWindow;
@@ -160,7 +167,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		public override void Dispose ()
 		{
-			content.ContentChanged -= new EventHandler (OnTextContentChanged);
+			if (content == null)
+				return;
+
 			content.DirtyChanged -= new EventHandler (OnTextDirtyChanged);
 			IdeApp.Workbench.ActiveDocumentChanged -= new EventHandler (OnActiveDocumentChanged);
 			content.Dispose ();
@@ -171,19 +180,19 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			base.Dispose ();
 		}
 		
-		public override void Load (string fileName)
+		public override Task Load (FileOpenInformation fileOpenInformation)
 		{
-			ContentName = fileName;
-			content.Load (fileName);
+			ContentName = fileOpenInformation.FileName;
+			return content.Load (ContentName);
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get { return control; }
 		}
 		
-		public override void Save (string fileName)
+		public override Task Save (FileSaveInformation fileSaveInformation)
 		{
-			content.Save (fileName);
+			return content.Save (fileSaveInformation);
 		}
 		
 		public override bool IsDirty {
@@ -210,14 +219,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		{
 		}
 		
-		void OnTextContentChanged (object s, EventArgs args)
-		{
-			OnContentChanged (args);
-		}
-		
 		void OnTextDirtyChanged (object s, EventArgs args)
 		{
-			OnDirtyChanged (args);
+			OnDirtyChanged ();
 		}
 		
 		void OnActiveDocumentChanged (object s, EventArgs args)
@@ -230,7 +234,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		{
 		}
 		
-		public override object GetContent (Type type)
+		protected override object OnGetContent (Type type)
 		{
 //			if (type == typeof(IEditableTextBuffer)) {
 //				// Intercept the IPositionable interface, since we need to
@@ -241,20 +245,20 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 //					return null;
 //			}
 //			
-			return  base.GetContent (type) ?? (content !=null  ? content.GetContent (type) : null);
+			return  base.OnGetContent (type) ?? (content !=null  ? content.GetContent (type) : null);
 		}
 
 		public void JumpTo (int line, int column)
 		{
-			IEditableTextBuffer ip = (IEditableTextBuffer) content.GetContent (typeof(IEditableTextBuffer));
+			var ip = (TextEditor) content.GetContent (typeof(TextEditor));
 			if (ip != null) {
 				ShowPage (0);
-				ip.SetCaretTo (line, column);
+				ip.SetCaretLocation (line, column);
 			}
 		}
 	}
 	
-	class TabView: AbstractBaseViewContent, IAttachableViewContent
+	class TabView: BaseViewContent
 	{
 		string label;
 		Gtk.Widget content;
@@ -265,32 +269,14 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			this.content = content;
 		}
 		
-		public override object GetContent (Type type)
+		protected override object OnGetContent (Type type)
 		{
-			if (type.IsInstanceOfType (Control))
-				return Control;
-			return base.GetContent (type);
+			if (type.IsInstanceOfType (content))
+				return content;
+			return base.OnGetContent (type);
 		}
 		
-		#region IAttachableViewContent implementation
-		public virtual void Selected ()
-		{
-		}
-
-		public virtual void Deselected ()
-		{
-		}
-
-		public virtual void BeforeSave ()
-		{
-		}
-
-		public virtual void BaseContentChanged ()
-		{
-		}
-		#endregion
-
-		public override Widget Control {
+		public override Control Control {
 			get {
 				return content;
 			}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs
index ef787a9b26..04e2b66bd2 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs
@@ -3,47 +3,66 @@ using System;
 using System.Threading;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
+using MonoDevelop.Core.Serialization;
 using MonoDevelop.Ide;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
-	public class GtkProjectServiceExtension: ProjectServiceExtension
+	public class GtkProjectServiceExtension: DotNetProjectExtension
 	{
-		public override bool SupportsItem (IBuildTarget item)
+		[ItemProperty ("GtkDesignInfo", IsExternal = true, SkipEmpty = true)]
+		GtkDesignInfo info;
+
+		protected override bool SupportsObject (WorkspaceObject item)
 		{
-			if (!IdeApp.IsInitialized)
-				return false;
-			
-			DotNetProject project = item as DotNetProject;
-			return project != null && project.References.Count != 0 && GtkDesignInfo.HasDesignedObjects (project);
+			return base.SupportsObject (item) && IdeApp.IsInitialized;
 		}
 
-		protected override BuildResult Build (IProgressMonitor monitor, SolutionEntityItem entry, ConfigurationSelector configuration)
+		protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
 		{
-			DotNetProject project = (DotNetProject) entry;
-			GtkDesignInfo info = GtkDesignInfo.FromProject (project);
+			base.OnReadProject (monitor, msproject);
+			if (info != null)
+				info.Project = Project;
+		}
+
+		public GtkDesignInfo DesignInfo {
+			get {
+				if (info == null)
+					info = new GtkDesignInfo (Project);
+				return info;
+			}
+			set {
+				info = value;
+			}
+		}
+
+		protected async override Task<BuildResult> OnBuild (ProgressMonitor monitor, ConfigurationSelector configuration, OperationContext operationContext)
+		{
+			if (Project.References.Count == 0 || !GtkDesignInfo.HasDesignedObjects (Project))
+				return await base.OnBuild (monitor, configuration, operationContext);
 
-			// The code generator must run in the GUI thread since it needs to
-			// access to Gtk classes
 			Generator gen = new Generator ();
-			lock (gen) {
-				Gtk.Application.Invoke (delegate { gen.Run (monitor, project, configuration); });
-				Monitor.Wait (gen);
+			if (!await gen.Run (monitor, Project, configuration)) {
+				BuildResult gr = new BuildResult ();
+				foreach (string s in gen.Messages)
+					gr.AddError (DesignInfo.GuiBuilderProject.File, 0, 0, null, s);
+				return gr;
 			}
 					
-			BuildResult res = base.Build (monitor, entry, configuration);
+			BuildResult res = await base.OnBuild (monitor, configuration, operationContext);
 
 			if (gen.Messages != null) {
 				foreach (string s in gen.Messages)
-					res.AddWarning (info.GuiBuilderProject.File, 0, 0, null, s);
+					res.AddWarning (DesignInfo.GuiBuilderProject.File, 0, 0, null, s);
 						
 				if (gen.Messages.Length > 0)
-					info.ForceCodeGenerationOnBuild ();
+					DesignInfo.ForceCodeGenerationOnBuild ();
 			}
 			
 			if (res.Failed && !Platform.IsWindows && !Platform.IsMac) {
 				// Some gtk# packages don't include the .pc file unless you install gtk-sharp-devel
-				if (project.AssemblyContext.GetPackage ("gtk-sharp-2.0") == null) {
+				if (Project.AssemblyContext.GetPackage ("gtk-sharp-2.0") == null) {
 					string msg = GettextCatalog.GetString (
 						"ERROR: MonoDevelop could not find the Gtk# 2.0 development package. " +
 						"Compilation of projects depending on Gtk# libraries will fail. " +
@@ -59,19 +78,18 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 	
 	class Generator
 	{
-		public void Run (IProgressMonitor monitor, DotNetProject project, ConfigurationSelector configuration)
+		public async Task<bool> Run (ProgressMonitor monitor, DotNetProject project, ConfigurationSelector configuration)
 		{
-			lock (this) {
-				try {
-					Stetic.CodeGenerationResult res = GuiBuilderService.GenerateSteticCode (monitor, project, configuration);
-					if (res != null)
-						Messages = res.Warnings;
-				} catch (Exception ex) {
-					Error = ex;
-					LoggingService.LogError (ex.ToString ());
-					Messages = new string [] { Error.Message };
-				}
-				Monitor.PulseAll (this);
+			try {
+				Stetic.CodeGenerationResult res = await GuiBuilderService.GenerateSteticCode (monitor, project, configuration);
+				if (res != null)
+					Messages = res.Warnings;
+				return true;
+			} catch (Exception ex) {
+				Error = ex;
+				LoggingService.LogError (ex.ToString ());
+				Messages = new  [] { Error.Message };
+				return false;
 			}
 		}
 		public string[] Messages;
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs
index 603b0beccb..c9f93016f6 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs
@@ -30,6 +30,11 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.TypeSystem;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+using System;
+using ICSharpCode.NRefactory6.CSharp;
 
 
 namespace MonoDevelop.GtkCore.GuiBuilder
@@ -54,7 +59,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (fileName.IsNullOrEmpty)
 				return false;
 			
-			if (GetWindow (fileName) == null)
+			if (GetWindow (fileName, ownerProject) == null)
 				return false;
 			
 			excludeThis = true;
@@ -63,42 +68,46 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			return db != null;
 		}
 		
-		public IViewContent CreateContent (MonoDevelop.Core.FilePath fileName, string mimeType, Project ownerProject)
+		public ViewContent CreateContent (MonoDevelop.Core.FilePath fileName, string mimeType, Project ownerProject)
 		{
 			excludeThis = true;
 			var db = DisplayBindingService.GetDefaultViewBinding (fileName, mimeType, ownerProject);
 			var content = db.CreateContent (fileName, mimeType, ownerProject);
-			GuiBuilderView view = new GuiBuilderView (content, GetWindow (fileName));
+			var window = GetWindow (fileName, ownerProject);
+			if (window == null)
+				throw new InvalidOperationException ("GetWindow == null");
+			GuiBuilderView view = new GuiBuilderView (content, window);
 			excludeThis = false;
 			return view;
 		}
 		
-		internal static GuiBuilderWindow GetWindow (string file)
+		internal static GuiBuilderWindow GetWindow (string file, Project project)
 		{
 			if (!IdeApp.Workspace.IsOpen)
 				return null;
-
-			Project project = null;
-			foreach (Project p in IdeApp.Workspace.GetAllProjects ()) {
-				if (p.IsFileInProject (file)) {
-					project = p;
-					break;
-				}
-			}
-			
 			if (!GtkDesignInfo.HasDesignedObjects (project))
 				return null;
-
 			GtkDesignInfo info = GtkDesignInfo.FromProject (project);
 			if (file.StartsWith (info.GtkGuiFolder))
 				return null;
-			
-			var doc = TypeSystemService.ParseFile (project, file);
+			var docId = TypeSystemService.GetDocumentId (project, file);
+			if (docId == null)
+				return null;
+			var doc = TypeSystemService.GetCodeAnalysisDocument (docId);
 			if (doc == null)
 				return null;
-
-			foreach (var t in doc.TopLevelTypeDefinitions) {
-				GuiBuilderWindow win = info.GuiBuilderProject.GetWindowForClass (t.FullName);
+			Microsoft.CodeAnalysis.SemanticModel semanticModel;
+			try {
+				semanticModel = doc.GetSemanticModelAsync ().Result;
+			} catch {
+				return null;
+			}
+			if (semanticModel == null)
+				return null;
+			var root = semanticModel.SyntaxTree.GetRoot ();
+			foreach (var classDeclaration in root.DescendantNodesAndSelf (child => !(child is BaseTypeDeclarationSyntax)).OfType<ClassDeclarationSyntax> ()) {
+				var c = semanticModel.GetDeclaredSymbol (classDeclaration);
+				GuiBuilderWindow win = info.GuiBuilderProject.GetWindowForClass (c.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.CSharpErrorMessageFormat));
 				if (win != null)
 					return win;
 			}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
index 0e16502285..2f2e4c8591 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
@@ -37,9 +37,12 @@ using System.CodeDom.Compiler;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using System.Linq;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using ICSharpCode.NRefactory6.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
@@ -114,7 +117,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (System.IO.File.Exists (fileName)) {
 				watcher.Path = Path.GetDirectoryName (fileName);
 				watcher.Filter = Path.GetFileName (fileName);
-				watcher.Changed += (FileSystemEventHandler) DispatchService.GuiDispatch (new FileSystemEventHandler (OnSteticFileChanged));
+				watcher.Changed += OnSteticFileChanged;
 				watcher.EnableRaisingEvents = true;
 			}
 		}	
@@ -158,17 +161,19 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		void OnSteticFileChanged (object s, FileSystemEventArgs args)
 		{
-			lock (fileSaveLock) {
-				if (lastSaveTime == System.IO.File.GetLastWriteTime (fileName))
-					return;
-			}
-			
-			if (GuiBuilderService.HasOpenDesigners (project, true)) {
-				if (MessageService.AskQuestion (GettextCatalog.GetString ("The project '{0}' has been modified by an external application. Do you want to reload it?", project.Name), GettextCatalog.GetString ("Unsaved changes in the open GTK designers will be lost."), AlertButton.Cancel, AlertButton.Reload) != AlertButton.Reload)
-					return;
-			}
-			if (!disposed)
-				Reload ();
+			Runtime.RunInMainThread (() => {
+				lock (fileSaveLock) {
+					if (lastSaveTime == System.IO.File.GetLastWriteTime (fileName))
+						return;
+				}
+
+				if (GuiBuilderService.HasOpenDesigners (project, true)) {
+					if (MessageService.AskQuestion (GettextCatalog.GetString ("The project '{0}' has been modified by an external application. Do you want to reload it?", project.Name), GettextCatalog.GetString ("Unsaved changes in the open GTK designers will be lost."), AlertButton.Cancel, AlertButton.Reload) != AlertButton.Reload)
+						return;
+				}
+				if (!disposed)
+					Reload ();
+			});
 		}
 		
 		public void Reload ()
@@ -219,7 +224,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			}
 				
 			if (GtkDesignInfo.FromProject (project).UpdateGtkFolder () && saveMdProject)
-				IdeApp.ProjectOperations.Save (project);
+				IdeApp.ProjectOperations.SaveAsync (project);
 		}
 		
 		public string File {
@@ -337,16 +342,23 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		void OnFileAdded (object sender, ProjectFileEventArgs e)
 		{
 			foreach (ProjectFileEventInfo args in e) {
-				var doc = TypeSystemService.ParseFile (args.Project, args.ProjectFile.Name);
+				var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
+				if (docId == null)
+					continue;
+				var doc = TypeSystemService.GetCodeAnalysisDocument (docId);
 				if (doc == null)
 					continue;
 	
 				string dir = Path.Combine (Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "stetic"), "deleted-designs");
 				if (!Directory.Exists (dir) || Directory.GetFiles (dir).Length == 0)
 					continue;
-	
-				foreach (var t in doc.TopLevelTypeDefinitions) {
-					string path = Path.Combine (dir, t.FullName + ".xml");
+				var semanticModel = doc.GetSemanticModelAsync ().Result;
+				if (semanticModel == null)
+					continue;
+
+				foreach (var classDeclaration in semanticModel.SyntaxTree.GetRoot ().DescendantNodesAndSelf (child => !(child is BaseTypeDeclarationSyntax)).OfType<ClassDeclarationSyntax> ()) {
+					var c = semanticModel.GetDeclaredSymbol (classDeclaration);
+					string path = Path.Combine (dir, c.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.CSharpErrorMessageFormat) + ".xml");
 					if (!System.IO.File.Exists (path))
 						continue;
 					XmlDocument xmldoc = new XmlDocument ();
@@ -362,12 +374,21 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			ArrayList toDelete = new ArrayList ();
 
 			foreach (ProjectFileEventInfo args in e) {
-				var doc = TypeSystemService.ParseFile (args.Project, args.ProjectFile.Name);
+
+				var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
+				if (docId == null)
+					continue;
+				var doc = TypeSystemService.GetCodeAnalysisDocument (docId);
 				if (doc == null)
 					continue;
+				var semanticModel = doc.GetSemanticModelAsync ().Result;
+				if (semanticModel == null)
+					continue;
+
 	
-				foreach (var t in doc.TopLevelTypeDefinitions) {
-					GuiBuilderWindow win = GetWindowForClass (t.FullName);
+				foreach (var classDeclaration in semanticModel.SyntaxTree.GetRoot ().DescendantNodesAndSelf (child => !(child is BaseTypeDeclarationSyntax)).OfType<ClassDeclarationSyntax> ()) {
+					var c = semanticModel.GetDeclaredSymbol (classDeclaration);
+					GuiBuilderWindow win = GetWindowForClass (c.ToDisplayString (Microsoft.CodeAnalysis.SymbolDisplayFormat.MinimallyQualifiedFormat));
 					if (win != null)
 						toDelete.Add (win);
 				}
@@ -410,7 +431,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			string path = null;
 			
 			if (pref.ReferenceType == ReferenceType.Project) {
-				DotNetProject p = project.ParentSolution.FindProjectByName (pref.Reference) as DotNetProject;
+				DotNetProject p = pref.ResolveProject (project.ParentSolution) as DotNetProject;
 				if (p != null)
 					path = p.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
 			} else if (pref.ReferenceType == ReferenceType.Assembly) {
@@ -444,8 +465,8 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				}
 			}
 			return null;
-		}

-

+		}
+
 		public GuiBuilderWindow GetWindowForFile (FilePath fileName)
 		{
 			if (Windows != null) {
@@ -466,8 +487,8 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				}
 			}
 			return null;
-		}

-

+		}
+
 		public Stetic.ActionGroupInfo GetActionGroupForFile (FilePath fileName)
 		{
 			foreach (Stetic.ActionGroupInfo group in SteticProject.ActionGroups) {
@@ -480,67 +501,70 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		public Stetic.ActionGroupInfo GetActionGroup (string name)
 		{
 			return SteticProject.GetActionGroup (name);
-		}

-

+		}
+
 		public FilePath GetSourceCodeFile (Stetic.ProjectItemInfo obj)
 		{
 			return GetSourceCodeFile (obj, true);
-		}

-

+		}
+
 		public FilePath GetSourceCodeFile (Stetic.ProjectItemInfo obj, bool getUserClass)
 		{
 			var cls = GetClass (obj, getUserClass);
 			if (cls != null)
-				return cls.Region.FileName;
+				return cls.Locations.First ().SourceTree.FilePath;
 			return null;
 		}
 		
-		IUnresolvedTypeDefinition GetClass (Stetic.ProjectItemInfo obj, bool getUserClass)
+		INamedTypeSymbol GetClass (Stetic.ProjectItemInfo obj, bool getUserClass)
 		{
 			string name = CodeBinder.GetClassName (obj);
 			return FindClass (name, getUserClass);
 		}
 		
-		public IUnresolvedTypeDefinition FindClass (string className)
+		public INamedTypeSymbol FindClass (string className)
 		{
 			return FindClass (className, true);
 		}
 		
-		public IUnresolvedTypeDefinition FindClass (string className, bool getUserClass)
-		{

+		public INamedTypeSymbol FindClass (string className, bool getUserClass)
+		{
 			FilePath gui_folder = GtkDesignInfo.FromProject (project).GtkGuiFolder;
 			var ctx = GetParserContext ();
 			if (ctx == null)
 				return null;
-			var classes = ctx.MainAssembly.GetAllTypeDefinitions ();
-			if (classes == null)
-				return null;
-			foreach (var cls in classes) {
-				if (cls.FullName == className) {
+			foreach (var cls in ctx.GetAllTypesInMainAssembly ()) {
+				if (cls.GetFullName() == className) {
 					if (getUserClass) {
 						// Return this class only if it is declared outside the gtk-gui
 						// folder. Generated partial classes will be ignored.
-						foreach (var part in cls.Parts) {
-							if (!string.IsNullOrEmpty (part.Region.FileName) && !((FilePath)cls.Region.FileName).IsChildPathOf (gui_folder)) {
-								return part;
+						foreach (var part in cls.Locations) {
+							var filePath = part.SourceTree.FilePath;
+							if (!string.IsNullOrEmpty (filePath) && !((FilePath)filePath).IsChildPathOf (gui_folder)) {
+								return cls;
 							}
 						}
 						continue;
 					}
-					if (getUserClass && !string.IsNullOrEmpty (cls.Region.FileName) && ((FilePath)cls.Region.FileName).IsChildPathOf (gui_folder))
+					if (getUserClass && !string.IsNullOrEmpty (cls.Locations.First ().SourceTree.FilePath) && ((FilePath)cls.Locations.First ().SourceTree.FilePath).IsChildPathOf (gui_folder))
 						continue;
-					return cls.Parts.First ();
+					return cls;
 				}
 			}
 			return null;
 		}
 		
-		public ICompilation GetParserContext ()
+		public Compilation GetParserContext ()
 		{
-			var dom = TypeSystemService.GetCompilation (Project);
+			System.Threading.Tasks.Task<Compilation> task;
+			do {
+				task = TypeSystemService.GetCompilationAsync (Project);
+				task.Wait (500);
+			} while (!task.IsCompleted);
+
+			var dom = task.Result;
 			if (dom != null && needsUpdate) {
 				needsUpdate = false;
-//				dom.ForceUpdate ();
 			}
 			return dom;
 		}
@@ -629,7 +653,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (hasError)
 				return files;
 
-			IDotNetLanguageBinding binding = LanguageBindingService.GetBindingPerLanguageName (project.LanguageName) as IDotNetLanguageBinding;
+			var binding = LanguageBindingService.GetBindingPerLanguageName (project.LanguageName);
 			string path = Path.Combine (guiFolder, binding.GetFileName ("generated"));
 			if (!System.IO.File.Exists (path)) {
 				// Generate an empty build class
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
index 40b3c74d59..c765892291 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs
@@ -42,6 +42,8 @@ using MonoDevelop.Projects.Policies;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.TypeSystem;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
 
 
 namespace MonoDevelop.GtkCore.GuiBuilder
@@ -111,7 +113,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		public static Stetic.Application SteticApp {
 			get {
 				// Stetic is not thread safe, so all has to be done in the gui thread
-				DispatchService.AssertGuiThread ();
+				Runtime.AssertMainThread ();
 				if (steticApp == null) {
 					steticApp = Stetic.ApplicationFactory.CreateApplication (Stetic.IsolationMode.None);
 					steticApp.AllowInProcLibraries = false;
@@ -166,7 +168,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			}
 		}
 		
-		public static ActionGroupView OpenActionGroup (Project project, Stetic.ActionGroupInfo group)
+		public static async Task<ActionGroupView> OpenActionGroup (Project project, Stetic.ActionGroupInfo group)
 		{
 			GuiBuilderProject p = GtkDesignInfo.FromProject (project).GuiBuilderProject ;
 			string file = p != null ? p.GetSourceCodeFile (group) : null;
@@ -174,7 +176,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				file = ActionGroupDisplayBinding.BindToClass (project, group);
 			}
 			
-			Document doc = IdeApp.Workbench.OpenDocument (file, true);
+			Document doc = await IdeApp.Workbench.OpenDocument (file, true);
 			if (doc != null) {
 				ActionGroupView view = doc.GetContent<ActionGroupView> ();
 				if (view != null) {
@@ -323,7 +325,6 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				component = item.Component;
 			
 			CodeCompileUnit cu = new CodeCompileUnit ();
-			
 			if (project.UsePartialTypes) {
 				CodeNamespace cns = new CodeNamespace (ns);
 				cu.Namespaces.Add (cns);
@@ -333,6 +334,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				type.Attributes = MemberAttributes.Public;
 				type.TypeAttributes = System.Reflection.TypeAttributes.Public;
 				cns.Types.Add (type);
+				type.Members.Add (
+					new CodeMemberMethod () {
+						Name = "Build"
+					}
+				);
 				
 				foreach (Stetic.ObjectBindInfo binfo in component.GetObjectBindInfo ()) {
 					// When a component is being renamed, we have to generate the 
@@ -369,10 +375,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				text = fileStream.ToString ();
 				text = FormatGeneratedFile (fileName, text, project, provider);
 			}
-			
 			if (saveToFile)
 				File.WriteAllText (fileName, text);
-			TypeSystemService.ParseFile (project, fileName);
+			TypeSystemService.NotifyFileChange (fileName, text);
 //			
 //			if (ProjectDomService.HasDom (project)) {
 //				// Only update the parser database if the project is actually loaded in the IDE.
@@ -385,7 +390,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		}
 		
 		
-		public static Stetic.CodeGenerationResult GenerateSteticCode (IProgressMonitor monitor, DotNetProject project, ConfigurationSelector configuration)
+		public async static Task<Stetic.CodeGenerationResult> GenerateSteticCode (ProgressMonitor monitor, DotNetProject project, ConfigurationSelector configuration)
 		{
 			if (generating || !GtkDesignInfo.HasDesignedObjects (project))
 				return null;
@@ -422,9 +427,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 					return null;
 				
 				if (info.GuiBuilderProject.HasError) {
-					monitor.ReportError (GettextCatalog.GetString ("GUI code generation failed for project '{0}'. The file '{1}' could not be loaded.", project.Name, info.SteticFile), null);
-					monitor.AsyncOperation.Cancel ();
-					return null;
+					var error = GettextCatalog.GetString ("GUI code generation failed for project '{0}'. The file '{1}' could not be loaded.", project.Name, info.SteticFile);
+					monitor.ReportError (error, null);
+					throw new UserException (error);
 				}
 				
 				if (info.GuiBuilderProject.IsEmpty) 
@@ -454,8 +459,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				if (!canGenerateInProcess) {
 					timer.Trace ("Generating out of process");
 				
-					// Run the generation in another thread to avoid freezing the GUI
-					System.Threading.ThreadPool.QueueUserWorkItem (delegate {
+					await Task.Run (delegate {
 						try {
 							// Generate the code in another process if stetic is not isolated
 							CodeGeneratorProcess cob = (CodeGeneratorProcess)Runtime.ProcessService.CreateExternalProcessObject (typeof(CodeGeneratorProcess), false);
@@ -469,10 +473,6 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 						}
 					});
 				
-					while (generating) {
-						DispatchService.RunPendingEvents ();
-						System.Threading.Thread.Sleep (100);
-					}
 				} else {
 					timer.Trace ("Generating in-process");
 					// No need to create another process, since stetic has its own backend process
@@ -544,7 +544,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				// Make sure the generated files are added to the project
 				if (info.UpdateGtkFolder ()) {
 					Gtk.Application.Invoke (delegate {
-						IdeApp.ProjectOperations.Save (project);
+						IdeApp.ProjectOperations.SaveAsync (project);
 					});
 				}
 				
@@ -592,7 +592,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		static string StripHeaderAndBlankLines (string text, CodeDomProvider provider)
 		{
-			Mono.TextEditor.TextDocument doc = new Mono.TextEditor.TextDocument ();
+			var doc = TextEditorFactory.CreateNewDocument ();
 			doc.Text = text;
 			int realStartLine = 0;
 			for (int i = 1; i <= doc.LineCount; i++) {
@@ -610,11 +610,11 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (provider is Microsoft.CSharp.CSharpCodeProvider) {
 				bool previousWasBlank = false;
 				for (int i = 1; i <= doc.LineCount; i++) {
-					Mono.TextEditor.DocumentLine line = doc.GetLine (i);
+					var line = doc.GetLine (i);
 					bool isBlank, isBracket;
 					CheckLine (doc, line, out isBlank, out isBracket);
 					if (isBlank && previousWasBlank && line.LengthIncludingDelimiter > 0) {
-						doc.Remove (line.Offset, line.LengthIncludingDelimiter);
+						doc.RemoveText (line.Offset, line.LengthIncludingDelimiter);
 						i--;
 					}
 					previousWasBlank = isBlank || isBracket;
@@ -622,10 +622,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			}
 			
 			int offset = doc.GetLine (realStartLine).Offset;
-			return doc.GetTextAt (offset, doc.TextLength - offset);
+			return doc.GetTextAt (offset, doc.Length - offset);
 		}
 
-		static void CheckLine (Mono.TextEditor.TextDocument doc, Mono.TextEditor.DocumentLine line, out bool isBlank, out bool isBracket)
+		static void CheckLine (IReadonlyTextDocument doc, IDocumentLine line, out bool isBlank, out bool isBracket)
 		{
 			isBlank = true;
 			isBracket = false;
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
index 0a33c84717..f1b4ded7ea 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
@@ -28,6 +28,7 @@
 
 
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
 
@@ -37,16 +38,19 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide.Commands;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Projects;
-using MonoDevelop.DesignerSupport.Toolbox; 
+using MonoDevelop.DesignerSupport.Toolbox;
 using MonoDevelop.DesignerSupport;
 
 using Gtk;
 using Gdk;
 using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+using MonoDevelop.Refactoring;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
-	public class GuiBuilderView : CombinedDesignView, ISupportsProjectReload
+	public class GuiBuilderView : CombinedDesignView
 	{
 		Stetic.WidgetDesigner designer;
 		Stetic.ActionGroupDesigner actionsBox;
@@ -61,7 +65,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		string rootName;
 		object designerStatus;
 		
-		public GuiBuilderView (IViewContent content, GuiBuilderWindow window): base (content)
+		public GuiBuilderView (ViewContent content, GuiBuilderWindow window): base (content)
 		{
 			rootName = window.Name;
 			
@@ -84,14 +88,16 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			LoadDesigner ();
 		}
 		
-		ProjectReloadCapability ISupportsProjectReload.ProjectReloadCapability {
+		public override ProjectReloadCapability ProjectReloadCapability {
 			get {
 				return ProjectReloadCapability.Full;
 			}
 		}
-		
-		void ISupportsProjectReload.Update (Project project)
+
+		protected override void OnSetProject (Projects.Project project)
 		{
+			base.OnSetProject (project);
+
 			if (gproject != null && gproject.Project == project)
 				return;
 			
@@ -101,7 +107,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			CloseDesigner ();
 			CloseProject ();
 			if (project != null) {
-				GuiBuilderWindow w = GuiBuilderDisplayBinding.GetWindow (this.ContentName);
+				GuiBuilderWindow w = GuiBuilderDisplayBinding.GetWindow (this.ContentName, project);
 				if (w != null) {
 					AttachWindow (w);
 					if (designerStatus != null)
@@ -262,7 +268,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			codeBinder.TargetObject = designer.RootComponent;
 		}
 		
-		void OnComponentNameChanged (object s, Stetic.ComponentNameEventArgs args)
+		async void OnComponentNameChanged (object s, Stetic.ComponentNameEventArgs args)
 		{
 			try {
 				// Make sure the fields in the partial class are up to date.
@@ -273,7 +279,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				if (gproject.Project.UsePartialTypes)
 					GuiBuilderService.GenerateSteticCodeStructure ((DotNetProject)gproject.Project, designer.RootComponent, args, false, false);
 				
-				codeBinder.UpdateField (args.Component, args.OldName);
+				await codeBinder.UpdateField (args.Component, args.OldName);
 			}
 			catch (Exception ex) {
 				LoggingService.LogInternalError (ex);
@@ -294,21 +300,19 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		void OnWindowModifiedChanged (object s, EventArgs args)
 		{
-			if (IsDirty)
-				OnContentChanged (args);
-			OnDirtyChanged (args);
+			OnDirtyChanged ();
 		}
 		
-		void OnBindWidgetField (object o, EventArgs a)
+		async void OnBindWidgetField (object o, EventArgs a)
 		{
 			if (designer.Selection != null)
-				codeBinder.BindToField (designer.Selection);
+				await codeBinder.BindToField (designer.Selection);
 		}
 		
-		void OnBindActionField (object o, EventArgs a)
+		async void OnBindActionField (object o, EventArgs a)
 		{
 			if (actionsBox.SelectedAction != null)
-				codeBinder.BindToField (actionsBox.SelectedAction);
+				await codeBinder.BindToField (actionsBox.SelectedAction);
 		}
 		
 		void OnSignalAdded (object sender, Stetic.ComponentSignalEventArgs args)
@@ -320,21 +324,21 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		{
 		}
 
-		void OnSignalChanged (object sender, Stetic.ComponentSignalEventArgs args)
+		async void OnSignalChanged (object sender, Stetic.ComponentSignalEventArgs args)
 		{
-			codeBinder.UpdateSignal (args.OldSignal, args.Signal);
+			await codeBinder.UpdateSignal (args.OldSignal, args.Signal);
 		}
 		
-		public override void Save (string fileName)
+		public override async Task Save (FileSaveInformation fileSaveInformation)
 		{
-			base.Save (fileName);
+			await base.Save (fileSaveInformation);
 			
 			if (designer == null)
 				return;
 			
 			string oldBuildFile = GuiBuilderService.GetBuildCodeFileName (gproject.Project, window.RootWidget.Name);
 			
-			codeBinder.UpdateBindings (fileName);
+			codeBinder.UpdateBindings (fileSaveInformation.FileName);
 			if (!ErrorMode) {
 				if (designer != null)
 					designer.Save ();
@@ -369,12 +373,13 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			var cls = codeBinder.GetClass ();
 			if (cls == null)
 				return;
-			foreach (var met in cls.Methods) {
-				if (met.Name == signal.Handler) {
-					ShowPage (0);
-					JumpTo (met.Region.BeginLine, met.Region.BeginColumn);
-					break;
-				}
+			var met = cls
+				.GetMembers (signal.Handler)
+				.OfType<IMethodSymbol> ()
+				.FirstOrDefault ();
+			if (met != null) {
+				ShowPage (0);
+				RefactoringService.RoslynJumpToDeclaration (met);
 			}
 		}
 		
@@ -490,7 +495,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			if (node.Reference == null)
 				return;
 			
-			ProjectReference pref;
+			MonoDevelop.Projects.ProjectReference pref;
 			
 			// If the class name includes an assembly name it means that the
 			// widget is implemented in another assembly, not in the one that
@@ -506,16 +511,16 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				if (asm == null)
 					return;
 				if (gproject.Project.AssemblyContext.GetPackagesFromFullName (asm).Length > 0) {
-					pref = new ProjectReference (ReferenceType.Package, asm);
+					pref = MonoDevelop.Projects.ProjectReference.CreateAssemblyReference (asm);
 				} else {
 					asm = gproject.Project.AssemblyContext.GetAssemblyLocation (asm, gproject.Project.TargetFramework);
-					pref = new ProjectReference (ReferenceType.Assembly, asm);
+					pref = MonoDevelop.Projects.ProjectReference.CreateAssemblyFileReference (asm);
 				}
 			}
 			else
-				pref = new ProjectReference (node.ReferenceType, node.Reference);
+				pref = MonoDevelop.Projects.ProjectReference.CreateCustomReference (node.ReferenceType, node.Reference);
 			
-			foreach (ProjectReference pr in gproject.Project.References) {
+			foreach (var pr in gproject.Project.References) {
 				if (pr.Reference == pref.Reference)
 					return;
 			}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
index 6b16de95e7..4a60c3f121 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs
@@ -37,7 +37,11 @@ using MonoDevelop.Projects;
 using MonoDevelop.Projects.Text;
 using MonoDevelop.GtkCore.Dialogs;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.GtkCore.GuiBuilder
 {
@@ -107,9 +111,9 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			// Find the classes that could be bound to this design
 			var ctx = fproject.GetParserContext ();
 			ArrayList list = new ArrayList ();
-			foreach (var cls in ctx.MainAssembly.GetAllTypeDefinitions ()) {
+			foreach (var cls in ctx.GetAllTypesInMainAssembly ()) {
 				if (IsValidClass (cls))
-					list.Add (cls.FullName);
+					list.Add (cls.GetFullName ());
 			}
 		
 			// Ask what to do
@@ -224,27 +228,23 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			}
 		}
 		
-		internal bool IsValidClass (IType cls)
+		internal bool IsValidClass (ITypeSymbol cls)
 		{
-			foreach (var bt in cls.DirectBaseTypes) {
-				if (bt.ReflectionName == rootWidget.Component.Type.ClassName)
-					return true;
-				
-				var baseCls = bt;
-				if (baseCls != null && IsValidClass (baseCls))
-					return true;
-			}
-			return false;
+			if (cls.SpecialType == Microsoft.CodeAnalysis.SpecialType.System_Object)
+				return false;
+			if (cls.BaseType.GetFullName () == rootWidget.Component.Type.ClassName)
+				return true;
+			return IsValidClass (cls.BaseType);
 		}
 	}
 	
 	class OpenDocumentFileProvider: ITextFileProvider
-	{

-		public IEditableTextFile GetEditableTextFile (FilePath filePath)
+	{
+		public ITextDocument GetEditableTextFile (FilePath filePath)
 		{
-			foreach (Document doc in IdeApp.Workbench.Documents) {
+			foreach (var doc in IdeApp.Workbench.Documents) {
 				if (doc.FileName == filePath) {
-					IEditableTextFile ef = doc.GetContent<IEditableTextFile> ();
+					var ef = doc.Editor;
 					if (ef != null) return ef;
 				}
 			}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs
index 1cb98ff733..78ca552c89 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs
@@ -58,11 +58,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			}
 			
 			List<ItemToolboxNode> list = new List<ItemToolboxNode> ();
-			ComponentType[] types = null;
-			DispatchService.GuiSyncDispatch (delegate {
+			var types = Runtime.RunInMainThread (delegate {
 				// Stetic is not thread safe, it has to be used from the gui thread
-				types = GuiBuilderService.SteticApp.GetComponentTypes (filename);
-			});
+				return GuiBuilderService.SteticApp.GetComponentTypes (filename);
+			}).Result;
 			foreach (ComponentType ct in types) {
 				if (ct.Category == "window")
 					continue;
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs
index b83e9e7a11..ad6f2b722b 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs
@@ -86,14 +86,14 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 	
 	class ActionGroupCommandHandler: NodeCommandHandler
 	{
-		public override void ActivateItem ()
+		public override async void ActivateItem ()
 		{
 			GuiBuilderWindow w = (GuiBuilderWindow) CurrentNode.GetParentDataItem (typeof(GuiBuilderWindow), false);
 			if (w != null) {
 				if (w.SourceCodeFile == FilePath.Null && !w.BindToClass ())
 					return;
 				
-				Document doc = IdeApp.Workbench.OpenDocument (w.SourceCodeFile, true);
+				Document doc = await IdeApp.Workbench.OpenDocument (w.SourceCodeFile, true);
 				if (doc != null) {
 					GuiBuilderView view = doc.GetContent<GuiBuilderView> ();
 					if (view != null)
@@ -103,7 +103,7 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 			else {
 				Project project = (Project) CurrentNode.GetParentDataItem (typeof(Project), false);
 				Stetic.ActionGroupInfo group = (Stetic.ActionGroupInfo) CurrentNode.DataItem;
-				GuiBuilderService.OpenActionGroup (project, group);
+				await GuiBuilderService.OpenActionGroup (project, group);
 			}
 		}
 		
@@ -136,7 +136,7 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 						}
 						gproject.RemoveActionGroup (group);
 						gproject.SaveProject (false);
-						IdeApp.ProjectOperations.Save (project);
+						IdeApp.ProjectOperations.SaveAsync (project);
 					}
 				}
 			}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
index 59c1529d1a..42cfbd603d 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
@@ -182,7 +182,7 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 
 			IdeApp.ProjectOperations.CreateProjectFile (project, path, id);
 			
-			IdeApp.ProjectOperations.Save (project);
+			IdeApp.ProjectOperations.SaveAsync (project);
 			
 			ITreeNavigator nav = Tree.GetNodeAtObject (dataItem);
 			if (nav != null)
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs
index 79e0b00d81..cf1ce14602 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs
@@ -81,9 +81,7 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
 		{
 			GuiBuilderWindow win = (GuiBuilderWindow) dataObject;
-			foreach (Stetic.ActionGroupInfo agroup in win.RootWidget.ActionGroups) {
-				builder.AddChild (agroup);
-			}
+			builder.AddChildren (win.RootWidget.ActionGroups);
 		}
 		
 		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
@@ -114,13 +112,13 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 	
 	class GladeWindowCommandHandler: NodeCommandHandler
 	{
-		public override void ActivateItem ()
+		public override async void ActivateItem ()
 		{
 			GuiBuilderWindow w = (GuiBuilderWindow) CurrentNode.DataItem;
 			if (w.SourceCodeFile == FilePath.Null && !w.BindToClass ())
 				return;
 			
-			Document doc = IdeApp.Workbench.OpenDocument (w.SourceCodeFile, true);
+			Document doc = await IdeApp.Workbench.OpenDocument (w.SourceCodeFile, true);
 			if (doc != null) {
 				GuiBuilderView view = doc.GetContent<GuiBuilderView> ();
 				if (view != null)
@@ -141,7 +139,7 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 					}
 					w.Project.Remove (w);
 					w.Project.SaveProject (false);
-					IdeApp.ProjectOperations.Save (w.Project.Project);
+					IdeApp.ProjectOperations.SaveAsync (w.Project.Project);
 				}
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
index b06919dae1..aea532fc77 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs
@@ -39,13 +39,6 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 {
 	public class WindowsFolderNodeBuilder: TypeNodeBuilder
 	{
-		EventHandler updateDelegate;
-		
-		public WindowsFolderNodeBuilder ()
-		{
-			updateDelegate = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnUpdateFiles));
-		}
-		
 		public override Type NodeDataType {
 			get { return typeof(WindowsFolder); }
 		}
@@ -82,10 +75,8 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 			GtkDesignInfo info = GtkDesignInfo.FromProject (p);
 			if (!info.GuiBuilderProject.HasError) {
 				builder.AddChild (new StockIconsNode (p));
-				foreach (GuiBuilderWindow fi in info.GuiBuilderProject.Windows)
-					builder.AddChild (fi);
-				foreach (Stetic.ActionGroupInfo group in info.GuiBuilderProject.SteticProject.ActionGroups)
-					builder.AddChild (group);
+				builder.AddChildren (info.GuiBuilderProject.Windows);
+				builder.AddChildren (info.GuiBuilderProject.SteticProject.ActionGroups);
 			}
 		}
 
@@ -105,13 +96,13 @@ namespace MonoDevelop.GtkCore.NodeBuilders
 		public override void OnNodeAdded (object dataObject)
 		{
 			WindowsFolder w = (WindowsFolder) dataObject;
-			w.Changed += updateDelegate;
+			w.Changed += OnUpdateFiles;
 		}
 		
 		public override void OnNodeRemoved (object dataObject)
 		{
 			WindowsFolder w = (WindowsFolder)dataObject;
-			w.Changed -= updateDelegate;
+			w.Changed -= OnUpdateFiles;
 			w.Dispose ();
 		}
 		
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
index 16df403f52..3132051581 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
@@ -115,13 +115,6 @@
 		<CommandItem id = "MonoDevelop.GtkCore.GtkCommands.EditIcons" />
 	</Extension>
 	
-	<Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
-		<ItemProperty class = "MonoDevelop.Projects.Project"
-		              name = "GtkDesignInfo"
-		              skipEmpty = "True"
-		              type = "MonoDevelop.GtkCore.GtkDesignInfo" />
-	</Extension>
-	
 	<Extension path = "/MonoDevelop/Ide/StartupHandlers">
 		<Class class="MonoDevelop.GtkCore.GtkCoreStartupCommand" />
 	</Extension>
@@ -146,7 +139,7 @@
 		<StockIcon stockid = "md-gtkcore-actiongroup" resource = "actiongroup.png" />
 	</Extension>
 	
-	<Extension path = "/MonoDevelop/ProjectModel/ProjectServiceExtensions">
+	<Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions">
 		<Class class = "MonoDevelop.GtkCore.GuiBuilder.GtkProjectServiceExtension"  insertafter="MidStep"/>
 	</Extension>
 	
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
index 6e4960f5ff..9b5c179396 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
@@ -61,6 +61,26 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -93,11 +113,6 @@
       <Name>libsteticui</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
       <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
       <Name>MonoDevelop.Refactoring</Name>
@@ -108,11 +123,6 @@
       <Name>Mono.Cecil</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -123,6 +133,21 @@
       <Name>Xwt</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
+      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
+      <Name>Mono.TextEditor</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\CSharpBinding\CSharpBinding.csproj">
+      <Project>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</Project>
+      <Name>CSharpBinding</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
+      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
+      <Name>ICSharpCode.NRefactory.CSharp</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
index e19b126148..c039499739 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
@@ -45,7 +45,7 @@ namespace MonoDevelop.GtkCore
 	{
 		DotNetProject project;
 		GuiBuilderProject builderProject;
-		IDotNetLanguageBinding binding;
+		LanguageBinding binding;
 		ProjectResourceProvider resourceProvider;
 		ReferenceManager referenceManager;
 		
@@ -58,18 +58,16 @@ namespace MonoDevelop.GtkCore
 		[ItemProperty (DefaultValue="Gdk.Pixbuf")]
 		string imageResourceLoaderClass = "Gdk.Pixbuf";
 		
-		GtkDesignInfo ()
+		internal GtkDesignInfo ()
 		{
 		}
 		
-		GtkDesignInfo (DotNetProject project)
+		internal GtkDesignInfo (DotNetProject project)
 		{
-			IExtendedDataItem item = (IExtendedDataItem) project;
-			item.ExtendedProperties ["GtkDesignInfo"] = this;
 			Project = project;
 		}
 		
-		DotNetProject Project {
+		internal DotNetProject Project {
 			get { return project; }
 			set {
 				if (project == value)
@@ -86,7 +84,7 @@ namespace MonoDevelop.GtkCore
 				}
 				project = value;
 				if (project != null) {
-					binding = LanguageBindingService.GetBindingPerLanguageName (project.LanguageName) as IDotNetLanguageBinding;
+					binding = LanguageBindingService.GetBindingPerLanguageName (project.LanguageName);
 					project.FileAddedToProject += OnFileEvent;
 					project.FileChangedInProject += OnFileEvent;
 					project.FileRemovedFromProject += OnFileEvent;
@@ -348,24 +346,21 @@ namespace MonoDevelop.GtkCore
 			info.CleanGtkFolder (saveFiles);
 			project.Files.Remove (info.ObjectsFile);
 			project.Files.Remove (info.SteticFile);
-			IExtendedDataItem item = (IExtendedDataItem) project;
-			item.ExtendedProperties.Remove ("GtkDesignInfo");
+
+			var ext = project.GetService<GtkProjectServiceExtension> ();
+			if (ext != null)
+				ext.DesignInfo = null;
 			info.Dispose ();
+
 			ProjectNodeBuilder.OnSupportChanged (project);
 		}
 
 		public static GtkDesignInfo FromProject (Project project)
 		{
-			if (!(project is DotNetProject))
-				return new GtkDesignInfo ();
-
-			IExtendedDataItem item = (IExtendedDataItem) project;
-			GtkDesignInfo info = item.ExtendedProperties ["GtkDesignInfo"] as GtkDesignInfo;
-			if (info == null)
-				info = new GtkDesignInfo ((DotNetProject) project);
-			else
-				info.Project = (DotNetProject) project;
-			return info;
+			var ext = project.GetService<GtkProjectServiceExtension> ();
+			if (ext != null)
+				return ext.DesignInfo;
+			return new GtkDesignInfo ();
 		}
 	}	
 }
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
index 14f8981c79..1a9d592dfb 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
@@ -33,9 +33,11 @@ using System.CodeDom;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
-
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp;
+using MonoDevelop.CSharp.Refactoring;
+using MonoDevelop.Refactoring;
 
 namespace MonoDevelop.GtkCore
 {
@@ -143,7 +145,7 @@ namespace MonoDevelop.GtkCore
 			StringCollection tb_names = new StringCollection ();
 			foreach (var cls in parser.GetToolboxItems().Values) {
 				UpdateClass (parser, stetic, cls, null);
-				tb_names.Add (cls.FullName);
+				tb_names.Add (cls.GetFullName ());
 			}
 
 			List<XmlElement> toDelete = new List<XmlElement> ();
@@ -160,9 +162,9 @@ namespace MonoDevelop.GtkCore
 			Save ();
 		}
 
-		void UpdateClass (WidgetParser parser, Stetic.Project stetic, ITypeDefinition widgetClass, ITypeDefinition wrapperClass)
+		void UpdateClass (WidgetParser parser, Stetic.Project stetic, ITypeSymbol widgetClass, ITypeSymbol wrapperClass)
 		{
-			string typeName = widgetClass.FullName;
+			string typeName = widgetClass.GetFullName();
 			string basetypeName = GetBaseType (parser, widgetClass, stetic);
 			XmlElement objectElem = (XmlElement) SelectSingleNode ("objects/object[@type='" + typeName + "']");
 			
@@ -171,14 +173,14 @@ namespace MonoDevelop.GtkCore
 				// The widget class is not yet in the XML file. Create an element for it.
 				objectElem = CreateElement ("object");
 				objectElem.SetAttribute ("type", typeName);
-				string category = parser.GetCategory (widgetClass);
+				string category = widgetClass.GetComponentCategory();
 				if (category == String.Empty)
 					objectElem.SetAttribute ("palette-category", "General");
 				else
 					objectElem.SetAttribute ("palette-category", category);
 				objectElem.SetAttribute ("allow-children", "false");
 				if (wrapperClass != null)
-					objectElem.SetAttribute ("wrapper", wrapperClass.FullName);
+					objectElem.SetAttribute ("wrapper", wrapperClass.GetFullName());
 				
 				// By default add a reference to Gtk.Widget properties and events
 				XmlElement itemGroups = objectElem.OwnerDocument.CreateElement ("itemgroups");
@@ -194,7 +196,7 @@ namespace MonoDevelop.GtkCore
 			UpdateObject (parser, basetypeName, objectElem, widgetClass, wrapperClass);
 		}
 		
-		string GetBaseType (WidgetParser parser, ITypeDefinition widgetClass, Stetic.Project stetic)
+		string GetBaseType (WidgetParser parser, ITypeSymbol widgetClass, Stetic.Project stetic)
 		{
 			string[] types = stetic.GetWidgetTypes ();
 			Hashtable typesHash = new Hashtable ();
@@ -205,9 +207,9 @@ namespace MonoDevelop.GtkCore
 			return ret ?? "Gtk.Widget";
 		}
 		
-		void UpdateObject (WidgetParser parser, string topType, XmlElement objectElem, ITypeDefinition widgetClass, ITypeDefinition wrapperClass)
+		void UpdateObject (WidgetParser parser, string topType, XmlElement objectElem, ITypeSymbol widgetClass, ITypeSymbol wrapperClass)
 		{
-			if (widgetClass.IsPublic)
+			if (widgetClass.DeclaredAccessibility == Accessibility.Public)
 				objectElem.RemoveAttribute ("internal");
 			else
 				objectElem.SetAttribute ("internal", "true");
@@ -219,10 +221,10 @@ namespace MonoDevelop.GtkCore
 			if (wrapperClass != null)
 				parser.CollectMembers (wrapperClass, false, null, properties, events);
 			
-			foreach (IProperty prop in properties.Values)
+			foreach (IPropertySymbol prop in properties.Values)
 				MergeProperty (parser, objectElem, prop);
 			
-			foreach (IEvent ev in events.Values)
+			foreach (IEventSymbol ev in events.Values)
 				MergeEvent (parser, objectElem, ev);
 			
 			// Remove old properties
@@ -246,7 +248,7 @@ namespace MonoDevelop.GtkCore
 			}
 		}
 		
-		void MergeProperty (WidgetParser parser, XmlElement objectElem, IProperty prop)
+		void MergeProperty (WidgetParser parser, XmlElement objectElem, IPropertySymbol prop)
 		{
 			XmlElement itemGroups = objectElem ["itemgroups"];
 			if (itemGroups == null) {
@@ -254,8 +256,8 @@ namespace MonoDevelop.GtkCore
 				objectElem.AppendChild (itemGroups);
 			}
 			
-			string cat = parser.GetCategory (prop);
-			XmlElement itemGroup = GetItemGroup (prop.DeclaringType, itemGroups, cat, "Properties");
+			string cat = prop.GetComponentCategory ();
+			XmlElement itemGroup = GetItemGroup (prop.ContainingType, itemGroups, cat, "Properties");
 			
 			XmlElement propElem = (XmlElement) itemGroup.SelectSingleNode ("property[@name='" + prop.Name + "']");
 			if (propElem == null) {
@@ -265,7 +267,7 @@ namespace MonoDevelop.GtkCore
 			}
 		}
 		
-		void MergeEvent (WidgetParser parser, XmlElement objectElem, IEvent evnt)
+		void MergeEvent (WidgetParser parser, XmlElement objectElem, IEventSymbol evnt)
 		{
 			XmlElement itemGroups = objectElem ["signals"];
 			if (itemGroups == null) {
@@ -273,8 +275,8 @@ namespace MonoDevelop.GtkCore
 				objectElem.AppendChild (itemGroups);
 			}
 			
-			string cat = parser.GetCategory (evnt);
-			XmlElement itemGroup = GetItemGroup (evnt.DeclaringType, itemGroups, cat, "Signals");
+			string cat = evnt.GetComponentCategory ();
+			XmlElement itemGroup = GetItemGroup (evnt.ContainingType, itemGroups, cat, "Signals");
 			
 			XmlElement signalElem = (XmlElement) itemGroup.SelectSingleNode ("signal[@name='" + evnt.Name + "']");
 			if (signalElem == null) {
@@ -284,7 +286,7 @@ namespace MonoDevelop.GtkCore
 			}
 		}
 		
-		XmlElement GetItemGroup (IType cls, XmlElement itemGroups, string cat, string groupName)
+		XmlElement GetItemGroup (ITypeSymbol cls, XmlElement itemGroups, string cat, string groupName)
 		{
 			XmlElement itemGroup;
 			
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
index e1c46517d8..6128a6a9bf 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
@@ -65,7 +65,7 @@ namespace MonoDevelop.GtkCore
 		public Stetic.ResourceInfo AddResource (string fileName)
 		{
 			ProjectFile file = project.AddFile (fileName, BuildAction.EmbeddedResource);
-			IdeApp.ProjectOperations.Save (project);
+			IdeApp.ProjectOperations.SaveAsync (project);
 			return new Stetic.ResourceInfo (file.ResourceId, fileName);
 		}
 		
@@ -74,7 +74,7 @@ namespace MonoDevelop.GtkCore
 			foreach (ProjectFile file in project.Files) {
 				if (resourceName == file.ResourceId) {
 					project.Files.Remove (file);
-					IdeApp.ProjectOperations.Save (project);
+					IdeApp.ProjectOperations.SaveAsync (project);
 					return;
 				}
 			}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
index c3358977e4..f765f2a8f8 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
@@ -156,16 +156,16 @@ namespace MonoDevelop.GtkCore {
 				if (version != assm_version) {
 					project.References.Remove (r);
 					if (name == "gnome-sharp" && assm_version == "Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f") {
-						project.References.Add (new ProjectReference (ReferenceType.Package, name + ", Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"));
+						project.References.Add (ProjectReference.CreateAssemblyReference (name + ", Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"));
 					} else {
-						project.References.Add (new ProjectReference (ReferenceType.Package, name + ", " + assm_version));
+						project.References.Add (ProjectReference.CreateAssemblyReference (name + ", " + assm_version));
 					}
 					changed = true;
 				}
 			}
 
 			if (!gtk) {
-				project.References.Add (new ProjectReference (ReferenceType.Package, "gtk-sharp" + ", " + assm_version));
+				project.References.Add (ProjectReference.CreateAssemblyReference ("gtk-sharp" + ", " + assm_version));
 				project.ExtendedProperties ["GtkReferenceExists"] = true;
 				changed = true;
 			}
@@ -175,7 +175,7 @@ namespace MonoDevelop.GtkCore {
 
 			GtkDesignInfo info = GtkDesignInfo.FromProject (project);
 			if (!gdk) {
-				project.References.Add (new ProjectReference (ReferenceType.Package, "gdk-sharp" + ", " + assm_version));
+				project.References.Add (ProjectReference.CreateAssemblyReference ("gdk-sharp" + ", " + assm_version));
 				changed = true;
 			}
 				
@@ -185,7 +185,7 @@ namespace MonoDevelop.GtkCore {
 				if (aname != null) {
 					aname = project.AssemblyContext.GetAssemblyNameForVersion (aname, project.TargetFramework);
 					if (aname != null) {
-						project.References.Add (new ProjectReference (ReferenceType.Package, aname));
+						project.References.Add (ProjectReference.CreateAssemblyReference (aname));
 						changed = true;
 					}
 				}
@@ -231,7 +231,7 @@ namespace MonoDevelop.GtkCore {
 				dnp.ExtendedProperties ["GtkReferenceExists"] = false;
 				GtkDesignInfo.DisableProject (dnp);
 			} else
-				dnp.References.Add (new ProjectReference (ReferenceType.Package, args.ProjectReference.StoredReference));
+				dnp.References.Add (ProjectReference.CreateAssemblyReference (args.ProjectReference.StoredReference));
 		}
 
 		static string GetReferenceName (ProjectReference pref)
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
index 68161a0a33..898b68a8cc 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs
@@ -77,7 +77,7 @@ namespace MonoDevelop.GtkCore
 			return (project is DotNetProject) && GtkDesignInfo.SupportsRefactoring (project as DotNetProject);
 		}
 		
-		public override bool AddToProject (SolutionItem policyParent, Project project, string language, string directory, string name)
+		public override bool AddToProject (SolutionFolderItem policyParent, Project project, string language, string directory, string name)
 		{
 			if (!GtkDesignInfo.SupportsDesigner (project)) {
 				ReferenceManager mgr = new ReferenceManager (project as DotNetProject);
@@ -92,8 +92,8 @@ namespace MonoDevelop.GtkCore
 			string fileName = fileTemplate.GetFileName (policyParent, project, language, directory, name);
 			fileTemplate.AddToProject (policyParent, project, language, directory, name);
 
-			TypeSystemService.ParseFile (project, fileName);
-			
+			FileService.NotifyFileChanged (fileName);
+
 			DotNetProject netProject = project as DotNetProject;
 			string ns = netProject != null ? netProject.GetDefaultNamespace (fileName) : "";
 			string cname = Path.GetFileNameWithoutExtension (fileName);
@@ -114,7 +114,7 @@ namespace MonoDevelop.GtkCore
 				
 				gproject.AddNewComponent (doc.DocumentElement);
 				gproject.SaveAll (false);
-				IdeApp.ProjectOperations.Save (project);
+				IdeApp.ProjectOperations.SaveAsync (project);
 				return true;
 			}
 			
@@ -128,7 +128,7 @@ namespace MonoDevelop.GtkCore
 				
 				gproject.SteticProject.AddNewActionGroup (doc.DocumentElement);
 				gproject.SaveAll (false);
-				IdeApp.ProjectOperations.Save (project);
+				IdeApp.ProjectOperations.SaveAsync (project);
 				return true;
 			}
 			
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
index 71d2d8d953..4a8a594040 100755..100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
@@ -33,193 +33,99 @@ using System.CodeDom;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
+using Microsoft.CodeAnalysis;
+using ICSharpCode.NRefactory6.CSharp.Completion;
+using System.Linq;
+using ICSharpCode.NRefactory6.CSharp;
 
 namespace MonoDevelop.GtkCore
 {
 
 	public class WidgetParser
 	{
-		ICompilation ctx;
+		Compilation ctx;
 
-		public ICompilation Ctx {
+		public Compilation Ctx {
 			get {
 				return ctx;
 			}
 		}
 		
-		public WidgetParser (ICompilation ctx)
+		public WidgetParser (Compilation ctx)
 		{
 			this.ctx = ctx;
 		}
 		
-		public Dictionary<string, ITypeDefinition> GetToolboxItems ()
+		static bool IsWidget(INamedTypeSymbol type)
 		{
-			Dictionary<string, ITypeDefinition> tb_items = new Dictionary<string, ITypeDefinition> ();
+			if (type.SpecialType == SpecialType.System_Object)
+				return false;
+			if (type.GetFullName () == "Gtk.Widget")
+				return true;
+			
+			return IsWidget (type.BaseType);
+		}
+		
+		public Dictionary<string, INamedTypeSymbol> GetToolboxItems ()
+		{
+			var tb_items = new Dictionary<string, INamedTypeSymbol> ();
 
-			var wt = ctx.FindType (new FullTypeName ("Gtk.Widget"));
-			if (wt != null && !(wt is UnknownType)) {
-				foreach (var t in wt.GetSubTypeDefinitions ()) {
-					if (IsToolboxWidget (t))
-						tb_items [t.FullName] = t;
-				}
+			foreach (var t in ctx.GetAllTypesInMainAssembly ()) {
+				if (t.IsToolboxItem() && IsWidget(t))
+					tb_items [t.GetFullName ()] = t;
 			}
 			
 			return tb_items;
 		}
 
-		public void CollectMembers (ITypeDefinition cls, bool inherited, string topType, ListDictionary properties, ListDictionary events)
+		public void CollectMembers (ITypeSymbol cls, bool inherited, string topType, ListDictionary properties, ListDictionary events)
 		{
-			if (cls.FullName == topType)
+			if (cls.GetFullName () == topType)
 				return;
 
-			foreach (IProperty prop in cls.Properties)
+			foreach (var prop in cls.GetMembers ().OfType<IPropertySymbol> ())
 				if (IsBrowsable (prop))
 					properties [prop.Name] = prop;
 
-			foreach (IEvent ev in cls.Events)
+			foreach (var ev in cls.GetMembers ().OfType<IEventSymbol> ())
 				if (IsBrowsable (ev))
 					events [ev.Name] = ev;
 					
 			if (inherited) {
-				foreach (var bcls in cls.DirectBaseTypes) {
-					if (bcls.GetDefinition () != null && bcls.Kind != TypeKind.Class)
-						CollectMembers (bcls.GetDefinition (), true, topType, properties, events);
-				}
+				CollectMembers (cls.BaseType, true, topType, properties, events);
 			}
 		}
 		
-		public string GetBaseType (ITypeDefinition cls, Hashtable knownTypes)
+		public string GetBaseType (ITypeSymbol cls, Hashtable knownTypes)
 		{
-			foreach (var bt in cls.DirectBaseTypes) {
-				string name = bt.ReflectionName;
-				if (knownTypes.Contains (name))
-					return name;
-			}
-
-			foreach (var bcls in cls.DirectBaseTypes) {
-				if (bcls.GetDefinition () != null) {
-					string ret = GetBaseType (bcls.GetDefinition (), knownTypes);
-					if (ret != null)
-						return ret;
-				}
-			}
-			return null;
+			if (cls.SpecialType == SpecialType.System_Object)
+				return null;
+			if (knownTypes.Contains (cls.BaseType.GetFullName ()))
+				return cls.BaseType.GetFullName ();
+			return GetBaseType (cls.BaseType, knownTypes);
 		}
 		
-		public string GetCategory (IEntity decoration)
-		{
-//			foreach (IAttributeSection section in decoration.Attributes) {
-				foreach (IAttribute at in decoration.Attributes) {
-					var type = at.AttributeType;
-					switch (type.ReflectionName) {
-					case "Category":
-					case "CategoryAttribute":
-					case "System.ComponentModel.Category":
-					case "System.ComponentModel.CategoryAttribute":
-						break;
-					default:
-						continue;
-					}
-					var pargs = at.PositionalArguments;
-					if (pargs != null && pargs.Count > 0) {
-						var val = pargs[0] as ConstantResolveResult;
-						if (val != null && val.ConstantValue is string)
-							return val.ConstantValue.ToString ();
-					}
-				}
-	//	}
-			return "";
-		}
 		
-		public ITypeDefinition GetClass (string classname)
+		public INamedTypeSymbol GetClass (string classname)
 		{
-			string name, ns;
-			int idx =classname.LastIndexOf ('.');
-			if (idx >= 0){
-				ns = classname.Substring (0, idx);
-				name = classname.Substring (idx + 1);
-			} else {
-				ns = "";
-				name = classname;
-			}
-			return ctx.MainAssembly.GetTypeDefinition (ns, name, 0);
+			return ctx.GetTypeByMetadataName (classname);
 		}
 
-		public bool IsBrowsable (IMember member)
+		public bool IsBrowsable (ISymbol member)
 		{
-			if (!member.IsPublic)
+			if (member.DeclaredAccessibility != Accessibility.Public)
 				return false;
 
-			IProperty prop = member as IProperty;
+			var prop = member as IPropertySymbol;
 			if (prop != null) {
-				if (!prop.CanGet || !prop.CanSet)
+				if (prop.GetMethod == null || prop.SetMethod == null)
 					return false;
-				if (Array.IndexOf (supported_types, prop.ReturnType.ReflectionName) == -1)
+				if (Array.IndexOf (supported_types, prop.Type.GetFullName ()) == -1)
 					return false;
 			}
 
-	//		foreach (IAttributeSection section in member.Attributes) {
-				foreach (IAttribute at in member.Attributes) {
-					var type = at.AttributeType;
-					switch (type.ReflectionName) {
-					case "Browsable":
-					case "BrowsableAttribute":
-					case "System.ComponentModel.Browsable":
-					case "System.ComponentModel.BrowsableAttribute":
-						break;
-					default:
-						continue;
-					}
-					var pargs = at.PositionalArguments;
-					if (pargs != null && pargs.Count > 0) {
-						var val = pargs[0] as ConstantResolveResult;
-						if (val.ConstantValue is bool) {
-							return (bool) val.ConstantValue;
-						}
-					}
-				}
-		//	}
-			return true;
-		}
-		
-		public bool IsToolboxWidget (ITypeDefinition cls)
-		{
-			if (!cls.IsPublic)
-				return false;
-
-			foreach (IAttribute at in cls.Attributes) {
-				var type = at.AttributeType;
-				switch (type.ReflectionName) {
-				case "ToolboxItem":
-				case "ToolboxItemAttribute":
-				case "System.ComponentModel.ToolboxItem":
-				case "System.ComponentModel.ToolboxItemAttribute":
-					break;
-				default:
-					continue;
-				}
-				var pargs = at.PositionalArguments;
-				if (pargs != null && pargs.Count > 0) {
-					var val = pargs[0] as ConstantResolveResult;
-					if (val.ConstantValue == null)
-						return false;
-					else if (val.ConstantValue is bool)
-						return (bool) val.ConstantValue;
-					else 
-						return val.ConstantValue != null;
-				}
-			}
-
-			foreach (var bcls in cls.DirectBaseTypes) {
-				if (bcls.GetDefinition () != null && bcls.Kind != TypeKind.Interface)
-					return IsToolboxWidget (bcls.GetDefinition ());
-			}
-
-			return false;
+			return member.IsDesignerBrowsable ();
 		}
 		
 		static string[] supported_types = new string[] {
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/ChangeLog b/main/src/addins/MonoDevelop.GtkCore/libstetic/ChangeLog
deleted file mode 100644
index 70f98ba295..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/ChangeLog
+++ /dev/null
@@ -1,1748 +0,0 @@
-2010-06-09  Mike Krüger  <mkrueger@novell.com>
-
-	* DND.cs: Fixed stetic crash when drag & drop widgets on mac.
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GladeUtils.cs:
-	* wrapper/objects.xml:
-	* wrapper/ActionToolbarWrapper.cs: Allow setting "System
-	  Default" as icon size. Fixed handling of default toolbar
-	  style. Should fix bug #609132 - Large toolbar reverts to
-	  small toolbar after compiling program.
-
-2010-04-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* editor/ActionMenu.cs: Explicit destroy of children should
-	  not be required.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* editor/ActionMenu.cs: moved code from dispose -> destroy.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* editor/ActionMenu.cs:
-	* editor/ActionToolbar.cs:
-	* editor/ActionMenuBar.cs: Destroy gtk components instead of
-	  disposing them.
-
-2010-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GladeUtils.cs: Fix glade import. GtkWindow and GtkDialog
-	  need to be special cased, since we are not creating real
-	  Gtk.Window objects anymore.
-
-2010-04-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Misc.cs: Show alignment buttons as toggles.
-
-2010-03-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Widget.cs:
-	* wrapper/Container.cs: When setting the name of a widget,
-	  make sure the old name field is also set. Fixes bug #549463
-	  - Forms designer renames variables it shouldn't.
-
-2010-01-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* TypedPropertyDescriptor.cs: Don't translate property names
-	  in the property grid. See bug #571351.
-
-2010-01-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GeneratorContext.cs: When loading an icon, don't hardcode
-	  the required size. Instead, call SizeLookup to get the
-	  correct size for the current theme.
-
-2010-01-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* ImageInfo.cs:
-	* wrapper/Bin.cs:
-	* WidgetUtils.cs:
-	* libstetic.csproj:
-	* ObjectWrapper.cs:
-	* wrapper/Action.cs:
-	* wrapper/Widget.cs:
-	* wrapper/VScale.cs:
-	* wrapper/HScale.cs:
-	* wrapper/MenuBar.cs:
-	* wrapper/Expander.cs:
-	* GeneratorContext.cs:
-	* wrapper/Notebook.cs:
-	* wrapper/ComboBox.cs:
-	* wrapper/Container.cs:
-	* RadioGroupManager.cs:
-	* wrapper/VScrollbar.cs:
-	* ProjectIconFactory.cs:
-	* wrapper/HScrollbar.cs:
-	* wrapper/ToolButton.cs:
-	* wrapper/ActionTree.cs:
-	* wrapper/ActionGroup.cs:
-	* wrapper/ComboBoxEntry.cs:
-	* wrapper/ActionToolbarWrapper.cs:
-	* wrapper/RadioActionGroupManager.cs: Use global:: for type
-	  references in generated code. 
-
-	* Placeholder.cs:
-	* editor/Flags.cs:
-	* editor/Enumeration.cs:
-	* editor/ActionMenuItem.cs:
-	* editor/ActionToolItem.cs: Fix warnings.
-
-2009-12-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.csproj: Flush.
-
-2009-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Table.cs: Fix table creation issue. Sync call has no
-	  effect while loading a widget.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Widget.cs: Fix check for top level window.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* wrapper/MenuBar.cs:
-	* wrapper/ActionToolbarWrapper.cs: Propagate the menu name to
-	  the action tree. Fixes bug #540512.
-
-2009-11-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ObjectReader.cs:
-	* ObjectWrapper.cs:
-	* ClassDescriptor.cs: Ensure the Loading flag is set when
-	  loading internal children of a widget.
-
-2009-11-05  Mike Kestner  <mkestner@novell.com>
-
-	* wrapper/*.cs: improper new keyword warning cleanup.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* libstetic.csproj: Reference mono-cairo package.
-
-2009-10-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Widget.cs: Don't fire the name changed event while
-	  loading.
-
-	* wrapper/Container.cs: Set the loading flag when loading.
-
-2009-10-16  Mike Krüger  <mkrueger@novell.com>
-
-	* DND.cs:
-	* WidgetUtils.cs:
-	* CommandDescriptor.cs:
-	* editor/Translatable.cs:
-	* editor/ActionMenuItem.cs: Handled icon loading failures.
-
-2009-09-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Paned.cs: Avoid unnecessary Changed event.
-
-2009-09-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper\Paned.cs: Restore the paned position after
-	  realizing. It may have been reset during the realization.
-	  Fixes bug #542227.
-
-2009-09-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Widget.cs: Fire name change event when name changes.
-	  Fixes bug #540512 - NullReferenceException in stetic
-	  generated code.
-
-2009-09-10  Christian Hergert  <chris@dronelabs.com>
-
-	* libstetic/libstetic.dll.config: Use quartz on osx.
-
-2009-09-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Action.cs: For stock gtk and gnome icons, use the
-	  stock id as base name for the action identifier. Fixes bug
-	  #525571.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.csproj: Updated dependencies. We now depend on
-	  gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Container.cs: Properly validate widget ids when
-	  pasting a child. If there is a conflict, the child has to be
-	  modified. Fixes bug #530086 - When copy/pasting widgets in
-	  stetic, the original is renamed.
-
-2009-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Notebook.cs: Fix issue with adding a widget with
-	  ShowScrollbars=true to a notebook. Fixes bug 526434 -
-	  Notebook Tab Labels Revert Back to "Page 1".
-
-2009-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/ComboBox.cs:
-	* wrapper/ComboBoxEntry.cs: Changed the sensitivity mode to
-	  'always on'. Since gtk+ 2.14, empty combos are disabled by
-	  default.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Fix invalid xml.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Fix some default values.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Make sure the default value for
-	  HasSeparator is true.
-
-2009-07-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Removed Version=2.6.0.0 specification
-	  from Pango.EllipsizeMode type. This allows other GTK
-	  versions to work. Patch by Daniel Newton.
-
-
-2009-07-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ClassDescriptor.cs: When creating a widget instance,
-	  initialize the properties after creating the wrapper, since
-	  some properties may be implemented in the wrapper. This
-	  should fix bug #505083 - hbuttonbox1.cs file being created
-	  in gtk-gui causing problems with compilation.
-
-2009-05-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Placeholder.cs:
-	* libstetic.csproj: Improved the look of placeholders.
-
-2009-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ItemDescriptor.cs: Added missing BindingFlags.Instance flag.
-
-	* wrapper/Container.cs: Fix bug when showing the selection
-	  box.
-
-	* TopLevelWindow.cs:
-	* TopLevelDialog.cs:
-	* wrapper/Dialog.cs:
-	* wrapper/Window.cs:
-	* wrapper/objects.xml: Top level windows are not represented
-	  using a Gtk.Window anymore at design time. Instead they are
-	  represented by TopLevelWindow. This is a regular widget, so
-	  window embedding hacks are not required anymore. The same
-	  has been done for Gtk.Dialog/TopLevelDialog.
-
-	* libstetic.csproj: Added new files.
-
-	* Makefile.am: Updated.
-
-	* DND.cs: Accept copy as drop target. Fixed the target list.
-
-	* TypedClassDescriptor.cs: Invocation of a constructor does
-	  not need an instance reference.
-
-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Registry.cs: Make sure GetType can find the type when the
-	  provided assembly name does not have version info.
-
-	* libstetic.csproj: Copy the config file to the output dir.
-
-	* TypedPropertyDescriptor.cs: Catch ambiguous match exception
-	  when looking for properties. 
-
-2009-04-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.csproj: Don't require a specific gtk# version.
-
-2009-03-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Registry.cs:
-	* WidgetLibrary.cs: Flush cached data when closing a change
-	  set.
-
-2009-02-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Table.cs:
-	* wrapper/objects.xml: A better fix for the default row/column
-	  issue.
-
-2009-02-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* libstetic.csproj: Don't build with make, since MD can build
-	  these just fine.
-
-2009-02-07  Mike Krüger  <mkrueger@novell.com>
-
-	* GladeUtils.cs: fixed compiler warning.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.mdp:
-	* libstetic.csproj: Migrated to MSBuild file format.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* libstetic.mdp: Flush project format changes.
-
-2009-01-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Added some defaults.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.mdp: All projects now require fx 3.5.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* PropertyDescriptor.cs: Use invariant culture when converting types.
-
-2008-07-27  Mike Krüger <mkrueger@novell.com> 
-
-	
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp: Removed some unused glade
-	  and gnome-sharp references (only the unused). But I'll continue to
-	  remove glade, we need to lower the dependency tree a bit.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added IViewContent
-	  switching logic (but should be done centrally using the secondaryview
-	  paradigmn).
-
-2008-02-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Workaround for mono bug
-	  #350432.
-
-2008-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Handle the delete
-	  key in TreeViewPad, so it will work event if the shortcut is not
-	  defined.
-
-2008-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  icons/pad-widget-tree-16.png: Added widget tree icon.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Update MD version.
-
-2008-01-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Made internal
-	  some classes that don't need to be public.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Notify file changes
-	  through the FileService.
-
-2008-01-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Stetic code must be
-	  generated in the GUI thread. Should fix bug #349505.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Feed default layout
-	  name to Gettext for translation.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/ActionGroupPartial.xft.xml,
-	  templates/Window.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Make template
-	  categories translatable.
-
-2008-01-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Added null check on the
-	  result of UpdateFile. Should fix bug #352194.
-
-2008-01-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Handle
-	  projects which don't support the GTK# designer. Window and widget
-	  generation options are hidden, and code is never generated. Fixes bug
-	  #350632.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Don't update bindings if the
-	  file has syntax errors. May fix bug #347590.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump add-in versions.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am: Update after build reorg.
-
-2007-12-06  Geoff Norton  <gnorton@novell.com>
-
-	* Makefile.am: Only build the GtkCore addin if we have gnome-sharp 
-	  available.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  Makefile.am: Directory reorganization.
-
-2007-11-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: Removed
-	  Gnome.FileEntry.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Track
-	  LoggingService API changes.
-
-2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Use RootCombine
-	  instead of CurrentOpenCombine when possible.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fix nullref. Happens
-	  when removing a project from a solution while one of the windows of that
-	  project is open.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/ActionGroup.xft.xml, templates/ActionGroupPartial.xft.xml,
-	  templates/Dialog.xft.xml, templates/DialogPartial.xft.xml,
-	  templates/Widget.xft.xml, templates/WidgetPartial.xft.xml,
-	  templates/Window.xft.xml, templates/WindowPartial.xft.xml: Use tango
-	  file icons. Removed obsolete icons.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Track api changes. Added
-	  Description property.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.mdp, lib/libstetic.mdp: Project file names updated by
-	  change in MD path functions.
-
-2007-10-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mds, Makefile.am: Added custom command for updating
-	  the Stetic sources.
-
-2007-10-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Set a more meaningful category name for
-	  addin commands.
-	* MonoDevelop.GtkCore.mdp, MonoDevelop.GtkCore.mds: Updated.
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: If the current selection
-	  can't be deleted, just ignore the delete command, so the default handler
-	  will be executed. Fixes bug #325440.
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.mdp: Fix required gtk# version.
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Applied changes that
-	  were neccassary for to the new FileService.
-
-2007-10-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Changed calls for
-	  the new StringParser.
-
-2007-10-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: In Bind(), don't subscribe the
-	  NameChanged event at every call.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: The designer needs to
-	  be explicitely destroyed.
-
-2007-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: No need to implement
-	  IComparable; it's done in the base class now.
-
-2007-09-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Assign the selected
-	  target gtk# version to the new project.
-
-2007-09-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Use ProjectReference.StoredReference
-	  rather than ProjectReference.Reference, in order to refer to the actual
-	  stored reference string rather than a temporarily bumped version.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Implemented an
-	  assembly resolver for the stetic app, so assembly widgets registered
-	  with .pc files can be found.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: If a widget dll belongs
-	  to a package, store it as a package reference in the toolbox index.
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Allow setting TargetGtkVersion to
-	  DefaultGtkVersion when current value is null.
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Don't touch GTK# assembly versions
-	  when a target version is not set. Don't use gtkVersion=null to represent
-	  default version.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Set TargetGtkVersion on new
-	  projects. Bump default version to 2.8.
-
-2007-09-17  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  lib/Makefile.am, MonoDevelop.GtkCore.mds, Makefile.am: Use projects for
-	  imported stetic libraries.
-
-2007-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Removed access to
-	  Component object.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Remove unused method.
-
-2007-09-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: Fix warnings.
-
-2007-09-13  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* lib/stetic, Makefile.am, lib/Makefile.am: Build stetic from 
-	  svn:externals.
-	* lib/libsteticui.dll.config, lib/libstetic.dll.config,
-	  lib/libstetic.dll, lib/libsteticui.dll: Removed.
-
-2007-09-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Remove
-	  deprecated FileOptions element from templates.
-
-2007-09-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Changed the way to
-	  set the active designer (the api changed). Fixed some renaming issues.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Track api changes.
-
-2007-09-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/Window.xft.xml: Oops, PartialTypeSupport should be set to
-	  Disabled for non-partial window.
-
-2007-09-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs: Use DotNetProject.UsePartialTypes
-	  instead of custom setting.
-	* MonoDevelop.GtkCore/WidgetFileTemplatePartialClass.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplateFullClass.cs: No longer needed.
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Use
-	  PartialTypes condition instead of custom file template.
-
-2007-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fixes for bugs #82671, #82527, #82476, #81763 and #81238.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs: Changes due to new
-	  property infrastructure.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs: By default use the project name
-	  as category name for new custom widgets.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Don't show the full
-	  name of widgets in the toolbar.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: In FindClass, make
-	  sure the getUserClass parameter is taken into account when the found
-	  class is not a multi-part class. Fixes bug #82258.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Removed the CommandService class.
-	  Everything is done directly with CommandManager. Moved all extension
-	  node types to MD.Components.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp, Makefile.am: Reorganized the extension point
-	  hierarchy. Embedded all add-in manifests as resources.
-	* lib/libstetic.dll: Updated from stetic module.
-
-2007-08-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Improved error
-	  reporting.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Converted
-	  DispatchService to a static class.
-
-2007-08-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated.
-
-2007-07-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed some
-	  problems with the target gtk version. It was not assigned to the
-	  stetic project. Also fixed some stock icon rendering issues in
-	  Stetic.
-
-2007-07-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes a nullref fix.
-
-2007-07-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Layout switch
-	  delay is not needed anymore.
-
-2007-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Fix nullref
-	  when gtk support is not enabled. Patch by Chris Howie.
-
-2007-07-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Don't try to use the CurrentNode property after adding the file,
-	  since it may have changed. Should fix bug #82123.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	  Fixes bugs #81846 and #82144.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix window
-	  source file lookup.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Use the new methods
-	  for checking clipboard operations on the current selection.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Include the
-	  current project in the list of libraries to show in the toolbox.
-	  Fixes bug #82125.
-
-2007-07-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated. Fixes bugs 81977,
-	  81810 and 82052.
-
-2007-07-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Properly rename
-	  fields when the widget name is changed. Fixes bug #81976.
-
-2007-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Update the
-	  properties pad when the focus is on the widget tree pad. Fixes bug
-	  #81971.
-
-2007-07-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added null
-	  check.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track api changes
-	  in DesignerSupport. When adding a project reference to a widget
-	  library, take into account that widgets may be implemented in a
-	  library different from the one providing the widget list.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: In
-	  GetDynamicItems, only return widgets provided by libraries
-	  referenced by the project. Don't return widgets from libstetic
-	  since those are already included by default in the toolbox.
-	  Implemented IToolboxDefaultProvider.
-
-2007-07-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Changed a bit
-	  because of the removal of custom collections in the Ide project.
-
-2007-06-30 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* gui.glade: Fixed capitalization.
-
-2007-06-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: Don't show windows
-	  in the toolbox.
-	* lib/libstetic.dll, lib/libsteticui.dll: Updated from Stetic module.
-
-2007-06-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Allow selecting
-	  the target GTK# version of the project.
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Implemented a
-	  toolbox loader, which allows registering assemblies in the toolbox.
-	  When a widget from a toolbox is dropped to a window, MD will now
-	  add a reference to the required assembly.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll: One last update.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Set the import
-	  file callback when editing project stock icons.
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: The GetResources
-	  method only returns resource files now.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-06-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Default pad
-	  placement is now specified in the xml file.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: In GetBaseType, use
-	  Project.GetWidgetTypes to get all registered wiget types, including
-	  base widget types (which were not provided by GetComponentTypes).
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fix for bug #81785.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Don't include non-public
-	  members to the objects.xml file.
-
-2007-05-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Fix feature message.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	  Includes fixes for bugs #81761, #81758 and #81762.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	  (UpdateLibraries) Properly check for library changes.
-
-2007-05-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Fixes bugs #80783 and #81683.
-
-2007-05-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Added new dependency.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn. Fixes bug
-	  #81590.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When selecting an
-	  image file in the widget designer, import the file into the
-	  project.
-
-2007-05-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added some delay
-	  in the code that changes the workbench layout when selecting the
-	  designer. Fixes bug #80963.
-
-2007-05-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPalettePad.cs: Removed old
-	  palette pad.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Set the 'internal' flag for
-	  widgets implemented by private classes.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn module.
-	  Fixes bugs #80875, #81261, #81365.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: If the project
-	  is a library, add itself as an internal widget library, so widgets
-	  with internal visibility will be shown.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: When saving a window,
-	  use the visibility of the class to set the visibility of the
-	  component. Together with all changes done in stetic, fixes bug
-	  #80875.
-
-2007-05-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Track api changes in
-	  Stetic.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Delay
-	  library updating until really necessary.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Copy the .addins.xml file to the output dir.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Copy stetic dlls together with the assembly.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Reference shared assemblies
-	  from the correct location.
-
-2007-05-04  Wade Berrier  <wberrier@novell.com> 
-	* lib/libstetic.dll.config:
-	* lib/libsteticui.dll.config:
-	Fix os attribute formats (mono-config.c separates oses by comma, 
-	and ignores or includes the whole string.)
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am:
-	  Migration to Mono.Addins.
-
-2007-04-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs, Makefile.am:
-	  Implemented project feature for enabling gtk# support in new
-	  projects.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Use
-	  Menu icon size in the project pad.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-04-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show a
-	  relative path in the window delete confirm dialog, since the
-	  absolute path may take too much space.
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Add
-	  Ok/Cancel buttons by default in new dialogs.
-
-2007-03-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fixes for bugs 81033, 81086, 81239, 81143, 81014 and
-	  81015.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Allow pasting when
-	  a placeholder is selected. Fixes bug #81246.
-
-2007-03-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp, Makefile.am, icons/image-x-generic.png:
-	  Show a "Stock Icons" node in the User Interface folder. It's easier
-	  to discover than the context menu option.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.Commands/GladeCommands.cs: Added menu option
-	  for opening the gtk# settings.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Don't crash if
-	  the gtk-gui folder doesn't exist. Fixes bug #81152.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Hide the border
-	  of the combined view notebook.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated from stetic module. Fixes NRE crash.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Fix null ref.
-
-2007-03-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Register a new toolbox loader. Removed
-	  old properties pads.
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Added reference to
-	  MonoDevelop.DesignerSupport.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Integrate Stetic
-	  widgets in the main toolbox.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Implement
-	  ICustomPropertyPadProvider and return the Stetic property pad.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Renamed.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Fix warning.
-
-2007-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	Updated from Stetic module. Includes fix for bug #80864.
-
-2007-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from SVN. Fixes some
-	  memory leaks and bug #79453.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Explicitely
-	  destroy notebook children, since notebook doesnt do it because of a
-	  gtk bug.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Some fixes in the
-	  dispose code.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Use
-	  ProjectOperations.SaveProject to save projects.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix nullref.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Log
-	  error message.
-	* Makefile.am, MonoDevelop.GtkCore.mdp: Synchronized MD project and
-	  makefile.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Avoid throwing
-	  delayed events after the project has been disposed.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added missing
-	  null check.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Ask for user
-	  confirmation when reloading a designer only when the designer has
-	  unsaved changes.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Detect external
-	  changes in the gui.stetic files, and reload it when it changes.
-	  Take into account that the load of gui.stetic can fail. Added
-	  several workarounds for this case.
-
-2007-02-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from SVN. Includes
-	  fixes for bugs #80722, #79427 and #80127.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Store some
-	  Stetic configuration in the MD properties.
-
-2007-02-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added options
-	  for enabling/disabling gtk support, and for gettext support.
-	* MonoDevelop.GtkCore.addin.xml: Change options panel name.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Make sure the
-	  MD project is saved together with the stetic project, if necessary.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Avoid saving
-	  the MD project twice.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: If gtk
-	  integration status changes for a project, refresh the tree.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Null check.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for gettext and
-	  gettext class options for generated code.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Added events for notifying
-	  when the gtk integration status changes for a project.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am: distcheck fixes
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When a designer
-	  project is disposed, hide the designer view in the editor.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Factorized some code into GtkDesignInfo.
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Make sure the code generation
-	  extension is executed before the last step.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Hide the add window commands when the project is not DotNet
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.dll, lib/libstetic.dll:
-	  Updated.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Intercept calls
-	  to the IPositionable interface, and show the editor page when
-	  jumping to a line.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: When looking for
-	  the window class, avoid returning the generated partial class.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Show the editor
-	  page when jumping to a signal handler.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Warn the user if
-	  the gtk-sharp-2 package can't be found. Some distros don't include
-	  the .pc file in the gtk# package, only in the -devel package.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-01-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll.config, lib/libsteticui.dll, lib/libstetic.dll,
-	  lib/libsteticui.dll.config: Updated from Stetic module.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Track api
-	  changes in Document class.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated form Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Removed
-	  implementation of all text editor interfaces. Now the view
-	  overrides GetContent and calls editor.GetContent when a requested
-	  interface is not found.
-
-2007-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Removed unused namespace.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Use the new base-type property
-	  to describe custom widgets. When looking for properties and events,
-	  look in the base classes as well as in the widget class.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectSignalDescriptor.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectPropertyDescriptor.cs:
-	  Removed unused files. All widget library functionality has been
-	  moved to stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Removed all
-	  widget library management, which has been moved to Stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Added some null checks.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Use the new way
-	  of managing dependencies in projects.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml: The
-	  window constructor now takes the window type.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Some gui
-	  improvements and added some null checks.
-
-2007-01-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't crash if the
-	  designer can't be loaded for some reason.
-
-2007-01-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplatePartialClass.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplateFullClass.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs,
-	  templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml,
-	  templates/ActionGroup.xft.xml, templates/DialogPartial.xft.xml,
-	  templates/Dialog.xft.xml: Implemented support for generating code
-	  in partial classes.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Use the
-	  correct method for saving the project.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Refresh the user
-	  interface folder when the gui project is reloaded.
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for partial
-	  classes. In the GuiBuilderProject property, don't update the
-	  gtk-gui folder since this call may change the contents of the
-	  project, and weird things happen when called by the project pad to
-	  fill the tree.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am: Added new files.
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	  Make it work even when the assembly it references has been deleted
-	  (maybe as a result of cleaning a project). In this case the widget
-	  library is shown as empty.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added support
-	  for Loading/Unloading a project, to optimize use of memory for
-	  solutions with many gui projects. Implemented support for
-	  generating code in partial classes.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Implemented
-	  support for generating code in partial classes. Implemented support
-	  for UNDO/REDO.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Generation of gui code is now done from the Build method of a
-	  project service extension. Fixes some issues when building a
-	  project which contains custom components.
-
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Track API changes in
-	  FileService.
-
-2006-12-13 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Don't
-	generate stetic code if CurrentOpenCombine is null.
-
-2006-12-07 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* MonoDevelop.GtkCore.mdp: Updated to it can be
-	built from MonoDevelop.
-
-2006-11-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Simplified the
-	  code by using global events from the Ide, instead of combine
-	  events.
-
-2006-10-18 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added RemoveExportedWidget method.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: track
-	  API changes.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: If the name of a
-	  widget changes and it is being exported, update it in the objects.xml
-	  file. Fixes bug #79656.
-
-2006-09-23 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module. It provides a redesigned API
-	  which will allow running designers in a separate process.
-	
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs:
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPalettePad.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs:
-	  Track api changes.
-	
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs: Make sure
-	  parse information is up to date before loading an assembly library.
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Make sure this object
-	  is always alive when remoted.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added null check.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Not needed anymore.
-	* MonoDevelop.GtkCore.addin.xml: Removed build step. Code generation
-	  is done now before compiling.
-	  
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectWidgetLibrary.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/CachedProjectWidgetLibrary.cs:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: ProjectWidgetLibrary is not used
-	  anymore. All libraries are now handled by AssemblyReferenceWidgetLibrary.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
-	  Moved to Stetic.
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-09-23 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track api changes.
-
-2006-09-19 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* .: Added svn:ignore for MonoDevelop.GtkCore.pidb
-
-2006-09-01 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from stetic module. Includes fix for bug #79247.
-	
-2006-09-01 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from stetic module.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Save the project after editing the icons.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Set the
-	  ResourceProvider for the main stetic project. Added null check.
-
-2006-08-30 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fixed bug about 
-	  adding the wrong widget as action designer page.
-
-2006-08-30 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Only export properties which
-	  return primitive types. Fixes bug #79195.
-	* lib/*: Updated from stetic module.
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: Unsubscribe close
-	  event when done.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Handle designer
-	  commands in its own tab page.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Explicitely dispose
-	  custom widgets to avoid memory leaks.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Track api changes.
-	
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-08-18 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* gui.glade: Minor fix.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Track api
-	  changes.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Stetic files don't need
-	  to be added as resource to projects.
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: Make it
-	  work for action groups.
-	* lib/*: several fixes.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added method
-	  for removing an action group.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track API changes
-	  in Stetic. Properly bound edit commands from the main menu.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.addin.xml: Implemented Open and Delete
-	  commands for global action groups.
-	  
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-08-11 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module. Includes fixes for
-	  bugs #79043, #79044 and #79045
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Don't
-	  crash if something goes wrong when binding a class.
-	  Fixed nullref.
-
-2006-08-04 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  CreateContentForFile should not load the file, just create
-	  the view.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Add
-	  support for IEncodedTextContent.
-
-2006-08-01 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	  Set the resource provider before loading the project.
-	  Fixes bug #78966.
-	  
-	* libs/*: Updated from Stetic module. Fixes several bugs:
-	  78938, 78916, 78909, 78956, and 78867.
-
-2006-07-27 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs:
-	  Added null check.
-	  
-	* MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	  Get the parser context using the assembly file name, not the full
-	  assembly name.
-
-2006-07-25 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Factorized several
-	  more or less duplicate methods into GuiBuilderProject, specially
-	  methods for locating the class bound to a window. GuiBuilderProject
-	  now will explicitelly update the parser database the first time it
-	  needs to locate a class, so it will work even if the parser service
-	  is busy parsing assemblies.
-
-2006-07-24 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated from stetic module. Fixes a bug
-	  in the table wrapper which may cause an endless loop.
-
-2006-07-05 Matej Urbas <matej.urbas@gmail.com>
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs: Updated to use
-	  ReturnType as BaseTypes in IClass instances.
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fixed automatic
-	  layout switch policy.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fix showing of
-	  action group view.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Properly
-	  bind actions when pressing "BindToField".
-	  
-	* MonoDevelop.GtkCore.addin.xml: Updated versions. 
-
-2006-06-29  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Only display WidgetBuilderOptionPanel 
-	for "DotNet" projects.
-
-2006-06-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Switch to the
-	  designer workbench layout when selecting an action group file.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Support jumping
-	  to signal hanlder when double-clicking it in the signals editor.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Removed debug code.
-	
-	* templates/ActionGroup.xft.xml:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: 
-	  Fix code generation of action groups.
-
-2006-06-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: If a member has a [Browsable(false)]
-	  attribute, don't add it to the objects.xml file. Also don't add
-	  read-only properties.
-	* lib/*: Updated from stetic module. Fixes bugs #78622 and #78620.
-	  Adds an icon for expander and fixes a bug in ColorButton (fix by ml)
-
-2006-06-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/libsteticui.dll:
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs:
-	  Track changes in the api.
-
-2006-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Several improvements.
-	  Also fixes bug #78160.
-	
-2006-05-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	  Added DisplayName property.
-
-2006-05-29  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: reverted interface changes - missing file change
-	
-2006-05-29  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: reverted interface changes
-
-2006-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Adds support for toolbars.
-
-2006-05-23  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: track api changes
-	
-2006-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Commands/GladeCommands.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.addin.xml: Added commands for creating
-	  an action group and editing the project icons.
-	  
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show local
-	  action groups as children of the window node.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Moved
-	  some event subscriptions to WindowsFolder.cs
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Open the
-	  corresponding file when clicking on local action groups.
-	  
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Added action group template.
-	
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Added support for
-	  action group file templates.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Notify changes in
-	  local action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show the actions
-	  tab until there is at least one action group.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Don't show
-	  properties or signals for global actions.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added virtual method
-	  OnActiveDocumentChanged, which is called when the view is brought to front.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Use the new MemberName
-	  field when binding fields.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Several minor fixes.
-	  
-	* lib/*: Updated.
-	  
-
-2006-05-12 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Initial support for the menu editor. Still very unstable!!
-	
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.addin.xml: Register a node builder and and
-	  display binding for action groups.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Update
-	  the folder when action groups change.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Fix nullref.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Factorized
-	  some code into CodeBinder.cs
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Factorized some
-	  code into CombinedDesignView.cs.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: New node
-	  builder for action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: New display
-	  binding for editing global action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs: Moved from
-	  GuiBuilderView.cs.
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs: A new
-	  toolbar for the action group designer.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: A view for editing
-	  global action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Moved here some code
-	  from GuiBuilderEditSession.cs.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Moved here some
-	  code from GuiBuilderView.cs.
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Added new files.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track api changes.
-	
-2006-05-05 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/libstetic.dll: Updated from Stetic module. Includes
-	  a fix for bug #78307.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Updated versions.
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-05-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from Stetic module. Includes fixes for
-	  bugs #78266, #78240 and #78276.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track changes
-	  in the Stetic API.
-
-2006-04-24 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Don't
-	  crash if a stetic project can't be loaded. Fixes bug #78169.
-	* lib/libstetic.dll: Updated from Stetic module. Fixes bug #78167.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Fixed construction of
-	  scales and scrollbars.
-
-2006-04-19 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs: When
-	  creating a widget from a widget design, remove the signals since
-	  those signals reference handlers in the widget class, not the
-	  widget container class.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Fix nullref in some themes.
-
-2006-04-10 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Fix typo.
-	* libs/*: Fix for #78111, #78092 and #78090.
-
-2006-04-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Save the project
-	  after adding or removing a resource.
-
-2006-04-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated.
-
-2006-03-31 Lluis Sanchez Gual <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Get open
-	  combine events in the GUI thread.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Properly
-	  delete signals for which there isn't a handler. Half fixed field
-	  renaming.
-	* lib/*: Updated.
-
-2006-03-31 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml: Fix ID and
-	  description. Added stetic config files to add-in package.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Updated references.
-
-2006-03-29 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	  Don't crash if no parse info is available for the file
-	  being edited. Should fix #77885.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show
-	  the bind to field button for the root container.
-	* lib/*: Updated.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Makefile.am: Use an unified format. Patch by Matze Braun.
-	* MonoDevelop.GtkCore.addin.xml: Updated add-in versions.
-
-2006-03-22 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore.mdp: Removed GladeFileDisplayBinding.
-	* lib/*: Updated.
-	* Makefile.am: Updated. Some files have been moved to Stetic.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fixed
-	  layout switching. Don't show the widget tree pad by default,
-	  since it is already available as a combo in the designer.
-	* MonoDevelop.GtkCore.GuiBuilder/GladeFileDisplayBinding.cs: Removed.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: use
-	  the new property tree instead of the grid.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: The designer
-	  toolbar has been moved to Stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Changed
-	  default placement.
-
-2006-03-19  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* .: Added Makefile.in and Makefile to svn:ignore.
-
-2006-03-15 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Updated.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for using
-	  resource images in the designer.
-	  
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Check if the objects.xml
-	  file exists before loading it.
-	* MonoDevelop.GtkCore/GeneratorBuildStep.cs: Don't generate code
-	  if the stetic file has not been modified since the last
-	  generation.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: If Gtk
-	  support is not enabled, don't enable it if no widgets have
-	  been selected.
-	* lib/libstetic.dll: Updated.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Mapped some
-	  commands.
-	* templates/Window.xft.xml: The constructor of Gtk.Window requires
-	  the title of the window.
-
-2006-03-04 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Updated.
-	* MonoDevelop.GtkCore/GeneratorBuildStep.cs: When generating
-	  code for a project that exports widgets, include the own
-	  project library to the generation, since there can be
-	  widgets that contain other widgets defined in the project.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs:
-	  removed some IdeApp dependencies.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectWidgetLibrary.cs:
-	  added method for getting the class information from
-	  a project.
-	* CachedProjectWidgetLibrary.cs: New widget library class
-	  which takes class information from a collection of 
-	  ProjectClassInfo objects.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectPropertyDescriptor.cs:
-	  Consider all properties runtime-properties, since they have 
-	  been created from class properties.
-	* lib/*: Updated.
-
-2006-03-03 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* Makefile.am: removed debug files.
-
-2006-03-02 Lluis Sanchez Gual  <lluis@novell.com>    
- 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Propagate
-	  project changes to the editor.
- 
-2006-03-02 Lluis Sanchez Gual  <lluis@novell.com>   
- 
-	Initial implementation of the Stetic add-in.
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/Placeholder.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/Placeholder.cs
index c1aced580b..b0dbb9f292 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/Placeholder.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/Placeholder.cs
@@ -103,6 +103,8 @@ namespace Stetic {
 			cr.RelLineTo (-rect.Width, 0);
 			cr.RelLineTo (0, -rect.Height);
 			cr.ClosePath ();
+
+			// FIXME: VV: Remove gradient features
 			using (var pat = new Cairo.LinearGradient (rect.X + rect.Width*fx, rect.Y + rect.Height*fy, rect.X + rect.Width*fw, rect.Y + rect.Height*fh)) {
 				pat.AddColorStop (0, c1);
 				pat.AddColorStop (1, c2);
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs
index faec75ffc3..ea7f4a401e 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/PropertyEditorCell.cs
@@ -33,7 +33,7 @@ namespace Stetic
 			editors[typeof (float)] = typeof (Stetic.Editor.FloatRange);
 			editors[typeof (double)] = typeof (Stetic.Editor.FloatRange);
 			editors[typeof (char)] = typeof (Stetic.Editor.Char);
-			editors[typeof (string)] = typeof (Stetic.Editor.TextEditor);
+			editors[typeof (string)] = typeof (Stetic.Editor.PropertyTextEditor);
 			editors[typeof (DateTime)] = typeof (Stetic.Editor.DateTimeEditorCell);
 			editors[typeof (TimeSpan)] = typeof (Stetic.Editor.TimeSpanEditorCell);
 			editors[typeof (string[])] = typeof (Stetic.Editor.StringArray);
@@ -60,6 +60,7 @@ namespace Stetic
 			layout.Width = -1;
 			
 			Pango.FontDescription des = container.Style.FontDescription.Copy();
+			des.Size = 10 * (int) Pango.Scale.PangoScale;
 			layout.FontDescription = des;
 			
 			this.property = property;
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/PropertyTextEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/PropertyTextEditor.cs
new file mode 100644
index 0000000000..6f8c996c11
--- /dev/null
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/PropertyTextEditor.cs
@@ -0,0 +1,83 @@
+
+using System;
+using Gtk;
+using Gdk;
+
+namespace Stetic.Editor
+{
+	public class PropertyTextEditor: Gtk.HBox, IPropertyEditor
+	{
+		protected Gtk.Entry entry;
+		protected Gtk.Button button;
+		PropertyDescriptor prop;
+		object obj;
+		
+		public PropertyTextEditor()
+		{
+			Spacing = 3;
+			entry = new Entry ();
+			entry.HasFrame = false;
+			PackStart (entry, true, true, 0);
+			button = new Button ("...");
+			button.Relief = ReliefStyle.Half;
+			PackStart (button, false, false, 0);
+			button.Clicked += ButtonClicked;
+			entry.Activated += TextChanged;
+			ShowAll ();
+		}
+		
+		void ButtonClicked (object s, EventArgs a)
+		{
+			using (TextEditorDialog dlg = new TextEditorDialog ()) {
+				dlg.Text = entry.Text;
+				dlg.SetTranslatable (prop.Translatable);
+				dlg.TransientFor = this.Toplevel as Gtk.Window;
+				if (prop.Translatable) {
+					dlg.Translated = prop.IsTranslated (obj);
+					dlg.ContextHint = prop.TranslationContext (obj);
+					dlg.Comment = prop.TranslationComment (obj);
+				}
+				if (dlg.Run () == (int) ResponseType.Ok) {
+					if (prop.Translatable) {
+						prop.SetTranslated (obj, dlg.Translated);
+						if (dlg.Translated) {
+							prop.SetTranslationComment (obj, dlg.Comment);
+							prop.SetTranslationContext (obj, dlg.ContextHint);
+						}
+					}
+					entry.Text = dlg.Text;
+					TextChanged (null, null);
+				}
+			}
+		}
+		
+		void TextChanged (object s, EventArgs a)
+		{
+			if (ValueChanged != null)
+				ValueChanged (this, a);
+		}
+		
+		public void Initialize (PropertyDescriptor descriptor)
+		{
+			if (descriptor.PropertyType != typeof(string))
+				throw new InvalidOperationException ("TextEditor only can edit string properties");
+			prop = descriptor;
+		}
+		
+		public void AttachObject (object obj)
+		{
+			this.obj = obj;
+		}
+		
+		// Gets/Sets the value of the editor. If the editor supports
+		// several value types, it is the responsibility of the editor 
+		// to return values with the expected type.
+		public object Value {
+			get { return entry.Text; }
+			set { entry.Text = value != null ? (string) value : ""; }
+		}
+
+		// To be fired when the edited value changes.
+		public event EventHandler ValueChanged;	
+	}
+}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs
index 667ccb2537..4bb92de628 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/Text.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Stetic.Editor 
 {
-	public class Text : TextEditor 
+	public class Text : PropertyTextEditor 
 	{
 		public Text ()
 		{
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextEditor.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextEditor.cs
deleted file mode 100644
index d2c135a2a6..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/TextEditor.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-
-using System;
-using Gtk;
-using Gdk;
-
-namespace Stetic.Editor
-{
-	public class TextEditor: Gtk.HBox, IPropertyEditor
-	{
-		protected Gtk.Entry entry;
-		protected Gtk.Button button;
-		PropertyDescriptor prop;
-		object obj;
-		
-		public TextEditor()
-		{
-			Spacing = 3;
-			entry = new Entry ();
-			entry.HasFrame = false;
-			PackStart (entry, true, true, 0);
-			button = new Button ("...");
-			button.Relief = ReliefStyle.Half;
-			PackStart (button, false, false, 0);
-			button.Clicked += ButtonClicked;
-			entry.Activated += TextChanged;
-			ShowAll ();
-		}
-		
-		void ButtonClicked (object s, EventArgs a)
-		{
-			using (TextEditorDialog dlg = new TextEditorDialog ()) {
-				dlg.Text = entry.Text;
-				dlg.SetTranslatable (prop.Translatable);
-				dlg.TransientFor = this.Toplevel as Gtk.Window;
-				if (prop.Translatable) {
-					dlg.Translated = prop.IsTranslated (obj);
-					dlg.ContextHint = prop.TranslationContext (obj);
-					dlg.Comment = prop.TranslationComment (obj);
-				}
-				if (dlg.Run () == (int) ResponseType.Ok) {
-					if (prop.Translatable) {
-						prop.SetTranslated (obj, dlg.Translated);
-						if (dlg.Translated) {
-							prop.SetTranslationComment (obj, dlg.Comment);
-							prop.SetTranslationContext (obj, dlg.ContextHint);
-						}
-					}
-					entry.Text = dlg.Text;
-					TextChanged (null, null);
-				}
-			}
-		}
-		
-		void TextChanged (object s, EventArgs a)
-		{
-			if (ValueChanged != null)
-				ValueChanged (this, a);
-		}
-		
-		public void Initialize (PropertyDescriptor descriptor)
-		{
-			if (descriptor.PropertyType != typeof(string))
-				throw new InvalidOperationException ("TextEditor only can edit string properties");
-			prop = descriptor;
-		}
-		
-		public void AttachObject (object obj)
-		{
-			this.obj = obj;
-		}
-		
-		// Gets/Sets the value of the editor. If the editor supports
-		// several value types, it is the responsibility of the editor 
-		// to return values with the expected type.
-		public object Value {
-			get { return entry.Text; }
-			set { entry.Text = value != null ? (string) value : ""; }
-		}
-
-		// To be fired when the edited value changes.
-		public event EventHandler ValueChanged;	
-	}
-}
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj
index 053a866ec1..43a845d8f2 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/libstetic.csproj
@@ -111,7 +111,6 @@
     <Compile Include="editor\StringArray.cs" />
     <Compile Include="editor\Text.cs" />
     <Compile Include="editor\TextBox.cs" />
-    <Compile Include="editor\TextEditor.cs" />
     <Compile Include="editor\TextEditorDialog.cs" />
     <Compile Include="editor\ThemedIcon.cs" />
     <Compile Include="editor\ThemedIconList.cs" />
@@ -224,6 +223,7 @@
     <Compile Include="TopLevelWindow.cs" />
     <Compile Include="wrapper\NotifyWorkaround.cs" />
     <Compile Include="editor\GtkWorkarounds.cs" />
+    <Compile Include="editor\PropertyTextEditor.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="stetic.glade">
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ChangeLog b/main/src/addins/MonoDevelop.GtkCore/libsteticui/ChangeLog
deleted file mode 100644
index 3467198ee3..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/ChangeLog
+++ /dev/null
@@ -1,228 +0,0 @@
-2010-05-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CecilWidgetLibrary.cs: Fix potential null ref. Fixes bug
-	  #583516 - Stetic breaks building MonoDevelop.IPhone.
-
-2010-05-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* LibraryCache.cs: Fixed problem with resolution of base
-	  types.
-
-2010-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CecilSignalDescriptor.cs: Cecil uses '/' as separator for
-	  inner classes. Convert to the standard '+' separator.
-
-2010-01-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* CodeGenerator.cs:
-	* libsteticui.csproj:
-	* CodeGeneratorPartialClass.cs:
-	* CodeGeneratorInternalClass.cs: Use global:: for type
-	  references in generated code. 
-
-2010-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* libsteticui.csproj: upgraded to v3.5 framework.
-
-2009-12-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* WidgetDesignerBackend.cs: Disable checkerboard background
-	  because redraw is super-inefficient and makes resizing
-	  unbearably slow. It needs to do more selective invalidation
-	  in resizes (like GTK viewport), and take the exposed area
-	  into account in expose events.
-
-2009-11-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* WidgetDesignerBackend.cs: Don't try to realize the child if
-	  the widget is not anchored. Fixes bug #553475 -
-	  "Gtk-Critical: gtk_widget_realize: assertion" when running a
-	  gtk# app inside MD.
-
-2009-11-05  Mike Kestner  <mkestner@novell.com>
-
-	* Application.cs:
-	* ApplicationBackend.cs:
-	* CodeGenerator.cs: some warning cleanup.
-
-2009-10-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Flush.
-
-2009-10-16  Mike Krüger  <mkrueger@novell.com>
-
-	* ActionComponent.cs: Handled icon loading failures.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* libsteticui.csproj: Mark Mono.Cecil project referece
-	as private.
-
-2009-09-10  Christian Hergert  <chris@dronelabs.com>
-
-	* libsteticui/libsteticui.dll.config: Use quartz on osx.
-
-2009-09-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Metacity/Preview.cs: Use Assembly.LoadWithPartialName. It's
-	  obsolete, but at least it works.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Metacity/Preview.cs:
-	* WidgetDesignerBackend.cs: Worked on designer decoration.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Grid.cs:
-	* LibraryCache.cs:
-	* Windows/Preview.cs:
-	* WidgetActionBar.cs:
-	* ApplicationBackend.cs: Fixed some warnings.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Updated dependencies. We now depend on
-	  gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project.cs:
-	* UndoQueue.cs:
-	* WidgetDesigner.cs:
-	* ProjectBackend.cs:
-	* WidgetEditSession.cs: Added support for saving and restoring
-	  the status of the designer, including the undo queue. This
-	  allows implenting ISupportsProjectReload.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Metacity/Preview.cs: Remove debug code.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Windows/Preview.cs: Dont try to create a Win32 preview
-	  window when not running on Windows.
-
-2009-07-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* WidgetDesigner.cs:
-	* ActionGroupDesigner.cs:
-	* WidgetDesignerBackend.cs:
-	* ActionGroupEditSession.cs: No more missing IntPtr
-	  constructor exceptions.
-
-2009-06-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* WidgetDesignerBackend.cs: Fix rendering of the window
-	  decoration.
-
-2009-06-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* WidgetDesigner.cs:
-	* WidgetDesignerBackend.cs: Dispose is not guaranteed to be
-	  called when destroying a widget. Use OnDestroyed instead.
-
-2009-06-25  Mike Krüger  <mkrueger@novell.com>
-
-	* WidgetDesignerBackend.cs: Draw dialog background.
-
-2009-06-25  Mike Krüger  <mkrueger@novell.com>
-
-	* WidgetDesignerBackend.cs: Draw checkboard background in the
-	  gui designer instead of monochrome dialog background.
-
-2009-06-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* PluggableWidget.cs: When replacing the child widget (because
-	  of reloading of the project for example), make sure the old
-	  one is destroyed.
-
-2009-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* libsteticui.csproj: Updated.
-
-	* Metacity/Theme.cs:
-	* Metacity/FrameType.cs:
-	* Metacity/FrameFlags.cs:
-	* Metacity/ButtonLayout.cs:
-	* Metacity/ObjectManager.cs:
-	* Metacity/ButtonFunction.cs: Use a better namespace.
-
-	* Metacity/Preview.cs: Use the new TopLevelWindow class. Track
-	  changes in the title of the window.
-
-	* Windows:
-	* Windows/Preview.cs:
-	* Windows/WindowsTheme.cs:
-	* WidgetDesignerBackend.cs: Added support for win32 window
-	  decorations.
-
-	* EmbedWindow.cs:
-	* UserInterface.cs: EmbedWindow is not required anymore.
-
-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Copy the config file to the output dir.
-	  Set project type to library.
-
-	* Metacity/Preview.cs:
-	* WidgetDesignerBackend.cs: Avoid exception in the
-	  MetacityPreview class constructor, since it crashes MD under
-	  ms.net.
-
-2009-04-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Don't require a specific gtk# version.
-
-2009-03-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* LibraryCache.cs: Avoid recursive loading of
-	  AssemblyDefinition. Rely on cache info to check if a
-	  referenced library contains widget definitions.
-
-	* AssemblyResolver.cs: Make sure the resolver returns full
-	  paths.
-
-	* CecilWidgetLibrary.cs: Use the full path to query info from
-	  the cache. Properly unsubscribe the Changed event from the
-	  cache. Resolve assemblies using the provided assembly
-	  resolver.
-
-	* ApplicationBackend.cs:
-	* AssemblyWidgetLibrary.cs: From now on the registry and the
-	  library cache only handle libraries with full paths.
-
-	* Project.cs: Make sure unused project backends are properly
-	  disposed.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Flush.
-
-2009-02-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* PropertyTree.cs:
-	* WidgetDesignerBackend.cs: Dispose Gdk cursors, else
-	  finalisers destroy them outside of the GUI thread and often
-	  crash MD due to X asserts resulting in _XCBUnlockDisplay
-	  errors.
-
-2009-02-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* libsteticui.csproj: Don't build with make, since MD can
-	  build these just fine.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* libsteticui.csproj: Allow unsafe code, since Shadow.cs has
-	  unsafe code.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.mdp:
-	* libsteticui.csproj: Migrated to MSBuild file format.
-
diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyTree.cs b/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyTree.cs
index f89aa36754..cbff163a9e 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyTree.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libsteticui/PropertyTree.cs
@@ -224,6 +224,7 @@ namespace Stetic
 			layout = new Pango.Layout (this.PangoContext);
 			layout.Wrap = Pango.WrapMode.Char;
 			Pango.FontDescription des = this.Style.FontDescription.Copy();
+			des.Size = 10 * (int) Pango.Scale.PangoScale;
 			layout.FontDescription = des;
 		}
 		
@@ -444,6 +445,7 @@ namespace Stetic
 			layout.Wrap = Pango.WrapMode.Char;
 			
 			Pango.FontDescription des = tree.Style.FontDescription.Copy();
+			des.Size = 10 * (int) Pango.Scale.PangoScale;
 			layout.FontDescription = des;
 		}
 		
diff --git a/main/src/addins/MonoDevelop.GtkCore2/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/ChangeLog
deleted file mode 100644
index 8235e70571..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/ChangeLog
+++ /dev/null
@@ -1,2935 +0,0 @@
-2010-10-04  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* MonoDevelop.GtkCore2.csproj: 
-
-2010-09-30  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gtk-gui/gui.stetic: 
-
-2010-09-22  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-	Implements ReloadDesigner commands.
-	* Makefile.am: 
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore2.addin.xml:
-	* MonoDevelop.GtkCore.Commands/GtkCommands.cs:
-	* MonoDevelop.GtkCore.Commands/GladeCommands.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFileNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-
-
-2010-09-21  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* MonoDevelop.GtkCore2.csproj: 
-
-2010-09-20  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* MonoDevelop.GtkCore2.addin.xml: 
-
-2010-09-17  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* MonoDevelop.GtkCore2.csproj: 
-
-2010-09-17  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-	Reorganizing project pad menu items.
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore2.addin.xml: 
-
-2010-09-15  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore2.addin.xml:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-
-
-2010-08-30  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj: 
-
-2010-08-27  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore2.addin.xml:
-	* MonoDevelop.GtkCore2.xbuild.csproj: 
-
-2010-08-17  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore.addin.xml: 
-
-2010-08-16  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* MonoDevelop.GtkCore.addin.xml: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* MonoDevelop.GtkCore.addin.xml: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore.addin.xml: 
-
-2010-08-09  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore.addin.xml: Add GuiFolderBuilderNode extension
-
-2010-08-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* MonoDevelop.GtkCore2.csproj: 
-
-2010-08-04  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* MonoDevelop.GtkCore2.csproj: 
-
-2010-07-27  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: 
-	Remove autoCommit argument 
-
-2010-07-05  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore.addin.xml: 
-
-2010-06-28  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFileExtension.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFileNodeBuilderExtension.cs:
-	Fixes fo better file grouping in the project pad
-
-
-2010-06-28  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* MonoDevelop.GtkCore2.csproj: 
-
-2010-06-23  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-	Draw action group icon
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFileExtension.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFileNodeBuilderExtension.cs:
-
-2010-06-23  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj: 
-
-2010-06-22  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFileExtension.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFileNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-
-
-2010-06-16  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* MonoDevelop.GtkCore.addin.xml: 
-
-2010-06-15  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-	 Changes in the project pad for displaying grouped component files
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFileNodeBuilderExtension.cs:
-
-
-2010-06-09  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Add gtkx files to project
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: 
-
-2010-06-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: 
-
-2010-06-02  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore2.csproj:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
-		Move generated partial class for components from gtk-gui.
-
-2010-04-29  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track
-	  AddFilesToProject API.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	  ViewContent widgets are now destroyed by the workspace
-	  window.
-
-
-2010-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: call
-	  destroy on the container vbox during
-
-2010-04-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: Found better work
-	  around for the "gnome-sharp" reference issue.
-
-2010-04-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: Fixed 'Bug 599335 -
-	  Error CS0433: The imported type `Gtk.DeleteEventArgs' is
-	  defined multiple times (CS0433)'.
-
-2010-03-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added
-	  null check.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bumped MD version.
-
-2010-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Use the
-	  stock Visual Design layout as layout for stetic.
-
-2010-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fix
-	  race in SteticApp initialization.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.GtkCore.csproj:
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs:
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs:
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs:
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs:
-	* MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	  Track api changes.
-
-2010-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	  Track API changes for lazy loading images.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Track api
-	  changes.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs:
-	  Flush.
-
-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  Track DisplayBinding API.
-
-2010-01-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.csproj:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Format
-	  generated files using the MD formatter to ensure that the
-	  generated text is the same for al platforms and
-	  environments.
-
-	* gtk-gui/gui.stetic: Use global:: for type references in
-	  generated code. 
-
-2009-12-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Implement SupportsItem.
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When
-	  adding a stock gtk widget to a window there is no need to
-	  update the references. Fixes bug #565492.
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs:
-	  Flush.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Introduced the ConfigurationSelector class to all methods
-	  that previously took a configuration name as string. This
-	  eliminates the ambiguity between solution configuration
-	  names and project configuration names.
-
-2009-11-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders\WindowsFolder.cs:
-	  Implemented Equals/GetHashCode. Fixes bug #549902 - MD
-	  crashes when adding a new gtk form.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2009-10-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.GtkCore.csproj:
-	* gtk-gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs:
-	  Flush.
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Use
-	  typed collection instead of ArrayList.
-
-2009-10-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs:
-	  Handled icon loading failures.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2009-09-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Route
-	  commands to the text editor view. Fixes bug #536740 -
-	  Expression evaluator unnecessarily in context menu.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* libstetic/editor/Accelerator.cs: 
-	* libstetic/editor/GroupPicker.cs: 
-	* libstetic/editor/TextEditor.cs: 
-	* libstetic/editor/SelectImageDialog.cs: 
-	* libstetic/editor/NonContainerWarningDialog.cs: 
-	* libstetic/editor/TextEditorDialog.cs: 
-	* libstetic/editor/EditIconDialog.cs: 
-	* libstetic/editor/IconSelectorMenu.cs: 
-	* libstetic/editor/Image.cs: 
-	* libstetic/editor/ActionGroupEditor.cs: 
-	* libstetic/editor/StringArray.cs: 
-	* libstetic/editor/EditIconFactoryDialog.cs: 
-	* libstetic/editor/SelectIconDialog.cs: 
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs: 
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: 
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixes to
-	  make windows and dialogs Transient to either their parent
-	  window/dialog or the MD root window (when applicable).
-
-2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Use real
-	  resource Ids instead of file names. Fixes bug #528309 -
-	  Button Icons are not displayed.
-
-2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Store the
-	  GuiBuilderProject on which the ChangedEvent was subscribed,
-	  and use that reference when unsubscribing on Dispose. This
-	  is required because the GuiBuilderProject bound to a project
-	  may change. Fixes bug #525421 - Removing gtk-sharp reference
-	  from a project causes it to not function properly.
-
-2009-08-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Don't use the text editor
-	  display binding id as reference for registering the designer
-	  view. Use DefaultDisplayBinding instead. Removed unused
-	  supportedFormats attribute.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	  Added support for saving and restoring the status of the
-	  designer, including the undo queue. This allows implenting
-	  ISupportsProjectReload.
-
-2009-08-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/FolderNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/GuiBuilderProjectNodeBuilder.cs:
-	  Remove unused files.
-
-2009-08-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Use the
-	  new AssemblyContext class to query and resolve assemblies.
-
-2009-08-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.csproj:
-	* MonoDevelop.GtkCore/Counters.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added
-	  some performance counters.
-
-2009-07-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs:
-	  Track api changes.
-
-2009-07-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: No more
-	  missing IntPtr constructor exceptions.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Use the
-	  new DesktopService instead of PlatformService.
-
-2009-06-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track
-	  assembly lookup APIs.
-
-2009-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore\ProjectResourceProvider.cs:
-	  GetMimeTypeForUri doesn't really support uris.
-
-2009-06-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	  GetGtkAssemblyVersion is expected to return the version and
-	  token, not only the version.
-
-2009-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore\ReferenceManager.cs: Don't get the
-	  package version from the gtk# package. Instead, get it from
-	  the first version numbers of the gtk-sharp assembly. That's
-	  necessary because in windows there is no gtk# package.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	  Workaround for what seems to be a mcs bug. Looks like it
-	  can't properly resolve the implicit conversion of null to
-	  string.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore\GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder\GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder\GuiBuilderProject.cs: Use the
-	  new FilePath class for handling file and directory paths.
-
-2009-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't
-	  create a new drop target list. Use the one defined by
-	  Stetic.
-
-2009-04-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Don't require a specific gtk#
-	  version.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: gui designer is now before
-	  the text editor (wrong text editor id).
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: Remove vte-sharp
-	  from the gnome libs list, since it now has its own package.
-
-2009-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Track
-	  API changes.
-
-2009-04-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	  Removed unused namespace.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	  Renamed PixbufService to ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	  Track API changes.
-
-2009-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: Moved
-	  SystemAssemblyService and related classes to the namespace
-	  MonoDevelop.Core.Assemblies.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Add
-	  support for multiple target runtimes.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	  Track API changes.
-
-2009-03-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: When the stetic files
-	  are generated for the first time, ensure that their write
-	  date is < the write date of the .stetic file, otherwise they
-	  won't be regenerated when building. Fixes bug #483970 -
-	  [Regression] Default C# Gtk# app no longer builds.
-
-2009-03-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2009-03-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Don't try to generate files when not building inside the
-	  IDE.
-
-2009-02-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: In
-	  ForceCodeGenerationOnBuild, force a rebuild of the project
-	  too. Fixes bug #472683.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Flush.
-
-2009-02-26  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/ProjectResourcesProvider.cs: lookup mime
-	type and use more specific ResourceInfo ctor. [Fixes #475820]
-
-2009-02-26  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/WidgetDesignerBackend.cs: implement Delete key 
-	support.  [Fixes #470637]
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Added
-	  explicit "Misc" category for localization.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Worked on
-	  propertygrid localization.
-
-2009-02-25  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/ApplicationBackend.cs: Reload the registry libraries
-	in LoadLibraries, since adding a library doesn't necessarily refresh
-	an out-of-date previously registered library.
-	* libsteticui/CecilWidgetLibrary.cs: enhance NeedsReload check to 
-	use a cache refresh and the new change notification so that the
-	library stays 'dirty' until it's reloaded.
-	* libsteticui/LibraryCache.cs: add change notification for cache items.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: do an update
-	of the steticapp libs even if the list hasn't changed in case the 
-	contents of any of them have changed.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: check for 
-	'dirty' references when regenerating code. [Fixes #472683]
-
-2009-02-24  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: only touch the design file
-	when forcing rebuilds.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: don't regen
-	if design file and generated files have equal timestamps to avoid
-	regenerations on fresh checkouts. [#478894]
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs:
-	  Track merge of the project pad context menu.
-
-2009-02-18  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/ScrolledWindow.cs: when the child viewport itself
-	is being replaced, don't try to remove the viewport from itself.
-	* libstetic/wrapper/Viewport.cs: add case for when placeholders are
-	being replaced by scrollable widgets to insert the new child directly
-	into the parent scrolled window. [Fixes #404861]
-
-2009-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Fix
-	  crash when the project's gtk# is not installed.
-
-2009-02-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Set correct resource name for
-	  DrawingArea template.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track api
-	  changes.
-
-2009-02-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build. Looks like the makefiles can't cope 
-	  with resources with IDs.
-
-2009-02-13  Mike Kestner <mkestner@novell.com> 
-
-	* Makefile.am: add template resource
-	* MonoDevelop.GtkCore.addin.xml: ditto.
-	* templates/DrawingArea.xft.xml: new DrawingArea subclass template
-	with stubs for OnExposeEvent, OnButtonPressEvent, OnSizeRequested,
-	OnSizeAllocated, and ctor. Helps speed up the development of custom
-	drawn widgets.  [Fixes #472665]
-
-2009-02-11  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/Registry.cs: account for reloading of the coreLib,
-	since this can happen when dogfooding MD. [Fixes #365983]
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.csproj: Remove a local-copy ref.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.mds:
-	* MonoDevelop.GtkCore.mdp:
-	* MonoDevelop.GtkCore.csproj: Migrated to MSBuild file format.
-
-2009-02-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.GtkCore.mdp:
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs:
-	  Added option for enabling/disabling auto-switch of the GUI
-	  builder layout. Disabled from now on by default.
-
-2009-02-04  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/objects.xml: explicit default values for Table
-	NRows and NCols values so they don't default to 1.  Fixes #471242.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2009-02-02  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/PropertyDescriptor.cs: null guard the ValueToString
-	formatting for string arrays.
-
-2009-02-02  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/PropertyDescriptor.cs: handle empty string lists
-	* libstetic/wrapper/ComboBox.cs: some more null guarding for Items.
-	[Fixes #471244]
-
-2009-01-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Propagate a
-	policy parent SolutionItem through project/file creation so that
-	policies can always be resolved correctly.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.mdp:
-	* libsteticui/libsteticui.mdp: Flush project format changes.
-
-2009-01-26  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/ActionTree.cs: guard against removing unsaved
-	actions.  [Fixes #443472]
-
-2009-01-22  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/editor/StringArray.cs: display "(Collection)" in the
-	label instead of a joined list on \n which displays garbage chars.
-	This approach is consistent with another very popular IDE. ;-)
-	* libstetic/wrapper/objects.xml: use Editor.StringArray for the Items
-	property of ComboBox.
-	* libstetic/wrapper/ComboBox.cs: switch Items to a string[].  Luckily
-	this is backwards compat since we currently saved string[] as a newline
-	join of the member strings.  [Fixes #405396]
-
-2009-01-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Don't serialize the GtkDesignInfo
-	element when it is empty.
-
-2009-01-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added missing
-	nullref check.
-
-2009-01-13  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: adds a
-	FileAddedToProject handler which scans the file for classes and
-	checks the deleted-designs cache for matches to restore to the
-	project.
-
-2009-01-13  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/ProjectBackend.cs (RemoveWidget): export the widget
-	to a deleted-designs dir for later recovery if necessary. Should
-	also decide on some cleanup mechanism to remove old designs and
-	automate recovery in the move case if possible.  Or we can wait for
-	1wpf which should solve the move case more cleanly.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: reenable
-	OnFileRemovedFromProject handler.  Revamp to use a ParseDocument of
-	the removed file to scan for removed classes to kill.
-	[Fixes #366392]
-
-2009-01-09  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/Project.cs: forward isInternal to the backend in
-	AddWidgetLibrary.
-
-2009-01-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui/LibraryCache.cs: Don't ignore internal classes when
-	looking for widgets. If a widget is internal, set the "internal" flag
-	to true. Don't abort AddObjects if there is an assembly resolution
-	error.
-
-2009-01-08  Mike Kestner <mkestner@novell.com> 
-
-	* libsteticui/LibraryCache.cs : delay cache directory creation until
-	files are going to be written to it.
-
-2009-01-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui/CecilWidgetLibrary.cs: Don't try to resolve full assembly
-	paths.
-
-2008-12-18  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/editor/Flags.cs : fix cs0030 under new mcs.
-	* libstetic/editor/FlagsSelectionDialog.cs : fix cs0030 under new mcs.
-	* libstetic/editor/ResponseId.cs : fix cs0030 under new mcs.
-
-2008-12-13  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/Container.cs: generate tooltips based on the target
-	version, using the new Tooltip API for >= 2.12.  Fixes #372015.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetParser.cs: Properly search for subclasses of
-	Gtk.Widget.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.mdp:
-	* libsteticui/libsteticui.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Remove the mono
-	version number comment from the generated files.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: Track API changes.
-
-2008-12-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs: Use an
-	Alignment as the concrete Bin instead of custom InvisibleFrame.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetParser.cs: Optimized GetToolboxItems.
-
-2008-12-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetParser.cs:
-	* MonoDevelop.GtkCore/ObjectsDocument.cs: Getting the list of widgets is
-	an expensive operation. It shouldn't be a property.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* MonoDevelop.GtkCore.mdp: Add AssemblyInfo.cs files that are
-	autogenerated from the addin manifests.
-
-2008-12-01  Mike Kestner <mkestner@novell.com> 
-
-	* libstetic/wrapper/objects.xml: move ToggleButton ahead of CheckButton
-	and add ToggleButton signal item group to CheckButton.  Remove toggled
-	signal from RadioButton since it inherits it from CheckButton.
-	[Fixes #450237]
-
-2008-11-25  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: refactor the default and 
-	supported version checks into the ReferenceManager, with all the other
-	package and assembly code.
-	* MonoDevelop.GtkCore/ReferenceManager.cs: refactored default and 
-	supported version properties. 
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: use new api.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: use new api.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: use new api.
-
-2008-11-23  Mike Kestner <mkestner@novell.com> 
-
-	* *: I've typed lib/stetic/libstetic(ui) a few too many times.
-
-2008-11-18  Mike Kestner <mkestner@novell.com> 
-
-	* */Makefile.am: break the gnome/gconf-sharp dependencies.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: set up
-	callbacks to the PlatformService for MIME resolution and showing
-	urls.
-
-2008-11-11  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: use the 
-	new ForceUpdate method on the ProjectDom returned by GetParserContext
-	to ensure a fully updated database.
-
-2008-11-11  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: null guarding for
-	all the things that can possibly go wrong with the parse in 
-	GetClass.
-
-2008-11-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Create the
-	formInfos list when the project is loaded. This is necessary since
-	the list is destroyed when the project is unloaded. Fixes bug #Bug
-	431723 - Cannot build GTK applications with sln format.
-
-2008-11-06  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	revert the context menu changes. Don't show them if the project has no
-	gtk-sharp ref, only add the templates to the dialog, per Lluis.
-
-2008-11-06  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	show Add Widget|Window|Dialog|ActionGroup template items in the context
-	menu and Add File dialog even when the project has no Gtk# reference.
-
-2008-11-05  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: needed to revert
-	the >= to <= change from the 440435 fix since the refmgr is now 
-	reporting TargetGtkVersion without Version=.  oops.
-
-2008-11-05  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: strip Version= out of
-	TargetGtkVersion.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2008-10-30  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: 
-	switch to a x.y TargetGtkVersion obtained by parsing the gtk-sharp
-	reference version. Invert the version comparison in the toolboxitem
-	filter.  We want toolbox items that are less than the project target
-	version, not greater.  Fixes #440435.
-
-2008-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Don't notify the
-	file has changed unless the changes are saved to disk. Fixes bug
-	#430497 - Widget names created in Stetic not available for
-	autocomplete.
-
-2008-10-29  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs (ShowPage): only
-	regenerate the dummy structure when switching to the source page.
-
-2008-10-28  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/ReferenceManager.cs: switch default updating
-	to use the current assembly StoredReference version.  Avoids problems
-	when the stored version has no corresponding installed package.
-	Fixes #436246.
-
-2008-10-27  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: don't store
-	configuration on Project Save.  Avoids a crash due to file availability
-	when saving config while loading and it's extraneous since we store
-	the config on app exit and it contains no project specific props.
-
-2008-10-22  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs (HasDesignedObjects): guard
-	against null projects.
-
-2008-10-21  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs (HasDesignedObjects): don't
-	instantiate just to get the SteticFile. Avoids project file garbage.
-	[Fixes #436201]
-
-2008-10-21  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: guard against null
-	documents returned from parse.  I think this is related to the old
-	ErrorsDuringCompile check that was commented with the new parser port.
-	[Fixes #436998]
-
-2008-10-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: fixed TODO.
-
-2008-10-03  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding:
-	rework GetWindow method. now uses the ParsedDocument for a requested 
-	file to check if any of its types have a GuiBuilderWindow.
-	The existing method of walking the project windows list and using 
-	the ProjectDom database to lookup their file locations is susceptible
-	to timing problems due to imcomplete parse databases.  This method is
-	probably slightly more efficient as well.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/ProjectResourceProvider.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track API.
-
-2008-09-23  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: bandaid to
-	avoid exceptions when removing non-existent buttons.  Fixes #377414.
-
-2008-09-23  Mike Kestner <mkestner@novell.com> 
-
-	* lib/stetic/libsteticui/CecilWidgetLibrary.cs: don't hold assembly
-	reference beyond load operation.  Recreate it on each load so we are
-	always accessing the current assembly instance.  Only access cache 
-	using filename.  Ensure Class description lookups cause spew to 
-	console.
-	* lib/stetic/libsteticui/LibraryCache.cs: enhance the path lookup
-	logic in Refresh to avoid some churn on named lookups.
-	* lib/stetic/libsteticui/ProjectBackend.cs: reload library if 
-	necessary before getting component types.  Fixes #427334.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated projects.
-
-2008-09-15  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCode.GuiBuilder/GtkProjectServiceExtension.cs:
-	add the project stetic file to any generation warnings produced.
-	Fixes #373244.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.mdp, lib/libstetic.mdp, lib/gtk-gui/generated.cs,
-	  gtk-gui/generated.cs: Updated generated code.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore/WidgetParser.cs: Track api changes.
-
-2008-09-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Changes caused by
-	  interface changes.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Moved
-	  the extensible tree view to its own directory.
-
-2008-08-27  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDesciptionTemplate.cs: perform a 
-	project save after the file insertions and updates.  This seems
-	suboptimal, since it would probably be better to mark the project
-	dirty and let the user save the project, but until we switch to
-	one-widget-per-design-file, we probably need to save the project
-	automatically to avoid problems.
-	Fixes #385712.
-
-2008-08-27  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	Restrict to DotNetProjects and verify ProjectFolders are for DNPs.
-	Fixes #412448.
-
-2008-08-22  Mike Kestner <mkestner@novell.com> 
-
-	Fixes bug #413275 and delays more GtkDesignInfo-related project file 
-	churn.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: init the refmgr on startup.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Remove targetVersion field and
-	associated prop.  Move reference updating logic to Ref Manager. Target
-	Version is now exclusively tracked via reference version by the
-	ReferenceManager.
-	* MonoDevelop.GtkCore/ReferenceManager.cs: new class to encapsulate all
-	reference management behaviors, from responding to user add removes to
-	automated updates for designer projects.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: only show feature
-	for projects which support refactoring, since it advertises designer
-	support and that's not available without refactoring yet. Use refmgr
-	for version updates.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionsPanel.cs: use refmgr 
-	for version info and suppress gettext options if no designed objects
-	exist.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: use refmgr for 
-	target version. 
-
-2008-08-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Remove
-	  the "resources folder" feature. Resources are now shown in the
-	  solution tree like any other files. For a detailed explanation see
-	  "Bug 381430 - [PATCH] Display resource files in main project tree".
-
-2008-08-19  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: revert a silly
-	change that was causing explicit paths to be inserted into gui.stetic
-	files for gac references.  [Fixes #412960]
-
-2008-08-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: fixed issue in
-	  GetSourceCodeFile.
-
-2008-08-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: fixed some
-	  possible nullrefs.
-
-2008-08-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp: re-set project
-	  references (fix some libstetic.dll not found issue,  localcopy ==
-	  true was missing).
-
-2008-08-18  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: make HasDesignedObjects
-	and SupportsDesigner static so that we can defer a few more instance
-	creation scenarios.
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: 
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: 
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: 
-	  Update to new static API.
-
-2008-08-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Add a null
-	  check.
-
-2008-08-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: fixed possible
-	  null references in the unload method.
-
-2008-08-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Fix crash when looking for
-	  designed objects in a project that doesn't support it.
-
-2008-07-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed some
-	  issues.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Translated
-	  old code to new dom.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/ObjectsDocument.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Changes for converted
-	  refactoring infrastructure.
-
-2008-07-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/WidgetParser.cs,
-	  MonoDevelop.GtkCore/ObjectsDocument.cs,
-	  MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Worked on code
-	  completion/new dom.
-
-2008-07-24  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: get paths
-	for gac references to simplify the lookup in stetic.
-
-2008-07-23  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	Use HasDesignedObjects not SupportsDesigner.
-
-2008-07-23  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: delay creation of guifolder
-	until GuiBuilderProject is accessed. Refactor Bind into a Project
-	property to gather all the connect/disconnects together. Add new
-	HasDesignedObjects prop for when SupportsDesigner doesn't cut it.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: use new
-	HasDesignedObjects prop.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs:
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: don't 
-	need to update the folder for these options any more.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: get
-	GuiBuilderProject from design info directly. 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: kill 
-	BeforeCompile handler and GetGuiBuilderProject method. Use new
-	HasDesignedObjects to control code generation.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: kill 
-	GenerateSteticCode field. It was always set to true. Use new
-	HasDesignedObjects prop to control generation.
-
-2008-07-22  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Connect to project file
-	events and trigger objects.xml updates. Translate a confirm button
-	label.  Require AddAttribute refactoring.
-	* MonoDevelop.GtkCore/ObjectsDocument.cs: new class reinstating some
-	old document updating code and adding some new.  Inserts ToolBoxItem
-	and Category attrs into sources for a first-time "upgrade" to enable 
-	the attr-sync feature now controlled by a root attribute on the 
-	document.
-	* MonoDevelop.GtkCore/WidgetParser.cs: new class reinstating some
-	old parsing code and adding some new.  This will become the home
-	for all source parsing in the addin. Refactoring to come...
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Add WidgetParser
-	prop.  Remove Debug spew.
-	
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs: Moved serialization engine to
-	  MonoDevelop.Core. Use new syntax for specifying attribute scope.
-
-2008-07-15  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: add an updatingVersion 
-	state to prevent warning when we are adjusting reference versions.
-
-2008-07-15  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: add a user confirmation for
-	disabling the designer on reference removal.  Leave the stetic.gui
-	and objects.xml files on disk, though we still remove them from the 
-	project.
-
-2008-07-14  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed possible
-	  null reference.
-
-2008-07-10  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs (FromProject): return an 
-	empty instance for non-DotNetProjects which will report false
-	on SupportsDesigner.
-
-2008-07-10  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Gutted.  Moved everything
-	that took a Project parameter to GtkDesignInfo. Removed all the 
-	enable/disable/get info methods replaced by GtkDesignInfo.FromProject.
-	Killed all the objects file updating. Moved designer support checks
-	to DesignInfo.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Add FromProject static
-	method to replace GtkCoreService.GetGtkInfo. Remove ExportedWidgets
-	and IsWidgetLibrary functionality. Enable and disable designer based
-	on presence of gtk-sharp reference on projects. Refactor/move code 
-	generation to GuiBuilderProject from UpdateGtkFolder. Kill 
-	GeneratePartialClasses since it's a simple project property access 
-	and all users of GtkDesignInfo access it via the project. Moved 
-	Refactory checks from GtkCoreService to encapsulate SupportsDesigner.
-	Fix Reference updating checks for Mono.Posix, since the 
-	StoredReference returns a simple name for it.
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: switched to 
-	FromProject api.  Killed ExportedWidget handling.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: removed widget
-	library checkbox. s/Gtk#/GTK# for consistency. Updated to new
-	DesignInfo API.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: removed
-	all the Exported Widgets and WidgetLibrary tab stuff, simplified to
-	a vbox and hand-written to remove glade taint.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: 
-	switched to new DesignInfo API.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: 
-	switched to new DesignInfo API. moved gui folder file generation
-	here instead of DesignInfo iterating over builder properties.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: 
-	Added category mangling for ToolboxItems so that they are placed
-	by project.
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: 
-	switched to new DesignInfo api.
-	* templates/Widget.xft.xml: add ToolboxItem attr.
-	* templates/WidgetPartial.xft.xml: add ToolboxItem attr.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2008-05-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Explicitly set the resource ids
-	  for gui.stetic and objects.xml, since msbuild uses different
-	  default ids.
-
-2008-05-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Track api
-	  changes.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Merged the extension points for
-	  project and solution option panels into a single extension point. A
-	  single extension point will now be used for all kinds of items.
-	  Extension conditions can be used to make panels visible only for
-	  some specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Replaced ICompilerResult/DefaultCompilerResult/CompilerResults by a
-	  new BuildResult class, which has owner information at error level,
-	  so it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore/ProjectResourceProvider.cs,
-	  MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs,
-	  MonoDevelop.GtkCore.mds, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: New project
-	  model changes.
-
-2008-05-20  Mike Kestner <mkestner@novell.com> 
-
-	* templates/Widget.xft.xml:
-	* templates/WidgetPartial.xft.xml:
-	Mark the custom widgets Visible=false to conform to the Gtk convention
-	of widgets being shown explicitly.  [Fixes #364985]
-
-2008-05-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Track API. Mark up
-	  for property grid.
-
-2008-05-13  Mike Kestner <mkestner@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: use new
-	Stetic.ApplicationFactory api.
-
-2008-05-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Track API.
-
-2008-04-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, gtk-gui,
-	  gtk-gui/generated.cs, gtk-gui/gui.stetic, Makefile.am,
-	  icons/pad-widget-tree-16.png,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Implement
-	  IOutlinedDocument instead of custom pad. Set GTK# version to 2.8.
-
-2008-03-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Removed unneeded dependency.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: fixed bugfix (thanks
-	  ankit)
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Fixed possible null
-	  reference exception.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Worked on gnome hig
-	  compliant alerts.
-
-2008-03-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed null ref.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Refactored content
-	  interfaces
-
-2008-02-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.mdp: Set correct makefile ver for files.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Worked on category
-	  support for the toolbox service.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp: Removed some unused glade
-	  and gnome-sharp references (only the unused). But I'll continue to
-	  remove glade, we need to lower the dependency tree a bit.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added IViewContent
-	  switching logic (but should be done centrally using the secondaryview
-	  paradigmn).
-
-2008-02-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Workaround for mono bug
-	  #350432.
-
-2008-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Handle the delete
-	  key in TreeViewPad, so it will work event if the shortcut is not
-	  defined.
-
-2008-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  icons/pad-widget-tree-16.png: Added widget tree icon.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Update MD version.
-
-2008-01-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Made internal
-	  some classes that don't need to be public.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Notify file changes
-	  through the FileService.
-
-2008-01-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Stetic code must be
-	  generated in the GUI thread. Should fix bug #349505.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Feed default layout
-	  name to Gettext for translation.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/ActionGroupPartial.xft.xml,
-	  templates/Window.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Make template
-	  categories translatable.
-
-2008-01-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Added null check on the
-	  result of UpdateFile. Should fix bug #352194.
-
-2008-01-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Handle
-	  projects which don't support the GTK# designer. Window and widget
-	  generation options are hidden, and code is never generated. Fixes bug
-	  #350632.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Don't update bindings if the
-	  file has syntax errors. May fix bug #347590.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump add-in versions.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am: Update after build reorg.
-
-2007-12-06  Geoff Norton  <gnorton@novell.com>
-
-	* Makefile.am: Only build the GtkCore addin if we have gnome-sharp 
-	  available.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  Makefile.am: Directory reorganization.
-
-2007-11-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: Removed
-	  Gnome.FileEntry.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Track
-	  LoggingService API changes.
-
-2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Use RootCombine
-	  instead of CurrentOpenCombine when possible.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fix nullref. Happens
-	  when removing a project from a solution while one of the windows of that
-	  project is open.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/ActionGroup.xft.xml, templates/ActionGroupPartial.xft.xml,
-	  templates/Dialog.xft.xml, templates/DialogPartial.xft.xml,
-	  templates/Widget.xft.xml, templates/WidgetPartial.xft.xml,
-	  templates/Window.xft.xml, templates/WindowPartial.xft.xml: Use tango
-	  file icons. Removed obsolete icons.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Track api changes. Added
-	  Description property.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.mdp, lib/libstetic.mdp: Project file names updated by
-	  change in MD path functions.
-
-2007-10-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mds, Makefile.am: Added custom command for updating
-	  the Stetic sources.
-
-2007-10-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Set a more meaningful category name for
-	  addin commands.
-	* MonoDevelop.GtkCore.mdp, MonoDevelop.GtkCore.mds: Updated.
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: If the current selection
-	  can't be deleted, just ignore the delete command, so the default handler
-	  will be executed. Fixes bug #325440.
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.mdp: Fix required gtk# version.
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Applied changes that
-	  were neccassary for to the new FileService.
-
-2007-10-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Changed calls for
-	  the new StringParser.
-
-2007-10-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: In Bind(), don't subscribe the
-	  NameChanged event at every call.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: The designer needs to
-	  be explicitely destroyed.
-
-2007-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: No need to implement
-	  IComparable; it's done in the base class now.
-
-2007-09-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Assign the selected
-	  target gtk# version to the new project.
-
-2007-09-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Use ProjectReference.StoredReference
-	  rather than ProjectReference.Reference, in order to refer to the actual
-	  stored reference string rather than a temporarily bumped version.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Implemented an
-	  assembly resolver for the stetic app, so assembly widgets registered
-	  with .pc files can be found.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: If a widget dll belongs
-	  to a package, store it as a package reference in the toolbox index.
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Allow setting TargetGtkVersion to
-	  DefaultGtkVersion when current value is null.
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Don't touch GTK# assembly versions
-	  when a target version is not set. Don't use gtkVersion=null to represent
-	  default version.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Set TargetGtkVersion on new
-	  projects. Bump default version to 2.8.
-
-2007-09-17  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  lib/Makefile.am, MonoDevelop.GtkCore.mds, Makefile.am: Use projects for
-	  imported stetic libraries.
-
-2007-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Removed access to
-	  Component object.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Remove unused method.
-
-2007-09-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: Fix warnings.
-
-2007-09-13  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* lib/stetic, Makefile.am, lib/Makefile.am: Build stetic from 
-	  svn:externals.
-	* lib/libsteticui.dll.config, lib/libstetic.dll.config,
-	  lib/libstetic.dll, lib/libsteticui.dll: Removed.
-
-2007-09-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Remove
-	  deprecated FileOptions element from templates.
-
-2007-09-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Changed the way to
-	  set the active designer (the api changed). Fixed some renaming issues.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Track api changes.
-
-2007-09-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/Window.xft.xml: Oops, PartialTypeSupport should be set to
-	  Disabled for non-partial window.
-
-2007-09-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs: Use DotNetProject.UsePartialTypes
-	  instead of custom setting.
-	* MonoDevelop.GtkCore/WidgetFileTemplatePartialClass.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplateFullClass.cs: No longer needed.
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Use
-	  PartialTypes condition instead of custom file template.
-
-2007-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fixes for bugs #82671, #82527, #82476, #81763 and #81238.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs: Changes due to new
-	  property infrastructure.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs: By default use the project name
-	  as category name for new custom widgets.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Don't show the full
-	  name of widgets in the toolbar.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: In FindClass, make
-	  sure the getUserClass parameter is taken into account when the found
-	  class is not a multi-part class. Fixes bug #82258.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Removed the CommandService class.
-	  Everything is done directly with CommandManager. Moved all extension
-	  node types to MD.Components.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp, Makefile.am: Reorganized the extension point
-	  hierarchy. Embedded all add-in manifests as resources.
-	* lib/libstetic.dll: Updated from stetic module.
-
-2007-08-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Improved error
-	  reporting.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Converted
-	  DispatchService to a static class.
-
-2007-08-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated.
-
-2007-07-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed some
-	  problems with the target gtk version. It was not assigned to the
-	  stetic project. Also fixed some stock icon rendering issues in
-	  Stetic.
-
-2007-07-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes a nullref fix.
-
-2007-07-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Layout switch
-	  delay is not needed anymore.
-
-2007-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Fix nullref
-	  when gtk support is not enabled. Patch by Chris Howie.
-
-2007-07-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Don't try to use the CurrentNode property after adding the file,
-	  since it may have changed. Should fix bug #82123.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	  Fixes bugs #81846 and #82144.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix window
-	  source file lookup.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Use the new methods
-	  for checking clipboard operations on the current selection.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Include the
-	  current project in the list of libraries to show in the toolbox.
-	  Fixes bug #82125.
-
-2007-07-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated. Fixes bugs 81977,
-	  81810 and 82052.
-
-2007-07-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Properly rename
-	  fields when the widget name is changed. Fixes bug #81976.
-
-2007-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Update the
-	  properties pad when the focus is on the widget tree pad. Fixes bug
-	  #81971.
-
-2007-07-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added null
-	  check.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track api changes
-	  in DesignerSupport. When adding a project reference to a widget
-	  library, take into account that widgets may be implemented in a
-	  library different from the one providing the widget list.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: In
-	  GetDynamicItems, only return widgets provided by libraries
-	  referenced by the project. Don't return widgets from libstetic
-	  since those are already included by default in the toolbox.
-	  Implemented IToolboxDefaultProvider.
-
-2007-07-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Changed a bit
-	  because of the removal of custom collections in the Ide project.
-
-2007-06-30 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* gui.glade: Fixed capitalization.
-
-2007-06-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: Don't show windows
-	  in the toolbox.
-	* lib/libstetic.dll, lib/libsteticui.dll: Updated from Stetic module.
-
-2007-06-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Allow selecting
-	  the target GTK# version of the project.
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Implemented a
-	  toolbox loader, which allows registering assemblies in the toolbox.
-	  When a widget from a toolbox is dropped to a window, MD will now
-	  add a reference to the required assembly.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll: One last update.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Set the import
-	  file callback when editing project stock icons.
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: The GetResources
-	  method only returns resource files now.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-06-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Default pad
-	  placement is now specified in the xml file.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: In GetBaseType, use
-	  Project.GetWidgetTypes to get all registered wiget types, including
-	  base widget types (which were not provided by GetComponentTypes).
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fix for bug #81785.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Don't include non-public
-	  members to the objects.xml file.
-
-2007-05-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Fix feature message.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	  Includes fixes for bugs #81761, #81758 and #81762.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	  (UpdateLibraries) Properly check for library changes.
-
-2007-05-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Fixes bugs #80783 and #81683.
-
-2007-05-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Added new dependency.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn. Fixes bug
-	  #81590.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When selecting an
-	  image file in the widget designer, import the file into the
-	  project.
-
-2007-05-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added some delay
-	  in the code that changes the workbench layout when selecting the
-	  designer. Fixes bug #80963.
-
-2007-05-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPalettePad.cs: Removed old
-	  palette pad.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Set the 'internal' flag for
-	  widgets implemented by private classes.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn module.
-	  Fixes bugs #80875, #81261, #81365.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: If the project
-	  is a library, add itself as an internal widget library, so widgets
-	  with internal visibility will be shown.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: When saving a window,
-	  use the visibility of the class to set the visibility of the
-	  component. Together with all changes done in stetic, fixes bug
-	  #80875.
-
-2007-05-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Track api changes in
-	  Stetic.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Delay
-	  library updating until really necessary.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Copy the .addins.xml file to the output dir.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Copy stetic dlls together with the assembly.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Reference shared assemblies
-	  from the correct location.
-
-2007-05-04  Wade Berrier  <wberrier@novell.com> 
-	* lib/libstetic.dll.config:
-	* lib/libsteticui.dll.config:
-	Fix os attribute formats (mono-config.c separates oses by comma, 
-	and ignores or includes the whole string.)
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am:
-	  Migration to Mono.Addins.
-
-2007-04-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs, Makefile.am:
-	  Implemented project feature for enabling gtk# support in new
-	  projects.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Use
-	  Menu icon size in the project pad.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-04-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show a
-	  relative path in the window delete confirm dialog, since the
-	  absolute path may take too much space.
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Add
-	  Ok/Cancel buttons by default in new dialogs.
-
-2007-03-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fixes for bugs 81033, 81086, 81239, 81143, 81014 and
-	  81015.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Allow pasting when
-	  a placeholder is selected. Fixes bug #81246.
-
-2007-03-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp, Makefile.am, icons/image-x-generic.png:
-	  Show a "Stock Icons" node in the User Interface folder. It's easier
-	  to discover than the context menu option.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.Commands/GladeCommands.cs: Added menu option
-	  for opening the gtk# settings.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Don't crash if
-	  the gtk-gui folder doesn't exist. Fixes bug #81152.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Hide the border
-	  of the combined view notebook.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated from stetic module. Fixes NRE crash.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Fix null ref.
-
-2007-03-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Register a new toolbox loader. Removed
-	  old properties pads.
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Added reference to
-	  MonoDevelop.DesignerSupport.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Integrate Stetic
-	  widgets in the main toolbox.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Implement
-	  ICustomPropertyPadProvider and return the Stetic property pad.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Renamed.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Fix warning.
-
-2007-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	Updated from Stetic module. Includes fix for bug #80864.
-
-2007-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from SVN. Fixes some
-	  memory leaks and bug #79453.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Explicitely
-	  destroy notebook children, since notebook doesnt do it because of a
-	  gtk bug.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Some fixes in the
-	  dispose code.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Use
-	  ProjectOperations.SaveProject to save projects.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix nullref.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Log
-	  error message.
-	* Makefile.am, MonoDevelop.GtkCore.mdp: Synchronized MD project and
-	  makefile.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Avoid throwing
-	  delayed events after the project has been disposed.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added missing
-	  null check.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Ask for user
-	  confirmation when reloading a designer only when the designer has
-	  unsaved changes.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Detect external
-	  changes in the gui.stetic files, and reload it when it changes.
-	  Take into account that the load of gui.stetic can fail. Added
-	  several workarounds for this case.
-
-2007-02-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from SVN. Includes
-	  fixes for bugs #80722, #79427 and #80127.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Store some
-	  Stetic configuration in the MD properties.
-
-2007-02-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added options
-	  for enabling/disabling gtk support, and for gettext support.
-	* MonoDevelop.GtkCore.addin.xml: Change options panel name.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Make sure the
-	  MD project is saved together with the stetic project, if necessary.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Avoid saving
-	  the MD project twice.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: If gtk
-	  integration status changes for a project, refresh the tree.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Null check.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for gettext and
-	  gettext class options for generated code.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Added events for notifying
-	  when the gtk integration status changes for a project.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am: distcheck fixes
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When a designer
-	  project is disposed, hide the designer view in the editor.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Factorized some code into GtkDesignInfo.
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Make sure the code generation
-	  extension is executed before the last step.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Hide the add window commands when the project is not DotNet
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.dll, lib/libstetic.dll:
-	  Updated.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Intercept calls
-	  to the IPositionable interface, and show the editor page when
-	  jumping to a line.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: When looking for
-	  the window class, avoid returning the generated partial class.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Show the editor
-	  page when jumping to a signal handler.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Warn the user if
-	  the gtk-sharp-2 package can't be found. Some distros don't include
-	  the .pc file in the gtk# package, only in the -devel package.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-01-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll.config, lib/libsteticui.dll, lib/libstetic.dll,
-	  lib/libsteticui.dll.config: Updated from Stetic module.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Track api
-	  changes in Document class.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated form Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Removed
-	  implementation of all text editor interfaces. Now the view
-	  overrides GetContent and calls editor.GetContent when a requested
-	  interface is not found.
-
-2007-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Removed unused namespace.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Use the new base-type property
-	  to describe custom widgets. When looking for properties and events,
-	  look in the base classes as well as in the widget class.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectSignalDescriptor.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectPropertyDescriptor.cs:
-	  Removed unused files. All widget library functionality has been
-	  moved to stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Removed all
-	  widget library management, which has been moved to Stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Added some null checks.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Use the new way
-	  of managing dependencies in projects.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml: The
-	  window constructor now takes the window type.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Some gui
-	  improvements and added some null checks.
-
-2007-01-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't crash if the
-	  designer can't be loaded for some reason.
-
-2007-01-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplatePartialClass.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplateFullClass.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs,
-	  templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml,
-	  templates/ActionGroup.xft.xml, templates/DialogPartial.xft.xml,
-	  templates/Dialog.xft.xml: Implemented support for generating code
-	  in partial classes.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Use the
-	  correct method for saving the project.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Refresh the user
-	  interface folder when the gui project is reloaded.
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for partial
-	  classes. In the GuiBuilderProject property, don't update the
-	  gtk-gui folder since this call may change the contents of the
-	  project, and weird things happen when called by the project pad to
-	  fill the tree.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am: Added new files.
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	  Make it work even when the assembly it references has been deleted
-	  (maybe as a result of cleaning a project). In this case the widget
-	  library is shown as empty.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added support
-	  for Loading/Unloading a project, to optimize use of memory for
-	  solutions with many gui projects. Implemented support for
-	  generating code in partial classes.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Implemented
-	  support for generating code in partial classes. Implemented support
-	  for UNDO/REDO.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Generation of gui code is now done from the Build method of a
-	  project service extension. Fixes some issues when building a
-	  project which contains custom components.
-
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Track API changes in
-	  FileService.
-
-2006-12-13 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Don't
-	generate stetic code if CurrentOpenCombine is null.
-
-2006-12-07 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* MonoDevelop.GtkCore.mdp: Updated to it can be
-	built from MonoDevelop.
-
-2006-11-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Simplified the
-	  code by using global events from the Ide, instead of combine
-	  events.
-
-2006-10-18 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added RemoveExportedWidget method.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: track
-	  API changes.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: If the name of a
-	  widget changes and it is being exported, update it in the objects.xml
-	  file. Fixes bug #79656.
-
-2006-09-23 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module. It provides a redesigned API
-	  which will allow running designers in a separate process.
-	
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs:
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPalettePad.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs:
-	  Track api changes.
-	
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs: Make sure
-	  parse information is up to date before loading an assembly library.
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Make sure this object
-	  is always alive when remoted.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added null check.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Not needed anymore.
-	* MonoDevelop.GtkCore.addin.xml: Removed build step. Code generation
-	  is done now before compiling.
-	  
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectWidgetLibrary.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/CachedProjectWidgetLibrary.cs:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: ProjectWidgetLibrary is not used
-	  anymore. All libraries are now handled by AssemblyReferenceWidgetLibrary.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
-	  Moved to Stetic.
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-09-23 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track api changes.
-
-2006-09-19 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* .: Added svn:ignore for MonoDevelop.GtkCore.pidb
-
-2006-09-01 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from stetic module. Includes fix for bug #79247.
-	
-2006-09-01 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from stetic module.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Save the project after editing the icons.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Set the
-	  ResourceProvider for the main stetic project. Added null check.
-
-2006-08-30 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fixed bug about 
-	  adding the wrong widget as action designer page.
-
-2006-08-30 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Only export properties which
-	  return primitive types. Fixes bug #79195.
-	* lib/*: Updated from stetic module.
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: Unsubscribe close
-	  event when done.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Handle designer
-	  commands in its own tab page.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Explicitely dispose
-	  custom widgets to avoid memory leaks.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Track api changes.
-	
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-08-18 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* gui.glade: Minor fix.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Track api
-	  changes.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Stetic files don't need
-	  to be added as resource to projects.
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: Make it
-	  work for action groups.
-	* lib/*: several fixes.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added method
-	  for removing an action group.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track API changes
-	  in Stetic. Properly bound edit commands from the main menu.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.addin.xml: Implemented Open and Delete
-	  commands for global action groups.
-	  
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-08-11 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module. Includes fixes for
-	  bugs #79043, #79044 and #79045
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Don't
-	  crash if something goes wrong when binding a class.
-	  Fixed nullref.
-
-2006-08-04 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  CreateContentForFile should not load the file, just create
-	  the view.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Add
-	  support for IEncodedTextContent.
-
-2006-08-01 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	  Set the resource provider before loading the project.
-	  Fixes bug #78966.
-	  
-	* libs/*: Updated from Stetic module. Fixes several bugs:
-	  78938, 78916, 78909, 78956, and 78867.
-
-2006-07-27 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs:
-	  Added null check.
-	  
-	* MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	  Get the parser context using the assembly file name, not the full
-	  assembly name.
-
-2006-07-25 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Factorized several
-	  more or less duplicate methods into GuiBuilderProject, specially
-	  methods for locating the class bound to a window. GuiBuilderProject
-	  now will explicitelly update the parser database the first time it
-	  needs to locate a class, so it will work even if the parser service
-	  is busy parsing assemblies.
-
-2006-07-24 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated from stetic module. Fixes a bug
-	  in the table wrapper which may cause an endless loop.
-
-2006-07-05 Matej Urbas <matej.urbas@gmail.com>
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs: Updated to use
-	  ReturnType as BaseTypes in IClass instances.
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fixed automatic
-	  layout switch policy.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fix showing of
-	  action group view.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Properly
-	  bind actions when pressing "BindToField".
-	  
-	* MonoDevelop.GtkCore.addin.xml: Updated versions. 
-
-2006-06-29  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Only display WidgetBuilderOptionPanel 
-	for "DotNet" projects.
-
-2006-06-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Switch to the
-	  designer workbench layout when selecting an action group file.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Support jumping
-	  to signal hanlder when double-clicking it in the signals editor.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Removed debug code.
-	
-	* templates/ActionGroup.xft.xml:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: 
-	  Fix code generation of action groups.
-
-2006-06-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: If a member has a [Browsable(false)]
-	  attribute, don't add it to the objects.xml file. Also don't add
-	  read-only properties.
-	* lib/*: Updated from stetic module. Fixes bugs #78622 and #78620.
-	  Adds an icon for expander and fixes a bug in ColorButton (fix by ml)
-
-2006-06-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/libsteticui.dll:
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs:
-	  Track changes in the api.
-
-2006-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Several improvements.
-	  Also fixes bug #78160.
-	
-2006-05-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	  Added DisplayName property.
-
-2006-05-29  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: reverted interface changes - missing file change
-	
-2006-05-29  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: reverted interface changes
-
-2006-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Adds support for toolbars.
-
-2006-05-23  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: track api changes
-	
-2006-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Commands/GladeCommands.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.addin.xml: Added commands for creating
-	  an action group and editing the project icons.
-	  
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show local
-	  action groups as children of the window node.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Moved
-	  some event subscriptions to WindowsFolder.cs
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Open the
-	  corresponding file when clicking on local action groups.
-	  
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Added action group template.
-	
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Added support for
-	  action group file templates.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Notify changes in
-	  local action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show the actions
-	  tab until there is at least one action group.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Don't show
-	  properties or signals for global actions.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added virtual method
-	  OnActiveDocumentChanged, which is called when the view is brought to front.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Use the new MemberName
-	  field when binding fields.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Several minor fixes.
-	  
-	* lib/*: Updated.
-	  
-
-2006-05-12 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Initial support for the menu editor. Still very unstable!!
-	
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.addin.xml: Register a node builder and and
-	  display binding for action groups.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Update
-	  the folder when action groups change.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Fix nullref.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Factorized
-	  some code into CodeBinder.cs
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Factorized some
-	  code into CombinedDesignView.cs.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: New node
-	  builder for action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: New display
-	  binding for editing global action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs: Moved from
-	  GuiBuilderView.cs.
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs: A new
-	  toolbar for the action group designer.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: A view for editing
-	  global action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Moved here some code
-	  from GuiBuilderEditSession.cs.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Moved here some
-	  code from GuiBuilderView.cs.
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Added new files.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track api changes.
-	
-2006-05-05 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/libstetic.dll: Updated from Stetic module. Includes
-	  a fix for bug #78307.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Updated versions.
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-05-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from Stetic module. Includes fixes for
-	  bugs #78266, #78240 and #78276.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track changes
-	  in the Stetic API.
-
-2006-04-24 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Don't
-	  crash if a stetic project can't be loaded. Fixes bug #78169.
-	* lib/libstetic.dll: Updated from Stetic module. Fixes bug #78167.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Fixed construction of
-	  scales and scrollbars.
-
-2006-04-19 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs: When
-	  creating a widget from a widget design, remove the signals since
-	  those signals reference handlers in the widget class, not the
-	  widget container class.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Fix nullref in some themes.
-
-2006-04-10 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Fix typo.
-	* libs/*: Fix for #78111, #78092 and #78090.
-
-2006-04-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Save the project
-	  after adding or removing a resource.
-
-2006-04-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated.
-
-2006-03-31 Lluis Sanchez Gual <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Get open
-	  combine events in the GUI thread.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Properly
-	  delete signals for which there isn't a handler. Half fixed field
-	  renaming.
-	* lib/*: Updated.
-
-2006-03-31 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml: Fix ID and
-	  description. Added stetic config files to add-in package.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Updated references.
-
-2006-03-29 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	  Don't crash if no parse info is available for the file
-	  being edited. Should fix #77885.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show
-	  the bind to field button for the root container.
-	* lib/*: Updated.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Makefile.am: Use an unified format. Patch by Matze Braun.
-	* MonoDevelop.GtkCore.addin.xml: Updated add-in versions.
-
-2006-03-22 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore.mdp: Removed GladeFileDisplayBinding.
-	* lib/*: Updated.
-	* Makefile.am: Updated. Some files have been moved to Stetic.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fixed
-	  layout switching. Don't show the widget tree pad by default,
-	  since it is already available as a combo in the designer.
-	* MonoDevelop.GtkCore.GuiBuilder/GladeFileDisplayBinding.cs: Removed.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: use
-	  the new property tree instead of the grid.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: The designer
-	  toolbar has been moved to Stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Changed
-	  default placement.
-
-2006-03-19  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* .: Added Makefile.in and Makefile to svn:ignore.
-
-2006-03-15 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Updated.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for using
-	  resource images in the designer.
-	  
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Check if the objects.xml
-	  file exists before loading it.
-	* MonoDevelop.GtkCore/GeneratorBuildStep.cs: Don't generate code
-	  if the stetic file has not been modified since the last
-	  generation.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: If Gtk
-	  support is not enabled, don't enable it if no widgets have
-	  been selected.
-	* lib/libstetic.dll: Updated.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Mapped some
-	  commands.
-	* templates/Window.xft.xml: The constructor of Gtk.Window requires
-	  the title of the window.
-
-2006-03-04 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Updated.
-	* MonoDevelop.GtkCore/GeneratorBuildStep.cs: When generating
-	  code for a project that exports widgets, include the own
-	  project library to the generation, since there can be
-	  widgets that contain other widgets defined in the project.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs:
-	  removed some IdeApp dependencies.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectWidgetLibrary.cs:
-	  added method for getting the class information from
-	  a project.
-	* CachedProjectWidgetLibrary.cs: New widget library class
-	  which takes class information from a collection of 
-	  ProjectClassInfo objects.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectPropertyDescriptor.cs:
-	  Consider all properties runtime-properties, since they have 
-	  been created from class properties.
-	* lib/*: Updated.
-
-2006-03-03 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* Makefile.am: removed debug files.
-
-2006-03-02 Lluis Sanchez Gual  <lluis@novell.com>    
- 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Propagate
-	  project changes to the editor.
- 
-2006-03-02 Lluis Sanchez Gual  <lluis@novell.com>   
- 
-	Initial implementation of the Stetic add-in.
diff --git a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.Commands/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.Commands/ChangeLog
deleted file mode 100644
index b2765325e1..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.Commands/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GladeCommands.cs: 
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.Dialogs/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.Dialogs/ChangeLog
deleted file mode 100644
index c48d43c59e..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.Dialogs/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* ProjectConversionDialog.cs: 
-
-2010-08-13  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* ProjectConversionDialog.cs:
-	* WidgetBuilderOptionPanel.cs: 
-
-2010-07-06  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ProjectConversionDialog.cs: 
-
-2010-06-23  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ProjectConversionDialog.cs: Initial commit
-	* WidgetBuilderOptionPanel.cs: 
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.GuiBuilder/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.GuiBuilder/ChangeLog
deleted file mode 100644
index a57bb556bb..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.GuiBuilder/ChangeLog
+++ /dev/null
@@ -1,101 +0,0 @@
-2010-10-28  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiBuilderView.cs:
-	* GuiBuilderWindow.cs:
-	* GuiBuilderProject.cs: 
-
-2010-09-08  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GuiBuilderWindow.cs:
-	* GuiBuilderService.cs:
-	* CombinedDesignView.cs: 
-
-2010-08-30  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GuiBuilderProject.cs: 
-
-2010-08-16  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GuiBuilderView.cs:
-	* ActionGroupView.cs:
-	* GuiBuilderProject.cs:
-	* GuiBuilderService.cs:
-	* GuiBuilderDisplayBinding.cs:
-	* ActionGroupDisplayBinding.cs:
-	* GtkProjectServiceExtension.cs: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GuiBuilderProject.cs: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GuiBuilderProject.cs:
-	* GuiBuilderService.cs: 
-
-2010-08-13  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GuiBuilderView.cs:
-	* GuiBuilderProject.cs:
-	* GuiBuilderService.cs:
-	* GuiBuilderDisplayBinding.cs:
-	* ActionGroupDisplayBinding.cs: 
-
-2010-08-09  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GuiBuilderProject.cs: Generate stetic code after a project converting
-	* GuiBuilderService.cs:
-	* GuiBuilderDisplayBinding.cs: Don't use component display binding for
-	generated partial files
-
-2010-08-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiBuilderView.cs: Raise OnDirtyChanged after saving.
-	* CombinedDesignView.cs: Track Api Changes.
-
-2010-08-05  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GuiBuilderView.cs: Remove ModifiedChanged handler
-
-2010-08-04  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* CodeBinder.cs: Bump Api
-	* GuiBuilderWindow.cs:
-	* GuiBuilderService.cs:
-	* CombinedDesignView.cs:
-	* ActionGroupDisplayBinding.cs: 
-
-2010-08-03  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiBuilderProject.cs: When Updatinglibraries don't save 
-							if Stetic.Project was uninitialized
-
-2010-07-27  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiBuilderView.cs:
-	* CombinedDesignView.cs: 
-
-2010-07-06  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiBuilderProject.cs:
-	* GuiBuilderService.cs: 
-
-2010-07-05  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiBuilderProject.cs:
-	* CombinedDesignView.cs: 
-
-2010-06-23  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiBuilderProject.cs: 
-
-2010-06-21  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiBuilderProject.cs: Add Convert method
-
-2010-06-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiBuilderProject.cs:
-	* GuiBuilderService.cs:
-	* GtkProjectServiceExtension.cs: 
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.NodeBuilders/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.NodeBuilders/ChangeLog
deleted file mode 100644
index f73c1a92e9..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore.NodeBuilders/ChangeLog
+++ /dev/null
@@ -1,83 +0,0 @@
-2010-09-17  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GuiProjectFolderNodeBuilder.cs: 
-
-2010-09-09  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* ProjectNodeBuilder.cs: 
-
-2010-08-30  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* ProjectFileNodeBuilderExtension.cs: 
-
-2010-08-17  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* WindowsFolder.cs:
-	* WidgetNodeBuilder.cs:
-	* WindowsFolderNodeBuilder.cs:
-	* ProjectFileNodeBuilderExtension.cs: 
-
-2010-08-16  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* ProjectNodeBuilder.cs:
-	* GuiProjectFolderNodeBuilder.cs:
-	* ProjectFolderNodeBuilderExtension.cs: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* ProjectNodeBuilder.cs:
-	* GuiProjectFolderNodeBuilder.cs: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* ProjectFileExtension.cs:
-	* GuiProjectFolderNodeBuilder.cs:
-	* ProjectFileNodeBuilderExtension.cs:
-	* ProjectFolderNodeBuilderExtension.cs: 
-
-2010-08-13  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* ProjectNodeBuilder.cs:
-	* StockIconsNodeBuilder.cs:
-	* ProjectFileNodeBuilderExtension.cs:
-	* ProjectFolderNodeBuilderExtension.cs: 
-
-2010-08-09  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GuiProjectFolder.cs: Put gui project folder directly below References
-	in the project pad
-	* ProjectNodeBuilder.cs:
-	* GuiProjectFolderNodeBuilder.cs:
-	* ProjectFolderNodeBuilderExtension.cs: 
-
-2010-07-06  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ProjectFileExtension.cs: Move cursor in entryFolder to the end.
-
-2010-07-05  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ProjectFileExtension.cs: Better approach for obtaining GtkComponentType
-	* ProjectFileNodeBuilderExtension.cs:
-	* ProjectFolderNodeBuilderExtension.cs: 
-
-2010-06-28  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ProjectNodeBuilder.cs:
-	* ProjectFileNodeBuilderExtension.cs:
-	* ProjectFolderNodeBuilderExtension.cs: 
-
-2010-06-23  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ProjectNodeBuilder.cs:
-	* ProjectFileNodeBuilderExtension.cs: Show ProjectConversionDialog before
-	conversion
-
-2010-06-21  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ProjectNodeBuilder.cs: Convert a project file layout on open	
-	* ProjectFileNodeBuilderExtension.cs: Group components files
-
-2010-06-16  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ProjectFileNodeBuilderExtension.cs: 
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore/ChangeLog
deleted file mode 100644
index a613ab6eb0..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore/ChangeLog
+++ /dev/null
@@ -1,68 +0,0 @@
-2010-09-20  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* WidgetFileDescriptionTemplate.cs: 
-
-2010-09-17  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-09-09  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-09-08  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* WidgetFileDescriptionTemplate.cs: 
-
-2010-08-30  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-08-27  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-08-17  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-08-16  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* WidgetFileDescriptionTemplate.cs: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-08-13  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-08-09  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GtkDesignInfo.cs:  Add ComponentNeedsCodeGeneration method,
-
-2010-08-04  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* WidgetFileDescriptionTemplate.cs: Bump Api
-
-2010-07-06  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GtkDesignInfo.cs: Remove gtk-gui folder after project conversion
-
-2010-06-23  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-06-16  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GtkDesignInfo.cs: 
-
-2010-06-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GtkDesignInfo.cs:  Transition from project file name to project folder.
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml b/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
index d86f60ec76..68333ec2a5 100644
--- a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
+++ b/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
@@ -175,7 +175,7 @@
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/Core/MimeTypes">
-		<MimeType id="text/x-gtkx" _description="Gtk# designer file" icon="gtk-page-setup" isText="true">
+		<MimeType id="text/x-gtkx" _description="Gtk# designer file" isText="true">
 			<File pattern="*.gtkx" />
 		</MimeType>
 	</Extension>
diff --git a/main/src/addins/MonoDevelop.GtkCore2/changes.patch b/main/src/addins/MonoDevelop.GtkCore2/changes.patch
index 9fbc84e921..9857ba3bd7 100644
--- a/main/src/addins/MonoDevelop.GtkCore2/changes.patch
+++ b/main/src/addins/MonoDevelop.GtkCore2/changes.patch
@@ -4034,7 +4034,7 @@ Index: MonoDevelop.GtkCore.addin.xml
  	</Extension>
  	
 +	<Extension path = "/MonoDevelop/Core/MimeTypes">
-+		<MimeType id="text/x-gtkx" _description="Gtk# designer file" icon="gtk-page-setup" isText="true">
++		<MimeType id="text/x-gtkx" _description="Gtk# designer file" isText="true">
 +			<File pattern="*.gtkx" />
 +		</MimeType>
 +	</Extension>
diff --git a/main/src/addins/MonoDevelop.GtkCore2/gtk-gui/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/gtk-gui/ChangeLog
deleted file mode 100644
index 3e2aea8cac..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/gtk-gui/ChangeLog
+++ /dev/null
@@ -1,50 +0,0 @@
-2010-08-27  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* gui.stetic: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* gui.stetic:
-	* MonoDevelop.GtkCore.Dialogs.ProjectConversionDialog.cs: 
-
-2010-08-13  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* gui.stetic: 
-
-2010-08-09  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* gui.stetic: 
-
-2010-08-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gui.stetic: 
-
-2010-08-05  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* gui.stetic: 
-
-2010-08-04  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* gui.stetic: 
-
-2010-08-03  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gui.stetic: 
-
-2010-07-05  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gui.stetic: 
-
-2010-06-23  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gui.stetic:
-	* MonoDevelop.GtkCore.Dialogs.ProjectConversionDialog.cs: 
-
-2010-06-16  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gui.stetic: 
-
-2010-06-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* gui.stetic: 
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/icons/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/icons/ChangeLog
deleted file mode 100644
index 86f901e6a8..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/icons/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* gtkx.png:
-	* gtk-logo.png: 
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/libstetic/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/libstetic/ChangeLog
deleted file mode 100644
index 4d98b372cf..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/libstetic/ChangeLog
+++ /dev/null
@@ -1,1793 +0,0 @@
-2010-10-28  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am: 
-
-2010-10-04  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* TypedClassDescriptor.cs: 
-
-2010-09-30  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Registry.cs: 
-
-2010-09-30  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Registry.cs:
-	* TypedClassDescriptor.cs: 
-
-2010-09-21  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* wrapper/Bin.cs: Set RootWrapperName
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* DND.cs:
-	* IProject.cs: 
-
-2010-08-13  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* GeneratorContext.cs: 
-
-2010-08-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* IProject.cs: Remove Modified property, add WasModified method which check state of a given top level
-
-2010-08-03  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* GladeUtils.cs: Set ObjectWrapper.RootWrapperName when reading from xml
-	* WidgetUtils.cs:
-	* ObjectReader.cs:
-	* ObjectWrapper.cs:
-	* wrapper/Frame.cs:
-	* wrapper/Window.cs:
-	* wrapper/MenuItem.cs:
-	* wrapper/Expander.cs:
-	* undo/UndoManager.cs:
-	* wrapper/Notebook.cs:
-	* wrapper/Container.cs:
-	* wrapper/OptionMenu.cs: 
-
-2010-08-03  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ObjectWrapper.cs: Save a root wrapper name
-
-2010-06-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* IProject.cs:
-	* ErrorWidget.cs: 
-
-2010-04-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* editor/ActionMenu.cs: Explicit destroy of children should
-	  not be required.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* editor/ActionMenu.cs: moved code from dispose -> destroy.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* editor/ActionMenu.cs:
-	* editor/ActionToolbar.cs:
-	* editor/ActionMenuBar.cs: Destroy gtk components instead of
-	  disposing them.
-
-2010-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GladeUtils.cs: Fix glade import. GtkWindow and GtkDialog
-	  need to be special cased, since we are not creating real
-	  Gtk.Window objects anymore.
-
-2010-04-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Misc.cs: Show alignment buttons as toggles.
-
-2010-03-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Widget.cs:
-	* wrapper/Container.cs: When setting the name of a widget,
-	  make sure the old name field is also set. Fixes bug #549463
-	  - Forms designer renames variables it shouldn't.
-
-2010-01-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* TypedPropertyDescriptor.cs: Don't translate property names
-	  in the property grid. See bug #571351.
-
-2010-01-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* GeneratorContext.cs: When loading an icon, don't hardcode
-	  the required size. Instead, call SizeLookup to get the
-	  correct size for the current theme.
-
-2010-01-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* ImageInfo.cs:
-	* wrapper/Bin.cs:
-	* WidgetUtils.cs:
-	* libstetic.csproj:
-	* ObjectWrapper.cs:
-	* wrapper/Action.cs:
-	* wrapper/Widget.cs:
-	* wrapper/VScale.cs:
-	* wrapper/HScale.cs:
-	* wrapper/MenuBar.cs:
-	* wrapper/Expander.cs:
-	* GeneratorContext.cs:
-	* wrapper/Notebook.cs:
-	* wrapper/ComboBox.cs:
-	* wrapper/Container.cs:
-	* RadioGroupManager.cs:
-	* wrapper/VScrollbar.cs:
-	* ProjectIconFactory.cs:
-	* wrapper/HScrollbar.cs:
-	* wrapper/ToolButton.cs:
-	* wrapper/ActionTree.cs:
-	* wrapper/ActionGroup.cs:
-	* wrapper/ComboBoxEntry.cs:
-	* wrapper/ActionToolbarWrapper.cs:
-	* wrapper/RadioActionGroupManager.cs: Use global:: for type
-	  references in generated code. 
-
-	* Placeholder.cs:
-	* editor/Flags.cs:
-	* editor/Enumeration.cs:
-	* editor/ActionMenuItem.cs:
-	* editor/ActionToolItem.cs: Fix warnings.
-
-2009-12-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.csproj: Flush.
-
-2009-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Table.cs: Fix table creation issue. Sync call has no
-	  effect while loading a widget.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Widget.cs: Fix check for top level window.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* wrapper/MenuBar.cs:
-	* wrapper/ActionToolbarWrapper.cs: Propagate the menu name to
-	  the action tree. Fixes bug #540512.
-
-2009-11-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ObjectReader.cs:
-	* ObjectWrapper.cs:
-	* ClassDescriptor.cs: Ensure the Loading flag is set when
-	  loading internal children of a widget.
-
-2009-11-05  Mike Kestner  <mkestner@novell.com>
-
-	* wrapper/*.cs: improper new keyword warning cleanup.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* libstetic.csproj: Reference mono-cairo package.
-
-2009-10-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Widget.cs: Don't fire the name changed event while
-	  loading.
-
-	* wrapper/Container.cs: Set the loading flag when loading.
-
-2009-10-16  Mike Krüger  <mkrueger@novell.com>
-
-	* DND.cs:
-	* WidgetUtils.cs:
-	* CommandDescriptor.cs:
-	* editor/Translatable.cs:
-	* editor/ActionMenuItem.cs: Handled icon loading failures.
-
-2009-09-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Paned.cs: Avoid unnecessary Changed event.
-
-2009-09-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper\Paned.cs: Restore the paned position after
-	  realizing. It may have been reset during the realization.
-	  Fixes bug #542227.
-
-2009-09-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Widget.cs: Fire name change event when name changes.
-	  Fixes bug #540512 - NullReferenceException in stetic
-	  generated code.
-
-2009-09-10  Christian Hergert  <chris@dronelabs.com>
-
-	* libstetic/libstetic.dll.config: Use quartz on osx.
-
-2009-09-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Action.cs: For stock gtk and gnome icons, use the
-	  stock id as base name for the action identifier. Fixes bug
-	  #525571.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.csproj: Updated dependencies. We now depend on
-	  gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Container.cs: Properly validate widget ids when
-	  pasting a child. If there is a conflict, the child has to be
-	  modified. Fixes bug #530086 - When copy/pasting widgets in
-	  stetic, the original is renamed.
-
-2009-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Notebook.cs: Fix issue with adding a widget with
-	  ShowScrollbars=true to a notebook. Fixes bug 526434 -
-	  Notebook Tab Labels Revert Back to "Page 1".
-
-2009-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/ComboBox.cs:
-	* wrapper/ComboBoxEntry.cs: Changed the sensitivity mode to
-	  'always on'. Since gtk+ 2.14, empty combos are disabled by
-	  default.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Fix invalid xml.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Fix some default values.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Make sure the default value for
-	  HasSeparator is true.
-
-2009-07-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Removed Version=2.6.0.0 specification
-	  from Pango.EllipsizeMode type. This allows other GTK
-	  versions to work. Patch by Daniel Newton.
-
-
-2009-07-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ClassDescriptor.cs: When creating a widget instance,
-	  initialize the properties after creating the wrapper, since
-	  some properties may be implemented in the wrapper. This
-	  should fix bug #505083 - hbuttonbox1.cs file being created
-	  in gtk-gui causing problems with compilation.
-
-2009-05-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Placeholder.cs:
-	* libstetic.csproj: Improved the look of placeholders.
-
-2009-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* ItemDescriptor.cs: Added missing BindingFlags.Instance flag.
-
-	* wrapper/Container.cs: Fix bug when showing the selection
-	  box.
-
-	* TopLevelWindow.cs:
-	* TopLevelDialog.cs:
-	* wrapper/Dialog.cs:
-	* wrapper/Window.cs:
-	* wrapper/objects.xml: Top level windows are not represented
-	  using a Gtk.Window anymore at design time. Instead they are
-	  represented by TopLevelWindow. This is a regular widget, so
-	  window embedding hacks are not required anymore. The same
-	  has been done for Gtk.Dialog/TopLevelDialog.
-
-	* libstetic.csproj: Added new files.
-
-	* Makefile.am: Updated.
-
-	* DND.cs: Accept copy as drop target. Fixed the target list.
-
-	* TypedClassDescriptor.cs: Invocation of a constructor does
-	  not need an instance reference.
-
-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Registry.cs: Make sure GetType can find the type when the
-	  provided assembly name does not have version info.
-
-	* libstetic.csproj: Copy the config file to the output dir.
-
-	* TypedPropertyDescriptor.cs: Catch ambiguous match exception
-	  when looking for properties. 
-
-2009-04-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.csproj: Don't require a specific gtk# version.
-
-2009-03-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Registry.cs:
-	* WidgetLibrary.cs: Flush cached data when closing a change
-	  set.
-
-2009-02-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/Table.cs:
-	* wrapper/objects.xml: A better fix for the default row/column
-	  issue.
-
-2009-02-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* libstetic.csproj: Don't build with make, since MD can build
-	  these just fine.
-
-2009-02-07  Mike Krüger  <mkrueger@novell.com>
-
-	* GladeUtils.cs: fixed compiler warning.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.mdp:
-	* libstetic.csproj: Migrated to MSBuild file format.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* libstetic.mdp: Flush project format changes.
-
-2009-01-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* wrapper/objects.xml: Added some defaults.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libstetic.mdp: All projects now require fx 3.5.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* PropertyDescriptor.cs: Use invariant culture when converting types.
-
-2008-07-27  Mike Krüger <mkrueger@novell.com> 
-
-	
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp: Removed some unused glade
-	  and gnome-sharp references (only the unused). But I'll continue to
-	  remove glade, we need to lower the dependency tree a bit.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added IViewContent
-	  switching logic (but should be done centrally using the secondaryview
-	  paradigmn).
-
-2008-02-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Workaround for mono bug
-	  #350432.
-
-2008-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Handle the delete
-	  key in TreeViewPad, so it will work event if the shortcut is not
-	  defined.
-
-2008-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  icons/pad-widget-tree-16.png: Added widget tree icon.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Update MD version.
-
-2008-01-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Made internal
-	  some classes that don't need to be public.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Notify file changes
-	  through the FileService.
-
-2008-01-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Stetic code must be
-	  generated in the GUI thread. Should fix bug #349505.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Feed default layout
-	  name to Gettext for translation.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/ActionGroupPartial.xft.xml,
-	  templates/Window.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Make template
-	  categories translatable.
-
-2008-01-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Added null check on the
-	  result of UpdateFile. Should fix bug #352194.
-
-2008-01-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Handle
-	  projects which don't support the GTK# designer. Window and widget
-	  generation options are hidden, and code is never generated. Fixes bug
-	  #350632.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Don't update bindings if the
-	  file has syntax errors. May fix bug #347590.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump add-in versions.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am: Update after build reorg.
-
-2007-12-06  Geoff Norton  <gnorton@novell.com>
-
-	* Makefile.am: Only build the GtkCore addin if we have gnome-sharp 
-	  available.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  Makefile.am: Directory reorganization.
-
-2007-11-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: Removed
-	  Gnome.FileEntry.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Track
-	  LoggingService API changes.
-
-2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Use RootCombine
-	  instead of CurrentOpenCombine when possible.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fix nullref. Happens
-	  when removing a project from a solution while one of the windows of that
-	  project is open.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/ActionGroup.xft.xml, templates/ActionGroupPartial.xft.xml,
-	  templates/Dialog.xft.xml, templates/DialogPartial.xft.xml,
-	  templates/Widget.xft.xml, templates/WidgetPartial.xft.xml,
-	  templates/Window.xft.xml, templates/WindowPartial.xft.xml: Use tango
-	  file icons. Removed obsolete icons.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Track api changes. Added
-	  Description property.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.mdp, lib/libstetic.mdp: Project file names updated by
-	  change in MD path functions.
-
-2007-10-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mds, Makefile.am: Added custom command for updating
-	  the Stetic sources.
-
-2007-10-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Set a more meaningful category name for
-	  addin commands.
-	* MonoDevelop.GtkCore.mdp, MonoDevelop.GtkCore.mds: Updated.
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: If the current selection
-	  can't be deleted, just ignore the delete command, so the default handler
-	  will be executed. Fixes bug #325440.
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.mdp: Fix required gtk# version.
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Applied changes that
-	  were neccassary for to the new FileService.
-
-2007-10-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Changed calls for
-	  the new StringParser.
-
-2007-10-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: In Bind(), don't subscribe the
-	  NameChanged event at every call.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: The designer needs to
-	  be explicitely destroyed.
-
-2007-10-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: No need to implement
-	  IComparable; it's done in the base class now.
-
-2007-09-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Assign the selected
-	  target gtk# version to the new project.
-
-2007-09-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Use ProjectReference.StoredReference
-	  rather than ProjectReference.Reference, in order to refer to the actual
-	  stored reference string rather than a temporarily bumped version.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Implemented an
-	  assembly resolver for the stetic app, so assembly widgets registered
-	  with .pc files can be found.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: If a widget dll belongs
-	  to a package, store it as a package reference in the toolbox index.
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Allow setting TargetGtkVersion to
-	  DefaultGtkVersion when current value is null.
-
-2007-09-19  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Don't touch GTK# assembly versions
-	  when a target version is not set. Don't use gtkVersion=null to represent
-	  default version.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Set TargetGtkVersion on new
-	  projects. Bump default version to 2.8.
-
-2007-09-17  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.mdp, lib/libstetic.mdp,
-	  lib/Makefile.am, MonoDevelop.GtkCore.mds, Makefile.am: Use projects for
-	  imported stetic libraries.
-
-2007-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Removed access to
-	  Component object.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Remove unused method.
-
-2007-09-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: Fix warnings.
-
-2007-09-13  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* lib/stetic, Makefile.am, lib/Makefile.am: Build stetic from 
-	  svn:externals.
-	* lib/libsteticui.dll.config, lib/libstetic.dll.config,
-	  lib/libstetic.dll, lib/libsteticui.dll: Removed.
-
-2007-09-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Remove
-	  deprecated FileOptions element from templates.
-
-2007-09-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Changed the way to
-	  set the active designer (the api changed). Fixed some renaming issues.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Track api changes.
-
-2007-09-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/Window.xft.xml: Oops, PartialTypeSupport should be set to
-	  Disabled for non-partial window.
-
-2007-09-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs: Use DotNetProject.UsePartialTypes
-	  instead of custom setting.
-	* MonoDevelop.GtkCore/WidgetFileTemplatePartialClass.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplateFullClass.cs: No longer needed.
-	* templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml, templates/ActionGroup.xft.xml,
-	  templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Use
-	  PartialTypes condition instead of custom file template.
-
-2007-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fixes for bugs #82671, #82527, #82476, #81763 and #81238.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs: Changes due to new
-	  property infrastructure.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs: By default use the project name
-	  as category name for new custom widgets.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Don't show the full
-	  name of widgets in the toolbar.
-
-2007-08-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: In FindClass, make
-	  sure the getUserClass parameter is taken into account when the found
-	  class is not a multi-part class. Fixes bug #82258.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Removed the CommandService class.
-	  Everything is done directly with CommandManager. Moved all extension
-	  node types to MD.Components.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp, Makefile.am: Reorganized the extension point
-	  hierarchy. Embedded all add-in manifests as resources.
-	* lib/libstetic.dll: Updated from stetic module.
-
-2007-08-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Improved error
-	  reporting.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Converted
-	  DispatchService to a static class.
-
-2007-08-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated.
-
-2007-07-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fixed some
-	  problems with the target gtk version. It was not assigned to the
-	  stetic project. Also fixed some stock icon rendering issues in
-	  Stetic.
-
-2007-07-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes a nullref fix.
-
-2007-07-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Layout switch
-	  delay is not needed anymore.
-
-2007-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Fix nullref
-	  when gtk support is not enabled. Patch by Chris Howie.
-
-2007-07-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Don't try to use the CurrentNode property after adding the file,
-	  since it may have changed. Should fix bug #82123.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	  Fixes bugs #81846 and #82144.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix window
-	  source file lookup.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Use the new methods
-	  for checking clipboard operations on the current selection.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Include the
-	  current project in the list of libraries to show in the toolbox.
-	  Fixes bug #82125.
-
-2007-07-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated. Fixes bugs 81977,
-	  81810 and 82052.
-
-2007-07-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Properly rename
-	  fields when the widget name is changed. Fixes bug #81976.
-
-2007-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Update the
-	  properties pad when the focus is on the widget tree pad. Fixes bug
-	  #81971.
-
-2007-07-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added null
-	  check.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track api changes
-	  in DesignerSupport. When adding a project reference to a widget
-	  library, take into account that widgets may be implemented in a
-	  library different from the one providing the widget list.
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: In
-	  GetDynamicItems, only return widgets provided by libraries
-	  referenced by the project. Don't return widgets from libstetic
-	  since those are already included by default in the toolbox.
-	  Implemented IToolboxDefaultProvider.
-
-2007-07-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Changed a bit
-	  because of the removal of custom collections in the Ide project.
-
-2007-06-30 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* gui.glade: Fixed capitalization.
-
-2007-06-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs: Don't show windows
-	  in the toolbox.
-	* lib/libstetic.dll, lib/libsteticui.dll: Updated from Stetic module.
-
-2007-06-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Allow selecting
-	  the target GTK# version of the project.
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Implemented a
-	  toolbox loader, which allows registering assemblies in the toolbox.
-	  When a widget from a toolbox is dropped to a window, MD will now
-	  add a reference to the required assembly.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll: One last update.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-06-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Set the import
-	  file callback when editing project stock icons.
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: The GetResources
-	  method only returns resource files now.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-06-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Default pad
-	  placement is now specified in the xml file.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: In GetBaseType, use
-	  Project.GetWidgetTypes to get all registered wiget types, including
-	  base widget types (which were not provided by GetComponentTypes).
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fix for bug #81785.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Don't include non-public
-	  members to the objects.xml file.
-
-2007-05-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs: Fix feature message.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-	  Includes fixes for bugs #81761, #81758 and #81762.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	  (UpdateLibraries) Properly check for library changes.
-
-2007-05-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Fixes bugs #80783 and #81683.
-
-2007-05-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Added new dependency.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn. Fixes bug
-	  #81590.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When selecting an
-	  image file in the widget designer, import the file into the
-	  project.
-
-2007-05-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added some delay
-	  in the code that changes the workbench layout when selecting the
-	  designer. Fixes bug #80963.
-
-2007-05-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPalettePad.cs: Removed old
-	  palette pad.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Set the 'internal' flag for
-	  widgets implemented by private classes.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn module.
-	  Fixes bugs #80875, #81261, #81365.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: If the project
-	  is a library, add itself as an internal widget library, so widgets
-	  with internal visibility will be shown.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: When saving a window,
-	  use the visibility of the class to set the visibility of the
-	  component. Together with all changes done in stetic, fixes bug
-	  #80875.
-
-2007-05-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs,
-	  MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Track api changes in
-	  Stetic.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: Delay
-	  library updating until really necessary.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Copy the .addins.xml file to the output dir.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Copy stetic dlls together with the assembly.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Reference shared assemblies
-	  from the correct location.
-
-2007-05-04  Wade Berrier  <wberrier@novell.com> 
-	* lib/libstetic.dll.config:
-	* lib/libsteticui.dll.config:
-	Fix os attribute formats (mono-config.c separates oses by comma, 
-	and ignores or includes the whole string.)
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp, Makefile.am:
-	  Migration to Mono.Addins.
-
-2007-04-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml, MonoDevelop.GtkCore.mdp,
-	  MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs, Makefile.am:
-	  Implemented project feature for enabling gtk# support in new
-	  projects.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Use
-	  Menu icon size in the project pad.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-
-2007-04-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show a
-	  relative path in the window delete confirm dialog, since the
-	  absolute path may take too much space.
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* templates/DialogPartial.xft.xml, templates/Dialog.xft.xml: Add
-	  Ok/Cancel buttons by default in new dialogs.
-
-2007-03-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	  Includes fixes for bugs 81033, 81086, 81239, 81143, 81014 and
-	  81015.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Allow pasting when
-	  a placeholder is selected. Fixes bug #81246.
-
-2007-03-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.mdp, Makefile.am, icons/image-x-generic.png:
-	  Show a "Stock Icons" node in the User Interface folder. It's easier
-	  to discover than the context menu option.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.Commands/GladeCommands.cs: Added menu option
-	  for opening the gtk# settings.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Don't crash if
-	  the gtk-gui folder doesn't exist. Fixes bug #81152.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Hide the border
-	  of the combined view notebook.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated from stetic module. Fixes NRE crash.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Fix null ref.
-
-2007-03-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Register a new toolbox loader. Removed
-	  old properties pads.
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Added reference to
-	  MonoDevelop.DesignerSupport.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from svn module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs: Integrate Stetic
-	  widgets in the main toolbox.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Implement
-	  ICustomPropertyPadProvider and return the Stetic property pad.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Renamed.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Fix warning.
-
-2007-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	Updated from Stetic module. Includes fix for bug #80864.
-
-2007-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from SVN. Fixes some
-	  memory leaks and bug #79453.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Explicitely
-	  destroy notebook children, since notebook doesnt do it because of a
-	  gtk bug.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Some fixes in the
-	  dispose code.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Use
-	  ProjectOperations.SaveProject to save projects.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Fix nullref.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs: Log
-	  error message.
-	* Makefile.am, MonoDevelop.GtkCore.mdp: Synchronized MD project and
-	  makefile.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Avoid throwing
-	  delayed events after the project has been disposed.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added missing
-	  null check.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Ask for user
-	  confirmation when reloading a designer only when the designer has
-	  unsaved changes.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs,
-	  MonoDevelop.GtkCore/GtkDesignInfo.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Detect external
-	  changes in the gui.stetic files, and reload it when it changes.
-	  Take into account that the load of gui.stetic can fail. Added
-	  several workarounds for this case.
-
-2007-02-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from SVN. Includes
-	  fixes for bugs #80722, #79427 and #80127.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Store some
-	  Stetic configuration in the MD properties.
-
-2007-02-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gui.glade, MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Added options
-	  for enabling/disabling gtk support, and for gettext support.
-	* MonoDevelop.GtkCore.addin.xml: Change options panel name.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Make sure the
-	  MD project is saved together with the stetic project, if necessary.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Avoid saving
-	  the MD project twice.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs: If gtk
-	  integration status changes for a project, refresh the tree.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Null check.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for gettext and
-	  gettext class options for generated code.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Added events for notifying
-	  when the gtk integration status changes for a project.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am: distcheck fixes
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: When a designer
-	  project is disposed, hide the designer view in the editor.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Factorized some code into GtkDesignInfo.
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Make sure the code generation
-	  extension is executed before the last step.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Hide the add window commands when the project is not DotNet
-	* MonoDevelop.GtkCore.mdp, lib/libsteticui.dll, lib/libstetic.dll:
-	  Updated.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Intercept calls
-	  to the IPositionable interface, and show the editor page when
-	  jumping to a line.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: When looking for
-	  the window class, avoid returning the generated partial class.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Show the editor
-	  page when jumping to a signal handler.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Warn the user if
-	  the gtk-sharp-2 package can't be found. Some distros don't include
-	  the .pc file in the gtk# package, only in the -devel package.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from Stetic module.
-
-2007-01-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* lib/libstetic.dll.config, lib/libsteticui.dll, lib/libstetic.dll,
-	  lib/libsteticui.dll.config: Updated from Stetic module.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs,
-	  MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Track api
-	  changes in Document class.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated form Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Removed
-	  implementation of all text editor interfaces. Now the view
-	  overrides GetContent and calls editor.GetContent when a requested
-	  interface is not found.
-
-2007-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Removed unused namespace.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Use the new base-type property
-	  to describe custom widgets. When looking for properties and events,
-	  look in the base classes as well as in the widget class.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectSignalDescriptor.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/ProjectPropertyDescriptor.cs:
-	  Removed unused files. All widget library functionality has been
-	  moved to stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Removed all
-	  widget library management, which has been moved to Stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Added some null checks.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Use the new way
-	  of managing dependencies in projects.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml: The
-	  window constructor now takes the window type.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Some gui
-	  improvements and added some null checks.
-
-2007-01-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't crash if the
-	  designer can't be loaded for some reason.
-
-2007-01-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml,
-	  MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.GtkCore/GtkCoreService.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplatePartialClass.cs,
-	  MonoDevelop.GtkCore/WidgetFileTemplateFullClass.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs,
-	  templates/WidgetPartial.xft.xml, templates/Widget.xft.xml,
-	  templates/WindowPartial.xft.xml, templates/Window.xft.xml,
-	  templates/ActionGroupPartial.xft.xml,
-	  templates/ActionGroup.xft.xml, templates/DialogPartial.xft.xml,
-	  templates/Dialog.xft.xml: Implemented support for generating code
-	  in partial classes.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Use the
-	  correct method for saving the project.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs: Refresh the user
-	  interface folder when the gui project is reloaded.
-	* MonoDevelop.GtkCore.mdp: Updated.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for partial
-	  classes. In the GuiBuilderProject property, don't update the
-	  gtk-gui folder since this call may change the contents of the
-	  project, and weird things happen when called by the project pad to
-	  fill the tree.
-	* lib/libsteticui.dll, lib/libstetic.dll: Updated from stetic module.
-	* Makefile.am: Added new files.
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs,
-	  MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	  Make it work even when the assembly it references has been deleted
-	  (maybe as a result of cleaning a project). In this case the widget
-	  library is shown as empty.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added support
-	  for Loading/Unloading a project, to optimize use of memory for
-	  solutions with many gui projects. Implemented support for
-	  generating code in partial classes.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs,
-	  MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Implemented
-	  support for generating code in partial classes. Implemented support
-	  for UNDO/REDO.
-	* MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs:
-	  Generation of gui code is now done from the Build method of a
-	  project service extension. Fixes some issues when building a
-	  project which contains custom components.
-
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Track API changes in
-	  FileService.
-
-2006-12-13 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Don't
-	generate stetic code if CurrentOpenCombine is null.
-
-2006-12-07 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* MonoDevelop.GtkCore.mdp: Updated to it can be
-	built from MonoDevelop.
-
-2006-11-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Simplified the
-	  code by using global events from the Ide, instead of combine
-	  events.
-
-2006-10-18 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added RemoveExportedWidget method.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: track
-	  API changes.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: If the name of a
-	  widget changes and it is being exported, update it in the objects.xml
-	  file. Fixes bug #79656.
-
-2006-09-23 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module. It provides a redesigned API
-	  which will allow running designers in a separate process.
-	
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs:
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPalettePad.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs:
-	  Track api changes.
-	
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs: Make sure
-	  parse information is up to date before loading an assembly library.
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Make sure this object
-	  is always alive when remoted.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added null check.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Not needed anymore.
-	* MonoDevelop.GtkCore.addin.xml: Removed build step. Code generation
-	  is done now before compiling.
-	  
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectWidgetLibrary.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/CachedProjectWidgetLibrary.cs:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: ProjectWidgetLibrary is not used
-	  anymore. All libraries are now handled by AssemblyReferenceWidgetLibrary.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
-	  Moved to Stetic.
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-09-23 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track api changes.
-
-2006-09-19 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* .: Added svn:ignore for MonoDevelop.GtkCore.pidb
-
-2006-09-01 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from stetic module. Includes fix for bug #79247.
-	
-2006-09-01 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from stetic module.
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Save the project after editing the icons.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Set the
-	  ResourceProvider for the main stetic project. Added null check.
-
-2006-08-30 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fixed bug about 
-	  adding the wrong widget as action designer page.
-
-2006-08-30 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Only export properties which
-	  return primitive types. Fixes bug #79195.
-	* lib/*: Updated from stetic module.
-	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs: Unsubscribe close
-	  event when done.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Handle designer
-	  commands in its own tab page.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Explicitely dispose
-	  custom widgets to avoid memory leaks.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Track api changes.
-	
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-08-18 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* gui.glade: Minor fix.
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Track api
-	  changes.
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Stetic files don't need
-	  to be added as resource to projects.
-	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs: Make it
-	  work for action groups.
-	* lib/*: several fixes.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Added method
-	  for removing an action group.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Track API changes
-	  in Stetic. Properly bound edit commands from the main menu.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs:
-	* MonoDevelop.GtkCore.addin.xml: Implemented Open and Delete
-	  commands for global action groups.
-	  
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-08-11 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module. Includes fixes for
-	  bugs #79043, #79044 and #79045
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Don't
-	  crash if something goes wrong when binding a class.
-	  Fixed nullref.
-
-2006-08-04 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	  CreateContentForFile should not load the file, just create
-	  the view.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Add
-	  support for IEncodedTextContent.
-
-2006-08-01 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	  Set the resource provider before loading the project.
-	  Fixes bug #78966.
-	  
-	* libs/*: Updated from Stetic module. Fixes several bugs:
-	  78938, 78916, 78909, 78956, and 78867.
-
-2006-07-27 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs:
-	  Added null check.
-	  
-	* MonoDevelop.GtkCore.WidgetLibrary/AssemblyReferenceWidgetLibrary.cs:
-	  Get the parser context using the assembly file name, not the full
-	  assembly name.
-
-2006-07-25 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Factorized several
-	  more or less duplicate methods into GuiBuilderProject, specially
-	  methods for locating the class bound to a window. GuiBuilderProject
-	  now will explicitelly update the parser database the first time it
-	  needs to locate a class, so it will work even if the parser service
-	  is busy parsing assemblies.
-
-2006-07-24 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/libstetic.dll: Updated from stetic module. Fixes a bug
-	  in the table wrapper which may cause an endless loop.
-
-2006-07-05 Matej Urbas <matej.urbas@gmail.com>
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.WidgetLibrary/BaseWidgetLibrary.cs: Updated to use
-	  ReturnType as BaseTypes in IClass instances.
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fixed automatic
-	  layout switch policy.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Fix showing of
-	  action group view.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Properly
-	  bind actions when pressing "BindToField".
-	  
-	* MonoDevelop.GtkCore.addin.xml: Updated versions. 
-
-2006-06-29  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Only display WidgetBuilderOptionPanel 
-	for "DotNet" projects.
-
-2006-06-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Switch to the
-	  designer workbench layout when selecting an action group file.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Support jumping
-	  to signal hanlder when double-clicking it in the signals editor.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Removed debug code.
-	
-	* templates/ActionGroup.xft.xml:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: 
-	  Fix code generation of action groups.
-
-2006-06-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/GtkCoreService.cs: If a member has a [Browsable(false)]
-	  attribute, don't add it to the objects.xml file. Also don't add
-	  read-only properties.
-	* lib/*: Updated from stetic module. Fixes bugs #78622 and #78620.
-	  Adds an icon for expander and fixes a bug in ColorButton (fix by ml)
-
-2006-06-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/libsteticui.dll:
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs:
-	  Track changes in the api.
-
-2006-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Several improvements.
-	  Also fixes bug #78160.
-	
-2006-05-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs:
-	  Added DisplayName property.
-
-2006-05-29  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: reverted interface changes - missing file change
-	
-2006-05-29  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: reverted interface changes
-
-2006-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Adds support for toolbars.
-
-2006-05-23  David Makovský (Yakeen) <yakeen@sannyas-on.net> 
-
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: track api changes
-	
-2006-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.Commands/GladeCommands.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	* MonoDevelop.GtkCore.addin.xml: Added commands for creating
-	  an action group and editing the project icons.
-	  
-	* MonoDevelop.GtkCore.NodeBuilders/WidgetNodeBuilder.cs: Show local
-	  action groups as children of the window node.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolder.cs:
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Moved
-	  some event subscriptions to WindowsFolder.cs
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: 
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: Open the
-	  corresponding file when clicking on local action groups.
-	  
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Added action group template.
-	
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Added support for
-	  action group file templates.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs: Notify changes in
-	  local action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show the actions
-	  tab until there is at least one action group.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: Don't show
-	  properties or signals for global actions.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Added virtual method
-	  OnActiveDocumentChanged, which is called when the view is brought to front.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Use the new MemberName
-	  field when binding fields.
-	  
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: Several minor fixes.
-	  
-	* lib/*: Updated.
-	  
-
-2006-05-12 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Initial support for the menu editor. Still very unstable!!
-	
-	* lib/*: Updated from Stetic module.
-	* MonoDevelop.GtkCore.addin.xml: Register a node builder and and
-	  display binding for action groups.
-	* MonoDevelop.GtkCore.NodeBuilders/WindowsFolderNodeBuilder.cs: Update
-	  the folder when action groups change.
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Fix nullref.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Factorized
-	  some code into CodeBinder.cs
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Factorized some
-	  code into CombinedDesignView.cs.
-	
-	* MonoDevelop.GtkCore.NodeBuilders/ActionGroupNodeBuilder.cs: New node
-	  builder for action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs: New display
-	  binding for editing global action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopWidgetActionBar.cs: Moved from
-	  GuiBuilderView.cs.
-	* MonoDevelop.GtkCore.GuiBuilder/MonoDevelopActionGroupToolbar.cs: A new
-	  toolbar for the action group designer.
-	* MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs: A view for editing
-	  global action groups.
-	* MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs: Moved here some code
-	  from GuiBuilderEditSession.cs.
-	* MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs: Moved here some
-	  code from GuiBuilderView.cs.
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Added new files.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track api changes.
-	
-2006-05-05 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/libstetic.dll: Updated from Stetic module. Includes
-	  a fix for bug #78307.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.addin.xml: Updated versions.
-	* MonoDevelop.GtkCore.mdp: Updated.
-
-2006-05-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated from Stetic module. Includes fixes for
-	  bugs #78266, #78240 and #78276.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Track changes
-	  in the Stetic API.
-
-2006-04-24 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs: Don't
-	  crash if a stetic project can't be loaded. Fixes bug #78169.
-	* lib/libstetic.dll: Updated from Stetic module. Fixes bug #78167.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Updated from stetic module. Fixed construction of
-	  scales and scrollbars.
-
-2006-04-19 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs: When
-	  creating a widget from a widget design, remove the signals since
-	  those signals reference handlers in the widget class, not the
-	  widget container class.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libs/*: Fix nullref in some themes.
-
-2006-04-10 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs: Fix typo.
-	* libs/*: Fix for #78111, #78092 and #78090.
-
-2006-04-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.GtkCore/ProjectResourceProvider.cs: Save the project
-	  after adding or removing a resource.
-
-2006-04-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/*: Updated.
-
-2006-03-31 Lluis Sanchez Gual <lluis@novell.com>
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Get open
-	  combine events in the GUI thread.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs: Properly
-	  delete signals for which there isn't a handler. Half fixed field
-	  renaming.
-	* lib/*: Updated.
-
-2006-03-31 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml: Fix ID and
-	  description. Added stetic config files to add-in package.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.GtkCore.addin.xml: Updated references.
-
-2006-03-29 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	  Don't crash if no parse info is available for the file
-	  being edited. Should fix #77885.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Don't show
-	  the bind to field button for the root container.
-	* lib/*: Updated.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Makefile.am: Use an unified format. Patch by Matze Braun.
-	* MonoDevelop.GtkCore.addin.xml: Updated add-in versions.
-
-2006-03-22 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* MonoDevelop.GtkCore.addin.xml:
-	* MonoDevelop.GtkCore.mdp: Removed GladeFileDisplayBinding.
-	* lib/*: Updated.
-	* Makefile.am: Updated. Some files have been moved to Stetic.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs: Fixed
-	  layout switching. Don't show the widget tree pad by default,
-	  since it is already available as a combo in the designer.
-	* MonoDevelop.GtkCore.GuiBuilder/GladeFileDisplayBinding.cs: Removed.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderPropertiesPad.cs: use
-	  the new property tree instead of the grid.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: The designer
-	  toolbar has been moved to Stetic.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProjectPad.cs: Changed
-	  default placement.
-
-2006-03-19  Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* .: Added Makefile.in and Makefile to svn:ignore.
-
-2006-03-15 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* Makefile.am:
-	* MonoDevelop.GtkCore.mdp: Updated.
-	
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderEditSession.cs:
-	* MonoDevelop.GtkCore/GtkDesignInfo.cs: Added support for using
-	  resource images in the designer.
-	  
-	* MonoDevelop.GtkCore/GtkCoreService.cs: Check if the objects.xml
-	  file exists before loading it.
-	* MonoDevelop.GtkCore/GeneratorBuildStep.cs: Don't generate code
-	  if the stetic file has not been modified since the last
-	  generation.
-	* MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs: If Gtk
-	  support is not enabled, don't enable it if no widgets have
-	  been selected.
-	* lib/libstetic.dll: Updated.
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Mapped some
-	  commands.
-	* templates/Window.xft.xml: The constructor of Gtk.Window requires
-	  the title of the window.
-
-2006-03-04 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* MonoDevelop.GtkCore.mdp, Makefile.am: Updated.
-	* MonoDevelop.GtkCore/GeneratorBuildStep.cs: When generating
-	  code for a project that exports widgets, include the own
-	  project library to the generation, since there can be
-	  widgets that contain other widgets defined in the project.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectClassDescriptor.cs:
-	  removed some IdeApp dependencies.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectWidgetLibrary.cs:
-	  added method for getting the class information from
-	  a project.
-	* CachedProjectWidgetLibrary.cs: New widget library class
-	  which takes class information from a collection of 
-	  ProjectClassInfo objects.
-	* MonoDevelop.GtkCore.WidgetLibrary/ProjectPropertyDescriptor.cs:
-	  Consider all properties runtime-properties, since they have 
-	  been created from class properties.
-	* lib/*: Updated.
-
-2006-03-03 Lluis Sanchez Gual  <lluis@novell.com>    
-
-	* Makefile.am: removed debug files.
-
-2006-03-02 Lluis Sanchez Gual  <lluis@novell.com>    
- 
-	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs: Propagate
-	  project changes to the editor.
- 
-2006-03-02 Lluis Sanchez Gual  <lluis@novell.com>   
- 
-	Initial implementation of the Stetic add-in.
diff --git a/main/src/addins/MonoDevelop.GtkCore2/libstetic/Placeholder.cs b/main/src/addins/MonoDevelop.GtkCore2/libstetic/Placeholder.cs
index d5a6b69bec..1a55e0258e 100644
--- a/main/src/addins/MonoDevelop.GtkCore2/libstetic/Placeholder.cs
+++ b/main/src/addins/MonoDevelop.GtkCore2/libstetic/Placeholder.cs
@@ -103,6 +103,8 @@ namespace Stetic {
 			cr.RelLineTo (-rect.Width, 0);
 			cr.RelLineTo (0, -rect.Height);
 			cr.ClosePath ();
+
+			// FIXME: VV: Remove gradient features
 			Cairo.LinearGradient pat = new Cairo.LinearGradient (rect.X + rect.Width*fx, rect.Y + rect.Height*fy, rect.X + rect.Width*fw, rect.Y + rect.Height*fh);
 			pat.AddColorStop (0, c1);
 			pat.AddColorStop (1, c2);
diff --git a/main/src/addins/MonoDevelop.GtkCore2/libstetic/PropertyEditorCell.cs b/main/src/addins/MonoDevelop.GtkCore2/libstetic/PropertyEditorCell.cs
index faec75ffc3..1079054eb1 100644
--- a/main/src/addins/MonoDevelop.GtkCore2/libstetic/PropertyEditorCell.cs
+++ b/main/src/addins/MonoDevelop.GtkCore2/libstetic/PropertyEditorCell.cs
@@ -60,6 +60,7 @@ namespace Stetic
 			layout.Width = -1;
 			
 			Pango.FontDescription des = container.Style.FontDescription.Copy();
+			des.Size = 10 * (int) Pango.Scale.PangoScale;
 			layout.FontDescription = des;
 			
 			this.property = property;
diff --git a/main/src/addins/MonoDevelop.GtkCore2/libstetic/editor/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/libstetic/editor/ChangeLog
deleted file mode 100644
index 35c0dbd643..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/libstetic/editor/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-2010-08-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* SelectIconDialog.cs: Remove setting Project.Modified property
-	* EditIconFactoryDialog.cs: Remove setting Project.Modified property
-
-2010-08-03  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ActionMenu.cs: Pass root wrapper as an argument for ObjectWrapper.Create
-	* ActionToolbar.cs:
-	* ActionMenuBar.cs:
-	* ActionGroupEditor.cs: 
-
-2010-06-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* SelectImageDialog.cs: 
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/libstetic/wrapper/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/libstetic/wrapper/ChangeLog
deleted file mode 100644
index b9ccf74b8f..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/libstetic/wrapper/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2010-08-03  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Frame.cs: Pass root wrapper as an argument for ObjectWrapper.Create
-	* Action.cs:
-	* Window.cs:
-	* Button.cs:
-	* Widget.cs:
-	* Expander.cs:
-	* Container.cs:
-	* ActionGroup.cs:
-	* ScrolledWindow.cs: 
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/libsteticui/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/libsteticui/ChangeLog
deleted file mode 100644
index 8d924e5e94..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/libsteticui/ChangeLog
+++ /dev/null
@@ -1,431 +0,0 @@
-2010-10-28  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ApplicationBackend.cs: 
-
-2010-10-04  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* libsteticui2.csproj:
-	* ApplicationBackend.cs: 
-
-2010-09-30  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ApplicationBackend.cs: 
-
-2010-09-30  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* libsteticui2.csproj:
-	* ApplicationBackend.cs: 
-
-2010-09-22  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs: Add ReloadComponent method
-	* ProjectBackend.cs: 
-
-2010-09-21  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs: Code cleanup
-	* ProjectBackend.cs: 
-
-2010-09-20  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* ProjectBackend.cs: 
-
-2010-09-17  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* libsteticui2.csproj: 
-
-2010-09-17  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* libsteticui2.csproj: 
-
-2010-09-15  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* libsteticui2.csproj: 
-
-2010-09-08  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* SignalsEditorBackend.cs: 
-
-2010-08-17  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* Application.cs:
-	* ProjectBackend.cs: 
-
-2010-08-16  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* ProjectBackend.cs:
-	* WidgetEditSession.cs:
-	* IProjectDesignInfo.cs: 
-
-2010-08-15  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* CodeGenerator.cs:
-	* ProjectBackend.cs:
-	* WidgetEditSession.cs:
-	* CodeGeneratorPartialClass.cs: 
-
-2010-08-13  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* Project.cs: 
-	* Makefile.am:
-	* CodeGenerator.cs:
-	* libsteticui2.csproj:
-	* ActionGroupEditSession.cs: 
-	* CodeGeneratorPartialClass.cs:
-	* CodeGeneratorInternalClass.cs: Remove class
-
-2010-08-09  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* Project.cs: Add ComponentNeedsCodeGeneration method
-	* ProjectBackend.cs:
-	* IProjectDesignInfo.cs:
-	* CodeGeneratorPartialClass.cs: Only generate code for components that
-	have been changed
-
-2010-08-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs: Remove Modifies property
-	* ProjectBackend.cs: Add modifiedTopLevel list, handled on project loading, saving.
-	* libsteticui2.csproj:
-	* WidgetEditSession.cs: Use ProjectBackend.WasModified to determine if it was modified
-
-2010-08-05  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* WidgetDesigner.cs:
-	* ProjectBackend.cs: 
-
-2010-08-05  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-	Remove ModifiedChanged event, 
-	change Changed event to ProjectChangedEventHandler (pass name of changed widget)
-	* Project.cs: 
-	* WidgetDesigner.cs:
-	* ProjectBackend.cs:
-	* WidgetEditSession.cs: 
-
-2010-08-04  Krzysztof Marecki  <freefirma@gmail.com>
-
-	* Project.cs: Pass root widget name in NotifyChanged
-	* Makefile.am:
-	* ProjectBackend.cs:
-	* libsteticui2.csproj: 
-
-2010-08-03  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Glade.cs:
-	* Makefile.am:
-	* ProjectBackend.cs: 
-
-2010-08-03  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* ProjectBackend.cs: Return empty string when GtktargetVersion
-						 is not initialized
-
-2010-07-27  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs: Remove autoCommit argument 
-	* Makefile.am:
-	* WidgetDesigner.cs: Remove temporary project
-	* ProjectBackend.cs: Do not clear libraries on Close
-	* WidgetEditSession.cs: Remove temporary project
-
-2010-07-27  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs:
-	* WidgetDesigner.cs:
-	* ProjectBackend.cs: 
-
-2010-07-06  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs: Add parameter to Convert method for passing
-				  a new gtk gui folder name.  
-	* ProjectBackend.cs: 
-
-2010-07-05  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Glade.cs:
-	* Project.cs: AddComponent method 
-	* Makefile.am:
-	* ProjectBackend.cs: 
-	* libsteticui2.csproj: 
-
-2010-06-28  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs: Find class name for given .gtkx file
-	* Makefile.am:
-	* ProjectBackend.cs:
-	* IProjectDesignInfo.cs: 
-
-2010-06-28  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* ProjectBackend.cs:
-	* libsteticui2.csproj: 
-
-2010-06-23  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* libsteticui2.csproj: 
-
-2010-06-23  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* libsteticui2.csproj: 
-
-2010-06-22  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am: 
-
-2010-06-16  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am: 
-
-2010-06-15  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs: Create backend for Convert
-
-2010-06-09  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* libsteticui2.csproj: 
-
-2010-06-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs: Transition from project file name to project folder.
-	* Makefile.am:
-	* Application.cs:
-	* ProjectBackend.cs:
-	* WidgetEditSession.cs: 
-
-2010-06-07  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Project.cs:
-	* Makefile.am:
-	* ProjectBackend.cs: 
-	* IProjectDesignInfo.cs: 
-
-2010-06-02  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* Makefile.am:
-	* libsteticui2.csproj: 
-
-2010-04-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* CecilSignalDescriptor.cs: Cecil uses '/' as separator for
-	  inner classes. Convert to the standard '+' separator.
-
-2010-01-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* CodeGenerator.cs:
-	* libsteticui.csproj:
-	* CodeGeneratorPartialClass.cs:
-	* CodeGeneratorInternalClass.cs: Use global:: for type
-	  references in generated code. 
-
-2010-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* libsteticui.csproj: upgraded to v3.5 framework.
-
-2009-12-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* WidgetDesignerBackend.cs: Disable checkerboard background
-	  because redraw is super-inefficient and makes resizing
-	  unbearably slow. It needs to do more selective invalidation
-	  in resizes (like GTK viewport), and take the exposed area
-	  into account in expose events.
-
-2009-11-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* WidgetDesignerBackend.cs: Don't try to realize the child if
-	  the widget is not anchored. Fixes bug #553475 -
-	  "Gtk-Critical: gtk_widget_realize: assertion" when running a
-	  gtk# app inside MD.
-
-2009-11-05  Mike Kestner  <mkestner@novell.com>
-
-	* Application.cs:
-	* ApplicationBackend.cs:
-	* CodeGenerator.cs: some warning cleanup.
-
-2009-10-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Flush.
-
-2009-10-16  Mike Krüger  <mkrueger@novell.com>
-
-	* ActionComponent.cs: Handled icon loading failures.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* libsteticui.csproj: Mark Mono.Cecil project referece
-	as private.
-
-2009-09-10  Christian Hergert  <chris@dronelabs.com>
-
-	* libsteticui/libsteticui.dll.config: Use quartz on osx.
-
-2009-09-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Metacity/Preview.cs: Use Assembly.LoadWithPartialName. It's
-	  obsolete, but at least it works.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Metacity/Preview.cs:
-	* WidgetDesignerBackend.cs: Worked on designer decoration.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* Grid.cs:
-	* LibraryCache.cs:
-	* Windows/Preview.cs:
-	* WidgetActionBar.cs:
-	* ApplicationBackend.cs: Fixed some warnings.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Updated dependencies. We now depend on
-	  gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project.cs:
-	* UndoQueue.cs:
-	* WidgetDesigner.cs:
-	* ProjectBackend.cs:
-	* WidgetEditSession.cs: Added support for saving and restoring
-	  the status of the designer, including the undo queue. This
-	  allows implenting ISupportsProjectReload.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Metacity/Preview.cs: Remove debug code.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Windows/Preview.cs: Dont try to create a Win32 preview
-	  window when not running on Windows.
-
-2009-07-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* WidgetDesigner.cs:
-	* ActionGroupDesigner.cs:
-	* WidgetDesignerBackend.cs:
-	* ActionGroupEditSession.cs: No more missing IntPtr
-	  constructor exceptions.
-
-2009-06-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* WidgetDesignerBackend.cs: Fix rendering of the window
-	  decoration.
-
-2009-06-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* WidgetDesigner.cs:
-	* WidgetDesignerBackend.cs: Dispose is not guaranteed to be
-	  called when destroying a widget. Use OnDestroyed instead.
-
-2009-06-25  Mike Krüger  <mkrueger@novell.com>
-
-	* WidgetDesignerBackend.cs: Draw dialog background.
-
-2009-06-25  Mike Krüger  <mkrueger@novell.com>
-
-	* WidgetDesignerBackend.cs: Draw checkboard background in the
-	  gui designer instead of monochrome dialog background.
-
-2009-06-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* PluggableWidget.cs: When replacing the child widget (because
-	  of reloading of the project for example), make sure the old
-	  one is destroyed.
-
-2009-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* libsteticui.csproj: Updated.
-
-	* Metacity/Theme.cs:
-	* Metacity/FrameType.cs:
-	* Metacity/FrameFlags.cs:
-	* Metacity/ButtonLayout.cs:
-	* Metacity/ObjectManager.cs:
-	* Metacity/ButtonFunction.cs: Use a better namespace.
-
-	* Metacity/Preview.cs: Use the new TopLevelWindow class. Track
-	  changes in the title of the window.
-
-	* Windows:
-	* Windows/Preview.cs:
-	* Windows/WindowsTheme.cs:
-	* WidgetDesignerBackend.cs: Added support for win32 window
-	  decorations.
-
-	* EmbedWindow.cs:
-	* UserInterface.cs: EmbedWindow is not required anymore.
-
-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Copy the config file to the output dir.
-	  Set project type to library.
-
-	* Metacity/Preview.cs:
-	* WidgetDesignerBackend.cs: Avoid exception in the
-	  MetacityPreview class constructor, since it crashes MD under
-	  ms.net.
-
-2009-04-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Don't require a specific gtk# version.
-
-2009-03-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* LibraryCache.cs: Avoid recursive loading of
-	  AssemblyDefinition. Rely on cache info to check if a
-	  referenced library contains widget definitions.
-
-	* AssemblyResolver.cs: Make sure the resolver returns full
-	  paths.
-
-	* CecilWidgetLibrary.cs: Use the full path to query info from
-	  the cache. Properly unsubscribe the Changed event from the
-	  cache. Resolve assemblies using the provided assembly
-	  resolver.
-
-	* ApplicationBackend.cs:
-	* AssemblyWidgetLibrary.cs: From now on the registry and the
-	  library cache only handle libraries with full paths.
-
-	* Project.cs: Make sure unused project backends are properly
-	  disposed.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.csproj: Flush.
-
-2009-02-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* PropertyTree.cs:
-	* WidgetDesignerBackend.cs: Dispose Gdk cursors, else
-	  finalisers destroy them outside of the GUI thread and often
-	  crash MD due to X asserts resulting in _XCBUnlockDisplay
-	  errors.
-
-2009-02-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* libsteticui.csproj: Don't build with make, since MD can
-	  build these just fine.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* libsteticui.csproj: Allow unsafe code, since Shadow.cs has
-	  unsafe code.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* libsteticui.mdp:
-	* libsteticui.csproj: Migrated to MSBuild file format.
-
diff --git a/main/src/addins/MonoDevelop.GtkCore2/libsteticui/PropertyTree.cs b/main/src/addins/MonoDevelop.GtkCore2/libsteticui/PropertyTree.cs
index c846444392..231db4d780 100644
--- a/main/src/addins/MonoDevelop.GtkCore2/libsteticui/PropertyTree.cs
+++ b/main/src/addins/MonoDevelop.GtkCore2/libsteticui/PropertyTree.cs
@@ -224,6 +224,7 @@ namespace Stetic
 			layout = new Pango.Layout (this.PangoContext);
 			layout.Wrap = Pango.WrapMode.Char;
 			Pango.FontDescription des = this.Style.FontDescription.Copy();
+			des.Size = 10 * (int) Pango.Scale.PangoScale;
 			layout.FontDescription = des;
 		}
 		
@@ -444,6 +445,7 @@ namespace Stetic
 			layout.Wrap = Pango.WrapMode.Char;
 			
 			Pango.FontDescription des = tree.Style.FontDescription.Copy();
+			des.Size = 10 * (int) Pango.Scale.PangoScale;
 			layout.FontDescription = des;
 		}
 		
diff --git a/main/src/addins/MonoDevelop.GtkCore2/templates/ChangeLog b/main/src/addins/MonoDevelop.GtkCore2/templates/ChangeLog
deleted file mode 100644
index 01d4fb5ad6..0000000000
--- a/main/src/addins/MonoDevelop.GtkCore2/templates/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-09-20  Krzysztof Marecki  <marecki.krzysztof@gmail.com>
-
-	* WidgetPartial.xft.xml: 
-
diff --git a/main/src/addins/MonoDevelop.HexEditor/ChangeLog b/main/src/addins/MonoDevelop.HexEditor/ChangeLog
deleted file mode 100644
index 7a9fa37460..0000000000
--- a/main/src/addins/MonoDevelop.HexEditor/ChangeLog
+++ /dev/null
@@ -1,137 +0,0 @@
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.HexEditor.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.HexEditor.csproj: Remove import off mono.addins
-	  targets.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.HexEditor.csproj:
-	* MonoDevelop.HexEditor.addin.xml:
-	* MonoDevelop.HexEditor/DisplayBinding.cs:
-	* MonoDevelop.HexEditor/HexEditorNodeExtension.cs: Merged
-	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
-	  and MD.Components into MD.Ide.
-
-2010-03-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Mono.MHex.Data/PieceTable.cs: fixed cut&paste error.
-
-2010-03-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Mono.MHex.Data/PieceTable.cs: Fixed bug in piece table.
-
-2010-03-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.HexEditor.csproj: Don't local-copy project refs,
-	  as it duplicates assemblies and breaks running on .NET.
-
-2010-02-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.HexEditor.addin.xml: disabled open with hex
-	  editor command (is already in 'Open with'...)
-
-2010-02-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.HexEditor.csproj:
-	* MonoDevelop.HexEditor.addin.xml:
-	* MonoDevelop.HexEditor/HexEditorNodeExtension.cs: Added open
-	  with hex editor command in the project pad.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs: Flush.
-
-2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.HexEditor.csproj: Don't use makefiles for
-	  building.
-
-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.HexEditor.addin.xml:
-	* MonoDevelop.HexEditor/DisplayBinding.cs: Mark hex editor as
-	  non-default so it doesn't try to take over all filetypes.
-	  Users will have to open it explicitly if they need it.
-
-2009-12-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.HexEditor.addin.xml: Added missing dependency.
-
-2009-12-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs: Fixed
-	  build.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Use correct cairo lib.
-
-2009-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.HexEditor.csproj: Don't local copy. Don't
-	  require specific versions.
-
-2009-11-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.HexEditor/HexEditorView.cs: Implemented
-	  IZoomable.
-
-2009-11-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.HexEditor/HexEditorView.cs: Set dirty flag after
-	  change.
-
-2009-11-18  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui:
-	* Mono.MHex:
-	* Makefile.am:
-	* Mono.MHex.Data:
-	* AssemblyInfo.cs:
-	* gtk-gui/gui.stetic:
-	* Mono.MHex.Rendering:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.HexEditor:
-	* Mono.MHex/HexEditor.cs:
-	* Mono.MHex.Data/Caret.cs:
-	* Mono.MHex/MiscActions.cs:
-	* Mono.MHex.Data/Buffer.cs:
-	* Mono.MHex.Data/Segment.cs:
-	* Mono.MHex.Data/ISegment.cs:
-	* Mono.MHex/DeleteActions.cs:
-	* Mono.MHex/ScrollActions.cs:
-	* Mono.MHex.Data/EditMode.cs:
-	* Mono.MHex.Data/Selection.cs:
-	* Mono.MHex/SimpleEditMode.cs:
-	* Mono.MHex/BookmarkActions.cs:
-	* Mono.MHex.Data/PieceTable.cs:
-	* MonoDevelop.HexEditor.csproj:
-	* Mono.MHex.Rendering/Margin.cs:
-	* Mono.MHex/CaretMoveActions.cs:
-	* Mono.MHex/SelectionActions.cs:
-	* Mono.MHex/HexEditorOptions.cs:
-	* Mono.MHex.Data/RedBlackTree.cs:
-	* Mono.MHex/IHexEditorOptions.cs:
-	* Mono.MHex.Data/HexEditorData.cs:
-	* MonoDevelop.HexEditor.addin.xml:
-	* Mono.MHex.Data/UpdateRequest.cs:
-	* Mono.MHex.Rendering/IconMargin.cs:
-	* Mono.MHex.Data/ReplaceEventArgs.cs:
-	* Mono.MHex.Rendering/GutterMargin.cs:
-	* Mono.MHex.Rendering/HexEditorStyle.cs:
-	* Mono.MHex.Rendering/HexEditorMargin.cs:
-	* MonoDevelop.HexEditor/HexEditorView.cs:
-	* Mono.MHex.Rendering/DashedLineMargin.cs:
-	* MonoDevelop.HexEditor/DisplayBinding.cs:
-	* Mono.MHex.Rendering/TextEditorMargin.cs:
-	* Mono.MHex.Rendering/EmptySpaceMargin.cs:
-	* MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs: Added
-	  hex editor display binding.
-
diff --git a/main/src/addins/MonoDevelop.HexEditor/Mono.MHex.Data/Buffer.cs b/main/src/addins/MonoDevelop.HexEditor/Mono.MHex.Data/Buffer.cs
index 4b5e64b651..31f8c29d7a 100644
--- a/main/src/addins/MonoDevelop.HexEditor/Mono.MHex.Data/Buffer.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/Mono.MHex.Data/Buffer.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.IO;
+using System.Threading.Tasks;
 
 namespace Mono.MHex.Data
 {
@@ -81,6 +82,16 @@ namespace Mono.MHex.Data
 			return new ArrayBuffer (buf);
 		}
 		
+		public static async Task<IBuffer> LoadAsync (Stream stream)
+		{
+			int count = (int) stream.Length;
+			byte[] buf = new byte[count];
+
+			await stream.ReadAsync (buf, 0, count);
+
+			return new ArrayBuffer (buf);
+		}
+
 		public static IBuffer Load (string fileName)
 		{
 			using (Stream stream = File.OpenRead (fileName)) {
diff --git a/main/src/addins/MonoDevelop.HexEditor/Mono.MHex/HexEditor.cs b/main/src/addins/MonoDevelop.HexEditor/Mono.MHex/HexEditor.cs
index dc0950d48b..bdea66542d 100644
--- a/main/src/addins/MonoDevelop.HexEditor/Mono.MHex/HexEditor.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/Mono.MHex/HexEditor.cs
@@ -161,6 +161,17 @@ namespace Mono.MHex
 			Options = HexEditorOptions.DefaultOptions;
 			Options.Changed += OptionsChanged;
 		}
+
+		protected override void Dispose (bool disposing)
+		{
+			Options.Changed -= OptionsChanged;
+			if (caretTimer != null) { 
+				caretTimer.Elapsed -= UpdateCaret;
+				caretTimer.Dispose ();
+				caretTimer = null;
+			}
+			base.Dispose (disposing);
+		}
 		
 		public void PurgeLayoutCaches ()
 		{
@@ -226,9 +237,7 @@ namespace Mono.MHex
 
 		void OptionsChanged (object sender, EventArgs e)
 		{
-			gutterMargin.IsVisible = Options.ShowLineNumberMargin;
-			iconMargin.IsVisible = iconMargin.IsVisible;
-			
+			iconMargin.IsVisible = gutterMargin.IsVisible = Options.ShowLineNumberMargin;
 			
 			Margins.ForEach (margin => { 
 				margin.PurgeLayoutCache (); 
diff --git a/main/src/addins/MonoDevelop.HexEditor/Mono.MHex/HexEditorDebugger.cs b/main/src/addins/MonoDevelop.HexEditor/Mono.MHex/HexEditorDebugger.cs
index fe8590e91e..9419238d43 100644
--- a/main/src/addins/MonoDevelop.HexEditor/Mono.MHex/HexEditorDebugger.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/Mono.MHex/HexEditorDebugger.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using Mono.MHex.Data;
+using MonoDevelop.HexEditor;
 using Xwt;
 
 namespace Mono.MHex
@@ -69,6 +70,7 @@ namespace Mono.MHex
 
 		public HexEditorDebugger ()
 		{
+			editor.HexEditorStyle = new MonoDevelopHexEditorStyle (editor);
 			var comboBox = new ComboBox ();
 			comboBox.Items.Add ("Hex 8");
 			comboBox.Items.Add ("Hex 16");
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj
index 90f243d1ab..29cfbde299 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj
@@ -93,11 +93,6 @@
     <Folder Include="MonoDevelop.HexEditor\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
       <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
       <Name>MonoDevelop.Core</Name>
@@ -108,11 +103,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
@@ -128,21 +118,6 @@
       <Name>MonoDevelop.Refactoring</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.AssemblyBrowser\MonoDevelop.AssemblyBrowser.csproj">
-      <Project>{0EA3AD14-404A-4D3F-979B-F087E2E70C82}</Project>
-      <Name>MonoDevelop.AssemblyBrowser</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\CSharpBinding\CSharpBinding.csproj">
-      <Project>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</Project>
-      <Name>CSharpBinding</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/DisplayBinding.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/DisplayBinding.cs
index 12a5f4c3d2..11c6c884fc 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/DisplayBinding.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/DisplayBinding.cs
@@ -39,7 +39,7 @@ namespace MonoDevelop.HexEditor
 			}
 		}
 		
-		public IViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
+		public ViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
 		{
 			
 			return new HexEditorView ();
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs
index b4f8bc4820..f23c5fc900 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs
@@ -32,6 +32,8 @@ using Mono.MHex.Data;
 using MonoDevelop.Ide.Gui.Content;
 using Xwt;
 using MonoDevelop.Ide.Fonts;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.HexEditor
 {
@@ -50,15 +52,25 @@ namespace MonoDevelop.HexEditor
 		{
 			hexEditor.HexEditorStyle = new MonoDevelopHexEditorStyle (hexEditor);
 			SetOptions ();
-			MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance.Changed += delegate {
-				SetOptions ();
-			};
+			DefaultSourceEditorOptions.Instance.Changed += Instance_Changed;
 			hexEditor.HexEditorData.Replaced += delegate {
 				this.IsDirty = true;
 			};
 			window = new ScrollView (hexEditor);
 		}
-		
+
+		public override void Dispose ()
+		{
+			((MonoDevelopHexEditorStyle)hexEditor.HexEditorStyle).Dispose ();
+			DefaultSourceEditorOptions.Instance.Changed -= Instance_Changed;
+			base.Dispose ();
+		}
+
+		void Instance_Changed (object sender, EventArgs e)
+		{
+			SetOptions ();
+		}
+
 		void SetOptions ()
 		{
 			var name = FontService.FilterFontName (FontService.GetUnderlyingFontName ("Editor"));
@@ -67,17 +79,19 @@ namespace MonoDevelop.HexEditor
 			hexEditor.Repaint ();
 		}
 		
-		public override void Save (string fileName)
+		public override Task Save (FileSaveInformation fileSaveInformation)
 		{
-			File.WriteAllBytes (fileName, hexEditor.HexEditorData.Bytes);
-			ContentName = fileName;
+			File.WriteAllBytes (fileSaveInformation.FileName, hexEditor.HexEditorData.Bytes);
+			ContentName = fileSaveInformation.FileName;
 			this.IsDirty = false;
+			return Task.FromResult (true);
 		}
 		
-		public override void Load (string fileName)
+		public override async Task Load (FileOpenInformation fileOpenInformation)
 		{
+			var fileName = fileOpenInformation.FileName;
 			using (Stream stream = File.OpenRead (fileName)) { 
-				hexEditor.HexEditorData.Buffer = ArrayBuffer.Load (stream);
+				hexEditor.HexEditorData.Buffer = await ArrayBuffer.LoadAsync (stream);
 			}
 			
 			ContentName = fileName;
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
index e63dee04d6..7897809fdd 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Debugger;
 using MonoDevelop.Core;
 
 using Mono.MHex.Data;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.HexEditor
 {
@@ -82,7 +83,7 @@ namespace MonoDevelop.HexEditor
 
 		void SetHexEditorOptions ()
 		{
-			hexEditor.Options.FontName = MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance.FontName;
+			hexEditor.Options.FontName = DefaultSourceEditorOptions.Instance.FontName;
 			hexEditor.PurgeLayoutCaches ();
 			hexEditor.Repaint ();
 		}
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs
index 24d4bb1105..c77914e172 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs
@@ -25,17 +25,17 @@
 // THE SOFTWARE.
 
 using System;
-using Mono.TextEditor.Highlighting;
 using Mono.MHex.Rendering;
 using Xwt;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
-using Mono.TextEditor;
 using Xwt.Drawing;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
 
 namespace MonoDevelop.HexEditor
 {
-	class MonoDevelopHexEditorStyle : HexEditorStyle
+	class MonoDevelopHexEditorStyle : HexEditorStyle, IDisposable
 	{
 		ColorScheme colorStyle;
 		Mono.MHex.HexEditor hexEditor;
@@ -44,12 +44,15 @@ namespace MonoDevelop.HexEditor
 		{
 			this.hexEditor = hexEditor;
 			SetStyle ();
-			IdeApp.Preferences.ColorSchemeChanged += delegate {
-				SetStyle ();
-				this.hexEditor.Options.RaiseChanged ();
-				this.hexEditor.PurgeLayoutCaches ();
-				this.hexEditor.Repaint ();
-			};
+			IdeApp.Preferences.ColorScheme.Changed += ColorSchemeChanged;
+		}
+
+		void ColorSchemeChanged (object sender, EventArgs e)
+		{
+			SetStyle ();
+			this.hexEditor.Options.RaiseChanged ();
+			this.hexEditor.PurgeLayoutCaches ();
+			this.hexEditor.Repaint ();
 		}
 		
 		void SetStyle ()
@@ -62,6 +65,11 @@ namespace MonoDevelop.HexEditor
 			return new Color (foreground.R, foreground.G, foreground.B, foreground.A);
 		}
 
+		public void Dispose ()
+		{
+			IdeApp.Preferences.ColorScheme.Changed -= ColorSchemeChanged;
+		}
+
 		public override Color HexOffset {
 			get {
 				return ConvertColor (colorStyle.LineNumbers.Foreground);
diff --git a/main/src/addins/MonoDevelop.Moonlight/ChangeLog b/main/src/addins/MonoDevelop.Moonlight/ChangeLog
deleted file mode 100644
index 8f00715899..0000000000
--- a/main/src/addins/MonoDevelop.Moonlight/ChangeLog
+++ /dev/null
@@ -1,828 +0,0 @@
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.addin.xml:
-	* MonoDevelop.Moonlight/MoonlightParser.cs: Track
-	  ProjectDomService/Parser API.
-
-2010-07-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs:
-	  Workaround for gmcs bug.
-
-2010-07-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Include
-	  redist assemblies in manifest AssemblyParts. Should fix Bug
-	  600727 - Moonlight: DataGrid missing.
-
-2010-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: reverted
-	  change (the bug is gone).
-
-2010-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: added
-	  null check.
-
-2010-06-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Track api
-	  changes.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2010-05-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Remove
-	  SupportedClrVersions, as it's been superseded by
-	  SupportsFramework.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Make use
-	  of the new Document.Dom property.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Moonlight.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight.csproj: Remove import off mono.addins
-	  targets.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Moonlight.csproj:
-	* MonoDevelop.Moonlight.addin.xml:
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs:
-	* MonoDevelop.Moonlight.Gui/MoonlightOptionsPanel.cs:
-	* MonoDevelop.Moonlight/MoonlightExecutionHandler.cs: Merged
-	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
-	  and MD.Components into MD.Ide.
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Track
-	  ProjectFile Link API.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.csproj:
-	* Templates/framework_SL_2_0.xml:
-	* Templates/framework_SL_3_0.xml:
-	* MonoDevelop.Moonlight.addin.xml:
-	* MonoDevelop.Moonlight/framework_SL_2_0.xml:
-	* MonoDevelop.Moonlight/framework_SL_3_0.xml: Moved framework
-	  declarations from resources to standalone files, so they can
-	  be loaded without loading the assembly.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight.addin.xml: Added some conditions to
-	  avoid early loading of extensions.
-
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Track api
-	  changes.
-
-2010-02-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: Make
-	  sure not to ever use smcs.exe directly. It needs magic
-	  runtime args and maybe a different Mono - and we need the
-	  smcs script to handle that.
-
-2010-02-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightParser.cs: Use
-	  DomRegion.Empty.
-
-2010-02-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: Redist
-	  assemblies are neither GAC nor Core. Fixes refs to redist
-	  assemblies.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs:
-	  Flush.
-
-2010-01-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Quote
-	  respack arguments.
-
-2010-01-19  Rolf Bjarne Kvinge  <RKvinge@novell.com>
-
-	* MonoDevelop.Moonlight/XamlG.cs: A file without a x:Class attribute
-	generates a zero-length code-behind file.
-
-2010-01-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Use
-	  FilePath to clean up code, and set resource IDs for respack.
-
-2010-01-13  Chris Toshok  <toshok@ximian.com>
-
-	* MonoDevelop.Moonlight/XamlG.cs: when generating fields for fully
-	qualified types, use global references to keep from conflicting
-	type/namespace names.
-
-2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Fix preventing
-	  showing a console for moonlight run. If we do create a
-	  console, dispose it. We need a real way to avoid showing
-	  consoles for execution handlers that don't use them.
-
-2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: Check
-	  MOONLIGHT_SDK_PATH from env as well as the target runtime,
-	  since Moonlight needn't be bound strictly to a single target
-	  runtime.
-
-2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: If the
-	  framework package is not found, fall back to default version
-	  string.
-
-2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Fix logic
-	  error.
-
-2009-12-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs:
-	* MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: Fix
-	  fxversion lookup for manifest.
-
-2009-12-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.csproj:
-	* MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs:
-	* MonoDevelop.Moonlight/SilverlightFrameworkBackend.cs:
-	  Renamed file. Remove MONO_PATH in the tools env vars if the
-	  base runtime sets it.
-
-2009-12-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/SilverlightFrameworkBackend.cs: Fix
-	  enumertion properly.
-
-2009-12-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/SilverlightFrameworkBackend.cs: Fix
-	  redist package enumeration.
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Try 3.0 first,
-	  fall back to 2.0.
-
-2009-12-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.csproj:
-	* MonoDevelop.Moonlight.addin.xml:
-	* MonoDevelop.Moonlight/MoonlightProject.cs:
-	* MonoDevelop.Moonlight/framework_SL_2_0.xml:
-	* MonoDevelop.Moonlight/framework_SL_3_0.xml:
-	* MonoDevelop.Moonlight/framework_Silverlight.xml:
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs:
-	* MonoDevelop.Moonlight/SilverlightFrameworkBackend.cs: Track
-	  the new moonlight dev bits layout. Add preliminary support
-	  for multi-targetting SL2 and SL3.
-
-2009-12-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightExecutionHandler.cs: Track
-	  BrowserLauncher API.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs:
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Introduced
-	  the ConfigurationSelector class to all methods that
-	  previously took a configuration name as string. This
-	  eliminates the ambiguity between solution configuration
-	  names and project configuration names.
-
-2009-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Track API. Set
-	  UserAssemblyPaths. Get correct configuration.
-
-	* MonoDevelop.Moonlight/MoonlightExecutionCommand.cs: Add
-	  property for list of user assemblies.
-
-2009-11-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs:
-	* MonoDevelop.Moonlight/MoonlightExecutionCommand.cs: Fix
-	  build.
-
-2009-11-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Hack to
-	  copy mdb files into the xap so that sdb works.
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Create a debug
-	  console except if we're using the "run" mode.
-
-2009-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Fix creation of
-	  Moonlight project configurations.
-
-2009-10-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.csproj:
-	* MonoDevelop.Moonlight.addin.xml:
-	* MonoDevelop.Moonlight/MoonlightProject.cs:
-	* MonoDevelop.Moonlight/MoonlightExecutionCommand.cs:
-	* MonoDevelop.Moonlight/MoonlightExecutionHandler.cs:
-	* MonoDevelop.Moonlight/MoonlightProjectConfiguration.cs: Use
-	  an execution handler so that the debugger command doesn't
-	  get enabled.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Moonlight.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Moonlight.csproj:
-	* gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs:
-	  Flush.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.Moonlight.csproj: Import md.targets .
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Moonlight.addin.xml: Bump MD version.
-
-2009-10-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Tweak API
-	  so classes can return completion lists instead of modifying
-	  one they're given.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.csproj: Don't local-copy project refs.
-
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.csproj: Fix build.
-
-2009-08-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight/SilverlightFrameworkBackend.cs: Track
-	  api changes.
-
-2009-07-31  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Don't
-	  double-resolve configurations.
-
-2009-07-31  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Limit compatible
-	  fx to prevent conflict with iPhone. 
-
-2009-06-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Remove
-	  MergeResults members and replace with calls to
-	  result.Append. Tidy up a little.
-
-	* MonoDevelop.Moonlight/SilverlightFrameworkBackend.cs: Fix
-	  building ML apps with separate SDK by allowing tool
-	  fallbacks to the base 3.5 framework.
-
-2009-06-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs:
-	  Get design and code back in sync.
-
-2009-06-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.addin.xml: Fix typo in framework ID.
-
-2009-06-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.csproj:
-	* MonoDevelop.Moonlight.addin.xml:
-	* MonoDevelop.Moonlight/framework_Silverlight.xml:
-	* MonoDevelop.Moonlight/SilverlightFrameworkBackend.cs: Define
-	  and register the Silverlight framework.
-
-2009-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight\MoonlightBuildExtension.cs: Track api
-	  changes.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight\MoonlightBuildExtension.cs: Use the
-	  new FilePath class for handling file and directory paths.
-
-2009-05-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightParser.cs: Fix logic.
-
-2009-05-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.Gui/MoonlightOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs:
-	  Improve the moonlight options panel. Add support for setting
-	  entry point.
-
-2009-05-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightParser.cs: Implement
-	  resolving types' namespaces.
-
-2009-05-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Use project name
-	  for app entry point, since default namespace isn't
-	  initalised during project creation.
-
-2009-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Handle
-	  respack.exe if the runtime gives us that.
-
-2009-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Fix
-	  dependency checks for respacked files.
-
-2009-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Write
-	  assembly error message to monitor's log.
-
-2009-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Assembly
-	  reference validation messages are empty, not null.
-
-2009-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Fix
-	  previous namespace fix.
-
-2009-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Fix
-	  deployment namespace handling.
-
-2009-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: More
-	  status messages. Some handling of cancelling build.
-
-	* Templates/Moonlight-ApplicationProject.xpt.xml: Fix
-	  template.
-
-2009-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Set entry point
-	  and enable manifest generation on new projects.
-
-2009-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Fix
-	  OnGetCanExecute.
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Embed Page
-	  and ApplicationDefinition files. Fix resource ID for
-	  resources file. Clean test page and manifest. Fix paths and
-	  namespaces in app definition generation. Write out app
-	  manifest.
-
-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Track api
-	  changes.
-
-2009-05-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Fix path
-	  serialization. Add StartPageUrl property. Update DoExecute
-	  and implement CanExecute.
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Fixed
-	  failed build tracking. Implement manifest generation.
-	  Implement test page creation. Add manifest and referenced
-	  assemblies to XAP.
-
-2009-05-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.csproj:
-	* Templates/PreviewTemplate.html: Add HTML template for
-	  previewing.
-
-2009-05-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/XamlG.cs:
-	* MonoDevelop.Moonlight/MoonlightParser.cs: Add
-	  System.Windows.Controls.Primitives to the generated imports.
-
-2009-05-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Remove xap
-	  file in clean step.
-
-2009-05-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Implement
-	  support for checking when we need to rebuild.
-
-2009-05-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Fix dll
-	  filenames.
-
-2009-05-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Fix
-	  zipping.
-
-2009-05-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.csproj: Add xapification code.
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Add
-	  initial xapification support.
-
-2009-05-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs:
-	  Fix respack execution.
-
-2009-05-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Implement
-	  respack invocation. Fix updating of xaml.g.cs files.
-
-2009-05-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.csproj:
-	* MonoDevelop.Moonlight/XamlG.cs:
-	* MonoDevelop.Moonlight.addin.xml:
-	* MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Add a
-	  build step that generates and injects the xaml.g.cs files.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.Moonlight.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Moonlight.addin.xml: Bump MD version.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightParser.cs: Track API changes.
-
-2009-03-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix Silverlight.js install directory.
-
-2009-03-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Fix framework ID.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.csproj: Exorcise more unwanted local
-	  copy.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.addin.xml: Move js file location to a
-	  subdirectory to match the location MSBuild and MD copy it.
-
-	* MonoDevelop.Moonlight.csproj: Flush.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.csproj: Don't local-copy other addins'
-	  dlls.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.csproj: More explicit references to
-	  keep csc happy.
-
-2009-02-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Moonlight/XamlG.cs:
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Fixed
-	  compiler warnings.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight.mdp:
-	* MonoDevelop.Moonlight.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Moonlight.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	*
-	  gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs:
-	  Flush.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.mdp: Flush project format changes.
-
-2009-01-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.addin.xml: Make sure Moonlight parser takes
-	precedence over XML parser.
-
-2008-12-29  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Moved
-	outline-building code to be the default implementation in
-	BaseXmlEditorExtension, since it works with any XmlParsedDocument.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs:
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Track API changes.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* MonoDevelop.Moonlight.mdp: Add AssemblyInfo.cs files that are
-	autogenerated from the addin manifests.
-
-2008-11-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.mdp: Updated.
-
-	* MonoDevelop.Moonlight/MoonlightParser.cs:
-	* MonoDevelop.Moonlight/MoonlightParsedDocument.cs:
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Moved
-	MoonlightParsedDocument to XmlParsedDocument in the Xml addin.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightParsedDocument.cs: Fix build
-	dependencies.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Use new API; move default
-	build action code into GetDefaultBuildAction override.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Moonlight.addin.xml: Bump MD version.
-
-2008-11-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Override new
-	IsLibraryBasedProjectType property, consolidating code in base class.
-
-2008-11-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.mdp: Updated.
-
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Added some very
-	simple XAML completions.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Moonlight.addin.xml: fixed 'Bug 399737 - Code completion
-	busted for referenced assemblies that are not in GAC, are outside of
-	the solution, and which are referenced by other non-GAC outside
-	referenced assemblies'.
-
-2008-10-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Moonlight.mdp:
-	* MonoDevelop.Moonlight.Gui:
-	* MonoDevelop.Moonlight.addin.xml:
-	* MonoDevelop.Moonlight.Gui/MoonlightOptionsPanel.cs:
-	* MonoDevelop.Moonlight.Gui/MoonlightOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs: Add
-	options panel for Moonlight settings.
-
-2008-10-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Implement document
-	outline.
-
-2008-10-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightParsedDocument.cs: Enable folding.
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.mdp: Updated.
-
-	* MonoDevelop.Moonlight/MoonlightParser.cs: Use StateEngine XML parser.
-	Gives better position information and more robust errors.
-
-2008-10-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightParser.cs: Fix return type of
-	InitialiseComponent.
-
-2008-10-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Templates/Moonlight-UserControlXaml.xft.xml:
-	* Templates/Moonlight-ApplicationProject.xpt.xml: Fix end tag in user
-	control.
-
-	* MonoDevelop.Moonlight/MoonlightEditorExtension.cs: Add stub editor
-	extension. Enables path bar.
-
-	* MonoDevelop.Moonlight/XamlG.cs: Import xamlg from moonlight.
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.mdp:
-	* MonoDevelop.Moonlight.addin.xml: Updated.
-
-	* MonoDevelop.Moonlight/MoonlightParser.cs: Add live parser based on
-	xamlg to inject member info on the fly.
-
-2008-10-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Set generator and content
-	type on added xaml files. Auto-add codebehind.
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.mdp: Updated.
-
-	* MonoDevelop.Moonlight.addin.xml:
-	* Templates/Moonlight-Xaml.xft.xml:
-	* Templates/Moonlight-Library.xpt.xml:
-	* Templates/Moonlight-Application.xpt.xml:
-	* Templates/Moonlight-LibraryProject.xpt.xml:
-	* Templates/Moonlight-UserControlXaml.xft.xml:
-	* Templates/Moonlight-ApplicationXaml.xft.xml:
-	* Templates/Moonlight-XamlWithCodeBehind.xft.xml:
-	* Templates/Moonlight-ApplicationProject.xpt.xml: Updated templates.
-
-2008-10-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Templates/MoonlightProject.xpt.xml:
-	* Templates/Moonlight-TestPage.xft.xml:
-	* Templates/MoonlightProject-Empty.xpt.xml:
-	* Templates/Moonlight-CreateSilverlightJs.xft.xml: Remove outdated
-	templates.
-
-	* Makefile.am:
-	* MonoDevelop.Moonlight.mdp:
-	* MonoDevelop.Moonlight.addin.xml: Updated.
-
-	* Templates/Silverlight.js: Add.
-
-	* Templates/Moonlight-Library.xpt.xml:
-	* Templates/Moonlight-Application.xpt.xml:
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Create VS-compatible
-	Moonlight/Silverlight projects. Limit it to C# for now.
-
-2008-10-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Moonlight.addin.xml:
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Enable loading of SL 2.0
-	projects. Currently only works with C#.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Moonlight.mdp, gtk-gui/generated.cs: Updated generated
-	  code.
-
-2008-06-17  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Templates/MoonlightProject.xpt.xml: Use escaped project name for
-	  identifier of main class.
-
-2008-06-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Moonlight.mdp,
-	  MonoDevelop.Moonlight/MoonlightCodebehindProvider.cs, Makefile.am:
-	  Remove old CodeBehind grouping mechanism.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Moonlight.addin.xml: Bump MD version.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: New project model changes.
-
-2008-05-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Moonlight.addin.xml: Set "isText" attribute on the
-	  mimetype definitions.
-
-2008-05-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Moonlight.addin.xml,
-	  MonoDevelop.Moonlight/MoonlightCodebehindProvider.cs: Remove use of
-	  removed extension point.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Moonlight.addin.xml: Use the new mime type extension to
-	  register new file types.
-
-2008-03-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Allow more paths for startup
-	  page. Should really make this an option at some point.
-
-2008-03-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs,
-	  Templates/Moonlight-XamlWithCodeBehind.xft.xml: Change "bin" to
-	  "ClientBin", which seems to be more conventional.
-
-2008-03-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Avoid NRE because BaseDirectory
-	  isn't set during project creation.
-
-2008-03-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.Moonlight.mdp: Fix build paths and disable local copy of
-	  project refs.
-	* MonoDevelop.Moonlight/MoonlightCodebehindProvider.cs: Make regex actually
-	  work.
-	* MonoDevelop.Moonlight/MoonlightProject.cs: Set default properties and
-	  paths needed for new Moonlight projects to work.
-	* Templates/Moonlight-XamlWithCodeBehind.xft.xml: Use text file template
-	  rather than ASP.NET file template. Add some default XAML. Reference the
-	  actual codebehind dll and class.
-	* Templates/Moonlight-CreateSilverlightJs.xft.xml: Use text file template
-	  rather than ASP.NET file template.
-	* Templates/Moonlight-Xaml.xft.xml: Use text file template rather than
-	  ASP.NET file template. Add some default XAML.
-
-2008-03-04  Michael Hutchinson  <mhutchinson@novell.com> 
-
-	* *.*: Initial commit of unfinished Moonlight addin.
-
diff --git a/main/src/addins/MonoDevelop.PackageManagement/AddinInfo.cs b/main/src/addins/MonoDevelop.PackageManagement/AddinInfo.cs
index 4e583304c7..6b768fe71c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/AddinInfo.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/AddinInfo.cs
@@ -9,8 +9,9 @@ using Mono.Addins.Description;
 	Category = "IDE extensions")]

 

 [assembly:AddinName ("NuGet Package Management")]

-[assembly:AddinDescription ("Provides support for adding and maintaining NuGet packages in your project. Uses NuGet 2.8.1")]

+[assembly:AddinDescription ("Provides support for adding and maintaining NuGet packages in your project. Uses NuGet 2.8.7")]

 

 [assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]

 [assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]

 [assembly:AddinDependency ("DesignerSupport", MonoDevelop.BuildInfo.Version)]

+[assembly:AddinDependency ("Refactoring", MonoDevelop.BuildInfo.Version)]

diff --git a/main/src/addins/MonoDevelop.PackageManagement/AssemblyInfo.cs b/main/src/addins/MonoDevelop.PackageManagement/AssemblyInfo.cs
index c6a9914c74..57b9b48471 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/AssemblyInfo.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/AssemblyInfo.cs
@@ -1,8 +1,15 @@
 

 using System.Reflection;

+using System.Runtime.CompilerServices;

 

 [assembly: AssemblyProduct ("MonoDevelop")]

 [assembly: AssemblyTitle("MonoDevelop.PackageManagement")]

 [assembly: AssemblyDescription("NuGet addin for MonoDevelop")]

 [assembly: AssemblyVersion ("1.0")]

 [assembly: AssemblyCopyright ("MIT X11")]

+[assembly: InternalsVisibleTo ("MonoDevelop.MonoDroid")]

+[assembly: InternalsVisibleTo ("MonoDevelop.PackageManagement.Cmdlets")]

+[assembly: InternalsVisibleTo ("MonoDevelop.PackageManagement.Extensions")]

+[assembly: InternalsVisibleTo ("MonoDevelop.PackageManagement.Tests")]

+[assembly: InternalsVisibleTo ("Xamarin.Ide")]

+[assembly: InternalsVisibleTo ("Xamarin.Ide.Insights")]

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/AddPackagesHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/AddPackagesHandler.cs
index 927b6b00f2..c16dc31352 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/AddPackagesHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/AddPackagesHandler.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class AddPackagesHandler : PackagesCommandHandler

+	internal class AddPackagesHandler : PackagesCommandHandler

 	{

 		protected override void Run ()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs
index ff92a2f132..a5a36004f2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ManagePackagesHandler.cs
@@ -27,13 +27,13 @@
 //

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 using MonoDevelop.Core;

 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class ManagePackagesHandler : PackagesCommandHandler

+	internal class ManagePackagesHandler : PackagesCommandHandler

 	{

 		protected override void Run ()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageManagementStartupHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageManagementStartupHandler.cs
index 4a9a933c57..d7c72eabcd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageManagementStartupHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageManagementStartupHandler.cs
@@ -26,7 +26,6 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.PackageManagement;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

@@ -34,35 +33,28 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class PackageManagementStartupHandler : CommandHandler

+	internal class PackageManagementStartupHandler : CommandHandler

 	{

-		IPackageManagementProjectService projectService;

-

-		public PackageManagementStartupHandler ()

-		{

-			projectService = PackageManagementServices.ProjectService;

-		}

-

 		protected override void Run ()

 		{

-			projectService.SolutionLoaded += SolutionLoaded;

-			projectService.SolutionUnloaded += SolutionUnloaded;

+			IdeApp.Workspace.SolutionLoaded += SolutionLoaded;

+			IdeApp.Workspace.SolutionUnloaded += SolutionUnloaded;

 			IdeApp.Workspace.ItemUnloading += WorkspaceItemUnloading;

 		}

 

-		void SolutionLoaded (object sender, EventArgs e)

+		void SolutionLoaded (object sender, SolutionEventArgs e)

 		{

 			ClearUpdatedPackagesInSolution ();

 

 			if (ShouldRestorePackages) {

-				RestoreAndCheckForUpdates ();

-			} else if (ShouldCheckForUpdates && AnyProjectHasPackages ()) {

+				RestoreAndCheckForUpdates (e.Solution);

+			} else if (ShouldCheckForUpdates && AnyProjectHasPackages (e.Solution)) {

 				// Use background dispatch even though the check is not done on the

 				// background dispatcher thread so that the solution load completes before

 				// the check for updates starts. Otherwise the check for updates finishes

 				// before the solution loads and the status bar never reports that

 				// package updates were being checked.

-				DispatchService.BackgroundDispatch (() => {

+				PackageManagementBackgroundDispatcher.Dispatch (() => {

 					CheckForUpdates ();

 				});

 			}

@@ -81,29 +73,29 @@ namespace MonoDevelop.PackageManagement.Commands
 			PackageManagementServices.UpdatedPackagesInSolution.Clear ();

 		}

 

-		void SolutionUnloaded (object sender, EventArgs e)

+		void SolutionUnloaded (object sender, SolutionEventArgs e)

 		{

 			ClearUpdatedPackagesInSolution ();

 		}

 

-		void RestoreAndCheckForUpdates ()

+		void RestoreAndCheckForUpdates (Solution solution)

 		{

-			bool checkUpdatesAfterRestore = ShouldCheckForUpdates && AnyProjectHasPackages ();

+			bool checkUpdatesAfterRestore = ShouldCheckForUpdates && AnyProjectHasPackages (solution);

 

-			var restorer = new PackageRestorer (projectService.OpenSolution.Solution);

-			DispatchService.BackgroundDispatch (() => {

+			var packageManagementSolution = new PackageManagementSolution (new PackageManagementSolutionProjectService (solution));

+			var restorer = new PackageRestorer (packageManagementSolution);

+			PackageManagementBackgroundDispatcher.Dispatch (() => {

 				restorer.Restore ();

 				if (checkUpdatesAfterRestore && !restorer.RestoreFailed) {

 					CheckForUpdates ();

 				}

+				restorer = null;

 			});

 		}

 

-		bool AnyProjectHasPackages ()

+		bool AnyProjectHasPackages (Solution solution)

 		{

-			return projectService

-				.OpenSolution

-				.Solution

+			return solution

 				.GetAllProjectsWithPackages ()

 				.Any ();

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageReferenceNodeCommandHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageReferenceNodeCommandHandler.cs
index 38e9b4411c..1b95ecafc6 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageReferenceNodeCommandHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageReferenceNodeCommandHandler.cs
@@ -27,15 +27,15 @@
 using System;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.Core;

+using MonoDevelop.Ide;

 using MonoDevelop.Ide.Commands;

 using MonoDevelop.Ide.Gui.Components;

 using MonoDevelop.PackageManagement.NodeBuilders;

 using MonoDevelop.Projects;

-using ICSharpCode.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class PackageReferenceNodeCommandHandler : NodeCommandHandler

+	internal class PackageReferenceNodeCommandHandler : NodeCommandHandler

 	{

 		public override void DeleteItem ()

 		{

@@ -51,7 +51,7 @@ namespace MonoDevelop.PackageManagement.Commands
 

 		void RemovePackage (PackageReferenceNode packageReferenceNode, ProgressMonitorStatusMessage progressMessage)

 		{

-			IPackageManagementProject project = PackageManagementServices.Solution.GetActiveProject ();

+			IPackageManagementProject project = PackageManagementServices.Solution.GetProject (packageReferenceNode.Project);

 			UninstallPackageAction action = project.CreateUninstallPackageAction ();

 			action.Package = project.FindPackage (packageReferenceNode.Id);

 

@@ -86,12 +86,14 @@ namespace MonoDevelop.PackageManagement.Commands
 			var packageReferenceNode = (PackageReferenceNode)CurrentNode.DataItem;

 

 			try {

-				IPackageManagementProject project = PackageManagementServices.Solution.GetActiveProject ();

+				IPackageManagementProject project = PackageManagementServices.Solution.GetProject (packageReferenceNode.Project);

 				ProgressMonitorStatusMessage progressMessage = ProgressMonitorStatusMessageFactory.CreateUpdatingSinglePackageMessage (packageReferenceNode.Id, project);

 				UpdatePackageAction action = project.CreateUpdatePackageAction ();

 				action.PackageId = packageReferenceNode.Id;

+				action.AllowPrereleaseVersions = !packageReferenceNode.IsReleaseVersion ();

 

-				RestoreBeforeUpdateAction.Restore (project, () => {

+				IPackageManagementSolution solution = GetPackageManagementSolution ();

+				RestoreBeforeUpdateAction.Restore (solution, project, () => {

 					UpdatePackage (progressMessage, action);

 				});

 			} catch (Exception ex) {

@@ -131,6 +133,24 @@ namespace MonoDevelop.PackageManagement.Commands
 			var reinstaller = new PackageReinstaller ();

 			reinstaller.Run (packageReferenceNode);

 		}

+

+		Solution GetSelectedSolution ()

+		{

+			var project = IdeApp.ProjectOperations.CurrentSelectedProject as DotNetProject;

+			if (project != null) {

+				return project.ParentSolution;

+			}

+			return IdeApp.ProjectOperations.CurrentSelectedSolution;

+		}

+

+		IPackageManagementSolution GetPackageManagementSolution ()

+		{

+			Solution solution = GetSelectedSolution ();

+			if (solution != null) {

+				return new PackageManagementSolution (new PackageManagementSolutionProjectService (solution));

+			}

+			return null;

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageReferenceNodeCommands.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageReferenceNodeCommands.cs
index 646d91226d..5da9002452 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageReferenceNodeCommands.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackageReferenceNodeCommands.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public enum PackageReferenceNodeCommands

+	internal enum PackageReferenceNodeCommands

 	{

 		ShowPackageVersion,

 		UpdatePackage,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackagesCommandHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackagesCommandHandler.cs
index 34ee152473..ae58f73082 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackagesCommandHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/PackagesCommandHandler.cs
@@ -26,17 +26,13 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 //

 

-using System;

-using System.Linq;

-using ICSharpCode.PackageManagement;

 using MonoDevelop.Components.Commands;

-using MonoDevelop.Core;

 using MonoDevelop.Ide;

 using MonoDevelop.Projects;

 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public abstract class PackagesCommandHandler : CommandHandler

+	internal abstract class PackagesCommandHandler : CommandHandler

 	{

 		protected override void Update (CommandInfo info)

 		{

@@ -93,5 +89,23 @@ namespace MonoDevelop.PackageManagement.Commands
 			}

 			return false;

 		}

+

+		Solution GetSelectedSolution ()

+		{

+			DotNetProject project = GetSelectedDotNetProject ();

+			if (project != null) {

+				return project.ParentSolution;

+			}

+			return IdeApp.ProjectOperations.CurrentSelectedSolution;

+		}

+

+		protected IPackageManagementSolution GetPackageManagementSolution ()

+		{

+			Solution solution = GetSelectedSolution ();

+			if (solution != null) {

+				return new PackageManagementSolution (new PackageManagementSolutionProjectService (solution));

+			}

+			return null;

+		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ProjectPackagesFolderNodeCommandHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ProjectPackagesFolderNodeCommandHandler.cs
index 01a2c9ef91..5113aa6e27 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ProjectPackagesFolderNodeCommandHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ProjectPackagesFolderNodeCommandHandler.cs
@@ -29,7 +29,7 @@ using MonoDevelop.Ide.Gui.Components;
 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class ProjectPackagesFolderNodeCommandHandler : NodeCommandHandler

+	internal class ProjectPackagesFolderNodeCommandHandler : NodeCommandHandler

 	{

 		public override void ActivateItem ()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ReinstallAllPackagesInProjectHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ReinstallAllPackagesInProjectHandler.cs
index c42d992967..8a3e452544 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ReinstallAllPackagesInProjectHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/ReinstallAllPackagesInProjectHandler.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.PackageManagement.NodeBuilders;

 using MonoDevelop.Projects;

@@ -35,7 +35,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class ReinstallAllPackagesInProjectHandler : PackagesCommandHandler

+	internal class ReinstallAllPackagesInProjectHandler : PackagesCommandHandler

 	{

 		protected override void Run ()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/RestorePackagesHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/RestorePackagesHandler.cs
index f2b33d8bd5..8d34126269 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/RestorePackagesHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/RestorePackagesHandler.cs
@@ -26,24 +26,18 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 //

 

-using System;

-using ICSharpCode.PackageManagement;

-using MonoDevelop.Core;

-using MonoDevelop.Core.Execution;

-using MonoDevelop.Ide;

-using MonoDevelop.Ide.Gui;

-using MonoDevelop.Core.ProgressMonitoring;

 using MonoDevelop.Components.Commands;

 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class RestorePackagesHandler : PackagesCommandHandler

+	internal class RestorePackagesHandler : PackagesCommandHandler

 	{

 		protected override void Run ()

 		{

-			var runner = new PackageRestoreRunner ();

-			DispatchService.BackgroundDispatch (() => {

+			var runner = new PackageRestoreRunner (GetPackageManagementSolution ());

+			PackageManagementBackgroundDispatcher.Dispatch (() => {

 				runner.Run ();

+				runner = null;

 			});

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/RestorePackagesInProjectHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/RestorePackagesInProjectHandler.cs
index cd12b8ef75..3f2fc07199 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/RestorePackagesInProjectHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/RestorePackagesInProjectHandler.cs
@@ -25,12 +25,11 @@
 // THE SOFTWARE.

 

 using MonoDevelop.Components.Commands;

-using MonoDevelop.Ide;

 using MonoDevelop.Projects;

 

 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class RestorePackagesInProjectHandler : PackagesCommandHandler

+	internal class RestorePackagesInProjectHandler : PackagesCommandHandler

 	{

 		protected override void Run ()

 		{

@@ -39,9 +38,11 @@ namespace MonoDevelop.PackageManagement.Commands
 				return;

 

 			ProgressMonitorStatusMessage progressMessage = ProgressMonitorStatusMessageFactory.CreateRestoringPackagesInProjectMessage ();

-			var runner = new PackageRestoreRunner ();

-			DispatchService.BackgroundDispatch (() => {

+			var runner = new PackageRestoreRunner (GetPackageManagementSolution ());

+			PackageManagementBackgroundDispatcher.Dispatch (() => {

 				runner.Run (project, progressMessage);

+				runner = null;

+				project = null;

 			});

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/UpdateAllPackagesInProjectHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/UpdateAllPackagesInProjectHandler.cs
index 0619a141f5..d56cabf8a7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/UpdateAllPackagesInProjectHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/UpdateAllPackagesInProjectHandler.cs
@@ -1,46 +1,48 @@
-//

-// UpdateAllPackagesInProjectHandler.cs

-//

-// Author:

-//       Matt Ward <matt.ward@xamarin.com>

-//

-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

+//
+// UpdateAllPackagesInProjectHandler.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Components.Commands;

 using MonoDevelop.Ide;

-

+using MonoDevelop.Core;
+
 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class UpdateAllPackagesInProjectHandler : PackagesCommandHandler

+	internal class UpdateAllPackagesInProjectHandler : PackagesCommandHandler

 	{

 		protected override void Run ()

 		{

-			try {

+			try {
+				IPackageManagementSolution solution = GetPackageManagementSolution ();

 				IPackageManagementProject project = PackageManagementServices.Solution.GetActiveProject ();

-				RestoreBeforeUpdateAction.Restore (project, () => {

-					DispatchService.GuiSyncDispatch (() => Update (project));

+				RestoreBeforeUpdateAction.Restore (solution, project, () => {

+					Runtime.RunInMainThread (() => Update (project)).Wait ();

 				});

 			} catch (Exception ex) {

 				ShowStatusBarError (ex);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/UpdateAllPackagesInSolutionHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/UpdateAllPackagesInSolutionHandler.cs
index bb850711ba..710470aff6 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/UpdateAllPackagesInSolutionHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Commands/UpdateAllPackagesInSolutionHandler.cs
@@ -1,49 +1,49 @@
-//

-// UpdateAllPackagesInSolutionCommandHandler.cs

-//

-// Author:

-//       Matt Ward <matt.ward@xamarin.com>

-//

-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

+//
+// UpdateAllPackagesInSolutionCommandHandler.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

 using MonoDevelop.Components.Commands;

-using MonoDevelop.Ide;

-

+using MonoDevelop.Core;
+
 namespace MonoDevelop.PackageManagement.Commands

 {

-	public class UpdateAllPackagesInSolutionHandler : PackagesCommandHandler

+	internal class UpdateAllPackagesInSolutionHandler : PackagesCommandHandler

 	{

 		protected override void Run ()

 		{

-			try {

-				UpdateAllPackagesInSolution updateAllPackages = CreateUpdateAllPackagesInSolution ();

+			try {
+				IPackageManagementSolution solution = GetPackageManagementSolution ();

+				UpdateAllPackagesInSolution updateAllPackages = CreateUpdateAllPackagesInSolution (solution);

 				ProgressMonitorStatusMessage progressMessage = ProgressMonitorStatusMessageFactory.CreateUpdatingPackagesInSolutionMessage (updateAllPackages.Projects);

-				RestoreBeforeUpdateAction.Restore (updateAllPackages.Projects, () => {

-					DispatchService.GuiSyncDispatch (() => {

+				RestoreBeforeUpdateAction.Restore (solution, updateAllPackages.Projects, () => {

+					Runtime.RunInMainThread (() => {

 						Update (updateAllPackages, progressMessage);

-					});

+					}).Wait ();

 				});

 			} catch (Exception ex) {

 				ProgressMonitorStatusMessage progressMessage = ProgressMonitorStatusMessageFactory.CreateUpdatingPackagesInSolutionMessage ();

@@ -61,10 +61,10 @@ namespace MonoDevelop.PackageManagement.Commands
 			}

 		}

 

-		UpdateAllPackagesInSolution CreateUpdateAllPackagesInSolution ()

+		UpdateAllPackagesInSolution CreateUpdateAllPackagesInSolution (IPackageManagementSolution solution)

 		{

 			return new UpdateAllPackagesInSolution (

-				PackageManagementServices.Solution,

+				solution,

 				PackageManagementServices.PackageRepositoryCache.CreateAggregateRepository ());

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackageSourceDialog.UI.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackageSourceDialog.UI.cs
index 1b291e8e2b..31dab786d6 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackageSourceDialog.UI.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackageSourceDialog.UI.cs
@@ -30,7 +30,7 @@ using Xwt;
 

 namespace MonoDevelop.PackageManagement

 {

-	public partial class AddPackageSourceDialog : Dialog

+	internal partial class AddPackageSourceDialog : Dialog

 	{

 		TextEntry packageSourceNameTextEntry;

 		TextEntry packageSourceUrlTextEntry;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackageSourceDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackageSourceDialog.cs
index dec492da47..a101cc2b88 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackageSourceDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackageSourceDialog.cs
@@ -25,12 +25,12 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 

 namespace MonoDevelop.PackageManagement

 {

-	public partial class AddPackageSourceDialog

+	internal partial class AddPackageSourceDialog

 	{

 		RegisteredPackageSourcesViewModel viewModel;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.UI.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.UI.cs
index 7fe0956497..912ed31c8c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.UI.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.UI.cs
@@ -27,14 +27,14 @@
 using System;

 using ExtendedTitleBarDialog = MonoDevelop.Components.ExtendedTitleBarDialog;

 using Mono.Unix;

+using MonoDevelop.Core;

 using MonoDevelop.Ide;

-using MonoDevelop.Ide.Gui;

 using Xwt;

 using Xwt.Drawing;

 

 namespace MonoDevelop.PackageManagement

 {

-	public partial class AddPackagesDialog : ExtendedTitleBarDialog

+	internal partial class AddPackagesDialog : ExtendedTitleBarDialog

 	{

 		ComboBox packageSourceComboBox;

 		SearchTextEntry packageSearchEntry;

@@ -60,8 +60,7 @@ namespace MonoDevelop.PackageManagement
 		Label errorMessageLabel;

 		Label loadingSpinnerLabel;

 		FrameBox noPackagesFoundFrame;

-		Color lineBorderColor = Color.FromBytes (163, 166, 171);

-		Color packageInfoBackgroundColor = Color.FromBytes (227, 231, 237);

+		int packageInfoFontSize = 11;

 

 		void Build ()

 		{

@@ -70,6 +69,10 @@ namespace MonoDevelop.PackageManagement
 			Height = 520;

 			Padding = new WidgetSpacing ();

 

+			if (Platform.IsWindows) {

+				packageInfoFontSize = 9;

+			}

+

 			// Top part of dialog:

 			// Package sources and search.

 			var topHBox = new HBox ();

@@ -95,7 +98,7 @@ namespace MonoDevelop.PackageManagement
 			var middleFrame = new FrameBox ();

 			middleFrame.Content = middleHBox;

 			middleFrame.BorderWidth = new WidgetSpacing (0, 0, 0, 1);

-			middleFrame.BorderColor = lineBorderColor;

+			middleFrame.BorderColor = Styles.LineBorderColor;

 			mainVBox.PackStart (middleFrame, true, true);

 

 			// Error information.

@@ -103,15 +106,15 @@ namespace MonoDevelop.PackageManagement
 			packagesListVBox.Spacing = 0;

 			errorMessageHBox = new HBox ();

 			errorMessageHBox.Margin = new WidgetSpacing ();

-			errorMessageHBox.BackgroundColor = Colors.Orange;

+			errorMessageHBox.BackgroundColor = Styles.ErrorBackgroundColor;

 			errorMessageHBox.Visible = false;

 			var errorImage = new ImageView ();

 			errorImage.Margin = new WidgetSpacing (10, 0, 0, 0);

-			errorImage.Image = ImageService.GetIcon (Stock.Warning, Gtk.IconSize.Menu);

+			errorImage.Image = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Warning, Gtk.IconSize.Menu);

 			errorImage.HorizontalPlacement = WidgetPlacement.End;

 			errorMessageHBox.PackStart (errorImage);

 			errorMessageLabel = new Label ();

-			errorMessageLabel.TextColor = Colors.White;

+			errorMessageLabel.TextColor = Styles.ErrorForegroundColor;

 			errorMessageLabel.Margin = new WidgetSpacing (5, 5, 5, 5);

 			errorMessageLabel.Wrap = WrapMode.Word;

 			errorMessageHBox.PackStart (errorMessageLabel, true);

@@ -138,7 +141,7 @@ namespace MonoDevelop.PackageManagement
 

 			loadingSpinnerFrame = new FrameBox ();

 			loadingSpinnerFrame.Visible = false;

-			loadingSpinnerFrame.BackgroundColor = Colors.White;

+			loadingSpinnerFrame.BackgroundColor = Styles.BackgroundColor;

 			loadingSpinnerFrame.Content = loadingSpinnerHBox;

 			loadingSpinnerFrame.BorderWidth = new WidgetSpacing ();

 			packagesListVBox.PackStart (loadingSpinnerFrame, true, true);

@@ -153,7 +156,7 @@ namespace MonoDevelop.PackageManagement
 

 			noPackagesFoundFrame = new FrameBox ();

 			noPackagesFoundFrame.Visible = false;

-			noPackagesFoundFrame.BackgroundColor = Colors.White;

+			noPackagesFoundFrame.BackgroundColor = Styles.BackgroundColor;

 			noPackagesFoundFrame.Content = noPackagesFoundHBox;

 			noPackagesFoundFrame.BorderWidth = new WidgetSpacing ();

 			packagesListVBox.PackStart (noPackagesFoundFrame, true, true);

@@ -161,7 +164,7 @@ namespace MonoDevelop.PackageManagement
 			// Package information

 			packageInfoVBox = new VBox ();

 			var packageInfoFrame = new FrameBox ();

-			packageInfoFrame.BackgroundColor = packageInfoBackgroundColor;

+			packageInfoFrame.BackgroundColor = Styles.PackageInfoBackgroundColor;

 			packageInfoFrame.BorderWidth = new WidgetSpacing ();

 			packageInfoFrame.Content = packageInfoVBox;

 			packageInfoVBox.Margin = new WidgetSpacing (15, 12, 15, 12);

@@ -173,11 +176,11 @@ namespace MonoDevelop.PackageManagement
 			packageInfoScrollView.BorderVisible = false;

 			packageInfoScrollView.HorizontalScrollPolicy = ScrollPolicy.Never;

 			packageInfoScrollView.Content = packageInfoContainerVBox;

-			packageInfoScrollView.BackgroundColor = packageInfoBackgroundColor;

+			packageInfoScrollView.BackgroundColor = Styles.PackageInfoBackgroundColor;

 			var packageInfoScrollViewFrame = new FrameBox ();

-			packageInfoScrollViewFrame.BackgroundColor = packageInfoBackgroundColor;

+			packageInfoScrollViewFrame.BackgroundColor = Styles.PackageInfoBackgroundColor;

 			packageInfoScrollViewFrame.BorderWidth = new WidgetSpacing (1, 0, 0, 0);

-			packageInfoScrollViewFrame.BorderColor = lineBorderColor;

+			packageInfoScrollViewFrame.BorderColor = Styles.LineBorderColor;

 			packageInfoScrollViewFrame.Content = packageInfoScrollView;

 			middleHBox.PackEnd (packageInfoScrollViewFrame);

 

@@ -187,18 +190,20 @@ namespace MonoDevelop.PackageManagement
 

 			packageNameLabel = new Label ();

 			packageNameLabel.Ellipsize = EllipsizeMode.End;

-			Font packageInfoSmallFont = packageNameLabel.Font.WithScaledSize (0.8);

+			Font packageInfoSmallFont = packageNameLabel.Font.WithSize (packageInfoFontSize);

+			packageNameLabel.Font = packageInfoSmallFont;

 			packageNameHBox.PackStart (packageNameLabel, true);

 

 			packageVersionLabel = new Label ();

 			packageVersionLabel.TextAlignment = Alignment.End;

+			packageVersionLabel.Font = packageInfoSmallFont;

 			packageNameHBox.PackEnd (packageVersionLabel);

 

 			// Package description.

 			packageDescription = new Label ();

 			packageDescription.Wrap = WrapMode.Word;

-			packageDescription.Font = packageNameLabel.Font.WithScaledSize (0.9);

-			packageDescription.BackgroundColor = packageInfoBackgroundColor;

+			packageDescription.Font = packageNameLabel.Font.WithSize (packageInfoFontSize);

+			packageDescription.BackgroundColor = Styles.PackageInfoBackgroundColor;

 			packageInfoVBox.PackStart (packageDescription);

 

 			// Package id.

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.cs
index ec8e0f7f69..fc3b7c756e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.cs
@@ -28,10 +28,12 @@ using System;
 using System.Collections.Generic;

 using System.ComponentModel;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using System.Threading.Tasks;

+using MonoDevelop.PackageManagement;

 using Mono.Unix;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

+using MonoDevelop.Projects;

 using NuGet;

 using Xwt;

 using Xwt.Drawing;

@@ -40,7 +42,7 @@ using PropertyChangedEventArgs = System.ComponentModel.PropertyChangedEventArgs;
 

 namespace MonoDevelop.PackageManagement

 {

-	public partial class AddPackagesDialog

+	internal partial class AddPackagesDialog

 	{

 		IBackgroundPackageActionRunner backgroundActionRunner;

 		IRecentPackageRepository recentPackageRepository;

@@ -60,6 +62,7 @@ namespace MonoDevelop.PackageManagement
 			new PackageSource ("", Catalog.GetString ("Configure Sources..."));

 		ImageLoader imageLoader = new ImageLoader ();

 		bool loadingMessageVisible;

+		const string IncludePrereleaseUserPreferenceName = "NuGet.AddPackagesDialog.IncludePrerelease";

 

 		public AddPackagesDialog (ManagePackagesViewModel parentViewModel, string initialSearch = null)

 			: this (

@@ -108,6 +111,9 @@ namespace MonoDevelop.PackageManagement
 			viewModel.PropertyChanged -= ViewModelPropertyChanged;

 			parentViewModel.Dispose ();

 			DisposeExistingTimer ();

+			packageStore.Clear ();

+			viewModel = null;

+			parentViewModel = null;

 			base.Dispose (disposing);

 		}

 

@@ -187,6 +193,31 @@ namespace MonoDevelop.PackageManagement
 		void ShowPrereleaseCheckBoxClicked (object sender, EventArgs e)

 		{

 			viewModel.IncludePrerelease = !viewModel.IncludePrerelease;

+

+			SaveIncludePrereleaseUserPreference ();

+		}

+

+		void SaveIncludePrereleaseUserPreference ()

+		{

+			Solution solution = IdeApp.ProjectOperations.CurrentSelectedSolution;

+			if (solution != null) {

+				if (viewModel.IncludePrerelease) {

+					solution.UserProperties.SetValue (IncludePrereleaseUserPreferenceName, viewModel.IncludePrerelease);

+				} else {

+					solution.UserProperties.RemoveValue (IncludePrereleaseUserPreferenceName);

+				}

+				solution.SaveUserProperties ();

+			}

+		}

+

+		bool GetIncludePrereleaseUserPreference ()

+		{

+			Solution solution = IdeApp.ProjectOperations.CurrentSelectedSolution;

+			if (solution != null) {

+				return solution.UserProperties.GetValue (IncludePrereleaseUserPreferenceName, false);

+			}

+

+			return false;

 		}

 

 		void LoadViewModel (string initialSearch)

@@ -194,6 +225,9 @@ namespace MonoDevelop.PackageManagement
 			viewModel.ClearPackagesOnPaging = false;

 			viewModel.SearchTerms = initialSearch;

 

+			viewModel.IncludePrerelease = GetIncludePrereleaseUserPreference ();

+			showPrereleaseCheckBox.Active = viewModel.IncludePrerelease;

+

 			ClearSelectedPackageInformation ();

 			PopulatePackageSources ();

 			viewModel.PropertyChanged += ViewModelPropertyChanged;

@@ -416,7 +450,7 @@ namespace MonoDevelop.PackageManagement
 				// Workaround: Image loading is incorrectly being done on GUI thread

 				// since the wrong synchronization context seems to be used. So

 				// here we switch to a background thread and then back to the GUI thread.

-				DispatchService.BackgroundDispatch (() => LoadImage (packageViewModel.IconUrl, row));

+				Task.Run (() => LoadImage (packageViewModel.IconUrl, row));

 			}

 		}

 

@@ -424,7 +458,7 @@ namespace MonoDevelop.PackageManagement
 		{

 			// Put it back on the GUI thread so the correct synchronization context

 			// is used. The image loading will be done on a background thread.

-			DispatchService.GuiDispatch (() => imageLoader.LoadFrom (iconUrl, row));

+			Runtime.RunInMainThread (() => imageLoader.LoadFrom (iconUrl, row));

 		}

 

 		bool IsOddRow (int row)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialogRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialogRunner.cs
index 4d5ac983d6..2c17e14bd9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialogRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialogRunner.cs
@@ -25,14 +25,14 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 using Xwt;

 using MonoDevelop.Core;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class AddPackagesDialogRunner

+	internal class AddPackagesDialogRunner

 	{

 		public void Run (string initialSearch = null)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/DialogExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/DialogExtensions.cs
index a2581c158f..06225fa73d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/DialogExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/DialogExtensions.cs
@@ -30,7 +30,7 @@ using Xwt;
 

 namespace MonoDevelop.PackageManagement

 {

-	public static class DialogExtensions

+	internal static class DialogExtensions

 	{

 		public static Command ShowWithParent (this Dialog dialog)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/HyperlinkWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/HyperlinkWidget.cs
index d42dc53f3c..43aede9353 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/HyperlinkWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/HyperlinkWidget.cs
@@ -33,7 +33,7 @@ using MonoDevelop.Ide;
 namespace MonoDevelop.PackageManagement

 {

 	[System.ComponentModel.ToolboxItem(true)]

-	public partial class HyperlinkWidget : Gtk.Bin

+	internal partial class HyperlinkWidget : Gtk.Bin

 	{

 		LinkButton linkButton;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs
index 5327c86e0f..e3ea8887c2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs
@@ -27,12 +27,14 @@
 //

 

 using System;

-using ICSharpCode.PackageManagement;

-using NuGet;

+using Gtk;

+using MonoDevelop.Components;

+using MonoDevelop.Core;

+using MonoDevelop.Ide;

 

 namespace MonoDevelop.PackageManagement

 {

-	public partial class LicenseAcceptanceDialog : Gtk.Dialog

+	internal partial class LicenseAcceptanceDialog : Gtk.Dialog

 	{

 		LicenseAcceptanceViewModel viewModel;

 

@@ -42,21 +44,43 @@ namespace MonoDevelop.PackageManagement
 			this.viewModel = viewModel;

 			this.subTitleHBoxForSinglePackage.Visible = viewModel.HasOnePackage;

 			this.subTitleHBoxForMultiplePackages.Visible = viewModel.HasMultiplePackages;

+

 			AddPackages ();

 		}

 

 		void AddPackages ()

 		{

 			foreach (PackageLicenseViewModel package in viewModel.Packages) {

-				AddPackageWidget (package);

+				AddPackage (package);

 			}

 			this.packagesVBox.ShowAll ();

 		}

 

-		void AddPackageWidget (PackageLicenseViewModel package)

+		void AddPackage (PackageLicenseViewModel package)

+		{

+			var label = new Label () {

+				Xalign = 0,

+				Yalign = 0,

+				Xpad = 5,

+				Ypad = 5,

+				Wrap = true,

+				Markup = CreatePackageMarkup (package)

+			};

+

+			GtkWorkarounds.SetLinkHandler (label, DesktopService.ShowUrl);

+

+			this.packagesVBox.PackStart (label, false, false, 0);

+		}

+

+		string CreatePackageMarkup (PackageLicenseViewModel package)

 		{

-			var widget = new PackageLicenseWidget (package);

-			this.packagesVBox.Add (widget);

+			return String.Format (

+				"<span weight='bold'>{0}</span>\t{1}\n<a href='{2}'>{3}</a>",

+				package.Id,

+				package.GetAuthors (),

+				package.LicenseUrl,

+				GettextCatalog.GetString ("View License")

+			);

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs
index ec08175f9e..bc692b9745 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs
@@ -28,11 +28,11 @@
 

 using System;

 using Gtk;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement

 {

-	public partial class ManagePackagesDialog : Gtk.Dialog

+	internal partial class ManagePackagesDialog : Gtk.Dialog

 	{

 		ManagePackagesViewModel viewModel;

 		IPackageManagementEvents packageManagementEvents;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellView.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellView.cs
index 5b2df5a845..cb16c4ae39 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellView.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellView.cs
@@ -25,23 +25,34 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.Core;

 using Xwt;

 using Xwt.Drawing;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageCellView : CanvasCellView

+	internal class PackageCellView : CanvasCellView

 	{

+		int packageIdFontSize;

+		int packageDescriptionFontSize;

+

 		public PackageCellView ()

 		{

 			CellWidth = 260;

 

-			BackgroundColor = Color.FromBytes (243, 246, 250);

-			StrongSelectionColor = Color.FromBytes (49, 119, 216);

-			SelectionColor = Color.FromBytes (204, 204, 204);

+			BackgroundColor = Styles.CellBackgroundColor;

+			StrongSelectionColor = Styles.CellStrongSelectionColor;

+			SelectionColor = Styles.CellSelectionColor;

 

 			UseStrongSelectionColor = true;

+

+			if (Platform.IsWindows) {

+				packageIdFontSize = 10;

+				packageDescriptionFontSize = 9;

+			} else {

+				packageIdFontSize = 12;

+				packageDescriptionFontSize = 11;

+			}

 		}

 

 		public IDataField<PackageViewModel> PackageField { get; set; }

@@ -88,6 +99,7 @@ namespace MonoDevelop.PackageManagement
 

 			// Package Id.

 			var packageIdTextLayout = new TextLayout ();

+			packageIdTextLayout.Font = packageIdTextLayout.Font.WithSize (packageIdFontSize);

 			packageIdTextLayout.Markup = packageViewModel.GetNameMarkup ();

 			packageIdTextLayout.Trimming = TextTrimming.WordElipsis;

 			Size packageIdTextSize = packageIdTextLayout.GetSize ();

@@ -99,7 +111,7 @@ namespace MonoDevelop.PackageManagement
 

 			// Package description.

 			var descriptionTextLayout = new TextLayout ();

-			descriptionTextLayout.Font = descriptionTextLayout.Font.WithScaledSize (0.9);

+			descriptionTextLayout.Font = descriptionTextLayout.Font.WithSize (packageDescriptionFontSize);

 			descriptionTextLayout.Width = cellArea.Width - packageDescriptionPadding.HorizontalSpacing - packageDescriptionLeftOffset;

 			descriptionTextLayout.Height = cellArea.Height - packageIdTextSize.Height - packageDescriptionPadding.VerticalSpacing;

 			descriptionTextLayout.Text = packageViewModel.Summary;

@@ -114,9 +126,9 @@ namespace MonoDevelop.PackageManagement
 		void UpdateTextColor (Context ctx)

 		{

 			if (UseStrongSelectionColor && Selected) {

-				ctx.SetColor (Colors.White);

+				ctx.SetColor (Styles.CellTextSelectionColor);

 			} else {

-				ctx.SetColor (Colors.Black);

+				ctx.SetColor (Styles.CellTextColor);

 			}

 		}

 

@@ -230,6 +242,9 @@ namespace MonoDevelop.PackageManagement
 				image = defaultPackageImage;

 			}

 

+			if (Selected)

+				image = image.WithStyles ("sel");

+

 			if (PackageImageNeedsResizing (image)) {

 				Point imageLocation = GetPackageImageLocation (maxPackageImageSize, cellArea);

 				ctx.DrawImage (

@@ -263,7 +278,7 @@ namespace MonoDevelop.PackageManagement
 		{

 			var layout = new TextLayout ();

 			layout.Text = "W";

-			layout.Font = layout.Font.WithScaledSize (0.9);

+			layout.Font = layout.Font.WithSize (packageDescriptionFontSize);

 			Size size = layout.GetSize ();

 			return new Size (CellWidth, size.Height * linesDisplayedCount + packageDescriptionPaddingHeight + packageDescriptionPadding.VerticalSpacing);

 		}

@@ -317,7 +332,7 @@ namespace MonoDevelop.PackageManagement
 		Image checkedCheckBoxWithBackgroundColorImage;

 		Image uncheckedCheckBoxWithBackgroundColorImage;

 

-		static readonly Image defaultPackageImage = Image.FromResource (typeof(PackageCellView), "reference-48.png");

+		static readonly Image defaultPackageImage = Image.FromResource (typeof(PackageCellView), "package-48.png");

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellViewCheckBox.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellViewCheckBox.cs
index 9addd492fc..5e0277c98d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellViewCheckBox.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellViewCheckBox.cs
@@ -30,7 +30,7 @@ using Gtk;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageCellViewCheckBox

+	internal class PackageCellViewCheckBox

 	{

 		static int indicatorSize;

 		static int indicatorSpacing;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellViewEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellViewEventArgs.cs
index 5a459272a0..32b9d14bef 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellViewEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellViewEventArgs.cs
@@ -25,11 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageCellViewEventArgs : EventArgs

+	internal class PackageCellViewEventArgs : EventArgs

 	{

 		public PackageCellViewEventArgs (PackageViewModel packageViewModel)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageLicenseWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageLicenseWidget.cs
index 3a84ae9e05..709e6c8314 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageLicenseWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageLicenseWidget.cs
@@ -27,13 +27,13 @@
 //

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

 	[System.ComponentModel.ToolboxItem(true)]

-	public partial class PackageLicenseWidget : Gtk.Bin

+	internal partial class PackageLicenseWidget : Gtk.Bin

 	{

 		public PackageLicenseWidget (PackageLicenseViewModel viewModel)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageManagementOptionsPanel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageManagementOptionsPanel.cs
index 977256acc9..ac5c61c5f2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageManagementOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageManagementOptionsPanel.cs
@@ -27,16 +27,17 @@
 //

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.Components;
+using MonoDevelop.PackageManagement;
 using MonoDevelop.Ide.Gui.Dialogs;

 

 namespace MonoDevelop.PackageManagement.Gui

 {

-	public class PackageManagementOptionsPanel : OptionsPanel

+	internal class PackageManagementOptionsPanel : OptionsPanel

 	{

 		PackageManagementOptionsViewModel optionsViewModel;

-		

-		public override Gtk.Widget CreatePanelWidget()

+

+		public override Control CreatePanelWidget()

 		{

 			var viewModels = new PackageManagementViewModels ();

 			optionsViewModel = viewModels.PackageManagementOptionsViewModel;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageManagementOptionsWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageManagementOptionsWidget.cs
index 5bb930bede..521df0f699 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageManagementOptionsWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageManagementOptionsWidget.cs
@@ -27,12 +27,12 @@
 //

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement

 {

 	[System.ComponentModel.ToolboxItem(true)]

-	public partial class PackageManagementOptionsWidget : Gtk.Bin

+	internal partial class PackageManagementOptionsWidget : Gtk.Bin

 	{

 		PackageManagementOptionsViewModel viewModel;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourceCellRenderer.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourceCellRenderer.cs
index 5e788c8ea7..b66eb067eb 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourceCellRenderer.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourceCellRenderer.cs
@@ -26,14 +26,14 @@
 

 using System;

 using Gtk;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Components;

 using MonoDevelop.Ide;

 using Gdk;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageSourceCellRenderer : CellRenderer

+	internal class PackageSourceCellRenderer : CellRenderer

 	{

 		[GLib.Property("package-source")]

 		public PackageSourceViewModel PackageSourceViewModel { get; set; }

@@ -56,7 +56,7 @@ namespace MonoDevelop.PackageManagement
 				int packageSourceNameWidth = GetLayoutWidth (layout);

 				StateType state = GetState (widget, flags);

 

-				layout.SetMarkup (GetPackageSourceDescriptionMarkup ());

+				layout.SetMarkup (GetPackageSourceDescriptionMarkup (flags));

 

 				window.DrawLayout (widget.Style.TextGC (state), cell_area.X + textSpacing, cell_area.Y + textTopSpacing, layout);

 

@@ -65,7 +65,7 @@ namespace MonoDevelop.PackageManagement
 						ctx.DrawImage (widget, warningImage, cell_area.X + textSpacing + packageSourceNameWidth + imageSpacing, cell_area.Y + textTopSpacing);

 					}

 

-					layout.SetMarkup (GetPackageSourceErrorMarkup ());

+					layout.SetMarkup (GetPackageSourceErrorMarkup (flags));

 					int packageSourceErrorTextX = cell_area.X + textSpacing + packageSourceNameWidth + (int)warningImage.Width + (2 * imageSpacing);

 					window.DrawLayout (widget.Style.TextGC (state), packageSourceErrorTextX, cell_area.Y + textTopSpacing, layout);

 				}

@@ -104,18 +104,20 @@ namespace MonoDevelop.PackageManagement
 			return new Size (width, height);

 		}

 

-		string GetPackageSourceDescriptionMarkup ()

+		string GetPackageSourceDescriptionMarkup (CellRendererState flags = CellRendererState.Focused)

 		{

 			return MarkupString.Format (

-				"<b>{0}</b>\n<span foreground='#747474'>{1}</span>",

+				"<b>{0}</b>\n<span foreground='{2}'>{1}</span>",

 				PackageSourceViewModel.Name,

-				PackageSourceViewModel.SourceUrl);

+				PackageSourceViewModel.SourceUrl,

+				Ide.Gui.Styles.ColorGetHex (flags.HasFlag (CellRendererState.Selected) ? Styles.PackageSourceUrlSelectedTextColor : Styles.PackageSourceUrlTextColor));

 		}

 

-		string GetPackageSourceErrorMarkup ()

+		string GetPackageSourceErrorMarkup (CellRendererState flags = CellRendererState.Focused)

 		{

 			return MarkupString.Format (

-				"<span foreground='#656565'>{0}</span>",

+				"<span foreground='{0}'>{1}</span>",

+				Ide.Gui.Styles.ColorGetHex (flags.HasFlag (CellRendererState.Selected) ? Styles.PackageSourceErrorSelectedTextColor : Styles.PackageSourceErrorTextColor),

 				PackageSourceViewModel.ValidationFailureMessage);

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourcesOptionsPanel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourcesOptionsPanel.cs
index d89d2bc405..22f60668a9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourcesOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourcesOptionsPanel.cs
@@ -30,19 +30,20 @@ using System;
 using System.Linq;

 using System.IO;

 using System.Security.Cryptography;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.Components;
+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 using MonoDevelop.Ide.Gui.Dialogs;

 

 namespace MonoDevelop.PackageManagement.Gui

 {

-	public class PackageSourcesOptionsPanel : OptionsPanel

+	internal class PackageSourcesOptionsPanel : OptionsPanel

 	{

 		PackageManagementViewModels viewModels;

 		PackageSourcesWidget packageSourcesWidget;

 

-		public override Gtk.Widget CreatePanelWidget()

+		public override Control CreatePanelWidget()

 		{

 			viewModels = new PackageManagementViewModels ();

 			viewModels.RegisteredPackageSourcesViewModel.Load ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourcesWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourcesWidget.cs
index 0b27fbaf60..11cc284a27 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourcesWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourcesWidget.cs
@@ -4,14 +4,14 @@ using System.Collections.Specialized;
 using System.Linq;

 

 using Gtk;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Components;

 

 namespace MonoDevelop.PackageManagement

 {

 	[System.ComponentModel.ToolboxItem(true)]

-	public partial class PackageSourcesWidget : Gtk.Bin

+	internal partial class PackageSourcesWidget : Gtk.Bin

 	{

 		RegisteredPackageSourcesViewModel viewModel;

 		ListStore packageSourcesStore;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackagesWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackagesWidget.cs
index 322c4db9c4..6412603bd3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackagesWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackagesWidget.cs
@@ -33,14 +33,14 @@ using System.Linq;
 

 using Gdk;

 using Gtk;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

 	[System.ComponentModel.ToolboxItem(true)]

-	public partial class PackagesWidget : Gtk.Bin

+	internal partial class PackagesWidget : Gtk.Bin

 	{

 		PackagesViewModel viewModel;

 		List<PackageSource> packageSources;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PagedResultsWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PagedResultsWidget.cs
index a596b7d59e..ed5c2a3677 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PagedResultsWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PagedResultsWidget.cs
@@ -29,13 +29,13 @@
 using System;

 using System.Collections.Generic;

 using Gtk;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using System.ComponentModel;

 

 namespace MonoDevelop.PackageManagement

 {

 	[System.ComponentModel.ToolboxItem(true)]

-	public partial class PagedResultsWidget : Gtk.Bin

+	internal partial class PagedResultsWidget : Gtk.Bin

 	{

 		PackagesViewModel viewModel;

 		List<Button> buttons;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/SelectProjectsDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/SelectProjectsDialog.cs
index 5c3f11168b..7a22f46a72 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/SelectProjectsDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/SelectProjectsDialog.cs
@@ -30,11 +30,11 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 using Gtk;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement

 {

-	public partial class SelectProjectsDialog : Gtk.Dialog

+	internal partial class SelectProjectsDialog : Gtk.Dialog

 	{

 		SelectProjectsViewModel viewModel;

 		ListStore projectsStore;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/Styles.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/Styles.cs
new file mode 100644
index 0000000000..aaea5a60c0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/Styles.cs
@@ -0,0 +1,87 @@
+//
+// Styles.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Ide;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.PackageManagement
+{
+	internal static class Styles
+	{
+		public static Xwt.Drawing.Color LineBorderColor { get; internal set; }
+		public static Xwt.Drawing.Color BackgroundColor { get; internal set; }
+		public static Xwt.Drawing.Color PackageInfoBackgroundColor { get; internal set; }
+		public static Xwt.Drawing.Color CellBackgroundColor { get; internal set; }
+		public static Xwt.Drawing.Color CellSelectionColor { get; internal set; }
+		public static Xwt.Drawing.Color CellStrongSelectionColor { get; internal set; }
+		public static Xwt.Drawing.Color CellTextColor { get; internal set; }
+		public static Xwt.Drawing.Color CellTextSelectionColor { get; internal set; }
+		public static Xwt.Drawing.Color PackageSourceUrlTextColor { get; internal set; }
+		public static Xwt.Drawing.Color PackageSourceUrlSelectedTextColor { get; internal set; }
+		public static Xwt.Drawing.Color PackageSourceErrorTextColor { get; internal set; }
+		public static Xwt.Drawing.Color PackageSourceErrorSelectedTextColor { get; internal set; }
+		public static Xwt.Drawing.Color ErrorBackgroundColor { get; internal set; }
+		public static Xwt.Drawing.Color ErrorForegroundColor { get; internal set; }
+
+		static Styles ()
+		{
+			LoadStyles ();
+			Ide.Gui.Styles.Changed +=  (o, e) => LoadStyles ();
+		}
+
+		public static void LoadStyles ()
+		{
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) {
+				CellBackgroundColor = Ide.Gui.Styles.PadBackground;
+			} else {
+				CellBackgroundColor = Xwt.Drawing.Color.FromName ("#3c3c3c");
+			}
+
+			// Shared
+
+			BackgroundColor = Ide.Gui.Styles.PrimaryBackgroundColor;
+
+			CellTextColor = Ide.Gui.Styles.BaseForegroundColor;
+			CellStrongSelectionColor = Ide.Gui.Styles.BaseSelectionBackgroundColor;
+			CellSelectionColor = Ide.Gui.Styles.BaseSelectionBackgroundColor;
+			CellTextSelectionColor = Ide.Gui.Styles.BaseSelectionTextColor;
+
+			PackageInfoBackgroundColor = Ide.Gui.Styles.SecondaryBackgroundLighterColor;
+			PackageSourceErrorTextColor = Ide.Gui.Styles.ErrorForegroundColor;
+			PackageSourceUrlTextColor = Ide.Gui.Styles.DimTextColor;
+
+			PackageSourceErrorSelectedTextColor = PackageSourceErrorTextColor;
+
+			// Blue selection text color only on Mac
+			PackageSourceUrlSelectedTextColor = Platform.IsMac ? Xwt.Drawing.Color.FromName ("#ffffff") : Ide.Gui.Styles.DimTextColor;
+
+			LineBorderColor = Ide.Gui.Styles.SeparatorColor;
+
+			ErrorBackgroundColor = Ide.Gui.Styles.StatusWarningBackgroundColor;
+			ErrorForegroundColor = Ide.Gui.Styles.StatusWarningTextColor;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNode.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNode.cs
index 915328acfd..da3636f7b5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNode.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNode.cs
@@ -33,14 +33,16 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class PackageReferenceNode

+	internal class PackageReferenceNode

 	{

 		public PackageReferenceNode (

+			ProjectPackagesFolderNode parentNode,

 			PackageReference packageReference,

 			bool installed,

 			bool pending = false,

 			IPackageName updatedPackage = null)

 		{

+			ParentNode = parentNode;

 			PackageReference = packageReference;

 			Installed = installed;

 			IsInstallPending = pending;

@@ -62,6 +64,13 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 		public bool IsInstallPending { get; private set; }

 		public bool IsReinstallNeeded { get; private set; }

 

+

+		ProjectPackagesFolderNode ParentNode { get; set; }

+

+		public IDotNetProject Project {

+			get { return ParentNode.Project; }

+		}

+

 		public string Name {

 			get { return PackageReference.Id; }

 		}

@@ -148,6 +157,11 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 		{

 			return (!Installed || IsInstallPending);

 		}

+

+		public bool IsReleaseVersion ()

+		{

+			return PackageReference.IsReleaseVersion ();

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodeBuilder.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodeBuilder.cs
index 149b61f265..bff21aff91 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodeBuilder.cs
@@ -33,7 +33,7 @@ using MonoDevelop.PackageManagement.Commands;
 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class PackageReferenceNodeBuilder : TypeNodeBuilder

+	internal class PackageReferenceNodeBuilder : TypeNodeBuilder

 	{

 		public override Type NodeDataType {

 			get { return typeof(PackageReferenceNode); }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodeDescriptor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodeDescriptor.cs
index 76e0d796db..e91d50f65d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodeDescriptor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodeDescriptor.cs
@@ -32,7 +32,7 @@ using System.Runtime.Versioning;
 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class PackageReferenceNodeDescriptor : CustomDescriptor

+	internal class PackageReferenceNodeDescriptor : CustomDescriptor

 	{

 		PackageReferenceNode packageReferenceNode;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodePropertyProvider.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodePropertyProvider.cs
index 1ec7365af2..4c5fa6f110 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodePropertyProvider.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/PackageReferenceNodePropertyProvider.cs
@@ -29,7 +29,7 @@ using MonoDevelop.DesignerSupport;
 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class PackageReferenceNodePropertyProvider : IPropertyProvider

+	internal class PackageReferenceNodePropertyProvider : IPropertyProvider

 	{

 		public bool SupportsObject (object obj)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNode.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNode.cs
index 45e629c2de..969ea872b2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNode.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNode.cs
@@ -27,7 +27,6 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide.Gui;

 using MonoDevelop.Projects;

@@ -35,7 +34,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class ProjectPackagesFolderNode

+	internal class ProjectPackagesFolderNode

 	{

 		IDotNetProject project;

 		IUpdatedPackagesInSolution updatedPackagesInSolution;

@@ -54,10 +53,14 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 			this.updatedPackagesInSolution = updatedPackagesInSolution;

 		}

 

-		public DotNetProject Project {

+		public DotNetProject DotNetProject {

 			get { return project.DotNetProject; }

 		}

 

+		internal IDotNetProject Project {

+			get { return project; }

+		}

+

 		public IconId Icon {

 			get { return Stock.OpenReferenceFolder; }

 		}

@@ -129,6 +132,7 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 		PackageReferenceNode CreatePackageReferenceNode (PackageReference reference, UpdatedPackagesInProject updatedPackages)

 		{

 			return new PackageReferenceNode (

+				this,

 				reference,

 				IsPackageInstalled (reference),

 				false,

@@ -139,6 +143,11 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 		{

 			return reference.IsPackageInstalled (project.DotNetProject);

 		}

+

+		public void ClearPackageReferences ()

+		{

+			packageReferences = null;

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNodeBuilder.cs
index 0fd8f7242f..02f8d0d84e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesFolderNodeBuilder.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 using Gdk;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide.Gui;

 using MonoDevelop.Ide.Gui.Components;

@@ -38,7 +38,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class ProjectPackagesFolderNodeBuilder : TypeNodeBuilder

+	internal class ProjectPackagesFolderNodeBuilder : TypeNodeBuilder

 	{

 		public override Type NodeDataType {

 			get { return typeof(ProjectPackagesFolderNode); }

@@ -80,9 +80,9 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 

 			List<PackageReferenceNode> nodes = projectPackagesNode.GetPackageReferencesNodes ().ToList ();

 

-			foreach (InstallPackageAction installAction in GetPendingInstallActions (projectPackagesNode.Project)) {

+			foreach (InstallPackageAction installAction in GetPendingInstallActions (projectPackagesNode.DotNetProject)) {

 				if (!nodes.Any (node => node.Id == installAction.GetPackageId ())) {

-					nodes.Add (CreatePackageReferenceNode (installAction));

+					nodes.Add (CreatePackageReferenceNode (projectPackagesNode, installAction));

 				}

 			}

 

@@ -96,9 +96,10 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 			return PackageManagementServices.BackgroundPackageActionRunner.PendingInstallActionsForProject (project);

 		}

 

-		PackageReferenceNode CreatePackageReferenceNode (InstallPackageAction installAction)

+		PackageReferenceNode CreatePackageReferenceNode (ProjectPackagesFolderNode parentNode, InstallPackageAction installAction)

 		{

 			return new PackageReferenceNode (

+				parentNode,

 				new PackageReference (installAction.GetPackageId (), installAction.GetPackageVersion (), null, null, false),

 				false,

 				true);

@@ -106,9 +107,7 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 

 		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)

 		{

-			foreach (PackageReferenceNode packageReference in GetPackageReferencesNodes (dataObject)) {

-				treeBuilder.AddChild (packageReference);

-			}

+			treeBuilder.AddChildren (GetPackageReferencesNodes (dataObject));

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesProjectNodeBuilderExtension.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesProjectNodeBuilderExtension.cs
index aecc5d8174..b4033cbcf8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesProjectNodeBuilderExtension.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectPackagesProjectNodeBuilderExtension.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 using MonoDevelop.Ide.Gui.Components;

@@ -34,7 +34,7 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class ProjectPackagesProjectNodeBuilderExtension : NodeBuilderExtension

+	internal class ProjectPackagesProjectNodeBuilderExtension : NodeBuilderExtension

 	{

 		IPackageManagementEvents packageManagementEvents;

 

@@ -72,8 +72,8 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 

 		void RefreshAllChildNodes ()

 		{

-			DispatchService.GuiDispatch (() => {

-				foreach (DotNetProject project in IdeApp.Workspace.GetAllSolutionItems<DotNetProject> ()) {

+			Runtime.RunInMainThread (() => {

+				foreach (DotNetProject project in IdeApp.Workspace.GetAllItems<DotNetProject> ()) {

 					RefreshChildNodes (project);

 				}

 			});

@@ -83,7 +83,17 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 		{

 			ITreeBuilder builder = Context.GetTreeBuilder (project);

 			if (builder != null) {

-				builder.UpdateChildren ();

+				if (builder.MoveToChild ("References", typeof (ProjectReferenceCollection))) {

+					builder.UpdateAll ();

+					builder.MoveToParent ();

+				}

+

+				if (builder.MoveToChild ("Packages", typeof (ProjectPackagesFolderNode))) {

+					var packagesFolder = (ProjectPackagesFolderNode)builder.DataItem;

+					packagesFolder.ClearPackageReferences ();

+					builder.UpdateAll ();

+					builder.MoveToParent ();

+				}

 			}

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferenceNodeBuilderExtension.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferenceNodeBuilderExtension.cs
index 9fdee1fd20..f65d0c2902 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferenceNodeBuilderExtension.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferenceNodeBuilderExtension.cs
@@ -30,11 +30,11 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Components;

 using MonoDevelop.Ide.Gui.Pads.ProjectPad;

 using MonoDevelop.Projects;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class ProjectReferenceNodeBuilderExtension : NodeBuilderExtension

+	internal class ProjectReferenceNodeBuilderExtension : NodeBuilderExtension

 	{

 		public override bool CanBuildNode (Type dataType)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesFromPackagesFolderNode.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesFromPackagesFolderNode.cs
index 6dea1b81be..d6f4bf7270 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesFromPackagesFolderNode.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesFromPackagesFolderNode.cs
@@ -25,14 +25,14 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 using System.Collections.Generic;

 using System.Linq;

 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class ProjectReferencesFromPackagesFolderNode

+	internal class ProjectReferencesFromPackagesFolderNode

 	{

 		public ProjectReferencesFromPackagesFolderNode (

 			DotNetProject project,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesFromPackagesFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesFromPackagesFolderNodeBuilder.cs
index 0705cf9826..aa529a834d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesFromPackagesFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesFromPackagesFolderNodeBuilder.cs
@@ -33,7 +33,7 @@ using System.Linq;
 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class ProjectReferencesFromPackagesFolderNodeBuilder : TypeNodeBuilder

+	internal class ProjectReferencesFromPackagesFolderNodeBuilder : TypeNodeBuilder

 	{

 		public override Type NodeDataType {

 			get { return typeof(ProjectReferencesFromPackagesFolderNode); }

@@ -65,9 +65,7 @@ namespace MonoDevelop.PackageManagement.NodeBuilders
 

 		public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)

 		{

-			foreach (ProjectReference projectReference in GetReferencesFromPackages (dataObject)) {

-				treeBuilder.AddChild (projectReference);

-			}

+			treeBuilder.AddChildren (GetReferencesFromPackages (dataObject));

 		}

 

 		IEnumerable<ProjectReference> GetReferencesFromPackages (object dataObject)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesNodeBuilderExtension.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesNodeBuilderExtension.cs
index 0ec0d6c16e..dd36fc27b8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesNodeBuilderExtension.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.NodeBuilders/ProjectReferencesNodeBuilderExtension.cs
@@ -25,13 +25,13 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide.Gui.Components;

 using MonoDevelop.Projects;

 

 namespace MonoDevelop.PackageManagement.NodeBuilders

 {

-	public class ProjectReferencesNodeBuilderExtension : NodeBuilderExtension

+	internal class ProjectReferencesNodeBuilderExtension : NodeBuilderExtension

 	{

 		public override bool CanBuildNode (Type dataType)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/PackageCodeDiagnosticProvider.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/PackageCodeDiagnosticProvider.cs
new file mode 100644
index 0000000000..1b14140a14
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Refactoring/PackageCodeDiagnosticProvider.cs
@@ -0,0 +1,104 @@
+//
+// PackageCodeDiagnosticProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.CodeIssues;
+using MonoDevelop.PackageManagement;
+using MonoDevelop.Projects;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.PackageManagement.Refactoring
+{
+	sealed class PackageCodeDiagnosticProvider : CodeDiagnosticProvider
+	{
+		static readonly Dictionary<Project, AnalyzersFromAssembly> diagnosticCache = new Dictionary<Project, AnalyzersFromAssembly> ();
+
+		static PackageCodeDiagnosticProvider ()
+		{
+			IdeApp.Workspace.SolutionUnloaded += delegate {
+				diagnosticCache.Clear ();
+			};
+			IdeApp.Workspace.ActiveConfigurationChanged += delegate {
+				diagnosticCache.Clear ();
+			};
+		}
+
+		public async override Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetCodeFixDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var diags = await GetProjectDiagnosticsAsync (document.Project, language, cancellationToken).ConfigureAwait (false);
+			return diags.Fixes;
+		}
+
+		public async override Task<IEnumerable<CodeDiagnosticDescriptor>> GetCodeDiagnosticDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var diags = await GetProjectDiagnosticsAsync (document.Project, language, cancellationToken).ConfigureAwait (false);
+			return diags.Analyzers;
+		}
+
+		public async override Task<IEnumerable<MonoDevelop.CodeActions.CodeRefactoringDescriptor>> GetCodeRefactoringDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken)
+		{
+			var diags = await GetProjectDiagnosticsAsync (document.Project, language, cancellationToken).ConfigureAwait (false);
+			return diags.Refactorings;
+		}
+
+		static Task<AnalyzersFromAssembly> GetProjectDiagnosticsAsync (Project project, string language, CancellationToken cancellationToken)
+		{
+			if (project == null)
+				return Task.FromResult (AnalyzersFromAssembly.Empty);
+			AnalyzersFromAssembly result;
+			if (diagnosticCache.TryGetValue(project, out result)) 
+				return Task.FromResult (result);
+
+			result = new AnalyzersFromAssembly ();
+
+			var dotNetProject = project as DotNetProject;
+			if (dotNetProject != null) {
+				var proxy = new DotNetProjectProxy (dotNetProject);
+				if (proxy.HasPackages ()) {
+					var packagesPath = new SolutionPackageRepositoryPath (proxy, PackageManagementServices.Options);
+					foreach (var file in Directory.EnumerateFiles (packagesPath.PackageRepositoryPath, "*.dll", SearchOption.AllDirectories)) {
+						cancellationToken.ThrowIfCancellationRequested ();
+						try {
+							var asm = Assembly.LoadFrom (file);
+							result.AddAssembly (asm);
+						} catch (Exception) {
+						}
+					}
+				}
+			}
+			diagnosticCache[project] = result;
+			return Task.FromResult (result);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ExceptionThrowingProcessPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ExceptionThrowingProcessPackageAction.cs
index c224dfaabf..ab04f3fad3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ExceptionThrowingProcessPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ExceptionThrowingProcessPackageAction.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class ExceptionThrowingProcessPackageAction : TestableProcessPackageAction

+	class ExceptionThrowingProcessPackageAction : TestableProcessPackageAction

 	{

 		public Exception ExceptionToThrowInExecuteCore = 

 			new Exception ("Error");

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ExceptionThrowingRegisteredPackageRepositories.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ExceptionThrowingRegisteredPackageRepositories.cs
index 19bd75e12a..d67d3e878c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ExceptionThrowingRegisteredPackageRepositories.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ExceptionThrowingRegisteredPackageRepositories.cs
@@ -29,7 +29,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class ExceptionThrowingRegisteredPackageRepositories : FakeRegisteredPackageRepositories

+	class ExceptionThrowingRegisteredPackageRepositories : FakeRegisteredPackageRepositories

 	{

 		public Exception ExceptionToThrowWhenActiveRepositoryAccessed { get; set; }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeBackgroundPackageActionRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeBackgroundPackageActionRunner.cs
index 4be9a1cbb3..f8819225b3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeBackgroundPackageActionRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeBackgroundPackageActionRunner.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeBackgroundPackageActionRunner : IBackgroundPackageActionRunner

+	class FakeBackgroundPackageActionRunner : IBackgroundPackageActionRunner

 	{

 		public IEnumerable<InstallPackageAction> PendingInstallActionsForProject (DotNetProject project)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeDotNetProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeDotNetProject.cs
index 6f0aeca6d7..7bb4c0cb71 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeDotNetProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeDotNetProject.cs
@@ -30,10 +30,11 @@ using MonoDevelop.Core;
 using MonoDevelop.Core.Assemblies;

 using MonoDevelop.Projects;

 using System.Linq;

+using System.Threading.Tasks;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeDotNetProject : FakeProject, IDotNetProject

+	class FakeDotNetProject : FakeProject, IDotNetProject

 	{

 		public FakeDotNetProject ()

 		{

@@ -81,10 +82,10 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 

 		public Action SaveAction = () => { };

 

-		public override void Save ()

+		public override async Task SaveAsync ()

 		{

 			SaveAction ();

-			base.Save ();

+			await base.SaveAsync ();

 			ReferencesWhenSavedCount = References.Count;

 			FilesAddedWhenSavedCount = FilesAdded.Count;

 			FilesInProjectWhenSavedCount = Files.Count;

@@ -104,11 +105,9 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			return buildAction;

 		}

 

-		public List<ImportAndCondition> ImportsAdded = new List<ImportAndCondition> ();

-

 		public void AddImportIfMissing (string name, string condition)

 		{

-			ImportsAdded.Add (new ImportAndCondition (name, condition));

+			throw new ApplicationException ("Obsolete should not be called.");

 		}

 

 		public List<string> ImportsRemoved = new List <string> ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeFileService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeFileService.cs
index de138df6cf..8b8d0f3fdd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeFileService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeFileService.cs
@@ -28,11 +28,11 @@ using System;
 using System.Collections.Generic;

 using System.IO;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeFileService : IPackageManagementFileService

+	class FakeFileService : IPackageManagementFileService

 	{

 		public string PathPassedToRemoveFile;

 		public string PathPassedToRemoveDirectory;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeInstallPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeInstallPackageAction.cs
index e353410e14..792eff1f63 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeInstallPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeInstallPackageAction.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeInstallPackageAction : InstallPackageAction

+	class FakeInstallPackageAction : InstallPackageAction

 	{

 		public FakeInstallPackageAction ()

 			: this (null)

@@ -44,8 +44,19 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		}

 

 		public FakeInstallPackageAction (IPackageManagementProject project, IPackageManagementEvents packageManagementEvents)

-			: base (project, packageManagementEvents)

+			: this (project, packageManagementEvents, new FakeFileRemover (), new FakeLicenseAcceptanceService ())

 		{

+		}

+

+		public FakeInstallPackageAction (

+			IPackageManagementProject project,

+			IPackageManagementEvents packageManagementEvents,

+			FakeFileRemover fileRemover,

+			FakeLicenseAcceptanceService licenseAcceptanceService)

+			: base (project, packageManagementEvents, fileRemover, licenseAcceptanceService)

+		{

+			FileRemover = fileRemover;

+			LicenseAcceptanceService = licenseAcceptanceService;

 			Operations = new List<PackageOperation> ();

 			Logger = new FakeLogger ();

 		}

@@ -63,6 +74,9 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		}

 

 		public Action ExecuteAction = () => { };

+

+		public FakeFileRemover FileRemover;

+		public FakeLicenseAcceptanceService LicenseAcceptanceService;

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeLicenseAcceptanceService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeLicenseAcceptanceService.cs
new file mode 100644
index 0000000000..1ae0c6c837
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeLicenseAcceptanceService.cs
@@ -0,0 +1,45 @@
+//
+// FakeLicenseAcceptanceService.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Linq;
+using System.Collections.Generic;
+using NuGet;
+
+namespace MonoDevelop.PackageManagement.Tests.Helpers
+{
+	public class FakeLicenseAcceptanceService : ILicenseAcceptanceService
+	{
+		public bool AcceptLicensesReturnValue = true;
+		public List<IPackage> PackagesAccepted;
+
+		public bool AcceptLicenses (IEnumerable<IPackage> packages)
+		{
+			PackagesAccepted = packages.ToList ();
+			return AcceptLicensesReturnValue;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeMachineCache.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeMachineCache.cs
index 04a52331d6..a96a575670 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeMachineCache.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeMachineCache.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetPackageNewImportsHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetPackageNewImportsHandler.cs
new file mode 100644
index 0000000000..ac2a71ea6a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeNuGetPackageNewImportsHandler.cs
@@ -0,0 +1,48 @@
+//
+// FakeNuGetPackageNewImportsHandler.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using NuGet;
+
+namespace MonoDevelop.PackageManagement.Tests.Helpers
+{
+	public class FakeNuGetPackageNewImportsHandler : INuGetPackageNewImportsHandler
+	{
+		public bool IsDisposed;
+		public List<ImportAndCondition> ImportsAdded = new List<ImportAndCondition> ();
+
+		public void AddImportIfMissing (string name, string condition, ProjectImportLocation location)
+		{
+			ImportsAdded.Add (new ImportAndCondition (name, condition, location));
+		}
+
+		public void Dispose ()
+		{
+			IsDisposed = true;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackage.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackage.cs
index 7ebab31800..b621fe6bd4 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackage.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackage.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;

 using System.IO;

 using System.Runtime.Versioning;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProject.cs
index b4e225fdcf..eb9318b244 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProject.cs
@@ -28,13 +28,13 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 using System.Runtime.Versioning;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageManagementProject : IPackageManagementProject

+	class FakePackageManagementProject : IPackageManagementProject

 	{

 		public FakePackageManagementProject ()

 			: this ("Test")

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProjectFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProjectFactory.cs
index 95d3e04eb0..4fb30c6769 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProjectFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProjectFactory.cs
@@ -26,13 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

 using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageManagementProjectFactory : IPackageManagementProjectFactory

+	class FakePackageManagementProjectFactory : IPackageManagementProjectFactory

 	{

 		public FakePackageManagementProjectFactory ()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProjectService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProjectService.cs
index e473bdf56c..3832caaf4e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProjectService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementProjectService.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageManagementProjectService : IPackageManagementProjectService

+	class FakePackageManagementProjectService : IPackageManagementProjectService

 	{

 		public IProject CurrentProject { get; set; }

 		public ISolution OpenSolution { get; set; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementSolution.cs
index adfddb3d8e..f2495b0445 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementSolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagementSolution.cs
@@ -27,13 +27,13 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using MonoDevelop.Projects;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageManagementSolution : IPackageManagementSolution

+	class FakePackageManagementSolution : IPackageManagementSolution

 	{

 		public void AddPackageToActiveProjectLocalRepository (FakePackage package)

 		{

@@ -218,6 +218,11 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		{

 			SolutionPackageRepository.AddPackageReference (packageId, packageVersion);

 		}

+

+		public IPackageManagementProject GetProject (IDotNetProject project)

+		{

+			return FakeActiveProject;

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManager.cs
index a6a3c7787c..21f358b016 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManager.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManager.cs
@@ -27,12 +27,11 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageManager : ISharpDevelopPackageManager

+	class FakePackageManager : IMonoDevelopPackageManager

 	{

 		public FakeProjectManager FakeProjectManager = new FakeProjectManager ();

 		public FakePackageManagementProjectService FakeProjectService = new FakePackageManagementProjectService ();

@@ -65,7 +64,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 

 		public IPackageRepository SourceRepository { get; set; }

 

-		public ISharpDevelopProjectManager ProjectManager { get; set; }

+		public IMonoDevelopProjectManager ProjectManager { get; set; }

 

 		public FakePackageRepository FakeSourceRepository = new FakePackageRepository ();

 

@@ -257,5 +256,9 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		public void AddPackageReference (IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)

 		{

 		}

+

+		public void InstallPackageIntoSolutionRepository (IPackage package)

+		{

+		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagerFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagerFactory.cs
index e66d160c69..a9e07fa479 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagerFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageManagerFactory.cs
@@ -26,19 +26,19 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageManagerFactory : IPackageManagerFactory

+	class FakePackageManagerFactory : IPackageManagerFactory

 	{

 		public FakePackageManager FakePackageManager = new FakePackageManager ();

 		public IPackageRepository PackageRepositoryPassedToCreatePackageManager;

 		public IDotNetProject ProjectPassedToCreateRepository;

 		public ISolutionPackageRepository SolutionPackageRepositoryPassedToCreatePackageManager;

 

-		public ISharpDevelopPackageManager CreatePackageManager (IPackageRepository sourceRepository, IDotNetProject project)

+		public IMonoDevelopPackageManager CreatePackageManager (IPackageRepository sourceRepository, IDotNetProject project)

 		{

 			PackageRepositoryPassedToCreatePackageManager = sourceRepository;

 			ProjectPassedToCreateRepository = project;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageOperationResolverFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageOperationResolverFactory.cs
index 5c66ad1845..7677db192f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageOperationResolverFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageOperationResolverFactory.cs
@@ -25,12 +25,12 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageOperationResolverFactory : IPackageOperationResolverFactory

+	class FakePackageOperationResolverFactory : IPackageOperationResolverFactory

 	{

 		public FakePackageOperationResolver FakeInstallPackageOperationResolver = new FakePackageOperationResolver ();

 		public IPackageRepository LocalRepositoryPassedToCreateInstallPackageOperationsResolver;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepository.cs
index 93dea0d78d..2bd4b437bd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepository.cs
@@ -27,12 +27,12 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageRepository : IRecentPackageRepository, IProgressProvider

+	public class FakePackageRepository : IRecentPackageRepository, IProgressProvider, ICloneableRepository

 	{

 		public List<FakePackage> FakePackages = new List<FakePackage> ();

 		public bool IsRemovePackageCalled;

@@ -91,6 +91,20 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 				ProgressAvailable (this, e);

 			}

 		}

+

+		public FakePackageRepository ClonedRepository;

+

+		public bool IsCloneOf (FakePackageRepository packageRepository)

+		{

+			return ClonedRepository == packageRepository;

+		}

+

+		public IPackageRepository Clone ()

+		{

+			return new FakePackageRepository () {

+				ClonedRepository = this

+			};

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepositoryFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepositoryFactory.cs
index cf406c1fd5..ab21fc5b7e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepositoryFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepositoryFactory.cs
@@ -26,13 +26,13 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageRepositoryFactory : IPackageRepositoryCache

+	class FakePackageRepositoryFactory : IPackageRepositoryCache

 	{

 		public List<string> PackageSourcesPassedToCreateRepository

 			= new List<string> ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepositoryFactoryEvents.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepositoryFactoryEvents.cs
index 867e7c83de..ecf70fad17 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepositoryFactoryEvents.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageRepositoryFactoryEvents.cs
@@ -25,11 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests

 {

-	public class FakePackageRepositoryFactoryEvents : IPackageRepositoryFactoryEvents

+	class FakePackageRepositoryFactoryEvents : IPackageRepositoryFactoryEvents

 	{

 		public event EventHandler<PackageRepositoryFactoryEventArgs> RepositoryCreated;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageViewModelFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageViewModelFactory.cs
index 52b88e9c19..e7866e947b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageViewModelFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakePackageViewModelFactory.cs
@@ -25,12 +25,12 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakePackageViewModelFactory : IPackageViewModelFactory

+	class FakePackageViewModelFactory : IPackageViewModelFactory

 	{

 		public FakePackageManagementSolution FakeSolution = new FakePackageManagementSolution ();

 		PackageManagementEvents packageManagementEvents = new PackageManagementEvents ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProcess.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProcess.cs
index 376be932ab..c922d58210 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProcess.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProcess.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProgressMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProgressMonitor.cs
index a06a2dc3df..3f00df6491 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProgressMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProgressMonitor.cs
@@ -29,14 +29,15 @@ using System.IO;
 using System.Text;

 using MonoDevelop.Core;

 using NUnit.Framework;

+using System.Threading;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeProgressMonitor : IProgressMonitor

+	public class FakeProgressMonitor : ProgressMonitor

 	{

 		public event MonitorHandler CancelRequested;

 

-		protected virtual void OnCancelRequested (IProgressMonitor monitor)

+		protected virtual void OnCancelRequested (ProgressMonitor monitor)

 		{

 			var handler = CancelRequested;

 			if (handler != null)

@@ -48,7 +49,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			Log = new StringWriter (LoggedMessages);

 		}

 

-		public void BeginTask (string name, int totalWork)

+		protected override void OnBeginTask (string name, int totalWork, int stepWork)

 		{

 			BeginTaskTotalWork = totalWork;

 		}

@@ -59,14 +60,14 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		{

 		}

 

-		public void EndTask ()

+		protected override void OnEndTask (string name, int totalWork, int stepWork)

 		{

 			IsTaskEnded = true;

 		}

 

 		public bool IsTaskEnded;

 

-		public void Step (int work)

+		protected override void OnStep (string message, int work)

 		{

 			StepCalledCount++;

 			TotalStepWork += work;

@@ -75,21 +76,21 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		public int StepCalledCount;

 		public int TotalStepWork;

 

-		public void ReportWarning (string message)

+		protected override void OnWarningReported (string message)

 		{

 			ReportedWarningMessage = message;

 		}

 

 		public string ReportedWarningMessage;

 

-		public void ReportSuccess (string message)

+		protected override void OnSuccessReported (string message)

 		{

 			ReportedSuccessMessage = message;

 		}

 

 		public string ReportedSuccessMessage;

 

-		public void ReportError (string message, Exception exception)

+		protected override void OnErrorReported (string message, Exception exception)

 		{

 			ReportedErrorMessage = message;

 		}

@@ -110,13 +111,13 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			Assert.IsFalse (log.Contains (message), log);

 		}

 

-		public TextWriter Log { get; set; }

 		public bool IsCancelRequested { get; set; }

-		public IAsyncOperation AsyncOperation { get; set; }

+		public AsyncOperation AsyncOperation { get; set; }

 		public object SyncRoot { get; set; }

 

-		public void Dispose ()

+		public override void Dispose ()

 		{

+			base.Dispose ();

 			IsDisposed = true;

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProgressMonitorFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProgressMonitorFactory.cs
index 90e62b3268..f7b28eb358 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProgressMonitorFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProgressMonitorFactory.cs
@@ -34,7 +34,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		public FakeProgressMonitor ProgressMonitor = new FakeProgressMonitor ();

 		public string StatusText;

 

-		public IProgressMonitor CreateProgressMonitor (string statusText)

+		public ProgressMonitor CreateProgressMonitor (string statusText)

 		{

 			StatusText = statusText;

 			return ProgressMonitor;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProject.cs
index 18971e4641..6debd6da0c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProject.cs
@@ -27,10 +27,12 @@
 using System;

 using System.Collections;

 using MonoDevelop.Core;

+using System.Collections.Generic;

+using System.Threading.Tasks;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeProject : IProject

+	class FakeProject : IProject

 	{

 		public string Name { get; set; }

 		public FilePath FileName { get; set; }

@@ -57,9 +59,14 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 

 		public bool IsSaved;

 

-		public virtual void Save ()

+		public virtual Task SaveAsync ()

 		{

 			IsSaved = true;

+			return Task.FromResult (0);

+		}

+

+		public IEnumerable<string> FlavorGuids {

+			get { yield break; }

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProjectManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProjectManager.cs
index 9cbbe9b1cc..f279c7c4e6 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProjectManager.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProjectManager.cs
@@ -25,13 +25,13 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using System.Collections.Generic;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeProjectManager : ISharpDevelopProjectManager

+	public class FakeProjectManager : IMonoDevelopProjectManager

 	{

 		public FakePackageRepository FakeLocalRepository {

 			get { return LocalRepository as FakePackageRepository; }

@@ -55,8 +55,13 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 

 		protected virtual void OnPackageReferenceAdded (IPackage package)

 		{

+			OnPackageReferenceAdded (new PackageOperationEventArgs (package, null, String.Empty));

+		}

+

+		protected virtual void OnPackageReferenceAdded (PackageOperationEventArgs eventArgs)

+		{

 			if (PackageReferenceAdded != null) {

-				PackageReferenceAdded (this, new PackageOperationEventArgs (package, null, String.Empty));

+				PackageReferenceAdded (this, eventArgs);

 			}

 		}

 

@@ -115,6 +120,11 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			OnPackageReferenceAdded (package);

 		}

 

+		public void FirePackageReferenceAdded (PackageOperationEventArgs eventArgs)

+		{

+			OnPackageReferenceAdded (eventArgs);

+		}

+

 		public void FirePackageReferenceRemoved (IPackage package)

 		{

 			FirePackageReferenceRemoved (new PackageOperationEventArgs (package, null, String.Empty));

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProjectSystemFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProjectSystemFactory.cs
index fc88fcd103..5cca970fb0 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProjectSystemFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeProjectSystemFactory.cs
@@ -25,13 +25,13 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeProjectSystemFactory : ISharpDevelopProjectSystemFactory

+	public class FakeProjectSystemFactory : IMonoDevelopProjectSystemFactory

 	{

 		public FakeProjectSystem FakeProjectSystem = new FakeProjectSystem ();

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeRecentPackageRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeRecentPackageRepository.cs
index b9ba5142c3..fe607f739d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeRecentPackageRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeRecentPackageRepository.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeRegisteredPackageRepositories.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeRegisteredPackageRepositories.cs
index 77b047d9b5..c7ac9bef61 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeRegisteredPackageRepositories.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeRegisteredPackageRepositories.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeRegisteredPackageRepositories : IRegisteredPackageRepositories

+	class FakeRegisteredPackageRepositories : IRegisteredPackageRepositories

 	{

 		public FakeRegisteredPackageRepositories ()

 		{

@@ -96,7 +96,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 

 		public PackageSource AddOnePackageSource (string name)

 		{

-			var source = new PackageSource ("http://sharpdevelop.codeplex.com", name);

+			var source = new PackageSource ("http://monodevelop.codeplex.com", name);

 			PackageSources.Add (source);

 			return source;

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSettings.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSettings.cs
index 24b3593320..0ea24e7221 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSettings.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSettings.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using System.Linq;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolution.cs
index ff5cc14ba2..38b766b63f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolution.cs
@@ -31,7 +31,7 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeSolution : ISolution

+	class FakeSolution : ISolution

 	{

 		public FilePath BaseDirectory { get; set; }

 		public FilePath FileName { get; set; }

@@ -65,6 +65,15 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 				ProjectAdded (this, new DotNetProjectEventArgs (project));

 			}

 		}

+

+		public event EventHandler<DotNetProjectEventArgs> ProjectRemoved;

+

+		public void RaiseProjectRemovedEvent (IDotNetProject project)

+		{

+			if (ProjectRemoved != null) {

+				ProjectRemoved (this, new DotNetProjectEventArgs (project));

+			}

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolutionPackageRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolutionPackageRepository.cs
index f7a3ec399a..2671eb0fff 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolutionPackageRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolutionPackageRepository.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolutionPackageRepositoryFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolutionPackageRepositoryFactory.cs
index 4cc0386417..cedda70399 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolutionPackageRepositoryFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeSolutionPackageRepositoryFactory.cs
@@ -25,11 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeSolutionPackageRepositoryFactory : ISolutionPackageRepositoryFactory

+	class FakeSolutionPackageRepositoryFactory : ISolutionPackageRepositoryFactory

 	{

 		public FakeSolutionPackageRepository FakeSolutionPackageRepository = new FakeSolutionPackageRepository ();

 		public ISolution SolutionPassedToCreateSolutionPackageRepository;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeTask.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeTask.cs
index 0743a8ba33..f22870d226 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeTask.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeTask.cs
@@ -25,11 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeTask<TResult> : ITask<TResult>

+	class FakeTask<TResult> : ITask<TResult>

 	{

 		public bool IsStartCalled;

 		public bool IsCancelCalled;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeTaskFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeTaskFactory.cs
index 70e5a37e08..4f6fcfa20e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeTaskFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeTaskFactory.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeTaskFactory : ITaskFactory

+	class FakeTaskFactory : ITaskFactory

 	{

 		public bool IsCreateTaskCalled;

 		public bool RunTasksSynchronously;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUninstallPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUninstallPackageAction.cs
index 2e8bdfe0b1..1e5777b56b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUninstallPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUninstallPackageAction.cs
@@ -25,11 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeUninstallPackageAction : UninstallPackageAction

+	class FakeUninstallPackageAction : UninstallPackageAction

 	{

 		public bool IsExecuted;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUpdatePackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUpdatePackageAction.cs
index 069cc62210..5da205d6dd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUpdatePackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUpdatePackageAction.cs
@@ -25,15 +25,17 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeUpdatePackageAction : UpdatePackageAction

+	class FakeUpdatePackageAction : UpdatePackageAction

 	{

 		public bool IsExecuted;

 

 		public FakePackageManagementProject FakeProject;

+		public FakeFileRemover FileRemover;

+		public FakeLicenseAcceptanceService LicenseAcceptanceService;

 

 		public FakeUpdatePackageAction ()

 			: this (new FakePackageManagementProject ())

@@ -41,11 +43,23 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		}

 

 		public FakeUpdatePackageAction (IPackageManagementProject project)

-			: base (project, null)

+			: this (project, null, new FakeFileRemover (), new FakeLicenseAcceptanceService ())

 		{

 			FakeProject = project as FakePackageManagementProject;

 		}

 

+		public FakeUpdatePackageAction (

+			IPackageManagementProject project,

+			IPackageManagementEvents packageManagementEvents,

+			FakeFileRemover fileRemover,

+			FakeLicenseAcceptanceService licenseAcceptanceService)

+			: base (project, packageManagementEvents, fileRemover, licenseAcceptanceService)

+		{

+			FakeProject = project as FakePackageManagementProject;

+			FileRemover = fileRemover;

+			LicenseAcceptanceService = licenseAcceptanceService;

+		}

+

 		protected override void ExecuteCore ()

 		{

 			IsExecuted = true;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUpdatedPackagesInSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUpdatedPackagesInSolution.cs
index bc0bfa4791..2f940c8df0 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUpdatedPackagesInSolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/FakeUpdatedPackagesInSolution.cs
@@ -31,7 +31,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class FakeUpdatedPackagesInSolution : IUpdatedPackagesInSolution

+	class FakeUpdatedPackagesInSolution : IUpdatedPackagesInSolution

 	{

 		public List<UpdatedPackagesInProject> ProjectsWithUpdatedPackages = new List<UpdatedPackagesInProject> ();

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ImportAndCondition.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ImportAndCondition.cs
index 33b99da2fb..c073ef5e2e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ImportAndCondition.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/ImportAndCondition.cs
@@ -1,43 +1,50 @@
-//

-// ImportAndCondition.cs

-//

-// Author:

-//       Matt Ward <matt.ward@xamarin.com>

-//

-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

-using System;

+//
+// ImportAndCondition.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 

+using NuGet;
+
 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

 	public class ImportAndCondition

-	{

-		public ImportAndCondition (string name, string condition)

+	{
+		public ImportAndCondition (string name, string condition)
+			: this (name, condition, ProjectImportLocation.Bottom)
+		{
+		}
+

+		public ImportAndCondition (string name, string condition, ProjectImportLocation location)

 		{

 			Name = name;

-			Condition = condition;

+			Condition = condition;
+			Location = location;

 		}

 

 		public string Name { get; set; }

-		public string Condition { get; set; }

+		public string Condition { get; set; }
+		public ProjectImportLocation Location { get; set; }

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/InstallPackageHelper.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/InstallPackageHelper.cs
index 303cc48702..5b19ebb45f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/InstallPackageHelper.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/InstallPackageHelper.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class InstallPackageHelper

+	class InstallPackageHelper

 	{

 		InstallPackageAction action;

 

@@ -64,7 +64,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			return package;

 		}

 

-		public PackageSource PackageSource = new PackageSource ("http://sharpdevelop/packages");

+		public PackageSource PackageSource = new PackageSource ("http://monodevelop/packages");

 		public bool IgnoreDependencies;

 		public bool AllowPrereleaseVersions;

 		public SemanticVersion Version;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/OneRegisteredPackageSourceHelper.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/OneRegisteredPackageSourceHelper.cs
index 1f48502c50..0dc030e9a1 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/OneRegisteredPackageSourceHelper.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/OneRegisteredPackageSourceHelper.cs
@@ -25,16 +25,16 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class OneRegisteredPackageSourceHelper

+	class OneRegisteredPackageSourceHelper

 	{

 		public TestablePackageManagementOptions Options;

 		public FakeSettings FakeSettings;

-		public PackageSource PackageSource = new PackageSource ("http://sharpdevelop.com", "Test Package Source");

+		public PackageSource PackageSource = new PackageSource ("http://monodevelop.com", "Test Package Source");

 

 		public RegisteredPackageSources RegisteredPackageSources {

 			get { return Options.PackageSources; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PackageCollectionAssert.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PackageCollectionAssert.cs
index 7b2e29d67c..4462399efa 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PackageCollectionAssert.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PackageCollectionAssert.cs
@@ -26,13 +26,13 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public static class PackageCollectionAssert

+	static class PackageCollectionAssert

 	{

 		public static void AreEqual (IEnumerable<IPackage> expectedPackages, IEnumerable<PackageViewModel> actualViewModels)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PackageSourceCollectionAssert.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PackageSourceCollectionAssert.cs
index 8d4d19074b..9c0a1389ab 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PackageSourceCollectionAssert.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PackageSourceCollectionAssert.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class PackageSourceCollectionAssert

+	class PackageSourceCollectionAssert

 	{

 		public static void AreEqual (IEnumerable<PackageSource> expectedSources, IEnumerable<PackageSourceViewModel> actualViewModels)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PageCollectionAssert.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PageCollectionAssert.cs
index a09c580545..cd87754a84 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PageCollectionAssert.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/PageCollectionAssert.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NUnit.Framework;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public static class PageCollectionAssert

+	static class PageCollectionAssert

 	{

 		public static void AreEqual (IEnumerable<Page> expectedPages, IEnumerable<Page> actualPages)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/RecentPackageInfoCollectionAssert.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/RecentPackageInfoCollectionAssert.cs
index 970b49e684..a005c9fabe 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/RecentPackageInfoCollectionAssert.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/RecentPackageInfoCollectionAssert.cs
@@ -26,11 +26,11 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public static class RecentPackageInfoCollectionAssert

+	static class RecentPackageInfoCollectionAssert

 	{

 		public static void AreEqual (IEnumerable<RecentPackageInfo> expectedPackages, IEnumerable<RecentPackageInfo> actualPackages)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/SelectedProjectCollectionAssert.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/SelectedProjectCollectionAssert.cs
index aa8cb49aac..166509a9e2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/SelectedProjectCollectionAssert.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/SelectedProjectCollectionAssert.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NUnit.Framework;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public static class SelectedProjectCollectionAssert

+	static class SelectedProjectCollectionAssert

 	{

 		public static void AreEqual (

 			IEnumerable<IPackageManagementSelectedProject> expected,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableBackgroundPackageActionRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableBackgroundPackageActionRunner.cs
index 0bcbdb5ac4..702d9d07e9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableBackgroundPackageActionRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableBackgroundPackageActionRunner.cs
@@ -26,16 +26,16 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableBackgroundPackageActionRunner : BackgroundPackageActionRunner

+	class TestableBackgroundPackageActionRunner : BackgroundPackageActionRunner

 	{

-		public List<MessageHandler> BackgroundDispatchersQueued = new List<MessageHandler> ();

+		public List<Action> BackgroundActionsQueued = new List<Action> ();

 

 		public TestableBackgroundPackageActionRunner (

 			IPackageManagementProgressMonitorFactory progressMonitorFactory,

@@ -56,46 +56,35 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 

 		public void ExecuteSingleBackgroundDispatch ()

 		{

-			BackgroundDispatchersQueued [0].Invoke ();

-			BackgroundDispatchersQueued.RemoveAt (0);

+			BackgroundActionsQueued [0].Invoke ();

+			BackgroundActionsQueued.RemoveAt (0);

 		}

 

 		public void ExecuteBackgroundDispatch ()

 		{

-			foreach (MessageHandler dispatcher in BackgroundDispatchersQueued) {

-				dispatcher.Invoke ();

+			foreach (Action action in BackgroundActionsQueued) {

+				action ();

 			}

-			BackgroundDispatchersQueued.Clear ();

+			BackgroundActionsQueued.Clear ();

 		}

 

-		protected override void BackgroundDispatch (MessageHandler handler)

+		protected override void BackgroundDispatch (Action action)

 		{

-			BackgroundDispatchersQueued.Add (handler);

+			BackgroundActionsQueued.Add (action);

 		}

 

-		public bool InvokeBackgroundDispatchAndWaitImmediately = true;

-

-		protected override void BackgroundDispatchAndWait (MessageHandler handler)

-		{

-			if (InvokeBackgroundDispatchAndWaitImmediately) {

-				handler.Invoke ();

-			} else {

-				BackgroundDispatchersQueued.Add (handler);

-			}

-		}

-

-		protected override void GuiDispatch (MessageHandler handler)

+		protected override void GuiDispatch (Action action)

 		{

-			handler.Invoke ();

+			action ();

 		}

 

-		public Func<IProgressMonitor,

+		public Func<ProgressMonitor,

 			IPackageManagementEvents,

 			IProgressProvider,

 			PackageManagementEventsMonitor> CreateEventMonitorAction;

 

 		protected override PackageManagementEventsMonitor CreateEventMonitor (

-			IProgressMonitor monitor,

+			ProgressMonitor monitor,

 			IPackageManagementEvents packageManagementEvents,

 			IProgressProvider progressProvider)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableCheckForUpdatesTaskRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableCheckForUpdatesTaskRunner.cs
index 6744012901..7493238378 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableCheckForUpdatesTaskRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableCheckForUpdatesTaskRunner.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableCheckForUpdatesTaskRunner : CheckForUpdatesTaskRunner

+	class TestableCheckForUpdatesTaskRunner : CheckForUpdatesTaskRunner

 	{

 		public List<string> LoggedErrorMessages = new List<string> ();

 		public List<Exception> LoggedExceptions = new List<Exception> ();

@@ -41,11 +41,6 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		{

 		}

 

-		protected override void GuiBackgroundDispatch (MessageHandler handler)

-		{

-			handler.Invoke ();

-		}

-

 		protected override void LogError (string message, Exception ex)

 		{

 			LoggedErrorMessages.Add (message);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableInstallPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableInstallPackageAction.cs
index 31cc20bd58..0185597a5b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableInstallPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableInstallPackageAction.cs
@@ -25,18 +25,29 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableInstallPackageAction : InstallPackageAction

+	class TestableInstallPackageAction : InstallPackageAction

 	{

 		public TestableInstallPackageAction (

 			IPackageManagementProject project,

 			IPackageManagementEvents packageManagementEvents,

 			FakeFileRemover fileRemover)

-			: base (project, packageManagementEvents, fileRemover)

+			: this (project, packageManagementEvents, fileRemover, new FakeLicenseAcceptanceService ())

 		{

+		}

+

+		public TestableInstallPackageAction (

+			IPackageManagementProject project,

+			IPackageManagementEvents packageManagementEvents,

+			FakeFileRemover fileRemover,

+			FakeLicenseAcceptanceService licenseAcceptanceService)

+			: base (project, packageManagementEvents, fileRemover, licenseAcceptanceService)

+		{

+			LicenseAcceptanceService = licenseAcceptanceService;

+

 			CreateOpenPackageReadMeMonitorAction = packageId => {

 				IOpenPackageReadMeMonitor monitor = base.CreateOpenPackageReadMeMonitor (packageId);

 				OpenPackageReadMeMonitor = monitor as OpenPackageReadMeMonitor;

@@ -54,6 +65,8 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		}

 

 		public bool NullOpenPackageReadMeMonitorIsCreated;

+

+		public FakeLicenseAcceptanceService LicenseAcceptanceService;

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableMonoDevelopProjectSystem.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableMonoDevelopProjectSystem.cs
index 708e46f146..145b665048 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableMonoDevelopProjectSystem.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableMonoDevelopProjectSystem.cs
@@ -26,12 +26,13 @@
 

 using System;

 using System.IO;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

+using System.Threading.Tasks;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableMonoDevelopProjectSystem : SharpDevelopProjectSystem

+	class TestableMonoDevelopProjectSystem : MonoDevelopProjectSystem

 	{

 		public string PathPassedToPhysicalFileSystemAddFile;

 		public Stream StreamPassedToPhysicalFileSystemAddFile;

@@ -46,8 +47,10 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		public ReferenceAndProjectName ReferenceAndProjectNamePassedToLogAddedReferenceToProject;

 		public ReferenceAndProjectName ReferenceAndProjectNamePassedToLogRemovedReferenceFromProject;

 		public FileNameAndProjectName FileNameAndProjectNamePassedToLogAddedFileToProject;

+		public FakeNuGetPackageNewImportsHandler NewImportsHandler;

 

-		public static Action<MessageHandler> GuiSyncDispatcher = handler => handler.Invoke ();

+		public static Action<Action> GuiSyncDispatcher = handler => handler.Invoke ();

+		public static Func<Func<Task>,Task> GuiSyncDispatcherFunc = handler => handler.Invoke();

 

 		public TestableMonoDevelopProjectSystem (IDotNetProject project)

 			: this (

@@ -65,7 +68,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			IPackageManagementProjectService projectService,

 			PackageManagementEvents packageManagementEvents,

 			FakeLogger logger)

-			: base (project, fileService, projectService, packageManagementEvents, GuiSyncDispatcher)

+			: base (project, fileService, projectService, packageManagementEvents, GuiSyncDispatcher, GuiSyncDispatcherFunc)

 		{

 			FakeFileService = (FakeFileService)fileService;

 			FakeProjectService = (FakePackageManagementProjectService)projectService;

@@ -117,6 +120,12 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			FileNameAndProjectNamePassedToLogAddedFileToProject =

 				new FileNameAndProjectName (fileName, projectName);

 		}

+

+		protected override INuGetPackageNewImportsHandler CreateNewImportsHandler ()

+		{

+			NewImportsHandler = new FakeNuGetPackageNewImportsHandler ();

+			return NewImportsHandler;

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityChecker.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityChecker.cs
index e675032f49..877dbe3a14 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityChecker.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityChecker.cs
@@ -25,13 +25,13 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using MonoDevelop.Ide;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestablePackageCompatibilityChecker : PackageCompatibilityChecker

+	class TestablePackageCompatibilityChecker : PackageCompatibilityChecker

 	{

 		public TestablePackageCompatibilityChecker (

 			IPackageManagementSolution solution,

@@ -47,7 +47,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			return PackageReferenceFile;

 		}

 

-		protected override void GuiDispatch (MessageHandler handler)

+		protected override void GuiDispatch (Action handler)

 		{

 			handler.Invoke ();

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityRunner.cs
index 2ebee582a5..ebfa45b83f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageCompatibilityRunner.cs
@@ -25,16 +25,16 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestablePackageCompatibilityRunner : PackageCompatibilityRunner

+	class TestablePackageCompatibilityRunner : PackageCompatibilityRunner

 	{

-		MessageHandler backgroundDispatcher;

+		Action backgroundDispatcher;

 

 		public TestablePackageCompatibilityRunner (

 			IDotNetProject project,

@@ -59,13 +59,13 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			backgroundDispatcher.Invoke ();

 		}

 

-		protected override void BackgroundDispatch (MessageHandler handler)

+		protected override void BackgroundDispatch (Action action)

 		{

-			backgroundDispatcher = handler;

+			backgroundDispatcher = action;

 		}

 

 		protected override PackageManagementEventsMonitor CreateEventMonitor (

-			IProgressMonitor monitor,

+			ProgressMonitor monitor,

 			IPackageManagementEvents packageManagementEvents,

 			IProgressProvider progressProvider)

 		{

@@ -97,7 +97,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 

 		public bool PackageConsoleIsShown;

 

-		protected override void ShowPackageConsole (IProgressMonitor progressMonitor)

+		protected override void ShowPackageConsole (ProgressMonitor progressMonitor)

 		{

 			PackageConsoleIsShown = true;

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageFromRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageFromRepository.cs
index ec2d653666..1af31686a7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageFromRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageFromRepository.cs
@@ -25,11 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestablePackageFromRepository : PackageFromRepository

+	class TestablePackageFromRepository : PackageFromRepository

 	{

 		public FakePackage FakePackagePassedToConstructor;

 		public FakePackageRepository FakePackageRepositoryPassedToConstructor;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementEventsMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementEventsMonitor.cs
index 0c114f4535..e108b80d57 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementEventsMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementEventsMonitor.cs
@@ -26,17 +26,17 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 using MonoDevelop.Core;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestablePackageManagementEventsMonitor : PackageManagementEventsMonitor

+	class TestablePackageManagementEventsMonitor : PackageManagementEventsMonitor

 	{

 		public TestablePackageManagementEventsMonitor (

-			IProgressMonitor progressMonitor,

+			ProgressMonitor progressMonitor,

 			IPackageManagementEvents packageManagementEvents,

 			IProgressProvider progressProvider)

 			: base (progressMonitor, packageManagementEvents, progressProvider)

@@ -50,19 +50,19 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			FilesChanged.AddRange (files);

 		}

 

-		protected override void GuiSyncDispatch (MessageHandler handler)

+		protected override void GuiSyncDispatch (Action action)

 		{

-			handler.Invoke ();

+			action.Invoke ();

 		}

 

-		protected override void ShowPackageConsole (IProgressMonitor progressMonitor)

+		protected override void ShowPackageConsole (ProgressMonitor progressMonitor)

 		{

 			IsPackageConsoleShown = true;

 			ProgressMonitorPassedToShowPackageConsole = progressMonitor;

 		}

 

 		public bool IsPackageConsoleShown;

-		public IProgressMonitor ProgressMonitorPassedToShowPackageConsole;

+		public ProgressMonitor ProgressMonitorPassedToShowPackageConsole;

 

 		protected override void ReconnectAssemblyReferences (IPackageManagementProject project)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementOptions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementOptions.cs
index 365d634fc9..826a775458 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementOptions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageManagementOptions.cs
@@ -25,12 +25,12 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestablePackageManagementOptions : PackageManagementOptions

+	class TestablePackageManagementOptions : PackageManagementOptions

 	{

 		public Properties Properties;

 		public FakeSettings FakeSettings;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageViewModel.cs
index 94d0a57325..283815f95d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackageViewModel.cs
@@ -1,10 +1,10 @@
 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestablePackageViewModel : PackageViewModel

+	class TestablePackageViewModel : PackageViewModel

 	{

 		public FakePackageManagementSolution FakeSolution;

 		public PackageManagementEvents PackageManagementEvents;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackagesViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackagesViewModel.cs
index fb05a1aa84..0d3b9259df 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackagesViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestablePackagesViewModel.cs
@@ -28,12 +28,12 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestablePackagesViewModel : PackagesViewModel

+	class TestablePackagesViewModel : PackagesViewModel

 	{

 		public FakeRegisteredPackageRepositories FakeRegisteredPackageRepositories;

 		public FakeTaskFactory FakeTaskFactory;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProcessPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProcessPackageAction.cs
index b85eb37b2d..38939273ff 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProcessPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProcessPackageAction.cs
@@ -24,11 +24,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableProcessPackageAction : ProcessPackageAction

+	class TestableProcessPackageAction : ProcessPackageAction

 	{

 		public FakePackageManagementProject FakeProject;

 		public PackageManagementEvents PackageManagementEvents;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProjectManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProjectManager.cs
index 068652c3d3..bcc0ed0e9e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProjectManager.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProjectManager.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableProjectManager : SharpDevelopProjectManager

+	class TestableProjectManager : MonoDevelopProjectManager

 	{

 		public IPackage PackagePassedToAddPackageReference;

 		public bool IgnoreDependenciesPassedToAddPackageReference;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProjectPackagesFolderNode.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProjectPackagesFolderNode.cs
index 6e54edd67b..9351ca65b0 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProjectPackagesFolderNode.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableProjectPackagesFolderNode.cs
@@ -31,7 +31,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableProjectPackagesFolderNode : ProjectPackagesFolderNode

+	class TestableProjectPackagesFolderNode : ProjectPackagesFolderNode

 	{

 		public TestableProjectPackagesFolderNode (

 			IDotNetProject project,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableSolutionPackageRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableSolutionPackageRepository.cs
index 78cbae75c9..68fb33cc77 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableSolutionPackageRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableSolutionPackageRepository.cs
@@ -25,16 +25,16 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableSolutionPackageRepository : SolutionPackageRepository

+	class TestableSolutionPackageRepository : SolutionPackageRepository

 	{

 		public TestableSolutionPackageRepository (

 			ISolution solution,

-			ISharpDevelopPackageRepositoryFactory repositoryFactory,

+			IMonoDevelopPackageRepositoryFactory repositoryFactory,

 			PackageManagementOptions options)

 			: base (solution, repositoryFactory, options)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatePackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatePackageAction.cs
index 01cb896f23..da0456771f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatePackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatePackageAction.cs
@@ -25,18 +25,28 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableUpdatePackageAction : UpdatePackageAction

+	class TestableUpdatePackageAction : UpdatePackageAction

 	{

 		public TestableUpdatePackageAction (

 			IPackageManagementProject project,

 			IPackageManagementEvents packageManagementEvents,

 			IFileRemover fileRemover)

-			: base (project, packageManagementEvents, fileRemover)

+			: this (project, packageManagementEvents, fileRemover, new FakeLicenseAcceptanceService ())

 		{

+		}

+

+		public TestableUpdatePackageAction (

+			IPackageManagementProject project,

+			IPackageManagementEvents packageManagementEvents,

+			IFileRemover fileRemover,

+			FakeLicenseAcceptanceService licenseAcceptanceService)

+			: base (project, packageManagementEvents, fileRemover, licenseAcceptanceService)

+		{

+			LicenseAcceptanceService = licenseAcceptanceService;

 			CreateOpenPackageReadMeMonitorAction = packageId => {

 				OpenPackageReadMeMonitor = base.CreateOpenPackageReadMeMonitor (packageId) as OpenPackageReadMeMonitor;

 				return OpenPackageReadMeMonitor;

@@ -50,6 +60,8 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		{

 			return CreateOpenPackageReadMeMonitorAction (packageId);

 		}

+

+		public FakeLicenseAcceptanceService LicenseAcceptanceService;

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatedPackagesInSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatedPackagesInSolution.cs
index 03e0f88235..391bf97b96 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatedPackagesInSolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableUpdatedPackagesInSolution.cs
@@ -25,12 +25,12 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableUpdatedPackagesInSolution : UpdatedPackagesInSolution

+	class TestableUpdatedPackagesInSolution : UpdatedPackagesInSolution

 	{

 		public TestableUpdatedPackagesInSolution (

 			IPackageManagementSolution solution,

@@ -48,9 +48,9 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			};

 		}

 

-		protected override void GuiDispatch (MessageHandler handler)

+		protected override void GuiDispatch (Action action)

 		{

-			handler.Invoke ();

+			action.Invoke ();

 		}

 

 		public Func<string, bool> FileExistsAction;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableViewModelBase.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableViewModelBase.cs
index 37656ef548..76128eaa28 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableViewModelBase.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/TestableViewModelBase.cs
@@ -25,11 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class TestableViewModelBase : ViewModelBase<TestableViewModelBase>

+	class TestableViewModelBase : ViewModelBase<TestableViewModelBase>

 	{

 		public string MyProperty { get; set; }

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/UninstallPackageHelper.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/UninstallPackageHelper.cs
index 3139f5a247..e6eed525b0 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/UninstallPackageHelper.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/UninstallPackageHelper.cs
@@ -25,12 +25,12 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class UninstallPackageHelper

+	class UninstallPackageHelper

 	{

 		UninstallPackageAction action;

 

@@ -50,7 +50,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 		}

 

 		public SemanticVersion Version;

-		public PackageSource PackageSource = new PackageSource ("http://sharpdevelop.net");

+		public PackageSource PackageSource = new PackageSource ("http://monodevelop.net");

 		public bool ForceRemove;

 		public bool RemoveDependencies;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/UpdatePackageHelper.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/UpdatePackageHelper.cs
index 1a61cddd71..26da8b9e5a 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/UpdatePackageHelper.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.Helpers/UpdatePackageHelper.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public class UpdatePackageHelper

+	class UpdatePackageHelper

 	{

 		UpdatePackageAction action;

 

@@ -63,7 +63,7 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 			return package;

 		}

 

-		public PackageSource PackageSource = new PackageSource ("http://sharpdevelop/packages");

+		public PackageSource PackageSource = new PackageSource ("http://monodevelop/packages");

 		public bool UpdateDependencies;

 		public bool AllowPrereleaseVersions;

 		public SemanticVersion Version;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj
index 71f6d04262..ac04c8f64c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <PropertyGroup>
     <ProjectGuid>{2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}</ProjectGuid>
@@ -212,6 +212,8 @@
     <Compile Include="MonoDevelop.PackageManagement.Tests\DotNetProjectExtensionsTests.cs" />
     <Compile Include="MonoDevelop.PackageManagement.Tests.Helpers\TestableCheckForUpdatesTaskRunner.cs" />
     <Compile Include="MonoDevelop.PackageManagement.Tests\MinClientVersionTests.cs" />
+    <Compile Include="MonoDevelop.PackageManagement.Tests.Helpers\FakeLicenseAcceptanceService.cs" />
+    <Compile Include="MonoDevelop.PackageManagement.Tests.Helpers\FakeNuGetPackageNewImportsHandler.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/AvailablePackagesViewModelTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/AvailablePackagesViewModelTests.cs
index 86cdc0025d..845d13fa87 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/AvailablePackagesViewModelTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/AvailablePackagesViewModelTests.cs
@@ -24,28 +24,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team

-// 

-// Permission is hereby granted, free of charge, to any person obtaining a copy of this

-// software and associated documentation files (the "Software"), to deal in the Software

-// without restriction, including without limitation the rights to use, copy, modify, merge,

-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons

-// to whom the Software is furnished to do so, subject to the following conditions:

-// 

-// The above copyright notice and this permission notice shall be included in all copies or

-// substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,

-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE

-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-// DEALINGS IN THE SOFTWARE.

-

 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/BackgroundPackageActionRunnerTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/BackgroundPackageActionRunnerTests.cs
index cc692abc1d..34e787f129 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/BackgroundPackageActionRunnerTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/BackgroundPackageActionRunnerTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NUnit.Framework;

 using NuGet;

@@ -76,18 +76,6 @@ namespace MonoDevelop.PackageManagement.Tests
 			runner.Run (progressMessage, actions);

 		}

 

-		void RunAndWait ()

-		{

-			runner.InvokeBackgroundDispatchAndWaitImmediately = true;

-			runner.RunAndWait (progressMessage, actions);

-		}

-

-		void RunAndWaitWithoutBackgroundDispatch ()

-		{

-			runner.InvokeBackgroundDispatchAndWaitImmediately = false;

-			runner.RunAndWait (progressMessage, actions);

-		}

-

 		FakeInstallPackageAction AddInstallAction ()

 		{

 			var action = new FakeInstallPackageAction (new FakePackageManagementProject (), packageManagementEvents);

@@ -119,6 +107,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			operations.Add (new PackageOperation (package, PackageAction.Install));

 			action.Operations = operations;

 			action.Package = package;

+			action.LicensesMustBeAccepted = false;

 		}

 

 		void AddInstallActionWithMissingPackageId (string packageId = "Unknown")

@@ -567,26 +556,6 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void IsRunning_OneUninstallActionAndRunAndWaitCalledButDispatcherNotComplete_IsRunningIsTrue ()

-		{

-			CreateRunner ();

-			AddUninstallAction ();

-			RunAndWaitWithoutBackgroundDispatch ();

-

-			Assert.IsTrue (runner.IsRunning);

-		}

-

-		[Test]

-		public void IsRunning_OneUninstallActionAndRunAndWaitCalledAndDispatcherCompletes_IsRunningIsFalse ()

-		{

-			CreateRunner ();

-			AddUninstallAction ();

-			RunAndWait ();

-

-			Assert.IsFalse (runner.IsRunning);

-		}

-

-		[Test]

 		public void IsRunning_ExceptionThrownRunningBackgroundDispatcher_IsRunningIsFalse ()

 		{

 			CreateRunner ();

@@ -599,20 +568,6 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			Assert.IsFalse (runner.IsRunning);

 		}

-

-		[Test]

-		public void IsRunning_ExceptionThrownRunningBackgroundDispatcherWithRunAndWait_IsRunningIsFalse ()

-		{

-			CreateRunner ();

-			AddUninstallAction ();

-			runner.CreateEventMonitorAction = (monitor, packageManagementEvents, progressProvider) => {

-				throw new ApplicationException ("Error");

-			};

-

-			RunAndWait ();

-

-			Assert.IsFalse (runner.IsRunning);

-		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DelegateCommandTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DelegateCommandTests.cs
index eee4b6f1da..2f50d599f9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DelegateCommandTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DelegateCommandTests.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NUnit.Framework;

 

 namespace MonoDevelop.PackageManagement.Tests

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DotNetProjectExtensionsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DotNetProjectExtensionsTests.cs
index a0d6d171cc..338491bd76 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DotNetProjectExtensionsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/DotNetProjectExtensionsTests.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NUnit.Framework;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs
index 7d3887e3ee..10d81693ac 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/EnsureNuGetPackageBuildImportsTargetUpdaterTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Linq;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 using NUnit.Framework;

 

 namespace MonoDevelop.PackageManagement.Tests

@@ -41,7 +41,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		void CreateMSBuildProject (string xml)

 		{

 			msbuildProject = new MSBuildProject ();

-			msbuildProject.Document.LoadXml (xml);

+			msbuildProject.LoadXml (xml);

 		}

 

 		void CreateUpdaterWithImportToRemove (string import)

@@ -55,7 +55,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			using (updater) {

 				PackageManagementMSBuildExtension.Updater = updater;

 				msbuildExtension = new PackageManagementMSBuildExtension ();

-				msbuildExtension.SaveProject (null, null, msbuildProject);

+				msbuildExtension.UpdateProject (msbuildProject);

 			}

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/IPackageExtensionsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/IPackageExtensionsTests.cs
index 5113b3f35d..385c39fd42 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/IPackageExtensionsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/IPackageExtensionsTests.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NUnit.Framework;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/InstallPackageActionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/InstallPackageActionTests.cs
index 584bf146be..bd6a95bf4e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/InstallPackageActionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/InstallPackageActionTests.cs
@@ -28,7 +28,6 @@ using System;
 using System.Collections.Generic;

 using System.IO;

 using System.Linq;

-using ICSharpCode.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

@@ -422,9 +421,10 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void Execute_ProjectHasOnePackageInstallOperationThatHasALicenseToBeAccepted_AcceptLicensesEventRaised ()

+		public void Execute_ProjectHasOnePackageInstallOperationThatHasALicenseToBeAcceptedAndLicensesMustBeAcceptedIsFalse_AcceptLicensesEventRaised ()

 		{

 			CreateAction ();

+			action.LicensesMustBeAccepted = false;

 			FakePackage expectedPackage = fakeProject.FakeSourceRepository.AddFakePackageWithVersion ("Test", "1.0");

 			expectedPackage.RequireLicenseAcceptance = true;

 			var expectedPackages = new IPackage [] { expectedPackage };

@@ -444,9 +444,10 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void Execute_ProjectHasOnePackageInstallOperationThatHasALicenseToBeAcceptedButPackageInstalledAlready_NoAcceptLicensesEventIsRaised ()

+		public void Execute_ProjectHasOnePackageInstallOperationThatHasALicenseToBeAcceptedButPackageInstalledAlreadyAndLicensesMustBeAcceptedIsFalse_NoAcceptLicensesEventIsRaised ()

 		{

 			CreateAction ();

+			action.LicensesMustBeAccepted = false;

 			FakePackage expectedPackage = fakeProject.FakeSourceRepository.AddFakePackageWithVersion ("Test", "1.0");

 			expectedPackage.RequireLicenseAcceptance = true;

 			var operation = new FakePackageOperation (expectedPackage, PackageAction.Install);

@@ -465,9 +466,10 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void Execute_ProjectHasOnePackageInstallOperationThatHasALicenseToBeAcceptedAndLicensesNotAccepted_ExceptionThrown ()

+		public void Execute_ProjectHasOnePackageInstallOperationThatHasALicenseToBeAcceptedAndLicensesNotAcceptedAndLicensesMustBeAcceptedIsFalse_ExceptionThrown ()

 		{

 			CreateAction ();

+			action.LicensesMustBeAccepted = false;

 			FakePackage expectedPackage = fakeProject.FakeSourceRepository.AddFakePackageWithVersion ("Test", "1.0");

 			expectedPackage.RequireLicenseAcceptance = true;

 			var operation = new FakePackageOperation (expectedPackage, PackageAction.Install);

@@ -536,12 +538,11 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateAction ();

 			fakeProject.FakePackages.Add (new FakePackage ("Test", "1.0"));

 			action.Package = new FakePackage ("Test", "1.1");

-			var firstReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NewAssembly");

-			var secondReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework");

+			var firstReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NewAssembly");

+			var secondReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

 			fakeProject.InstallPackageAction = (p, a) => {

-				var referenceBeingRemoved = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework") {

-					LocalCopy = false

-				};

+				var referenceBeingRemoved = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

+				referenceBeingRemoved.LocalCopy = false;

 				packageManagementEvents.OnReferenceRemoving (referenceBeingRemoved);

 				packageManagementEvents.OnReferenceAdding (firstReferenceBeingAdded);

 				packageManagementEvents.OnReferenceAdding (secondReferenceBeingAdded);

@@ -559,12 +560,11 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateAction ();

 			fakeProject.FakePackages.Add (new FakePackage ("Test", "1.0"));

 			action.Package = new FakePackage ("Test", "1.1");

-			var firstReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NewAssembly");

-			var secondReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework");

+			var firstReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NewAssembly");

+			var secondReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

 			fakeProject.InstallPackageAction = (p, a) => {

-				var referenceBeingRemoved = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework") {

-					LocalCopy = false

-				};

+				var referenceBeingRemoved = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

+				referenceBeingRemoved.LocalCopy = false;

 				packageManagementEvents.OnReferenceRemoving (referenceBeingRemoved);

 				packageManagementEvents.OnReferenceAdding (firstReferenceBeingAdded);

 				packageManagementEvents.OnReferenceAdding (secondReferenceBeingAdded);

@@ -685,5 +685,49 @@ namespace MonoDevelop.PackageManagement.Tests
 			Assert.IsTrue (fileRemovedResult.Value);

 			Assert.IsNull (fileRemover.FileRemoved);

 		}

+

+		[Test]

+		public void NewInstance_LicensesMustBeAccepted_TrueByDefault ()

+		{

+			CreateAction ();

+

+			Assert.IsTrue (action.LicensesMustBeAccepted);

+		}

+

+		[Test]

+		public void Execute_ProjectHasOnePackageInstallOperationThatHasALicenseToBeAccepted_PackagesPassedToLicenseAcceptanceService ()

+		{

+			CreateAction ();

+			FakePackage expectedPackage = fakeProject.FakeSourceRepository.AddFakePackageWithVersion ("Test", "1.0");

+			expectedPackage.RequireLicenseAcceptance = true;

+			var expectedPackages = new IPackage [] { expectedPackage };

+			var operation = new FakePackageOperation (expectedPackage, PackageAction.Install);

+			action.PackageId = expectedPackage.Id;

+			action.PackageVersion = expectedPackage.Version;

+			fakeProject.FakeInstallOperations.Add (operation);

+

+			action.Execute ();

+

+			PackageCollectionAssert.AreEqual (expectedPackages, action.LicenseAcceptanceService.PackagesAccepted);

+		}

+

+		[Test]

+		public void Execute_ProjectHasOnePackageInstallOperationThatHasALicenseToBeAcceptedAndLicensesNotAccepted_LicenseAcceptanceServiceUsedAndExceptionThrown ()

+		{

+			CreateAction ();

+			FakePackage expectedPackage = fakeProject.FakeSourceRepository.AddFakePackageWithVersion ("Test", "1.0");

+			expectedPackage.RequireLicenseAcceptance = true;

+			var expectedPackages = new IPackage [] { expectedPackage };

+			var operation = new FakePackageOperation (expectedPackage, PackageAction.Install);

+			action.PackageId = expectedPackage.Id;

+			action.PackageVersion = expectedPackage.Version;

+			fakeProject.FakeInstallOperations.Add (operation);

+			action.LicenseAcceptanceService.AcceptLicensesReturnValue = false;

+

+			Exception ex = Assert.Throws (typeof(ApplicationException), () => action.Execute ());

+

+			Assert.AreEqual ("Licenses not accepted.", ex.Message);

+			PackageCollectionAssert.AreEqual (expectedPackages, action.LicenseAcceptanceService.PackagesAccepted);

+		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs
index 78593251e5..59ed4dd6da 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildProjectExtensionsTests.cs
@@ -1,10 +1,11 @@
 

 using System;

 using System.Xml;

-using ICSharpCode.PackageManagement;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.PackageManagement;

+using MonoDevelop.Projects.MSBuild;

 using NuGet;

 using NUnit.Framework;

+using System.Linq;

 

 namespace MonoDevelop.PackageManagement.Tests

 {

@@ -30,44 +31,38 @@ namespace MonoDevelop.PackageManagement.Tests
 

 		void AssertLastMSBuildImportElementHasProjectAttributeValue (string expectedAttributeValue)

 		{

-			XmlElement import = GetLastMSBuildImportElement ();

-			string actualAttributeValue = import.GetAttribute ("Project");

+			MSBuildImport import = GetLastMSBuildImportElement ();

+			string actualAttributeValue = import.Project;

 			Assert.AreEqual (expectedAttributeValue, actualAttributeValue);

 		}

 

 		void AssertLastMSBuildImportElementHasCondition (string expectedCondition)

 		{

-			XmlElement import = GetLastMSBuildImportElement ();

-			string actualCondition = import.GetAttribute ("Condition");

-			Assert.AreEqual (expectedCondition, actualCondition);

+			MSBuildImport import = GetLastMSBuildImportElement ();

+			Assert.AreEqual (expectedCondition, import.Condition);

 		}

 

-		XmlElement GetLastMSBuildImportElement ()

+		MSBuildImport GetLastMSBuildImportElement ()

 		{

-			var import = project.Document.DocumentElement.LastChild as XmlElement;

-			Assert.AreEqual (import.LocalName, "Import");

-			return import;

+			return project.Imports.LastOrDefault ();

 		}

 

 		void AssertFirstMSBuildImportElementHasProjectAttributeValue (string expectedAttributeValue)

 		{

-			XmlElement import = GetFirstMSBuildImportElement ();

-			string actualAttributeValue = import.GetAttribute ("Project");

+			MSBuildImport import = GetFirstMSBuildImportElement ();

+			string actualAttributeValue = import.Project;

 			Assert.AreEqual (expectedAttributeValue, actualAttributeValue);

 		}

 

-		XmlElement GetFirstMSBuildImportElement ()

+		MSBuildImport GetFirstMSBuildImportElement ()

 		{

-			var import = project.Document.DocumentElement.FirstChild as XmlElement;

-			Assert.AreEqual (import.LocalName, "Import");

-			return import;

+			return project.Imports.FirstOrDefault ();

 		}

 

 		void AssertFirstMSBuildImportElementHasCondition (string expectedCondition)

 		{

-			XmlElement import = GetFirstMSBuildImportElement ();

-			string actualCondition = import.GetAttribute ("Condition");

-			Assert.AreEqual (expectedCondition, actualCondition);

+			var import = GetFirstMSBuildImportElement ();

+			Assert.AreEqual (expectedCondition, import.Condition);

 		}

 

 		[Test]

@@ -135,7 +130,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			

 			AddImportIfMissingAtBottom (import);

 			

-			Assert.AreEqual (1, project.Document.DocumentElement.ChildNodes.Count);

+			Assert.AreEqual (1, project.Imports.Count ());

 		}

 

 		[Test]

@@ -160,7 +155,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			

 			project.RemoveImportIfExists (import);

 			

-			Assert.AreEqual (0, project.Document.DocumentElement.ChildNodes.Count);

+			Assert.AreEqual (0, project.Imports.Count ());

 		}

 

 		[Test]

@@ -173,7 +168,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			

 			project.RemoveImportIfExists (import2);

 			

-			Assert.AreEqual (0, project.Document.DocumentElement.ChildNodes.Count);

+			Assert.AreEqual (0, project.Imports.Count ());

 		}

 

 		[Test]

@@ -210,7 +205,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			

 			AddImportIfMissingAtTop (import);

 			

-			Assert.AreEqual (1, project.Document.DocumentElement.ChildNodes.Count);

+			Assert.AreEqual (1, project.Imports.Count ());

 		}

 	}

 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildTargetsRestoredMonitorTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildTargetsRestoredMonitorTests.cs
index 93ae95c5b1..eed15ff652 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildTargetsRestoredMonitorTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MSBuildTargetsRestoredMonitorTests.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopPackageManagerFactoryTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopPackageManagerFactoryTests.cs
index 921e216264..c64ab3283c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopPackageManagerFactoryTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopPackageManagerFactoryTests.cs
@@ -1,5 +1,5 @@
 //

-// SharpDevelopPackageManagerFactoryTests.cs

+// MonoDevelopPackageManagerFactoryTests.cs

 //

 // Author:

 //       Matt Ward <matt.ward@xamarin.com>

@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

@@ -35,7 +35,7 @@ namespace MonoDevelop.PackageManagement.Tests
 	[TestFixture]

 	public class MonoDevelopPackageManagerFactoryTests

 	{

-		SharpDevelopPackageManagerFactory factory;

+		MonoDevelopPackageManagerFactory factory;

 		IPackageManager packageManager;

 		FakePackageRepository fakePackageRepository;

 		FakeDotNetProject testProject;

@@ -48,7 +48,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			options = new TestablePackageManagementOptions ();

 			fakePackageRepositoryFactory = new FakePackageRepositoryFactory ();

 			fakeProjectSystemFactory = new FakeProjectSystemFactory ();

-			factory = new SharpDevelopPackageManagerFactory (fakePackageRepositoryFactory, fakeProjectSystemFactory, options);

+			factory = new MonoDevelopPackageManagerFactory (fakePackageRepositoryFactory, fakeProjectSystemFactory, options);

 		}

 

 		void CreateTestProject ()

@@ -131,8 +131,8 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			string expectedDirectory = @"c:\projects\MyProject\packages\TestPackage.1.0.0.0".ToNativePath ();

 

-			SharpDevelopPackageManager sharpDevelopPackageManager = packageManager as SharpDevelopPackageManager;

-			string actualDirectory = sharpDevelopPackageManager.PathResolver.GetInstallPath (package);

+			MonoDevelopPackageManager monoDevelopPackageManager = packageManager as MonoDevelopPackageManager;

+			string actualDirectory = monoDevelopPackageManager.PathResolver.GetInstallPath (package);

 

 			Assert.AreEqual (expectedDirectory, actualDirectory);

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopPackageManagerTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopPackageManagerTests.cs
index beb98f08ff..cc50fb5172 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopPackageManagerTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopPackageManagerTests.cs
@@ -1,5 +1,5 @@
 //

-// SharpDevelopPackageManagerTests.cs

+// MonoDevelopPackageManagerTests.cs

 //

 // Author:

 //       Matt Ward <matt.ward@xamarin.com>

@@ -27,7 +27,7 @@
 using System;

 using System.Linq;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

@@ -37,7 +37,7 @@ namespace MonoDevelop.PackageManagement.Tests
 	[TestFixture]

 	public class MonoDevelopPackageManagerTests

 	{

-		SharpDevelopPackageManager packageManager;

+		MonoDevelopPackageManager packageManager;

 		FakePackageRepository fakeFeedSourceRepository;

 		FakeSharedPackageRepository fakeSolutionSharedRepository;

 		FakeProject project;

@@ -51,6 +51,14 @@ namespace MonoDevelop.PackageManagement.Tests
 

 		void CreatePackageManager (IProject project, PackageReferenceRepositoryHelper packageRefRepositoryHelper)

 		{

+			CreatePackageManager (project, packageRefRepositoryHelper, new FakePackageRepository ());

+		}

+

+		void CreatePackageManager (

+			IProject project,

+			PackageReferenceRepositoryHelper packageRefRepositoryHelper,

+			IPackageRepository sourceRepository)

+		{

 			options = new TestablePackageManagementOptions ();

 			options.PackagesDirectory = "packages";

 

@@ -59,7 +67,7 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			fakeFileSystem = new FakeFileSystem ();

 

-			fakeFeedSourceRepository = new FakePackageRepository ();

+			fakeFeedSourceRepository = sourceRepository as FakePackageRepository;

 			fakeSolutionSharedRepository = packageRefRepositoryHelper.FakeSharedSourceRepository;

 

 			fakePackageOperationResolverFactory = new FakePackageOperationResolverFactory ();

@@ -70,7 +78,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			fakeSolutionPackageRepository.PackagePathResolver = pathResolver;

 			fakeSolutionPackageRepository.FakeSharedRepository = fakeSolutionSharedRepository;

 

-			packageManager = new SharpDevelopPackageManager (fakeFeedSourceRepository,

+			packageManager = new MonoDevelopPackageManager (sourceRepository,

 				packageRefRepositoryHelper.FakeProjectSystem,

 				fakeSolutionPackageRepository,

 				fakePackageOperationResolverFactory);

@@ -78,9 +86,14 @@ namespace MonoDevelop.PackageManagement.Tests
 

 		void CreatePackageManager ()

 		{

+			CreatePackageManager (new FakePackageRepository ());

+		}

+

+		void CreatePackageManager (IPackageRepository sourceRepository)

+		{

 			CreateTestProject ();

 			CreatePackageReferenceRepositoryHelper ();

-			CreatePackageManager (project, packageRefRepositoryHelper);

+			CreatePackageManager (project, packageRefRepositoryHelper, sourceRepository);

 		}

 

 		void CreatePackageReferenceRepositoryHelper ()

@@ -342,6 +355,17 @@ namespace MonoDevelop.PackageManagement.Tests
 				() => eventArgs.ToList ().ForEach (eventArg => projectManager.FirePackageReferenceRemoved (eventArg)));

 		}

 

+		void RaisePackageAddedEventWhenPackageReferenceUpdated (

+			FakeProjectManager projectManager,

+			FakePackage updatedPackage,

+			params PackageOperationEventArgs[] eventArgs)

+		{

+			projectManager.WhenUpdatePackageReferenceCalled (

+				updatedPackage.Id,

+				updatedPackage.Version,

+				() => eventArgs.ToList ().ForEach (eventArg => projectManager.FirePackageReferenceAdded (eventArg)));

+		}

+

 		void RaisePackageRemovedEventWhenPackageReferenceAdded (

 			FakeProjectManager projectManager,

 			FakePackage newPackage,

@@ -353,11 +377,44 @@ namespace MonoDevelop.PackageManagement.Tests
 				() => eventArgs.ToList ().ForEach (eventArg => projectManager.FirePackageReferenceRemoved (eventArg)));

 		}

 

+		void RaisePackageAddedEventWhenPackageReferenceAdded (

+			FakeProjectManager projectManager,

+			FakePackage newPackage,

+			params PackageOperationEventArgs[] eventArgs)

+		{

+			projectManager.WhenAddPackageReferenceCalled (

+				newPackage.Id,

+				newPackage.Version,

+				() => eventArgs.ToList ().ForEach (eventArg => projectManager.FirePackageReferenceAdded (eventArg)));

+		}

+

 		[Test]

-		public void ProjectManager_InstanceCreated_SourceRepositoryIsSharedRepositoryPassedToPackageManager ()

+		public void ProjectManager_InstanceCreated_SourceRepositoryIsAggregrateRepositoryContainingSharedRepositoryPassedToPackageManager ()

 		{

 			CreatePackageManager ();

-			Assert.AreEqual (fakeSolutionSharedRepository, packageManager.ProjectManager.SourceRepository);

+

+			var aggregateRepository = packageManager.ProjectManager.SourceRepository as AggregateRepository;

+			var secondaryRepository = aggregateRepository.Repositories.Last () as FakePackageRepository;

+			Assert.AreEqual (2, aggregateRepository.Repositories.Count ());

+			Assert.AreEqual (fakeSolutionSharedRepository, aggregateRepository.Repositories.First ());

+			Assert.IsTrue (secondaryRepository.IsCloneOf (fakeFeedSourceRepository));

+		}

+

+		[Test]

+		public void ProjectManager_LocalRepositoryIsFallbackRepository_SourceRepositoryIsFallbackContainingSharedRepositoryPassedToPackageManager ()

+		{

+			var primaryRepository = new FakePackageRepository ();

+			var dependencyResolver = new FakePackageRepository ();

+			var fallbackRepository = new FallbackRepository (primaryRepository, dependencyResolver);

+			CreatePackageManager (fallbackRepository);

+

+			var sourceRepository = packageManager.ProjectManager.SourceRepository as FallbackRepository;

+			var aggregateRepository = sourceRepository.SourceRepository as AggregateRepository;

+			Assert.AreEqual (dependencyResolver, sourceRepository.DependencyResolver);

+			var secondaryRepository = aggregateRepository.Repositories.Last () as FakePackageRepository;

+			Assert.AreEqual (2, aggregateRepository.Repositories.Count ());

+			Assert.AreEqual (fakeSolutionSharedRepository, aggregateRepository.Repositories.First ());

+			Assert.IsTrue (secondaryRepository.IsCloneOf (primaryRepository));

 		}

 

 		[Test]

@@ -1133,6 +1190,84 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			Assert.IsTrue (fakeSolutionSharedRepository.FakePackages.Contains (installedPackage));

 		}

+

+		[Test]

+		public void InstallPackage_PackageReferenceIsAddedForPackageNotInstalledInLocalRepository_PackageIsInstalled ()

+		{

+			CreatePackageManager ();

+			var fakeProjectManager = new FakeProjectManager ();

+			packageManager.ProjectManager = fakeProjectManager;

+			var packageReferenced = new FakePackage ("FooBar", "1.0");

+			FakePackage newPackage = fakeFeedSourceRepository.AddFakePackageWithVersion ("MyPackage", "1.1");

+			var eventArgs = new PackageOperationEventArgs (packageReferenced, null, null);

+			RaisePackageAddedEventWhenPackageReferenceAdded (fakeProjectManager, newPackage, eventArgs);

+			var installAction = new FakeInstallPackageAction {

+				Operations = new List<PackageOperation> ()

+			};

+

+			packageManager.InstallPackage (newPackage, installAction);

+

+			Assert.IsTrue (fakeSolutionSharedRepository.PackagesAdded.Contains (packageReferenced));

+		}

+

+		[Test]

+		public void InstallPackage_PackageReferenceIsAddedForPackageInstalledInLocalRepository_PackageIsNotInstalledToLocalRepositoryAgain ()

+		{

+			CreatePackageManager ();

+			var fakeProjectManager = new FakeProjectManager ();

+			packageManager.ProjectManager = fakeProjectManager;

+			var packageReferenced = new FakePackage ("FooBar", "1.0");

+			fakeSolutionSharedRepository.FakePackages.Add (packageReferenced);

+			FakePackage newPackage = fakeFeedSourceRepository.AddFakePackageWithVersion ("MyPackage", "1.1");

+			var eventArgs = new PackageOperationEventArgs (packageReferenced, null, null);

+			RaisePackageAddedEventWhenPackageReferenceAdded (fakeProjectManager, newPackage, eventArgs);

+			var installAction = new FakeInstallPackageAction {

+				Operations = new List<PackageOperation> ()

+			};

+

+			packageManager.InstallPackage (newPackage, installAction);

+

+			Assert.IsFalse (fakeSolutionSharedRepository.PackagesAdded.Contains (packageReferenced));

+		}

+

+		[Test]

+		public void UpdatePackage_PackageReferenceIsAddedForPackageNotInstalledInLocalRepository_PackageIsInstalled ()

+		{

+			CreatePackageManager ();

+			var fakeProjectManager = new FakeProjectManager ();

+			packageManager.ProjectManager = fakeProjectManager;

+			var packageReferenced = new FakePackage ("FooBar", "1.0");

+			FakePackage newPackage = fakeFeedSourceRepository.AddFakePackageWithVersion ("MyPackage", "1.1");

+			var eventArgs = new PackageOperationEventArgs (packageReferenced, null, null);

+			RaisePackageAddedEventWhenPackageReferenceUpdated (fakeProjectManager, newPackage, eventArgs);

+			var updateAction = new FakeUpdatePackageAction {

+				Operations = new List<PackageOperation> ()

+			};

+

+			packageManager.UpdatePackage (newPackage, updateAction);

+

+			Assert.IsTrue (fakeSolutionSharedRepository.PackagesAdded.Contains (packageReferenced));

+		}

+

+		[Test]

+		public void UpdatePackage_PackageReferenceIsAddedForPackageInstalledInLocalRepository_PackageIsNotInstalledAgainInLocalRepository ()

+		{

+			CreatePackageManager ();

+			var fakeProjectManager = new FakeProjectManager ();

+			packageManager.ProjectManager = fakeProjectManager;

+			var packageReferenced = new FakePackage ("FooBar", "1.0");

+			fakeSolutionSharedRepository.FakePackages.Add (packageReferenced);

+			FakePackage newPackage = fakeFeedSourceRepository.AddFakePackageWithVersion ("MyPackage", "1.1");

+			var eventArgs = new PackageOperationEventArgs (packageReferenced, null, null);

+			RaisePackageAddedEventWhenPackageReferenceUpdated (fakeProjectManager, newPackage, eventArgs);

+			var updateAction = new FakeUpdatePackageAction {

+				Operations = new List<PackageOperation> ()

+			};

+

+			packageManager.UpdatePackage (newPackage, updateAction);

+

+			Assert.IsFalse (fakeSolutionSharedRepository.PackagesAdded.Contains (packageReferenced));

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectManagerTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectManagerTests.cs
index 754f648a29..49ce6e4f04 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectManagerTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectManagerTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs
index fd3280c147..0fa66464e2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/MonoDevelopProjectSystemTests.cs
@@ -1,5 +1,5 @@
 //

-// SharpDevelopProjectSystemTests.cs

+// MonoDevelopProjectSystemTests.cs

 //

 // Author:

 //       Matt Ward <matt.ward@xamarin.com>

@@ -28,12 +28,12 @@ using System;
 using System.IO;

 using System.Linq;

 using System.Runtime.Versioning;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Core.Assemblies;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using MonoDevelop.Projects;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 using NuGet;

 using NUnit.Framework;

 

@@ -87,26 +87,38 @@ namespace MonoDevelop.PackageManagement.Tests
 

 		void AssertLastMSBuildChildElementHasProjectAttributeValue (string expectedImport)

 		{

-			ImportAndCondition import = project.ImportsAdded.Last ();

+			ImportAndCondition import = projectSystem.NewImportsHandler.ImportsAdded.Last ();

 			Assert.AreEqual (expectedImport, import.Name);

 		}

 

 		void AssertLastImportHasCondition (string expectedCondition)

 		{

-			ImportAndCondition import = project.ImportsAdded.Last ();

+			ImportAndCondition import = projectSystem.NewImportsHandler.ImportsAdded.Last ();

 			Assert.AreEqual (expectedCondition, import.Condition);

 		}

 

+		void AssertLastImportHasImportLocation (ProjectImportLocation expectedLocation)

+		{

+			ImportAndCondition import = projectSystem.NewImportsHandler.ImportsAdded.Last ();

+			Assert.AreEqual (expectedLocation, import.Location);

+		}

+

 		void AssertFirstMSBuildChildElementHasProjectAttributeValue (string expectedImport)

 		{

-			ImportAndCondition import = project.ImportsAdded.First ();

+			ImportAndCondition import = projectSystem.NewImportsHandler.ImportsAdded.First ();

 			Assert.AreEqual (expectedImport, import.Name);

 		}

 

 		void AssertFirstImportHasCondition (string expectedCondition)

 		{

-			ImportAndCondition import = project.ImportsAdded.First ();

+			ImportAndCondition import = projectSystem.NewImportsHandler.ImportsAdded.First ();

 			Assert.AreEqual (expectedCondition, import.Condition);

+		}
+
+		void AssertFirstImportHasImportLocation (ProjectImportLocation expectedLocation)

+		{

+			ImportAndCondition import = projectSystem.NewImportsHandler.ImportsAdded.First ();

+			Assert.AreEqual (expectedLocation, import.Location);

 		}

 

 		void AssertImportRemoved (string expectedImportRemoved)

@@ -117,7 +129,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		MSBuildProject CreateMSBuildProject (string xml)

 		{

 			var msbuildProject = new MSBuildProject ();

-			msbuildProject.Document.LoadXml (xml);

+			msbuildProject.LoadXml (xml);

 			return msbuildProject;

 		}

 

@@ -402,7 +414,7 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			ProjectReference actualReference = project.References [0];

 			Assert.AreEqual ("nunit.framework", actualReference.Reference);

-			Assert.AreEqual (fileName, actualReference.HintPath);

+			Assert.AreEqual (fileName, actualReference.HintPath.ToString());

 		}

 

 		[Test]

@@ -417,7 +429,7 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			ProjectReference actualReference = project.References [0];

 			Assert.AreEqual ("nunit.framework", actualReference.Reference);

-			Assert.AreEqual (fullFileName, actualReference.HintPath);

+			Assert.AreEqual (fullFileName, actualReference.HintPath.ToString());

 		}

 

 		[Test]

@@ -899,6 +911,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			projectSystem.AddImport (targetPath, ProjectImportLocation.Bottom);

 

 			AssertLastMSBuildChildElementHasProjectAttributeValue (@"..\packages\Foo.0.1\build\Foo.targets");

+			AssertLastImportHasImportLocation (ProjectImportLocation.Bottom);

 		}

 

 		[Test]

@@ -911,6 +924,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			projectSystem.AddImport (targetPath, ProjectImportLocation.Bottom);

 

 			AssertLastMSBuildChildElementHasProjectAttributeValue (@"packages\Foo.0.1\build\Foo.targets");

+			AssertLastImportHasImportLocation (ProjectImportLocation.Bottom);

 		}

 

 		[Test]

@@ -923,6 +937,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			projectSystem.AddImport (targetPath, ProjectImportLocation.Bottom);

 

 			AssertLastImportHasCondition ("Exists('..\\packages\\Foo.0.1\\build\\Foo.targets')");

+			AssertLastImportHasImportLocation (ProjectImportLocation.Bottom);

 		}

 

 		[Test]

@@ -931,11 +946,12 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateTestProject (@"d:\projects\MyProject\MyProject\MyProject.csproj");

 			CreateProjectSystem (project);

 			string targetPath = @"d:\projects\MyProject\packages\Foo.0.1\build\Foo.targets".ToNativePath ();

-			projectSystem.AddImport (targetPath, ProjectImportLocation.Bottom);

 

 			projectSystem.AddImport (targetPath, ProjectImportLocation.Bottom);

+			Assert.AreEqual (1, projectSystem.NewImportsHandler.ImportsAdded.Count);

 

-			Assert.AreEqual (2, project.ImportsAdded.Count);

+			projectSystem.AddImport (targetPath, ProjectImportLocation.Bottom);

+			Assert.AreEqual (1, projectSystem.NewImportsHandler.ImportsAdded.Count);

 		}

 

 		[Test]

@@ -945,11 +961,12 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateProjectSystem (project);

 			string targetPath1 = @"d:\projects\MyProject\packages\Foo.0.1\build\Foo.targets".ToNativePath ();

 			string targetPath2 = @"d:\projects\MyProject\packages\Foo.0.1\BUILD\FOO.TARGETS".ToNativePath ();

+

 			projectSystem.AddImport (targetPath1, ProjectImportLocation.Bottom);

+			Assert.AreEqual (1, projectSystem.NewImportsHandler.ImportsAdded.Count);

 

 			projectSystem.AddImport (targetPath2, ProjectImportLocation.Bottom);

-

-			Assert.AreEqual (2, project.ImportsAdded.Count);

+			Assert.AreEqual (1, projectSystem.NewImportsHandler.ImportsAdded.Count);

 		}

 

 		[Test]

@@ -988,7 +1005,7 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			projectSystem.RemoveImport (targetPath2);

 

-			Assert.AreEqual (1, project.ImportsAdded.Count);

+			Assert.AreEqual (1, projectSystem.NewImportsHandler.ImportsAdded.Count);

 			Assert.AreEqual (2, project.ImportsRemoved.Count);

 		}

 

@@ -1013,6 +1030,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			projectSystem.AddImport (targetPath, ProjectImportLocation.Top);

 

 			AssertFirstMSBuildChildElementHasProjectAttributeValue (@"..\packages\Foo.0.1\build\Foo.targets");

+			AssertFirstImportHasImportLocation (ProjectImportLocation.Top);

 		}

 

 		[Test]

@@ -1025,6 +1043,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			projectSystem.AddImport (targetPath, ProjectImportLocation.Top);

 

 			AssertFirstImportHasCondition ("Exists('..\\packages\\Foo.0.1\\build\\Foo.targets')");

+			AssertFirstImportHasImportLocation (ProjectImportLocation.Top);

 		}

 

 		[Test]

@@ -1033,11 +1052,13 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateTestProject (@"d:\projects\MyProject\MyProject\MyProject.csproj");

 			CreateProjectSystem (project);

 			string targetPath = @"d:\projects\MyProject\packages\Foo.0.1\build\Foo.targets".ToNativePath ();

+

 			projectSystem.AddImport (targetPath, ProjectImportLocation.Top);

+			Assert.AreEqual (1, projectSystem.NewImportsHandler.ImportsAdded.Count);

 

 			projectSystem.AddImport (targetPath, ProjectImportLocation.Top);

 

-			Assert.AreEqual (2, project.ImportsAdded.Count);

+			Assert.AreEqual (1, projectSystem.NewImportsHandler.ImportsAdded.Count);

 		}

 

 		[Test]

@@ -1172,7 +1193,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			int targetCountBeforeSave = msbuildProject.Targets.Count ();

 			project.SaveAction = () => {

 				var msbuildExtension = new PackageManagementMSBuildExtension ();

-				msbuildExtension.SaveProject (null, null, msbuildProject);

+				msbuildExtension.UpdateProject (msbuildProject);

 			};

 

 			projectSystem.RemoveImport (targetPath);

@@ -1195,7 +1216,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			string fileName = @"d:\projects\packages\nunit\nunit.framework.dll".ToNativePath ();

 			projectSystem.AddReference (fileName, null);

 

-			Assert.AreEqual (fileName, referenceBeingAdded.HintPath);

+			Assert.AreEqual (fileName, referenceBeingAdded.HintPath.ToString ());

 			Assert.IsTrue (referenceBeingAdded.LocalCopy);

 		}

 

@@ -1215,8 +1236,20 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			projectSystem.RemoveReference (fileName);

 

-			Assert.AreEqual (fileName, referenceBeingRemoved.HintPath);

+			Assert.AreEqual (fileName, referenceBeingRemoved.HintPath.ToString ());

 			Assert.IsFalse (projectIsSaved);

+		}
+
+		[Test]

+		public void AddImport_FullImportFilePathAndBottomOfProject_ImportHandlerIsDisposed ()

+		{

+			CreateTestProject (@"d:\projects\MyProject\MyProject\MyProject.csproj");

+			CreateProjectSystem (project);

+			string targetPath = @"d:\projects\MyProject\packages\Foo.0.1\build\Foo.targets".ToNativePath ();

+

+			projectSystem.AddImport (targetPath, ProjectImportLocation.Bottom);

+

+			Assert.IsTrue (projectSystem.NewImportsHandler.IsDisposed);

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/OpenDotNetProjectTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/OpenDotNetProjectTests.cs
index 84d7b1a2ae..39ddd0638f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/OpenDotNetProjectTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/OpenDotNetProjectTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageCompatibilityRunnerTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageCompatibilityRunnerTests.cs
index d8b6e7e655..b9b290a0ff 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageCompatibilityRunnerTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageCompatibilityRunnerTests.cs
@@ -28,7 +28,7 @@ using System;
 using System.IO;

 using System.Linq;

 using System.Text;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Core.Assemblies;

 using MonoDevelop.PackageManagement.Tests.Helpers;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFilesTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFilesTests.cs
index 30d245fe04..acf36c1ef4 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFilesTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFilesTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using NUnit.Framework;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 

 namespace MonoDevelop.PackageManagement.Tests

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFromRepositoryTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFromRepositoryTests.cs
index c83b4aee72..a0ad251140 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFromRepositoryTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageFromRepositoryTests.cs
@@ -126,10 +126,10 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void IconUrl_WrappedPackageIconUrlIsHttpSharpDevelopNet_ReturnsHttpSharpDevelopNet ()

+		public void IconUrl_WrappedPackageIconUrlIsHttpMonoDevelopNet_ReturnsHttpMonoDevelopNet ()

 		{

 			CreatePackage ();

-			var expectedUrl = new Uri ("http://sharpdevelop.net");

+			var expectedUrl = new Uri ("http://monodevelop.net");

 			fakePackage.IconUrl = expectedUrl;

 			Uri url = package.IconUrl;

 

@@ -137,10 +137,10 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void LicenseUrl_WrappedPackageLicenseUrlIsHttpSharpDevelopNet_ReturnsHttpSharpDevelopNet ()

+		public void LicenseUrl_WrappedPackageLicenseUrlIsHttpMonoDevelopNet_ReturnsHttpMonoDevelopNet ()

 		{

 			CreatePackage ();

-			var expectedUrl = new Uri ("http://sharpdevelop.net");

+			var expectedUrl = new Uri ("http://monodevelop.net");

 			fakePackage.LicenseUrl = expectedUrl;

 			Uri url = package.LicenseUrl;

 

@@ -148,10 +148,10 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void ProjectUrl_WrappedPackageProjectUrlIsHttpSharpDevelopNet_ReturnsHttpSharpDevelopNet ()

+		public void ProjectUrl_WrappedPackageProjectUrlIsHttpMonoDevelopNet_ReturnsHttpMonoDevelopNet ()

 		{

 			CreatePackage ();

-			var expectedUrl = new Uri ("http://sharpdevelop.net");

+			var expectedUrl = new Uri ("http://monodevelop.net");

 			fakePackage.ProjectUrl = expectedUrl;

 			Uri url = package.ProjectUrl;

 

@@ -159,10 +159,10 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void ReportAbuseUrl_WrappedPackageReportAbuseUrlIsHttpSharpDevelopNet_ReturnsHttpSharpDevelopNet ()

+		public void ReportAbuseUrl_WrappedPackageReportAbuseUrlIsHttpMonoDevelopNet_ReturnsHttpMonoDevelopNet ()

 		{

 			CreatePackage ();

-			var expectedUrl = new Uri ("http://sharpdevelop.net");

+			var expectedUrl = new Uri ("http://monodevelop.net");

 			fakePackage.ReportAbuseUrl = expectedUrl;

 			Uri url = package.ReportAbuseUrl;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementEventsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementEventsTests.cs
index 5e7f7074e9..8327d86530 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementEventsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementEventsTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementLoggerTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementLoggerTests.cs
index cce2a5c9e9..360cd4e72b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementLoggerTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementLoggerTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsTests.cs
index 48f81bc6d7..6505eabb04 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsTests.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using System.IO;

 using System.Text;

 using System.Xml;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

@@ -228,11 +228,11 @@ namespace MonoDevelop.PackageManagement.Tests
 		public void ActivePackageSource_SourceChanged_ActivePackageSourceUpdatedInSettings ()

 		{

 			CreateOptions ();

-			var packageSource = new PackageSource ("http://sharpdevelop.com", "Test");

+			var packageSource = new PackageSource ("http://monodevelop.com", "Test");

 

 			options.ActivePackageSource = packageSource;

 

-			var expectedSetting = new SettingValue ("Test", "http://sharpdevelop.com", false);

+			var expectedSetting = new SettingValue ("Test", "http://monodevelop.com", false);

 			SettingValue actualSetting = fakeSettings.GetValuePassedToSetValueForActivePackageSourceSection ();

 

 			Assert.AreEqual (expectedSetting, actualSetting);

@@ -285,7 +285,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		{

 			CreateOptions ();

 

-			options.ActivePackageSource = new PackageSource ("http://sharpdevelop.com", "Test");

+			options.ActivePackageSource = new PackageSource ("http://monodevelop.com", "Test");

 

 			bool sectionDeleted = fakeSettings.IsActivePackageSourceSectionDeleted;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsViewModelTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsViewModelTests.cs
index 8686205e1f..1f18cd7c90 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsViewModelTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementOptionsViewModelTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NUnit.Framework;

 using MonoDevelop.Core;

 using MonoDevelop.PackageManagement.Tests.Helpers;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementProjectTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementProjectTests.cs
index bad7bed11b..d0ec929a40 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementProjectTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementProjectTests.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSelectedProjectTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSelectedProjectTests.cs
index ab4f35a0aa..77d06c2fad 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSelectedProjectTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSelectedProjectTests.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NUnit.Framework;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSelectedProjectsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSelectedProjectsTests.cs
index 97c363af45..e820f8a489 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSelectedProjectsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSelectedProjectsTests.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSolutionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSolutionTests.cs
index d7d5b380ca..63b6b51f9f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSolutionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageManagementSolutionTests.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 using MonoDevelop.PackageManagement.Tests.Helpers;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 

@@ -101,7 +101,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void GetActiveProject_ProjectIsSelected_CreatesProjectUsingCurrentProjectSelectedInSharpDevelop ()

+		public void GetActiveProject_ProjectIsSelected_CreatesProjectUsingCurrentProjectSelectedInMonoDevelop ()

 		{

 			CreateSolution ();

 

@@ -196,7 +196,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		{

 			CreateSolution ();

 			FakeDotNetProject expectedProject = AddProjectToOpenProjects ("Test");

-			var source = new PackageSource ("http://sharpdevelop.net");

+			var source = new PackageSource ("http://monodevelop.net");

 

 			solution.GetProject (source, "Test");

 

@@ -210,7 +210,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		{

 			CreateSolution ();

 			FakeDotNetProject expectedProject = AddProjectToOpenProjects ("Test");

-			var source = new PackageSource ("http://sharpdevelop.net");

+			var source = new PackageSource ("http://monodevelop.net");

 

 			solution.GetProject (source, "TEST");

 

@@ -224,7 +224,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		{

 			CreateSolution ();

 			AddProjectToOpenProjects ("Test");

-			var source = new PackageSource ("http://sharpdevelop.net");

+			var source = new PackageSource ("http://monodevelop.net");

 			IPackageManagementProject project = solution.GetProject (source, "Test");

 

 			FakePackageManagementProject expectedProject = fakeProjectFactory.FirstFakeProjectCreated;

@@ -237,7 +237,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		{

 			CreateSolution ();

 			AddProjectToOpenProjects ("Test");

-			var expectedSource = new PackageSource ("http://sharpdevelop.net");

+			var expectedSource = new PackageSource ("http://monodevelop.net");

 			solution.GetProject (expectedSource, "Test");

 

 			PackageSource actualSource = fakeRegisteredPackageRepositories.PackageSourcePassedToCreateRepository;

@@ -713,6 +713,22 @@ namespace MonoDevelop.PackageManagement.Tests
 			Assert.AreEqual (fakeSolutionPackageRepositoryFactory.SolutionPassedToCreateSolutionPackageRepository, fakeSolution);

 			Assert.AreEqual (fakeSolutionPackageRepositoryFactory.FakeSolutionPackageRepository, repository);

 		}

+

+		[Test]

+		public void GetProject_NoRepositorySpecified_CreatesProjectUsingAggregateRepository ()

+		{

+			CreateSolution ();

+			var dotNetProject = new FakeDotNetProject ();

+			AggregateRepository expectedRepository = CreateAggregateRepositoryWithOneRepository ();

+			fakeRegisteredPackageRepositories.CreateAggregateRepositoryAction = () => expectedRepository;

+

+			IPackageManagementProject project = solution.GetProject (dotNetProject);

+

+			IPackageRepository repository = fakeProjectFactory.FirstRepositoryPassedToCreateProject;

+			IPackageManagementProject expectedProject = fakeProjectFactory.FirstFakeProjectCreated;

+			Assert.AreEqual (expectedRepository, repository);

+			Assert.AreEqual (expectedProject, project);

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageOperationMessageTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageOperationMessageTests.cs
index 6f5c077c16..f0e6dd813d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageOperationMessageTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageOperationMessageTests.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReferenceNodeTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReferenceNodeTests.cs
index 3f7609c3d1..09a5d8d0b8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReferenceNodeTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReferenceNodeTests.cs
@@ -45,7 +45,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			bool installPending = false,

 			PackageName updatedPackage = null)

 		{

-			node = new PackageReferenceNode (packageReference, installed, installPending, updatedPackage);

+			node = new PackageReferenceNode (null, packageReference, installed, installPending, updatedPackage);

 		}

 

 		void CreatePackageReference (

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReinstallerTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReinstallerTests.cs
index 06fd381977..51651487dc 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReinstallerTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageReinstallerTests.cs
@@ -58,7 +58,8 @@ namespace MonoDevelop.PackageManagement.Tests
 				null,

 				false);

 

-			var node = new PackageReferenceNode (packageReference, true);

+			var parentNode = new TestableProjectPackagesFolderNode (project.FakeDotNetProject, null);

+			var node = new PackageReferenceNode (parentNode, packageReference, true);

 

 			reinstaller.Run (node);

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageRepositoryCacheTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageRepositoryCacheTests.cs
index 6c02e947bc..58aad3dd12 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageRepositoryCacheTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageRepositoryCacheTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

@@ -62,7 +62,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateCacheUsingPackageSources (fakePackageRepositoryFactory);

 		}

 

-		void CreateCacheUsingPackageSources (ISharpDevelopPackageRepositoryFactory repositoryFactory)

+		void CreateCacheUsingPackageSources (IMonoDevelopPackageRepositoryFactory repositoryFactory)

 		{

 			nuGetPackageSource = new PackageSource ("http://nuget.org", "NuGet");

 			machineCache = new FakePackageRepository ();

@@ -92,10 +92,10 @@ namespace MonoDevelop.PackageManagement.Tests
 		}

 

 		[Test]

-		public void CreateRepository_CacheCastToISharpDevelopPackageRepositoryFactory_CreatesPackageRepositoryUsingPackageRepositoryFactoryPassedInConstructor ()

+		public void CreateRepository_CacheCastToIMonoDevelopPackageRepositoryFactory_CreatesPackageRepositoryUsingPackageRepositoryFactoryPassedInConstructor ()

 		{

 			CreateCache ();

-			var factory = cache as ISharpDevelopPackageRepositoryFactory;

+			var factory = cache as IMonoDevelopPackageRepositoryFactory;

 			IPackageRepository repository = factory.CreateRepository (nuGetPackageSource.Source);

 

 			Assert.AreEqual (fakePackageRepositoryFactory.FakePackageRepository, repository);

@@ -451,7 +451,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			packageSourcesHelper.RegisteredPackageSources.Clear ();

 			var invalidPackageSource = new PackageSource (String.Empty, "InvalidSource");

 			packageSourcesHelper.RegisteredPackageSources.Add (invalidPackageSource);

-			var factory = new SharpDevelopPackageRepositoryFactory ();

+			var factory = new MonoDevelopPackageRepositoryFactory ();

 			CreateCacheUsingPackageSources (factory);

 			IPackageRepository repository = cache.CreateAggregateRepository ();

 			var aggregateRepository = (MonoDevelopAggregateRepository)repository;

@@ -468,7 +468,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			packageSourcesHelper.RegisteredPackageSources.Clear ();

 			var invalidPackageSource = new PackageSource (String.Empty, "InvalidSource");

 			packageSourcesHelper.RegisteredPackageSources.Add (invalidPackageSource);

-			var factory = new SharpDevelopPackageRepositoryFactory ();

+			var factory = new MonoDevelopPackageRepositoryFactory ();

 			CreateCacheUsingPackageSources (factory);

 			IPackageRepository repository = cache.CreateAggregateRepository ();

 			var aggregateRepository = (MonoDevelopAggregateRepository)repository;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageSourceViewModelTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageSourceViewModelTests.cs
index 1790b4c647..1f4727ff65 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageSourceViewModelTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageSourceViewModelTests.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 

@@ -39,7 +39,7 @@ namespace MonoDevelop.PackageManagement.Tests
 

 		void CreatePackageSource ()

 		{

-			CreatePackageSource ("http://sharpdevelop.codeplex.com", "Test");

+			CreatePackageSource ("http://monodevelop.codeplex.com", "Test");

 		}

 

 		void CreatePackageSource (string source, string name)

@@ -49,7 +49,7 @@ namespace MonoDevelop.PackageManagement.Tests
 

 		void CreatePackageSourceWithName (string  name)

 		{

-			CreatePackageSource ("http://sharpdevelop.codeplex.com", name);

+			CreatePackageSource ("http://monodevelop.codeplex.com", name);

 		}

 

 		void  CreatePackageSourceWithSourceUrl (string  sourceUrl)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageViewModelTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageViewModelTests.cs
index b406395815..86800e3cec 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageViewModelTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackageViewModelTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

@@ -221,7 +221,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		public void HasLicenseUrl_PackageHasLicenseUrl_ReturnsTrue ()

 		{

 			CreateViewModel ();

-			fakePackage.LicenseUrl = new Uri ("http://sharpdevelop.com");

+			fakePackage.LicenseUrl = new Uri ("http://monodevelop.com");

 

 			Assert.IsTrue (viewModel.HasLicenseUrl);

 		}

@@ -239,7 +239,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		public void HasProjectUrl_PackageHasProjectUrl_ReturnsTrue ()

 		{

 			CreateViewModel ();

-			fakePackage.ProjectUrl = new Uri ("http://sharpdevelop.com");

+			fakePackage.ProjectUrl = new Uri ("http://monodevelop.com");

 

 			Assert.IsTrue (viewModel.HasProjectUrl);

 		}

@@ -257,7 +257,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		public void HasReportAbuseUrl_PackageHasReportAbuseUrl_ReturnsTrue ()

 		{

 			CreateViewModel ();

-			fakePackage.ReportAbuseUrl = new Uri ("http://sharpdevelop.com");

+			fakePackage.ReportAbuseUrl = new Uri ("http://monodevelop.com");

 

 			Assert.IsTrue (viewModel.HasReportAbuseUrl);

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackagesViewModelTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackagesViewModelTests.cs
index 1dd3518bb4..988738e90d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackagesViewModelTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/PackagesViewModelTests.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;

 using System.ComponentModel;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProcessPackageActionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProcessPackageActionTests.cs
index ef9622d12d..213dbfb3e8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProcessPackageActionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProcessPackageActionTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectHelper.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectHelper.cs
index 0ea0adcad9..64343c5b98 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectHelper.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectHelper.cs
@@ -26,15 +26,14 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

-using MonoDevelop.Core;

 using MonoDevelop.PackageManagement;

+using MonoDevelop.Core;

 using MonoDevelop.Projects;

 using System.Linq;

 

 namespace MonoDevelop.PackageManagement.Tests.Helpers

 {

-	public static class ProjectHelper

+	static class ProjectHelper

 	{

 		public static ISolution CreateSolution ()

 		{

@@ -96,13 +95,13 @@ namespace MonoDevelop.PackageManagement.Tests.Helpers
 

 		public static void AddReference (FakeDotNetProject project, string referenceName, string hintPath = null)

 		{

-			var reference = new ProjectReference (ReferenceType.Assembly, referenceName, hintPath);

+			var reference = ProjectReference.CreateCustomReference (ReferenceType.Assembly, referenceName, hintPath);

 			project.References.Add (reference);

 		}

 

 		public static void AddGacReference (FakeDotNetProject project, string referenceName)

 		{

-			var reference = new ProjectReference (ReferenceType.Package, referenceName);

+			var reference = ProjectReference.CreateAssemblyReference (referenceName);

 			project.References.Add (reference);

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectTargetFrameworkMonitorTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectTargetFrameworkMonitorTests.cs
index 2286de495b..7be5ccceed 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectTargetFrameworkMonitorTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ProjectTargetFrameworkMonitorTests.cs
@@ -310,6 +310,24 @@ namespace MonoDevelop.PackageManagement.Tests
 			Assert.AreEqual (1, eventArgs.Count);

 			Assert.AreEqual (secondProject, eventArgs [0].Project);

 		}

+

+		[Test]

+		public void ProjectTargetFrameworkChanged_ProjectRemovedFromSolutionAndProjectTargetFrameworkChanged_EventDoesNotFire ()

+		{

+			CreateProjectTargetFrameworkMonitor ();

+			FakeDotNetProject originalProject = LoadSolutionWithOneProject ();

+			CaptureProjectTargetFrameworkChangedEvents ();

+			// Ensure IDotNetProject.Equals method is used since a new DotNetProjectProxy is

+			// created for the event so the object instances will be different and just removing

+			// the instance from the list matching the instance is incorrect. 

+			var project = new FakeDotNetProject ();

+			originalProject.EqualsAction = p => p == project;

+			solution.RaiseProjectRemovedEvent (project);

+

+			originalProject.RaiseModifiedEvent (originalProject, targetFrameworkPropertyName);

+

+			Assert.AreEqual (0, eventArgs.Count);

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RecentPackageInfoTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RecentPackageInfoTests.cs
index 0ed79dbc6c..fb35e28ed3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RecentPackageInfoTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RecentPackageInfoTests.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RecentPackageRepositoryTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RecentPackageRepositoryTests.cs
index ab9d358517..923997dae6 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RecentPackageRepositoryTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RecentPackageRepositoryTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReducedPackageOperationsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReducedPackageOperationsTests.cs
index 644f16fa5a..b230cf0802 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReducedPackageOperationsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReducedPackageOperationsTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RegisteredPackageRepositoriesTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RegisteredPackageRepositoriesTests.cs
index 61967dfbe5..d13ffd344b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RegisteredPackageRepositoriesTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RegisteredPackageRepositoriesTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RegisteredPackageSourcesViewModelTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RegisteredPackageSourcesViewModelTests.cs
index bfb9c04719..c793eff96e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RegisteredPackageSourcesViewModelTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RegisteredPackageSourcesViewModelTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

@@ -127,7 +127,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		public void Load_PackageSourceModifiedAfterLoadAndSaveNotCalled_RegisteredPackageSourcesInOptionsUnchanged ()

 		{

 			CreateViewModel ();

-			AddPackageSourceToOptions ("Test", "http://sharpdevelop.com");

+			AddPackageSourceToOptions ("Test", "http://monodevelop.com");

 			viewModel.Load ();

 

 			PackageSourceViewModel packageSourceViewModel = viewModel.PackageSourceViewModels [0];

@@ -135,7 +135,7 @@ namespace MonoDevelop.PackageManagement.Tests
 			packageSourceViewModel.SourceUrl = "changed-url";

 

 			var expectedSources = new PackageSource[] {

-				new PackageSource ("http://sharpdevelop.com", "Test")

+				new PackageSource ("http://monodevelop.com", "Test")

 			};

 

 			PackageSourceCollectionAssert.AreEqual (expectedSources, packageSources);

@@ -145,7 +145,7 @@ namespace MonoDevelop.PackageManagement.Tests
 		public void Save_PackageSourceModifiedAfterLoad_RegisteredPackageSourcesInOptionsUpdated ()

 		{

 			CreateViewModel ();

-			AddPackageSourceToOptions ("Test", "http://sharpdevelop.com");

+			AddPackageSourceToOptions ("Test", "http://monodevelop.com");

 			viewModel.Load ();

 

 			PackageSourceViewModel packageSourceViewModel = viewModel.PackageSourceViewModels [0];

@@ -165,17 +165,17 @@ namespace MonoDevelop.PackageManagement.Tests
 		public void Save_OnePackageSourceAddedAfterLoadAndBeforeSave_TwoRegisteredPackageSourcesInOptions ()

 		{

 			CreateViewModel ();

-			AddPackageSourceToOptions ("Test", "http://sharpdevelop.com/1");

+			AddPackageSourceToOptions ("Test", "http://monodevelop.com/1");

 			viewModel.Load ();

 

-			var newSource = new PackageSource ("http://sharpdevelop.com/2", "Test");

+			var newSource = new PackageSource ("http://monodevelop.com/2", "Test");

 

 			var newPackageSourceViewModel = new PackageSourceViewModel (newSource);

 			viewModel.PackageSourceViewModels.Add (newPackageSourceViewModel);

 

 			viewModel.Save ();

 

-			var expectedSource = new PackageSource ("http://sharpdevelop.com/1", "Test");

+			var expectedSource = new PackageSource ("http://monodevelop.com/1", "Test");

 

 			var expectedSources = new PackageSource[] {

 				expectedSource,

@@ -191,12 +191,12 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateViewModel ();

 			viewModel.Load ();

 			viewModel.NewPackageSourceName = "Test";

-			viewModel.NewPackageSourceUrl = "http://sharpdevelop.com";

+			viewModel.NewPackageSourceUrl = "http://monodevelop.com";

 

 			viewModel.AddPackageSourceCommand.Execute (null);

 

 			var expectedSources = new PackageSource[] {

-				new PackageSource ("http://sharpdevelop.com", "Test")

+				new PackageSource ("http://monodevelop.com", "Test")

 			};

 

 			PackageSourceCollectionAssert.AreEqual (expectedSources, viewModel.PackageSourceViewModels);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReinstallPackageActionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReinstallPackageActionTests.cs
index 188523a129..06943b7899 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReinstallPackageActionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReinstallPackageActionTests.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using MonoDevelop.Projects;

 using NuGet;

@@ -99,12 +99,11 @@ namespace MonoDevelop.PackageManagement.Tests
 		{

 			CreateAction ("MyPackage", "1.2.3.4");

 			FakePackage package = AddPackageToSourceRepository ("MyPackage", "1.2.3.4");

-			var firstReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NewAssembly");

-			var secondReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework");

+			var firstReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NewAssembly");

+			var secondReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

 			project.FakeUninstallPackageAction.ExecuteAction = () => {

-				var referenceBeingRemoved = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework") {

-					LocalCopy = false

-				};

+				var referenceBeingRemoved = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

+				referenceBeingRemoved.LocalCopy = false;

 				packageManagementEvents.OnReferenceRemoving (referenceBeingRemoved);

 			};

 			bool installActionMaintainsLocalCopyReferences = false;

@@ -169,6 +168,18 @@ namespace MonoDevelop.PackageManagement.Tests
 			Assert.IsTrue (fileRemovedResult.Value);

 			Assert.IsNull (fileRemover.FileRemoved);

 		}

+

+		[Test]

+		public void Execute_PackageExistsInSourceRepository_PackageIsInstalledWithoutLicenseAgreementDialogShowns ()

+		{

+			CreateAction ("MyPackage", "1.2.3.4");

+			AddPackageToSourceRepository ("MyPackage", "1.2.3.4");

+

+			action.Execute ();

+

+			Assert.IsTrue (project.LastInstallPackageCreated.IsExecuteCalled);

+			Assert.IsFalse (project.LastInstallPackageCreated.LicensesMustBeAccepted);

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReinstallProjectPackagesActionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReinstallProjectPackagesActionTests.cs
index 61ff6616d5..9fc767cacf 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReinstallProjectPackagesActionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ReinstallProjectPackagesActionTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RestorePackagesActionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RestorePackagesActionTests.cs
index fb19a62571..78dd92bf9f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RestorePackagesActionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/RestorePackagesActionTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NUnit.Framework;

 using NuGet;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SettingProviderTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SettingProviderTests.cs
index 6ce4d4f783..07c464a8f8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SettingProviderTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SettingProviderTests.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SolutionPackageRepositoryPathTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SolutionPackageRepositoryPathTests.cs
index ef40415b0b..058761fc55 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SolutionPackageRepositoryPathTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SolutionPackageRepositoryPathTests.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NUnit.Framework;

 using MonoDevelop.Core;

 using MonoDevelop.PackageManagement.Tests.Helpers;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SolutionPackageRepositoryTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SolutionPackageRepositoryTests.cs
index 7980a7767a..0952b5ca56 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SolutionPackageRepositoryTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/SolutionPackageRepositoryTests.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ThreadSafePackageManagementEventsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ThreadSafePackageManagementEventsTests.cs
index 42810f1dac..9151e6067d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ThreadSafePackageManagementEventsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/ThreadSafePackageManagementEventsTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

@@ -49,10 +49,10 @@ namespace MonoDevelop.PackageManagement.Tests
 			threadSafeEvents = new ThreadSafePackageManagementEvents (unsafeEvents, RunGuiSyncDispatch);

 		}

 

-		void RunGuiSyncDispatch (MessageHandler messageHandler)

+		void RunGuiSyncDispatch (Action action)

 		{

 			isGuiSyncDispatchCalled = true;

-			messageHandler.Invoke ();

+			action.Invoke ();

 		}

 

 		void OnEventHandlerFired (object sender, EventArgs e)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UninstallPackageActionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UninstallPackageActionTests.cs
index 948780a2ab..23ab02a146 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UninstallPackageActionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UninstallPackageActionTests.cs
@@ -26,7 +26,7 @@
 

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

 using NUnit.Framework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateAllPackagesInProjectTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateAllPackagesInProjectTests.cs
index 4d267ceeae..45861805d4 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateAllPackagesInProjectTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateAllPackagesInProjectTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

@@ -47,9 +47,9 @@ namespace MonoDevelop.PackageManagement.Tests
 			updateAllPackagesInProject = new UpdateAllPackagesInProject (fakeProject);

 		}

 

-		void AddPackageToProject (string packageId)

+		void AddPackageToProject (string packageId, string version = "1.0")

 		{

-			var package = new FakePackage (packageId, "1.0");

+			var package = new FakePackage (packageId, version);

 			fakeProject.FakePackagesInReverseDependencyOrder.Add (package);

 		}

 

@@ -227,6 +227,20 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			Assert.IsTrue (update);

 		}

+

+		[Test]

+		public void CreateActions_TwoPackagesInProjectOnePrereleaseOneStable_AllowPrereleaseIsTrueForPrereleasePackage ()

+		{

+			CreateUpdateAllPackagesInProject ();

+			AddPackageToProject ("Test1", "1.0.0-alpha");

+			AddPackageToProject ("Test2", "1.0.0");

+			CallCreateActions ();

+

+			Assert.AreEqual ("Test1", updateActions [0].PackageId);

+			Assert.AreEqual ("Test2", updateActions [1].PackageId);

+			Assert.AreEqual (true, updateActions [0].AllowPrereleaseVersions);

+			Assert.AreEqual (false, updateActions [1].AllowPrereleaseVersions);

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateAllPackagesInSolutionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateAllPackagesInSolutionTests.cs
index d73ffc3db6..6e923e2d59 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateAllPackagesInSolutionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdateAllPackagesInSolutionTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

@@ -49,9 +49,9 @@ namespace MonoDevelop.PackageManagement.Tests
 			updateAllPackagesInSolution = new UpdateAllPackagesInSolution (fakeSolution, fakeSourceRepository);

 		}

 

-		void AddPackageToSolution (string packageId)

+		void AddPackageToSolution (string packageId, string version = "1.0")

 		{

-			var package = new FakePackage (packageId, "1.0");

+			var package = new FakePackage (packageId, version);

 			fakeSolution.FakePackagesInReverseDependencyOrder.Add (package);

 		}

 

@@ -261,6 +261,21 @@ namespace MonoDevelop.PackageManagement.Tests
 

 			Assert.IsTrue (updateAllPackagesInSolution.UpdateDependencies);

 		}

+

+		[Test]

+		public void CreateActions_TwoPackagesOneStableOnePrereleaseInSolutionWithOneProject_ReturnsTwoActionsWithAllowPrereleaseTrueForPrereleasePackage ()

+		{

+			CreateUpdateAllPackagesInSolution ();

+			FakePackageManagementProject project = AddProjectToSolution ("MyProject");

+			AddPackageToSolution ("Test1", "1.0.0-alpha");

+			AddPackageToSolution ("Test2", "1.0");

+			CallCreateActions ();

+

+			Assert.AreEqual ("Test1", project.FirstFakeUpdatePackageActionCreated.PackageId);

+			Assert.AreEqual (true, project.FirstFakeUpdatePackageActionCreated.AllowPrereleaseVersions);

+			Assert.AreEqual ("Test2", project.FakeUpdatePackageActionsCreated [1].PackageId);

+			Assert.AreEqual (false, project.FakeUpdatePackageActionsCreated[1].AllowPrereleaseVersions);

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatePackageActionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatePackageActionTests.cs
index 15c0419c37..df84c7bd79 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatePackageActionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatePackageActionTests.cs
@@ -28,7 +28,6 @@ using System;
 using System.Collections.Generic;

 using System.IO;

 using System.Linq;

-using ICSharpCode.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

@@ -490,12 +489,11 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateSolution ();

 			fakeProject.FakePackages.Add (new FakePackage ("Test", "1.0"));

 			action.Package = new FakePackage ("Test", "1.1");

-			var firstReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NewAssembly");

-			var secondReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework");

+			var firstReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NewAssembly");

+			var secondReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

 			fakeProject.UpdatePackageAction = (p, a) => {

-				var referenceBeingRemoved = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework") {

-					LocalCopy = true

-				};

+				var referenceBeingRemoved = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

+				referenceBeingRemoved.LocalCopy = true;

 				packageManagementEvents.OnReferenceRemoving (referenceBeingRemoved);

 				packageManagementEvents.OnReferenceAdding (firstReferenceBeingAdded);

 				packageManagementEvents.OnReferenceAdding (secondReferenceBeingAdded);

@@ -512,12 +510,11 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateSolution ();

 			fakeProject.FakePackages.Add (new FakePackage ("Test", "1.0"));

 			action.Package = new FakePackage ("Test", "1.1");

-			var firstReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NewAssembly");

-			var secondReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework");

+			var firstReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NewAssembly");

+			var secondReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

 			fakeProject.UpdatePackageAction = (p, a) => {

-				var referenceBeingRemoved = new ProjectReference (ReferenceType.Assembly, "nunit.framework") {

-					LocalCopy = true

-				};

+				var referenceBeingRemoved = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "nunit.framework");

+				referenceBeingRemoved.LocalCopy = true;

 				packageManagementEvents.OnReferenceRemoving (referenceBeingRemoved);

 				packageManagementEvents.OnReferenceAdding (firstReferenceBeingAdded);

 				packageManagementEvents.OnReferenceAdding (secondReferenceBeingAdded);

@@ -534,14 +531,12 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateSolution ();

 			fakeProject.FakePackages.Add (new FakePackage ("Test", "1.0"));

 			action.Package = new FakePackage ("Test", "1.1");

-			var firstReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NewAssembly") {

-				LocalCopy = true

-			};

-			var secondReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework");

+			var firstReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NewAssembly");

+			firstReferenceBeingAdded.LocalCopy = true;

+			var secondReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

 			fakeProject.UpdatePackageAction = (p, a) => {

-				var referenceBeingRemoved = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework") {

-					LocalCopy = false

-				};

+				var referenceBeingRemoved = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

+				referenceBeingRemoved.LocalCopy = false;

 				packageManagementEvents.OnReferenceRemoving (referenceBeingRemoved);

 				packageManagementEvents.OnReferenceAdding (firstReferenceBeingAdded);

 				packageManagementEvents.OnReferenceAdding (secondReferenceBeingAdded);

@@ -558,14 +553,12 @@ namespace MonoDevelop.PackageManagement.Tests
 			CreateSolution ();

 			fakeProject.FakePackages.Add (new FakePackage ("Test", "1.0"));

 			action.Package = new FakePackage ("Test", "1.1");

-			var firstReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NewAssembly") {

-				LocalCopy = true

-			};

-			var secondReferenceBeingAdded = new ProjectReference (ReferenceType.Assembly, "NUnit.Framework");

+			var firstReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NewAssembly");

+			firstReferenceBeingAdded.LocalCopy = true;

+			var secondReferenceBeingAdded = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "NUnit.Framework");

 			fakeProject.UpdatePackageAction = (p, a) => {

-				var referenceBeingRemoved = new ProjectReference (ReferenceType.Assembly, "nunit.framework") {

-					LocalCopy = false

-				};

+				var referenceBeingRemoved = ProjectReference.CreateCustomReference (ReferenceType.Assembly, "nunit.framework");

+				referenceBeingRemoved.LocalCopy = false;

 				packageManagementEvents.OnReferenceRemoving (referenceBeingRemoved);

 				packageManagementEvents.OnReferenceAdding (firstReferenceBeingAdded);

 				packageManagementEvents.OnReferenceAdding (secondReferenceBeingAdded);

@@ -651,6 +644,35 @@ namespace MonoDevelop.PackageManagement.Tests
 			Assert.AreEqual (expectedFileName, fileRemover.FileRemoved);

 			Assert.IsFalse (fileRemovedResult.Value);

 		}

+

+		[Test]

+		public void NewInstance_LicensesMustBeAccepted_TrueByDefault ()

+		{

+			CreateSolution ();

+

+			Assert.IsTrue (action.LicensesMustBeAccepted);

+		}

+

+		[Test]

+		public void Execute_UpdateIfPackageDoesNotExistInProjectSetToFalseAndPackageDoesNotExistInProjectAndPackageRequiresLicenseAcceptance_PackageLicenseAcceptanceIsNotRequested ()

+		{

+			CreateSolution ();

+			var package = new FakePackage ("Test") {

+				RequireLicenseAcceptance = true

+			};

+			action.Package = package;

+			var operation = new FakePackageOperation (package, PackageAction.Install);

+			action.PackageId = package.Id;

+			action.PackageVersion = package.Version;

+			fakeProject.FakeInstallOperations.Add (operation);

+			action.UpdateIfPackageDoesNotExistInProject = false;

+			action.Execute ();

+

+			bool updated = fakeProject.IsUpdatePackageCalled;

+

+			Assert.IsFalse (updated);

+			Assert.IsNull (action.LicenseAcceptanceService.PackagesAccepted);

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesInSolutionTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesInSolutionTests.cs
index a67593fd7c..0a0a83eed6 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesInSolutionTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesInSolutionTests.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NUnit.Framework;

@@ -588,6 +588,103 @@ namespace MonoDevelop.PackageManagement.Tests
 			Assert.AreEqual ("MyPackage", updatedPackages.GetPackages ().First ().Id);

 			Assert.AreEqual ("1.8", updatedPackages.GetPackages ().First ().Version.ToString ());

 		}

+

+		[Test]

+		public void CheckForUpdates_ProjectHasPreReleasePackageWhichHasUpdatedPrereleasePackage_OnePrereleaseUpdateFound ()

+		{

+			CreateUpdatedPackagesInSolution ();

+			FakePackageManagementProject project = AddProjectToSolution ();

+			project.AddPackageReference ("MyPackage", "1.0.1-alpha");

+			AddUpdatedPackageToAggregateSourceRepository ("MyPackage", "1.0.1-beta");

+			updatedPackagesInSolution.CheckForUpdates ();

+

+			UpdatedPackagesInProject updatedPackages = updatedPackagesInSolution.GetUpdatedPackages (project.Project);

+

+			Assert.AreEqual (1, updatedPackages.GetPackages ().Count ());

+			Assert.AreEqual ("MyPackage", updatedPackages.GetPackages ().First ().Id);

+			Assert.AreEqual ("1.0.1-beta", updatedPackages.GetPackages ().First ().Version.ToString ());

+		}

+

+		[Test]

+		public void CheckForUpdates_ProjectHasPreReleasePackageWhichHasUpdatedStablePackage_OneStableUpdateFound ()

+		{

+			CreateUpdatedPackagesInSolution ();

+			FakePackageManagementProject project = AddProjectToSolution ();

+			project.AddPackageReference ("MyPackage", "1.0.1-alpha");

+			AddUpdatedPackageToAggregateSourceRepository ("MyPackage", "1.0.1");

+			updatedPackagesInSolution.CheckForUpdates ();

+

+			UpdatedPackagesInProject updatedPackages = updatedPackagesInSolution.GetUpdatedPackages (project.Project);

+

+			Assert.AreEqual (1, updatedPackages.GetPackages ().Count ());

+			Assert.AreEqual ("MyPackage", updatedPackages.GetPackages ().First ().Id);

+			Assert.AreEqual ("1.0.1", updatedPackages.GetPackages ().First ().Version.ToString ());

+		}

+

+		[Test]

+		public void CheckForUpdates_ProjectHasStableAndPreReleasePackagesBothWithUpdatese_TwoUpdatesFound ()

+		{

+			CreateUpdatedPackagesInSolution ();

+			FakePackageManagementProject project = AddProjectToSolution ();

+			project.AddPackageReference ("MyPackage", "1.0.1-alpha");

+			project.AddPackageReference ("AnotherPackage", "1.0");

+			AddUpdatedPackageToAggregateSourceRepository ("MyPackage", "1.0.1-beta");

+			AddUpdatedPackageToAggregateSourceRepository ("AnotherPackage", "1.1");

+			updatedPackagesInSolution.CheckForUpdates ();

+

+			UpdatedPackagesInProject updatedPackages = updatedPackagesInSolution.GetUpdatedPackages (project.Project);

+

+			Assert.AreEqual (2, updatedPackages.GetPackages ().Count ());

+			Assert.AreEqual ("AnotherPackage", updatedPackages.GetPackages ().First ().Id);

+			Assert.AreEqual ("1.1", updatedPackages.GetPackages ().First ().Version.ToString ());

+			Assert.AreEqual ("MyPackage", updatedPackages.GetPackages ().Last ().Id);

+			Assert.AreEqual ("1.0.1-beta", updatedPackages.GetPackages ().Last ().Version.ToString ());

+		}

+

+		[Test]

+		public void CheckForUpdates_ProjectHasStablePackageWhichHasUpdatedPrereleasePackage_NoUpdatesFound ()

+		{

+			CreateUpdatedPackagesInSolution ();

+			FakePackageManagementProject project = AddProjectToSolution ();

+			project.AddPackageReference ("MyPackage", "1.0.1");

+			AddUpdatedPackageToAggregateSourceRepository ("MyPackage", "1.1.0-alpha");

+			updatedPackagesInSolution.CheckForUpdates ();

+

+			UpdatedPackagesInProject updatedPackages = updatedPackagesInSolution.GetUpdatedPackages (project.Project);

+

+			Assert.AreEqual (0, updatedPackages.GetPackages ().Count ());

+		}

+

+		[Test]

+		public void GetUpdatedPackages_UpdatingThreeOldAndroidPackagesInstallsOneAndUpdatesOneAndRemovesOneWithOneInstall_NoUpdatesRemain ()

+		{

+			CreateUpdatedPackagesInSolution ();

+			FakePackageManagementProject project = AddProjectToSolution ();

+			project.AddPackageReference ("Xamarin.Android.Support.v13", "20.0.0.4");

+			project.AddPackageReference ("Xamarin.Android.Support.v4", "20.0.0.4");

+			project.AddPackageReference ("Xamarin.Android.Support.v7.AppCompat", "20.0.0.2");

+			AddUpdatedPackageToAggregateSourceRepository ("Xamarin.Android.Support.v13", "23.1.1.0");

+			AddUpdatedPackageToAggregateSourceRepository ("Xamarin.Android.Support.v4", "23.1.1.0");

+			AddUpdatedPackageToAggregateSourceRepository ("Xamarin.Android.Support.v7.AppCompat", "23.1.1.0");

+			updatedPackagesInSolution.CheckForUpdates ();

+			int originalUpdatesAvailable = updatedPackagesInSolution

+				.GetUpdatedPackages (project.Project)

+				.GetPackages ()

+				.Count ();

+			var task = taskFactory.FakeTasksCreated [0] as FakeTask<CheckForUpdatesTask>;

+			task.ExecuteTaskButNotContinueWith ();

+			project.PackageReferences.Clear ();

+			project.AddPackageReference ("Xamarin.Android.Support.v4", "23.1.1.0");

+			project.AddPackageReference ("Xamarin.Android.Support.v7.AppCompat", "23.1.1.0");

+			var installedPackage = FakePackage.CreatePackageWithVersion ("Xamarin.Android.Support.v4", "23.1.1.0");

+			packageManagementEvents.OnParentPackageInstalled (installedPackage, project);

+			task.ExecuteContinueWith ();

+

+			UpdatedPackagesInProject updatedPackages = updatedPackagesInSolution.GetUpdatedPackages (project.Project);

+

+			Assert.AreEqual (3, originalUpdatesAvailable);

+			Assert.AreEqual (0, updatedPackages.GetPackages ().Count ());

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesTests.cs
index 31407117ee..9b4c2316c9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UpdatedPackagesTests.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 using System.Runtime.Versioning;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using NUnit.Framework;

 using MonoDevelop.PackageManagement.Tests.Helpers;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UserAgentGeneratorForRepositoryRequestsTests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UserAgentGeneratorForRepositoryRequestsTests.cs
index 6a729abaa7..74da61618b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UserAgentGeneratorForRepositoryRequestsTests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests/UserAgentGeneratorForRepositoryRequestsTests.cs
@@ -26,7 +26,7 @@
 

 using System;

 using System.Net;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.PackageManagement.Tests.Helpers;

 using NuGet;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
index 2c2bb34b98..caa93c4622 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml
@@ -7,6 +7,7 @@
 	</Runtime>

 

 	<Extension path = "/MonoDevelop/Ide/Commands">

+		<Category _name = "NuGet" id = "NuGet">

 		<Command

 			id = "MonoDevelop.PackageManagement.Commands.AddNuGetPackages"

 			_description = "Add NuGet packages to the project"

@@ -54,6 +55,7 @@
 			_description="Retargets all packages"

 			_label="Re_target"

 			defaultHandler="MonoDevelop.PackageManagement.Commands.ReinstallAllPackagesInProjectHandler" />

+		</Category>

 	</Extension>

 	

 	<Extension path="/MonoDevelop/Ide/MainMenu/Project">

@@ -97,7 +99,7 @@
 	</Extension>

 	

 	<Extension path="/MonoDevelop/Core/StockIcons">

-		<StockIcon stockid="md-nuget-package" resource="reference-48.png" />

+		<StockIcon stockid="md-nuget-package" resource="package-48.png" />

 		<StockIcon stockid="md-nuget-package-source" resource="package-source-32.png" size="Dnd" />

 		<StockIcon stockid="md-prefs-package" resource="prefs-package-16.png" size="Menu" />

 		<StockIcon stockid="md-prefs-package-source" resource="prefs-package-source-16.png" size="Menu" />

@@ -146,7 +148,11 @@
 		<Class class="MonoDevelop.PackageManagement.SearchPackagesSearchCategory" />

 	</Extension>

 

-	<Extension path="/MonoDevelop/ProjectModel/MSBuildExtensions">

+	<Extension path="/MonoDevelop/ProjectModel/ProjectModelExtensions">

 		<Class class="MonoDevelop.PackageManagement.PackageManagementMSBuildExtension" />

 	</Extension>

+	<!--

+	<Extension path="/MonoDevelop/Refactoring/CodeDiagnosticProvider">

+		<Class class="MonoDevelop.PackageManagement.Refactoring.PackageCodeDiagnosticProvider" />

+	</Extension>-->

 </ExtensionModel>

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
index e1673e7ae1..ffb8d42e5f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
@@ -115,10 +115,6 @@
     <Compile Include="MonoDevelop.PackageManagement\IRegisteredPackageRepositories.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ISelectProjectsService.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ISettingsFactory.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\ISharpDevelopPackageManager.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\ISharpDevelopPackageRepositoryFactory.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\ISharpDevelopProjectManager.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\ISharpDevelopProjectSystemFactory.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ISolutionPackageRepository.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ISolutionPackageRepositoryFactory.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ITask.cs" />
@@ -159,7 +155,7 @@
     <Compile Include="MonoDevelop.PackageManagement\RecentPackagesViewModel.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ReducedPackageOperations.cs" />
     <Compile Include="MonoDevelop.PackageManagement\RegisteredPackageSourcesViewModel.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\RemovedPackageReferenceMonitor.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\PackageReferenceMonitor.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ResolveFileConflictEventArgs.cs" />
     <Compile Include="MonoDevelop.PackageManagement\SelectedProjectsForInstalledPackages.cs" />
     <Compile Include="MonoDevelop.PackageManagement\SelectedProjectsForUpdatedPackages.cs" />
@@ -194,7 +190,6 @@
     <Compile Include="MonoDevelop.PackageManagement\ProcessPackageAction.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ProcessPackageOperationsAction.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ProjectBrowserUpdater.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\ProjectExtensions.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ProjectTargetFramework.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ProjectTemplatePackageRepositoryCache.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ProjectTemplatePackageSettingsFileName.cs" />
@@ -207,12 +202,6 @@
     <Compile Include="MonoDevelop.PackageManagement\RegisteredProjectTemplatePackageSources.cs" />
     <Compile Include="MonoDevelop.PackageManagement\SettingsFactory.cs" />
     <Compile Include="MonoDevelop.PackageManagement\MonoDevelopHttpUserAgent.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\SharpDevelopPackageManager.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\SharpDevelopPackageManagerFactory.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\SharpDevelopPackageRepositoryFactory.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\SharpDevelopProjectManager.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\SharpDevelopProjectSystem.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\SharpDevelopProjectSystemFactory.cs" />
     <Compile Include="MonoDevelop.PackageManagement\SolutionExtensions.cs" />
     <Compile Include="MonoDevelop.PackageManagement\SolutionPackageRepository.cs" />
     <Compile Include="MonoDevelop.PackageManagement\SolutionPackageRepositoryFactory.cs" />
@@ -285,7 +274,6 @@
     <Compile Include="MonoDevelop.PackageManagement\PackageRestoreRunner.cs" />
     <Compile Include="MonoDevelop.PackageManagement.Gui\PackageCellView.cs" />
     <Compile Include="MonoDevelop.PackageManagement\SearchPackagesSearchCategory.cs" />
-    <Compile Include="MonoDevelop.PackageManagement\SearchPackagesDataSource.cs" />
     <Compile Include="MonoDevelop.PackageManagement.Gui\AddPackagesDialogRunner.cs" />
     <Compile Include="MonoDevelop.PackageManagement.Commands\ProjectPackagesFolderNodeCommandHandler.cs" />
     <Compile Include="MonoDevelop.PackageManagement.NodeBuilders\ProjectReferenceNodeBuilderExtension.cs" />
@@ -300,6 +288,7 @@
     </Compile>
     <Compile Include="MonoDevelop.PackageManagement.Gui\DialogExtensions.cs" />
     <Compile Include="MonoDevelop.PackageManagement.Gui\PackageCellViewEventArgs.cs" />
+    <Compile Include="MonoDevelop.PackageManagement.Gui\Styles.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ImageLoader.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ImageLoadedEventArgs.cs" />
     <Compile Include="MonoDevelop.PackageManagement\PackageSourceViewModelChecker.cs" />
@@ -366,6 +355,7 @@
     <Compile Include="MonoDevelop.PackageManagement\EnsureNuGetPackageBuildImportsTargetUpdater.cs" />
     <Compile Include="MonoDevelop.PackageManagement\CheckForUpdatesTaskRunner.cs" />
     <Compile Include="MonoDevelop.PackageManagement\CheckForUpdatesTask.cs" />
+    <Compile Include="MonoDevelop.PackageManagement.Refactoring\PackageCodeDiagnosticProvider.cs" />
     <Compile Include="MonoDevelop.PackageManagement\ProjectReloadedEventArgs.cs" />
     <Compile Include="MonoDevelop.PackageManagement\OpenPackageReadmeMonitor.cs" />
     <Compile Include="MonoDevelop.PackageManagement\IOpenPackageReadMeMonitor.cs" />
@@ -375,6 +365,20 @@
     <Compile Include="MonoDevelop.PackageManagement\LocalCopyReferenceMaintainer.cs" />
     <Compile Include="MonoDevelop.PackageManagement\DotNetSolutionEventArgs.cs" />
     <Compile Include="MonoDevelop.PackageManagement\DotNetProjectImportEventArgs.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\IMonoDevelopProjectManager.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\IMonoDevelopPackageManager.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\MonoDevelopPackageManagerFactory.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\IMonoDevelopPackageRepositoryFactory.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\IMonoDevelopProjectSystemFactory.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\MonoDevelopPackageRepositoryFactory.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\MonoDevelopPackageManager.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\MonoDevelopProjectManager.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\MonoDevelopProjectSystem.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\MonoDevelopProjectSystemFactory.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\PackageManagementBackgroundDispatcher.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\PackageManagementSolutionProjectService.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\NuGetPackageNewImportsHandler.cs" />
+    <Compile Include="MonoDevelop.PackageManagement\INuGetPackageNewImportsHandler.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDevelop.PackageManagement.addin.xml" />
@@ -387,25 +391,97 @@
     <EmbeddedResource Include="icons\package-source-32%402x.png">
       <LogicalName>package-source-32@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-source-32~dark.png">
+      <LogicalName>package-source-32~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-source-32~dark%402x.png">
+      <LogicalName>package-source-32~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-source-32~sel.png">
+      <LogicalName>package-source-32~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-source-32~sel%402x.png">
+      <LogicalName>package-source-32~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-source-32~dark~sel.png">
+      <LogicalName>package-source-32~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-source-32~dark~sel%402x.png">
+      <LogicalName>package-source-32~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-package-16.png">
       <LogicalName>prefs-package-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-package-16%402x.png">
       <LogicalName>prefs-package-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-16~dark.png">
+      <LogicalName>prefs-package-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-16~dark%402x.png">
+      <LogicalName>prefs-package-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-16~sel.png">
+      <LogicalName>prefs-package-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-16~sel%402x.png">
+      <LogicalName>prefs-package-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-16~dark~sel.png">
+      <LogicalName>prefs-package-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-16~dark~sel%402x.png">
+      <LogicalName>prefs-package-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-package-source-16.png">
       <LogicalName>prefs-package-source-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-package-source-16%402x.png">
       <LogicalName>prefs-package-source-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-source-16~dark.png">
+      <LogicalName>prefs-package-source-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-source-16~dark%402x.png">
+      <LogicalName>prefs-package-source-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-source-16~sel.png">
+      <LogicalName>prefs-package-source-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-source-16~sel%402x.png">
+      <LogicalName>prefs-package-source-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-source-16~dark~sel.png">
+      <LogicalName>prefs-package-source-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-package-source-16~dark~sel%402x.png">
+      <LogicalName>prefs-package-source-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="icons\reference-48.png">
-      <LogicalName>reference-48.png</LogicalName>
+    <EmbeddedResource Include="icons\package-48.png">
+      <LogicalName>package-48.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\reference-48%402x.png">
-      <LogicalName>reference-48@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\package-48%402x.png">
+      <LogicalName>package-48@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~dark.png">
+      <LogicalName>package-48~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~dark%402x.png">
+      <LogicalName>package-48~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~sel.png">
+      <LogicalName>package-48~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~sel%402x.png">
+      <LogicalName>package-48~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~dark~sel.png">
+      <LogicalName>package-48~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-48~dark~sel%402x.png">
+      <LogicalName>package-48~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -415,11 +491,6 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
-      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
-      <Name>MonoDevelop.Ide</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -440,6 +511,16 @@
       <Name>ICSharpCode.NRefactory</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
+      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
+      <Name>MonoDevelop.Ide</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\MonoDevelop.Refactoring\MonoDevelop.Refactoring.csproj">
+      <Project>{100568FC-F4E8-439B-94AD-41D11724E45B}</Project>
+      <Name>MonoDevelop.Refactoring</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="MonoDevelop.PackageManagement.NodeBuilders\" />
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AcceptLicensesEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AcceptLicensesEventArgs.cs
index 4f4eeeedde..1ba27e9429 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AcceptLicensesEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AcceptLicensesEventArgs.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class AcceptLicensesEventArgs : EventArgs

+	internal class AcceptLicensesEventArgs : EventArgs

 	{

 		public AcceptLicensesEventArgs(IEnumerable<IPackage> packages)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AggregateExceptionErrorMessage.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AggregateExceptionErrorMessage.cs
index c8e33a8997..35a27c720b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AggregateExceptionErrorMessage.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AggregateExceptionErrorMessage.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class AggregateExceptionErrorMessage

+	internal class AggregateExceptionErrorMessage

 	{

 		AggregateException ex;

 		StringBuilder errorMessage = new StringBuilder();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AvailablePackagesViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AvailablePackagesViewModel.cs
index 1af600c304..9e3a3b2a80 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AvailablePackagesViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/AvailablePackagesViewModel.cs
@@ -34,9 +34,9 @@ using MonoDevelop.PackageManagement;
 using NuGet;

 using MonoDevelop.Core;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class AvailablePackagesViewModel : PackagesViewModel

+	internal class AvailablePackagesViewModel : PackagesViewModel

 	{

 		ISolutionPackageRepository solutionPackageRepository;

 		IPackageRepository repository;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/BackgroundPackageActionRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/BackgroundPackageActionRunner.cs
index 258e102084..49c4b94f00 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/BackgroundPackageActionRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/BackgroundPackageActionRunner.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 using MonoDevelop.Projects;

@@ -35,7 +35,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class BackgroundPackageActionRunner : IBackgroundPackageActionRunner

+	internal class BackgroundPackageActionRunner : IBackgroundPackageActionRunner

 	{

 		static MonoDevelop.Core.Instrumentation.Counter InstallPackageCounter = MonoDevelop.Core.Instrumentation.InstrumentationService.CreateCounter ("Package Installed", "Package Management", id:"PackageManagement.Package.Installed");

 		static MonoDevelop.Core.Instrumentation.Counter UninstallPackageCounter = MonoDevelop.Core.Instrumentation.InstrumentationService.CreateCounter ("Package Uninstalled", "Package Management", id:"PackageManagement.Package.Uninstalled");

@@ -79,7 +79,13 @@ namespace MonoDevelop.PackageManagement
 			AddInstallActionsToPendingQueue (actions);

 			packageManagementEvents.OnPackageOperationsStarting ();

 			runCount++;

-			BackgroundDispatch (() => TryRunActionsWithProgressMonitor (progressMessage, actions.ToList ()));

+

+			List<IPackageAction> actionsList = actions.ToList ();

+			BackgroundDispatch (() => {

+				TryRunActionsWithProgressMonitor (progressMessage, actionsList);

+				actionsList = null;

+				progressMessage = null;

+			});

 		}

 

 		void AddInstallActionsToPendingQueue (IEnumerable<IPackageAction> actions)

@@ -89,14 +95,6 @@ namespace MonoDevelop.PackageManagement
 			}

 		}

 

-		public void RunAndWait (ProgressMonitorStatusMessage progressMessage, IEnumerable<IPackageAction> actions)

-		{

-			AddInstallActionsToPendingQueue (actions);

-			packageManagementEvents.OnPackageOperationsStarting ();

-			runCount++;

-			BackgroundDispatchAndWait (() => TryRunActionsWithProgressMonitor (progressMessage, actions.ToList ()));

-		}

-

 		void TryRunActionsWithProgressMonitor (ProgressMonitorStatusMessage progressMessage, IList<IPackageAction> actions)

 		{

 			try {

@@ -110,7 +108,7 @@ namespace MonoDevelop.PackageManagement
 

 		void RunActionsWithProgressMonitor (ProgressMonitorStatusMessage progressMessage, IList<IPackageAction> installPackageActions)

 		{

-			using (IProgressMonitor monitor = progressMonitorFactory.CreateProgressMonitor (progressMessage.Status)) {

+			using (ProgressMonitor monitor = progressMonitorFactory.CreateProgressMonitor (progressMessage.Status)) {

 				using (PackageManagementEventsMonitor eventMonitor = CreateEventMonitor (monitor)) {

 					try {

 						monitor.BeginTask (null, installPackageActions.Count);

@@ -130,20 +128,20 @@ namespace MonoDevelop.PackageManagement
 			}

 		}

 

-		PackageManagementEventsMonitor CreateEventMonitor (IProgressMonitor monitor)

+		PackageManagementEventsMonitor CreateEventMonitor (ProgressMonitor monitor)

 		{

 			return CreateEventMonitor (monitor, packageManagementEvents, progressProvider);

 		}

 

 		protected virtual PackageManagementEventsMonitor CreateEventMonitor (

-			IProgressMonitor monitor,

+			ProgressMonitor monitor,

 			IPackageManagementEvents packageManagementEvents,

 			IProgressProvider progressProvider)

 		{

 			return new PackageManagementEventsMonitor (monitor, packageManagementEvents, progressProvider);

 		}

 

-		void RunActionsWithProgressMonitor (IProgressMonitor monitor, IList<IPackageAction> packageActions)

+		void RunActionsWithProgressMonitor (ProgressMonitor monitor, IList<IPackageAction> packageActions)

 		{

 			foreach (IPackageAction action in packageActions) {

 				action.Execute ();

@@ -216,26 +214,21 @@ namespace MonoDevelop.PackageManagement
 

 		public void ShowError (ProgressMonitorStatusMessage progressMessage, string error)

 		{

-			using (IProgressMonitor monitor = progressMonitorFactory.CreateProgressMonitor (progressMessage.Status)) {

+			using (ProgressMonitor monitor = progressMonitorFactory.CreateProgressMonitor (progressMessage.Status)) {

 				monitor.Log.WriteLine (error);

 				monitor.ReportError (progressMessage.Error, null);

 				monitor.ShowPackageConsole ();

 			}

 		}

 

-		protected virtual void BackgroundDispatch (MessageHandler handler)

+		protected virtual void BackgroundDispatch (Action action)

 		{

-			DispatchService.BackgroundDispatch (handler);

+			PackageManagementBackgroundDispatcher.Dispatch (action);

 		}

-

-		protected virtual void BackgroundDispatchAndWait (MessageHandler handler)

-		{

-			DispatchService.BackgroundDispatchAndWait (handler);

-		}

-

-		protected virtual void GuiDispatch (MessageHandler handler)

+
+		protected virtual void GuiDispatch (Action handler)
 		{

-			DispatchService.GuiDispatch (handler);

+			Runtime.RunInMainThread (handler);

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatedPackagesAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatedPackagesAction.cs
index 96f915c177..bdc748dc10 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatedPackagesAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatedPackagesAction.cs
@@ -25,12 +25,12 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class CheckForUpdatedPackagesAction : IPackageAction

+	internal class CheckForUpdatedPackagesAction : IPackageAction

 	{

 		IUpdatedPackagesInSolution updatedPackagesInSolution;

 

@@ -54,7 +54,7 @@ namespace MonoDevelop.PackageManagement
 		{

 			// Queue the check for updates with the background dispatcher so

 			// the NuGet addin does not create another separate Package Console.

-			DispatchService.BackgroundDispatch (() => {

+			PackageManagementBackgroundDispatcher.Dispatch (() => {

 				updatedPackagesInSolution.CheckForUpdates ();

 			});

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatesTask.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatesTask.cs
index d59e6517f8..45b7375059 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatesTask.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatesTask.cs
@@ -27,12 +27,12 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class CheckForUpdatesTask : IDisposable

+	internal class CheckForUpdatesTask : IDisposable

 	{

 		UpdatedPackagesInSolution updatedPackagesInSolution;

 		List<IPackageManagementProject> projects;

@@ -61,15 +61,18 @@ namespace MonoDevelop.PackageManagement
 					projectsWithUpdatedPackages.Add (updatedPackages);

 				}

 			}

+

+			projects.Clear ();

+

+			if (disposed) {

+				projectsWithUpdatedPackages.Clear ();

+			}

 		}

 

 		public void CheckForUpdatesCompleted ()

 		{

-			updatedPackagesInSolution.CheckForUpdatesCompleted (this);

-		}

-

-		public IEnumerable<UpdatedPackagesInProject> ProjectsWithUpdatedPackages {

-			get { return projectsWithUpdatedPackages; }

+			updatedPackagesInSolution.CheckForUpdatesCompleted (projectsWithUpdatedPackages);

+			projectsWithUpdatedPackages.Clear ();

 		}

 

 		public void Dispose ()

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatesTaskRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatesTaskRunner.cs
index c323d30246..c2149758ef 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatesTaskRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatesTaskRunner.cs
@@ -25,13 +25,13 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class CheckForUpdatesTaskRunner : IDisposable

+	internal class CheckForUpdatesTaskRunner : IDisposable

 	{

 		ITaskFactory taskFactory;

 		CheckForUpdatesTask currentCheckForUpdatesTask;

@@ -132,9 +132,9 @@ namespace MonoDevelop.PackageManagement
 			return taskToCompare == task;

 		}

 

-		protected virtual void GuiBackgroundDispatch (MessageHandler handler)

+		protected virtual void GuiBackgroundDispatch (Action action)

 		{

-			DispatchService.BackgroundDispatch (handler);

+			PackageManagementBackgroundDispatcher.Dispatch (action);

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ConfigSettingsFileSystem.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ConfigSettingsFileSystem.cs
index 8e656126b1..b772683c12 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ConfigSettingsFileSystem.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ConfigSettingsFileSystem.cs
@@ -32,9 +32,9 @@ using MonoDevelop.PackageManagement;
 using MonoDevelop.Projects;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ConfigSettingsFileSystem : PhysicalFileSystem

+	internal class ConfigSettingsFileSystem : PhysicalFileSystem

 	{

 		ConfigSettingsFileSystem(string root)

 			: base(root)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DefaultProjectTemplatePackageSource.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DefaultProjectTemplatePackageSource.cs
index bb3180a475..8bb65f4ad9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DefaultProjectTemplatePackageSource.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DefaultProjectTemplatePackageSource.cs
@@ -29,9 +29,9 @@ using System;
 using System.IO;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class DefaultProjectTemplatePackageSource

+	internal class DefaultProjectTemplatePackageSource

 	{

 		PackageSource packageSource;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DelegateCommand.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DelegateCommand.cs
index fa114d2128..bba2b1b012 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DelegateCommand.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DelegateCommand.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class DelegateCommand : ICommand

+	internal class DelegateCommand : ICommand

 	{

 		Action<object> execute;

 		Predicate<object> canExecute;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectEventArgs.cs
index 42572cc64c..9cd4e3406b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectEventArgs.cs
@@ -29,7 +29,7 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class DotNetProjectEventArgs : EventArgs

+	internal class DotNetProjectEventArgs : EventArgs

 	{

 		public DotNetProjectEventArgs (IDotNetProject project)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectExtensions.cs
index 13c5aefb37..38ba1cae5f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectExtensions.cs
@@ -34,9 +34,9 @@ using MonoDevelop.PackageManagement;
 using MonoDevelop.Projects;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class DotNetProjectExtensions

+	internal static class DotNetProjectExtensions

 	{

 		public static readonly Guid WebApplication = Guid.Parse("{349C5851-65DF-11DA-9384-00065B846F21}");

 		public static readonly Guid WebSite = Guid.Parse("{E24C65DC-7377-472B-9ABA-BC803B73C61A}");

@@ -47,7 +47,7 @@ namespace ICSharpCode.PackageManagement
 		{

 			return project.HasProjectType(WebApplication) || project.HasProjectType(WebSite);

 		}

-		

+

 		public static bool HasProjectType(this IDotNetProject project, Guid projectTypeGuid)

 		{

 			foreach (string guid in project.GetProjectTypeGuids()) {

@@ -57,13 +57,13 @@ namespace ICSharpCode.PackageManagement
 			}

 			return false;

 		}

-		

+

 		public static string[] GetProjectTypeGuids(this IDotNetProject project)

 		{

 			string projectTypeGuids = project.GetProjectTypeGuidPropertyValue();

 			return projectTypeGuids.Split(new char[] {';'}, StringSplitOptions.RemoveEmptyEntries);

 		}

-		

+

 		static bool IsMatch(Guid guid, string guidStringToMatch)

 		{

 			Guid result;

@@ -72,7 +72,7 @@ namespace ICSharpCode.PackageManagement
 			}

 			return false;

 		}

-		

+

 		public static string GetProjectTypeGuidPropertyValue (this IDotNetProject project)

 		{

 			string propertyValue = null;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectImportEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectImportEventArgs.cs
index cf0b696498..81fb3ebe65 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectImportEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectImportEventArgs.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class DotNetProjectImportEventArgs : EventArgs

+	internal class DotNetProjectImportEventArgs : EventArgs

 	{

 		public DotNetProjectImportEventArgs (IDotNetProject project, string import)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectProxy.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectProxy.cs
index bbc942d40e..07dc225d42 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectProxy.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectProxy.cs
@@ -30,7 +30,7 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class DotNetProjectProxy : ProjectProxy, IDotNetProject

+	internal class DotNetProjectProxy : ProjectProxy, IDotNetProject

 	{

 		DotNetProject project;

 		EventHandler<ProjectModifiedEventArgs> projectModifiedHandler;

@@ -120,7 +120,7 @@ namespace MonoDevelop.PackageManagement
 

 		public void DisposeProjectBuilder ()

 		{

-			DotNetProject.DisposeProjectBuilder ();

+			DotNetProject.ReloadProjectBuilder ();

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectReferenceEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectReferenceEventArgs.cs
index 09d4cf6528..4f39b93f46 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectReferenceEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetProjectReferenceEventArgs.cs
@@ -29,7 +29,7 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class DotNetProjectReferenceEventArgs : EventArgs

+	internal class DotNetProjectReferenceEventArgs : EventArgs

 	{

 		public DotNetProjectReferenceEventArgs (ProjectReference reference)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetSolutionEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetSolutionEventArgs.cs
index 43e3f47630..04d15288b7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetSolutionEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/DotNetSolutionEventArgs.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class DotNetSolutionEventArgs : EventArgs

+	internal class DotNetSolutionEventArgs : EventArgs

 	{

 		public DotNetSolutionEventArgs (ISolution solution)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs
index fcdaa000d9..01d16ee5f7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/EnsureNuGetPackageBuildImportsTargetUpdater.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Linq;

 using System.Xml;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 

 namespace MonoDevelop.PackageManagement

 {

@@ -44,7 +44,7 @@ namespace MonoDevelop.PackageManagement
 	/// EnsureNuGetPackageBuildImports target element then the 

 	/// EnsureNuGetPackageBuildImports is removed.

 	/// </summary>

-	public class EnsureNuGetPackageBuildImportsTargetUpdater : IDisposable

+	internal class EnsureNuGetPackageBuildImportsTargetUpdater : IDisposable

 	{

 		static readonly string NuGetTargetName = "EnsureNuGetPackageBuildImports";

 

@@ -73,10 +73,10 @@ namespace MonoDevelop.PackageManagement
 			if (msbuildTask == null)

 				return;

 

-			RemoveFromProject (msbuildTask.Element);

+			nugetImportTarget.RemoveTask (msbuildTask);

 

 			if (nugetImportTarget.Tasks.Count () == 0) {

-				RemoveFromProject (nugetImportTarget.Element);

+				project.Remove (nugetImportTarget);

 			}

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FailingPackageRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FailingPackageRepository.cs
index e45a612994..7315ccbde3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FailingPackageRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FailingPackageRepository.cs
@@ -36,7 +36,7 @@ namespace MonoDevelop.PackageManagement
 	/// This is only used when creating an AggregateRepository so it does not prevent packages

 	/// being returned from other valid package repositories.

 	/// </summary>

-	public class FailingPackageRepository : IPackageRepository

+	internal class FailingPackageRepository : IPackageRepository

 	{

 		string source;

 		Exception exception;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FallbackRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FallbackRepository.cs
index dff511195d..343472aff2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FallbackRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FallbackRepository.cs
@@ -25,7 +25,7 @@ namespace NuGet
 	/// <summary>

 	/// Represents a package repository that implements a dependency provider. 

 	/// </summary>

-	public class FallbackRepository : IDependencyResolver, IServiceBasedRepository, IPackageLookup, ILatestPackageLookup, IOperationAwareRepository

+	internal class FallbackRepository : IDependencyResolver, IServiceBasedRepository, IPackageLookup, ILatestPackageLookup, IOperationAwareRepository

 	{

 		private readonly IPackageRepository _primaryRepository;

 		private readonly IPackageRepository _dependencyResolver;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileConflictResolver.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileConflictResolver.cs
index 613274d54c..58f84caff8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileConflictResolver.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileConflictResolver.cs
@@ -30,9 +30,9 @@ using System;
 using MonoDevelop.Ide;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class FileConflictResolver : IFileConflictResolver

+	internal class FileConflictResolver : IFileConflictResolver

 	{

 		static AlertButton YesToAllButton = new AlertButton ("Yes to All");

 		static AlertButton NoToAllButton = new AlertButton ("No to All");

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FilePathExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FilePathExtensions.cs
index 7c6cd512b7..d6ecfad26c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FilePathExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FilePathExtensions.cs
@@ -30,7 +30,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement

 {

-	public static class FilePathExtensions

+	internal static class FilePathExtensions

 	{

 		public static bool IsPackagesConfigFileName (this FilePath filePath)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileRemover.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileRemover.cs
index 96849ca9d0..9fe43414d0 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileRemover.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileRemover.cs
@@ -29,7 +29,7 @@ using System.IO;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class FileRemover : IFileRemover

+	internal class FileRemover : IFileRemover

 	{

 		public void RemoveFile (string fileName)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileRemovingEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileRemovingEventArgs.cs
index 557b185dca..1cd1b3fb8c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileRemovingEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FileRemovingEventArgs.cs
@@ -29,7 +29,7 @@ using MonoDevelop.Core;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class FileRemovingEventArgs : EventArgs

+	internal class FileRemovingEventArgs : EventArgs

 	{

 		public FileRemovingEventArgs (string fileName)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FolderBrowser.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FolderBrowser.cs
index 93bc7421ea..c09b2ab79f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FolderBrowser.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/FolderBrowser.cs
@@ -29,9 +29,9 @@
 using System;

 using MonoDevelop.Components;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class FolderBrowser : IFolderBrowser

+	internal class FolderBrowser : IFolderBrowser

 	{

 		public string SelectFolder ()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IBackgroundPackageActionRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IBackgroundPackageActionRunner.cs
index fb236aed59..ccd2b79b5c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IBackgroundPackageActionRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IBackgroundPackageActionRunner.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

 namespace MonoDevelop.PackageManagement

 {

-	public interface IBackgroundPackageActionRunner

+	internal interface IBackgroundPackageActionRunner

 	{

 		IEnumerable<InstallPackageAction> PendingInstallActions { get; }

 		IEnumerable<InstallPackageAction> PendingInstallActionsForProject (DotNetProject project);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ICommand.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ICommand.cs
index 13ad4de0f5..eeb880ce65 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ICommand.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ICommand.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface ICommand

+	internal interface ICommand

 	{

 		bool CanExecute(object parameter);

 		void Execute(object parameter);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ICompilerMessageView.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ICompilerMessageView.cs
index dc57f7fefe..0defab266e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ICompilerMessageView.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ICompilerMessageView.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface ICompilerMessageView

+	internal interface ICompilerMessageView

 	{

 		IMessageViewCategory Create(string categoryName, string categoryDisplayName);

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IDotNetProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IDotNetProject.cs
index 04f1a5550d..d1e2fc0f11 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IDotNetProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IDotNetProject.cs
@@ -30,7 +30,7 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement

 {

-	public interface IDotNetProject : IProject

+	internal interface IDotNetProject : IProject

 	{

 		event EventHandler<ProjectModifiedEventArgs> Modified;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IFileRemover.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IFileRemover.cs
index b9a19bb0d4..d79bdf74a9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IFileRemover.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IFileRemover.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement

 {

-	public interface IFileRemover

+	internal interface IFileRemover

 	{

 		void RemoveFile (string fileName);

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IFolderBrowser.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IFolderBrowser.cs
index ee2625484e..b278dda9c6 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IFolderBrowser.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IFolderBrowser.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IFolderBrowser

+	internal interface IFolderBrowser

 	{

 		string SelectFolder();

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ILicenseAcceptanceService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ILicenseAcceptanceService.cs
index b31c251516..1f98fe8e08 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ILicenseAcceptanceService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ILicenseAcceptanceService.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface ILicenseAcceptanceService

+	internal interface ILicenseAcceptanceService

 	{

 		bool AcceptLicenses(IEnumerable<IPackage> packages);

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMachinePackageCache.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMachinePackageCache.cs
index 3965ddb4a6..727aaf7857 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMachinePackageCache.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMachinePackageCache.cs
@@ -30,9 +30,9 @@ using System;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IMachinePackageCache

+	internal interface IMachinePackageCache

 	{

 		IQueryable<IPackage> GetPackages();

 		void Clear();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMessageViewCategory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMessageViewCategory.cs
index 6faad20cc1..725d50a4bb 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMessageViewCategory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMessageViewCategory.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IMessageViewCategory

+	internal interface IMessageViewCategory

 	{

 		void AppendLine(string text);

 		void Clear();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopPackageManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopPackageManager.cs
new file mode 100644
index 0000000000..0851e40070
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopPackageManager.cs
@@ -0,0 +1,53 @@
+// 

+// IMonoDevelopPackageManager.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012-2013 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System.Collections.Generic;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal interface IMonoDevelopPackageManager : IPackageManager

+	{

+		IMonoDevelopProjectManager ProjectManager { get; }

+		

+		void InstallPackage(IPackage package, InstallPackageAction installAction);

+		void UninstallPackage(IPackage package, UninstallPackageAction uninstallAction);

+		void UpdatePackage(IPackage package, UpdatePackageAction updateAction);

+		void UpdatePackages(UpdatePackagesAction updateAction);

+		void UpdatePackageReference(IPackage package, IUpdatePackageSettings settings);

+		void AddPackageReference (IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions);

+

+		IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, InstallPackageAction installAction);

+		IEnumerable<PackageOperation> GetUpdatePackageOperations(IEnumerable<IPackage> packages, IUpdatePackageSettings settings);

+		ReinstallPackageOperations GetReinstallPackageOperations (IEnumerable<IPackage> packages);

+		

+		void RunPackageOperations(IEnumerable<PackageOperation> operations);

+

+		void InstallPackageIntoSolutionRepository (IPackage package);

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopPackageRepositoryFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopPackageRepositoryFactory.cs
new file mode 100644
index 0000000000..adc6245783
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopPackageRepositoryFactory.cs
@@ -0,0 +1,48 @@
+// 

+// IMonoDevelopPackageRepositoryFactory.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System;

+using System.Collections.Generic;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal interface IMonoDevelopPackageRepositoryFactory : IPackageRepositoryFactory

+	{

+		ISharedPackageRepository CreateSharedRepository(

+			IPackagePathResolver pathResolver,

+			IFileSystem fileSystem,

+			IFileSystem configSettingsFileSystem);

+		

+		IRecentPackageRepository CreateRecentPackageRepository(

+			IList<RecentPackageInfo> recentPackages,

+			IPackageRepository aggregateRepository);

+		

+		IPackageRepository CreateAggregateRepository(IEnumerable<IPackageRepository> repositories);

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopProjectManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopProjectManager.cs
new file mode 100644
index 0000000000..78e2b907f4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopProjectManager.cs
@@ -0,0 +1,42 @@
+// 

+// IMonoDevelopProjectManager.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012-2013 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System;

+using System.Collections.Generic;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal interface IMonoDevelopProjectManager : IProjectManager

+	{

+		IPackagePathResolver PathResolver { get; }

+		bool IsInstalled(string packageId);

+		bool HasOlderPackageInstalled(IPackage package);

+		IEnumerable<PackageReference> GetPackageReferences ();

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopProjectSystemFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopProjectSystemFactory.cs
new file mode 100644
index 0000000000..80b5a8ca03
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IMonoDevelopProjectSystemFactory.cs
@@ -0,0 +1,39 @@
+// 

+// IMonoDevelopProjectSystemFactory.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System;

+using MonoDevelop.Projects;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal interface IMonoDevelopProjectSystemFactory

+	{

+		IProjectSystem CreateProjectSystem(DotNetProject project);

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/INuGetPackageNewImportsHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/INuGetPackageNewImportsHandler.cs
new file mode 100644
index 0000000000..766d06270b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/INuGetPackageNewImportsHandler.cs
@@ -0,0 +1,37 @@
+//
+// INuGetPackageNewImportsHandler.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NuGet;
+
+namespace MonoDevelop.PackageManagement
+{
+	internal interface INuGetPackageNewImportsHandler : IDisposable
+	{
+		void AddImportIfMissing (string name, string condition, ProjectImportLocation location);
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IOpenPackageReadMeMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IOpenPackageReadMeMonitor.cs
index d24baf45c4..d7ca135f49 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IOpenPackageReadMeMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IOpenPackageReadMeMonitor.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement

 {

-	public interface IOpenPackageReadMeMonitor : IDisposable

+	internal interface IOpenPackageReadMeMonitor : IDisposable

 	{

 		void OpenReadMeFile ();

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageAction.cs
index 1e544319d4..fcd937dd40 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageAction.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageAction

+	internal interface IPackageAction

 	{

 		void Execute();

 		bool HasPackageScriptsToRun();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageActionRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageActionRunner.cs
index a90f8977d3..bfd26ce4b7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageActionRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageActionRunner.cs
@@ -29,9 +29,9 @@
 using System;

 using System.Collections.Generic;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageActionRunner

+	internal interface IPackageActionRunner

 	{

 		void Run(IPackageAction action);

 		void Run(IEnumerable<IPackageAction> actions);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageExtensions.cs
index 0ba7363c9d..fc730e53a9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageExtensions.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class IPackageExtensions

+	internal static class IPackageExtensions

 	{

 		/// <summary>

 		/// Returns description if summary is missing.

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageFromRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageFromRepository.cs
index 947bed8b9f..42742205c2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageFromRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageFromRepository.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageFromRepository : IPackage

+	internal interface IPackageFromRepository : IPackage

 	{

 		IPackageRepository Repository { get; }

 		bool HasDependencies { get; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageFromRepositoryExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageFromRepositoryExtensions.cs
index 8ddae3f231..d2ec8f6c11 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageFromRepositoryExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageFromRepositoryExtensions.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class IPackageFromRepositoryExtensions

+	internal static class IPackageFromRepositoryExtensions

 	{

 		public static IDisposable StartInstallOperation(this IPackageFromRepository package)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementEvents.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementEvents.cs
index c830df588d..468567a479 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementEvents.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementEvents.cs
@@ -33,9 +33,9 @@ using MonoDevelop.PackageManagement;
 using NuGet;

 using MonoDevelop.Projects;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagementEvents

+	internal interface IPackageManagementEvents

 	{

 		event EventHandler PackageOperationsStarting;

 		event EventHandler PackageOperationsFinished;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementFileService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementFileService.cs
index 938562338e..f0dc1fff03 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementFileService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementFileService.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagementFileService

+	internal interface IPackageManagementFileService

 	{

 		void RemoveFile(string path);

 		void RemoveDirectory(string path);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementOutputMessagesView.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementOutputMessagesView.cs
index 89dd3c1719..949f0a0eff 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementOutputMessagesView.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementOutputMessagesView.cs
@@ -28,9 +28,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagementOutputMessagesView

+	internal interface IPackageManagementOutputMessagesView

 	{

 		void Clear();

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProgressMonitorFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProgressMonitorFactory.cs
index efecca66e2..2f95ad5c68 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProgressMonitorFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProgressMonitorFactory.cs
@@ -29,9 +29,9 @@ using MonoDevelop.Core;
 

 namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagementProgressMonitorFactory

+	internal interface IPackageManagementProgressMonitorFactory

 	{

-		IProgressMonitor CreateProgressMonitor (string statusText);

+		ProgressMonitor CreateProgressMonitor (string statusText);

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProject.cs
index 5c325681e4..b5c91c7e86 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProject.cs
@@ -35,9 +35,9 @@ using NuGet;
 using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagementProject

+	internal interface IPackageManagementProject

 	{

 		event EventHandler<PackageOperationEventArgs> PackageInstalled;

 		event EventHandler<PackageOperationEventArgs> PackageUninstalled;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProjectFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProjectFactory.cs
index b9dbd43d97..11d33f3c5c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProjectFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProjectFactory.cs
@@ -29,9 +29,9 @@ using System;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagementProjectFactory

+	internal interface IPackageManagementProjectFactory

 	{

 		IPackageManagementProject CreateProject (IPackageRepository sourceRepository, IDotNetProject project);

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProjectService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProjectService.cs
index 57feeb967c..8e16b8eaa1 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProjectService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementProjectService.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagementProjectService

+	internal interface IPackageManagementProjectService

 	{

 		event EventHandler SolutionLoaded;

 		event EventHandler SolutionUnloaded;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementSelectedProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementSelectedProject.cs
index e7089d2caf..09d7f66efa 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementSelectedProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementSelectedProject.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagementSelectedProject

+	internal interface IPackageManagementSelectedProject

 	{

 		string Name { get; }

 		bool IsSelected { get; set; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementSolution.cs
index f7c0036588..6e187b79af 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementSolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagementSolution.cs
@@ -26,23 +26,21 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 //

 

-using System;

 using System.Collections.Generic;

 using System.Linq;

 

-using MonoDevelop.PackageManagement;

-using MonoDevelop.Projects;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagementSolution

+	internal interface IPackageManagementSolution

 	{

 		IPackageManagementProject GetActiveProject();

 		IPackageManagementProject GetActiveProject(IPackageRepository sourceRepository);

 		IPackageManagementProject GetProject(PackageSource source, string projectName);

 		IPackageManagementProject GetProject(IPackageRepository sourceRepository, string projectName);

 		IPackageManagementProject GetProject (IPackageRepository sourceRepository, IDotNetProject project);

+		IPackageManagementProject GetProject (IDotNetProject project);

 		IEnumerable<IPackageManagementProject> GetProjects(IPackageRepository sourceRepository);

 		

 		IDotNetProject GetActiveDotNetProject ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagerFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagerFactory.cs
index 49b0f81ba2..fda6556de6 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagerFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageManagerFactory.cs
@@ -30,11 +30,11 @@ using System;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageManagerFactory

+	internal interface IPackageManagerFactory

 	{

-		ISharpDevelopPackageManager CreatePackageManager (

+		IMonoDevelopPackageManager CreatePackageManager (

 			IPackageRepository sourceRepository, 

 			IDotNetProject project);

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageOperationResolverFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageOperationResolverFactory.cs
index e4e6f2fe27..104662c580 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageOperationResolverFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageOperationResolverFactory.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageOperationResolverFactory

+	internal interface IPackageOperationResolverFactory

 	{

 		IPackageOperationResolver CreateInstallPackageOperationResolver(

 			IPackageRepository localRepository,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryCache.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryCache.cs
index 8524d1a07a..e8199509ac 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryCache.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryCache.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageRepositoryCache : ISharpDevelopPackageRepositoryFactory

+	internal interface IPackageRepositoryCache : IMonoDevelopPackageRepositoryFactory

 	{

 		IRecentPackageRepository RecentPackageRepository { get; }

 		IPackageRepository CreateAggregateRepository();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryExtensions.cs
index fce99ffbc0..d5858da9a3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryExtensions.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class IPackageRepositoryExtensions

+	internal static class IPackageRepositoryExtensions

 	{

 		public static IDisposable StartInstallOperation(this IPackageRepository repository, string mainPackageId = null, string mainPackageVersion = null)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryFactoryEvents.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryFactoryEvents.cs
index a59e910baf..7495928d47 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryFactoryEvents.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageRepositoryFactoryEvents.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageRepositoryFactoryEvents

+	internal interface IPackageRepositoryFactoryEvents

 	{

 		event EventHandler<PackageRepositoryFactoryEventArgs> RepositoryCreated;

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageViewModelFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageViewModelFactory.cs
index 9c6e84e042..e8506064fb 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageViewModelFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageViewModelFactory.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageViewModelFactory

+	internal interface IPackageViewModelFactory

 	{

 		PackageViewModel CreatePackageViewModel(IPackageViewModelParent parent, IPackageFromRepository package);

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageViewModelParent.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageViewModelParent.cs
index 767e169d3e..4b7079404b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageViewModelParent.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPackageViewModelParent.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPackageViewModelParent

+	internal interface IPackageViewModelParent

 	{

 		bool IncludePrerelease { get; }

 		void OnPackageCheckedChanged (PackageViewModel packageViewModel);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProcess.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProcess.cs
index d67b526c9c..b936f1701a 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProcess.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProcess.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IProcess

+	internal interface IProcess

 	{

 		void Start(string fileName);

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProject.cs
index d359be3c57..0d77622f83 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProject.cs
@@ -27,18 +27,21 @@
 using System;

 using System.Collections;

 using MonoDevelop.Core;

+using System.Collections.Generic;

+using System.Threading.Tasks;

 

 namespace MonoDevelop.PackageManagement

 {

-	public interface IProject

+	internal interface IProject

 	{

 		string Name { get; }

 		FilePath FileName { get; }

 		FilePath BaseDirectory { get; }

 		ISolution ParentSolution { get; }

 		IDictionary ExtendedProperties { get; }

+		IEnumerable<string> FlavorGuids { get; }

 

-		void Save ();

+		Task SaveAsync ();

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProjectBrowserUpdater.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProjectBrowserUpdater.cs
index 4bffc15d8d..f49363208c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProjectBrowserUpdater.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IProjectBrowserUpdater.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IProjectBrowserUpdater : IDisposable

+	internal interface IProjectBrowserUpdater : IDisposable

 	{

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPropertyService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPropertyService.cs
index 664fe023d6..25f335d046 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPropertyService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IPropertyService.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IPropertyService

+	internal interface IPropertyService

 	{

 		string DataDirectory { get; }

 		string ConfigDirectory { get; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IRecentPackageRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IRecentPackageRepository.cs
index c9b4b03a72..1fa838eafc 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IRecentPackageRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IRecentPackageRepository.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IRecentPackageRepository : IPackageRepository

+	internal interface IRecentPackageRepository : IPackageRepository

 	{

 		void Clear();

 		bool HasRecentPackages { get; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IRegisteredPackageRepositories.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IRegisteredPackageRepositories.cs
index a09f9d2ef9..5adc777250 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IRegisteredPackageRepositories.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IRegisteredPackageRepositories.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IRegisteredPackageRepositories

+	internal interface IRegisteredPackageRepositories

 	{

 		IPackageRepository ActiveRepository { get; }

 		IRecentPackageRepository RecentPackageRepository { get; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISelectProjectsService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISelectProjectsService.cs
index 8a79ad0a66..cf632388aa 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISelectProjectsService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISelectProjectsService.cs
@@ -29,9 +29,9 @@
 using System;

 using System.Collections.Generic;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface ISelectProjectsService

+	internal interface ISelectProjectsService

 	{

 		bool SelectProjects(IEnumerable<IPackageManagementSelectedProject> projects);

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISettingsFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISettingsFactory.cs
index 4199af4034..4a57175be2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISettingsFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISettingsFactory.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface ISettingsFactory

+	internal interface ISettingsFactory

 	{

 		ISettings CreateSettings(string directory);

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISettingsProvider.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISettingsProvider.cs
index aa0fa620cf..90a99fec45 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISettingsProvider.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISettingsProvider.cs
@@ -29,7 +29,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement

 {

-	public interface ISettingsProvider

+	internal interface ISettingsProvider

 	{

 		event EventHandler SettingsChanged;

 		ISettings LoadSettings();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopPackageManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopPackageManager.cs
deleted file mode 100644
index 8c18ec2372..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopPackageManager.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// 

-// ISharpDevelopPackageManager.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012-2013 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using System.Collections.Generic;

-using MonoDevelop.PackageManagement;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public interface ISharpDevelopPackageManager : IPackageManager

-	{

-		ISharpDevelopProjectManager ProjectManager { get; }

-		

-		void InstallPackage(IPackage package, InstallPackageAction installAction);

-		void UninstallPackage(IPackage package, UninstallPackageAction uninstallAction);

-		void UpdatePackage(IPackage package, UpdatePackageAction updateAction);

-		void UpdatePackages(UpdatePackagesAction updateAction);

-		void UpdatePackageReference(IPackage package, IUpdatePackageSettings settings);

-		void AddPackageReference (IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions);

-

-		IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, InstallPackageAction installAction);

-		IEnumerable<PackageOperation> GetUpdatePackageOperations(IEnumerable<IPackage> packages, IUpdatePackageSettings settings);

-		ReinstallPackageOperations GetReinstallPackageOperations (IEnumerable<IPackage> packages);

-		

-		void RunPackageOperations(IEnumerable<PackageOperation> operations);

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopPackageRepositoryFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopPackageRepositoryFactory.cs
deleted file mode 100644
index f4f0b8ad96..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopPackageRepositoryFactory.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// 

-// ISharpDevelopPackageRepositoryFactory.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using System.Collections.Generic;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public interface ISharpDevelopPackageRepositoryFactory : IPackageRepositoryFactory

-	{

-		ISharedPackageRepository CreateSharedRepository(

-			IPackagePathResolver pathResolver,

-			IFileSystem fileSystem,

-			IFileSystem configSettingsFileSystem);

-		

-		IRecentPackageRepository CreateRecentPackageRepository(

-			IList<RecentPackageInfo> recentPackages,

-			IPackageRepository aggregateRepository);

-		

-		IPackageRepository CreateAggregateRepository(IEnumerable<IPackageRepository> repositories);

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopProjectManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopProjectManager.cs
deleted file mode 100644
index f6c03db717..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopProjectManager.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// 

-// ISharpDevelopProjectManager.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012-2013 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using System.Collections.Generic;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public interface ISharpDevelopProjectManager : IProjectManager

-	{

-		IPackagePathResolver PathResolver { get; }

-		bool IsInstalled(string packageId);

-		bool HasOlderPackageInstalled(IPackage package);

-		IEnumerable<PackageReference> GetPackageReferences ();

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopProjectSystemFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopProjectSystemFactory.cs
deleted file mode 100644
index a9bd683b0b..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISharpDevelopProjectSystemFactory.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// 

-// ISharpDevelopProjectSystemFactory.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using MonoDevelop.Projects;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public interface ISharpDevelopProjectSystemFactory

-	{

-		IProjectSystem CreateProjectSystem(DotNetProject project);

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolution.cs
index e64ab2b6a1..072b2a235c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolution.cs
@@ -31,7 +31,7 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement

 {

-	public interface ISolution

+	internal interface ISolution

 	{

 		Solution Solution { get; }

 

@@ -41,6 +41,7 @@ namespace MonoDevelop.PackageManagement
 		IEnumerable<IDotNetProject> GetAllProjects ();

 

 		event EventHandler<DotNetProjectEventArgs> ProjectAdded;

+		event EventHandler<DotNetProjectEventArgs> ProjectRemoved;

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolutionPackageRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolutionPackageRepository.cs
index 3c00c845e5..ec46b343c8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolutionPackageRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolutionPackageRepository.cs
@@ -32,9 +32,9 @@ using System.Linq;
 

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface ISolutionPackageRepository

+	internal interface ISolutionPackageRepository

 	{

 		string GetInstallPath(IPackage package);

 		IEnumerable<IPackage> GetPackagesByDependencyOrder();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolutionPackageRepositoryFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolutionPackageRepositoryFactory.cs
index c9cc090a9c..ddbc2c948e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolutionPackageRepositoryFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ISolutionPackageRepositoryFactory.cs
@@ -30,9 +30,9 @@ using System;
 using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface ISolutionPackageRepositoryFactory

+	internal interface ISolutionPackageRepositoryFactory

 	{

 		ISolutionPackageRepository CreateSolutionPackageRepository (ISolution solution);

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ITask.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ITask.cs
index ff7af23c3a..436feeb7c7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ITask.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ITask.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface ITask<TResult>

+	internal interface ITask<TResult>

 	{

 		void Start();

 		void Cancel();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ITaskFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ITaskFactory.cs
index 92e04d0dd9..6604b89e3b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ITaskFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ITaskFactory.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface ITaskFactory

+	internal interface ITaskFactory

 	{

 		ITask<TResult> CreateTask<TResult>(

 			Func<TResult> function,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IThreadSafePackageManagementEvents.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IThreadSafePackageManagementEvents.cs
index 26abff3221..436f2e7621 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IThreadSafePackageManagementEvents.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IThreadSafePackageManagementEvents.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IThreadSafePackageManagementEvents : IPackageManagementEvents, IDisposable

+	internal interface IThreadSafePackageManagementEvents : IPackageManagementEvents, IDisposable

 	{

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackageActions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackageActions.cs
index b02670416b..105698dab4 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackageActions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackageActions.cs
@@ -29,9 +29,9 @@
 using System;

 using System.Collections.Generic;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IUpdatePackageActions : IUpdatePackageSettings

+	internal interface IUpdatePackageActions : IUpdatePackageSettings

 	{

 		//IPackageScriptRunner PackageScriptRunner { get; set; }

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackageSettings.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackageSettings.cs
index fe56a04af8..e8091917ae 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackageSettings.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackageSettings.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IUpdatePackageSettings

+	internal interface IUpdatePackageSettings

 	{

 		bool UpdateDependencies { get; set; }

 		bool AllowPrereleaseVersions { get; set; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackagesAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackagesAction.cs
index b78ee7506b..37953cacb9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackagesAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatePackagesAction.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public interface IUpdatePackagesAction : IPackageAction, IUpdatePackageSettings

+	internal interface IUpdatePackagesAction : IPackageAction, IUpdatePackageSettings

 	{

 		IEnumerable<PackageOperation> Operations { get; }

 		ILogger Logger { get; set; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatedPackagesInSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatedPackagesInSolution.cs
index bf18b5e521..b1bb3e9cf8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatedPackagesInSolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/IUpdatedPackagesInSolution.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement

 {

-	public interface IUpdatedPackagesInSolution

+	internal interface IUpdatedPackagesInSolution

 	{

 		void Clear ();

 		void CheckForUpdates ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageCache.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageCache.cs
index b012c143cc..bd23d1b8d7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageCache.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageCache.cs
@@ -30,7 +30,7 @@ using Xwt.Drawing;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class ImageCache

+	internal class ImageCache

 	{

 		const int MaxImageCount = 50;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoadedEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoadedEventArgs.cs
index a483a1de3e..52b9be6406 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoadedEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoadedEventArgs.cs
@@ -29,7 +29,7 @@ using Xwt.Drawing;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class ImageLoadedEventArgs : EventArgs

+	internal class ImageLoadedEventArgs : EventArgs

 	{

 		public ImageLoadedEventArgs (Image image, Uri uri, object state)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
index 9bb27d746f..64cf38aa79 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
@@ -30,13 +30,13 @@ using System.Net;
 using System.Threading.Tasks;

 using MonoDevelop.Ide;

 using NuGet;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using Xwt.Drawing;

 using System.Collections.Generic;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class ImageLoader

+	internal class ImageLoader

 	{

 		public event EventHandler<ImageLoadedEventArgs> Loaded;

 

@@ -91,8 +91,7 @@ namespace MonoDevelop.PackageManagement
 		ImageLoadedEventArgs LoadImage (Uri uri, object state)

 		{

 			try {

-				var httpClient = new HttpClient (uri);

-				Stream stream = httpClient.GetResponse ().GetResponseStream ();

+				Stream stream = GetResponseStream (uri);

 				Image image = Image.FromStream (stream);

 

 				return new ImageLoadedEventArgs (image, uri, state);

@@ -101,6 +100,17 @@ namespace MonoDevelop.PackageManagement
 			}

 		}

 

+		static Stream GetResponseStream (Uri uri)

+		{

+			if (uri.IsFile) {

+				var request = WebRequest.Create (uri);

+				return request.GetResponse ().GetResponseStream ();

+			}

+

+			var httpClient = new HttpClient (uri);

+			return httpClient.GetResponse ().GetResponseStream ();

+		}

+

 		void OnLoaded (ITask<ImageLoadedEventArgs> task, Uri uri, object state)

 		{

 			if (task.IsFaulted) {

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstallPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstallPackageAction.cs
index f5854cf48f..07c1d0f685 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstallPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstallPackageAction.cs
@@ -28,12 +28,11 @@
 

 using System;

 using System.Collections.Generic;

-using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class InstallPackageAction : ProcessPackageOperationsAction

+	internal class InstallPackageAction : ProcessPackageOperationsAction

 	{

 		IFileRemover fileRemover;

 

@@ -48,12 +47,22 @@ namespace ICSharpCode.PackageManagement
 			IPackageManagementProject project,

 			IPackageManagementEvents packageManagementEvents,

 			IFileRemover fileRemover)

-			: base (project, packageManagementEvents)

+			: this (project, packageManagementEvents, fileRemover, new LicenseAcceptanceService ())

+		{

+		}

+

+		public InstallPackageAction (

+			IPackageManagementProject project,

+			IPackageManagementEvents packageManagementEvents,

+			IFileRemover fileRemover,

+			ILicenseAcceptanceService licenseAcceptanceService)

+			: base (project, packageManagementEvents, licenseAcceptanceService)

 		{

 			this.fileRemover = fileRemover;

 

 			OpenReadMeText = true;

 			PreserveLocalCopyReferences = true;

+			LicensesMustBeAccepted = true;

 		}

 

 		public bool IgnoreDependencies { get; set; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackageViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackageViewModel.cs
index 42e8a84343..cd88ac2f02 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackageViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackageViewModel.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class InstalledPackageViewModel : PackageViewModel

+	internal class InstalledPackageViewModel : PackageViewModel

 	{

 		public InstalledPackageViewModel(

 			IPackageViewModelParent parent,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackageViewModelFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackageViewModelFactory.cs
index ea31b50e6d..f14164dacc 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackageViewModelFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackageViewModelFactory.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class InstalledPackageViewModelFactory : PackageViewModelFactory

+	internal class InstalledPackageViewModelFactory : PackageViewModelFactory

 	{

 		SelectedProjectsForInstalledPackages selectedProjectsForInstalledPackages;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackagesViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackagesViewModel.cs
index 97277f10fa..9348cfa62c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackagesViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/InstalledPackagesViewModel.cs
@@ -31,9 +31,9 @@ using System.Linq;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class InstalledPackagesViewModel : PackagesViewModel

+	internal class InstalledPackagesViewModel : PackagesViewModel

 	{

 		IPackageManagementSolution solution;

 		IPackageManagementEvents packageManagementEvents;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs
index 82c7dcae77..a5110e4a2e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceService.cs
@@ -26,24 +26,37 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 //

 

-using System;

 using System.Collections.Generic;

+using MonoDevelop.Core;

 using MonoDevelop.Ide;

-using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class LicenseAcceptanceService : ILicenseAcceptanceService

+	internal class LicenseAcceptanceService : ILicenseAcceptanceService

 	{

-		public bool AcceptLicenses(IEnumerable<IPackage> packages)

+		public bool AcceptLicenses (IEnumerable<IPackage> packages)

+		{

+			if (Runtime.IsMainThread) {

+				return ShowLicenseAcceptanceDialog (packages);

+			}

+

+			bool accepted = false;

+			Runtime.RunInMainThread (() => {

+				accepted = ShowLicenseAcceptanceDialog (packages);

+			}).Wait ();

+			return accepted;

+		}

+

+		bool ShowLicenseAcceptanceDialog (IEnumerable<IPackage> packages)

 		{

 			using (LicenseAcceptanceDialog dialog = CreateLicenseAcceptanceDialog (packages)) {

-				int result = MessageService.ShowCustomDialog (dialog);

+				dialog.Modal = false;

+				int result = MessageService.ShowCustomDialog (dialog, IdeApp.Workbench.RootWindow);

 				return result == (int)Gtk.ResponseType.Ok;

 			}

 		}

-		

+

 		LicenseAcceptanceDialog CreateLicenseAcceptanceDialog(IEnumerable<IPackage> packages)

 		{

 			var viewModel = new LicenseAcceptanceViewModel(packages);

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceViewModel.cs
index 2b3d123122..bc17c68314 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LicenseAcceptanceViewModel.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class LicenseAcceptanceViewModel : ViewModelBase<LicenseAcceptanceViewModel>

+	internal class LicenseAcceptanceViewModel : ViewModelBase<LicenseAcceptanceViewModel>

 	{

 		IList<PackageLicenseViewModel> packages;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LocalCopyReferenceMaintainer.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LocalCopyReferenceMaintainer.cs
index 2637df430b..40cf81b6b5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LocalCopyReferenceMaintainer.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/LocalCopyReferenceMaintainer.cs
@@ -27,12 +27,12 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class LocalCopyReferenceMaintainer : IDisposable

+	internal class LocalCopyReferenceMaintainer : IDisposable

 	{

 		readonly IPackageManagementEvents packageManagementEvents;

 		List<ProjectReference> referencesRemovedWithLocalCopyFalse = new List<ProjectReference> ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs
index 7ef89003a4..48b81b69ba 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildProjectExtensions.cs
@@ -31,12 +31,12 @@ using System.Collections.Generic;
 using System.Linq;

 using System.Xml;

 

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class MSBuildProjectExtensions

+	internal static class MSBuildProjectExtensions

 	{

 		static readonly XmlNamespaceManager namespaceManager =

 			new XmlNamespaceManager (new NameTable ());

@@ -64,63 +64,18 @@ namespace ICSharpCode.PackageManagement
 			ProjectImportLocation importLocation,

 			string condition)

 		{

-			XmlElement import = project.AddImportElement (importedProjectFile, importLocation);

-			import.SetAttribute ("Condition", condition);

-		}

-		

-		static XmlElement AddImportElement(

-			this MSBuildProject project,

-			string importedProjectFile,

-			ProjectImportLocation importLocation)

-		{

-			if (importLocation == ProjectImportLocation.Top) {

-				return project.AddImportElementAtTop (importedProjectFile);

-			}

-			XmlElement import = project.CreateImportElement (importedProjectFile);

-			project.Document.DocumentElement.AppendChild (import);

-			return import;

-		}

-		

-		static XmlElement CreateImportElement(this MSBuildProject project, string importedProjectFile)

-		{

-			XmlElement import = project.Document.CreateElement ("Import", MSBuildProject.Schema);

-			import.SetAttribute ("Project", importedProjectFile);

-			return import;

-		}

-		

-		static XmlElement AddImportElementAtTop (this MSBuildProject project, string importedProjectFile)

-		{

-			XmlElement import = project.CreateImportElement (importedProjectFile);

-			XmlElement projectRoot = project.Document.DocumentElement;

-			projectRoot.InsertBefore (import, projectRoot.FirstChild);

-			return import;

+			var before = importLocation == ProjectImportLocation.Top ? project.GetAllObjects ().FirstOrDefault () : null;

+			project.AddNewImport (importedProjectFile, condition, before);

 		}

 		

 		public static void RemoveImportIfExists (this MSBuildProject project, string importedProjectFile)

 		{

-			XmlElement import = project.FindImportElement (importedProjectFile);

-			if (import != null) {

-				import.ParentNode.RemoveChild (import);

-			}

+			project.RemoveImport (importedProjectFile);

 		}

 		

 		public static bool ImportExists (this MSBuildProject project, string importedProjectFile)

 		{

-			return project.FindImportElement (importedProjectFile) != null;

-		}

-		

-		static XmlElement FindImportElement (this MSBuildProject project, string importedProjectFile)

-		{

-			return project

-				.Imports ()

-				.FirstOrDefault (import => String.Equals (import.GetAttribute ("Project"), importedProjectFile, StringComparison.OrdinalIgnoreCase));

-		}

-		

-		static IEnumerable <XmlElement> Imports (this MSBuildProject project)

-		{

-			foreach (XmlElement import in project.Document.DocumentElement.SelectNodes ("tns:Import", namespaceManager)) {

-				yield return import;

-			}

+			return project.GetImport (importedProjectFile) != null;

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildTargetsRestoredMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildTargetsRestoredMonitor.cs
index 1f8f80f58c..a9e8ee54dc 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildTargetsRestoredMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MSBuildTargetsRestoredMonitor.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class MSBuildTargetsRestoredMonitor : IDisposable

+	internal class MSBuildTargetsRestoredMonitor : IDisposable

 	{

 		IPackageManagementEvents packageManagementEvents;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MachinePackageCache.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MachinePackageCache.cs
index 4b13b7c84b..01a909f82d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MachinePackageCache.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MachinePackageCache.cs
@@ -30,9 +30,9 @@ using System;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class MachinePackageCache : IMachinePackageCache

+	internal class MachinePackageCache : IMachinePackageCache

 	{

 		public IQueryable<IPackage> GetPackages()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ManagePackagesViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ManagePackagesViewModel.cs
index d794208cbc..eda1c66dfa 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ManagePackagesViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ManagePackagesViewModel.cs
@@ -32,9 +32,9 @@ using System.Linq;
 

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ManagePackagesViewModel : ViewModelBase<ManagePackagesViewModel>, IDisposable

+	internal class ManagePackagesViewModel : ViewModelBase<ManagePackagesViewModel>, IDisposable

 	{

 		IThreadSafePackageManagementEvents packageManagementEvents;

 		PackagesViewModels packagesViewModels;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ManagePackagesViewTitle.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ManagePackagesViewTitle.cs
index c07724593c..48a8243b4c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ManagePackagesViewTitle.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ManagePackagesViewTitle.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ManagePackagesViewTitle

+	internal class ManagePackagesViewTitle

 	{

 		public ManagePackagesViewTitle(IPackageManagementSolution solution)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MarkupString.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MarkupString.cs
index 3137ec55a0..52d1ccc9d0 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MarkupString.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MarkupString.cs
@@ -30,9 +30,9 @@ using System;
 using System.Linq;

 using GLib;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class MarkupString

+	internal static class MarkupString

 	{

 		public static string Format (string format, params string[] args)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopAggregateRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopAggregateRepository.cs
index 3a140e6802..3463ea7f8f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopAggregateRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopAggregateRepository.cs
@@ -33,7 +33,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class MonoDevelopAggregateRepository : AggregateRepository

+	internal class MonoDevelopAggregateRepository : AggregateRepository

 	{

 		ConcurrentQueue<Exception> failures = new ConcurrentQueue<Exception> ();

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopCredentialProvider.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopCredentialProvider.cs
index e9dbe4417b..3678763e21 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopCredentialProvider.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopCredentialProvider.cs
@@ -30,7 +30,7 @@ using System;
 using System.Net;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

 	class MonoDevelopCredentialProvider : ICredentialProvider
 	{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopHttpUserAgent.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopHttpUserAgent.cs
index 6c8ec642c8..8a2e703a0f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopHttpUserAgent.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopHttpUserAgent.cs
@@ -1,5 +1,5 @@
 // 

-// SharpDevelopHttpUserAgent.cs

+// MonoDevelopHttpUserAgent.cs

 // 

 // Author:

 //   Matt Ward <ward.matt@gmail.com>

@@ -31,9 +31,9 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class MonoDevelopHttpUserAgent

+	internal class MonoDevelopHttpUserAgent

 	{

 		public MonoDevelopHttpUserAgent()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageManager.cs
new file mode 100644
index 0000000000..dd3985fa06
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageManager.cs
@@ -0,0 +1,251 @@
+// 

+// MonoDevelopPackageManager.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012-2013 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System.Collections.Generic;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal class MonoDevelopPackageManager : PackageManager, IMonoDevelopPackageManager

+	{

+		IProjectSystem projectSystem;

+		IPackageOperationResolverFactory packageOperationResolverFactory;

+		

+		public MonoDevelopPackageManager(

+			IPackageRepository sourceRepository,

+			IProjectSystem projectSystem,

+			ISolutionPackageRepository solutionPackageRepository,

+			IPackageOperationResolverFactory packageOperationResolverFactory)

+			: base(

+				sourceRepository,

+				solutionPackageRepository.PackagePathResolver,

+				solutionPackageRepository.FileSystem,

+				solutionPackageRepository.Repository)

+		{

+			this.projectSystem = projectSystem;

+			this.packageOperationResolverFactory = packageOperationResolverFactory;

+			CreateProjectManager();

+		}

+		

+		/// <summary>

+		/// project manager should be created with:

+		/// 	local repo = PackageReferenceRepository(projectSystem, sharedRepo)

+		///     packageRefRepo should have its RegisterIfNecessary() method called before creating the project manager.

+		/// 	source repo = sharedRepository

+		/// </summary>

+		void CreateProjectManager()

+		{

+			var packageRefRepository = CreatePackageReferenceRepository();

+			ProjectManager = CreateProjectManager(packageRefRepository);

+		}

+		

+		PackageReferenceRepository CreatePackageReferenceRepository()

+		{

+			var sharedRepository = LocalRepository as ISharedPackageRepository;

+			var packageRefRepository = new PackageReferenceRepository(projectSystem, projectSystem.ProjectName, sharedRepository);

+			packageRefRepository.RegisterIfNecessary();

+			return packageRefRepository;

+		}

+		

+		public IMonoDevelopProjectManager ProjectManager { get; set; }

+		

+		MonoDevelopProjectManager CreateProjectManager(PackageReferenceRepository packageRefRepository)

+		{

+			IPackageRepository sourceRepository = CreateProjectManagerSourceRepository ();

+			return new MonoDevelopProjectManager (sourceRepository, PathResolver, projectSystem, packageRefRepository);

+		}

+

+		IPackageRepository CreateProjectManagerSourceRepository ()

+		{

+			var fallbackRepository = SourceRepository as FallbackRepository;

+			if (fallbackRepository != null) {

+				var primaryRepositories = new [] {

+					LocalRepository,

+					fallbackRepository.SourceRepository.Clone () }; 

+

+				return new FallbackRepository (

+					new AggregateRepository (primaryRepositories),

+					fallbackRepository.DependencyResolver);

+			}

+			return new AggregateRepository (new [] { LocalRepository, SourceRepository.Clone () });

+		}

+
+		public void InstallPackage(IPackage package)

+		{

+			bool ignoreDependencies = false;

+			bool allowPreleaseVersions = false;

+			InstallPackage(package, ignoreDependencies, allowPreleaseVersions);

+		}

+		

+		public void InstallPackage(IPackage package, InstallPackageAction installAction)

+		{

+			RunPackageOperations(installAction.Operations);

+			AddPackageReference(package, installAction.IgnoreDependencies, installAction.AllowPrereleaseVersions);

+		}

+		

+		public void AddPackageReference (IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)

+		{

+			var monitor = new PackageReferenceMonitor (ProjectManager, this);

+			using (monitor) {

+				ProjectManager.AddPackageReference(package.Id, package.Version, ignoreDependencies, allowPrereleaseVersions);

+			}

+			

+			monitor.PackagesRemoved.ForEach(packageRemoved => UninstallPackageFromSolutionRepository(packageRemoved));

+		}

+		

+		public override void InstallPackage(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)

+		{

+			base.InstallPackage(package, ignoreDependencies, allowPrereleaseVersions);

+			AddPackageReference(package, ignoreDependencies, allowPrereleaseVersions);

+		}

+		

+		public void UninstallPackage(IPackage package, UninstallPackageAction uninstallAction)

+		{

+			UninstallPackage(package, uninstallAction.ForceRemove, uninstallAction.RemoveDependencies);

+		}

+		

+		public override void UninstallPackage(IPackage package, bool forceRemove, bool removeDependencies)

+		{

+			ProjectManager.RemovePackageReference(package.Id, forceRemove, removeDependencies);

+			if (!IsPackageReferencedByOtherProjects(package)) {

+				base.UninstallPackage(package, forceRemove, removeDependencies);

+			}

+		}

+		

+		public void UninstallPackageFromSolutionRepository(IPackage package)

+		{

+			if (!IsPackageReferencedByOtherProjects(package)) {

+				ExecuteUninstall(package);

+			}

+		}

+

+		public void InstallPackageIntoSolutionRepository (IPackage package)

+		{

+			if (!LocalRepository.Exists (package)) {

+				ExecuteInstall (package);

+			}

+		}

+		

+		bool IsPackageReferencedByOtherProjects(IPackage package)

+		{

+			var sharedRepository = LocalRepository as ISharedPackageRepository;

+			return sharedRepository.IsReferenced(package.Id, package.Version);

+		}

+		

+		public IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, InstallPackageAction installAction)

+		{

+			IPackageOperationResolver resolver = CreateInstallPackageOperationResolver(installAction);

+			return resolver.ResolveOperations(package);

+		}

+		

+		IPackageOperationResolver CreateInstallPackageOperationResolver(InstallPackageAction installAction)

+		{

+			return packageOperationResolverFactory.CreateInstallPackageOperationResolver(

+				LocalRepository,

+				SourceRepository,

+				Logger,

+				installAction);

+		}

+		

+		public void UpdatePackage(IPackage package, UpdatePackageAction updateAction)

+		{

+			RunPackageOperations(updateAction.Operations);

+			UpdatePackageReference(package, updateAction);

+		}

+		

+		public void UpdatePackageReference(IPackage package, IUpdatePackageSettings settings)

+		{

+			UpdatePackageReference(package, settings.UpdateDependencies, settings.AllowPrereleaseVersions);

+		}

+		

+		void UpdatePackageReference(IPackage package, bool updateDependencies, bool allowPrereleaseVersions)

+		{

+			var monitor = new PackageReferenceMonitor (ProjectManager, this);

+			using (monitor) {

+				ProjectManager.UpdatePackageReference(package.Id, package.Version, updateDependencies, allowPrereleaseVersions);

+			}

+			

+			monitor.PackagesRemoved.ForEach(packageRemoved => UninstallPackageFromSolutionRepository(packageRemoved));

+		}

+		

+		public void UpdatePackages(UpdatePackagesAction updateAction)

+		{

+			RunPackageOperations(updateAction.Operations);

+			foreach (IPackage package in updateAction.Packages) {

+				UpdatePackageReference(package, updateAction);

+			}

+		}

+		

+		public IEnumerable<PackageOperation> GetUpdatePackageOperations(

+			IEnumerable<IPackage> packages,

+			IUpdatePackageSettings settings)

+		{

+			IPackageOperationResolver resolver = CreateUpdatePackageOperationResolver(settings);

+			

+			var reducedOperations = new ReducedPackageOperations(resolver, packages);

+			reducedOperations.Reduce();

+			return reducedOperations.Operations;

+		}

+		

+		IPackageOperationResolver CreateUpdatePackageOperationResolver(IUpdatePackageSettings settings)

+		{

+			return packageOperationResolverFactory.CreateUpdatePackageOperationResolver(

+				LocalRepository,

+				SourceRepository,

+				Logger,

+				settings);

+		}

+		

+		public void RunPackageOperations(IEnumerable<PackageOperation> operations)

+		{

+			foreach (PackageOperation operation in operations) {

+				Execute(operation);

+			}

+		}

+

+		public ReinstallPackageOperations GetReinstallPackageOperations (IEnumerable<IPackage> packages)

+		{

+			var installWalker = new InstallWalker (

+				LocalRepository,

+				SourceRepository,

+				ProjectManager.Project.TargetFramework,

+				ProjectManager.Logger,

+				ignoreDependencies: true,

+				allowPrereleaseVersions: false,

+				dependencyVersion: DependencyVersion.Lowest);

+

+			IList<IPackage> packagesInDependencyOrder;

+			IList<PackageOperation> operations = installWalker.ResolveOperations (

+				packages,

+				out packagesInDependencyOrder,

+				allowPrereleaseVersionsBasedOnPackage: true);

+

+			return new ReinstallPackageOperations (operations, packagesInDependencyOrder);

+		}

+	}

+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageManagerFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageManagerFactory.cs
new file mode 100644
index 0000000000..f9b191e565
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageManagerFactory.cs
@@ -0,0 +1,95 @@
+// 

+// MonoDevelopPackageManagerFactory.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using MonoDevelop.PackageManagement;

+using MonoDevelop.Projects;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal class MonoDevelopPackageManagerFactory : IPackageManagerFactory

+	{

+		PackageManagementOptions options;

+		IMonoDevelopPackageRepositoryFactory packageRepositoryFactory;

+		IMonoDevelopProjectSystemFactory projectSystemFactory;

+		

+		public MonoDevelopPackageManagerFactory()

+			: this(

+				new MonoDevelopPackageRepositoryFactory(),

+				new MonoDevelopProjectSystemFactory(),

+				PackageManagementServices.Options)

+		{

+		}

+		

+		public MonoDevelopPackageManagerFactory(

+			IMonoDevelopPackageRepositoryFactory packageRepositoryFactory,

+		    IMonoDevelopProjectSystemFactory projectSystemFactory,

+		    PackageManagementOptions options)

+		{

+			this.packageRepositoryFactory = packageRepositoryFactory;

+			this.projectSystemFactory = projectSystemFactory;

+			this.options = options;

+		}

+		

+		public IMonoDevelopPackageManager CreatePackageManager(

+			IPackageRepository sourceRepository,

+			IDotNetProject project)

+		{

+			SolutionPackageRepository solutionPackageRepository = CreateSolutionPackageRepository (project.ParentSolution);

+			IProjectSystem projectSystem = CreateProjectSystem (project.DotNetProject);

+			PackageOperationsResolverFactory packageOperationResolverFactory = new PackageOperationsResolverFactory();

+			

+			return new MonoDevelopPackageManager(

+				sourceRepository,

+				projectSystem,

+				solutionPackageRepository,

+				packageOperationResolverFactory);

+		}

+		

+		SolutionPackageRepository CreateSolutionPackageRepository (ISolution solution)

+		{

+			return new SolutionPackageRepository (solution, packageRepositoryFactory, options);

+		}

+		

+		IProjectSystem CreateProjectSystem(DotNetProject project)

+		{

+			return projectSystemFactory.CreateProjectSystem(project);

+		}

+

+		public IPackageManager CreatePackageManager (

+			IPackageRepository sourceRepository,

+			ISolutionPackageRepository solutionPackageRepository)

+		{

+			return new PackageManager (

+				sourceRepository,

+				solutionPackageRepository.PackagePathResolver,

+				solutionPackageRepository.FileSystem,

+				solutionPackageRepository.Repository);

+		}

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageRepositoryFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageRepositoryFactory.cs
new file mode 100644
index 0000000000..47a35521cc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopPackageRepositoryFactory.cs
@@ -0,0 +1,58 @@
+// 

+// MonoDevelopPackageRepositoryFactory.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System;

+using System.Collections.Generic;

+using MonoDevelop.PackageManagement;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal class MonoDevelopPackageRepositoryFactory : PackageRepositoryFactory, IMonoDevelopPackageRepositoryFactory

+	{

+		public ISharedPackageRepository CreateSharedRepository(

+			IPackagePathResolver pathResolver,

+			IFileSystem fileSystem,

+			IFileSystem configSettingsFileSystem)

+		{

+			return new SharedPackageRepository(pathResolver, fileSystem, configSettingsFileSystem);

+		}

+		

+		public IRecentPackageRepository CreateRecentPackageRepository(

+			IList<RecentPackageInfo> recentPackages,

+			IPackageRepository aggregateRepository)

+		{

+			return new RecentPackageRepository(recentPackages, aggregateRepository);

+		}

+		

+		public IPackageRepository CreateAggregateRepository(IEnumerable<IPackageRepository> repositories)

+		{

+			return new MonoDevelopAggregateRepository (repositories);

+		}

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectManager.cs
new file mode 100644
index 0000000000..445c6260f5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectManager.cs
@@ -0,0 +1,64 @@
+// 

+// MonoDevelopProjectManager.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System;

+using System.Collections.Generic;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal class MonoDevelopProjectManager : ProjectManager, IMonoDevelopProjectManager

+	{

+		public MonoDevelopProjectManager(

+			IPackageRepository sourceRepository,

+			IPackagePathResolver pathResolver,

+			IProjectSystem project,

+			IPackageRepository localRepository)

+			: base(sourceRepository, pathResolver, project, localRepository)

+		{

+		}

+		

+		public bool IsInstalled(string packageId)

+		{

+			return LocalRepository.Exists(packageId);

+		}

+		

+		public bool HasOlderPackageInstalled(IPackage package)

+		{

+			IPackage installedPackage = LocalRepository.FindPackage(package.Id);

+			return (installedPackage != null) &&

+				(installedPackage.Version < package.Version);

+		}

+

+		public IEnumerable<PackageReference> GetPackageReferences ()

+		{

+			var repository = LocalRepository as PackageReferenceRepository;

+			return repository.ReferenceFile.GetPackageReferences ();

+		}

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystem.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystem.cs
new file mode 100644
index 0000000000..2679c57a95
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystem.cs
@@ -0,0 +1,498 @@
+// 

+// MonoDevelopProjectSystem.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System;

+using System.IO;

+using System.Runtime.Versioning;

+using System.Threading.Tasks;

+

+using MonoDevelop.Core;

+using MonoDevelop.Ide;

+using MonoDevelop.PackageManagement;

+using MonoDevelop.Projects;

+using MonoDevelop.Projects.MSBuild;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal class MonoDevelopProjectSystem : PhysicalFileSystem, IProjectSystem

+	{

+		IDotNetProject project;

+		ProjectTargetFramework targetFramework;

+		IPackageManagementFileService fileService;

+		IPackageManagementEvents packageManagementEvents;

+		Action<Action> guiSyncDispatcher;

+		Func<Func<Task>,Task> guiSyncDispatcherFunc;

+

+		public MonoDevelopProjectSystem(DotNetProject project)

+			: this (

+				new DotNetProjectProxy (project),

+				new PackageManagementFileService (),

+				PackageManagementServices.ProjectService,

+				PackageManagementServices.PackageManagementEvents,

+				DefaultGuiSyncDispatcher,

+				GuiSyncDispatchWithException)

+		{

+		}

+		

+		public MonoDevelopProjectSystem (

+			IDotNetProject project,

+			IPackageManagementFileService fileService,

+			IPackageManagementProjectService projectService,

+			IPackageManagementEvents packageManagementEvents,

+			Action<Action> guiSyncDispatcher,

+			Func<Func<Task>, Task> guiSyncDispatcherFunc)

+			: base (AppendTrailingSlashToDirectory (project.BaseDirectory))

+		{

+			this.project = project;

+			this.fileService = fileService;

+			this.packageManagementEvents = packageManagementEvents;

+			this.guiSyncDispatcher = guiSyncDispatcher;

+			this.guiSyncDispatcherFunc = guiSyncDispatcherFunc;

+		}

+		

+		static string AppendTrailingSlashToDirectory(string directory)

+		{

+			return directory + Path.DirectorySeparatorChar.ToString();

+		}

+		

+		public bool IsBindingRedirectSupported { get; set; }

+		

+		public FrameworkName TargetFramework {

+			get {

+				return GuiSyncDispatch (() => GetTargetFramework ());

+			}

+		}

+		

+		FrameworkName GetTargetFramework()

+		{

+			if (targetFramework == null) {

+				targetFramework = new ProjectTargetFramework(project);

+			}

+			return targetFramework.TargetFrameworkName;

+		}

+		

+		public string ProjectName {

+			get {

+				return GuiSyncDispatch (() => project.Name);

+			}

+		}

+

+		public dynamic GetPropertyValue (string propertyName)

+		{

+			return GuiSyncDispatch (() => {

+				if ("RootNamespace".Equals(propertyName, StringComparison.OrdinalIgnoreCase)) {

+					return project.DefaultNamespace;

+				}

+				return String.Empty;

+			});

+		}

+

+		public void AddReference(string referencePath, Stream stream)

+		{

+			GuiSyncDispatch (async () => {

+				ProjectReference assemblyReference = CreateReference (referencePath);

+				packageManagementEvents.OnReferenceAdding (assemblyReference);

+				await AddReferenceToProject (assemblyReference);

+			});

+		}

+		

+		ProjectReference CreateReference(string referencePath)

+		{

+			string fullPath = GetFullPath(referencePath);

+			return ProjectReference.CreateAssemblyFileReference (fullPath);

+		}

+		

+		async Task AddReferenceToProject(ProjectReference assemblyReference)

+		{

+			project.References.Add (assemblyReference);

+			await project.SaveAsync ();

+			LogAddedReferenceToProject(assemblyReference);

+		}

+		

+		void LogAddedReferenceToProject(ProjectReference referenceProjectItem)

+		{

+			LogAddedReferenceToProject(referenceProjectItem.Reference, ProjectName);

+		}

+		

+		protected virtual void LogAddedReferenceToProject(string referenceName, string projectName)

+		{

+			DebugLogFormat("Added reference '{0}' to project '{1}'.", referenceName, projectName);

+		}

+		

+		void DebugLogFormat(string format, params object[] args)

+		{

+			Logger.Log(MessageLevel.Debug, format, args);

+		}

+		

+		public bool ReferenceExists(string name)

+		{

+			return GuiSyncDispatch (() => {

+				ProjectReference referenceProjectItem = FindReference (name);

+				if (referenceProjectItem != null) {

+					return true;

+				}

+				return false;

+			});

+		}

+		

+		ProjectReference FindReference(string name)

+		{

+			string referenceName = GetReferenceName(name);

+			foreach (ProjectReference referenceProjectItem in project.References) {

+				string projectReferenceName = GetProjectReferenceName(referenceProjectItem.Reference);

+				if (IsMatchIgnoringCase(projectReferenceName, referenceName)) {

+					return referenceProjectItem;

+				}

+			}

+			return null;

+		}

+		

+		string GetReferenceName(string name)

+		{

+			if (HasDllOrExeFileExtension(name)) {

+				return Path.GetFileNameWithoutExtension(name);

+			}

+			return name;

+		}

+		

+		string GetProjectReferenceName(string name)

+		{

+			string referenceName = GetReferenceName(name);

+			return GetAssemblyShortName(referenceName);

+		}

+		

+		string GetAssemblyShortName(string name)

+		{

+			string[] parts = name.Split(',');

+			return parts[0];

+		}

+		

+		bool HasDllOrExeFileExtension(string name)

+		{

+			string extension = Path.GetExtension(name);

+			return

+				IsMatchIgnoringCase(extension, ".dll") ||

+				IsMatchIgnoringCase(extension, ".exe");

+		}

+		

+		bool IsMatchIgnoringCase(string lhs, string rhs)

+		{

+			return String.Equals(lhs, rhs, StringComparison.InvariantCultureIgnoreCase);

+		}

+		

+		public void RemoveReference(string name)

+		{

+			GuiSyncDispatch (async () => {

+				ProjectReference referenceProjectItem = FindReference (name);

+				if (referenceProjectItem != null) {

+					packageManagementEvents.OnReferenceRemoving (referenceProjectItem);

+					project.References.Remove (referenceProjectItem);

+					await project.SaveAsync ();

+					LogRemovedReferenceFromProject (referenceProjectItem);

+				}

+			});

+		}

+		

+		void LogRemovedReferenceFromProject(ProjectReference referenceProjectItem)

+		{

+			LogRemovedReferenceFromProject(referenceProjectItem.Reference, ProjectName);

+		}

+		

+		protected virtual void LogRemovedReferenceFromProject(string referenceName, string projectName)

+		{

+			DebugLogFormat("Removed reference '{0}' from project '{1}'.", referenceName, projectName);

+		}

+		

+		public bool IsSupportedFile(string path)

+		{

+			return GuiSyncDispatch (() => {

+				if (project.IsWebProject ()) {

+					return !IsAppConfigFile (path);

+				}

+				return !IsWebConfigFile (path);

+			});

+		}

+		

+		bool IsWebConfigFile(string path)

+		{

+			return IsFileNameMatchIgnoringPath("web.config", path);

+		}

+		

+		bool IsAppConfigFile(string path)

+		{

+			return IsFileNameMatchIgnoringPath("app.config", path);

+		}

+		

+		bool IsFileNameMatchIgnoringPath(string fileName1, string path)

+		{

+			string fileName2 = Path.GetFileName(path);

+			return IsMatchIgnoringCase(fileName1, fileName2);

+		}

+		

+		public override void AddFile(string path, Stream stream)

+		{

+			PhysicalFileSystemAddFile(path, stream);

+			GuiSyncDispatch (async () => await AddFileToProject (path));

+		}

+		

+		protected virtual void PhysicalFileSystemAddFile(string path, Stream stream)

+		{

+			base.AddFile(path, stream);

+		}

+		

+		public override void AddFile(string path, Action<Stream> writeToStream)

+		{

+			PhysicalFileSystemAddFile (path, writeToStream);

+			GuiSyncDispatch (async () => await AddFileToProject (path));

+		}

+

+		protected virtual void PhysicalFileSystemAddFile (string path, Action<Stream> writeToStream)

+		{

+			base.AddFile(path, writeToStream);

+		}

+

+		async Task AddFileToProject(string path)

+		{

+			if (ShouldAddFileToProject(path)) {

+				await AddFileProjectItemToProject(path);

+			}

+			OnFileChanged (path);

+			LogAddedFileToProject(path);

+		}

+		

+		bool ShouldAddFileToProject(string path)

+		{

+			return !IsBinDirectory(path) && !FileExistsInProject(path);

+		}

+

+		void OnFileChanged (string path)

+		{

+			GuiSyncDispatch (() => fileService.OnFileChanged (GetFullPath (path)));

+		}

+		

+		bool IsBinDirectory(string path)

+		{

+			string directoryName = Path.GetDirectoryName(path);

+			return IsMatchIgnoringCase(directoryName, "bin");

+		}

+		

+		public bool FileExistsInProject(string path)

+		{

+			string fullPath = GetFullPath(path);

+			return GuiSyncDispatch (() => {

+				return project.IsFileInProject (fullPath);

+			});

+		}

+		

+		async Task AddFileProjectItemToProject(string path)

+		{

+			ProjectFile fileItem = CreateFileProjectItem (path);

+			project.AddFile (fileItem);

+			await project.SaveAsync ();

+		}

+		

+		ProjectFile CreateFileProjectItem(string path)

+		{

+			//TODO custom tool?

+			string fullPath = GetFullPath(path);

+			string buildAction = project.GetDefaultBuildAction(fullPath);

+			return new ProjectFile(fullPath) {

+				BuildAction = buildAction

+			};

+		}

+		

+		void LogAddedFileToProject(string fileName)

+		{

+			LogAddedFileToProject(fileName, ProjectName);

+		}

+		

+		protected virtual void LogAddedFileToProject(string fileName, string projectName)

+		{

+			DebugLogFormat("Added file '{0}' to project '{1}'.", fileName, projectName);

+		}

+		

+		public override void DeleteDirectory(string path, bool recursive)

+		{

+			GuiSyncDispatch (async () => {

+				string directory = GetFullPath (path);

+				fileService.RemoveDirectory (directory);

+				await project.SaveAsync ();

+				LogDeletedDirectory (path);

+			});

+		}

+		

+		public override void DeleteFile(string path)

+		{

+			GuiSyncDispatch (async () => {

+				string fileName = GetFullPath (path);

+				project.Files.Remove (fileName);

+				fileService.RemoveFile (fileName);

+				await project.SaveAsync ();

+				LogDeletedFileInfo (path);

+			});

+		}

+		

+		protected virtual void LogDeletedDirectory(string folder)

+		{

+			DebugLogFormat("Removed folder '{0}'.", folder);

+		}

+		

+		void LogDeletedFileInfo(string path)

+		{

+			string fileName = Path.GetFileName(path);

+			string directory = Path.GetDirectoryName(path);

+			if (String.IsNullOrEmpty(directory)) {

+				LogDeletedFile(fileName);

+			} else {

+				LogDeletedFileFromDirectory(fileName, directory);

+			}

+		}

+		

+		protected virtual void LogDeletedFile(string fileName)

+		{

+			DebugLogFormat("Removed file '{0}'.", fileName);

+		}

+		

+		protected virtual void LogDeletedFileFromDirectory(string fileName, string directory)

+		{

+			DebugLogFormat("Removed file '{0}' from folder '{1}'.", fileName, directory);

+		}

+		

+		public void AddFrameworkReference(string name)

+		{

+			GuiSyncDispatch (async () => {

+				ProjectReference assemblyReference = CreateGacReference (name);

+				await AddReferenceToProject (assemblyReference);

+			});

+		}

+		

+		ProjectReference CreateGacReference(string name)

+		{

+			return ProjectReference.CreateAssemblyReference (name);

+		}

+		

+		public string ResolvePath(string path)

+		{

+			return path;

+		}

+		

+		public void AddImport(string targetPath, ProjectImportLocation location)

+		{

+			GuiSyncDispatch (async () => {

+				string relativeTargetPath = GetRelativePath (targetPath);

+				string condition = GetCondition (relativeTargetPath);

+				using (var handler = CreateNewImportsHandler ()) {

+					handler.AddImportIfMissing (relativeTargetPath, condition, location);

+					await project.SaveAsync ();

+				}

+			});

+		}

+

+		protected virtual INuGetPackageNewImportsHandler CreateNewImportsHandler ()

+		{

+			return new NuGetPackageNewImportsHandler ();

+		}

+

+		static string GetCondition (string targetPath)

+		{

+			return String.Format ("Exists('{0}')", targetPath);

+		}

+

+		string GetRelativePath(string path)

+		{

+			return MSBuildProjectService.ToMSBuildPath (project.BaseDirectory, path);

+		}

+		

+		public void RemoveImport(string targetPath)

+		{

+			GuiSyncDispatch (async () => {

+				string relativeTargetPath = GetRelativePath (targetPath);

+				project.RemoveImport (relativeTargetPath);

+				RemoveImportWithForwardSlashes (targetPath);

+

+				using (var updater = new EnsureNuGetPackageBuildImportsTargetUpdater ()) {

+					updater.RemoveImport (relativeTargetPath);

+					await project.SaveAsync ();

+				}

+

+				packageManagementEvents.OnImportRemoved (project, relativeTargetPath);

+			});

+		}

+

+		void RemoveImportWithForwardSlashes (string targetPath)

+		{

+			string relativeTargetPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, targetPath);

+			if (Path.DirectorySeparatorChar == '\\') {

+				relativeTargetPath = relativeTargetPath.Replace ('\\', '/');

+			}

+			project.RemoveImport (relativeTargetPath);

+		}

+

+		/// <summary>

+		/// NuGet sometimes uses CreateFile to replace an existing file.

+		/// This happens when the XML transformation (web.config.transform) is reverted on 

+		/// uninstalling a NuGet package. It also happens when an XML document transform 

+		/// (.install.xdt, .uninstall.xdt) is run.

+		/// </summary>

+		public override Stream CreateFile (string path)

+		{

+			OnFileChanged (path);

+			return base.CreateFile (path);

+		}

+

+		T GuiSyncDispatch<T> (Func<T> action)

+		{

+			T result = default(T);

+			guiSyncDispatcher (() => result = action ());

+			return result;

+		}

+

+		void GuiSyncDispatch (Action action)

+		{

+			guiSyncDispatcher (() => action ());

+		}

+

+		static Task GuiSyncDispatchWithException (Func<Task> func)

+		{

+			if (Runtime.IsMainThread)

+				throw new InvalidOperationException ("GuiSyncDispatch called from GUI thread");

+			return Runtime.RunInMainThread (func);

+		}

+

+		public static void DefaultGuiSyncDispatcher (Action action)

+		{

+			Runtime.RunInMainThread (action).Wait ();

+		}

+

+		void GuiSyncDispatch (Func<Task> func)

+		{

+			guiSyncDispatcherFunc (func).Wait ();

+		}

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystemFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystemFactory.cs
new file mode 100644
index 0000000000..62dc7d1817
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopProjectSystemFactory.cs
@@ -0,0 +1,42 @@
+// 

+// MonoDevelopProjectSystemFactory.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2012 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System;

+using MonoDevelop.Projects;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal class MonoDevelopProjectSystemFactory : IMonoDevelopProjectSystemFactory

+	{

+		public IProjectSystem CreateProjectSystem(DotNetProject project)

+		{

+			return new MonoDevelopProjectSystem(project);

+		}

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NuGetPackageNewImportsHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NuGetPackageNewImportsHandler.cs
new file mode 100644
index 0000000000..ba687b81a1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NuGetPackageNewImportsHandler.cs
@@ -0,0 +1,65 @@
+//
+// NuGetPackageNewImportsHandler.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using MonoDevelop.Projects.MSBuild;
+using NuGet;
+
+namespace MonoDevelop.PackageManagement
+{
+	internal class NuGetPackageNewImportsHandler : INuGetPackageNewImportsHandler
+	{
+		string name;
+		string condition;
+		ProjectImportLocation location;
+
+		public NuGetPackageNewImportsHandler ()
+		{
+			PackageManagementMSBuildExtension.NewImportsHandler = this;
+		}
+
+		public void Dispose ()
+		{
+			PackageManagementMSBuildExtension.NewImportsHandler = null;
+		}
+
+		public void AddImportIfMissing (string name, string condition, ProjectImportLocation location)
+		{
+			this.name = name;
+			this.condition = condition;
+			this.location = location;
+		}
+
+		public void UpdateProject (MSBuildProject project)
+		{
+			if (String.IsNullOrEmpty (name))
+				return;
+
+			project.AddImportIfMissing (name, location, condition);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NullOpenPackageReadMeMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NullOpenPackageReadMeMonitor.cs
index 51414a77f0..679b82cb30 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NullOpenPackageReadMeMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/NullOpenPackageReadMeMonitor.cs
@@ -26,7 +26,7 @@
 

 namespace MonoDevelop.PackageManagement

 {

-	public class NullOpenPackageReadMeMonitor : IOpenPackageReadMeMonitor

+	internal class NullOpenPackageReadMeMonitor : IOpenPackageReadMeMonitor

 	{

 		public static readonly IOpenPackageReadMeMonitor Null = new NullOpenPackageReadMeMonitor ();

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/OpenDotNetProjects.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/OpenDotNetProjects.cs
index cd3138b4bc..1faa3b74a9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/OpenDotNetProjects.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/OpenDotNetProjects.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using MonoDevelop.Projects;

 using MonoDevelop.PackageManagement;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class OpenDotNetProjects

+	internal class OpenDotNetProjects

 	{

 		IPackageManagementProjectService projectService;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/OpenPackageReadmeMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/OpenPackageReadmeMonitor.cs
index dcef59e884..a88d721192 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/OpenPackageReadmeMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/OpenPackageReadmeMonitor.cs
@@ -27,12 +27,12 @@
 using System;

 using System.IO;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class OpenPackageReadMeMonitor : IOpenPackageReadMeMonitor

+	internal class OpenPackageReadMeMonitor : IOpenPackageReadMeMonitor

 	{

 		IPackageManagementProject project;

 		IPackageManagementFileService fileService;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageActionRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageActionRunner.cs
index 9e5eebfacf..3836dbeff3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageActionRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageActionRunner.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageActionRunner : IPackageActionRunner

+	internal class PackageActionRunner : IPackageActionRunner

 	{

 		IPackageManagementEvents packageManagementEvents;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibility.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibility.cs
index c4841df845..69922f7a32 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibility.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibility.cs
@@ -28,12 +28,12 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 using System.Runtime.Versioning;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageCompatibility

+	internal class PackageCompatibility

 	{

 		IDotNetProject project;

 		IPackage package;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityChecker.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityChecker.cs
index 1252aa9018..38ae89ad1e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityChecker.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityChecker.cs
@@ -1,41 +1,42 @@
-//

-// PackageCompatibilityChecker.cs

-//

-// Author:

-//       Matt Ward <matt.ward@xamarin.com>

-//

-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

+//
+// PackageCompatibilityChecker.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System;

 using System.Collections.Generic;

 using System.IO;

 using System.Linq;

 using System.Runtime.Versioning;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 using NuGet;

-

+using MonoDevelop.Core;
+
 namespace MonoDevelop.PackageManagement

 {

-	public class PackageCompatibilityChecker

+	internal class PackageCompatibilityChecker

 	{

 		IPackageManagementSolution solution;

 		IRegisteredPackageRepositories registeredRepositories;

@@ -118,9 +119,9 @@ namespace MonoDevelop.PackageManagement
 			return packageReferences.Any (packageReference => packageReference.RequireReinstallation);

 		}

 

-		protected virtual void GuiDispatch (MessageHandler handler)

+		protected virtual void GuiDispatch (Action handler)

 		{

-			DispatchService.GuiDispatch (handler);

+			Runtime.RunInMainThread (handler);

 		}

 

 		public void GenerateReport (TextWriter writer)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityHandler.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityHandler.cs
index 07d943a34b..f01886e712 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityHandler.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityHandler.cs
@@ -25,12 +25,12 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageCompatibilityHandler

+	internal class PackageCompatibilityHandler

 	{

 		public void MonitorTargetFrameworkChanges (ProjectTargetFrameworkMonitor projectTargetFrameworkMonitor)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs
index 5d52a4614d..90ed0fe71e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageCompatibilityRunner.cs
@@ -26,21 +26,22 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using System.Threading.Tasks;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageCompatibilityRunner

+	internal class PackageCompatibilityRunner

 	{

 		IDotNetProject project;

 		IPackageManagementSolution solution;

 		IRegisteredPackageRepositories registeredRepositories;

 		IPackageManagementProgressMonitorFactory progressMonitorFactory;

 		ProgressMonitorStatusMessage progressMessage;

-		IProgressMonitor progressMonitor;

+		ProgressMonitor progressMonitor;

 		IPackageManagementEvents packageManagementEvents;

 		IProgressProvider progressProvider;

 

@@ -76,9 +77,9 @@ namespace MonoDevelop.PackageManagement
 			BackgroundDispatch (() => RunInternal ());

 		}

 

-		protected virtual void BackgroundDispatch (MessageHandler handler)

+		protected virtual void BackgroundDispatch (Action action)

 		{

-			DispatchService.BackgroundDispatch (() => RunInternal ());

+			PackageManagementBackgroundDispatcher.Dispatch (action);

 		}

 

 		void RunInternal ()

@@ -101,18 +102,18 @@ namespace MonoDevelop.PackageManagement
 			return ProgressMonitorStatusMessageFactory.CreateCheckingPackageCompatibilityMessage ();

 		}

 

-		IProgressMonitor CreateProgressMonitor ()

+		ProgressMonitor CreateProgressMonitor ()

 		{

 			return progressMonitorFactory.CreateProgressMonitor (progressMessage.Status);

 		}

 

-		PackageManagementEventsMonitor CreateEventMonitor (IProgressMonitor monitor)

+		PackageManagementEventsMonitor CreateEventMonitor (ProgressMonitor monitor)

 		{

 			return CreateEventMonitor (monitor, packageManagementEvents, progressProvider);

 		}

 

 		protected virtual PackageManagementEventsMonitor CreateEventMonitor (

-			IProgressMonitor monitor,

+			ProgressMonitor monitor,

 			IPackageManagementEvents packageManagementEvents,

 			IProgressProvider progressProvider)

 		{

@@ -157,7 +158,7 @@ namespace MonoDevelop.PackageManagement
 			ShowPackageConsole (progressMonitor);

 		}

 

-		protected virtual void ShowPackageConsole (IProgressMonitor progressMonitor)

+		protected virtual void ShowPackageConsole (ProgressMonitor progressMonitor)

 		{

 			progressMonitor.ShowPackageConsole ();

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFiles.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFiles.cs
index 79d2189ecc..c809d8585e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFiles.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFiles.cs
@@ -33,9 +33,9 @@ using System.Linq;
 

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageFiles

+	internal class PackageFiles

 	{

 		IEnumerable<IPackageFile> files;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFilesForOperations.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFilesForOperations.cs
index 9ebb699d91..d8d8f9ec7c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFilesForOperations.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFilesForOperations.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageFilesForOperations

+	internal class PackageFilesForOperations

 	{

 		IEnumerable<PackageOperation> operations;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFromRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFromRepository.cs
index f597c22480..c5b6ec36f5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFromRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageFromRepository.cs
@@ -33,9 +33,9 @@ using System.Runtime.Versioning;
 

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageFromRepository : IPackageFromRepository

+	internal class PackageFromRepository : IPackageFromRepository

 	{

 		IPackage package;

 		bool? hasDependencies;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageLicenseViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageLicenseViewModel.cs
index b6269554cc..81bc2c340c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageLicenseViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageLicenseViewModel.cs
@@ -27,11 +27,14 @@
 //

 

 using System;

+using System.Collections.Generic;

+using System.Linq;

+using MonoDevelop.Core;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageLicenseViewModel : ViewModelBase<PackageLicenseViewModel>

+	internal class PackageLicenseViewModel : ViewModelBase<PackageLicenseViewModel>

 	{

 		IPackage package;

 		

@@ -51,5 +54,22 @@ namespace ICSharpCode.PackageManagement
 		public Uri LicenseUrl {

 			get { return package.LicenseUrl; }

 		}

+

+		internal string GetAuthors ()

+		{

+			List<string> authors = package.Authors.ToList ();

+

+			string authorStartText = null;

+			if (authors.Count > 1) {

+				authorStartText = GettextCatalog.GetString ("Authors:");

+			} else {

+				authorStartText = GettextCatalog.GetString ("Author:");

+			}

+

+			return String.Format (

+				"{0} {1}",

+				authorStartText,

+				String.Join (", ", authors));

+		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageListViewTextFormatter.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageListViewTextFormatter.cs
index 3bcaf06a72..82eb773db9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageListViewTextFormatter.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageListViewTextFormatter.cs
@@ -29,7 +29,7 @@ using System.Text;
 

 namespace MonoDevelop.PackageManagement

 {

-	public static class PackageListViewTextFormatter

+	internal static class PackageListViewTextFormatter

 	{

 		public static string Format (string text)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementBackgroundDispatcher.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementBackgroundDispatcher.cs
new file mode 100644
index 0000000000..1839762c2c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementBackgroundDispatcher.cs
@@ -0,0 +1,96 @@
+//
+// PackageManagementBackgroundDispatcher.cs
+//
+// Author:
+//   Todd Berman  <tberman@off.net>
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2005 Todd Berman  <tberman@off.net>
+// Copyright (c) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.PackageManagement
+{
+	class PackageManagementBackgroundDispatcher
+	{
+		static Queue<Action> backgroundQueue = new Queue<Action> ();
+		static ManualResetEvent backgroundThreadWait = new ManualResetEvent (false);
+		static Thread backgroundThread;
+
+		public static void Initialize ()
+		{
+			backgroundThread = new Thread (new ThreadStart (RunDispatcher)) {
+				Name = "NuGet background dispatcher",
+				IsBackground = true,
+				Priority = ThreadPriority.Lowest,
+			};
+			backgroundThread.Start ();
+		}
+
+		static void RunDispatcher ()
+		{
+			while (true) {
+				Action action = null;
+				bool wait = false;
+				lock (backgroundQueue) {
+					if (backgroundQueue.Count == 0) {
+						backgroundThreadWait.Reset ();
+						wait = true;
+					} else
+						action = backgroundQueue.Dequeue ();
+				}
+
+				if (wait) {
+					backgroundThreadWait.WaitOne ();
+					continue;
+				}
+
+				if (action != null) {
+					try {
+						action ();
+					} catch (Exception ex) {
+						LoggingService.LogError ("BackgroundDispatcher error.", ex);
+					}
+				}
+			}
+		}
+
+		public static void Dispatch (Action action)
+		{
+			QueueBackground (action);
+		}
+
+		static void QueueBackground (Action action)
+		{
+			lock (backgroundQueue) {
+				backgroundQueue.Enqueue (action);
+				if (backgroundQueue.Count == 1)
+					backgroundThreadWait.Set ();
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementCompilerMessageView.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementCompilerMessageView.cs
index 60d8f50aa1..0cc26c372f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementCompilerMessageView.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementCompilerMessageView.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementCompilerMessageView : ICompilerMessageView

+	internal class PackageManagementCompilerMessageView : ICompilerMessageView

 	{

 		public IMessageViewCategory Create(string categoryName, string categoryDisplayName)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEnumerableExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEnumerableExtensions.cs
index 4033521c6e..302eca8e84 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEnumerableExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEnumerableExtensions.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class PackageManagementEnumerableExtensions

+	internal static class PackageManagementEnumerableExtensions

 	{

 		public static IEnumerable<TSource> DistinctLast<TSource>(this IEnumerable<TSource> source, IEqualityComparer<TSource> comparer)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEvents.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEvents.cs
index fa67203211..f060f0f8ab 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEvents.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEvents.cs
@@ -33,9 +33,9 @@ using NuGet;
 using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementEvents : IPackageManagementEvents

+	internal class PackageManagementEvents : IPackageManagementEvents

 	{

 		public event EventHandler PackageOperationsStarting;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs
index a6130d65f7..4676b26668 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementEventsMonitor.cs
@@ -27,7 +27,7 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 using NuGet;

@@ -35,9 +35,9 @@ using MonoDevelop.Ide.TypeSystem;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementEventsMonitor : IDisposable

+	internal class PackageManagementEventsMonitor : IDisposable

 	{

-		IProgressMonitor progressMonitor;

+		ProgressMonitor progressMonitor;

 		IPackageManagementEvents packageManagementEvents;

 		IProgressProvider progressProvider;

 		FileConflictResolution lastFileConflictResolution;

@@ -48,7 +48,7 @@ namespace MonoDevelop.PackageManagement
 		ISolution solutionContainingProjectBuildersToDispose;

 

 		public PackageManagementEventsMonitor (

-			IProgressMonitor progressMonitor,

+			ProgressMonitor progressMonitor,

 			IPackageManagementEvents packageManagementEvents,

 			IProgressProvider progressProvider)

 		{

@@ -99,9 +99,9 @@ namespace MonoDevelop.PackageManagement
 				(lastFileConflictResolution == FileConflictResolution.OverwriteAll);

 		}

 

-		protected virtual void GuiSyncDispatch (MessageHandler handler)

+		protected virtual void GuiSyncDispatch (Action action)

 		{

-			DispatchService.GuiSyncDispatch (handler);

+			Runtime.RunInMainThread (action).Wait ();

 		}

 

 		void PackageOperationMessageLogged (object sender, PackageOperationMessageLoggedEventArgs e)

@@ -199,7 +199,7 @@ namespace MonoDevelop.PackageManagement
 			packageManagementEvents.OnPackageOperationError (ex);

 		}

 

-		protected virtual void ShowPackageConsole (IProgressMonitor progressMonitor)

+		protected virtual void ShowPackageConsole (ProgressMonitor progressMonitor)

 		{

 			progressMonitor.ShowPackageConsole ();

 		}

@@ -213,10 +213,11 @@ namespace MonoDevelop.PackageManagement
 

 		protected virtual void ReconnectAssemblyReferences (IPackageManagementProject project)

 		{

-			var projectWrapper = TypeSystemService.GetProjectContentWrapper (project.DotNetProject);

-			if (projectWrapper != null) {

-				projectWrapper.ReconnectAssemblyReferences ();

-			}

+			// TODO : Roslyn port ? 

+//			var projectWrapper = TypeSystemService.GetProjectContentWrapper (project.DotNetProject);

+//			if (projectWrapper != null) {

+//				projectWrapper.ReconnectAssemblyReferences ();

+//			}

 		}

 

 		void PackageInstalled (object sender, ParentPackageOperationEventArgs e)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementFileService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementFileService.cs
index e222021128..16f46e11d5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementFileService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementFileService.cs
@@ -31,9 +31,9 @@ using System.IO;
 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementFileService : IPackageManagementFileService

+	internal class PackageManagementFileService : IPackageManagementFileService

 	{

 		IPackageManagementEvents packageManagementEvents;

 

@@ -71,9 +71,9 @@ namespace ICSharpCode.PackageManagement
 

 		public void OpenFile (string path)

 		{

-			DispatchService.GuiSyncDispatch (() => {

+			Runtime.RunInMainThread (() => {

 				IdeApp.Workbench.OpenDocument (path, null, true);

-			});

+			}).Wait ();

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementLogger.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementLogger.cs
index c1e0f33bfc..688188d843 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementLogger.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementLogger.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementLogger : ILogger

+	internal class PackageManagementLogger : ILogger

 	{

 		IPackageManagementEvents packageManagementEvents;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs
index 596a30aafa..2d7ea6dca8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMSBuildExtension.cs
@@ -27,19 +27,31 @@
 using System;

 using MonoDevelop.Core;

 using MonoDevelop.Projects;

-using MonoDevelop.Projects.Formats.MSBuild;

+using MonoDevelop.Projects.MSBuild;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementMSBuildExtension : MSBuildExtension

+	internal class PackageManagementMSBuildExtension : ProjectExtension

 	{

 		public static EnsureNuGetPackageBuildImportsTargetUpdater Updater;

+		public static NuGetPackageNewImportsHandler NewImportsHandler;

 

-		public override void SaveProject (IProgressMonitor monitor, SolutionEntityItem item, MSBuildProject project)

+		protected override void OnWriteProject (ProgressMonitor monitor, MSBuildProject msproject)

+		{

+			UpdateProject (msproject);

+			base.OnWriteProject (monitor, msproject);

+		}

+

+		public void UpdateProject (MSBuildProject msproject)

 		{

 			EnsureNuGetPackageBuildImportsTargetUpdater currentUpdater = Updater;

 			if (currentUpdater != null) {

-				currentUpdater.UpdateProject (project);

+				currentUpdater.UpdateProject (msproject);

+			}

+

+			NuGetPackageNewImportsHandler importsHandler = NewImportsHandler;

+			if (importsHandler != null) {

+				importsHandler.UpdateProject (msproject);

 			}

 		}

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMessageViewCategory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMessageViewCategory.cs
index 3bd784677f..8665006a0d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMessageViewCategory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementMessageViewCategory.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementMessageViewCategory : IMessageViewCategory

+	internal class PackageManagementMessageViewCategory : IMessageViewCategory

 	{

 //		MessageViewCategory messageViewCategory;

 //		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOptions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOptions.cs
index 2e15423ba0..6965afb94a 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOptions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOptions.cs
@@ -34,9 +34,9 @@ using MonoDevelop.Core;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementOptions

+	internal class PackageManagementOptions

 	{

 		const string PackageDirectoryPropertyName = "PackagesDirectory";

 		const string RecentPackagesPropertyName = "RecentPackages";

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOptionsViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOptionsViewModel.cs
index 72f74dbded..125fd06ca8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOptionsViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOptionsViewModel.cs
@@ -29,9 +29,9 @@
 using System;

 using System.Linq;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementOptionsViewModel : ViewModelBase<PackageManagementOptionsViewModel>

+	internal class PackageManagementOptionsViewModel : ViewModelBase<PackageManagementOptionsViewModel>

 	{

 		PackageManagementOptions options;

 		IRecentPackageRepository recentPackageRepository;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOutputMessagesView.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOutputMessagesView.cs
index 87614c038e..9a8be1795d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOutputMessagesView.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementOutputMessagesView.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementOutputMessagesView : IPackageManagementOutputMessagesView

+	internal class PackageManagementOutputMessagesView : IPackageManagementOutputMessagesView

 	{

 		public static readonly string CategoryName = "PackageManagement";

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressMonitor.cs
index 01df99b9a0..1bda3c5992 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressMonitor.cs
@@ -1,4 +1,4 @@
-//

+//

 // PackageManagementProgressMonitor.cs

 //

 // Author:

@@ -30,166 +30,94 @@ using System.IO;
 using System.Linq;

 using MonoDevelop.Core;

 using MonoDevelop.Core.Execution;

+using System.Threading;

 using MonoDevelop.Core.ProgressMonitoring;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementProgressMonitor : IProgressMonitor, IAsyncOperation

+	internal class PackageManagementProgressMonitor : ProgressMonitor

 	{

-		IProgressMonitor consoleMonitor;

-		IProgressMonitor statusMonitor;

-		List<string> warnings = new List<string> ();

-		List<string> errors = new List<string> ();

+		OutputProgressMonitor consoleMonitor;

+		CancellationTokenRegistration consoleMonitorReg;

+		CancellationTokenRegistration statusMonitorReg;

 

-		public IProgressMonitor ConsoleMonitor {

+		public ProgressMonitor ConsoleMonitor {

 			get { return consoleMonitor; }

 		}

 

-		public IConsole Console {

-			get { return (IConsole)this.consoleMonitor; }

+		public OperationConsole Console {

+			get { return consoleMonitor.Console; }

 		}

 

-		public PackageManagementProgressMonitor (IProgressMonitor consoleMonitor, IProgressMonitor statusMonitor)

+		public PackageManagementProgressMonitor (OutputProgressMonitor consoleMonitor, ProgressMonitor statusMonitor)

 		{

+			AddFollowerMonitor (statusMonitor);

 			this.consoleMonitor = consoleMonitor;

-			this.statusMonitor = statusMonitor;

-

-			consoleMonitor.CancelRequested += OnCancelRequested;

-			statusMonitor.CancelRequested += OnCancelRequested;

-		}

-

-		public void BeginTask (string name, int totalWork)

-		{

-			statusMonitor.BeginTask (name, totalWork);

-		}

-

-		public void BeginStepTask (string name, int totalWork, int stepSize)

-		{

-			statusMonitor.BeginStepTask (name, totalWork, stepSize);

-		}

-

-		public void EndTask ()

-		{

-			statusMonitor.EndTask ();

-		}

 

-		public void Step (int work)

-		{

-			statusMonitor.Step (work);

+			consoleMonitorReg = consoleMonitor.CancellationToken.Register (OnCancelRequested);

+			statusMonitorReg = statusMonitor.CancellationToken.Register (OnCancelRequested);

 		}

 

-		public TextWriter Log

+		protected override void OnWriteLog (string message)

 		{

-			get { return consoleMonitor.Log; }

+			consoleMonitor.Log.Write (message);

 		}

 

-		public void ReportSuccess (string message)

+		protected override void OnWriteErrorLog (string message)

 		{

-			consoleMonitor.ReportSuccess (message);

-			statusMonitor.ReportSuccess (message);

+			consoleMonitor.ErrorLog.Write (message);

 		}

 

-		public void ReportWarning (string message)

+		public override void Dispose ()

 		{

-			warnings.Add (message);

-			statusMonitor.ReportWarning (message);

-		}

+			consoleMonitorReg.Dispose ();

+			statusMonitorReg.Dispose ();

 

-		public void ReportError (string message, Exception ex)

-		{

-			errors.Add (message);

-			statusMonitor.ReportError (message, ex);

-		}

-

-		public void Dispose ()

-		{

-			consoleMonitor.CancelRequested -= OnCancelRequested;

-			statusMonitor.CancelRequested -= OnCancelRequested;

+			foreach (var m in SuccessMessages)

+				consoleMonitor.ReportSuccess (m);

 

 			// Do not report warnings if there are errors otherwise the warnings will

 			// appear at the end of the Package Console and hide the error which 

 			// should be the last line of text visible to the user.

-			if (errors.Count == 0) {

+			if (Errors.Length == 0) {

 				ReportAllWarningsButLastToConsole ();

 			}

 

 			ReportAllErrorsButLastToConsole ();

 

 			consoleMonitor.Dispose ();

-			statusMonitor.Dispose ();

+

+			base.Dispose ();

 		}

 

 		void ReportAllWarningsButLastToConsole ()

 		{

-			warnings = warnings.Distinct ().ToList ();

+			var warnings = Warnings.Distinct ().ToList ();

 			RemoveLastItem (warnings);

 			warnings.ForEach (warning => consoleMonitor.ReportWarning (warning));

 		}

 

 		void ReportAllErrorsButLastToConsole ()

 		{

+			var errors = Errors.ToList ();

 			RemoveLastItem (errors);

-			errors.ForEach (error => consoleMonitor.ReportError (error, null));

+			errors.ForEach (error => consoleMonitor.ReportError (error.Message, error.Exception));

 		}

 

-		static void RemoveLastItem (List<string> items)

+		static void RemoveLastItem<T> (List<T> items)

 		{

 			if (items.Count > 0) {

 				items.RemoveAt (items.Count - 1);

 			}

 		}

 

-		public bool IsCancelRequested

-		{

-			get {

-				return consoleMonitor.IsCancelRequested || statusMonitor.IsCancelRequested;

-			}

-		}

-

 		public object SyncRoot {

 			get { return this; }

 		}

 

-		void OnCancelRequested (IProgressMonitor sender)

-		{

-			AsyncOperation.Cancel ();

-		}

-

-		public IAsyncOperation AsyncOperation

-		{

-			get { return this; }

-		}

-

-		void IAsyncOperation.Cancel ()

-		{

-			consoleMonitor.AsyncOperation.Cancel ();

-		}

-

-		void IAsyncOperation.WaitForCompleted ()

+		void OnCancelRequested ()

 		{

-			consoleMonitor.AsyncOperation.WaitForCompleted ();

-		}

-

-		public bool IsCompleted {

-			get { return consoleMonitor.AsyncOperation.IsCompleted; }

-		}

-

-		bool IAsyncOperation.Success { 

-			get { return consoleMonitor.AsyncOperation.Success; }

-		}

-

-		bool IAsyncOperation.SuccessWithWarnings { 

-			get { return consoleMonitor.AsyncOperation.SuccessWithWarnings; }

-		}

-

-		public event MonitorHandler CancelRequested {

-			add { consoleMonitor.CancelRequested += value; }

-			remove { consoleMonitor.CancelRequested -= value; }

-		}

-

-		public event OperationHandler Completed {

-			add { consoleMonitor.AsyncOperation.Completed += value; }

-			remove { consoleMonitor.AsyncOperation.Completed -= value; }

+			CancellationTokenSource.Cancel ();

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressMonitorFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressMonitorFactory.cs
index d15afde849..4289e0278d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressMonitorFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressMonitorFactory.cs
@@ -29,18 +29,19 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;

 using MonoDevelop.Ide;

 using MonoDevelop.Core.ProgressMonitoring;

+using MonoDevelop.Core.Execution;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementProgressMonitorFactory : IPackageManagementProgressMonitorFactory

+	internal class PackageManagementProgressMonitorFactory : IPackageManagementProgressMonitorFactory

 	{

-		public IProgressMonitor CreateProgressMonitor (string title)

+		public ProgressMonitor CreateProgressMonitor (string title)

 		{

-			IProgressMonitor consoleMonitor = CreatePackageConsoleOutputMonitor ();

+			OutputProgressMonitor consoleMonitor = CreatePackageConsoleOutputMonitor ();

 

 			Pad pad = IdeApp.Workbench.ProgressMonitors.GetPadForMonitor (consoleMonitor);

 

-			IProgressMonitor statusMonitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (

+			ProgressMonitor statusMonitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (

 				title,

 				Stock.StatusSolutionOperation,

 				false,

@@ -51,7 +52,7 @@ namespace MonoDevelop.PackageManagement
 			return new PackageManagementProgressMonitor (consoleMonitor, statusMonitor);

 		}

 

-		IProgressMonitor CreatePackageConsoleOutputMonitor ()

+		OutputProgressMonitor CreatePackageConsoleOutputMonitor ()

 		{

 			return IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor (

 				"PackageConsole",

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressProvider.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressProvider.cs
index 4c2353b194..ce0833db17 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressProvider.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProgressProvider.cs
@@ -1,48 +1,49 @@
-//

-// PackageManagementProgressProvider.cs

-//

-// Author:

-//       Matt Ward <matt.ward@xamarin.com>

-//

-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

+//
+// PackageManagementProgressProvider.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using MonoDevelop.Ide;

-

+using MonoDevelop.Core;
+
 namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementProgressProvider : IProgressProvider

+	internal class PackageManagementProgressProvider : IProgressProvider

 	{

-		Action<MessageHandler> guiDispatcher;

+		Action<Action> guiDispatcher;

 

 		public PackageManagementProgressProvider (IPackageRepositoryFactoryEvents repositoryFactoryEvents)

-			: this (repositoryFactoryEvents, DispatchService.GuiDispatch)

+			: this (repositoryFactoryEvents, h => Runtime.RunInMainThread (h))

 		{

 		}

 

 		public PackageManagementProgressProvider (

 			IPackageRepositoryFactoryEvents repositoryFactoryEvents,

-			Action<MessageHandler> guiDispatcher)

+			Action<Action> guiDispatcher)

 		{

 			repositoryFactoryEvents.RepositoryCreated += RepositoryCreated;

 			this.guiDispatcher = guiDispatcher;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProject.cs
index 2aa0377574..4b5c6c8eeb 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProject.cs
@@ -35,12 +35,12 @@ using MonoDevelop.PackageManagement;
 using MonoDevelop.Projects;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementProject : IPackageManagementProject

+	internal class PackageManagementProject : IPackageManagementProject

 	{

-		ISharpDevelopPackageManager packageManager;

-		ISharpDevelopProjectManager projectManager;

+		IMonoDevelopPackageManager packageManager;

+		IMonoDevelopProjectManager projectManager;

 		IPackageManagementEvents packageManagementEvents;

 		IDotNetProject project;

 		ProjectTargetFramework targetFramework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectFactory.cs
index 6dfe3931de..94d4efbd09 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectFactory.cs
@@ -30,11 +30,11 @@ using System;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementProjectFactory : IPackageManagementProjectFactory

+	internal class PackageManagementProjectFactory : IPackageManagementProjectFactory

 	{

-		SharpDevelopPackageManagerFactory factory = new SharpDevelopPackageManagerFactory();

+		MonoDevelopPackageManagerFactory factory = new MonoDevelopPackageManagerFactory();

 		IPackageManagementEvents packageManagementEvents;

 		

 		public PackageManagementProjectFactory(IPackageManagementEvents packageManagementEvents)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectOperations.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectOperations.cs
index b550cf2910..9f418a756b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectOperations.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectOperations.cs
@@ -1,45 +1,45 @@
-//

-// PackageManagementProjectOperations.cs

-//

-// Author:

-//       Matt Ward <matt.ward@xamarin.com>

-//

-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

+//
+// PackageManagementProjectOperations.cs
+//
+// Author:
+//       Matt Ward <matt.ward@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 using MonoDevelop.Projects;

 using NuGet;

-

+using MonoDevelop.Core;
+
 namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementProjectOperations : IPackageManagementProjectOperations

+	internal class PackageManagementProjectOperations : IPackageManagementProjectOperations

 	{

 		IPackageManagementSolution solution;

 		IRegisteredPackageRepositories registeredPackageRepositories;

 		BackgroundPackageActionRunner backgroundActionRunner;

-		IPackageManagementEvents packageManagementEvents;

 

 		public PackageManagementProjectOperations (

 			IPackageManagementSolution solution,

@@ -50,7 +50,6 @@ namespace MonoDevelop.PackageManagement
 			this.solution = solution;

 			this.registeredPackageRepositories = registeredPackageRepositories;

 			this.backgroundActionRunner = backgroundActionRunner;

-			this.packageManagementEvents = packageManagementEvents;

 

 			packageManagementEvents.ParentPackageInstalled += PackageInstalled;

 			packageManagementEvents.ParentPackageUninstalled += PackageUninstalled;

@@ -66,19 +65,20 @@ namespace MonoDevelop.PackageManagement
 		{

 			List<IPackageAction> actions = null;

 

-			DispatchService.GuiSyncDispatch (() => {

+			Runtime.RunInMainThread (() => {

 				IPackageRepository repository = CreatePackageRepository (packageSourceUrl);

 				IPackageManagementProject packageManagementProject = solution.GetProject (repository, new DotNetProjectProxy ((DotNetProject)project));

 				actions = packages.Select (packageReference => {

 					InstallPackageAction action = packageManagementProject.CreateInstallPackageAction ();

 					action.PackageId = packageReference.Id;

-					action.PackageVersion = new SemanticVersion (packageReference.Version);

+					action.PackageVersion = new SemanticVersion (packageReference.Version);
+					action.LicensesMustBeAccepted = false;

 					return (IPackageAction)action;

 				}).ToList ();

-			});

+			}).Wait ();

 

 			ProgressMonitorStatusMessage progressMessage = GetProgressMonitorStatusMessages (actions);

-			backgroundActionRunner.RunAndWait (progressMessage, actions);

+			backgroundActionRunner.Run (progressMessage, actions);

 		}

 

 		IPackageRepository CreatePackageRepository (string packageSourceUrl)

@@ -98,19 +98,35 @@ namespace MonoDevelop.PackageManagement
 

 		public IEnumerable<PackageManagementPackageReference> GetInstalledPackages (Project project)

 		{

-			List<PackageManagementPackageReference> packageReferences = null;

-		

-			DispatchService.GuiSyncDispatch (() => {

+			return Runtime.RunInMainThread (() => {

 				string url = RegisteredPackageSources.DefaultPackageSourceUrl;

 				var repository = registeredPackageRepositories.CreateRepository (new PackageSource (url));

 				IPackageManagementProject packageManagementProject = solution.GetProject (repository, new DotNetProjectProxy ((DotNetProject)project));

-				packageReferences = packageManagementProject

+
+				var packages = packageManagementProject

 					.GetPackageReferences ()

 					.Select (packageReference => new PackageManagementPackageReference (packageReference.Id, packageReference.Version.ToString ()))

-					.ToList ();

-			});

-

-			return packageReferences;

+					.ToList ();
+
+				packages.AddRange (GetMissingPackagesBeingInstalled (packages, (DotNetProject)project));
+				return packages;

+			}).Result;

+		}
+
+		IEnumerable<PackageManagementPackageReference> GetMissingPackagesBeingInstalled (
+			IEnumerable<PackageManagementPackageReference> existingPackages,
+			DotNetProject project)
+		{
+			return GetPackagesBeingInstalled (project)
+				.Where (package => !existingPackages.Any (existingPackage => existingPackage.Id == package.Id));
+		}
+
+		static IEnumerable<PackageManagementPackageReference> GetPackagesBeingInstalled (DotNetProject project)
+		{
+			return PackageManagementServices.BackgroundPackageActionRunner.PendingInstallActionsForProject (project)
+				.Select (installAction => new PackageManagementPackageReference (
+					installAction.GetPackageId (), 
+					installAction.GetPackageVersion ().ToString ()));
 		}

 

 		void PackageUninstalled (object sender, ParentPackageOperationEventArgs e)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectService.cs
index 00bd3ab908..27b1348402 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementProjectService.cs
@@ -32,9 +32,9 @@ using MonoDevelop.Ide;
 using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementProjectService : IPackageManagementProjectService

+	internal class PackageManagementProjectService : IPackageManagementProjectService

 	{

 		public PackageManagementProjectService ()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementPropertyService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementPropertyService.cs
index ea0936f826..4f29cd7248 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementPropertyService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementPropertyService.cs
@@ -29,9 +29,9 @@
 using System;

 using MonoDevelop.Core;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementPropertyService : IPropertyService

+	internal class PackageManagementPropertyService : IPropertyService

 	{

 		public string DataDirectory {

 			get { return UserProfile.Current.ConfigDir; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSelectedProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSelectedProject.cs
index d4eef0a928..4d0b7656ad 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSelectedProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSelectedProject.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementSelectedProject : IPackageManagementSelectedProject

+	internal class PackageManagementSelectedProject : IPackageManagementSelectedProject

 	{

 		public PackageManagementSelectedProject(IPackageManagementProject project)

 			: this(project, selected: false)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSelectedProjects.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSelectedProjects.cs
index d2d5b69700..a99fcd5fd5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSelectedProjects.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSelectedProjects.cs
@@ -36,9 +36,9 @@ using MonoDevelop.Projects;
 using NuGet;

 using MonoDevelop.PackageManagement;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementSelectedProjects

+	internal class PackageManagementSelectedProjects

 	{

 		bool? singleProjectSelected;

 		IDotNetProject singleDotNetProjectSelected;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementServices.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementServices.cs
index f07f6e48b2..80f1349706 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementServices.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementServices.cs
@@ -28,10 +28,9 @@
 

 using System;

 using NuGet;

-using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

 	public static class PackageManagementServices

 	{

@@ -81,9 +80,10 @@ namespace ICSharpCode.PackageManagement
 			projectOperations = new PackageManagementProjectOperations (solution, registeredPackageRepositories, backgroundPackageActionRunner, packageManagementEvents);

 

 			InitializeCredentialProvider();

+			PackageManagementBackgroundDispatcher.Initialize ();

 		}

 		

-		public static void InitializeCredentialProvider()

+		internal static void InitializeCredentialProvider()

 		{

 			HttpClient.DefaultCredentialProvider = CreateSettingsCredentialProvider (new MonoDevelopCredentialProvider ());

 		}

@@ -105,63 +105,63 @@ namespace ICSharpCode.PackageManagement
 			return NullSettings.Instance;

 		}

 

-		public static PackageManagementOptions Options {

+		internal static PackageManagementOptions Options {

 			get { return options; }

 		}

 		

-		public static IPackageManagementSolution Solution {

+		internal static IPackageManagementSolution Solution {

 			get { return solution; }

 		}

 		

-		public static IRegisteredPackageRepositories RegisteredPackageRepositories {

+		internal static IRegisteredPackageRepositories RegisteredPackageRepositories {

 			get { return registeredPackageRepositories; }

 		}

 		

-		public static IPackageRepositoryCache PackageRepositoryCache {

+		internal static IPackageRepositoryCache PackageRepositoryCache {

 			get { return packageRepositoryCache; }

 		}

 		

-		public static IPackageManagementEvents PackageManagementEvents {

+		internal static IPackageManagementEvents PackageManagementEvents {

 			get { return packageManagementEvents; }

 		}

 		

-		public static IPackageManagementOutputMessagesView OutputMessagesView {

+		internal static IPackageManagementOutputMessagesView OutputMessagesView {

 			get { return outputMessagesView; }

 		}

 		

-		public static IPackageManagementProjectService ProjectService {

+		internal static IPackageManagementProjectService ProjectService {

 			get { return projectService; }

 		}

 		

-		public static IPackageActionRunner PackageActionRunner {

+		internal static IPackageActionRunner PackageActionRunner {

 			get { return packageActionRunner; }

 		}

 		

-		public static IPackageRepositoryCache ProjectTemplatePackageRepositoryCache {

+		internal static IPackageRepositoryCache ProjectTemplatePackageRepositoryCache {

 			get { return projectTemplatePackageRepositoryCache; }

 		}

 		

-		public static RegisteredPackageSources ProjectTemplatePackageSources {

+		internal static RegisteredPackageSources ProjectTemplatePackageSources {

 			get { return projectTemplatePackageSources.PackageSources; }

 		}

 

-		public static IBackgroundPackageActionRunner BackgroundPackageActionRunner {

+		internal static IBackgroundPackageActionRunner BackgroundPackageActionRunner {

 			get { return backgroundPackageActionRunner; }

 		}

 

-		public static IPackageManagementProgressMonitorFactory ProgressMonitorFactory {

+		internal static IPackageManagementProgressMonitorFactory ProgressMonitorFactory {

 			get { return progressMonitorFactory; }

 		}

 

-		public static IRecentPackageRepository RecentPackageRepository {

+		internal static IRecentPackageRepository RecentPackageRepository {

 			get { return packageRepositoryCache.RecentPackageRepository; }

 		}

 

-		public static IProgressProvider ProgressProvider {

+		internal static IProgressProvider ProgressProvider {

 			get { return progressProvider; }

 		}

 

-		public static IUpdatedPackagesInSolution UpdatedPackagesInSolution {

+		internal static IUpdatedPackagesInSolution UpdatedPackagesInSolution {

 			get { return updatedPackagesInSolution; }

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolution.cs
index f732ecd211..b5c5418f23 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolution.cs
@@ -26,21 +26,28 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 //

 

-using System;

 using System.Collections.Generic;

 using System.Linq;

-using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementSolution : IPackageManagementSolution

+	internal class PackageManagementSolution : IPackageManagementSolution

 	{

 		IRegisteredPackageRepositories registeredPackageRepositories;

 		IPackageManagementProjectService projectService;

 		IPackageManagementProjectFactory projectFactory;

 		ISolutionPackageRepositoryFactory solutionPackageRepositoryFactory;

-		

+

+		internal PackageManagementSolution (

+			IPackageManagementProjectService projectService)

+			: this (

+				PackageManagementServices.RegisteredPackageRepositories,

+				projectService,

+				PackageManagementServices.PackageManagementEvents)

+		{

+		}

+

 		public PackageManagementSolution(

 			IRegisteredPackageRepositories registeredPackageRepositories,

 			IPackageManagementProjectService projectService,

@@ -153,6 +160,11 @@ namespace ICSharpCode.PackageManagement
 		{

 			return CreateProject (sourceRepository, project);

 		}

+

+		public IPackageManagementProject GetProject (IDotNetProject project)

+		{

+			return CreateProject (registeredPackageRepositories.CreateAggregateRepository(), project);

+		}

 		

 		public IEnumerable<IDotNetProject> GetDotNetProjects ()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolutionExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolutionExtensions.cs
index 4f9ef87876..128412cff8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolutionExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolutionExtensions.cs
@@ -24,19 +24,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using System;
-using MonoDevelop.PackageManagement;
 using MonoDevelop.Projects;
 
-namespace ICSharpCode.PackageManagement
+namespace MonoDevelop.PackageManagement
 {
-	public static class PackageManagementSolutionExtensions
+	internal static class PackageManagementSolutionExtensions
 	{
 		public static IPackageManagementProject GetProject (this IPackageManagementSolution solution, DotNetProject project)
 		{
 			var projectProxy = new DotNetProjectProxy (project);
-			var repository = PackageManagementServices.PackageRepositoryCache.CreateAggregateWithPriorityMachineCacheRepository ();
-			return solution.GetProject (repository, projectProxy);
+			return solution.GetProject (projectProxy);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolutionProjectService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolutionProjectService.cs
new file mode 100644
index 0000000000..b0054728d5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementSolutionProjectService.cs
@@ -0,0 +1,72 @@
+//

+// PackageManagementSolutionProjectService.cs

+//

+// Author:

+//       Matt Ward <matt.ward@xamarin.com>

+//

+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+using System;

+using System.Collections.Generic;

+using MonoDevelop.Projects;

+

+namespace MonoDevelop.PackageManagement

+{

+	class PackageManagementSolutionProjectService : IPackageManagementProjectService

+	{

+		SolutionProxy solution;

+

+		public PackageManagementSolutionProjectService (Solution solution)

+		{

+			this.solution = new SolutionProxy (solution);

+		}

+

+		public IProject CurrentProject {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		public ISolution OpenSolution {

+			get { return solution; }

+		}

+

+		public IEnumerable<IDotNetProject> GetOpenProjects ()

+		{

+			return solution.GetAllProjects ();

+		}

+

+		public event EventHandler<ProjectReloadedEventArgs> ProjectReloaded;

+		public event EventHandler SolutionLoaded;

+		public event EventHandler SolutionUnloaded;

+

+		public IProjectBrowserUpdater CreateProjectBrowserUpdater ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		public string GetDefaultCustomToolForFileName (ProjectFile projectItem)

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

+

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementTask.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementTask.cs
index 97753656b7..9c890d49e7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementTask.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementTask.cs
@@ -30,9 +30,9 @@ using System;
 using System.Threading;

 using System.Threading.Tasks;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementTask<TResult> : ITask<TResult>

+	internal class PackageManagementTask<TResult> : ITask<TResult>

 	{

 		Task<TResult> task;

 		Action<ITask<TResult>> continueWith;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementTaskFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementTaskFactory.cs
index 6189173548..c57ca72e60 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementTaskFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementTaskFactory.cs
@@ -32,9 +32,9 @@ using System.Threading.Tasks;
 

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementTaskFactory : ITaskFactory

+	internal class PackageManagementTaskFactory : ITaskFactory

 	{

 		public ITask<TResult> CreateTask<TResult>(

 			Func<TResult> function,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementViewModels.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementViewModels.cs
index 8132c0eea9..600165760b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementViewModels.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementViewModels.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageManagementViewModels

+	internal class PackageManagementViewModels

 	{

 		ManagePackagesViewModel managePackagesViewModel;

 		RegisteredPackageSourcesViewModel registeredPackageSourcesViewModel;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationExceptionEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationExceptionEventArgs.cs
index 74442bc0ed..1e51a75eda 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationExceptionEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationExceptionEventArgs.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageOperationExceptionEventArgs : EventArgs

+	internal class PackageOperationExceptionEventArgs : EventArgs

 	{

 		public PackageOperationExceptionEventArgs(Exception ex)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationMessage.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationMessage.cs
index 73f0ffafa3..5bf7a7d2d5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationMessage.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationMessage.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageOperationMessage

+	internal class PackageOperationMessage

 	{

 		string message;

 		object[] args;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationMessageLoggedEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationMessageLoggedEventArgs.cs
index 0b8c984458..cb06eeb2b1 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationMessageLoggedEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationMessageLoggedEventArgs.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageOperationMessageLoggedEventArgs : EventArgs

+	internal class PackageOperationMessageLoggedEventArgs : EventArgs

 	{

 		public PackageOperationMessageLoggedEventArgs(

 			MessageLevel level,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationsResolverFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationsResolverFactory.cs
index 323b4e3b54..7615494c4b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationsResolverFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageOperationsResolverFactory.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageOperationsResolverFactory : IPackageOperationResolverFactory

+	internal class PackageOperationsResolverFactory : IPackageOperationResolverFactory

 	{

 		public IPackageOperationResolver CreateInstallPackageOperationResolver(

 			IPackageRepository localRepository,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceExtensions.cs
index 14ae2402b7..c2fc1b11d8 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceExtensions.cs
@@ -26,13 +26,13 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public static class PackageReferenceExtensions

+	internal static class PackageReferenceExtensions

 	{

 		public static bool IsPackageInstalled (this PackageReference packageReference, DotNetProject project)

 		{

@@ -52,6 +52,15 @@ namespace MonoDevelop.PackageManagement
 				.GetPackageLookupPaths (packageReference.Id, packageReference.Version)

 				.Any ();

 		}

+

+		public static bool IsReleaseVersion (this PackageReference packageReference)

+		{

+			if (packageReference.Version == null) {

+				return true;

+			}

+

+			return String.IsNullOrEmpty (packageReference.Version.SpecialVersion);

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceMonitor.cs
new file mode 100644
index 0000000000..732940d0df
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReferenceMonitor.cs
@@ -0,0 +1,71 @@
+// 

+// PackageReferenceMonitor.cs

+// 

+// Author:

+//   Matt Ward <ward.matt@gmail.com>

+// 

+// Copyright (C) 2013 Matthew Ward

+// 

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+// 

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+

+using System;

+using System.Collections.Generic;

+using NuGet;

+

+namespace MonoDevelop.PackageManagement

+{

+	internal class PackageReferenceMonitor : IDisposable

+	{

+		IMonoDevelopProjectManager projectManager;

+		IMonoDevelopPackageManager packageManager;

+		List<IPackage> packagesRemoved = new List<IPackage>();

+		

+		public PackageReferenceMonitor (

+			IMonoDevelopProjectManager projectManager,

+			IMonoDevelopPackageManager packageManager)

+		{

+			this.projectManager = projectManager;

+			this.packageManager = packageManager;

+			projectManager.PackageReferenceRemoved += PackageReferenceRemoved;

+			projectManager.PackageReferenceAdded += PackageReferenceAdded;

+		}

+		

+		void PackageReferenceRemoved(object sender, PackageOperationEventArgs e)

+		{

+			packagesRemoved.Add(e.Package);

+		}

+

+		void PackageReferenceAdded (object sender, PackageOperationEventArgs e)

+		{

+			packageManager.InstallPackageIntoSolutionRepository (e.Package);

+		}

+		

+		public void Dispose()

+		{

+			projectManager.PackageReferenceRemoved -= PackageReferenceRemoved;

+			projectManager.PackageReferenceAdded -= PackageReferenceAdded;

+		}

+		

+		public List<IPackage> PackagesRemoved {

+			get { return packagesRemoved; }

+		}

+	}

+}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReinstaller.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReinstaller.cs
index 7efd25eb1a..bff3dcbf99 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReinstaller.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageReinstaller.cs
@@ -25,12 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

 using MonoDevelop.PackageManagement.NodeBuilders;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageReinstaller

+	internal class PackageReinstaller

 	{

 		IPackageManagementSolution solution;

 		IBackgroundPackageActionRunner runner;

@@ -59,7 +58,7 @@ namespace MonoDevelop.PackageManagement
 		public void Run (PackageReferenceNode packageReferenceNode, ProgressMonitorStatusMessage progressMessage)

 		{

 			try {

-				IPackageManagementProject project = solution.GetActiveProject ();

+				IPackageManagementProject project = solution.GetProject (packageReferenceNode.Project);

 				ReinstallPackageAction action = project.CreateReinstallPackageAction ();

 				action.PackageId = packageReferenceNode.Id;

 				action.PackageVersion = packageReferenceNode.Version;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRepositoryCache.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRepositoryCache.cs
index ca1ae8b41d..38c63a275a 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRepositoryCache.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRepositoryCache.cs
@@ -32,11 +32,11 @@ using System.Collections.Generic;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageRepositoryCache : IPackageRepositoryCache, IPackageRepositoryFactoryEvents

+	internal class PackageRepositoryCache : IPackageRepositoryCache, IPackageRepositoryFactoryEvents

 	{

-		ISharpDevelopPackageRepositoryFactory factory;

+		IMonoDevelopPackageRepositoryFactory factory;

 		RegisteredPackageSources packageSources;

 		PackageManagementOptions options;

 		IList<RecentPackageInfo> recentPackages;

@@ -48,7 +48,7 @@ namespace ICSharpCode.PackageManagement
 		public PackageRepositoryCache (

 			PackageManagementOptions options,

 			IPackageRepository machineCache,

-			ISharpDevelopPackageRepositoryFactory factory)

+			IMonoDevelopPackageRepositoryFactory factory)

 		{

 			this.options = options;

 			this.machineCache = machineCache;

@@ -58,7 +58,7 @@ namespace ICSharpCode.PackageManagement
 

 		public PackageRepositoryCache (

 			PackageManagementOptions options,

-			ISharpDevelopPackageRepositoryFactory factory)

+			IMonoDevelopPackageRepositoryFactory factory)

 			: this (

 				options,

 				MachineCache.Default,

@@ -69,7 +69,7 @@ namespace ICSharpCode.PackageManagement
 		public PackageRepositoryCache (PackageManagementOptions options)

 			: this(

 				options,

-				new SharpDevelopPackageRepositoryFactory ())

+				new MonoDevelopPackageRepositoryFactory ())

 		{

 		}

 

@@ -77,7 +77,7 @@ namespace ICSharpCode.PackageManagement
 			RegisteredPackageSources packageSources,

 			IList<RecentPackageInfo> recentPackages)

 		{

-			this.factory = new SharpDevelopPackageRepositoryFactory ();

+			this.factory = new MonoDevelopPackageRepositoryFactory ();

 			this.recentPackages = recentPackages;

 			this.packageSources = packageSources;

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRepositoryFactoryEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRepositoryFactoryEventArgs.cs
index 0415c048e0..995209b05f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRepositoryFactoryEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRepositoryFactoryEventArgs.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageRepositoryFactoryEventArgs : EventArgs

+	internal class PackageRepositoryFactoryEventArgs : EventArgs

 	{

 		public PackageRepositoryFactoryEventArgs(IPackageRepository repository)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoreRunner.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoreRunner.cs
index 0b905a25cb..3f090d518f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoreRunner.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoreRunner.cs
@@ -1,4 +1,4 @@
-//

+//

 // PackageRestoreRunner.cs

 //

 // Author:

@@ -26,7 +26,7 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 using MonoDevelop.Ide.TypeSystem;

@@ -35,7 +35,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageRestoreRunner

+	internal class PackageRestoreRunner

 	{

 		IPackageManagementSolution solution;

 		IPackageManagementProgressMonitorFactory progressMonitorFactory;

@@ -52,6 +52,15 @@ namespace MonoDevelop.PackageManagement
 		{

 		}

 

+		internal PackageRestoreRunner (IPackageManagementSolution solution)

+			: this (

+				solution,

+				PackageManagementServices.ProgressMonitorFactory,

+				PackageManagementServices.PackageManagementEvents,

+				PackageManagementServices.ProgressProvider)

+		{

+		}

+

 		public PackageRestoreRunner(

 			IPackageManagementSolution solution,

 			IPackageManagementProgressMonitorFactory progressMonitorFactory,

@@ -77,7 +86,7 @@ namespace MonoDevelop.PackageManagement
 

 		public void Run (ProgressMonitorStatusMessage progressMessage)

 		{

-			using (IProgressMonitor progressMonitor = CreateProgressMonitor (progressMessage)) {

+			using (ProgressMonitor progressMonitor = CreateProgressMonitor (progressMessage)) {

 				using (PackageManagementEventsMonitor eventMonitor = CreateEventMonitor (progressMonitor)) {

 					try {

 						RestorePackages (progressMonitor, progressMessage);

@@ -95,17 +104,17 @@ namespace MonoDevelop.PackageManagement
 

 		public bool RestoreFailed { get; private set; }

 

-		IProgressMonitor CreateProgressMonitor (ProgressMonitorStatusMessage progressMessage)

+		ProgressMonitor CreateProgressMonitor (ProgressMonitorStatusMessage progressMessage)

 		{

 			return progressMonitorFactory.CreateProgressMonitor (progressMessage.Status);

 		}

 

-		PackageManagementEventsMonitor CreateEventMonitor (IProgressMonitor monitor)

+		PackageManagementEventsMonitor CreateEventMonitor (ProgressMonitor monitor)

 		{

 			return new PackageManagementEventsMonitor (monitor, packageManagementEvents, progressProvider);

 		}

 

-		void RestorePackages (IProgressMonitor progressMonitor, ProgressMonitorStatusMessage progressMessage)

+		void RestorePackages (ProgressMonitor progressMonitor, ProgressMonitorStatusMessage progressMessage)

 		{

 			var msbuildTargetsMonitor = new MSBuildTargetsRestoredMonitor (packageManagementEvents);

 			using (msbuildTargetsMonitor) {

@@ -139,7 +148,7 @@ namespace MonoDevelop.PackageManagement
 		/// </summary>

 		void RefreshProjectReferences (bool refreshMSBuildTargets)

 		{

-			DispatchService.GuiDispatch (() => {

+			Runtime.RunInMainThread (() => {

 				foreach (IDotNetProject projectInSolution in solution.GetDotNetProjects ()) {

 					if (refreshMSBuildTargets) {

 						projectInSolution.RefreshProjectBuilder ();

@@ -156,10 +165,11 @@ namespace MonoDevelop.PackageManagement
 

 		void ReconnectAssemblyReferences (DotNetProject dotNetProject)

 		{

-			var projectWrapper = TypeSystemService.GetProjectContentWrapper (dotNetProject);

-			if (projectWrapper != null) {

-				projectWrapper.ReconnectAssemblyReferences ();

-			}

+			// TODO: Roslyn port ?

+//			var projectWrapper = TypeSystemService.GetProjectContentWrapper (dotNetProject);

+//			if (projectWrapper != null) {

+//				projectWrapper.ReconnectAssemblyReferences ();

+//			}

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoredEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoredEventArgs.cs
index cf9b9dc141..7858fd88b1 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoredEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestoredEventArgs.cs
@@ -29,7 +29,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageRestoredEventArgs : EventArgs

+	internal class PackageRestoredEventArgs : EventArgs

 	{

 		public PackageRestoredEventArgs (IPackage package)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestorer.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestorer.cs
index f13c9f3fb3..1ea060c154 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestorer.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageRestorer.cs
@@ -26,33 +26,32 @@
 

 using System;

 using System.Linq;

-using ICSharpCode.PackageManagement;

 using MonoDevelop.Projects;

 using System.Collections.Generic;

 using MonoDevelop.Core;

-using NuGet;

-using MonoDevelop.PackageManagement.Commands;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageRestorer

+	internal class PackageRestorer

 	{

 		List<ProjectPackageReferenceFile> packageReferenceFiles;

 		IDotNetProject singleProject;

+		IPackageManagementSolution solution;

 

-		public PackageRestorer (Solution solution)

-			: this (solution.GetAllDotNetProjects ())

+		public PackageRestorer (IPackageManagementSolution solution)

+			: this (solution, solution.GetDotNetProjects ().Select (p => p.DotNetProject))

 		{

 		}

 

-		public PackageRestorer (DotNetProject project)

-			: this (new [] { project })

+		public PackageRestorer (IPackageManagementSolution solution, DotNetProject project)

+			: this (solution, new [] { project })

 		{

 			singleProject = new DotNetProjectProxy (project);

 		}

 

-		public PackageRestorer (IEnumerable<DotNetProject> projects)

+		public PackageRestorer (IPackageManagementSolution solution, IEnumerable<DotNetProject> projects)

 		{

+			this.solution = solution;

 			packageReferenceFiles = FindAllPackageReferenceFiles (projects).ToList ();

 		}

 

@@ -89,7 +88,7 @@ namespace MonoDevelop.PackageManagement
 

 		void RestoreWithProgressMonitor (ProgressMonitorStatusMessage progressMessage)

 		{

-			var runner = new PackageRestoreRunner ();

+			var runner = new PackageRestoreRunner (solution);

 			if (singleProject != null) {

 				runner.Run (singleProject, progressMessage);

 			} else {

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSearchCriteria.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSearchCriteria.cs
index 476d72222f..cb1cb1afd3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSearchCriteria.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSearchCriteria.cs
@@ -29,7 +29,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageSearchCriteria

+	internal class PackageSearchCriteria

 	{

 		WildcardVersionSpec wildcardVersionSpec;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceConverter.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceConverter.cs
index 26cd738f41..61bf2f4a60 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceConverter.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceConverter.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class PackageSourceConverter

+	internal static class PackageSourceConverter

 	{

 		public static IEnumerable<PackageSource> ConvertFromSettings(IEnumerable<SettingValue> packageSources)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceExtensions.cs
index 565f2fac46..dd169caa3f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceExtensions.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class PackageSourceExtensions

+	internal static class PackageSourceExtensions

 	{

 		public static bool IsAggregate(this PackageSource packageSource)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModel.cs
index dab268d647..815b0e7220 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModel.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageSourceViewModel : ViewModelBase<PackageSourceViewModel>

+	internal class PackageSourceViewModel : ViewModelBase<PackageSourceViewModel>

 	{

 		RegisteredPackageSource packageSource;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChangedEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChangedEventArgs.cs
index 1d4e44d3ba..6574148487 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChangedEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChangedEventArgs.cs
@@ -25,11 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageSourceViewModelChangedEventArgs : EventArgs

+	internal class PackageSourceViewModelChangedEventArgs : EventArgs

 	{

 		public PackageSourceViewModelChangedEventArgs (PackageSourceViewModel packageSource)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelCheckedEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelCheckedEventArgs.cs
index b40ddbafea..2cee563ded 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelCheckedEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelCheckedEventArgs.cs
@@ -25,11 +25,11 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageSourceViewModelCheckedEventArgs : EventArgs

+	internal class PackageSourceViewModelCheckedEventArgs : EventArgs

 	{

 		public PackageSourceViewModelCheckedEventArgs (PackageSourceViewModel packageSource)

 			: this (packageSource, "")

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChecker.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChecker.cs
index dd60e30ca6..90587defb4 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChecker.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageSourceViewModelChecker.cs
@@ -29,13 +29,13 @@ using System.Collections.Generic;
 using System.IO;

 using System.Net;

 using System.Threading.Tasks;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackageSourceViewModelChecker : IDisposable

+	internal class PackageSourceViewModelChecker : IDisposable

 	{

 		PackageManagementTaskFactory taskFactory = new PackageManagementTaskFactory ();

 		List<ITask<PackageSourceViewModelCheckedEventArgs>> tasks = new List<ITask<PackageSourceViewModelCheckedEventArgs>>();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageUpdateChecker.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageUpdateChecker.cs
new file mode 100644
index 0000000000..8850375e3e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageUpdateChecker.cs
@@ -0,0 +1,100 @@
+//

+// PackageUpdateChecker.cs

+//

+// Author:

+//       Matt Ward <matt.ward@xamarin.com>

+//

+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+using System;

+using ICSharpCode.PackageManagement;

+using MonoDevelop.Core;

+

+namespace MonoDevelop.PackageManagement

+{

+	public class PackageUpdateChecker

+	{

+		IUpdatedPackagesInSolution updatedPackagesInSolution;

+		IPackageManagementProgressMonitorFactory progressMonitorFactory;

+

+		public PackageUpdateChecker ()

+			: this (

+				PackageManagementServices.UpdatedPackagesInSolution,

+				PackageManagementServices.ProgressMonitorFactory)

+		{

+		}

+

+		public PackageUpdateChecker (

+			IUpdatedPackagesInSolution updatedPackagesInSolution,

+			IPackageManagementProgressMonitorFactory progressMonitorFactory)

+		{

+			this.updatedPackagesInSolution = updatedPackagesInSolution;

+			this.progressMonitorFactory = progressMonitorFactory;

+		}

+

+		public void Run ()

+		{

+			try {

+				CheckForPackageUpdatesWithProgressMonitor ();

+			} catch (Exception ex) {

+				LoggingService.LogInternalError ("PackageUpdateChecker error.", ex);

+			}

+		}

+

+		void CheckForPackageUpdatesWithProgressMonitor ()

+		{

+			ProgressMonitorStatusMessage progressMessage = ProgressMonitorStatusMessageFactory.CreateCheckingForPackageUpdatesMessage ();

+			using (ProgressMonitor progressMonitor = CreateProgressMonitor (progressMessage)) {

+				try {

+					using (var eventMonitor = new PackageUpdatesEventMonitor (progressMonitor)) {

+						CheckForPackageUpdates (progressMonitor, progressMessage, eventMonitor);

+					}

+				} catch (Exception ex) {

+					LoggingService.LogInternalError (ex);

+					progressMonitor.Log.WriteLine (ex.Message);

+					progressMonitor.ReportError (progressMessage.Error, null);

+					progressMonitor.ShowPackageConsole ();

+				}

+			}

+		}

+

+		ProgressMonitor CreateProgressMonitor (ProgressMonitorStatusMessage progressMessage)

+		{

+			return progressMonitorFactory.CreateProgressMonitor (progressMessage.Status);

+		}

+

+		void CheckForPackageUpdates (

+			ProgressMonitor progressMonitor,

+			ProgressMonitorStatusMessage progressMessage,

+			PackageUpdatesEventMonitor eventMonitor)

+		{

+			updatedPackagesInSolution.CheckForUpdates ();

+			if (updatedPackagesInSolution.AnyUpdates ()) {

+				progressMonitor.ReportSuccess (GettextCatalog.GetString ("Package updates are available."));

+			} else if (eventMonitor.WarningReported) {

+				progressMonitor.ReportWarning (progressMessage.Warning);

+			} else {

+				progressMonitor.ReportSuccess (progressMessage.Success);

+			}

+		}

+	}

+}

+

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModel.cs
index afd50ed9c8..f99b967fa7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModel.cs
@@ -34,9 +34,9 @@ using System.Runtime.Versioning;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageViewModel : ViewModelBase<PackageViewModel>

+	internal class PackageViewModel : ViewModelBase<PackageViewModel>

 	{

 		DelegateCommand addPackageCommand;

 		DelegateCommand removePackageCommand;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModelFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModelFactory.cs
index 89c42b6557..cc88824b81 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModelFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModelFactory.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageViewModelFactory : IPackageViewModelFactory

+	internal class PackageViewModelFactory : IPackageViewModelFactory

 	{

 		public PackageViewModelFactory(IPackageViewModelFactory packageViewModelFactory)

 			: this(

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModelOperationLogger.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModelOperationLogger.cs
index 40cadd6c90..ff8743c0a1 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModelOperationLogger.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageViewModelOperationLogger.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackageViewModelOperationLogger : ILogger

+	internal class PackageViewModelOperationLogger : ILogger

 	{

 		ILogger logger;

 		IPackage package;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesForSelectedPageQuery.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesForSelectedPageQuery.cs
index d6177fa592..f3aa8d2b1c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesForSelectedPageQuery.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesForSelectedPageQuery.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackagesForSelectedPageQuery

+	internal class PackagesForSelectedPageQuery

 	{

 		public PackagesForSelectedPageQuery (

 			PackagesViewModel viewModel,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesForSelectedPageResult.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesForSelectedPageResult.cs
index 90ac1f0a63..56d728a7d3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesForSelectedPageResult.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesForSelectedPageResult.cs
@@ -32,9 +32,9 @@ using System.Linq;
 

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackagesForSelectedPageResult

+	internal class PackagesForSelectedPageResult

 	{

 		public PackagesForSelectedPageResult(IEnumerable<IPackage> packages, PackagesForSelectedPageQuery query)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesRequiringLicenseAcceptance.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesRequiringLicenseAcceptance.cs
index d0c0ea3318..342f05ef09 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesRequiringLicenseAcceptance.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesRequiringLicenseAcceptance.cs
@@ -27,12 +27,12 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class PackagesRequiringLicenseAcceptance

+	internal class PackagesRequiringLicenseAcceptance

 	{

 		IPackageManagementProject project;

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesViewModel.cs
index 86b2ed48c8..87115a0be2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesViewModel.cs
@@ -37,9 +37,9 @@ using MonoDevelop.Core;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public abstract class PackagesViewModel : ViewModelBase<PackagesViewModel>, IDisposable, IPackageViewModelParent

+	internal abstract class PackagesViewModel : ViewModelBase<PackagesViewModel>, IDisposable, IPackageViewModelParent

 	{

 		Pages pages = new Pages();

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesViewModels.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesViewModels.cs
index f93581a5ab..78137341f1 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesViewModels.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackagesViewModels.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class PackagesViewModels : IDisposable

+	internal class PackagesViewModels : IDisposable

 	{

 		public PackagesViewModels(

 			IPackageManagementSolution solution,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Page.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Page.cs
index 911f23f6c7..1ac0dad324 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Page.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Page.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class Page

+	internal class Page

 	{

 		public int Number { get; set; }

 		public bool IsSelected { get; set; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Pages.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Pages.cs
index 762d8440d0..aa531638e1 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Pages.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Pages.cs
@@ -29,9 +29,9 @@
 using System;

 using System.Collections.ObjectModel;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class Pages : ObservableCollection<Page>

+	internal class Pages : ObservableCollection<Page>

 	{

 		public const int DefaultPageSize = 29;

 		public const int DefaultMaximumSelectablePages = 5;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ParentPackageOperationEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ParentPackageOperationEventArgs.cs
index 2fdc32c4fc..f48019dfd5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ParentPackageOperationEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ParentPackageOperationEventArgs.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ParentPackageOperationEventArgs : EventArgs

+	internal class ParentPackageOperationEventArgs : EventArgs

 	{

 		public ParentPackageOperationEventArgs(IPackage package, IPackageManagementProject project)

 			: this (package, project, new PackageOperation [0])

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ParentPackagesOperationEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ParentPackagesOperationEventArgs.cs
index 29bb19c506..2fc09a470e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ParentPackagesOperationEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ParentPackagesOperationEventArgs.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ParentPackagesOperationEventArgs : EventArgs

+	internal class ParentPackagesOperationEventArgs : EventArgs

 	{

 		public ParentPackagesOperationEventArgs(IEnumerable<IPackage> packages)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PreventPackagesConfigFileBeingRemovedOnUpdateMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PreventPackagesConfigFileBeingRemovedOnUpdateMonitor.cs
index 07345ba0a2..a579030c45 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PreventPackagesConfigFileBeingRemovedOnUpdateMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PreventPackagesConfigFileBeingRemovedOnUpdateMonitor.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using System.IO;

 using MonoDevelop.Core;

 

@@ -39,7 +39,7 @@ namespace MonoDevelop.PackageManagement
 	/// being removed, cancels the standard file deletion call to FileService.RemoveFile, and

 	/// removes the file itself.

 	/// </summary>

-	public class PreventPackagesConfigFileBeingRemovedOnUpdateMonitor : IDisposable

+	internal class PreventPackagesConfigFileBeingRemovedOnUpdateMonitor : IDisposable

 	{

 		IPackageManagementEvents packageManagementEvents;

 		IFileRemover fileRemover;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Process.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Process.cs
index 1185189f5f..767986eb36 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Process.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/Process.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class Process : IProcess

+	internal class Process : IProcess

 	{	

 		public void Start(string fileName)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProcessPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProcessPackageAction.cs
index e7ed10250a..dac4daf34a 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProcessPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProcessPackageAction.cs
@@ -34,9 +34,9 @@ using MonoDevelop.Core;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public abstract class ProcessPackageAction : IPackageAction

+	internal abstract class ProcessPackageAction : IPackageAction

 	{

 		IPackageManagementEvents packageManagementEvents;

 		bool hasBeforeExecuteBeenRun;

@@ -144,7 +144,7 @@ namespace ICSharpCode.PackageManagement
 			packageManagementEvents.OnPackageOperationMessageLogged (MessageLevel.Info, message);

 		}

 

-		void CheckLicenses ()

+		protected virtual void CheckLicenses ()

 		{

 			if (!AcceptLicenses ()) {

 				string message = GettextCatalog.GetString ("Licenses not accepted.");

@@ -158,12 +158,12 @@ namespace ICSharpCode.PackageManagement
 			var actions = new IPackageAction [] { this };

 			List<IPackage> packages = packagesWithLicenses.GetPackagesRequiringLicenseAcceptance (actions).ToList ();

 			if (packages.Any ()) {

-				return packageManagementEvents.OnAcceptLicenses (packages);

+				return OnAcceptLicenses (packages);

 			}

 

 			return true;

-		}

-		

+		}
+
 		void ExecuteWithScriptRunner()

 		{

 //			using (RunPackageScriptsAction runScriptsAction = CreateRunPackageScriptsAction()) {

@@ -265,5 +265,10 @@ namespace ICSharpCode.PackageManagement
 		{

 			return new LocalCopyReferenceMaintainer (packageManagementEvents);

 		}

+

+		protected virtual bool OnAcceptLicenses (IEnumerable<IPackage> packages)
+		{
+			return packageManagementEvents.OnAcceptLicenses (packages);
+		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProcessPackageOperationsAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProcessPackageOperationsAction.cs
index 6cb5f30fb4..8c28780674 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProcessPackageOperationsAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProcessPackageOperationsAction.cs
@@ -30,22 +30,34 @@ using System.Collections.Generic;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public abstract class ProcessPackageOperationsAction : ProcessPackageAction

+	internal abstract class ProcessPackageOperationsAction : ProcessPackageAction

 	{

 		IPackageManagementEvents packageManagementEvents;

+		ILicenseAcceptanceService licenseAcceptanceService;

+

+		protected ProcessPackageOperationsAction (

+			IPackageManagementProject project,

+			IPackageManagementEvents packageManagementEvents,

+			ILicenseAcceptanceService licenseAcceptanceService)

+			: base (project, packageManagementEvents)

+		{

+			this.packageManagementEvents = packageManagementEvents;

+			this.licenseAcceptanceService = licenseAcceptanceService;

+		}

 

 		public ProcessPackageOperationsAction(

 			IPackageManagementProject project,

 			IPackageManagementEvents packageManagementEvents)

-			: base(project, packageManagementEvents)

+			: this (project, packageManagementEvents, new LicenseAcceptanceService ())

 		{

-			this.packageManagementEvents = packageManagementEvents;

 		}

 		

 		public IEnumerable<PackageOperation> Operations { get; set; }

 

+		public bool LicensesMustBeAccepted { get; set; }

+

 		public override bool HasPackageScriptsToRun()

 		{

 			BeforeExecute();

@@ -81,5 +93,14 @@ namespace ICSharpCode.PackageManagement
 		{

 			packageManagementEvents.OnParentPackageInstalled (Package, Project, Operations);

 		}

+

+		protected override bool OnAcceptLicenses (IEnumerable<IPackage> packages)
+		{

+			if (LicensesMustBeAccepted) {

+				return licenseAcceptanceService.AcceptLicenses (packages);

+			} else {
+				return base.OnAcceptLicenses (packages);

+			}
+		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorExtensions.cs
index 6054ce7cf4..734c915364 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorExtensions.cs
@@ -32,11 +32,11 @@ using MonoDevelop.Ide.Gui;
 

 namespace MonoDevelop.PackageManagement

 {

-	public static class ProgressMonitorExtensions

+	internal static class ProgressMonitorExtensions

 	{

-		public static void ShowPackageConsole (this IProgressMonitor monitor)

+		public static void ShowPackageConsole (this ProgressMonitor monitor)

 		{

-			DispatchService.GuiDispatch (() => {

+			Runtime.RunInMainThread (() => {

 				var aggregatedMonitor = (PackageManagementProgressMonitor)monitor;

 				Pad pad = IdeApp.Workbench.ProgressMonitors.GetPadForMonitor (aggregatedMonitor.ConsoleMonitor);

 				if (pad != null) {

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessage.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessage.cs
index 3a434bf430..e2ceafb7cf 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessage.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessage.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class ProgressMonitorStatusMessage

+	internal class ProgressMonitorStatusMessage

 	{

 		string success;

 		string error;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessageFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessageFactory.cs
index 6c42dbef5f..045561ac7f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessageFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProgressMonitorStatusMessageFactory.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 

 namespace MonoDevelop.PackageManagement

 {

-	public static class ProgressMonitorStatusMessageFactory

+	internal static class ProgressMonitorStatusMessageFactory

 	{

 		public static ProgressMonitorStatusMessage CreateInstallingSinglePackageMessage (string packageId)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectBrowserUpdater.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectBrowserUpdater.cs
index 05286f4e49..f68491881d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectBrowserUpdater.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectBrowserUpdater.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ProjectBrowserUpdater : IProjectBrowserUpdater

+	internal class ProjectBrowserUpdater : IProjectBrowserUpdater

 	{

 //		ProjectBrowserControl projectBrowser;

 //		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectExtensions.cs
deleted file mode 100644
index d04a5b35f4..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectExtensions.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// 

-// ProjectExtensions.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using MonoDevelop.Core.ProgressMonitoring;

-using MonoDevelop.Projects;

-using MonoDevelop.Ide;

-

-namespace ICSharpCode.PackageManagement

-{

-	public static class ProjectExtensions

-	{

-		public static void Save(this Project project)

-		{

-			DispatchService.GuiSyncDispatch(() => {

-				IdeApp.ProjectOperations.Save(project);

-			});

-		}

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectModifiedEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectModifiedEventArgs.cs
index 8f887c768b..a9e7a137dc 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectModifiedEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectModifiedEventArgs.cs
@@ -30,7 +30,7 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class ProjectModifiedEventArgs : EventArgs

+	internal class ProjectModifiedEventArgs : EventArgs

 	{

 		public ProjectModifiedEventArgs (IDotNetProject project, string propertyName)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectPackageReferenceFile.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectPackageReferenceFile.cs
index 09f6ed1c09..1b6d6352de 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectPackageReferenceFile.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectPackageReferenceFile.cs
@@ -28,11 +28,11 @@ using System;
 using System.Linq;

 using MonoDevelop.Projects;

 using NuGet;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class ProjectPackageReferenceFile : PackageReferenceFile

+	internal class ProjectPackageReferenceFile : PackageReferenceFile

 	{

 		public ProjectPackageReferenceFile (DotNetProject project)

 			: base(project.GetPackagesConfigFilePath ())

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectPackagesCompatibilityReport.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectPackagesCompatibilityReport.cs
index 81e5f82e62..eeb8074d9b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectPackagesCompatibilityReport.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectPackagesCompatibilityReport.cs
@@ -35,7 +35,7 @@ using System.Linq;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class ProjectPackagesCompatibilityReport

+	internal class ProjectPackagesCompatibilityReport

 	{

 		FrameworkName projectTargetFramework;

 		List<PackageCompatibility> packageCompatibilities = new List<PackageCompatibility> ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectProxy.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectProxy.cs
index 7aef3277df..7e12939a42 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectProxy.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectProxy.cs
@@ -26,13 +26,16 @@
 

 using System;

 using System.Collections;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Projects;

+using System.Collections.Generic;

+using MonoDevelop.Ide;

+using System.Threading.Tasks;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class ProjectProxy : IProject

+	internal class ProjectProxy : IProject

 	{

 		Project project;

 

@@ -61,9 +64,15 @@ namespace MonoDevelop.PackageManagement
 			get { return project.ExtendedProperties; }

 		}

 

-		public void Save ()

+		public IEnumerable<string> FlavorGuids {

+			get { return project.FlavorGuids; }

+		}

+

+		public async Task SaveAsync ()

 		{

-			project.Save ();

+			using (var monitor = new ProgressMonitor ()) {

+				await project.SaveAsync (monitor);

+			}

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectReferenceExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectReferenceExtensions.cs
index 60d2bd1eee..be249f306f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectReferenceExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectReferenceExtensions.cs
@@ -25,14 +25,14 @@
 // THE SOFTWARE.

 

 using System;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Projects;

 using System.IO;

 

 namespace MonoDevelop.PackageManagement

 {

-	public static class ProjectReferenceExtensions

+	internal static class ProjectReferenceExtensions

 	{

 		public static bool IsReferenceFromPackage (this ProjectReference projectReference)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectReloadedEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectReloadedEventArgs.cs
index 9438a2f268..208ddf7b65 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectReloadedEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectReloadedEventArgs.cs
@@ -29,7 +29,7 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class ProjectReloadedEventArgs : EventArgs

+	internal class ProjectReloadedEventArgs : EventArgs

 	{

 		public static ProjectReloadedEventArgs Create (SolutionItemChangeEventArgs eventArgs)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFramework.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFramework.cs
index 9099f6d4c7..daf302fef2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFramework.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFramework.cs
@@ -32,9 +32,9 @@ using MonoDevelop.Core.Assemblies;
 using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ProjectTargetFramework

+	internal class ProjectTargetFramework

 	{

 		IDotNetProject project;

 		FrameworkName targetFramework;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFrameworkChangedEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFrameworkChangedEventArgs.cs
index 83f39c4675..38847dffab 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFrameworkChangedEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFrameworkChangedEventArgs.cs
@@ -28,7 +28,7 @@ using System;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class ProjectTargetFrameworkChangedEventArgs : EventArgs

+	internal class ProjectTargetFrameworkChangedEventArgs : EventArgs

 	{

 		public ProjectTargetFrameworkChangedEventArgs (IDotNetProject project)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFrameworkMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFrameworkMonitor.cs
index a0b8528796..b0b65b5c94 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFrameworkMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTargetFrameworkMonitor.cs
@@ -26,12 +26,12 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using System.Linq;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class ProjectTargetFrameworkMonitor

+	internal class ProjectTargetFrameworkMonitor

 	{

 		IPackageManagementProjectService projectService;

 		List<MonitoredSolution> monitoredSolutions = new List<MonitoredSolution> ();

@@ -67,6 +67,7 @@ namespace MonoDevelop.PackageManagement
 			monitoredSolution.Projects.Clear ();

 

 			monitoredSolution.Solution.ProjectAdded -= ProjectAdded;

+			monitoredSolution.Solution.ProjectRemoved -= ProjectRemoved;

 			monitoredSolutions.Remove (monitoredSolution);

 		}

 

@@ -88,6 +89,7 @@ namespace MonoDevelop.PackageManagement
 			var solutionEventArgs = (DotNetSolutionEventArgs)e;

 			ISolution solution = solutionEventArgs.Solution;

 			solution.ProjectAdded += ProjectAdded;

+			solution.ProjectRemoved += ProjectRemoved;

 			List<IDotNetProject> projects = solution.GetAllProjects ().ToList ();

 

 			foreach (IDotNetProject project in projects) {

@@ -129,6 +131,16 @@ namespace MonoDevelop.PackageManagement
 			return false;

 		}

 

+		void ProjectRemoved (object sender, DotNetProjectEventArgs e)

+		{

+			MonitoredSolution monitoredSolution = FindMonitoredSolution ((ISolution)sender);

+			IDotNetProject matchedProject = monitoredSolution.Projects.FirstOrDefault (project => project.Equals (e.Project));

+			if (matchedProject != null) {

+				matchedProject.Modified -= ProjectModified;

+				monitoredSolution.Projects.Remove (matchedProject);

+			}

+		}

+

 		class MonitoredSolution

 		{

 			public ISolution Solution { get; set; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplateNuGetPackageInstaller.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplateNuGetPackageInstaller.cs
index 7ffe91bb8f..889a88d3bb 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplateNuGetPackageInstaller.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplateNuGetPackageInstaller.cs
@@ -27,14 +27,14 @@
 using MonoDevelop.Ide.Templates;

 using MonoDevelop.Projects;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide;

 using NuGet;

 using System.Linq;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class ProjectTemplateNuGetPackageInstaller : ProjectTemplatePackageInstaller

+	internal class ProjectTemplateNuGetPackageInstaller : ProjectTemplatePackageInstaller

 	{

 		IPackageManagementSolution packageManagementSolution;

 		IPackageRepositoryCache packageRepositoryCache;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplatePackageRepositoryCache.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplatePackageRepositoryCache.cs
index 99ffdf1e5f..ddd6790436 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplatePackageRepositoryCache.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplatePackageRepositoryCache.cs
@@ -30,13 +30,13 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

 	/// <summary>

 	/// Supports a configurable set of package repositories for project templates that can be

 	/// different to the registered package repositories used with the Add Package Reference dialog.

 	/// </summary>

-	public class ProjectTemplatePackageRepositoryCache : IPackageRepositoryCache

+	internal class ProjectTemplatePackageRepositoryCache : IPackageRepositoryCache

 	{

 		IPackageRepositoryCache packageRepositoryCache;

 		RegisteredProjectTemplatePackageSources registeredPackageSources;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplatePackageSettingsFileName.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplatePackageSettingsFileName.cs
index ad395570c7..3a28f98b5f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplatePackageSettingsFileName.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ProjectTemplatePackageSettingsFileName.cs
@@ -29,9 +29,9 @@
 using System;

 using System.IO;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ProjectTemplatePackagesSettingsFileName

+	internal class ProjectTemplatePackagesSettingsFileName

 	{

 		string directory;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackageInfo.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackageInfo.cs
index 415d15f8fc..4698c8f37f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackageInfo.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackageInfo.cs
@@ -29,7 +29,7 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

 	public class RecentPackageInfo

 	{

@@ -39,12 +39,12 @@ namespace ICSharpCode.PackageManagement
 		{

 		}

 		

-		public RecentPackageInfo(IPackage package)

+		internal RecentPackageInfo(IPackage package)

 			: this(package.Id, package.Version)

 		{

 		}

 		

-		public RecentPackageInfo(string id, SemanticVersion version)

+		internal RecentPackageInfo(string id, SemanticVersion version)

 		{

 			this.Id = id;

 			this.version = version;

@@ -62,7 +62,7 @@ namespace ICSharpCode.PackageManagement
 			return String.Format("[RecentPackageInfo Id={0}, Version={1}]", Id, Version);

 		}

 		

-		public bool IsMatch(IPackage package)

+		internal bool IsMatch(IPackage package)

 		{

 			return (package.Version.ToString() == Version) && (package.Id == Id);

 		}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackageRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackageRepository.cs
index b8c869ebc1..e833dc3504 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackageRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackageRepository.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class RecentPackageRepository : IRecentPackageRepository

+	internal class RecentPackageRepository : IRecentPackageRepository

 	{

 		public const int DefaultMaximumPackagesCount = 20;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackagesViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackagesViewModel.cs
index 4f4b6e00fb..352640d48a 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackagesViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RecentPackagesViewModel.cs
@@ -30,9 +30,9 @@ using System;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class RecentPackagesViewModel : PackagesViewModel

+	internal class RecentPackagesViewModel : PackagesViewModel

 	{

 		IPackageManagementEvents packageManagementEvents;

 		IPackageRepository recentPackageRepository;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReducedPackageOperations.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReducedPackageOperations.cs
index c1e937ef5d..3834b2070b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReducedPackageOperations.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReducedPackageOperations.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ReducedPackageOperations

+	internal class ReducedPackageOperations

 	{

 		IPackageOperationResolver resolver;

 		IList<PackageOperation> operations;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageRepositories.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageRepositories.cs
index d09316f56a..2740d41ace 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageRepositories.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageRepositories.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class RegisteredPackageRepositories : IRegisteredPackageRepositories

+	internal class RegisteredPackageRepositories : IRegisteredPackageRepositories

 	{

 		IPackageRepositoryCache repositoryCache;

 		PackageManagementOptions options;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSource.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSource.cs
index de86b2d95c..cb4bf0f3b7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSource.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSource.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class RegisteredPackageSource

+	internal class RegisteredPackageSource

 	{

 		public string Source { get; set; }

 		public string Name { get; set; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourceSettings.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourceSettings.cs
index 1986fcc729..ac112b3cf3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourceSettings.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourceSettings.cs
@@ -30,14 +30,14 @@ using System;
 using System.Collections.Generic;

 using System.Collections.Specialized;

 using System.Linq;

+using System.Security.Cryptography;

 

 using MonoDevelop.Core;

-using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class RegisteredPackageSourceSettings

+	internal class RegisteredPackageSourceSettings

 	{

 		public static readonly string PackageSourcesSectionName = "packageSources";

 		public static readonly string ActivePackageSourceSectionName = "activePackageSource";

@@ -104,7 +104,7 @@ namespace ICSharpCode.PackageManagement
 			try {

 				ReadPackageSources ();

 			} catch (Exception ex) {

-				LoggingService.LogError ("Unable to read NuGet.config file.", ex);

+				ShowReadPackageSourcesError (ex);

 

 				// Fallback to using the default package source only (nuget.org)

 				// and treat NuGet.config as read-only.

@@ -123,6 +123,27 @@ namespace ICSharpCode.PackageManagement
 				UpdatePackageSourceSettingsWithChanges();

 			}

 		}

+

+		static void ShowReadPackageSourcesError (Exception ex)

+		{

+			Ide.MessageService.ShowError (

+				GettextCatalog.GetString ("Unable to read the NuGet.Config file"),

+				String.Format (GetReadPackageSourcesErrorMessage (ex),

+					BrandingService.ApplicationName,

+					ex.Message),

+				ex);

+		}

+

+		static string GetReadPackageSourcesErrorMessage (Exception ex)

+		{

+			if (ex is CryptographicException) {

+				return GettextCatalog.GetString ("Unable to decrypt passwords stored in the NuGet.Config file. " +

+					"{0} will now fallback to using the Official NuGet Gallery and the NuGet.Config file will be treated as read-only.");

+			}

+

+			return GettextCatalog.GetString ("An error occurred when trying to read the NuGet.Config file. " +

+				"{0} will now fallback to using the Official NuGet Gallery and the NuGet.Config file will be treated as read-only.\n\n{1}");

+		}

 		

 		void PackageSourcesChanged(object sender, NotifyCollectionChangedEventArgs e)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSources.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSources.cs
index 3772a0765c..c73487c121 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSources.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSources.cs
@@ -32,9 +32,9 @@ using System.Collections.ObjectModel;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class RegisteredPackageSources : ObservableCollection<PackageSource>

+	internal class RegisteredPackageSources : ObservableCollection<PackageSource>

 	{

 		public static readonly string DefaultPackageSourceUrl = "https://www.nuget.org/api/v2/";

 		public static readonly string DefaultPackageSourceName = "Official NuGet Gallery";

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourcesViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourcesViewModel.cs
index 9dad10f11e..9c35378387 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourcesViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredPackageSourcesViewModel.cs
@@ -35,9 +35,9 @@ using System.Linq;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class RegisteredPackageSourcesViewModel : ViewModelBase<RegisteredPackageSourcesViewModel>, IDisposable, IPackageSourceProvider

+	internal class RegisteredPackageSourcesViewModel : ViewModelBase<RegisteredPackageSourcesViewModel>, IDisposable, IPackageSourceProvider

 	{

 		ObservableCollection<PackageSourceViewModel> packageSourceViewModels = 

 			new ObservableCollection<PackageSourceViewModel>();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredProjectTemplatePackageSources.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredProjectTemplatePackageSources.cs
index a26f6088af..a78f93a9ad 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredProjectTemplatePackageSources.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RegisteredProjectTemplatePackageSources.cs
@@ -31,9 +31,9 @@ using Mono.Addins;
 using MonoDevelop.PackageManagement;

 using MonoDevelop.Ide.Templates;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class RegisteredProjectTemplatePackageSources

+	internal class RegisteredProjectTemplatePackageSources

 	{

 		RegisteredPackageSources packageSources = new RegisteredPackageSources();

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallPackageAction.cs
index e2b3573b91..62e5792661 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallPackageAction.cs
@@ -31,12 +31,12 @@ using MonoDevelop.Ide.Commands;
 using MonoDevelop.Ide.Gui.Components;

 using MonoDevelop.PackageManagement.NodeBuilders;

 using MonoDevelop.Projects;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class ReinstallPackageAction : ProcessPackageAction

+	internal class ReinstallPackageAction : ProcessPackageAction

 	{

 		IFileRemover fileRemover;

 

@@ -84,6 +84,7 @@ namespace MonoDevelop.PackageManagement
 			action.Package = Package;

 			action.OpenReadMeText = false;

 			action.PreserveLocalCopyReferences = false;

+			action.LicensesMustBeAccepted = false;

 			action.Execute ();

 		}

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallPackageOperations.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallPackageOperations.cs
index 4e5db3cb1a..78c70d29dd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallPackageOperations.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallPackageOperations.cs
@@ -31,7 +31,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class ReinstallPackageOperations

+	internal class ReinstallPackageOperations

 	{

 		List<PackageOperation> operations;

 		List<IPackage> packagesInDependencyOrder;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallProjectPackagesAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallProjectPackagesAction.cs
index 85d42b791b..93eaa2e337 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallProjectPackagesAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ReinstallProjectPackagesAction.cs
@@ -27,13 +27,13 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class ReinstallProjectPackagesAction : IPackageAction

+	internal class ReinstallProjectPackagesAction : IPackageAction

 	{

 		IPackageManagementProject project;

 		IPackageManagementEvents packageManagementEvents;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RemovedPackageReferenceMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RemovedPackageReferenceMonitor.cs
deleted file mode 100644
index b26f68d526..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RemovedPackageReferenceMonitor.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// 

-// RemovedPackageReferenceMonitor.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2013 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using System.Collections.Generic;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public class RemovedPackageReferenceMonitor : IDisposable

-	{

-		ISharpDevelopProjectManager projectManager;

-		List<IPackage> packagesRemoved = new List<IPackage>();

-		

-		public RemovedPackageReferenceMonitor(ISharpDevelopProjectManager projectManager)

-		{

-			this.projectManager = projectManager;

-			projectManager.PackageReferenceRemoved += PackageReferenceRemoved;

-		}

-		

-		void PackageReferenceRemoved(object sender, PackageOperationEventArgs e)

-		{

-			packagesRemoved.Add(e.Package);

-		}

-		

-		public void Dispose()

-		{

-			projectManager.PackageReferenceRemoved -= PackageReferenceRemoved;

-		}

-		

-		public List<IPackage> PackagesRemoved {

-			get { return packagesRemoved; }

-		}

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ResolveFileConflictEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ResolveFileConflictEventArgs.cs
index 97ebae3b1c..b220db95b5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ResolveFileConflictEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ResolveFileConflictEventArgs.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ResolveFileConflictEventArgs : EventArgs

+	internal class ResolveFileConflictEventArgs : EventArgs

 	{

 		public ResolveFileConflictEventArgs(string message)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreBeforeUpdateAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreBeforeUpdateAction.cs
index 3d3c5ce64c..55a64da3e3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreBeforeUpdateAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestoreBeforeUpdateAction.cs
@@ -27,13 +27,11 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

-using MonoDevelop.Ide;

 using MonoDevelop.Projects;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class RestoreBeforeUpdateAction

+	internal class RestoreBeforeUpdateAction

 	{

 		IPackageManagementProjectService projectService;

 		IBackgroundPackageActionRunner backgroundRunner;

@@ -54,28 +52,32 @@ namespace MonoDevelop.PackageManagement
 		}

 

 		public static void Restore (

+			IPackageManagementSolution solution,

 			IPackageManagementProject project,

 			Action afterRestore)

 		{

 			var runner = new RestoreBeforeUpdateAction ();

-			runner.RestoreProjectPackages (project.DotNetProject, afterRestore);

+			runner.RestoreProjectPackages (solution, project.DotNetProject, afterRestore);

 		}

 

 		public static void Restore (

+			IPackageManagementSolution solution,

 			IEnumerable<IPackageManagementProject> projects,

 			Action afterRestore)

 		{

 			var runner = new RestoreBeforeUpdateAction ();

 			runner.RestoreAllPackagesInSolution (

+				solution,

 				projects.Select (project => project.DotNetProject),

 				afterRestore);

 		}

 

 		public void RestoreAllPackagesInSolution (

+			IPackageManagementSolution solution,

 			IEnumerable<DotNetProject> projects,

 			Action afterRestore)

 		{

-			var restorer = new PackageRestorer (projects);

+			var restorer = new PackageRestorer (solution, projects);

 			Restore (restorer, afterRestore);

 		}

 

@@ -83,7 +85,7 @@ namespace MonoDevelop.PackageManagement
 		{

 			ProgressMonitorStatusMessage progressMessage = ProgressMonitorStatusMessageFactory.CreateRestoringPackagesBeforeUpdateMessage ();

 

-			DispatchService.BackgroundDispatch (() => {

+			PackageManagementBackgroundDispatcher.Dispatch (() => {

 				restorer.Restore (progressMessage);

 				if (!restorer.RestoreFailed) {

 					afterRestore ();

@@ -91,9 +93,12 @@ namespace MonoDevelop.PackageManagement
 			});

 		}

 

-		public void RestoreProjectPackages (DotNetProject project, Action afterRestore)

+		public void RestoreProjectPackages (

+			IPackageManagementSolution solution,

+			DotNetProject project,

+			Action afterRestore)

 		{

-			var restorer = new PackageRestorer (project);

+			var restorer = new PackageRestorer (solution, project);

 			Restore (restorer, afterRestore);

 		}

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestorePackagesAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestorePackagesAction.cs
index 8f67b0fd6e..a10aad464a 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestorePackagesAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/RestorePackagesAction.cs
@@ -27,13 +27,13 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using MonoDevelop.Core;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class RestorePackagesAction : IPackageAction

+	internal class RestorePackagesAction : IPackageAction

 	{

 		IPackageManagementSolution solution;

 		IPackageManagementEvents packageManagementEvents;

@@ -56,7 +56,7 @@ namespace MonoDevelop.PackageManagement
 				solution,

 				packageManagementEvents,

 				PackageManagementServices.PackageRepositoryCache,

-				new SharpDevelopPackageManagerFactory ())

+				new MonoDevelopPackageManagerFactory ())

 		{

 		}

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesDataSource.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesDataSource.cs
deleted file mode 100644
index 3887262942..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesDataSource.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-//

-// SearchPackagesDataSource.cs

-//

-// Author:

-//       Matt Ward <matt.ward@xamarin.com>

-//

-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

-using System;

-using ICSharpCode.NRefactory.TypeSystem;

-using MonoDevelop.Components.MainToolbar;

-using MonoDevelop.Core;

-using MonoDevelop.Ide.CodeCompletion;

-using Xwt.Drawing;

-using ICSharpCode.PackageManagement;

-

-namespace MonoDevelop.PackageManagement

-{

-	public class SearchPackagesDataSource : ISearchDataSource

-	{

-		readonly SearchPopupSearchPattern searchPattern;

-

-		public SearchPackagesDataSource (SearchPopupSearchPattern searchPattern)

-		{

-			this.searchPattern = searchPattern;

-		}

-

-		Image ISearchDataSource.GetIcon (int item)

-		{

-			return null;

-		}

-

-		string ISearchDataSource.GetMarkup (int item, bool isSelected)

-		{

-			return GettextCatalog.GetString ("Search Packages...");

-		}

-

-		string ISearchDataSource.GetDescriptionMarkup (int item, bool isSelected)

-		{

-			return null;

-		}

-

-		TooltipInformation ISearchDataSource.GetTooltip (int item)

-		{

-			return null;

-		}

-

-		double ISearchDataSource.GetWeight (int item)

-		{

-			return 0;

-		}

-

-		DomRegion ISearchDataSource.GetRegion (int item)

-		{

-			return DomRegion.Empty;

-		}

-

-		bool ISearchDataSource.CanActivate (int item)

-		{

-			return IsProjectSelected ();

-		}

-

-		bool IsProjectSelected ()

-		{

-			return PackageManagementServices.ProjectService.CurrentProject != null;

-		}

-

-		void ISearchDataSource.Activate (int item)

-		{

-			var runner = new AddPackagesDialogRunner ();

-			runner.Run (searchPattern.UnparsedPattern);

-		}

-

-		int ISearchDataSource.ItemCount {

-			get {

-				if (IsProjectSelected ()) {

-					return 1;

-				}

-				return 0;

-			}

-		}

-	}

-}

-

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesSearchCategory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesSearchCategory.cs
index 9a1bdde9b9..cf35d50a71 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesSearchCategory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesSearchCategory.cs
@@ -27,21 +27,68 @@
 using System;

 using System.Threading;

 using System.Threading.Tasks;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Components.MainToolbar;

 using MonoDevelop.Core;

+using MonoDevelop.Ide.CodeCompletion;

+using MonoDevelop.Ide.TypeSystem;

+using Xwt.Drawing;

+using MonoDevelop.Ide;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class SearchPackagesSearchCategory : SearchCategory

+	internal class SearchPackagesSearchCategory : SearchCategory

 	{

 		public SearchPackagesSearchCategory ()

 			: base (GettextCatalog.GetString("Search"))

 		{

 		}

+		public override Task GetResults (ISearchResultCallback searchResultCallback, SearchPopupSearchPattern pattern, CancellationToken token)
+		{

+			if (IsProjectSelected ()) {

+				searchResultCallback.ReportResult (new SearchPackageSearchResult (pattern));

+			}

+			return SpecializedTasks.EmptyTask;
+		}

 

-		public override Task<ISearchDataSource> GetResults (SearchPopupSearchPattern searchPattern, int resultsCount, CancellationToken token)

+		class SearchPackageSearchResult : SearchResult

 		{

-			return Task.Factory.StartNew (() => (ISearchDataSource)new SearchPackagesDataSource (searchPattern));

+			SearchPopupSearchPattern pattern;

+

+			public override bool CanActivate {
+				get {
+					return IsProjectSelected ();
+				}
+			}
+

+			public SearchPackageSearchResult (SearchPopupSearchPattern pattern) : base ("", "", 0)
+			{

+				this.pattern = pattern;
+			}

+
+			public override void Activate ()
+			{
+				var runner = new AddPackagesDialogRunner ();

+				runner.Run (pattern.UnparsedPattern);

+			}

+

+			public override string GetMarkupText (bool selected)
+			{
+				return GettextCatalog.GetString ("Search Packages...");

+			}
+		}

+

+		static bool IsProjectSelected ()

+		{

+			return PackageManagementServices.ProjectService.CurrentProject != null;

+		}

+

+		static readonly string [] tags = { "search" };

+

+		public override string [] Tags {
+			get {
+				return tags;
+			}
 		}

 

 		public override bool IsValidTag (string tag)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsEventArgs.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsEventArgs.cs
index 444db4e904..c4a9527c8a 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsEventArgs.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsEventArgs.cs
@@ -29,9 +29,9 @@
 using System;

 using System.Collections.Generic;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class SelectProjectsEventArgs : EventArgs

+	internal class SelectProjectsEventArgs : EventArgs

 	{

 		public SelectProjectsEventArgs(IEnumerable<IPackageManagementSelectedProject> selectedProjects)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs
index 3042569412..72063554e5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsService.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using MonoDevelop.Ide;

 using MonoDevelop.PackageManagement;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class SelectProjectsService : ISelectProjectsService

+	internal class SelectProjectsService : ISelectProjectsService

 	{

 		public bool SelectProjects(IEnumerable<IPackageManagementSelectedProject> projects)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsViewModel.cs
index ee3e00a080..921e24f5c4 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectProjectsViewModel.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using System.Collections.ObjectModel;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class SelectProjectsViewModel

+	internal class SelectProjectsViewModel

 	{

 		ObservableCollection<IPackageManagementSelectedProject> projects = 

 			new ObservableCollection<IPackageManagementSelectedProject>();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectedProjectsForInstalledPackages.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectedProjectsForInstalledPackages.cs
index 87b968e692..cd839669d2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectedProjectsForInstalledPackages.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectedProjectsForInstalledPackages.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class SelectedProjectsForInstalledPackages : PackageManagementSelectedProjects

+	internal class SelectedProjectsForInstalledPackages : PackageManagementSelectedProjects

 	{

 		public SelectedProjectsForInstalledPackages(IPackageManagementSolution solution)

 			: base(solution)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectedProjectsForUpdatedPackages.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectedProjectsForUpdatedPackages.cs
index cbbd91ad0d..82bb39d287 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectedProjectsForUpdatedPackages.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SelectedProjectsForUpdatedPackages.cs
@@ -30,9 +30,9 @@ using System;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class SelectedProjectsForUpdatedPackages : PackageManagementSelectedProjects

+	internal class SelectedProjectsForUpdatedPackages : PackageManagementSelectedProjects

 	{

 		public SelectedProjectsForUpdatedPackages(IPackageManagementSolution solution)

 			: base(solution)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SettingsFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SettingsFactory.cs
index 9fac0b11d7..8f41306204 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SettingsFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SettingsFactory.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class SettingsFactory : ISettingsFactory

+	internal class SettingsFactory : ISettingsFactory

 	{

 		public ISettings CreateSettings(string directory)

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SettingsProvider.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SettingsProvider.cs
index 7f89c7f8bb..febdee98d5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SettingsProvider.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SettingsProvider.cs
@@ -26,13 +26,13 @@
 

 using System;

 using System.IO;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 using MonoDevelop.Core;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class SettingsProvider : ISettingsProvider

+	internal class SettingsProvider : ISettingsProvider

 	{

 		public static Func<IFileSystem, string, IMachineWideSettings, ISettings> LoadDefaultSettings

 			= Settings.LoadDefaultSettings;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopPackageManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopPackageManager.cs
deleted file mode 100644
index 84a9f3d9f1..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopPackageManager.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-// 

-// SharpDevelopPackageManager.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012-2013 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using System.Collections.Generic;

-using MonoDevelop.PackageManagement;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public class SharpDevelopPackageManager : PackageManager, ISharpDevelopPackageManager

-	{

-		IProjectSystem projectSystem;

-		IPackageOperationResolverFactory packageOperationResolverFactory;

-		

-		public SharpDevelopPackageManager(

-			IPackageRepository sourceRepository,

-			IProjectSystem projectSystem,

-			ISolutionPackageRepository solutionPackageRepository,

-			IPackageOperationResolverFactory packageOperationResolverFactory)

-			: base(

-				sourceRepository,

-				solutionPackageRepository.PackagePathResolver,

-				solutionPackageRepository.FileSystem,

-				solutionPackageRepository.Repository)

-		{

-			this.projectSystem = projectSystem;

-			this.packageOperationResolverFactory = packageOperationResolverFactory;

-			CreateProjectManager();

-		}

-		

-		// <summary>

-		/// project manager should be created with:

-		/// 	local repo = PackageReferenceRepository(projectSystem, sharedRepo)

-		///     packageRefRepo should have its RegisterIfNecessary() method called before creating the project manager.

-		/// 	source repo = sharedRepository

-		/// </summary>

-		void CreateProjectManager()

-		{

-			var packageRefRepository = CreatePackageReferenceRepository();

-			ProjectManager = CreateProjectManager(packageRefRepository);

-		}

-		

-		PackageReferenceRepository CreatePackageReferenceRepository()

-		{

-			var sharedRepository = LocalRepository as ISharedPackageRepository;

-			var packageRefRepository = new PackageReferenceRepository(projectSystem, projectSystem.ProjectName, sharedRepository);

-			packageRefRepository.RegisterIfNecessary();

-			return packageRefRepository;

-		}

-		

-		public ISharpDevelopProjectManager ProjectManager { get; set; }

-		

-		SharpDevelopProjectManager CreateProjectManager(PackageReferenceRepository packageRefRepository)

-		{

-			return new SharpDevelopProjectManager(LocalRepository, PathResolver, projectSystem, packageRefRepository);

-		}

-		

-		public void InstallPackage(IPackage package)

-		{

-			bool ignoreDependencies = false;

-			bool allowPreleaseVersions = false;

-			InstallPackage(package, ignoreDependencies, allowPreleaseVersions);

-		}

-		

-		public void InstallPackage(IPackage package, InstallPackageAction installAction)

-		{

-			RunPackageOperations(installAction.Operations);

-			AddPackageReference(package, installAction.IgnoreDependencies, installAction.AllowPrereleaseVersions);

-		}

-		

-		public void AddPackageReference (IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)

-		{

-			var monitor = new RemovedPackageReferenceMonitor(ProjectManager);

-			using (monitor) {

-				ProjectManager.AddPackageReference(package.Id, package.Version, ignoreDependencies, allowPrereleaseVersions);

-			}

-			

-			monitor.PackagesRemoved.ForEach(packageRemoved => UninstallPackageFromSolutionRepository(packageRemoved));

-		}

-		

-		public override void InstallPackage(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)

-		{

-			base.InstallPackage(package, ignoreDependencies, allowPrereleaseVersions);

-			AddPackageReference(package, ignoreDependencies, allowPrereleaseVersions);

-		}

-		

-		public void UninstallPackage(IPackage package, UninstallPackageAction uninstallAction)

-		{

-			UninstallPackage(package, uninstallAction.ForceRemove, uninstallAction.RemoveDependencies);

-		}

-		

-		public override void UninstallPackage(IPackage package, bool forceRemove, bool removeDependencies)

-		{

-			ProjectManager.RemovePackageReference(package.Id, forceRemove, removeDependencies);

-			if (!IsPackageReferencedByOtherProjects(package)) {

-				base.UninstallPackage(package, forceRemove, removeDependencies);

-			}

-		}

-		

-		public void UninstallPackageFromSolutionRepository(IPackage package)

-		{

-			if (!IsPackageReferencedByOtherProjects(package)) {

-				ExecuteUninstall(package);

-			}

-		}

-		

-		bool IsPackageReferencedByOtherProjects(IPackage package)

-		{

-			var sharedRepository = LocalRepository as ISharedPackageRepository;

-			return sharedRepository.IsReferenced(package.Id, package.Version);

-		}

-		

-		public IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, InstallPackageAction installAction)

-		{

-			IPackageOperationResolver resolver = CreateInstallPackageOperationResolver(installAction);

-			return resolver.ResolveOperations(package);

-		}

-		

-		IPackageOperationResolver CreateInstallPackageOperationResolver(InstallPackageAction installAction)

-		{

-			return packageOperationResolverFactory.CreateInstallPackageOperationResolver(

-				LocalRepository,

-				SourceRepository,

-				Logger,

-				installAction);

-		}

-		

-		public void UpdatePackage(IPackage package, UpdatePackageAction updateAction)

-		{

-			RunPackageOperations(updateAction.Operations);

-			UpdatePackageReference(package, updateAction);

-		}

-		

-		public void UpdatePackageReference(IPackage package, IUpdatePackageSettings settings)

-		{

-			UpdatePackageReference(package, settings.UpdateDependencies, settings.AllowPrereleaseVersions);

-		}

-		

-		void UpdatePackageReference(IPackage package, bool updateDependencies, bool allowPrereleaseVersions)

-		{

-			var monitor = new RemovedPackageReferenceMonitor(ProjectManager);

-			using (monitor) {

-				ProjectManager.UpdatePackageReference(package.Id, package.Version, updateDependencies, allowPrereleaseVersions);

-			}

-			

-			monitor.PackagesRemoved.ForEach(packageRemoved => UninstallPackageFromSolutionRepository(packageRemoved));

-		}

-		

-		public void UpdatePackages(UpdatePackagesAction updateAction)

-		{

-			RunPackageOperations(updateAction.Operations);

-			foreach (IPackage package in updateAction.Packages) {

-				UpdatePackageReference(package, updateAction);

-			}

-		}

-		

-		public IEnumerable<PackageOperation> GetUpdatePackageOperations(

-			IEnumerable<IPackage> packages,

-			IUpdatePackageSettings settings)

-		{

-			IPackageOperationResolver resolver = CreateUpdatePackageOperationResolver(settings);

-			

-			var reducedOperations = new ReducedPackageOperations(resolver, packages);

-			reducedOperations.Reduce();

-			return reducedOperations.Operations;

-		}

-		

-		IPackageOperationResolver CreateUpdatePackageOperationResolver(IUpdatePackageSettings settings)

-		{

-			return packageOperationResolverFactory.CreateUpdatePackageOperationResolver(

-				LocalRepository,

-				SourceRepository,

-				Logger,

-				settings);

-		}

-		

-		public void RunPackageOperations(IEnumerable<PackageOperation> operations)

-		{

-			foreach (PackageOperation operation in operations) {

-				Execute(operation);

-			}

-		}

-

-		public ReinstallPackageOperations GetReinstallPackageOperations (IEnumerable<IPackage> packages)

-		{

-			var installWalker = new InstallWalker (

-				LocalRepository,

-				SourceRepository,

-				ProjectManager.Project.TargetFramework,

-				ProjectManager.Logger,

-				ignoreDependencies: true,

-				allowPrereleaseVersions: false,

-				dependencyVersion: DependencyVersion.Lowest);

-

-			IList<IPackage> packagesInDependencyOrder;

-			IList<PackageOperation> operations = installWalker.ResolveOperations (

-				packages,

-				out packagesInDependencyOrder,

-				allowPrereleaseVersionsBasedOnPackage: true);

-

-			return new ReinstallPackageOperations (operations, packagesInDependencyOrder);

-		}

-	}

-}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopPackageManagerFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopPackageManagerFactory.cs
deleted file mode 100644
index 02626127aa..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopPackageManagerFactory.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// 

-// SharpDevelopPackageManagerFactory.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using MonoDevelop.PackageManagement;

-using MonoDevelop.Projects;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public class SharpDevelopPackageManagerFactory : IPackageManagerFactory

-	{

-		PackageManagementOptions options;

-		ISharpDevelopPackageRepositoryFactory packageRepositoryFactory;

-		ISharpDevelopProjectSystemFactory projectSystemFactory;

-		

-		public SharpDevelopPackageManagerFactory()

-			: this(

-				new SharpDevelopPackageRepositoryFactory(),

-				new SharpDevelopProjectSystemFactory(),

-				PackageManagementServices.Options)

-		{

-		}

-		

-		public SharpDevelopPackageManagerFactory(

-			ISharpDevelopPackageRepositoryFactory packageRepositoryFactory,

-		    ISharpDevelopProjectSystemFactory projectSystemFactory,

-		    PackageManagementOptions options)

-		{

-			this.packageRepositoryFactory = packageRepositoryFactory;

-			this.projectSystemFactory = projectSystemFactory;

-			this.options = options;

-		}

-		

-		public ISharpDevelopPackageManager CreatePackageManager(

-			IPackageRepository sourceRepository,

-			IDotNetProject project)

-		{

-			SolutionPackageRepository solutionPackageRepository = CreateSolutionPackageRepository (project.ParentSolution);

-			IProjectSystem projectSystem = CreateProjectSystem (project.DotNetProject);

-			PackageOperationsResolverFactory packageOperationResolverFactory = new PackageOperationsResolverFactory();

-			

-			return new SharpDevelopPackageManager(

-				sourceRepository,

-				projectSystem,

-				solutionPackageRepository,

-				packageOperationResolverFactory);

-		}

-		

-		SolutionPackageRepository CreateSolutionPackageRepository (ISolution solution)

-		{

-			return new SolutionPackageRepository (solution, packageRepositoryFactory, options);

-		}

-		

-		IProjectSystem CreateProjectSystem(DotNetProject project)

-		{

-			return projectSystemFactory.CreateProjectSystem(project);

-		}

-

-		public IPackageManager CreatePackageManager (

-			IPackageRepository sourceRepository,

-			ISolutionPackageRepository solutionPackageRepository)

-		{

-			return new PackageManager (

-				sourceRepository,

-				solutionPackageRepository.PackagePathResolver,

-				solutionPackageRepository.FileSystem,

-				solutionPackageRepository.Repository);

-		}

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopPackageRepositoryFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopPackageRepositoryFactory.cs
deleted file mode 100644
index afcd7dffb4..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopPackageRepositoryFactory.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// 

-// SharpDevelopPackageRepositoryFactory.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using System.Collections.Generic;

-using MonoDevelop.PackageManagement;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public class SharpDevelopPackageRepositoryFactory : PackageRepositoryFactory, ISharpDevelopPackageRepositoryFactory

-	{

-		public ISharedPackageRepository CreateSharedRepository(

-			IPackagePathResolver pathResolver,

-			IFileSystem fileSystem,

-			IFileSystem configSettingsFileSystem)

-		{

-			return new SharedPackageRepository(pathResolver, fileSystem, configSettingsFileSystem);

-		}

-		

-		public IRecentPackageRepository CreateRecentPackageRepository(

-			IList<RecentPackageInfo> recentPackages,

-			IPackageRepository aggregateRepository)

-		{

-			return new RecentPackageRepository(recentPackages, aggregateRepository);

-		}

-		

-		public IPackageRepository CreateAggregateRepository(IEnumerable<IPackageRepository> repositories)

-		{

-			return new MonoDevelopAggregateRepository (repositories);

-		}

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectManager.cs
deleted file mode 100644
index 51ac0b51ee..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectManager.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// 

-// SharpDevelopProjectManager.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using System.Collections.Generic;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public class SharpDevelopProjectManager : ProjectManager, ISharpDevelopProjectManager

-	{

-		public SharpDevelopProjectManager(

-			IPackageRepository sourceRepository,

-			IPackagePathResolver pathResolver,

-			IProjectSystem project,

-			IPackageRepository localRepository)

-			: base(sourceRepository, pathResolver, project, localRepository)

-		{

-		}

-		

-		public bool IsInstalled(string packageId)

-		{

-			return LocalRepository.Exists(packageId);

-		}

-		

-		public bool HasOlderPackageInstalled(IPackage package)

-		{

-			IPackage installedPackage = LocalRepository.FindPackage(package.Id);

-			return (installedPackage != null) &&

-				(installedPackage.Version < package.Version);

-		}

-

-		public IEnumerable<PackageReference> GetPackageReferences ()

-		{

-			var repository = LocalRepository as PackageReferenceRepository;

-			return repository.ReferenceFile.GetPackageReferences ();

-		}

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs
deleted file mode 100644
index 4684a24b57..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystem.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-// 

-// SharpDevelopProjectSystem.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using System.IO;

-using System.Runtime.Versioning;

-

-using MonoDevelop.Core;

-using MonoDevelop.Ide;

-using MonoDevelop.PackageManagement;

-using MonoDevelop.Projects;

-using MonoDevelop.Projects.Formats.MSBuild;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public class SharpDevelopProjectSystem : PhysicalFileSystem, IProjectSystem

-	{

-		IDotNetProject project;

-		ProjectTargetFramework targetFramework;

-		IPackageManagementFileService fileService;

-		IPackageManagementEvents packageManagementEvents;

-		Action<MessageHandler> guiSyncDispatcher;

-

-		public SharpDevelopProjectSystem(DotNetProject project)

-			: this (

-				new DotNetProjectProxy (project),

-				new PackageManagementFileService (),

-				PackageManagementServices.ProjectService,

-				PackageManagementServices.PackageManagementEvents,

-				DispatchService.GuiSyncDispatch)

-		{

-		}

-		

-		public SharpDevelopProjectSystem (

-			IDotNetProject project,

-			IPackageManagementFileService fileService,

-			IPackageManagementProjectService projectService,

-			IPackageManagementEvents packageManagementEvents,

-			Action<MessageHandler> guiSyncDispatcher)

-			: base (AppendTrailingSlashToDirectory (project.BaseDirectory))

-		{

-			this.project = project;

-			this.fileService = fileService;

-			this.packageManagementEvents = packageManagementEvents;

-			this.guiSyncDispatcher = guiSyncDispatcher;

-		}

-		

-		static string AppendTrailingSlashToDirectory(string directory)

-		{

-			return directory + Path.DirectorySeparatorChar.ToString();

-		}

-		

-		public bool IsBindingRedirectSupported { get; set; }

-		

-		public FrameworkName TargetFramework {

-			get {

-				return GuiSyncDispatch (() => GetTargetFramework ());

-			}

-		}

-		

-		FrameworkName GetTargetFramework()

-		{

-			if (targetFramework == null) {

-				targetFramework = new ProjectTargetFramework(project);

-			}

-			return targetFramework.TargetFrameworkName;

-		}

-		

-		public string ProjectName {

-			get {

-				return GuiSyncDispatch (() => project.Name);

-			}

-		}

-

-		public dynamic GetPropertyValue (string propertyName)

-		{

-			return GuiSyncDispatch (() => {

-				if ("RootNamespace".Equals(propertyName, StringComparison.OrdinalIgnoreCase)) {

-					return project.DefaultNamespace;

-				}

-				return String.Empty;

-			});

-		}

-

-		public void AddReference(string referencePath, Stream stream)

-		{

-			GuiSyncDispatch (() => {

-				ProjectReference assemblyReference = CreateReference (referencePath);

-				packageManagementEvents.OnReferenceAdding (assemblyReference);

-				AddReferenceToProject (assemblyReference);

-			});

-		}

-		

-		ProjectReference CreateReference(string referencePath)

-		{

-			string fullPath = GetFullPath(referencePath);

-			return new ProjectReference(ReferenceType.Assembly, fullPath);

-		}

-		

-		void AddReferenceToProject(ProjectReference assemblyReference)

-		{

-			project.References.Add (assemblyReference);

-			project.Save ();

-			LogAddedReferenceToProject(assemblyReference);

-		}

-		

-		void LogAddedReferenceToProject(ProjectReference referenceProjectItem)

-		{

-			LogAddedReferenceToProject(referenceProjectItem.Reference, ProjectName);

-		}

-		

-		protected virtual void LogAddedReferenceToProject(string referenceName, string projectName)

-		{

-			DebugLogFormat("Added reference '{0}' to project '{1}'.", referenceName, projectName);

-		}

-		

-		void DebugLogFormat(string format, params object[] args)

-		{

-			Logger.Log(MessageLevel.Debug, format, args);

-		}

-		

-		public bool ReferenceExists(string name)

-		{

-			return GuiSyncDispatch (() => {

-				ProjectReference referenceProjectItem = FindReference (name);

-				if (referenceProjectItem != null) {

-					return true;

-				}

-				return false;

-			});

-		}

-		

-		ProjectReference FindReference(string name)

-		{

-			string referenceName = GetReferenceName(name);

-			foreach (ProjectReference referenceProjectItem in project.References) {

-				string projectReferenceName = GetProjectReferenceName(referenceProjectItem.Reference);

-				if (IsMatchIgnoringCase(projectReferenceName, referenceName)) {

-					return referenceProjectItem;

-				}

-			}

-			return null;

-		}

-		

-		string GetReferenceName(string name)

-		{

-			if (HasDllOrExeFileExtension(name)) {

-				return Path.GetFileNameWithoutExtension(name);

-			}

-			return name;

-		}

-		

-		string GetProjectReferenceName(string name)

-		{

-			string referenceName = GetReferenceName(name);

-			return GetAssemblyShortName(referenceName);

-		}

-		

-		string GetAssemblyShortName(string name)

-		{

-			string[] parts = name.Split(',');

-			return parts[0];

-		}

-		

-		bool HasDllOrExeFileExtension(string name)

-		{

-			string extension = Path.GetExtension(name);

-			return

-				IsMatchIgnoringCase(extension, ".dll") ||

-				IsMatchIgnoringCase(extension, ".exe");

-		}

-		

-		bool IsMatchIgnoringCase(string lhs, string rhs)

-		{

-			return String.Equals(lhs, rhs, StringComparison.InvariantCultureIgnoreCase);

-		}

-		

-		public void RemoveReference(string name)

-		{

-			GuiSyncDispatch (() => {

-				ProjectReference referenceProjectItem = FindReference (name);

-				if (referenceProjectItem != null) {

-					packageManagementEvents.OnReferenceRemoving (referenceProjectItem);

-					project.References.Remove (referenceProjectItem);

-					project.Save ();

-					LogRemovedReferenceFromProject (referenceProjectItem);

-				}

-			});

-		}

-		

-		void LogRemovedReferenceFromProject(ProjectReference referenceProjectItem)

-		{

-			LogRemovedReferenceFromProject(referenceProjectItem.Reference, ProjectName);

-		}

-		

-		protected virtual void LogRemovedReferenceFromProject(string referenceName, string projectName)

-		{

-			DebugLogFormat("Removed reference '{0}' from project '{1}'.", referenceName, projectName);

-		}

-		

-		public bool IsSupportedFile(string path)

-		{

-			return GuiSyncDispatch (() => {

-				if (project.IsWebProject ()) {

-					return !IsAppConfigFile (path);

-				}

-				return !IsWebConfigFile (path);

-			});

-		}

-		

-		bool IsWebConfigFile(string path)

-		{

-			return IsFileNameMatchIgnoringPath("web.config", path);

-		}

-		

-		bool IsAppConfigFile(string path)

-		{

-			return IsFileNameMatchIgnoringPath("app.config", path);

-		}

-		

-		bool IsFileNameMatchIgnoringPath(string fileName1, string path)

-		{

-			string fileName2 = Path.GetFileName(path);

-			return IsMatchIgnoringCase(fileName1, fileName2);

-		}

-		

-		public override void AddFile(string path, Stream stream)

-		{

-			PhysicalFileSystemAddFile(path, stream);

-			GuiSyncDispatch (() => AddFileToProject (path));

-		}

-		

-		protected virtual void PhysicalFileSystemAddFile(string path, Stream stream)

-		{

-			base.AddFile(path, stream);

-		}

-		

-		public override void AddFile(string path, Action<Stream> writeToStream)

-		{

-			PhysicalFileSystemAddFile (path, writeToStream);

-			GuiSyncDispatch (() => AddFileToProject (path));

-		}

-

-		protected virtual void PhysicalFileSystemAddFile (string path, Action<Stream> writeToStream)

-		{

-			base.AddFile(path, writeToStream);

-		}

-

-		void AddFileToProject(string path)

-		{

-			if (ShouldAddFileToProject(path)) {

-				AddFileProjectItemToProject(path);

-			}

-			OnFileChanged (path);

-			LogAddedFileToProject(path);

-		}

-		

-		bool ShouldAddFileToProject(string path)

-		{

-			return !IsBinDirectory(path) && !FileExistsInProject(path);

-		}

-

-		void OnFileChanged (string path)

-		{

-			GuiSyncDispatch (() => fileService.OnFileChanged (GetFullPath (path)));

-		}

-		

-		bool IsBinDirectory(string path)

-		{

-			string directoryName = Path.GetDirectoryName(path);

-			return IsMatchIgnoringCase(directoryName, "bin");

-		}

-		

-		public bool FileExistsInProject(string path)

-		{

-			string fullPath = GetFullPath(path);

-			return GuiSyncDispatch (() => {

-				return project.IsFileInProject (fullPath);

-			});

-		}

-		

-		void AddFileProjectItemToProject(string path)

-		{

-			ProjectFile fileItem = CreateFileProjectItem (path);

-			project.AddFile (fileItem);

-			project.Save ();

-		}

-		

-		ProjectFile CreateFileProjectItem(string path)

-		{

-			//TODO custom tool?

-			string fullPath = GetFullPath(path);

-			string buildAction = project.GetDefaultBuildAction(fullPath);

-			return new ProjectFile(fullPath) {

-				BuildAction = buildAction

-			};

-		}

-		

-		void LogAddedFileToProject(string fileName)

-		{

-			LogAddedFileToProject(fileName, ProjectName);

-		}

-		

-		protected virtual void LogAddedFileToProject(string fileName, string projectName)

-		{

-			DebugLogFormat("Added file '{0}' to project '{1}'.", fileName, projectName);

-		}

-		

-		public override void DeleteDirectory(string path, bool recursive)

-		{

-			GuiSyncDispatch (() => {

-				string directory = GetFullPath (path);

-				fileService.RemoveDirectory (directory);

-				project.Save ();

-				LogDeletedDirectory (path);

-			});

-		}

-		

-		public override void DeleteFile(string path)

-		{

-			GuiSyncDispatch (() => {

-				string fileName = GetFullPath (path);

-				project.Files.Remove (fileName);

-				fileService.RemoveFile (fileName);

-				project.Save ();

-				LogDeletedFileInfo (path);

-			});

-		}

-		

-		protected virtual void LogDeletedDirectory(string folder)

-		{

-			DebugLogFormat("Removed folder '{0}'.", folder);

-		}

-		

-		void LogDeletedFileInfo(string path)

-		{

-			string fileName = Path.GetFileName(path);

-			string directory = Path.GetDirectoryName(path);

-			if (String.IsNullOrEmpty(directory)) {

-				LogDeletedFile(fileName);

-			} else {

-				LogDeletedFileFromDirectory(fileName, directory);

-			}

-		}

-		

-		protected virtual void LogDeletedFile(string fileName)

-		{

-			DebugLogFormat("Removed file '{0}'.", fileName);

-		}

-		

-		protected virtual void LogDeletedFileFromDirectory(string fileName, string directory)

-		{

-			DebugLogFormat("Removed file '{0}' from folder '{1}'.", fileName, directory);

-		}

-		

-		public void AddFrameworkReference(string name)

-		{

-			GuiSyncDispatch (() => {

-				ProjectReference assemblyReference = CreateGacReference (name);

-				AddReferenceToProject (assemblyReference);

-			});

-		}

-		

-		ProjectReference CreateGacReference(string name)

-		{

-			return new ProjectReference(ReferenceType.Package, name);

-		}

-		

-		public string ResolvePath(string path)

-		{

-			return path;

-		}

-		

-		public void AddImport(string targetPath, ProjectImportLocation location)

-		{

-			GuiSyncDispatch (() => {

-				string relativeTargetPath = GetRelativePath (targetPath);

-				string condition = GetCondition (relativeTargetPath);

-				project.AddImportIfMissing (relativeTargetPath, condition);

-				project.Save ();

-			});

-		}

-

-		static string GetCondition (string targetPath)

-		{

-			return String.Format ("Exists('{0}')", targetPath);

-		}

-

-		string GetRelativePath(string path)

-		{

-			return MSBuildProjectService.ToMSBuildPath (project.BaseDirectory, path);

-		}

-		

-		public void RemoveImport(string targetPath)

-		{

-			GuiSyncDispatch (() => {

-				string relativeTargetPath = GetRelativePath (targetPath);

-				project.RemoveImport (relativeTargetPath);

-				RemoveImportWithForwardSlashes (targetPath);

-

-				using (var updater = new EnsureNuGetPackageBuildImportsTargetUpdater ()) {

-					updater.RemoveImport (relativeTargetPath);

-					project.Save ();

-				}

-

-				packageManagementEvents.OnImportRemoved (project, relativeTargetPath);

-			});

-		}

-

-		void RemoveImportWithForwardSlashes (string targetPath)

-		{

-			string relativeTargetPath = FileService.AbsoluteToRelativePath (project.BaseDirectory, targetPath);

-			if (Path.DirectorySeparatorChar == '\\') {

-				relativeTargetPath = relativeTargetPath.Replace ('\\', '/');

-			}

-			project.RemoveImport (relativeTargetPath);

-		}

-

-		/// <summary>

-		/// NuGet sometimes uses CreateFile to replace an existing file.

-		/// This happens when the XML transformation (web.config.transform) is reverted on 

-		/// uninstalling a NuGet package. It also happens when an XML document transform 

-		/// (.install.xdt, .uninstall.xdt) is run.

-		/// </summary>

-		public override Stream CreateFile (string path)

-		{

-			OnFileChanged (path);

-			return base.CreateFile (path);

-		}

-

-		T GuiSyncDispatch<T> (Func<T> action)

-		{

-			T result = default(T);

-			guiSyncDispatcher (() => result = action ());

-			return result;

-		}

-

-		void GuiSyncDispatch (Action action)

-		{

-			guiSyncDispatcher (() => action ());

-		}

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystemFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystemFactory.cs
deleted file mode 100644
index 5faa892bd2..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SharpDevelopProjectSystemFactory.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// 

-// SharpDevelopProjectSystemFactory.cs

-// 

-// Author:

-//   Matt Ward <ward.matt@gmail.com>

-// 

-// Copyright (C) 2012 Matthew Ward

-// 

-// Permission is hereby granted, free of charge, to any person obtaining

-// a copy of this software and associated documentation files (the

-// "Software"), to deal in the Software without restriction, including

-// without limitation the rights to use, copy, modify, merge, publish,

-// distribute, sublicense, and/or sell copies of the Software, and to

-// permit persons to whom the Software is furnished to do so, subject to

-// the following conditions:

-// 

-// The above copyright notice and this permission notice shall be

-// included in all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-//

-

-using System;

-using MonoDevelop.Projects;

-using NuGet;

-

-namespace ICSharpCode.PackageManagement

-{

-	public class SharpDevelopProjectSystemFactory : ISharpDevelopProjectSystemFactory

-	{

-		public IProjectSystem CreateProjectSystem(DotNetProject project)

-		{

-			return new SharpDevelopProjectSystem(project);

-		}

-	}

-}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionExtensions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionExtensions.cs
index c77db7ebe2..31c7a400d2 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionExtensions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionExtensions.cs
@@ -29,18 +29,13 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using MonoDevelop.Core.ProgressMonitoring;

+using MonoDevelop.Core;

 using MonoDevelop.Projects;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public static class SolutionExtensions

+	internal static class SolutionExtensions

 	{

-		public static void Save(this Solution solution)

-		{

-			solution.Save(new NullProgressMonitor());

-		}

-

 		public static IEnumerable<DotNetProject> GetAllDotNetProjects (this Solution solution)

 		{

 			return solution.GetAllProjects ().OfType<DotNetProject> ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepository.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepository.cs
index da361f1f20..0f2d920814 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepository.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepository.cs
@@ -33,12 +33,12 @@ using System.Linq;
 using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class SolutionPackageRepository : ISolutionPackageRepository

+	internal class SolutionPackageRepository : ISolutionPackageRepository

 	{

 		SolutionPackageRepositoryPath repositoryPath;

-		ISharpDevelopPackageRepositoryFactory repositoryFactory;

+		IMonoDevelopPackageRepositoryFactory repositoryFactory;

 		DefaultPackagePathResolver packagePathResolver;

 		PhysicalFileSystem fileSystem;

 		ISharedPackageRepository repository;

@@ -46,14 +46,14 @@ namespace ICSharpCode.PackageManagement
 		public SolutionPackageRepository (ISolution solution)

 			: this (

 				solution,

-				new SharpDevelopPackageRepositoryFactory(),

+				new MonoDevelopPackageRepositoryFactory(),

 				PackageManagementServices.Options)

 		{

 		}

 		

 		public SolutionPackageRepository (

 			ISolution solution,

-			ISharpDevelopPackageRepositoryFactory repositoryFactory,

+			IMonoDevelopPackageRepositoryFactory repositoryFactory,

 			PackageManagementOptions options)

 		{

 			this.repositoryFactory = repositoryFactory;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepositoryFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepositoryFactory.cs
index d08e71d5c7..f33e29a16b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepositoryFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepositoryFactory.cs
@@ -31,11 +31,11 @@ using MonoDevelop.PackageManagement;
 using MonoDevelop.Projects;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class SolutionPackageRepositoryFactory : ISolutionPackageRepositoryFactory

+	internal class SolutionPackageRepositoryFactory : ISolutionPackageRepositoryFactory

 	{

-		ISharpDevelopPackageRepositoryFactory repositoryFactory;

+		IMonoDevelopPackageRepositoryFactory repositoryFactory;

 		PackageManagementOptions options;

 		

 		public SolutionPackageRepositoryFactory()

@@ -44,7 +44,7 @@ namespace ICSharpCode.PackageManagement
 		}

 		

 		public SolutionPackageRepositoryFactory(

-			ISharpDevelopPackageRepositoryFactory repositoryFactory,

+			IMonoDevelopPackageRepositoryFactory repositoryFactory,

 			PackageManagementOptions options)

 		{

 			this.repositoryFactory = repositoryFactory;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepositoryPath.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepositoryPath.cs
index 60bb5b02a1..2bc36444f7 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepositoryPath.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionPackageRepositoryPath.cs
@@ -32,9 +32,9 @@ using MonoDevelop.PackageManagement;
 using MonoDevelop.Projects;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class SolutionPackageRepositoryPath

+	internal class SolutionPackageRepositoryPath

 	{

 		ISolution solution;

 		DefaultPackagePathResolver pathResolver;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionProxy.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionProxy.cs
index d97c9579f8..b69b5fc984 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionProxy.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SolutionProxy.cs
@@ -32,10 +32,11 @@ using MonoDevelop.Projects;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class SolutionProxy : ISolution

+	internal class SolutionProxy : ISolution

 	{

 		Solution solution;

 		EventHandler<DotNetProjectEventArgs> projectAdded;

+		EventHandler<DotNetProjectEventArgs> projectRemoved;

 

 		public SolutionProxy (Solution solution)

 		{

@@ -84,6 +85,29 @@ namespace MonoDevelop.PackageManagement
 				projectAdded (this, new DotNetProjectEventArgs (project));

 			}

 		}

+

+		public event EventHandler<DotNetProjectEventArgs> ProjectRemoved {

+			add {

+				if (projectRemoved == null) {

+					solution.SolutionItemRemoved += SolutionItemRemoved;

+				}

+				projectRemoved += value;

+			}

+			remove {

+				projectRemoved -= value;

+				if (projectRemoved == null) {

+					solution.SolutionItemRemoved -= SolutionItemRemoved;

+				}

+			}

+		}

+

+		void SolutionItemRemoved (object sender, SolutionItemChangeEventArgs e)

+		{

+			var project = e.SolutionItem as DotNetProject;

+			if (project != null) {

+				projectRemoved (this, new DotNetProjectEventArgs (project));

+			}

+		}

 	}

 }

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafePackageManagementEvents.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafePackageManagementEvents.cs
index d85e9f4457..bbc5af1241 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafePackageManagementEvents.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafePackageManagementEvents.cs
@@ -34,23 +34,21 @@ using NuGet;
 using MonoDevelop.PackageManagement;

 using MonoDevelop.Projects;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ThreadSafePackageManagementEvents : IThreadSafePackageManagementEvents

+	internal class ThreadSafePackageManagementEvents : IThreadSafePackageManagementEvents

 	{

-		static Action<MessageHandler> defaultGuiSyncDispatcher = DispatchService.GuiSyncDispatch;

-

-		Action<MessageHandler> guiSyncDispatcher;

+		Action<Action> guiSyncDispatcher;

 		IPackageManagementEvents unsafeEvents;

 

 		public ThreadSafePackageManagementEvents (IPackageManagementEvents unsafeEvents)

-			: this (unsafeEvents, defaultGuiSyncDispatcher)

+			: this (unsafeEvents, MonoDevelopProjectSystem.DefaultGuiSyncDispatcher)

 		{

 		}

 

 		public ThreadSafePackageManagementEvents (

 			IPackageManagementEvents unsafeEvents,

-			Action<MessageHandler> guiSyncDispatcher)

+			Action<Action> guiSyncDispatcher)

 		{

 			this.unsafeEvents = unsafeEvents;

 			this.guiSyncDispatcher = guiSyncDispatcher;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafeProjectBrowserUpdater.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafeProjectBrowserUpdater.cs
index 85e6475974..d3b9d94294 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafeProjectBrowserUpdater.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ThreadSafeProjectBrowserUpdater.cs
@@ -28,9 +28,9 @@
 

 using System;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class ThreadSafeProjectBrowserUpdater : ProjectBrowserUpdater

+	internal class ThreadSafeProjectBrowserUpdater : ProjectBrowserUpdater

 	{

 //		public ThreadSafeProjectBrowserUpdater()

 //			: base(GetProjectBrowserControl())

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallPackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallPackageAction.cs
index 44296c8438..4015de0434 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallPackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UninstallPackageAction.cs
@@ -30,9 +30,9 @@ using System;
 using System.IO;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UninstallPackageAction : ProcessPackageAction

+	internal class UninstallPackageAction : ProcessPackageAction

 	{

 		public UninstallPackageAction(

 			IPackageManagementProject project,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllPackagesInProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllPackagesInProject.cs
index d8bac043c7..31fdb59aa3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllPackagesInProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllPackagesInProject.cs
@@ -25,12 +25,12 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdateAllPackagesInProject : UpdatePackageActions

+	internal class UpdateAllPackagesInProject : UpdatePackageActions

 	{

 		IPackageManagementProject project;

 		

@@ -56,6 +56,9 @@ namespace ICSharpCode.PackageManagement
 		{

 			UpdatePackageAction action = CreateDefaultUpdatePackageAction(project);

 			action.PackageId = package.Id;

+			if (!action.AllowPrereleaseVersions && !package.IsReleaseVersion ()) {

+				action.AllowPrereleaseVersions = true;

+			}

 			return action;

 		}

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllPackagesInSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllPackagesInSolution.cs
index 2b56af8919..73c63afa38 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllPackagesInSolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateAllPackagesInSolution.cs
@@ -27,9 +27,9 @@ using System.Collections.Generic;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdateAllPackagesInSolution : UpdatePackageActions

+	internal class UpdateAllPackagesInSolution : UpdatePackageActions

 	{

 		IPackageManagementSolution solution;

 		IPackageRepository sourceRepository;

@@ -73,6 +73,9 @@ namespace ICSharpCode.PackageManagement
 		{

 			UpdatePackageAction action = CreateDefaultUpdatePackageAction(project);

 			action.PackageId = package.Id;

+			if (!action.AllowPrereleaseVersions && !package.IsReleaseVersion ()) {

+				action.AllowPrereleaseVersions = true;

+			}

 			return action;

 		}

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackageAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackageAction.cs
index 3be5f36caf..8c6129780f 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackageAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackageAction.cs
@@ -28,12 +28,11 @@
 

 using System;

 using System.Collections.Generic;

-using MonoDevelop.PackageManagement;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdatePackageAction : ProcessPackageOperationsAction, IUpdatePackageSettings

+	internal class UpdatePackageAction : ProcessPackageOperationsAction, IUpdatePackageSettings

 	{

 		IFileRemover fileRemover;

 

@@ -51,11 +50,21 @@ namespace ICSharpCode.PackageManagement
 			IPackageManagementProject project,

 			IPackageManagementEvents packageManagementEvents,

 			IFileRemover fileRemover)

-			: base (project, packageManagementEvents)

+			: this (project, packageManagementEvents, fileRemover, new LicenseAcceptanceService ())

+		{

+		}

+

+		public UpdatePackageAction (

+			IPackageManagementProject project,

+			IPackageManagementEvents packageManagementEvents,

+			IFileRemover fileRemover,

+			ILicenseAcceptanceService licenseAcceptanceService)

+			: base (project, packageManagementEvents, licenseAcceptanceService)

 		{

 			this.fileRemover = fileRemover;

 			UpdateDependencies = true;

 			UpdateIfPackageDoesNotExistInProject = true;

+			LicensesMustBeAccepted = true;

 		}

 		

 		public bool UpdateDependencies { get; set; }

@@ -124,5 +133,12 @@ namespace ICSharpCode.PackageManagement
 		{

 			return ShouldUpdatePackage ();

 		}

+

+		protected override void CheckLicenses ()
+		{

+			if (ShouldUpdatePackage ()) {
+				base.CheckLicenses ();

+			}
+		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackageActions.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackageActions.cs
index bc95a2a0e7..dc5f45b52c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackageActions.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackageActions.cs
@@ -25,9 +25,9 @@
 using System;

 using System.Collections.Generic;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public abstract class UpdatePackageActions : IUpdatePackageActions

+	internal abstract class UpdatePackageActions : IUpdatePackageActions

 	{

 		public bool UpdateDependencies { get; set; }

 		public bool AllowPrereleaseVersions { get; set; }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesAction.cs
index 7827037bfb..a76b2a0ad6 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesAction.cs
@@ -30,9 +30,9 @@ using System;
 using System.Collections.Generic;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdatePackagesAction : IUpdatePackagesAction

+	internal class UpdatePackagesAction : IUpdatePackagesAction

 	{

 		List<IPackage> packages = new List<IPackage>();

 		List<PackageOperation> operations = new List<PackageOperation>();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesActionFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesActionFactory.cs
index ab1a290391..4ed823a89d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesActionFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesActionFactory.cs
@@ -32,9 +32,9 @@ using System.Linq;
 

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdatePackagesActionFactory

+	internal class UpdatePackagesActionFactory

 	{

 		ILogger logger;

 		IPackageManagementEvents packageManagementEvents;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesProgressMonitorStatusMessage.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesProgressMonitorStatusMessage.cs
index aaeb369b15..5b0d15ad19 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesProgressMonitorStatusMessage.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatePackagesProgressMonitorStatusMessage.cs
@@ -26,11 +26,11 @@
 

 using System;

 using System.Collections.Generic;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class UpdatePackagesProgressMonitorStatusMessage : ProgressMonitorStatusMessage

+	internal class UpdatePackagesProgressMonitorStatusMessage : ProgressMonitorStatusMessage

 	{

 		UpdatedPackagesMonitor monitor;

 		string packagesUpToDateMessage;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateSolutionPackagesAction.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateSolutionPackagesAction.cs
index 229156a1ad..c2dc4ccfce 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateSolutionPackagesAction.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdateSolutionPackagesAction.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using System.Linq;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdateSolutionPackagesAction : IUpdatePackagesAction

+	internal class UpdateSolutionPackagesAction : IUpdatePackagesAction

 	{

 		List<IPackageFromRepository> packages = new List<IPackageFromRepository>();

 		List<PackageOperation> operations = new List<PackageOperation>();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackageViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackageViewModel.cs
index 4b9985eed9..d26a7ded54 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackageViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackageViewModel.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdatedPackageViewModel : PackageViewModel

+	internal class UpdatedPackageViewModel : PackageViewModel

 	{

 		public UpdatedPackageViewModel(

 			IPackageViewModelParent parent,

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackageViewModelFactory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackageViewModelFactory.cs
index cd6ca00324..0154ed85e5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackageViewModelFactory.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackageViewModelFactory.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdatedPackageViewModelFactory : PackageViewModelFactory

+	internal class UpdatedPackageViewModelFactory : PackageViewModelFactory

 	{

 		SelectedProjectsForUpdatedPackages selectedProjectsForUpdatedPackages;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackages.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackages.cs
index 3d2984e654..049efda942 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackages.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackages.cs
@@ -32,9 +32,9 @@ using System.Linq;
 

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdatedPackages

+	internal class UpdatedPackages

 	{

 		IPackageRepository sourceRepository;

 		List<IPackageName> installedPackages;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInProject.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInProject.cs
index c73b1ccd6d..881a12d206 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInProject.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInProject.cs
@@ -31,7 +31,7 @@ using NuGet;
 

 namespace MonoDevelop.PackageManagement

 {

-	public class UpdatedPackagesInProject

+	internal class UpdatedPackagesInProject

 	{

 		List<IPackageName> packages;

 

@@ -82,6 +82,13 @@ namespace MonoDevelop.PackageManagement
 					packages.Remove (package);

 				}

 			}

+

+			RemoveUninstalledPackages (packageReferences);

+		}

+

+		void RemoveUninstalledPackages (IEnumerable<PackageReference> packageReferences)

+		{

+			packages.RemoveAll (package => !packageReferences.Any (packageReference => packageReference.Id == package.Id));

 		}

 	}

 }

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInSolution.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInSolution.cs
index 774271fab0..6ff41bc7dc 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInSolution.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesInSolution.cs
@@ -28,14 +28,14 @@ using System;
 using System.Collections.Generic;

 using System.IO;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class UpdatedPackagesInSolution : IUpdatedPackagesInSolution

+	internal class UpdatedPackagesInSolution : IUpdatedPackagesInSolution

 	{

 		IPackageManagementSolution solution;

 		IRegisteredPackageRepositories registeredPackageRepositories;

@@ -132,9 +132,9 @@ namespace MonoDevelop.PackageManagement
 			});

 		}

 

-		public void CheckForUpdatesCompleted (CheckForUpdatesTask task)

+		public void CheckForUpdatesCompleted (IEnumerable<UpdatedPackagesInProject> projects)

 		{

-			projectsWithUpdatedPackages = task.ProjectsWithUpdatedPackages.ToList ();

+			projectsWithUpdatedPackages = projects.ToList ();

 

 			RemovePackagesUpdatedDuringCheckForUpdates ();

 

@@ -172,14 +172,50 @@ namespace MonoDevelop.PackageManagement
 			LogCheckingForUpdates (project.Name);

 

 			project.Logger = new PackageManagementLogger (packageManagementEvents);

-			var updatedPackages = new UpdatedPackages (project, project.SourceRepository);

-			List<IPackage> packages = updatedPackages.GetUpdatedPackages ().ToList ();

+

+			var packageReferences = project.GetPackageReferences ();

+

+			List<IPackage> packages = GetUpdatedStablePackages (project, packageReferences).ToList ();

+			packages.AddRange (GetUpdatedPrereleasePackages (project, packageReferences));

 

 			LogPackagesFound (packages.Count);

 

 			return new UpdatedPackagesInProject (project.Project, packages);

 		}

 

+		IEnumerable<IPackage> GetUpdatedStablePackages (

+			IPackageManagementProject project,

+			IEnumerable<PackageReference> packageReferences)

+		{

+			return GetUpdatedPackages (project, packageReferences, false, packageRef => packageRef.IsReleaseVersion ());

+		}

+

+		IEnumerable<IPackage> GetUpdatedPrereleasePackages (

+			IPackageManagementProject project,

+			IEnumerable<PackageReference> packageReferences)

+		{

+			return GetUpdatedPackages (project, packageReferences, true, packageRef => !packageRef.IsReleaseVersion ());

+		}

+

+		IEnumerable<IPackage> GetUpdatedPackages (

+			IPackageManagementProject project,

+			IEnumerable<PackageReference> packageReferences,

+			bool includePrerelease,

+			Func<PackageReference, bool> filter)

+		{

+			var filteredPackageReferences = packageReferences.Where (filter).ToList ();

+

+			if (!filteredPackageReferences.Any ())

+				return Enumerable.Empty <IPackage> ();

+

+			var updatedPackages = new UpdatedPackages (

+				filteredPackageReferences,

+				project.SourceRepository,

+				project.ConstraintProvider);

+

+			return updatedPackages.GetUpdatedPackages (includePrerelease);

+		}

+

 		void LogCheckingForUpdates (string projectName)

 		{

 			Log (GettextCatalog.GetString ("Checking {0} for updates...", projectName));

@@ -217,9 +253,9 @@ namespace MonoDevelop.PackageManagement
 			});

 		}

 

-		protected virtual void GuiDispatch (MessageHandler handler)

+		protected virtual void GuiDispatch (Action action)

 		{

-			DispatchService.GuiSyncDispatch (handler);

+			Runtime.RunInMainThread (action).Wait ();

 		}

 

 		T GuiSyncDispatch<T> (Func<T> action)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesMonitor.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesMonitor.cs
index 7e2edcbc6c..ff4b92691b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesMonitor.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesMonitor.cs
@@ -27,12 +27,12 @@
 using System;

 using System.Collections.Generic;

 using System.Linq;

-using ICSharpCode.PackageManagement;

+using MonoDevelop.PackageManagement;

 using NuGet;

 

 namespace MonoDevelop.PackageManagement

 {

-	public class UpdatedPackagesMonitor : IDisposable

+	internal class UpdatedPackagesMonitor : IDisposable

 	{

 		List<IPackageManagementProject> projects;

 		bool packagesUpdated;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesViewModel.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesViewModel.cs
index e268abcbf4..a808374cb3 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesViewModel.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UpdatedPackagesViewModel.cs
@@ -32,9 +32,9 @@ using System.Linq;
 

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UpdatedPackagesViewModel : PackagesViewModel

+	internal class UpdatedPackagesViewModel : PackagesViewModel

 	{

 		PackageManagementSelectedProjects selectedProjects;

 		UpdatedPackages updatedPackages;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UserAgentGeneratorForRepositoryRequests.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UserAgentGeneratorForRepositoryRequests.cs
index 8d878cab00..74490b9c25 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UserAgentGeneratorForRepositoryRequests.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/UserAgentGeneratorForRepositoryRequests.cs
@@ -29,9 +29,9 @@
 using System;

 using NuGet;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public class UserAgentGeneratorForRepositoryRequests

+	internal class UserAgentGeneratorForRepositoryRequests

 	{

 		MonoDevelopHttpUserAgent userAgent = new MonoDevelopHttpUserAgent();

 

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ViewModelBase.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ViewModelBase.cs
index c2f2798e9d..b52b29a0c9 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ViewModelBase.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ViewModelBase.cs
@@ -30,9 +30,9 @@ using System;
 using System.ComponentModel;

 using System.Linq.Expressions;

 

-namespace ICSharpCode.PackageManagement

+namespace MonoDevelop.PackageManagement

 {

-	public abstract class ViewModelBase<TModel> : INotifyPropertyChanged

+	internal abstract class ViewModelBase<TModel> : INotifyPropertyChanged

 	{

 		public event PropertyChangedEventHandler PropertyChanged;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/WildcardVersionSpec.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/WildcardVersionSpec.cs
index 6633e6ee45..f3d61c2575 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/WildcardVersionSpec.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/WildcardVersionSpec.cs
@@ -38,7 +38,7 @@ namespace MonoDevelop.PackageManagement
 	/// 1.2.3 => 1.2.3.*

 	/// 1.2.3.4 => 1.2.3.4

 	/// </summary>

-	public class WildcardVersionSpec

+	internal class WildcardVersionSpec

 	{

 		string[] parts;

 		int wildcardPart = -1;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.HyperlinkWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.HyperlinkWidget.cs
index 32cdd17bb4..c5680531eb 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.HyperlinkWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.HyperlinkWidget.cs
@@ -2,7 +2,7 @@
 // This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.PackageManagement

 {

-	public partial class HyperlinkWidget

+	internal partial class HyperlinkWidget

 	{

 		protected virtual void Build ()

 		{

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.LicenseAcceptanceDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.LicenseAcceptanceDialog.cs
index 2d21dc3734..3ed3189826 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.LicenseAcceptanceDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.LicenseAcceptanceDialog.cs
@@ -2,17 +2,28 @@
 // This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.PackageManagement

 {

-	public partial class LicenseAcceptanceDialog

+	internal partial class LicenseAcceptanceDialog

 	{

+		private global::Gtk.VBox topVBox;

+		

 		private global::Gtk.HBox subTitleHBoxForSinglePackage;

+		

 		private global::Gtk.Label subTitleLabelForSinglePackage;

+		

 		private global::Gtk.HBox subTitleHBoxForMultiplePackages;

+		

 		private global::Gtk.Label subTitleLabelForMultiplePackages;

+		

 		private global::Gtk.ScrolledWindow GtkScrolledWindow;

+		

 		private global::Gtk.VBox packagesVBox;

+		

 		private global::Gtk.HBox bottomMessageHBox;

+		

 		private global::Gtk.Label mainMessageLabel;

+		

 		private global::Gtk.Button buttonCancel;

+		

 		private global::Gtk.Button buttonOk;

 

 		protected virtual void Build ()

@@ -20,7 +31,7 @@ namespace MonoDevelop.PackageManagement
 			global::Stetic.Gui.Initialize (this);

 			// Widget MonoDevelop.PackageManagement.LicenseAcceptanceDialog

 			this.Name = "MonoDevelop.PackageManagement.LicenseAcceptanceDialog";

-			this.Title = global::Mono.Unix.Catalog.GetString ("License Agreements");

+			this.Title = global::Mono.Unix.Catalog.GetString ("License Acceptance");

 			this.WindowPosition = ((global::Gtk.WindowPosition)(1));

 			this.Modal = true;

 			// Internal child MonoDevelop.PackageManagement.LicenseAcceptanceDialog.VBox

@@ -28,42 +39,49 @@ namespace MonoDevelop.PackageManagement
 			w1.Name = "mainVBox";

 			w1.BorderWidth = ((uint)(2));

 			// Container child mainVBox.Gtk.Box+BoxChild

+			this.topVBox = new global::Gtk.VBox ();

+			this.topVBox.Name = "topVBox";

+			this.topVBox.Spacing = 6;

+			this.topVBox.BorderWidth = ((uint)(10));

+			// Container child topVBox.Gtk.Box+BoxChild

 			this.subTitleHBoxForSinglePackage = new global::Gtk.HBox ();

 			this.subTitleHBoxForSinglePackage.Name = "subTitleHBoxForSinglePackage";

 			this.subTitleHBoxForSinglePackage.Spacing = 6;

 			// Container child subTitleHBoxForSinglePackage.Gtk.Box+BoxChild

 			this.subTitleLabelForSinglePackage = new global::Gtk.Label ();

 			this.subTitleLabelForSinglePackage.Name = "subTitleLabelForSinglePackage";

-			this.subTitleLabelForSinglePackage.LabelProp = global::Mono.Unix.Catalog.GetString ("The following package requires a click-to-accept license:");

+			this.subTitleLabelForSinglePackage.LabelProp = global::Mono.Unix.Catalog.GetString ("The following package requires that you accept the license terms before installin" +

+			"g.");

 			this.subTitleHBoxForSinglePackage.Add (this.subTitleLabelForSinglePackage);

 			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.subTitleHBoxForSinglePackage [this.subTitleLabelForSinglePackage]));

 			w2.Position = 0;

 			w2.Expand = false;

 			w2.Fill = false;

-			w1.Add (this.subTitleHBoxForSinglePackage);

-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(w1 [this.subTitleHBoxForSinglePackage]));

+			this.topVBox.Add (this.subTitleHBoxForSinglePackage);

+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.topVBox [this.subTitleHBoxForSinglePackage]));

 			w3.Position = 0;

 			w3.Expand = false;

 			w3.Fill = false;

-			// Container child mainVBox.Gtk.Box+BoxChild

+			// Container child topVBox.Gtk.Box+BoxChild

 			this.subTitleHBoxForMultiplePackages = new global::Gtk.HBox ();

 			this.subTitleHBoxForMultiplePackages.Name = "subTitleHBoxForMultiplePackages";

 			this.subTitleHBoxForMultiplePackages.Spacing = 6;

 			// Container child subTitleHBoxForMultiplePackages.Gtk.Box+BoxChild

 			this.subTitleLabelForMultiplePackages = new global::Gtk.Label ();

 			this.subTitleLabelForMultiplePackages.Name = "subTitleLabelForMultiplePackages";

-			this.subTitleLabelForMultiplePackages.LabelProp = global::Mono.Unix.Catalog.GetString ("The following packages require a click-to-accept license:");

+			this.subTitleLabelForMultiplePackages.LabelProp = global::Mono.Unix.Catalog.GetString ("The following packages require that you accept their license terms before install" +

+			"ing.");

 			this.subTitleHBoxForMultiplePackages.Add (this.subTitleLabelForMultiplePackages);

 			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.subTitleHBoxForMultiplePackages [this.subTitleLabelForMultiplePackages]));

 			w4.Position = 0;

 			w4.Expand = false;

 			w4.Fill = false;

-			w1.Add (this.subTitleHBoxForMultiplePackages);

-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1 [this.subTitleHBoxForMultiplePackages]));

+			this.topVBox.Add (this.subTitleHBoxForMultiplePackages);

+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.topVBox [this.subTitleHBoxForMultiplePackages]));

 			w5.Position = 1;

 			w5.Expand = false;

 			w5.Fill = false;

-			// Container child mainVBox.Gtk.Box+BoxChild

+			// Container child topVBox.Gtk.Box+BoxChild

 			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();

 			this.GtkScrolledWindow.Name = "GtkScrolledWindow";

 			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));

@@ -76,65 +94,65 @@ namespace MonoDevelop.PackageManagement
 			this.packagesVBox.Spacing = 6;

 			w6.Add (this.packagesVBox);

 			this.GtkScrolledWindow.Add (w6);

-			w1.Add (this.GtkScrolledWindow);

-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1 [this.GtkScrolledWindow]));

+			this.topVBox.Add (this.GtkScrolledWindow);

+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.topVBox [this.GtkScrolledWindow]));

 			w9.Position = 2;

-			w9.Padding = ((uint)(3));

-			// Container child mainVBox.Gtk.Box+BoxChild

+			// Container child topVBox.Gtk.Box+BoxChild

 			this.bottomMessageHBox = new global::Gtk.HBox ();

 			this.bottomMessageHBox.Name = "bottomMessageHBox";

 			this.bottomMessageHBox.Spacing = 6;

 			// Container child bottomMessageHBox.Gtk.Box+BoxChild

 			this.mainMessageLabel = new global::Gtk.Label ();

 			this.mainMessageLabel.Name = "mainMessageLabel";

-			this.mainMessageLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("By clicking \"OK\" you agree to the license terms for the packages listed above.\nIf" +

-			" you do not agree to the license terms click \"Cancel\".");

+			this.mainMessageLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("By clicking Accept you agree to the license terms for the packages listed above.\n" +

+			"If you do not agree to the license terms click Decline.");

 			this.bottomMessageHBox.Add (this.mainMessageLabel);

 			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.bottomMessageHBox [this.mainMessageLabel]));

 			w10.Position = 0;

 			w10.Expand = false;

 			w10.Fill = false;

-			w1.Add (this.bottomMessageHBox);

-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(w1 [this.bottomMessageHBox]));

+			this.topVBox.Add (this.bottomMessageHBox);

+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.topVBox [this.bottomMessageHBox]));

 			w11.Position = 3;

 			w11.Expand = false;

 			w11.Fill = false;

+			w1.Add (this.topVBox);

+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1 [this.topVBox]));

+			w12.Position = 0;

 			// Internal child MonoDevelop.PackageManagement.LicenseAcceptanceDialog.ActionArea

-			global::Gtk.HButtonBox w12 = this.ActionArea;

-			w12.Name = "mainButtonArea";

-			w12.Spacing = 10;

-			w12.BorderWidth = ((uint)(5));

-			w12.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));

+			global::Gtk.HButtonBox w13 = this.ActionArea;

+			w13.Name = "mainButtonArea";

+			w13.Spacing = 10;

+			w13.BorderWidth = ((uint)(5));

+			w13.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));

 			// Container child mainButtonArea.Gtk.ButtonBox+ButtonBoxChild

 			this.buttonCancel = new global::Gtk.Button ();

 			this.buttonCancel.CanDefault = true;

 			this.buttonCancel.CanFocus = true;

 			this.buttonCancel.Name = "buttonCancel";

-			this.buttonCancel.UseStock = true;

 			this.buttonCancel.UseUnderline = true;

-			this.buttonCancel.Label = "gtk-cancel";

+			this.buttonCancel.Label = global::Mono.Unix.Catalog.GetString ("_Decline");

 			this.AddActionWidget (this.buttonCancel, -6);

-			global::Gtk.ButtonBox.ButtonBoxChild w13 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonCancel]));

-			w13.Expand = false;

-			w13.Fill = false;

+			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13 [this.buttonCancel]));

+			w14.Expand = false;

+			w14.Fill = false;

 			// Container child mainButtonArea.Gtk.ButtonBox+ButtonBoxChild

 			this.buttonOk = new global::Gtk.Button ();

 			this.buttonOk.CanDefault = true;

 			this.buttonOk.CanFocus = true;

 			this.buttonOk.Name = "buttonOk";

-			this.buttonOk.UseStock = true;

 			this.buttonOk.UseUnderline = true;

-			this.buttonOk.Label = "gtk-ok";

+			this.buttonOk.Label = global::Mono.Unix.Catalog.GetString ("_Accept");

 			this.AddActionWidget (this.buttonOk, -5);

-			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonOk]));

-			w14.Position = 1;

-			w14.Expand = false;

-			w14.Fill = false;

+			global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13 [this.buttonOk]));

+			w15.Position = 1;

+			w15.Expand = false;

+			w15.Fill = false;

 			if ((this.Child != null)) {

 				this.Child.ShowAll ();

 			}

-			this.DefaultWidth = 447;

-			this.DefaultHeight = 300;

+			this.DefaultWidth = 494;

+			this.DefaultHeight = 365;

 			this.Show ();

 		}

 	}

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.ManagePackagesDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.ManagePackagesDialog.cs
index ba8f311f1b..828e0600a0 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.ManagePackagesDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.ManagePackagesDialog.cs
@@ -2,7 +2,7 @@
 // This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.PackageManagement

 {

-	public partial class ManagePackagesDialog

+	internal partial class ManagePackagesDialog

 	{

 		private global::Gtk.Notebook notebook;

 		private global::MonoDevelop.PackageManagement.PackagesWidget availablePackagesWidget;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageLicenseWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageLicenseWidget.cs
index a320196190..eff892805d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageLicenseWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageLicenseWidget.cs
@@ -2,7 +2,7 @@
 // This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.PackageManagement

 {

-	public partial class PackageLicenseWidget

+	internal partial class PackageLicenseWidget

 	{

 		private global::Gtk.HBox mainHBox;

 		private global::Gtk.VBox packageIdVBox;

@@ -46,7 +46,10 @@ namespace MonoDevelop.PackageManagement
 			w2.Expand = false;

 			w2.Fill = false;

 			// Container child packageIdVBox.Gtk.Box+BoxChild

-			this.licenseHyperlinkWidget = null;

+			this.licenseHyperlinkWidget = new global::MonoDevelop.PackageManagement.HyperlinkWidget ();

+			this.licenseHyperlinkWidget.Events = ((global::Gdk.EventMask)(256));

+			this.licenseHyperlinkWidget.Name = "licenseHyperlinkWidget";

+			this.licenseHyperlinkWidget.Label = global::Mono.Unix.Catalog.GetString ("View License");

 			this.packageIdVBox.Add (this.licenseHyperlinkWidget);

 			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.packageIdVBox [this.licenseHyperlinkWidget]));

 			w3.Position = 1;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageManagementOptionsWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageManagementOptionsWidget.cs
index c43e0f9c0d..cb5c9dafd5 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageManagementOptionsWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageManagementOptionsWidget.cs
@@ -2,7 +2,7 @@
 // This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.PackageManagement

 {

-	public partial class PackageManagementOptionsWidget

+	internal partial class PackageManagementOptionsWidget

 	{

 		private global::Gtk.VBox mainVBox;

 		

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageSourcesWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageSourcesWidget.cs
index 9359f33175..2bfbf2394b 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageSourcesWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackageSourcesWidget.cs
@@ -2,7 +2,7 @@
 // This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.PackageManagement

 {

-	public partial class PackageSourcesWidget

+	internal partial class PackageSourcesWidget

 	{

 		private global::Gtk.VBox mainVBox;

 		private global::Gtk.HBox packageSourceListHBox;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackagesWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackagesWidget.cs
index c2142af5cd..4401840b74 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackagesWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackagesWidget.cs
@@ -2,58 +2,110 @@
 // This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.PackageManagement

 {

-	public partial class PackagesWidget

+	internal partial class PackagesWidget

 	{

 		private global::Gtk.HPaned mainPane;

+		

 		private global::Gtk.VBox packagesListVBox;

+		

 		private global::Gtk.ScrolledWindow packagesTreeScrolledWindow;

+		

 		private global::Gtk.TreeView packagesTreeView;

+		

 		private global::Gtk.HBox pagedResultsHBox;

+		

 		private global::Gtk.Label pagedResultsLeftLabel;

+		

 		private global::MonoDevelop.PackageManagement.PagedResultsWidget pagedResultsWidget;

+		

 		private global::Gtk.Label pagedResultsRightLabel;

+		

 		private global::Gtk.VBox packageInfoVBox;

+		

 		private global::Gtk.ComboBox packageSourceComboBox;

+		

 		private global::Gtk.HBox packageSearchHBox;

+		

 		private global::Gtk.Entry packageSearchEntry;

+		

 		private global::Gtk.Button packageSearchButton;

+		

+		private global::MonoDevelop.Components.ImageView imageSearch;

+		

 		private global::Gtk.CheckButton includePrereleaseCheckButton;

+		

 		private global::Gtk.HButtonBox updateAllPackagesButtonBox;

+		

 		private global::Gtk.Button updateAllPackagesButton;

+		

 		private global::Gtk.Frame packageInfoFrame;

+		

 		private global::Gtk.Alignment packageInfoFrameAlignment;

+		

 		private global::Gtk.ScrolledWindow GtkScrolledWindow;

+		

 		private global::Gtk.VBox packageInfoFrameVBox;

+		

 		private global::Gtk.HBox packageCreatedByHBox;

+		

 		private global::Gtk.Label packageCreatedByLabel;

+		

 		private global::Gtk.Label packageCreatedByTextBox;

+		

 		private global::Gtk.HBox packageIdHBox;

+		

 		private global::Gtk.Label packageIdLabel;

+		

 		private global::MonoDevelop.PackageManagement.HyperlinkWidget packageIdButton;

+		

 		private global::Gtk.Label packageIdTextBox;

+		

 		private global::Gtk.HBox packageVersionHBox;

+		

 		private global::Gtk.Label packageVersionLabel;

+		

 		private global::Gtk.Label packageVersionTextBox;

+		

 		private global::Gtk.HBox packageLastUpdatedHBox;

+		

 		private global::Gtk.Label packageLastUpdatedLabel;

+		

 		private global::Gtk.Label packageLastUpdatedTextBox;

+		

 		private global::Gtk.HBox packageDownloadsHBox;

+		

 		private global::Gtk.Label packageDownloadsLabel;

+		

 		private global::Gtk.Label packageDownloadsTextBox;

+		

 		private global::Gtk.HBox viewLicenseTermsHBox;

+		

 		private global::MonoDevelop.PackageManagement.HyperlinkWidget viewLicenseTermsButton;

+		

 		private global::Gtk.HBox moreInformationHBox;

+		

 		private global::MonoDevelop.PackageManagement.HyperlinkWidget moreInformationButton;

+		

 		private global::Gtk.TextView packageDescriptionTextView;

+		

 		private global::Gtk.HBox packageDependenciesHBox;

+		

 		private global::Gtk.Label packageDependenciesLabel;

+		

 		private global::Gtk.Label packageDependenciesNoneLabel;

+		

 		private global::Gtk.HBox packageDependenciesListHBox;

+		

 		private global::Gtk.Label packageDependenciesListLabel;

+		

 		private global::Gtk.Label packageDependenciesListFillerLabel;

+		

 		private global::Gtk.HButtonBox managePackageButtonBox;

+		

 		private global::Gtk.Button addPackageButton;

+		

 		private global::Gtk.Button removePackageButton;

+		

 		private global::Gtk.Button managePackageButton;

 

 		protected virtual void Build ()

@@ -145,10 +197,12 @@ namespace MonoDevelop.PackageManagement
 			this.packageSearchButton = new global::Gtk.Button ();

 			this.packageSearchButton.CanFocus = true;

 			this.packageSearchButton.Name = "packageSearchButton";

-			this.packageSearchButton.UseUnderline = true;

-			global::Gtk.Image w10 = new global::Gtk.Image ();

-			w10.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-find", global::Gtk.IconSize.Menu);

-			this.packageSearchButton.Image = w10;

+			// Container child packageSearchButton.Gtk.Container+ContainerChild

+			this.imageSearch = new global::MonoDevelop.Components.ImageView ();

+			this.imageSearch.Name = "imageSearch";

+			this.imageSearch.IconId = "gtk-find";

+			this.imageSearch.IconSize = ((global::Gtk.IconSize)(1));

+			this.packageSearchButton.Add (this.imageSearch);

 			this.packageSearchHBox.Add (this.packageSearchButton);

 			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.packageSearchHBox [this.packageSearchButton]));

 			w11.Position = 1;

@@ -216,7 +270,7 @@ namespace MonoDevelop.PackageManagement
 			// Container child packageCreatedByHBox.Gtk.Box+BoxChild

 			this.packageCreatedByLabel = new global::Gtk.Label ();

 			this.packageCreatedByLabel.Name = "packageCreatedByLabel";

-			this.packageCreatedByLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Created by:</span>");

+			this.packageCreatedByLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Created by:</span>");

 			this.packageCreatedByLabel.UseMarkup = true;

 			this.packageCreatedByHBox.Add (this.packageCreatedByLabel);

 			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.packageCreatedByHBox [this.packageCreatedByLabel]));

@@ -244,7 +298,7 @@ namespace MonoDevelop.PackageManagement
 			// Container child packageIdHBox.Gtk.Box+BoxChild

 			this.packageIdLabel = new global::Gtk.Label ();

 			this.packageIdLabel.Name = "packageIdLabel";

-			this.packageIdLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Id:</span>");

+			this.packageIdLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Id:</span>");

 			this.packageIdLabel.UseMarkup = true;

 			this.packageIdHBox.Add (this.packageIdLabel);

 			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.packageIdHBox [this.packageIdLabel]));

@@ -277,7 +331,7 @@ namespace MonoDevelop.PackageManagement
 			// Container child packageVersionHBox.Gtk.Box+BoxChild

 			this.packageVersionLabel = new global::Gtk.Label ();

 			this.packageVersionLabel.Name = "packageVersionLabel";

-			this.packageVersionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Version:</span>");

+			this.packageVersionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Version:</span>");

 			this.packageVersionLabel.UseMarkup = true;

 			this.packageVersionHBox.Add (this.packageVersionLabel);

 			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.packageVersionHBox [this.packageVersionLabel]));

@@ -305,7 +359,7 @@ namespace MonoDevelop.PackageManagement
 			// Container child packageLastUpdatedHBox.Gtk.Box+BoxChild

 			this.packageLastUpdatedLabel = new global::Gtk.Label ();

 			this.packageLastUpdatedLabel.Name = "packageLastUpdatedLabel";

-			this.packageLastUpdatedLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Last Updated:</span>");

+			this.packageLastUpdatedLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Last Updated:</span>");

 			this.packageLastUpdatedLabel.UseMarkup = true;

 			this.packageLastUpdatedHBox.Add (this.packageLastUpdatedLabel);

 			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.packageLastUpdatedHBox [this.packageLastUpdatedLabel]));

@@ -333,7 +387,7 @@ namespace MonoDevelop.PackageManagement
 			// Container child packageDownloadsHBox.Gtk.Box+BoxChild

 			this.packageDownloadsLabel = new global::Gtk.Label ();

 			this.packageDownloadsLabel.Name = "packageDownloadsLabel";

-			this.packageDownloadsLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Downloads:</span>");

+			this.packageDownloadsLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Downloads:</span>");

 			this.packageDownloadsLabel.UseMarkup = true;

 			this.packageDownloadsHBox.Add (this.packageDownloadsLabel);

 			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.packageDownloadsHBox [this.packageDownloadsLabel]));

@@ -397,7 +451,7 @@ namespace MonoDevelop.PackageManagement
 			// Container child packageDependenciesHBox.Gtk.Box+BoxChild

 			this.packageDependenciesLabel = new global::Gtk.Label ();

 			this.packageDependenciesLabel.Name = "packageDependenciesLabel";

-			this.packageDependenciesLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Dependencies:</span>");

+			this.packageDependenciesLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Dependencies:</span>");

 			this.packageDependenciesLabel.UseMarkup = true;

 			this.packageDependenciesHBox.Add (this.packageDependenciesLabel);

 			global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.packageDependenciesHBox [this.packageDependenciesLabel]));

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PagedResultsWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PagedResultsWidget.cs
index 6b92bee148..620fb8dba1 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PagedResultsWidget.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PagedResultsWidget.cs
@@ -2,16 +2,27 @@
 // This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.PackageManagement

 {

-	public partial class PagedResultsWidget

+	internal partial class PagedResultsWidget

 	{

 		private global::Gtk.HBox mainHBox;

+		

 		private global::Gtk.Button backButton;

+		

+		private global::MonoDevelop.Components.ImageView imageBack;

+		

 		private global::Gtk.Button firstButton;

+		

 		private global::Gtk.Button secondButton;

+		

 		private global::Gtk.Button thirdButton;

+		

 		private global::Gtk.Button fourthButton;

+		

 		private global::Gtk.Button fifthButton;

+		

 		private global::Gtk.Button forwardButton;

+		

+		private global::MonoDevelop.Components.ImageView imageForward;

 

 		protected virtual void Build ()

 		{

@@ -28,9 +39,12 @@ namespace MonoDevelop.PackageManagement
 			this.backButton.Name = "backButton";

 			this.backButton.FocusOnClick = false;

 			this.backButton.Relief = ((global::Gtk.ReliefStyle)(2));

-			global::Gtk.Image w1 = new global::Gtk.Image ();

-			w1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-back", global::Gtk.IconSize.Menu);

-			this.backButton.Image = w1;

+			// Container child backButton.Gtk.Container+ContainerChild

+			this.imageBack = new global::MonoDevelop.Components.ImageView ();

+			this.imageBack.Name = "imageBack";

+			this.imageBack.IconId = "gtk-go-back";

+			this.imageBack.IconSize = ((global::Gtk.IconSize)(1));

+			this.backButton.Add (this.imageBack);

 			this.mainHBox.Add (this.backButton);

 			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.mainHBox [this.backButton]));

 			w2.Position = 0;

@@ -103,9 +117,12 @@ namespace MonoDevelop.PackageManagement
 			this.forwardButton.Name = "forwardButton";

 			this.forwardButton.FocusOnClick = false;

 			this.forwardButton.Relief = ((global::Gtk.ReliefStyle)(2));

-			global::Gtk.Image w8 = new global::Gtk.Image ();

-			w8.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-forward", global::Gtk.IconSize.Menu);

-			this.forwardButton.Image = w8;

+			// Container child forwardButton.Gtk.Container+ContainerChild

+			this.imageForward = new global::MonoDevelop.Components.ImageView ();

+			this.imageForward.Name = "imageForward";

+			this.imageForward.IconId = "gtk-go-forward";

+			this.imageForward.IconSize = ((global::Gtk.IconSize)(1));

+			this.forwardButton.Add (this.imageForward);

 			this.mainHBox.Add (this.forwardButton);

 			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.mainHBox [this.forwardButton]));

 			w9.Position = 6;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.SelectProjectsDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.SelectProjectsDialog.cs
index 9b20ebd3ce..65295f4e5e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.SelectProjectsDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.SelectProjectsDialog.cs
@@ -2,7 +2,7 @@
 // This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.PackageManagement

 {

-	public partial class SelectProjectsDialog

+	internal partial class SelectProjectsDialog

 	{

 		private global::Gtk.HBox installLabelHBox;

 		private global::Gtk.Label installLabel;

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/generated.cs
index df4abc38da..97249fd82d 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/generated.cs
@@ -68,44 +68,6 @@ namespace Stetic
 		}

 	}

 

-	internal class IconLoader

-	{

-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)

-		{

-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);

-			if ((res != null)) {

-				return res;

-			} else {

-				int sz;

-				int sy;

-				global::Gtk.Icon.SizeLookup (size, out sz, out sy);

-				try {

-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);

-				} catch (System.Exception) {

-					if ((name != "gtk-missing-image")) {

-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);

-					} else {

-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);

-						Gdk.GC gc = new Gdk.GC (pmap);

-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);

-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);

-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);

-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));

-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);

-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);

-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1)

-						- (sz / 4)), ((sz - 1)

-						- (sz / 4)));

-						pmap.DrawLine (gc, ((sz - 1)

-						- (sz / 4)), (sz / 4), (sz / 4), ((sz - 1)

-						- (sz / 4)));

-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);

-					}

-				}

-			}

-		}

-	}

-

 	internal class ActionGroups

 	{

 		public static Gtk.ActionGroup GetActionGroup (System.Type type)

diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/gui.stetic
index f92e7e0b54..9a7a6284dc 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/gui.stetic
@@ -284,11 +284,15 @@
                   <widget class="Gtk.Button" id="packageSearchButton">
                     <property name="MemberName" />
                     <property name="CanFocus">True</property>
-                    <property name="Type">TextAndIcon</property>
-                    <property name="Icon">stock:gtk-find Menu</property>
-                    <property name="Label" translatable="yes" />
-                    <property name="UseUnderline">True</property>
+                    <property name="Type">Custom</property>
                     <signal name="Clicked" handler="SearchButtonClicked" />
+                    <child>
+                      <widget class="MonoDevelop.Components.ImageView" id="imageSearch">
+                        <property name="MemberName" />
+                        <property name="IconId">gtk-find</property>
+                        <property name="IconSize">Menu</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                     <property name="Position">1</property>
@@ -787,9 +791,9 @@
       <placeholder />
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.PackageManagement.LicenseAcceptanceDialog" design-size="447 300">
+  <widget class="Gtk.Dialog" id="MonoDevelop.PackageManagement.LicenseAcceptanceDialog" design-size="494 365">
     <property name="MemberName" />
-    <property name="Title" translatable="yes">License Agreements</property>
+    <property name="Title" translatable="yes">License Acceptance</property>
     <property name="WindowPosition">Center</property>
     <property name="Modal">True</property>
     <property name="Buttons">2</property>
@@ -799,13 +803,29 @@
         <property name="MemberName" />
         <property name="BorderWidth">2</property>
         <child>
-          <widget class="Gtk.HBox" id="subTitleHBoxForSinglePackage">
+          <widget class="Gtk.VBox" id="topVBox">
             <property name="MemberName" />
             <property name="Spacing">6</property>
+            <property name="BorderWidth">10</property>
             <child>
-              <widget class="Gtk.Label" id="subTitleLabelForSinglePackage">
+              <widget class="Gtk.HBox" id="subTitleHBoxForSinglePackage">
                 <property name="MemberName" />
-                <property name="LabelProp" translatable="yes">The following package requires a click-to-accept license:</property>
+                <property name="Spacing">6</property>
+                <child>
+                  <widget class="Gtk.Label" id="subTitleLabelForSinglePackage">
+                    <property name="MemberName" />
+                    <property name="LabelProp" translatable="yes">The following package requires that you accept the license terms before installing.</property>
+                  </widget>
+                  <packing>
+                    <property name="Position">0</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder />
+                </child>
               </widget>
               <packing>
                 <property name="Position">0</property>
@@ -815,96 +835,90 @@
               </packing>
             </child>
             <child>
-              <placeholder />
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.HBox" id="subTitleHBoxForMultiplePackages">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <child>
-              <widget class="Gtk.Label" id="subTitleLabelForMultiplePackages">
+              <widget class="Gtk.HBox" id="subTitleHBoxForMultiplePackages">
                 <property name="MemberName" />
-                <property name="LabelProp" translatable="yes">The following packages require a click-to-accept license:</property>
+                <property name="Spacing">6</property>
+                <child>
+                  <widget class="Gtk.Label" id="subTitleLabelForMultiplePackages">
+                    <property name="MemberName" />
+                    <property name="LabelProp" translatable="yes">The following packages require that you accept their license terms before installing.</property>
+                  </widget>
+                  <packing>
+                    <property name="Position">0</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder />
+                </child>
               </widget>
               <packing>
-                <property name="Position">0</property>
+                <property name="Position">1</property>
                 <property name="AutoSize">True</property>
                 <property name="Expand">False</property>
                 <property name="Fill">False</property>
               </packing>
             </child>
             <child>
-              <placeholder />
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
-            <property name="MemberName" />
-            <property name="ShadowType">In</property>
-            <child>
-              <widget class="Gtk.Viewport" id="GtkViewport">
+              <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
                 <property name="MemberName" />
-                <property name="ShadowType">None</property>
+                <property name="ShadowType">In</property>
                 <child>
-                  <widget class="Gtk.VBox" id="packagesVBox">
+                  <widget class="Gtk.Viewport" id="GtkViewport">
                     <property name="MemberName" />
-                    <property name="ShowScrollbars">True</property>
-                    <property name="Spacing">6</property>
+                    <property name="ShadowType">None</property>
                     <child>
-                      <placeholder />
+                      <widget class="Gtk.VBox" id="packagesVBox">
+                        <property name="MemberName" />
+                        <property name="ShowScrollbars">True</property>
+                        <property name="Spacing">6</property>
+                        <child>
+                          <placeholder />
+                        </child>
+                      </widget>
                     </child>
                   </widget>
                 </child>
               </widget>
+              <packing>
+                <property name="Position">2</property>
+                <property name="AutoSize">True</property>
+              </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="Position">2</property>
-            <property name="AutoSize">True</property>
-            <property name="Padding">3</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.HBox" id="bottomMessageHBox">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
             <child>
-              <widget class="Gtk.Label" id="mainMessageLabel">
+              <widget class="Gtk.HBox" id="bottomMessageHBox">
                 <property name="MemberName" />
-                <property name="LabelProp" translatable="yes">By clicking "OK" you agree to the license terms for the packages listed above.
-If you do not agree to the license terms click "Cancel".</property>
+                <property name="Spacing">6</property>
+                <child>
+                  <widget class="Gtk.Label" id="mainMessageLabel">
+                    <property name="MemberName" />
+                    <property name="LabelProp" translatable="yes">By clicking Accept you agree to the license terms for the packages listed above.
+If you do not agree to the license terms click Decline.</property>
+                  </widget>
+                  <packing>
+                    <property name="Position">0</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder />
+                </child>
               </widget>
               <packing>
-                <property name="Position">0</property>
+                <property name="Position">3</property>
                 <property name="AutoSize">True</property>
                 <property name="Expand">False</property>
                 <property name="Fill">False</property>
               </packing>
             </child>
-            <child>
-              <placeholder />
-            </child>
           </widget>
           <packing>
-            <property name="Position">3</property>
+            <property name="Position">0</property>
             <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
           </packing>
         </child>
       </widget>
@@ -921,11 +935,10 @@ If you do not agree to the license terms click "Cancel".</property>
             <property name="MemberName" />
             <property name="CanDefault">True</property>
             <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-cancel</property>
+            <property name="Type">TextOnly</property>
+            <property name="Label" translatable="yes">_Decline</property>
+            <property name="UseUnderline">True</property>
             <property name="ResponseId">-6</property>
-            <property name="label">gtk-cancel</property>
           </widget>
           <packing>
             <property name="Expand">False</property>
@@ -937,11 +950,10 @@ If you do not agree to the license terms click "Cancel".</property>
             <property name="MemberName" />
             <property name="CanDefault">True</property>
             <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-ok</property>
+            <property name="Type">TextOnly</property>
+            <property name="Label" translatable="yes">_Accept</property>
+            <property name="UseUnderline">True</property>
             <property name="ResponseId">-5</property>
-            <property name="label">gtk-ok</property>
           </widget>
           <packing>
             <property name="Position">1</property>
@@ -1366,12 +1378,17 @@ If you do not agree to the license terms click "Cancel".</property>
           <widget class="Gtk.Button" id="backButton">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
-            <property name="Type">TextAndIcon</property>
-            <property name="Icon">stock:gtk-go-back Menu</property>
-            <property name="Label" translatable="yes" />
+            <property name="Type">Custom</property>
             <property name="FocusOnClick">False</property>
             <property name="Relief">None</property>
             <signal name="Clicked" handler="BackButtonClicked" />
+            <child>
+              <widget class="MonoDevelop.Components.ImageView" id="imageBack">
+                <property name="MemberName" />
+                <property name="IconId">gtk-go-back</property>
+                <property name="IconSize">Menu</property>
+              </widget>
+            </child>
           </widget>
           <packing>
             <property name="Position">0</property>
@@ -1470,12 +1487,17 @@ If you do not agree to the license terms click "Cancel".</property>
           <widget class="Gtk.Button" id="forwardButton">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
-            <property name="Type">TextAndIcon</property>
-            <property name="Icon">stock:gtk-go-forward Menu</property>
-            <property name="Label" translatable="yes" />
+            <property name="Type">Custom</property>
             <property name="FocusOnClick">False</property>
             <property name="Relief">None</property>
             <signal name="Clicked" handler="ForwardButtonClicked" />
+            <child>
+              <widget class="MonoDevelop.Components.ImageView" id="imageForward">
+                <property name="MemberName" />
+                <property name="IconId">gtk-go-forward</property>
+                <property name="IconSize">Menu</property>
+              </widget>
+            </child>
           </widget>
           <packing>
             <property name="Position">6</property>
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48.png
new file mode 100644
index 0000000000..6dbcbea034
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48@2x.png
new file mode 100644
index 0000000000..0484944163
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark.png
new file mode 100644
index 0000000000..2fb74b25c1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark@2x.png
new file mode 100644
index 0000000000..07520b847c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel.png
new file mode 100644
index 0000000000..7fec138598
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel@2x.png
new file mode 100644
index 0000000000..e134ffbf43
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel.png
new file mode 100644
index 0000000000..7fec138598
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel@2x.png
new file mode 100644
index 0000000000..e134ffbf43
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32.png
index 7e19f0f3b1..7aef0ee9bd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32.png
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32@2x.png
index 3894330a48..794f6171dd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32@2x.png
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark.png
new file mode 100644
index 0000000000..e94c8ac213
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark@2x.png
new file mode 100644
index 0000000000..152e07daf7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel.png
new file mode 100644
index 0000000000..28260cb4c2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel@2x.png
new file mode 100644
index 0000000000..f2110151b7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel.png
new file mode 100644
index 0000000000..28260cb4c2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel@2x.png
new file mode 100644
index 0000000000..f2110151b7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16.png
index b441192270..7db9d7157e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16.png
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16@2x.png
index a59c599aca..43064c4e34 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16@2x.png
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark.png
new file mode 100644
index 0000000000..eed666c26f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark@2x.png
new file mode 100644
index 0000000000..a09bb7df42
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel.png
new file mode 100644
index 0000000000..d61c5c8698
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel@2x.png
new file mode 100644
index 0000000000..638b4a730a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel.png
new file mode 100644
index 0000000000..d61c5c8698
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel@2x.png
new file mode 100644
index 0000000000..638b4a730a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16.png
index c01c3f5eb0..9850050463 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16.png
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16@2x.png
index 7e19f0f3b1..7aef0ee9bd 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16@2x.png
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark.png
new file mode 100644
index 0000000000..593d3a8b96
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark@2x.png
new file mode 100644
index 0000000000..501ead7b45
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel.png
new file mode 100644
index 0000000000..e3aee767a7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel@2x.png
new file mode 100644
index 0000000000..6b8d55dfed
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel.png
new file mode 100644
index 0000000000..e3aee767a7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel@2x.png
new file mode 100644
index 0000000000..6b8d55dfed
--- /dev/null
+++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48.png b/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48.png
deleted file mode 100644
index 7301fbb0fe..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48@2x.png
deleted file mode 100644
index e66a2f6dbc..0000000000
--- a/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.Refactoring/AddinInfo.cs b/main/src/addins/MonoDevelop.Refactoring/AddinInfo.cs
index 1dd2ad8160..7374e7dd61 100644
--- a/main/src/addins/MonoDevelop.Refactoring/AddinInfo.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/AddinInfo.cs
@@ -15,3 +15,5 @@ using Mono.Addins.Description;
 [assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("DesignerSupport", MonoDevelop.BuildInfo.Version)]
 [assembly:AddinDependency ("SourceEditor2", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("RegexToolkit", MonoDevelop.BuildInfo.Version)]
+ 
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/AssemblyInfo.cs b/main/src/addins/MonoDevelop.Refactoring/AssemblyInfo.cs
index c787015813..430de1984b 100644
--- a/main/src/addins/MonoDevelop.Refactoring/AssemblyInfo.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/AssemblyInfo.cs
@@ -7,3 +7,7 @@ using System.Reflection;
 [assembly: AssemblyDescription ("Provides refactoring support to MonoDevelop")]
 [assembly: AssemblyVersion ("2.6")]
 [assembly: AssemblyCopyright ("X11")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("FSharpBinding")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("MonoDevelop.CSharpBinding")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("MonoDevelop.PackageManagement")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("MonoDevelop.MonoDroid")]
diff --git a/main/src/addins/MonoDevelop.Refactoring/ChangeLog b/main/src/addins/MonoDevelop.Refactoring/ChangeLog
deleted file mode 100644
index 4ca6ea8bd6..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/ChangeLog
+++ /dev/null
@@ -1,1991 +0,0 @@
-2010-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/CodeGenerationCommands.cs: Use
-	  delegation methods.
-
-2010-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceFormatItem/IntroduceFormatItemRefactoring.cs:
-	  Track API changes.
-
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringService.cs: Track API
-	  changes.
-
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	  Remove empty line of the backing store.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs:
-	* MonoDevelop.CodeGeneration/PropertyGenerator.cs:
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationCommands.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementAbstractMembers.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RemoveUnusedImportsRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceFormatItem/IntroduceFormatItemRefactoring.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Track API changes.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationCommands.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementAbstractMembers.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RemoveUnusedImportsRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceFormatItem/IntroduceFormatItemRefactoring.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Use texteditordata infrastructure.
-
-2010-07-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceFormatItem/IntroduceFormatItemRefactoring.cs:
-	  Track API changes.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs: Track
-	  ProjectDomService/Parser API.
-
-2010-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: fixed
-	  cut&paste error.
-
-2010-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: Fixed 'Bug
-	  616653 - "import symbol" does not resolve full typenames'.
-
-2010-06-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	  Implemented 'Bug 615701 - Escape should cancel renaming
-	  refactor action, not accept it'.
-
-2010-06-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/EncapsulateFieldDialog.cs:
-	* MonoDevelop.Refactoring/OverridesImplementsDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementImplicit.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementExplicit.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Added help windows for refactorings that use the insertion
-	  point mode.
-
-2010-06-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring/OverridesImplementsDialog.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	  Track API.
-
-2010-06-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Improved parameter naming of created methods.
-
-2010-06-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  added null check.
-
-2010-06-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Create method now uses insertion cursor.
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  fixed null reference exception.
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.CodeGeneration/ToStringGenerator.cs:
-	* MonoDevelop.CodeGeneration/PropertyGenerator.cs:
-	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs:
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs:
-	* MonoDevelop.Refactoring/EncapsulateFieldDialog.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
-	* MonoDevelop.Refactoring/OverridesImplementsDialog.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/EqualityMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs:
-	* MonoDevelop.CodeGeneration/CreateConstructorGenerator.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementImplicit.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementExplicit.cs:
-	  Code generator get's now used by code completion auto
-	  generation & insert code feature.
-
-2010-06-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/EncapsulateFieldDialog.cs:
-	* MonoDevelop.Refactoring/OverridesImplementsDialog.cs: Worked
-	  on code generation.
-
-2010-06-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementImplicit.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementExplicit.cs:
-	  Extracted indent level calculation.
-
-2010-06-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementImplicit.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementExplicit.cs:
-	  Worked on refactoring - corrected interface formatting.
-
-2010-06-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/EncapsulateFieldDialog.cs: fixed
-	  compilation error.
-
-2010-06-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/EncapsulateFieldDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Worked on insertioncursor edit mode.
-
-2010-05-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Worked on new member positioning.
-
-2010-05-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/CreateBackingStore.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Worked on refactoring.
-
-2010-05-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Fixed 'Bug 609221 - Refactor->"Create Method" does not infer
-	  type for parameter from LINQ query'.
-
-2010-05-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  handle null obj.
-
-2010-05-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ConvertPropery/CreateBackingStore.cs:
-	  Fixed 'Bug 609278 - Add backing store doesn't remove
-	  namespace from backing field'.
-
-2010-05-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Fixed 'Bug 558372 - Code parser is interpreting classname as
-	  method name'.
-
-2010-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Use
-	  ShowCustomDialog (which destroys the dialog when done)
-	  instead of RunCustomDialog (which doesn't).
-
-2010-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Refactoring.Rename/RenameItemDialog.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantDialog.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	  Fixed 'Bug 607994 - Cancelling "Extract Method" dialog needs
-	  Esc to be hit twice' & centered refactoring dialogs on the
-	  mac.
-
-2010-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Fixed 'Bug 607990 - "Extract Method" refactoring sometimes
-	  tries to pass in unnecessary parameter depending on
-	  selection'
-
-2010-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Fixed 'Bug 607984 - Over-zealous "Declare Local" refactoring
-	  renames within string'.
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  More dialog placing.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs:
-	  Flush.
-
-2010-05-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.RefactorImports/FindTypeReferencesVisitor.cs:
-	  Check for valid end position before cutting text.
-
-2010-05-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.RefactorImports/SortImportsRefactoring.cs:
-	  Implemented 'Bug 606848 - Organize Usings does not order
-	  System before other elements'.
-
-2010-05-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Implemented 'Bug 580806 - Feature request: Show resolve-menu
-	  (extract method) when calling method with wrong signature'.
-
-2010-05-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  Fixed 'Bug 593525 - Moving a class to a separate file causes
-	  attributes for that class, in the original source file...'.
-
-2010-05-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  handle invalid regions.
-
-2010-05-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs: Added
-	  multi monitor support.
-
-2010-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: fixed warning.
-
-2010-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: Track API
-	  changes.
-
-2010-05-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Track api changes in the command service.
-
-2010-05-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.addin.xml: Changed some mac
-	  shortcuts.
-
-2010-05-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameItemDialog.cs: Improved
-	  the class renaming behaviour. (Bug 603938 - Renaming a Class
-	  in a file with multiple classes renames the file)
-
-2010-05-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Fixed
-	  'Bug 604085 - Renaming C# method inserts wrong name.'.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs:
-	* MonoDevelop.Refactoring/FindReferencesHandler.cs:
-	* MonoDevelop.Refactoring/GotoDeclarationHandler.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
-	* MonoDevelop.Refactoring/FindDerivedClassesHandler.cs:
-	* MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs:
-	  Make use of the Document.Dom property.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: Check if the
-	  file has a valid compilation unit.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: checked for
-	  valid dom.
-
-2010-05-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: Fixed 'Bug
-	  601738 - Import Type list not sorted'.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: Cached
-	  import symbol handler data.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	  Fixed 'Bug 601136 - Remove backing store refactoring is
-	  broken'.
-
-2010-04-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring.addin.xml: Make Mac import symbol
-	  consistent with Linux/Windows.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: Optimized
-	  performance a bit.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: fixed
-	  'insertNamespace' feature.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: Generate
-	  descriptions for the types to insert.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: fixed
-	  'Bug 599635 - In-place rename should select name'.
-
-2010-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/ImportSymbolHandler.cs: Implemented
-	  'Bug 596515 - Import Symbol completion command'.
-
-2010-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/QuickFixHandler.cs: track API
-	  changes.
-
-2010-04-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Fixed unit tests.
-
-2010-04-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameItemDialog.cs: Fixed
-	  'Bug 595604 - Renaming a constructor should rename the
-	  class'.
-
-2010-04-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Use the new TextEditorData property from Document.
-
-2010-04-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/QuickFixHandler.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Fixed unit tests
-
-2010-04-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  fixed 'Bug 595597 - "Create Method" refactoring uses full
-	  namespace'.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	  Implemented 'Bug 595585 - Allow in-place variable renaming'.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableHandler.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Fixed 'Bug 595580 - Add default key-bindings for currently
-	  unbindable refactoring actions'.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs: Fixed 'Bug
-	  595175 - Code generator window displays offscreen'.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.RefactorImports/FindTypeReferencesVisitor.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RemoveUnusedImportsRefactoring.cs:
-	  Fixed 'Bug 595558 - "Remove unused usings" sometimes removes
-	  usings that aren't unused'.
-
-2010-04-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Fixed 'Bug
-	  546446 - Find references shows usages of overloads'.
-
-2010-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/INRefactoryASTProvider.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Fixed 'Bug 545634 - Create method goes wrong in situation'.
-
-2010-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceFormatItem/IntroduceFormatItemRefactoring.cs:
-	  Fixed failing unit test.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Refactoring.addin.xml: Bumped MD version.
-
-2010-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Don't
-	  rename partial type files when they've a different name than
-	  the class name. (Bug 589663 - Rename class doesnt work well
-	  with partial types)
-
-2010-03-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringService.cs: fixed bug
-	  when replace changes overlap.
-
-2010-03-18  Levi Bard  <levi@unity3d.com>
-
-	* MonoDevelop.Refactoring/Change.cs: Track API changes.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj: Fix build.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring/QuickFixHandler.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring/RefactoringOperation.cs:
-	* MonoDevelop.CodeGeneration/ToStringGenerator.cs:
-	* MonoDevelop.CodeGeneration/PropertyGenerator.cs:
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs:
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs:
-	* MonoDevelop.Refactoring/FindReferencesHandler.cs:
-	* MonoDevelop.Refactoring/GotoDeclarationHandler.cs:
-	* MonoDevelop.Refactoring/EncapsulateFieldDialog.cs:
-	* MonoDevelop.Refactoring.Rename/RenameItemDialog.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
-	* MonoDevelop.Refactoring/FindDerivedClassesHandler.cs:
-	* MonoDevelop.Refactoring/OverridesImplementsDialog.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationCommands.cs:
-	* MonoDevelop.CodeGeneration/EqualityMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs:
-	* MonoDevelop.CodeGeneration/CreateConstructorGenerator.cs:
-	* gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs:
-	* MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.OverridesImplementsDialog.cs:
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementImplicit.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementExplicit.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantDialog.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementAbstractMembers.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs:
-	* MonoDevelop.CodeGeneration/EqualityMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RemoveUnusedImportsRefactoring.cs:
-	  Track API changes.
-
-2010-03-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Fixed
-	  'Bug 587071 - Find references shows a lot of methods with
-	  the same name but not from the correct class'.
-
-2010-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/QuickFixHandler.cs: Fixed bug in
-	  quick fix handler.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/QuickFixHandler.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Implemented
-	  'Bug 582410 - Feature request: Resolve using for extension
-	  methods'.
-
-2010-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Added additional null check.
-
-2010-02-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs: Track
-	  moved diff component.
-
-2010-02-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Don't explode
-	  on docs with no compilation unit.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs: Fix
-	  build.
-
-2010-02-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/QuickFixHandler.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Added quick
-	  fix handler (currently only namespace resolving is
-	  supported).
-
-2010-02-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs: The file rename operation
-	  now saves the project.
-
-2010-02-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodHandler.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodHandler.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantHandler.cs:
-	  Implemented 'Bug 580657 - Feature request: Key-binding to
-	  frequently used functionality'.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs: Track
-	  api changes.
-
-2010-02-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Re-worked the
-	  refactoring submenu.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  Track api changes.
-
-2010-02-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs: moved
-	  method.
-
-2010-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Track API changes for lazy loading images.
-
-2010-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CodeGeneration/CodeGenerationCommands.cs: Only
-	  enable command when text editor has input focus. 
-
-	* MonoDevelop.Refactoring.addin.xml: Insert the Code
-	  Generation command into edit menu and editor context menu.
-
-2010-02-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs: TextReplace change is now
-	  re-usable by the formatting visitor.
-
-2010-02-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  fixed some bugs in the declare local code generator.
-
-2010-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/FindDerivedClassesHandler.cs: Added
-	  FindDerivedClasses command.
-
-2010-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: fixed
-	  'Bug 574924 - Find references doesn't work for constructor'.
-
-2010-01-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring.csproj: Don't use makefiles for
-	  building.
-
-2010-01-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs:
-	  Handle instantiated types in refactorings.
-
-2010-01-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.MoveTypeToFile/TypeFilterTransformer.cs:
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  fixed 'Bug 531510 - Refactoring of generic types fails with
-	  exception'.
-
-2010-01-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs:
-	* gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.RefactoringPreviewDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.ExtractMethod.ExtractMethodDialog.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementAbstractMembers.cs:
-	* gtk-gui/MonoDevelop.Refactoring.IntroduceConstant.IntroduceConstantDialog.cs:
-	  Implemented 'Bug 525257 - Missing "Implement abstract
-	  members'.
-
-2010-01-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Fix NRE
-	  when key is not bound.
-
-2010-01-11  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs:
-	* gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.RefactoringPreviewDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* gtk-gui/MonoDevelop.Refactoring.ExtractMethod.ExtractMethodDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.IntroduceConstant.IntroduceConstantDialog.cs:
-	  Normalized extract method indentation - fixing 'Bug 569370 -
-	  Extract method doesn't fix indentation'.
-
-2010-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs: added null
-	  check.
-
-2009-12-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Added some null checks.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Name threads
-	  to make debugging easier.
-
-2009-11-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceFormatItem/IntroduceFormatItemRefactoring.cs:
-	  Fixed 'Bug 554260 - Introduce Format Item breaks work with
-	  escaped quotes'.
-
-2009-11-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  Fixed 'Bug 554415 - Exception in Move File To Type
-	  refactoring'.
-
-2009-11-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs: Fixed
-	  'Bug 553557 - Refactoring preview dialog has double-spaced
-	  lines'.
-
-2009-11-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceFormatItem/IntroduceFormatItemRefactoring.cs:
-	  fixed 'Bug 553091 - Extract format item on unfinished string
-	  pulls in code in following line'.
-
-2009-11-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceFormatItem/IntroduceFormatItemRefactoring.cs:
-	  Fixed 'Bug 553122 – Selection has strange offset after
-	  refactoring commands'.
-
-2009-11-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Fixed 'Bug 552140 - Exception on refactor to method'.
-
-2009-10-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  fixed 'Bug 551554 - interface rename does not sync project
-	  file'.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Refactoring.addin.xml: Bump MD version.
-
-2009-10-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  declare local/extract method is now much faster on large
-	  files.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Refactoring.csproj:
-	* gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs:
-	* gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.RefactoringPreviewDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.ExtractMethod.ExtractMethodDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.IntroduceConstant.IntroduceConstantDialog.cs:
-	  Flush.
-
-2009-10-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Fixed
-	  issue in CollectMembers.
-
-2009-10-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameItemDialog.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Added
-	  support for rename file names of partial classes.
-
-2009-10-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Fixed "Bug
-	  549130 - "resolve" adds using st. at wrong place when
-	  namespace and classname conflict".
-
-2009-10-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Fixed
-	  'Bug 510939 - Find references should report the interface
-	  method if the method implements the interface'.
-
-2009-10-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Declare local now generates better variable names.
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Extract method now trims the strings itself.
-
-2009-10-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementImplicit.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementExplicit.cs:
-	  Implement interface is now atomic.
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Fixed 'Bug 548367 - Extract method adds an unwanted newline
-	  at the end'.
-
-	* MonoDevelop.Refactoring.MoveTypeToFile/TypeSearchVisitor.cs:
-	* MonoDevelop.Refactoring.MoveTypeToFile/TypeFilterTransformer.cs:
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  Fixed 'Bug 545270 - Move type to another file'.
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj: 
-
-2009-10-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs: Fixed
-	  'Bug 547414 - Gtk-Criticals in refactoring dialog'.
-
-2009-10-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RefactorImportsHandler.cs:
-	  fixed 'Bug 547985 - Remove & Sort using throws exception
-	  when when no usings are necessary.'.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/GotoDeclarationHandler.cs: Special
-	  handling for field types & names (same as properties).
-
-2009-10-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  check extract method on start, not on menu popup (speed!).
-
-2009-10-11  Mike Krüger  <mkrueger@novell.com>
-
-	* ChangeLog: 
-
-	* MonoDevelop.Refactoring/Change.cs: Update visible documents
-	  after refactoring.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs: Update visible documents
-	  after refactoring.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Fixed 'Bug 545632 - The flag 'generate method comment' in
-	  refactoring Create method does nothing'.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameItemDialog.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Fixed
-	  'Bug 545671 - Class rename changes wrong filename/classname
-	  when filenames/classnames are in conflict'.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Enter accepts now extract method/escape closes dialog.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	  Fixed 'Bug 545635 - In refactoring window the enter key does
-	  not hit OK' (means that the extract method dialog remembers
-	  the modifier setting).
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Fixed 'Bug 545631 - Extract method gives exception'.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	  Fixed unit test.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs: Call move
-	  after show.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Fixed 'Bug 545119 - Refactor -> "Extract Method..." removes
-	  comments and new lines'.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.Refactoring.csproj: Mark the *-sharp references
-	with SpecificVersion=false.
-
-2009-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  fixed naming of new methods.
-
-2009-10-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  declare local now generates a more .NET like name.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.Refactoring.addin.xml: Bump MD version.
-
-2009-10-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: added null
-	  check.
-
-2009-10-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RemoveUnusedImportsRefactoring.cs:
-	  Fixed 'Bug 544027 - "Organize Usings" commands should only
-	  be visible in usings section'.
-
-2009-10-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Fixed "Bug
-	  543970 - "Goto class part" pad is not focused".
-
-2009-09-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs: better
-	  sort order in writeline code generator: local vars ->
-	  parameters -> members. (this is the opposite of the old
-	  one).
-
-2009-09-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Added support for creating an method in an interface type.
-
-2009-09-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs: Fixed failing unit
-	  tests.
-
-2009-09-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	  InnerClassTypeReferences now get properly converted.
-
-2009-09-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Don't NRE when command is not key-bound.
-
-2009-09-21  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.CodeGeneration/PropertyGenerator.cs:
-	* MonoDevelop.CodeGeneration/ToStringGenerator.cs:
-	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs:
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs:
-	* MonoDevelop.Refactoring/FindReferencesHandler.cs:
-	* MonoDevelop.Refactoring/GotoDeclarationHandler.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
-	* MonoDevelop.CodeGeneration/EqualityMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs:
-	* MonoDevelop.CodeGeneration/CreateConstructorGenerator.cs:
-	* MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs:
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/GetContainingEmbeddedStatementVisitor.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Renamed IDomVisitable -> INode
-
-2009-09-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.csproj: fixed project file.
-
-2009-09-18  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	Fix build.
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/GetContainingEmbeddedStatementVisitor.cs:
-	  Fixed 'Bug 540055 - refactoring 'create local var' is going
-	  wrong in for loop'.
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Fixed possible null reference in extract method.
-
-2009-09-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Fixed 'Bug
-	  539729 - Cannot use refactoring operations over a var used
-	  in a lock() statement'.
-
-2009-09-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	  Now getting the correct text file provider for remove
-	  backing store refactoring.
-
-2009-09-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Fixed Bug 537927 - "Create" refactorings on member method
-	  are broken/enh. create method on called member
-
-2009-09-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: In
-	  FindReferencesThread, report exceptions to the monitor
-	  instead of letting them reach the top of the thread and
-	  crash MD.
-
-2009-09-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Made it a bit more strict where code generator is valid.
-
-2009-09-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Fixed "Bug 537927 - "Create" refactorings on member method
-	  are broken".
-
-2009-09-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Added shortcut
-	  key for encapsulate fields command.
-
-2009-09-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Added integrate temporary variable to translation.
-
-2009-09-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.RefactorImports/SortImportsRefactoring.cs:
-	  Fixed bug in sort usings.
-
-2009-09-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.csproj: 
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Fixed translation of declare local.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: 
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs: 
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: 
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Make dialogs transient for the root window.
-
-2009-09-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameHandler.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalHandler.cs:
-	* MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RefactorImportsHandler.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Fixed some issues. Always check with IsValid before calling
-	  a refactoring.
-
-2009-09-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Improved declare local code generator.
-
-2009-09-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  fixed unassigned variable errors.
-
-2009-09-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodAstTransformer.cs:
-	  worked on extract method.
-
-2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Refactoring.csproj: Don't require a specific
-	  version for Mono.Addins.
-
-2009-09-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/INRefactoryASTProvider.cs: Resolve
-	  type now works with templates with >=2 type arguments.
-
-2009-09-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Use shorten type name method.
-
-2009-09-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Worked on refactoring/use shorten type name method.
-
-2009-09-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: ResolvedType
-	  is no longer used for the resolve namespace feature.
-	  Therefore replaced the check with an expression check.
-
-2009-08-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Worked on declare local variable.
-
-2009-08-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/CreateBackingStore.cs:
-	  Worked on unit tests.
-
-2009-08-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/CreateBackingStore.cs:
-	  Backing store commands did show up in too many context
-	  menus.
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Resolve
-	  namespace can now resolve conflicts.
-
-	* MonoDevelop.Refactoring.Rename/RenameHandler.cs:
-	* MonoDevelop.Refactoring.Rename/RenameItemDialog.cs: Fixed
-	  possible rename exceptions.
-
-2009-08-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Worked on extract method.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	  Fixed possible null reference exception.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	  Let the code refactorer auto detect the search scope.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs: changed return
-	  type.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs: Only full
-	  reference ArgumentNullException when System namespace isn't
-	  imported.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs: Fixed
-	  null check generator & abstract generate action statement
-	  output.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.CodeGeneration/NullCheckGenerator.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs: Added
-	  NullCheckGenerator from Scott Thomas <scpeterson@novell.com>
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	  Not longer possible to remove backing stores when the field
-	  has attributes.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs: Fixed
-	  parameter members in the code generation action.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring/RefactoringService.cs: Refactorings
-	  are now atomic.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/CreateBackingStore.cs:
-	  Worked on refactoring.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring/RefactoringService.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/PropertyVisitor.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/CreateBackingStore.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	  Improved "remove backing store"/implemented support for
-	  overlapping changes.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ConvertPropery/CreateBackingStore.cs:
-	  Improved backing store name creation.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.ConvertPropery:
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/CreateBackingStore.cs:
-	* MonoDevelop.Refactoring.ConvertPropery/RemoveBackingStore.cs:
-	  Added create/remove backing store property refactorings.
-
-2009-08-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  Move type to file refactoring now works with generic types.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/ToStringGenerator.cs:
-	* MonoDevelop.CodeGeneration/PropertyGenerator.cs:
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/EqualityMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs:
-	* MonoDevelop.CodeGeneration/CreateConstructorGenerator.cs:
-	  Fixed "Bug 533330 - Code generator ignores virtual space
-	  when inserting code in body".
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.CodeGeneration/EventMethodGenerator.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/RaiseEventMethodGenerator.cs:
-	  Worked on raise event method generator (now it generates a
-	  thread safe version).
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	  Fixed "Bug 533681 - Method overriding always uses full
-	  namespaces".
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.ImplementInterface:
-	* MonoDevelop.Refactoring/RefactoringOperation.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementExplicit.cs:
-	* MonoDevelop.Refactoring.ImplementInterface/ImplementImplicit.cs:
-	  Added 'Bug 325224 - Better placing of 'Implement Interface'
-	  command'.
-
-2009-08-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs: Fix NRE
-	  introduced in last commit.
-
-2009-08-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationCommands.cs: Don't
-	  show the generator window at all if it's not valid.
-
-2009-08-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs: Don't
-	  explode when ParsedDocument or CompilationUnit is null.
-
-2009-08-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	  Fixed "Bug 531549 - Quick insert menu adds erroneous
-	  override keyword for interfaces".
-
-2009-08-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Fix out of bounds error when matching bracket is not found.
-
-2009-08-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.Refactoring.csproj: Don't make local copies of
-	  project references.
-
-2009-08-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Made
-	  refactorer public.
-
-2009-08-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/HelperMethods.cs: Added helper
-	  method.
-
-2009-08-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.RefactorImports/SortImportsRefactoring.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RemoveUnusedImportsRefactoring.cs:
-	  Fixed bug with namespaces.
-
-2009-08-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.CodeGeneration/ToStringGenerator.cs:
-	* MonoDevelop.CodeGeneration/PropertyGenerator.cs:
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs:
-	* MonoDevelop.CodeGeneration/EventMethodGenerator.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/EqualityMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/CreateConstructorGenerator.cs:
-	  Check IsSpecialName flag.
-
-2009-08-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.Refactoring.RefactorImports/SortImportsRefactoring.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RefactorImportsHandler.cs:
-	* MonoDevelop.Refactoring.RefactorImports/FindTypeReferencesVisitor.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RemoveUnusedImportsRefactoring.cs:
-	  Added remove unused usings & sort usings command.
-
-2009-08-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.RefactorImports:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring.Rename/RenameHandler.cs:
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalHandler.cs:
-	* MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RefactorImportsHandler.cs:
-	* MonoDevelop.Refactoring.RefactorImports/RemoveUnusedImportsRefactoring.cs:
-	  Worked on code generation/refactoring.
-
-2009-08-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.CodeGeneration/OverrideMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/EqualityMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/CreateConstructorGenerator.cs:
-	  Added override member generator.
-
-2009-08-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.CodeGeneration/ToStringGenerator.cs:
-	* MonoDevelop.CodeGeneration/PropertyGenerator.cs:
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs:
-	* MonoDevelop.CodeGeneration/EventMethodGenerator.cs:
-	* MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
-	* MonoDevelop.CodeGeneration/EqualityMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/CreateConstructorGenerator.cs:
-	  Worked on quick code generation.
-
-2009-08-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.CodeGeneration:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.CodeGeneration/ICodeGenerator.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring/RefactoringService.cs:
-	* MonoDevelop.CodeGeneration/ToStringGenerator.cs:
-	* MonoDevelop.CodeGeneration/PropertyGenerator.cs:
-	* MonoDevelop.CodeGeneration/WriteLineGenerator.cs:
-	* MonoDevelop.CodeGeneration/GenerateCodeWindow.cs:
-	* MonoDevelop.CodeGeneration/EventMethodGenerator.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationOptions.cs:
-	* MonoDevelop.CodeGeneration/CodeGenerationCommands.cs:
-	* MonoDevelop.CodeGeneration/EqualityMembersGenerator.cs:
-	* MonoDevelop.CodeGeneration/ReadonlyPropertyGenerator.cs:
-	* gtk-gui/MonoDevelop.CodeGeneration.GenerateCodeWindow.cs:
-	* MonoDevelop.CodeGeneration/CreateConstructorGenerator.cs:
-	  Worked on code generation popup feature.
-
-2009-08-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	  Only look for local variables or parameters when extracting
-	  a method.
-
-2009-08-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.IntroduceFormatItem:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceFormatItem/IntroduceFormatItemRefactoring.cs:
-	  Added introduce format item refactoring.
-
-2009-08-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	  fixed possible null reference.
-
-2009-07-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  Only enable the move type to file refactoring when the type
-	  has a source project. Prevents offering the refactoring for
-	  types in dlls.
-
-2009-07-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Rename
-	  refactoring now takes care of xml docs too.
-
-2009-07-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring/HelperMethods.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	  Added conversion helper method.
-
-2009-07-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Fixed
-	  "Bug 524313 - Wrong caret position when exiting local rename
-	  link mode".
-
-2009-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Fixed "Bug
-	  523947 - Using key command to go to class with parts should
-	  offer choice".
-
-2009-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/FindReferencesHandler.cs:
-	* MonoDevelop.Refactoring/GotoDeclarationHandler.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodAstTransformer.cs:
-	  Fixed "Bug 523950 - Make Find References keybindable".
-
-2009-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  checked in newest integrate temporary variable.
-
-2009-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Checked in latest refactoring from andrea.
-
-2009-07-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Declare local is now more carefully looking at the
-	  expression the show up is requested. Removed some debug
-	  messages.
-
-2009-07-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	  Added insanity check for caret offset (it may be after the
-	  document).
-
-2009-07-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringService.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Worked on unit test support.
-
-2009-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  Fixed possible null reference exception.
-
-2009-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Checked in changes from andrea
-
-2009-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	  Fixed bug in introduce constant refactoring.
-
-2009-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs: Rename
-	  on parameters/local variables are now done with link edit
-	  mode instead of a dialog.
-
-2009-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.MoveTypeToFile:
-	* MonoDevelop.Refactoring/INRefactoryASTProvider.cs:
-	* MonoDevelop.Refactoring.MoveTypeToFile/TypeFilterTransformer.cs:
-	* MonoDevelop.Refactoring.MoveTypeToFile/MoveTypeToFileRefactoring.cs:
-	  Added move type to own file/rename file refactoring.
-
-2009-07-13  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodAstTransformer.cs:
-	  Worked on extract method.
-
-2009-07-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Worked on extract method.
-
-2009-07-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	  Improved introduce constant.
-
-2009-07-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Worked on refactoring.
-
-2009-07-13  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring.Rename/RenameHandler.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Worked on refactoring/bound rename to F2.
-
-2009-07-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs: Worked
-	  on refactoring preview.
-
-2009-07-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	* MonoDevelop.Refactoring.CreateClass/CreateStructCodeGenerator.cs:
-	  Added create struct generator (based on class generator).
-
-2009-07-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Applied new patch from andrea.
-
-2009-07-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring.CreateClass:
-	* MonoDevelop.Refactoring/RefactoringService.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.CreateClass/CreateClassCodeGenerator.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	  Worked on refactoring.
-
-2009-07-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	  Create method code generator now selects the method body.
-
-2009-07-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Fixed declare local code generator.
-
-2009-07-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantDialog.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	  Worked on introduce constant refactoring.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.IntroduceConstant:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantDialog.cs:
-	* MonoDevelop.Refactoring.IntroduceConstant/IntroduceConstantRefactoring.cs:
-	* gtk-gui/MonoDevelop.Refactoring.IntroduceConstant.IntroduceConstantDialog.cs:
-	  Worked on refactoring.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Handled the extract method case where only one variable is
-	  changed (use return instead of ref params).
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	  Worked on extract method.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Fixing generic type declarations.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  declare local variable no longer shows up in item context
-	  menu.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Improved local variable code generator.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Checked in changes from andrea.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringOperation.cs:
-	* MonoDevelop.Refactoring/INRefactoryASTProvider.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalHandler.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Added declare local code generator.
-
-2009-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.DeclareLocal:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringOperation.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	* MonoDevelop.Refactoring.DeclareLocal/DeclareLocalCodeGenerator.cs:
-	  Worked on refactoring.
-
-2009-07-08  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.Rename:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/Rename.cs:
-	* MonoDevelop.Refactoring/RenameItemDialog.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring.Rename/RenameItemDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.RenameItemDialog.cs:
-	* MonoDevelop.Refactoring.Rename/RenameRefactoring.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethod.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethod.cs:
-	* gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethodCodeGenerator.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariable.cs:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariableRefactoring.cs:
-	  Worked on refactoring.
-
-2009-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* ChangeLog:
-	* Makefile.am:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariable.cs:
-
-
-2009-07-07  Andrea Krüger  <andrea@icsharpcod.net>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable:
-	* MonoDevelop.Refactoring.IntegrateTemporaryVariable/IntegrateTemporaryVariable.cs:
-	  Applied patch from Andrea Krüger: Started
-	  IntegrateTemporaryVarible refactoring.
-
-2009-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring/Rename.cs:
-	* MonoDevelop.Refactoring/RenameItemDialog.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringOptions.cs:
-	* MonoDevelop.Refactoring/RefactoringOperation.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethod.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethod.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	  Refactored the refactoring a bit.
-
-2009-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring.CreateMethod:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring.CreateMethod/CreateMethod.cs:
-	  Started create method command.
-
-2009-07-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.Refactoring.csproj: Don't local-copy MD project
-	  refs.
-
-2009-07-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.Refactoring.ExtractMethod.ExtractMethodDialog.cs:
-	  Fix expand/fill and sizing.
-
-2009-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.addin.xml: Bound go to definition to
-	  F12
-
-2009-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs: Added 'goto
-	  declaration' command.
-
-2009-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring/Rename.cs:
-	* MonoDevelop.Refactoring/Refactoring.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringService.cs:
-	* MonoDevelop.Refactoring/RefactoringOperation.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethod.cs:
-	  Renamed Refactoring to RefactoringOperation. Fixed command
-	  item creation.
-
-2009-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/Rename.cs:
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring/Refactoring.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringService.cs:
-	* MonoDevelop.Refactoring/INRefactoryASTProvider.cs:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethod.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/VariableLookupVisitor.cs:
-	* gtk-gui/MonoDevelop.Refactoring.ExtractMethod.ExtractMethodDialog.cs:
-	  Worked on refactoring support.
-
-2009-07-02  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.Refactoring.ExtractMethod.ExtractMethodDialog.cs:
-	  Save changes to extract mehtod dialog to ensure that they're
-	  not lost due stetic bugs.
-
-2009-07-02  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring.ExtractMethod:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethod.cs:
-	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.ExtractMethod.ExtractMethodDialog.cs:
-	  Worked on extract method.
-
-2009-07-01  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring/Rename.cs:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/Change.cs:
-	* MonoDevelop.Refactoring/Refactoring.cs:
-	* MonoDevelop.Refactoring/RenameItemDialog.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* MonoDevelop.Refactoring/RefactoringService.cs:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs: Moved
-	  some refactoring infrastructure from MonoDevlop.Projects.
-
-2009-07-01  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui:
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.Refactoring:
-	* MonoDevelop.Refactoring.csproj:
-	* MonoDevelop.Refactoring/Rename.cs:
-	* MonoDevelop.Refactoring.addin.xml:
-	* MonoDevelop.Refactoring/RenameItemDialog.cs:
-	* MonoDevelop.Refactoring/RefactoryCommands.cs:
-	* gtk-gui/MonoDevelop.Refactoring.RenameItemDialog.cs:
-	* MonoDevelop.Refactoring/RefactoringPreviewDialog.cs:
-	* gtk-gui/MonoDevelop.Refactoring.RefactoringPreviewDialog.cs:
-	  Moved refactoring support to an own assembly.
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
index 619a60fa9e..4bba040f78 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
@@ -31,20 +31,17 @@ using System.Linq;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
-using Gtk;
 using MonoDevelop.AnalysisCore.Gui;
-using MonoDevelop.SourceEditor;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.AnalysisCore.Fixes;
 using MonoDevelop.Ide;
 using MonoDevelop.CodeIssues;
-using ICSharpCode.NRefactory.Refactoring;
 using MonoDevelop.CodeActions;
 using System.Threading;
 using System.IO;
 using MonoDevelop.Refactoring;
 using MonoDevelop.Ide.Gui.Dialogs;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.AnalysisCore
 {
@@ -71,32 +68,32 @@ namespace MonoDevelop.AnalysisCore
 				return;
 			}
 			var fixes = codeActionExtension.GetCurrentFixes ();
-			info.Enabled = fixes.Any ();
+			info.Enabled = !fixes.IsEmpty;
 		}
 		
 		protected override void Run ()
 		{
-			var doc = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
-			var view = doc.GetContent<MonoDevelop.SourceEditor.SourceEditorView> ();
-			if (view == null) {
-				LoggingService.LogWarning ("ShowFixesHandler could not find a SourceEditorView");
-				return;
-			}
-			var widget = view.TextEditor;
-			var pt = view.DocumentToScreenLocation (doc.Editor.Caret.Location);
-			
-			var ces = new CommandEntrySet ();
-			ces.AddItem (AnalysisCommands.FixOperations);
-			var menu = MonoDevelop.Ide.IdeApp.CommandService.CreateMenu (ces);
-			
-			menu.Popup (null, null, delegate (Menu mn, out int x, out int y, out bool push_in) {
-				x = pt.X;
-				y = pt.Y;
-				push_in = true;
-				//if the menu would be off the bottom of the screen, "drop" it upwards
-				if (y + mn.Requisition.Height > widget.Screen.Height)
-					y -= mn.Requisition.Height + (int)widget.LineHeight;
-			}, 0, Global.CurrentEventTime);
+//			var doc = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
+//			var view = doc.GetContent<MonoDevelop.SourceEditor.SourceEditorView> ();
+//			if (view == null) {
+//				LoggingService.LogWarning ("ShowFixesHandler could not find a SourceEditorView");
+//				return;
+//			}
+//			var widget = view.TextEditor;
+//			var pt = view.DocumentToScreenLocation (doc.Editor.Caret.Location);
+//			
+//			var ces = new CommandEntrySet ();
+//			ces.AddItem (AnalysisCommands.FixOperations);
+//			var menu = MonoDevelop.Ide.IdeApp.CommandService.CreateMenu (ces);
+//			
+//			menu.Popup (null, null, delegate (Menu mn, out int x, out int y, out bool push_in) {
+//				x = pt.X;
+//				y = pt.Y;
+//				push_in = true;
+//				//if the menu would be off the bottom of the screen, "drop" it upwards
+//				if (y + mn.Requisition.Height > widget.Screen.Height)
+//					y -= mn.Requisition.Height + (int)widget.LineHeight;
+//			}, 0, Global.CurrentEventTime);
 		}
 	}
 	
@@ -104,11 +101,11 @@ namespace MonoDevelop.AnalysisCore
 	{
 		protected override void Update (CommandArrayInfo info)
 		{
-			MonoDevelop.Ide.Gui.Document document;
-			IList<FixableResult> results;
-			if (!GetFixes (out document, out results))
-				return;
-			PopulateInfos (info, document, results);
+//			MonoDevelop.Ide.Gui.Document document;
+//			IList<FixableResult> results;
+//			if (!GetFixes (out document, out results))
+//				return;
+//			PopulateInfos (info, document, results);
 		}
 		
 		protected override void Run (object dataItem)
@@ -121,54 +118,52 @@ namespace MonoDevelop.AnalysisCore
 				((System.Action)dataItem) ();
 				return;
 			}
-			if (!RefactoringService.CheckUserSettings ())
-				return;
 			var action = dataItem as IAnalysisFixAction;
 			if (action != null) {
 				action.Fix (); 
 				return;
 			}
-			var ca = dataItem as CodeAction;
-			if (ca != null) {
-				var doc = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
-
-				var context = doc.ParsedDocument.CreateRefactoringContext != null ? doc.ParsedDocument.CreateRefactoringContext (doc, default(CancellationToken)) : null;
-				using (var script = context.CreateScript ()) {
-					ca.Run (context, script);
-				}
-				return;
-			}
+//			var ca = dataItem as CodeAction;
+//			if (ca != null) {
+//				var doc = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
+//
+//				var context = doc.ParsedDocument.CreateRefactoringContext != null ? doc.ParsedDocument.CreateRefactoringContext (doc, default(CancellationToken)) : null;
+//				using (var script = context.CreateScript ()) {
+//					ca.Run (context, script);
+//				}
+//				return;
+//			}
 
 
 		}
 		
-		public static bool GetFixes (out Document document, out IList<FixableResult> results)
-		{
-			results = null;
-			document = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
-			if (document == null)
-				return false;
-			
-			var ext = document.GetContent<ResultsEditorExtension> ();
-			if (ext == null)
-				return false;
-			
-			var list = ext.GetResultsAtOffset (document.Editor.Caret.Offset).OfType<FixableResult> ().ToList ();
-			list.Sort (ResultCompareImportanceDesc);
-			results = list;
-
-			if (results.Count > 0)
-				return true;
-
-			var codeActionExtension = document.GetContent <CodeActionEditorExtension> ();
-			if (codeActionExtension != null) {
-				var fixes = codeActionExtension.GetCurrentFixes ();
-				if (fixes != null)
-					return fixes.Any (CodeActionEditorExtension.IsAnalysisOrErrorFix);
-			} 
-			return false;
-		}
-		
+//		public static bool GetFixes (out MonoDevelop.Ide.Gui.Document document, out IList<FixableResult> results)
+//		{
+//			results = null;
+//			document = MonoDevelop.Ide.IdeApp.Workbench.ActiveDocument;
+//			if (document == null)
+//				return false;
+//			
+//			var ext = document.GetContent<ResultsEditorExtension> ();
+//			if (ext == null)
+//				return false;
+//			
+//			var list = ext.GetResultsAtOffset (document.Editor.CaretOffset).OfType<FixableResult> ().ToList ();
+//			list.Sort (ResultCompareImportanceDesc);
+//			results = list;
+//
+//			if (results.Count > 0)
+//				return true;
+//
+//			var codeActionExtension = document.GetContent <CodeActionEditorExtension> ();
+//			if (codeActionExtension != null) {
+//				var fixes = codeActionExtension.GetCurrentFixes ();
+//				if (fixes != null)
+//					return !fixes.IsEmpty;
+//			} 
+//			return false;
+//		}
+//		
 		static int ResultCompareImportanceDesc (Result r1, Result r2)
 		{
 			int c = ((int)r1.Level).CompareTo ((int)r2.Level);
@@ -177,113 +172,113 @@ namespace MonoDevelop.AnalysisCore
 			return string.Compare (r1.Message, r2.Message, StringComparison.Ordinal);
 		}
 		
-		public static void PopulateInfos (CommandArrayInfo infos, Document doc, IEnumerable<FixableResult> results)
-		{
-			//FIXME: ellipsize long messages
-			int mnemonic = 1;
-
-			var codeActionExtension = doc.GetContent <CodeActionEditorExtension> ();
-			var fixes = codeActionExtension.GetCurrentFixes ();
-			if (fixes != null) {
-				foreach (var _fix in fixes.Where (CodeActionEditorExtension.IsAnalysisOrErrorFix)) {
-					var fix = _fix;
-					if (fix is AnalysisContextActionProvider.AnalysisCodeAction)
-						continue;
-					var escapedLabel = fix.Title.Replace ("_", "__");
-					var label = (mnemonic <= 10)
-						? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
-							: "  " + escapedLabel;
-					infos.Add (label, fix);
-				}
-			}
-
-			foreach (var result in results) {
-				bool firstAction = true;
-				foreach (var action in GetActions (doc, result)) {
-					if (firstAction) {
-						//FIXME: make this header item insensitive but not greyed out
-						infos.Add (new CommandInfo (result.Message.Replace ("_", "__"), false, false) {
-							Icon = GetIcon (result.Level)
-						}, null);
-						firstAction = false;
-					}
-					var escapedLabel = action.Label.Replace ("_", "__");
-					var label = (mnemonic <= 10)
-						? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
-						: "  " + escapedLabel;
-					infos.Add (label, action);
-				}
-				if (result.HasOptionsDialog) {
-					var declSet = new CommandInfoSet ();
-					declSet.Text = GettextCatalog.GetString ("_Options for \"{0}\"", result.OptionsTitle);
-
-					bool hasBatchFix = false;
-					foreach (var fix in result.Fixes.OfType<IAnalysisFixAction> ().Where (f => f.SupportsBatchFix)) {
-						hasBatchFix = true;
-						var title = string.Format (GettextCatalog.GetString ("Apply in file: {0}"), fix.Label);
-						declSet.CommandInfos.Add (title, new System.Action(fix.BatchFix));
-					}
-					if (hasBatchFix)
-						declSet.CommandInfos.AddSeparator ();
-
-					var ir = result as InspectorResults;
-					if (ir != null) {
-						var inspector = ir.Inspector;
-
-						if (inspector.CanSuppressWithAttribute) {
-							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Suppress with attribute"), new System.Action(delegate {
-								inspector.SuppressWithAttribute (doc, ir.Region); 
-							}));
-						}
-
-						if (inspector.CanDisableWithPragma) {
-							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Suppress with #pragma"), new System.Action(delegate {
-								inspector.DisableWithPragma (doc, ir.Region); 
-							}));
-						}
-
-						if (inspector.CanDisableOnce) {
-							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Disable Once"), new System.Action(delegate {
-								inspector.DisableOnce (doc, ir.Region); 
-							}));
-						}
-
-						if (inspector.CanDisableAndRestore) {
-							declSet.CommandInfos.Add (GettextCatalog.GetString ("Disable _and Restore"), new System.Action(delegate {
-								inspector.DisableAndRestore (doc, ir.Region); 
-							}));
-						}
-					}
-
-					declSet.CommandInfos.Add (GettextCatalog.GetString ("_Configure Rule"), result);
-
-					infos.Add (declSet);
-				}
-			}
-		}
-		
-		public static IEnumerable<IAnalysisFixAction> GetActions (Document doc, FixableResult result)
-		{
-			foreach (var fix in result.Fixes)
-				foreach (var handler in AnalysisExtensions.GetFixHandlers (fix.FixType))
-					foreach (var action in handler.GetFixes (doc, fix))
-						yield return action;
-
-		}
-		
-		static string GetIcon (Severity severity)
-		{
-			switch (severity) {
-			case Severity.Error:
-				return Ide.Gui.Stock.Error;
-			case Severity.Warning:
-				return Ide.Gui.Stock.Warning;
-			case Severity.Hint:
-				return Ide.Gui.Stock.Information;
-			default:
-				return null;
-			}
-		}
+//		public static void PopulateInfos (CommandArrayInfo infos, MonoDevelop.Ide.Gui.Document doc, IEnumerable<FixableResult> results)
+//		{
+////			//FIXME: ellipsize long messages
+////			int mnemonic = 1;
+////
+////			var codeActionExtension = doc.GetContent <CodeActionEditorExtension> ();
+////			var fixes = codeActionExtension.GetCurrentFixes ();
+////			if (fixes != null) {
+////				foreach (var _fix in fixes.Where (CodeActionEditorExtension.IsAnalysisOrErrorFix)) {
+////					var fix = _fix;
+////					if (fix is AnalysisContextActionProvider.AnalysisCodeAction)
+////						continue;
+////					var escapedLabel = fix.Title.Replace ("_", "__");
+////					var label = (mnemonic <= 10)
+////						? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
+////							: "  " + escapedLabel;
+////					infos.Add (label, fix);
+////				}
+////			}
+////
+////			foreach (var result in results) {
+////				bool firstAction = true;
+////				foreach (var action in GetActions (doc, result)) {
+////					if (firstAction) {
+////						//FIXME: make this header item insensitive but not greyed out
+////						infos.Add (new CommandInfo (result.Message.Replace ("_", "__"), false, false) {
+////							Icon = GetIcon (result.Level)
+////						}, null);
+////						firstAction = false;
+////					}
+////					var escapedLabel = action.Label.Replace ("_", "__");
+////					var label = (mnemonic <= 10)
+////						? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
+////						: "  " + escapedLabel;
+////					infos.Add (label, action);
+////				}
+////				if (result.HasOptionsDialog) {
+////					var declSet = new CommandInfoSet ();
+////					declSet.Text = GettextCatalog.GetString ("_Options for \"{0}\"", result.OptionsTitle);
+////
+////					bool hasBatchFix = false;
+////					foreach (var fix in result.Fixes.OfType<IAnalysisFixAction> ().Where (f => f.SupportsBatchFix)) {
+////						hasBatchFix = true;
+////						var title = string.Format (GettextCatalog.GetString ("Apply in file: {0}"), fix.Label);
+////						declSet.CommandInfos.Add (title, new System.Action(fix.BatchFix));
+////					}
+////					if (hasBatchFix)
+////						declSet.CommandInfos.AddSeparator ();
+////
+////					var ir = result as InspectorResults;
+////					if (ir != null) {
+////						var inspector = ir.Inspector;
+////
+////						if (inspector.CanSuppressWithAttribute) {
+////							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Suppress with attribute"), new System.Action(delegate {
+////								inspector.SuppressWithAttribute (doc, ir.Region); 
+////							}));
+////						}
+////
+////						if (inspector.CanDisableWithPragma) {
+////							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Suppress with #pragma"), new System.Action(delegate {
+////								inspector.DisableWithPragma (doc, ir.Region); 
+////							}));
+////						}
+////
+////						if (inspector.CanDisableOnce) {
+////							declSet.CommandInfos.Add (GettextCatalog.GetString ("_Disable Once"), new System.Action(delegate {
+////								inspector.DisableOnce (doc, ir.Region); 
+////							}));
+////						}
+////
+////						if (inspector.CanDisableAndRestore) {
+////							declSet.CommandInfos.Add (GettextCatalog.GetString ("Disable _and Restore"), new System.Action(delegate {
+////								inspector.DisableAndRestore (doc, ir.Region); 
+////							}));
+////						}
+////					}
+////
+////					declSet.CommandInfos.Add (GettextCatalog.GetString ("_Configure Rule"), result);
+////
+////					infos.Add (declSet);
+////				}
+////			}
+//		}
+//		
+//		public static IEnumerable<IAnalysisFixAction> GetActions (MonoDevelop.Ide.Gui.Document doc, FixableResult result)
+//		{
+//			foreach (var fix in result.Fixes)
+//				foreach (var handler in AnalysisExtensions.GetFixHandlers (fix.FixType))
+//					foreach (var action in handler.GetFixes (doc.Editor, doc, fix))
+//						yield return action;
+//
+//		}
+//
+//		static string GetIcon (Severity severity)
+//		{
+//			switch (severity) {
+//			case Severity.Error:
+//				return Ide.Gui.Stock.Error;
+//			case Severity.Warning:
+//				return Ide.Gui.Stock.Warning;
+//			case Severity.Hint:
+//				return Ide.Gui.Stock.Information;
+//			default:
+//				return null;
+//			}
+//		}
 	}
 
 	class ExportRulesHandler : CommandHandler
@@ -297,19 +292,19 @@ namespace MonoDevelop.AnalysisCore
 			if (!dlg.Run ())
 				return;
 
-			Dictionary<BaseCodeIssueProvider, Severity> severities = new Dictionary<BaseCodeIssueProvider, Severity> ();
+			Dictionary<CodeDiagnosticDescriptor, DiagnosticSeverity?> severities = new Dictionary<CodeDiagnosticDescriptor, DiagnosticSeverity?> ();
 
-			foreach (var node in RefactoringService.GetInspectors (lang)) {
-				severities [node] = node.GetSeverity ();
-				if (node.HasSubIssues) {
-					foreach (var subIssue in node.SubIssues) {
-						severities [subIssue] = subIssue.GetSeverity ();
-					}
-				}
+			foreach (var node in BuiltInCodeDiagnosticProvider.GetBuiltInCodeDiagnosticDecsriptorsAsync (CodeRefactoringService.MimeTypeToLanguage(lang), true).Result) {
+				severities [node] = node.DiagnosticSeverity;
+//				if (node.GetProvider ().SupportedDiagnostics.Length > 1) {
+//					foreach (var subIssue in node.GetProvider ().SupportedDiagnostics) {
+//						severities [subIssue] = node.GetSeverity (subIssue);
+//					}
+//				}
 			}
 
-			var grouped = severities.Keys.OfType<CodeIssueProvider> ()
-				.GroupBy (node => node.Category)
+			var grouped = severities.Keys.OfType<CodeDiagnosticDescriptor> ()
+				.GroupBy (node => node.GetProvider ().SupportedDiagnostics.First ().Category)
 				.OrderBy (g => g.Key, StringComparer.Ordinal);
 
 			using (var sw = new StreamWriter (dlg.SelectedFile)) {
@@ -318,33 +313,31 @@ namespace MonoDevelop.AnalysisCore
 					sw.WriteLine ("<h2>" + g.Key + "</h2>");
 					sw.WriteLine ("<table border='1'>");
 
-					foreach (var node in g.OrderBy (n => n.Title, StringComparer.Ordinal)) {
-						var title = node.Title;
-						var desc = node.Description != title ? node.Description : "";
-						sw.WriteLine ("<tr><td>" + title + "</td><td>" + desc + "</td><td>" + node.GetSeverity () + "</td></tr>");
-						if (node.HasSubIssues) {
-							foreach (var subIssue in node.SubIssues) {
-								title = subIssue.Title;
-								desc = subIssue.Description != title ? subIssue.Description : "";
-								sw.WriteLine ("<tr><td> - " + title + "</td><td>" + desc + "</td><td>" + subIssue.GetSeverity () + "</td></tr>");
+					foreach (var node in g.OrderBy (n => n.Name, StringComparer.Ordinal)) {
+						var title = node.Name;
+						var desc = node.GetProvider ().SupportedDiagnostics.First ().Description.ToString () != title ? node.GetProvider ().SupportedDiagnostics.First ().Description : "";
+						sw.WriteLine ("<tr><td>" + title + "</td><td>" + desc + "</td><td>" + node.DiagnosticSeverity + "</td></tr>");
+						if (node.GetProvider ().SupportedDiagnostics.Length > 1) {
+							foreach (var subIssue in node.GetProvider ().SupportedDiagnostics) {
+								title = subIssue.Description.ToString ();
+								desc = subIssue.Description.ToString () != title ? subIssue.Description : "";
+								sw.WriteLine ("<tr><td> - " + title + "</td><td>" + desc + "</td><td>" + node.GetSeverity (subIssue) + "</td></tr>");
 							}
 						}
 					}
 					sw.WriteLine ("</table>");
 				}
 
-				Dictionary<CodeActionProvider, bool> providerStates = new Dictionary<CodeActionProvider, bool> ();
-				string disabledNodes = PropertyService.Get ("ContextActions." + lang, "");
-				foreach (var node in RefactoringService.ContextAddinNodes.Where (n => n.MimeType == lang)) {
-					providerStates [node] = disabledNodes.IndexOf (node.IdString, StringComparison.Ordinal) < 0;
+				var providerStates = new Dictionary<CodeRefactoringDescriptor, bool> ();
+				foreach (var node in BuiltInCodeDiagnosticProvider.GetBuiltInCodeRefactoringDescriptorsAsync (CodeRefactoringService.MimeTypeToLanguage(lang), true).Result) {
+					providerStates [node] = node.IsEnabled;
 				}
 
 				sw.WriteLine ("<h1>Code Actions</h1>");
 				sw.WriteLine ("<table border='1'>");
-				var sortedAndFiltered = providerStates.Keys.OrderBy (n => n.Title, StringComparer.Ordinal);
+				var sortedAndFiltered = providerStates.Keys.OrderBy (n => n.Name, StringComparer.Ordinal);
 				foreach (var node in sortedAndFiltered) {
-					var desc = node.Title != node.Description ? node.Description : "";
-					sw.WriteLine ("<tr><td>" + node.Title + "</td><td>" + desc + "</td></tr>");
+					sw.WriteLine ("<tr><td>" + node.IdString + "</td><td>" + node.Name + "</td></tr>");
 				}
 				sw.WriteLine ("</table>");
 			}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisOptions.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisOptions.cs
index cedc34ccd3..0ffe36ac2a 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisOptions.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisOptions.cs
@@ -26,17 +26,19 @@
 
 using System;
 using MonoDevelop.Core;
-using MonoDevelop.SourceEditor.QuickTasks;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.AnalysisCore
 {
 	public static class AnalysisOptions
 	{
-		public static PropertyWrapper<bool> AnalysisEnabled {
-			get { return QuickTaskStrip.EnableFancyFeatures; }
+		public readonly static ConfigurationProperty<bool> EnableFancyFeatures = IdeApp.Preferences.EnableSourceAnalysis;
+
+		public static ConfigurationProperty<bool> AnalysisEnabled {
+			get { return EnableFancyFeatures; }
 		}
 
-		public readonly static PropertyWrapper<bool> EnableUnitTestEditorIntegration = new PropertyWrapper<bool> ("Testing.EnableUnitTestEditorIntegration", false);
+		public readonly static ConfigurationProperty<bool> EnableUnitTestEditorIntegration = IdeApp.Preferences.EnableUnitTestEditorIntegration;
 
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/FixableResult.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/FixableResult.cs
index 7aaf76620f..ca3ca05b3e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/FixableResult.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/FixableResult.cs
@@ -26,26 +26,23 @@
 
 using System;
 using System.Collections.Generic;
-using MonoDevelop.SourceEditor;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Refactoring;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AnalysisCore
 {
-	public class FixableResult : Result
-	{
-		public FixableResult (DomRegion region, string message, Severity level,
-			IssueMarker mark, params IAnalysisFix[] fixes)
-			: base (region, message, level, mark)
-		{
-			this.Fixes = fixes;
-		}
-		
-		public IAnalysisFix[] Fixes { get; protected set; }
-	}
+//	public class FixableResult : Result
+//	{
+//		public FixableResult (TextSpan region, string message, DiagnosticSeverity level,
+//			IssueMarker mark, params IAnalysisFix[] fixes)
+//			: base (region, message, level, mark)
+//		{
+//			this.Fixes = fixes;
+//		}
+//		
+//		public IAnalysisFix[] Fixes { get; protected set; }
+//	}
 	
 	//FIXME: should this really use MonoDevelop.Ide.Gui.Document? Fixes could be more generic.
 	public interface IAnalysisFix
@@ -55,14 +52,14 @@ namespace MonoDevelop.AnalysisCore
 	
 	public interface IFixHandler
 	{
-		IEnumerable<IAnalysisFixAction> GetFixes (MonoDevelop.Ide.Gui.Document doc, object fix);
+		IEnumerable<IAnalysisFixAction> GetFixes (TextEditor editor, DocumentContext doc, object fix);
 	}
 	
 	public interface IAnalysisFixAction
 	{
 		string Label { get; }
 		bool SupportsBatchFix { get; }
-		DocumentRegion DocumentRegion { get; }
+		TextSpan DocumentRegion { get; }
 		string IdString { get; }
 		void Fix ();
 		void BatchFix ();
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs
index 021445d57b..ca7bd317f0 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/GenericFix.cs
@@ -25,63 +25,30 @@
 // THE SOFTWARE.
 using System;
 using System.Collections.Generic;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.CodeIssues;
 using MonoDevelop.Ide;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Refactoring;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AnalysisCore.Fixes
 {
-	public class InspectorResults : GenericResults
-	{
-		public BaseCodeIssueProvider Inspector { get; private set; }
-
-		public InspectorResults (BaseCodeIssueProvider inspector, DomRegion region, string message, Severity level, IssueMarker mark, params GenericFix[] fixes)
-			: base (region, message, level, mark, fixes)
-		{
-			this.Inspector = inspector;
-		}
-
-		public override bool HasOptionsDialog { get { return true; } }
-		public override string OptionsTitle { get { return GetTitle (Inspector); } }
-		public override void ShowResultOptionsDialog ()
-		{
-			IdeApp.Workbench.ShowGlobalPreferencesDialog (null, "C#", dialog => {
-				var panel = dialog.GetPanel<CodeIssuePanel> ("C#");
-				if (panel == null)
-					return;
-				panel.Widget.SelectCodeIssue (Inspector.IdString);
-			});
-		}
-
-		public static string GetTitle (BaseCodeIssueProvider inspector)
-		{
-			if (inspector.Parent == null)
-				return inspector.Title;
-			return inspector.Parent.Title + " -> " + inspector.Title;
-		}
-
-
-	}
-
-	public class GenericResults : FixableResult
-	{
-		public GenericResults (DomRegion region, string message, Severity level,
-			IssueMarker mark, params GenericFix[] fixes)
-			: base (region, message, level, mark)
-		{
-			this.Fixes = fixes;
-		}
-	}
+//	public class GenericResults : FixableResult
+//	{
+//		public GenericResults (TextSpan region, string message, DiagnosticSeverity level,
+//			IssueMarker mark, params GenericFix[] fixes)
+//			: base (region, message, level, mark)
+//		{
+//			this.Fixes = fixes;
+//		}
+//	}
 	
 	public class GenericFix : IAnalysisFix, IAnalysisFixAction
 	{
 		Action fix;
 		Action batchFix;
 		string label;
-		public DocumentRegion DocumentRegion { get; set; }
+		public TextSpan DocumentRegion { get; set; }
 		public string IdString { get; set; }
 
 		public GenericFix (string label, Action fix, Action batchFix = null)
@@ -130,7 +97,7 @@ namespace MonoDevelop.AnalysisCore.Fixes
 	public class GenericFixHandler : IFixHandler
 	{
 		#region IFixHandler implementation
-		public IEnumerable<IAnalysisFixAction> GetFixes (MonoDevelop.Ide.Gui.Document doc, object fix)
+		public IEnumerable<IAnalysisFixAction> GetFixes (TextEditor editor, DocumentContext context, object fix)
 		{
 			yield return (GenericFix)fix;
 		}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
index 2624a4fe2d..15471b44fa 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
@@ -27,13 +27,10 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Refactoring;
 using MonoDevelop.Refactoring.Rename;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-using Mono.TextEditor;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AnalysisCore.Fixes
 {
@@ -42,14 +39,14 @@ namespace MonoDevelop.AnalysisCore.Fixes
 		public string NewName { get; private set; }
 		public string OldName { get; private set; }
 		public string IdString { get; set; }
-		public IEntity Item { get; private set; }
-		
-		public RenameMemberFix (IEntity item, string oldName, string newName)
-		{
-			this.OldName = oldName;
-			this.NewName = newName;
-			this.Item = item;
-		}
+//		public IEntity Item { get; private set; }
+//		
+//		public RenameMemberFix (IEntity item, string oldName, string newName)
+//		{
+//			this.OldName = oldName;
+//			this.NewName = newName;
+//			this.Item = item;
+//		}
 		
 		public string FixType { get { return "RenameMember"; } }
 	}
@@ -58,23 +55,22 @@ namespace MonoDevelop.AnalysisCore.Fixes
 	{
 		//FIXME: why is this invalid on the parseddocuments loaded when the doc is first loaded?
 		//maybe the item's type's SourceProject is null?
-		public IEnumerable<IAnalysisFixAction> GetFixes (MonoDevelop.Ide.Gui.Document doc, object fix)
+		public IEnumerable<IAnalysisFixAction> GetFixes (TextEditor editor, DocumentContext doc, object fix)
 		{
 			var renameFix = (RenameMemberFix)fix;
 			var refactoring = new RenameRefactoring ();
-			var options = new RefactoringOptions (doc) {
-				SelectedItem = renameFix.Item,
+			var options = new RefactoringOptions (editor, doc) {
+			//	SelectedItem = renameFix.Item,
 			};
 			
-			if (renameFix.Item == null) {
-				ResolveResult resolveResult;
-				
-				options.SelectedItem = CurrentRefactoryOperationsHandler.GetItem (options.Document, out resolveResult);
-			}
-			
-			if (!refactoring.IsValid (options))
-				yield break;
-			
+//			if (renameFix.Item == null) {
+//				ResolveResult resolveResult;
+//				options.SelectedItem = CurrentRefactoryOperationsHandler.GetItem (options.Editor, options.DocumentContext, out resolveResult);
+//			}
+//			
+//			if (!refactoring.IsValid (options))
+//				yield break;
+//			
 			var prop = new RenameRefactoring.RenameProperties () {
 				NewName = renameFix.NewName,
 			};
@@ -113,25 +109,25 @@ namespace MonoDevelop.AnalysisCore.Fixes
 			public RenameRefactoring.RenameProperties Properties;
 			public bool Preview;
 			public string Label { get; set; }
-			public DocumentRegion DocumentRegion { get; set; }
+			public TextSpan DocumentRegion { get; set; }
 			public string IdString { get; set; }
 
 			public void Fix ()
 			{
 				if (string.IsNullOrEmpty (Properties.NewName)) {
-					Refactoring.Run (Options);
+					//Refactoring.RunInplace (Options);
 					return;
 				}
-				
-				//FIXME: performchanges should probably use a monitor too, as it can be slow
-				var changes = Refactoring.PerformChanges (Options, Properties);
-				if (Preview) {
-					using (var dlg = new RefactoringPreviewDialog (changes))
-						MessageService.ShowCustomDialog (dlg);
-				} else {
-					var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Rename", null);
-					RefactoringService.AcceptChanges (monitor, changes);
-				}
+
+//				//FIXME: performchanges should probably use a monitor too, as it can be slow
+//				var changes = Refactoring.PerformChanges (Options, Properties);
+//				if (Preview) {
+//				using (var dlg = new RefactoringPreviewDialog (changes))
+//					MessageService.ShowCustomDialog (dlg);
+//				} else {
+//					var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Rename", null);
+//					RefactoringService.AcceptChanges (monitor, changes);
+//				}
 			}
 			
 			public bool SupportsBatchFix {
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/AnalysisOptionsPanel.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/AnalysisOptionsPanel.cs
index b8ddfd008e..deeaf2b724 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/AnalysisOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/AnalysisOptionsPanel.cs
@@ -27,6 +27,7 @@
 using System;
 using MonoDevelop.Ide.Gui.Dialogs;
 using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 
@@ -36,7 +37,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 	{
 		AnalysisOptionsWidget widget;
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			return widget = new AnalysisOptionsWidget () {
 				AnalysisEnabled = AnalysisOptions.AnalysisEnabled,
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultMarker.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultMarker.cs
index 332f0061cf..43ddf40ef4 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultMarker.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultMarker.cs
@@ -24,15 +24,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using Mono.TextEditor;
-using MonoDevelop.SourceEditor;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Refactoring;
 using System.Collections.Generic;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.AnalysisCore.Gui
 {
+/*
 	class ResultMarker : UnderlineTextSegmentMarker
 	{
 		readonly Result result;
@@ -42,17 +40,9 @@ namespace MonoDevelop.AnalysisCore.Gui
 			this.result = result;
 		}
 		
-		static bool IsOneLine (Result result)
-		{
-			return result.Region.BeginLine == result.Region.EndLine;
-		}
-		
 		public Result Result { get { return result; } }
 		
 		//utility for debugging
-		public int Line { get { return result.Region.BeginLine; } }
-		public int ColStart { get { return IsOneLine (result)? (result.Region.BeginColumn) : 0; } }
-		public int ColEnd   { get { return IsOneLine (result)? (result.Region.EndColumn) : 0; } }
 		public string Message { get { return result.Message; } }
 		
 		static Cairo.Color GetColor (TextEditor editor, Result result)
@@ -214,4 +204,5 @@ namespace MonoDevelop.AnalysisCore.Gui
 		}
 		#endregion
 	}
+*/
 }
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs
index e826f51f45..682e6cfe9d 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs
@@ -1,95 +1,74 @@
-// 

-// ResultTooltipProvider.cs

-//  

-// Author:

-//       Michael Hutchinson <mhutchinson@novell.com>

-// 

-// Copyright (c) 2010 Novell, Inc.

-// 

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-// 

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

-using System;

-using Mono.TextEditor;

-using MonoDevelop.SourceEditor;

-using System.Text;

-using System.Collections.Generic;

-using MonoDevelop.Ide.TypeSystem;

-

-namespace MonoDevelop.AnalysisCore.Gui

-{

-	class ResultTooltipProvider : TooltipProvider

-	{

-		public ResultTooltipProvider ()

-		{

-		}

-

-		public override TooltipItem GetItem (TextEditor editor, int offset)

-		{

-			//get the ResultsEditorExtension from the editor

-			var ed =  editor as ExtensibleTextEditor;

-			if (ed == null)

-				return null;

-			var ext = ed.Extension;

-			while (ext != null && !(ext is ResultsEditorExtension))

-				ext = ext.Next;

-			if (ext == null)

-				return null;

-			var resExt = (ResultsEditorExtension) ext;

-			

-			//get the results from the extension

-			var results = resExt.GetResultsAtOffset (offset);

-			if (results == null || results.Count == 0)

-				return null;

-			

-			return new TooltipItem (results, editor.Document.GetLineByOffset (offset));

-		}

-

-		protected override Gtk.Window CreateTooltipWindow (TextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)

-		{

-			//create a message string from all the results

-			var results = (IList<Result>)item.Item;

-			var sb = new StringBuilder ();

-			bool first = false;

-			foreach (var r in results) {

-				if (!first)

-					first = true;

-				else

-					sb.AppendLine ();

-				sb.Append (r.Level.ToString ());

-				sb.Append (": ");

-				sb.Append (AmbienceService.EscapeText (r.Message));

-			}

-

-			//FIXME: use a nicer, more specialized tooltip window, with results formatting and hints about 

-			// commands and stuff

-			var win = new LanguageItemWindow ((ExtensibleTextEditor) editor, modifierState, null, sb.ToString (), null);

-			if (win.IsEmpty)

-				return null;

-			return win;

-		}

-

-		protected override void GetRequiredPosition (TextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)

-		{

-			var win = (LanguageItemWindow) tipWindow;

-			requiredWidth = win.SetMaxWidth (win.Screen.Width);

-			xalign = 0.5;

-		}

-	}

-}

-

+// 
+// ResultTooltipProvider.cs
+//  
+// Author:
+//       Michael Hutchinson <mhutchinson@novell.com>
+// 
+// Copyright (c) 2010 Novell, Inc.
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Text;
+using System.Collections.Generic;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.SourceEditor;
+using System.Linq;
+using MonoDevelop.Components;
+using System.Threading.Tasks;
+using System.Threading;
+
+namespace MonoDevelop.AnalysisCore.Gui
+{
+	class ResultTooltipProvider : TooltipProvider
+	{
+		#region ITooltipProvider implementation 
+		public override Task<TooltipItem> GetItem (TextEditor editor, DocumentContext ctx, int offset, CancellationToken token = default (CancellationToken))
+		{
+			foreach (var marker in editor.GetTextSegmentMarkersAt (offset)) {
+				var result = marker.Tag as Result;
+				if (result != null) 
+					return Task.FromResult(new TooltipItem (result, marker.Offset, marker.Length));
+			}
+			return Task.FromResult<TooltipItem> (null);
+
+		}
+
+		public override Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Xwt.ModifierKeys modifierState)
+		{
+			var result = item.Item as Result;
+
+			var window = new LanguageItemWindow (CompileErrorTooltipProvider.GetExtensibleTextEditor (editor), modifierState, null, result.Message, null);
+			if (window.IsEmpty)
+				return null;
+			return window;
+		}
+
+		public override void GetRequiredPosition (TextEditor editor, Control tipWindow, out int requiredWidth, out double xalign)
+		{
+			var win = (LanguageItemWindow) tipWindow;
+			requiredWidth = win.SetMaxWidth (win.Screen.Width / 4);
+			xalign = 0.5;
+		}
+		#endregion
+
+
+	}
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
index 4806feac47..f10459f87a 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
@@ -30,20 +30,36 @@ using MonoDevelop.Ide.Gui.Content;
 using System.Threading;
 using System.Threading.Tasks;
 using System.IO;
-using Mono.TextEditor;
 using System.Linq;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Refactoring;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
 using MonoDevelop.CodeIssues;
+using System.Collections.Immutable;
 
 namespace MonoDevelop.AnalysisCore.Gui
 {
+	class AnalysisDocument
+	{
+		public TextEditor Editor { get; private set; }
+		public DocumentLocation CaretLocation { get; private set; }
+		public DocumentContext DocumentContext { get; private set; }
+
+		public AnalysisDocument (TextEditor editor, DocumentContext documentContext)
+		{
+			this.Editor = editor;
+			this.CaretLocation = editor.CaretLocation;
+			this.DocumentContext = documentContext;
+		}
+	}
+
 	public class ResultsEditorExtension : TextEditorExtension, IQuickTaskProvider
 	{
 		bool disposed;
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 
@@ -61,13 +77,12 @@ namespace MonoDevelop.AnalysisCore.Gui
 			if (disposed) 
 				return;
 			enabled = false;
-			Document.DocumentParsed -= OnDocumentParsed;
+			DocumentContext.DocumentParsed -= OnDocumentParsed;
 			CancelUpdateTimout ();
 			CancelTask ();
 			AnalysisOptions.AnalysisEnabled.Changed -= AnalysisOptionsChanged;
 			while (markers.Count > 0)
-				Document.Editor.Document.RemoveMarker (markers.Dequeue ());
-			tasks.Clear ();
+				Editor.RemoveMarker (markers.Dequeue ());
 			disposed = true;
 		}
 		
@@ -90,20 +105,16 @@ namespace MonoDevelop.AnalysisCore.Gui
 			if (enabled)
 				return;
 			enabled = true;
-			Document.DocumentParsed += OnDocumentParsed;
-			if (Document.ParsedDocument != null)
+			DocumentContext.DocumentParsed += OnDocumentParsed;
+			if (DocumentContext.ParsedDocument != null)
 				OnDocumentParsed (null, null);
 		}
 
 		void CancelTask ()
 		{
-			if (src != null) {
-				src.Cancel ();
-				try {
-					oldTask.Wait ();
-				} catch (TaskCanceledException) {
-				} catch (AggregateException ex) {
-					ex.Handle (e => e is TaskCanceledException);
+			lock (updateLock) {
+				if (src != null) {
+					src.Cancel ();
 				}
 			}
 		}
@@ -113,33 +124,39 @@ namespace MonoDevelop.AnalysisCore.Gui
 			if (!enabled)
 				return;
 			enabled = false;
-			Document.DocumentParsed -= OnDocumentParsed;
+			DocumentContext.DocumentParsed -= OnDocumentParsed;
 			CancelTask ();
 			new ResultsUpdater (this, new Result[0], CancellationToken.None).Update ();
 		}
 		
-		Task oldTask;
 		CancellationTokenSource src = null;
 		object updateLock = new object();
 		uint updateTimeout = 0;
 
 		void OnDocumentParsed (object sender, EventArgs args)
 		{
-			if (!QuickTaskStrip.EnableFancyFeatures)
+			if (!AnalysisOptions.EnableFancyFeatures)
 				return;
 			CancelUpdateTimout ();
-			var doc = Document.ParsedDocument;
-			if (doc == null)
+			var doc = DocumentContext.ParsedDocument;
+			if (doc == null || DocumentContext.IsAdHocProject)
 				return;
 			updateTimeout = GLib.Timeout.Add (250, delegate {
 				lock (updateLock) {
 					CancelTask ();
 					src = new CancellationTokenSource ();
 					var token = src.Token;
-					oldTask = Task.Run (() => {
-						var result = CodeAnalysisRunner.Check (Document, doc, token);
-						var updater = new ResultsUpdater (this, result, token);
-						updater.Update ();
+					var ad = new AnalysisDocument (Editor, DocumentContext);
+					Task.Run (() => {
+						try {
+							var result = CodeDiagnosticRunner.Check (ad, token).Result;
+							if (token.IsCancellationRequested)
+								return;
+							var updater = new ResultsUpdater (this, result, token);
+							updater.Update ();
+						} catch (OperationCanceledException) {
+						} catch (AggregateException) {
+						}
 					});
 					updateTimeout = 0;
 					return false;
@@ -155,6 +172,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 			}
 		}
 
+
 		class ResultsUpdater 
 		{
 			readonly ResultsEditorExtension ext;
@@ -163,6 +181,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 			//the number of markers at the head of the queue that need tp be removed
 			int oldMarkers;
 			IEnumerator<Result> enumerator;
+			ImmutableArray<QuickTask>.Builder builder;
 			
 			public ResultsUpdater (ResultsEditorExtension ext, IEnumerable<Result> results, CancellationToken cancellationToken)
 			{
@@ -173,17 +192,34 @@ namespace MonoDevelop.AnalysisCore.Gui
 				this.ext = ext;
 				this.cancellationToken = cancellationToken;
 				this.oldMarkers = ext.markers.Count;
+				builder = ImmutableArray<QuickTask>.Empty.ToBuilder ();
 				enumerator = ((IEnumerable<Result>)results).GetEnumerator ();
 			}
 			
 			public void Update ()
 			{
-				if (!QuickTaskStrip.EnableFancyFeatures || cancellationToken.IsCancellationRequested)
+				if (!AnalysisOptions.EnableFancyFeatures || cancellationToken.IsCancellationRequested)
 					return;
-				ext.tasks.Clear ();
+				ext.tasks = ext.tasks.Clear ();
 				GLib.Idle.Add (IdleHandler);
 			}
-			
+
+			static Cairo.Color GetColor (TextEditor editor, Result result)
+			{
+				switch (result.Level) {
+				case DiagnosticSeverity.Hidden:
+					return DefaultSourceEditorOptions.Instance.GetColorStyle ().PlainText.Background;
+				case DiagnosticSeverity.Error:
+					return DefaultSourceEditorOptions.Instance.GetColorStyle ().UnderlineError.Color;
+				case DiagnosticSeverity.Warning:
+					return DefaultSourceEditorOptions.Instance.GetColorStyle ().UnderlineWarning.Color;
+				case DiagnosticSeverity.Info:
+					return DefaultSourceEditorOptions.Instance.GetColorStyle ().UnderlineSuggestion.Color;
+				default:
+					throw new System.ArgumentOutOfRangeException ();
+				}
+			}
+
 			//this runs as a glib idle handler so it can add/remove text editor markers
 			//in order to to block the GUI thread, we batch them in UPDATE_COUNT
 			bool IdleHandler ()
@@ -191,45 +227,49 @@ namespace MonoDevelop.AnalysisCore.Gui
 				if (cancellationToken.IsCancellationRequested)
 					return false;
 				var editor = ext.Editor;
-				if (editor == null || editor.Document == null)
+				if (editor == null)
 					return false;
 				//clear the old results out at the same rate we add in the new ones
 				for (int i = 0; oldMarkers > 0 && i < UPDATE_COUNT; i++) {
 					if (cancellationToken.IsCancellationRequested)
 						return false;
-					editor.Document.RemoveMarker (ext.markers.Dequeue ());
+					editor.RemoveMarker (ext.markers.Dequeue ());
 					oldMarkers--;
 				}
 				//add in the new markers
 				for (int i = 0; i < UPDATE_COUNT; i++) {
 					if (!enumerator.MoveNext ()) {
+						ext.tasks = builder.ToImmutable ();
 						ext.OnTasksUpdated (EventArgs.Empty);
 						return false;
 					}
 					if (cancellationToken.IsCancellationRequested)
 						return false;
 					var currentResult = (Result)enumerator.Current;
-
 					if (currentResult.InspectionMark != IssueMarker.None) {
-						int start = editor.LocationToOffset (currentResult.Region.Begin);
-						int end = editor.LocationToOffset (currentResult.Region.End);
+						int start = currentResult.Region.Start;
+						int end = currentResult.Region.End;
 						if (start >= end)
 							continue;
 						if (currentResult.InspectionMark == IssueMarker.GrayOut) {
-							var marker = new GrayOutMarker (currentResult, TextSegment.FromBounds (start, end));
+							var marker = TextMarkerFactory.CreateGenericTextSegmentMarker (editor, TextSegmentMarkerEffect.GrayOut, TextSegment.FromBounds (start, end));
 							marker.IsVisible = currentResult.Underline;
-							editor.Document.AddMarker (marker);
+							marker.Tag = currentResult;
+							editor.AddMarker (marker);
 							ext.markers.Enqueue (marker);
-							editor.Parent.TextViewMargin.RemoveCachedLine (editor.GetLineByOffset (start));
-							editor.Parent.QueueDraw ();
+//							editor.Parent.TextViewMargin.RemoveCachedLine (editor.GetLineByOffset (start));
+//							editor.Parent.QueueDraw ();
 						} else {
-							var marker = new ResultMarker (currentResult, TextSegment.FromBounds (start, end));
+							var effect = currentResult.InspectionMark == IssueMarker.DottedLine ? TextSegmentMarkerEffect.DottedLine : TextSegmentMarkerEffect.WavedLine;
+							var marker = TextMarkerFactory.CreateGenericTextSegmentMarker (editor, effect, TextSegment.FromBounds (start, end));
+							marker.Color = GetColor (editor, currentResult);
 							marker.IsVisible = currentResult.Underline;
-							editor.Document.AddMarker (marker);
+							marker.Tag = currentResult;
+							editor.AddMarker (marker);
 							ext.markers.Enqueue (marker);
 						}
 					}
-					ext.tasks.Add (new QuickTask (currentResult.Message, currentResult.Region.Begin, currentResult.Level));
+					builder.Add (new QuickTask (currentResult.Message, currentResult.Region.Start, currentResult.Level));
 				}
 				
 				return true;
@@ -237,7 +277,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 		}
 		
 		//all markers known to be in the editor
-		Queue<ResultMarker> markers = new Queue<ResultMarker> ();
+		Queue<IGenericTextSegmentMarker> markers = new Queue<IGenericTextSegmentMarker> ();
 		
 		const int UPDATE_COUNT = 20;
 		
@@ -247,23 +287,23 @@ namespace MonoDevelop.AnalysisCore.Gui
 //			var line = Editor.GetLineByOffset (offset);
 			
 			var list = new List<Result> ();
-			foreach (var marker in Editor.Document.GetTextSegmentMarkersAt (offset)) {
+			foreach (var marker in Editor.GetTextSegmentMarkersAt (offset)) {
 				if (token.IsCancellationRequested)
 					break;
-				var resultMarker = marker as ResultMarker;
-				if (resultMarker != null)
-					list.Add (resultMarker.Result);
+				var resultMarker = marker as IGenericTextSegmentMarker;
+				if (resultMarker != null && resultMarker.Tag is Result)
+					list.Add (resultMarker.Tag as Result);
 			}
 			return list;
 		}
 		
 		public IEnumerable<Result> GetResults ()
 		{
-			return markers.Select (m => m.Result);
+			return markers.Select (m => m.Tag).OfType<Result> ();
 		}
 
 		#region IQuickTaskProvider implementation
-		List<QuickTask> tasks = new List<QuickTask> ();
+		ImmutableArray<QuickTask> tasks = ImmutableArray<QuickTask>.Empty;
 
 		public event EventHandler TasksUpdated;
 
@@ -274,7 +314,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 				handler (this, e);
 		}
 		
-		public IEnumerable<QuickTask> QuickTasks {
+		public ImmutableArray<QuickTask> QuickTasks {
 			get {
 				return tasks;
 			}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/IssueMarker.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/IssueMarker.cs
new file mode 100644
index 0000000000..8713caf62d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/IssueMarker.cs
@@ -0,0 +1,55 @@
+//
+// IssueMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.AnalysisCore
+{
+	/// <summary>
+	/// The issue marker is used to set how an issue should be marked inside the text editor.
+	/// </summary>
+	public enum IssueMarker
+	{
+		/// <summary>
+		/// The issue is not shown inside the text editor. (But in the task bar)
+		/// </summary>
+		None,
+
+		/// <summary>
+		/// The region is marked as underline in the severity color.
+		/// </summary>
+		WavedLine,
+
+		/// <summary>
+		/// The region is marked as dotted line in the severity color.
+		/// </summary>
+		DottedLine,
+
+		/// <summary>
+		/// The text is grayed out.
+		/// </summary>
+		GrayOut
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Result.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Result.cs
index 0e89e12711..7ed4a24101 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Result.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Result.cs
@@ -25,25 +25,22 @@
 // THE SOFTWARE.
 
 using System;
-using ICSharpCode.NRefactory.Refactoring;
 using MonoDevelop.AnalysisCore.Extensions;
-using MonoDevelop.SourceEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.AnalysisCore
 {
 	public class Result
 	{
-		public Result (DomRegion region, string message, bool underLine = true)
+		public Result (TextSpan region, string message, bool underLine = true)
 		{
 			this.Region = region;
 			this.Message = message;
 			this.Underline = underLine;
 		}
 		
-		public Result (DomRegion region, string message, Severity level, IssueMarker inspectionMark, bool underline = true)
+		public Result (TextSpan region, string message, DiagnosticSeverity level, IssueMarker inspectionMark, bool underline = true)
 		{
 			this.Region = region;
 			this.Message = message;
@@ -52,7 +49,7 @@ namespace MonoDevelop.AnalysisCore
 			this.Underline = underline;
 		}
 		 
-		public void SetSeverity (Severity level, IssueMarker inspectionMark)
+		public void SetSeverity (DiagnosticSeverity level, IssueMarker inspectionMark)
 		{
 			this.Level = level;
 			this.InspectionMark = inspectionMark;
@@ -66,9 +63,9 @@ namespace MonoDevelop.AnalysisCore
 		}
 		
 		public string Message { get; private set; }
-		public Severity Level { get; private set; }
+		public DiagnosticSeverity Level { get; private set; }
 		public IssueMarker InspectionMark { get; private set; }
-		public DomRegion Region { get; private set; }
+		public TextSpan Region { get; private set; }
 		
 		public bool Underline { get; private set; }
 		
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Rules/Adaptors.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Rules/Adaptors.cs
deleted file mode 100644
index eaf8c6a3af..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Rules/Adaptors.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// 
-// Adaptors.cs
-//  
-// Author:
-//       Michael Hutchinson <mhutchinson@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using MonoDevelop.AnalysisCore.Fixes;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace MonoDevelop.AnalysisCore.Rules
-{
-	public static class Adapters
-	{
-		public static IUnresolvedFile GetCompilationUnit (Document input)
-		{
-			return input.ParsedDocument.ParsedFile;
-		}
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/AnalysisCodeAction.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/AnalysisCodeAction.cs
deleted file mode 100644
index 5641aecb60..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/AnalysisCodeAction.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// 
-// AnalysisQuickFix.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.AnalysisCore;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using MonoDevelop.Ide;
-using MonoDevelop.CodeIssues;
-using MonoDevelop.AnalysisCore.Fixes;
-using Mono.TextEditor;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.CodeActions
-{
-	class AnalysisContextActionProvider : CodeActionProvider
-	{
-		public Result Result {
-			get;
-			private set;
-		}
-		
-		public IAnalysisFixAction Action {
-			get;
-			private set;
-		}
-		
-		public AnalysisContextActionProvider (Result result, IAnalysisFixAction action)
-		{
-			Result = result;
-			Action = action;
-			Description = result.Message;
-		}
-		
-		public override System.Collections.Generic.IEnumerable<CodeAction> GetActions (MonoDevelop.Ide.Gui.Document document, object refactoringContext, TextLocation loc, CancellationToken cancellationToken)
-		{
-			yield return new AnalysisCodeAction (Action, Result) {
-				DocumentRegion = Action.DocumentRegion
-			};
-		}
-
-		internal class AnalysisCodeAction : CodeAction
-		{
-			public IAnalysisFixAction Action {
-				get;
-				private set;
-			}
-			public Result Result {
-				get;
-				private set;
-			}
-
-			public AnalysisCodeAction (IAnalysisFixAction action, Result result)
-			{
-				Action = action;
-				Title = action.Label;
-				Result = result;
-				IdString = action.IdString;
-			}
-	
-			public override void Run (IRefactoringContext context, object script)
-			{
-				Action.Fix ();
-			}
-			
-			public override bool SupportsBatchRunning {
-				get {
-					return Action.SupportsBatchFix;
-				}
-			}
-			
-			public override void BatchRun (MonoDevelop.Ide.Gui.Document document, TextLocation loc)
-			{
-				Action.BatchFix ();
-			}
-
-			public void ShowOptions (object sender, EventArgs e)
-			{
-				var inspectorResults = Result as InspectorResults;
-				if (inspectorResults != null)
-					inspectorResults.ShowResultOptionsDialog ();
-			}
-
-			public void HideCodeIssue (object sender, EventArgs e)
-			{
-				var inspectorResults = Result as InspectorResults;
-				if (inspectorResults != null)
-					inspectorResults.Inspector.SetIsEnabled (false);
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeAction.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeAction.cs
deleted file mode 100644
index 0aef83200c..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeAction.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// 
-// Result.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory;
-using System;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.Refactoring;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.CodeActions
-{
-	/// <summary>
-	/// A code action represents a menu entry that does edit operation in one document.
-	/// </summary>
-	public abstract class CodeAction
-	{
-		/// <summary>
-		/// Gets or sets the menu item text.
-		/// </summary>
-		public string Title { get; set; }
-
-		/// <summary>
-		/// Gets or sets the id string. The id is used to identify a specific code action.
-		/// </summary>
-		public string IdString { get; set; }
-
-		/// <summary>
-		/// The region of the code action.
-		/// </summary>
-		public DocumentRegion DocumentRegion { get; set; }
-		
-		/// <summary>
-		/// Gets or sets the type of the inspector that is the source of this action.
-		/// </summary>
-		/// <value>The type of the inspector.</value>
-		public Type InspectorType { get; set; }
-		
-		/// <summary>
-		/// Gets or sets the sibling key.
-		/// </summary>
-		/// <value>The sibling key.</value>
-		public object SiblingKey { get; set; }
-
-		/// <summary>
-		/// Gets or sets the severity of the code action.
-		/// </summary>
-		/// <value>The severity.</value>
-		public Severity Severity { get; set; }
-
-		protected CodeAction ()
-		{
-			IdString = GetType ().FullName;
-		}
-
-		/// <summary>
-		/// Performs the specified code action in document at loc.
-		/// </summary>
-		public abstract void Run (IRefactoringContext context, object script);
-
-		/// <summary>
-		/// True if <see cref="BatchRun"/> can be used on the current instance.
-		/// </summary>
-		/// <value><c>true</c> if supports batch running; otherwise, <c>false</c>.</value>
-		public virtual bool SupportsBatchRunning {
-			get{
-				return false;
-			}
-		}
-		
-		public virtual void BatchRun (MonoDevelop.Ide.Gui.Document document, TextLocation loc)
-		{
-			if (!SupportsBatchRunning) {
-				throw new InvalidOperationException ("Batch running is not supported.");
-			}
-		}
-	}
-
-	public class DefaultCodeAction : CodeAction
-	{
-		public Action<RefactoringContext, Script> act;
-
-		public DefaultCodeAction (string title, Action<RefactoringContext, Script> act)
-		{
-			Title = title;
-			this.act = act;
-		}
-
-		public override void Run (IRefactoringContext context, object script)
-		{
-			act ((RefactoringContext)context, (Script)script);
-		}
-	}
-
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionAddinNode.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionAddinNode.cs
deleted file mode 100644
index 11b7701fbd..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionAddinNode.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 
-// ContextActionCodon.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using Mono.Addins;
-
-namespace MonoDevelop.CodeActions
-{
-	public class CodeActionAddinNode : TypeExtensionNode
-	{
-		[NodeAttribute ("mimeType", Required=true, Description="The mime type of this action.")]
-		string mimeType = null;
-		
-		public string MimeType {
-			get {
-				return mimeType;
-			}
-		}
-		
-		[NodeAttribute ("_title", Required=true, Localizable=true, Description="The title of this action.")]
-		string title = null;
-		
-		public string Title {
-			get {
-				return title;
-			}
-		}
-		
-		[NodeAttribute ("_description", Required=true, Localizable=true,  Description="The description of this action.")]
-		string description = null;
-		
-		public string Description {
-			get {
-				return description;
-			}
-		}
-		
-		CodeActionProvider action;
-		public CodeActionProvider Action {
-			get {
-				if (action == null) {
-					action = (CodeActionProvider)CreateInstance ();
-					action.Title = title;
-					action.Description = description;
-					action.MimeType = MimeType;
-				}
-				
-				return action;
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionContainer.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionContainer.cs
new file mode 100644
index 0000000000..f8522866e1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionContainer.cs
@@ -0,0 +1,119 @@
+//
+// CodeActionContainer.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CodeActions;
+using System;
+using MonoDevelop.CodeIssues;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using System.Collections;
+
+namespace MonoDevelop.CodeActions
+{
+	class CodeActionContainer
+	{
+		public static readonly CodeActionContainer Empty = new CodeActionContainer();
+
+		public bool IsEmpty {
+			get {
+				return CodeFixActions.Count + DiagnosticsAtCaret.Count + CodeRefactoringActions.Count == 0;
+			}
+		}
+
+		IReadOnlyList<ValidCodeDiagnosticAction> codeFixActions;
+		public IReadOnlyList<ValidCodeDiagnosticAction> CodeFixActions {
+			get {
+				return codeFixActions ?? new ValidCodeDiagnosticAction[0];
+			}
+			private set {
+				codeFixActions = value;
+			}
+		}
+
+		IReadOnlyList<ValidCodeAction> codeRefactoringActions;
+
+		public IReadOnlyList<ValidCodeAction> CodeRefactoringActions {
+			get {
+				return codeRefactoringActions ?? new ValidCodeAction[0];
+			}
+			private set {
+				codeRefactoringActions = value;
+			}
+		}
+
+		public IEnumerable<ValidCodeAction> AllValidCodeActions {
+			get {
+				return CodeRefactoringActions.Concat (CodeFixActions);
+			}
+		}
+
+		IReadOnlyList<Diagnostic> diagnosticsAtCaret;
+		public IReadOnlyList<Diagnostic> DiagnosticsAtCaret {
+			get {
+				return diagnosticsAtCaret ?? new Diagnostic[0];
+			}
+			private set {
+				diagnosticsAtCaret = value.Distinct (new DiagnosticComparer()).ToList ();
+			}
+		}
+
+		class DiagnosticComparer : IEqualityComparer<Diagnostic>
+		{
+			bool IEqualityComparer<Diagnostic>.Equals (Diagnostic x, Diagnostic y)
+			{
+				if (x.Id != null && y.Id != null)
+					return x.Id == y.Id;
+				return x.Equals (y);
+			}
+
+			int IEqualityComparer<Diagnostic>.GetHashCode (Diagnostic obj)
+			{
+				return obj.Id != null ? obj.Id.GetHashCode () : obj.GetHashCode ();
+			}
+		}
+
+		CodeActionContainer ()
+		{
+			CodeFixActions = new List<ValidCodeDiagnosticAction> ();
+			CodeRefactoringActions = new List<ValidCodeAction> ();
+			DiagnosticsAtCaret = new List<Diagnostic> ();
+		}
+
+		internal CodeActionContainer (List<ValidCodeDiagnosticAction> codeDiagnosticActions, List<ValidCodeAction> codeRefactoringActions, List<Diagnostic> diagnosticsAtCaret)
+		{
+			if (codeDiagnosticActions == null)
+				throw new ArgumentNullException ("codeDiagnosticActions");
+			if (codeRefactoringActions == null)
+				throw new ArgumentNullException ("codeRefactoringActions");
+			if (diagnosticsAtCaret == null)
+				throw new ArgumentNullException ("diagnosticsAtCaret");
+			CodeFixActions = codeDiagnosticActions;
+			CodeRefactoringActions = codeRefactoringActions;
+			DiagnosticsAtCaret = diagnosticsAtCaret;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
index fc93c8dc00..4b13b80f07 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
@@ -24,38 +24,39 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-using MonoDevelop.Ide.Gui.Content;
 using Gtk;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using MonoDevelop.Components.Commands;
-using MonoDevelop.SourceEditor.QuickTasks;
 using System.Linq;
 using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory;
 using System.Threading;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Semantics;
-using MonoDevelop.AnalysisCore.Fixes;
-using ICSharpCode.NRefactory.Refactoring;
+using Microsoft.CodeAnalysis.CodeFixes;
+using MonoDevelop.CodeIssues;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis.CodeActions;
+using RefactoringEssentials;
+using MonoDevelop.AnalysisCore;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor.Extension;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis;
+using System.Reflection;
 using MonoDevelop.Ide.Gui;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace MonoDevelop.CodeActions
 {
-	class CodeActionEditorExtension : TextEditorExtension 
+	class CodeActionEditorExtension : TextEditorExtension
 	{
-		uint quickFixTimeout;
-
 		const int menuTimeout = 250;
 		uint smartTagPopupTimeoutId;
 		uint menuCloseTimeoutId;
-		FixMenuDescriptor codeActionMenu;
-
-		public IEnumerable<CodeAction> Fixes {
-			get;
-			private set;
-		}
 
 		static CodeActionEditorExtension ()
 		{
@@ -67,6 +68,7 @@ namespace MonoDevelop.CodeActions
 
 		void CancelSmartTagPopupTimeout ()
 		{
+
 			if (smartTagPopupTimeoutId != 0) {
 				GLib.Source.Remove (smartTagPopupTimeoutId);
 				smartTagPopupTimeoutId = 0;
@@ -80,27 +82,31 @@ namespace MonoDevelop.CodeActions
 				menuCloseTimeoutId = 0;
 			}
 		}
-		
+
 		void RemoveWidget ()
 		{
 			if (currentSmartTag != null) {
-				document.Editor.Document.RemoveMarker (currentSmartTag);
+				Editor.RemoveMarker (currentSmartTag);
+				currentSmartTag.CancelPopup -= CurrentSmartTag_CancelPopup;
+				currentSmartTag.ShowPopup -= CurrentSmartTag_ShowPopup;
+
 				currentSmartTag = null;
-				currentSmartTagBegin = DocumentLocation.Empty;
+				currentSmartTagBegin = -1;
 			}
 			CancelSmartTagPopupTimeout ();
-
 		}
-		
+
 		public override void Dispose ()
 		{
 			CancelMenuCloseTimer ();
 			CancelQuickFixTimer ();
-			document.Editor.SelectionChanged -= HandleSelectionChanged;
-			document.DocumentParsed -= HandleDocumentDocumentParsed;
-			document.Editor.Parent.BeginHover -= HandleBeginHover;
+			Editor.CaretPositionChanged -= HandleCaretPositionChanged;
+			Editor.SelectionChanged -= HandleSelectionChanged;
+			DocumentContext.DocumentParsed -= HandleDocumentDocumentParsed;
+			Editor.MouseMoved -= HandleBeginHover;
+			Editor.TextChanged -= Editor_TextChanged;
+			Editor.EndAtomicUndoOperation -= Editor_EndAtomicUndoOperation;
 			RemoveWidget ();
-			Fixes = null;
 			base.Dispose ();
 		}
 
@@ -108,6 +114,8 @@ namespace MonoDevelop.CodeActions
 
 		static void ConfirmUsage (string id)
 		{
+			if (id == null)
+				return;
 			if (!CodeActionUsages.ContainsKey (id)) {
 				CodeActionUsages [id] = 1;
 			} else {
@@ -120,70 +128,150 @@ namespace MonoDevelop.CodeActions
 		internal static int GetUsage (string id)
 		{
 			int result;
-			if (!CodeActionUsages.TryGetValue (id, out result)) 
+			if (id == null || !CodeActionUsages.TryGetValue (id, out result))
 				return 0;
 			return result;
 		}
 
 		public void CancelQuickFixTimer ()
 		{
-			if (quickFixCancellationTokenSource != null)
-				quickFixCancellationTokenSource.Cancel ();
-			if (quickFixTimeout != 0) {
-				GLib.Source.Remove (quickFixTimeout);
-				quickFixTimeout = 0;
-			}
+			quickFixCancellationTokenSource.Cancel ();
+			quickFixCancellationTokenSource = new CancellationTokenSource ();
+			smartTagTask = null;
 		}
 
-		CancellationTokenSource quickFixCancellationTokenSource;
+		Task<CodeActionContainer> smartTagTask;
+		CancellationTokenSource quickFixCancellationTokenSource = new CancellationTokenSource ();
+		List<CodeDiagnosticFixDescriptor> codeFixes;
 
-		public override void CursorPositionChanged ()
+		void HandleCaretPositionChanged (object sender, EventArgs e)
 		{
+			if (Editor.IsInAtomicUndo)
+				return;
 			CancelQuickFixTimer ();
-			if (QuickTaskStrip.EnableFancyFeatures &&  Document.ParsedDocument != null && !Debugger.DebuggingService.IsDebugging) {
-				quickFixCancellationTokenSource = new CancellationTokenSource ();
+			if (AnalysisOptions.EnableFancyFeatures && DocumentContext.ParsedDocument != null) {
 				var token = quickFixCancellationTokenSource.Token;
-				quickFixTimeout = GLib.Timeout.Add (100, delegate {
-					var loc = Document.Editor.Caret.Location;
-					RefactoringService.QueueQuickFixAnalysis (Document, loc, token, delegate(List<CodeAction> fixes) {
-						if (!fixes.Any ()) {
-							ICSharpCode.NRefactory.Semantics.ResolveResult resolveResult;
-							AstNode node;
-							if (ResolveCommandHandler.ResolveAt (document, out resolveResult, out node, token)) {
-								var possibleNamespaces = ResolveCommandHandler.GetPossibleNamespaces (document, node, ref resolveResult);
-								if (!possibleNamespaces.Any ()) {
-									if (currentSmartTag != null)
-										Application.Invoke (delegate { RemoveWidget (); });
-									return;
+				var curOffset = Editor.CaretOffset;
+				if (HasCurrentFixes) {
+					foreach (var fix in GetCurrentFixes ().AllValidCodeActions) {
+						if (!fix.ValidSegment.Contains (curOffset)) {
+							RemoveWidget ();
+							break;
+						}
+					}
+				}
+
+				var loc = Editor.CaretOffset;
+				var ad = DocumentContext.AnalysisDocument;
+				if (ad == null) {
+					return;
+				}
+
+				TextSpan span;
+
+				if (Editor.IsSomethingSelected) {
+					var selectionRange = Editor.SelectionRange;
+					span = selectionRange.Offset >= 0 ? TextSpan.FromBounds (selectionRange.Offset, selectionRange.EndOffset) : TextSpan.FromBounds (loc, loc);
+				} else {
+					span = TextSpan.FromBounds (loc, loc);
+				}
+
+				var diagnosticsAtCaret =
+					Editor.GetTextSegmentMarkersAt (Editor.CaretOffset)
+						  .OfType<IGenericTextSegmentMarker> ()
+						  .Select (rm => rm.Tag)
+						  .OfType<DiagnosticResult> ()
+						  .Select (dr => dr.Diagnostic)
+						  .ToList ();
+
+				var errorList = Editor
+					.GetTextSegmentMarkersAt (Editor.CaretOffset)
+					.OfType<IErrorMarker> ()
+					.Where (rm => !string.IsNullOrEmpty (rm.Error.Id)).ToList ();
+				int editorLength = Editor.Length;
+
+				smartTagTask = Task.Run (async delegate {
+					try {
+						var codeIssueFixes = new List<ValidCodeDiagnosticAction> ();
+						var diagnosticIds = diagnosticsAtCaret.Select (diagnostic => diagnostic.Id).Concat (errorList.Select (rm => rm.Error.Id)).ToList ();
+						if (codeFixes == null) {
+							codeFixes = (await CodeRefactoringService.GetCodeFixesAsync (DocumentContext, CodeRefactoringService.MimeTypeToLanguage (Editor.MimeType), token).ConfigureAwait (false)).ToList ();
+						}
+						foreach (var cfp in codeFixes) {
+							if (token.IsCancellationRequested)
+								return CodeActionContainer.Empty;
+							var provider = cfp.GetCodeFixProvider ();
+							if (!provider.FixableDiagnosticIds.Any (diagnosticIds.Contains))
+								continue;
+							try {
+								var groupedDiagnostics = diagnosticsAtCaret
+									.Concat (errorList.Select (em => em.Error.Tag)
+									.OfType<Diagnostic> ())
+									.GroupBy (d => d.Location.SourceSpan);
+								foreach (var g in groupedDiagnostics) {
+									if (token.IsCancellationRequested)
+										return CodeActionContainer.Empty;
+									var diagnosticSpan = g.Key;
+
+									var validDiagnostics = g.Where (d => provider.FixableDiagnosticIds.Contains (d.Id)).ToImmutableArray ();
+									if (validDiagnostics.Length == 0)
+										continue;
+									await provider.RegisterCodeFixesAsync (new CodeFixContext (ad, diagnosticSpan, validDiagnostics, (ca, d) => codeIssueFixes.Add (new ValidCodeDiagnosticAction (cfp, ca, validDiagnostics, diagnosticSpan)), token));
+
+									// TODO: Is that right ? Currently it doesn't really make sense to run one code fix provider on several overlapping diagnostics at the same location
+									//       However the generate constructor one has that case and if I run it twice the same code action is generated twice. So there is a dupe check problem there.
+									// Work around for now is to only take the first diagnostic batch.
+									break;
 								}
-							} else {
-								if (currentSmartTag != null)
-									Application.Invoke (delegate { RemoveWidget (); });
-								return;
+							} catch (OperationCanceledException) {
+								return CodeActionContainer.Empty;
+							} catch (AggregateException ae) {
+								ae.Flatten ().Handle (aex => aex is OperationCanceledException);
+								return CodeActionContainer.Empty;
+							} catch (Exception ex) {
+								LoggingService.LogError ("Error while getting refactorings from code fix provider " + cfp.Name, ex);
+								continue;
 							}
 						}
+						var codeActions = new List<ValidCodeAction> ();
+						foreach (var action in await CodeRefactoringService.GetValidActionsAsync (Editor, DocumentContext, span, token).ConfigureAwait (false)) {
+							codeActions.Add (action);
+						}
+						var codeActionContainer = new CodeActionContainer (codeIssueFixes, codeActions, diagnosticsAtCaret);
 						Application.Invoke (delegate {
 							if (token.IsCancellationRequested)
 								return;
-							CreateSmartTag (fixes, loc);
+							if (codeActionContainer.IsEmpty) {
+								RemoveWidget ();
+								return;
+							}
+							CreateSmartTag (codeActionContainer, loc);
 						});
-					});
-					quickFixTimeout = 0;
-					return false;
-				});
+						return codeActionContainer;
+
+					} catch (AggregateException ae) {
+						ae.Flatten ().Handle (aex => aex is OperationCanceledException);
+						return CodeActionContainer.Empty;
+					} catch (OperationCanceledException) {
+						return CodeActionContainer.Empty;
+					} catch (TargetInvocationException ex) {
+						if (ex.InnerException is OperationCanceledException)
+							return CodeActionContainer.Empty;
+						throw;
+					}
+
+				}, token);
 			} else {
 				RemoveWidget ();
 			}
-			base.CursorPositionChanged ();
 		}
 
-		internal static bool IsAnalysisOrErrorFix (CodeAction act)
+		internal static bool IsAnalysisOrErrorFix (Microsoft.CodeAnalysis.CodeActions.CodeAction act)
 		{
-			return act is AnalysisContextActionProvider.AnalysisCodeAction || act.Severity == Severity.Error;
-		} 
-			
+			return false;
+		}
 
-		class FixMenuEntry
+		internal class FixMenuEntry
 		{
 			public static readonly FixMenuEntry Separator = new FixMenuEntry ("-", null);
 			public readonly string Label;
@@ -197,7 +285,7 @@ namespace MonoDevelop.CodeActions
 			}
 		}
 
-		class FixMenuDescriptor : FixMenuEntry
+		internal class FixMenuDescriptor : FixMenuEntry
 		{
 			readonly List<FixMenuEntry> items = new List<FixMenuEntry> ();
 
@@ -217,7 +305,7 @@ namespace MonoDevelop.CodeActions
 
 			public void Add (FixMenuEntry entry)
 			{
-				items.Add (entry); 
+				items.Add (entry);
 			}
 
 			public object MotionNotifyEvent {
@@ -230,478 +318,506 @@ namespace MonoDevelop.CodeActions
 		{
 			FixMenuDescriptor menu = new FixMenuDescriptor ();
 			var fixMenu = menu;
-			ResolveResult resolveResult;
-			ICSharpCode.NRefactory.CSharp.AstNode node;
+			//ResolveResult resolveResult;
+			//ICSharpCode.NRefactory.CSharp.AstNode node;
 			int items = 0;
-			if (ResolveCommandHandler.ResolveAt (document, out resolveResult, out node)) {
-				var possibleNamespaces = MonoDevelop.Refactoring.ResolveCommandHandler.GetPossibleNamespaces (
-					document,
-					node,
-					ref resolveResult
-				);
-
-				foreach (var t in possibleNamespaces.Where (tp => tp.OnlyAddReference)) {
-					menu.Add (new FixMenuEntry (t.GetImportText (), delegate {
-						new ResolveCommandHandler.AddImport (document, resolveResult, null, t.Reference, true, node).Run ();
-					}));
-					items++;
-				}
 
-				bool addUsing = !(resolveResult is AmbiguousTypeResolveResult);
-				if (addUsing) {
-					foreach (var t in possibleNamespaces.Where (tp => tp.IsAccessibleWithGlobalUsing)) {
-						string ns = t.Namespace;
-						var reference = t.Reference;
-						menu.Add (new FixMenuEntry (t.GetImportText (), 
-							delegate {
-								new ResolveCommandHandler.AddImport (document, resolveResult, ns, reference, true, node).Run ();
-							})
-						);
-						items++;
-					}
-				}
+			//			if (AddPossibleNamespace != null) {
+			//				AddPossibleNamespace (Editor, DocumentContext, menu);
+			//				items = menu.Items.Count;
+			//			}
 
-				bool resolveDirect = !(resolveResult is UnknownMemberResolveResult);
-				if (resolveDirect) {
-					foreach (var t in possibleNamespaces) {
-						string ns = t.Namespace;
-						var reference = t.Reference;
-						menu.Add (new FixMenuEntry (t.GetInsertNamespaceText (document.Editor.GetTextBetween (node.StartLocation, node.EndLocation)),
-							delegate {
-							new ResolveCommandHandler.AddImport (document, resolveResult, ns, reference, false, node).Run ();
-						}));
-						items++;
-					}
-				}
-
-				if (menu.Items.Any () && Fixes.Any ()) {
-					fixMenu = new FixMenuDescriptor (GettextCatalog.GetString ("Quick Fixes"));
-					menu.Add (fixMenu);
-					items++;
-				}
-			}
 			PopulateFixes (fixMenu, ref items);
+
 			if (items == 0) {
 				return;
 			}
-			document.Editor.SuppressTooltips = true;
-			document.Editor.Parent.HideTooltip ();
+			Editor.SuppressTooltips = true;
 			if (menuAction != null)
 				menuAction (menu);
-			var container = document.Editor.Parent;
 
-			var p = container.LocationToPoint (currentSmartTagBegin);
+			var p = Editor.LocationToPoint (Editor.OffsetToLocation (currentSmartTagBegin));
+			Gtk.Widget widget = Editor;
 			var rect = new Gdk.Rectangle (
-				p.X + container.Allocation.X , 
-				p.Y + (int)document.Editor.LineHeight + container.Allocation.Y, 0, 0);
+				(int)p.X + widget.Allocation.X,
+				(int)p.Y + widget.Allocation.Y, 0, 0);
 
-			ShowFixesMenu (document.Editor.Parent, rect, menu);
+			ShowFixesMenu (widget, rect, menu);
 		}
 
-		#if MAC
-		class ClosingMenuDelegate : AppKit.NSMenuDelegate
-		{
-			readonly TextEditorData data;
-
-			public ClosingMenuDelegate (TextEditorData editor_data)
-			{
-				data = editor_data;
-			}
-
-			public override void MenuWillHighlightItem (AppKit.NSMenu menu, AppKit.NSMenuItem item)
-			{
-			}
-
-			public override void MenuDidClose (AppKit.NSMenu menu)
-			{
-				data.SuppressTooltips = false;
-			}
-		}
-		#endif
-
 		bool ShowFixesMenu (Gtk.Widget parent, Gdk.Rectangle evt, FixMenuDescriptor entrySet)
 		{
-			if (parent == null || parent.GdkWindow == null)
+			if (parent == null || parent.GdkWindow == null) {
+				Editor.SuppressTooltips = false;
 				return true;
+			}
+
 			try {
-				#if MAC
 				parent.GrabFocus ();
 				int x, y;
 				x = (int)evt.X;
 				y = (int)evt.Y;
+
 				// Explicitly release the grab because the menu is shown on the mouse position, and the widget doesn't get the mouse release event
 				Gdk.Pointer.Ungrab (Gtk.Global.CurrentEventTime);
-				var menu = CreateNSMenu (entrySet);
-				menu.Delegate = new ClosingMenuDelegate (document.Editor);
-				var nsview = MonoDevelop.Components.Mac.GtkMacInterop.GetNSView (parent);
-				var toplevel = parent.Toplevel as Gtk.Window;
-				int trans_x, trans_y;
-				parent.TranslateCoordinates (toplevel, (int)x, (int)y, out trans_x, out trans_y);
-
-				// Window coordinates in gtk are the same for cocoa, with the exception of the Y coordinate, that has to be flipped.
-				var pt = new CoreGraphics.CGPoint ((float)trans_x, (float)trans_y);
-				int w,h;
-				toplevel.GetSize (out w, out h);
-				pt.Y = h - pt.Y;
-
-				var tmp_event = AppKit.NSEvent.MouseEvent (AppKit.NSEventType.LeftMouseDown,
-				pt,
-				0, 0,
-				MonoDevelop.Components.Mac.GtkMacInterop.GetNSWindow (toplevel).WindowNumber,
-				null, 0, 0, 0);
-
-				AppKit.NSMenu.PopUpContextMenu (menu, tmp_event, nsview);
-				#else
-				var menu = CreateGtkMenu (entrySet);
-				menu.Events |= Gdk.EventMask.AllEventsMask;
-				menu.SelectFirst (true);
-
-				menu.Hidden += delegate {
-					document.Editor.SuppressTooltips = false;
-				};
-				menu.ShowAll ();
-				menu.SelectFirst (true);
-				menu.MotionNotifyEvent += (o, args) => {
-					if (args.Event.Window == Editor.Parent.TextArea.GdkWindow) {
-						StartMenuCloseTimer ();
-					} else {
-						CancelMenuCloseTimer ();
-					}
-				};
 
-				GtkWorkarounds.ShowContextMenu (menu, parent, null, evt);
-				#endif
+				var menu = CreateContextMenu (entrySet);
+				menu.Show (parent, x, y, () => Editor.SuppressTooltips = false, true);
 			} catch (Exception ex) {
 				LoggingService.LogError ("Error while context menu popup.", ex);
 			}
 			return true;
 		}
-		#if MAC
 
-		AppKit.NSMenu CreateNSMenu (FixMenuDescriptor entrySet)
+		ContextMenu CreateContextMenu (FixMenuDescriptor entrySet)
 		{
-			var menu = new AppKit.NSMenu ();
+			var menu = new ContextMenu ();
+
 			foreach (var item in entrySet.Items) {
 				if (item == FixMenuEntry.Separator) {
-					menu.AddItem (AppKit.NSMenuItem.SeparatorItem);
+					menu.Items.Add (new SeparatorContextMenuItem ());
 					continue;
 				}
+
+				var menuItem = new ContextMenuItem (item.Label);
+				menuItem.Context = item.Action;
 				var subMenu = item as FixMenuDescriptor;
 				if (subMenu != null) {
-					var gtkSubMenu = new AppKit.NSMenuItem (item.Label.Replace ("_", ""));
-					gtkSubMenu.Submenu = CreateNSMenu (subMenu);
-					menu.AddItem (gtkSubMenu); 
-					continue;
+					menuItem.SubMenu = CreateContextMenu (subMenu);
+				} else {
+					menuItem.Clicked += (object sender, ContextMenuItemClickedEventArgs e) => ((System.Action)((ContextMenuItem)sender).Context) ();
 				}
-				var menuItem = new AppKit.NSMenuItem (item.Label.Replace ("_", ""));
-				menuItem.Activated += delegate {
-					item.Action ();
-				};
-				menu.AddItem (menuItem); 
+				menu.Items.Add (menuItem);
 			}
+
 			return menu;
 		}
-		#endif
 
-		static Menu CreateGtkMenu (FixMenuDescriptor entrySet)
+		static string CreateLabel (string title, ref int mnemonic)
 		{
-			var menu = new Menu ();
-			foreach (var item in entrySet.Items) {
-				if (item == FixMenuEntry.Separator) {
-					menu.Add (new SeparatorMenuItem ()); 
-					continue;
-				}
-				var subMenu = item as FixMenuDescriptor;
-				if (subMenu != null) {
-					var gtkSubMenu = new Gtk.MenuItem (item.Label);
-					gtkSubMenu.Submenu = CreateGtkMenu (subMenu);
-					menu.Add (gtkSubMenu); 
-					continue;
-				}
-				var menuItem = new Gtk.MenuItem (item.Label);
-				menuItem.Activated += delegate {
-					item.Action ();
-				};
-				menu.Add (menuItem); 
+			var escapedLabel = title.Replace ("_", "__");
+#if MAC
+			return escapedLabel;
+#else
+			return (mnemonic <= 10) ? "_" + mnemonic++ % 10 + " \u2013 " + escapedLabel : "  " + escapedLabel;
+#endif
+		}
+
+		internal class FixAllDiagnosticProvider : FixAllContext.DiagnosticProvider
+		{
+			private readonly ImmutableHashSet<string> _diagnosticIds;
+
+			/// <summary>
+			/// Delegate to fetch diagnostics for any given document within the given fix all scope.
+			/// This delegate is invoked by <see cref="GetDocumentDiagnosticsAsync(Document, CancellationToken)"/> with the given <see cref="_diagnosticIds"/> as arguments.
+			/// </summary>
+			private readonly Func<Microsoft.CodeAnalysis.Document, ImmutableHashSet<string>, CancellationToken, Task<IEnumerable<Diagnostic>>> _getDocumentDiagnosticsAsync;
+
+			/// <summary>
+			/// Delegate to fetch diagnostics for any given project within the given fix all scope.
+			/// This delegate is invoked by <see cref="GetProjectDiagnosticsAsync(Project, CancellationToken)"/> and <see cref="GetAllDiagnosticsAsync(Project, CancellationToken)"/>
+			/// with the given <see cref="_diagnosticIds"/> as arguments.
+			/// The boolean argument to the delegate indicates whether or not to return location-based diagnostics, i.e.
+			/// (a) False => Return only diagnostics with <see cref="Location.None"/>.
+			/// (b) True => Return all project diagnostics, regardless of whether or not they have a location.
+			/// </summary>
+			private readonly Func<Project, bool, ImmutableHashSet<string>, CancellationToken, Task<IEnumerable<Diagnostic>>> _getProjectDiagnosticsAsync;
+
+			public FixAllDiagnosticProvider (
+				ImmutableHashSet<string> diagnosticIds,
+				Func<Microsoft.CodeAnalysis.Document, ImmutableHashSet<string>, CancellationToken, Task<IEnumerable<Diagnostic>>> getDocumentDiagnosticsAsync,
+				Func<Project, bool, ImmutableHashSet<string>, CancellationToken, Task<IEnumerable<Diagnostic>>> getProjectDiagnosticsAsync)
+			{
+				_diagnosticIds = diagnosticIds;
+				_getDocumentDiagnosticsAsync = getDocumentDiagnosticsAsync;
+				_getProjectDiagnosticsAsync = getProjectDiagnosticsAsync;
+			}
+
+			public override Task<IEnumerable<Diagnostic>> GetDocumentDiagnosticsAsync (Microsoft.CodeAnalysis.Document document, CancellationToken cancellationToken)
+			{
+				return _getDocumentDiagnosticsAsync (document, _diagnosticIds, cancellationToken);
+			}
+
+			public override Task<IEnumerable<Diagnostic>> GetAllDiagnosticsAsync (Project project, CancellationToken cancellationToken)
+			{
+				return _getProjectDiagnosticsAsync (project, true, _diagnosticIds, cancellationToken);
+			}
+
+			public override Task<IEnumerable<Diagnostic>> GetProjectDiagnosticsAsync (Project project, CancellationToken cancellationToken)
+			{
+				return _getProjectDiagnosticsAsync (project, false, _diagnosticIds, cancellationToken);
 			}
-			return menu;
 		}
 
 		void PopulateFixes (FixMenuDescriptor menu, ref int items)
 		{
-			if (!RefactoringService.ShowFixes)
-				return;
 			int mnemonic = 1;
 			bool gotImportantFix = false, addedSeparator = false;
-			var fixesAdded = new List<string> ();
-			foreach (var fix_ in Fixes.OrderByDescending (i => Tuple.Create (IsAnalysisOrErrorFix(i), (int)i.Severity, GetUsage (i.IdString)))) {
+			foreach (var fix_ in GetCurrentFixes ().CodeFixActions.OrderByDescending (i => Tuple.Create (IsAnalysisOrErrorFix (i.CodeAction), (int)0, GetUsage (i.CodeAction.EquivalenceKey)))) {
 				// filter out code actions that are already resolutions of a code issue
-				if (fixesAdded.Any (f => fix_.IdString.IndexOf (f, StringComparison.Ordinal) >= 0))
-					continue;
-				fixesAdded.Add (fix_.IdString);
-				if (IsAnalysisOrErrorFix (fix_))
+				if (IsAnalysisOrErrorFix (fix_.CodeAction))
 					gotImportantFix = true;
-				if (!addedSeparator && gotImportantFix && !IsAnalysisOrErrorFix(fix_)) {
+				if (!addedSeparator && gotImportantFix && !IsAnalysisOrErrorFix (fix_.CodeAction)) {
 					menu.Add (FixMenuEntry.Separator);
 					addedSeparator = true;
 				}
 
 				var fix = fix_;
-				var escapedLabel = fix.Title.Replace ("_", "__");
-				var label = (mnemonic <= 10)
-					? "_" + (mnemonic++ % 10).ToString () + " " + escapedLabel
-					: "  " + escapedLabel;
-				var thisInstanceMenuItem = new FixMenuEntry (label, delegate {
-					new ContextActionRunner (fix, document, currentSmartTagBegin).Run (null, EventArgs.Empty);
-					ConfirmUsage (fix.IdString);
+				var label = CreateLabel (fix.CodeAction.Title, ref mnemonic);
+				var thisInstanceMenuItem = new FixMenuEntry (label,async delegate {
+					await new ContextActionRunner (fix.CodeAction, Editor, DocumentContext).Run ();
+					ConfirmUsage (fix.CodeAction.EquivalenceKey);
 				});
 				menu.Add (thisInstanceMenuItem);
 				items++;
 			}
 
 			bool first = true;
-			var settingsMenuFixes = Fixes
-				.OfType<AnalysisContextActionProvider.AnalysisCodeAction> ()
-				.Where (f => f.Result is InspectorResults)
-				.GroupBy (f => ((InspectorResults)f.Result).Inspector);
-			foreach (var analysisFixGroup_ in settingsMenuFixes) {
-				var analysisFixGroup = analysisFixGroup_;
-				var arbitraryFixInGroup = analysisFixGroup.First ();
-				var ir = (InspectorResults)arbitraryFixInGroup.Result;
+			foreach (var fix in GetCurrentFixes ().CodeRefactoringActions) {
+				if (first) {
+					if (items > 0)
+						menu.Add (FixMenuEntry.Separator);
+					first = false;
+				}
+
+				var label = CreateLabel (fix.CodeAction.Title, ref mnemonic);
+				var thisInstanceMenuItem = new FixMenuEntry (label, async delegate {
+					await new ContextActionRunner (fix.CodeAction, Editor, DocumentContext).Run ();
+					ConfirmUsage (fix.CodeAction.EquivalenceKey);
+				});
+				menu.Add (thisInstanceMenuItem);
+				items++;
+			}
+
+			first = false;
 
+			var warningsAtCaret = (DocumentContext.AnalysisDocument.GetSemanticModelAsync ().Result)
+				.GetDiagnostics (new TextSpan (Editor.CaretOffset, 0))
+				.Where (diag => diag.Severity == DiagnosticSeverity.Warning).ToList ();
+			
+			foreach (var warning in warningsAtCaret) {
+				var label = GettextCatalog.GetString ("_Options for \"{0}\"", warning.Descriptor.Title);
+				var subMenu = new FixMenuDescriptor (label);
 				if (first) {
 					menu.Add (FixMenuEntry.Separator);
 					first = false;
 				}
+				var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with #pragma"),
+				 	async delegate {
+						var fixes = await CSharpSuppressionFixProvider.Instance.GetSuppressionsAsync (DocumentContext.AnalysisDocument, new TextSpan (Editor.CaretOffset, 0), new [] { warning }, default (CancellationToken)).ConfigureAwait (false);
+					 	foreach (var f in fixes) {
+							CodeDiagnosticDescriptor.RunAction (DocumentContext, f.Action, default (CancellationToken));
+					 	}
+				 	}
+				);
+				subMenu.Add (menuItem);
+				menu.Add (subMenu);
+				items++;
+			}
 
-				var subMenu = new FixMenuDescriptor ();
-				foreach (var analysisFix_ in analysisFixGroup) {
-					var analysisFix = analysisFix_;
-					if (analysisFix.SupportsBatchRunning) {
-						var batchRunMenuItem = new FixMenuEntry (
-							string.Format (GettextCatalog.GetString ("Apply in file: {0}"), analysisFix.Title), 
-							delegate {
-								ConfirmUsage (analysisFix.IdString);
-								new ContextActionRunner (analysisFix, document, this.currentSmartTagBegin).BatchRun (null, EventArgs.Empty);
-							}
-						);
-						subMenu.Add (batchRunMenuItem);
-						subMenu.Add (FixMenuEntry.Separator);
-					}
-				}
+			foreach (var fix_ in GetCurrentFixes ().DiagnosticsAtCaret) {
+				var fix = fix_;
+				var label = GettextCatalog.GetString ("_Options for \"{0}\"", fix.GetMessage ());
+				var subMenu = new FixMenuDescriptor (label);
 
-				var inspector = ir.Inspector;
-				if (inspector.CanSuppressWithAttribute) {
-					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with attribute"),
-						delegate {
-							inspector.SuppressWithAttribute (document, arbitraryFixInGroup.DocumentRegion); 
-						});
-					subMenu.Add (menuItem);
+				CodeDiagnosticDescriptor descriptor = BuiltInCodeDiagnosticProvider.GetCodeDiagnosticDescriptor (fix.Id);
+				if (descriptor == null)
+					continue;
+				if (first) {
+					menu.Add (FixMenuEntry.Separator);
+					first = false;
 				}
-
-				if (inspector.CanDisableWithPragma) {
+				//				if (inspector.CanSuppressWithAttribute) {
+				//					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with attribute"),
+				//						delegate {
+				//							
+				//							inspector.SuppressWithAttribute (Editor, DocumentContext, GetTextSpan (fix.Item2)); 
+				//						});
+				//					subMenu.Add (menuItem);
+				//				}
+
+				if (descriptor.CanDisableWithPragma) {
 					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with #pragma"),
-						delegate {
-							inspector.DisableWithPragma (document, arbitraryFixInGroup.DocumentRegion); 
-						});
+													 delegate {
+														 descriptor.DisableWithPragma (Editor, DocumentContext, fix);
+													 });
 					subMenu.Add (menuItem);
-				}
-
-				if (inspector.CanDisableOnce) {
-					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Disable Once"),
+					menuItem = new FixMenuEntry (GettextCatalog.GetString ("_Suppress with file"),
 						delegate {
-							inspector.DisableOnce (document, arbitraryFixInGroup.DocumentRegion); 
+							descriptor.DisableWithFile (Editor, DocumentContext, fix);
 						});
 					subMenu.Add (menuItem);
 				}
-
-				if (inspector.CanDisableAndRestore) {
-					var menuItem = new FixMenuEntry (GettextCatalog.GetString ("Disable _and Restore"),
-						delegate {
-							inspector.DisableAndRestore (document, arbitraryFixInGroup.DocumentRegion); 
-						});
-					subMenu.Add (menuItem);
-				}
-				var label = GettextCatalog.GetString ("_Options for \"{0}\"", InspectorResults.GetTitle (ir.Inspector));
-				var subMenuItem = new FixMenuDescriptor (label);
-
 				var optionsMenuItem = new FixMenuEntry (GettextCatalog.GetString ("_Configure Rule"),
 					delegate {
-						arbitraryFixInGroup.ShowOptions (null, EventArgs.Empty);
+						IdeApp.Workbench.ShowGlobalPreferencesDialog (null, "C#", dialog => {
+							var panel = dialog.GetPanel<CodeIssuePanel> ("C#");
+							if (panel == null)
+								return;
+							panel.Widget.SelectCodeIssue (descriptor.IdString);
+						});
 					});
-				subMenuItem.Add (optionsMenuItem);
+				subMenu.Add (optionsMenuItem);
+
+
+				foreach (var fix2 in GetCurrentFixes ().CodeFixActions.OrderByDescending (i => Tuple.Create (IsAnalysisOrErrorFix (i.CodeAction), (int)0, GetUsage (i.CodeAction.EquivalenceKey)))) {
+
+					var provider = fix2.Diagnostic.GetCodeFixProvider ().GetFixAllProvider ();
+					if (provider == null)
+						continue;
+					if (!provider.GetSupportedFixAllScopes ().Contains (FixAllScope.Document))
+						continue;
+					var subMenu2 = new FixMenuDescriptor (GettextCatalog.GetString ("Fix all"));
+					var diagnosticAnalyzer = fix2.Diagnostic.GetCodeDiagnosticDescriptor (LanguageNames.CSharp).GetProvider ();
+					if (!diagnosticAnalyzer.SupportedDiagnostics.Contains (fix.Descriptor))
+						continue;
+
+					var menuItem = new FixMenuEntry (
+						GettextCatalog.GetString ("In _Document"),
+						async delegate {
+							var fixAllDiagnosticProvider = new FixAllDiagnosticProvider (diagnosticAnalyzer.SupportedDiagnostics.Select (d => d.Id).ToImmutableHashSet (), async (Microsoft.CodeAnalysis.Document doc, ImmutableHashSet<string> diagnostics, CancellationToken token) => {
+
+								var model = await doc.GetSemanticModelAsync (token);
+								var compilationWithAnalyzer = model.Compilation.WithAnalyzers (new [] { diagnosticAnalyzer }.ToImmutableArray (), null, token);
+
+								return await compilationWithAnalyzer.GetAnalyzerSemanticDiagnosticsAsync (model, null, token);
+							}, (Project arg1, bool arg2, ImmutableHashSet<string> arg3, CancellationToken arg4) => {
+								return Task.FromResult ((IEnumerable<Diagnostic>)new Diagnostic [] { });
+							});
+							var ctx = new FixAllContext (
+								this.DocumentContext.AnalysisDocument,
+								fix2.Diagnostic.GetCodeFixProvider (),
+								FixAllScope.Document,
+								fix2.CodeAction.EquivalenceKey,
+								diagnosticAnalyzer.SupportedDiagnostics.Select (d => d.Id),
+								fixAllDiagnosticProvider,
+								default (CancellationToken)
+							);
+							var fixAll = await provider.GetFixAsync (ctx);
+							using (var undo = Editor.OpenUndoGroup ()) {
+								CodeDiagnosticDescriptor.RunAction (DocumentContext, fixAll, default (CancellationToken));
+							}
+						});
+					subMenu2.Add (menuItem);
+					subMenu.Add (FixMenuEntry.Separator);
+					subMenu.Add (subMenu2);
+				}
 
-				menu.Add (subMenuItem);
+				menu.Add (subMenu);
 				items++;
 			}
 		}
 
-
-		class ContextActionRunner
+		internal class ContextActionRunner
 		{
-			CodeAction act;
-			Document document;
-			TextLocation loc;
+			readonly CodeAction act;
+			TextEditor editor;
+			DocumentContext documentContext;
 
-			public ContextActionRunner (MonoDevelop.CodeActions.CodeAction act, MonoDevelop.Ide.Gui.Document document, ICSharpCode.NRefactory.TextLocation loc)
+			public ContextActionRunner (CodeAction act, TextEditor editor, DocumentContext documentContext)
 			{
+				this.editor = editor;
 				this.act = act;
-				this.document = document;
-				this.loc = loc;
+				this.documentContext = documentContext;
 			}
 
-			public void Run (object sender, EventArgs e)
+			public async Task Run ()
 			{
-				var context = document.ParsedDocument.CreateRefactoringContext (document, CancellationToken.None);
-				RefactoringService.ApplyFix (act, context);
-			}
-
-			public void BatchRun (object sender, EventArgs e)
-			{
-				act.BatchRun (document, loc);
-			}
-		}
-
-		class SmartTagMarker : TextSegmentMarker, IActionTextLineMarker
-		{
-			CodeActionEditorExtension codeActionEditorExtension;
-			internal List<CodeAction> fixes;
-			DocumentLocation loc;
-
-			public SmartTagMarker (int offset, CodeActionEditorExtension codeActionEditorExtension, List<CodeAction> fixes, DocumentLocation loc) : base (offset, 0)
-			{
-				this.codeActionEditorExtension = codeActionEditorExtension;
-				this.fixes = fixes;
-				this.loc = loc;
-			}
-
-			public SmartTagMarker (int offset) : base (offset, 0)
-			{
-			}
-			const double tagMarkerWidth = 8;
-			const double tagMarkerHeight = 2;
-			public override void Draw (TextEditor editor, Cairo.Context cr, Pango.Layout layout, bool selected, int startOffset, int endOffset, double y, double startXPos, double endXPos)
-			{
-				var line = editor.GetLine (loc.Line);
-				var x = editor.ColumnToX (line, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.XOffset + editor.TextViewMargin.TextStartPosition;
+				var token = default (CancellationToken);
+				var insertionAction = act as InsertionAction;
+				if (insertionAction != null) {
+					var insertion = await insertionAction.CreateInsertion (token).ConfigureAwait (false);
+
+					var document = await IdeApp.Workbench.OpenDocument (insertion.Location.SourceTree.FilePath, documentContext.Project);
+					var parsedDocument = await document.UpdateParseDocument ();
+					if (parsedDocument != null) {
+						var insertionPoints = InsertionPointService.GetInsertionPoints (
+							document.Editor,
+							parsedDocument,
+							insertion.Type,
+							insertion.Location.SourceSpan.Start
+						);
 
-				cr.Rectangle (Math.Floor (x) + 0.5, Math.Floor (y) + 0.5 + (line == editor.GetLineByOffset (startOffset) ? editor.LineHeight - tagMarkerHeight - 1 : 0), tagMarkerWidth * cr.LineWidth, tagMarkerHeight * cr.LineWidth);
+						var options = new InsertionModeOptions (
+							insertionAction.Title,
+							insertionPoints,
+							point => {
+								if (!point.Success)
+									return;
+								var node = Formatter.Format (insertion.Node, TypeSystemService.Workspace, document.GetOptionSet (), token);
+								point.InsertionPoint.Insert (document.Editor, document, node.ToString ());
+								// document = await Simplifier.ReduceAsync(document.AnalysisDocument, Simplifier.Annotation, cancellationToken: token).ConfigureAwait(false);
+							}
+						);
 
-				if (HslColor.Brightness (editor.ColorStyle.PlainText.Background) < 0.5) {
-					cr.SetSourceRGBA (0.8, 0.8, 1, 0.9);
-				} else {
-					cr.SetSourceRGBA (0.2, 0.2, 1, 0.9);
+						document.Editor.StartInsertionMode (options);
+						return;
+					}
 				}
-				cr.Stroke ();
-			}
 
-			#region IActionTextLineMarker implementation
-
-			bool IActionTextLineMarker.MousePressed (TextEditor editor, MarginMouseEventArgs args)
-			{
-				return false;
+				var oldSolution = documentContext.AnalysisDocument.Project.Solution;
+				var updatedSolution = oldSolution;
+				if (RefactoringService.OptionSetCreation != null)
+					documentContext.RoslynWorkspace.Options = RefactoringService.OptionSetCreation (editor, documentContext);
+				using (var undo = editor.OpenUndoGroup ()) {
+					foreach (var operation in act.GetOperationsAsync (token).Result) {
+						var applyChanges = operation as ApplyChangesOperation;
+						if (applyChanges == null) {
+							operation.Apply (documentContext.RoslynWorkspace, token);
+							continue;
+						}
+						if (updatedSolution == oldSolution) {
+							updatedSolution = applyChanges.ChangedSolution;
+						}
+						operation.Apply (documentContext.RoslynWorkspace, token);
+					}
+				}
+				await TryStartRenameSession (documentContext.RoslynWorkspace, oldSolution, updatedSolution, token);
 			}
 
-			void IActionTextLineMarker.MouseHover (TextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result)
+			static IEnumerable<DocumentId> GetChangedDocuments (Solution newSolution, Solution oldSolution)
 			{
-				if (args.Button != 0)
-					return;
-				var line = editor.GetLine (loc.Line);
-				if (line == null)
-					return;
-				var x = editor.ColumnToX (line, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.TextStartPosition;
-				var y = editor.LineToY (line.LineNumber + 1) - editor.VAdjustment.Value;
-				const double xAdditionalSpace = tagMarkerWidth;
-				if (args.X - x >= -xAdditionalSpace * editor.Options.Zoom && 
-					args.X - x < (tagMarkerWidth + xAdditionalSpace) * editor.Options.Zoom /*&& 
-				    args.Y - y < (editor.LineHeight / 2) * editor.Options.Zoom*/) {
-					result.Cursor = null;
-					Popup ();
-				} else {
-					codeActionEditorExtension.CancelSmartTagPopupTimeout ();
+				if (newSolution != null) {
+					var solutionChanges = newSolution.GetChanges (oldSolution);
+					foreach (var projectChanges in solutionChanges.GetProjectChanges ()) {
+						foreach (var documentId in projectChanges.GetChangedDocuments ()) {
+							yield return documentId;
+						}
+					}
 				}
 			}
 
-			public void Popup ()
+			async Task TryStartRenameSession (Workspace workspace, Solution oldSolution, Solution newSolution, CancellationToken cancellationToken)
 			{
-				codeActionEditorExtension.smartTagPopupTimeoutId = GLib.Timeout.Add (menuTimeout, delegate {
-					codeActionEditorExtension.PopupQuickFixMenu (null, menu => {
-						codeActionEditorExtension.codeActionMenu = menu;
-					});
-					codeActionEditorExtension.smartTagPopupTimeoutId = 0;
-					return false;
-				});
+				var changedDocuments = GetChangedDocuments (newSolution, oldSolution);
+				foreach (var documentId in changedDocuments) {
+					var document = newSolution.GetDocument (documentId);
+					var root = await document.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+					SyntaxToken? renameTokenOpt = root.GetAnnotatedNodesAndTokens (RenameAnnotation.Kind)
+													  .Where (s => s.IsToken)
+													  .Select (s => s.AsToken ())
+													  .Cast<SyntaxToken?> ()
+													  .FirstOrDefault ();
+					if (renameTokenOpt.HasValue) {
+						var latestDocument = workspace.CurrentSolution.GetDocument (documentId);
+						var latestModel = await latestDocument.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+						var latestRoot = await latestDocument.GetSyntaxRootAsync (cancellationToken).ConfigureAwait (false);
+						await Runtime.RunInMainThread (async delegate {
+							try {
+								var node = latestRoot.FindNode (renameTokenOpt.Value.Parent.Span, false, false);
+								if (node == null)
+									return;
+								var info = latestModel.GetSymbolInfo (node);
+								var sym = info.Symbol ?? latestModel.GetDeclaredSymbol (node);
+								if (sym != null)
+									await new MonoDevelop.Refactoring.Rename.RenameRefactoring ().Rename (sym);
+							} catch (Exception ex) {
+								LoggingService.LogError ("Error while renaming " + renameTokenOpt.Value.Parent, ex);
+							}
+						});
+						return;
+					}
+				}
 			}
-
-
-			#endregion
 		}
 
-		SmartTagMarker currentSmartTag;
-		DocumentLocation currentSmartTagBegin;
-		void CreateSmartTag (List<CodeAction> fixes, DocumentLocation loc)
+		ISmartTagMarker currentSmartTag;
+		int currentSmartTagBegin;
+
+		void CreateSmartTag (CodeActionContainer fixes, int offset)
 		{
-			Fixes = fixes;
-			if (!QuickTaskStrip.EnableFancyFeatures) {
+			if (!AnalysisOptions.EnableFancyFeatures || fixes.IsEmpty) {
 				RemoveWidget ();
 				return;
 			}
-			var editor = document.Editor;
-			if (editor == null || editor.Parent == null || !editor.Parent.IsRealized) {
+			var editor = Editor;
+			if (editor == null) {
 				RemoveWidget ();
 				return;
 			}
-			if (document.ParsedDocument == null || document.ParsedDocument.IsInvalid) {
+			if (DocumentContext.ParsedDocument == null || DocumentContext.ParsedDocument.IsInvalid) {
 				RemoveWidget ();
 				return;
 			}
 
-			var container = editor.Parent;
-			if (container == null) {
-				RemoveWidget ();
-				return;
-			}
+			//			var container = editor.Parent;
+			//			if (container == null) {
+			//				RemoveWidget ();
+			//				return;
+			//			}
 			bool first = true;
-			DocumentLocation smartTagLocBegin = loc;
-			foreach (var fix in fixes) {
-				if (fix.DocumentRegion.IsEmpty)
+			var smartTagLocBegin = offset;
+			foreach (var fix in fixes.CodeFixActions.Concat (fixes.CodeRefactoringActions)) {
+				var textSpan = fix.ValidSegment;
+				if (textSpan.IsEmpty)
 					continue;
-				if (first || loc < fix.DocumentRegion.Begin) {
-					smartTagLocBegin = fix.DocumentRegion.Begin;
+				if (first || offset < textSpan.Start) {
+					smartTagLocBegin = textSpan.Start;
 				}
 				first = false;
 			}
-			if (smartTagLocBegin.Line != loc.Line)
-				smartTagLocBegin = new DocumentLocation (loc.Line, 1);
+			//			if (smartTagLocBegin.Line != loc.Line)
+			//				smartTagLocBegin = new DocumentLocation (loc.Line, 1);
 			// got no fix location -> try to search word start
-			if (first) {
-				int offset = document.Editor.LocationToOffset (smartTagLocBegin);
-				while (offset > 0) {
-					char ch = document.Editor.GetCharAt (offset - 1);
-					if (!char.IsLetterOrDigit (ch) && ch != '_')
-						break;
-					offset--;
-				}
-				smartTagLocBegin = document.Editor.OffsetToLocation (offset);
-			}
+			//			if (first) {
+			//				int offset = document.Editor.LocationToOffset (smartTagLocBegin);
+			//				while (offset > 0) {
+			//					char ch = document.Editor.GetCharAt (offset - 1);
+			//					if (!char.IsLetterOrDigit (ch) && ch != '_')
+			//						break;
+			//					offset--;
+			//				}
+			//				smartTagLocBegin = document.Editor.OffsetToLocation (offset);
+			//			}
 
 			if (currentSmartTag != null && currentSmartTagBegin == smartTagLocBegin) {
-				currentSmartTag.fixes = fixes;
 				return;
 			}
 			RemoveWidget ();
 			currentSmartTagBegin = smartTagLocBegin;
-			var line = document.Editor.GetLine (smartTagLocBegin.Line);
-			currentSmartTag = new SmartTagMarker ((line.NextLine ?? line).Offset, this, fixes, smartTagLocBegin);
-			document.Editor.Document.AddMarker (currentSmartTag);
+			var realLoc = Editor.OffsetToLocation (smartTagLocBegin);
+
+			currentSmartTag = TextMarkerFactory.CreateSmartTagMarker (Editor, smartTagLocBegin, realLoc);
+			currentSmartTag.CancelPopup += CurrentSmartTag_CancelPopup;
+			currentSmartTag.ShowPopup += CurrentSmartTag_ShowPopup;
+			currentSmartTag.Tag = fixes;
+			currentSmartTag.IsVisible = fixes.CodeFixActions.Count > 0;
+			editor.AddMarker (currentSmartTag);
 		}
-		
-		public override void Initialize ()
+
+		void CurrentSmartTag_ShowPopup (object sender, EventArgs e)
+		{
+			CurrentSmartTagPopup ();
+		}
+
+		void CurrentSmartTag_CancelPopup (object sender, EventArgs e)
+		{
+			CancelSmartTagPopupTimeout ();
+		}
+
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-			document.DocumentParsed += HandleDocumentDocumentParsed;
-			document.Editor.SelectionChanged += HandleSelectionChanged;
-			document.Editor.Parent.BeginHover += HandleBeginHover;
+			DocumentContext.DocumentParsed += HandleDocumentDocumentParsed;
+			Editor.SelectionChanged += HandleSelectionChanged;
+			Editor.MouseMoved += HandleBeginHover;
+			Editor.CaretPositionChanged += HandleCaretPositionChanged;
+			Editor.TextChanged += Editor_TextChanged;
+			Editor.EndAtomicUndoOperation += Editor_EndAtomicUndoOperation;
+		}
+
+		void Editor_EndAtomicUndoOperation (object sender, EventArgs e)
+		{
+			RemoveWidget ();
+			HandleCaretPositionChanged (null, EventArgs.Empty);
+		}
+
+		void Editor_TextChanged (object sender, MonoDevelop.Core.Text.TextChangeEventArgs e)
+		{
+			if (Editor.IsInAtomicUndo)
+				return;
+			RemoveWidget ();
+			HandleCaretPositionChanged (null, EventArgs.Empty);
 		}
 
 		void HandleBeginHover (object sender, EventArgs e)
@@ -725,43 +841,46 @@ namespace MonoDevelop.CodeActions
 
 		void HandleSelectionChanged (object sender, EventArgs e)
 		{
-			CursorPositionChanged ();
+			HandleCaretPositionChanged (null, EventArgs.Empty);
 		}
-		
+
 		void HandleDocumentDocumentParsed (object sender, EventArgs e)
 		{
-			CursorPositionChanged ();
+			HandleCaretPositionChanged (null, EventArgs.Empty);
 		}
-		
-		[CommandUpdateHandler(RefactoryCommands.QuickFix)]
-		public void UpdateQuickFixCommand (CommandInfo ci)
+
+		void CurrentSmartTagPopup ()
 		{
-			if (QuickTaskStrip.EnableFancyFeatures) {
-				ci.Enabled = currentSmartTag != null;
-			} else {
-				ci.Enabled = true;
-			}
+			CancelSmartTagPopupTimeout ();
+			smartTagPopupTimeoutId = GLib.Timeout.Add (menuTimeout, delegate {
+				PopupQuickFixMenu (null, menu => { });
+				smartTagPopupTimeoutId = 0;
+				return false;
+			});
 		}
-		
-		[CommandHandler(RefactoryCommands.QuickFix)]
+
+		[CommandHandler (RefactoryCommands.QuickFix)]
 		void OnQuickFixCommand ()
 		{
-			if (!QuickTaskStrip.EnableFancyFeatures) {
-				Fixes = RefactoringService.GetValidActions (Document, Document.Editor.Caret.Location);
-				currentSmartTagBegin = Document.Editor.Caret.Location;
-				PopupQuickFixMenu (null, null); 
-
+			if (!AnalysisOptions.EnableFancyFeatures || currentSmartTag == null) {
+				//Fixes = RefactoringService.GetValidActions (Editor, DocumentContext, Editor.CaretLocation).Result;
+				currentSmartTagBegin = Editor.CaretOffset;
+				PopupQuickFixMenu (null, null);
 				return;
 			}
-			if (currentSmartTag == null)
-				return;
-			currentSmartTag.Popup ();
+
+			CurrentSmartTagPopup ();
+		}
+
+		internal bool HasCurrentFixes {
+			get {
+				return smartTagTask != null && smartTagTask.IsCompleted;
+			}
 		}
 
-		static readonly List<CodeAction> emptyList = new List<CodeAction> ();
-		internal List<CodeAction> GetCurrentFixes ()
+		internal CodeActionContainer GetCurrentFixes ()
 		{
-			return currentSmartTag == null ? emptyList : currentSmartTag.fixes;
+			return smartTagTask == null ? CodeActionContainer.Empty : smartTagTask.Result;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs
index 66f132a1c5..7e89e64f47 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs
@@ -26,12 +26,14 @@
 using System;
 using MonoDevelop.Ide.Gui.Dialogs;
 using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using System.Linq;
 using System.Text;
 using MonoDevelop.Refactoring;
 using System.Collections.Generic;
 using GLib;
+using MonoDevelop.CodeIssues;
 
 namespace MonoDevelop.CodeActions
 {
@@ -39,7 +41,7 @@ namespace MonoDevelop.CodeActions
 	{
 		ContextActionPanelWidget widget;
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			return widget = new ContextActionPanelWidget ("text/x-csharp");
 		}
@@ -54,14 +56,14 @@ namespace MonoDevelop.CodeActions
 	{
 		readonly string mimeType;
 		
-		readonly TreeStore treeStore = new TreeStore (typeof(string), typeof(bool), typeof(CodeActionProvider), typeof(string));
-		readonly Dictionary<CodeActionProvider, bool> providerStates = new Dictionary<CodeActionProvider, bool> ();
+		readonly TreeStore treeStore = new TreeStore (typeof(string), typeof(bool), typeof(CodeRefactoringDescriptor));
+		readonly Dictionary<CodeRefactoringDescriptor, bool> providerStates = new Dictionary<CodeRefactoringDescriptor, bool> ();
 
 		void GetAllProviderStates ()
 		{
-			string disabledNodes = PropertyService.Get ("ContextActions." + mimeType, "");
-			foreach (var node in RefactoringService.ContextAddinNodes.Where (n => n.MimeType == mimeType)) {
-				providerStates [node] = disabledNodes.IndexOf (node.IdString, StringComparison.Ordinal) < 0;
+			var language = CodeRefactoringService.MimeTypeToLanguage (mimeType);
+			foreach (var node in BuiltInCodeDiagnosticProvider.GetBuiltInCodeRefactoringDescriptorsAsync (CodeRefactoringService.MimeTypeToLanguage(language), true).Result) {
+				providerStates [node] = node.IsEnabled;
 			}
 		}
 
@@ -94,7 +96,7 @@ namespace MonoDevelop.CodeActions
 				TreeIter iter;
 				if (!treeStore.GetIterFromString (out iter, args.Path)) 
 					return;
-				var provider = (CodeActionProvider)treeStore.GetValue (iter, 2);
+				var provider = (CodeRefactoringDescriptor)treeStore.GetValue (iter, 2);
 				providerStates [provider] = !providerStates [provider];
 				treeStore.SetValue (iter, 1, providerStates [provider]);
 			};
@@ -125,26 +127,20 @@ namespace MonoDevelop.CodeActions
 		{
 			treeStore.Clear ();
 			var sortedAndFiltered = providerStates.Keys
-				.Where (node => string.IsNullOrEmpty (filter) || node.Title.IndexOf (filter, StringComparison.OrdinalIgnoreCase) > 0)
-				.OrderBy (n => n.Title, StringComparer.Ordinal);
+				.Where (node => string.IsNullOrEmpty (filter) || node.Name.IndexOf (filter, StringComparison.OrdinalIgnoreCase) > 0)
+				.OrderBy (n => n.Name, StringComparer.Ordinal);
 			foreach (var node in sortedAndFiltered) {
-				var title = node.Title;
+				var title = node.Name;
 				MonoDevelop.CodeIssues.CodeIssuePanelWidget.MarkupSearchResult (filter, ref title);
-				treeStore.AppendValues (title, providerStates [node], node, node.Description);
+				treeStore.AppendValues (title, providerStates [node], node);
 			}
 		}
 
 		public void ApplyChanges ()
 		{
-			var sb = new StringBuilder ();
 			foreach (var kv in providerStates) {
-				if (kv.Value)
-					continue;
-				if (sb.Length > 0)
-					sb.Append (",");
-				sb.Append (kv.Key.IdString);
+				kv.Key.IsEnabled = kv.Value;
 			}
-			PropertyService.Set ("ContextActions." + mimeType, sb.ToString ());
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionProvider.cs
deleted file mode 100644
index 32c1c7d1ec..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionProvider.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// 
-// ContextActionProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using System.Threading;
-using System.Collections.Generic;
-using System;
-
-namespace MonoDevelop.CodeActions
-{
-	/// <summary>
-	/// A code action provider is a factory that creates code actions for a document at a given location.
-	/// Note: There is only one code action provider generated therfore providers need to be state less.
-	/// </summary>
-	public abstract class CodeActionProvider
-	{
-		/// <summary>
-		/// Gets or sets the type of the MIME the provider is attached to.
-		/// </summary>
-		public string MimeType { get; set; }
-
-		/// <summary>
-		/// Gets or sets the category of the provider (used in the option panel).
-		/// </summary>
-		public string Category { get; set; }
-
-		/// <summary>
-		/// Gets or sets the title of the provider (used in the option panel).
-		/// </summary>
-		public string Title { get; set; }
-		
-		/// <summary>
-		/// Gets or sets the description of the provider (used in the option panel).
-		/// </summary>
-		public string Description { get; set; }
-
-		/// <summary>
-		/// Gets the identifier string used as property ID tag.
-		/// </summary>
-		public virtual string IdString {
-			get {
-				return GetType ().FullName;
-			}
-		}
-
-		/// <summary>
-		/// Gets all the code actions in document at given location.
-		/// </summary>
-		public abstract IEnumerable<CodeAction> GetActions (MonoDevelop.Ide.Gui.Document document, object refactoringContext, TextLocation loc, CancellationToken cancellationToken);
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs
new file mode 100644
index 0000000000..aa46055a1f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringDescriptor.cs
@@ -0,0 +1,101 @@
+//
+// CodeActionDescriptor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using MonoDevelop.Core;
+using System.Linq;
+
+namespace MonoDevelop.CodeActions
+{
+	/// <summary>
+	/// This class wraps a roslyn ICodeRefactoringProvider and adds required meta data to it.
+	/// </summary>
+	class CodeRefactoringDescriptor
+	{
+		readonly Type codeActionType;
+		readonly ExportCodeRefactoringProviderAttribute attr;
+
+		CodeRefactoringProvider instance;
+
+		/// <summary>
+		/// Gets the identifier string.
+		/// </summary>
+		internal string IdString {
+			get {
+				return codeActionType.FullName;
+			}
+		}
+
+		/// <summary>
+		/// Gets the display name for this action.
+		/// </summary>
+		public string Name { get { return attr.Name; } }
+
+		/// <summary>
+		/// Gets the language for this action.
+		/// </summary>
+		public string Language { get { return attr.Languages.FirstOrDefault (); } }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether this code action is enabled by the user.
+		/// </summary>
+		/// <value><c>true</c> if this code action is enabled; otherwise, <c>false</c>.</value>
+		public bool IsEnabled {
+			get {
+				return PropertyService.Get ("CodeActions." + Language + "." + IdString, true);
+			}
+			set {
+				PropertyService.Set ("CodeActions." + Language + "." + IdString, value);
+			}
+		}
+
+		internal CodeRefactoringDescriptor (Type codeActionType, ExportCodeRefactoringProviderAttribute attr)
+		{
+			if (codeActionType == null)
+				throw new ArgumentNullException ("codeActionType");
+			if (attr == null)
+				throw new ArgumentNullException ("attr");
+			this.codeActionType = codeActionType;
+			this.attr = attr;
+		}
+
+		/// <summary>
+		/// Gets the roslyn code action provider.
+		/// </summary>
+		public CodeRefactoringProvider GetProvider ()
+		{
+			if (instance == null)
+				instance = (CodeRefactoringProvider)Activator.CreateInstance (codeActionType);
+			return instance;
+		}
+
+		public override string ToString ()
+		{
+			return string.Format ("[CodeActionDescriptor: IdString={0}, Name={1}, Language={2}]", IdString, Name, Language);
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs
new file mode 100644
index 0000000000..1c546dfc66
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeRefactoringService.cs
@@ -0,0 +1,164 @@
+//
+// CodeActionService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeIssues;
+using Mono.Addins;
+using RefactoringEssentials;
+using MonoDevelop.Core.Text;
+using System.Linq;
+
+namespace MonoDevelop.CodeActions
+{
+	static class CodeRefactoringService
+	{
+		readonly static List<CodeDiagnosticProvider> providers = new List<CodeDiagnosticProvider> ();
+
+		static CodeRefactoringService ()
+		{	
+			providers.Add (new BuiltInCodeDiagnosticProvider ());
+
+			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeDiagnosticProvider", delegate(object sender, ExtensionNodeEventArgs args) {
+				var node = (TypeExtensionNode)args.ExtensionNode;
+				switch (args.Change) {
+				case ExtensionChange.Add:
+					providers.Add ((CodeDiagnosticProvider)node.CreateInstance ());
+					break;
+				}
+			});
+		}
+
+		public async static Task<IEnumerable<CodeDiagnosticDescriptor>> GetCodeDiagnosticsAsync (DocumentContext documentContext, string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var result = new List<CodeDiagnosticDescriptor> ();
+
+			foreach (var provider in providers) {
+				if (cancellationToken.IsCancellationRequested)
+					return Enumerable.Empty<CodeDiagnosticDescriptor> ();
+				result.AddRange (await provider.GetCodeDiagnosticDescriptorsAsync (documentContext, language, cancellationToken).ConfigureAwait (false));
+			}
+			return result;
+		}
+
+		public async static Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetCodeFixesAsync (DocumentContext documentContext, string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var result = new List<CodeDiagnosticFixDescriptor> ();
+			foreach (var provider in providers) {
+				result.AddRange (await provider.GetCodeFixDescriptorsAsync (documentContext, language, cancellationToken).ConfigureAwait (false));
+			}
+			return result;
+		}
+
+		public async static Task<IEnumerable<CodeRefactoringDescriptor>> GetCodeRefactoringsAsync (DocumentContext documentContext, string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var result = new List<CodeRefactoringDescriptor> ();
+			foreach (var provider in providers) {
+				result.AddRange (await provider.GetCodeRefactoringDescriptorsAsync (documentContext, language, cancellationToken).ConfigureAwait (false));
+			}
+			return result;
+		}
+
+		static List<CodeRefactoringDescriptor> codeRefactoringCache;
+		public static async Task<IEnumerable<ValidCodeAction>> GetValidActionsAsync (TextEditor editor, DocumentContext doc, TextSpan span, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			var parsedDocument = doc.ParsedDocument;
+			var actions = new List<ValidCodeAction> ();
+			if (parsedDocument == null)
+				return actions;
+			var model = parsedDocument.GetAst<SemanticModel> ();
+			if (model == null)
+				return actions;
+			var root = await model.SyntaxTree.GetRootAsync(cancellationToken).ConfigureAwait (false);
+			if (span.End > root.Span.End)
+				return actions;
+			TextSpan tokenSegment = span;
+			var token = root.FindToken (span.Start);
+			if (!token.IsMissing)
+				tokenSegment = token.Span;
+			try {
+				if (codeRefactoringCache == null) {
+					codeRefactoringCache = (await GetCodeRefactoringsAsync (doc, MimeTypeToLanguage(editor.MimeType), cancellationToken).ConfigureAwait (false)).ToList ();
+				}
+				foreach (var descriptor in codeRefactoringCache) {
+					if (!descriptor.IsEnabled)
+						continue;
+					var analysisDocument = doc.AnalysisDocument;
+					if (cancellationToken.IsCancellationRequested || analysisDocument == null)
+						return Enumerable.Empty<ValidCodeAction> ();
+					try {
+						await descriptor.GetProvider ().ComputeRefactoringsAsync (
+							new CodeRefactoringContext (analysisDocument, span, delegate (CodeAction ca) {
+								var nrca = ca as NRefactoryCodeAction;
+								var validSegment = tokenSegment;
+								if (nrca != null)
+									validSegment = nrca.TextSpan;
+								actions.Add (new ValidCodeAction (ca, validSegment));
+							}, cancellationToken)
+						).ConfigureAwait (false);
+					} catch (OperationCanceledException) {
+						if (cancellationToken.IsCancellationRequested)
+							return Enumerable.Empty<ValidCodeAction> ();
+					} catch (AggregateException) {
+						if (cancellationToken.IsCancellationRequested)
+							return Enumerable.Empty<ValidCodeAction> ();
+					} catch (Exception e) {
+						LoggingService.LogError ("Error while getting refactorings from " + descriptor.IdString, e); 
+						continue;
+					}
+				}
+			} catch (OperationCanceledException) {
+				if (cancellationToken.IsCancellationRequested)
+					return Enumerable.Empty<ValidCodeAction> ();
+			} catch (AggregateException) {
+				if (cancellationToken.IsCancellationRequested)
+					return Enumerable.Empty<ValidCodeAction> ();
+			}
+			return actions;
+		}
+
+		public static string MimeTypeToLanguage (string mimeType)
+		{
+			switch (mimeType) {
+			case "text/x-csharp":
+				return LanguageNames.CSharp;
+			}
+			return null;
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ICodeActionProviderSource.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ICodeActionProviderSource.cs
deleted file mode 100644
index 155c74d767..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ICodeActionProviderSource.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// 
-// ICodeActionProviderSource.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-
-namespace MonoDevelop.CodeActions
-{
-	/// <summary>
-	/// A code action provider source provides a way for language backends to add a set of generated code action providers.
-	/// </summary>
-	public interface ICodeActionProviderSource
-	{
-		/// <summary>
-		/// Gets the providers.
-		/// </summary>
-		IEnumerable<CodeActionProvider> GetProviders ();
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeAction.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeAction.cs
new file mode 100644
index 0000000000..803cd429be
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeAction.cs
@@ -0,0 +1,47 @@
+//
+// ValidCodeAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.CodeActions
+{
+	/// <summary>
+	/// Represents a code action that's valid at a specific segment.
+	/// </summary>
+	class ValidCodeAction
+	{
+		public CodeAction CodeAction { get; private set; }
+
+		public TextSpan ValidSegment { get; private set; }
+
+		public ValidCodeAction (CodeAction codeAction, TextSpan validSegment)
+		{
+			this.CodeAction = codeAction;
+			this.ValidSegment = validSegment;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeDiagnosticAction.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeDiagnosticAction.cs
new file mode 100644
index 0000000000..5c946ac714
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/ValidCodeDiagnosticAction.cs
@@ -0,0 +1,62 @@
+//
+// ValidCodeDiagnosticAction.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Microsoft.CodeAnalysis.CodeActions;
+using MonoDevelop.Core.Text;
+using MonoDevelop.CodeActions;
+using Microsoft.CodeAnalysis;
+using MonoDevelop.CodeIssues;
+using Microsoft.CodeAnalysis.Text;
+using System.Collections.Immutable;
+
+namespace MonoDevelop.CodeActions
+{
+	/// <summary>
+	/// Represents a code action that's valid at a specific segment that was created as a action for a specific code diagnostic.
+	/// </summary>
+	class ValidCodeDiagnosticAction : ValidCodeAction
+	{
+		ImmutableArray<Diagnostic> validDiagnostics;
+
+		public CodeDiagnosticFixDescriptor Diagnostic {
+			get;
+			private set;
+		}
+
+		public ImmutableArray<Diagnostic> ValidDiagnostics {
+			get {
+				return validDiagnostics;
+			}
+		}
+
+		public ValidCodeDiagnosticAction (CodeDiagnosticFixDescriptor diagnostic, CodeAction codeAction, ImmutableArray<Diagnostic> validDiagnostics, TextSpan validSegment) : base (codeAction, validSegment)
+		{
+			this.Diagnostic = diagnostic;
+			this.validDiagnostics = validDiagnostics;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ActionSummary.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ActionSummary.cs
deleted file mode 100644
index 42eda56ce6..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ActionSummary.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// IGroupingProvider.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2013 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using Mono.TextEditor;
-
-namespace MonoDevelop.CodeIssues
-{
-
-	public class ActionSummary
-	{
-		/// <summary>
-		/// Gets or sets the title.
-		/// </summary>
-		/// <value>The title.</value>
-		public string Title { get; set; }
-		
-		/// <summary>
-		/// Gets or sets the sibling key.
-		/// </summary>
-		/// <value>The sibling key.</value>
-		public object SiblingKey { get; set; }
-
-		/// <summary>
-		/// Gets a value indicating whether this <see cref="MonoDevelop.CodeIssues.ActionSummary"/> is batchable.
-		/// </summary>
-		/// <value><c>true</c> if batchable; otherwise, <c>false</c>.</value>
-		public bool Batchable { get; set; }
-		
-		public DocumentRegion Region { get; set; }
-
-		/// <summary>
-		/// Gets or sets the <see cref="IssueSummary"/> representing the source of this action.
-		/// </summary>
-		/// <value>The issue summary.</value>
-		public IssueSummary IssueSummary { get; set; }
-		
-		public override string ToString ()
-		{
-			return string.Format ("[ActionSummary: Title={0}, Batchable={1}, Region={2}]", Title, Batchable, Region);
-		}
-	}
-
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalyzersFromAssembly.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalyzersFromAssembly.cs
new file mode 100644
index 0000000000..76d68b034f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalyzersFromAssembly.cs
@@ -0,0 +1,110 @@
+//
+// AnalyzersFromAssembly.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Threading;
+using MonoDevelop.CodeIssues;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.CodeFixes;
+using RefactoringEssentials;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+
+namespace MonoDevelop.CodeIssues
+{
+	
+	class AnalyzersFromAssembly
+	{
+		public List<CodeDiagnosticDescriptor> Analyzers;
+		public List<CodeDiagnosticFixDescriptor> Fixes;
+		public List<CodeRefactoringDescriptor> Refactorings;
+
+		public readonly static AnalyzersFromAssembly Empty = new AnalyzersFromAssembly ();
+
+		public AnalyzersFromAssembly ()
+		{
+			Analyzers = new List<CodeDiagnosticDescriptor> ();
+			Fixes = new List<CodeDiagnosticFixDescriptor> ();
+			Refactorings = new List<CodeRefactoringDescriptor> ();
+		}
+
+		internal static AnalyzersFromAssembly CreateFrom (System.Reflection.Assembly asm, bool force = false)
+		{
+			var result = new AnalyzersFromAssembly ();
+			result.AddAssembly (asm, force);
+			return result;
+		}
+
+		internal void AddAssembly (System.Reflection.Assembly asm, bool force = false)
+		{
+			if (!force) {
+				var assemblyName = asm.GetName ().Name;
+				if (assemblyName == "MonoDevelop.AspNet" ||
+				    assemblyName == "Microsoft.CodeAnalysis.CSharp" ||
+				    assemblyName.Contains ("FSharpBinding")  ||
+					assemblyName != "RefactoringEssentials" &&
+					!(asm.GetReferencedAssemblies ().Any (a => a.Name == diagnosticAnalyzerAssembly) && asm.GetReferencedAssemblies ().Any (a => a.Name == "MonoDevelop.Ide")))
+					return;
+			}
+			foreach (var type in asm.GetTypes ()) {
+				var notPortedYetAttribute = (NotPortedYetAttribute)type.GetCustomAttributes (typeof(NotPortedYetAttribute), false).FirstOrDefault ();
+				if (notPortedYetAttribute!= null) {
+					continue;
+				}
+				var analyzerAttr = (DiagnosticAnalyzerAttribute)type.GetCustomAttributes (typeof(DiagnosticAnalyzerAttribute), false).FirstOrDefault ();
+				if (analyzerAttr != null) {
+					var analyzer = (DiagnosticAnalyzer)Activator.CreateInstance (type);
+					foreach (var diag in analyzer.SupportedDiagnostics) {
+						try {
+							Analyzers.Add (new CodeDiagnosticDescriptor (diag, analyzerAttr.Languages, type));
+						} catch (Exception e) {
+							LoggingService.LogError ("error while adding diagnostic analyzer: " + diag.Id + " from assembly " + asm.FullName, e);
+						}
+					}
+				}
+
+				var codeFixAttr = (ExportCodeFixProviderAttribute)type.GetCustomAttributes (typeof(ExportCodeFixProviderAttribute), false).FirstOrDefault ();
+				if (codeFixAttr != null) {
+					Fixes.Add (new CodeDiagnosticFixDescriptor (type, codeFixAttr));
+				}
+
+				var exportAttr = type.GetCustomAttributes (typeof(ExportCodeRefactoringProviderAttribute), false).FirstOrDefault () as ExportCodeRefactoringProviderAttribute;
+				if (exportAttr != null) {
+					Refactorings.Add (new CodeRefactoringDescriptor (type, exportAttr)); 
+				}
+			}
+		}
+
+		readonly static string diagnosticAnalyzerAssembly = typeof (DiagnosticAnalyzerAttribute).Assembly.GetName ().Name;
+
+	}
+
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BatchFixer.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BatchFixer.cs
deleted file mode 100644
index 783b45ff03..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BatchFixer.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// BatchFixer.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2013 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Core;
-using System.Threading.Tasks;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.Refactoring;
-using System.Threading;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor.Utils;
-using System.Text;
-using Mono.TextEditor;
-
-namespace MonoDevelop.CodeIssues
-{
-	public class BatchFixer
-	{
-		readonly IActionMatcher matcher;
-
-		readonly IProgressMonitor monitor;
-
-		public BatchFixer (IActionMatcher matcher, IProgressMonitor monitor)
-		{
-			this.matcher = matcher;
-			this.monitor = monitor;
-		}
-
-		/// <summary>
-		/// Tries to apply the actions passed in <paramref name="actions"/>.
-		/// </summary>
-		/// <param name="actions">The actions to apply.</param>
-		/// <returns>The fixed code actions.</returns>
-		public IEnumerable<ActionSummary> TryFixIssues (IEnumerable<ActionSummary> actions)
-		{
-			if (actions == null)
-				throw new ArgumentNullException ("actions");
-				
-			// enumerate once
-			var actionSummaries = actions as IList<ActionSummary> ?? actions.ToList ();
-			var issueSummaries = actionSummaries.Select (action => action.IssueSummary).ToList ();
-			var files = issueSummaries.Select (issue => issue.File).Distinct ().ToList ();
-			monitor.BeginTask ("Applying fixes", files.Count);
-			
-			var appliedActions = new List<ActionSummary> (issueSummaries.Count);
-			Parallel.ForEach (files, file => {
-				monitor.Step (1);
-				
-				var fileSummaries = issueSummaries.Where (summary => summary.File == file);
-				var inspectorIds = new HashSet<string> (fileSummaries.Select (summary => summary.InspectorIdString));
-				
-				bool hadBom;
-				Encoding encoding;
-				bool isOpen;
-				var data = TextFileProvider.Instance.GetTextEditorData (file.FilePath, out hadBom, out encoding, out isOpen);
-				IRefactoringContext refactoringContext;
-				var realActions = GetIssues (data, file, inspectorIds, out refactoringContext).SelectMany (issue => issue.Actions).ToList ();
-				if (realActions.Count == 0 || refactoringContext == null)
-					return;
-				
-				var fileActionSummaries = actionSummaries.Where (summary => summary.IssueSummary.File == file).ToList ();
-				var matches = matcher.Match (fileActionSummaries, realActions).ToList ();
-				
-				var appliedFixes = RefactoringService.ApplyFixes (matches.Select (match => match.Action), refactoringContext);
-				appliedActions.AddRange (matches.Where (match => appliedFixes.Contains (match.Action)).Select (match => match.Summary));
-				
-				if (!isOpen) {
-					// If the file is open we leave it to the user to explicitly save the file
-					TextFileUtility.WriteText (file.Name, data.Text, encoding, hadBom);
-				}
-			});
-			return appliedActions;
-		}
-
-		static IList<CodeIssue> GetIssues (TextEditorData data, ProjectFile file, ISet<string> inspectorIds, out IRefactoringContext refactoringContext)
-		{
-			var issues = new List<CodeIssue> ();
-			
-			var document = TypeSystemService.ParseFile (file.Project, data);
-			if (document == null) {
-				refactoringContext = null;
-				return issues;
-			}
-
-			var content = TypeSystemService.GetProjectContext (file.Project);
-			var compilation  = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
-			var resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile);
-			
-			refactoringContext = document.CreateRefactoringContextWithEditor (data, resolver, CancellationToken.None);
-			var context = refactoringContext;
-			foreach (var provider in GetInspectors (data, inspectorIds)) {
-				var severity = provider.GetSeverity ();
-				if (severity == Severity.None || !provider.GetIsEnabled ())
-					continue;
-				try {
-					lock (issues) {
-						issues.AddRange (provider.GetIssues (context, CancellationToken.None));
-					}
-				} catch (Exception ex) {
-					LoggingService.LogError ("Error while running code issue on: " + data.FileName, ex);
-				}
-			}
-			return issues;
-		}
-
-		static IList<CodeIssueProvider> GetInspectors (TextEditorData editor, ICollection<string> inspectorIds)
-		{
-			var inspectors = RefactoringService.GetInspectors (editor.MimeType).ToList ();
-			return inspectors
-				.Where (inspector => inspectorIds.Contains (inspector.IdString))
-				.ToList ();
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BuiltInCodeDiagnosticProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BuiltInCodeDiagnosticProvider.cs
new file mode 100644
index 0000000000..bd00becc7c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/BuiltInCodeDiagnosticProvider.cs
@@ -0,0 +1,111 @@
+//
+// BuiltInCodeDiagnosticProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Threading;
+using MonoDevelop.CodeIssues;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+
+namespace MonoDevelop.CodeIssues
+{
+	
+	/// <summary>
+	/// Provides all IDE code diagnostics and fix provider.
+	/// (Scans the app domain for providers)
+	/// </summary>
+	class BuiltInCodeDiagnosticProvider : CodeDiagnosticProvider
+	{
+		readonly static Task<AnalyzersFromAssembly> builtInDiagnostics;
+
+		static BuiltInCodeDiagnosticProvider ()
+		{
+			builtInDiagnostics = Task.Run (() => {
+				var result = new AnalyzersFromAssembly ();
+				foreach (var asm in AppDomain.CurrentDomain.GetAssemblies()) {
+					try {
+						result.AddAssembly (asm);
+					} catch (Exception e) {
+						LoggingService.LogError ("error while loading diagnostics in " + asm.FullName, e);
+					}
+				}
+				return result;
+			});
+		}
+
+		internal static CodeDiagnosticDescriptor GetCodeDiagnosticDescriptor (string diagnosticId)
+		{
+			foreach (var builtInDescriptor in BuiltInCodeDiagnosticProvider.GetBuiltInCodeDiagnosticDecsriptorsAsync (null).Result) {
+				if (builtInDescriptor.GetProvider ().SupportedDiagnostics.Any (diagnostic => diagnosticId == diagnostic.Id))
+					return builtInDescriptor;
+			}
+			return null;
+		}
+
+		internal async static Task<IEnumerable<CodeDiagnosticDescriptor>> GetBuiltInCodeDiagnosticDecsriptorsAsync (string language, bool includeDisabledNodes = false, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			builtInDiagnostics.Wait (cancellationToken);
+			var diags = await builtInDiagnostics;
+			var builtInCodeDiagnostics = diags.Analyzers;
+			if (string.IsNullOrEmpty (language))
+				return includeDisabledNodes ? builtInCodeDiagnostics : builtInCodeDiagnostics.Where (act => act.IsEnabled);
+			return includeDisabledNodes ? builtInCodeDiagnostics.Where (ca => ca.Languages.Contains (language)) : builtInCodeDiagnostics.Where (ca => ca.Languages.Contains (language) && ca.IsEnabled);
+		}
+
+		public async static Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetBuiltInCodeFixDescriptorsAsync (string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var diags = await builtInDiagnostics.ConfigureAwait (false);
+			var builtInCodeFixes = diags.Fixes;
+			return string.IsNullOrEmpty (language) ? builtInCodeFixes : builtInCodeFixes.Where (cfp => cfp.Languages.Contains (language));
+		}
+
+		public async static Task<IEnumerable<CodeRefactoringDescriptor>> GetBuiltInCodeRefactoringDescriptorsAsync (string language, bool includeDisabledNodes = false, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var diags = await builtInDiagnostics.ConfigureAwait (false);
+			var builtInCodeFixes = diags.Refactorings;
+			return string.IsNullOrEmpty (language) ? builtInCodeFixes : builtInCodeFixes.Where (cfp => cfp.Language.Contains (language));
+		}
+
+		public override Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetCodeFixDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken)
+		{
+			return GetBuiltInCodeFixDescriptorsAsync (language, cancellationToken);
+		}
+
+		public override Task<IEnumerable<CodeDiagnosticDescriptor>> GetCodeDiagnosticDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken)
+		{
+			return GetBuiltInCodeDiagnosticDecsriptorsAsync (language, false, cancellationToken);
+		}
+
+		public override Task<IEnumerable<CodeRefactoringDescriptor>> GetCodeRefactoringDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			return GetBuiltInCodeRefactoringDescriptorsAsync (language, false, cancellationToken);
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CSharpSuppressionFixProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CSharpSuppressionFixProvider.cs
new file mode 100644
index 0000000000..5ec493b3bd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CSharpSuppressionFixProvider.cs
@@ -0,0 +1,119 @@
+//
+// CSharpSuppressionFixProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CodeIssues
+{
+	class CSharpSuppressionFixProvider : ISuppressionFixProvider
+	{
+		static readonly Type typeInfo;
+		static readonly MethodInfo canBeSuppressedOrUnsuppressedMethod;
+		static readonly MethodInfo getFixAllProviderMethod;
+		static readonly MethodInfo getSuppressionsAsync1Method;
+		static readonly MethodInfo getSuppressionsAsync2Method;
+
+		object instance;
+
+		public static ISuppressionFixProvider Instance;
+
+		static CSharpSuppressionFixProvider ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CSharp.CodeFixes.Suppression.CSharpSuppressionCodeFixProvider, Microsoft.CodeAnalysis.CSharp.Features", true);
+
+			if (typeInfo == null) 
+				LoggingService.LogError ("CSharpSuppressionCodeFixProvider not found.");
+
+			canBeSuppressedOrUnsuppressedMethod = typeInfo.GetMethod ("CanBeSuppressedOrUnsuppressed");
+			if (canBeSuppressedOrUnsuppressedMethod == null)
+				LoggingService.LogError ("CanBeSuppressedOrUnsuppressed not found.");
+			getFixAllProviderMethod = typeInfo.GetMethod ("GetFixAllProvider");
+			if (getFixAllProviderMethod == null)
+				LoggingService.LogError ("GetFixAllProvider not found.");
+				              
+			getSuppressionsAsync1Method = typeInfo.GetMethod ("GetSuppressionsAsync", new [] { typeof(Project), typeof(IEnumerable<Diagnostic>), typeof(CancellationToken) });
+			if (getSuppressionsAsync1Method == null)
+				LoggingService.LogError ("GetSuppressionsAsync1 not found.");
+			getSuppressionsAsync2Method = typeInfo.GetMethod ("GetSuppressionsAsync", new [] { typeof(Document), typeof(TextSpan), typeof(IEnumerable<Diagnostic>), typeof(CancellationToken) });
+			if (getSuppressionsAsync2Method == null)
+				LoggingService.LogError ("GetSuppressionsAsync2 not found.");
+			Instance = new CSharpSuppressionFixProvider ();
+		}
+
+		public CSharpSuppressionFixProvider ()
+		{
+			instance = Activator.CreateInstance (typeInfo, true);
+		}
+
+		public bool CanBeSuppressedOrUnsuppressed (Diagnostic diagnostic)
+		{
+			return (bool)canBeSuppressedOrUnsuppressedMethod.Invoke (instance, new [] { diagnostic } );
+		}
+
+		public FixAllProvider GetFixAllProvider ()
+		{
+			return (FixAllProvider)canBeSuppressedOrUnsuppressedMethod.Invoke (instance, null);
+		}
+
+		public Task<IEnumerable<CodeFix>> GetSuppressionsAsync (Project project, IEnumerable<Diagnostic> diagnostics, CancellationToken cancellationToken)
+		{
+			var o2 = getSuppressionsAsync1Method.Invoke (instance, new object[] { project, diagnostics, cancellationToken } );
+			var task = (Task)o2;
+
+			var propertyInfo = task.GetType ().GetProperty ("Result");
+			var result = (IEnumerable)propertyInfo.GetValue (task);
+
+			List<CodeFix> wrappedResult = new List<CodeFix> ();
+			foreach (var o in result)
+				wrappedResult.Add (new CodeFix (o));
+			return Task.FromResult((IEnumerable<CodeFix>)wrappedResult);
+		}
+
+		public Task<IEnumerable<CodeFix>> GetSuppressionsAsync (Document document, TextSpan span, IEnumerable<Diagnostic> diagnostics, CancellationToken cancellationToken)
+		{
+			var o2 = getSuppressionsAsync2Method.Invoke (instance, new object [] { document, span, diagnostics, cancellationToken });
+			var task = (Task)o2;
+
+
+			var propertyInfo = task.GetType ().GetProperty ("Result");
+			var result = (IEnumerable)propertyInfo.GetValue (task);
+
+			List<CodeFix> wrappedResult = new List<CodeFix> ();
+			foreach (var o in result)
+				wrappedResult.Add (new CodeFix (o));
+			return Task.FromResult((IEnumerable<CodeFix>)wrappedResult);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisBatchRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisBatchRunner.cs
deleted file mode 100644
index 8463822b85..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisBatchRunner.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-//
-// CodeIssueBatchRunner.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-// Copyright (c) 2013 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Linq;
-using System.Threading;
-using MonoDevelop.Ide;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.TypeSystem;
-using System.Threading.Tasks;
-using System.IO;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Refactoring;
-using MonoDevelop.Core;
-using System.Collections.Concurrent;
-using ICSharpCode.NRefactory.TypeSystem;
-using Mono.TextEditor;
-using MonoDevelop.Core.Instrumentation;
-using MonoDevelop.Refactoring;
-using System.Collections.Generic;
-using MonoDevelop.Core;

-

-namespace MonoDevelop.CodeIssues

-{

-	public class CodeAnalysisBatchRunner

-	{

-		private readonly object _lock = new object ();

-

-		private int workerCount;

-

-		private readonly AnalysisJobQueue jobQueue = new AnalysisJobQueue ();

-

-		public IJobContext QueueJob (IAnalysisJob job)

-		{

-			jobQueue.Add (job);

-			EnsureRunning ();

-			return new JobContext (job, jobQueue, this);

-		}

-

-		private void EnsureRunning ()

-		{

-			for (; Interlocked.Add (ref workerCount, 1) < Environment.ProcessorCount;) {

-				new Thread (() => {

-					try {

-						ProcessQueue ();

-					}

-					finally {

-						Interlocked.Add (ref workerCount, -1);

-					}

-				}).Start ();

-			}

-		}

-

-		private void ProcessQueue ()

-		{

-			while (true) {

-				try {

-					using (var slice = GetSlice ()) {

-						if (slice == null)

-							// TODO: Do something smarter if the queue is empty

-							return;

-						AnalyzeFile (slice, slice.GetJobs ().SelectMany (job => job.GetIssueProviders (slice.File)));

-					}

-				} catch (Exception e) {

-					LoggingService.LogInternalError (e);

-				}

-			}

-		}

-

-		private JobSlice GetSlice ()

-		{

-			lock (_lock) {

-				return jobQueue.Dequeue (1).FirstOrDefault ();

-			}

-		}

-

-		void AnalyzeFile (JobSlice item, IEnumerable<BaseCodeIssueProvider> codeIssueProviders)
-		{
-			var file = item.File;
-
-			if (file.BuildAction != BuildAction.Compile)
-				return;
-
-			if (!(file.Project is DotNetProject))
-				return;
-
-			TextEditorData editor;
-			try {
-				editor = TextFileProvider.Instance.GetReadOnlyTextEditorData (file.FilePath);
-			} catch (FileNotFoundException) {
-				// Swallow exception and ignore this file
-				return;
-			}
-			var document = TypeSystemService.ParseFile (file.Project, editor);
-			if (document == null)
-				return;
-
-			var content = TypeSystemService.GetProjectContext (file.Project);
-			var compilation = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
-
-			CSharpAstResolver resolver;
-			using (var timer = ExtensionMethods.ResolveCounter.BeginTiming ()) {
-				resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile);
-				try {
-					resolver.ApplyNavigator (new ExtensionMethods.ConstantModeResolveVisitorNavigator (ResolveVisitorNavigationMode.Resolve, null));
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while applying navigator", e);
-				}
-			}
-			var context = document.CreateRefactoringContextWithEditor (editor, resolver, CancellationToken.None);
-
-			foreach (var provider in codeIssueProviders) {
-				if (item.CancellationToken.IsCancellationRequested)
-					break;
-				IList<IAnalysisJob> jobs;
-				lock (_lock)
-					jobs = item.GetJobs ().ToList ();
-				var jobsForProvider = jobs.Where (j => j.GetIssueProviders (file).Contains (provider)).ToList();
-				try {
-					var issues = provider.GetIssues (context, CancellationToken.None).ToList ();
-					foreach (var job in jobsForProvider) {
-						// Call AddResult even if issues.Count == 0, to enable a job implementation to keep
-						// track of progress information.
-						job.AddResult (file, provider, issues);
-					}
-				} catch (OperationCanceledException) {
-					// The operation was cancelled, no-op as the user-visible parts are
-					// handled elsewhere
-				} catch (Exception e) {
-					foreach (var job in jobsForProvider) {
-						job.AddError (file, provider);
-					}
-				}
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticDescriptor.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticDescriptor.cs
new file mode 100644
index 0000000000..0a2936b065
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticDescriptor.cs
@@ -0,0 +1,226 @@
+//
+// CodeIssueDescriptor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.Diagnostics;
+using MonoDevelop.Core;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.Editor;
+using System.Threading;
+using MonoDevelop.Ide.TypeSystem;
+using System.Reflection;
+using Microsoft.CodeAnalysis.CodeActions;
+using System.Collections.Immutable;
+
+namespace MonoDevelop.CodeIssues
+{
+	class CodeDiagnosticDescriptor
+	{
+		readonly Type diagnosticAnalyzerType;
+		readonly Microsoft.CodeAnalysis.DiagnosticDescriptor descriptor;
+
+		DiagnosticAnalyzer instance;
+
+
+		/// <summary>
+		/// Gets the identifier string.
+		/// </summary>
+		internal string IdString {
+			get {
+				return diagnosticAnalyzerType.FullName;
+			}
+		}
+
+		public Type DiagnosticAnalyzerType {
+			get {
+				return diagnosticAnalyzerType;
+			}
+		}
+
+		/// <summary>
+		/// Gets the display name for this issue.
+		/// </summary>
+		public string Name { get; private set; }
+
+		/// <summary>
+		/// Gets the description of the issue provider (used in the option panel).
+		/// </summary>
+
+		/// <summary>
+		/// Gets the languages for this issue.
+		/// </summary>
+		public string[] Languages { get; private set; }
+
+		public DiagnosticSeverity? DiagnosticSeverity {
+			get {
+				DiagnosticSeverity? result = null;
+
+				foreach (var diagnostic in GetProvider ().SupportedDiagnostics) {
+					if (!result.HasValue)
+						result = GetSeverity(diagnostic);
+					if (result != GetSeverity(diagnostic))
+						return null;
+				}
+				return result;
+			}
+
+			set {
+				if (!value.HasValue)
+					return;
+				foreach (var diagnostic in GetProvider ().SupportedDiagnostics) {
+					SetSeverity (diagnostic, value.Value);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether this code action is enabled by the user.
+		/// </summary>
+		/// <value><c>true</c> if this code action is enabled; otherwise, <c>false</c>.</value>
+		public bool IsEnabled {
+			get {
+				foreach (var diagnostic in GetProvider ().SupportedDiagnostics) {
+					if (GetIsEnabled (diagnostic))
+						return true;
+				}
+				return false;
+			}
+			set {
+				foreach (var diagnostic in GetProvider ().SupportedDiagnostics) {
+					SetIsEnabled (diagnostic, value);
+				}
+			}
+		}
+
+		internal DiagnosticSeverity GetSeverity (DiagnosticDescriptor diagnostic)
+		{
+			return PropertyService.Get ("CodeIssues." + Languages + "." + IdString + "." + diagnostic.Id + ".severity", diagnostic.DefaultSeverity);
+		}
+
+		internal void SetSeverity (DiagnosticDescriptor diagnostic, DiagnosticSeverity severity)
+		{
+			PropertyService.Set ("CodeIssues." + Languages + "." + IdString + "." + diagnostic.Id + ".severity", severity);
+		}
+
+		internal bool GetIsEnabled (DiagnosticDescriptor diagnostic)
+		{
+			return PropertyService.Get ("CodeIssues." + Languages + "." + IdString + "." + diagnostic.Id + ".enabled", true);
+		}
+
+		internal void SetIsEnabled (DiagnosticDescriptor diagnostic, bool value)
+		{
+			PropertyService.Set ("CodeIssues." + Languages + "." + IdString + "." + diagnostic.Id + ".enabled", value);
+		}
+
+		static CodeDiagnosticDescriptor ()
+		{
+			getCodeActionsMethod = typeof (CodeAction).GetMethod ("GetCodeActions", BindingFlags.Instance | BindingFlags.NonPublic);
+			hasCodeActionsProperty = typeof (CodeAction).GetProperty ("HasCodeActions", BindingFlags.Instance | BindingFlags.NonPublic);
+
+		}
+
+		internal CodeDiagnosticDescriptor (Microsoft.CodeAnalysis.DiagnosticDescriptor descriptor, string[] languages, Type codeIssueType)
+		{
+			if (descriptor == null)
+				throw new ArgumentNullException ("descriptor");
+			if (languages == null)
+				throw new ArgumentNullException ("languages");
+			if (codeIssueType == null)
+				throw new ArgumentNullException ("codeIssueType");
+			Name = descriptor.Title.ToString () ?? "unnamed";
+			Languages = languages;
+			this.descriptor = descriptor;
+			this.diagnosticAnalyzerType = codeIssueType;
+		}
+
+		/// <summary>
+		/// Gets the roslyn code action provider.
+		/// </summary>
+		public DiagnosticAnalyzer GetProvider ()
+		{
+			if (instance == null)
+				instance = (DiagnosticAnalyzer)Activator.CreateInstance(diagnosticAnalyzerType);
+
+			return instance;
+		}
+
+		public override string ToString ()
+		{
+			return string.Format ("[CodeIssueDescriptor: IdString={0}, Name={1}, Language={2}]", IdString, Name, Languages);
+		}
+
+		public bool CanDisableWithPragma { get { return !string.IsNullOrEmpty (descriptor.Id); } }
+
+		const string analysisDisableTag = "Analysis ";
+		readonly static MethodInfo getCodeActionsMethod;
+		readonly static PropertyInfo hasCodeActionsProperty;
+
+		public async void DisableWithPragma (TextEditor editor, DocumentContext context, Diagnostic fix, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var line = editor.GetLineByOffset (fix.Location.SourceSpan.Start);
+			var span = new TextSpan (line.Offset, line.Length);
+			var fixes = await CSharpSuppressionFixProvider.Instance.GetSuppressionsAsync (context.AnalysisDocument, span, new [] { fix }, cancellationToken).ConfigureAwait (false);
+			foreach (var f in fixes) {
+				RunAction (context, f.Action, cancellationToken);
+			}
+		}
+
+		public async void DisableWithFile (TextEditor editor, DocumentContext context, Diagnostic fix, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			var p = context.RoslynWorkspace.CurrentSolution.GetProject (TypeSystemService.GetProjectId (context.Project));
+
+			var fixes = await CSharpSuppressionFixProvider.Instance.GetSuppressionsAsync (p, new [] { fix }, cancellationToken ).ConfigureAwait (false);
+
+			foreach (var f in fixes) {
+				RunAction (context, f.Action, cancellationToken);
+			}
+		}
+
+		internal static async void RunAction (DocumentContext context, CodeAction action, CancellationToken cancellationToken)
+		{
+			var operations = await action.GetOperationsAsync (cancellationToken).ConfigureAwait (false);
+			if (operations == null)
+				return;
+			foreach (var op in operations) {
+				if (op == null)
+					continue;
+				try {
+					op.Apply (context.RoslynWorkspace, cancellationToken);
+				} catch (Exception e) {
+					LoggingService.LogError ("Error while appyling operation : " + op, e);
+				}
+			}
+
+			if ((bool)hasCodeActionsProperty.GetValue (action)) {
+				var result = (ImmutableArray<CodeAction>)getCodeActionsMethod.Invoke (action, null);
+				foreach (var nested in result) {
+					RunAction (context, nested, cancellationToken);
+				}
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticFixDescriptor.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticFixDescriptor.cs
new file mode 100644
index 0000000000..29c0d576c8
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticFixDescriptor.cs
@@ -0,0 +1,89 @@
+//
+// CodeFixDescriptor.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Diagnostics;
+using System.Linq;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CodeIssues
+{
+	class CodeDiagnosticFixDescriptor
+	{
+		readonly Type codeFixProviderType;
+		readonly ExportCodeFixProviderAttribute attribute;
+		CodeFixProvider instance;
+
+		public string Name {
+			get {
+				return attribute.Name;
+			}
+		}
+
+		public string[] Languages {
+			get {
+				return attribute.Languages;
+			}
+		}
+
+		internal CodeDiagnosticFixDescriptor (Type codeFixProviderType, ExportCodeFixProviderAttribute attribute)
+		{
+			if (codeFixProviderType == null)
+				throw new ArgumentNullException ("codeFixProviderType");
+			if (attribute == null)
+				throw new ArgumentNullException ("attribute");
+			this.codeFixProviderType = codeFixProviderType;
+			this.attribute = attribute;
+		}
+		
+		public CodeFixProvider GetCodeFixProvider ()
+		{
+			if (instance == null) {
+				try {
+					instance = (CodeFixProvider)Activator.CreateInstance (codeFixProviderType);
+				} catch (InvalidCastException) {
+					LoggingService.LogError (codeFixProviderType + " can't be cast to CodeFixProvider.");
+					throw;
+				}
+			}
+
+			return instance;
+		}
+
+		public CodeDiagnosticDescriptor GetCodeDiagnosticDescriptor (string language)
+		{
+			var fixableIds = GetCodeFixProvider ().FixableDiagnosticIds.ToList ();
+
+			foreach (var descriptor in BuiltInCodeDiagnosticProvider.GetBuiltInCodeDiagnosticDecsriptorsAsync (language).Result) {
+				if (descriptor.GetProvider ().SupportedDiagnostics.Any (diagnostic => fixableIds.Contains (diagnostic.Id)))
+					return descriptor;
+
+			}
+			return null;
+
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticProvider.cs
new file mode 100644
index 0000000000..479d24dffb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticProvider.cs
@@ -0,0 +1,45 @@
+//
+// CodeDiagnosticProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.Collections.Generic;
+using System.Threading;
+using MonoDevelop.CodeIssues;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+
+namespace MonoDevelop.CodeIssues
+{
+	/// <summary>
+	/// The code diagnostic provider gives a list of code diagnostic and fix providers from an arbitrary source.
+	/// </summary>
+	abstract class CodeDiagnosticProvider 
+	{
+		public abstract Task<IEnumerable<CodeDiagnosticDescriptor>> GetCodeDiagnosticDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default (CancellationToken));
+		public abstract Task<IEnumerable<CodeDiagnosticFixDescriptor>> GetCodeFixDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default (CancellationToken));
+		public abstract Task<IEnumerable<CodeRefactoringDescriptor>> GetCodeRefactoringDescriptorsAsync (DocumentContext document, string language, CancellationToken cancellationToken = default (CancellationToken));
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs
new file mode 100644
index 0000000000..3525d66f9e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs
@@ -0,0 +1,140 @@
+// 
+// CodeAnalysisRunner.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//#define PROFILE
+using System;
+using System.Linq;
+using MonoDevelop.AnalysisCore;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Gui;
+using System.Threading;
+using MonoDevelop.CodeIssues;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.CodeFixes;
+using MonoDevelop.CodeActions;
+using MonoDevelop.Core;
+using MonoDevelop.AnalysisCore.Gui;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+using System.Diagnostics;
+
+namespace MonoDevelop.CodeIssues
+{
+	static class CodeDiagnosticRunner
+	{
+		static IEnumerable<CodeDiagnosticDescriptor> diagnostics;
+		static TraceListener consoleTraceListener = new ConsoleTraceListener ();
+
+		public static async Task<IEnumerable<Result>> Check (AnalysisDocument analysisDocument, CancellationToken cancellationToken)
+		{
+			var input = analysisDocument.DocumentContext;
+			if (!AnalysisOptions.EnableFancyFeatures || input.Project == null || !input.IsCompileableInProject || input.AnalysisDocument == null)
+				return Enumerable.Empty<Result> ();
+			try {
+				var model = input.ParsedDocument.GetAst<SemanticModel> ();
+				if (model == null)
+					return Enumerable.Empty<Result> ();
+				var compilation = model.Compilation;
+				var language = CodeRefactoringService.MimeTypeToLanguage (analysisDocument.Editor.MimeType);
+
+				var providers = new List<DiagnosticAnalyzer> ();
+				var alreadyAdded = new HashSet<Type>();
+				if (diagnostics == null) {
+					diagnostics = await CodeRefactoringService.GetCodeDiagnosticsAsync (analysisDocument.DocumentContext, language, cancellationToken);
+				}
+				var diagnosticTable = new Dictionary<string, CodeDiagnosticDescriptor> ();
+				foreach (var diagnostic in diagnostics) {
+					if (alreadyAdded.Contains (diagnostic.DiagnosticAnalyzerType))
+						continue;
+					if (!diagnostic.IsEnabled)
+						continue;
+					alreadyAdded.Add (diagnostic.DiagnosticAnalyzerType);
+					var provider = diagnostic.GetProvider ();
+					if (provider == null)
+						continue;
+					foreach (var diag in provider.SupportedDiagnostics)
+						diagnosticTable [diag.Id] = diagnostic;
+					providers.Add (provider);
+				}
+
+				if (providers.Count == 0 || cancellationToken.IsCancellationRequested)
+					return Enumerable.Empty<Result> ();
+				#if DEBUG
+				Debug.Listeners.Add (consoleTraceListener); 
+				#endif
+
+				CompilationWithAnalyzers compilationWithAnalyzer;
+				var analyzers = System.Collections.Immutable.ImmutableArray<DiagnosticAnalyzer>.Empty.AddRange (providers);
+				var diagnosticList = new List<Diagnostic> ();
+				try {
+					var options = new CompilationWithAnalyzersOptions (
+						null, 
+						delegate (Exception exception, DiagnosticAnalyzer analyzer, Diagnostic diag) {
+							LoggingService.LogError ("Exception in diagnostic analyzer " + diag.Id + ":" + diag.GetMessage (), exception);
+						},
+						null, 
+						false, 
+						false
+					);
+
+					compilationWithAnalyzer = compilation.WithAnalyzers (analyzers, options);
+					if (input.ParsedDocument == null || cancellationToken.IsCancellationRequested)
+						return Enumerable.Empty<Result> ();
+					
+					diagnosticList.AddRange (await compilationWithAnalyzer.GetAnalyzerSemanticDiagnosticsAsync (model, null, cancellationToken).ConfigureAwait (false));
+					diagnosticList.AddRange (await compilationWithAnalyzer.GetAnalyzerSyntaxDiagnosticsAsync (model.SyntaxTree, cancellationToken).ConfigureAwait (false));
+				} catch (Exception) {
+					return Enumerable.Empty<Result> ();
+				} finally {
+					#if DEBUG
+					Debug.Listeners.Remove (consoleTraceListener); 
+					#endif
+					CompilationWithAnalyzers.ClearAnalyzerState (analyzers);
+				}
+
+				return diagnosticList
+					.Where (d => !d.Id.StartsWith("CS", StringComparison.Ordinal))
+					.Where (d => diagnosticTable[d.Id].GetIsEnabled (d.Descriptor))
+					.Select (diagnostic => {
+						var res = new DiagnosticResult(diagnostic);
+						// var line = analysisDocument.Editor.GetLineByOffset (res.Region.Start);
+						// Console.WriteLine (diagnostic.Id + "/" + res.Region +"/" + analysisDocument.Editor.GetTextAt (line));
+						return res;
+					});
+			} catch (OperationCanceledException) {
+				return Enumerable.Empty<Result> ();
+			}  catch (AggregateException ae) {
+				ae.Flatten ().Handle (ix => ix is OperationCanceledException);
+				return Enumerable.Empty<Result> ();
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while running diagnostics.", e); 
+				return Enumerable.Empty<Result> ();
+			}
+		}
+
+
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeFix.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeFix.cs
new file mode 100644
index 0000000000..5af069950c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeFix.cs
@@ -0,0 +1,93 @@
+//
+// CodeFix.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CodeIssues
+{
+	public class CodeFix
+	{
+		readonly static Type typeInfo;
+		readonly static FieldInfo projectField;
+		readonly static FieldInfo actionField;
+		readonly static FieldInfo diagnosticsField;
+
+		object codeFixInstance;
+
+		static CodeFix ()
+		{
+			typeInfo = Type.GetType ("Microsoft.CodeAnalysis.CodeFixes.CodeFix, Microsoft.CodeAnalysis.Workspaces", true);
+			if (typeInfo == null) 
+				LoggingService.LogError ("CodeFix not found.");
+
+			projectField = typeInfo.GetField ("Project", BindingFlags.NonPublic | BindingFlags.Instance);
+			if (projectField == null) 
+				LoggingService.LogError ("Project field not found.");
+
+			actionField = typeInfo.GetField ("Action", BindingFlags.NonPublic | BindingFlags.Instance);
+			if (actionField == null) 
+				LoggingService.LogError ("Action field not found.");
+			
+			diagnosticsField = typeInfo.GetField ("Diagnostics", BindingFlags.NonPublic | BindingFlags.Instance);
+			if (diagnosticsField == null) 
+				LoggingService.LogError ("Diagnostics field not found.");
+			
+
+		}
+
+		public Diagnostic PrimaryDiagnostic {
+			get {
+				return Diagnostics [0];
+			}
+		}
+
+		public Project Project { get { return (Project)projectField.GetValue (codeFixInstance); } }
+		public CodeAction Action { get { return (CodeAction)actionField.GetValue (codeFixInstance); } }
+		public ImmutableArray<Diagnostic> Diagnostics { get { return (ImmutableArray<Diagnostic>)diagnosticsField.GetValue (codeFixInstance); } }
+
+		public CodeFix (object codeFixInstance)
+		{
+			this.codeFixInstance = codeFixInstance;
+		}
+
+		public CodeFix (Project project, CodeAction action, Diagnostic diagnostic)
+		{
+			codeFixInstance = Activator.CreateInstance (typeInfo, project, action, diagnostic); 
+		}
+
+		public CodeFix (Project project, CodeAction action, ImmutableArray<Diagnostic> diagnostics)
+		{
+			codeFixInstance = Activator.CreateInstance (typeInfo, project, action, diagnostics); 
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssue.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssue.cs
deleted file mode 100644
index 846f4dc678..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssue.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// 
-// CodeIssue.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using Mono.TextEditor;
-using System.Collections.Generic;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace MonoDevelop.CodeIssues
-{
-	/// <summary>
-	/// A code issue marks an issue inside a text editor. An issue is a description shown in the tooltip and
-	/// (optionally) a set of code actions to solve the issue.
-	/// </summary>
-	public class CodeIssue
-	{
-		/// <summary>
-		/// Gets or sets the description shown in the tooltip.
-		/// </summary>
-		public string Description {
-			get;
-			private set;
-		}
-		
-		/// <summary>
-		/// Gets or sets the region of the issue.
-		/// </summary>
-		public DomRegion Region {
-			get;
-			private set;
-		}
-
-		
-
-		/// <summary>
-		/// Gets or sets a value indicating how this issue should be marked inside the text editor.
-		/// Note: There is only one code issue provider generated therfore providers need to be state less.
-		/// </summary>
-		public IssueMarker IssueMarker { get; private set; }
-
-
-		/// <summary>
-		/// Gets or sets the code actions to solve the issue.
-		/// </summary>
-		public IEnumerable<MonoDevelop.CodeActions.CodeAction> Actions {
-			get;
-			private set;
-		}
-		
-		public string InspectorIdString {
-			get;
-			private set;
-		}
-
-		/// <summary>
-		/// Gets or sets the code action providers for this issue.
-		/// </summary>
-		public IList<Type> ActionProvider {
-			get;
-			set;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MonoDevelop.CodeIssues.CodeIssue"/> class.
-		/// </summary>
-		public CodeIssue (IssueMarker issueMarker, string description, string fileName, DocumentLocation start, DocumentLocation end, string inspectorIdString, IEnumerable<MonoDevelop.CodeActions.CodeAction>  actions = null) : this (issueMarker, description, new DomRegion (fileName, start, end), inspectorIdString, actions)
-		{
-		}
-		
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MonoDevelop.CodeIssues.CodeIssue"/> class.
-		/// </summary>
-		public CodeIssue (IssueMarker issueMarker, string description, DomRegion region, string inspectorIdString, IEnumerable<MonoDevelop.CodeActions.CodeAction>  actions = null)
-		{
-			IssueMarker = issueMarker;
-			Description = description;
-			Region = region;
-			Actions = actions;
-			InspectorIdString = inspectorIdString;
-		}
-
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueAddinNode.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueAddinNode.cs
deleted file mode 100644
index d8aee4e498..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueAddinNode.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// 
-// InspectorAddinNode.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.SourceEditor;
-using Mono.Addins;
-using MonoDevelop.Core;
-using MonoDevelop.SourceEditor.QuickTasks;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace MonoDevelop.CodeIssues
-{
-	public class CodeIssueAddinNode : TypeExtensionNode
-	{
-		[NodeAttribute ("mimeType", Required=true, Description="The mime type of this action.")]
-		string mimeType = null;
-		public string MimeType {
-			get {
-				return mimeType;
-			}
-		}
-
-		[NodeAttribute ("severity", Required=true, Localizable=false,  Description="The severity of this action.")]
-		Severity severity;
-		public Severity Severity {
-			get {
-				return severity;
-			}
-		}
-
-		CodeIssueProvider inspector;
-		public CodeIssueProvider Inspector {
-			get {
-				if (inspector == null) {
-					inspector = (CodeIssueProvider)CreateInstance ();
-					inspector.DefaultSeverity = severity;
-					inspector.SetMimeType (MimeType);
-				}
-				return inspector;
-			}
-		}
-		
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
index 241f9281f6..7533c2d604 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
@@ -28,15 +28,17 @@ using MonoDevelop.Ide.Gui.Dialogs;
 using Gtk;
 using MonoDevelop.Core;
 using System.Linq;
-using MonoDevelop.SourceEditor;
 using MonoDevelop.Refactoring;
 using System.Collections.Generic;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Refactoring;
 using GLib;
 using MonoDevelop.Components;
 using Gdk;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.CodeActions;
+using Microsoft.CodeAnalysis;
 using MonoDevelop.SourceEditor.QuickTasks;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.CodeIssues
 {
@@ -58,7 +60,7 @@ namespace MonoDevelop.CodeIssues
 			widget = new CodeIssuePanelWidget ("text/x-csharp");
 		}
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			EnsureWidget ();
 			return widget;
@@ -73,19 +75,21 @@ namespace MonoDevelop.CodeIssues
 	partial class CodeIssuePanelWidget : Bin
 	{
 		readonly string mimeType;
-		readonly TreeStore treeStore = new TreeStore (typeof(string), typeof(BaseCodeIssueProvider), typeof (string));
-		readonly Dictionary<BaseCodeIssueProvider, Severity> severities = new Dictionary<BaseCodeIssueProvider, Severity> ();
-		readonly Dictionary<BaseCodeIssueProvider, bool> enableState = new Dictionary<BaseCodeIssueProvider, bool> ();
+		readonly TreeStore treeStore = new TreeStore (typeof(string), typeof(Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>), typeof (string));
+		readonly Dictionary<Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>, DiagnosticSeverity?> severities = new Dictionary<Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>, DiagnosticSeverity?> ();
+		readonly Dictionary<Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>, bool> enableState = new Dictionary<Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>, bool> ();
 
 		void GetAllSeverities ()
 		{
-			foreach (var node in RefactoringService.GetInspectors (mimeType)) {
-				severities [node] = node.GetSeverity ();
-				enableState [node] = node.GetIsEnabled ();
-				if (node.HasSubIssues) {
-					foreach (var subIssue in node.SubIssues) {
-						severities [subIssue] = subIssue.GetSeverity ();
-						enableState [subIssue] = subIssue.GetIsEnabled ();
+			foreach (var node in BuiltInCodeDiagnosticProvider.GetBuiltInCodeDiagnosticDecsriptorsAsync (CodeRefactoringService.MimeTypeToLanguage (mimeType), true).Result) {
+				var root = new Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor> (node, null);
+				severities [root] = node.DiagnosticSeverity;
+				enableState [root] = node.IsEnabled;
+				if (node.GetProvider ().SupportedDiagnostics.Length > 1) {
+					foreach (var subIssue in node.GetProvider ().SupportedDiagnostics) {
+						var sub = new Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor> (node, subIssue);
+						severities [sub] = node.GetSeverity (subIssue);
+						enableState [sub] = node.GetIsEnabled (subIssue);
 					}
 				}
 			}
@@ -102,8 +106,8 @@ namespace MonoDevelop.CodeIssues
 		bool SelectCodeIssue (string idString, TreeIter iter)
 		{
 			do {
-				var provider = treeStore.GetValue (iter, 1) as BaseCodeIssueProvider; 
-				if (provider != null && provider.IdString == idString) {
+				var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
+				if (provider != null && idString  == provider.Item1.IdString) {
 					treeviewInspections.ExpandToPath (treeStore.GetPath (iter));
 					treeviewInspections.Selection.SelectIter (iter);
 					return true;
@@ -120,33 +124,30 @@ namespace MonoDevelop.CodeIssues
 			return false;
 		}
 
-		static string GetDescription (Severity severity)
+		static string GetDescription (DiagnosticSeverity severity)
 		{
 			switch (severity) {
-			case Severity.None:
+			case DiagnosticSeverity.Hidden:
 				return GettextCatalog.GetString ("Do not show");
-			case Severity.Error:
+			case DiagnosticSeverity.Error:
 				return GettextCatalog.GetString ("Error");
-			case Severity.Warning:
+			case DiagnosticSeverity.Warning:
 				return GettextCatalog.GetString ("Warning");
-			case Severity.Hint:
-				return GettextCatalog.GetString ("Hint");
-			case Severity.Suggestion:
-				return GettextCatalog.GetString ("Suggestion");
+			case DiagnosticSeverity.Info:
+				return GettextCatalog.GetString ("Info");
 			default:
 				throw new ArgumentOutOfRangeException ();
 			}
 		}
 
-		Xwt.Drawing.Image GetIcon (Severity severity)
+		Xwt.Drawing.Image GetIcon (DiagnosticSeverity severity)
 		{
 			switch (severity) {
-			case Severity.Error:
+			case DiagnosticSeverity.Error:
 				return QuickTaskOverviewMode.ErrorImage;
-			case Severity.Warning:
+			case DiagnosticSeverity.Warning:
 				return QuickTaskOverviewMode.WarningImage;
-			case Severity.Hint:
-			case Severity.Suggestion:
+			case DiagnosticSeverity.Info:
 				return QuickTaskOverviewMode.SuggestionImage;
 			default:
 				return QuickTaskOverviewMode.OkImage;
@@ -157,25 +158,24 @@ namespace MonoDevelop.CodeIssues
 		{
 			categories.Clear ();
 			treeStore.Clear ();
-
-			var grouped = severities.Keys.OfType<CodeIssueProvider> ()
-				.Where (node => string.IsNullOrEmpty (filter) || node.Title.IndexOf (filter, StringComparison.OrdinalIgnoreCase) > 0)
-				.GroupBy (node => node.Category)
+			var grouped = severities.Keys
+				.Where (node => node.Item2 == null && (string.IsNullOrEmpty (filter) || node.Item1.Name.IndexOf (filter, StringComparison.OrdinalIgnoreCase) > 0))
+				.GroupBy (node => node.Item1.GetProvider ().SupportedDiagnostics.First ().Category)
 				.OrderBy (g => g.Key, StringComparer.Ordinal);
 
 			foreach (var g in grouped) {
 				TreeIter categoryIter = treeStore.AppendValues ("<b>" + g.Key + "</b>", null, null);
 				categories [g.Key] = categoryIter;
 
-				foreach (var node in g.OrderBy (n => n.Title, StringComparer.Ordinal)) {
-					var title = node.Title;
+				foreach (var node in g.OrderBy (n => n.Item1.Name, StringComparer.Ordinal)) {
+					var title = node.Item1.Name;
 					MarkupSearchResult (filter, ref title);
-					var nodeIter = treeStore.AppendValues (categoryIter, title, node, node.Description);
-					if (node.HasSubIssues) {
-						foreach (var subIssue in node.SubIssues) {
-							title = subIssue.Title;
+					var nodeIter = treeStore.AppendValues (categoryIter, title, node, Ambience.EscapeText (node.Item1.Name));
+					if (node.Item1.GetProvider ().SupportedDiagnostics.Length > 1) {
+						foreach (var subIssue in node.Item1.GetProvider ().SupportedDiagnostics) {
+							title = subIssue.Title.ToString ();
 							MarkupSearchResult (filter, ref title);
-							treeStore.AppendValues (nodeIter, title, subIssue, subIssue.Description);
+							treeStore.AppendValues (nodeIter, title, new Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>(node.Item1, subIssue), Ambience.EscapeText (node.Item1.Name));
 						}
 					}
 				}
@@ -212,8 +212,11 @@ namespace MonoDevelop.CodeIssues
 			{
 				int w = 10;
 				var newCellArea = new Gdk.Rectangle (cell_area.X + w, cell_area.Y, cell_area.Width - w, cell_area.Height);
+				var icon = Icon;
+				if ((flags & Gtk.CellRendererState.Selected) != 0)
+					icon = icon.WithStyles ("sel");
 				using (var ctx = CairoHelper.Create (window)) {
-					ctx.DrawImage (widget, Icon, cell_area.X - 4, cell_area.Y + Math.Round ((cell_area.Height - Icon.Height) / 2));
+					ctx.DrawImage (widget, icon, cell_area.X - 4, cell_area.Y + Math.Round ((cell_area.Height - Icon.Height) / 2));
 				}
 
 				base.Render (window, widget, background_area, newCellArea, expose_area, flags);
@@ -241,7 +244,7 @@ namespace MonoDevelop.CodeIssues
 			toggleRenderer.Toggled += delegate(object o, ToggledArgs args) {
 				TreeIter iter;
 				if (treeStore.GetIterFromString (out iter, args.Path)) {
-					var provider = (BaseCodeIssueProvider)treeStore.GetValue (iter, 1);
+					var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
 					enableState[provider] = !enableState[provider];
 				}
 			};
@@ -251,7 +254,7 @@ namespace MonoDevelop.CodeIssues
 			titleCol.PackStart (toggleRenderer, false);
 			titleCol.Sizing = TreeViewColumnSizing.Autosize;
 			titleCol.SetCellDataFunc (toggleRenderer, delegate (TreeViewColumn treeColumn, CellRenderer cell, TreeModel model, TreeIter iter) {
-				var provider = (BaseCodeIssueProvider)model.GetValue (iter, 1);
+				var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
 				if (provider == null) {
 					toggleRenderer.Visible = false;
 					return;
@@ -284,12 +287,11 @@ namespace MonoDevelop.CodeIssues
 			col.MinWidth = 100;
 			col.Expand = false;
 
-			var comboBoxStore = new ListStore (typeof(string), typeof(Severity));
-//			comboBoxStore.AppendValues (GetDescription (Severity.None), Severity.None);
-			comboBoxStore.AppendValues (GetDescription (Severity.Error), Severity.Error);
-			comboBoxStore.AppendValues (GetDescription (Severity.Warning), Severity.Warning);
-			comboBoxStore.AppendValues (GetDescription (Severity.Hint), Severity.Hint);
-			comboBoxStore.AppendValues (GetDescription (Severity.Suggestion), Severity.Suggestion);
+			var comboBoxStore = new ListStore (typeof(string), typeof(DiagnosticSeverity));
+			comboBoxStore.AppendValues (GetDescription (DiagnosticSeverity.Hidden), DiagnosticSeverity.Hidden);
+			comboBoxStore.AppendValues (GetDescription (DiagnosticSeverity.Error), DiagnosticSeverity.Error);
+			comboBoxStore.AppendValues (GetDescription (DiagnosticSeverity.Warning), DiagnosticSeverity.Warning);
+			comboBoxStore.AppendValues (GetDescription (DiagnosticSeverity.Info), DiagnosticSeverity.Info);
 			comboRenderer.Model = comboBoxStore;
 			comboRenderer.Mode = CellRendererMode.Activatable;
 			comboRenderer.TextColumn = 0;
@@ -307,8 +309,8 @@ namespace MonoDevelop.CodeIssues
 					return;
 				do {
 					if ((string)comboBoxStore.GetValue (storeIter, 0) == args.NewText) {
-						var provider = (BaseCodeIssueProvider)treeStore.GetValue (iter, 1);
-						var severity = (Severity)comboBoxStore.GetValue (storeIter, 1);
+						var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
+						var severity = (DiagnosticSeverity)comboBoxStore.GetValue (storeIter, 1);
 						severities[provider] = severity;
 						return;
 					}
@@ -316,15 +318,19 @@ namespace MonoDevelop.CodeIssues
 			};
 			
 			col.SetCellDataFunc (comboRenderer, delegate (TreeViewColumn treeColumn, CellRenderer cell, TreeModel model, TreeIter iter) {
-				var provider = (BaseCodeIssueProvider)model.GetValue (iter, 1);
+				var provider = (Tuple<CodeDiagnosticDescriptor, DiagnosticDescriptor>)treeStore.GetValue (iter, 1);
 				if (provider == null) {
 					comboRenderer.Visible = false;
 					return;
 				}
 				var severity = severities[provider];
+				if (!severity.HasValue) {
+					comboRenderer.Visible = false;
+					return;
+				}
 				comboRenderer.Visible = true;
-				comboRenderer.Text = GetDescription (severity);
-				comboRenderer.Icon = GetIcon (severity);
+				comboRenderer.Text = GetDescription (severity.Value);
+				comboRenderer.Icon = GetIcon (severity.Value);
 			});
 			treeviewInspections.HeadersVisible = false;
 			treeviewInspections.Model = treeStore;
@@ -342,10 +348,27 @@ namespace MonoDevelop.CodeIssues
 
 		public void ApplyChanges ()
 		{
-			foreach (var kv in severities)
-				kv.Key.SetSeverity (kv.Value);
-			foreach (var kv in enableState)
-				kv.Key.SetIsEnabled (kv.Value);
+			foreach (var kv in severities) {
+				var userSeverity = kv.Value;
+				if (!userSeverity.HasValue)
+					continue;
+				if (kv.Key.Item2 == null) {
+					kv.Key.Item1.DiagnosticSeverity = userSeverity;
+					continue;
+				}
+				kv.Key.Item1.SetSeverity (kv.Key.Item2, userSeverity.Value);
+			}
+
+			foreach (var kv in enableState) {
+				var userIsEnabled = kv.Value;
+				if (kv.Key.Item2 == null) {
+					kv.Key.Item1.IsEnabled = userIsEnabled;
+					continue;
+				}
+				kv.Key.Item1.SetIsEnabled (kv.Key.Item2, userIsEnabled);
+			}
+			foreach (var doc in IdeApp.Workbench.Documents)
+				doc.StartReparseThread ();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueProvider.cs
deleted file mode 100644
index d9a2abe2ef..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssueProvider.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-// 
-// IInspector.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Threading;
-using MonoDevelop.Core;
-using ICSharpCode.NRefactory.Refactoring;
-using Mono.TextEditor;
-using System;
-
-namespace MonoDevelop.CodeIssues
-{
-	public abstract class BaseCodeIssueProvider
-	{
-		public virtual CodeIssueProvider Parent {
-			get {
-				return null;
-			}
-		}
-		/// <summary>
-		/// Gets or sets the type of the MIME the provider is attached to.
-		/// </summary>
-		public abstract string MimeType {
-			get;
-		}
-
-		/// <summary>
-		/// Gets or sets the title of the issue provider (used in the option panel).
-		/// </summary>
-		public string Title { get; set; }
-
-		/// <summary>
-		/// Gets or sets the description of the issue provider (used in the option panel).
-		/// </summary>
-		public string Description { get; set; }
-
-		
-		/// <summary>
-		/// Gets the identifier string used as property ID tag.
-		/// </summary>
-		public virtual string IdString {
-			get {
-				return "refactoring.codeissues." + MimeType + "." + GetType ().FullName;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the default severity. Note that GetSeverity () should be called to get the valid value inside the IDE.
-		/// </summary>
-		public Severity DefaultSeverity { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether this issue is enabled. Note that GetIsEnabled () should be called to get the valid value inside the IDE.
-		/// </summary>
-		/// <value><c>true</c> if this instance is enabled; otherwise, <c>false</c>.</value>
-		public bool IsEnabledByDefault { get; set; }
-
-		/// <summary>
-		/// Gets the current (user defined) severity.
-		/// </summary>
-		protected Severity severity;
-
-		public Severity GetSeverity ()
-		{
-			return severity;
-		}
-
-		/// <summary>
-		/// Sets the user defined severity.
-		/// </summary>
-		public void SetSeverity (Severity severity)
-		{
-			if (this.severity == severity)
-				return;
-			this.severity = severity;
-			PropertyService.Set (IdString, severity);
-		}
-
-
-		protected bool isEnabled;
-		
-		public bool GetIsEnabled ()
-		{
-			return isEnabled;
-		}
-		
-		/// <summary>
-		/// Sets the user defined severity.
-		/// </summary>
-		public void SetIsEnabled (bool isEnabled)
-		{
-			if (this.isEnabled == isEnabled)
-				return;
-			this.isEnabled = isEnabled;
-			PropertyService.Set (IdString + ".isEnabled", isEnabled);
-		}
-
-		protected void UpdateSeverity ()
-		{
-			severity = PropertyService.Get<Severity> (IdString, DefaultSeverity);
-			isEnabled = PropertyService.Get<bool> (IdString+ ".isEnabled", IsEnabledByDefault);
-		}
-
-		/// <summary>
-		/// Gets all the code issues inside a document.
-		/// </summary>
-		public abstract IEnumerable<CodeIssue> GetIssues (object refactoringContext, CancellationToken cancellationToken);
-
-		public virtual bool CanDisableOnce { get { return false; } }
-
-		public virtual bool CanDisableAndRestore { get { return false; } }
-
-		public virtual bool CanDisableWithPragma { get { return false; } }
-
-		public virtual bool CanSuppressWithAttribute { get { return false; } }
-
-		public virtual void DisableOnce (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public virtual void DisableAndRestore (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public virtual void DisableWithPragma (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			throw new NotSupportedException ();
-		}
-
-		public virtual void SuppressWithAttribute (MonoDevelop.Ide.Gui.Document document, DocumentRegion loc)
-		{
-			throw new NotSupportedException ();
-		}
-	}
-
-
-	/// <summary>
-	/// A code issue provider is a factory that creates code issues of a given document.
-	/// </summary>
-	public abstract class CodeIssueProvider : BaseCodeIssueProvider
-	{
-		string mimeType;
-		public override string MimeType {
-			get {
-				return mimeType;
-			}
-		}
-
-		public void SetMimeType (string mimeType)
-		{
-			this.mimeType = mimeType;
-			UpdateSeverity ();
-		}
-
-		/// <summary>
-		/// Gets or sets the category of the issue provider (used in the option panel).
-		/// </summary>
-		public string Category { get; set; }
-
-		/// <summary>
-		/// If true this issue has sub issues.
-		/// </summary>
-		public abstract bool HasSubIssues { get; }
-
-		/// <summary>
-		/// Gets the sub issues of this issue. If HasSubIssus == false an InvalidOperationException is thrown.
-		/// </summary>
-		public virtual IEnumerable<BaseCodeIssueProvider> SubIssues { get { throw new InvalidOperationException (); } }
-
-		/// <summary>
-		/// Gets the effective set of providers. The effective set of providers
-		/// is either the sub issues (if it has sub issues) or simply itself (otherwise).
-		/// </summary>
-		/// <returns>The effective provider set.</returns>
-		public IEnumerable<BaseCodeIssueProvider> GetEffectiveProviderSet()
-		{
-			if (HasSubIssues)
-				return SubIssues;
-			return new[] { this };
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DefaultCodeIssueCategories.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DefaultCodeIssueCategories.cs
deleted file mode 100644
index 68f473ed32..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DefaultCodeIssueCategories.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// 
-// DefaultInspectionCategories.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin <http://xamarin.com>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.CodeIssues
-{
-	/// <summary>
-	/// Default code issue categories provide strings to common categories used in the code issue options panel.
-	/// </summary>
-	public static class DefaultCodeIssueCategories
-	{
-		public readonly static string Improvements      = GettextCatalog.GetString ("Code Improvements");
-		public readonly static string CodeQualityIssues = GettextCatalog.GetString ("Code Quality Issues");
-		public readonly static string ConstraintViolations = GettextCatalog.GetString ("Constraint Violations");
-		public readonly static string Redundancies = GettextCatalog.GetString ("Redundancies");
-		public readonly static string Opportunities = GettextCatalog.GetString ("Language Usage Opportunities");
-		public readonly static string Notifications = GettextCatalog.GetString ("Code Notifications");
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs
new file mode 100644
index 0000000000..830d8483bb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/DiagnosticResult.cs
@@ -0,0 +1,77 @@
+// 
+// CodeAnalysisRunner.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//#define PROFILE
+using System;
+using MonoDevelop.AnalysisCore;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using RefactoringEssentials;
+
+namespace MonoDevelop.CodeIssues
+{
+	class DiagnosticResult : Result
+	{
+		readonly Diagnostic diagnostic;
+
+		public Diagnostic Diagnostic {
+			get {
+				return diagnostic;
+			}
+		}
+
+		public DiagnosticResult (Diagnostic diagnostic) : base (GetSpan (diagnostic), diagnostic.GetMessage ())
+		{
+			if (diagnostic == null)
+				throw new ArgumentNullException ("diagnostic");
+			this.diagnostic = diagnostic;
+
+			SetSeverity (diagnostic.Severity, GetIssueMarker ()); 
+		}
+
+		static TextSpan GetSpan (Diagnostic diagnostic)
+		{
+			int start = diagnostic.Location.SourceSpan.Start;
+			int end = diagnostic.Location.SourceSpan.End;
+
+			foreach (var loc in diagnostic.AdditionalLocations) {
+				start = Math.Min (start, loc.SourceSpan.Start);
+				end = Math.Max (start, loc.SourceSpan.End);
+			}
+
+			return TextSpan.FromBounds (start, end);
+		}
+
+		IssueMarker GetIssueMarker ()
+		{
+			if (diagnostic.Descriptor.Category == DiagnosticAnalyzerCategories.RedundanciesInCode || diagnostic.Descriptor.Category == DiagnosticAnalyzerCategories.RedundanciesInDeclarations)
+				return IssueMarker.GrayOut;
+			if (diagnostic.Severity == DiagnosticSeverity.Info)
+				return IssueMarker.DottedLine;
+			return IssueMarker.WavedLine;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
deleted file mode 100644
index a92561d2d6..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//

-// FileGroupingProvider.cs

-//

-// Author:

-//       Marius Ungureanu <marius.ungureanu@xamarin.com>

-//

-// Copyright (c) 2013 Marius Ungureanu

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-using MonoDevelop.Projects;

-using MonoDevelop.Core;

-

-namespace MonoDevelop.CodeIssues

-{

-	[GroupingDescription("File")]

-	public class FileGroupingProvider : AbstractGroupingProvider<ProjectFile>

-	{

-		#region implemented abstract members of AbstractGroupingProvider

-		protected override ProjectFile GetGroupingKey (IssueSummary issue)

-		{

-			return issue.File;

-		}

-		protected override string GetGroupName (IssueSummary issue)

-		{

-			return issue.File.FilePath.ToRelative (issue.Project.BaseDirectory);

-		}

-		#endregion

-	}

-}

-

diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ICodeIssueProviderSource.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ICodeIssueProviderSource.cs
deleted file mode 100644
index 39ddd1a037..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ICodeIssueProviderSource.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// 
-// ICodeIssueProviderSource.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Collections.Generic;
-using System.Threading;
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Projects;
-using Mono.TextEditor;
-
-namespace MonoDevelop.CodeIssues
-{
-	/// <summary>
-	/// A code issue provider source provides a way for language backends to add a set of generated code issue providers.
-	/// </summary>
-	public interface ICodeIssueProviderSource
-	{
-		/// <summary>
-		/// Gets the providers.
-		/// </summary>
-		IEnumerable<CodeIssueProvider> GetProviders ();
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ISuppressionFixProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ISuppressionFixProvider.cs
new file mode 100644
index 0000000000..9343139e81
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ISuppressionFixProvider.cs
@@ -0,0 +1,63 @@
+//
+// ISuppressionFixProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Text;
+
+namespace MonoDevelop.CodeIssues
+{
+	interface ISuppressionFixProvider
+	{
+		/// <summary>
+		/// Returns true if the given diagnostic can be suppressed or unsuppressed.
+		/// </summary>
+		bool CanBeSuppressedOrUnsuppressed(Diagnostic diagnostic);
+
+		/// <summary>
+		/// Gets one or more add suppression or remove suppression fixes for the specified diagnostics represented as a list of <see cref="CodeAction"/>'s.
+		/// </summary>
+		/// <returns>A list of zero or more potential <see cref="CodeFix"/>'es. It is also safe to return null if there are none.</returns>
+		Task<IEnumerable<CodeFix>> GetSuppressionsAsync(Document document, TextSpan span, IEnumerable<Diagnostic> diagnostics, CancellationToken cancellationToken);
+
+		/// <summary>
+		/// Gets one or more add suppression or remove suppression fixes for the specified no-location diagnostics represented as a list of <see cref="CodeAction"/>'s.
+		/// </summary>
+		/// <returns>A list of zero or more potential <see cref="CodeFix"/>'es. It is also safe to return null if there are none.</returns>
+		Task<IEnumerable<CodeFix>> GetSuppressionsAsync(Project project, IEnumerable<Diagnostic> diagnostics, CancellationToken cancellationToken);
+
+		/// <summary>
+		/// Gets an optional <see cref="FixAllProvider"/> that can fix all/multiple occurrences of diagnostics fixed by this fix provider.
+		/// Return null if the provider doesn't support fix all/multiple occurrences.
+		/// Otherwise, you can return any of the well known fix all providers from <see cref="WellKnownFixAllProviders"/> or implement your own fix all provider.
+		/// </summary>
+		FixAllProvider GetFixAllProvider();
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueSummary.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueSummary.cs
deleted file mode 100644
index bb022e92a8..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueSummary.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-//
-// IGroupingProvider.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2013 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Refactoring;
-using MonoDevelop.Projects;
-using System.Collections.Generic;
-using System.IO;
-using System;
-using System.Linq;
-
-namespace MonoDevelop.CodeIssues
-{
-	public class IssueSummary: IIssueTreeNode
-	{
-		public static IssueSummary FromCodeIssue(ProjectFile file, BaseCodeIssueProvider provider, CodeIssue codeIssue)
-		{
-			var topLevelProvider = (provider as CodeIssueProvider) ?? provider.Parent;
-			if (topLevelProvider == null)
-				throw new ArgumentException ("must be a CodeIssueProvider or a BaseCodeIssueProvider with Parent != null", "provider");
-			var issueSummary = new IssueSummary {
-				IssueDescription = codeIssue.Description,
-				Region = codeIssue.Region,
-				ProviderTitle = topLevelProvider.Title,
-				ProviderDescription = topLevelProvider.Description,
-				ProviderCategory = topLevelProvider.Category,
-				Severity = topLevelProvider.GetSeverity (),
-				IssueMarker = codeIssue.IssueMarker,
-				File = file,
-				Project = file.Project,
-				InspectorIdString = codeIssue.InspectorIdString
-			};
-			issueSummary.Actions = codeIssue.Actions.Select (a => new ActionSummary {
-				Batchable = a.SupportsBatchRunning,
-				SiblingKey = a.SiblingKey,
-				Title = a.Title,
-				Region = a.DocumentRegion,
-				IssueSummary = issueSummary
-			}).ToList ();
-			return issueSummary;
-		}
-
-		#region IIssueTreeNode implementation
-		
-		string IIssueTreeNode.Text {
-			get {
-				string lineDescription;
-				if (Region.BeginLine == Region.EndLine) {
-					lineDescription = Region.BeginLine.ToString ();
-				} else {
-					lineDescription = string.Format ("{0}-{1}", Region.BeginLine, Region.EndLine);
-				}
-				var fileName = Path.GetFileName (File.Name);
-				return string.Format ("{0} [{1}:{2}]", IssueDescription, fileName, lineDescription);
-			}
-		}
-
-		static readonly ICollection<IIssueTreeNode> emptyCollection = new IIssueTreeNode[0];
-
-		ICollection<IIssueTreeNode> IIssueTreeNode.Children {
-			get {
-				return emptyCollection;
-			}
-		}
-
-		bool IIssueTreeNode.HasVisibleChildren {
-			get {
-				return false;
-			}
-		}
-
-		bool visible = true;
-		bool IIssueTreeNode.Visible {
-			get {
-				return visible;
-			}
-				
-			set {
-				if (visible != value) {
-					visible = value;
-					OnVisibleChanged (new IssueGroupEventArgs (this));
-				}
-			}
-		}
-
-		ICollection<IIssueTreeNode> IIssueTreeNode.AllChildren {
-			get {
-				return emptyCollection;
-			}
-		}
-		
-		event EventHandler<IssueGroupEventArgs> visibleChanged;
-		event EventHandler<IssueGroupEventArgs> IIssueTreeNode.VisibleChanged {
-			add {
-				visibleChanged += value;
-			}
-			remove {
-				visibleChanged -= value;
-			}
-		}
-
-		protected virtual void OnVisibleChanged (IssueGroupEventArgs eventArgs)
-		{
-			var handler = visibleChanged;
-			if (handler != null) {
-				handler (this, eventArgs);
-			}
-		}
-		
-		// no-op events, these never happen in this implementation
-		event EventHandler<IssueGroupEventArgs> IIssueTreeNode.ChildrenInvalidated {
-			add {
-			}
-			remove {
-			}
-		}
-
-		event EventHandler<IssueTreeNodeEventArgs> IIssueTreeNode.ChildAdded {
-			add {
-			}
-			remove {
-			}
-		}
-
-		event EventHandler<IssueGroupEventArgs> IIssueTreeNode.TextChanged {
-			add {
-			}
-			remove {
-			}
-		}
-		
-		#endregion
-		
-		/// <summary>
-		/// The description of the issue.
-		/// </summary>
-		public string IssueDescription { get; set; }
-
-		/// <summary>
-		/// The region.
-		/// </summary>
-		public DomRegion Region { get; set; }
-
-		/// <summary>
-		/// Gets or sets the category of the issue provider.
-		/// </summary>
-		public string ProviderCategory { get; set; }
-
-		/// <summary>
-		/// Gets or sets the title of the issue provider.
-		/// </summary>
-		public string ProviderTitle { get; set; }
-
-		/// <summary>
-		/// Gets or sets the description of the issue provider.
-		/// </summary>
-		public string ProviderDescription { get; set; }
-
-		/// <summary>
-		/// Gets or sets the severity.
-		/// </summary>
-		public Severity Severity { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating how this issue should be marked inside the text editor.
-		/// Note: There is only one code issue provider generated therfore providers need to be state less.
-		/// </summary>
-		public IssueMarker IssueMarker { get; set; }
-
-		/// <summary>
-		/// Gets or sets the file that this issue was found in.
-		/// </summary>
-		/// <value>The file.</value>
-		public ProjectFile File { get; set; }
-
-		/// <summary>
-		/// Gets or sets the project this issue was found in.
-		/// </summary>
-		/// <value>The project.</value>
-		public Project Project { get; set; }
-
-		/// <summary>
-		/// Gets or sets the type of the inspector that was the source of this issue.
-		/// </summary>
-		/// <value>The type of the inspector.</value>
-		public string InspectorIdString { get; set; }
-
-		IList<ActionSummary> actions;
-
-		/// <summary>
-		/// Gets or sets the actions available to fix this issue.
-		/// </summary>
-		/// <value>The actions.</value>
-		public IList<ActionSummary> Actions {
-			get {
-				if (actions == null) {
-					Actions = new List<ActionSummary> ();
-				}
-				return actions;
-			}
-			set {
-				if (value == null)
-					throw new ArgumentNullException ("value");
-				actions = value;
-			}
-		}
-		
-		public override string ToString ()
-		{
-			return string.Format ("[IssueSummary: ProviderTitle={2}, Region={0}, ProviderCategory={1}]", Region, ProviderCategory, ProviderTitle);
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AbstractGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AbstractGroupingProvider.cs
index 3f7cd390c7..3f7cd390c7 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AbstractGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AbstractGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ActionSummary.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ActionSummary.cs
new file mode 100644
index 0000000000..7a560e69fd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ActionSummary.cs
@@ -0,0 +1,65 @@
+//
+// IGroupingProvider.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2013 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.CodeIssues
+{
+	public class ActionSummary
+	{
+		/// <summary>
+		/// Gets or sets the title.
+		/// </summary>
+		/// <value>The title.</value>
+		public string Title { get; set; }
+		
+		/// <summary>
+		/// Gets or sets the sibling key.
+		/// </summary>
+		/// <value>The sibling key.</value>
+		public object SiblingKey { get; set; }
+
+		/// <summary>
+		/// Gets a value indicating whether this <see cref="MonoDevelop.CodeIssues.ActionSummary"/> is batchable.
+		/// </summary>
+		/// <value><c>true</c> if batchable; otherwise, <c>false</c>.</value>
+		public bool Batchable { get; set; }
+		
+		public DocumentRegion Region { get; set; }
+
+		/// <summary>
+		/// Gets or sets the <see cref="IssueSummary"/> representing the source of this action.
+		/// </summary>
+		/// <value>The issue summary.</value>
+		public IssueSummary IssueSummary { get; set; }
+		
+		public override string ToString ()
+		{
+			return string.Format ("[ActionSummary: Title={0}, Batchable={1}, Region={2}]", Title, Batchable, Region);
+		}
+	}
+
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalysisState.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AnalysisState.cs
index 221e11d819..221e11d819 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalysisState.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AnalysisState.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalysisStateChangeEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AnalysisStateChangeEventArgs.cs
index 7531189f08..7531189f08 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/AnalysisStateChangeEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/AnalysisStateChangeEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs
new file mode 100644
index 0000000000..c4c6491f05
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs
@@ -0,0 +1,141 @@
+//
+// BatchFixer.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2013 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using MonoDevelop.Ide;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+using MonoDevelop.Refactoring;
+using ICSharpCode.NRefactory.Refactoring;
+using System.Threading;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.TypeSystem;
+using ICSharpCode.NRefactory.CSharp;
+using System.Text;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.CodeIssues
+{
+	public class BatchFixer
+	{
+		readonly IActionMatcher matcher;
+
+		readonly ProgressMonitor monitor;
+
+		public BatchFixer (IActionMatcher matcher, ProgressMonitor monitor)
+		{
+			this.matcher = matcher;
+			this.monitor = monitor;
+		}
+
+		/// <summary>
+		/// Tries to apply the actions passed in <paramref name="actions"/>.
+		/// </summary>
+		/// <param name="actions">The actions to apply.</param>
+		/// <returns>The fixed code actions.</returns>
+		public IEnumerable<ActionSummary> TryFixIssues (IEnumerable<ActionSummary> actions)
+		{
+			if (actions == null)
+				throw new ArgumentNullException ("actions");
+				
+			// enumerate once
+			var actionSummaries = actions as IList<ActionSummary> ?? actions.ToList ();
+			var issueSummaries = actionSummaries.Select (action => action.IssueSummary).ToList ();
+			var files = issueSummaries.Select (issue => issue.File).Distinct ().ToList ();
+			monitor.BeginTask ("Applying fixes", files.Count);
+			
+			var appliedActions = new List<ActionSummary> (issueSummaries.Count);
+			Parallel.ForEach (files, file => {
+				monitor.Step (1);
+				
+				var fileSummaries = issueSummaries.Where (summary => summary.File == file);
+				var inspectorIds = new HashSet<string> (fileSummaries.Select (summary => summary.InspectorIdString));
+				
+				bool isOpen;
+				var data = TextFileProvider.Instance.GetTextEditorData (file.FilePath, out isOpen);
+				IRefactoringContext refactoringContext;
+				var realActions = GetIssues (data, file, inspectorIds, out refactoringContext).SelectMany (issue => issue.Actions).ToList ();
+				if (realActions.Count == 0 || refactoringContext == null)
+					return;
+				
+				var fileActionSummaries = actionSummaries.Where (summary => summary.IssueSummary.File == file).ToList ();
+				var matches = matcher.Match (fileActionSummaries, realActions).ToList ();
+				
+				var appliedFixes = RefactoringService.ApplyFixes (matches.Select (match => match.Action), refactoringContext);
+				appliedActions.AddRange (matches.Where (match => appliedFixes.Contains (match.Action)).Select (match => match.Summary));
+				
+				if (!isOpen) {
+					// If the file is open we leave it to the user to explicitly save the file
+					data.Save ();
+				}
+			});
+			return appliedActions;
+		}
+
+		static IList<CodeIssue> GetIssues (ITextDocument data, ProjectFile file, ISet<string> inspectorIds, out IRefactoringContext refactoringContext)
+		{
+			var issues = new List<CodeIssue> ();
+//			
+//			var document = TypeSystemService.ParseFile (file.Project, data);
+//			if (document == null) {
+				refactoringContext = null;
+//				return issues;
+//			}
+//
+//			var content = TypeSystemService.GetProjectContext (file.Project);
+//			var compilation  = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
+//			var resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile);
+//			
+//			refactoringContext = document.CreateRefactoringContextWithEditor (data, resolver, CancellationToken.None);
+//			var context = refactoringContext;
+//			foreach (var provider in GetInspectors (data, inspectorIds)) {
+//				var severity = provider.GetSeverity ();
+//				if (severity == Severity.None || !provider.GetIsEnabled ())
+//					continue;
+//				try {
+//					lock (issues) {
+//						issues.AddRange (provider.GetIssues (context, CancellationToken.None));
+//					}
+//				} catch (Exception ex) {
+//					LoggingService.LogError ("Error while running code issue on: " + data.FileName, ex);
+//				}
+//			}
+			return issues;
+		}
+
+		static IList<CodeIssueProvider> GetInspectors (IReadonlyTextDocument editor, ICollection<string> inspectorIds)
+		{
+			var inspectors = RefactoringService.GetInspectors (editor.MimeType).ToList ();
+			return inspectors
+				.Where (inspector => inspectorIds.Contains (inspector.IdString))
+				.ToList ();
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CategoryGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CategoryGroupingProvider.cs
index bb7094f20d..bb7094f20d 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CategoryGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CategoryGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs
new file mode 100644
index 0000000000..8306a6ab3c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs
@@ -0,0 +1,162 @@
+//
+// CodeIssueBatchRunner.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+// Copyright (c) 2013 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using System.Threading;
+using MonoDevelop.Ide;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.TypeSystem;
+using System.Threading.Tasks;
+using System.IO;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.Refactoring;
+using MonoDevelop.Core;
+using System.Collections.Concurrent;
+using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Core.Instrumentation;
+using MonoDevelop.Refactoring;
+using System.Collections.Generic;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CodeIssues
+{
+	public class CodeAnalysisBatchRunner
+	{
+		private readonly object _lock = new object ();
+
+		private int workerCount;
+
+		private readonly AnalysisJobQueue jobQueue = new AnalysisJobQueue ();
+
+		public IJobContext QueueJob (IAnalysisJob job)
+		{
+			jobQueue.Add (job);
+			EnsureRunning ();
+			return new JobContext (job, jobQueue, this);
+		}
+
+		private void EnsureRunning ()
+		{
+			for (; Interlocked.Add (ref workerCount, 1) < Environment.ProcessorCount;) {
+				new Thread (() => {
+					try {
+						ProcessQueue ();
+					}
+					finally {
+						Interlocked.Add (ref workerCount, -1);
+					}
+				}).Start ();
+			}
+		}
+
+		private void ProcessQueue ()
+		{
+			while (true) {
+				try {
+					using (var slice = GetSlice ()) {
+						if (slice == null)
+							// TODO: Do something smarter if the queue is empty
+							return;
+						AnalyzeFile (slice, slice.GetJobs ().SelectMany (job => job.GetIssueProviders (slice.File)));
+					}
+				} catch (Exception e) {
+					LoggingService.LogError ("Unhandled exception", e);
+				}
+			}
+		}
+
+		private JobSlice GetSlice ()
+		{
+			lock (_lock) {
+				return jobQueue.Dequeue (1).FirstOrDefault ();
+			}
+		}
+
+		void AnalyzeFile (JobSlice item, IEnumerable<BaseCodeIssueProvider> codeIssueProviders)
+		{
+//			var file = item.File;
+//
+//			if (file.BuildAction != BuildAction.Compile)
+//				return;
+//
+//			if (!(file.Project is DotNetProject))
+//				return;
+//
+//			TextEditorData editor;
+//			try {
+//				editor = TextFileProvider.Instance.GetReadOnlyTextEditorData (file.FilePath);
+//			} catch (FileNotFoundException) {
+//				// Swallow exception and ignore this file
+//				return;
+//			}
+//			var document = TypeSystemService.ParseFile (file.Project, editor);
+//			if (document == null)
+//				return;
+//
+//			var content = TypeSystemService.GetProjectContext (file.Project);
+//			var compilation = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
+//
+//			CSharpAstResolver resolver;
+//			using (var timer = ExtensionMethods.ResolveCounter.BeginTiming ()) {
+//				resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile);
+//				try {
+//					resolver.ApplyNavigator (new ExtensionMethods.ConstantModeResolveVisitorNavigator (ResolveVisitorNavigationMode.Resolve, null));
+//				} catch (Exception e) {
+//					LoggingService.LogError ("Error while applying navigator", e);
+//				}
+//			}
+//			var context = document.CreateRefactoringContextWithEditor (editor, resolver, CancellationToken.None);
+//
+//			foreach (var provider in codeIssueProviders) {
+//				if (item.CancellationToken.IsCancellationRequested)
+//					break;
+//				IList<IAnalysisJob> jobs;
+//				lock (_lock)
+//					jobs = item.GetJobs ().ToList ();
+//				var jobsForProvider = jobs.Where (j => j.GetIssueProviders (file).Contains (provider)).ToList();
+//				try {
+//					var issues = provider.GetIssues (context, CancellationToken.None).ToList ();
+//					foreach (var job in jobsForProvider) {
+//						// Call AddResult even if issues.Count == 0, to enable a job implementation to keep
+//						// track of progress information.
+//						job.AddResult (file, provider, issues);
+//					}
+//				} catch (OperationCanceledException) {
+//					// The operation was cancelled, no-op as the user-visible parts are
+//					// handled elsewhere
+//				} catch (Exception e) {
+//					foreach (var job in jobsForProvider) {
+//						job.AddError (file, provider);
+//					}
+//				}
+//			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeIssuePad.cs
index c875894512..c875894512 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeIssuePad.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ExactIssueMatcher.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ExactIssueMatcher.cs
index 3f1db8df72..3f1db8df72 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ExactIssueMatcher.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ExactIssueMatcher.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/FileGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/FileGroupingProvider.cs
new file mode 100644
index 0000000000..aa1d64d7cf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/FileGroupingProvider.cs
@@ -0,0 +1,46 @@
+//
+// FileGroupingProvider.cs
+//
+// Author:
+//       Marius Ungureanu <marius.ungureanu@xamarin.com>
+//
+// Copyright (c) 2013 Marius Ungureanu
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Projects;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CodeIssues
+{
+	[GroupingDescription("File")]
+	public class FileGroupingProvider : AbstractGroupingProvider<ProjectFile>
+	{
+		#region implemented abstract members of AbstractGroupingProvider
+		protected override ProjectFile GetGroupingKey (IssueSummary issue)
+		{
+			return issue.File;
+		}
+		protected override string GetGroupName (IssueSummary issue)
+		{
+			return issue.File.FilePath.ToRelative (issue.Project.BaseDirectory);
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingDescriptionAttribute.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingDescriptionAttribute.cs
index 720084149e..720084149e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingDescriptionAttribute.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingDescriptionAttribute.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingProviderChainControl.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingProviderChainControl.cs
index 3449d7b24b..3449d7b24b 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingProviderChainControl.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingProviderChainControl.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingProviderEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingProviderEventArgs.cs
index f9eee0fc87..f9eee0fc87 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/GroupingProviderEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/GroupingProviderEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IActionMatcher.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IActionMatcher.cs
index 8e732f596a..8e732f596a 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IActionMatcher.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IActionMatcher.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IGroupingProvider.cs
index 19b0001bf4..19b0001bf4 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IIssueSummarySink.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IIssueSummarySink.cs
index af1cb51c0c..af1cb51c0c 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IIssueSummarySink.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IIssueSummarySink.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IIssueTreeNode.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IIssueTreeNode.cs
index 68cf43ef50..68cf43ef50 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IIssueTreeNode.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IIssueTreeNode.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueGroup.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueGroup.cs
index 10e261b7fc..10e261b7fc 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueGroup.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueGroup.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueGroupEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueGroupEventArgs.cs
index 42787d4560..42787d4560 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueGroupEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueGroupEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueMatch.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueMatch.cs
index fbdaafcd57..fbdaafcd57 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueMatch.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueMatch.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueSummary.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueSummary.cs
new file mode 100644
index 0000000000..5e7c4d201c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueSummary.cs
@@ -0,0 +1,236 @@
+//
+// IGroupingProvider.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2013 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Refactoring;
+using MonoDevelop.Projects;
+using System.Collections.Generic;
+using System.IO;
+using System;
+using System.Linq;
+
+namespace MonoDevelop.CodeIssues
+{
+	public class IssueSummary: IIssueTreeNode
+	{
+		public static IssueSummary FromCodeIssue(ProjectFile file, BaseCodeIssueProvider provider, CodeIssue codeIssue)
+		{
+			var topLevelProvider = (provider as CodeIssueProvider) ?? provider.Parent;
+			if (topLevelProvider == null)
+				throw new ArgumentException ("must be a CodeIssueProvider or a BaseCodeIssueProvider with Parent != null", "provider");
+			var issueSummary = new IssueSummary {
+				IssueDescription = codeIssue.Description,
+				Region = codeIssue.Region,
+				ProviderTitle = topLevelProvider.Title,
+				ProviderDescription = topLevelProvider.Description,
+				ProviderCategory = topLevelProvider.Category,
+				Severity = topLevelProvider.GetSeverity (),
+				IssueMarker = codeIssue.IssueMarker,
+				File = file,
+				Project = file.Project,
+				InspectorIdString = codeIssue.InspectorIdString
+			};
+			issueSummary.Actions = codeIssue.Actions.Select (a => new ActionSummary {
+//				Batchable = a.SupportsBatchRunning,
+//				SiblingKey = a.SiblingKey,
+//				Title = a.,
+//				Region = a.DocumentRegion,
+				IssueSummary = issueSummary
+			}).ToList ();
+			return issueSummary;
+		}
+
+		#region IIssueTreeNode implementation
+		
+		string IIssueTreeNode.Text {
+			get {
+				string lineDescription;
+				if (Region.BeginLine == Region.EndLine) {
+					lineDescription = Region.BeginLine.ToString ();
+				} else {
+					lineDescription = string.Format ("{0}-{1}", Region.BeginLine, Region.EndLine);
+				}
+				var fileName = Path.GetFileName (File.Name);
+				return string.Format ("{0} [{1}:{2}]", IssueDescription, fileName, lineDescription);
+			}
+		}
+
+		static readonly ICollection<IIssueTreeNode> emptyCollection = new IIssueTreeNode[0];
+
+		ICollection<IIssueTreeNode> IIssueTreeNode.Children {
+			get {
+				return emptyCollection;
+			}
+		}
+
+		bool IIssueTreeNode.HasVisibleChildren {
+			get {
+				return false;
+			}
+		}
+
+		bool visible = true;
+		bool IIssueTreeNode.Visible {
+			get {
+				return visible;
+			}
+				
+			set {
+				if (visible != value) {
+					visible = value;
+					OnVisibleChanged (new IssueGroupEventArgs (this));
+				}
+			}
+		}
+
+		ICollection<IIssueTreeNode> IIssueTreeNode.AllChildren {
+			get {
+				return emptyCollection;
+			}
+		}
+		
+		event EventHandler<IssueGroupEventArgs> visibleChanged;
+		event EventHandler<IssueGroupEventArgs> IIssueTreeNode.VisibleChanged {
+			add {
+				visibleChanged += value;
+			}
+			remove {
+				visibleChanged -= value;
+			}
+		}
+
+		protected virtual void OnVisibleChanged (IssueGroupEventArgs eventArgs)
+		{
+			var handler = visibleChanged;
+			if (handler != null) {
+				handler (this, eventArgs);
+			}
+		}
+		
+		// no-op events, these never happen in this implementation
+		event EventHandler<IssueGroupEventArgs> IIssueTreeNode.ChildrenInvalidated {
+			add {
+			}
+			remove {
+			}
+		}
+
+		event EventHandler<IssueTreeNodeEventArgs> IIssueTreeNode.ChildAdded {
+			add {
+			}
+			remove {
+			}
+		}
+
+		event EventHandler<IssueGroupEventArgs> IIssueTreeNode.TextChanged {
+			add {
+			}
+			remove {
+			}
+		}
+		
+		#endregion
+		
+		/// <summary>
+		/// The description of the issue.
+		/// </summary>
+		public string IssueDescription { get; set; }
+
+		/// <summary>
+		/// The region.
+		/// </summary>
+		public DomRegion Region { get; set; }
+
+		/// <summary>
+		/// Gets or sets the category of the issue provider.
+		/// </summary>
+		public string ProviderCategory { get; set; }
+
+		/// <summary>
+		/// Gets or sets the title of the issue provider.
+		/// </summary>
+		public string ProviderTitle { get; set; }
+
+		/// <summary>
+		/// Gets or sets the description of the issue provider.
+		/// </summary>
+		public string ProviderDescription { get; set; }
+
+		/// <summary>
+		/// Gets or sets the severity.
+		/// </summary>
+		public Severity Severity { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating how this issue should be marked inside the text editor.
+		/// Note: There is only one code issue provider generated therfore providers need to be state less.
+		/// </summary>
+		public IssueMarker IssueMarker { get; set; }
+
+		/// <summary>
+		/// Gets or sets the file that this issue was found in.
+		/// </summary>
+		/// <value>The file.</value>
+		public ProjectFile File { get; set; }
+
+		/// <summary>
+		/// Gets or sets the project this issue was found in.
+		/// </summary>
+		/// <value>The project.</value>
+		public Project Project { get; set; }
+
+		/// <summary>
+		/// Gets or sets the type of the inspector that was the source of this issue.
+		/// </summary>
+		/// <value>The type of the inspector.</value>
+		public string InspectorIdString { get; set; }
+
+		IList<ActionSummary> actions;
+
+		/// <summary>
+		/// Gets or sets the actions available to fix this issue.
+		/// </summary>
+		/// <value>The actions.</value>
+		public IList<ActionSummary> Actions {
+			get {
+				if (actions == null) {
+					Actions = new List<ActionSummary> ();
+				}
+				return actions;
+			}
+			set {
+				if (value == null)
+					throw new ArgumentNullException ("value");
+				actions = value;
+			}
+		}
+		
+		public override string ToString ()
+		{
+			return string.Format ("[IssueSummary: ProviderTitle={2}, Region={0}, ProviderCategory={1}]", Region, ProviderCategory, ProviderTitle);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueTreeNodeEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueTreeNodeEventArgs.cs
index 37d663f252..37d663f252 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/IssueTreeNodeEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/IssueTreeNodeEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/NullGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/NullGroupingProvider.cs
index 677d9989c6..677d9989c6 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/NullGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/NullGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ProjectGroupingProvider.cs
index 7ca19ba063..7ca19ba063 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ProjectGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProviderGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ProviderGroupingProvider.cs
index 7cdf46e461..7cdf46e461 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProviderGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/ProviderGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/AnalysisJobQueue.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/AnalysisJobQueue.cs
index cdb3182fbb..cdb3182fbb 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/AnalysisJobQueue.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/AnalysisJobQueue.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/CodeIssueEventArgs.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/CodeIssueEventArgs.cs
index 53e3a29f8b..53e3a29f8b 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/CodeIssueEventArgs.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/CodeIssueEventArgs.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/IAnalysisJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/IAnalysisJob.cs
index 0ab2553b4f..0ab2553b4f 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/IAnalysisJob.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/IAnalysisJob.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/IJobContext.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/IJobContext.cs
index 4027081b81..4027081b81 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/IJobContext.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/IJobContext.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobContext.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobContext.cs
index e15c83c88e..e15c83c88e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobContext.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobContext.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobSlice.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobSlice.cs
index 7802e21ada..7802e21ada 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobSlice.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobSlice.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobStatus.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobStatus.cs
index 02ca3eb1fd..02ca3eb1fd 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/JobStatus.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/JobStatus.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/ProgressMonitorWrapperJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/ProgressMonitorWrapperJob.cs
new file mode 100644
index 0000000000..b1eea307cf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/ProgressMonitorWrapperJob.cs
@@ -0,0 +1,126 @@
+//
+// ProgressReportingWrapperJob.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2013 Simon Lindgren
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Linq;
+using MonoDevelop.Ide;
+using MonoDevelop.Core;
+using MonoDevelop.Projects;
+using System.Collections.Generic;
+using System;
+
+namespace MonoDevelop.CodeIssues
+{
+	public class ProgressMonitorWrapperJob : IAnalysisJob
+	{
+		readonly IAnalysisJob wrappedJob;
+
+		ProgressMonitor monitor;

+

+		int reportingThinningFactor = 100;

+

+		int completedWork;

+

+		public ProgressMonitorWrapperJob (IAnalysisJob wrappedJob, string message)
+		{
+			this.wrappedJob = wrappedJob;
+			monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (message, null, false);
+			var work = wrappedJob.GetFiles ().Sum (f => wrappedJob.GetIssueProviders (f).Count ());
+			
+			monitor.BeginTask (message, work);
+		}
+
+		#region IAnalysisJob implementation
+
+		public event EventHandler<CodeIssueEventArgs> CodeIssueAdded {
+			add {
+				wrappedJob.CodeIssueAdded += value;
+			}
+			remove {
+				wrappedJob.CodeIssueAdded -= value;
+			}
+		}
+
+		public IEnumerable<ProjectFile> GetFiles ()
+		{
+			return wrappedJob.GetFiles ();
+		}
+
+		public IEnumerable<BaseCodeIssueProvider> GetIssueProviders (ProjectFile file)
+		{
+			return wrappedJob.GetIssueProviders (file);
+		}
+
+		public void AddResult (ProjectFile file, BaseCodeIssueProvider provider, IEnumerable<CodeIssue> issues)
+		{
+			Step ();
+			wrappedJob.AddResult (file, provider, issues);
+		}
+
+		public void AddError (ProjectFile file, BaseCodeIssueProvider provider)
+		{
+			Step ();
+			wrappedJob.AddError (file, provider);
+		}
+
+		public event EventHandler<EventArgs> Completed {
+			add {
+				wrappedJob.Completed += value;
+			}
+			remove {
+				wrappedJob.Completed -= value;
+			}
+		}
+
+		public void SetCompleted ()
+		{
+			StopReporting ();
+			wrappedJob.SetCompleted ();
+		}
+
+		void Step ()

+		{

+			completedWork++;
+			if (monitor != null && completedWork % reportingThinningFactor == 0) {
+				monitor.Step (reportingThinningFactor);
+			}
+		}
+
+		void StopReporting ()
+		{
+			if (monitor != null) {
+				monitor.Dispose ();
+				monitor = null;
+			}
+		}
+
+		public void NotifyCancelled ()
+		{
+			StopReporting ();
+		}
+
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/SimpleAnalysisJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs
index 15878be01b..15878be01b 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/SimpleAnalysisJob.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/SeverityGroupingProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/SeverityGroupingProvider.cs
index dc129bb35e..dc129bb35e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/SeverityGroupingProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/SeverityGroupingProvider.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/SolutionAnalysisJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/SolutionAnalysisJob.cs
index 785c037dcd..785c037dcd 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/SolutionAnalysisJob.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/SolutionAnalysisJob.cs
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/ProgressMonitorWrapperJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/ProgressMonitorWrapperJob.cs
deleted file mode 100644
index 6557a3c04e..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Runner/ProgressMonitorWrapperJob.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-//
-// ProgressReportingWrapperJob.cs
-//
-// Author:
-//       Simon Lindgren <simon.n.lindgren@gmail.com>
-//
-// Copyright (c) 2013 Simon Lindgren
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System.Linq;
-using MonoDevelop.Ide;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using System.Collections.Generic;
-using System;
-
-namespace MonoDevelop.CodeIssues
-{
-	public class ProgressMonitorWrapperJob : IAnalysisJob
-	{
-		readonly IAnalysisJob wrappedJob;
-
-		IProgressMonitor monitor;

-

-		int reportingThinningFactor = 100;

-

-		int completedWork;

-

-		public ProgressMonitorWrapperJob (IAnalysisJob wrappedJob, string message)
-		{
-			this.wrappedJob = wrappedJob;
-			monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (message, null, false);
-			var work = wrappedJob.GetFiles ().Sum (f => wrappedJob.GetIssueProviders (f).Count ());
-			
-			monitor.BeginTask (message, work);
-		}
-
-		#region IAnalysisJob implementation
-
-		public event EventHandler<CodeIssueEventArgs> CodeIssueAdded {
-			add {
-				wrappedJob.CodeIssueAdded += value;
-			}
-			remove {
-				wrappedJob.CodeIssueAdded -= value;
-			}
-		}
-
-		public IEnumerable<ProjectFile> GetFiles ()
-		{
-			return wrappedJob.GetFiles ();
-		}
-
-		public IEnumerable<BaseCodeIssueProvider> GetIssueProviders (ProjectFile file)
-		{
-			return wrappedJob.GetIssueProviders (file);
-		}
-
-		public void AddResult (ProjectFile file, BaseCodeIssueProvider provider, IEnumerable<CodeIssue> issues)
-		{
-			Step ();
-			wrappedJob.AddResult (file, provider, issues);
-		}
-
-		public void AddError (ProjectFile file, BaseCodeIssueProvider provider)
-		{
-			Step ();
-			wrappedJob.AddError (file, provider);
-		}
-
-		public event EventHandler<EventArgs> Completed {
-			add {
-				wrappedJob.Completed += value;
-			}
-			remove {
-				wrappedJob.Completed -= value;
-			}
-		}
-
-		public void SetCompleted ()
-		{
-			StopReporting ();
-			wrappedJob.SetCompleted ();
-		}
-
-		void Step ()

-		{

-			completedWork++;
-			if (monitor != null && completedWork % reportingThinningFactor == 0) {
-				monitor.Step (reportingThinningFactor);
-			}
-		}
-
-		void StopReporting ()
-		{
-			if (monitor != null) {
-				monitor.Dispose ();
-				monitor = null;
-			}
-		}
-
-		public void NotifyCancelled ()
-		{
-			StopReporting ();
-		}
-
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameHandler.cs
deleted file mode 100644
index 1b965f684d..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameHandler.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// 
-// RenameHandler.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace MonoDevelop.Refactoring.Rename
-{
-	public class RenameHandler : AbstractRefactoringCommandHandler
-	{
-		protected override void Update (RefactoringOptions options, CommandInfo info)
-		{
-			var renameRefactoring = new RenameRefactoring ();
-			if (!renameRefactoring.IsValid (options))
-				info.Bypass = true;
-		}
-
-		protected override void Run (RefactoringOptions options)
-		{
-			var renameRefactoring = new RenameRefactoring ();
-			if (renameRefactoring.IsValid (options))
-				renameRefactoring.Run (options);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
index 69852183a5..6682c5ab01 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
@@ -32,110 +32,105 @@ using MonoDevelop.Core;
 using System.Collections.Generic;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.ProgressMonitoring;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
 using System.Linq;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Refactoring.Rename
 {
 	public partial class RenameItemDialog : Gtk.Dialog
 	{
-		RenameRefactoring rename;
-		RefactoringOptions options;
-		
-		public RenameItemDialog (RefactoringOptions options, RenameRefactoring rename)
+		Func<RenameRefactoring.RenameProperties, Task<IList<Change>>> rename;
+
+		public RenameItemDialog (string title, string currentName, Func<RenameRefactoring.RenameProperties, Task<IList<Change>>> renameOperation)
 		{
-			this.options = options;
-			this.rename = rename;
-			if (options.SelectedItem is IMethod && ((IMethod)options.SelectedItem).IsConstructor) {
-				options.SelectedItem = ((IMethod)options.SelectedItem).DeclaringType;
-			}
 			this.Build ();
-			includeOverloadsCheckbox.Active = true;
-			includeOverloadsCheckbox.Visible = false;
-			if (options.SelectedItem is IType) {
+			Init (title, currentName, renameOperation);
+		}
 
-				var t = (IType)options.SelectedItem;
-				if (t.Kind == TypeKind.TypeParameter) {
-					this.Title = GettextCatalog.GetString ("Rename Type Parameter");
+		public RenameItemDialog (ISymbol symbol, RenameRefactoring rename)
+		{
+			this.Build ();
+
+			string title;
+			if (symbol is ITypeSymbol) {
+
+				var t = (ITypeSymbol)symbol;
+				if (t.TypeKind == TypeKind.TypeParameter) {
+					title = GettextCatalog.GetString ("Rename Type Parameter");
 					entry.Text = t.Name;
 
 				} else {
-					var typeDefinition = (t).GetDefinition ();
-					if (typeDefinition.DeclaringType == null) {
+					var typeDefinition = t;
+					if (typeDefinition.ContainingType == null) {
 						// not supported for inner types
 						this.renameFileFlag.Visible = true;
-						this.renameFileFlag.Active = options.Document != null ? options.Document.FileName.FileNameWithoutExtension.Contains (typeDefinition.Name) : false;
+						this.renameFileFlag.Active = t.Locations.First ().SourceTree.FilePath.Contains (typeDefinition.Name);
 					} else {
 						this.renameFileFlag.Active = false;
 					}
-					if (typeDefinition.Kind == TypeKind.Interface)
-						this.Title = GettextCatalog.GetString ("Rename Interface");
+					if (typeDefinition.TypeKind == TypeKind.Interface)
+						title = GettextCatalog.GetString ("Rename Interface");
+					else if (typeDefinition.TypeKind == TypeKind.Delegate)
+						title = GettextCatalog.GetString ("Rename Delegate");
+					else if (typeDefinition.TypeKind == TypeKind.Enum)
+						title = GettextCatalog.GetString ("Rename Enum");
+					else if (typeDefinition.TypeKind == TypeKind.Struct)
+						title = GettextCatalog.GetString ("Rename Struct");
 					else
-						this.Title = GettextCatalog.GetString ("Rename Class");
+						title = GettextCatalog.GetString ("Rename Class");
 				}
 				//				this.fileName = type.GetDefinition ().Region.FileName;
-			} else if (options.SelectedItem is IField) {
-				this.Title = GettextCatalog.GetString ("Rename Field");
-			} else if (options.SelectedItem is IProperty) {
-				if (((IProperty)options.SelectedItem).IsIndexer) {
-					this.Title = GettextCatalog.GetString ("Rename Indexer");
+			} else if (symbol.Kind == SymbolKind.Field) {
+				title = GettextCatalog.GetString ("Rename Field");
+			} else if (symbol.Kind == SymbolKind.Property) {
+				title = GettextCatalog.GetString ("Rename Property");
+			} else if (symbol.Kind == SymbolKind.Event) {
+				title = GettextCatalog.GetString ("Rename Event");
+			} else if (symbol.Kind == SymbolKind.Method) { 
+				var m = (IMethodSymbol)symbol;
+				if (m.MethodKind == MethodKind.Constructor ||
+					m.MethodKind == MethodKind.StaticConstructor ||
+					m.MethodKind == MethodKind.Destructor) {
+					title = GettextCatalog.GetString ("Rename Class");
 				} else {
-					this.Title = GettextCatalog.GetString ("Rename Property");
+					title = GettextCatalog.GetString ("Rename Method");
+					includeOverloadsCheckbox.Visible = m.ContainingType.GetMembers (m.Name).Length > 1;
 				}
-			} else if (options.SelectedItem is IEvent) {
-				this.Title = GettextCatalog.GetString ("Rename Event");
-			} else if (options.SelectedItem is IMethod) { 
-				var m = (IMethod)options.SelectedItem;
-				if (m.IsConstructor || m.IsDestructor) {
-					this.Title = GettextCatalog.GetString ("Rename Class");
-				} else {
-					this.Title = GettextCatalog.GetString ("Rename Method");
-					includeOverloadsCheckbox.Visible = m.DeclaringType.GetMethods (x => x.Name == m.Name).Count () > 1;
-				}
-			} else if (options.SelectedItem is IParameter) {
-				this.Title = GettextCatalog.GetString ("Rename Parameter");
-			} else if (options.SelectedItem is IVariable) {
-				this.Title = GettextCatalog.GetString ("Rename Variable");
-			} else if (options.SelectedItem is ITypeParameter) {
-				this.Title = GettextCatalog.GetString ("Rename Type Parameter");
-			}  else if (options.SelectedItem is INamespace) {
-				this.Title = GettextCatalog.GetString ("Rename namespace");
+			} else if (symbol.Kind == SymbolKind.Parameter) {
+				title = GettextCatalog.GetString ("Rename Parameter");
+			} else if (symbol.Kind == SymbolKind.Local) {
+				title = GettextCatalog.GetString ("Rename Variable");
+			} else if (symbol.Kind == SymbolKind.TypeParameter) {
+				title = GettextCatalog.GetString ("Rename Type Parameter");
+			} else if (symbol.Kind == SymbolKind.Namespace) {
+				title = GettextCatalog.GetString ("Rename Namespace");
+			} else if (symbol.Kind == SymbolKind.Label) {
+				title = GettextCatalog.GetString ("Rename Label");
 			} else {
-				this.Title = GettextCatalog.GetString ("Rename Item");
-			}
-			
-			if (options.SelectedItem is IEntity) {
-				var member = (IEntity)options.SelectedItem;
-				if (member.SymbolKind == SymbolKind.Constructor || member.SymbolKind == SymbolKind.Destructor) {
-					entry.Text = member.DeclaringType.Name;
-				} else {
-					entry.Text = member.Name;
-				}
-				//				fileName = member.Region.FileName;
-			} else if (options.SelectedItem is IType) {
-				var lvar = (IType)options.SelectedItem;
-				entry.Text = lvar.Name;
-				//				this.fileName = lvar.Region.FileName;
-			} else if (options.SelectedItem is ITypeParameter) {
-				var lvar = (ITypeParameter)options.SelectedItem;
-				entry.Text = lvar.Name;
-				//				this.fileName = lvar.Region.FileName;
-			} else if (options.SelectedItem is IVariable) {
-				var lvar = (IVariable)options.SelectedItem;
-				entry.Text = lvar.Name;
-				//				this.fileName = lvar.Region.FileName;
-			} else if (options.SelectedItem is INamespace) {
-				var lvar = (INamespace)options.SelectedItem;
-				entry.Text = lvar.FullName;
-				//				this.fileName = lvar.Region.FileName;
+				title = GettextCatalog.GetString ("Rename Item");
 			}
+
+
+			Init (title, symbol.Name, async prop => { return await rename.PerformChangesAsync (symbol, prop); });
+
+		}
+
+		void Init (string title, string currenName, Func<RenameRefactoring.RenameProperties, Task<IList<Change>>> rename)
+		{
+			this.Title = title;
+			this.rename = rename;
+
+			includeOverloadsCheckbox.Active = true;
+			includeOverloadsCheckbox.Visible = false;
+			entry.Text = currenName;
 			entry.SelectRegion (0, -1);
-			
+
 			buttonPreview.Sensitive = buttonOk.Sensitive = false;
 			entry.Changed += OnEntryChanged;
 			entry.Activated += OnEntryActivated;
-			
+
 			buttonOk.Clicked += OnOKClicked;
 			buttonPreview.Clicked += OnPreviewClicked;
 			entry.Changed += delegate { buttonPreview.Sensitive = buttonOk.Sensitive = ValidateName (); };
@@ -143,6 +138,7 @@ namespace MonoDevelop.Refactoring.Rename
 			this.hbox1.HideAll ();
 		}
 
+
 		bool ValidateName ()
 		{
 			return true; // TODO: Name validation.
@@ -183,20 +179,20 @@ namespace MonoDevelop.Refactoring.Rename
 			}
 		}
 		
-		void OnOKClicked (object sender, EventArgs e)
+		async void OnOKClicked (object sender, EventArgs e)
 		{
 			var properties = Properties;
 			((Widget)this).Destroy ();
-			List<Change> changes = rename.PerformChanges (options, properties);
-			IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (this.Title, null);
+			var changes = await this.rename (properties);
+			ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (Title, null);
 			RefactoringService.AcceptChanges (monitor, changes);
 		}
 		
-		void OnPreviewClicked (object sender, EventArgs e)
+		async void OnPreviewClicked (object sender, EventArgs e)
 		{
 			var properties = Properties;
 			((Widget)this).Destroy ();
-			List<Change> changes = rename.PerformChanges (options, properties);
+			var changes = await this.rename (properties);
 			using (var dlg = new RefactoringPreviewDialog (changes))
 				MessageService.ShowCustomDialog (dlg);
 		}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
index bedc666cc3..44eb9d4af7 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
@@ -27,226 +27,112 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using System.Text;
 using MonoDevelop.Ide;
 using System.Linq;
-using Mono.TextEditor.PopupWindow;
 using MonoDevelop.Ide.FindInFiles;
 using MonoDevelop.Ide.ProgressMonitoring;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using MonoDevelop.Core.ProgressMonitoring;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.FindSymbols;
+using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Ide.Gui;
-
+using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Rename;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MonoDevelop.Refactoring.Rename
 {
-	public class RenameRefactoring : RefactoringOperation
+	public class RenameRefactoring
 	{
-		public override string AccelKey {
-			get {
-				var key = IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.EditCommands.Rename).AccelKey;
-				return key == null ? null : key.Replace ("dead_circumflex", "^");
-			}
-		}
-		
-		public RenameRefactoring ()
-		{
-			Name = "Rename";
-		}
-		
-		public override bool IsValid (RefactoringOptions options)
+		public static async Task<bool> Rename (ISymbol symbol, string newName)
 		{
-			if (options.SelectedItem is IVariable || options.SelectedItem is IParameter)
+			if (symbol == null)
+				throw new ArgumentNullException ("symbol");
+			if (newName == null)
+				throw new ArgumentNullException ("newName");
+			try {
+				await new RenameRefactoring ().PerformChangesAsync (symbol, new RenameProperties () { NewName = newName });
 				return true;
-			if (options.SelectedItem is INamespace) {
-				var ns = (INamespace)options.SelectedItem;
-				return ns.Types.Any (type => !string.IsNullOrEmpty (type.Region.FileName));
+			} catch (AggregateException ae) {
+				foreach (var inner in ae.Flatten ().InnerExceptions)
+					LoggingService.LogError ("Exception while rename.", inner);
+				return false;
+			} catch (Exception e) {
+				LoggingService.LogError ("Exception while rename.", e);
+				return false;
 			}
-			if (options.SelectedItem is ITypeDefinition)
-				return !string.IsNullOrEmpty (((ITypeDefinition)options.SelectedItem).Region.FileName);
-			if (options.SelectedItem is IType && ((IType)options.SelectedItem).Kind == TypeKind.TypeParameter)
-				return !string.IsNullOrEmpty (((ITypeParameter)options.SelectedItem).Region.FileName);
-
-			var member = options.SelectedItem as IMember;
-			if (member != null) {
-				if (member.SymbolKind == SymbolKind.Operator)
-					return false;
-				var cls = member.DeclaringTypeDefinition;
-				return cls != null;
-			}
-			return false;
 		}
 
-		public static void Rename (IEntity entity, string newName)
+		static void Rollback (TextEditor editor, List<MonoDevelop.Core.Text.TextChangeEventArgs> textChanges)
 		{
-			if (newName == null) {
-				var options = new RefactoringOptions () {
-					SelectedItem = entity
-				};
-				new RenameRefactoring ().Run (options);
-				return;
-			}
-			using (var monitor = new NullProgressMonitor ()) {
-				var col = ReferenceFinder.FindReferences (entity, true, monitor);
-				
-				List<Change> result = new List<Change> ();
-				foreach (var memberRef in col) {
-					var change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = newName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), newName);
-					result.Add (change);
-				}
-				if (result.Count > 0) {
-					RefactoringService.AcceptChanges (monitor, result);
-				}
+			for (int i = textChanges.Count - 1; i >= 0; i--) {
+				var v = textChanges [i];
+				editor.ReplaceText (v.Offset, v.InsertionLength, v.RemovedText);
 			}
 		}
 
-		public static void RenameVariable (IVariable variable, string newName)
+		public async Task Rename (ISymbol symbol)
 		{
-			using (var monitor = new NullProgressMonitor ()) {
-				var col = ReferenceFinder.FindReferences (variable, true, monitor);
-				
-				List<Change> result = new List<Change> ();
-				foreach (var memberRef in col) {
-					var change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = newName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), newName);
-					result.Add (change);
-				}
-				if (result.Count > 0) {
-					RefactoringService.AcceptChanges (monitor, result);
+			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
+			var ws = TypeSystemService.GetWorkspace (solution);
+
+			var currentSolution = ws.CurrentSolution;
+			var cts = new CancellationTokenSource ();
+			var newSolution = await MessageService.ExecuteTaskAndShowWaitDialog (Task.Run (() => Renamer.RenameSymbolAsync (currentSolution, symbol, "_" + symbol.Name + "_", ws.Options, cts.Token)), GettextCatalog.GetString ("Looking for all references"), cts);
+			var projectChanges = currentSolution.GetChanges (newSolution).GetProjectChanges ().ToList ();
+			var changedDocuments = new HashSet<string> ();
+			foreach (var change in projectChanges) {
+				foreach (var changedDoc in change.GetChangedDocuments ()) {
+					changedDocuments.Add (ws.CurrentSolution.GetDocument (changedDoc).FilePath);
 				}
 			}
-		}
 
-		public static void RenameTypeParameter (ITypeParameter typeParameter, string newName)
-		{
-			if (newName == null) {
-				var options = new RefactoringOptions () {
-					SelectedItem = typeParameter
-				};
-				new RenameRefactoring ().Run (options);
+			if (changedDocuments.Count > 1) {
+				using (var dlg = new RenameItemDialog (symbol, this))
+					MessageService.ShowCustomDialog (dlg);
 				return;
 			}
 
-			using (var monitor = new NullProgressMonitor ()) {
-				var col = ReferenceFinder.FindReferences (typeParameter, true, monitor);
-				
-				List<Change> result = new List<Change> ();
-				foreach (var memberRef in col) {
-					var change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = newName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), newName);
-					result.Add (change);
-				}
-				if (result.Count > 0) {
-					RefactoringService.AcceptChanges (monitor, result);
-				}
+			var projectChange = projectChanges [0];
+			var changes = projectChange.GetChangedDocuments ().ToList ();
+			if (changes.Count != 1 || symbol.Kind == SymbolKind.NamedType) {
+				using (var dlg = new RenameItemDialog (symbol, this))
+					MessageService.ShowCustomDialog (dlg);
+				return;
 			}
-		}
-
-		public static void RenameNamespace (INamespace ns, string newName)
-		{
-			using (var monitor = new NullProgressMonitor ()) {
-				var col = ReferenceFinder.FindReferences (ns, true, monitor);
+			var doc = IdeApp.Workbench.ActiveDocument;
+			var editor = doc.Editor;
+			
+			var links = new List<TextLink> ();
+			var link = new TextLink ("name");
 
-				List<Change> result = new List<Change> ();
-				foreach (var memberRef in col) {
-					var change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = newName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), newName);
-					result.Add (change);
-				}
-				if (result.Count > 0) {
-					RefactoringService.AcceptChanges (monitor, result);
+			var cd = changes [0];
+			var oldDoc = projectChange.OldProject.GetDocument (cd);
+			var newDoc = projectChange.NewProject.GetDocument (cd);
+			var oldVersion = editor.Version;
+			foreach (var textChange in await oldDoc.GetTextChangesAsync (newDoc)) {
+				var segment = new TextSegment (textChange.Span.Start, textChange.Span.Length);
+				if (segment.Offset <= editor.CaretOffset && editor.CaretOffset <= segment.EndOffset) {
+					link.Links.Insert (0, segment); 
+				} else {
+					link.AddLink (segment);
 				}
 			}
-		}
 
-
-		public override string GetMenuDescription (RefactoringOptions options)
-		{
-			return IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.EditCommands.Rename).Text;
-		}
-		
-		public override void Run (RefactoringOptions options)
-		{
-			if (options.SelectedItem is IVariable) {
-				var field = options.SelectedItem as IField;
-				if (field != null && (field.Accessibility != Accessibility.Private || field.DeclaringTypeDefinition != null && field.DeclaringTypeDefinition.Parts.Count > 1)) {
-					using (var dlg = new RenameItemDialog (options, this))
-						MessageService.ShowCustomDialog (dlg);
-					return;
-				}
-
-				var par = options.SelectedItem as IParameter;
-				if (par != null && par.Owner != null && (par.Owner.Accessibility != Accessibility.Private || par.Owner.DeclaringTypeDefinition != null && par.Owner.DeclaringTypeDefinition.Parts.Count > 1)) {
-					using (var dlg = new RenameItemDialog (options, this))
-						MessageService.ShowCustomDialog (dlg);
-					return;
-				}
-
-				var col = ReferenceFinder.FindReferences (options.SelectedItem, true);
-				if (col == null)
-					return;
-				var data = options.Document != null ? options.GetTextEditorData () : IdeApp.Workbench.ActiveDocument.Editor;
-				var editor = data.Parent;
-				if (editor == null) {
-					using (var dlg = new RenameItemDialog (options, this))
-						MessageService.ShowCustomDialog (dlg);
-					return;
-				}
-				
-				var links = new List<TextLink> ();
-				var link = new TextLink ("name");
-				int baseOffset = Int32.MaxValue;
-				foreach (var r in col) {
-					baseOffset = Math.Min (baseOffset, r.Offset);
-				}
-				foreach (MemberReference r in col) {
-					var segment = new TextSegment (r.Offset - baseOffset, r.Length);
-					if (segment.Offset <= data.Caret.Offset - baseOffset && data.Caret.Offset - baseOffset <= segment.EndOffset) {
-						link.Links.Insert (0, segment); 
-					} else {
-						link.AddLink (segment);
+			links.Add (link);
+			editor.StartTextLinkMode (new TextLinkModeOptions (links, (arg) => {
+				//If user cancel renaming revert changes
+				if (!arg.Success) {
+					var textChanges = editor.Version.GetChangesTo (oldVersion).ToList ();
+					foreach (var v in textChanges) {
+						editor.ReplaceText (v.Offset, v.RemovalLength, v.InsertedText);
 					}
 				}
-				
-				links.Add (link);
-				if (editor.CurrentMode is TextLinkEditMode)
-					((TextLinkEditMode)editor.CurrentMode).ExitTextLinkMode ();
-				TextLinkEditMode tle = new TextLinkEditMode (editor, baseOffset, links);
-				tle.SetCaretPosition = false;
-				tle.SelectPrimaryLink = true;
-				if (tle.ShouldStartTextLinkMode) {
-					tle.Cancel += delegate {
-						if (tle.HasChangedText)
-							editor.Document.Undo ();
-					};
-					tle.OldMode = data.CurrentMode;
-					tle.StartMode ();
-					data.CurrentMode = tle;
-				}
-			} else {
-				using (var dlg = new RenameItemDialog (options, this))
-					MessageService.ShowCustomDialog (dlg);
-			}
+			}));
 		}
 		
 		public class RenameProperties
@@ -267,64 +153,68 @@ namespace MonoDevelop.Refactoring.Rename
 			}
 		}
 		
-		public override List<Change> PerformChanges (RefactoringOptions options, object prop)
+		public async Task<List<Change>> PerformChangesAsync (ISymbol symbol, RenameProperties properties)
 		{
-			RenameProperties properties = (RenameProperties)prop;
-			List<Change> result = new List<Change> ();
-			IEnumerable<MemberReference> col = null;
-			using (var monitor = new MessageDialogProgressMonitor (true, false, false, true)) {
-				col = ReferenceFinder.FindReferences (options.SelectedItem, properties.IncludeOverloads, monitor);
-				if (col == null)
-					return result;
-					
-				if (properties.RenameFile && options.SelectedItem is IType) {
-					var cls = ((IType)options.SelectedItem).GetDefinition ();
-					int currentPart = 1;
-					var alreadyRenamed = new HashSet<string> ();
-					foreach (var part in cls.Parts) {
-						if (alreadyRenamed.Contains (part.Region.FileName))
-							continue;
-						alreadyRenamed.Add (part.Region.FileName);
-							
-						string oldFileName = System.IO.Path.GetFileNameWithoutExtension (part.Region.FileName);
-						string newFileName;
-						var newName = properties.NewName;
-						if (string.IsNullOrEmpty (oldFileName) || string.IsNullOrEmpty (newName))
-							continue;
-						if (oldFileName.ToUpper () == newName.ToUpper () || oldFileName.ToUpper ().EndsWith ("." + newName.ToUpper (), StringComparison.Ordinal))
-							continue;
-						int idx = oldFileName.IndexOf (cls.Name, StringComparison.Ordinal);
-						if (idx >= 0) {
-							newFileName = oldFileName.Substring (0, idx) + newName + oldFileName.Substring (idx + cls.Name.Length);
-						} else {
-							newFileName = currentPart != 1 ? newName + currentPart : newName;
-							currentPart++;
-						}
-							
-						int t = 0;
-						while (System.IO.File.Exists (GetFullFileName (newFileName, part.Region.FileName, t))) {
-							t++;
-						}
-						result.Add (new RenameFileChange (part.Region.FileName, GetFullFileName (newFileName, part.Region.FileName, t)));
+			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
+			var ws = TypeSystemService.GetWorkspace (solution);
+
+			var newSolution = await Renamer.RenameSymbolAsync (ws.CurrentSolution, symbol, properties.NewName, ws.Options);
+			var changes = new List<Change> ();
+
+			foreach (var projectChange in newSolution.GetChanges (ws.CurrentSolution).GetProjectChanges ()) {
+				foreach (var changedDoc in projectChange.GetChangedDocuments ()) {
+					var newDoc = newSolution.GetDocument (changedDoc);
+					foreach (var textChange in await newDoc.GetTextChangesAsync (ws.CurrentSolution.GetDocument (changedDoc))) {
+						changes.Add (new TextReplaceChange () {
+							FileName = newDoc.FilePath,
+							Offset = textChange.Span.Start,
+							RemovedChars = textChange.Span.Length,
+							InsertedText = textChange.NewText
+						});
 					}
 				}
-				
-				foreach (var memberRef in col) {
-					TextReplaceChange change = new TextReplaceChange ();
-					change.FileName = memberRef.FileName;
-					change.Offset = memberRef.Offset;
-					change.RemovedChars = memberRef.Length;
-					change.InsertedText = properties.NewName;
-					change.Description = string.Format (GettextCatalog.GetString ("Replace '{0}' with '{1}'"), memberRef.GetName (), properties.NewName);
-					result.Add (change);
+			}
+
+			if (properties.RenameFile && symbol is INamedTypeSymbol) {
+				var type = (INamedTypeSymbol)symbol;
+				int currentPart = 1;
+				var alreadyRenamed = new HashSet<string> ();
+				foreach (var part in type.Locations) {
+					if (!part.IsInSource)
+						continue;
+					var fileName = part?.SourceTree?.FilePath;
+					if (fileName == null || alreadyRenamed.Contains (fileName))
+						continue;
+					alreadyRenamed.Add (fileName);
+
+					string oldFileName = System.IO.Path.GetFileNameWithoutExtension (fileName);
+					string newFileName;
+					var newName = properties.NewName;
+					if (string.IsNullOrEmpty (oldFileName) || string.IsNullOrEmpty (newName))
+						continue;
+					if (oldFileName.ToUpper () == newName.ToUpper () || oldFileName.ToUpper ().EndsWith ("." + newName.ToUpper (), StringComparison.Ordinal))
+						continue;
+					int idx = oldFileName.IndexOf (type.Name, StringComparison.Ordinal);
+					if (idx >= 0) {
+						newFileName = oldFileName.Substring (0, idx) + newName + oldFileName.Substring (idx + type.Name.Length);
+					} else {
+						newFileName = currentPart != 1 ? newName + currentPart : newName;
+						currentPart++;
+					}
+
+					int t = 0;
+					while (System.IO.File.Exists (GetFullFileName (newFileName, fileName, t))) {
+						t++;
+					}
+					changes.Add (new RenameFileChange (fileName, GetFullFileName (newFileName, fileName, t)));
 				}
 			}
-			return result;
+			return changes;
 		}
 		
 		static string GetFullFileName (string fileName, string oldFullFileName, int tryCount)
 		{
-			StringBuilder name = new StringBuilder (fileName);
+			var name = new StringBuilder (fileName);
 			if (tryCount > 0) {
 				name.Append ("_");
 				name.Append (tryCount.ToString ());
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameTextEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameTextEditorExtension.cs
deleted file mode 100644
index c2e6e44360..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameTextEditorExtension.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// 
-// RenameTextEditorExtension.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.Refactoring.Rename
-{
-	public class RenameTextEditorExtension : TextEditorExtension
-	{
-		[CommandUpdateHandler(EditCommands.Rename)]
-		public void RenameCommand_Update(CommandInfo ci)
-		{
-			new RenameHandler ().UpdateCommandInfo (ci);
-		}
-
-		[CommandHandler (EditCommands.Rename)]
-		public void RenameCommand ()
-		{
-			new RenameHandler ().Start (base.Editor);
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
index ed0ba0695c..80dfdf8a69 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
@@ -8,25 +8,21 @@
 	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeGenerators" name = "Code Generators">
 		<ExtensionNode name="Class"/>
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/Refactoring/ASTProvider" name = "ASTProviders">
 		<ExtensionNode name="Class"/>
 	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeActions" name = "CodeAction">
-		<ExtensionNode name="Action" type ="MonoDevelop.CodeActions.CodeActionAddinNode"/>
-	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeActionSource" name = "CodeActionSource">
-		<ExtensionNode name="Source"/>
+
+	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeDiagnosticProvider" name = "Code Diagnostic Provider">
+		<ExtensionNode name="Class"/>
 	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeIssues" name = "CodeIssue">
-		<ExtensionNode name="CodeIssue" type ="MonoDevelop.CodeIssues.CodeIssueAddinNode"/>
+
+	<ExtensionPoint path = "/MonoDevelop/Refactoring/FindReferencesProvider">
+		<ExtensionNode name="Class"/>
 	</ExtensionPoint>
-	
-	<ExtensionPoint path = "/MonoDevelop/Refactoring/CodeIssueSource" name = "CodeIssueSource">
-		<ExtensionNode name="Source"/>
+
+	<ExtensionPoint path = "/MonoDevelop/Refactoring/JumpToDeclarationHandler" defaultInsertAfter = "MidStep">
+		<ExtensionNode name="Class"/>
 	</ExtensionPoint>
 
 	<ExtensionNodeSet id="MonoDevelop.AnalysisCore.Rules">
@@ -41,7 +37,7 @@
 		<Description>Analysis rules.</Description>
 		<ExtensionNodeSet id="MonoDevelop.AnalysisCore.Rules" />
 	</ExtensionPoint>
-	
+
 	<ExtensionPoint path = "/MonoDevelop/AnalysisCore/Types" name = "Analysis rule input/output types">
 		<Description>Analysis rule input/output types.</Description>
 		<ExtensionNode name="Type" type="MonoDevelop.AnalysisCore.Extensions.AnalysisTypeExtensionNode" />
@@ -70,44 +66,26 @@
 	
 	<!-- RefactoryCommands -->
 	<Extension path = "/MonoDevelop/Ide/Commands">
-	
+
 		<Category _name = "Code Navigation" id = "CodeNavigation">
-		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration"
-					defaultHandler = "MonoDevelop.Refactoring.GotoDeclarationHandler"
-					_label = "_Go to Declaration" 
-					shortcut = "F12"
-					macShortcut = "Meta|D"/>
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.FindReferences"
-					defaultHandler = "MonoDevelop.Refactoring.FindReferencesHandler"
 					_label = "_Find References" 
 					shortcut = "Shift|F12"
 					macShortcut = "Shift|Meta|R"/>
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.FindAllReferences"
-					defaultHandler = "MonoDevelop.Refactoring.FindAllReferencesHandler"
 					_label = "_Find References of All Overloads" />
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.FindDerivedClasses"
-					defaultHandler = "MonoDevelop.Refactoring.FindDerivedClassesHandler"
 					_label = "Find _Derived Symbols" />
 		</Category>
 		
 		<Category _name = "Refactoring" id = "Refactoring">
-		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.Resolve"
-				defaultHandler = "MonoDevelop.Refactoring.ResolveCommandHandler"
-				type="array"
-				_label = "Resolve"/> 
 
-		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.CurrentRefactoryOperations"
-				defaultHandler = "MonoDevelop.Refactoring.CurrentRefactoryOperationsHandler"
-				type="array"
-				_label = "Refactory Operations" /> 
-		
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.QuickFix"
 					_label = "Quick Fix..."
 					shortcut = "Alt|Return"
 					macShortcut = "Alt|Return" />
 		
 		<Command id = "MonoDevelop.Refactoring.RefactoryCommands.ImportSymbol"
-					defaultHandler = "MonoDevelop.Refactoring.ImportSymbolHandler"
 					_label = "Import Symbol..."
 					shortcut = "Control|Alt|space"
 					macShortcut = "Control|Alt|space" />
@@ -120,20 +98,7 @@
 		</Category>
 	</Extension>
 	
-	<Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor">
-		<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.Resolve" insertbefore="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations"/>
-		
-		<ItemSet id = "Fix" _label = "Fix" autohide="true"
-			insertafter="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations" insertbefore="MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator">
-			<CommandItem id = "MonoDevelop.AnalysisCore.AnalysisCommands.FixOperations" />
-		</ItemSet>
-		
-		
-		<CommandItem id = "MonoDevelop.Refactoring.RefactoryCommands.CurrentRefactoryOperations" insertafter="MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations" insertbefore="MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator"/>
-	</Extension>
-	
 	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
-		<Class class = "MonoDevelop.Refactoring.Rename.RenameTextEditorExtension" />
 		<Class class = "MonoDevelop.CodeActions.CodeActionEditorExtension" />
 	</Extension>
 	
@@ -145,9 +110,6 @@
 	<!-- Quick fix commands -->
 
 	<Extension path = "/MonoDevelop/Ide/Commands/Refactoring">
-		<Command id = "MonoDevelop.AnalysisCore.AnalysisCommands.FixOperations" type="array" 
-			defaultHandler="MonoDevelop.AnalysisCore.FixOperationsHandler"
-			_label = "Fixes" />
 		<Command id = "MonoDevelop.AnalysisCore.AnalysisCommands.ShowFixes"
 			defaultHandler="MonoDevelop.AnalysisCore.ShowFixesHandler"
 			_label = "Show Fixes"
@@ -160,7 +122,7 @@
 	
 	<Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/TextEditor">
 		<Section id="Analysis" _label="Source Analysis" fill="true" class="MonoDevelop.AnalysisCore.Gui.AnalysisOptionsPanel" icon="md-prefs-code-analysis" >
-			<Section id="C#" _label="C#" icon="md-prefs-csharp">
+			<Section id="C#" _label="C#" icon="md-prefs-source">
 				<Panel id="CodeIssuePanel" _label="Code Rules" fill="true" class="MonoDevelop.CodeIssues.CodeIssuePanel" grouping="Tab" icon="md-prefs-code-rules" />
 				<Panel id="CodeActions" _label="Code Actions" fill="true" class="MonoDevelop.CodeActions.CodeActionPanel" grouping="Tab" icon="md-prefs-code-actions" />
 			</Section>
@@ -170,13 +132,13 @@
 	<!-- Extensions to the addin points defined by this addin -->
 	
 	<Extension path = "/MonoDevelop/AnalysisCore/Types">
-		<Type name="Document" class="MonoDevelop.Ide.Gui.Document" />
+		<Type name="AnalysisDocument" class="MonoDevelop.AnalysisCore.Gui.AnalysisDocument" />
 		<Type name="CompilationUnit" class="MonoDevelop.Projects.Dom.ICompilationUnit" />
 	</Extension>
 	
 	<Extension path = "/MonoDevelop/AnalysisCore/Rules">
 		<Adaptor func="MonoDevelop.AnalysisCore.Rules.Adapters.GetCompilationUnit"
-			input="Document" output="CompilationUnit" />
+			input="AnalysisDocument" output="CompilationUnit" />
 		<Category _name="Design Guidelines" id="Design">
 <!--			<Rule _name="Naming Conventions" input="CompilationUnit" 
 				func="MonoDevelop.AnalysisCore.Rules.NamingConventions.ClassNaming" />-->
@@ -193,4 +155,8 @@
 		<StockIcon stockid="md-prefs-code-rules" resource="prefs-code-rules-16.png" size="Menu" />
 		<StockIcon stockid="md-prefs-code-analysis" resource="prefs-code-analysis-16.png" size="Menu" />
 	</Extension>
+
+	<Extension path = "/MonoDevelop/Refactoring/JumpToDeclarationHandler">
+		<Class id="MidStep" class="MonoDevelop.Refactoring.DummyJumpToDeclarationHandler" />
+	</Extension>
 </ExtensionModel>
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
index 6fe3d47b41..36cac0ba56 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
@@ -75,10 +75,43 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
       <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="System.Composition.AttributedModel">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Composition.AttributedModel.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Features">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Features.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Features">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Features.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -96,86 +129,45 @@
     <Compile Include="MonoDevelop.AnalysisCore\AnalysisOptions.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\AnalysisService.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\FixableResult.cs" />
-    <Compile Include="MonoDevelop.AnalysisCore\Rules\Adaptors.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\Result.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\RuleTree.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\RuleTreeType.cs" />
     <Compile Include="MonoDevelop.AnalysisCore\Fixes\GenericFix.cs" />
     <Compile Include="MonoDevelop.Refactoring\RefactoringService.cs" />
-    <Compile Include="MonoDevelop.Refactoring\RefactoryCommands.cs" />
-    <Compile Include="MonoDevelop.Refactoring\RefactoringOperation.cs" />
     <Compile Include="MonoDevelop.Refactoring\Change.cs" />
-    <Compile Include="MonoDevelop.Refactoring\GotoDeclarationHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindReferencesHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring.Rename\RenameTextEditorExtension.cs" />
     <Compile Include="MonoDevelop.Refactoring.Rename\RenameRefactoring.cs" />
     <Compile Include="MonoDevelop.Refactoring.Rename\RenameItemDialog.cs" />
-    <Compile Include="MonoDevelop.Refactoring.Rename\RenameHandler.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Refactoring.Rename.RenameItemDialog.cs" />
-    <Compile Include="MonoDevelop.Refactoring\AbstractRefactoringCommandHandler.cs" />
     <Compile Include="MonoDevelop.Refactoring\RefactoringOptions.cs" />
     <Compile Include="MonoDevelop.Refactoring\RefactoringPreviewDialog.cs" />
     <Compile Include="gtk-gui\MonoDevelop.Refactoring.RefactoringPreviewDialog.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindDerivedClassesHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\ImportSymbolHandler.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeIssueProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeIssue.cs" />
     <Compile Include="MonoDevelop.CodeActions\CodeActionEditorExtension.cs" />
-    <Compile Include="MonoDevelop.CodeActions\CodeAction.cs" />
-    <Compile Include="MonoDevelop.CodeActions\CodeActionProvider.cs" />
-    <Compile Include="MonoDevelop.CodeActions\CodeActionAddinNode.cs" />
     <Compile Include="MonoDevelop.CodeActions\CodeActionPanelWidget.cs" />
-    <Compile Include="MonoDevelop.CodeActions\AnalysisCodeAction.cs" />
     <Compile Include="gtk-gui\MonoDevelop.CodeActions.ContextActionPanelWidget.cs" />
     <Compile Include="MonoDevelop.CodeIssues\CodeIssuePanelWidget.cs" />
     <Compile Include="gtk-gui\MonoDevelop.CodeIssues.CodeIssuePanelWidget.cs" />
-    <Compile Include="MonoDevelop.CodeActions\ICodeActionProviderSource.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ICodeIssueProviderSource.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeAnalysisRunner.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\DefaultCodeIssueCategories.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeIssueAddinNode.cs" />
-    <Compile Include="MonoDevelop.Refactoring\ResolveCommandHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\ExtensionMethods.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeIssuePad.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueSummary.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueGroup.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CategoryGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\GroupingProviderChainControl.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\GroupingDescriptionAttribute.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\NullGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueGroupEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\GroupingProviderEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\AbstractGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ProviderGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\SeverityGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\AnalysisState.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\AnalysisStateChangeEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\CodeAnalysisBatchRunner.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IIssueTreeNode.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IIssueSummarySink.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueTreeNodeEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ActionSummary.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\BatchFixer.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IssueMatch.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ExactIssueMatcher.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\IActionMatcher.cs" />
     <Compile Include="AddinInfo.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindDerivedSymbolsHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindMemberOverloadsHandler.cs" />
-    <Compile Include="MonoDevelop.Refactoring\FindExtensionMethodHandler.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\IAnalysisJob.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\AnalysisJobQueue.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\CodeIssueEventArgs.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\SolutionAnalysisJob.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\SimpleAnalysisJob.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\ProgressMonitorWrapperJob.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\JobContext.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\IJobContext.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\JobSlice.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\Runner\JobStatus.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\ProjectGroupingProvider.cs" />
-    <Compile Include="MonoDevelop.CodeIssues\FileGroupingProvider.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\DiagnosticResult.cs" />
+    <Compile Include="MonoDevelop.CodeActions\CodeRefactoringDescriptor.cs" />
+    <Compile Include="MonoDevelop.CodeActions\CodeRefactoringService.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CodeDiagnosticDescriptor.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CodeDiagnosticRunner.cs" />
+    <Compile Include="MonoDevelop.CodeActions\CodeActionContainer.cs" />
+    <Compile Include="MonoDevelop.AnalysisCore\IssueMarker.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CodeDiagnosticProvider.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\BuiltInCodeDiagnosticProvider.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\AnalyzersFromAssembly.cs" />
+    <Compile Include="MonoDevelop.CodeActions\ValidCodeAction.cs" />
+    <Compile Include="MonoDevelop.CodeActions\ValidCodeDiagnosticAction.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CodeDiagnosticFixDescriptor.cs" />
+    <Compile Include="MonoDevelop.Refactoring\Commands.cs" />
+    <Compile Include="MonoDevelop.Refactoring\RefactoringSymbolInfo.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\ISuppressionFixProvider.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CodeFix.cs" />
+    <Compile Include="MonoDevelop.CodeIssues\CSharpSuppressionFixProvider.cs" />
+    <Compile Include="MonoDevelop.Refactoring\FindReferencesProvider.cs" />
+    <Compile Include="MonoDevelop.Refactoring\JumpToDeclarationHandler.cs" />
+    <Compile Include="MonoDevelop.Refactoring\InsertionPointService.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="MonoDevelop.Refactoring\" />
@@ -183,7 +175,8 @@
     <Folder Include="MonoDevelop.AnalysisCore\" />
     <Folder Include="MonoDevelop.CodeIssues\" />
     <Folder Include="MonoDevelop.CodeActions\" />
-    <Folder Include="MonoDevelop.CodeIssues\Runner\" />
+    <Folder Include="MonoDevelop.AnalysisCore\Rules\" />
+    <Folder Include="MonoDevelop.CodeIssues\Pad\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDevelop.Refactoring.addin.xml">
@@ -200,18 +193,72 @@
     <EmbeddedResource Include="icons\prefs-code-actions-16%402x.png">
       <LogicalName>prefs-code-actions-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-actions-16~dark.png">
+      <LogicalName>prefs-code-actions-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-actions-16~dark%402x.png">
+      <LogicalName>prefs-code-actions-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-actions-16~sel.png">
+      <LogicalName>prefs-code-actions-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-actions-16~sel%402x.png">
+      <LogicalName>prefs-code-actions-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-actions-16~dark~sel.png">
+      <LogicalName>prefs-code-actions-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-actions-16~dark~sel%402x.png">
+      <LogicalName>prefs-code-actions-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-code-rules-16.png">
       <LogicalName>prefs-code-rules-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-code-rules-16%402x.png">
       <LogicalName>prefs-code-rules-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-rules-16~dark.png">
+      <LogicalName>prefs-code-rules-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-rules-16~dark%402x.png">
+      <LogicalName>prefs-code-rules-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-rules-16~sel.png">
+      <LogicalName>prefs-code-rules-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-rules-16~sel%402x.png">
+      <LogicalName>prefs-code-rules-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-rules-16~dark~sel.png">
+      <LogicalName>prefs-code-rules-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-rules-16~dark~sel%402x.png">
+      <LogicalName>prefs-code-rules-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-code-analysis-16.png">
       <LogicalName>prefs-code-analysis-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-code-analysis-16%402x.png">
       <LogicalName>prefs-code-analysis-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-analysis-16~dark.png">
+      <LogicalName>prefs-code-analysis-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-analysis-16~dark%402x.png">
+      <LogicalName>prefs-code-analysis-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-analysis-16~sel.png">
+      <LogicalName>prefs-code-analysis-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-analysis-16~sel%402x.png">
+      <LogicalName>prefs-code-analysis-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-analysis-16~dark~sel.png">
+      <LogicalName>prefs-code-analysis-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-code-analysis-16~dark~sel%402x.png">
+      <LogicalName>prefs-code-analysis-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
@@ -224,31 +271,11 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.csproj">
       <Project>{2C24D515-4A2C-445C-8419-C09231913CFA}</Project>
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
-      <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
-      <Name>ICSharpCode.NRefactory.CSharp</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
@@ -269,15 +296,69 @@
       <Name>Mono.Debugging</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
+      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
+      <Name>MonoDevelop.SourceEditor</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\RefactoringEssentials\RefactoringEssentials\RefactoringEssentials.csproj">
+      <Project>{C465A5DC-AD28-49A2-89C0-F81838814A7E}</Project>
+      <Name>RefactoringEssentials</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
+      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
+      <Name>Mono.TextEditor</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <None Include="MonoDevelop.AnalysisCore\README.txt" />
     <None Include="MonoDevelop.AnalysisCore\TODO.txt" />
     <None Include="MonoDevelop.Refactoring\QuickFixHandler.cs" />
-    <None Include="MonoDevelop.Refactoring\EncapsulateFieldDialog.cs" />
-    <None Include="MonoDevelop.Refactoring\OverridesImplementsDialog.cs" />
     <None Include="gtk-gui\MonoDevelop.Refactoring.OverridesImplementsDialog.cs" />
     <None Include="gtk-gui\MonoDevelop.Refactoring.EncapsulateFieldDialog.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\AnalysisJobQueue.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\CodeIssueEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\IAnalysisJob.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\IJobContext.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\JobContext.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\JobSlice.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\JobStatus.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\ProgressMonitorWrapperJob.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\Runner\SimpleAnalysisJob.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\CodeIssuePad.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\ExactIssueMatcher.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IActionMatcher.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueMatch.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\SolutionAnalysisJob.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\CodeAnalysisBatchRunner.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\BatchFixer.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\AbstractGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\FileGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\GroupingDescriptionAttribute.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\GroupingProviderChainControl.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\GroupingProviderEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IIssueSummarySink.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IIssueTreeNode.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueGroup.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueGroupEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueSummary.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\IssueTreeNodeEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\NullGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\ProjectGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\ProviderGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\SeverityGroupingProvider.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\ActionSummary.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\AnalysisState.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\AnalysisStateChangeEventArgs.cs" />
+    <None Include="MonoDevelop.CodeIssues\Pad\CategoryGroupingProvider.cs" />
   </ItemGroup>
-</Project>
+
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Features.dll" DestinationFolder="..\..\..\build\bin" ContinueOnError="true" />
+    <Copy SourceFiles="..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Features.dll" DestinationFolder="..\..\..\build\bin" ContinueOnError="true" />
+  </Target>
+  </Project>
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs
deleted file mode 100644
index cf29ac7626..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AbstractRefactoringCommandHandler.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// 
-// AbstractRefactoringCommandHandler.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace MonoDevelop.Refactoring
-{
-	public abstract class AbstractRefactoringCommandHandler : CommandHandler
-	{
-		protected abstract void Run (RefactoringOptions options);
-
-		protected virtual void Update (RefactoringOptions options, CommandInfo info)
-		{
-		}
-
-		public void UpdateCommandInfo (CommandInfo info)
-		{
-			Update (info);
-		}
-
-		public void Start (object data)
-		{
-			Run (data);
-		}
-
-		RefactoringOptions CreateOptions ()
-		{
-			Document doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null)
-				return null;
-			
-			ResolveResult result;
-			var item = CurrentRefactoryOperationsHandler.GetItem (doc, out result);
-			
-			return new RefactoringOptions (doc) {
-				ResolveResult = result,
-				SelectedItem = item
-			};
-		}
-
-		protected override void Update (CommandInfo info)
-		{
-			base.Update (info);
-			
-			var options = CreateOptions ();
-			if (options != null) {
-				Update (options, info);
-			} else {
-				info.Bypass = true;
-			}
-		}
-
-		protected override void Run (object data)
-		{
-			var options = CreateOptions ();
-			if (options != null)
-				Run (options);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs
index 0f3805e639..c43f81e299 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs
@@ -28,11 +28,10 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using MonoDevelop.Projects.Text;
-using Mono.TextEditor;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Refactoring
 {
@@ -47,7 +46,7 @@ namespace MonoDevelop.Refactoring
 		{
 		}
 		
-		public abstract void PerformChange (IProgressMonitor monitor, RefactoringOptions rctx);
+		public abstract void PerformChange (ProgressMonitor monitor, RefactoringOptions rctx);
 	}
 	
 	public class TextReplaceChange : Change
@@ -84,26 +83,23 @@ namespace MonoDevelop.Refactoring
 			set;
 		}
 		
-		static List<TextEditorData> textEditorDatas = new List<TextEditorData> ();
+		static List<TextEditor> textEditorDatas = new List<TextEditor> ();
 		static List<IDisposable> undoGroups = new List<IDisposable> ();
 		
 		public static void FinishRefactoringOperation ()
 		{
-			foreach (TextEditorData data in textEditorDatas) {
-				data.Document.CommitUpdateAll ();
-			}
 			textEditorDatas.Clear ();
 			undoGroups.ForEach (grp => grp.Dispose ());
 			undoGroups.Clear ();
 		}
 		
-		internal static TextEditorData GetTextEditorData (string fileName)
+		internal static TextEditor GetTextEditorData (string fileName)
 		{
 			if (IdeApp.Workbench == null)
 				return null;
 			foreach (var doc in IdeApp.Workbench.Documents) {
 				if (doc.FileName == fileName) {
-					TextEditorData result = doc.Editor;
+					var result = doc.Editor;
 					if (result != null) {
 						textEditorDatas.Add (result);
 						undoGroups.Add (result.OpenUndoGroup ());
@@ -113,43 +109,26 @@ namespace MonoDevelop.Refactoring
 			}
 			return null;
 		}
-		protected virtual TextEditorData TextEditorData {
+		protected virtual TextEditor TextEditorData {
 			get {
 				return GetTextEditorData (FileName);
 			}
 		}
-		public override void PerformChange (IProgressMonitor monitor, RefactoringOptions rctx)
+		public override void PerformChange (ProgressMonitor monitor, RefactoringOptions rctx)
 		{
 			if (rctx == null)
 				throw new InvalidOperationException ("Refactory context not available.");
 			
-			TextEditorData textEditorData = this.TextEditorData;
-			bool saveEditor = false;
-			bool hadBom = true;
-			System.Text.Encoding encoding = System.Text.Encoding.UTF8;
+			var textEditorData = this.TextEditorData;
 
 			if (textEditorData == null) {
 				bool open;
-				textEditorData = TextFileProvider.Instance.GetTextEditorData (FileName, out hadBom, out encoding, out open);
-				saveEditor = true;
-			}
-		
-			
-			int offset = textEditorData.Caret.Offset;
-			int charsInserted = textEditorData.Replace (Offset, RemovedChars, InsertedText);
-			if (MoveCaretToReplace) {
-				textEditorData.Caret.Offset = Offset + charsInserted;
+				var data = TextFileProvider.Instance.GetTextEditorData (FileName, out open);
+				data.ReplaceText (Offset, RemovedChars, InsertedText);
+				data.Save ();
 			} else {
-				if (Offset < offset) {
-					int rem = RemovedChars;
-					if (Offset + rem > offset)
-						rem = offset - Offset;
-					textEditorData.Caret.Offset = offset - rem + charsInserted;
-				}
+				textEditorData.ReplaceText (Offset, RemovedChars, InsertedText);
 			}
-			
-			if (saveEditor)
-				Mono.TextEditor.Utils.TextFileUtility.WriteText (FileName, textEditorData.Text, encoding, hadBom);
 		}
 		
 		public override string ToString ()
@@ -177,33 +156,14 @@ namespace MonoDevelop.Refactoring
 			this.Description = string.Format (GettextCatalog.GetString ("Create file '{0}'"), Path.GetFileName (fileName));
 		}
 		
-		public override void PerformChange (IProgressMonitor monitor, RefactoringOptions rctx)
+		public override void PerformChange (ProgressMonitor monitor, RefactoringOptions rctx)
 		{
 			File.WriteAllText (FileName, Content);
-			rctx.Document.Project.AddFile (FileName);
-			IdeApp.ProjectOperations.Save (rctx.Document.Project);
-		}
-	}
-	
-	public class OpenFileChange : Change
-	{
-		public string FileName {
-			get;
-			set;
-		}
-		
-		public OpenFileChange (string fileName)
-		{
-			this.FileName = fileName;
-			this.Description = string.Format (GettextCatalog.GetString ("Open file '{0}'"), Path.GetFileName (fileName));
-		}
-		
-		public override void PerformChange (IProgressMonitor monitor, RefactoringOptions rctx)
-		{
-			IdeApp.Workbench.OpenDocument (FileName);
+			rctx.DocumentContext.Project.AddFile (FileName);
+			IdeApp.ProjectOperations.SaveAsync (rctx.DocumentContext.Project);
 		}
 	}
-	
+
 	public class RenameFileChange : Change
 	{
 		public string OldName {
@@ -219,25 +179,20 @@ namespace MonoDevelop.Refactoring
 		public RenameFileChange (string oldName, string newName)
 		{
 			if (oldName == null)
-				throw new ArgumentNullException ("oldName");
+				throw new ArgumentNullException (nameof (oldName));
 			if (newName == null)
-				throw new ArgumentNullException ("newName");
+				throw new ArgumentNullException (nameof (newName));
 			this.OldName = oldName;
 			this.NewName = newName;
 			this.Description = string.Format (GettextCatalog.GetString ("Rename file '{0}' to '{1}'"), Path.GetFileName (oldName), Path.GetFileName (newName));
 		}
 		
-		public override void PerformChange (IProgressMonitor monitor, RefactoringOptions rctx)
+		public override void PerformChange (ProgressMonitor monitor, RefactoringOptions rctx)
 		{
 			if (rctx == null)
-				throw new ArgumentNullException ("rctx");
+				throw new ArgumentNullException (nameof (rctx));
 			FileService.RenameFile (OldName, NewName);
-			if (IdeApp.ProjectOperations.CurrentSelectedSolution != null) {
-				foreach (var p in IdeApp.ProjectOperations.CurrentSelectedSolution.GetAllProjects ()) {
-					if (p.GetProjectFile (NewName) != null)
-						IdeApp.ProjectOperations.Save (p);
-				}
-			}
+			IdeApp.ProjectOperations.CurrentSelectedSolution?.SaveAsync (new ProgressMonitor ());
 		}
 	}
 	
@@ -254,9 +209,9 @@ namespace MonoDevelop.Refactoring
 			this.Description = string.Format (GettextCatalog.GetString ("Save project {0}"), project.Name);
 		}
 		
-		public override void PerformChange (IProgressMonitor monitor, RefactoringOptions rctx)
+		public override void PerformChange (ProgressMonitor monitor, RefactoringOptions rctx)
 		{
-			IdeApp.ProjectOperations.Save (this.Project);
+			IdeApp.ProjectOperations.SaveAsync (this.Project);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Commands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Commands.cs
new file mode 100644
index 0000000000..856fcc63cd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Commands.cs
@@ -0,0 +1,44 @@
+//
+// Commands.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.Refactoring
+{
+
+	public enum RefactoryCommands
+	{
+		CurrentRefactoryOperations,
+		GotoDeclaration, // in 'referenced' in IdeViMode.cs as string
+		FindReferences,
+		FindAllReferences,
+		FindDerivedClasses,
+		DeclareLocal,
+		ImportSymbol,
+		QuickFix
+	}
+
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/EncapsulateFieldDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/EncapsulateFieldDialog.cs
deleted file mode 100644
index 7c806bbfcc..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/EncapsulateFieldDialog.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-// EncapsulateFieldDialog.cs
-//
-// Author:
-//   Jeffrey Stedfast  <fejj@novell.com>
-//   Ankit Jain  <jankit@novell.com>
-//
-// Copyright (c) 2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-
-using System;
-using System.Text;
-using System.CodeDom;
-
-using Gtk;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Parser;
-using MonoDevelop.Projects.CodeGeneration;
-using MonoDevelop.Ide;
-using Mono.TextEditor;
-using System.Linq;
-using System.Collections.Generic;
-using Mono.TextEditor.PopupWindow;
-
-namespace MonoDevelop.Refactoring {
-
-	public partial class EncapsulateFieldDialog : Gtk.Dialog
-	{
-		IType declaringType;
-		ListStore store;
-		ListStore visibilityStore;
-		MonoDevelop.Ide.Gui.Document editor;
-		
-		private const int colCheckedIndex = 0;
-		private const int colFieldNameIndex = 1;
-		private const int colPropertyNameIndex = 2;
-		private const int colVisibilityIndex = 3;
-		private const int colReadOnlyIndex = 4;
-		private const int colFieldIndex = 5;
-
-		public EncapsulateFieldDialog (MonoDevelop.Ide.Gui.Document editor, ITypeResolveContext ctx, IType declaringType)
-			: this (editor, declaringType, null)
-		{}
-
-		public EncapsulateFieldDialog (MonoDevelop.Ide.Gui.Document editor, ITypeResolveContext ctx, IField field)
-			: this (editor, field.DeclaringType, field)
-		{}
-
-		private EncapsulateFieldDialog (MonoDevelop.Ide.Gui.Document editor, IType declaringType, IField field)
-		{
-			this.editor = editor;
-			this.declaringType = declaringType;
-			this.Build ();
-
-			Title = GettextCatalog.GetString ("Encapsulate Fields");
-			buttonOk.Sensitive = true;
-			store = new ListStore (typeof (bool), typeof(string), typeof (string), typeof (string), typeof (bool), typeof (IField));
-			visibilityStore = new ListStore (typeof (string));
-
-			// Column #1
-			CellRendererToggle cbRenderer = new CellRendererToggle ();
-			cbRenderer.Activatable = true;
-			cbRenderer.Toggled += OnSelectedToggled;
-			TreeViewColumn cbCol = new TreeViewColumn ();
-			cbCol.Title = "";
-			cbCol.PackStart (cbRenderer, false);
-			cbCol.AddAttribute (cbRenderer, "active", colCheckedIndex);
-			treeview.AppendColumn (cbCol);
-
-			// Column #2
-			CellRendererText fieldRenderer = new CellRendererText ();
-			fieldRenderer.Weight = (int) Pango.Weight.Bold;
-			TreeViewColumn fieldCol = new TreeViewColumn ();
-			fieldCol.Title = GettextCatalog.GetString ("Field");
-			fieldCol.Expand = true;
-			fieldCol.PackStart (fieldRenderer, true);
-			fieldCol.AddAttribute (fieldRenderer, "text", colFieldNameIndex);
-			treeview.AppendColumn (fieldCol);
-
-			// Column #3
-			CellRendererText propertyRenderer = new CellRendererText ();
-			propertyRenderer.Editable = true;
-			propertyRenderer.Edited += new EditedHandler (OnPropertyEdited);
-			TreeViewColumn propertyCol = new TreeViewColumn ();
-			propertyCol.Title = GettextCatalog.GetString ("Property");
-			propertyCol.Expand = true;
-			propertyCol.PackStart (propertyRenderer, true);
-			propertyCol.AddAttribute (propertyRenderer, "text", colPropertyNameIndex);
-			propertyCol.SetCellDataFunc (propertyRenderer, new TreeCellDataFunc (RenderPropertyName));
-			treeview.AppendColumn (propertyCol);
-
-			// Column #4
-			CellRendererCombo visiComboRenderer = new CellRendererCombo ();
-			visiComboRenderer.Model = visibilityStore;
-			visiComboRenderer.Editable = true;
-			visiComboRenderer.Edited += new EditedHandler (OnVisibilityEdited);
-			visiComboRenderer.HasEntry = false;
-			visiComboRenderer.TextColumn = 0;
-
-			TreeViewColumn visiCol = new TreeViewColumn ();
-			visiCol.Title = GettextCatalog.GetString ("Visibility");
-			visiCol.PackStart (visiComboRenderer, false);
-			visiCol.AddAttribute (visiComboRenderer, "text", colVisibilityIndex);
-			treeview.AppendColumn (visiCol);
-
-			// Column #5
-			CellRendererToggle roRenderer = new CellRendererToggle ();
-			roRenderer.Activatable = true;
-			roRenderer.Xalign = 0.0f;
-			roRenderer.Toggled += new ToggledHandler (OnReadOnlyToggled);
-			TreeViewColumn roCol = new TreeViewColumn ();
-			roCol.Title = GettextCatalog.GetString ("Read only");
-			roCol.PackStart (roRenderer, false);
-			roCol.AddAttribute (roRenderer, "active", colReadOnlyIndex);
-			treeview.AppendColumn (roCol);
-
-			visibilityStore.AppendValues ("Public");
-			visibilityStore.AppendValues ("Private");
-			visibilityStore.AppendValues ("Protected");
-			visibilityStore.AppendValues ("Internal");
-
-			treeview.Model = store;
-
-			foreach (IField ifield in declaringType.Fields) {
-				bool enabled = field != null && (field.Name == ifield.Name);
-				string propertyName = GeneratePropertyName (ifield.Name);
-				store.AppendValues (enabled, ifield.Name, propertyName,
-				                    "Public", ifield.IsReadonly || ifield.IsLiteral, ifield);
-
-				if (enabled)
-					CheckAndUpdateConflictMessage (propertyName, false);
-			}
-
-			store.SetSortColumnId (colFieldNameIndex, SortType.Ascending);
-			buttonSelectAll.Clicked += OnSelectAllClicked;
-			buttonUnselectAll.Clicked += OnUnselectAllClicked;
-			buttonOk.Clicked += OnOKClicked;
-			buttonCancel.Clicked += OnCancelClicked;
-
-			UpdateOKButton ();
-		}
-
-		string GeneratePropertyName (string fieldName)
-		{
-			StringBuilder builder = new StringBuilder (fieldName.Length);
-			bool upper = true;
-			int i = 0;
-
-			// Field names are commonly prefixed with "m" or "m_" by devs from c++ land.
-			if (fieldName[0] == 'm' && fieldName.Length > 1 &&
-			    (fieldName[1] == '_' || Char.IsUpper (fieldName[1])))
-				i++;
-
-			while (i < fieldName.Length) {
-				if (fieldName[i] == '_') {
-					// strip _'s and uppercase the next letter
-					upper = true;
-				} else if (Char.IsLetter (fieldName[i])) {
-					builder.Append (upper ? Char.ToUpper (fieldName[i]) : fieldName[i]);
-					upper = false;
-				} else {
-					builder.Append (fieldName[i]);
-				}
-
-				i++;
-			}
-
-			return builder.ToString ();
-		}
-
-		void OnPropertyEdited (object sender, EditedArgs args)
-		{
-			TreeIter iter;
-			if (!store.GetIterFromString (out iter, args.Path))
-				return;
-
-			store.SetValue (iter, colPropertyNameIndex, args.NewText);
-			if (!CheckAndUpdateConflictMessage (iter, true))
-				// unselect this field
-				store.SetValue (iter, colCheckedIndex, false);
-
-			UpdateOKButton ();
-		}
-
-		void RenderPropertyName (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
-		{
-			bool selected = (bool) store.GetValue (iter, colCheckedIndex);
-			string propertyName = (string) store.GetValue (iter, colPropertyNameIndex);
-			string error;
-
-			CellRendererText cellRendererText = (CellRendererText) cell;
-			if (!selected || IsValidPropertyName (propertyName, out error))
-				cellRendererText.Foreground = "black";
-			else
-				cellRendererText.Foreground = "red";
-
-			cellRendererText.Text = propertyName;
-		}
-
-		// @clearOnValid: clear the message label if propertyName is valid
-		bool CheckAndUpdateConflictMessage (TreeIter iter, bool clearOnValid)
-		{
-			return CheckAndUpdateConflictMessage ((string) store.GetValue (iter, colPropertyNameIndex), 
-			                                      clearOnValid);
-		}
-
-		// @clearOnValid: clear the message label if propertyName is valid
-		bool CheckAndUpdateConflictMessage (string name, bool clearOnValid)
-		{
-			string error;
-			if (IsValidPropertyName (name, out error)) {
-				if (clearOnValid)
-					SetErrorMessage (null);
-				return true;
-			} else {
-				SetErrorMessage (error);
-				return false;
-			}
-		}
-
-		void SetErrorMessage (string message)
-		{
-			if (String.IsNullOrEmpty (message)) {
-				labelError.Text = String.Empty;
-				imageError.Clear ();
-			} else {
-				labelError.Text = message;
-				imageError.SetFromStock (MonoDevelop.Ide.Gui.Stock.Error, IconSize.Menu);
-			}
-		}
-
-		bool IsValidPropertyName (string name, out string error_msg)
-		{
-			// Don't allow the user to click OK unless there is a new name
-			if (name.Length == 0) {
-				error_msg = GettextCatalog.GetString ("Property name must be non-empty.");
-				return false;
-			}
-			foreach (IMember member in declaringType.Members) {
-				if (member.Name == name) {
-					error_msg = GettextCatalog.GetString ("Property name conflicts with an existing member name.");
-					return false;
-				}
-			}
-			error_msg = String.Empty;
-			return true;
-		}
-
-		private void OnVisibilityEdited (object sender, EditedArgs args)
-		{
-			TreeIter iter;
-			if (store.GetIterFromString (out iter, args.Path))
-				store.SetValue (iter, colVisibilityIndex, args.NewText);
-		}
-
-		private void OnSelectedToggled (object o, ToggledArgs args)
-		{
-			TreeIter iter;
-			if (!store.GetIterFromString (out iter, args.Path))
-				return;
-
-			bool old_value = (bool) store.GetValue (iter, colCheckedIndex);
-			store.SetValue (iter, colCheckedIndex, !old_value);
-
-			if (old_value)
-				SetErrorMessage (null);
-			else
-				CheckAndUpdateConflictMessage (iter, true);
-			UpdateOKButton ();
-		}
-
-		void UpdateOKButton ()
-		{
-			TreeIter iter;
-			if (!store.GetIterFirst (out iter))
-				return;
-
-			bool atleast_one_selected = false;
-			do {
-				bool selected = (bool) store.GetValue (iter, colCheckedIndex);
-				if (!selected)
-					continue;
-
-				atleast_one_selected = true;
-
-				string propertyName = (string) store.GetValue (iter, colPropertyNameIndex);
-				string error;
-				if (!IsValidPropertyName (propertyName, out error)) {
-					buttonOk.Sensitive = false;
-					return;
-				}
-			} while (store.IterNext (ref iter));
-
-			buttonOk.Sensitive = atleast_one_selected;
-		}
-
-		private void OnReadOnlyToggled (object o, ToggledArgs args)
-		{
-			TreeIter iter;
-			if (store.GetIterFromString (out iter, args.Path)) {
-				IField ifield = (IField) store.GetValue (iter, colFieldIndex);
-				if (ifield.IsReadonly || ifield.IsLiteral)
-					return;
-
-				bool value = (bool) store.GetValue (iter, colReadOnlyIndex);
-				store.SetValue (iter, colReadOnlyIndex, !value);
-			}
-		}
-
-		void OnSelectAllClicked (object sender, EventArgs e)
-		{
-			SelectAll (true);
-		}
-
-		void OnUnselectAllClicked (object sender, EventArgs e)
-		{
-			SelectAll (false);
-			SetErrorMessage (null);
-		}
-
-		void SelectAll (bool select)
-		{
-			TreeIter iter;
-			if (!store.GetIterFirst (out iter))
-				return;
-
-			// clear any old error message
-			SetErrorMessage (null);
-
-			bool has_error = false;
-			do {
-				if (select && !CheckAndUpdateConflictMessage (iter, false))
-					has_error = true;
-				store.SetValue (iter, colCheckedIndex, select);
-			} while (store.IterNext (ref iter));
-
-			if (has_error)
-				SetErrorMessage (GettextCatalog.GetString ("One or more property names conflict with existing members of the class"));
-			UpdateOKButton ();
-		}
-
-		void OnCancelClicked (object sender, EventArgs e)
-		{
-			((Widget) this).Destroy ();
-		}
-		class FieldData {
-			public IField Field { get; set; }
-			public string PropertyName { get; set; }
-			public bool ReadOnly { get; set; }
-			public Modifiers Modifiers { get; set; }
-			
-			public FieldData (IField field, string propertyName, bool readOnly, Modifiers modifiers)
-			{
-				this.Field = field;
-				this.PropertyName = propertyName;
-				this.ReadOnly = readOnly;
-				this.Modifiers = modifiers;
-			}
-		}
-		
-		void OnOKClicked (object sender, EventArgs e)
-		{
-			TreeIter iter;
-			if (!store.GetIterFirst (out iter))
-				return;
-			
-			List<FieldData> data = new List<FieldData> ();
-			
-			do {
-				bool selected = (bool) store.GetValue (iter, colCheckedIndex);
-				if (!selected)
-					continue;
-
-				string propertyName = (string) store.GetValue (iter, colPropertyNameIndex);
-				string visibility = (string) store.GetValue (iter, colVisibilityIndex);
-				bool read_only = (bool) store.GetValue (iter, colReadOnlyIndex);
-				IField field = (IField) store.GetValue (iter, colFieldIndex);
-				Modifiers mod = Modifiers.None;
-				if (visibility.ToUpper () == "PUBLIC")
-					mod = Modifiers.Public;
-				if (visibility.ToUpper () == "PRIVATE")
-					mod = Modifiers.Private;
-				if (visibility.ToUpper () == "PROTECTED")
-					mod = Modifiers.Protected;
-				if (visibility.ToUpper () == "INTERNAL")
-					mod = Modifiers.Internal;
-				data.Add (new FieldData (field, propertyName, read_only, mod));
-			} while (store.IterNext (ref iter));
-			
-			var mode = new InsertionCursorEditMode (editor.Editor.Parent, CodeGenerationService.GetInsertionPoints (editor, declaringType));
-			var helpWindow = new ModeHelpWindow ();
-			helpWindow.Shown += (s, a) => DesktopService.RemoveWindowShadow (helpWindow);
-			helpWindow.TransientFor = IdeApp.Workbench.RootWindow;
-			helpWindow.TitleText = GettextCatalog.GetString ("<b>Encapsulate Field -- Targeting</b>");
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Key</b>"), GettextCatalog.GetString ("<b>Behavior</b>")));
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Up</b>"), GettextCatalog.GetString ("Move to <b>previous</b> target point.")));
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Down</b>"), GettextCatalog.GetString ("Move to <b>next</b> target point.")));
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Enter</b>"), GettextCatalog.GetString ("<b>Declare new property</b> at target point.")));
-			helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Esc</b>"), GettextCatalog.GetString ("<b>Cancel</b> this refactoring.")));
-			mode.HelpWindow = helpWindow;
-			mode.CurIndex = mode.InsertionPoints.Count - 1;
-			int idx = -1, i = 0;
-			TextLocation lTextLocation = TextLocation.Empty;
-			foreach (IMember member in declaringType.Members) {
-				if (lTextLocation != member.Location && data.Any (d => d.Field.Location == member.Location))
-					idx = i;
-				lTextLocation = member.Location;
-				i++;
-			}
-			if (idx >= 0)
-				mode.CurIndex = idx + 1;
-			mode.StartMode ();
-			mode.Exited += delegate(object s, InsertionCursorEventArgs args) {
-				if (args.Success) {
-					CodeGenerator generator =  CodeGenerator.CreateGenerator (editor.Editor.Document.MimeType, editor.Editor.TabsToSpaces, editor.Editor.Options.TabSize, editor.Editor.EolMarker);
-					StringBuilder code = new StringBuilder ();
-					for (int j = 0; j < data.Count; j++) {
-						if (j > 0) {
-							code.AppendLine ();
-							code.AppendLine ();
-						}
-						var f = data[j];
-						code.Append (generator.CreateFieldEncapsulation (declaringType, f.Field, f.PropertyName, f.Modifiers, f.ReadOnly));
-					}
-					args.InsertionPoint.Insert (editor.Editor, code.ToString ());
-				}
-			};
-			((Widget) this).Destroy ();
-		}
-
-		static MemberAttributes StringToMemberAttributes (string visibility)
-		{
-			switch (visibility) {
-			case "Public":
-				return MemberAttributes.Public;
-			case "Private":
-				return MemberAttributes.Private;
-			case "Protected":
-				return MemberAttributes.Family;
-			case "Internal":
-				return MemberAttributes.Assembly;
-			default:
-				throw new ArgumentException ("Unknown visibility : " + visibility);
-			}
-		}
-
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ExtensionMethods.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ExtensionMethods.cs
deleted file mode 100644
index cb52d45e37..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ExtensionMethods.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// ExtensionMethods.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.Gui;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-using System.Threading.Tasks;
-using MonoDevelop.Core;
-using System.Threading;
-using MonoDevelop.Core.Instrumentation;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.Refactoring
-{
-    public static class ExtensionMethods
-    {
-		class ResolverAnnotation
-		{
-			public CancellationTokenSource SharedTokenSource;
-			public Task<CSharpAstResolver> Task;
-			public CSharpUnresolvedFile ParsedFile;
-		}
-
-		public static TimerCounter ResolveCounter = InstrumentationService.CreateTimerCounter("Resolve document", "Parsing");
-
-		/// <summary>
-		/// Returns a full C# syntax tree resolver which is shared between semantic highlighting, source analysis and refactoring.
-		/// For code analysis tasks this should be used instead of generating an own resolver. Only exception is if a local resolving is done using a 
-		/// resolve navigator.
-		/// Note: The shared resolver is fully resolved.
-		/// </summary>
-		public static Task<CSharpAstResolver> GetSharedResolver (this Document document)
-		{
-			var parsedDocument = document.ParsedDocument;
-			if (parsedDocument == null || document.IsProjectContextInUpdate || document.Project != null && !(document.Project is DotNetProject))
-				return null;
-
-			var unit       = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (unit == null || parsedFile == null)
-				return null;
-			var compilation = document.Compilation;
-
-			var resolverAnnotation = document.Annotation<ResolverAnnotation> ();
-
-			if (resolverAnnotation != null) {
-				if (resolverAnnotation.ParsedFile == parsedFile)
-					return resolverAnnotation.Task;
-				if (resolverAnnotation.SharedTokenSource != null)
-					resolverAnnotation.SharedTokenSource.Cancel ();
-				document.RemoveAnnotations<ResolverAnnotation> ();
-			}
-
-			var tokenSource = new CancellationTokenSource ();
-			var token = tokenSource.Token;
-			var resolveTask = Task.Factory.StartNew (delegate {
-				try {
-					using (var timer = ResolveCounter.BeginTiming ()) {
-						var result = new CSharpAstResolver (compilation, unit, parsedFile);
-						result.ApplyNavigator (new ConstantModeResolveVisitorNavigator (ResolveVisitorNavigationMode.Resolve, null), token);
-						return result;
-					}
-				} catch (OperationCanceledException) {
-					return null;
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while creating the resolver.", e);
-					return null;
-				}
-			}, token);
-
-			var wrapper = resolveTask.ContinueWith (t => {
-				if (t.IsCanceled)
-					return null;
-				if (t.IsFaulted) {
-					var ex = t.Exception.Flatten ().InnerException;
-					if (!(ex is TaskCanceledException))
-						LoggingService.LogWarning ("Exception while getting shared AST resolver.", ex);
-					return null;
-				}
-				return t.Result;
-			}, TaskContinuationOptions.ExecuteSynchronously);
-
-			document.AddAnnotation (new ResolverAnnotation {
-				Task = wrapper,
-				ParsedFile = parsedFile,
-				SharedTokenSource = tokenSource
-			});
-
-			return wrapper;
-		}
-
-		public sealed class ConstantModeResolveVisitorNavigator : IResolveVisitorNavigator
-		{
-			readonly ResolveVisitorNavigationMode mode;
-			readonly IResolveVisitorNavigator targetForResolveCalls;
-
-			public ConstantModeResolveVisitorNavigator(ResolveVisitorNavigationMode mode, IResolveVisitorNavigator targetForResolveCalls)
-			{
-				this.mode = mode;
-				this.targetForResolveCalls = targetForResolveCalls;
-			}
-
-			ResolveVisitorNavigationMode IResolveVisitorNavigator.Scan(AstNode node)
-			{
-				return mode;
-			}
-
-			void IResolveVisitorNavigator.Resolved(AstNode node, ResolveResult result)
-			{
-				if (targetForResolveCalls != null)
-					targetForResolveCalls.Resolved(node, result);
-			}
-
-			void IResolveVisitorNavigator.ProcessConversion(Expression expression, ResolveResult result, Conversion conversion, IType targetType)
-			{
-				if (targetForResolveCalls != null)
-					targetForResolveCalls.ProcessConversion(expression, result, conversion, targetType);
-			}
-		}
-
-    }
-}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs
deleted file mode 100644
index da9a514bbb..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-// FindDerivedClassesHandler.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Refactoring;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using System.Collections.Generic;
-using System.Threading;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.FindInFiles;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Semantics;
-using System.Threading.Tasks;
-using System.Linq;
-using System.Collections.Concurrent;
-
-namespace MonoDevelop.Refactoring
-{
-	public class FindDerivedClassesHandler : CommandHandler
-	{
-		public static void FindDerivedClasses (ITypeDefinition cls)
-		{
-			FindDerivedSymbols (cls, null);
-		}
-
-		public static void FindDerivedMembers (IMember member)
-		{
-			var cls = member.DeclaringTypeDefinition;
-			if (cls == null)
-				return;
-			FindDerivedSymbols (cls, member);
-		}
-
-		static void FindDerivedSymbols (ITypeDefinition cls, IMember member)
-		{
-			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
-			if (solution == null)
-				return;
-
-			var sourceProject = TypeSystemService.GetProject (cls);
-			if (sourceProject == null)
-				return;
-
-			var compilations = ReferenceFinder.GetAllReferencingProjects (solution, sourceProject)
-				.Select (TypeSystemService.GetCompilation).Where (c => c != null).ToList ();
-
-			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
-				var label = member == null
-					? GettextCatalog.GetString ("Searching for derived classes in solution...")
-					: GettextCatalog.GetString ("Searching for derived members in solution...");
-				monitor.BeginTask (label, compilations.Count);
-
-				Parallel.ForEach (compilations, comp => {
-					try {
-						SearchCompilation (monitor, comp, cls, member);
-					} catch (Exception ex) {
-						LoggingService.LogInternalError (ex);
-						monitor.ReportError ("Unhandled error while searching", ex);
-					}
-					monitor.Step (1);
-				});
-
-				monitor.EndTask ();
-			};
-		}
-
-		static void SearchCompilation (ISearchProgressMonitor monitor, ICompilation comp, ITypeDefinition cls, IMember member)
-		{
-			var importedType = comp.Import (cls);
-			if (importedType == null) {
-				return;
-			}
-
-			IMember impMember = null;
-			if (member != null) {
-				impMember = comp.Import (member);
-				if (impMember == null) {
-					return;
-				}
-			}
-
-			foreach (var derivedType in comp.MainAssembly.GetAllTypeDefinitions ()) {
-				if (!derivedType.IsDerivedFrom (importedType))
-					continue;
-				IEntity result;
-				if (member != null) {
-					result = FindDerivedMember (impMember, derivedType);
-					if (result == null)
-						continue;
-				}
-				else {
-					result = derivedType;
-				}
-				ReportResult (monitor, result);
-			}
-		}
-
-		static IMember FindDerivedMember (IMember importedMember, ITypeDefinition derivedType)
-		{
-			IMember derivedMember;
-			if (importedMember.DeclaringTypeDefinition.Kind == TypeKind.Interface) {
-				derivedMember = derivedType.GetMembers (null, GetMemberOptions.IgnoreInheritedMembers)
-					.FirstOrDefault (m => m.ImplementedInterfaceMembers.Any (im => im.Region == importedMember.Region));
-			}
-			else {
-				derivedMember = InheritanceHelper.GetDerivedMember (importedMember, derivedType);
-			}
-			return derivedMember;
-		}
-
-		static void ReportResult (ISearchProgressMonitor monitor, IEntity result)
-		{
-			string filename = result.Region.FileName;
-			if (string.IsNullOrEmpty (filename))
-				return;
-
-			var textFile = TextFileProvider.Instance.GetTextEditorData (filename);
-			var start = textFile.LocationToOffset (result.Region.Begin);
-			textFile.SearchRequest.SearchPattern = result.Name;
-			var sr = textFile.SearchForward (start);
-			if (sr != null)
-				start = sr.Offset;
-
-			if (textFile.Parent == null)
-				textFile.Dispose ();
-
-			monitor.ReportResult (new MemberReference (result, result.Region, start, result.Name.Length));
-		}
-
-		protected override void Run (object data)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-
-			ResolveResult resolveResult;
-			var item = CurrentRefactoryOperationsHandler.GetItem (doc, out resolveResult);
-
-			var typeDef = item as ITypeDefinition;
-			if (typeDef != null && ((typeDef.Kind == TypeKind.Class && !typeDef.IsSealed) || typeDef.Kind == TypeKind.Interface)) {
-				FindDerivedClasses (typeDef);
-				return;
-			}
-
-			var member = item as IMember;
-			var handler = new FindDerivedSymbolsHandler (member);
-			if (handler.IsValid) {
-				handler.Run ();
-				return;
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs
deleted file mode 100644
index 50c204a767..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// FindDerivedSymbolsHandler.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.FindInFiles;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Analysis;
-using MonoDevelop.Ide.TypeSystem;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MonoDevelop.Projects;
-using System.Threading;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.Refactoring
-{
-	class FindDerivedSymbolsHandler 
-	{
-		readonly IMember member;
-
-		public FindDerivedSymbolsHandler (IMember member)
-		{
-			this.member = member;
-		}
-
-		public bool IsValid {
-			get {
-				if (IdeApp.ProjectOperations.CurrentSelectedSolution == null)
-					return false;
-				if (TypeSystemService.GetProject (member) == null)
-					return false;
-				return member.IsVirtual || member.IsAbstract || member.DeclaringType.Kind == TypeKind.Interface;
-			}
-		}
-
-		public void Run ()
-		{
-			FindDerivedClassesHandler.FindDerivedMembers (member);
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindExtensionMethodHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindExtensionMethodHandler.cs
deleted file mode 100644
index 97e5441889..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindExtensionMethodHandler.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// FindExtensionMethodHandler.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.FindInFiles;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Analysis;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.Refactoring
-{
-	class FindExtensionMethodHandler 
-	{
-		//Ide.Gui.Document doc;
-		ITypeDefinition entity;
-
-		public FindExtensionMethodHandler (Ide.Gui.Document doc, ITypeDefinition entity)
-		{
-			//this.doc = doc;
-			this.entity = entity;
-		}
-
-		public void Run ()
-		{
-			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
-				foreach (var project in IdeApp.ProjectOperations.CurrentSelectedSolution.GetAllProjects ()) {
-					var comp = TypeSystemService.GetCompilation (project); 
-					foreach (var type in comp.MainAssembly.GetAllTypeDefinitions ()) {
-						if (!type.IsStatic)
-							continue;
-						foreach (var method in type.GetMethods (m => m.IsStatic)) {
-							if (!method.IsExtensionMethod)
-								continue;
-							IType[] ifTypes;
-							var typeDef = comp.Import (entity);
-							if (typeDef == null)
-								continue;
-							if (!CSharpResolver.IsEligibleExtensionMethod (typeDef, method, true, out ifTypes))
-								continue;
-
-							var tf = TextFileProvider.Instance.GetReadOnlyTextEditorData (method.Region.FileName);
-							var start = tf.LocationToOffset (method.Region.Begin); 
-							tf.SearchRequest.SearchPattern = method.Name;
-							var sr = tf.SearchForward (start); 
-							if (sr != null)
-								start = sr.Offset;
-							monitor.ReportResult (new MemberReference (method, method.Region, start, method.Name.Length));
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindMemberOverloadsHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindMemberOverloadsHandler.cs
deleted file mode 100644
index db0f154683..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindMemberOverloadsHandler.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// FindMemberOverloadsHandler.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.FindInFiles;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Analysis;
-
-namespace MonoDevelop.Refactoring
-{
-	class FindMemberOverloadsHandler
-	{
-		//Ide.Gui.Document doc;
-		IMember entity;
-
-		public FindMemberOverloadsHandler (Ide.Gui.Document doc, IMember entity)
-		{
-			//this.doc = doc;
-			this.entity = entity;
-		}
-
-		public bool IsValid {
-			get {
-				foreach (var overloadedMember in entity.DeclaringType.GetMembers (m => m.Name == entity.Name && m.SymbolKind == entity.SymbolKind)) {
-					var fileName = overloadedMember.Region.FileName;
-					if (string.IsNullOrEmpty (fileName))
-						continue;
-					return true;
-				}
-				return false;
-			}
-		}
-
-		public void Run ()
-		{
-			using (var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true)) {
-				foreach (var overloadedMember in entity.DeclaringType.GetMembers (m => m.Name == entity.Name && m.SymbolKind == entity.SymbolKind)) {
-					var fileName = overloadedMember.Region.FileName;
-					if (string.IsNullOrEmpty (fileName))
-						continue;
-					var tf = TextFileProvider.Instance.GetReadOnlyTextEditorData (fileName);
-					var start = tf.LocationToOffset (overloadedMember.Region.Begin); 
-					tf.SearchRequest.SearchPattern = overloadedMember.Name;
-					var sr = tf.SearchForward (start); 
-					if (sr != null)
-						start = sr.Offset;
-					monitor.ReportResult (new MemberReference (overloadedMember, overloadedMember.Region, start, overloadedMember.Name.Length));
-				}
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs
deleted file mode 100644
index 8e219e7e35..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// 
-// FindReferencesHandler.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Threading;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Refactoring;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace MonoDevelop.Refactoring
-{
-	public class FindReferencesHandler : CommandHandler
-	{
-		public static void FindRefs (object obj)
-		{
-			var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true);
-			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
-			ThreadPool.QueueUserWorkItem (delegate {
-				try {
-					foreach (var mref in ReferenceFinder.FindReferences (solution, obj, false, ReferenceFinder.RefactoryScope.Unknown, monitor)) {
-						monitor.ReportResult (mref);
-					}
-				} catch (Exception ex) {
-					if (monitor != null)
-						monitor.ReportError ("Error finding references", ex);
-					else
-						LoggingService.LogError ("Error finding references", ex);
-				} finally {
-					if (monitor != null)
-						monitor.Dispose ();
-				}
-			});
-		}
-		protected override void Run (object data)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-			ResolveResult resolveResoult;
-			object item = CurrentRefactoryOperationsHandler.GetItem (doc, out resolveResoult);
-			if (item != null)
-				FindRefs (item);
-		}
-	}
-
-	public class FindAllReferencesHandler : CommandHandler
-	{
-		public static void FindRefs (object obj)
-		{
-			var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true);
-			var solution = IdeApp.ProjectOperations.CurrentSelectedSolution;
-			ThreadPool.QueueUserWorkItem (delegate {
-				try {
-					foreach (var mref in ReferenceFinder.FindReferences (solution, obj, true, ReferenceFinder.RefactoryScope.Unknown, monitor)) {
-						monitor.ReportResult (mref);
-					}
-				} catch (Exception ex) {
-					if (monitor != null)
-						monitor.ReportError ("Error finding references", ex);
-					else
-						LoggingService.LogError ("Error finding references", ex);
-				} finally {
-					if (monitor != null)
-						monitor.Dispose ();
-				}
-			});
-		}
-		protected override void Run (object data)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-			ResolveResult resolveResoult;
-			object item = CurrentRefactoryOperationsHandler.GetItem (doc, out resolveResoult);
-			if (item != null)
-				FindRefs (item);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesProvider.cs
new file mode 100644
index 0000000000..9e8d17fb4d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesProvider.cs
@@ -0,0 +1,42 @@
+//
+// FindReferencesProvider.cs
+//
+// Author:
+//       mkrueger <>
+//
+// Copyright (c) 2016 
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections;
+using System.Collections.Generic;
+using MonoDevelop.Ide.FindInFiles;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.Refactoring
+{
+	abstract class FindReferencesProvider
+	{
+		public abstract Task<IEnumerable<SearchResult>> FindReferences (string documentationCommentId, Project hintProject, CancellationToken token = default(CancellationToken));
+		public abstract Task<IEnumerable<SearchResult>> FindAllReferences (string documentationCommentId, Project hintProject, CancellationToken token = default(CancellationToken));
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs
deleted file mode 100644
index 58bb8a4dd0..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// 
-// GotoDeclarationHandler.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Refactoring;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.Semantics;
-
-namespace MonoDevelop.Refactoring
-{
-	public class GotoDeclarationHandler : CommandHandler
-	{
-		protected override void Run (object data)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-
-			ResolveResult resolveResoult;
-			object item = CurrentRefactoryOperationsHandler.GetItem (doc, out resolveResoult);
-			var entity = item as INamedElement;
-			if (entity != null) {
-				IdeApp.ProjectOperations.JumpToDeclaration (entity);
-			} else {
-				var v = item as IVariable;
-				if (v != null)
-					IdeApp.ProjectOperations.JumpToDeclaration (v);
-			}
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ImportSymbolHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ImportSymbolHandler.cs
deleted file mode 100644
index 1a2960a688..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ImportSymbolHandler.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-// 
-// RefactoryCommands.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Text;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Refactoring;
-using MonoDevelop.Ide;
-using System.Linq;
-using MonoDevelop.Ide.CodeCompletion;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-
-namespace MonoDevelop.Refactoring
-{
-	class GenerateNamespaceImport
-	{
-		public bool GenerateUsing { get; set; }
-		public bool InsertNamespace { get; set; }
-	}
-	
-	class ImportSymbolCache
-	{
-		Dictionary<string, GenerateNamespaceImport> cache = new Dictionary<string, GenerateNamespaceImport> ();
-		
-		public GenerateNamespaceImport GetResult (IUnresolvedFile unit, IType type, MonoDevelop.Ide.Gui.Document doc)
-		{
-			GenerateNamespaceImport result;
-			if (cache.TryGetValue (type.Namespace, out result))
-				return result;
-			result = new GenerateNamespaceImport ();
-			cache[type.Namespace] = result;
-			TextEditorData data = doc.Editor;
-			
-			result.InsertNamespace  = false;
-			var loc = new TextLocation (data.Caret.Line, data.Caret.Column);
-			foreach (var ns in RefactoringOptions.GetUsedNamespaces (doc, loc)) {
-				if (type.Namespace == ns) {
-					result.GenerateUsing = false;
-					return result;
-				}
-			}
-			
-			result.GenerateUsing = true;
-			string name = type.Name;
-			
-			foreach (string ns in RefactoringOptions.GetUsedNamespaces (doc, loc)) {
-				if (doc.Compilation.MainAssembly.GetTypeDefinition (ns, name, type.TypeParameterCount) != null) {
-					result.GenerateUsing = false;
-					result.InsertNamespace = true;
-					return result;
-				}
-			}
-			return result;
-		}
-	}
-		
-	class ImportSymbolCompletionData : CompletionData
-	{
-		IType type;
-		Ambience ambience;
-		ParsedDocument unit;
-		MonoDevelop.Ide.Gui.Document doc;
-		ImportSymbolCache cache;
-		
-		public IType Type {
-			get { return this.type; }
-		}
-		
-		public ImportSymbolCompletionData (MonoDevelop.Ide.Gui.Document doc, ImportSymbolCache cache, IType type)
-		{
-			this.doc = doc;
-			this.cache = cache;
-//			this.data = doc.Editor;
-			this.ambience = AmbienceService.GetAmbience (doc.Editor.MimeType);
-			this.type = type;
-			this.unit = doc.ParsedDocument;
-			this.DisplayFlags |= ICSharpCode.NRefactory.Completion.DisplayFlags.IsImportCompletion;
-		}
-		
-		bool initialized = false;
-		bool generateUsing, insertNamespace;
-		
-		void Initialize ()
-		{
-			if (initialized)
-				return;
-			initialized = true;
-			if (string.IsNullOrEmpty (type.Namespace)) 
-				return;
-			var result = cache.GetResult (unit.ParsedFile, type, doc);
-			generateUsing = result.GenerateUsing;
-			insertNamespace = result.InsertNamespace;
-		}
-		
-		#region IActionCompletionData implementation
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
-		{
-			Initialize ();
-			using (var undo = doc.Editor.OpenUndoGroup ()) {
-				string text = insertNamespace ? type.Namespace + "." + type.Name : type.Name;
-				if (text != GetCurrentWord (window)) {
-					if (window.WasShiftPressed && generateUsing) 
-						text = type.Namespace + "." + text;
-					window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, GetCurrentWord (window), text);
-				}
-				
-				if (!window.WasShiftPressed && generateUsing) {
-					var generator = CodeGenerator.CreateGenerator (doc);
-					if (generator != null) {
-						generator.AddGlobalNamespaceImport (doc, type.Namespace);
-						// reparse
-						doc.UpdateParseDocument ();
-					}
-				}
-			}
-			ka |= KeyActions.Ignore;
-		}
-		#endregion
-		
-		#region ICompletionData implementation
-		public override IconId Icon {
-			get {
-				return type.GetStockIcon ();
-			}
-		}
-		string displayText = null;
-		public override string DisplayText {
-			get {
-				if (displayText == null)
-					displayText = ambience.GetString (type, OutputFlags.IncludeGenerics);
-				return displayText;
-			}
-		}
-		
-		static string GetDefaultDisplaySelection (string description, bool isSelected)
-		{
-			if (!isSelected)
-				return "<span foreground=\"darkgray\">" + description + "</span>";
-			return description;
-		}
-
-		string displayDescription = null;
-		public override string GetDisplayDescription (bool isSelected)
-		{
-			if (displayDescription == null) {
-				Initialize ();
-				if (generateUsing || insertNamespace) {
-					displayDescription = string.Format (GettextCatalog.GetString ("(from '{0}')"), type.Namespace);
-				} else {
-					displayDescription = "";
-				}
-			}
-			return GetDefaultDisplaySelection (displayDescription, isSelected);
-		}
-
-		
-		public override string Description {
-			get {
-				Initialize ();
-				if (generateUsing)
-					return string.Format (GettextCatalog.GetString ("Add namespace import '{0}'"), type.Namespace);
-				return null;
-			}
-		}
-		
-		public override string CompletionText {
-			get {
-				return type.Name;
-			}
-		}
-		#endregion
-	}
-	
-	public class ImportSymbolHandler: CommandHandler
-	{	
-		protected override void Run ()
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null)
-				return;
-			ITextEditorExtension ext = doc.EditorExtension;
-			while (ext != null && !(ext is CompletionTextEditorExtension))
-				ext = ext.Next;
-			if (ext == null)
-				return;
-		
-			var dom = doc.Compilation;
-			ImportSymbolCache cache = new ImportSymbolCache ();
-			var lookup = new MemberLookup (null, doc.Compilation.MainAssembly);
-
-			List<ImportSymbolCompletionData> typeList = new List<ImportSymbolCompletionData> ();
-			foreach (var type in dom.GetTopLevelTypeDefinitons ()) {
-				if (!lookup.IsAccessible (type, false))
-					continue;
-				typeList.Add (new ImportSymbolCompletionData (doc, cache, type));
-			}
-			
-			typeList.Sort (delegate (ImportSymbolCompletionData left, ImportSymbolCompletionData right) {
-				return left.Type.Name.CompareTo (right.Type.Name);
-			});
-			
-			
-			CompletionDataList completionList = new CompletionDataList ();
-			completionList.IsSorted = true;
-			typeList.ForEach (cd => completionList.Add (cd));
-			
-			((CompletionTextEditorExtension)ext).ShowCompletion (completionList);
-		}
-	}
-}
-
-/*
-// 
-// RefactoryCommands.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Text;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Refactoring;
-using MonoDevelop.Ide;
-using System.Linq;
-using MonoDevelop.Ide.CodeCompletion;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.Refactoring
-{
-	class GenerateNamespaceImport
-	{
-		public bool GenerateUsing { get; set; }
-		public bool InsertNamespace { get; set; }
-	}
-	
-	class ImportSymbolCache
-	{
-		Dictionary<string, GenerateNamespaceImport> cache = new Dictionary<string, GenerateNamespaceImport> ();
-		
-		public GenerateNamespaceImport GetResult (IUnresolvedFile unit, string typeNamespace, string typeName, MonoDevelop.Ide.Gui.Document doc)
-		{
-			GenerateNamespaceImport result;
-			if (cache.TryGetValue (typeNamespace, out result))
-				return result;
-			result = new GenerateNamespaceImport ();
-			cache[typeNamespace] = result;
-			TextEditorData data = doc.Editor;
-			
-			result.InsertNamespace  = false;
-			var loc = new TextLocation (data.Caret.Line, data.Caret.Column);
-			foreach (var ns in RefactoringOptions.GetUsedNamespaces (doc, loc)) {
-				if (typeNamespace == ns) {
-					result.GenerateUsing = false;
-					return result;
-				}
-			}
-			
-			result.GenerateUsing = true;
-			string name = typeName;
-			
-			foreach (string ns in RefactoringOptions.GetUsedNamespaces (doc, loc)) {
-				if (doc.Compilation.MainAssembly.GetTypeDefinition (ns, name, 0) != null) {
-					result.GenerateUsing = false;
-					result.InsertNamespace = true;
-					return result;
-				}
-			}
-			return result;
-		}
-	}
-		
-	class ImportSymbolCompletionData : CompletionData
-	{
-		internal readonly string typeName;
-		ParsedDocument unit;
-		MonoDevelop.Ide.Gui.Document doc;
-		ImportSymbolCache cache;
-		TypeKind kind;
-		Lazy<FrameworkLookup.AssemblyLookup> lookup;
-		MonoDevelop.Projects.ProjectReference reference;
-		public ImportSymbolCompletionData (MonoDevelop.Ide.Gui.Document doc, ImportSymbolCache cache, string typeName, TypeKind kind, Lazy<FrameworkLookup.AssemblyLookup> lookup, MonoDevelop.Projects.ProjectReference reference)
-		{
-			this.doc = doc;
-			this.cache = cache;
-			this.unit = doc.ParsedDocument;
-			this.kind = kind;
-			this.typeName = typeName;
-			this.lookup = lookup;
-			this.reference = reference;
-		}
-		
-		bool initialized = false;
-		bool generateReference;
-		bool generateUsing;
-		bool insertNamespace;
-		
-		void Initialize ()
-		{
-			if (initialized)
-				return;
-			initialized = true;
-			var netProject = (DotNetProject)doc.Project;
-			generateReference = true;
-			foreach (var r in netProject.References) {
-				if (r.Equals (reference)) {
-					generateReference = false;
-					break;
-				}
-			}
-			var result = cache.GetResult (unit.ParsedFile, lookup.Value.Namespace, typeName, doc);
-			generateUsing = result.GenerateUsing;
-			insertNamespace = result.InsertNamespace;
-		}
-		
-		#region IActionCompletionData implementation
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
-		{
-			Initialize ();
-			string text = insertNamespace ? lookup.Value.Namespace + "." + typeName : typeName;
-			if (text != GetCurrentWord (window)) {
-				if (window.WasShiftPressed && generateReference) 
-					text = lookup.Value.Namespace + "." + text;
-				window.CompletionWidget.SetCompletionText (window.CodeCompletionContext, GetCurrentWord (window), text);
-			}
-
-			if (generateReference) {
-				var project = doc.Project;
-				project.Items.Add (reference);
-				IdeApp.ProjectOperations.Save (project);
-			}
-
-			if (!window.WasShiftPressed && generateUsing) {
-				var generator = CodeGenerator.CreateGenerator (doc);
-				if (generator != null) {
-					generator.AddGlobalNamespaceImport (doc, lookup.Value.Namespace);
-					// reparse
-					doc.UpdateParseDocument ();
-				}
-			}
-		}
-		#endregion
-		
-		#region ICompletionData implementation
-		public override IconId Icon {
-			get {
-				switch (kind) {
-				case TypeKind.Delegate:
-					return MonoDevelop.Ide.Gui.Stock.Delegate;
-				case TypeKind.Struct:
-					return MonoDevelop.Ide.Gui.Stock.Struct;
-				case TypeKind.Interface:
-					return MonoDevelop.Ide.Gui.Stock.Interface;
-				case TypeKind.Enum:
-					return MonoDevelop.Ide.Gui.Stock.Enum;
-				default:
-					return MonoDevelop.Ide.Gui.Stock.Class;
-				}
-			}
-		}
-
-		public override string DisplayText {
-			get {
-				return typeName;
-			}
-		}
-		
-		string displayDescription = null;
-		public override string DisplayDescription {
-			get {
-				if (displayDescription == null) {
-					Initialize ();
-					if (generateReference) {
-						displayDescription = string.Format (GettextCatalog.GetString ("(reference '{0}')"), reference.Reference);
-					} else if (generateUsing) {
-						displayDescription = string.Format (GettextCatalog.GetString ("(from '{0}')"), lookup.Value.Namespace);
-					} else {
-						displayDescription = "";
-					}
-				}
-				return displayDescription;
-			}
-		}
-		
-		public override string Description {
-			get {
-				return DisplayDescription;
-			}
-		}
-		
-		public override string CompletionText {
-			get {
-				return typeName;
-			}
-		}
-		#endregion
-	}
-	
-	public class ImportSymbolHandler: CommandHandler
-	{	
-		protected override void Run ()
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null)
-				return;
-			ITextEditorExtension ext = doc.EditorExtension;
-			while (ext != null && !(ext is CompletionTextEditorExtension))
-				ext = ext.Next;
-			if (ext == null)
-				return;
-
-			var dom = doc.Compilation;
-			ImportSymbolCache cache = new ImportSymbolCache ();
-			List<ImportSymbolCompletionData> typeList = new List<ImportSymbolCompletionData> ();
-			Dictionary<string, MonoDevelop.Projects.ProjectReference> referenceCache = new Dictionary<string, MonoDevelop.Projects.ProjectReference> ();
-			var netProject = (DotNetProject)doc.Project;
-			foreach (var type in TypeSystemService.GetFrameworkLookup (netProject).GetAllTypes ()) {
-				var r = type.Item3.Value;
-				MonoDevelop.Projects.ProjectReference reference;
-				if (!referenceCache.TryGetValue (r.FullName, out reference)) {
-					var systemAssembly = netProject.AssemblyContext.GetAssemblyFromFullName (r.FullName, r.Package, netProject.TargetFramework);
-					if (systemAssembly == null) {
-						reference = null;
-					} else {
-						reference = new MonoDevelop.Projects.ProjectReference (systemAssembly);
-					}
-					referenceCache [r.FullName] = reference;
-				}
-				if (reference == null)
-					continue;
-				typeList.Add (new ImportSymbolCompletionData (doc, cache, type.Item2, type.Item1, type.Item3, reference));
-			}
-
-			typeList.Sort (delegate (ImportSymbolCompletionData left, ImportSymbolCompletionData right) {
-				return left.typeName.CompareTo (right.typeName);
-			});
-
-			
-			var completionList = new CompletionDataList ();
-			completionList.IsSorted = true;
-
-			typeList.ForEach (cd => completionList.Add (cd));
-
-			((CompletionTextEditorExtension)ext).ShowCompletion (completionList);
-		}
-	}
-}
- * */
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs
new file mode 100644
index 0000000000..5f60bf1ec2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/InsertionPointService.cs
@@ -0,0 +1,270 @@
+//
+// InsertionPointService.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.Refactoring
+{
+	public static class InsertionPointService
+	{
+		public static List<InsertionPoint> GetInsertionPoints (IReadonlyTextDocument data, MonoDevelop.Ide.TypeSystem.ParsedDocument parsedDocument, ITypeSymbol type, int part)
+		{
+			if (data == null)
+				throw new ArgumentNullException (nameof (data));
+			if (parsedDocument == null)
+				throw new ArgumentNullException (nameof (parsedDocument));
+			if (type == null)
+				throw new ArgumentNullException (nameof (type));
+			if (!type.IsDefinedInSource ())
+				throw new ArgumentException ("The given type needs to be defined in source code.", nameof (type));
+
+			// update type from parsed document, since this is always newer.
+			//type = parsedDocument.GetInnermostTypeDefinition (type.GetLocation ()) ?? type;
+			//var realStartLocation = data.OffsetToLocation (offset);
+			var model = parsedDocument.GetAst<SemanticModel> ();
+			return GetInsertionPoints (data, model, type, part);
+		}
+
+		internal static List<InsertionPoint> GetInsertionPoints (IReadonlyTextDocument data, SemanticModel model, ITypeSymbol type, int part)
+		{

+			List<InsertionPoint> result = new List<InsertionPoint> ();
+
+			type = model.GetEnclosingNamedType (part, default (CancellationToken)) as ITypeSymbol ?? type;
+			var sourceSpan = new TextSpan (part, 0);
+
+			var filePath = data.FileName;
+			var declaringType = type.DeclaringSyntaxReferences.FirstOrDefault (dsr => dsr.SyntaxTree.FilePath == filePath && dsr.Span.Contains (sourceSpan)) ?? type.DeclaringSyntaxReferences.FirstOrDefault ();
+			if (declaringType == null)
+				return result;
+			return GetInsertionPoints (data, type, result, sourceSpan, declaringType);
+		}
+
+		static List<InsertionPoint> GetInsertionPoints (IReadonlyTextDocument data, ITypeSymbol type, List<InsertionPoint> result, TextSpan sourceSpan, SyntaxReference declaringType)
+		{

+			var openBraceToken = declaringType.GetSyntax ().ChildTokens ().FirstOrDefault (t => t.IsKind (SyntaxKind.OpenBraceToken));
+			if (!openBraceToken.IsMissing) {
+				var domLocation = data.OffsetToLocation (openBraceToken.SpanStart);
+				result.Add (GetInsertionPosition (data, domLocation.Line, domLocation.Column));
+				//			result.Add (GetInsertionPosition (data, realStartLocation.Line, realStartLocation.Column));
+				result [0].LineBefore = NewLineInsertion.None;
+			}
+			foreach (var member in type.GetMembers ()) {
+				if (member.IsImplicitlyDeclared || !member.IsDefinedInSource ())
+					continue;
+				//var domLocation = member.BodyRegion.End;
+				foreach (var loc in member.DeclaringSyntaxReferences) {
+					if (loc.SyntaxTree.FilePath != declaringType.SyntaxTree.FilePath || !declaringType.Span.Contains (sourceSpan))
+						continue;
+					var domLocation = data.OffsetToLocation (loc.Span.End);
+
+					if (domLocation.Line <= 0) {
+						var lineSegment = data.GetLineByOffset (loc.Span.Start);
+						if (lineSegment == null)
+							continue;
+						domLocation = new DocumentLocation (lineSegment.LineNumber, lineSegment.Length + 1);
+					}
+					result.Add (GetInsertionPosition (data, domLocation.Line, domLocation.Column));
+					break;
+				}
+			}
+
+			result [result.Count - 1].LineAfter = NewLineInsertion.None;
+			CheckStartPoint (data, result [0], result.Count == 1);
+			if (result.Count > 1) {
+				result.RemoveAt (result.Count - 1); 
+				NewLineInsertion insertLine;
+				var typeSyntaxReference = type.DeclaringSyntaxReferences.FirstOrDefault (r => r.Span.Contains (sourceSpan));
+
+				var lineBefore = data.GetLineByOffset (typeSyntaxReference.Span.End).PreviousLine;
+				if (lineBefore != null && lineBefore.Length == lineBefore.GetIndentation (data).Length) {
+					insertLine = NewLineInsertion.None;
+				} else {
+					insertLine = NewLineInsertion.Eol;
+				}
+				// search for line start
+				var line = data.GetLineByOffset (typeSyntaxReference.Span.End);
+				int col = typeSyntaxReference.Span.End - line.Offset;
+				if (line != null) {
+					var lineOffset = line.Offset;
+					col = Math.Min (line.Length, col);
+					while (lineOffset + col - 2 >= 0 && col > 1 && char.IsWhiteSpace (data.GetCharAt (lineOffset + col - 2)))
+						col--;
+				}
+				result.Add (new InsertionPoint (new DocumentLocation (line.LineNumber, col), insertLine, NewLineInsertion.Eol));
+				CheckEndPoint (data, result [result.Count - 1], result.Count == 1);
+			}
+
+//			foreach (var region in parsedDocument.UserRegions.Where (r => type.BodyRegion.IsInside (r.Region.Begin))) {
+//				result.Add (new InsertionPoint (new DocumentLocation (region.Region.BeginLine + 1, 1), NewLineInsertion.Eol, NewLineInsertion.Eol));
+//				result.Add (new InsertionPoint (new DocumentLocation (region.Region.EndLine, 1), NewLineInsertion.Eol, NewLineInsertion.Eol));
+//				result.Add (new InsertionPoint (new DocumentLocation (region.Region.EndLine + 1, 1), NewLineInsertion.Eol, NewLineInsertion.Eol));
+//			}
+			result.Sort ((left, right) => left.Location.CompareTo (right.Location));
+			//foreach (var res in result)
+			//	Console.WriteLine (res);
+			return result;
+		}
+
+		public static List<InsertionPoint> GetInsertionPoints (IReadonlyTextDocument data, MonoDevelop.Ide.TypeSystem.ParsedDocument parsedDocument, ITypeSymbol type, Location location)
+		{
+			return GetInsertionPoints (data, parsedDocument, type, location.SourceSpan.Start);
+		}
+
+		static void CheckEndPoint (IReadonlyTextDocument doc, InsertionPoint point, bool isStartPoint)
+		{
+			var line = doc.GetLine (point.Location.Line);
+			if (line == null)
+				return;
+
+			if (doc.GetLineIndent (line).Length + 1 < point.Location.Column)
+				point.LineBefore = NewLineInsertion.BlankLine;
+			if (point.Location.Column < line.Length + 1)
+				point.LineAfter = NewLineInsertion.Eol;
+		}
+
+		static void CheckStartPoint (IReadonlyTextDocument doc, InsertionPoint point, bool isEndPoint)
+		{
+			var line = doc.GetLine (point.Location.Line);
+			if (line == null)
+				return;
+			if (doc.GetLineIndent (line).Length + 1 == point.Location.Column) {
+				int lineNr = point.Location.Line;
+				while (lineNr > 1 && doc.GetLineIndent (lineNr - 1).Length == doc.GetLine (lineNr - 1).Length) {
+					lineNr--;
+				}
+				line = doc.GetLine (lineNr);
+				point.Location = new DocumentLocation (lineNr, doc.GetLineIndent (line).Length + 1);
+			}
+
+			if (doc.GetLineIndent (line).Length + 1 < point.Location.Column)
+				point.LineBefore = NewLineInsertion.Eol;
+			if (point.Location.Column < line.Length + 1)
+				point.LineAfter = isEndPoint ? NewLineInsertion.Eol : NewLineInsertion.BlankLine;
+		}
+
+		static InsertionPoint GetInsertionPosition (IReadonlyTextDocument doc, int line, int column)
+		{
+			int bodyEndOffset = doc.LocationToOffset (line, column) + 1;
+			var curLine = doc.GetLine (line);
+			if (curLine != null) {
+				if (bodyEndOffset < curLine.Offset + curLine.Length) {
+					// case1: positition is somewhere inside the start line
+					return new InsertionPoint (new DocumentLocation (line, column + 1), NewLineInsertion.Eol, NewLineInsertion.BlankLine);
+				}
+			}
+
+			// -> if position is at line end check next line
+			var nextLine = doc.GetLine (line + 1);
+			if (nextLine == null) // check for 1 line case.
+				return new InsertionPoint (new DocumentLocation (line, column + 1), NewLineInsertion.BlankLine, NewLineInsertion.BlankLine);
+
+			for (int i = nextLine.Offset; i < nextLine.EndOffset; i++) {
+				char ch = doc.GetCharAt (i);
+				if (!char.IsWhiteSpace (ch)) {
+					// case2: next line contains non ws chars.
+					return new InsertionPoint (new DocumentLocation (line + 1, 1), NewLineInsertion.Eol, NewLineInsertion.BlankLine);
+				}
+			}
+
+			var nextLine2 = doc.GetLine (line + 2);
+			if (nextLine2 != null) {
+				for (int i = nextLine2.Offset; i < nextLine2.EndOffset; i++) {
+					char ch = doc.GetCharAt (i);
+					if (!char.IsWhiteSpace (ch)) {
+						// case3: one blank line
+						return new InsertionPoint (new DocumentLocation (line + 1, 1), NewLineInsertion.Eol, NewLineInsertion.Eol);
+					}
+				}
+			}
+			// case4: more than 1 blank line
+			return new InsertionPoint (new DocumentLocation (line + 1, 1), NewLineInsertion.Eol, NewLineInsertion.None);
+		}
+
+		internal static InsertionPoint GetSuitableInsertionPoint (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part, SyntaxNode member)
+		{
+			switch (member.Kind ()) {
+			case SyntaxKind.FieldDeclaration:
+				return GetNewFieldPosition (data, points, cls, part);
+			case SyntaxKind.MethodDeclaration:
+			case SyntaxKind.ConstructorDeclaration:
+			case SyntaxKind.DestructorDeclaration:
+			case SyntaxKind.OperatorDeclaration:
+				return GetNewMethodPosition (data, points, cls, part);
+			case SyntaxKind.EventDeclaration:
+				return GetNewEventPosition (data, points, cls, part);
+			case SyntaxKind.PropertyDeclaration:
+				return GetNewPropertyPosition (data, points, cls, part);
+			}
+			throw new InvalidOperationException ("Invalid member type: " + member.Kind ());
+		}
+
+		static InsertionPoint GetNewFieldPosition (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part)
+		{
+			if (!cls.GetMembers ().OfType<IFieldSymbol> ().Any ()) 
+				return points.FirstOrDefault ();
+			var lastField = cls.GetMembers ().OfType<IFieldSymbol> ().Last ();
+			var begin = data.OffsetToLocation (lastField.Locations.First ().SourceSpan.Start);
+			return points.FirstOrDefault (p => p.Location > begin);
+		}
+
+		static InsertionPoint GetNewMethodPosition (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part)
+		{
+			if (!cls.GetMembers ().OfType<IMethodSymbol> ().Any ()) 
+				return GetNewPropertyPosition (data, points, cls, part);
+			var lastMethod = cls.GetMembers ().OfType<IMethodSymbol> ().Last ();
+			var begin = data.OffsetToLocation (lastMethod.Locations.First ().SourceSpan.Start);
+			return points.FirstOrDefault (p => p.Location > begin);
+		}
+
+		static InsertionPoint GetNewPropertyPosition (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part)
+		{
+			if (!cls.GetMembers ().OfType<IPropertySymbol> ().Any ()) 
+				return GetNewFieldPosition (data, points, cls, part);
+			var lastProperty = cls.GetMembers ().OfType<IPropertySymbol> ().Last ();
+			var begin = data.OffsetToLocation (lastProperty.Locations.First ().SourceSpan.Start);
+			return points.FirstOrDefault (p => p.Location > begin);
+		}
+
+		static InsertionPoint GetNewEventPosition (IReadonlyTextDocument data, IEnumerable<InsertionPoint> points, ITypeSymbol cls, Location part)
+		{
+			if (!cls.GetMembers ().OfType<IEventSymbol> ().Any ()) 
+				return GetNewMethodPosition (data, points, cls, part);
+			var lastEvent = cls.GetMembers ().OfType<IEventSymbol> ().Last ();
+			var begin = data.OffsetToLocation (lastEvent.Locations.First ().SourceSpan.Start);
+			return points.FirstOrDefault (p => p.Location > begin);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/JumpToDeclarationHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/JumpToDeclarationHandler.cs
new file mode 100644
index 0000000000..297cc379ee
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/JumpToDeclarationHandler.cs
@@ -0,0 +1,45 @@
+//
+// JumpToDeclarationHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.Refactoring
+{
+	abstract class JumpToDeclarationHandler
+	{
+		public abstract Task<bool> TryJumpToDeclarationAsync (string documentIdString, Projects.Project hintProject, CancellationToken token = default(CancellationToken));
+	}
+
+	class DummyJumpToDeclarationHandler : JumpToDeclarationHandler
+	{
+		public override Task<bool> TryJumpToDeclarationAsync (string documentIdString, Projects.Project hintProject, CancellationToken token = default (CancellationToken))
+		{
+			return Task.FromResult (false);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/OverridesImplementsDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/OverridesImplementsDialog.cs
deleted file mode 100644
index bc8541afc5..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/OverridesImplementsDialog.cs
+++ /dev/null
@@ -1,400 +0,0 @@
-// OverridesImplementsDialog.cs
-//
-//Author:
-//    Ankit Jain  <jankit@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.Collections.Generic;
-
-using Gtk;
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects.CodeGeneration;
-using MonoDevelop.Projects.Dom;
-using MonoDevelop.Projects.Dom.Output;
-using Ambience_ = MonoDevelop.Projects.Dom.Output.Ambience;
-using MonoDevelop.Ide;
-using System.Text;
-using Mono.TextEditor;
-using Mono.TextEditor.PopupWindow;
-
-
-namespace MonoDevelop.Refactoring
-{
-	partial class OverridesImplementsDialog : Gtk.Dialog
-	{
-		IType cls;
-		TreeStore store;
-		CodeRefactorer refactorer;
-		Ambience ambience;
-		MonoDevelop.Ide.Gui.Document editor;
-		
-		private const int colCheckedIndex = 0;
-		private const int colIconIndex = 1;
-		private const int colNameIndex = 2;
-		private const int colExplicitIndex = 3;
-		private const int colItemIndex = 4;
-
-/*		private const OutputFlags default_conversion_flags =
-			OutputFlags.ShowParameterNames |
-			OutputFlags.ShowGenericParameters |
-			OutputFlags.ShowReturnType |
-			OutputFlags.ShowParameters |
-			OutputFlags.UseIntrinsicTypeNames;*/
-		private const OutputFlags default_conversion_flags =
-			OutputFlags.IncludeParameters |
-			OutputFlags.IncludeParameterName |
-			OutputFlags.IncludeReturnType;
-
-		public OverridesImplementsDialog (MonoDevelop.Ide.Gui.Document editor, IType cls)
-		{
-			this.Build();
-			this.editor = editor;
-			this.cls = cls;
-
-			// FIXME: title
-			Title = GettextCatalog.GetString ("Override and/or implement members");
-
-			store = new TreeStore (typeof (bool), typeof (Gdk.Pixbuf), typeof (string), typeof (bool), typeof (IMember));
-
-			// Column #1
-			TreeViewColumn nameCol = new TreeViewColumn ();
-			nameCol.Title = GettextCatalog.GetString ("Name");
-			nameCol.Expand = true;
-			nameCol.Resizable = true;
-
-			CellRendererToggle cbRenderer = new CellRendererToggle ();
-			cbRenderer.Activatable = true;
-			cbRenderer.Toggled += OnSelectToggled;
-			nameCol.PackStart (cbRenderer, false);
-			nameCol.AddAttribute (cbRenderer, "active", colCheckedIndex);
-
-			CellRendererPixbuf iconRenderer = new CellRendererPixbuf ();
-			nameCol.PackStart (iconRenderer, false);
-			nameCol.AddAttribute (iconRenderer, "pixbuf", colIconIndex);
-
-			CellRendererText nameRenderer = new CellRendererText ();
-			nameRenderer.Ellipsize = Pango.EllipsizeMode.End;
-			nameCol.PackStart (nameRenderer, true);
-			nameCol.AddAttribute (nameRenderer, "text", colNameIndex);
-
-			treeview.AppendColumn (nameCol);
-
-			// Column #2
-			CellRendererToggle explicitRenderer = new CellRendererToggle ();
-			explicitRenderer.Activatable = true;
-			explicitRenderer.Xalign = 0.0f;
-			explicitRenderer.Toggled += OnExplicitToggled;
-			TreeViewColumn explicitCol = new TreeViewColumn ();
-			explicitCol.Title = GettextCatalog.GetString ("Explicit");
-			explicitCol.PackStart (explicitRenderer, true);
-			explicitCol.SetCellDataFunc (explicitRenderer, new TreeCellDataFunc (RenderExplicitCheckbox));
-			explicitCol.AddAttribute (explicitRenderer, "active", colExplicitIndex);
-			treeview.AppendColumn (explicitCol);
-
-			store.SetSortColumnId (colNameIndex, SortType.Ascending);
-			treeview.Model = store;
-
-			buttonCancel.Clicked += OnCancelClicked;
-			buttonOk.Clicked += OnOKClicked;
-			buttonSelectAll.Clicked += delegate { SelectAll (true); };
-			buttonUnselectAll.Clicked += delegate { SelectAll (false); };
-
-			refactorer = IdeApp.Workspace.GetCodeRefactorer (IdeApp.ProjectOperations.CurrentSelectedSolution);
-			ambience = AmbienceService.GetAmbienceForFile (cls.GetDefinition ().Region.FileName);
-			PopulateTreeView ();
-			UpdateOKButton ();
-		}
-
-		void PopulateTreeView ()
-		{
-			List<IMember> class_members = new List<IMember> ();
-			List<IMember> interface_members = new List<IMember> ();
-
-			refactorer.FindOverridables (cls, class_members, interface_members, false, true);
-
-			Dictionary<string, TreeIter> iter_cache = new Dictionary<string,TreeIter> ();
-			PopulateTreeView (class_members, iter_cache,
-					ImageService.GetPixbuf (MonoDevelop.Ide.Gui.Stock.Class, IconSize.Menu));
-			PopulateTreeView (interface_members, iter_cache,
-					ImageService.GetPixbuf (MonoDevelop.Ide.Gui.Stock.Interface, IconSize.Menu));
-		}
-
-		void PopulateTreeView (List<IMember> members, Dictionary<string, TreeIter> iter_cache, Gdk.Pixbuf parent_icon)
-		{
-			foreach (IMember member in members) {
-				TreeIter iter;
-				if (!iter_cache.TryGetValue (member.DeclaringType.FullName, out iter)) {
-					iter = store.AppendValues (false, parent_icon,
-			                                   GetDescriptionString (member.DeclaringType), false, member.DeclaringType);
-					iter_cache [member.DeclaringType.FullName] = iter;
-				}
-
-				store.AppendValues (iter, false,
-				                    ImageService.GetPixbuf (member.StockIcon, IconSize.Menu),
-				                    GetDescriptionString (member), false, member);
-			}
-		}
-
-#region Event handlers
-		void RenderExplicitCheckbox (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
-		{
-			CellRendererToggle cellToggle = (CellRendererToggle) cell;
-			IMember item = (IMember) store.GetValue (iter, colItemIndex);
-			bool parent_is_class = false;
-
-			// Don't show 'explicit' checkbox for Class/interface rows or class methods
-			TreeIter parentIter;
-			if (item is IMember && store.IterParent (out parentIter, iter)) {
-				IType parentClass = store.GetValue (parentIter, colItemIndex) as IType;
-				if (parentClass != null && parentClass.ClassType != ClassType.Interface)
-					parent_is_class = true;
-			}
-
-			if (parent_is_class || item is IType) {
-				cellToggle.Visible = false;
-			} else {
-				cellToggle.Visible = true;
-				cellToggle.Active = GetExplicit (iter);
-			}
-		}
-
-		void OnSelectToggled (object o, ToggledArgs args)
-		{
-			TreeIter iter;
-			if (!store.GetIterFromString (out iter, args.Path))
-				return;
-
-			bool old_value = GetChecked (iter);
-			store.SetValue (iter, colCheckedIndex, !old_value);
-
-			TreeIter parent;
-			if (store.IterParent (out parent, iter)) {
-				// Member(method/property/etc) row clicked
-				// Set the parent's 'checked' state according to the children's state
-				bool all_children_checked = true;
-				foreach (TreeIter child in GetAllNodes (parent, false)) {
-					if (!GetChecked (child)) {
-						all_children_checked = false;
-						break;
-					}
-				}
-
-				store.SetValue (parent, colCheckedIndex, all_children_checked);
-			} else {
-				// Mark children's state to match parent's checked state
-				foreach (TreeIter child in GetAllNodes (iter, false))
-					store.SetValue (child, colCheckedIndex, !old_value);
-			}
-			UpdateOKButton ();
-		}
-
-		void OnExplicitToggled (object o, ToggledArgs args)
-		{
-			TreeIter iter;
-			if (!store.GetIterFromString (out iter, args.Path))
-				return;
-
-			store.SetValue (iter, colExplicitIndex, !GetExplicit (iter));
-		}
-
-		void OnCancelClicked (object sender, EventArgs e)
-		{
-			((Widget) this).Destroy ();
-		}
-
-		void UpdateOKButton ()
-		{
-			bool atleast_one_checked = false;
-			foreach (TreeIter iter in GetAllNodes (TreeIter.Zero, true)) {
-				if (GetChecked (iter)) {
-					atleast_one_checked = true;
-					break;
-				}
-			}
-			buttonOk.Sensitive = atleast_one_checked;
-		}
-
-		void OnOKClicked (object sender, EventArgs e)
-		{
-			try {
-				StringBuilder code = new StringBuilder ();
-				CodeGenerator generator =  CodeGenerator.CreateGenerator (editor.Editor.Document.MimeType, editor.Editor.TabsToSpaces, editor.Editor.Options.TabSize, editor.Editor.EolMarker);
-				IType declaringType = editor.GetType (cls.Location.Line, cls.Location.Column) ?? cls;
-
-				foreach (KeyValuePair<IType, IEnumerable<TreeIter>> kvp in GetAllClasses ()) {
-					if (code.Length > 0) {
-						code.AppendLine ();
-						code.AppendLine ();
-					}
-				
-					//update the target class so that new members don't get inserted in weird locations
-					StringBuilder curImpl = new StringBuilder ();
-					foreach (var pair in YieldImpls (kvp)) {
-						if (curImpl.Length > 0) {
-							curImpl.AppendLine ();
-							curImpl.AppendLine ();
-						}
-						curImpl.Append (generator.CreateMemberImplementation (declaringType, pair.Key, pair.Value != null).Code);
-					}
-					if (kvp.Key.ClassType == ClassType.Interface) {
-						code.Append (generator.WrapInRegions (kvp.Key.Name + " implementation", curImpl.ToString ()));
-					} else {
-						code.Append (curImpl.ToString ());
-					}
-				}
-				
-				var mode = new InsertionCursorEditMode (editor.Editor.Parent, CodeGenerationService.GetInsertionPoints (editor, this.cls));
-				var helpWindow = new ModeHelpWindow ();
-				helpWindow.Shown += (s, a) => DesktopService.RemoveWindowShadow (helpWindow);
-				helpWindow.TransientFor = IdeApp.Workbench.RootWindow;
-				helpWindow.TitleText = GettextCatalog.GetString ("<b>Override -- Targeting</b>");
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Key</b>"), GettextCatalog.GetString ("<b>Behavior</b>")));
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Up</b>"), GettextCatalog.GetString ("Move to <b>previous</b> target point.")));
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Down</b>"), GettextCatalog.GetString ("Move to <b>next</b> target point.")));
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Enter</b>"), GettextCatalog.GetString ("<b>Declare overrides</b> at target point.")));
-				helpWindow.Items.Add (new KeyValuePair<string, string> (GettextCatalog.GetString ("<b>Esc</b>"), GettextCatalog.GetString ("<b>Cancel</b> this refactoring.")));
-				mode.HelpWindow = helpWindow;
-				mode.CurIndex = mode.InsertionPoints.Count - 1;
-				mode.StartMode ();
-				mode.Exited += delegate(object s, InsertionCursorEventArgs args) {
-					if (args.Success)
-						args.InsertionPoint.Insert (editor.Editor, code.ToString ());
-				};
-				
-			} finally {
-				((Widget) this).Destroy ();
-			}
-		}
-#endregion
-
-#region Helper methods
-		
-		IEnumerable<KeyValuePair<IType, IEnumerable<TreeIter>>> GetAllClasses ()
-		{
-			TreeIter iter;
-			if (!store.GetIterFirst (out iter))
-				yield break;
-			do {
-				TreeIter firstMember;
-				if (store.IterChildren (out firstMember, iter)) {
-					List<TreeIter> children = new List<TreeIter> (GetCheckedSiblings (firstMember));
-					if (children.Count > 0)
-						yield return new KeyValuePair<IType, IEnumerable<TreeIter>> (
-							(IType) store.GetValue (iter, colItemIndex),
-							children);
-				}
-			} while (store.IterNext (ref iter));
-		}
-		
-		IEnumerable<TreeIter> GetCheckedSiblings (TreeIter firstMember)
-		{
-			TreeIter iter = firstMember;
-			do {
-				if (GetChecked (iter)) {
-					yield return iter;
-				}
-			} while (store.IterNext (ref iter));
-		}
-		
-		IEnumerable<KeyValuePair<IMember, IReturnType>> YieldImpls (KeyValuePair<IType, IEnumerable<TreeIter>> kvp)
-		{
-			bool is_interface = kvp.Key.ClassType == ClassType.Interface;
-			IReturnType privateImplementationType = new DomReturnType (kvp.Key.FullName);
-			foreach (TreeIter memberIter in kvp.Value) {
-				yield return new KeyValuePair<IMember, IReturnType> (
-					GetIMember (memberIter),
-					(is_interface && GetExplicit (memberIter)) ? privateImplementationType : null);
-			}
-		}
-		
-		void SelectAll (bool select)
-		{
-			foreach (TreeIter iter in GetAllNodes (TreeIter.Zero, true))
-				store.SetValue (iter, colCheckedIndex, select);
-			UpdateOKButton ();
-		}
-
-		bool GetChecked (TreeIter iter)
-		{
-			return (bool) store.GetValue (iter, colCheckedIndex);
-		}
-		
-		IMember GetIMember (TreeIter iter)
-		{
-			return (IMember) store.GetValue (iter, colItemIndex);
-		}
-
-		bool GetExplicit (TreeIter iter)
-		{
-			return (bool) store.GetValue (iter, colExplicitIndex);
-		}
-
-		IEnumerable<TreeIter> GetAllNodes (TreeIter parent, bool iter_children)
-		{
-			TreeIter child;
-			if (parent.Equals (TreeIter.Zero)) {
-				if (!store.IterChildren (out child))
-					yield break;
-			} else if (!store.IterChildren (out child, parent)) {
-				yield break;
-			}
-
-			do {
-				yield return child;
-				if (iter_children && store.IterHasChild (child)) {
-					TreeIter iter;
-					if (store.IterChildren (out iter, child)) {
-						do {
-							yield return iter;
-						} while (store.IterNext (ref iter));
-					}
-				}
-			} while (store.IterNext (ref child));
-		}
-
-		string GetDescriptionString (IType klass)
-		{
-			return String.Format ("{0} ({1})", ambience.GetString (klass, default_conversion_flags), klass.Namespace);
-		}
-
-		string GetDescriptionString (IMember member)
-		{
-			string sig = null;
-			OutputFlags flags = default_conversion_flags & ~OutputFlags.IncludeReturnType;
-
-			sig = ambience.GetString (member, flags);
-
-			if (sig == null)
-				throw new InvalidOperationException (String.Format ("Unsupported language member type: {0}", member.GetType ()));
-
-			return sig + " : " + ambience.GetString (member.ReturnType, default_conversion_flags);
-		}
-
-#endregion
-
-	}
-
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOperation.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOperation.cs
deleted file mode 100644
index 444970df71..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOperation.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// 
-// RefactoringOperation.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-
-namespace MonoDevelop.Refactoring
-{
-	public abstract class RefactoringOperation
-	{
-		public string Name {
-			get;
-			set;
-		}
-		
-		public bool IsBreakingAPI {
-			get;
-			set;
-		}
-		
-		public virtual string AccelKey {
-			get {
-				return "";
-			}
-		}
-		public virtual string GetMenuDescription (RefactoringOptions options)
-		{
-			return Name;
-		}
-		
-		public virtual bool IsValid (RefactoringOptions options)
-		{
-			return true;
-		}
-		
-		public virtual List<Change> PerformChanges (RefactoringOptions options, object properties)
-		{
-			throw new System.NotImplementedException ();
-		}
-
-		public virtual void Run (RefactoringOptions options)
-		{
-			var changes = PerformChanges (options, null);
-			var monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (Name, null);
-			RefactoringService.AcceptChanges (monitor, changes);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
index f0f9af2e6b..2684ff57f9 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
@@ -28,36 +28,32 @@ using MonoDevelop.Ide.Gui;
  
 using System.Text;
 using MonoDevelop.Projects.Text;
-using ICSharpCode.NRefactory.CSharp;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory.CSharp.Resolver;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.TypeSystem;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
+using MonoDevelop.Ide.Editor;
 using System.Threading.Tasks;
+using System.Collections.Immutable;
+using System.Threading;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.Refactoring
 {
 	public class RefactoringOptions
 	{
-		readonly Task<CSharpAstResolver> resolver;
-
-		public Document Document {
+		public TextEditor Editor {
 			get;
 			private set;
 		}
-		
-		public object SelectedItem {
+
+		public DocumentContext DocumentContext {
 			get;
-			set;
+			private set;
 		}
-		
-		public ResolveResult ResolveResult {
+
+		public object SelectedItem {
 			get;
 			set;
 		}
@@ -70,43 +66,48 @@ namespace MonoDevelop.Refactoring
 		
 		public string MimeType {
 			get {
-				return DesktopService.GetMimeTypeForUri (Document.FileName);
+				return DesktopService.GetMimeTypeForUri (DocumentContext.Name);
 			}
 		}
 		
-		public TextLocation Location {
+		public DocumentLocation Location {
 			get {
-				return new TextLocation (Document.Editor.Caret.Line, Document.Editor.Caret.Column);
+				return Editor.CaretLocation;
 			}
 		}
-		//public readonly SyntaxTree Unit;
+
 
 		public RefactoringOptions ()
 		{
 		}
 
-		public RefactoringOptions (Document doc)
+		public RefactoringOptions (MonoDevelop.Ide.Gui.Document doc) : this(doc.Editor, doc)
 		{
-			this.Document = doc;
-			if (doc != null && doc.ParsedDocument != null) {
+		}
+
+		public RefactoringOptions (TextEditor editor, DocumentContext doc)
+		{
+			this.DocumentContext = doc;
+			this.Editor = editor;
+			/*if (doc != null && doc.ParsedDocument != null) {
 				var sharedResolver = doc.GetSharedResolver ();
 				if (sharedResolver == null)
 					return;
 				resolver = sharedResolver;
 				//Unit = resolver != null ? resolver.RootNode as SyntaxTree : null;
-			}
+			}*/
 		}
 
-		public Mono.TextEditor.TextEditorData GetTextEditorData ()
+		public TextEditor GetTextEditorData ()
 		{
-			return Document.Editor;
+			return Editor;
 		}
 		
-		public static string GetWhitespaces (Document document, int insertionOffset)
+		public static string GetWhitespaces (TextEditor editor, int insertionOffset)
 		{
 			StringBuilder result = new StringBuilder ();
-			for (int i = insertionOffset; i < document.Editor.Length; i++) {
-				char ch = document.Editor.GetCharAt (i);
+			for (int i = insertionOffset; i < editor.Length; i++) {
+				char ch = editor.GetCharAt (i);
 				if (ch == ' ' || ch == '\t') {
 					result.Append (ch);
 				} else {
@@ -115,96 +116,56 @@ namespace MonoDevelop.Refactoring
 			}
 			return result.ToString ();
 		}
-		
-		public string OutputNode (AstNode node)
-		{
-			using (var stringWriter = new System.IO.StringWriter ()) {
-				var formatter = new TextWriterTokenWriter (stringWriter);
-//				formatter.Indentation = indentLevel;
-				stringWriter.NewLine = Document.Editor.EolMarker;
-				
-				var visitor = new CSharpOutputVisitor (formatter, FormattingOptionsFactory.CreateMono ());
-				node.AcceptVisitor (visitor);
-				return stringWriter.ToString ();
-			}
-		}
-		
-		public CodeGenerator CreateCodeGenerator ()
-		{
-			var result = CodeGenerator.CreateGenerator (Document);
-			if (result == null)
-				LoggingService.LogError ("Generator can't be generated for : " + Document.Editor.MimeType);
-			return result;
-		}
-		
-		public static string GetIndent (Document document, IEntity member)
+
+		public static string GetIndent (TextEditor editor, Microsoft.CodeAnalysis.SyntaxNode member)
 		{
-			return GetWhitespaces (document, document.Editor.Document.LocationToOffset (member.Region.BeginLine, 1));
+			return GetWhitespaces (editor, member.SpanStart);
 		}
 		
 		public string GetWhitespaces (int insertionOffset)
 		{
-			return GetWhitespaces (Document, insertionOffset);
-		}
-		
-		public string GetIndent (IEntity member)
-		{
-			return GetIndent (Document, member);
-		}
-//		
-//		public IReturnType ShortenTypeName (IReturnType fullyQualifiedTypeName)
-//		{
-//			return Document.ParsedDocument.CompilationUnit.ShortenTypeName (fullyQualifiedTypeName, Document.Editor.Caret.Line, Document.Editor.Caret.Column);
-//		}
-//		
-//		public ParsedDocument ParseDocument ()
-//		{
-//			return ProjectDomService.Parse (Dom.Project, Document.FileName, Document.Editor.Text);
-//		}
-		
-		public List<string> GetUsedNamespaces ()
-		{
-			return GetUsedNamespaces (Document, Location);
-		}
-		
-		public static List<string> GetUsedNamespaces (Document doc, TextLocation loc)
-		{
-			var result = new List<string> ();
-			var pf = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (pf == null)
-				return result;
-			var scope = pf.GetUsingScope (loc);
-			if (scope == null)
-				return result;
-			var resolver = pf.GetResolver (doc.Compilation, loc);
-			for (var n = scope; n != null; n = n.Parent) {
-				result.Add (n.NamespaceName);
-				result.AddRange (n.Usings.Select (u => u.ResolveNamespace (resolver))
-					.Where (nr => nr != null)
-					.Select (nr => nr.FullName));
-			}
-			return result;
+			return GetWhitespaces (Editor, insertionOffset);
 		}
 		
-		public ResolveResult Resolve (AstNode node)
+		public Task<ImmutableArray<string>> GetUsedNamespacesAsync (CancellationToken cancellationToken = default (CancellationToken))
 		{
-			if (!resolver.IsCompleted)
-				resolver.Wait (2000);
-			if (!resolver.IsCompleted)
-				return null;
-			return resolver.Result.Resolve (node);
+			return GetUsedNamespacesAsync (Editor, DocumentContext,  Editor.LocationToOffset (Location));
 		}
 		
-		public AstType CreateShortType (IType fullType)
+		public static async Task<ImmutableArray<string>> GetUsedNamespacesAsync (TextEditor editor, DocumentContext doc, int offset, CancellationToken cancellationToken = default (CancellationToken))
 		{
-			var parsedFile = Document.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
+			if (editor == null)
+				throw new System.ArgumentNullException (nameof (editor));
+			var parsedDocument = doc.ParsedDocument;
+			if (parsedDocument == null)
+				return ImmutableArray<string>.Empty;
+			var result = ImmutableArray<string>.Empty.ToBuilder ();
+			var sm = parsedDocument.GetAst<SemanticModel> (); 
+			var node = (await sm.SyntaxTree.GetRootAsync (cancellationToken).ConfigureAwait (false)).FindNode (TextSpan.FromBounds (offset, offset)); 
 			
-			var csResolver = parsedFile.GetResolver (Document.Compilation, Document.Editor.Caret.Location);
+			while (node != null) {
+				var cu = node as CompilationUnitSyntax;
+				if (cu != null) {
+					foreach (var u in cu.Usings) {
+						if (u.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective)
+							result.Add (u.Name.ToString ());
+					}
+				}
+				var ns = node as NamespaceDeclarationSyntax;
+				if (ns != null) {
+					var name = ns.Name.ToString ();
+					result.Add (name);
+					foreach (var u in ns.Usings) {
+						if (u.Kind () == Microsoft.CodeAnalysis.CSharp.SyntaxKind.UsingDirective) 
+							result.Add (u.Name.ToString ());
+					}
+				}
+
+				node = node.Parent;
+			}
 			
-			var builder = new ICSharpCode.NRefactory.CSharp.Refactoring.TypeSystemAstBuilder (csResolver);
-			return builder.ConvertType (fullType);
+			return result.ToImmutable ();
 		}
-	
 		
 //		public List<string> GetResolveableNamespaces (RefactoringOptions options, out bool resolveDirect)
 //		{
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
index ecfbf2e593..fe722b16b4 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
@@ -30,10 +30,10 @@ using Gtk;
 using Gdk;
 
 using MonoDevelop.Core;
-using Mono.TextEditor;
 using MonoDevelop.Ide;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 using MonoDevelop.Ide.Fonts;
 
 
@@ -48,9 +48,9 @@ namespace MonoDevelop.Refactoring
 		const int objColumn = 2;
 		const int statusVisibleColumn = 3;
 
-		List<Change> changes;
+		IList<Change> changes;
 
-		public RefactoringPreviewDialog (List<Change> changes)
+		public RefactoringPreviewDialog (IList<Change> changes)
 		{
 			this.Build ();
 			this.changes = changes;
@@ -87,7 +87,7 @@ namespace MonoDevelop.Refactoring
 			};
 			
 			buttonOk.Clicked += delegate {
-				IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (this.Title, null);
+				ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor (this.Title, null);
 				RefactoringService.AcceptChanges (monitor, changes);
 				
 				Destroy ();
@@ -107,9 +107,9 @@ namespace MonoDevelop.Refactoring
 				return;
 			}
 			
-			Mono.TextEditor.TextDocument doc = new Mono.TextEditor.TextDocument ();
-			doc.Text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (replaceChange.FileName);
-			DocumentLocation loc = doc.OffsetToLocation (replaceChange.Offset);
+			var doc = TextEditorFactory.CreateNewDocument ();
+			doc.Text = TextFileUtility.ReadAllText (replaceChange.FileName);
+			var loc = doc.OffsetToLocation (replaceChange.Offset);
 			
 			string text = string.Format (GettextCatalog.GetString ("(Line:{0}, Column:{1})"), loc.Line, loc.Column);
 			if (treeviewPreview.Selection.IterIsSelected (iter)) {
@@ -136,21 +136,21 @@ namespace MonoDevelop.Refactoring
 					return;
 			
 				var openDocument = IdeApp.Workbench.GetDocument (replaceChange.FileName);
-				Mono.TextEditor.TextDocument originalDocument = new Mono.TextEditor.TextDocument ();
+				var originalDocument = TextEditorFactory.CreateNewDocument ();
 				originalDocument.FileName = replaceChange.FileName;
 				if (openDocument == null) {
-					originalDocument.Text = Mono.TextEditor.Utils.TextFileUtility.ReadAllText (replaceChange.FileName);
+					originalDocument.Text = TextFileUtility.ReadAllText (replaceChange.FileName);
 				} else {
-					originalDocument.Text = openDocument.Editor.Document.Text;
+					originalDocument.Text = openDocument.Editor.Text;
 				}
 				
-				Mono.TextEditor.TextDocument changedDocument = new Mono.TextEditor.TextDocument ();
+				var changedDocument = TextEditorFactory.CreateNewDocument ();
 				changedDocument.FileName = replaceChange.FileName;
 				changedDocument.Text = originalDocument.Text;
 				
-				changedDocument.Replace (replaceChange.Offset, replaceChange.RemovedChars, replaceChange.InsertedText);
-				
-				string diffString = Mono.TextEditor.Utils.Diff.GetDiffString (originalDocument, changedDocument);
+				changedDocument.ReplaceText (replaceChange.Offset, replaceChange.RemovedChars, replaceChange.InsertedText);
+
+				string diffString = originalDocument.GetDiffAsString (changedDocument);
 				
 				cellRendererDiff.InitCell (treeviewPreview, true, diffString, replaceChange.FileName);
 			} catch (Exception e) {
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs
index 9e18efff67..5204352316 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringService.cs
@@ -33,107 +33,53 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 using System.Linq;
 using MonoDevelop.AnalysisCore;
-using ICSharpCode.NRefactory;
 using System.Threading.Tasks;
 using System.Threading;
 using MonoDevelop.CodeActions;
 using MonoDevelop.CodeIssues;
-using Mono.TextEditor;
 using MonoDevelop.Ide.TypeSystem;
 using System.Diagnostics;
 using MonoDevelop.Core.Instrumentation;
+using MonoDevelop.Ide.Editor;
+using Microsoft.CodeAnalysis.Options;

 using MonoDevelop.Ide;
+using MonoDevelop.Projects;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
 
 namespace MonoDevelop.Refactoring
-{
+{ 
 	public static class RefactoringService
 	{
-		static readonly List<RefactoringOperation> refactorings = new List<RefactoringOperation>();
-		static readonly List<CodeActionProvider> contextActions = new List<CodeActionProvider> ();
-		static readonly List<CodeIssueProvider> inspectors = new List<CodeIssueProvider> ();
-		
-		public static IEnumerable<CodeActionProvider> ContextAddinNodes {
-			get {
-				return contextActions;
-			}
-		} 
-
-		public static void AddProvider (CodeActionProvider provider)
-		{
-			contextActions.Add (provider);
-		}
-		
-		public static void AddProvider (CodeIssueProvider provider)
-		{
-			inspectors.Add (provider);
-		}
-
-		public static List<CodeIssueProvider> Inspectors {
-			get {
-				return inspectors;
-			}
-		}
+		internal static Func<TextEditor, DocumentContext, OptionSet> OptionSetCreation;
+		static ImmutableList<FindReferencesProvider> findReferencesProvider = ImmutableList<FindReferencesProvider>.Empty;
+		static List<JumpToDeclarationHandler> jumpToDeclarationHandler = new List<JumpToDeclarationHandler> ();
 
 		static RefactoringService ()
 		{
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/Refactorings", delegate(object sender, ExtensionNodeEventArgs args) {
+			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/FindReferencesProvider", delegate(object sender, ExtensionNodeEventArgs args) {
+				var provider  = (FindReferencesProvider) args.ExtensionObject;
 				switch (args.Change) {
-				case ExtensionChange.Add:
-					refactorings.Add ((RefactoringOperation)args.ExtensionObject);
+					case ExtensionChange.Add:
+					findReferencesProvider.Add (provider);
 					break;
-				case ExtensionChange.Remove:
-					refactorings.Remove ((RefactoringOperation)args.ExtensionObject);
+					case ExtensionChange.Remove:
+					findReferencesProvider.Remove (provider);
 					break;
 				}
 			});
 
-			
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeActions", delegate(object sender, ExtensionNodeEventArgs args) {
+			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/JumpToDeclarationHandler", delegate(object sender, ExtensionNodeEventArgs args) {
+				var provider  = (JumpToDeclarationHandler) args.ExtensionObject;
 				switch (args.Change) {
-				case ExtensionChange.Add:
-					contextActions.Add (((CodeActionAddinNode)args.ExtensionNode).Action);
+					case ExtensionChange.Add:
+					jumpToDeclarationHandler.Add (provider);
 					break;
-				case ExtensionChange.Remove:
-					contextActions.Remove (((CodeActionAddinNode)args.ExtensionNode).Action);
+					case ExtensionChange.Remove:
+					jumpToDeclarationHandler.Remove (provider);
 					break;
 				}
 			});
-			
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeActionSource", delegate(object sender, ExtensionNodeEventArgs args) {
-				switch (args.Change) {
-				case ExtensionChange.Add:
-					contextActions.AddRange (((ICodeActionProviderSource)args.ExtensionObject).GetProviders ());
-					break;
-				}
-			});
-			
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeIssues", delegate(object sender, ExtensionNodeEventArgs args) {
-				switch (args.Change) {
-				case ExtensionChange.Add:
-					inspectors.Add (((CodeIssueAddinNode)args.ExtensionNode).Inspector);
-					break;
-				case ExtensionChange.Remove:
-					inspectors.Remove (((CodeIssueAddinNode)args.ExtensionNode).Inspector);
-					break;
-				}
-			});
-			
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Refactoring/CodeIssueSource", delegate(object sender, ExtensionNodeEventArgs args) {
-				switch (args.Change) {
-				case ExtensionChange.Add:
-					var source = (ICodeIssueProviderSource)args.ExtensionObject;
-					var providers = source.GetProviders ();
-					inspectors.AddRange (providers);
-					break;
-				}
-			});
-			
-		}
-		
-		public static IEnumerable<RefactoringOperation> Refactorings {
-			get {
-				return refactorings;
-			}
 		}
 		
 		class RenameHandler 
@@ -157,238 +103,207 @@ namespace MonoDevelop.Refactoring
 			}
 		}
 		
-		public static void AcceptChanges (IProgressMonitor monitor, List<Change> changes)
+		public static void AcceptChanges (ProgressMonitor monitor, IList<Change> changes)
 		{
 			AcceptChanges (monitor, changes, MonoDevelop.Ide.TextFileProvider.Instance);
 		}
-		
-		public static void AcceptChanges (IProgressMonitor monitor, List<Change> changes, MonoDevelop.Projects.Text.ITextFileProvider fileProvider)
+
+		public static async Task RoslynJumpToDeclaration (ISymbol symbol, Projects.Project hintProject = null, CancellationToken token = default(CancellationToken))
 		{
-			var rctx = new RefactoringOptions (null);
+			var result = await TryJumpToDeclarationAsync (symbol.GetDocumentationCommentId (), hintProject, token).ConfigureAwait (false);
+			if (!result) {
+				await Runtime.RunInMainThread (delegate {
+					IdeApp.ProjectOperations.JumpToDeclaration (symbol, hintProject);
+				});
+			}
+		}
+
+		public static void AcceptChanges (ProgressMonitor monitor, IList<Change> changes, MonoDevelop.Ide.ITextFileProvider fileProvider)
+		{
+			var rctx = new RefactoringOptions (null, null);
 			var handler = new RenameHandler (changes);
 			FileService.FileRenamed += handler.FileRename;
 			var fileNames = new HashSet<FilePath> ();
-			for (int i = 0; i < changes.Count; i++) {
-				changes[i].PerformChange (monitor, rctx);
-				var replaceChange = changes[i] as TextReplaceChange;
-				if (replaceChange == null)
-					continue;
-				for (int j = i + 1; j < changes.Count; j++) {
-					var change = changes[j] as TextReplaceChange;
+			var ws = TypeSystemService.Workspace as MonoDevelopWorkspace;
+			string originalName;
+			int originalOffset;
+			try {
+				for (int i = 0; i < changes.Count; i++) {
+					var change = changes [i] as TextReplaceChange;
 					if (change == null)
 						continue;
-					fileNames.Add (change.FileName);
-					if (replaceChange.Offset >= 0 && change.Offset >= 0 && replaceChange.FileName == change.FileName) {
-						if (replaceChange.Offset < change.Offset) {
-							change.Offset -= replaceChange.RemovedChars;
-							if (!string.IsNullOrEmpty (replaceChange.InsertedText))
-								change.Offset += replaceChange.InsertedText.Length;
-						} else if (replaceChange.Offset < change.Offset + change.RemovedChars) {
-							change.RemovedChars = Math.Max (0, change.RemovedChars - replaceChange.RemovedChars);
-							change.Offset = replaceChange.Offset + (!string.IsNullOrEmpty (replaceChange.InsertedText) ? replaceChange.InsertedText.Length : 0);
-						}
+
+					if (ws.TryGetOriginalFileFromProjection (change.FileName, change.Offset, out originalName, out originalOffset)) {
+						fileNames.Add (change.FileName);
+						change.FileName = originalName;
+						change.Offset = originalOffset;
 					}
 				}
-			}
-			FileService.NotifyFilesChanged (fileNames);
-			FileService.FileRenamed -= handler.FileRename;
-			TextReplaceChange.FinishRefactoringOperation ();
-		}
-		
-		public static IEnumerable<CodeIssueProvider> GetInspectors (string mimeType)
-		{
-			return inspectors.Where (i => i.MimeType == mimeType);
-		}
+				if (changes.All (x => x is TextReplaceChange)) {
+					List<Change> newChanges = new List<Change> (changes);
+					newChanges.Sort ((Change x, Change y) => ((TextReplaceChange)x).Offset.CompareTo (((TextReplaceChange)y).Offset));
+					changes = newChanges;
+				}
 
-		static Stopwatch validActionsWatch = new Stopwatch ();
-		static Stopwatch actionWatch = new Stopwatch ();
 
-		public static IEnumerable<CodeAction> GetValidActions (Document doc, TextLocation loc, CancellationToken cancellationToken = default (CancellationToken))
-		{
-			var editor = doc.Editor;
-			string disabledNodes = editor != null ? PropertyService.Get ("ContextActions." + editor.MimeType, "") ?? "" : "";
-			var result = new List<CodeAction> ();
-			var timer = InstrumentationService.CreateTimerCounter ("Source analysis background task", "Source analysis");
-			timer.BeginTiming ();
-			validActionsWatch.Restart ();
-			var timeTable = new Dictionary<CodeActionProvider, long> ();
-			try {
-				var parsedDocument = doc.ParsedDocument;
-				if (editor != null && parsedDocument != null && parsedDocument.CreateRefactoringContext != null) {
-					var ctx = parsedDocument.CreateRefactoringContext (doc, cancellationToken);
-					if (ctx != null) {
-						foreach (var provider in contextActions.Where (fix =>
-							fix.MimeType == editor.MimeType &&
-							disabledNodes.IndexOf (fix.IdString, StringComparison.Ordinal) < 0))
-						{
-							try {
-								actionWatch.Restart ();
-								result.AddRange (provider.GetActions (doc, ctx, loc, cancellationToken));
-								actionWatch.Stop ();
-								timeTable[provider] = actionWatch.ElapsedMilliseconds;
-							} catch (Exception ex) {
-								LoggingService.LogError ("Error in context action provider " + provider.Title, ex);
+				for (int i = 0; i < changes.Count; i++) {
+					changes [i].PerformChange (monitor, rctx);
+					var replaceChange = changes [i] as TextReplaceChange;
+					if (replaceChange == null)
+						continue;
+
+					for (int j = i + 1; j < changes.Count; j++) {
+						var change = changes [j] as TextReplaceChange;
+						if (change == null)
+							continue;
+
+						fileNames.Add (change.FileName);
+
+						if (replaceChange.Offset >= 0 && change.Offset >= 0 && replaceChange.FileName == change.FileName) {
+							if (replaceChange.Offset < change.Offset) {
+								change.Offset -= replaceChange.RemovedChars;
+								if (!string.IsNullOrEmpty (replaceChange.InsertedText))
+									change.Offset += replaceChange.InsertedText.Length;
+							} else if (replaceChange.Offset < change.Offset + change.RemovedChars) {
+								change.RemovedChars = Math.Max (0, change.RemovedChars - replaceChange.RemovedChars);
+								change.Offset = replaceChange.Offset + (!string.IsNullOrEmpty (replaceChange.InsertedText) ? replaceChange.InsertedText.Length : 0);
 							}
 						}
 					}
 				}
-			} catch (Exception ex) {
-				LoggingService.LogError ("Error in analysis service", ex);
-			} finally {
-				timer.EndTiming ();
-				validActionsWatch.Stop ();
-				if (validActionsWatch.ElapsedMilliseconds > 1000) {
-					LoggingService.LogWarning ("Warning slow edit action update."); 
-					foreach (var pair in timeTable) {
-						if (pair.Value > 50)
-							LoggingService.LogInfo ("ACTION '" + pair.Key.Title + "' took " + pair.Value +"ms"); 
+
+				foreach (var renameChange in changes.OfType<RenameFileChange> ()) {
+					if (fileNames.Contains (renameChange.OldName)) {
+						fileNames.Remove (renameChange.OldName);
+						fileNames.Add (renameChange.NewName);
 					}
 				}
-			}
-			return (IEnumerable<CodeAction>)result;
-		}
 
-		public static void QueueQuickFixAnalysis (Document doc, TextLocation loc, CancellationToken token, Action<List<CodeAction>> callback)
-		{
-			var ext = doc.GetContent<MonoDevelop.AnalysisCore.Gui.ResultsEditorExtension> ();
-			var issues = ext != null ? ext.GetResultsAtOffset (doc.Editor.LocationToOffset (loc), token).OrderBy (r => r.Level).ToList () : new List<Result> ();
-
-			ThreadPool.QueueUserWorkItem (delegate {
-				try {
-					var result = new List<CodeAction> ();
-					foreach (var r in issues) {
-						if (token.IsCancellationRequested)
-							return;
-						var fresult = r as FixableResult;
-						if (fresult == null)
-							continue;
-						foreach (var action in FixOperationsHandler.GetActions (doc, fresult)) {
-							result.Add (new AnalysisContextActionProvider.AnalysisCodeAction (action, r) {
-								DocumentRegion = action.DocumentRegion
-							});
-						}
-					}
-					result.AddRange (GetValidActions (doc, loc));
-					callback (result);
-				} catch (Exception ex) {
-					LoggingService.LogError ("Error in analysis service", ex);
+				foreach (var doc in IdeApp.Workbench.Documents) {
+					fileNames.Remove (doc.FileName);
 				}
-			});
-		}	
 
-		public static IList<CodeAction> ApplyFixes (IEnumerable<CodeAction> fixes, IRefactoringContext refactoringContext)
-		{
-			if (fixes == null)
-				throw new ArgumentNullException ("fixes");
-			if (refactoringContext == null)
-				throw new ArgumentNullException ("refactoringContext");
-			var allFixes = fixes as IList<CodeAction> ?? fixes.ToArray ();
-			if (allFixes.Count == 0)
-				return new List<CodeAction> ();
-				
-			var scriptProvider = refactoringContext as IRefactoringContext;
-			if (scriptProvider == null) {
-				return RunAll (allFixes, refactoringContext, null);
-			}
-			using (var script = scriptProvider.CreateScript ()) {
-				return RunAll (allFixes, refactoringContext, script);
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while applying refactoring changes", e);
+			} finally {
+				FileService.NotifyFilesChanged (fileNames);
+				FileService.FileRenamed -= handler.FileRename;
+				TextReplaceChange.FinishRefactoringOperation ();
 			}
 		}
 
-		const string EnableRefactorings = "RefactoringSettings.EnableRefactorings";
+		//		public static void QueueQuickFixAnalysis (Document doc, TextLocation loc, CancellationToken token, Action<List<CodeAction>> callback)
+		//		{
+		//			var ext = doc.GetContent<MonoDevelop.AnalysisCore.Gui.ResultsEditorExtension> ();
+		//			var issues = ext != null ? ext.GetResultsAtOffset (doc.Editor.LocationToOffset (loc), token).OrderBy (r => r.Level).ToList () : new List<Result> ();
+		//
+		//			ThreadPool.QueueUserWorkItem (delegate {
+		//				try {
+		//					var result = new List<CodeAction> ();
+		//					foreach (var r in issues) {
+		//						if (token.IsCancellationRequested)
+		//							return;
+		//						var fresult = r as FixableResult;
+		//						if (fresult == null)
+		//							continue;
+		////						foreach (var action in FixOperationsHandler.GetActions (doc, fresult)) {
+		////							result.Add (new AnalysisContextActionProvider.AnalysisCodeAction (action, r) {
+		////								DocumentRegion = action.DocumentRegion
+		////							});
+		////						}
+		//					}
+		//					result.AddRange (GetValidActions (doc, loc).Result);
+		//					callback (result);
+		//				} catch (Exception ex) {
+		//					LoggingService.LogError ("Error in analysis service", ex);
+		//				}
+		//			});
+		//		}	
 
-		internal static bool CheckUserSettings()
+		public static MonoDevelop.Ide.Editor.DocumentLocation GetCorrectResolveLocation (IReadonlyTextDocument editor, MonoDevelop.Ide.Editor.DocumentLocation location)
 		{
-			var hasRefactoringSettings = IdeApp.ProjectOperations.CurrentSelectedSolution == null ||
-				IdeApp.ProjectOperations.CurrentSelectedSolution.UserProperties.HasValue (EnableRefactorings);
-			if (!hasRefactoringSettings) {
-				var useRefactoringsButton     = new AlertButton (GettextCatalog.GetString("Use refactorings on this solution"));
-				var text = GettextCatalog.GetString (
-@"WARNING: The Xamarin Studio refactoring operations do not yet support C# 6.
-
-You may continue to use refactoring operations with C# 6, however you should check the results carefully to make sure that they have not made incorrect changes to your code. In particular, the ""?."" null propagating dereference will be changed to ""."", a simple dereference, which can cause unexpected NullReferenceExceptions at runtime.");
-				var message = new QuestionMessage (text);
-				message.Buttons.Add (useRefactoringsButton);
-				message.Buttons.Add (AlertButton.Cancel);
-				message.Icon = Gtk.Stock.DialogWarning;
-				message.DefaultButton = 1;
+			if (editor == null || location.Column == 1)
+				return location;
 
-				var result = MessageService.AskQuestion (message);
-				if (result == AlertButton.Cancel)
-					return false;
-				ShowFixes = result == useRefactoringsButton;
-			}
-			return ShowFixes;
+			/*if (editor is TextEditor) {
+				if (((TextEditor)editor).IsSomethingSelected)
+					return ((TextEditor)editor).SelectionRegion.Begin;
+			}*/
+			var line = editor.GetLine (location.Line);
+			if (line == null || location.Column > line.LengthIncludingDelimiter)
+				return location;
+			int offset = editor.LocationToOffset (location);
+			if (offset > 0 && !char.IsLetterOrDigit (editor.GetCharAt (offset)) && char.IsLetterOrDigit (editor.GetCharAt (offset - 1)))
+				return new MonoDevelop.Ide.Editor.DocumentLocation (location.Line, location.Column - 1);
+			return location;
 		}
 
-		internal static bool ShowFixes {
-			get {
-				if (Ide.IdeApp.ProjectOperations.CurrentSelectedSolution != null) {
-					var hasRefactoringSettings = IdeApp.ProjectOperations.CurrentSelectedSolution.UserProperties.HasValue (EnableRefactorings);
-					return !hasRefactoringSettings || IdeApp.ProjectOperations.CurrentSelectedSolution.UserProperties.GetValue<bool> (EnableRefactorings);
+		public static async Task FindReferencesAsync (string documentIdString, Projects.Project hintProject = null)
+		{
+			if (hintProject == null)
+				hintProject = IdeApp.Workbench.ActiveDocument?.Project;
+			var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true);
+			try {
+				foreach (var provider in findReferencesProvider) {
+					try {
+						foreach (var result in await provider.FindReferences (documentIdString, hintProject, monitor.CancellationToken)) {
+							monitor.ReportResult (result);
+						}
+					} catch (Exception ex) {
+						if (monitor != null)
+							monitor.ReportError ("Error finding references", ex);
+						LoggingService.LogError ("Error finding references", ex);
+						findReferencesProvider = findReferencesProvider.Remove (provider);
+					}
 				}
-				return true;
-			}
-			set {
-				IdeApp.ProjectOperations.CurrentSelectedSolution.UserProperties.SetValue (EnableRefactorings, value);
-				IdeApp.ProjectOperations.CurrentSelectedSolution.SaveUserProperties ();
+			} finally {
+				if (monitor != null)
+					monitor.Dispose ();
 			}
 		}
 
-
-		public static void ApplyFix (CodeAction action, IRefactoringContext context)
+		public static async Task FindAllReferencesAsync (string documentIdString, Projects.Project hintProject = null)
 		{
-			if (!CheckUserSettings ())
-				return;
-			using (var script = context.CreateScript ()) {
-				action.Run (context, script);
-			}
-		}
+			if (hintProject == null)
+				hintProject = IdeApp.Workbench.ActiveDocument?.Project;
+			var monitor = IdeApp.Workbench.ProgressMonitors.GetSearchProgressMonitor (true, true);
+			try {
+				foreach (var provider in findReferencesProvider) {
+					try {
+						foreach (var result in await provider.FindAllReferences (documentIdString, hintProject, monitor.CancellationToken)) {
+							monitor.ReportResult (result);
+						}
+					} catch (OperationCanceledException) {
 
-		static List<CodeAction> RunAll (IEnumerable<CodeAction> allFixes, IRefactoringContext refactoringContext, object script)
-		{
-			var appliedFixes = new List<CodeAction> ();
-			foreach (var fix in allFixes) {
-				fix.Run (refactoringContext, script);
-				appliedFixes.Add (fix);
+					} catch (Exception ex) {
+						if (monitor != null)
+							monitor.ReportError ("Error finding references", ex);
+						LoggingService.LogError ("Error finding references", ex);
+						findReferencesProvider = findReferencesProvider.Remove (provider);
+					}
+				}
+			} finally {
+				if (monitor != null)
+					monitor.Dispose ();
 			}
-			return appliedFixes;
 		}
 
-		public static DocumentLocation GetCorrectResolveLocation (Document doc, DocumentLocation location)
+		public static async Task<bool> TryJumpToDeclarationAsync (string documentIdString, Projects.Project hintProject = null, CancellationToken token = default(CancellationToken))
 		{
-			if (doc == null)
-				return location;
-			var editor = doc.Editor;
-			if (editor == null || location.Column == 1)
-				return location;
-
-			if (editor.IsSomethingSelected)
-				return editor.MainSelection.Start;
-
-			var line = editor.GetLine (location.Line);
-			if (line == null || location.Column > line.LengthIncludingDelimiter)
-				return location;
-			int offset = editor.LocationToOffset (location);
-			if (offset > 0 && !char.IsLetterOrDigit (doc.Editor.GetCharAt (offset)) && char.IsLetterOrDigit (doc.Editor.GetCharAt (offset - 1)))
-				return new DocumentLocation (location.Line, location.Column - 1);
-			return location;
-		}
-
-		static readonly CodeAnalysisBatchRunner runner = new CodeAnalysisBatchRunner();
+				if (hintProject == null)
+					hintProject = IdeApp.Workbench.ActiveDocument?.Project;
+			for (int i = 0; i < jumpToDeclarationHandler.Count; i++) {
+				var handler = jumpToDeclarationHandler [i];
+				try {
+					if (await handler.TryJumpToDeclarationAsync (documentIdString, hintProject, token))
+						return true;
+				} catch (OperationCanceledException) {
+				} catch (Exception ex) {
+					LoggingService.LogError ("Error jumping to declaration", ex);
+				}
+			}
 
-		/// <summary>
-		/// Queues a code analysis job.
-		/// </summary>
-		/// <param name="job">The job to queue.</param>
-		/// <param name="progressMessage">
-		/// The message used for a progress monitor, or null if no progress monitor should be used.
-		/// </param>
-		public static IJobContext QueueCodeIssueAnalysis(IAnalysisJob job, string progressMessage = null)
-		{
-			if (progressMessage != null)
-				job = new ProgressMonitorWrapperJob (job, progressMessage);
-			return runner.QueueJob (job);
+			return false;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringSymbolInfo.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringSymbolInfo.cs
new file mode 100644
index 0000000000..918e9e7713
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringSymbolInfo.cs
@@ -0,0 +1,129 @@
+//
+// RefactoringSymbolInfo.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Refactoring;
+using MonoDevelop.Ide;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor;
+using System.Threading;
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace MonoDevelop.Refactoring
+{
+
+	class RefactoringSymbolInfo
+	{
+		public readonly static RefactoringSymbolInfo Empty = new RefactoringSymbolInfo (new SymbolInfo ());
+
+		SymbolInfo symbolInfo;
+
+		public ISymbol Symbol
+		{
+			get
+			{
+				return symbolInfo.Symbol;
+			}
+		}
+
+		public ImmutableArray<ISymbol> CandidateSymbols
+		{
+			get
+			{
+				return symbolInfo.CandidateSymbols;
+			}
+		}
+
+		public ISymbol DeclaredSymbol
+		{
+			get;
+			internal set;
+		}
+
+		public SyntaxNode Node { get; private set; }
+		public SemanticModel Model { get; private set; }
+
+		public RefactoringSymbolInfo (SymbolInfo symbolInfo)
+		{
+			this.symbolInfo = symbolInfo;
+		}
+
+		public static Task<RefactoringSymbolInfo> GetSymbolInfoAsync (DocumentContext document, int offset, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			if (document == null)
+				throw new ArgumentNullException (nameof (document));
+			if (document.AnalysisDocument == null)
+				return Task.FromResult (RefactoringSymbolInfo.Empty);
+
+			if (Runtime.IsMainThread) {//InternalGetSymbolInfoAsync can be CPU heavy, go to ThreadPool if we are on UI thread
+				return Task.Run (() => InternalGetSymbolInfoAsync (document.AnalysisDocument, offset, cancellationToken));
+			} else {
+				return InternalGetSymbolInfoAsync (document.AnalysisDocument, offset, cancellationToken);
+			}
+		}
+
+		public static Task<RefactoringSymbolInfo> GetSymbolInfoAsync (DocumentContext document, TextEditor editor, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			if (editor.IsSomethingSelected) {
+				var selectionRange = editor.SelectionRange;
+				if (editor.GetTextAt (selectionRange).Any (ch => !char.IsLetterOrDigit (ch) && ch !='_')) {
+					return Task.FromResult (RefactoringSymbolInfo.Empty);
+				}
+				return GetSymbolInfoAsync (document, selectionRange.Offset, cancellationToken);
+			}
+			return GetSymbolInfoAsync (document, editor.CaretOffset, cancellationToken);
+		}
+
+		static async Task<RefactoringSymbolInfo> InternalGetSymbolInfoAsync (Microsoft.CodeAnalysis.Document document, int offset, CancellationToken cancellationToken = default (CancellationToken))
+		{
+			var unit = await document.GetSemanticModelAsync (cancellationToken).ConfigureAwait (false);
+			if (unit != null) {
+				var root = await unit.SyntaxTree.GetRootAsync (cancellationToken).ConfigureAwait (false);
+				try {
+					var token = root.FindToken (offset);
+					if (!token.Span.IntersectsWith (offset))
+						return RefactoringSymbolInfo.Empty;
+					var symbol = unit.GetSymbolInfo (token.Parent, cancellationToken);
+					return new RefactoringSymbolInfo (symbol) {
+						DeclaredSymbol = token.IsKind (SyntaxKind.IdentifierToken) ? unit.GetDeclaredSymbol (token.Parent, cancellationToken) : null,
+						Node = token.Parent,
+						Model = unit
+					};
+				} catch (Exception) {
+					return RefactoringSymbolInfo.Empty;
+				}
+			}
+			return RefactoringSymbolInfo.Empty;
+		}
+	}
+
+}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
deleted file mode 100644
index d89a7c4081..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
+++ /dev/null
@@ -1,441 +0,0 @@
-//
-// RefactoryCommands.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.FindInFiles;
-using MonoDevelop.Ide;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.Semantics;
-using MonoDevelop.CodeActions;
-using MonoDevelop.SourceEditor.QuickTasks;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MonoDevelop.Refactoring
-{
-	public enum RefactoryCommands
-	{
-		CurrentRefactoryOperations,
-		GotoDeclaration, // in 'referenced' in IdeViMode.cs as string
-		FindReferences,
-		FindAllReferences,
-		FindDerivedClasses,
-		DeclareLocal,
-		RemoveUnusedImports,
-		SortImports,
-		RemoveSortImports,
-		ExtractMethod,
-		CreateMethod,
-		IntroduceConstant,
-		IntegrateTemporaryVariable,
-		ImportSymbol,
-		QuickFix,
-		Resolve
-	}
-	
-	public class CurrentRefactoryOperationsHandler : CommandHandler
-	{
-		protected override void Run (object data)
-		{
-			var del = (System.Action) data;
-			if (del != null)
-				del ();
-		}
-		
-		public static ResolveResult GetResolveResult (MonoDevelop.Ide.Gui.Document doc)
-		{
-			ITextEditorResolver textEditorResolver = doc.GetContent<ITextEditorResolver> ();
-			if (textEditorResolver != null)
-				return textEditorResolver.GetLanguageItem (doc.Editor.IsSomethingSelected ? doc.Editor.SelectionRange.Offset : doc.Editor.Caret.Offset);
-			return null;
-		}
-		
-		public static object GetItem (MonoDevelop.Ide.Gui.Document doc, out ResolveResult resolveResult)
-		{
-			resolveResult = GetResolveResult (doc);
-			if (resolveResult is LocalResolveResult) 
-				return ((LocalResolveResult)resolveResult).Variable;
-			if (resolveResult is MemberResolveResult)
-				return ((MemberResolveResult)resolveResult).Member;
-			if (resolveResult is MethodGroupResolveResult) {
-				var mg = ((MethodGroupResolveResult)resolveResult);
-				var method = mg.Methods.FirstOrDefault ();
-				if (method == null && mg.GetExtensionMethods ().Any ()) 
-					method = mg.GetExtensionMethods ().First ().FirstOrDefault ();
-				return method;
-			}
-			if (resolveResult is TypeResolveResult)
-				return resolveResult.Type;
-			if (resolveResult is NamespaceResolveResult)
-				return ((NamespaceResolveResult)resolveResult).Namespace;
-			if (resolveResult is OperatorResolveResult)
-				return ((OperatorResolveResult)resolveResult).UserDefinedOperatorMethod;
-			return null;
-		}
-
-		class JumpTo
-		{
-			object el;
-			
-			public JumpTo (object el)
-			{
-				this.el = el;
-			}
-			
-			public void Run ()
-			{
-				if (el is IUnresolvedEntity) {
-					var e = (IUnresolvedEntity)el;
-					IdeApp.Workbench.OpenDocument (e.Region.FileName, e.Region.BeginLine, e.Region.BeginColumn);
-					return;
-				} 
-				if (el is IVariable)
-					IdeApp.ProjectOperations.JumpToDeclaration ((IVariable)el);
-				if (el is INamedElement)
-					IdeApp.ProjectOperations.JumpToDeclaration ((INamedElement)el);
-			}
-		}
-
-		
-		class GotoBase 
-		{
-			IEntity item;
-			
-			public GotoBase (IEntity item)
-			{
-				this.item = item;
-			}
-			
-			public void Run ()
-			{
-				var cls = item as ITypeDefinition;
-				if (cls != null && cls.DirectBaseTypes != null) {
-					foreach (var bt in cls.DirectBaseTypes) {
-						var def = bt.GetDefinition ();
-						if (def != null && def.Kind != TypeKind.Interface) {
-							IdeApp.ProjectOperations.JumpToDeclaration (def); 
-							return;
-						}
-					}
-				}
-				
-				var method = item as IMember;
-				if (method != null) {
-					var baseMethod = InheritanceHelper.GetBaseMember (method); 
-					if (baseMethod != null) {
-						IdeApp.ProjectOperations.JumpToDeclaration (baseMethod); 
-					}
-					return;
-				}
-			}
-		}
-		
-		class FindRefs 
-		{
-			object obj;
-			bool allOverloads;
-			public FindRefs (object obj, bool all)
-			{
-				this.obj = obj;
-				this.allOverloads = all;
-			}
-			
-			public void Run ()
-			{
-				if (allOverloads) {
-					FindAllReferencesHandler.FindRefs (obj);
-				} else {
-					FindReferencesHandler.FindRefs (obj);
-				}
-			}
-		}
-		
-		class FindDerivedClasses
-		{
-			ITypeDefinition type;
-			
-			public FindDerivedClasses (ITypeDefinition type)
-			{
-				this.type = type;
-			}
-			
-			public void Run ()
-			{
-				FindDerivedClassesHandler.FindDerivedClasses (type);
-			}
-		}
-
-		class RefactoringDocumentInfo
-		{
-			public IEnumerable<CodeAction> validActions;
-			public MonoDevelop.Ide.TypeSystem.ParsedDocument lastDocument;
-
-			public override string ToString ()
-			{
-				return string.Format ("[RefactoringDocumentInfo: #validActions={0}, lastDocument={1}]", validActions != null ? validActions.Count ().ToString () : "null", lastDocument);
-			}
-		}
-
-
-		DocumentLocation lastLocation;
-
-		static bool HasOverloads (Solution solution, object item)
-		{
-			var member = item as IMember;
-			if (member != null && member.ImplementedInterfaceMembers.Any ())
-				return true;
-			var method = item as IMethod;
-			if (method == null)
-				return false;
-			return method.DeclaringType.GetMethods (m => m.Name == method.Name).Count () > 1;
-		}
-
-
-		protected override void Update (CommandArrayInfo ainfo)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null)
-				return;
-			
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null || parsedDocument.IsInvalid)
-				return;
-			
-			ResolveResult resolveResult;
-			object item = GetItem (doc, out resolveResult);
-			bool added = false;
-
-			var options = new RefactoringOptions (doc) {
-				ResolveResult = resolveResult,
-				SelectedItem = item
-			};
-			
-			var ciset = new CommandInfoSet ();
-			ciset.Text = GettextCatalog.GetString ("Refactor");
-
-			bool canRename;
-			if (item is IVariable || item is IParameter) {
-				canRename = true; 
-			} else if (item is ITypeDefinition) { 
-				canRename = !((ITypeDefinition)item).Region.IsEmpty;
-			} else if (item is IType) { 
-				canRename = ((IType)item).Kind == TypeKind.TypeParameter;
-			} else if (item is IMember) {
-				canRename = !((IMember)item).Region.IsEmpty;
-			} else if (item is INamespace) {
-				canRename = true;
-			} else {
-				canRename = false;
-			}
-			if (canRename) {
-				ciset.CommandInfos.Add (IdeApp.CommandService.GetCommandInfo (MonoDevelop.Ide.Commands.EditCommands.Rename), new Action (delegate {
-					new MonoDevelop.Refactoring.Rename.RenameHandler ().Start (null);
-				}));
-				added = true;
-			}
-			if (RefactoringService.ShowFixes) {
-				foreach (var refactoring in RefactoringService.Refactorings) {
-					if (refactoring.IsValid (options)) {
-						CommandInfo info = new CommandInfo (refactoring.GetMenuDescription (options));
-						info.AccelKey = refactoring.AccelKey;
-						ciset.CommandInfos.Add (info, new Action (new RefactoringOperationWrapper (refactoring, options).Operation));
-					}
-				}
-				var refactoringInfo = doc.Annotation<RefactoringDocumentInfo> ();
-				if (refactoringInfo == null) {
-					refactoringInfo = new RefactoringDocumentInfo ();
-					doc.AddAnnotation (refactoringInfo);
-				}
-				var loc = doc.Editor.Caret.Location;
-				bool first = true;
-				if (refactoringInfo.lastDocument != doc.ParsedDocument || loc != lastLocation) {
-					try {
-						refactoringInfo.validActions = RefactoringService.GetValidActions (doc, loc, new CancellationTokenSource (500).Token);
-					} catch (TaskCanceledException) {
-					} catch (AggregateException ae) {
-						ae.Flatten ().Handle (x => x is TaskCanceledException); 
-					}
-	
-					lastLocation = loc;
-					refactoringInfo.lastDocument = doc.ParsedDocument;
-				}
-				if (refactoringInfo.validActions != null && refactoringInfo.lastDocument != null && refactoringInfo.lastDocument.CreateRefactoringContext != null) {
-					var context = refactoringInfo.lastDocument.CreateRefactoringContext (doc, CancellationToken.None);
-
-					foreach (var fix_ in refactoringInfo.validActions.OrderByDescending (i => Tuple.Create (CodeActionEditorExtension.IsAnalysisOrErrorFix(i), (int)i.Severity, CodeActionEditorExtension.GetUsage (i.IdString)))) {
-						if (CodeActionEditorExtension.IsAnalysisOrErrorFix (fix_))
-							continue;
-						var fix = fix_;
-						if (first) {
-							first = false;
-							if (ciset.CommandInfos.Count > 0)
-								ciset.CommandInfos.AddSeparator ();
-						}
-
-						ciset.CommandInfos.Add (fix.Title, new Action (() => RefactoringService.ApplyFix (fix, context)));
-					}
-				}
-			}
-			if (ciset.CommandInfos.Count > 0) {
-				ainfo.Add (ciset, null);
-				added = true;
-			}
-			
-			if (IdeApp.ProjectOperations.CanJumpToDeclaration (item)) {
-				var type = item as IType;
-				if (type != null && type.GetDefinition ().Parts.Count > 1) {
-					var declSet = new CommandInfoSet ();
-					declSet.Text = GettextCatalog.GetString ("_Go to Declaration");
-					var ct = type.GetDefinition ();
-					foreach (var part in ct.Parts)
-						declSet.CommandInfos.Add (string.Format (GettextCatalog.GetString ("{0}, Line {1}"), FormatFileName (part.Region.FileName), part.Region.BeginLine), new System.Action (new JumpTo (part).Run));
-					ainfo.Add (declSet);
-				} else {
-					ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.GotoDeclaration), new System.Action (new JumpTo (item).Run));
-				}
-				added = true;
-			}
-
-			if (item is IMember) {
-				var member = (IMember)item;
-				if (member.IsOverride || member.ImplementedInterfaceMembers.Any ()) {
-					ainfo.Add (GettextCatalog.GetString ("Go to _Base Symbol"), new System.Action (new GotoBase (member).Run));
-					added = true;
-				}
-			}
-
-			if (!(item is IMethod && ((IMethod)item).SymbolKind == SymbolKind.Operator) && (item is IEntity || item is ITypeParameter || item is IVariable || item is INamespace)) {
-
-				ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindReferences), new System.Action (new FindRefs (item, false).Run));
-				if (doc.HasProject && HasOverloads (doc.Project.ParentSolution, item))
-					ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindAllReferences), new System.Action (new FindRefs (item, true).Run));
-				added = true;
-			}
-
-			if (item is IMember) {
-				var member = (IMember)item;
-				var handler = new FindDerivedSymbolsHandler (member);
-				if (handler.IsValid) {
-					var a = ainfo.Add (GettextCatalog.GetString ("Find Derived Symbols"), new Action (handler.Run));
-					a.AccelKey = IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindDerivedClasses).AccelKey;
-					added = true;
-				}
-			}
-			if (item is IMember) {
-				var member = (IMember)item;
-				if (member.SymbolKind == SymbolKind.Method || member.SymbolKind == SymbolKind.Indexer) {
-					var findMemberOverloadsHandler = new FindMemberOverloadsHandler (doc, member);
-					if (findMemberOverloadsHandler.IsValid) {
-						ainfo.Add (GettextCatalog.GetString ("Find Member Overloads"), new System.Action (findMemberOverloadsHandler.Run));
-						added = true;
-					}
-				}
-			}
-
-			if (item is ITypeDefinition) {
-				ITypeDefinition cls = (ITypeDefinition)item;
-				foreach (var bc in cls.DirectBaseTypes) {
-					if (bc != null && bc.GetDefinition () != null && bc.GetDefinition ().Kind != TypeKind.Interface/* TODO: && IdeApp.ProjectOperations.CanJumpToDeclaration (bc)*/) {
-						ainfo.Add (GettextCatalog.GetString ("Go to _Base"), new System.Action (new GotoBase ((ITypeDefinition)item).Run));
-						break;
-					}
-				}
-				if ((cls.Kind == TypeKind.Class && !cls.IsSealed) || cls.Kind == TypeKind.Interface) {
-					var label = cls.Kind != TypeKind.Interface ? GettextCatalog.GetString ("Find _derived classes") : GettextCatalog.GetString ("Find _implementor classes");
-					var a = ainfo.Add (label, new System.Action (new FindDerivedClasses (cls).Run));
-					a.AccelKey = IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindDerivedClasses).AccelKey;
-				}
-				ainfo.Add (GettextCatalog.GetString ("Find Extension Methods"), new System.Action (new FindExtensionMethodHandler (doc, cls).Run));
-				added = true;
-
-			}
-
-			if (added)
-				ainfo.AddSeparator ();
-		}
-		
-
-		class RefactoringOperationWrapper
-		{
-			RefactoringOperation refactoring;
-			RefactoringOptions options;
-			
-			public RefactoringOperationWrapper (RefactoringOperation refactoring, RefactoringOptions options)
-			{
-				this.refactoring = refactoring;
-				this.options = options;
-			}
-			
-			public void Operation ()
-			{
-				refactoring.Run (options);
-			}
-		}
-
-		bool IsModifiable (object member)
-		{
-			IType t = member as IType;
-			if (t != null) 
-				return t.GetDefinition ().Region.FileName == IdeApp.Workbench.ActiveDocument.FileName;
-			if (member is IMember)
-				return ((IMember)member).DeclaringTypeDefinition.Region.FileName == IdeApp.Workbench.ActiveDocument.FileName;
-			return false;
-		}
-
-		static string FormatFileName (string fileName)
-		{
-			if (fileName == null)
-				return null;
-			char[] seperators = { System.IO.Path.DirectorySeparatorChar, System.IO.Path.AltDirectorySeparatorChar };
-			int idx = fileName.LastIndexOfAny (seperators);
-			if (idx > 0) 
-				idx = fileName.LastIndexOfAny (seperators, idx - 1);
-			if (idx > 0) 
-				return "..." + fileName.Substring (idx);
-			return fileName;
-		}
-
-		public static bool ContainsAbstractMembers (IType cls)
-		{
-			if (cls == null)
-				return false;
-			return cls.GetMembers ().Any (m => m.IsAbstract);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs
deleted file mode 100644
index b71ab8ca03..0000000000
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs
+++ /dev/null
@@ -1,578 +0,0 @@
-// 
-// ResolveCommand.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.NRefactory.TypeSystem;
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Completion;
-using ICSharpCode.NRefactory.CSharp.TypeSystem;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide.TypeSystem;
-using System.Threading;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using MonoDevelop.Core.Assemblies;
-using MonoDevelop.Projects;
-using ICSharpCode.NRefactory.TypeSystem.Implementation;
-using MonoDevelop.Core.ProgressMonitoring;
-using ICSharpCode.NRefactory.Completion;
-
-namespace MonoDevelop.Refactoring
-{
-	public class ResolveCommandHandler : CommandHandler
-	{
-		public static bool ResolveAt (Document doc, out ResolveResult resolveResult, out AstNode node, CancellationToken token = default (CancellationToken))
-		{
-			if (doc == null)
-				throw new ArgumentNullException ("doc");
-			var editor = doc.Editor;
-			if (editor == null || editor.MimeType != "text/x-csharp") {
-				node = null;
-				resolveResult = null;
-				return false;
-			}
-			if (!InternalResolveAt (doc, out resolveResult, out node)) {
-				var location = RefactoringService.GetCorrectResolveLocation (doc, editor.Caret.Location);
-				resolveResult = GetHeuristicResult (doc, location, ref node);
-				if (resolveResult == null)
-					return false;
-			}
-			var oce = node as ObjectCreateExpression;
-			if (oce != null)
-				node = oce.Type;
-			return true;
-		}
-
-		static bool InternalResolveAt (Document doc, out ResolveResult resolveResult, out AstNode node, CancellationToken token = default (CancellationToken))
-		{
-			var parsedDocument = doc.ParsedDocument;
-			resolveResult = null;
-			node = null;
-			if (parsedDocument == null)
-				return false;
-			var unit = parsedDocument.GetAst<SyntaxTree> ();
-			var parsedFile = parsedDocument.ParsedFile as CSharpUnresolvedFile;
-			if (unit == null || parsedFile == null)
-				return false;
-			try {
-				var location = RefactoringService.GetCorrectResolveLocation (doc, doc.Editor.Caret.Location);
-				resolveResult = ResolveAtLocation.Resolve (doc.Compilation, parsedFile, unit, location, out node, token);
-				if (resolveResult == null || node is Statement)
-					return false;
-			} catch (OperationCanceledException) {
-				return false;
-			} catch (Exception e) {
-				Console.WriteLine ("Got resolver exception:" + e);
-				return false;
-			}
-			return true;
-		}
-
-		protected override void Update (CommandArrayInfo ainfo)
-		{
-			var doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null || doc.FileName == FilePath.Null || doc.ParsedDocument == null)
-				return;
-
-			ResolveResult resolveResult;
-			AstNode node;
-			if (!ResolveAt (doc, out resolveResult, out node))
-				return;
-			var resolveMenu = new CommandInfoSet ();
-			resolveMenu.Text = GettextCatalog.GetString ("Resolve");
-			
-			var possibleNamespaces = GetPossibleNamespaces (doc, node, ref resolveResult);
-
-			foreach (var t in possibleNamespaces.Where (tp => tp.OnlyAddReference)) {
-				var reference = t.Reference;
-				var info = resolveMenu.CommandInfos.Add (
-					t.GetImportText (),
-					new System.Action (new AddImport (doc, resolveResult, null, reference, true, node).Run)
-					);
-				info.Icon = MonoDevelop.Ide.Gui.Stock.AddNamespace;
-			
-			}
-
-
-			bool addUsing = !(resolveResult is AmbiguousTypeResolveResult);
-			if (addUsing) {
-				foreach (var t in possibleNamespaces.Where (tp => tp.IsAccessibleWithGlobalUsing)) {
-					string ns = t.Namespace;
-					var reference = t.Reference;
-					var info = resolveMenu.CommandInfos.Add (
-						t.GetImportText (),
-						new System.Action (new AddImport (doc, resolveResult, ns, reference, true, node).Run)
-						);
-					info.Icon = MonoDevelop.Ide.Gui.Stock.AddNamespace;
-				}
-			}
-			
-			bool resolveDirect = !(resolveResult is UnknownMemberResolveResult);
-			if (resolveDirect) {
-				if (resolveMenu.CommandInfos.Count > 0)
-					resolveMenu.CommandInfos.AddSeparator ();
-				foreach (var t in possibleNamespaces) {
-					string ns = t.Namespace;
-					var reference = t.Reference;
-					resolveMenu.CommandInfos.Add (t.GetInsertNamespaceText (doc.Editor.GetTextBetween (node.StartLocation, node.EndLocation)), new System.Action (new AddImport (doc, resolveResult, ns, reference, false, node).Run));
-				}
-			}
-			
-			if (resolveMenu.CommandInfos.Count > 0)
-				ainfo.Insert (0, resolveMenu);
-		}
-
-		static string CreateStub (Document doc, int offset)
-		{
-			if (offset <= 0)
-				return "";
-			string text = doc.Editor.GetTextAt (0, Math.Min (doc.Editor.Length, offset));
-			var stub = new StringBuilder (text);
-			CSharpCompletionEngine.AppendMissingClosingBrackets (stub, false);
-			return stub.ToString ();
-		}
-
-		static ResolveResult GetHeuristicResult (Document doc, DocumentLocation location, ref AstNode node)
-		{
-			var editor = doc.Editor;
-			if (editor == null || editor.Caret == null)
-				return null;
-			int offset = editor.Caret.Offset;
-			bool wasLetter = false, wasWhitespaceAfterLetter = false;
-			while (offset < editor.Length) {
-				char ch = editor.GetCharAt (offset);
-				bool isLetter = char.IsLetterOrDigit (ch) || ch == '_';
-				bool isWhiteSpace = char.IsWhiteSpace (ch);
-				bool isValidPunc = ch == '.' || ch == '<' || ch == '>';
-
-				if (!(wasLetter && wasWhitespaceAfterLetter) && (isLetter || isWhiteSpace || isValidPunc)) {
-					if (isValidPunc) {
-						wasWhitespaceAfterLetter = false;
-						wasLetter = false;
-					}
-					offset++;
-				} else {
-					offset--;
-					while (offset > 1) {
-						ch = editor.GetCharAt (offset - 1);
-						if (!(ch == '.' || char.IsWhiteSpace (ch)))
-							break;
-						offset--;
-					}
-					break;
-				}
-
-				wasLetter |= isLetter;
-				if (wasLetter)
-					wasWhitespaceAfterLetter |= isWhiteSpace;
-			}
-
-			var unit = SyntaxTree.Parse (CreateStub (doc, offset), doc.FileName);
-
-			var parsedDocument = doc.ParsedDocument;
-			if (parsedDocument == null)
-				return null;
-			return ResolveAtLocation.Resolve (
-				doc.Compilation, 
-				parsedDocument.ParsedFile as CSharpUnresolvedFile,
-				unit,
-				location, 
-				out node);
-		}
-
-		public static List<PossibleNamespace> GetPossibleNamespaces (Document doc, AstNode node, ref ResolveResult resolveResult)
-		{
-			if (doc == null)
-				throw new ArgumentNullException ("doc");
-			if (node == null)
-				throw new ArgumentNullException ("node");
-			var location = RefactoringService.GetCorrectResolveLocation (doc, doc.Editor.Caret.Location);
-
-			if (resolveResult == null || resolveResult.Type.FullName == "System.Void")
-				resolveResult = GetHeuristicResult (doc, location, ref node) ?? resolveResult;
-			var foundNamespaces = GetPossibleNamespaces (doc, node, resolveResult, location);
-			
-			if (!(resolveResult is AmbiguousTypeResolveResult)) {
-				var usedNamespaces = RefactoringOptions.GetUsedNamespaces (doc, location);
-				foundNamespaces = foundNamespaces.Where (n => !usedNamespaces.Contains (n.Namespace));
-			}
-			var result = new List<PossibleNamespace> ();
-			foreach (var ns in foundNamespaces) {
-				if (result.Any (n => n.Namespace == ns.Namespace))
-					continue;
-				result.Add (ns); 
-			}
-			return result;
-		}
-
-		static int GetTypeParameterCount (AstNode node)
-		{
-			if (node is ObjectCreateExpression)
-				node = ((ObjectCreateExpression)node).Type;
-			if (node is SimpleType)
-				return ((SimpleType)node).TypeArguments.Count;
-			if (node is MemberType)
-				return ((MemberType)node).TypeArguments.Count;
-			if (node is IdentifierExpression)
-				return ((IdentifierExpression)node).TypeArguments.Count;
-			return 0;
-		}
-
-		public class PossibleNamespace
-		{
-			public string Namespace { get; private set; }
-			public bool IsAccessibleWithGlobalUsing { get; private set; }
-			public bool OnlyAddReference { get { return !IsAccessibleWithGlobalUsing && Reference != null; } }
-			public MonoDevelop.Projects.ProjectReference Reference { get; private set; }
-
-			public PossibleNamespace (string @namespace, bool isAccessibleWithGlobalUsing, MonoDevelop.Projects.ProjectReference reference = null)
-			{
-				this.Namespace = @namespace;
-				this.IsAccessibleWithGlobalUsing = isAccessibleWithGlobalUsing;
-				this.Reference = reference;
-			}
-
-			string GetLibraryName ()
-			{
-				var txt = Reference.Reference;
-				int idx = txt.IndexOf (',');
-				if (idx >= 0)
-					return txt.Substring (0, idx);
-				return txt;
-			}
-
-			public string GetImportText ()
-			{
-				if (OnlyAddReference)
-					return GettextCatalog.GetString (
-						"Reference '{0}'", 
-						GetLibraryName ().Replace ("_", "__"));
-				if (Reference != null) 
-						return GettextCatalog.GetString (
-							"Reference '{0}' and use '{1}'", 
-							GetLibraryName (),
-						string.Format ("using {0};", Namespace.Replace ("_", "__")));
-
-				return string.Format ("using {0};", Namespace.Replace ("_", "__"));
-			}
-
-			public string GetInsertNamespaceText (string member)
-			{
-				if (Reference != null) 
-					return GettextCatalog.GetString (
-						"Reference '{0}' and use '{1}'", 
-						GetLibraryName ().Replace ("_", "__"),
-						(Namespace + "." + member).Replace ("_", "__")
-					);
-				return (Namespace + "." + member).Replace ("_", "__");
-			}
-		}
-
-		internal static bool CanBeReferenced (Project project, SystemAssembly systemAssembly)
-		{
-			var netProject = project as DotNetProject;
-			if (netProject == null)
-				return false;
-			var result = netProject.TargetRuntime.AssemblyContext.GetAssemblyNameForVersion(systemAssembly.FullName, netProject.TargetFramework);
-			return !string.IsNullOrEmpty (result);
-		}
-
-		static bool CanReference (Document doc, MonoDevelop.Projects.ProjectReference projectReference)
-		{
-			var project = doc.Project as DotNetProject;
-			if (project == null || projectReference == null || project.ParentSolution == null)
-				return true;
-			switch (projectReference.ReferenceType) {
-			case ReferenceType.Project:
-				var referenceProject = projectReference.ResolveProject (project.ParentSolution) as DotNetProject;
-				if (referenceProject == null)
-					return true;
-				string reason;
-				return project.CanReferenceProject (referenceProject, out reason);
-			}
-			return true;
-
-		}
-
-		static IEnumerable<PossibleNamespace> GetPossibleNamespaces (Document doc, AstNode node, ResolveResult resolveResult, DocumentLocation location)
-		{
-			var unit = doc.ParsedDocument.GetAst<SyntaxTree> ();
-			if (unit == null)
-				yield break;
-			var project = doc.Project;
-			if (project == null)
-				yield break;
-			int tc = GetTypeParameterCount (node);
-			var attribute = unit.GetNodeAt<ICSharpCode.NRefactory.CSharp.Attribute> (location);
-			bool isInsideAttributeType = attribute != null && attribute.Type.Contains (location);
-
-			var compilations = new List<Tuple<ICompilation, MonoDevelop.Projects.ProjectReference>> ();
-			compilations.Add (Tuple.Create (doc.Compilation, (MonoDevelop.Projects.ProjectReference)null));
-			var referencedItems = IdeApp.Workspace != null ? project.GetReferencedItems (IdeApp.Workspace.ActiveConfiguration).ToList () : (IEnumerable<SolutionItem>) new SolutionItem[0];
-			var solution = project != null ? project.ParentSolution : null;
-			if (solution != null) {
-				foreach (var curProject in solution.GetAllProjects ()) {
-					if (curProject == project || referencedItems.Contains (curProject))
-						continue;
-
-					var otherRefes = IdeApp.Workspace != null ? curProject.GetReferencedItems (IdeApp.Workspace.ActiveConfiguration).ToList () : (IEnumerable<SolutionItem>) new SolutionItem[0];
-					if (otherRefes.Contains (project))
-						continue;
-
-					var comp = TypeSystemService.GetCompilation (curProject);
-					if (comp == null)
-						continue;
-					compilations.Add (Tuple.Create (comp, new MonoDevelop.Projects.ProjectReference (curProject)));
-				}
-			}
-
-			var netProject = project as DotNetProject;
-			if (netProject == null) 
-				yield break;
-			FrameworkLookup frameworkLookup;
-			if (!TypeSystemService.TryGetFrameworkLookup (netProject, out frameworkLookup))
-				frameworkLookup = null;
-			if (frameworkLookup != null && resolveResult is UnknownMemberResolveResult) {
-				var umResult = (UnknownMemberResolveResult)resolveResult;
-				try {
-					foreach (var r in frameworkLookup.GetExtensionMethodLookups (umResult)) {
-						var systemAssembly = netProject.AssemblyContext.GetAssemblyFromFullName (r.FullName, r.Package, netProject.TargetFramework);
-						if (systemAssembly == null)
-							continue;
-						if (CanBeReferenced (doc.Project, systemAssembly))
-							compilations.Add (Tuple.Create (TypeSystemService.GetCompilation (systemAssembly, doc.Compilation), new MonoDevelop.Projects.ProjectReference (systemAssembly)));
-					}
-				} catch (Exception e) {
-					if (!TypeSystemService.RecreateFrameworkLookup (netProject))
-						LoggingService.LogError (string.Format ("Error while looking up extension method {0}", umResult.MemberName), e);
-				}
-			}
-			bool foundIdentifier = false;
-			var lookup = new MemberLookup (null, doc.Compilation.MainAssembly);
-			foreach (var comp in compilations) {
-				var compilation = comp.Item1;
-				var requiredReference = comp.Item2;
-				if (resolveResult is AmbiguousTypeResolveResult) {
-					if (compilation != doc.Compilation)
-						continue;
-					var aResult = resolveResult as AmbiguousTypeResolveResult;
-					var file = doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile;
-					var scope = file.GetUsingScope (location).Resolve (compilation);
-					while (scope != null) {
-						foreach (var u in scope.Usings) {
-							foreach (var typeDefinition in u.Types) {
-								if (typeDefinition.Name == aResult.Type.Name && 
-								    typeDefinition.TypeParameterCount == tc &&
-								    lookup.IsAccessible (typeDefinition, false)) {
-									if (CanReference(doc, requiredReference))
-										yield return new PossibleNamespace (typeDefinition.Namespace, true, requiredReference);
-								}
-							}
-						}
-						scope = scope.Parent;
-					}
-				}
-				var allTypes =  compilation == doc.Compilation ? compilation.GetAllTypeDefinitions () : compilation.MainAssembly.GetAllTypeDefinitions ();
-				if (resolveResult is UnknownIdentifierResolveResult) {
-					var uiResult = resolveResult as UnknownIdentifierResolveResult;
-					string possibleAttributeName = isInsideAttributeType ? uiResult.Identifier + "Attribute" : uiResult.Identifier;
-					foreach (var typeDefinition in allTypes) {
-						if ((typeDefinition.Name == possibleAttributeName || typeDefinition.Name == uiResult.Identifier) && typeDefinition.TypeParameterCount == tc &&
-						    lookup.IsAccessible (typeDefinition, false)) {
-							if (CanReference (doc, requiredReference)) {
-								if (typeDefinition.DeclaringTypeDefinition != null) {
-									var builder = new TypeSystemAstBuilder (new CSharpResolver (doc.Compilation));
-									foundIdentifier = true;
-									yield return new PossibleNamespace (builder.ConvertType (typeDefinition.DeclaringTypeDefinition).ToString (), false, requiredReference);
-								} else {
-									foundIdentifier = true;
-									yield return new PossibleNamespace (typeDefinition.Namespace, true, requiredReference);
-								}
-							}
-						}
-					}
-				}
-
-				if (resolveResult is UnknownMemberResolveResult) {
-					var umResult = (UnknownMemberResolveResult)resolveResult;
-					string possibleAttributeName = isInsideAttributeType ? umResult.MemberName + "Attribute" : umResult.MemberName;
-					foreach (var typeDefinition in allTypes.Where (t => t.HasExtensionMethods)) {
-						if (!lookup.IsAccessible (typeDefinition, false))
-							continue;
-						foreach (var method in typeDefinition.Methods.Where (m => m.IsExtensionMethod && (m.Name == possibleAttributeName || m.Name == umResult.MemberName))) {
-							if (!lookup.IsAccessible (method, false))
-								continue;
-							IType[] inferredTypes;
-							if (CSharpResolver.IsEligibleExtensionMethod (
-								compilation.Import (umResult.TargetType),
-								method,
-								true,
-								out inferredTypes
-							)) {
-								if (CanReference(doc, requiredReference))
-									yield return new PossibleNamespace (typeDefinition.Namespace, true, requiredReference);
-								goto skipType;
-							}
-						}
-						skipType:
-						;
-					}
-				}
-				
-				if (resolveResult is ErrorResolveResult) {
-					var identifier = unit != null ? unit.GetNodeAt<Identifier> (location) : null;
-					if (identifier != null) {
-						var uiResult = resolveResult as UnknownIdentifierResolveResult;
-						if (uiResult != null) {
-							string possibleAttributeName = isInsideAttributeType ? uiResult.Identifier + "Attribute" : uiResult.Identifier;
-							foreach (var typeDefinition in allTypes) {
-								if ((identifier.Name == possibleAttributeName || identifier.Name == uiResult.Identifier) && 
-									typeDefinition.TypeParameterCount == tc && 
-									lookup.IsAccessible (typeDefinition, false))
-									if (CanReference(doc, requiredReference))
-										yield return new PossibleNamespace (typeDefinition.Namespace, true, requiredReference);
-							}
-						}
-					}
-				}
-			}
-
-			// Try to search framework types
-			if (!foundIdentifier && frameworkLookup != null && resolveResult is UnknownIdentifierResolveResult && node is AstType) {
-				var uiResult = resolveResult as UnknownIdentifierResolveResult;
-				if (uiResult != null) {
-					var lookups = new List<Tuple<FrameworkLookup.AssemblyLookup, SystemAssembly>> ();
-					try {
-						foreach (var r in frameworkLookup.GetLookups (uiResult, tc, isInsideAttributeType)) {
-							var systemAssembly = netProject.AssemblyContext.GetAssemblyFromFullName (r.FullName, r.Package, netProject.TargetFramework);
-							if (systemAssembly == null)
-								continue;
-							if (CanBeReferenced (doc.Project, systemAssembly))
-								lookups.Add (Tuple.Create (r, systemAssembly));
-						}
-					} catch (Exception e) {
-						if (!TypeSystemService.RecreateFrameworkLookup (netProject))
-							LoggingService.LogError (string.Format ("Error while looking up identifier {0}", uiResult.Identifier), e);
-					}
-					foreach(var kv in lookups)
-						if (CanReference(doc, new MonoDevelop.Projects.ProjectReference (kv.Item2)))
-							yield return new PossibleNamespace (kv.Item1.Namespace, true, new MonoDevelop.Projects.ProjectReference (kv.Item2));
-
-				}
-			}
-			if (!foundIdentifier && frameworkLookup != null && resolveResult is UnknownMemberResolveResult) {
-				var uiResult = resolveResult as UnknownMemberResolveResult;
-				if (uiResult != null) {
-					var lookups = new List<Tuple<FrameworkLookup.AssemblyLookup, SystemAssembly>> ();
-					try {
-						foreach (var r in frameworkLookup.GetLookups (uiResult, node.ToString (), tc, isInsideAttributeType)) {
-							var systemAssembly = netProject.AssemblyContext.GetAssemblyFromFullName (r.FullName, r.Package, netProject.TargetFramework);
-							if (systemAssembly == null)
-								continue;
-							if (CanBeReferenced (doc.Project, systemAssembly))
-								lookups.Add (Tuple.Create (r, systemAssembly));
-						}
-					} catch (Exception e) {
-						if (!TypeSystemService.RecreateFrameworkLookup (netProject))
-							LoggingService.LogError (string.Format ("Error while looking up member resolve result {0}", node), e);
-					}
-					foreach(var kv in lookups)
-						if (CanReference(doc, new MonoDevelop.Projects.ProjectReference (kv.Item2)))
-							yield return new PossibleNamespace (kv.Item1.Namespace, true, new MonoDevelop.Projects.ProjectReference (kv.Item2));
-				}
-			}
-
-		}
-
-		internal class AddImport
-		{
-			readonly Document doc;
-			readonly ResolveResult resolveResult;
-			readonly string ns;
-			readonly bool addUsing;
-			readonly AstNode node;
-			readonly MonoDevelop.Projects.ProjectReference reference;
-
-			public AddImport (Document doc, ResolveResult resolveResult, string ns, MonoDevelop.Projects.ProjectReference reference, bool addUsing, AstNode node)
-			{
-				this.doc = doc;
-				this.resolveResult = resolveResult;
-				this.ns = ns;
-				this.reference = reference;
-				this.addUsing = addUsing;
-				this.node = node;
-			}
-			
-			public void Run ()
-			{
-				var loc = doc.Editor.Caret.Location;
-
-				if (reference != null) {
-					var project = doc.Project;
-					project.Items.Add (reference);
-					IdeApp.ProjectOperations.Save (project);
-				}
-
-				if (string.IsNullOrEmpty (ns))
-					return;
-
-				if (!addUsing) {
-//					var unit = doc.ParsedDocument.GetAst<SyntaxTree> ();
-					int offset = doc.Editor.LocationToOffset (node.StartLocation);
-					doc.Editor.Insert (offset, ns + ".");
-					doc.Editor.Document.CommitLineUpdate (loc.Line);
-					return;
-				}
-
-				var generator = doc.CreateCodeGenerator ();
-
-				if (resolveResult is NamespaceResolveResult) {
-					generator.AddLocalNamespaceImport (doc, ns, loc);
-				} else {
-					generator.AddGlobalNamespaceImport (doc, ns);
-				}
-			}
-		}
-		
-		protected override void Run (object data)
-		{
-			var del = (System.Action)data;
-			if (del != null)
-				del ();
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs
index 2364f13514..49fef05e69 100644
--- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs
@@ -32,7 +32,7 @@ namespace MonoDevelop.Refactoring
 		
 		private global::Gtk.HBox hbox2;
 		
-		private global::Gtk.Image imageError;
+		private global::MonoDevelop.Components.ImageView imageError;
 		
 		private global::Gtk.Label labelError;
 		
@@ -176,8 +176,10 @@ namespace MonoDevelop.Refactoring
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.imageError = new global::Gtk.Image ();
+			this.imageError = new global::MonoDevelop.Components.ImageView ();
 			this.imageError.Name = "imageError";
+			this.imageError.IconId = "md-error";
+			this.imageError.IconSize = ((global::Gtk.IconSize)(1));
 			this.hbox2.Add (this.imageError);
 			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.imageError]));
 			w14.Position = 0;
diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs
index 37013c6e31..ae107ee523 100644
--- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs
@@ -18,7 +18,7 @@ namespace MonoDevelop.Refactoring.Rename
 		
 		private global::Gtk.HBox hbox1;
 		
-		private global::Gtk.Image imageWarning;
+		private global::MonoDevelop.Components.ImageView imageWarning;
 		
 		private global::Gtk.Label labelWarning;
 		
@@ -104,9 +104,10 @@ namespace MonoDevelop.Refactoring.Rename
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.imageWarning = new global::Gtk.Image ();
+			this.imageWarning = new global::MonoDevelop.Components.ImageView ();
 			this.imageWarning.Name = "imageWarning";
-			this.imageWarning.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-apply", global::Gtk.IconSize.Button);
+			this.imageWarning.IconId = "md-warning";
+			this.imageWarning.IconSize = ((global::Gtk.IconSize)(4));
 			this.hbox1.Add (this.imageWarning);
 			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.imageWarning]));
 			w7.Position = 0;
diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/generated.cs
index 03fa31124a..9b81ae2955 100644
--- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/generated.cs
@@ -1,4 +1,4 @@
-
+#pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.
 namespace Stetic
 {
@@ -14,40 +14,6 @@ namespace Stetic
 		}
 	}
 
-	internal class IconLoader
-	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
-		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
-				return res;
-			} else {
-				int sz;
-				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-					}
-				}
-			}
-		}
-	}
-
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic
index 11b6e6c4d6..a86aee9313 100644
--- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic
@@ -6,9 +6,7 @@
   </configuration>
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
-    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" internal="true" />
   </import>
   <widget class="Gtk.Dialog" id="MonoDevelop.Refactoring.RefactoringPreviewDialog" design-size="400 300">
@@ -205,10 +203,11 @@
                 <property name="MemberName" />
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.Image" id="imageWarning">
-                    <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-apply Button</property>
-                  </widget>
+	              <widget class="MonoDevelop.Components.ImageView" id="imageWarning">
+	                <property name="MemberName" />
+	                <property name="IconSize">Button</property>
+	                <property name="IconId">md-warning</property>
+	              </widget>
                   <packing>
                     <property name="Position">0</property>
                     <property name="AutoSize">True</property>
@@ -483,9 +482,11 @@
                 <property name="MemberName" />
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.Image" id="imageError">
-                    <property name="MemberName" />
-                  </widget>
+	              <widget class="MonoDevelop.Components.ImageView" id="imageError">
+	                <property name="MemberName" />
+	                <property name="IconSize">Menu</property>
+	                <property name="IconId">md-error</property>
+	              </widget>
                   <packing>
                     <property name="Position">0</property>
                     <property name="AutoSize">True</property>
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16.png
index 3bfcaaa4a0..d97495cb13 100644
--- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16.png
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16@2x.png
index d3843fa488..55ef68a9c6 100644
--- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16@2x.png
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark.png
new file mode 100644
index 0000000000..b9d01a9dc2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark@2x.png
new file mode 100644
index 0000000000..5ef17f66c0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel.png
new file mode 100644
index 0000000000..92487c7153
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel@2x.png
new file mode 100644
index 0000000000..9ffc6a0967
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel.png
new file mode 100644
index 0000000000..6557f93395
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel@2x.png
new file mode 100644
index 0000000000..5698b2a9bd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16.png
index d332c8658f..07f2ebe88b 100644
--- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16.png
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16@2x.png
index ae2a84b99b..f5f9e8e084 100644
--- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16@2x.png
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark.png
new file mode 100644
index 0000000000..0b45e6e9cf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark@2x.png
new file mode 100644
index 0000000000..6f3c4357f6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel.png
new file mode 100644
index 0000000000..e2771512bf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel@2x.png
new file mode 100644
index 0000000000..9593c410ba
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel.png
new file mode 100644
index 0000000000..e2771512bf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel@2x.png
new file mode 100644
index 0000000000..9593c410ba
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16.png
index 7bd0114b4f..ef893c57bb 100644
--- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16.png
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16@2x.png
index 7e0f57994c..1d986f2fa1 100644
--- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16@2x.png
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark.png
new file mode 100644
index 0000000000..d689e9361f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark@2x.png
new file mode 100644
index 0000000000..90282fec96
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel.png
new file mode 100644
index 0000000000..b0f3ea7cfe
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel@2x.png
new file mode 100644
index 0000000000..fa6a41cc8e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel.png
new file mode 100644
index 0000000000..b0f3ea7cfe
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel@2x.png
new file mode 100644
index 0000000000..fa6a41cc8e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.Refactoring/packages.config b/main/src/addins/MonoDevelop.Refactoring/packages.config
new file mode 100644
index 0000000000..3299dfcf07
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Refactoring/packages.config
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages />
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog b/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog
deleted file mode 100644
index c0476d13eb..0000000000
--- a/main/src/addins/MonoDevelop.RegexToolkit/ChangeLog
+++ /dev/null
@@ -1,466 +0,0 @@
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.RegexToolkit/Commands.cs: Dialog placement.
-
-2010-05-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Added multi
-	  monitor support.
-
-2010-05-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit.addin.xml: On Windows, show the
-	  global options command in the Tools menu.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.RegexToolkit.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.RegexToolkit.csproj:
-	* MonoDevelop.RegexToolkit.addin.xml:
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs:
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Merged
-	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
-	  and MD.Components into MD.Ide.
-
-2010-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: disabled
-	  elements list.
-
-2010-02-05  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs:
-	  Avoid unhandled exception on invalid expression.
-
-2010-01-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.RegexToolkit.csproj:
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs:
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs:
-	* MonoDevelop.RegexToolkit/UpdateInProgressDialog.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.UpdateInProgressDialog.cs:
-	  Made the regex toolkit a bit nicer.
-
-2009-12-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Set button
-	  sensitivity depending on whether entries are full. Pack
-	  icons into same columns as text.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.RegexToolkit/UpdateInProgressDialog.cs: Name
-	  threads to make debugging easier.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.RegexToolkit.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.RegexToolkit.csproj:
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.UpdateInProgressDialog.cs:
-	  Flush.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.RegexToolkit.addin.xml: Bump MD version.
-
-2009-09-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.RegexToolkit.addin.xml: Added missing "..." to
-	  menu item.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit.csproj: Updated dependencies. We
-	  now depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-06-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs: In .NET,
-	  settings as read-only after the creation of an
-	  XmlTextWriter.
-
-2009-06-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit/UpdateInProgressDialog.cs: Limit
-	  the number of expressions when querying. Beyond 1230 there
-	  is an expression which makes the web service reply to fail.
-
-2009-06-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit/UpdateInProgressDialog.cs: Properly
-	  show error messages while updating.
-
-2009-06-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.RegexToolkit.csproj:
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs:
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.UpdateInProgressDialog.cs:
-	  Cosmetic GUI fixes.
-
-	* MonoDevelop.RegexToolkit/UpdateInProgressDialog.cs: Properly
-	  handle cancellation of the web service call.
-
-2009-06-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs: On MS.NET
-	  XmlWritter.Settings is not initialized by default. Path by
-	  Carlo Kok.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.RegexToolkit.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.RegexToolkit.addin.xml: Bump MD version.
-
-2009-03-02  David Makovský (Yakeen)  <yakeen@sannyas-on.net>
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: make strings
-	  translatable
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs: Changed
-	  override Destroy --> override OnDestroyed.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* RegexElements.xml: Reverted changes (we came to the
-	  conclusion that the old ones were more correct).
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* RegexElements.xml: Changed some problematic strings found by
-	  eno.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs:
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs: Worked on
-	  ressource de-allocation.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit.mdp:
-	* MonoDevelop.RegexToolkit.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.RegexToolkit.addin.xml: Bump MD version.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.RegexToolkit.mdp: Flush project format changes.
-
-2008-12-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs:
-	* gtk-gui/MonoDevelop.RegexToolkit.UpdateInProgressDialog.cs:
-	TooltipWindow has been moved to MD.Components.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-12-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* gtk-gui/gui.stetic: Manually remove unnecessary viewports. They were
-	preventing automatic scrolling when the selection was changed with
-	the keyboard.
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Tidied. Remove
-	unnecessary destructions. Work around GTK event handler marshalling
-	issues by using a method instead of a delegate -- prevents error
-	message when using Regex Toolkit on GTK# 2.12.6.
-
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs: Updated.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.RegexToolkit.addin.xml: Bump MD version.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.UpdateInProgressDialog.cs: Updated
-	  generated code.
-
-2008-06-18  Ankit Jain  <jankit@novell.com>
-
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs:
-	* gtk-gui/gui.stetic: Fix window title, and set WrapMode on the
-	description textview.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit.addin.xml: Bump MD version.
-
-2008-06-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs,
-	  MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Use the OnDestroyed
-	  event instead of Dispose, since with the latest changes in gtk#,
-	  Dispose is not called anymore when a widget is destroyed.
-
-2008-05-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Use base tooltip
-	  window.
-	* gtk-gui/gui.stetic: Set target GTK version to 2.8.
-
-2008-04-18  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: fixed Bug 379472 -
-	  GTK warnings caused by regex toolkit window.
-
-2008-03-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs: Set type wink
-
-2008-03-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs,
-	  gtk-gui/gui.stetic: Changed start position.
-
-2008-03-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs,
-	  gtk-gui/generated.cs, gtk-gui/gui.stetic: Overworked regex toolkit
-	  window.
-
-2008-02-28  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs: Fixed "Bug 365624
-	  - Widget toolbox are shown unsorted".
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs: Moved some
-	  buttons.
-
-2008-02-09  Mike Krüger <mkrueger@novell.com> 
-
-	* Makefile.am: Managed texteditor is now standard - the gtksourceview1&2 are
-	  now optional.
-
-2008-01-29  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Small workaround to be
-	  able to build in mono 1.2.4 (mono 1.2.4 ignores usings in anon
-	  delegates).
-
-2008-01-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Fixed Bug 355842 - Tootips
-	  in regex toolkit are excessively persistent.
-
-2008-01-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Fixed Bug 355842 - Tootips
-	  in regex toolkit are excessively persistent.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit.addin.xml: Update MD version.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* RegexElements.xml: Improve formatting of translatable strings.
-	* MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Actually feed translatable
-	  strings from xml file through Gettext.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit.mdp: Updated project files. The order of extended
-	  properties won't change anymore.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs,
-	  gtk-gui/gui.stetic: Updated.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit.mdp, Makefile.am: Directory reorganization.
-
-2007-12-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AssemblyInfo.cs: Sync assembly and add-in versions.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs: Track LoggingService API
-	  changes.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit.addin.xml: Bump MD version.
-
-2007-10-24  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs,
-	  MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Regex library behaves
-	  more nicely when scrolling.
-
-2007-10-24  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs,
-	  gtk-gui/gui.stetic: Made the replacement regex label clearer.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit.mdp: Project file names updated by change in MD
-	  path functions.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit.addin.xml: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.UpdateInProgressDialog.cs: Regenerated
-	  GUI files.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexLibraryWindow.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexLibraryWindow.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWindow.cs: Changes due to
-	  new property infrastructure.
-
-2007-08-15  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.RegexToolkit/UpdateInProgressDialog.cs: Use fully 
-	  qualified type names inside anonymous delegates as a workaround 
-	  for gmcs 1.2.4 bug.
-
-2007-08-15  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/UpdateInProgressDialog.cs,
-	  MonoDevelop.RegexToolkit/RegexLibraryWindow.cs,
-	  MonoDevelop.RegexToolkit/RegexToolkitWindow.cs: Made the dialogs
-	  more HID compliant.
-
-2007-08-15  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit.mdp: Added prefixes for makefile support.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.RegexToolkit.addin.xml, MonoDevelop.RegexToolkit.mdp,
-	  Makefile.am: Reorganized the extension point hierarchy. Embedded all
-	  add-in manifests as resources.
-
-2007-08-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexLibrary.cs,
-	  MonoDevelop.RegexToolkit/RegexToolkit.cs: Regex library closing
-	  behavior now is connected with the regex toolkit.
-
-2007-08-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexLibrary.cs,
-	  MonoDevelop.RegexToolkit/RegexToolkit.cs,
-	  MonoDevelop.RegexToolkit/Commands.cs,
-	  MonoDevelop.RegexToolkit/Webservices.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexLibrary.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkit.cs: Added regular
-	  expression library to the regex toolkit.
-
-2007-08-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkit.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkit.cs: Regex toolkit now
-	  supports replacement expressions.
-
-2007-07-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkit.cs, RegexElements.xml: Worked
-	  on tooltips.
-
-2007-07-30  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkit.cs: worked on regex toolkit.
-
-2007-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkit.cs,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkit.cs: Worked on regex
-	  toolkit.
-
-2007-07-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit/RegexToolkit.cs, RegexElements.xml,
-	  gtk-gui/MonoDevelop.RegexToolkit.RegexToolkit.cs: Worked on regex
-	  toolkit.
-
-2007-07-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.RegexToolkit.addin.xml,
-	  MonoDevelop.RegexToolkit/RegexToolkit.cs,
-	  MonoDevelop.RegexToolkit/Commands.cs: Initial checkin.
-
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj
index 707c2c6c9a..693ad315a0 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit.csproj
@@ -62,6 +62,30 @@
     <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Composition.AttributedModel">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Composition.AttributedModel.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -79,16 +103,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -104,6 +118,7 @@
     <Compile Include="MonoDevelop.RegexToolkit\ElementHelpWidget.cs" />
     <Compile Include="gtk-gui\MonoDevelop.RegexToolkit.ElementHelpWidget.cs" />
     <Compile Include="AddinInfo.cs" />
+    <Compile Include="MonoDevelop.RegexToolkit\ValidateActionCodeRefactoringProvider.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
index 044f2705aa..0889c8ddcb 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs
@@ -27,11 +27,13 @@
 //
 
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using Gtk;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Core;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.RegexToolkit
 {
@@ -40,11 +42,11 @@ namespace MonoDevelop.RegexToolkit
 		ShowRegexToolkit
 	}
 	
-	class ViewOnlyContent : AbstractViewContent
+	class ViewOnlyContent : ViewContent
 	{
 		Widget widget;
-		
-		public override Widget Control {
+
+		public override Control Control {
 			get {
 				return widget;
 			}
@@ -54,21 +56,20 @@ namespace MonoDevelop.RegexToolkit
 		{
 			this.widget = widget;
 			this.ContentName = contentName;
-			IsViewOnly = true;
 		}
-		
-		public override void Load (string fileName)
-		{
-			throw new System.NotImplementedException ();
+
+		public override bool IsViewOnly {
+			get {
+				return true;
+			}
 		}
-		
 	}
 	
-	class DefaultAttachableViewContent : AbstractAttachableViewContent
+	class DefaultAttachableViewContent : BaseViewContent
 	{
 		Widget widget;
-		
-		public override Widget Control {
+
+		public override Control Control {
 			get {
 				return widget;
 			}
@@ -91,18 +92,24 @@ namespace MonoDevelop.RegexToolkit
 	{
 		protected override void Run ()
 		{
+			RunRegexWindow ();
+		}
+
+		public static RegexToolkitWidget RunRegexWindow ()
+		{

 			foreach (var document in IdeApp.Workbench.Documents) {
-				if (document.Window.ViewContent.Control is RegexToolkitWidget) {
+				if (document.Window.ViewContent.Control.GetNativeWidget<Gtk.Widget> () is RegexToolkitWidget) {
 					document.Window.SelectWindow ();
-					return;
+					return (RegexToolkitWidget)document.Window.ViewContent.Control;
 				}
 			}
 			var regexToolkit = new RegexToolkitWidget ();
 			var newDocument = IdeApp.Workbench.OpenDocument (new ViewOnlyContent (regexToolkit, GettextCatalog.GetString ("Regex Toolkit")), true);
-			
+
 			var elementHelp = new ElementHelpWidget (newDocument.Window, regexToolkit);
-			
+
 			newDocument.Window.AttachViewContent (new DefaultAttachableViewContent (elementHelp, GettextCatalog.GetString ("Elements")));
+			return regexToolkit;
 		}
 	}
 	
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs
index c9e7b682f5..fc0e540066 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs
@@ -36,7 +36,7 @@ using MonoDevelop.Components;
 namespace MonoDevelop.RegexToolkit
 {
 	[System.ComponentModel.ToolboxItem(true)]
-	partial class ElementHelpWidget : Gtk.Bin
+	internal partial class ElementHelpWidget : Gtk.Bin
 	{
 		TreeStore elementsStore;
 //		IWorkbenchWindow workbenchWindow;
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs
index ecd1defcba..2cf57d534b 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs
@@ -42,7 +42,14 @@ namespace MonoDevelop.RegexToolkit
 		TreeStore resultStore;
 		
 		Thread regexThread;
-		
+		public string Regex { 
+			get {
+				return entryRegEx.Text;
+			}
+			set {
+				entryRegEx.Text = value;
+			}
+		}
 		public RegexToolkitWidget ()
 		{
 			this.Build ();
@@ -59,7 +66,7 @@ namespace MonoDevelop.RegexToolkit
 				if (regexThread != null && regexThread.IsAlive) {
 					regexThread.Abort ();
 					regexThread.Join ();
-					SetButtonStart (GettextCatalog.GetString ("Start Regular E_xpression"), "gtk-media-play");
+					SetButtonStart (GettextCatalog.GetString ("Start Regular E_xpression"), "gtk-execute");
 					regexThread = null;
 					return;
 				}
@@ -171,16 +178,16 @@ namespace MonoDevelop.RegexToolkit
 			} finally {
 				regexThread = null;
 				Application.Invoke (delegate {
-					SetButtonStart (GettextCatalog.GetString ("Start Regular E_xpression"), "gtk-media-play");
+					SetButtonStart (GettextCatalog.GetString ("Start Regular E_xpression"), "gtk-execute");
 				});
 			}
 		}
 
 		void SetButtonStart (string text, string icon)
 		{
-			((Gtk.Label)((Gtk.HBox)((Gtk.Alignment)this.buttonStart.Child).Child).Children [1]).Text = text;
-			((Gtk.Label)((Gtk.HBox)((Gtk.Alignment)this.buttonStart.Child).Child).Children [1]).UseUnderline = true;
-			((Gtk.Image)((Gtk.HBox)((Gtk.Alignment)this.buttonStart.Child).Child).Children [0]).Pixbuf = global::Stetic.IconLoader.LoadIcon (this, icon, global::Gtk.IconSize.Menu);
+			buttonStartLabel.Text = text;
+			buttonStartLabel.UseUnderline = true;
+			buttonStartIcon.SetIcon (icon, IconSize.Menu);
 		}
 		
 		
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ValidateActionCodeRefactoringProvider.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ValidateActionCodeRefactoringProvider.cs
new file mode 100644
index 0000000000..8b7bd5a146
--- /dev/null
+++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ValidateActionCodeRefactoringProvider.cs
@@ -0,0 +1,117 @@
+//
+// ValidateActionCodeRefactoringProvider.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Threading;
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Formatting;
+using MonoDevelop.Core;
+using MonoDevelop.RegexToolkit;
+
+namespace RefactoringEssentials.CSharp.CodeRefactorings
+{
+	[ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = "Validate regular expression")]
+	public class ValidateActionCodeRefactoringProvider : CodeRefactoringProvider
+	{
+		public sealed override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+		{
+			var document = context.Document;
+			if (document.Project.Solution.Workspace.Kind == WorkspaceKind.MiscellaneousFiles)
+				return;
+			var span = context.Span;
+			if (!span.IsEmpty)
+				return;
+			var cancellationToken = context.CancellationToken;
+			if (cancellationToken.IsCancellationRequested)
+				return;
+
+			var model = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+			//if (model.IsFromGeneratedCode(cancellationToken))
+			//	return;
+			var root = await model.SyntaxTree.GetRootAsync(cancellationToken).ConfigureAwait(false);
+			if (!root.Span.Contains (span))
+				return;
+			var node = root.FindNode(span, false, true);
+			if (!node.IsKind(SyntaxKind.StringLiteralExpression))
+				return;
+			var argument = node.Parent as ArgumentSyntax;
+			if (argument == null)
+				return;
+			var list = argument.Parent as ArgumentListSyntax;
+
+			var invocation = argument.Parent?.Parent as InvocationExpressionSyntax;
+			if (invocation != null) {
+				var info = model.GetSymbolInfo (invocation);
+				if (!IsRegexMatchMethod (info) || list.Arguments [1] != argument)
+					return;
+			}
+
+			var oce = argument.Parent?.Parent as ObjectCreationExpressionSyntax;
+			if (oce != null) {
+				var info = model.GetSymbolInfo (oce);
+				if (info.Symbol == null || !IsRegexType (info.Symbol.ContainingType) || list.Arguments [0] != argument)
+					return;
+			}
+			 
+			var regex = model.GetConstantValue (node);
+			if (!regex.HasValue)
+				return;
+			
+			context.RegisterRefactoring (CodeAction.Create(
+				GettextCatalog.GetString("Validate regular expression"),
+				t2 => {
+					ShowRegexToolkitHandler.RunRegexWindow ().Regex = regex.Value.ToString ();
+					return Task.FromResult(document);
+				}
+			));
+		}
+
+		internal static bool IsRegexMatchMethod (SymbolInfo symbolInfo)
+		{
+			var symbol = symbolInfo.Symbol;
+			if (symbol == null)
+				return false;
+			return IsRegexType (symbol.ContainingType) && symbol.IsStatic && (symbol.Name == "IsMatch" || symbol.Name == "Match" || symbol.Name == "Matches");
+		}
+
+		internal static bool IsRegexConstructor (SymbolInfo symbolInfo)
+		{
+			return symbolInfo.Symbol?.ContainingType is INamedTypeSymbol && IsRegexType (symbolInfo.Symbol.ContainingType);
+		}
+
+		internal static bool IsRegexType (INamedTypeSymbol containingType)
+		{
+			return containingType != null && containingType.Name == "Regex" && containingType.ContainingNamespace.ToDisplayString () == "System.Text.RegularExpressions";
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.ElementHelpWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.ElementHelpWidget.cs
index 0caf4e91ee..c49c20c8c0 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.ElementHelpWidget.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.ElementHelpWidget.cs
@@ -2,11 +2,14 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.RegexToolkit
 {
-	partial class ElementHelpWidget
+	internal partial class ElementHelpWidget
 	{
 		private global::Gtk.VBox vbox4;
+		
 		private global::Gtk.Label label11;
+		
 		private global::Gtk.ScrolledWindow elementsscrolledwindow;
+		
 		private global::Gtk.TreeView elementsTreeview;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs
index ececd80c33..8145fc8684 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs
@@ -5,34 +5,69 @@ namespace MonoDevelop.RegexToolkit
 	internal partial class RegexToolkitWidget
 	{
 		private global::Gtk.VBox vbox2;
+		
 		private global::Gtk.VPaned vpaned1;
+		
 		private global::Gtk.VBox vbox1;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.VBox vbox6;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.Entry entryRegEx;
+		
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.CheckButton checkbuttonReplace;
+		
 		private global::Gtk.Entry entryReplace;
+		
 		private global::Gtk.HBox hbox7;
+		
 		private global::Gtk.Button buttonStart;
+		
+		private global::Gtk.HBox buttonStartHbox;
+		
+		private global::MonoDevelop.Components.ImageView buttonStartIcon;
+		
+		private global::Gtk.Label buttonStartLabel;
+		
 		private global::Gtk.CheckButton expandMatches;
+		
 		private global::Gtk.VBox vbox4;
+		
 		private global::Gtk.Label label10;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow5;
+		
 		private global::Gtk.TreeView optionsTreeview;
+		
 		private global::Gtk.VBox HelpWidget;
+		
 		private global::Gtk.Label label9;
+		
 		private global::Gtk.HBox hbox5;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow1;
+		
 		private global::Gtk.TextView inputTextview;
+		
 		private global::Gtk.HBox hbox4;
+		
 		private global::Gtk.Notebook notebook2;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow2;
+		
 		private global::Gtk.TreeView resultsTreeview;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.ScrolledWindow scrolledwindow4;
+		
 		private global::Gtk.TextView replaceResultTextview;
+		
 		private global::Gtk.Label label4;
 
 		protected virtual void Build ()
@@ -123,17 +158,37 @@ namespace MonoDevelop.RegexToolkit
 			this.buttonStart.CanDefault = true;
 			this.buttonStart.CanFocus = true;
 			this.buttonStart.Name = "buttonStart";
-			this.buttonStart.UseUnderline = true;
-			this.buttonStart.Label = global::Mono.Unix.Catalog.GetString ("Start Regular E_xpression");
-			global::Gtk.Image w5 = new global::Gtk.Image ();
-			w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-media-play", global::Gtk.IconSize.Menu);
-			this.buttonStart.Image = w5;
-			this.hbox7.Add (this.buttonStart);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.buttonStart]));
-			w6.PackType = ((global::Gtk.PackType)(1));
-			w6.Position = 0;
+			// Container child buttonStart.Gtk.Container+ContainerChild
+			this.buttonStartHbox = new global::Gtk.HBox ();
+			this.buttonStartHbox.Name = "buttonStartHbox";
+			this.buttonStartHbox.Spacing = 2;
+			// Container child buttonStartHbox.Gtk.Box+BoxChild
+			this.buttonStartIcon = new global::MonoDevelop.Components.ImageView ();
+			this.buttonStartIcon.Name = "buttonStartIcon";
+			this.buttonStartIcon.IconId = "gtk-execute";
+			this.buttonStartIcon.IconSize = ((global::Gtk.IconSize)(1));
+			this.buttonStartHbox.Add (this.buttonStartIcon);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.buttonStartHbox [this.buttonStartIcon]));
+			w5.Position = 0;
+			w5.Expand = false;
+			w5.Fill = false;
+			// Container child buttonStartHbox.Gtk.Box+BoxChild
+			this.buttonStartLabel = new global::Gtk.Label ();
+			this.buttonStartLabel.Name = "buttonStartLabel";
+			this.buttonStartLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Start Regular E_xpression");
+			this.buttonStartLabel.UseUnderline = true;
+			this.buttonStartHbox.Add (this.buttonStartLabel);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.buttonStartHbox [this.buttonStartLabel]));
+			w6.Position = 1;
 			w6.Expand = false;
 			w6.Fill = false;
+			this.buttonStart.Add (this.buttonStartHbox);
+			this.hbox7.Add (this.buttonStart);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.buttonStart]));
+			w8.PackType = ((global::Gtk.PackType)(1));
+			w8.Position = 0;
+			w8.Expand = false;
+			w8.Fill = false;
 			// Container child hbox7.Gtk.Box+BoxChild
 			this.expandMatches = new global::Gtk.CheckButton ();
 			this.expandMatches.CanFocus = true;
@@ -144,23 +199,23 @@ namespace MonoDevelop.RegexToolkit
 			this.expandMatches.UseUnderline = true;
 			this.expandMatches.BorderWidth = ((uint)(3));
 			this.hbox7.Add (this.expandMatches);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.expandMatches]));
-			w7.Position = 1;
-			w7.Expand = false;
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.expandMatches]));
+			w9.Position = 1;
+			w9.Expand = false;
 			this.vbox3.Add (this.hbox7);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox7]));
-			w8.PackType = ((global::Gtk.PackType)(1));
-			w8.Position = 2;
-			w8.Expand = false;
-			w8.Fill = false;
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox7]));
+			w10.PackType = ((global::Gtk.PackType)(1));
+			w10.Position = 2;
+			w10.Expand = false;
+			w10.Fill = false;
 			this.vbox6.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.vbox3]));
-			w9.Position = 2;
-			w9.Expand = false;
-			w9.Fill = false;
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.vbox3]));
+			w11.Position = 2;
+			w11.Expand = false;
+			w11.Fill = false;
 			this.hbox1.Add (this.vbox6);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox6]));
-			w10.Position = 0;
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox6]));
+			w12.Position = 0;
 			// Container child hbox1.Gtk.Box+BoxChild
 			this.vbox4 = new global::Gtk.VBox ();
 			this.vbox4.Name = "vbox4";
@@ -173,10 +228,10 @@ namespace MonoDevelop.RegexToolkit
 			this.label10.UseMarkup = true;
 			this.label10.UseUnderline = true;
 			this.vbox4.Add (this.label10);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label10]));
-			w11.Position = 0;
-			w11.Expand = false;
-			w11.Fill = false;
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label10]));
+			w13.Position = 0;
+			w13.Expand = false;
+			w13.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
 			this.scrolledwindow5 = new global::Gtk.ScrolledWindow ();
 			this.scrolledwindow5.CanFocus = true;
@@ -188,18 +243,18 @@ namespace MonoDevelop.RegexToolkit
 			this.optionsTreeview.Name = "optionsTreeview";
 			this.scrolledwindow5.Add (this.optionsTreeview);
 			this.vbox4.Add (this.scrolledwindow5);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.scrolledwindow5]));
-			w13.Position = 1;
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.scrolledwindow5]));
+			w15.Position = 1;
 			this.hbox1.Add (this.vbox4);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox4]));
-			w14.Position = 1;
-			w14.Expand = false;
-			w14.Fill = false;
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox4]));
+			w16.Position = 1;
+			w16.Expand = false;
+			w16.Fill = false;
 			this.vbox1.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
-			w15.Position = 0;
-			w15.Expand = false;
-			w15.Fill = false;
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
+			w17.Position = 0;
+			w17.Expand = false;
+			w17.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
 			this.HelpWidget = new global::Gtk.VBox ();
 			this.HelpWidget.Name = "HelpWidget";
@@ -213,10 +268,10 @@ namespace MonoDevelop.RegexToolkit
 			this.label9.UseMarkup = true;
 			this.label9.UseUnderline = true;
 			this.HelpWidget.Add (this.label9);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.HelpWidget [this.label9]));
-			w16.Position = 0;
-			w16.Expand = false;
-			w16.Fill = false;
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.HelpWidget [this.label9]));
+			w18.Position = 0;
+			w18.Expand = false;
+			w18.Fill = false;
 			// Container child HelpWidget.Gtk.Box+BoxChild
 			this.hbox5 = new global::Gtk.HBox ();
 			this.hbox5.Name = "hbox5";
@@ -232,21 +287,21 @@ namespace MonoDevelop.RegexToolkit
 			this.inputTextview.Name = "inputTextview";
 			this.scrolledwindow1.Add (this.inputTextview);
 			this.hbox5.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.scrolledwindow1]));
-			w18.Position = 0;
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.scrolledwindow1]));
+			w20.Position = 0;
 			this.HelpWidget.Add (this.hbox5);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.HelpWidget [this.hbox5]));
-			w19.Position = 1;
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.HelpWidget [this.hbox5]));
+			w21.Position = 1;
 			this.vbox1.Add (this.HelpWidget);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.HelpWidget]));
-			w20.Position = 1;
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.HelpWidget]));
+			w22.Position = 1;
 			this.vpaned1.Add (this.vbox1);
-			global::Gtk.Paned.PanedChild w21 = ((global::Gtk.Paned.PanedChild)(this.vpaned1 [this.vbox1]));
-			w21.Resize = false;
+			global::Gtk.Paned.PanedChild w23 = ((global::Gtk.Paned.PanedChild)(this.vpaned1 [this.vbox1]));
+			w23.Resize = false;
 			// Container child vpaned1.Gtk.Paned+PanedChild
 			this.hbox4 = new global::Gtk.HBox ();
 			this.hbox4.Name = "hbox4";
-			this.hbox4.Spacing = 6;

+			this.hbox4.Spacing = 6;
 			this.hbox4.BorderWidth = ((uint)(6));
 			// Container child hbox4.Gtk.Box+BoxChild
 			this.notebook2 = new global::Gtk.Notebook ();
@@ -283,8 +338,8 @@ namespace MonoDevelop.RegexToolkit
 			this.replaceResultTextview.CursorVisible = false;
 			this.scrolledwindow4.Add (this.replaceResultTextview);
 			this.notebook2.Add (this.scrolledwindow4);
-			global::Gtk.Notebook.NotebookChild w25 = ((global::Gtk.Notebook.NotebookChild)(this.notebook2 [this.scrolledwindow4]));
-			w25.Position = 1;
+			global::Gtk.Notebook.NotebookChild w27 = ((global::Gtk.Notebook.NotebookChild)(this.notebook2 [this.scrolledwindow4]));
+			w27.Position = 1;
 			// Notebook tab
 			this.label4 = new global::Gtk.Label ();
 			this.label4.Name = "label4";
@@ -292,12 +347,12 @@ namespace MonoDevelop.RegexToolkit
 			this.notebook2.SetTabLabel (this.scrolledwindow4, this.label4);
 			this.label4.ShowAll ();
 			this.hbox4.Add (this.notebook2);
-			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.notebook2]));
-			w26.Position = 0;
+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.notebook2]));
+			w28.Position = 0;
 			this.vpaned1.Add (this.hbox4);
 			this.vbox2.Add (this.vpaned1);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.vpaned1]));
-			w28.Position = 0;
+			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.vpaned1]));
+			w30.Position = 0;
 			this.Add (this.vbox2);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/generated.cs
index 0ada9fc5f0..75935e2e55 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/generated.cs
@@ -66,40 +66,6 @@ namespace Stetic
 		}
 	}
 
-	internal class IconLoader
-	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
-		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
-				return res;
-			} else {
-				int sz;
-				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-					}
-				}
-			}
-		}
-	}
-
 	internal class ActionGroups
 	{
 		public static Gtk.ActionGroup GetActionGroup (System.Type type)
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/gui.stetic
index 426ce9fe4f..e34438ae6d 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/gui.stetic
@@ -110,10 +110,39 @@
                                     <property name="MemberName" />
                                     <property name="CanDefault">True</property>
                                     <property name="CanFocus">True</property>
-                                    <property name="Type">TextAndIcon</property>
-                                    <property name="Icon">stock:gtk-media-play Menu</property>
-                                    <property name="Label" translatable="yes">Start Regular E_xpression</property>
-                                    <property name="UseUnderline">True</property>
+                                    <property name="Type">Custom</property>
+                                    <child>
+                                      <widget class="Gtk.HBox" id="buttonStartHbox">
+                                        <property name="MemberName" />
+                                        <property name="Spacing">2</property>
+                                        <child>
+                                          <widget class="MonoDevelop.Components.ImageView" id="buttonStartIcon">
+                                            <property name="MemberName" />
+                                            <property name="IconId">gtk-execute</property>
+                                            <property name="IconSize">Menu</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="Position">0</property>
+                                            <property name="AutoSize">True</property>
+                                            <property name="Expand">False</property>
+                                            <property name="Fill">False</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="Gtk.Label" id="buttonStartLabel">
+                                            <property name="MemberName" />
+                                            <property name="LabelProp" translatable="yes">Start Regular E_xpression</property>
+                                            <property name="UseUnderline">True</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="Position">1</property>
+                                            <property name="AutoSize">True</property>
+                                            <property name="Expand">False</property>
+                                            <property name="Fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
                                   </widget>
                                   <packing>
                                     <property name="PackType">End</property>
@@ -356,6 +385,7 @@
   <widget class="Gtk.Bin" id="MonoDevelop.RegexToolkit.ElementHelpWidget" design-size="300 300">
     <property name="MemberName" />
     <property name="Visible">False</property>
+    <property name="GeneratePublic">False</property>
     <child>
       <widget class="Gtk.VBox" id="vbox4">
         <property name="MemberName" />
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs b/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs
index f9f893a74a..f4bee85833 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/AssemblyInfo.cs
@@ -8,3 +8,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDescription ("Provides a text editor for the MonoDevelop based on Mono.TextEditor")]
 [assembly: AssemblyVersion ("2.6")]
 [assembly: InternalsVisibleTo("UnitTests")]
+[assembly: InternalsVisibleTo("MonoDevelop.VersionControl")]
+[assembly: InternalsVisibleTo("MonoDevelop.Refactoring")]
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog b/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
deleted file mode 100644
index a409adf06e..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
+++ /dev/null
@@ -1,5017 +0,0 @@
-2010-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Optimized
-	  document loading.
-
-2010-07-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/AutoSave.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Auto save
-	  thread is now shared.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Moved the
-	  SetCaretTo to the mono.texteditor.
-
-2010-07-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Track API
-	  changes.
-
-2010-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track API
-	  changes.
-
-2010-07-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: added null
-	  check.-
-
-2010-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug
-	  622214 - NullReferenceException when closing file tab'.
-
-2010-07-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Unsubscribe
-	  the recently added file change events, check if the widget's
-	  disposed to avoid NRE, and avoid an unnecessary closure
-	  creation.
-
-2010-07-13  Levi Bard <levi@unity3d.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	  Also respond to FileService events.
-
-2010-07-13  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/NavigationBar.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/ISourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs:
-	* MonoDevelop.SourceEditor/NavigationBarCommands.cs:
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Removed old unused quick finder code/moved dropdownbox to
-	  components.
-
-2010-07-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Replaced
-	  custom workerthread with
-	  system.compontentmodel.backgroundworker.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Track
-	  ProjectDomService/Parser API.
-
-2010-07-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Handled some
-	  potential threading issues.-
-
-2010-07-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Track API
-	  changes.
-
-2010-07-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Simplified
-	  call.
-
-2010-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: added null
-	  check.
-
-2010-07-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Disabled the
-	  navigation bar subsystem - it got replaced by the pathed
-	  document subsystem.
-
-2010-06-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Fixed
-	  'Bug 616949 - Message bubbles prevents the background color
-	  of selected text to change'.
-
-2010-06-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Fixed
-	  'Bug 616001 - Inline errors don't completely vanish after
-	  build'.
-
-2010-06-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  613825 - Auto-complete on highlighted text overwrites
-	  following characters'.
-
-2010-06-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed
-	  breakpoint text markers.
-
-2010-06-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed 'Bug
-	  613114 - NRE in editor means error marker never goes away'.
-
-2010-06-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Use a
-	  system font for bubbles.
-
-2010-06-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  611202 - Move line up/down command fails in aspx files'.
-
-
-2010-06-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: check if
-	  search&replace widget is open.
-
-2010-06-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed 'Bug
-	  610204 - Find-as-you-type-bar with Chrome style broke a good
-	  use case of the find-bar with Firefox style'.
-
-2010-05-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Fixed
-	  'Bug 610099 - Typing in lines with bubbles very slow'.
-
-
-2010-05-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	  Generalized method.
-
-2010-05-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	  Generalized method.
-
-2010-05-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Worked
-	  on message bubbles.
-
-2010-05-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Removed
-	  the message bubble focus inactive toggle (it's still
-	  inactive, if the line has changed).
-
-2010-05-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Removed
-	  debug message.
-
-2010-05-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Removed
-	  message box which informs of undo past save point.
-
-2010-05-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: fixed
-	  little selection drawing issue.
-
-2010-05-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  Fix text alignment.
-
-2010-05-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  Track API.
-
-2010-05-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  Use new BounceFadePopupWindow class.
-
-2010-05-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Fixed
-	  some drawing issues.
-
-2010-05-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  Worked on message bubble popups
-
-2010-05-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs:
-	  Corrected some minor drawing issues.
-
-2010-05-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Clip
-	  selection region.
-
-2010-05-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  The message bubbles can now draw selected regions.
-
-2010-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Removed debug
-	  code.
-
-2010-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Ensures
-	  that the layout is created.
-
-2010-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Fixed
-	  some issues with message bubbles.
-
-2010-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  Worked on text editor styling.
-
-2010-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Used smartscrolledwindow.
-
-2010-05-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Used the
-	  standard scrolled window again.
-
-2010-05-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Added
-	  border around the text editor & fixed some splitting issues.
-
-2010-05-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Used compact
-	  scrolled window.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: Clea
-	  up path API.
-
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	  Clean up dialog placement.
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Flush.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Disable the
-	  search result animation as it looks rather ugly right now.
-
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  Tweak.
-
-2010-05-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Unsubscribe
-	  options change event.
-
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs:
-	  Subscribe the options changed event only once.
-
-2010-05-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  Speed up animation & made it a bit smaller.
-
-2010-05-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  Tweaked error bubble popup drawing a bit.
-
-2010-05-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleHighlightPopupWindow.cs:
-	  Added message bubble popup animation/fixed bug in message
-	  bubble calculation.
-
-2010-05-21  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs: Worked
-	  on message bubbles.
-
-2010-05-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: Fixed 'Bug
-	  607311 - MouseOver cause MD to crash'.
-
-2010-05-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  533918 - Scroll position "jumps" first time editor tab is
-	  shown'.
-
-2010-05-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Fix keybindings.
-
-2010-05-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Escape in a
-	  'do you want to continue' dialog should cancel.
-
-2010-05-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: Provide
-	  tooltips for message bubbles.
-
-2010-05-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Improved the
-	  error bubble drawing.
-
-2010-05-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Expanded
-	  message bubbles now overdraw lines instead of inserting
-	  virtual space.
-
-2010-05-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented
-	  'Bug 606978 - Warning message when undoing past save point'.
-
-2010-05-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Track code
-	  template API.
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track code
-	  template API and toolbox API.
-
-2010-05-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Improved
-	  multi monitor support.
-
-2010-05-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Use
-	  ViActions.Join as EditorCommands.JoinWithNextLine, since
-	  it's more efficient and supports joining multiple lines.
-
-2010-05-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Removed debug
-	  message.
-
-2010-05-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Display
-	  resolve errors in the tooltip.
-
-2010-05-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: Fixed selection
-	  drawing error.
-
-2010-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Optimized
-	  speed of message bubbles.
-
-2010-05-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Fixed
-	  'Bug 605000 - Search history does not include recent
-	  searches in current editor'.
-
-2010-05-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs: Use
-	  PangoUtil to create the PangoLayout to avoid a leak.
-
-2010-05-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/StatusBox.cs: Nullify editor
-	  reference to help tracking leaks.
-
-2010-05-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	  Removed debug message/handled null case.
-
-2010-05-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs:
-	  Track API changes.
-
-2010-05-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: implemented
-	  'Bug 603984 - Control-f with selection while search open
-	  should use selection'.
-
-2010-05-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Check for
-	  empty and null.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Make use
-	  of the new Document.Dom property.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fix auto
-	  insert bracket issue.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed
-	  possible null ref.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Auto expand
-	  multiple error bubbles when the caret is in a line that
-	  contains a multi error bubble.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed 'Bug
-	  603113 - Automatic window scrolling hides completion
-	  window'.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed
-	  breakpoint update.
-
-2010-05-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Added bounds
-	  check.
-
-2010-05-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed update
-	  breakpoint slowness problem.
-
-2010-05-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Removed some duplicate
-	  entries/put toggle code focus command into the text editor
-	  context menu.
-
-2010-05-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs: free
-	  delegate reference.
-
-2010-05-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Track
-	  API changes.
-
-2010-05-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Ensure that
-	  created font description is destroyed.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Moved the
-	  command handlers to the view.
-
-2010-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/GotoLineNumberWidget.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Fixed
-	  IntPtr exception.
-
-2010-04-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Always fire
-	  the CaretPositionSet event when the caret position changes.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Widgets from
-	  views are now destroyed by the workspace window.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  600671 - Text painting gets into a weird state'.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: added the toggle message
-	  bubble command to the main menu message bubble submenu.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SourceEditorCommands.cs: Fixed 'Bug
-	  600622 – Can't set a breakpoint on line with inline
-	  error/warning'.
-
-2010-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed 'Bug
-	  600609 - Parameter tooltips should hide when scrolling
-	  editor'.
-
-2010-04-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs: Accept getting
-	  the focus only when the mouse is moved inside the window.
-
-2010-04-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	  Added some null checks.
-
-2010-04-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/GotoLineNumberWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Added
-	  some HACK comments.
-
-2010-04-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/GotoLineNumberWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Worked
-	  on mac bugfix.
-
-2010-04-22  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.SourceEditor/GotoLineNumberWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	  Take back last commit. 
-
-2010-04-22  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.SourceEditor/GotoLineNumberWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	  Found other solution to mac drawing problem.
-
-2010-04-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	  Fixed 'Bug 598203 - Tooltip shows too fast, follows mouse,
-	  and flickers'.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Removed
-	  intptr constructor.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed find
-	  issue.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: provided int
-	  ptr constructor.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/GotoLineNumberWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Worked
-	  on mac disappearing buttons work around.
-
-2010-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	  Fixed 'Bug 597672 - Search bar icons vanish when moving
-	  across them mouse right to left'.
-
-2010-04-19  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/MessageBubbleCommands.cs: Worked on
-	  message bubbles/Added some bubble commands to the view menu.
-
-2010-04-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Unregister
-	  pinned watch control when the watch is removed.
-
-	* MonoDevelop.SourceEditor/PinnedWatchWidget.cs: Embed an
-	  ObjectValueTreeView instance instead of a custom value
-	  viewer.
-
-2010-04-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed warning.
-
-2010-04-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Optimized
-	  error bubbles.
-
-2010-04-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: checked
-	  document == null.
-
-2010-04-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Levi Bard
-	  <levi@unity3d.com> Cache selection mode.
-
-2010-04-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  596511 - Code completion removes block selection and only
-	  affects 1 line'
-
-2010-04-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: ContentName
-	  can be null if the file is not saved.
-
-2010-04-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Added some
-	  checks to avoid updating breakpoints when the editor has
-	  been disposed.
-
-2010-04-13  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	  Implemented 'Bug 595598 - Intelligent placing of
-	  semi-colons'.
-
-2010-04-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented
-	  'Bug 595587 - Move code block to correct depth when
-	  Alt+arrow moving'.
-
-2010-04-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  595584 - Code completion leaves the cursor in the wrong
-	  place'.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed 'Bug
-	  595601 - Make "add matching quote" aware of whether or not
-	  it is within a string already'.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Text
-	  editor extension is disposed in Document.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Dispose
-	  text editor extensions.
-
-2010-04-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented
-	  command for 'Bug 595228 - Block selection should be usable
-	  from keyboard'
-
-2010-04-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/DebugValueMarker.cs: Removed
-	  debugvaluemarker (it's now done by pinnedquickwatch).
-
-2010-04-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs: Removed
-	  unnecessary unselection code.
-
-2010-04-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs: Converted to a
-	  TopLevel window, so that it can get proper focus and the
-	  value entry works as expected.
-
-2010-04-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  594370 - NRE in source editor crashed MD'.
-
-2010-04-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	  Implemented use selection for find/replace commands.
-
-2010-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed auto
-	  save creation.
-
-2010-03-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fix bug 569417
-	  - Exception in SourceEditorView.CheckFrameIsInFile.
-
-2010-03-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/PinnedWatchWidget.cs: Improve
-	  visual style.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.SourceEditor.addin.xml: Bumped MD version.
-
-2010-03-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/StatusBox.cs:
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Optimized
-	  text editor caret movement/selection speed.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/StatusBox.cs:
-	* MonoDevelop.SourceEditor/IdeViMode.cs:
-	* MonoDevelop.SourceEditor/NavigationBar.cs:
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/DebugValueMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs:
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs:
-	* MonoDevelop.SourceEditor/PinnedWatchWidget.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs:
-	* MonoDevelop.SourceEditor/ISourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/NavigationBarCommands.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* MonoDevelop.SourceEditor/MarkerOperationsHandler.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs:
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs:
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Don't modify
-	  the style's default font, because that affects other parts
-	  of the MD GUI. Make a copy instead, and track style updates.
-
-2010-03-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Fixed
-	  'Bug 586479 - GTK and GLib criticals from
-	  DropDownBox.PositionListWindow'.
-
-2010-03-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: fixed
-	  scrolling bar bug.
-
-2010-03-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Added repaint
-	  after task update.
-
-2010-03-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Optimized
-	  error bubble speed.
-
-2010-03-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/NavigationBarCommands.cs: When the
-	  caret panel is shown the toggle command is renamed to 'hide
-	  caret panel'.
-
-2010-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/StatusBox.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Optimized
-	  caret state box.
-
-2010-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs: Fixed
-	  the show column ruler option.
-
-2010-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed 'Bug
-	  585770 - Matching brace should not be inserted in comments'.
-
-2010-03-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Don't add
-	  tasks to invalid lines. May happen when the file is reloaded
-	  and changed from outside or when the task is invalid.
-
-2010-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Fixed 'Bug
-	  585305 - NRE in text editor when hiding annotations'.
-
-2010-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Fixed
-	  'Bug 584883 - Layout issue in quick finder dropdowns'.
-
-2010-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/NavigationBar.cs: Navigation bar
-	  now controls the visibility of the containing panels.
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: 
-
-2010-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/StatusBox.cs:
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/NavigationBar.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/NavigationBarCommands.cs: Worked on
-	  navigation panel (it's now possible to show the caret
-	  position there).
-
-2010-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/StatusBox.cs:
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs:
-	  Refactored text editor resolve providers. Language bindings
-	  now can provide own providers.
-
-2010-03-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fix build
-
-2010-03-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Moved find
-	  expression code into the language binding.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: up/down
-	  only reacts when search entry has the focus.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	  Implemented 'Bug 584244 - key binding (up/down arrow) to
-	  cycle through recent searches'.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Fixed
-	  'Bug 584235 - New search widget causes text to be
-	  overrwritten when it shouldn't'.
-
-2010-03-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Handled
-	  unresolved member resolve result.
-
-2010-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Fixed
-	  'Bug 583495 - Clicking on search result briefly selects
-	  result'.
-
-2010-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  583461 - Fold preview scrolling is strange'.
-
-2010-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/PinnedWatchWidget.cs: setting
-	  minimum height to 18.
-
-2010-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/PinnedWatchWidget.cs: Fixed 'Bug
-	  583026 - Font and aligning issues with the
-	  PinnedWatchWidget'/Applied patch from Alexander Cherniuk
-	  <ts33kr@gmail.com>
-
-2010-02-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: added
-	  selection check.
-
-2010-02-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Fixed
-	  'Bug 582050 - Cannot see selection while search box is
-	  visible, even if editor has focus'
-
-2010-02-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: BOM is now
-	  remembered.
-
-2010-02-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Add
-	  command handlers for RecenterEditor and TransposeCharacters.
-
-2010-02-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: Missed file in
-	  previous commit.
-
-2010-02-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Track API
-	  changes.
-
-2010-02-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Improved
-	  keyboard navigation in search & replace widget.
-
-2010-02-22  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	  Fixed 'Bug 581629 - Search and replace should not trim the
-	  search/replace term'.
-
-2010-02-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Worked
-	  on search & replace.
-
-2010-02-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Worked
-	  on search & replace.
-
-2010-02-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	  Fixed search update bug.
-
-2010-02-16  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/GotoLineNumberWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	  Worked on the search box/goto line number box.
-
-2010-02-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Fixed
-	  search & replace widget flickering problem.
-
-2010-02-15  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/searchoptions.png:
-	* MonoDevelop.SourceEditor/searchoptions.svg:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Added
-	  search options icon.
-
-2010-02-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/PinnedWatchWidget.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Worked
-	  on search & replace widget.
-
-2010-02-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Remove
-	  dead code.
-
-2010-02-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: fixed
-	  flickering in inform label update.
-
-2010-02-12  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/GotoLineNumberWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	  Overworked the search & replace widget.
-
-2010-02-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	  re-implemented intptr constructor.
-
-2010-02-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed 'Bug
-	  577848 - MissingIntPtrCtorException appears randomly'.
-
-2010-02-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Added scroll
-	  to caret call for all folding commands to fix "Bug 577933 -
-	  Text editor cannot be scrolled and no text is in view".
-
-2010-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track print
-	  API.
-
-2010-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/PrintSettingsWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs:
-	  Stub out a widget for editing custom print settings.
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs:
-	  Unify and expand the custom print settings in a settings
-	  class. Fix warnings.
-
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs: Fix warning.
-
-2010-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs: Use
-	  mm units instead of px.
-
-2010-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs:
-	  Replace the Gnome printing code with a new GTK 2.10
-	  implementation.
-
-2010-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Added method
-	  to check whether text editor has input focus.
-
-2010-02-04  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/DebugValueMarker.cs:
-	* MonoDevelop.SourceEditor/PinnedWatchWidget.cs: Added first
-	  version of widget based pinned watches.
-
-2010-02-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/DebugValueMarker.cs:
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Use
-	  the new pinned watch infrastructure.
-
-2010-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs:
-	* MonoDevelop.SourceEditor/DebugValueMarker.cs:
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs:
-	  Display mouse over widget for pin watches.
-
-2010-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed 'Bug
-	  574362 - Matching brace shouldn't be added inside comments'.
-
-2010-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs: fixed 'Bug
-	  574994 - Pinned quick watch issues'.
-
-2010-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueMarker.cs: handles h
-	  scrolling & clipping.
-
-2010-01-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Don't
-	  show the window in the ctor. This means the creator can move
-	  it before showing it, and we don't get a flicker. Also means
-	  we have to grab/ungrab in map/unmap.
-
-2010-01-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueMarker.cs: hide close
-	  pins, when mouse is not in the right line.
-
-2010-01-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs:
-	* MonoDevelop.SourceEditor/DebugValueMarker.cs: Worked on
-	  pinnable watches.
-
-2010-01-26  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs:
-	* MonoDevelop.SourceEditor/DebugValueMarker.cs:
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs:
-	  Implemented 'quick watches'.
-
-2010-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs:
-	  Track DisplayBinding API.
-
-2010-01-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Track
-	  HelpService API.
-
-2010-01-21  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Added support for custom key actions in completion list.
-
-2010-01-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: fixed 'Bug
-	  366110 - Accessibility issue regarding tooltips font'.
-
-2010-01-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented
-	  'Bug 433318 - Allow scrolling the text boxes that appear
-	  when hovering over a folded region'.
-
-2010-01-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Track api
-	  changes.
-
-2010-01-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs:
-	  implemented 'Bug 571252 - Quick finder dropdowns should take
-	  mouse grab'.
-
-2010-01-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs:
-	  fixed bug with on the fly formatting check button.
-
-2010-01-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: icon is no
-	  longer drawn over the left margins.
-
-2010-01-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: fixed bug in
-	  error text marker collapsing sign.
-
-2010-01-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed 'Bug
-	  569665 - Moving entire lines of code with Alt + Up/Down
-	  causes the editor to behave erratically.'.
-
-2010-01-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Track
-	  selection during mouse scroll events. Fix page size.
-
-2010-01-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Use the eol
-	  marker from the policy.
-
-2010-01-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: Worked on
-	  collapsible error bubbles.
-
-2010-01-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: added case
-	  check.
-
-2010-01-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed auto
-	  set pattern casing for selection.
-
-2010-01-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: fixed 'Bug
-	  568979 - Hruler paints over error text'.
-
-2010-01-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: Fixed 'Bug
-	  568966 - Error bubbles wrapped lines have wrong bg in ruler
-	  area'.
-
-2010-01-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: fixed selection
-	  drawing bug.
-
-2010-01-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Added support
-	  for multiple errors/warnings in one line.
-
-2010-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	  fixed "Bug 561572 - Search keeps defaulting to case
-	  sensitive" & "Bug 564384 - Can't turn off case sensitivity".
-
-2010-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed Bug 
-	  564855 - Pressing Enter at the end of a line with a breakpoint 
-	  on it causes the line to be drawn as a not "breakpointed" line.
-
-2010-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug
-	  567335 - Split Horizontal View Jumps Both Panes to the Start
-	  of the File instead of displaying the same place'.
-
-2010-01-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs: Constrain the
-	  text layout so it doesn't ever render under the dropdown
-	  arrows.
-
-2010-01-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: fixed/added
-	  debug messages for 'Bug 566249 - InvalidCastException when
-	  deleting some text in the text editor'.
-
-2010-01-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug
-	  560510 - Preprocessor enabled code shows as comment anyway'.
-
-2010-01-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs: Render as the
-	  inside of a button, so it matches button styling. Use
-	  depressed state when popup active.
-
-2009-12-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Use proper
-	  enums for values instead of letting them get cached as
-	  strings and having to reparse them every time.
-
-2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Use some of the new
-	  icons.
-
-2009-12-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Re-enable
-	  syntax error underlining. No idea why Mike disabled it, but
-	  it's far more useful than error bubbles.
-
-2009-12-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Check that
-	  file exists before getting its old attributes.
-
-2009-12-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs: Escape now
-	  closes drop down.
-
-2009-12-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs: Improved the
-	  drawing of the tiny drop down box.
-
-2009-12-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs: Keyboard now
-	  works in tiny drop down.
-
-2009-12-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs: Added spacing
-	  for the right arrows.
-
-2009-12-03  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/objects.xml:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/TinyDropDownBox.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Added tiny
-	  drop down box.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/AutoSave.cs: Name threads to make
-	  debugging easier.
-
-2009-12-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed 'Bug
-	  559822 - comments are folded with incorrect match'.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	  Track API.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Only update
-	  individual properties on property service events, instead of
-	  wholesale refreshing them all on any (unrelated) property
-	  service event. Prevents firing lots of change events that
-	  could cause lots of unnecessary work and slowdowns
-	  elsewhere.
-
-2009-11-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Fixed
-	  search & replace speed issue.
-
-2009-11-26  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	  Worked on search & replace popup.
-
-2009-11-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Cleanly take
-	  out event handler.
-
-2009-11-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs: only set the
-	  color styles, when an editor color style is available.
-
-2009-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Try to display
-	  the current non-external frame only if the current frame
-	  isn't in the current file. This means we also show a
-	  stack/execution marker in external code files, if they're
-	  somehow opened.
-
-2009-11-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Use FilePath
-	  when comparing files, since it is case insensitive in
-	  windows.
-
-2009-11-25  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Worked on message bubbles.
-
-2009-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: When debugging 
-	  stops, clear the stack marker as well as the execution marker.
-
-2009-11-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Use the new
-	  tracepoint markers.
-
-2009-11-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Disabled error
-	  bubbles by request from lluis.
-
-2009-11-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Used the
-	  correct screen for the screen height. 
-
-2009-11-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Increased
-	  the number of maximum items in the quick class browser
-	  dropdown.
-
-2009-11-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/ErrorTextMarker.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Worked on
-	  error markers
-
-2009-11-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implement
-	  markers for current stack frame.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Use correct cairo lib.
-
-2009-11-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/SourceEditorCommands.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	  Implemented 'Code focus toggle and follow-cursor'.
-
-2009-11-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Source
-	  editor options are now public.
-
-2009-11-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Move common
-	  infobar code to new widget in MonoDevelop.Components.
-	  Attempt to make messages clearer and more usable.
-
-2009-11-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/AutoSave.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  552173 - Good file for testing texteditor performance'.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.SourceEditor.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Flush.
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj: Reference mono-cairo
-	  package.
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Add null
-	  check.
-
-2009-10-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  550882 - ArgumentNull Exception when removing a breakpoint'.
-
-2009-10-22  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Fixed the dialog.
-
-2009-10-22  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Added option to turn off parameter insight.
-
-2009-10-21  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Added missing check button.
-
-2009-10-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs:
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs: Added
-	  enable animations option.
-
-2009-10-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Fix Mac keybinding.
-
-2009-10-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/SourceEditorCommands.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Add a
-	  command to pulse the caret.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Added caret
-	  pulse.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed bug
-	  with constructor initializers.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Added caret
-	  line highlighting.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Search
-	  pattern is now set when search widget is first opened/added
-	  animated search results.
-
-2009-10-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed
-	  method overloading when no space is used before '('.
-
-2009-10-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed C/Vala
-	  bindings.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Fixed xml
-	  documentation summary markup.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Merged code template
-	  windows.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: Use \ instead of '/'
-	in the Import.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: Add md.targets .
-
-2009-10-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/AutoSave.cs: fixed 'Bug 541726 -
-	  using nant beside monodevelop gives errors because of backup
-	  files'.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.SourceEditor.addin.xml: Bump MD version.
-
-2009-10-05  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	  Enable vi word breaking.
-
-2009-10-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed caret
-	  mode update at the end of the document.
-
-2009-10-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Clear caret
-	  state when closing a source editor/update caret state when
-	  activating a source editor.
-
-2009-10-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed class
-	  quick finder flicker on file open.
-
-2009-10-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed 'Bug
-	  543195 New: GTK-Critical errors in split/unsplit text
-	  editor'.
-
-2009-10-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs:
-	  Fixed 'Bug 543200 - Files with hscrollbar open scrolled one
-	  character to the right'/optimized file opening.
-
-2009-09-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Corrected
-	  quick class browser column.
-
-2009-09-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Drop down
-	  box now handles the screen borders.
-
-2009-09-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Delete command
-	  now doesn't delete the whole line when nothing is selected.
-
-2009-09-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: Optimized &
-	  improved the behavior of the class quick finder.
-
-2009-09-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  533918 - Scroll position "jumps" first time editor tab is
-	  shown'.
-
-2009-09-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj: Fix build.
-
-2009-09-24  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj: Removed nrefactory
-	  reference.
-
-2009-09-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed menu
-	  positioning.
-
-2009-09-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Semantic
-	  highlighting requires to purge the layout cache, when the
-	  parser updates to reflect semantic changes.
-
-2009-09-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  537761 - Keystrokes not working on texteditor like "CTRL +
-	  X|Y to trigger Foo action...'.
-
-2009-09-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Check that
-	  help is supported before trying to show it.
-
-2009-09-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  540487 - Event handler anon delegate completion puts caret
-	  in wrong place'.
-
-2009-09-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Removed code
-	  duplication/fixed folding commands.
-
-2009-09-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Renamed
-	  IDomVisitable -> INode
-
-2009-09-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: fixed inner
-	  type sorting.
-
-2009-09-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: quick class
-	  browser now shows full inner type name.
-
-2009-09-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Only set the
-	  search engine, when the option is changed.
-
-2009-09-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Added some
-	  error handling code.
-
-2009-09-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Corrected
-	  caret position after format.
-
-2009-09-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Worked on
-	  formatting.
-
-2009-09-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Worked on
-	  on the fly format for code template insertion.
-
-2009-09-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track API
-	  changes.
-
-2009-09-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed code
-	  completion + auto insert braces bug.
-
-2009-09-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Worked on
-	  template formatting.
-
-2009-09-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	  Fixed syntax style verification.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	  Set the dialog transient to our widgets toplevel.
-
-2009-09-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed 'Bug
-	  537375 - Completed text not immediately updated'.
-
-2009-09-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed build.
-
-2009-09-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fold actions
-	  now re calculate the vertical scrollbar.
-
-2009-08-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Insert the text editor
-	  extension node in the default display binding group.
-
-2009-08-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug
-	  534735 - Write-permission cleared on save".
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed
-	  compiler warnings.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: Updated dependencies. We
-	  now depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs: Track
-	  API changes.
-
-2009-08-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Auto save is
-	  only created after atomic undos.
-
-2009-08-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	  Fixed Bug 529544 - Source editor should validate styles when
-	  adding them & Bug 531014 - Syntax Highlighting: Style sheet
-	  file has to be called [something]Style.xml.
-
-2009-08-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implement
-	  ISupportsProjectReload.
-
-2009-08-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/AutoSave.cs:
-	* MonoDevelop.SourceEditor/Counters.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Add some
-	  counters.
-
-2009-08-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: drop down
-	  box (in quick navigation) now recognizes leave event and
-	  deselects the selected item.
-
-2009-08-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs: Added
-	  abbrev word to the foundWords list.
-
-2009-08-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs: fixed bug
-	  in getwordbeforecaret
-
-2009-08-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs: Replaced
-	  the GetWordBeforeCaret with an own implementation.
-
-2009-08-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs: fixed typo
-	  in dynamic abbrev that caused a bug.
-
-2009-08-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Changed dynamic abbrev
-	  key to alt+/ 
-
-2009-08-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs:
-	* MonoDevelop.SourceEditor/SourceEditorCommands.cs: Added
-	  dynamic abbrev command (default: alt+space).
-
-2009-08-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug
-	  529009 - When open documents are restored, scroll
-	  positioning is bad".
-
-2009-08-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj: Use Mono.Cairo 2.0.
-
-2009-08-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: bracket
-	  auto insertion no longer closes parameter help window.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2009-07-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed Bug
-	  526721 - When splitting window vertically, the slider under
-	  left split is not shown unitl window is resized.
-
-2009-07-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Worked on
-	  xml documentation.
-
-2009-07-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Using custom
-	  documentation, if any.
-
-2009-07-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug
-	  525256 - Mouse Cursor jumps to random position after resolve
-	  type name.".
-
-2009-07-28  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj: Fixing build.
-
-2009-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Implemented
-	  "Bug 523920 - Comment command not using tags defined in
-	  syntax mode".
-
-2009-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed "Bug
-	  523853 - Delegate not recognised by refactoring tools
-	  (doesn't offer Go To Declaration)".
-
-2009-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug
-	  518391 - Exception when save a file into vfat partition".
-
-2009-07-21  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: 
-	  Add goto definition, goto next/previous error.
-
-2009-07-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: On first
-	  load parse info is updated before showing the document (to
-	  prevent folding update flicker).
-
-2009-07-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Auto
-	  insert bracket feature no longer closes code completion
-	  window too early (which caused that the code completion
-	  window didn't complete).
-
-2009-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SyntaxModeService.cs: Removed debug
-	  messages.
-
-2009-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed some
-	  automatic bracket issues.
-
-2009-07-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Made the
-	  automatic bracket insertion behavior more nicely (thanks go
-	  to marlun for suggesting this) .
-
-2009-07-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Improved
-	  automatic " insertion behaivour.
-
-2009-07-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: 
-
-2009-06-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs: Track
-	  api changes.
-
-2009-06-25  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: 
-	  Save files via the Gui.Document.
-
-2009-06-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug
-	  515825 - Toggle fold does not work if cursor sent to the end
-	  of folded line".
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: Use
-	  the new DesktopService instead of PlatformService.
-
-2009-06-22  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	  Reduce unnecessary whitespace.
-
-2009-06-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: The
-	  editor should only open files which are known to be text.
-	  Fixes bug #514761.
-
-2009-06-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/EditActions.cs: Fixed "Bug 514284 -
-	  Tab key doesn't work for plain text files (with tab as
-	  reindent option set)".
-
-2009-06-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor\SourceEditorView.cs: Fix nullref.
-
-2009-06-18  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	  Worked on on the fly formatting. DO NOT USE THIS OPTION (it
-	  may break code. But for testing it may be ok)
-
-2009-06-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs:
-	  Implement support for per mime-type formatting policies.
-
-2009-06-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug
-	  510226 - Edit / Folding commands seem to be currently
-	  broken".
-
-2009-06-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/AutoSave.cs: Fixed "Bug 504605 -
-	  Crash after removing a project".
-
-2009-06-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: When setting
-	  the mime type for the file, try to find one for which there
-	  is a syntax mode.
-
-2009-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/EditActions.cs: Fixed Bug 506245 -
-	  Block indent doesn't work.
-
-2009-05-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: fixed
-	  'Bug 506246 - Search command doesn't copy the selected
-	  string if find widget is visible'.
-
-2009-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor\SourceEditorView.cs: Use FilePath
-	  for representing paths.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor\SourceEditorView.cs: Use the new
-	  FilePath class for handling file and directory paths.
-
-2009-05-14  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs:
-	  Moved highlight properties semantic rule to c# backend.
-
-2009-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug
-	  502586 - Edit / Format / Join Lines does not join blank
-	  lines".
-
-2009-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/EditActions.cs: Fixed "Bug 501996 -
-	  Tab interpreted as reindent sometimes also inserts tabs".
-
-2009-05-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Fixed
-	  "Bug 501993 - Find and replace: Pressing Tab never gets to
-	  Replace field".
-
-2009-05-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: Save
-	  no longer centers the caret.
-
-2009-05-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/SyntaxModeCodon.cs:
-	* MonoDevelop.SourceEditor/SyntaxModeService.cs:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	* MonoDevelop.SourceEditor.Extension/TemplateExtensionNodeLoader.cs:
-	  Added support for custom syntax highlighting.
-
-2009-05-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed "Bug
-	  499981 - "File Changed" notification panel is unreadable
-	  when a dark theme is used".
-
-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Added
-	  missing empty region check.
-
-2009-05-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Changed
-	  default for completewithpunctuation
-
-2009-04-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Handle
-	  subword commands.
-
-2009-04-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Fixed 'Bug 499151 - Some text style policies are not
-	  respected'.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: the
-	  content may be == null now.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs:
-	  Track API changes.
-
-2009-04-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Use
-	  UntitledName when view.IsUntitled.
-
-2009-04-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	  Reimplemented language binding service.
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed "Bug
-	  497118 - Code folding makes debugging annoying".
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: track api
-	  changes.
-
-2009-04-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Implement
-	  handlers for ScrollPageDown and ScrollPageUp.
-
-2009-04-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Jumping with search & replace panel to files may no longer
-	  fold the jump destination.
-
-2009-04-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Track
-	  comment tag API.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Renamed
-	  PixbufService to ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug
-	  489963 - Files loose execution bit when saved".
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Track api changes.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.Extension/TemplateCodon.cs: (Revert
-	  revision 132136)
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.Extension/TemplateCodon.cs: Fixed
-	  possible bug in template codons.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Track API
-	  changes.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.SourceEditor.addin.xml: Bump MD version.
-
-2009-04-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Added patch
-	  from Levi Bard
-	  <taktaktaktaktaktaktaktaktaktak@gmail.com>:Make sure GUI
-	  operations are performed in the GUI thread.
-
-
-2009-04-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:
-	  fixed error.
-
-2009-04-14  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Fixed compilation error.
-
-2009-04-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: changed
-	  default value for 'CompleteWithSpaceOrPunctuation'
-
-2009-04-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:
-	  fixed "Bug 494565 - New auto-complete behavior is improperly
-	  labeled.".
-
-2009-04-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Hitting
-	  search repeatedly does search next
-
-2009-04-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Made the
-	  'undo' of code completion operations more intelligent.
-
-2009-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Track api
-	  changes.
-
-2009-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Added some
-	  virtual leading whitespace fixes.
-
-2009-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Added some
-	  fixes for virtual leading whitespace feature/removed some
-	  old code.
-
-2009-04-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/AutoSave.cs:
-	* MonoDevelop.SourceEditor/EditActions.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on "Bug
-	  492923 - MD hangs while editing text".
-
-2009-04-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	  Implemented "Bug 492675 - New line & ; at end of line".
-
-2009-04-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Added
-	  ctrl+return/shift+return commands.
-
-2009-04-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj: 
-
-	* MonoDevelop.SourceEditor/AutoSave.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Implemented
-	  auto save feature ("Bug 409717 - No automatic save").
-
-2009-04-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed "Bug
-	  487215 - No type is displayed when hovering over "var"
-	  keyword".
-
-2009-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug
-	  487736 - Clipboard ring and code snippets not shown anymore
-	  in the toolbox".
-
-2009-03-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	  Implemented "Bug 487422 - Ctrl+C/V/X should copy/paste/cut
-	  the whole line if no selection is made like in VS".
-
-2009-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed auto
-	  insert matching bracket bug.
-
-2009-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Added
-	  support for contextual templates.
-
-2009-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs: Fixed Header.
-
-2009-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Added the template
-	  commands to the editor context menu.
-
-2009-03-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: removed
-	  caching of results for custom expressions.
-
-2009-03-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs:
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	  Fixed compilation error.
-
-2009-03-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	  Implemented template function callbacks.
-
-2009-03-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented
-	  ICodeTemplateWidget interface.
-
-2009-03-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Worked on
-	  text link edit mode.
-
-2009-03-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fix possible
-	  NRE.
-
-2009-03-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Track API
-	  changes.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	  Track API changes.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: Don't local-copy project
-	  refs.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: Added text editor
-	  reference.
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed "Bug
-	  484574 - Setting SourceEditorView.Text doesn't mark the
-	  document as dirty".
-
-2009-03-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: Moved text editor to core
-
-2009-03-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs: Worked on code
-	  formatter.
-
-2009-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs: Changed
-	  interface.
-
-2009-03-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.Extension/TemplateCodon.cs: Fix
-	  resource disposal issues that prevented addins adding syntax
-	  modes and colour schemes, and probably caused resource
-	  stream leaks.
-
-2009-03-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed "Bug
-	  482806 - #region auto folding doesn't work.".
-
-2009-03-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Remove old
-	  code that could intefere with previous fix.
-
-2009-03-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Only show
-	  the class & method bar when there's a parsed
-	  CompilationUnit.
-
-2009-03-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Properly
-	  implement IEncodedTextContent.
-
-2009-03-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed "Bug
-	  480556 - MonoDevelop can't handle UTF-16 source files".
-
-2009-02-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs:
-	  Translation fixes. Patch from Kriván Bálint.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: Flush.
-
-2009-02-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: drop down
-	  box popup now selects always the current selected item as
-	  first item.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Changed the
-	  key for small tooltips (without full names) to shift instead
-	  of control. This should now work on all window managers.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	  Changed override Destroy --> override OnDestroyed.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	  Worked on clean ressource de-allocation.
-
-2009-02-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Assigned ids to tooltip
-	  providers.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Don't use
-	  the TextEditor from a non-gui thread since this property
-	  needs to query some gtk# properties.
-
-2009-02-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: Set a minimum
-	  icon height and width on the drop down boxes. Fixes size
-	  jumping with small UI font (there'll still be an issue with
-	  large fonts).
-
-2009-02-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Language
-	  tooltips now shrink namespaces when control is pressed.
-
-2009-02-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs:
-	  Track api changes.
-
-2009-02-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: fixed "Bug
-	  477513 - Tooltips should show full namespace when names
-	  clash".
-
-2009-02-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Changed
-	  message.
-
-2009-02-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed "Bug
-	  475990 - Code navigation not working in a ctor call inside a
-	  property".
-
-2009-02-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Handle
-	  UTF32 code points from IMContext. Don't pass most recent
-	  keypress through with IMContext multi-press commits, so that
-	  it doesn't append the space/enter that was used to terminate
-	  the multi-press input.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fix nullref.
-
-2009-02-16  Mike Krüger  <mkrueger@novell.com>
-
-	* gtk-gui/gui.stetic: 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed "Bug
-	  395576 - If a file changes outside monodevelop environment,
-	  notification is hard to see".
-
-2009-02-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs:
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs:
-	  fixed "Bug 364198 - Tooltips should be reduced if there are
-	  proper "using statements"".
-
-2009-02-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: error
-	  underlining & folding now works on untitled files.
-
-2009-02-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Improved
-	  language item tooltip formatting.
-
-2009-02-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Implement F1
-	  member help. Looks like it was never implemented for
-	  SourceEditor2.
-
-2009-02-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs: Fix NRE when
-	  there is no policy parent. Fixes creation of files not
-	  attached to projects.
-
-2009-02-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: added
-	  tooltip support for aggregated resolve results.
-
-2009-02-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed "Bug
-	  474149 - Context menu shows incorrect overload".
-
-2009-02-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs: default
-	  formatter now accounts eol policies.
-
-2009-02-11  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.csproj:
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/DefaultFormatter.cs: Added default
-	  formatter that uses text policy settings.
-
-2009-02-11  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed "Bug
-	  474055 - no parameters hints on first parameter when "Insert
-	  Matching Brace" is enabled".
-
-2009-02-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs: Fix
-	  null ref.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: Remove more inadvertent
-	  local copying of references.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.csproj: Don't local-copy other
-	  addins' dlls.
-
-2009-02-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs:
-	  Fixed compiler warnings.
-
-2009-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Remove
-	  unnecessary completion context event filtering.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.mdp:
-	* MonoDevelop.SourceEditor.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fire
-	  CompletionContextChanged when buffer changed by anything
-	  other than one character inserted at the cursor position.
-	  Fixes "Bug 448911 - Typing '#region<SPC>foo' results in
-	  'region<SPC>fooon' and "Bug 435770 - Code completion window
-	  should handle document changing under it". Fix typo that
-	  caused OnTextReplaced to be subscribed to TextReplacing
-	  instead of TextReplaced; this should fix line number
-	  updating in error pad. Also combine duplicate event
-	  handlers.
-
-2009-02-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: Add the tab and
-	  AdvancedBackspace actions that the SourceEditor usually adds
-	  to the edit mode. Restores deletion of matching brackets and
-	  tab-triggering of template insertion.
-
-2009-02-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug
-	  470859 - GLib-criticals in text editor'.
-
-2009-02-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs:
-	  implement missing members.
-
-2009-02-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/EditActions.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed
-	  "Bug 472714 - MonoDevelop automatic indentation does not
-	  follow "Convert tabs to spaces" option".
-
-2009-02-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed
-	  "Bug 469910 - Incorrect type resolution on attributes".
-
-2009-02-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: Remove unnecessary
-	  markup escaping.
-
-2009-02-03  Mike Krüger  <mkrueger@novell.com>
-
-	*
-	  MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs:
-	  Commented out some non functional code.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.SourceEditor.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	*
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Flush.
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.mdp: Fixed assembly references.
-
-2009-02-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Set caret
-	  position correctly after a completion insertion.
-
-2009-02-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs:
-	*
-	  MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:
-	  Remove proeprties that have been moved to text style
-	  policies. Track SourceEditorOptions API changes.
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	*
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Remove proeprties that have been moved to text style
-	  policies.
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.mdp: Updated.
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Track
-	  SourceEditorOptions API changes. Make the split editor use
-	  same StyledSourceEditorOptions object as its companion.
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Track
-	  SourceEditorOptions API changes. Use
-	  StyledSourceEditorOptions options object.
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Use
-	  settings from default TextStylePolicy.
-
-	* MonoDevelop.SourceEditor/EditActions.cs:
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs:
-	  Track SourceEditorOptions API changes.
-
-	* MonoDevelop.SourceEditor/ISourceEditorOptions.cs: Extract
-	  ISourceEditorOptions interface from ISourceEditorOptions.
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track
-	  SourceEditorOptions API changes. Propagate project change
-	  events to the child editor's StyledSourceEditorOptions.
-
-	* MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs:
-	  Implement an ISourceEditorOptions for ExtensibleTextEditor
-	  to use, which merges the default SourceEditorOptions and an
-	  attached Project's TextStylePolicy.
-
-2009-02-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Track changes in MD's assembly handling.
-	  Mono.Cairo is no longer considered to be a "system"
-	  assembly.
-
-2009-01-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented
-	texteditordataprovider.
-
-2009-01-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: handled possible
-	null reference exception.
-
-2009-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.mdp: removed treat warnings as errors
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: (Revert revision 124646)
-
-2009-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Changed the
-	behavior of the quick class browser dropdown.
-
-2009-01-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor.mdp:
-	* MonoDevelop.SourceEditor/IdeViMode.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:
-	* MonoDevelop.SourceEditor.Extension/TemplateCodon.cs:
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	* MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs: Fixed
-	compiler warnings.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Use MD's TextFile API
-	for loading and saving files, because it handles encodings, and does
-	"safer" writes.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: Use a faster sort - the
-	one used in the completion list.
-
-2009-01-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: Type & member list is
-	now sorted.
-
-2009-01-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: Don't crash when 
-	showing the quick finder for files with a parsed document but a 
-	no compilation unit. Fixes "Bug 468925 - MD crashes when opening / 
-	clicking in web.config file".
-	
-	In such cases, also hide the quick finder to save space.
-
-2009-01-23  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/DropDownBox.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/DropDownBoxListWindow.cs: Optimized the quick
-	class browser, update was too expensive speed wise. The quick class
-	browser dropdown is now a custom control.
-
-2009-01-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	Updated.
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented SearchNext
-	in the document interator. Fixes a performance issue (the default
-	implementations makes multiple calls to MoveAhead, which go through
-	all the remoting chaing).
-
-2009-01-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: In DocumentTextIterator,
-	the first call to MoveAhead must initialize the offset. Fixes bug
-	#460627 - Find In Files doesn't find all matches.
-
-2009-01-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed issue with 0
-	length documents.
-
-2009-01-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed possible array
-	index out of bound exception.
-
-2009-01-15  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: handled unlikly null
-	ref.
-
-2009-01-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed "Bug 465222 -
-	"Insert matching brace" - no newlines please!".
-
-2009-01-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed possible null
-	reference.
-
-2009-01-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Track changes in command names.
-	Patch by Vadim Chekan.
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Add/remove breakpoints
-	when clicking on the icon bar.
-
-2009-01-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed possible null
-	ref. exception.
-
-2009-01-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed 'Bug 463881 -
-	Type navigator does not work with attributes'.
-
-2009-01-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Worked on on the fly
-	type resolving.
-
-2009-01-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed 'Bug 456429 -
-	Search and replace broken again'.
-
-2008-12-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs:
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: TooltipWindow has been
-	moved to MD.Components.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-12-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Added command for
-	showing the expression evaluator.
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Factorized
-	expression finder code.
-
-2008-11-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Refactored
-	ambiences/domoutputvisitor.
-
-2008-11-26  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Moved command handlers
-	to witget. Fixing Bug 448915 - Toggle Line Comment(s) not available
-	in Alpha 2.
-
-2008-11-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Track api
-	changes.
-
-2008-11-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: Removed return type from
-	class quick finder.
-
-2008-11-24  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track search APIs.
-
-2008-11-18  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Use more precise error
-	underline positioning when available.
-
-2008-11-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Use named colours in
-	error/warning markers.
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Escape markup in
-	error message tooltips.
-
-2008-11-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Rename Error to
-	ErrorMarker to reduce ambiguity. Track Error API. Use different
-	colour for warnings. Tidy up API. Remove unnecessary field from
-	ErrorMarker class.
-
-2008-11-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Don't add
-	TriggerWordLength to the partial_word's length; the latter is all we
-	need. Fixes Bug 445388 - Ctrl-space in middle of word sometimes
-	overwrites too far.
-
-2008-11-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed 'Bug 444922 -
-	Buggy tooltips'.
-
-2008-11-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed code completion
-	bug.
-
-2008-11-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	removed auto templates.
-
-2008-11-12  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: removed space
-	template completion.
-
-2008-11-12  Mike Krüger  <mike@icsharpcode.net>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixed some slight
-	issues with templates and code completion insertion.
-
-2008-11-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fix line/col indexing on
-	the CodeCompletionContext. It should be one-indexed for compatibility
-	with the rest of MD.
-
-2008-11-11  Mike Krüger  <mike@icsharpcode.net>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: made brace auto
-	insertion more intelligent (doesn't insert closing brace when it
-	exists).
-
-2008-11-11  Mike Krüger  <mike@icsharpcode.net>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: fixed 'Bug 442768 -
-	Should show fully qualified name in tooltip when namespaces clash'.
-
-2008-11-10  Mike Krüger  <mike@icsharpcode.net>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	Added enable auto completion option.
-
-2008-11-07  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: Escape status bar text.
-
-2008-11-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Add submenu on
-	context menu for selecting input method. Seems be be the standard
-	thing to do in GTK.
-
-2008-11-06  Mike Krüger  <mike@icsharpcode.net>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Worked on code
-	templates.
-
-2008-11-06  Mike Krüger  <mike@icsharpcode.net>
-
-	* MonoDevelop.SourceEditor/EditActions.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: fixes some bugs with
-	code templates and auto insert brackets.
-
-2008-11-06  Mike Krüger  <mike@icsharpcode.net>
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs:
-	* MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs:
-	* MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs: fixed 'Bug
-	442099 - Empty code info tooltips should not be shown'.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Bump MD version.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor.addin.xml: Removed options which are not
-	really contextual.
-
-2008-11-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Add border around text
-	editor to give it definition when UI and colours schemes are both
-	light or dark.
-
-2008-11-05  Mike Krüger  <mike@icsharpcode.net>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs:
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Fixed some
-	warnings/cosmetic changes.
-
-2008-11-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implement
-	Indent/Unindent/ToggleComment commands directly on the editor instead
-	of implementing removed ICodeStyleOperations interface. Rename some
-	methods. Disable comment toggling command if language binding has
-	null single line comment value, so it no longer breaks on
-	XML/HTML/ASP.NET etc. Workaround for enhancement bugs "433644 -
-	'toggle line comment(s)' within script tags in aspx file fails" and
-	"440592 - 'toggle line comment(s)' in xml file should add comment
-	tags ('<!--', '-->')".
-
-2008-10-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: fixed 'Bug 439552
-	- Search in document doesn't work properly'.
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Handled the
-	resetTimerId differently.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Made the case a.Count ==
-	0 a bit more  efficient in the OnTextReplacing event.
-
-2008-10-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Make sure find/replace
-	changes to the editor are done in the gui thread. Should fix bug
-	#434159.
-
-2008-10-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: added lock for
-	possible threading issue.
-
-2008-10-16  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Remove unneeded
-	field and parameter. Rename SetCurrentMode to UpdateEditMode.
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Fire an OnChanged
-	event when the UseViModes setting changes, so that the setting is
-	applied by open editors.
-
-2008-10-15  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: Refactor.
-
-2008-10-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: Add :make command.
-
-2008-10-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: Track API.
-
-2008-10-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor.mdp: Updated.
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Add an option for
-	enabling vi modes.
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs:
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs: Add UI
-	for enabling vi modes.
-
-2008-10-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Allow enabling the
-	vi mode without recompilation.
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.mdp: Updated.
-
-	* MonoDevelop.SourceEditor/IdeViMode.cs: Add support for simple vi
-	commands.
-
-2008-10-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Restore
-	functionality to pop up context menu at caret if activated by key
-	press.
-
-2008-10-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed 'Bug 434165 - Page
-	UP/Down Key on top/bottom of a code folded make the region Unfolded'.
-
-2008-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed 'Bug 433271 -
-	Problems with code completion while creating #regions'.
-
-2008-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug 433401 -
-	Static methods don't show in the Methods dropdown'.
-
-2008-10-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.SourceEditor.mdp: Updated.
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs:
-	* MonoDevelop.SourceEditor/ExtensibleTextEditor.cs: Change file name to
-	match class name.
-
-2008-10-08  Andreia Gaita  <avidigal@novell.com>
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Don't run the
-	autocorrect/underline error timer if the UnderlineErrors options is
-	false (fixes #433288)
-
-2008-10-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/EditActions.cs: Track API.
-
-2008-10-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: fixed 'Bug 432856 -
-	  Creation and editing broken for unsaved files'.
-
-2008-10-06  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor.mdp: Updated.
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Add a way to enable
-	  vi mode.
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Call the text editor
-	  widget even if the escape key is pressed.
-
-2008-10-06  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Fixed bug with on
-	  the fly edit options changing.
-
-2008-09-30  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs: Exposed the
-	  control left/right option to the user.
-
-2008-09-30  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Exposet
-	  ControlLeftRightMode option in the options class == made a real
-	  monodevelop property (default value taken from platform service).
-
-2008-09-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug 430509 -
-	  Comment folding is too aggresive'.
-
-2008-09-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Track API. Move
-	  folding logic out of the editor. Reduce file width to 132 cols,
-	  assuming 8-wide tabs.
-
-2008-09-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/objects.xml: Updated.
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fix threading problem
-	  in ParseInformationUpdaterWorkerThread. This thread was getting the
-	  TextEditor property which runs gtk code, and this is only allowed
-	  in the GUI thread.
-
-2008-09-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs: Track API.
-
-2008-09-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: improved comment
-	  folding update.
-
-2008-09-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: fixed 'Bug 427511 -
-	  Code Completion not working for files not belonging to a project'.
-
-2008-09-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: fixed 'Bug 397930 -
-	  Navigation to generic method not working correctly'.
-
-2008-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/objects.xml,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Flush.
-
-2008-09-16  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed update issue in
-	  quick class finder.
-
-2008-09-15  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed bug in source
-	  editor caused by an change in the parser service update behavior.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs: Updated
-	  generated code.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/EditActions.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Track api changes.
-
-2008-09-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Worked on fold
-	  information update.
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed crash with
-	  search/replace widgets.
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: recognizing
-	  using/namespace import differences
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ClassQuickFinder.cs: Changed compilation
-	  unit/document meta information interface.
-
-2008-09-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fix packing on reload
-	  bar.
-
-2008-09-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/ClassQuickFinder.cs: Restore region combo
-	  functionality.
-
-2008-09-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/EditActions.cs,
-	  MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Fix spelling
-	  (extendible->extensible) while we can.
-
-2008-09-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* gtk-gui/gui.stetic: Updated.
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Tidy up replace
-	  mode switching logic. Fixes buglets where shortcuts couldn't be
-	  used to switch between modes, and the first click on the
-	  search/replace toggle was ignored.
-
-2008-09-08  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Optimized language
-	  item tooltip.
-
-2008-09-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/ClassQuickFinder.cs,
-	  MonoDevelop.SourceEditor/GotoLineNumberWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Make non-reusable
-	  widgets internal.
-	* gtk-gui/objects.xml, Makefile.am, MonoDevelop.SourceEditor.mdp:
-	  Updated.
-	* gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs,
-	  gtk-gui/gui.stetic: Replace stetic widget by manual code.
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Slim down unnecessary
-	  spacing around the edge of the text editor. Tidy up padding for
-	  child widgets.
-
-2008-09-05  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Fix build.
-	* gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	  Reduce wasted screen space.
-
-2008-09-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Some folding location
-	  fixes.
-
-2008-09-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed "[Bug 422095]
-	  New: NRE in the console when opening file ( seems related to
-	  folding regions)".
-
-2008-08-20  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: made some changes
-	  caused by text editor changes.
-
-2008-08-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fix some memory
-	  leaks.
-
-2008-08-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fix for backward
-	  search.
-
-2008-08-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor.addin.xml,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Added
-	  context menu for the editor margin.
-
-2008-08-15  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs: fixed
-	  bug in general options panel.
-	* gtk-gui/objects.xml: Fixed options button.
-
-2008-08-13  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: fixed "Bug 416847
-	  - Cannot use Tab Button".
-
-2008-08-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed bug.
-
-2008-08-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor.Extension,
-	  MonoDevelop.SourceEditor.Extension/TemplateCodon.cs,
-	  MonoDevelop.SourceEditor.Extension/TemplateExtensionNodeLoader.cs,
-	  MonoDevelop.SourceEditor.addin.xml,
-	  MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: fixed "Bug
-	  405926 - Addins cannot add syntax schemes or colour schemes to the
-	  text editor".
-
-2008-08-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* gtk-gui/gui.stetic,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs,
-	  gtk-gui/objects.xml: Tidy up the text editor options panels.
-	* MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs: Removed
-	  unnecessary toolbox item attributes.
-	* MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Fix spelling,
-	  sheme -> scheme.
-
-2008-08-11  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: fixed Bug 416088 -
-	  Remove Whitespace From Newlines
-
-2008-08-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed "Bug 415737 -
-	  Crash with split window".
-
-2008-08-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Worked on dom.
-
-2008-08-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/objects.xml, gtk-gui/gui.stetic,
-	  MonoDevelop.SourceEditor.mdp: Updated.
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Request file edit
-	  permission when the user tries to modify the document.
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Fix possible
-	  index out of range exception.
-
-2008-08-04  Aaron Bockover  <abock@gnome.org>
-
-	This commit refactors the search/replace widget to unify the code into
-	a single common widget/class; it additionally adds extensive keybinding
-	support for navigating results and improves the GTK UI/layout of the widget
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixes in place to use
-	the new merged search/replace widget
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Merged
-	Search and Replace functionality into a single widget; implemented 
-	extensive and intuitive keybinding support for navigating search results
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs: 
-	* gtk-gui/gui.stetic: Redesigned search/replace widget to be easier to
-	maintain, use proper GTK layout techniques, and icons instead of arrows
-	for better semantic and consistent meaning
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchWidget.cs:
-	* MonoDevelop.SourceEditor/SearchWidget.cs: Removed, merged above
-
-2008-08-04  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/LanguageItemWindow.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/EditActions.cs: Worked on language window
-	  tooltips
-
-2008-08-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs,
-	  gtk-gui/gui.stetic, Makefile.am, MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ClassQuickFinder.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Refactored class
-	  browser into a separate widget. Improved efficiency -- it's no
-	  longer just hidden, but is now not created unless needed. Also
-	  fixed a bug where the class browser would be shown for certain
-	  files even when disabled.
-
-2008-07-30  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: changed getparser
-	  call.
-
-2008-07-30  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: fixed "Bug 408899 -
-	  Code templates expanded in comments".
-
-2008-07-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Restore error
-	  underlining functionality.
-
-2008-07-29  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Use folding regions
-	  from the CompilationUnit. Restores folding for ASP.NET documents
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs,
-	  MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Translated
-	  old code to new dom.
-
-2008-07-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Don't escape file names
-	  for VFS here. It is done in the platform service.
-
-2008-07-27  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs,
-	  MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs,
-	  MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/LanguageItemWindow.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on code
-	  completion/new dom.
-
-=======
-2008-07-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Don't escape file names
-	  for VFS here. It is done in the platform service.
-
->>>>>>> .merge-right.r109767
-2008-07-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs: Make sure no rows are
-	  selected the first time the value tree is shown.
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track api changes.
-
-2008-07-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs,
-	  MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Track api
-	  changes.
-
-2008-07-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/DebugValueWindow.cs: Show and hide
-	  scrollbars when needed. Set the window to modal mode when the user
-	  starts editing a value. In this way keyboard events will be
-	  directed to this popup window instead of the editor.
-	* MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs: Set
-	  tooltip alignment.
-	* MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Implemented
-	  basic expression scanner. Use the selection as debug expression if
-	  there is something selected.
-
-2008-07-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am, MonoDevelop.SourceEditor.addin.xml,
-	  MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/DebugValueWindow.cs,
-	  MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs: Initial
-	  implementation of debug tooltips. It still has some window sizing
-	  and editing issues.
-
-2008-07-06  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: Added
-	  support for custom styles and modes.
-
-2008-07-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug 402202 -
-	  The line number at the bottom of MD is wrong when code is folded'.
-
-2008-07-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: fixed Bug 405930 -
-	  FoldingRegions in compilation units are all folded by default
-
-2008-07-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/gui.stetic, Makefile.am, MonoDevelop.SourceEditor.addin.xml,
-	  MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/DebugValueWindow.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/LanguageItemTooltipProvider.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Moved tooltip
-	  support to Mono.TextEditor. Implemented tooltip providers for
-	  language item documentation and compilation errors.
-
-2008-07-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track api changes.
-
-2008-07-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor.addin.xml: Add add-in dependency.
-
-2008-07-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  Makefile.am, MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Use new text markers
-	  defined in MD.Debugger. Properly fire LineCountChanged event.
-
-2008-06-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Don't add folding
-	  regions for one-line classes, properties and methods.
-
-2008-06-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug 402368 -
-	  SourceEditorWidget+Error.RemoveFromLine throws uncaught exception'
-
-2008-06-23  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Added tab to
-	  reindent option.
-
-2008-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Moved logic for
-	  getting the system font from Font to FontName. In this way it is
-	  possible to make copies of options objects and get the name copied.
-
-2008-06-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Track api changes.
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Moved initial
-	  options loading to TextEditor.
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Remove debug code.
-
-2008-06-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: fixed font name
-	  resolving.
-
-2008-06-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug 393408 -
-	  Exception in ParseInformationUpdaterWorkerThread'.
-
-2008-06-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: fixed 'Bug 382403 - Find
-	  moves current position in all files'.
-
-2008-06-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Another
-	  workaround for gtk# bug #398929.
-
-2008-06-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SearchWidget.cs: Workaround for gtk# bug
-	  #398929.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/gui.stetic, MonoDevelop.SourceEditor.addin.xml: Bump MD
-	  version.
-
-2008-06-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Use the OnDestroyed event instead of Dispose, since with the latest
-	  changes in gtk#, Dispose is not called anymore when a widget is
-	  destroyed.
-
-2008-05-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fix search issue with
-	  the ITextIterator implementation. The iterator should wrap around
-	  the end of the document if the initial position is not 0.
-
-2008-05-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed dispose source
-	  editor widget bug.
-
-2008-05-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Added new dom & new
-	  class browser.
-
-2008-05-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Dispose() is called
-	  after the widget is destroyed. There is no need to explicitely
-	  destroy child widgets since destroying the parent widgets destroys
-	  all children.
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Don't explicitelly call
-	  widget.Dispose, since Destroy already calls it.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: New project model
-	  changes.
-
-2008-05-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Name the editor's
-	  ViewContent.
-
-2008-05-20  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug 384665 -
-	  Gtk-critical showed in console'.
-
-2008-05-20  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed 'Bug 385457 -
-	  Folding in the middle of a method'.
-
-2008-05-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Change ITextToolboxNode
-	  API so that nodes have more control over when they're shown.
-
-2008-05-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track API.
-
-2008-05-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am, MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Show the current
-	  execution location when debugging. Show breakpoints.
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Use the new
-	  UnderlineMarker.
-
-2008-05-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: Use platform
-	  service to determine whether a mimetype is text.
-
-2008-05-08  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed 'Bug 387448 -
-	  New text editor always show same value for "col" and "ch"'
-
-2008-05-07  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Enable support for
-	  ITextToolboxNodes.
-
-2008-05-06  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Trap and report
-	  errors from the text editor extension chain.
-
-2008-05-06  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: implemented Bug 383067 -
-	  Find/Replace Bar in managed editor should support regular
-	  expression find/replace
-
-2008-05-06  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Worked on regex search.
-
-2008-05-02  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/EditActions.cs: fixed Bug 383946 – Text
-	  editor deletes "matching" braces
-
-2008-04-30  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Fixed null
-	  reference when typing.
-
-2008-04-24  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Wrap info comments
-	  if they are wider than the screen, and move them inwards if they 
-	  extend offscreen.
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Use TooltipWindow and
-	  FixedWidthWrapLabel.
-
-2008-04-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs: Attempt to fix
-	  major "Bug 382141 - ALL keypresses are intepreted as newlines" by
-	  reworking input method context handling.
-
-2008-04-21  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: fixed keyboard
-	  input.
-
-2008-04-16  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Track API change.
-	  Remove char code translation hack.
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Break up overly long
-	  line.
-
-2008-04-16  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Removed work
-	  around.
-
-2008-04-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: Handle mime
-	  types with xml subtype.
-
-2008-04-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Track API.
-
-2008-04-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs:
-	  Use a fontbutton instead of a fontselection. Makes UI more compact
-	  and gets rid of a failed GTK critical assert.
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.SearchWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Fix the pop up menu
-	  position relative to the button rather than the mouse pointer.
-	* gtk-gui/gui.stetic, MonoDevelop.SourceEditor.mdp: Updated.
-
-2008-04-10  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* gtk-gui/gui.stetic: Set GTK version to 2.8.3.
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Catch and log errors
-	  in worker thread to avoid crashing whole app.
-	* MonoDevelop.SourceEditor/LanguageItemWindow.cs: Make tooltips
-	  semi-transparent when Ctrl key is held down.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Added missing null
-	  check.
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Track api changes.
-
-2008-04-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs:
-	  CanCreateContentForMimeType should return only true for text files.
-
-2008-04-02  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Worked on issue
-	  "Bug 376142 - Issue with rightclick menu".
-
-2008-04-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed bug in using
-	  folding.
-
-2008-03-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Added using folding
-	  regions.
-
-2008-03-27  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed resource
-	  deallocation (the real source of the ParseInformation update bug).
-
-2008-03-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed Bug 373709 - 2
-	  Gtk-Criticals when closing source editor.
-
-2008-03-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed Bug 373056 -
-	  Random MD crash.
-
-2008-03-27  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	  Fixed Bug 373702 - Null reference errors in source editor.
-
-2008-03-21  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* gtk-gui/gui.stetic: Set target GTK# version to 2.8.
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Ignore multiple
-	  Dispose calls. Don't try to alter focus while widget is being
-	  disposed. Fixes two Gtk-Criticals.
-
-2008-03-21  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Fixed "Bug 372817 - With
-	  windows split, search always jumps to match in first window
-	  regardless of focus".
-
-2008-03-20  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Don't try to comment
-	  line if language binding is null. Fixes NRE.
-
-2008-03-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Fixed 'Bug 372256
-	  - Region wrapped when Code Folding is disabled'
-
-2008-03-18  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* gtk-gui/gui.stetic: Spelling fix.
-
-2008-03-18  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/EditActions.cs: Fixed Bug 371703 - Unable to
-	  delete {.
-
-2008-03-14  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed Bug 370134 -
-	  Replace box: can't navigate through controls using the Tab key.
-
-2008-03-14  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Search is now more
-	  interactive.
-
-2008-03-13  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/GotoLineNumberWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed Bug 370133 -
-	  When jumping to a line, caret should be placed in the middle of the
-	  window
-
-2008-03-13  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Fixed Bug 370139 - Search
-	  entry shown in red backround even if there is a match.
-
-2008-03-13  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed Bug 363634 -
-	  Quick class navigator does not work for abstract methods
-
-2008-03-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed warning.
-
-2008-03-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: added emacs find
-	  next/prev
-
-2008-03-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/objects.xml,
-	  MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor.addin.xml: Use new options dialog
-	  infrastructure.
-
-2008-03-05  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs: Window split now removes
-	  the split that doesn't have the focus. (intelligent split)
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.SearchWidget.cs: Fixed some dialogs for
-	  hig compliance.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/MarkerOperationsHandler.cs: Worked on gnome hig
-	  compliant alerts.
-
-2008-03-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Improved threading.
-
-2008-03-03  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs: Added some worker
-	  threads.
-
-2008-03-03  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Added code metrics start.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Refactored content
-	  interfaces
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Added command for
-	  switching between splits.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Worked on quick finder
-	  tooltips.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Added zoom commands to
-	  main menu.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/MarkerOperationsHandler.cs: Text editor now
-	  reacts on context sensitive menus display (Shift+F10) and  Ctrl+F1 shows
-	  the tooltip.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed "Bug 365840 -
-	  Editor should have the focus after switching documents".
-
-2008-02-28  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug 365453 -
-	  Exception when attempting to save newly created file (not as part of a
-	  project)".
-
-2008-02-28  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed "Bug 365624 - Widget
-	  toolbox are shown unsorted".
-
-2008-02-28  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs: Worked on
-	  search&replace. (Bug 365439 - Replace usability issues)
-
-2008-02-28  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Fixed Bug 365570 - Crash
-	  in the editor
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on category support
-	  for the toolbox service.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Automatically unfold
-	  regions when you jump to them.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.SourceEditor/SourceEditorWidget.cs:
-	  Refactored status bar.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on undo.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: No longer setting caret
-	  position on right click on selection.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs: Changed combobox sizing
-	  a bit.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Fixed Bug 364192 - Right
-	  click should place the caret before showing context menu.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Some changes for slight
-	  change in the text editor interface.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Added some safety checks.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed status bar - worked
-	  on region combo.
-
-2008-02-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Cosmetic fix.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Search error removed, when
-	  pattern is empty
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: swapped search wrap
-	  messages.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/GotoLineNumberWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Improved search (user
-	  recognizes if pattern is not found). Set some status bar messages.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Fixed Bug 363983 -
-	  Tooltip does not hide when goto dialog shows.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: toolbox drag from now works.
-
-2008-02-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Properly check if the
-	  editor was the last focused widget.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Changed clipboard ring
-	  handling of duplicate items.
-
-2008-02-22  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/objects.xml, gtk-gui/gui.stetic, Makefile.am,
-	  MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on clipboard ring
-	  and completion window now closes when switching the desktop.
-
-2008-02-21  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Fixed Bug 363327 - Too
-	  many undo steps needed to remove a new line.
-
-2008-02-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Enable clipboard and
-	  undo commands only when the editor window has the focus.
-
-2008-02-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Add binding for delete
-	  command, so the delete action will work even if the the delete command
-	  is bound to the delete key.
-
-2008-02-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: fixed little comment issue.
-
-2008-02-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixing file changed bug
-	  (with new files).
-
-2008-02-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.SearchWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs,
-	  gtk-gui/gui.stetic: Use buttons without relief for the search/replace
-	  widgets.
-
-2008-02-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed toggle code comment
-	  bug.
-
-2008-02-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed comment/uncomment
-	  code.
-
-2008-02-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed Bug 362889 - Error
-	  underlining not properly redrawn.
-
-2008-02-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: fixed some gdk criticals
-	  caused by an too early OptionsChanged event.
-
-2008-02-19  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Worked on selection.
-
-2008-02-18  Marcos David Marín Amador <MarcosMarin@gmail.com> 
-
-	* MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Small workaround to be able to
-	  build in mono 1.2.4 (mono 1.2.4 ignores usings in anon delegates).
-
-2008-02-18  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed Bug 362692 - Undoing
-	  all changes should clear the modified flag of the editor.
-
-2008-02-18  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Implemented mouse wheel
-	  zoom.
-
-2008-02-18  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Fixed find next selection
-	  update.
-
-2008-02-18  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.SearchWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: replace/search patterns are
-	  now static.
-
-2008-02-18  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed file system watcher.
-
-2008-02-17  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/GotoLineNumberWidget.cs: Fixed goto line number
-	  relative jump.
-
-2008-02-17  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Worked on search options.
-
-2008-02-17  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.SearchWidget.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/GotoLineNumberWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/EditActions.cs,
-	  MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs,
-	  MonoDevelop.SourceEditor/SearchWidget.cs: Worked on search and replace.
-
-2008-02-15  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs: Ruler can
-	  now be set up to column 1024.
-
-2008-02-15  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/MarkerOperationsHandler.cs: Refactored text
-	  editor.
-
-2008-02-15  Geoff Norton  <gnorton@novell.com>
-
-	* MonoDevelop.SourceEditor.mdp: Remove the gnome-sharp dependecny.
-	* Makefile.am: Remove the gnome-sharp dependecny.
-
-2008-02-15  Geoff Norton  <gnorton@novell.com>:
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Disable GnomePrint so that
-	we can work on systems that dont have it.  TODO: Rewrite in GtkPrint.
-
-2008-02-15  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs,
-	  MonoDevelop.SourceEditor/MarkerOperationsHandler.cs,
-	  MonoDevelop.SourceEditor/EditActions.cs,
-	  MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: Refactored text
-	  editor.
-
-2008-02-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* SourceEditorWidget.cs: Add workaround for gmcs 1.2.4 bug. 
-
-2008-02-14  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.SourceEditor.mdp: Fix dist.
-
-2008-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Use new RunAction method
-	  to execute editor actions. Added missing commands.
-
-2008-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Bind MonoDevelop
-	  shortcuts to editor actions.
-
-2008-02-14  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor.addin.xml,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs,
-	  MonoDevelop.SourceEditor/MarkerOperationsHandler.cs,
-	  MonoDevelop.SourceEditor/SourceEditorCommands.cs: Urls inside the text
-	  editor can now be opened using the context menu.
-
-2008-02-14  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Fixed warning.
-
-2008-02-14  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/gui.stetic, MonoDevelop.SourceEditor/SourceEditorView.cs: Changed
-	  delete call.
-
-2008-02-13  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Changed delete action.
-
-2008-02-12  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs, Makefile.am,
-	  MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Worked on semantic
-	  highlighting - properties can now be shown as italic. (Enable it in the
-	  syntax highlighting panel)
-
-2008-02-12  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Improved auto insert
-	  bracket.
-
-2008-02-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Some changes for the
-	  text editor.
-
-2008-02-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Optimized/Refactored the
-	  text editor.
-
-2008-02-11  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed a bug caused by
-	  performance optimization.
-
-2008-02-10  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed Bug 360411 - Problems
-	  in Code Completion.
-
-2008-02-09  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Changes for overwrite
-	  mode.
-
-2008-02-08  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs:
-	  Changed the highlighting panel.
-
-2008-02-08  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: TextChange is now fired.
-
-2008-02-08  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed highlighting
-	  bug/code navigator combos.
-
-2008-02-08  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed sizing bug.
-
-2008-02-07  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Color styles are now in
-	  options.
-
-2008-02-06  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  Makefile.am, MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on printing
-
-2008-02-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Added some folding
-	  commands.
-
-2008-02-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Improved folding behavior.
-
-2008-02-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor.addin.xml: Worked on text editor context menu.
-
-2008-02-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor.addin.xml,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Converted
-	  comment/uncomment to the more common toggle comment logic.
-
-2008-02-05  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: #region ... #endregion is
-	  now folded per default.
-
-2008-02-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs: Fixed
-	  highlighting panel.
-
-2008-02-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorOptions.cs: Implemented bracket
-	  matching.
-
-2008-02-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/EditActions.cs: Bug 354129 - Auto add second
-	  brackets, quotation mark
-
-2008-02-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented Bug 323946 -
-	  Undo/Redo functionality are not context sensitive.
-
-2008-02-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed reload bug.
-
-2008-02-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Filtered out body less
-	  methods in folding (abstract methods,  methods declared in interfaces).
-
-2008-02-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Comment/Uncomment and
-	  Indent/Unindent commands should now work as expected.
-
-2008-02-03  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented ISplittable.
-
-2008-02-02  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed code completion bug.
-
-2008-02-02  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Added some safety checks.
-
-2008-02-02  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs: Added bounds check for
-	  error underlining.
-
-2008-02-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed insert/delete text
-	  caret offsets.
-
-2008-02-01  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/objects.xml, gtk-gui/gui.stetic, Makefile.am,
-	  MonoDevelop.SourceEditor.mdp: Added makefile.
-
-2008-02-01  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on folding.
-
-2008-01-31  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs: Some changes
-	  due to lazy loading.
-
-2008-01-31  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
-	  MonoDevelop.SourceEditor.addin.xml,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs: Worked on
-	  context menu.
-
-2008-01-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on bookmark
-	  commands.
-
-2008-01-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: AutoInsert template
-	  option now works.
-
-2008-01-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: AutoInsert template
-	  option now works.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.SourceEditor.addin.xml: Update MD version.
-
-2008-01-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: AutoInsert template
-	  option now works.
-
-2008-01-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Added auto insert
-	  bracket option.
-
-2008-01-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Added auto insert
-	  bracket option.
-
-2008-01-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Added property change
-	  event.
-
-2008-01-25  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Added property change
-	  event.
-
-2008-01-24  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Worked on error
-	  underlining.
-
-2008-01-23  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/EditActions.cs: Worked on code templates.
-
-2008-01-22  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
-	  gtk-gui/gui.stetic, ChangeLog,
-	  MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs: Worked on style panel.
-
-2008-01-22  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
-	  gtk-gui/objects.xml,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs,
-	  gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs,
-	  MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs,
-	  MonoDevelop.SourceEditor.addin.xml, MonoDevelop.SourceEditor.mdp,
-	  MonoDevelop.SourceEditor/SourceEditorWidget.cs,
-	  MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
-	  MonoDevelop.SourceEditor/SourceEditorView.cs,
-	  MonoDevelop.SourceEditor/SourceEditorOptions.cs,
-	  MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs,
-	  MonoDevelop.SourceEditor/LanguageItemWindow.cs: Worked on text editor
-	  option panels.
-
-2008-01-21  Mike Krüger <mkrueger@novell.com> 
-
-	* ExtendibleTextEditor.cs, SourceEditorView.cs,
-	  MonoDevelop.SourceEditor.addin.xml, MonoDevelop.SourceEditor.mdp: Worked
-	  on context menu.
-
-2008-01-21  Geoff Norton  <gnorton@novell.com>
-
-	* MonoDevelop.SourceEditor.mdp: Remove hard dependency on Gnome#
-	* SourceEditorView.cs: Get the MimeType from the PlatformService rather
-	than directly from Gnome.Vfs.
-
-2008-01-21  Mike Krüger <mkrueger@novell.com> 
-
-	* SourceEditorWidget.cs, ExtendibleTextEditor.cs, SourceEditorView.cs:
-	  Worked on search commands.
-
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs
deleted file mode 100644
index c9a574ac82..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// TemplateCodon.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-using System.IO;
-using System;
-using System.Xml;
-
-using Mono.Addins;
-using Mono.TextEditor.Highlighting;
-
-namespace MonoDevelop.SourceEditor.Extension
-{
-	[ExtensionNode (Description="A template for color and syntax shemes.")]
-	public class TemplateCodon : ExtensionNode, Mono.TextEditor.Highlighting.IStreamProvider
-	{
-		[NodeAttribute("resource", "Name of the resource where the template is stored.")]
-		string resource;
-		
-		[NodeAttribute("file", "Name of the file where the template is stored.")]
-		string file;
-		
-		public TemplateCodon ()
-		{
-			resource = file = null;
-		}
-		
-		public Stream Open ()
-		{
-			Stream stream;
-			if (!string.IsNullOrEmpty (file)) {
-				stream = File.OpenRead (Addin.GetFilePath (file));
-			} else if (!string.IsNullOrEmpty (resource)) {
-				stream = Addin.GetResource (resource);
-				if (stream == null)
-					throw new ApplicationException ("Template " + resource + " not found");
-			} else {
-				throw new InvalidOperationException ("Template file or resource not provided");
-			}
-			
-			return stream;
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateExtensionNodeLoader.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateExtensionNodeLoader.cs
deleted file mode 100644
index 8989591d6f..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateExtensionNodeLoader.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// TemplateExtensionNodeLoader.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using Mono.TextEditor.Highlighting;
-using Mono.Addins;
-
-namespace MonoDevelop.SourceEditor.Extension
-{
-	public static class TemplateExtensionNodeLoader
-	{
-		static bool initialized = false;
-		
-		public static void Init ()
-		{
-			if (initialized)
-				return;
-			initialized = true;
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/SourceEditor2/SyntaxModes", OnSyntaxModeExtensionChanged);
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/SourceEditor2/Styles", OnStylesExtensionChanged);
-		}
-
-		static void OnSyntaxModeExtensionChanged (object s, ExtensionNodeEventArgs args)
-		{
-			TemplateCodon codon = (TemplateCodon)args.ExtensionNode;
-			if (args.Change == ExtensionChange.Add) {
-				Mono.TextEditor.Highlighting.SyntaxModeService.AddSyntaxMode (codon);
-			} else {
-				Mono.TextEditor.Highlighting.SyntaxModeService.RemoveSyntaxMode (codon);
-			}
-		}
-		
-		static void OnStylesExtensionChanged (object s, ExtensionNodeEventArgs args)
-		{
-			TemplateCodon codon = (TemplateCodon)args.ExtensionNode;
-			if (args.Change == ExtensionChange.Add) {
-				Mono.TextEditor.Highlighting.SyntaxModeService.AddStyle (codon);
-			} else {
-				Mono.TextEditor.Highlighting.SyntaxModeService.RemoveStyle (codon);
-			}
-		}
-		
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentEngine.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentEngine.cs
deleted file mode 100644
index 18be36da2b..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentEngine.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-//
-// JSonTextEditorExtension.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.CSharp;
-using Mono.TextEditor;
-using System.Text;
-using ICSharpCode.NRefactory;
-
-namespace MonoDevelop.SourceEditor.JSon
-{
-	class JSonIndentEngine : IStateMachineIndentEngine
-	{
-		TextEditorData data;
-		int offset, line, column;
-		internal Indent thisLineIndent, nextLineIndent;
-		StringBuilder currentIndent;
-		char previousNewline = '\0';
-		char previousChar = '\0';
-		bool isLineStart;
-		bool isInString;
-
-		public JSonIndentEngine (TextEditorData data)
-		{
-			this.data = data;
-			Reset ();
-		}
-
-		#region IStateMachineIndentEngine implementation
-
-		public IStateMachineIndentEngine Clone ()
-		{
-			return (IStateMachineIndentEngine)MemberwiseClone ();
-		}
-
-		public bool IsInsidePreprocessorDirective {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsidePreprocessorComment {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsideStringLiteral {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsideVerbatimString {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsideCharacter {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsideString {
-			get {
-				return isInString;
-			}
-		}
-
-		public bool IsInsideLineComment {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsideMultiLineComment {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsideDocLineComment {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsideComment {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsideOrdinaryComment {
-			get {
-				return false;
-			}
-		}
-
-		public bool IsInsideOrdinaryCommentOrString {
-			get {
-				return false;
-			}
-		}
-
-		public bool LineBeganInsideVerbatimString {
-			get {
-				return false;
-			}
-		}
-
-		public bool LineBeganInsideMultiLineComment {
-			get {
-				return false;
-			}
-		}
-
-		#endregion
-
-		public static ICSharpCode.NRefactory.CSharp.TextEditorOptions CreateNRefactoryTextEditorOptions (TextEditorData doc)
-		{
-			return new ICSharpCode.NRefactory.CSharp.TextEditorOptions {
-				TabsToSpaces = doc.TabsToSpaces,
-				TabSize = doc.Options.TabSize,
-				IndentSize = doc.Options.IndentationSize,
-				ContinuationIndent = doc.Options.IndentationSize,
-				LabelIndent = -doc.Options.IndentationSize,
-				EolMarker = doc.EolMarker,
-				IndentBlankLines = doc.Options.IndentStyle != IndentStyle.Virtual,
-				WrapLineLength = doc.Options.RulerColumn
-			};
-		}
-
-		#region IDocumentIndentEngine implementation
-
-		public void Push (char ch)
-		{
-			var isNewLine = NewLine.IsNewLine (ch);
-			if (!isNewLine) {
-				if (ch == '"')
-					isInString = !IsInsideString;
-				if (ch == '{' || ch == '[') {
-					nextLineIndent.Push (IndentType.Block);
-				} else if (ch == '}' || ch == ']') {
-					if (thisLineIndent.Count > 0)
-						thisLineIndent.Pop ();
-					if (nextLineIndent.Count > 0)
-						nextLineIndent.Pop ();
-				} 
-			} else {
-				if (ch == NewLine.LF && previousChar == NewLine.CR) {
-					offset++;
-					previousChar = ch;
-					return;
-				}
-			}
-
-			offset++;
-			if (!isNewLine) {
-				previousNewline = '\0';
-
-				isLineStart &= char.IsWhiteSpace (ch);
-
-				if (isLineStart)
-					currentIndent.Append (ch);
-
-				if (ch == '\t') {
-					var nextTabStop = (column - 1 + data.Options.IndentationSize) / data.Options.IndentationSize;
-					column = 1 + nextTabStop * data.Options.IndentationSize;
-				} else {
-					column++;
-				}
-			} else {
-				previousNewline = ch;
-				currentIndent.Length = 0;
-				isLineStart = true;
-				column = 1;
-				line++;
-				thisLineIndent = nextLineIndent.Clone ();
-			}
-			previousChar = ch;
-		}
-
-		public void Reset ()
-		{
-			offset = 0;
-			line = column = 1;
-			thisLineIndent = new Indent (CreateNRefactoryTextEditorOptions (data));
-			nextLineIndent = new Indent (CreateNRefactoryTextEditorOptions (data));
-			currentIndent = new StringBuilder ();
-			previousNewline = '\0';
-			previousChar = '\0';
-			isLineStart = true;
-			isInString = false;
-		}
-
-		public void Update (int offset)
-		{
-			if (Offset > offset)
-				Reset ();
-
-			while (Offset < offset) {
-				Push (Document.GetCharAt (Offset));
-			}
-		}
-
-		IDocumentIndentEngine IDocumentIndentEngine.Clone ()
-		{
-			return Clone ();
-		}
-
-		public ICSharpCode.NRefactory.Editor.IDocument Document {
-			get {
-				return data.Document;
-			}
-		}
-
-		public string ThisLineIndent {
-			get {
-				return thisLineIndent.IndentString;
-			}
-		}
-
-		public string NextLineIndent {
-			get {
-				return nextLineIndent.IndentString;
-			}
-		}
-
-		public string CurrentIndent {
-			get {
-				return currentIndent.ToString ();
-			}
-		}
-
-		public bool NeedsReindent {
-			get {
-				return ThisLineIndent != CurrentIndent;
-			}
-		}
-
-		public int Offset {
-			get {
-				return offset;
-			}
-		}
-
-		public TextLocation Location {
-			get {
-				return new TextLocation (line, column);
-			}
-		}
-
-		public bool EnableCustomIndentLevels {
-			get;
-			set;
-		}
-
-		#endregion
-
-		#region ICloneable implementation
-
-		object ICloneable.Clone ()
-		{
-			return Clone ();
-		}
-
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentationTracker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentationTracker.cs
deleted file mode 100644
index 7ebfbe34fb..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonIndentationTracker.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// JSonTextEditorExtension.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using Mono.TextEditor;
-using ICSharpCode.NRefactory.CSharp;
-using System;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.SourceEditor.JSon
-{
-	class JSonIndentationTracker : IIndentationTracker
-	{
-		readonly TextEditorData data;
-		readonly CacheIndentEngine stateTracker;
-
-		public JSonIndentationTracker(TextEditorData data, CacheIndentEngine stateTracker)
-		{
-			this.data = data;
-			this.stateTracker = stateTracker;
-		}
-
-		string GetIndentationString (DocumentLocation loc)
-		{
-			var line = data.Document.GetLine (loc.Line);
-			if (line == null)
-				return "";
-			// Get context to the end of the line w/o changing the main engine's state
-			var offset = line.Offset;
-			string curIndent = line.GetIndentation (data.Document);
-			try {
-				stateTracker.Update (Math.Min (data.Length, offset + Math.Min (line.Length, loc.Column - 1)));
-				int nlwsp = curIndent.Length;
-				if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && data.Document.GetCharAt (offset + nlwsp) == '*'))
-					return stateTracker.ThisLineIndent;
-			} catch (Exception e) {
-				LoggingService.LogError ("Error while indenting at "+ loc, e); 
-			}
-			return curIndent;
-		}
-
-		#region IIndentationTracker implementation
-		public string GetIndentationString (int offset)
-		{
-			return GetIndentationString (data.OffsetToLocation (offset));
-		}
-
-		public string GetIndentationString (int lineNumber, int column)
-		{
-			return GetIndentationString (new DocumentLocation (lineNumber, column));
-		}
-
-		public int GetVirtualIndentationColumn (int offset)
-		{
-			return 1 + GetIndentationString (offset).Length;
-		}
-
-		public int GetVirtualIndentationColumn (int lineNumber, int column)
-		{
-			return 1 + GetIndentationString (lineNumber, column).Length;
-		}
-		#endregion
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonTextEditorExtension.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonTextEditorExtension.cs
deleted file mode 100644
index 5ae84fa44a..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.JSon/JSonTextEditorExtension.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// JSonTextEditorExtension.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using MonoDevelop.Ide.Gui.Content;
-using ICSharpCode.NRefactory.CSharp;
-using Gdk;
-using Mono.TextEditor;
-using System;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.CodeCompletion;
-
-namespace MonoDevelop.SourceEditor.JSon
-{
-	class JSonTextEditorExtension : TextEditorExtension
-	{
-		CacheIndentEngine stateTracker;
-
-		TextEditorData textEditorData {
-			get {
-				return document.Editor;
-			}
-		}
-
-		public override void Initialize ()
-		{
-			base.Initialize ();
-			IStateMachineIndentEngine indentEngine;
-			indentEngine = new JSonIndentEngine (document.Editor);
-			stateTracker = new CacheIndentEngine (indentEngine);
-			document.Editor.IndentationTracker = new JSonIndentationTracker (document.Editor, stateTracker);
-		}
-
-
-		public override bool KeyPress (Key key, char keyChar, ModifierType modifier)
-		{
-			var result = base.KeyPress (key, keyChar, modifier);
-
-			if (key == Key.Return) {
-				if (textEditorData.Options.IndentStyle == IndentStyle.Virtual) {
-					if (textEditorData.GetLine (textEditorData.Caret.Line).Length == 0)
-						textEditorData.Caret.Column = textEditorData.IndentationTracker.GetVirtualIndentationColumn (textEditorData.Caret.Location);
-				} else {
-					DoReSmartIndent ();
-				}
-			}
-
-			return result;
-		}
-
-		void DoReSmartIndent ()
-		{
-			DoReSmartIndent (textEditorData.Caret.Offset);
-		}
-
-		void DoReSmartIndent (int cursor)
-		{
-			SafeUpdateIndentEngine (cursor);
-			if (stateTracker.LineBeganInsideVerbatimString || stateTracker.LineBeganInsideMultiLineComment)
-				return;
-			var line = textEditorData.Document.GetLineByOffset (cursor);
-
-			// Get context to the end of the line w/o changing the main engine's state
-			var curTracker = stateTracker.Clone ();
-			try {
-				for (int max = cursor; max < line.EndOffset; max++) {
-					curTracker.Push (textEditorData.Document.GetCharAt (max));
-				}
-			} catch (Exception e) {
-				LoggingService.LogError ("Exception during indentation", e);
-			}
-
-			int pos = line.Offset;
-			string curIndent = line.GetIndentation (textEditorData.Document);
-			int nlwsp = curIndent.Length;
-			int offset = cursor > pos + nlwsp ? cursor - (pos + nlwsp) : 0;
-			if (!stateTracker.LineBeganInsideMultiLineComment || (nlwsp < line.LengthIncludingDelimiter && textEditorData.Document.GetCharAt (line.Offset + nlwsp) == '*')) {
-				// Possibly replace the indent
-				string newIndent = curTracker.ThisLineIndent;
-				int newIndentLength = newIndent.Length;
-				if (newIndent != curIndent) {
-					if (CompletionWindowManager.IsVisible) {
-						if (pos < CompletionWindowManager.CodeCompletionContext.TriggerOffset)
-							CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp;
-					}
-
-					newIndentLength = textEditorData.Replace (pos, nlwsp, newIndent);
-					textEditorData.Document.CommitLineUpdate (textEditorData.Caret.Line);
-					CompletionWindowManager.HideWindow ();
-				}
-				pos += newIndentLength;
-			} else {
-				pos += curIndent.Length;
-			}
-
-			pos += offset;
-
-			textEditorData.FixVirtualIndentation ();
-		}
-		internal void SafeUpdateIndentEngine (int offset)
-		{
-			try {
-				stateTracker.Update (offset);
-			} catch (Exception e) {
-				LoggingService.LogError ("Error while updating the indentation engine", e);
-			}
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs
index ccf1be8f63..3a49025ecf 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs
@@ -24,9 +24,11 @@
 // THE SOFTWARE.
 
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Dialogs;
 using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -46,22 +48,22 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			autoInsertBraceCheckbutton.Toggled += HandleAutoInsertBraceCheckbuttonToggled;
 		}
 		
-		public virtual Gtk.Widget CreatePanelWidget ()
+		public virtual Control CreatePanelWidget ()
 		{
 			//			this.autoInsertTemplateCheckbutton.Active  = DefaultSourceEditorOptions.Options.AutoInsertTemplates;
 			autoInsertBraceCheckbutton.Active = DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket;
 			smartSemicolonPlaceCheckbutton.Active = DefaultSourceEditorOptions.Instance.SmartSemicolonPlacement;
 			
 			tabAsReindentCheckbutton.Active = DefaultSourceEditorOptions.Instance.TabIsReindent;
-			indentationCombobox.Active = (int)DefaultSourceEditorOptions.Instance.IndentStyle;
+			indentationCombobox.Active = Math.Min (2, (int)DefaultSourceEditorOptions.Instance.IndentStyle);
 			controlLeftRightCombobox.Active = (int)DefaultSourceEditorOptions.Instance.WordNavigationStyle;
-			useViModesCheck.Active = DefaultSourceEditorOptions.Instance.UseViModes;
 			checkbuttonOnTheFlyFormatting.Active = DefaultSourceEditorOptions.Instance.OnTheFlyFormatting;
 			checkbuttonGenerateFormattingUndoStep.Active = DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep;
 
 
 			checkbuttonFormatOnSave.Active = PropertyService.Get ("AutoFormatDocumentOnSave", false);
 			checkbuttonAutoSetSearchPatternCasing.Active = PropertyService.Get ("AutoSetPatternCasing", false);
+			checkbuttonEnableSelectionSurrounding.Active = DefaultSourceEditorOptions.Instance.EnableSelectionWrappingKeys;
 			HandleAutoInsertBraceCheckbuttonToggled (null, null);
 			return this;
 		}
@@ -76,14 +78,14 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			//DefaultSourceEditorOptions.Options.AutoInsertTemplates = this.autoInsertTemplateCheckbutton.Active;
 			DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket = autoInsertBraceCheckbutton.Active;
 			DefaultSourceEditorOptions.Instance.SmartSemicolonPlacement = smartSemicolonPlaceCheckbutton.Active;
-			DefaultSourceEditorOptions.Instance.IndentStyle = (IndentStyle)indentationCombobox.Active;
+			DefaultSourceEditorOptions.Instance.IndentStyle = (MonoDevelop.Ide.Editor.IndentStyle)indentationCombobox.Active;
 			DefaultSourceEditorOptions.Instance.TabIsReindent = tabAsReindentCheckbutton.Active;
 			DefaultSourceEditorOptions.Instance.WordNavigationStyle = (WordNavigationStyle)controlLeftRightCombobox.Active;
-			DefaultSourceEditorOptions.Instance.UseViModes = useViModesCheck.Active;
 			DefaultSourceEditorOptions.Instance.OnTheFlyFormatting = checkbuttonOnTheFlyFormatting.Active;
 			DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep = checkbuttonGenerateFormattingUndoStep.Active;
 			PropertyService.Set ("AutoSetPatternCasing", checkbuttonAutoSetSearchPatternCasing.Active);
 			PropertyService.Set ("AutoFormatDocumentOnSave", checkbuttonFormatOnSave.Active);
+			DefaultSourceEditorOptions.Instance.EnableSelectionWrappingKeys = checkbuttonEnableSelectionSurrounding.Active;
 		}
 
 		public void Initialize (OptionsDialog dialog, object dataObject)
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs
index 85830f504d..f88decd359 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs
@@ -29,14 +29,15 @@ using Mono.TextEditor.Highlighting;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using Gtk;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
 	public partial class ColorShemeEditor : Gtk.Dialog
 	{
-		TextEditor textEditor;
+		MonoTextEditor textEditor;
 		ColorScheme colorSheme;
-		TreeStore colorStore = new Gtk.TreeStore (typeof (string), typeof(ColorScheme.PropertyDecsription), typeof(object));
+		TreeStore colorStore = new Gtk.TreeStore (typeof (string), typeof(ColorScheme.PropertyDescription), typeof(object));
 		string fileName;
 		HighlightingPanel panel;
 
@@ -44,8 +45,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 			this.panel = panel;
 			this.Build ();
-			textEditor = new TextEditor ();
-			textEditor.Options = DefaultSourceEditorOptions.Instance;
+			textEditor = new MonoTextEditor ();
+			textEditor.Options = new StyledSourceEditorOptions (MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance);
 			this.scrolledwindowTextEditor.Child = textEditor;
 			textEditor.ShowAll ();
 			
@@ -73,7 +74,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		void SyntaxCellRenderer (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter)
 		{
 			var renderer = (Gtk.CellRendererText)cell;
-			var data = (ColorScheme.PropertyDecsription)colorStore.GetValue (iter, 1);
+			var data = (ColorScheme.PropertyDescription)colorStore.GetValue (iter, 1);
 			string markup = GLib.Markup.EscapeText (data.Attribute.Name);
 			renderer.Markup = markup;
 		}
@@ -86,7 +87,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			Gtk.TreeIter iter;
 			if (colorStore.GetIterFirst (out iter)) {
 				do {
-					var data = (ColorScheme.PropertyDecsription)colorStore.GetValue (iter, 1);
+					var data = (ColorScheme.PropertyDescription)colorStore.GetValue (iter, 1);
 					var style = colorStore.GetValue (iter, 2);
 					data.Info.SetValue (sheme, style, null);
 				} while (colorStore.IterNext (ref iter));
@@ -100,8 +101,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 				if (editor == null)
 					continue;
 				doc.UpdateParseDocument ();
-				editor.Parent.TextViewMargin.PurgeLayoutCache ();
-				editor.Document.CommitUpdateAll ();
+//				editor.Parent.TextViewMargin.PurgeLayoutCache ();
+//				editor.Document.CommitUpdateAll ();
 			}
 		
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionAppearancePanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionAppearancePanel.cs
index c51e0406d2..46e5157abb 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionAppearancePanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionAppearancePanel.cs
@@ -24,8 +24,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -50,12 +53,11 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 		}
 
-		Gtk.Widget IOptionsPanel.CreatePanelWidget ()
+		Control IOptionsPanel.CreatePanelWidget ()
 		{
-			spinbutton1.Value = CompletionTextEditorExtension.CompletionListRows;
-			filterByBrowsableCheckbutton.Active = CompletionTextEditorExtension.FilterCompletionListByEditorBrowsable;
-			normalOnlyRadiobutton.Active = !CompletionTextEditorExtension.IncludeEditorBrowsableAdvancedMembers;
-			includeAdvancedRadiobutton.Active = CompletionTextEditorExtension.IncludeEditorBrowsableAdvancedMembers;
+			filterByBrowsableCheckbutton.Active = IdeApp.Preferences.FilterCompletionListByEditorBrowsable;
+			normalOnlyRadiobutton.Active = !IdeApp.Preferences.IncludeEditorBrowsableAdvancedMembers;
+			includeAdvancedRadiobutton.Active = IdeApp.Preferences.IncludeEditorBrowsableAdvancedMembers;
 			FilterToggled (this, EventArgs.Empty);
 			return this;
 		}
@@ -72,9 +74,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 
 		void IOptionsPanel.ApplyChanges ()
 		{
-			CompletionTextEditorExtension.CompletionListRows.Value = spinbutton1.ValueAsInt;
-			CompletionTextEditorExtension.FilterCompletionListByEditorBrowsable.Value = filterByBrowsableCheckbutton.Active;
-			CompletionTextEditorExtension.IncludeEditorBrowsableAdvancedMembers.Value = includeAdvancedRadiobutton.Active;
+			IdeApp.Preferences.FilterCompletionListByEditorBrowsable.Value = filterByBrowsableCheckbutton.Active;
+			IdeApp.Preferences.IncludeEditorBrowsableAdvancedMembers.Value = includeAdvancedRadiobutton.Active;
 		}
 
 		#endregion
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs
index 175d8528ed..7ee88faaa1 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionCharactersPanel.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 using System;
 using Xwt;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide.CodeCompletion;
@@ -32,7 +33,7 @@ using System.Collections.Generic;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
-	public class CompletionCharactersPanel : VBox, IOptionsPanel
+	class CompletionCharactersPanel : VBox, IOptionsPanel
 	{
 		ListView list;
 		ListStore store;
@@ -87,7 +88,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			}
 		}
 
-		Gtk.Widget IOptionsPanel.CreatePanelWidget ()
+		Control IOptionsPanel.CreatePanelWidget ()
 		{
 			return (Gtk.Widget)Xwt.Toolkit.CurrentEngine.GetNativeWidget (this);
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs
index 5586c8edf8..86d2a271bc 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/CompletionOptionsPanel.cs
@@ -24,8 +24,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -53,16 +57,16 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 		}
 
-		Gtk.Widget IOptionsPanel.CreatePanelWidget ()
+		Control IOptionsPanel.CreatePanelWidget ()
 		{
 			autoCodeCompletionCheckbutton.Active = DefaultSourceEditorOptions.Instance.EnableAutoCodeCompletion;
-			showImportsCheckbutton.Active = CompletionTextEditorExtension.AddImportedItemsToCompletionList;
-			includeKeywordsCheckbutton.Active = CompletionTextEditorExtension.IncludeKeywordsInCompletionList;
-			includeCodeSnippetsCheckbutton.Active = CompletionTextEditorExtension.IncludeCodeSnippetsInCompletionList;
+			showImportsCheckbutton.Active = IdeApp.Preferences.AddImportedItemsToCompletionList;
+			includeKeywordsCheckbutton.Active = IdeApp.Preferences.IncludeKeywordsInCompletionList;
+			includeCodeSnippetsCheckbutton.Active = IdeApp.Preferences.IncludeCodeSnippetsInCompletionList;
 
-			insertParenthesesCheckbutton.Active = CompletionTextEditorExtension.AddParenthesesAfterCompletion;
-			openingRadiobutton.Active = CompletionTextEditorExtension.AddOpeningOnly;
-			bothRadiobutton.Active = !CompletionTextEditorExtension.AddOpeningOnly;
+			insertParenthesesCheckbutton.Active = IdeApp.Preferences.AddParenthesesAfterCompletion;
+			openingRadiobutton.Active = IdeApp.Preferences.AddOpeningOnly;
+			bothRadiobutton.Active = !IdeApp.Preferences.AddOpeningOnly;
 
 			InsertParensToggled (this, EventArgs.Empty);
 			AutomaticCompletionToggled (this, EventArgs.Empty);
@@ -87,12 +91,12 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		void IOptionsPanel.ApplyChanges ()
 		{
 			DefaultSourceEditorOptions.Instance.EnableAutoCodeCompletion = autoCodeCompletionCheckbutton.Active;
-			CompletionTextEditorExtension.AddImportedItemsToCompletionList.Value = showImportsCheckbutton.Active;
-			CompletionTextEditorExtension.IncludeKeywordsInCompletionList.Value = includeKeywordsCheckbutton.Active;
-			CompletionTextEditorExtension.IncludeCodeSnippetsInCompletionList.Value = includeCodeSnippetsCheckbutton.Active;
+			IdeApp.Preferences.AddImportedItemsToCompletionList.Value = showImportsCheckbutton.Active;
+			IdeApp.Preferences.IncludeKeywordsInCompletionList.Value = includeKeywordsCheckbutton.Active;
+			IdeApp.Preferences.IncludeCodeSnippetsInCompletionList.Value = includeCodeSnippetsCheckbutton.Active;
 
-			CompletionTextEditorExtension.AddParenthesesAfterCompletion.Value = insertParenthesesCheckbutton.Active;
-			CompletionTextEditorExtension.AddOpeningOnly.Value = openingRadiobutton.Active;
+			IdeApp.Preferences.AddParenthesesAfterCompletion.Value = insertParenthesesCheckbutton.Active;
+			IdeApp.Preferences.AddOpeningOnly.Value = openingRadiobutton.Active;
 		}
 
 		#endregion
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs
index 17a3c6a6cc..ef53e55e75 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs
@@ -25,8 +25,10 @@
 
 using System;
 using MonoDevelop.Ide.Gui.Dialogs;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Content; 
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Editor; 
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -42,7 +44,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			this.comboboxLineEndings.Active = (int)DefaultSourceEditorOptions.Instance.LineEndingConversion;
 		}
 
-		public virtual Gtk.Widget CreatePanelWidget ()
+		public virtual Control CreatePanelWidget ()
 		{
 			this.foldingCheckbutton.Active = DefaultSourceEditorOptions.Instance.ShowFoldMargin;
 			this.foldregionsCheckbutton.Active = DefaultSourceEditorOptions.Instance.DefaultRegionsFolding;
@@ -58,7 +60,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 			DefaultSourceEditorOptions.Instance.DefaultRegionsFolding = this.foldregionsCheckbutton.Active;
 			DefaultSourceEditorOptions.Instance.DefaultCommentFolding = this.foldCommentsCheckbutton.Active;
-			DefaultSourceEditorOptions.Instance.LineEndingConversion = (LineEndingConversion)this.comboboxLineEndings.Active;
+			DefaultSourceEditorOptions.Instance.LineEndingConversion = (MonoDevelop.Ide.Editor.LineEndingConversion)this.comboboxLineEndings.Active;
 			if (DefaultSourceEditorOptions.Instance.ShowFoldMargin != this.foldingCheckbutton.Active) {
 				DefaultSourceEditorOptions.Instance.ShowFoldMargin = this.foldingCheckbutton.Active;
 				HighlightingPanel.UpdateActiveDocument ();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
index 013f184cb4..26aa51f03f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
@@ -32,6 +32,8 @@ using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Dialogs;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -57,9 +59,13 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			col.SetAttributes (crtext, "markup", 0);
 			styleTreeview.AppendColumn (col);
 			styleTreeview.Model = styleStore;
-			// ensure that custom styles are loaded.
-			new SourceEditorDisplayBinding ();
 			schemeName = DefaultSourceEditorOptions.Instance.ColorScheme;
+			MonoDevelop.Ide.Gui.Styles.Changed += HandleSkinChanged;
+		}
+
+		void HandleSkinChanged (object sender, EventArgs e)
+		{
+			ShowStyles ();
 		}
 		
 		protected override void OnDestroyed ()
@@ -70,6 +76,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 				styleStore.Dispose ();
 				styleStore = null;
 			}
+
+			MonoDevelop.Ide.Gui.Styles.Changed -= HandleSkinChanged;
 			base.OnDestroyed ();
 		}
 
@@ -78,7 +86,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			return String.Format ("<b>{0}</b> - {1}", GLib.Markup.EscapeText (name), GLib.Markup.EscapeText (description));
 		}
 
-		public virtual Gtk.Widget CreatePanelWidget ()
+		public virtual Control CreatePanelWidget ()
 		{
 			this.addButton.Clicked += AddColorScheme;
 			this.removeButton.Clicked += RemoveColorScheme;
@@ -142,6 +150,21 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			try {
 				error = false;
 				return Mono.TextEditor.Highlighting.SyntaxModeService.GetColorStyle (styleName);
+			} catch (StyleImportException e) {
+				error = true;
+
+				var style = Mono.TextEditor.Highlighting.SyntaxModeService.DefaultColorStyle.Clone ();
+				style.Name = styleName;
+				switch (e.Reason) {
+				case StyleImportException.ImportFailReason.NoValidColorsFound:
+					style.Description = GettextCatalog.GetString ("No valid colors found inside the settings. (Maybe only theme is defined - check <FontsAndColors> node?)");
+					break;
+				default:
+					style.Description = GettextCatalog.GetString ("Loading error");
+					break;
+				}
+				style.FileName = Mono.TextEditor.Highlighting.SyntaxModeService.GetFileName (styleName);
+				return style;
 			} catch (Exception e) {
 				LoggingService.LogError ("Error while loading color style " + styleName, e);
 				error = true;
@@ -158,9 +181,10 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 			styleStore.Clear ();
 			bool error;
-			TreeIter selectedIter = styleStore.AppendValues (GetMarkup (GettextCatalog.GetString ("Default"), GettextCatalog.GetString ("The default color scheme.")), LoadStyle ("Default", out error));
+			var defaultStyle = LoadStyle (MonoDevelop.Ide.Editor.Highlighting.ColorScheme.DefaultColorStyle, out error);
+			TreeIter selectedIter = styleStore.AppendValues (GetMarkup (defaultStyle.Name, defaultStyle.Description), defaultStyle);
 			foreach (string styleName in Mono.TextEditor.Highlighting.SyntaxModeService.Styles) {
-				if (styleName == "Default")
+				if (styleName == MonoDevelop.Ide.Editor.Highlighting.ColorScheme.DefaultColorStyle)
 					continue;
 				var style = LoadStyle (styleName, out error);
 				string name = style.Name ?? "";
@@ -178,7 +202,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 				if (style.Name == DefaultSourceEditorOptions.Instance.ColorScheme)
 					selectedIter = iter;
 			}
-			styleTreeview.Selection.SelectIter (selectedIter); 
+			if (styleTreeview.Selection != null)
+				styleTreeview.Selection.SelectIter (selectedIter); 
 		}
 		
 		void RemoveColorScheme (object sender, EventArgs args)
@@ -189,8 +214,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			var sheme = (ColorScheme)this.styleStore.GetValue (selectedIter, 1);
 			
 			string fileName = sheme.FileName;
-			
-			if (fileName != null && fileName.StartsWith (SourceEditorDisplayBinding.SyntaxModePath, StringComparison.Ordinal)) {
+
+			if (fileName != null && fileName.StartsWith (MonoDevelop.Ide.Editor.TextEditorDisplayBinding.SyntaxModePath, StringComparison.Ordinal)) {
 				Mono.TextEditor.Highlighting.SyntaxModeService.Remove (sheme);
 				File.Delete (fileName);
 				ShowStyles ();
@@ -226,17 +251,24 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			if (!dialog.Run ())
 				return;
 
-			string newFileName = SourceEditorDisplayBinding.SyntaxModePath.Combine (dialog.SelectedFile.FileName);
+			string newFileName = MonoDevelop.Ide.Editor.TextEditorDisplayBinding.SyntaxModePath.Combine (dialog.SelectedFile.FileName);
 
 			bool success = true;
 			try {
+				if (File.Exists (newFileName)) {
+					MessageService.ShowError (string.Format (GettextCatalog.GetString ("Highlighting with the same name already exists. Remove {0} first."), System.IO.Path.GetFileNameWithoutExtension (newFileName)));
+					return;
+				}
+
 				File.Copy (dialog.SelectedFile.FullPath, newFileName);
 			} catch (Exception e) {
 				success = false;
 				LoggingService.LogError ("Can't copy syntax mode file.", e);
 			}
 			if (success) {
-				SourceEditorDisplayBinding.LoadCustomStylesAndModes ();
+				Mono.TextEditor.Highlighting.SyntaxModeService.LoadStylesAndModes (TextEditorDisplayBinding.SyntaxModePath);
+				MonoDevelop.Ide.Editor.Highlighting.SyntaxModeService.LoadStylesAndModes (TextEditorDisplayBinding.SyntaxModePath);
+				MonoDevelop.Ide.Editor.TextEditorDisplayBinding.LoadCustomStylesAndModes ();
 				ShowStyles ();
 			}
 		}
@@ -249,11 +281,11 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		{
 			if (IdeApp.Workbench.ActiveDocument != null) {
 				IdeApp.Workbench.ActiveDocument.UpdateParseDocument ();
-				var editor = IdeApp.Workbench.ActiveDocument.Editor;
-				if (editor != null) {
-					editor.Parent.TextViewMargin.PurgeLayoutCache ();
-					editor.Parent.QueueDraw ();
-				}
+//				var editor = IdeApp.Workbench.ActiveDocument.Editor;
+//				if (editor != null) {
+//					editor.Parent.TextViewMargin.PurgeLayoutCache ();
+//					editor.Parent.QueueDraw ();
+//				}
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs
index f983b9f003..3307f2c390 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs
@@ -25,8 +25,9 @@
 
 using System;
 using MonoDevelop.Ide.Gui.Dialogs;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.Ide;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
@@ -60,9 +61,20 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 		public MarkerPanel()
 		{
 			this.Build();
+			showLineNumbers = DefaultSourceEditorOptions.Instance.ShowLineNumberMargin;
+			underlineErrors = DefaultSourceEditorOptions.Instance.UnderlineErrors;
+			highlightMatchingBracket = DefaultSourceEditorOptions.Instance.HighlightMatchingBracket;
+			highlightCurrentLine = DefaultSourceEditorOptions.Instance.HighlightCaretLine;
+			showRuler = DefaultSourceEditorOptions.Instance.ShowRuler;
+			enableAnimation = DefaultSourceEditorOptions.Instance.EnableAnimations;
+			enableHighlightUsages = DefaultSourceEditorOptions.Instance.EnableHighlightUsages;
+			drawIndentMarkers = DefaultSourceEditorOptions.Instance.DrawIndentationMarkers;
+			showWhitespaces = DefaultSourceEditorOptions.Instance.ShowWhitespaces;
+			includeWhitespaces = DefaultSourceEditorOptions.Instance.IncludeWhitespaces;
+			enableQuickDiff = DefaultSourceEditorOptions.Instance.EnableQuickDiff;
 		}
 		
-		public virtual Gtk.Widget CreatePanelWidget ()
+		public virtual Control CreatePanelWidget ()
 		{
 			this.showLineNumbersCheckbutton.Active = showLineNumbers = DefaultSourceEditorOptions.Instance.ShowLineNumberMargin;
 			this.showLineNumbersCheckbutton.Toggled += delegate {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
index f4b3975f73..defcb3df86 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			style.Name = this.entryName.Text;
 			style.Description = this.entryDescription.Text;
 			style.BaseScheme = name;
-			string path = SourceEditorDisplayBinding.SyntaxModePath;
+			string path = MonoDevelop.Ide.Editor.TextEditorDisplayBinding.SyntaxModePath;
 			string baseName = style.Name.Replace (" ", "_");
 			
 			while (File.Exists (System.IO.Path.Combine (path, baseName + "Style.json"))) {
@@ -79,6 +79,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 				style.Save (fileName);
 				style.FileName = fileName;
 				Mono.TextEditor.Highlighting.SyntaxModeService.AddStyle (style);
+				MonoDevelop.Ide.Editor.Highlighting.SyntaxModeService.LoadStylesAndModes (Ide.Editor.TextEditorDisplayBinding.SyntaxModePath);
 			} catch (Exception ex) {
 				LoggingService.LogInternalError (ex);
 			}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IQuickTaskProvider.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IQuickTaskProvider.cs
deleted file mode 100644
index 0350a92b3b..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IQuickTaskProvider.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// 
-// IQuickTaskProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-namespace MonoDevelop.SourceEditor.QuickTasks
-{
-	public interface IQuickTaskProvider
-	{
-		IEnumerable<QuickTask> QuickTasks {
-			get;
-		}
-		
-		event EventHandler TasksUpdated;
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IUsageProvider.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IUsageProvider.cs
deleted file mode 100644
index b3d38082fd..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/IUsageProvider.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// 
-// IUsageProvider.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using Mono.TextEditor;
-using MonoDevelop.Ide.FindInFiles;
-
-namespace MonoDevelop.SourceEditor.QuickTasks
-{
-
-	public struct Usage
-	{
-		public DocumentLocation Location;
-		public ReferenceUsageType UsageType;
-
-		public Usage (DocumentLocation location, ReferenceUsageType usageType)
-		{
-			this.Location = location;
-			this.UsageType = usageType;
-		}
-	}
-
-	public interface IUsageProvider
-	{
-		IEnumerable<Usage> Usages {
-			get;
-		}
-
-		event EventHandler UsagesUpdated;
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTask.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTask.cs
deleted file mode 100644
index 15bd3982ad..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTask.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// 
-// QuickTask.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-// 
-// Copyright (c) 2012 Xamarin Inc. (http://xamarin.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using Gtk;
-using Mono.TextEditor;
-using System.Collections.Generic;
-using Gdk;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using MonoDevelop.Components.Commands;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.Refactoring;
-
-namespace MonoDevelop.SourceEditor.QuickTasks
-{
-	
-	public class QuickTask
-	{
-		Lazy<string> description;
-		public string Description {
-			get {
-				return description.Value;
-			}
-		}
-		
-		public TextLocation Location {
-			get;
-			private set;
-		}
-		
-		public Severity Severity {
-			get;
-			private set;
-		}
-		
-		public QuickTask (Func<string> descriptionFunc, TextLocation location, Severity severity)
-		{
-			this.description = new Lazy<string> (descriptionFunc);
-			this.Location = location;
-			this.Severity = severity;
-		}
-
-		public QuickTask (string description, TextLocation location, Severity severity)
-		{
-			this.description = new Lazy<string> (() => description);
-			this.Location = location;
-			this.Severity = severity;
-		}
-
-		public override string ToString ()
-		{
-			return string.Format ("[QuickTask: Description={0}, Location={1}, Severity={2}]", Description, Location, Severity);
-		}
-	}
-	
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs
index c089b13afe..79fab2b7a6 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskMiniMapMode.cs
@@ -33,23 +33,48 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Components.Commands;
 using ICSharpCode.NRefactory;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.SourceEditor.QuickTasks
 {
-	public class QuickTaskMiniMapMode : HBox
+	class QuickTaskMiniMapMode : HBox, IMapMode
 	{
+		Minimpap minimap;
 		QuickTaskOverviewMode rightMap;
+		Adjustment vadjustment;
 
 		public QuickTaskMiniMapMode (QuickTaskStrip parent)
 		{
-			var minimap = new Minimpap (parent);
+			minimap = new Minimpap (parent);
 			PackStart (minimap, true, true, 0);
 			
 			rightMap = new QuickTaskOverviewMode (parent);
 			PackStart (rightMap, true, true, 0);
+			vadjustment = parent.VAdjustment;
+
+			vadjustment.ValueChanged += RedrawOnVAdjustmentChange;
+
+		}
+
+
+		protected override void OnDestroyed ()
+		{
+			vadjustment.ValueChanged -= RedrawOnVAdjustmentChange;
+
+			base.OnDestroyed ();
+		}
+
+		void RedrawOnVAdjustmentChange (object sender, EventArgs e)
+		{
+			QueueDraw ();
+		}
+
+		public void ForceDraw ()
+		{
+			minimap.RequestRedraw ();
 		}
 
-		public class Minimpap : QuickTaskOverviewMode
+		class Minimpap : QuickTaskOverviewMode
 		{
 			const double lineHeight = 2;
 
@@ -82,7 +107,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 				}
 			}
 	
-			void RequestRedraw ()
+			public void RequestRedraw ()
 			{
 				RemoveRedrawTimer ();
 				redrawTimeout = GLib.Timeout.Add (450, delegate {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
index c423ff5fae..f95a7c7403 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
@@ -26,21 +26,24 @@
 
 using System;
 using Gtk;
-using Mono.TextEditor;
 using System.Collections.Generic;
 using Gdk;
 using MonoDevelop.Core;
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.Refactoring;
 using MonoDevelop.Ide;
 using System.Linq;
 using MonoDevelop.Components;
 using Mono.TextEditor.Theatrics;
+using MonoDevelop.Ide.Editor;
 using Xwt.Drawing;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
+using Mono.TextEditor;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MonoDevelop.SourceEditor.QuickTasks
 {
-	public class QuickTaskOverviewMode : DrawingArea
+	class QuickTaskOverviewMode : DrawingArea, IMapMode
 	{
 		static Xwt.Drawing.Image searchImage = Xwt.Drawing.Image.FromResource ("issues-busy-16.png");
 		static Xwt.Drawing.Image okImage = Xwt.Drawing.Image.FromResource ("issues-ok-16.png");
@@ -70,26 +73,39 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			get {
 				return okImage;
 			}
+		}

+

+		Cairo.Color win81Slider;

+		Cairo.Color win81SliderPrelight;
+		int win81ScrollbarWidth; 
+
+		protected override void OnStyleSet (Style previous_style)

+		{

+			base.OnStyleSet (previous_style);
+			if (Core.Platform.IsWindows) {
+				using (var scrollstyle = Rc.GetStyleByPaths (Settings, null, null, VScrollbar.GType)) {
+					var scrl = new VScrollbar (null);
+					scrl.Style = scrollstyle;
+					win81Slider = scrollstyle.Background (StateType.Normal).ToCairoColor ();
+					win81SliderPrelight = scrollstyle.Background (StateType.Prelight).ToCairoColor ();
+					win81ScrollbarWidth = (int)scrl.StyleGetProperty ("slider-width");
+					scrl.Destroy ();
+				}
+			}
 		}
 
-		//TODO: find a way to look these up from the theme
-		static readonly Cairo.Color win81Background = new Cairo.Color (240/255d, 240/255d, 240/255d);
-		static readonly Cairo.Color win81Slider = new Cairo.Color (205/255d, 205/255d, 205/255d);
-		static readonly Cairo.Color win81SliderPrelight = new Cairo.Color (166/255d, 166/255d, 166/255d);
-		static readonly Cairo.Color win81SliderActive = new Cairo.Color (96/255d, 96/255d, 96/255d);
-
-		readonly int barPadding = Platform.IsWindows? 1 : 3;
+		readonly int barPadding = MonoDevelop.Core.Platform.IsWindows ? 1 : 3;
 
 		readonly QuickTaskStrip parentStrip;
 		protected readonly Adjustment vadjustment;
-		
+		TextViewMargin textViewMargin;
 		int caretLine = -1;
-		
-		public TextEditor TextEditor {
+
+		public Mono.TextEditor.MonoTextEditor TextEditor {
 			get;
 			private set;
 		}
-		
+
 		public IEnumerable<QuickTask> AllTasks {
 			get {
 				return parentStrip.AllTasks;
@@ -101,7 +117,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 				return parentStrip.AllUsages;
 			}
 		}
-		
+
 		public QuickTaskOverviewMode (QuickTaskStrip parent)
 		{
 			this.parentStrip = parent;
@@ -113,21 +129,24 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			vadjustment.Changed += RedrawOnVAdjustmentChange;
 			parentStrip.TaskProviderUpdated += RedrawOnUpdate;
 			TextEditor = parent.TextEditor;
-//			TextEditor.Caret.PositionChanged += CaretPositionChanged;
+			caret = TextEditor.Caret;
+			//			caret.PositionChanged += CaretPositionChanged;
 			TextEditor.HighlightSearchPatternChanged += RedrawOnUpdate;
-			TextEditor.TextViewMargin.SearchRegionsUpdated += RedrawOnUpdate;
-			TextEditor.TextViewMargin.MainSearchResultChanged += RedrawOnUpdate;
-			TextEditor.GetTextEditorData ().HeightTree.LineUpdateFrom += HandleLineUpdateFrom;
+			textViewMargin = TextEditor.TextViewMargin;
+			textViewMargin.SearchRegionsUpdated += RedrawOnUpdate;
+			textViewMargin.MainSearchResultChanged += RedrawOnUpdate;
+			heightTree = TextEditor.GetTextEditorData ().HeightTree;
+			heightTree.LineUpdateFrom += HandleLineUpdateFrom;
 			TextEditor.HighlightSearchPatternChanged += HandleHighlightSearchPatternChanged;
 			HasTooltip = true;
 
-			fadeInStage.ActorStep += delegate(Actor<QuickTaskOverviewMode> actor) {
+			fadeInStage.ActorStep += delegate (Actor<QuickTaskOverviewMode> actor) {
 				barColorValue = actor.Percent;
 				return true;
 			};
 			fadeInStage.Iteration += (sender, e) => QueueDraw ();
 
-			fadeOutStage.ActorStep += delegate(Actor<QuickTaskOverviewMode> actor) {
+			fadeOutStage.ActorStep += delegate (Actor<QuickTaskOverviewMode> actor) {
 				barColorValue = 1 - actor.Percent;
 				return true;
 			};
@@ -141,42 +160,76 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			yPositionCache.Clear ();
 		}
 
-		void HandleLineUpdateFrom (object sender, HeightTree.HeightChangedEventArgs e)
+		void HandleLineUpdateFrom (object sender, Mono.TextEditor.HeightTree.HeightChangedEventArgs e)
 		{
 			yPositionCache.Clear ();
 		}
-		
+
 		void CaretPositionChanged (object sender, EventArgs e)
 		{
-			var line = TextEditor.Caret.Line;
+			var line = caret.Line;
 			if (caretLine != line) {
 				caretLine = line;
 				QueueDraw ();
 			}
 		}
-		
+
 		protected override void OnDestroyed ()
 		{
-			base.OnDestroyed ();
+			DestroyBackgroundSurface ();
+			RemoveIndicatorIdleHandler ();
+			DestroyIndicatorSwapSurface ();
+			DestroyIndicatorSurface ();
 			CancelFadeInTimeout ();
 			RemovePreviewPopupTimeout ();
 			DestroyPreviewWindow ();
-			TextEditor.Caret.PositionChanged -= CaretPositionChanged;
+			if (caret != null) {
+				caret.PositionChanged -= CaretPositionChanged;
+				caret = null;
+			}
 			TextEditor.HighlightSearchPatternChanged -= HandleHighlightSearchPatternChanged;
-			TextEditor.GetTextEditorData ().HeightTree.LineUpdateFrom -= HandleLineUpdateFrom;
+			if (heightTree != null) {
+				heightTree.LineUpdateFrom -= HandleLineUpdateFrom;
+				heightTree = null;
+			}
 			TextEditor.HighlightSearchPatternChanged -= RedrawOnUpdate;
-			TextEditor.TextViewMargin.SearchRegionsUpdated -= RedrawOnUpdate;
-			TextEditor.TextViewMargin.MainSearchResultChanged -= RedrawOnUpdate;
-			
+			textViewMargin.SearchRegionsUpdated -= RedrawOnUpdate;
+			textViewMargin.MainSearchResultChanged -= RedrawOnUpdate;
+			textViewMargin = null;
 			parentStrip.TaskProviderUpdated -= RedrawOnUpdate;
-			
+
 			vadjustment.ValueChanged -= RedrawOnVAdjustmentChange;
 			vadjustment.Changed -= RedrawOnVAdjustmentChange;
+			base.OnDestroyed ();
+		}
+
+		void DestroyBackgroundSurface ()
+		{

+			if (backgroundSurface != null) {
+				backgroundSurface.Dispose ();
+				backgroundSurface = null;
+			}
+		}
+
+		void DestroyIndicatorSurface ()
+		{
+			if (indicatorSurface != null) {
+				indicatorSurface.Dispose ();
+				indicatorSurface = null;
+			}
+		}
+
+		void DestroyIndicatorSwapSurface ()
+		{
+			if (swapIndicatorSurface != null) {
+				swapIndicatorSurface.Dispose ();
+				swapIndicatorSurface = null;
+			}
 		}
-		
+
 		void RedrawOnUpdate (object sender, EventArgs e)
 		{
-			QueueDraw ();
+			DrawIndicatorSurface ();
 		}
 
 		void RedrawOnVAdjustmentChange (object sender, EventArgs e)
@@ -190,8 +243,8 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			return y < IndicatorHeight;
 		}
-		
-		internal CodeSegmentPreviewWindow previewWindow;
+
+		internal Mono.TextEditor.CodeSegmentPreviewWindow previewWindow;
 
 		protected override bool OnMotionNotifyEvent (EventMotion evnt)
 		{
@@ -206,10 +259,9 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 
 			const ModifierType buttonMask = ModifierType.Button1Mask | ModifierType.Button2Mask |
 				ModifierType.Button3Mask | ModifierType.Button4Mask | ModifierType.Button5Mask;
-
-			if ((evnt.State & buttonMask & ModifierType.ShiftMask) == ModifierType.ShiftMask) {
+			if ((evnt.State & ModifierType.ShiftMask) == ModifierType.ShiftMask) {
 				int line = YToLine (evnt.Y);
-				
+
 				line = Math.Max (1, line - 2);
 				int lastLine = Math.Min (TextEditor.LineCount, line + 5);
 				var start = TextEditor.GetLine (line);
@@ -217,8 +269,8 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 				if (start == null || end == null) {
 					return base.OnMotionNotifyEvent (evnt);
 				}
-				var showSegment = new TextSegment (start.Offset, end.Offset + end.Length - start.Offset);
-				
+				var showSegment = new Mono.TextEditor.TextSegment (start.Offset, end.Offset + end.Length - start.Offset);
+
 				if (previewWindow != null) {
 					previewWindow.SetSegment (showSegment, false);
 					PositionPreviewWindow ((int)evnt.Y);
@@ -303,22 +355,22 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return false;
 		}
 
-		void CountTasks (out int errors, out int warnings, out int hints, out int suggestions)
+		void CountTasks (out int errors, out int warnings, out int infos, out int hidden)
 		{
-			errors = warnings = hints = suggestions = 0;
+			errors = warnings = infos = hidden = 0;
 			foreach (var task in AllTasks) {
 				switch (task.Severity) {
-				case Severity.Error:
+				case DiagnosticSeverity.Error:
 					errors++;
 					break;
-				case Severity.Warning:
+				case DiagnosticSeverity.Warning:
 					warnings++;
 					break;
-				case Severity.Hint:
-					hints++;
+				case DiagnosticSeverity.Info:
+					infos++;
 					break;
-				case Severity.Suggestion:
-					suggestions++;
+				case DiagnosticSeverity.Hidden:
+					hidden++;
 					break;
 				}
 			}
@@ -328,7 +380,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			QuickTask hoverTask = null;
 			foreach (var task in AllTasks) {
-				double ty = GetYPosition (task.Location.Line);
+				double ty = GetYPosition (TextEditor.OffsetToLineNumber (task.Location));
 				if (Math.Abs (ty - y) < 3) {
 					hoverTask = task;
 				}
@@ -343,52 +395,53 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 				QueueDraw ();
 			}
 		}
-		
-		class PreviewPopup {
-			
+
+		class PreviewPopup
+		{
+
 			QuickTaskOverviewMode strip;
-			TextSegment segment;
+			Mono.TextEditor.TextSegment segment;
 			int w, y;
-			
-			public PreviewPopup (QuickTaskOverviewMode strip, TextSegment segment, int w, int y)
+
+			public PreviewPopup (QuickTaskOverviewMode strip, Mono.TextEditor.TextSegment segment, int w, int y)
 			{
 				this.strip = strip;
 				this.segment = segment;
 				this.w = w;
 				this.y = y;
 			}
-			
+
 			public bool Run ()
 			{
-				strip.previewWindow = new CodeSegmentPreviewWindow (strip.TextEditor, true, segment, w, -1, false);
+				strip.previewWindow = new Mono.TextEditor.CodeSegmentPreviewWindow (strip.TextEditor, true, segment, w, -1, false);
 				strip.previewWindow.WidthRequest = w;
 				strip.previewWindow.Show ();
 				strip.PositionPreviewWindow (y);
 				return false;
 			}
-			
+
 		}
-		
+
 		uint previewPopupTimeout = 0;
-		
+
 		void PositionPreviewWindow (int my)
 		{
 			int ox, oy;
 			GdkWindow.GetOrigin (out ox, out oy);
-			
+
 			Gdk.Rectangle geometry = Screen.GetMonitorGeometry (Screen.GetMonitorAtPoint (ox, oy));
-			
+
 			var alloc = previewWindow.Allocation;
 			int x = ox - 4 - alloc.Width;
 			if (x < geometry.Left)
 				x = ox + parentStrip.Allocation.Width + 4;
-			
+
 			int y = oy + my - alloc.Height / 2;
 			y = Math.Max (geometry.Top, Math.Min (y, geometry.Bottom));
-			
+
 			previewWindow.Move (x, y);
 		}
-		
+
 		void RemovePreviewPopupTimeout ()
 		{
 			if (previewPopupTimeout != 0) {
@@ -396,7 +449,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 				previewPopupTimeout = 0;
 			}
 		}
-		
+
 		void DestroyPreviewWindow ()
 		{
 			if (previewWindow != null) {
@@ -412,7 +465,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			if (fadeTimeOutHandler == 0)
 				return;
-			GLib.Source.Remove (fadeTimeOutHandler); 
+			GLib.Source.Remove (fadeTimeOutHandler);
 			fadeTimeOutHandler = 0;
 		}
 
@@ -451,41 +504,39 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		protected override bool OnLeaveNotifyEvent (EventCrossing evnt)
 		{
 			isPointerInside = false;
-			if (!IsInGrab ()) 
+			if (!IsInGrab ())
 				StartFadeOutAnimation ();
 			RemovePreviewPopupTimeout ();
 			DestroyPreviewWindow ();
 
 			return base.OnLeaveNotifyEvent (evnt);
 		}
-		
-		Cairo.Color GetBarColor (Severity severity)
+
+		Cairo.Color GetBarColor (DiagnosticSeverity severity)
 		{
 			var style = this.TextEditor.ColorStyle;
 			if (style == null)
 				return new Cairo.Color (0, 0, 0);
 			switch (severity) {
-			case Severity.Error:
+			case DiagnosticSeverity.Error:
 				return style.UnderlineError.Color;
-			case Severity.Warning:
+			case DiagnosticSeverity.Warning:
 				return style.UnderlineWarning.Color;
-			case Severity.Suggestion:
+			case DiagnosticSeverity.Info:
 				return style.UnderlineSuggestion.Color;
-			case Severity.Hint:
-				return style.UnderlineHint.Color;
-			case Severity.None:
+			case DiagnosticSeverity.Hidden:
 				return style.PlainText.Background;
 			default:
 				throw new ArgumentOutOfRangeException ();
 			}
 		}
 
-		protected virtual double IndicatorHeight  {
+		protected virtual double IndicatorHeight {
 			get {
-				return Platform.IsWindows ? Allocation.Width : 3 + 8 + 3;
+				return MonoDevelop.Core.Platform.IsWindows ? Allocation.Width : 3 + 8 + 3;
 			}
 		}
-		
+
 		protected virtual void MovePosition (double y)
 		{
 			double position = ((y - IndicatorHeight) / (Allocation.Height - IndicatorHeight)) * vadjustment.Upper - vadjustment.PageSize / 2;
@@ -551,14 +602,11 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 
 		void MoveToTask (QuickTask task)
 		{
-			if (task.Location.IsEmpty) {
-				Console.WriteLine ("empty:" + task.Description);
-			}
-			var loc = new DocumentLocation (
-				Math.Max (DocumentLocation.MinLine, task.Location.Line),
-				Math.Max (DocumentLocation.MinColumn, task.Location.Column)
-			);
-			TextEditor.Caret.Location = loc;
+			//			var loc = new DocumentLocation (
+			//				Math.Max (DocumentLocation.MinLine, task.Location.Line),
+			//				Math.Max (DocumentLocation.MinColumn, task.Location.Column)
+			//			);
+			caret.Offset = task.Location;
 			TextEditor.CenterToCaret ();
 			TextEditor.StartCaretPulseAnimation ();
 			TextEditor.GrabFocus ();
@@ -575,18 +623,17 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return QuickTaskStrip.HoverMode.NextMessage;
 		}
 
-		protected void DrawIndicator (Cairo.Context cr, Severity severity)
+		protected void DrawIndicator (Cairo.Context cr, DiagnosticSeverity severity)
 		{
 			Xwt.Drawing.Image image;
 			switch (severity) {
-			case Severity.Error:
+			case DiagnosticSeverity.Error:
 				image = errorImage;
 				break;
-			case Severity.Warning:
+			case DiagnosticSeverity.Warning:
 				image = warningImage;
 				break;
-			case Severity.Suggestion:
-			case Severity.Hint:
+			case DiagnosticSeverity.Info:
 				image = suggestionImage;
 				break;
 			default:
@@ -610,26 +657,26 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		protected override void OnSizeRequested (ref Requisition requisition)
 		{
 			base.OnSizeRequested (ref requisition);
-			requisition.Width = Platform.IsWindows? 17 : 15;
+			requisition.Width = MonoDevelop.Core.Platform.IsWindows ? win81ScrollbarWidth : 15;
 		}
-		
+
 		double LineToY (int logicalLine)
 		{
 			var h = Allocation.Height - IndicatorHeight;
 			var p = TextEditor.LocationToPoint (logicalLine, 1, true).Y;
-			var q = Math.Max (TextEditor.GetTextEditorData ().TotalHeight, TextEditor.Allocation.Height) 
+			var q = Math.Max (TextEditor.GetTextEditorData ().TotalHeight, TextEditor.Allocation.Height)
 				+ TextEditor.Allocation.Height
 				- TextEditor.LineHeight;
 
-			return IndicatorHeight  + h * p / q;
+			return IndicatorHeight + h * p / q;
 		}
-		
+
 		int YToLine (double y)
 		{
 			var line = 0.5 + (y - IndicatorHeight) / (Allocation.Height - IndicatorHeight) * (double)(TextEditor.GetTextEditorData ().VisibleLineCount);
 			return TextEditor.GetTextEditorData ().VisualToLogicalLine ((int)line);
 		}
-		
+
 		protected void DrawCaret (Cairo.Context cr)
 		{
 			if (TextEditor.ColorStyle == null || caretLine < 0)
@@ -653,60 +700,64 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return y;
 		}
 
-		protected Severity DrawQuickTasks (Cairo.Context cr)
+		protected void DrawQuickTasks (Cairo.Context cr, IEnumerator<Usage> allUsages, IEnumerator<QuickTask> allTasks, ref bool nextStep, ref DiagnosticSeverity severity, List<HashSet<int>> lineCache)
 		{
-			Severity severity = Severity.None;
-
-			foreach (var usage in AllUsages) {
-				double y = GetYPosition (usage.Location.Line);
+			if (allUsages.MoveNext ()) {
+				var usage = allUsages.Current;
+				int y = (int)GetYPosition (TextEditor.OffsetToLineNumber (usage.Offset));
+				if (lineCache[0].Contains (y))
+					return;
+				lineCache[0].Add (y);
 				var usageColor = TextEditor.ColorStyle.PlainText.Foreground;
 				usageColor.A = 0.4;
 				HslColor color;
-				if ((usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Write) != 0) {
+				if ((usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Declariton) != 0) {
+					color = TextEditor.ColorStyle.ChangingUsagesRectangle.Color;
+					if (color.Alpha == 0.0)
+						color = TextEditor.ColorStyle.UsagesRectangle.Color;
+				} else if ((usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Write) != 0) {
 					color = TextEditor.ColorStyle.ChangingUsagesRectangle.Color;
-				} else if ((usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Read) != 0) {
+					if (color.Alpha == 0.0)
+						color = TextEditor.ColorStyle.UsagesRectangle.Color;
+				} else if ((usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Read) != 0 || (usage.UsageType & MonoDevelop.Ide.FindInFiles.ReferenceUsageType.Keyword) != 0) {
 					color = TextEditor.ColorStyle.UsagesRectangle.Color;
 				} else {
 					color = usageColor;
 				}
 				color.L = 0.5;
-				cr.Color = color;
+				cr.SetSourceColor (color);
 				cr.MoveTo (0, y - 3);
 				cr.LineTo (5, y);
 				cr.LineTo (0, y + 3);
 				cr.LineTo (0, y - 3);
 				cr.ClosePath ();
 				cr.Fill ();
-			}
-
-			foreach (var task in AllTasks) {
-				double y = GetYPosition (task.Location.Line);
-
-				cr.SetSourceColor (GetBarColor (task.Severity));
-				cr.Rectangle (0, Math.Round (y) - 1, Allocation.Width, 2);
-				cr.Fill ();
-
-				switch (task.Severity) {
-				case Severity.Error:
-					severity = Severity.Error;
-					break;
-				case Severity.Warning:
-					if (severity == Severity.None)
-						severity = Severity.Warning;
-					break;
+			} else if (allTasks.MoveNext ()) {
+				var task = allTasks.Current;
+				int y = (int)GetYPosition (TextEditor.OffsetToLineNumber (task.Location));
+				if (!lineCache[1].Contains (y)) {
+					lineCache[1].Add (y);
+					cr.SetSourceColor (GetBarColor (task.Severity));
+					cr.Rectangle (1, y - 1, Allocation.Width - 1, 2);
+					cr.Fill ();
 				}
+				if (task.Severity == DiagnosticSeverity.Error)
+					severity = DiagnosticSeverity.Error;
+				else if (task.Severity == DiagnosticSeverity.Warning && severity != DiagnosticSeverity.Error)
+					severity = DiagnosticSeverity.Warning;
+			} else {
+				nextStep = true;
 			}
-			return severity;
 		}
-		
+
 		protected void DrawLeftBorder (Cairo.Context cr)
 		{
 			cr.MoveTo (0.5, 0);
 			cr.LineTo (0.5, Allocation.Height);
 			if (TextEditor.ColorStyle != null) {
 				var col = TextEditor.ColorStyle.PlainText.Background.ToXwtColor ();
-				if (!Platform.IsWindows) {
-					col.Light *= 0.88;
+				if (!MonoDevelop.Core.Platform.IsWindows) {
+					col.Light *= 0.95;
 				}
 				cr.SetSourceColor (col.ToCairoColor ());
 			}
@@ -717,34 +768,36 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			yPositionCache.Clear ();
 			base.OnSizeAllocated (allocation);
+			DrawIndicatorSurface (0);
 		}
 
 		void GetBarDimensions (out double x, out double y, out double w, out double h)
 		{
 			var alloc = Allocation;
 
-			x = Platform.IsWindows ? 0 : 1 + barPadding;
+			x = MonoDevelop.Core.Platform.IsWindows ? 0 : 1 + barPadding;
 			var adjUpper = vadjustment.Upper;
-			var allocH = alloc.Height - (int) IndicatorHeight;
+			var allocH = alloc.Height - (int)IndicatorHeight;
 			y = IndicatorHeight + Math.Round (allocH * vadjustment.Value / adjUpper);
-			w = Platform.IsWindows ? alloc.Width : 8;
+			w = MonoDevelop.Core.Platform.IsWindows ? alloc.Width : 8;
 			const int minBarHeight = 16;
 			h = Math.Max (minBarHeight, Math.Round (allocH * (vadjustment.PageSize / adjUpper)) - barPadding - barPadding);
 		}
 		double barColorValue = 0.0;
 		const double barAlphaMax = 0.5;
 		const double barAlphaMin = 0.22;
-
+		Caret caret;
+		HeightTree heightTree;
 
 		protected virtual void DrawBar (Cairo.Context cr)
 		{
-			if (vadjustment == null || vadjustment.Upper <= vadjustment.PageSize) 
+			if (vadjustment == null || vadjustment.Upper <= vadjustment.PageSize)
 				return;
 
 			double x, y, w, h;
 			GetBarDimensions (out x, out y, out w, out h);
 
-			if (Platform.IsWindows) {
+			if (MonoDevelop.Core.Platform.IsWindows) {
 				cr.Rectangle (x, y, w, h);
 			} else {
 				MonoDevelop.Components.CairoExtensions.RoundedRectangle (cr, x, y, w, h, 4);
@@ -753,12 +806,12 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			bool prelight = State == StateType.Prelight;
 
 			Cairo.Color c;
-			if (Platform.IsWindows) {
+			if (MonoDevelop.Core.Platform.IsWindows) {
 				c = prelight ? win81SliderPrelight : win81Slider;
 				//compute new color such that it will produce same color when blended with bg
-				c = AddAlpha (win81Background, c, 0.5d);
+				c = AddAlpha (TextEditor.ColorStyle.PlainText.Background, c, 0.5d);
 			} else {
-				var brightness = HslColor.Brightness (TextEditor.ColorStyle.PlainText.Background); 
+				var brightness = HslColor.Brightness (TextEditor.ColorStyle.PlainText.Background);
 				c = new Cairo.Color (1 - brightness, 1 - brightness, 1 - brightness, barColorValue * (barAlphaMax - barAlphaMin) + barAlphaMin);
 			}
 			cr.SetSourceColor (c);
@@ -780,75 +833,241 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			return (c0 * a0 - cb * ab * (1 - aa)) / aa;
 		}
 
-		protected void DrawSearchResults (Cairo.Context cr)
+
+		protected void DrawSearchResults (Cairo.Context cr, IEnumerator<TextSegment> searchResults, ref bool nextStep)
 		{
-			foreach (var region in TextEditor.TextViewMargin.SearchResults) {
-				int line = TextEditor.OffsetToLineNumber (region.Offset);
-				double y = GetYPosition (line);
-				bool isMainSelection = false;
-				if (!TextEditor.TextViewMargin.MainSearchResult.IsInvalid)
-					isMainSelection = region.Offset == TextEditor.TextViewMargin.MainSearchResult.Offset;
-				cr.SetSourceColor (isMainSelection ? TextEditor.ColorStyle.SearchResultMain.Color : TextEditor.ColorStyle.SearchResult.Color);
-				cr.Rectangle (barPadding, Math.Round (y) - 1, Allocation.Width - barPadding * 2, 2);
-				cr.Fill ();
+			if (!searchResults.MoveNext ()) {
+				nextStep = true;
+				return;
 			}
+			var region = searchResults.Current;
+			int line = TextEditor.OffsetToLineNumber (region.Offset);
+			double y = GetYPosition (line);
+			bool isMainSelection = false;
+			if (!TextEditor.TextViewMargin.MainSearchResult.IsInvalid)
+				isMainSelection = region.Offset == TextEditor.TextViewMargin.MainSearchResult.Offset;
+			cr.SetSourceColor (isMainSelection ? TextEditor.ColorStyle.SearchResultMain.Color : TextEditor.ColorStyle.SearchResult.Color);
+			cr.Rectangle (barPadding, Math.Round (y) - 1, Allocation.Width - barPadding * 2, 2);
+			cr.Fill ();
 		}
-		
+
+		SurfaceWrapper backgroundSurface, indicatorSurface, swapIndicatorSurface;
 		protected override bool OnExposeEvent (Gdk.EventExpose e)
 		{
 			if (TextEditor == null)
 				return true;
+
 			using (Cairo.Context cr = Gdk.CairoHelper.Create (e.Window)) {
-				cr.LineWidth = 1;
-				cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
-				
-				if (TextEditor.ColorStyle != null) {
-					if (Platform.IsWindows) {
-						using (var pattern = new Cairo.SolidPattern (win81Background)) {
-							cr.SetSource (pattern);
-						}
-					} else {
-						var col = TextEditor.ColorStyle.PlainText.Background.ToXwtColor();
-						col.Light *= 0.948;
-						using (var grad = new Cairo.LinearGradient (0, 0, Allocation.Width, 0)) {
-							grad.AddColorStop (0, col.ToCairoColor ());
-							grad.AddColorStop (0.7, TextEditor.ColorStyle.PlainText.Background);
-							grad.AddColorStop (1, col.ToCairoColor ());
-							cr.SetSource (grad);
-						}
-						/*
-						var col = new Cairo.Color (229 / 255.0, 229 / 255.0, 229 / 255.0);
-						using (var grad = new Cairo.LinearGradient (0, 0, Allocation.Width, 0)) {
-							grad.AddColorStop (0, col);
-							grad.AddColorStop (0.5, new Cairo.Color (1, 1, 1));
-							grad.AddColorStop (1, col);
-							cr.SetSource (grad);
-						}*/
-					}
+				var allocation = Allocation;
+				if (indicatorSurface != null) {
+					cr.SetSourceSurface (indicatorSurface.Surface, 0, 0);
+					cr.Paint ();
+				} else {
+					CachedDraw (cr,
+					            ref backgroundSurface,
+					            allocation,
+					            draw: (c, o) => DrawBackground (c, allocation));
 				}
-				cr.Fill ();
-
 				if (TextEditor == null)
 					return true;
-				
-				if (TextEditor.HighlightSearchPattern) {
-					DrawSearchResults (cr);
-					DrawSearchIndicator (cr);
-				} else {
-					if (!Debugger.DebuggingService.IsDebugging) {
-						var severity = DrawQuickTasks (cr);
-						DrawIndicator (cr, severity);
-					}
-				}
+
 				DrawCaret (cr);
 
 				if (QuickTaskStrip.MergeScrollBarAndQuickTasks)
 					DrawBar (cr);
-				DrawLeftBorder (cr);
 			}
-			
+
 			return true;
 		}
+
+		CancellationTokenSource src = new CancellationTokenSource ();
+
+		class IdleUpdater
+		{
+			readonly QuickTaskOverviewMode mode;
+			readonly CancellationToken token;
+			SurfaceWrapper surface;
+			Cairo.Context cr;
+			Gdk.Rectangle allocation;
+
+			public IdleUpdater (QuickTaskOverviewMode mode, System.Threading.CancellationToken token)
+			{
+				this.mode = mode;
+				this.token = token;
+			}
+
+			public void Start ()
+			{
+				allocation = mode.Allocation;
+				var swapSurface = mode.swapIndicatorSurface;
+				if (swapSurface != null) {
+					if (swapSurface.Width == allocation.Width && swapSurface.Height == allocation.Height) {
+						surface = swapSurface;
+					} else {
+						mode.DestroyIndicatorSwapSurface ();
+					}
+				}
+
+				if (surface == null) {
+					using (var similiar = CairoHelper.Create (IdeApp.Workbench.RootWindow.GdkWindow))
+						surface = new SurfaceWrapper (similiar, allocation.Width, allocation.Height);
+				}
+
+				searchResults = mode.TextEditor.TextViewMargin.SearchResults.ToList().GetEnumerator ();
+				allUsages = mode.AllUsages.GetEnumerator ();
+				allTasks = mode.AllTasks.GetEnumerator ();
+				cr = new Cairo.Context (surface.Surface);
+				GLib.Idle.Add (RunHandler);
+			}
+
+			int drawingStep;
+			DiagnosticSeverity severity = DiagnosticSeverity.Hidden;
+			IEnumerator<TextSegment> searchResults;
+			IEnumerator<Usage> allUsages;
+			IEnumerator<QuickTask> allTasks;
+
+			bool RunHandler ()
+			{
+				tokenExit:
+				if (token.IsCancellationRequested || mode.TextEditor.GetTextEditorData () == null) {
+					cr.Dispose ();
+					// if the surface was newly created dispose it otherwise it'll leak.
+					if (surface != mode.swapIndicatorSurface)
+						surface.Dispose ();
+					return false;
+				}
+				var lineCache = new List<HashSet<int>> ();
+				lineCache.Add (new HashSet<int> ());
+				lineCache.Add (new HashSet<int> ());
+				bool nextStep = false;
+				switch (drawingStep) {
+				case 0:
+                	CachedDraw (cr, ref mode.backgroundSurface, allocation, draw: (c, o) => mode.DrawBackground (c, allocation));
+					drawingStep++;
+					return true;
+				case 1:
+					for (int i = 0; i < 10 && !nextStep; i++) {
+						if (token.IsCancellationRequested)
+							goto tokenExit;
+						if (mode.TextEditor.HighlightSearchPattern) {
+							mode.DrawSearchResults (cr, searchResults, ref nextStep);
+						} else {
+							if (!Debugger.DebuggingService.IsDebugging) {
+								mode.DrawQuickTasks (cr, allUsages, allTasks, ref nextStep, ref severity, lineCache);
+							} else {
+								nextStep = true;
+							}
+						}
+					}
+					if (nextStep)
+						drawingStep++;
+					return true;
+				case 2:
+					if (mode.TextEditor.HighlightSearchPattern) {
+						mode.DrawSearchIndicator (cr);
+					} else {
+						if (!Debugger.DebuggingService.IsDebugging) {
+							mode.DrawIndicator (cr, severity);
+						}
+					}
+					drawingStep++;
+					return true;
+				default:
+					cr.Dispose ();
+					var tmp = mode.indicatorSurface;
+					mode.indicatorSurface = surface;
+					mode.swapIndicatorSurface = tmp;
+					mode.QueueDraw ();
+
+					return false;
+				}
+			}
+		}
+
+		uint indicatorIdleTimout;
+		void DrawIndicatorSurface(uint timeout = 250)
+		{
+			RemoveIndicatorIdleHandler ();
+			GLib.TimeoutHandler timeoutHandler = delegate {
+				indicatorIdleTimout = 0;
+				if (!IsRealized)
+					return false;
+				var allocation = Allocation;
+				src.Cancel ();
+				src = new CancellationTokenSource ();
+				new IdleUpdater (this, src.Token).Start ();
+				return false;
+			};
+			if (timeout == 0) {
+				timeoutHandler ();
+			} else {
+				indicatorIdleTimout = GLib.Timeout.Add (timeout, timeoutHandler);
+			}
+		}
+
+		void RemoveIndicatorIdleHandler ()
+		{
+			if (indicatorIdleTimout > 0) {
+				GLib.Source.Remove (indicatorIdleTimout);
+				indicatorIdleTimout = 0;
+			}
+		}
+
+		/// TODO: CairoExtensions.CachedDraw seems not to work correctly for me.
+		public static void CachedDraw (Cairo.Context self, ref SurfaceWrapper surface, Gdk.Rectangle region, object parameters = null, float opacity = 1.0f, Action<Cairo.Context, float> draw = null, double? forceScale = null)
+		{
+			double displayScale = forceScale.HasValue ? forceScale.Value : QuartzSurface.GetRetinaScale (self);
+			int targetWidth = (int) (region.Width * displayScale);
+			int targetHeight = (int) (region.Height * displayScale);
+
+			bool redraw = false;
+			if (surface == null || surface.Width != targetWidth || surface.Height != targetHeight) {
+				if (surface != null)
+					surface.Dispose ();
+				surface = new SurfaceWrapper (self, targetWidth, targetHeight);
+				redraw = true;
+			} else if ((surface.Data == null && parameters != null) || (surface.Data != null && !surface.Data.Equals (parameters))) {
+				redraw = true;
+			}
+
+
+			if (redraw) {
+				surface.Data = parameters;
+				using (var context = new Cairo.Context (surface.Surface)) {
+					draw(context, 1.0f);
+				}
+			}
+
+			self.SetSourceSurface (surface.Surface, 0, 0);
+			self.Paint ();
+		}
+
+		void DrawBackground (Cairo.Context cr, Gdk.Rectangle allocation)
+		{
+			cr.LineWidth = 1;
+			cr.Rectangle (0, 0, allocation.Width, allocation.Height);
+
+			if (TextEditor.ColorStyle != null) {
+				if (MonoDevelop.Core.Platform.IsWindows) {
+					using (var pattern = new Cairo.SolidPattern (TextEditor.ColorStyle.PlainText.Background)) {
+						cr.SetSource (pattern);
+						cr.Fill ();
+					}
+				} else {
+					cr.SetSourceColor (TextEditor.ColorStyle.PlainText.Background);
+					cr.Fill ();
+				}
+			}
+			DrawLeftBorder (cr);
+		}
+
+		public void ForceDraw ()
+		{
+			DestroyBackgroundSurface ();
+			DestroyIndicatorSwapSurface ();
+			DestroyIndicatorSurface ();
+
+			DrawIndicatorSurface (0);
+		}
 	}
-	
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
index 052f69f046..c750bf49d0 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
@@ -35,14 +35,21 @@ using MonoDevelop.Components.Commands;
 using ICSharpCode.NRefactory;
 using System.Linq;
 using ICSharpCode.NRefactory.Refactoring;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
 
 namespace MonoDevelop.SourceEditor.QuickTasks
 {
-	public class QuickTaskStrip : VBox
+	interface IMapMode
 	{
-		// move that one to AnalysisOptions when the new features are enabled by default.
-		public readonly static PropertyWrapper<bool> EnableFancyFeatures = new PropertyWrapper<bool> ("MonoDevelop.AnalysisCore.AnalysisEnabled", false);
-		public readonly static bool MergeScrollBarAndQuickTasks = !Platform.IsMac;
+		void ForceDraw ();
+	}
+	class QuickTaskStrip : VBox
+	{
+		public readonly static ConfigurationProperty<bool> EnableFancyFeatures = IdeApp.Preferences.EnableSourceAnalysis;
+		public readonly static bool MergeScrollBarAndQuickTasks = !MonoDevelop.Core.Platform.IsMac;
 
 		static QuickTaskStrip ()
 		{
@@ -61,15 +68,18 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			}
 		}
 		
-		Mono.TextEditor.TextEditor textEditor;
-		public TextEditor TextEditor {
+		Mono.TextEditor.MonoTextEditor textEditor;
+		public Mono.TextEditor.MonoTextEditor TextEditor {
 			get {
 				return textEditor;
 			}
 			set {
 				if (value == null)
 					throw new ArgumentNullException ();
+				if (textEditor != null)
+					textEditor.EditorOptionsChanged -= TextEditor_EditorOptionsChanged;
 				textEditor = value;
+				textEditor.EditorOptionsChanged += TextEditor_EditorOptionsChanged;
 				SetupMode ();
 			}
 		}
@@ -86,8 +96,8 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 			}
 		}
 		
-		Dictionary<IQuickTaskProvider, List<QuickTask>> providerTasks = new Dictionary<IQuickTaskProvider, List<QuickTask>> ();
-		Dictionary<IUsageProvider, List<Usage>> providerUsages = new Dictionary<IUsageProvider, List<Usage>> ();
+		ImmutableDictionary<IQuickTaskProvider, ImmutableArray<QuickTask>> providerTasks = ImmutableDictionary<IQuickTaskProvider, ImmutableArray<QuickTask>>.Empty;
+		ImmutableDictionary<UsageProviderEditorExtension, ImmutableArray<Usage>> providerUsages = ImmutableDictionary<UsageProviderEditorExtension, ImmutableArray<Usage>>.Empty;
 
 		public IEnumerable<QuickTask> AllTasks {
 			get {
@@ -154,12 +164,14 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		
 		protected override void OnDestroyed ()
 		{
-			base.OnDestroyed ();
 			adj = null;
+			if (textEditor != null)
+				textEditor.EditorOptionsChanged -= TextEditor_EditorOptionsChanged;
 			textEditor = null;
 			providerTasks = null;
 			PropertyService.RemovePropertyHandler ("ScrollBar.Mode", ScrollBarModeChanged);
 			EnableFancyFeatures.Changed -= HandleChanged;
+			base.OnDestroyed ();
 		}
 		
 		void ScrollBarModeChanged (object sender, PropertyChangedEventArgs args)
@@ -172,15 +184,15 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			if (providerTasks == null)
 				return;
-			providerTasks [provider] = new List<QuickTask> (provider.QuickTasks);
+			providerTasks = providerTasks.SetItem (provider, provider.QuickTasks);
 			OnTaskProviderUpdated (EventArgs.Empty);
 		}
 		
-		public void Update (IUsageProvider provider)
+		public void Update (UsageProviderEditorExtension provider)
 		{
 			if (providerTasks == null)
 				return;
-			providerUsages [provider] = new List<Usage> (provider.Usages);
+			providerUsages = providerUsages.SetItem (provider, provider.Usages);
 			OnTaskProviderUpdated (EventArgs.Empty);
 		}
 
@@ -196,11 +208,17 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		protected override bool OnButtonPressEvent (EventButton evnt)
 		{
 			if (evnt.Button == 3) {
-				IdeApp.CommandService.ShowContextMenu (this, evnt, "/MonoDevelop/SourceEditor2/ContextMenu/Scrollbar");
+				IdeApp.CommandService.ShowContextMenu (this, evnt, IdeApp.CommandService.CreateCommandEntrySet ("/MonoDevelop/SourceEditor2/ContextMenu/Scrollbar"), this);
 			}
 			return base.OnButtonPressEvent (evnt);
 		}
-		
+
+		void TextEditor_EditorOptionsChanged (object sender, EventArgs e)
+		{
+			(mapMode as IMapMode)?.ForceDraw ();
+			QueueDraw ();
+		}
+
 		#region Command handlers
 		[CommandHandler (ScrollbarCommand.Top)]
 		internal void GotoTop ()
@@ -255,13 +273,13 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		internal enum HoverMode { NextMessage, NextWarning, NextError }
 		internal QuickTask SearchNextTask (HoverMode mode)
 		{
-			var curLoc = (TextLocation)TextEditor.Caret.Location;
+			var curLoc = TextEditor.Caret.Offset;
 			QuickTask firstTask = null;
 			foreach (var task in AllTasks.OrderBy (t => t.Location) ) {
 				bool isNextTask = task.Location > curLoc;
 				if (mode == HoverMode.NextMessage ||
-					mode == HoverMode.NextWarning && task.Severity == Severity.Warning ||
-					mode == HoverMode.NextError && task.Severity == Severity.Error) {
+					mode == HoverMode.NextWarning && task.Severity == DiagnosticSeverity.Warning ||
+					mode == HoverMode.NextError && task.Severity == DiagnosticSeverity.Error) {
 					if (isNextTask)
 						return task;
 					if (firstTask == null)
@@ -273,13 +291,13 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 
 		internal QuickTask SearchPrevTask (HoverMode mode)
 		{
-			var curLoc = (TextLocation)TextEditor.Caret.Location;
+			var curLoc = TextEditor.Caret.Offset;
 			QuickTask firstTask = null;
 			foreach (var task in AllTasks.OrderByDescending (t => t.Location) ) {
 				bool isNextTask = task.Location < curLoc;
 				if (mode == HoverMode.NextMessage ||
-					mode == HoverMode.NextWarning && task.Severity == Severity.Warning ||
-					mode == HoverMode.NextError && task.Severity == Severity.Error) {
+					mode == HoverMode.NextWarning && task.Severity == DiagnosticSeverity.Warning ||
+					mode == HoverMode.NextError && task.Severity == DiagnosticSeverity.Error) {
 					if (isNextTask)
 						return task;
 					if (firstTask == null)
@@ -293,10 +311,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			if (quickTask == null)
 				return;
-			var line = quickTask.Location.Line;
-			if (line < 1 || line >= TextEditor.LineCount)
-				return;
-			TextEditor.Caret.Location = new TextLocation (line, Math.Max (1, quickTask.Location.Column));
+			TextEditor.Caret.Offset = quickTask.Location;
 			TextEditor.CenterToCaret ();
 			TextEditor.StartCaretPulseAnimation ();
 			TextEditor.GrabFocus ();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/DocumentLineWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/DocumentLineWrapper.cs
new file mode 100644
index 0000000000..d3b7c7e3b2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/DocumentLineWrapper.cs
@@ -0,0 +1,131 @@
+//
+// DocumentLineWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class DocumentLineWrapper : MonoDevelop.Ide.Editor.IDocumentLine
+	{
+		public Mono.TextEditor.DocumentLine Line {
+			get;
+			private set;
+		}
+
+		public DocumentLineWrapper (Mono.TextEditor.DocumentLine line)
+		{
+			if (line == null)
+				throw new ArgumentNullException ("line");
+			this.Line = line;
+		}
+
+		#region IDocumentLine implementation
+		int MonoDevelop.Ide.Editor.IDocumentLine.LengthIncludingDelimiter {
+			get {
+				return Line.LengthIncludingDelimiter;
+			}
+		}
+
+		int MonoDevelop.Ide.Editor.IDocumentLine.EndOffsetIncludingDelimiter {
+			get {
+				return Line.EndOffsetIncludingDelimiter;
+			}
+		}
+
+		MonoDevelop.Core.Text.ISegment MonoDevelop.Ide.Editor.IDocumentLine.SegmentIncludingDelimiter {
+			get {
+				return MonoDevelop.Core.Text.TextSegment.FromBounds (Line.Offset, Line.EndOffsetIncludingDelimiter);
+			}
+		}
+
+		MonoDevelop.Core.Text.UnicodeNewline MonoDevelop.Ide.Editor.IDocumentLine.UnicodeNewline {
+			get {
+				return (MonoDevelop.Core.Text.UnicodeNewline)Line.UnicodeNewline;
+			}
+		}
+
+		int MonoDevelop.Ide.Editor.IDocumentLine.DelimiterLength {
+			get {
+				return Line.DelimiterLength;
+			}
+		}
+
+		int MonoDevelop.Ide.Editor.IDocumentLine.LineNumber {
+			get {
+				return Line.LineNumber;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.IDocumentLine MonoDevelop.Ide.Editor.IDocumentLine.PreviousLine {
+			get {
+				var prev = Line.PreviousLine;
+				return prev != null ? new DocumentLineWrapper (prev) : null;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.IDocumentLine MonoDevelop.Ide.Editor.IDocumentLine.NextLine {
+			get {
+				var next = Line.NextLine;
+				return next != null ? new DocumentLineWrapper (next) : null;
+			}
+		}
+		#endregion
+
+		#region ISegment implementation
+		int MonoDevelop.Core.Text.ISegment.Offset {
+			get {
+				return Line.Offset;
+			}
+		}
+
+		int MonoDevelop.Core.Text.ISegment.Length {
+			get {
+				return Line.Length;
+			}
+		}
+
+		int MonoDevelop.Core.Text.ISegment.EndOffset {
+			get {
+				return Line.EndOffset;
+			}
+		}
+		#endregion
+
+		public override int GetHashCode ()
+		{
+			return Line.GetHashCode () ^ 991;
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (ReferenceEquals (obj, this))
+				return true;
+			var other = obj as MonoDevelop.Ide.Editor.IDocumentLine;
+			if (other == null)
+				return false;
+			return Line.Offset == other.Offset && Line.Length == other.Length;
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs
new file mode 100644
index 0000000000..8d1ba6cf48
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/FoldSegmentWrapper.cs
@@ -0,0 +1,66 @@
+//
+// FoldSegmentWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class FoldSegmentWrapper : Mono.TextEditor.FoldSegment, IFoldSegment
+	{
+		bool IFoldSegment.IsCollapsed {
+			get {
+				return IsFolded;
+			}
+			set {
+				IsFolded = value;
+			}
+		}
+
+		string IFoldSegment.CollapsedText {
+			get {
+				return Description;
+			}
+			set {
+				Description = value;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.FoldingType IFoldSegment.FoldingType {
+			get {
+				return (MonoDevelop.Ide.Editor.FoldingType)base.FoldingType;
+			}
+			set {
+				base.FoldingType = (Mono.TextEditor.FoldingType)value;
+			}
+		}
+
+		public FoldSegmentWrapper (TextDocument doc, string description, int offset, int length, Mono.TextEditor.FoldingType foldingType) : base (doc, description, offset, length, foldingType)
+		{
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs
new file mode 100644
index 0000000000..4186bc48cc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs
@@ -0,0 +1,396 @@
+//
+// ITextDocumentWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using Mono.TextEditor;
+using System.IO;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Text;
+using Atk;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TextDocumentWrapper : ITextDocument, IDisposable
+	{
+		readonly TextDocument document;
+
+		public TextDocument Document {
+			get {
+				return document;
+			}
+		}
+
+		public TextDocumentWrapper (TextDocument document)
+		{
+			if (document == null)
+				throw new ArgumentNullException (nameof (document));
+			this.document = document;
+			this.document.TextReplaced += HandleTextReplaced;
+			this.document.TextReplacing += HandleTextReplacing;
+			this.document.LineChanged += Document_LineChanged; 
+			this.document.LineInserted += Document_LineInserted;
+			this.document.LineRemoved += Document_LineRemoved;
+		}
+
+		public void Dispose ()
+		{
+			document.TextReplaced -= HandleTextReplaced;
+			document.TextReplacing -= HandleTextReplacing;
+			document.LineChanged -= Document_LineChanged; 
+			document.LineInserted -= Document_LineInserted;
+			document.LineRemoved -= Document_LineRemoved;
+		}
+
+		void Document_LineRemoved (object sender, Mono.TextEditor.LineEventArgs e)
+		{
+			var handler = LineRemoved;
+			if (handler != null)
+				handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+		}
+
+		void Document_LineInserted (object sender, Mono.TextEditor.LineEventArgs e)
+		{
+			var handler = LineInserted;
+			if (handler != null)
+				handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+		}
+
+		void Document_LineChanged (object sender, Mono.TextEditor.LineEventArgs e)
+		{
+			var handler = LineChanged;
+			if (handler != null)
+				handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+		}
+
+		void HandleTextReplacing (object sender, DocumentChangeEventArgs e)
+		{
+			var handler = textChanging;
+			if (handler != null)
+				handler (this, new MonoDevelop.Core.Text.TextChangeEventArgs (e.Offset, e.RemovedText.Text, e.InsertedText.Text));
+		}
+
+		void HandleTextReplaced (object sender, DocumentChangeEventArgs e)
+		{
+			var handler = textChanged;
+			if (handler != null)
+				handler (this, new MonoDevelop.Core.Text.TextChangeEventArgs (e.Offset, e.RemovedText.Text, e.InsertedText.Text));
+		}
+		
+		#region ITextDocument implementation
+		event EventHandler<MonoDevelop.Core.Text.TextChangeEventArgs> textChanging;
+		event EventHandler<MonoDevelop.Core.Text.TextChangeEventArgs> ITextDocument.TextChanging {
+			add {
+				textChanging += value;
+			}
+			remove {
+				textChanging -= value;
+			}
+		}
+
+		event EventHandler<MonoDevelop.Core.Text.TextChangeEventArgs> textChanged;
+		event EventHandler<MonoDevelop.Core.Text.TextChangeEventArgs> ITextDocument.TextChanged {
+			add {
+				textChanged += value;
+			}
+			remove {
+				textChanged -= value;
+			}
+		}
+
+		void ITextDocument.InsertText (int offset, string text)
+		{
+			document.Insert (offset, text);
+		}
+
+		void ITextDocument.InsertText (int offset, MonoDevelop.Core.Text.ITextSource text)
+		{
+			document.Insert (offset, text.Text);
+		}
+
+		void ITextDocument.RemoveText (int offset, int length)
+		{
+			document.Remove (offset, length);
+		}
+
+		void ITextDocument.ReplaceText (int offset, int length, string value)
+		{
+			document.Replace (offset, length, value);
+		}
+
+		void ITextDocument.ReplaceText (int offset, int length, MonoDevelop.Core.Text.ITextSource value)
+		{
+			document.Replace (offset, length, value.Text);
+		}
+
+		IDisposable ITextDocument.OpenUndoGroup ()
+		{
+			return document.OpenUndoGroup ();
+		}
+
+		IReadonlyTextDocument ITextDocument.CreateDocumentSnapshot ()
+		{
+			return new ReadonlyDocumentSnapshot (document);
+		}
+
+		string ITextDocument.Text {
+			get {
+				return document.Text;
+			}
+			set {
+				document.Text = value;
+			}
+		}
+
+		bool ITextDocument.IsReadOnly {
+			get {
+				return document.ReadOnly;
+			}
+			set {
+				document.ReadOnly = value;
+			}
+		}
+
+		FilePath ITextDocument.FileName {
+			get {
+				return document.FileName;
+			}
+			set {
+				document.FileName = value;
+			}
+		}
+
+		event EventHandler ITextDocument.FileNameChanged {
+			add {
+				document.FileNameChanged += value;
+			}
+			remove {
+				document.FileNameChanged -= value;
+			}
+		}
+
+		string ITextDocument.MimeType {
+			get {
+				return document.MimeType;
+			}
+			set {
+				document.MimeType = value;
+			}
+		}
+
+		event EventHandler ITextDocument.MimeTypeChanged {
+			add {
+				document.MimeTypeChanged += value;
+			}
+			remove {
+				document.MimeTypeChanged -= value;
+			}
+		}
+
+
+
+		bool ITextDocument.UseBOM {
+			get {
+				return document.UseBom;
+			}
+			set {
+				document.UseBom = value;
+			}
+		}
+
+		System.Text.Encoding ITextDocument.Encoding {
+			get {
+				return document.Encoding;
+			}
+			set {
+				document.Encoding = value;
+			}
+		}
+
+		bool ITextDocument.IsInAtomicUndo {
+			get {
+				return document.IsInAtomicUndo;
+			}
+		}
+
+		char ITextDocument.this [int offset] {
+			get {
+				return document.GetCharAt (offset);
+			}
+			set {
+				document.Replace (offset, 1, value.ToString ());
+			}
+		}
+
+		char MonoDevelop.Core.Text.ITextSource.this [int offset] {
+			get {
+				return document.GetCharAt (offset);
+			}
+		}
+
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineChanged;
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineInserted;
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineRemoved;
+
+		#endregion
+
+		#region IReadonlyTextDocument implementation
+
+		int IReadonlyTextDocument.LocationToOffset (int line, int column)
+		{
+			return document.LocationToOffset (line, column);
+		}
+
+		MonoDevelop.Ide.Editor.DocumentLocation IReadonlyTextDocument.OffsetToLocation (int offset)
+		{
+			var loc = document.OffsetToLocation (offset);
+			return new MonoDevelop.Ide.Editor.DocumentLocation (loc.Line, loc.Column);
+		}
+
+		IDocumentLine IReadonlyTextDocument.GetLine (int lineNumber)
+		{
+			var line = document.GetLine (lineNumber);
+			return line != null ? new DocumentLineWrapper (line) : null;
+		}
+
+		IDocumentLine IReadonlyTextDocument.GetLineByOffset (int offset)
+		{
+			var line = document.GetLineByOffset (offset);
+			return line != null ? new DocumentLineWrapper (line) : null;
+		}
+
+		bool IReadonlyTextDocument.IsReadOnly {
+			get {
+				return document.ReadOnly;
+			}
+		}
+
+		FilePath IReadonlyTextDocument.FileName {
+			get {
+				return document.FileName;
+			}
+		}
+
+		string IReadonlyTextDocument.MimeType {
+			get {
+				return document.MimeType;
+			}
+		}
+
+		int IReadonlyTextDocument.LineCount {
+			get {
+				return document.LineCount;
+			}
+		}
+
+		#endregion
+
+		#region ITextSource implementation
+
+		string MonoDevelop.Core.Text.ITextSource.GetTextAt (int offset, int length)
+		{
+			return document.GetTextAt (offset, length);
+		}
+
+		MonoDevelop.Core.Text.ITextSourceVersion MonoDevelop.Core.Text.ITextSource.Version {
+			get {
+				return new TextSourceVersionWrapper (document.Version);
+			}
+		}
+
+		bool MonoDevelop.Core.Text.ITextSource.UseBOM {
+			get {
+				return document.UseBom;
+			}
+		}
+
+		System.Text.Encoding MonoDevelop.Core.Text.ITextSource.Encoding {
+			get {
+				return document.Encoding;
+			}
+		}
+
+		int MonoDevelop.Core.Text.ITextSource.Length {
+			get {
+				return document.TextLength;
+			}
+		}
+
+		string MonoDevelop.Core.Text.ITextSource.Text {
+			get {
+				return document.Text;
+			}
+		}
+
+		char MonoDevelop.Core.Text.ITextSource.GetCharAt (int offset)
+		{
+			return document.GetCharAt (offset);
+		}
+
+
+		TextReader MonoDevelop.Core.Text.ITextSource.CreateReader ()
+		{
+			return document.CreateReader ();
+		}
+
+		TextReader MonoDevelop.Core.Text.ITextSource.CreateReader (int offset, int length)
+		{
+			return document.CreateReader (offset, length);
+		}
+
+		void MonoDevelop.Core.Text.ITextSource.WriteTextTo (TextWriter writer)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (document.Text);
+		}
+
+		void MonoDevelop.Core.Text.ITextSource.WriteTextTo (TextWriter writer, int offset, int length)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (document.GetTextAt (offset, length));
+		}
+
+		ITextSource ITextSource.CreateSnapshot ()
+		{
+			return new ImmutableTextTextSource (document.GetImmutableText (), document.Encoding, document.UseBom, new TextSourceVersionWrapper (document.Version));
+		}
+
+		ITextSource ITextSource.CreateSnapshot (int offset, int length)
+		{
+			return new ImmutableTextTextSource (document.GetImmutableText (offset, length), document.Encoding, document.UseBom);
+		}
+
+		/// <inheritdoc/>
+		public void CopyTo (int sourceIndex, char [] destination, int destinationIndex, int count)
+		{
+			document.CopyTo (sourceIndex, destination, destinationIndex, count); 
+		}
+
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ImmutableTextTextSource.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ImmutableTextTextSource.cs
new file mode 100644
index 0000000000..92778ef40b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ImmutableTextTextSource.cs
@@ -0,0 +1,131 @@
+//
+// RopeTextSource.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+using Mono.TextEditor.Utils;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class ImmutableTextTextSource : ITextSource
+	{
+		readonly ImmutableText immutableText;
+		readonly ITextSourceVersion version;
+
+		public ImmutableTextTextSource (ImmutableText immutableText, System.Text.Encoding encoding, bool useBom, ITextSourceVersion version = null)
+		{
+			if (immutableText == null)
+				throw new ArgumentNullException (nameof (immutableText));
+			this.immutableText = immutableText;
+			this.encoding = encoding;
+			UseBOM = useBom;
+			this.version = version;
+		}
+
+		#region ITextSource implementation
+		char ITextSource.GetCharAt (int offset)
+		{
+			return immutableText [offset];
+		}
+
+		char ITextSource.this [int offset] {
+			get {
+				return immutableText [offset];
+			}
+		}
+
+		string ITextSource.GetTextAt (int offset, int length)
+		{
+			return immutableText.ToString (offset, length);
+		}
+
+		System.IO.TextReader ITextSource.CreateReader ()
+		{
+			return new ImmutableTextTextReader (immutableText);
+		}
+
+		System.IO.TextReader ITextSource.CreateReader (int offset, int length)
+		{
+			return new ImmutableTextTextReader (immutableText.GetText (offset, length));
+		}
+
+		void ITextSource.WriteTextTo (System.IO.TextWriter writer)
+		{
+			immutableText.WriteTo (writer, 0, immutableText.Length);
+		}
+
+		void ITextSource.WriteTextTo (System.IO.TextWriter writer, int offset, int length)
+		{
+			immutableText.WriteTo (writer, offset, length);
+		}
+
+		ITextSource ITextSource.CreateSnapshot ()
+		{
+			return this;
+		}
+
+		ITextSource ITextSource.CreateSnapshot (int offset, int length)
+		{
+			return new ImmutableTextTextSource (immutableText.GetText (offset, length), Encoding, UseBOM);
+		}
+
+		ITextSourceVersion ITextSource.Version {
+			get {
+				return version;
+			}
+		}
+
+		public bool UseBOM {
+			get;
+			private set;
+		}
+
+		System.Text.Encoding encoding;
+		public System.Text.Encoding Encoding {
+			get {
+				return encoding ?? System.Text.Encoding.UTF8;
+			}
+		}
+
+		int ITextSource.Length {
+			get {
+				return immutableText.Length;
+			}
+		}
+
+		string ITextSource.Text {
+			get {
+				return immutableText.ToString ();
+			}
+		}
+
+		/// <inheritdoc/>
+		void ITextSource.CopyTo (int sourceIndex, char [] destination, int destinationIndex, int count)
+		{
+			immutableText.CopyTo (sourceIndex, destination, destinationIndex, count); 
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/IndentationTrackerWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/IndentationTrackerWrapper.cs
new file mode 100644
index 0000000000..a88ecf421c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/IndentationTrackerWrapper.cs
@@ -0,0 +1,83 @@
+// IndentationTrackerWrapper.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class IndentationTrackerWrapper : Mono.TextEditor.IIndentationTracker
+	{
+		readonly IReadonlyTextDocument document;
+		readonly MonoDevelop.Ide.Editor.Extension.IndentationTracker indentationTracker;
+
+		public IndentationTrackerWrapper (Mono.TextEditor.TextEditorData textEditorData, IReadonlyTextDocument document, MonoDevelop.Ide.Editor.Extension.IndentationTracker indentationTracker)
+		{
+			if (textEditorData == null)
+				throw new System.ArgumentNullException ("textEditorData");
+			if (document == null)
+				throw new System.ArgumentNullException ("document");
+			if (indentationTracker == null)
+				throw new System.ArgumentNullException ("indentationTracker");
+			this.document = document;
+			this.indentationTracker = indentationTracker;
+		}
+
+		#region IIndentationTracker implementation
+
+		IndentatitonTrackerFeatures IIndentationTracker.SupportedFeatures {
+			get {
+				return (IndentatitonTrackerFeatures)indentationTracker.SupportedFeatures;
+			}
+		}
+
+		string Mono.TextEditor.IIndentationTracker.GetIndentationString (int offset)
+		{
+			return indentationTracker.GetIndentationString (document.OffsetToLineNumber (offset));
+		}
+
+		string Mono.TextEditor.IIndentationTracker.GetIndentationString (int lineNumber, int column)
+		{
+			return indentationTracker.GetIndentationString (lineNumber);
+		}
+
+		static int CountIndent (string str)
+		{
+			// '\t' == 1 - virtual indent is here the character indent not the visual one.
+			return str.Length;
+		}
+
+		int Mono.TextEditor.IIndentationTracker.GetVirtualIndentationColumn (int offset)
+		{
+			return 1 + CountIndent(((Mono.TextEditor.IIndentationTracker)this).GetIndentationString (offset));
+		}
+
+		int Mono.TextEditor.IIndentationTracker.GetVirtualIndentationColumn (int lineNumber, int column)
+		{
+			return 1 + CountIndent(((Mono.TextEditor.IIndentationTracker)this).GetIndentationString (lineNumber, column));
+		}
+		#endregion
+	}
+}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ReadonlyDocumentSnapshot.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ReadonlyDocumentSnapshot.cs
new file mode 100644
index 0000000000..b35d08b6a0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ReadonlyDocumentSnapshot.cs
@@ -0,0 +1,184 @@
+//
+// ReadonlyDocumentSnapshot.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using Mono.TextEditor.Utils;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class ReadonlyDocumentSnapshot : IReadonlyTextDocument
+	{
+		readonly Mono.TextEditor.TextDocument snapshot;
+		readonly MonoDevelop.Core.Text.ITextSourceVersion version;
+
+		public ReadonlyDocumentSnapshot (Mono.TextEditor.TextDocument textDocument)
+		{
+			snapshot = textDocument.CreateDocumentSnapshot ();
+			version = new TextSourceVersionWrapper (textDocument.Version);
+		}
+
+		#region IReadonlyTextDocument implementation
+
+		int IReadonlyTextDocument.LocationToOffset (int line, int column)
+		{
+			return snapshot.LocationToOffset (line, column);
+		}
+
+		DocumentLocation IReadonlyTextDocument.OffsetToLocation (int offset)
+		{
+			var loc = snapshot.OffsetToLocation (offset);
+			return new MonoDevelop.Ide.Editor.DocumentLocation (loc.Line, loc.Column);
+		}
+
+		IDocumentLine IReadonlyTextDocument.GetLine (int lineNumber)
+		{
+			var line = snapshot.GetLine (lineNumber);
+			return line != null ? new DocumentLineWrapper (line) : null;
+		}
+
+		IDocumentLine IReadonlyTextDocument.GetLineByOffset (int offset)
+		{
+			var line = snapshot.GetLineByOffset (offset);
+			return line != null ? new DocumentLineWrapper (line) : null;
+		}
+
+		bool IReadonlyTextDocument.IsReadOnly {
+			get {
+				return true;
+			}
+		}
+
+		MonoDevelop.Core.FilePath IReadonlyTextDocument.FileName {
+			get {
+				return snapshot.FileName;
+			}
+		}
+
+		string IReadonlyTextDocument.MimeType {
+			get {
+				return snapshot.MimeType;
+			}
+		}
+
+		int IReadonlyTextDocument.LineCount {
+			get {
+				return snapshot.LineCount;
+			}
+		}
+
+		#endregion
+
+		#region ITextSource implementation
+
+		char MonoDevelop.Core.Text.ITextSource.GetCharAt (int offset)
+		{
+			return snapshot.GetCharAt (offset);
+		}
+
+		char MonoDevelop.Core.Text.ITextSource.this [int offset] {
+			get {
+				return snapshot.GetCharAt (offset);
+			}
+		}
+
+		string MonoDevelop.Core.Text.ITextSource.GetTextAt (int offset, int length)
+		{
+			return snapshot.GetTextAt (offset, length);
+		}
+
+		System.IO.TextReader MonoDevelop.Core.Text.ITextSource.CreateReader ()
+		{
+			return snapshot.CreateReader ();
+		}
+
+		System.IO.TextReader MonoDevelop.Core.Text.ITextSource.CreateReader (int offset, int length)
+		{
+			return snapshot.CreateReader (offset, length);
+		}
+
+		void MonoDevelop.Core.Text.ITextSource.WriteTextTo (System.IO.TextWriter writer)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (snapshot.Text);
+		}
+
+		void MonoDevelop.Core.Text.ITextSource.WriteTextTo (System.IO.TextWriter writer, int offset, int length)
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			writer.Write (snapshot.GetTextAt (offset, length));
+		}
+
+		MonoDevelop.Core.Text.ITextSource MonoDevelop.Core.Text.ITextSource.CreateSnapshot ()
+		{
+			return this;
+		}
+
+		MonoDevelop.Core.Text.ITextSource MonoDevelop.Core.Text.ITextSource.CreateSnapshot (int offset, int length)
+		{
+			return new ImmutableTextTextSource (snapshot.GetImmutableText (offset, length), snapshot.Encoding, snapshot.UseBom);
+		}
+
+		MonoDevelop.Core.Text.ITextSourceVersion MonoDevelop.Core.Text.ITextSource.Version {
+			get {
+				return version;
+			}
+		}
+
+		bool MonoDevelop.Core.Text.ITextSource.UseBOM {
+			get {
+				return snapshot.UseBom;
+			}
+		}
+
+		System.Text.Encoding MonoDevelop.Core.Text.ITextSource.Encoding {
+			get {
+				return snapshot.Encoding;
+			}
+		}
+
+		int MonoDevelop.Core.Text.ITextSource.Length {
+			get {
+				return snapshot.TextLength;
+			}
+		}
+
+		string MonoDevelop.Core.Text.ITextSource.Text {
+			get {
+				return snapshot.Text;
+			}
+		}
+
+		/// <inheritdoc/>
+		public void CopyTo (int sourceIndex, char [] destination, int destinationIndex, int count)
+		{
+			snapshot.CopyTo (sourceIndex, destination, destinationIndex, count); 
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SelectionSurroundingProviderWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SelectionSurroundingProviderWrapper.cs
new file mode 100644
index 0000000000..516a662f6b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SelectionSurroundingProviderWrapper.cs
@@ -0,0 +1,58 @@
+//
+// SelectionSurroundingProviderWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.SourceEditor.Wrappers;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class SelectionSurroundingProviderWrapper : ISelectionSurroundingProvider
+	{
+		readonly MonoDevelop.Ide.Editor.Extension.SelectionSurroundingProvider surroundingProvider;
+
+		public SelectionSurroundingProviderWrapper (MonoDevelop.Ide.Editor.Extension.SelectionSurroundingProvider surroundingProvider)
+		{
+			if (surroundingProvider == null)
+				throw new ArgumentNullException ("surroundingProvider");
+			this.surroundingProvider = surroundingProvider;
+		}
+
+		#region ISelectionSurroundingProvider implementation
+
+		bool ISelectionSurroundingProvider.GetSelectionSurroundings (TextEditorData textEditorData, uint unicodeKey, out string start, out string end)
+		{
+			return surroundingProvider.GetSelectionSurroundings (unicodeKey, out start, out end);
+		}
+
+		void ISelectionSurroundingProvider.HandleSpecialSelectionKey (TextEditorData textEditorData, uint unicodeKey)
+		{
+			surroundingProvider.HandleSpecialSelectionKey (unicodeKey);
+		}
+
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SemanticHighlightingSyntaxMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SemanticHighlightingSyntaxMode.cs
new file mode 100644
index 0000000000..47ec20530c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/SemanticHighlightingSyntaxMode.cs
@@ -0,0 +1,236 @@
+//
+// SemanticHighlightingSyntaxMode.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor.Highlighting;
+using MonoDevelop.Ide.Editor.Highlighting;
+using Mono.TextEditor;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
+using Gtk;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	sealed class SemanticHighlightingSyntaxMode : SyntaxMode, IDisposable
+	{
+		readonly ExtensibleTextEditor editor;
+		readonly SyntaxMode syntaxMode;
+		SemanticHighlighting semanticHighlighting;
+
+		public override TextDocument Document {
+			get {
+				return syntaxMode.Document;
+			}
+			set {
+				syntaxMode.Document = value;
+			}
+		}
+
+		public Mono.TextEditor.Highlighting.SyntaxMode UnderlyingSyntaxMode {
+			get {
+				return this.syntaxMode;
+			}
+		}
+
+		internal class StyledTreeSegment : Mono.TextEditor.TreeSegment
+		{
+			public string Style {
+				get;
+				private set;
+			}
+
+			public StyledTreeSegment (int offset, int length, string style) : base (offset, length)
+			{
+				Style = style;
+			}
+		}
+
+		class HighlightingSegmentTree : Mono.TextEditor.SegmentTree<StyledTreeSegment>
+		{
+			public bool GetStyle (Chunk chunk, ref int endOffset, out string style)
+			{
+				var segment = GetSegmentsAt (chunk.Offset).FirstOrDefault (s => s.EndOffset > chunk.Offset);
+				if (segment == null) {
+					style = null;
+					return false;
+				}
+				endOffset = segment.EndOffset;
+				style = segment.Style;
+				return true;
+			}
+
+			public void AddStyle (MonoDevelop.Core.Text.ISegment segment, string style)
+			{
+				if (IsDirty)
+					return;
+				Add (new StyledTreeSegment (segment.Offset, segment.Length, style));
+			}
+		}
+
+		bool isDisposed;
+		Queue<Tuple<DocumentLine, HighlightingSegmentTree>> lineSegments = new Queue<Tuple<DocumentLine, HighlightingSegmentTree>> ();
+
+		public SemanticHighlightingSyntaxMode (ExtensibleTextEditor editor, ISyntaxMode syntaxMode, SemanticHighlighting semanticHighlighting)
+		{
+			if (editor == null)
+				throw new ArgumentNullException ("editor");
+			if (syntaxMode == null)
+				throw new ArgumentNullException ("syntaxMode");
+			if (semanticHighlighting == null)
+				throw new ArgumentNullException ("semanticHighlighting");
+			this.editor = editor;
+			this.semanticHighlighting = semanticHighlighting;
+			this.syntaxMode = syntaxMode as SyntaxMode;
+			semanticHighlighting.SemanticHighlightingUpdated += SemanticHighlighting_SemanticHighlightingUpdated;
+		}
+
+		public void UpdateSemanticHighlighting (SemanticHighlighting newHighlighting)
+		{
+			if (isDisposed)
+				return;
+			if (semanticHighlighting !=null)
+				semanticHighlighting.SemanticHighlightingUpdated -= SemanticHighlighting_SemanticHighlightingUpdated;
+			semanticHighlighting = newHighlighting;
+			if (semanticHighlighting !=null)
+				semanticHighlighting.SemanticHighlightingUpdated += SemanticHighlighting_SemanticHighlightingUpdated;
+		}
+
+		void SemanticHighlighting_SemanticHighlightingUpdated (object sender, EventArgs e)
+		{
+			Application.Invoke (delegate {
+				if (isDisposed)
+					return;
+				UnregisterLineSegmentTrees ();
+				lineSegments.Clear ();
+
+				var margin = editor.TextViewMargin;
+				if (margin == null)
+					return;
+				margin.PurgeLayoutCache ();
+				editor.QueueDraw ();
+			});
+		}
+
+		void UnregisterLineSegmentTrees ()
+		{
+			if (isDisposed)
+				return;
+			foreach (var kv in lineSegments) {
+				try {
+					kv.Item2.RemoveListener ();
+				} catch (Exception) {
+				}
+			}
+		}
+
+		public void Dispose()
+		{
+			if (isDisposed)
+				return;
+			isDisposed = true;
+			UnregisterLineSegmentTrees ();
+			lineSegments = null;
+			semanticHighlighting.SemanticHighlightingUpdated -= SemanticHighlighting_SemanticHighlightingUpdated;
+		}
+
+		public override SpanParser CreateSpanParser (Mono.TextEditor.DocumentLine line, CloneableStack<Span> spanStack)
+		{
+			return syntaxMode.CreateSpanParser (line, spanStack);
+		}
+
+		public override ChunkParser CreateChunkParser (SpanParser spanParser, Mono.TextEditor.Highlighting.ColorScheme style, DocumentLine line)
+		{
+			return new CSharpChunkParser (this, spanParser, style, line);
+		}
+
+		class CSharpChunkParser : ChunkParser
+		{
+			const int MaximumCachedLineSegments = 200;
+			SemanticHighlightingSyntaxMode semanticMode;
+
+			public CSharpChunkParser (SemanticHighlightingSyntaxMode semanticMode, SpanParser spanParser, Mono.TextEditor.Highlighting.ColorScheme style, DocumentLine line) : base (semanticMode, spanParser, style, line)
+			{
+				this.semanticMode = semanticMode;
+			}
+
+			protected override void AddRealChunk (Chunk chunk)
+			{
+				if (!DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting) {
+					base.AddRealChunk (chunk);
+					return;
+				}
+				StyledTreeSegment treeseg = null;
+
+				try {
+					var tree = semanticMode.lineSegments.FirstOrDefault (t => t.Item1 == line);
+					if (tree == null) {
+						tree = Tuple.Create (line, new HighlightingSegmentTree ());
+						tree.Item2.InstallListener (semanticMode.Document); 
+						int lineOffset = line.Offset;
+						foreach (var seg in semanticMode.semanticHighlighting.GetColoredSegments (new MonoDevelop.Core.Text.TextSegment (lineOffset, line.Length))) {
+							tree.Item2.AddStyle (seg, seg.ColorStyleKey);
+						}
+						while (semanticMode.lineSegments.Count > MaximumCachedLineSegments) {
+							var removed = semanticMode.lineSegments.Dequeue ();
+							try {
+								removed.Item2.RemoveListener ();
+							} catch (Exception) { }
+						}
+						semanticMode.lineSegments.Enqueue (tree);
+					}
+					treeseg = tree.Item2.GetSegmentsOverlapping (chunk).FirstOrDefault (s => s.Offset < chunk.EndOffset && s.EndOffset > chunk.Offset);
+				} catch (Exception e) {
+					Console.WriteLine ("Error in semantic highlighting: " + e);
+				}
+
+				if (treeseg != null) {
+					if (treeseg.Offset - chunk.Offset > 0)
+						AddRealChunk (new Chunk (chunk.Offset, treeseg.Offset - chunk.Offset, chunk.Style));
+
+					var startOffset = Math.Max (chunk.Offset, treeseg.Offset);
+					var endOffset = Math.Min (treeseg.EndOffset, chunk.EndOffset);
+
+					base.AddRealChunk (new Chunk (startOffset, endOffset - startOffset, treeseg.Style));
+
+					if (endOffset < chunk.EndOffset)
+						AddRealChunk (new Chunk (treeseg.EndOffset, chunk.EndOffset - endOffset, chunk.Style));
+					return;
+				}
+
+				base.AddRealChunk (chunk);
+			}
+
+			protected override string GetStyle (Chunk chunk)
+			{
+				/*if (spanParser.CurRule.Name == "Comment") {
+					if (tags.Contains (doc.GetTextAt (chunk))) 
+						return "Comment Tag";
+				}*/
+				return base.GetStyle (chunk);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextChangeEventArgsWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextChangeEventArgsWrapper.cs
new file mode 100644
index 0000000000..754bb26cad
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextChangeEventArgsWrapper.cs
@@ -0,0 +1,37 @@
+//
+// TextSourceVersionWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TextChangeEventArgsWrapper : TextChangeEventArgs
+	{
+		public TextChangeEventArgsWrapper (ICSharpCode.NRefactory.Editor.TextChangeEventArgs change) : base (change.Offset, change.RemovedText.Text, change.InsertedText.Text)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextPasteHandlerWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextPasteHandlerWrapper.cs
new file mode 100644
index 0000000000..765e39f7a2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextPasteHandlerWrapper.cs
@@ -0,0 +1,68 @@
+// SourceEditorView.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TextPasteHandlerWrapper : ICSharpCode.NRefactory.Editor.ITextPasteHandler, IDisposable
+	{
+		readonly MonoDevelop.Ide.Editor.Extension.TextPasteHandler textPasteHandler;
+		readonly Mono.TextEditor.TextEditorData data;
+
+		public TextPasteHandlerWrapper (Mono.TextEditor.TextEditorData data, MonoDevelop.Ide.Editor.Extension.TextPasteHandler textPasteHandler)
+		{
+			this.data = data;
+			this.textPasteHandler = textPasteHandler;
+			data.Paste += HandlePaste;
+		}
+
+		void HandlePaste (int insertionOffset, string text, int insertedChars)
+		{
+			textPasteHandler.PostFomatPastedText (insertionOffset, insertedChars);
+		}
+
+		#region IDisposable implementation
+
+		public void Dispose ()
+		{
+			data.Paste -= HandlePaste;
+		}
+
+		#endregion
+
+		#region ITextPasteHandler implementation
+
+		string ICSharpCode.NRefactory.Editor.ITextPasteHandler.FormatPlainText (int offset, string text, byte[] copyData)
+		{
+			return textPasteHandler.FormatPlainText (offset, text, copyData);
+		}
+
+		byte[] ICSharpCode.NRefactory.Editor.ITextPasteHandler.GetCopyData (ICSharpCode.NRefactory.Editor.ISegment segment)
+		{
+			return textPasteHandler.GetCopyData (segment.Offset, segment.Length);
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextSourceVersionWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextSourceVersionWrapper.cs
new file mode 100644
index 0000000000..f185268b4d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TextSourceVersionWrapper.cs
@@ -0,0 +1,71 @@
+//
+// TextSourceVersionWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Text;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TextSourceVersionWrapper : ITextSourceVersion
+	{
+		readonly ICSharpCode.NRefactory.Editor.ITextSourceVersion version;
+
+		public TextSourceVersionWrapper (ICSharpCode.NRefactory.Editor.ITextSourceVersion version)
+		{
+			if (version == null)
+				throw new ArgumentNullException ("version");
+			this.version = version;
+		}
+
+		#region ITextSourceVersion implementation
+
+		bool ITextSourceVersion.BelongsToSameDocumentAs (ITextSourceVersion other)
+		{
+			var otherWrapper = other as TextSourceVersionWrapper;
+			return otherWrapper != null && version.BelongsToSameDocumentAs (otherWrapper.version);
+		}
+
+		int ITextSourceVersion.CompareAge (ITextSourceVersion other)
+		{
+			var otherWrapper = (TextSourceVersionWrapper)other;
+			return version.CompareAge (otherWrapper.version);
+		}
+
+		System.Collections.Generic.IEnumerable<TextChangeEventArgs> ITextSourceVersion.GetChangesTo (ITextSourceVersion other)
+		{
+			var otherWrapper = (TextSourceVersionWrapper)other;
+			foreach (var change in version.GetChangesTo (otherWrapper.version))
+				yield return new TextChangeEventArgsWrapper (change);
+		}
+
+		int ITextSourceVersion.MoveOffsetTo (ITextSourceVersion other, int oldOffset)
+		{
+			var otherWrapper = (TextSourceVersionWrapper)other;
+			return version.MoveOffsetTo (otherWrapper.version, oldOffset);
+		}
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs
new file mode 100644
index 0000000000..148b925256
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/TooltipProviderWrapper.cs
@@ -0,0 +1,144 @@
+//
+// TooltipProviderWrapper.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Mono.TextEditor;
+using MonoDevelop.Ide;
+using Xwt.GtkBackend;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.SourceEditor.Wrappers
+{
+	class TooltipProviderWrapper : TooltipProvider, IDisposable
+	{
+		readonly MonoDevelop.Ide.Editor.TooltipProvider provider;
+		TooltipItem lastWrappedItem;
+		Ide.Editor.TooltipItem lastUnwrappedItem;
+
+		public MonoDevelop.Ide.Editor.TooltipProvider OriginalProvider {
+			get {
+				return provider;
+			}
+		}
+
+		public TooltipProviderWrapper (MonoDevelop.Ide.Editor.TooltipProvider provider)
+		{
+			if (provider == null)
+				throw new ArgumentNullException (nameof (provider));
+			this.provider = provider;
+		}
+
+		#region implemented abstract members of TooltipProvider
+
+		static MonoDevelop.Ide.Editor.TextEditor WrapEditor (MonoTextEditor editor)
+		{
+			foreach (var doc in IdeApp.Workbench.Documents) {
+				if (doc.FileName == editor.FileName)
+					return doc.Editor;
+			}
+			return null;
+		}
+
+		public override async Task<TooltipItem> GetItem (MonoTextEditor editor, int offset, CancellationToken token = default(CancellationToken))
+		{
+			var wrappedEditor = WrapEditor (editor);
+			if (wrappedEditor == null)
+				return null;
+			var doc = IdeApp.Workbench.ActiveDocument;
+			if (doc == null)
+				return null;
+			var task = provider.GetItem (wrappedEditor, doc, offset, token);
+			if (task == null) {
+				LoggingService.LogWarning ("Tooltip provider " + provider + " gave back null on GetItem (should always return a non null task).");
+				return null;
+			}
+			var item = await task;
+			if (item == null)
+				return null;
+			if (lastUnwrappedItem != null) {
+				if (lastUnwrappedItem.Offset == item.Offset &&
+					lastUnwrappedItem.Length == item.Length &&
+					lastUnwrappedItem.Item.Equals (item.Item)) {
+					return lastWrappedItem;
+				}
+			}
+			lastUnwrappedItem = item;
+			return lastWrappedItem = new TooltipItem (item.Item, item.Offset, item.Length);
+		}
+
+		public override bool IsInteractive (MonoTextEditor editor, Gtk.Window tipWindow)
+		{
+			var wrappedEditor = WrapEditor (editor);
+			if (wrappedEditor == null)
+				return false;
+			return provider.IsInteractive (wrappedEditor, tipWindow);
+		}
+
+		public override Gtk.Window CreateTooltipWindow (MonoTextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
+		{
+			var wrappedEditor = WrapEditor (editor);
+			if (wrappedEditor == null)
+				return null;
+			var control = provider.CreateTooltipWindow (wrappedEditor, IdeApp.Workbench.ActiveDocument, new MonoDevelop.Ide.Editor.TooltipItem (item.Item, item.ItemSegment.Offset, item.ItemSegment.Length), offset, modifierState.ToXwtValue ());
+			if (control == null)
+				return null;
+			return (Gtk.Window)control;
+		}
+
+		protected override void GetRequiredPosition (MonoTextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
+		{
+			var wrappedEditor = WrapEditor (editor);
+			if (wrappedEditor == null) {
+				requiredWidth = 0;
+				xalign = 0;
+				return;
+			}
+			provider.GetRequiredPosition (wrappedEditor, tipWindow, out requiredWidth, out xalign);
+		}
+
+		public override Gtk.Window ShowTooltipWindow (MonoTextEditor editor, Gtk.Window tipWindow, int offset, Gdk.ModifierType modifierState, int mouseX, int mouseY, TooltipItem item)
+		{
+			var wrappedEditor = WrapEditor (editor);
+			if (wrappedEditor == null) {
+				return tipWindow;
+			}
+			provider.ShowTooltipWindow (wrappedEditor, tipWindow, new MonoDevelop.Ide.Editor.TooltipItem (item.Item, item.ItemSegment.Offset, item.ItemSegment.Length), modifierState.ToXwtValue (), mouseX, mouseY);
+			return tipWindow;
+		}
+
+		public void Dispose ()
+		{
+			var disposableProvider = provider as IDisposable;
+			if (disposableProvider != null) {
+				disposableProvider.Dispose ();
+			}
+			lastWrappedItem = null;
+			lastUnwrappedItem = null;
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
index 2bae84f1f8..112f02c8fb 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
@@ -38,29 +38,6 @@
 		<ExtensionNode name="Class" />
 	</ExtensionPoint>
 
-	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/TooltipProviders" name = "Tooltip providers">
-		<Description>Tooltip providers. Classes must implement ITooltipProvider.</Description>
-		<ExtensionNode name="Class" />
-		<ConditionType id="FileType" type="MonoDevelop.Ide.Extensions.FileTypeCondition">
-			<Description>Type of the file being edited.</Description>
-		</ConditionType>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/SyntaxModes" name = "Text editor syntax modes">
-		<Description>Syntax modes</Description>
-		<ExtensionNode name="Templates" type="MonoDevelop.SourceEditor.Extension.TemplateCodon"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/Styles" name = "Text editor styles">
-		<Description>Styles</Description>
-		<ExtensionNode name="Templates" type="MonoDevelop.SourceEditor.Extension.TemplateCodon"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/SourceEditor2/CustomModes" name = "Text editor custom syntax modes">
-		<Description>Styles</Description>
-		<ExtensionNode name="SyntaxMode" type="MonoDevelop.SourceEditor.SyntaxModeCodon"/>
-	</ExtensionPoint>
-
 	<!-- Extensions -->
 	<Extension path = "/MonoDevelop/SourceEditor2/TooltipProviders">
 		<Class id="Debug" class="MonoDevelop.SourceEditor.DebugValueTooltipProvider" />
@@ -97,30 +74,6 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/Commands/TextEditor">
-		<Command id = "MonoDevelop.SourceEditor.SourceEditorCommands.DynamicAbbrev"
-				defaultHandler = "MonoDevelop.SourceEditor.DynamicAbbrevHandler"
-				_label = "Dynamic abbrev"
-				_description = "Cycles completing the current word from matching words in all open files"
-				macShortcut = "Ctrl|/"
-				shortcut = "Alt|/" />
-		<Command id = "MonoDevelop.SourceEditor.SourceEditorCommands.PulseCaret"
-				_label = "Find caret"
-				_description = "Animates the text editor caret to help find it"
-				shortcut = "Ctrl||"
-				macShortcut = "Meta||" />
-		<Command id = "MonoDevelop.SourceEditor.SourceEditorCommands.ToggleErrorTextMarker"
-				_label = "Toggle message bubble"
-				_description = "Toggles message bubble on/off"/>
-		
-		<Command id = "MonoDevelop.SourceEditor.MessageBubbleCommands.HideIssues"
-				defaultHandler = "MonoDevelop.SourceEditor.HideIssuesHandler"
-				_label = "_Hide Issues"/>
-
-		<Command id = "MonoDevelop.SourceEditor.MessageBubbleCommands.ToggleIssues"
-				defaultHandler = "MonoDevelop.SourceEditor.ToggleIssuesHandler"
-				_label = "Toggle Issues"
-				type="array"/>
-
 		<Command id = "MonoDevelop.SourceEditor.QuickTasks.ScrollbarCommand.Top"
 				_label = "_Top"/>
 		<Command id = "MonoDevelop.SourceEditor.QuickTasks.ScrollbarCommand.Bottom"
@@ -137,13 +90,6 @@
 				type="radio"/>
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Ide/DisplayBindings">
-		<DisplayBinding
-			id = "TextEditor"
-			insertafter ="DefaultDisplayBinding"
-			class = "MonoDevelop.SourceEditor.SourceEditorDisplayBinding" />
-	</Extension>
-
 	<Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor">
 		<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.MarkerOperations" />
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ExpressionEvaluator" />
@@ -189,30 +135,21 @@
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.DisableAllBreakpoints" />
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ClearAllBreakpoints" />
 		<CommandItem id = "MonoDevelop.Debugger.DebugCommands.ShowBreakpointProperties" />
-		<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.ToggleErrorTextMarker" />
+		<CommandItem id = "MonoDevelop.Ide.Editor.MessageBubbleCommands.Toggle" />
 	</Extension>
 
 	<Extension path="/MonoDevelop/Ide/GlobalOptionsDialog/TextEditor">
 		<Section id="General" insertbefore="Formatting" _label="General" fill="true" class="MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel" icon="md-prefs-text-editor-general" />
 		<Section id="Markers" _label="Markers and Rulers" class="MonoDevelop.SourceEditor.OptionPanels.MarkerPanel" icon="md-prefs-markers-rulers" />
 		<Section id="Behavior" _label="Behavior" class="MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel" icon="md-prefs-text-editor-behavior" />
-		<Section id="CodeCompletion" _label="Code Completion" icon="md-prefs-completion-behavior">
-			<Panel id="CompletionBehavior" _label="Behavior" class="MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel" icon="md-prefs-completion-behavior" />
+		<Section id="CodeCompletion" _label="Code Completion" icon="md-prefs-completion">
+			<Panel id="CompletionBehavior" _label="Behavior" class="MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel" icon="md-prefs-completion" />
 			<!-- <Section id="CompletionCharacters" _label="Completion Characters" class="MonoDevelop.SourceEditor.OptionPanels.CompletionCharactersPanel" /> -->
-			<Panel id="CompletionAppearance" _label="Appearance" class="MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel" icon="md-prefs-completion-appearance" />
+			<Panel id="CompletionAppearance" _label="Appearance" class="MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel" icon="md-prefs-completion" />
 		</Section>
 		<Section id="SyntaxHighlighting" _label="Syntax Highlighting" fill="true" class="MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel" icon="md-prefs-syntax-highlighting" />
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Ide/MainMenu/View">
-		<ItemSet id = "MessageBubbles" _label = "_Message Bubbles" insertafter="MonoDevelop.Ide.Commands.ViewCommands.ViewList" insertbefore="ViewSeparator3">
-			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.ToggleErrorTextMarker" />
-			<CommandItem id = "MonoDevelop.SourceEditor.MessageBubbleCommands.HideIssues" />
-			<SeparatorItem id = "Separator1" />
-			<CommandItem id = "MonoDevelop.SourceEditor.MessageBubbleCommands.ToggleIssues" />
-		</ItemSet>
-	</Extension>
-	
 	<Extension path = "/MonoDevelop/Ide/MainMenu/Search">
 		<ItemSet id = "Inspect" _label = "Inspect" insertafter="MonoDevelop.Ide.Commands.ViewCommands.ShowNext" insertbefore="Separator3">
 			<CommandItem id = "MonoDevelop.SourceEditor.SourceEditorCommands.NextIssue" />
@@ -222,8 +159,12 @@
 		</ItemSet>
 	</Extension>
 
-	<Extension path = "/MonoDevelop/Ide/TextEditorExtensions">
-		<Class fileExtensions = ".json" class = "MonoDevelop.SourceEditor.JSon.JSonTextEditorExtension" />
+	<Extension path = "/MonoDevelop/SourceEditor2/EditorFactory">
+		<Class id = "SourceEditor" class="MonoDevelop.SourceEditor.EditorFactory" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/AutoInsertBracketHandler">
+		<Class id = "Default" class="MonoDevelop.SourceEditor.DefaultAutoInsertBracketHandler" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Core/UserDataMigration">
@@ -238,8 +179,7 @@
 		<StockIcon stockid="md-prefs-syntax-highlighting" resource="prefs-syntax-highlighting-16.png" size="Menu" />
 		<StockIcon stockid="md-prefs-text-editor-general" resource="prefs-text-editor-general-16.png" size="Menu" />
 		<StockIcon stockid="md-prefs-text-editor-behavior" resource="prefs-text-editor-behavior-16.png" size="Menu" />
-		<StockIcon stockid="md-prefs-completion-appearance" resource="prefs-completion-appearance-16.png" size="Menu" />
-		<StockIcon stockid="md-prefs-completion-behavior" resource="prefs-completion-behavior-16.png" size="Menu" />
+		<StockIcon stockid="md-prefs-completion" resource="prefs-completion-16.png" size="Menu" />
 	</Extension>
 	
 </ExtensionModel>
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
index 9c6b608723..c300831fcc 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
@@ -9,8 +9,9 @@
     <OutputType>Library</OutputType>
     <RootNamespace>MonoDevelop.SourceEditor</RootNamespace>
     <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
+    <AssemblyName>MonoDevelop.SourceEditor</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <AssemblyName>MonoDevelop.SourceEditor2</AssemblyName>
+    <AssemblyName>MonoDevelop.SourceEditor</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -67,11 +68,6 @@
       <Name>MonoDevelop.Debugger</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
@@ -97,6 +93,16 @@
       <Name>ICSharpCode.NRefactory.CSharp</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
+      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
+      <Name>Mono.TextEditor</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\xwt\Xwt.Gtk\Xwt.Gtk.csproj">
+      <Project>{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}</Project>
+      <Name>Xwt.Gtk</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -119,6 +125,18 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -126,8 +144,6 @@
     <Compile Include="MonoDevelop.SourceEditor\EditActions.cs" />
     <Compile Include="MonoDevelop.SourceEditor\ExtensibleTextEditor.cs" />
     <Compile Include="MonoDevelop.SourceEditor\LanguageItemWindow.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\SourceEditorDisplayBinding.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\SourceEditorOptions.cs" />
     <Compile Include="MonoDevelop.SourceEditor\SourceEditorView.cs" />
     <Compile Include="MonoDevelop.SourceEditor\SourceEditorWidget.cs" />
     <Compile Include="MonoDevelop.SourceEditor.OptionPanels\BehaviorPanel.cs" />
@@ -141,27 +157,17 @@
     <Compile Include="MonoDevelop.SourceEditor\CompileErrorTooltipProvider.cs" />
     <Compile Include="MonoDevelop.SourceEditor\DebugValueWindow.cs" />
     <Compile Include="MonoDevelop.SourceEditor\DebugValueTooltipProvider.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.Extension\TemplateCodon.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.Extension\TemplateExtensionNodeLoader.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\IdeViMode.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.GotoLineNumberWidget.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\StyledSourceEditorOptions.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\ISourceEditorOptions.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\AutoSave.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\SyntaxModeCodon.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\SyntaxModeService.cs" />
     <Compile Include="MonoDevelop.SourceEditor\Counters.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\DynamicAbbrevHandler.cs" />
     <Compile Include="MonoDevelop.SourceEditor\PinnedWatchWidget.cs" />
     <Compile Include="MonoDevelop.SourceEditor\SourceEditorPrintOperation.cs" />
     <Compile Include="MonoDevelop.SourceEditor\PrintSettingsWidget.cs" />
     <Compile Include="gtk-gui\MonoDevelop.SourceEditor.PrintSettingsWidget.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\MessageBubbleCommands.cs" />
     <Compile Include="MonoDevelop.SourceEditor\MessageBubbleTextMarker.cs" />
     <Compile Include="MonoDevelop.SourceEditor\MessageBubbleCache.cs" />
     <Compile Include="MonoDevelop.SourceEditor.OptionPanels\ColorShemeEditor.cs" />
@@ -171,11 +177,8 @@
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskStrip.cs" />
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\ScrollbarCommand.cs" />
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\ScrollBarMode.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\IQuickTaskProvider.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTask.cs" />
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskMiniMapMode.cs" />
     <Compile Include="MonoDevelop.SourceEditor.QuickTasks\QuickTaskOverviewMode.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.QuickTasks\IUsageProvider.cs" />
     <Compile Include="MonoDevelop.SourceEditor\FileRegistry.cs" />
     <Compile Include="MonoDevelop.SourceEditor\SearchAndReplaceOptions.cs" />
     <Compile Include="MonoDevelop.SourceEditor\ErrorText.cs" />
@@ -187,10 +190,34 @@
     <Compile Include="MonoDevelop.SourceEditor.OptionPanels\CompletionCharactersPanel.cs" />
     <Compile Include="MonoDevelop.SourceEditor\OverlayMessageWindow.cs" />
     <Compile Include="MonoDevelop.SourceEditor\HoverCloseButton.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.JSon\JSonIndentationTracker.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.JSon\JSonIndentEngine.cs" />
-    <Compile Include="MonoDevelop.SourceEditor.JSon\JSonTextEditorExtension.cs" />
-    <Compile Include="MonoDevelop.SourceEditor\AbstractUsagesExtension.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\DocumentLineWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\ITextDocumentWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UsageSegmentMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\DebugTextMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\EditorFactory.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TextSourceVersionWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TextChangeEventArgsWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TextPasteHandlerWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\SelectionSurroundingProviderWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\IndentationTrackerWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\WavedLineMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\GrayOutMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\SmartTagMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UrlTextLineMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\AsmLineMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\LinkMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\ListDataProviderWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\TooltipProviderWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\UnitTestMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\FoldSegmentWrapper.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\StyledSourceEditorOptions.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\SemanticHighlightingSyntaxMode.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\ReadonlyDocumentSnapshot.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\TextMarker\ErrorMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SyntaxModeLoader.cs" />
+    <Compile Include="MonoDevelop.SourceEditor.Wrappers\ImmutableTextTextSource.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\SearchInSelectionMarker.cs" />
+    <Compile Include="MonoDevelop.SourceEditor\DefaultAutoInsertBracketHandler.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -199,45 +226,90 @@
     <EmbeddedResource Include="MonoDevelop.SourceEditor.addin.xml">
       <LogicalName>MonoDevelop.SourceEditor.addin.xml</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.SourceEditor\searchoptions.png">
-      <LogicalName>searchoptions.png</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-busy-16.png">
       <LogicalName>issues-busy-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-busy-16%402x.png">
       <LogicalName>issues-busy-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-busy-16~dark.png">
+      <LogicalName>issues-busy-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-busy-16~dark%402x.png">
+      <LogicalName>issues-busy-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-error-16.png">
       <LogicalName>issues-error-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-error-16%402x.png">
       <LogicalName>issues-error-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-error-16~dark.png">
+      <LogicalName>issues-error-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-error-16~dark%402x.png">
+      <LogicalName>issues-error-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-ok-16.png">
       <LogicalName>issues-ok-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-ok-16%402x.png">
       <LogicalName>issues-ok-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-ok-16~dark.png">
+      <LogicalName>issues-ok-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-ok-16~dark%402x.png">
+      <LogicalName>issues-ok-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-suggestion-16.png">
       <LogicalName>issues-suggestion-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-suggestion-16%402x.png">
       <LogicalName>issues-suggestion-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-suggestion-16~dark.png">
+      <LogicalName>issues-suggestion-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-suggestion-16~dark%402x.png">
+      <LogicalName>issues-suggestion-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-warning-16.png">
       <LogicalName>issues-warning-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\issues-warning-16%402x.png">
       <LogicalName>issues-warning-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-warning-16~dark.png">
+      <LogicalName>issues-warning-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\issues-warning-16~dark%402x.png">
+      <LogicalName>issues-warning-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\find-options-22x32.png">
+      <LogicalName>find-options-22x32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\find-options-22x32%402x.png">
+      <LogicalName>find-options-22x32@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\find-options-22x32~dark.png">
+      <LogicalName>find-options-22x32~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\find-options-22x32~dark%402x.png">
+      <LogicalName>find-options-22x32~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-bookmark-15.png">
       <LogicalName>gutter-bookmark-15.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-bookmark-15%402x.png">
       <LogicalName>gutter-bookmark-15@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-bookmark-15~dark.png">
+      <LogicalName>gutter-bookmark-15~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-bookmark-15~dark%402x.png">
+      <LogicalName>gutter-bookmark-15~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\gutter-error-15.png">
       <LogicalName>gutter-error-15.png</LogicalName>
     </EmbeddedResource>
@@ -256,40 +328,126 @@
     <EmbeddedResource Include="icons\prefs-markers-rulers-16%402x.png">
       <LogicalName>prefs-markers-rulers-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-markers-rulers-16~dark.png">
+      <LogicalName>prefs-markers-rulers-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-markers-rulers-16~dark%402x.png">
+      <LogicalName>prefs-markers-rulers-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-markers-rulers-16~sel.png">
+      <LogicalName>prefs-markers-rulers-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-markers-rulers-16~sel%402x.png">
+      <LogicalName>prefs-markers-rulers-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-markers-rulers-16~dark~sel.png">
+      <LogicalName>prefs-markers-rulers-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-markers-rulers-16~dark~sel%402x.png">
+      <LogicalName>prefs-markers-rulers-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-syntax-highlighting-16.png">
       <LogicalName>prefs-syntax-highlighting-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-syntax-highlighting-16%402x.png">
       <LogicalName>prefs-syntax-highlighting-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~dark.png">
+      <LogicalName>prefs-syntax-highlighting-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~dark%402x.png">
+      <LogicalName>prefs-syntax-highlighting-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~sel.png">
+      <LogicalName>prefs-syntax-highlighting-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~sel%402x.png">
+      <LogicalName>prefs-syntax-highlighting-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~dark~sel.png">
+      <LogicalName>prefs-syntax-highlighting-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~dark~sel%402x.png">
+      <LogicalName>prefs-syntax-highlighting-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-text-editor-general-16.png">
       <LogicalName>prefs-text-editor-general-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-text-editor-general-16%402x.png">
       <LogicalName>prefs-text-editor-general-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-general-16~dark.png">
+      <LogicalName>prefs-text-editor-general-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-general-16~dark%402x.png">
+      <LogicalName>prefs-text-editor-general-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-general-16~sel.png">
+      <LogicalName>prefs-text-editor-general-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-general-16~sel%402x.png">
+      <LogicalName>prefs-text-editor-general-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-general-16~dark~sel.png">
+      <LogicalName>prefs-text-editor-general-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-general-16~dark~sel%402x.png">
+      <LogicalName>prefs-text-editor-general-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-text-editor-behavior-16.png">
       <LogicalName>prefs-text-editor-behavior-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-text-editor-behavior-16%402x.png">
       <LogicalName>prefs-text-editor-behavior-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-completion-appearance-16.png">
-      <LogicalName>prefs-completion-appearance-16.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~dark.png">
+      <LogicalName>prefs-text-editor-behavior-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~dark%402x.png">
+      <LogicalName>prefs-text-editor-behavior-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~sel.png">
+      <LogicalName>prefs-text-editor-behavior-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~sel%402x.png">
+      <LogicalName>prefs-text-editor-behavior-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~dark~sel.png">
+      <LogicalName>prefs-text-editor-behavior-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~dark~sel%402x.png">
+      <LogicalName>prefs-text-editor-behavior-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-completion-16.png">
+      <LogicalName>prefs-completion-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-completion-16%402x.png">
+      <LogicalName>prefs-completion-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-completion-16~dark.png">
+      <LogicalName>prefs-completion-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-completion-16~dark%402x.png">
+      <LogicalName>prefs-completion-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-completion-16~sel.png">
+      <LogicalName>prefs-completion-16~sel.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-completion-appearance-16%402x.png">
-      <LogicalName>prefs-completion-appearance-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-completion-16~sel%402x.png">
+      <LogicalName>prefs-completion-16~sel@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-completion-behavior-16.png">
-      <LogicalName>prefs-completion-behavior-16.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-completion-16~dark~sel.png">
+      <LogicalName>prefs-completion-16~dark~sel.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-completion-behavior-16%402x.png">
-      <LogicalName>prefs-completion-behavior-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-completion-16~dark~sel%402x.png">
+      <LogicalName>prefs-completion-16~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Folder Include="MonoDevelop.SourceEditor\" />
     <Folder Include="MonoDevelop.SourceEditor.QuickTasks\" />
+    <Folder Include="MonoDevelop.SourceEditor.Wrappers\" />
+    <Folder Include="MonoDevelop.SourceEditor\TextMarker\" />
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs
index b2e4e24551..45ec1def05 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs
@@ -138,7 +138,7 @@ namespace MonoDevelop.SourceEditor
 
 				CancelTooltip ();
 				var token = tooltipCancelSrc.Token;
-				Task.Factory.StartNew (delegate {
+				Task.Run (delegate {
 					var list = GetReferences (result, token).ToList ();
 					if (!token.IsCancellationRequested) {
 						Gtk.Application.Invoke (delegate {
@@ -251,7 +251,7 @@ namespace MonoDevelop.SourceEditor
 			OnUsagesUpdated (EventArgs.Empty);
 		}
 
-		public class UsageMarker : TextLineMarker
+		class UsageMarker : TextLineMarker
 		{
 			List<UsageSegment> usages = new List<UsageSegment> ();
 
@@ -312,7 +312,7 @@ namespace MonoDevelop.SourceEditor
 							lg.AddColorStop (0, colorStyle.Color);
 							lg.AddColorStop (1, colorStyle.SecondColor);
 							cr.SetSource (lg);
-							cr.RoundedRectangle (@from + 0.5, y + 1.5, to - @from - 1, editor.LineHeight - 2, editor.LineHeight / 4);
+							cr.RoundedRectangle (@from - 0.5, y + 0.5, to - @from + 1, editor.LineHeight - 1, 2);
 							cr.FillPreserve ();
 						}
 
@@ -324,7 +324,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		public class UsageSegment
+		class UsageSegment
 		{
 			public readonly ReferenceUsageType UsageType;
 			public readonly TextSegment TextSegment;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AutoSave.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AutoSave.cs
deleted file mode 100644
index c96c5161bb..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AutoSave.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-//
-// AutoSave.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using MonoDevelop.Core;
-using Gtk;
-
-namespace MonoDevelop.SourceEditor
-{
-	static class AutoSave
-	{
-		//FIXME: is this path a good one? wouldn't it be better to put autosaves beside the files anyway?
-		static string autoSavePath = UserProfile.Current.CacheDir.Combine ("AutoSave");
-		static bool autoSaveEnabled;
-		
-		static AutoSave ()
-		{
-			try {
-				if (!Directory.Exists (autoSavePath))
-					Directory.CreateDirectory (autoSavePath);
-			} catch (Exception e) {
-				LoggingService.LogError ("Can't create auto save path:" + autoSavePath +". Auto save is disabled.", e);
-				autoSaveEnabled = false;
-				return;
-			}
-			autoSaveEnabled = true;
-			StartAutoSaveThread ();
-		}
-
-		static string GetAutoSaveFileName (string fileName)
-		{
-			if (fileName == null)
-				return null;
-			string newFileName = Path.Combine (Path.GetDirectoryName (fileName), Path.GetFileNameWithoutExtension (fileName) + Path.GetExtension (fileName) + "~");
-			newFileName = Path.Combine (autoSavePath, newFileName.Replace(',','_').Replace(" ","").Replace (":","").Replace (Path.DirectorySeparatorChar, '_').Replace (Path.AltDirectorySeparatorChar, '_'));
-			return newFileName;
-		}
-
-		public static bool AutoSaveExists (string fileName)
-		{
-			if (!autoSaveEnabled)
-				return false;
-			try {
-				var autoSaveFilename = GetAutoSaveFileName (fileName);
-				bool autoSaveExists = File.Exists (autoSaveFilename);
-				if (autoSaveExists) {
-					if (File.GetLastWriteTimeUtc (autoSaveFilename) < File.GetLastWriteTimeUtc (fileName)) {
-						File.Delete (autoSaveFilename);
-						return false;
-					}
-				}
-				return autoSaveExists;
-			} catch (Exception e) {
-				LoggingService.LogError ("Error in auto save - disableing.", e);
-				DisableAutoSave ();
-				return false;
-			}
-		}
-
-		static void CreateAutoSave (string fileName, string content)
-		{
-			if (!autoSaveEnabled)
-				return;
-			try {
-				// Directory may have removed/unmounted. Therefore this operation is not guaranteed to work.
-				string tmpFile = Path.GetTempFileName ();
-				File.WriteAllText (tmpFile, content);
-
-				var autosaveFileName = GetAutoSaveFileName (fileName);
-				if (File.Exists (autosaveFileName))
-					File.Delete (autosaveFileName);
-				File.Move (tmpFile, autosaveFileName);
-				Counters.AutoSavedFiles++;
-			} catch (Exception e) {
-				LoggingService.LogError ("Error in auto save while creating: " + fileName +". Disableing auto save.", e);
-				DisableAutoSave ();
-			}
-		}
-
-#region AutoSave
-		class FileContent
-		{
-			public string FileName;
-			public Mono.TextEditor.TextDocument Content;
-
-			public FileContent (string fileName, Mono.TextEditor.TextDocument content)
-			{
-				this.FileName = fileName;
-				this.Content = content;
-			}
-		}
-
-		public static bool Running {
-			get {
-				return autoSaveThreadRunning;
-			}
-		}
-
-		static readonly AutoResetEvent resetEvent = new AutoResetEvent (false);
-		static readonly AutoResetEvent saveEvent = new AutoResetEvent (false);
-		static bool autoSaveThreadRunning = false;
-		static Thread autoSaveThread;
-		static Queue<FileContent> queue = new Queue<FileContent> ();
-		static object contentLock = new object ();
-
-		static void StartAutoSaveThread ()
-		{
-			autoSaveThreadRunning = true;
-			if (autoSaveThread == null) {
-				autoSaveThread = new Thread (AutoSaveThread);
-				autoSaveThread.Name = "Autosave";
-				autoSaveThread.IsBackground = true;
-				autoSaveThread.Start ();
-			}
-		}
-
-		static void AutoSaveThread ()
-		{
-			while (autoSaveThreadRunning) {
-				resetEvent.WaitOne ();
-				while (queue.Count > 0) {
-					var content = queue.Dequeue ();
-					// Don't create an auto save for unsaved files.
-					if (string.IsNullOrEmpty (content.FileName))
-						continue;
-					string text = null;
-					bool set = false;
-					Application.Invoke (delegate {
-						try {
-							text = content.Content.Text;
-							set = true;
-						} catch (Exception e) {
-							LoggingService.LogError ("Exception in auto save thread.", e);
-							return;
-						} finally {
-							saveEvent.Set();
-						}
-					}
-					);
-					saveEvent.WaitOne ();
-					if (set)
-						CreateAutoSave (content.FileName, text);
-				}
-			}
-		}
-
-		public static string LoadAutoSave (string fileName)
-		{
-			string autoSaveFileName = GetAutoSaveFileName (fileName);
-			return Mono.TextEditor.Utils.TextFileUtility.ReadAllText (autoSaveFileName);
-		}
-
-		public static void RemoveAutoSaveFile (string fileName)
-		{
-			if (!autoSaveEnabled)
-				return;
-			if (AutoSaveExists (fileName)) {
-				string autoSaveFileName = GetAutoSaveFileName (fileName);
-				try {
-					lock (contentLock) {
-						File.Delete (autoSaveFileName);
-					}
-				} catch (Exception e) {
-					LoggingService.LogError ("Can't delete auto save file: " + autoSaveFileName +". Disableing auto save.", e);
-					DisableAutoSave ();
-				}
-			}
-		}
-
-		public static void InformAutoSaveThread (Mono.TextEditor.TextDocument content)
-		{
-			if (content == null || !autoSaveEnabled)
-				return;
-			if (content.IsDirty) {
-				queue.Enqueue (new FileContent (content.FileName, content));
-				resetEvent.Set ();
-			} else {
-				RemoveAutoSaveFile (content.FileName);
-			}
-		}
-
-		public static void DisableAutoSave ()
-		{
-			autoSaveThreadRunning = false;
-			if (autoSaveThread != null) {
-				resetEvent.Set ();
-				autoSaveThread.Join ();
-				autoSaveThread = null;
-			}
-			autoSaveEnabled = false;
-		}
-#endregion
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs
index 45dc49b306..203b0280f3 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/CompileErrorTooltipProvider.cs
@@ -26,50 +26,51 @@
 //
 
 using System;
-using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Components;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MonoDevelop.SourceEditor
 {
-	
-	
-	public class CompileErrorTooltipProvider: TooltipProvider
+	class CompileErrorTooltipProvider: TooltipProvider
 	{
-		
-		public CompileErrorTooltipProvider()
+		internal static ExtensibleTextEditor GetExtensibleTextEditor (TextEditor editor)
 		{
+			var view = editor.GetContent<SourceEditorView> ();
+			if (view == null)
+				return null;
+			return view.TextEditor;
 		}
 
 		#region ITooltipProvider implementation 
-		
-		public override TooltipItem GetItem (Mono.TextEditor.TextEditor editor, int offset)
+		public override Task<TooltipItem> GetItem (TextEditor editor, DocumentContext ctx, int offset, CancellationToken token = default(CancellationToken))
 		{
-			var ed = editor as ExtensibleTextEditor;
+			var ed = GetExtensibleTextEditor (editor);
 			if (ed == null)
-				return null;
+				return Task.FromResult<TooltipItem> (null);
 
 			string errorInformation = ed.GetErrorInformationAt (offset);
 			if (string.IsNullOrEmpty (errorInformation))
-				return null;
+				return Task.FromResult<TooltipItem> (null);
 
-			return new TooltipItem (errorInformation, editor.Document.GetLineByOffset (offset));
+			return Task.FromResult (new TooltipItem (errorInformation, editor.GetLineByOffset (offset)));
 		}
-		
-		protected override Gtk.Window CreateTooltipWindow (Mono.TextEditor.TextEditor editor, int offset, Gdk.ModifierType modifierState, TooltipItem item)
+
+		public override Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Xwt.ModifierKeys modifierState)
 		{
-			LanguageItemWindow result = new LanguageItemWindow ((ExtensibleTextEditor) editor, modifierState, null, (string)item.Item, null);
+			var result = new LanguageItemWindow (GetExtensibleTextEditor (editor), modifierState, null, (string)item.Item, null);
 			if (result.IsEmpty)
 				return null;
 			return result;
 		}
 		
-		protected override void GetRequiredPosition (Mono.TextEditor.TextEditor editor, Gtk.Window tipWindow, out int requiredWidth, out double xalign)
+		public override void GetRequiredPosition (TextEditor editor, Control tipWindow, out int requiredWidth, out double xalign)
 		{
-			LanguageItemWindow win = (LanguageItemWindow) tipWindow;
-			requiredWidth = win.SetMaxWidth (win.Screen.Width);
+			var win = (LanguageItemWindow) tipWindow;
+			requiredWidth = win.SetMaxWidth (win.Screen.Width / 4);
 			xalign = 0.5;
 		}
-
 		#endregion 
-		
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/Counters.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/Counters.cs
index 5d26f8797e..e55ef141ff 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/Counters.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/Counters.cs
@@ -34,6 +34,5 @@ namespace MonoDevelop.SourceEditor
 		public static Counter EditorsInMemory = InstrumentationService.CreateCounter ("Editors in Memory", "Text Editor");
 		public static Counter SourceViewsInMemory = InstrumentationService.CreateCounter ("Source Views in Memory", "Text Editor");
 		public static Counter LoadedEditors = InstrumentationService.CreateCounter ("Loaded Editors", "Text Editor");
-		public static Counter AutoSavedFiles = InstrumentationService.CreateCounter ("Autosaved Files", "Text Editor");
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
index 0445b5c58c..efd7a03a36 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
@@ -29,29 +29,31 @@
 using System;
 using System.Collections.Generic;
 
-using Mono.TextEditor;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Debugger;
 using MonoDevelop.Components;
 using Mono.Debugging.Client;
-using TextEditor = Mono.TextEditor.TextEditor;
+
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.CSharp.TypeSystem;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class DebugValueTooltipProvider: TooltipProvider, IDisposable
+	class DebugValueTooltipProvider: TooltipProvider
 	{
 		DebugValueWindow tooltip;
 		
 		public DebugValueTooltipProvider ()
 		{
 			DebuggingService.CurrentFrameChanged += CurrentFrameChanged;
-			DebuggingService.DebugSessionStarted += DebugSessionStarted;
-		}
-
-		void DebugSessionStarted (object sender, EventArgs e)
-		{
-			DebuggingService.DebuggerSession.TargetExited += TargetProcessExited;
+			DebuggingService.StoppedEvent += TargetProcessExited;
 		}
 
 		void CurrentFrameChanged (object sender, EventArgs e)
@@ -70,9 +72,10 @@ namespace MonoDevelop.SourceEditor
 
 		#region ITooltipProvider implementation
 
-		public override TooltipItem GetItem (TextEditor editor, int offset)
+
+		public override async Task<TooltipItem> GetItem (TextEditor editor, DocumentContext ctx, int offset, CancellationToken token = default(CancellationToken))
 		{
-			if (offset >= editor.Document.TextLength)
+			if (offset >= editor.Length)
 				return null;
 
 			if (!DebuggingService.IsDebugging || DebuggingService.IsRunning)
@@ -82,7 +85,9 @@ namespace MonoDevelop.SourceEditor
 			if (frame == null)
 				return null;
 
-			var ed = (ExtensibleTextEditor) editor;
+			var ed = CompileErrorTooltipProvider.GetExtensibleTextEditor (editor);
+			if (ed == null)
+				return null;
 			string expression = null;
 			int startOffset;
 
@@ -90,20 +95,22 @@ namespace MonoDevelop.SourceEditor
 				startOffset = ed.SelectionRange.Offset;
 				expression = ed.SelectedText;
 			} else {
-				var doc = IdeApp.Workbench.ActiveDocument;
+				var doc = ctx;
 				if (doc == null || doc.ParsedDocument == null)
 					return null;
 
 				var resolver = doc.GetContent<IDebuggerExpressionResolver> ();
-				var data = editor.GetTextEditorData ();
+				var data = doc.GetContent<SourceEditorView> ();
 
 				if (resolver != null) {
-					expression = resolver.ResolveExpression (data, doc, offset, out startOffset);
+					var result = await resolver.ResolveExpressionAsync (editor, doc, offset, token);
+					expression = result.Text;
+					startOffset = result.Span.Start;
 				} else {
-					int endOffset = data.FindCurrentWordEnd (offset);
-					startOffset = data.FindCurrentWordStart (offset);
+					int endOffset = data.GetTextEditorData ().FindCurrentWordEnd (offset);
+					startOffset = data.GetTextEditorData ().FindCurrentWordStart (offset);
 
-					expression = data.GetTextAt (startOffset, endOffset - startOffset);
+					expression = editor.GetTextAt (startOffset, endOffset - startOffset);
 				}
 			}
 			
@@ -123,40 +130,42 @@ namespace MonoDevelop.SourceEditor
 			
 			return new TooltipItem (val, startOffset, expression.Length);
 		}
-			
-		public override Gtk.Window ShowTooltipWindow (TextEditor editor, int offset, Gdk.ModifierType modifierState, int mouseX, int mouseY, TooltipItem item)
+
+		public override Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Xwt.ModifierKeys modifierState)
+		{
+			return new DebugValueWindow (editor, offset, DebuggingService.CurrentFrame, (ObjectValue) item.Item, null);
+		}
+
+		public override void ShowTooltipWindow (TextEditor editor, Control tipWindow, TooltipItem item, Xwt.ModifierKeys modifierState, int mouseX, int mouseY)
 		{
-			var location = editor.OffsetToLocation (item.ItemSegment.Offset);
+			var location = editor.OffsetToLocation (item.Offset);
 			var point = editor.LocationToPoint (location);
 			int lineHeight = (int) editor.LineHeight;
-			int y = point.Y;
+			int y = (int)point.Y;
 
 			// find the top of the line that the mouse is hovering over
 			while (y + lineHeight < mouseY)
 				y += lineHeight;
 
 			var caret = new Gdk.Rectangle (mouseX, y, 1, lineHeight);
-			tooltip = new DebugValueWindow (editor, offset, DebuggingService.CurrentFrame, (ObjectValue) item.Item, null);
+			tooltip = (DebugValueWindow)tipWindow;
 			tooltip.ShowPopup (editor, caret, PopupPosition.TopLeft);
-
-			return tooltip;
 		}
 
-		public override bool IsInteractive (TextEditor editor, Gtk.Window tipWindow)
+		public override bool IsInteractive (TextEditor editor, Control tipWindow)
 		{
 			return DebuggingService.IsDebugging;
 		}
 		
 		#endregion 
 		
-		#region IDisposable implementation
-		public void Dispose ()
+		public override void Dispose ()
 		{
+			if (IsDisposed)
+				return;
 			DebuggingService.CurrentFrameChanged -= CurrentFrameChanged;
-			DebuggingService.DebugSessionStarted -= DebugSessionStarted;
-			if (DebuggingService.DebuggerSession != null)
-				DebuggingService.DebuggerSession.TargetExited -= TargetProcessExited;
+			DebuggingService.StoppedEvent -= TargetProcessExited;
+			base.Dispose ();
 		}
-		#endregion
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
index 0c50ed2d0b..211578084c 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
@@ -34,10 +34,11 @@ using Gtk;
 using Mono.TextEditor;
 using Gdk;
 using MonoDevelop.Ide;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class BaseWindow : Gtk.Window
+	class BaseWindow : Gtk.Window
 	{
 		public BaseWindow () : base (Gtk.WindowType.Toplevel)
 		{
@@ -64,20 +65,51 @@ namespace MonoDevelop.SourceEditor
 		}
 	}
 
-	public class DebugValueWindow : PopoverWindow
+	class DebugValueWindow : PopoverWindow
 	{
 		ObjectValueTreeView tree;
 		ScrolledWindow sw;
 
-		public DebugValueWindow (Mono.TextEditor.TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch) : base (Gtk.WindowType.Toplevel)
+		static readonly string innerTreeName = "MonoDevelop.SourceEditor.DebugValueWindow.ObjectValueTreeView";
+		static string currentBgColor;
+
+		static DebugValueWindow ()
+		{
+			UpdateTreeStyle (Ide.Gui.Styles.PopoverWindow.DefaultBackgroundColor.ToCairoColor ());
+			Ide.Gui.Styles.Changed += (sender, e) => UpdateTreeStyle (Ide.Gui.Styles.PopoverWindow.DefaultBackgroundColor.ToCairoColor ());
+		}
+
+		static void UpdateTreeStyle (Cairo.Color newBgColor)
+		{
+			string oddRowColor, bgColor;
+
+			bgColor = CairoExtensions.ColorGetHex (newBgColor);
+			if (bgColor == currentBgColor)
+				return;
+
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light)
+				oddRowColor = CairoExtensions.ColorGetHex (newBgColor.AddLight (-0.02));
+			else
+				oddRowColor = CairoExtensions.ColorGetHex (newBgColor.AddLight (-0.02));
+
+			string rc = "style \"" + innerTreeName + "\" = \"treeview\" {\n";
+			rc += string.Format ("GtkTreeView::odd-row-color = \"{0}\"\n", oddRowColor);
+			rc += string.Format ("base[NORMAL] = \"{0}\"\n", bgColor);
+			rc += "\n}\n";
+			rc += string.Format ("widget \"*.{0}\" style \"{0}\" ", innerTreeName);
+
+			Rc.ParseString (rc);
+			currentBgColor = bgColor;
+		}
+
+		public DebugValueWindow (TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch) : base (Gtk.WindowType.Toplevel)
 		{
 			this.TypeHint = WindowTypeHint.PopupMenu;
 			this.AllowShrink = false;
 			this.AllowGrow = false;
 			this.Decorated = false;
 
-			TransientFor = (Gtk.Window)editor.Toplevel;
-
+			TransientFor = (Gtk.Window) (editor.GetNativeWidget <Gtk.Widget> ()).Toplevel;
 			// Avoid getting the focus when the window is shown. We'll get it when the mouse enters the window
 			AcceptFocus = false;
 
@@ -85,7 +117,10 @@ namespace MonoDevelop.SourceEditor
 			sw.HscrollbarPolicy = PolicyType.Never;
 			sw.VscrollbarPolicy = PolicyType.Never;
 
+			UpdateTreeStyle (Theme.BackgroundColor);
 			tree = new ObjectValueTreeView ();
+			tree.Name = innerTreeName;
+
 			sw.Add (tree);
 			ContentBox.Add (sw);
 
@@ -97,31 +132,49 @@ namespace MonoDevelop.SourceEditor
 			tree.AllowPinning = true;
 			tree.RootPinAlwaysVisible = true;
 			tree.PinnedWatch = watch;
-			DocumentLocation location = editor.Document.OffsetToLocation (offset);
+			var location = editor.OffsetToLocation (offset);
 			tree.PinnedWatchLine = location.Line;
-			tree.PinnedWatchFile = ((ExtensibleTextEditor)editor).View.ContentName;
+			tree.PinnedWatchFile = editor.FileName;
 
 			tree.AddValue (value);
 			tree.Selection.UnselectAll ();
 			tree.SizeAllocated += OnTreeSizeChanged;
-			tree.PinStatusChanged += delegate {
-				Destroy ();
-			};
+			tree.PinStatusChanged += OnPinStatusChanged;
 
 			sw.ShowAll ();
 
-			tree.StartEditing += delegate {
-				Modal = true;
-			};
-
-			tree.EndEditing += delegate {
-				Modal = false;
-			};
+			tree.StartEditing += OnStartEditing;
+			tree.EndEditing += OnEndEditing;
 
 			ShowArrow = true;
 			Theme.CornerRadius = 3;
 		}
 
+		void OnStartEditing (object sender, EventArgs args)
+		{
+			Modal = true;
+		}
+
+		void OnEndEditing (object sender, EventArgs args)
+		{
+			Modal = false;
+		}
+
+		void OnPinStatusChanged (object sender, EventArgs args)
+		{
+			Destroy ();
+		}
+
+		protected override void OnDestroyed ()

+		{
+			tree.StartEditing -= OnStartEditing;
+			tree.EndEditing -= OnEndEditing;
+			tree.PinStatusChanged -= OnPinStatusChanged;
+			tree.SizeAllocated -= OnTreeSizeChanged;
+

+			base.OnDestroyed ();

+		}
+
 		protected override bool OnEnterNotifyEvent (EventCrossing evnt)
 		{
 			if (!AcceptFocus)
@@ -167,11 +220,12 @@ namespace MonoDevelop.SourceEditor
 				this.GetPosition (out x, out y);
 				oldY = y;
 
-				Gdk.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen, Screen.GetMonitorAtPoint (x, y));
+				Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (x, y));
+				int top = (int)geometry.Top;
 				if (allocation.Height <= geometry.Height && y + allocation.Height >= geometry.Y + geometry.Height - edgeGap)
-					y = geometry.Top + (geometry.Height - allocation.Height - edgeGap);
-				if (y < geometry.Top + edgeGap)
-					y = geometry.Top + edgeGap;
+					y = top + ((int)geometry.Height - allocation.Height - edgeGap);
+				if (y < top + edgeGap)
+					y = top + edgeGap;
 
 				if (y != oldY) {
 					Move (x, y);
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DefaultAutoInsertBracketHandler.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DefaultAutoInsertBracketHandler.cs
new file mode 100644
index 0000000000..6298c61340
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DefaultAutoInsertBracketHandler.cs
@@ -0,0 +1,108 @@
+//
+// DefaultAutoInsertBracketHandler.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor.Highlighting;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.SourceEditor
+{
+	class DefaultAutoInsertBracketHandler : AutoInsertBracketHandler
+	{
+		const string openBrackets = "{[('\"";
+		const string closingBrackets = "}])'\"";
+
+		public override bool CanHandle (TextEditor editor)
+		{
+			return true;
+		}
+
+		public override bool Handle (TextEditor editor, DocumentContext ctx, KeyDescriptor descriptor)
+		{
+			int braceIndex = openBrackets.IndexOf (descriptor.KeyChar);
+			if (braceIndex < 0)
+				return false;
+			
+			var extEditor = ((SourceEditorView)editor.Implementation).SourceEditorWidget.TextEditor;
+
+			var line = extEditor.Document.GetLine (extEditor.Caret.Line);
+			if (line == null)
+				return false;
+
+			bool inStringOrComment = false;
+
+			var stack = line.StartSpan.Clone ();
+			var sm = extEditor.Document.SyntaxMode as SyntaxMode;
+			if (sm != null)
+				// extEditor.Caret.Offset - 1 means we care if we were inside string
+				// before typing current char
+				Mono.TextEditor.Highlighting.SyntaxModeService.ScanSpans (extEditor.Document, sm, sm, stack, line.Offset, extEditor.Caret.Offset - 1);
+			foreach (var span in stack) {
+				if (string.IsNullOrEmpty (span.Color))
+					continue;
+				if (span.Color.StartsWith ("String", StringComparison.Ordinal) ||
+				    span.Color.StartsWith ("Comment", StringComparison.Ordinal) ||
+				    span.Color.StartsWith ("Xml Attribute Value", StringComparison.Ordinal)) {
+					inStringOrComment = true;
+					break;
+				}
+			}
+			char insertionChar = '\0';
+			bool insertMatchingBracket = false;
+			if (!inStringOrComment) {
+				char closingBrace = closingBrackets [braceIndex];
+				char openingBrace = openBrackets [braceIndex];
+
+				int count = 0;
+				foreach (char curCh in ExtensibleTextEditor.GetTextWithoutCommentsAndStrings(extEditor.Document, 0, extEditor.Document.TextLength)) {
+					if (curCh == openingBrace) {
+						count++;
+					} else if (curCh == closingBrace) {
+						count--;
+					}
+				}
+
+				if (count >= 0) {
+					insertMatchingBracket = true;
+					insertionChar = closingBrace;
+				}
+			}
+
+			if (insertMatchingBracket) {
+				using (var undo = editor.OpenUndoGroup ()) {
+					editor.EnsureCaretIsNotVirtual ();
+					editor.InsertAtCaret (insertionChar.ToString ());
+					editor.CaretOffset--;
+					editor.StartSession (new SkipCharSession (insertionChar));
+				}
+				return true;
+			}
+
+			return false;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs
deleted file mode 100644
index db50031bb3..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DynamicAbbrevHandler.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// 
-// DynamicAbbrevHandler.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System.Linq;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui;
-using System.Collections.Generic;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.SourceEditor
-{
-	public class DynamicAbbrevHandler : CommandHandler
-	{
-		enum AbbrevState {
-			SearchBackward,
-			SearchForward,
-			SearchOtherBuffers,
-			CycleThroughFoundWords
-		}
-		
-		static SourceEditorView lastView = null;
-		static string           lastAbbrev = null;
-		static int              lastTriggerOffset = 0;
-		static int              lastInsertPos = 0;
-		static List<string>     foundWords = new List<string> ();
-		static int              lastStartOffset = 0;
-		static AbbrevState      curState;
-		
-		protected override void Run (object data)
-		{
-			MonoDevelop.Ide.Gui.Document doc = IdeApp.Workbench.ActiveDocument;
-			if (doc == null)
-				return;
-			SourceEditorView view = IdeApp.Workbench.ActiveDocument.GetContent<SourceEditorView> ();
-			if (view == null)
-				return;
-			
-			string abbrevWord;
-			int offset;
-			int startOffset;
-			
-			if (lastView == view && view.TextEditor.Caret.Offset == lastTriggerOffset) {
-				abbrevWord = lastAbbrev;
-				offset = lastStartOffset;
-			} else {
-				abbrevWord = GetWordBeforeCaret (view.TextEditor);
-				lastAbbrev = abbrevWord;
-				offset = view.TextEditor.Caret.Offset - abbrevWord.Length - 1;
-				lastInsertPos = lastTriggerOffset = offset + 1;
-				foundWords.Clear ();
-				foundWords.Add (abbrevWord);
-				curState = AbbrevState.SearchBackward;
-			}
-			
-			lastView = view;
-			switch (curState) {
-			case AbbrevState.SearchBackward:
-				while (offset > 0) {
-					if (IsMatchAt (view, offset, abbrevWord)) {
-						int endOffset = SearchEndPos (offset, view);
-						string curWord = view.TextEditor.Document.GetTextBetween (offset, endOffset);
-						if (foundWords.Contains (curWord)) {
-							offset--;
-							continue;
-						}
-						foundWords.Add (curWord);
-						ReplaceWord (view, curWord);
-						lastStartOffset = offset - 1;
-						return;
-					}
-					offset--;
-				}
-				offset = view.TextEditor.Caret.Offset;
-				curState = AbbrevState.SearchForward;
-				goto case AbbrevState.SearchForward;
-			case AbbrevState.SearchForward:
-				while (offset < view.TextEditor.Document.TextLength) {
-					if (IsMatchAt (view, offset, abbrevWord)) {
-						int endOffset = SearchEndPos (offset, view);
-						string curWord = view.TextEditor.Document.GetTextBetween (offset, endOffset);
-						if (foundWords.Contains (curWord)) {
-							offset++;
-							continue;
-						}
-						foundWords.Add (curWord);
-						ReplaceWord (view, curWord);
-						lastStartOffset = offset + 1;
-						return;
-					}
-					offset++;
-				}
-				curState = AbbrevState.SearchOtherBuffers;
-				goto case AbbrevState.SearchOtherBuffers;
-			case AbbrevState.SearchOtherBuffers:
-				foreach (Document curDoc in IdeApp.Workbench.Documents) {
-					SourceEditorView otherView = curDoc.GetContent<SourceEditorView> ();
-					if (curDoc == doc || otherView == null || otherView.Document == null)
-						continue;
-					for (int i = 0; i < otherView.Document.TextLength; i++) {
-						if (IsMatchAt (otherView, i, abbrevWord)) {
-							int endOffset = SearchEndPos (i, otherView);
-							string curWord = otherView.TextEditor.Document.GetTextBetween (i, endOffset);
-							if (foundWords.Contains (curWord))
-								continue;
-							foundWords.Add (curWord);
-						}
-					}
-				}
-				curState = AbbrevState.CycleThroughFoundWords;
-				goto case AbbrevState.CycleThroughFoundWords;
-			case AbbrevState.CycleThroughFoundWords:
-				int index = foundWords.IndexOf (view.TextEditor.Document.GetTextAt (lastInsertPos, view.TextEditor.Caret.Offset - lastInsertPos));
-				if (index < 0)
-					break;
-				startOffset = offset;
-				offset = startOffset + foundWords[index].Length;
-				index = (index + foundWords.Count + 1) % foundWords.Count;
-				ReplaceWord (view, foundWords[index]);
-				break;
-			}
-		}
-		
-		public static bool IsIdentifierPart (char ch)
-		{
-			return char.IsLetterOrDigit (ch) || ch == '_';
-		}
-		
-		static string GetWordBeforeCaret (MonoDevelop.SourceEditor.ExtensibleTextEditor editor)
-		{
-			int startOffset = editor.Caret.Offset;
-			int offset = startOffset - 1;
-			while (offset > 0) {
-				char ch = editor.Document.GetCharAt (offset);
-				if (!IsIdentifierPart (ch)) {
-					offset++;
-					break;
-				}
-				offset--;
-			}
-			if (offset >= startOffset)
-				return "";
-			return editor.Document.GetTextBetween (offset, startOffset);
-		}
-		
-		static void ReplaceWord (MonoDevelop.SourceEditor.SourceEditorView view, string curWord)
-		{
-			view.TextEditor.Replace (lastInsertPos, view.TextEditor.Caret.Offset - lastInsertPos, curWord);
-			view.TextEditor.Document.CommitLineUpdate (view.TextEditor.Caret.Line);
-			lastTriggerOffset = view.TextEditor.Caret.Offset;
-		}
-		
-		static int SearchEndPos (int offset, MonoDevelop.SourceEditor.SourceEditorView view)
-		{
-			while (offset < view.TextEditor.Document.TextLength && IsIdentifierPart (view.TextEditor.Document.GetCharAt (offset))) {
-				offset++;
-			}
-			return offset;
-		}
-		
-		static bool IsMatchAt (MonoDevelop.SourceEditor.SourceEditorView view, int offset, string abbrevWord)
-		{
-			if (offset + abbrevWord.Length >= view.TextEditor.Document.TextLength)
-				return false;
-			if (offset > 0 && IsIdentifierPart (view.TextEditor.Document.GetCharAt (offset - 1)))
-				return false;
-			if (offset + abbrevWord.Length < view.TextEditor.Document.TextLength && !IsIdentifierPart (view.TextEditor.Document.GetCharAt (offset + abbrevWord.Length)))
-				return false;
-			return view.TextEditor.Document.GetTextAt (offset, abbrevWord.Length) == abbrevWord;
-		}
-	}
-}
- 
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
index f126440083..bda75e6a0a 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
@@ -29,7 +29,7 @@ using System.Linq;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class TabAction
+	class TabAction
 	{
 		ExtensibleTextEditor editor;
 		
@@ -72,7 +72,7 @@ namespace MonoDevelop.SourceEditor
 		
 		static void RemoveCharBeforCaret (TextEditorData data)
 		{
-			if (!data.IsSomethingSelected && ((ISourceEditorOptions)data.Options).AutoInsertMatchingBracket) {
+			if (!data.IsSomethingSelected && MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket) {
 				if (data.Caret.Offset > 0) {
 					var line = data.GetLine (data.Caret.Line);
 					var stack = line.StartSpan.Clone();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditorFactory.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditorFactory.cs
new file mode 100644
index 0000000000..eba8185a7d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditorFactory.cs
@@ -0,0 +1,87 @@
+//
+// EditorFactory.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.SourceEditor.Wrappers;
+using Mono.TextEditor;
+using Mono.TextEditor.Highlighting;
+
+namespace MonoDevelop.SourceEditor
+{
+	sealed class EditorFactory : ITextEditorFactory
+	{
+
+		#region ITextEditorFactory implementation
+
+		ITextDocument ITextEditorFactory.CreateNewDocument ()
+		{
+			return new TextDocumentWrapper (new TextDocument ());
+		}
+
+		ITextDocument ITextEditorFactory.CreateNewDocument (MonoDevelop.Core.Text.ITextSource textSource, string fileName, string mimeType)
+		{
+			return new TextDocumentWrapper (new TextDocument (textSource.Text) {
+				Encoding = textSource.Encoding,
+				UseBom = textSource.UseBOM,
+				MimeType = mimeType,
+				FileName = fileName
+			});
+		}
+
+		IReadonlyTextDocument ITextEditorFactory.CreateNewReadonlyDocument (MonoDevelop.Core.Text.ITextSource textSource, string fileName, string mimeType)
+		{
+			return new TextDocumentWrapper (new TextDocument (textSource.Text) {
+				Encoding = textSource.Encoding,
+				UseBom = textSource.UseBOM,
+				ReadOnly = true,
+				MimeType = mimeType,
+				FileName = fileName
+			});
+		}
+
+		ITextEditorImpl ITextEditorFactory.CreateNewEditor ()
+		{
+			return new SourceEditorView ();
+		}
+
+		ITextEditorImpl ITextEditorFactory.CreateNewEditor (IReadonlyTextDocument document)
+		{
+			return new SourceEditorView (document);
+		}
+
+		string[] ITextEditorFactory.GetSyntaxProperties (string mimeType, string name)
+		{
+			var mode = SyntaxModeService.GetSyntaxMode (null, mimeType);
+			if (mode == null)
+				return null;
+			System.Collections.Generic.List<string> value;
+			if (!mode.Properties.TryGetValue (name, out value))
+				return null;
+			return value.ToArray ();
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs
index dadd156bd5..53219debb7 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ErrorText.cs
@@ -38,13 +38,13 @@ using MonoDevelop.Components;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class ErrorText
+	class ErrorText
 	{
-		public Task Task { get; set; }
+		public TaskListEntry Task { get; set; }
 		public bool IsError { get; set; }
 		public string ErrorMessage { get; set; }
 
-		public ErrorText (Task task, bool isError, string errorMessage)
+		public ErrorText (TaskListEntry task, bool isError, string errorMessage)
 		{
 			this.Task = task;
 			this.IsError = isError;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
index 84b2484b64..5d0098dd5f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
@@ -1,4 +1,4 @@
-// ExtendibleTextEditor.cs
+// ExtendibleTextEditor.cs
 //
 // Author:
 //   Mike Krüger <mkrueger@novell.com>
@@ -41,36 +41,89 @@ using Mono.Addins;
 using MonoDevelop.Projects.Text;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.CodeFormatting;
-using MonoDevelop.SourceEditor.Extension;
 using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.Semantics;
 using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Highlighting;
+using MonoDevelop.SourceEditor.Wrappers;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class ExtensibleTextEditor : Mono.TextEditor.TextEditor
+	class ExtensibleTextEditor : Mono.TextEditor.MonoTextEditor
 	{
 		internal object MemoryProbe = Counters.EditorsInMemory.CreateMemoryProbe ();
 		
 		SourceEditorView view;
-		ExtensionContext extensionContext;
 		Adjustment cachedHAdjustment, cachedVAdjustment;
 		
-		public ITextEditorExtension Extension {
-			get;
-			set;
+		TextEditorExtension editorExtension;
+		bool needToAddLastExtension;
+
+		public TextEditorExtension EditorExtension {
+			get {
+				return editorExtension;
+			}
+			set {
+				editorExtension = value;
+				needToAddLastExtension = true;
+			}
 		}
-		
-		public new ISourceEditorOptions Options {
-			get { return (ISourceEditorOptions)base.Options; }
+
+		SemanticHighlighting semanticHighlighting;
+		public SemanticHighlighting SemanticHighlighting {
+			get {
+				return semanticHighlighting;
+			}
+			set {
+				semanticHighlighting = value;
+				UpdateSemanticHighlighting ();
+			}
+		}
+
+		void UpdateSemanticHighlighting ()
+		{
+			var oldSemanticHighighting = Document.SyntaxMode as SemanticHighlightingSyntaxMode;
+
+			if (semanticHighlighting == null) {
+				if (oldSemanticHighighting != null)
+					Document.MimeType = Document.MimeType;
+			} else {
+				if (oldSemanticHighighting == null) {
+					Document.SyntaxMode = new SemanticHighlightingSyntaxMode (this, Document.SyntaxMode, semanticHighlighting);
+				} else {
+					oldSemanticHighighting.UpdateSemanticHighlighting (semanticHighlighting);
+				}
+			}
+		}
+
+		class LastEditorExtension : TextEditorExtension
+		{
+			readonly ExtensibleTextEditor ext;
+			public LastEditorExtension (ExtensibleTextEditor ext)
+			{
+				if (ext == null)
+					throw new ArgumentNullException ("ext");
+				this.ext = ext;
+			}
+			
+			public override bool KeyPress (KeyDescriptor descriptor)
+			{
+				var native =(Tuple<Gdk.Key, Gdk.ModifierType>)descriptor.NativeKeyChar;
+				ext.SimulateKeyPress (native.Item1, (uint)descriptor.KeyChar, native.Item2);
+				if (descriptor.SpecialKey == SpecialKey.Escape)
+					return true;
+				return false;
+			}
 		}
 
 		static ExtensibleTextEditor ()
 		{
 			var icon = Xwt.Drawing.Image.FromResource ("gutter-bookmark-15.png");
 
-			BookmarkMarker.DrawBookmarkFunc = delegate(TextEditor editor, Cairo.Context cr, DocumentLine lineSegment, double x, double y, double width, double height) {
+			BookmarkMarker.DrawBookmarkFunc = delegate(Mono.TextEditor.MonoTextEditor editor, Cairo.Context cr, DocumentLine lineSegment, double x, double y, double width, double height) {
 				if (!lineSegment.IsBookmarked)
 					return;
 				cr.DrawImage (
@@ -83,14 +136,14 @@ namespace MonoDevelop.SourceEditor
 
 		}
 		
-		public ExtensibleTextEditor (SourceEditorView view, ISourceEditorOptions options, Mono.TextEditor.TextDocument doc) : base(doc, options)
+		public ExtensibleTextEditor (SourceEditorView view, Mono.TextEditor.ITextEditorOptions options, Mono.TextEditor.TextDocument doc) : base(doc, options)
 		{
 			Initialize (view);
 		}
 
 		public ExtensibleTextEditor (SourceEditorView view)
 		{
-			base.Options = new StyledSourceEditorOptions (view.Project, null);
+			base.Options = new StyledSourceEditorOptions (DefaultSourceEditorOptions.Instance);
 			Initialize (view);
 		}
 		
@@ -101,53 +154,15 @@ namespace MonoDevelop.SourceEditor
 		void Initialize (SourceEditorView view)
 		{
 			this.view = view;
-			Caret.PositionChanged += delegate {
-				if (Extension != null) {
-					try {
-						Extension.CursorPositionChanged ();
-					} catch (Exception ex) {
-						ReportExtensionError (ex);
-					}
-				}
+
+			Document.SyntaxModeChanged += delegate {
+				UpdateSemanticHighlighting ();
 			};
-			
-			Document.TextReplaced += HandleSkipCharsOnReplace;
 
 			UpdateEditMode ();
 			this.DoPopupMenu = ShowPopup;
 		}
-		
-		void HandleSkipCharsOnReplace (object sender, DocumentChangeEventArgs args)
-		{
-			var skipChars = GetTextEditorData ().SkipChars;
-			for (int i = 0; i < skipChars.Count; i++) {
-				var sc = skipChars [i];
-				if (args.Offset > sc.Offset) {
-					skipChars.RemoveAt (i);
-					i--;
-					continue;
-				}
-				if (args.Offset <= sc.Offset) {
-					sc.Offset += args.ChangeDelta;
-				}
-			}
-		}
-		
-		public ExtensionContext ExtensionContext {
-			get {
-				return extensionContext;
-			}
-			set {
-				if (extensionContext != null) {
-					extensionContext.RemoveExtensionNodeHandler ("MonoDevelop/SourceEditor2/TooltipProviders", OnTooltipProviderChanged);
-					ClearTooltipProviders ();
-				}
-				extensionContext = value;
-				if (extensionContext != null)
-					extensionContext.AddExtensionNodeHandler ("MonoDevelop/SourceEditor2/TooltipProviders", OnTooltipProviderChanged);
-			}
-		}
-		
+
 		static bool? testNewViMode = null;
 		static bool TestNewViMode {
 			get {
@@ -159,22 +174,12 @@ namespace MonoDevelop.SourceEditor
 		
 		void UpdateEditMode ()
 		{
-			if (Options.UseViModes) {
-				if (TestNewViMode) {
-					if (!(CurrentMode is NewIdeViMode))
-					CurrentMode = new NewIdeViMode (this);
-				} else {
-					if (!(CurrentMode is IdeViMode))
-						CurrentMode = new IdeViMode (this);
-				}
-			} else {
-		//		if (!(CurrentMode is SimpleEditMode)){
-					SimpleEditMode simpleMode = new SimpleEditMode ();
-					simpleMode.KeyBindings [EditMode.GetKeyCode (Gdk.Key.Tab)] = new TabAction (this).Action;
-					simpleMode.KeyBindings [EditMode.GetKeyCode (Gdk.Key.BackSpace)] = EditActions.AdvancedBackspace;
-					CurrentMode = simpleMode;
-		//		}
-			}
+	//		if (!(CurrentMode is SimpleEditMode)){
+				SimpleEditMode simpleMode = new SimpleEditMode ();
+				simpleMode.KeyBindings [Mono.TextEditor.EditMode.GetKeyCode (Gdk.Key.Tab)] = new TabAction (this).Action;
+				simpleMode.KeyBindings [Mono.TextEditor.EditMode.GetKeyCode (Gdk.Key.BackSpace)] = EditActions.AdvancedBackspace;
+				CurrentMode = simpleMode;
+	//		}
 		}
 
 		void UnregisterAdjustments ()
@@ -187,35 +192,25 @@ namespace MonoDevelop.SourceEditor
 			cachedVAdjustment = null;
 		}
 
+		internal bool IsDestroyed { get; private set; }
+
 		protected override void OnDestroyed ()
 		{
+			IsDestroyed = true;
 			UnregisterAdjustments ();
-			Extension = null;
-			ExtensionContext = null;
 			view = null;
+			var disposableSyntaxMode = Document.SyntaxMode as IDisposable;
+			if (disposableSyntaxMode != null)  {
+				disposableSyntaxMode.Dispose ();
+				Document.SyntaxMode = null;
+			}
 			base.OnDestroyed ();
 			if (Options != null) {
 				Options.Dispose ();
 				base.Options = null;
 			}
 		}
-		
-		void OnTooltipProviderChanged (object s, ExtensionNodeEventArgs a)
-		{
-			TooltipProvider provider;
-			try {
-				provider = (TooltipProvider) a.ExtensionObject;
-			} catch (Exception e) {
-				LoggingService.LogError ("Can't create tooltip provider:"+ a.ExtensionNode, e);
-				return;
-			}
-			if (a.Change == ExtensionChange.Add) {
-				AddTooltipProvider (provider);
-			} else {
-				RemoveTooltipProvider (provider);
-			}
-		}
-		
+
 		public void FireOptionsChange ()
 		{
 			this.OptionsChanged (null, null);
@@ -230,6 +225,14 @@ namespace MonoDevelop.SourceEditor
 			UpdateEditMode ();
 			base.OptionsChanged (sender, args);
 		}
+
+		protected override string GetIdeColorStyleName ()
+		{
+			var scheme = Ide.Editor.Highlighting.SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme);
+			if (!scheme.FitsIdeSkin (IdeApp.Preferences.UserInterfaceSkin))
+				scheme = Ide.Editor.Highlighting.SyntaxModeService.GetDefaultColorStyle (IdeApp.Preferences.UserInterfaceSkin);
+			return scheme.Name;
+		}
 		
 		bool isInKeyStroke = false;
 		protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
@@ -255,7 +258,14 @@ namespace MonoDevelop.SourceEditor
 		{
 			isInKeyStroke = true;
 			try {
-				return Extension.KeyPress (key, (char)ch, state);
+				if (needToAddLastExtension) {
+					var ext = EditorExtension;
+					while (ext.Next != null)
+						ext = ext.Next;
+					ext.Next = new LastEditorExtension (this);
+					needToAddLastExtension = false;
+				}
+				return EditorExtension.KeyPress (KeyDescriptor.FromGtk (key, (char)ch, state));
 			} catch (Exception ex) {
 				ReportExtensionError (ex);
 			} finally {
@@ -268,17 +278,12 @@ namespace MonoDevelop.SourceEditor
 		{
 			LoggingService.LogInternalError ("Error in text editor extension chain", ex);
 		}
-		
-		IEnumerable<char> TextWithoutCommentsAndStrings {
-			get {
-				return from p in GetTextWithoutCommentsAndStrings (Document, 0, Document.TextLength) select p.Key;
-			}
-		}
-		
-		static IEnumerable<KeyValuePair <char, int>> GetTextWithoutCommentsAndStrings (Mono.TextEditor.TextDocument doc, int start, int end) 
+
+		internal static IEnumerable<char> GetTextWithoutCommentsAndStrings (Mono.TextEditor.TextDocument doc, int start, int end) 
 		{
 			bool isInString = false, isInChar = false;
 			bool isInLineComment = false, isInBlockComment = false;
+			int escaping = 0;
 			
 			for (int pos = start; pos < end; pos++) {
 				char ch = doc.GetCharAt (pos);
@@ -300,196 +305,121 @@ namespace MonoDevelop.SourceEditor
 						}
 						break;
 					case '"':
-						if (!(isInChar || isInLineComment || isInBlockComment)) 
-							isInString = !isInString;
+						if (!(isInChar || isInLineComment || isInBlockComment))
+							if (!isInString || escaping != 1)
+								isInString = !isInString;
 						break;
 					case '\'':
-						if (!(isInString || isInLineComment || isInBlockComment)) 
-							isInChar = !isInChar;
+						if (!(isInString || isInLineComment || isInBlockComment))
+							if (!isInChar || escaping != 1)
+								isInChar = !isInChar;
+						break;
+					case '\\':
+						if (escaping != 1)
+							escaping = 2;
 						break;
 					default :
 						if (!(isInString || isInChar || isInLineComment || isInBlockComment))
-							yield return new KeyValuePair<char, int> (ch, pos);
+							yield return ch;
 						break;
 				}
+				escaping--;
 			}
 		}
-		
-		
+
+
 		protected override bool OnIMProcessedKeyPressEvent (Gdk.Key key, uint ch, Gdk.ModifierType state)
 		{
 			bool result = true;
 			if (key == Gdk.Key.Escape) {
-				bool b = Extension != null ? ExtensionKeyPress (key, ch, state) : base.OnIMProcessedKeyPressEvent (key, ch, state);
+				bool b = EditorExtension != null ? ExtensionKeyPress (key, ch, state) : base.OnIMProcessedKeyPressEvent (key, ch, state);
 				if (b) {
 					view.SourceEditorWidget.RemoveSearchWidget ();
 					return true;
 				}
-				return false; 
+				return false;
 			}
 
 			if (Document == null)
 				return true;
 
-			bool inStringOrComment = false;
-			bool isString = false;
-			DocumentLine line = Document.GetLine (Caret.Line);
-			if (line == null)
-				return true;
-			//			string escape = "\"";
-			var stack = line.StartSpan.Clone ();
-			var sm = Document.SyntaxMode as SyntaxMode;
-			if (sm != null)
-				Mono.TextEditor.Highlighting.SyntaxModeService.ScanSpans (Document, sm, sm, stack, line.Offset, Caret.Offset);
-
-			foreach (Span span in stack) {
-				if (string.IsNullOrEmpty (span.Color))
-					continue;
-				if (span.Color.StartsWith ("String", StringComparison.Ordinal) ||
-				    span.Color.StartsWith ("Comment", StringComparison.Ordinal) ||
-				    span.Color.StartsWith ("Xml Attribute Value", StringComparison.Ordinal)) {
-					//Treat "Xml Attribute Value" as "String" so quotes in SkipChars works in Xml
-					if (span.Color.StartsWith ("Comment", StringComparison.Ordinal)) {
-						isString = false;
-					} else {
-						isString = true;
-					}
-					inStringOrComment = true;
+
+			var oldMode = Caret.IsInInsertMode;
+			bool wasHandled = false;
+			var currentSession = this.view.CurrentSession;
+			if (currentSession != null) {
+				switch (key) {
+				case Gdk.Key.Return:
+					currentSession.BeforeReturn (out wasHandled);
+					break;
+				case Gdk.Key.BackSpace:
+					currentSession.BeforeBackspace (out wasHandled);
+					break;
+				case Gdk.Key.Delete:
+				case Gdk.Key.KP_Delete:
+					currentSession.BeforeDelete (out wasHandled);
+					break;
+				default:
+					currentSession.BeforeType ((char)ch, out wasHandled);
 					break;
 				}
 			}
-			// insert template when space is typed (currently disabled - it's annoying).
-			bool templateInserted = false;
-			//!inStringOrComment && (key == Gdk.Key.space) && DoInsertTemplate ();
-			bool returnBetweenBraces = key == Gdk.Key.Return && (state & (Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask)) == Gdk.ModifierType.None && Caret.Offset > 0 && Caret.Offset < Document.TextLength && Document.GetCharAt (Caret.Offset - 1) == '{' && Document.GetCharAt (Caret.Offset) == '}' && !inStringOrComment;
-//			int initialOffset = Caret.Offset;
-			const string openBrackets = "{[('\"";
-			const string closingBrackets = "}])'\"";
-			int braceIndex = openBrackets.IndexOf ((char)ch);
-			var skipChars = GetTextEditorData ().SkipChars;
-			var skipChar = skipChars.Find (sc => sc.Char == (char)ch && sc.Offset == Caret.Offset);
-//			bool startedAtomicOperation = false;
-
-			// special handling for escape chars inside ' and "
-			if (Caret.Offset > 0) {
-				char charBefore = Document.GetCharAt (Caret.Offset - 1);
-				if (ch == '"') {
-					if (!inStringOrComment && charBefore == '"' || 
-						isString && charBefore == '\\' ) {
-						skipChar = null;
-						braceIndex = -1;
-					}
-				}
 
-			}
-			char insertionChar = '\0';
-			bool insertMatchingBracket = false;
-			IDisposable undoGroup = null;
-			if (skipChar == null && Options.AutoInsertMatchingBracket && braceIndex >= 0 && !IsSomethingSelected) {
-				if (!inStringOrComment) {
-					char closingBrace = closingBrackets [braceIndex];
-					char openingBrace = openBrackets [braceIndex];
-
-					int count = 0;
-					foreach (char curCh in TextWithoutCommentsAndStrings) {
-						if (curCh == openingBrace) {
-							count++;
-						} else if (curCh == closingBrace) {
-							count--;
+			if (!wasHandled) {
+				if (EditorExtension != null) {
+					if (!DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep) {
+						using (var undo = Document.OpenUndoGroup ()) {
+							if (ExtensionKeyPress (key, ch, state))
+								result = base.OnIMProcessedKeyPressEvent (key, ch, state);
 						}
-					}
-
-					if (count >= 0) {
-						insertMatchingBracket = true;
-						insertionChar = closingBrace;
-					}
-				} else {
-					char charBefore = Document.GetCharAt (Caret.Offset - 1);
-					if (!inStringOrComment && ch == '"' && charBefore != '\\') {
-						insertMatchingBracket = true;
-						insertionChar = '"';
-					}
-				}
-			}
-			
-			//Console.WriteLine (Caret.Offset + "/" + insOff);
-			if (insertMatchingBracket)
-				undoGroup = Document.OpenUndoGroup ();
-
-			var oldMode = Caret.IsInInsertMode;
-			if (skipChar != null) {
-				Caret.IsInInsertMode = false;
-				skipChars.Remove (skipChar);
-			}
-			if (Extension != null) {
-				if (!DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep) {
-					using (var undo = Document.OpenUndoGroup ()) {
+					} else {
 						if (ExtensionKeyPress (key, ch, state))
 							result = base.OnIMProcessedKeyPressEvent (key, ch, state);
 					}
 				} else {
-					if (ExtensionKeyPress (key, ch, state))
-						result = base.OnIMProcessedKeyPressEvent (key, ch, state);
+					result = base.OnIMProcessedKeyPressEvent (key, ch, state);
 				}
-				if (returnBetweenBraces)
-					HitReturn ();
-			} else {
-				result = base.OnIMProcessedKeyPressEvent (key, ch, state);
-				if (returnBetweenBraces)
-					HitReturn ();
-			}
-			if (skipChar != null) {
-				Caret.IsInInsertMode = oldMode;
-			}
 
-			if (insertMatchingBracket) {
-				GetTextEditorData ().EnsureCaretIsNotVirtual ();
-				int offset = Caret.Offset;
-				Caret.AutoUpdatePosition = false;
-				Insert (offset, insertionChar.ToString ());
-				Caret.AutoUpdatePosition = true;
-				GetTextEditorData ().SetSkipChar (offset, insertionChar);
-				undoGroup.Dispose ();
+				if (currentSession != null) {
+					switch (key) {
+					case Gdk.Key.Return:
+						currentSession.AfterReturn ();
+						break;
+					case Gdk.Key.BackSpace:
+						currentSession.AfterBackspace ();
+						break;
+					case Gdk.Key.Delete:
+					case Gdk.Key.KP_Delete:
+						currentSession.AfterDelete ();
+						break;
+					default:
+						currentSession.AfterType ((char)ch);
+						break;
+					}
+				}
 			}
-			return templateInserted || result;
-		}
-		
-		void HitReturn ()
-		{
-			int o = Caret.Offset - 1;
-			while (o > 0 && char.IsWhiteSpace (GetCharAt (o - 1))) 
-				o--;
-			Caret.Offset = o;
-			ExtensionKeyPress (Gdk.Key.Return, (char)0, Gdk.ModifierType.None);			
+			return result;
 		}
-		
+
 		internal string GetErrorInformationAt (int offset)
 		{
-			DocumentLocation location = Document.OffsetToLocation (offset);
+			var location = Document.OffsetToLocation (offset);
 			DocumentLine line = Document.GetLine (location.Line);
 			if (line == null)
 				return null;
-			var error = line.Markers.FirstOrDefault (m => m is ErrorMarker) as ErrorMarker;
+
+			var error = Document.GetTextSegmentMarkersAt (offset).OfType<ErrorMarker> ().FirstOrDefault ();
 			
 			if (error != null) {
-				if (error.Info.ErrorType == ErrorType.Warning)
-					return GettextCatalog.GetString ("<b>Parser Warning</b>: {0}",
-					                                 GLib.Markup.EscapeText (error.Info.Message));
-				return GettextCatalog.GetString ("<b>Parser Error</b>: {0}",
-				                                 GLib.Markup.EscapeText (error.Info.Message));
+				if (error.Error.ErrorType == MonoDevelop.Ide.TypeSystem.ErrorType.Warning)
+					return GettextCatalog.GetString ("<b>Warning</b>: {0}",
+						GLib.Markup.EscapeText (error.Error.Message));
+				return GettextCatalog.GetString ("<b>Error</b>: {0}",
+					GLib.Markup.EscapeText (error.Error.Message));
 			}
 			return null;
 		}
 		
-		internal ParsedDocument ParsedDocument {
-			get {
-				var doc = IdeApp.Workbench.ActiveDocument;
-				if (doc != null) 
-					return doc.ParsedDocument;
-				return null;
-			}
-		}
-		
 		public MonoDevelop.Projects.Project Project {
 			get {
 				var doc = IdeApp.Workbench.ActiveDocument;
@@ -499,12 +429,9 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		int           oldOffset = -1;
-
-		public ResolveResult GetLanguageItem (int offset, out DomRegion region)
+		public Microsoft.CodeAnalysis.ISymbol GetLanguageItem (int offset, out MonoDevelop.Ide.Editor.DocumentRegion region)
 		{
-			oldOffset = offset;
-			region = DomRegion.Empty;
+			region = MonoDevelop.Ide.Editor.DocumentRegion.Empty;
 
 			if (textEditorResolverProvider != null) {
 				return textEditorResolverProvider.GetLanguageItem (view.WorkbenchWindow.Document, offset, out region);
@@ -516,7 +443,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			if (IsSomethingSelected) {
 				var result = GetLanguageItem (Caret.Offset, Document.GetTextAt (SelectionRange));
-				if (result != null && !result.IsError)
+				if (result != null)
 					return CodeTemplateContext.InExpression;
 			}
 			return CodeTemplateContext.Standard;
@@ -529,10 +456,8 @@ namespace MonoDevelop.SourceEditor
 			internal set { this.textEditorResolverProvider = value; }
 		}
 		
-		public ResolveResult GetLanguageItem (int offset, string expression)
+		public Microsoft.CodeAnalysis.ISymbol GetLanguageItem (int offset, string expression)
 		{
-			oldOffset = offset;
-			
 			if (textEditorResolverProvider != null) {
 				return textEditorResolverProvider.GetLanguageItem (view.WorkbenchWindow.Document, offset, expression);
 			}
@@ -572,16 +497,29 @@ namespace MonoDevelop.SourceEditor
 			ParameterInformationWindowManager.HideWindow (null, view);
 			return base.OnFocusOutEvent (evnt); 
 		}
-		
+
+		string menuPath = "/MonoDevelop/SourceEditor2/ContextMenu/Editor";
+
+		internal string ContextMenuPath {
+			get {
+				return menuPath;
+			}
+
+			set {
+				menuPath = value;
+			}
+		}
+
+
 		void ShowPopup (Gdk.EventButton evt)
 		{
 			view.FireCompletionContextChanged ();
 			CompletionWindowManager.HideWindow ();
 			ParameterInformationWindowManager.HideWindow (null, view);
 			HideTooltip ();
-			const string menuPath = "/MonoDevelop/SourceEditor2/ContextMenu/Editor";
-			var ctx = ExtensionContext ?? AddinManager.AddinEngine;
-
+			if (string.IsNullOrEmpty (menuPath))
+				return;
+			var ctx = view.WorkbenchWindow?.ExtensionContext ?? AddinManager.AddinEngine;
 			CommandEntrySet cset = IdeApp.CommandService.CreateCommandEntrySet (ctx, menuPath);
 
 			if (Platform.IsMac) {
@@ -624,28 +562,15 @@ namespace MonoDevelop.SourceEditor
 		}
 		
 #region Templates
-		int FindPrevWordStart (int offset)
-		{
-			while (--offset >= 0 && !Char.IsWhiteSpace (Document.GetCharAt (offset))) 
-				;
-			return ++offset;
-		}
 
-		public string GetWordBeforeCaret ()
-		{
-			int offset = this.Caret.Offset;
-			int start  = FindPrevWordStart (offset);
-			return Document.GetTextAt (start, offset - start);
-		}
-		
 		public bool IsTemplateKnown ()
 		{
-			string word = GetWordBeforeCaret ();
+			string shortcut = CodeTemplate.GetTemplateShortcutBeforeCaret (EditorExtension.Editor);
 			bool result = false;
 			foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplates (Document.MimeType)) {
-				if (template.Shortcut == word) {
+				if (template.Shortcut == shortcut) {
 					result = true;
-				} else if (template.Shortcut.StartsWith (word)) {
+				} else if (template.Shortcut.StartsWith (shortcut)) {
 					result = false;
 					break;
 				}
@@ -655,10 +580,10 @@ namespace MonoDevelop.SourceEditor
 		
 		public bool DoInsertTemplate ()
 		{
-			string word = GetWordBeforeCaret ();
+			string shortcut = CodeTemplate.GetTemplateShortcutBeforeCaret (EditorExtension.Editor);
 			foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplates (Document.MimeType)) {
-				if (template.Shortcut == word) {
-					InsertTemplate (template, view.WorkbenchWindow.Document);
+				if (template.Shortcut == shortcut) {
+					InsertTemplate (template, view.WorkbenchWindow.Document.Editor, view.WorkbenchWindow.Document);
 					return true;
 				}
 			}
@@ -666,13 +591,16 @@ namespace MonoDevelop.SourceEditor
 		}
 		
 
-		internal void InsertTemplate (CodeTemplate template, MonoDevelop.Ide.Gui.Document document)
+		internal void InsertTemplate (CodeTemplate template, MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.Editor.DocumentContext context)
 		{
-			using (var undo = Document.OpenUndoGroup ()) {
-				var result = template.InsertTemplateContents (document);
-
-				var links = result.TextLinks;
+			using (var undo = editor.OpenUndoGroup ()) {
+				var result = template.InsertTemplateContents (editor, context);
 
+				var links = result.TextLinks.Select (l => new Mono.TextEditor.TextLink (l.Name) {
+					Links = l.Links.Select (s => new TextSegment (s.Offset, s.Length)).ToList (),
+					IsEditable = l.IsEditable,
+					IsIdentifier = l.IsIdentifier
+				}).ToList ();
 				var tle = new TextLinkEditMode (this, result.InsertPosition, links);
 				tle.TextLinkMode = TextLinkMode.General;
 				if (tle.ShouldStartTextLinkMode) {
@@ -1021,7 +949,7 @@ namespace MonoDevelop.SourceEditor
 			RunAction (SelectionActions.MovePageUp);
 		}
 		
-		[CommandHandler (MonoDevelop.SourceEditor.SourceEditorCommands.PulseCaret)]
+		[CommandHandler (MonoDevelop.Ide.Commands.TextEditorCommands.PulseCaret)]
 		internal void OnPulseCaretCommand ()
 		{
 			StartCaretPulseAnimation ();
@@ -1052,18 +980,6 @@ namespace MonoDevelop.SourceEditor
 				RunAction (Mono.TextEditor.Vi.ViActions.Join);
 			}
 		}
-
-		[CommandHandler (MonoDevelop.Ide.Commands.EditCommands.SortSelectedLines)]
-		void SortSelectedLines ()
-		{
-			RunAction (MiscActions.SortSelectedLines);
-		}
-
-		[CommandUpdateHandler (MonoDevelop.Ide.Commands.EditCommands.SortSelectedLines)]
-		void UpdateSortSelectedLines (CommandInfo ci)
-		{
-			ci.Enabled = GetTextEditorData ().IsMultiLineSelection;
-		}
 #endregion
 	
 	}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/FileRegistry.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/FileRegistry.cs
index c7703d4fad..71daa0ec75 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/FileRegistry.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/FileRegistry.cs
@@ -31,6 +31,7 @@ using MonoDevelop.Core;
 using Services = MonoDevelop.Projects.Services;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor
 {
@@ -42,22 +43,15 @@ namespace MonoDevelop.SourceEditor
 	{
 		readonly static List<SourceEditorView> openFiles = new List<SourceEditorView> ();
 		readonly static FileSystemWatcher fileSystemWatcher;
-		readonly static StringComparison fileNameComparer = Platform.IsWindows ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
-
-		public static bool SuspendFileWatch {
-			get;
-			set;
-		}
 
 		static FileRegistry ()
 		{
 			fileSystemWatcher = new FileSystemWatcher ();
-			fileSystemWatcher.Created += (FileSystemEventHandler)DispatchService.GuiDispatch (new FileSystemEventHandler (OnFileChanged));
-			fileSystemWatcher.Changed += (FileSystemEventHandler)DispatchService.GuiDispatch (new FileSystemEventHandler (OnFileChanged));
+			fileSystemWatcher.Created += (s, e) => Runtime.RunInMainThread (() => OnFileChanged (s, e));
+			fileSystemWatcher.Changed += (s, e) => Runtime.RunInMainThread (() => OnFileChanged (s, e));
 
-			var fileChanged = DispatchService.GuiDispatch (new EventHandler<FileEventArgs> (HandleFileServiceChange));
-			FileService.FileCreated += fileChanged;
-			FileService.FileChanged += fileChanged;
+			FileService.FileCreated += HandleFileServiceChange;
+			FileService.FileChanged += HandleFileServiceChange;
 
 		}
 
@@ -79,13 +73,14 @@ namespace MonoDevelop.SourceEditor
 
 		static void HandleFileServiceChange (object sender, FileEventArgs e)
 		{
-			// The Ide.Document generates a file service changed event this needs to be skipped.
-			if (!TypeSystemService.TrackFileChanges)
-				return;
 			bool foundOneChange = false;
 			foreach (var file in e) {
+				if (skipFiles.Contains (file.FileName)) {
+					skipFiles.Remove (file.FileName);
+					continue;
+				}
 				foreach (var view in openFiles) {
-					if (SkipView (view) || !string.Equals (view.ContentName, file.FileName, fileNameComparer))
+					if (SkipView (view) || !string.Equals (view.ContentName, file.FileName, FilePath.PathComparison))
 						continue;
 					if (!view.IsDirty/* && (IdeApp.Workbench.AutoReloadDocuments || file.AutoReload)*/)
 						view.SourceEditorWidget.Reload ();
@@ -117,20 +112,22 @@ namespace MonoDevelop.SourceEditor
 
 		static void OnFileChanged (object sender, FileSystemEventArgs e)
 		{
-			if (e.ChangeType == WatcherChangeTypes.Changed || e.ChangeType == WatcherChangeTypes.Created) 
+			if (e.ChangeType == WatcherChangeTypes.Changed || e.ChangeType == WatcherChangeTypes.Created)
 				CheckFileChange (e.FullPath);
 		}
 
 		static void CheckFileChange (string fileName)
 		{
-			if (SuspendFileWatch)
+			if (skipFiles.Contains (fileName)) {
+				skipFiles.Remove (fileName);
 				return;
+			}
 
 			var changedViews = new List<SourceEditorView> ();
 			foreach (var view in openFiles) {
 				if (SkipView (view))
 					continue;
-				if (string.Equals (view.ContentName, fileName, fileNameComparer)) {
+				if (string.Equals (view.ContentName, fileName, FilePath.PathComparison)) {
 					if (view.LastSaveTimeUtc == File.GetLastWriteTimeUtc (fileName))
 						continue;
 					if (!view.IsDirty/* && IdeApp.Workbench.AutoReloadDocuments*/)
@@ -196,7 +193,7 @@ namespace MonoDevelop.SourceEditor
 			foreach (var view in openFiles) {
 				if (SkipView (view) || !view.SourceEditorWidget.HasIncorrectEolMarker)
 					continue;
-				
+
 				view.SourceEditorWidget.ConvertLineEndings ();
 				view.SourceEditorWidget.RemoveMessageBar ();
 				view.WorkbenchWindow.ShowNotification = false;
@@ -225,9 +222,16 @@ namespace MonoDevelop.SourceEditor
 			foreach (var view in openFiles) {
 				if (SkipView (view) || !view.SourceEditorWidget.HasIncorrectEolMarker)
 					continue;
-				view.SourceEditorWidget.UpdateEolMarkerMessage(multiple);
+				view.SourceEditorWidget.UpdateEolMarkerMessage (multiple);
 			}
 		}
+
+		static List<string> skipFiles = new List<string> ();
+		internal static void SkipNextChange (string fileName)
+		{
+			if (!skipFiles.Contains (fileName))
+				skipFiles.Add (fileName);
+		}
 		#endregion
 	}
-} 
+}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs
index b19f1e26ad..ecdf017ea7 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs
@@ -30,12 +30,13 @@ using System;
 using Gtk;
 
 using Mono.TextEditor;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.SourceEditor
 {
 	public partial class GotoLineNumberWidget : Gtk.Bin
 	{
-		readonly TextEditor textEditor;
+		readonly MonoTextEditor textEditor;
 		readonly Widget frame;
 
 		double vSave, hSave;
@@ -45,7 +46,7 @@ namespace MonoDevelop.SourceEditor
 		void HandleViewTextEditorhandleSizeAllocated (object o, SizeAllocatedArgs args)
 		{
 			int newX = textEditor.Allocation.Width - this.Allocation.Width - 8;
-			var containerChild = ((TextEditor.EditorContainerChild)textEditor [frame]);
+			var containerChild = ((MonoTextEditor.EditorContainerChild)textEditor [frame]);
 			if (newX != containerChild.X) {
 				this.entryLineNumber.WidthRequest = textEditor.Allocation.Width / 4;
 				containerChild.X = newX;
@@ -58,7 +59,7 @@ namespace MonoDevelop.SourceEditor
 			Destroy ();
 		}
 
-		public GotoLineNumberWidget (TextEditor textEditor, Widget frame)
+		public GotoLineNumberWidget (MonoTextEditor textEditor, Widget frame)
 		{
 			this.textEditor = textEditor;
 			this.frame = frame;
@@ -66,14 +67,7 @@ namespace MonoDevelop.SourceEditor
 			
 			StoreWidgetState ();
 			textEditor.Parent.SizeAllocated += HandleViewTextEditorhandleSizeAllocated;
-			
-			//HACK: GTK rendering issue on Mac, images don't repaint unless we put them in visible eventboxes
-			if (MonoDevelop.Core.Platform.IsMac) {
-				foreach (var eb in new [] { eventbox1, eventbox2 }) {
-					eb.VisibleWindow = true;
-					eb.ModifyBg (StateType.Normal, new Gdk.Color (230, 230, 230));
-				}
-			}
+
 			this.closeButton.Clicked += delegate {
 				RestoreWidgetState ();
 				CloseWidget ();
@@ -175,17 +169,15 @@ namespace MonoDevelop.SourceEditor
 				if (col > 0)
 					textEditor.Caret.Column = col;
 				textEditor.CenterToCaret ();
-			} catch (System.Exception) { 
+			} catch (System.Exception) { 
 			}
 		}
-		
-		internal static readonly Gdk.Color warningColor = new Gdk.Color (210, 210, 32);
-		internal static readonly Gdk.Color errorColor   = new Gdk.Color (255, 102, 102);
-		
+
 		void PreviewLine ()
 		{
 			if (String.IsNullOrEmpty (entryLineNumber.Text) || entryLineNumber.Text == "+" || entryLineNumber.Text == "-") {
 				this.entryLineNumber.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Normal));
+				this.entryLineNumber.ModifyText (Gtk.StateType.Normal, Style.Foreground (Gtk.StateType.Normal));
 				RestoreWidgetState ();
 				return;
 			}
@@ -196,11 +188,12 @@ namespace MonoDevelop.SourceEditor
 					
 				} else {
 					this.entryLineNumber.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Normal));
+					this.entryLineNumber.ModifyText (Gtk.StateType.Normal, Style.Foreground (Gtk.StateType.Normal));
 				}
 				textEditor.Caret.Line = targetLine;
 				textEditor.CenterToCaret ();
-			} catch (System.Exception) { 
-				this.entryLineNumber.ModifyBase (Gtk.StateType.Normal, errorColor);
+			} catch (System.Exception) {
+				this.entryLineNumber.ModifyText (Gtk.StateType.Normal, Ide.Gui.Styles.Editor.SearchErrorForegroundColor.ToGdkColor ());
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs
index 0284769bc6..74da4193b8 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs
@@ -29,7 +29,7 @@ using Gdk;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class HoverCloseButton : EventBox
+	class HoverCloseButton : EventBox
 	{
 		bool hovered;
 
@@ -140,6 +140,7 @@ namespace MonoDevelop.SourceEditor
 					context.Fill ();
 
 					// Inset shadow
+					// FIXME: VV: Remove gradient features
 					using (var lg = new Cairo.LinearGradient (0, center.Y - 5, 0, center.Y)) {
 						context.Arc (center.X, center.Y + 1, radius, 0, Math.PI * 2);
 						lg.AddColorStop (0, new Cairo.Color (0, 0, 0, 0.2 * opacity));
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ISourceEditorOptions.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ISourceEditorOptions.cs
deleted file mode 100644
index db013b102d..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ISourceEditorOptions.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// ISourceEditorOptions.cs
-// 
-// Author:
-//       Michael Hutchinson <mhutchinson@novell.com>
-//
-// Copyright (c) 2009 Novell, Inc. (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-using Pango;
-
-using Mono.TextEditor;
-using Mono.TextEditor.Highlighting;
-
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.CodeCompletion;
-
-namespace MonoDevelop.SourceEditor
-{
-	public enum EditorFontType {
-		// Default Monospace font as set in the user's GNOME font properties
-		DefaultMonospace,
-		
-		// Default Sans font as set in the user's GNOME font properties
-		DefaultSans,
-		
-		// Custom font, will need to get the FontName property for more specifics
-		UserSpecified
-	}
-
-	public interface ISourceEditorOptions : Mono.TextEditor.ITextEditorOptions
-	{
-		
-		bool EnableAutoCodeCompletion {get; }
-		bool DefaultRegionsFolding {get; }
-		bool DefaultCommentFolding {get; }
-		bool EnableSemanticHighlighting {get; }
-		//public bool AutoInsertTemplates {get; }
-		bool TabIsReindent {get; }
-		bool AutoInsertMatchingBracket {get; }
-		bool UnderlineErrors {get; }
-		EditorFontType EditorFontType {get; }
-		bool UseViModes {get; }
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs
deleted file mode 100644
index d7dcbada63..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/IdeViMode.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-// 
-// IdeViMode.cs
-// 
-// Author:
-//   Michael Hutchinson <mhutchinson@novell.com>
-// 
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text.RegularExpressions;
-using Mono.TextEditor;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.SourceEditor
-{
-	public class NewIdeViMode : Mono.TextEditor.Vi.NewViEditMode
-	{
-		public NewIdeViMode (ExtensibleTextEditor editor)
-		{
-			this.editor = editor;
-		}
-		
-		protected override void HandleKeypress (Gdk.Key key, uint unicodeKey, Gdk.ModifierType modifier)
-		{
-			base.HandleKeypress (key, unicodeKey, modifier);
-			IdeApp.Workbench.StatusBar.ShowMessage (ViEditor.Message);
-		}
-	}
-	
-	public class IdeViMode : Mono.TextEditor.Vi.ViEditMode
-	{
-		new ExtensibleTextEditor editor;
-		TabAction tabAction;
-		
-		public IdeViMode (ExtensibleTextEditor editor)
-		{
-			this.editor = editor;
-			tabAction = new TabAction (editor);
-		}
-
-		protected override Action<TextEditorData> GetInsertAction (Gdk.Key key, Gdk.ModifierType modifier)
-		{
-			if (modifier == Gdk.ModifierType.None) {
-				switch (key) {
-				case Gdk.Key.BackSpace:
-					return EditActions.AdvancedBackspace;
-				case Gdk.Key.Tab:
-					return tabAction.Action;
-				}
-			}
-			return base.GetInsertAction (key, modifier);
-		}
-		
-		protected override string RunExCommand (string command)
-		{
-			if (':' != command[0] || 2 > command.Length)
-				return base.RunExCommand (command);
-
-			switch (command[1]) {
-			case 'w':
-				if (2 < command.Length) { 
-					switch (command[2]) {
-					case 'q':	// :wq
-						var workbenchWindow = editor.View.WorkbenchWindow;
-						workbenchWindow.Document.Save ();
-						Gtk.Application.Invoke (delegate {
-							workbenchWindow.CloseWindow (false/*, true, -1*/);
-						});
-						return "Saved and closed file.";
-					case '!':	// :w!
-						editor.View.Save ();
-						break;
-					default:
-						return base.RunExCommand (command);
-					}
-				}
-				else editor.View.WorkbenchWindow.Document.Save ();
-				return "Saved file.";
-				
-			case 'q':
-				bool force = false;
-				if (2 < command.Length) {
-					switch (command[2]) {
-					case '!':	// :q!
-						force = true;
-						break;
-					default:
-						return base.RunExCommand (command);
-					}
-				}
-				
-				if (!force && editor.View.IsDirty)
-					return "Document has not been saved!";
-
-				var window = editor.View.WorkbenchWindow;
-				Gtk.Application.Invoke (delegate {
-					window.CloseWindow (force);
-				});
-				return force? "Closed file without saving.": "Closed file.";
-				
-				
-			case 'm':
-				if (!Regex.IsMatch (command, "^:mak[e!]", RegexOptions.Compiled))
-					break;
-				MonoDevelop.Projects.Project proj = editor.View.Project;
-				if (proj != null) {
-					IdeApp.ProjectOperations.Build (proj);
-					return string.Format ("Building project {0}", proj.Name);
-				}
-				return "File is not part of a project";
-			case 'c':
-				// Error manipulation
-				if (3 == command.Length) {
-					switch (command[2]) {
-					case 'n':
-						// :cn - jump to next error
-						IdeApp.CommandService.DispatchCommand (MonoDevelop.Ide.Commands.ViewCommands.ShowNext);
-						return string.Empty;
-					case 'N':
-					case 'p':
-						// :c[pN] - jump to previous error
-						IdeApp.CommandService.DispatchCommand (MonoDevelop.Ide.Commands.ViewCommands.ShowPrevious);
-						return string.Empty;
-					}
-				}
-				break;
-			}
-			
-			return base.RunExCommand (command);
-		}
-		
-		protected override void HandleKeypress (Gdk.Key key, uint unicodeKey, Gdk.ModifierType modifier)
-		{
-			if (0 != (Gdk.ModifierType.ControlMask & modifier)) {
-				switch (key) {
-				case Gdk.Key.bracketright:
-					// ctrl-] => Go to declaration	
-					// HACK: since the SourceEditor can't link the Refactoring addin the command is provided as string.
-					IdeApp.CommandService.DispatchCommand ("MonoDevelop.Refactoring.RefactoryCommands.GotoDeclaration", MonoDevelop.Components.Commands.CommandSource.Keybinding);
-					return;
-				}
-			}// ctrl+key		
-			
-			base.HandleKeypress (key, unicodeKey, modifier);
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs
index 10172f1446..252786d652 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs
@@ -39,11 +39,11 @@ using ICSharpCode.NRefactory.Semantics;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class LanguageItemWindow: MonoDevelop.Components.TooltipWindow
+	class LanguageItemWindow: MonoDevelop.Components.TooltipWindow
 	{
 		public bool IsEmpty { get; set; }
 		
-		public LanguageItemWindow (ExtensibleTextEditor ed, Gdk.ModifierType modifierState, ResolveResult result, string errorInformations, IUnresolvedFile unit)
+		public LanguageItemWindow (ExtensibleTextEditor ed, Xwt.ModifierKeys modifierState, object result, string errorInformations, object unit)
 		{
 			string tooltip = null;
 			if (result is UnknownIdentifierResolveResult) {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ListDataProviderWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ListDataProviderWrapper.cs
new file mode 100644
index 0000000000..34d0b8fa5f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ListDataProviderWrapper.cs
@@ -0,0 +1,63 @@
+// SourceEditorView.cs
+//
+// Author:
+//   Mike Krüger <mkrueger@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using Mono.TextEditor.PopupWindow;
+
+namespace MonoDevelop.SourceEditor
+{
+	class ListDataProviderWrapper : IListDataProvider<string>
+	{
+		MonoDevelop.Ide.CodeTemplates.IListDataProvider<string> dataProvider;
+
+		public ListDataProviderWrapper (MonoDevelop.Ide.CodeTemplates.IListDataProvider<string> dataProvider)
+		{
+			this.dataProvider = dataProvider;
+		}
+
+		#region IListDataProvider implementation
+		Xwt.Drawing.Image IListDataProvider<string>.GetIcon (int index)
+		{
+			return dataProvider.GetIcon (index);
+		}
+
+		string IListDataProvider<string>.GetText (int index)
+		{
+			return dataProvider.GetText (index);
+		}
+
+		int IListDataProvider<string>.Count {
+			get {
+				return dataProvider.Count;
+			}
+		}
+
+		string IListDataProvider<string>.this [int index] {
+			get {
+				return dataProvider[index];
+			}
+		}
+		#endregion
+	}
+
+}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs
index 1aab3dd990..ef80c7e016 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MarkerOperationsHandler.cs
@@ -35,12 +35,12 @@ using MonoDevelop.Ide;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class MarkerOperationsHandler : CommandHandler
+	class MarkerOperationsHandler : CommandHandler
 	{
 		protected override void Run (object data)
 		{
 			UrlMarker urlMarker = data as UrlMarker;
-			if (data == null)
+			if (urlMarker == null)
 				return;
 			try {
 				if (urlMarker.UrlType == UrlType.Email) {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
index c7f1464e68..14ecc77bad 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
@@ -43,7 +43,7 @@ namespace MonoDevelop.SourceEditor
 		internal Dictionary<string, LayoutDescriptor> textWidthDictionary = new Dictionary<string, LayoutDescriptor> ();
 		internal Dictionary<DocumentLine, double> lineWidthDictionary = new Dictionary<DocumentLine, double> ();
 		
-		internal TextEditor editor;
+		internal MonoTextEditor editor;
 
 		internal Pango.FontDescription fontDescription;
 		internal Pango.FontDescription tooltipFontDescription;
@@ -51,7 +51,7 @@ namespace MonoDevelop.SourceEditor
 
 		public MessageBubbleTextMarker CurrentSelectedTextMarker;
 
-		public MessageBubbleCache (TextEditor editor)
+		public MessageBubbleCache (MonoTextEditor editor)
 		{
 			this.editor = editor;
 			errorPixbuf = Xwt.Drawing.Image.FromResource ("gutter-error-15.png");
@@ -132,7 +132,7 @@ namespace MonoDevelop.SourceEditor
 							w += (int)cache.warningPixbuf.Width + iconTextSpacing;
 
 						requisition.Width = Math.Max (w + textBorder * 2, requisition.Width);
-						y += h + verticalTextSpace;
+						y += h + verticalTextSpace - 3;
 					}
 				}
 
@@ -147,7 +147,6 @@ namespace MonoDevelop.SourceEditor
 
 			protected override void OnDrawContent (Gdk.EventExpose evnt, Cairo.Context g)
 			{
-				Theme.BorderColor = marker.TooltipColor.Color;
 				g.Rectangle (0, 0, Allocation.Width, Allocation.Height);
 				g.SetSourceColor (marker.TooltipColor.Color);
 				g.Fill ();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCommands.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCommands.cs
deleted file mode 100644
index 2f28478563..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCommands.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// 
-// MessageBubbleCommands.cs
-//  
-// Author:
-//       Mike Krüger <mkrueger@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using MonoDevelop.Ide;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Core;
-	
-namespace MonoDevelop.SourceEditor
-{
-	public enum MessageBubbleCommands
-	{
-		HideIssues,
-		ToggleIssues
-	}
-	
-	class HideIssuesHandler : CommandHandler
-	{
-		protected override void Update (CommandInfo info)
-		{
-			base.Update (info);
-			info.Text = IdeApp.Preferences.DefaultHideMessageBubbles ? GettextCatalog.GetString ("_Show Message Bubbles") : GettextCatalog.GetString ("_Hide Message Bubbles"); 
-		}
-		
-		protected override void Run (object data)
-		{
-			IdeApp.Preferences.DefaultHideMessageBubbles = !IdeApp.Preferences.DefaultHideMessageBubbles;
-		}
-	}
-	
-	class ToggleIssuesHandler : CommandHandler 
-	{
-		protected override void Run (object data)
-		{
-			Action action = data as Action;
-			if (action != null)
-				action ();
-		}
-		
-		protected override void Update (CommandArrayInfo ainfo)
-		{
-			CommandInfo info = ainfo.Add (GettextCatalog.GetString ("_Errors & Warnings"), new Action (delegate {
-				MonoDevelop.Ide.IdeApp.Preferences.ShowMessageBubbles = MonoDevelop.Ide.ShowMessageBubbles.ForErrorsAndWarnings;
-			}));
-			info.Checked = MonoDevelop.Ide.IdeApp.Preferences.ShowMessageBubbles == MonoDevelop.Ide.ShowMessageBubbles.ForErrorsAndWarnings;
-			
-			info = ainfo.Add (GettextCatalog.GetString ("E_rrors only"), new Action (delegate {
-				MonoDevelop.Ide.IdeApp.Preferences.ShowMessageBubbles = MonoDevelop.Ide.ShowMessageBubbles.ForErrors;
-			}));
-			info.Checked = MonoDevelop.Ide.IdeApp.Preferences.ShowMessageBubbles == MonoDevelop.Ide.ShowMessageBubbles.ForErrors;
-		}
-	}
-}
-
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs
index 7484634970..a6e90c738e 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs
@@ -34,24 +34,26 @@ using MonoDevelop.Ide;
 using System.Text.RegularExpressions;
 using Mono.TextEditor.Highlighting;
 using MonoDevelop.Ide.Fonts;
-using MonoDevelop.Components;
 using Gtk;
+using MonoDevelop.Components;
+using MonoDevelop.SourceEditor.Wrappers;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.SourceEditor
 {
-	class MessageBubbleTextMarker : MarginMarker, IDisposable, IActionTextLineMarker
+	class MessageBubbleTextMarker : MarginMarker, IDisposable, IActionTextLineMarker, MonoDevelop.Ide.Editor.IMessageBubbleLineMarker
 	{
 		readonly MessageBubbleCache cache;
 		
 		internal const int border = 4;
 		
-		TextEditor editor {
+		MonoTextEditor editor {
 			get { return cache.editor;}
 		}
 
 		public override bool IsVisible {
 			get { return !task.Completed; }
-			set { task.Completed = !value; }
+			set { task.Completed = !value; editor.QueueDraw (); }
 		}
 
 		public bool UseVirtualLines { get; set; }
@@ -61,13 +63,20 @@ namespace MonoDevelop.SourceEditor
 			get { return errors; }
 		}
 
-		Task task;
-		DocumentLine lineSegment;
+		TaskListEntry task;
+		internal TaskListEntry Task {

+			get {

+				return this.task;

+			}

+		}
+
+		TaskListEntry primaryTask;
+
 //		int editorAllocHeight = -1;
 //		int lastLineLength = -1;
 		internal double lastHeight = 0;
 
-		public double GetLineHeight (TextEditor editor)
+		public double GetLineHeight (MonoTextEditor editor)
 		{
 			return editor.LineHeight;
 			/*
@@ -96,8 +105,10 @@ namespace MonoDevelop.SourceEditor
 			return height;*/
 		}
 
-		public void SetPrimaryError (string text)
+		public void SetPrimaryError (TaskListEntry task)
 		{
+			this.primaryTask = task;
+			var text = task.Description;
 			EnsureLayoutCreated (editor);
 			
 			var match = mcsErrorFormat.Match (text);
@@ -134,39 +145,47 @@ namespace MonoDevelop.SourceEditor
 
 		public override TextLineMarkerFlags Flags {
 			get {
-				if (lineSegment != null && lineSegment.Markers.Any (m => m is DebugTextMarker)) 
+				if (LineSegment != null && editor.Document.GetTextSegmentMarkersAt (LineSegment).Any (m => m is DebugTextMarker)) 
 					return TextLineMarkerFlags.None;
 
 				return TextLineMarkerFlags.DrawsSelection;
 			}
 		}
 
-		string initialText;
 		bool isError;
-		internal MessageBubbleTextMarker (MessageBubbleCache cache, Task task, DocumentLine lineSegment, bool isError, string errorMessage)
+
+		public MessageBubbleTextMarker (MessageBubbleCache cache)
 		{
 			if (cache == null)
 				throw new ArgumentNullException ("cache");
 			this.cache = cache;
-			this.task = task;
 			this.IsVisible = true;
-			this.lineSegment = lineSegment;
-			this.initialText = editor.Document.GetTextAt (lineSegment);
+		}
+
+		internal MessageBubbleTextMarker (MessageBubbleCache cache, TaskListEntry task, bool isError, string errorMessage)
+		{
+			if (cache == null)
+				throw new ArgumentNullException ("cache");
+			this.cache = cache;
+			this.task = task;
 			this.isError = isError;
 			AddError (task, isError, errorMessage);
 //			cache.Changed += (sender, e) => CalculateLineFit (editor, lineSegment);
 		}
 		
 		static System.Text.RegularExpressions.Regex mcsErrorFormat = new System.Text.RegularExpressions.Regex ("(.+)\\(CS\\d+\\)\\Z");
-		public void AddError (Task task, bool isError, string errorMessage)
+		public void AddError (TaskListEntry task, bool isError, string errorMessage)
 		{
+			if (this.task == null) {
+				this.task = task;
+			}
 			var match = mcsErrorFormat.Match (errorMessage);
 			if (match.Success)
 				errorMessage = match.Groups [1].Value;
 			errors.Add (new ErrorText (task, isError, errorMessage));
 			DisposeLayout ();
 		}
-		
+
 		public void DisposeLayout ()
 		{
 			layouts = null;
@@ -271,7 +290,7 @@ namespace MonoDevelop.SourceEditor
 			get { return layouts; }
 		}
 		
-		internal void EnsureLayoutCreated (TextEditor editor)
+		internal void EnsureLayoutCreated (MonoTextEditor editor)
 		{
 			if (layouts != null)
 				return;
@@ -332,16 +351,27 @@ namespace MonoDevelop.SourceEditor
 		}
 
 		#region IActionTextMarker implementation
-		public bool MousePressed (TextEditor editor, MarginMouseEventArgs args)
+		int curError = 0;
+		public bool MousePressed (MonoTextEditor editor, MarginMouseEventArgs args)
+		{
+			if (bubbleDrawX < args.X && args.X < bubbleDrawX + bubbleWidth) {
+				errors [curError].Task.SelectInPad ();
+				curError = (curError + 1) % errors.Count;
+				return true;
+			}
+			return false;
+		}
+
+		bool IActionTextLineMarker.MouseReleased (MonoTextEditor editor, MarginMouseEventArgs args)
 		{
 			return false;
 		}
 
-		public void MouseHover (TextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result)
+		public void MouseHover (MonoTextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result)
 		{
 			if (!IsVisible)
 				return;
-			if (LineSegment == null)
+			if (base.LineSegment == null)
 				return;
 			if (bubbleDrawX < args.X && args.X < bubbleDrawX + bubbleWidth) {
 				editor.HideTooltip ();
@@ -355,12 +385,12 @@ namespace MonoDevelop.SourceEditor
 		double bubbleWidth;
 		bool bubbleIsReduced;
 		
-		public override void Draw (TextEditor editor, Cairo.Context g, double y, LineMetrics metrics)
+		public override void Draw (MonoTextEditor editor, Cairo.Context g, LineMetrics metrics)
 		{
 
 		}
 
-		public override void DrawAfterEol (TextEditor textEditor, Cairo.Context g, double y, EndOfLineMetrics metrics)
+		public override void DrawAfterEol (MonoTextEditor textEditor, Cairo.Context g, EndOfLineMetrics metrics)
 		{
 			if (!IsVisible)
 				return;
@@ -374,6 +404,7 @@ namespace MonoDevelop.SourceEditor
 			var sx = metrics.TextRenderEndPosition;
 			var width = LayoutWidth + errorCounterWidth + editor.LineHeight;
 			var drawLayout = layouts[0].Layout;
+			var y = metrics.LineYRenderStartPosition;
 			bool customLayout = true; //sx + width > editor.Allocation.Width;
 			bool hideText = false;
 			bubbleIsReduced = customLayout;
@@ -427,6 +458,7 @@ namespace MonoDevelop.SourceEditor
 					editor.LineHeight / 2 - 2
 				);
 
+				// FIXME: VV: Remove gradient features
 				using (var lg = new Cairo.LinearGradient (errorCounterX, errorCounterY, errorCounterX, errorCounterY + errorCounterHeight)) {
 					lg.AddColorStop (0, CounterColor.Color);
 					lg.AddColorStop (1, CounterColor.Color.AddLight (-0.1));
@@ -494,7 +526,7 @@ namespace MonoDevelop.SourceEditor
 			return margin is IconMargin;
 		}
 
-		void DrawIconMarginBackground (TextEditor ed, Cairo.Context cr, MarginDrawMetrics metrics)
+		void DrawIconMarginBackground (MonoTextEditor ed, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			cr.Rectangle (metrics.X, metrics.Y, metrics.Width, metrics.Height);
 			cr.SetSourceColor (IconMarginColor.Color);
@@ -510,7 +542,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		public override void DrawForeground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public override void DrawForeground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			var tx = Math.Round (metrics.X + (metrics.Width - cache.errorPixbuf.Width) / 2) - 1;
 			var ty = Math.Floor (metrics.Y + (metrics.Height - cache.errorPixbuf.Height) / 2);
@@ -521,10 +553,10 @@ namespace MonoDevelop.SourceEditor
 			cr.Restore ();
 		}
 
-		public override bool DrawBackground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		public override bool DrawBackground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
 		{
 			if (metrics.Margin is FoldMarkerMargin || metrics.Margin is GutterMargin || metrics.Margin is ActionMargin)
-				return DrawMarginBackground (editor, metrics.Margin, cr, metrics.Area, lineSegment, metrics.LineNumber, metrics.X, metrics.Y, metrics.Height);
+				return DrawMarginBackground (editor, metrics.Margin, cr, metrics.Area, LineSegment, metrics.LineNumber, metrics.X, metrics.Y, metrics.Height);
 			if (metrics.Margin is IconMargin) {
 				DrawIconMarginBackground (editor, cr, metrics);
 				return true;
@@ -532,7 +564,7 @@ namespace MonoDevelop.SourceEditor
 			return false;
 		}
 
-		bool DrawMarginBackground (TextEditor e, Margin margin, Cairo.Context cr, Cairo.Rectangle area, DocumentLine documentLine, long line, double x, double y, double lineHeight)
+		bool DrawMarginBackground (MonoTextEditor e, Margin margin, Cairo.Context cr, Cairo.Rectangle area, DocumentLine documentLine, long line, double x, double y, double lineHeight)
 		{
 			if (cache.CurrentSelectedTextMarker != null && cache.CurrentSelectedTextMarker != this)
 				return false;
@@ -547,12 +579,12 @@ namespace MonoDevelop.SourceEditor
 
 		#region text background
 
-		public override bool DrawBackground (TextEditor editor, Cairo.Context g, double y, LineMetrics metrics)
+		public override bool DrawBackground (MonoTextEditor editor, Cairo.Context g, LineMetrics metrics)
 		{
 			if (!IsVisible)
 				return false;
 			bool markerShouldDrawnAsHidden = cache.CurrentSelectedTextMarker != null && cache.CurrentSelectedTextMarker != this;
-			if (metrics.LineSegment.Markers.Any (m => m is DebugTextMarker))
+			if (editor.Document.GetTextSegmentMarkersAt (metrics.LineSegment).Any (m => m is DebugTextMarker))
 				return false;
 
 			EnsureLayoutCreated (editor);
@@ -565,11 +597,11 @@ namespace MonoDevelop.SourceEditor
 			var max = Math.Round (editor.TextViewMargin.XOffset + editor.LineHeight / 2);
 			double x2 = Math.Max (min, max);
 
-			bool isEolSelected = editor.IsSomethingSelected && editor.SelectionMode != Mono.TextEditor.SelectionMode.Block ? editor.SelectionRange.Contains (lineSegment.Offset + lineSegment.Length) : false;
+			bool isEolSelected = editor.IsSomethingSelected && editor.SelectionMode != Mono.TextEditor.SelectionMode.Block ? editor.SelectionRange.Contains (LineSegment.Offset + LineSegment.Length) : false;
 
-			int active = editor.Document.GetTextAt (lineSegment) == initialText ? 0 : 1;
+			int active = 0;
 			bool highlighted = active == 0 && isCaretInLine;
-
+			var y = metrics.LineYRenderStartPosition;
 			// draw background
 			if (!markerShouldDrawnAsHidden) {
 				DrawRectangle (g, x, y, right, editor.LineHeight);
@@ -627,30 +659,74 @@ namespace MonoDevelop.SourceEditor
 			return true;
 		}
 
-		void DrawErrorMarkers (TextEditor editor, Cairo.Context g, LineMetrics metrics, double y)
+		void DrawErrorMarkers (MonoTextEditor editor, Cairo.Context g, LineMetrics metrics, double y)
 		{
 			uint curIndex = 0, byteIndex = 0;
 
 			var o = metrics.LineSegment.Offset;
 
 			foreach (var task in errors.Select (t => t.Task)) {
-				var column = (uint)(Math.Min (Math.Max (0, task.Column - 1), metrics.Layout.LineChars.Length));
-				int index = (int)metrics.Layout.TranslateToUTF8Index (column, ref curIndex, ref byteIndex);
-				var pos = metrics.Layout.Layout.IndexToPos (index);
-				var co = o + task.Column - 1;
-				g.SetSourceColor (GetMarkerColor (false, metrics.SelectionStart <= co && co < metrics.SelectionEnd));
-				g.MoveTo (
-					metrics.TextRenderStartPosition + editor.TextViewMargin.TextStartPosition + pos.X / Pango.Scale.PangoScale,
-					y + editor.LineHeight - 3
-					);
-				g.RelLineTo (3, 3);
-				g.RelLineTo (-6, 0);
-				g.ClosePath ();
+				try {
+					var column = (uint)(Math.Min (Math.Max (0, task.Column - 1), metrics.Layout.LineChars.Length));
+					var line = editor.GetLine (task.Line);
+					// skip possible white space locations 
+					while (column < line.Length && char.IsWhiteSpace (editor.GetCharAt (line.Offset + (int)column))) {
+						column++;
+					}
+					if (column >= metrics.Layout.LineChars.Length)
+						continue;
+					int index = (int)metrics.Layout.TranslateToUTF8Index (column, ref curIndex, ref byteIndex);
+					var pos = metrics.Layout.Layout.IndexToPos (index);
+					var co = o + task.Column - 1;
+					g.SetSourceColor (GetMarkerColor (false, metrics.SelectionStart <= co && co < metrics.SelectionEnd));
+					g.MoveTo (
+						metrics.TextRenderStartPosition + editor.TextViewMargin.TextStartPosition + pos.X / Pango.Scale.PangoScale,
+						y + editor.LineHeight - 3
+						);
+					g.RelLineTo (3, 3);
+					g.RelLineTo (-6, 0);
+					g.ClosePath ();
 
-				g.Fill ();
+					g.Fill ();
+				} catch (Exception e) {
+					LoggingService.LogError ("Error while drawing task marker " + task, e);
+				}				
 			}
 		}
 
 		#endregion
+
+		MonoDevelop.Ide.Editor.IDocumentLine MonoDevelop.Ide.Editor.ITextLineMarker.Line {
+			get {
+				return new DocumentLineWrapper (base.LineSegment);
+			}
+		}
+
+		void MonoDevelop.Ide.Editor.IMessageBubbleLineMarker.AddTask (TaskListEntry task)
+		{
+			AddError (task, task.Severity == TaskSeverity.Error, task.Description);
+		}
+
+		TaskListEntry MonoDevelop.Ide.Editor.IMessageBubbleLineMarker.PrimaryTask {
+			get {
+				return primaryTask;
+			}
+			set {
+				SetPrimaryError (task);
+			}
+		}
+
+		int MonoDevelop.Ide.Editor.IMessageBubbleLineMarker.TaskCount {
+			get {
+				return errors.Count;
+			}
+		}
+
+		IEnumerable<TaskListEntry> MonoDevelop.Ide.Editor.IMessageBubbleLineMarker.Tasks {
+			get {
+				return errors.Select (e => e.Task);
+			}
+		}
+
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
index 0d9afdeea5..85d6545eb9 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
@@ -31,14 +31,25 @@ using Gdk;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class OverlayMessageWindow : Gtk.EventBox
+	class OverlayMessageWindow : Gtk.EventBox
 	{
 		const int border = 8;
 
-		public Func<int> SizeFunc;
+		private Func<int> sizeFunc;
 
 		ExtensibleTextEditor textEditor;
 
+		public Func<int> SizeFunc {
+			get {
+				return sizeFunc;
+			}
+
+			set {
+				sizeFunc = value;
+				QueueResize ();
+			}
+		}
+
 		public OverlayMessageWindow ()
 		{
 			AppPaintable = true;
@@ -50,7 +61,7 @@ namespace MonoDevelop.SourceEditor
 			this.ShowAll (); 
 			textEditor.AddTopLevelWidget (this, 0, 0); 
 			textEditor.SizeAllocated += HandleSizeAllocated;
-			var child = (TextEditor.EditorContainerChild)textEditor [this];
+			var child = (MonoTextEditor.EditorContainerChild)textEditor [this];
 			child.FixedPosition = true;
 		}
 
@@ -67,36 +78,24 @@ namespace MonoDevelop.SourceEditor
 		{
 			base.OnSizeRequested (ref requisition);
 
-			if (wRequest > 0) {
-				requisition.Width = wRequest;
+			if (SizeFunc != null) {
+				requisition.Width = Math.Min (SizeFunc (), textEditor.Allocation.Width - border * 2);
 			}
+
 		}
 
 		protected override void OnSizeAllocated (Gdk.Rectangle allocation)
 		{
 			base.OnSizeAllocated (allocation);
-			Resize (allocation);
+			AdjustPositionInEditor (allocation);
 		}
-		int wRequest = -1;
+
 		void HandleSizeAllocated (object o, Gtk.SizeAllocatedArgs args)
 		{
-			if (SizeFunc != null) {
-				var req = Math.Min (SizeFunc (), textEditor.Allocation.Width - border * 2);
-				if (req != wRequest) {
-					wRequest = req;
-					QueueResize ();
-				}
-			} else {
-				if (Allocation.Width > textEditor.Allocation.Width - border * 2) {
-					if (textEditor.Allocation.Width - border * 2 > 0) {
-						QueueResize ();
-					}
-				}
-			}
-			Resize (Allocation);
+			AdjustPositionInEditor (Allocation);
 		}
 
-		void Resize (Gdk.Rectangle alloc)
+		void AdjustPositionInEditor (Gdk.Rectangle alloc)
 		{
 			textEditor.MoveTopLevelWidget (this, (textEditor.Allocation.Width - alloc.Width) / 2, textEditor.Allocation.Height - alloc.Height - 8);
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs
index ae953190d9..1c2d9779d2 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/PinnedWatchWidget.cs
@@ -32,13 +32,13 @@ using Gtk;
 
 namespace MonoDevelop.SourceEditor
 {
-	public class PinnedWatchWidget : EventBox
+	class PinnedWatchWidget : EventBox
 	{
 		readonly ObjectValueTreeView valueTree;
 		ScrolledWindow sw;
 		ObjectValue objectValue;
 
-		TextEditor Editor {
+		MonoTextEditor Editor {
 			get; set;
 		}
 		
@@ -66,7 +66,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		public PinnedWatchWidget (TextEditor editor, PinnedWatch watch)
+		public PinnedWatchWidget (MonoTextEditor editor, PinnedWatch watch)
 		{
 			objectValue = watch.Value;
 			Editor = editor;
@@ -158,7 +158,7 @@ namespace MonoDevelop.SourceEditor
 			TreeViewColumn col;
 			int cx, cy;
 			valueTree.GetPathAtPos ((int)args.Event.X, (int)args.Event.Y, out path, out col, out cx, out cy);
-			Gdk.Rectangle rect = valueTree.GetCellArea (path, col);
+			//Gdk.Rectangle rect = valueTree.GetCellArea (path, col);
 			if (!mousePressed && valueTree.Columns[0] == col) {
 				mousePressed = true;
 				Editor.TextArea.MoveToTop (this);
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
index cb6cedc56f..0007142983 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs
@@ -35,6 +35,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Commands;
 using MonoDevelop.Components.Commands;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.SourceEditor
 {
@@ -48,13 +49,35 @@ namespace MonoDevelop.SourceEditor
 			get;
 			set;
 		}
+		bool isInSelectionSearchMode;
+		TextSegmentMarker selectionMarker;
 
 		public bool IsInSelectionSearchMode {
-			get;
-			set;
+			get {
+				return isInSelectionSearchMode;
+			}
+
+			set {
+				if (value) {
+					Console.WriteLine ("add marker");
+					selectionMarker = new SearchInSelectionMarker (SelectionSegment);
+					this.textEditor.Document.AddMarker (selectionMarker);
+				} else {
+					RemoveSelectionMarker ();
+				}
+				isInSelectionSearchMode = value;
+			}
 		}
 
-		readonly TextEditor textEditor;
+		void RemoveSelectionMarker ()
+		{
+			if (selectionMarker == null)
+				return;
+			this.textEditor.Document.RemoveMarker (selectionMarker);
+			selectionMarker = null;
+		}
+
+		readonly MonoTextEditor textEditor;
 		readonly Widget frame;
 		bool isReplaceMode = true;
 		Widget[] replaceWidgets;
@@ -101,7 +124,7 @@ namespace MonoDevelop.SourceEditor
 			if (frame == null || textEditor == null)
 				return;
 			int newX = textEditor.Allocation.Width - Allocation.Width - 8;
-			TextEditor.EditorContainerChild containerChild = ((TextEditor.EditorContainerChild)textEditor [frame]);
+			MonoTextEditor.EditorContainerChild containerChild = ((MonoTextEditor.EditorContainerChild)textEditor [frame]);
 			if (newX != containerChild.X) {
 				searchEntry.WidthRequest = textEditor.Allocation.Width / 3;
 				containerChild.X = newX;
@@ -118,7 +141,7 @@ namespace MonoDevelop.SourceEditor
 			return "(" + nextShortcut + ")";
 		}
 		
-		public SearchAndReplaceWidget (TextEditor textEditor, Widget frame)
+		public SearchAndReplaceWidget (MonoTextEditor textEditor, Widget frame)
 		{
 			if (textEditor == null)
 				throw new ArgumentNullException ("textEditor");
@@ -157,13 +180,6 @@ namespace MonoDevelop.SourceEditor
 			};
 			FilterHistory (seachHistoryProperty);
 			FilterHistory (replaceHistoryProperty);
-			//HACK: GTK rendering issue on Mac, images don't repaint unless we put them in visible eventboxes
-			if (Platform.IsMac) {
-				foreach (var eb in new [] { eventbox2, eventbox3, eventbox4, eventbox5, eventbox6 }) {
-					eb.VisibleWindow = true;
-					eb.ModifyBg (StateType.Normal, new Gdk.Color (245, 245, 245));
-				}
-			}
 
 			if (String.IsNullOrEmpty (textEditor.SearchPattern)) {
 				textEditor.SearchPattern = SearchAndReplaceOptions.SearchPattern;
@@ -190,8 +206,17 @@ namespace MonoDevelop.SourceEditor
 				if (oldPattern != SearchAndReplaceOptions.SearchPattern)
 					UpdateSearchEntry ();
 				var history = GetHistory (seachHistoryProperty);
+
+				// Don't do anything to the history if we have a blank search
+				if (string.IsNullOrWhiteSpace (SearchPattern)) {
+					return;
+				}
+
 				if (history.Count > 0 && history [0] == oldPattern) {
-					ChangeHistory (seachHistoryProperty, SearchAndReplaceOptions.SearchPattern);
+					// Only update the current history item if we're adding to the search string
+					if (!oldPattern.StartsWith (SearchPattern)) {
+						ChangeHistory (seachHistoryProperty, SearchAndReplaceOptions.SearchPattern);
+					}
 				} else {
 					UpdateSearchHistory (SearchAndReplaceOptions.SearchPattern);
 				}
@@ -281,14 +306,14 @@ namespace MonoDevelop.SourceEditor
 			resultInformLabelEventBox.BorderWidth = 2;
 			resultInformLabel.Xpad = 2;
 			resultInformLabel.Show ();
-			searchEntry.FilterButtonPixbuf = Xwt.Drawing.Image.FromResource ("searchoptions.png");
+			searchEntry.FilterButtonPixbuf = Xwt.Drawing.Image.FromResource ("find-options-22x32.png");
 
 			if (textEditor.IsSomethingSelected) {
-				if (textEditor.MainSelection.MinLine == textEditor.MainSelection.MaxLine) {
+				if (textEditor.MainSelection.MinLine == textEditor.MainSelection.MaxLine || ClipboardContainsSelection()) {
 					SetSearchPattern ();
 				} else {
-					IsInSelectionSearchMode = true;
 					SelectionSegment = textEditor.SelectionRange;
+					IsInSelectionSearchMode = true;
 					SetSearchOptions ();
 				}
 			}
@@ -304,6 +329,11 @@ namespace MonoDevelop.SourceEditor
 			SearchAndReplaceOptions.ReplacePatternChanged += HandleReplacePatternChanged;
 		}
 
+		bool ClipboardContainsSelection ()
+		{
+			return textEditor.SelectedText == ClipboardActions.GetClipboardContent ();
+		}
+
 		void HandleReplacePatternChanged (object sender, EventArgs e)
 		{
 			ReplacePattern = SearchAndReplaceOptions.ReplacePattern;
@@ -611,6 +641,7 @@ But I leave it in in the case I've missed something. Mike
 		
 		protected override void OnDestroyed ()
 		{
+			RemoveSelectionMarker ();
 			SearchAndReplaceOptions.SearchPatternChanged -= HandleSearchPatternChanged;
 			SearchAndReplaceOptions.ReplacePatternChanged -= HandleReplacePatternChanged;
 
@@ -773,8 +804,7 @@ But I leave it in in the case I've missed something. Mike
 			if (!valid || textEditor.TextViewMargin.SearchResultMatchCount == 0) {
 				//resultInformLabel.Markup = "<span foreground=\"#000000\" background=\"" + MonoDevelop.Components.PangoCairoHelper.GetColorString (GotoLineNumberWidget.errorColor) + "\">" + GettextCatalog.GetString ("Not found") + "</span>";
 				resultInformLabel.Text = GettextCatalog.GetString ("Not found");
-				resultInformLabelEventBox.ModifyBg (StateType.Normal, GotoLineNumberWidget.errorColor);
-				resultInformLabel.ModifyFg (StateType.Normal, searchEntry.Entry.Style.Foreground (StateType.Normal));
+				resultInformLabel.ModifyFg (StateType.Normal, Ide.Gui.Styles.Editor.SearchErrorForegroundColor.ToGdkColor ());
 			} else {
 				int resultIndex = 0;
 				int foundIndex = -1;
@@ -827,7 +857,7 @@ But I leave it in in the case I've missed something. Mike
 			textEditor.SearchPattern = searchPattern;
 		}
 
-		public static SearchResult FindNext (TextEditor textEditor)
+		public static SearchResult FindNext (MonoTextEditor textEditor)
 		{
 			textEditor.SearchPattern = SearchAndReplaceOptions.SearchPattern;
 			SearchResult result = textEditor.FindNext (true);
@@ -835,9 +865,7 @@ But I leave it in in the case I've missed something. Mike
 				return null;
 			textEditor.CenterToCaret ();
 
-			if (result == null) {
-				IdeApp.Workbench.StatusBar.ShowError (GettextCatalog.GetString ("Search pattern not found"));
-			} else if (result.SearchWrapped) {
+			if (result.SearchWrapped) {
 				IdeApp.Workbench.StatusBar.ShowMessage (
 					Stock.Find,
 					GettextCatalog.GetString ("Reached bottom, continued from top")
@@ -848,16 +876,14 @@ But I leave it in in the case I've missed something. Mike
 			return result;
 		}
 
-		public static SearchResult FindPrevious (TextEditor textEditor)
+		public static SearchResult FindPrevious (MonoTextEditor textEditor)
 		{
 			textEditor.SearchPattern = SearchAndReplaceOptions.SearchPattern;
 			SearchResult result = textEditor.FindPrevious (true);
 			if (result == null)
 				return null;
 			textEditor.CenterToCaret ();
-			if (result == null) {
-				IdeApp.Workbench.StatusBar.ShowError (GettextCatalog.GetString ("Search pattern not found"));
-			} else if (result.SearchWrapped) {
+			if (result.SearchWrapped) {
 				IdeApp.Workbench.StatusBar.ShowMessage (
 					Stock.Find,
 					GettextCatalog.GetString ("Reached top, continued from bottom")
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchInSelectionMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchInSelectionMarker.cs
new file mode 100644
index 0000000000..695ff657df
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchInSelectionMarker.cs
@@ -0,0 +1,56 @@
+using Mono.TextEditor;
+using System;
+
+namespace MonoDevelop.SourceEditor
+{
+	class SearchInSelectionMarker : TextSegmentMarker
+	{
+
+		public SearchInSelectionMarker (TextSegment textSegment) : base (textSegment)
+		{
+		}
+
+		public override void DrawBackground (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			int markerStart = Offset;
+			int markerEnd = EndOffset;
+
+			double @from;
+			double to;
+			var startXPos = metrics.TextRenderStartPosition;
+			var endXPos = metrics.TextRenderEndPosition;
+			var y = metrics.LineYRenderStartPosition;
+			if (markerStart < startOffset && endOffset < markerEnd) {
+				@from = startXPos;
+				to = endXPos;
+			} else {
+				int start = startOffset < markerStart ? markerStart : startOffset;
+				int end = endOffset < markerEnd ? endOffset : markerEnd;
+
+				uint curIndex = 0, byteIndex = 0;
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(start - startOffset), ref curIndex, ref byteIndex);
+
+				int x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				@from = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(end - startOffset), ref curIndex, ref byteIndex);
+				x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				to = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+			}
+
+			@from = Math.Max (@from, editor.TextViewMargin.XOffset);
+			to = Math.Max (to, editor.TextViewMargin.XOffset);
+			if (@from <= to) {
+				if (metrics.TextEndOffset < markerEnd)
+					to = metrics.WholeLineWidth + metrics.TextRenderStartPosition;
+				var c1 = editor.Options.GetColorStyle ().PlainText.Background;
+				var c2 = editor.Options.GetColorStyle ().SelectedText.Background;
+				cr.SetSourceRGB ((c1.R + c2.R) / 2, (c1.G + c2.G) / 2, (c1.B + c2.B) / 2);
+				cr.Rectangle (@from, y, to - @from, metrics.LineHeight);
+				cr.Fill ();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorCommands.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorCommands.cs
index 847f0e93a1..53776a244b 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorCommands.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorCommands.cs
@@ -33,9 +33,6 @@ namespace MonoDevelop.SourceEditor
 	public enum SourceEditorCommands
 	{
 		MarkerOperations,
-		DynamicAbbrev,
-		PulseCaret,
-		ToggleErrorTextMarker,
 
 		NextIssue,
 		PrevIssue,
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs
deleted file mode 100644
index 704ca02a68..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// SourceEditorDisplayBinding.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.IO;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Codons;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.SourceEditor
-{
-	public class SourceEditorDisplayBinding : IViewDisplayBinding
-	{
-		static bool IsInitialized = false;
-
-		public static FilePath SyntaxModePath {
-			get {
-				return UserProfile.Current.UserDataRoot.Combine ("HighlightingSchemes");
-			}
-		}
-		
-		static SourceEditorDisplayBinding ()
-		{
-			InitSourceEditor ();
-		}
-
-		public static void InitSourceEditor ()
-		{
-			if (IsInitialized)
-				return;
-			IsInitialized = true;
-			
-			MonoDevelop.SourceEditor.Extension.TemplateExtensionNodeLoader.Init ();
-			DefaultSourceEditorOptions.Init ();
-			SyntaxModeService.EnsureLoad ();
-			LoadCustomStylesAndModes ();
-		}
-		
-		internal static void LoadCustomStylesAndModes ()
-		{
-			bool success = true;
-			if (!Directory.Exists (SyntaxModePath)) {
-				try {
-					Directory.CreateDirectory (SyntaxModePath);
-				} catch (Exception e) {
-					success = false;
-					LoggingService.LogError ("Can't create syntax mode directory", e);
-				}
-			}
-			if (success)
-				Mono.TextEditor.Highlighting.SyntaxModeService.LoadStylesAndModes (SyntaxModePath);
-		}
-
-		public string Name {
-			get {
-				return GettextCatalog.GetString ("Source Code Editor");
-			}
-		}
-
-		public bool CanHandle (FilePath fileName, string mimeType, Project ownerProject)
-		{
-			if (fileName != null)
-				return DesktopService.GetFileIsText (fileName, mimeType);
-
-			if (!string.IsNullOrEmpty (mimeType))
-				return DesktopService.GetMimeTypeIsText (mimeType);
-
-			return false;
-		}
-
-		public IViewContent CreateContent (FilePath fileName, string mimeType, Project ownerProject)
-		{
-			return new SourceEditorView ();
-		}
-
-		public bool CanHandleFile (string fileName)
-		{
-			return DesktopService.GetFileIsText (fileName);
-		}
-
-		public bool CanUseAsDefault {
-			get { return true; }
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
deleted file mode 100644
index 67208ec589..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
+++ /dev/null
@@ -1,682 +0,0 @@
-// SourceEditorOptions.cs
-//
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-
-using Mono.TextEditor;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Fonts;
-
-namespace MonoDevelop.SourceEditor
-{
-	[Obsolete ("Use WordNavigationStyle")]
-	public enum ControlLeftRightMode
-	{
-		MonoDevelop,
-		Emacs,
-		SharpDevelop
-	}
-
-	public enum WordNavigationStyle
-	{
-		Unix,
-		Windows
-	}
-	
-	public enum LineEndingConversion {
-		Ask,
-		LeaveAsIs,
-		ConvertAlways
-	}
-	
-	public class DefaultSourceEditorOptions : TextEditorOptions, ISourceEditorOptions
-	{
-		static DefaultSourceEditorOptions instance;
-		//static TextStylePolicy defaultPolicy;
-		static bool inited;
-		
-		public static DefaultSourceEditorOptions Instance {
-			get { return instance; }
-		}
-		
-		static DefaultSourceEditorOptions ()
-		{
-			Init ();
-		}
-		
-		public static void Init ()
-		{
-			if (inited)
-				return;
-			inited = true;
-			
-			TextStylePolicy policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
-			instance = new DefaultSourceEditorOptions (policy);
-			MonoDevelop.Projects.Policies.PolicyService.DefaultPolicies.PolicyChanged += instance.HandlePolicyChanged;
-		}
-
-		void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
-		{
-			TextStylePolicy pol = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
-			UpdateStylePolicy (pol);
-		}
-		
-		DefaultSourceEditorOptions (MonoDevelop.Ide.Gui.Content.TextStylePolicy currentPolicy)
-		{
-			LoadAllPrefs ();
-			UpdateStylePolicy (currentPolicy);
-			PropertyService.PropertyChanged += UpdatePreferences;
-			FontService.RegisterFontChangedCallback ("Editor", UpdateFont);
-			FontService.RegisterFontChangedCallback ("Pad", UpdateFont);
-			
-		}
-		
-		public override void Dispose()
-		{
-			PropertyService.PropertyChanged -= UpdatePreferences;
-			FontService.RemoveCallback (UpdateFont);
-		}
-		
-		void UpdateFont ()
-		{
-			base.FontName = FontName;
-			base.GutterFontName = GutterFontName;
-			this.OnChanged (EventArgs.Empty);
-		
-		}
-		
-		void UpdateStylePolicy (MonoDevelop.Ide.Gui.Content.TextStylePolicy currentPolicy)
-		{
-			this.defaultEolMarker = TextStylePolicy.GetEolMarker (currentPolicy.EolMarker);
-			
-			base.TabsToSpaces          = currentPolicy.TabsToSpaces; // PropertyService.Get ("TabsToSpaces", false);
-			base.IndentationSize       = currentPolicy.TabWidth; //PropertyService.Get ("TabIndent", 4);
-			base.RulerColumn           = currentPolicy.FileWidth; //PropertyService.Get ("RulerColumn", 80);
-			base.AllowTabsAfterNonTabs = !currentPolicy.NoTabsAfterNonTabs; //PropertyService.Get ("AllowTabsAfterNonTabs", true);
-			base.RemoveTrailingWhitespaces = currentPolicy.RemoveTrailingWhitespace; //PropertyService.Get ("RemoveTrailingWhitespaces", true);
-		}
-		
-		// Need to be picky about only updating individual properties when they change.
-		// The old approach called LoadAllPrefs on any prefs event, which sometimes caused 
-		// massive change event storms.
-		void UpdatePreferences (object sender, PropertyChangedEventArgs args)
-		{
-			try {
-				switch (args.Key) {
-				case "TabIsReindent": 
-					this.TabIsReindent = (bool)args.NewValue;
-					break;
-				case "AutoInsertMatchingBracket":
-					this.AutoInsertMatchingBracket = (bool)args.NewValue;
-					break;
-				case "UnderlineErrors":
-					this.UnderlineErrors = (bool)args.NewValue;
-					break;
-				case "IndentStyle":
-					if (args.NewValue == null) {
-						LoggingService.LogWarning ("tried to set indent style == null");
-					} else if (!(args.NewValue is IndentStyle)) {
-						LoggingService.LogWarning ("tried to set indent style to " + args.NewValue + " which isn't from type IndentStyle instead it is from:" + args.NewValue.GetType ());
-						this.IndentStyle = (IndentStyle)Enum.Parse (typeof(IndentStyle), args.NewValue.ToString ());
-					} else 
-						this.IndentStyle = (IndentStyle)args.NewValue;
-					break;
-				case "ShowLineNumberMargin":
-					base.ShowLineNumberMargin = (bool)args.NewValue;
-					break;
-				case "ShowFoldMargin":
-					base.ShowFoldMargin = (bool)args.NewValue;
-					break;
-				case "HighlightCaretLine":
-					base.HighlightCaretLine = (bool)args.NewValue;
-					break;
-				case "HighlightMatchingBracket":
-					base.HighlightMatchingBracket = (bool)args.NewValue;
-					break;
-				case "ShowRuler":
-					base.ShowRuler = (bool)args.NewValue;
-					break;
-				case "FontName":
-					base.FontName = (string)args.NewValue;
-					break;
-				case "GutterFontName":
-					base.GutterFontName = (string)args.NewValue;
-					break;
-				case "ColorScheme":
-					base.ColorScheme = (string)args.NewValue;
-					break;
-				case "DefaultRegionsFolding":
-					this.DefaultRegionsFolding = (bool)args.NewValue;
-					break;
-				case "DefaultCommentFolding":
-					this.DefaultCommentFolding = (bool)args.NewValue;
-					break;
-				case "UseViModes":
-					this.UseViModes = (bool)args.NewValue;
-					break;
-				case "OnTheFlyFormatting":
-					this.OnTheFlyFormatting = (bool)args.NewValue;
-					break;
-				case "WordNavigationStyle":
-					this.WordNavigationStyle = (WordNavigationStyle)args.NewValue;
-					break;
-				case "EnableAnimations":
-					base.EnableAnimations = (bool)args.NewValue;
-					break;
-				case "DrawIndentationMarkers":
-					base.DrawIndentationMarkers = (bool)args.NewValue;
-					break;
-				case "EnableQuickDiff":
-					base.EnableQuickDiff = (bool)args.NewValue;
-					break;
-				case "GenerateFormattingUndoStep":
-					base.GenerateFormattingUndoStep = (bool)args.NewValue;
-					break;
-				}
-			} catch (Exception ex) {
-				LoggingService.LogError ("SourceEditorOptions error with property value for '" + (args.Key ?? "") + "'", ex);
-			}
-		}
-		
-		void LoadAllPrefs ()
-		{
-			this.tabIsReindent = PropertyService.Get ("TabIsReindent", false);
-			//			this.autoInsertTemplates        = PropertyService.Get ("AutoInsertTemplates", false);
-			this.autoInsertMatchingBracket = PropertyService.Get ("AutoInsertMatchingBracket", false);
-			this.smartSemicolonPlacement = PropertyService.Get ("SmartSemicolonPlacement", false);
-			this.underlineErrors = PropertyService.Get ("UnderlineErrors", true);
-			this.indentStyle = PropertyService.Get ("IndentStyle", IndentStyle.Smart);
-			base.ShowLineNumberMargin = PropertyService.Get ("ShowLineNumberMargin", true);
-			base.ShowFoldMargin = PropertyService.Get ("ShowFoldMargin", false);
-			base.HighlightCaretLine = PropertyService.Get ("HighlightCaretLine", false);
-			base.HighlightMatchingBracket = PropertyService.Get ("HighlightMatchingBracket", true);
-			base.ShowRuler = PropertyService.Get ("ShowRuler", false);
-			base.FontName = PropertyService.Get ("FontName", "Mono 10");
-			base.GutterFontName = PropertyService.Get ("GutterFontName", "");
-			base.ColorScheme = PropertyService.Get ("ColorScheme", "Default");
-			this.defaultRegionsFolding = PropertyService.Get ("DefaultRegionsFolding", false);
-			this.defaultCommentFolding = PropertyService.Get ("DefaultCommentFolding", true);
-			this.useViModes = PropertyService.Get ("UseViModes", false);
-			this.onTheFlyFormatting = PropertyService.Get ("OnTheFlyFormatting", true);
-
-			WordNavigationStyle defaultWordNavigation = WordNavigationStyle.Unix;
-			if (Platform.IsWindows || PropertyService.Get ("ControlLeftRightMode", (string)null) == "SharpDevelop") {
-				defaultWordNavigation = WordNavigationStyle.Windows;
-			}
-			this.WordNavigationStyle = PropertyService.Get ("WordNavigationStyle", defaultWordNavigation);
-
-			base.EnableAnimations = PropertyService.Get ("EnableAnimations", true);
-			this.EnableHighlightUsages = PropertyService.Get ("EnableHighlightUsages", false);
-			base.DrawIndentationMarkers = PropertyService.Get ("DrawIndentationMarkers", false);
-			this.lineEndingConversion = PropertyService.Get ("LineEndingConversion", LineEndingConversion.Ask);
-			base.GenerateFormattingUndoStep = PropertyService.Get ("GenerateFormattingUndoStep", false);
-			base.ShowWhitespaces = PropertyService.Get ("ShowWhitespaces", Mono.TextEditor.ShowWhitespaces.Never);
-			base.IncludeWhitespaces = PropertyService.Get ("IncludeWhitespaces", Mono.TextEditor.IncludeWhitespaces.All);
-			base.WrapLines = PropertyService.Get ("WrapLines", false);
-			base.EnableQuickDiff = PropertyService.Get ("EnableQuickDiff", false);
-		}
-		
-		#region new options
-		
-		public bool EnableAutoCodeCompletion {
-			get { return CompletionTextEditorExtension.EnableAutoCodeCompletion; }
-			set { CompletionTextEditorExtension.EnableAutoCodeCompletion.Set (value); }
-		}
-		
-		bool defaultRegionsFolding;
-		public bool DefaultRegionsFolding {
-			get {
-				return defaultRegionsFolding;
-			}
-			set {
-				if (value != this.defaultRegionsFolding) {
-					this.defaultRegionsFolding = value;
-					PropertyService.Set ("DefaultRegionsFolding", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		bool defaultCommentFolding;
-		public bool DefaultCommentFolding {
-			get {
-				return defaultCommentFolding;
-			}
-			set {
-				if (value != this.defaultCommentFolding) {
-					this.defaultCommentFolding = value;
-					PropertyService.Set ("DefaultCommentFolding", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		public bool EnableSemanticHighlighting {
-			get {
-				return true;
-			}
-		}
-		/*
-		bool autoInsertTemplates;
-		public bool AutoInsertTemplates {
-			get {
-				return autoInsertTemplates;
-			}
-			set {
-				if (value != this.autoInsertTemplates) {
-					this.autoInsertTemplates = value;
-					PropertyService.Set ("AutoInsertTemplates", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}*/
-		
-		bool tabIsReindent;
-		public bool TabIsReindent {
-			get {
-				return tabIsReindent;
-			}
-			set {
-				if (value != this.tabIsReindent) {
-					this.tabIsReindent = value;
-					PropertyService.Set ("TabIsReindent", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		bool autoInsertMatchingBracket;
-		public bool AutoInsertMatchingBracket {
-			get {
-				return autoInsertMatchingBracket;
-			}
-			set {
-				if (value != this.autoInsertMatchingBracket) {
-					this.autoInsertMatchingBracket = value;
-					PropertyService.Set ("AutoInsertMatchingBracket", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		bool smartSemicolonPlacement;
-		public bool SmartSemicolonPlacement {
-			get {
-				return smartSemicolonPlacement;
-			}
-			set {
-				if (value != this.smartSemicolonPlacement) {
-					this.smartSemicolonPlacement= value;
-					PropertyService.Set ("SmartSemicolonPlacement", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-
-		bool underlineErrors;
-		public bool UnderlineErrors {
-			get {
-				return underlineErrors; 
-			}
-			set {
-				if (value != this.underlineErrors) {
-					this.underlineErrors = value;
-					PropertyService.Set ("UnderlineErrors", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		IndentStyle indentStyle;
-		public override IndentStyle IndentStyle {
-			get {
-				return indentStyle;
-			}
-			set {
-				if (value != this.indentStyle) {
-					this.indentStyle = value;
-					PropertyService.Set ("IndentStyle", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		EditorFontType editorFontType;
-		public EditorFontType EditorFontType {
-			get {
-				return editorFontType;
-			}
-			set {
-				if (value != this.editorFontType) {
-					this.editorFontType = value;
-					PropertyService.Set ("EditorFontType", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		bool enableHighlightUsages;
-		public bool EnableHighlightUsages {
-			get {
-				return enableHighlightUsages;
-			}
-			set {
-				if (value != this.enableHighlightUsages) {
-					this.enableHighlightUsages = value;
-					PropertyService.Set ("EnableHighlightUsages", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		LineEndingConversion lineEndingConversion;
-		public LineEndingConversion LineEndingConversion {
-			get {
-				return lineEndingConversion;
-			}
-			set {
-				if (value != this.lineEndingConversion) {
-					this.lineEndingConversion = value;
-					PropertyService.Set ("LineEndingConversion", value);
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-
-		#endregion
-		
-		bool useViModes = false;
-		public bool UseViModes {
-			get {
-				return useViModes;
-			}
-			set {
-				if (useViModes == value)
-					return;
-				useViModes = value;
-				PropertyService.Set ("UseViModes", value);
-				OnChanged (EventArgs.Empty);
-			}
-		}
-		
-		bool onTheFlyFormatting = false;
-		public bool OnTheFlyFormatting {
-			get {
-				return onTheFlyFormatting;
-			}
-			set {
-				if (onTheFlyFormatting == value)
-					return;
-				onTheFlyFormatting = value;
-				PropertyService.Set ("OnTheFlyFormatting", value);
-				OnChanged (EventArgs.Empty);
-			}
-		}
-		
-		#region old options
-		string defaultEolMarker;
-		public override string DefaultEolMarker {
-			get { return defaultEolMarker; }
-		}
-
-		WordNavigationStyle wordNavigationStyle = Platform.IsWindows
-			? WordNavigationStyle.Windows
-			: WordNavigationStyle.Unix;
-
-		[Obsolete("Use WordNavigationStyle")]
-		public ControlLeftRightMode ControlLeftRightMode {
-			get {
-				return WordNavigationStyle == WordNavigationStyle.Unix
-					? ControlLeftRightMode.MonoDevelop
-					: ControlLeftRightMode.SharpDevelop;
-			}
-			set {
-				switch (value) {
-				case ControlLeftRightMode.Emacs:
-				case ControlLeftRightMode.MonoDevelop:
-					WordNavigationStyle = WordNavigationStyle.Unix;
-					return;
-				default:
-					WordNavigationStyle = WordNavigationStyle.Windows;
-					return;
-				}
-			}
-		}
-
-		public WordNavigationStyle WordNavigationStyle {
-			get {
-				return wordNavigationStyle;
-			}
-			set {
-				if (wordNavigationStyle != value) {
-					wordNavigationStyle = value;
-					PropertyService.Set ("WordNavigationStyle", value);
-					SetWordFindStrategy ();
-					OnChanged (EventArgs.Empty);
-				}
-			}
-		}
-		
-		IWordFindStrategy wordFindStrategy = null;
-		public override IWordFindStrategy WordFindStrategy {
-			get {
-				if (wordFindStrategy == null)
-					SetWordFindStrategy ();
-				return this.wordFindStrategy;
-			}
-			set {
-				throw new System.NotImplementedException ();
-			}
-		}
-		
-		void SetWordFindStrategy ()
-		{
-			if (useViModes) {
-				wordFindStrategy = new Mono.TextEditor.Vi.ViWordFindStrategy ();
-				return;
-			}
-			
-			switch (WordNavigationStyle) {
-			case WordNavigationStyle.Windows:
-				wordFindStrategy = new SharpDevelopWordFindStrategy ();
-				break;
-			default:
-				wordFindStrategy = new EmacsWordFindStrategy ();
-				break;
-			}
-		}
-
-		public override bool AllowTabsAfterNonTabs {
-			set {
-				if (value != AllowTabsAfterNonTabs) {
-					PropertyService.Set ("AllowTabsAfterNonTabs", value);
-					base.AllowTabsAfterNonTabs = value;
-				}
-			}
-		}
-				
-		public override bool TabsToSpaces {
-			set {
-				PropertyService.Set ("TabsToSpaces", value);
-				base.TabsToSpaces = value;
-			}
-		}
-		
-		public override int IndentationSize {
-			set {
-				PropertyService.Set ("TabIndent", value);
-				base.IndentationSize = value;
-			}
-		}
-		
-		public override int TabSize {
-			get {
-				return IndentationSize;
-			}
-			set {
-				IndentationSize = value;
-			}
-		}
-		
-		public override bool RemoveTrailingWhitespaces {
-			set {
-				PropertyService.Set ("RemoveTrailingWhitespaces", value);
-				base.RemoveTrailingWhitespaces = value;
-			}
-		}
-
-		
-		public override bool ShowLineNumberMargin {
-			set {
-				PropertyService.Set ("ShowLineNumberMargin", value);
-				base.ShowLineNumberMargin = value;
-			}
-		}
-		
-		public override bool ShowFoldMargin {
-			set {
-				PropertyService.Set ("ShowFoldMargin", value);
-				base.ShowFoldMargin = value;
-			}
-		}
-		
-		public override bool HighlightCaretLine {
-			set {
-				PropertyService.Set ("HighlightCaretLine", value);
-				base.HighlightCaretLine = value;
-			}
-		}
-		
-		public override bool EnableSyntaxHighlighting {
-			get {
-				return true;
-			}
-			set {
-				// nothing
-			}
-		}
-		
-		public override bool HighlightMatchingBracket {
-			set {
-				PropertyService.Set ("HighlightMatchingBracket", value);
-				base.HighlightMatchingBracket = value;
-			}
-		}
-		
-		public override int RulerColumn {
-			set {
-				PropertyService.Set ("RulerColumn", value);
-				base.RulerColumn = value;
-			}
-		}
-		
-		public override bool ShowRuler {
-			set {
-				PropertyService.Set ("ShowRuler", value);
-				base.ShowRuler = value;
-			}
-		}
-		
-		public override bool EnableAnimations {
-			set {
-				PropertyService.Set ("EnableAnimations", value);
-				base.EnableAnimations = value;
-			}
-		}
-		
-		public override bool DrawIndentationMarkers {
-			set {
-				PropertyService.Set ("DrawIndentationMarkers", value);
-				base.DrawIndentationMarkers = value;
-			}
-		}
-
-		public override ShowWhitespaces ShowWhitespaces {
-			set {
-				PropertyService.Set ("ShowWhitespaces", value);
-				base.ShowWhitespaces = value;
-			}
-		}
-
-		public override IncludeWhitespaces IncludeWhitespaces {
-			set {
-				PropertyService.Set ("IncludeWhitespaces", value);
-				base.IncludeWhitespaces = value;
-			}
-		}
-
-		public override bool WrapLines {
-			set {
-				PropertyService.Set ("WrapLines", value);
-				base.WrapLines = value;
-			}
-		}
-
-		public override bool EnableQuickDiff {
-			set {
-				PropertyService.Set ("EnableQuickDiff", value);
-				base.EnableQuickDiff = value;
-			}
-		}
-
-		public override string FontName {
-			get {
-				return FontService.FilterFontName (FontService.GetUnderlyingFontName ("Editor"));
-			}
-			set {
-				throw new InvalidOperationException ("Set font through font service");
-			}
-		}
-		
-		public override string GutterFontName {
-			get {
-				return FontService.FilterFontName (FontService.GetUnderlyingFontName ("Editor"));
-			}
-			set {
-				throw new InvalidOperationException ("Set font through font service");
-			}
-		}
-		
-		public override string ColorScheme {
-			set {
-				string newColorScheme = !String.IsNullOrEmpty (value) ? value : "Default";
-				PropertyService.Set ("ColorScheme", newColorScheme);
-				base.ColorScheme =  newColorScheme;
-			}
-		}
-
-		public override bool GenerateFormattingUndoStep {
-			set {
-				PropertyService.Set ("GenerateFormattingUndoStep", value);
-				base.GenerateFormattingUndoStep = value;
-			}
-		}
-
-		#endregion
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs
index 2aeda98637..79ae4bcf25 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorPrintOperation.cs
@@ -28,6 +28,7 @@ using Gtk;
 using Mono.TextEditor;
 using System.Text;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor
 {
@@ -284,11 +285,19 @@ namespace MonoDevelop.SourceEditor
 		
 		private SourceEditorPrintSettings ()
 		{
-			Font = DefaultSourceEditorOptions.Instance.Font;
+			try {
+				Font = Pango.FontDescription.FromString (DefaultSourceEditorOptions.Instance.FontName);
+			} catch {
+				Console.WriteLine ("Could not load font: {0}", DefaultSourceEditorOptions.Instance.FontName);
+			}
+			if (Font == null || String.IsNullOrEmpty (Font.Family))
+				Font = Pango.FontDescription.FromString (TextEditorOptions.DEFAULT_FONT);
+			//if (Font != null)
+			//	Font.Size = (int)(Font.Size * DefaultSourceEditorOptions.Instance.Zoom);
 			TabSize = DefaultSourceEditorOptions.Instance.TabSize;
 			HeaderFormat = "%F";
 			FooterFormat = GettextCatalog.GetString ("Page %N of %Q");
-			ColorScheme = "default";
+			ColorScheme = MonoDevelop.Ide.Editor.Highlighting.ColorScheme.DefaultColorStyle;
 			HeaderSeparatorWeight = FooterSeparatorWeight = 0.5;
 			HeaderPadding = FooterPadding = 6;
 			UseHighlighting = true;
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
index 5cfd2f7cb7..561ddbc78a 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
@@ -55,39 +55,47 @@ using System.Text;
 using Mono.Addins;
 using MonoDevelop.Components;
 using Mono.TextEditor.Utils;
-using MonoDevelop.Projects.Policies;

+using MonoDevelop.Core.Text;
+using MonoDevelop.Projects.Policies;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.SourceEditor.Wrappers;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor.Highlighting;
+using System.Threading.Tasks;

+using System.Threading;

 

 namespace MonoDevelop.SourceEditor
 {	
-	public class SourceEditorView : AbstractViewContent, IExtensibleTextEditor, IBookmarkBuffer, IClipboardHandler, 
-		ICompletionWidget,  ISplittable, IFoldable, IToolboxDynamicProvider, IEncodedTextContent,
-		ICustomFilteringToolboxConsumer, IZoomable, ITextEditorResolver, Mono.TextEditor.ITextEditorDataProvider,
-		ICodeTemplateHandler, ICodeTemplateContextProvider, ISupportsProjectReload, IPrintable
+	partial class SourceEditorView : ViewContent, IBookmarkBuffer, IClipboardHandler, ITextFile,
+		ICompletionWidget,  ISplittable, IFoldable, IToolboxDynamicProvider,
+		ICustomFilteringToolboxConsumer, IZoomable, ITextEditorResolver, ITextEditorDataProvider,
+		ICodeTemplateHandler, ICodeTemplateContextProvider, IPrintable,
+	ITextEditorImpl, IEditorActionHost, ITextMarkerFactory, IUndoHandler
 	{
 		readonly SourceEditorWidget widget;
 		bool isDisposed = false;
 		DateTime lastSaveTimeUtc;
-		string loadedMimeType;
 		internal object MemoryProbe = Counters.SourceViewsInMemory.CreateMemoryProbe ();
-		TextLineMarker currentDebugLineMarker;
-		TextLineMarker debugStackLineMarker;
-		int lastDebugLine = -1;
+		DebugMarkerPair currentDebugLineMarker;
+		DebugMarkerPair debugStackLineMarker;
 		BreakpointStore breakpoints;
-		EventHandler currentFrameChanged;
-		EventHandler executionLocationChanged;
-		EventHandler<BreakpointEventArgs> breakpointAdded;
-		EventHandler<BreakpointEventArgs> breakpointRemoved;
-		EventHandler<BreakpointEventArgs> breakpointStatusChanged;
-		List<DocumentLine> breakpointSegments = new List<DocumentLine> ();
-		DocumentLine debugStackSegment;
-		DocumentLine currentLineSegment;
+		List<DebugMarkerPair> breakpointSegments = new List<DebugMarkerPair> ();
 		List<PinnedWatchInfo> pinnedWatches = new List<PinnedWatchInfo> ();
 		bool writeAllowed;
 		bool writeAccessChecked;
+
+		public ViewContent ViewContent {
+			get {
+				return this;
+			}
+		}
 		
-		public Mono.TextEditor.TextDocument Document {
+		public TextDocument Document {
 			get {
-				return widget.TextEditor.Document;
+				return widget?.TextEditor?.Document;
+			}
+			set {
+				widget.TextEditor.Document = value;
 			}
 		}
 
@@ -99,7 +107,8 @@ namespace MonoDevelop.SourceEditor
 				lastSaveTimeUtc = value;
 			}
 		}		
-		public ExtensibleTextEditor TextEditor {
+
+		internal ExtensibleTextEditor TextEditor {
 			get {
 				return widget.TextEditor;
 			}
@@ -111,7 +120,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return widget != null ? widget.Vbox : null;
 			}
@@ -122,43 +131,18 @@ namespace MonoDevelop.SourceEditor
 				return Document.LineCount;
 			}
 		}
-		
-		public override Project Project {
-			get {
-				return base.Project;
-			}
-			set {
-				if (value != base.Project)
-					((StyledSourceEditorOptions)SourceEditorWidget.TextEditor.Options).UpdateStyleParent (value, loadedMimeType);
-				base.Project = value;
-			}
+
+
+		string ITextEditorImpl.ContextMenuPath {
+			get { return TextEditor.ContextMenuPath; }
+			set { TextEditor.ContextMenuPath = value; }
 		}
 			
 		public override string TabPageLabel {
 			get { return GettextCatalog.GetString ("Source"); }
 		}
 		
-		uint autoSaveTimer = 0;
 
-		void InformAutoSave ()
-		{
-			RemoveAutoSaveTimer ();
-			autoSaveTimer = GLib.Timeout.Add (500, delegate {
-				AutoSave.InformAutoSaveThread (Document);
-				autoSaveTimer = 0;
-				return false;
-			});
-		}
-		
-		void RemoveAutoSaveTimer ()
-		{
-			if (autoSaveTimer == 0)
-				return;
-			GLib.Source.Remove (autoSaveTimer);
-			autoSaveTimer = 0;
-		}
-		
-		bool wasEdited = false;
 		uint removeMarkerTimeout;
 		Queue<MessageBubbleTextMarker> markersToRemove = new Queue<MessageBubbleTextMarker> ();
 
@@ -176,54 +160,50 @@ namespace MonoDevelop.SourceEditor
 				while (markersToRemove.Count > 0) {
 					var _m = markersToRemove.Dequeue ();
 					currentErrorMarkers.Remove (_m);
-					widget.TextEditor.Document.RemoveMarker (_m);
+					if (_m.LineSegment != null)
+						widget.TextEditor.Document.RemoveMarker (_m);
 				}
 				removeMarkerTimeout = 0;
 				return false;
 			});
 		}
 
-		public SourceEditorView ()
+		public SourceEditorView (IReadonlyTextDocument document = null)
 		{
 			Counters.LoadedEditors++;
-			currentFrameChanged = (EventHandler)DispatchService.GuiDispatch (new EventHandler (OnCurrentFrameChanged));
-			executionLocationChanged = (EventHandler)DispatchService.GuiDispatch (new EventHandler (OnExecutionLocationChanged));
-			breakpointAdded = (EventHandler<BreakpointEventArgs>)DispatchService.GuiDispatch (new EventHandler<BreakpointEventArgs> (OnBreakpointAdded));
-			breakpointRemoved = (EventHandler<BreakpointEventArgs>)DispatchService.GuiDispatch (new EventHandler<BreakpointEventArgs> (OnBreakpointRemoved));
-			breakpointStatusChanged = (EventHandler<BreakpointEventArgs>)DispatchService.GuiDispatch (new EventHandler<BreakpointEventArgs> (OnBreakpointStatusChanged));
 
 			widget = new SourceEditorWidget (this);
-			widget.TextEditor.Document.SyntaxModeChanged += HandleSyntaxModeChanged;
+			if (document != null) {
+				var textDocument = document as TextDocument;
+				if (textDocument != null) {
+					widget.TextEditor.Document = textDocument;
+				} else {
+					widget.TextEditor.Document.Text = document.Text;
+				}
+			}
+
 			widget.TextEditor.Document.TextReplaced += HandleTextReplaced;
 			widget.TextEditor.Document.LineChanged += HandleLineChanged;
+			widget.TextEditor.Document.LineInserted += HandleLineChanged;
+			widget.TextEditor.Document.LineRemoved += HandleLineChanged;
 
 			widget.TextEditor.Document.BeginUndo += HandleBeginUndo; 
 			widget.TextEditor.Document.EndUndo += HandleEndUndo;
-			widget.TextEditor.Document.Undone += HandleUndone;
-			widget.TextEditor.Document.Redone += HandleUndone;
 
 			widget.TextEditor.Document.TextReplacing += OnTextReplacing;
 			widget.TextEditor.Document.TextReplaced += OnTextReplaced;
 			widget.TextEditor.Document.ReadOnlyCheckDelegate = CheckReadOnly;
-			
+			widget.TextEditor.Document.TextSet += HandleDocumentTextSet;
+
+
+			widget.TextEditor.TextViewMargin.LineShown += TextViewMargin_LineShown;
 			//			widget.TextEditor.Document.DocumentUpdated += delegate {
 			//				this.IsDirty = Document.IsDirty;
 			//			};
 			
 			widget.TextEditor.Caret.PositionChanged += HandlePositionChanged; 
 			widget.TextEditor.IconMargin.ButtonPressed += OnIconButtonPress;
-		
-			debugStackLineMarker = new DebugStackLineTextMarker (widget.TextEditor);
-			currentDebugLineMarker = new CurrentDebugLineTextMarker (widget.TextEditor);
-			
-			this.WorkbenchWindowChanged += HandleWorkbenchWindowChanged;
-			this.ContentNameChanged += delegate {
-				this.Document.FileName = this.ContentName;
-				if (String.IsNullOrEmpty (ContentName) || !File.Exists (ContentName))
-					return;
-				
-				lastSaveTimeUtc = File.GetLastWriteTimeUtc (ContentName);
-			};
+			widget.TextEditor.TextArea.FocusOutEvent += TextArea_FocusOutEvent;
 			ClipbardRingUpdated += UpdateClipboardRing;
 			
 			TextEditorService.FileExtensionAdded += HandleFileExtensionAdded;
@@ -231,14 +211,15 @@ namespace MonoDevelop.SourceEditor
 
 			breakpoints = DebuggingService.Breakpoints;
 			DebuggingService.DebugSessionStarted += OnDebugSessionStarted;
-			DebuggingService.ExecutionLocationChanged += executionLocationChanged;
-			DebuggingService.CurrentFrameChanged += currentFrameChanged;
-			DebuggingService.StoppedEvent += currentFrameChanged;
-			DebuggingService.ResumedEvent += currentFrameChanged;
-			breakpoints.BreakpointAdded += breakpointAdded;
-			breakpoints.BreakpointRemoved += breakpointRemoved;
-			breakpoints.BreakpointStatusChanged += breakpointStatusChanged;
-			breakpoints.BreakpointModified += breakpointStatusChanged;
+			DebuggingService.StoppedEvent += HandleTargetExited;
+			DebuggingService.ExecutionLocationChanged += OnExecutionLocationChanged;
+			DebuggingService.CurrentFrameChanged += OnCurrentFrameChanged;
+			DebuggingService.StoppedEvent += OnCurrentFrameChanged;
+			DebuggingService.ResumedEvent += OnCurrentFrameChanged;
+			breakpoints.BreakpointAdded += OnBreakpointAdded;
+			breakpoints.BreakpointRemoved += OnBreakpointRemoved;
+			breakpoints.BreakpointStatusChanged += OnBreakpointStatusChanged;
+			breakpoints.BreakpointModified += OnBreakpointStatusChanged;
 			DebuggingService.PinnedWatches.WatchAdded += OnWatchAdded;
 			DebuggingService.PinnedWatches.WatchRemoved += OnWatchRemoved;
 			DebuggingService.PinnedWatches.WatchChanged += OnWatchChanged;
@@ -246,15 +227,34 @@ namespace MonoDevelop.SourceEditor
 			TaskService.Errors.TasksAdded += UpdateTasks;
 			TaskService.Errors.TasksRemoved += UpdateTasks;
 			TaskService.JumpedToTask += HandleTaskServiceJumpedToTask;
-			IdeApp.Preferences.ShowMessageBubblesChanged += HandleIdeAppPreferencesShowMessageBubblesChanged;
+			IdeApp.Preferences.ShowMessageBubbles.Changed += HandleIdeAppPreferencesShowMessageBubblesChanged;
 			TaskService.TaskToggled += HandleErrorListPadTaskToggled;
 			widget.TextEditor.Options.Changed += HandleWidgetTextEditorOptionsChanged;
-			IdeApp.Preferences.DefaultHideMessageBubblesChanged += HandleIdeAppPreferencesDefaultHideMessageBubblesChanged;
+			IdeApp.Preferences.DefaultHideMessageBubbles.Changed += HandleIdeAppPreferencesDefaultHideMessageBubblesChanged;
 			Document.AddAnnotation (this);
+			if (document != null) {
+				Document.MimeType = document.MimeType;
+				Document.FileName = document.FileName;
+			}
 			FileRegistry.Add (this);
 		}
 
-		void HandleLineChanged (object sender, LineEventArgs e)
+		void HandleDocumentTextSet (object sender, EventArgs e)
+		{
+			while (editSessions.Count > 0) {
+				EndSession ();
+			}
+		}
+
+		protected override void OnContentNameChanged ()
+		{
+			Document.FileName = ContentName;
+			if (!String.IsNullOrEmpty (ContentName) && File.Exists (ContentName))
+				lastSaveTimeUtc = File.GetLastWriteTimeUtc (ContentName);
+			base.OnContentNameChanged ();
+		}
+
+		void HandleLineChanged (object sender, Mono.TextEditor.LineEventArgs e)
 		{
 			UpdateBreakpoints ();
 			UpdateWidgetPositions ();
@@ -266,61 +266,42 @@ namespace MonoDevelop.SourceEditor
 					marker.GetLineHeight (widget.TextEditor);
 				}
 			}
+			var handler = LineChanged;
+			if (handler != null)
+				handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
 		}
 
 		void HandleTextReplaced (object sender, DocumentChangeEventArgs args)
 		{
 			if (Document.CurrentAtomicUndoOperationType == OperationType.Format)
 				return;
-			if (!inLoad) {
-				if (widget.TextEditor.Document.IsInAtomicUndo) {
-					wasEdited = true;
-				}
-				else {
-					InformAutoSave ();
-				}
-			}
 
 			int startIndex = args.Offset;
 			foreach (var marker in currentErrorMarkers) {
-				if (marker.LineSegment.Contains (args.Offset) || marker.LineSegment.Contains (args.Offset + args.InsertionLength) || args.Offset < marker.LineSegment.Offset && marker.LineSegment.Offset < args.Offset + args.InsertionLength) {
+				var line = marker.LineSegment;
+				if (line == null || line.Contains (args.Offset) || line.Contains (args.Offset + args.InsertionLength) || args.Offset < line.Offset && line.Offset < args.Offset + args.InsertionLength) {
 					markersToRemove.Enqueue (marker);
 				}
 			}
 			ResetRemoveMarker ();
 		}
 
-		void HandleSyntaxModeChanged (object sender, SyntaxModeChangeEventArgs e)
-		{
-			var oldProvider = e.OldMode as IQuickTaskProvider;
-			if (oldProvider != null)
-				widget.RemoveQuickTaskProvider (oldProvider);
-			var newProvider = e.NewMode as IQuickTaskProvider;
-			if (newProvider != null)
-				widget.AddQuickTaskProvider (newProvider);
-		}
-
-
 		void HandleEndUndo (object sender, TextDocument.UndoOperationEventArgs e)
 		{
-			if (wasEdited)
-				InformAutoSave ();
+			OnEndUndo (EventArgs.Empty);
 		}
 
 		void HandleBeginUndo (object sender, EventArgs e)
 		{
-			wasEdited = false;
+			OnBeginUndo (EventArgs.Empty);
 		}
 
-		void HandleUndone (object sender, TextDocument.UndoOperationEventArgs e)
-		{
-			AutoSave.InformAutoSaveThread (Document);
-		}
 
 		void HandlePositionChanged (object sender, DocumentLocationEventArgs e)
 		{
 			OnCaretPositionSet (EventArgs.Empty);
 			FireCompletionContextChanged ();
+			OnCaretPositionChanged (EventArgs.Empty);
 		}
 
 		void HandleFileExtensionRemoved (object sender, FileExtensionEventArgs args)
@@ -337,7 +318,7 @@ namespace MonoDevelop.SourceEditor
 			AddFileExtension (args.Extension);
 		}
 
-		Dictionary<TopLevelWidgetExtension,Gtk.Widget> widgetExtensions = new Dictionary<TopLevelWidgetExtension, Widget> ();
+		Dictionary<TopLevelWidgetExtension,Widget> widgetExtensions = new Dictionary<TopLevelWidgetExtension, Widget> ();
 		Dictionary<FileExtension,Tuple<TextLineMarker,DocumentLine>> markerExtensions = new Dictionary<FileExtension, Tuple<TextLineMarker,DocumentLine>> ();
 
 		void LoadExtensions ()
@@ -353,7 +334,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			if (extension is TopLevelWidgetExtension) {
 				var widgetExtension = (TopLevelWidgetExtension)extension;
-				var w = widgetExtension.CreateWidget ();
+				Widget w = widgetExtension.CreateWidget ();
 				int x, y;
 				if (!CalcWidgetPosition (widgetExtension, w, out x, out y)) {
 					w.Destroy ();
@@ -371,22 +352,22 @@ namespace MonoDevelop.SourceEditor
 				if (line == null)
 					return;
 
-				var marker = lineExt.CreateMarker ();
+				var marker = (TextLineMarker)lineExt.CreateMarker ();
 				widget.TextEditor.Document.AddMarker (line, marker);
 				widget.TextEditor.QueueDraw ();
-				markerExtensions [extension] = new Tuple<TextLineMarker,DocumentLine> (marker, line);
+				markerExtensions [extension] = new Tuple<TextLineMarker, DocumentLine> (marker, line);
 			}
 		}
 
 		void HandleScrollToViewRequested (object sender, EventArgs e)
 		{
 			var widgetExtension = (TopLevelWidgetExtension)sender;
-			Gtk.Widget w;
+			Widget w;
 			if (widgetExtensions.TryGetValue (widgetExtension, out w)) {
 				int x, y;
 				widget.TextEditor.TextArea.GetTopLevelWidgetPosition (w, out x, out y);
 				var size = w.SizeRequest ();
-				Gtk.Application.Invoke (delegate {
+				Application.Invoke (delegate {
 					widget.TextEditor.ScrollTo (new Gdk.Rectangle (x, y, size.Width, size.Height));
 				});
 			}
@@ -396,7 +377,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			if (extension is TopLevelWidgetExtension) {
 				var widgetExtension = (TopLevelWidgetExtension)extension;
-				Gtk.Widget w;
+				Widget w;
 				if (!widgetExtensions.TryGetValue (widgetExtension, out w))
 					return;
 				widgetExtensions.Remove (widgetExtension);
@@ -428,7 +409,7 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		bool CalcWidgetPosition (TopLevelWidgetExtension widgetExtension, Gtk.Widget w, out int x, out int y)
+		bool CalcWidgetPosition (TopLevelWidgetExtension widgetExtension, Widget w, out int x, out int y)
 		{
 			DocumentLine line = widget.TextEditor.Document.GetLine (widgetExtension.Line);
 			if (line == null) {
@@ -437,10 +418,10 @@ namespace MonoDevelop.SourceEditor
 			}
 
 			int lw, lh;
-			var wrapper = widget.TextEditor.TextViewMargin.GetLayout (line);
-			wrapper.Layout.GetPixelSize (out lw, out lh);
-			if (wrapper.IsUncached)
-				wrapper.Dispose ();
+			var tmpWrapper = widget.TextEditor.TextViewMargin.GetLayout (line);
+			tmpWrapper.Layout.GetPixelSize (out lw, out lh);
+			if (tmpWrapper.IsUncached)
+				tmpWrapper.Dispose ();
 			lh = (int) TextEditor.TextViewMargin.GetLineHeight (widgetExtension.Line);
 			x = (int)widget.TextEditor.TextViewMargin.XOffset + lw + 4;
 			y = (int)widget.TextEditor.LineToY (widgetExtension.Line);
@@ -492,16 +473,18 @@ namespace MonoDevelop.SourceEditor
 			}
 			x += widgetExtension.OffsetX;
 			y += widgetExtension.OffsetY;
+
+			//We don't want Widget to appear outside TextArea(cut off)...
+			x = Math.Max (0, x);
+			y = Math.Max (0, y);
 			return true;
 		}
 
-		void HandleWorkbenchWindowChanged (object sender, EventArgs e)
+		protected override void OnWorkbenchWindowChanged ()
 		{
-			if (WorkbenchWindow != null) {
-				widget.TextEditor.ExtensionContext = WorkbenchWindow.ExtensionContext;
+			base.OnWorkbenchWindowChanged ();
+			if (WorkbenchWindow != null)
 				WorkbenchWindow.ActiveViewContentChanged += HandleActiveViewContentChanged;
-				this.WorkbenchWindowChanged -= HandleWorkbenchWindowChanged;
-			}
 		}
 
 		void HandleActiveViewContentChanged (object o, ActiveViewContentEventArgs e)
@@ -520,7 +503,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			var task = e.Tasks != null ? e.Tasks.FirstOrDefault () : null;
 			var doc = Document;
-			if (task == null || doc == null || task.FileName != doc.FileName || this.TextEditor == null)
+			if (task == null || doc == null || task.FileName != doc.FileName || TextEditor == null)
 				return;
 			var lineSegment = doc.GetLine (task.Line);
 			if (lineSegment == null)
@@ -529,12 +512,12 @@ namespace MonoDevelop.SourceEditor
 			if (marker == null)
 				return;
 			
-			marker.SetPrimaryError (task.Description);
+			marker.SetPrimaryError (task);
 			
 			if (TextEditor != null && TextEditor.IsComposited) {
 				/*if (messageBubbleHighlightPopupWindow != null)
 					messageBubbleHighlightPopupWindow.Destroy ();*/
-			/*	messageBubbleHighlightPopupWindow = new MessageBubbleHighlightPopupWindow (this, marker);
+			/*	messageBherbbleHighlightPopupWindow = new MessageBubbleHighlightPopupWindow (this, marker);
 				messageBubbleHighlightPopupWindow.Destroyed += delegate {
 					messageBubbleHighlightPopupWindow = null;
 				};
@@ -542,61 +525,86 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 
-		void HandleIdeAppPreferencesDefaultHideMessageBubblesChanged (object sender, PropertyChangedEventArgs e)
+		void HandleIdeAppPreferencesDefaultHideMessageBubblesChanged (object sender, EventArgs e)
 		{
 			currentErrorMarkers.ForEach (marker => marker.IsVisible =  !IdeApp.Preferences.DefaultHideMessageBubbles);
-			this.TextEditor.QueueDraw ();
+			TextEditor.QueueDraw ();
 		}
 
-		void HandleIdeAppPreferencesShowMessageBubblesChanged (object sender, PropertyChangedEventArgs e)
+		void HandleIdeAppPreferencesShowMessageBubblesChanged (object sender, EventArgs e)
 		{
 			UpdateTasks (null, null);
 		}
 
 		void HandleErrorListPadTaskToggled (object sender, TaskEventArgs e)
 		{
-			this.TextEditor.QueueDraw ();
+			TextEditor.QueueDraw ();
 		}
 		
 		MessageBubbleCache messageBubbleCache;
-		List<MessageBubbleTextMarker> currentErrorMarkers = new List<MessageBubbleTextMarker> ();
-
-		void UpdateTasks (object sender, TaskEventArgs e)
-		{
-			Task[] tasks = TaskService.Errors.GetFileTasks (ContentName);
-			if (tasks == null)
-				return;
-			DisposeErrorMarkers (); // disposes messageBubbleCache as well.
-			if (IdeApp.Preferences.ShowMessageBubbles == ShowMessageBubbles.Never)
-				return;
-			using (var undo = Document.OpenUndoGroup ()) {
-				if (messageBubbleCache != null)
-					messageBubbleCache.Dispose ();
-				messageBubbleCache = new MessageBubbleCache (widget.TextEditor);
-				
-				foreach (Task task in tasks) {
-					if (task.Severity == TaskSeverity.Error || task.Severity == TaskSeverity.Warning) {
-						if (IdeApp.Preferences.ShowMessageBubbles == ShowMessageBubbles.ForErrors && task.Severity == TaskSeverity.Warning)
-							continue;
-						DocumentLine lineSegment = widget.Document.GetLine (task.Line);
-						if (lineSegment == null)
-							continue;
-						var marker = currentErrorMarkers.FirstOrDefault (m => m.LineSegment == lineSegment);
-						if (marker != null) {
-							marker.AddError (task, task.Severity == TaskSeverity.Error, task.Description);
+		List<MessageBubbleTextMarker> currentErrorMarkers = new List<MessageBubbleTextMarker> ();

+		CancellationTokenSource messageBubbleUpdateSource = new CancellationTokenSource ();
+
+		void UpdateTasks (object sender, TaskEventArgs e)

+		{

+			TaskListEntry [] tasks = TaskService.Errors.GetFileTasks (ContentName);

+			if (tasks == null)

+				return;

+			DisposeErrorMarkers (); // disposes messageBubbleCache as well.

+			if (IdeApp.Preferences.ShowMessageBubbles == ShowMessageBubbles.Never)

+				return;

+			messageBubbleCache = new MessageBubbleCache (widget.TextEditor);

+			CancelMessageBubbleUpdate ();

+			var token = messageBubbleUpdateSource;

+

+			Task.Run (delegate {

+				var errorMarkers = new List<MessageBubbleTextMarker> ();

+				foreach (TaskListEntry task in tasks) {

+					if (token.IsCancellationRequested)

+						return null;

+					if (task.Severity == TaskSeverity.Error || task.Severity == TaskSeverity.Warning) {

+						if (IdeApp.Preferences.ShowMessageBubbles == ShowMessageBubbles.ForErrors && task.Severity == TaskSeverity.Warning)

+							continue;

+						var errorTextMarker = new MessageBubbleTextMarker (messageBubbleCache, task, task.Severity == TaskSeverity.Error, task.Description);

+						errorMarkers.Add (errorTextMarker);

+

+						errorTextMarker.IsVisible = !IdeApp.Preferences.DefaultHideMessageBubbles;

+					}

+				}

+				return errorMarkers;

+			}).ContinueWith (t => {

+				if (token.IsCancellationRequested)

+					return;

+				Application.Invoke (delegate {

+					if (token.IsCancellationRequested)

+						return;
+					var newErrorMarkers = new List<MessageBubbleTextMarker> ();

+					foreach (var marker in t.Result) {

+						if (token.IsCancellationRequested)

+							return;

+						var lineSegment = widget.Document.GetLine (marker.Task.Line);

+						if (lineSegment == null)

 							continue;
-						}
-						MessageBubbleTextMarker errorTextMarker = new MessageBubbleTextMarker (messageBubbleCache, task, lineSegment, task.Severity == TaskSeverity.Error, task.Description);
-						currentErrorMarkers.Add (errorTextMarker);
-						
-						errorTextMarker.IsVisible =  !IdeApp.Preferences.DefaultHideMessageBubbles;
-						widget.Document.AddMarker (lineSegment, errorTextMarker, false);
+						var oldMarker = lineSegment.Markers.OfType<MessageBubbleTextMarker> ().FirstOrDefault ();
+						if (oldMarker != null) {
+							oldMarker.AddError (marker.Task, marker.Task.Severity == TaskSeverity.Error, marker.Task.Description);
+						} else {
+							marker.LineSegment = lineSegment;

+							widget.Document.AddMarker (lineSegment, marker, false, 0);
+							newErrorMarkers.Add (marker);
+						}

 					}
-				}
-			}
-			widget.TextEditor.QueueDraw ();
-		}
-		
+					this.currentErrorMarkers = newErrorMarkers;

+				});

+			});

+		}

+

+		void CancelMessageBubbleUpdate ()

+		{

+			messageBubbleUpdateSource.Cancel ();

+			messageBubbleUpdateSource = new CancellationTokenSource ();

+		}

+

 		void DisposeErrorMarkers ()
 		{
 			//the window has a reference to the markers we're destroying
@@ -604,7 +612,7 @@ namespace MonoDevelop.SourceEditor
 			//NRE and bring down MD
 			/*if (messageBubbleHighlightPopupWindow != null)
 				messageBubbleHighlightPopupWindow.Destroy ();*/
-			
+
 			currentErrorMarkers.ForEach (em => {
 				widget.Document.RemoveMarker (em);
 				em.Dispose ();
@@ -621,19 +629,19 @@ namespace MonoDevelop.SourceEditor
 			return text;
 		}
 		
-		public override void Save (string fileName)
+		public override Task Save (FileSaveInformation fileSaveInformation)
 		{
-			Save (fileName, this.encoding);
+			return Save (fileSaveInformation.FileName, fileSaveInformation.Encoding ?? encoding);
 		}
 
-		public void Save (string fileName, Encoding encoding)
+		public async Task Save (string fileName, Encoding encoding)
 		{
 			if (widget.HasMessageBar)
 				return;
-			
-			if (!string.IsNullOrEmpty (ContentName))
-				AutoSave.RemoveAutoSaveFile (ContentName);
-
+			if (encoding != null) {
+				this.encoding = encoding;
+				UpdateTextDocumentEncoding ();
+			}
 			if (ContentName != fileName) {
 				FileService.RequestFileEdit ((FilePath) fileName);
 				writeAllowed = true;
@@ -641,7 +649,7 @@ namespace MonoDevelop.SourceEditor
 			}
 
 			if (warnOverwrite) {
-				if (fileName == ContentName) {
+				if (string.Equals (fileName, ContentName, FilePath.PathComparison)) {
 					string question = GettextCatalog.GetString (
 						"This file {0} has been changed outside of {1}. Are you sure you want to overwrite the file?",
 						fileName, BrandingService.ApplicationName
@@ -661,15 +669,14 @@ namespace MonoDevelop.SourceEditor
 						var document = WorkbenchWindow.Document;
 						if (formatter.SupportsOnTheFlyFormatting) {
 							using (var undo = TextEditor.OpenUndoGroup ()) {
-								formatter.OnTheFlyFormat (document, 0, Document.TextLength);
-								wasEdited = false;
+								formatter.OnTheFlyFormat (WorkbenchWindow.Document.Editor, WorkbenchWindow.Document);
 							}
 						} else {
 							var text = document.Editor.Text;
 							var policies = document.Project != null ? document.Project.Policies : PolicyService.DefaultPolicies;
 							string formattedText = formatter.FormatText (policies, text);
 							if (formattedText != null && formattedText != text) {
-								document.Editor.Replace (0, text.Length, formattedText);
+								document.Editor.ReplaceText (0, text.Length, formattedText);
 							}
 						}
 					}
@@ -678,7 +685,7 @@ namespace MonoDevelop.SourceEditor
 				}
 			}
 
-			FileRegistry.SuspendFileWatch = true;
+			FileRegistry.SkipNextChange (fileName);
 			try {
 				object attributes = null;
 				if (File.Exists (fileName)) {
@@ -722,7 +729,8 @@ namespace MonoDevelop.SourceEditor
 	//						writeBom =!Mono.TextEditor.Utils.TextFileUtility.IsASCII (writeText);
 						}
 					}
-					Mono.TextEditor.Utils.TextFileUtility.WriteText (fileName, writeText, writeEncoding, writeBom);
+					await MonoDevelop.Core.Text.TextFileUtility.WriteTextAsync (fileName, writeText, writeEncoding, writeBom);
+					this.encoding = writeEncoding;
 				} catch (InvalidEncodingException) {
 					var result = MessageService.AskQuestion (GettextCatalog.GetString ("Can't save file with current codepage."), 
 						GettextCatalog.GetString ("Some unicode characters in this file could not be saved with the current encoding.\nDo you want to resave this file as Unicode ?\nYou can choose another encoding in the 'save as' dialog."),
@@ -730,9 +738,9 @@ namespace MonoDevelop.SourceEditor
 						AlertButton.Cancel,
 						new AlertButton (GettextCatalog.GetString ("Save as Unicode")));
 					if (result != AlertButton.Cancel) {
-						this.hadBom = true;
+						hadBom = true;
 						this.encoding = Encoding.UTF8;
-						Mono.TextEditor.Utils.TextFileUtility.WriteText (fileName, Document.Text, encoding, hadBom);
+						MonoDevelop.Core.Text.TextFileUtility.WriteText (fileName, Document.Text, encoding, hadBom);
 					} else {
 						return;
 					}
@@ -747,10 +755,8 @@ namespace MonoDevelop.SourceEditor
 			} catch (UnauthorizedAccessException e) {
 				LoggingService.LogError ("Error while saving file", e);
 				MessageService.ShowError (GettextCatalog.GetString ("Can't save file - access denied"), e.Message);
-			} finally {
-				FileRegistry.SuspendFileWatch = false;
 			}
-				
+
 //			if (encoding != null)
 //				se.Buffer.SourceEncoding = encoding;
 //			TextFileService.FireCommitCountChanges (this);
@@ -758,17 +764,12 @@ namespace MonoDevelop.SourceEditor
 			ContentName = fileName; 
 			UpdateMimeType (fileName);
 			Document.SetNotDirtyState ();
-			this.IsDirty = false;
-		}
-		
-		public override void DiscardChanges ()
-		{
-			if (!string.IsNullOrEmpty (ContentName))
-				AutoSave.RemoveAutoSaveFile (ContentName);
+			IsDirty = false;
 		}
 		
-		public override void LoadNew (Stream content, string mimeType)
+		public void InformLoadComplete ()
 		{
+		/*
 			Document.MimeType = mimeType;
 			string text = null;
 			if (content != null) {
@@ -778,79 +779,40 @@ namespace MonoDevelop.SourceEditor
 			}
 			this.CreateDocumentParsedHandler ();
 			RunFirstTimeFoldUpdate (text);
+			*/
 			Document.InformLoadComplete ();
 		}
 		
-		public override void Load (string fileName)
+		public override Task LoadNew (Stream content, string mimeType)
 		{
-			Load (fileName, null);
+			throw new NotSupportedException ("Moved to TextEditorViewContent.LoadNew.");
 		}
-
-		void RunFirstTimeFoldUpdate (string text)
+		
+		public override Task Load (FileOpenInformation fileOpenInformation)
 		{
-			if (string.IsNullOrEmpty (text)) 
-				return;
-			ParsedDocument parsedDocument = null;
-
-			var foldingParser = TypeSystemService.GetFoldingParser (Document.MimeType);
-			if (foldingParser != null) {
-				parsedDocument = foldingParser.Parse (Document.FileName, text);
-			} else {
-				var normalParser = TypeSystemService.GetParser (Document.MimeType);
-				if (normalParser != null) {
-					using (var sr = new StringReader (text))
-						parsedDocument = normalParser.Parse (true, Document.FileName, sr, null);
-				}
-			}
-			if (parsedDocument != null) 
-				widget.UpdateParsedDocument (parsedDocument);
+			return Load (fileOpenInformation.FileName, fileOpenInformation.Encoding, fileOpenInformation.IsReloadOperation);
 		}
 
-		void CreateDocumentParsedHandler ()
-		{
-			this.WorkbenchWindowChanged += delegate {
-				if (WorkbenchWindow == null)
-					return;
-				WorkbenchWindow.DocumentChanged +=  delegate {
-					if (WorkbenchWindow.Document == null)
-						return;
-					foreach (var provider in WorkbenchWindow.Document.GetContents<IQuickTaskProvider> ()) {
-						widget.AddQuickTaskProvider (provider);
-					}
-					foreach (var provider in WorkbenchWindow.Document.GetContents<IUsageProvider> ()) {
-						widget.AddUsageTaskProvider (provider);
-					}
-					ownerDocument = WorkbenchWindow.Document;
-					ownerDocument.DocumentParsed += HandleDocumentParsed;
-				};
-			};
-		}
-
-		MonoDevelop.Ide.Gui.Document ownerDocument;
-		protected MonoDevelop.Ide.Gui.Document OwnerDocument {
-			get { return ownerDocument; }
-		}
-
-		protected virtual void HandleDocumentParsed (object sender, EventArgs e)
-		{
-			widget.UpdateParsedDocument (ownerDocument.ParsedDocument);
-		}		
-
-		void IEncodedTextContent.Load (string fileName, Encoding loadEncoding)
+		protected virtual string ProcessLoadText (string text)
 		{
-			Load (fileName, loadEncoding);
+			return text;
 		}
 
-		protected virtual string ProcessLoadText (string text)
+		void UpdateTextDocumentEncoding ()
 		{
-			return text;
+			if (wrapper != null) {
+				wrapper.Document.Encoding = encoding;
+				wrapper.Document.UseBom = hadBom;
+			}
 		}
 
-		public void Load (string fileName, Encoding loadEncoding, bool reload = false)
+		public Task Load (string fileName, Encoding loadEncoding, bool reload = false)
 		{
-			// Handle the "reload" case.
-			if (ContentName == fileName)
-				AutoSave.RemoveAutoSaveFile (fileName);
+			var document = Document;
+			if (document == null)
+				return TaskUtil.Default<object> ();
+			document.TextReplaced -= OnTextReplaced;
+			
 			if (warnOverwrite) {
 				warnOverwrite = false;
 				widget.RemoveMessageBar ();
@@ -860,47 +822,45 @@ namespace MonoDevelop.SourceEditor
 			UpdateMimeType (fileName);
 			string text = null;
 			bool didLoadCleanly;
-			if (AutoSave.AutoSaveExists (fileName)) {
+			if (!reload && AutoSave.AutoSaveExists (fileName)) {
 				widget.ShowAutoSaveWarning (fileName);
-				this.encoding = loadEncoding;
+				encoding = loadEncoding;
 				didLoadCleanly = false;
 			}
 			else {
-				inLoad = true;
 				if (loadEncoding == null) {
-					text = TextFileUtility.ReadAllText (fileName, out hadBom, out encoding);
+					text = MonoDevelop.Core.Text.TextFileUtility.ReadAllText (fileName, out hadBom, out encoding);
 				} else {
 					encoding = loadEncoding;
-					text = TextFileUtility.ReadAllText (fileName, loadEncoding, out hadBom);
+					text = MonoDevelop.Core.Text.TextFileUtility.ReadAllText (fileName, loadEncoding, out hadBom);
 				}
 				text = ProcessLoadText (text);
 				if (reload) {
-					Document.Replace (0, Document.TextLength, text);
-					Document.DiffTracker.Reset ();
+					document.Replace (0, Document.TextLength, text);
+					document.DiffTracker.Reset ();
 				} else {
-					Document.Text = text;
-					Document.DiffTracker.SetBaseDocument (Document.CreateDocumentSnapshot ());
+					document.Text = text;
+					document.DiffTracker.SetBaseDocument (Document.CreateDocumentSnapshot ());
 				}
-				inLoad = false;
 				didLoadCleanly = true;
 			}
 			// TODO: Would be much easier if the view would be created after the containers.
-			CreateDocumentParsedHandler ();
 			ContentName = fileName;
 			lastSaveTimeUtc = File.GetLastWriteTimeUtc (ContentName);
-			RunFirstTimeFoldUpdate (text);
 			widget.TextEditor.Caret.Offset = 0;
 			UpdateExecutionLocation ();
 			UpdateBreakpoints ();
 			UpdatePinnedWatches ();
 			LoadExtensions ();
-			this.IsDirty = !didLoadCleanly;
+			IsDirty = !didLoadCleanly;
 			UpdateTasks (null, null);
 			widget.TextEditor.TextArea.SizeAllocated += HandleTextEditorVAdjustmentChanged;
 			if (didLoadCleanly) {
-				Document.InformLoadComplete ();
 				widget.EnsureCorrectEolMarker (fileName);
 			}
+			UpdateTextDocumentEncoding ();
+			document.TextReplaced += OnTextReplaced;
+			return TaskUtil.Default<object> ();
 		}
 		
 		void HandleTextEditorVAdjustmentChanged (object sender, EventArgs e)
@@ -911,8 +871,8 @@ namespace MonoDevelop.SourceEditor
 
 		internal void LoadSettings ()
 		{
-			FileSettingsStore.Settings settings;
-			if (widget == null || string.IsNullOrEmpty (ContentName) || !FileSettingsStore.TryGetValue (ContentName, out settings))
+			MonoDevelop.Ide.Editor.FileSettingsStore.Settings settings;
+			if (widget == null || string.IsNullOrEmpty (ContentName) || !MonoDevelop.Ide.Editor.FileSettingsStore.TryGetValue (ContentName, out settings))
 				return;
 			
 			widget.TextEditor.Caret.Offset = settings.CaretOffset;
@@ -934,7 +894,7 @@ namespace MonoDevelop.SourceEditor
 //			}
 			if (string.IsNullOrEmpty (ContentName))
 				return;
-			FileSettingsStore.Store (ContentName, new FileSettingsStore.Settings () {
+			MonoDevelop.Ide.Editor.FileSettingsStore.Store (ContentName, new MonoDevelop.Ide.Editor.FileSettingsStore.Settings {
 				CaretOffset = widget.TextEditor.Caret.Offset,
 				vAdjustment = widget.TextEditor.VAdjustment.Value,
 				hAdjustment = widget.TextEditor.HAdjustment.Value//,
@@ -943,11 +903,10 @@ namespace MonoDevelop.SourceEditor
 		}
 
 		bool warnOverwrite = false;
-		bool inLoad = false;
 		Encoding encoding;
 		bool hadBom = false;
 
-		internal void ReplaceContent (string fileName, string content, Encoding encoding)
+		internal void ReplaceContent (string fileName, string content, Encoding enc)
 		{
 			if (warnOverwrite) {
 				warnOverwrite = false;
@@ -956,38 +915,36 @@ namespace MonoDevelop.SourceEditor
 			}
 			UpdateMimeType (fileName);
 			
-			inLoad = true;
 			Document.Replace (0, Document.TextLength, content);
 			Document.DiffTracker.Reset ();
-			inLoad = false;
-			this.encoding = encoding;
+			encoding = enc;
 			ContentName = fileName;
-			RunFirstTimeFoldUpdate (content);
-			CreateDocumentParsedHandler ();
 			UpdateExecutionLocation ();
 			UpdateBreakpoints ();
 			UpdatePinnedWatches ();
 			LoadExtensions ();
 			IsDirty = false;
-			Document.InformLoadComplete ();
+			UpdateTextDocumentEncoding ();
+			InformLoadComplete ();
 		}
-		
+	
 		void UpdateMimeType (string fileName)
 		{
-			// Look for a mime type for which there is a syntax mode
-			string mimeType = DesktopService.GetMimeTypeForUri (fileName);
-			if (loadedMimeType != mimeType) {
-				loadedMimeType = mimeType;
-				if (mimeType != null) {
-					foreach (string mt in DesktopService.GetMimeTypeInheritanceChain (loadedMimeType)) {
-						if (Mono.TextEditor.Highlighting.SyntaxModeService.GetSyntaxMode (null, mt) != null) {
-							Document.MimeType = mt;
-							widget.TextEditor.TextEditorResolverProvider = TextEditorResolverService.GetProvider (mt);
-							break;
-						}
+			Document.MimeType = DesktopService.GetMimeTypeForUri (fileName);
+
+			//if the mimetype doesn't have a syntax mode, try to load one for its base mimetypes
+			var sm = Document.SyntaxMode as Mono.TextEditor.Highlighting.SyntaxMode;
+			if (sm != null && sm.MimeType == null) {
+				foreach (string mt in DesktopService.GetMimeTypeInheritanceChain (Document.MimeType)) {
+					var syntaxMode = Mono.TextEditor.Highlighting.SyntaxModeService.GetSyntaxMode (null, mt);
+					if (syntaxMode != null) {
+						Document.SyntaxMode = syntaxMode;
+						break;
 					}
 				}
-				((StyledSourceEditorOptions)SourceEditorWidget.TextEditor.Options).UpdateStyleParent (Project, loadedMimeType);
+			}
+			if (Document.MimeType != null) {
+				widget.TextEditor.TextEditorResolverProvider = TextEditorResolverService.GetProvider (Document.MimeType);
 			}
 		}
 		
@@ -997,52 +954,56 @@ namespace MonoDevelop.SourceEditor
 
 		public override void Dispose ()
 		{
+			if (isDisposed)
+				return;
+			isDisposed = true;

+
+			CancelMessageBubbleUpdate ();
 			ClearExtensions ();
 			FileRegistry.Remove (this);
-			RemoveAutoSaveTimer ();
-			
+
 			StoreSettings ();
 			
-			this.isDisposed = true;
 			Counters.LoadedEditors--;
 			
 		/*	if (messageBubbleHighlightPopupWindow != null)
 				messageBubbleHighlightPopupWindow.Destroy ();*/
 
-			IdeApp.Preferences.DefaultHideMessageBubblesChanged -= HandleIdeAppPreferencesDefaultHideMessageBubblesChanged;
-			IdeApp.Preferences.ShowMessageBubblesChanged -= HandleIdeAppPreferencesShowMessageBubblesChanged;
+			IdeApp.Preferences.DefaultHideMessageBubbles.Changed -= HandleIdeAppPreferencesDefaultHideMessageBubblesChanged;
+			IdeApp.Preferences.ShowMessageBubbles.Changed -= HandleIdeAppPreferencesShowMessageBubblesChanged;
 			TaskService.TaskToggled -= HandleErrorListPadTaskToggled;
 			
 			DisposeErrorMarkers ();
 			
 			ClipbardRingUpdated -= UpdateClipboardRing;
 
-			widget.TextEditor.Document.SyntaxModeChanged -= HandleSyntaxModeChanged;
 			widget.TextEditor.Document.TextReplaced -= HandleTextReplaced;
 			widget.TextEditor.Document.LineChanged -= HandleLineChanged;
 			widget.TextEditor.Document.BeginUndo -= HandleBeginUndo; 
 			widget.TextEditor.Document.EndUndo -= HandleEndUndo;
-			widget.TextEditor.Document.Undone -= HandleUndone;
-			widget.TextEditor.Document.Redone -= HandleUndone;
 			widget.TextEditor.Caret.PositionChanged -= HandlePositionChanged; 
 			widget.TextEditor.IconMargin.ButtonPressed -= OnIconButtonPress;
 			widget.TextEditor.Document.TextReplacing -= OnTextReplacing;
 			widget.TextEditor.Document.TextReplaced -= OnTextReplaced;
 			widget.TextEditor.Document.ReadOnlyCheckDelegate = null;
 			widget.TextEditor.Options.Changed -= HandleWidgetTextEditorOptionsChanged;
+			widget.TextEditor.TextViewMargin.LineShown -= TextViewMargin_LineShown;
+			widget.TextEditor.TextArea.FocusOutEvent -= TextArea_FocusOutEvent;
+			widget.TextEditor.Document.TextSet -= HandleDocumentTextSet;
 
 			TextEditorService.FileExtensionAdded -= HandleFileExtensionAdded;
 			TextEditorService.FileExtensionRemoved -= HandleFileExtensionRemoved;
 
-			DebuggingService.ExecutionLocationChanged -= executionLocationChanged;
+			DebuggingService.ExecutionLocationChanged -= OnExecutionLocationChanged;
 			DebuggingService.DebugSessionStarted -= OnDebugSessionStarted;
-			DebuggingService.CurrentFrameChanged -= currentFrameChanged;
-			DebuggingService.StoppedEvent -= currentFrameChanged;
-			DebuggingService.ResumedEvent -= currentFrameChanged;
-			breakpoints.BreakpointAdded -= breakpointAdded;
-			breakpoints.BreakpointRemoved -= breakpointRemoved;
-			breakpoints.BreakpointStatusChanged -= breakpointStatusChanged;
-			breakpoints.BreakpointModified -= breakpointStatusChanged;
+			DebuggingService.StoppedEvent -= HandleTargetExited;
+			DebuggingService.CurrentFrameChanged -= OnCurrentFrameChanged;
+			DebuggingService.StoppedEvent -= OnCurrentFrameChanged;
+			DebuggingService.ResumedEvent -= OnCurrentFrameChanged;
+			breakpoints.BreakpointAdded -= OnBreakpointAdded;
+			breakpoints.BreakpointRemoved -= OnBreakpointRemoved;
+			breakpoints.BreakpointStatusChanged -= OnBreakpointStatusChanged;
+			breakpoints.BreakpointModified -= OnBreakpointStatusChanged;
 			DebuggingService.PinnedWatches.WatchAdded -= OnWatchAdded;
 			DebuggingService.PinnedWatches.WatchRemoved -= OnWatchRemoved;
 			DebuggingService.PinnedWatches.WatchChanged -= OnWatchChanged;
@@ -1057,32 +1018,25 @@ namespace MonoDevelop.SourceEditor
 			debugStackLineMarker = null;
 			currentDebugLineMarker = null;
 
-			executionLocationChanged = null;
-			currentFrameChanged = null;
-			breakpointAdded = null;
-			breakpointRemoved = null;
-			breakpointStatusChanged = null;
-
-			if (ownerDocument != null) {
-				ownerDocument.DocumentParsed -= HandleDocumentParsed;
-				ownerDocument = null;
-			}
-
 			RemoveMarkerQueue ();
+			widget.Dispose ();
+			if (wrapper != null) {
+				wrapper.Dispose ();
+				wrapper = null;
+			}
+			this.Project = null;
 		}
-		
-		public Ambience GetAmbience ()
-		{
-			string file = this.IsUntitled ? this.UntitledName : this.ContentName;
-			return AmbienceService.GetAmbienceForFile (file);
-		}
-		
 
 		bool CheckReadOnly (int line)
 		{
 			if (!writeAccessChecked && !IsUntitled) {
 				writeAccessChecked = true;
-				writeAllowed = FileService.RequestFileEdit (ContentName, false);
+				try {
+					writeAllowed = FileService.RequestFileEdit (ContentName);
+				} catch (Exception e) {
+					IdeApp.Workbench.StatusBar.ShowError (e.Message); 
+					writeAllowed = false;
+				}
 			}
 			return IsUntitled || writeAllowed;
 		}
@@ -1096,9 +1050,9 @@ namespace MonoDevelop.SourceEditor
 		
 		void OnTextReplaced (object s, DocumentChangeEventArgs a)
 		{
-			this.IsDirty = Document.IsDirty;
+			IsDirty = Document.IsDirty;
 			
-			DocumentLocation location = Document.OffsetToLocation (a.Offset);
+			var location = Document.OffsetToLocation (a.Offset);
 			
 			int i = 0, lines = 0;
 			while (i != -1 && i < oldReplaceText.Length) {
@@ -1136,35 +1090,38 @@ namespace MonoDevelop.SourceEditor
 		
 		void UpdateExecutionLocation ()
 		{
+			if (currentDebugLineMarker != null || debugStackLineMarker != null) {
+				RemoveDebugMarkers ();
+				widget.TextEditor.QueueDraw ();
+			}
 			if (DebuggingService.IsPaused) {
 				var location = CheckLocationIsInFile (DebuggingService.NextStatementLocation)
 					?? CheckFrameIsInFile (DebuggingService.CurrentFrame)
 					?? CheckFrameIsInFile (DebuggingService.GetCurrentVisibleFrame ());
 				if (location != null) {
-					if (lastDebugLine == location.Line)
-						return;
 					RemoveDebugMarkers ();
-					lastDebugLine = location.Line;
-					var segment = widget.TextEditor.Document.GetLine (lastDebugLine);
+					var segment = widget.TextEditor.Document.GetLine (location.Line);
 					if (segment != null) {
+						int offset, length;
+						if (location.Line > 0 && location.Column > 0 && location.EndLine > 0 && location.EndColumn > 0) {
+							offset = widget.TextEditor.LocationToOffset (location.Line, location.Column);
+							length = widget.TextEditor.LocationToOffset (location.EndLine, location.EndColumn) - offset;
+						} else {
+							offset = segment.Offset;
+							length = segment.Length;
+						}
 						if (DebuggingService.CurrentFrameIndex == 0) {
-							currentLineSegment = segment;
-							widget.TextEditor.Document.AddMarker (segment, currentDebugLineMarker);
+							currentDebugLineMarker = new CurrentDebugLineTextMarker (widget.TextEditor, offset, length);
+							currentDebugLineMarker.AddTo (widget.TextEditor.Document, segment);
 						} else {
-							debugStackSegment = segment;
-							widget.TextEditor.Document.AddMarker (segment, debugStackLineMarker);
+							debugStackLineMarker = new DebugStackLineTextMarker (widget.TextEditor, offset, length);
+							debugStackLineMarker.AddTo (widget.TextEditor.Document, segment);
 						}
 						widget.TextEditor.QueueDraw ();
 					}
 					return;
 				}
 			}
-			
-			if (currentLineSegment != null || debugStackSegment != null) {
-				RemoveDebugMarkers ();
-				lastDebugLine = -1;
-				widget.TextEditor.QueueDraw ();
-			}
 		}
 
 		SourceLocation CheckLocationIsInFile (SourceLocation location)
@@ -1182,13 +1139,13 @@ namespace MonoDevelop.SourceEditor
 
 		void RemoveDebugMarkers ()
 		{
-			if (currentLineSegment != null) {
-				widget.TextEditor.Document.RemoveMarker (currentDebugLineMarker);
-				currentLineSegment = null;
+			if (currentDebugLineMarker != null) {
+				currentDebugLineMarker.Remove ();
+				currentDebugLineMarker = null;
 			}
-			if (debugStackSegment != null) {
-				widget.TextEditor.Document.RemoveMarker (debugStackLineMarker);
-				debugStackSegment = null;
+			if (debugStackLineMarker != null) {
+				debugStackLineMarker.Remove ();
+				debugStackLineMarker = null;
 			}
 		}
 		
@@ -1225,10 +1182,10 @@ namespace MonoDevelop.SourceEditor
 			if (w.OffsetX < 0) {
 				w.OffsetY = (int)widget.TextEditor.LineToY (w.Line);
 				int lw, lh;
-				var wrapper = widget.TextEditor.TextViewMargin.GetLayout (line);
-				wrapper.Layout.GetPixelSize (out lw, out lh);
-				if (wrapper.IsUncached)
-					wrapper.Dispose ();
+				var tmpWrapper = widget.TextEditor.TextViewMargin.GetLayout (line);
+				tmpWrapper.Layout.GetPixelSize (out lw, out lh);
+				if (tmpWrapper.IsUncached)
+					tmpWrapper.Dispose ();
 				w.OffsetX = (int)widget.TextEditor.TextViewMargin.XOffset + lw + 4;
 			}
 			wi.Widget = new PinnedWatchWidget (widget.TextEditor, w);
@@ -1250,7 +1207,6 @@ namespace MonoDevelop.SourceEditor
 			foreach (var marker in currentErrorMarkers) {
 				marker.IsVisible = false;
 			}
-			DebuggingService.DebuggerSession.TargetExited += HandleTargetExited;
 		}
 
 		void HandleTargetExited (object sender, EventArgs e)
@@ -1304,7 +1260,7 @@ namespace MonoDevelop.SourceEditor
 					foreach (var bp in breakpoints.GetBreakpointsAtFile (fp.FullPath)) {
 						count++;
 						if (i < breakpointSegments.Count) {
-							int lineNumber = document.OffsetToLineNumber (breakpointSegments [i].Offset);
+							int lineNumber = document.OffsetToLineNumber (breakpointSegments [i].TextMarker.Offset);
 							if (lineNumber != bp.Line) {
 								mismatch = true;
 								break;
@@ -1325,10 +1281,12 @@ namespace MonoDevelop.SourceEditor
 			foreach (var line in breakpointSegments) {
 				if (line == null)
 					continue;
-				lineNumbers.Add (document.OffsetToLineNumber (line.Offset));
-				document.RemoveMarker (line, typeof(BreakpointTextMarker));
-				document.RemoveMarker (line, typeof(DisabledBreakpointTextMarker));
-				document.RemoveMarker (line, typeof(InvalidBreakpointTextMarker));
+				var endLine = document.OffsetToLineNumber (line.TextMarker.EndOffset);
+				for (int i = document.OffsetToLineNumber (line.TextMarker.Offset); i <= endLine; i++) {
+					lineNumbers.Add (i);
+				}
+				document.RemoveMarker (line.TextMarker);
+				document.RemoveMarker (line.IconMarker);
 			}
 			
 			breakpointSegments.Clear ();
@@ -1347,7 +1305,6 @@ namespace MonoDevelop.SourceEditor
 			document.CommitDocumentUpdate ();
 			
 			// Ensure the current line marker is drawn at the top
-			lastDebugLine = -1;
 			UpdateExecutionLocation ();
 		}
 		
@@ -1365,7 +1322,7 @@ namespace MonoDevelop.SourceEditor
 			FilePath fp = Name;
 			if (fp.FullPath == bp.FileName) {
 				if (bp.Line <= 0 || bp.Line > textEditor.Document.LineCount) {
-					LoggingService.LogWarning ("Invalid breakpoint :" + bp +" in line " + bp.Line); 
+					LoggingService.LogWarning ("Invalid breakpoint :" + bp + " in line " + bp.Line);
 					return;
 				}
 				DocumentLine line = document.GetLine (bp.Line);
@@ -1375,16 +1332,22 @@ namespace MonoDevelop.SourceEditor
 				if (line == null)
 					return;
 
+				//TODO: 1. When not in debug mode use Microsoft.CodeAnalysis.CSharp.EditAndContinue.BreakpointSpans.TryGetBreakpointSpan
+				//TODO: 2. When in debug mode extend Breakpoint class to have endLine and endColumn set if .mdb/.pdb has endLine/endColumn
+				var offset = line.Offset;
+				var lenght = line.Length;
+				DebugMarkerPair marker;
 				if (!bp.Enabled) {
-					document.AddMarker (line, new DisabledBreakpointTextMarker (textEditor, tracepoint));
+					marker = new DisabledBreakpointTextMarker (textEditor, offset, lenght, tracepoint);
 				} else if (status == BreakEventStatus.Bound || status == BreakEventStatus.Disconnected) {
-					document.AddMarker (line, new BreakpointTextMarker (textEditor, tracepoint));
+					marker = new BreakpointTextMarker (textEditor, offset, lenght, tracepoint);
 				} else {
-					document.AddMarker (line, new InvalidBreakpointTextMarker (textEditor, tracepoint));
+					marker = new InvalidBreakpointTextMarker (textEditor, offset, lenght, tracepoint);
 				}
 
 				textEditor.QueueDraw ();
-				breakpointSegments.Add (line);
+				breakpointSegments.Add (marker);
+				marker.AddTo (document, line);
 			}
 		}
 		
@@ -1395,6 +1358,7 @@ namespace MonoDevelop.SourceEditor
 			// Updated with a delay, to make sure it works when called as a
 			// result of inserting/removing lines before a breakpoint position
 			GLib.Timeout.Add (10, delegate {
+				// Make sure this runs in the UI thread.
 				if (!isDisposed)
 					UpdateBreakpoints ();
 				return false;
@@ -1408,6 +1372,7 @@ namespace MonoDevelop.SourceEditor
 			// Updated with a delay, to make sure it works when called as a
 			// result of inserting/removing lines before a breakpoint position
 			GLib.Timeout.Add (10, delegate {
+				// Make sure this runs in the UI thread.
 				if (!isDisposed)
 					UpdateBreakpoints ();
 				return false;
@@ -1421,6 +1386,7 @@ namespace MonoDevelop.SourceEditor
 			// Updated with a delay, to make sure it works when called as a
 			// result of inserting/removing lines before a breakpoint position
 			GLib.Timeout.Add (10, delegate {
+				// Make sure this runs in the UI thread.
 				if (!isDisposed)
 					UpdateBreakpoints (true);
 				return false;
@@ -1429,7 +1395,7 @@ namespace MonoDevelop.SourceEditor
 		
 		void OnIconButtonPress (object s, MarginMouseEventArgs args)
 		{
-			if (args.LineNumber < DocumentLocation.MinLine)
+			if (args.LineNumber < Mono.TextEditor.DocumentLocation.MinLine)
 				return;
 
 			if (args.TriggersContextMenu ()) {
@@ -1444,51 +1410,23 @@ namespace MonoDevelop.SourceEditor
 					WorkbenchWindow.ExtensionContext ?? AddinManager.AddinEngine,
 					"/MonoDevelop/SourceEditor2/IconContextMenu/Editor");
 			} else if (args.Button == 1) {
-				if (!string.IsNullOrEmpty (this.Document.FileName)) {
+				if (!string.IsNullOrEmpty (Document.FileName)) {
 					if (args.LineSegment != null) {
 						int column = TextEditor.Caret.Line == args.LineNumber ? TextEditor.Caret.Column : 1;
 
 						lock (breakpoints)
-							breakpoints.Toggle (this.Document.FileName, args.LineNumber, column);
+							breakpoints.Toggle (Document.FileName, args.LineNumber, column);
 					}
 				}
 			}
 		}
-		
-		#region IExtensibleTextEditor
-		public ITextEditorExtension Extension {
-			get;
-			set;
-		}
-		
-		ITextEditorExtension IExtensibleTextEditor.AttachExtension (ITextEditorExtension extension)
-		{
-			Extension = extension;
-			this.widget.TextEditor.Extension = extension;
-			return this.widget;
-		}
-		
-//		protected override void OnMoveCursor (MovementStep step, int count, bool extend_selection)
-//		{
-//			base.OnMoveCursor (step, count, extend_selection);
-//			if (extension != null)
-//				extension.CursorPositionChanged ();
-//		}
-		
-//		protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
-//		{
-//			if (extension != null)
-//				return extension.KeyPress (evnt.Key, evnt.State);
-//			return this.KeyPress (evnt.Key, evnt.State); 
-//		}		
-		#endregion
-		
+
 		#region IEditableTextBuffer
 		public bool EnableUndo {
 			get {
 				if (widget == null)
 					return false;
-				return /*this.TextEditor.PreeditOffset < 0 &&*/ this.Document.CanUndo && widget.EditorHasFocus;
+				return /*this.TextEditor.PreeditOffset < 0 &&*/ Document.CanUndo && widget.EditorHasFocus;
 			}
 		}
 		
@@ -1506,14 +1444,14 @@ namespace MonoDevelop.SourceEditor
 			}*/
 			if (MiscActions.CancelPreEditMode (TextEditor.GetTextEditorData ()))
 				return;
-			MiscActions.Undo (this.TextEditor.GetTextEditorData ());
+			MiscActions.Undo (TextEditor.GetTextEditorData ());
 		}
 		
 		public bool EnableRedo {
 			get {
 				if (widget == null)
 					return false;
-				return /*this.TextEditor.PreeditOffset < 0 && */ this.Document.CanRedo && widget.EditorHasFocus;
+				return /*this.TextEditor.PreeditOffset < 0 && */ Document.CanRedo && widget.EditorHasFocus;
 			}
 		}
 
@@ -1550,7 +1488,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			if (MiscActions.CancelPreEditMode (TextEditor.GetTextEditorData ()))
 				return;
-			MiscActions.Redo (this.TextEditor.GetTextEditorData ());
+			MiscActions.Redo (TextEditor.GetTextEditorData ());
 		}
 		
 		public IDisposable OpenUndoGroup ()
@@ -1566,7 +1504,7 @@ namespace MonoDevelop.SourceEditor
 				TextEditor.DeleteSelectedText ();
 				var offset = TextEditor.Caret.Offset;
 				int length = TextEditor.Insert (offset, value);
-				TextEditor.SelectionRange = new TextSegment (offset, length);
+				TextEditor.SelectionRange = new Mono.TextEditor.TextSegment (offset, length);
 			}
 		}
 
@@ -1577,8 +1515,7 @@ namespace MonoDevelop.SourceEditor
 		}
 
 		public event EventHandler CaretPositionSet;
-		public event EventHandler<TextChangedEventArgs> TextChanged;
-		
+
 		public bool HasInputFocus {
 			get { return TextEditor.HasFocus; }
 		}
@@ -1589,7 +1526,6 @@ namespace MonoDevelop.SourceEditor
 		}
 		#endregion
 		
-		#region ITextBuffer
 		public int CursorPosition { 
 			get {
 				return TextEditor.Caret.Offset;
@@ -1598,56 +1534,28 @@ namespace MonoDevelop.SourceEditor
 				TextEditor.Caret.Offset = value;
 			}
 		}
-
-		public int SelectionStartPosition { 
-			get {
-				if (!TextEditor.IsSomethingSelected)
-					return TextEditor.Caret.Offset;
-				return TextEditor.SelectionRange.Offset;
-			}
-		}
-
-		public int SelectionEndPosition { 
-			get {
-				if (!TextEditor.IsSomethingSelected)
-					return TextEditor.Caret.Offset;
-				return TextEditor.SelectionRange.EndOffset;
-			}
-		}
-		
-		public void Select (int startPosition, int endPosition)
-		{
-			TextEditor.SelectionRange = new TextSegment (startPosition, endPosition - startPosition);
-			TextEditor.ScrollToCaret ();
-		}
-		
-		public void ShowPosition (int position)
-		{
-			// TODO
-		}
-		#endregion
 		
 		#region ITextFile
 		public FilePath Name {
 			get { 
-				return this.ContentName ?? this.UntitledName; 
+				return ContentName ?? UntitledName; 
 			} 
 		}
 
 		public string Text {
 			get {
-				return this.widget.TextEditor.Document.Text;
+				return widget.TextEditor.Document.Text;
 			}
 			set {
 				this.IsDirty = true;
-				TextDocument document = this.widget.TextEditor.Document;
+				var document = this.widget.TextEditor.Document;
 				document.Replace (0, document.TextLength, value);
 			}
 		}
 		
 		public int Length { 
 			get {
-				return this.widget.TextEditor.Document.TextLength;
+				return widget.TextEditor.Document.TextLength;
 			}
 		}
 
@@ -1671,17 +1579,17 @@ namespace MonoDevelop.SourceEditor
 		
 		public char GetCharAt (int position)
 		{
-			return this.widget.TextEditor.Document.GetCharAt (position);
+			return widget.TextEditor.Document.GetCharAt (position);
 		}
 		
 		public int GetPositionFromLineColumn (int line, int column)
 		{
-			return this.widget.TextEditor.Document.LocationToOffset (new DocumentLocation (line, column));
+			return widget.TextEditor.Document.LocationToOffset (new Mono.TextEditor.DocumentLocation (line, column));
 		}
 
 		public void GetLineColumnFromPosition (int position, out int line, out int column)
 		{
-			DocumentLocation location = this.widget.TextEditor.Document.OffsetToLocation (position);
+			var location = widget.TextEditor.Document.OffsetToLocation (position);
 			line = location.Line;
 			column = location.Column;
 		}
@@ -1690,25 +1598,25 @@ namespace MonoDevelop.SourceEditor
 		#region IEditableTextFile
 		public int InsertText (int position, string text)
 		{
-			return this.widget.TextEditor.Insert (position, text);
+			return widget.TextEditor.Insert (position, text);
 		}
 
 		public void DeleteText (int position, int length)
 		{
-			this.widget.TextEditor.TextArea.Remove (position, length);
+			widget.TextEditor.TextArea.Remove (position, length);
 		}
 		#endregion 
 		
 		#region IBookmarkBuffer
 		DocumentLine GetLine (int position)
 		{
-			DocumentLocation location = Document.OffsetToLocation (position);
+			var location = Document.OffsetToLocation (position);
 			return Document.GetLine (location.Line);
 		}
 				
 		public void SetBookmarked (int position, bool mark)
 		{
-			DocumentLine line = GetLine (position);
+			var line = GetLine (position);
 			if (line != null && line.IsBookmarked != mark) {
 				int lineNumber = widget.TextEditor.Document.OffsetToLineNumber (line.Offset);
 				line.IsBookmarked = mark;
@@ -1719,8 +1627,8 @@ namespace MonoDevelop.SourceEditor
 		
 		public bool IsBookmarked (int position)
 		{
-			DocumentLine line = GetLine (position);
-			return line != null ? line.IsBookmarked : false;
+			var line = GetLine (position);
+			return line != null && line.IsBookmarked;
 		}
 		
 		public void PrevBookmark ()
@@ -1818,7 +1726,7 @@ namespace MonoDevelop.SourceEditor
 			get {
 				if (TextEditor.IsSomethingSelected) {
 					if (TextEditor.MainSelection.SelectionMode == Mono.TextEditor.SelectionMode.Block)
-						return System.Math.Abs (TextEditor.MainSelection.Anchor.Column - TextEditor.MainSelection.Lead.Column);
+						return Math.Abs (TextEditor.MainSelection.Anchor.Column - TextEditor.MainSelection.Lead.Column);
 					return TextEditor.SelectionRange.Length;
 				}
 				return 0;
@@ -1837,11 +1745,15 @@ namespace MonoDevelop.SourceEditor
 			get {
 				return TextEditor.Caret.Offset;
 			}
+			set {
+				TextEditor.Caret.Offset = value;
+				TextEditor.ScrollToCaret ();
+			}
 		}
 		
-		public Gtk.Style GtkStyle { 
+		public Style GtkStyle { 
 			get {
-				return widget.Vbox.Style.Copy ();
+				return widget.Vbox.Style;
 			}
 		}
 
@@ -1862,9 +1774,14 @@ namespace MonoDevelop.SourceEditor
 			var loc = editor.Caret.Location;
 			result.TriggerLine = loc.Line;
 			result.TriggerLineOffset = loc.Column - 1;
-			var p = this.widget.TextEditor.LocationToPoint (loc);
+			var p = widget.TextEditor.LocationToPoint (loc);
 			int tx, ty;
-			editor.ParentWindow.GetOrigin (out tx, out ty);
+			var parentWindow = editor.ParentWindow;
+			if (parentWindow != null) {
+				parentWindow.GetOrigin (out tx, out ty);
+			} else {
+				tx = ty = 0;
+			}
 			tx += editor.Allocation.X + p.X;
 			ty += editor.Allocation.Y + p.Y + (int)editor.LineHeight;
 
@@ -1874,7 +1791,7 @@ namespace MonoDevelop.SourceEditor
 			return result;
 		}
 		
-		public Gdk.Point DocumentToScreenLocation (DocumentLocation location)
+		public Gdk.Point DocumentToScreenLocation (Mono.TextEditor.DocumentLocation location)
 		{
 			var p = widget.TextEditor.LocationToPoint (location);
 			int tx, ty;
@@ -1898,21 +1815,25 @@ namespace MonoDevelop.SourceEditor
 			return Document.GetTextBetween (min, max);
 		}
 		
-		public void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word)
+		public void SetCompletionText (CodeCompletionContext ctx, string partialWord, string completeWord)
 		{
-			SetCompletionText (ctx, partial_word, complete_word, complete_word.Length);
+			if (ctx == null)
+				throw new ArgumentNullException ("ctx");
+			if (completeWord == null)
+				throw new ArgumentNullException ("completeWord");
+			SetCompletionText (ctx, partialWord, completeWord, completeWord.Length);
 		}
 
-		public static void SetCompletionText (TextEditorData data, CodeCompletionContext ctx, string partial_word, string complete_word, int wordOffset)
+		public static void SetCompletionText (TextEditorData data, CodeCompletionContext ctx, string partialWord, string completeWord, int wordOffset)
 		{
 			if (data == null || data.Document == null)
 				return;
 
 			int triggerOffset = ctx.TriggerOffset;
-			int length = String.IsNullOrEmpty (partial_word) ? 0 : partial_word.Length;
+			int length = String.IsNullOrEmpty (partialWord) ? 0 : partialWord.Length;
 
 			// for named arguments invoke(arg:<Expr>);
-			if (complete_word.EndsWith (":", StringComparison.Ordinal)) {
+			if (completeWord.EndsWith (":", StringComparison.Ordinal)) {
 				if (data.GetCharAt (triggerOffset + length) == ':')
 					length++;
 			}
@@ -1932,9 +1853,9 @@ namespace MonoDevelop.SourceEditor
 			}
 
 			// | in the completion text now marks the caret position
-			int idx = complete_word.IndexOf ('|');
+			int idx = completeWord.IndexOf ('|');
 			if (idx >= 0) {
-				complete_word = complete_word.Remove (idx, 1);
+				completeWord = completeWord.Remove (idx, 1);
 			}
 			
 			triggerOffset += data.EnsureCaretIsNotVirtual ();
@@ -1949,11 +1870,11 @@ namespace MonoDevelop.SourceEditor
 						if (lineSegment == null)
 							continue;
 						int offset = lineSegment.Offset + column;
-						data.Replace (offset, length, complete_word);
+						data.Replace (offset, length, completeWord);
 					}
-					int minColumn = System.Math.Min (data.MainSelection.Anchor.Column, data.MainSelection.Lead.Column);
+					int minColumn = Math.Min (data.MainSelection.Anchor.Column, data.MainSelection.Lead.Column);
 					data.MainSelection = data.MainSelection.WithRange (
-						new DocumentLocation (data.Caret.Line == minLine ? maxLine : minLine, minColumn),
+						new Mono.TextEditor.DocumentLocation (data.Caret.Line == minLine ? maxLine : minLine, minColumn),
 						data.Caret.Location
 					);
 
@@ -1961,7 +1882,7 @@ namespace MonoDevelop.SourceEditor
 					data.Caret.PreserveSelection = false;
 				}
 			} else {
-				data.Replace (triggerOffset, length, complete_word);
+				data.Replace (triggerOffset, length, completeWord);
 			}
 			
 			data.Document.CommitLineUpdate (data.Caret.Line);
@@ -1970,17 +1891,13 @@ namespace MonoDevelop.SourceEditor
 
 		}
 
-		public void SetCompletionText (CodeCompletionContext ctx, string partial_word, string complete_word, int wordOffset)
+		public void SetCompletionText (CodeCompletionContext ctx, string partialWord, string completeWord, int wordOffset)
 		{
 			var data = GetTextEditorData ();
 			if (data == null)
 				return;
 			using (var undo = data.OpenUndoGroup ()) {
-				SetCompletionText (data, ctx, partial_word, complete_word, wordOffset);
-				var formatter = CodeFormatterService.GetFormatter (data.MimeType);
-				if (formatter != null && complete_word.IndexOfAny (new [] {' ', '\t', '{', '}'}) > 0 && formatter.SupportsOnTheFlyFormatting) {
-					formatter.OnTheFlyFormat (WorkbenchWindow.Document, ctx.TriggerOffset, ctx.TriggerOffset + complete_word.Length);
-				}
+				SetCompletionText (data, ctx, partialWord, completeWord, wordOffset);
 			}
 		}
 		
@@ -2003,10 +1920,12 @@ namespace MonoDevelop.SourceEditor
 			if (TextEditor.IsSomethingSelected) {
 				expression = TextEditor.SelectedText;
 			} else {
-				DomRegion region;
+				MonoDevelop.Ide.Editor.DocumentRegion region;
 				var rr = TextEditor.GetLanguageItem (TextEditor.Caret.Offset, out region);
-				if (rr != null && !rr.IsError)
-					expression = TextEditor.GetTextBetween (region.Begin, region.End);
+				if (rr != null)
+					expression = TextEditor.GetTextBetween (
+						region.BeginLine, region.BeginColumn, 
+						region.EndLine, region.EndColumn);
 			}
 
 			DebuggingService.ShowExpressionEvaluator (expression);
@@ -2075,18 +1994,18 @@ namespace MonoDevelop.SourceEditor
 		{
 			bool toggle = true;
 
-			foreach (FoldSegment segment in Document.FoldSegments) {
-				if (segment.FoldingType == FoldingType.TypeMember || segment.FoldingType == FoldingType.Comment)
+			foreach (var segment in Document.FoldSegments) {
+				if (segment.FoldingType == Mono.TextEditor.FoldingType.TypeMember || segment.FoldingType == Mono.TextEditor.FoldingType.Comment)
 					if (segment.IsFolded)
 						toggle = false;
 			}
 
 
-			foreach (FoldSegment segment in Document.FoldSegments) {
-				if (segment.FoldingType == FoldingType.TypeDefinition) {
+			foreach (var segment in Document.FoldSegments) {
+				if (segment.FoldingType == Mono.TextEditor.FoldingType.TypeDefinition) {
 					segment.IsFolded = false;
 				}
-				if (segment.FoldingType == FoldingType.TypeMember || segment.FoldingType == FoldingType.Comment)
+				if (segment.FoldingType == Mono.TextEditor.FoldingType.TypeMember || segment.FoldingType == Mono.TextEditor.FoldingType.Comment)
 					segment.IsFolded = toggle;
 			}
 
@@ -2151,7 +2070,7 @@ namespace MonoDevelop.SourceEditor
 		
 		static SourceEditorView ()
 		{
-			CodeSegmentPreviewWindow.CodeSegmentPreviewInformString = GettextCatalog.GetString ("Press 'F2' for focus");
+			CodeSegmentPreviewWindow.CodeSegmentPreviewInformString = GettextCatalog.GetString ("Press F2 to focus");
 			ClipboardActions.CopyOperation.Copy += delegate (string text) {
 				if (String.IsNullOrEmpty (text))
 					return;
@@ -2172,7 +2091,7 @@ namespace MonoDevelop.SourceEditor
 					item.Description += line;
 				}
 				item.Category = GettextCatalog.GetString ("Clipboard ring");
-				item.Icon = DesktopService.GetIconForFile ("a.txt", Gtk.IconSize.Menu);
+				item.Icon = DesktopService.GetIconForFile ("a.txt", IconSize.Menu);
 				item.Name = text.Length > 16 ? text.Substring (0, 16) + "..." : text;
 				item.Name = item.Name.Replace ("\t", "\\t");
 				item.Name = item.Name.Replace ("\n", "\\n");
@@ -2183,6 +2102,8 @@ namespace MonoDevelop.SourceEditor
 				if (ClipbardRingUpdated != null)
 					ClipbardRingUpdated (null, EventArgs.Empty);
 			};
+			SyntaxModeLoader.Init ();
+			Mono.TextEditor.Highlighting.SyntaxModeService.LoadStylesAndModes (TextEditorDisplayBinding.SyntaxModePath);
 		}
 		
 		public void UpdateClipboardRing (object sender, EventArgs e)
@@ -2219,16 +2140,16 @@ namespace MonoDevelop.SourceEditor
 		{
 			var tn = item as ITextToolboxNode;
 			if (tn != null) {
-				tn.InsertAtCaret (base.WorkbenchWindow.Document);
+				tn.InsertAtCaret (WorkbenchWindow.Document);
 				TextEditor.GrabFocus ();
 			}
 		}
 		
 		#region dnd
-		Gtk.Widget customSource;
+		Widget customSource;
 		ItemToolboxNode dragItem;
 
-		void IToolboxConsumer.DragItem (ItemToolboxNode item, Gtk.Widget source, Gdk.DragContext ctx)
+		void IToolboxConsumer.DragItem (ItemToolboxNode item, Widget source, Gdk.DragContext ctx)
 		{
 			//FIXME: use the preview text
 			string text = GetDragPreviewText (item);
@@ -2266,7 +2187,7 @@ namespace MonoDevelop.SourceEditor
 				LoggingService.LogWarning ("Cannot use non-ITextToolboxNode toolbox items in the text editor.");
 				return null;
 			}
-			return tn.GetDragPreview (base.WorkbenchWindow.Document);
+			return tn.GetDragPreview (WorkbenchWindow.Document);
 		}
 		
 		System.ComponentModel.ToolboxItemFilterAttribute[] IToolboxConsumer.ToolboxFilterAttributes {
@@ -2285,10 +2206,10 @@ namespace MonoDevelop.SourceEditor
 			//int i = filename.LastIndexOf ('.');
 			//string ext = i < 0? null : filename.Substring (i + 1);
 			
-			return textNode.IsCompatibleWith (base.WorkbenchWindow.Document);
+			return textNode.IsCompatibleWith (WorkbenchWindow.Document);
 		}
 		
-		public Gtk.TargetEntry[] DragTargets { 
+		public TargetEntry[] DragTargets { 
 			get {
 				return ClipboardActions.CopyOperation.TargetEntries;
 			}
@@ -2309,88 +2230,80 @@ namespace MonoDevelop.SourceEditor
 		#region IZoomable
 		bool IZoomable.EnableZoomIn {
 			get {
-				return this.TextEditor.Options.CanZoomIn;
+				return TextEditor.Options.CanZoomIn;
 			}
 		}
 		
 		bool IZoomable.EnableZoomOut {
 			get {
-				return this.TextEditor.Options.CanZoomOut;
+				return TextEditor.Options.CanZoomOut;
 			}
 		}
 		
 		bool IZoomable.EnableZoomReset {
 			get {
-				return this.TextEditor.Options.CanResetZoom;
+				return TextEditor.Options.CanResetZoom;
 			}
 		}
 		
 		void IZoomable.ZoomIn ()
 		{
-			this.TextEditor.Options.ZoomIn ();
+			TextEditor.Options.ZoomIn ();
 		}
 		
 		void IZoomable.ZoomOut ()
 		{
-			this.TextEditor.Options.ZoomOut ();
+			TextEditor.Options.ZoomOut ();
 		}
 		
 		void IZoomable.ZoomReset ()
 		{
-			this.TextEditor.Options.ZoomReset ();
+			TextEditor.Options.ZoomReset ();
 		}
 
 		#region ITextEditorResolver implementation 
 		
-		public ResolveResult GetLanguageItem (int offset)
+		public Microsoft.CodeAnalysis.ISymbol GetLanguageItem (int offset)
 		{
-			DomRegion region;
-			return this.SourceEditorWidget.TextEditor.GetLanguageItem (offset, out region);
+			MonoDevelop.Ide.Editor.DocumentRegion region;
+			return SourceEditorWidget.TextEditor.GetLanguageItem (offset, out region);
 		}
 		
-		public ResolveResult GetLanguageItem (int offset, string expression)
+		public Microsoft.CodeAnalysis.ISymbol GetLanguageItem (int offset, string expression)
 		{
-			return this.SourceEditorWidget.TextEditor.GetLanguageItem (offset, expression);
+			return SourceEditorWidget.TextEditor.GetLanguageItem (offset, expression);
 		}
 		#endregion 
 		
 		#region ISupportsProjectReload implementaion
 		
-		ProjectReloadCapability ISupportsProjectReload.ProjectReloadCapability {
+		public override ProjectReloadCapability ProjectReloadCapability {
 			get {
 				return ProjectReloadCapability.Full;
 			}
 		}
-		
-		void ISupportsProjectReload.Update (Project project)
-		{
-			// The project will be assigned to the view. Nothing else to do. 
-		}
-		
+
 		#endregion
 		
 		#endregion
-		public Mono.TextEditor.TextEditorData GetTextEditorData ()
+		public TextEditorData GetTextEditorData ()
 		{
 			var editor = TextEditor;
 			if (editor == null)
 				return null;
 			return editor.GetTextEditorData ();
 		}
-		
-		public void InsertTemplate (CodeTemplate template, MonoDevelop.Ide.Gui.Document doc)
-		{
-			TextEditor.InsertTemplate (template, doc);
-		}
-		
-		[CommandHandler (TextEditorCommands.GotoMatchingBrace)]
-		protected void OnGotoMatchingBrace ()
+
+		public void InsertTemplate (CodeTemplate template, MonoDevelop.Ide.Editor.TextEditor editor, DocumentContext context)
 		{
-			TextEditor.RunAction (MiscActions.GotoMatchingBracket);
+			TextEditor.InsertTemplate (template, editor, context);
 		}
-		
+
 		void CorrectIndenting ()
 		{
+			var doc = IdeApp.Workbench.ActiveDocument?.Editor;
+			if (doc == null)
+				return;
 			var formatter = CodeFormatterService.GetFormatter (Document.MimeType);
 			if (formatter == null || !formatter.SupportsCorrectingIndent)
 				return;
@@ -2404,53 +2317,22 @@ namespace MonoDevelop.SourceEditor
 					var version = TextEditor.Document.Version;
 					int max = selection.MaxLine;
 					for (int i = TextEditor.MainSelection.MinLine; i <= max; i++) {
-						formatter.CorrectIndenting (policies, editorData, i);
+						formatter.CorrectIndenting (policies, doc, i);
 					}
 					editorData.SetSelection (version.MoveOffsetTo (editorData.Document.Version, anchor), version.MoveOffsetTo (editorData.Document.Version, lead));
 				}
 			} else {
-				formatter.CorrectIndenting (policies, editorData, TextEditor.Caret.Line);
+				formatter.CorrectIndenting (policies, doc, TextEditor.Caret.Line);
 			}
 		}
 
-		[CommandUpdateHandler (TextEditorCommands.MoveBlockUp)]
-		[CommandUpdateHandler (TextEditorCommands.MoveBlockDown)]
-		void MoveBlockUpdateHandler (CommandInfo cinfo)
+		protected override object OnGetContent (Type type)
 		{
-			cinfo.Enabled = widget.EditorHasFocus;
+			if (type.Equals (typeof(TextEditorData)))
+				return TextEditor.GetTextEditorData ();
+			return base.OnGetContent (type);
 		}
 
-		[CommandHandler (TextEditorCommands.MoveBlockUp)]
-		protected void OnMoveBlockUp ()
-		{
-			using (var undo = TextEditor.OpenUndoGroup ()) {
-				TextEditor.RunAction (MiscActions.MoveBlockUp);
-				CorrectIndenting ();
-			}
-		}
-		
-		[CommandHandler (TextEditorCommands.MoveBlockDown)]
-		protected void OnMoveBlockDown ()
-		{
-			using (var undo = TextEditor.OpenUndoGroup ()) {
-				TextEditor.RunAction (MiscActions.MoveBlockDown);
-				CorrectIndenting ();
-			}
-		}
-		
-		[CommandUpdateHandler (TextEditorCommands.ToggleBlockSelectionMode)]
-		protected void UpdateToggleBlockSelectionMode (CommandInfo cinfo)
-		{
-			cinfo.Enabled = TextEditor.IsSomethingSelected;
-		}
-		
-		[CommandHandler (TextEditorCommands.ToggleBlockSelectionMode)]
-		protected void OnToggleBlockSelectionMode ()
-		{
-			TextEditor.SelectionMode = TextEditor.SelectionMode == Mono.TextEditor.SelectionMode.Normal ? Mono.TextEditor.SelectionMode.Block : Mono.TextEditor.SelectionMode.Normal;
-			TextEditor.QueueDraw ();
-		}
-		
 		#region widget command handlers
 		[CommandHandler (SearchCommands.EmacsFindNext)]
 		public void EmacsFindNext ()
@@ -2548,57 +2430,939 @@ namespace MonoDevelop.SourceEditor
 		{
 			widget.MonodocResolverUpdate (cinfo);
 		}
-		
-		[CommandUpdateHandler (EditCommands.ToggleCodeComment)]
-		internal void OnUpdateToggleComment (MonoDevelop.Components.Commands.CommandInfo info)
+
+		[CommandHandler (SourceEditorCommands.NextIssue)]
+		void NextIssue ()
+		{
+			widget.NextIssue ();
+		}	
+
+		[CommandHandler (SourceEditorCommands.PrevIssue)]
+		void PrevIssue ()
+		{
+			widget.PrevIssue ();
+		}
+
+		[CommandHandler (SourceEditorCommands.NextIssueError)]
+		void NextIssueError ()
+		{
+			widget.NextIssueError ();
+		}	
+
+		[CommandHandler (SourceEditorCommands.PrevIssueError)]
+		void PrevIssueError ()
+		{
+			widget.PrevIssueError ();
+		}
+		#endregion
+
+		TextDocumentWrapper wrapper;
+		IReadonlyTextDocument ITextEditorImpl.Document {
+			get {
+				if (wrapper == null) {
+					wrapper = new TextDocumentWrapper (widget.TextEditor.Document);
+					if (encoding != null) {
+						wrapper.Document.Encoding = encoding;
+						wrapper.Document.UseBom = hadBom;
+					} else {
+						wrapper.Document.Encoding = Encoding.UTF8;
+						wrapper.Document.UseBom = true;
+					}
+				}
+				return wrapper;
+			}
+		}
+
+		event EventHandler ITextEditorImpl.SelectionChanged {
+			add {
+				TextEditor.SelectionChanged += value;
+			}
+			remove {
+				TextEditor.SelectionChanged -= value;
+			}
+		}
+
+		event EventHandler<Xwt.MouseMovedEventArgs> ITextEditorImpl.MouseMoved {
+			add {
+				TextEditor.BeginHover += value;
+			}
+			remove {
+				TextEditor.BeginHover -= value;
+			}
+		}
+
+		event EventHandler ITextEditorImpl.VAdjustmentChanged {
+			add {
+				TextEditor.VAdjustment.ValueChanged += value;
+			}
+			remove {
+				TextEditor.VAdjustment.ValueChanged -= value;
+			}
+		}
+
+		event EventHandler ITextEditorImpl.HAdjustmentChanged {
+			add {
+				TextEditor.HAdjustment.ValueChanged += value;
+			}
+			remove {
+				TextEditor.HAdjustment.ValueChanged -= value;
+			}
+		}
+
+		public event EventHandler CaretPositionChanged;
+		bool hasCaretPositionChanged;
+		protected virtual void OnCaretPositionChanged (EventArgs e)
+		{
+			if (widget.TextEditor.Document.IsInAtomicUndo) {
+				hasCaretPositionChanged = true;
+				return;
+			}
+			var handler = CaretPositionChanged;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public event EventHandler BeginAtomicUndoOperation;
+
+		protected virtual void OnBeginUndo (EventArgs e)
+		{
+			hasCaretPositionChanged = false;
+			var handler = BeginAtomicUndoOperation;
+			if (handler != null)
+				handler (this, e);
+		}
+
+		public event EventHandler EndAtomicUndoOperation;
+
+		protected virtual void OnEndUndo (EventArgs e)
+		{
+			var handler = EndAtomicUndoOperation;
+			if (handler != null)
+				handler (this, e);
+			if (hasCaretPositionChanged) {
+				OnCaretPositionChanged (e);
+				hasCaretPositionChanged = false;
+			}
+		}
+
+		void ITextEditorImpl.SetSelection (int anchorOffset, int leadOffset)
+		{
+			TextEditor.SetSelection (anchorOffset, leadOffset);
+		}
+
+		void ITextEditorImpl.ClearSelection ()
+		{
+			TextEditor.ClearSelection ();
+		}
+
+		void ITextEditorImpl.CenterToCaret ()
+		{
+			TextEditor.CenterToCaret ();
+		}
+
+		void ITextEditorImpl.StartCaretPulseAnimation ()
+		{
+			TextEditor.StartCaretPulseAnimation ();
+		}
+
+		int ITextEditorImpl.EnsureCaretIsNotVirtual ()
+		{
+			return TextEditor.GetTextEditorData ().EnsureCaretIsNotVirtual ();
+		}
+
+		void ITextEditorImpl.FixVirtualIndentation ()
+		{
+			TextEditor.GetTextEditorData ().FixVirtualIndentation ();
+		}
+
+		object ITextEditorImpl.CreateNativeControl ()
+		{
+			return widget != null ? widget.Vbox : null;
+		}
+
+		string ITextEditorImpl.FormatString (int offset, string code)
+		{
+			return TextEditor.GetTextEditorData ().FormatString (offset, code);
+		}
+
+		void ITextEditorImpl.StartInsertionMode (InsertionModeOptions insertionModeOptions)
+		{
+			var mode = new InsertionCursorEditMode (TextEditor, insertionModeOptions.InsertionPoints.Select (ip => new Mono.TextEditor.InsertionPoint ( 
+				new Mono.TextEditor.DocumentLocation (ip.Location.Line, ip.Location.Column),
+				(Mono.TextEditor.NewLineInsertion)ip.LineBefore,
+				(Mono.TextEditor.NewLineInsertion)ip.LineAfter
+			)).ToList ());
+			if (mode.InsertionPoints.Count == 0) {
+				return;
+			}
+			var helpWindow = new Mono.TextEditor.PopupWindow.InsertionCursorLayoutModeHelpWindow ();
+			helpWindow.TitleText = insertionModeOptions.Operation;
+			mode.HelpWindow = helpWindow;
+			mode.CurIndex = insertionModeOptions.FirstSelectedInsertionPoint;
+			mode.StartMode ();
+			mode.Exited += delegate(object s, Mono.TextEditor.InsertionCursorEventArgs iCArgs) {
+				if (insertionModeOptions.ModeExitedAction != null) {
+					insertionModeOptions.ModeExitedAction (new MonoDevelop.Ide.Editor.InsertionCursorEventArgs (iCArgs.Success,
+																												iCArgs.Success ? 
+					                                                                                            new MonoDevelop.Ide.Editor.InsertionPoint (
+						                                                                                            new MonoDevelop.Ide.Editor.DocumentLocation (iCArgs.InsertionPoint.Location.Line, iCArgs.InsertionPoint.Location.Column),
+						                                                                                            (MonoDevelop.Ide.Editor.NewLineInsertion)iCArgs.InsertionPoint.LineBefore, 
+						                                                                                            (MonoDevelop.Ide.Editor.NewLineInsertion)iCArgs.InsertionPoint.LineAfter) 
+					                                                                                            : null
+																											   ));
+				}
+			};
+		}
+
+		void ITextEditorImpl.StartTextLinkMode (TextLinkModeOptions textLinkModeOptions)
 		{
-			widget.OnUpdateToggleComment (info);
+			var convertedLinks = new List<Mono.TextEditor.TextLink> ();
+			foreach (var link in textLinkModeOptions.Links) {
+				var convertedLink = new Mono.TextEditor.TextLink (link.Name);
+				convertedLink.IsEditable = link.IsEditable;
+				convertedLink.IsIdentifier = link.IsIdentifier;
+				var func = link.GetStringFunc;
+				if (func != null) {
+					convertedLink.GetStringFunc = delegate(Func<string, string> arg) {
+						return new ListDataProviderWrapper (func (arg));
+					};
+				}
+				foreach (var segment in link.Links) {
+					convertedLink.AddLink (new Mono.TextEditor.TextSegment (segment.Offset, segment.Length)); 
+				}
+				convertedLinks.Add (convertedLink); 
+			}
+
+			var tle = new TextLinkEditMode (TextEditor, 0, convertedLinks);
+			tle.SetCaretPosition = false;
+			if (tle.ShouldStartTextLinkMode) {
+				tle.OldMode = TextEditor.CurrentMode;
+				if (textLinkModeOptions.ModeExitedAction != null) {
+					tle.Cancel += (sender, e) => textLinkModeOptions.ModeExitedAction (new TextLinkModeEventArgs (false));
+					tle.Exited += (sender, e) => {
+						for (int i = 0; i < convertedLinks.Count; i++) {
+							textLinkModeOptions.Links[i].CurrentText = convertedLinks[i].CurrentText;
+						}
+						textLinkModeOptions.ModeExitedAction (new TextLinkModeEventArgs (true));
+						
+					};
+				}
+				var undoOperation = TextEditor.OpenUndoGroup ();
+				tle.Exited += (object sender, EventArgs e) => undoOperation.Dispose ();
+				tle.StartMode ();
+				TextEditor.CurrentMode = tle;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.DocumentLocation ITextEditorImpl.PointToLocation (double xp, double yp, bool endAtEol)
+		{
+			var pt = TextEditor.PointToLocation (xp, yp);
+			return new MonoDevelop.Ide.Editor.DocumentLocation (pt.Line, pt.Column);
+		}
+
+		Xwt.Point ITextEditorImpl.LocationToPoint (int line, int column)
+		{
+			var p = TextEditor.LocationToPoint (line, column);
+			return new Xwt.Point (p.X, p.Y);
+		}
+
+		void ITextEditorImpl.AddMarker (IDocumentLine line, ITextLineMarker lineMarker)
+		{
+			var debugPair = lineMarker as DebugMarkerPair;
+			if (debugPair != null) {
+				debugPair.AddTo (TextEditor.Document, ((DocumentLineWrapper)line).Line);
+				return;
+			}
+			var textLineMarker = lineMarker as TextLineMarker;
+			if (textLineMarker == null)
+				throw new InvalidOperationException ("Tried to add an incompatible text marker. Use the MarkerHost to create compatible ones.");
+
+			if (lineMarker is IUnitTestMarker) {
+				var actionMargin = TextEditor.ActionMargin;
+				if (actionMargin != null) {
+					actionMargin.IsVisible = true;
+				}
+			}
+
+			TextEditor.Document.AddMarker (((DocumentLineWrapper)line).Line, textLineMarker);
+		}
+
+		void ITextEditorImpl.RemoveMarker (ITextLineMarker lineMarker)
+		{
+			var debugPair = lineMarker as DebugMarkerPair;
+			if (debugPair != null) {
+				debugPair.Remove ();
+				return;
+			}
+			var textLineMarker = lineMarker as TextLineMarker;
+			if (textLineMarker == null)
+				throw new InvalidOperationException ("Tried to add an incompatible text marker.");
+			TextEditor.Document.RemoveMarker (textLineMarker);
+		}
+
+		IEnumerable<ITextLineMarker> ITextEditorImpl.GetLineMarkers (IDocumentLine line)
+		{
+			return ((DocumentLineWrapper)line).Line.Markers.OfType<ITextLineMarker> ();
+		}
+
+		IEnumerable<ITextSegmentMarker> ITextEditorImpl.GetTextSegmentMarkersAt (MonoDevelop.Core.Text.ISegment segment)
+		{
+			return TextEditor.Document.GetTextSegmentMarkersAt (new Mono.TextEditor.TextSegment (segment.Offset, segment.Length)).OfType<ITextSegmentMarker> ();
+		}
+
+		IEnumerable<ITextSegmentMarker> ITextEditorImpl.GetTextSegmentMarkersAt (int offset)
+		{
+			return TextEditor.Document.GetTextSegmentMarkersAt (offset).OfType<ITextSegmentMarker> ();
 		}
 
-		[CommandHandler (EditCommands.ToggleCodeComment)]
-		public void ToggleCodeComment ()
+		void ITextEditorImpl.AddMarker (ITextSegmentMarker marker)
 		{
-			widget.ToggleCodeComment ();
+			var textSegmentMarker = marker as TextSegmentMarker;
+			if (textSegmentMarker == null)
+				throw new InvalidOperationException ("Tried to add an incompatible text marker. Use the MarkerHost to create compatible ones.");
+			TextEditor.Document.AddMarker (textSegmentMarker);
 		}
 
-		[CommandUpdateHandler (EditCommands.AddCodeComment)]
-		internal void OnUpdateAddCodeComment (MonoDevelop.Components.Commands.CommandInfo info)
+		bool ITextEditorImpl.RemoveMarker (ITextSegmentMarker marker)
 		{
-			widget.OnUpdateToggleComment (info);
+			var textSegmentMarker = marker as TextSegmentMarker;
+			if (textSegmentMarker == null)
+				throw new InvalidOperationException ("Tried to remove an incompatible text marker.");
+			return TextEditor.Document.RemoveMarker (textSegmentMarker);
 		}
 
-		[CommandHandler (EditCommands.AddCodeComment)]
-		public void AddCodeComment ()
+		IFoldSegment ITextEditorImpl.CreateFoldSegment (int offset, int length, bool isFolded)
 		{
-			widget.AddCodeComment ();
+			return new FoldSegmentWrapper (TextEditor.Document, "...", offset, length, Mono.TextEditor.FoldingType.None) { IsFolded = isFolded };
+		}
+
+		void ITextEditorImpl.SetFoldings (IEnumerable<IFoldSegment> foldings)
+		{
+			if (this.isDisposed || !TextEditor.Options.ShowFoldMargin)
+				return;
+			TextEditor.Document.UpdateFoldSegments (foldings.Cast<FoldSegment> ().ToList (), true);
+		}
+
+		IEnumerable<IFoldSegment> ITextEditorImpl.GetFoldingsContaining (int offset)
+		{
+			return TextEditor.Document.GetFoldingsFromOffset (offset).Cast<IFoldSegment> ();
+		}
+
+		IEnumerable<IFoldSegment> ITextEditorImpl.GetFoldingsIn (int offset, int length)
+		{
+			return TextEditor.Document.GetFoldingContaining (offset, length).Cast<IFoldSegment> ();
+		}
+
+		MonoDevelop.Ide.Editor.ITextEditorOptions ITextEditorImpl.Options {
+			get {
+				return((StyledSourceEditorOptions)TextEditor.Options).OptionsCore;
+			}
+			set {
+				((StyledSourceEditorOptions)TextEditor.Options).OptionsCore = value;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.DocumentLocation ITextEditorImpl.CaretLocation {
+			get {
+				var loc = TextEditor.Caret.Location;
+				return new MonoDevelop.Ide.Editor.DocumentLocation (loc.Line, loc.Column);
+			}
+			set {
+				TextEditor.Caret.Location = new Mono.TextEditor.DocumentLocation (value.Line, value.Column);
+				TextEditor.ScrollToCaret ();
+			}
+		}
+
+		bool ITextEditorImpl.IsSomethingSelected {
+			get {
+				return TextEditor.IsSomethingSelected;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.SelectionMode ITextEditorImpl.SelectionMode {
+			get {
+				return (MonoDevelop.Ide.Editor.SelectionMode)TextEditor.SelectionMode;
+			}
 		}
 
-		[CommandUpdateHandler (EditCommands.RemoveCodeComment)]
-		internal void OnUpdateRemoveCodeComment (MonoDevelop.Components.Commands.CommandInfo info)
+		MonoDevelop.Core.Text.ISegment ITextEditorImpl.SelectionRange {
+			get {
+				var range = TextEditor.SelectionRange;
+				return MonoDevelop.Core.Text.TextSegment.FromBounds (range.Offset, range.EndOffset);
+			}
+			set {
+				TextEditor.SelectionRange = new Mono.TextEditor.TextSegment (value.Offset, value.Length);
+			}
+		}
+		
+		int ITextEditorImpl.SelectionAnchorOffset {
+			get {
+				return TextEditor.SelectionAnchor;
+			}
+			set {
+				TextEditor.SelectionAnchor = value;
+			}
+		}
+
+		int ITextEditorImpl.SelectionLeadOffset {
+			get {
+				return TextEditor.SelectionLead;
+			}
+			set {
+				TextEditor.SelectionLead = value;
+			}
+		}
+
+		bool ITextEditorImpl.SuppressTooltips {
+			get {
+				return TextEditor.GetTextEditorData ().SuppressTooltips;
+			}
+			set {
+				if (value)
+					TextEditor.HideTooltip ();
+				TextEditor.GetTextEditorData ().SuppressTooltips = value;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.DocumentRegion ITextEditorImpl.SelectionRegion {
+			get {
+				return new MonoDevelop.Ide.Editor.DocumentRegion (
+					TextEditor.MainSelection.Start.Line,
+					TextEditor.MainSelection.Start.Column,
+					TextEditor.MainSelection.End.Line,
+					TextEditor.MainSelection.End.Column
+				);
+			}
+			set {
+				TextEditor.MainSelection = new Mono.TextEditor.Selection (
+					value.BeginLine,
+					value.BeginColumn,
+					value.EndLine,
+					value.EndColumn
+				);
+			}
+		}
+
+		IEditorActionHost ITextEditorImpl.Actions {
+			get {
+				return this;
+			}
+		}
+
+		double ITextEditorImpl.LineHeight {
+			get {
+				return TextEditor.GetTextEditorData ().LineHeight;
+			}
+		}
+
+		ITextMarkerFactory ITextEditorImpl.TextMarkerFactory {
+			get {
+				return this;
+			}
+		}
+
+		MonoDevelop.Ide.Editor.EditMode ITextEditorImpl.EditMode {
+			get {
+				if (TextEditor.CurrentMode is TextLinkEditMode)
+					return MonoDevelop.Ide.Editor.EditMode.TextLink;
+				if (TextEditor.CurrentMode is InsertionCursorEditMode)
+					return MonoDevelop.Ide.Editor.EditMode.CursorInsertion;
+				return MonoDevelop.Ide.Editor.EditMode.Edit;
+			}
+		}
+
+		string ITextEditorImpl.GetVirtualIndentationString (int lineNumber)
 		{
-			widget.OnUpdateToggleComment (info);
+			if (!TextEditor.GetTextEditorData ().HasIndentationTracker)
+				return TextEditor.GetLineIndent (lineNumber);
+			return TextEditor.GetTextEditorData ().IndentationTracker.GetIndentationString (lineNumber, 1);
 		}
 
-		[CommandHandler (EditCommands.RemoveCodeComment)]
-		public void RemoveCodeComment ()
+		void ITextEditorImpl.SetIndentationTracker (IndentationTracker indentationTracker)
 		{
-			widget.RemoveCodeComment ();
+			TextEditor.GetTextEditorData ().IndentationTracker = indentationTracker != null ? new IndentationTrackerWrapper (TextEditor.GetTextEditorData (), wrapper, indentationTracker) : null;
 		}
 
-		[CommandUpdateHandler (SourceEditorCommands.ToggleErrorTextMarker)]
-		public void OnUpdateToggleErrorTextMarker (CommandInfo info)
+		void ITextEditorImpl.SetSelectionSurroundingProvider (SelectionSurroundingProvider surroundingProvider)
 		{
-			widget.OnUpdateToggleErrorTextMarker (info);
+			TextEditor.GetTextEditorData ().SelectionSurroundingProvider = surroundingProvider != null ? new SelectionSurroundingProviderWrapper (surroundingProvider) : null;
 		}
 		
-		[CommandHandler (SourceEditorCommands.ToggleErrorTextMarker)]
-		public void OnToggleErrorTextMarker ()
+		void ITextEditorImpl.SetTextPasteHandler (TextPasteHandler textPasteHandler)
+		{
+			var data = TextEditor.GetTextEditorData ();
+			if (data.TextPasteHandler != null)
+				((TextPasteHandlerWrapper)data.TextPasteHandler).Dispose ();
+			if (textPasteHandler == null) {
+				data.TextPasteHandler = null;
+				return;
+			}
+			data.TextPasteHandler = new TextPasteHandlerWrapper (data, textPasteHandler);
+		}
+
+		internal Stack<EditSession> editSessions = new Stack<EditSession> ();
+
+		public EditSession CurrentSession {
+			get {
+				return editSessions.Count () > 0 ? editSessions.Peek () : null;
+			}
+		}
+
+		public void StartSession (EditSession session)
+		{
+			if (session == null)
+				throw new ArgumentNullException (nameof (session));
+			editSessions.Push (session);
+			session.SessionStarted ();
+		}
+
+		public void EndSession ()
+		{
+			if (editSessions.Count == 0)
+				throw new InvalidOperationException ("No edit session was started.");
+			var session = editSessions.Pop ();
+			session.Dispose ();
+		}
+
+		void ITextEditorImpl.ScrollTo (int offset)
 		{
-			widget.OnToggleErrorTextMarker ();
+			TextEditor.ScrollTo (offset); 
 		}
 
-		[CommandHandler (EditCommands.IndentSelection)]
-		public void IndentSelection ()
+		void ITextEditorImpl.CenterTo (int offset)
+		{
+			TextEditor.CenterTo (offset); 
+		}
+
+		void ITextEditorImpl.ClearTooltipProviders ()
+		{
+			TextEditor.ClearTooltipProviders ();
+		}
+
+		IEnumerable<MonoDevelop.Ide.Editor.TooltipProvider> ITextEditorImpl.TooltipProvider {
+			get {
+				foreach (var p in GetTextEditorData ().TooltipProviders) {
+					var wrapper = p as TooltipProviderWrapper;
+					if (wrapper == null)
+						continue;
+					yield return wrapper.OriginalProvider;
+				}
+			}
+		}
+
+		void ITextEditorImpl.AddTooltipProvider (MonoDevelop.Ide.Editor.TooltipProvider provider)
+		{
+			TextEditor.AddTooltipProvider (new TooltipProviderWrapper (provider));
+		}
+
+		void ITextEditorImpl.RemoveTooltipProvider (MonoDevelop.Ide.Editor.TooltipProvider provider)
+		{
+			foreach (var p in GetTextEditorData ().TooltipProviders) {
+				var wrapper = p as TooltipProviderWrapper;
+				if (wrapper == null)
+					continue;
+				if (wrapper.OriginalProvider == provider) {
+					TextEditor.RemoveTooltipProvider (p);
+					return;
+				}
+			}
+		}
+
+		Xwt.Point ITextEditorImpl.GetEditorWindowOrigin ()
+		{
+			int ox, oy;
+			TextEditor.GdkWindow.GetOrigin (out ox, out oy); 
+			return new Xwt.Point (ox, oy);
+		}
+
+		Xwt.Rectangle ITextEditorImpl.GetEditorAllocation ()
+		{
+			var alloc = TextEditor.Allocation;
+			return new Xwt.Rectangle (alloc.X, alloc.Y, alloc.Width, alloc.Height);
+		}
+
+
+		TextEditorExtension ITextEditorImpl.EditorExtension {
+			get {
+				return TextEditor.EditorExtension;
+			}
+			set {
+				TextEditor.EditorExtension = value;
+			}
+		}
+
+
+		SemanticHighlighting ITextEditorImpl.SemanticHighlighting {
+			get {
+				return TextEditor.SemanticHighlighting;
+			}
+			set {
+				TextEditor.SemanticHighlighting = value;
+			}
+		}
+
+		string ITextEditorImpl.GetPangoMarkup (int offset, int length, bool fitIdeStyle)
+		{
+			return TextEditor.GetTextEditorData ().GetMarkup (offset, length, false, replaceTabs:false, fitIdeStyle:fitIdeStyle);
+		}
+
+		void ITextEditorImpl.SetUsageTaskProviders (IEnumerable<UsageProviderEditorExtension> providers)
+		{
+			widget.ClearUsageTaskProvider ();
+			foreach (var p in providers) {
+				widget.AddUsageTaskProvider (p);
+			}
+		}
+
+		void ITextEditorImpl.SetQuickTaskProviders (IEnumerable<IQuickTaskProvider> providers)
+		{
+			widget.ClearQuickTaskProvider ();
+			foreach (var p in providers) {
+				widget.AddQuickTaskProvider (p);
+			}
+		}
+
+
+		class BracketMatcherTextMarker : TextSegmentMarker
+		{
+			public BracketMatcherTextMarker (int offset, int length) : base (offset, length)
+			{
+			}
+
+			public override void DrawBackground (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+			{
+				try {
+					double fromX, toX;
+					GetLineDrawingPosition (metrics, startOffset, out fromX, out toX);
+
+					fromX = Math.Max (fromX, editor.TextViewMargin.XOffset);
+					toX = Math.Max (toX, editor.TextViewMargin.XOffset);
+					if (fromX < toX) {
+						var bracketMatch = new Cairo.Rectangle (fromX + 0.5, metrics.LineYRenderStartPosition + 0.5, toX - fromX - 1, editor.LineHeight - 2);
+						if (editor.TextViewMargin.BackgroundRenderer == null) {
+							cr.SetSourceColor (editor.ColorStyle.BraceMatchingRectangle.Color);
+							cr.Rectangle (bracketMatch);
+							cr.FillPreserve ();
+							cr.SetSourceColor (editor.ColorStyle.BraceMatchingRectangle.SecondColor);
+							cr.Stroke ();
+						}
+					}
+				} catch (Exception e) {
+					LoggingService.LogError ($"Error while drawing bracket matcher ({this}) startOffset={startOffset} lineCharLength={metrics.Layout.LineChars.Length}", e);
+				}
+			}
+
+			void GetLineDrawingPosition (LineMetrics metrics, int startOffset, out double fromX, out double toX)
+			{
+				var startXPos = metrics.TextRenderStartPosition;
+				var endXPos = metrics.TextRenderEndPosition;
+				int start = this.Offset;
+				int end = this.EndOffset;
+
+				uint curIndex = 0, byteIndex = 0;
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(start - startOffset), ref curIndex, ref byteIndex);
+
+				int x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				fromX = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(end - startOffset), ref curIndex, ref byteIndex);
+				x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				toX = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+			}
+		}
+
+		List<BracketMatcherTextMarker> bracketMarkers = new List<BracketMatcherTextMarker> ();
+
+		void ITextEditorImpl.UpdateBraceMatchingResult (BraceMatchingResult? result)
+		{
+			if (result.HasValue) {
+				if (bracketMarkers.Count > 0 && result.Value.LeftSegment.Offset == bracketMarkers [0].Offset)
+					return;
+				ClearBracketMarkers ();
+				bracketMarkers.Add (new BracketMatcherTextMarker (result.Value.LeftSegment.Offset, result.Value.LeftSegment.Length));
+				bracketMarkers.Add (new BracketMatcherTextMarker (result.Value.RightSegment.Offset, result.Value.RightSegment.Length));
+				bracketMarkers.ForEach (marker => widget.TextEditor.Document.AddMarker (marker));
+			} else {
+				ClearBracketMarkers ();
+			}
+		}
+
+		void ClearBracketMarkers ()
+		{
+			bracketMarkers.ForEach (marker => widget.TextEditor.Document.RemoveMarker (marker));
+			bracketMarkers.Clear ();
+		}
+
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineChanged;
+
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineInserted;
+
+		void HandleLineInserted (object sender, Mono.TextEditor.LineEventArgs e)
+		{
+			var handler = LineInserted;
+			if (handler != null)
+				handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+		}
+
+		public event EventHandler<MonoDevelop.Ide.Editor.LineEventArgs> LineRemoved;
+
+		void HandleLineRemoved (object sender, Mono.TextEditor.LineEventArgs e)
+		{
+			var handler = LineRemoved;
+			if (handler != null)
+				handler (this, new MonoDevelop.Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+		}
+
+		public double ZoomLevel {
+			get { return TextEditor != null && TextEditor.Options != null ? TextEditor.Options.Zoom : 1d; }
+			set { if (TextEditor != null && TextEditor.Options != null) TextEditor.Options.Zoom = value; }
+		}
+		event EventHandler ITextEditorImpl.ZoomLevelChanged {
+			add {
+				TextEditor.Options.ZoomChanged += value;
+			}
+			remove {
+				TextEditor.Options.ZoomChanged += value;
+			}
+		}
+
+		public void AddOverlay (Control messageOverlayContent, Func<int> sizeFunc)
+		{
+			widget.AddOverlay (messageOverlayContent.GetNativeWidget<Widget> (), sizeFunc);
+		}
+
+		public void RemoveOverlay (Control messageOverlayContent)
+		{
+			widget.RemoveOverlay (messageOverlayContent.GetNativeWidget<Widget> ());
+		}
+
+		void TextViewMargin_LineShown (object sender, Mono.TextEditor.LineEventArgs e)
+		{
+			LineShown?.Invoke (this, new Ide.Editor.LineEventArgs (new DocumentLineWrapper (e.Line)));
+		}
+
+		public IEnumerable<IDocumentLine> VisibleLines {
+			get {
+				foreach (var v in TextEditor.TextViewMargin.CachedLine) {
+					yield return new DocumentLineWrapper (v);
+				}
+			}
+		}
+
+		public event EventHandler<Ide.Editor.LineEventArgs> LineShown;
+
+
+
+
+		#region IEditorActionHost implementation
+
+		void IEditorActionHost.MoveCaretDown ()
+		{
+			CaretMoveActions.Down (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretUp ()
+		{
+			CaretMoveActions.Up (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretRight ()
+		{
+			CaretMoveActions.Right (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretLeft ()
+		{
+			CaretMoveActions.Left (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretToLineEnd ()
+		{
+			CaretMoveActions.LineEnd (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretToLineStart ()
+		{
+			CaretMoveActions.LineHome (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretToDocumentStart ()
+		{
+			CaretMoveActions.ToDocumentStart (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.MoveCaretToDocumentEnd ()
+		{
+			CaretMoveActions.ToDocumentEnd (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.Backspace ()
+		{
+			DeleteActions.Backspace (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.ClipboardCopy ()
+		{
+			ClipboardActions.Copy (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.ClipboardCut ()
+		{
+			ClipboardActions.Cut (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.ClipboardPaste ()
+		{
+			ClipboardActions.Paste (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.NewLine ()
+		{
+			MiscActions.InsertNewLine (TextEditor.GetTextEditorData ());
+		}
+
+		void IEditorActionHost.SwitchCaretMode ()
+		{
+			TextEditor.RunAction (MiscActions.SwitchCaretMode);
+		}
+
+		void IEditorActionHost.InsertTab ()
+		{
+			TextEditor.RunAction (MiscActions.InsertTab);
+		}
+
+		void IEditorActionHost.RemoveTab ()
+		{
+			TextEditor.RunAction (MiscActions.RemoveTab);
+		}
+
+		void IEditorActionHost.InsertNewLine ()
+		{
+			TextEditor.RunAction (MiscActions.InsertNewLine);
+		}
+
+		void IEditorActionHost.DeletePreviousWord ()
+		{
+			TextEditor.RunAction (DeleteActions.PreviousWord);
+		}
+
+		void IEditorActionHost.DeleteNextWord ()
+		{
+			TextEditor.RunAction (DeleteActions.NextWord);
+		}
+
+		void IEditorActionHost.DeletePreviousSubword ()
+		{
+			TextEditor.RunAction (DeleteActions.PreviousSubword);
+		}
+
+		void IEditorActionHost.DeleteNextSubword ()
+		{
+			TextEditor.RunAction (DeleteActions.NextSubword);
+		}
+
+		void IEditorActionHost.StartCaretPulseAnimation ()
+		{
+			TextEditor.StartCaretPulseAnimation ();
+		}
+
+		void IEditorActionHost.RecenterEditor ()
+		{
+			TextEditor.RunAction (MiscActions.RecenterEditor);
+		}
+
+		void IEditorActionHost.JoinLines ()
+		{
+			using (var undo = Document.OpenUndoGroup ()) {
+				TextEditor.RunAction (Mono.TextEditor.Vi.ViActions.Join);
+			}
+		}
+
+		void IEditorActionHost.MoveNextSubWord ()
+		{
+			TextEditor.RunAction (SelectionActions.MoveNextSubword);
+		}
+
+		void IEditorActionHost.MovePrevSubWord ()
+		{
+			TextEditor.RunAction (SelectionActions.MovePreviousSubword);
+		}
+
+		void IEditorActionHost.MoveNextWord ()
+		{
+			TextEditor.RunAction (CaretMoveActions.NextWord);
+		}
+
+		void IEditorActionHost.MovePrevWord ()
+		{
+			TextEditor.RunAction (CaretMoveActions.PreviousWord);
+		}
+
+		void IEditorActionHost.PageUp ()
+		{
+			TextEditor.RunAction (CaretMoveActions.PageUp);
+		}
+
+		void IEditorActionHost.PageDown ()
+		{
+			TextEditor.RunAction (CaretMoveActions.PageDown);
+		}
+
+		void IEditorActionHost.DeleteCurrentLine ()
+		{
+			TextEditor.RunAction (DeleteActions.CaretLine);
+		}
+
+		void IEditorActionHost.DeleteCurrentLineToEnd ()
+		{
+			TextEditor.RunAction (DeleteActions.CaretLineToEnd);
+		}
+
+		void IEditorActionHost.ScrollLineUp ()
+		{
+			TextEditor.RunAction (ScrollActions.Up);
+		}
+
+		void IEditorActionHost.ScrollLineDown ()
+		{
+			TextEditor.RunAction (ScrollActions.Down);
+		}
+
+		void IEditorActionHost.ScrollPageUp ()
+		{
+			TextEditor.RunAction (ScrollActions.PageUp);
+		}
+
+		void IEditorActionHost.ScrollPageDown ()
+		{
+			TextEditor.RunAction (ScrollActions.PageDown);
+		}
+
+		void IEditorActionHost.MoveBlockUp ()
+		{
+			using (var undo = TextEditor.OpenUndoGroup ()) {
+				TextEditor.RunAction (MiscActions.MoveBlockUp);
+				CorrectIndenting ();
+			}
+		}
+
+		void IEditorActionHost.MoveBlockDown ()
+		{
+			using (var undo = TextEditor.OpenUndoGroup ()) {
+				TextEditor.RunAction (MiscActions.MoveBlockDown);
+				CorrectIndenting ();
+			}
+		}
+
+		void IEditorActionHost.ToggleBlockSelectionMode ()
+		{
+			TextEditor.SelectionMode = TextEditor.SelectionMode == Mono.TextEditor.SelectionMode.Normal ? Mono.TextEditor.SelectionMode.Block : Mono.TextEditor.SelectionMode.Normal;
+			TextEditor.QueueDraw ();
+		}
+
+		void IEditorActionHost.IndentSelection ()
 		{
 			if (widget.TextEditor.IsSomethingSelected) {
 				MiscActions.IndentSelection (widget.TextEditor.GetTextEditorData ());
@@ -2607,45 +3371,74 @@ namespace MonoDevelop.SourceEditor
 				widget.TextEditor.Insert (offset, widget.TextEditor.Options.IndentationString);
 			}
 		}
-		
-		[CommandHandler (EditCommands.UnIndentSelection)]
-		public void UnIndentSelection ()
+
+		void IEditorActionHost.UnIndentSelection ()
 		{
-			Mono.TextEditor.MiscActions.RemoveTab (widget.TextEditor.GetTextEditorData ());
+			MiscActions.RemoveTab (widget.TextEditor.GetTextEditorData ());
 		}
-		
-		[CommandHandler (EditCommands.InsertGuid)]
-		public void InsertGuid ()
+
+		#endregion
+
+
+		#region ISegmentMarkerHost implementation
+
+		ITextSegmentMarker ITextMarkerFactory.CreateUsageMarker (MonoDevelop.Ide.Editor.TextEditor editor, Usage usage)
 		{
-			TextEditor.InsertAtCaret (Guid.NewGuid ().ToString ());
+			return new UsageSegmentMarker (usage);
 		}
 
-		[CommandHandler (SourceEditorCommands.NextIssue)]
-		void NextIssue ()
+		IUrlTextLineMarker ITextMarkerFactory.CreateUrlTextMarker (MonoDevelop.Ide.Editor.TextEditor editor, IDocumentLine line, string value, MonoDevelop.Ide.Editor.UrlType url, string syntax, int startCol, int endCol)
 		{
-			widget.NextIssue ();
-		}	
+			return new UrlTextLineMarker (TextEditor.Document, line, value, (Mono.TextEditor.UrlType)url, syntax, startCol, endCol);
+		}
 
-		[CommandHandler (SourceEditorCommands.PrevIssue)]
-		void PrevIssue ()
+		ICurrentDebugLineTextMarker ITextMarkerFactory.CreateCurrentDebugLineTextMarker (MonoDevelop.Ide.Editor.TextEditor editor, int offset, int length)
 		{
-			widget.PrevIssue ();
+			return new CurrentDebugLineTextMarker (TextEditor, offset, length);
 		}
 
-		[CommandHandler (SourceEditorCommands.NextIssueError)]
-		void NextIssueError ()
+		ITextLineMarker ITextMarkerFactory.CreateAsmLineMarker (MonoDevelop.Ide.Editor.TextEditor editor)
 		{
-			widget.NextIssueError ();
-		}	
+			return new AsmLineMarker ();
+		}
 
-		[CommandHandler (SourceEditorCommands.PrevIssueError)]
-		void PrevIssueError ()
+		IUnitTestMarker ITextMarkerFactory.CreateUnitTestMarker (MonoDevelop.Ide.Editor.TextEditor editor, UnitTestMarkerHost host, UnitTestLocation unitTestLocation)
 		{
-			widget.PrevIssueError ();
+			return new UnitTestMarker (TextEditor, host, unitTestLocation);
+		}
+
+		IMessageBubbleLineMarker ITextMarkerFactory.CreateMessageBubbleLineMarker (MonoDevelop.Ide.Editor.TextEditor editor)
+		{
+			return new MessageBubbleTextMarker (messageBubbleCache);
 		}
 
+		IGenericTextSegmentMarker ITextMarkerFactory.CreateGenericTextSegmentMarker (MonoDevelop.Ide.Editor.TextEditor editor, TextSegmentMarkerEffect effect, int offset, int length)
+		{
+			switch (effect) {
+			case TextSegmentMarkerEffect.DottedLine:
+			case TextSegmentMarkerEffect.WavedLine:
+				return new GenericUnderlineMarker (new Mono.TextEditor.TextSegment (offset, length), effect);
+			case TextSegmentMarkerEffect.GrayOut:
+				return new GrayOutMarker (new Mono.TextEditor.TextSegment (offset, length));
+			default:
+				throw new ArgumentOutOfRangeException ();
+			}
+		}
 
+		public ILinkTextMarker CreateLinkMarker (MonoDevelop.Ide.Editor.TextEditor editor, int offset, int length, Action<LinkRequest> activateLink)
+		{
+			return new LinkMarker (offset, length, activateLink);
+		}
 
+		ISmartTagMarker ITextMarkerFactory.CreateSmartTagMarker (MonoDevelop.Ide.Editor.TextEditor editor, int offset, MonoDevelop.Ide.Editor.DocumentLocation realLocation)
+		{
+			return new SmartTagMarker (offset, realLocation);
+		}
+
+		IErrorMarker ITextMarkerFactory.CreateErrorMarker (MonoDevelop.Ide.Editor.TextEditor editor, MonoDevelop.Ide.TypeSystem.Error info, int offset, int length)
+		{
+			return new ErrorMarker (info, offset, length);
+		}
 		#endregion
 
 
@@ -2672,7 +3465,7 @@ namespace MonoDevelop.SourceEditor
 		void GotoPgDown ()
 		{
 			widget.QuickTaskStrip.GotoPgDown ();
-		}	
+		}
 
 		[CommandUpdateHandler (ScrollbarCommand.ShowTasks)]
 		void UpdateShowMap (CommandInfo info)
@@ -2699,5 +3492,14 @@ namespace MonoDevelop.SourceEditor
 		}
 
 		#endregion
+	
+	
+
+		public event EventHandler FocusLost;
+
+		void TextArea_FocusOutEvent (object o, FocusOutEventArgs args)
+		{
+			FocusLost?.Invoke (this, EventArgs.Empty);
+		}
 	}
 } 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
index 7062444ed2..9dfe1d2b70 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
@@ -45,12 +45,14 @@ using MonoDevelop.Ide.TypeSystem;
 using Mono.TextEditor.Highlighting;
 using MonoDevelop.SourceEditor.QuickTasks;
 using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.Refactoring;
 using MonoDevelop.Ide.Tasks;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
+using Microsoft.CodeAnalysis;
 
 namespace MonoDevelop.SourceEditor
 {
-	class SourceEditorWidget : ITextEditorExtension, IQuickTaskProvider
+	class SourceEditorWidget : IServiceProvider
 	{
 		SourceEditorView view;
 		DecoratedScrolledWindow mainsw;
@@ -62,11 +64,16 @@ namespace MonoDevelop.SourceEditor
 		TextEditorData textEditorData;
 		
 		const uint CHILD_PADDING = 0;
+
+		// VV: I removed the animation since it was very slow especially on @2x
+		// TODO: Maybe the AddAnimationWidget () shouldn't be used at all
+		const uint ANIMATION_DURATION = 0; // 300
 		
 //		bool shouldShowclassBrowser;
 //		bool canShowClassBrowser;
-		ISourceEditorOptions options {
+		Mono.TextEditor.ITextEditorOptions options {
 			get {
+				
 				return textEditor.Options;
 			}
 		}
@@ -82,7 +89,7 @@ namespace MonoDevelop.SourceEditor
 		
 		ParsedDocument parsedDocument;
 		
-		readonly ExtensibleTextEditor textEditor;
+		ExtensibleTextEditor textEditor;
 		ExtensibleTextEditor splittedTextEditor;
 		ExtensibleTextEditor lastActiveEditor;
 		
@@ -92,13 +99,6 @@ namespace MonoDevelop.SourceEditor
 			}
 		}
 		
-		public Ambience Ambience {
-			get {
-				string fileName = view.IsUntitled ? view.UntitledName : view.ContentName;
-				return AmbienceService.GetAmbienceForFile (fileName);
-			}
-		}
-		
 		List<IQuickTaskProvider> quickTaskProvider = new List<IQuickTaskProvider> ();
 		public void AddQuickTaskProvider (IQuickTaskProvider provider)
 		{
@@ -108,6 +108,14 @@ namespace MonoDevelop.SourceEditor
 				secondsw.AddQuickTaskProvider (provider);
 		}
 
+		internal void ClearQuickTaskProvider ()
+		{
+			foreach (var provider in quickTaskProvider.ToArray ()) {
+				RemoveQuickTaskProvider (provider);
+			}
+			quickTaskProvider = new List<IQuickTaskProvider> ();
+		}
+
 		public void RemoveQuickTaskProvider (IQuickTaskProvider provider)
 		{
 			quickTaskProvider.Remove (provider);
@@ -117,44 +125,32 @@ namespace MonoDevelop.SourceEditor
 		}		
 
 		
-		List<IUsageProvider> usageProvider = new List<IUsageProvider> ();
-		public void AddUsageTaskProvider (IUsageProvider provider)
+		List<UsageProviderEditorExtension> usageProvider = new List<UsageProviderEditorExtension> ();
+
+		internal void ClearUsageTaskProvider()
 		{
-			usageProvider.Add (provider);
-			mainsw.AddUsageProvider (provider); 
-			if (secondsw != null)
-				secondsw.AddUsageProvider (provider);
-		}
-		
-		#region ITextEditorExtension
-		
-		ITextEditorExtension ITextEditorExtension.Next {
-			get {
-				return null;
+			foreach (var provider in usageProvider.ToArray ()) {
+				RemoveUsageTaskProvider (provider);
 			}
-		}
-		
-		object ITextEditorExtension.GetExtensionCommandTarget ()
-		{
-			return null;
-		}
+			usageProvider = new List<UsageProviderEditorExtension> ();
 
-		void ITextEditorExtension.TextChanged (int startIndex, int endIndex)
-		{
 		}
 
-		void ITextEditorExtension.CursorPositionChanged ()
+		public void AddUsageTaskProvider (UsageProviderEditorExtension provider)
 		{
+			usageProvider.Add (provider);
+			mainsw.AddUsageProvider (provider); 
+			if (secondsw != null)
+				secondsw.AddUsageProvider (provider);
 		}
 
-		bool ITextEditorExtension.KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		void RemoveUsageTaskProvider (UsageProviderEditorExtension provider)
 		{
-			this.TextEditor.SimulateKeyPress (key, (uint)keyChar, modifier);
-			if (key == Gdk.Key.Escape)
-				return true;
-			return false;
+			usageProvider.Remove (provider);
+			mainsw.RemoveUsageProvider (provider); 
+			if (secondsw != null)
+				secondsw.RemoveUsageProvider (provider);
 		}
-		#endregion
 		
 		public bool HasMessageBar {
 			get { return messageBar != null; }
@@ -195,7 +191,7 @@ namespace MonoDevelop.SourceEditor
 			return false;
 		}
 		
-		public class Border : Gtk.DrawingArea
+		class Border : Gtk.DrawingArea
 		{
 			protected override bool OnExposeEvent (Gdk.EventExpose evnt)
 			{
@@ -209,6 +205,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			SourceEditorWidget parent;
 			ScrolledWindow scrolledWindow;
+			EventBox scrolledBackground;
 			
 			QuickTaskStrip strip;
 			
@@ -235,9 +232,11 @@ namespace MonoDevelop.SourceEditor
 				this.parent = parent;
 				this.strip = new QuickTaskStrip ();
 
+				scrolledBackground = new EventBox ();
 				scrolledWindow = new CompactScrolledWindow ();
 				scrolledWindow.ButtonPressEvent += PrepareEvent;
-				PackStart (scrolledWindow, true, true, 0);
+				scrolledBackground.Add (scrolledWindow);
+				PackStart (scrolledBackground, true, true, 0);
 				strip.VAdjustment = scrolledWindow.Vadjustment;
 				PackEnd (strip, false, true, 0);
 
@@ -307,20 +306,36 @@ namespace MonoDevelop.SourceEditor
 					provider.TasksUpdated -= HandleTasksUpdated;
 			}	
 
+			public void AddUsageProvider (UsageProviderEditorExtension p)
+			{
+				p.UsagesUpdated += HandleUsagesUpdated;
+			}
+
+			public void RemoveUsageProvider (UsageProviderEditorExtension p)
+			{
+				p.UsagesUpdated -= HandleUsagesUpdated;
+			}	
 
-			public void AddUsageProvider (IUsageProvider p)
+			void HandleUsagesUpdated (object sender, EventArgs e)
 			{
-				p.UsagesUpdated += (sender, e) => strip.Update (p);
+				strip.Update ((UsageProviderEditorExtension)sender);
 			}
-			
+
 			protected override void OnDestroyed ()
 			{
+				if (scrolledWindow == null)
+					return;
 				if (scrolledWindow.Child != null)
 					RemoveEvents ();
-
 				SetSuppressScrollbar (false);
 				QuickTaskStrip.EnableFancyFeatures.Changed -= FancyFeaturesChanged;
 				scrolledWindow.ButtonPressEvent -= PrepareEvent;
+				scrolledWindow.Vadjustment.Destroy ();
+				scrolledWindow.Hadjustment.Destroy ();
+				scrolledWindow.Destroy ();
+				scrolledWindow = null;
+				strip.Destroy ();
+				strip = null;
 				base.OnDestroyed ();
 			}
 			
@@ -329,11 +344,11 @@ namespace MonoDevelop.SourceEditor
 				args.RetVal = true;
 			}
 		
-			public void SetTextEditor (TextEditor container)
+			public void SetTextEditor (Mono.TextEditor.MonoTextEditor container)
 			{
 				scrolledWindow.Child = container;
 				this.strip.TextEditor = container;
-//				container.TextEditorWidget.EditorOptionsChanged += OptionsChanged;
+				container.EditorOptionsChanged += OptionsChanged;
 				container.Caret.ModeChanged += parent.UpdateLineColOnEventHandler;
 				container.Caret.PositionChanged += parent.CaretPositionChanged;
 				container.SelectionChanged += parent.UpdateLineColOnEventHandler;
@@ -341,26 +356,27 @@ namespace MonoDevelop.SourceEditor
 			
 			void OptionsChanged (object sender, EventArgs e)
 			{
-				TextEditor editor = (TextEditor)sender;
-				scrolledWindow.ModifyBg (StateType.Normal, (Mono.TextEditor.HslColor)editor.ColorStyle.PlainText.Background);
+				var editor = (Mono.TextEditor.MonoTextEditor)scrolledWindow.Child;
+				scrolledBackground.ModifyBg (StateType.Normal, (HslColor)editor.ColorStyle.PlainText.Background);
 			}
 			
 			void RemoveEvents ()
 			{
-				var container = scrolledWindow.Child as TextEditor;
+				var container = scrolledWindow.Child as Mono.TextEditor.MonoTextEditor;
 				if (container == null) {
+
 					LoggingService.LogError ("can't remove events from text editor container.");
 					return;
 				}
-//				container.TextEditorWidget.EditorOptionsChanged -= OptionsChanged;
+				container.EditorOptionsChanged -= OptionsChanged;
 				container.Caret.ModeChanged -= parent.UpdateLineColOnEventHandler;
 				container.Caret.PositionChanged -= parent.CaretPositionChanged;
 				container.SelectionChanged -= parent.UpdateLineColOnEventHandler;
 			}
 			
-			public TextEditor RemoveTextEditor ()
+			public Mono.TextEditor.MonoTextEditor RemoveTextEditor ()
 			{
-				var child = scrolledWindow.Child as TextEditor;
+				var child = scrolledWindow.Child as Mono.TextEditor.MonoTextEditor;
 				if (child == null)
 					return null;
 				RemoveEvents ();
@@ -383,16 +399,15 @@ namespace MonoDevelop.SourceEditor
 				if (this.splittedTextEditor == null || !splittedTextEditor.TextArea.HasFocus)
 					OnLostFocus ();
 			};
-			IdeApp.FocusOut += (sender, e) => textEditor.TextArea.HideTooltip (false);
+			if (IdeApp.CommandService != null)
+				IdeApp.FocusOut += IdeApp_FocusOut;
 			mainsw = new DecoratedScrolledWindow (this);
 			mainsw.SetTextEditor (textEditor);
 			
 			vbox.PackStart (mainsw, true, true, 0);
 			
 			textEditorData = textEditor.GetTextEditorData ();
-			textEditorData.EditModeChanged += delegate {
-				KillWidgets ();
-			};
+			textEditorData.EditModeChanged += TextEditorData_EditModeChanged;
 
 			ResetFocusChain ();
 			
@@ -404,23 +419,43 @@ namespace MonoDevelop.SourceEditor
 				UpdateLineCol ();
 			};
 			vbox.Destroyed += delegate {
+				if (isDisposed)
+					return;
 				isDisposed = true;
-				RemoveErrorUndelinesResetTimerId ();
 				StopParseInfoThread ();
 				KillWidgets ();
 
-				foreach (var provider in quickTaskProvider.ToArray ()) {
-					RemoveQuickTaskProvider (provider);
-				}
+				ClearQuickTaskProvider ();
+				ClearUsageTaskProvider ();
 
+				if (textEditor != null && !textEditor.IsDestroyed)
+					textEditor.Destroy ();
+
+				if (splittedTextEditor != null && !splittedTextEditor.IsDestroyed)
+					splittedTextEditor.Destroy ();
+				
 				this.lastActiveEditor = null;
 				this.splittedTextEditor = null;
+				this.textEditor = null;
+				textEditorData.EditModeChanged -= TextEditorData_EditModeChanged;
+				textEditorData = null;
 				view = null;
 				parsedDocument = null;
 
 //				IdeApp.Workbench.StatusBar.ClearCaretState ();
 			};
 			vbox.ShowAll ();
+
+		}
+
+		void TextEditorData_EditModeChanged (object sender, EditModeChangedEventArgs e)
+		{
+			KillWidgets ();
+		}
+
+		void IdeApp_FocusOut (object sender, EventArgs e)
+		{
+			textEditor.TextArea.HideTooltip (false);
 		}
 
 		void OnLostFocus ()
@@ -447,10 +482,16 @@ namespace MonoDevelop.SourceEditor
 		
 		public void Dispose ()
 		{
-			RemoveErrorUndelinesResetTimerId ();
+			if (IdeApp.CommandService != null)
+				IdeApp.FocusOut -= IdeApp_FocusOut;
+
+			if (!isDisposed) {
+				vbox.Destroy ();
+				isDisposed = true;
+			}
 		}
 		
-		FoldSegment AddMarker (List<FoldSegment> foldSegments, string text, DomRegion region, FoldingType type)
+		Mono.TextEditor.FoldSegment AddMarker (List<Mono.TextEditor.FoldSegment> foldSegments, string text, DomRegion region, Mono.TextEditor.FoldingType type)
 		{
 			Document document = textEditorData.Document;
 			if (document == null || region.BeginLine <= 0 || region.EndLine <= 0 || region.BeginLine > document.LineCount || region.EndLine > document.LineCount)
@@ -459,110 +500,27 @@ namespace MonoDevelop.SourceEditor
 			int startOffset = document.LocationToOffset (region.BeginLine, region.BeginColumn);
 			int endOffset   = document.LocationToOffset (region.EndLine, region.EndColumn );
 			
-			FoldSegment result = new FoldSegment (document, text, startOffset, endOffset - startOffset, type);
+			var result = new Mono.TextEditor.FoldSegment (document, text, startOffset, endOffset - startOffset, type);
 			
 			foldSegments.Add (result);
 			return result;
 		}
-		HashSet<string> symbols = new HashSet<string> ();
 		bool reloadSettings;
 		
 		void HandleParseInformationUpdaterWorkerThreadDoWork (bool firstTime, ParsedDocument parsedDocument, CancellationToken token = default(CancellationToken))
 		{
-			var doc = Document;
-			if (doc == null || parsedDocument == null)
-				return;
-			UpdateErrorUndelines (parsedDocument);
-			if (!options.ShowFoldMargin)
-				return;
-			// don't update parsed documents that contain errors - the foldings from there may be invalid.
-			if (parsedDocument.HasErrors)
-				return;
-			try {
-				List<FoldSegment > foldSegments = new List<FoldSegment> ();
-				bool updateSymbols = parsedDocument.Defines.Count != symbols.Count;
-				if (!updateSymbols) {
-					foreach (PreProcessorDefine define in parsedDocument.Defines) {
-						if (token.IsCancellationRequested)
-							return;
-						if (!symbols.Contains (define.Define)) {
-							updateSymbols = true;
-							break;
-						}
-					}
-				}
-				
-				if (updateSymbols) {
-					symbols.Clear ();
-					foreach (PreProcessorDefine define in parsedDocument.Defines) {
-						symbols.Add (define.Define);
-					}
-				}
-				
-				foreach (FoldingRegion region in parsedDocument.Foldings) {
-					if (token.IsCancellationRequested)
+
+
+			if (reloadSettings) {
+				reloadSettings = false;
+				Application.Invoke (delegate {
+					if (isDisposed)
 						return;
-					FoldingType type = FoldingType.None;
-					bool setFolded = false;
-					bool folded = false;
-					
-					//decide whether the regions should be folded by default
-					switch (region.Type) {
-					case FoldType.Member:
-						type = FoldingType.TypeMember;
-						break;
-					case FoldType.Type:
-						type = FoldingType.TypeDefinition;
-						break;
-					case FoldType.UserRegion:
-						type = FoldingType.Region;
-						setFolded = options.DefaultRegionsFolding;
-						folded = true;
-						break;
-					case FoldType.Comment:
-						type = FoldingType.Comment;
-						setFolded = options.DefaultCommentFolding;
-						folded = true;
-						break;
-					case FoldType.CommentInsideMember:
-						type = FoldingType.Comment;
-						setFolded = options.DefaultCommentFolding;
-						folded = false;
-						break;
-					case FoldType.Undefined:
-						setFolded = true;
-						folded = region.IsFoldedByDefault;
-						break;
-					}
-					
-					//add the region
-					FoldSegment marker = AddMarker (foldSegments, region.Name, 
-					                                       region.Region, type);
-					
-					//and, if necessary, set its fold state
-					if (marker != null && setFolded && firstTime) {
-						// only fold on document open, later added folds are NOT folded by default.
-						marker.IsFolded = folded;
-						continue;
-					}
-					if (marker != null && region.Region.IsInside (textEditorData.Caret.Line, textEditorData.Caret.Column))
-						marker.IsFolded = false;
-					
-				}
-				doc.UpdateFoldSegments (foldSegments, false, true, token);
-
-				if (reloadSettings) {
-					reloadSettings = false;
-					Application.Invoke (delegate {
-						if (isDisposed)
-							return;
-						view.LoadSettings ();
-						mainsw.QueueDraw ();
-					});
-				}
-			} catch (Exception ex) {
-				LoggingService.LogError ("Unhandled exception in ParseInformationUpdaterWorkerThread", ex);
+					view.LoadSettings ();
+					mainsw.QueueDraw ();
+				});
 			}
+
 		}
 
 		internal void UpdateParsedDocument (ParsedDocument document)
@@ -590,7 +548,7 @@ namespace MonoDevelop.SourceEditor
 			StopParseInfoThread ();
 			if (runInThread) {
 				var token = parserInformationUpdateSrc.Token;
-				System.Threading.Tasks.Task.Factory.StartNew (delegate {
+				System.Threading.Tasks.Task.Run (delegate {
 					HandleParseInformationUpdaterWorkerThreadDoWork (false, parsedDocument, token);
 				}); 
 			} else {
@@ -608,77 +566,9 @@ namespace MonoDevelop.SourceEditor
 		{
 			this.lastActiveEditor = editor;
 		}
-			
-		#region Error underlining
-		List<ErrorMarker> errors = new List<ErrorMarker> ();
-		uint resetTimerId;
-		
-		void RemoveErrorUndelinesResetTimerId ()
-		{
-			if (resetTimerId > 0) {
-				GLib.Source.Remove (resetTimerId);
-				resetTimerId = 0;
-			}
-		}
-		
-		void UpdateErrorUndelines (ParsedDocument parsedDocument)
-		{
-			if (!options.UnderlineErrors || parsedDocument == null) {
-				Application.Invoke (delegate {
-					var doc = this.TextEditor != null ? this.TextEditor.Document : null;
-					if (doc == null)
-						return;
-					RemoveErrorUnderlines (doc);
-					UpdateQuickTasks (parsedDocument);
-				});
-				return;
-			}
-				
-			Application.Invoke (delegate {
-				if (!quickTaskProvider.Contains (this))
-					AddQuickTaskProvider (this);
-				RemoveErrorUndelinesResetTimerId ();
-				const uint timeout = 500;
-				resetTimerId = GLib.Timeout.Add (timeout, delegate {
-					if (!this.isDisposed) {
-						Document doc = this.TextEditor != null ? this.TextEditor.Document : null;
-						if (doc != null) {
-							RemoveErrorUnderlines (doc);
-
-							// Else we underline the error
-							if (parsedDocument.Errors != null) {
-								foreach (var error in parsedDocument.Errors)
-									UnderLineError (doc, error);
-							}
-						}
-					}
-					resetTimerId = 0;
-					return false;
-				});
-				UpdateQuickTasks (parsedDocument);
-			});
-		}
-		
-		void RemoveErrorUnderlines (Document doc)
-		{
-			errors.ForEach (err => doc.RemoveMarker (err));
-			errors.Clear ();
-		}
-		
-		void UnderLineError (Document doc, Error info)
-		{
-			var line = doc.GetLine (info.Region.BeginLine);
-			// If the line is already underlined
-			if (errors.Any (em => em.LineSegment == line))
-				return;
-			ErrorMarker error = new ErrorMarker (textEditor.Document, info, line);
-			errors.Add (error);
-			doc.AddMarker (line, error);
-		}
-		#endregion
-	
-		
-		Gtk.Paned splitContainer = null;
+
+		Gtk.Paned splitContainer;
+
 		public bool IsSplitted {
 			get {
 				return splitContainer != null;
@@ -763,7 +653,7 @@ namespace MonoDevelop.SourceEditor
 				 if (!textEditor.TextArea.HasFocus)
 					OnLostFocus ();
 			};
-			splittedTextEditor.Extension = textEditor.Extension;
+			splittedTextEditor.EditorExtension = textEditor.EditorExtension;
 			if (textEditor.GetTextEditorData ().HasIndentationTracker)
 				splittedTextEditor.GetTextEditorData ().IndentationTracker = textEditor.GetTextEditorData ().IndentationTracker;
 			splittedTextEditor.Document.BracketMatcher = textEditor.Document.BracketMatcher;
@@ -831,7 +721,7 @@ namespace MonoDevelop.SourceEditor
 					EllipsizeMiddle (Document.FileName, 50), BrandingService.ApplicationName));
 				
 				var b1 = new Button (GettextCatalog.GetString ("_Reload from disk"));
-				b1.Image = ImageService.GetImage (Gtk.Stock.Refresh, IconSize.Button);
+				b1.Image = new ImageView (Gtk.Stock.Refresh, IconSize.Button);
 				b1.Clicked += delegate {
 					Reload ();
 					view.TextEditor.GrabFocus ();
@@ -839,7 +729,7 @@ namespace MonoDevelop.SourceEditor
 				messageBar.ActionArea.Add (b1);
 				
 				var b2 = new Button (GettextCatalog.GetString ("_Keep changes"));
-				b2.Image = ImageService.GetImage (Gtk.Stock.Cancel, IconSize.Button);
+				b2.Image = new ImageView (Gtk.Stock.Cancel, IconSize.Button);
 				b2.Clicked += delegate {
 					RemoveMessageBar ();
 					view.LastSaveTimeUtc = System.IO.File.GetLastWriteTimeUtc (view.ContentName);
@@ -849,14 +739,14 @@ namespace MonoDevelop.SourceEditor
 
 				if (multiple) {
 					var b3 = new Button (GettextCatalog.GetString ("_Reload all"));
-					b3.Image = ImageService.GetImage (Gtk.Stock.Cancel, IconSize.Button);
+					b3.Image = new ImageView (Gtk.Stock.Cancel, IconSize.Button);
 					b3.Clicked += delegate {
 						FileRegistry.ReloadAllChangedFiles ();
 					};
 					messageBar.ActionArea.Add (b3);
 	
 					var b4 = new Button (GettextCatalog.GetString ("_Ignore all"));
-					b4.Image = ImageService.GetImage (Gtk.Stock.Cancel, IconSize.Button);
+					b4.Image = new ImageView (Gtk.Stock.Cancel, IconSize.Button);
 					b4.Clicked += delegate {
 						FileRegistry.IgnoreAllChangedFiles ();
 					};
@@ -969,20 +859,38 @@ namespace MonoDevelop.SourceEditor
 			return "Unknown";
 		}
 
-		OverlayMessageWindow messageOverlayWindow;
+		//TODO: Support multiple Overlays at once to display above each other
+		internal void AddOverlay (Widget messageOverlayContent, Func<int> sizeFunc = null)
+		{
+			var messageOverlayWindow = new OverlayMessageWindow ();
+			messageOverlayWindow.Child = messageOverlayContent;
+			messageOverlayWindow.SizeFunc = sizeFunc;
+			messageOverlayWindow.ShowOverlay (TextEditor);
+			messageOverlayWindows.Add (messageOverlayWindow);
+		}
+
+		internal void RemoveOverlay (Widget messageOverlayContent)
+		{
+			var window = messageOverlayWindows.FirstOrDefault (w => w.Child == messageOverlayContent);
+			if (window == null)
+				return;
+			messageOverlayWindows.Remove (window);
+			window.Destroy ();
+		}
+
+		List<OverlayMessageWindow> messageOverlayWindows = new List<OverlayMessageWindow> ();
+		HBox incorrectEolMessage;
 
 		void ShowIncorrectEolMarkers (string fileName, bool multiple)
 		{
 			RemoveMessageBar ();
-			messageOverlayWindow = new OverlayMessageWindow ();
-
 			var hbox = new HBox ();
 			hbox.Spacing = 8;
 
 			var image = new HoverCloseButton ();
 			hbox.PackStart (image, false, false, 0);
 			var label = new Label (string.Format ("This file has line endings ({0}) which differ from the policy settings ({1}).", GetEolString (DetectedEolMarker), GetEolString (textEditor.Options.DefaultEolMarker)));
-			var color = (Mono.TextEditor.HslColor)textEditor.ColorStyle.NotificationText.Foreground;
+			var color = (HslColor)textEditor.ColorStyle.NotificationText.Foreground;
 			label.ModifyFg (StateType.Normal, color);
 
 			int w, h;
@@ -1007,11 +915,9 @@ namespace MonoDevelop.SourceEditor
 			var combo = new ComboBox (list.ToArray ());
 			combo.Active = 0;
 			hbox.PackEnd (combo, false, false, 0);
-			var container = new HBox ();
+			incorrectEolMessage = new HBox ();
 			const int containerPadding = 8;
-			container.PackStart (hbox, true, true, containerPadding); 
-			messageOverlayWindow.Child = container; 
-			messageOverlayWindow.ShowOverlay (this.TextEditor);
+			incorrectEolMessage.PackStart (hbox, true, true, containerPadding); 
 
 			// This is hacky, but it will ensure that our combo appears with with the correct size.
 			GLib.Timeout.Add (100, delegate {
@@ -1019,25 +925,26 @@ namespace MonoDevelop.SourceEditor
 				return false;
 			});
 
-			messageOverlayWindow.SizeFunc = () => {
+			AddOverlay (incorrectEolMessage, () => {
 				return okButton.SizeRequest ().Width +
-					combo.SizeRequest ().Width +
-					image.SizeRequest ().Width +
-					w +
-					hbox.Spacing * 4 + 
-					containerPadding * 2;
-			};
+							   combo.SizeRequest ().Width +
+							   image.SizeRequest ().Width +
+							   w +
+							   hbox.Spacing * 4 +
+							   containerPadding * 2;
+			});
+
 			image.Clicked += delegate {
 				UseIncorrectMarkers = true;
 				view.WorkbenchWindow.ShowNotification = false;
 				RemoveMessageBar ();
 			};
-			okButton.Clicked += delegate {
+			okButton.Clicked += async delegate {
 				switch (combo.Active) {
 				case 0:
 					ConvertLineEndings ();
 					view.WorkbenchWindow.ShowNotification = false;
-					view.Save (fileName, view.SourceEncoding);
+					await view.Save (fileName, view.SourceEncoding);
 					break;
 				case 1:
 					FileRegistry.ConvertLineEndingsInAllFiles ();
@@ -1067,7 +974,7 @@ namespace MonoDevelop.SourceEditor
 					    "Do you want to use the original file, or load from the autosave file?")));
 				
 				Button b1 = new Button (GettextCatalog.GetString("_Use original file"));
-				b1.Image = ImageService.GetImage (Gtk.Stock.Refresh, IconSize.Button);
+				b1.Image = new ImageView (Gtk.Stock.Refresh, IconSize.Button);
 				b1.Clicked += delegate {
 					try {
 						AutoSave.RemoveAutoSaveFile (fileName);
@@ -1083,14 +990,13 @@ namespace MonoDevelop.SourceEditor
 				messageBar.ActionArea.Add (b1);
 				
 				Button b2 = new Button (GettextCatalog.GetString("_Load from autosave"));
-				b2.Image = ImageService.GetImage (Gtk.Stock.RevertToSaved, IconSize.Button);
+				b2.Image = new ImageView (Gtk.Stock.RevertToSaved, IconSize.Button);
 				b2.Clicked += delegate {
 					try {
-						string content = AutoSave.LoadAutoSave (fileName);
-						AutoSave.RemoveAutoSaveFile (fileName);
+						var content = AutoSave.LoadAndRemoveAutoSave (fileName);
 						TextEditor.GrabFocus ();
 						view.Load (fileName);
-						view.ReplaceContent (fileName, content, view.SourceEncoding);
+						view.ReplaceContent (fileName, content.Text, view.SourceEncoding);
 						view.WorkbenchWindow.Document.ReparseDocument ();
 						view.IsDirty = true;
 					} catch (Exception ex) {
@@ -1125,21 +1031,21 @@ namespace MonoDevelop.SourceEditor
 			}
 			if (!TextEditor.Visible)
 				TextEditor.Visible = true;
-			if (messageOverlayWindow != null) {
-				messageOverlayWindow.Destroy ();
-				messageOverlayWindow = null;
+			if (incorrectEolMessage != null) {
+				RemoveOverlay (incorrectEolMessage);
+				incorrectEolMessage = null;
 			}
 		}
 
-		public void Reload ()
+		public async void Reload ()
 		{
 			try {
-				if (!System.IO.File.Exists (view.ContentName))
+				if (!System.IO.File.Exists (view.ContentName) || this.isDisposed)
 					return;
 
 				view.StoreSettings ();
 				reloadSettings = true;
-				view.Load (view.ContentName, view.SourceEncoding, true);
+				await view.Load (view.ContentName, view.SourceEncoding, true);
 				view.WorkbenchWindow.ShowNotification = false;
 			} catch (Exception ex) {
 				MessageService.ShowError ("Could not reload the file.", ex);
@@ -1278,7 +1184,7 @@ namespace MonoDevelop.SourceEditor
 			SetReplacePatternToSelection ();
 		}
 
-		void ShowSearchReplaceWidget (bool replace)
+		void ShowSearchReplaceWidget (bool replace, bool switchFocus = true)
 		{
 			if (searchAndReplaceWidget == null) {
 				KillWidgets ();
@@ -1289,7 +1195,7 @@ namespace MonoDevelop.SourceEditor
 				searchAndReplaceWidgetFrame.Child = searchAndReplaceWidget = new SearchAndReplaceWidget (TextEditor, searchAndReplaceWidgetFrame);
 				searchAndReplaceWidget.Destroyed += (sender, e) => RemoveSearchWidget ();
 				searchAndReplaceWidgetFrame.ShowAll ();
-				this.TextEditor.AddAnimatedWidget (searchAndReplaceWidgetFrame, 300, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Blocking.Downstage, TextEditor.Allocation.Width - 400, -searchAndReplaceWidget.Allocation.Height);
+				this.TextEditor.AddAnimatedWidget (searchAndReplaceWidgetFrame, ANIMATION_DURATION, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Blocking.Downstage, TextEditor.Allocation.Width - 400, -searchAndReplaceWidget.Allocation.Height);
 //				this.PackEnd (searchAndReplaceWidget);
 //				this.SetChildPacking (searchAndReplaceWidget, false, false, CHILD_PADDING, PackType.End);
 				//		searchAndReplaceWidget.ShowAll ();
@@ -1313,7 +1219,8 @@ namespace MonoDevelop.SourceEditor
 					this.FindNext ();
 				}
 			}
-			searchAndReplaceWidget.Focus ();
+			if (switchFocus)
+				searchAndReplaceWidget.Focus ();
 		}
 		
 		public void ShowGotoLineNumberWidget ()
@@ -1329,7 +1236,7 @@ namespace MonoDevelop.SourceEditor
 				gotoLineNumberWidgetFrame.Child = gotoLineNumberWidget = new GotoLineNumberWidget (textEditor, gotoLineNumberWidgetFrame);
 				gotoLineNumberWidget.Destroyed += (sender, e) => RemoveSearchWidget ();
 				gotoLineNumberWidgetFrame.ShowAll ();
-				TextEditor.AddAnimatedWidget (gotoLineNumberWidgetFrame, 300, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Mono.TextEditor.Theatrics.Blocking.Downstage, this.TextEditor.Allocation.Width - 400, -gotoLineNumberWidget.Allocation.Height);
+				TextEditor.AddAnimatedWidget (gotoLineNumberWidgetFrame, ANIMATION_DURATION, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Mono.TextEditor.Theatrics.Blocking.Downstage, this.TextEditor.Allocation.Width - 400, -gotoLineNumberWidget.Allocation.Height);
 				
 				ResetFocusChain ();
 			}
@@ -1345,6 +1252,8 @@ namespace MonoDevelop.SourceEditor
 		
 		public SearchResult FindNext (bool focus)
 		{
+			if (searchAndReplaceWidget == null)
+				ShowSearchReplaceWidget (false, false);
 			return SearchAndReplaceWidget.FindNext (TextEditor);
 		}
 		
@@ -1355,6 +1264,8 @@ namespace MonoDevelop.SourceEditor
 		
 		public SearchResult FindPrevious (bool focus)
 		{
+			if (searchAndReplaceWidget == null)
+				ShowSearchReplaceWidget (false, false);
 			return SearchAndReplaceWidget.FindPrevious (TextEditor);
 		}
 
@@ -1420,20 +1331,8 @@ namespace MonoDevelop.SourceEditor
 		#region Help
 		internal void MonodocResolver ()
 		{
-			DomRegion region;
+			MonoDevelop.Ide.Editor.DocumentRegion region;
 			var res = TextEditor.GetLanguageItem (TextEditor.Caret.Offset, out region);
-			if (res is UnknownIdentifierResolveResult) {
-				var uir = (UnknownIdentifierResolveResult)res;
-				IdeApp.HelpOperations.SearchHelpFor (uir.Identifier);
-				return;
-			}
-
-			if (res is UnknownMemberResolveResult) {
-				var uir = (UnknownMemberResolveResult)res;
-				IdeApp.HelpOperations.SearchHelpFor (uir.MemberName);
-				return;
-			}
-
 			string url = HelpService.GetMonoDocHelpUrl (res);
 			if (url != null)
 				IdeApp.HelpOperations.ShowHelp (url);
@@ -1441,140 +1340,16 @@ namespace MonoDevelop.SourceEditor
 		
 		internal void MonodocResolverUpdate (CommandInfo cinfo)
 		{
-			DomRegion region;
+			MonoDevelop.Ide.Editor.DocumentRegion region;
 			var res = TextEditor.GetLanguageItem (TextEditor.Caret.Offset, out region);
-			if (res == null || !IdeApp.HelpOperations.CanShowHelp (res) && !(res is UnknownIdentifierResolveResult || res is UnknownMemberResolveResult))
+			if (HelpService.GetMonoDocHelpUrl (res) == null)
 				cinfo.Bypass = true;
 		}
 		
 		#endregion
 		
 		#region commenting and indentation
-		internal void OnUpdateToggleComment (MonoDevelop.Components.Commands.CommandInfo info)
-		{
-			var mode = Document.SyntaxMode as SyntaxMode;
-			if (mode == null) {
-				info.Visible = false;
-				return;
-			}
-			List<string> lineComments;
-			if (mode.Properties.TryGetValue ("LineComment", out lineComments)) {
-				info.Visible = lineComments.Count > 0;
-			} else {
-				List<string> blockStarts;
-				List<string> blockEnds;
-				if (mode.Properties.TryGetValue ("BlockCommentStart", out blockStarts) && mode.Properties.TryGetValue ("BlockCommentEnd", out blockEnds)) {
-					info.Visible = blockStarts.Count > 0 && blockEnds.Count > 0;
-				}
-			}
-		}
-		
-		void ToggleCodeCommentWithBlockComments ()
-		{
-			var mode = Document.SyntaxMode as SyntaxMode;
-			if (mode == null)
-				return;
-
-			List<string> blockStarts;
-			if (!mode.Properties.TryGetValue ("BlockCommentStart", out blockStarts) || blockStarts.Count == 0)
-				return;
-
-			List<string> blockEnds;
-			if (!mode.Properties.TryGetValue ("BlockCommentEnd", out blockEnds) || blockEnds.Count == 0)
-				return;
-
-			string blockStart = blockStarts[0];
-			string blockEnd = blockEnds[0];
-
-			using (var undo = Document.OpenUndoGroup ()) {
-				DocumentLine startLine;
-				DocumentLine endLine;
 	
-				if (TextEditor.IsSomethingSelected) {
-					startLine = Document.GetLineByOffset (textEditor.SelectionRange.Offset);
-					endLine = Document.GetLineByOffset (textEditor.SelectionRange.EndOffset);
-
-					// If selection ends at begining of line... This is visible as previous line
-					// is selected, hence we want to select previous line Bug 26287
-					if (endLine.Offset == textEditor.SelectionRange.EndOffset)
-						endLine = endLine.PreviousLine;
-				} else {
-					startLine = endLine = Document.GetLine (textEditor.Caret.Line);
-				}
-				string startLineText = Document.GetTextAt (startLine.Offset, startLine.Length);
-				string endLineText = Document.GetTextAt (endLine.Offset, endLine.Length);
-				if (startLineText.StartsWith (blockStart) && endLineText.EndsWith (blockEnd, StringComparison.Ordinal)) {
-					textEditor.Remove (endLine.Offset + endLine.Length - blockEnd.Length, blockEnd.Length);
-					textEditor.Remove (startLine.Offset, blockStart.Length);
-					if (TextEditor.IsSomethingSelected) {
-						TextEditor.SelectionAnchor -= blockEnd.Length;
-					}
-				} else {
-					textEditor.Insert (endLine.Offset + endLine.Length, blockEnd);
-					textEditor.Insert (startLine.Offset, blockStart);
-					if (TextEditor.IsSomethingSelected) {
-						TextEditor.SelectionAnchor += blockEnd.Length;
-					}
-
-				}
-			}
-		}
-
-		bool TryGetLineCommentTag (out string commentTag)
-		{
-			var mode = Document.SyntaxMode as SyntaxMode;
-			List<string> lineComments;
-			if (mode == null || !mode.Properties.TryGetValue ("LineComment", out lineComments) || lineComments.Count == 0) {
-				commentTag = null;
-				return false;
-			}
-			commentTag = lineComments [0];
-			return true;
-		}
-
-		public void ToggleCodeComment ()
-		{
-			string commentTag;
-			if (!TryGetLineCommentTag (out commentTag)) {
-				ToggleCodeCommentWithBlockComments ();
-				return;
-			}
-
-			bool comment = false;
-			foreach (var line in textEditor.SelectedLines) {
-				if (line.GetIndentation (TextEditor.Document).Length == line.Length)
-					continue;
-				string text = Document.GetTextAt (line);
-				string trimmedText = text.TrimStart ();
-				if (!trimmedText.StartsWith (commentTag, StringComparison.Ordinal)) {
-					comment = true;
-					break;
-				}
-			}
-
-			if (comment) {
-				CommentSelectedLines (commentTag);
-			} else {
-				UncommentSelectedLines (commentTag);
-			}
-		}
-
-		public void AddCodeComment ()
-		{
-			string commentTag;
-			if (!TryGetLineCommentTag (out commentTag))
-				return;
-			CommentSelectedLines (commentTag);
-		}
-
-		public void RemoveCodeComment ()
-		{
-			string commentTag;
-			if (!TryGetLineCommentTag (out commentTag))
-				return;
-			UncommentSelectedLines (commentTag);
-		}
-
 		public void OnUpdateToggleErrorTextMarker (CommandInfo info)
 		{
 			DocumentLine line = TextEditor.Document.GetLine (TextEditor.Caret.Line);
@@ -1597,117 +1372,7 @@ namespace MonoDevelop.SourceEditor
 				TextEditor.QueueDraw ();
 			}
 		}
-		
-		void CommentSelectedLines (string commentTag)
-		{
-			int startLineNr = TextEditor.IsSomethingSelected ? Document.OffsetToLineNumber (TextEditor.SelectionRange.Offset) : TextEditor.Caret.Line;
-			int endLineNr = TextEditor.IsSomethingSelected ? Document.OffsetToLineNumber (TextEditor.SelectionRange.EndOffset) : TextEditor.Caret.Line;
-			if (endLineNr < 0)
-				endLineNr = Document.LineCount;
-			
-			DocumentLine anchorLine = TextEditor.IsSomethingSelected ? TextEditor.Document.GetLineByOffset (TextEditor.SelectionAnchor) : null;
-			int anchorColumn = TextEditor.IsSomethingSelected ? TextEditor.SelectionAnchor - anchorLine.Offset : -1;
-			
-			using (var undo = Document.OpenUndoGroup ()) {
-				foreach (DocumentLine line in TextEditor.SelectedLines) {
-//					if (line.GetIndentation (TextEditor.Document).Length == line.EditableLength)
-//						continue;
-					TextEditor.Insert (line.Offset, commentTag);
-				}
-				if (TextEditor.IsSomethingSelected) {
-					if (TextEditor.SelectionAnchor < TextEditor.Caret.Offset) {
-						if (anchorColumn != 0) 
-							TextEditor.SelectionAnchor = System.Math.Min (anchorLine.Offset + anchorLine.Length, System.Math.Max (anchorLine.Offset, TextEditor.SelectionAnchor + commentTag.Length));
-					} else {
-						if (anchorColumn != 0) {
-							TextEditor.SelectionAnchor = System.Math.Min (anchorLine.Offset + anchorLine.Length, System.Math.Max (anchorLine.Offset, anchorLine.Offset + anchorColumn + commentTag.Length));
-						} else {
-	//						TextEditor.SelectionAnchor = anchorLine.Offset;
-						}
-					}
-				}
-				
-				if (TextEditor.IsSomethingSelected) 
-					TextEditor.ExtendSelectionTo (TextEditor.Caret.Offset);
-			}
-			Document.CommitMultipleLineUpdate (startLineNr, endLineNr);
-		}
-		
-		void UncommentSelectedLines (string commentTag)
-		{
-			int startLineNr = TextEditor.IsSomethingSelected ? Document.OffsetToLineNumber (TextEditor.SelectionRange.Offset) : TextEditor.Caret.Line;
-			int endLineNr   = TextEditor.IsSomethingSelected ? Document.OffsetToLineNumber (TextEditor.SelectionRange.EndOffset) : TextEditor.Caret.Line;
-			if (endLineNr < 0)
-				endLineNr = Document.LineCount;
-			DocumentLine anchorLine   = TextEditor.IsSomethingSelected ? TextEditor.Document.GetLineByOffset (TextEditor.SelectionAnchor) : null;
-			int         anchorColumn = TextEditor.IsSomethingSelected ? TextEditor.SelectionAnchor - anchorLine.Offset : -1;
-			
-			using (var undo = Document.OpenUndoGroup ()) {
-				int first = -1;
-				int last  = 0;
-				foreach (DocumentLine line in TextEditor.SelectedLines) {
-					string text = Document.GetTextAt (line);
-					string trimmedText = text.TrimStart ();
-					int length = 0;
-					if (trimmedText.StartsWith (commentTag)) {
-						TextEditor.Remove (line.Offset + (text.Length - trimmedText.Length), commentTag.Length);
-						length = commentTag.Length;
-					}
-					last = length;
-					if (first < 0)
-						first = last;
-				}
-				
-				if (TextEditor.IsSomethingSelected) {
-					if (TextEditor.SelectionAnchor < TextEditor.Caret.Offset) {
-						TextEditor.SelectionAnchor = System.Math.Min (anchorLine.Offset + anchorLine.Length, System.Math.Max (anchorLine.Offset, TextEditor.SelectionAnchor - first));
-					} else {
-						TextEditor.SelectionAnchor = System.Math.Min (anchorLine.Offset + anchorLine.Length, System.Math.Max (anchorLine.Offset, anchorLine.Offset + anchorColumn - last));
-					}
-				}
-				
-				if (TextEditor.IsSomethingSelected) 
-					TextEditor.ExtendSelectionTo (TextEditor.Caret.Offset);
-			}
-			Document.CommitMultipleLineUpdate (startLineNr, endLineNr);
-		}
-		
-		#endregion
-		
-		#region IQuickTaskProvider implementation
-		List<QuickTask> tasks = new List<QuickTask> ();
-
-		public event EventHandler TasksUpdated;
-
-		protected virtual void OnTasksUpdated (EventArgs e)
-		{
-			EventHandler handler = this.TasksUpdated;
-			if (handler != null)
-				handler (this, e);
-		}
-		
-		public IEnumerable<QuickTask> QuickTasks {
-			get {
-				return tasks;
-			}
-		}
-		
-		void UpdateQuickTasks (ParsedDocument doc)
-		{
-			tasks.Clear ();
-			if (doc != null) {
-				foreach (var cmt in doc.TagComments) {
-					var newTask = new QuickTask (cmt.Text, cmt.Region.Begin, Severity.Hint);
-					tasks.Add (newTask);
-				}
-			
-				foreach (var error in doc.Errors) {
-					var newTask = new QuickTask (error.Message, error.Region.Begin, error.ErrorType == ErrorType.Error ? Severity.Error : Severity.Warning);
-					tasks.Add (newTask);
-				}
-			}
-			OnTasksUpdated (EventArgs.Empty);
-		}
+	
 		#endregion
 
 		internal void NextIssue ()
@@ -1739,56 +1404,12 @@ namespace MonoDevelop.SourceEditor
 		}
 
 
-	}
-
-	class ErrorMarker : UnderlineMarker
-	{
-		public Error Info { get; private set; }
-		
-		public ErrorMarker (TextDocument doc, Error info, DocumentLine line)
-		{
-			Info = info;
-			LineSegment = line;
-			// may be null if no line is assigned to the error.
-			Wave = true;
-			
-			StartCol = Info.Region.BeginColumn;
-			if (line != null) {
-				var startOffset = line.Offset;
-				if (startOffset + StartCol - 1 >= 0) {
-					while (StartCol < line.Length) {
-						char ch = doc.GetCharAt (startOffset + StartCol - 1);
-						if (!char.IsWhiteSpace (ch))
-							break;
-						StartCol++;
-					}
-				}
-			}
-
-			if (Info.Region.EndColumn > StartCol) {
-				EndCol = Info.Region.EndColumn;
-			} else {
-				if (line == null) {
-					EndCol = StartCol + 1;
-					return;
-				}
-				var start = line.Offset + StartCol - 1;
-				int o = start + 1;
-				while (o < line.EndOffset) {
-					char ch = doc.GetCharAt (o);
-					if (!(char.IsLetterOrDigit (ch) || ch == '_'))
-						break;
-					o++;
-				}
-				EndCol = Info.Region.BeginColumn + o - start + 1;
-			}
-		}
-
-		public override void Draw (TextEditor editor, Cairo.Context cr, double y, LineMetrics metrics)
+		#region IServiceProvider implementation
+		object IServiceProvider.GetService (Type serviceType)
 		{
-			Color = Info.ErrorType == ErrorType.Warning ? editor.ColorStyle.UnderlineWarning.Color : editor.ColorStyle.UnderlineError.Color;
-
-			base.Draw (editor, cr, y, metrics);
+			return view.GetContent (serviceType);
 		}
+		#endregion
 	}
+
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
index 01d4f54f65..a4a333c89f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
@@ -25,350 +25,308 @@
 // THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Policies;
-using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Ide;
 using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.SourceEditor
 {
-
-	internal class StyledSourceEditorOptions : ISourceEditorOptions
+	class StyledSourceEditorOptions : TextEditorOptions
 	{
-		PolicyContainer policyContainer;
-		EventHandler changed;
-		IEnumerable<string> mimeTypes;
-		TextStylePolicy currentPolicy;
-		string lastMimeType;
+		MonoDevelop.Ide.Editor.ITextEditorOptions optionsCore;
 
-		public StyledSourceEditorOptions (Project styleParent, string mimeType)
-		{
-			UpdateStyleParent (styleParent, mimeType);
+		public MonoDevelop.Ide.Editor.ITextEditorOptions OptionsCore {
+			get {
+				return optionsCore;
+			}
+			set {
+				optionsCore = value;
+				OnChanged (EventArgs.Empty);
+			}
 		}
-
-		TextStylePolicy CurrentPolicy {
-			get { return currentPolicy; }
+	
+		public StyledSourceEditorOptions (MonoDevelop.Ide.Editor.ITextEditorOptions optionsCore)
+		{
+			if (optionsCore == null)
+				throw new ArgumentNullException ("optionsCore");
+			this.optionsCore = optionsCore;
+			DefaultSourceEditorOptions.Instance.Changed += HandleChanged;
 		}
 
-
-		public void UpdateStyleParent (Project styleParent, string mimeType)
+		public override void Dispose ()
 		{
-			if (styleParent != null && policyContainer == styleParent.Policies && mimeType == lastMimeType)
-				return;
-			lastMimeType = mimeType;
-
-			if (policyContainer != null)
-				policyContainer.PolicyChanged -= HandlePolicyChanged;
-
-			if (string.IsNullOrEmpty (mimeType))
-				mimeType = "text/plain";
-			this.mimeTypes = DesktopService.GetMimeTypeInheritanceChain (mimeType);
-
-			if (styleParent != null)
-				policyContainer = styleParent.Policies;
-			else
-				policyContainer = MonoDevelop.Projects.Policies.PolicyService.DefaultPolicies;
-			currentPolicy = policyContainer.Get<TextStylePolicy> (mimeTypes);
-
-			policyContainer.PolicyChanged += HandlePolicyChanged;
-			if (changed != null)
-				this.changed (this, EventArgs.Empty);
+			DefaultSourceEditorOptions.Instance.Changed -= HandleChanged;
+
+			base.Dispose ();
 		}
 
-		void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
+		void HandleChanged (object sender, EventArgs e)
 		{
-			currentPolicy = policyContainer.Get<TextStylePolicy> (mimeTypes);
-			if (changed != null)
-				this.changed (this, EventArgs.Empty);
+			DisposeFont ();
+			OnChanged (EventArgs.Empty);
 		}
 
-		public bool OverrideDocumentEolMarker {
-			get { return DefaultSourceEditorOptions.Instance.OverrideDocumentEolMarker; }
+		#region ITextEditorOptions implementation
+		static IWordFindStrategy monoDevelopWordFindStrategy = new EmacsWordFindStrategy (false);
+		static IWordFindStrategy emacsWordFindStrategy = new EmacsWordFindStrategy (true);
+		static IWordFindStrategy sharpDevelopWordFindStrategy = new SharpDevelopWordFindStrategy ();
+
+		public override IWordFindStrategy WordFindStrategy {
+			get {
+				switch (DefaultSourceEditorOptions.Instance.WordFindStrategy) {
+				case MonoDevelop.Ide.Editor.WordFindStrategy.MonoDevelop:
+					return monoDevelopWordFindStrategy;
+				case MonoDevelop.Ide.Editor.WordFindStrategy.Emacs:
+					return emacsWordFindStrategy;
+				case MonoDevelop.Ide.Editor.WordFindStrategy.SharpDevelop:
+					return sharpDevelopWordFindStrategy;
+				default:
+					throw new ArgumentOutOfRangeException ();
+				}
+			}
 			set {
-				throw new NotSupportedException ();
+				throw new NotImplementedException ();
 			}
 		}
-		
-		public string DefaultEolMarker {
-			get { return TextStylePolicy.GetEolMarker (CurrentPolicy.EolMarker); }
+
+		public override bool AllowTabsAfterNonTabs {
+			get {
+				return DefaultSourceEditorOptions.Instance.AllowTabsAfterNonTabs;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public int RulerColumn {
-			get { return CurrentPolicy.FileWidth; }
+		public override bool HighlightMatchingBracket {
+			get {
+				return DefaultSourceEditorOptions.Instance.HighlightMatchingBracket;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public int TabSize {
-			get { return CurrentPolicy.TabWidth; }
+		public override bool TabsToSpaces {
+			get {
+				return optionsCore.TabsToSpaces;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public bool TabsToSpaces {
-			get { return CurrentPolicy.TabsToSpaces; }
+		public override int IndentationSize {
+			get {
+				return optionsCore.IndentationSize;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public bool RemoveTrailingWhitespaces {
-			get { return CurrentPolicy.RemoveTrailingWhitespace; }
+		public override int TabSize {
+			get {
+				return optionsCore.TabSize;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public bool AllowTabsAfterNonTabs {
-			get { return !CurrentPolicy.NoTabsAfterNonTabs; }
+
+		public override bool ShowIconMargin {
+			get {
+				return optionsCore.ShowIconMargin;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public int IndentationSize {
-			get { return CurrentPolicy.IndentWidth; }
+		public override bool ShowLineNumberMargin {
+			get {
+				return optionsCore.ShowLineNumberMargin;
+			}
 			set {
 				throw new NotSupportedException ();
 			}
 		}
 
-		public string IndentationString {
-			get { return this.TabsToSpaces ? new string (' ', this.TabSize) : "\t"; }
-		}
-
-		#region ITextEditorOptions implementation
-
-		public bool CanResetZoom {
-			get { return DefaultSourceEditorOptions.Instance.CanResetZoom; }
-		}
-
-		public bool CanZoomIn {
-			get { return DefaultSourceEditorOptions.Instance.CanZoomIn; }
-		}
-
-		public bool CanZoomOut {
-			get { return DefaultSourceEditorOptions.Instance.CanZoomOut; }
-		}
-
-		public event EventHandler Changed {
-			add {
-				if (changed == null)
-					DefaultSourceEditorOptions.Instance.Changed += HandleDefaultsChanged;
-				changed += value;
+		public override bool ShowFoldMargin {
+			get {
+				return optionsCore.ShowFoldMargin;
 			}
-			remove {
-				changed -= value;
-				if (changed == null)
-					DefaultSourceEditorOptions.Instance.Changed -= HandleDefaultsChanged;
+			set {
+				throw new NotSupportedException ();
 			}
 		}
 
-		void HandleDefaultsChanged (object sender, EventArgs e)
-		{
-			if (changed != null)
-				changed (this, EventArgs.Empty);
-		}
-
-		public string ColorScheme {
-			get { return DefaultSourceEditorOptions.Instance.ColorScheme; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool EnableSyntaxHighlighting {
-			get { return DefaultSourceEditorOptions.Instance.EnableSyntaxHighlighting; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public Pango.FontDescription Font {
-			get { return DefaultSourceEditorOptions.Instance.Font; }
-		}
-		
-		public string FontName {
-			get { return DefaultSourceEditorOptions.Instance.FontName; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public Pango.FontDescription GutterFont {
-			get { return DefaultSourceEditorOptions.Instance.GutterFont; }
-		}
-		
-		public string GutterFontName {
-			get { return DefaultSourceEditorOptions.Instance.GutterFontName; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public Mono.TextEditor.Highlighting.ColorScheme GetColorStyle ()
-		{
-			return DefaultSourceEditorOptions.Instance.GetColorStyle ();
-		}
-
-		public bool HighlightCaretLine {
-			get { return DefaultSourceEditorOptions.Instance.HighlightCaretLine; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool HighlightMatchingBracket {
-			get { return DefaultSourceEditorOptions.Instance.HighlightMatchingBracket; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool ShowFoldMargin {
-			get { return DefaultSourceEditorOptions.Instance.ShowFoldMargin; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool ShowIconMargin {
-			get { return DefaultSourceEditorOptions.Instance.ShowIconMargin; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool ShowLineNumberMargin {
-			get { return DefaultSourceEditorOptions.Instance.ShowLineNumberMargin; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool ShowRuler {
-			get { return DefaultSourceEditorOptions.Instance.ShowRuler; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public bool EnableAnimations {
-			get { return DefaultSourceEditorOptions.Instance.EnableAnimations; }
-			set { throw new NotSupportedException (); }
-		}
-		
-		public Mono.TextEditor.IWordFindStrategy WordFindStrategy {
-			get { return DefaultSourceEditorOptions.Instance.WordFindStrategy; }
-			set { throw new NotSupportedException (); }
-		}
-
-		public double Zoom {
-			get { return DefaultSourceEditorOptions.Instance.Zoom; }
-			set { DefaultSourceEditorOptions.Instance.Zoom = value; }
-		}
-
-		public bool DrawIndentationMarkers {
-			get { return DefaultSourceEditorOptions.Instance.DrawIndentationMarkers; }
-			set { DefaultSourceEditorOptions.Instance.DrawIndentationMarkers = value; }
-		}
-
-		public ShowWhitespaces ShowWhitespaces  {
-			get { return DefaultSourceEditorOptions.Instance.ShowWhitespaces; }
-			set { DefaultSourceEditorOptions.Instance.ShowWhitespaces = value; }
-		}
-
-		public IncludeWhitespaces IncludeWhitespaces {
-			get { return DefaultSourceEditorOptions.Instance.IncludeWhitespaces; }
-			set { DefaultSourceEditorOptions.Instance.IncludeWhitespaces = value; }
+		public override bool HighlightCaretLine {
+			get {
+				return optionsCore.HighlightCaretLine;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool WrapLines {
-			get { return DefaultSourceEditorOptions.Instance.WrapLines; }
-			set { DefaultSourceEditorOptions.Instance.WrapLines = value; }
+		public override int RulerColumn {
+			get {
+				return optionsCore.RulerColumn;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool EnableQuickDiff {
-			get { return DefaultSourceEditorOptions.Instance.EnableQuickDiff; }
-			set { DefaultSourceEditorOptions.Instance.EnableQuickDiff = value; }
+		public override bool ShowRuler {
+			get {
+				return optionsCore.ShowRuler;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool GenerateFormattingUndoStep {
-			get { return DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep; }
-			set { DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep = value; }
+		public override Mono.TextEditor.IndentStyle IndentStyle {
+			get {
+				if (optionsCore.IndentStyle == MonoDevelop.Ide.Editor.IndentStyle.Smart && optionsCore.RemoveTrailingWhitespaces)
+					return Mono.TextEditor.IndentStyle.Virtual;
+				return (Mono.TextEditor.IndentStyle)optionsCore.IndentStyle;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public void ZoomIn ()
-		{
-			DefaultSourceEditorOptions.Instance.ZoomIn ();
+		public override bool OverrideDocumentEolMarker {
+			get {
+				return optionsCore.OverrideDocumentEolMarker;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public void ZoomOut ()
-		{
-			DefaultSourceEditorOptions.Instance.ZoomOut ();
+		public override bool EnableSyntaxHighlighting {
+			get {
+				return optionsCore.EnableSyntaxHighlighting;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public void ZoomReset ()
-		{
-			DefaultSourceEditorOptions.Instance.ZoomReset ();
+		public override bool EnableAnimations {
+			get {
+				return DefaultSourceEditorOptions.Instance.HighlightMatchingBracket;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		#endregion
-
-
-		#region ISourceEditorOptions implementation
-
-		public bool AutoInsertMatchingBracket {
-			get { return DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket; }
+		public override bool EnableQuickDiff {
+			get {
+				return DefaultSourceEditorOptions.Instance.EnableQuickDiff;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool DefaultCommentFolding {
-			get { return DefaultSourceEditorOptions.Instance.DefaultCommentFolding; }
+		public override bool DrawIndentationMarkers {
+			get {
+				return DefaultSourceEditorOptions.Instance.DrawIndentationMarkers;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool DefaultRegionsFolding {
-			get { return DefaultSourceEditorOptions.Instance.DefaultRegionsFolding; }
+		public override bool WrapLines {
+			get {
+				return optionsCore.WrapLines;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public EditorFontType EditorFontType {
-			get { return DefaultSourceEditorOptions.Instance.EditorFontType; }
+		public override string FontName {
+			get {
+				return optionsCore.FontName;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool EnableAutoCodeCompletion {
-			get { return DefaultSourceEditorOptions.Instance.EnableAutoCodeCompletion; }
+		public override string GutterFontName {
+			get {
+				return optionsCore.GutterFontName;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool EnableSemanticHighlighting {
-			get { return DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting; }
+		public override string ColorScheme {
+			get {
+				return optionsCore.ColorScheme;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public IndentStyle IndentStyle {
+		public override string DefaultEolMarker {
 			get {
-				if ((DefaultSourceEditorOptions.Instance.IndentStyle == Mono.TextEditor.IndentStyle.Smart ||
-					DefaultSourceEditorOptions.Instance.IndentStyle == Mono.TextEditor.IndentStyle.Auto) && CurrentPolicy.RemoveTrailingWhitespace)
-					return IndentStyle.Virtual;
-				return DefaultSourceEditorOptions.Instance.IndentStyle;
+				return optionsCore.DefaultEolMarker;
 			}
 			set {
-				throw new NotSupportedException ("Use property 'IndentStyle' instead.");
+				throw new NotSupportedException ();
 			}
 		}
 
-		public bool TabIsReindent {
-			get { return DefaultSourceEditorOptions.Instance.TabIsReindent; }
+		public override Mono.TextEditor.ShowWhitespaces ShowWhitespaces {
+			get {
+				return (Mono.TextEditor.ShowWhitespaces)optionsCore.ShowWhitespaces;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool UnderlineErrors {
-			get { return DefaultSourceEditorOptions.Instance.UnderlineErrors; }
+		public override Mono.TextEditor.IncludeWhitespaces IncludeWhitespaces {
+			get {
+				return (Mono.TextEditor.IncludeWhitespaces)optionsCore.IncludeWhitespaces;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool UseViModes {
-			get { return DefaultSourceEditorOptions.Instance.UseViModes; }
+		public override bool GenerateFormattingUndoStep {
+			get {
+				return optionsCore.GenerateFormattingUndoStep;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-		public bool EnableSelectionWrappingKeys { 
-			get { return DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket; } 
+		public override bool EnableSelectionWrappingKeys {
+			get {
+				return optionsCore.EnableSelectionWrappingKeys;
+			}
+			set {
+				throw new NotSupportedException ();
+			}
 		}
 
-
 		#endregion
 
-		public void Dispose ()
-		{
-			mimeTypes = null;
-			if (policyContainer != null)
-				policyContainer.PolicyChanged -= HandlePolicyChanged;
-			if (changed != null) {
-				DefaultSourceEditorOptions.Instance.Changed -= HandleDefaultsChanged;
-				changed = null;
-			}
-		}
+
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeCodon.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeCodon.cs
deleted file mode 100644
index f7339614c3..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeCodon.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// 
-// SyntaxModeCodon.cs
-//  
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using Mono.TextEditor.Highlighting;
-using Mono.Addins;
-
-
-namespace MonoDevelop.SourceEditor
-{
-	[ExtensionNode (Description="A syntax mode. The specified class must be a valid syntax mode.")]
-	class SyntaxModeCodon : TypeExtensionNode
-	{
-		[NodeAttribute ("mimeTypes", true, "Mime types of the syntax mode.")]
-		string mimeTypes = null;
-		
-		public SyntaxMode SyntaxMode {
-			get {
-				return CreateInstance () as SyntaxMode;
-			}
-		}
-
-		public string MimeTypes {
-			get {
-				return mimeTypes;
-			}
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeLoader.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeLoader.cs
new file mode 100644
index 0000000000..2f2e1c8f73
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeLoader.cs
@@ -0,0 +1,68 @@
+//
+// SyntaxModeLoader.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System.IO;
+using Mono.Addins;
+using MonoDevelop.Ide.Editor.Highlighting;
+
+namespace MonoDevelop.SourceEditor
+{
+	static class SyntaxModeLoader
+	{
+		static bool initialized = false;
+
+		public static void Init ()
+		{
+			if (initialized)
+				return;
+			initialized = true;
+			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/SourceEditor2/SyntaxModes", OnSyntaxModeExtensionChanged);
+		}
+
+		static void OnSyntaxModeExtensionChanged (object s, ExtensionNodeEventArgs args)
+		{
+			TemplateCodon codon = (TemplateCodon)args.ExtensionNode;
+			if (args.Change == ExtensionChange.Add) {
+				Mono.TextEditor.Highlighting.SyntaxModeService.AddSyntaxMode (new StreamProviderWrapper(codon));
+			}
+		}
+
+		class StreamProviderWrapper : Mono.TextEditor.Highlighting.IStreamProvider
+		{
+			readonly TemplateCodon codon;
+
+			public StreamProviderWrapper (TemplateCodon codon)
+			{
+				this.codon = codon;
+			}
+
+			Stream Mono.TextEditor.Highlighting.IStreamProvider.Open ()
+			{
+				return codon.Open ();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeService.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeService.cs
deleted file mode 100644
index 1f57d22a7e..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SyntaxModeService.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// 
-// SyntaxModeService.cs
-//  
-// Author:
-//   Mike Krüger <mkrueger@novell.com>
-//
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using Mono.TextEditor.Highlighting;
-using Mono.Addins;
-
-
-namespace MonoDevelop.SourceEditor
-{
-	public static class SyntaxModeService
-	{
-		static SyntaxModeService ()
-		{
-//			Console.WriteLine ("SETUP SMS");
-			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/SourceEditor2/CustomModes", delegate(object sender, ExtensionNodeEventArgs args) {
-				SyntaxModeCodon syntaxModeCodon = (SyntaxModeCodon)args.ExtensionNode;
-				switch (args.Change) {
-				case ExtensionChange.Add:
-//					Console.WriteLine ("INstall:" + syntaxModeCodon.MimeTypes);
-					Mono.TextEditor.Highlighting.SyntaxModeService.InstallSyntaxMode (syntaxModeCodon.MimeTypes, new SyntaxModeProvider (d => {
-						var result = syntaxModeCodon.SyntaxMode;
-						result.Document = d;
-						return result;
-					}));
-					break;
-				}
-			});
-		}
-		
-		public static void EnsureLoad ()
-		{
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/AsmLineMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/AsmLineMarker.cs
new file mode 100644
index 0000000000..cd743619e6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/AsmLineMarker.cs
@@ -0,0 +1,48 @@
+//
+// AsmLineMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using Mono.TextEditor;
+using MonoDevelop.SourceEditor.Wrappers;
+using Mono.TextEditor.Highlighting;
+
+namespace MonoDevelop.SourceEditor
+{
+	class AsmLineMarker: TextLineMarker, MonoDevelop.Ide.Editor.ITextLineMarker
+	{
+		public override ChunkStyle GetStyle (ChunkStyle baseStyle)
+		{
+			var st = new ChunkStyle (baseStyle);
+			st.Foreground = new Cairo.Color (125, 125, 125);
+			return st;
+		}
+
+		MonoDevelop.Ide.Editor.IDocumentLine MonoDevelop.Ide.Editor.ITextLineMarker.Line {
+			get {
+				return new DocumentLineWrapper (LineSegment);
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs
new file mode 100644
index 0000000000..5fdd3251bc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs
@@ -0,0 +1,273 @@
+// DebugTextMarker.cs
+//
+// Authors: Lluis Sanchez Gual <lluis@novell.com>
+//          Jeffrey Stedfast <jeff@xamarin.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+using System;
+using System.Linq;
+using Mono.TextEditor;
+using Mono.TextEditor.Highlighting;
+using MonoDevelop.SourceEditor.Wrappers;
+using MonoDevelop.Components;
+using MonoDevelop.Debugger;
+using MonoDevelop.Ide.Editor;
+using Xwt.Drawing;
+using System.Collections.Generic;
+
+namespace MonoDevelop.SourceEditor
+{
+	class DebugIconMarker : MarginMarker
+	{
+		Image DebugIcon { get; }
+
+		public DebugIconMarker (Image debugIcon)
+		{
+			DebugIcon = debugIcon;
+		}
+
+		public override bool CanDrawForeground (Margin margin)
+		{
+			return margin is IconMargin;
+		}
+
+		public override void DrawForeground (MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		{
+			double size = metrics.Margin.Width;
+			double borderLineWidth = cr.LineWidth;
+
+			double x = Math.Floor (metrics.Margin.XOffset - borderLineWidth / 2);
+			double y = Math.Floor (metrics.Y + (metrics.Height - size) / 2);
+
+			var deltaX = size / 2 - DebugIcon.Width / 2 + 0.5f;
+			var deltaY = size / 2 - DebugIcon.Height / 2 + 0.5f;
+
+			cr.DrawImage (editor, DebugIcon, Math.Round (x + deltaX), Math.Round (y + deltaY));
+		}
+	}
+
+	class DebugTextMarker : TextSegmentMarker, IChunkMarker
+	{
+		readonly Func<MonoTextEditor, AmbientColor> background;
+		readonly Func<MonoTextEditor, ChunkStyle> forground;
+		MonoTextEditor editor;
+
+		public DebugTextMarker (int offset, int length, Func<MonoTextEditor, AmbientColor> background, Func<MonoTextEditor, ChunkStyle> forground = null)
+			: base (offset, length)
+		{
+			this.forground = forground;
+			this.background = background;
+		}
+
+		public override void DrawBackground (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			this.editor = editor;
+			int markerStart = base.Offset;
+			int markerEnd = base.EndOffset;
+
+			if (markerEnd < startOffset || markerStart > endOffset)
+				return;
+
+			double @from;
+			double to;
+			var startXPos = metrics.TextRenderStartPosition;
+			var endXPos = metrics.TextRenderEndPosition;
+			var y = metrics.LineYRenderStartPosition;
+			if (markerStart < startOffset && endOffset < markerEnd) {
+				@from = startXPos;
+				to = endXPos;
+			} else {
+				int start = startOffset < markerStart ? markerStart : startOffset;
+				int end = endOffset < markerEnd ? endOffset : markerEnd;
+
+				uint curIndex = 0, byteIndex = 0;
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(start - startOffset), ref curIndex, ref byteIndex);
+
+				int x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				@from = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(end - startOffset), ref curIndex, ref byteIndex);
+				x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				to = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+			}
+
+			@from = Math.Max (@from, editor.TextViewMargin.XOffset);
+			to = Math.Max (to, editor.TextViewMargin.XOffset);
+			if (@from < to) {
+				cr.SetSourceColor (background(editor).Color);
+				cr.RoundedRectangle (@from + 2.5, y + 0.5, to - @from, editor.LineHeight - 1, 2); // 2.5 to make space for the column guideline
+
+				if (background(editor).HasBorderColor) {
+					cr.FillPreserve ();
+
+					cr.SetSourceColor (background(editor).BorderColor);
+					cr.Stroke ();
+				} else {
+					cr.Fill ();
+				}
+			}
+		}
+
+		public override ChunkStyle GetStyle (ChunkStyle baseStyle)
+		{
+			if (baseStyle == null)
+				return null;
+
+			var style = new ChunkStyle (baseStyle);
+			if (forground != null && editor != null) {
+				style.Foreground = forground(editor).Foreground;
+			}
+			return style;
+		}
+
+		#region IChunkMarker implementation
+
+		void IChunkMarker.TransformChunks (List<Chunk> chunks)
+		{
+			if (forground == null) {
+				return;
+			}
+			int markerStart = Segment.Offset;
+			int markerEnd = Segment.EndOffset;
+			for (int i = 0; i < chunks.Count; i++) {
+				var chunk = chunks [i];
+				if (chunk.EndOffset < markerStart || markerEnd <= chunk.Offset) 
+					continue;
+				if (chunk.Offset == markerStart && chunk.EndOffset == markerEnd)
+					return;
+				if (chunk.Offset < markerStart && chunk.EndOffset > markerEnd) {
+					var newChunk = new Chunk (chunk.Offset, markerStart - chunk.Offset, chunk.Style);
+					chunks.Insert (i, newChunk);
+					chunk.Offset += newChunk.Length;
+					chunk.Length -= newChunk.Length;
+					continue;
+				}
+			}
+		}
+
+		void IChunkMarker.ChangeForeColor (MonoTextEditor editor, Chunk chunk, ref Cairo.Color color)
+		{
+			if (forground == null || editor == null) {
+				return;
+			}
+			int markerStart = Segment.Offset;
+			int markerEnd = Segment.EndOffset;
+			if (chunk.EndOffset <= markerStart || markerEnd <= chunk.Offset) 
+				return;
+			color = forground(editor).Foreground;
+		}
+
+		#endregion
+	}
+
+	abstract class DebugMarkerPair
+	{
+		public DebugIconMarker IconMarker { get; protected set; }
+		public DebugTextMarker TextMarker { get; protected set; }
+		private TextDocument document;
+
+		internal void AddTo (TextDocument document, DocumentLine line)
+		{
+			this.document = document;
+			document.AddMarker (line, IconMarker);
+			document.AddMarker (TextMarker);
+		}
+
+		internal void Remove ()
+		{
+			if (document != null) {
+				document.RemoveMarker (IconMarker);
+				document.RemoveMarker (TextMarker);
+			}
+		}
+	}
+
+	class BreakpointTextMarker : DebugMarkerPair
+	{
+		static readonly Image breakpoint = Image.FromResource (typeof (BreakpointPad), "gutter-breakpoint-15.png");
+		static readonly Image tracepoint = Image.FromResource (typeof (BreakpointPad), "gutter-tracepoint-15.png");
+
+		public BreakpointTextMarker (MonoTextEditor editor, int offset, int length, bool isTracepoint)
+		{
+			IconMarker = new DebugIconMarker (isTracepoint ? tracepoint : breakpoint);
+			TextMarker = new DebugTextMarker (offset, length, e => e.ColorStyle.BreakpointMarker, e => e.ColorStyle.BreakpointText);
+		}
+	}
+
+	class DisabledBreakpointTextMarker : DebugMarkerPair
+	{
+		static readonly Image breakpoint = Image.FromResource (typeof (BreakpointPad), "gutter-breakpoint-disabled-15.png");
+		static readonly Image tracepoint = Image.FromResource (typeof (BreakpointPad), "gutter-tracepoint-disabled-15.png");
+
+		public DisabledBreakpointTextMarker (MonoTextEditor editor, int offset, int length, bool isTracepoint)
+		{
+			IconMarker = new DebugIconMarker (isTracepoint ? tracepoint : breakpoint);
+			TextMarker = new DebugTextMarker (offset, length, e => e.ColorStyle.BreakpointMarkerDisabled);
+		}
+	}
+
+	class InvalidBreakpointTextMarker : DebugMarkerPair
+	{
+		static readonly Image breakpoint = Image.FromResource (typeof (BreakpointPad), "gutter-breakpoint-invalid-15.png");
+		static readonly Image tracepoint = Image.FromResource (typeof (BreakpointPad), "gutter-tracepoint-invalid-15.png");
+
+		public InvalidBreakpointTextMarker (MonoTextEditor editor, int offset, int length, bool isTracepoint)
+		{
+			IconMarker = new DebugIconMarker (isTracepoint ? tracepoint : breakpoint);
+			TextMarker = new DebugTextMarker (offset, length, e => e.ColorStyle.BreakpointMarkerInvalid);
+		}
+	}
+
+	class DebugStackLineTextMarker : DebugMarkerPair
+	{
+		static readonly Image stackLine = Image.FromResource (typeof (BreakpointPad), "gutter-stack-15.png");
+
+		public DebugStackLineTextMarker (MonoTextEditor editor, int offset, int length)
+		{
+			IconMarker = new DebugIconMarker (stackLine);
+			TextMarker = new DebugTextMarker (offset, length, e => e.ColorStyle.DebuggerStackLineMarker, e => e.ColorStyle.DebuggerStackLine);
+		}
+	}
+
+	class CurrentDebugLineTextMarker : DebugMarkerPair, ICurrentDebugLineTextMarker
+	{
+		static readonly Image currentLine = Image.FromResource (typeof (BreakpointPad), "gutter-execution-15.png");
+
+		public CurrentDebugLineTextMarker (MonoTextEditor editor, int offset, int length)
+		{
+			IconMarker = new DebugIconMarker (currentLine);
+			TextMarker = new DebugTextMarker (offset, length, e => e.ColorStyle.DebuggerCurrentLineMarker, e => e.ColorStyle.DebuggerCurrentLine);
+		}
+
+		public bool IsVisible { get { return IconMarker.IsVisible; } set { IconMarker.IsVisible = value; } }
+
+		IDocumentLine ITextLineMarker.Line { get { return new DocumentLineWrapper (IconMarker.LineSegment); } }
+
+		public object Tag { get { return IconMarker.Tag; } set { IconMarker.Tag = value; } }
+	}
+
+}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/ErrorMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/ErrorMarker.cs
new file mode 100644
index 0000000000..19067b2026
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/ErrorMarker.cs
@@ -0,0 +1,81 @@
+//
+// ErrorMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.SourceEditor
+{
+	class ErrorMarker : UnderlineTextSegmentMarker, IErrorMarker
+	{
+		readonly static Cairo.Color defaultColor = new Cairo.Color(0, 0, 0);
+
+		readonly Error info;
+
+		public ErrorMarker (Error info, int offset, int length) : base (defaultColor, new TextSegment (offset, length))
+		{
+			this.info = info;
+			this.Wave = true;
+		}
+
+		public override void Draw (Mono.TextEditor.MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			Color = info.ErrorType == ErrorType.Warning ? editor.ColorStyle.UnderlineWarning.Color : editor.ColorStyle.UnderlineError.Color;
+			base.Draw (editor, cr, metrics, startOffset, endOffset);
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MousePressed {
+			add {
+				throw new NotImplementedException ();
+			}
+			remove {
+				throw new NotImplementedException ();
+			}
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MouseHover {
+			add {
+				throw new NotImplementedException ();
+			}
+			remove {
+				throw new NotImplementedException ();
+			}
+		}
+
+		object ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+
+		public Error Error {
+			get {
+				return info;
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/GrayOutMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/GrayOutMarker.cs
new file mode 100644
index 0000000000..4e5dcd4d56
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/GrayOutMarker.cs
@@ -0,0 +1,123 @@
+//
+// GrayOutMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Mono.TextEditor;
+using System.Collections.Generic;
+using MonoDevelop.Components;
+
+namespace MonoDevelop.SourceEditor
+{
+	class GrayOutMarker : UnderlineTextSegmentMarker, IChunkMarker, MonoDevelop.Ide.Editor.IGenericTextSegmentMarker
+	{
+		public GrayOutMarker (TextSegment segment) : base ("", segment)
+		{
+		}
+
+		public override void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			// nothing (is drawn using chunk marker)
+		}
+
+		#region IChunkMarker implementation
+
+		void IChunkMarker.TransformChunks (List<Chunk> chunks)
+		{
+			int markerStart = Segment.Offset;
+			int markerEnd = Segment.EndOffset;
+			for (int i = 0; i < chunks.Count; i++) {
+				var chunk = chunks [i];
+				if (chunk.EndOffset < markerStart || markerEnd <= chunk.Offset) 
+					continue;
+				if (chunk.Offset == markerStart && chunk.EndOffset == markerEnd)
+					return;
+				if (chunk.Offset < markerStart && chunk.EndOffset > markerEnd) {
+					var newChunk = new Chunk (chunk.Offset, markerStart - chunk.Offset, chunk.Style);
+					chunks.Insert (i, newChunk);
+					chunk.Offset += newChunk.Length;
+					chunk.Length -= newChunk.Length;
+					continue;
+				}
+			}
+		}
+
+		void IChunkMarker.ChangeForeColor (MonoTextEditor editor, Chunk chunk, ref Cairo.Color color)
+		{
+			if (Debugger.DebuggingService.IsDebugging)
+				return;
+			int markerStart = Segment.Offset;
+			int markerEnd = Segment.EndOffset;
+			if (chunk.EndOffset <= markerStart || markerEnd <= chunk.Offset) 
+				return;
+			var bgc = editor.ColorStyle.PlainText.Background;
+			double alpha = 0.6;
+			color = new Cairo.Color (
+				color.R * alpha + bgc.R * (1.0 - alpha),
+				color.G * alpha + bgc.G * (1.0 - alpha),
+				color.B * alpha + bgc.B * (1.0 - alpha)
+			);
+		}
+		#endregion
+
+		event EventHandler<MonoDevelop.Ide.Editor.TextMarkerMouseEventArgs> MonoDevelop.Ide.Editor.ITextSegmentMarker.MousePressed {
+			add {
+				throw new NotSupportedException ();
+			}
+			remove {
+				throw new NotSupportedException ();
+			}
+		}
+
+		event EventHandler<MonoDevelop.Ide.Editor.TextMarkerMouseEventArgs> MonoDevelop.Ide.Editor.ITextSegmentMarker.MouseHover {
+			add {
+				throw new NotSupportedException ();
+			}
+			remove {
+				throw new NotSupportedException ();
+			}
+		}
+
+		object MonoDevelop.Ide.Editor.ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+
+		MonoDevelop.Ide.Editor.TextSegmentMarkerEffect MonoDevelop.Ide.Editor.IGenericTextSegmentMarker.Effect {
+			get {
+				return MonoDevelop.Ide.Editor.TextSegmentMarkerEffect.GrayOut;
+			}
+		}
+
+		HslColor MonoDevelop.Ide.Editor.IGenericTextSegmentMarker.Color {
+			get {
+				throw new NotSupportedException ();
+			}
+			set {
+				throw new NotSupportedException ();
+			}
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs
new file mode 100644
index 0000000000..c884720dd2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/LinkMarker.cs
@@ -0,0 +1,130 @@
+//
+// LinkMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide.Editor;
+using Mono.TextEditor;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.SourceEditor
+{
+	class LinkMarker : UnderlineTextSegmentMarker, ILinkTextMarker, IActionTextLineMarker
+	{
+		static readonly Gdk.Cursor textLinkCursor = new Gdk.Cursor (Gdk.CursorType.Hand1);
+
+		Action<LinkRequest> activateLink;
+
+		public bool OnlyShowLinkOnHover {
+			get;
+			set;
+		}
+
+
+		public LinkMarker (int offset, int length, Action<LinkRequest> activateLink) : base (DefaultSourceEditorOptions.Instance.GetColorStyle ().LinkColor.Color, new TextSegment (offset, length))
+		{
+			this.activateLink = activateLink;
+			this.Wave = false;
+		}
+
+		public event EventHandler<TextMarkerMouseEventArgs> MousePressed;
+		public event EventHandler<TextMarkerMouseEventArgs> MouseHover;
+
+		object ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+
+		bool IActionTextLineMarker.MousePressed (MonoTextEditor editor, MarginMouseEventArgs args)
+		{
+			MousePressed?.Invoke (this, new TextEventArgsWrapper (args));
+			return false;
+		}
+
+		bool IActionTextLineMarker.MouseReleased (MonoTextEditor editor, MarginMouseEventArgs args)
+		{
+			if ((Platform.IsMac && (args.ModifierState & Gdk.ModifierType.Mod2Mask) == Gdk.ModifierType.Mod2Mask) ||
+			    (!Platform.IsMac && (args.ModifierState & Gdk.ModifierType.ControlMask) == Gdk.ModifierType.ControlMask))
+				activateLink?.Invoke (LinkRequest.RequestNewView);
+			else
+				activateLink?.Invoke (LinkRequest.SameView);
+			
+			return false;
+		}
+
+
+		void IActionTextLineMarker.MouseHover (MonoTextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result)
+		{
+			MouseHover?.Invoke (this, new TextEventArgsWrapper (args));
+			result.Cursor = textLinkCursor;
+			if (OnlyShowLinkOnHover) {
+				editor.GetTextEditorData ().Document.CommitLineUpdate (args.LineSegment);
+				editor.TextViewMargin.HoveredLineChanged += new UpdateOldLine (editor, args.LineSegment).TextViewMargin_HoveredLineChanged;
+			}
+		}
+
+		class UpdateOldLine
+		{
+			MonoTextEditor editor;
+			DocumentLine lineSegment;
+
+			public UpdateOldLine (MonoTextEditor editor, DocumentLine lineSegment)
+			{
+				this.editor = editor;
+				this.lineSegment = lineSegment;
+			}
+
+			public void TextViewMargin_HoveredLineChanged (object sender, Mono.TextEditor.LineEventArgs e)
+			{
+				editor.GetTextEditorData ().Document.CommitLineUpdate (lineSegment);
+				editor.TextViewMargin.HoveredLineChanged -= TextViewMargin_HoveredLineChanged;
+			}
+		}
+
+		public override void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			if (OnlyShowLinkOnHover) {
+					if (editor.TextViewMargin.MarginCursor != textLinkCursor)
+					return;
+				if (editor.TextViewMargin.HoveredLine == null)
+					return;
+				var hoverOffset = editor.LocationToOffset (editor.TextViewMargin.HoveredLocation);
+				if (!Segment.Contains (hoverOffset)) 
+					return; 
+			}
+			this.Color = editor.ColorStyle.LinkColor.Color;
+
+			if (!OnlyShowLinkOnHover) {
+				if (editor.TextViewMargin.MarginCursor == textLinkCursor && editor.TextViewMargin.HoveredLine != null) {
+					var hoverOffset = editor.LocationToOffset (editor.TextViewMargin.HoveredLocation);
+					if (Segment.Contains (hoverOffset))
+						this.Color = editor.ColorStyle.ActiveLinkColor.Color;
+				}
+			}
+
+			base.Draw (editor, cr, metrics, startOffset, endOffset);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs
new file mode 100644
index 0000000000..c9711c7948
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs
@@ -0,0 +1,162 @@
+//
+// SmartTagMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.SourceEditor
+{
+	class SmartTagMarker : TextSegmentMarker, IActionTextLineMarker, ISmartTagMarker
+	{
+		const double tagMarkerWidth = 8;
+		const double tagMarkerHeight = 2;
+		MonoDevelop.Ide.Editor.DocumentLocation loc;
+		Mono.TextEditor.MonoTextEditor editor;
+
+		public SmartTagMarker (int offset, MonoDevelop.Ide.Editor.DocumentLocation realLocation) : base (offset, 0)
+		{
+			this.loc = realLocation;
+		}
+
+		public override void Draw (Mono.TextEditor.MonoTextEditor editor, Cairo.Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			this.editor = editor;
+			var line = editor.GetLine (loc.Line);
+			if (line == null)
+				return;
+			var x = editor.ColumnToX (line, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.XOffset + editor.TextViewMargin.TextStartPosition;
+
+			cr.Rectangle (Math.Floor (x), Math.Floor (metrics.LineYRenderStartPosition) + (line == editor.GetLineByOffset (startOffset) ? editor.LineHeight - tagMarkerHeight : 0), tagMarkerWidth, tagMarkerHeight);
+			cr.SetSourceColor ((HslColor.Brightness (editor.ColorStyle.PlainText.Background) < 0.5 ? Ide.Gui.Styles.Editor.SmartTagMarkerColorDark : Ide.Gui.Styles.Editor.SmartTagMarkerColorLight).ToCairoColor ());
+			cr.Fill ();
+		}
+
+		#region IActionTextLineMarker implementation
+
+		bool IActionTextLineMarker.MousePressed (Mono.TextEditor.MonoTextEditor editor, MarginMouseEventArgs args)
+		{
+			var handler = MousePressed;
+			if (handler != null)
+				handler (this, new TextEventArgsWrapper (args));
+			return false;
+		}
+
+		bool IActionTextLineMarker.MouseReleased (MonoTextEditor editor, MarginMouseEventArgs args)
+		{
+			return false;
+		}
+
+
+		void IActionTextLineMarker.MouseHover (Mono.TextEditor.MonoTextEditor editor, MarginMouseEventArgs args, TextLineMarkerHoverResult result)
+		{
+			if (args.Button != 0)
+				return;
+			var line = editor.GetLine (loc.Line);
+			if (line == null)
+				return;
+			var x = editor.ColumnToX (line, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.TextStartPosition;
+			//var y = editor.LineToY (line.LineNumber + 1) - editor.VAdjustment.Value;
+			const double xAdditionalSpace = tagMarkerWidth;
+			if (args.X - x >= -xAdditionalSpace * editor.Options.Zoom && 
+				args.X - x < (tagMarkerWidth + xAdditionalSpace) * editor.Options.Zoom /*&& 
+				    args.Y - y < (editor.LineHeight / 2) * editor.Options.Zoom*/) {
+				result.Cursor = null;
+				ShowPopup?.Invoke (null, null);
+			} else {
+				CancelPopup?.Invoke (null, null);
+			}
+		}
+
+
+		#endregion
+
+		bool ISmartTagMarker.IsInsideSmartTag (double x, double y)
+		{
+			if (editor == null)
+				return false;
+			var lin2 = editor.GetLine (loc.Line);
+			var x2 = editor.ColumnToX (lin2, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.TextStartPosition;
+			var y2 = editor.LineToY (loc.Line + 1) - editor.VAdjustment.Value;
+			return x - x2 >= 0 * editor.Options.Zoom && 
+				x - x2 < tagMarkerWidth * editor.Options.Zoom && 
+				y - y2 < (editor.LineHeight / 2) * editor.Options.Zoom;
+		}
+
+		public event EventHandler<TextMarkerMouseEventArgs> MousePressed;
+		#pragma warning disable 0067
+		public event EventHandler<TextMarkerMouseEventArgs> MouseHover;
+		#pragma warning restore 0067
+		public event EventHandler ShowPopup;
+		public event EventHandler CancelPopup;
+
+		object ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+	}
+
+	class TextEventArgsWrapper : TextMarkerMouseEventArgs
+	{
+		readonly MarginMouseEventArgs args;
+
+		public override double X {
+			get {
+				return args.X;
+			}
+		}
+
+		public override double Y {
+			get {
+				return args.Y;
+			}
+		}
+
+		public override object OverwriteCursor {
+			get;
+			set;
+		}
+
+		public override string TooltipMarkup {
+			get;
+			set;
+		}
+
+		public TextEventArgsWrapper (MarginMouseEventArgs args)
+		{
+			if (args == null)
+				throw new ArgumentNullException ("args");
+			this.args = args;
+		}
+
+		public override bool TriggersContextMenu ()
+		{
+			return args.TriggersContextMenu ();
+		}
+	}
+
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UnitTestMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UnitTestMarker.cs
new file mode 100644
index 0000000000..7eb72901ff
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UnitTestMarker.cs
@@ -0,0 +1,136 @@
+using System;
+using MonoDevelop.Ide.Editor;
+using Mono.TextEditor;
+using MonoDevelop.Core;
+using MonoDevelop.Components;
+using MonoDevelop.SourceEditor.Wrappers;
+
+namespace MonoDevelop.SourceEditor
+{
+	class UnitTestMarker : MarginMarker, IUnitTestMarker
+	{
+		IDocumentLine ITextLineMarker.Line {
+			get {
+				return new DocumentLineWrapper (LineSegment);
+			}
+		}
+
+		readonly UnitTestMarkerHost host;
+		readonly UnitTestLocation unitTest;
+		readonly ExtensibleTextEditor textEditor;
+
+		UnitTestLocation IUnitTestMarker.UnitTest {
+			get {
+				return unitTest;
+			}
+		}
+
+		void IUnitTestMarker.UpdateState ()
+		{
+			var line = LineSegment;
+			if (line == null)
+				return;
+			textEditor.RedrawMarginLine (textEditor.ActionMargin, line.LineNumber); 
+		}
+
+		public UnitTestMarker (ExtensibleTextEditor textEditor, UnitTestMarkerHost host, UnitTestLocation unitTest)
+		{
+			if (textEditor == null)
+				throw new ArgumentNullException ("textEditor");
+			if (host == null)
+				throw new ArgumentNullException ("host");
+			this.textEditor = textEditor;
+			this.host = host;
+			this.unitTest = unitTest;
+		}
+
+		public override bool CanDrawForeground (Margin margin)
+		{
+			return margin is ActionMargin;
+		}
+
+		public override void InformMouseHover (Mono.TextEditor.MonoTextEditor editor, Margin margin, MarginMouseEventArgs args)
+		{
+			if (!(margin is ActionMargin))
+				return;
+			string toolTip;
+			if (unitTest.IsFixture) {
+				if (isFailed) {
+					toolTip = GettextCatalog.GetString ("NUnit Fixture failed (click to run)");
+					if (!string.IsNullOrEmpty (failMessage))
+						toolTip += Environment.NewLine + failMessage.TrimEnd ();
+				} else {
+					toolTip = GettextCatalog.GetString ("NUnit Fixture (click to run)");
+				}
+			} else {
+				if (isFailed) {
+					toolTip = GettextCatalog.GetString ("NUnit Test failed (click to run)");
+					if (!string.IsNullOrEmpty (failMessage))
+						toolTip += Environment.NewLine + failMessage.TrimEnd ();
+					foreach (var id in unitTest.TestCases) {
+						if (host.IsFailure (unitTest.UnitTestIdentifier, id)) {
+							var msg = host.GetMessage (unitTest.UnitTestIdentifier, id);
+							if (!string.IsNullOrEmpty (msg)) {
+								toolTip += Environment.NewLine + "Test" + id + ":";
+								toolTip += Environment.NewLine + msg.TrimEnd ();
+							}
+						}
+					}
+				} else {
+					toolTip = GettextCatalog.GetString ("NUnit Test (click to run)");
+				}
+
+			}
+			editor.TooltipText = toolTip;
+		}
+
+//		static Menu menu;
+
+		public override void InformMousePress (Mono.TextEditor.MonoTextEditor editor, Margin margin, MarginMouseEventArgs args)
+		{
+			if (!(margin is ActionMargin))
+				return;
+			host.PopupContextMenu (unitTest, (int)(args.X + margin.XOffset), (int)args.Y);
+			editor.TextArea.ResetMouseState (); 
+		}
+
+		bool isFailed;
+		string failMessage;
+
+		public override void DrawForeground (Mono.TextEditor.MonoTextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
+		{
+			isFailed = false;
+			bool searchCases = false;
+
+			Xwt.Drawing.Image icon = host.GetStatusIcon (unitTest.UnitTestIdentifier);
+			if (icon != null) {
+				if (host.HasResult (unitTest.UnitTestIdentifier)) {
+					searchCases = true;
+				} else if (host.IsFailure (unitTest.UnitTestIdentifier)) {
+					failMessage = host.GetMessage (unitTest.UnitTestIdentifier);
+					isFailed = true;
+				}
+			} else {
+				searchCases = true;
+			}
+
+			if (searchCases) {
+				foreach (var caseId in unitTest.TestCases) {
+					icon = host.GetStatusIcon (unitTest.UnitTestIdentifier, caseId);
+					if (host.IsFailure (unitTest.UnitTestIdentifier, caseId)) {
+						failMessage = host.GetMessage (unitTest.UnitTestIdentifier, caseId);
+						isFailed = true;
+						break;
+					} 
+				}
+			}
+
+			if (icon != null) {
+				if (icon.Width > metrics.Width || icon.Height > metrics.Height)
+					icon = icon.WithBoxSize (metrics.Width, metrics.Height);
+				cr.DrawImage (editor, icon, Math.Truncate (metrics.X + metrics.Width / 2 - icon.Width / 2), Math.Truncate (metrics.Y + metrics.Height / 2 - icon.Height / 2));
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UrlTextLineMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UrlTextLineMarker.cs
new file mode 100644
index 0000000000..00e8ccfed0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UrlTextLineMarker.cs
@@ -0,0 +1,56 @@
+//
+// UrlTextLineMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+
+namespace MonoDevelop.SourceEditor
+{
+	class UrlTextLineMarker : UrlMarker, IUrlTextLineMarker
+    {
+		readonly IDocumentLine line;
+
+		public UrlTextLineMarker (TextDocument doc, IDocumentLine line, string url, Mono.TextEditor.UrlType urlType, string style, int startColumn, int endColumn) : base (doc, doc.GetLine (line.LineNumber), url, urlType, style, startColumn, endColumn)
+		{
+			if (doc == null)
+				throw new ArgumentNullException ("doc");
+			this.line = line;
+		}
+		
+		MonoDevelop.Ide.Editor.UrlType IUrlTextLineMarker.UrlType {
+			get {
+				return (MonoDevelop.Ide.Editor.UrlType)UrlType;
+			}
+		}
+
+		IDocumentLine ITextLineMarker.Line {
+			get {
+				return line;
+			}
+		}
+    }
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs
new file mode 100644
index 0000000000..234ac4d6d4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs
@@ -0,0 +1,104 @@
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.FindInFiles;
+using Cairo;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.SourceEditor
+{
+	class UsageSegmentMarker : TextSegmentMarker, ITextSegmentMarker
+	{
+		readonly Usage usage;
+
+		public Usage Usage {
+			get {
+				return usage;
+			}
+		}
+
+		public UsageSegmentMarker (Usage usage) : base (usage.Offset, usage.Length)
+		{
+			this.usage = usage;
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MousePressed {
+			add {
+			}
+			remove {
+			}
+		}
+
+		event EventHandler<TextMarkerMouseEventArgs> ITextSegmentMarker.MouseHover {
+			add {
+			}
+			remove {
+			}
+		}
+
+		object ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+
+		public override void DrawBackground (Mono.TextEditor.MonoTextEditor editor, Context cr, LineMetrics metrics, int startOffset, int endOffset)
+		{
+			int markerStart = usage.Offset;
+			int markerEnd = usage.EndOffset;
+
+			if (markerEnd < startOffset || markerStart > endOffset) 
+				return; 
+
+			double @from;
+			double to;
+			var startXPos = metrics.TextRenderStartPosition;
+			var endXPos = metrics.TextRenderEndPosition;
+			var y = metrics.LineYRenderStartPosition;
+			if (markerStart < startOffset && endOffset < markerEnd) {
+				@from = startXPos;
+				to = endXPos;
+			} else {
+				int start = startOffset < markerStart ? markerStart : startOffset;
+				int end = endOffset < markerEnd ? endOffset : markerEnd;
+
+				uint curIndex = 0, byteIndex = 0;
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(start - startOffset), ref curIndex, ref byteIndex);
+
+				int x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				@from = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+
+				TextViewMargin.TranslateToUTF8Index (metrics.Layout.LineChars, (uint)(end - startOffset), ref curIndex, ref byteIndex);
+				x_pos = metrics.Layout.Layout.IndexToPos ((int)byteIndex).X;
+
+				to = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+			}
+
+			@from = Math.Max (@from, editor.TextViewMargin.XOffset);
+			to = Math.Max (to, editor.TextViewMargin.XOffset);
+			if (@from < to) {
+				Mono.TextEditor.Highlighting.AmbientColor colorStyle;
+				if ((usage.UsageType & ReferenceUsageType.Write) == ReferenceUsageType.Write ||
+					(usage.UsageType & ReferenceUsageType.Declariton) == ReferenceUsageType.Declariton) {
+					colorStyle = editor.ColorStyle.ChangingUsagesRectangle;
+					if (colorStyle.Color.A == 0.0)
+						colorStyle = editor.ColorStyle.UsagesRectangle;
+				} else {
+					colorStyle = editor.ColorStyle.UsagesRectangle;
+				}
+
+				using (var lg = new LinearGradient (@from + 1, y + 1.5, to , y + editor.LineHeight - 1)) {
+					lg.AddColorStop (0, colorStyle.Color);
+					lg.AddColorStop (1, colorStyle.SecondColor);
+					cr.SetSource (lg);
+					cr.RoundedRectangle (@from - 0.5, y + 0.5, to - @from + 1, editor.LineHeight - 1, 2);
+					cr.FillPreserve ();
+				}
+
+				cr.SetSourceColor (colorStyle.BorderColor);
+				cr.Stroke ();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/WavedLineMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/WavedLineMarker.cs
new file mode 100644
index 0000000000..7953dac2b5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/WavedLineMarker.cs
@@ -0,0 +1,135 @@
+//
+// WavedLineMarker.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.TextEditor;
+using MonoDevelop.Components;
+using MonoDevelop.Debugger;
+using Pango;
+
+namespace MonoDevelop.SourceEditor
+{
+	class GenericUnderlineMarker : UnderlineTextSegmentMarker, MonoDevelop.Ide.Editor.IGenericTextSegmentMarker
+	{
+		HslColor color;
+
+		HslColor MonoDevelop.Ide.Editor.IGenericTextSegmentMarker.Color {
+			get {
+				return color;
+			}
+			set {
+				color = value;
+			}
+		}
+
+		public GenericUnderlineMarker (TextSegment segment, MonoDevelop.Ide.Editor.TextSegmentMarkerEffect effect) : base ("", segment)
+		{
+			this.effect = effect;
+		}
+
+		public override void Draw (MonoTextEditor editor, Cairo.Context cr, LineMetrics layout, int startOffset, int endOffset)
+		{
+			if (DebuggingService.IsDebugging)
+				return;
+			int markerStart = Segment.Offset;
+			int markerEnd = Segment.EndOffset;
+			if (markerEnd < startOffset || markerStart > endOffset) 
+				return;
+			
+			double drawFrom;
+			double drawTo;
+			double y = layout.LineYRenderStartPosition;
+			double startXPos = layout.TextRenderStartPosition;
+			double endXPos = layout.TextRenderEndPosition;
+
+			if (markerStart < startOffset && endOffset < markerEnd) {
+				drawTo = endXPos;
+				var line = editor.GetLineByOffset (startOffset);
+				int offset = line.GetIndentation (editor.Document).Length;
+				drawFrom = startXPos + (layout.Layout.Layout.IndexToPos (offset).X  / Pango.Scale.PangoScale);
+			} else {
+				int start;
+				if (startOffset < markerStart) {
+					start = markerStart;
+				} else {
+					var line = editor.GetLineByOffset (startOffset);
+					int offset = line.GetIndentation (editor.Document).Length;
+					start = startOffset + offset;
+				}
+				int end = endOffset < markerEnd ? endOffset : markerEnd;
+				int x_pos;
+
+				x_pos = layout.Layout.Layout.IndexToPos (start - startOffset).X;
+				drawFrom = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+				x_pos = layout.Layout.Layout.IndexToPos (end - startOffset).X;
+	
+				drawTo = startXPos + (int)(x_pos / Pango.Scale.PangoScale);
+			}
+			
+			drawFrom = Math.Max (drawFrom, editor.TextViewMargin.XOffset);
+			drawTo = Math.Max (drawTo, editor.TextViewMargin.XOffset);
+			if (drawFrom >= drawTo)
+				return;
+			
+			double height = editor.LineHeight / 5;
+			cr.SetSourceColor (color);
+			if (effect == MonoDevelop.Ide.Editor.TextSegmentMarkerEffect.WavedLine) {	
+				Pango.CairoHelper.ShowErrorUnderline (cr, drawFrom, y + editor.LineHeight - height, drawTo - drawFrom, height);
+			} else if (effect == MonoDevelop.Ide.Editor.TextSegmentMarkerEffect.DottedLine) {
+				cr.Save ();
+				cr.LineWidth = 1;
+				cr.MoveTo (drawFrom + 1, y + editor.LineHeight - 1 + 0.5);
+				cr.RelLineTo (Math.Min (drawTo - drawFrom, 4 * 3), 0);
+				cr.SetDash (new double[] { 2, 2 }, 0);
+				cr.Stroke ();
+				cr.Restore ();
+			} else {
+				cr.MoveTo (drawFrom, y + editor.LineHeight - 1);
+				cr.LineTo (drawTo, y + editor.LineHeight - 1);
+				cr.Stroke ();
+			}
+		}
+
+		#pragma warning disable 0067
+		public event EventHandler<MonoDevelop.Ide.Editor.TextMarkerMouseEventArgs> MousePressed;
+
+		public event EventHandler<MonoDevelop.Ide.Editor.TextMarkerMouseEventArgs> MouseHover;
+		#pragma warning restore 0067
+
+		object MonoDevelop.Ide.Editor.ITextSegmentMarker.Tag {
+			get;
+			set;
+		}
+
+		MonoDevelop.Ide.Editor.TextSegmentMarkerEffect effect;
+		MonoDevelop.Ide.Editor.TextSegmentMarkerEffect MonoDevelop.Ide.Editor.IGenericTextSegmentMarker.Effect {
+			get {
+				return effect;
+			}
+		}
+
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.png b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.png
deleted file mode 100644
index 0be6338cb3..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.svg b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.svg
deleted file mode 100644
index 209df7dfd1..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.svg
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   x="0"
-   y="0"
-   width="60"
-   height="60"
-   id="svg1"
-   sodipodi:version="0.32"
-   inkscape:version="0.47pre4 r22446"
-   sodipodi:docname="stock_search.svg"
-   inkscape:export-filename="/home/mkrueger/Desktop/search.png"
-   inkscape:export-xdpi="30.584652"
-   inkscape:export-ydpi="30.584652">
-  <metadata
-     id="metadata22">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.020833"
-     inkscape:cx="30.556057"
-     inkscape:cy="28.957974"
-     inkscape:window-width="1920"
-     inkscape:window-height="1150"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg1"
-     showgrid="false"
-     inkscape:window-maximized="1" />
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       id="perspective27" />
-    <linearGradient
-       id="linearGradient900">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop901" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop902" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient903"
-       xlink:href="#linearGradient900" />
-    <linearGradient
-       id="linearGradient904"
-       xlink:href="#linearGradient900" />
-    <linearGradient
-       id="linearGradient905"
-       xlink:href="#linearGradient900" />
-    <linearGradient
-       id="linearGradient906"
-       xlink:href="#linearGradient900" />
-    <linearGradient
-       id="linearGradient907"
-       xlink:href="#linearGradient900" />
-    <linearGradient
-       id="linearGradient1163"
-       xlink:href="#linearGradient1160" />
-    <linearGradient
-       id="linearGradient1160">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop1161" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop1162" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective2825"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <path
-     id="path1187"
-     style="font-size:12px;fill:#ececec;fill-rule:evenodd;stroke:#666666;stroke-width:2.69768906000000008;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     d="M 22.02672,24.498927 C 33.829117,39.594897 40.992998,49.676163 41.774708,46.334461 44.926753,45.774828 36.273157,36.703552 24.541555,22.750956 L 22.02672,24.498927 z"
-     sodipodi:nodetypes="cccc" />
-  <ellipse
-     d="m 47.865601,28.05961 c 0,11.379166 -9.224637,20.603802 -20.603802,20.603802 -11.379166,0 -20.6038019,-9.224636 -20.6038019,-20.603802 0,-11.379165 9.2246359,-20.6038014 20.6038019,-20.6038014 11.379165,0 20.603802,9.2246364 20.603802,20.6038014 z"
-     sodipodi:ry="20.603802"
-     sodipodi:rx="20.603802"
-     sodipodi:cy="28.05961"
-     sodipodi:cx="27.261799"
-     id="path1174"
-     style="font-size:12px;fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:#666666;stroke-width:3.12500000000000000;stroke-opacity:1"
-     transform="matrix(0.80118022,0,0,0.74680016,-3.6563689,-3.1173228)"
-     ry="20.603802"
-     rx="20.603802"
-     cy="28.05961"
-     cx="27.261799" />
-  <ellipse
-     d="m 47.865601,28.05961 c 0,11.379166 -9.224637,20.603802 -20.603802,20.603802 -11.379166,0 -20.6038019,-9.224636 -20.6038019,-20.603802 0,-11.379165 9.2246359,-20.6038014 20.6038019,-20.6038014 11.379165,0 20.603802,9.2246364 20.603802,20.6038014 z"
-     sodipodi:ry="20.603802"
-     sodipodi:rx="20.603802"
-     sodipodi:cy="28.05961"
-     sodipodi:cx="27.261799"
-     id="path1175"
-     style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#666666;stroke-width:3.70790005000000011;stroke-opacity:1"
-     transform="matrix(0.65257038,0,0,0.59740916,0.42439363,1.1215815)"
-     ry="20.603802"
-     rx="20.603802"
-     cy="28.05961"
-     cx="27.261799"
-     inkscape:export-xdpi="32"
-     inkscape:export-ydpi="32" />
-  <path
-     sodipodi:nodetypes="cccccccc"
-     id="rect812"
-     d="m 59.124514,25.370475 c -0.01119,0.592816 -0.21095,1.16795 -0.618473,1.612191 l -9.044962,9.876788 c -0.815044,0.888485 -2.089709,0.845211 -2.870461,-0.08329 l -8.2694,-9.787908 c -0.736904,-0.876357 -0.696351,-2.231158 -0.01059,-3.127324 l 20.3094,-0.06794 c 0.354504,0.454282 0.515189,1.012071 0.504518,1.577474 z"
-     style="font-size:12px;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
-     inkscape:export-xdpi="32"
-     inkscape:export-ydpi="32" />
-</svg>
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs
index 1b7c8e870b..40e716faff 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs
@@ -2,17 +2,18 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.SourceEditor
 {
-	partial class GotoLineNumberWidget
+	public partial class GotoLineNumberWidget
 	{
 		private global::Gtk.HBox hbox1;
 		private global::Gtk.Entry entryLineNumber;
 		private global::Gtk.Button buttonGoToLine;
-		private global::Gtk.EventBox eventbox2;
-		private global::Gtk.Image image2;
+		
+		private global::MonoDevelop.Components.ImageView image2;
+		
 		private global::Gtk.Button closeButton;
-		private global::Gtk.EventBox eventbox1;
-		private global::Gtk.Image image1;
 		
+		private global::MonoDevelop.Components.ImageView image1;
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -39,44 +40,32 @@ namespace MonoDevelop.SourceEditor
 			this.buttonGoToLine.Name = "buttonGoToLine";
 			this.buttonGoToLine.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonGoToLine.Gtk.Container+ContainerChild
-			this.eventbox2 = new global::Gtk.EventBox ();
-			this.eventbox2.Name = "eventbox2";
-			this.eventbox2.AboveChild = true;
-			this.eventbox2.VisibleWindow = false;
-			// Container child eventbox2.Gtk.Container+ContainerChild
-			this.image2 = new global::Gtk.Image ();
+			this.image2 = new global::MonoDevelop.Components.ImageView ();
 			this.image2.Name = "image2";
-			this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-jump-to", global::Gtk.IconSize.Menu);
-			this.eventbox2.Add (this.image2);
-			this.buttonGoToLine.Add (this.eventbox2);
-			this.buttonGoToLine.Label = null;
+			this.image2.IconId = "gtk-jump-to";
+			this.image2.IconSize = ((global::Gtk.IconSize)(1));
+			this.buttonGoToLine.Add (this.image2);
 			this.hbox1.Add (this.buttonGoToLine);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonGoToLine]));
-			w4.Position = 1;
-			w4.Expand = false;
-			w4.Fill = false;
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonGoToLine]));
+			w3.Position = 1;
+			w3.Expand = false;
+			w3.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
 			this.closeButton = new global::Gtk.Button ();
 			this.closeButton.CanFocus = true;
 			this.closeButton.Name = "closeButton";
 			this.closeButton.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child closeButton.Gtk.Container+ContainerChild
-			this.eventbox1 = new global::Gtk.EventBox ();
-			this.eventbox1.Name = "eventbox1";
-			this.eventbox1.AboveChild = true;
-			this.eventbox1.VisibleWindow = false;
-			// Container child eventbox1.Gtk.Container+ContainerChild
-			this.image1 = new global::Gtk.Image ();
+			this.image1 = new global::MonoDevelop.Components.ImageView ();
 			this.image1.Name = "image1";
-			this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-close", global::Gtk.IconSize.Menu);
-			this.eventbox1.Add (this.image1);
-			this.closeButton.Add (this.eventbox1);
-			this.closeButton.Label = null;
+			this.image1.IconId = "gtk-close";
+			this.image1.IconSize = ((global::Gtk.IconSize)(1));
+			this.closeButton.Add (this.image1);
 			this.hbox1.Add (this.closeButton);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton]));
-			w7.Position = 2;
-			w7.Expand = false;
-			w7.Fill = false;
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton]));
+			w5.Position = 2;
+			w5.Expand = false;
+			w5.Fill = false;
 			this.Add (this.hbox1);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs
index 0fab32c065..58b57721bb 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs
@@ -5,289 +5,315 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class BehaviorPanel
 	{
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.Label GtkLabel5;
+
 		private global::Gtk.Alignment alignment3;
+
 		private global::Gtk.VBox vbox4;
+
 		private global::Gtk.CheckButton autoInsertBraceCheckbutton;
+
 		private global::Gtk.HBox hbox2;
+
 		private global::Gtk.Label fixed1;
+
 		private global::Gtk.CheckButton smartSemicolonPlaceCheckbutton;
+
 		private global::Gtk.CheckButton checkbuttonOnTheFlyFormatting;
+
 		private global::Gtk.CheckButton checkbuttonFormatOnSave;
+
 		private global::Gtk.CheckButton checkbuttonAutoSetSearchPatternCasing;
+
 		private global::Gtk.CheckButton checkbuttonGenerateFormattingUndoStep;
-		private global::Gtk.Label GtkLabel6;
+
+		private global::Gtk.CheckButton checkbuttonEnableSelectionSurrounding;
+
+		private global::Gtk.Label GtkLabel7;
+
 		private global::Gtk.Alignment GtkAlignment;
+
 		private global::Gtk.VBox vbox2;
+
 		private global::Gtk.HBox hbox1;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.ComboBox indentationCombobox;
+
 		private global::Gtk.CheckButton tabAsReindentCheckbutton;
-		private global::Gtk.Label GtkLabel8;
+
+		private global::Gtk.Label GtkLabel9;
+
 		private global::Gtk.Alignment alignment4;
+
 		private global::Gtk.VBox vbox5;
-		private global::Gtk.CheckButton useViModesCheck;
+
 		private global::Gtk.HBox hbox3;
+
 		private global::Gtk.Label label2;
+
 		private global::Gtk.ComboBox controlLeftRightCombobox;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel5 = new global::Gtk.Label ();
+			this.GtkLabel5 = new global::Gtk.Label();
 			this.GtkLabel5.Name = "GtkLabel5";
 			this.GtkLabel5.Xalign = 0F;
-			this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Automatic behaviors</b>");
+			this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Automatic behaviors</b>");
 			this.GtkLabel5.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel5);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel5]));
+			this.vbox1.Add(this.GtkLabel5);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel5]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment3.Name = "alignment3";
 			this.alignment3.LeftPadding = ((uint)(12));
 			// Container child alignment3.Gtk.Container+ContainerChild
-			this.vbox4 = new global::Gtk.VBox ();
+			this.vbox4 = new global::Gtk.VBox();
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.autoInsertBraceCheckbutton = new global::Gtk.CheckButton ();
+			this.autoInsertBraceCheckbutton = new global::Gtk.CheckButton();
 			this.autoInsertBraceCheckbutton.CanFocus = true;
 			this.autoInsertBraceCheckbutton.Name = "autoInsertBraceCheckbutton";
-			this.autoInsertBraceCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Insert matching brace");
+			this.autoInsertBraceCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Insert matching brace");
 			this.autoInsertBraceCheckbutton.DrawIndicator = true;
 			this.autoInsertBraceCheckbutton.UseUnderline = true;
-			this.vbox4.Add (this.autoInsertBraceCheckbutton);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.autoInsertBraceCheckbutton]));
+			this.vbox4.Add(this.autoInsertBraceCheckbutton);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.autoInsertBraceCheckbutton]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.fixed1 = new global::Gtk.Label ();
+			this.fixed1 = new global::Gtk.Label();
 			this.fixed1.Name = "fixed1";
-			this.hbox2.Add (this.fixed1);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed1]));
+			this.hbox2.Add(this.fixed1);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1]));
 			w3.Position = 0;
 			w3.Expand = false;
 			w3.Fill = false;
 			w3.Padding = ((uint)(6));
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.smartSemicolonPlaceCheckbutton = new global::Gtk.CheckButton ();
+			this.smartSemicolonPlaceCheckbutton = new global::Gtk.CheckButton();
 			this.smartSemicolonPlaceCheckbutton.CanFocus = true;
 			this.smartSemicolonPlaceCheckbutton.Name = "smartSemicolonPlaceCheckbutton";
-			this.smartSemicolonPlaceCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Smart semicolon placement");
+			this.smartSemicolonPlaceCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Smart semicolon placement");
 			this.smartSemicolonPlaceCheckbutton.Active = true;
 			this.smartSemicolonPlaceCheckbutton.DrawIndicator = true;
 			this.smartSemicolonPlaceCheckbutton.UseUnderline = true;
-			this.hbox2.Add (this.smartSemicolonPlaceCheckbutton);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.smartSemicolonPlaceCheckbutton]));
+			this.hbox2.Add(this.smartSemicolonPlaceCheckbutton);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.smartSemicolonPlaceCheckbutton]));
 			w4.Position = 1;
-			this.vbox4.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox2]));
+			this.vbox4.Add(this.hbox2);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox2]));
 			w5.Position = 1;
 			w5.Expand = false;
 			w5.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonOnTheFlyFormatting = new global::Gtk.CheckButton ();
+			this.checkbuttonOnTheFlyFormatting = new global::Gtk.CheckButton();
 			this.checkbuttonOnTheFlyFormatting.CanFocus = true;
 			this.checkbuttonOnTheFlyFormatting.Name = "checkbuttonOnTheFlyFormatting";
-			this.checkbuttonOnTheFlyFormatting.Label = global::Mono.Unix.Catalog.GetString ("_Enable on the fly code formatting");
+			this.checkbuttonOnTheFlyFormatting.Label = global::Mono.Unix.Catalog.GetString("_Enable on the fly code formatting");
 			this.checkbuttonOnTheFlyFormatting.DrawIndicator = true;
 			this.checkbuttonOnTheFlyFormatting.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonOnTheFlyFormatting);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonOnTheFlyFormatting]));
+			this.vbox4.Add(this.checkbuttonOnTheFlyFormatting);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonOnTheFlyFormatting]));
 			w6.Position = 2;
 			w6.Expand = false;
 			w6.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonFormatOnSave = new global::Gtk.CheckButton ();
+			this.checkbuttonFormatOnSave = new global::Gtk.CheckButton();
 			this.checkbuttonFormatOnSave.CanFocus = true;
 			this.checkbuttonFormatOnSave.Name = "checkbuttonFormatOnSave";
-			this.checkbuttonFormatOnSave.Label = global::Mono.Unix.Catalog.GetString ("_Format document on save");
+			this.checkbuttonFormatOnSave.Label = global::Mono.Unix.Catalog.GetString("_Format document on save");
 			this.checkbuttonFormatOnSave.DrawIndicator = true;
 			this.checkbuttonFormatOnSave.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonFormatOnSave);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonFormatOnSave]));
+			this.vbox4.Add(this.checkbuttonFormatOnSave);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonFormatOnSave]));
 			w7.Position = 3;
 			w7.Expand = false;
 			w7.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonAutoSetSearchPatternCasing = new global::Gtk.CheckButton ();
+			this.checkbuttonAutoSetSearchPatternCasing = new global::Gtk.CheckButton();
 			this.checkbuttonAutoSetSearchPatternCasing.CanFocus = true;
 			this.checkbuttonAutoSetSearchPatternCasing.Name = "checkbuttonAutoSetSearchPatternCasing";
-			this.checkbuttonAutoSetSearchPatternCasing.Label = global::Mono.Unix.Catalog.GetString ("_Automatically set search pattern case sensitivity");
+			this.checkbuttonAutoSetSearchPatternCasing.Label = global::Mono.Unix.Catalog.GetString("_Automatically set search pattern case sensitivity");
 			this.checkbuttonAutoSetSearchPatternCasing.DrawIndicator = true;
 			this.checkbuttonAutoSetSearchPatternCasing.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonAutoSetSearchPatternCasing);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonAutoSetSearchPatternCasing]));
+			this.vbox4.Add(this.checkbuttonAutoSetSearchPatternCasing);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonAutoSetSearchPatternCasing]));
 			w8.Position = 4;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonGenerateFormattingUndoStep = new global::Gtk.CheckButton ();
+			this.checkbuttonGenerateFormattingUndoStep = new global::Gtk.CheckButton();
 			this.checkbuttonGenerateFormattingUndoStep.CanFocus = true;
 			this.checkbuttonGenerateFormattingUndoStep.Name = "checkbuttonGenerateFormattingUndoStep";
-			this.checkbuttonGenerateFormattingUndoStep.Label = global::Mono.Unix.Catalog.GetString ("_Generate additional undo steps for formatting");
+			this.checkbuttonGenerateFormattingUndoStep.Label = global::Mono.Unix.Catalog.GetString("_Generate additional undo steps for formatting");
 			this.checkbuttonGenerateFormattingUndoStep.DrawIndicator = true;
 			this.checkbuttonGenerateFormattingUndoStep.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonGenerateFormattingUndoStep);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonGenerateFormattingUndoStep]));
+			this.vbox4.Add(this.checkbuttonGenerateFormattingUndoStep);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonGenerateFormattingUndoStep]));
 			w9.Position = 5;
 			w9.Expand = false;
 			w9.Fill = false;
-			this.alignment3.Add (this.vbox4);
-			this.vbox1.Add (this.alignment3);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3]));
-			w11.Position = 1;
-			w11.Expand = false;
-			w11.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel6 = new global::Gtk.Label ();
-			this.GtkLabel6.Name = "GtkLabel6";
-			this.GtkLabel6.Xalign = 0F;
-			this.GtkLabel6.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Indentation</b>");
-			this.GtkLabel6.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel6);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel6]));
-			w12.Position = 2;
+			// Container child vbox4.Gtk.Box+BoxChild
+			this.checkbuttonEnableSelectionSurrounding = new global::Gtk.CheckButton();
+			this.checkbuttonEnableSelectionSurrounding.CanFocus = true;
+			this.checkbuttonEnableSelectionSurrounding.Name = "checkbuttonEnableSelectionSurrounding";
+			this.checkbuttonEnableSelectionSurrounding.Label = global::Mono.Unix.Catalog.GetString("Enable _selection surrounding keys");
+			this.checkbuttonEnableSelectionSurrounding.DrawIndicator = true;
+			this.checkbuttonEnableSelectionSurrounding.UseUnderline = true;
+			this.vbox4.Add(this.checkbuttonEnableSelectionSurrounding);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonEnableSelectionSurrounding]));
+			w10.Position = 6;
+			w10.Expand = false;
+			w10.Fill = false;
+			this.alignment3.Add(this.vbox4);
+			this.vbox1.Add(this.alignment3);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
+			w12.Position = 1;
 			w12.Expand = false;
 			w12.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkAlignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
+			this.GtkLabel7 = new global::Gtk.Label();
+			this.GtkLabel7.Name = "GtkLabel7";
+			this.GtkLabel7.Xalign = 0F;
+			this.GtkLabel7.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Indentation</b>");
+			this.GtkLabel7.UseMarkup = true;
+			this.vbox1.Add(this.GtkLabel7);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel7]));
+			w13.Position = 2;
+			w13.Expand = false;
+			w13.Fill = false;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.GtkAlignment = new global::Gtk.Alignment(0F, 0F, 1F, 1F);
 			this.GtkAlignment.Name = "GtkAlignment";
 			this.GtkAlignment.LeftPadding = ((uint)(12));
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			this.vbox2 = new global::Gtk.VBox ();
+			this.vbox2 = new global::Gtk.VBox();
 			this.vbox2.Name = "vbox2";
 			this.vbox2.Spacing = 6;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Indentation mode:");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Indentation mode:");
 			this.label1.UseUnderline = true;
-			this.hbox1.Add (this.label1);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label1]));
-			w13.Position = 0;
-			w13.Expand = false;
-			w13.Fill = false;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.indentationCombobox = global::Gtk.ComboBox.NewText ();
-			this.indentationCombobox.Name = "indentationCombobox";
-			this.hbox1.Add (this.indentationCombobox);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.indentationCombobox]));
-			w14.Position = 1;
+			this.hbox1.Add(this.label1);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1]));
+			w14.Position = 0;
 			w14.Expand = false;
 			w14.Fill = false;
-			this.vbox2.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
-			w15.Position = 0;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.indentationCombobox = global::Gtk.ComboBox.NewText();
+			this.indentationCombobox.Name = "indentationCombobox";
+			this.hbox1.Add(this.indentationCombobox);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.indentationCombobox]));
+			w15.Position = 1;
 			w15.Expand = false;
 			w15.Fill = false;
+			this.vbox2.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
+			w16.Position = 0;
+			w16.Expand = false;
+			w16.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.tabAsReindentCheckbutton = new global::Gtk.CheckButton ();
+			this.tabAsReindentCheckbutton = new global::Gtk.CheckButton();
 			this.tabAsReindentCheckbutton.CanFocus = true;
 			this.tabAsReindentCheckbutton.Name = "tabAsReindentCheckbutton";
-			this.tabAsReindentCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Interpret tab _keystroke as reindent command");
+			this.tabAsReindentCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Interpret tab _keystroke as reindent command");
 			this.tabAsReindentCheckbutton.DrawIndicator = true;
 			this.tabAsReindentCheckbutton.UseUnderline = true;
-			this.vbox2.Add (this.tabAsReindentCheckbutton);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.tabAsReindentCheckbutton]));
-			w16.Position = 1;
-			w16.Expand = false;
-			w16.Fill = false;
-			this.GtkAlignment.Add (this.vbox2);
-			this.vbox1.Add (this.GtkAlignment);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkAlignment]));
-			w18.Position = 3;
-			w18.Expand = false;
-			w18.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel8 = new global::Gtk.Label ();
-			this.GtkLabel8.Name = "GtkLabel8";
-			this.GtkLabel8.Xalign = 0F;
-			this.GtkLabel8.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Navigation</b>");
-			this.GtkLabel8.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel8);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel8]));
-			w19.Position = 4;
+			this.vbox2.Add(this.tabAsReindentCheckbutton);
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.tabAsReindentCheckbutton]));
+			w17.Position = 1;
+			w17.Expand = false;
+			w17.Fill = false;
+			this.GtkAlignment.Add(this.vbox2);
+			this.vbox1.Add(this.GtkAlignment);
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkAlignment]));
+			w19.Position = 3;
 			w19.Expand = false;
 			w19.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment4 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.GtkLabel9 = new global::Gtk.Label();
+			this.GtkLabel9.Name = "GtkLabel9";
+			this.GtkLabel9.Xalign = 0F;
+			this.GtkLabel9.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Navigation</b>");
+			this.GtkLabel9.UseMarkup = true;
+			this.vbox1.Add(this.GtkLabel9);
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel9]));
+			w20.Position = 4;
+			w20.Expand = false;
+			w20.Fill = false;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.alignment4 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment4.Name = "alignment4";
 			this.alignment4.LeftPadding = ((uint)(12));
 			// Container child alignment4.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.useViModesCheck = new global::Gtk.CheckButton ();
-			this.useViModesCheck.CanFocus = true;
-			this.useViModesCheck.Name = "useViModesCheck";
-			this.useViModesCheck.Label = global::Mono.Unix.Catalog.GetString ("Use _Vi modes");
-			this.useViModesCheck.DrawIndicator = true;
-			this.useViModesCheck.UseUnderline = true;
-			this.vbox5.Add (this.useViModesCheck);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.useViModesCheck]));
-			w20.Position = 0;
-			w20.Expand = false;
-			w20.Fill = false;
-			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
+			this.label2 = new global::Gtk.Label();
 			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Word _break mode:");
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("Word _break mode:");
 			this.label2.UseUnderline = true;
-			this.hbox3.Add (this.label2);
-			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label2]));
+			this.hbox3.Add(this.label2);
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.label2]));
 			w21.Position = 0;
 			w21.Expand = false;
 			w21.Fill = false;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.controlLeftRightCombobox = global::Gtk.ComboBox.NewText ();
+			this.controlLeftRightCombobox = global::Gtk.ComboBox.NewText();
 			this.controlLeftRightCombobox.Name = "controlLeftRightCombobox";
-			this.hbox3.Add (this.controlLeftRightCombobox);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.controlLeftRightCombobox]));
+			this.hbox3.Add(this.controlLeftRightCombobox);
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.controlLeftRightCombobox]));
 			w22.Position = 1;
 			w22.Expand = false;
 			w22.Fill = false;
-			this.vbox5.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3]));
-			w23.Position = 1;
+			this.vbox5.Add(this.hbox3);
+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3]));
+			w23.Position = 0;
 			w23.Expand = false;
 			w23.Fill = false;
-			this.alignment4.Add (this.vbox5);
-			this.vbox1.Add (this.alignment4);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment4]));
+			this.alignment4.Add(this.vbox5);
+			this.vbox1.Add(this.alignment4);
+			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment4]));
 			w25.Position = 5;
 			w25.Expand = false;
 			w25.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs
index 4b433ec225..4809dfe38e 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.cs
@@ -5,46 +5,79 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class ColorShemeEditor
 	{
 		private global::Gtk.HBox hbox1;
+
 		private global::Gtk.Label label2;
+
 		private global::Gtk.Entry entryName;
+
 		private global::Gtk.Label label3;
+
 		private global::Gtk.Entry entryDescription;
+
 		private global::Gtk.HPaned hpaned1;
+
 		private global::Gtk.VBox vbox2;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
 		private global::Gtk.TreeView treeviewColors;
+
 		private global::Gtk.VBox vbox3;
+
 		private global::Gtk.Notebook notebookColorChooser;
+
 		private global::Gtk.VBox vbox4;
+
 		private global::Gtk.Table table1;
+
 		private global::Gtk.ColorButton colorbuttonBg;
+
 		private global::Gtk.ColorButton colorbuttonFg;
+
 		private global::Gtk.Label label5;
+
 		private global::Gtk.Label label7;
+
 		private global::Gtk.CheckButton checkbuttonBold;
+
 		private global::Gtk.CheckButton checkbuttonItalic;
+
 		private global::Gtk.Label label4;
+
 		private global::Gtk.VBox vbox5;
+
 		private global::Gtk.Table table2;
+
 		private global::Gtk.ColorButton colorbuttonBorder;
+
 		private global::Gtk.ColorButton colorbuttonPrimary;
+
 		private global::Gtk.ColorButton colorbuttonSecondary;
+
 		private global::Gtk.Label label10;
+
 		private global::Gtk.Label label11;
+
 		private global::Gtk.Label label9;
+
 		private global::Gtk.Label label6;
+
 		private global::Gtk.Label label8;
+
 		private global::Gtk.ScrolledWindow scrolledwindowTextEditor;
+
 		private global::Gtk.Button buttonCancel;
+
 		private global::Gtk.Button buttonOk;
-		
-		protected virtual void Build ()
+
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Edit color sheme");
+			this.Title = global::Mono.Unix.Catalog.GetString("Edit Color Scheme");
 			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 			this.BorderWidth = ((uint)(6));
 			// Internal child MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.VBox
@@ -52,115 +85,116 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w1.Name = "dialog1_VBox";
 			w1.BorderWidth = ((uint)(2));
 			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			this.hbox1.BorderWidth = ((uint)(6));
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
+			this.label2 = new global::Gtk.Label();
 			this.label2.Name = "label2";
 			this.label2.Xalign = 0F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("_Name:");
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("_Name:");
 			this.label2.UseUnderline = true;
-			this.hbox1.Add (this.label2);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label2]));
+			this.hbox1.Add(this.label2);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label2]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.entryName = new global::Gtk.Entry ();
+			this.entryName = new global::Gtk.Entry();
 			this.entryName.CanFocus = true;
 			this.entryName.Name = "entryName";
 			this.entryName.IsEditable = true;
 			this.entryName.InvisibleChar = '●';
-			this.hbox1.Add (this.entryName);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryName]));
+			this.hbox1.Add(this.entryName);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.entryName]));
 			w3.Position = 1;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.label3 = new global::Gtk.Label ();
+			this.label3 = new global::Gtk.Label();
 			this.label3.Name = "label3";
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("_Description:");
+			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("_Description:");
 			this.label3.UseUnderline = true;
-			this.hbox1.Add (this.label3);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label3]));
+			this.hbox1.Add(this.label3);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label3]));
 			w4.Position = 2;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.entryDescription = new global::Gtk.Entry ();
+			this.entryDescription = new global::Gtk.Entry();
 			this.entryDescription.CanFocus = true;
 			this.entryDescription.Name = "entryDescription";
 			this.entryDescription.IsEditable = true;
 			this.entryDescription.InvisibleChar = '●';
-			this.hbox1.Add (this.entryDescription);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryDescription]));
+			this.hbox1.Add(this.entryDescription);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.entryDescription]));
 			w5.Position = 3;
-			w1.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox1]));
+			w1.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1[this.hbox1]));
 			w6.Position = 0;
 			w6.Expand = false;
 			w6.Fill = false;
 			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.hpaned1 = new global::Gtk.HPaned ();
+			this.hpaned1 = new global::Gtk.HPaned();
 			this.hpaned1.CanFocus = true;
 			this.hpaned1.Name = "hpaned1";
 			this.hpaned1.Position = 415;
 			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.vbox2 = new global::Gtk.VBox ();
+			this.vbox2 = new global::Gtk.VBox();
 			this.vbox2.Name = "vbox2";
 			this.vbox2.Spacing = 6;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
 			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Colors");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Colors");
 			this.label1.UseUnderline = true;
-			this.vbox2.Add (this.label1);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label1]));
+			this.vbox2.Add(this.label1);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.label1]));
 			w7.Position = 0;
 			w7.Expand = false;
 			w7.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
 			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
 			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-			this.treeviewColors = new global::Gtk.TreeView ();
+			this.treeviewColors = new global::Gtk.TreeView();
 			this.treeviewColors.CanFocus = true;
 			this.treeviewColors.Name = "treeviewColors";
-			this.GtkScrolledWindow.Add (this.treeviewColors);
-			this.vbox2.Add (this.GtkScrolledWindow);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow]));
+			this.GtkScrolledWindow.Add(this.treeviewColors);
+			this.vbox2.Add(this.GtkScrolledWindow);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.GtkScrolledWindow]));
 			w9.Position = 1;
-			this.hpaned1.Add (this.vbox2);
-			global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.vbox2]));
+			this.hpaned1.Add(this.vbox2);
+			global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.vbox2]));
 			w10.Resize = false;
 			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.vbox3 = new global::Gtk.VBox ();
+			this.vbox3 = new global::Gtk.VBox();
 			this.vbox3.Name = "vbox3";
 			this.vbox3.Spacing = 6;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.notebookColorChooser = new global::Gtk.Notebook ();
+			this.notebookColorChooser = new global::Gtk.Notebook();
 			this.notebookColorChooser.CanFocus = true;
 			this.notebookColorChooser.Name = "notebookColorChooser";
 			this.notebookColorChooser.CurrentPage = 1;
 			this.notebookColorChooser.ShowBorder = false;
 			this.notebookColorChooser.BorderWidth = ((uint)(8));
 			// Container child notebookColorChooser.Gtk.Notebook+NotebookChild
-			this.vbox4 = new global::Gtk.VBox ();
+			this.vbox4 = new global::Gtk.VBox();
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
+			this.table1 = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false);
+			this.table1.Name = "table1";
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			// Container child table1.Gtk.Table+TableChild
-			this.colorbuttonBg = new global::Gtk.ColorButton ();
+			this.colorbuttonBg = new global::Gtk.ColorButton();
 			this.colorbuttonBg.CanFocus = true;
 			this.colorbuttonBg.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonBg.Name = "colorbuttonBg";
-			this.table1.Add (this.colorbuttonBg);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.colorbuttonBg]));
+			this.table1.Add(this.colorbuttonBg);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.colorbuttonBg]));
 			w11.TopAttach = ((uint)(1));
 			w11.BottomAttach = ((uint)(2));
 			w11.LeftAttach = ((uint)(1));
@@ -168,90 +202,90 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w11.XOptions = ((global::Gtk.AttachOptions)(4));
 			w11.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.colorbuttonFg = new global::Gtk.ColorButton ();
+			this.colorbuttonFg = new global::Gtk.ColorButton();
 			this.colorbuttonFg.CanFocus = true;
 			this.colorbuttonFg.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonFg.Name = "colorbuttonFg";
-			this.table1.Add (this.colorbuttonFg);
-			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.colorbuttonFg]));
+			this.table1.Add(this.colorbuttonFg);
+			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.colorbuttonFg]));
 			w12.LeftAttach = ((uint)(1));
 			w12.RightAttach = ((uint)(2));
 			w12.XOptions = ((global::Gtk.AttachOptions)(4));
 			w12.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label5 = new global::Gtk.Label ();
+			this.label5 = new global::Gtk.Label();
 			this.label5.Name = "label5";
 			this.label5.Xalign = 1F;
-			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("_Background:");
+			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString("_Background:");
 			this.label5.UseUnderline = true;
-			this.table1.Add (this.label5);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5]));
+			this.table1.Add(this.label5);
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.label5]));
 			w13.TopAttach = ((uint)(1));
 			w13.BottomAttach = ((uint)(2));
 			w13.XOptions = ((global::Gtk.AttachOptions)(4));
 			w13.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label7 = new global::Gtk.Label ();
+			this.label7 = new global::Gtk.Label();
 			this.label7.Name = "label7";
 			this.label7.Xalign = 1F;
-			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("_Foreground:");
+			this.label7.LabelProp = global::Mono.Unix.Catalog.GetString("_Foreground:");
 			this.label7.UseUnderline = true;
-			this.table1.Add (this.label7);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.label7]));
+			this.table1.Add(this.label7);
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.label7]));
 			w14.XOptions = ((global::Gtk.AttachOptions)(4));
 			w14.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox4.Add (this.table1);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.table1]));
+			this.vbox4.Add(this.table1);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.table1]));
 			w15.Position = 0;
 			w15.Expand = false;
 			w15.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonBold = new global::Gtk.CheckButton ();
+			this.checkbuttonBold = new global::Gtk.CheckButton();
 			this.checkbuttonBold.CanFocus = true;
 			this.checkbuttonBold.Name = "checkbuttonBold";
-			this.checkbuttonBold.Label = global::Mono.Unix.Catalog.GetString ("B_old");
+			this.checkbuttonBold.Label = global::Mono.Unix.Catalog.GetString("B_old");
 			this.checkbuttonBold.DrawIndicator = true;
 			this.checkbuttonBold.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonBold);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonBold]));
+			this.vbox4.Add(this.checkbuttonBold);
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonBold]));
 			w16.Position = 1;
 			w16.Expand = false;
 			w16.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.checkbuttonItalic = new global::Gtk.CheckButton ();
+			this.checkbuttonItalic = new global::Gtk.CheckButton();
 			this.checkbuttonItalic.CanFocus = true;
 			this.checkbuttonItalic.Name = "checkbuttonItalic";
-			this.checkbuttonItalic.Label = global::Mono.Unix.Catalog.GetString ("Italic");
+			this.checkbuttonItalic.Label = global::Mono.Unix.Catalog.GetString("Italic");
 			this.checkbuttonItalic.DrawIndicator = true;
 			this.checkbuttonItalic.UseUnderline = true;
-			this.vbox4.Add (this.checkbuttonItalic);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.checkbuttonItalic]));
+			this.vbox4.Add(this.checkbuttonItalic);
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.checkbuttonItalic]));
 			w17.Position = 2;
 			w17.Expand = false;
 			w17.Fill = false;
-			this.notebookColorChooser.Add (this.vbox4);
+			this.notebookColorChooser.Add(this.vbox4);
 			// Notebook tab
-			this.label4 = new global::Gtk.Label ();
+			this.label4 = new global::Gtk.Label();
 			this.label4.Name = "label4";
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("page1");
-			this.notebookColorChooser.SetTabLabel (this.vbox4, this.label4);
-			this.label4.ShowAll ();
+			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("page1");
+			this.notebookColorChooser.SetTabLabel(this.vbox4, this.label4);
+			this.label4.ShowAll();
 			// Container child notebookColorChooser.Gtk.Notebook+NotebookChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
+			this.table2 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false);
 			this.table2.Name = "table2";
 			this.table2.RowSpacing = ((uint)(6));
 			this.table2.ColumnSpacing = ((uint)(6));
 			// Container child table2.Gtk.Table+TableChild
-			this.colorbuttonBorder = new global::Gtk.ColorButton ();
+			this.colorbuttonBorder = new global::Gtk.ColorButton();
 			this.colorbuttonBorder.CanFocus = true;
 			this.colorbuttonBorder.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonBorder.Name = "colorbuttonBorder";
-			this.table2.Add (this.colorbuttonBorder);
-			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table2 [this.colorbuttonBorder]));
+			this.table2.Add(this.colorbuttonBorder);
+			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table2[this.colorbuttonBorder]));
 			w19.TopAttach = ((uint)(2));
 			w19.BottomAttach = ((uint)(3));
 			w19.LeftAttach = ((uint)(1));
@@ -259,23 +293,23 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w19.XOptions = ((global::Gtk.AttachOptions)(4));
 			w19.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.colorbuttonPrimary = new global::Gtk.ColorButton ();
+			this.colorbuttonPrimary = new global::Gtk.ColorButton();
 			this.colorbuttonPrimary.CanFocus = true;
 			this.colorbuttonPrimary.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonPrimary.Name = "colorbuttonPrimary";
-			this.table2.Add (this.colorbuttonPrimary);
-			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table2 [this.colorbuttonPrimary]));
+			this.table2.Add(this.colorbuttonPrimary);
+			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table2[this.colorbuttonPrimary]));
 			w20.LeftAttach = ((uint)(1));
 			w20.RightAttach = ((uint)(2));
 			w20.XOptions = ((global::Gtk.AttachOptions)(4));
 			w20.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.colorbuttonSecondary = new global::Gtk.ColorButton ();
+			this.colorbuttonSecondary = new global::Gtk.ColorButton();
 			this.colorbuttonSecondary.CanFocus = true;
 			this.colorbuttonSecondary.Events = ((global::Gdk.EventMask)(784));
 			this.colorbuttonSecondary.Name = "colorbuttonSecondary";
-			this.table2.Add (this.colorbuttonSecondary);
-			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2 [this.colorbuttonSecondary]));
+			this.table2.Add(this.colorbuttonSecondary);
+			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2[this.colorbuttonSecondary]));
 			w21.TopAttach = ((uint)(1));
 			w21.BottomAttach = ((uint)(2));
 			w21.LeftAttach = ((uint)(1));
@@ -283,80 +317,80 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w21.XOptions = ((global::Gtk.AttachOptions)(4));
 			w21.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.label10 = new global::Gtk.Label ();
+			this.label10 = new global::Gtk.Label();
 			this.label10.Name = "label10";
 			this.label10.Xalign = 1F;
-			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("_Secondary Color:");
+			this.label10.LabelProp = global::Mono.Unix.Catalog.GetString("_Secondary Color:");
 			this.label10.UseUnderline = true;
-			this.table2.Add (this.label10);
-			global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table2 [this.label10]));
+			this.table2.Add(this.label10);
+			global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table2[this.label10]));
 			w22.TopAttach = ((uint)(1));
 			w22.BottomAttach = ((uint)(2));
 			w22.XOptions = ((global::Gtk.AttachOptions)(4));
 			w22.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.label11 = new global::Gtk.Label ();
+			this.label11 = new global::Gtk.Label();
 			this.label11.Name = "label11";
 			this.label11.Xalign = 1F;
-			this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("_Border Color:");
+			this.label11.LabelProp = global::Mono.Unix.Catalog.GetString("_Border Color:");
 			this.label11.UseUnderline = true;
-			this.table2.Add (this.label11);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2 [this.label11]));
+			this.table2.Add(this.label11);
+			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2[this.label11]));
 			w23.TopAttach = ((uint)(2));
 			w23.BottomAttach = ((uint)(3));
 			w23.XOptions = ((global::Gtk.AttachOptions)(4));
 			w23.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
-			this.label9 = new global::Gtk.Label ();
+			this.label9 = new global::Gtk.Label();
 			this.label9.Name = "label9";
 			this.label9.Xalign = 1F;
-			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("_Primary Color:");
+			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString("_Primary Color:");
 			this.label9.UseUnderline = true;
-			this.table2.Add (this.label9);
-			global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table2 [this.label9]));
+			this.table2.Add(this.label9);
+			global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table2[this.label9]));
 			w24.XOptions = ((global::Gtk.AttachOptions)(4));
 			w24.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox5.Add (this.table2);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.table2]));
+			this.vbox5.Add(this.table2);
+			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.table2]));
 			w25.Position = 0;
 			w25.Expand = false;
 			w25.Fill = false;
-			this.notebookColorChooser.Add (this.vbox5);
-			global::Gtk.Notebook.NotebookChild w26 = ((global::Gtk.Notebook.NotebookChild)(this.notebookColorChooser [this.vbox5]));
+			this.notebookColorChooser.Add(this.vbox5);
+			global::Gtk.Notebook.NotebookChild w26 = ((global::Gtk.Notebook.NotebookChild)(this.notebookColorChooser[this.vbox5]));
 			w26.Position = 1;
 			// Notebook tab
-			this.label6 = new global::Gtk.Label ();
+			this.label6 = new global::Gtk.Label();
 			this.label6.Name = "label6";
-			this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("page2");
-			this.notebookColorChooser.SetTabLabel (this.vbox5, this.label6);
-			this.label6.ShowAll ();
-			this.vbox3.Add (this.notebookColorChooser);
-			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.notebookColorChooser]));
+			this.label6.LabelProp = global::Mono.Unix.Catalog.GetString("page2");
+			this.notebookColorChooser.SetTabLabel(this.vbox5, this.label6);
+			this.label6.ShowAll();
+			this.vbox3.Add(this.notebookColorChooser);
+			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.notebookColorChooser]));
 			w27.Position = 0;
 			w27.Expand = false;
 			w27.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.label8 = new global::Gtk.Label ();
+			this.label8 = new global::Gtk.Label();
 			this.label8.Name = "label8";
 			this.label8.Xalign = 0F;
-			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("_Preview:");
+			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString("_Preview:");
 			this.label8.UseUnderline = true;
-			this.vbox3.Add (this.label8);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label8]));
+			this.vbox3.Add(this.label8);
+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.label8]));
 			w28.Position = 1;
 			w28.Expand = false;
 			w28.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.scrolledwindowTextEditor = new global::Gtk.ScrolledWindow ();
+			this.scrolledwindowTextEditor = new global::Gtk.ScrolledWindow();
 			this.scrolledwindowTextEditor.CanFocus = true;
 			this.scrolledwindowTextEditor.Name = "scrolledwindowTextEditor";
 			this.scrolledwindowTextEditor.ShadowType = ((global::Gtk.ShadowType)(1));
-			this.vbox3.Add (this.scrolledwindowTextEditor);
-			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.scrolledwindowTextEditor]));
+			this.vbox3.Add(this.scrolledwindowTextEditor);
+			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.scrolledwindowTextEditor]));
 			w29.Position = 2;
-			this.hpaned1.Add (this.vbox3);
-			w1.Add (this.hpaned1);
-			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(w1 [this.hpaned1]));
+			this.hpaned1.Add(this.vbox3);
+			w1.Add(this.hpaned1);
+			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(w1[this.hpaned1]));
 			w31.Position = 1;
 			// Internal child MonoDevelop.SourceEditor.OptionPanels.ColorShemeEditor.ActionArea
 			global::Gtk.HButtonBox w32 = this.ActionArea;
@@ -365,38 +399,39 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w32.BorderWidth = ((uint)(5));
 			w32.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
+			this.buttonCancel = new global::Gtk.Button();
 			this.buttonCancel.CanDefault = true;
 			this.buttonCancel.CanFocus = true;
 			this.buttonCancel.Name = "buttonCancel";
 			this.buttonCancel.UseStock = true;
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w33 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32 [this.buttonCancel]));
+			this.AddActionWidget(this.buttonCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w33 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32[this.buttonCancel]));
 			w33.Expand = false;
 			w33.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
+			this.buttonOk = new global::Gtk.Button();
 			this.buttonOk.CanDefault = true;
 			this.buttonOk.CanFocus = true;
 			this.buttonOk.Name = "buttonOk";
 			this.buttonOk.UseStock = true;
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w34 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32 [this.buttonOk]));
+			this.AddActionWidget(this.buttonOk, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w34 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w32[this.buttonOk]));
 			w34.Position = 1;
 			w34.Expand = false;
 			w34.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
 			this.DefaultWidth = 760;
 			this.DefaultHeight = 458;
 			this.label2.MnemonicWidget = this.entryName;
 			this.label3.MnemonicWidget = this.entryDescription;
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs
index 2ec1f37faa..5bce3c3b27 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.cs
@@ -2,196 +2,167 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
-	internal partial class CompletionAppearancePanel
+	public partial class CompletionAppearancePanel
 	{
 		private global::Gtk.VBox vbox1;
-		private global::Gtk.HBox hbox1;
-		private global::Gtk.Label label2;
-		private global::Gtk.SpinButton spinbutton1;
-		private global::Gtk.Label label3;
+
 		private global::Gtk.Alignment alignment3;
+
 		private global::Gtk.VBox vbox5;
+
 		private global::Gtk.CheckButton filterByBrowsableCheckbutton;
+
 		private global::Gtk.HBox hbox2;
+
 		private global::Gtk.Fixed fixed1;
+
 		private global::Gtk.RadioButton normalOnlyRadiobutton;
+
 		private global::Gtk.Alignment alignment1;
+
 		private global::Gtk.Label label4;
+
 		private global::Gtk.HBox hbox3;
+
 		private global::Gtk.Fixed fixed2;
+
 		private global::Gtk.RadioButton includeAdvancedRadiobutton;
+
 		private global::Gtk.Alignment alignment2;
+
 		private global::Gtk.Label label5;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Completion list has");
-			this.hbox1.Add (this.label2);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label2]));
-			w1.Position = 0;
-			w1.Expand = false;
-			w1.Fill = false;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.spinbutton1 = new global::Gtk.SpinButton (0, 100, 1);
-			this.spinbutton1.CanFocus = true;
-			this.spinbutton1.Name = "spinbutton1";
-			this.spinbutton1.Adjustment.PageIncrement = 10;
-			this.spinbutton1.ClimbRate = 1;
-			this.spinbutton1.Numeric = true;
-			this.hbox1.Add (this.spinbutton1);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.spinbutton1]));
-			w2.Position = 1;
-			w2.Expand = false;
-			w2.Fill = false;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("rows");
-			this.hbox1.Add (this.label3);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label3]));
-			w3.Position = 2;
-			w3.Expand = false;
-			w3.Fill = false;
-			this.vbox1.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
-			w4.Position = 0;
-			w4.Expand = false;
-			w4.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment3.Name = "alignment3";
 			this.alignment3.LeftPadding = ((uint)(12));
 			// Container child alignment3.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.filterByBrowsableCheckbutton = new global::Gtk.CheckButton ();
+			this.filterByBrowsableCheckbutton = new global::Gtk.CheckButton();
 			this.filterByBrowsableCheckbutton.CanFocus = true;
 			this.filterByBrowsableCheckbutton.Name = "filterByBrowsableCheckbutton";
-			this.filterByBrowsableCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Filter members by [EditorBrowsable] attribute");
+			this.filterByBrowsableCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Filter members by [EditorBrowsable] attribute");
 			this.filterByBrowsableCheckbutton.Active = true;
 			this.filterByBrowsableCheckbutton.DrawIndicator = true;
 			this.filterByBrowsableCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.filterByBrowsableCheckbutton);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.filterByBrowsableCheckbutton]));
-			w5.Position = 0;
-			w5.Expand = false;
-			w5.Fill = false;
+			this.vbox5.Add(this.filterByBrowsableCheckbutton);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.filterByBrowsableCheckbutton]));
+			w1.Position = 0;
+			w1.Expand = false;
+			w1.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.fixed1 = new global::Gtk.Fixed ();
+			this.fixed1 = new global::Gtk.Fixed();
 			this.fixed1.Name = "fixed1";
 			this.fixed1.HasWindow = false;
-			this.hbox2.Add (this.fixed1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed1]));
-			w6.Position = 0;
-			w6.Expand = false;
-			w6.Padding = ((uint)(6));
+			this.hbox2.Add(this.fixed1);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1]));
+			w2.Position = 0;
+			w2.Expand = false;
+			w2.Padding = ((uint)(6));
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.normalOnlyRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Show Normal members only"));
+			this.normalOnlyRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Show Normal members only"));
 			this.normalOnlyRadiobutton.CanFocus = true;
 			this.normalOnlyRadiobutton.Name = "normalOnlyRadiobutton";
 			this.normalOnlyRadiobutton.DrawIndicator = true;
 			this.normalOnlyRadiobutton.UseUnderline = true;
-			this.normalOnlyRadiobutton.Group = new global::GLib.SList (global::System.IntPtr.Zero);
-			this.hbox2.Add (this.normalOnlyRadiobutton);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.normalOnlyRadiobutton]));
-			w7.Position = 1;
-			this.vbox5.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
-			w8.Position = 1;
-			w8.Expand = false;
-			w8.Fill = false;
+			this.normalOnlyRadiobutton.Group = new global::GLib.SList(global::System.IntPtr.Zero);
+			this.hbox2.Add(this.normalOnlyRadiobutton);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.normalOnlyRadiobutton]));
+			w3.Position = 1;
+			this.vbox5.Add(this.hbox2);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
+			w4.Position = 1;
+			w4.Expand = false;
+			w4.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment1 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment1.Name = "alignment1";
 			this.alignment1.LeftPadding = ((uint)(38));
 			// Container child alignment1.Gtk.Container+ContainerChild
-			this.label4 = new global::Gtk.Label ();
+			this.label4 = new global::Gtk.Label();
 			this.label4.Name = "label4";
 			this.label4.Xalign = 0F;
-			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("<i>EditorBrowsableState.Always</i>");
+			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("<i>EditorBrowsableState.Always</i>");
 			this.label4.UseMarkup = true;
-			this.alignment1.Add (this.label4);
-			this.vbox5.Add (this.alignment1);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.alignment1]));
-			w10.Position = 2;
-			w10.Expand = false;
-			w10.Fill = false;
+			this.alignment1.Add(this.label4);
+			this.vbox5.Add(this.alignment1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.alignment1]));
+			w6.Position = 2;
+			w6.Expand = false;
+			w6.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.fixed2 = new global::Gtk.Fixed ();
+			this.fixed2 = new global::Gtk.Fixed();
 			this.fixed2.Name = "fixed2";
 			this.fixed2.HasWindow = false;
-			this.hbox3.Add (this.fixed2);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.fixed2]));
-			w11.Position = 0;
-			w11.Expand = false;
-			w11.Padding = ((uint)(6));
+			this.hbox3.Add(this.fixed2);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2]));
+			w7.Position = 0;
+			w7.Expand = false;
+			w7.Padding = ((uint)(6));
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.includeAdvancedRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Show Normal and _Advanced members"));
+			this.includeAdvancedRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("Show Normal and _Advanced members"));
 			this.includeAdvancedRadiobutton.CanFocus = true;
 			this.includeAdvancedRadiobutton.Name = "includeAdvancedRadiobutton";
 			this.includeAdvancedRadiobutton.DrawIndicator = true;
 			this.includeAdvancedRadiobutton.UseUnderline = true;
 			this.includeAdvancedRadiobutton.Group = this.normalOnlyRadiobutton.Group;
-			this.hbox3.Add (this.includeAdvancedRadiobutton);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.includeAdvancedRadiobutton]));
-			w12.Position = 1;
-			this.vbox5.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3]));
-			w13.Position = 3;
-			w13.Expand = false;
-			w13.Fill = false;
+			this.hbox3.Add(this.includeAdvancedRadiobutton);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.includeAdvancedRadiobutton]));
+			w8.Position = 1;
+			this.vbox5.Add(this.hbox3);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3]));
+			w9.Position = 3;
+			w9.Expand = false;
+			w9.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.alignment2 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment2 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment2.Name = "alignment2";
 			this.alignment2.LeftPadding = ((uint)(38));
 			// Container child alignment2.Gtk.Container+ContainerChild
-			this.label5 = new global::Gtk.Label ();
+			this.label5 = new global::Gtk.Label();
 			this.label5.Name = "label5";
 			this.label5.Xalign = 0F;
-			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("<i>EditorBrowsableState.Always and EditorBrowsableState.Advanced</i>");
+			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString("<i>EditorBrowsableState.Always and EditorBrowsableState.Advanced</i>");
 			this.label5.UseMarkup = true;
-			this.alignment2.Add (this.label5);
-			this.vbox5.Add (this.alignment2);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.alignment2]));
-			w15.Position = 4;
-			w15.Expand = false;
-			w15.Fill = false;
-			this.alignment3.Add (this.vbox5);
-			this.vbox1.Add (this.alignment3);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3]));
-			w17.Position = 1;
-			w17.Expand = false;
-			w17.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.alignment2.Add(this.label5);
+			this.vbox5.Add(this.alignment2);
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.alignment2]));
+			w11.Position = 4;
+			w11.Expand = false;
+			w11.Fill = false;
+			this.alignment3.Add(this.vbox5);
+			this.vbox1.Add(this.alignment3);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
+			w13.Position = 0;
+			w13.Expand = false;
+			w13.Fill = false;
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Hide ();
+			this.Hide();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
index 7b6d6bd809..2676db7750 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.cs
@@ -5,201 +5,220 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	internal partial class CompletionOptionsPanel
 	{
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.Alignment alignment3;
+
 		private global::Gtk.VBox vbox5;
+
 		private global::Gtk.CheckButton autoCodeCompletionCheckbutton;
+
 		private global::Gtk.HBox hbox4;
+
 		private global::Gtk.Fixed fixed3;
+
 		private global::Gtk.CheckButton includeKeywordsCheckbutton;
+
 		private global::Gtk.HBox hbox5;
+
 		private global::Gtk.Fixed fixed4;
+
 		private global::Gtk.CheckButton includeCodeSnippetsCheckbutton;
+
 		private global::Gtk.CheckButton showImportsCheckbutton;
+
 		private global::Gtk.CheckButton insertParenthesesCheckbutton;
+
 		private global::Gtk.HBox hbox2;
+
 		private global::Gtk.Fixed fixed1;
+
 		private global::Gtk.RadioButton openingRadiobutton;
+
 		private global::Gtk.HBox hbox3;
+
 		private global::Gtk.Fixed fixed2;
+
 		private global::Gtk.RadioButton bothRadiobutton;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment3.Name = "alignment3";
 			this.alignment3.LeftPadding = ((uint)(12));
 			// Container child alignment3.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.autoCodeCompletionCheckbutton = new global::Gtk.CheckButton ();
+			this.autoCodeCompletionCheckbutton = new global::Gtk.CheckButton();
 			this.autoCodeCompletionCheckbutton.CanFocus = true;
 			this.autoCodeCompletionCheckbutton.Name = "autoCodeCompletionCheckbutton";
-			this.autoCodeCompletionCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show completion list after a character is typed");
+			this.autoCodeCompletionCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show completion list after a character is typed");
 			this.autoCodeCompletionCheckbutton.DrawIndicator = true;
 			this.autoCodeCompletionCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.autoCodeCompletionCheckbutton);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.autoCodeCompletionCheckbutton]));
+			this.vbox5.Add(this.autoCodeCompletionCheckbutton);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.autoCodeCompletionCheckbutton]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox4 = new global::Gtk.HBox ();
+			this.hbox4 = new global::Gtk.HBox();
 			this.hbox4.Name = "hbox4";
 			this.hbox4.Spacing = 6;
 			// Container child hbox4.Gtk.Box+BoxChild
-			this.fixed3 = new global::Gtk.Fixed ();
+			this.fixed3 = new global::Gtk.Fixed();
 			this.fixed3.Name = "fixed3";
 			this.fixed3.HasWindow = false;
-			this.hbox4.Add (this.fixed3);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed3]));
+			this.hbox4.Add(this.fixed3);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.fixed3]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Padding = ((uint)(6));
 			// Container child hbox4.Gtk.Box+BoxChild
-			this.includeKeywordsCheckbutton = new global::Gtk.CheckButton ();
+			this.includeKeywordsCheckbutton = new global::Gtk.CheckButton();
 			this.includeKeywordsCheckbutton.CanFocus = true;
 			this.includeKeywordsCheckbutton.Name = "includeKeywordsCheckbutton";
-			this.includeKeywordsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Include _keywords in completion list");
+			this.includeKeywordsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Include _keywords in completion list");
 			this.includeKeywordsCheckbutton.DrawIndicator = true;
 			this.includeKeywordsCheckbutton.UseUnderline = true;
-			this.hbox4.Add (this.includeKeywordsCheckbutton);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.includeKeywordsCheckbutton]));
+			this.hbox4.Add(this.includeKeywordsCheckbutton);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox4[this.includeKeywordsCheckbutton]));
 			w3.Position = 1;
-			this.vbox5.Add (this.hbox4);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox4]));
+			this.vbox5.Add(this.hbox4);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox4]));
 			w4.Position = 1;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox5 = new global::Gtk.HBox ();
+			this.hbox5 = new global::Gtk.HBox();
 			this.hbox5.Name = "hbox5";
 			this.hbox5.Spacing = 6;
 			// Container child hbox5.Gtk.Box+BoxChild
-			this.fixed4 = new global::Gtk.Fixed ();
+			this.fixed4 = new global::Gtk.Fixed();
 			this.fixed4.Name = "fixed4";
 			this.fixed4.HasWindow = false;
-			this.hbox5.Add (this.fixed4);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.fixed4]));
+			this.hbox5.Add(this.fixed4);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.fixed4]));
 			w5.Position = 0;
 			w5.Expand = false;
 			w5.Padding = ((uint)(6));
 			// Container child hbox5.Gtk.Box+BoxChild
-			this.includeCodeSnippetsCheckbutton = new global::Gtk.CheckButton ();
+			this.includeCodeSnippetsCheckbutton = new global::Gtk.CheckButton();
 			this.includeCodeSnippetsCheckbutton.CanFocus = true;
 			this.includeCodeSnippetsCheckbutton.Name = "includeCodeSnippetsCheckbutton";
-			this.includeCodeSnippetsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Include _code snippets in completion list");
+			this.includeCodeSnippetsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Include _code snippets in completion list");
 			this.includeCodeSnippetsCheckbutton.DrawIndicator = true;
 			this.includeCodeSnippetsCheckbutton.UseUnderline = true;
-			this.hbox5.Add (this.includeCodeSnippetsCheckbutton);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.includeCodeSnippetsCheckbutton]));
+			this.hbox5.Add(this.includeCodeSnippetsCheckbutton);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox5[this.includeCodeSnippetsCheckbutton]));
 			w6.Position = 1;
-			this.vbox5.Add (this.hbox5);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox5]));
+			this.vbox5.Add(this.hbox5);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox5]));
 			w7.Position = 2;
 			w7.Expand = false;
 			w7.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.showImportsCheckbutton = new global::Gtk.CheckButton ();
+			this.showImportsCheckbutton = new global::Gtk.CheckButton();
 			this.showImportsCheckbutton.CanFocus = true;
 			this.showImportsCheckbutton.Name = "showImportsCheckbutton";
-			this.showImportsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show import items");
+			this.showImportsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show import items");
 			this.showImportsCheckbutton.DrawIndicator = true;
 			this.showImportsCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.showImportsCheckbutton);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.showImportsCheckbutton]));
+			this.vbox5.Add(this.showImportsCheckbutton);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.showImportsCheckbutton]));
 			w8.Position = 3;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.insertParenthesesCheckbutton = new global::Gtk.CheckButton ();
+			this.insertParenthesesCheckbutton = new global::Gtk.CheckButton();
 			this.insertParenthesesCheckbutton.CanFocus = true;
 			this.insertParenthesesCheckbutton.Name = "insertParenthesesCheckbutton";
-			this.insertParenthesesCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("A_utomatically insert parentheses after completion:");
+			this.insertParenthesesCheckbutton.Label = global::Mono.Unix.Catalog.GetString("A_utomatically insert parentheses after completion:");
 			this.insertParenthesesCheckbutton.DrawIndicator = true;
 			this.insertParenthesesCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.insertParenthesesCheckbutton);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.insertParenthesesCheckbutton]));
+			this.vbox5.Add(this.insertParenthesesCheckbutton);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.insertParenthesesCheckbutton]));
 			w9.Position = 4;
 			w9.Expand = false;
 			w9.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.fixed1 = new global::Gtk.Fixed ();
+			this.fixed1 = new global::Gtk.Fixed();
 			this.fixed1.Name = "fixed1";
 			this.fixed1.HasWindow = false;
-			this.hbox2.Add (this.fixed1);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed1]));
+			this.hbox2.Add(this.fixed1);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.fixed1]));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Padding = ((uint)(6));
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.openingRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Opening only"));
+			this.openingRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Opening only"));
 			this.openingRadiobutton.CanFocus = true;
 			this.openingRadiobutton.Name = "openingRadiobutton";
+			this.openingRadiobutton.Active = true;
 			this.openingRadiobutton.DrawIndicator = true;
 			this.openingRadiobutton.UseUnderline = true;
-			this.openingRadiobutton.Group = new global::GLib.SList (global::System.IntPtr.Zero);
-			this.hbox2.Add (this.openingRadiobutton);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.openingRadiobutton]));
+			this.openingRadiobutton.Group = new global::GLib.SList(global::System.IntPtr.Zero);
+			this.hbox2.Add(this.openingRadiobutton);
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.openingRadiobutton]));
 			w11.Position = 1;
-			this.vbox5.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
+			this.vbox5.Add(this.hbox2);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
 			w12.Position = 5;
 			w12.Expand = false;
 			w12.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.fixed2 = new global::Gtk.Fixed ();
+			this.fixed2 = new global::Gtk.Fixed();
 			this.fixed2.Name = "fixed2";
 			this.fixed2.HasWindow = false;
-			this.hbox3.Add (this.fixed2);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.fixed2]));
+			this.hbox3.Add(this.fixed2);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2]));
 			w13.Position = 0;
 			w13.Expand = false;
 			w13.Padding = ((uint)(6));
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.bothRadiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_Both opening and closing"));
+			this.bothRadiobutton = new global::Gtk.RadioButton(global::Mono.Unix.Catalog.GetString("_Both opening and closing"));
 			this.bothRadiobutton.CanFocus = true;
 			this.bothRadiobutton.Name = "bothRadiobutton";
 			this.bothRadiobutton.DrawIndicator = true;
 			this.bothRadiobutton.UseUnderline = true;
 			this.bothRadiobutton.Group = this.openingRadiobutton.Group;
-			this.hbox3.Add (this.bothRadiobutton);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.bothRadiobutton]));
+			this.hbox3.Add(this.bothRadiobutton);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.bothRadiobutton]));
 			w14.Position = 1;
-			this.vbox5.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3]));
+			this.vbox5.Add(this.hbox3);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox3]));
 			w15.Position = 6;
 			w15.Expand = false;
 			w15.Fill = false;
-			this.alignment3.Add (this.vbox5);
-			this.vbox1.Add (this.alignment3);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3]));
+			this.alignment3.Add(this.vbox5);
+			this.vbox1.Add(this.alignment3);
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
 			w17.Position = 0;
 			w17.Expand = false;
 			w17.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Hide ();
+			this.Hide();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
index 27fc99c53f..73a12ec8ea 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
@@ -5,222 +5,242 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	internal partial class GeneralOptionsPanel
 	{
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.Label GtkLabel13;
+
 		private global::Gtk.Alignment alignment2;
+
 		private global::Gtk.VBox vbox4;
+
 		private global::Gtk.HBox hbox3;
+
 		private global::Gtk.Fixed fixed2;
+
 		private global::Gtk.HBox hbox1;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.ComboBox comboboxLineEndings;
+
 		private global::Gtk.Label GtkLabel14;
+
 		private global::Gtk.Alignment alignment3;
+
 		private global::Gtk.VBox vbox5;
+
 		private global::Gtk.CheckButton foldingCheckbutton;
+
 		private global::Gtk.CheckButton foldregionsCheckbutton;
+
 		private global::Gtk.CheckButton foldCommentsCheckbutton;
+
 		private global::Gtk.Label GtkLabel15;
+
 		private global::Gtk.Alignment alignment4;
+
 		private global::Gtk.VBox vbox6;
+
 		private global::Gtk.CheckButton wordWrapCheckbutton;
+
 		private global::Gtk.CheckButton antiAliasingCheckbutton;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel13 = new global::Gtk.Label ();
+			this.GtkLabel13 = new global::Gtk.Label();
 			this.GtkLabel13.Name = "GtkLabel13";
 			this.GtkLabel13.Xalign = 0F;
-			this.GtkLabel13.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Coding</b>");
+			this.GtkLabel13.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Coding</b>");
 			this.GtkLabel13.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel13);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel13]));
+			this.vbox1.Add(this.GtkLabel13);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel13]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment2 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment2 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment2.Name = "alignment2";
 			this.alignment2.LeftPadding = ((uint)(12));
 			// Container child alignment2.Gtk.Container+ContainerChild
-			this.vbox4 = new global::Gtk.VBox ();
+			this.vbox4 = new global::Gtk.VBox();
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3 = new global::Gtk.HBox();
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.fixed2 = new global::Gtk.Fixed ();
+			this.fixed2 = new global::Gtk.Fixed();
 			this.fixed2.Name = "fixed2";
 			this.fixed2.HasWindow = false;
-			this.hbox3.Add (this.fixed2);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.fixed2]));
+			this.hbox3.Add(this.fixed2);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.fixed2]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Padding = ((uint)(6));
-			this.vbox4.Add (this.hbox3);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox3]));
+			this.vbox4.Add(this.hbox3);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox3]));
 			w3.Position = 0;
 			w3.Expand = false;
 			w3.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Line ending conversion:");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Line ending conversion:");
 			this.label1.UseUnderline = true;
-			this.hbox1.Add (this.label1);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label1]));
+			this.hbox1.Add(this.label1);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1]));
 			w4.Position = 0;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.comboboxLineEndings = global::Gtk.ComboBox.NewText ();
+			this.comboboxLineEndings = global::Gtk.ComboBox.NewText();
 			this.comboboxLineEndings.Name = "comboboxLineEndings";
-			this.hbox1.Add (this.comboboxLineEndings);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboboxLineEndings]));
+			this.hbox1.Add(this.comboboxLineEndings);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.comboboxLineEndings]));
 			w5.Position = 1;
 			w5.Expand = false;
 			w5.Fill = false;
-			this.vbox4.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox1]));
+			this.vbox4.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.hbox1]));
 			w6.Position = 1;
 			w6.Expand = false;
 			w6.Fill = false;
-			this.alignment2.Add (this.vbox4);
-			this.vbox1.Add (this.alignment2);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment2]));
+			this.alignment2.Add(this.vbox4);
+			this.vbox1.Add(this.alignment2);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment2]));
 			w8.Position = 1;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel14 = new global::Gtk.Label ();
+			this.GtkLabel14 = new global::Gtk.Label();
 			this.GtkLabel14.Name = "GtkLabel14";
 			this.GtkLabel14.Xalign = 0F;
-			this.GtkLabel14.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Code Folding</b>");
+			this.GtkLabel14.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Code Folding</b>");
 			this.GtkLabel14.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel14);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel14]));
+			this.vbox1.Add(this.GtkLabel14);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel14]));
 			w9.Position = 2;
 			w9.Expand = false;
 			w9.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment3 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment3.Name = "alignment3";
 			this.alignment3.LeftPadding = ((uint)(12));
 			// Container child alignment3.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.foldingCheckbutton = new global::Gtk.CheckButton ();
+			this.foldingCheckbutton = new global::Gtk.CheckButton();
 			this.foldingCheckbutton.CanFocus = true;
 			this.foldingCheckbutton.Name = "foldingCheckbutton";
-			this.foldingCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Enable code _folding");
+			this.foldingCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Enable code _folding");
 			this.foldingCheckbutton.DrawIndicator = true;
 			this.foldingCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.foldingCheckbutton);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.foldingCheckbutton]));
+			this.vbox5.Add(this.foldingCheckbutton);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.foldingCheckbutton]));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.foldregionsCheckbutton = new global::Gtk.CheckButton ();
+			this.foldregionsCheckbutton = new global::Gtk.CheckButton();
 			this.foldregionsCheckbutton.CanFocus = true;
 			this.foldregionsCheckbutton.Name = "foldregionsCheckbutton";
-			this.foldregionsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Fold #_regions by default");
+			this.foldregionsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Fold #_regions by default");
 			this.foldregionsCheckbutton.DrawIndicator = true;
 			this.foldregionsCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.foldregionsCheckbutton);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.foldregionsCheckbutton]));
+			this.vbox5.Add(this.foldregionsCheckbutton);
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.foldregionsCheckbutton]));
 			w11.Position = 1;
 			w11.Expand = false;
 			w11.Fill = false;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.foldCommentsCheckbutton = new global::Gtk.CheckButton ();
+			this.foldCommentsCheckbutton = new global::Gtk.CheckButton();
 			this.foldCommentsCheckbutton.CanFocus = true;
 			this.foldCommentsCheckbutton.Name = "foldCommentsCheckbutton";
-			this.foldCommentsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Fold _comments by default");
+			this.foldCommentsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Fold _comments by default");
 			this.foldCommentsCheckbutton.DrawIndicator = true;
 			this.foldCommentsCheckbutton.UseUnderline = true;
-			this.vbox5.Add (this.foldCommentsCheckbutton);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.foldCommentsCheckbutton]));
+			this.vbox5.Add(this.foldCommentsCheckbutton);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.foldCommentsCheckbutton]));
 			w12.Position = 2;
 			w12.Expand = false;
 			w12.Fill = false;
-			this.alignment3.Add (this.vbox5);
-			this.vbox1.Add (this.alignment3);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment3]));
+			this.alignment3.Add(this.vbox5);
+			this.vbox1.Add(this.alignment3);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment3]));
 			w14.Position = 3;
 			w14.Expand = false;
 			w14.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel15 = new global::Gtk.Label ();
+			this.GtkLabel15 = new global::Gtk.Label();
 			this.GtkLabel15.Name = "GtkLabel15";
 			this.GtkLabel15.Xalign = 0F;
-			this.GtkLabel15.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Appearance</b>");
+			this.GtkLabel15.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Appearance</b>");
 			this.GtkLabel15.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel15);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel15]));
+			this.vbox1.Add(this.GtkLabel15);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel15]));
 			w15.Position = 4;
 			w15.Expand = false;
 			w15.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment4 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment4 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment4.Name = "alignment4";
 			this.alignment4.LeftPadding = ((uint)(12));
 			// Container child alignment4.Gtk.Container+ContainerChild
-			this.vbox6 = new global::Gtk.VBox ();
+			this.vbox6 = new global::Gtk.VBox();
 			this.vbox6.Name = "vbox6";
 			this.vbox6.Spacing = 6;
 			// Container child vbox6.Gtk.Box+BoxChild
-			this.wordWrapCheckbutton = new global::Gtk.CheckButton ();
+			this.wordWrapCheckbutton = new global::Gtk.CheckButton();
 			this.wordWrapCheckbutton.CanFocus = true;
 			this.wordWrapCheckbutton.Name = "wordWrapCheckbutton";
-			this.wordWrapCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Word wrap");
+			this.wordWrapCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Word wrap");
 			this.wordWrapCheckbutton.DrawIndicator = true;
 			this.wordWrapCheckbutton.UseUnderline = true;
-			this.vbox6.Add (this.wordWrapCheckbutton);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.wordWrapCheckbutton]));
+			this.vbox6.Add(this.wordWrapCheckbutton);
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.wordWrapCheckbutton]));
 			w16.Position = 0;
 			w16.Expand = false;
 			w16.Fill = false;
 			// Container child vbox6.Gtk.Box+BoxChild
-			this.antiAliasingCheckbutton = new global::Gtk.CheckButton ();
+			this.antiAliasingCheckbutton = new global::Gtk.CheckButton();
 			this.antiAliasingCheckbutton.CanFocus = true;
 			this.antiAliasingCheckbutton.Name = "antiAliasingCheckbutton";
-			this.antiAliasingCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Use anti aliasing");
+			this.antiAliasingCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Use anti aliasing");
 			this.antiAliasingCheckbutton.DrawIndicator = true;
 			this.antiAliasingCheckbutton.UseUnderline = true;
-			this.vbox6.Add (this.antiAliasingCheckbutton);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.antiAliasingCheckbutton]));
+			this.vbox6.Add(this.antiAliasingCheckbutton);
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.antiAliasingCheckbutton]));
 			w17.Position = 1;
 			w17.Expand = false;
 			w17.Fill = false;
-			this.alignment4.Add (this.vbox6);
-			this.vbox1.Add (this.alignment4);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment4]));
+			this.alignment4.Add(this.vbox6);
+			this.vbox1.Add(this.alignment4);
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment4]));
 			w19.Position = 5;
 			w19.Expand = false;
 			w19.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
 			this.label1.MnemonicWidget = this.comboboxLineEndings;
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
index b3e59c99f9..28afed11c1 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
@@ -5,176 +5,177 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class HighlightingPanel
 	{
 		private global::Gtk.VBox vbox4;
-		
+
 		private global::Gtk.Label GtkLabel5;
-		
+
 		private global::Gtk.Alignment GtkAlignment;
-		
+
 		private global::Gtk.VBox vbox5;
-		
+
 		private global::Gtk.HBox hbox1;
-		
+
 		private global::Gtk.ScrolledWindow scrolledwindow1;
-		
+
 		private global::Gtk.TreeView styleTreeview;
-		
+
 		private global::Gtk.VBox vbox1;
-		
+
 		private global::Gtk.Button buttonNew;
-		
+
 		private global::Gtk.Button buttonEdit;
-		
+
 		private global::Gtk.HBox hbox2;
-		
+
 		private global::Gtk.Button addButton;
-		
+
 		private global::Gtk.Button removeButton;
-		
+
 		private global::Gtk.Button buttonExport;
 
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.Gtk.Container+ContainerChild
-			this.vbox4 = new global::Gtk.VBox ();
+			this.vbox4 = new global::Gtk.VBox();
 			this.vbox4.Name = "vbox4";
 			this.vbox4.Spacing = 6;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.GtkLabel5 = new global::Gtk.Label ();
+			this.GtkLabel5 = new global::Gtk.Label();
 			this.GtkLabel5.Name = "GtkLabel5";
 			this.GtkLabel5.Xalign = 0F;
-			this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Color scheme</b>");
+			this.GtkLabel5.LabelProp = global::Mono.Unix.Catalog.GetString("<b>Color scheme</b>");
 			this.GtkLabel5.UseMarkup = true;
-			this.vbox4.Add (this.GtkLabel5);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkLabel5]));
+			this.vbox4.Add(this.GtkLabel5);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.GtkLabel5]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.GtkAlignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
+			this.GtkAlignment = new global::Gtk.Alignment(0F, 0F, 1F, 1F);
 			this.GtkAlignment.Name = "GtkAlignment";
 			this.GtkAlignment.LeftPadding = ((uint)(12));
 			// Container child GtkAlignment.Gtk.Container+ContainerChild
-			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5 = new global::Gtk.VBox();
 			this.vbox5.Name = "vbox5";
 			this.vbox5.Spacing = 6;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1 = new global::Gtk.HBox();
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
+			this.scrolledwindow1 = new global::Gtk.ScrolledWindow();
 			this.scrolledwindow1.CanFocus = true;
 			this.scrolledwindow1.Name = "scrolledwindow1";
 			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			global::Gtk.Viewport w2 = new global::Gtk.Viewport ();
+			global::Gtk.Viewport w2 = new global::Gtk.Viewport();
 			w2.ShadowType = ((global::Gtk.ShadowType)(0));
 			// Container child GtkViewport.Gtk.Container+ContainerChild
-			this.styleTreeview = new global::Gtk.TreeView ();
+			this.styleTreeview = new global::Gtk.TreeView();
 			this.styleTreeview.CanFocus = true;
 			this.styleTreeview.Name = "styleTreeview";
 			this.styleTreeview.HeadersVisible = false;
-			w2.Add (this.styleTreeview);
-			this.scrolledwindow1.Add (w2);
-			this.hbox1.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.scrolledwindow1]));
+			w2.Add(this.styleTreeview);
+			this.scrolledwindow1.Add(w2);
+			this.hbox1.Add(this.scrolledwindow1);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1]));
 			w5.Position = 0;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.buttonNew = new global::Gtk.Button ();
+			this.buttonNew = new global::Gtk.Button();
 			this.buttonNew.CanFocus = true;
 			this.buttonNew.Name = "buttonNew";
 			this.buttonNew.UseStock = true;
 			this.buttonNew.UseUnderline = true;
 			this.buttonNew.Label = "gtk-new";
-			this.vbox1.Add (this.buttonNew);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.buttonNew]));
+			this.vbox1.Add(this.buttonNew);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.buttonNew]));
 			w6.Position = 0;
 			w6.Expand = false;
 			w6.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.buttonEdit = new global::Gtk.Button ();
+			this.buttonEdit = new global::Gtk.Button();
 			this.buttonEdit.CanFocus = true;
 			this.buttonEdit.Name = "buttonEdit";
 			this.buttonEdit.UseUnderline = true;
-			this.buttonEdit.Label = global::Mono.Unix.Catalog.GetString ("_Edit");
-			this.vbox1.Add (this.buttonEdit);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.buttonEdit]));
+			this.buttonEdit.Label = global::Mono.Unix.Catalog.GetString("_Edit");
+			this.vbox1.Add(this.buttonEdit);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.buttonEdit]));
 			w7.Position = 1;
 			w7.Expand = false;
 			w7.Fill = false;
-			this.hbox1.Add (this.vbox1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox1]));
+			this.hbox1.Add(this.vbox1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox1]));
 			w8.Position = 1;
 			w8.Expand = false;
 			w8.Fill = false;
-			this.vbox5.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox1]));
+			this.vbox5.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox1]));
 			w9.Position = 0;
 			// Container child vbox5.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2 = new global::Gtk.HBox();
 			this.hbox2.Name = "hbox2";
 			this.hbox2.Spacing = 6;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.addButton = new global::Gtk.Button ();
+			this.addButton = new global::Gtk.Button();
 			this.addButton.CanFocus = true;
 			this.addButton.Name = "addButton";
 			this.addButton.UseStock = true;
 			this.addButton.UseUnderline = true;
 			this.addButton.Label = "gtk-add";
-			this.hbox2.Add (this.addButton);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.addButton]));
+			this.hbox2.Add(this.addButton);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.addButton]));
 			w10.PackType = ((global::Gtk.PackType)(1));
 			w10.Position = 0;
 			w10.Expand = false;
 			w10.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.removeButton = new global::Gtk.Button ();
+			this.removeButton = new global::Gtk.Button();
 			this.removeButton.CanFocus = true;
 			this.removeButton.Name = "removeButton";
 			this.removeButton.UseStock = true;
 			this.removeButton.UseUnderline = true;
 			this.removeButton.Label = "gtk-remove";
-			this.hbox2.Add (this.removeButton);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.removeButton]));
+			this.hbox2.Add(this.removeButton);
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.removeButton]));
 			w11.PackType = ((global::Gtk.PackType)(1));
 			w11.Position = 1;
 			w11.Expand = false;
 			w11.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.buttonExport = new global::Gtk.Button ();
+			this.buttonExport = new global::Gtk.Button();
 			this.buttonExport.CanFocus = true;
 			this.buttonExport.Name = "buttonExport";
 			this.buttonExport.UseUnderline = true;
-			this.buttonExport.Label = global::Mono.Unix.Catalog.GetString ("Export");
-			this.hbox2.Add (this.buttonExport);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonExport]));
+			this.buttonExport.Label = global::Mono.Unix.Catalog.GetString("Export");
+			this.hbox2.Add(this.buttonExport);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.buttonExport]));
 			w12.PackType = ((global::Gtk.PackType)(1));
 			w12.Position = 2;
 			w12.Expand = false;
 			w12.Fill = false;
-			this.vbox5.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
+			this.vbox5.Add(this.hbox2);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
 			w13.PackType = ((global::Gtk.PackType)(1));
 			w13.Position = 1;
 			w13.Expand = false;
 			w13.Fill = false;
-			this.GtkAlignment.Add (this.vbox5);
-			this.vbox4.Add (this.GtkAlignment);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkAlignment]));
+			this.GtkAlignment.Add(this.vbox5);
+			this.vbox4.Add(this.GtkAlignment);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.GtkAlignment]));
 			w15.Position = 1;
-			this.Add (this.vbox4);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox4);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs
index e186e1dc05..7da2e57e69 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.cs
@@ -5,176 +5,194 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class MarkerPanel
 	{
 		private global::Gtk.VBox vbox1;
+
 		private global::Gtk.Label GtkLabel9;
+
 		private global::Gtk.Alignment alignment1;
+
 		private global::Gtk.VBox vbox3;
+
 		private global::Gtk.CheckButton showLineNumbersCheckbutton;
+
 		private global::Gtk.CheckButton underlineErrorsCheckbutton;
+
 		private global::Gtk.CheckButton highlightMatchingBracketCheckbutton;
+
 		private global::Gtk.CheckButton highlightCurrentLineCheckbutton;
+
 		private global::Gtk.CheckButton showRulerCheckbutton;
+
 		private global::Gtk.CheckButton enableAnimationCheckbutton1;
+
 		private global::Gtk.CheckButton enableHighlightUsagesCheckbutton;
+
 		private global::Gtk.CheckButton drawIndentMarkersCheckbutton;
+
 		private global::Gtk.CheckButton enableQuickDiffCheckbutton;
+
 		private global::Gtk.Table table1;
+
 		private global::Gtk.CheckButton checkbuttonLineEndings;
+
 		private global::Gtk.CheckButton checkbuttonSpaces;
+
 		private global::Gtk.CheckButton checkbuttonTabs;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.ComboBox showWhitespacesCombobox;
-		
-		protected virtual void Build ()
+
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.MarkerPanel
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.MarkerPanel";
 			// Container child MonoDevelop.SourceEditor.OptionPanels.MarkerPanel.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel9 = new global::Gtk.Label ();
+			this.GtkLabel9 = new global::Gtk.Label();
 			this.GtkLabel9.Name = "GtkLabel9";
 			this.GtkLabel9.Xalign = 0F;
-			this.GtkLabel9.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>General</b>");
+			this.GtkLabel9.LabelProp = global::Mono.Unix.Catalog.GetString("<b>General</b>");
 			this.GtkLabel9.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel9);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkLabel9]));
+			this.vbox1.Add(this.GtkLabel9);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel9]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment1 = new global::Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
 			this.alignment1.Name = "alignment1";
 			this.alignment1.LeftPadding = ((uint)(12));
 			// Container child alignment1.Gtk.Container+ContainerChild
-			this.vbox3 = new global::Gtk.VBox ();
+			this.vbox3 = new global::Gtk.VBox();
 			this.vbox3.Name = "vbox3";
 			this.vbox3.Spacing = 6;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.showLineNumbersCheckbutton = new global::Gtk.CheckButton ();
+			this.showLineNumbersCheckbutton = new global::Gtk.CheckButton();
 			this.showLineNumbersCheckbutton.CanFocus = true;
 			this.showLineNumbersCheckbutton.Name = "showLineNumbersCheckbutton";
-			this.showLineNumbersCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show line numbers");
+			this.showLineNumbersCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show line numbers");
 			this.showLineNumbersCheckbutton.DrawIndicator = true;
 			this.showLineNumbersCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.showLineNumbersCheckbutton);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.showLineNumbersCheckbutton]));
+			this.vbox3.Add(this.showLineNumbersCheckbutton);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.showLineNumbersCheckbutton]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.underlineErrorsCheckbutton = new global::Gtk.CheckButton ();
+			this.underlineErrorsCheckbutton = new global::Gtk.CheckButton();
 			this.underlineErrorsCheckbutton.CanFocus = true;
 			this.underlineErrorsCheckbutton.Name = "underlineErrorsCheckbutton";
-			this.underlineErrorsCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Underline errors");
+			this.underlineErrorsCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Underline errors");
 			this.underlineErrorsCheckbutton.DrawIndicator = true;
 			this.underlineErrorsCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.underlineErrorsCheckbutton);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.underlineErrorsCheckbutton]));
+			this.vbox3.Add(this.underlineErrorsCheckbutton);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.underlineErrorsCheckbutton]));
 			w3.Position = 1;
 			w3.Expand = false;
 			w3.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.highlightMatchingBracketCheckbutton = new global::Gtk.CheckButton ();
+			this.highlightMatchingBracketCheckbutton = new global::Gtk.CheckButton();
 			this.highlightMatchingBracketCheckbutton.CanFocus = true;
 			this.highlightMatchingBracketCheckbutton.Name = "highlightMatchingBracketCheckbutton";
-			this.highlightMatchingBracketCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Highlight matching braces");
+			this.highlightMatchingBracketCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Highlight matching braces");
 			this.highlightMatchingBracketCheckbutton.DrawIndicator = true;
 			this.highlightMatchingBracketCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.highlightMatchingBracketCheckbutton);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.highlightMatchingBracketCheckbutton]));
+			this.vbox3.Add(this.highlightMatchingBracketCheckbutton);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.highlightMatchingBracketCheckbutton]));
 			w4.Position = 2;
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.highlightCurrentLineCheckbutton = new global::Gtk.CheckButton ();
+			this.highlightCurrentLineCheckbutton = new global::Gtk.CheckButton();
 			this.highlightCurrentLineCheckbutton.CanFocus = true;
 			this.highlightCurrentLineCheckbutton.Name = "highlightCurrentLineCheckbutton";
-			this.highlightCurrentLineCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Highlight _current line");
+			this.highlightCurrentLineCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Highlight _current line");
 			this.highlightCurrentLineCheckbutton.DrawIndicator = true;
 			this.highlightCurrentLineCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.highlightCurrentLineCheckbutton);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.highlightCurrentLineCheckbutton]));
+			this.vbox3.Add(this.highlightCurrentLineCheckbutton);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.highlightCurrentLineCheckbutton]));
 			w5.Position = 3;
 			w5.Expand = false;
 			w5.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.showRulerCheckbutton = new global::Gtk.CheckButton ();
+			this.showRulerCheckbutton = new global::Gtk.CheckButton();
 			this.showRulerCheckbutton.CanFocus = true;
 			this.showRulerCheckbutton.Name = "showRulerCheckbutton";
-			this.showRulerCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Show _column ruler");
+			this.showRulerCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Show _column ruler");
 			this.showRulerCheckbutton.DrawIndicator = true;
 			this.showRulerCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.showRulerCheckbutton);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.showRulerCheckbutton]));
+			this.vbox3.Add(this.showRulerCheckbutton);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.showRulerCheckbutton]));
 			w6.Position = 4;
 			w6.Expand = false;
 			w6.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.enableAnimationCheckbutton1 = new global::Gtk.CheckButton ();
+			this.enableAnimationCheckbutton1 = new global::Gtk.CheckButton();
 			this.enableAnimationCheckbutton1.CanFocus = true;
 			this.enableAnimationCheckbutton1.Name = "enableAnimationCheckbutton1";
-			this.enableAnimationCheckbutton1.Label = global::Mono.Unix.Catalog.GetString ("_Enable animations");
+			this.enableAnimationCheckbutton1.Label = global::Mono.Unix.Catalog.GetString("_Enable animations");
 			this.enableAnimationCheckbutton1.DrawIndicator = true;
 			this.enableAnimationCheckbutton1.UseUnderline = true;
-			this.vbox3.Add (this.enableAnimationCheckbutton1);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.enableAnimationCheckbutton1]));
+			this.vbox3.Add(this.enableAnimationCheckbutton1);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.enableAnimationCheckbutton1]));
 			w7.Position = 5;
 			w7.Expand = false;
 			w7.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.enableHighlightUsagesCheckbutton = new global::Gtk.CheckButton ();
+			this.enableHighlightUsagesCheckbutton = new global::Gtk.CheckButton();
 			this.enableHighlightUsagesCheckbutton.CanFocus = true;
 			this.enableHighlightUsagesCheckbutton.Name = "enableHighlightUsagesCheckbutton";
-			this.enableHighlightUsagesCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("Highlight _identifier references");
+			this.enableHighlightUsagesCheckbutton.Label = global::Mono.Unix.Catalog.GetString("Highlight _identifier references");
 			this.enableHighlightUsagesCheckbutton.DrawIndicator = true;
 			this.enableHighlightUsagesCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.enableHighlightUsagesCheckbutton);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.enableHighlightUsagesCheckbutton]));
+			this.vbox3.Add(this.enableHighlightUsagesCheckbutton);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.enableHighlightUsagesCheckbutton]));
 			w8.Position = 6;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.drawIndentMarkersCheckbutton = new global::Gtk.CheckButton ();
+			this.drawIndentMarkersCheckbutton = new global::Gtk.CheckButton();
 			this.drawIndentMarkersCheckbutton.CanFocus = true;
 			this.drawIndentMarkersCheckbutton.Name = "drawIndentMarkersCheckbutton";
-			this.drawIndentMarkersCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Show indentation guides");
+			this.drawIndentMarkersCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Show indentation guides");
 			this.drawIndentMarkersCheckbutton.DrawIndicator = true;
 			this.drawIndentMarkersCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.drawIndentMarkersCheckbutton);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.drawIndentMarkersCheckbutton]));
+			this.vbox3.Add(this.drawIndentMarkersCheckbutton);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.drawIndentMarkersCheckbutton]));
 			w9.Position = 7;
 			w9.Expand = false;
 			w9.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.enableQuickDiffCheckbutton = new global::Gtk.CheckButton ();
+			this.enableQuickDiffCheckbutton = new global::Gtk.CheckButton();
 			this.enableQuickDiffCheckbutton.CanFocus = true;
 			this.enableQuickDiffCheckbutton.Name = "enableQuickDiffCheckbutton";
-			this.enableQuickDiffCheckbutton.Label = global::Mono.Unix.Catalog.GetString ("_Visualize changed lines");
+			this.enableQuickDiffCheckbutton.Label = global::Mono.Unix.Catalog.GetString("_Visualize changed lines");
 			this.enableQuickDiffCheckbutton.DrawIndicator = true;
 			this.enableQuickDiffCheckbutton.UseUnderline = true;
-			this.vbox3.Add (this.enableQuickDiffCheckbutton);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.enableQuickDiffCheckbutton]));
+			this.vbox3.Add(this.enableQuickDiffCheckbutton);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.enableQuickDiffCheckbutton]));
 			w10.Position = 8;
 			w10.Expand = false;
 			w10.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(4)), false);
+			this.table1 = new global::Gtk.Table(((uint)(4)), ((uint)(4)), false);
 			this.table1.Name = "table1";
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			// Container child table1.Gtk.Table+TableChild
-			this.checkbuttonLineEndings = new global::Gtk.CheckButton ();
+			this.checkbuttonLineEndings = new global::Gtk.CheckButton();
 			this.checkbuttonLineEndings.CanFocus = true;
 			this.checkbuttonLineEndings.Name = "checkbuttonLineEndings";
-			this.checkbuttonLineEndings.Label = global::Mono.Unix.Catalog.GetString ("Include Line Endings");
+			this.checkbuttonLineEndings.Label = global::Mono.Unix.Catalog.GetString("Include Line Endings");
 			this.checkbuttonLineEndings.DrawIndicator = true;
 			this.checkbuttonLineEndings.UseUnderline = true;
-			this.table1.Add (this.checkbuttonLineEndings);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkbuttonLineEndings]));
+			this.table1.Add(this.checkbuttonLineEndings);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonLineEndings]));
 			w11.TopAttach = ((uint)(3));
 			w11.BottomAttach = ((uint)(4));
 			w11.LeftAttach = ((uint)(1));
@@ -182,14 +200,14 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w11.XOptions = ((global::Gtk.AttachOptions)(4));
 			w11.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.checkbuttonSpaces = new global::Gtk.CheckButton ();
+			this.checkbuttonSpaces = new global::Gtk.CheckButton();
 			this.checkbuttonSpaces.CanFocus = true;
 			this.checkbuttonSpaces.Name = "checkbuttonSpaces";
-			this.checkbuttonSpaces.Label = global::Mono.Unix.Catalog.GetString ("Include _Spaces");
+			this.checkbuttonSpaces.Label = global::Mono.Unix.Catalog.GetString("Include _Spaces");
 			this.checkbuttonSpaces.DrawIndicator = true;
 			this.checkbuttonSpaces.UseUnderline = true;
-			this.table1.Add (this.checkbuttonSpaces);
-			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkbuttonSpaces]));
+			this.table1.Add(this.checkbuttonSpaces);
+			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonSpaces]));
 			w12.TopAttach = ((uint)(1));
 			w12.BottomAttach = ((uint)(2));
 			w12.LeftAttach = ((uint)(1));
@@ -197,14 +215,14 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w12.XOptions = ((global::Gtk.AttachOptions)(4));
 			w12.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.checkbuttonTabs = new global::Gtk.CheckButton ();
+			this.checkbuttonTabs = new global::Gtk.CheckButton();
 			this.checkbuttonTabs.CanFocus = true;
 			this.checkbuttonTabs.Name = "checkbuttonTabs";
-			this.checkbuttonTabs.Label = global::Mono.Unix.Catalog.GetString ("Include Tabs");
+			this.checkbuttonTabs.Label = global::Mono.Unix.Catalog.GetString("Include Tabs");
 			this.checkbuttonTabs.DrawIndicator = true;
 			this.checkbuttonTabs.UseUnderline = true;
-			this.table1.Add (this.checkbuttonTabs);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.checkbuttonTabs]));
+			this.table1.Add(this.checkbuttonTabs);
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonTabs]));
 			w13.TopAttach = ((uint)(2));
 			w13.BottomAttach = ((uint)(3));
 			w13.LeftAttach = ((uint)(1));
@@ -212,38 +230,39 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w13.XOptions = ((global::Gtk.AttachOptions)(4));
 			w13.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Show invisible characters:");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Show invisible characters:");
 			this.label1.UseUnderline = true;
-			this.table1.Add (this.label1);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
+			this.table1.Add(this.label1);
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
 			w14.XOptions = ((global::Gtk.AttachOptions)(4));
 			w14.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.showWhitespacesCombobox = global::Gtk.ComboBox.NewText ();
+			this.showWhitespacesCombobox = global::Gtk.ComboBox.NewText();
 			this.showWhitespacesCombobox.Name = "showWhitespacesCombobox";
-			this.table1.Add (this.showWhitespacesCombobox);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.showWhitespacesCombobox]));
+			this.table1.Add(this.showWhitespacesCombobox);
+			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.showWhitespacesCombobox]));
 			w15.LeftAttach = ((uint)(1));
 			w15.RightAttach = ((uint)(4));
 			w15.XOptions = ((global::Gtk.AttachOptions)(4));
 			w15.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.vbox3.Add (this.table1);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.table1]));
+			this.vbox3.Add(this.table1);
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.table1]));
 			w16.Position = 9;
 			w16.Fill = false;
-			this.alignment1.Add (this.vbox3);
-			this.vbox1.Add (this.alignment1);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.alignment1]));
+			this.alignment1.Add(this.vbox3);
+			this.vbox1.Add(this.alignment1);
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment1]));
 			w18.Position = 1;
 			w18.Expand = false;
 			w18.Fill = false;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs
index 8d919b5500..efa3323b30 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.cs
@@ -5,21 +5,29 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 	public partial class NewColorShemeDialog
 	{
 		private global::Gtk.Table table1;
+
 		private global::Gtk.ComboBox comboboxBaseStyle;
+
 		private global::Gtk.Entry entryDescription;
+
 		private global::Gtk.Entry entryName;
+
 		private global::Gtk.Label label1;
+
 		private global::Gtk.Label label2;
+
 		private global::Gtk.Label label3;
+
 		private global::Gtk.Button buttonCancel;
+
 		private global::Gtk.Button buttonOk;
-		
-		protected virtual void Build ()
+
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog
 			this.Name = "MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog";
-			this.Title = global::Mono.Unix.Catalog.GetString ("Create new color sheme");
+			this.Title = global::Mono.Unix.Catalog.GetString("Create new color sheme");
 			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 			this.BorderWidth = ((uint)(6));
 			// Internal child MonoDevelop.SourceEditor.OptionPanels.NewColorShemeDialog.VBox
@@ -27,26 +35,26 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w1.Name = "dialog1_VBox";
 			w1.BorderWidth = ((uint)(2));
 			// Container child dialog1_VBox.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
+			this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false);
 			this.table1.Name = "table1";
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			// Container child table1.Gtk.Table+TableChild
-			this.comboboxBaseStyle = global::Gtk.ComboBox.NewText ();
+			this.comboboxBaseStyle = global::Gtk.ComboBox.NewText();
 			this.comboboxBaseStyle.Name = "comboboxBaseStyle";
-			this.table1.Add (this.comboboxBaseStyle);
-			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.comboboxBaseStyle]));
+			this.table1.Add(this.comboboxBaseStyle);
+			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.comboboxBaseStyle]));
 			w2.LeftAttach = ((uint)(1));
 			w2.RightAttach = ((uint)(2));
 			w2.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.entryDescription = new global::Gtk.Entry ();
+			this.entryDescription = new global::Gtk.Entry();
 			this.entryDescription.CanFocus = true;
 			this.entryDescription.Name = "entryDescription";
 			this.entryDescription.IsEditable = true;
 			this.entryDescription.InvisibleChar = '●';
-			this.table1.Add (this.entryDescription);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryDescription]));
+			this.table1.Add(this.entryDescription);
+			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.entryDescription]));
 			w3.TopAttach = ((uint)(2));
 			w3.BottomAttach = ((uint)(3));
 			w3.LeftAttach = ((uint)(1));
@@ -54,13 +62,13 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w3.XOptions = ((global::Gtk.AttachOptions)(4));
 			w3.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.entryName = new global::Gtk.Entry ();
+			this.entryName = new global::Gtk.Entry();
 			this.entryName.CanFocus = true;
 			this.entryName.Name = "entryName";
 			this.entryName.IsEditable = true;
 			this.entryName.InvisibleChar = '●';
-			this.table1.Add (this.entryName);
-			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.entryName]));
+			this.table1.Add(this.entryName);
+			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.entryName]));
 			w4.TopAttach = ((uint)(1));
 			w4.BottomAttach = ((uint)(2));
 			w4.LeftAttach = ((uint)(1));
@@ -68,41 +76,41 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w4.XOptions = ((global::Gtk.AttachOptions)(4));
 			w4.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label1 = new global::Gtk.Label ();
+			this.label1 = new global::Gtk.Label();
 			this.label1.Name = "label1";
 			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Based on:");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("_Based on:");
 			this.label1.UseMarkup = true;
 			this.label1.UseUnderline = true;
-			this.table1.Add (this.label1);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
+			this.table1.Add(this.label1);
+			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
 			w5.XOptions = ((global::Gtk.AttachOptions)(4));
 			w5.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label2 = new global::Gtk.Label ();
+			this.label2 = new global::Gtk.Label();
 			this.label2.Name = "label2";
 			this.label2.Xalign = 0F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("_Name:");
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("_Name:");
 			this.label2.UseUnderline = true;
-			this.table1.Add (this.label2);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
+			this.table1.Add(this.label2);
+			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.label2]));
 			w6.TopAttach = ((uint)(1));
 			w6.BottomAttach = ((uint)(2));
 			w6.XOptions = ((global::Gtk.AttachOptions)(4));
 			w6.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.label3 = new global::Gtk.Label ();
+			this.label3 = new global::Gtk.Label();
 			this.label3.Name = "label3";
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("_Description:");
+			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("_Description:");
 			this.label3.UseUnderline = true;
-			this.table1.Add (this.label3);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
+			this.table1.Add(this.label3);
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
 			w7.TopAttach = ((uint)(2));
 			w7.BottomAttach = ((uint)(3));
 			w7.XOptions = ((global::Gtk.AttachOptions)(4));
 			w7.YOptions = ((global::Gtk.AttachOptions)(4));
-			w1.Add (this.table1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1 [this.table1]));
+			w1.Add(this.table1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
 			w8.Position = 0;
 			w8.Expand = false;
 			w8.Fill = false;
@@ -113,38 +121,39 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			w9.BorderWidth = ((uint)(5));
 			w9.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonCancel = new global::Gtk.Button ();
+			this.buttonCancel = new global::Gtk.Button();
 			this.buttonCancel.CanDefault = true;
 			this.buttonCancel.CanFocus = true;
 			this.buttonCancel.Name = "buttonCancel";
 			this.buttonCancel.UseStock = true;
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9 [this.buttonCancel]));
+			this.AddActionWidget(this.buttonCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonCancel]));
 			w10.Expand = false;
 			w10.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.buttonOk = new global::Gtk.Button ();
+			this.buttonOk = new global::Gtk.Button();
 			this.buttonOk.CanDefault = true;
 			this.buttonOk.CanFocus = true;
 			this.buttonOk.Name = "buttonOk";
 			this.buttonOk.UseStock = true;
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9 [this.buttonOk]));
+			this.AddActionWidget(this.buttonOk, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonOk]));
 			w11.Position = 1;
 			w11.Expand = false;
 			w11.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
 			this.DefaultWidth = 393;
 			this.DefaultHeight = 148;
 			this.label2.MnemonicWidget = this.entryName;
 			this.label3.MnemonicWidget = this.entryDescription;
-			this.Show ();
+			this.Show();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs
index 397cff6550..a4f72fc66a 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.PrintSettingsWidget.cs
@@ -4,16 +4,17 @@ namespace MonoDevelop.SourceEditor
 {
 	internal partial class PrintSettingsWidget
 	{
-		protected virtual void Build ()
+		protected virtual void Build()
 		{
-			global::Stetic.Gui.Initialize (this);
+			global::Stetic.Gui.Initialize(this);
 			// Widget MonoDevelop.SourceEditor.PrintSettingsWidget
-			global::Stetic.BinContainer.Attach (this);
+			global::Stetic.BinContainer.Attach(this);
 			this.Name = "MonoDevelop.SourceEditor.PrintSettingsWidget";
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
-			this.Hide ();
+			this.Hide();
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
index 1768c2468d..747ee9c089 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs
@@ -5,30 +5,43 @@ namespace MonoDevelop.SourceEditor
 	public partial class SearchAndReplaceWidget
 	{
 		private global::Gtk.Table table;
+		
 		private global::Gtk.Button buttonSearchMode;
+		
 		private global::Gtk.Arrow searchButtonModeArrow;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::MonoDevelop.Components.SearchEntry searchEntry;
+		
 		private global::Gtk.Button buttonSearchBackward;
-		private global::Gtk.EventBox eventbox2;
-		private global::Gtk.Image image2;
+		
+		private global::MonoDevelop.Components.ImageView image2;
+		
 		private global::Gtk.Button buttonSearchForward;
-		private global::Gtk.EventBox eventbox3;
-		private global::Gtk.Image image3;
+		
+		private global::MonoDevelop.Components.ImageView image3;
+		
 		private global::Gtk.Button closeButton;
-		private global::Gtk.EventBox eventbox4;
-		private global::Gtk.Image image4;
+		
+		private global::MonoDevelop.Components.ImageView image4;
+		
 		private global::Gtk.HBox hbox2;
+		
 		private global::Gtk.Entry entryReplace;
+		
 		private global::Gtk.Button buttonReplace;
-		private global::Gtk.EventBox eventbox5;
-		private global::Gtk.Image image5;
+		
+		private global::MonoDevelop.Components.ImageView image5;
+		
 		private global::Gtk.Button buttonReplaceAll;
+		
 		private global::Gtk.HBox hbox3;
-		private global::Gtk.EventBox eventbox6;
-		private global::Gtk.Image image6;
-		private global::Gtk.Label label1;
 		
+		private global::MonoDevelop.Components.ImageView image6;
+		
+		private global::Gtk.Label label1;
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -47,7 +60,6 @@ namespace MonoDevelop.SourceEditor
 			this.searchButtonModeArrow = new global::Gtk.Arrow (((global::Gtk.ArrowType)(0)), ((global::Gtk.ShadowType)(0)));
 			this.searchButtonModeArrow.Name = "searchButtonModeArrow";
 			this.buttonSearchMode.Add (this.searchButtonModeArrow);
-			this.buttonSearchMode.Label = null;
 			this.table.Add (this.buttonSearchMode);
 			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table [this.buttonSearchMode]));
 			w2.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -74,71 +86,53 @@ namespace MonoDevelop.SourceEditor
 			this.buttonSearchBackward.Name = "buttonSearchBackward";
 			this.buttonSearchBackward.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonSearchBackward.Gtk.Container+ContainerChild
-			this.eventbox2 = new global::Gtk.EventBox ();
-			this.eventbox2.Name = "eventbox2";
-			this.eventbox2.AboveChild = true;
-			this.eventbox2.VisibleWindow = false;
-			// Container child eventbox2.Gtk.Container+ContainerChild
-			this.image2 = new global::Gtk.Image ();
+			this.image2 = new global::MonoDevelop.Components.ImageView ();
 			this.image2.Name = "image2";
-			this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-up", global::Gtk.IconSize.Menu);
-			this.eventbox2.Add (this.image2);
-			this.buttonSearchBackward.Add (this.eventbox2);
-			this.buttonSearchBackward.Label = null;
+			this.image2.IconId = "gtk-go-up";
+			this.image2.IconSize = ((global::Gtk.IconSize)(1));
+			this.buttonSearchBackward.Add (this.image2);
 			this.hbox1.Add (this.buttonSearchBackward);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchBackward]));
-			w6.Position = 1;
-			w6.Expand = false;
-			w6.Fill = false;
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchBackward]));
+			w5.Position = 1;
+			w5.Expand = false;
+			w5.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
 			this.buttonSearchForward = new global::Gtk.Button ();
 			this.buttonSearchForward.CanFocus = true;
 			this.buttonSearchForward.Name = "buttonSearchForward";
 			this.buttonSearchForward.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonSearchForward.Gtk.Container+ContainerChild
-			this.eventbox3 = new global::Gtk.EventBox ();
-			this.eventbox3.Name = "eventbox3";
-			this.eventbox3.AboveChild = true;
-			this.eventbox3.VisibleWindow = false;
-			// Container child eventbox3.Gtk.Container+ContainerChild
-			this.image3 = new global::Gtk.Image ();
+			this.image3 = new global::MonoDevelop.Components.ImageView ();
 			this.image3.Name = "image3";
-			this.image3.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-down", global::Gtk.IconSize.Menu);
-			this.eventbox3.Add (this.image3);
-			this.buttonSearchForward.Add (this.eventbox3);
-			this.buttonSearchForward.Label = null;
+			this.image3.IconId = "gtk-go-down";
+			this.image3.IconSize = ((global::Gtk.IconSize)(1));
+			this.buttonSearchForward.Add (this.image3);
 			this.hbox1.Add (this.buttonSearchForward);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchForward]));
-			w9.Position = 2;
-			w9.Expand = false;
-			w9.Fill = false;
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchForward]));
+			w7.Position = 2;
+			w7.Expand = false;
+			w7.Fill = false;
 			// Container child hbox1.Gtk.Box+BoxChild
 			this.closeButton = new global::Gtk.Button ();
 			this.closeButton.CanFocus = true;
 			this.closeButton.Name = "closeButton";
 			this.closeButton.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child closeButton.Gtk.Container+ContainerChild
-			this.eventbox4 = new global::Gtk.EventBox ();
-			this.eventbox4.Name = "eventbox4";
-			this.eventbox4.AboveChild = true;
-			this.eventbox4.VisibleWindow = false;
-			// Container child eventbox4.Gtk.Container+ContainerChild
-			this.image4 = new global::Gtk.Image ();
+			this.image4 = new global::MonoDevelop.Components.ImageView ();
 			this.image4.Name = "image4";
-			this.image4.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-close", global::Gtk.IconSize.Menu);
-			this.eventbox4.Add (this.image4);
-			this.closeButton.Add (this.eventbox4);
-			this.closeButton.Label = null;
+			this.image4.IconId = "gtk-close";
+			this.image4.IconSize = ((global::Gtk.IconSize)(1));
+			this.closeButton.Add (this.image4);
 			this.hbox1.Add (this.closeButton);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton]));
-			w12.Position = 3;
-			w12.Expand = false;
-			w12.Fill = false;
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton]));
+			w9.Position = 3;
+			w9.Expand = false;
+			w9.Fill = false;
 			this.table.Add (this.hbox1);
-			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table [this.hbox1]));
-			w13.LeftAttach = ((uint)(1));
-			w13.RightAttach = ((uint)(2));
-			w13.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table [this.hbox1]));
+			w10.LeftAttach = ((uint)(1));
+			w10.RightAttach = ((uint)(2));
+			w10.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table.Gtk.Table+TableChild
 			this.hbox2 = new global::Gtk.HBox ();
 			this.hbox2.Name = "hbox2";
@@ -149,30 +143,24 @@ namespace MonoDevelop.SourceEditor
 			this.entryReplace.IsEditable = true;
 			this.entryReplace.InvisibleChar = '●';
 			this.hbox2.Add (this.entryReplace);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.entryReplace]));
-			w14.Position = 0;
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.entryReplace]));
+			w11.Position = 0;
 			// Container child hbox2.Gtk.Box+BoxChild
 			this.buttonReplace = new global::Gtk.Button ();
 			this.buttonReplace.CanFocus = true;
 			this.buttonReplace.Name = "buttonReplace";
 			this.buttonReplace.Relief = ((global::Gtk.ReliefStyle)(2));
 			// Container child buttonReplace.Gtk.Container+ContainerChild
-			this.eventbox5 = new global::Gtk.EventBox ();
-			this.eventbox5.Name = "eventbox5";
-			this.eventbox5.AboveChild = true;
-			this.eventbox5.VisibleWindow = false;
-			// Container child eventbox5.Gtk.Container+ContainerChild
-			this.image5 = new global::Gtk.Image ();
+			this.image5 = new global::MonoDevelop.Components.ImageView ();
 			this.image5.Name = "image5";
-			this.image5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-find-and-replace", global::Gtk.IconSize.Menu);
-			this.eventbox5.Add (this.image5);
-			this.buttonReplace.Add (this.eventbox5);
-			this.buttonReplace.Label = null;
+			this.image5.IconId = "gtk-find-and-replace";
+			this.image5.IconSize = ((global::Gtk.IconSize)(1));
+			this.buttonReplace.Add (this.image5);
 			this.hbox2.Add (this.buttonReplace);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplace]));
-			w17.Position = 1;
-			w17.Expand = false;
-			w17.Fill = false;
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplace]));
+			w13.Position = 1;
+			w13.Expand = false;
+			w13.Fill = false;
 			// Container child hbox2.Gtk.Box+BoxChild
 			this.buttonReplaceAll = new global::Gtk.Button ();
 			this.buttonReplaceAll.CanFocus = true;
@@ -183,43 +171,37 @@ namespace MonoDevelop.SourceEditor
 			this.hbox3.Name = "hbox3";
 			this.hbox3.Spacing = 6;
 			// Container child hbox3.Gtk.Box+BoxChild
-			this.eventbox6 = new global::Gtk.EventBox ();
-			this.eventbox6.Name = "eventbox6";
-			this.eventbox6.AboveChild = true;
-			this.eventbox6.VisibleWindow = false;
-			// Container child eventbox6.Gtk.Container+ContainerChild
-			this.image6 = new global::Gtk.Image ();
+			this.image6 = new global::MonoDevelop.Components.ImageView ();
 			this.image6.Name = "image6";
-			this.image6.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-find-and-replace", global::Gtk.IconSize.Menu);
-			this.eventbox6.Add (this.image6);
-			this.hbox3.Add (this.eventbox6);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.eventbox6]));
-			w19.Position = 0;
-			w19.Expand = false;
-			w19.Fill = false;
+			this.image6.IconId = "gtk-find-and-replace";
+			this.image6.IconSize = ((global::Gtk.IconSize)(1));
+			this.hbox3.Add (this.image6);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.image6]));
+			w14.Position = 0;
+			w14.Expand = false;
+			w14.Fill = false;
 			// Container child hbox3.Gtk.Box+BoxChild
 			this.label1 = new global::Gtk.Label ();
 			this.label1.Name = "label1";
 			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("All");
 			this.hbox3.Add (this.label1);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label1]));
-			w20.Position = 1;
-			w20.Expand = false;
-			w20.Fill = false;
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label1]));
+			w15.Position = 1;
+			w15.Expand = false;
+			w15.Fill = false;
 			this.buttonReplaceAll.Add (this.hbox3);
-			this.buttonReplaceAll.Label = null;
 			this.hbox2.Add (this.buttonReplaceAll);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplaceAll]));
-			w22.Position = 2;
-			w22.Expand = false;
-			w22.Fill = false;
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplaceAll]));
+			w17.Position = 2;
+			w17.Expand = false;
+			w17.Fill = false;
 			this.table.Add (this.hbox2);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table [this.hbox2]));
-			w23.TopAttach = ((uint)(1));
-			w23.BottomAttach = ((uint)(2));
-			w23.LeftAttach = ((uint)(1));
-			w23.RightAttach = ((uint)(2));
-			w23.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table [this.hbox2]));
+			w18.TopAttach = ((uint)(1));
+			w18.BottomAttach = ((uint)(2));
+			w18.LeftAttach = ((uint)(1));
+			w18.RightAttach = ((uint)(2));
+			w18.YOptions = ((global::Gtk.AttachOptions)(4));
 			this.Add (this.table);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs
index 5cdc11900b..8bc1a8b869 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs
@@ -1,3 +1,4 @@
+#pragma warning disable 436
 
 // This file has been generated by the GUI designer. Do not modify.
 namespace Stetic
@@ -6,9 +7,10 @@ namespace Stetic
 	{
 		private static bool initialized;
 
-		internal static void Initialize (Gtk.Widget iconRenderer)
+		internal static void Initialize(Gtk.Widget iconRenderer)
 		{
-			if ((Stetic.Gui.initialized == false)) {
+			if ((Stetic.Gui.initialized == false))
+			{
 				Stetic.Gui.initialized = true;
 			}
 		}
@@ -17,98 +19,69 @@ namespace Stetic
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
-		
+
 		private Gtk.UIManager uimanager;
 
-		public static BinContainer Attach (Gtk.Bin bin)
+		public static BinContainer Attach(Gtk.Bin bin)
 		{
-			BinContainer bc = new BinContainer ();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
-			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
-			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
+			BinContainer bc = new BinContainer();
+			bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
+			bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
+			bin.Added += new Gtk.AddedHandler(bc.OnAdded);
 			return bc;
 		}
 
-		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
+		private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
 		{
-			if ((this.child != null)) {
-				args.Requisition = this.child.SizeRequest ();
+			if ((this.child != null))
+			{
+				args.Requisition = this.child.SizeRequest();
 			}
 		}
 
-		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
+		private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
 		{
-			if ((this.child != null)) {
+			if ((this.child != null))
+			{
 				this.child.Allocation = args.Allocation;
 			}
 		}
 
-		private void OnAdded (object sender, Gtk.AddedArgs args)
+		private void OnAdded(object sender, Gtk.AddedArgs args)
 		{
 			this.child = args.Widget;
 		}
 
-		public void SetUiManager (Gtk.UIManager uim)
+		public void SetUiManager(Gtk.UIManager uim)
 		{
 			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
+			this.child.Realized += new System.EventHandler(this.OnRealized);
 		}
 
-		private void OnRealized (object sender, System.EventArgs args)
+		private void OnRealized(object sender, System.EventArgs args)
 		{
-			if ((this.uimanager != null)) {
+			if ((this.uimanager != null))
+			{
 				Gtk.Widget w;
 				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
-					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
+				if (((w != null)
+							&& typeof(Gtk.Window).IsInstanceOfType(w)))
+				{
+					((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
 					this.uimanager = null;
 				}
 			}
 		}
 	}
 
-	internal class IconLoader
-	{
-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
-		{
-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
-			if ((res != null)) {
-				return res;
-			} else {
-				int sz;
-				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
-				try {
-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
-				} catch (System.Exception) {
-					if ((name != "gtk-missing-image")) {
-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
-					} else {
-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
-						Gdk.GC gc = new Gdk.GC (pmap);
-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-					}
-				}
-			}
-		}
-	}
-
 	internal class ActionGroups
 	{
-		public static Gtk.ActionGroup GetActionGroup (System.Type type)
+		public static Gtk.ActionGroup GetActionGroup(System.Type type)
 		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
+			return Stetic.ActionGroups.GetActionGroup(type.FullName);
 		}
 
-		public static Gtk.ActionGroup GetActionGroup (string name)
+		public static Gtk.ActionGroup GetActionGroup(string name)
 		{
 			return null;
 		}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
index 1f2e5837de..19f98120aa 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
@@ -7,9 +7,9 @@
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
-    <widget-library name="../../../../build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll" />
     <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
-    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" internal="true" />
+    <widget-library name="../../../../external/xwt/Xwt.Gtk/bin/Debug/Xwt.Gtk.dll" />
+    <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel" design-size="454 364">
     <property name="MemberName" />
@@ -734,6 +734,22 @@
                     <property name="Fill">False</property>
                   </packing>
                 </child>
+                <child>
+                  <widget class="Gtk.CheckButton" id="checkbuttonEnableSelectionSurrounding">
+                    <property name="MemberName" />
+                    <property name="CanFocus">True</property>
+                    <property name="Label" translatable="yes">Enable _selection surrounding keys</property>
+                    <property name="DrawIndicator">True</property>
+                    <property name="HasLabel">True</property>
+                    <property name="UseUnderline">True</property>
+                  </widget>
+                  <packing>
+                    <property name="Position">6</property>
+                    <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
               </widget>
             </child>
           </widget>
@@ -745,7 +761,7 @@
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Label" id="GtkLabel6">
+          <widget class="Gtk.Label" id="GtkLabel7">
             <property name="MemberName" />
             <property name="Xalign">0</property>
             <property name="LabelProp" translatable="yes">&lt;b&gt;Indentation&lt;/b&gt;</property>
@@ -833,7 +849,7 @@
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Label" id="GtkLabel8">
+          <widget class="Gtk.Label" id="GtkLabel9">
             <property name="MemberName" />
             <property name="Xalign">0</property>
             <property name="LabelProp" translatable="yes">&lt;b&gt;Navigation&lt;/b&gt;</property>
@@ -855,22 +871,6 @@
                 <property name="MemberName" />
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.CheckButton" id="useViModesCheck">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="Label" translatable="yes">Use _Vi modes</property>
-                    <property name="DrawIndicator">True</property>
-                    <property name="HasLabel">True</property>
-                    <property name="UseUnderline">True</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
                   <widget class="Gtk.HBox" id="hbox3">
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
@@ -902,7 +902,7 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="Position">1</property>
+                    <property name="Position">0</property>
                     <property name="AutoSize">True</property>
                     <property name="Expand">False</property>
                     <property name="Fill">False</property>
@@ -1171,16 +1171,10 @@
                 <property name="Type">Custom</property>
                 <property name="Relief">None</property>
                 <child>
-                  <widget class="Gtk.EventBox" id="eventbox2">
+                  <widget class="MonoDevelop.Components.ImageView" id="image2">
                     <property name="MemberName" />
-                    <property name="AboveChild">True</property>
-                    <property name="VisibleWindow">False</property>
-                    <child>
-                      <widget class="Gtk.Image" id="image2">
-                        <property name="MemberName" />
-                        <property name="Pixbuf">stock:gtk-go-up Menu</property>
-                      </widget>
-                    </child>
+                    <property name="IconId">gtk-go-up</property>
+                    <property name="IconSize">Menu</property>
                   </widget>
                 </child>
               </widget>
@@ -1198,16 +1192,10 @@
                 <property name="Type">Custom</property>
                 <property name="Relief">None</property>
                 <child>
-                  <widget class="Gtk.EventBox" id="eventbox3">
+                  <widget class="MonoDevelop.Components.ImageView" id="image3">
                     <property name="MemberName" />
-                    <property name="AboveChild">True</property>
-                    <property name="VisibleWindow">False</property>
-                    <child>
-                      <widget class="Gtk.Image" id="image3">
-                        <property name="MemberName" />
-                        <property name="Pixbuf">stock:gtk-go-down Menu</property>
-                      </widget>
-                    </child>
+                    <property name="IconId">gtk-go-down</property>
+                    <property name="IconSize">Menu</property>
                   </widget>
                 </child>
               </widget>
@@ -1225,16 +1213,10 @@
                 <property name="Type">Custom</property>
                 <property name="Relief">None</property>
                 <child>
-                  <widget class="Gtk.EventBox" id="eventbox4">
+                  <widget class="MonoDevelop.Components.ImageView" id="image4">
                     <property name="MemberName" />
-                    <property name="AboveChild">True</property>
-                    <property name="VisibleWindow">False</property>
-                    <child>
-                      <widget class="Gtk.Image" id="image4">
-                        <property name="MemberName" />
-                        <property name="Pixbuf">stock:gtk-close Menu</property>
-                      </widget>
-                    </child>
+                    <property name="IconId">gtk-close</property>
+                    <property name="IconSize">Menu</property>
                   </widget>
                 </child>
               </widget>
@@ -1281,16 +1263,10 @@
                 <property name="Type">Custom</property>
                 <property name="Relief">None</property>
                 <child>
-                  <widget class="Gtk.EventBox" id="eventbox5">
+                  <widget class="MonoDevelop.Components.ImageView" id="image5">
                     <property name="MemberName" />
-                    <property name="AboveChild">True</property>
-                    <property name="VisibleWindow">False</property>
-                    <child>
-                      <widget class="Gtk.Image" id="image5">
-                        <property name="MemberName" />
-                        <property name="Pixbuf">stock:gtk-find-and-replace Menu</property>
-                      </widget>
-                    </child>
+                    <property name="IconId">gtk-find-and-replace</property>
+                    <property name="IconSize">Menu</property>
                   </widget>
                 </child>
               </widget>
@@ -1312,16 +1288,10 @@
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.EventBox" id="eventbox6">
+                      <widget class="MonoDevelop.Components.ImageView" id="image6">
                         <property name="MemberName" />
-                        <property name="AboveChild">True</property>
-                        <property name="VisibleWindow">False</property>
-                        <child>
-                          <widget class="Gtk.Image" id="image6">
-                            <property name="MemberName" />
-                            <property name="Pixbuf">stock:gtk-find-and-replace Menu</property>
-                          </widget>
-                        </child>
+                        <property name="IconId">gtk-find-and-replace</property>
+                        <property name="IconSize">Menu</property>
                       </widget>
                       <packing>
                         <property name="Position">0</property>
@@ -1397,16 +1367,10 @@
             <property name="Type">Custom</property>
             <property name="Relief">None</property>
             <child>
-              <widget class="Gtk.EventBox" id="eventbox2">
+              <widget class="MonoDevelop.Components.ImageView" id="image2">
                 <property name="MemberName" />
-                <property name="AboveChild">True</property>
-                <property name="VisibleWindow">False</property>
-                <child>
-                  <widget class="Gtk.Image" id="image2">
-                    <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-jump-to Menu</property>
-                  </widget>
-                </child>
+                <property name="IconId">gtk-jump-to</property>
+                <property name="IconSize">Menu</property>
               </widget>
             </child>
           </widget>
@@ -1424,16 +1388,10 @@
             <property name="Type">Custom</property>
             <property name="Relief">None</property>
             <child>
-              <widget class="Gtk.EventBox" id="eventbox1">
+              <widget class="MonoDevelop.Components.ImageView" id="image1">
                 <property name="MemberName" />
-                <property name="AboveChild">True</property>
-                <property name="VisibleWindow">False</property>
-                <child>
-                  <widget class="Gtk.Image" id="image1">
-                    <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-close Menu</property>
-                  </widget>
-                </child>
+                <property name="IconId">gtk-close</property>
+                <property name="IconSize">Menu</property>
               </widget>
             </child>
           </widget>
@@ -2436,59 +2394,6 @@
         <property name="MemberName" />
         <property name="Spacing">6</property>
         <child>
-          <widget class="Gtk.HBox" id="hbox1">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <child>
-              <widget class="Gtk.Label" id="label2">
-                <property name="MemberName" />
-                <property name="LabelProp" translatable="yes">Completion list has</property>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.SpinButton" id="spinbutton1">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="Upper">100</property>
-                <property name="PageIncrement">10</property>
-                <property name="StepIncrement">1</property>
-                <property name="ClimbRate">1</property>
-                <property name="Numeric">True</property>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="label3">
-                <property name="MemberName" />
-                <property name="LabelProp" translatable="yes">rows</property>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
           <widget class="Gtk.Alignment" id="alignment3">
             <property name="MemberName" />
             <property name="LeftPadding">12</property>
@@ -2635,7 +2540,7 @@
             </child>
           </widget>
           <packing>
-            <property name="Position">1</property>
+            <property name="Position">0</property>
             <property name="AutoSize">True</property>
             <property name="Expand">False</property>
             <property name="Fill">False</property>
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32.png
new file mode 100644
index 0000000000..242c7f399d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32@2x.png
new file mode 100644
index 0000000000..2ac79e1dea
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark.png
new file mode 100644
index 0000000000..a34279810d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark@2x.png
new file mode 100644
index 0000000000..f9dafa0b2f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15.png
index 50b75050d0..9d85bdc169 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15@2x.png
index 6e2df33c1b..a392c6d782 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark.png
new file mode 100644
index 0000000000..1d9477df8d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark@2x.png
new file mode 100644
index 0000000000..e60e88b61b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15.png
index 7cfe2604d9..dafe2f346f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15@2x.png
index b30b504b07..83afe23e8d 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15.png
index 9539699270..f7e2edb3ca 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15@2x.png
index f72f42331c..0eef55b3d9 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16.png
index c350248a23..1dd9519c21 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16@2x.png
index 6e7b4a077d..222c272b13 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark.png
new file mode 100644
index 0000000000..021435da5a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark@2x.png
new file mode 100644
index 0000000000..cdcf00008a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16.png
index 06185a2a51..b4e3e10680 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16@2x.png
index 7a466198a2..5bd225090f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark.png
new file mode 100644
index 0000000000..aa5754907f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark@2x.png
new file mode 100644
index 0000000000..f39161e6cb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16.png
index d5824843a9..b220283313 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16@2x.png
index 8674aebbf8..83d47c0537 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark.png
new file mode 100644
index 0000000000..a9292b0b4a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark@2x.png
new file mode 100644
index 0000000000..06d984df89
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16.png
index 7bd0114b4f..1fdf2bf0e6 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16@2x.png
index 7e0f57994c..fa0ca940ac 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark.png
new file mode 100644
index 0000000000..4417225d40
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark@2x.png
new file mode 100644
index 0000000000..85f875ab31
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16.png
index d332c8658f..7314d71c29 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16@2x.png
index ae2a84b99b..bdffb6d700 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark.png
new file mode 100644
index 0000000000..0ed4f689ac
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark@2x.png
new file mode 100644
index 0000000000..4bc5bec07f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16.png
new file mode 100644
index 0000000000..8cc3c5844a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16@2x.png
new file mode 100644
index 0000000000..7415b28288
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark.png
new file mode 100644
index 0000000000..8915de07e5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark@2x.png
new file mode 100644
index 0000000000..f82447e0dc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel.png
new file mode 100644
index 0000000000..2fc1948ac2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel@2x.png
new file mode 100644
index 0000000000..045e2802c4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel.png
new file mode 100644
index 0000000000..2fc1948ac2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel@2x.png
new file mode 100644
index 0000000000..045e2802c4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16.png
deleted file mode 100644
index 536c7bdb27..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16@2x.png
deleted file mode 100644
index 8883b8b5ec..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16.png
deleted file mode 100644
index 536c7bdb27..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16@2x.png
deleted file mode 100644
index 8883b8b5ec..0000000000
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16.png
index 2272d20f00..bcc63b30ec 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16@2x.png
index be480ee9b7..9c9c38748c 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark.png
new file mode 100644
index 0000000000..31eccd3bbe
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark@2x.png
new file mode 100644
index 0000000000..239afa7929
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel.png
new file mode 100644
index 0000000000..e66be7813b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel@2x.png
new file mode 100644
index 0000000000..af9ca1824e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel.png
new file mode 100644
index 0000000000..e66be7813b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel@2x.png
new file mode 100644
index 0000000000..af9ca1824e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16.png
index 878fd038b1..58c4976e67 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16@2x.png
index f5e72e78dc..0d30b0bf95 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark.png
new file mode 100644
index 0000000000..b4c872be39
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark@2x.png
new file mode 100644
index 0000000000..38eb036705
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel.png
new file mode 100644
index 0000000000..f42642f5b2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel@2x.png
new file mode 100644
index 0000000000..7562d51fe9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel.png
new file mode 100644
index 0000000000..f42642f5b2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel@2x.png
new file mode 100644
index 0000000000..7562d51fe9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16.png
index bf175ec49a..9df636c7fd 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16@2x.png
index e4a86d4fd8..592c731b19 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark.png
new file mode 100644
index 0000000000..1ea6159ced
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark@2x.png
new file mode 100644
index 0000000000..1e7cac36f4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel.png
new file mode 100644
index 0000000000..27e58ecddb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel@2x.png
new file mode 100644
index 0000000000..734609deb7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel.png
new file mode 100644
index 0000000000..27e58ecddb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel@2x.png
new file mode 100644
index 0000000000..734609deb7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16.png
index 3dee46575c..9e06aadb07 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16@2x.png
index e0e6d11f70..fb30076fd1 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16@2x.png
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark.png
new file mode 100644
index 0000000000..6dd4e516ed
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark@2x.png
new file mode 100644
index 0000000000..6ec43f0b00
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel.png
new file mode 100644
index 0000000000..f275acd398
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel@2x.png
new file mode 100644
index 0000000000..ba68c2b249
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel.png
new file mode 100644
index 0000000000..f275acd398
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel.png
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel@2x.png
new file mode 100644
index 0000000000..ba68c2b249
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj
new file mode 100644
index 0000000000..b652356828
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MonoDevelop.UnitTesting.NUnit.Runners.csproj
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F4100131-BA38-4E16-B29D-9B404A22B7F8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>MonoDevelop.UnitTesting.NUnit.Runners</RootNamespace>
+    <AssemblyName>MonoDevelop.UnitTesting.NUnit.Runners</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MyClass.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MyClass.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MyClass.cs
new file mode 100644
index 0000000000..caaeb163d7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/MyClass.cs
@@ -0,0 +1,36 @@
+//
+// MyClass.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+namespace MonoDevelop.UnitTesting.NUnit.Runners
+{
+	public class MyClass
+	{
+		public MyClass ()
+		{
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/Properties/AssemblyInfo.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..5b3c31357b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit.Runners/Properties/AssemblyInfo.cs
@@ -0,0 +1,52 @@
+//
+// AssemblyInfo.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle ("MonoDevelop.UnitTesting.NUnit.Runners")]
+[assembly: AssemblyDescription ("")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("Xamarin")]
+[assembly: AssemblyProduct ("")]
+[assembly: AssemblyCopyright ("Xamarin, Inc (http://www.xamarin.com)")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion ("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/AddinInfo.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/AddinInfo.cs
new file mode 100644
index 0000000000..6a99bf020a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/AddinInfo.cs
@@ -0,0 +1,16 @@
+
+using System;
+using Mono.Addins;
+using Mono.Addins.Description;
+
+[assembly:Addin ("UnitTesting.NUnit", 
+	Namespace = "MonoDevelop",
+	Version = MonoDevelop.BuildInfo.Version,
+	Category = "Testing")]
+
+[assembly:AddinName ("NUnit support")]
+[assembly:AddinDescription ("Integrates NUnit into the MonoDevelop IDE")]
+
+[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("UnitTesting", MonoDevelop.BuildInfo.Version)]
diff --git a/main/src/addins/NUnit/AssemblyInfo.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/AssemblyInfo.cs
index 7b21277467..7b21277467 100644
--- a/main/src/addins/NUnit/AssemblyInfo.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/AssemblyInfo.cs
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/Makefile.am b/main/src/addins/MonoDevelop.UnitTesting.NUnit/Makefile.am
new file mode 100644
index 0000000000..313b99438e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = NUnitRunner NUnit3Runner .
+
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj
new file mode 100644
index 0000000000..0d5a440146
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit.csproj
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6224D87E-2AC1-4D9F-91ED-714F797297BF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AssemblyName>MonoDevelop.UnitTesting.NUnit</AssemblyName>
+    <RootNamespace>MonoDevelop.UnitTesting.NUnit</RootNamespace>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\build\AddIns\MonoDevelop.UnitTesting</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>3</WarningLevel>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+    <DefineConstants>DEBUG</DefineConstants>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.UnitTesting\MonoDevelop.NUnit.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\build\AddIns\MonoDevelop.UnitTesting</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>3</WarningLevel>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+    <DebugSymbols>true</DebugSymbols>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.UnitTesting\MonoDevelop.NUnit.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
+      <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
+      <Name>MonoDevelop.Core</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
+      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
+      <Name>MonoDevelop.Ide</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
+      <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
+      <Name>Mono.Addins</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj">
+      <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project>
+      <Name>MonoDevelop.UnitTesting</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MonoDevelopNUnit.addin.xml">
+      <LogicalName>MonoDevelopNUnit.addin.xml</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="templates\images\nunit-library-project.png">
+      <LogicalName>nunit-library-project.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="templates\images\nunit-library-project%402x.png">
+      <LogicalName>nunit-library-project@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="templates\images\nunit-library-project~dark.png">
+      <LogicalName>nunit-library-project~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="templates\images\nunit-library-project~dark%402x.png">
+      <LogicalName>nunit-library-project~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="templates\NUnitAssemblyGroup.xpt.xml">
+      <LogicalName>NUnitAssemblyGroup.xpt.xml</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="templates\NUnitProject.xpt.xml">
+      <LogicalName>NUnitProject.xpt.xml</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="templates\NUnitProjectVBNet.xpt.xml">
+      <LogicalName>NUnitProjectVBNet.xpt.xml</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="templates\NUnitTestClass.xft.xml">
+      <LogicalName>NUnitTestClass.xft.xml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MonoDevelop.UnitTesting.NUnit\ExternalTestRunner.cs" />
+    <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitAssemblyTestSuite.cs" />
+    <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitProjectTestSuite.cs" />
+    <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitTestCase.cs" />
+    <Compile Include="MonoDevelop.UnitTesting.NUnit\NUnitTestSuite.cs" />
+    <Compile Include="MonoDevelop.UnitTesting.NUnit\SystemTestProvider.cs" />
+    <Compile Include="MonoDevelop.UnitTesting.NUnit\TcpTestListener.cs" />
+    <Compile Include="AddinInfo.cs" />
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="MonoDevelop.UnitTesting.NUnit\RemoteTestResult.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="templates\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs
new file mode 100644
index 0000000000..93b5eefb6a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs
@@ -0,0 +1,319 @@
+//
+// ExternalTestRunner.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using System.Reflection;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using System.Text;
+
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
+using MonoDevelop.Core.Assemblies;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.UnitTesting.NUnit.External
+{
+	class ExternalTestRunner: IDisposable
+	{
+		RemoteProcessConnection connection;
+		IRemoteEventListener listener;
+
+		public ExternalTestRunner ()
+		{
+		}
+
+		public Task Connect (NUnitVersion version, IExecutionHandler executionHandler = null, OperationConsole console = null)
+		{
+			var exePath = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), version.ToString (), "NUnitRunner.exe");
+			connection = new RemoteProcessConnection (exePath, executionHandler, console, Runtime.MainSynchronizationContext);
+			connection.AddListener (this);
+			return connection.Connect ();
+		}
+
+		public async Task<UnitTestResult> Run (IRemoteEventListener listener, string[] nameFilter, string path, string suiteName, List<string> supportAssemblies, string testRunnerType, string testRunnerAssembly, string crashLogFile)
+		{
+			this.listener = listener;
+
+			var msg = new RunRequest {
+				NameFilter = nameFilter,
+				Path = path,
+				SuiteName = suiteName,
+				SupportAssemblies = supportAssemblies.ToArray (),
+				TestRunnerType = testRunnerType,
+				TestRunnerAssembly = testRunnerAssembly,
+				CrashLogFile = crashLogFile
+			};
+
+			var r = (await connection.SendMessage (msg)).Result;
+
+			await connection.ProcessPendingMessages ();
+
+			return ToUnitTestResult (r);
+		}
+
+		UnitTestResult ToUnitTestResult (RemoteTestResult r)
+		{
+			if (r == null)
+				return null;
+			
+			return new UnitTestResult {
+				TestDate = r.TestDate,
+				Status = (ResultStatus) (int)r.Status,
+				Passed = r.Passed,
+				Errors = r.Errors,
+				Failures = r.Failures,
+				Inconclusive = r.Inconclusive,
+				NotRunnable = r.NotRunnable,
+				Skipped = r.Skipped,
+				Ignored = r.Ignored,
+				Time = r.Time,
+				Message = r.Message,
+				StackTrace = r.StackTrace,
+				ConsoleOutput = r.ConsoleOutput,
+				ConsoleError = r.ConsoleError
+			};
+		}
+		
+		public async Task<NunitTestInfo> GetTestInfo (string path, List<string> supportAssemblies)
+		{
+			var msg = new GetTestInfoRequest {
+				Path = path,
+				SupportAssemblies = supportAssemblies.ToArray ()
+			};
+
+			return (await connection.SendMessage (msg)).Result;
+		}
+
+		[MessageHandler]
+		public void OnTestStarted (TestStartedMessage msg)
+		{
+			listener.TestStarted (msg.TestCase);
+		}
+
+		[MessageHandler]
+		public void OnTestFinished (TestFinishedMessage msg)
+		{
+			listener.TestFinished (msg.TestCase, ToUnitTestResult (msg.Result));
+		}
+
+		[MessageHandler]
+		public void OnSuiteStarted (SuiteStartedMessage msg)
+		{
+			listener.SuiteStarted (msg.Suite);
+		}
+
+		[MessageHandler]
+		public void OnSuiteFinished (SuiteFinishedMessage msg)
+		{
+			listener.SuiteFinished (msg.Suite, ToUnitTestResult (msg.Result));
+		}
+
+		public void Dispose ()
+		{
+			connection.Dispose ();
+		}
+	}
+
+	class LocalTestMonitor: MarshalByRefObject, IRemoteEventListener
+	{
+		TestContext context;
+		UnitTest rootTest;
+//		string rootFullName;
+		UnitTest runningTest;
+		bool singleTestRun;
+		UnitTestResult singleTestResult;
+		public bool Canceled;
+
+		public LocalTestMonitor (TestContext context, UnitTest rootTest, string rootFullName, bool singleTestRun)
+		{
+//			this.rootFullName = rootFullName;
+			this.rootTest = rootTest;
+			this.context = context;
+			this.singleTestRun = singleTestRun;
+		}
+		
+		public UnitTest RunningTest {
+			get { return runningTest; }
+		}
+		
+		internal UnitTestResult SingleTestResult {
+			get {
+				if (singleTestResult == null)
+					singleTestResult = new UnitTestResult ();
+				return singleTestResult;
+			}
+			set {
+				singleTestResult = value;
+			}
+		}
+		
+		void IRemoteEventListener.TestStarted (string testCase)
+		{
+			if (singleTestRun || Canceled)
+				return;
+			
+			UnitTest t = GetLocalTest (testCase);
+			if (t == null)
+				return;
+			
+			runningTest = t;
+			context.Monitor.BeginTest (t);
+			t.Status = TestStatus.Running;
+		}
+
+		void ProcessResult (UnitTestResult res)
+		{
+			if (string.IsNullOrEmpty (res.Message)) {
+				if (res.IsFailure)
+					res.Message = GettextCatalog.GetString ("Test failed");
+				else if (res.IsNotRun)
+					res.Message = GettextCatalog.GetString ("Test ignored");
+				else {
+					res.Message = GettextCatalog.GetString ("Test successful") + "\n\n";
+					res.Message += GettextCatalog.GetString ("Execution time: {0:0.00}ms", res.Time.TotalMilliseconds);
+				}
+			}
+		}
+			
+		void IRemoteEventListener.TestFinished (string test, UnitTestResult result)
+		{
+			if (Canceled)
+				return;
+
+			ProcessResult (result);
+
+			if (singleTestRun) {
+				SingleTestResult = result;
+				return;
+			}
+			
+			UnitTest t = GetLocalTest (test);
+			if (t == null)
+				return;
+			
+			t.RegisterResult (context, result);
+			context.Monitor.EndTest (t, result);
+			t.Status = TestStatus.Ready;
+			runningTest = null;
+		}
+
+		void IRemoteEventListener.SuiteStarted (string suite)
+		{
+			if (singleTestRun || Canceled)
+				return;
+			
+			UnitTest t = GetLocalTest (suite);
+			if (t == null)
+				return;
+			
+			t.Status = TestStatus.Running;
+			context.Monitor.BeginTest (t);
+		}
+
+		void IRemoteEventListener.SuiteFinished (string suite, UnitTestResult result)
+		{
+			if (singleTestRun || Canceled)
+				return;
+			
+			ProcessResult (result);
+
+			UnitTest t = GetLocalTest (suite);
+			if (t == null)
+				return;
+			
+			t.RegisterResult (context, result);
+			t.Status = TestStatus.Ready;
+			context.Monitor.EndTest (t, result);
+		}
+		
+		UnitTest GetLocalTest (string sname)
+		{
+			if (sname == null)
+				return null;
+			if (sname == "<root>")
+				return rootTest;
+			/*
+			if (sname.StartsWith (rootFullName)) {
+				sname = sname.Substring (rootFullName.Length);
+			}
+			if (sname.StartsWith ("."))
+				sname = sname.Substring (1);*/
+			UnitTest tt = FindTest (rootTest, sname);
+			return tt;
+		}
+		
+		UnitTest FindTest (UnitTest t, string testPath)
+		{
+			var group = t as UnitTestGroup;
+			if (group == null)
+				return null;
+			return SearchRecursive (group, testPath);
+		}
+
+		UnitTest SearchRecursive (UnitTestGroup group, string testPath)
+		{
+			UnitTest result;
+			foreach (var t in group.Tests) {
+				if (t.TestId == testPath)
+					return t;
+				var childGroup = t as UnitTestGroup;
+				if (childGroup != null) {
+					result = SearchRecursive (childGroup, testPath);
+					if (result != null)
+						return result;
+				}
+			}
+			return null;
+		}
+		
+		public override object InitializeLifetimeService ()
+		{
+			return null;
+		}
+	}	
+
+	public interface IRemoteEventListener
+	{
+		void TestStarted (string testCase);
+		void TestFinished (string test, UnitTestResult result);
+		void SuiteStarted (string suite);
+		void SuiteFinished (string suite, UnitTestResult result);
+	}
+
+	public enum NUnitVersion
+	{
+		Unknown,
+		NUnit2,
+		NUnit3
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs
new file mode 100644
index 0000000000..8d08a3ab21
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs
@@ -0,0 +1,763 @@
+//
+// NUnitAssemblyTestSuite.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using System.Reflection;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using System.Runtime.Serialization.Formatters.Binary;
+
+using MonoDevelop.Projects;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
+using MonoDevelop.UnitTesting.NUnit.External;
+using MonoDevelop.Ide;
+using System.Xml.Linq;
+using System.Linq;
+using System.Globalization;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.UnitTesting.NUnit
+{
+	public abstract class NUnitAssemblyTestSuite: UnitTestGroup
+	{
+		object locker = new object ();
+		UnitTest[] oldList;
+		TestInfoCache testInfoCache = new TestInfoCache ();
+		bool cacheLoaded;
+		DateTime lastAssemblyTime;
+
+		static Queue<LoadData> loadQueue = new Queue<LoadData> ();
+		static bool loaderRunning;
+
+		public virtual IList<string> UserAssemblyPaths {
+			get {
+				return null;
+			}
+		}
+
+		public NUnitAssemblyTestSuite (string name): base (name)
+		{
+		}
+
+		public NUnitAssemblyTestSuite (string name, WorkspaceObject ownerSolutionItem): base (name, ownerSolutionItem)
+		{
+		}
+		
+		public override void Dispose ()
+		{
+			try {
+				if (TestInfoCachePath != null) {
+					testInfoCache.Write (TestInfoCachePath);
+				}
+			} catch {
+			}
+			base.Dispose ();
+		}
+
+		public NUnitVersion NUnitVersion { get; set; }
+
+		public override bool HasTests {
+			get {
+				return true;
+			}
+		}
+
+		public virtual void GetCustomTestRunner (out string assembly, out string type)
+		{
+			assembly = type = null;
+		}
+
+		public virtual void GetCustomConsoleRunner (out string command, out string args)
+		{
+			command = args = null;
+		}
+
+		ProcessExecutionCommand GetCustomConsoleRunnerCommand ()
+		{
+			string file, args;
+
+			GetCustomConsoleRunner (out file, out args);
+			file = file != null ? file.Trim () : null;
+			if (string.IsNullOrEmpty (file))
+				return null;
+
+			var cmd = Runtime.ProcessService.CreateCommand (file);
+			cmd.Arguments = args;
+			return cmd;
+		}
+
+		protected override void OnActiveConfigurationChanged ()
+		{
+			UpdateTests ();
+			base.OnActiveConfigurationChanged ();
+		}
+		
+		internal SourceCodeLocation GetSourceCodeLocation (UnitTest test)
+		{
+			return GetSourceCodeLocation (test.FixtureTypeNamespace, test.FixtureTypeName, test.Name);
+		}
+		
+		protected virtual SourceCodeLocation GetSourceCodeLocation (string fixtureTypeNamespace, string fixtureTypeName, string testName)
+		{
+			return null;
+		}
+		
+		public override int CountTestCases ()
+		{
+			lock (locker) {
+				if (Status == TestStatus.Loading)
+					Monitor.Wait (locker, 10000);
+			}
+			return base.CountTestCases ();
+		}
+		
+		protected bool RefreshRequired {
+			get {
+				return lastAssemblyTime != GetAssemblyTime ();
+			}
+		}
+
+		public override Task Refresh (CancellationToken ct)
+		{
+			return Task.Run (delegate {
+				lock (locker) {
+					try {
+						while (Status == TestStatus.Loading) {
+							Monitor.Wait (locker);
+						}
+						if (RefreshRequired) {
+							lastAssemblyTime = GetAssemblyTime ();
+							UpdateTests ();
+							OnCreateTests (); // Force loading
+							while (Status == TestStatus.Loading) {
+								Monitor.Wait (locker);
+							}
+						}
+					} catch {
+					}
+				}
+			});
+		}
+		
+		DateTime GetAssemblyTime ()
+		{
+			string path = AssemblyPath;
+			if (File.Exists (path))
+				return File.GetLastWriteTime (path);
+			else
+				return DateTime.MinValue;
+		}
+
+		
+		protected override void OnCreateTests ()
+		{
+			lock (locker) {
+				if (Status == TestStatus.Loading)
+					return;
+					
+				NunitTestInfo ti = testInfoCache.GetInfo (AssemblyPath);
+				if (ti != null) {
+					FillTests (ti);
+					return;
+				}
+				
+				Status = TestStatus.Loading;
+			}
+			
+			lastAssemblyTime = GetAssemblyTime ();
+			
+			if (oldList != null) {
+				foreach (UnitTest t in oldList)
+					Tests.Add (t);
+			}
+
+			OnTestStatusChanged ();
+
+			LoadData ld = new LoadData ();
+			ld.Path = AssemblyPath;
+			ld.TestInfoCachePath = cacheLoaded ? null : TestInfoCachePath;
+			ld.Callback = delegate {
+				Runtime.RunInMainThread (delegate {
+					AsyncCreateTests (ld);
+				});
+			};
+			ld.SupportAssemblies = new List<string> (SupportAssemblies);
+			ld.NUnitVersion = NUnitVersion;
+			
+			AsyncLoadTest (ld);
+
+			// Read the cache from disk only once
+			cacheLoaded = true;
+		}
+		
+		void AsyncCreateTests (object ob)
+		{
+			TestStatus newStatus = TestStatus.Ready;
+			
+			try {
+				LoadData loadData = (LoadData) ob;
+				
+				if (loadData.Error != null) {
+					newStatus = TestStatus.LoadError;
+					return;
+				}
+				
+				Tests.Clear ();
+
+				if (loadData.Info == null) {
+					oldList = new UnitTest [0];
+					return;
+				}
+
+				FillTests (loadData.Info);
+				
+				// If the async loader has loaded a cache, reuse it.
+				if (loadData.InfoCache != null)
+					testInfoCache = loadData.InfoCache;
+				
+				testInfoCache.SetInfo (AssemblyPath, loadData.Info);
+			}
+			catch (Exception ex) {
+				LoggingService.LogError (ex.ToString ());
+				newStatus = TestStatus.LoadError;
+			}
+			finally {
+				lock (locker) {
+					Status = newStatus;
+					Monitor.PulseAll (locker);
+				}
+				OnTestChanged ();
+			}
+		}
+		
+		void FillTests (NunitTestInfo ti)
+		{
+			if (ti.Tests == null)
+				return;
+			foreach (NunitTestInfo test in ti.Tests) {
+				UnitTest newTest;
+				if (test.Tests != null)
+					newTest = new NUnitTestSuite (this, test);
+				else
+					newTest = new NUnitTestCase (this, test, test.PathName);
+				newTest.FixtureTypeName = test.FixtureTypeName;
+				newTest.FixtureTypeNamespace = test.FixtureTypeNamespace;
+				Tests.Add (newTest);
+
+			}
+			oldList = new UnitTest [Tests.Count];
+			Tests.CopyTo (oldList, 0);
+		}
+		
+		static void AsyncLoadTest (LoadData ld)
+		{
+			lock (loadQueue) {
+				if (!loaderRunning) {
+					Thread t = new Thread (new ThreadStart (RunAsyncLoadTest));
+					t.Name = "NUnit test loader";
+					t.IsBackground = true;
+					t.Start ();
+					loaderRunning = true;
+				}
+				loadQueue.Enqueue (ld);
+				Monitor.Pulse (loadQueue);
+			}
+		}
+		
+		static void RunAsyncLoadTest ()
+		{
+			while (true) {
+				LoadData ld;
+				lock (loadQueue) {
+					if (loadQueue.Count == 0) {
+						if (!Monitor.Wait (loadQueue, 5000, true)) {
+							loaderRunning = false;
+							return;
+						}
+					}
+					ld = (LoadData)loadQueue.Dequeue ();
+				}
+				
+				try {
+					// If the information is cached in a file and it is up to date information,
+					// there is no need to parse again the assembly.
+
+					if (ld.TestInfoCachePath != null && File.Exists (ld.TestInfoCachePath)) {
+						ld.InfoCache = TestInfoCache.Read (ld.TestInfoCachePath);
+						NunitTestInfo info = ld.InfoCache.GetInfo (ld.Path);
+						if (info != null) {
+							ld.Info = info;
+							ld.Callback (ld);
+							continue;
+						}
+					}
+				} catch (Exception ex) {
+					LoggingService.LogError (ex.ToString ());
+				}
+
+				ExternalTestRunner runner = null;
+
+				try {
+					if (File.Exists (ld.Path)) {
+						runner = new ExternalTestRunner ();
+						runner.Connect (ld.NUnitVersion).Wait ();
+						ld.Info = runner.GetTestInfo (ld.Path, ld.SupportAssemblies).Result;
+					}
+				} catch (Exception ex) {

+					Console.WriteLine (ex);
+					ld.Error = ex;
+				}
+				finally {
+					try {
+						if (runner != null)
+							runner.Dispose ();
+					} catch {}
+				}
+
+				try {
+					ld.Callback (ld);
+				} catch {
+				}
+			}
+		}
+		
+		protected override UnitTestResult OnRun (TestContext testContext)
+		{
+			return RunUnitTest (this, "", "", null, testContext);
+		}
+
+		protected override bool OnCanRun (MonoDevelop.Core.Execution.IExecutionHandler executionContext)
+		{
+			var runnerCmd = GetCustomConsoleRunnerCommand ();
+			if (runnerCmd != null) {
+				return executionContext.CanExecute (runnerCmd);
+			}
+			return Runtime.ProcessService.IsValidForRemoteHosting (executionContext);
+		}
+
+		public string[] CollectTests (UnitTestGroup group)
+		{
+			List<string> result = new List<string> ();
+			foreach (var t in group.Tests) {
+				if (t.IsExplicit)
+					continue;
+				if (t is UnitTestGroup) {
+					result.AddRange (CollectTests ((UnitTestGroup)t));
+				} else {
+					result.Add (t.TestId);
+				}
+			}
+			return result.ToArray ();
+		}
+
+		internal UnitTestResult RunUnitTest (UnitTest test, string suiteName, string pathName, string testName, TestContext testContext)
+		{
+			var runnerExe = GetCustomConsoleRunnerCommand ();
+			if (runnerExe != null)
+				return RunWithConsoleRunner (runnerExe, test, suiteName, pathName, testName, testContext);
+
+			var console = testContext.ExecutionContext.ConsoleFactory.CreateConsole ();
+
+			ExternalTestRunner runner = new ExternalTestRunner ();
+			runner.Connect (NUnitVersion, testContext.ExecutionContext.ExecutionHandler, console).Wait ();
+			LocalTestMonitor localMonitor = new LocalTestMonitor (testContext, test, suiteName, testName != null);
+
+			string[] filter = null;
+			if (test != null) {
+				if (test is UnitTestGroup && NUnitVersion == NUnitVersion.NUnit2) {
+					filter = CollectTests ((UnitTestGroup)test);
+				} else if (test.TestId != null) {
+					filter = new string [] { test.TestId };
+				}
+			}
+
+			RunData rd = new RunData ();
+			rd.Runner = runner;
+			rd.Test = this;
+			rd.LocalMonitor = localMonitor;
+
+			var cancelReg = testContext.Monitor.CancellationToken.Register (rd.Cancel);
+
+			UnitTestResult result;
+			var crashLogFile = Path.GetTempFileName ();
+
+			try {
+				if (string.IsNullOrEmpty (AssemblyPath)) {
+					string msg = GettextCatalog.GetString ("Could not get a valid path to the assembly. There may be a conflict in the project configurations.");
+					throw new Exception (msg);
+				}

+
+				string testRunnerAssembly, testRunnerType;
+				GetCustomTestRunner (out testRunnerAssembly, out testRunnerType);
+
+				testContext.Monitor.CancellationToken.ThrowIfCancellationRequested ();
+					
+				result = runner.Run (localMonitor, filter, AssemblyPath, "", new List<string> (SupportAssemblies), testRunnerType, testRunnerAssembly, crashLogFile).Result;
+				if (testName != null)
+					result = localMonitor.SingleTestResult;
+				
+				ReportCrash (testContext, crashLogFile);
+				
+			} catch (Exception ex) {
+				if (ReportCrash (testContext, crashLogFile)) {
+					result = UnitTestResult.CreateFailure (GettextCatalog.GetString ("Unhandled exception"), null);
+				}
+				else if (!localMonitor.Canceled) {
+					LoggingService.LogError (ex.ToString ());
+					if (localMonitor.RunningTest != null) {
+						RuntimeErrorCleanup (testContext, localMonitor.RunningTest, ex);
+					} else {
+						testContext.Monitor.ReportRuntimeError (null, ex);
+						throw;
+					}
+					result = UnitTestResult.CreateFailure (ex);
+				} else {
+					result = UnitTestResult.CreateFailure (GettextCatalog.GetString ("Canceled"), null);
+				}
+			} finally {
+				if (console != null)
+					console.Dispose ();
+				cancelReg.Dispose ();
+				runner.Dispose ();
+				File.Delete (crashLogFile);
+			}
+			
+			return result;
+		}
+
+		bool ReportCrash (TestContext testContext, string crashLogFile)
+		{
+			var crash = File.ReadAllText (crashLogFile);
+			if (crash.Length == 0)
+				return false;
+
+			var ex = RemoteUnhandledException.Parse (crash);
+			testContext.Monitor.ReportRuntimeError (GettextCatalog.GetString ("Unhandled exception"), ex);
+			return true;
+		}
+
+		void RuntimeErrorCleanup (TestContext testContext, UnitTest t, Exception ex)
+		{
+			UnitTestResult result = UnitTestResult.CreateFailure (ex);
+			t.RegisterResult (testContext, result);
+			while (t != null && t != this) {
+				testContext.Monitor.EndTest (t, result);
+				t.Status = TestStatus.Ready;
+				t = t.Parent;
+			}
+		}
+
+		UnitTestResult RunWithConsoleRunner (ProcessExecutionCommand cmd, UnitTest test, string suiteName, string pathName, string testName, TestContext testContext)
+		{
+			var outFile = Path.GetTempFileName ();
+			var xmlOutputConsole = new LocalConsole ();
+			var appDebugOutputConsole = testContext.ExecutionContext.ConsoleFactory.CreateConsole ();
+			OperationConsole cons;
+			if (appDebugOutputConsole != null) {
+				cons = new MultipleOperationConsoles (appDebugOutputConsole, xmlOutputConsole);
+			} else {
+				cons = xmlOutputConsole;
+			}
+			try {
+				MonoDevelop.UnitTesting.NUnit.External.TcpTestListener tcpListener = null;
+				LocalTestMonitor localMonitor = new LocalTestMonitor (testContext, test, suiteName, testName != null);
+
+				if (!string.IsNullOrEmpty (cmd.Arguments))
+					cmd.Arguments += " ";
+				cmd.Arguments += "\"-xml=" + outFile + "\" " + AssemblyPath;
+
+				bool automaticUpdates = cmd.Command != null && (cmd.Command.Contains ("GuiUnit") || (cmd.Command.Contains ("mdtool.exe") && cmd.Arguments.Contains ("run-md-tests")));

+				if (!string.IsNullOrEmpty(pathName))

+					cmd.Arguments += " -run=\"" + test.TestId.Replace("\"", "\\\"") + "\"";
+				if (automaticUpdates) {
+					tcpListener = new MonoDevelop.UnitTesting.NUnit.External.TcpTestListener (localMonitor, suiteName);
+					cmd.Arguments += " -port=" + tcpListener.Port;
+				}
+
+				// Note that we always dispose the tcp listener as we don't want it listening
+				// forever if the test runner does not try to connect to it
+				using (tcpListener) {
+					var handler = testContext.ExecutionContext.ExecutionHandler;
+
+					if (handler == null)
+						handler = Runtime.ProcessService.DefaultExecutionHandler;
+					
+					var p = handler.Execute (cmd, cons);
+					using (testContext.Monitor.CancellationToken.Register (p.Cancel))
+						p.Task.Wait ();
+
+					if (new FileInfo (outFile).Length == 0)
+						throw new Exception ("Command failed");
+				}
+
+				// mdtool.exe does not necessarily guarantee we get automatic updates. It just guarantees
+				// that if guiunit is being used then it will give us updates. If you have a regular test
+				// assembly compiled against nunit.framework.dll 
+				if (automaticUpdates && tcpListener.HasReceivedConnection) {
+					if (testName != null)
+						return localMonitor.SingleTestResult;
+					return test.GetLastResult ();
+				}
+
+				XDocument doc = XDocument.Load (outFile);
+
+				if (doc.Root != null) {
+					var root = doc.Root.Elements ("test-suite").FirstOrDefault ();
+					if (root != null) {
+						xmlOutputConsole.SetDone ();
+						var ot = xmlOutputConsole.OutReader.ReadToEnd ();
+						var et = xmlOutputConsole.ErrorReader.ReadToEnd ();
+						testContext.Monitor.WriteGlobalLog (ot);
+						if (!string.IsNullOrEmpty (et)) {
+							testContext.Monitor.WriteGlobalLog ("ERROR:\n");
+							testContext.Monitor.WriteGlobalLog (et);
+						}
+
+						bool macunitStyle = doc.Root.Element ("environment") != null && doc.Root.Element ("environment").Attribute ("macunit-version") != null;
+						var result = ReportXmlResult (localMonitor, root, "", macunitStyle);
+						if (testName != null)
+							result = localMonitor.SingleTestResult;
+						return result;
+					}
+				}
+				throw new Exception ("Test results could not be parsed.");
+			} catch (Exception ex) {
+				xmlOutputConsole.SetDone ();
+				var ot = xmlOutputConsole.OutReader.ReadToEnd ();
+				var et = xmlOutputConsole.ErrorReader.ReadToEnd ();
+				testContext.Monitor.WriteGlobalLog (ot);
+				if (!string.IsNullOrEmpty (et)) {
+					testContext.Monitor.WriteGlobalLog ("ERROR:\n");
+					testContext.Monitor.WriteGlobalLog (et);
+				}
+				testContext.Monitor.ReportRuntimeError ("Test execution failed.\n" + ot + "\n" + et, ex);
+				return UnitTestResult.CreateIgnored ("Test execution failed");
+			} finally {
+				File.Delete (outFile);
+				cons.Dispose ();
+			}
+		}
+
+		UnitTestResult ReportXmlResult (IRemoteEventListener listener, XElement elem, string testPrefix, bool macunitStyle)
+		{
+			UnitTestResult result = new UnitTestResult ();
+			var time = (string)elem.Attribute ("time");
+			if (time != null)
+				result.Time = TimeSpan.FromSeconds (double.Parse (time, CultureInfo.InvariantCulture));
+			result.TestDate = DateTime.Now;
+
+			var reason = elem.Element ("reason");
+			if (reason != null)
+				result.Message = (string) reason;
+
+			var failure = elem.Element ("failure");
+			if (failure != null) {
+				var msg = failure.Element ("message");
+				if (msg != null)
+					result.Message = (string)msg;
+				var stack = failure.Element ("stack-trace");
+				if (stack != null)
+					result.StackTrace = (string)stack;
+			}
+
+			switch ((string)elem.Attribute ("result")) {
+			case "Error":
+			case "Failure":
+				result.Status = ResultStatus.Failure;
+				break;
+			case "Success":
+				result.Status = ResultStatus.Success;
+				break;
+			case "Ignored":
+				result.Status = ResultStatus.Ignored;
+				break;
+			default:
+				result.Status = ResultStatus.Inconclusive;
+				break;
+			}
+
+			if (elem.Name == "test-suite") {
+				// nunitlite does not emit <test-suite type="Namespace" elements so we need to fake
+				// them by deconstructing the full type name and emitting the suite started events manually
+				var names = new List<string> ();
+				if (!macunitStyle || (string)elem.Attribute ("type") == "Assembly")
+					names.Add ("<root>");
+				else
+					names.AddRange (elem.Attribute ("name").Value.Split ('.'));
+
+				for (int i = 0; i < names.Count; i ++)
+					listener.SuiteStarted (testPrefix + string.Join (".", names.Take (i + 1)));
+
+				var name = (string)elem.Attribute ("type") == "Assembly" ? "<root>" : (string) elem.Attribute ("name");
+				var cts = elem.Element ("results");
+				if (cts != null) {
+					foreach (var ct in cts.Elements ()) {
+						var r = ReportXmlResult (listener, ct, name != "<root>" ? testPrefix + name + "." : "", macunitStyle);
+						result.Add (r);
+					}
+				}
+				for (int i = 0; i < names.Count; i ++)
+					listener.SuiteFinished (testPrefix + string.Join (".", names.Take (i + 1)), result);
+			} else {
+				string name = (string)elem.Attribute ("name");
+				switch (result.Status) {
+				case ResultStatus.Success:
+					result.Passed++;
+					break;
+				case ResultStatus.Failure:
+					result.Failures++;
+					break;
+				case ResultStatus.Ignored:
+					result.Ignored++;
+					break;
+				case ResultStatus.Inconclusive:
+					result.Inconclusive++;
+					break;
+				}
+
+				listener.TestStarted (name);
+				listener.TestFinished (name, result);
+			}
+			return result;
+		}
+		
+		protected abstract string AssemblyPath {
+			get;
+		}
+		
+		protected virtual IEnumerable<string> SupportAssemblies {
+			get { yield break; }
+		}
+		
+		// File where cached test info for this test suite will be saved
+		// Returns null by default which means that test info will not be saved.
+		protected virtual string TestInfoCachePath {
+			get { return null; }
+		}
+		
+		class LoadData
+		{
+			public string Path;
+			public string TestInfoCachePath;
+			public Exception Error;
+			public NunitTestInfo Info;
+			public TestInfoCache InfoCache;
+			public WaitCallback Callback;
+			public List<string> SupportAssemblies;
+			public NUnitVersion NUnitVersion;
+		}
+		
+		class RunData
+		{
+			public ExternalTestRunner Runner;
+			public UnitTest Test;
+			public LocalTestMonitor LocalMonitor;
+			
+			public void Cancel ()
+			{
+				LocalMonitor.Canceled = true;
+				Runner.Dispose ();
+				ClearRunningStatus (Test);
+			}
+			
+			void ClearRunningStatus (UnitTest t)
+			{
+				t.Status = TestStatus.Ready;
+				UnitTestGroup group = t as UnitTestGroup;
+				if (group == null) return;
+				foreach (UnitTest ct in group.Tests)
+					ClearRunningStatus (ct);
+			}
+		}
+		
+		[Serializable]
+		class TestInfoCache
+		{
+			Hashtable table = new Hashtable ();
+			
+			[NonSerialized]
+			bool modified;
+			
+			public void SetInfo (string path, NunitTestInfo info)
+			{
+				if (File.Exists (path)) {
+					CachedTestInfo cti = new CachedTestInfo ();
+					cti.LastWriteTime = File.GetLastWriteTime (path);
+					cti.Info = info;
+					table [path] = cti;
+					modified = true;
+				}
+			}
+			
+			public NunitTestInfo GetInfo (string path)
+			{
+				CachedTestInfo cti = (CachedTestInfo) table [path];
+				if (cti != null && File.Exists (path) && File.GetLastWriteTime (path) == cti.LastWriteTime)
+					return cti.Info;
+				else
+					return null;
+			}
+			
+			public static TestInfoCache Read (string file)
+			{
+				BinaryFormatter bf = new BinaryFormatter ();
+				Stream s = new FileStream (file, FileMode.Open, FileAccess.Read);
+				try {
+					return (TestInfoCache) bf.Deserialize (s);
+				} finally {
+					s.Close ();
+				}
+			}
+			
+			public void Write (string file)
+			{
+				if (modified) {
+					BinaryFormatter bf = new BinaryFormatter ();
+					Stream s = new FileStream (file, FileMode.Create, FileAccess.Write);
+					try {
+						bf.Serialize (s, this);
+					} finally {
+						s.Close ();
+					}
+				}
+			}
+		}
+		
+		[Serializable]
+		class CachedTestInfo
+		{
+			public DateTime LastWriteTime;
+			public NunitTestInfo Info;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs
new file mode 100644
index 0000000000..a14d2e4088
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitProjectTestSuite.cs
@@ -0,0 +1,203 @@
+//
+// NUnitProjectTestSuite.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+
+using MonoDevelop.Projects;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.TypeSystem;
+using System;
+using System.Threading;
+using ProjectReference = MonoDevelop.Projects.ProjectReference;
+using System.Threading.Tasks;
+using MonoDevelop.UnitTesting.NUnit.External;
+using System.Reflection;
+using MonoDevelop.Ide.Gui.Components;
+using MonoDevelop.Core.Assemblies;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.UnitTesting.NUnit
+{
+	public class NUnitProjectTestSuite: NUnitAssemblyTestSuite
+	{
+		DotNetProject project;
+		string resultsPath;
+		string storeId;
+
+		public override IList<string> UserAssemblyPaths {
+			get {
+				return project.GetUserAssemblyPaths (IdeApp.Workspace.ActiveConfiguration);
+			}
+		}
+
+		public NUnitProjectTestSuite (DotNetProject project, NUnitVersion version): base (project.Name, project)
+		{
+			NUnitVersion = version;
+			storeId = Path.GetFileName (project.FileName);
+			resultsPath = UnitTestService.GetTestResultsDirectory (project.BaseDirectory);
+			ResultsStore = new BinaryResultsStore (resultsPath, storeId);
+			this.project = project;
+			project.NameChanged += OnProjectRenamed;
+			IdeApp.ProjectOperations.EndBuild += OnProjectBuilt;
+		}
+
+		protected override async Task OnBuild ()
+		{
+			await IdeApp.ProjectOperations.Build (project).Task;
+			OnProjectBuilt (null, null);
+		}
+
+		public static NUnitProjectTestSuite CreateTest (DotNetProject project)
+		{
+			if (!project.ParentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration).BuildEnabledForItem (project))
+				return null;
+
+			foreach (var p in project.References) {
+				var nv = GetNUnitVersion (p);
+				if (nv != null)
+					return new NUnitProjectTestSuite (project, nv.Value);
+			}
+			return null;
+		}
+
+		public static bool IsNUnitReference (ProjectReference p)
+		{
+			return GetNUnitVersion (p).HasValue;
+		}
+
+		public static NUnitVersion? GetNUnitVersion (ProjectReference p)
+		{
+			if (p.Reference.IndexOf ("GuiUnit", StringComparison.OrdinalIgnoreCase) != -1 || p.Reference.IndexOf ("nunitlite", StringComparison.OrdinalIgnoreCase) != -1)
+				return NUnitVersion.NUnit2;
+			if (p.Reference.IndexOf ("nunit.framework", StringComparison.OrdinalIgnoreCase) != -1) {
+				var selector = p.Project?.DefaultConfiguration.Selector;
+				if (selector == null)
+					return NUnitVersion.Unknown;
+
+				var f = p.GetReferencedFileNames (selector).FirstOrDefault ();
+				if (f != null && File.Exists (f)) {
+					try {
+						var aname = new AssemblyName (SystemAssemblyService.GetAssemblyName (f));
+						if (aname.Version.Major == 2)
+							return NUnitVersion.NUnit2;
+						else
+							return NUnitVersion.NUnit3;
+					} catch (Exception ex) {
+						LoggingService.LogError ("Could not get assembly version", ex);
+					}
+				}
+			}
+			return null;
+		}
+
+		protected override SourceCodeLocation GetSourceCodeLocation (string fixtureTypeNamespace, string fixtureTypeName, string testName)
+		{
+			if (string.IsNullOrEmpty (fixtureTypeName) || string.IsNullOrEmpty (fixtureTypeName))
+				return null;
+			var task = NUnitSourceCodeLocationFinder.TryGetSourceCodeLocationAsync (project, fixtureTypeNamespace, fixtureTypeName, testName);
+			if (!task.Wait (2000))
+				return null;
+			return task.Result;
+
+		}
+
+		public override void Dispose ()
+		{
+			project.NameChanged -= OnProjectRenamed;
+			IdeApp.ProjectOperations.EndBuild -= OnProjectBuilt;
+			base.Dispose ();
+		}
+		
+		void OnProjectRenamed (object sender, SolutionItemRenamedEventArgs e)
+		{
+			UnitTestGroup parent = Parent as UnitTestGroup;
+			if (parent != null)
+				parent.UpdateTests ();
+		}
+		
+		void OnProjectBuilt (object s, BuildEventArgs args)
+		{
+			if (RefreshRequired)
+				UpdateTests ();
+		}
+
+		public override void GetCustomTestRunner (out string assembly, out string type)
+		{
+			type = project.ProjectProperties.GetValue ("TestRunnerType");
+			var asm = project.ProjectProperties.GetValue ("TestRunnerAssembly");
+			assembly = asm != null ? project.BaseDirectory.Combine (asm.ToString ()).ToString () : null;
+		}
+
+		public override void GetCustomConsoleRunner (out string command, out string args)
+		{
+			var r = project.ProjectProperties.GetPathValue ("TestRunnerCommand");
+			command = !string.IsNullOrEmpty (r) ? project.BaseDirectory.Combine (r).ToString () : null;
+			args = project.ProjectProperties.GetValue ("TestRunnerArgs");
+			if (command == null && args == null) {
+				var guiUnit = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Assembly && StringComparer.OrdinalIgnoreCase.Equals (Path.GetFileName (pref.Reference), "GuiUnit.exe"));
+				if (guiUnit != null) {
+					command = guiUnit.Reference;
+				}
+
+				var projectReference = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Project && pref.Reference.StartsWith ("GuiUnit", StringComparison.OrdinalIgnoreCase));
+				if (IdeApp.IsInitialized && command == null && projectReference != null) {
+					var guiUnitProject = IdeApp.Workspace.GetAllProjects ().First (f => f.Name == projectReference.Reference);
+					if (guiUnitProject != null)
+						command = guiUnitProject.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
+				}
+			}
+		}
+
+		protected override string AssemblyPath {
+			get { return project.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration); }
+		}
+		
+		protected override string TestInfoCachePath {
+			get { return Path.Combine (resultsPath, storeId + ".test-cache"); }
+		}
+		
+		protected override IEnumerable<string> SupportAssemblies {
+			get {
+				// Referenced assemblies which are not in the gac and which are not localy copied have to be preloaded
+				DotNetProject project = base.OwnerSolutionItem as DotNetProject;
+				if (project != null) {
+					foreach (var pr in project.References) {
+						if (pr.ReferenceType != ReferenceType.Package && !pr.LocalCopy && pr.ReferenceOutputAssembly) {
+							foreach (string file in pr.GetReferencedFileNames (IdeApp.Workspace.ActiveConfiguration))
+								yield return file;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestCase.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestCase.cs
new file mode 100644
index 0000000000..968d750e07
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestCase.cs
@@ -0,0 +1,75 @@
+//
+// NUnitTestCase.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+
+using MonoDevelop.UnitTesting.NUnit.External;
+
+namespace MonoDevelop.UnitTesting.NUnit
+{
+	class NUnitTestCase: UnitTest
+	{
+		NUnitAssemblyTestSuite rootSuite;
+		string className;
+		string pathName;
+		
+		public NUnitTestCase (NUnitAssemblyTestSuite rootSuite, NunitTestInfo tinfo, string className) : base (tinfo.Name)
+		{
+			this.className = className;
+			this.pathName = tinfo.PathName;
+			this.rootSuite = rootSuite;
+			this.TestId = tinfo.TestId;
+			this.IsExplicit = tinfo.IsExplicit;
+		}
+		
+		protected override UnitTestResult OnRun (TestContext testContext)
+		{
+			return rootSuite.RunUnitTest (this, className, pathName, Name, testContext);
+		}
+		
+		protected override bool OnCanRun (MonoDevelop.Core.Execution.IExecutionHandler executionContext)
+		{
+			return rootSuite.CanRun (executionContext);
+		}
+
+		
+		public override SourceCodeLocation SourceCodeLocation {
+			get {
+				UnitTest p = Parent;
+				while (p != null) {
+					NUnitAssemblyTestSuite root = p as NUnitAssemblyTestSuite;
+					if (root != null)
+						return root.GetSourceCodeLocation (this);
+					p = p.Parent;
+				}
+				return null; 
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestSuite.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestSuite.cs
new file mode 100644
index 0000000000..77d6629e88
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitTestSuite.cs
@@ -0,0 +1,100 @@
+//
+// NUnitTestSuite.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using MonoDevelop.UnitTesting.NUnit.External;
+
+namespace MonoDevelop.UnitTesting.NUnit
+{
+	class NUnitTestSuite: UnitTestGroup
+	{
+		NunitTestInfo testInfo;
+		NUnitAssemblyTestSuite rootSuite;
+		string fullName;
+		
+		public NUnitTestSuite (NUnitAssemblyTestSuite rootSuite, NunitTestInfo tinfo): base (tinfo.Name)
+		{
+			fullName = !string.IsNullOrEmpty (tinfo.PathName) ? tinfo.PathName + "." + tinfo.Name : tinfo.Name;
+			this.testInfo = tinfo;
+			this.rootSuite = rootSuite;
+			this.TestId = tinfo.TestId;
+		}
+		
+		public override bool HasTests {
+			get {
+				return true;
+			}
+		}
+		
+		public string ClassName {
+			get { return fullName; }
+		}
+		
+		protected override UnitTestResult OnRun (TestContext testContext)
+		{
+			return rootSuite.RunUnitTest (this, fullName, fullName, null, testContext);
+		}
+		
+		protected override bool OnCanRun (MonoDevelop.Core.Execution.IExecutionHandler executionContext)
+		{
+			return rootSuite.CanRun (executionContext);
+		}
+
+		
+		protected override void OnCreateTests ()
+		{
+			if (testInfo.Tests == null)
+				return;
+			
+			foreach (NunitTestInfo test in testInfo.Tests) {
+				UnitTest newTest;
+				if (test.Tests != null)
+					newTest = new NUnitTestSuite (rootSuite, test);
+				else
+					newTest = new NUnitTestCase (rootSuite, test, ClassName);
+				newTest.FixtureTypeName = test.FixtureTypeName;
+				newTest.FixtureTypeNamespace = test.FixtureTypeNamespace;
+				Tests.Add (newTest);
+			}
+		}
+		
+		public override SourceCodeLocation SourceCodeLocation {
+			get {
+				UnitTest p = Parent;
+				while (p != null) {
+					NUnitAssemblyTestSuite root = p as NUnitAssemblyTestSuite;
+					if (root != null)
+						return root.GetSourceCodeLocation (this);
+					p = p.Parent;
+				}
+				return null; 
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/RemoteTestResult.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/RemoteTestResult.cs
new file mode 100644
index 0000000000..7b9280e8b1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/RemoteTestResult.cs
@@ -0,0 +1,197 @@
+//
+// RemoteTestResult.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using MonoDevelop.Core.Execution;
+
+namespace MonoDevelop.UnitTesting.NUnit
+{
+	[MessageDataType]
+	public class RunRequest: BinaryMessage<RunResponse>
+	{
+		[MessageDataProperty]
+		public string[] NameFilter { get; set; }
+
+		[MessageDataProperty]
+		public string Path { get; set; }
+
+		[MessageDataProperty]
+		public string SuiteName { get; set; }
+
+		[MessageDataProperty]
+		public string[] SupportAssemblies { get; set; }
+
+		[MessageDataProperty]
+		public string TestRunnerType { get; set; }
+
+		[MessageDataProperty]
+		public string TestRunnerAssembly { get; set; }
+
+		[MessageDataProperty]
+		public string CrashLogFile { get; set; }
+	}
+
+	[MessageDataType]
+	public class RunResponse : BinaryMessage
+	{
+		[MessageDataProperty]
+		public RemoteTestResult Result { get; set; }
+	}
+
+	[MessageDataType]
+	public class GetTestInfoRequest: BinaryMessage<GetTestInfoResponse>
+	{
+		[MessageDataProperty]
+		public string Path { get; set; }
+
+		[MessageDataProperty]
+		public string[] SupportAssemblies { get; set; }
+	}
+
+	[MessageDataType]
+	public class GetTestInfoResponse: BinaryMessage
+	{
+		[MessageDataProperty]
+		public NunitTestInfo Result { get; set; }
+	}
+
+	[MessageDataType]
+	public class TestStartedMessage: BinaryMessage
+	{
+		[MessageDataProperty]
+		public string TestCase { get; set; }
+	}
+
+	[MessageDataType]
+	public class TestFinishedMessage: BinaryMessage
+	{
+		[MessageDataProperty]
+		public string TestCase { get; set; }
+
+		[MessageDataProperty]
+		public RemoteTestResult Result;
+	}
+
+	[MessageDataType]
+	public class SuiteStartedMessage: BinaryMessage
+	{
+		[MessageDataProperty]
+		public string Suite { get; set; }
+	}
+
+	[MessageDataType]
+	public class SuiteFinishedMessage: BinaryMessage
+	{
+		[MessageDataProperty]
+		public string Suite { get; set; }
+
+		[MessageDataProperty]
+		public RemoteTestResult Result;
+	}
+
+
+	[MessageDataType]
+	public class RemoteTestResult
+	{
+		[MessageDataProperty]
+		public DateTime TestDate { get; set; }
+
+		[MessageDataProperty]
+		public RemoteResultStatus Status { get; set; }
+
+		[MessageDataProperty]
+		public int Passed { get; set; }
+
+		[MessageDataProperty]
+		public int Errors { get; set; }
+
+		[MessageDataProperty]
+		public int Failures { get; set; }
+
+		[MessageDataProperty]
+		public int Inconclusive { get; set; }
+
+		[MessageDataProperty]
+		public int NotRunnable { get; set; }
+
+		[MessageDataProperty]
+		public int Skipped { get; set; }
+
+		[MessageDataProperty]
+		public int Ignored { get; set; }
+
+		[MessageDataProperty]
+		public TimeSpan Time { get; set; }
+
+		[MessageDataProperty]
+		public string Message { get; set; }
+
+		[MessageDataProperty]
+		public string StackTrace { get; set; }
+
+		[MessageDataProperty]
+		public string ConsoleOutput { get; set; }
+
+		[MessageDataProperty]
+		public string ConsoleError { get; set; }
+	}
+
+	[MessageDataType]
+	[Serializable]
+	public class NunitTestInfo
+	{
+		[MessageDataProperty]
+		public string Name { get; set; }
+
+		[MessageDataProperty]
+		public string PathName { get; set; }
+
+		[MessageDataProperty]
+		public string TestId { get; set; }
+
+		[MessageDataProperty]
+		public string FixtureTypeName { get; set; }
+
+		[MessageDataProperty]
+		public string FixtureTypeNamespace { get; set; }
+
+		[MessageDataProperty]
+		public bool IsExplicit { get; set; }
+
+		[MessageDataProperty]
+		public NunitTestInfo[] Tests { get; set; }
+	}
+
+	[Flags]
+	public enum RemoteResultStatus
+	{
+		Success = 1,
+		Failure = 2,
+		Ignored = 4,
+		Inconclusive = 8
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/SystemTestProvider.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/SystemTestProvider.cs
new file mode 100644
index 0000000000..12076b4bf7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/SystemTestProvider.cs
@@ -0,0 +1,72 @@
+//
+// SystemTestProvider.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using MonoDevelop.Ide;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.UnitTesting.NUnit
+{
+	public class SystemTestProvider: ITestProvider
+	{
+		public SystemTestProvider ()
+		{
+			IdeApp.Workspace.ReferenceAddedToProject += OnReferenceChanged;
+			IdeApp.Workspace.ReferenceRemovedFromProject += OnReferenceChanged;
+		}
+
+		public UnitTest CreateUnitTest (WorkspaceObject entry)
+		{
+			UnitTest test = null;
+			
+			if (entry is DotNetProject)
+				test = NUnitProjectTestSuite.CreateTest ((DotNetProject)entry);
+			
+			UnitTestGroup grp = test as UnitTestGroup;
+			if (grp != null && !grp.HasTests) {
+				test.Dispose ();
+				return null;
+			}
+			
+			return test;
+		}
+
+		void OnReferenceChanged (object s, ProjectReferenceEventArgs args)
+		{
+			if (NUnitProjectTestSuite.IsNUnitReference (args.ProjectReference))
+				UnitTestService.ReloadTests ();
+		}
+
+		public void Dispose ()
+		{
+			IdeApp.Workspace.ReferenceAddedToProject -= OnReferenceChanged;
+			IdeApp.Workspace.ReferenceRemovedFromProject -= OnReferenceChanged;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TcpTestListener.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TcpTestListener.cs
new file mode 100644
index 0000000000..9795cbcff6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/TcpTestListener.cs
@@ -0,0 +1,219 @@
+//
+// TcpTestListener.cs
+//
+// Author:
+//       Alan McGovern <alan.mcgovern@gmail.com>
+//
+// Copyright (c) 2013 Alan McGovern
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using MonoDevelop.UnitTesting.NUnit.External;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using System.Collections.Generic;
+using System.Linq;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.UnitTesting.NUnit.External
+{
+	class TcpTestListener : IDisposable
+	{
+		string testSuiteName;
+		string rootTestName;
+
+		public bool HasReceivedConnection {
+			get; private set;
+		}
+
+		List<Tuple<string,UnitTestResult>> suiteStack = new List<Tuple<string, UnitTestResult>> ();
+		IRemoteEventListener listener;
+
+		TcpListener TcpListener {
+			get; set;
+		}
+
+		public int Port {
+			get { return ((IPEndPoint) TcpListener.LocalEndpoint).Port; }
+		}
+
+
+		public TcpTestListener (IRemoteEventListener listener, string suiteName)
+		{
+			this.testSuiteName = suiteName;
+			this.listener = listener;
+			bool rootSuiteStarted = false;
+
+			TcpListener = new TcpListener (new IPEndPoint (IPAddress.Loopback, 0));
+			TcpListener.Start ();
+			Task.Run (() => {
+				try {
+					using (var client = TcpListener.AcceptTcpClient ())
+					using (var socketStream = client.GetStream ())
+					using (var reader = new StreamReader (socketStream, Encoding.UTF8)) {
+
+						HasReceivedConnection = true;
+						string line = null;
+						while ((line = reader.ReadLine ()) != null) {
+							var element = XElement.Parse (line);
+							string testName = element.Attribute ("name").Value;
+							var action = element.Name.LocalName;
+
+							if (testSuiteName.Length == 0 && !rootSuiteStarted) {
+								// Running the whole assembly
+								rootTestName = testName;
+								rootSuiteStarted = true;
+								continue;
+							}
+							if (testSuiteName == testName && !rootSuiteStarted) {
+								// Running a test suite
+								rootTestName = testName;
+								rootSuiteStarted = true;
+								listener.SuiteStarted ("<root>");
+								continue;
+							}
+
+							if (!rootSuiteStarted)
+								continue;
+
+							switch (action) {
+							case "suite-started":
+								UpdateTestSuiteStatus (testName, false); break;
+							case "test-started":
+								UpdateTestSuiteStatus (testName, true);
+								listener.TestStarted (testName); break;
+							case "test-finished":
+								var res = CreateResult (element);
+								AddTestResult (res);
+								listener.TestFinished (testName, res); break;
+							case "suite-finished":
+								if (testName == rootTestName) {
+									FinishSuites (0);
+									listener.SuiteFinished ("<root>", CreateResult (element));
+									rootSuiteStarted = false;
+								}
+								break;
+							}
+						}
+					}
+				} catch (Exception ex) {
+					LoggingService.LogError ("Exception in test listener", ex);
+				} finally {
+					TcpListener.Stop ();
+				}
+			});
+		}
+
+		public void Dispose ()
+		{
+			TcpListener.Stop ();
+		}
+
+		void UpdateTestSuiteStatus (string name, bool isTest)
+		{
+			if (testSuiteName.Length > 0)
+				name = name.Substring (testSuiteName.Length + 1);
+			string[] parts = name.Split ('.');
+			int len = isTest ? parts.Length - 1 : parts.Length;
+			for (int n = 0; n < len; n++) {
+				if (n >= suiteStack.Count) {
+					StartSuite (parts[n]);
+				} else if (parts [n] != suiteStack [n].Item1) {
+					FinishSuites (n);
+					StartSuite (parts[n]);
+				}
+			}
+		}
+
+		void FinishSuites (int stackLevel)
+		{
+			if (stackLevel + 1 < suiteStack.Count)
+				FinishSuites (stackLevel + 1);
+
+			if (stackLevel >= suiteStack.Count)
+				return;
+
+			var tname = GetTestSuiteName (stackLevel);
+			var res = suiteStack [stackLevel].Item2;
+
+			suiteStack.RemoveAt (stackLevel);
+
+			listener.SuiteFinished (tname, res);
+		}
+
+		void StartSuite (string name)
+		{
+			suiteStack.Add (new Tuple<string, UnitTestResult> (name, new UnitTestResult ()));
+			name = GetTestSuiteName (suiteStack.Count - 1);
+			listener.SuiteStarted (name);
+		}
+
+		void AddTestResult (UnitTestResult res)
+		{
+			foreach (var r in suiteStack)
+				r.Item2.Add (res);
+		}
+
+		string GetTestSuiteName (int stackLevel)
+		{
+			var info = suiteStack [stackLevel];
+
+			string name;
+			if (stackLevel > 0) {
+				var prefix = string.Join (".", suiteStack.Select (s => s.Item1).Take (stackLevel));
+				name = prefix + "." + info.Item1;
+			} else
+				name = info.Item1;
+
+			if (testSuiteName.Length > 0)
+				name = testSuiteName + "." + name;
+			return name;
+		}
+
+		UnitTestResult CreateResult (XElement element)
+		{
+			var result = (ResultStatus)Enum.Parse (typeof(ResultStatus), element.Attribute ("result").Value);
+			var passed = int.Parse (element.Attribute ("passed").Value);
+			var failures = int.Parse (element.Attribute ("failures").Value);
+			var ignored = int.Parse (element.Attribute ("ignored").Value);
+			var inconclusive = int.Parse (element.Attribute ("inconclusive").Value);
+
+			var message = (string)element.Attribute ("message");
+			var stackTrace = (string)element.Attribute ("stack-trace");
+			var output = (string)element.Attribute ("output");
+
+			return new UnitTestResult {
+				Status = result,
+				Passed = passed,
+				Failures = failures,
+				Ignored = ignored,
+				Inconclusive = inconclusive,
+				Message = message,
+				StackTrace = stackTrace,
+				ConsoleOutput = output
+			};
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelopNUnit.addin.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelopNUnit.addin.xml
new file mode 100644
index 0000000000..5b90817b8e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelopNUnit.addin.xml
@@ -0,0 +1,31 @@
+<ExtensionModel>
+
+	<!-- Extensions -->
+	
+	<Extension path = "/MonoDevelop/UnitTesting/TestProviders">
+		<Class id="SystemTestProvider" class="MonoDevelop.UnitTesting.NUnit.SystemTestProvider" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
+		<ProjectTemplate id = "MonoDevelop.CSharp.NUnitLibraryProject" resource = "NUnitProject.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.VBNet.NUnitLibraryProject" resource = "NUnitProjectVBNet.xpt.xml"/>
+	</Extension>
+
+  	<Extension path = "/MonoDevelop/Ide/FileTemplates">
+		<FileTemplate id = "NUnitTestClass" resource = "NUnitTestClass.xft.xml"/>
+	</Extension>
+
+	<Extension path="/MonoDevelop/Ide/TemplateImages">
+		<Image id="md-nunit-library-project" resource="nunit-library-project.png" />
+	</Extension>
+	
+	<Extension path = "/MonoDevelop/UnitTesting/UnitTestMarkers">
+		<TestMarkers
+				testMethodAttributeMarker="NUnit.Framework.TestAttribute"
+				testCaseMethodAttributeMarker="NUnit.Framework.TestCaseAttribute"
+				ignoreTestMethodAttributeMarker="NUnit.Framework.IgnoreAttribute"
+				ignoreTestClassAttributeMarker="NUnit.Framework.IgnoreAttribute"
+			/>
+	</Extension>
+	
+</ExtensionModel>
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/EventListenerWrapper.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/EventListenerWrapper.cs
new file mode 100644
index 0000000000..2472998471
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/EventListenerWrapper.cs
@@ -0,0 +1,187 @@
+//
+// EventListenerWrapper.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Reflection;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using System.Text;
+
+using MonoDevelop.Core.Execution;
+using NUnit.Engine;
+using NUnit.Common;
+using System.Diagnostics.Contracts;
+using NUnit.Framework.Interfaces;
+using NUnit.Framework.Internal;
+using System.Xml;
+using System.Net.Configuration;
+using System.Globalization;
+using MonoDevelop.UnitTesting.NUnit;
+
+namespace NUnit3Runner
+{
+	
+	class EventListenerWrapper: MarshalByRefObject, ITestEventListener
+	{
+		RemoteProcessServer server;
+
+		public EventListenerWrapper (RemoteProcessServer server)
+		{
+			this.server = server;
+		}
+		
+		public void RunFinished (Exception exception)
+		{
+		}
+		
+		public void RunFinished (TestResult results)
+		{
+		}
+		
+		public void RunStarted (string name, int testCount)
+		{
+		}
+		
+		public void SuiteFinished (XmlNode testResult)
+		{
+			var testName = testResult.Attributes["fullname"].Value;
+			server.SendMessage (new SuiteFinishedMessage {
+				Suite = testName,
+				Result = GetLocalTestResult (testResult)
+			});
+		}
+
+		public void SuiteStarted (XmlNode testResult)
+		{
+			var testName = testResult.Attributes["fullname"].Value;
+			server.SendMessage (new SuiteStartedMessage {
+				Suite = testName
+			});
+		}
+		
+		public void TestFinished (XmlNode testResult)
+		{
+			var testName = testResult.Attributes["fullname"].Value;
+			server.SendMessage (new TestFinishedMessage {
+				TestCase = testName,
+				Result = GetLocalTestResult (testResult)
+			});
+		}
+		
+		public void TestStarted (XmlNode data)
+		{
+			var testName = data.Attributes["fullname"].Value;
+			server.SendMessage (new TestStartedMessage {
+				TestCase = testName
+			});
+		}
+		
+		public override object InitializeLifetimeService ()
+		{
+			return null;
+		}
+		
+		string GetTestName (XmlNode data)
+		{
+			return data.Attributes["fullname"].Value;
+		}
+		
+		public RemoteTestResult GetLocalTestResult (XmlNode t)
+		{
+			var e = (XmlElement)t;
+
+			RemoteTestResult res = new RemoteTestResult ();
+
+			if (e.LocalName == "test-suite") {
+				res.Failures = int.Parse (e.GetAttribute ("failed"));
+				res.Errors = 0;
+				res.Ignored = int.Parse (e.GetAttribute ("skipped"));
+				res.Inconclusive = int.Parse (e.GetAttribute ("inconclusive"));
+				res.NotRunnable = 0;
+				res.Passed = int.Parse (e.GetAttribute ("passed"));
+			} else if (e.LocalName == "test-case") {
+				var runResult = e.GetAttribute ("result");
+				if (runResult == "Passed")
+					res.Passed = 1;
+				else if (runResult == "Failed") {
+					res.Failures = 1;
+					var msg = e.SelectSingleNode ("failure/message");
+					if (msg != null)
+						res.Message = msg.InnerText;
+					var stack = e.SelectSingleNode ("failure/stack-trace");
+					if (stack != null)
+						res.StackTrace = stack.InnerText;
+				}
+				else if (runResult == "Skipped") {
+					res.Skipped = 1;
+					var msg = e.SelectSingleNode ("reason/message");
+					if (msg != null)
+						res.Message = msg.InnerText;
+				} else if (runResult == "Inconclusive") {
+					res.Inconclusive = 1;
+					var msg = e.SelectSingleNode ("reason/message");
+					if (msg != null)
+						res.Message = msg.InnerText;
+				}
+			}
+
+			res.Time = TimeSpan.FromSeconds (double.Parse (e.GetAttribute ("duration"), CultureInfo.InvariantCulture));
+
+			var output = e.SelectSingleNode ("output");
+			if (output != null) {
+				Console.WriteLine (output.InnerText);
+				res.ConsoleOutput = output.InnerText;
+			}
+			
+			return res;
+		}
+
+		public void UnhandledException (Exception exception)
+		{
+		}
+
+		void ITestEventListener.OnTestEvent (string report)
+		{
+			var doc = new XmlDocument();
+			doc.LoadXml (report);
+
+			var testEvent = doc.FirstChild;
+			switch (testEvent.Name)
+			{
+				case "test-case":
+				TestFinished (testEvent);
+				break;
+
+				case "test-suite":
+				SuiteFinished (testEvent);
+				break;
+			}
+		}
+	}
+	
+}
diff --git a/main/src/addins/CBinding/Makefile.am b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Makefile.am
index c9cc87438f..c9cc87438f 100644
--- a/main/src/addins/CBinding/Makefile.am
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Makefile.am
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj
new file mode 100644
index 0000000000..c04f9da8c4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D2A4E99E-FC2D-45A9-8BE7-1AB7DF95BA2A}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>NUnit3Runner</RootNamespace>
+    <AssemblyName>NUnitRunner</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.UnitTesting\NUnit3</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ExternalConsole>true</ExternalConsole>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.UnitTesting\NUnit3</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ExternalConsole>true</ExternalConsole>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\..\..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.engine">
+      <HintPath>..\..\..\..\packages\NUnit.Engine.3.0.1\lib\nunit.engine.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.engine.api">
+      <HintPath>..\..\..\..\packages\NUnit.Engine.3.0.1\lib\nunit.engine.api.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil">
+      <HintPath>..\..\..\..\packages\NUnit.Engine.3.0.1\lib\Mono.Cecil.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit-agent">
+      <HintPath>..\..\..\..\packages\NUnit.Engine.3.0.1\lib\nunit-agent.exe</HintPath>
+    </Reference>
+    <Reference Include="nunit-agent-x86">
+      <HintPath>..\..\..\..\packages\NUnit.Engine.3.0.1\lib\nunit-agent-x86.exe</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.Execution\BinaryMessage.cs">
+      <Link>BinaryMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.Execution\RemoteProcessServer.cs">
+      <Link>RemoteProcessServer.cs</Link>
+    </Compile>
+    <Compile Include="..\MonoDevelop.UnitTesting.NUnit\RemoteTestResult.cs">
+      <Link>RemoteTestResult.cs</Link>
+    </Compile>
+    <Compile Include="NUnitTestRunner.cs" />
+    <Compile Include="EventListenerWrapper.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnitTestRunner.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnitTestRunner.cs
new file mode 100644
index 0000000000..b085795abe
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnitTestRunner.cs
@@ -0,0 +1,210 @@
+//
+// ExternalTestRunner.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using System.Linq;
+using System.Reflection;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+
+using NUnit.Framework;
+using NUnit.Framework.Interfaces;
+using NUnit.Engine;
+using System.Xml;
+using NUnit.Common;
+using NUnit.Engine.Internal;
+using MonoDevelop.Core.Execution;
+using MonoDevelop.UnitTesting.NUnit;
+
+namespace NUnit3Runner
+{
+	public class NUnitTestRunner: MessageListener
+	{
+		RemoteProcessServer server;
+		ITestEngine engine;
+		ITestFilterService filterService;
+
+		public NUnitTestRunner (RemoteProcessServer server)
+		{
+			this.server = server;
+
+			// Note: We need to load all nunit.*.dll assemblies before we do *anything* else in this class
+			// This is to ensure that we always load the assemblies from the monodevelop directory and not
+			// from the directory of the assembly under test. For example we wnat to load
+			// /Applications/MonoDevelop/lib/Addins/nunit.framework.dll and not /user/app/foo/bin/debug/nunit.framework.dll
+			var path = Path.GetDirectoryName (GetType ().Assembly.Location);
+			string nunitPath = Path.Combine (path, "nunit.framework.dll");
+			Assembly.LoadFrom (nunitPath);
+
+			Initialize ();
+		}
+
+		public void Initialize ()
+		{

+			engine = TestEngineActivator.CreateInstance ();
+			filterService = engine.Services.GetService<ITestFilterService>();
+		}
+
+		[MessageHandler]
+		public RunResponse Run (RunRequest r)
+		{
+			EventListenerWrapper listenerWrapper = new EventListenerWrapper (server);
+
+			UnhandledExceptionEventHandler exceptionHandler = (object sender, UnhandledExceptionEventArgs e) => {
+				var ex = e.ExceptionObject;
+				File.WriteAllText (r.CrashLogFile, e.ToString ());
+			};
+
+			AppDomain.CurrentDomain.UnhandledException += exceptionHandler;
+			try {
+				var res = Run (listenerWrapper, r.NameFilter, r.Path, r.SuiteName, r.SupportAssemblies, r.TestRunnerType, r.TestRunnerAssembly);
+				res = res.SelectSingleNode ("test-suite");
+				return new RunResponse () { Result = listenerWrapper.GetLocalTestResult (res) };
+			} finally {
+				AppDomain.CurrentDomain.UnhandledException -= exceptionHandler;
+			}
+		}
+
+		[MessageHandler]
+		public GetTestInfoResponse GetTestInfo (GetTestInfoRequest req)
+		{
+			var r = GetTestInfo (req.Path, req.SupportAssemblies);
+			return new GetTestInfoResponse { Result = r };
+		}
+
+		TestPackage CreatePackage (string path)
+		{
+			TestPackage package = new TestPackage (path);
+			package.AddSetting ("ShadowCopyFiles", false);
+			package.AddSetting ("ProcessModel", "InProcess");
+			package.AddSetting ("DomainUsage", "Single");
+			return package;
+		}
+		
+		public XmlNode Run (ITestEventListener listener, string[] nameFilter, string path, string suiteName, string[] supportAssemblies, string testRunnerType, string testRunnerAssembly)
+		{
+			InitSupportAssemblies (supportAssemblies);
+
+			TestFilter filter = TestFilter.Empty;
+			if (nameFilter != null && nameFilter.Length > 0)
+				filter = CreateTestFilter (nameFilter);
+
+			ITestRunner tr = null;
+			if (!string.IsNullOrEmpty (testRunnerType)) {
+				Type runnerType;
+				if (string.IsNullOrEmpty (testRunnerAssembly))
+					runnerType = Type.GetType (testRunnerType, true);
+				else {
+					var asm = Assembly.LoadFrom (testRunnerAssembly);
+					runnerType = asm.GetType (testRunnerType);
+				}
+				tr = (ITestRunner)Activator.CreateInstance (runnerType);
+			}
+
+			TestPackage package = CreatePackage (path);
+
+			if (tr == null)
+				tr = engine.GetRunner (package);
+
+			return tr.Run (listener, filter);
+		}
+		
+		public NunitTestInfo GetTestInfo (string path, string[] supportAssemblies)
+		{
+			InitSupportAssemblies (supportAssemblies);
+			TestPackage package = CreatePackage (path);
+			var tr = engine.GetRunner (package);
+			var r = tr.Explore (TestFilter.Empty);
+			var root = r.SelectSingleNode ("test-suite") as XmlElement;
+			if (root != null)
+				return BuildTestInfo (root);
+			else
+				return null;
+		}
+		
+		internal NunitTestInfo BuildTestInfo (XmlElement test)
+		{
+			NunitTestInfo ti = new NunitTestInfo ();
+			// The name of inherited tests include the base class name as prefix.
+			// That prefix has to be removed
+			string tname = test.GetAttribute ("name");
+			string fullName = test.GetAttribute ("fullname");
+
+			var tn = test.GetAttribute ("classname");
+			if (tn != null) {
+				var i = tn.LastIndexOf ('.');
+				if (i != -1) {
+					ti.FixtureTypeName = tn.Substring (i + 1);
+					ti.FixtureTypeNamespace = tn.Substring (0, i);
+				} else {
+					ti.FixtureTypeName = tn;
+					ti.FixtureTypeNamespace = "";
+				}
+			}
+			ti.Name = tname;
+			ti.TestId = fullName;
+			// Trim short name from end of full name to get the path
+			string testNameWithDelimiter = "." + tname;
+			if (fullName.EndsWith (testNameWithDelimiter)) {
+				int pathLength = fullName.Length - testNameWithDelimiter.Length;
+				ti.PathName = fullName.Substring (0, pathLength);
+			}
+			else
+				ti.PathName = null;
+
+			ti.IsExplicit = test.GetAttribute ("classname") == "Explicit";
+
+			var children = test.ChildNodes.OfType<XmlElement> ().Where (e => e.LocalName == "test-suite" || e.LocalName == "test-case").ToArray ();
+			if (children.Length > 0) {
+				ti.Tests = new NunitTestInfo [children.Length];
+				for (int n=0; n<children.Length; n++)
+					ti.Tests [n] = BuildTestInfo (children [n]);
+			}
+			return ti;
+		}
+		
+		void InitSupportAssemblies (string[] supportAssemblies)
+		{
+			// Preload support assemblies (they may not be in the test assembly directory nor in the gac)
+			foreach (string asm in supportAssemblies)
+				Assembly.LoadFrom (asm);
+		}
+		
+		private TestFilter CreateTestFilter (string[] nameFilter)
+		{
+			ITestFilterBuilder builder = filterService.GetTestFilterBuilder();
+			foreach (var testName in nameFilter)
+				builder.AddTest(testName);
+			return builder.GetFilter();
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Program.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Program.cs
new file mode 100644
index 0000000000..5ed87b6e4b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Program.cs
@@ -0,0 +1,42 @@
+//
+// Program.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Execution;
+
+namespace NUnit3Runner
+{
+	public class Application
+	{
+		static RemoteProcessServer server;
+
+		public static void Main (string [] args)
+		{
+			server = new RemoteProcessServer ();
+			server.Connect (args, new NUnitTestRunner (server));
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/packages.config b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/packages.config
new file mode 100644
index 0000000000..c2833088b1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="3.0.1" targetFramework="net45" />
+  <package id="NUnit.Engine" version="3.0.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Application.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Application.cs
new file mode 100644
index 0000000000..359570c678
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Application.cs
@@ -0,0 +1,45 @@
+//
+// Application.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Core.Execution;
+using MonoDevelop.UnitTesting.NUnit.External;
+using MonoDevelop.UnitTesting.NUnit;
+
+namespace NUnitRunner
+{
+	public class Application
+	{
+		static RemoteProcessServer server;
+
+		public static void Main (string [] args)
+		{
+			NUnitTestRunner.PreloadAssemblies ();
+			server = new RemoteProcessServer ();
+			server.Connect (args, new RemoteNUnitTestRunner (server));
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/ExternalTestRunner.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/ExternalTestRunner.cs
new file mode 100644
index 0000000000..dd42c9e545
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/ExternalTestRunner.cs
@@ -0,0 +1,236 @@
+//
+// ExternalTestRunner.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using System.Reflection;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using System.Text;
+
+using NUnit.Core;
+using NUnit.Util;
+using MonoDevelop.Core.Execution;
+
+namespace MonoDevelop.UnitTesting.NUnit.External
+{
+	public class RemoteNUnitTestRunner: MessageListener
+	{
+		NUnitTestRunner runner;
+		RemoteProcessServer server;
+
+		public RemoteNUnitTestRunner (RemoteProcessServer server)
+		{
+			this.server = server;
+
+			// Add standard services to ServiceManager
+			ServiceManager.Services.AddService (new DomainManager ());
+			ServiceManager.Services.AddService (new ProjectService ());
+			ServiceManager.Services.AddService (new AddinRegistry ());
+			ServiceManager.Services.AddService (new AddinManager ());
+			ServiceManager.Services.AddService (new TestAgency ());
+			
+			// Initialize services
+			ServiceManager.Services.InitializeServices ();
+		}
+
+		[MessageHandler]
+		public RunResponse Run (RunRequest r)
+		{
+			var res = Run (r.NameFilter, r.Path, r.SuiteName, r.SupportAssemblies, r.TestRunnerType, r.TestRunnerAssembly, r.CrashLogFile);
+			return new RunResponse () { Result = res };
+		}
+
+		public RemoteTestResult Run (string[] nameFilter, string path, string suiteName, string[] supportAssemblies, string testRunnerType, string testRunnerAssembly, string crashLogFile)
+		{
+			NUnitTestRunner runner = GetRunner (path);
+			EventListenerWrapper listenerWrapper = new EventListenerWrapper (server);
+			
+			UnhandledExceptionEventHandler exceptionHandler = (object sender, UnhandledExceptionEventArgs e) => {
+				var ex = e.ExceptionObject;
+				File.WriteAllText (crashLogFile, e.ToString ());
+			};
+
+			AppDomain.CurrentDomain.UnhandledException += exceptionHandler;
+			try {
+				TestResult res = runner.Run (listenerWrapper, nameFilter, path, suiteName, supportAssemblies, testRunnerType, testRunnerAssembly);
+				return listenerWrapper.GetLocalTestResult (res);
+			} finally {
+				AppDomain.CurrentDomain.UnhandledException -= exceptionHandler;
+			}
+		}
+
+		[MessageHandler]
+		public GetTestInfoResponse GetTestInfo (GetTestInfoRequest req)
+		{
+			NUnitTestRunner runner = GetRunner (req.Path);
+			var r = runner.GetTestInfo (req.Path, req.SupportAssemblies);
+			return new GetTestInfoResponse { Result = r };
+		}
+		
+		NUnitTestRunner GetRunner (string assemblyPath)
+		{
+			string basePath = Path.GetDirectoryName (GetType ().Assembly.Location);
+
+			TestPackage package = new TestPackage (assemblyPath);
+			package.Settings ["ShadowCopyFiles"] = false;
+			package.BasePath = basePath;
+			
+			AppDomain domain = Services.DomainManager.CreateDomain (package);
+			string asm = Path.Combine (basePath, "NUnitRunner.exe");
+			runner = (NUnitTestRunner)domain.CreateInstanceFromAndUnwrap (asm, "MonoDevelop.UnitTesting.NUnit.External.NUnitTestRunner");
+			runner.Initialize ();
+			return runner;
+		}
+	}
+	
+	class EventListenerWrapper: MarshalByRefObject, EventListener
+	{
+		RemoteProcessServer server;
+		StringBuilder consoleOutput;
+		StringBuilder consoleError;
+		
+		public EventListenerWrapper (RemoteProcessServer server)
+		{
+			this.server = server;
+		}
+		
+		public void RunFinished (Exception exception)
+		{
+		}
+		
+		public void RunFinished (TestResult results)
+		{
+		}
+		
+		public void RunStarted (string name, int testCount)
+		{
+		}
+		
+		public void SuiteFinished (TestResult result)
+		{
+			server.SendMessage (new SuiteFinishedMessage {
+				Suite = GetTestName (result.Test),
+				Result = GetLocalTestResult (result)
+			});
+		}
+
+		public void SuiteStarted (TestName suite)
+		{
+			server.SendMessage (new SuiteStartedMessage {
+				Suite = GetTestName (suite)
+			});
+		}
+		
+		public void TestFinished (TestResult result)
+		{
+			server.SendMessage (new TestFinishedMessage {
+				TestCase = GetTestName (result.Test),
+				Result = GetLocalTestResult (result)
+			});
+		}
+		
+		public void TestOutput (TestOutput testOutput)
+		{
+			Console.WriteLine (testOutput.Text);
+			if (consoleOutput == null)
+				return;
+			else if (testOutput.Type == TestOutputType.Out)
+				consoleOutput.Append (testOutput.Text);
+			else
+				consoleError.Append (testOutput.Text);
+		}
+		
+		public void TestStarted (TestName testCase)
+		{
+			server.SendMessage (new TestStartedMessage {
+				TestCase = GetTestName (testCase)
+			});
+			consoleOutput = new StringBuilder ();
+			consoleError = new StringBuilder ();
+		}
+		
+		public override object InitializeLifetimeService ()
+		{
+			return null;
+		}
+		
+		string GetTestName (ITest t)
+		{
+			if (t == null)
+				return null;
+			return t.TestName.FullName;
+		}
+		
+		public string GetTestName (TestName t)
+		{
+			if (t == null)
+				return null;
+			return t.FullName;
+		}
+		
+		public RemoteTestResult GetLocalTestResult (TestResult t)
+		{
+			RemoteTestResult res = new RemoteTestResult ();
+			var summary = new ResultSummarizer (t);
+			res.Failures = summary.Failures;
+			res.Errors = summary.Errors;
+			res.Ignored = summary.Ignored;
+			res.Inconclusive = summary.Inconclusive;
+			res.NotRunnable = summary.NotRunnable;
+			res.Passed = summary.Passed;
+			res.StackTrace = t.StackTrace;
+			res.Time = TimeSpan.FromSeconds (t.Time);
+			res.Message = t.Message;
+
+			if (consoleOutput != null) {
+				res.ConsoleOutput = consoleOutput.ToString ();
+				res.ConsoleError = consoleError.ToString ();
+				consoleOutput = null;
+				consoleError = null;
+			}
+			
+			return res;
+		}
+
+		public void UnhandledException (Exception exception)
+		{
+		}
+	}
+	
+	public interface IRemoteEventListener
+	{
+		void TestStarted (string testCase);
+		void TestFinished (string test, RemoteTestResult result);
+		void SuiteStarted (string suite);
+		void SuiteFinished (string suite, RemoteTestResult result);
+	}
+}
+
diff --git a/main/src/addins/NUnit/NUnitRunner/Makefile.am b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Makefile.am
index c9cc87438f..c9cc87438f 100644
--- a/main/src/addins/NUnit/NUnitRunner/Makefile.am
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Makefile.am
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj
new file mode 100644
index 0000000000..e798c370bf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0AF16AF1-0876-413E-9803-08BD33C19E00}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AssemblyName>NUnitRunner</AssemblyName>
+    <RootNamespace>NUnitRunner</RootNamespace>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.UnitTesting\NUnit2</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile></DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\MonoDevelop.UnitTesting\NUnit2</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+    <DebugSymbols>true</DebugSymbols>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\..\build\AddIns\NUnit\NUnitRunner.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.core">
+      <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.core.interfaces">
+      <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.util">
+      <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="NUnitTestRunner.cs" />
+    <Compile Include="ExternalTestRunner.cs" />
+    <Compile Include="Application.cs" />
+    <Compile Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.Execution\BinaryMessage.cs">
+      <Link>BinaryMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.Execution\RemoteProcessServer.cs">
+      <Link>RemoteProcessServer.cs</Link>
+    </Compile>
+    <Compile Include="..\MonoDevelop.UnitTesting.NUnit\RemoteTestResult.cs">
+      <Link>RemoteTestResult.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitTestRunner.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitTestRunner.cs
new file mode 100644
index 0000000000..8059c6d934
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitTestRunner.cs
@@ -0,0 +1,207 @@
+//
+// ExternalTestRunner.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using System.Linq;
+using System.Reflection;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+
+using NUnit.Core;
+using NUnit.Framework;
+using NUnit.Core.Filters;
+
+namespace MonoDevelop.UnitTesting.NUnit.External
+{
+	public class NUnitTestRunner: MarshalByRefObject
+	{
+		public NUnitTestRunner ()
+		{
+			PreloadAssemblies ();
+		}
+
+		public static void PreloadAssemblies ()
+		{
+			// Note: We need to load all nunit.*.dll assemblies before we do *anything* else in this class
+			// This is to ensure that we always load the assemblies from the monodevelop directory and not
+			// from the directory of the assembly under test. For example we wnat to load
+			// /Applications/MonoDevelop/lib/Addins/nunit.framework.dll and not /user/app/foo/bin/debug/nunit.framework.dll
+
+			// Force the loading of the NUnit.Framework assembly.
+			// It's needed since that dll is not located in the test dll directory.
+			var path = Path.GetDirectoryName (typeof(NUnitTestRunner).Assembly.Location);
+			string nunitPath = Path.Combine (path, "nunit.framework.dll");
+			string nunitCorePath = Path.Combine (path, "nunit.core.dll");
+			string nunitCoreInterfacesPath = Path.Combine (path, "nunit.core.interfaces.dll");
+
+			Assembly.LoadFrom (nunitCoreInterfacesPath);
+			Assembly.LoadFrom (nunitCorePath);
+			Assembly.LoadFrom (nunitPath);
+		}
+
+		public void Initialize ()
+		{

+			// Initialize ExtensionHost if not already done

+			if ( !CoreExtensions.Host.Initialized )

+				CoreExtensions.Host.InitializeService();

+		}
+		
+		public TestResult Run (EventListener listener, string[] nameFilter, string path, string suiteName, string[] supportAssemblies, string testRunnerType, string testRunnerAssembly)
+		{
+			InitSupportAssemblies (supportAssemblies);
+
+			ITestFilter filter = TestFilter.Empty;
+			if (nameFilter != null && nameFilter.Length > 0)
+				filter = new TestNameFilter (nameFilter);
+
+			TestRunner tr;
+			if (!string.IsNullOrEmpty (testRunnerType)) {
+				Type runnerType;
+				if (string.IsNullOrEmpty (testRunnerAssembly))
+					runnerType = Type.GetType (testRunnerType, true);
+				else {
+					var asm = Assembly.LoadFrom (testRunnerAssembly);
+					runnerType = asm.GetType (testRunnerType);
+				}
+				tr = (TestRunner)Activator.CreateInstance (runnerType);
+			} else
+				tr = new RemoteTestRunner ();
+
+			TestPackage package = new TestPackage (path);
+			if (!string.IsNullOrEmpty (suiteName))
+				package.TestName = suiteName;
+			tr.Load (package);
+			return tr.Run (listener, filter, false, LoggingThreshold.All);
+		}
+		
+		public NunitTestInfo GetTestInfo (string path, string[] supportAssemblies)
+		{
+			InitSupportAssemblies (supportAssemblies);
+			TestSuite rootTS = new TestSuiteBuilder ().Build (new TestPackage (path));
+			return BuildTestInfo (rootTS);
+		}
+		
+		internal NunitTestInfo BuildTestInfo (Test test)
+		{
+			NunitTestInfo ti = new NunitTestInfo ();
+			// The name of inherited tests include the base class name as prefix.
+			// That prefix has to be removed
+			string tname = test.TestName.Name;
+			// Find the last index of the dot character that is not a part of the test parameters
+			// Parameterized methods can contain '.' as class name & they don't seem to prefix base class name, so it's safe to skip them
+			if (!(test.Parent is ParameterizedMethodSuite)) {
+				int j = tname.IndexOf ('(');
+				int i = tname.LastIndexOf ('.', (j == -1) ? (tname.Length - 1) : j);
+				if (i != -1)
+					tname = tname.Substring (i + 1);
+			}
+
+			if (test.FixtureType != null) {
+				ti.FixtureTypeName = test.FixtureType.Name;
+				ti.FixtureTypeNamespace = test.FixtureType.Namespace;
+			} else if (test.TestType == "ParameterizedTest") {
+				ti.FixtureTypeName = test.Parent.FixtureType.Name;
+				ti.FixtureTypeNamespace = test.Parent.FixtureType.Namespace;
+			}
+			ti.Name = tname;
+			ti.TestId = test.TestName.FullName;
+
+			// Trim short name from end of full name to get the path
+			string testNameWithDelimiter = "." + tname;
+			if (test.TestName.FullName.EndsWith (testNameWithDelimiter)) {
+				int pathLength = test.TestName.FullName.Length - testNameWithDelimiter.Length;
+				ti.PathName = test.TestName.FullName.Substring(0, pathLength );
+			}
+			else
+				ti.PathName = null;
+			
+			if (test.Tests != null && test.Tests.Count > 0) {
+				ti.Tests = new NunitTestInfo [test.Tests.Count];
+				for (int n=0; n<test.Tests.Count; n++)
+					ti.Tests [n] = BuildTestInfo ((Test)test.Tests [n]);
+			}
+			ti.IsExplicit = test.RunState == RunState.Explicit;
+			return ti;
+		}
+		
+		void InitSupportAssemblies (string[] supportAssemblies)
+		{
+			// Preload support assemblies (they may not be in the test assembly directory nor in the gac)
+			foreach (string asm in supportAssemblies)
+				Assembly.LoadFrom (asm);
+		}
+		
+		public override object InitializeLifetimeService ()
+		{
+			return null;
+		}
+	}
+		
+	[Serializable]
+	public class TestNameFilter: ITestFilter
+	{
+		string[] names;
+		
+		public TestNameFilter (params string[] names)
+		{
+			this.names = names;
+		}
+		
+		#region ITestFilter implementation 
+		
+		public bool Pass (ITest test)
+		{
+			if (!test.IsSuite && names.Any (n => test.TestName.FullName == n))
+				return true;
+			if (test.Tests != null) {
+				foreach (ITest ct in test.Tests) {
+					if (Pass (ct))
+						return true;
+				}
+			}
+			return false;
+		}
+		
+		public bool Match (ITest test)
+		{
+			return Pass (test);
+		}
+		
+		public bool IsEmpty {
+			get {
+				return false;
+			}
+		}
+		
+		#endregion 
+	}
+}
+
diff --git a/main/src/addins/NUnit/NUnitRunner/packages.config b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/packages.config
index b815516599..b815516599 100644
--- a/main/src/addins/NUnit/NUnitRunner/packages.config
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/packages.config
diff --git a/main/src/addins/NUnit/templates/NUnitAssemblyGroup.xpt.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitAssemblyGroup.xpt.xml
index ab95772034..ab95772034 100644
--- a/main/src/addins/NUnit/templates/NUnitAssemblyGroup.xpt.xml
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitAssemblyGroup.xpt.xml
diff --git a/main/src/addins/NUnit/templates/NUnitProject.xpt.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitProject.xpt.xml
index 7b364a57c3..7b364a57c3 100644
--- a/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitProject.xpt.xml
diff --git a/main/src/addins/NUnit/templates/NUnitProjectVBNet.xpt.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitProjectVBNet.xpt.xml
index 12ec5b3dae..12ec5b3dae 100644
--- a/main/src/addins/NUnit/templates/NUnitProjectVBNet.xpt.xml
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitProjectVBNet.xpt.xml
diff --git a/main/src/addins/NUnit/templates/NUnitTestClass.xft.xml b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitTestClass.xft.xml
index aaebb07b4e..aaebb07b4e 100644
--- a/main/src/addins/NUnit/templates/NUnitTestClass.xft.xml
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/NUnitTestClass.xft.xml
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project.png b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project.png
new file mode 100644
index 0000000000..c0e3797eaf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project@2x.png b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project@2x.png
new file mode 100644
index 0000000000..c995eb9128
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark.png b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark.png
new file mode 100644
index 0000000000..ed1a8d0d5a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark@2x.png
new file mode 100644
index 0000000000..62ef7ff47e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/templates/images/nunit-library-project~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/AddinInfo.cs b/main/src/addins/MonoDevelop.UnitTesting/AddinInfo.cs
new file mode 100644
index 0000000000..c9be9da936
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/AddinInfo.cs
@@ -0,0 +1,15 @@
+
+using System;
+using Mono.Addins;
+using Mono.Addins.Description;
+
+[assembly:Addin ("UnitTesting", 
+	Namespace = "MonoDevelop",
+	Version = MonoDevelop.BuildInfo.Version,
+	Category = "Testing")]
+
+[assembly:AddinName ("Unit Testing core support")]
+[assembly:AddinDescription ("Unit Testing core support")]
+
+[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
diff --git a/main/src/addins/MonoDevelop.UnitTesting/AssemblyInfo.cs b/main/src/addins/MonoDevelop.UnitTesting/AssemblyInfo.cs
new file mode 100644
index 0000000000..7b21277467
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+// Autogenerated from MonoDevelopNUnit.addin.xml
+
+using System.Reflection;
+
+[assembly: AssemblyProduct ("MonoDevelop")]
+[assembly: AssemblyTitle ("NUnit support")]
+[assembly: AssemblyDescription ("Integrates NUnit into the MonoDevelop IDE.")]
+[assembly: AssemblyVersion ("2.6")]
+[assembly: AssemblyCopyright ("MIT X11")]
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Commands/NUnitCommands.cs b/main/src/addins/MonoDevelop.UnitTesting/Commands/NUnitCommands.cs
new file mode 100644
index 0000000000..5f776ccc60
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Commands/NUnitCommands.cs
@@ -0,0 +1,86 @@
+//
+// TestChart.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.UnitTesting.Commands
+{
+	public enum TestCommands
+	{
+		RunAllTests,
+		RunTest,
+		DebugTest,
+		RunTestWith,
+		ShowTestCode,
+		SelectTestInTree,
+		ShowTestDetails,
+		GoToFailure,
+		RerunTest,
+	}
+	
+	public enum TestChartCommands
+	{
+		ShowResults,
+		ShowTime,
+		UseTimeScale,
+		SingleDayResult,
+		ShowSuccessfulTests,
+		ShowFailedTests,
+		ShowIgnoredTests
+	}
+	
+	public enum NUnitProjectCommands
+	{
+		AddAssembly
+	}
+	
+	class RunAllTestsHandler: CommandHandler
+	{
+		protected override void Run ()
+		{
+			WorkspaceObject ob = IdeApp.ProjectOperations.CurrentSelectedObject;
+			if (ob != null) {
+				UnitTest test = UnitTestService.FindRootTest (ob);
+				if (test != null)
+					UnitTestService.RunTest (test, null);
+			}
+		}
+		
+		protected override void Update (CommandInfo info)
+		{
+			WorkspaceObject ob = IdeApp.ProjectOperations.CurrentSelectedObject;
+			if (ob != null) {
+				UnitTest test = UnitTestService.FindRootTest (ob);
+				info.Enabled = (test != null);
+			} else
+				info.Enabled = false;
+		}
+	}
+}
diff --git a/main/src/addins/NUnit/Gui/NUnitOptionsPanel.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/NUnitOptionsPanel.cs
index b4cecde926..b4cecde926 100644
--- a/main/src/addins/NUnit/Gui/NUnitOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/NUnitOptionsPanel.cs
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestChart.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestChart.cs
new file mode 100644
index 0000000000..13e923934d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestChart.cs
@@ -0,0 +1,407 @@
+//
+// TestChart.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using Gtk;
+using Gdk;
+using MonoDevelop.Components.Chart;
+
+namespace MonoDevelop.UnitTesting
+{
+	enum TestChartType {
+		Results,
+		Time
+	}
+	
+	class TestRunAxis: IntegerAxis
+	{
+		public UnitTestResult[] CurrentResults;
+		
+		public TestRunAxis (bool showLabel): base (showLabel)
+		{
+		}
+		
+		public override string GetValueLabel (double value)
+		{
+			if (CurrentResults == null)
+				return "";
+
+			int val = (int) value;
+			if (val >= CurrentResults.Length)
+				return "";
+				
+			UnitTestResult res = CurrentResults [CurrentResults.Length - val - 1];
+			return string.Format ("{0}/{1}", res.TestDate.Day, res.TestDate.Month);
+		}
+	}
+	
+	class TestChart: BasicChart
+	{
+		Serie serieFailed;
+		Serie serieSuccess;
+		Serie serieIgnored;
+		
+		Serie serieTime;
+		
+		bool timeScale = false;
+		bool singleDayResult = false;
+		TestChartType type;
+		
+		TimeSpan currentSpan = TimeSpan.FromDays (5);
+		int testCount = 20;
+		UnitTest test;
+		bool showLastTest = true;
+		bool resetCursors = true;
+		double lastDateValue;
+		double lastTestNumber;
+		UnitTestResult[] currentResults;
+		TestRunAxis testRunAxis;
+		
+		public TestChart ()
+		{
+			AllowSelection = true;
+			SetAutoScale (AxisDimension.Y, false, true);
+			StartY = 0;
+			
+			serieFailed = new Serie ("Failed tests");
+			serieFailed.Color = new Cairo.Color (1, 0, 0);
+			serieSuccess = new Serie ("Successful tests");
+			serieSuccess.Color = new Cairo.Color (0, 0.65, 0);
+			serieIgnored = new Serie ("Ignored tests");
+			serieIgnored.Color = new Cairo.Color (0.8, 0.8, 0);
+			
+			serieTime = new Serie ("Time");
+			serieTime.Color = new Cairo.Color (0, 0, 1);
+			
+			UpdateMode ();
+			
+/*			EndX = DateTime.Now.Ticks;
+			StartX = EndX - currentSpan.Ticks;
+			*/
+			EndX = 5;
+			StartX = 0;
+		}
+		
+		public bool ShowSuccessfulTests {
+			get { return serieSuccess.Visible; }
+			set { serieSuccess.Visible = value; }
+		}
+		
+		public bool ShowFailedTests {
+			get { return serieFailed.Visible; }
+			set { serieFailed.Visible = value; }
+		}
+		
+		public bool ShowIgnoredTests {
+			get { return serieIgnored.Visible; }
+			set { serieIgnored.Visible = value; }
+		}
+		
+		public bool UseTimeScale {
+			get { return timeScale; }
+			set { timeScale = value; UpdateMode (); }
+		}
+		
+		public bool SingleDayResult {
+			get { return singleDayResult; }
+			set { singleDayResult = value; UpdateMode (); }
+		}
+		
+		public TestChartType Type {
+			get { return type; }
+			set { type = value; UpdateMode (); }
+		}
+		
+		public DateTime CurrentDate {
+			get {
+				if (timeScale)
+					return new DateTime ((long) SelectionEnd.Value);
+				else {
+					int n = (int) SelectionStart.Value;
+					if (currentResults != null && n >= 0 && n < currentResults.Length)
+						return currentResults [currentResults.Length - n - 1].TestDate;
+					else
+						return DateTime.MinValue;
+				}
+			}
+		}
+		
+		public DateTime ReferenceDate {
+			get {
+				if (timeScale)
+					return new DateTime ((long) SelectionStart.Value);
+				else {
+					int n = (int) SelectionEnd.Value;
+					if (currentResults != null && n >= 0 && n < currentResults.Length)
+						return currentResults [currentResults.Length - n - 1].TestDate;
+					else
+						return DateTime.MinValue;
+				}
+			}
+		}
+		
+		void UpdateMode ()
+		{
+			AllowSelection = false;
+			
+			Reset ();
+
+			if (type == TestChartType.Results) {
+				AddSerie (serieIgnored);
+				AddSerie (serieFailed);
+				AddSerie (serieSuccess);
+			} else {
+				AddSerie (serieTime);
+			}
+			
+			if (timeScale) {
+				ReverseXAxis = false;
+				Axis ax = new DateTimeAxis (true);
+				AddAxis (new DateTimeAxis (false), AxisPosition.Top);
+				AddAxis (ax, AxisPosition.Bottom);
+				SelectionEnd.Value = SelectionStart.Value = DateTime.Now.Ticks;
+				SelectionStart.LabelAxis = ax;
+				SelectionEnd.LabelAxis = ax;
+			} else {
+				ReverseXAxis = true;
+				AddAxis (new TestRunAxis (false), AxisPosition.Top);
+				testRunAxis = new TestRunAxis (true);
+				AddAxis (testRunAxis, AxisPosition.Bottom);
+				SelectionEnd.Value = SelectionStart.Value = 0;
+				SelectionStart.LabelAxis = testRunAxis;
+				SelectionEnd.LabelAxis = testRunAxis;
+			}
+			showLastTest = true;
+			resetCursors = true;
+			
+			AddAxis (new IntegerAxis (true), AxisPosition.Left);
+			AddAxis (new IntegerAxis (true), AxisPosition.Right);
+			
+			if (test != null)
+				Fill (test);
+			
+			AllowSelection = true;
+		}
+		
+		public new void Clear ()
+		{
+			base.Clear ();
+			test = null;
+		}
+		
+		public void ZoomIn ()
+		{
+			if (test == null)
+				return;
+			if (timeScale) {
+				currentSpan = new TimeSpan (currentSpan.Ticks / 2);
+				if (currentSpan.TotalSeconds < 60)
+					currentSpan = TimeSpan.FromSeconds (60);
+			} else {
+				testCount = testCount / 2;
+				if (testCount < 5)
+					testCount = 5;
+			}
+			Fill (test);
+		}
+		
+		public void ZoomOut ()
+		{
+			if (test == null)
+				return;
+			if (timeScale) {
+				currentSpan = new TimeSpan (currentSpan.Ticks * 2);
+				if (currentSpan.TotalDays > 50 * 365)
+					currentSpan = TimeSpan.FromDays (50 * 365);
+			} else {
+				testCount *= 2;
+				if (testCount > 100000)
+					testCount = 100000;
+			}
+			Fill (test);
+		}
+		
+		public void GoNext ()
+		{
+			if (showLastTest)
+				return;
+
+			if (timeScale) {
+				lastDateValue += (EndX - StartX) / 3;
+				UnitTestResult lastResult = test.Results.GetLastResult (DateTime.Now);
+				if (lastResult != null && new DateTime ((long)lastDateValue) > lastResult.TestDate)
+					showLastTest = true;
+			} else {
+				lastTestNumber -= (EndX - StartX) / 3;
+				if (lastTestNumber < 0)
+					showLastTest = true;
+			}
+			Fill (test);
+		}
+		
+		public void GoPrevious ()
+		{
+			if (timeScale) {
+				lastDateValue -= (EndX - StartX) / 3;
+			} else {
+				lastTestNumber += (EndX - StartX) / 3;
+			}
+			showLastTest = false;
+			Fill (test);
+		}
+		
+		public void GoLast ()
+		{
+			showLastTest = true;
+			resetCursors = true;
+			Fill (test);
+		}
+		
+		public void Fill (UnitTest test)
+		{
+			serieFailed.Clear ();
+			serieSuccess.Clear ();
+			serieIgnored.Clear ();
+			serieTime.Clear ();
+			
+			this.test = test;
+			
+			if (showLastTest) {
+				if (timeScale)
+					lastDateValue = DateTime.Now.Ticks;
+				else
+					lastTestNumber = 0;
+			}
+			
+			UnitTestResult first = null;
+			UnitTestResult[] results;
+			UnitTestResult lastResult = test.Results.GetLastResult (DateTime.Now);
+			if (lastResult == null)
+				return;
+			
+			if (timeScale) {
+				DateTime startDate;
+				if (showLastTest) {
+					startDate = lastResult.TestDate - currentSpan;
+					StartX = startDate.Ticks;
+					EndX = lastResult.TestDate.Ticks;
+					first = test.Results.GetLastResult (startDate);
+					results = test.Results.GetResults (startDate, lastResult.TestDate);
+				} else {
+					DateTime endDate = new DateTime ((long)lastDateValue);
+					startDate = endDate - currentSpan;
+					StartX = (double)startDate.Ticks;
+					EndX = (double)endDate.Ticks;
+					first = test.Results.GetLastResult (startDate);
+					results = test.Results.GetResults (startDate, lastResult.TestDate);
+				}
+				if (singleDayResult) {
+					first = test.Results.GetPreviousResult (new DateTime (startDate.Year, startDate.Month, startDate.Day));
+					ArrayList list = new ArrayList ();
+					if (first != null)
+						list.Add (first);
+					for (int n=0; n<results.Length - 1; n++) {
+						DateTime d1 = results [n].TestDate;
+						DateTime d2 = results [n + 1].TestDate;
+						if (d1.Day != d2.Day || d1.Month != d2.Month || d1.Year != d2.Year)
+							list.Add (results [n]);
+					}
+					list.Add (results [results.Length - 1]);
+					results = (UnitTestResult[])list.ToArray (typeof(UnitTestResult));
+				}
+				
+				if (resetCursors) {
+					SelectionEnd.Value = EndX;
+					if (results.Length > 1)
+						SelectionStart.Value = results [results.Length - 2].TestDate.Ticks;
+					else
+						SelectionStart.Value = EndX;
+					resetCursors = false;
+				}
+			} else {
+				if (singleDayResult) {
+					ArrayList list = new ArrayList ();
+					list.Add (lastResult);
+					while (list.Count < testCount + (int)lastTestNumber + 1) {
+						UnitTestResult res = test.Results.GetPreviousResult (lastResult.TestDate);
+						if (res == null)
+							break;
+						if (res.TestDate.Day != lastResult.TestDate.Day || res.TestDate.Month != lastResult.TestDate.Month || res.TestDate.Year != lastResult.TestDate.Year)
+							list.Add (res);
+						lastResult = res;
+					}
+					results = (UnitTestResult[])list.ToArray (typeof(UnitTestResult));
+					Array.Reverse (results);
+				} else {
+					results = test.Results.GetResultsToDate (DateTime.Now, testCount + (int)lastTestNumber + 1);
+				}
+				EndX = lastTestNumber + testCount;
+				StartX = lastTestNumber;
+				
+				if (resetCursors) {
+					SelectionStart.Value = StartX;
+					SelectionEnd.Value = StartX + 1;
+					resetCursors = false;
+				}
+			}
+			
+			
+			currentResults = results;
+			if (testRunAxis != null)
+				testRunAxis.CurrentResults = currentResults;
+			
+			if (Type == TestChartType.Results) {
+				if (first != null) {
+					double x = timeScale ? first.TestDate.Ticks : results.Length;
+					serieFailed.AddData (x, first.ErrorsAndFailures);
+					serieSuccess.AddData (x, first.Passed);
+					serieIgnored.AddData (x, first.TestsNotRun);
+				}
+				
+				for (int n=0; n < results.Length; n++) {
+					UnitTestResult res = results [n];
+					double x = timeScale ? res.TestDate.Ticks : results.Length - n - 1;
+					serieFailed.AddData (x, res.ErrorsAndFailures);
+					serieSuccess.AddData (x, res.Passed);
+					serieIgnored.AddData (x, res.TestsNotRun);
+				}
+			} else {
+				if (first != null) {
+					double x = timeScale ? first.TestDate.Ticks : results.Length;
+					serieTime.AddData (x, first.Time.TotalMilliseconds);
+				}
+				for (int n=0; n < results.Length; n++) {
+					UnitTestResult res = results [n];
+					double x = timeScale ? res.TestDate.Ticks : results.Length - n - 1;
+					serieTime.AddData (x, results [n].Time.TotalMilliseconds);
+				}
+			}
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs
new file mode 100644
index 0000000000..e09a748a95
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestNodeBuilder.cs
@@ -0,0 +1,197 @@
+//
+// TestNodeBuilder.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Globalization;
+using System.Text;
+
+using MonoDevelop.Core;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.UnitTesting.Commands;
+using MonoDevelop.Ide.Commands;
+using MonoDevelop.Ide.Gui.Components;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.TypeSystem;
+
+namespace MonoDevelop.UnitTesting
+{
+	class TestNodeBuilder: TypeNodeBuilder
+	{
+		public override Type CommandHandlerType {
+			get { return typeof(TestNodeCommandHandler); }
+		}
+		
+		public override string ContextMenuAddinPath {
+			get { return "/MonoDevelop/UnitTesting/ContextMenu/TestPad"; }
+		}
+			
+		public override Type NodeDataType {
+			get { return typeof(UnitTest); }
+		}
+		
+		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
+		{
+			return ((UnitTest)dataObject).Name;
+		}
+		
+/*		public override void GetNodeAttributes (ITreeNavigator parentNode, object dataObject, ref NodeAttributes attributes)
+		{
+			attributes |= NodeAttributes.UseMarkup;
+		}
+*/
+		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
+		{
+			UnitTest test = dataObject as UnitTest;
+			nodeInfo.Icon = test.StatusIcon;
+
+			var title = RemoveGenericArgument (test.Title);
+			title = test.Title;
+			if (test.Status == TestStatus.Running) {
+				nodeInfo.Label = Ambience.EscapeText (title);
+				return;
+			} else if (test.Status == TestStatus.Loading) {
+				nodeInfo.Label = Ambience.EscapeText (title) + GettextCatalog.GetString (" (Loading)");
+				return;
+			} else if (test.Status == TestStatus.LoadError) {
+				nodeInfo.Label = Ambience.EscapeText (title) + GettextCatalog.GetString (" (Load failed)");
+				return;
+			} else {
+				nodeInfo.Label = Ambience.EscapeText (title);
+
+				UnitTestResult res = test.GetLastResult ();
+				if (res != null && treeBuilder.Options ["ShowTestCounters"] && (test is UnitTestGroup)) {
+					nodeInfo.Label += string.Format (GettextCatalog.GetString (" ({0} passed, {1} failed, {2} not run)"), res.Passed, res.ErrorsAndFailures, res.TestsNotRun);
+				}
+
+				if (treeBuilder.Options ["ShowTestTime"]) {
+					nodeInfo.Label += string.Format ("   Time: {0}ms", res.Time.TotalMilliseconds);
+				}
+			}
+		}
+
+		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
+		{
+			UnitTestGroup test = dataObject as UnitTestGroup;
+			if (test == null)
+				return;
+
+			builder.AddChildren (test.Tests);
+		}
+
+		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
+		{
+			UnitTestGroup test = dataObject as UnitTestGroup;
+			return test != null && test.Tests.Count > 0;
+		}
+		
+		public override void OnNodeAdded (object dataObject)
+		{
+			UnitTest test = (UnitTest) dataObject;
+			test.TestChanged += OnTestChanged;
+			test.TestStatusChanged += OnTestStatusChanged;
+		}
+		
+		public override void OnNodeRemoved (object dataObject)
+		{
+			UnitTest test = (UnitTest) dataObject;
+			test.TestChanged -= OnTestChanged;
+			test.TestStatusChanged -= OnTestStatusChanged;
+		}
+		
+		public void OnTestChanged (object sender, EventArgs args)
+		{
+			ITreeBuilder tb = Context.GetTreeBuilder (sender);
+			if (tb != null) tb.UpdateAll ();
+		}
+		
+		public void OnTestStatusChanged (object sender, EventArgs args)
+		{
+			ITreeBuilder tb = Context.GetTreeBuilder (sender);
+			if (tb != null) tb.Update ();
+		}
+
+		static string RemoveGenericArgument (string title)
+		{
+			var leftParen = title.LastIndexOf ('(', title.Length - 1);
+			if (leftParen > -1) {
+				var leftAngleIndex = title.LastIndexOf ('<', leftParen);
+				if (leftAngleIndex > -1) {
+					var rightAngleIndex = title.IndexOf ('>', leftAngleIndex);
+					if (rightAngleIndex > -1) {
+						title = title.Substring (0, leftAngleIndex) + title.Substring (rightAngleIndex + 1);
+					}
+				}
+			}
+			return title;
+		}
+	}
+	
+	class TestNodeCommandHandler: NodeCommandHandler
+	{
+		[CommandHandler (TestCommands.ShowTestCode)]
+		protected async void OnShowTest ()
+		{
+			UnitTest test = CurrentNode.DataItem as UnitTest;
+			SourceCodeLocation loc = null;
+//			UnitTestResult res = test.GetLastResult ();
+			loc = test.SourceCodeLocation;
+			if (loc != null)
+				await IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
+		}
+		
+		[CommandHandler (TestCommands.GoToFailure)]
+		protected async void OnShowFailure ()
+		{
+			UnitTest test = CurrentNode.DataItem as UnitTest;
+			SourceCodeLocation loc = null;
+			UnitTestResult res = test.GetLastResult ();
+			if (res != null && res.IsFailure)
+				loc = res.GetFailureLocation ();
+			if (loc == null)
+				loc = test.SourceCodeLocation;
+			if (loc != null)
+				await IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
+		}
+
+		[CommandUpdateHandler (TestCommands.GoToFailure)]
+		protected void OnUpdateGoToFailure (CommandInfo info)
+		{
+			UnitTest test = CurrentNode.DataItem as UnitTest;
+			info.Enabled = IsGoToFailureEnabled (test);
+		}
+
+		bool IsGoToFailureEnabled (UnitTest test)
+		{
+			if (/*test.SourceCodeLocation == null ||*/ test is UnitTestGroup)
+				return false;
+
+			UnitTestResult res = test.GetLastResult ();
+			return res != null && res.IsFailure;
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs
new file mode 100644
index 0000000000..f7e55d7743
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs
@@ -0,0 +1,926 @@
+//
+// TestPad.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using Gtk;
+using Gdk;
+
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
+using MonoDevelop.Ide.Gui.Pads;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.UnitTesting.Commands;
+using MonoDevelop.Ide.Gui.Components;
+using MonoDevelop.Ide.Execution;
+using MonoDevelop.Components.Docking;
+using MonoDevelop.Ide;
+using MonoDevelop.Projects;
+using System.Linq;
+using MonoDevelop.Components;
+using MonoDevelop.Ide.Commands;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace MonoDevelop.UnitTesting
+{
+	class TestPad : TreeViewPad
+	{
+		AsyncOperation runningTestOperation;
+		VPaned paned;
+		TreeView detailsTree;
+		ListStore detailsStore;
+		HeaderLabel detailLabel;
+		TestChart chart;
+		UnitTest detailsTest;
+		DateTime detailsDate;
+		DateTime detailsReferenceDate;
+		ButtonNotebook infoBook;
+		TextView outputView;
+		TextView resultView;
+		TreeView regressionTree;
+		ListStore regressionStore;
+		TreeView failedTree;
+		ListStore failedStore;
+		
+		int TestSummaryPage;
+		int TestRegressionsPage;
+		int TestFailuresPage;
+		int TestResultPage;
+		int TestOutputPage;
+		
+		VBox detailsPad;
+		
+		ArrayList testNavigationHistory = new ArrayList ();
+
+		Button buttonRunAll, buttonStop;
+		
+		public override void Initialize (NodeBuilder[] builders, TreePadOption[] options, string menuPath)
+		{
+			base.Initialize (builders, options, menuPath);
+			
+			UnitTestService.TestSuiteChanged += OnTestSuiteChanged;
+			paned = new VPaned ();
+			
+			VBox vbox = new VBox ();
+			DockItemToolbar topToolbar = Window.GetToolbar (DockPositionType.Top);
+
+			var hbox = new HBox { Spacing = 6 };
+			hbox.PackStart (new ImageView (ImageService.GetIcon ("md-execute-all", IconSize.Menu)), false, false, 0);
+			hbox.PackStart (new Label (GettextCatalog.GetString ("Run All")), false, false, 0);
+			buttonRunAll = new Button (hbox);
+			buttonRunAll.Clicked += new EventHandler (OnRunAllClicked);
+			buttonRunAll.Sensitive = true;
+			buttonRunAll.TooltipText = GettextCatalog.GetString ("Run all tests");
+			topToolbar.Add (buttonRunAll);
+			
+			buttonStop = new Button (new ImageView (Ide.Gui.Stock.Stop, IconSize.Menu));
+			buttonStop.Clicked += new EventHandler (OnStopClicked);
+			buttonStop.Sensitive = false;
+			buttonStop.TooltipText = GettextCatalog.GetString ("Cancel running test");
+			topToolbar.Add (buttonStop);
+			topToolbar.ShowAll ();
+			
+			vbox.PackEnd (base.Control, true, true, 0);
+			vbox.FocusChain = new Gtk.Widget [] { base.Control };
+			
+			paned.Pack1 (vbox, true, true);
+			
+			detailsPad = new VBox ();
+			
+			EventBox eb = new EventBox ();
+			HBox header = new HBox ();
+			eb.Add (header);
+
+			detailLabel = new HeaderLabel ();
+			detailLabel.Padding = 6;
+			
+			Button hb = new Button (new ImageView ("gtk-close", IconSize.SmallToolbar));
+			hb.Relief = ReliefStyle.None;
+			hb.Clicked += new EventHandler (OnCloseDetails);
+			header.PackEnd (hb, false, false, 0);
+			
+			hb = new Button (new ImageView ("gtk-go-back", IconSize.SmallToolbar));
+			hb.Relief = ReliefStyle.None;
+			hb.Clicked += new EventHandler (OnGoBackTest);
+			header.PackEnd (hb, false, false, 0);
+			
+			header.Add (detailLabel);
+			Gdk.Color hcol = eb.Style.Background (StateType.Normal);
+			hcol.Red = (ushort) (((double)hcol.Red) * 0.9);
+			hcol.Green = (ushort) (((double)hcol.Green) * 0.9);
+			hcol.Blue = (ushort) (((double)hcol.Blue) * 0.9);
+		//	eb.ModifyBg (StateType.Normal, hcol);
+			
+			detailsPad.PackStart (eb, false, false, 0);
+			
+			VPaned panedDetails = new VPaned ();
+			panedDetails.BorderWidth = 3;
+			VBox boxPaned1 = new VBox ();
+			
+			chart = new TestChart ();
+			chart.SelectionChanged += new EventHandler (OnChartDateChanged);
+
+			var chartWidget = chart.GetNativeWidget<Widget> ();
+			chartWidget.ButtonPressEvent += OnChartButtonPress;
+			chartWidget.HeightRequest = 50;
+
+			Toolbar toolbar = new Toolbar ();
+			toolbar.IconSize = IconSize.SmallToolbar;
+			toolbar.ToolbarStyle = ToolbarStyle.Icons;
+			toolbar.ShowArrow = false;
+			ToolButton but = new ToolButton ("gtk-zoom-in");
+			but.Clicked += new EventHandler (OnZoomIn);
+			toolbar.Insert (but, -1);
+			
+			but = new ToolButton ("gtk-zoom-out");
+			but.Clicked += new EventHandler (OnZoomOut);
+			toolbar.Insert (but, -1);
+			
+			but = new ToolButton ("gtk-go-back");
+			but.Clicked += new EventHandler (OnChartBack);
+			toolbar.Insert (but, -1);
+			
+			but = new ToolButton ("gtk-go-forward");
+			but.Clicked += new EventHandler (OnChartForward);
+			toolbar.Insert (but, -1);
+			
+			but = new ToolButton ("gtk-goto-last");
+			but.Clicked += new EventHandler (OnChartLast);
+			toolbar.Insert (but, -1);
+			
+			boxPaned1.PackStart (toolbar, false, false, 0);
+			boxPaned1.PackStart (chart, true, true, 0);
+			
+			panedDetails.Pack1 (boxPaned1, false, false);
+			
+			// Detailed test information --------
+			
+			infoBook = new ButtonNotebook ();
+			infoBook.PageLoadRequired += new EventHandler (OnPageLoadRequired);
+			
+			// Info - Group summary
+			
+			Frame tf = new Frame ();
+			ScrolledWindow sw = new ScrolledWindow ();
+			detailsTree = new TreeView ();
+			
+			detailsTree.HeadersVisible = true;
+			detailsTree.RulesHint = true;
+			detailsStore = new ListStore (typeof(object), typeof(string), typeof (string), typeof (string), typeof (string));
+			
+			CellRendererText trtest = new CellRendererText ();
+			CellRendererText tr;
+			
+			TreeViewColumn col3 = new TreeViewColumn ();
+			col3.Expand = false;
+//			col3.Alignment = 0.5f;
+			col3.Widget = new ImageView (TestStatusIcon.Success);
+			col3.Widget.Show ();
+			tr = new CellRendererText ();
+//			tr.Xalign = 0.5f;
+			col3.PackStart (tr, false);
+			col3.AddAttribute (tr, "markup", 2);
+			detailsTree.AppendColumn (col3);
+			
+			TreeViewColumn col4 = new TreeViewColumn ();
+			col4.Expand = false;
+//			col4.Alignment = 0.5f;
+			col4.Widget = new ImageView (TestStatusIcon.Failure);
+			col4.Widget.Show ();
+			tr = new CellRendererText ();
+//			tr.Xalign = 0.5f;
+			col4.PackStart (tr, false);
+			col4.AddAttribute (tr, "markup", 3);
+			detailsTree.AppendColumn (col4);
+			
+			TreeViewColumn col5 = new TreeViewColumn ();
+			col5.Expand = false;
+//			col5.Alignment = 0.5f;
+			col5.Widget = new ImageView (TestStatusIcon.NotRun);
+			col5.Widget.Show ();
+			tr = new CellRendererText ();
+//			tr.Xalign = 0.5f;
+			col5.PackStart (tr, false);
+			col5.AddAttribute (tr, "markup", 4);
+			detailsTree.AppendColumn (col5);
+			
+			TreeViewColumn col1 = new TreeViewColumn ();
+//			col1.Resizable = true;
+//			col1.Expand = true;
+			col1.Title = "Test";
+			col1.PackStart (trtest, true);
+			col1.AddAttribute (trtest, "markup", 1);
+			detailsTree.AppendColumn (col1);
+			
+			detailsTree.Model = detailsStore;
+			
+			sw.Add (detailsTree);
+			tf.Add (sw);
+			tf.ShowAll ();
+			
+			TestSummaryPage = infoBook.AddPage (GettextCatalog.GetString ("Summary"), tf);
+			
+			// Info - Regressions list
+			
+			tf = new Frame ();
+			sw = new ScrolledWindow ();
+			tf.Add (sw);
+			regressionTree = new TreeView ();
+			regressionTree.HeadersVisible = false;
+			regressionTree.RulesHint = true;
+			regressionStore = new ListStore (typeof(object), typeof(string), typeof (Xwt.Drawing.Image));
+			
+			CellRendererText trtest2 = new CellRendererText ();
+			var pr = new CellRendererImage ();
+			
+			TreeViewColumn col = new TreeViewColumn ();
+			col.PackStart (pr, false);
+			col.AddAttribute (pr, "image", 2);
+			col.PackStart (trtest2, false);
+			col.AddAttribute (trtest2, "markup", 1);
+			regressionTree.AppendColumn (col);
+			regressionTree.Model = regressionStore;
+			sw.Add (regressionTree);
+			tf.ShowAll ();
+			
+			TestRegressionsPage = infoBook.AddPage (GettextCatalog.GetString ("Regressions"), tf);
+			
+			// Info - Failed tests list
+			
+			tf = new Frame ();
+			sw = new ScrolledWindow ();
+			tf.Add (sw);
+			failedTree = new TreeView ();
+			failedTree.HeadersVisible = false;
+			failedTree.RulesHint = true;
+			failedStore = new ListStore (typeof(object), typeof(string), typeof (Xwt.Drawing.Image));
+			
+			trtest2 = new CellRendererText ();
+			pr = new CellRendererImage ();
+			
+			col = new TreeViewColumn ();
+			col.PackStart (pr, false);
+			col.AddAttribute (pr, "image", 2);
+			col.PackStart (trtest2, false);
+			col.AddAttribute (trtest2, "markup", 1);
+			failedTree.AppendColumn (col);
+			failedTree.Model = failedStore;
+			sw.Add (failedTree);
+			tf.ShowAll ();
+			
+			TestFailuresPage = infoBook.AddPage (GettextCatalog.GetString ("Failed tests"), tf);
+			
+			// Info - results
+			
+			tf = new Frame ();
+			sw = new ScrolledWindow ();
+			tf.Add (sw);
+			resultView = new TextView ();
+			resultView.Editable = false;
+			sw.Add (resultView);
+			tf.ShowAll ();
+			TestResultPage = infoBook.AddPage (GettextCatalog.GetString ("Result"), tf);
+			
+			// Info - Output
+			
+			tf = new Frame ();
+			sw = new ScrolledWindow ();
+			tf.Add (sw);
+			outputView = new TextView ();
+			outputView.Editable = false;
+			sw.Add (outputView);
+			tf.ShowAll ();
+			TestOutputPage = infoBook.AddPage (GettextCatalog.GetString ("Output"), tf);
+			
+			panedDetails.Pack2 (infoBook, true, true);
+			detailsPad.PackStart (panedDetails, true, true, 0);
+			paned.Pack2 (detailsPad, true, true);
+			
+			paned.ShowAll ();
+			
+			infoBook.HidePage (TestResultPage);
+			infoBook.HidePage (TestOutputPage);
+			infoBook.HidePage (TestSummaryPage);
+			infoBook.HidePage (TestRegressionsPage);
+			infoBook.HidePage (TestFailuresPage);
+			
+			detailsPad.Sensitive = false;
+			detailsPad.Hide ();
+			
+			detailsTree.RowActivated += new Gtk.RowActivatedHandler (OnTestActivated);
+			regressionTree.RowActivated += new Gtk.RowActivatedHandler (OnRegressionTestActivated);
+			failedTree.RowActivated += new Gtk.RowActivatedHandler (OnFailedTestActivated);
+			
+			foreach (UnitTest t in UnitTestService.RootTests)
+				TreeView.AddChild (t);
+		}
+		
+		void OnTestSuiteChanged (object sender, EventArgs e)
+		{
+			if (UnitTestService.RootTests.Length > 0) {
+				var s = TreeView.SaveTreeState ();
+				TreeView.Clear ();
+				foreach (UnitTest t in UnitTestService.RootTests)
+					TreeView.AddChild (t);
+				TreeView.RestoreTreeState (s);
+			}
+			else {
+				TreeView.Clear ();
+				ClearDetails ();
+			}
+		}
+		
+		public void SelectTest (UnitTest t)
+		{
+			ITreeNavigator node = FindTestNode (t);
+			if (node != null) {
+				node.ExpandToNode ();
+				node.Selected = true;
+			}
+		}
+		
+		ITreeNavigator FindTestNode (UnitTest t)
+		{
+			ITreeNavigator nav = TreeView.GetNodeAtObject (t);
+			if (nav != null)
+				return nav;
+			if (t.Parent == null)
+				return null;
+				
+			nav = FindTestNode (t.Parent);
+			
+			if (nav == null)
+				return null;
+				
+			nav.MoveToFirstChild ();	// Make sure the children are created
+			return TreeView.GetNodeAtObject (t);
+		}
+		
+		public override Control Control {
+			get {
+				return paned;
+			}
+		}
+		
+		[CommandHandler (TestCommands.RunTest)]
+		protected void OnRunTest ()
+		{
+			RunSelectedTest (null);
+		}
+		
+		[CommandUpdateHandler (TestCommands.RunTest)]
+		protected void OnUpdateRunTest (CommandInfo info)
+		{
+			info.Enabled = runningTestOperation == null;
+		}
+		
+		[CommandHandler (TestCommands.RunTestWith)]
+		protected void OnRunTest (object data)
+		{
+			IExecutionHandler h = ExecutionModeCommandService.GetExecutionModeForCommand (data);
+			if (h != null)
+				RunSelectedTest (h);
+		}
+		
+		[CommandUpdateHandler (TestCommands.RunTestWith)]
+		protected void OnUpdateRunTest (CommandArrayInfo info)
+		{
+			UnitTest test = GetSelectedTest ();
+			if (test != null) {
+				SolutionItem item = test.OwnerObject as SolutionItem;
+				ExecutionModeCommandService.GenerateExecutionModeCommands (
+				    item,
+				    test.CanRun,
+				    info);
+
+				foreach (var ci in info)
+					ci.Enabled = runningTestOperation == null;
+			}
+		}
+		
+		[CommandHandler (TestCommands.DebugTest)]
+		protected void OnDebugTest (object data)
+		{
+			var debugModeSet = Runtime.ProcessService.GetDebugExecutionMode ();
+			var mode = debugModeSet.ExecutionModes.First (m => m.Id == (string)data);
+			RunSelectedTest (mode.ExecutionHandler);
+		}
+
+		[CommandUpdateHandler (TestCommands.DebugTest)]
+		protected void OnUpdateDebugTest (CommandArrayInfo info)
+		{
+			var debugModeSet = Runtime.ProcessService.GetDebugExecutionMode ();
+			if (debugModeSet == null)
+				return;
+
+			UnitTest test = GetSelectedTest ();
+			if (test == null)
+				return;
+
+			foreach (var mode in debugModeSet.ExecutionModes) {
+				if (test.CanRun (mode.ExecutionHandler)) {
+					var ci = info.Add (GettextCatalog.GetString ("Debug Test ({0})", mode.Name), mode.Id);
+					ci.Enabled = runningTestOperation == null;
+				}
+			}
+
+			if (info.Count == 1)
+				info [0].Text = GettextCatalog.GetString ("Debug Test");
+		}
+
+		public TestPad ()
+		{
+			base.TreeView.CurrentItemActivated += delegate {
+				RunSelectedTest (null);
+			};
+		}
+		
+		void OnStopClicked (object sender, EventArgs args)
+		{
+			if (runningTestOperation != null)
+				runningTestOperation.Cancel ();
+		}
+		
+		UnitTest GetSelectedTest ()
+		{
+			ITreeNavigator nav = TreeView.GetSelectedNode ();
+			if (nav == null)
+				return null;
+			return nav.DataItem as UnitTest;
+		}
+
+		public AsyncOperation RunTest (UnitTest test, IExecutionHandler mode)
+		{
+			return RunTest (FindTestNode (test), mode, false);
+		}
+
+		AsyncOperation RunTest (ITreeNavigator nav, IExecutionHandler mode, bool bringToFront = true)
+		{
+			if (nav == null)
+				return null;
+			UnitTest test = nav.DataItem as UnitTest;
+			if (test == null)
+				return null;
+			UnitTestService.ResetResult (test.RootTest);
+			
+			this.buttonRunAll.Sensitive = false;
+			this.buttonStop.Sensitive = true;
+
+			ExecutionContext context = new ExecutionContext (mode, IdeApp.Workbench.ProgressMonitors.ConsoleFactory, null);
+
+			if (bringToFront)
+				IdeApp.Workbench.GetPad<TestPad> ().BringToFront ();
+			runningTestOperation = UnitTestService.RunTest (test, context);
+			runningTestOperation.Task.ContinueWith (t => OnTestSessionCompleted (), TaskScheduler.FromCurrentSynchronizationContext ());
+			return runningTestOperation;
+		}
+		
+		void OnRunAllClicked (object sender, EventArgs args)
+		{
+			RunTest (TreeView.GetRootNode (), null);
+		}
+		
+		void RunSelectedTest (IExecutionHandler mode)
+		{
+			RunTest (TreeView.GetSelectedNode (), mode);
+		}
+		
+		void OnTestSessionCompleted ()
+		{
+			RefreshDetails ();
+			runningTestOperation = null;
+			this.buttonRunAll.Sensitive = true;
+			this.buttonStop.Sensitive = false;
+
+		}
+
+
+		protected override void OnSelectionChanged (object sender, EventArgs args)
+		{
+			base.OnSelectionChanged (sender, args);
+			ITreeNavigator nav = TreeView.GetSelectedNode ();
+			if (nav != null) {
+				UnitTest test = nav.DataItem as UnitTest;
+				if (test != null)
+					FillDetails (test, false);
+			}
+		}
+		
+		void OnGoBackTest (object sender, EventArgs args)
+		{
+			int c = testNavigationHistory.Count;
+			if (c > 1) {
+				UnitTest t = (UnitTest) testNavigationHistory [c - 2];
+				testNavigationHistory.RemoveAt (c - 1);
+				testNavigationHistory.RemoveAt (c - 2);
+				FillDetails (t, true);
+			}
+		}
+		
+		void OnCloseDetails (object sender, EventArgs args)
+		{
+			detailsPad.Hide ();
+		}
+		
+		[CommandHandler (TestCommands.ShowTestDetails)]
+		protected void OnShowDetails ()
+		{
+			if (!detailsPad.Visible) {
+				detailsPad.Show ();
+				
+				ITreeNavigator nav = TreeView.GetSelectedNode ();
+				if (nav != null) {
+					UnitTest test = (UnitTest) nav.DataItem;
+					FillDetails (test, false);
+				} else
+					ClearDetails ();
+			}
+		}
+		
+		void ClearDetails ()
+		{
+			chart.Clear ();
+			detailLabel.Markup = "";
+			detailsStore.Clear ();
+			if (detailsTest != null)
+				detailsTest.TestChanged -= OnDetailsTestChanged;
+			detailsTest = null;
+			detailsDate = DateTime.MinValue;
+			detailsReferenceDate = DateTime.MinValue;
+			detailsPad.Sensitive = false;
+		}
+		
+		void RefreshDetails ()
+		{
+			if (detailsTest != null)
+				FillDetails (detailsTest, false);
+		}
+		
+		void FillDetails (UnitTest test, bool selectInTree)
+		{
+			if (!detailsPad.Visible)
+				return;
+
+			detailsPad.Sensitive = true;
+			
+			if (detailsTest != null)
+				detailsTest.TestChanged -= OnDetailsTestChanged;
+			
+			if (detailsTest != test) {
+				detailsTest = test;
+				if (selectInTree)
+					SelectTest (test);
+				testNavigationHistory.Add (test);
+				if (testNavigationHistory.Count > 50)
+					testNavigationHistory.RemoveAt (0);
+			}
+			detailsTest.TestChanged += OnDetailsTestChanged;
+			
+			if (test is UnitTestGroup) {
+				infoBook.HidePage (TestResultPage);
+				infoBook.HidePage (TestOutputPage);
+				infoBook.ShowPage (TestSummaryPage);
+				infoBook.ShowPage (TestRegressionsPage);
+				infoBook.ShowPage (TestFailuresPage);
+			} else {
+				infoBook.HidePage (TestSummaryPage);
+				infoBook.HidePage (TestRegressionsPage);
+				infoBook.HidePage (TestFailuresPage);
+				infoBook.ShowPage (TestResultPage);
+				infoBook.ShowPage (TestOutputPage);
+			}
+			detailLabel.Markup = "<b>" + test.Name + "</b>";
+			detailsDate = DateTime.MinValue;
+			detailsReferenceDate = DateTime.MinValue;
+			chart.Fill (test);
+			infoBook.Reset ();
+		}
+		
+		void FillTestInformation ()
+		{
+			if (!detailsPad.Visible)
+				return;
+
+			if (detailsTest is UnitTestGroup) {
+				UnitTestGroup group = detailsTest as UnitTestGroup;
+				if (infoBook.Page == TestSummaryPage) {
+					detailsStore.Clear ();
+					foreach (UnitTest t in group.Tests) {
+						UnitTestResult res = t.Results.GetLastResult (chart.CurrentDate);
+						if (res != null)
+							detailsStore.AppendValues (t, t.Name, res.Passed.ToString (), res.ErrorsAndFailures.ToString (), res.Ignored.ToString());
+						else
+							detailsStore.AppendValues (t, t.Name, "", "", "");
+					}
+				}
+				else if (infoBook.Page == TestRegressionsPage) {
+					regressionStore.Clear ();
+					UnitTestCollection regs = detailsTest.GetRegressions (chart.ReferenceDate, chart.CurrentDate);
+					if (regs.Count > 0) {
+						foreach (UnitTest t in regs)
+							regressionStore.AppendValues (t, t.Name, TestStatusIcon.Failure);
+					} else
+						regressionStore.AppendValues (null, GettextCatalog.GetString ("No regressions found."));
+				}
+				else if (infoBook.Page == TestFailuresPage) {
+					failedStore.Clear ();
+					UnitTestCollection regs = group.GetFailedTests (chart.CurrentDate);
+					if (regs.Count > 0) {
+						foreach (UnitTest t in regs)
+							failedStore.AppendValues (t, t.Name, TestStatusIcon.Failure);
+					} else
+						failedStore.AppendValues (null, GettextCatalog.GetString ("No failed tests found."));
+				}
+			} else {
+				UnitTestResult res = detailsTest.Results.GetLastResult (chart.CurrentDate);
+				if (infoBook.Page == TestOutputPage) {
+					outputView.Buffer.Clear ();
+					if (res != null)
+						outputView.Buffer.InsertAtCursor (res.ConsoleOutput);
+				} else if (infoBook.Page == TestResultPage) {
+					resultView.Buffer.Clear ();
+					if (res != null) {
+						string msg = res.Message + "\n\n" + res.StackTrace;
+						resultView.Buffer.InsertAtCursor (msg);
+					}
+				}
+			}
+		}
+		
+		void OnDetailsTestChanged (object sender, EventArgs e)
+		{
+			RefreshDetails ();
+		}
+		
+		void OnChartDateChanged (object sender, EventArgs e)
+		{
+			if (detailsTest != null && (detailsDate != chart.CurrentDate || detailsReferenceDate != chart.ReferenceDate)) {
+				detailsDate = chart.CurrentDate;
+				detailsReferenceDate = chart.ReferenceDate;
+				FillTestInformation ();
+			}
+		}
+		
+		void OnPageLoadRequired (object o, EventArgs args)
+		{
+			if (detailsTest != null)
+				FillTestInformation ();
+		}
+		
+		protected virtual void OnTestActivated (object sender, Gtk.RowActivatedArgs args)
+		{
+			TreeIter it;
+			detailsStore.GetIter (out it, args.Path);
+			UnitTest t = (UnitTest) detailsStore.GetValue (it, 0);
+			if (t != null)
+				FillDetails (t, true);
+		}
+		
+		protected virtual void OnRegressionTestActivated (object sender, Gtk.RowActivatedArgs args)
+		{
+			TreeIter it;
+			regressionStore.GetIter (out it, args.Path);
+			UnitTest t = (UnitTest) regressionStore.GetValue (it, 0);
+			if (t != null)
+				FillDetails (t, true);
+		}
+		
+		protected virtual void OnFailedTestActivated (object sender, Gtk.RowActivatedArgs args)
+		{
+			TreeIter it;
+			failedStore.GetIter (out it, args.Path);
+			UnitTest t = (UnitTest) failedStore.GetValue (it, 0);
+			if (t != null)
+				FillDetails (t, true);
+		}
+		
+		void OnZoomIn (object sender, EventArgs a)
+		{
+			if (detailsTest != null)
+				chart.ZoomIn ();
+		}
+		
+		void OnZoomOut (object sender, EventArgs a)
+		{
+			if (detailsTest != null)
+				chart.ZoomOut ();
+		}
+		
+		void OnChartBack (object sender, EventArgs a)
+		{
+			if (detailsTest != null)
+				chart.GoPrevious ();
+		}
+		
+		void OnChartForward (object sender, EventArgs a)
+		{
+			if (detailsTest != null)
+				chart.GoNext ();
+		}
+		
+		void OnChartLast (object sender, EventArgs a)
+		{
+			if (detailsTest != null)
+				chart.GoLast ();
+		}
+		
+		void OnChartButtonPress (object o, Gtk.ButtonPressEventArgs args)
+		{
+			if (args.Event.TriggersContextMenu ()) {
+				IdeApp.CommandService.ShowContextMenu (Control, args.Event, "/MonoDevelop/UnitTesting/ContextMenu/TestChart");
+				args.RetVal = true;
+			}
+		}
+		
+		[CommandHandler (TestChartCommands.ShowResults)]
+		protected void OnShowResults ()
+		{
+			chart.Type = TestChartType.Results;
+		}
+		
+		[CommandUpdateHandler (TestChartCommands.ShowResults)]
+		protected void OnUpdateShowResults (CommandInfo info)
+		{
+			info.Checked = chart.Type == TestChartType.Results;
+		}
+		
+		[CommandHandler (TestChartCommands.ShowTime)]
+		protected void OnShowTime ()
+		{
+			chart.Type = TestChartType.Time;
+		}
+		
+		[CommandUpdateHandler (TestChartCommands.ShowTime)]
+		protected void OnUpdateShowTime (CommandInfo info)
+		{
+			info.Checked = chart.Type == TestChartType.Time;
+		}
+		
+		[CommandHandler (TestChartCommands.UseTimeScale)]
+		protected void OnUseTimeScale ()
+		{
+			chart.UseTimeScale = !chart.UseTimeScale;
+		}
+		
+		[CommandUpdateHandler (TestChartCommands.UseTimeScale)]
+		protected void OnUpdateUseTimeScale (CommandInfo info)
+		{
+			info.Checked = chart.UseTimeScale;
+		}
+		
+		[CommandHandler (TestChartCommands.SingleDayResult)]
+		protected void OnSingleDayResult ()
+		{
+			chart.SingleDayResult = !chart.SingleDayResult;
+		}
+		
+		[CommandUpdateHandler (TestChartCommands.SingleDayResult)]
+		protected void OnUpdateSingleDayResult (CommandInfo info)
+		{
+			info.Checked = chart.SingleDayResult;
+		}
+		
+		[CommandHandler (TestChartCommands.ShowSuccessfulTests)]
+		protected void OnShowSuccessfulTests ()
+		{
+			chart.ShowSuccessfulTests = !chart.ShowSuccessfulTests;
+		}
+		
+		[CommandUpdateHandler (TestChartCommands.ShowSuccessfulTests)]
+		protected void OnUpdateShowSuccessfulTests (CommandInfo info)
+		{
+			info.Enabled = chart.Type == TestChartType.Results;
+			info.Checked = chart.ShowSuccessfulTests;
+		}
+		
+		[CommandHandler (TestChartCommands.ShowFailedTests)]
+		protected void OnShowFailedTests ()
+		{
+			chart.ShowFailedTests = !chart.ShowFailedTests;
+		}
+		
+		[CommandUpdateHandler (TestChartCommands.ShowFailedTests)]
+		protected void OnUpdateShowFailedTests (CommandInfo info)
+		{
+			info.Enabled = chart.Type == TestChartType.Results;
+			info.Checked = chart.ShowFailedTests;
+		}
+		
+		[CommandHandler (TestChartCommands.ShowIgnoredTests)]
+		protected void OnShowIgnoredTests ()
+		{
+			chart.ShowIgnoredTests = !chart.ShowIgnoredTests;
+		}
+		
+		[CommandUpdateHandler (TestChartCommands.ShowIgnoredTests)]
+		protected void OnUpdateShowIgnoredTests (CommandInfo info)
+		{
+			info.Enabled = chart.Type == TestChartType.Results;
+			info.Checked = chart.ShowIgnoredTests;
+		}
+	}
+	
+	class ButtonNotebook: Notebook
+	{
+		ArrayList loadedPages = new ArrayList ();
+		
+		public void Reset ()
+		{
+			loadedPages.Clear ();
+			OnPageLoadRequired ();
+		}
+		
+		public int AddPage (string text, Widget widget)
+		{
+			return AppendPage (widget, new Label (text));
+		}
+		
+		public void ShowPage (int n)
+		{
+			GetNthPage (n).Show ();
+		}
+		
+		public void HidePage (int n)
+		{
+			GetNthPage (n).Hide ();
+		}
+		
+		protected override void OnSwitchPage (NotebookPage page, uint n)
+		{
+			base.OnSwitchPage (page, n);
+			if (!loadedPages.Contains (Page))
+				OnPageLoadRequired ();
+		}
+		
+		void OnPageLoadRequired ()
+		{
+			loadedPages.Add (Page);
+			if (PageLoadRequired != null)
+				PageLoadRequired (this, EventArgs.Empty);
+		}
+		
+		public EventHandler PageLoadRequired;
+	}
+	
+	class HeaderLabel: Widget
+	{
+		string text;
+		Pango.Layout layout;
+		int padding;
+		
+		public HeaderLabel ()
+		{
+			WidgetFlags |= WidgetFlags.NoWindow;
+			layout = new Pango.Layout (this.PangoContext);
+		}
+		
+		public string Markup {
+			get { return text; }
+			set {
+				text = value;
+				layout.SetMarkup (text);
+				QueueDraw ();
+			}
+		}
+		
+		public int Padding {
+			get { return padding; }
+			set { padding = value; }
+		}
+		
+		protected override bool OnExposeEvent (Gdk.EventExpose args)
+		{
+			Gdk.GC gc = new Gdk.GC (GdkWindow);
+			gc.ClipRectangle = Allocation;
+			GdkWindow.DrawLayout (gc, padding, padding, layout);
+			return true;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs
new file mode 100644
index 0000000000..c207a05218
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs
@@ -0,0 +1,862 @@
+//
+// TestResultsPad.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using Gtk;
+using Gdk;
+
+using MonoDevelop.Core;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.UnitTesting.Commands;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components.Docking;
+using MonoDevelop.Ide;
+using System.Text.RegularExpressions;
+using MonoDevelop.Components;
+using System.Threading;
+using MonoDevelop.Ide.Commands;
+using MonoDevelop.Ide.Fonts;
+
+namespace MonoDevelop.UnitTesting
+{
+	class TestResultsPad: PadContent, ITestProgressMonitor
+	{
+		IPadWindow window;
+		VBox panel;
+		HPaned book;
+		
+		Label infoLabel = new Label ();
+		Label infoCurrent = new Label ();
+		HBox labels;
+		
+		Label resultLabel = new Label ();
+		
+		ProgressBar progressBar = new ProgressBar ();
+		MonoDevelop.Ide.Gui.Components.PadTreeView failuresTreeView;
+		TreeStore failuresStore;
+		TextView outputView;
+		TextTag bold;
+		Dictionary<UnitTest,int> outIters = new Dictionary<UnitTest,int> ();
+		Widget outputViewScrolled;
+		VSeparator infoSep;
+		Gtk.TreeIter startMessageIter;
+		
+		Button buttonStop;
+		Button buttonRun;
+		
+		ToggleButton buttonSuccess;
+		ToggleButton buttonFailures;
+		ToggleButton buttonIgnored;
+		ToggleButton buttonInconclusive;
+		ToggleButton buttonOutput;
+		
+		bool running;
+		int testsToRun;
+		int testsRun;
+
+		UnitTestResult resultSummary;
+
+		UnitTest rootTest;
+		CancellationTokenSource cancellationSource;
+		string configuration;
+		ArrayList results = new ArrayList ();
+		
+		Exception error;
+		string errorMessage;
+		
+		bool cancel;
+		
+		public class ResultRecord
+		{
+			public UnitTest Test;
+			public UnitTestResult Result;
+		}
+		
+		public TestResultsPad ()
+		{
+			UnitTestService.TestSuiteChanged += new EventHandler (OnTestSuiteChanged);
+			IdeApp.Workspace.WorkspaceItemClosed += OnWorkspaceItemClosed;
+			
+			panel = new VBox ();
+			
+			// Results notebook
+			
+			book = new HPaned ();
+			panel.PackStart (book, true, true, 0);
+			panel.FocusChain = new Gtk.Widget [] { book };
+			
+			// Failures tree
+			failuresTreeView = new MonoDevelop.Ide.Gui.Components.PadTreeView ();
+			failuresTreeView.HeadersVisible = false;
+			failuresStore = new TreeStore (typeof(Xwt.Drawing.Image), typeof(string), typeof(object), typeof(string), typeof(int), typeof(int));
+			var pr = new CellRendererImage ();
+			CellRendererText tr = new CellRendererText ();
+			TreeViewColumn col = new TreeViewColumn ();
+			col.PackStart (pr, false);
+			col.AddAttribute (pr, "image", 0);
+			col.PackStart (tr, false);
+			col.AddAttribute (tr, "markup", 1);
+			failuresTreeView.AppendColumn (col);
+			failuresTreeView.Model = failuresStore;
+		
+			var sw = new MonoDevelop.Components.CompactScrolledWindow ();
+			sw.ShadowType = ShadowType.None;
+			sw.Add (failuresTreeView);
+			book.Pack1 (sw, true, true);
+			
+			outputView = new MonoDevelop.Ide.Gui.Components.LogView.LogTextView ();
+			outputView.ModifyFont (FontService.MonospaceFont);
+			outputView.Editable = false;
+			bold = new TextTag ("bold");
+			bold.Weight = Pango.Weight.Bold;
+			outputView.Buffer.TagTable.Add (bold);
+			sw = new MonoDevelop.Components.CompactScrolledWindow ();
+			sw.ShadowType = ShadowType.None;
+			sw.Add (outputView);
+			book.Pack2 (sw, true, true);
+			outputViewScrolled = sw;
+			
+			failuresTreeView.RowActivated += OnRowActivated;
+			failuresTreeView.Selection.Changed += OnRowSelected;
+			failuresTreeView.DoPopupMenu = delegate (EventButton evt) {
+				IdeApp.CommandService.ShowContextMenu (failuresTreeView, evt,
+					"/MonoDevelop/UnitTesting/ContextMenu/TestResultsPad");
+			};
+			
+			panel.ShowAll ();
+			
+			outputViewScrolled.Hide ();
+		}
+		
+		protected override void Initialize (IPadWindow window)
+		{
+			this.window = window;
+			
+			DockItemToolbar toolbar = window.GetToolbar (DockPositionType.Top);
+			
+			buttonSuccess = new ToggleButton ();
+			buttonSuccess.Label = GettextCatalog.GetString ("Successful Tests");
+			buttonSuccess.Active = false;
+			buttonSuccess.Image = new ImageView (TestStatusIcon.Success);
+			buttonSuccess.Image.Show ();
+			buttonSuccess.Toggled += new EventHandler (OnShowSuccessfulToggled);
+			buttonSuccess.TooltipText = GettextCatalog.GetString ("Show Successful Tests");
+			toolbar.Add (buttonSuccess);
+
+			buttonInconclusive = new ToggleButton ();
+			buttonInconclusive.Label = GettextCatalog.GetString ("Inconclusive Tests");
+			buttonInconclusive.Active = true;
+			buttonInconclusive.Image = new ImageView (TestStatusIcon.Inconclusive);
+			buttonInconclusive.Image.Show ();
+			buttonInconclusive.Toggled += new EventHandler (OnShowInconclusiveToggled);
+			buttonInconclusive.TooltipText = GettextCatalog.GetString ("Show Inconclusive Tests");
+			toolbar.Add (buttonInconclusive);
+			
+			buttonFailures = new ToggleButton ();
+			buttonFailures.Label = GettextCatalog.GetString ("Failed Tests");
+			buttonFailures.Active = true;
+			buttonFailures.Image = new ImageView (TestStatusIcon.Failure);
+			buttonFailures.Image.Show ();
+			buttonFailures.Toggled += new EventHandler (OnShowFailuresToggled);
+			buttonFailures.TooltipText = GettextCatalog.GetString ("Show Failed Tests");
+			toolbar.Add (buttonFailures);
+
+			buttonIgnored = new ToggleButton ();
+			buttonIgnored.Label = GettextCatalog.GetString ("Ignored Tests");
+			buttonIgnored.Active = true;
+			buttonIgnored.Image = new ImageView (TestStatusIcon.NotRun);
+			buttonIgnored.Image.Show ();
+			buttonIgnored.Toggled += new EventHandler (OnShowIgnoredToggled);
+			buttonIgnored.TooltipText = GettextCatalog.GetString ("Show Ignored Tests");
+			toolbar.Add (buttonIgnored);
+			
+			buttonOutput = new ToggleButton ();
+			buttonOutput.Label = GettextCatalog.GetString ("Output");
+			buttonOutput.Active = false;
+			buttonOutput.Image = new ImageView (MonoDevelop.Ide.Gui.Stock.OutputIcon, IconSize.Menu);
+			buttonOutput.Image.Show ();
+			buttonOutput.Toggled += new EventHandler (OnShowOutputToggled);
+			buttonOutput.TooltipText = GettextCatalog.GetString ("Show Output");
+			toolbar.Add (buttonOutput);
+			
+			toolbar.Add (new SeparatorToolItem ());
+			
+			buttonRun = new Button ();
+			buttonRun.Label = GettextCatalog.GetString ("Rerun Tests");
+			buttonRun.Image = new ImageView ("md-execute-all", IconSize.Menu);
+			buttonRun.Image.Show ();
+			buttonRun.Sensitive = false;
+			toolbar.Add (buttonRun);
+			
+			buttonStop = new Button (new ImageView (Ide.Gui.Stock.Stop, Gtk.IconSize.Menu));
+			toolbar.Add (buttonStop);
+			toolbar.ShowAll ();
+			
+			buttonStop.Clicked += new EventHandler (OnStopClicked);
+			buttonRun.Clicked += new EventHandler (OnRunClicked);
+			
+			// Run panel
+			
+			DockItemToolbar runPanel = window.GetToolbar (DockPositionType.Bottom);
+			
+			infoSep = new VSeparator ();
+			
+			resultLabel.UseMarkup = true;
+			infoCurrent.Ellipsize = Pango.EllipsizeMode.Start;
+			infoCurrent.WidthRequest = 0;
+			runPanel.Add (resultLabel);
+			runPanel.Add (progressBar);
+			runPanel.Add (infoCurrent, true, 10);	
+			
+			labels = new HBox (false, 10);
+			
+			infoLabel.UseMarkup = true;
+
+			labels.PackStart (infoLabel, true, false, 0);
+
+			runPanel.Add (new Gtk.Label (), true);
+			runPanel.Add (labels);
+			runPanel.Add (infoSep, false, 10);
+			
+			progressBar.HeightRequest = infoLabel.SizeRequest ().Height;
+			runPanel.ShowAll ();
+			progressBar.Hide ();
+			infoSep.Hide ();
+			resultSummary = new UnitTestResult ();
+			UpdateCounters ();
+		}
+		
+		public void OnTestSuiteChanged (object sender, EventArgs e)
+		{
+			if (rootTest != null) {
+				rootTest = UnitTestService.SearchTest (rootTest.FullName);
+				if (rootTest == null)
+					buttonRun.Sensitive = false;
+			}
+		}
+
+		void OnWorkspaceItemClosed (object sender, EventArgs e)
+		{
+			ClearResults ();
+		}
+
+		void ClearResults ()
+		{
+			if (failuresTreeView.IsRealized)
+				failuresTreeView.ScrollToPoint (0, 0);
+
+			results.Clear ();
+
+			error = null;
+			errorMessage = null;
+
+			failuresStore.Clear ();
+			outputView.Buffer.Clear ();
+			outIters.Clear ();
+			progressBar.Fraction = 0;
+			progressBar.Text = "";
+			testsRun = 0;
+			resultSummary = new UnitTestResult ();
+			resultLabel.Markup = "";
+			resultLabel.Hide ();
+			labels.Show ();
+			UpdateCounters ();
+		}
+		
+		bool Running {
+			get { return running; }
+			set {
+				running = value;
+				window.IsWorking = value;
+			}
+		}
+		
+		public override Control Control {
+			get {
+				return panel;
+			}
+		}
+		
+		string GetResultsMarkup ()
+		{
+			return string.Format (GettextCatalog.GetString ("<b>Passed</b>: {0}   <b>Failed</b>: {1}   <b>Errors</b>: {2}   <b>Inconclusive</b>: {3}   <b>Invalid</b>: {4}   <b>Ignored</b>: {5}   <b>Skipped</b>: {6}   <b>Time</b>: {7}"), 
+					                        resultSummary.Passed, resultSummary.Failures, resultSummary.Errors, resultSummary.Inconclusive, resultSummary.NotRunnable, resultSummary.Ignored, resultSummary.Skipped, resultSummary.Time);
+		}
+		void UpdateCounters ()
+		{
+			infoLabel.Markup = GetResultsMarkup ();
+		}
+
+		public void InitializeTestRun (UnitTest test, CancellationTokenSource cs)
+		{
+			rootTest = test;
+			cancellationSource = cs;
+			cs.Token.Register (OnCancel);
+			results.Clear ();
+
+			testsToRun = test.CountTestCases ();
+			error = null;
+			errorMessage = null;
+			
+			progressBar.Fraction = 0;
+			progressBar.Text = "";
+			progressBar.Text = "0 / " + testsToRun;
+			testsRun = 0;
+			resultSummary = new UnitTestResult ();
+			UpdateCounters ();
+			
+			infoSep.Show ();
+			infoCurrent.Show ();
+			progressBar.Show ();
+			resultLabel.Hide ();
+			labels.Show ();
+			buttonStop.Sensitive = true;
+			buttonRun.Sensitive = false;
+
+			if (failuresTreeView.IsRealized)
+				failuresTreeView.ScrollToPoint (0, 0);
+			
+			failuresStore.Clear ();
+			outputView.Buffer.Clear ();
+			outIters.Clear ();
+			cancel = false;
+			Running = true;
+			
+			configuration = IdeApp.Workspace.ActiveConfigurationId;
+			
+			AddStartMessage ();
+		}
+		
+		public void AddStartMessage (bool isRunning = true)
+		{
+			if (rootTest != null) {
+				var infoIcon = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Information, Gtk.IconSize.Menu);
+				string msg = string.Format (isRunning ? GettextCatalog.GetString ("Running tests for <b>{0}</b> configuration <b>{1}</b>") : GettextCatalog.GetString ("Test results for <b>{0}</b> configuration <b>{1}</b>"), rootTest.Name, configuration);
+				startMessageIter = failuresStore.AppendValues (infoIcon, msg, rootTest, null, 0);
+			} else {
+				startMessageIter = Gtk.TreeIter.Zero;
+			}
+		}
+
+		public void ReportRuntimeError (string message, Exception exception)
+		{
+			error = exception;
+			errorMessage = message;
+			AddErrorMessage ();
+		}
+		const int ErrorMessage = 1;
+		const int StackTrace = 2;
+
+		public void AddErrorMessage ()
+		{
+			string msg;
+			if (error is RemoteUnhandledException)
+				msg = Escape (errorMessage);
+			else {
+				msg = GettextCatalog.GetString ("Internal error");
+				if (errorMessage != null)
+					msg += ": " + Escape (errorMessage);
+			}
+
+			var stock = ImageService.GetIcon (Ide.Gui.Stock.Error, Gtk.IconSize.Menu);
+			TreeIter testRow = failuresStore.AppendValues (stock, msg, null, null, 0);
+			string name = error is RemoteUnhandledException ? ((RemoteUnhandledException)error).RemoteExceptionName : error.GetType ().Name;
+			failuresStore.AppendValues (testRow, null, Escape (name + ": " + error.Message), null);
+			TreeIter row = failuresStore.AppendValues (testRow, null, GettextCatalog.GetString ("Stack Trace"), null, null, 0);
+			AddStackTrace (row, error.StackTrace, null);
+		}
+		
+		readonly static Regex stackTraceLineRegex = new Regex (@".*\s(?<file>.*)\:\D*\s?(?<line>\d+)", RegexOptions.Compiled);
+		
+		public static bool TryParseLocationFromStackTrace (string stackTraceLine, out string fileName, out int lineNumber)
+		{
+			var match = stackTraceLineRegex.Match (stackTraceLine);
+
+			if (!match.Success) {
+				fileName = null;
+				lineNumber = -1;
+				return false;
+			}
+			try {
+				fileName = match.Groups ["file"].Value;
+				lineNumber = int.Parse (match.Groups ["line"].Value);
+			} catch (Exception) {
+				fileName = null;
+				lineNumber = -1;
+				return false;
+			}
+			return true;
+		}
+
+		void AddStackTrace (TreeIter row, string stackTrace, UnitTest test)
+		{
+			string[] stackLines = stackTrace.Replace ("\r", "").Split ('\n');
+			foreach (string line in stackLines) {
+				string fileName;
+				int lineNumber;
+				TryParseLocationFromStackTrace (line, out fileName, out lineNumber);
+				failuresStore.AppendValues (row, null, Escape (line), test, fileName, lineNumber, StackTrace);
+			}
+		}
+		
+		public void FinishTestRun ()
+		{
+			if (!Gtk.TreeIter.Zero.Equals (startMessageIter)) {
+				string msg = string.Format (GettextCatalog.GetString ("Test results for <b>{0}</b> configuration <b>{1}</b>"), rootTest != null ? rootTest.Name : "null", configuration);
+				failuresStore.SetValue (startMessageIter, 1, msg);
+				startMessageIter = Gtk.TreeIter.Zero;
+			}
+			infoCurrent.Text = "";
+			progressBar.Fraction = 1;
+			progressBar.Text = "";
+			
+			infoSep.Hide ();
+			infoCurrent.Hide ();
+			progressBar.Hide ();
+			resultLabel.Show ();
+			labels.Hide ();
+			buttonStop.Sensitive = false;
+			buttonRun.Sensitive = true;
+			
+			resultLabel.Markup = GetResultsMarkup ();
+
+			Running = false;
+		}
+		
+		void OnStopClicked (object sender, EventArgs args)
+		{
+			if (running)
+				Cancel ();
+		}
+		
+		void OnRunClicked (object sender, EventArgs args)
+		{
+			if (rootTest == null)
+				return;
+			UnitTestService.RunTest (rootTest, null);
+		}
+
+		void OnRowActivated (object s, EventArgs a)
+		{
+			Gtk.TreeIter iter;
+			if (failuresTreeView.Selection.GetSelected (out iter)) {
+				string file = (string)failuresStore.GetValue (iter, 3);
+				int line = (int)failuresStore.GetValue (iter, 4);
+				try {
+					if (file != null && File.Exists (file)) {
+						IdeApp.Workbench.OpenDocument (file, line, -1);
+						return;
+					}
+				} catch (Exception) {
+				}
+			}
+			OnShowTest ();
+		}
+		
+		void OnRowSelected (object s, EventArgs a)
+		{
+			UnitTest test = GetSelectedTest ();
+			if (test != null) {
+				int offset;
+				if (outIters.TryGetValue (test, out offset)) {
+					TextIter it = outputView.Buffer.GetIterAtOffset (offset);
+					outputView.Buffer.MoveMark (outputView.Buffer.InsertMark, it);
+					outputView.Buffer.MoveMark (outputView.Buffer.SelectionBound, it);
+					outputView.ScrollToMark (outputView.Buffer.InsertMark, 0.0, true, 0.0, 0.0);
+				}
+			}
+		}
+
+		[CommandHandler (EditCommands.Copy)]
+		protected void OnCopy ()
+		{
+			UnitTest test = GetSelectedTest ();
+			if (test != null) {
+				var last = test.GetLastResult ();
+				if (last == null)
+					return;
+
+				Gtk.TreeModel foo;
+				Gtk.TreeIter iter;
+				if (!failuresTreeView.Selection.GetSelected (out foo, out iter))
+					return;
+
+				int type = (int)failuresStore.GetValue (iter, 5);
+
+				var clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
+				switch (type) {
+					case ErrorMessage:
+					clipboard.Text = last.Message;
+					break;
+					case StackTrace:
+					clipboard.Text = last.StackTrace;
+					break;
+					default:
+					clipboard.Text = last.Message + Environment.NewLine + "Stack trace:" + Environment.NewLine + last.StackTrace;
+					break;
+				}
+			} else {
+				if (error == null)
+					return;
+				var clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
+
+				Gtk.TreeModel foo;
+				Gtk.TreeIter iter;
+				if (!failuresTreeView.Selection.GetSelected (out foo, out iter))
+					return;
+
+				int type = (int)failuresStore.GetValue (iter, 5);
+
+				switch (type) {
+				case ErrorMessage:
+					clipboard.Text = error.Message;
+					break;
+				case StackTrace:
+					clipboard.Text = error.StackTrace;
+					break;
+				default:
+					clipboard.Text = error.Message + Environment.NewLine + "Stack trace:" + Environment.NewLine + error.StackTrace;
+					break;
+				}
+			}
+		}
+
+		[CommandUpdateHandler (EditCommands.Copy)]
+		protected void OnUpdateCopy (CommandInfo info)
+		{
+			UnitTest test = GetSelectedTest ();
+			if (test != null) {
+				var last = test.GetLastResult ();
+
+				Gtk.TreeModel foo;
+				Gtk.TreeIter iter;
+				if (!failuresTreeView.Selection.GetSelected (out foo, out iter)) {
+					info.Enabled = false;
+					return;
+				}
+
+				int type = (int)failuresStore.GetValue (iter, 5);
+				switch (type) {
+				case ErrorMessage:
+					info.Enabled = !string.IsNullOrEmpty (last.Message);
+					return;
+				case StackTrace:
+				default:
+					info.Enabled = !string.IsNullOrEmpty (last.StackTrace);
+					return;
+				}
+			}
+			info.Enabled = error != null;
+		}
+
+		[CommandHandler (TestCommands.SelectTestInTree)]
+		protected void OnSelectTestInTree ()
+		{
+			Pad pad = IdeApp.Workbench.GetPad<TestPad> ();
+			pad.BringToFront ();
+			TestPad content = (TestPad)pad.Content;
+			content.SelectTest (GetSelectedTest ());
+		}
+		
+		[CommandUpdateHandler (TestCommands.SelectTestInTree)]
+		protected void OnUpdateSelectTestInTree (CommandInfo info)
+		{
+			UnitTest test = GetSelectedTest ();
+			info.Enabled = test != null;
+		}
+		
+		[CommandHandler (TestCommands.GoToFailure)]
+		protected void OnShowTest ()
+		{
+			UnitTest test = GetSelectedTest ();
+			if (test == null)
+				return;
+			SourceCodeLocation loc = null;
+			UnitTestResult res = test.GetLastResult ();
+			if (res != null && res.IsFailure)
+				loc = res.GetFailureLocation ();
+			if (loc == null)
+				loc = test.SourceCodeLocation;
+			if (loc != null) {
+				IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
+			} else {
+				LoggingService.LogError ("Can't get source code location for test : "+ test);
+				MessageService.ShowError (GettextCatalog.GetString ("Can't get source code location for :" + test.Name));
+			}
+		}
+
+		[CommandHandler (TestCommands.ShowTestCode)]
+		protected void OnShowTestCode ()
+		{
+			UnitTest test = GetSelectedTest ();
+			if (test == null)
+				return;
+			SourceCodeLocation loc = test.SourceCodeLocation;
+			if (loc != null) {
+				IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
+			}  else {
+				LoggingService.LogError ("Can't get source code location for test : "+ test);
+				MessageService.ShowError (GettextCatalog.GetString ("Can't get source code location for :" + test.Name));
+			}
+		}
+
+		[CommandHandler (TestCommands.RerunTest)]
+		protected void OnRerunTest ()
+		{
+			UnitTest test = GetSelectedTest ();
+			if (test == null)
+				return;
+			UnitTestService.RunTest (test, null);
+		}
+		
+		UnitTest GetSelectedTest ()
+		{
+			Gtk.TreeModel foo;
+			Gtk.TreeIter iter;
+			if (!failuresTreeView.Selection.GetSelected (out foo, out iter))
+				return null;
+
+			UnitTest t = (UnitTest)failuresStore.GetValue (iter, 2);
+			return t;
+		}
+		
+		void OnShowSuccessfulToggled (object sender, EventArgs args)
+		{
+			RefreshList ();
+		}
+		
+		void OnShowFailuresToggled (object sender, EventArgs args)
+		{
+			RefreshList ();
+		}
+		
+		void OnShowInconclusiveToggled (object sender, EventArgs args)
+		{
+			RefreshList ();
+		}
+		
+		void OnShowIgnoredToggled (object sender, EventArgs args)
+		{
+			RefreshList ();
+		}
+		
+		void OnShowOutputToggled (object sender, EventArgs args)
+		{
+			outputViewScrolled.Visible = buttonOutput.Active;
+		}
+		
+		void RefreshList ()
+		{
+			if (failuresTreeView.IsRealized)
+				failuresTreeView.ScrollToPoint (0, 0);
+
+			failuresStore.Clear ();
+			outputView.Buffer.Clear ();
+			outIters.Clear ();
+			AddStartMessage (running);
+				
+			foreach (ResultRecord res in results) {
+				ShowTestResult (res.Test, res.Result);
+			}
+			
+			if (error != null)
+				AddErrorMessage ();
+		}
+		
+		void ShowTestResult (UnitTest test, UnitTestResult result)
+		{
+			if (result.IsSuccess) {
+				if (!buttonSuccess.Active)
+					return;
+				TreeIter testRow = failuresStore.AppendValues (TestStatusIcon.Success, Escape (test.FullName), test);
+				failuresTreeView.ScrollToCell (failuresStore.GetPath (testRow), null, false, 0, 0);
+			}
+			if (result.IsFailure) {
+				if (!buttonFailures.Active)
+					return;
+				string file = test.SourceCodeLocation != null ? test.SourceCodeLocation.FileName + ":" + test.SourceCodeLocation.Line : null;
+				TreeIter testRow = failuresStore.AppendValues (TestStatusIcon.Failure, Escape (test.FullName), test, file);
+				bool hasMessage = !string.IsNullOrEmpty (result.Message);
+
+				if (hasMessage)
+					failuresStore.AppendValues (testRow, null, "<span font='" + FontService.MonospaceFontName + "'>"+Escape (result.Message) + "</span>", test, null, 0, ErrorMessage);
+				if (!string.IsNullOrEmpty (result.StackTrace)) {
+					TreeIter row = testRow;
+					if (hasMessage)
+						row = failuresStore.AppendValues (testRow, null, GettextCatalog.GetString ("Stack Trace"), test, null, 0, StackTrace);
+					AddStackTrace (row, result.StackTrace, test);
+				}
+				failuresTreeView.ScrollToCell (failuresStore.GetPath (testRow), null, false, 0, 0);
+			}
+			if (result.IsNotRun) {
+				if (!buttonIgnored.Active)
+					return;
+				TreeIter testRow = failuresStore.AppendValues (TestStatusIcon.NotRun, Escape (test.FullName), test);
+				if (result.Message != null)
+					failuresStore.AppendValues (testRow, null, Escape (result.Message), test);
+				failuresTreeView.ScrollToCell (failuresStore.GetPath (testRow), null, false, 0, 0);
+			}
+			if (result.IsInconclusive) {
+				if (!buttonInconclusive.Active)
+					return;
+				TreeIter testRow = failuresStore.AppendValues (TestStatusIcon.Inconclusive, Escape (test.FullName), test);
+				if (result.Message != null)
+					failuresStore.AppendValues (testRow, null, Escape (result.Message), test);
+				failuresTreeView.ScrollToCell (failuresStore.GetPath (testRow), null, false, 0, 0);
+			}
+			
+			string msg = GettextCatalog.GetString ("Running {0} ...", test.FullName);
+			TextIter it = outputView.Buffer.EndIter;
+			outIters [test] = it.Offset;
+			outputView.Buffer.InsertWithTags (ref it, msg, bold);
+			outputView.Buffer.Insert (ref it, "\n");
+			if (result.ConsoleOutput != null)
+				outputView.Buffer.Insert (ref it, result.ConsoleOutput);
+			if (result.ConsoleError != null)
+				outputView.Buffer.Insert (ref it, result.ConsoleError);
+			outputView.ScrollMarkOnscreen (outputView.Buffer.InsertMark);
+		}
+
+		void ITestProgressMonitor.WriteGlobalLog (string message)
+		{
+			TextIter it = outputView.Buffer.EndIter;
+			outputView.Buffer.Insert (ref it, message);
+			outputView.ScrollMarkOnscreen (outputView.Buffer.InsertMark);
+		}
+
+		string Escape (string s)
+		{
+			return GLib.Markup.EscapeText (s);
+		}
+		
+		void ITestProgressMonitor.EndTest (UnitTest test, UnitTestResult result)
+		{
+			if (test is UnitTestGroup)
+				return;
+			
+			testsRun++;
+			ResultRecord rec = new ResultRecord ();
+			rec.Test = test;
+			rec.Result = result;
+			
+			resultSummary.Add (result);
+			results.Add (rec);
+			
+			ShowTestResult (test, result);
+			
+			UpdateCounters ();
+
+			double frac;
+			if (testsToRun != 0)
+				frac = ((double)testsRun / (double)testsToRun);
+			else
+				frac = 1;
+
+			frac = Math.Min (1, Math.Max (0, frac));
+
+			progressBar.Fraction = frac;
+			progressBar.Text = testsRun + " / " + testsToRun;
+		}
+		
+		void ITestProgressMonitor.BeginTest (UnitTest test)
+		{
+			infoCurrent.Text = GettextCatalog.GetString ("Running ") + test.FullName;
+			infoCurrent.Xalign = 0;
+		}
+
+		public void Cancel ()
+		{
+			if (cancel)
+				return;
+			cancel = true;
+			cancellationSource.Cancel ();
+		}
+
+		void OnCancel ()
+		{
+			Gtk.Application.Invoke (delegate {
+				failuresStore.AppendValues (TestStatusIcon.Failure, GettextCatalog.GetString ("Test execution cancelled."), null);
+			});
+		}
+		
+		CancellationToken ITestProgressMonitor.CancellationToken {
+			get { return cancellationSource.Token; }
+		}
+	}
+	
+	class TestMonitor: ITestProgressMonitor
+	{
+		ITestProgressMonitor monitor;
+		TestResultsPad pad;
+
+		public TestMonitor (TestResultsPad pad, CancellationTokenSource cs)
+		{
+			this.pad = pad;
+			this.monitor = pad;
+		}
+		public void FinishTestRun ()
+		{
+			Runtime.RunInMainThread (delegate {
+				pad.FinishTestRun ();
+			});
+		}
+		public void BeginTest (UnitTest test)
+		{
+			Runtime.RunInMainThread (delegate {
+				monitor.BeginTest (test);
+			});
+		}
+		public void EndTest (UnitTest test, UnitTestResult result)
+		{
+			Runtime.RunInMainThread (delegate {
+				monitor.EndTest (test, result);
+			});
+		}
+		public void ReportRuntimeError (string message, Exception exception)
+		{
+			Runtime.RunInMainThread (delegate {
+				monitor.ReportRuntimeError (message, exception);
+			});
+		}
+		public void WriteGlobalLog (string message)
+		{
+			Runtime.RunInMainThread (delegate {
+				monitor.WriteGlobalLog (message);
+			});
+		}
+
+		public CancellationToken CancellationToken {
+			get { return monitor.CancellationToken; }
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestStatusIcon.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestStatusIcon.cs
new file mode 100644
index 0000000000..05d428b698
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestStatusIcon.cs
@@ -0,0 +1,74 @@
+//
+// CircleImage.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using Gdk;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.UnitTesting
+{
+	static class TestStatusIcon
+	{
+		public static readonly Xwt.Drawing.Image Running;
+		public static readonly Xwt.Drawing.Image None;
+		public static readonly Xwt.Drawing.Image NotRun;
+		public static readonly Xwt.Drawing.Image Loading;
+
+		public static readonly Xwt.Drawing.Image Failure;
+		public static readonly Xwt.Drawing.Image Success;
+		public static readonly Xwt.Drawing.Image SuccessAndFailure;
+		public static readonly Xwt.Drawing.Image Inconclusive;
+		
+		public static readonly Xwt.Drawing.Image OldFailure;
+		public static readonly Xwt.Drawing.Image OldSuccess;
+		public static readonly Xwt.Drawing.Image OldSuccessAndFailure;
+		public static readonly Xwt.Drawing.Image OldInconclusive;
+
+		static TestStatusIcon ()
+		{
+			try {
+				Running = Xwt.Drawing.Image.FromResource ("unit-running-16.png");
+				Failure = Xwt.Drawing.Image.FromResource ("unit-failed-16.png");
+				None = Xwt.Drawing.Image.FromResource ("unit-not-yet-run-16.png");
+				NotRun = Xwt.Drawing.Image.FromResource ("unit-skipped-16.png");
+				Success = Xwt.Drawing.Image.FromResource ("unit-success-16.png");
+				SuccessAndFailure = Xwt.Drawing.Image.FromResource ("unit-mixed-results-16.png");
+				Loading = Xwt.Drawing.Image.FromResource ("unit-loading-16.png");
+				Inconclusive = Xwt.Drawing.Image.FromResource ("unit-inconclusive-16.png");
+				OldFailure = Failure.WithAlpha (0.4);
+				OldSuccess = Success.WithAlpha (0.4);
+				OldSuccessAndFailure = SuccessAndFailure.WithAlpha (0.4);
+				OldInconclusive = Inconclusive.WithAlpha (0.4);
+			} catch (Exception e) {
+				LoggingService.LogError ("Error while loading icons.", e);
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16.png
new file mode 100644
index 0000000000..08156925bf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16@2x.png
new file mode 100644
index 0000000000..a626c128b9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark.png
new file mode 100644
index 0000000000..c73c3e92fd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark@2x.png
new file mode 100644
index 0000000000..392713f95a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel.png
new file mode 100644
index 0000000000..390f9d1e34
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel@2x.png
new file mode 100644
index 0000000000..0724d75161
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel.png
new file mode 100644
index 0000000000..390f9d1e34
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel@2x.png
new file mode 100644
index 0000000000..0724d75161
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/pad-unit-test-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32.png
new file mode 100644
index 0000000000..94cd21390d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32@2x.png
new file mode 100644
index 0000000000..05e84865e9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark.png
new file mode 100644
index 0000000000..b67ac9d2e7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark@2x.png
new file mode 100644
index 0000000000..0a0c74b70b
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel.png
new file mode 100644
index 0000000000..5de67db489
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png
new file mode 100644
index 0000000000..e5dde885d9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel.png
new file mode 100644
index 0000000000..5de67db489
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel@2x.png
new file mode 100644
index 0000000000..e5dde885d9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/project-nunit-overlay-32~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16.png
new file mode 100644
index 0000000000..0b434fcc3a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16@2x.png
new file mode 100644
index 0000000000..652cf7c6dd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark.png
new file mode 100644
index 0000000000..bfe3e1c59a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark@2x.png
new file mode 100644
index 0000000000..8c66142ce0
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-failed-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16.png
new file mode 100644
index 0000000000..e1767bea57
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16@2x.png
new file mode 100644
index 0000000000..7bfee6e8ef
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark.png
new file mode 100644
index 0000000000..683d1ae1d7
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark@2x.png
new file mode 100644
index 0000000000..2dac729015
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-inconclusive-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16.png
new file mode 100644
index 0000000000..80adae4315
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16@2x.png
new file mode 100644
index 0000000000..de27f28d8a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark.png
new file mode 100644
index 0000000000..7506a641b1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark@2x.png
new file mode 100644
index 0000000000..d4fb6f3aae
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-loading-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16.png
new file mode 100644
index 0000000000..5d5d0b99f4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16@2x.png
new file mode 100644
index 0000000000..1a3a7be90e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark.png
new file mode 100644
index 0000000000..ea24dc5244
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark@2x.png
new file mode 100644
index 0000000000..19908b7a58
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-mixed-results-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16.png
new file mode 100644
index 0000000000..0918265bd5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16@2x.png
new file mode 100644
index 0000000000..f690bc4ca6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark.png
new file mode 100644
index 0000000000..9567eba24d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark@2x.png
new file mode 100644
index 0000000000..7a72559000
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-not-yet-run-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16.png
new file mode 100644
index 0000000000..3f26d8a8de
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16@2x.png
new file mode 100644
index 0000000000..483d39776f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark.png
new file mode 100644
index 0000000000..4cf4973b3c
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark@2x.png
new file mode 100644
index 0000000000..507066be18
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-running-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16.png
new file mode 100644
index 0000000000..486f84499f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16@2x.png
new file mode 100644
index 0000000000..7769944638
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark.png
new file mode 100644
index 0000000000..fad4fdf159
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark@2x.png
new file mode 100644
index 0000000000..f0fcadf3fc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-skipped-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16.png
new file mode 100644
index 0000000000..67dec0fab1
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16@2x.png
new file mode 100644
index 0000000000..fc3ce92d32
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark.png
new file mode 100644
index 0000000000..d8f17aaa61
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark@2x.png
new file mode 100644
index 0000000000..07673c4707
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Makefile.am b/main/src/addins/MonoDevelop.UnitTesting/Makefile.am
new file mode 100644
index 0000000000..c9cc87438f
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Makefile.am
@@ -0,0 +1 @@
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
new file mode 100644
index 0000000000..d6236f6466
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AssemblyName>MonoDevelop.UnitTesting</AssemblyName>
+    <RootNamespace>MonoDevelop.UnitTesting</RootNamespace>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\build\AddIns\MonoDevelop.UnitTesting</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>3</WarningLevel>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+    <DefineConstants>DEBUG</DefineConstants>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.UnitTesting\MonoDevelop.NUnit.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\build\AddIns\MonoDevelop.UnitTesting</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>3</WarningLevel>
+    <Execution>
+      <Execution clr-version="Net_2_0" />
+    </Execution>
+    <DebugSymbols>true</DebugSymbols>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.UnitTesting\MonoDevelop.NUnit.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="Mono.Posix" />
+    <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
+      <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
+      <Name>MonoDevelop.Core</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
+      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
+      <Name>MonoDevelop.Ide</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
+      <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
+      <Name>Mono.Addins</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\xwt\Xwt\Xwt.csproj">
+      <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project>
+      <Name>Xwt</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
+      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
+      <Name>ICSharpCode.NRefactory</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Gui\icons\unit-running-16.png">
+      <LogicalName>unit-running-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-running-16%402x.png">
+      <LogicalName>unit-running-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-running-16~dark.png">
+      <LogicalName>unit-running-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-running-16~dark%402x.png">
+      <LogicalName>unit-running-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-failed-16.png">
+      <LogicalName>unit-failed-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-failed-16%402x.png">
+      <LogicalName>unit-failed-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-failed-16~dark.png">
+      <LogicalName>unit-failed-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-failed-16~dark%402x.png">
+      <LogicalName>unit-failed-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-mixed-results-16.png">
+      <LogicalName>unit-mixed-results-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-mixed-results-16%402x.png">
+      <LogicalName>unit-mixed-results-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-mixed-results-16~dark.png">
+      <LogicalName>unit-mixed-results-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-mixed-results-16~dark%402x.png">
+      <LogicalName>unit-mixed-results-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16.png">
+      <LogicalName>unit-not-yet-run-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16%402x.png">
+      <LogicalName>unit-not-yet-run-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16~dark.png">
+      <LogicalName>unit-not-yet-run-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16~dark%402x.png">
+      <LogicalName>unit-not-yet-run-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-skipped-16.png">
+      <LogicalName>unit-skipped-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-skipped-16%402x.png">
+      <LogicalName>unit-skipped-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-skipped-16~dark.png">
+      <LogicalName>unit-skipped-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-skipped-16~dark%402x.png">
+      <LogicalName>unit-skipped-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-loading-16.png">
+      <LogicalName>unit-loading-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-loading-16%402x.png">
+      <LogicalName>unit-loading-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-loading-16~dark.png">
+      <LogicalName>unit-loading-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-loading-16~dark%402x.png">
+      <LogicalName>unit-loading-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-success-16.png">
+      <LogicalName>unit-success-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-success-16%402x.png">
+      <LogicalName>unit-success-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MonoDevelopNUnit.addin.xml">
+      <LogicalName>MonoDevelopNUnit.addin.xml</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32.png">
+      <LogicalName>project-nunit-overlay-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32%402x.png">
+      <LogicalName>project-nunit-overlay-32@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~dark.png">
+      <LogicalName>project-nunit-overlay-32~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~dark%402x.png">
+      <LogicalName>project-nunit-overlay-32~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~sel.png">
+      <LogicalName>project-nunit-overlay-32~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~sel%402x.png">
+      <LogicalName>project-nunit-overlay-32~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~dark~sel.png">
+      <LogicalName>project-nunit-overlay-32~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~dark~sel%402x.png">
+      <LogicalName>project-nunit-overlay-32~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="gtk-gui\gui.stetic">
+      <LogicalName>gui.stetic</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16.png">
+      <LogicalName>pad-unit-test-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16%402x.png">
+      <LogicalName>pad-unit-test-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16~dark.png">
+      <LogicalName>pad-unit-test-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16~dark%402x.png">
+      <LogicalName>pad-unit-test-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16~sel.png">
+      <LogicalName>pad-unit-test-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16~sel%402x.png">
+      <LogicalName>pad-unit-test-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16~dark~sel.png">
+      <LogicalName>pad-unit-test-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\pad-unit-test-16~dark~sel%402x.png">
+      <LogicalName>pad-unit-test-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-inconclusive-16.png">
+      <LogicalName>unit-inconclusive-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-inconclusive-16%402x.png">
+      <LogicalName>unit-inconclusive-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-inconclusive-16~dark.png">
+      <LogicalName>unit-inconclusive-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Gui\icons\unit-inconclusive-16~dark%402x.png">
+      <LogicalName>unit-inconclusive-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Commands\NUnitCommands.cs" />
+    <Compile Include="Gui\TestPad.cs" />
+    <Compile Include="Gui\TestResultsPad.cs" />
+    <Compile Include="Gui\TestNodeBuilder.cs" />
+    <Compile Include="Gui\TestChart.cs" />
+    <Compile Include="Services\SolutionFolderTestGroup.cs" />
+    <Compile Include="Services\ITestProvider.cs" />
+    <Compile Include="Services\UnitTestService.cs" />
+    <Compile Include="Services\SystemTestProvider.cs" />
+    <Compile Include="Services\ITestProgressMonitor.cs" />
+    <Compile Include="Services\TestContext.cs" />
+    <Compile Include="Services\UnitTestCollection.cs" />
+    <Compile Include="Services\UnitTest.cs" />
+    <Compile Include="Services\UnitTestGroup.cs" />
+    <Compile Include="Services\GeneralTestOptions.cs" />
+    <Compile Include="Services\IResultsStore.cs" />
+    <Compile Include="Services\UnitTestResultsStore.cs" />
+    <Compile Include="Services\WorkspaceTestGroup.cs" />
+    <Compile Include="gtk-gui\generated.cs" />
+    <Compile Include="Services\UnitTestResult.cs" />
+    <Compile Include="Services\UnitTestStatus.cs" />
+    <Compile Include="Services\UnitTestProjectServiceExtension.cs" />
+    <Compile Include="Gui\TestStatusIcon.cs" />
+    <Compile Include="AddinInfo.cs" />
+    <Compile Include="Services\AbstractResultsStore.cs" />
+    <Compile Include="Services\BinaryResultsStore.cs" />
+    <Compile Include="Services\NUnitSourceCodeLocationFinder.cs" />
+    <Compile Include="Services\RemoteUnhandledException.cs" />
+    <Compile Include="Services\AbstractUnitTestEditorExtension.cs" />
+    <Compile Include="Services\UnitTestMarkersExtension.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Makefile.am" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml
new file mode 100644
index 0000000000..2e4df980c8
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelopNUnit.addin.xml
@@ -0,0 +1,129 @@
+<ExtensionModel>
+
+	<!-- Extension Points -->
+
+	<ExtensionPoint path = "/MonoDevelop/UnitTesting/TestProviders" name = "Test providers">
+		<Description>Test providers. Specified classes must implement ITestProvider.</Description>
+		<ExtensionNode name ="Class" />
+	</ExtensionPoint>
+
+	<ExtensionPoint path = "/MonoDevelop/UnitTesting/ContextMenu/TestChart">
+		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
+	</ExtensionPoint>
+
+	<ExtensionPoint path = "/MonoDevelop/UnitTesting/ContextMenu/TestPad">
+		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
+	</ExtensionPoint>
+
+	<ExtensionPoint path = "/MonoDevelop/UnitTesting/ContextMenu/TestResultsPad">
+		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
+	</ExtensionPoint>
+
+	<ExtensionPoint path = "/MonoDevelop/UnitTesting/NUnitSourceCodeLocationFinder">
+		<ExtensionNode name="Class"/>
+	</ExtensionPoint>
+
+	<ExtensionPoint path = "/MonoDevelop/UnitTesting/UnitTestMarkers" name = "Unit Test Markers">
+		<Description>Unit test markers are used to identify test methods in soure code.</Description>
+		<ExtensionNode name ="TestMarkers" type="MonoDevelop.UnitTesting.UnitTestMarkersExtension"/>
+	</ExtensionPoint>
+
+	<!-- Extensions -->
+
+	<Extension path = "/MonoDevelop/Ide/Pads">
+		<SolutionPad id = "MonoDevelop.UnitTesting.TestPad" defaultLayout="*" defaultPlacement = "Right" defaultStatus="AutoHide" _label = "Unit Tests" icon = "nunit-pad-icon" class = "MonoDevelop.UnitTesting.TestPad">
+			<PadOption id = "ShowTestTime" _label = "Show Test Time" defaultValue = "False" />
+			<PadOption id = "ShowTestCounters" _label = "Show Test Counters" defaultValue = "False" />
+			<NodeBuilder id = "TestNode" class = "MonoDevelop.UnitTesting.TestNodeBuilder"/>
+		</SolutionPad>
+		<Pad id="MonoDevelop.UnitTesting.TestResultsPad" _label="Test Results" icon="nunit-pad-icon" class="MonoDevelop.UnitTesting.TestResultsPad" defaultPlacement = "Bottom" defaultLayout="UnitTesting" defaultStatus="AutoHide"/>
+	</Extension>
+
+	<Extension path="/MonoDevelop/Ide/WorkbenchLayouts">
+		<Layout id="UnitTesting" _name="Unit Testing">
+			<LayoutPad id="MonoDevelop.UnitTesting.TestPad" status="Dockable" />
+			<LayoutPad id="MonoDevelop.UnitTesting.TestResultsPad" status="Dockable" />
+		</Layout>
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/Commands">
+		<Category _name = "Unit Testing" id = "UnitTesting">
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.RunAllTests"
+			_label = "Run Unit Tests"
+			icon = "md-run-unit-tests"
+			_description="Runs all tests of the current selected project."
+			shortcut="Control|T"
+			defaultHandler="MonoDevelop.UnitTesting.Commands.RunAllTestsHandler"/>
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.RunTestWith"
+			_label = "Run With"
+			type="array"
+			_description="Runs tests using a special execution mode."/>
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.DebugTest"
+			_label = "Debug Test"
+			type="array" />
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.RunTest" _label = "Run Test" />
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.ShowTestCode" _label = "Show test source code" />
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.GoToFailure" _label = "Go to failure" />
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.SelectTestInTree" _label = "Select test in tree" />
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.ShowTestDetails" _label = "Show results pad" />
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestCommands.RerunTest" _label = "Rerun test" />
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.UseTimeScale" _label = "Proportional time scale" type="check"/>
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.SingleDayResult" _label = "Show one result per day" type="check"/>
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowResults" _label = "Results chart" type="radio"/>
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowTime" _label = "Time chart" type="radio"/>
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowSuccessfulTests" _label = "Show successful tests" type="check"/>
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowFailedTests" _label = "Show failed tests" type="check"/>
+		<Command id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowIgnoredTests" _label = "Show ignored tests" type="check"/>
+		</Category>
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Ide/MainMenu/Run">
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.RunAllTests" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/UnitTesting/ContextMenu/TestPad">
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.RunTest" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.DebugTest" />
+		<ItemSet id = "RunTestWith" _label = "Run Test With">
+			<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.RunTestWith" />
+		</ItemSet>
+		<SeparatorItem id = "s0" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.GoToFailure" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.ShowTestCode" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.ShowTestDetails" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/UnitTesting/ContextMenu/TestResultsPad">
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.GoToFailure" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.ShowTestCode" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.SelectTestInTree" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestCommands.RerunTest" />
+		<SeparatorItem id = "s1" />
+		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Copy" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/UnitTesting/ContextMenu/TestChart">
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowResults" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowTime" />
+		<SeparatorItem id = "s1" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowSuccessfulTests" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowFailedTests" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.ShowIgnoredTests" />
+		<SeparatorItem id = "s2" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.UseTimeScale" />
+		<CommandItem id = "MonoDevelop.UnitTesting.Commands.TestChartCommands.SingleDayResult" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/UnitTesting/TestProviders">
+		<Class id="SystemTestProvider" class="MonoDevelop.UnitTesting.SystemTestProvider" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/Core/StockIcons">
+		<StockIcon stockid = "nunit-pad-icon" resource = "pad-unit-test-16.png" size="Menu" />
+	</Extension>
+
+	<Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions">
+		<Class class = "MonoDevelop.UnitTesting.UnitTestProjectServiceExtension" />
+	</Extension>
+	
+</ExtensionModel>
diff --git a/main/src/addins/NUnit/README b/main/src/addins/MonoDevelop.UnitTesting/README
index 091d68920f..091d68920f 100644
--- a/main/src/addins/NUnit/README
+++ b/main/src/addins/MonoDevelop.UnitTesting/README
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs
new file mode 100644
index 0000000000..6885470811
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs
@@ -0,0 +1,407 @@
+//
+// AbstractResultsStore.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Xml.Serialization;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.UnitTesting
+{
+	public abstract class AbstractResultsStore: IResultsStore
+	{
+		Hashtable fileCache = new Hashtable ();
+		string basePath;
+		string storeId;
+		Hashtable cachedRootList = new Hashtable ();
+
+		IResultsStoreSerializer serializer;
+
+		public AbstractResultsStore (IResultsStoreSerializer serializer, string directory, string storeId)
+		{
+			this.serializer = serializer;
+			this.basePath = directory;
+			this.storeId = storeId;
+		}
+		
+		public void RegisterResult (string configuration, UnitTest test, UnitTestResult result)
+		{
+			string aname = test.StoreRelativeName;
+			
+			TestRecord root = GetRootRecord (configuration, result.TestDate);
+			if (root == null) {
+				root = new TestRecord ();
+				fileCache [GetRootFileName (configuration, result.TestDate)] = root;
+			}
+			root.Modified = true;
+			TestRecord record = root;
+			
+			if (aname.Length > 0) {
+				string[] path = test.StoreRelativeName.Split ('.');
+				foreach (string p in path) {
+					TestRecord ctr = record.Tests != null ? record.Tests [p] : null;
+					if (ctr == null) {
+						ctr = new TestRecord ();
+						ctr.Name = p;
+						if (record.Tests == null)
+							record.Tests = new TestRecordCollection ();
+						record.Tests.Add (ctr);
+					}
+					record = ctr;
+				}
+			}
+			
+			if (record.Results == null)
+				record.Results = new UnitTestResultCollection ();
+			record.Results.Add (result);
+		}
+		
+		public UnitTestResult GetNextResult (string configuration, UnitTest test, DateTime date)
+		{
+			DateTime currentDate = date;
+			TestRecord root = GetRootRecord (configuration, currentDate);
+			if (root == null)
+				root = GetNextRootRecord (configuration, ref currentDate);
+			
+			while (root != null) {
+				TestRecord tr = FindRecord (root, test.StoreRelativeName);
+				if (tr != null && tr.Results != null) {
+					foreach (UnitTestResult res in tr.Results) {
+						if (res.TestDate > date)
+							return res;
+					}
+				}
+				root = GetNextRootRecord (configuration, ref currentDate);
+			}
+			return null;
+		}
+		
+		public UnitTestResult GetPreviousResult (string configuration, UnitTest test, DateTime date)
+		{
+			DateTime currentDate = date;
+			TestRecord root = GetRootRecord (configuration, currentDate);
+			if (root == null)
+				root = GetPreviousRootRecord (configuration, ref currentDate);
+			
+			while (root != null) {
+				TestRecord tr = FindRecord (root, test.StoreRelativeName);
+				if (tr != null && tr.Results != null) {
+					for (int n = tr.Results.Count - 1; n >= 0; n--) {
+						UnitTestResult res = (UnitTestResult) tr.Results [n];
+						if (res.TestDate < date)
+							return res;
+					}
+				}
+				root = GetPreviousRootRecord (configuration, ref currentDate);
+			}
+			return null;
+		}
+		
+		public UnitTestResult GetLastResult (string configuration, UnitTest test, DateTime date)
+		{
+			return GetPreviousResult (configuration, test, date.AddTicks (1));
+		}
+		
+		public UnitTestResult[] GetResults (string configuration, UnitTest test, DateTime startDate, DateTime endDate)
+		{
+			ArrayList list = new ArrayList ();
+			DateTime firstDay = new DateTime (startDate.Year, startDate.Month, startDate.Day);
+			
+			DateTime[] dates = GetStoreDates (configuration);
+			
+			foreach (DateTime date in dates) {
+				if (date < firstDay)
+					continue;
+				if (date > endDate)
+					break;
+				
+				TestRecord root = GetRootRecord (configuration, date);
+				if (root == null) continue;
+
+				TestRecord tr = FindRecord (root, test.StoreRelativeName);
+				if (tr != null && tr.Results != null) {
+					foreach (UnitTestResult res in tr.Results) {
+						if (res.TestDate >= startDate && res.TestDate <= endDate)
+							list.Add (res);
+					}
+				}
+			}
+			
+			return (UnitTestResult[]) list.ToArray (typeof(UnitTestResult));
+		}
+		
+		public UnitTestResult[] GetResultsToDate (string configuration, UnitTest test, DateTime endDate, int count)
+		{
+			ArrayList list = new ArrayList ();
+			DateTime[] dates = GetStoreDates (configuration);
+			
+			for (int n = dates.Length - 1; n >= 0 && list.Count < count; n--) {
+				if (dates [n] > endDate)
+					continue;
+				
+				TestRecord root = GetRootRecord (configuration, dates [n]);
+				if (root == null) continue;
+
+				TestRecord tr = FindRecord (root, test.StoreRelativeName);
+				if (tr != null && tr.Results != null) {
+					for (int m = tr.Results.Count - 1; m >= 0 && list.Count < count; m--) {
+						UnitTestResult res = (UnitTestResult) tr.Results [m];
+						if (res.TestDate <= endDate)
+							list.Add (res);
+					}
+				}
+			}
+			
+			UnitTestResult[] array = (UnitTestResult[]) list.ToArray (typeof(UnitTestResult));
+			Array.Reverse (array);
+			return array;
+		}
+		
+		public void Save ()
+		{
+			if (!Directory.Exists (basePath))
+				Directory.CreateDirectory (basePath);
+			
+			foreach (DictionaryEntry entry in fileCache) {
+				TestRecord record = (TestRecord) entry.Value;
+				if (!record.Modified)
+					continue;
+				
+				string filePath = Path.Combine (basePath, (string)entry.Key);
+				try {
+					serializer.Serialize (filePath, record);
+					record.Modified = false;
+				} catch (Exception ex) {
+					LoggingService.LogError (ex.ToString ());
+				}
+			}
+			cachedRootList.Clear ();
+		}
+		
+		TestRecord FindRecord (TestRecord root, string aname)
+		{
+			if (aname.Length == 0)
+				return root;
+			else {
+				string[] path = aname.Split ('.');
+				TestRecord tr = root;
+				foreach (string p in path) {
+					if (tr.Tests == null)
+						return null;
+					tr = tr.Tests [p];
+					if (tr == null)
+						return null;
+				}
+				return tr;
+			}
+		}
+
+		TestRecord GetRootRecord (string configuration, DateTime date)
+		{
+			string file = GetRootFileName (configuration, date);
+			TestRecord res = (TestRecord) fileCache [file];
+			if (res != null)
+				return res;
+			string filePath;
+			try {
+				filePath = Path.Combine (basePath, file);
+			} catch (Exception) {
+				return null;
+			}
+			
+			try {
+				res = (TestRecord) serializer.Deserialize (filePath);
+			} catch (Exception ex) {
+				LoggingService.LogError (ex.ToString ());
+				return null;
+			}
+			
+			if (res != null) {
+				fileCache [file] = res;
+			}
+			return res;
+		}
+		
+		TestRecord GetNextRootRecord (string configuration, ref DateTime date)
+		{
+			DateTime[] dates = GetStoreDates (configuration);
+			foreach (DateTime d in dates) {
+				if (d > date) {
+					date = d;
+					return GetRootRecord (configuration, d);
+				}
+			}
+			return null;
+		}
+		
+		TestRecord GetPreviousRootRecord (string configuration, ref DateTime date)
+		{
+			date = new DateTime (date.Year, date.Month, date.Day);
+			DateTime[] dates = GetStoreDates (configuration);
+			for (int n = dates.Length - 1; n >= 0; n--) {
+				if (dates [n] < date) {
+					date = dates [n];
+					return GetRootRecord (configuration, dates [n]);
+				}
+			}
+			return null;
+		}
+
+		// Filter out all invalid path characters in the file name
+		// Bug 3023 - Running NUnit tests throws ArgumentException: Illegal Characters in path
+		static string EscapeFilename (string str)
+		{
+			var pc = FilePath.GetInvalidPathChars ();
+			char[] specialCharacters = new char[pc.Length + 1];
+			pc.CopyTo (specialCharacters, 0);
+			specialCharacters [specialCharacters.Length - 1] = '%';
+
+			int i = str.IndexOfAny (specialCharacters);
+			while (i != -1) {
+				str = str.Substring (0, i) + '%' + ((int) str [i]).ToString ("X") + str.Substring (i + 1);
+				i = str.IndexOfAny (specialCharacters, i + 3);
+			}
+			return str;
+		}
+		
+		string GetRootFileName (string configuration, DateTime date)
+		{
+			var filteredConfiguration = EscapeFilename (configuration);
+			return storeId + "-" + filteredConfiguration + "-" + date.ToString ("yyyy-MM-dd", CultureInfo.InvariantCulture) + ".xml";
+		}
+		
+		DateTime ParseFileNameDate (string configuration, string fileName)
+		{
+			fileName = Path.GetFileNameWithoutExtension (fileName);
+			fileName = fileName.Substring (storeId.Length + configuration.Length + 2);
+			return DateTime.ParseExact (fileName, "yyyy-MM-dd", CultureInfo.InvariantCulture);
+		}
+		
+		DateTime[] GetStoreDates (string configuration)
+		{
+			if (!Directory.Exists (basePath))
+				return new DateTime [0];
+			
+			DateTime[] res = (DateTime[]) cachedRootList [configuration];
+			if (res != null)
+				return res;
+			
+			var dates = new List<DateTime> ();
+			var escapedConfiguration = EscapeFilename (configuration);
+			foreach (string file in Directory.GetFiles (basePath, storeId + "-" + escapedConfiguration + "-*")) {
+				try {
+					DateTime t = ParseFileNameDate (escapedConfiguration, Path.GetFileName (file));
+					dates.Add (t);
+				} catch { }
+			}
+			res = dates.ToArray ();
+			cachedRootList [configuration] = res;
+			return res;
+		}
+	}
+	
+	/// <summary>
+	/// Encapsulates serialization/deserialization logic
+	/// </summary>
+	public interface IResultsStoreSerializer
+	{
+		/// <summary>
+		/// Serialize the record into the specified path.
+		/// </summary>
+		void Serialize(string filePath, TestRecord testRecord);
+		
+		/// <summary>
+		/// Deserialize the TestRecord from the sepcified path if possible.
+		/// Return null if deserialization is impossible.
+		/// </summary>
+		TestRecord Deserialize(string filePath);
+	}
+	
+	[Serializable]
+	public class TestRecord
+	{
+		string name;
+		UnitTestResultCollection results;
+		TestRecordCollection tests;
+		internal bool Modified;
+		
+		[XmlAttribute]
+		public string Name {
+			get { return name; }
+			set { name = value; }
+		}
+		
+		public UnitTestResultCollection Results {
+			get { return results; }
+			set { results = value; }
+		}
+		
+		public TestRecordCollection Tests {
+			get { return tests; }
+			set { tests = value; }
+		}
+	}
+	
+	[Serializable]
+	public class TestRecordCollection: CollectionBase
+	{
+		public new TestRecord this [int n] {
+			get { return (TestRecord) ((IList)this) [n]; }
+		}
+		
+		public new TestRecord this [string name] {
+			get {
+				for (int n=0; n<List.Count; n++)
+					if (((TestRecord)List [n]).Name == name)
+						return (TestRecord) List [n];
+				return null;
+			}
+		}
+		
+		public void Add (TestRecord test)
+		{
+			((IList)this).Add (test);
+		}
+	}
+	
+	[Serializable]
+	public class UnitTestResultCollection: CollectionBase
+	{
+		public new UnitTestResult this [int n] {
+			get { return (UnitTestResult) ((IList)this) [n]; }
+		}
+		
+		public void Add (UnitTestResult test)
+		{
+			((IList)this).Add (test);
+		}
+	}	
+}
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
new file mode 100644
index 0000000000..1831e69db4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
@@ -0,0 +1,373 @@
+//
+// AbstractUnitTestTextEditorExtension.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Threading;
+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using Gtk;
+using MonoDevelop.Components;
+using System.Threading.Tasks;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Projects;
+using Mono.Addins;
+
+namespace MonoDevelop.UnitTesting
+{
+	public abstract class AbstractUnitTestTextEditorExtension : TextEditorExtension
+	{
+		const string TestMarkersPath = "/MonoDevelop/UnitTesting/UnitTestMarkers";
+		static IUnitTestMarkers [] unitTestMarkers;
+
+		static AbstractUnitTestTextEditorExtension ()
+		{
+			AddinManager.AddExtensionNodeHandler (TestMarkersPath, HandleExtensionNodeEventHandler);
+		}
+
+		static void HandleExtensionNodeEventHandler (object sender, ExtensionNodeEventArgs args)
+		{
+			unitTestMarkers = AddinManager.GetExtensionNodes (TestMarkersPath).OfType<IUnitTestMarkers> ().ToArray ();
+		}
+
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+			DocumentContext.DocumentParsed += HandleDocumentParsed; 
+			if (IdeApp.Workbench == null)
+				return;
+			UnitTestService.TestSessionCompleted += HandleTestSessionCompleted;
+		}
+
+		void HandleTestSessionCompleted (object sender, EventArgs e)
+		{
+			foreach (var marker in currentMarker)
+				marker.UpdateState ();
+		}
+
+		public override void Dispose ()
+		{
+			src.Cancel ();
+			UnitTestService.TestSessionCompleted -= HandleTestSessionCompleted;
+			RemoveHandler ();
+			DocumentContext.DocumentParsed -= HandleDocumentParsed; 
+			base.Dispose ();
+		}
+
+		CancellationTokenSource src = new CancellationTokenSource ();
+
+		public abstract Task<IList<UnitTestLocation>> GatherUnitTests (IUnitTestMarkers[] unitTestMarkers, CancellationToken token);
+
+		void HandleDocumentParsed (object sender, EventArgs e)
+		{
+			if (!IdeApp.Preferences.EnableUnitTestEditorIntegration)
+				return;
+			src.Cancel ();
+			src = new CancellationTokenSource ();
+			var token = src.Token;
+			ThreadPool.QueueUserWorkItem (delegate {
+				if (token.IsCancellationRequested || DocumentContext == null)
+					return;
+				try {
+					GatherUnitTests (unitTestMarkers, token).ContinueWith (task => {
+						var foundTests = task.Result;
+						if (foundTests == null || DocumentContext == null)
+							return;
+						Application.Invoke (delegate {
+							if (token.IsCancellationRequested || DocumentContext == null)
+								return;
+							foreach (var oldMarker in currentMarker)
+								Editor.RemoveMarker (oldMarker);
+							var newMarkers = new List<IUnitTestMarker> ();
+							foreach (var foundTest in foundTests) {
+								if (foundTest == null)
+									continue;
+								var unitTestMarker = TextMarkerFactory.CreateUnitTestMarker (Editor, new UnitTestMarkerHostImpl (this), foundTest);
+								newMarkers.Add (unitTestMarker);
+								var line = Editor.GetLineByOffset (foundTest.Offset);
+								if (line != null) {
+									Editor.AddMarker (line, unitTestMarker);
+								}
+							}
+							currentMarker = newMarkers;
+						});
+
+					}, TaskContinuationOptions.ExecuteSynchronously | 
+						TaskContinuationOptions.NotOnCanceled | 
+						TaskContinuationOptions.NotOnFaulted);
+				} catch (OperationCanceledException) {
+				}
+			});
+		}
+
+		static uint timeoutHandler;
+
+		static void RemoveHandler ()
+		{
+			if (timeoutHandler != 0) {
+				GLib.Source.Remove (timeoutHandler); 
+				timeoutHandler = 0;
+			}
+		}
+
+		List<IUnitTestMarker> currentMarker = new List<IUnitTestMarker>();
+
+		class UnitTestMarkerHostImpl : UnitTestMarkerHost
+		{
+			readonly AbstractUnitTestTextEditorExtension ext;
+
+			public UnitTestMarkerHostImpl (AbstractUnitTestTextEditorExtension ext)
+			{
+				if (ext == null)
+					throw new ArgumentNullException (nameof (ext));
+				this.ext = ext;
+			}
+
+			#region implemented abstract members of UnitTestMarkerHost
+
+			public override Xwt.Drawing.Image GetStatusIcon (string unitTestIdentifier, string caseId = null)
+			{
+				var test = UnitTestService.SearchTestById (unitTestIdentifier + caseId);
+				if (test != null)
+					return test.StatusIcon;
+				return TestStatusIcon.None;
+			}
+
+			public override bool IsFailure (string unitTestIdentifier, string caseId = null)
+			{
+				var test = UnitTestService.SearchTestById (unitTestIdentifier + caseId);
+				if (test != null) {
+					var result = test.GetLastResult ();
+					if (result != null)
+						return result.IsFailure;
+				}
+				return false;
+			}
+
+			public override string GetMessage (string unitTestIdentifier, string caseId = null)
+			{
+				var test = UnitTestService.SearchTestById (unitTestIdentifier + caseId);
+				if (test != null) {
+					var result = test.GetLastResult ();
+					if (result != null)
+						return result.Message;
+				}
+				return null;
+			}
+
+			public override bool HasResult (string unitTestIdentifier, string caseId = null)
+			{
+				return UnitTestService.SearchTestById (unitTestIdentifier + caseId) != null;
+			}
+
+			public override void PopupContextMenu (UnitTestLocation unitTest, int x, int y)
+			{
+				var debugModeSet = Runtime.ProcessService.GetDebugExecutionMode ();
+				var project = ext?.DocumentContext?.Project;
+				if (project == null)
+					return;
+				var menu = new ContextMenu ();
+				if (unitTest.IsFixture) {
+					var menuItem = new ContextMenuItem ("_Run All");
+					menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, false).Run;
+					menu.Add (menuItem);
+					if (debugModeSet != null) {
+						menuItem = new ContextMenuItem ("_Debug All");
+						menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Run;
+						menu.Add (menuItem);
+					}
+					menuItem = new ContextMenuItem ("_Select in Test Pad");
+					menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Select;
+					menu.Add (menuItem);
+				} else {
+					if (unitTest.TestCases.Count == 0) {
+						var menuItem = new ContextMenuItem ("_Run");
+						menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, false).Run;
+						menu.Add (menuItem);
+						if (debugModeSet != null) {
+							menuItem = new ContextMenuItem ("_Debug");
+							menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Run;
+							menu.Add (menuItem);
+						}
+						menuItem = new ContextMenuItem ("_Select in Test Pad");
+						menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Select;
+						menu.Add (menuItem);
+					} else {
+						var menuItem = new ContextMenuItem ("_Run All");
+						menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, false).Run;
+						menu.Add (menuItem);
+						if (debugModeSet != null) {
+							menuItem = new ContextMenuItem ("_Debug All");
+							menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier, project, true).Run;
+							menu.Add (menuItem);
+						}
+						menu.Add (new SeparatorContextMenuItem ());
+						foreach (var id in unitTest.TestCases) {
+							var submenu = new ContextMenu ();
+							menuItem = new ContextMenuItem ("_Run");
+							menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, project, false).Run;
+							submenu.Add (menuItem);
+							if (debugModeSet != null) {
+								menuItem = new ContextMenuItem ("_Debug");
+								menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, project, true).Run;
+								submenu.Add (menuItem);
+							}
+
+							var label = "Test" + id;
+							string tooltip = null;
+							var test = UnitTestService.SearchTestById (unitTest.UnitTestIdentifier + id);
+							if (test != null) {
+								var result = test.GetLastResult ();
+								if (result != null && result.IsFailure) {
+									tooltip = result.Message;
+									label += "!";
+								}
+							}
+
+							menuItem = new ContextMenuItem ("_Select in Test Pad");
+							menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, project, true).Select;
+							submenu.Add (menuItem);
+
+							var subMenuItem = new ContextMenuItem (label);
+							// if (!string.IsNullOrEmpty (tooltip))
+							//	subMenuItem.TooltipText = tooltip;
+							subMenuItem.SubMenu  = submenu;
+							menu.Add (subMenuItem);
+						}
+					}
+				}
+				menu.Show (ext.Editor, x, y);
+			}
+
+			#endregion
+
+			class TestRunner
+			{
+				readonly string testCase;
+				readonly bool debug;
+				IBuildTarget project;
+
+				public TestRunner (string testCase, IBuildTarget project, bool debug)
+				{
+					this.testCase = testCase;
+					this.debug = debug;
+					this.project = project;
+				}
+
+				bool TimeoutHandler ()
+				{
+					var test = UnitTestService.SearchTestById (testCase);
+					if (test != null) {
+						RunTest (test); 
+						timeoutHandler = 0;
+					} else {
+						return true;
+					}
+					return false;
+				}
+
+				internal async void Run (object sender, EventArgs e)
+				{
+					if (IdeApp.ProjectOperations.IsBuilding (IdeApp.ProjectOperations.CurrentSelectedSolution) || 
+						IdeApp.ProjectOperations.IsRunning (IdeApp.ProjectOperations.CurrentSelectedSolution))
+						return;
+
+					var foundTest = UnitTestService.SearchTestById (testCase);
+					if (foundTest != null) {
+						RunTest (foundTest);
+						return;
+					}
+
+					await IdeApp.ProjectOperations.Build (project).Task;
+					await UnitTestService.RefreshTests (CancellationToken.None);
+
+					foundTest = UnitTestService.SearchTestById (testCase);
+					if (foundTest != null)
+						RunTest (foundTest);
+				}
+
+				internal void Select (object sender, EventArgs e)
+				{
+					var test = UnitTestService.SearchTestById (testCase);
+					if (test == null)
+						return;
+					UnitTestService.CurrentSelectedTest = test;
+				}
+
+				void RunTest (UnitTest test)
+				{
+					var debugModeSet = Runtime.ProcessService.GetDebugExecutionMode ();
+					Core.Execution.IExecutionHandler ctx = null;
+					if (debug && debugModeSet != null) {
+						foreach (var executionMode in debugModeSet.ExecutionModes) {
+							if (test.CanRun (executionMode.ExecutionHandler)) {
+								ctx = executionMode.ExecutionHandler;
+								break;
+							}
+						}
+					}
+					// NUnitService.Instance.RunTest (test, ctx);
+					var pad = IdeApp.Workbench.GetPad<TestPad> ();
+					var content = (TestPad)pad.Content;
+					content.RunTest (test, ctx);
+				}
+			}
+		}
+	}
+
+	/// <summary>
+	/// Markers that can be used to identify a method as a unit test
+	/// </summary>
+	public interface IUnitTestMarkers
+	{
+		/// <summary>
+		/// Type of attribute that a method needs to have to be considered to be a test method
+		/// </summary>
+		/// <value>The test method attribute marker.</value>
+		string TestMethodAttributeMarker { get; }
+
+		/// <summary>
+		/// Type of attribute that describes a test case for a test method. It has to be applied to a test method.
+		/// </summary>
+		/// <value>The test method attribute marker.</value>
+		string TestCaseMethodAttributeMarker { get; }
+
+		/// <summary>
+		/// Type of attribute used to mark a test method to be ignored
+		/// </summary>
+		/// <value>The ignore test method attribute marker.</value>
+		string IgnoreTestMethodAttributeMarker { get; }
+
+		/// <summary>
+		/// Type of attribute used to mark a test class to be ignored
+		/// </summary>
+		/// <value>The ignore test method attribute marker.</value>
+		string IgnoreTestClassAttributeMarker { get; }
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/BinaryResultsStore.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/BinaryResultsStore.cs
new file mode 100644
index 0000000000..292ad8d687
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/BinaryResultsStore.cs
@@ -0,0 +1,98 @@
+//
+// BinaryResultsStore.cs
+//
+// Author:
+//       Sergey Khabibullin <sergey@khabibullin.com>
+//
+// Copyright (c) 2014 Sergey Khabibullin
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Xml.Serialization;
+using System.IO;
+using ICSharpCode.NRefactory.Utils;
+
+namespace MonoDevelop.UnitTesting
+{
+	/// <summary>
+	/// ResultsStore implementation that uses binary serializer
+	/// </summary>
+	public class BinaryResultsStore : AbstractResultsStore
+	{
+		static BinaryResultsStoreSerializer serializer = new BinaryResultsStoreSerializer();
+
+		public BinaryResultsStore (string directory, string storeId)
+			: base(serializer, directory, storeId)
+		{
+		}
+	}
+
+	/// <summary>
+	/// Serializer implementation that uses ICSharpCode.NRefactory.Utils.FastSerializer
+	/// as it's main method to serialize test records. The serializer is backward compatible
+	/// with the old xml-based serialization and will deserialize test record from xml
+	/// if the binary form is not yet present.
+	/// </summary>
+	public class BinaryResultsStoreSerializer : IResultsStoreSerializer
+	{
+		const string binaryExtension = ".test-result";
+		const string xmlExtension = ".xml";
+
+		FastSerializer fastSerializer = new FastSerializer();
+		XmlSerializer xmlSerializer = new XmlSerializer(typeof(TestRecord));
+
+		public void Serialize (string xmlFilePath, TestRecord testRecord)
+		{
+			// no need for xml serialization because next time it will be
+			// deserialized from the binary format
+			string binaryFilePath = GetBinaryFilePath (xmlFilePath);
+			using (var stream = File.OpenWrite(binaryFilePath)) {
+				fastSerializer.Serialize (stream, testRecord);
+			}
+		}
+
+		public TestRecord Deserialize (string xmlFilePath)
+		{
+			string binaryFilePath = GetBinaryFilePath (xmlFilePath);
+
+			// deserialize from the binary format if the file exists
+			if (File.Exists(binaryFilePath)) {
+				using (var stream = File.OpenRead (binaryFilePath)) {
+					return (TestRecord) fastSerializer.Deserialize (stream);
+				}
+			}
+
+			// deserialize from xml if the file exists
+			if (File.Exists(xmlFilePath)) {
+				using (var reader = new StreamReader (xmlFilePath)) {
+					return (TestRecord) xmlSerializer.Deserialize (reader);
+				}
+			}
+
+			return null;
+		}
+
+		string GetBinaryFilePath(string xmlFilePath)
+		{
+			// filename with the binary extension
+			return xmlFilePath.Substring (0, xmlFilePath.Length - xmlExtension.Length) + binaryExtension;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/GeneralTestOptions.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/GeneralTestOptions.cs
new file mode 100644
index 0000000000..97b6171714
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/GeneralTestOptions.cs
@@ -0,0 +1,43 @@
+//
+// GeneralTestOptions.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using System.Collections;
+
+namespace MonoDevelop.UnitTesting
+{
+	public class GeneralTestOptions: ICloneable
+	{
+		public object Clone ()
+		{
+			return new GeneralTestOptions ();
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/IResultsStore.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/IResultsStore.cs
new file mode 100644
index 0000000000..6afb5c4d53
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/IResultsStore.cs
@@ -0,0 +1,46 @@
+//
+// IResultsStore.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace MonoDevelop.UnitTesting
+{
+	public interface IResultsStore
+	{
+		void RegisterResult (string configuration, UnitTest test, UnitTestResult result);
+		
+		UnitTestResult GetLastResult (string configuration, UnitTest test, DateTime date);
+		UnitTestResult GetNextResult (string configuration, UnitTest test, DateTime date);
+		UnitTestResult GetPreviousResult (string configuration, UnitTest test, DateTime date);
+		UnitTestResult[] GetResults (string configuration, UnitTest test, DateTime startDate, DateTime endDate);
+		UnitTestResult[] GetResultsToDate (string configuration, UnitTest test, DateTime endDate, int count);
+		
+		void Save ();
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/ITestProgressMonitor.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/ITestProgressMonitor.cs
new file mode 100644
index 0000000000..653461811d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/ITestProgressMonitor.cs
@@ -0,0 +1,45 @@
+//
+// ITestProgressMonitor.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Threading;
+
+namespace MonoDevelop.UnitTesting
+{
+	public interface ITestProgressMonitor
+	{
+		void BeginTest (UnitTest test);
+		void EndTest (UnitTest test, UnitTestResult result);
+		void ReportRuntimeError (string message, Exception exception);
+		void WriteGlobalLog (string message);
+		CancellationToken CancellationToken { get; }
+	}
+	
+	public delegate void TestHandler ();
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/ITestProvider.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/ITestProvider.cs
new file mode 100644
index 0000000000..c503f70ca5
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/ITestProvider.cs
@@ -0,0 +1,40 @@
+//
+// ITestProvider.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.UnitTesting
+{
+	public interface ITestProvider: IDisposable
+	{
+		UnitTest CreateUnitTest (WorkspaceObject entry);
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/NUnitSourceCodeLocationFinder.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/NUnitSourceCodeLocationFinder.cs
new file mode 100644
index 0000000000..02dc515ce3
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/NUnitSourceCodeLocationFinder.cs
@@ -0,0 +1,70 @@
+//
+// NUnitSourceCodeLocationFinder.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Threading.Tasks;
+using System.Threading;
+using Mono.Addins;
+using System.Collections.Generic;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.UnitTesting
+{
+	public abstract class NUnitSourceCodeLocationFinder
+	{
+		static List<NUnitSourceCodeLocationFinder> locationFinder = new List<NUnitSourceCodeLocationFinder> ();
+
+		static NUnitSourceCodeLocationFinder ()
+		{
+			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/UnitTesting/NUnitSourceCodeLocationFinder", delegate(object sender, ExtensionNodeEventArgs args) {
+				var provider  = (NUnitSourceCodeLocationFinder) args.ExtensionObject;
+				switch (args.Change) {
+				case ExtensionChange.Add:
+					locationFinder.Add (provider);
+					break;
+				case ExtensionChange.Remove:
+					locationFinder.Remove (provider);
+					break;
+				}
+			});
+		}
+
+		public static async Task<SourceCodeLocation> TryGetSourceCodeLocationAsync (Project project, string fixtureTypeNamespace, string fixtureTypeName, string testName, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			foreach (var finder in locationFinder) {
+				var result = await finder.GetSourceCodeLocationAsync (project, fixtureTypeNamespace, fixtureTypeName, testName, cancellationToken).ConfigureAwait (false);
+				if (result != null)
+					return result;
+			}
+			return null;
+		}
+
+
+		public abstract Task<SourceCodeLocation> GetSourceCodeLocationAsync (Project project, string fixtureTypeNamespace, string fixtureTypeName, string testName, CancellationToken cancellationToken = default(CancellationToken));
+
+
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/RemoteUnhandledException.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/RemoteUnhandledException.cs
new file mode 100644
index 0000000000..64a4accb5a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/RemoteUnhandledException.cs
@@ -0,0 +1,81 @@
+//
+// RemoteUnhandledException.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Reflection;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using System.Text;
+
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
+
+namespace MonoDevelop.UnitTesting
+{
+
+	/// <summary>
+	/// Exception class that can be serialized
+	/// </summary>
+	public class RemoteUnhandledException: Exception
+	{
+		string stack;
+
+		public RemoteUnhandledException (string exceptionName, string message, string stack): base (message)
+		{
+			RemoteExceptionName = exceptionName;
+			this.stack = stack;
+		}
+
+		public RemoteUnhandledException (Exception ex): base (ex.Message)
+		{
+			RemoteExceptionName = ex.GetType().Name;
+			this.stack = ex.StackTrace;
+		}
+
+		public string Serialize ()
+		{
+			return RemoteExceptionName + "\n" + Message.Replace ('\r',' ').Replace ('\n',' ') + "\n" + StackTrace;
+		}
+
+		public static RemoteUnhandledException Parse (string s)
+		{
+			int i = s.IndexOf ('\n');
+			string name = s.Substring (0, i++);
+			int i2 = s.IndexOf ('\n', i);
+			return new RemoteUnhandledException (name, s.Substring (i, i2 - i), s.Substring (i2 + 1));
+		}
+
+		public string RemoteExceptionName { get; set; }
+
+		public override string StackTrace {
+			get {
+				return stack;
+			}
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs
new file mode 100644
index 0000000000..5346301540
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs
@@ -0,0 +1,96 @@
+//
+// CombineTestGroup.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+using System.Collections;
+using MonoDevelop.Core;
+using MonoDevelop.Projects;
+
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
+
+namespace MonoDevelop.UnitTesting
+{
+	public class SolutionFolderTestGroup: UnitTestGroup
+	{
+		SolutionFolder folder;
+		
+		public SolutionFolderTestGroup (SolutionFolder c): base (c.Name, c)
+		{
+			string storeId = c.ItemId;
+			string resultsPath = UnitTestService.GetTestResultsDirectory (c.BaseDirectory);
+			ResultsStore = new BinaryResultsStore (resultsPath, storeId);
+			
+			folder = c;
+			folder.NameChanged += OnCombineRenamed;
+
+			if (c.IsRoot) {
+				folder.ParentSolution.SolutionItemAdded += OnEntryChanged;
+				folder.ParentSolution.SolutionItemRemoved += OnEntryChanged;
+			}
+		}
+		
+		public static SolutionFolderTestGroup CreateTest (SolutionFolder c)
+		{
+			return new SolutionFolderTestGroup (c);
+		}
+		
+		public override void Dispose ()
+		{
+			folder.NameChanged -= OnCombineRenamed;
+			if (folder.IsRoot) {
+				folder.ParentSolution.SolutionItemAdded -= OnEntryChanged;
+				folder.ParentSolution.SolutionItemRemoved -= OnEntryChanged;
+			}
+			base.Dispose ();
+		}
+
+		void OnEntryChanged (object sender, SolutionItemEventArgs e)
+		{
+			UpdateTests ();
+		}
+		
+		void OnCombineRenamed (object sender, SolutionItemRenamedEventArgs e)
+		{
+			UnitTestGroup parent = Parent as UnitTestGroup;
+			if (parent != null)
+				parent.UpdateTests ();
+		}
+		
+		protected override void OnCreateTests ()
+		{
+			foreach (SolutionFolderItem e in folder.Items) {
+				UnitTest t = UnitTestService.BuildTest (e);
+				if (t != null)
+					Tests.Add (t);
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/SystemTestProvider.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/SystemTestProvider.cs
new file mode 100644
index 0000000000..d59e90f281
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/SystemTestProvider.cs
@@ -0,0 +1,61 @@
+//
+// SystemTestProvider.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.UnitTesting
+{
+	class SystemTestProvider: ITestProvider
+	{
+		public UnitTest CreateUnitTest (WorkspaceObject entry)
+		{
+			UnitTest test = null;
+			
+			if (entry is SolutionFolder)
+				test = SolutionFolderTestGroup.CreateTest ((SolutionFolder)entry);
+			if (entry is Solution)
+				test = SolutionFolderTestGroup.CreateTest (((Solution)entry).RootFolder);
+			if (entry is Workspace)
+				test = WorkspaceTestGroup.CreateTest ((Workspace)entry);
+			
+			UnitTestGroup grp = test as UnitTestGroup;
+			if (grp != null && !grp.HasTests) {
+				test.Dispose ();
+				return null;
+			}
+			
+			return test;
+		}
+
+		public void Dispose ()
+		{
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/TestContext.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/TestContext.cs
new file mode 100644
index 0000000000..2f6dfadaff
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/TestContext.cs
@@ -0,0 +1,73 @@
+//
+// TestContext.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
+using MonoDevelop.Ide;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.UnitTesting
+{
+	public class TestContext
+	{
+		ITestProgressMonitor monitor;
+		DateTime testDate;
+		object contextData;
+		MonoDevelop.Projects.ExecutionContext executionContext;
+
+		internal TestContext (ITestProgressMonitor monitor, TestResultsPad resultsPad, MonoDevelop.Projects.ExecutionContext executionContext, DateTime testDate)
+		{
+			this.monitor = monitor;
+			if (executionContext == null)
+				executionContext = new ExecutionContext (Runtime.ProcessService.DefaultExecutionHandler, IdeApp.Workbench.ProgressMonitors.ConsoleFactory, null);
+			this.executionContext = executionContext;
+			// Round to seconds
+			this.testDate = new DateTime ((testDate.Ticks / TimeSpan.TicksPerSecond) * TimeSpan.TicksPerSecond);
+		}
+		
+		public ITestProgressMonitor Monitor {
+			get { return monitor; }
+		}
+		
+		public DateTime TestDate {
+			get { return testDate; }
+		}
+		
+		public object ContextData {
+			get { return contextData; }
+			set { contextData = value; }
+		}
+		
+		public ExecutionContext ExecutionContext {
+			get { return executionContext; }
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTest.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTest.cs
new file mode 100644
index 0000000000..c19796d5cb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTest.cs
@@ -0,0 +1,453 @@
+//
+// UnitTest.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using System.Collections;
+using MonoDevelop.Core;
+using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Projects;
+using MonoDevelop.Core.Serialization;
+using MonoDevelop.Core.Execution;
+using MonoDevelop.Ide;
+using System.Threading.Tasks;
+using System.Threading;
+
+namespace MonoDevelop.UnitTesting
+{
+	public abstract class UnitTest: IDisposable
+	{
+		string name;
+		IResultsStore resultsStore;
+		UnitTestResult lastResult;
+		UnitTest parent;
+		TestStatus status;
+		WorkspaceObject ownerSolutionItem;
+		SolutionItem ownerSolutionEntityItem;
+		UnitTestResultsStore results;
+		bool historicResult;
+		bool resultLoaded;
+		
+		public string FixtureTypeNamespace {
+			get;
+			set;
+		}
+		
+		public string FixtureTypeName {
+			get;
+			set;
+		}
+
+		public bool IsExplicit {
+			get;
+			set;
+		}
+
+		protected UnitTest (string name)
+		{
+			this.name = name;
+		}
+		
+		protected UnitTest (string name, WorkspaceObject ownerSolutionItem)
+		{
+			this.name = name;
+			this.ownerSolutionItem = ownerSolutionItem;
+			ownerSolutionEntityItem = ownerSolutionItem as SolutionItem;
+			if (ownerSolutionEntityItem != null)
+				ownerSolutionEntityItem.DefaultConfigurationChanged += OnConfugurationChanged;
+		}
+		
+		public virtual void Dispose ()
+		{
+			if (ownerSolutionEntityItem != null)
+				ownerSolutionEntityItem.DefaultConfigurationChanged -= OnConfugurationChanged;
+		}
+		
+		internal void SetParent (UnitTest t)
+		{
+			parent = t;
+		}
+		
+		public virtual string ActiveConfiguration {
+			get {
+				if (ownerSolutionEntityItem != null) {
+					if (ownerSolutionEntityItem.DefaultConfiguration == null)
+						return "";
+					return ownerSolutionEntityItem.DefaultConfiguration.Id;
+				} else if (Parent != null) {
+					return Parent.ActiveConfiguration;
+				} else {
+					return "default";
+				}
+			}
+		}
+		
+		public virtual string[] GetConfigurations ()
+		{
+			if (ownerSolutionEntityItem != null) {
+				string[] res = new string [ownerSolutionEntityItem.Configurations.Count];
+				for (int n=0; n<ownerSolutionEntityItem.Configurations.Count; n++)
+					res [n] = ownerSolutionEntityItem.Configurations [n].Id;
+				return res;
+			} else if (Parent != null) {
+				return Parent.GetConfigurations ();
+			} else {
+				return new string [] { "default" };
+			}
+		}
+
+		public UnitTestResultsStore Results {
+			get {
+				if (results == null) {
+					results = new UnitTestResultsStore (this, GetResultsStore ());
+				}
+				return results;
+			}
+		}
+		
+		public UnitTestResult GetLastResult ()
+		{
+			if (!resultLoaded) {
+				resultLoaded = true;
+				lastResult = Results.GetLastResult (DateTime.Now);
+				if (lastResult != null)
+					historicResult = true;
+			}
+			return lastResult;
+		}
+		
+		public void ResetLastResult ()
+		{
+			historicResult = true;
+			OnTestStatusChanged ();
+		}
+
+		public bool IsHistoricResult {
+			get { return historicResult; }
+		}
+		
+		public UnitTestCollection GetRegressions (DateTime fromDate, DateTime toDate)
+		{
+			UnitTestCollection list = new UnitTestCollection ();
+			FindRegressions (list, fromDate, toDate);
+			return list;
+		}
+		
+		public virtual int CountTestCases ()
+		{
+			return 1;
+		}
+		
+		public virtual SourceCodeLocation SourceCodeLocation {
+			get { return null; }
+		}
+		
+		public UnitTest Parent {
+			get { return parent; }
+		}
+		
+		public UnitTest RootTest {
+			get {
+				if (parent != null)
+					return parent.RootTest;
+				else
+					return this;
+			}
+		}
+		
+		public virtual string Name {
+			get { return name; }
+		}
+		
+		public virtual string Title {
+			get { return Name; }
+		}
+		
+		public TestStatus Status {
+			get { return status; }
+			set {
+				status = value;
+				OnTestStatusChanged ();
+			}
+		}
+
+		public Xwt.Drawing.Image StatusIcon {
+			get {
+				if (Status == TestStatus.Running) {
+					return TestStatusIcon.Running;
+				} else if (Status == TestStatus.Loading) {
+					return TestStatusIcon.Loading;
+				} else if (Status == TestStatus.LoadError) {
+					return TestStatusIcon.Failure;
+				} else {
+					UnitTestResult res = GetLastResult ();
+					if (res == null)
+						return TestStatusIcon.None;
+					else if (res.Status == ResultStatus.Ignored)
+						return TestStatusIcon.NotRun;
+					else if (res.ErrorsAndFailures > 0 && res.Passed > 0)
+						return IsHistoricResult ? TestStatusIcon.OldSuccessAndFailure : TestStatusIcon.SuccessAndFailure;
+					else if (res.IsInconclusive)
+						return IsHistoricResult ? TestStatusIcon.OldInconclusive : TestStatusIcon.Inconclusive;
+					else if (res.IsFailure)
+						return IsHistoricResult ? TestStatusIcon.OldFailure : TestStatusIcon.Failure;
+					else if (res.IsSuccess)
+						return IsHistoricResult ? TestStatusIcon.OldSuccess : TestStatusIcon.Success;
+					else if (res.IsNotRun || res.Ignored > 0)
+						return TestStatusIcon.NotRun;
+					else
+						return TestStatusIcon.None;
+				}
+			}
+		}
+
+		public string TestId {
+			get;
+			protected set;
+		}
+		
+		public string FullName {
+			get {
+				if (parent != null)
+					return parent.FullName + "." + Name;
+				else
+					return Name;
+			}
+		}
+		
+		protected WorkspaceObject OwnerSolutionItem {
+			get { return ownerSolutionItem; }
+		}
+		
+		public WorkspaceObject OwnerObject {
+			get {
+				if (ownerSolutionItem != null)
+					return ownerSolutionItem;
+				else if (parent != null)
+					return parent.OwnerObject;
+				else
+					return null;
+			}
+		}
+		
+		internal string StoreRelativeName {
+			get {
+				if (resultsStore != null || Parent == null)
+					return "";
+				else if (Parent.resultsStore != null)
+					return Name;
+				else
+					return Parent.StoreRelativeName + "." + Name;
+			}
+		}
+		
+		// Forces the reloading of tests, if they have changed
+		public virtual Task Refresh (CancellationToken ct)
+		{
+			return Task.FromResult (0);
+		}
+		
+		public UnitTestResult Run (TestContext testContext)
+		{
+			testContext.Monitor.BeginTest (this);
+			UnitTestResult res = null;
+			object ctx = testContext.ContextData;
+			
+			try {
+				Status = TestStatus.Running;
+				res = OnRun (testContext);
+			} catch (Exception ex) {
+				res = UnitTestResult.CreateFailure (ex);
+			} finally {
+				Status = TestStatus.Ready;
+				testContext.Monitor.EndTest (this, res);
+			}
+			RegisterResult (testContext, res);
+			testContext.ContextData = ctx;
+			return res;
+		}
+		
+		public bool CanRun (IExecutionHandler executionContext)
+		{
+			if (executionContext == null)
+				executionContext = Runtime.ProcessService.DefaultExecutionHandler;
+			return OnCanRun (executionContext);
+		}
+		
+		protected abstract UnitTestResult OnRun (TestContext testContext);
+		
+		protected virtual bool OnCanRun (IExecutionHandler executionContext)
+		{
+			return true;
+		}
+
+		bool building;
+
+		/// <summary>
+		/// Builds the project that contains this unit test or group of unit tests.
+		/// It returns when the project has been built and the tests have been updated. 
+		/// </summary>
+		public Task Build ()
+		{
+			return OnBuild ();
+		}
+
+		protected virtual Task OnBuild ()
+		{
+			if (parent != null)
+				return parent.Build ();
+			return Task.FromResult (true);
+		}
+		
+		public void RegisterResult (TestContext context, UnitTestResult result)
+		{
+			// Avoid registering results twice
+			if (lastResult != null && lastResult.TestDate == context.TestDate)
+				return;
+
+			result.TestDate = context.TestDate;
+//			if ((int)result.Status == 0)
+//				result.Status = ResultStatus.Ignored;
+
+			lastResult = result;
+			historicResult = false;
+			resultLoaded = true;
+
+			IResultsStore store = GetResultsStore ();
+			if (store != null)
+				store.RegisterResult (ActiveConfiguration, this, result);
+			OnTestStatusChanged ();
+		}
+		
+		IResultsStore GetResultsStore ()
+		{
+			if (resultsStore != null)
+				return resultsStore;
+			if (Parent != null)
+				return Parent.GetResultsStore ();
+			else
+				return null;
+		}
+		
+		protected IResultsStore ResultsStore {
+			get { return resultsStore; }
+			set { resultsStore = value; }
+		}
+		
+		public virtual void SaveResults ()
+		{
+			IResultsStore store = GetResultsStore ();
+			if (store != null)
+				store.Save ();
+		}
+		
+		internal virtual void FindRegressions (UnitTestCollection list, DateTime fromDate, DateTime toDate)
+		{
+			UnitTestResult res1 = Results.GetLastResult (fromDate);
+			UnitTestResult res2 = Results.GetLastResult (toDate);
+			if ((res1 == null || res1.IsSuccess) && (res2 != null && !res2.IsSuccess))
+				list.Add (this);
+		}
+
+		void GetOwnerSolutionItem (UnitTest t, out IConfigurationTarget c, out string path)
+		{
+			if (OwnerSolutionItem is SolutionItem) {
+				c = OwnerSolutionItem as SolutionItem;
+				path = "";
+			} else if (parent != null) {
+				parent.GetOwnerSolutionItem (t, out c, out path);
+				if (c == null) return;
+				if (path.Length > 0)
+					path += "/" + t.Name;
+				else
+					path = t.Name;
+			} else {
+				c = null;
+				path = null;
+			}
+		}
+		
+		void OnConfugurationChanged (object ob, ConfigurationEventArgs args)
+		{
+			OnActiveConfigurationChanged ();
+		}
+		
+		protected virtual void OnActiveConfigurationChanged ()
+		{
+			OnTestChanged ();
+		}
+		
+		protected virtual void OnTestChanged ()
+		{
+			Gtk.Application.Invoke (delegate {
+				// Run asynchronously in the UI thread
+				if (TestChanged != null)
+					TestChanged (this, EventArgs.Empty);
+			});
+		}
+		
+		protected virtual void OnTestStatusChanged ()
+		{
+			Gtk.Application.Invoke (delegate {
+				// Run asynchronously in the UI thread
+				if (TestStatusChanged != null)
+					TestStatusChanged (this, EventArgs.Empty);
+			});
+		}
+		
+		public event EventHandler TestChanged;
+		public event EventHandler TestStatusChanged;
+	}
+	
+	public class SourceCodeLocation
+	{
+		string fileName;
+		int line;
+		int column;
+		
+		public SourceCodeLocation (string fileName, int line, int column)
+		{
+			this.fileName = fileName;
+			this.line = line;
+			this.column = column;
+		}
+		
+		public string FileName {
+			get { return fileName; }
+		}
+		
+		public int Line {
+			get { return line; }
+		}
+		
+		public int Column {
+			get { return column; }
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestCollection.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestCollection.cs
new file mode 100644
index 0000000000..8a004ad81d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestCollection.cs
@@ -0,0 +1,91 @@
+//
+// UnitTestCollection.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace MonoDevelop.UnitTesting
+{
+	public class UnitTestCollection: Collection<UnitTest>
+	{
+		UnitTest owner;
+		
+		internal UnitTestCollection (UnitTest owner)
+		{
+			this.owner = owner;
+		}
+		
+		public UnitTestCollection ()
+		{
+		}
+		
+		public UnitTest this [string name] {
+			get {
+				for (int n=0; n<Items.Count; n++)
+					if (Items [n].Name == name)
+						return Items [n];
+				return null;
+			}
+		}
+		
+		protected override void SetItem (int index, UnitTest item)
+		{
+			if (owner != null)
+				this[index].SetParent (null);
+			base.SetItem (index, item);
+			if (owner != null)
+				item.SetParent (owner);
+		}
+		
+		protected override void RemoveItem (int index)
+		{
+			if (owner != null)
+				this [index].SetParent (null);
+			base.RemoveItem(index);
+		}
+
+		protected override void InsertItem (int index, UnitTest item)
+		{
+			base.InsertItem(index, item);
+			if (owner != null)
+				item.SetParent (owner);
+		}
+
+		protected override void ClearItems ()
+		{
+			if (owner != null) {
+				foreach (UnitTest t in this)
+					t.SetParent (null);
+			}
+			base.ClearItems();
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestGroup.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestGroup.cs
new file mode 100644
index 0000000000..037499cfdc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestGroup.cs
@@ -0,0 +1,197 @@
+//
+// UnitTestGroup.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using MonoDevelop.Core;
+using MonoDevelop.Core.ProgressMonitoring;
+using System.Collections;
+using MonoDevelop.Projects;
+using System.Threading.Tasks;
+using System.Threading;
+
+namespace MonoDevelop.UnitTesting
+{
+	public class UnitTestGroup: UnitTest
+	{
+		UnitTestCollection tests;
+		
+		public UnitTestGroup (string name): base (name)
+		{
+		}
+		
+		protected UnitTestGroup (string name, WorkspaceObject ownerSolutionItem): base (name, ownerSolutionItem)
+		{
+		}
+		
+		public virtual bool HasTests {
+			get {
+				foreach (UnitTest t in Tests) {
+					if (t is UnitTestGroup) {
+						if (((UnitTestGroup)t).HasTests)
+							return true;
+					} else
+						return true;
+				}
+				return false;
+			}
+		}
+		
+		public UnitTestCollection Tests {
+			get {
+				if (tests == null) {
+					tests = new UnitTestCollection (this);
+					OnCreateTests ();
+				}
+				return tests;
+			}
+		}
+		
+		public UnitTestCollection GetFailedTests (DateTime date)
+		{
+			UnitTestCollection col = new UnitTestCollection ();
+			CollectFailedTests (col, date);
+			return col;
+		}
+		
+		void CollectFailedTests (UnitTestCollection col, DateTime date)
+		{
+			foreach (UnitTest t in Tests) {
+				if (t is UnitTestGroup)
+					((UnitTestGroup)t).CollectFailedTests (col, date);
+				else {
+					UnitTestResult res = t.Results.GetLastResult (date);
+					if (res != null && res.IsFailure)
+						col.Add (t);
+				}
+			}
+		}
+		
+		public void UpdateTests ()
+		{
+			if (tests != null) {
+				foreach (UnitTest t in tests)
+					t.Dispose ();
+				tests = null;
+				OnTestChanged ();
+			}
+		}
+		
+		public override void SaveResults ()
+		{
+			base.SaveResults ();
+			if (tests != null) {
+				foreach (UnitTest t in tests)
+					t.SaveResults ();
+			}
+		}
+		
+		
+		public override int CountTestCases ()
+		{
+			int total = 0;
+			foreach (UnitTest t in Tests)
+				total += t.CountTestCases ();
+			return total;
+		}
+		
+		protected virtual void OnCreateTests ()
+		{
+		}
+		
+		public async override Task Refresh (CancellationToken ct)
+		{
+			foreach (UnitTest t in Tests)
+				await t.Refresh (ct);
+		}
+		
+		protected override UnitTestResult OnRun (TestContext testContext)
+		{
+			UnitTestResult tres = new UnitTestResult ();
+			OnBeginTest (testContext);
+			
+			try {
+				foreach (UnitTest t in Tests) {
+					if (t.IsExplicit)
+						continue;
+					UnitTestResult res;
+					try {
+						res = OnRunChildTest (t, testContext);
+						if (testContext.Monitor.CancellationToken.IsCancellationRequested)
+							break;
+					} catch (Exception ex) {
+						res = UnitTestResult.CreateFailure (ex);
+					}
+					tres.Add (res);
+				}
+			} finally {
+				OnEndTest (testContext);
+			}
+			return tres;
+		}
+		
+		protected override bool OnCanRun (MonoDevelop.Core.Execution.IExecutionHandler executionContext)
+		{
+			foreach (UnitTest t in Tests)
+				if (!t.CanRun (executionContext))
+					return false;
+			return true;
+		}
+
+		
+		protected virtual void OnBeginTest (TestContext testContext)
+		{
+		}
+		
+		protected virtual UnitTestResult OnRunChildTest (UnitTest test, TestContext testContext)
+		{
+			return test.Run (testContext);
+		}
+		
+		protected virtual void OnEndTest (TestContext testContext)
+		{
+		}
+		
+		internal override void FindRegressions (UnitTestCollection list, DateTime fromDate, DateTime toDate)
+		{
+			foreach (UnitTest test in Tests)
+				test.FindRegressions (list, fromDate, toDate);
+		}
+		
+		public override void Dispose ()
+		{
+			base.Dispose ();
+
+			if (tests != null) {
+				foreach (UnitTest t in tests)
+					t.Dispose ();
+			}
+		}
+		
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestMarkersExtension.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestMarkersExtension.cs
new file mode 100644
index 0000000000..530bc19deb
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestMarkersExtension.cs
@@ -0,0 +1,50 @@
+//
+// UnitTestMarkersExtension.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2016 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using Mono.Addins;
+
+namespace MonoDevelop.UnitTesting
+{
+	class UnitTestMarkersExtension: ExtensionNode, IUnitTestMarkers
+	{
+		[NodeAttribute ("testMethodAttributeMarker")]
+		public string TestMethodAttributeMarker { get; set; }
+
+		[NodeAttribute ("testCaseMethodAttributeMarker")]
+		public string TestCaseMethodAttributeMarker { get; set; }
+
+		[NodeAttribute ("ignoreTestMethodAttributeMarker")]
+		public string IgnoreTestMethodAttributeMarker { get; set; }
+
+		[NodeAttribute ("ignoreTestClassAttributeMarker")]
+		public string IgnoreTestClassAttributeMarker { get; set; }
+
+		public UnitTestMarkersExtension ()
+		{
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestProjectServiceExtension.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestProjectServiceExtension.cs
new file mode 100644
index 0000000000..ed258d9b9a
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestProjectServiceExtension.cs
@@ -0,0 +1,131 @@
+// NUnitProjectServiceExtension.cs
+//
+// Author:
+//   Lluis Sanchez Gual <lluis@novell.com>
+//
+// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+//
+
+using MonoDevelop.Core;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide;
+using System.Threading.Tasks;
+using System.Threading;
+using System.Runtime.InteropServices;
+
+namespace MonoDevelop.UnitTesting
+{
+	public class UnitTestProjectServiceExtension: ProjectExtension
+	{
+		bool checkingCanExecute;
+		object canExecuteCheckLock = new object ();
+
+		bool unitTestChecked;
+		UnitTest unitTestFound;
+
+		protected override bool SupportsObject (WorkspaceObject item)
+		{
+			return IdeApp.IsInitialized && base.SupportsObject (item);
+		}
+
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+			if (IdeApp.IsInitialized)
+				UnitTestService.TestSuiteChanged += TestSuiteChanged;
+		}
+
+		public override void Dispose ()
+		{
+			base.Dispose ();
+			if (IdeApp.IsInitialized)
+				UnitTestService.TestSuiteChanged -= TestSuiteChanged;
+		}
+
+		void TestSuiteChanged (object sender, System.EventArgs e)
+		{
+			unitTestChecked = false;
+			unitTestFound = null;
+		}
+
+		UnitTest FindRootTest ()
+		{
+			if (!unitTestChecked) {
+				unitTestFound = UnitTestService.FindRootTest (Project);
+				unitTestChecked = true;
+			}
+			return unitTestFound;
+		}
+
+		protected override async Task OnExecute (MonoDevelop.Core.ProgressMonitor monitor, MonoDevelop.Projects.ExecutionContext context, ConfigurationSelector configuration)
+		{
+			bool defaultCanExecute;
+
+			lock (canExecuteCheckLock) {
+				try {
+					checkingCanExecute = true;
+					defaultCanExecute = Project.CanExecute (context, configuration);
+				} finally {
+					checkingCanExecute = false;
+				}
+			}
+			if (defaultCanExecute) {
+				// It is executable by default
+				await base.OnExecute (monitor, context, configuration);
+				return;
+			}
+			UnitTest test = FindRootTest ();
+			if (test != null) {
+				var cs = new CancellationTokenSource ();
+				using (monitor.CancellationToken.Register (cs.Cancel))
+					await UnitTestService.RunTest (test, context, false, false, cs);
+			}
+		}
+
+		protected override ProjectFeatures OnGetSupportedFeatures ()
+		{
+			var sf = base.OnGetSupportedFeatures ();
+			if (!sf.HasFlag (ProjectFeatures.Execute)) {
+				// Unit test projects support execution
+				UnitTest test = FindRootTest ();
+				if (test != null)
+					sf |= ProjectFeatures.Execute;
+			}
+			return sf;
+		}
+		
+		protected override bool OnGetCanExecute (MonoDevelop.Projects.ExecutionContext context, ConfigurationSelector configuration)
+		{
+			// We check for DefaultExecutionHandlerFactory because the tests can't run using any other execution mode
+			
+			var res = base.OnGetCanExecute (context, configuration);
+			lock (canExecuteCheckLock) {
+				if (checkingCanExecute)
+					return res;
+			}
+			if (res)
+				return true;
+			UnitTest test = FindRootTest ();
+			return (test != null) && test.CanRun (context.ExecutionHandler);
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResult.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResult.cs
new file mode 100644
index 0000000000..f20f1e19fc
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResult.cs
@@ -0,0 +1,226 @@
+//
+// UnitTestResult.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Xml.Serialization;
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+namespace MonoDevelop.UnitTesting
+{
+	[Serializable]
+	public class UnitTestResult
+	{
+		DateTime testDate;
+		ResultStatus status;
+		TimeSpan time;
+		string message;
+		string output;
+		string stackTrace;
+		string cerror;
+		
+		public UnitTestResult ()
+		{
+		}
+		
+		public static UnitTestResult CreateFailure (Exception ex)
+		{
+			UnitTestResult res = new UnitTestResult ();
+			res.status = ResultStatus.Failure;
+			res.Message = ex.Message;
+			res.stackTrace = ex.StackTrace;
+			return res;
+		}
+		
+		public static UnitTestResult CreateFailure (string message, Exception ex)
+		{
+			UnitTestResult res = new UnitTestResult ();
+			res.status = ResultStatus.Failure;
+			res.Message = message;
+			if (ex != null)
+				res.stackTrace = ex.Message + "\n" + ex.StackTrace;
+			return res;
+		}
+		
+		public static UnitTestResult CreateIgnored (string message)
+		{
+			UnitTestResult res = new UnitTestResult ();
+			res.status = ResultStatus.Ignored;
+			res.Message = message;
+			return res;
+		}
+		
+		public static UnitTestResult CreateInconclusive (string message)
+		{
+			UnitTestResult res = new UnitTestResult ();
+			res.status = ResultStatus.Inconclusive;
+			res.Message = message;
+			return res;
+		}
+		
+		public static UnitTestResult CreateSuccess ()
+		{
+			UnitTestResult res = new UnitTestResult ();
+			res.status = ResultStatus.Success;
+			return res;
+		}
+		
+		public DateTime TestDate {
+			get { return testDate; }
+			set { testDate = value; }
+		}
+		
+		public ResultStatus Status {
+			get { return status; }
+			set { status = value; }
+		}
+		
+		public bool IsFailure {
+			get { return ErrorsAndFailures > 0; }
+		}
+
+		public bool IsSuccess {
+			get { return ErrorsAndFailures == 0 && Passed > 0; }
+		}
+
+		public bool IsInconclusive {
+			get { return Passed == 0 && ErrorsAndFailures == 0 && Inconclusive > 0; }
+		}
+
+		public bool IsNotRun {
+			get {
+				return Passed == 0 && ErrorsAndFailures == 0 && TestsNotRun > 0;
+			}
+		}
+
+		public int Passed {
+			get;
+			set;
+		}
+
+		public int Errors {
+			get;
+			set;
+		}
+
+		public int Failures {
+			get;
+			set;
+		}
+
+		public int ErrorsAndFailures {
+			get {
+				return Errors + Failures;
+			}
+		}
+
+		public int TestsNotRun {
+			get {
+				return Ignored + NotRunnable + Skipped;
+			}
+		}
+
+		public int Inconclusive {
+			get;
+			set;
+		}
+
+		public int NotRunnable {
+			get;
+			set;
+		}
+
+		public int Skipped {
+			get;
+			set;
+		}
+
+		public int Ignored {
+			get;
+			set;
+		}
+		
+		public TimeSpan Time {
+			get { return time; }
+			set { time = value; }
+		}
+		
+		public string Message {
+			get { return message; }
+			set { message = value; }
+		}
+		
+		public string StackTrace {
+			get { return stackTrace; }
+			set { stackTrace = value; }
+		}
+		
+		public string ConsoleOutput {
+			get { return output; }
+			set { output = value; }
+		}
+		
+		public string ConsoleError {
+			get { return cerror; }
+			set { cerror = value; }
+		}
+		
+		public SourceCodeLocation GetFailureLocation ()
+		{
+			if (string.IsNullOrEmpty (stackTrace))
+				return null;
+			string[] stackLines = stackTrace.Replace ("\r", "").Split ('\n');
+			foreach (string line in stackLines) {
+				if (line.IndexOf ("NUnit.Framework") != -1)
+					continue;
+				Regex r = new Regex (@".*?\(.*?\)\s\[.*?\]\s.*?\s(?<file>.*)\:(?<line>\d*)");
+				Match m = r.Match (line);
+				if (m.Groups ["file"] != null && m.Groups ["line"] != null && File.Exists (m.Groups ["file"].Value)) {
+					int lin;
+					if (int.TryParse (m.Groups ["line"].Value, out lin))
+						return new SourceCodeLocation (m.Groups ["file"].Value, lin, -1);
+				}
+			}
+			return null;
+		}
+
+		public void Add (UnitTestResult res)
+		{
+			Time += res.Time;
+			Passed += res.Passed;
+			Errors += res.Errors;
+			Failures += res.Failures;
+			Ignored += res.Ignored;
+			Inconclusive += res.Inconclusive;
+			Skipped += res.Skipped;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResultsStore.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResultsStore.cs
new file mode 100644
index 0000000000..5cadb15f39
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResultsStore.cs
@@ -0,0 +1,76 @@
+//
+// TestNodeBuilder.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+
+namespace MonoDevelop.UnitTesting
+{
+	public class UnitTestResultsStore
+	{
+		UnitTest test;
+		IResultsStore store;
+		
+		internal UnitTestResultsStore (UnitTest test, IResultsStore store)
+		{
+			this.test = test;
+			this.store = store;
+		}
+		
+		public UnitTestResult GetLastResult (DateTime date)
+		{
+			if (store == null) return null;
+			return store.GetLastResult (test.ActiveConfiguration, test, date);
+		}
+		
+		public UnitTestResult GetNextResult (DateTime date)
+		{
+			if (store == null) return null;
+			return store.GetNextResult (test.ActiveConfiguration, test, date);
+		}
+		
+		public UnitTestResult GetPreviousResult (DateTime date)
+		{
+			if (store == null) return null;
+			return store.GetPreviousResult (test.ActiveConfiguration, test, date);
+		}
+		
+		public UnitTestResult[] GetResults (DateTime startDate, DateTime endDate)
+		{
+			if (store == null) return new UnitTestResult [0];
+			return store.GetResults (test.ActiveConfiguration, test, startDate, endDate);
+		}
+		
+		public UnitTestResult[] GetResultsToDate (DateTime endDate, int count)
+		{
+			if (store == null) return new UnitTestResult [0];
+			return store.GetResultsToDate (test.ActiveConfiguration, test, endDate, count);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs
new file mode 100644
index 0000000000..5816721bcf
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs
@@ -0,0 +1,459 @@
+//
+// NUnitService.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+
+using MonoDevelop.Core;
+using MonoDevelop.Core.Execution;
+using Mono.Addins;
+using MonoDevelop.Projects;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide;
+using System.Threading.Tasks;
+using System.Linq;
+using MonoDevelop.Ide.TypeSystem;
+using System.IO;
+using MonoDevelop.Ide.Gui.Components;
+
+namespace MonoDevelop.UnitTesting
+{
+	public static class UnitTestService
+	{
+		static ArrayList providers = new ArrayList ();
+		static UnitTest[] rootTests;
+		
+		static UnitTestService ()
+		{
+			IdeApp.Workspace.WorkspaceItemOpened += OnWorkspaceChanged;
+			IdeApp.Workspace.WorkspaceItemClosed += OnWorkspaceChanged;
+			IdeApp.Workspace.ActiveConfigurationChanged += OnWorkspaceChanged;
+
+			IdeApp.Workspace.ItemAddedToSolution += OnItemsChangedInSolution;;
+			IdeApp.Workspace.ItemRemovedFromSolution += OnItemsChangedInSolution;
+			IdeApp.Workspace.ReferenceAddedToProject += OnReferenceChangedInProject;;
+			IdeApp.Workspace.ReferenceRemovedFromProject += OnReferenceChangedInProject;
+
+			Mono.Addins.AddinManager.AddExtensionNodeHandler ("/MonoDevelop/UnitTesting/TestProviders", OnExtensionChange);
+
+			RebuildTests ();
+		}
+
+		static void OnExtensionChange (object s, ExtensionNodeEventArgs args)
+		{
+			if (args.Change == ExtensionChange.Add) {
+				ProjectService ps = MonoDevelop.Projects.Services.ProjectService;
+				ITestProvider provider = args.ExtensionObject as ITestProvider;
+				providers.Add (provider);
+			}
+			else {
+				ITestProvider provider = args.ExtensionObject as ITestProvider;
+				providers.Remove (provider);
+				provider.Dispose ();
+			}
+		}
+
+		public static UnitTest CurrentSelectedTest {
+			get {
+				var pad = IdeApp.Workbench.GetPad<TestPad> ();
+				pad.BringToFront ();
+				TestPad testPad = (TestPad)pad.Content;
+				ITreeNavigator nav = testPad.TreeView.GetSelectedNode ();
+				if (nav != null)
+					return nav.DataItem as UnitTest;
+				return null;
+			}
+			set {
+				var pad = IdeApp.Workbench.GetPad<TestPad> ();
+				pad.BringToFront ();
+				var content = (TestPad)pad.Content;
+				content.SelectTest (value);
+			}
+		}
+
+		public static AsyncOperation RunTest (UnitTest test, MonoDevelop.Projects.ExecutionContext context)
+		{
+			var result = RunTest (test, context, IdeApp.Preferences.BuildBeforeRunningTests);
+			result.Task.ContinueWith (t => OnTestSessionCompleted (), TaskScheduler.FromCurrentSynchronizationContext ());
+			return result;
+		}
+		
+		public static AsyncOperation RunTest (UnitTest test, MonoDevelop.Projects.ExecutionContext context, bool buildOwnerObject)
+		{
+			var cs = new CancellationTokenSource ();
+			return new AsyncOperation (RunTest (test, context, buildOwnerObject, true, cs), cs);
+		}
+
+		internal static async Task RunTest (UnitTest test, MonoDevelop.Projects.ExecutionContext context, bool buildOwnerObject, bool checkCurrentRunOperation, CancellationTokenSource cs)
+		{
+			string testName = test.FullName;
+			
+			if (buildOwnerObject) {
+				IBuildTarget bt = test.OwnerObject as IBuildTarget;
+				if (bt != null) {
+					if (!IdeApp.ProjectOperations.CurrentRunOperation.IsCompleted) {
+						MonoDevelop.Ide.Commands.StopHandler.StopBuildOperations ();
+						await IdeApp.ProjectOperations.CurrentRunOperation.Task;
+					}
+	
+					var res = await IdeApp.ProjectOperations.Build (bt, cs.Token).Task;
+					if (res.HasErrors)
+						return;
+
+					await RefreshTests (cs.Token);
+					test = SearchTest (testName);
+					if (test != null)
+						await RunTest (test, context, false, checkCurrentRunOperation, cs);
+					return;
+				}
+			}
+			
+			if (checkCurrentRunOperation && !IdeApp.ProjectOperations.ConfirmExecutionOperation ())
+				return;
+			
+			Pad resultsPad = IdeApp.Workbench.GetPad <TestResultsPad>();
+			if (resultsPad == null) {
+				resultsPad = IdeApp.Workbench.ShowPad (new TestResultsPad (), "MonoDevelop.UnitTesting.TestResultsPad", GettextCatalog.GetString ("Test results"), "Bottom", "md-solution");
+			}
+			
+			// Make the pad sticky while the tests are runnig, so the results pad is always visible (even if minimized)
+			// That's required since when running in debug mode, the layout is automatically switched to debug.
+			
+			resultsPad.Sticky = true;
+			resultsPad.BringToFront ();
+			
+			TestSession session = new TestSession (test, context, (TestResultsPad) resultsPad.Content, cs);
+			
+			OnTestSessionStarting (new TestSessionEventArgs { Session = session, Test = test });
+
+			if (checkCurrentRunOperation)
+				IdeApp.ProjectOperations.CurrentRunOperation = session;
+			
+			try {
+				await session.Start ();
+			} finally {
+				resultsPad.Sticky = false;
+			}
+		}
+
+		/// <summary>
+		/// For each node already in the test tree, it checks if there is any change. If there is, it reloads the test.
+		/// </summary>
+		public static Task RefreshTests (CancellationToken ct)
+		{
+			return Task.WhenAll (RootTests.Select (t => t.Refresh (ct)));
+		}
+
+		/// <summary>
+		/// Reloads the test tree, creating new test branches if necessary
+		/// </summary>
+		public static void ReloadTests ()
+		{
+			foreach (var t in RootTests.OfType<UnitTestGroup> ())
+				t.UpdateTests ();
+		}
+
+		public static UnitTest SearchTest (string fullName)
+		{
+			foreach (UnitTest t in RootTests) {
+				UnitTest r = SearchTest (t, fullName);
+				if (r != null)
+					return r;
+			}
+			return null;
+		}
+
+		public static UnitTest SearchTestById (string id)
+		{
+			foreach (UnitTest t in RootTests) {
+				UnitTest r = SearchTestById (t, id);
+				if (r != null)
+					return r;
+			}
+			return null;
+		}
+
+		
+		static UnitTest SearchTest (UnitTest test, string fullName)
+		{
+			if (test == null)
+				return null;
+			if (test.FullName == fullName)
+				return test;
+
+			UnitTestGroup group = test as UnitTestGroup;
+			if (group != null)  {
+				foreach (UnitTest t in group.Tests) {
+					UnitTest result = SearchTest (t, fullName);
+					if (result != null)
+						return result;
+				}
+			}
+			return null;
+		}
+
+		static UnitTest SearchTestById (UnitTest test, string id)
+		{
+			if (test == null)
+				return null;
+			if (test.TestId == id)
+				return test;
+
+			UnitTestGroup group = test as UnitTestGroup;
+			if (group != null)  {
+				foreach (UnitTest t in group.Tests) {
+					UnitTest result = SearchTestById (t, id);
+					if (result != null)
+						return result;
+				}
+			}
+			return null;
+		}
+
+		public static UnitTest FindRootTest (WorkspaceObject item)
+		{
+			return FindRootTest (RootTests, item);
+		}
+		
+		public static UnitTest FindRootTest (IEnumerable<UnitTest> tests, WorkspaceObject item)
+		{
+			foreach (UnitTest t in tests) {
+				if (t.OwnerObject == item)
+					return t;
+				UnitTestGroup tg = t as UnitTestGroup;
+				if (tg != null) {
+					UnitTest ct = FindRootTest (tg.Tests, item);
+					if (ct != null)
+						return ct;
+				}
+			}
+			return null;
+		}
+		
+		static void OnWorkspaceChanged (object sender, EventArgs e)
+		{
+			RebuildTests ();
+		}
+
+		static void OnReferenceChangedInProject (object sender, ProjectReferenceEventArgs e)
+		{
+			if (!IsSolutionGroupPresent (e.Project.ParentSolution, rootTests))
+				RebuildTests ();
+		}
+
+		static void OnItemsChangedInSolution (object sender, SolutionItemChangeEventArgs e)
+		{
+			if (!IsSolutionGroupPresent (e.Solution, rootTests))
+				RebuildTests ();
+		}
+
+		static bool IsSolutionGroupPresent (Solution sol, IEnumerable<UnitTest> tests)
+		{
+			foreach (var t in tests) {
+				var tg = t as SolutionFolderTestGroup;
+				if (tg != null && ((SolutionFolder)tg.OwnerObject).ParentSolution == sol)
+					return true;
+				var g = t as UnitTestGroup;
+				if (g != null && g.HasTests) {
+					if (IsSolutionGroupPresent (sol, g.Tests))
+						return true;
+				}
+			}
+			return false;
+		}
+
+		static void RebuildTests ()
+		{
+			if (rootTests != null) {
+				foreach (IDisposable t in rootTests)
+					t.Dispose ();
+			}
+
+			List<UnitTest> list = new List<UnitTest> ();
+			foreach (WorkspaceItem it in IdeApp.Workspace.Items) {
+				UnitTest t = BuildTest (it);
+				if (t != null)
+					list.Add (t);
+			}
+
+			rootTests = list.ToArray ();
+			NotifyTestSuiteChanged ();
+		}
+		
+		public static UnitTest BuildTest (WorkspaceObject entry)
+		{
+			foreach (ITestProvider p in providers) {
+				try {
+					UnitTest t = p.CreateUnitTest (entry);
+					if (t != null)
+						return t;
+				} catch {
+				}
+			}
+			return null;
+		}
+
+		public static string GetTestResultsDirectory (string baseDirectory)
+		{
+			var newCache = TypeSystemService.GetCacheDirectory (baseDirectory, false);
+			if (newCache == null) {
+				newCache = TypeSystemService.GetCacheDirectory (baseDirectory, true);
+				var oldDirectory = Path.Combine (baseDirectory, "test-results");
+				var newDirectory = Path.Combine (newCache, "test-results");
+				try {
+					Directory.CreateDirectory (newDirectory);
+					if (Directory.Exists (oldDirectory)) {
+						foreach (string file in Directory.GetFiles(oldDirectory, "*.*"))
+							File.Copy (file, file.Replace (oldDirectory, newDirectory));
+					}
+				} catch (Exception e) {
+					LoggingService.LogError ("Error while copying old test-results", e);
+				}
+				return newDirectory;
+			}
+
+			return Path.Combine (newCache, "test-results");
+		}
+
+
+		public static UnitTest[] RootTests {
+			get { return rootTests; }
+		}
+		
+		static void NotifyTestSuiteChanged ()
+		{
+			Runtime.RunInMainThread (() => {
+				if (TestSuiteChanged != null)
+					TestSuiteChanged (null, EventArgs.Empty);
+			});
+		}
+
+		public static void ResetResult (UnitTest test)
+		{
+			if (test == null)
+				return;
+			test.ResetLastResult ();
+			UnitTestGroup group = test as UnitTestGroup;
+			if (group == null) 
+				return;
+			foreach (UnitTest t in new List<UnitTest> (group.Tests))
+				ResetResult (t);
+		}
+
+		public static event EventHandler TestSuiteChanged;
+
+		static void OnTestSessionCompleted ()
+		{
+			var handler = TestSessionCompleted;
+			if (handler != null)
+				handler (null, EventArgs.Empty);
+		}
+
+		public static event EventHandler TestSessionCompleted;
+
+		static void OnTestSessionStarting (TestSessionEventArgs args)
+		{
+			if (TestSessionStarting != null)
+				TestSessionStarting (null, args);
+		}
+
+		/// <summary>
+		/// Occurs just before a test session is started
+		/// </summary>
+		public static event EventHandler<TestSessionEventArgs> TestSessionStarting;
+	}
+	
+
+
+	class TestSession: AsyncOperation
+	{
+		UnitTest test;
+		TestMonitor monitor;
+		MonoDevelop.Projects.ExecutionContext context;
+		TestResultsPad resultsPad;
+
+		public TestSession (UnitTest test, MonoDevelop.Projects.ExecutionContext context, TestResultsPad resultsPad, CancellationTokenSource cs)
+		{
+			this.test = test;
+			this.context = new Projects.ExecutionContext (context.ExecutionHandler, new CustomConsoleFactory (context.ConsoleFactory, cs), context.ExecutionTarget);
+			CancellationTokenSource = cs;
+			this.monitor = new TestMonitor (resultsPad, CancellationTokenSource);
+			this.resultsPad = resultsPad;
+			resultsPad.InitializeTestRun (test, cs);
+			Task = new Task ((Action)RunTests);
+		}
+		
+		public Task Start ()
+		{
+			Task.Start ();
+			return Task;
+		}
+
+		void RunTests ()
+		{
+			try {
+				UnitTestService.ResetResult (test);
+
+				TestContext ctx = new TestContext (monitor, resultsPad, context, DateTime.Now);
+				test.Run (ctx);
+				test.SaveResults ();
+			} catch (Exception ex) {
+				LoggingService.LogError (ex.ToString ());
+				monitor.ReportRuntimeError (null, ex);
+			} finally {
+				monitor.FinishTestRun ();
+			}
+		}
+	}
+
+	public class TestSessionEventArgs: EventArgs
+	{
+		public AsyncOperation Session { get; set; }
+		public UnitTest Test { get; set; }
+	}
+
+	class CustomConsoleFactory : OperationConsoleFactory
+	{
+		OperationConsoleFactory factory;
+		CancellationTokenSource cancelSource;
+
+		public CustomConsoleFactory (OperationConsoleFactory factory, CancellationTokenSource cs)
+		{
+			this.factory = factory;
+			cancelSource = cs;
+		}
+
+		protected override OperationConsole OnCreateConsole (CreateConsoleOptions options)
+		{
+			return factory.CreateConsole (options.WithBringToFront (false)).WithCancelCallback (cancelSource.Cancel);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestStatus.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestStatus.cs
new file mode 100644
index 0000000000..b3cea6e526
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestStatus.cs
@@ -0,0 +1,50 @@
+//
+// TestStatus.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace MonoDevelop.UnitTesting
+{
+	public enum TestStatus
+	{
+		Ready,
+		Loading,
+		LoadError,
+		Running
+	}
+	
+	[Flags]
+	public enum ResultStatus
+	{
+		Success = 1,
+		Failure = 2,
+		Ignored = 4,
+		Inconclusive = 8
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/WorkspaceTestGroup.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/WorkspaceTestGroup.cs
new file mode 100644
index 0000000000..1b41f224ab
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/WorkspaceTestGroup.cs
@@ -0,0 +1,85 @@
+//
+// WorkspaceTestGroup.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
+// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using MonoDevelop.Projects;
+
+
+namespace MonoDevelop.UnitTesting
+{
+	public class WorkspaceTestGroup: UnitTestGroup
+	{
+		Workspace workspace;
+		
+		public WorkspaceTestGroup (Workspace ws): base (ws.Name, ws)
+		{
+			string storeId = ws.Name;
+			string resultsPath = UnitTestService.GetTestResultsDirectory (ws.BaseDirectory);
+			ResultsStore = new BinaryResultsStore (resultsPath, storeId);
+			
+			workspace = ws;
+			workspace.ItemAdded += OnEntryChanged;
+			workspace.ItemRemoved += OnEntryChanged;
+			workspace.NameChanged += OnCombineRenamed;
+		}
+		
+		public static WorkspaceTestGroup CreateTest (Workspace ws)
+		{
+			return new WorkspaceTestGroup (ws);
+		}
+		
+		public override void Dispose ()
+		{
+			workspace.ItemAdded -= OnEntryChanged;
+			workspace.ItemRemoved -= OnEntryChanged;
+			workspace.NameChanged -= OnCombineRenamed;
+			base.Dispose ();
+		}
+		
+		void OnEntryChanged (object sender, WorkspaceItemEventArgs e)
+		{
+			UpdateTests ();
+		}
+		
+		void OnCombineRenamed (object sender, WorkspaceItemRenamedEventArgs e)
+		{
+			UnitTestGroup parent = Parent as UnitTestGroup;
+			if (parent != null)
+				parent.UpdateTests ();
+		}
+		
+		protected override void OnCreateTests ()
+		{
+			foreach (WorkspaceItem e in workspace.Items) {
+				UnitTest t = UnitTestService.BuildTest (e);
+				if (t != null)
+					Tests.Add (t);
+			}
+		}
+	}
+}
+
diff --git a/main/src/addins/NUnit/TODO b/main/src/addins/MonoDevelop.UnitTesting/TODO
index c33f3d3595..c33f3d3595 100644
--- a/main/src/addins/NUnit/TODO
+++ b/main/src/addins/MonoDevelop.UnitTesting/TODO
diff --git a/main/src/addins/MonoDevelop.UnitTesting/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.UnitTesting/gtk-gui/generated.cs
new file mode 100644
index 0000000000..9ef3363981
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/gtk-gui/generated.cs
@@ -0,0 +1,29 @@
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace Stetic
+{
+	internal class Gui
+	{
+		private static bool initialized;
+
+		internal static void Initialize (Gtk.Widget iconRenderer)
+		{
+			if ((Stetic.Gui.initialized == false)) {
+				Stetic.Gui.initialized = true;
+			}
+		}
+	}
+
+	internal class ActionGroups
+	{
+		public static Gtk.ActionGroup GetActionGroup (System.Type type)
+		{
+			return Stetic.ActionGroups.GetActionGroup (type.FullName);
+		}
+
+		public static Gtk.ActionGroup GetActionGroup (string name)
+		{
+			return null;
+		}
+	}
+}
diff --git a/main/src/addins/MonoDevelop.UnitTesting/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.UnitTesting/gtk-gui/gui.stetic
new file mode 100644
index 0000000000..53835b10dd
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/gtk-gui/gui.stetic
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<stetic-interface>
+  <configuration>
+    <images-root-path>..</images-root-path>
+    <target-gtk-version>2.12</target-gtk-version>
+  </configuration>
+  <import>
+    <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
+    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
+    <widget-library name="../../../../build/AddIns/NUnit/MonoDevelop.NUnit.dll" internal="true" />
+  </import>
+</stetic-interface>
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.WebReferences/ChangeLog b/main/src/addins/MonoDevelop.WebReferences/ChangeLog
deleted file mode 100644
index 7f2e5ec7cf..0000000000
--- a/main/src/addins/MonoDevelop.WebReferences/ChangeLog
+++ /dev/null
@@ -1,655 +0,0 @@
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs: Fix
-	  incorrect use of ShowCustomDialog/RunCustomDialog.
-
-2010-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  Fix build.
-
-2010-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  Properly destroy the web reference dialog.
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  More dialog placing.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Flush.
-
-2010-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs:
-	* MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs:
-	  Use correct namespace when updating a web reference. Fixes
-	  bug #605942 - Refreshing .NET 2.0 Web Service causes
-	  additional class nesting.
-
-2010-04-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs:
-	  Fix build.
-
-2010-04-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.WebReferences.WS:
-	* MonoDevelop.WebReferences.WCF:
-	* MonoDevelop.WebReferences.csproj:
-	* MonoDevelop.WebReferences.addin.xml:
-	* MonoDevelop.WebReferences.WCF/WCFMetadata.cs:
-	* MonoDevelop.WebReferences/WebReferenceItem.cs:
-	* MonoDevelop.WebReferences/WebServiceEngine.cs:
-	* MonoDevelop.WebReferences.WS/WebReferences.cs:
-	* MonoDevelop.WebReferences.WCF/MetadataFile.cs:
-	* MonoDevelop.WebReferences.WCF/ExtensionFile.cs:
-	* MonoDevelop.WebReferences.WCF/ClientOptions.cs:
-	* MonoDevelop.WebReferences/WebServiceEngineWS.cs:
-	* MonoDevelop.WebReferences.WS/WebReferenceUrl.cs:
-	* MonoDevelop.WebReferences/WebReferenceFolder.cs:
-	* MonoDevelop.WebReferences.WCF/ReferenceGroup.cs:
-	* MonoDevelop.WebReferences.WCF/MetadataSource.cs:
-	* MonoDevelop.WebReferences/WebServiceEngineWCF.cs:
-	* MonoDevelop.WebReferences/WebReferencesService.cs:
-	* MonoDevelop.WebReferences.WCF/CollectionMapping.cs:
-	* MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs:
-	* MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs:
-	* MonoDevelop.WebReferences.WCF/ReferencedAssembly.cs:
-	* MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs:
-	* MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs:
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	* MonoDevelop.WebReferences/WebReferenceItemCollection.cs:
-	* MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs:
-	* MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs:
-	* MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs:
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs:
-	* MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	  Improved compatibility. VS can now properly open projects
-	  with web references created with MD, and vice-versa.
-	  Reorganized a bit the code.
-
-2010-04-23  Carlo Kok  <ck@remobjects.com>
-	* Makefile.am:
-	* MonoDevelop.WebReferences.csproj:
-	  Add missing System.Configuration reference.
-	  
-2010-04-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.WebReferences.csproj:
-	* MonoDevelop.WebReferences.Resources/WebReference.png:
-	* MonoDevelop.WebReferences.Resources/WebReferenceItem.VS.png:
-	* MonoDevelop.WebReferences.Resources/WebReference.Service.png:
-	* MonoDevelop.WebReferences.Resources/WebReference.File.Wsdl.png:
-	* MonoDevelop.WebReferences.Resources/WebReference.File.Disco.png:
-	* MonoDevelop.WebReferences.Resources/WebReferenceFolder.Open.png:
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	* MonoDevelop.WebReferences.Resources/WebReferenceFolder.Closed.png:
-	  Remove unused icons.
-
-	* MonoDevelop.WebReferences/WebServiceEngineWCF.cs:
-	* MonoDevelop.WebReferences/MoonlightChannelBaseExtension.cs:
-	  Add support for moonlight and monotouch proxies.
-
-2010-04-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.WebReferences.csproj:
-	* MonoDevelop.WebReferences/CodeGenerator.cs:
-	* MonoDevelop.WebReferences/WebServiceEngine.cs:
-	* MonoDevelop.WebReferences/WebReferenceItem.cs:
-	* MonoDevelop.WebReferences/WebServiceEngineWS.cs:
-	* MonoDevelop.WebReferences/WebServiceEngineWCF.cs:
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	* MonoDevelop.WebReferences/WebReferenceItemCollection.cs:
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs:
-	  Add support for WCF references.
-
-2010-04-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs: Log
-	  the error.
-
-2010-04-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	  Show an error message if DiscoverAny fails. Fixes bug
-	  #590375 - Add Web Reference dialog silently swallows errors.
-
-2010-04-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences/WebReferenceItem.cs: Fix warning.
-
-	* MonoDevelop.WebReferences/WebReferenceItemCollection.cs:
-	  Simplify.
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  Ask for confirmation before deleting a web reference.
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	  Don't allow duplicate reference names.
-
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	  Don't allow duplicate reference names. Fixes bug #582487 -
-	  Web reference cannot be deleted.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.WebReferences.addin.xml: Bumped MD version.
-
-2010-03-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  Use the correct reference name for comparing. Fixes bug
-	  #583009 - WebReferenceCommandHandler duplicates references.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.WebReferences.csproj:
-	* MonoDevelop.WebReferences.addin.xml:
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs:
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.WebReferences.csproj:
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	* MonoDevelop.WebReferences.Dialogs/UserPasswordDialog.cs:
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.UserPasswordDialog.cs:
-	  Add support for basic authentication.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	  Flush.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.WebReferences/CodeGenerator.cs: Fix spelling
-	  typo.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.WebReferences.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.WebReferences.csproj:
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	  Flush.
-
-2009-10-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	  Don't generate invalid namespace names. Hide the navigation
-	  toolbar if we have no browser.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.WebReferences.addin.xml: Bump MD version.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.csproj: Updated dependencies. We
-	  now depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences\Library.cs: Fix cast exception on
-	  MS.NET.
-
-2009-08-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  Before adding refs, resolve them against the target
-	  framework.
-
-2009-08-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences/Library.cs: VS uses "Web
-	  References" instead of "WebReferences"
-
-	* MonoDevelop.WebReferences/DiscoveryProtocol.cs: Ignore
-	  unknown discovery results.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	  Flush.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences\Library.cs:
-	* MonoDevelop.WebReferences\WebReferenceItemCollection.cs:
-	* MonoDevelop.WebReferences.NodeBuilders\WebReferenceFolderNodeBuilder.cs:
-	  Use the new FilePath class for handling file and directory
-	  paths.
-
-2009-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.WebReferences/WebReferenceItem.cs: fixed
-	  compilation error.
-
-2009-04-28  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.WebReferences/WebReferenceItem.cs: Applied patch
-	  from Luciano N. Callero <lnc19@hotmail.com> : "Fix Web
-	  Reference Update bug that prevent a web reference from being
-	  update."
-
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.WebReferences.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.WebReferences.addin.xml: Bump MD version.
-
-2009-03-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  Fix framework IDs.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.addin.xml: Track merge of the
-	  project pad context menu.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs: Flush.
-
-2009-02-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences/CodeGenerator.cs: Properly fix
-	  warning.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.WebReferences.csproj: Make implicit references
-	  explicit. Csc is much pickier about these.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.WebReferences.csproj: Remove invalid
-	  ApplicationIcon value that broke the build in VS.
-
-2009-02-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.WebReferences/CodeGenerator.cs:
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	  Fixed compiler warnings
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.mds:
-	* MonoDevelop.WebReferences.mdp:
-	* MonoDevelop.WebReferences.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.WebReferences.addin.xml: Bump MD version.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.WebReferences.mdp: Flush project format changes.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	Track API changes.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs:
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs:
-	Fix comments.
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs: Make
-	sure no files are added to the project if the web reference proxy
-	can't be generated.
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	Flush.
-
-	* Makefile.am: Fix parallel build.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.WebReferences.addin.xml: Bump MD version.
-
-2008-11-05  Mike Kestner <mkestner@novell.com>
-
-	* MonoDevelop.WebReferences.mdp: update the UsePartialTypes attribute.
-	Not sure how or why it got set to False, but it should be true.
-	[Fixes #440796]
-
-2008-10-22 Luciano N. Callero <lnc19@hotmail.com>
-
-	* MonoDevelop.WebReferences/CodeGenerator.cs: Add a new Constructor
-	  to the proxy class with Url as a parameter.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com>
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  Track API.
-
-2008-09-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp: Updated projects.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	  Updated generated code.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs,
-	  MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs,
-	  MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs,
-	  MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs,
-	  MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  Moved the extensible tree view to its own directory.
-
-2008-06-18  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.WebReferences/WebReferenceItem.cs: Update web reference 
-	  over the network.
-
-2008-06-17  Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs: 
-	  Auto-add necessary references.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml: Bump MD version.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs,
-	  MonoDevelop.WebReferences/WebReferenceItem.cs,
-	  MonoDevelop.WebReferences/Library.cs,
-	  MonoDevelop.WebReferences/WebReferenceItemCollection.cs,
-	  MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs,
-	  gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs:
-	  New project model changes.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs,
-	  MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs: Worked on gnome
-	  hig compliant alerts.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	  Refactored status bar.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml: Update MD version.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml: Updated add-in category and
-	  description.
-
-2008-01-02  Geoff Norton  <gnorton@novell.com>
-
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	The using System.Net;\rusing System.Text;\n pattern was causing a
-	CS8025 on SVN trunk.  Replace the \r with a \n.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences/Library.cs,
-	  MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs,
-	  gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs,
-	  gtk-gui/gui.stetic: Make it work when a browser is not installed.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp: Updated project files. The order of
-	  extended properties won't change anymore.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp, Makefile.am: Directory reorganization.
-
-2007-11-30  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp,
-	  MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs,
-	  gtk-gui/gui.stetic: Use WebBrowserService instead of MozillaControl.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp: Don't try to use partial types in stetic
-	  code generation.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml: Bump MD version.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp: Project file names updated by change in MD
-	  path functions.
-
-2007-10-01  Raja R Harinath  <rharinath@novell.com>
-
-	* Makefile.am (FILES, REFS): Remove $(srcdir) prefix.  It's added
-	automatically by Makefile.include.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml: Bump MD version.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml: Removed the CommandService class.
-	  Everything is done directly with CommandManager. Moved all extension
-	  node types to MD.Components.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml,
-	  MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs,
-	  MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs,
-	  MonoDevelop.WebReferences.mdp, Makefile.am: Reorganized the extension
-	  point hierarchy. Embedded all add-in manifests as resources.
-
-2007-08-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs: API
-	  cleanup. Converted core services into regular classes.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs:
-	  Converted DispatchService to a static class.
-
-2007-07-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml,
-	  MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs:
-	  Declared missing extension point.
-
-2007-06-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/gui.stetic,
-	  MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs: Made the
-	  dialog internal.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp: Copy the .addins.xml file to the
-	  output dir.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am: Updated.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp, Makefile.am: Reference shared
-	  assemblies from the correct location.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml, MonoDevelop.WebReferences.mdp,
-	  gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs,
-	  gtk-gui/gui.stetic, Makefile.am: Migration to Mono.Addins.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AssemblyInfo.cs: Avoid version auto-increment.
-	* MonoDevelop.WebReferences.mdp: Don't copy referenced assemblies.
-	* Makefile.am: Flush.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp, Makefile.am: Synchronized the MD
-	  project and the Makefile
-	* gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs,
-	  gtk-gui/gui.stetic: Updated.
-
-2007-02-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.WebReferences.mdp, gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs,
-	  gtk-gui/gui.stetic, Makefile.am: i18n fixes and split stetic
-	  generated code in several files.
-
-2006-11-29 Gideon de Swardt <gdeswardt@gmail.com>
-	* Makefile.in: 
-	Remove the Makefile.in from source, should not have been committed in the first place.
-
-2006-11-28 Gideon de Swardt <gdeswardt@gmail.com>
-	* MonoDevelop.WebReferences:
-	Move the source code from Google Code project.
-
-2006-08-31 Gideon de Swardt <gdeswardt@gmail.com>
-	* MonoDevelop.WebReferences/CodeGenerator:
-	Changed the class to use the LanguageBinding from the DotNetProject.
-
-2006-08-26 Gideon de Swardt <gdeswardt@gmail.com>
-	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
-	Moved the UI code to stetic
-	* svnci:
-	Added the svn commit change log script from monodevelop
-
-2006-08-25 Gideon de Swardt <gdeswardt@gmail.com>
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs:
-	Added an event handler to refresh the web reference folder node when a *.map project 
-	file has been removed from a project
-
-2006-08-15 Gideon de Swardt <gdeswardt@gmail.com>
-		
-	* MonoDevelop.WebReferences.addin.xml:
-	Removed the Delete All menu option on the Web Reference folder
-	Changed the version number
-	
-	* MonoDevelop.WebReferences/CodeGenerator.cs:
-	Added support for generating the code in VB.NET
-	
-	* MonoDevelop.WebReferences/Library.cs:
-	Added a method that checks if the project contains any web references
-	
-	* MonoDevelop.WebReferences/WebReferenceItemCollection.cs:
-	Optimized the WebReferenceItemCollection construct method by only looping through the 
-	project files collection once instead of previously seeking for the specific map file
-	after it found the reference file. This will also sort the problem with VB reference files
-	not being loaded.
-	
-	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
-	Check that the project options for the Runtime Version is set to 
-	"2.0", if it is set to "1.1" ask the user whether or not to
-	switch to "2.0" automatically. The project build will fail if
-	the Runtime is set to 1.1. Do not add the web reference if the
-	user chooses to keep the runtime version 1.1.
-	
-	Added functionality to add a ProjectReference for System.Web.Services to the project if
-	it does not currently contain a reference. This is required to successfully compile 
-	the project.
-	
-	* MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs:
-	Check if the project contains any web references before it adds the WebReferenceFolder
-	
-	* MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs:
-	Add a check not to hide the web reference folder if the project options is set to show all
-	
-	* MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs:
-	Changed the HasChildNodes method to use the new method to check if a project contains any 
-	web references rather than parsing and loading the collection of all web references in a project.
-	Changed the BuildChildNodes to parse the project every time the method is called.
-
-2006-08-11 Gideon de Swardt  <gdeswardt@gmail.com> 
-
-	Initial setup of the AddIn
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
index 9b7f5c314f..c45f4968fe 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
@@ -8,19 +8,18 @@ using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide;
 using System.Collections.Generic;
 using MonoDevelop.Core.Assemblies;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.WebReferences.Commands
 {
 	/// <summary>Defines the properties and methods for the WebReferenceCommandHandler class.</summary>
 	public class WebReferenceCommandHandler : NodeCommandHandler
 	{
-		StatusBarContext UpdateReferenceContext {
-			get; set;
-		}
-		
+		bool updatingReferences;
+
 		/// <summary>Execute the command for adding a new web reference to a project.</summary>
 		[CommandHandler (WebReferenceCommands.Add)]
-		public void NewWebReference()
+		public async void NewWebReference()
 		{
 			// Get the project and project folder
 			var project = CurrentNode.GetParentDataItem (typeof(DotNetProject), true) as DotNetProject;
@@ -46,8 +45,8 @@ namespace MonoDevelop.WebReferences.Commands
 				if (MessageService.RunCustomDialog (dialog) != (int)Gtk.ResponseType.Ok)
 					return;
 
-				dialog.SelectedService.GenerateFiles (project, dialog.Namespace, dialog.ReferenceName);
-				IdeApp.ProjectOperations.Save(project);
+				await dialog.SelectedService.GenerateFiles (project, dialog.Namespace, dialog.ReferenceName);
+				await IdeApp.ProjectOperations.SaveAsync(project);
 			} catch (Exception exception) {
 				MessageService.ShowError ("The web reference could not be added", exception);
 			} finally {
@@ -60,72 +59,57 @@ namespace MonoDevelop.WebReferences.Commands
 		[CommandUpdateHandler (WebReferenceCommands.UpdateAll)]
 		void CanUpdateWebReferences (CommandInfo ci)
 		{
-			// This does not appear to work.
-			ci.Enabled = UpdateReferenceContext == null;
+			ci.Enabled = !updatingReferences;
 		}
 		
 		/// <summary>Execute the command for updating a web reference in a project.</summary>
 		[CommandHandler (WebReferenceCommands.Update)]
-		public void Update()
+		public async void Update()
 		{
-			UpdateReferences (new [] { (WebReferenceItem) CurrentNode.DataItem });
+			await UpdateReferences (new [] { (WebReferenceItem) CurrentNode.DataItem });
 		}
 
 		/// <summary>Execute the command for updating all web reference in a project.</summary>
 		[CommandHandler (WebReferenceCommands.UpdateAll)]
-		public void UpdateAll()
+		public async void UpdateAll()
 		{
 			var folder = (WebReferenceFolder)CurrentNode.DataItem;
 			DotNetProject project = folder.Project;
 			if (folder.IsWCF)
-				UpdateReferences (WebReferencesService.GetWebReferenceItemsWCF (project).ToArray ());
+				await UpdateReferences (WebReferencesService.GetWebReferenceItemsWCF (project).ToArray ());
 			else
-				UpdateReferences (WebReferencesService.GetWebReferenceItemsWS (project).ToArray ());
+				await UpdateReferences (WebReferencesService.GetWebReferenceItemsWS (project).ToArray ());
 		}
 		
-		void UpdateReferences (IList<WebReferenceItem> items)
+		async Task UpdateReferences (IList<WebReferenceItem> items)
 		{
+			if (updatingReferences)
+				return;
 			try {
-				UpdateReferenceContext = IdeApp.Workbench.StatusBar.CreateContext ();
-				UpdateReferenceContext.BeginProgress (GettextCatalog.GetPluralString ("Updating web reference", "Updating web references", items.Count));
-				
-				DispatchService.ThreadDispatch (() => {
-					for (int i = 0; i < items.Count; i ++) {
-						DispatchService.GuiDispatch (() => UpdateReferenceContext.SetProgressFraction (Math.Max (0.1, (double)i / items.Count)));
+				updatingReferences = true;
+				using (var monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (GettextCatalog.GetPluralString ("Updating web reference", "Updating web references", items.Count), MonoDevelop.Ide.Gui.Stock.StatusDownload, true)) {
+					monitor.BeginTask (GettextCatalog.GetPluralString ("Updating web reference", "Updating web references", items.Count), items.Count);
+
+					for (int i = 0; i < items.Count; i++) {
 						try {
-							items [i].Update();
+							await items [i].Update ();
 						} catch (Exception ex) {
-							DispatchService.GuiSyncDispatch (() => {
-								MessageService.ShowError (GettextCatalog.GetString ("Failed to update Web Reference '{0}'", items [i].Name), ex);
-								DisposeUpdateContext ();
-							});
+							MessageService.ShowError (GettextCatalog.GetString ("Failed to update Web Reference '{0}'", items [i].Name), ex);
 							return;
 						}
+						monitor.Step ();
 					}
-					
-					DispatchService.GuiDispatch (() => {
-						// Make sure that we save all relevant projects, there should only be 1 though
-						foreach (var project in items.Select (i =>i.Project).Distinct ())
-							IdeApp.ProjectOperations.Save (project);
-						
-						IdeApp.Workbench.StatusBar.ShowMessage(GettextCatalog.GetPluralString ("Updated Web Reference {0}", "Updated Web References", items.Count, items[0].Name));
-						DisposeUpdateContext ();
-					});
-				});
-			} catch {
-				DisposeUpdateContext ();
-				throw;
+
+					// Make sure that we save all relevant projects, there should only be 1 though
+					foreach (var project in items.Select (i => i.Project).Distinct ())
+						await IdeApp.ProjectOperations.SaveAsync (project);
+				}
+				IdeApp.Workbench.StatusBar.ShowMessage (GettextCatalog.GetPluralString ("Updated Web Reference {0}", "Updated Web References", items.Count, items [0].Name));
+			} finally {
+				updatingReferences = false;
 			}
 		}
 	
-		void DisposeUpdateContext ()
-		{
-			if (UpdateReferenceContext != null) {
-				UpdateReferenceContext.Dispose ();
-				UpdateReferenceContext = null;
-			}
-		}
-		
 		/// <summary>Execute the command for removing a web reference from a project.</summary>
 		[CommandHandler (WebReferenceCommands.Delete)]
 		public void Delete()
@@ -134,7 +118,7 @@ namespace MonoDevelop.WebReferences.Commands
 			if (!MessageService.Confirm (GettextCatalog.GetString ("Are you sure you want to delete the web service reference '{0}'?", item.Name), AlertButton.Delete))
 				return;
 			item.Delete();
-			IdeApp.ProjectOperations.Save (item.Project);
+			IdeApp.ProjectOperations.SaveAsync (item.Project);
 			IdeApp.Workbench.StatusBar.ShowMessage("Deleted Web Reference " + item.Name);
 		}
 		
@@ -154,7 +138,7 @@ namespace MonoDevelop.WebReferences.Commands
 			foreach (var item in items.ToList ())
 				item.Delete();
 
-			IdeApp.ProjectOperations.Save(project);
+			IdeApp.ProjectOperations.SaveAsync(project);
 			IdeApp.Workbench.StatusBar.ShowMessage("Deleted all Web References");
 		}
 
@@ -167,7 +151,7 @@ namespace MonoDevelop.WebReferences.Commands
 
 		/// <summary>Execute the command for configuring a web reference in a project.</summary>
 		[CommandHandler (WebReferenceCommands.Configure)]
-		public void Configure ()
+		public async void Configure ()
 		{
 			var item = (WebReferenceItem) CurrentNode.DataItem;
 
@@ -195,7 +179,7 @@ namespace MonoDevelop.WebReferences.Commands
 					return;
 				
 				refgroup.Save (item.MapFile.FilePath);
-				UpdateReferences (new [] { item });
+				await UpdateReferences (new [] { item });
 			} catch (Exception exception) {
 				LoggingService.LogInternalError (exception);
 			} finally {
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
index d69ba80256..cfbea29412 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
@@ -53,7 +53,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 			listAccess.Active = options.GenerateInternalTypes ? 1 : 0;
 			listAsync.Active = AsyncOptionToIndex;
 
-			if (project is PortableDotNetProject) {
+			if (project.IsPortableLibrary) {
 				listAccess.Sensitive = false;
 				listAsync.Sensitive = false;
 			}
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
index 28d9c0bd1a..89e60acb6c 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
@@ -149,7 +149,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		#endregion
 		
 		#region Member Variables
-		const string homeUrl = "http://www.w3schools.com/WebServices/TempConvert.asmx";
+		const string homeUrl = "http://www.w3schools.com/xml/tempconvert.asmx";
 		WebServiceDiscoveryResult selectedService;
 //		protected Gtk.Alignment frmBrowserAlign;
 		#endregion
@@ -169,7 +169,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 			tbxReferenceURL.Text = homeUrl;
 
 			wcfOptions = WebReferencesService.WcfEngine.DefaultClientOptions;
-			if (project is PortableDotNetProject) {
+			if (project.IsPortableLibrary) {
 				wcfOptions.GenerateAsynchronousMethods = false;
 				wcfOptions.GenerateEventBasedAsynchronousMethods = true;
 			}
@@ -209,7 +209,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		}
 		
 		/// <summary>Execute the event when any of the buttons on the action panel has been clicked</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 //		private void Browser_URLKeyReleased (object sender, EventArgs e)
 //		{
@@ -251,7 +251,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		}
 		
 		/// <summary>Execute the event when the Enter key has been pressed on the Url Entry</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 		void Browser_URLKeyReleased (object sender, KeyReleaseEventArgs e)
 		{
@@ -263,7 +263,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		}
 		
 		/// <summary>Execute the event when the Location of the Browser has changed</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 		void Browser_LocationChanged (object sender, EventArgs e)
 		{
@@ -283,7 +283,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 
 		
 		/// <summary>Execute when the browser starts loading a document</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 		void Browser_StartLoading (object sender, EventArgs e)
 		{
@@ -291,7 +291,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		}
 		
 		/// <summary>Execute the browser stop loading a document</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 		void Browser_StopLoading (object sender, EventArgs e)
 		{
@@ -299,7 +299,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		}
 		
 		/// <summary>Execute when the Back button has been clicked</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 		void Browser_BackButtonClicked (object sender, EventArgs e)
 		{
@@ -308,7 +308,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		}
 		
 		/// <summary>Execute when the Next button has been clicked</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 		void Browser_NextButtonClicked (object sender, EventArgs e)
 		{
@@ -317,7 +317,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		}
 		
 		/// <summary>Execute when the Refresh button has been clicked</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 		void Browser_RefreshButtonClicked (object sender, EventArgs e)
 		{
@@ -326,7 +326,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		}
 		
 		/// <summary>Execute when the Stop button has been clicked</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 		void Browser_StopButtonClicked (object sender, EventArgs e)
 		{
@@ -335,7 +335,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 		}
 		
 		/// <summary>Execute when the Home button has been clicked</summary>
-		/// <param name="sender">An object that contains the sender data.</param>

+		/// <param name="sender">An object that contains the sender data.</param>
 		/// <param name="e">An EventArgs object that contains the event data.</param>
 		void Browser_HomeButtonClicked (object sender, EventArgs e)
 		{
@@ -491,7 +491,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 				btnOK.Sensitive = isWebService;
 				tlbNavigate.Visible = WebBrowserService.CanGetWebBrowser;
 				tbxReferenceName.Sensitive = isWebService;
-				comboModel.Sensitive = !(project is PortableDotNetProject);
+				comboModel.Sensitive = !project.IsPortableLibrary;
 				break;
 
 			case DialogState.CreateConfig:
@@ -609,6 +609,17 @@ namespace MonoDevelop.WebReferences.Dialogs
 			}
 		}
 
+
+		protected override void OnDestroyed ()
+		{
+			btnNavBack.Activated -= Browser_BackButtonClicked;
+			btnNavNext.Activated -= Browser_NextButtonClicked;
+			btnRefresh.Activated -= Browser_RefreshButtonClicked;
+			btnStop.Activated -= Browser_StopButtonClicked;
+			btnHome.Activated -= Browser_HomeButtonClicked;
+
+			base.OnDestroyed ();
+		}
 	}
 	
 	class AskCredentials: GuiSyncObject, ICredentials
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
index 65ab2ef5af..87869b8874 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
@@ -41,18 +41,12 @@ namespace MonoDevelop.WebReferences.NodeBuilders
 			return "WebReferences";
 		}
 		
-		/// <summary>Build the node in the project tree.</summary>
-		/// <param name="treeBuilder">An ITreeBuilder containing the project tree builder.</param>
-		/// <param name="dataObject">An object containing the current builder child.</param>
-		/// <param name="label">A string containing the label of the node.</param>
-		/// <param name="icon">A Pixbif containing the icon for the node.</param>
-		/// <param name="closedIcon">A Pixbif containing the closed icon for the node.</param>
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
 			var folder = (WebReferenceFolder) dataObject;
 			nodeInfo.Label = folder.IsWCF ? GettextCatalog.GetString ("Web Services") : GettextCatalog.GetString ("Web References");
-			nodeInfo.Icon = Context.GetIcon (Stock.OpenReferenceFolder);
-			nodeInfo.ClosedIcon = Context.GetIcon (Stock.ClosedReferenceFolder);
+			nodeInfo.Icon = Context.GetIcon ("md-webreference-folder");
+			nodeInfo.ClosedIcon = Context.GetIcon ("md-webreference-folder");
 			
 		}
 		
@@ -71,11 +65,9 @@ namespace MonoDevelop.WebReferences.NodeBuilders
 		{
 			var folder = (WebReferenceFolder) dataObject;
 			if (folder.IsWCF)
-				foreach (WebReferenceItem item in WebReferencesService.GetWebReferenceItemsWCF (folder.Project))
-					treeBuilder.AddChild(item);
+				treeBuilder.AddChildren (WebReferencesService.GetWebReferenceItemsWCF (folder.Project));
 			else
-				foreach (WebReferenceItem item in WebReferencesService.GetWebReferenceItemsWS (folder.Project))
-					treeBuilder.AddChild(item);
+				treeBuilder.AddChildren (WebReferencesService.GetWebReferenceItemsWS (folder.Project));
 		}
 		
 		/// <summary>Compare two object with one another and returns a number based on their sort order.</summary>
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs
index f4f7115fe7..9e7ed5efe0 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs
@@ -39,12 +39,6 @@ namespace MonoDevelop.WebReferences.NodeBuilders
 			return "WebReferenceItem";
 		}
 		
-		/// <summary>Build the node in the project tree.</summary>
-		/// <param name="treeBuilder">An ITreeBuilder containing the project tree builder.</param>
-		/// <param name="dataObject">An object containing the current builder child.</param>
-		/// <param name="label">A string containing the label of the node.</param>
-		/// <param name="icon">A Pixbif containing the icon for the node.</param>
-		/// <param name="closedIcon">A Pixbif containing the closed icon for the node.</param>
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
 			nodeInfo.Label = ((WebReferenceItem) dataObject).Name;
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Resources/WebReferenceItem.png b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Resources/WebReferenceItem.png
deleted file mode 100644
index e6939b38c2..0000000000
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Resources/WebReferenceItem.png
+++ /dev/null
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs
index ccc0ebe932..422fbf91fa 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadata.cs
@@ -26,12 +26,20 @@
 
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.WebReferences.WCF
 {
-	public class WCFMetadata: ProjectItem
+	[ExportProjectItemType ("WCFMetadata")]
+	public class WCFMetadata: PathBasedProjectItem
 	{
-		[ProjectPathItemProperty ("Include")]
-		public FilePath Path { get; set; }
+		WCFMetadata ()
+		{
+		}
+
+		public WCFMetadata (FilePath path)
+		{
+			Path = path;
+		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs
index 4aaffcf3a6..435f76d8e6 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WCFMetadataStorage.cs
@@ -26,12 +26,20 @@
 
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.WebReferences.WCF
 {
-	public class WCFMetadataStorage: ProjectItem
+	[ExportProjectItemType ("WCFMetadataStorage")]
+	public class WCFMetadataStorage: PathBasedProjectItem
 	{
-		[ProjectPathItemProperty ("Include")]
-		public FilePath Path { get; set; }
+		WCFMetadataStorage ()
+		{
+		}
+
+		public WCFMetadataStorage (FilePath path)
+		{
+			Path = path;
+		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
index a278dc0a7f..383470d741 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
@@ -40,6 +40,7 @@ using System.Xml.Schema;
 using System.Text;
 using Mono.ServiceContractTool;
 using MonoDevelop.Core;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.WebReferences.WCF
 {
@@ -94,38 +95,41 @@ namespace MonoDevelop.WebReferences.WCF
 			}
 		}
 		
-		protected override string GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
+		protected override async Task<string> GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
 		{
 			if (!dotNetProject.Items.GetAll<WCFMetadata> ().Any ()) {
-				var met = new WCFMetadata ();
-				met.Path = basePath.ParentDirectory;
+				var met = new WCFMetadata (basePath.ParentDirectory);
 				dotNetProject.Items.Add (met);
 			}
 			
 			WCFMetadataStorage metStor = dotNetProject.Items.GetAll<WCFMetadataStorage> ().FirstOrDefault (m => m.Path.CanonicalPath == basePath);
 			if (metStor == null)
-				dotNetProject.Items.Add (new WCFMetadataStorage { Path = basePath });
-			
+				dotNetProject.Items.Add (new WCFMetadataStorage (basePath));
+
 			string file = Path.Combine (basePath, "Reference.svcmap");
-			if (protocol != null) {
-				protocol.ResolveAll ();
-				protocol.WriteAll (basePath, "Reference.svcmap");
-				refGroup = ConvertMapFile (file);
-			} else {
-				// TODO
-				var map = new ReferenceGroup ();
-				map.ClientOptions = defaultOptions;
-				map.Save (file);
-				map.ID = Guid.NewGuid ().ToString ();
-				refGroup = map;
-			}
+
+			await Task.Run (() => {
+				if (protocol != null) {
+					protocol.ResolveAll ();
+					protocol.WriteAll (basePath, "Reference.svcmap");
+					refGroup = ConvertMapFile (file);
+				} else {
+					// TODO
+					var map = new ReferenceGroup ();
+					map.ClientOptions = defaultOptions;
+					map.Save (file);
+					map.ID = Guid.NewGuid ().ToString ();
+					refGroup = map;
+				}
+			});
+
 			foreach (MetadataFile mfile in refGroup.Metadata)
 				dotNetProject.AddFile (new FilePath (mfile.FileName).ToAbsolute (basePath), BuildAction.None);
 			
 			return file;
 		}
 		
-		public override void Update ()
+		public override async Task Update ()
 		{
 			ReferenceGroup resfile = ReferenceGroup.Read (Item.MapFile.FilePath);
 			if (resfile.MetadataSources.Count == 0)
@@ -137,7 +141,7 @@ namespace MonoDevelop.WebReferences.WCF
 			
 			metadata = wref.metadata;
 			protocol = wref.protocol;
-			GenerateFiles (Item.Project, Item.Project.DefaultNamespace, Item.Name);
+			await GenerateFiles (Item.Project, Item.Project.DefaultNamespace, Item.Name);
 		}
 		
 		public override IEnumerable<string> GetAssemblyReferences ()
@@ -148,72 +152,73 @@ namespace MonoDevelop.WebReferences.WCF
 			yield return "System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 		}
 		
-		protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath basePath, string proxyNamespace, string referenceName)
+		protected override Task<string> CreateProxyFile (DotNetProject dotNetProject, FilePath basePath, string proxyNamespace, string referenceName)
 		{
-			var ccu = new CodeCompileUnit ();
-			var cns = new CodeNamespace (proxyNamespace);
-			ccu.Namespaces.Add (cns);
-			
+			CodeDomProvider code_provider = GetProvider (dotNetProject);
+
 			bool targetMoonlight = dotNetProject.TargetFramework.Id.Identifier == ("Silverlight");
 			bool targetMonoTouch = dotNetProject.TargetFramework.Id.Identifier == ("MonoTouch");
 			bool targetMonoDroid = dotNetProject.TargetFramework.Id.Identifier == ("MonoDroid");
-			
-			bool targetCoreClr = targetMoonlight || targetMonoDroid || targetMonoTouch;
-			bool generateSyncMethods = targetMonoDroid | targetMonoTouch;
-			
-			var generator = new ServiceContractGenerator (ccu);
-			generator.Options = ServiceContractGenerationOptions.ChannelInterface | ServiceContractGenerationOptions.ClientClass;
-			if (refGroup.ClientOptions.GenerateAsynchronousMethods || targetCoreClr)
-				generator.Options |= ServiceContractGenerationOptions.AsynchronousMethods;
-			if (refGroup.ClientOptions.GenerateEventBasedAsynchronousMethods)
-				generator.Options |= ServiceContractGenerationOptions.EventBasedAsynchronousMethods;
+
+			return Task.Run (() => {
+				var ccu = new CodeCompileUnit ();
+				var cns = new CodeNamespace (proxyNamespace);
+				ccu.Namespaces.Add (cns);
+
+				bool targetCoreClr = targetMoonlight || targetMonoDroid || targetMonoTouch;
+				bool generateSyncMethods = targetMonoDroid | targetMonoTouch;
+
+				var generator = new ServiceContractGenerator (ccu);
+				generator.Options = ServiceContractGenerationOptions.ChannelInterface | ServiceContractGenerationOptions.ClientClass;
+				if (refGroup.ClientOptions.GenerateAsynchronousMethods || targetCoreClr)
+					generator.Options |= ServiceContractGenerationOptions.AsynchronousMethods;
+				if (refGroup.ClientOptions.GenerateEventBasedAsynchronousMethods)
+					generator.Options |= ServiceContractGenerationOptions.EventBasedAsynchronousMethods;
 #if NET_4_5
 			if (refGroup.ClientOptions.GenerateTaskBasedAsynchronousMethod)
 				generator.Options |= ServiceContractGenerationOptions.TaskBasedAsynchronousMethod;
 #endif
-			if (refGroup.ClientOptions.GenerateInternalTypes)
-				generator.Options |= ServiceContractGenerationOptions.InternalTypes;
-			if (refGroup.ClientOptions.GenerateMessageContracts)
-				generator.Options |= ServiceContractGenerationOptions.TypedMessages;
-//			if (targetMoonlight || targetMonoTouch)
-//				generator.Options |= ServiceContractGenerationOptions.EventBasedAsynchronousMethods;
-			
-			MetadataSet mset;
-			mset = protocol != null ? ToMetadataSet (protocol) : metadata;
+				if (refGroup.ClientOptions.GenerateInternalTypes)
+					generator.Options |= ServiceContractGenerationOptions.InternalTypes;
+				if (refGroup.ClientOptions.GenerateMessageContracts)
+					generator.Options |= ServiceContractGenerationOptions.TypedMessages;
+				//			if (targetMoonlight || targetMonoTouch)
+				//				generator.Options |= ServiceContractGenerationOptions.EventBasedAsynchronousMethods;
 
-			CodeDomProvider code_provider = GetProvider (dotNetProject);
-			
-			var list = new List<IWsdlImportExtension> ();
-			list.Add (new TransportBindingElementImporter ());
-			list.Add (new XmlSerializerMessageContractImporter ());
-			
-			var importer = new WsdlImporter (mset);
-			try {
-				ConfigureImporter (importer);
-			} catch {
-			}
+				MetadataSet mset;
+				mset = protocol != null ? ToMetadataSet (protocol) : metadata;
 
-			Collection<ContractDescription> contracts = importer.ImportAllContracts ();
-			
-			foreach (ContractDescription cd in contracts) {
-				cd.Namespace = proxyNamespace;
-				if (targetCoreClr) {
-					var moonctx = new MoonlightChannelBaseContext ();
-					cd.Behaviors.Add (new MoonlightChannelBaseContractExtension (moonctx, generateSyncMethods));
-					foreach (var od in cd.Operations)
-						od.Behaviors.Add (new MoonlightChannelBaseOperationExtension (moonctx, generateSyncMethods));
-					generator.GenerateServiceContractType (cd);
-					moonctx.Fixup ();
+				var list = new List<IWsdlImportExtension> ();
+				list.Add (new TransportBindingElementImporter ());
+				list.Add (new XmlSerializerMessageContractImporter ());
+
+				var importer = new WsdlImporter (mset);
+				try {
+					ConfigureImporter (importer);
+				} catch {
 				}
-				else
-					generator.GenerateServiceContractType (cd);
-			}
-			
-			string fileSpec = Path.Combine (basePath, referenceName + "." + code_provider.FileExtension);
-			using (TextWriter w = File.CreateText (fileSpec)) {
-				code_provider.GenerateCodeFromCompileUnit (ccu, w, null);
-			}
-			return fileSpec;
+
+				Collection<ContractDescription> contracts = importer.ImportAllContracts ();
+
+				foreach (ContractDescription cd in contracts) {
+					cd.Namespace = proxyNamespace;
+					if (targetCoreClr) {
+						var moonctx = new MoonlightChannelBaseContext ();
+						cd.Behaviors.Add (new MoonlightChannelBaseContractExtension (moonctx, generateSyncMethods));
+						foreach (var od in cd.Operations)
+							od.Behaviors.Add (new MoonlightChannelBaseOperationExtension (moonctx, generateSyncMethods));
+						generator.GenerateServiceContractType (cd);
+						moonctx.Fixup ();
+					} else
+						generator.GenerateServiceContractType (cd);
+				}
+
+				string fileSpec = Path.Combine (basePath, referenceName + "." + code_provider.FileExtension);
+				using (TextWriter w = File.CreateText (fileSpec)) {
+					code_provider.GenerateCodeFromCompileUnit (ccu, w, null);
+				}
+				return fileSpec;
+			});
 		}
 
 		void ConfigureImporter (WsdlImporter importer)
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
index 2a920da2d5..bd5d77331e 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
@@ -30,6 +30,7 @@ using MonoDevelop.Core;
 
 namespace MonoDevelop.WebReferences.WS
 {
+	[ExportProjectItemType ("WebReferenceUrl")]
 	public class WebReferenceUrl: ProjectItem
 	{
 		public WebReferenceUrl ()
@@ -42,9 +43,11 @@ namespace MonoDevelop.WebReferences.WS
 			Include = url;
 			UpdateFromURL = url;
 		}
-		
-		[ItemProperty]
-		public string Include { get; private set; }
+
+		protected override void Read (Project project, MonoDevelop.Projects.MSBuild.IMSBuildItemEvaluated buildItem)
+		{
+			base.Read (project, buildItem);
+		}
 		
 		[ItemProperty]
 		public string UrlBehavior { get; set; }
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferences.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferences.cs
index 96de170e6c..cddaf99f5a 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferences.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferences.cs
@@ -29,9 +29,16 @@ using MonoDevelop.Core;
 
 namespace MonoDevelop.WebReferences.WS
 {
-	public class WebReferences: ProjectItem
+	[ExportProjectItemType ("WebReferences")]
+	public class WebReferences: PathBasedProjectItem
 	{
-		[ProjectPathItemProperty ("Include")]
-		public FilePath Path;
+		WebReferences ()
+		{
+		}
+
+		public WebReferences (FilePath path)
+		{
+			Path = path;
+		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
index f6db9a47df..178a85908a 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
@@ -27,6 +27,7 @@
 using System.Web.Services.Discovery;
 using System.Linq;
 using System.Text;
+using System.Xml.Serialization;
 using MonoDevelop.Projects;
 using System.Web.Services.Description;
 using System.IO;
@@ -34,6 +35,7 @@ using System.CodeDom.Compiler;
 using System.CodeDom;
 using MonoDevelop.Core;
 using WebReferencesDir = MonoDevelop.WebReferences.WS.WebReferences;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.WebReferences.WS
 {
@@ -77,44 +79,45 @@ namespace MonoDevelop.WebReferences.WS
 			}
 		}
 		
-		protected override string GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
+		protected override async Task<string> GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
 		{
 			if (!dotNetProject.Items.GetAll<WebReferencesDir> ().Any ()) {
-				var met = new WebReferencesDir ();
-				met.Path = basePath.ParentDirectory;
+				var met = new WebReferencesDir (basePath.ParentDirectory);
 				dotNetProject.Items.Add (met);
 			}
-			
-			WebReferenceUrl wru = dotNetProject.Items.GetAll<WebReferenceUrl> ().FirstOrDefault (m => m.RelPath.CanonicalPath == basePath);
-			if (wru == null) {
-				wru = new WebReferenceUrl (protocol.Url);
-				wru.RelPath = basePath;
-				dotNetProject.Items.Add (wru);
-			}
-			
-			protocol.ResolveAll ();
-			DiscoveryClientResultCollection files = protocol.WriteAll (basePath, "Reference.map");
+
+			DiscoveryClientResultCollection files = await Task.Run (() => {
+				WebReferenceUrl wru = dotNetProject.Items.GetAll<WebReferenceUrl> ().FirstOrDefault (m => m.RelPath.CanonicalPath == basePath);
+				if (wru == null) {
+					wru = new WebReferenceUrl (protocol.Url);
+					wru.RelPath = basePath;
+					dotNetProject.Items.Add (wru);
+				}
+
+				protocol.ResolveAll ();
+				return protocol.WriteAll (basePath, "Reference.map");
+			});
 			
 			foreach (DiscoveryClientResult dr in files)
-				dotNetProject.AddFile (new FilePath (dr.Filename).ToAbsolute (basePath), BuildAction.None);
+				dotNetProject.AddFile (new FilePath (Path.GetFileName (dr.Filename)).ToAbsolute (basePath), BuildAction.None);
 			
 			return Path.Combine (basePath, "Reference.map");
 		}
 
-		public override void Update ()
+		public override async Task Update ()
 		{
 			WebReferenceUrl wru = Item.Project.Items.GetAll<WebReferenceUrl> ().FirstOrDefault (m => m.RelPath.CanonicalPath == Item.BasePath);
 			if (wru == null)
 				return;
-			
-			var wref = (WebServiceDiscoveryResultWS) WebReferencesService.WsEngine.Discover (wru.UpdateFromURL);
+
+			var wref = await Task.Run (() => (WebServiceDiscoveryResultWS)WebReferencesService.WsEngine.Discover (wru.UpdateFromURL));
 			if (wref == null)
 				return;
 			
 			protocol = wref.protocol;
 			
 			// Re-generate the proxy and map files
-			GenerateFiles (Item.Project, Item.Project.DefaultNamespace, Item.Name);
+			await GenerateFiles (Item.Project, Item.Project.DefaultNamespace, Item.Name);
 		}
 		
 		public override System.Collections.Generic.IEnumerable<string> GetAssemblyReferences ()
@@ -124,44 +127,48 @@ namespace MonoDevelop.WebReferences.WS
 			yield return "System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 		}
 		
-		protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath basePath, string proxyNamespace, string referenceName)
+		protected override Task<string> CreateProxyFile (DotNetProject dotNetProject, FilePath basePath, string proxyNamespace, string referenceName)
 		{
 			// Setup the proxy namespace and compile unit
 			CodeDomProvider codeProv = GetProvider (dotNetProject);
-			var codeNamespace = new CodeNamespace (proxyNamespace);
-			var urlConstructor = new CodeConstructor ();
-			var codeUnit = new CodeCompileUnit ();
-			codeUnit.Namespaces.Add (codeNamespace);
-
-			// Setup the importer and import the service description into the code unit
-			ServiceDescriptionImporter importer = Library.ReadServiceDescriptionImporter (protocol);
-			importer.Import (codeNamespace, codeUnit);
-
-			// Add the new Constructor with Url as a paremeter
-			// Search for the class which inherit SoapHttpClientProtocol (Which is the Service Class)
-			foreach (CodeTypeDeclaration declarationType in codeUnit.Namespaces[0].Types) 
-				if (declarationType.IsClass) 
-					if (declarationType.BaseTypes.Count > 0)
-						// Is a Service Class
-						if (declarationType.BaseTypes [0].BaseType.IndexOf ("SoapHttpClientProtocol", System.StringComparison.Ordinal) > -1) {
-							// Create new public constructor with the Url as parameter
-							urlConstructor.Attributes = MemberAttributes.Public;
-							urlConstructor.Parameters.Add (new CodeParameterDeclarationExpression ("System.String", "url"));
-							urlConstructor.Statements.Add (new CodeAssignStatement (
-						                                                        new CodePropertyReferenceExpression (new CodeThisReferenceExpression(), 
-						                                                                                             "Url"),
-						                                                        new CodeVariableReferenceExpression ("url")));
-							declarationType.Members.Add (urlConstructor);
-						}
-			
-			// Generate the code and save the file
-			string fileSpec = Path.Combine (basePath, dotNetProject.LanguageBinding.GetFileName (referenceName));
-			var writer = new StreamWriter (fileSpec);
-			codeProv.GenerateCodeFromCompileUnit (codeUnit, writer, new CodeGeneratorOptions ());
-			
-			writer.Close ();
-			
-			return fileSpec;
+
+			return Task.Run (() => {
+				var codeNamespace = new CodeNamespace (proxyNamespace);
+				var urlConstructor = new CodeConstructor ();
+				var codeUnit = new CodeCompileUnit ();
+				codeUnit.Namespaces.Add (codeNamespace);
+
+				// Setup the importer and import the service description into the code unit
+				ServiceDescriptionImporter importer = Library.ReadServiceDescriptionImporter (protocol);
+				importer.CodeGenerationOptions = CodeGenerationOptions.GenerateNewAsync;
+				importer.Import (codeNamespace, codeUnit);
+
+				// Add the new Constructor with Url as a paremeter
+				// Search for the class which inherit SoapHttpClientProtocol (Which is the Service Class)
+				foreach (CodeTypeDeclaration declarationType in codeUnit.Namespaces [0].Types)
+					if (declarationType.IsClass)
+						if (declarationType.BaseTypes.Count > 0)
+							// Is a Service Class
+							if (declarationType.BaseTypes [0].BaseType.IndexOf ("SoapHttpClientProtocol", System.StringComparison.Ordinal) > -1) {
+								// Create new public constructor with the Url as parameter
+								urlConstructor.Attributes = MemberAttributes.Public;
+								urlConstructor.Parameters.Add (new CodeParameterDeclarationExpression ("System.String", "url"));
+								urlConstructor.Statements.Add (new CodeAssignStatement (
+																					new CodePropertyReferenceExpression (new CodeThisReferenceExpression (),
+																														 "Url"),
+																					new CodeVariableReferenceExpression ("url")));
+								declarationType.Members.Add (urlConstructor);
+							}
+
+				// Generate the code and save the file
+				string fileSpec = Path.Combine (basePath, dotNetProject.LanguageBinding.GetFileName (referenceName));
+				var writer = new StreamWriter (fileSpec);
+				codeProv.GenerateCodeFromCompileUnit (codeUnit, writer, new CodeGeneratorOptions ());
+
+				writer.Close ();
+
+				return fileSpec;
+			});
 		}
 
 		public override string GetServiceURL ()
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.addin.xml b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.addin.xml
index 4db5d43fe3..796c2541f2 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.addin.xml
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.addin.xml
@@ -56,7 +56,8 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Core/StockIcons">
-		<StockIcon stockid = "md-webreference-item" resource = "WebReferenceItem.png" />
+		<StockIcon stockid = "md-webreference-item" resource = "web-reference-16.png" />
+		<StockIcon stockid = "md-webreference-folder" resource = "folder-web-16.png" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj
index 3cb39b9ec1..b519acf43c 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.csproj
@@ -139,8 +139,53 @@
     <EmbeddedResource Include="MonoDevelop.WebReferences.Resources\wsdl.html">
       <LogicalName>wsdl.html</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelop.WebReferences.Resources\WebReferenceItem.png">
-      <LogicalName>WebReferenceItem.png</LogicalName>
+    <EmbeddedResource Include="icons\folder-web-16.png">
+      <LogicalName>folder-web-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\folder-web-16%402x.png">
+      <LogicalName>folder-web-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\folder-web-16~dark.png">
+      <LogicalName>folder-web-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\folder-web-16~dark%402x.png">
+      <LogicalName>folder-web-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\folder-web-16~dark~sel.png">
+      <LogicalName>folder-web-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\folder-web-16~dark~sel%402x.png">
+      <LogicalName>folder-web-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\folder-web-16~sel.png">
+      <LogicalName>folder-web-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\folder-web-16~sel%402x.png">
+      <LogicalName>folder-web-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-reference-16.png">
+      <LogicalName>web-reference-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-reference-16%402x.png">
+      <LogicalName>web-reference-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-reference-16~dark.png">
+      <LogicalName>web-reference-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-reference-16~dark%402x.png">
+      <LogicalName>web-reference-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-reference-16~dark~sel.png">
+      <LogicalName>web-reference-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-reference-16~dark~sel%402x.png">
+      <LogicalName>web-reference-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-reference-16~sel.png">
+      <LogicalName>web-reference-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-reference-16~sel%402x.png">
+      <LogicalName>web-reference-16~sel@2x.png</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -154,5 +199,6 @@
     <Folder Include="MonoDevelop.WebReferences.WCF\" />
     <Folder Include="MonoDevelop.WebReferences\" />
     <Folder Include="MonoDevelop.WebReferences.WS\" />
+    <Folder Include="icons\" />
   </ItemGroup>
 </Project>
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
index bfa1ad18de..7d557d34fb 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
@@ -45,7 +45,7 @@ namespace MonoDevelop.WebReferences
 				
 				var dr = (DiscoveryReference) Activator.CreateInstance(type);
 				dr.Url = dcr.Url;
-				var fs = new FileStream (Path.Combine(basePath, dcr.Filename), FileMode.Open, FileAccess.Read);
+				var fs = new FileStream (Path.Combine(basePath, Path.GetFileName (dcr.Filename)), FileMode.Open, FileAccess.Read);
 				Documents.Add (dr.Url, dr.ReadDocument (fs));
 				fs.Close ();
 				References.Add (dr.Url, dr);
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
index 175ceec2a0..2c71248e96 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
@@ -1,6 +1,6 @@
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
-
+using System.Threading.Tasks;
 
 namespace MonoDevelop.WebReferences
 {
@@ -38,10 +38,10 @@ namespace MonoDevelop.WebReferences
 		}
 		
 		/// <summary>Update the web reference item by using the map file.</summary>
-		public void Update()
+		public Task Update()
 		{
 			WebServiceDiscoveryResult service = engine.Load (this);
-			service.Update ();
+			return service.Update ();
 		}
 		
 		/// <summary>Delete the web reference from the project.</summary>
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferencesService.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferencesService.cs
index 00aa735380..d8b367469c 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferencesService.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferencesService.cs
@@ -29,6 +29,7 @@ using MonoDevelop.Projects;
 using System.Collections.Generic;
 using MonoDevelop.WebReferences.WCF;
 using MonoDevelop.WebReferences.WS;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.WebReferences
 {
@@ -62,11 +63,11 @@ namespace MonoDevelop.WebReferences
 			// This is called from a background thread when webreferences are being
 			// updated asynchronously, so lets keep things simple for the users of
 			// this event and just ensure we proxy it to the main thread.
-			if (MonoDevelop.Ide.DispatchService.IsGuiThread) {
+			if (Runtime.IsMainThread) {
 				if (WebReferencesChanged != null)
 					WebReferencesChanged (null, new WebReferencesChangedEventArgs (project));
 			} else {
-				MonoDevelop.Ide.DispatchService.GuiDispatch (() => {
+				Runtime.RunInMainThread (() => {
 					if (WebReferencesChanged != null)
 						WebReferencesChanged (null, new WebReferencesChangedEventArgs (project));
 				});
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
index 62d4395fc4..2e8bfe4398 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
@@ -30,6 +30,7 @@ using MonoDevelop.Core;
 using System.Collections.Generic;
 using System.IO;
 using System.CodeDom.Compiler;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.WebReferences
 {
@@ -72,7 +73,7 @@ namespace MonoDevelop.WebReferences
 		
 		public abstract string ProxyGenerator { get; }
 		
-		public virtual void GenerateFiles (DotNetProject project, string namspace, string referenceName)
+		public virtual async Task GenerateFiles (DotNetProject project, string namspace, string referenceName)
 		{
 			//make sure we have a valid value for the namespace
 			if (string.IsNullOrEmpty (namspace)) {
@@ -90,10 +91,10 @@ namespace MonoDevelop.WebReferences
 				project.Files.Remove (f);
 			
 			// Generate the wsdl, disco and map files
-			string mapSpec = GenerateDescriptionFiles (project, basePath);
+			string mapSpec = await GenerateDescriptionFiles (project, basePath);
 			
 			// Generate the proxy class
-			string proxySpec = CreateProxyFile (project, basePath, namspace + "." + referenceName, "Reference");
+			string proxySpec = await CreateProxyFile (project, basePath, namspace + "." + referenceName, "Reference");
 			
 			ProjectFile mapFile = project.Files.GetFile (mapSpec);
 			if (mapFile == null) {
@@ -128,7 +129,7 @@ namespace MonoDevelop.WebReferences
 				string targetName = project.TargetRuntime.AssemblyContext.GetAssemblyNameForVersion (refName, null, project.TargetFramework);
 				//FIXME: warn when we could not find a matching target assembly
 				if (targetName != null) {
-					packageRef = new ProjectReference (ReferenceType.Package, targetName);
+					packageRef = ProjectReference.CreateAssemblyReference (targetName);
 					if (!project.References.Contains (packageRef))
 						project.References.Add (packageRef);
 				}
@@ -136,10 +137,10 @@ namespace MonoDevelop.WebReferences
 			WebReferencesService.NotifyWebReferencesChanged (project);
 		}
 		
-		protected abstract string GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath);
+		protected abstract Task<string> GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath);
 		
-		protected abstract string CreateProxyFile (DotNetProject dotNetProject, FilePath basePath, string proxyNamespace, string referenceName);
+		protected abstract Task<string> CreateProxyFile (DotNetProject dotNetProject, FilePath basePath, string proxyNamespace, string referenceName);
 		
-		public abstract void Update ();
+		public abstract Task Update ();
 	}
 }
diff --git a/main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs b/main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs
index 26c8b48195..3788b1590a 100644
--- a/main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs
@@ -5,14 +5,23 @@ namespace MonoDevelop.WebReferences.Dialogs
 	public partial class WCFConfigWidget
 	{
 		private global::Gtk.VBox dialog1_VBox;
+		
 		private global::Gtk.Table wcfOptions;
+		
 		private global::Gtk.ComboBox dictionaryCollection;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.Label label4;
+		
 		private global::Gtk.ComboBox listAccess;
+		
 		private global::Gtk.ComboBox listAsync;
+		
 		private global::Gtk.ComboBox listCollection;
 
 		protected virtual void Build ()
diff --git a/main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs b/main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs
index 9a240c227b..b103b95f2a 100644
--- a/main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/gtk-gui/MonoDevelop.WebReferences.Dialogs.WebReferenceDialog.cs
@@ -5,29 +5,53 @@ namespace MonoDevelop.WebReferences.Dialogs
 	internal partial class WebReferenceDialog
 	{
 		private global::Gtk.UIManager UIManager;
+		
 		private global::Gtk.Action btnNavBack;
+		
 		private global::Gtk.Action btnNavNext;
+		
 		private global::Gtk.Action btnRefresh;
+		
 		private global::Gtk.Action btnStop;
+		
 		private global::Gtk.Action btnHome;
+		
 		private global::Gtk.VBox vbxContainer;
+		
 		private global::Gtk.Toolbar tlbNavigate;
+		
 		private global::Gtk.Table tblWebReferenceUrl;
+		
 		private global::Gtk.Button btnGO;
+		
 		private global::Gtk.Label lblWebServiceUrl;
+		
 		private global::Gtk.Entry tbxReferenceURL;
+		
 		private global::Gtk.Frame frmBrowser;
+		
 		private global::Gtk.Table tblReferenceName;
+		
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.ComboBox comboModel;
+		
 		private global::Gtk.Label label1;
+		
 		private global::Gtk.Label lblNamespace;
+		
 		private global::Gtk.Label lblReference;
+		
 		private global::Gtk.Entry tbxNamespace;
+		
 		private global::Gtk.Entry tbxReferenceName;
+		
 		private global::Gtk.Button btnCancel;
+		
 		private global::Gtk.Button btnBack;
+		
 		private global::Gtk.Button btnOK;
+		
 		private global::Gtk.Button btnConfig;
 
 		protected virtual void Build ()
@@ -61,7 +85,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 			this.vbxContainer = new global::Gtk.VBox ();
 			this.vbxContainer.Name = "vbxContainer";
 			// Container child vbxContainer.Gtk.Box+BoxChild
-			this.UIManager.AddUiFromString (@"<ui><toolbar name='tlbNavigate'><toolitem name='btnNavBack' action='btnNavBack'/><toolitem name='btnNavNext' action='btnNavNext'/><toolitem name='btnRefresh' action='btnRefresh'/><toolitem name='btnStop' action='btnStop'/><toolitem name='btnHome' action='btnHome'/></toolbar></ui>");
+			this.UIManager.AddUiFromString ("<ui><toolbar name='tlbNavigate'><toolitem name='btnNavBack' action='btnNavBack'/><toolitem name='btnNavNext' action='btnNavNext'/><toolitem name='btnRefresh' action='btnRefresh'/><toolitem name='btnStop' action='btnStop'/><toolitem name='btnHome' action='btnHome'/></toolbar></ui>");
 			this.tlbNavigate = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/tlbNavigate")));
 			this.tlbNavigate.Name = "tlbNavigate";
 			this.tlbNavigate.ShowArrow = false;
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16.png b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16.png
new file mode 100644
index 0000000000..a86f7c7217
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16@2x.png b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16@2x.png
new file mode 100644
index 0000000000..a4bd682242
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16@2x.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark.png b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark.png
new file mode 100644
index 0000000000..c07eb02834
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark@2x.png b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark@2x.png
new file mode 100644
index 0000000000..29a92d0e19
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark~sel.png b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark~sel.png
new file mode 100644
index 0000000000..ca426c05ad
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark~sel@2x.png
new file mode 100644
index 0000000000..4274f200a6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~sel.png b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~sel.png
new file mode 100644
index 0000000000..ca426c05ad
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~sel.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~sel@2x.png b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~sel@2x.png
new file mode 100644
index 0000000000..4274f200a6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/folder-web-16~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16.png b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16.png
new file mode 100644
index 0000000000..c69492cf42
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16@2x.png b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16@2x.png
new file mode 100644
index 0000000000..d7266a7ff2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16@2x.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark.png b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark.png
new file mode 100644
index 0000000000..cb0cf67908
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark@2x.png b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark@2x.png
new file mode 100644
index 0000000000..c1e8eb8720
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark@2x.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark~sel.png b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark~sel.png
new file mode 100644
index 0000000000..88b20a94f2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark~sel.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark~sel@2x.png
new file mode 100644
index 0000000000..c94e07680d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~dark~sel@2x.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~sel.png b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~sel.png
new file mode 100644
index 0000000000..88b20a94f2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~sel.png
diff --git a/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~sel@2x.png b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~sel@2x.png
new file mode 100644
index 0000000000..c94e07680d
--- /dev/null
+++ b/main/src/addins/MonoDevelop.WebReferences/icons/web-reference-16~sel@2x.png
diff --git a/main/src/addins/MonoDeveloperExtensions/ChangeLog b/main/src/addins/MonoDeveloperExtensions/ChangeLog
deleted file mode 100644
index a4f1db7c01..0000000000
--- a/main/src/addins/MonoDeveloperExtensions/ChangeLog
+++ /dev/null
@@ -1,466 +0,0 @@
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDeveloperExtensions.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Commands.cs:
-	* MonoSolutionItemHandler.cs:
-	* MonoDeveloperExtensions.csproj:
-	* MonoDeveloperExtensions.addin.xml: Merged MD.Projects into
-	  MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components
-	  into MD.Ide.
-
-2010-01-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions.csproj: Flush.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoSolutionItemHandler.cs: Introduced the
-	  ConfigurationSelector class to all methods that previously
-	  took a configuration name as string. This eliminates the
-	  ambiguity between solution configuration names and project
-	  configuration names.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDeveloperExtensions.addin.xml: Bump MD version.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDeveloperExtensions.addin.xml: Bump MD version.
-
-2009-09-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoMakefileFormat.cs: Use the new DotNetAssemblyProject
-	  class instead of DotNetProject, which is now abstract.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoMakefileFormat.cs: Use the new FilePath class for
-	  handling file and directory paths.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDeveloperExtensions.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDeveloperExtensions.addin.xml: Bump MD version.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions.addin.xml: Track merge of the
-	  project pad context menu.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDeveloperExtensions.csproj: Make implicit references
-	  explicit. Csc is much pickier about these.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions.csproj: Flush.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions.mds:
-	* MonoDeveloperExtensions.mdp:
-	* MonoDeveloperExtensions.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDeveloperExtensions.addin.xml: Bump MD version.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDeveloperExtensions.mdp: Flush project format changes.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* NUnit/NUnit.mdp:
-	* MonoDeveloperExtensions.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoMakefileFormat.cs: Track API changes.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* NUnit/Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions.addin.xml: Bump MD version.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoSolutionItemHandler.cs: Track API.
-
-2008-09-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoSolutionItemHandler.cs: Ignore compiler messages which are not
-	  errors or warnings. Fixes bug #393621.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* NUnit/NUnit.mdp, MonoDeveloperExtensions.mdp: Updated generated code.
-
-2008-06-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoMakefileFormat.cs: Track api changes.
-
-2008-06-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoMakefileFormat.cs: Avoid re-initializing the project handler for
-	  projects already created with the Mono format.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Bump MD version.
-
-2008-05-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoSolutionItemHandler.cs: Fix warning.
-
-2008-05-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoMakefileFormat.cs: Track api changes.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Merged the extension points for
-	  project and solution option panels into a single extension point. A
-	  single extension point will now be used for all kinds of items.
-	  Extension conditions can be used to make panels visible only for
-	  some specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoSolutionItemHandler.cs: Replaced
-	  ICompilerResult/DefaultCompilerResult/CompilerResults by a new
-	  BuildResult class, which has owner information at error level, so
-	  it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.mds, MonoMakefileFormat.cs, Commands.cs,
-	  MonoSolutionItemHandler.cs, Makefile.am,
-	  MonoDeveloperExtensions.addin.xml, NUnit/MonoTestProvider.cs,
-	  MonoDeveloperExtensions.mdp: New project model changes.
-
-2008-03-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.mdp: Removed unneeded dependencies.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Makefile.am, MonoDeveloperExtensions.mdp: Removed some unused glade and
-	  gnome-sharp references (only the unused). But I'll continue to remove
-	  glade, we need to lower the dependency tree a bit.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Update MD version.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Updated add-in category and
-	  description.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am, NUnit/NUnit.mdp, MonoDeveloperExtensions.mdp: Directory
-	  reorganization.
-
-2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoProject.cs: Use RootCombine instead of CurrentOpenCombine when
-	  possible.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Bump MD version.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.mds, MonoDeveloperExtensions.mdp, NUnit/NUnit.mdp:
-	  Project file names updated by change in MD path functions.
-
-2007-10-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoProject.cs, MonoProjectConfiguration.cs: MonoProject now is a subclass
-	  of DotNetProject. Project export to VS format now works.
-
-2007-10-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoMakefileFormat.cs, MonoProject.cs: Make sure the .sources file is
-	  included when exporting the project.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Bump MD version.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am, MonoDeveloperExtensions.addin.xml,
-	  MonoDeveloperExtensions.mdp, NUnit/Makefile.am: Reorganized the
-	  extension point hierarchy. Embedded all add-in manifests as resources.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Commands.cs: Converted DispatchService to a static class.
-
-2007-06-19  Ankit Jain  <jankit@novell.com>
-
-	Fix bug#81901.
-	* MonoProject.cs (AddSourceFile): Use File.* for file operations
-	instead of FileService.
-	(RemoveSourceFile): Likewise.
-
-2007-05-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Removed MS namespace from add-in
-	  dependency.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.mdp: Copy the .addins.xml file to the output
-	  dir.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am, MonoDeveloperExtensions.mdp: Reference shared assemblies
-	  from the correct location.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am, MonoDeveloperExtensions.addin.xml,
-	  MonoDeveloperExtensions.mdp: Migration to Mono.Addins.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoMakefileFormat.cs: Track api changes.
-	* MonoDeveloperExtensions.mdp: Updated.
-
-2007-03-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoMakefileFormat.cs: Save MonoProject and MonoCombine objects only.
-	* MonoDeveloperExtensions.mdp, NUnit/NUnit.mdp: Disable local-copy
-	  references.
-
-2007-03-08  Marek Sieradzki  <marek.sieradzki@gmail.com>
-
-	* MonoTestProvider.cs: Removing as it was already moved to separate
-	assembly.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* NUnit/NUnit.mdp: Set target runtime to 2.0.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am, MonoDeveloperExtensions.mdp, NUnit/Makefile.am,
-	  NUnit/NUnit.mdp: Synchronized MD project and makefile.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AssemblyInfo.cs: Removed version auto-increment.
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.mds, MonoDeveloperExtensions.mdp,
-	  NUnit/NUnit.mdp: Updated.
-	* MonoProject.cs: Track api changes.
-
-2007-02-06  Ankit Jain  <jankit@novell.com>
-
-	* Commands.cs: Remove all svn commands. We have svn integrated now.
-	* MonoDeveloperExtensions.addin.xml: Likewise.
-
-2007-02-06  Ankit Jain  <jankit@novell.com>
-
-	* MonoProject.cs (OnClean): Override.
-
-2006-02-02 David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* MonoDeveloperExtensions.addin.xml: replaced icon for install command by gtk+ 2.4 stock icon
-	
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoProject.cs: Use the FileService for copying and deleting files.
-
-2006-12-07 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* MonoDeveloperExtensions.mdp: Updated so it can
-	be built from MonoDevelop.
-
-2006-09-19 Jacob Ilsø Christensen  <jacobilsoe@gmail.com>
-
-	* NUnit: Added svn:ignore for MonoDeveloperExtensions_nunit.pidb
-
-2006-08-22 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoCombine.cs:
-	* MonoProject.cs: Track api changes.
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Updated versions.
-	* MonoDeveloperExtensions.mdp: Updated.
-
-2006-06-29  Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoProject.cs: Implement SupportedLanguages, to filter file templates.
-
-2006-05-31 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoProject.cs: Removed dependency to NUnit add-in.
-	* Makefile.am: Removed dependency to NUnit add-in. Added the
-	  new nunit module to the build.
-	
-	* MonoDeveloperExtensions.addin.xml: Added optional module which
-	  extends the nunit add-in.
-	  
-	* NUnit/MonoTestProvider.cs: 
-	* NUnit/Makefile.am: 
-	* NUnit/NUnit.mdp: Created a new assembly which implements the nunit
-	  extension for Mono projects.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions.addin.xml: Updated versions.
-	* MonoDeveloperExtensions.mdp: Updated.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Updated references.
-
-2006-03-26 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* MonoDeveloperExtensions/MonoMakefileFormat.cs: Include 2.0
-	  directories in the solution. Patch by Marek Sieradzki.
-
-2006-03-29 Grzegorz Sobanski  <silk@boktor.net>  
-
-	* Makefile.am: removed unneeded references to nunit.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* MonoDeveloperExtensions.mdp: Updated.
-	* Makefile.am: Use an unified format. Patch by Matze Braun.
-	* MonoDeveloperExtensions.addin.xml: Updated add-in versions.
-
-2006-02-08 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* MonoMakefileFormat.cs: Track changes in Makefile format, again.
-
-2006-01-10 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* MonoMakefileFormat.cs: Track changes in Makefile format.
-
-2005-10-19  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Commands.cs: Always open documents in the GUI thread.
-
-2005-10-11  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Fixed addin header information.
-	Use "id" attribuet instead of "name" to identify addins.
-
-2005-10-04  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDeveloperExtensions.addin.xml: Added addin dependencies.
-
-2005-09-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	 * MonoProject.cs: Use the new regex for parsing error messages.
-	 * Commands.cs: Use an external console for the ci command.
-
-2005-08-10  Ben Motmans  <ben.motmans@gmail.com>
-
-	* MonoDeveloperExtensions.mdp: references update
-
-2005-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions/Commands.cs:
-	* MonoDeveloperExtensions/MonoProject.cs: Track api changes.
-
-2005-07-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoMakefileFormat.cs: Avoid adding projects twice.
-	* MonoProject.cs: 
-	* MonoTestProvider.cs: Generate a unit test tree for assemblies that
-	have a Test directory.
-	* Makefile.am: Added conditional build.
-	* MonoDeveloperExtensions.addin.xml: This addin depends on the nunit addin.
-
-2005-07-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoProject.cs: Implemented CreateConfiguration method.
-	* MonoDeveloperExtensions.addin.xml: Added install command
-	  to the correct toolbar.
-
-2005-04-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDeveloperExtensions.addin.xml:
-	* Commands.cs: Use the new command service. Added hacky support for
-	basic svn operations.
-
-2005-04-17  John Luke  <john.luke@gmail.com>
-
-	* Makefile.am: fix distcheck
-
-2005-04-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoProject.cs: Look for ChangeLog files in a more rational 
-	(and faster) way.
-
-2005-05-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoProject.cs: Update the sources file when files are renamed.
-	Don't add the ChangeLog file to the project for now, it's too slow
-	to look for it.
-
-2005-02-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoProject.cs: Don't try to parse errors from the stdout, only
-	from stderr.
-	* MonoMakefileFormat.cs: In GetValidFormatName, keep the file path.
-
diff --git a/main/src/addins/MonoDeveloperExtensions/Commands.cs b/main/src/addins/MonoDeveloperExtensions/Commands.cs
index 9c0477378e..9601cd5eb0 100644
--- a/main/src/addins/MonoDeveloperExtensions/Commands.cs
+++ b/main/src/addins/MonoDeveloperExtensions/Commands.cs
@@ -30,7 +30,7 @@ using MonoDevelop.Projects;
 using MonoDevelop.Core;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
- 
+using System.Threading.Tasks;
 
 namespace MonoDeveloper
 {	
@@ -45,19 +45,19 @@ namespace MonoDeveloper
 		{
 			DotNetProject p = IdeApp.ProjectOperations.CurrentSelectedProject as DotNetProject;
 			if (p != null)
-				DispatchService.BackgroundDispatch (new StatefulMessageHandler (Install), p);
+				Task.Run (() => Install (p));
 		}
 		
 		protected override void Update (CommandInfo info)
 		{
-			info.Visible = MonoMakefileFormat.IsMonoProject (IdeApp.ProjectOperations.CurrentSelectedProject);
+			info.Visible = IdeApp.ProjectOperations.CurrentSelectedItem is MonoMakefileProjectExtension;
 		}
 		
-		void Install (object prj)
+		async void Install (object prj)
 		{
 			DotNetProject p = prj as DotNetProject;
-			using (IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBuildProgressMonitor ()) {
-				p.RunTarget (monitor, "install", IdeApp.Workspace.ActiveConfiguration);
+			using (ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetBuildProgressMonitor ()) {
+				await p.RunTarget (monitor, "install", IdeApp.Workspace.ActiveConfiguration);
 			}
 		}
 
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
index f8288a171a..96813bd4dc 100644
--- a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
+++ b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
@@ -1,8 +1,7 @@
 <ExtensionModel>
     
-	<Extension path = "/MonoDevelop/ProjectModel/FileFormats">
-		<FileFormat id = "MonoMakefile" name="Mono Makefile"
-						class = "MonoDeveloper.MonoMakefileFormat" />
+	<Extension path = "/MonoDevelop/ProjectModel/WorkspaceObjectReaders">
+		<Class class = "MonoDeveloper.MonoMakefileProjectReader" />
 	</Extension>
 
   <Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels">
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj
index a994b138b5..92f57f4f76 100644
--- a/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj
+++ b/main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.csproj
@@ -75,10 +75,11 @@
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="MonoMakefile.cs" />
-    <Compile Include="MonoMakefileFormat.cs" />
     <Compile Include="Commands.cs" />
-    <Compile Include="MonoSolutionItemHandler.cs" />
     <Compile Include="AddinInfo.cs" />
+    <Compile Include="MonoMakefileSolutionExtension.cs" />
+    <Compile Include="MonoMakefileProjectExtension.cs" />
+    <Compile Include="MonoMakefileProjectReader.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDeveloperExtensions.addin.xml">
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoMakefile.cs b/main/src/addins/MonoDeveloperExtensions/MonoMakefile.cs
index 8168d90acb..672a5ef378 100644
--- a/main/src/addins/MonoDeveloperExtensions/MonoMakefile.cs
+++ b/main/src/addins/MonoDeveloperExtensions/MonoMakefile.cs
@@ -41,6 +41,8 @@ namespace MonoDeveloper
 		string multilineMatch = @"(((?<content>.*)(?<!\\)\n)|((?<content>.*?)\\\n(\t(?<content>.*?)\\\n)*\t(?<content>.*?)(?<!\\)\n))";
 		string fileName;
 		
+		public static string[] MonoConfigurations = { "default", "net_4_0" };
+
 		public MonoMakefile (string file)
 		{
 			this.fileName = file;
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoMakefileFormat.cs b/main/src/addins/MonoDeveloperExtensions/MonoMakefileFormat.cs
deleted file mode 100644
index ce6dd41f4a..0000000000
--- a/main/src/addins/MonoDeveloperExtensions/MonoMakefileFormat.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-//
-// MonoMakefileFormat.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using MonoDevelop.Core;
-using System.Text.RegularExpressions;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Extensions;
-
-namespace MonoDeveloper
-{
-	public class MonoMakefileFormat: IFileFormat
-	{
-		public static readonly string[] Configurations = new string [] {
-			"default", "net_2_0"
-		};
-		
-		public string Name {
-			get { return "Mono Makefile"; }
-		}

-

-		public FilePath GetValidFormatName (object obj, FilePath fileName)
-		{
-			return fileName.ParentDirectory.Combine ("Makefile");
-		}

-

-		public bool CanReadFile (FilePath file, Type expectedType)
-		{
-			if (file.FileName != "Makefile") return false;
-			MonoMakefile mkfile = new MonoMakefile (file);
-			if (mkfile.Content.IndexOf ("build/rules.make") == -1) return false;
-			
-			if (mkfile.GetVariable ("LIBRARY") != null) return expectedType.IsAssignableFrom (typeof(DotNetProject));
-			if (mkfile.GetVariable ("PROGRAM") != null) return expectedType.IsAssignableFrom (typeof(DotNetProject));
-			string subdirs = mkfile.GetVariable ("SUBDIRS");
-			if (subdirs != null && subdirs.Trim (' ','\t') != "")
-				return expectedType.IsAssignableFrom (typeof(Solution)) || expectedType.IsAssignableFrom (typeof(SolutionFolder));
-			
-			return false;
-		}
-		
-		public bool CanWriteFile (object obj)
-		{
-			return (obj is SolutionFolder) || IsMonoProject (obj);
-		}

-

-		public void WriteFile (FilePath file, object node, IProgressMonitor monitor)
-		{
-		}

-

-		public List<FilePath> GetItemFiles (object obj)
-		{

-			List<FilePath> col = new List<FilePath> ();
-			DotNetProject mp = obj as DotNetProject;
-			if (mp != null) {
-				MonoSolutionItemHandler handler = ProjectExtensionUtil.GetItemHandler (mp) as MonoSolutionItemHandler;
-				if (handler != null && File.Exists (handler.SourcesFile)) {
-					col.Add (mp.FileName);
-					col.Add (handler.SourcesFile);
-				}
-			}
-			return col;
-		}

-

-		public object ReadFile (FilePath fileName, Type expectedType, IProgressMonitor monitor)
-		{
-			return ReadFile (fileName, false, monitor);
-		}

-

-		public object ReadFile (FilePath fileName, bool hasParentSolution, IProgressMonitor monitor)
-		{

-			FilePath basePath = fileName.ParentDirectory;
-			MonoMakefile mkfile = new MonoMakefile (fileName);
-			string aname = mkfile.GetVariable ("LIBRARY");
-			if (aname == null) aname = mkfile.GetVariable ("PROGRAM");
-			
-			try {
-				ProjectExtensionUtil.BeginLoadOperation ();
-				if (aname != null) {
-					// It is a project
-					monitor.BeginTask ("Loading '" + fileName + "'", 0);
-					DotNetAssemblyProject project = new DotNetAssemblyProject ("C#");
-					MonoSolutionItemHandler handler = new MonoSolutionItemHandler (project);
-					ProjectExtensionUtil.InstallHandler (handler, project);
-					project.Name = Path.GetFileName (basePath);
-					handler.Read (mkfile);
-					monitor.EndTask ();
-					return project;
-				} else {
-					string subdirs;
-					StringBuilder subdirsBuilder = new StringBuilder ();
-					subdirsBuilder.Append (mkfile.GetVariable ("common_dirs"));
-					if (subdirsBuilder.Length != 0) {
-						subdirsBuilder.Append ("\t");
-						subdirsBuilder.Append (mkfile.GetVariable ("net_2_0_dirs"));
-					}
-					if (subdirsBuilder.Length == 0)
-						subdirsBuilder.Append (mkfile.GetVariable ("SUBDIRS"));
-	
-					subdirs = subdirsBuilder.ToString ();
-					if (subdirs != null && (subdirs = subdirs.Trim (' ','\t')) != "")
-					{
-						object retObject;
-						SolutionFolder folder;
-						if (!hasParentSolution) {
-							Solution sol = new Solution ();
-							sol.ConvertToFormat (Services.ProjectService.FileFormats.GetFileFormat ("MonoMakefile"), false);
-							sol.FileName = fileName;
-							folder = sol.RootFolder;
-							retObject = sol;
-							
-							foreach (string conf in MonoMakefileFormat.Configurations) {
-								SolutionConfiguration sc = new SolutionConfiguration (conf);
-								sol.Configurations.Add (sc);
-							}
-						} else {
-							folder = new SolutionFolder ();
-							folder.Name = Path.GetFileName (Path.GetDirectoryName (fileName));
-							retObject = folder;
-						}
-						
-						subdirs = subdirs.Replace ('\t',' ');
-						string[] dirs = subdirs.Split (' ');
-						
-						monitor.BeginTask ("Loading '" + fileName + "'", dirs.Length);
-						Hashtable added = new Hashtable ();
-						foreach (string dir in dirs) {
-							if (added.Contains (dir)) continue;
-							added.Add (dir, dir);
-							monitor.Step (1);
-							if (dir == null) continue;
-							string tdir = dir.Trim ();
-							if (tdir == "") continue;
-							string mfile = Path.Combine (Path.Combine (basePath, tdir), "Makefile");
-							if (File.Exists (mfile) && CanReadFile (mfile, typeof(SolutionItem))) {
-								SolutionItem it = (SolutionItem) ReadFile (mfile, true, monitor);
-								folder.Items.Add (it);
-							}
-						}
-						monitor.EndTask ();
-						return retObject;
-					}
-				}
-			} finally {
-				ProjectExtensionUtil.EndLoadOperation ();
-			}
-			return null;
-		}
-		
-		public static bool IsMonoProject (object obj)
-		{
-			DotNetProject p = obj as DotNetProject;
-			return p != null && (ProjectExtensionUtil.GetItemHandler (p) is MonoSolutionItemHandler);
-		}
-
-		public void ConvertToFormat (object obj)
-		{
-			// Nothing can be converted to this format.
-		}
-		
-		public bool SupportsMixedFormats {
-			get { return false; }
-		}
-		
-		public IEnumerable<string> GetCompatibilityWarnings (object obj)
-		{
-			yield break;
-		}
-		
-		public bool SupportsFramework (MonoDevelop.Core.Assemblies.TargetFramework framework)
-		{
-			return true;
-		}
-	}
-}
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectExtension.cs b/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectExtension.cs
new file mode 100644
index 0000000000..3bdd1a1c54
--- /dev/null
+++ b/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectExtension.cs
@@ -0,0 +1,350 @@
+//
+// MakefileProject.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Projects;
+using MonoDevelop.Core;
+using System.Collections;
+using System.Threading.Tasks;
+using System.IO;
+using System.Text.RegularExpressions;
+using MonoDevelop.Ide;
+using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Core.Execution;
+using System.CodeDom.Compiler;
+
+namespace MonoDeveloper
+{
+	public class MonoMakefileProjectExtension: DotNetProjectExtension
+	{
+		string outFile;
+		ArrayList refNames = new ArrayList ();
+		bool loading;
+		string testFileBase;
+		object unitTest;
+
+		public MonoMakefileProjectExtension ()
+		{
+		}
+
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+			Project.FileAddedToProject += OnFileAddedToProject;
+			Project.FileRemovedFromProject += OnFileRemovedFromProject;
+			Project.FileRenamedInProject += OnFileRenamedInProject;
+		}
+
+		public string SourcesFile {
+			get { return outFile + ".sources"; }
+		}
+
+		protected override Task OnSave (ProgressMonitor monitor)
+		{
+			// Nothing to do, changes are saved directly to the backing file
+			return Task.FromResult (0);
+		}
+
+		internal void Read (MonoMakefile mkfile)
+		{
+			loading = true;
+
+			string basePath = Path.GetDirectoryName (mkfile.FileName);
+			string aname;
+
+			string targetAssembly = mkfile.GetVariable ("LIBRARY");
+			if (targetAssembly == null) {
+				targetAssembly = mkfile.GetVariable ("PROGRAM");
+				if (Path.GetDirectoryName (targetAssembly) == "")
+					targetAssembly = Path.Combine (basePath, targetAssembly);
+				aname = Path.GetFileName (targetAssembly);
+			} else {
+				aname = Path.GetFileName (targetAssembly);
+				string targetName = mkfile.GetVariable ("LIBRARY_NAME");
+				if (targetName != null) targetAssembly = targetName;
+				targetAssembly = "$(topdir)/class/lib/$(PROFILE)/" + targetAssembly;
+			}
+
+			outFile = Path.Combine (basePath, aname);
+			Project.FileName = mkfile.FileName;
+
+			ArrayList checkedFolders = new ArrayList ();
+
+			// Parse projects
+			string sources = outFile + ".sources";
+			StreamReader sr = new StreamReader (sources);
+			string line;
+			while ((line = sr.ReadLine ()) != null) {
+				line = line.Trim (' ','\t');
+				if (line != "") {
+					string fname = Path.Combine (basePath, line);
+					Project.Files.Add (new ProjectFile (fname));
+
+					string dir = Path.GetDirectoryName (fname);
+					if (!checkedFolders.Contains (dir)) {
+						checkedFolders.Add (dir);
+						fname = Path.Combine (dir, "ChangeLog");
+						if (File.Exists (fname))
+							Project.Files.Add (new ProjectFile (fname, BuildAction.Content));
+					}
+				}
+			}
+
+			sr.Close ();
+
+			// Project references
+			string refs = mkfile.GetVariable ("LIB_MCS_FLAGS");
+			if (refs == null || refs == "") refs = mkfile.GetVariable ("LOCAL_MCS_FLAGS");
+
+			if (refs != null && refs != "") {
+				Regex var = new Regex(@"(.*?/r:(?<ref>.*?)(( |\t)|$).*?)*");
+				Match match = var.Match (refs);
+				if (match.Success) {
+					foreach (Capture c in match.Groups["ref"].Captures)
+						refNames.Add (Path.GetFileNameWithoutExtension (c.Value));
+				}
+			}
+
+			int i = basePath.LastIndexOf ("/mcs/", basePath.Length - 2);
+			string topdir = basePath.Substring (0, i + 4);
+			targetAssembly = targetAssembly.Replace ("$(topdir)", topdir);
+
+			if (mkfile.GetVariable ("NO_TEST") != "yes") {
+				string tname = Path.GetFileNameWithoutExtension (aname) + "_test_";
+				testFileBase = Path.Combine (basePath, tname);
+			}
+
+			foreach (string sconf in MonoMakefile.MonoConfigurations) {
+				var conf = (DotNetProjectConfiguration) Project.CreateConfiguration (sconf);
+				conf.OutputDirectory = basePath;
+				conf.OutputAssembly = Path.GetFileName (targetAssembly);
+				Project.Configurations.Add (conf);
+			}
+
+			loading = false;
+			IdeApp.Workspace.SolutionLoaded += CombineOpened;
+		}
+
+		void CombineOpened (object sender, SolutionEventArgs args)
+		{
+			if (args.Solution == Project.ParentSolution) {
+				foreach (string pref in refNames) {
+					Project p = Project.ParentSolution.FindProjectByName (pref);
+					if (p != null) Project.References.Add (ProjectReference.CreateProjectReference (p));
+				}
+			}
+		}
+
+		static Regex regexError = new Regex (@"^(\s*(?<file>.*)\((?<line>\d*)(,(?<column>\d*[\+]*))?\)(:|)\s+)*(?<level>\w+)\s*(?<number>.*):\s(?<message>.*)",
+			RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+
+		protected override Task<TargetEvaluationResult> OnRunTarget (ProgressMonitor monitor, string target, ConfigurationSelector configuration, TargetEvaluationContext context)
+		{
+			if (target == ProjectService.BuildTarget)
+				target = "all";
+			else if (target == ProjectService.CleanTarget)
+				target = "clean";
+
+			DotNetProjectConfiguration conf = (DotNetProjectConfiguration) Project.GetConfiguration (configuration);
+
+			return Task<TargetEvaluationResult>.Factory.StartNew (delegate {
+				using (var output = new StringWriter ()) {
+					using (var tw = new LogTextWriter ()) {
+						tw.ChainWriter (output);
+						tw.ChainWriter (monitor.Log);
+
+						using (ProcessWrapper proc = Runtime.ProcessService.StartProcess ("make", "PROFILE=" + conf.Id + " " + target, conf.OutputDirectory, monitor.Log, tw, null))
+							proc.WaitForOutput ();
+
+						tw.UnchainWriter (output);
+						tw.UnchainWriter (monitor.Log);
+
+						CompilerResults cr = new CompilerResults (null);
+						string[] lines = output.ToString ().Split ('\n');
+						foreach (string line in lines) {
+							CompilerError err = CreateErrorFromString (line);
+							if (err != null)
+								cr.Errors.Add (err);
+						}
+
+						return new TargetEvaluationResult (new BuildResult (cr, output.ToString ()));
+					}
+				}
+			});
+		}
+
+		private CompilerError CreateErrorFromString (string error_string)
+		{
+			// When IncludeDebugInformation is true, prevents the debug symbols stats from braeking this.
+			if (error_string.StartsWith ("WROTE SYMFILE") ||
+				error_string.StartsWith ("make[") ||
+				error_string.StartsWith ("OffsetTable") ||
+				error_string.StartsWith ("Compilation succeeded") ||
+				error_string.StartsWith ("Compilation failed"))
+				return null;
+
+			CompilerError error = new CompilerError();
+
+			Match match=regexError.Match(error_string);
+			if (!match.Success)
+				return null;
+
+			string level = match.Result("${level}");
+			if (level == "warning")
+				error.IsWarning = true;
+			else if (level != "error")
+				return null;
+
+			if (String.Empty != match.Result("${file}"))
+				error.FileName = Path.Combine (Project.BaseDirectory, match.Result("${file}"));
+			if (String.Empty != match.Result("${line}"))
+				error.Line=Int32.Parse(match.Result("${line}"));
+			if (String.Empty != match.Result("${column}"))
+				error.Column = Int32.Parse(match.Result("${column}"));
+			error.ErrorNumber = match.Result ("${number}");
+			error.ErrorText = match.Result ("${message}");
+			return error;
+		}
+
+		void OnFileAddedToProject (object s, ProjectFileEventArgs args)
+		{
+			if (loading) return;
+
+			foreach (ProjectFileEventInfo e in args) {
+				if (e.ProjectFile.BuildAction != BuildAction.Compile)
+					continue;
+				AddSourceFile (e.ProjectFile.Name);
+			}
+		}
+
+		void OnFileRemovedFromProject (object s, ProjectFileEventArgs args)
+		{
+			if (loading) return;
+
+			foreach (ProjectFileEventInfo e in args) {
+				if (e.ProjectFile.BuildAction != BuildAction.Compile)
+					continue;
+
+				RemoveSourceFile (e.ProjectFile.Name);
+			}
+		}
+
+		void OnFileRenamedInProject (object s, ProjectFileRenamedEventArgs args)
+		{
+			if (loading) return;
+
+			foreach (ProjectFileRenamedEventInfo e in args) {
+				if (e.ProjectFile.BuildAction != BuildAction.Compile)
+					continue;
+
+				if (RemoveSourceFile (e.OldName))
+					AddSourceFile (e.NewName);
+			}
+		}
+
+		void AddSourceFile (string sourceFile)
+		{
+			StreamReader sr = null;
+			StreamWriter sw = null;
+
+			try {
+				sr = new StreamReader (outFile + ".sources");
+				sw = new StreamWriter (outFile + ".sources.new");
+
+				string newFile = Project.GetRelativeChildPath (sourceFile);
+				if (newFile.StartsWith ("./")) newFile = newFile.Substring (2);
+
+				string line;
+				while ((line = sr.ReadLine ()) != null) {
+					string file = line.Trim (' ','\t');
+					if (newFile != null && (file == "" || string.Compare (file, newFile) > 0)) {
+						sw.WriteLine (newFile);
+						newFile = null;
+					}
+					sw.WriteLine (line);
+				}
+				if (newFile != null)
+					sw.WriteLine (newFile);
+			} finally {
+				if (sr != null) sr.Close ();
+				if (sw != null) sw.Close ();
+			}
+			File.Delete (outFile + ".sources");
+			File.Move (outFile + ".sources.new", outFile + ".sources");
+		}
+
+		bool RemoveSourceFile (string sourceFile)
+		{
+			StreamReader sr = null;
+			StreamWriter sw = null;
+			bool found = false;
+
+			try {
+				sr = new StreamReader (outFile + ".sources");
+				sw = new StreamWriter (outFile + ".sources.new");
+
+				string oldFile = Project.GetRelativeChildPath (sourceFile);
+				if (oldFile.StartsWith ("./")) oldFile = oldFile.Substring (2);
+
+				string line;
+				while ((line = sr.ReadLine ()) != null) {
+					string file = line.Trim (' ','\t');
+					if (oldFile != file)
+						sw.WriteLine (line);
+					else
+						found = true;
+				}
+			} finally {
+				if (sr != null) sr.Close ();
+				if (sw != null) sw.Close ();
+			}
+			if (found) {
+				File.Delete (outFile + ".sources");
+				File.Move (outFile + ".sources.new", outFile + ".sources");
+			}
+			return found;
+		}
+
+		public override void Dispose ()
+		{
+			Project.FileAddedToProject -= OnFileAddedToProject;
+			Project.FileRemovedFromProject -= OnFileRemovedFromProject;
+			Project.FileRenamedInProject -= OnFileRenamedInProject;
+			IdeApp.Workspace.SolutionLoaded -= CombineOpened;
+			base.Dispose ();
+		}
+
+		public string GetTestFileBase ()
+		{
+			return testFileBase;
+		}
+
+		public object UnitTest {
+			get { return unitTest; }
+			set { unitTest = value; }
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs b/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs
new file mode 100644
index 0000000000..317e5d1840
--- /dev/null
+++ b/main/src/addins/MonoDeveloperExtensions/MonoMakefileProjectReader.cs
@@ -0,0 +1,143 @@
+//
+// MonoMakeFileProjectServiceExtension.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Projects;
+using MonoDevelop.Core;
+using System.Threading.Tasks;
+using MonoDevelop.Projects.MSBuild;
+using System.IO;
+using System.Text;
+using System.Collections.Generic;
+
+namespace MonoDeveloper
+{
+	public class MonoMakefileProjectReader: WorkspaceObjectReader
+	{
+		public override bool CanRead (FilePath file, Type expectedType)
+		{
+			if (file.FileName != "Makefile") return false;
+			MonoMakefile mkfile = new MonoMakefile (file);
+			if (mkfile.Content.IndexOf ("build/rules.make") == -1) return false;
+
+			if (mkfile.GetVariable ("LIBRARY") != null) return expectedType.IsAssignableFrom (typeof(DotNetProject));
+			if (mkfile.GetVariable ("PROGRAM") != null) return expectedType.IsAssignableFrom (typeof(DotNetProject));
+			string subdirs = mkfile.GetVariable ("SUBDIRS");
+			if (subdirs != null && subdirs.Trim (' ','\t') != "")
+				return expectedType.IsAssignableFrom (typeof(Solution)) || expectedType.IsAssignableFrom (typeof(SolutionFolder));
+
+			return false;
+		}
+
+		public override Task<SolutionItem> LoadSolutionItem (ProgressMonitor monitor, SolutionLoadContext ctx, string fileName, MSBuildFileFormat expectedFormat, string typeGuid, string itemGuid)
+		{
+			return Task.Run (() => (SolutionItem) ReadFile (fileName, false, monitor));
+		}
+
+		public override Task<WorkspaceItem> LoadWorkspaceItem (ProgressMonitor monitor, string fileName)
+		{
+			return Task.Run (() => (WorkspaceItem) ReadFile (fileName, false, monitor));
+		}
+
+		public object ReadFile (FilePath fileName, bool hasParentSolution, ProgressMonitor monitor)
+		{
+			FilePath basePath = fileName.ParentDirectory;
+			MonoMakefile mkfile = new MonoMakefile (fileName);
+			string aname = mkfile.GetVariable ("LIBRARY");
+			if (aname == null)
+				aname = mkfile.GetVariable ("PROGRAM");
+
+			if (!string.IsNullOrEmpty (aname)) {
+				monitor.BeginTask ("Loading '" + fileName + "'", 0);
+				var project = Services.ProjectService.CreateProject ("C#");
+				project.FileName = fileName;
+
+				var ext = new MonoMakefileProjectExtension ();
+				project.AttachExtension (ext);
+				ext.Read (mkfile);
+
+				monitor.EndTask ();
+				return project;
+			}
+
+			string subdirs;
+			StringBuilder subdirsBuilder = new StringBuilder ();
+			subdirsBuilder.Append (mkfile.GetVariable ("common_dirs"));
+			if (subdirsBuilder.Length != 0) {
+				subdirsBuilder.Append ("\t");
+				subdirsBuilder.Append (mkfile.GetVariable ("net_2_0_dirs"));
+			}
+			if (subdirsBuilder.Length == 0)
+				subdirsBuilder.Append (mkfile.GetVariable ("SUBDIRS"));
+
+			subdirs = subdirsBuilder.ToString ();
+			if (subdirs != null && (subdirs = subdirs.Trim (' ', '\t')) != "") {
+				object retObject;
+				SolutionFolder folder;
+				if (!hasParentSolution) {
+					Solution sol = new Solution ();
+					sol.AttachExtension (new MonoMakefileSolutionExtension ());
+					sol.FileName = fileName;
+					folder = sol.RootFolder;
+					retObject = sol;
+
+					foreach (string conf in MonoMakefile.MonoConfigurations) {
+						SolutionConfiguration sc = new SolutionConfiguration (conf);
+						sol.Configurations.Add (sc);
+					}
+				} else {
+					folder = new SolutionFolder ();
+					folder.Name = Path.GetFileName (Path.GetDirectoryName (fileName));
+					retObject = folder;
+				}
+
+				subdirs = subdirs.Replace ('\t', ' ');
+				string[] dirs = subdirs.Split (' ');
+
+				monitor.BeginTask ("Loading '" + fileName + "'", dirs.Length);
+				HashSet<string> added = new HashSet<string> ();
+				foreach (string dir in dirs) {
+					if (!added.Add (dir))
+						continue;
+					monitor.Step (1);
+					if (dir == null)
+						continue;
+					string tdir = dir.Trim ();
+					if (tdir == "")
+						continue;
+					string mfile = Path.Combine (Path.Combine (basePath, tdir), "Makefile");
+					if (File.Exists (mfile) && CanRead (mfile, typeof(SolutionItem))) {
+						SolutionFolderItem it = (SolutionFolderItem) ReadFile (mfile, true, monitor);
+						folder.Items.Add (it);
+					}
+				}
+				monitor.EndTask ();
+				return retObject;
+			}
+			return null;
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoMakefileSolutionExtension.cs b/main/src/addins/MonoDeveloperExtensions/MonoMakefileSolutionExtension.cs
new file mode 100644
index 0000000000..a09cd12563
--- /dev/null
+++ b/main/src/addins/MonoDeveloperExtensions/MonoMakefileSolutionExtension.cs
@@ -0,0 +1,41 @@
+//
+// MonoMakefileSolutionExtension.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Projects;
+using System.Threading.Tasks;
+
+namespace MonoDeveloper
+{
+	public class MonoMakefileSolutionExtension: SolutionExtension
+	{
+		protected override Task Save (MonoDevelop.Core.ProgressMonitor monitor)
+		{
+			// Saving is not supported, don't do anything.
+			return Task.FromResult (0);
+		}
+	}
+}
+
diff --git a/main/src/addins/MonoDeveloperExtensions/MonoSolutionItemHandler.cs b/main/src/addins/MonoDeveloperExtensions/MonoSolutionItemHandler.cs
deleted file mode 100644
index e9feae9213..0000000000
--- a/main/src/addins/MonoDeveloperExtensions/MonoSolutionItemHandler.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-// MonoSolutionItemHandler.cs
-//
-// Author:
-//   Lluis Sanchez Gual <lluis@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using System;
-using System.CodeDom.Compiler;
-using System.Collections;
-using System.IO;
-using System.Text.RegularExpressions;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Core.ProgressMonitoring;
-using MonoDevelop.Ide;
-using MonoDevelop.Projects;
-using MonoDevelop.Projects.Extensions;
-
-namespace MonoDeveloper
-{
-	public class MonoSolutionItemHandler: ISolutionItemHandler
-	{
-		DotNetProject project;
-		string outFile;
-		ArrayList refNames = new ArrayList ();
-		bool loading;
-		string testFileBase;
-		object unitTest;
-		
-		public MonoSolutionItemHandler (DotNetProject project)
-		{
-			this.project = project;
-			project.FileAddedToProject += OnFileAddedToProject;
-			project.FileRemovedFromProject += OnFileRemovedFromProject;
-			project.FileRenamedInProject += OnFileRenamedInProject;
-		}
-		
-		public string SourcesFile {
-			get { return outFile + ".sources"; }
-		}
-		
-		public bool SyncFileName {
-			get { return false; }
-		}
-		
-		public string ItemId {
-			get {
-				if (project.ParentSolution != null)
-					return project.ParentSolution.GetRelativeChildPath (project.FileName);
-				else
-					return project.Name;
-			}
-		}
-
-		public void Save (MonoDevelop.Core.IProgressMonitor monitor)
-		{
-		}
-		
-		internal void Read (MonoMakefile mkfile)
-		{
-			loading = true;
-			
-			string basePath = Path.GetDirectoryName (mkfile.FileName);
-			string aname;
-			
-			string targetAssembly = mkfile.GetVariable ("LIBRARY");
-			if (targetAssembly == null) {
-				targetAssembly = mkfile.GetVariable ("PROGRAM");
-				if (Path.GetDirectoryName (targetAssembly) == "")
-					targetAssembly = Path.Combine (basePath, targetAssembly);
-				aname = Path.GetFileName (targetAssembly);
-			} else {
-				aname = Path.GetFileName (targetAssembly);
-				string targetName = mkfile.GetVariable ("LIBRARY_NAME");
-				if (targetName != null) targetAssembly = targetName;
-				targetAssembly = "$(topdir)/class/lib/$(PROFILE)/" + targetAssembly;
-			}
-			
-			outFile = Path.Combine (basePath, aname);
-			project.FileName = mkfile.FileName;
-			
-			ArrayList checkedFolders = new ArrayList ();
-			
-			// Parse projects
-			string sources = outFile + ".sources";
-			StreamReader sr = new StreamReader (sources);
-			string line;
-			while ((line = sr.ReadLine ()) != null) {
-				line = line.Trim (' ','\t');
-				if (line != "") {
-					string fname = Path.Combine (basePath, line);
-					project.Files.Add (new ProjectFile (fname));
-					
-					string dir = Path.GetDirectoryName (fname);
-					if (!checkedFolders.Contains (dir)) {
-						checkedFolders.Add (dir);
-						fname = Path.Combine (dir, "ChangeLog");
-						if (File.Exists (fname))
-							project.Files.Add (new ProjectFile (fname, BuildAction.Content));
-					}
-				}
-			}
-			
-			sr.Close ();
-			
-			// Project references
-			string refs = mkfile.GetVariable ("LIB_MCS_FLAGS");
-			if (refs == null || refs == "") refs = mkfile.GetVariable ("LOCAL_MCS_FLAGS");
-			
-			if (refs != null && refs != "") {
-				Regex var = new Regex(@"(.*?/r:(?<ref>.*?)(( |\t)|$).*?)*");
-				Match match = var.Match (refs);
-				if (match.Success) {
-					foreach (Capture c in match.Groups["ref"].Captures)
-						refNames.Add (Path.GetFileNameWithoutExtension (c.Value));
-				}
-			}
-			
-			int i = basePath.LastIndexOf ("/mcs/", basePath.Length - 2);
-			string topdir = basePath.Substring (0, i + 4);
-			targetAssembly = targetAssembly.Replace ("$(topdir)", topdir);
-			
-			if (mkfile.GetVariable ("NO_TEST") != "yes") {
-				string tname = Path.GetFileNameWithoutExtension (aname) + "_test_";
-				testFileBase = Path.Combine (basePath, tname);
-			}
-			
-			foreach (string sconf in MonoMakefileFormat.Configurations) {
-				DotNetProjectConfiguration conf = new DotNetProjectConfiguration (sconf);
-				conf.CompilationParameters = project.LanguageBinding.CreateCompilationParameters (null);
-				conf.OutputDirectory = basePath;
-				conf.OutputAssembly = Path.GetFileName (targetAssembly);
-				project.Configurations.Add (conf);
-			}
-			
-			loading = false;
-			IdeApp.Workspace.SolutionLoaded += CombineOpened;
-		}
-		
-		public void CombineOpened (object sender, SolutionEventArgs args)
-		{
-			if (args.Solution == project.ParentSolution) {
-				foreach (string pref in refNames) {
-					Project p = project.ParentSolution.FindProjectByName (pref);
-					if (p != null) project.References.Add (new ProjectReference (p));
-				}
-			}
-		}
-
-		public BuildResult RunTarget (MonoDevelop.Core.IProgressMonitor monitor, string target, ConfigurationSelector configuration)
-		{
-			if (target == ProjectService.BuildTarget)
-				target = "all";
-			else if (target == ProjectService.CleanTarget)
-				target = "clean";
-			
-			DotNetProjectConfiguration conf = (DotNetProjectConfiguration) project.GetConfiguration (configuration);
-
-			using (var output = new StringWriter ()) {
-				using (var tw = new LogTextWriter ()) {
-					tw.ChainWriter (output);
-					tw.ChainWriter (monitor.Log);
-
-					using (ProcessWrapper proc = Runtime.ProcessService.StartProcess ("make", "PROFILE=" + conf.Id + " " + target, conf.OutputDirectory, monitor.Log, tw, null))
-						proc.WaitForOutput ();
-
-					tw.UnchainWriter (output);
-					tw.UnchainWriter (monitor.Log);
-
-					var result = new BuildResult (output.ToString (), 1, 0);
-
-					string[] lines = result.CompilerOutput.Split ('\n');
-					foreach (string line in lines) {
-						var err = CreateErrorFromString (line);
-						if (err != null)
-							result.Append (err);
-					}
-
-					return result;
-				}
-			}
-
-		}
-		
-		private BuildError CreateErrorFromString (string error_string)
-		{
-			// When IncludeDebugInformation is true, prevents the debug symbols stats from braeking this.
-			if (error_string.StartsWith ("WROTE SYMFILE") ||
-			    error_string.StartsWith ("make[") ||
-			    error_string.StartsWith ("OffsetTable") ||
-			    error_string.StartsWith ("Compilation succeeded") ||
-			    error_string.StartsWith ("Compilation failed"))
-				return null;
-
-			return BuildError.FromMSBuildErrorFormat (error_string);
-		}
-		
-		void OnFileAddedToProject (object s, ProjectFileEventArgs args)
-		{
-			if (loading) return;
-			
-			foreach (ProjectFileEventInfo e in args) {
-				if (e.ProjectFile.BuildAction != BuildAction.Compile)
-					continue;
-				AddSourceFile (e.ProjectFile.Name);
-			}
-		}
-		
-		void OnFileRemovedFromProject (object s, ProjectFileEventArgs args)
-		{
-			if (loading) return;
-			
-			foreach (ProjectFileEventInfo e in args) {
-				if (e.ProjectFile.BuildAction != BuildAction.Compile)
-					continue;
-
-				RemoveSourceFile (e.ProjectFile.Name);
-			}
-		}
-		
- 		void OnFileRenamedInProject (object s, ProjectFileRenamedEventArgs args)
-		{
-			if (loading) return;
-			
-			foreach (ProjectFileRenamedEventInfo e in args) {
-				if (e.ProjectFile.BuildAction != BuildAction.Compile)
-					continue;
-				
-				if (RemoveSourceFile (e.OldName))
-					AddSourceFile (e.NewName);
-			}
-		}
-
-		void AddSourceFile (string sourceFile)
-		{
-			StreamReader sr = null;
-			StreamWriter sw = null;
-			
-			try {
-				sr = new StreamReader (outFile + ".sources");
-				sw = new StreamWriter (outFile + ".sources.new");
-
-				string newFile = project.GetRelativeChildPath (sourceFile);
-				if (newFile.StartsWith ("./")) newFile = newFile.Substring (2);
-				
-				string line;
-				while ((line = sr.ReadLine ()) != null) {
-					string file = line.Trim (' ','\t');
-					if (newFile != null && (file == "" || string.Compare (file, newFile) > 0)) {
-						sw.WriteLine (newFile);
-						newFile = null;
-					}
-					sw.WriteLine (line);
-				}
-				if (newFile != null)
-					sw.WriteLine (newFile);
-			} finally {
-				if (sr != null) sr.Close ();
-				if (sw != null) sw.Close ();
-			}
-			File.Delete (outFile + ".sources");
-			File.Move (outFile + ".sources.new", outFile + ".sources");
-		}
-		
-		bool RemoveSourceFile (string sourceFile)
-		{
-			StreamReader sr = null;
-			StreamWriter sw = null;
-			bool found = false;
-
-			try {
-				sr = new StreamReader (outFile + ".sources");
-				sw = new StreamWriter (outFile + ".sources.new");
-
-				string oldFile = project.GetRelativeChildPath (sourceFile);
-				if (oldFile.StartsWith ("./")) oldFile = oldFile.Substring (2);
-				
-				string line;
-				while ((line = sr.ReadLine ()) != null) {
-					string file = line.Trim (' ','\t');
-					if (oldFile != file)
-						sw.WriteLine (line);
-					else
-						found = true;
-				}
-			} finally {
-				if (sr != null) sr.Close ();
-				if (sw != null) sw.Close ();
-			}
-			if (found) {
-				File.Delete (outFile + ".sources");
-				File.Move (outFile + ".sources.new", outFile + ".sources");
-			}
-			return found;
-		}
-		
-		public void Dispose ()
-		{
-			project.FileAddedToProject -= OnFileAddedToProject;
-			project.FileRemovedFromProject -= OnFileRemovedFromProject;
-			project.FileRenamedInProject -= OnFileRenamedInProject;
-			IdeApp.Workspace.SolutionLoaded -= CombineOpened;
-		}
-
-		public void OnModified (string hint)
-		{
-		}
-		
-		public string GetTestFileBase ()
-		{
-			return testFileBase;
-		}
-		
-		public object UnitTest {
-			get { return unitTest; }
-			set { unitTest = value; }
-		}
-
-		public object GetService (Type t)
-		{
-			return null;
-		}
-	}
-}
diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/AddinInfo.cs b/main/src/addins/MonoDeveloperExtensions/NUnit/AddinInfo.cs
index 14d9f61a8c..9774d2f6f6 100644
--- a/main/src/addins/MonoDeveloperExtensions/NUnit/AddinInfo.cs
+++ b/main/src/addins/MonoDeveloperExtensions/NUnit/AddinInfo.cs
@@ -3,4 +3,4 @@ using System;
 using Mono.Addins;
 using Mono.Addins.Description;
 
-[assembly:AddinDependency ("NUnit", MonoDevelop.BuildInfo.Version)]
+[assembly:AddinDependency ("UnitTesting", MonoDevelop.BuildInfo.Version)]
diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/ChangeLog b/main/src/addins/MonoDeveloperExtensions/NUnit/ChangeLog
deleted file mode 100644
index d463fc5278..0000000000
--- a/main/src/addins/MonoDeveloperExtensions/NUnit/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* NUnit.csproj: Merged MD.Projects into MD.Core, and
-	  MD.Projects.Gui, MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* NUnit.csproj: Flush.
-
-2009-10-13  Ankit Jain  <jankit@novell.com>
-
-	* NUnit.csproj: Import md.targets .
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* NUnit.mdp:
-	* NUnit.csproj: Migrated to MSBuild file format.
-
diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/ExtensionModel.addin.xml b/main/src/addins/MonoDeveloperExtensions/NUnit/ExtensionModel.addin.xml
index 1bef6a70fc..3be216d8dc 100644
--- a/main/src/addins/MonoDeveloperExtensions/NUnit/ExtensionModel.addin.xml
+++ b/main/src/addins/MonoDeveloperExtensions/NUnit/ExtensionModel.addin.xml
@@ -1,6 +1,6 @@
 <ExtensionModel>
 
-	<Extension path = "/MonoDevelop/NUnit/TestProviders">
+	<Extension path = "/MonoDevelop/UnitTesting/TestProviders">
 		<Class id = "MonoTestProvider" class = "MonoDeveloper.MonoTestProvider"/>
 	</Extension>
 
diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/MonoTestProvider.cs b/main/src/addins/MonoDeveloperExtensions/NUnit/MonoTestProvider.cs
index 026631b786..7605e6302f 100644
--- a/main/src/addins/MonoDeveloperExtensions/NUnit/MonoTestProvider.cs
+++ b/main/src/addins/MonoDeveloperExtensions/NUnit/MonoTestProvider.cs
@@ -30,25 +30,24 @@ using System;
 using System.IO;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Extensions;
-using MonoDevelop.NUnit;
+using MonoDevelop.UnitTesting;
+using MonoDevelop.UnitTesting.NUnit;
 
 namespace MonoDeveloper
 {	
 	class MonoTestProvider: ITestProvider
 	{
-		public UnitTest CreateUnitTest (IWorkspaceObject entry)
+		public UnitTest CreateUnitTest (WorkspaceObject entry)
 		{
-			if (entry is DotNetProject) {
-				DotNetProject project = (DotNetProject) entry;
-				MonoSolutionItemHandler handler = ProjectExtensionUtil.GetItemHandler (project) as MonoSolutionItemHandler;
-				if (handler != null) {
-					if (handler.UnitTest != null)
-						return (UnitTest) handler.UnitTest;
-					string testFileBase = handler.GetTestFileBase ();
-					UnitTest testSuite = new MonoTestSuite (project, project.Name, testFileBase);
-					handler.UnitTest = testSuite;
-					return testSuite;
-				}
+			var ext = entry.GetService<MonoMakefileProjectExtension> ();
+			if (ext != null) {
+				var project = (DotNetProject) entry;
+				if (ext.UnitTest != null)
+					return (UnitTest) ext.UnitTest;
+				string testFileBase = ext.GetTestFileBase ();
+				UnitTest testSuite = new MonoTestSuite (project, project.Name, testFileBase);
+				ext.UnitTest = testSuite;
+				return testSuite;
 			}
 			return null;
 		}
@@ -57,13 +56,17 @@ namespace MonoDeveloper
 		{
 			return null;
 		}
+
+		public void Dispose ()
+		{
+		}
 	}
 	
 	class MonoTestSuite: NUnitAssemblyTestSuite
 	{
 		string basePath;
 		
-		public MonoTestSuite (Project p, string name, string basePath): base (name, p)
+		public MonoTestSuite (DotNetProject p, string name, string basePath): base (name, p)
 		{
 			this.basePath = basePath;
 		}
diff --git a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj
index 2074526569..1fac44d9d1 100644
--- a/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj
+++ b/main/src/addins/MonoDeveloperExtensions/NUnit/NUnit.csproj
@@ -51,16 +51,21 @@
       <Name>MonoDevelop.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\NUnit\MonoDevelop.NUnit.csproj">
-      <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project>
-      <Name>MonoDevelop.NUnit</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\MonoDevelop.UnitTesting\MonoDevelop.UnitTesting.csproj">
+      <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project>
+      <Name>MonoDevelop.UnitTesting</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MonoDevelop.UnitTesting.NUnit\MonoDevelop.UnitTesting.NUnit.csproj">
+      <Project>{6224D87E-2AC1-4D9F-91ED-714F797297BF}</Project>
+      <Name>MonoDevelop.UnitTesting.NUnit</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/main/src/addins/NUnit/AddinInfo.cs b/main/src/addins/NUnit/AddinInfo.cs
deleted file mode 100644
index b7a7b115b1..0000000000
--- a/main/src/addins/NUnit/AddinInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-using System;
-using Mono.Addins;
-using Mono.Addins.Description;
-
-[assembly:Addin ("NUnit", 
-	Namespace = "MonoDevelop",
-	Version = MonoDevelop.BuildInfo.Version,
-	Category = "Testing")]
-
-[assembly:AddinName ("NUnit support")]
-[assembly:AddinDescription ("Integrates NUnit into the MonoDevelop IDE")]
-
-[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)]
-[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)]
diff --git a/main/src/addins/NUnit/ChangeLog b/main/src/addins/NUnit/ChangeLog
deleted file mode 100644
index 2dda19f864..0000000000
--- a/main/src/addins/NUnit/ChangeLog
+++ /dev/null
@@ -1,1117 +0,0 @@
-2010-06-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/NUnitAssemblyGroup.xpt.xml: Don't include the
-	  assembly name in the project type name since it doesn't work
-	  well when running on .NET
-
-2010-06-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestNodeBuilder.cs:
-	* MonoDevelopNUnit.addin.xml: Added go-to-failure command to
-	  the test pad context menu. Fixes bug #610358 - Go to source
-	  code in unit test pad doesn't work as expected.
-
-2010-05-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitService.cs: Use ShowCustomDialog (which
-	  destroys the dialog when done) instead of RunCustomDialog
-	  (which doesn't).
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Services/NUnitService.cs: More dialog placing.
-
-2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs: Clean up
-	  dialog placement.
-
-2010-05-05  Mike Krüger  <mkrueger@novell.com>
-
-	* Services/UnitTestResult.cs: handled possible null ref.
-
-2010-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelopNUnit.addin.xml: Register nunit project as
-	  serializable.
-
-	* Services/NUnitService.cs:
-	* Project/NUnitAssemblyGroupProject.cs: Ensure that tests are
-	  always shown for nunit assembly projects, when created and
-	  when added. Fixes bug #602143 - Unit tests don't show up in
-	  the Unit Tests pane.
-
-2010-04-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/TestResultsPad.cs: Free up wasted space between
-	  scrollbars and treeview contents.
-
-2010-04-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestResultsPad.cs:
-	* Commands/NUnitCommands.cs:
-	* MonoDevelopNUnit.addin.xml:
-	* Services/UnitTestResult.cs: In the results pad, allow
-	  jumping to a specific line of the call stack. When
-	  double-clicking in a test failure, jump to the location of
-	  the failure, if available.
-
-	* gtk-gui/MonoDevelop.NUnit.NUnitOptionsWidget.cs: Flush.
-
-2010-04-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelopNUnit.addin.xml: Fixed node set name.
-
-	* nunit.glade:
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.NUnit.csproj:
-	* Gui/NUnitOptionsPanel.cs:
-	* gtk-gui/MonoDevelop.NUnit.NUnitOptionsWidget.cs: Ported some
-	  old glade code to stetic.
-
-	* Services/ExternalTestRunner.cs:
-	* Services/NUnitAssemblyTestSuite.cs: Make sure the remote
-	  monitor is not disconnected too early.
-
-	* Gui/TestPad.cs:
-	* Gui/TestResultsPad.cs: Fix warnings.
-
-2010-04-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/UnitTestGroup.cs:
-	* Services/NUnitTestSuite.cs:
-	* Services/SystemTestProvider.cs:
-	* Services/NUnitAssemblyTestSuite.cs: Don't show projects and
-	  solutions which don't contain unit tests.
-
-2010-04-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services\ExternalTestRunner.cs: Preload the NUnitRunner
-	  assembly.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelopNUnit.addin.xml: Bumped MD version.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitAssemblyTestSuite.cs: Fill the tests in the
-	  gui thread. Fixes bug #585286 - Collection modified while
-	  iterating.
-
-2010-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelopNUnit.addin.xml: Set the default location for
-	  unit tests pads. Register a new Unit Testing layout.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Gui/TestPad.cs:
-	* Gui/CircleImage.cs:
-	* Gui/TestResultsPad.cs:
-	* Gui/TestNodeBuilder.cs:
-	* MonoDevelop.NUnit.csproj:
-	* Services/NUnitService.cs:
-	* Commands/NUnitCommands.cs:
-	* MonoDevelopNUnit.addin.xml:
-	* Gui/UnitTestOptionsDialog.cs:
-	* Gui/TestAssemblyNodeBuilder.cs:
-	* Services/NUnitProjectTestSuite.cs:
-	* Gui/NUnitAssemblyGroupNodeBuilder.cs:
-	* Services/NUnitProjectServiceExtension.cs:
-	* Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs: Merged
-	  MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
-	  and MD.Components into MD.Ide.
-
-2010-03-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Gui/TestPad.cs:
-	* Gui/TestResultsPad.cs:
-	* MonoDevelop.NUnit.csproj: Use the new DockItemToolbar class
-	  for showing toolbar commands.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestPad.cs:
-	* Gui/TestResultsPad.cs: Track api changes.
-
-2010-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/TestPad.cs:
-	* Gui/TestResultsPad.cs: Track API changes for lazy loading
-	  images.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs: Flush.
-
-2009-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Gui/unit-test-16.png:
-	* Gui/unit-test-24.png:
-	* MonoDevelop.NUnit.csproj:
-	* MonoDevelopNUnit.addin.xml: Added new icon.
-
-2009-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitService.cs: Don't try to build tests until the
-	  service has been fully initialized.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Services/NUnitService.cs:
-	* Services/NUnitAssemblyTestSuite.cs: Name threads to make
-	  debugging easier.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestResultsPad.cs:
-	* Project/NUnitAssemblyGroupProject.cs:
-	* Services/NUnitProjectServiceExtension.cs: Introduced the
-	  ConfigurationSelector class to all methods that previously
-	  took a configuration name as string. This eliminates the
-	  ambiguity between solution configuration names and project
-	  configuration names.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Use correct cairo lib.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelopNUnit.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestPad.cs:
-	* Gui/TestResultsPad.cs: Fix warnings.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.NUnit.csproj: Reference the mono-cairo package.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs: Flush.
-
-2009-10-16  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/CircleImage.cs: Handled icon loading error.
-
-2009-10-09  Mike Krüger  <mkrueger@novell.com>
-
-	* md1format.xml: Track namespace changes.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelopNUnit.addin.xml: Bump MD version.
-
-2009-10-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitService.cs: After a build operation, and
-	  before running the tests, ensure that the tests are up to
-	  date by calling Refresh.
-
-	* Services/UnitTest.cs: Added refresh operation. Fire test
-	  events in the gui thread.
-
-	* Services/UnitTestGroup.cs:
-	* Services/NUnitProjectTestSuite.cs:
-	* Services/NUnitAssemblyTestSuite.cs: Implemented the Refresh
-	  operation. This operation updates any test that needs to be
-	  updated. It is an async operation. All this fixes bug
-	  #540257 - Unit test pad not updated correctly when "run
-	  tests" implies a build operation.
-
-2009-09-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestPad.cs: Add support for custom execution modes.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* Services/NUnitService.cs: Make dialog transient for the
-	  root window.
-
-2009-08-28  Mike Krüger  <mkrueger@novell.com>
-
-	* templates/NUnitTestClass.xft.xml: Fixed "Bug 479196 - "add
-	  test fixture" adds refs to nunit.core and nunit.framework
-	  from "Package"".
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.NUnit.csproj: Updated dependencies. We now
-	  depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Gui/TestChart.cs:
-	* MonoDevelop.NUnit.csproj: Track api changes in the chart
-	  widget.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitAssemblyTestSuite.cs: Track api changes.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitService.cs:
-	* Gui/NUnitAssemblyGroupNodeBuilder.cs:
-	* Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs: Use the
-	  new DesktopService instead of PlatformService.
-
-2009-06-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services\ExternalTestRunner.cs:
-	* Services\NUnitAssemblyTestSuite.cs: In some cases MS.NET
-	  can't properly resolve assemblies even if they are already
-	  loaded. For example, when deserializing objects from
-	  remoting. Added a handler for AssemblyResolve that handle
-	  this case.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project\NUnitAssemblyGroupFileFormat.cs: Use the new
-	  FilePath class for handling file and directory paths.
-
-2009-05-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitTestCase.cs:
-	* Services/NUnitTestSuite.cs: Implement OnCanRun for NUnit
-	  tests and test suites.
-
-	* Services/UnitTestGroup.cs: A test suite can be run using a
-	  specific mode if all child tests can.
-
-	* Gui/TestPad.cs: Improve support for using a custom execution
-	  mode.
-
-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelopNUnit.addin.xml: Added Run Test With submenu,
-	  with support for all registered modes.
-
-	* Gui/TestPad.cs:
-	* Services/UnitTest.cs:
-	* Services/TestContext.cs: Track api changes.
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelopNUnit.addin.xml: Changed copyright tag.
-
-2009-04-24  Mike Krüger  <mkrueger@novell.com>
-
-	* AssemblyInfo.cs: Changed assembly info.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/TestResultsPad.cs: Renamed PixbufService to
-	  ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/TestResultsPad.cs: Track API changes.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* MonoDevelop.NUnit.csproj: don't require specific
-	gtk-sharp version.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/NUnitOptionsPanel.cs:
-	* Services/NUnitService.cs:
-	* MonoDevelopNUnit.addin.xml:
-	* Gui/UnitTestOptionsDialog.cs: translated the option panels
-	  to the new option structure.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelopNUnit.addin.xml: Bump MD version.
-
-2009-03-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* templates/NUnitProject.xpt.xml: Reference the version of
-	  NUnit that we ship with MD.
-
-2009-03-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitAssemblyTestSuite.cs: Improved error message.
-
-2009-03-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestPad.cs:
-	* Services/UnitTest.cs:
-	* Services/TestContext.cs:
-	* Services/NUnitService.cs:
-	* Services/NUnitAssemblyTestSuite.cs:
-	* Services/NUnitProjectServiceExtension.cs: Changed the way
-	  execution handlers work. We are not using platform ids
-	  anymore. Instead, we use command strings when looking for
-	  execution handlers. IExecutionHandlerFactory has been
-	  removed and now everything is handled by IExecutionHandler,
-	  which has a new CanExecute method. This model is more simple
-	  and more generic.
-
-2009-02-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitProjectTestSuite.cs: Check for nunit.core as
-	  well as nunit.framework when looking for nunit test
-	  projects. Should fix bug #477523.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestPad.cs: Track merge of the project pad context menu.
-
-2009-02-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitAssemblyTestSuite.cs: Modify the test
-	  collection in the gui thread, to avoid concurrent access.
-	  Fixes bug #469131 - Random IOE exception.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestPad.cs:
-	* Services/UnitTest.cs:
-	* Gui/TestResultsPad.cs:
-	* Services/TestContext.cs:
-	* Services/NUnitService.cs:
-	* Commands/NUnitCommands.cs:
-	* MonoDevelopNUnit.addin.xml:
-	* Services/ExternalTestRunner.cs:
-	* Services/NUnitAssemblyTestSuite.cs:
-	* Services/NUnitProjectServiceExtension.cs: Added support for
-	  running unit tests using a special execution mode (for
-	  example, using the debugger).
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelopNUnit.addin.xml: Don't partially assembly-qualify
-	  type name, as it makes .NET unhappy, and doesn't seem to be
-	  necessary for Mono.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.NUnit.mds:
-	* MonoDevelop.NUnit.mdp:
-	* MonoDevelop.NUnit.csproj: Migrated to MSBuild file format.
-
-2009-02-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelopNUnit.addin.xml: Don't register the nunit package
-	  if mono-nunit is installed and has the same version.
-
-	* gtk-gui/generated.cs: Flush.
-
-2009-02-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/UnitTestResult.cs: Getting the failure location
-	  doesn't work very well. Disable for now.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelopNUnit.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.NUnit.mdp: Flush.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.NUnit.mds:
-	* MonoDevelop.NUnit.mdp:
-	* NUnitRunner/NUnitRunner.mdp: Flush project format changes.
-
-2009-01-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* NUnitRunner/NUnitTestRunner.cs: Make sure that only the provided test
-	suite is executed.
-
-2009-01-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/ExternalTestRunner.cs: Add a default test result message when
-	none is provided.
-
-	* Gui/TestResultsPad.cs:
-	* Gui/TestNodeBuilder.cs:
-	* Services/UnitTestResult.cs: When jumping to the test source code, if
-	the test failed, jump to the line of the failure.
-
-	* templates/NUnitTestClass.xft.xml: Add references to NUnit when adding
-	a test fixture to a project.
-
-2009-01-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestPad.cs:
-	* Services/NUnitService.cs:
-	* Commands/NUnitCommands.cs:
-	* MonoDevelopNUnit.addin.xml:
-	* Services/UnitTestCollection.cs: Added command for running the tests.
-
-	* Makefile.am:
-	* MonoDevelop.NUnit.mdp:
-	* Services/NUnitProjectServiceExtension.cs: When the project is a nunit
-	library and there are no custom execution commands, run the tests
-	when clicking on the Run option.
-
-2009-01-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.NUnit.mds: Added new NUnitRunner project.
-
-2009-01-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* lib/nunit.util.dll:
-	* lib/nunit.core.dll:
-	* lib/nunit.framework.dll:
-	* MonoDevelopNUnit.addin.xml:
-	* lib/nunit.core.interfaces.dll: Update to latest NUnit.
-
-	* NUnitRunner:
-	* Services/UnitTest.cs:
-	* NUnitRunner/Makefile.am:
-	* Services/NUnitTestCase.cs:
-	* Services/NUnitTestSuite.cs:
-	* Services/UnitTestResult.cs:
-	* NUnitRunner/NUnitRunner.mdp:
-	* Services/ExternalTestRunner.cs:
-	* NUnitRunner/NUnitTestRunner.cs:
-	* Services/NUnitProjectTestSuite.cs:
-	* Services/NUnitAssemblyTestSuite.cs: Changed the way tests are run.
-	Tests are now run in a separate appdomain to avoid conflicts of the
-	tested assembly with MD.
-
-	* Gui/TestResultsPad.cs: Ignore NUnit stack frames when looking for the
-	source of a test failure. Fix some issues with the output pad.
-
-	* Makefile.am:
-	* MonoDevelop.NUnit.mdp: Updated.
-
-2009-01-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestPad.cs:
-	* Gui/TestResultsPad.cs: Make sure the tree view is the first widget to
-	be focused when presenting the pad.
-
-2009-01-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/ExternalTestRunner.cs: Fix bug #461415 - NUnit addin's path
-	handling does not account for inherited tests. Patch by Brian
-	Anderson.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.NUnit.mdp: All projects now require fx 3.5.
-
-2008-12-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/NUnitAssemblyGroupFileFormat.cs: Track API changes.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.NUnit.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitService.cs: Track api changes.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs: Add missing files.
-
-2008-11-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/ExternalTestRunner.cs: Fix bug #440929 - Exception when
-	running single test fixture that contains no tests.
-
-	* MonoDevelop.NUnit.mdp: Added stetic file.
-
-	* Makefile.am: Fix support for makefile parallel build.
-
-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build dependencies.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelopNUnit.addin.xml: Bump MD version.
-
-2008-10-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml, Services/WorkspaceTestGroup.cs,
-	  Services/NUnitService.cs, Services/SolutionFolderTestGroup.cs,
-	  Gui/TestResultsPad.cs, Gui/TestPad.cs: Use a simple lazy singleton
-	  instead of an IService.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Updated generated code.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Services/NUnitProjectTestSuite.cs: Track api changes.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs,
-	  Gui/NUnitAssemblyGroupNodeBuilder.cs, Gui/TestNodeBuilder.cs,
-	  Gui/TestAssemblyNodeBuilder.cs, Gui/TestPad.cs: Moved the
-	  extensible tree view to its own directory.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* Services/NUnitProjectTestSuite.cs: Translated old code to new dom.
-
-2008-07-25  Peter Johanson <peter@peterjohanson.com> 
-
-	* Services/ExternalTestRunner.cs: Prevent an ArgumentOutOfRange
-	  exception if we are running a UnitTestGroup node.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/NUnitAssemblyGroupFileFormat.cs,
-	  Project/NUnitAssemblyGroupProject.cs, Project/TestAssembly.cs,
-	  Services/NUnitOptions.cs, Services/UnitTest.cs: Moved serialization
-	  engine to MonoDevelop.Core. Use new syntax for specifying attribute
-	  scope.
-
-2008-06-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Services/NUnitAssemblyTestSuite.cs: When counting test cases, ensure
-	  the test suite is fully loaded. Fixes bug #400106.
-	* Gui/TestResultsPad.cs: Some protection against division by 0.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Bump MD version.
-
-2008-05-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/TestResultsPad.cs: Fix bug 387453 - Buttons in NUnit Test Results
-	  throw exception.
-
-2008-05-27  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Services/NUnitService.cs, Gui/TestPad.cs: Moved SearchTest to
-	  NUnitService.
-	* Gui/TestResultsPad.cs: Fixed bug 366047 - Exceptions in "Test
-	  results" pad.
-
-2008-05-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/NUnitAssemblyGroupFileFormat.cs: Track api changes.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/NUnitAssemblyGroupProject.cs: Replaced
-	  ICompilerResult/DefaultCompilerResult/CompilerResults by a new
-	  BuildResult class, which has owner information at error level, so
-	  it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* md1format.xml: Added missing file.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml, MonoDevelop.NUnit.mdp,
-	  Services/WorkspaceTestGroup.cs, Services/NUnitService.cs,
-	  Services/UnitTest.cs, Services/SolutionFolderTestGroup.cs,
-	  Services/UnitTestGroup.cs, Services/NUnitProjectTestSuite.cs,
-	  Services/SystemTestProvider.cs, Services/ITestProvider.cs,
-	  Services/NUnitAssemblyTestSuite.cs,
-	  Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs,
-	  Gui/TestResultsPad.cs, Gui/NUnitAssemblyGroupNodeBuilder.cs,
-	  Gui/TestPad.cs, Project/NUnitAssemblyGroupProject.cs,
-	  Project/NUnitAssemblyGroupFileFormat.cs, Makefile.am: New project
-	  model changes.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* Services/TestProgressMonitor.cs: Refactored status bar.
-
-2008-02-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml, Services/NUnitService.cs: Put back the
-	  old results pad.
-	* Gui/TestResultsPad.cs: When double clicking a test, jump to the exact
-	  line that failed. When selecting a test, scroll the output view so
-	  it shows the test's output.
-	* Gui/TestPad.cs: Use a toolbar without labels.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Services/TestProgressMonitor.cs: Added tests finished message.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/TestPad.cs: Fixed threading bug.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml, Services/TestProgressMonitor.cs,
-	  Services/NUnitService.cs, Gui/TestResultsPad.cs, Gui/TestPad.cs,
-	  Gui/CircleImage.cs: Worked on nunit pad
-
-2008-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp, Makefile.am: Fix references.
-	* MonoDevelopNUnit.addin.xml, Services/NUnitService.cs: Register nunit
-	  packages using the extension point, instead of doing it by conde in the
-	  nunit service (since that code won't be run unless the service is
-	  explicitely loaded). Fixes bug #
-
-2008-02-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/NUnitAssemblyGroupNodeBuilder.cs, Gui/TestAssemblyNodeBuilder.cs:
-	  Handle the delete key in TreeViewPad, so it will work event if the
-	  shortcut is not defined.
-
-2008-02-06  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/TestPad.cs: Some changes for the new TreeViePiye
-
-2008-02-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/NUnitProject.xpt.xml: Fix nunit versions referenced in the
-	  project.
-
-2008-02-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* templates/NUnitProject.xpt.xml: Don't try to open Test.cs, since it wont
-	  work for languages other than c#. Fixes bug #358359.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Update MD version.
-
-2008-01-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/NUnitOptionsPanel.cs: Ensure we don't create subclasses of classes
-	  with private fields bound by glade#. It would not work due to bug
-	  355228.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/NUnitTestClass.xft.xml, templates/NUnitAssemblyGroup.xpt.xml,
-	  templates/NUnitProject.xpt.xml: Make template categories translatable.
-
-2008-01-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/TestPad.cs: Add null check when filling data for selected node. Should
-	  fix bug #350518.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp, Makefile.am: Directory reorganization.
-
-2007-11-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml, Services/NUnitService.cs: Reuse the results
-	  pad. Don't create it at every session. Fixes bug #338960.
-	* Gui/TestResultsPad.cs: Icon and title is now set in the manifest.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Services/NUnitService.cs, Services/XmlResultsStore.cs,
-	  Services/NUnitAssemblyTestSuite.cs: Track LoggingService API changes.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Bump MD version.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/NUnitAssemblyGroupNodeBuilder.cs, templates/NUnitTestClass.xft.xml:
-	  Use tango file icons. Removed obsolete icons.
-
-2007-10-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp, Services/NUnitService.cs, Gui/nunit-overlay-32.png,
-	  Gui/TestResultsPad.cs, Makefile.am,
-	  templates/NUnitAssemblyGroup.xpt.xml, templates/NUnitProject.xpt.xml:
-	  Updated project icons. Use the base project icon with an overlay to show
-	  the type.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Project file names updated by change in MD path
-	  functions.
-
-2007-10-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Fix warning level.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Bump MD version.
-
-2007-09-04  Michael Hutchinson <MHutchinson@novell.com>
-
-	* Gui/UnitTestOptionsDialog.cs,
-	  Gui/NUnitOptionsPanel.cs: Fix compiler warnings.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/UnitTestOptionsDialog.cs, Gui/NUnitOptionsPanel.cs: Changes due to new
-	  property infrastructure.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Removed the CommandService class. Everything
-	  is done directly with CommandManager. Moved all extension node types to
-	  MD.Components.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp, MonoDevelopNUnit.addin.xml,
-	  Services/NUnitService.cs, Gui/UnitTestOptionsDialog.cs,
-	  Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs,
-	  Gui/TestResultsPad.cs, Gui/NUnitAssemblyGroupNodeBuilder.cs,
-	  Gui/TestAssemblyNodeBuilder.cs, Gui/TestNodeBuilder.cs, Gui/TestPad.cs,
-	  Makefile.am: Reorganized the extension point hierarchy. Embedded all
-	  add-in manifests as resources.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Services/NUnitService.cs,
-	  Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs,
-	  Gui/NUnitAssemblyGroupNodeBuilder.cs, Gui/TestNodeBuilder.cs,
-	  Gui/TestPad.cs: Converted DispatchService to a static class.
-
-2007-07-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp, MonoDevelopNUnit.addin.xml, Gui/nunit.png,
-	  Makefile.am: Added icon for the nunit pad.
-
-2007-07-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Services/NUnitService.cs, Services/XmlResultsStore.cs,
-	  Services/NUnitAssemblyTestSuite.cs: Use the log service for logging
-	  errors.
-
-2007-07-03  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/TestResultsPad.cs: Changed a bit because of the removal of custom
-	  collections in the Ide project.
-
-2007-06-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Services/NUnitService.cs: Track api changes.
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Services/NUnitService.cs: If a solution is already open when
-	  initializing the nunit service, load the test tree.
-
-2007-05-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/TestResultsPad.cs: Fixed some status messages. Make sure the
-	  progress label does not grow beyond the available space.
-
-2007-05-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Services/NUnitService.cs: Unregister tests providers of unloaded
-	  add-ins.
-
-2007-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/TestPad.cs: Added missing null check. Fixes bug #81097.
-
-2007-05-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/TestPad.cs: Fill the tree if there is some RootTest defined just
-	  after the pad initialization.
-
-2007-05-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Copy nunit dlls to target dir.
-	* Services/NUnitService.cs, Gui/TestResultsPad.cs: Track api changes.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Copy the .addins.xml file to the output dir.
-
-2007-05-10  Mike Krüger <mkrueger@novell.com>
-
-	* Services/NUnitService.cs:
-	Fixed bug in pad loading.
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp, Makefile.am: Reference shared assemblies from
-	  the correct location.
-
-2007-05-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Restore extension deleted during the M.A
-	  migration.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp, MonoDevelopNUnit.addin.xml,
-	  Services/NUnitService.cs, Gui/UnitTestOptionsDialog.cs,
-	  Makefile.am: Migration to Mono.Addins.
-
-2007-05-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.Projects/Combine.cs,
-	  MonoDevelop.Projects/CombineEntryEventArgs.cs,
-	  MonoDevelop.Projects.Parser/DefaultParserService.cs: Added a
-	  Reloading property to the argument of the entry add/remove events
-	  of Combine, which is set to true if the entry is being only
-	  reloaded, not actually removed/added to the combine.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Updated.
-	* Project/NUnitAssemblyGroupFileFormat.cs: Track api changes.
-
-2007-03-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Don't local copy references.
-	* Services/NUnitService.cs, Gui/TestResultsPad.cs: Added button for
-	  running the tests. Fixed context menu. Don't make the TestResultPad
-	  a subclass of GuiSyncObject because there are some identity issue
-	  with GetHashCode and the proxy. Using TestMonitor instead.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Set target runtime to 2.0.
-
-2007-02-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am: Remove nunit references, since nunit is now included in
-	  the add-in.
-
-2007-02-11  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	*Makefile.am: install also nunit.framework.dll, otherwise addin will not start on some systems
-
-2007-02-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Synchronized the MD project and the Makefile
-	* MonoDevelopNUnit.addin.xml: Removed nunit dependency. Added new
-	  project template.
-	* Services/ExternalTestRunner.cs, Services/NUnitAssemblyTestSuite.cs:
-	  Track api changes in NUnit.
-	* Services/NUnitService.cs: Register the nunit package is none is
-	  installed.
-	* Gui/TestResultsPad.cs: Make the toolbar smaller. Added null check for
-	  empty result messages when a test is ignored.
-	* lib, lib/nunit.framework.dll, lib/nunit.core.dll: Bundle nunit
-	  together with the add-in.
-	* Makefile.am: Synchronized the MD project and the Makefile. Bundle
-	  nunit together with the add-in.
-	* templates/NUnitTestClass.xft.xml: Latest NUnit versions require the
-	  Test attribute to be applied to test methods.
-	* templates/NUnitProject.xpt.xml: New project template.
-
-2007-02-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp: Updated.
-	* Gui/NUnitAssemblyGroupNodeBuilder.cs: Dispose the project after
-	  removing it.
-	* Project/NUnitAssemblyGroupProject.cs: Track api changes.
-
-2006-12-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/NUnitAssemblyGroupProject.cs: Track api changes.
-
-2006-11-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Services/NUnitService.cs: Use global events to keep track of
-	  reference changes (simplified the code).
-
-2006-09-21 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Gui/NUnitAssemblyGroupNodeBuilder.cs:
-	* MonoDevelopNUnit.addin.xml: Added delete command to the nunit
-	  assembly group context menu.
-	  
-	* Services/NUnitProjectTestSuite.cs: Track API changes.
-
-2006-09-07 Andrés G. Aragoneses  <knocte@gmail.com>
-
-	* MonoDevelopNUnit.addin.xml: Improved string.
-
-2006-09-05 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Services/ExternalTestRunner.cs: Make sure the MonoDevelop.Projects
-	  add-in is loaded in the remote process.
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.mdp:
-	* Makefile.am:
-	* templates/NUnitTestClass.xft.xml: Added new file template for
-	  unit tests.
-	  
-	* Services/UnitTest.cs: Removed DataItem attributes, since they
-	  are not ignored anymore.
-	* MonoDevelopNUnit.addin.xml: Updated versions.
-
-2006-06-15 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitService.cs: Use the new extension listeners to
-	  read extensions.
-
-2006-05-31 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelopNUnit.addin.xml:
-	* Services/NUnitService.cs: Added an extension point for registering
-	  test providers. It replaces the RegisterTestProvider api call.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelopNUnit.addin.xml: Updated versions.
-	* MonoDevelop.NUnit.mdp: Updated.
-
-2006-04-18 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/CircleImage.cs: Added static constructor to get
-	strict "beforefieldinit" semantics, so that the images
-	are loaded after GTK is initialized.
-
-2006-04-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Reference nunit libraries using $(NUNIT_LIBS).
-	  Patch by Christian Hergert.
-
-2006-04-03 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* NUnit/Services/NUnitService.cs: Use a GUI thread safe
-	  subscription to CombineOpened event.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com>
-
-	* MonoDevelop.NUnit.addin.xml: Added info about the
-	  nunit dependency.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.NUnit.addin.xml: Updated references.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* MonoDevelop.NUnit.mdp: Updated.
-	* Makefile.am: Use an unified format. Patch by Matze Braun.
-	* MonoDevelopNUnit.addin.xml: Updated add-in versions.
-
-2006-03-22  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* NUnit/MonoDevelopNUnit.addin.xml: Declared nunit.framework
-	  dependency.
-
-2005-12-22  David Makovský <yakeen@sannyas-on.net> 
-
-	* Gui/TestResultsPad.cs:
-	* Gui/NUnitOptionsPanel.cs:
-	* Gui/TestNodeBuilder.cs:
-	* Gui/TestPad.cs: Make some strings translatable.
-
-
-2005-11-15  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Services/NUnitTestCase.cs:
-	* Services/NUnitTestSuite.cs:
-	* Services/NUnitAssemblyTestSuite.cs:
-	* Services/ExternalTestRunner.cs: Properly handle the case when it's
-	running a single test case.
-	
-	* Services/UnitTest.cs: Save the inherited store if needed.
-	* Services/XmlResultsStore.cs: Reset the modified flag once the
-	store is saved.
-	* Gui/TestResultsPad.cs: Clear the output buffer when refreshing the
-	results list.
-	* MonoDevelopNUnit.addin.xml: Added dependency.
-
-2005-10-11  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Fixed addin header information.
-	Use "id" attribuet instead of "name" to identify addins.
-
-2005-10-04  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* MonoDevelopNUnit.addin.xml: Added addin dependencies.
-	* Gui/UnitTestOptionsDialog.cs: Use the new addin API.
-
-2005-09-22  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Services/NUnitService.cs:
-	* Services/CombineTestGroup.cs:
-	* Services/NUnitProjectTestSuite.cs:
-	* Services/SystemTestProvider.cs: Only generate a test suite for
-	projects that reference the nunit.framework assembly.
-
-2005-08-12  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* templates/*:
-	* MonoDevelopNUnit.addin.xml: Properly reference resource icons and
-	templates.
-	* Makefile.am: Embed icon and templates as resources.
-	* Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs: Track changes in
-	the Stock class.
-
-2005-08-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitService.cs:
-	* Gui/UnitTestOptionsDialog.cs: Track changes in TreeViewOptions.
-
-2005-08-10  Ben Motmans  <ben.motmans@gmail.com>
-
-	* MonoDevelop.NUnit.mdp: references update
-
-2005-08-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Services/NUnitProjectTestSuite.cs: Use the new IParserContext API.
-
-2005-08-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/TestPad.cs:
-	* Gui/TestResultsPad.cs: Use the new command service to show
-	context menus.
-
-2005-07-27  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Project/NUnitAssemblyGroupProject.cs: Track api changes.
-
-2005-07-13  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* New addin implementation.
-
-2005-03-16  John Luke  <john.luke@gmail.com>
-
-	* Redo the nunit addin based on gnunit
diff --git a/main/src/addins/NUnit/Commands/NUnitCommands.cs b/main/src/addins/NUnit/Commands/NUnitCommands.cs
deleted file mode 100644
index 0a581fdb81..0000000000
--- a/main/src/addins/NUnit/Commands/NUnitCommands.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// TestChart.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.NUnit.Commands
-{
-	public enum TestCommands
-	{
-		RunAllTests,
-		RunTest,
-		DebugTest,
-		RunTestWith,
-		ShowTestCode,
-		SelectTestInTree,
-		ShowTestDetails,
-		GoToFailure,
-		RerunTest,
-	}
-	
-	public enum TestChartCommands
-	{
-		ShowResults,
-		ShowTime,
-		UseTimeScale,
-		SingleDayResult,
-		ShowSuccessfulTests,
-		ShowFailedTests,
-		ShowIgnoredTests
-	}
-	
-	public enum NUnitProjectCommands
-	{
-		AddAssembly
-	}
-	
-	class RunAllTestsHandler: CommandHandler
-	{
-		protected override void Run ()
-		{
-			IWorkspaceObject ob = IdeApp.ProjectOperations.CurrentSelectedBuildTarget;
-			if (ob != null) {
-				UnitTest test = NUnitService.Instance.FindRootTest (ob);
-				if (test != null)
-					NUnitService.Instance.RunTest (test, null);
-			}
-		}
-		
-		protected override void Update (CommandInfo info)
-		{
-			IWorkspaceObject ob = IdeApp.ProjectOperations.CurrentSelectedBuildTarget;
-			if (ob != null) {
-				UnitTest test = NUnitService.Instance.FindRootTest (ob);
-				info.Enabled = (test != null);
-			} else
-				info.Enabled = false;
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs b/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs
deleted file mode 100644
index 3b3114af61..0000000000
--- a/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs
+++ /dev/null
@@ -1,440 +0,0 @@
-//
-// AbstractUnitTestTextEditorExtension.cs
-//
-// Author:
-//       Mike Krüger <mkrueger@xamarin.com>
-//
-// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Ide.Gui.Content;
-using System.Collections.Generic;
-using System.Threading;
-using Mono.TextEditor;
-using MonoDevelop.NUnit;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-using Gtk;
-using MonoDevelop.Components;
-
-namespace MonoDevelop.NUnit
-{
-	public abstract class AbstractUnitTestTextEditorExtension : TextEditorExtension
-	{
-		public override void Initialize ()
-		{
-			base.Initialize ();
-			Document.DocumentParsed += HandleDocumentParsed; 
-			if (IdeApp.Workbench == null)
-				return;
-			NUnitService.Instance.TestSessionCompleted += HandleTestSessionCompleted;
-		}
-
-		void HandleTestSessionCompleted (object sender, EventArgs e)
-		{
-			if (document.Editor == null)
-				return;
-			document.Editor.Parent.TextArea.RedrawMargin (document.Editor.Parent.TextArea.ActionMargin);
-		}
-
-		public override void Dispose ()
-		{
-			NUnitService.Instance.TestSessionCompleted -= HandleTestSessionCompleted;
-			RemoveHandler ();
-			Document.DocumentParsed -= HandleDocumentParsed; 
-			base.Dispose ();
-		}
-
-		CancellationTokenSource src = new CancellationTokenSource ();
-
-		public abstract IList<UnitTestLocation> GatherUnitTests ();
-
-		readonly static PropertyWrapper<bool> EnableUnitTestEditorIntegration = new PropertyWrapper<bool> ("Testing.EnableUnitTestEditorIntegration", false);
-
-		void HandleDocumentParsed (object sender, EventArgs e)
-		{
-			if (!EnableUnitTestEditorIntegration)
-				return;
-			src.Cancel ();
-			src = new CancellationTokenSource ();
-			var token = src.Token;
-			ThreadPool.QueueUserWorkItem (delegate {
-				if (token.IsCancellationRequested)
-					return;
-				var foundTests = GatherUnitTests ();
-				if (foundTests == null)
-					return;
-				Application.Invoke (delegate {
-					var editor = document.Editor;
-					if (editor == null)
-						return;
-					var textEditor = editor.Parent;
-					if (textEditor == null)
-						return;
-					var actionMargin = textEditor.ActionMargin;
-					if (actionMargin == null)
-						return;
-					if (actionMargin.IsVisible ^ (foundTests.Count > 0))
-						textEditor.QueueDraw ();
-					actionMargin.IsVisible |= foundTests.Count > 0;
-					foreach (var oldMarker in currentMarker)
-						editor.Document.RemoveMarker (oldMarker);
-
-					foreach (var foundTest in foundTests) {
-						if (token.IsCancellationRequested)
-							return;
-						var unitTestMarker = new UnitTestMarker (foundTest, document);
-						currentMarker.Add (unitTestMarker);
-						editor.Document.AddMarker (foundTest.LineNumber, unitTestMarker);
-					}
-				});
-			});
-		}
-
-		static uint timeoutHandler;
-
-		static void RemoveHandler ()
-		{
-			if (timeoutHandler != 0) {
-				GLib.Source.Remove (timeoutHandler); 
-				timeoutHandler = 0;
-			}
-		}
-
-		List<UnitTestMarker> currentMarker = new List<UnitTestMarker>();
-
-		class UnitTestMarker : MarginMarker
-		{
-			readonly UnitTestLocation unitTest;
-			readonly MonoDevelop.Ide.Gui.Document doc;
-
-			public UnitTestMarker(UnitTestLocation unitTest, MonoDevelop.Ide.Gui.Document doc)
-			{
-				this.unitTest = unitTest;
-				this.doc = doc;
-			}
-
-			public override bool CanDrawForeground (Margin margin)
-			{
-				return margin is ActionMargin;
-			}
-
-			public override void InformMouseHover (TextEditor editor, Margin margin, MarginMouseEventArgs args)
-			{
-				if (!(margin is ActionMargin))
-					return;
-				string toolTip;
-				if (unitTest.IsFixture) {
-					if (isFailed) {
-						toolTip = GettextCatalog.GetString ("NUnit Fixture failed (click to run)");
-						if (!string.IsNullOrEmpty (failMessage))
-							toolTip += Environment.NewLine + failMessage.TrimEnd ();
-					} else {
-						toolTip = GettextCatalog.GetString ("NUnit Fixture (click to run)");
-					}
-				} else {
-					if (isFailed) {
-						toolTip = GettextCatalog.GetString ("NUnit Test failed (click to run)");
-						if (!string.IsNullOrEmpty (failMessage))
-							toolTip += Environment.NewLine + failMessage.TrimEnd ();
-						foreach (var id in unitTest.TestCases) {
-							var test = NUnitService.Instance.SearchTestById (unitTest.UnitTestIdentifier + id);
-							if (test != null) {
-								var result = test.GetLastResult ();
-								if (result != null && result.IsFailure) {
-									if (!string.IsNullOrEmpty (result.Message)) {
-										toolTip += Environment.NewLine + "Test" + id +":";
-										toolTip += Environment.NewLine + result.Message.TrimEnd ();
-									}
-								}
-							}
-
-						}
-					} else {
-						toolTip = GettextCatalog.GetString ("NUnit Test (click to run)");
-					}
-
-				}
-				editor.TooltipText = toolTip;
-			}
-
-			static Menu menu;
-
-			public override void InformMousePress (TextEditor editor, Margin margin, MarginMouseEventArgs args)
-			{
-				if (!(margin is ActionMargin))
-					return;
-				if (menu != null) {
-					menu.Destroy ();
-				}
-				var debugModeSet = Runtime.ProcessService.GetDebugExecutionMode ();
-
-				menu = new Menu ();
-				if (unitTest.IsFixture) {
-					var menuItem = new MenuItem ("_Run All");
-					menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, false).Run;
-					menu.Add (menuItem);
-					if (debugModeSet != null) {
-						menuItem = new MenuItem ("_Debug All");
-						menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Run;
-						menu.Add (menuItem);
-					}
-					menuItem = new MenuItem ("_Select in Test Pad");
-					menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Select;
-					menu.Add (menuItem);
-				} else {
-					if (unitTest.TestCases.Count == 0) {
-						var menuItem = new MenuItem ("_Run");
-						menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, false).Run;
-						menu.Add (menuItem);
-						if (debugModeSet != null) {
-							menuItem = new MenuItem ("_Debug");
-							menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Run;
-							menu.Add (menuItem);
-						}
-						menuItem = new MenuItem ("_Select in Test Pad");
-						menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Select;
-						menu.Add (menuItem);
-					} else {
-						var menuItem = new MenuItem ("_Run All");
-						menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, false).Run;
-						menu.Add (menuItem);
-						if (debugModeSet != null) {
-							menuItem = new MenuItem ("_Debug All");
-							menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier, true).Run;
-							menu.Add (menuItem);
-						}
-						menu.Add (new SeparatorMenuItem ());
-						foreach (var id in unitTest.TestCases) {
-							var submenu = new Menu ();
-							menuItem = new MenuItem ("_Run");
-							menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier + id, false).Run;
-							submenu.Add (menuItem);
-							if (debugModeSet != null) {
-								menuItem = new MenuItem ("_Debug");
-								menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier + id, true).Run;
-								submenu.Add (menuItem);
-							}
-
-							var label = "Test" + id;
-							string tooltip = null;
-							var test = NUnitService.Instance.SearchTestById (unitTest.UnitTestIdentifier + id);
-							if (test != null) {
-								var result = test.GetLastResult ();
-								if (result != null && result.IsFailure) {
-									tooltip = result.Message;
-									label += "!";
-								}
-							}
-
-							menuItem = new MenuItem ("_Select in Test Pad");
-							menuItem.Activated += new TestRunner (doc, unitTest.UnitTestIdentifier + id, true).Select;
-							submenu.Add (menuItem);
-
-
-							var subMenuItem = new MenuItem (label);
-							if (!string.IsNullOrEmpty (tooltip))
-								subMenuItem.TooltipText = tooltip;
-							subMenuItem.Submenu = submenu;
-							menu.Add (subMenuItem);
-						}
-					}
-				}
-				menu.ShowAll ();
-				editor.TextArea.ResetMouseState (); 
-				GtkWorkarounds.ShowContextMenu (menu, editor, new Gdk.Rectangle ((int)args.X, (int)args.Y, 1, 1));
-			}
-
-			class TestRunner
-			{
-				//				readonly MonoDevelop.Ide.Gui.Document doc;
-				readonly string testCase;
-				readonly bool debug;
-
-				public TestRunner (MonoDevelop.Ide.Gui.Document doc, string testCase, bool debug)
-				{
-					//					this.doc = doc;
-					this.testCase = testCase;
-					this.debug = debug;
-				}
-
-				bool TimeoutHandler ()
-				{
-					var test = NUnitService.Instance.SearchTestById (testCase);
-					if (test != null) {
-						RunTest (test); 
-						timeoutHandler = 0;
-					} else {
-						return true;
-					}
-					return false;
-				}
-
-				List<NUnitProjectTestSuite> testSuites = new List<NUnitProjectTestSuite>();
-				internal void Run (object sender, EventArgs e)
-				{
-					menu.Destroy ();
-					menu = null;
-					if (IdeApp.ProjectOperations.IsBuilding (IdeApp.ProjectOperations.CurrentSelectedSolution) || 
-						IdeApp.ProjectOperations.IsRunning (IdeApp.ProjectOperations.CurrentSelectedSolution))
-						return;
-
-					var foundTest = NUnitService.Instance.SearchTestById (testCase);
-					if (foundTest != null) {
-						RunTest (foundTest);
-						return;
-					}
-
-					var tests = new Stack<UnitTest> ();
-					foreach (var test in NUnitService.Instance.RootTests) {
-						tests.Push (test);
-					}
-					while (tests.Count > 0) {
-						var test = tests.Pop ();
-
-						var solutionFolderTestGroup = test as SolutionFolderTestGroup;
-						if (solutionFolderTestGroup != null) {
-							foreach (var test2 in solutionFolderTestGroup.Tests) {
-								tests.Push (test2); 
-							}
-							continue;
-						}
-						var nUnitProjectTestSuite = test as NUnitProjectTestSuite;
-						if (nUnitProjectTestSuite != null)
-							testSuites.Add (nUnitProjectTestSuite); 
-					}
-
-					foreach (var test in testSuites) {
-						test.TestChanged += HandleTestChanged;
-						test.ProjectBuiltWithoutTestChange += HandleTestChanged;
-					}
-
-					IdeApp.ProjectOperations.Build (IdeApp.ProjectOperations.CurrentSelectedSolution);
-				}
-
-				void HandleTestChanged (object sender, EventArgs e)
-				{
-					var foundTest = NUnitService.Instance.SearchTestById (testCase);
-					if (foundTest != null) {
-						foreach (var test in testSuites) {
-							test.TestChanged -= HandleTestChanged;
-							test.ProjectBuiltWithoutTestChange -= HandleTestChanged;
-						}
-						testSuites.Clear ();
-
-						RunTest (foundTest); 
-					}
-				}
-
-				internal void Select (object sender, EventArgs e)
-				{
-					menu.Destroy ();
-					menu = null;
-					var test = NUnitService.Instance.SearchTestById (testCase);
-					if (test == null)
-						return;
-					var pad = IdeApp.Workbench.GetPad<TestPad> ();
-					pad.BringToFront ();
-					var content = (TestPad)pad.Content;
-					content.SelectTest (test);
-				}
-
-				void RunTest (UnitTest test)
-				{
-					var debugModeSet = Runtime.ProcessService.GetDebugExecutionMode ();
-					MonoDevelop.Core.Execution.IExecutionHandler ctx = null;
-					if (debug && debugModeSet != null) {
-						foreach (var executionMode in debugModeSet.ExecutionModes) {
-							if (test.CanRun (executionMode.ExecutionHandler)) {
-								ctx = executionMode.ExecutionHandler;
-								break;
-							}
-						}
-					}
-					// NUnitService.Instance.RunTest (test, ctx);
-					var pad = IdeApp.Workbench.GetPad<TestPad> ();
-					var content = (TestPad)pad.Content;
-					content.RunTest (test, ctx);
-				}
-			}
-
-			bool isFailed;
-			string failMessage;
-			public override void DrawForeground (TextEditor editor, Cairo.Context cr, MarginDrawMetrics metrics)
-			{
-				isFailed = false;
-				var test = NUnitService.Instance.SearchTestById (unitTest.UnitTestIdentifier);
-				bool searchCases = false;
-
-				Xwt.Drawing.Image icon = null;
-
-				if (test != null) {
-					icon = test.StatusIcon;
-					var result = test.GetLastResult ();
-					if (result == null) {
-						searchCases = true;
-					} else if (result.IsFailure) {
-						failMessage = result.Message;
-						isFailed = true;
-					}
-				} else {
-					searchCases = true;
-				}
-
-				if (searchCases) {
-					foreach (var caseId in unitTest.TestCases) {
-						test = NUnitService.Instance.SearchTestById (unitTest.UnitTestIdentifier + caseId);
-						if (test != null) {
-							icon = test.StatusIcon;
-							var result = test.GetLastResult ();
-							if (result != null && result.IsFailure) {
-								failMessage = result.Message;
-								isFailed = true;
-								break;
-							} 
-						}
-					}
-				}
-
-				if (icon != null) {
-					if (icon.Width > metrics.Width || icon.Height > metrics.Height)
-						icon = icon.WithBoxSize (metrics.Width, metrics.Height);
-					cr.DrawImage (editor, icon, Math.Truncate (metrics.X + metrics.Width / 2 - icon.Width / 2), Math.Truncate (metrics.Y + metrics.Height / 2 - icon.Height / 2));
-				}
-			}
-		}
-		public class UnitTestLocation
-		{
-			public int LineNumber { get; set; }
-			public bool IsFixture { get; set; }
-			public string UnitTestIdentifier { get; set; }
-			public bool IsIgnored { get; set; }
-
-			public List<string> TestCases = new List<string> ();
-
-			public UnitTestLocation (int lineNumber)
-			{
-				LineNumber = lineNumber;
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs b/main/src/addins/NUnit/Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs
deleted file mode 100644
index 1d7c6e5a4e..0000000000
--- a/main/src/addins/NUnit/Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// NUnitAssemblyGroupConfigurationNodeBuilder.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.NUnit.Commands;
-using MonoDevelop.Components;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.NUnit
-{
-	public class NUnitAssemblyGroupConfigurationNodeBuilder: TypeNodeBuilder
-	{
-		EventHandler assembliesChanged;
-		
-		public NUnitAssemblyGroupConfigurationNodeBuilder ()
-		{
-			assembliesChanged = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnAssembliesChanged));
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(NUnitAssemblyGroupConfigurationNodeCommandHandler); }
-		}
-		
-		public override string ContextMenuAddinPath {
-			get { return "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroupConfiguration"; }
-		}
-
-		public override Type NodeDataType {
-			get { return typeof(NUnitAssemblyGroupProjectConfiguration); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((SolutionItemConfiguration)dataObject).Id;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
-		{
-			var conf = (SolutionItemConfiguration) dataObject;
-			nodeInfo.Label = conf.Id;
-			nodeInfo.Icon = Context.GetIcon (Stock.ClosedFolder);
-		}
-
-		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			var config = (NUnitAssemblyGroupProjectConfiguration) dataObject;
-				
-			foreach (TestAssembly ta in config.Assemblies)
-				builder.AddChild (ta);
-		}
-
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			var config = (NUnitAssemblyGroupProjectConfiguration) dataObject;
-			return config.Assemblies.Count > 0;
-		}
-		
-		public override void OnNodeAdded (object dataObject)
-		{
-			var config = (NUnitAssemblyGroupProjectConfiguration) dataObject;
-			config.AssembliesChanged += assembliesChanged;
-		}
-		
-		public override void OnNodeRemoved (object dataObject)
-		{
-			var config = (NUnitAssemblyGroupProjectConfiguration) dataObject;
-			config.AssembliesChanged -= assembliesChanged;
-		}
-		
-		public void OnAssembliesChanged (object sender, EventArgs args)
-		{
-			ITreeBuilder tb = Context.GetTreeBuilder (sender);
-			if (tb != null) tb.UpdateAll ();
-		}
-	}
-	
-	class NUnitAssemblyGroupConfigurationNodeCommandHandler: NodeCommandHandler
-	{
-		[CommandHandler (NUnitProjectCommands.AddAssembly)]
-		protected void OnAddAssembly ()
-		{
-			var config = (NUnitAssemblyGroupProjectConfiguration) CurrentNode.DataItem;
-			
-			var dlg = new SelectFileDialog (GettextCatalog.GetString ("Add files")) {
-				TransientFor = IdeApp.Workbench.RootWindow,
-				SelectMultiple = true,
-			};
-			if (!dlg.Run ())
-				return;
-			
-			foreach (string file in dlg.SelectedFiles)
-				config.Assemblies.Add (new TestAssembly (file));
-			
-			IdeApp.Workspace.Save();
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/Gui/NUnitAssemblyGroupNodeBuilder.cs b/main/src/addins/NUnit/Gui/NUnitAssemblyGroupNodeBuilder.cs
deleted file mode 100644
index 490a355404..0000000000
--- a/main/src/addins/NUnit/Gui/NUnitAssemblyGroupNodeBuilder.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// NUnitAssemblyGroupNodeBuilder.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.NUnit.Commands;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.NUnit
-{
-	public class NUnitAssemblyGroupNodeBuilder: TypeNodeBuilder
-	{
-		ConfigurationEventHandler configsChanged;
-		
-		public NUnitAssemblyGroupNodeBuilder ()
-		{
-			configsChanged = (ConfigurationEventHandler) DispatchService.GuiDispatch (new ConfigurationEventHandler (OnConfigurationsChanged));
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(NUnitAssemblyGroupNodeCommandHandler); }
-		}
-		
-		public override string ContextMenuAddinPath {
-			get { return "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroup"; }
-		}
-
-		public override Type NodeDataType {
-			get { return typeof(NUnitAssemblyGroupProject); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((NUnitAssemblyGroupProject)dataObject).Name;
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
-		{
-			NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject;
-			nodeInfo.Label = project.Name;
-			nodeInfo.Icon = Context.GetIcon (Stock.Project);
-		}
-
-		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject;
-				
-			foreach (NUnitAssemblyGroupProjectConfiguration c in project.Configurations)
-				builder.AddChild (c);
-		}
-
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject;
-			return project.Configurations.Count > 0;
-		}
-		
-		public override void OnNodeAdded (object dataObject)
-		{
-			NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject;
-			project.ConfigurationAdded += configsChanged;
-			project.ConfigurationRemoved += configsChanged;
-		}
-		
-		public override void OnNodeRemoved (object dataObject)
-		{
-			NUnitAssemblyGroupProject project = dataObject as NUnitAssemblyGroupProject;
-			project.ConfigurationAdded -= configsChanged;
-			project.ConfigurationRemoved -= configsChanged;
-		}
-		
-		public void OnConfigurationsChanged (object sender, ConfigurationEventArgs args)
-		{
-			ITreeBuilder tb = Context.GetTreeBuilder (sender);
-			if (tb != null) tb.UpdateAll ();
-		}
-	}
-	
-	class NUnitAssemblyGroupNodeCommandHandler: NodeCommandHandler
-	{
-		[CommandHandler (NUnitProjectCommands.AddAssembly)]
-		protected void OnShowTest ()
-		{
-		}
-		
-		public override void DeleteItem ()
-		{
-			NUnitAssemblyGroupProject project = CurrentNode.DataItem as NUnitAssemblyGroupProject;
-			project.ParentFolder.Items.Remove (project);
-			project.Dispose ();
-			IdeApp.Workspace.Save ();
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/Gui/TestAssemblyNodeBuilder.cs b/main/src/addins/NUnit/Gui/TestAssemblyNodeBuilder.cs
deleted file mode 100644
index 0bf065550c..0000000000
--- a/main/src/addins/NUnit/Gui/TestAssemblyNodeBuilder.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// TestAssemblyNodeBuilder.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.NUnit.Commands;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Ide.Gui.Components;
-
-namespace MonoDevelop.NUnit
-{
-	public class TestAssemblyNodeBuilder: TypeNodeBuilder
-	{
-		public override Type CommandHandlerType {
-			get { return typeof(TestAssemblyNodeCommandHandler); }
-		}
-		
-		public override string ContextMenuAddinPath {
-			get { return "/MonoDevelop/NUnit/ContextMenu/ProjectPad/TestAssembly"; }
-		}
-
-		public override Type NodeDataType {
-			get { return typeof(TestAssembly); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return Path.GetFileName (((TestAssembly)dataObject).Path);
-		}
-		
-		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
-		{
-			TestAssembly asm = dataObject as TestAssembly;
-			nodeInfo.Label = Path.GetFileName (asm.Path);
-			nodeInfo.Icon = Context.GetIcon (MonoDevelop.Ide.Gui.Stock.Reference);
-		}
-	}
-	
-	class TestAssemblyNodeCommandHandler: NodeCommandHandler
-	{
-		public override void DeleteItem ()
-		{
-			TestAssembly asm = CurrentNode.DataItem as TestAssembly;
-			NUnitAssemblyGroupProjectConfiguration config = (NUnitAssemblyGroupProjectConfiguration) CurrentNode.GetParentDataItem (typeof(NUnitAssemblyGroupProjectConfiguration), false);
-			config.Assemblies.Remove (asm);
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/Gui/TestChart.cs b/main/src/addins/NUnit/Gui/TestChart.cs
deleted file mode 100644
index fa379bbdf4..0000000000
--- a/main/src/addins/NUnit/Gui/TestChart.cs
+++ /dev/null
@@ -1,407 +0,0 @@
-//
-// TestChart.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using Gtk;
-using Gdk;
-using MonoDevelop.Components.Chart;
-
-namespace MonoDevelop.NUnit
-{
-	public enum TestChartType {
-		Results,
-		Time
-	}
-	
-	class TestRunAxis: IntegerAxis
-	{
-		public UnitTestResult[] CurrentResults;
-		
-		public TestRunAxis (bool showLabel): base (showLabel)
-		{
-		}
-		
-		public override string GetValueLabel (double value)
-		{
-			if (CurrentResults == null)
-				return "";
-
-			int val = (int) value;
-			if (val >= CurrentResults.Length)
-				return "";
-				
-			UnitTestResult res = CurrentResults [CurrentResults.Length - val - 1];
-			return string.Format ("{0}/{1}", res.TestDate.Day, res.TestDate.Month);
-		}
-	}
-	
-	public class TestChart: BasicChart
-	{
-		Serie serieFailed;
-		Serie serieSuccess;
-		Serie serieIgnored;
-		
-		Serie serieTime;
-		
-		bool timeScale = false;
-		bool singleDayResult = false;
-		TestChartType type;
-		
-		TimeSpan currentSpan = TimeSpan.FromDays (5);
-		int testCount = 20;
-		UnitTest test;
-		bool showLastTest = true;
-		bool resetCursors = true;
-		double lastDateValue;
-		double lastTestNumber;
-		UnitTestResult[] currentResults;
-		TestRunAxis testRunAxis;
-		
-		public TestChart ()
-		{
-			AllowSelection = true;
-			SetAutoScale (AxisDimension.Y, false, true);
-			StartY = 0;
-			
-			serieFailed = new Serie ("Failed tests");
-			serieFailed.Color = new Cairo.Color (1, 0, 0);
-			serieSuccess = new Serie ("Successful tests");
-			serieSuccess.Color = new Cairo.Color (0, 0.65, 0);
-			serieIgnored = new Serie ("Ignored tests");
-			serieIgnored.Color = new Cairo.Color (0.8, 0.8, 0);
-			
-			serieTime = new Serie ("Time");
-			serieTime.Color = new Cairo.Color (0, 0, 1);
-			
-			UpdateMode ();
-			
-/*			EndX = DateTime.Now.Ticks;
-			StartX = EndX - currentSpan.Ticks;
-			*/
-			EndX = 5;
-			StartX = 0;
-		}
-		
-		public bool ShowSuccessfulTests {
-			get { return serieSuccess.Visible; }
-			set { serieSuccess.Visible = value; }
-		}
-		
-		public bool ShowFailedTests {
-			get { return serieFailed.Visible; }
-			set { serieFailed.Visible = value; }
-		}
-		
-		public bool ShowIgnoredTests {
-			get { return serieIgnored.Visible; }
-			set { serieIgnored.Visible = value; }
-		}
-		
-		public bool UseTimeScale {
-			get { return timeScale; }
-			set { timeScale = value; UpdateMode (); }
-		}
-		
-		public bool SingleDayResult {
-			get { return singleDayResult; }
-			set { singleDayResult = value; UpdateMode (); }
-		}
-		
-		public TestChartType Type {
-			get { return type; }
-			set { type = value; UpdateMode (); }
-		}
-		
-		public DateTime CurrentDate {
-			get {
-				if (timeScale)
-					return new DateTime ((long) SelectionEnd.Value);
-				else {
-					int n = (int) SelectionStart.Value;
-					if (currentResults != null && n >= 0 && n < currentResults.Length)
-						return currentResults [currentResults.Length - n - 1].TestDate;
-					else
-						return DateTime.MinValue;
-				}
-			}
-		}
-		
-		public DateTime ReferenceDate {
-			get {
-				if (timeScale)
-					return new DateTime ((long) SelectionStart.Value);
-				else {
-					int n = (int) SelectionEnd.Value;
-					if (currentResults != null && n >= 0 && n < currentResults.Length)
-						return currentResults [currentResults.Length - n - 1].TestDate;
-					else
-						return DateTime.MinValue;
-				}
-			}
-		}
-		
-		void UpdateMode ()
-		{
-			AllowSelection = false;
-			
-			Reset ();
-
-			if (type == TestChartType.Results) {
-				AddSerie (serieIgnored);
-				AddSerie (serieFailed);
-				AddSerie (serieSuccess);
-			} else {
-				AddSerie (serieTime);
-			}
-			
-			if (timeScale) {
-				ReverseXAxis = false;
-				Axis ax = new DateTimeAxis (true);
-				AddAxis (new DateTimeAxis (false), AxisPosition.Top);
-				AddAxis (ax, AxisPosition.Bottom);
-				SelectionEnd.Value = SelectionStart.Value = DateTime.Now.Ticks;
-				SelectionStart.LabelAxis = ax;
-				SelectionEnd.LabelAxis = ax;
-			} else {
-				ReverseXAxis = true;
-				AddAxis (new TestRunAxis (false), AxisPosition.Top);
-				testRunAxis = new TestRunAxis (true);
-				AddAxis (testRunAxis, AxisPosition.Bottom);
-				SelectionEnd.Value = SelectionStart.Value = 0;
-				SelectionStart.LabelAxis = testRunAxis;
-				SelectionEnd.LabelAxis = testRunAxis;
-			}
-			showLastTest = true;
-			resetCursors = true;
-			
-			AddAxis (new IntegerAxis (true), AxisPosition.Left);
-			AddAxis (new IntegerAxis (true), AxisPosition.Right);
-			
-			if (test != null)
-				Fill (test);
-			
-			AllowSelection = true;
-		}
-		
-		public new void Clear ()
-		{
-			base.Clear ();
-			test = null;
-		}
-		
-		public void ZoomIn ()
-		{
-			if (test == null)
-				return;
-			if (timeScale) {
-				currentSpan = new TimeSpan (currentSpan.Ticks / 2);
-				if (currentSpan.TotalSeconds < 60)
-					currentSpan = TimeSpan.FromSeconds (60);
-			} else {
-				testCount = testCount / 2;
-				if (testCount < 5)
-					testCount = 5;
-			}
-			Fill (test);
-		}
-		
-		public void ZoomOut ()
-		{
-			if (test == null)
-				return;
-			if (timeScale) {
-				currentSpan = new TimeSpan (currentSpan.Ticks * 2);
-				if (currentSpan.TotalDays > 50 * 365)
-					currentSpan = TimeSpan.FromDays (50 * 365);
-			} else {
-				testCount *= 2;
-				if (testCount > 100000)
-					testCount = 100000;
-			}
-			Fill (test);
-		}
-		
-		public void GoNext ()
-		{
-			if (showLastTest)
-				return;
-
-			if (timeScale) {
-				lastDateValue += (EndX - StartX) / 3;
-				UnitTestResult lastResult = test.Results.GetLastResult (DateTime.Now);
-				if (lastResult != null && new DateTime ((long)lastDateValue) > lastResult.TestDate)
-					showLastTest = true;
-			} else {
-				lastTestNumber -= (EndX - StartX) / 3;
-				if (lastTestNumber < 0)
-					showLastTest = true;
-			}
-			Fill (test);
-		}
-		
-		public void GoPrevious ()
-		{
-			if (timeScale) {
-				lastDateValue -= (EndX - StartX) / 3;
-			} else {
-				lastTestNumber += (EndX - StartX) / 3;
-			}
-			showLastTest = false;
-			Fill (test);
-		}
-		
-		public void GoLast ()
-		{
-			showLastTest = true;
-			resetCursors = true;
-			Fill (test);
-		}
-		
-		public void Fill (UnitTest test)
-		{
-			serieFailed.Clear ();
-			serieSuccess.Clear ();
-			serieIgnored.Clear ();
-			serieTime.Clear ();
-			
-			this.test = test;
-			
-			if (showLastTest) {
-				if (timeScale)
-					lastDateValue = DateTime.Now.Ticks;
-				else
-					lastTestNumber = 0;
-			}
-			
-			UnitTestResult first = null;
-			UnitTestResult[] results;
-			UnitTestResult lastResult = test.Results.GetLastResult (DateTime.Now);
-			if (lastResult == null)
-				return;
-			
-			if (timeScale) {
-				DateTime startDate;
-				if (showLastTest) {
-					startDate = lastResult.TestDate - currentSpan;
-					StartX = startDate.Ticks;
-					EndX = lastResult.TestDate.Ticks;
-					first = test.Results.GetLastResult (startDate);
-					results = test.Results.GetResults (startDate, lastResult.TestDate);
-				} else {
-					DateTime endDate = new DateTime ((long)lastDateValue);
-					startDate = endDate - currentSpan;
-					StartX = (double)startDate.Ticks;
-					EndX = (double)endDate.Ticks;
-					first = test.Results.GetLastResult (startDate);
-					results = test.Results.GetResults (startDate, lastResult.TestDate);
-				}
-				if (singleDayResult) {
-					first = test.Results.GetPreviousResult (new DateTime (startDate.Year, startDate.Month, startDate.Day));
-					ArrayList list = new ArrayList ();
-					if (first != null)
-						list.Add (first);
-					for (int n=0; n<results.Length - 1; n++) {
-						DateTime d1 = results [n].TestDate;
-						DateTime d2 = results [n + 1].TestDate;
-						if (d1.Day != d2.Day || d1.Month != d2.Month || d1.Year != d2.Year)
-							list.Add (results [n]);
-					}
-					list.Add (results [results.Length - 1]);
-					results = (UnitTestResult[])list.ToArray (typeof(UnitTestResult));
-				}
-				
-				if (resetCursors) {
-					SelectionEnd.Value = EndX;
-					if (results.Length > 1)
-						SelectionStart.Value = results [results.Length - 2].TestDate.Ticks;
-					else
-						SelectionStart.Value = EndX;
-					resetCursors = false;
-				}
-			} else {
-				if (singleDayResult) {
-					ArrayList list = new ArrayList ();
-					list.Add (lastResult);
-					while (list.Count < testCount + (int)lastTestNumber + 1) {
-						UnitTestResult res = test.Results.GetPreviousResult (lastResult.TestDate);
-						if (res == null)
-							break;
-						if (res.TestDate.Day != lastResult.TestDate.Day || res.TestDate.Month != lastResult.TestDate.Month || res.TestDate.Year != lastResult.TestDate.Year)
-							list.Add (res);
-						lastResult = res;
-					}
-					results = (UnitTestResult[])list.ToArray (typeof(UnitTestResult));
-					Array.Reverse (results);
-				} else {
-					results = test.Results.GetResultsToDate (DateTime.Now, testCount + (int)lastTestNumber + 1);
-				}
-				EndX = lastTestNumber + testCount;
-				StartX = lastTestNumber;
-				
-				if (resetCursors) {
-					SelectionStart.Value = StartX;
-					SelectionEnd.Value = StartX + 1;
-					resetCursors = false;
-				}
-			}
-			
-			
-			currentResults = results;
-			if (testRunAxis != null)
-				testRunAxis.CurrentResults = currentResults;
-			
-			if (Type == TestChartType.Results) {
-				if (first != null) {
-					double x = timeScale ? first.TestDate.Ticks : results.Length;
-					serieFailed.AddData (x, first.ErrorsAndFailures);
-					serieSuccess.AddData (x, first.Passed);
-					serieIgnored.AddData (x, first.TestsNotRun);
-				}
-				
-				for (int n=0; n < results.Length; n++) {
-					UnitTestResult res = results [n];
-					double x = timeScale ? res.TestDate.Ticks : results.Length - n - 1;
-					serieFailed.AddData (x, res.ErrorsAndFailures);
-					serieSuccess.AddData (x, res.Passed);
-					serieIgnored.AddData (x, res.TestsNotRun);
-				}
-			} else {
-				if (first != null) {
-					double x = timeScale ? first.TestDate.Ticks : results.Length;
-					serieTime.AddData (x, first.Time.TotalMilliseconds);
-				}
-				for (int n=0; n < results.Length; n++) {
-					UnitTestResult res = results [n];
-					double x = timeScale ? res.TestDate.Ticks : results.Length - n - 1;
-					serieTime.AddData (x, results [n].Time.TotalMilliseconds);
-				}
-			}
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/Gui/TestNodeBuilder.cs b/main/src/addins/NUnit/Gui/TestNodeBuilder.cs
deleted file mode 100644
index 7166e6b610..0000000000
--- a/main/src/addins/NUnit/Gui/TestNodeBuilder.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-//
-// TestNodeBuilder.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using MonoDevelop.Core;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.NUnit.Commands;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.NUnit
-{
-	public class TestNodeBuilder: TypeNodeBuilder
-	{
-		EventHandler testChanged;
-		EventHandler testStatusChanged;
-		
-		public TestNodeBuilder ()
-		{
-			testChanged = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnTestChanged));
-			testStatusChanged = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnTestStatusChanged));
-		}
-		
-		public override Type CommandHandlerType {
-			get { return typeof(TestNodeCommandHandler); }
-		}
-		
-		public override string ContextMenuAddinPath {
-			get { return "/MonoDevelop/NUnit/ContextMenu/TestPad"; }
-		}
-			
-		public override Type NodeDataType {
-			get { return typeof(UnitTest); }
-		}
-		
-		public override string GetNodeName (ITreeNavigator thisNode, object dataObject)
-		{
-			return ((UnitTest)dataObject).Name;
-		}
-		
-/*		public override void GetNodeAttributes (ITreeNavigator parentNode, object dataObject, ref NodeAttributes attributes)
-		{
-			attributes |= NodeAttributes.UseMarkup;
-		}
-*/
-		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
-		{
-			UnitTest test = dataObject as UnitTest;
-			nodeInfo.Icon = test.StatusIcon;
-			
-			if (test.Status == TestStatus.Running) {
-				nodeInfo.Label = test.Title;
-				return;
-			} else if (test.Status == TestStatus.Loading) {
-				nodeInfo.Label = test.Title + GettextCatalog.GetString (" (Loading)");
-				return;
-			} else if (test.Status == TestStatus.LoadError) {
-				nodeInfo.Label = test.Title + GettextCatalog.GetString (" (Load failed)");
-				return;
-			} else {
-				nodeInfo.Label = test.Title;
-
-				UnitTestResult res = test.GetLastResult ();
-				if (res != null && treeBuilder.Options ["ShowTestCounters"] && (test is UnitTestGroup)) {
-					nodeInfo.Label += string.Format (GettextCatalog.GetString (" ({0} passed, {1} failed, {2} not run)"), res.Passed, res.ErrorsAndFailures, res.TestsNotRun);
-				}
-
-				if (treeBuilder.Options ["ShowTestTime"]) {
-					nodeInfo.Label += string.Format ("   Time: {0}ms", res.Time.TotalMilliseconds);
-				}
-			}
-		}
-
-		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			UnitTestGroup test = dataObject as UnitTestGroup;
-			if (test == null)
-				return;
-				
-			foreach (UnitTest t in test.Tests)
-				builder.AddChild (t);
-		}
-
-		public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
-		{
-			UnitTestGroup test = dataObject as UnitTestGroup;
-			return test != null && test.Tests.Count > 0;
-		}
-		
-		public override void OnNodeAdded (object dataObject)
-		{
-			UnitTest test = (UnitTest) dataObject;
-			test.TestChanged += testChanged;
-			test.TestStatusChanged += testStatusChanged;
-		}
-		
-		public override void OnNodeRemoved (object dataObject)
-		{
-			UnitTest test = (UnitTest) dataObject;
-			test.TestChanged -= testChanged;
-			test.TestStatusChanged -= testStatusChanged;
-		}
-		
-		public void OnTestChanged (object sender, EventArgs args)
-		{
-			ITreeBuilder tb = Context.GetTreeBuilder (sender);
-			if (tb != null) tb.UpdateAll ();
-		}
-		
-		public void OnTestStatusChanged (object sender, EventArgs args)
-		{
-			ITreeBuilder tb = Context.GetTreeBuilder (sender);
-			if (tb != null) tb.Update ();
-		}
-	}
-	
-	class TestNodeCommandHandler: NodeCommandHandler
-	{
-		[CommandHandler (TestCommands.ShowTestCode)]
-		protected void OnShowTest ()
-		{
-			UnitTest test = CurrentNode.DataItem as UnitTest;
-			SourceCodeLocation loc = null;
-//			UnitTestResult res = test.GetLastResult ();
-			loc = test.SourceCodeLocation;
-			if (loc != null)
-				IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
-		}
-		
-		[CommandHandler (TestCommands.GoToFailure)]
-		protected void OnShowFailure ()
-		{
-			UnitTest test = CurrentNode.DataItem as UnitTest;
-			SourceCodeLocation loc = null;
-			UnitTestResult res = test.GetLastResult ();
-			if (res != null && res.IsFailure)
-				loc = res.GetFailureLocation ();
-			if (loc == null)
-				loc = test.SourceCodeLocation;
-			if (loc != null)
-				IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
-		}
-		
-		[CommandUpdateHandler (TestCommands.ShowTestCode)]
-		protected void OnUpdateRunTest (CommandInfo info)
-		{
-			UnitTest test = CurrentNode.DataItem as UnitTest;
-			info.Enabled = test.SourceCodeLocation != null;
-		}
-
-		[CommandUpdateHandler (TestCommands.GoToFailure)]
-		protected void OnUpdateGoToFailure (CommandInfo info)
-		{
-			UnitTest test = CurrentNode.DataItem as UnitTest;
-			info.Enabled = IsGoToFailureEnabled (test);
-		}
-
-		bool IsGoToFailureEnabled (UnitTest test)
-		{
-			if (test.SourceCodeLocation == null || test is UnitTestGroup)
-				return false;
-
-			UnitTestResult res = test.GetLastResult ();
-			return res != null && res.IsFailure;
-		}
-		
-		[CommandUpdateHandler (ProjectCommands.Options)]
-		protected void OnUpdateShowOptions (CommandInfo info)
-		{
-			info.Visible = !(CurrentNode.DataItem is SolutionFolderTestGroup);
-		}
-		
-		[CommandHandler (ProjectCommands.Options)]
-		protected void OnShowOptions ()
-		{
-			UnitTest test = CurrentNode.DataItem as UnitTest;
-			NUnitService.ShowOptionsDialog (test);
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/Gui/TestPad.cs b/main/src/addins/NUnit/Gui/TestPad.cs
deleted file mode 100644
index 3e46d3c8bb..0000000000
--- a/main/src/addins/NUnit/Gui/TestPad.cs
+++ /dev/null
@@ -1,927 +0,0 @@
-//
-// TestPad.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using Gtk;
-using Gdk;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.NUnit.Commands;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide.Execution;
-using MonoDevelop.Components.Docking;
-using MonoDevelop.Ide;
-using MonoDevelop.Projects;
-using Mono.TextEditor;
-using System.Linq;
-using MonoDevelop.Components;
-using MonoDevelop.Ide.Commands;
-using System.Collections.Generic;
-
-namespace MonoDevelop.NUnit
-{
-	public class TestPad : TreeViewPad
-	{
-		NUnitService testService = NUnitService.Instance;
-		
-		IAsyncOperation runningTestOperation;
-		VPaned paned;
-		TreeView detailsTree;
-		ListStore detailsStore;
-		HeaderLabel detailLabel;
-		TestChart chart;
-		UnitTest detailsTest;
-		DateTime detailsDate;
-		DateTime detailsReferenceDate;
-		ButtonNotebook infoBook;
-		TextView outputView;
-		TextView resultView;
-		TreeView regressionTree;
-		ListStore regressionStore;
-		TreeView failedTree;
-		ListStore failedStore;
-		
-		int TestSummaryPage;
-		int TestRegressionsPage;
-		int TestFailuresPage;
-		int TestResultPage;
-		int TestOutputPage;
-		
-		EventHandler testChangedHandler;
-		VBox detailsPad;
-		
-		ArrayList testNavigationHistory = new ArrayList ();
-
-		Button buttonRunAll, buttonStop;
-		
-		public override void Initialize (NodeBuilder[] builders, TreePadOption[] options, string menuPath)
-		{
-			base.Initialize (builders, options, menuPath);
-			
-			testChangedHandler = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnDetailsTestChanged));
-			testService.TestSuiteChanged += (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnTestSuiteChanged));
-			paned = new VPaned ();
-			
-			VBox vbox = new VBox ();
-			DockItemToolbar topToolbar = Window.GetToolbar (PositionType.Top);
-
-			var hbox = new HBox { Spacing = 6 };
-			hbox.PackStart (new ImageView (ImageService.GetIcon ("nunit-run", IconSize.Menu)), false, false, 0);
-			hbox.PackStart (new Label (GettextCatalog.GetString ("Run All")), false, false, 0);
-			buttonRunAll = new Button (hbox);
-			buttonRunAll.Clicked += new EventHandler (OnRunAllClicked);
-			buttonRunAll.Sensitive = true;
-			buttonRunAll.TooltipText = GettextCatalog.GetString ("Run all tests");
-			topToolbar.Add (buttonRunAll);
-			
-			buttonStop = new Button (new Gtk.Image (Ide.Gui.Stock.Stop, IconSize.Menu));
-			buttonStop.Clicked += new EventHandler (OnStopClicked);
-			buttonStop.Sensitive = false;
-			buttonStop.TooltipText = GettextCatalog.GetString ("Cancel running test");
-			topToolbar.Add (buttonStop);
-			topToolbar.ShowAll ();
-			
-			vbox.PackEnd (base.Control, true, true, 0);
-			vbox.FocusChain = new Gtk.Widget [] { base.Control };
-			
-			paned.Pack1 (vbox, true, true);
-			
-			detailsPad = new VBox ();
-			
-			EventBox eb = new EventBox ();
-			HBox header = new HBox ();
-			eb.Add (header);
-
-			detailLabel = new HeaderLabel ();
-			detailLabel.Padding = 6;
-			
-			Button hb = new Button (new Gtk.Image ("gtk-close", IconSize.SmallToolbar));
-			hb.Relief = ReliefStyle.None;
-			hb.Clicked += new EventHandler (OnCloseDetails);
-			header.PackEnd (hb, false, false, 0);
-			
-			hb = new Button (new Gtk.Image ("gtk-go-back", IconSize.SmallToolbar));
-			hb.Relief = ReliefStyle.None;
-			hb.Clicked += new EventHandler (OnGoBackTest);
-			header.PackEnd (hb, false, false, 0);
-			
-			header.Add (detailLabel);
-			Gdk.Color hcol = eb.Style.Background (StateType.Normal);
-			hcol.Red = (ushort) (((double)hcol.Red) * 0.9);
-			hcol.Green = (ushort) (((double)hcol.Green) * 0.9);
-			hcol.Blue = (ushort) (((double)hcol.Blue) * 0.9);
-		//	eb.ModifyBg (StateType.Normal, hcol);
-			
-			detailsPad.PackStart (eb, false, false, 0);
-			
-			VPaned panedDetails = new VPaned ();
-			panedDetails.BorderWidth = 3;
-			VBox boxPaned1 = new VBox ();
-			
-			chart = new TestChart ();
-			chart.ButtonPressEvent += OnChartButtonPress;
-			chart.SelectionChanged += new EventHandler (OnChartDateChanged);
-			chart.HeightRequest = 50;
-			
-			Toolbar toolbar = new Toolbar ();
-			toolbar.IconSize = IconSize.SmallToolbar;
-			toolbar.ToolbarStyle = ToolbarStyle.Icons;
-			toolbar.ShowArrow = false;
-			ToolButton but = new ToolButton ("gtk-zoom-in");
-			but.Clicked += new EventHandler (OnZoomIn);
-			toolbar.Insert (but, -1);
-			
-			but = new ToolButton ("gtk-zoom-out");
-			but.Clicked += new EventHandler (OnZoomOut);
-			toolbar.Insert (but, -1);
-			
-			but = new ToolButton ("gtk-go-back");
-			but.Clicked += new EventHandler (OnChartBack);
-			toolbar.Insert (but, -1);
-			
-			but = new ToolButton ("gtk-go-forward");
-			but.Clicked += new EventHandler (OnChartForward);
-			toolbar.Insert (but, -1);
-			
-			but = new ToolButton ("gtk-goto-last");
-			but.Clicked += new EventHandler (OnChartLast);
-			toolbar.Insert (but, -1);
-			
-			boxPaned1.PackStart (toolbar, false, false, 0);
-			boxPaned1.PackStart (chart, true, true, 0);
-			
-			panedDetails.Pack1 (boxPaned1, false, false);
-			
-			// Detailed test information --------
-			
-			infoBook = new ButtonNotebook ();
-			infoBook.PageLoadRequired += new EventHandler (OnPageLoadRequired);
-			
-			// Info - Group summary
-			
-			Frame tf = new Frame ();
-			ScrolledWindow sw = new ScrolledWindow ();
-			detailsTree = new TreeView ();
-			
-			detailsTree.HeadersVisible = true;
-			detailsTree.RulesHint = true;
-			detailsStore = new ListStore (typeof(object), typeof(string), typeof (string), typeof (string), typeof (string));
-			
-			CellRendererText trtest = new CellRendererText ();
-			CellRendererText tr;
-			
-			TreeViewColumn col3 = new TreeViewColumn ();
-			col3.Expand = false;
-//			col3.Alignment = 0.5f;
-			col3.Widget = new ImageView (TestStatusIcon.Success);
-			col3.Widget.Show ();
-			tr = new CellRendererText ();
-//			tr.Xalign = 0.5f;
-			col3.PackStart (tr, false);
-			col3.AddAttribute (tr, "markup", 2);
-			detailsTree.AppendColumn (col3);
-			
-			TreeViewColumn col4 = new TreeViewColumn ();
-			col4.Expand = false;
-//			col4.Alignment = 0.5f;
-			col4.Widget = new ImageView (TestStatusIcon.Failure);
-			col4.Widget.Show ();
-			tr = new CellRendererText ();
-//			tr.Xalign = 0.5f;
-			col4.PackStart (tr, false);
-			col4.AddAttribute (tr, "markup", 3);
-			detailsTree.AppendColumn (col4);
-			
-			TreeViewColumn col5 = new TreeViewColumn ();
-			col5.Expand = false;
-//			col5.Alignment = 0.5f;
-			col5.Widget = new ImageView (TestStatusIcon.NotRun);
-			col5.Widget.Show ();
-			tr = new CellRendererText ();
-//			tr.Xalign = 0.5f;
-			col5.PackStart (tr, false);
-			col5.AddAttribute (tr, "markup", 4);
-			detailsTree.AppendColumn (col5);
-			
-			TreeViewColumn col1 = new TreeViewColumn ();
-//			col1.Resizable = true;
-//			col1.Expand = true;
-			col1.Title = "Test";
-			col1.PackStart (trtest, true);
-			col1.AddAttribute (trtest, "markup", 1);
-			detailsTree.AppendColumn (col1);
-			
-			detailsTree.Model = detailsStore;
-			
-			sw.Add (detailsTree);
-			tf.Add (sw);
-			tf.ShowAll ();
-			
-			TestSummaryPage = infoBook.AddPage (GettextCatalog.GetString ("Summary"), tf);
-			
-			// Info - Regressions list
-			
-			tf = new Frame ();
-			sw = new ScrolledWindow ();
-			tf.Add (sw);
-			regressionTree = new TreeView ();
-			regressionTree.HeadersVisible = false;
-			regressionTree.RulesHint = true;
-			regressionStore = new ListStore (typeof(object), typeof(string), typeof (Xwt.Drawing.Image));
-			
-			CellRendererText trtest2 = new CellRendererText ();
-			var pr = new CellRendererImage ();
-			
-			TreeViewColumn col = new TreeViewColumn ();
-			col.PackStart (pr, false);
-			col.AddAttribute (pr, "image", 2);
-			col.PackStart (trtest2, false);
-			col.AddAttribute (trtest2, "markup", 1);
-			regressionTree.AppendColumn (col);
-			regressionTree.Model = regressionStore;
-			sw.Add (regressionTree);
-			tf.ShowAll ();
-			
-			TestRegressionsPage = infoBook.AddPage (GettextCatalog.GetString ("Regressions"), tf);
-			
-			// Info - Failed tests list
-			
-			tf = new Frame ();
-			sw = new ScrolledWindow ();
-			tf.Add (sw);
-			failedTree = new TreeView ();
-			failedTree.HeadersVisible = false;
-			failedTree.RulesHint = true;
-			failedStore = new ListStore (typeof(object), typeof(string), typeof (Xwt.Drawing.Image));
-			
-			trtest2 = new CellRendererText ();
-			pr = new CellRendererImage ();
-			
-			col = new TreeViewColumn ();
-			col.PackStart (pr, false);
-			col.AddAttribute (pr, "image", 2);
-			col.PackStart (trtest2, false);
-			col.AddAttribute (trtest2, "markup", 1);
-			failedTree.AppendColumn (col);
-			failedTree.Model = failedStore;
-			sw.Add (failedTree);
-			tf.ShowAll ();
-			
-			TestFailuresPage = infoBook.AddPage (GettextCatalog.GetString ("Failed tests"), tf);
-			
-			// Info - results
-			
-			tf = new Frame ();
-			sw = new ScrolledWindow ();
-			tf.Add (sw);
-			resultView = new TextView ();
-			resultView.Editable = false;
-			sw.Add (resultView);
-			tf.ShowAll ();
-			TestResultPage = infoBook.AddPage (GettextCatalog.GetString ("Result"), tf);
-			
-			// Info - Output
-			
-			tf = new Frame ();
-			sw = new ScrolledWindow ();
-			tf.Add (sw);
-			outputView = new TextView ();
-			outputView.Editable = false;
-			sw.Add (outputView);
-			tf.ShowAll ();
-			TestOutputPage = infoBook.AddPage (GettextCatalog.GetString ("Output"), tf);
-			
-			panedDetails.Pack2 (infoBook, true, true);
-			detailsPad.PackStart (panedDetails, true, true, 0);
-			paned.Pack2 (detailsPad, true, true);
-			
-			paned.ShowAll ();
-			
-			infoBook.HidePage (TestResultPage);
-			infoBook.HidePage (TestOutputPage);
-			infoBook.HidePage (TestSummaryPage);
-			infoBook.HidePage (TestRegressionsPage);
-			infoBook.HidePage (TestFailuresPage);
-			
-			detailsPad.Sensitive = false;
-			detailsPad.Hide ();
-			
-			detailsTree.RowActivated += new Gtk.RowActivatedHandler (OnTestActivated);
-			regressionTree.RowActivated += new Gtk.RowActivatedHandler (OnRegressionTestActivated);
-			failedTree.RowActivated += new Gtk.RowActivatedHandler (OnFailedTestActivated);
-			
-			foreach (UnitTest t in testService.RootTests)
-				TreeView.AddChild (t);
-		}
-		
-		void OnTestSuiteChanged (object sender, EventArgs e)
-		{
-			if (testService.RootTests.Length > 0) {
-				var s = TreeView.SaveTreeState ();
-				TreeView.Clear ();
-				foreach (UnitTest t in testService.RootTests)
-					TreeView.AddChild (t);
-				TreeView.RestoreTreeState (s);
-			}
-			else {
-				TreeView.Clear ();
-				ClearDetails ();
-			}
-		}
-		
-		public void SelectTest (UnitTest t)
-		{
-			ITreeNavigator node = FindTestNode (t);
-			if (node != null) {
-				node.ExpandToNode ();
-				node.Selected = true;
-			}
-		}
-		
-		ITreeNavigator FindTestNode (UnitTest t)
-		{
-			ITreeNavigator nav = TreeView.GetNodeAtObject (t);
-			if (nav != null)
-				return nav;
-			if (t.Parent == null)
-				return null;
-				
-			nav = FindTestNode (t.Parent);
-			
-			if (nav == null)
-				return null;
-				
-			nav.MoveToFirstChild ();	// Make sure the children are created
-			return TreeView.GetNodeAtObject (t);
-		}
-		
-		public override Gtk.Widget Control {
-			get {
-				return paned;
-			}
-		}
-		
-		[CommandHandler (TestCommands.RunTest)]
-		protected void OnRunTest ()
-		{
-			RunSelectedTest (null);
-		}
-		
-		[CommandUpdateHandler (TestCommands.RunTest)]
-		protected void OnUpdateRunTest (CommandInfo info)
-		{
-			info.Enabled = runningTestOperation == null;
-		}
-		
-		[CommandHandler (TestCommands.RunTestWith)]
-		protected void OnRunTest (object data)
-		{
-			IExecutionHandler h = ExecutionModeCommandService.GetExecutionModeForCommand (data);
-			if (h != null)
-				RunSelectedTest (h);
-		}
-		
-		[CommandUpdateHandler (TestCommands.RunTestWith)]
-		protected void OnUpdateRunTest (CommandArrayInfo info)
-		{
-			UnitTest test = GetSelectedTest ();
-			if (test != null) {
-				SolutionEntityItem item = test.OwnerObject as SolutionEntityItem;
-				ExecutionModeCommandService.GenerateExecutionModeCommands (
-				    item,
-				    test.CanRun,
-				    info);
-
-				foreach (var ci in info)
-					ci.Enabled = runningTestOperation == null;
-			}
-		}
-		
-		[CommandHandler (TestCommands.DebugTest)]
-		protected void OnDebugTest (object data)
-		{
-			var debugModeSet = Runtime.ProcessService.GetDebugExecutionMode ();
-			var mode = debugModeSet.ExecutionModes.First (m => m.Id == (string)data);
-			RunSelectedTest (mode.ExecutionHandler);
-		}
-
-		[CommandUpdateHandler (TestCommands.DebugTest)]
-		protected void OnUpdateDebugTest (CommandArrayInfo info)
-		{
-			var debugModeSet = Runtime.ProcessService.GetDebugExecutionMode ();
-			if (debugModeSet == null)
-				return;
-
-			UnitTest test = GetSelectedTest ();
-			if (test == null)
-				return;
-
-			foreach (var mode in debugModeSet.ExecutionModes) {
-				if (test.CanRun (mode.ExecutionHandler)) {
-					var ci = info.Add (GettextCatalog.GetString ("Debug Test ({0})", mode.Name), mode.Id);
-					ci.Enabled = runningTestOperation == null;
-				}
-			}
-
-			if (info.Count == 1)
-				info [0].Text = GettextCatalog.GetString ("Debug Test");
-		}
-
-		public TestPad ()
-		{
-			base.TreeView.CurrentItemActivated += delegate {
-				RunSelectedTest (null);
-			};
-		}
-		
-		void OnStopClicked (object sender, EventArgs args)
-		{
-			if (runningTestOperation != null)
-				runningTestOperation.Cancel ();
-		}
-		
-		UnitTest GetSelectedTest ()
-		{
-			ITreeNavigator nav = TreeView.GetSelectedNode ();
-			if (nav == null)
-				return null;
-			return nav.DataItem as UnitTest;
-		}
-
-		public IAsyncOperation RunTest (UnitTest test, IExecutionHandler mode)
-		{
-			return RunTest (FindTestNode (test), mode, false);
-		}
-
-		IAsyncOperation RunTest (ITreeNavigator nav, IExecutionHandler mode, bool bringToFront = true)
-		{
-			if (nav == null)
-				return null;
-			UnitTest test = nav.DataItem as UnitTest;
-			if (test == null)
-				return null;
-			NUnitService.ResetResult (test.RootTest);
-			
-			this.buttonRunAll.Sensitive = false;
-			this.buttonStop.Sensitive = true;
-
-			if (bringToFront)
-				IdeApp.Workbench.GetPad<TestPad> ().BringToFront ();
-			runningTestOperation = testService.RunTest (test, mode);
-			runningTestOperation.Completed += (OperationHandler) DispatchService.GuiDispatch (new OperationHandler (OnTestSessionCompleted));
-			return runningTestOperation;
-		}
-		
-		void OnRunAllClicked (object sender, EventArgs args)
-		{
-			RunTest (TreeView.GetRootNode (), null);
-		}
-		
-		void RunSelectedTest (IExecutionHandler mode)
-		{
-			RunTest (TreeView.GetSelectedNode (), mode);
-		}
-		
-		void OnTestSessionCompleted (IAsyncOperation op)
-		{
-			if (op.Success)
-				RefreshDetails ();
-			runningTestOperation = null;
-			this.buttonRunAll.Sensitive = true;
-			this.buttonStop.Sensitive = false;
-
-		}
-
-
-		protected override void OnSelectionChanged (object sender, EventArgs args)
-		{
-			base.OnSelectionChanged (sender, args);
-			ITreeNavigator nav = TreeView.GetSelectedNode ();
-			if (nav != null) {
-				UnitTest test = nav.DataItem as UnitTest;
-				if (test != null)
-					FillDetails (test, false);
-			}
-		}
-		
-		void OnGoBackTest (object sender, EventArgs args)
-		{
-			int c = testNavigationHistory.Count;
-			if (c > 1) {
-				UnitTest t = (UnitTest) testNavigationHistory [c - 2];
-				testNavigationHistory.RemoveAt (c - 1);
-				testNavigationHistory.RemoveAt (c - 2);
-				FillDetails (t, true);
-			}
-		}
-		
-		void OnCloseDetails (object sender, EventArgs args)
-		{
-			detailsPad.Hide ();
-		}
-		
-		[CommandHandler (TestCommands.ShowTestDetails)]
-		protected void OnShowDetails ()
-		{
-			if (!detailsPad.Visible) {
-				detailsPad.Show ();
-				
-				ITreeNavigator nav = TreeView.GetSelectedNode ();
-				if (nav != null) {
-					UnitTest test = (UnitTest) nav.DataItem;
-					FillDetails (test, false);
-				} else
-					ClearDetails ();
-			}
-		}
-		
-		void ClearDetails ()
-		{
-			chart.Clear ();
-			detailLabel.Markup = "";
-			detailsStore.Clear ();
-			if (detailsTest != null)
-				detailsTest.TestChanged -= testChangedHandler;
-			detailsTest = null;
-			detailsDate = DateTime.MinValue;
-			detailsReferenceDate = DateTime.MinValue;
-			detailsPad.Sensitive = false;
-		}
-		
-		void RefreshDetails ()
-		{
-			if (detailsTest != null)
-				FillDetails (detailsTest, false);
-		}
-		
-		void FillDetails (UnitTest test, bool selectInTree)
-		{
-			if (!detailsPad.Visible)
-				return;
-
-			detailsPad.Sensitive = true;
-			
-			if (detailsTest != null)
-				detailsTest.TestChanged -= testChangedHandler;
-			
-			if (detailsTest != test) {
-				detailsTest = test;
-				if (selectInTree)
-					SelectTest (test);
-				testNavigationHistory.Add (test);
-				if (testNavigationHistory.Count > 50)
-					testNavigationHistory.RemoveAt (0);
-			}
-			detailsTest.TestChanged += testChangedHandler;
-			
-			if (test is UnitTestGroup) {
-				infoBook.HidePage (TestResultPage);
-				infoBook.HidePage (TestOutputPage);
-				infoBook.ShowPage (TestSummaryPage);
-				infoBook.ShowPage (TestRegressionsPage);
-				infoBook.ShowPage (TestFailuresPage);
-			} else {
-				infoBook.HidePage (TestSummaryPage);
-				infoBook.HidePage (TestRegressionsPage);
-				infoBook.HidePage (TestFailuresPage);
-				infoBook.ShowPage (TestResultPage);
-				infoBook.ShowPage (TestOutputPage);
-			}
-			detailLabel.Markup = "<b>" + test.Name + "</b>";
-			detailsDate = DateTime.MinValue;
-			detailsReferenceDate = DateTime.MinValue;
-			chart.Fill (test);
-			infoBook.Reset ();
-		}
-		
-		void FillTestInformation ()
-		{
-			if (!detailsPad.Visible)
-				return;
-
-			if (detailsTest is UnitTestGroup) {
-				UnitTestGroup group = detailsTest as UnitTestGroup;
-				if (infoBook.Page == TestSummaryPage) {
-					detailsStore.Clear ();
-					foreach (UnitTest t in group.Tests) {
-						UnitTestResult res = t.Results.GetLastResult (chart.CurrentDate);
-						if (res != null)
-							detailsStore.AppendValues (t, t.Name, res.Passed.ToString (), res.ErrorsAndFailures.ToString (), res.Ignored.ToString());
-						else
-							detailsStore.AppendValues (t, t.Name, "", "", "");
-					}
-				}
-				else if (infoBook.Page == TestRegressionsPage) {
-					regressionStore.Clear ();
-					UnitTestCollection regs = detailsTest.GetRegressions (chart.ReferenceDate, chart.CurrentDate);
-					if (regs.Count > 0) {
-						foreach (UnitTest t in regs)
-							regressionStore.AppendValues (t, t.Name, TestStatusIcon.Failure);
-					} else
-						regressionStore.AppendValues (null, GettextCatalog.GetString ("No regressions found."));
-				}
-				else if (infoBook.Page == TestFailuresPage) {
-					failedStore.Clear ();
-					UnitTestCollection regs = group.GetFailedTests (chart.CurrentDate);
-					if (regs.Count > 0) {
-						foreach (UnitTest t in regs)
-							failedStore.AppendValues (t, t.Name, TestStatusIcon.Failure);
-					} else
-						failedStore.AppendValues (null, GettextCatalog.GetString ("No failed tests found."));
-				}
-			} else {
-				UnitTestResult res = detailsTest.Results.GetLastResult (chart.CurrentDate);
-				if (infoBook.Page == TestOutputPage) {
-					outputView.Buffer.Clear ();
-					if (res != null)
-						outputView.Buffer.InsertAtCursor (res.ConsoleOutput);
-				} else if (infoBook.Page == TestResultPage) {
-					resultView.Buffer.Clear ();
-					if (res != null) {
-						string msg = res.Message + "\n\n" + res.StackTrace;
-						resultView.Buffer.InsertAtCursor (msg);
-					}
-				}
-			}
-		}
-		
-		void OnDetailsTestChanged (object sender, EventArgs e)
-		{
-			RefreshDetails ();
-		}
-		
-		void OnChartDateChanged (object sender, EventArgs e)
-		{
-			if (detailsTest != null && (detailsDate != chart.CurrentDate || detailsReferenceDate != chart.ReferenceDate)) {
-				detailsDate = chart.CurrentDate;
-				detailsReferenceDate = chart.ReferenceDate;
-				FillTestInformation ();
-			}
-		}
-		
-		void OnPageLoadRequired (object o, EventArgs args)
-		{
-			if (detailsTest != null)
-				FillTestInformation ();
-		}
-		
-		protected virtual void OnTestActivated (object sender, Gtk.RowActivatedArgs args)
-		{
-			TreeIter it;
-			detailsStore.GetIter (out it, args.Path);
-			UnitTest t = (UnitTest) detailsStore.GetValue (it, 0);
-			if (t != null)
-				FillDetails (t, true);
-		}
-		
-		protected virtual void OnRegressionTestActivated (object sender, Gtk.RowActivatedArgs args)
-		{
-			TreeIter it;
-			regressionStore.GetIter (out it, args.Path);
-			UnitTest t = (UnitTest) regressionStore.GetValue (it, 0);
-			if (t != null)
-				FillDetails (t, true);
-		}
-		
-		protected virtual void OnFailedTestActivated (object sender, Gtk.RowActivatedArgs args)
-		{
-			TreeIter it;
-			failedStore.GetIter (out it, args.Path);
-			UnitTest t = (UnitTest) failedStore.GetValue (it, 0);
-			if (t != null)
-				FillDetails (t, true);
-		}
-		
-		void OnZoomIn (object sender, EventArgs a)
-		{
-			if (detailsTest != null)
-				chart.ZoomIn ();
-		}
-		
-		void OnZoomOut (object sender, EventArgs a)
-		{
-			if (detailsTest != null)
-				chart.ZoomOut ();
-		}
-		
-		void OnChartBack (object sender, EventArgs a)
-		{
-			if (detailsTest != null)
-				chart.GoPrevious ();
-		}
-		
-		void OnChartForward (object sender, EventArgs a)
-		{
-			if (detailsTest != null)
-				chart.GoNext ();
-		}
-		
-		void OnChartLast (object sender, EventArgs a)
-		{
-			if (detailsTest != null)
-				chart.GoLast ();
-		}
-		
-		void OnChartButtonPress (object o, Gtk.ButtonPressEventArgs args)
-		{
-			if (args.Event.TriggersContextMenu ()) {
-				IdeApp.CommandService.ShowContextMenu (Control, args.Event, "/MonoDevelop/NUnit/ContextMenu/TestChart");
-				args.RetVal = true;
-			}
-		}
-		
-		[CommandHandler (TestChartCommands.ShowResults)]
-		protected void OnShowResults ()
-		{
-			chart.Type = TestChartType.Results;
-		}
-		
-		[CommandUpdateHandler (TestChartCommands.ShowResults)]
-		protected void OnUpdateShowResults (CommandInfo info)
-		{
-			info.Checked = chart.Type == TestChartType.Results;
-		}
-		
-		[CommandHandler (TestChartCommands.ShowTime)]
-		protected void OnShowTime ()
-		{
-			chart.Type = TestChartType.Time;
-		}
-		
-		[CommandUpdateHandler (TestChartCommands.ShowTime)]
-		protected void OnUpdateShowTime (CommandInfo info)
-		{
-			info.Checked = chart.Type == TestChartType.Time;
-		}
-		
-		[CommandHandler (TestChartCommands.UseTimeScale)]
-		protected void OnUseTimeScale ()
-		{
-			chart.UseTimeScale = !chart.UseTimeScale;
-		}
-		
-		[CommandUpdateHandler (TestChartCommands.UseTimeScale)]
-		protected void OnUpdateUseTimeScale (CommandInfo info)
-		{
-			info.Checked = chart.UseTimeScale;
-		}
-		
-		[CommandHandler (TestChartCommands.SingleDayResult)]
-		protected void OnSingleDayResult ()
-		{
-			chart.SingleDayResult = !chart.SingleDayResult;
-		}
-		
-		[CommandUpdateHandler (TestChartCommands.SingleDayResult)]
-		protected void OnUpdateSingleDayResult (CommandInfo info)
-		{
-			info.Checked = chart.SingleDayResult;
-		}
-		
-		[CommandHandler (TestChartCommands.ShowSuccessfulTests)]
-		protected void OnShowSuccessfulTests ()
-		{
-			chart.ShowSuccessfulTests = !chart.ShowSuccessfulTests;
-		}
-		
-		[CommandUpdateHandler (TestChartCommands.ShowSuccessfulTests)]
-		protected void OnUpdateShowSuccessfulTests (CommandInfo info)
-		{
-			info.Enabled = chart.Type == TestChartType.Results;
-			info.Checked = chart.ShowSuccessfulTests;
-		}
-		
-		[CommandHandler (TestChartCommands.ShowFailedTests)]
-		protected void OnShowFailedTests ()
-		{
-			chart.ShowFailedTests = !chart.ShowFailedTests;
-		}
-		
-		[CommandUpdateHandler (TestChartCommands.ShowFailedTests)]
-		protected void OnUpdateShowFailedTests (CommandInfo info)
-		{
-			info.Enabled = chart.Type == TestChartType.Results;
-			info.Checked = chart.ShowFailedTests;
-		}
-		
-		[CommandHandler (TestChartCommands.ShowIgnoredTests)]
-		protected void OnShowIgnoredTests ()
-		{
-			chart.ShowIgnoredTests = !chart.ShowIgnoredTests;
-		}
-		
-		[CommandUpdateHandler (TestChartCommands.ShowIgnoredTests)]
-		protected void OnUpdateShowIgnoredTests (CommandInfo info)
-		{
-			info.Enabled = chart.Type == TestChartType.Results;
-			info.Checked = chart.ShowIgnoredTests;
-		}
-	}
-	
-	class ButtonNotebook: Notebook
-	{
-		ArrayList loadedPages = new ArrayList ();
-		
-		public void Reset ()
-		{
-			loadedPages.Clear ();
-			OnPageLoadRequired ();
-		}
-		
-		public int AddPage (string text, Widget widget)
-		{
-			return AppendPage (widget, new Label (text));
-		}
-		
-		public void ShowPage (int n)
-		{
-			GetNthPage (n).Show ();
-		}
-		
-		public void HidePage (int n)
-		{
-			GetNthPage (n).Hide ();
-		}
-		
-		protected override void OnSwitchPage (NotebookPage page, uint n)
-		{
-			base.OnSwitchPage (page, n);
-			if (!loadedPages.Contains (Page))
-				OnPageLoadRequired ();
-		}
-		
-		void OnPageLoadRequired ()
-		{
-			loadedPages.Add (Page);
-			if (PageLoadRequired != null)
-				PageLoadRequired (this, EventArgs.Empty);
-		}
-		
-		public EventHandler PageLoadRequired;
-	}
-	
-	class HeaderLabel: Widget
-	{
-		string text;
-		Pango.Layout layout;
-		int padding;
-		
-		public HeaderLabel ()
-		{
-			WidgetFlags |= WidgetFlags.NoWindow;
-			layout = new Pango.Layout (this.PangoContext);
-		}
-		
-		public string Markup {
-			get { return text; }
-			set {
-				text = value;
-				layout.SetMarkup (text);
-				QueueDraw ();
-			}
-		}
-		
-		public int Padding {
-			get { return padding; }
-			set { padding = value; }
-		}
-		
-		protected override bool OnExposeEvent (Gdk.EventExpose args)
-		{
-			Gdk.GC gc = new Gdk.GC (GdkWindow);
-			gc.ClipRectangle = Allocation;
-			GdkWindow.DrawLayout (gc, padding, padding, layout);
-			return true;
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Gui/TestResultsPad.cs b/main/src/addins/NUnit/Gui/TestResultsPad.cs
deleted file mode 100644
index 5110f4de4d..0000000000
--- a/main/src/addins/NUnit/Gui/TestResultsPad.cs
+++ /dev/null
@@ -1,861 +0,0 @@
-//
-// TestResultsPad.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using Gtk;
-using Gdk;
-
-using MonoDevelop.Core;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.NUnit.Commands;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Docking;
-using MonoDevelop.Ide;
-using System.Text.RegularExpressions;
-using MonoDevelop.Components;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Ide.Fonts;
-using MonoDevelop.NUnit.External;
-
-namespace MonoDevelop.NUnit
-{
-	public class TestResultsPad: IPadContent, ITestProgressMonitor
-	{
-		NUnitService testService = NUnitService.Instance;
-		
-		IPadWindow window;
-		VBox panel;
-		HPaned book;
-		
-		Label infoLabel = new Label ();
-		Label infoCurrent = new Label ();
-		HBox labels;
-		
-		Label resultLabel = new Label ();
-		
-		ProgressBar progressBar = new ProgressBar ();
-		MonoDevelop.Ide.Gui.Components.PadTreeView failuresTreeView;
-		TreeStore failuresStore;
-		TextView outputView;
-		TextTag bold;
-		Dictionary<UnitTest,int> outIters = new Dictionary<UnitTest,int> ();
-		Widget outputViewScrolled;
-		VSeparator infoSep;
-		Gtk.TreeIter startMessageIter;
-		
-		Button buttonStop;
-		Button buttonRun;
-		
-		ToggleButton buttonSuccess;
-		ToggleButton buttonFailures;
-		ToggleButton buttonIgnored;
-		ToggleButton buttonInconclusive;
-		ToggleButton buttonOutput;
-		
-		bool running;
-		int testsToRun;
-		int testsRun;
-
-		UnitTestResult resultSummary;
-
-		UnitTest rootTest;
-		string configuration;
-		ArrayList results = new ArrayList ();
-		
-		Exception error;
-		string errorMessage;
-		
-		bool cancel;
-		
-		public class ResultRecord
-		{
-			public UnitTest Test;
-			public UnitTestResult Result;
-		}
-		
-		public TestResultsPad ()
-		{
-			testService.TestSuiteChanged += new EventHandler (OnTestSuiteChanged);
-			IdeApp.Workspace.WorkspaceItemClosed += OnWorkspaceItemClosed;
-			
-			panel = new VBox ();
-			
-			// Results notebook
-			
-			book = new HPaned ();
-			panel.PackStart (book, true, true, 0);
-			panel.FocusChain = new Gtk.Widget [] { book };
-			
-			// Failures tree
-			failuresTreeView = new MonoDevelop.Ide.Gui.Components.PadTreeView ();
-			failuresTreeView.HeadersVisible = false;
-			failuresStore = new TreeStore (typeof(Xwt.Drawing.Image), typeof(string), typeof(object), typeof(string), typeof(int), typeof(int));
-			var pr = new CellRendererImage ();
-			CellRendererText tr = new CellRendererText ();
-			TreeViewColumn col = new TreeViewColumn ();
-			col.PackStart (pr, false);
-			col.AddAttribute (pr, "image", 0);
-			col.PackStart (tr, false);
-			col.AddAttribute (tr, "markup", 1);
-			failuresTreeView.AppendColumn (col);
-			failuresTreeView.Model = failuresStore;
-		
-			var sw = new MonoDevelop.Components.CompactScrolledWindow ();
-			sw.ShadowType = ShadowType.None;
-			sw.Add (failuresTreeView);
-			book.Pack1 (sw, true, true);
-			
-			outputView = new MonoDevelop.Ide.Gui.Components.LogView.LogTextView ();
-			outputView.ModifyFont (FontService.MonospaceFont);
-			outputView.Editable = false;
-			bold = new TextTag ("bold");
-			bold.Weight = Pango.Weight.Bold;
-			outputView.Buffer.TagTable.Add (bold);
-			sw = new MonoDevelop.Components.CompactScrolledWindow ();
-			sw.ShadowType = ShadowType.None;
-			sw.Add (outputView);
-			book.Pack2 (sw, true, true);
-			outputViewScrolled = sw;
-			
-			failuresTreeView.RowActivated += OnRowActivated;
-			failuresTreeView.Selection.Changed += OnRowSelected;
-			failuresTreeView.DoPopupMenu = delegate (EventButton evt) {
-				IdeApp.CommandService.ShowContextMenu (failuresTreeView, evt,
-					"/MonoDevelop/NUnit/ContextMenu/TestResultsPad");
-			};
-			
-			Control.ShowAll ();
-			
-			outputViewScrolled.Hide ();
-		}
-		
-		void IPadContent.Initialize (IPadWindow window)
-		{
-			this.window = window;
-			
-			DockItemToolbar toolbar = window.GetToolbar (PositionType.Top);
-			
-			buttonSuccess = new ToggleButton ();
-			buttonSuccess.Label = GettextCatalog.GetString ("Successful Tests");
-			buttonSuccess.Active = false;
-			buttonSuccess.Image = new ImageView (TestStatusIcon.Success);
-			buttonSuccess.Image.Show ();
-			buttonSuccess.Toggled += new EventHandler (OnShowSuccessfulToggled);
-			buttonSuccess.TooltipText = GettextCatalog.GetString ("Show Successful Tests");
-			toolbar.Add (buttonSuccess);
-
-			buttonInconclusive = new ToggleButton ();
-			buttonInconclusive.Label = GettextCatalog.GetString ("Inconclusive Tests");
-			buttonInconclusive.Active = true;
-			buttonInconclusive.Image = new ImageView (TestStatusIcon.Inconclusive);
-			buttonInconclusive.Image.Show ();
-			buttonInconclusive.Toggled += new EventHandler (OnShowInconclusiveToggled);
-			buttonInconclusive.TooltipText = GettextCatalog.GetString ("Show Inconclusive Tests");
-			toolbar.Add (buttonInconclusive);
-			
-			buttonFailures = new ToggleButton ();
-			buttonFailures.Label = GettextCatalog.GetString ("Failed Tests");
-			buttonFailures.Active = true;
-			buttonFailures.Image = new ImageView (TestStatusIcon.Failure);
-			buttonFailures.Image.Show ();
-			buttonFailures.Toggled += new EventHandler (OnShowFailuresToggled);
-			buttonFailures.TooltipText = GettextCatalog.GetString ("Show Failed Tests");
-			toolbar.Add (buttonFailures);
-
-			buttonIgnored = new ToggleButton ();
-			buttonIgnored.Label = GettextCatalog.GetString ("Ignored Tests");
-			buttonIgnored.Active = true;
-			buttonIgnored.Image = new ImageView (TestStatusIcon.NotRun);
-			buttonIgnored.Image.Show ();
-			buttonIgnored.Toggled += new EventHandler (OnShowIgnoredToggled);
-			buttonIgnored.TooltipText = GettextCatalog.GetString ("Show Ignored Tests");
-			toolbar.Add (buttonIgnored);
-			
-			buttonOutput = new ToggleButton ();
-			buttonOutput.Label = GettextCatalog.GetString ("Output");
-			buttonOutput.Active = false;
-			buttonOutput.Image = ImageService.GetImage (MonoDevelop.Ide.Gui.Stock.OutputIcon, IconSize.Menu);
-			buttonOutput.Image.Show ();
-			buttonOutput.Toggled += new EventHandler (OnShowOutputToggled);
-			buttonOutput.TooltipText = GettextCatalog.GetString ("Show Output");
-			toolbar.Add (buttonOutput);
-			
-			toolbar.Add (new SeparatorToolItem ());
-			
-			buttonRun = new Button ();
-			buttonRun.Label = GettextCatalog.GetString ("Rerun Tests");
-			buttonRun.Image = new ImageView (ImageService.GetIcon ("nunit-run", IconSize.Menu));
-			buttonRun.Image.Show ();
-			buttonRun.Sensitive = false;
-			toolbar.Add (buttonRun);
-			
-			buttonStop = new Button (new Gtk.Image (Ide.Gui.Stock.Stop, Gtk.IconSize.Menu));
-			toolbar.Add (buttonStop);
-			toolbar.ShowAll ();
-			
-			buttonStop.Clicked += new EventHandler (OnStopClicked);
-			buttonRun.Clicked += new EventHandler (OnRunClicked);
-			
-			// Run panel
-			
-			DockItemToolbar runPanel = window.GetToolbar (PositionType.Bottom);
-			
-			infoSep = new VSeparator ();
-			
-			resultLabel.UseMarkup = true;
-			infoCurrent.Ellipsize = Pango.EllipsizeMode.Start;
-			infoCurrent.WidthRequest = 0;
-			runPanel.Add (resultLabel);
-			runPanel.Add (progressBar);
-			runPanel.Add (infoCurrent, true, 10);	
-			
-			labels = new HBox (false, 10);
-			
-			infoLabel.UseMarkup = true;
-
-			labels.PackStart (infoLabel, true, false, 0);
-
-			runPanel.Add (new Gtk.Label (), true);
-			runPanel.Add (labels);
-			runPanel.Add (infoSep, false, 10);
-			
-			progressBar.HeightRequest = infoLabel.SizeRequest ().Height;
-			runPanel.ShowAll ();
-			progressBar.Hide ();
-			infoSep.Hide ();
-			resultSummary = new UnitTestResult ();
-			UpdateCounters ();
-		}
-		
-		public void Dispose ()
-		{
-		}
-		
-		public void OnTestSuiteChanged (object sender, EventArgs e)
-		{
-			if (rootTest != null) {
-				rootTest = testService.SearchTest (rootTest.FullName);
-				if (rootTest == null)
-					buttonRun.Sensitive = false;
-			}
-		}
-
-		void OnWorkspaceItemClosed (object sender, EventArgs e)
-		{
-			ClearResults ();
-		}
-
-		void ClearResults ()
-		{
-			if (failuresTreeView.IsRealized)
-				failuresTreeView.ScrollToPoint (0, 0);
-
-			results.Clear ();
-
-			error = null;
-			errorMessage = null;
-
-			failuresStore.Clear ();
-			outputView.Buffer.Clear ();
-			outIters.Clear ();
-			progressBar.Fraction = 0;
-			progressBar.Text = "";
-			testsRun = 0;
-			resultSummary = new UnitTestResult ();
-			resultLabel.Markup = "";
-			resultLabel.Hide ();
-			labels.Show ();
-			UpdateCounters ();
-		}
-		
-		bool Running {
-			get { return running; }
-			set {
-				running = value;
-				window.IsWorking = value;
-			}
-		}
-		
-		public Gtk.Widget Control {
-			get {
-				return panel;
-			}
-		}
-		
-		public void RedrawContent ()
-		{
-		}
-		
-		string GetResultsMarkup ()
-		{
-			return string.Format (GettextCatalog.GetString ("<b>Passed</b>: {0}   <b>Failed</b>: {1}   <b>Errors</b>: {2}   <b>Inconclusive</b>: {3}   <b>Invalid</b>: {4}   <b>Ignored</b>: {5}   <b>Skipped</b>: {6}   <b>Time</b>: {7}"), 
-					                        resultSummary.Passed, resultSummary.Failures, resultSummary.Errors, resultSummary.Inconclusive, resultSummary.NotRunnable, resultSummary.Ignored, resultSummary.Skipped, resultSummary.Time);
-		}
-		void UpdateCounters ()
-		{
-			infoLabel.Markup = GetResultsMarkup ();
-		}
-		
-		public void InitializeTestRun (UnitTest test)
-		{
-			rootTest = test;
-			results.Clear ();
-
-			testsToRun = test.CountTestCases ();
-			error = null;
-			errorMessage = null;
-			
-			progressBar.Fraction = 0;
-			progressBar.Text = "";
-			progressBar.Text = "0 / " + testsToRun;
-			testsRun = 0;
-			resultSummary = new UnitTestResult ();
-			UpdateCounters ();
-			
-			infoSep.Show ();
-			infoCurrent.Show ();
-			progressBar.Show ();
-			resultLabel.Hide ();
-			labels.Show ();
-			buttonStop.Sensitive = true;
-			buttonRun.Sensitive = false;
-
-			if (failuresTreeView.IsRealized)
-				failuresTreeView.ScrollToPoint (0, 0);
-			
-			failuresStore.Clear ();
-			outputView.Buffer.Clear ();
-			outIters.Clear ();
-			cancel = false;
-			Running = true;
-			
-			configuration = IdeApp.Workspace.ActiveConfigurationId;
-			
-			AddStartMessage ();
-		}
-		
-		public void AddStartMessage (bool isRunning = true)
-		{
-			if (rootTest != null) {
-				var infoIcon = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Information, Gtk.IconSize.Menu);
-				string msg = string.Format (isRunning ? GettextCatalog.GetString ("Running tests for <b>{0}</b> configuration <b>{1}</b>") : GettextCatalog.GetString ("Test results for <b>{0}</b> configuration <b>{1}</b>"), rootTest.Name, configuration);
-				startMessageIter = failuresStore.AppendValues (infoIcon, msg, rootTest, null, 0);
-			} else {
-				startMessageIter = Gtk.TreeIter.Zero;
-			}
-		}
-
-		public void ReportRuntimeError (string message, Exception exception)
-		{
-			error = exception;
-			errorMessage = message;
-			AddErrorMessage ();
-		}
-		const int ErrorMessage = 1;
-		const int StackTrace = 2;
-
-		public void AddErrorMessage ()
-		{
-			string msg;
-			if (error is RemoteUnhandledException)
-				msg = Escape (errorMessage);
-			else {
-				msg = GettextCatalog.GetString ("Internal error");
-				if (errorMessage != null)
-					msg += ": " + Escape (errorMessage);
-			}
-
-			var stock = ImageService.GetIcon (Ide.Gui.Stock.Error, Gtk.IconSize.Menu);
-			TreeIter testRow = failuresStore.AppendValues (stock, msg, null, null, 0);
-			string name = error is RemoteUnhandledException ? ((RemoteUnhandledException)error).RemoteExceptionName : error.GetType ().Name;
-			failuresStore.AppendValues (testRow, null, Escape (name + ": " + error.Message), null);
-			TreeIter row = failuresStore.AppendValues (testRow, null, GettextCatalog.GetString ("Stack Trace"), null, null, 0);
-			AddStackTrace (row, error.StackTrace, null);
-		}
-		
-		readonly static Regex stackTraceLineRegex = new Regex (@".*\s(?<file>.*)\:\D*\s?(?<line>\d+)", RegexOptions.Compiled);
-		
-		public static bool TryParseLocationFromStackTrace (string stackTraceLine, out string fileName, out int lineNumber)
-		{
-			var match = stackTraceLineRegex.Match (stackTraceLine);
-
-			if (!match.Success) {
-				fileName = null;
-				lineNumber = -1;
-				return false;
-			}
-			try {
-				fileName = match.Groups ["file"].Value;
-				lineNumber = int.Parse (match.Groups ["line"].Value);
-			} catch (Exception) {
-				fileName = null;
-				lineNumber = -1;
-				return false;
-			}
-			return true;
-		}
-
-		void AddStackTrace (TreeIter row, string stackTrace, UnitTest test)
-		{
-			string[] stackLines = stackTrace.Replace ("\r", "").Split ('\n');
-			foreach (string line in stackLines) {
-				string fileName;
-				int lineNumber;
-				TryParseLocationFromStackTrace (line, out fileName, out lineNumber);
-				failuresStore.AppendValues (row, null, Escape (line), test, fileName, lineNumber, StackTrace);
-			}
-		}
-		
-		public void FinishTestRun ()
-		{
-			if (!Gtk.TreeIter.Zero.Equals (startMessageIter)) {
-				string msg = string.Format (GettextCatalog.GetString ("Test results for <b>{0}</b> configuration <b>{1}</b>"), rootTest != null ? rootTest.Name : "null", configuration);
-				failuresStore.SetValue (startMessageIter, 1, msg);
-				startMessageIter = Gtk.TreeIter.Zero;
-			}
-			infoCurrent.Text = "";
-			progressBar.Fraction = 1;
-			progressBar.Text = "";
-			
-			infoSep.Hide ();
-			infoCurrent.Hide ();
-			progressBar.Hide ();
-			resultLabel.Show ();
-			labels.Hide ();
-			buttonStop.Sensitive = false;
-			buttonRun.Sensitive = true;
-			
-			resultLabel.Markup = GetResultsMarkup ();
-
-			Running = false;
-		}
-		
-		void OnStopClicked (object sender, EventArgs args)
-		{
-			if (running)
-				Cancel ();
-		}
-		
-		void OnRunClicked (object sender, EventArgs args)
-		{
-			if (rootTest == null)
-				return;
-			NUnitService.Instance.RunTest (rootTest, null);
-		}
-
-		void OnRowActivated (object s, EventArgs a)
-		{
-			Gtk.TreeIter iter;
-			if (failuresTreeView.Selection.GetSelected (out iter)) {
-				string file = (string)failuresStore.GetValue (iter, 3);
-				int line = (int)failuresStore.GetValue (iter, 4);
-				try {
-					if (file != null && File.Exists (file)) {
-						IdeApp.Workbench.OpenDocument (file, line, -1);
-						return;
-					}
-				} catch (Exception) {
-				}
-			}
-			OnShowTest ();
-		}
-		
-		void OnRowSelected (object s, EventArgs a)
-		{
-			UnitTest test = GetSelectedTest ();
-			if (test != null) {
-				int offset;
-				if (outIters.TryGetValue (test, out offset)) {
-					TextIter it = outputView.Buffer.GetIterAtOffset (offset);
-					outputView.Buffer.MoveMark (outputView.Buffer.InsertMark, it);
-					outputView.Buffer.MoveMark (outputView.Buffer.SelectionBound, it);
-					outputView.ScrollToMark (outputView.Buffer.InsertMark, 0.0, true, 0.0, 0.0);
-				}
-			}
-		}
-
-		[CommandHandler (EditCommands.Copy)]
-		protected void OnCopy ()
-		{
-			UnitTest test = GetSelectedTest ();
-			if (test != null) {
-				var last = test.GetLastResult ();
-				if (last == null)
-					return;
-
-				Gtk.TreeModel foo;
-				Gtk.TreeIter iter;
-				if (!failuresTreeView.Selection.GetSelected (out foo, out iter))
-					return;
-				
-				int type = (int)failuresStore.GetValue (iter, 5);
-
-				var clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
-				switch (type) {
-				case ErrorMessage:
-					clipboard.Text = last.Message;
-					break;
-				case StackTrace:
-					clipboard.Text = last.StackTrace;
-					break;
-				default:
-					clipboard.Text = last.Message + Environment.NewLine + "Stack trace:" + Environment.NewLine + last.StackTrace;
-					break;
-				}
-			}
-		}
-
-		[CommandUpdateHandler (EditCommands.Copy)]
-		protected void OnUpdateCopy (CommandInfo info)
-		{
-			UnitTest test = GetSelectedTest ();
-			if (test != null) {
-				var last = test.GetLastResult ();
-
-				Gtk.TreeModel foo;
-				Gtk.TreeIter iter;
-				if (!failuresTreeView.Selection.GetSelected (out foo, out iter)) {
-					info.Enabled = false;
-					return;
-				}
-
-				int type = (int)failuresStore.GetValue (iter, 5);
-				switch (type) {
-				case ErrorMessage:
-					info.Enabled = !string.IsNullOrEmpty (last.Message);
-					return;
-				case StackTrace:
-				default:
-					info.Enabled = !string.IsNullOrEmpty (last.StackTrace);
-					return;
-				}
-			}
-			info.Enabled = false;
-		}
-
-		[CommandHandler (TestCommands.SelectTestInTree)]
-		protected void OnSelectTestInTree ()
-		{
-			Pad pad = IdeApp.Workbench.GetPad<TestPad> ();
-			pad.BringToFront ();
-			TestPad content = (TestPad)pad.Content;
-			content.SelectTest (GetSelectedTest ());
-		}
-		
-		[CommandUpdateHandler (TestCommands.SelectTestInTree)]
-		protected void OnUpdateSelectTestInTree (CommandInfo info)
-		{
-			UnitTest test = GetSelectedTest ();
-			info.Enabled = test != null;
-		}
-		
-		[CommandHandler (TestCommands.GoToFailure)]
-		protected void OnShowTest ()
-		{
-			UnitTest test = GetSelectedTest ();
-			if (test == null)
-				return;
-			SourceCodeLocation loc = null;
-			UnitTestResult res = test.GetLastResult ();
-			if (res != null && res.IsFailure)
-				loc = res.GetFailureLocation ();
-			if (loc == null)
-				loc = test.SourceCodeLocation;
-			if (loc != null)
-				IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
-		}
-		
-		[CommandHandler (TestCommands.ShowTestCode)]
-		protected void OnShowTestCode ()
-		{
-			UnitTest test = GetSelectedTest ();
-			if (test == null)
-				return;
-			SourceCodeLocation loc = test.SourceCodeLocation;
-			if (loc != null)
-				IdeApp.Workbench.OpenDocument (loc.FileName, loc.Line, loc.Column);
-		}
-
-		[CommandHandler (TestCommands.RerunTest)]
-		protected void OnRerunTest ()
-		{
-			UnitTest test = GetSelectedTest ();
-			if (test == null)
-				return;
-			NUnitService.Instance.RunTest (test, null);
-		}
-		
-		[CommandUpdateHandler (TestCommands.ShowTestCode)]
-		[CommandUpdateHandler (TestCommands.GoToFailure)]
-		[CommandUpdateHandler (TestCommands.RerunTest)]
-		protected void OnUpdateRunTest (CommandInfo info)
-		{
-			UnitTest test = GetSelectedTest ();
-			info.Enabled = test != null && test.SourceCodeLocation != null;
-		}
-		
-		UnitTest GetSelectedTest ()
-		{
-			Gtk.TreeModel foo;
-			Gtk.TreeIter iter;
-			if (!failuresTreeView.Selection.GetSelected (out foo, out iter))
-				return null;
-
-			UnitTest t = (UnitTest)failuresStore.GetValue (iter, 2);
-			return t;
-		}
-		
-		void OnShowSuccessfulToggled (object sender, EventArgs args)
-		{
-			RefreshList ();
-		}
-		
-		void OnShowFailuresToggled (object sender, EventArgs args)
-		{
-			RefreshList ();
-		}
-		
-		void OnShowInconclusiveToggled (object sender, EventArgs args)
-		{
-			RefreshList ();
-		}
-		
-		void OnShowIgnoredToggled (object sender, EventArgs args)
-		{
-			RefreshList ();
-		}
-		
-		void OnShowOutputToggled (object sender, EventArgs args)
-		{
-			outputViewScrolled.Visible = buttonOutput.Active;
-		}
-		
-		void RefreshList ()
-		{
-			if (failuresTreeView.IsRealized)
-				failuresTreeView.ScrollToPoint (0, 0);
-
-			failuresStore.Clear ();
-			outputView.Buffer.Clear ();
-			outIters.Clear ();
-			AddStartMessage (running);
-				
-			foreach (ResultRecord res in results) {
-				ShowTestResult (res.Test, res.Result);
-			}
-			
-			if (error != null)
-				AddErrorMessage ();
-		}
-		
-		void ShowTestResult (UnitTest test, UnitTestResult result)
-		{
-			if (result.IsSuccess) {
-				if (!buttonSuccess.Active)
-					return;
-				TreeIter testRow = failuresStore.AppendValues (TestStatusIcon.Success, Escape (test.FullName), test);
-				failuresTreeView.ScrollToCell (failuresStore.GetPath (testRow), null, false, 0, 0);
-			}
-			if (result.IsFailure) {
-				if (!buttonFailures.Active)
-					return;
-				string file = test.SourceCodeLocation != null ? test.SourceCodeLocation.FileName + ":" + test.SourceCodeLocation.Line : null;
-				TreeIter testRow = failuresStore.AppendValues (TestStatusIcon.Failure, Escape (test.FullName), test, file);
-				bool hasMessage = !string.IsNullOrEmpty (result.Message);
-
-				if (hasMessage)
-					failuresStore.AppendValues (testRow, null, "<span font='" + FontService.MonospaceFontName + "'>"+Escape (result.Message) + "</span>", test, null, 0, ErrorMessage);
-				if (!string.IsNullOrEmpty (result.StackTrace)) {
-					TreeIter row = testRow;
-					if (hasMessage)
-						row = failuresStore.AppendValues (testRow, null, GettextCatalog.GetString ("Stack Trace"), test, null, 0, StackTrace);
-					AddStackTrace (row, result.StackTrace, test);
-				}
-				failuresTreeView.ScrollToCell (failuresStore.GetPath (testRow), null, false, 0, 0);
-			}
-			if (result.IsNotRun) {
-				if (!buttonIgnored.Active)
-					return;
-				TreeIter testRow = failuresStore.AppendValues (TestStatusIcon.NotRun, Escape (test.FullName), test);
-				if (result.Message != null)
-					failuresStore.AppendValues (testRow, null, Escape (result.Message), test);
-				failuresTreeView.ScrollToCell (failuresStore.GetPath (testRow), null, false, 0, 0);
-			}
-			if (result.IsInconclusive) {
-				if (!buttonInconclusive.Active)
-					return;
-				TreeIter testRow = failuresStore.AppendValues (TestStatusIcon.Inconclusive, Escape (test.FullName), test);
-				if (result.Message != null)
-					failuresStore.AppendValues (testRow, null, Escape (result.Message), test);
-				failuresTreeView.ScrollToCell (failuresStore.GetPath (testRow), null, false, 0, 0);
-			}
-			
-			string msg = GettextCatalog.GetString ("Running {0} ...", test.FullName);
-			TextIter it = outputView.Buffer.EndIter;
-			outIters [test] = it.Offset;
-			outputView.Buffer.InsertWithTags (ref it, msg, bold);
-			outputView.Buffer.Insert (ref it, "\n");
-			if (result.ConsoleOutput != null)
-				outputView.Buffer.Insert (ref it, result.ConsoleOutput);
-			if (result.ConsoleError != null)
-				outputView.Buffer.Insert (ref it, result.ConsoleError);
-			outputView.ScrollMarkOnscreen (outputView.Buffer.InsertMark);
-		}
-
-		void ITestProgressMonitor.WriteGlobalLog (string message)
-		{
-			TextIter it = outputView.Buffer.EndIter;
-			outputView.Buffer.Insert (ref it, message);
-			outputView.ScrollMarkOnscreen (outputView.Buffer.InsertMark);
-		}
-
-		string Escape (string s)
-		{
-			return GLib.Markup.EscapeText (s);
-		}
-		
-		void ITestProgressMonitor.EndTest (UnitTest test, UnitTestResult result)
-		{
-			if (test is UnitTestGroup)
-				return;
-			
-			testsRun++;
-			ResultRecord rec = new ResultRecord ();
-			rec.Test = test;
-			rec.Result = result;
-			
-			resultSummary.Add (result);
-			results.Add (rec);
-			
-			ShowTestResult (test, result);
-			
-			UpdateCounters ();
-
-			double frac;
-			if (testsToRun != 0)
-				frac = ((double)testsRun / (double)testsToRun);
-			else
-				frac = 1;
-
-			frac = Math.Min (1, Math.Max (0, frac));
-
-			progressBar.Fraction = frac;
-			progressBar.Text = testsRun + " / " + testsToRun;
-		}
-		
-		void ITestProgressMonitor.BeginTest (UnitTest test)
-		{
-			infoCurrent.Text = GettextCatalog.GetString ("Running ") + test.FullName;
-			infoCurrent.Xalign = 0;
-		}
-		
-		public void Cancel ()
-		{
-			if (cancel)
-				return;
-			cancel = true;
-			Gtk.Application.Invoke (delegate {
-				failuresStore.AppendValues (TestStatusIcon.Failure, GettextCatalog.GetString ("Test execution cancelled."), null);
-			});
-			if (CancelRequested != null)
-				CancelRequested ();
-		}
-		
-		bool ITestProgressMonitor.IsCancelRequested {
-			get { return cancel; }
-		}
-		
-		public event TestHandler CancelRequested;
-	}
-	
-	class TestMonitor: ITestProgressMonitor
-	{
-		ITestProgressMonitor monitor;
-		TestResultsPad pad;
-		
-		public TestMonitor (TestResultsPad pad)
-		{
-			this.pad = pad;
-			this.monitor = pad;
-		}
-		public void InitializeTestRun (UnitTest test)
-		{
-			DispatchService.GuiDispatch (delegate {
-				pad.InitializeTestRun (test);
-			});
-		}
-		public void FinishTestRun ()
-		{
-			DispatchService.GuiDispatch (delegate {
-				pad.FinishTestRun ();
-			});
-		}
-		public void Cancel ()
-		{
-			DispatchService.GuiDispatch (delegate {
-				pad.Cancel ();
-			});
-		}
-		public void BeginTest (UnitTest test)
-		{
-			DispatchService.GuiDispatch (delegate {
-				monitor.BeginTest (test);
-			});
-		}
-		public void EndTest (UnitTest test, UnitTestResult result)
-		{
-			DispatchService.GuiDispatch (delegate {
-				monitor.EndTest (test, result);
-			});
-		}
-		public void ReportRuntimeError (string message, Exception exception)
-		{
-			DispatchService.GuiDispatch (delegate {
-				monitor.ReportRuntimeError (message, exception);
-			});
-		}
-		public void WriteGlobalLog (string message)
-		{
-			DispatchService.GuiDispatch (delegate {
-				monitor.WriteGlobalLog (message);
-			});
-		}
-		public bool IsCancelRequested {
-			get { return monitor.IsCancelRequested; }
-		}
-		public event TestHandler CancelRequested {
-			add { monitor.CancelRequested += value; }
-			remove { monitor.CancelRequested -= value; }
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Gui/TestStatusIcon.cs b/main/src/addins/NUnit/Gui/TestStatusIcon.cs
deleted file mode 100644
index 4dbb85f498..0000000000
--- a/main/src/addins/NUnit/Gui/TestStatusIcon.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// CircleImage.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gdk;
-using MonoDevelop.Core;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.NUnit
-{
-	static class TestStatusIcon
-	{
-		public static readonly Xwt.Drawing.Image Running;
-		public static readonly Xwt.Drawing.Image None;
-		public static readonly Xwt.Drawing.Image NotRun;
-		public static readonly Xwt.Drawing.Image Loading;
-
-		public static readonly Xwt.Drawing.Image Failure;
-		public static readonly Xwt.Drawing.Image Success;
-		public static readonly Xwt.Drawing.Image SuccessAndFailure;
-		public static readonly Xwt.Drawing.Image Inconclusive;
-		
-		public static readonly Xwt.Drawing.Image OldFailure;
-		public static readonly Xwt.Drawing.Image OldSuccess;
-		public static readonly Xwt.Drawing.Image OldSuccessAndFailure;
-		public static readonly Xwt.Drawing.Image OldInconclusive;
-
-		static TestStatusIcon ()
-		{
-			try {
-				Running = Xwt.Drawing.Image.FromResource ("unit-running-16.png");
-				Failure = Xwt.Drawing.Image.FromResource ("unit-failed-16.png");
-				None = Xwt.Drawing.Image.FromResource ("unit-not-yet-run-16.png");
-				NotRun = Xwt.Drawing.Image.FromResource ("unit-skipped-16.png");
-				Success = Xwt.Drawing.Image.FromResource ("unit-success-16.png");
-				SuccessAndFailure = Xwt.Drawing.Image.FromResource ("unit-mixed-results-16.png");
-				Loading = Xwt.Drawing.Image.FromResource ("unit-loading-16.png");
-				Inconclusive = Xwt.Drawing.Image.FromResource ("unit-inconclusive-16.png");
-				OldFailure = Failure.WithAlpha (0.4);
-				OldSuccess = Success.WithAlpha (0.4);
-				OldSuccessAndFailure = SuccessAndFailure.WithAlpha (0.4);
-				OldInconclusive = Inconclusive.WithAlpha (0.4);
-			} catch (Exception e) {
-				LoggingService.LogError ("Error while loading icons.", e);
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Gui/UnitTestOptionsDialog.cs b/main/src/addins/NUnit/Gui/UnitTestOptionsDialog.cs
deleted file mode 100644
index 8ab7f6c393..0000000000
--- a/main/src/addins/NUnit/Gui/UnitTestOptionsDialog.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// UnitTestOptionsDialog.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-using Mono.Addins;
-using MonoDevelop.Core;
-using Gtk;
-using MonoDevelop.Ide.Gui.Dialogs;
-using MonoDevelop.Ide.Extensions;
-
-namespace MonoDevelop.NUnit {
-
-	public class UnitTestOptionsDialog : OptionsDialog
-	{
-		ExtensionNode configurationNode;
-		UnitTest test;
-		
-		public UnitTestOptionsDialog (Gtk.Window parent, Properties properties) : base (parent, properties, "/MonoDevelop/NUnit/UnitTestOptions/GeneralOptions", false)
-		{
-			this.Title = GettextCatalog.GetString ("Unit Test Options");
-		
-			test = properties.Get<UnitTest>("UnitTest");
-			configurationNode = AddinManager.GetExtensionNode("/MonoDevelop/NUnit/UnitTestOptions/ConfigurationOptions");
-			
-			TreeIter iter;
-			if (store.GetIterFirst (out iter)) {
-				OptionsDialogSection section = store.GetValue (iter, 0) as OptionsDialogSection;
-				
-				if (section != null && section.Id == "Configurations") {
-					FillConfigurations (iter);
-				}
-			}
-			ExpandCategories ();
-			if (firstSection != null)
-				ShowPage (firstSection);
-		}
-		protected override void OnResponse (Gtk.ResponseType response_id)
-		{
-			base.OnResponse (response_id);
-			Destroy ();
-		}
-
-		OptionsDialogSection firstSection = null;
-		void FillConfigurations (Gtk.TreeIter configIter)
-		{
-			foreach (string name in test.GetConfigurations ()) {
-				Properties configNodeProperties = new Properties();
-				configNodeProperties.Set ("UnitTest", test);
-				configNodeProperties.Set ("Config", name);
-				foreach (OptionsDialogSection section in configurationNode.ChildNodes) {
-					OptionsDialogSection s = (OptionsDialogSection)section.Clone ();
-					if (firstSection == null)
-						firstSection = s;
-					s.Label = StringParserService.Parse (section.Label, new string[,] { { "Configuration", name } });
-					AddSection (configIter, s, configNodeProperties);
-				}
-			}
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16.png
deleted file mode 100644
index 1c0ac5a7c5..0000000000
--- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16@2x.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16@2x.png
deleted file mode 100644
index 973f82c591..0000000000
--- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16.png
deleted file mode 100644
index 4be65aa981..0000000000
--- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16@2x.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16@2x.png
deleted file mode 100644
index a4aa276ed3..0000000000
--- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32.png
deleted file mode 100644
index daa6d0d2a5..0000000000
--- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32@2x.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32@2x.png
deleted file mode 100644
index 664f413a7a..0000000000
--- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16.png
deleted file mode 100644
index ab1367642d..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-failed-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png
deleted file mode 100644
index fc9fa4445b..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16.png b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16.png
deleted file mode 100644
index 0b58080a9b..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16@2x.png
deleted file mode 100644
index 970c207555..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-loading-16.png b/main/src/addins/NUnit/Gui/icons/unit-loading-16.png
deleted file mode 100644
index 7863245aba..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-loading-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-loading-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-loading-16@2x.png
deleted file mode 100644
index 5c7b89a6b2..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-loading-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png
deleted file mode 100644
index ef419bb561..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png
deleted file mode 100644
index 03afb04a77..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16.png b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16.png
deleted file mode 100644
index 6c3109b84c..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16@2x.png
deleted file mode 100644
index e9c6f0085d..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-run-16.png b/main/src/addins/NUnit/Gui/icons/unit-run-16.png
deleted file mode 100644
index 6f911a1600..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-run-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-run-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-run-16@2x.png
deleted file mode 100644
index 59ea4fa20a..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-run-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-running-16.png b/main/src/addins/NUnit/Gui/icons/unit-running-16.png
deleted file mode 100644
index 587de48d85..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-running-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-running-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-running-16@2x.png
deleted file mode 100644
index e61f579a0c..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-running-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png b/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png
deleted file mode 100644
index 7b245ca9ee..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png
deleted file mode 100644
index 12500e3c5c..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16.png b/main/src/addins/NUnit/Gui/icons/unit-success-16.png
deleted file mode 100644
index b167c97951..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-success-16.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png
deleted file mode 100644
index 7abbc8ec46..0000000000
--- a/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/Makefile.am b/main/src/addins/NUnit/Makefile.am
deleted file mode 100644
index 3ae131ae68..0000000000
--- a/main/src/addins/NUnit/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = NUnitRunner .
-
-include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj
deleted file mode 100644
index 40f784226e..0000000000
--- a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>MonoDevelop.NUnit</AssemblyName>
-    <RootNamespace>MonoDevelop.NUnit</RootNamespace>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\build\AddIns\NUnit\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>3</WarningLevel>
-    <Execution>
-      <Execution clr-version="Net_2_0" />
-    </Execution>
-    <DefineConstants>DEBUG</DefineConstants>
-    <NoWarn>1591;1573</NoWarn>
-    <DocumentationFile>..\..\..\build\AddIns\NUnit\MonoDevelop.NUnit.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\..\build\AddIns\NUnit\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>3</WarningLevel>
-    <Execution>
-      <Execution clr-version="Net_2_0" />
-    </Execution>
-    <DebugSymbols>true</DebugSymbols>
-    <NoWarn>1591;1573</NoWarn>
-    <DocumentationFile>..\..\..\build\AddIns\NUnit\MonoDevelop.NUnit.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="Mono.Posix" />
-    <Reference Include="Mono.Cairo" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Core" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.core">
-      <HintPath>..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.core.interfaces">
-      <HintPath>..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.util">
-      <HintPath>..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
-      <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
-      <Name>MonoDevelop.Core</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
-      <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project>
-      <Name>MonoDevelop.Ide</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="NUnitRunner\NUnitRunner.csproj">
-      <Project>{0AF16AF1-0876-413E-9803-08BD33C19E00}</Project>
-      <Name>NUnitRunner</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
-      <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
-      <Name>Mono.Addins</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\external\xwt\Xwt\Xwt.csproj">
-      <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project>
-      <Name>Xwt</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="templates\NUnitAssemblyGroup.xpt.xml">
-      <LogicalName>NUnitAssemblyGroup.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-running-16.png">
-      <LogicalName>unit-running-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-running-16%402x.png">
-      <LogicalName>unit-running-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-failed-16.png">
-      <LogicalName>unit-failed-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-failed-16%402x.png">
-      <LogicalName>unit-failed-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-mixed-results-16.png">
-      <LogicalName>unit-mixed-results-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-mixed-results-16%402x.png">
-      <LogicalName>unit-mixed-results-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16.png">
-      <LogicalName>unit-not-yet-run-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16%402x.png">
-      <LogicalName>unit-not-yet-run-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-skipped-16.png">
-      <LogicalName>unit-skipped-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-skipped-16%402x.png">
-      <LogicalName>unit-skipped-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-loading-16.png">
-      <LogicalName>unit-loading-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-success-16.png">
-      <LogicalName>unit-success-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-success-16%402x.png">
-      <LogicalName>unit-success-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\NUnitTestClass.xft.xml">
-      <LogicalName>NUnitTestClass.xft.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MonoDevelopNUnit.addin.xml">
-      <LogicalName>MonoDevelopNUnit.addin.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\NUnitProject.xpt.xml">
-      <LogicalName>NUnitProject.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32.png">
-      <LogicalName>project-nunit-overlay-32.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32%402x.png">
-      <LogicalName>project-nunit-overlay-32@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32.png">
-      <LogicalName>project-nunit-overlay-light-32.png</LogicalName>
-    </EmbeddedResource><!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) -->
-    <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32@2x.png">
-      <LogicalName>project-nunit-overlay-light-32@2x.png</LogicalName>
-    </EmbeddedResource><!-- TODO: VV: Duped definition to not break fsharpbinding (https://github.com/fsharp/fsharpbinding/blob/master/monodevelop/MonoDevelop.FSharpBinding/Templates/FSharpNUnitLibraryProject.xpt.xml#L8) -->
-    <EmbeddedResource Include="gtk-gui\gui.stetic">
-      <LogicalName>gui.stetic</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\pad-unit-test-16.png">
-      <LogicalName>pad-unit-test-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\pad-unit-test-16%402x.png">
-      <LogicalName>pad-unit-test-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\pad-unit-test-results-16.png">
-      <LogicalName>pad-unit-test-results-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\pad-unit-test-results-16%402x.png">
-      <LogicalName>pad-unit-test-results-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-inconclusive-16.png">
-      <LogicalName>unit-inconclusive-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-inconclusive-16%402x.png">
-      <LogicalName>unit-inconclusive-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-run-16.png">
-      <LogicalName>unit-run-16.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Gui\icons\unit-run-16%402x.png">
-      <LogicalName>unit-run-16@2x.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\NUnitProjectVBNet.xpt.xml">
-      <LogicalName>NUnitProjectVBNet.xpt.xml</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\images\nunit-library-project.png">
-      <LogicalName>nunit-library-project.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="templates\images\nunit-library-project%402x.png">
-      <LogicalName>nunit-library-project@2x.png</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Commands\NUnitCommands.cs" />
-    <Compile Include="Gui\TestPad.cs" />
-    <Compile Include="Gui\TestResultsPad.cs" />
-    <Compile Include="Gui\TestNodeBuilder.cs" />
-    <Compile Include="Gui\TestChart.cs" />
-    <Compile Include="Gui\UnitTestOptionsDialog.cs" />
-    <Compile Include="Gui\NUnitAssemblyGroupNodeBuilder.cs" />
-    <Compile Include="Gui\NUnitAssemblyGroupConfigurationNodeBuilder.cs" />
-    <Compile Include="Gui\TestAssemblyNodeBuilder.cs" />
-    <Compile Include="Project\NUnitAssemblyGroupProject.cs" />
-    <Compile Include="Project\TestAssembly.cs" />
-    <Compile Include="Project\TestAssemblyCollection.cs" />
-    <Compile Include="Services\SolutionFolderTestGroup.cs" />
-    <Compile Include="Services\ITestProvider.cs" />
-    <Compile Include="Services\NUnitService.cs" />
-    <Compile Include="Services\SystemTestProvider.cs" />
-    <Compile Include="Services\ITestProgressMonitor.cs" />
-    <Compile Include="Services\TestContext.cs" />
-    <Compile Include="Services\UnitTestCollection.cs" />
-    <Compile Include="Services\UnitTest.cs" />
-    <Compile Include="Services\UnitTestGroup.cs" />
-    <Compile Include="Services\ExternalTestRunner.cs" />
-    <Compile Include="Services\NUnitAssemblyTestSuite.cs" />
-    <Compile Include="Services\NUnitProjectTestSuite.cs" />
-    <Compile Include="Services\NUnitTestCase.cs" />
-    <Compile Include="Services\NUnitTestSuite.cs" />
-    <Compile Include="Services\GeneralTestOptions.cs" />
-    <Compile Include="Services\NUnitOptions.cs" />
-    <Compile Include="Services\IResultsStore.cs" />
-    <Compile Include="Services\UnitTestResultsStore.cs" />
-    <Compile Include="Services\WorkspaceTestGroup.cs" />
-    <Compile Include="gtk-gui\generated.cs" />
-    <Compile Include="Services\UnitTestResult.cs" />
-    <Compile Include="Services\UnitTestStatus.cs" />
-    <Compile Include="Services\NUnitProjectServiceExtension.cs" />
-    <Compile Include="Gui\NUnitOptionsPanel.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.NUnit.NUnitOptionsWidget.cs" />
-    <Compile Include="Services\TcpTestListener.cs" />
-    <Compile Include="Gui\TestStatusIcon.cs" />
-    <Compile Include="AddinInfo.cs" />
-    <Compile Include="Gui\AbstractUnitTestEditorExtension.cs" />
-    <Compile Include="Services\AbstractResultsStore.cs" />
-    <Compile Include="Services\BinaryResultsStore.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile.am" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Target Name="BeforeBuild">
-    <PropertyGroup>
-      <NuGet>$(SolutionDir)\external\nuget-binary\NuGet.exe</NuGet>
-      <NuGet Condition="$(OS)=='Unix'">mono $(NuGet)</NuGet>
-    </PropertyGroup>
-    <Exec Condition="Exists('$(SolutionDir)\..\.git')" Command="$(NuGet) restore -SolutionDirectory $(SolutionDir)" />
-  </Target>
-  <ItemGroup>
-    <Folder Include="templates\images\" />
-  </ItemGroup>
-</Project>
diff --git a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml b/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
deleted file mode 100644
index 25aef50656..0000000000
--- a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<ExtensionModel>
-
-	<Runtime>
-		<Import assembly="MonoDevelop.NUnit.dll" />
-		<Import assembly="nunit.core.dll" />
-		<Import assembly="nunit.core.interfaces.dll" />
-		<Import assembly="nunit.framework.dll" />
-		<Import assembly="nunit.util.dll" />
-	</Runtime>
-
-	<!-- Extension Points -->
-
-	<ExtensionPoint path = "/MonoDevelop/NUnit/TestProviders" name = "Test providers">
-		<Description>Test providers. Specified classes must implement ITestProvider.</Description>
-		<ExtensionNode name ="Class" />
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/TestChart">
-		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/TestPad">
-		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/TestResultsPad">
-		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroup">
-		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/TestAssembly">
-		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroupConfiguration">
-		<ExtensionNodeSet id="MonoDevelop.Components.Commands.ItemSet"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/NUnit/UnitTestOptions/GeneralOptions">
-		<ExtensionNodeSet id="MonoDevelop.Ide.OptionsDialogSection"/>
-	</ExtensionPoint>
-
-	<ExtensionPoint path = "/MonoDevelop/NUnit/UnitTestOptions/ConfigurationOptions">
-		<ExtensionNodeSet id="MonoDevelop.Ide.OptionsDialogSection"/>
-	</ExtensionPoint>
-
-
-	<!-- Extensions -->
-
-	<Extension path = "/MonoDevelop/Ide/Pads">
-		<SolutionPad id = "MonoDevelop.NUnit.TestPad" defaultLayout="*" defaultPlacement = "Right" defaultStatus="AutoHide" _label = "Unit Tests" icon = "nunit-pad-icon" class = "MonoDevelop.NUnit.TestPad">
-			<PadOption id = "ShowTestTime" _label = "Show Test Time" defaultValue = "False" />
-			<PadOption id = "ShowTestCounters" _label = "Show Test Counters" defaultValue = "False" />
-			<NodeBuilder id = "TestNode" class = "MonoDevelop.NUnit.TestNodeBuilder"/>
-		</SolutionPad>
-		<Pad id="MonoDevelop.NUnit.TestResultsPad" _label="Test Results" icon="nunit-results-pad-icon" class="MonoDevelop.NUnit.TestResultsPad" defaultPlacement = "Bottom" defaultLayout="UnitTesting" defaultStatus="AutoHide"/>
-	</Extension>
-
-	<Extension path="/MonoDevelop/Ide/WorkbenchLayouts">
-		<Layout id="UnitTesting" _name="Unit Testing">
-			<LayoutPad id="MonoDevelop.NUnit.TestPad" status="Dockable" />
-			<LayoutPad id="MonoDevelop.NUnit.TestResultsPad" status="Dockable" />
-		</Layout>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
-		<NodeBuilder id = "NUnitAssemblyGroupNodeBuilder" class = "MonoDevelop.NUnit.NUnitAssemblyGroupNodeBuilder"/>
-		<NodeBuilder id = "NUnitAssemblyGroupConfigurationNodeBuilder" class = "MonoDevelop.NUnit.NUnitAssemblyGroupConfigurationNodeBuilder"/>
-		<NodeBuilder id = "TestAssemblyNodeBuilder" class = "MonoDevelop.NUnit.TestAssemblyNodeBuilder"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/Commands">
-		<Category _name = "NUnit" id = "NUnit">
-		<Command id = "MonoDevelop.NUnit.Commands.TestCommands.RunAllTests"
-			_label = "Run Unit Tests"
-			_description="Runs all tests of the current selected project."
-			shortcut="Control|T"
-			defaultHandler="MonoDevelop.NUnit.Commands.RunAllTestsHandler"/>
-		<Command id = "MonoDevelop.NUnit.Commands.TestCommands.RunTestWith"
-			_label = "Run With"
-			type="array"
-			_description="Runs tests using a special execution mode."/>
-		<Command id = "MonoDevelop.NUnit.Commands.TestCommands.DebugTest"
-			_label = "Debug Test"
-			type="array" />
-		<Command id = "MonoDevelop.NUnit.Commands.TestCommands.RunTest" _label = "Run Test" />
-		<Command id = "MonoDevelop.NUnit.Commands.TestCommands.ShowTestCode" _label = "Show test source code" />
-		<Command id = "MonoDevelop.NUnit.Commands.TestCommands.GoToFailure" _label = "Go to failure" />
-		<Command id = "MonoDevelop.NUnit.Commands.TestCommands.SelectTestInTree" _label = "Select test in tree" />
-		<Command id = "MonoDevelop.NUnit.Commands.TestCommands.ShowTestDetails" _label = "Show results pad" />
-		<Command id = "MonoDevelop.NUnit.Commands.TestCommands.RerunTest" _label = "Rerun test" />
-		<Command id = "MonoDevelop.NUnit.Commands.TestChartCommands.UseTimeScale" _label = "Proportional time scale" type="check"/>
-		<Command id = "MonoDevelop.NUnit.Commands.TestChartCommands.SingleDayResult" _label = "Show one result per day" type="check"/>
-		<Command id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowResults" _label = "Results chart" type="radio"/>
-		<Command id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowTime" _label = "Time chart" type="radio"/>
-		<Command id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowSuccessfulTests" _label = "Show successful tests" type="check"/>
-		<Command id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowFailedTests" _label = "Show failed tests" type="check"/>
-		<Command id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowIgnoredTests" _label = "Show ignored tests" type="check"/>
-		<Command id = "MonoDevelop.NUnit.Commands.NUnitProjectCommands.AddAssembly" _label = "Add assembly..."/>
-		</Category>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/MainMenu/Run">
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.RunAllTests" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroup">
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/NUnitAssemblyGroupConfiguration">
-		<CommandItem id = "MonoDevelop.NUnit.Commands.NUnitProjectCommands.AddAssembly" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/NUnit/ContextMenu/ProjectPad/TestAssembly">
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Delete" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/NUnit/ContextMenu/TestPad">
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.RunTest" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.DebugTest" />
-		<ItemSet id = "RunTestWith" _label = "Run Test With">
-			<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.RunTestWith" />
-		</ItemSet>
-		<SeparatorItem id = "s0" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.GoToFailure" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.ShowTestCode" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.ShowTestDetails" />
-		<SeparatorItem id = "s1" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.ProjectCommands.Options" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/NUnit/ContextMenu/TestResultsPad">
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.GoToFailure" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.ShowTestCode" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.SelectTestInTree" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestCommands.RerunTest" />
-		<SeparatorItem id = "s1" />
-		<CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Copy" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/NUnit/ContextMenu/TestChart">
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowResults" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowTime" />
-		<SeparatorItem id = "s1" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowSuccessfulTests" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowFailedTests" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestChartCommands.ShowIgnoredTests" />
-		<SeparatorItem id = "s2" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestChartCommands.UseTimeScale" />
-		<CommandItem id = "MonoDevelop.NUnit.Commands.TestChartCommands.SingleDayResult" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/NUnit/UnitTestOptions/GeneralOptions">
-		<Section id = "Configurations"
-					 _label = "Configurations" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/NUnit/UnitTestOptions/ConfigurationOptions">
-		<Section id = "NUnitOptionsPanel"
-					 _label = "${Configuration}"
-					 class = "MonoDevelop.NUnit.NUnitOptionsPanel"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
-<!--		<ProjectTemplate id = "NUnitAssemblyGroup" resource = "NUnitAssemblyGroup.xpt.xml"/>-->
-		<ProjectTemplate id = "NUnitProject" resource = "NUnitProject.xpt.xml"/>
-		<ProjectTemplate id = "NUnitProjectVBNet" resource = "NUnitProjectVBNet.xpt.xml"/>
-	</Extension>
-
-  	<Extension path = "/MonoDevelop/Ide/FileTemplates">
-		<FileTemplate id = "NUnitTestClass" resource = "NUnitTestClass.xft.xml"/>
-	</Extension>
-
-	<Extension path = "/MonoDevelop/NUnit/TestProviders">
-		<Class id="SystemTestProvider" class="MonoDevelop.NUnit.SystemTestProvider" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/Core/StockIcons">
-		<StockIcon stockid = "nunit-pad-icon" resource = "pad-unit-test-16.png" size="Menu" />
-		<StockIcon stockid = "nunit-results-pad-icon" resource = "pad-unit-test-results-16.png" size="Menu" />
-		<StockIcon stockid = "nunit-run" resource = "unit-run-16.png" size="Menu" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/ProjectServiceExtensions">
-		<Class class = "MonoDevelop.NUnit.NUnitProjectServiceExtension" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
-		<DataType class = "MonoDevelop.NUnit.NUnitAssemblyGroupProject" />
-		<DataType class = "MonoDevelop.NUnit.NUnitCategoryOptions" />
-	</Extension>
-
-	<Extension path = "/MonoDevelop/ProjectModel/ExtendedProperties">
-		<ItemProperty class = "MonoDevelop.Projects.SolutionItemConfiguration"
-			name = "UnitTestInformation" type = "MonoDevelop.NUnit.UnitTestOptionsSet" />
-		<ItemProperty class = "MonoDevelop.Projects.DotNetProject"
-			name = "TestRunnerType" type = "System.String" external="false" />
-		<ItemProperty class = "MonoDevelop.Projects.DotNetProject"
-			name = "TestRunnerAssembly" type = "MonoDevelop.Core.FilePath" external="false" />
-		<ItemProperty class = "MonoDevelop.Projects.DotNetProject"
-			name = "TestRunnerCommand" type = "MonoDevelop.Core.FilePath" external="false" />
-		<ItemProperty class = "MonoDevelop.Projects.DotNetProject"
-			name = "TestRunnerArgs" type = "System.String" external="false" />
-	</Extension>
-
-	<Extension path="/MonoDevelop/Ide/TemplateImages">
-		<Image id="md-nunit-library-project" resource="nunit-library-project.png" />
-	</Extension>
-</ExtensionModel>
diff --git a/main/src/addins/NUnit/NUnitRunner/ChangeLog b/main/src/addins/NUnit/NUnitRunner/ChangeLog
deleted file mode 100644
index 05e2ede495..0000000000
--- a/main/src/addins/NUnit/NUnitRunner/ChangeLog
+++ /dev/null
@@ -1,32 +0,0 @@
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* NUnitRunner.csproj: Flush.
-
-2009-10-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* NUnitTestRunner.cs: The name of inherited tests include the
-	  base class name as prefix. That prefix has to be removed.
-	  Fixes bug #543772 - derived TestFixtures are visible but not
-	  being run.
-
-2009-06-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* NUnitTestRunner.cs: In some cases MS.NET can't properly
-	  resolve assemblies even if they are already loaded. For
-	  example, when deserializing objects from remoting. Added a
-	  handler for AssemblyResolve that handle this case.
-
-2009-02-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Added support for running unit tests using a
-	  special execution mode (for example, using the debugger).
-
-2009-02-06 Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix distcheck.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* NUnitRunner.mdp:
-	* NUnitRunner.csproj: Migrated to MSBuild file format.
-
diff --git a/main/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj b/main/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj
deleted file mode 100644
index 5822b21843..0000000000
--- a/main/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0AF16AF1-0876-413E-9803-08BD33C19E00}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>NUnitRunner</AssemblyName>
-    <RootNamespace>NUnitRunner</RootNamespace>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\..\build\AddIns\NUnit</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <NoWarn>1591;1573</NoWarn>
-    <DocumentationFile>..\..\..\..\build\AddIns\NUnit\NUnitRunner.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\..\build\AddIns\NUnit</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <DebugSymbols>true</DebugSymbols>
-    <NoWarn>1591;1573</NoWarn>
-    <DocumentationFile>..\..\..\..\build\AddIns\NUnit\NUnitRunner.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.core">
-      <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.core.interfaces">
-      <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="NUnitTestRunner.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Target Name="BeforeBuild">
-    <PropertyGroup>
-      <NuGet>$(SolutionDir)\external\nuget-binary\NuGet.exe</NuGet>
-      <NuGet Condition="$(OS)=='Unix'">mono $(NuGet)</NuGet>
-    </PropertyGroup>
-    <Exec Condition="Exists('$(SolutionDir)\..\.git')" Command="$(NuGet) restore -SolutionDirectory $(SolutionDir)" />
-  </Target>
-</Project>
diff --git a/main/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs b/main/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs
deleted file mode 100644
index 8602b52b56..0000000000
--- a/main/src/addins/NUnit/NUnitRunner/NUnitTestRunner.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-//
-// ExternalTestRunner.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Linq;
-using System.Reflection;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-
-using NUnit.Core;
-using NUnit.Framework;
-using NUnit.Core.Filters;
-
-namespace MonoDevelop.NUnit.External
-{
-	public class NUnitTestRunner: MarshalByRefObject
-	{
-		public NUnitTestRunner ()
-		{
-		}
-
-		public void PreloadAssemblies (string nunitPath, string nunitCorePath, string nunitCoreInterfacesPath)
-		{
-			// Note: We need to load all nunit.*.dll assemblies before we do *anything* else in this class
-			// This is to ensure that we always load the assemblies from the monodevelop directory and not
-			// from the directory of the assembly under test. For example we wnat to load
-			// /Applications/MonoDevelop/lib/Addins/nunit.framework.dll and not /user/app/foo/bin/debug/nunit.framework.dll
-
-			// In some cases MS.NET can't properly resolve assemblies even if they
-			// are already loaded. For example, when deserializing objects from remoting.
-			AppDomain.CurrentDomain.AssemblyResolve += delegate (object s, ResolveEventArgs args) {
-				foreach (Assembly am in AppDomain.CurrentDomain.GetAssemblies ()) {
-					if (am.GetName ().FullName == args.Name)
-						return am;
-				}
-				return null;
-			};
-			
-			// Force the loading of the NUnit.Framework assembly.
-			// It's needed since that dll is not located in the test dll directory.
-			Assembly.LoadFrom (nunitCoreInterfacesPath);
-			Assembly.LoadFrom (nunitCorePath);
-			Assembly.LoadFrom (nunitPath);
-		}
-
-		public void Initialize ()
-		{

-			// Initialize ExtensionHost if not already done

-			if ( !CoreExtensions.Host.Initialized )

-				CoreExtensions.Host.InitializeService();

-		}
-		
-		public TestResult Run (EventListener listener, ITestFilter filter, string path, string suiteName, List<string> supportAssemblies, string testRunnerType, string testRunnerAssembly)
-		{
-			InitSupportAssemblies (supportAssemblies);
-			
-			if (filter == null)
-				filter = TestFilter.Empty;
-
-			TestRunner tr;
-			if (!string.IsNullOrEmpty (testRunnerType)) {
-				Type runnerType;
-				if (string.IsNullOrEmpty (testRunnerAssembly))
-					runnerType = Type.GetType (testRunnerType, true);
-				else {
-					var asm = Assembly.LoadFrom (testRunnerAssembly);
-					runnerType = asm.GetType (testRunnerType);
-				}
-				tr = (TestRunner)Activator.CreateInstance (runnerType);
-			} else
-				tr = new RemoteTestRunner ();
-
-			TestPackage package = new TestPackage (path);
-			if (!string.IsNullOrEmpty (suiteName))
-				package.TestName = suiteName;
-			tr.Load (package);
-			return tr.Run (listener, filter, false, LoggingThreshold.All);
-		}
-		
-		public NunitTestInfo GetTestInfo (string path, List<string> supportAssemblies)
-		{
-			InitSupportAssemblies (supportAssemblies);
-			
-			TestSuite rootTS = new TestSuiteBuilder ().Build (new TestPackage (path));
-			return BuildTestInfo (rootTS);
-		}
-		
-		NunitTestInfo BuildTestInfo (Test test)
-		{
-			NunitTestInfo ti = new NunitTestInfo ();
-			// The name of inherited tests include the base class name as prefix.
-			// That prefix has to be removed
-			string tname = test.TestName.Name;
-			// Find the last index of the dot character that is not a part of the test parameters
-			int j = tname.IndexOf ('(');
-			int i = tname.LastIndexOf ('.', (j == -1) ? (tname.Length - 1) : j);
-			if (i != -1)
-				tname = tname.Substring (i + 1);
-			if (test.FixtureType != null) {
-				ti.FixtureTypeName = test.FixtureType.Name;
-				ti.FixtureTypeNamespace = test.FixtureType.Namespace;
-			} else if (test.TestType == "ParameterizedTest") {
-				ti.FixtureTypeName = test.Parent.FixtureType.Name;
-				ti.FixtureTypeNamespace = test.Parent.FixtureType.Namespace;
-			}
-			ti.Name = tname;
-			ti.TestId = test.TestName.FullName;
-
-			// Trim short name from end of full name to get the path
-			string testNameWithDelimiter = "." + tname;
-			if (test.TestName.FullName.EndsWith (testNameWithDelimiter)) {
-				int pathLength = test.TestName.FullName.Length - testNameWithDelimiter.Length;
-				ti.PathName = test.TestName.FullName.Substring(0, pathLength );
-			}
-			else
-				ti.PathName = null;
-			
-			if (test.Tests != null && test.Tests.Count > 0) {
-				ti.Tests = new NunitTestInfo [test.Tests.Count];
-				for (int n=0; n<test.Tests.Count; n++)
-					ti.Tests [n] = BuildTestInfo ((Test)test.Tests [n]);
-			}
-			ti.IsExplicit = test.RunState == RunState.Explicit;
-			return ti;
-		}
-		
-		void InitSupportAssemblies (List<string> supportAssemblies)
-		{
-			// Preload support assemblies (they may not be in the test assembly directory nor in the gac)
-			foreach (string asm in supportAssemblies)
-				Assembly.LoadFrom (asm);
-		}
-		
-		public override object InitializeLifetimeService ()
-		{
-			return null;
-		}
-	}
-
-	[Serializable]
-	public class NunitTestInfo
-	{
-		public string Name;
-		public string PathName;
-		public string TestId;
-		public string FixtureTypeName;
-		public string FixtureTypeNamespace;
-		public bool IsExplicit;
-		public NunitTestInfo[] Tests;
-	}
-		
-	[Serializable]
-	public class TestNameFilter: ITestFilter
-	{
-		string[] names;
-		
-		public TestNameFilter (params string[] names)
-		{
-			this.names = names;
-		}
-		
-		#region ITestFilter implementation 
-		
-		public bool Pass (ITest test)
-		{
-			if (!test.IsSuite && names.Any (n => test.TestName.FullName == n))
-				return true;
-			if (test.Tests != null) {
-				foreach (ITest ct in test.Tests) {
-					if (Pass (ct))
-						return true;
-				}
-			}
-			return false;
-		}
-		
-		public bool Match (ITest test)
-		{
-			return Pass (test);
-		}
-		
-		public bool IsEmpty {
-			get {
-				return false;
-			}
-		}
-		
-		#endregion 
-	}
-}
-
diff --git a/main/src/addins/NUnit/Project/NUnitAssemblyGroupProject.cs b/main/src/addins/NUnit/Project/NUnitAssemblyGroupProject.cs
deleted file mode 100644
index 0a67aac29d..0000000000
--- a/main/src/addins/NUnit/Project/NUnitAssemblyGroupProject.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-//
-// NUnitAssemblyGroupProject.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-using System.Xml;
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Ide.TypeSystem;
-
-namespace MonoDevelop.NUnit
-{
-	[DataInclude (typeof(NUnitAssemblyGroupProjectConfiguration))]
-	public class NUnitAssemblyGroupProject: SolutionEntityItem
-	{
-		RootTest rootTest;
-		
-		public NUnitAssemblyGroupProject ()
-		{
-		}
-		
-		protected override void OnEndLoad ()
-		{
-			base.OnEndLoad ();
-			if (Configurations.Count == 0)
-				Configurations.Add (CreateConfiguration ("Default"));
-		}
-
-		public override void InitializeFromTemplate (XmlElement element)
-		{
-			Configurations.Add (CreateConfiguration ("Default"));
-		}
-
-		public UnitTest RootTest {
-			get {
-				if (rootTest == null) {
-					rootTest = new RootTest (this);
-				}
-				return rootTest;
-			}
-		}
-		
-		public override SolutionItemConfiguration CreateConfiguration (string name)
-		{
-			NUnitAssemblyGroupProjectConfiguration conf = new NUnitAssemblyGroupProjectConfiguration ();
-			conf.Name = name;
-			return conf;
-		}
-		
-		protected override void OnClean (IProgressMonitor monitor, ConfigurationSelector configuration)
-		{
-		}
-		
-		protected override BuildResult OnBuild (IProgressMonitor monitor, ConfigurationSelector configuration)
-		{
-			return null;
-		}
-		
-		protected override void OnExecute (IProgressMonitor monitor, ExecutionContext context, ConfigurationSelector configuration)
-		{
-		}
-		
-		protected override bool OnGetNeedsBuilding (ConfigurationSelector configuration)
-		{
-			return false;
-		}
-		
-		protected override void OnSetNeedsBuilding (bool value, ConfigurationSelector configuration)
-		{
-		}
-	}
-	
-	public class NUnitAssemblyGroupProjectConfiguration: SolutionItemConfiguration
-	{
-		TestAssemblyCollection assemblies;
-		
-		public NUnitAssemblyGroupProjectConfiguration ()
-		{
-			assemblies = new TestAssemblyCollection (this);
-		}
-		
-		public override void CopyFrom (ItemConfiguration other)
-		{
-			base.CopyFrom (other);
-			
-			NUnitAssemblyGroupProjectConfiguration conf = other as NUnitAssemblyGroupProjectConfiguration;
-			if (conf != null) {
-				assemblies.Clear ();
-				foreach (TestAssembly ta in conf.Assemblies) {
-					TestAssembly copy = new TestAssembly (ta.Path);
-					assemblies.Add (copy);
-				}
-			}
-		}
-		
-		[ItemProperty ("Assemblies")]
-		[ItemProperty ("Assembly", ValueType=typeof(TestAssembly), Scope="*")]
-		public TestAssemblyCollection Assemblies {
-			get { return assemblies; }
-		}
-		
-		internal void OnAssembliesChanged ()
-		{
-			if (AssembliesChanged != null)
-				AssembliesChanged (this, EventArgs.Empty);
-		}
-		
-		public event EventHandler AssembliesChanged;
-	}
-	
-	class RootTest: UnitTestGroup
-	{
-		NUnitAssemblyGroupProject project;
-		string resultsPath;
-		NUnitAssemblyGroupProjectConfiguration lastConfig;
-			
-		
-		internal static string GetTestResultsDirectory (string baseDirectory)
-		{
-			var newCache = TypeSystemService.GetCacheDirectory (baseDirectory, false);
-			if (newCache == null) {
-				newCache = TypeSystemService.GetCacheDirectory (baseDirectory, true);
-				var oldDirectory = Path.Combine (baseDirectory, "test-results");
-				var newDirectory = Path.Combine (newCache, "test-results");
-				try {
-					Directory.CreateDirectory (newDirectory);
-					if (Directory.Exists (oldDirectory)) {
-						foreach (string file in Directory.GetFiles(oldDirectory, "*.*"))
-							File.Copy (file, file.Replace (oldDirectory, newDirectory));
-					}
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while copying old test-results", e);
-				}
-				return newDirectory;
-			}
-
-			return Path.Combine (newCache, "test-results");
-		}
-		
-		public RootTest (NUnitAssemblyGroupProject project): base (project.Name, project)
-		{
-			this.project = project;
-			resultsPath = GetTestResultsDirectory (project.BaseDirectory);
-			ResultsStore = new BinaryResultsStore (resultsPath, Path.GetFileName (project.FileName));
-			
-			lastConfig = (NUnitAssemblyGroupProjectConfiguration) project.DefaultConfiguration;
-			if (lastConfig != null)
-				lastConfig.AssembliesChanged += new EventHandler (OnAssembliesChanged);
-		}
-
-		public override void Dispose ()
-		{
-			if (lastConfig != null)
-				lastConfig.AssembliesChanged -= new EventHandler (OnAssembliesChanged);
-		}
-		
-		internal string ResultsPath {
-			get { return resultsPath; }
-		}
-		
-		void OnAssembliesChanged (object sender, EventArgs args)
-		{
-			UpdateTests ();
-		}
-		
-		public override bool HasTests {
-			get {
-				return true;
-			}
-		}
-		
-		
-		protected override void OnActiveConfigurationChanged ()
-		{
-			if (lastConfig != null)
-				lastConfig.AssembliesChanged -= new EventHandler (OnAssembliesChanged);
-
-			lastConfig = (NUnitAssemblyGroupProjectConfiguration) project.DefaultConfiguration;
-			if (lastConfig != null)
-				lastConfig.AssembliesChanged += new EventHandler (OnAssembliesChanged);
-
-			UpdateTests ();
-			base.OnActiveConfigurationChanged ();
-		}
-		
-		protected override void OnCreateTests ()
-		{
-			NUnitAssemblyGroupProjectConfiguration conf = (NUnitAssemblyGroupProjectConfiguration) project.GetConfiguration ((ItemConfigurationSelector) ActiveConfiguration);
-			if (conf != null) {
-				foreach (TestAssembly t in conf.Assemblies)
-					Tests.Add (t);
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Project/TestAssembly.cs b/main/src/addins/NUnit/Project/TestAssembly.cs
deleted file mode 100644
index 3beb664b6c..0000000000
--- a/main/src/addins/NUnit/Project/TestAssembly.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// TestAssembly.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.IO;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-
-namespace MonoDevelop.NUnit
-{
-	public class TestAssembly: NUnitAssemblyTestSuite
-	{
-		[ItemProperty ("Path")]
-		string path;
-		
-		public TestAssembly (): base (null)
-		{
-		}
-		
-		public TestAssembly (string path): base (null)
-		{
-			this.path = path;
-		}
-		
-		public override string Name {
-			get { return System.IO.Path.GetFileNameWithoutExtension (path); }
-		}
-		
-		public string Path {
-			get { return path; }
-			set { path = value; }
-		}
-		
-		protected override string AssemblyPath {
-			get { return path; }
-		}
-		
-		protected override string TestInfoCachePath {
-			get {
-				if (Parent != null)
-					return System.IO.Path.Combine (((RootTest)Parent).ResultsPath, System.IO.Path.GetFileName (path) + ".test-cache");
-				else
-					return null;
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Project/TestAssemblyCollection.cs b/main/src/addins/NUnit/Project/TestAssemblyCollection.cs
deleted file mode 100644
index 64e1ea75eb..0000000000
--- a/main/src/addins/NUnit/Project/TestAssemblyCollection.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// TestAssemblyCollection.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace MonoDevelop.NUnit
-{
-	public class TestAssemblyCollection: CollectionBase
-	{
-		NUnitAssemblyGroupProjectConfiguration owner;
-		
-		internal TestAssemblyCollection (NUnitAssemblyGroupProjectConfiguration owner)
-		{
-			this.owner = owner;
-		}
-		
-		public new TestAssembly this [int n] {
-			get { return (TestAssembly) List [n]; }
-		}
-		
-		public void Add (TestAssembly asm)
-		{
-			List.Add (asm);
-		}
-		
-		public void Remove (TestAssembly asm)
-		{
-			List.Remove (asm);
-		}
-		
-		protected override void OnInsertComplete (int index, object value)
-		{
-			owner.OnAssembliesChanged ();
-		}
-		
-		protected override void OnRemoveComplete (int index, object value)
-		{
-			owner.OnAssembliesChanged ();
-		}
-		
-		protected override void OnSetComplete (int index, object oldValue, object newValue)
-		{
-			owner.OnAssembliesChanged ();
-		}
-		
-		protected override void OnClearComplete ()
-		{
-			owner.OnAssembliesChanged ();
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/AbstractResultsStore.cs b/main/src/addins/NUnit/Services/AbstractResultsStore.cs
deleted file mode 100644
index 10500c7ab2..0000000000
--- a/main/src/addins/NUnit/Services/AbstractResultsStore.cs
+++ /dev/null
@@ -1,407 +0,0 @@
-//
-// AbstractResultsStore.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Xml.Serialization;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.NUnit
-{
-	public abstract class AbstractResultsStore: IResultsStore
-	{
-		Hashtable fileCache = new Hashtable ();
-		string basePath;
-		string storeId;
-		Hashtable cachedRootList = new Hashtable ();
-
-		IResultsStoreSerializer serializer;
-
-		public AbstractResultsStore (IResultsStoreSerializer serializer, string directory, string storeId)
-		{
-			this.serializer = serializer;
-			this.basePath = directory;
-			this.storeId = storeId;
-		}
-		
-		public void RegisterResult (string configuration, UnitTest test, UnitTestResult result)
-		{
-			string aname = test.StoreRelativeName;
-			
-			TestRecord root = GetRootRecord (configuration, result.TestDate);
-			if (root == null) {
-				root = new TestRecord ();
-				fileCache [GetRootFileName (configuration, result.TestDate)] = root;
-			}
-			root.Modified = true;
-			TestRecord record = root;
-			
-			if (aname.Length > 0) {
-				string[] path = test.StoreRelativeName.Split ('.');
-				foreach (string p in path) {
-					TestRecord ctr = record.Tests != null ? record.Tests [p] : null;
-					if (ctr == null) {
-						ctr = new TestRecord ();
-						ctr.Name = p;
-						if (record.Tests == null)
-							record.Tests = new TestRecordCollection ();
-						record.Tests.Add (ctr);
-					}
-					record = ctr;
-				}
-			}
-			
-			if (record.Results == null)
-				record.Results = new UnitTestResultCollection ();
-			record.Results.Add (result);
-		}
-		
-		public UnitTestResult GetNextResult (string configuration, UnitTest test, DateTime date)
-		{
-			DateTime currentDate = date;
-			TestRecord root = GetRootRecord (configuration, currentDate);
-			if (root == null)
-				root = GetNextRootRecord (configuration, ref currentDate);
-			
-			while (root != null) {
-				TestRecord tr = FindRecord (root, test.StoreRelativeName);
-				if (tr != null && tr.Results != null) {
-					foreach (UnitTestResult res in tr.Results) {
-						if (res.TestDate > date)
-							return res;
-					}
-				}
-				root = GetNextRootRecord (configuration, ref currentDate);
-			}
-			return null;
-		}
-		
-		public UnitTestResult GetPreviousResult (string configuration, UnitTest test, DateTime date)
-		{
-			DateTime currentDate = date;
-			TestRecord root = GetRootRecord (configuration, currentDate);
-			if (root == null)
-				root = GetPreviousRootRecord (configuration, ref currentDate);
-			
-			while (root != null) {
-				TestRecord tr = FindRecord (root, test.StoreRelativeName);
-				if (tr != null && tr.Results != null) {
-					for (int n = tr.Results.Count - 1; n >= 0; n--) {
-						UnitTestResult res = (UnitTestResult) tr.Results [n];
-						if (res.TestDate < date)
-							return res;
-					}
-				}
-				root = GetPreviousRootRecord (configuration, ref currentDate);
-			}
-			return null;
-		}
-		
-		public UnitTestResult GetLastResult (string configuration, UnitTest test, DateTime date)
-		{
-			return GetPreviousResult (configuration, test, date.AddTicks (1));
-		}
-		
-		public UnitTestResult[] GetResults (string configuration, UnitTest test, DateTime startDate, DateTime endDate)
-		{
-			ArrayList list = new ArrayList ();
-			DateTime firstDay = new DateTime (startDate.Year, startDate.Month, startDate.Day);
-			
-			DateTime[] dates = GetStoreDates (configuration);
-			
-			foreach (DateTime date in dates) {
-				if (date < firstDay)
-					continue;
-				if (date > endDate)
-					break;
-				
-				TestRecord root = GetRootRecord (configuration, date);
-				if (root == null) continue;
-
-				TestRecord tr = FindRecord (root, test.StoreRelativeName);
-				if (tr != null && tr.Results != null) {
-					foreach (UnitTestResult res in tr.Results) {
-						if (res.TestDate >= startDate && res.TestDate <= endDate)
-							list.Add (res);
-					}
-				}
-			}
-			
-			return (UnitTestResult[]) list.ToArray (typeof(UnitTestResult));
-		}
-		
-		public UnitTestResult[] GetResultsToDate (string configuration, UnitTest test, DateTime endDate, int count)
-		{
-			ArrayList list = new ArrayList ();
-			DateTime[] dates = GetStoreDates (configuration);
-			
-			for (int n = dates.Length - 1; n >= 0 && list.Count < count; n--) {
-				if (dates [n] > endDate)
-					continue;
-				
-				TestRecord root = GetRootRecord (configuration, dates [n]);
-				if (root == null) continue;
-
-				TestRecord tr = FindRecord (root, test.StoreRelativeName);
-				if (tr != null && tr.Results != null) {
-					for (int m = tr.Results.Count - 1; m >= 0 && list.Count < count; m--) {
-						UnitTestResult res = (UnitTestResult) tr.Results [m];
-						if (res.TestDate <= endDate)
-							list.Add (res);
-					}
-				}
-			}
-			
-			UnitTestResult[] array = (UnitTestResult[]) list.ToArray (typeof(UnitTestResult));
-			Array.Reverse (array);
-			return array;
-		}
-		
-		public void Save ()
-		{
-			if (!Directory.Exists (basePath))
-				Directory.CreateDirectory (basePath);
-			
-			foreach (DictionaryEntry entry in fileCache) {
-				TestRecord record = (TestRecord) entry.Value;
-				if (!record.Modified)
-					continue;
-				
-				string filePath = Path.Combine (basePath, (string)entry.Key);
-				try {
-					serializer.Serialize (filePath, record);
-					record.Modified = false;
-				} catch (Exception ex) {
-					LoggingService.LogError (ex.ToString ());
-				}
-			}
-			cachedRootList.Clear ();
-		}
-		
-		TestRecord FindRecord (TestRecord root, string aname)
-		{
-			if (aname.Length == 0)
-				return root;
-			else {
-				string[] path = aname.Split ('.');
-				TestRecord tr = root;
-				foreach (string p in path) {
-					if (tr.Tests == null)
-						return null;
-					tr = tr.Tests [p];
-					if (tr == null)
-						return null;
-				}
-				return tr;
-			}
-		}
-
-		TestRecord GetRootRecord (string configuration, DateTime date)
-		{
-			string file = GetRootFileName (configuration, date);
-			TestRecord res = (TestRecord) fileCache [file];
-			if (res != null)
-				return res;
-			string filePath;
-			try {
-				filePath = Path.Combine (basePath, file);
-			} catch (Exception) {
-				return null;
-			}
-			
-			try {
-				res = (TestRecord) serializer.Deserialize (filePath);
-			} catch (Exception ex) {
-				LoggingService.LogError (ex.ToString ());
-				return null;
-			}
-			
-			if (res != null) {
-				fileCache [file] = res;
-			}
-			return res;
-		}
-		
-		TestRecord GetNextRootRecord (string configuration, ref DateTime date)
-		{
-			DateTime[] dates = GetStoreDates (configuration);
-			foreach (DateTime d in dates) {
-				if (d > date) {
-					date = d;
-					return GetRootRecord (configuration, d);
-				}
-			}
-			return null;
-		}
-		
-		TestRecord GetPreviousRootRecord (string configuration, ref DateTime date)
-		{
-			date = new DateTime (date.Year, date.Month, date.Day);
-			DateTime[] dates = GetStoreDates (configuration);
-			for (int n = dates.Length - 1; n >= 0; n--) {
-				if (dates [n] < date) {
-					date = dates [n];
-					return GetRootRecord (configuration, dates [n]);
-				}
-			}
-			return null;
-		}
-
-		// Filter out all invalid path characters in the file name
-		// Bug 3023 - Running NUnit tests throws ArgumentException: Illegal Characters in path
-		static string EscapeFilename (string str)
-		{
-			var pc = FilePath.GetInvalidPathChars ();
-			char[] specialCharacters = new char[pc.Length + 1];
-			pc.CopyTo (specialCharacters, 0);
-			specialCharacters [specialCharacters.Length - 1] = '%';
-
-			int i = str.IndexOfAny (specialCharacters);
-			while (i != -1) {
-				str = str.Substring (0, i) + '%' + ((int) str [i]).ToString ("X") + str.Substring (i + 1);
-				i = str.IndexOfAny (specialCharacters, i + 3);
-			}
-			return str;
-		}
-		
-		string GetRootFileName (string configuration, DateTime date)
-		{
-			var filteredConfiguration = EscapeFilename (configuration);
-			return storeId + "-" + filteredConfiguration + "-" + date.ToString ("yyyy-MM-dd", CultureInfo.InvariantCulture) + ".xml";
-		}
-		
-		DateTime ParseFileNameDate (string configuration, string fileName)
-		{
-			fileName = Path.GetFileNameWithoutExtension (fileName);
-			fileName = fileName.Substring (storeId.Length + configuration.Length + 2);
-			return DateTime.ParseExact (fileName, "yyyy-MM-dd", CultureInfo.InvariantCulture);
-		}
-		
-		DateTime[] GetStoreDates (string configuration)
-		{
-			if (!Directory.Exists (basePath))
-				return new DateTime [0];
-			
-			DateTime[] res = (DateTime[]) cachedRootList [configuration];
-			if (res != null)
-				return res;
-			
-			var dates = new List<DateTime> ();
-			var escapedConfiguration = EscapeFilename (configuration);
-			foreach (string file in Directory.GetFiles (basePath, storeId + "-" + escapedConfiguration + "-*")) {
-				try {
-					DateTime t = ParseFileNameDate (escapedConfiguration, Path.GetFileName (file));
-					dates.Add (t);
-				} catch { }
-			}
-			res = dates.ToArray ();
-			cachedRootList [configuration] = res;
-			return res;
-		}
-	}
-	
-	/// <summary>
-	/// Encapsulates serialization/deserialization logic
-	/// </summary>
-	public interface IResultsStoreSerializer
-	{
-		/// <summary>
-		/// Serialize the record into the specified path.
-		/// </summary>
-		void Serialize(string filePath, TestRecord testRecord);
-		
-		/// <summary>
-		/// Deserialize the TestRecord from the sepcified path if possible.
-		/// Return null if deserialization is impossible.
-		/// </summary>
-		TestRecord Deserialize(string filePath);
-	}
-	
-	[Serializable]
-	public class TestRecord
-	{
-		string name;
-		UnitTestResultCollection results;
-		TestRecordCollection tests;
-		internal bool Modified;
-		
-		[XmlAttribute]
-		public string Name {
-			get { return name; }
-			set { name = value; }
-		}
-		
-		public UnitTestResultCollection Results {
-			get { return results; }
-			set { results = value; }
-		}
-		
-		public TestRecordCollection Tests {
-			get { return tests; }
-			set { tests = value; }
-		}
-	}
-	
-	[Serializable]
-	public class TestRecordCollection: CollectionBase
-	{
-		public new TestRecord this [int n] {
-			get { return (TestRecord) ((IList)this) [n]; }
-		}
-		
-		public new TestRecord this [string name] {
-			get {
-				for (int n=0; n<List.Count; n++)
-					if (((TestRecord)List [n]).Name == name)
-						return (TestRecord) List [n];
-				return null;
-			}
-		}
-		
-		public void Add (TestRecord test)
-		{
-			((IList)this).Add (test);
-		}
-	}
-	
-	[Serializable]
-	public class UnitTestResultCollection: CollectionBase
-	{
-		public new UnitTestResult this [int n] {
-			get { return (UnitTestResult) ((IList)this) [n]; }
-		}
-		
-		public void Add (UnitTestResult test)
-		{
-			((IList)this).Add (test);
-		}
-	}	
-}
diff --git a/main/src/addins/NUnit/Services/BinaryResultsStore.cs b/main/src/addins/NUnit/Services/BinaryResultsStore.cs
deleted file mode 100644
index c6d0eca036..0000000000
--- a/main/src/addins/NUnit/Services/BinaryResultsStore.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// BinaryResultsStore.cs
-//
-// Author:
-//       Sergey Khabibullin <sergey@khabibullin.com>
-//
-// Copyright (c) 2014 Sergey Khabibullin
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using ICSharpCode.NRefactory.Utils;
-using System.Xml.Serialization;
-using System.IO;
-
-namespace MonoDevelop.NUnit
-{
-	/// <summary>
-	/// ResultsStore implementation that uses binary serializer
-	/// </summary>
-	public class BinaryResultsStore : AbstractResultsStore
-	{
-		static BinaryResultsStoreSerializer serializer = new BinaryResultsStoreSerializer();
-
-		public BinaryResultsStore (string directory, string storeId)
-			: base(serializer, directory, storeId)
-		{
-		}
-	}
-
-	/// <summary>
-	/// Serializer implementation that uses ICSharpCode.NRefactory.Utils.FastSerializer
-	/// as it's main method to serialize test records. The serializer is backward compatible
-	/// with the old xml-based serialization and will deserialize test record from xml
-	/// if the binary form is not yet present.
-	/// </summary>
-	public class BinaryResultsStoreSerializer : IResultsStoreSerializer
-	{
-		const string binaryExtension = ".test-result";
-		const string xmlExtension = ".xml";
-
-		FastSerializer fastSerializer = new FastSerializer();
-		XmlSerializer xmlSerializer = new XmlSerializer(typeof(TestRecord));
-
-		public void Serialize (string xmlFilePath, TestRecord testRecord)
-		{
-			// no need for xml serialization because next time it will be
-			// deserialized from the binary format
-			string binaryFilePath = GetBinaryFilePath (xmlFilePath);
-			using (var stream = File.OpenWrite(binaryFilePath)) {
-				fastSerializer.Serialize (stream, testRecord);
-			}
-		}
-
-		public TestRecord Deserialize (string xmlFilePath)
-		{
-			string binaryFilePath = GetBinaryFilePath (xmlFilePath);
-
-			// deserialize from the binary format if the file exists
-			if (File.Exists(binaryFilePath)) {
-				using (var stream = File.OpenRead (binaryFilePath)) {
-					return (TestRecord) fastSerializer.Deserialize (stream);
-				}
-			}
-
-			// deserialize from xml if the file exists
-			if (File.Exists(xmlFilePath)) {
-				using (var reader = new StreamReader (xmlFilePath)) {
-					return (TestRecord) xmlSerializer.Deserialize (reader);
-				}
-			}
-
-			return null;
-		}
-
-		string GetBinaryFilePath(string xmlFilePath)
-		{
-			// filename with the binary extension
-			return xmlFilePath.Substring (0, xmlFilePath.Length - xmlExtension.Length) + binaryExtension;
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/ExternalTestRunner.cs b/main/src/addins/NUnit/Services/ExternalTestRunner.cs
deleted file mode 100644
index ea9f51d972..0000000000
--- a/main/src/addins/NUnit/Services/ExternalTestRunner.cs
+++ /dev/null
@@ -1,423 +0,0 @@
-//
-// ExternalTestRunner.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Reflection;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using System.Text;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using NUnit.Core;
-using NUnit.Util;
-using NF = NUnit.Framework;
-using NC = NUnit.Core;
-
-namespace MonoDevelop.NUnit.External
-{
-	class ExternalTestRunner: RemoteProcessObject
-	{
-		NUnitTestRunner runner;
-
-		public ExternalTestRunner ()
-		{
-			// In some cases MS.NET can't properly resolve assemblies even if they
-			// are already loaded. For example, when deserializing objects from remoting.
-			AppDomain.CurrentDomain.AssemblyResolve += delegate (object s, ResolveEventArgs args) {
-				foreach (Assembly am in AppDomain.CurrentDomain.GetAssemblies ()) {
-					if (am.GetName ().FullName == args.Name)
-						return am;
-				}
-				return null;
-			};
-			
-			// Add standard services to ServiceManager
-			ServiceManager.Services.AddService (new DomainManager ());
-			ServiceManager.Services.AddService (new ProjectService ());
-			ServiceManager.Services.AddService (new AddinRegistry ());
-			ServiceManager.Services.AddService (new AddinManager ());
-			ServiceManager.Services.AddService (new TestAgency ());
-			
-			// Initialize services
-			ServiceManager.Services.InitializeServices ();
-			
-			// Preload the runner assembly. Required because TestNameFilter is implemented there
-			string asm = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "NUnitRunner.dll");
-			Assembly.LoadFrom (asm);
-		}
-
-		public UnitTestResult Run (IRemoteEventListener listener, ITestFilter filter, string path, string suiteName, List<string> supportAssemblies, string testRunnerType, string testRunnerAssembly, string crashLogFile)
-		{
-			NUnitTestRunner runner = GetRunner (path);
-			EventListenerWrapper listenerWrapper = listener != null ? new EventListenerWrapper (listener) : null;
-			
-			UnhandledExceptionEventHandler exceptionHandler = (object sender, UnhandledExceptionEventArgs e) => {
-				
-				var ex = new RemoteUnhandledException ((Exception) e.ExceptionObject);
-				File.WriteAllText (crashLogFile, ex.Serialize ());
-			};
-
-			AppDomain.CurrentDomain.UnhandledException += exceptionHandler;
-			try {
-				TestResult res = runner.Run (listenerWrapper, filter, path, suiteName, supportAssemblies, testRunnerType, testRunnerAssembly);
-				return listenerWrapper.GetLocalTestResult (res);
-			} finally {
-				AppDomain.CurrentDomain.UnhandledException -= exceptionHandler;
-			}
-		}
-		
-		public NunitTestInfo GetTestInfo (string path, List<string> supportAssemblies)
-		{
-			NUnitTestRunner runner = GetRunner (path);
-			return runner.GetTestInfo (path, supportAssemblies);
-		}
-		
-		NUnitTestRunner GetRunner (string assemblyPath)
-		{
-			TestPackage package = new TestPackage (assemblyPath);
-			package.Settings ["ShadowCopyFiles"] = false;
-			
-			AppDomain domain = Services.DomainManager.CreateDomain (package);
-			string asm = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "NUnitRunner.dll");
-			runner = (NUnitTestRunner)domain.CreateInstanceFromAndUnwrap (asm, "MonoDevelop.NUnit.External.NUnitTestRunner");
-			runner.PreloadAssemblies (typeof(NF.Assert).Assembly.Location, typeof (NC.TestSuiteBuilder).Assembly.Location, typeof(NC.Test).Assembly.Location);
-			runner.Initialize ();
-			return runner;
-		}
-	}
-	
-	class EventListenerWrapper: MarshalByRefObject, EventListener
-	{
-		IRemoteEventListener wrapped;
-		StringBuilder consoleOutput;
-		StringBuilder consoleError;
-		
-		public EventListenerWrapper (IRemoteEventListener wrapped)
-		{
-			this.wrapped = wrapped;
-		}
-		
-		public void RunFinished (Exception exception)
-		{
-		}
-		
-		public void RunFinished (TestResult results)
-		{
-		}
-		
-		public void RunStarted (string name, int testCount)
-		{
-		}
-		
-		public void SuiteFinished (TestResult result)
-		{
-			wrapped.SuiteFinished (GetTestName (result.Test), GetLocalTestResult (result));
-		}
-
-		public void SuiteStarted (TestName suite)
-		{
-			wrapped.SuiteStarted (GetTestName (suite));
-		}
-		
-		public void TestFinished (TestResult result)
-		{
-			wrapped.TestFinished (GetTestName (result.Test), GetLocalTestResult (result));
-		}
-		
-		public void TestOutput (TestOutput testOutput)
-		{
-			if (consoleOutput == null) {
-				Console.WriteLine (testOutput.Text);
-				return;
-			}
-			else if (testOutput.Type == TestOutputType.Out)
-				consoleOutput.Append (testOutput.Text);
-			else
-				consoleError.Append (testOutput.Text);
-		}
-		
-		public void TestStarted (TestName testCase)
-		{
-			wrapped.TestStarted (GetTestName (testCase));
-			consoleOutput = new StringBuilder ();
-			consoleError = new StringBuilder ();
-		}
-		
-		public override object InitializeLifetimeService ()
-		{
-			return null;
-		}
-		
-		string GetTestName (ITest t)
-		{
-			if (t == null)
-				return null;
-			return t.TestName.FullName;
-		}
-		
-		public string GetTestName (TestName t)
-		{
-			if (t == null)
-				return null;
-			return t.FullName;
-		}
-		
-		public UnitTestResult GetLocalTestResult (TestResult t)
-		{
-
-			UnitTestResult res = new UnitTestResult ();
-			var summary = new ResultSummarizer (t);
-			res.Failures = summary.Failures;
-			res.Errors = summary.Errors;
-			res.Ignored = summary.Ignored;
-			res.Inconclusive = summary.Inconclusive;
-			res.NotRunnable = summary.NotRunnable;
-			res.Passed = summary.Passed;
-			res.StackTrace = t.StackTrace;
-			res.Time = TimeSpan.FromSeconds (t.Time);
-
-			res.Message = t.Message;
-			if (string.IsNullOrEmpty (res.Message)) {
-				if (res.IsFailure)
-					res.Message = GettextCatalog.GetString ("Test failed");
-				else if (!t.Executed)
-					res.Message = GettextCatalog.GetString ("Test ignored");
-				else {
-					res.Message = GettextCatalog.GetString ("Test successful") + "\n\n";
-					res.Message += GettextCatalog.GetString ("Execution time: {0:0.00}ms", t.Time);
-				}
-			}
-
-			if (consoleOutput != null) {
-				res.ConsoleOutput = consoleOutput.ToString ();
-				res.ConsoleError = consoleError.ToString ();
-				consoleOutput = null;
-				consoleError = null;
-			}
-			
-			return res;
-		}
-
-		public void UnhandledException (Exception exception)
-		{
-		}
-	}
-	
-	interface IRemoteEventListener
-	{
-		void TestStarted (string testCase);
-		void TestFinished (string test, UnitTestResult result);
-		void SuiteStarted (string suite);
-		void SuiteFinished (string suite, UnitTestResult result);
-	}
-	
-	class LocalTestMonitor: MarshalByRefObject, IRemoteEventListener
-	{
-		TestContext context;
-		UnitTest rootTest;
-//		string rootFullName;
-		UnitTest runningTest;
-		bool singleTestRun;
-		UnitTestResult singleTestResult;
-		public bool Canceled;
-
-		public LocalTestMonitor (TestContext context, UnitTest rootTest, string rootFullName, bool singleTestRun)
-		{
-//			this.rootFullName = rootFullName;
-			this.rootTest = rootTest;
-			this.context = context;
-			this.singleTestRun = singleTestRun;
-		}
-		
-		public UnitTest RunningTest {
-			get { return runningTest; }
-		}
-		
-		internal UnitTestResult SingleTestResult {
-			get {
-				if (singleTestResult == null)
-					singleTestResult = new UnitTestResult ();
-				return singleTestResult;
-			}
-			set {
-				singleTestResult = value;
-			}
-		}
-		
-		void IRemoteEventListener.TestStarted (string testCase)
-		{
-			if (singleTestRun || Canceled)
-				return;
-			
-			UnitTest t = GetLocalTest (testCase);
-			if (t == null)
-				return;
-			
-			runningTest = t;
-			context.Monitor.BeginTest (t);
-			t.Status = TestStatus.Running;
-		}
-			
-		void IRemoteEventListener.TestFinished (string test, UnitTestResult result)
-		{
-			if (Canceled)
-				return;
-			if (singleTestRun) {
-				SingleTestResult = result;
-				return;
-			}
-			
-			UnitTest t = GetLocalTest (test);
-			if (t == null)
-				return;
-			
-			t.RegisterResult (context, result);
-			context.Monitor.EndTest (t, result);
-			t.Status = TestStatus.Ready;
-			runningTest = null;
-		}
-
-		void IRemoteEventListener.SuiteStarted (string suite)
-		{
-			if (singleTestRun || Canceled)
-				return;
-			
-			UnitTest t = GetLocalTest (suite);
-			if (t == null)
-				return;
-			
-			t.Status = TestStatus.Running;
-			context.Monitor.BeginTest (t);
-		}
-
-		void IRemoteEventListener.SuiteFinished (string suite, UnitTestResult result)
-		{
-			if (singleTestRun || Canceled)
-				return;
-			
-			UnitTest t = GetLocalTest (suite);
-			if (t == null)
-				return;
-			
-			t.RegisterResult (context, result);
-			t.Status = TestStatus.Ready;
-			context.Monitor.EndTest (t, result);
-		}
-		
-		UnitTest GetLocalTest (string sname)
-		{
-			if (sname == null)
-				return null;
-			if (sname == "<root>")
-				return rootTest;
-			/*
-			if (sname.StartsWith (rootFullName)) {
-				sname = sname.Substring (rootFullName.Length);
-			}
-			if (sname.StartsWith ("."))
-				sname = sname.Substring (1);*/
-			UnitTest tt = FindTest (rootTest, sname);
-			return tt;
-		}
-		
-		UnitTest FindTest (UnitTest t, string testPath)
-		{
-			var group = t as UnitTestGroup;
-			if (group == null)
-				return null;
-			return SearchRecursive (group, testPath);
-		}
-
-		UnitTest SearchRecursive (UnitTestGroup group, string testPath)
-		{
-			UnitTest result;
-			foreach (var t in group.Tests) {
-				if (t.TestId == testPath)
-					return t;
-				var childGroup = t as UnitTestGroup;
-				if (childGroup != null) {
-					result = SearchRecursive (childGroup, testPath);
-					if (result != null)
-						return result;
-				}
-			}
-			return null;
-		}
-		
-		public override object InitializeLifetimeService ()
-		{
-			return null;
-		}
-	}	
-
-	/// <summary>
-	/// Exception class that can be serialized
-	/// </summary>
-	class RemoteUnhandledException: Exception
-	{
-		string stack;
-
-		public RemoteUnhandledException (string exceptionName, string message, string stack): base (message)
-		{
-			RemoteExceptionName = exceptionName;
-			this.stack = stack;
-		}
-
-		public RemoteUnhandledException (Exception ex): base (ex.Message)
-		{
-			RemoteExceptionName = ex.GetType().Name;
-			this.stack = ex.StackTrace;
-		}
-
-		public string Serialize ()
-		{
-			return RemoteExceptionName + "\n" + Message.Replace ('\r',' ').Replace ('\n',' ') + "\n" + StackTrace;
-		}
-
-		public static RemoteUnhandledException Parse (string s)
-		{
-			int i = s.IndexOf ('\n');
-			string name = s.Substring (0, i++);
-			int i2 = s.IndexOf ('\n', i);
-			return new RemoteUnhandledException (name, s.Substring (i, i2 - i), s.Substring (i2 + 1));
-		}
-
-		public string RemoteExceptionName { get; set; }
-
-		public override string StackTrace {
-			get {
-				return stack;
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/GeneralTestOptions.cs b/main/src/addins/NUnit/Services/GeneralTestOptions.cs
deleted file mode 100644
index 59b9e1fb39..0000000000
--- a/main/src/addins/NUnit/Services/GeneralTestOptions.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// GeneralTestOptions.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-
-namespace MonoDevelop.NUnit
-{
-	public class GeneralTestOptions: ICloneable
-	{
-		public object Clone ()
-		{
-			return new GeneralTestOptions ();
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/IResultsStore.cs b/main/src/addins/NUnit/Services/IResultsStore.cs
deleted file mode 100644
index 4d6e69846e..0000000000
--- a/main/src/addins/NUnit/Services/IResultsStore.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// IResultsStore.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace MonoDevelop.NUnit
-{
-	public interface IResultsStore
-	{
-		void RegisterResult (string configuration, UnitTest test, UnitTestResult result);
-		
-		UnitTestResult GetLastResult (string configuration, UnitTest test, DateTime date);
-		UnitTestResult GetNextResult (string configuration, UnitTest test, DateTime date);
-		UnitTestResult GetPreviousResult (string configuration, UnitTest test, DateTime date);
-		UnitTestResult[] GetResults (string configuration, UnitTest test, DateTime startDate, DateTime endDate);
-		UnitTestResult[] GetResultsToDate (string configuration, UnitTest test, DateTime endDate, int count);
-		
-		void Save ();
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/ITestProgressMonitor.cs b/main/src/addins/NUnit/Services/ITestProgressMonitor.cs
deleted file mode 100644
index 96fbc51e5f..0000000000
--- a/main/src/addins/NUnit/Services/ITestProgressMonitor.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// ITestProgressMonitor.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace MonoDevelop.NUnit
-{
-	public interface ITestProgressMonitor
-	{
-		void BeginTest (UnitTest test);
-		void EndTest (UnitTest test, UnitTestResult result);
-		void ReportRuntimeError (string message, Exception exception);
-		void WriteGlobalLog (string message);
-		
-		bool IsCancelRequested { get; }
-		event TestHandler CancelRequested;
-	}
-	
-	public delegate void TestHandler ();
-}
-
diff --git a/main/src/addins/NUnit/Services/ITestProvider.cs b/main/src/addins/NUnit/Services/ITestProvider.cs
deleted file mode 100644
index d02a417fb6..0000000000
--- a/main/src/addins/NUnit/Services/ITestProvider.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// ITestProvider.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.NUnit
-{
-	public interface ITestProvider
-	{
-		UnitTest CreateUnitTest (IWorkspaceObject entry);
-		Type[] GetOptionTypes ();
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs b/main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
deleted file mode 100644
index 2cff607204..0000000000
--- a/main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
+++ /dev/null
@@ -1,759 +0,0 @@
-//
-// NUnitAssemblyTestSuite.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Reflection;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using System.Runtime.Serialization.Formatters.Binary;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using NUnit.Core;
-using NUnit.Core.Filters;
-using MonoDevelop.NUnit.External;
-using MonoDevelop.Ide;
-using System.Xml.Linq;
-using System.Linq;
-using System.Globalization;
-
-namespace MonoDevelop.NUnit
-{
-	public abstract class NUnitAssemblyTestSuite: UnitTestGroup
-	{
-		object locker = new object ();
-		UnitTest[] oldList;
-		TestInfoCache testInfoCache = new TestInfoCache ();
-		bool cacheLoaded;
-		DateTime lastAssemblyTime;
-
-		static Queue<LoadData> loadQueue = new Queue<LoadData> ();
-		static bool loaderRunning;
-
-		public virtual IList<string> UserAssemblyPaths {
-			get {
-				return null;
-			}
-		}
-
-		public NUnitAssemblyTestSuite (string name): base (name)
-		{
-		}
-
-		public NUnitAssemblyTestSuite (string name, SolutionItem ownerSolutionItem): base (name, ownerSolutionItem)
-		{
-		}
-		
-		public override void Dispose ()
-		{
-			try {
-				if (TestInfoCachePath != null) {
-					testInfoCache.Write (TestInfoCachePath);
-				}
-			} catch {
-			}
-			base.Dispose ();
-		}
-		
-		public override bool HasTests {
-			get {
-				return true;
-			}
-		}
-
-		public virtual void GetCustomTestRunner (out string assembly, out string type)
-		{
-			assembly = type = null;
-		}
-
-		public virtual void GetCustomConsoleRunner (out string command, out string args)
-		{
-			command = args = null;
-		}
-
-		ProcessExecutionCommand GetCustomConsoleRunnerCommand ()
-		{
-			string file, args;
-
-			GetCustomConsoleRunner (out file, out args);
-			file = file != null ? file.Trim () : null;
-			if (string.IsNullOrEmpty (file))
-				return null;
-
-			var cmd = Runtime.ProcessService.CreateCommand (file);
-			cmd.Arguments = args;
-			return cmd;
-		}
-
-		protected override void OnActiveConfigurationChanged ()
-		{
-			UpdateTests ();
-			base.OnActiveConfigurationChanged ();
-		}
-		
-		internal SourceCodeLocation GetSourceCodeLocation (UnitTest test)
-		{
-			return GetSourceCodeLocation (test.FixtureTypeNamespace, test.FixtureTypeName, test.Name);
-		}
-		
-		protected virtual SourceCodeLocation GetSourceCodeLocation (string fixtureTypeNamespace, string fixtureTypeName, string methodName)
-		{
-			return null;
-		}
-		
-		public override int CountTestCases ()
-		{
-			lock (locker) {
-				if (Status == TestStatus.Loading)
-					Monitor.Wait (locker, 10000);
-			}
-			return base.CountTestCases ();
-		}
-		
-		protected bool RefreshRequired {
-			get {
-				return lastAssemblyTime != GetAssemblyTime ();
-			}
-		}
-
-		public override IAsyncOperation Refresh ()
-		{
-			AsyncOperation oper = new AsyncOperation ();
-			System.Threading.ThreadPool.QueueUserWorkItem (delegate {
-				lock (locker) {
-					try {
-						while (Status == TestStatus.Loading) {
-							Monitor.Wait (locker);
-						}
-						if (RefreshRequired) {
-							lastAssemblyTime = GetAssemblyTime ();
-							UpdateTests ();
-							OnCreateTests (); // Force loading
-							while (Status == TestStatus.Loading) {
-								Monitor.Wait (locker);
-							}
-						}
-						oper.SetCompleted (true);
-					} catch {
-						oper.SetCompleted (false);
-					}
-				}
-			});
-			return oper;
-		}
-		
-		DateTime GetAssemblyTime ()
-		{
-			string path = AssemblyPath;
-			if (File.Exists (path))
-				return File.GetLastWriteTime (path);
-			else
-				return DateTime.MinValue;
-		}
-
-		
-		protected override void OnCreateTests ()
-		{
-			lock (locker) {
-				if (Status == TestStatus.Loading)
-					return;
-					
-				NunitTestInfo ti = testInfoCache.GetInfo (AssemblyPath);
-				if (ti != null) {
-					FillTests (ti);
-					return;
-				}
-				
-				Status = TestStatus.Loading;
-			}
-			
-			lastAssemblyTime = GetAssemblyTime ();
-			
-			if (oldList != null) {
-				foreach (UnitTest t in oldList)
-					Tests.Add (t);
-			}
-
-			OnTestStatusChanged ();
-
-			LoadData ld = new LoadData ();
-			ld.Path = AssemblyPath;
-			ld.TestInfoCachePath = cacheLoaded ? null : TestInfoCachePath;
-			ld.Callback = delegate {
-				DispatchService.GuiDispatch (delegate {
-					AsyncCreateTests (ld);
-				});
-			};
-			ld.SupportAssemblies = new List<string> (SupportAssemblies);
-			
-			AsyncLoadTest (ld);
-
-			// Read the cache from disk only once
-			cacheLoaded = true;
-		}
-		
-		void AsyncCreateTests (object ob)
-		{
-			TestStatus newStatus = TestStatus.Ready;
-			
-			try {
-				LoadData loadData = (LoadData) ob;
-				
-				if (loadData.Error != null) {
-					newStatus = TestStatus.LoadError;
-					return;
-				}
-				
-				Tests.Clear ();
-
-				if (loadData.Info == null) {
-					oldList = new UnitTest [0];
-					return;
-				}
-
-				FillTests (loadData.Info);
-				
-				// If the async loader has loaded a cache, reuse it.
-				if (loadData.InfoCache != null)
-					testInfoCache = loadData.InfoCache;
-				
-				testInfoCache.SetInfo (AssemblyPath, loadData.Info);
-			}
-			catch (Exception ex) {
-				LoggingService.LogError (ex.ToString ());
-				newStatus = TestStatus.LoadError;
-			}
-			finally {
-				lock (locker) {
-					Status = newStatus;
-					Monitor.PulseAll (locker);
-				}
-				OnTestChanged ();
-			}
-		}
-		
-		void FillTests (NunitTestInfo ti)
-		{
-			if (ti.Tests == null)
-				return;
-			foreach (NunitTestInfo test in ti.Tests) {
-				UnitTest newTest;
-				if (test.Tests != null)
-					newTest = new NUnitTestSuite (this, test);
-				else
-					newTest = new NUnitTestCase (this, test, test.PathName);
-				newTest.FixtureTypeName = test.FixtureTypeName;
-				newTest.FixtureTypeNamespace = test.FixtureTypeNamespace;
-				Tests.Add (newTest);
-
-			}
-			oldList = new UnitTest [Tests.Count];
-			Tests.CopyTo (oldList, 0);
-		}
-		
-		static void AsyncLoadTest (LoadData ld)
-		{
-			lock (loadQueue) {
-				if (!loaderRunning) {
-					Thread t = new Thread (new ThreadStart (RunAsyncLoadTest));
-					t.Name = "NUnit test loader";
-					t.IsBackground = true;
-					t.Start ();
-					loaderRunning = true;
-				}
-				loadQueue.Enqueue (ld);
-				Monitor.Pulse (loadQueue);
-			}
-		}
-		
-		static void RunAsyncLoadTest ()
-		{
-			while (true) {
-				LoadData ld;
-				lock (loadQueue) {
-					if (loadQueue.Count == 0) {
-						if (!Monitor.Wait (loadQueue, 5000, true)) {
-							loaderRunning = false;
-							return;
-						}
-					}
-					ld = (LoadData)loadQueue.Dequeue ();
-				}
-				
-				try {
-					// If the information is cached in a file and it is up to date information,
-					// there is no need to parse again the assembly.
-
-					if (ld.TestInfoCachePath != null && File.Exists (ld.TestInfoCachePath)) {
-						ld.InfoCache = TestInfoCache.Read (ld.TestInfoCachePath);
-						NunitTestInfo info = ld.InfoCache.GetInfo (ld.Path);
-						if (info != null) {
-							ld.Info = info;
-							ld.Callback (ld);
-							continue;
-						}
-					}
-				} catch (Exception ex) {
-					LoggingService.LogError (ex.ToString ());
-				}
-
-				ExternalTestRunner runner = null;
-
-				try {
-					if (File.Exists (ld.Path)) {
-						runner = (ExternalTestRunner)Runtime.ProcessService.CreateExternalProcessObject (typeof(ExternalTestRunner), false);
-						ld.Info = runner.GetTestInfo (ld.Path, ld.SupportAssemblies);
-					}
-				} catch (Exception ex) {

-					Console.WriteLine (ex);
-					ld.Error = ex;
-				}
-				finally {
-					try {
-						if (runner != null)
-							runner.Dispose ();
-					} catch {}
-				}
-
-				try {
-					ld.Callback (ld);
-				} catch {
-				}
-			}
-		}
-		
-		protected override UnitTestResult OnRun (TestContext testContext)
-		{
-			return RunUnitTest (this, "", "", null, testContext);
-		}
-
-		protected override bool OnCanRun (MonoDevelop.Core.Execution.IExecutionHandler executionContext)
-		{
-			var runnerCmd = GetCustomConsoleRunnerCommand ();
-			if (runnerCmd != null) {
-				return executionContext.CanExecute (runnerCmd);
-			}
-			return Runtime.ProcessService.IsValidForRemoteHosting (executionContext);
-		}
-
-		public string[] CollectTests (UnitTestGroup group)
-		{
-			List<string> result = new List<string> ();
-			foreach (var t in group.Tests) {
-				if (t.IsExplicit)
-					continue;
-				if (t is UnitTestGroup) {
-					result.AddRange (CollectTests ((UnitTestGroup)t));
-				} else {
-					result.Add (t.TestId);
-				}
-			}
-			return result.ToArray ();
-		}
-
-		internal UnitTestResult RunUnitTest (UnitTest test, string suiteName, string pathName, string testName, TestContext testContext)
-		{
-			var runnerExe = GetCustomConsoleRunnerCommand ();
-			if (runnerExe != null)
-				return RunWithConsoleRunner (runnerExe, test, suiteName, pathName, testName, testContext);
-
-			ExternalTestRunner runner = (ExternalTestRunner)Runtime.ProcessService.CreateExternalProcessObject (typeof(ExternalTestRunner), testContext.ExecutionContext, UserAssemblyPaths);
-			LocalTestMonitor localMonitor = new LocalTestMonitor (testContext, test, suiteName, testName != null);
-
-			ITestFilter filter = null;
-			if (test != null) {
-				if (test is UnitTestGroup) {
-					var categoryOptions = (NUnitCategoryOptions) test.GetOptions (typeof(NUnitCategoryOptions));
-					if (categoryOptions.EnableFilter && categoryOptions.Categories.Count > 0) {
-						string[] cats = new string [categoryOptions.Categories.Count];
-						categoryOptions.Categories.CopyTo (cats, 0);
-						filter = new CategoryFilter (cats);
-						if (categoryOptions.Exclude)
-							filter = new NotFilter (filter);
-					} else {
-						filter = new TestNameFilter (CollectTests ((UnitTestGroup)test));
-					}
-				} else {
-					filter = new TestNameFilter (test.TestId);
-				}
-			}
-
-			RunData rd = new RunData ();
-			rd.Runner = runner;
-			rd.Test = this;
-			rd.LocalMonitor = localMonitor;
-			testContext.Monitor.CancelRequested += new TestHandler (rd.Cancel);
-
-			UnitTestResult result;
-			var crashLogFile = Path.GetTempFileName ();
-
-			try {
-				if (string.IsNullOrEmpty (AssemblyPath)) {
-					string msg = GettextCatalog.GetString ("Could not get a valid path to the assembly. There may be a conflict in the project configurations.");
-					throw new Exception (msg);
-				}

-				System.Runtime.Remoting.RemotingServices.Marshal (localMonitor, null, typeof (IRemoteEventListener));
-
-				string testRunnerAssembly, testRunnerType;
-				GetCustomTestRunner (out testRunnerAssembly, out testRunnerType);
-
-				result = runner.Run (localMonitor, filter, AssemblyPath, "", new List<string> (SupportAssemblies), testRunnerType, testRunnerAssembly, crashLogFile);
-				if (testName != null)
-					result = localMonitor.SingleTestResult;
-				
-				ReportCrash (testContext, crashLogFile);
-				
-			} catch (Exception ex) {
-				if (ReportCrash (testContext, crashLogFile)) {
-					result = UnitTestResult.CreateFailure (GettextCatalog.GetString ("Unhandled exception"), null);
-				}
-				else if (!localMonitor.Canceled) {
-					LoggingService.LogError (ex.ToString ());
-					if (localMonitor.RunningTest != null) {
-						RuntimeErrorCleanup (testContext, localMonitor.RunningTest, ex);
-					} else {
-						testContext.Monitor.ReportRuntimeError (null, ex);
-						throw;
-					}
-					result = UnitTestResult.CreateFailure (ex);
-				} else {
-					result = UnitTestResult.CreateFailure (GettextCatalog.GetString ("Canceled"), null);
-				}
-			} finally {
-				File.Delete (crashLogFile);
-				testContext.Monitor.CancelRequested -= new TestHandler (rd.Cancel);
-				runner.Dispose ();
-				System.Runtime.Remoting.RemotingServices.Disconnect (localMonitor);
-			}
-			
-			return result;
-		}
-
-		bool ReportCrash (TestContext testContext, string crashLogFile)
-		{
-			var crash = File.ReadAllText (crashLogFile);
-			if (crash.Length == 0)
-				return false;
-
-			var ex = RemoteUnhandledException.Parse (crash);
-			testContext.Monitor.ReportRuntimeError (GettextCatalog.GetString ("Unhandled exception"), ex);
-			return true;
-		}
-
-		void RuntimeErrorCleanup (TestContext testContext, UnitTest t, Exception ex)
-		{
-			UnitTestResult result = UnitTestResult.CreateFailure (ex);
-			t.RegisterResult (testContext, result);
-			while (t != null && t != this) {
-				testContext.Monitor.EndTest (t, result);
-				t.Status = TestStatus.Ready;
-				t = t.Parent;
-			}
-		}
-
-		UnitTestResult RunWithConsoleRunner (ProcessExecutionCommand cmd, UnitTest test, string suiteName, string pathName, string testName, TestContext testContext)
-		{
-			var outFile = Path.GetTempFileName ();
-			LocalConsole cons = new LocalConsole ();
-
-			try {
-				MonoDevelop.NUnit.External.TcpTestListener tcpListener = null;
-				LocalTestMonitor localMonitor = new LocalTestMonitor (testContext, test, suiteName, testName != null);
-
-				if (!string.IsNullOrEmpty (cmd.Arguments))
-					cmd.Arguments += " ";
-				cmd.Arguments += "\"-xml=" + outFile + "\" " + AssemblyPath;
-
-				bool automaticUpdates = cmd.Command != null && (cmd.Command.Contains ("GuiUnit") || (cmd.Command.Contains ("mdtool.exe") && cmd.Arguments.Contains ("run-md-tests")));

-				if (!string.IsNullOrEmpty(pathName))

-					cmd.Arguments += " -run=" + test.TestId;
-				if (automaticUpdates) {
-					tcpListener = new MonoDevelop.NUnit.External.TcpTestListener (localMonitor, suiteName);
-					cmd.Arguments += " -port=" + tcpListener.Port;
-				}
-
-				// Note that we always dispose the tcp listener as we don't want it listening
-				// forever if the test runner does not try to connect to it
-				using (tcpListener) {
-					using (var p = testContext.ExecutionContext.Execute (cmd, cons)) {
-						testContext.Monitor.CancelRequested += p.Cancel;
-						if (testContext.Monitor.IsCancelRequested)
-							p.Cancel ();
-						p.WaitForCompleted ();
-						testContext.Monitor.CancelRequested -= p.Cancel;
-					}
-					
-					if (new FileInfo (outFile).Length == 0)
-						throw new Exception ("Command failed");
-				}
-
-				// mdtool.exe does not necessarily guarantee we get automatic updates. It just guarantees
-				// that if guiunit is being used then it will give us updates. If you have a regular test
-				// assembly compiled against nunit.framework.dll 
-				if (automaticUpdates && tcpListener.HasReceivedConnection) {
-					if (testName != null)
-						return localMonitor.SingleTestResult;
-					return test.GetLastResult ();
-				}
-
-				XDocument doc = XDocument.Load (outFile);
-
-				if (doc.Root != null) {
-					var root = doc.Root.Elements ("test-suite").FirstOrDefault ();
-					if (root != null) {
-						cons.SetDone ();
-						var ot = cons.Out.ReadToEnd ();
-						var et = cons.Error.ReadToEnd ();
-						testContext.Monitor.WriteGlobalLog (ot);
-						if (!string.IsNullOrEmpty (et)) {
-							testContext.Monitor.WriteGlobalLog ("ERROR:\n");
-							testContext.Monitor.WriteGlobalLog (et);
-						}
-
-						bool macunitStyle = doc.Root.Element ("environment") != null && doc.Root.Element ("environment").Attribute ("macunit-version") != null;
-						var result = ReportXmlResult (localMonitor, root, "", macunitStyle);
-						if (testName != null)
-							result = localMonitor.SingleTestResult;
-						return result;
-					}
-				}
-				throw new Exception ("Test results could not be parsed.");
-			} catch (Exception ex) {
-				cons.SetDone ();
-				var ot = cons.Out.ReadToEnd ();
-				var et = cons.Error.ReadToEnd ();
-				testContext.Monitor.WriteGlobalLog (ot);
-				if (!string.IsNullOrEmpty (et)) {
-					testContext.Monitor.WriteGlobalLog ("ERROR:\n");
-					testContext.Monitor.WriteGlobalLog (et);
-				}
-				testContext.Monitor.ReportRuntimeError ("Test execution failed.\n" + ot + "\n" + et, ex);
-				return UnitTestResult.CreateIgnored ("Test execution failed");
-			} finally {
-				File.Delete (outFile);
-				cons.Dispose ();
-			}
-		}
-
-		UnitTestResult ReportXmlResult (IRemoteEventListener listener, XElement elem, string testPrefix, bool macunitStyle)
-		{
-			UnitTestResult result = new UnitTestResult ();
-			var time = (string)elem.Attribute ("time");
-			if (time != null)
-				result.Time = TimeSpan.FromSeconds (double.Parse (time, CultureInfo.InvariantCulture));
-			result.TestDate = DateTime.Now;
-
-			var reason = elem.Element ("reason");
-			if (reason != null)
-				result.Message = (string) reason;
-
-			var failure = elem.Element ("failure");
-			if (failure != null) {
-				var msg = failure.Element ("message");
-				if (msg != null)
-					result.Message = (string)msg;
-				var stack = failure.Element ("stack-trace");
-				if (stack != null)
-					result.StackTrace = (string)stack;
-			}
-
-			switch ((string)elem.Attribute ("result")) {
-			case "Error":
-			case "Failure":
-				result.Status = ResultStatus.Failure;
-				break;
-			case "Success":
-				result.Status = ResultStatus.Success;
-				break;
-			case "Ignored":
-				result.Status = ResultStatus.Ignored;
-				break;
-			default:
-				result.Status = ResultStatus.Inconclusive;
-				break;
-			}
-
-			if (elem.Name == "test-suite") {
-				// nunitlite does not emit <test-suite type="Namespace" elements so we need to fake
-				// them by deconstructing the full type name and emitting the suite started events manually
-				var names = new List<string> ();
-				if (!macunitStyle || (string)elem.Attribute ("type") == "Assembly")
-					names.Add ("<root>");
-				else
-					names.AddRange (elem.Attribute ("name").Value.Split ('.'));
-
-				for (int i = 0; i < names.Count; i ++)
-					listener.SuiteStarted (testPrefix + string.Join (".", names.Take (i + 1)));
-
-				var name = (string)elem.Attribute ("type") == "Assembly" ? "<root>" : (string) elem.Attribute ("name");
-				var cts = elem.Element ("results");
-				if (cts != null) {
-					foreach (var ct in cts.Elements ()) {
-						var r = ReportXmlResult (listener, ct, name != "<root>" ? testPrefix + name + "." : "", macunitStyle);
-						result.Add (r);
-					}
-				}
-				for (int i = 0; i < names.Count; i ++)
-					listener.SuiteFinished (testPrefix + string.Join (".", names.Take (i + 1)), result);
-			} else {
-				string name = (string)elem.Attribute ("name");
-				switch (result.Status) {
-				case ResultStatus.Success:
-					result.Passed++;
-					break;
-				case ResultStatus.Failure:
-					result.Failures++;
-					break;
-				case ResultStatus.Ignored:
-					result.Ignored++;
-					break;
-				case ResultStatus.Inconclusive:
-					result.Inconclusive++;
-					break;
-				}
-
-				listener.TestStarted (name);
-				listener.TestFinished (name, result);
-			}
-			return result;
-		}
-		
-		protected abstract string AssemblyPath {
-			get;
-		}
-		
-		protected virtual IEnumerable<string> SupportAssemblies {
-			get { yield break; }
-		}
-		
-		// File where cached test info for this test suite will be saved
-		// Returns null by default which means that test info will not be saved.
-		protected virtual string TestInfoCachePath {
-			get { return null; }
-		}
-		
-		class LoadData
-		{
-			public string Path;
-			public string TestInfoCachePath;
-			public Exception Error;
-			public NunitTestInfo Info;
-			public TestInfoCache InfoCache;
-			public WaitCallback Callback;
-			public List<string> SupportAssemblies;
-		}
-		
-		class RunData
-		{
-			public ExternalTestRunner Runner;
-			public UnitTest Test;
-			public LocalTestMonitor LocalMonitor;
-			
-			public void Cancel ()
-			{
-				LocalMonitor.Canceled = true;
-				Runner.Shutdown ();
-				ClearRunningStatus (Test);
-			}
-			
-			void ClearRunningStatus (UnitTest t)
-			{
-				t.Status = TestStatus.Ready;
-				UnitTestGroup group = t as UnitTestGroup;
-				if (group == null) return;
-				foreach (UnitTest ct in group.Tests)
-					ClearRunningStatus (ct);
-			}
-		}
-		
-		[Serializable]
-		class TestInfoCache
-		{
-			Hashtable table = new Hashtable ();
-			
-			[NonSerialized]
-			bool modified;
-			
-			public void SetInfo (string path, NunitTestInfo info)
-			{
-				if (File.Exists (path)) {
-					CachedTestInfo cti = new CachedTestInfo ();
-					cti.LastWriteTime = File.GetLastWriteTime (path);
-					cti.Info = info;
-					table [path] = cti;
-					modified = true;
-				}
-			}
-			
-			public NunitTestInfo GetInfo (string path)
-			{
-				CachedTestInfo cti = (CachedTestInfo) table [path];
-				if (cti != null && File.Exists (path) && File.GetLastWriteTime (path) == cti.LastWriteTime)
-					return cti.Info;
-				else
-					return null;
-			}
-			
-			public static TestInfoCache Read (string file)
-			{
-				BinaryFormatter bf = new BinaryFormatter ();
-				Stream s = new FileStream (file, FileMode.Open, FileAccess.Read);
-				try {
-					return (TestInfoCache) bf.Deserialize (s);
-				} finally {
-					s.Close ();
-				}
-			}
-			
-			public void Write (string file)
-			{
-				if (modified) {
-					BinaryFormatter bf = new BinaryFormatter ();
-					Stream s = new FileStream (file, FileMode.Create, FileAccess.Write);
-					try {
-						bf.Serialize (s, this);
-					} finally {
-						s.Close ();
-					}
-				}
-			}
-		}
-		
-		[Serializable]
-		class CachedTestInfo
-		{
-			public DateTime LastWriteTime;
-			public NunitTestInfo Info;
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/NUnitOptions.cs b/main/src/addins/NUnit/Services/NUnitOptions.cs
deleted file mode 100644
index 277392bc17..0000000000
--- a/main/src/addins/NUnit/Services/NUnitOptions.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// NUnitCategoryOptions.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Text;
-using System.Collections;
-using System.Collections.Specialized;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.NUnit
-{
-	public class NUnitCategoryOptions: ICloneable
-	{
-		[ItemProperty ("Categories")]
-		[ItemProperty ("Category", ValueType=typeof(string), Scope="*")]
-		StringCollection categories = new StringCollection ();
-		
-		bool enableFilter;
-		bool exclude;
-		
-		public StringCollection Categories {
-			get { return categories; }
-		}
-		
-		[ItemProperty]
-		public bool EnableFilter {
-			get { return enableFilter; }
-			set { enableFilter = value; }
-		}
-		
-		[ItemProperty]
-		public bool Exclude {
-			get { return exclude; }
-			set { exclude = value; }
-		}
-		
-		public object Clone ()
-		{
-			NUnitCategoryOptions op = new NUnitCategoryOptions ();
-			op.enableFilter = enableFilter;
-			op.exclude = exclude;
-			op.categories = new StringCollection ();
-			foreach (string s in categories)
-				op.categories.Add (s);
-			return op;
-		}
-		
-		public override string ToString ()
-		{
-			if (EnableFilter && Categories.Count > 0) {
-				StringBuilder s = new StringBuilder ();
-				if (Exclude)
-					s.Append (GettextCatalog.GetString ("Exclude the following categories: "));
-				else
-					s.Append (GettextCatalog.GetString ("Include the following categories: "));
-				for (int n=0; n<Categories.Count; n++) {
-					if (n > 0) s.Append (", ");
-					s.Append (Categories [n]);
-				}
-				return s.ToString ();
-			} else
-				return "";
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/NUnitProjectServiceExtension.cs b/main/src/addins/NUnit/Services/NUnitProjectServiceExtension.cs
deleted file mode 100644
index d868a0fb66..0000000000
--- a/main/src/addins/NUnit/Services/NUnitProjectServiceExtension.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// NUnitProjectServiceExtension.cs
-//
-// Author:
-//   Lluis Sanchez Gual <lluis@novell.com>
-//
-// Copyright (c) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-//
-
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.NUnit
-{
-	public class NUnitProjectServiceExtension: ProjectServiceExtension
-	{
-		public override void Execute (MonoDevelop.Core.IProgressMonitor monitor, IBuildTarget item, ExecutionContext context, ConfigurationSelector configuration)
-		{
-			if (base.CanExecute (item, context, configuration)) {
-				// It is executable by default
-				base.Execute(monitor, item, context, configuration);
-				return;
-			} else if (item is IWorkspaceObject) {
-				UnitTest test = NUnitService.Instance.FindRootTest ((IWorkspaceObject)item);
-				if (test != null) {
-					IAsyncOperation oper = null;
-					DispatchService.GuiSyncDispatch (delegate {
-						oper = NUnitService.Instance.RunTest (test, context.ExecutionHandler, false, false);
-					});
-					if (oper != null) {
-						monitor.CancelRequested += delegate {
-							oper.Cancel ();
-						};
-						oper.WaitForCompleted ();
-					}
-				}
-			}
-		}
-		
-		public override bool CanExecute (IBuildTarget item, ExecutionContext context, ConfigurationSelector configuration)
-		{
-			// We check for DefaultExecutionHandlerFactory because the tests can't run using any other execution mode
-			
-			bool res = base.CanExecute (item, context, configuration);
-			if (!res && (item is IWorkspaceObject)) {
-				UnitTest test = NUnitService.Instance.FindRootTest ((IWorkspaceObject)item);
-				return (test != null) && test.CanRun (context.ExecutionHandler);
-			} else
-				return res;
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs b/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
deleted file mode 100644
index db55aebcac..0000000000
--- a/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-// NUnitProjectTestSuite.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System.IO;
-using System.Linq;
-using System.Collections.Generic;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
-using System;
-using ProjectReference = MonoDevelop.Projects.ProjectReference;
-
-namespace MonoDevelop.NUnit
-{
-	public class NUnitProjectTestSuite: NUnitAssemblyTestSuite
-	{
-		DotNetProject project;
-		string resultsPath;
-		string storeId;
-
-		public override IList<string> UserAssemblyPaths {
-			get {
-				return project.GetUserAssemblyPaths (IdeApp.Workspace.ActiveConfiguration);
-			}
-		}
-
-		public NUnitProjectTestSuite (DotNetProject project): base (project.Name, project)
-		{
-			storeId = Path.GetFileName (project.FileName);
-			resultsPath = MonoDevelop.NUnit.RootTest.GetTestResultsDirectory (project.BaseDirectory);
-			ResultsStore = new BinaryResultsStore (resultsPath, storeId);
-			this.project = project;
-			project.NameChanged += new SolutionItemRenamedEventHandler (OnProjectRenamed);
-			IdeApp.ProjectOperations.EndBuild += new BuildEventHandler (OnProjectBuilt);
-		}
-		
-		public static NUnitProjectTestSuite CreateTest (DotNetProject project)
-		{
-			if (!project.ParentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration).BuildEnabledForItem (project))
-				return null;
-
-			foreach (var p in project.References)
-				if (IsNUnitReference (p))
-					return new NUnitProjectTestSuite (project);
-			return null;
-		}
-
-		public static bool IsNUnitReference (ProjectReference p)
-		{
-			return p.Reference.IndexOf ("GuiUnit", StringComparison.OrdinalIgnoreCase) != -1 || p.Reference.IndexOf ("nunit.framework") != -1 || p.Reference.IndexOf ("nunit.core") != -1 || p.Reference.IndexOf ("nunitlite") != -1;
-		}
-
-		protected override SourceCodeLocation GetSourceCodeLocation (string fixtureTypeNamespace, string fixtureTypeName, string methodName)
-		{
-			if (string.IsNullOrEmpty (fixtureTypeName) || string.IsNullOrEmpty (fixtureTypeName))
-				return null;
-			var ctx = TypeSystemService.GetCompilation (project);
-			var cls = ctx.MainAssembly.GetTypeDefinition (fixtureTypeNamespace ?? "", fixtureTypeName, 0);
-			if (cls == null)
-				return null;
-			
-			if (cls.Name != methodName) {
-				foreach (var met in cls.GetMethods ()) {
-					if (met.Name == methodName)
-						return new SourceCodeLocation (met.Region.FileName, met.Region.BeginLine, met.Region.BeginColumn);
-				}
-				
-				int idx = methodName != null ? methodName.IndexOf ('(') : -1;
-				if (idx > 0) {
-					methodName = methodName.Substring (0, idx);
-					foreach (var met in cls.GetMethods ()) {
-						if (met.Name == methodName)
-							return new SourceCodeLocation (met.Region.FileName, met.Region.BeginLine, met.Region.BeginColumn);
-					}
-				}
-			}
-			return new SourceCodeLocation (cls.Region.FileName, cls.Region.BeginLine, cls.Region.BeginColumn);
-		}
-		
-		public override void Dispose ()
-		{
-			project.NameChanged -= new SolutionItemRenamedEventHandler (OnProjectRenamed);
-			IdeApp.ProjectOperations.EndBuild -= new BuildEventHandler (OnProjectBuilt);
-			base.Dispose ();
-		}
-		
-		void OnProjectRenamed (object sender, SolutionItemRenamedEventArgs e)
-		{
-			UnitTestGroup parent = Parent as UnitTestGroup;
-			if (parent != null)
-				parent.UpdateTests ();
-		}
-		
-		void OnProjectBuilt (object s, BuildEventArgs args)
-		{
-			if (RefreshRequired) {
-				UpdateTests ();
-			} else {
-				Gtk.Application.Invoke (delegate {
-					OnProjectBuiltWithoutTestChange (EventArgs.Empty);
-				});
-			}
-		}
-
-		public override void GetCustomTestRunner (out string assembly, out string type)
-		{
-			type = (string) project.ExtendedProperties ["TestRunnerType"];
-			var asm = project.ExtendedProperties ["TestRunnerAssembly"];
-			assembly = asm != null ? project.BaseDirectory.Combine (asm.ToString ()).ToString () : null;
-		}
-
-		public override void GetCustomConsoleRunner (out string command, out string args)
-		{
-			var r = project.ExtendedProperties ["TestRunnerCommand"];
-			command = r != null ? project.BaseDirectory.Combine (r.ToString ()).ToString () : null;
-			args = (string)project.ExtendedProperties ["TestRunnerArgs"];
-			if (command == null && args == null) {
-				var guiUnit = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Assembly && StringComparer.OrdinalIgnoreCase.Equals (Path.GetFileName (pref.Reference), "GuiUnit.exe"));
-				if (guiUnit != null) {
-					command = guiUnit.Reference;
-				}
-
-				var projectReference = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Project && pref.Reference.StartsWith ("GuiUnit", StringComparison.OrdinalIgnoreCase));
-				if (IdeApp.IsInitialized && command == null && projectReference != null) {
-					var guiUnitProject = IdeApp.Workspace.GetAllProjects ().First (f => f.Name == projectReference.Reference);
-					if (guiUnitProject != null)
-						command = guiUnitProject.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
-				}
-			}
-		}
-
-		protected override string AssemblyPath {
-			get { return project.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration); }
-		}
-		
-		protected override string TestInfoCachePath {
-			get { return Path.Combine (resultsPath, storeId + ".test-cache"); }
-		}
-		
-		protected override IEnumerable<string> SupportAssemblies {
-			get {
-				// Referenced assemblies which are not in the gac and which are not localy copied have to be preloaded
-				DotNetProject project = base.OwnerSolutionItem as DotNetProject;
-				if (project != null) {
-					foreach (var pr in project.References) {
-						if (pr.ReferenceType != ReferenceType.Package && !pr.LocalCopy && pr.ReferenceOutputAssembly) {
-							foreach (string file in pr.GetReferencedFileNames (IdeApp.Workspace.ActiveConfiguration))
-								yield return file;
-						}
-					}
-				}
-			}
-		}
-
-		public event EventHandler ProjectBuiltWithoutTestChange;
-
-		protected virtual void OnProjectBuiltWithoutTestChange (EventArgs e)
-		{
-			var handler = ProjectBuiltWithoutTestChange;
-			if (handler != null)
-				handler (this, e);
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/NUnitService.cs b/main/src/addins/NUnit/Services/NUnitService.cs
deleted file mode 100644
index 0e6503fb8a..0000000000
--- a/main/src/addins/NUnit/Services/NUnitService.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-//
-// NUnitService.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using Mono.Addins;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.NUnit
-{
-	public class NUnitService
-	{
-		static NUnitService instance;
-		
-		ArrayList providers = new ArrayList ();
-		UnitTest[] rootTests;
-		
-		private NUnitService ()
-		{
-			IdeApp.Workspace.WorkspaceItemOpened += OnWorkspaceChanged;
-			IdeApp.Workspace.WorkspaceItemClosed += OnWorkspaceChanged;
-			IdeApp.Workspace.ActiveConfigurationChanged += OnWorkspaceChanged;
-
-			IdeApp.Workspace.ItemAddedToSolution += OnItemsChangedInSolution;;
-			IdeApp.Workspace.ItemRemovedFromSolution += OnItemsChangedInSolution;
-			IdeApp.Workspace.ReferenceAddedToProject += OnReferenceChangedInProject;;
-			IdeApp.Workspace.ReferenceRemovedFromProject += OnReferenceChangedInProject;
-
-			Mono.Addins.AddinManager.AddExtensionNodeHandler ("/MonoDevelop/NUnit/TestProviders", OnExtensionChange);
-		}
-
-		public static NUnitService Instance {
-			get {
-				if (instance == null) {
-					instance = new NUnitService ();
-					instance.RebuildTests ();
-				}
-				return instance;
-			}
-		}
-
-		void OnExtensionChange (object s, ExtensionNodeEventArgs args)
-		{
-			if (args.Change == ExtensionChange.Add) {
-				ProjectService ps = MonoDevelop.Projects.Services.ProjectService;
-				ITestProvider provider = args.ExtensionObject as ITestProvider;
-				providers.Add (provider);
-				
-				Type[] types = provider.GetOptionTypes ();
-				if (types != null) {
-					foreach (Type t in types) {
-						if (!typeof(ICloneable).IsAssignableFrom (t)) {
-							LoggingService.LogError ("Option types must implement ICloneable: " + t);
-							continue;
-						}
-						ps.DataContext.IncludeType (t);
-					}
-				}
-			}
-			else {
-				ITestProvider provider = args.ExtensionObject as ITestProvider;
-				providers.Remove (provider);
-				
-				// The types returned by provider.GetOptionTypes should probably be unregistered
-				// from the DataContext, but DataContext does not allow unregisterig.
-				// This is not a big issue anyway.
-			}
-		}
-		
-		public IAsyncOperation RunTest (UnitTest test, IExecutionHandler context)
-		{
-			var result = RunTest (test, context, IdeApp.Preferences.BuildBeforeRunningTests);
-			result.Completed += (OperationHandler) DispatchService.GuiDispatch (new OperationHandler (OnTestSessionCompleted));
-			return result;
-		}
-		
-		public IAsyncOperation RunTest (UnitTest test, IExecutionHandler context, bool buildOwnerObject)
-		{
-			return RunTest (test, context, buildOwnerObject, true);
-		}
-
-		internal IAsyncOperation RunTest (UnitTest test, IExecutionHandler context, bool buildOwnerObject, bool checkCurrentRunOperation)
-		{
-			string testName = test.FullName;
-			
-			if (buildOwnerObject) {
-				IBuildTarget bt = test.OwnerObject as IBuildTarget;
-				if (bt != null && bt.NeedsBuilding (IdeApp.Workspace.ActiveConfiguration)) {
-					if (!IdeApp.ProjectOperations.CurrentRunOperation.IsCompleted) {
-						MonoDevelop.Ide.Commands.StopHandler.StopBuildOperations ();
-						IdeApp.ProjectOperations.CurrentRunOperation.WaitForCompleted ();
-					}
-	
-					AsyncOperation retOper = new AsyncOperation ();
-					
-					IAsyncOperation op = IdeApp.ProjectOperations.Build (bt);
-					retOper.TrackOperation (op, false);
-						
-					op.Completed += delegate {
-						// The completed event of the build operation is run in the gui thread,
-						// so we need a new thread, because refreshing must be async
-						System.Threading.ThreadPool.QueueUserWorkItem (delegate {
-							if (op.Success) {
-								RefreshTests ();
-								test = SearchTest (testName);
-								if (test != null) {
-									Gtk.Application.Invoke (delegate {
-										// RunTest must run in the gui thread
-										retOper.TrackOperation (RunTest (test, context, false), true);
-									});
-								}
-								else
-									retOper.SetCompleted (false);
-							}
-						});
-					};
-					
-					return retOper;
-				}
-			}
-			
-			if (checkCurrentRunOperation && !IdeApp.ProjectOperations.ConfirmExecutionOperation ())
-				return NullProcessAsyncOperation.Failure;
-			
-			Pad resultsPad = IdeApp.Workbench.GetPad <TestResultsPad>();
-			if (resultsPad == null) {
-				resultsPad = IdeApp.Workbench.ShowPad (new TestResultsPad (), "MonoDevelop.NUnit.TestResultsPad", GettextCatalog.GetString ("Test results"), "Bottom", "md-solution");
-			}
-			
-			// Make the pad sticky while the tests are runnig, so the results pad is always visible (even if minimized)
-			// That's required since when running in debug mode, the layout is automatically switched to debug.
-			
-			resultsPad.Sticky = true;
-			resultsPad.BringToFront ();
-			
-			TestSession session = new TestSession (test, context, (TestResultsPad) resultsPad.Content);
-			
-			session.Completed += delegate {
-				Gtk.Application.Invoke (delegate {
-					resultsPad.Sticky = false;
-				});
-			};
-
-			OnTestSessionStarting (new TestSessionEventArgs { Session = session, Test = test });
-
-			session.Start ();
-
-			if (checkCurrentRunOperation)
-				IdeApp.ProjectOperations.CurrentRunOperation = session;
-			
-			return session;
-		}
-		
-		public void RefreshTests ()
-		{
-			foreach (UnitTest t in RootTests)
-				t.Refresh ().WaitForCompleted ();
-		}
-		
-		public UnitTest SearchTest (string fullName)
-		{
-			foreach (UnitTest t in RootTests) {
-				UnitTest r = SearchTest (t, fullName);
-				if (r != null)
-					return r;
-			}
-			return null;
-		}
-
-		public UnitTest SearchTestById (string id)
-		{
-			foreach (UnitTest t in RootTests) {
-				UnitTest r = SearchTestById (t, id);
-				if (r != null)
-					return r;
-			}
-			return null;
-		}
-
-		
-		UnitTest SearchTest (UnitTest test, string fullName)
-		{
-			if (test == null)
-				return null;
-			if (test.FullName == fullName)
-				return test;
-
-			UnitTestGroup group = test as UnitTestGroup;
-			if (group != null)  {
-				foreach (UnitTest t in group.Tests) {
-					UnitTest result = SearchTest (t, fullName);
-					if (result != null)
-						return result;
-				}
-			}
-			return null;
-		}
-
-		UnitTest SearchTestById (UnitTest test, string id)
-		{
-			if (test == null)
-				return null;
-			if (test.TestId == id)
-				return test;
-
-			UnitTestGroup group = test as UnitTestGroup;
-			if (group != null)  {
-				foreach (UnitTest t in group.Tests) {
-					UnitTest result = SearchTestById (t, id);
-					if (result != null)
-						return result;
-				}
-			}
-			return null;
-		}
-
-		public UnitTest FindRootTest (IWorkspaceObject item)
-		{
-			return FindRootTest (RootTests, item);
-		}
-		
-		public UnitTest FindRootTest (IEnumerable<UnitTest> tests, IWorkspaceObject item)
-		{
-			foreach (UnitTest t in tests) {
-				if (t.OwnerObject == item)
-					return t;
-				UnitTestGroup tg = t as UnitTestGroup;
-				if (tg != null) {
-					UnitTest ct = FindRootTest (tg.Tests, item);
-					if (ct != null)
-						return ct;
-				}
-			}
-			return null;
-		}
-		
-		void OnWorkspaceChanged (object sender, EventArgs e)
-		{
-			RebuildTests ();
-		}
-
-		void OnReferenceChangedInProject (object sender, ProjectReferenceEventArgs e)
-		{
-			if (!IsSolutionGroupPresent (e.Project.ParentSolution, rootTests))
-				RebuildTests ();
-		}
-
-		void OnItemsChangedInSolution (object sender, SolutionItemChangeEventArgs e)
-		{
-			if (!IsSolutionGroupPresent (e.Solution, rootTests))
-				RebuildTests ();
-		}
-
-		bool IsSolutionGroupPresent (Solution sol, IEnumerable<UnitTest> tests)
-		{
-			foreach (var t in tests) {
-				var tg = t as SolutionFolderTestGroup;
-				if (tg != null && ((SolutionFolder)tg.OwnerObject).ParentSolution == sol)
-					return true;
-				var g = t as UnitTestGroup;
-				if (g != null && g.HasTests) {
-					if (IsSolutionGroupPresent (sol, g.Tests))
-						return true;
-				}
-			}
-			return false;
-		}
-
-		void RebuildTests ()
-		{
-			if (rootTests != null) {
-				foreach (IDisposable t in rootTests)
-					t.Dispose ();
-			}
-
-			List<UnitTest> list = new List<UnitTest> ();
-			foreach (WorkspaceItem it in IdeApp.Workspace.Items) {
-				UnitTest t = BuildTest (it);
-				if (t != null)
-					list.Add (t);
-			}
-
-			rootTests = list.ToArray ();
-			NotifyTestSuiteChanged ();
-		}
-		
-		public UnitTest BuildTest (IWorkspaceObject entry)
-		{
-			foreach (ITestProvider p in providers) {
-				try {
-					UnitTest t = p.CreateUnitTest (entry);
-					if (t != null)
-						return t;
-				} catch {
-				}
-			}
-			return null;
-		}
-		
-		public UnitTest[] RootTests {
-			get { return rootTests; }
-		}
-		
-		public static void ShowOptionsDialog (UnitTest test)
-		{
-			Properties properties = new Properties ();
-			properties.Set ("UnitTest", test);
-			using (var dlg = new UnitTestOptionsDialog (IdeApp.Workbench.RootWindow, properties))
-				MessageService.ShowCustomDialog (dlg);
-		}
-		
-		void NotifyTestSuiteChanged ()
-		{
-			if (TestSuiteChanged != null)
-				TestSuiteChanged (this, EventArgs.Empty);
-		}
-
-		public static void ResetResult (UnitTest test)
-		{
-			if (test == null)
-				return;
-			test.ResetLastResult ();
-			UnitTestGroup group = test as UnitTestGroup;
-			if (group == null) 
-				return;
-			foreach (UnitTest t in new List<UnitTest> (group.Tests))
-				ResetResult (t);
-		}
-
-		public event EventHandler TestSuiteChanged;
-
-		void OnTestSessionCompleted (IAsyncOperation op)
-		{
-			var handler = TestSessionCompleted;
-			if (handler != null)
-				handler (this, EventArgs.Empty);
-		}
-
-		public event EventHandler TestSessionCompleted;
-
-		void OnTestSessionStarting (TestSessionEventArgs args)
-		{
-			if (TestSessionStarting != null)
-				TestSessionStarting (this, args);
-		}
-
-		/// <summary>
-		/// Occurs just before a test session is started
-		/// </summary>
-		public event EventHandler<TestSessionEventArgs> TestSessionStarting;
-	}
-	
-
-
-	class TestSession: IAsyncOperation, ITestProgressMonitor
-	{
-		UnitTest test;
-		TestMonitor monitor;
-		Thread runThread;
-		bool success;
-		ManualResetEvent waitEvent;
-		IExecutionHandler context;
-		TestResultsPad resultsPad;
-
-		public TestSession (UnitTest test, IExecutionHandler context, TestResultsPad resultsPad)
-		{
-			this.test = test;
-			this.context = context;
-			this.monitor = new TestMonitor (resultsPad);
-			this.resultsPad = resultsPad;
-			resultsPad.InitializeTestRun (test);
-		}
-		
-		public void Start ()
-		{
-			runThread = new Thread (new ThreadStart (RunTests));
-			runThread.Name = "NUnit test runner";
-			runThread.IsBackground = true;
-			runThread.Start ();
-		}
-		
-		void RunTests ()
-		{
-			try {
-				NUnitService.ResetResult (test);
-
-				TestContext ctx = new TestContext (monitor, resultsPad, context, DateTime.Now);
-				test.Run (ctx);
-				test.SaveResults ();
-				success = true;
-			} catch (Exception ex) {
-				LoggingService.LogError (ex.ToString ());
-				monitor.ReportRuntimeError (null, ex);
-				success = false;
-			} finally {
-				monitor.FinishTestRun ();
-				runThread = null;
-			}
-			lock (this) {
-				if (waitEvent != null)
-					waitEvent.Set ();
-			}
-			if (Completed != null)
-				Completed (this);
-		}
-		
-		void ITestProgressMonitor.BeginTest (UnitTest test)
-		{
-			monitor.BeginTest (test);
-		}
-		
-		void ITestProgressMonitor.EndTest (UnitTest test, UnitTestResult result)
-		{
-			monitor.EndTest (test, result);
-		}
-		
-		void ITestProgressMonitor.ReportRuntimeError (string message, Exception exception)
-		{
-			monitor.ReportRuntimeError (message, exception);
-		}
-		
-		void ITestProgressMonitor.WriteGlobalLog (string message)
-		{
-			monitor.WriteGlobalLog (message);
-		}
-
-		bool ITestProgressMonitor.IsCancelRequested {
-			get { return monitor.IsCancelRequested; }
-		}
-		
-		void IAsyncOperation.Cancel ()
-		{
-			monitor.Cancel ();
-		}
-		
-		public void WaitForCompleted ()
-		{
-			if (IsCompleted) return;
-			
-			if (DispatchService.IsGuiThread) {
-				while (!IsCompleted) {
-					while (Gtk.Application.EventsPending ())
-						Gtk.Application.RunIteration ();
-					Thread.Sleep (100);
-				}
-			} else {
-				lock (this) {
-					if (waitEvent == null)
-						waitEvent = new ManualResetEvent (false);
-				}
-				waitEvent.WaitOne ();
-			}
-		}
-		
-		public bool IsCompleted {
-			get { return runThread == null; }
-		}
-		
-		public bool Success {
-			get { return success; }
-		}
-
-		public bool SuccessWithWarnings {
-			get { return false; }
-		}
-
-		public event OperationHandler Completed;
-		
-		public event TestHandler CancelRequested {
-			add { monitor.CancelRequested += value; }
-			remove { monitor.CancelRequested -= value; }
-		}
-	}
-
-	public class TestSessionEventArgs: EventArgs
-	{
-		public IAsyncOperation Session { get; set; }
-		public UnitTest Test { get; set; }
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/NUnitTestCase.cs b/main/src/addins/NUnit/Services/NUnitTestCase.cs
deleted file mode 100644
index 1a774892fc..0000000000
--- a/main/src/addins/NUnit/Services/NUnitTestCase.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// NUnitTestCase.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using MonoDevelop.NUnit.External;
-
-namespace MonoDevelop.NUnit
-{
-	class NUnitTestCase: UnitTest
-	{
-		NUnitAssemblyTestSuite rootSuite;
-		string className;
-		string pathName;
-		
-		public NUnitTestCase (NUnitAssemblyTestSuite rootSuite, NunitTestInfo tinfo, string className) : base (tinfo.Name)
-		{
-			this.className = className;
-			this.pathName = tinfo.PathName;
-			this.rootSuite = rootSuite;
-			this.TestId = tinfo.TestId;
-			this.IsExplicit = tinfo.IsExplicit;
-		}
-		
-		protected override UnitTestResult OnRun (TestContext testContext)
-		{
-			return rootSuite.RunUnitTest (this, className, pathName, Name, testContext);
-		}
-		
-		protected override bool OnCanRun (MonoDevelop.Core.Execution.IExecutionHandler executionContext)
-		{
-			return rootSuite.CanRun (executionContext);
-		}
-
-		
-		public override SourceCodeLocation SourceCodeLocation {
-			get {
-				UnitTest p = Parent;
-				while (p != null) {
-					NUnitAssemblyTestSuite root = p as NUnitAssemblyTestSuite;
-					if (root != null)
-						return root.GetSourceCodeLocation (this);
-					p = p.Parent;
-				}
-				return null; 
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/NUnitTestSuite.cs b/main/src/addins/NUnit/Services/NUnitTestSuite.cs
deleted file mode 100644
index 74d3a26e4b..0000000000
--- a/main/src/addins/NUnit/Services/NUnitTestSuite.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// NUnitTestSuite.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using MonoDevelop.NUnit.External;
-
-namespace MonoDevelop.NUnit
-{
-	class NUnitTestSuite: UnitTestGroup
-	{
-		NunitTestInfo testInfo;
-		NUnitAssemblyTestSuite rootSuite;
-		string fullName;
-		
-		public NUnitTestSuite (NUnitAssemblyTestSuite rootSuite, NunitTestInfo tinfo): base (tinfo.Name)
-		{
-			fullName = !string.IsNullOrEmpty (tinfo.PathName) ? tinfo.PathName + "." + tinfo.Name : tinfo.Name;
-			this.testInfo = tinfo;
-			this.rootSuite = rootSuite;
-			this.TestId = tinfo.TestId;
-		}
-		
-		public override bool HasTests {
-			get {
-				return true;
-			}
-		}
-		
-		public string ClassName {
-			get { return fullName; }
-		}
-		
-		protected override UnitTestResult OnRun (TestContext testContext)
-		{
-			return rootSuite.RunUnitTest (this, fullName, fullName, null, testContext);
-		}
-		
-		protected override bool OnCanRun (MonoDevelop.Core.Execution.IExecutionHandler executionContext)
-		{
-			return rootSuite.CanRun (executionContext);
-		}
-
-		
-		protected override void OnCreateTests ()
-		{
-			if (testInfo.Tests == null)
-				return;
-			
-			foreach (NunitTestInfo test in testInfo.Tests) {
-				UnitTest newTest;
-				if (test.Tests != null)
-					newTest = new NUnitTestSuite (rootSuite, test);
-				else
-					newTest = new NUnitTestCase (rootSuite, test, ClassName);
-				newTest.FixtureTypeName = test.FixtureTypeName;
-				newTest.FixtureTypeNamespace = test.FixtureTypeNamespace;
-				Tests.Add (newTest);
-			}
-		}
-		
-		public override SourceCodeLocation SourceCodeLocation {
-			get {
-				UnitTest p = Parent;
-				while (p != null) {
-					NUnitAssemblyTestSuite root = p as NUnitAssemblyTestSuite;
-					if (root != null)
-						return root.GetSourceCodeLocation (this);
-					p = p.Parent;
-				}
-				return null; 
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/SolutionFolderTestGroup.cs b/main/src/addins/NUnit/Services/SolutionFolderTestGroup.cs
deleted file mode 100644
index 25f8370524..0000000000
--- a/main/src/addins/NUnit/Services/SolutionFolderTestGroup.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// CombineTestGroup.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-using MonoDevelop.Core;
-using MonoDevelop.Projects;
-
-using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Ide;
-
-namespace MonoDevelop.NUnit
-{
-	public class SolutionFolderTestGroup: UnitTestGroup
-	{
-		SolutionFolder folder;
-		
-		public SolutionFolderTestGroup (SolutionFolder c): base (c.Name, c)
-		{
-			string storeId = c.ItemId;
-			string resultsPath = MonoDevelop.NUnit.RootTest.GetTestResultsDirectory (c.BaseDirectory);
-			ResultsStore = new BinaryResultsStore (resultsPath, storeId);
-			
-			folder = c;
-			folder.NameChanged += OnCombineRenamed;
-
-			if (c.IsRoot) {
-				folder.ParentSolution.SolutionItemAdded += OnEntryChanged;
-				folder.ParentSolution.SolutionItemRemoved += OnEntryChanged;
-				IdeApp.Workspace.ReferenceAddedToProject += OnReferenceChanged;
-				IdeApp.Workspace.ReferenceRemovedFromProject += OnReferenceChanged;
-			}
-		}
-		
-		public static SolutionFolderTestGroup CreateTest (SolutionFolder c)
-		{
-			return new SolutionFolderTestGroup (c);
-		}
-		
-		public override void Dispose ()
-		{
-			folder.NameChanged -= OnCombineRenamed;
-			if (folder.IsRoot) {
-				folder.ParentSolution.SolutionItemAdded -= OnEntryChanged;
-				folder.ParentSolution.SolutionItemRemoved -= OnEntryChanged;
-				IdeApp.Workspace.ReferenceAddedToProject -= OnReferenceChanged;
-				IdeApp.Workspace.ReferenceRemovedFromProject -= OnReferenceChanged;
-			}
-			base.Dispose ();
-		}
-
-		void OnReferenceChanged (object s, ProjectReferenceEventArgs args)
-		{
-			if (args.Project.ParentSolution == folder.ParentSolution && NUnitProjectTestSuite.IsNUnitReference (args.ProjectReference))
-				UpdateTests ();
-		}
-		
-		void OnEntryChanged (object sender, SolutionItemEventArgs e)
-		{
-			UpdateTests ();
-		}
-		
-		void OnCombineRenamed (object sender, SolutionItemRenamedEventArgs e)
-		{
-			UnitTestGroup parent = Parent as UnitTestGroup;
-			if (parent != null)
-				parent.UpdateTests ();
-		}
-		
-		protected override void OnCreateTests ()
-		{
-			NUnitService testService = NUnitService.Instance;
-			foreach (SolutionItem e in folder.Items) {
-				UnitTest t = testService.BuildTest (e);
-				if (t != null)
-					Tests.Add (t);
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/SystemTestProvider.cs b/main/src/addins/NUnit/Services/SystemTestProvider.cs
deleted file mode 100644
index 311926ae21..0000000000
--- a/main/src/addins/NUnit/Services/SystemTestProvider.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// SystemTestProvider.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.NUnit
-{
-	public class SystemTestProvider: ITestProvider
-	{
-		public UnitTest CreateUnitTest (IWorkspaceObject entry)
-		{
-			UnitTest test = null;
-			
-			if (entry is SolutionFolder)
-				test = SolutionFolderTestGroup.CreateTest ((SolutionFolder)entry);
-			if (entry is Solution)
-				test = SolutionFolderTestGroup.CreateTest (((Solution)entry).RootFolder);
-			if (entry is Workspace)
-				test = WorkspaceTestGroup.CreateTest ((Workspace)entry);
-			if (entry is DotNetProject)
-				test = NUnitProjectTestSuite.CreateTest ((DotNetProject)entry);
-			if (entry is NUnitAssemblyGroupProject)
-				test = ((NUnitAssemblyGroupProject)entry).RootTest;
-			
-			UnitTestGroup grp = test as UnitTestGroup;
-			if (grp != null && !grp.HasTests)
-				return null;
-			
-			return test;
-		}
-		
-		public Type[] GetOptionTypes ()
-		{
-			return new Type[] {
-				typeof(GeneralTestOptions),
-				typeof(NUnitCategoryOptions)
-			};
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/TcpTestListener.cs b/main/src/addins/NUnit/Services/TcpTestListener.cs
deleted file mode 100644
index cf2f57ffd5..0000000000
--- a/main/src/addins/NUnit/Services/TcpTestListener.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-//
-// TcpTestListener.cs
-//
-// Author:
-//       Alan McGovern <alan.mcgovern@gmail.com>
-//
-// Copyright (c) 2013 Alan McGovern
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Net;
-using System.Net.Sockets;
-using MonoDevelop.NUnit.External;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.NUnit.External
-{
-	class TcpTestListener : IDisposable
-	{
-		string testSuiteName;
-		string rootTestName;
-
-		public bool HasReceivedConnection {
-			get; private set;
-		}
-
-		List<Tuple<string,UnitTestResult>> suiteStack = new List<Tuple<string, UnitTestResult>> ();
-		IRemoteEventListener listener;
-
-		TcpListener TcpListener {
-			get; set;
-		}
-
-		public int Port {
-			get { return ((IPEndPoint) TcpListener.LocalEndpoint).Port; }
-		}
-
-
-		public TcpTestListener (IRemoteEventListener listener, string suiteName)
-		{
-			this.testSuiteName = suiteName;
-			this.listener = listener;
-			bool rootSuiteStarted = false;
-
-			TcpListener = new TcpListener (new IPEndPoint (IPAddress.Loopback, 0));
-			TcpListener.Start ();
-			Task.Factory.StartNew (() => {
-				try {
-					using (var client = TcpListener.AcceptTcpClient ())
-					using (var socketStream = client.GetStream ())
-					using (var reader = new StreamReader (socketStream, Encoding.UTF8)) {
-
-						HasReceivedConnection = true;
-						string line = null;
-						while ((line = reader.ReadLine ()) != null) {
-							var element = XElement.Parse (line);
-							string testName = element.Attribute ("name").Value;
-							var action = element.Name.LocalName;
-
-							if (testSuiteName.Length == 0 && !rootSuiteStarted) {
-								// Running the whole assembly
-								rootTestName = testName;
-								rootSuiteStarted = true;
-								continue;
-							}
-							if (testSuiteName == testName && !rootSuiteStarted) {
-								// Running a test suite
-								rootTestName = testName;
-								rootSuiteStarted = true;
-								listener.SuiteStarted ("<root>");
-								continue;
-							}
-
-							if (!rootSuiteStarted)
-								continue;
-
-							switch (action) {
-							case "suite-started":
-								UpdateTestSuiteStatus (testName, false); break;
-							case "test-started":
-								UpdateTestSuiteStatus (testName, true);
-								listener.TestStarted (testName); break;
-							case "test-finished":
-								var res = CreateResult (element);
-								AddTestResult (res);
-								listener.TestFinished (testName, res); break;
-							case "suite-finished":
-								if (testName == rootTestName) {
-									FinishSuites (0);
-									listener.SuiteFinished ("<root>", CreateResult (element));
-									rootSuiteStarted = false;
-								}
-								break;
-							}
-						}
-					}
-				} catch (Exception ex) {
-					LoggingService.LogError ("Exception in test listener", ex);
-				} finally {
-					TcpListener.Stop ();
-				}
-			});
-		}
-
-		public void Dispose ()
-		{
-			TcpListener.Stop ();
-		}
-
-		void UpdateTestSuiteStatus (string name, bool isTest)
-		{
-			if (testSuiteName.Length > 0)
-				name = name.Substring (testSuiteName.Length + 1);
-			string[] parts = name.Split ('.');
-			int len = isTest ? parts.Length - 1 : parts.Length;
-			for (int n = 0; n < len; n++) {
-				if (n >= suiteStack.Count) {
-					StartSuite (parts[n]);
-				} else if (parts [n] != suiteStack [n].Item1) {
-					FinishSuites (n);
-					StartSuite (parts[n]);
-				}
-			}
-		}
-
-		void FinishSuites (int stackLevel)
-		{
-			if (stackLevel + 1 < suiteStack.Count)
-				FinishSuites (stackLevel + 1);
-
-			if (stackLevel >= suiteStack.Count)
-				return;
-
-			var tname = GetTestSuiteName (stackLevel);
-			var res = suiteStack [stackLevel].Item2;
-
-			suiteStack.RemoveAt (stackLevel);
-
-			listener.SuiteFinished (tname, res);
-		}
-
-		void StartSuite (string name)
-		{
-			suiteStack.Add (new Tuple<string, UnitTestResult> (name, new UnitTestResult ()));
-			name = GetTestSuiteName (suiteStack.Count - 1);
-			listener.SuiteStarted (name);
-		}
-
-		void AddTestResult (UnitTestResult res)
-		{
-			foreach (var r in suiteStack)
-				r.Item2.Add (res);
-		}
-
-		string GetTestSuiteName (int stackLevel)
-		{
-			var info = suiteStack [stackLevel];
-
-			string name;
-			if (stackLevel > 0) {
-				var prefix = string.Join (".", suiteStack.Select (s => s.Item1).Take (stackLevel));
-				name = prefix + "." + info.Item1;
-			} else
-				name = info.Item1;
-
-			if (testSuiteName.Length > 0)
-				name = testSuiteName + "." + name;
-			return name;
-		}
-
-		UnitTestResult CreateResult (XElement element)
-		{
-			var result = (ResultStatus)Enum.Parse (typeof(ResultStatus), element.Attribute ("result").Value);
-			var passed = int.Parse (element.Attribute ("passed").Value);
-			var failures = int.Parse (element.Attribute ("failures").Value);
-			var ignored = int.Parse (element.Attribute ("ignored").Value);
-			var inconclusive = int.Parse (element.Attribute ("inconclusive").Value);
-
-			var message = (string)element.Attribute ("message");
-			var stackTrace = (string)element.Attribute ("stack-trace");
-
-			return new UnitTestResult {
-				Status = result,
-				Passed = passed,
-				Failures = failures,
-				Ignored = ignored,
-				Inconclusive = inconclusive,
-				Message = message,
-				StackTrace = stackTrace
-			};
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/TestContext.cs b/main/src/addins/NUnit/Services/TestContext.cs
deleted file mode 100644
index 0955714d6c..0000000000
--- a/main/src/addins/NUnit/Services/TestContext.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// TestContext.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using MonoDevelop.Core;
-using MonoDevelop.Core.Execution;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.NUnit
-{
-	public class TestContext
-	{
-		ITestProgressMonitor monitor;
-		DateTime testDate;
-		object contextData;
-		IExecutionHandler executionContext;
-
-		public TestContext (ITestProgressMonitor monitor, TestResultsPad resultsPad, IExecutionHandler executionContext, DateTime testDate)
-		{
-			this.monitor = monitor;
-			if (executionContext == null)
-				executionContext = Runtime.ProcessService.DefaultExecutionHandler;
-			this.executionContext = executionContext;
-			// Round to seconds
-			this.testDate = new DateTime ((testDate.Ticks / TimeSpan.TicksPerSecond) * TimeSpan.TicksPerSecond);
-		}
-		
-		public ITestProgressMonitor Monitor {
-			get { return monitor; }
-		}
-		
-		public DateTime TestDate {
-			get { return testDate; }
-		}
-		
-		public object ContextData {
-			get { return contextData; }
-			set { contextData = value; }
-		}
-		
-		public IExecutionHandler ExecutionContext {
-			get { return executionContext; }
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/UnitTest.cs b/main/src/addins/NUnit/Services/UnitTest.cs
deleted file mode 100644
index d1739df74e..0000000000
--- a/main/src/addins/NUnit/Services/UnitTest.cs
+++ /dev/null
@@ -1,672 +0,0 @@
-//
-// UnitTest.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections;
-using MonoDevelop.Core;
-using MonoDevelop.Core.ProgressMonitoring;
-using MonoDevelop.Projects;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Core.Execution;
-
-namespace MonoDevelop.NUnit
-{
-	public abstract class UnitTest: IDisposable
-	{
-		string name;
-		IResultsStore resultsStore;
-		UnitTestResult lastResult;
-		UnitTest parent;
-		TestStatus status;
-		Hashtable options;
-		IWorkspaceObject ownerSolutionItem;
-		SolutionEntityItem ownerSolutionEntityItem;
-		UnitTestResultsStore results;
-		bool historicResult;
-		bool resultLoaded;
-		
-		public string FixtureTypeNamespace {
-			get;
-			set;
-		}
-		
-		public string FixtureTypeName {
-			get;
-			set;
-		}
-
-		public bool IsExplicit {
-			get;
-			set;
-		}
-
-		protected UnitTest (string name)
-		{
-			this.name = name;
-		}
-		
-		protected UnitTest (string name, IWorkspaceObject ownerSolutionItem)
-		{
-			this.name = name;
-			this.ownerSolutionItem = ownerSolutionItem;
-			ownerSolutionEntityItem = ownerSolutionItem as SolutionEntityItem;
-			if (ownerSolutionEntityItem != null)
-				ownerSolutionEntityItem.DefaultConfigurationChanged += OnConfugurationChanged;
-		}
-		
-		public virtual void Dispose ()
-		{
-			if (ownerSolutionEntityItem != null)
-				ownerSolutionEntityItem.DefaultConfigurationChanged -= OnConfugurationChanged;
-		}
-		
-		internal void SetParent (UnitTest t)
-		{
-			parent = t;
-		}
-		
-		public virtual string ActiveConfiguration {
-			get {
-				if (ownerSolutionEntityItem != null) {
-					if (ownerSolutionEntityItem.DefaultConfiguration == null)
-						return "";
-					return ownerSolutionEntityItem.DefaultConfiguration.Id;
-				} else if (Parent != null) {
-					return Parent.ActiveConfiguration;
-				} else {
-					return "default";
-				}
-			}
-		}
-		
-		public virtual string[] GetConfigurations ()
-		{
-			if (ownerSolutionEntityItem != null) {
-				string[] res = new string [ownerSolutionEntityItem.Configurations.Count];
-				for (int n=0; n<ownerSolutionEntityItem.Configurations.Count; n++)
-					res [n] = ownerSolutionEntityItem.Configurations [n].Id;
-				return res;
-			} else if (Parent != null) {
-				return Parent.GetConfigurations ();
-			} else {
-				return new string [] { "default" };
-			}
-		}
-		
-		public ICloneable GetOptions (Type optionsType)
-		{
-			return GetOptions (optionsType, ActiveConfiguration);
-		}
-		
-		public bool HasOptions (Type optionsType, string configuration)
-		{
-			return GetOptions (optionsType, configuration, false) != null;
-		}
-		
-		public void ResetOptions (Type optionsType, string configuration)
-		{
-			if (GetOptions (optionsType, configuration, false) == null)
-				return;
-				
-			if (options == null || !options.ContainsKey (configuration))
-				return;
-
-			Hashtable configOptions = (Hashtable) options [configuration];
-			if (configOptions != null)
-				configOptions.Remove (optionsType);
-			SaveOptions ();
-		}
-		
-		public ICloneable GetOptions (Type optionsType, string configuration)
-		{
-			return GetOptions (optionsType, configuration, true);
-		}
-		
-		public ICollection GetAllOptions (string configuration)
-		{
-			Hashtable localOptions = GetOptionsTable (configuration);
-			if (localOptions == null || localOptions.Count == 0) {
-				if (Parent != null)
-					return Parent.GetAllOptions (configuration);
-				else
-					return new object[0];
-			}
-			if (Parent == null)
-				return localOptions.Values;
-
-			ICollection parentOptions = Parent.GetAllOptions (configuration);
-			if (parentOptions.Count == 0)
-				return localOptions.Values;
-
-			Hashtable t = new Hashtable ();
-			foreach (object ob in parentOptions)
-				t [ob.GetType()] = ob;
-
-			foreach (ICloneable ob in localOptions.Values)
-				t [ob.GetType()] = ob.Clone ();
-
-			return t.Values;
-		}
-
-		ICloneable GetOptions (Type optionsType, string configuration, bool createDefault)
-		{
-			Hashtable configOptions = GetOptionsTable (configuration);
-			
-			if (configOptions != null) {
-				ICloneable ob = (ICloneable) configOptions [optionsType];
-				if (ob != null)
-					return (ICloneable) ob.Clone ();
-			}
-			if (!createDefault)
-				return null;
-			if (parent != null)
-				return parent.GetOptions (optionsType, configuration);
-			else
-				return (ICloneable) Activator.CreateInstance (optionsType);
-		}
-		
-		Hashtable GetOptionsTable (string configuration)
-		{
-			Hashtable configOptions = null;
-			
-			if (options == null || !options.ContainsKey (configuration)) {
-				ICollection col = OnLoadOptions (configuration);
-				if (col != null && col.Count > 0) {
-					if (options == null)
-						options = new Hashtable ();
-					configOptions = (Hashtable) options [configuration];
-					if (configOptions == null) {
-						configOptions = new Hashtable ();
-						options [configuration] = configOptions;
-					}
-					foreach (object op in col)
-						configOptions [op.GetType ()] = op;
-				}
-			} else
-				configOptions = (Hashtable) options [configuration];
-			return configOptions;
-		}
-		
-		public virtual void SetOptions (ICloneable ops, string configuration)
-		{
-			if (options == null)
-				options = new Hashtable ();
-				
-			Hashtable configOptions = (Hashtable) options [configuration];
-			if (configOptions == null) {
-				configOptions = new Hashtable ();
-				options [configuration] = configOptions;
-			}
-			
-			configOptions [ops.GetType ()] = ops.Clone ();
-			SaveOptions ();
-		}
-		
-		void SaveOptions ()
-		{
-			if (options == null) {
-				OnSaveOptions (new OptionsData[0]);
-				return;
-			}
-			
-			ArrayList list = new ArrayList ();
-			foreach (DictionaryEntry e in options) {
-				OptionsData d = new OptionsData ((string) e.Key, ((Hashtable) e.Value).Values);
-				list.Add (d);
-			}
-			
-			OnSaveOptions ((OptionsData[]) list.ToArray (typeof(OptionsData)));
-		}
-		
-		public UnitTestResultsStore Results {
-			get {
-				if (results == null) {
-					results = new UnitTestResultsStore (this, GetResultsStore ());
-				}
-				return results;
-			}
-		}
-		
-		public UnitTestResult GetLastResult ()
-		{
-			if (!resultLoaded) {
-				resultLoaded = true;
-				lastResult = Results.GetLastResult (DateTime.Now);
-				if (lastResult != null)
-					historicResult = true;
-			}
-			return lastResult;
-		}
-		
-		public void ResetLastResult ()
-		{
-			historicResult = true;
-			OnTestStatusChanged ();
-		}
-
-		public bool IsHistoricResult {
-			get { return historicResult; }
-		}
-		
-		public UnitTestCollection GetRegressions (DateTime fromDate, DateTime toDate)
-		{
-			UnitTestCollection list = new UnitTestCollection ();
-			FindRegressions (list, fromDate, toDate);
-			return list;
-		}
-		
-		public virtual int CountTestCases ()
-		{
-			return 1;
-		}
-		
-		public virtual SourceCodeLocation SourceCodeLocation {
-			get { return null; }
-		}
-		
-		public UnitTest Parent {
-			get { return parent; }
-		}
-		
-		public UnitTest RootTest {
-			get {
-				if (parent != null)
-					return parent.RootTest;
-				else
-					return this;
-			}
-		}
-		
-		public virtual string Name {
-			get { return name; }
-		}
-		
-		public virtual string Title {
-			get { return Name; }
-		}
-		
-		public TestStatus Status {
-			get { return status; }
-			set {
-				status = value;
-				OnTestStatusChanged ();
-			}
-		}
-
-		public Xwt.Drawing.Image StatusIcon {
-			get {
-				if (Status == TestStatus.Running) {
-					return TestStatusIcon.Running;
-				} else if (Status == TestStatus.Loading) {
-					return TestStatusIcon.Loading;
-				} else if (Status == TestStatus.LoadError) {
-					return TestStatusIcon.Failure;
-				} else {
-					UnitTestResult res = GetLastResult ();
-					if (res == null)
-						return TestStatusIcon.None;
-					else if (res.Status == ResultStatus.Ignored)
-						return TestStatusIcon.NotRun;
-					else if (res.ErrorsAndFailures > 0 && res.Passed > 0)
-						return IsHistoricResult ? TestStatusIcon.OldSuccessAndFailure : TestStatusIcon.SuccessAndFailure;
-					else if (res.IsInconclusive)
-						return IsHistoricResult ? TestStatusIcon.OldInconclusive : TestStatusIcon.Inconclusive;
-					else if (res.IsFailure)
-						return IsHistoricResult ? TestStatusIcon.OldFailure : TestStatusIcon.Failure;
-					else if (res.IsSuccess)
-						return IsHistoricResult ? TestStatusIcon.OldSuccess : TestStatusIcon.Success;
-					else if (res.IsNotRun || res.Ignored > 0)
-						return TestStatusIcon.NotRun;
-					else
-						return TestStatusIcon.None;
-				}
-			}
-		}
-
-		public string TestId {
-			get;
-			protected set;
-		}
-		
-		public string FullName {
-			get {
-				if (parent != null)
-					return parent.FullName + "." + Name;
-				else
-					return Name;
-			}
-		}
-		
-		protected IWorkspaceObject OwnerSolutionItem {
-			get { return ownerSolutionItem; }
-		}
-		
-		public IWorkspaceObject OwnerObject {
-			get {
-				if (ownerSolutionItem != null)
-					return ownerSolutionItem;
-				else if (parent != null)
-					return parent.OwnerObject;
-				else
-					return null;
-			}
-		}
-		
-		internal string StoreRelativeName {
-			get {
-				if (resultsStore != null || Parent == null)
-					return "";
-				else if (Parent.resultsStore != null)
-					return Name;
-				else
-					return Parent.StoreRelativeName + "." + Name;
-			}
-		}
-		
-		// Forces the reloading of tests, if they have changed
-		public virtual IAsyncOperation Refresh ()
-		{
-			AsyncOperation op = new AsyncOperation ();
-			op.SetCompleted (true);
-			return op;
-		}
-		
-		public UnitTestResult Run (TestContext testContext)
-		{
-			testContext.Monitor.BeginTest (this);
-			UnitTestResult res = null;
-			object ctx = testContext.ContextData;
-			
-			try {
-				Status = TestStatus.Running;
-				res = OnRun (testContext);
-			} catch (global::NUnit.Framework.SuccessException) {
-				res = UnitTestResult.CreateSuccess();
-			} catch (global::NUnit.Framework.IgnoreException ex) {
-				res = UnitTestResult.CreateIgnored(ex.Message);
-			} catch (global::NUnit.Framework.InconclusiveException ex) {
-				res = UnitTestResult.CreateInconclusive(ex.Message);
-			} catch (Exception ex) {
-				res = UnitTestResult.CreateFailure (ex);
-			} finally {
-				Status = TestStatus.Ready;
-				testContext.Monitor.EndTest (this, res);
-			}
-			RegisterResult (testContext, res);
-			testContext.ContextData = ctx;
-			return res;
-		}
-		
-		public bool CanRun (IExecutionHandler executionContext)
-		{
-			if (executionContext == null)
-				executionContext = Runtime.ProcessService.DefaultExecutionHandler;
-			return OnCanRun (executionContext);
-		}
-		
-		protected abstract UnitTestResult OnRun (TestContext testContext);
-		
-		protected virtual bool OnCanRun (IExecutionHandler executionContext)
-		{
-			return true;
-		}
-		
-		public void RegisterResult (TestContext context, UnitTestResult result)
-		{
-			// Avoid registering results twice
-			if (lastResult != null && lastResult.TestDate == context.TestDate)
-				return;
-
-			result.TestDate = context.TestDate;
-//			if ((int)result.Status == 0)
-//				result.Status = ResultStatus.Ignored;
-
-			lastResult = result;
-			historicResult = false;
-			resultLoaded = true;
-
-			IResultsStore store = GetResultsStore ();
-			if (store != null)
-				store.RegisterResult (ActiveConfiguration, this, result);
-			OnTestStatusChanged ();
-		}
-		
-		IResultsStore GetResultsStore ()
-		{
-			if (resultsStore != null)
-				return resultsStore;
-			if (Parent != null)
-				return Parent.GetResultsStore ();
-			else
-				return null;
-		}
-		
-		protected IResultsStore ResultsStore {
-			get { return resultsStore; }
-			set { resultsStore = value; }
-		}
-		
-		public virtual void SaveResults ()
-		{
-			IResultsStore store = GetResultsStore ();
-			if (store != null)
-				store.Save ();
-		}
-		
-		internal virtual void FindRegressions (UnitTestCollection list, DateTime fromDate, DateTime toDate)
-		{
-			UnitTestResult res1 = Results.GetLastResult (fromDate);
-			UnitTestResult res2 = Results.GetLastResult (toDate);
-			if ((res1 == null || res1.IsSuccess) && (res2 != null && !res2.IsSuccess))
-				list.Add (this);
-		}
-		
-		protected virtual void OnSaveOptions (OptionsData[] data)
-		{
-			IConfigurationTarget ce;
-			string path;
-			
-			GetOwnerSolutionItem (this, out ce, out path);
-			
-			if (ce == null)
-				throw new InvalidOperationException ("Options can't be saved.");
-			
-			foreach (OptionsData d in data) {
-				IExtendedDataItem edi = (IExtendedDataItem) ce.Configurations [d.Configuration];
-				if (edi == null)
-					continue;
-				UnitTestOptionsSet oset = (UnitTestOptionsSet) edi.ExtendedProperties ["UnitTestInformation"];
-				if (oset == null) {
-					oset = new UnitTestOptionsSet ();
-					edi.ExtendedProperties ["UnitTestInformation"] = oset;
-				}
-				
-				UnitTestOptionsEntry te = oset.FindEntry (path);
-
-				if (d.Options.Count > 0) {
-					if (te == null) {
-						te = new UnitTestOptionsEntry ();
-						te.Path = path;
-						oset.Tests.Add (te);
-					}
-					te.Options.Clear ();
-					te.Options.AddRange (d.Options);
-				} else if (te != null) {
-					oset.Tests.Remove (te);
-				}
-			}
-			
-			ce.Save (new NullProgressMonitor ());
-		}
-		
-		protected virtual ICollection OnLoadOptions (string configuration)
-		{
-			IConfigurationTarget ce;
-			string path;
-			
-			GetOwnerSolutionItem (this, out ce, out path);
-			
-			if (ce == null)
-				return null;
-			
-			IExtendedDataItem edi = (IExtendedDataItem) ce.Configurations [configuration];
-			if (edi == null)
-				return null;
-
-			UnitTestOptionsSet oset = (UnitTestOptionsSet) edi.ExtendedProperties ["UnitTestInformation"];
-			if (oset == null)
-				return null;
-			
-			UnitTestOptionsEntry te = oset.FindEntry (path);
-			if (te != null)
-				return te.Options;
-			else
-				return null;
-		}
-		
-		void GetOwnerSolutionItem (UnitTest t, out IConfigurationTarget c, out string path)
-		{
-			if (OwnerSolutionItem is SolutionEntityItem) {
-				c = OwnerSolutionItem as SolutionEntityItem;
-				path = "";
-			} else if (parent != null) {
-				parent.GetOwnerSolutionItem (t, out c, out path);
-				if (c == null) return;
-				if (path.Length > 0)
-					path += "/" + t.Name;
-				else
-					path = t.Name;
-			} else {
-				c = null;
-				path = null;
-			}
-		}
-		
-		void OnConfugurationChanged (object ob, ConfigurationEventArgs args)
-		{
-			OnActiveConfigurationChanged ();
-		}
-		
-		protected virtual void OnActiveConfigurationChanged ()
-		{
-			OnTestChanged ();
-		}
-		
-		protected virtual void OnTestChanged ()
-		{
-			Gtk.Application.Invoke (delegate {
-				if (TestChanged != null)
-					TestChanged (this, EventArgs.Empty);
-			});
-		}
-		
-		protected virtual void OnTestStatusChanged ()
-		{
-			Gtk.Application.Invoke (delegate {
-				if (TestStatusChanged != null)
-					TestStatusChanged (this, EventArgs.Empty);
-			});
-		}
-		
-		public event EventHandler TestChanged;
-		public event EventHandler TestStatusChanged;
-	}
-	
-	public class SourceCodeLocation
-	{
-		string fileName;
-		int line;
-		int column;
-		
-		public SourceCodeLocation (string fileName, int line, int column)
-		{
-			this.fileName = fileName;
-			this.line = line;
-			this.column = column;
-		}
-		
-		public string FileName {
-			get { return fileName; }
-		}
-		
-		public int Line {
-			get { return line; }
-		}
-		
-		public int Column {
-			get { return column; }
-		}
-	}
-
-	public class OptionsData
-	{
-		string configuration;
-		ICollection options;
-		
-		public OptionsData (string configuration, ICollection options)
-		{
-			this.configuration = configuration;
-			this.options = options;
-		}
-		
-		public string Configuration {
-			get { return configuration; }
-		}
-		
-		public ICollection Options {
-			get { return options; }
-		}
-	}
-	
-	
-	class UnitTestOptionsSet
-	{
-		[ExpandedCollection]
-		[ItemProperty ("Test", ValueType = typeof(UnitTestOptionsEntry))]
-		public ArrayList Tests = new ArrayList ();
-		
-		public UnitTestOptionsEntry FindEntry (string testPath)
-		{
-			foreach (UnitTestOptionsEntry t in Tests)
-				if (t.Path == testPath) return t;
-			return null;
-		}
-	}
-	
-	class UnitTestOptionsEntry
-	{
-		[ItemProperty ("Path")]
-		public string Path;
-
-		[ItemProperty ("Options")]
-		[ExpandedCollection]
-		public ArrayList Options = new ArrayList ();
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/UnitTestCollection.cs b/main/src/addins/NUnit/Services/UnitTestCollection.cs
deleted file mode 100644
index a7a8638854..0000000000
--- a/main/src/addins/NUnit/Services/UnitTestCollection.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// UnitTestCollection.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-namespace MonoDevelop.NUnit
-{
-	public class UnitTestCollection: Collection<UnitTest>
-	{
-		UnitTest owner;
-		
-		internal UnitTestCollection (UnitTest owner)
-		{
-			this.owner = owner;
-		}
-		
-		public UnitTestCollection ()
-		{
-		}
-		
-		public UnitTest this [string name] {
-			get {
-				for (int n=0; n<Items.Count; n++)
-					if (Items [n].Name == name)
-						return Items [n];
-				return null;
-			}
-		}
-		
-		protected override void SetItem (int index, UnitTest item)
-		{
-			if (owner != null)
-				this[index].SetParent (null);
-			base.SetItem (index, item);
-			if (owner != null)
-				item.SetParent (owner);
-		}
-		
-		protected override void RemoveItem (int index)
-		{
-			if (owner != null)
-				this [index].SetParent (null);
-			base.RemoveItem(index);
-		}
-
-		protected override void InsertItem (int index, UnitTest item)
-		{
-			base.InsertItem(index, item);
-			if (owner != null)
-				item.SetParent (owner);
-		}
-
-		protected override void ClearItems ()
-		{
-			if (owner != null) {
-				foreach (UnitTest t in this)
-					t.SetParent (null);
-			}
-			base.ClearItems();
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/UnitTestGroup.cs b/main/src/addins/NUnit/Services/UnitTestGroup.cs
deleted file mode 100644
index f478e1f00b..0000000000
--- a/main/src/addins/NUnit/Services/UnitTestGroup.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-//
-// UnitTestGroup.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using MonoDevelop.Core;
-using MonoDevelop.Core.ProgressMonitoring;
-using System.Collections;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.NUnit
-{
-	public class UnitTestGroup: UnitTest
-	{
-		UnitTestCollection tests;
-		
-		public UnitTestGroup (string name): base (name)
-		{
-		}
-		
-		protected UnitTestGroup (string name, IWorkspaceObject ownerSolutionItem): base (name, ownerSolutionItem)
-		{
-		}
-		
-		public virtual bool HasTests {
-			get {
-				foreach (UnitTest t in Tests) {
-					if (t is UnitTestGroup) {
-						if (((UnitTestGroup)t).HasTests)
-							return true;
-					} else
-						return true;
-				}
-				return false;
-			}
-		}
-		
-		public UnitTestCollection Tests {
-			get {
-				if (tests == null) {
-					tests = new UnitTestCollection (this);
-					OnCreateTests ();
-				}
-				return tests;
-			}
-		}
-		
-		public UnitTestCollection GetFailedTests (DateTime date)
-		{
-			UnitTestCollection col = new UnitTestCollection ();
-			CollectFailedTests (col, date);
-			return col;
-		}
-		
-		void CollectFailedTests (UnitTestCollection col, DateTime date)
-		{
-			foreach (UnitTest t in Tests) {
-				if (t is UnitTestGroup)
-					((UnitTestGroup)t).CollectFailedTests (col, date);
-				else {
-					UnitTestResult res = t.Results.GetLastResult (date);
-					if (res != null && res.IsFailure)
-						col.Add (t);
-				}
-			}
-		}
-		
-		public void UpdateTests ()
-		{
-			if (tests != null) {
-				foreach (UnitTest t in tests)
-					t.Dispose ();
-				tests = null;
-				OnTestChanged ();
-			}
-		}
-		
-		public override void SaveResults ()
-		{
-			base.SaveResults ();
-			if (tests != null) {
-				foreach (UnitTest t in tests)
-					t.SaveResults ();
-			}
-		}
-		
-		
-		public override int CountTestCases ()
-		{
-			int total = 0;
-			foreach (UnitTest t in Tests)
-				total += t.CountTestCases ();
-			return total;
-		}
-		
-		protected virtual void OnCreateTests ()
-		{
-		}
-		
-		public override IAsyncOperation Refresh ()
-		{
-			AggregatedAsyncOperation oper = new AggregatedAsyncOperation ();
-			foreach (UnitTest t in Tests)
-				oper.Add (t.Refresh ());
-			oper.StartMonitoring ();
-			return oper;
-		}
-		
-		protected override UnitTestResult OnRun (TestContext testContext)
-		{
-			UnitTestResult tres = new UnitTestResult ();
-			OnBeginTest (testContext);
-			
-			try {
-				foreach (UnitTest t in Tests) {
-					if (t.IsExplicit)
-						continue;
-					UnitTestResult res;
-					try {
-						res = OnRunChildTest (t, testContext);
-						if (testContext.Monitor.IsCancelRequested)
-							break;
-					} catch (Exception ex) {
-						res = UnitTestResult.CreateFailure (ex);
-					}
-					tres.Add (res);
-				}
-			} finally {
-				OnEndTest (testContext);
-			}
-			return tres;
-		}
-		
-		protected override bool OnCanRun (MonoDevelop.Core.Execution.IExecutionHandler executionContext)
-		{
-			foreach (UnitTest t in Tests)
-				if (!t.CanRun (executionContext))
-					return false;
-			return true;
-		}
-
-		
-		protected virtual void OnBeginTest (TestContext testContext)
-		{
-		}
-		
-		protected virtual UnitTestResult OnRunChildTest (UnitTest test, TestContext testContext)
-		{
-			return test.Run (testContext);
-		}
-		
-		protected virtual void OnEndTest (TestContext testContext)
-		{
-		}
-		
-		internal override void FindRegressions (UnitTestCollection list, DateTime fromDate, DateTime toDate)
-		{
-			foreach (UnitTest test in Tests)
-				test.FindRegressions (list, fromDate, toDate);
-		}
-		
-		public override void Dispose ()
-		{
-			base.Dispose ();
-
-			if (tests != null) {
-				foreach (UnitTest t in tests)
-					t.Dispose ();
-			}
-		}
-		
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/UnitTestResult.cs b/main/src/addins/NUnit/Services/UnitTestResult.cs
deleted file mode 100644
index 25d6e4227f..0000000000
--- a/main/src/addins/NUnit/Services/UnitTestResult.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// UnitTestResult.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Xml.Serialization;
-using System.Globalization;
-using System.Text.RegularExpressions;
-
-namespace MonoDevelop.NUnit
-{
-	[Serializable]
-	public class UnitTestResult
-	{
-		DateTime testDate;
-		ResultStatus status;
-		TimeSpan time;
-		string message;
-		string output;
-		string stackTrace;
-		string cerror;
-		
-		public UnitTestResult ()
-		{
-		}
-		
-		public static UnitTestResult CreateFailure (Exception ex)
-		{
-			UnitTestResult res = new UnitTestResult ();
-			res.status = ResultStatus.Failure;
-			res.Message = ex.Message;
-			res.stackTrace = ex.StackTrace;
-			return res;
-		}
-		
-		public static UnitTestResult CreateFailure (string message, Exception ex)
-		{
-			UnitTestResult res = new UnitTestResult ();
-			res.status = ResultStatus.Failure;
-			res.Message = message;
-			if (ex != null)
-				res.stackTrace = ex.Message + "\n" + ex.StackTrace;
-			return res;
-		}
-		
-		public static UnitTestResult CreateIgnored (string message)
-		{
-			UnitTestResult res = new UnitTestResult ();
-			res.status = ResultStatus.Ignored;
-			res.Message = message;
-			return res;
-		}
-		
-		public static UnitTestResult CreateInconclusive (string message)
-		{
-			UnitTestResult res = new UnitTestResult ();
-			res.status = ResultStatus.Inconclusive;
-			res.Message = message;
-			return res;
-		}
-		
-		public static UnitTestResult CreateSuccess ()
-		{
-			UnitTestResult res = new UnitTestResult ();
-			res.status = ResultStatus.Success;
-			return res;
-		}
-		
-		public DateTime TestDate {
-			get { return testDate; }
-			set { testDate = value; }
-		}
-		
-		public ResultStatus Status {
-			get { return status; }
-			set { status = value; }
-		}
-		
-		public bool IsFailure {
-			get { return ErrorsAndFailures > 0; }
-		}
-
-		public bool IsSuccess {
-			get { return ErrorsAndFailures == 0 && Passed > 0; }
-		}
-
-		public bool IsInconclusive {
-			get { return Passed == 0 && ErrorsAndFailures == 0 && Inconclusive > 0; }
-		}
-
-		public bool IsNotRun {
-			get {
-				return Passed == 0 && ErrorsAndFailures == 0 && TestsNotRun > 0;
-			}
-		}
-
-		public int Passed {
-			get;
-			set;
-		}
-
-		public int Errors {
-			get;
-			set;
-		}
-
-		public int Failures {
-			get;
-			set;
-		}
-
-		public int ErrorsAndFailures {
-			get {
-				return Errors + Failures;
-			}
-		}
-
-		public int TestsNotRun {
-			get {
-				return Ignored + NotRunnable + Skipped;
-			}
-		}
-
-		public int Inconclusive {
-			get;
-			set;
-		}
-
-		public int NotRunnable {
-			get;
-			set;
-		}
-
-		public int Skipped {
-			get;
-			set;
-		}
-
-		public int Ignored {
-			get;
-			set;
-		}
-		
-		public TimeSpan Time {
-			get { return time; }
-			set { time = value; }
-		}
-		
-		public string Message {
-			get { return message; }
-			set { message = value; }
-		}
-		
-		public string StackTrace {
-			get { return stackTrace; }
-			set { stackTrace = value; }
-		}
-		
-		public string ConsoleOutput {
-			get { return output; }
-			set { output = value; }
-		}
-		
-		public string ConsoleError {
-			get { return cerror; }
-			set { cerror = value; }
-		}
-		
-		public SourceCodeLocation GetFailureLocation ()
-		{
-			if (string.IsNullOrEmpty (stackTrace))
-				return null;
-			string[] stackLines = stackTrace.Replace ("\r", "").Split ('\n');
-			foreach (string line in stackLines) {
-				if (line.IndexOf ("NUnit.Framework") != -1)
-					continue;
-				Regex r = new Regex (@".*?\(.*?\)\s\[.*?\]\s.*?\s(?<file>.*)\:(?<line>\d*)");
-				Match m = r.Match (line);
-				if (m.Groups ["file"] != null && m.Groups ["line"] != null && File.Exists (m.Groups ["file"].Value)) {
-					int lin;
-					if (int.TryParse (m.Groups ["line"].Value, out lin))
-						return new MonoDevelop.NUnit.SourceCodeLocation (m.Groups ["file"].Value, lin, -1);
-				}
-			}
-			return null;
-		}
-
-		public void Add (UnitTestResult res)
-		{
-			Time += res.Time;
-			Passed += res.Passed;
-			Errors += res.Errors;
-			Failures += res.Failures;
-			Ignored += res.Ignored;
-			Inconclusive += res.Inconclusive;
-			Skipped += res.Skipped;
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/UnitTestResultsStore.cs b/main/src/addins/NUnit/Services/UnitTestResultsStore.cs
deleted file mode 100644
index 37bbe7edc3..0000000000
--- a/main/src/addins/NUnit/Services/UnitTestResultsStore.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// TestNodeBuilder.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
-namespace MonoDevelop.NUnit
-{
-	public class UnitTestResultsStore
-	{
-		UnitTest test;
-		IResultsStore store;
-		
-		internal UnitTestResultsStore (UnitTest test, IResultsStore store)
-		{
-			this.test = test;
-			this.store = store;
-		}
-		
-		public UnitTestResult GetLastResult (DateTime date)
-		{
-			if (store == null) return null;
-			return store.GetLastResult (test.ActiveConfiguration, test, date);
-		}
-		
-		public UnitTestResult GetNextResult (DateTime date)
-		{
-			if (store == null) return null;
-			return store.GetNextResult (test.ActiveConfiguration, test, date);
-		}
-		
-		public UnitTestResult GetPreviousResult (DateTime date)
-		{
-			if (store == null) return null;
-			return store.GetPreviousResult (test.ActiveConfiguration, test, date);
-		}
-		
-		public UnitTestResult[] GetResults (DateTime startDate, DateTime endDate)
-		{
-			if (store == null) return new UnitTestResult [0];
-			return store.GetResults (test.ActiveConfiguration, test, startDate, endDate);
-		}
-		
-		public UnitTestResult[] GetResultsToDate (DateTime endDate, int count)
-		{
-			if (store == null) return new UnitTestResult [0];
-			return store.GetResultsToDate (test.ActiveConfiguration, test, endDate, count);
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/UnitTestStatus.cs b/main/src/addins/NUnit/Services/UnitTestStatus.cs
deleted file mode 100644
index 272c2ede4f..0000000000
--- a/main/src/addins/NUnit/Services/UnitTestStatus.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// TestStatus.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-namespace MonoDevelop.NUnit
-{
-	public enum TestStatus
-	{
-		Ready,
-		Loading,
-		LoadError,
-		Running
-	}
-	
-	[Flags]
-	public enum ResultStatus
-	{
-		Success = 1,
-		Failure = 2,
-		Ignored = 4,
-		Inconclusive = 8
-	}
-}
-
diff --git a/main/src/addins/NUnit/Services/WorkspaceTestGroup.cs b/main/src/addins/NUnit/Services/WorkspaceTestGroup.cs
deleted file mode 100644
index 0c7713f524..0000000000
--- a/main/src/addins/NUnit/Services/WorkspaceTestGroup.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// WorkspaceTestGroup.cs
-//
-// Author:
-//   Lluis Sanchez Gual
-//
-// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using MonoDevelop.Projects;
-
-
-namespace MonoDevelop.NUnit
-{
-	public class WorkspaceTestGroup: UnitTestGroup
-	{
-		Workspace workspace;
-		
-		public WorkspaceTestGroup (Workspace ws): base (ws.Name, ws)
-		{
-			string storeId = ws.Name;
-			string resultsPath = MonoDevelop.NUnit.RootTest.GetTestResultsDirectory (ws.BaseDirectory);
-			ResultsStore = new BinaryResultsStore (resultsPath, storeId);
-			
-			workspace = ws;
-			workspace.ItemAdded += OnEntryChanged;
-			workspace.ItemRemoved += OnEntryChanged;
-			workspace.NameChanged += OnCombineRenamed;
-		}
-		
-		public static WorkspaceTestGroup CreateTest (Workspace ws)
-		{
-			return new WorkspaceTestGroup (ws);
-		}
-		
-		public override void Dispose ()
-		{
-			workspace.ItemAdded -= OnEntryChanged;
-			workspace.ItemRemoved -= OnEntryChanged;
-			workspace.NameChanged -= OnCombineRenamed;
-			base.Dispose ();
-		}
-		
-		void OnEntryChanged (object sender, WorkspaceItemEventArgs e)
-		{
-			UpdateTests ();
-		}
-		
-		void OnCombineRenamed (object sender, WorkspaceItemRenamedEventArgs e)
-		{
-			UnitTestGroup parent = Parent as UnitTestGroup;
-			if (parent != null)
-				parent.UpdateTests ();
-		}
-		
-		protected override void OnCreateTests ()
-		{
-			NUnitService testService = NUnitService.Instance;
-			foreach (WorkspaceItem e in workspace.Items) {
-				UnitTest t = testService.BuildTest (e);
-				if (t != null)
-					Tests.Add (t);
-			}
-		}
-	}
-}
-
diff --git a/main/src/addins/NUnit/gtk-gui/MonoDevelop.NUnit.NUnitOptionsWidget.cs b/main/src/addins/NUnit/gtk-gui/MonoDevelop.NUnit.NUnitOptionsWidget.cs
deleted file mode 100644
index 81b4cad14b..0000000000
--- a/main/src/addins/NUnit/gtk-gui/MonoDevelop.NUnit.NUnitOptionsWidget.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.NUnit
-{
-	internal partial class NUnitOptionsWidget
-	{
-		private global::Gtk.VBox vbox1;
-		private global::Gtk.CheckButton useParentCheck;
-		private global::Gtk.HSeparator hseparator1;
-		private global::Gtk.VBox vbox3;
-		private global::Gtk.Label label1;
-		private global::Gtk.HBox hbox2;
-		private global::Gtk.Label label2;
-		private global::Gtk.VBox vbox4;
-		private global::Gtk.RadioButton noFilterRadio;
-		private global::Gtk.RadioButton includeRadio;
-		private global::Gtk.RadioButton excludeRadio;
-		private global::Gtk.Label label3;
-		private global::Gtk.HBox hbox1;
-		private global::Gtk.Label label4;
-		private global::Gtk.ScrolledWindow scrolledwindow1;
-		private global::Gtk.TreeView categoryTree;
-		private global::Gtk.VBox vbox2;
-		private global::Gtk.Button addButton;
-		private global::Gtk.Button removeButton;
-		
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.NUnit.NUnitOptionsWidget
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "MonoDevelop.NUnit.NUnitOptionsWidget";
-			// Container child MonoDevelop.NUnit.NUnitOptionsWidget.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
-			this.vbox1.Name = "vbox1";
-			this.vbox1.Spacing = 6;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.useParentCheck = new global::Gtk.CheckButton ();
-			this.useParentCheck.Name = "useParentCheck";
-			this.useParentCheck.Label = global::Mono.Unix.Catalog.GetString ("Use parent test settings");
-			this.useParentCheck.DrawIndicator = true;
-			this.useParentCheck.UseUnderline = true;
-			this.vbox1.Add (this.useParentCheck);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.useParentCheck]));
-			w1.Position = 0;
-			w1.Expand = false;
-			w1.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.hseparator1 = new global::Gtk.HSeparator ();
-			this.hseparator1.Name = "hseparator1";
-			this.vbox1.Add (this.hseparator1);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
-			w2.Position = 1;
-			w2.Expand = false;
-			w2.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("The following filter will be applied when running the tests:");
-			this.vbox3.Add (this.label1);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label1]));
-			w3.Position = 0;
-			w3.Expand = false;
-			w3.Fill = false;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
-			this.hbox2.Name = "hbox2";
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.WidthRequest = 18;
-			this.label2.Name = "label2";
-			this.hbox2.Add (this.label2);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label2]));
-			w4.Position = 0;
-			w4.Expand = false;
-			w4.Fill = false;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.vbox4 = new global::Gtk.VBox ();
-			this.vbox4.Name = "vbox4";
-			this.vbox4.Spacing = 6;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.noFilterRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Don't apply any filter"));
-			this.noFilterRadio.Name = "noFilterRadio";
-			this.noFilterRadio.Active = true;
-			this.noFilterRadio.DrawIndicator = true;
-			this.noFilterRadio.UseUnderline = true;
-			this.noFilterRadio.Group = new global::GLib.SList (global::System.IntPtr.Zero);
-			this.vbox4.Add (this.noFilterRadio);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.noFilterRadio]));
-			w5.Position = 0;
-			w5.Expand = false;
-			w5.Fill = false;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.includeRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Include the following categories"));
-			this.includeRadio.Name = "includeRadio";
-			this.includeRadio.DrawIndicator = true;
-			this.includeRadio.UseUnderline = true;
-			this.includeRadio.Group = this.noFilterRadio.Group;
-			this.vbox4.Add (this.includeRadio);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.includeRadio]));
-			w6.Position = 1;
-			w6.Expand = false;
-			w6.Fill = false;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.excludeRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Exclude the following categories"));
-			this.excludeRadio.Name = "excludeRadio";
-			this.excludeRadio.DrawIndicator = true;
-			this.excludeRadio.UseUnderline = true;
-			this.excludeRadio.Group = this.noFilterRadio.Group;
-			this.vbox4.Add (this.excludeRadio);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.excludeRadio]));
-			w7.Position = 2;
-			w7.Expand = false;
-			w7.Fill = false;
-			this.hbox2.Add (this.vbox4);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vbox4]));
-			w8.Position = 1;
-			this.vbox3.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox2]));
-			w9.Position = 1;
-			this.vbox1.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.vbox3]));
-			w10.Position = 2;
-			w10.Expand = false;
-			w10.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.Xalign = 0F;
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Categories:");
-			this.vbox1.Add (this.label3);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.label3]));
-			w11.Position = 3;
-			w11.Expand = false;
-			w11.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.label4 = new global::Gtk.Label ();
-			this.label4.WidthRequest = 18;
-			this.label4.Name = "label4";
-			this.hbox1.Add (this.label4);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label4]));
-			w12.Position = 0;
-			w12.Expand = false;
-			w12.Fill = false;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow1.Name = "scrolledwindow1";
-			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			this.categoryTree = new global::Gtk.TreeView ();
-			this.categoryTree.Name = "categoryTree";
-			this.scrolledwindow1.Add (this.categoryTree);
-			this.hbox1.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.scrolledwindow1]));
-			w14.Position = 1;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.vbox2 = new global::Gtk.VBox ();
-			this.vbox2.Name = "vbox2";
-			this.vbox2.Spacing = 6;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.addButton = new global::Gtk.Button ();
-			this.addButton.Name = "addButton";
-			this.addButton.UseStock = true;
-			this.addButton.UseUnderline = true;
-			this.addButton.Label = "gtk-add";
-			this.vbox2.Add (this.addButton);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.addButton]));
-			w15.Position = 0;
-			w15.Expand = false;
-			w15.Fill = false;
-			// Container child vbox2.Gtk.Box+BoxChild
-			this.removeButton = new global::Gtk.Button ();
-			this.removeButton.Name = "removeButton";
-			this.removeButton.UseStock = true;
-			this.removeButton.UseUnderline = true;
-			this.removeButton.Label = "gtk-remove";
-			this.vbox2.Add (this.removeButton);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.removeButton]));
-			w16.Position = 1;
-			w16.Expand = false;
-			w16.Fill = false;
-			this.hbox1.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2]));
-			w17.Position = 2;
-			w17.Expand = false;
-			w17.Fill = false;
-			this.vbox1.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
-			w18.Position = 4;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Show ();
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/gtk-gui/generated.cs b/main/src/addins/NUnit/gtk-gui/generated.cs
deleted file mode 100644
index 75935e2e55..0000000000
--- a/main/src/addins/NUnit/gtk-gui/generated.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace Stetic
-{
-	internal class Gui
-	{
-		private static bool initialized;
-
-		internal static void Initialize (Gtk.Widget iconRenderer)
-		{
-			if ((Stetic.Gui.initialized == false)) {
-				Stetic.Gui.initialized = true;
-			}
-		}
-	}
-
-	internal class BinContainer
-	{
-		private Gtk.Widget child;
-		private Gtk.UIManager uimanager;
-
-		public static BinContainer Attach (Gtk.Bin bin)
-		{
-			BinContainer bc = new BinContainer ();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
-			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
-			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
-			return bc;
-		}
-
-		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
-		{
-			if ((this.child != null)) {
-				args.Requisition = this.child.SizeRequest ();
-			}
-		}
-
-		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
-		{
-			if ((this.child != null)) {
-				this.child.Allocation = args.Allocation;
-			}
-		}
-
-		private void OnAdded (object sender, Gtk.AddedArgs args)
-		{
-			this.child = args.Widget;
-		}
-
-		public void SetUiManager (Gtk.UIManager uim)
-		{
-			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
-		}
-
-		private void OnRealized (object sender, System.EventArgs args)
-		{
-			if ((this.uimanager != null)) {
-				Gtk.Widget w;
-				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
-					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
-					this.uimanager = null;
-				}
-			}
-		}
-	}
-
-	internal class ActionGroups
-	{
-		public static Gtk.ActionGroup GetActionGroup (System.Type type)
-		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
-		}
-
-		public static Gtk.ActionGroup GetActionGroup (string name)
-		{
-			return null;
-		}
-	}
-}
diff --git a/main/src/addins/NUnit/gtk-gui/gui.stetic b/main/src/addins/NUnit/gtk-gui/gui.stetic
deleted file mode 100644
index b198c1bf51..0000000000
--- a/main/src/addins/NUnit/gtk-gui/gui.stetic
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<stetic-interface>
-  <configuration>
-    <images-root-path>..</images-root-path>
-    <target-gtk-version>2.12</target-gtk-version>
-  </configuration>
-  <import>
-    <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/AddIns/NUnit/MonoDevelop.NUnit.dll" internal="true" />
-  </import>
-  <widget class="Gtk.Bin" id="MonoDevelop.NUnit.NUnitOptionsWidget" design-size="450 380">
-    <property name="MemberName" />
-    <property name="GeneratePublic">False</property>
-    <child>
-      <widget class="Gtk.VBox" id="vbox1">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <child>
-          <widget class="Gtk.CheckButton" id="useParentCheck">
-            <property name="MemberName" />
-            <property name="Label" translatable="yes">Use parent test settings</property>
-            <property name="DrawIndicator">True</property>
-            <property name="HasLabel">True</property>
-            <property name="UseUnderline">True</property>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">False</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.HSeparator" id="hseparator1">
-            <property name="MemberName" />
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">False</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.VBox" id="vbox3">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <child>
-              <widget class="Gtk.Label" id="label1">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">The following filter will be applied when running the tests:</property>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">False</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.HBox" id="hbox2">
-                <property name="MemberName" />
-                <child>
-                  <widget class="Gtk.Label" id="label2">
-                    <property name="MemberName" />
-                    <property name="WidthRequest">18</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">False</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox4">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.RadioButton" id="noFilterRadio">
-                        <property name="MemberName" />
-                        <property name="Label" translatable="yes">Don't apply any filter</property>
-                        <property name="Active">True</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="Group">noFilterRadio</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.RadioButton" id="includeRadio">
-                        <property name="MemberName" />
-                        <property name="Label" translatable="yes">Include the following categories</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="Group">noFilterRadio</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.RadioButton" id="excludeRadio">
-                        <property name="MemberName" />
-                        <property name="Label" translatable="yes">Exclude the following categories</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="Group">noFilterRadio</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">2</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">2</property>
-            <property name="AutoSize">False</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="label3">
-            <property name="MemberName" />
-            <property name="Xalign">0</property>
-            <property name="LabelProp" translatable="yes">Categories:</property>
-          </widget>
-          <packing>
-            <property name="Position">3</property>
-            <property name="AutoSize">False</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.HBox" id="hbox1">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <child>
-              <widget class="Gtk.Label" id="label4">
-                <property name="MemberName" />
-                <property name="WidthRequest">18</property>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">False</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
-                <property name="MemberName" />
-                <property name="ShadowType">In</property>
-                <child>
-                  <widget class="Gtk.TreeView" id="categoryTree">
-                    <property name="MemberName" />
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.VBox" id="vbox2">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Button" id="addButton">
-                    <property name="MemberName" />
-                    <property name="UseStock">True</property>
-                    <property name="Type">StockItem</property>
-                    <property name="StockId">gtk-add</property>
-                    <property name="label">gtk-add</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">False</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.Button" id="removeButton">
-                    <property name="MemberName" />
-                    <property name="UseStock">True</property>
-                    <property name="Type">StockItem</property>
-                    <property name="StockId">gtk-remove</property>
-                    <property name="label">gtk-remove</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">False</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">False</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">4</property>
-            <property name="AutoSize">False</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</stetic-interface>
\ No newline at end of file
diff --git a/main/src/addins/NUnit/packages.config b/main/src/addins/NUnit/packages.config
deleted file mode 100644
index b815516599..0000000000
--- a/main/src/addins/NUnit/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<packages>

-  <package id="NUnit" version="2.6.4" targetFramework="net40" />

-  <package id="NUnit.Runners" version="2.6.4" targetFramework="net40" />

-</packages>

diff --git a/main/src/addins/NUnit/templates/images/nunit-library-project.png b/main/src/addins/NUnit/templates/images/nunit-library-project.png
deleted file mode 100644
index 99f50eb029..0000000000
--- a/main/src/addins/NUnit/templates/images/nunit-library-project.png
+++ /dev/null
diff --git a/main/src/addins/NUnit/templates/images/nunit-library-project@2x.png b/main/src/addins/NUnit/templates/images/nunit-library-project@2x.png
deleted file mode 100644
index 86fcbe0866..0000000000
--- a/main/src/addins/NUnit/templates/images/nunit-library-project@2x.png
+++ /dev/null
diff --git a/main/src/addins/TextTemplating/ChangeLog b/main/src/addins/TextTemplating/ChangeLog
deleted file mode 100644
index b50bf1355a..0000000000
--- a/main/src/addins/TextTemplating/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* TextTransform:
-	* Mono.TextTemplating:
-	* Mono.TextTemplating.Tests:
-	* MonoDevelop.TextTemplating: Include the ASP.NET MVC and
-	  TextTemplating addins in the main solution and build.
-
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/ChangeLog b/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/ChangeLog
deleted file mode 100644
index 061fc503b5..0000000000
--- a/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/ChangeLog
+++ /dev/null
@@ -1,65 +0,0 @@
-2009-12-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.Tests.csproj: Don't local-copy nunit.
-
-2009-11-27  Olivier Dagenais  <olivier.dagenais@gmail.com>
-
-	* GenerationTests.cs: Make tests independent of the runtime
-	  they are running under by stripping the "autogenerated"
-	  comment (i.e. the first 9 lines).
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Mono.TextTemplating.Tests.csproj: Flush.
-
-2009-08-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* DummyHost.cs: Fix windows build.
-
-2009-08-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.Tests.csproj: Use assembly refs for
-	  nunit.
-
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.Tests.csproj: Include the ASP.NET MVC
-	  and TextTemplating addins in the main solution and build.
-
-2009-04-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* GenerationTests.cs: Add tests for Windows/Mac newlines.
-
-2009-04-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.Tests.csproj: Updated.
-
-	* GenerationTests.cs: Add test for C# output.
-
-	* ParsingTests.cs: Track dummy host name change.
-
-	* DummyHost.cs: Add more functionality to dummy host.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.Tests.csproj: Move output dir from
-	  ../bin to ../build.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.Tests.csproj: Fix output directory.
-
-2009-03-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.Tests.csproj: Updated.
-
-	* ParsingTests.cs: Add parser test.
-
-	* DummyHost.cs: Dummy templating host.
-
-2009-03-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.Tests.csproj: Add tests.
-
-	* ParsingTests.cs: Tokeniser state/value/location test.
-
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/EngineTests.cs b/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/EngineTests.cs
new file mode 100644
index 0000000000..e81aee6164
--- /dev/null
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/EngineTests.cs
@@ -0,0 +1,72 @@
+//
+// EngineTests.cs
+//
+// Author:
+//       Mikayla Hutchinson <m.j.hutchinson@gmail.com>
+//
+// Copyright (c) 2016 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using NUnit.Framework;
+
+namespace Mono.TextTemplating.Tests
+{
+	[TestFixture]
+	public class EngineTests
+	{
+		#pragma warning disable 414
+		static object [] ParameterParsingCases = {
+			new object [] { "foo=bar",             true,  "",     "",    "foo", "bar"     },
+			new object [] { "a=b",                 true,  "",     "",    "a",   "b"       },
+			new object [] { "a=b=c",               true,  "",     "",    "a",   "b=c"     },
+			new object [] { "!!c!d",               true,  "",     "",    "c",   "d"       },
+			new object [] { "!!!",                 false, "",     "",    "",    ""        },
+			new object [] { "a=",                  true,  "",     "",    "a",   ""        },
+			new object [] { "=",                   false, "",     "",    "",    ""        },
+			new object [] { "",                    false, "",     "",    "",    ""        },
+			new object [] { "!",                   false, "",     "",    "",    ""        },
+			new object [] { "a!",                  true,  "",     "",    "a",   ""        },
+			new object [] { "!b!c!d",              true,  "",     "b",   "c",   "d"       },
+			new object [] { "a!b!c!d",             true,  "a",    "b",   "c",   "d"       },
+			new object [] { "a=b!c!d!e",           true,  "",     "",    "a",   "b!c!d!e" },
+			new object [] { "a!b!c!d!e",           true,  "a",    "b",   "c",   "d!e"     },
+			new object [] { "foo!bar!baz!wibb!le", true,  "foo", "bar", "baz",  "wibb!le" },
+		};
+		#pragma warning restore 414
+
+		[Test]
+		[TestCaseSource(nameof (ParameterParsingCases))]
+		public void ParameterParsing (
+			string parameter, bool valid,
+			string expectedProcessor, string expectedDirective,
+			string expectedName, string expectedValue)
+		{
+			string processor, directive, name, value;
+			var success = TemplateGenerator.TryParseParameter (parameter, out processor, out directive, out name, out value);
+
+			Assert.AreEqual (valid, success);
+			Assert.AreEqual (expectedProcessor, processor);
+			Assert.AreEqual (expectedDirective, directive);
+			Assert.AreEqual (expectedName, name);
+			Assert.AreEqual (expectedValue, value);
+		}
+	}
+}
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj b/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj
index fec16c1aac..ed523be4cf 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj
@@ -42,6 +42,8 @@
     <Compile Include="TemplatingEngineHelper.cs" />
     <Compile Include="TemplateEnginePreprocessTemplateTests.cs" />
     <Compile Include="GenerateIndentedClassCodeTests.cs" />
+    <Compile Include="TextTemplatingSessionTests.cs" />
+    <Compile Include="EngineTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mono.TextTemplating\Mono.TextTemplating.csproj">
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/TextTemplatingSessionTests.cs b/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/TextTemplatingSessionTests.cs
new file mode 100644
index 0000000000..c5b0606394
--- /dev/null
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/TextTemplatingSessionTests.cs
@@ -0,0 +1,57 @@
+//

+// TextTemplatingSessionTests.cs

+//

+// Author:

+//       Matt Ward <matt.ward@xamarin.com>

+//

+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+using System;

+using System.Reflection;

+using Microsoft.VisualStudio.TextTemplating;

+using NUnit.Framework;

+

+namespace Mono.TextTemplating.Tests

+{

+	[TestFixture]

+	public class TextTemplatingSessionTests

+	{

+		[Test]

+		public void AppDomainSerializationTest ()

+		{

+			var guid = Guid.NewGuid ();

+			var appDomain = AppDomain.CreateDomain ("TextTemplatingSessionSerializationTestAppDomain");

+

+			var session = (TextTemplatingSession)appDomain.CreateInstanceFromAndUnwrap (

+				typeof(TextTemplatingSession).Assembly.Location,

+				typeof(TextTemplatingSession).FullName,

+				false,

+				BindingFlags.Public | BindingFlags.Instance,

+				null,

+				new object[] { guid },

+				null,

+				null);

+

+			Assert.AreEqual (guid, session.Id);

+		}

+	}

+}

+

diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/AssemblyInfo.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/AssemblyInfo.cs
index 13849716d3..9747297d18 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/AssemblyInfo.cs
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/AssemblyInfo.cs
@@ -34,4 +34,6 @@ using System;
 [assembly: AssemblyCopyright("MIT/X11")]
 [assembly: CLSCompliant (true)]
 
+[assembly: InternalsVisibleTo("Mono.TextTemplating.Tests")]
+
 //[assembly: AssemblyVersion("1.0.0.0")]
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/ChangeLog b/main/src/addins/TextTemplating/Mono.TextTemplating/ChangeLog
deleted file mode 100644
index 513777600d..0000000000
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/ChangeLog
+++ /dev/null
@@ -1,212 +0,0 @@
-2010-03-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/TemplateGenerator.cs: Expose OutputFile
-	  for custom tool to access.
-
-2010-03-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/CrossAppDomainAssemblyResolver.cs: A
-	  handler for AssemblyResolve events that looks them up in the
-	  domain that created the resolver.
-
-	* Makefile.am:
-	* Mono.TextTemplating.csproj: Added file.
-
-2009-11-27  Olivier Dagenais  <olivier.dagenais@gmail.com>
-	* Mono.TextTemplating/ParsedTemplate.cs: Fixed a bug where the
-	  location of an error was being ignored.
-
-2009-11-27  Olivier Dagenais  <olivier.dagenais@gmail.com>
-
-	* Mono.TextTemplating/TemplatingEngine.cs: Mark the generated
-	  type as partial.
-
-2009-11-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/ParsedTemplate.cs: Don't check if
-	  included file exists before trying to resolve it from the
-	  host, because host may use include paths. Patch from Aaron
-	  Bockover.
-
-2009-08-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/TemplatingEngine.cs: Fix NRE when
-	  template fails to compile.
-
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* Mono.TextTemplating.csproj: Include the ASP.NET MVC and
-	  TextTemplating addins in the main solution and build.
-
-2009-08-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.csproj:
-	* Mono.TextTemplating/ParsedTemplate.cs:
-	* Mono.TextTemplating/CompiledTemplate.cs:
-	* Mono.TextTemplating/TemplatingEngine.cs:
-	* Mono.TextTemplating/TemplateGenerator.cs:
-	* Mono.TextTemplating/IExtendedTextTemplatingEngineHost.cs:
-	  Add support for caching compiled templates, and a couple of
-	  bugfixes. Patch from Nathan Baulch
-	  (nathan.baulch@gmail.com).
-
-2009-06-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/TemplatingEngine.cs: Handle expressions
-	  and content in helpers, based on patch from Nathan Baulch.
-	  Liberally add C# 3 sugar to neaten up CodeDOM usage.
-
-2009-06-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/TemplateGenerator.cs: Added overload for
-	  Process template that uses input/output strings directly,
-	  avoiding file read/write. Expose engine to subclasses.
-
-	* Mono.TextTemplating/Tokeniser.cs: Remove outdated TODO.
-
-2009-04-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Microsoft.VisualStudio.TextTemplating/ToStringHelper.cs: Use
-	  IConvertible.ToString (formatProvider) when possible.
-	
-	Thanks to Stuart Carnie for this patch.
-
-2009-04-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/Tokeniser.cs: Add support for Mac and
-	  Windows newlines.
-
-	* Mono.TextTemplating/TemplatingEngine.cs: Keep temp files
-	  when in debug mode, so that the generated code can be
-	  debugged.
-
-	* Mono.TextTemplating/ParsedTemplate.cs: Fixes for csc
-	  compilation.
-
-	Thanks to Stuart Carnie for this patch.
-
-2009-04-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.csproj:
-	* Mono.TextTemplating/TemplatingEngine.cs:
-	* Mono.TextTemplating/TemplateSettings.cs:
-	* Microsoft.VisualStudio.TextTemplating/Engine.cs: Move the
-	  real engine into the Mono.TextTemplating namespace and
-	  expose helper methods so that they can be tested.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.csproj: Move output dir from ../bin to
-	  ../build.
-
-2009-03-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/Tokeniser.cs: Tweaked location of next
-	  state after directive.
-
-2009-03-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/Tokeniser.cs: Location tweaks within
-	  directives.
-
-	* Mono.TextTemplating/ParsedTemplate.cs: Make Location
-	  equatable.
-
-2009-03-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/Tokeniser.cs:
-	* Mono.TextTemplating/ParsedTemplate.cs: Fix end location
-	  capture after newline handling changes.
-
-2009-03-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/Tokeniser.cs:
-	* Microsoft.VisualStudio.TextTemplating/Engine.cs: Match T4's
-	  newline handling.
-
-2009-03-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/ParsedTemplate.cs: Fix logic that
-	  prevented adding directives.
-
-2009-03-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/Tokeniser.cs:
-	* Mono.TextTemplating/ParsedTemplate.cs: More accurate
-	  location captures. Capture start of tags as well as start of
-	  content.
-
-2009-03-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/TemplateGenerator.cs: Report exceptions
-	  in errors.
-
-	* Mono.TextTemplating/Tokeniser.cs: Make API public.
-
-	* Mono.TextTemplating/ParsedTemplate.cs: Unify segment types.
-	  Track end locations. Make API public. Allow parsing without
-	  includes.
-
-	* Microsoft.VisualStudio.TextTemplating/Engine.cs: Track
-	  location API.
-
-2009-03-06  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/TemplateGenerator.cs: Fix
-	  SetFileExtension.
-
-	* Microsoft.VisualStudio.TextTemplating/Engine.cs: Capture
-	  hostspecific attribute from template directive.
-
-2009-03-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating/TemplateGenerator.cs: Fix output
-	  extension changing.
-
-	* Mono.TextTemplating/Tokeniser.cs: Fix helper regions.
-
-2009-03-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Mono.TextTemplating.csproj: Updated.
-
-	* Mono.TextTemplating/TemplateGenerator.cs: Simple template
-	  host implementation. Doesn't handle everything yet.
-
-	* Mono.TextTemplating/Tokeniser.cs: Fix a number of offset
-	  issues that broke most captures. Only allow EOF in content
-	  regions, and in this case capture the last content. Track
-	  current column, for error reporting.
-
-	* Mono.TextTemplating/ParsedTemplate.cs: Overhaul location
-	  tracking for error reporting. Don't record empty segments.
-
-	* Microsoft.VisualStudio.TextTemplating/Engine.cs: Use run
-	  method instead of runner, since the whole thing's done in
-	  the appdomain now. Catch errors from the runner. Use host's
-	  default assemblies and imports. Track ParsedTemplate error
-	  reporting changes. Filter out content regions with only a
-	  single newline.
-
-	* Microsoft.VisualStudio.TextTemplating/ToStringHelper.cs:
-	  Don't cache delegates; this won't work for instances. Maybe
-	  IL generation is called for.
-
-2009-03-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs:
-	* Mono.TextTemplating:
-	* Mono.TextTemplating.csproj:
-	* Mono.TextTemplating/Tokeniser.cs:
-	* Microsoft.VisualStudio.TextTemplating:
-	* Mono.TextTemplating/ParsedTemplate.cs:
-	* Microsoft.VisualStudio.TextTemplating/Engine.cs:
-	* Microsoft.VisualStudio.TextTemplating/ToStringHelper.cs:
-	* Microsoft.VisualStudio.TextTemplating/DirectiveProcessor.cs:
-	* Microsoft.VisualStudio.TextTemplating/TextTransformation.cs:
-	* Microsoft.VisualStudio.TextTemplating/ITextTemplatingEngineHost.cs:
-	* Microsoft.VisualStudio.TextTemplating/DirectiveProcessorException.cs:
-	* Microsoft.VisualStudio.TextTemplating/RequiresProvidesDirectiveProcessor.cs:
-	  Move T4 implementation to its own assembly. Tweak some
-	  appdomain stuff.
-
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Microsoft.VisualStudio.TextTemplating/TextTemplatingSession.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/Microsoft.VisualStudio.TextTemplating/TextTemplatingSession.cs
index ce362d10c6..cf1fc83b20 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/Microsoft.VisualStudio.TextTemplating/TextTemplatingSession.cs
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Microsoft.VisualStudio.TextTemplating/TextTemplatingSession.cs
@@ -31,12 +31,18 @@ using System.Runtime.Serialization;
 namespace Microsoft.VisualStudio.TextTemplating

 {

 	[Serializable]

-	public sealed class TextTemplatingSession : Dictionary<string, Object>, ITextTemplatingSession

+	public sealed class TextTemplatingSession : Dictionary<string, Object>, ITextTemplatingSession, ISerializable

 	{

 		public TextTemplatingSession () : this (Guid.NewGuid ())

 		{

 		}

-		

+

+		TextTemplatingSession (SerializationInfo info, StreamingContext context)

+			: base (info, context)

+		{

+			Id = (Guid)info.GetValue ("Id", typeof (Guid));

+		}

+

 		public TextTemplatingSession (Guid id)

 		{

 			this.Id = id;

@@ -66,6 +72,12 @@ namespace Microsoft.VisualStudio.TextTemplating
 		{

 			return other != null && other.Id == this.Id;

 		}

+

+		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)

+		{

+			base.GetObjectData (info, context);

+			info.AddValue ("Id", Id);

+		}

 	}

 }

 

diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating.nuspec b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating.nuspec
index dc7ba85255..9b294cf88e 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating.nuspec
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating.nuspec
@@ -2,18 +2,20 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">

     <metadata>

         <id>Mono.TextTemplating</id>

-        <version>1.0.0</version>

+        <version>1.1.0</version>
         <title>Mono.TextTemplating</title>

-        <authors>Michael Hutchinson</authors>

+        <authors>Mikayla Hutchinson</authors>
         <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>

         <projectUrl>https://github.com/mono/monodevelop/tree/master/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating</projectUrl>

         <requireLicenseAcceptance>false</requireLicenseAcceptance>

         <description>Open-source implementation of the T4 templating engine.</description>

-        <releaseNotes>Built from MonoDevelop git repository, commit 94b807b84f7e9d164e44a57fc594039738e4a920</releaseNotes>

-        <copyright>2009-2011 Novell, Inc. 2011-2014 Xamarin Inc.</copyright>

+        <releaseNotes>Built from MonoDevelop git repository, commit ad93842159363eaaebcb36701ac95a4eaef23c87</releaseNotes>

+        <copyright>2009-2011 Novell, Inc. 2011-2016 Xamarin Inc.</copyright>
         <tags>T4, templating</tags>

     </metadata>

     <files>

-        <file src="..\..\..\..\build\AddIns\MonoDevelop.TextTemplating\Mono.TextTemplating.dll" target="lib\Mono.TextTemplating.dll" />

+        <file src="../../../../build/AddIns/MonoDevelop.TextTemplating/Mono.TextTemplating.dll" target="lib/net45/Mono.TextTemplating.dll" />
+        <file src="../../../../build/AddIns/MonoDevelop.TextTemplating/TextTransform.exe" target="tools/TextTransform.exe" />
+        <file src="../../../../build/AddIns/MonoDevelop.TextTemplating/Mono.TextTemplating.dll" target="tools/Mono.TextTemplating.dll" />
     </files>

-</package>
\ No newline at end of file
+</package>
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/CompiledTemplate.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/CompiledTemplate.cs
index 1506211283..3679b6f860 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/CompiledTemplate.cs
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/CompiledTemplate.cs
@@ -121,13 +121,17 @@ namespace Mono.TextTemplating
 		
 		Assembly ResolveReferencedAssemblies (object sender, ResolveEventArgs args)
 		{
-			Assembly asm = null;
+			AssemblyName asmName = new AssemblyName (args.Name);
 			foreach (var asmFile in assemblyFiles) {
-				var name = System.IO.Path.GetFileNameWithoutExtension (asmFile);
-				if (args.Name.StartsWith (name, StringComparison.Ordinal))
-					asm = Assembly.LoadFrom (asmFile);
+				if (asmName.Name == System.IO.Path.GetFileNameWithoutExtension (asmFile))
+					return Assembly.LoadFrom (asmFile);
 			}
-			return asm;
+
+			var path = host.ResolveAssemblyReference (asmName.Name + ".dll");
+			if (System.IO.File.Exists (path))
+				return Assembly.LoadFrom (path);
+
+			return null;
 		}
 		
 		public void Dispose ()
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs
index ebb5568c06..5c661ed7bb 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs
@@ -264,6 +264,70 @@ namespace Mono.TextTemplating
 		{
 			parameters.Add (new ParameterKey (processorName, directiveName, parameterName), value);
 		}
+
+		/// <summary>
+		/// Parses a parameter and adds it.
+		/// </summary>
+		/// <returns>Whether the parameter was parsed successfully.</returns>
+		/// <param name="unparsedParameter">Parameter in name=value or processor!directive!name!value format.</param>
+		public bool TryAddParameter (string unparsedParameter)
+		{
+			string processor, directive, name, value;
+			if (TryParseParameter (unparsedParameter, out processor, out directive, out name, out value)) {
+				AddParameter (processor, directive, name, value);
+				return true;
+			}
+			return false;
+		}
+
+		internal static bool TryParseParameter (string parameter, out string processor, out string directive, out string name, out string value)
+		{
+			processor = directive = name = value = "";
+
+			int start = 0;
+			int end = parameter.IndexOfAny (new [] { '=', '!' });
+			if (end < 0)
+				return false;
+
+			//simple format n=v
+			if (parameter [end] == '=') {
+				name = parameter.Substring (start, end);
+				value = parameter.Substring (end + 1);
+				return !string.IsNullOrEmpty (name);
+			}
+
+			//official format, p!d!n!v
+			processor = parameter.Substring (start, end);
+
+			start = end + 1;
+			end = parameter.IndexOf ('!', start);
+			if (end < 0) {
+				//unlike official version, we allow you to omit processor/directive
+				name = processor;
+				value = parameter.Substring (start);
+				processor = "";
+				return !string.IsNullOrEmpty (name);
+			}
+
+			directive = parameter.Substring (start, end - start);
+
+
+			start = end + 1;
+			end = parameter.IndexOf ('!', start);
+			if (end < 0) {
+				//we also allow you just omit the processor
+				name = directive;
+				directive = processor;
+				value = parameter.Substring (start);
+				processor = "";
+				return !string.IsNullOrEmpty (name);
+			}
+
+			name = parameter.Substring (start, end - start);
+			value = parameter.Substring (end + 1);
+
+			return !string.IsNullOrEmpty (name);
+		}
 		
 		protected virtual bool LoadIncludeText (string requestFileName, out string content, out string location)
 		{
diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs
index 9425f6dae8..69a6f6a5c7 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs
@@ -1094,6 +1094,7 @@ namespace Mono.TextTemplating
 			var initializeCodeGenerator = GetInitializeCodeGeneratorAction (cgType);
 			var cgFieldGen = cgType.GetMethod ("GenerateField", BindingFlags.NonPublic | BindingFlags.Instance);
 			var cgPropGen = cgType.GetMethod ("GenerateProperty", BindingFlags.NonPublic | BindingFlags.Instance);
+			var cgMethGen = cgType.GetMethod ("GenerateMethod", BindingFlags.NonPublic | BindingFlags.Instance);
 
 			#pragma warning disable 0618
 			var generator = (CodeGenerator) provider.CreateGenerator ();
@@ -1113,6 +1114,12 @@ namespace Mono.TextTemplating
 					cgPropGen.Invoke (generator, new object[] { p, dummy });
 					continue;
 				}
+				var m = member as CodeMemberMethod;
+				if (m != null) {
+					initializeCodeGenerator (generator, sw, options);
+					cgMethGen.Invoke (generator, new object[] { m, dummy });
+					continue;
+				}
 			}
 		}
 
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/ChangeLog b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/ChangeLog
deleted file mode 100644
index 64bfcdfeac..0000000000
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/ChangeLog
+++ /dev/null
@@ -1,191 +0,0 @@
-2010-07-20  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.TextTemplating.csproj: Added reference to
-	  mono.texteditor to allows windows builds.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/T4EditorExtension.cs: Track API changes.
-
-2010-07-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* T4SyntaxMode.xml: Added styles for templated regions in
-	  files, e.g. ASP.NET and T4.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Parser/T4Parser.cs:
-	* MonoDevelop.TextTemplating.addin.xml: Track
-	  ProjectDomService/Parser API.
-
-2010-06-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* TextTemplatingTool.cs: Make ThreadAsyncOperation public.
-
-2010-05-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* TextTemplatingService.cs: Allow RecyclableAppDomain to
-	  resolve assemblies from MD appdomain. Should fix issues
-	  running ASP.NET MVC templates.
-
-2010-05-06  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.TextTemplating.csproj: Added missing core
-	  reference (required for System.Action).
-
-2010-05-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* TextTemplatingTool.cs: Make cancellable, so bad user code
-	  can be aborted.
-
-2010-04-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/T4EditorExtension.cs: Free up wasted space between
-	  scrollbars and treeview contents.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.TextTemplating.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Gui/T4EditorExtension.cs:
-	* MonoDevelop.TextTemplating.csproj:
-	* MonoDevelop.TextTemplating.addin.xml: Merged MD.Projects
-	  into MD.Core, and MD.Projects.Gui, MD.Core.Gui and
-	  MD.Components into MD.Ide.
-
-2010-03-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* TextTemplatingTool.cs: Remove dead code.
-
-2010-03-15  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* TextTemplatingService.cs: Added shared templating appdomain.
-
-	* TextTemplatingTool.cs: Added text templating tool.
-
-	* Templates:
-	* Templates/T4TemplateCSharp.xft.xml:
-	* MonoDevelop.TextTemplating.addin.xml: Added T4 template.
-
-	* Makefile.am:
-	* MonoDevelop.TextTemplating.csproj: Updated.
-
-2010-02-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Gui/T4EditorExtension.cs: File extensions are now declared
-	  in the node metadata.
-
-	* MonoDevelop.TextTemplating.addin.xml: Added some conditions
-	  to avoid early loading of extensions.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.TextTemplating.addin.xml: Bump MD version.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.TextTemplating.csproj: Mark *-sharp references
-	with SpecificVersion=false. Import md.targets .
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.TextTemplating.addin.xml: Bump MD version.
-
-2009-09-12  Mike Krüger  <mkrueger@novell.com>
-
-	* Gui/T4EditorExtension.cs: Track API changes.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.TextTemplating.csproj: Updated dependencies. We
-	  now depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Update assembly info.
-
-	* MonoDevelop.TextTemplating.addin.xml: Typo.
-
-2009-08-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.TextTemplating.csproj: Don't local copy
-	  MD.Components.
-
-2009-08-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.TextTemplating.csproj: Fix build on windows.
-
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.TextTemplating.csproj: Don't local-copy project
-	  refs.
-
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.TextTemplating.csproj: Include the ASP.NET MVC
-	  and TextTemplating addins in the main solution and build.
-
-2009-08-11  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* TextTemplatingService.cs: Track task service API.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.TextTemplating.addin.xml: Bump MD version.
-
-2009-04-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Parser/T4Parser.cs: Track parser API.
-
-2009-04-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.TextTemplating.addin.xml: Fix refs.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.TextTemplating.csproj: Move output dir from
-	  ../bin to ../build.
-
-2009-03-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/T4EditorExtension.cs: Fix warning.
-
-	* TextTemplatingService.cs:
-	* MonoDevelop.TextTemplating.csproj: Added new
-	  TextTemplatingService.
-
-2009-03-10  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui:
-	* Gui/T4EditorExtension.cs:
-	* MonoDevelop.TextTemplating.csproj:
-	* MonoDevelop.TextTemplating.addin.xml: Add T4 editor
-	  extension with outlining.
-
-2009-03-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Parser/T4ParsedDocument.cs: More concise fold markers. Use
-	  new tag start position info.
-
-2009-03-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* .:
-	* Parser:
-	* AssemblyInfo.cs:
-	* T4SyntaxMode.xml:
-	* Parser/T4Parser.cs:
-	* Parser/T4ParsedDocument.cs:
-	* MonoDevelop.TextTemplating.csproj:
-	* MonoDevelop.TextTemplating.addin.xml: Added new
-	  TextTemplating addin.
-
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs
index 260518ee9d..091402071e 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Gui/T4EditorExtension.cs
@@ -32,6 +32,11 @@ using MonoDevelop.DesignerSupport;
 using MonoDevelop.TextTemplating.Parser;
 using MonoDevelop.Ide;
 using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor.Extension;
+using MonoDevelop.Ide.Editor;
+using System.Threading.Tasks;
+using System.Threading;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.TextTemplating.Gui
 {
@@ -44,16 +49,16 @@ namespace MonoDevelop.TextTemplating.Gui
 		{
 		}
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
-			Document.DocumentParsed += HandleDocumentDocumentParsed;
+			DocumentContext.DocumentParsed += HandleDocumentDocumentParsed;
 			HandleDocumentDocumentParsed (this, EventArgs.Empty);
 		}
 
 		void HandleDocumentDocumentParsed (object sender, EventArgs e)
 		{
-			parsedDoc = (T4ParsedDocument)Document.ParsedDocument;
+			parsedDoc = (T4ParsedDocument)DocumentContext.ParsedDocument;
 			if (parsedDoc != null)
 				RefreshOutline ();
 		}
@@ -71,30 +76,21 @@ namespace MonoDevelop.TextTemplating.Gui
 		protected T4ParsedDocument ParsedDoc {
 			get { return parsedDoc; }
 		}
-		
-		protected ITextBuffer Buffer {
-			get {
-				if (Document == null)
-					throw new InvalidOperationException ("Editor extension not yet initialized");
-				return Document.GetContent<ITextBuffer> ();
-			}
-		}
-		
-		protected IEditableTextBuffer EditableBuffer {
+
+		protected TextEditor EditableBuffer {
 			get {
-				if (Document == null)
+				if (DocumentContext == null)
 					throw new InvalidOperationException ("Editor extension not yet initialized");
-				return Document.GetContent<IEditableTextBuffer> ();
+				return DocumentContext.GetContent<TextEditor> ();
 			}
 		}
 		
 		protected string GetBufferText (DomRegion region)
 		{
-			MonoDevelop.Ide.Gui.Content.ITextBuffer buf = Buffer;
-			int start = buf.GetPositionFromLineColumn (region.BeginLine, region.BeginColumn);
-			int end = buf.GetPositionFromLineColumn (region.EndLine, region.EndColumn);
+			int start = Editor.LocationToOffset (region.BeginLine, region.BeginColumn);
+			int end = Editor.LocationToOffset (region.EndLine, region.EndColumn);
 			if (end > start && start >= 0)
-				return buf.GetText (start, end);
+				return Editor.GetTextBetween (start, end);
 			else
 				return null;
 		}
@@ -103,31 +99,28 @@ namespace MonoDevelop.TextTemplating.Gui
 		
 		#region Code completion
 
-		public override ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)
+		public override Task<ICompletionDataList> CodeCompletionCommand (CodeCompletionContext completionContext)
 		{
 			int pos = completionContext.TriggerOffset;
 			if (pos <= 0)
 				return null;
-			int triggerWordLength = 0;
-			return HandleCodeCompletion ((CodeCompletionContext) completionContext, true, ref triggerWordLength);
+			return HandleCodeCompletion ((CodeCompletionContext) completionContext, true);
 		}
 
-		public override ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
+		public override Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
 			int pos = completionContext.TriggerOffset;
 			if (pos > 0 && Editor.GetCharAt (pos - 1) == completionChar) {
-				return HandleCodeCompletion ((CodeCompletionContext) completionContext, 
-				                             false, ref triggerWordLength);
+				return HandleCodeCompletion (completionContext, false);
 			}
 			return null;
 		}
 
-		protected virtual ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, bool forced, ref int triggerWordLength)
+		protected virtual Task<ICompletionDataList> HandleCodeCompletion (
+		    CodeCompletionContext completionContext, bool forced)
 		{
 			//IEditableTextBuffer buf = this.EditableBuffer;
-			return null;
+			return Task.FromResult<ICompletionDataList> (null);
 		}
 		
 		#endregion
@@ -239,7 +232,7 @@ namespace MonoDevelop.TextTemplating.Gui
 		
 		void RefillOutlineStore ()
 		{
-			DispatchService.AssertGuiThread ();
+			Runtime.AssertMainThread ();
 			Gdk.Threads.Enter ();
 			refreshingOutline = false;
 			if (outlineTreeStore == null || !outlineTreeView.IsRealized)
@@ -272,9 +265,9 @@ namespace MonoDevelop.TextTemplating.Gui
 		
 		void SelectSegment (Mono.TextTemplating.ISegment seg)
 		{
-			int s = Editor.Document.LocationToOffset (seg.TagStartLocation.Line, seg.TagStartLocation.Column);
+			int s = Editor.LocationToOffset (seg.TagStartLocation.Line, seg.TagStartLocation.Column);
 			if (s > -1) {
-				Editor.Caret.Offset = s;
+				Editor.CaretOffset = s;
 				Editor.CenterTo (s);
 			}
 		}
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
index 91b0d65c0a..f7725166a1 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj
@@ -77,6 +77,10 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Parser\" />
@@ -104,16 +108,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4ParsedDocument.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4ParsedDocument.cs
index 6c3e152a43..1d6036c153 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4ParsedDocument.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4ParsedDocument.cs
@@ -29,35 +29,28 @@ using System.Collections.Generic;
 using Mono.TextTemplating;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
 
 namespace MonoDevelop.TextTemplating.Parser
 {
 	
 	
-	public class T4ParsedDocument : ParsedDocument
+	public class T4ParsedDocument : DefaultParsedDocument
 	{
-		string fileName;
-		IList<Error> errors;
+		IList<MonoDevelop.Ide.TypeSystem.Error> errors;
 
-		public override string FileName {
-			get {
-				return fileName;
-			}
-		}
-
-		public T4ParsedDocument (string fileName, List<ISegment> segments, IList<Error> errors)
+		public T4ParsedDocument (string fileName, List<ISegment> segments, IList<MonoDevelop.Ide.TypeSystem.Error> errors) : base(fileName)
 		{
-			this.fileName = fileName;
 			this.errors = errors;
 			TemplateSegments = segments;
 		}
 
-		public override IList<Error> Errors {
-			get {
-				return errors;
-			}
+		public override System.Threading.Tasks.Task<IReadOnlyList<MonoDevelop.Ide.TypeSystem.Error>> GetErrorsAsync (System.Threading.CancellationToken cancellationToken)
+		{
+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<MonoDevelop.Ide.TypeSystem.Error>)errors);
 		}
-		
+
 		public List<ISegment> TemplateSegments { get; private set; }
 		
 		public IEnumerable<Directive> TemplateDirectives {
@@ -79,10 +72,15 @@ namespace MonoDevelop.TextTemplating.Parser
 				}
 			}
 		}
+
+		public override System.Threading.Tasks.Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (System.Threading.CancellationToken cancellationToken)
+		{
+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<FoldingRegion>)Foldings.ToList ());
+		}
 		
-		public override IEnumerable<FoldingRegion> Foldings {
+		public IEnumerable<FoldingRegion> Foldings {
 			get {
-				foreach (var region in Comments.ToFolds ()) 
+				foreach (var region in GetCommentsAsync().Result.ToFolds ()) 
 					yield return region;
 				foreach (ISegment seg in TemplateSegments) {
 					if (seg.EndLocation.Line - seg.TagStartLocation.Line < 1)
@@ -105,7 +103,7 @@ namespace MonoDevelop.TextTemplating.Parser
 						name = "<#@" + dir.Name + "...#>";
 					}
 					
-					DomRegion region = new DomRegion (seg.TagStartLocation.Line, seg.TagStartLocation.Column,
+					var region = new DocumentRegion (seg.TagStartLocation.Line, seg.TagStartLocation.Column,
 				                                      seg.EndLocation.Line, seg.EndLocation.Column);
 					
 					yield return new FoldingRegion (name, region, false);
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4Parser.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4Parser.cs
index a18ebdbc6a..d348e6340e 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4Parser.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Parser/T4Parser.cs
@@ -28,32 +28,35 @@ using System;
 using System.IO;
 using Mono.TextTemplating;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Projects;
 using System.Collections.Generic;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.TextTemplating.Parser
 {
 	public class T4Parser : TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader content, Project project = null)
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)
 		{
+			var fileName = parseOptions.FileName;
 			ParsedTemplate template = new ParsedTemplate (fileName);
+			var readOnlyDoc = TextEditorFactory.CreateNewReadonlyDocument (parseOptions.Content, fileName);
+
 			try {
-				var tk = new Tokeniser (fileName, content.ReadToEnd ());
+				var tk = new Tokeniser (fileName, readOnlyDoc.Text);
 				template.ParseWithoutIncludes (tk);
 			} catch (ParserException ex) {
 				template.LogError (ex.Message, ex.Location);
 			}
-
 			var errors = new List<Error> ();
 			foreach (System.CodeDom.Compiler.CompilerError err in template.Errors) {
-				errors.Add (new Error (err.IsWarning ? ErrorType.Warning : ErrorType.Error, err.ErrorText, err.Line, err.Column));
+				errors.Add (new Error (err.IsWarning ? ErrorType.Warning : ErrorType.Error, err.ErrorText, new DocumentLocation (err.Line, err.Column)));
 			}
 			var doc = new T4ParsedDocument (fileName, template.RawSegments, errors);
 			doc.Flags |= ParsedDocumentFlags.NonSerializable;
 
-			return doc;
+			return System.Threading.Tasks.Task.FromResult((ParsedDocument)doc);
 		}
 	}
 }
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/T4FileTemplate.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/T4FileTemplate.cs
index 7d0c9eb9c8..df1bb81309 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/T4FileTemplate.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/T4FileTemplate.cs
@@ -25,13 +25,13 @@
 // THE SOFTWARE.

 

 using System;

-using System.Collections.Generic;

+using System.CodeDom.Compiler;
 using System.IO;

+using System.Linq;
 using System.Xml;

 using MonoDevelop.Core;

-using MonoDevelop.Ide.Templates;

 using MonoDevelop.Core.StringParsing;

-using Microsoft.VisualStudio.TextTemplating;

+using MonoDevelop.Ide.Templates;
 

 namespace MonoDevelop.TextTemplating

 {

@@ -66,11 +66,11 @@ namespace MonoDevelop.TextTemplating
 				if (host.Errors.HasErrors) {

 					foreach (var err in host.Errors)

 						LoggingService.LogError ("Error in template generator: {0}", err.ToString());

-					throw new Exception ("Failed to generate file");

+					var firstError = host.Errors.OfType<CompilerError> ().First (f => !f.IsWarning);
+					throw new Exception ("Failed to generate file: " + firstError.ErrorText);
 				}

 				return output;

 			}

 		}

 	}

 }

-

diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFileGenerator.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFileGenerator.cs
index 44dd8582e3..e00280fc72 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFileGenerator.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFileGenerator.cs
@@ -28,15 +28,16 @@ using System;
 using MonoDevelop.Ide.CustomTools;
 using MonoDevelop.Projects;
 using MonoDevelop.Core;
+using System.Threading.Tasks;
 using MonoDevelop.Ide;
 
 namespace MonoDevelop.TextTemplating
 {
 	public class TextTemplatingFileGenerator : ISingleFileCustomTool
 	{
-		public IAsyncOperation Generate (IProgressMonitor monitor, ProjectFile file, SingleFileCustomToolResult result)
+		public Task Generate (ProgressMonitor monitor, ProjectFile file, SingleFileCustomToolResult result)
 		{
-			return new ThreadAsyncOperation (delegate {
+			return Task.Run (delegate {
 				using (var host = new ProjectFileTemplatingHost (file, IdeApp.Workspace.ActiveConfiguration)) {
 					host.AddMonoDevelopHostImport ();
 					var defaultOutputName = file.FilePath.ChangeExtension (".cs"); //cs extension for VS compat
@@ -51,7 +52,7 @@ namespace MonoDevelop.TextTemplating
 					foreach (var err in host.Errors)
 						monitor.Log.WriteLine (err);
 				}
-			}, result);
+			});
 		}
 
 		static bool warningLogged;
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs
index 358f7de463..4387d8d872 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs
@@ -32,14 +32,15 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.CustomTools;
 using MonoDevelop.Projects;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.TextTemplating
 {
 	public class TextTemplatingFilePreprocessor : ISingleFileCustomTool
 	{
-		public IAsyncOperation Generate (IProgressMonitor monitor, ProjectFile file, SingleFileCustomToolResult result)
+		public Task Generate (ProgressMonitor monitor, ProjectFile file, SingleFileCustomToolResult result)
 		{
-			return new ThreadAsyncOperation (delegate {
+			return Task.Run (delegate {
 				using (var host = new ProjectFileTemplatingHost (file, IdeApp.Workspace.ActiveConfiguration)) {
 
 					string outputFile;
@@ -51,7 +52,7 @@ namespace MonoDevelop.TextTemplating
 					foreach (var err in host.Errors)
 						monitor.Log.WriteLine (err);
 				}
-			}, result);
+			});
 		}
 
 		static void Generate (TemplateGenerator host, ProjectFile file, out string outputFile)
@@ -106,4 +107,3 @@ namespace MonoDevelop.TextTemplating
 		}
 	}
 }
-
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs
index e434450482..78a26818aa 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs
@@ -39,7 +39,7 @@ namespace MonoDevelop.TextTemplating
 			
 			TaskService.Errors.Clear ();
 			foreach (CompilerError err in errors) {
-					TaskService.Errors.Add (new Task (err.FileName, err.ErrorText, err.Column, err.Line,
+					TaskService.Errors.Add (new TaskListEntry (err.FileName, err.ErrorText, err.Column, err.Line,
 					                                  err.IsWarning? TaskSeverity.Warning : TaskSeverity.Error));
 			}
 			TaskService.ShowErrors ();
diff --git a/main/src/addins/TextTemplating/TextTransform/ChangeLog b/main/src/addins/TextTemplating/TextTransform/ChangeLog
deleted file mode 100644
index 08db48eca0..0000000000
--- a/main/src/addins/TextTemplating/TextTransform/ChangeLog
+++ /dev/null
@@ -1,25 +0,0 @@
-2009-08-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* TextTransform.csproj: Include the ASP.NET MVC and
-	  TextTemplating addins in the main solution and build.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* TextTransform.csproj: Move output dir from ../bin to
-	  ../build.
-
-2009-03-05  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* TextTransform.csproj: Updated.
-
-	* TextTransform.cs: Complete the runner implementation.
-
-2009-03-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Options.cs:
-	* AssemblyInfo.cs:
-	* TextTransform.cs:
-	* TextTransform.csproj: Stub out the command-line
-	  TextTransform tool.
-
diff --git a/main/src/addins/TextTemplating/TextTransform/TextTransform.cs b/main/src/addins/TextTemplating/TextTransform/TextTransform.cs
index e4f239e320..914b739fe9 100644
--- a/main/src/addins/TextTemplating/TextTransform/TextTransform.cs
+++ b/main/src/addins/TextTemplating/TextTransform/TextTransform.cs
@@ -67,7 +67,7 @@ namespace Mono.TextTemplating
 				{ "I=", "Paths to search for included files", s => generator.IncludePaths.Add (s) },
 				{ "P=", "Paths to search for referenced assemblies", s => generator.ReferencePaths.Add (s) },
 				{ "dp=", "Directive processor (name!class!assembly)", s => directives.Add (s) },
-				{ "a=", "Parameters ([processorName]![directiveName]!name!value)", s => parameters.Add (s) },
+				{ "a=", "Parameters (name=value) or ([processorName!][directiveName!]name!value)", s => parameters.Add (s) },
 				{ "h|?|help", "Show help", s => ShowHelp (false) },
 		//		{ "k=,", "Session {key},{value} pairs", (s, t) => session.Add (s, t) },
 				{ "c=", "Preprocess the template into {0:class}", (s) => preprocess = s },
@@ -82,7 +82,7 @@ namespace Mono.TextTemplating
 			inputFile = remainingArgs [0];
 			
 			if (!File.Exists (inputFile)) {
-				Console.Error.WriteLine ("Input file '{0}' does not exist.");
+				Console.Error.WriteLine ("Input file '{0}' does not exist.", inputFile);
 				return -1;
 			}
 			
@@ -97,38 +97,30 @@ namespace Mono.TextTemplating
 				}
 			}
 
-			//FIXME: implement quoting and escaping for values
 			foreach (var par in parameters) {
-				var split = par.Split ('!');
-				if (split.Length < 2) {
-					Console.Error.WriteLine ("Parameter does not have enough values: {0}", par);
+				if (!generator.TryAddParameter (par)) {
+					Console.Error.WriteLine ("Parameter has incorrect format: {0}", par);
 					return -1;
 				}
-				if (split.Length > 2) {
-					Console.Error.WriteLine ("Parameter has too many values: {0}", par);
-					return -1;
-				}
-				string name = split[split.Length-2];
-				string val  = split[split.Length-1];
-				if (string.IsNullOrEmpty (name)) {
-					Console.Error.WriteLine ("Parameter has no name: {0}", par);
-					return -1;
-				}
-				generator.AddParameter (split.Length > 3? split[0] : null, split.Length > 2? split[split.Length-3] : null, name, val);
 			}
 			
 			foreach (var dir in directives) {
 				var split = dir.Split ('!');
+
 				if (split.Length != 3) {
-					Console.Error.WriteLine ("Directive does not have correct number of values: {0}", dir);
+					Console.Error.WriteLine ("Directive must have 3 values: {0}", dir);
 					return -1;
 				}
-				foreach (var s in split) {
+
+				for (int i = 0; i < 3; i++) {
+					string s = split [i];
 					if (string.IsNullOrEmpty (s)) {
-						Console.Error.WriteLine ("Directive has missing value: {0}", dir);
+						string kind = i == 0? "name" : (i == 1 ? "class" : "assembly");
+						Console.Error.WriteLine ("Directive has missing {0} value: {1}", kind, dir);
 						return -1;
 					}
 				}
+
 				generator.AddDirectiveProcessor (split[0], split[1], split[2]);
 			}
 			
diff --git a/main/src/addins/VBNetBinding/ChangeLog b/main/src/addins/VBNetBinding/ChangeLog
deleted file mode 100644
index 23c009ae4f..0000000000
--- a/main/src/addins/VBNetBinding/ChangeLog
+++ /dev/null
@@ -1,1306 +0,0 @@
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Parser/DomParser.cs:
-	* VBNetBinding.addin.xml: Track ProjectDomService/Parser API.
-
-2010-06-14  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBBindingCompilerServices.cs: Track api changes.
-
-2010-06-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/VBConsoleApplicationProject.xpt.xml: Set the
-	  external console flag for console projects.
-
-2010-05-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.addin.xml: Remove duplicated options section.
-
-2010-05-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.addin.xml: Fix type reference. Fixes bug
-	  #602452 - VB project options fail.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VBNetBinding.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* VBNetBinding.csproj:
-	* VBNetBinding.addin.xml:
-	* Gui/ImportsOptionsPanel.cs:
-	* Gui/ProjectOptionsPanel.cs:
-	* VBBindingCompilerServices.cs:
-	* Gui/ImportsOptionsPanelWidget.cs:
-	* Gui/ConfigurationOptionsPanel.cs:
-	* Gui/ProjectOptionsPanelWidget.cs:
-	* Gui/ConfigurationOptionsPanelWidget.cs: Merged MD.Projects
-	  into MD.Core, and MD.Projects.Gui, MD.Core.Gui and
-	  MD.Components into MD.Ide.
-
-2010-03-03  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Project/VBNetResourceIdBuilder.cs: Track ProjectFile Link
-	  API.
-
-2010-03-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Parser/DomParser.cs: Use getter and setter modifiers.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.csproj: Flush.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/objects.xml:
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ImportsOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ConfigurationOptionsPanelWidget.cs:
-	  Flush.
-
-2009-12-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/VBGtkSharp2Project.xpt.xml: Set correct assembly
-	  target for gui projects.
-
-2009-12-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBLanguageBinding.cs:
-	* VBBindingCompilerServices.cs: Introduced the
-	  ConfigurationSelector class to all methods that previously
-	  took a configuration name as string. This eliminates the
-	  ambiguity between solution configuration names and project
-	  configuration names.
-
-2009-11-24  Rolf Bjarne Kvinge  <RKvinge@novell.com>
-
-	* VBBindingCompilerServices.cs: When setting the doc file, use quotes
-	in case the filename has spaces.
-
-2009-11-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/VBProjectParameters.cs: Use the new
-	  DotNetProjectParameters base class, and inform that in VB,
-	  the default namespace is implicit.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VBNetBinding.addin.xml: Bump MD version.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBBindingCompilerServices.cs: Trim file name.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates\VBGtkSharp2Project.xpt.xml: Add missing reference
-	  (vbc requires it).
-
-	* VBBindingCompilerServices.cs: Fixed error parsing regex so
-	  that it works for MS's vbc. Added -quiet parameter to remove
-	  unrequired output messages.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* templates/AssemblyInfo.xft.xml: Fix template so that it
-	  works with MS.NET.
-
-	* VBBindingCompilerServices.cs: Improve error message when the
-	  compiler is not found.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBBindingCompilerServices.cs: Locate the correct compiler
-	  and set the required env vars for the target runtime object.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/objects.xml:
-	* VBNetBinding.csproj:
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ImportsOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ConfigurationOptionsPanelWidget.cs:
-	  Flush.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VBNetBinding.addin.xml: Update license.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VBNetBinding.addin.xml: Bump MD version.
-
-2009-09-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/DomParser.cs:
-	* VBLanguageBinding.cs:
-	* VBBindingCompilerServices.cs:
-	* Project/VBCompilerParameters.cs: Updated license. Markus
-	  Palme has relicensed to MIT/X11.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.csproj: Updated dependencies. We now depend on
-	  gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* VBNetBinding.csproj: Flush.
-
-2009-06-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* templates/VBConsoleApplicationProject.xpt.xml: Add a
-	  reference to system.dll.
-
-2009-04-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* VBLanguageBinding.cs: Track comment tag API.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* VBNetBinding.csproj: don't require specific gtk-sharp version.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* VBLanguageBinding.cs:
-	* VBNetBinding.addin.xml: Removed icon service.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VBNetBinding.addin.xml: Bump MD version.
-
-2009-03-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* templates/VBGtkSharp2Project.xpt.xml: Don't require specific
-	  GTK# versions.
-
-2009-03-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBBindingCompilerServices.cs: Added workaround for bug
-	  484351 - VB projects compile with warning "optioninfer was
-	  not recognized.
-
-2009-03-17  Mike Krüger  <mkrueger@novell.com>
-
-	* Parser/DomParser.cs: Track API changes.
-
-2009-03-13  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* VBNetBinding.csproj: Don't local-copy project refs.
-
-2009-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* VBNetBinding.csproj: Monodevelop changed the reference a
-	  bit.
-
-2009-03-10  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* VBNetBinding.csproj: Updated nrefactory reference.
-
-2009-02-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* VBNetBinding.csproj:
-	* gtk-gui/objects.xml:
-	* ProjectExtensions.cs:
-	* VBLanguageBinding.cs:
-	* VBNetBinding.addin.xml:
-	* Gui/ProjectOptionsPanel.cs:
-	* Gui/ImportsOptionsPanel.cs:
-	* VBBindingCompilerServices.cs:
-	* Project/VBProjectParameters.cs:
-	* Project/VBCompilerParameters.cs:
-	* Gui/ProjectOptionsPanelWidget.cs:
-	* Gui/ImportsOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ImportsOptionsPanelWidget.cs:
-	  Use the new ProjectParameters class and property to store
-	  global project settings that were previously stored as
-	  custom properties. Split the compiler options in two panels,
-	  one with the basic options and one with the imports.
-
-2009-02-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Project/Import.cs:
-	* gtk-gui/gui.stetic:
-	* VBNetBinding.csproj:
-	* VBLanguageBinding.cs:
-	* VBNetBinding.addin.xml:
-	* VBBindingCompilerServices.cs:
-	* Gui/ProjectOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs:
-	  Use the new API to properly implement support for Import
-	  items.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Parser/DomParser.cs: Remove unused (but invalid) namespace,
-	  as csc doesn't like it.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.csproj: Flush.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* VBNetBinding.mdp:
-	* VBNetBinding.mds:
-	* VBNetBinding.csproj: Migrated to MSBuild file format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VBNetBinding.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.mdp: Flush.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.mdp:
-	* gtk-gui/gui.stetic: Set correct gtk# version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Flush.
-
-2009-02-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/VBNetResourceIdBuilder.cs: Track api changes.
-
-2009-01-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.mdp:
-	* gtk-gui/objects.xml:
-	* gtk-gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ConfigurationOptionsPanelWidget.cs:
-	Flush.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* VBNetBinding.mdp: Flush project format changes.
-
-2008-12-30  Rolf Bjarne Kvinge  <RKvinge@novell.com>
-
-	* VBAmbience.cs: Deleted (unused).
-
-	* Gui/CodeGenerationPanel.cs:
-	* Gui/CodeGenerationPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.CodeGenerationPanelWidget.cs:
-	Deleted, replaced with new widgets.
-
-	* Gui/VBCompilerPanel.cs:
-	* Gui/ChooseRuntimePanel.cs:
-	* Gui/GuiMessageRecipient.cs:
-	* Gui/TextEditorOptionsPanel.cs:
-	* Gui/VBDocConfigurationPanel.cs: Delete unused dialogs.
-
-	* Makefile.am:
-	* md1format.xml:
-	* VBNetBinding.mdp: Updated.
-
-	* gtk-gui/gui.stetic:
-	* VBCodeGenerator.cs:
-	* gtk-gui/objects.xml:
-	* gtk-gui/generated.cs:
-	* ProjectExtensions.cs:
-	* VBLanguageBinding.cs:
-	* VBNetBinding.addin.xml:
-	* Gui/ProjectOptionsPanel.cs:
-	* VBBindingCompilerServices.cs:
-	* Project/VBCompilerParameters.cs:
-	* Gui/ConfigurationOptionsPanel.cs:
-	* Gui/ProjectOptionsPanelWidget.cs:
-	* Project/VBNetResourceIdBuilder.cs:
-	* Gui/ConfigurationOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ProjectOptionsPanelWidget.cs:
-	* gtk-gui/MonoDevelop.VBNetBinding.ConfigurationOptionsPanelWidget.cs:
-	
-	Major overhaul:
-	- Added two new dialogs, one for project-specific options and one
-      for configuration-specific options. All other dialogs	have been 
-	  removed.
-	- Fixed (de)serialization of project-specific options, they are now
-	  correctly passed to the compiler (optionstrict|explicit|compare|
-	  infer + a few more).
-	- We're passing a lot more options to the compiler (-define:_MyType,
-	  -optimize, -optioninfer, -optionstrict, -codepage , -rootnamespace,
-	  -define:DEBUG/TRACE, -doc, -removeintchecks, -imports).
-	- Warnings emitted by the compiler are correctly detected as warnings
-	  instead of errors.
-	- Unified namespace to MonoDevelop.VBNetBinding (there was a mix 
-	  between VBBInding, MonoDevelop.VBBinding and MonoDevelop.VBNetBinding).
-
-2008-12-29  Rolf Bjarne Kvinge  <RKvinge@novell.com>
-
-	* FormattingStrategy:
-	* Parser/SharpDevelopTree:
-	* Parser/SharpDevelopTree/Class.cs:
-	* Parser/SharpDevelopTree/ReturnType.cs:
-	* Parser/SharpDevelopTree/Constructor.cs:
-	* FormattingStrategy/VBFormattingStrategy.cs:
-	* Parser/SharpDevelopTree/CompilationUnit.cs: Deleted unused/empty
-	files.
-
-2008-12-29  Rolf Bjarne Kvinge  <RKvinge@novell.com>
-
-	* VBNetBinding.mdp: Updated.
-
-2008-12-29  Rolf Bjarne Kvinge  <RKvinge@novell.com>
-
-	* Makefile.am:
-	* Parser/Parser.cs:
-	* Parser/Resolver.cs:
-	* Parser/TypeVisitor.cs:
-	* Parser/VBNetVisitor.cs:
-	* Parser/ExpressionFinder.cs: Delete unused/commented out files.
-
-2008-12-29  Rolf Bjarne Kvinge  <RKvinge@novell.com>
-
-	* SharpRefactoryVB:
-	* SharpRefactoryVB/src:
-	* SharpRefactoryVB/src/Lexer:
-	* SharpRefactoryVB/src/Parser:
-	* SharpRefactoryVB/src/CodeDom:
-	* SharpRefactoryVB/src/Main.cs:
-	* SharpRefactoryVB/Makefile.am:
-	* SharpRefactoryVB/src/Parser/AST:
-	* SharpRefactoryVB/src/Lexer/Reader:
-	* SharpRefactoryVB/src/Lexer/Specials:
-	* SharpRefactoryVB/src/Lexer/Lexer.cs:
-	* SharpRefactoryVB/src/AssemblyInfo.cs:
-	* SharpRefactoryVB/src/CSharpConverter:
-	* SharpRefactoryVB/src/Parser/generated:
-	* SharpRefactoryVB/src/Parser/AST/INode.cs:
-	* SharpRefactoryVB/src/Parser/AST/Enums.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel:
-	* SharpRefactoryVB/src/Parser/AST/Statements:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope:
-	* SharpRefactoryVB/src/Parser/AST/Expressions:
-	* SharpRefactoryVB/src/Parser/AST/Modifier.cs:
-	* SharpRefactoryVB/src/Lexer/Reader/IReader.cs:
-	* SharpRefactoryVB/src/CodeDom/CodeDOMVisitor.cs:
-	* SharpRefactoryVB/src/Parser/generated/Makefile:
-	* SharpRefactoryVB/src/Parser/AST/IASTVisitor.cs:
-	* SharpRefactoryVB/src/Lexer/Specials/Comment.cs:
-	* SharpRefactoryVB/src/Lexer/Specials/NewLine.cs:
-	* SharpRefactoryVB/src/Parser/generated/Parser.cs:
-	* SharpRefactoryVB/src/Parser/generated/Errors.cs:
-	* SharpRefactoryVB/src/Parser/generated/VBNET.ATG:
-	* SharpRefactoryVB/src/Lexer/Reader/FileReader.cs:
-	* SharpRefactoryVB/src/Parser/AST/AbstractNode.cs:
-	* SharpRefactoryVB/src/Lexer/Specials/TagComment.cs:
-	* SharpRefactoryVB/src/Parser/generated/keywordlist:
-	* SharpRefactoryVB/src/Lexer/Reader/StringReader.cs:
-	* SharpRefactoryVB/src/Parser/generated/Parser.frame:
-	* SharpRefactoryVB/src/Lexer/Specials/CommentType.cs:
-	* SharpRefactoryVB/src/Parser/AST/CompilationUnit.cs:
-	* SharpRefactoryVB/src/Parser/generated/Modifiers.cs:
-	* SharpRefactoryVB/src/Parser/generated/Scanner.frame:
-	* SharpRefactoryVB/src/Parser/AST/LookupTableVisitor.cs:
-	* SharpRefactoryVB/src/Parser/generated/buildparser.cmd:
-	* SharpRefactoryVB/src/Parser/AST/AbstractASTVisitor.cs:
-	* SharpRefactoryVB/src/Lexer/Specials/SpecialTracker.cs:
-	* SharpRefactoryVB/src/CSharpConverter/CSharpVisitor.cs:
-	* SharpRefactoryVB/src/Parser/generated/ParamModifiers.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/Statement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/IfStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/Expression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/ForStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/EndStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/HandlesClause.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/TypeReference.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/LockStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/StopStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/WithStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/ExitStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/GoToStatement.cs:
-	* SharpRefactoryVB/src/Parser/generated/keywordlist/Tokens.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/LabelStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/ReDimStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/BlockStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/ErrorStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/WhileStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/ThrowStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/EraseStatements.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/DoLoopStatement.cs:
-	* SharpRefactoryVB/src/Parser/generated/keywordlist/Keywords.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/ResumeStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/ReturnStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/SelectStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/ImplementsClause.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/CastExpression.cs:
-	* SharpRefactoryVB/src/Lexer/Specials/PreProcessingDirective.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/FieldDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/EventDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/OnErrorStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/TypeDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/ForeachStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/PropertyGetRegion.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/MethodDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/PropertySetRegion.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/ImportsStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/TypeOfExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/TryCatchStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/DeclareDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/PropertyDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/GetTypeExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/VariableDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/ImportsDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/AddHandlerStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/RaiseEventStatement.cs:
-	* SharpRefactoryVB/src/Parser/generated/keywordlist/KeywordList.txt:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/PrimitiveExpression.cs:
-	* SharpRefactoryVB/src/Parser/generated/keywordlist/BuildKeywords.pl:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/AddressOfExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/DelegateDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/StatementExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/TypeLevel/ConstructorDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/InvocationExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/NamespaceDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/AttributeDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/IdentifierExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/AssignmentExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/RemoveHandlerStatement.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/ArrayCreateExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/ObjectCreateExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/ParenthesizedExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/BaseReferenceExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/NamedArgumentExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/ImportsAliasDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Statements/LocalVariableDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/OptionStrictDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/ThisReferenceExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/TypeReferenceExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/UnaryOperatorExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/ClassReferenceExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/BinaryOperatorExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/OptionCompareDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/GlobalScope/OptionExplicitDeclaration.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/ArrayInitializerExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/LoopControlVariableExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/ParameterDeclarationExpression.cs:
-	* SharpRefactoryVB/src/Parser/AST/Expressions/FieldReferenceOrInvocationExpression.cs:
-	Delete a lot of unused/empty files.
-
-	* ProjectNodeBuilder.cs: Delete unused file.
-
-2008-12-29  Rolf Bjarne Kvinge  <RKvinge@novell.com>
-
-	* md1format.xml: Sync with VBCompilerParameters.
-
-2008-12-29  Rolf Bjarne Kvinge  <RKvinge@novell.com>
-
-	* Project/VBCompilerParameters.cs:
-	* Gui/CodeGenerationPanelWidget.cs: Remove compiler parameters which
-	aren't applicable to any vb compiler. Added MyType compiler
-	parameter.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.mdp: Don't require a specific version of Mono.Addins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from
-	the addin manifests.
-
-2008-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* VBBindingCompilerServices.cs: Skip the space after the end of
-	filenames when capturing error locations. Fixes Bug 444089 - File not
-	found when going to source of error.
-
-2008-11-20  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CodeGenerationPanelWidget.cs: Fix NRE.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.addin.xml: Bump MD version.
-
-2008-11-04  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Gui/CodeGenerationPanelWidget.cs: Disable CompileTarget and MainClass
-	setting when project.IsLibraryBasedProjectType. Prevents messing up
-	ASP.NET and Moonlight projects.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* VBNetBinding.addin.xml: Removed vb ambience.
-
-2008-10-28  Mike Krüger  <mkrueger@novell.com>
-
-	* VBNetBinding.addin.xml: fixed 'Bug 399737 - Code completion busted for
-	referenced assemblies that are not in GAC, are outside of the
-	solution, and which are referenced by other non-GAC outside
-	referenced assemblies'.
-
-2008-10-01  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* VBBindingCompilerServices.cs: Track API.
-
-2008-10-01  Rolf Bjarne Kvinge <RKvinge@novell.com> 
-
-	* VBBindingCompilerServices.cs: GenerateOptions: Output the actual
-	  additional parameters to the compiler command, not the length of
-	  the additional parameters.
-
-2008-09-26  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/DomParser.cs: Track API.
-
-2008-09-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp, md1format.xml, Makefile.am: Add missing file.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp, gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.VBNetBinding.CodeGenerationPanelWidget.cs:
-	  Updated generated code.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CodeGenerationPanelWidget.cs: Track api changes.
-
-2008-09-10  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Changed compilation unit/document meta
-	  information interface.
-
-2008-09-09  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Some changes caused by interface changes.
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CodeGenerationPanelWidget.cs, Parser/Parser.cs,
-	  Parser/DomParser.cs, Parser/VBNetVisitor.cs, Parser/Resolver.cs,
-	  Parser/TypeVisitor.cs, Parser/ExpressionFinder.cs,
-	  Parser/SharpDevelopTree/CompilationUnit.cs,
-	  Parser/SharpDevelopTree/ReturnType.cs,
-	  Parser/SharpDevelopTree/Class.cs,
-	  Parser/SharpDevelopTree/Constructor.cs, VBAmbience.cs,
-	  VBLanguageBinding.cs: Translated old code to new dom.
-
-2008-07-28  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/TypeVisitor.cs: Some changes for the new nrefactory.
-
-2008-07-27  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Worked on code completion/new dom.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/VBCompilerParameters.cs: Moved serialization engine to
-	  MonoDevelop.Core. Use new syntax for specifying attribute scope.
-
-2008-07-15  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Added missing method (interface changed).
-
-2008-07-14  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Added missing method (interface changed).
-
-2008-06-14  Ankit Jain  <jankit@novell.com>
-
-	Fix bug #400300.
-	* VBBindingCompilerServices.cs (ParseOutput): Returns BuildResult now.
-	Move construction of BuildResult to here.
-
-2008-06-14  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (GenerateOptions): Emit -debug option.
-
-2008-06-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: worked on dom parser.
-
-2008-06-13  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/DomParser.cs: Some changes in the vb.net dom parser.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Bump MD version.
-
-2008-05-28  Mike Krüger <mkrueger@novell.com> 
-
-	* VBNetBinding.addin.xml, Parser/DomParser.cs: Worked on vb.net dom
-	  parser.
-
-2008-05-27  Mike Krüger <mkrueger@novell.com> 
-
-	* VBNetBinding.mdp, Parser/DomParser.cs, Makefile.am: Added new dom
-	  parser for vb.net.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Merged the extension points for project and
-	  solution option panels into a single extension point. A single
-	  extension point will now be used for all kinds of items. Extension
-	  conditions can be used to make panels visible only for some
-	  specific item types.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBBindingCompilerServices.cs, VBLanguageBinding.cs: Replaced
-	  ICompilerResult/DefaultCompilerResult/CompilerResults by a new
-	  BuildResult class, which has owner information at error level, so
-	  it is possible to know which project generated an error when
-	  building a solution. Updated Task and TaskService to use the new
-	  owner information.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CodeGenerationPanel.cs, Gui/CodeGenerationPanelWidget.cs,
-	  VBNetBinding.addin.xml, VBNetBinding.mdp, VBNetBinding.mds,
-	  VBBindingCompilerServices.cs, Project/VBCompilerParameters.cs,
-	  Project/VBNetResourceIdBuilder.cs, gtk-gui/objects.xml,
-	  gtk-gui/gui.stetic, Makefile.am: New project model changes.
-
-2008-05-08  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* VBNetBinding.addin.xml: Set "isText" attribute on the mimetype
-	  definitions.
-
-2008-04-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/Resolver.cs: Don't check using's region, since it is the
-	  region of the using declaration only.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Use the new mime type extension to register
-	  new file types.
-	* gtk-gui/MonoDevelop.VBNetBinding.CodeGenerationPanelWidget.cs:
-	  Updated.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CodeGenerationPanelWidget.cs,
-	  gtk-gui/MonoDevelop.VBNetBinding.CodeGenerationPanelWidget.cs: Worked on
-	  gnome hig compliant alerts.
-
-2008-02-23  Mike Krüger <mkrueger@novell.com> 
-
-	* VB.glade, Gui/CodeGenerationPanel.cs, Gui/CodeGenerationPanelWidget.cs,
-	  VBNetBinding.addin.xml, VBNetBinding.mdp, VBBindingCompilerServices.cs,
-	  Project/VBCompilerParameters.cs, Makefile.am: Removed old glade widget,
-	  improved option panel a bit.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Update MD version.
-
-2008-01-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CodeGenerationPanel.cs: Ensure we don't create subclasses of classes
-	  with private fields bound by glade#. It would not work due to bug
-	  355228.
-
-2008-01-15  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* templates/EmptyVBFile.xft.xml, templates/EmptyVBProject.xpt.xml,
-	  templates/AssemblyInfo.xft.xml, templates/VBGtkSharp2Project.xpt.xml,
-	  templates/VBConsoleApplicationProject.xpt.xml: Make template categories
-	  translatable.
-
-2008-01-03  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* VBBindingCompilerServices.cs: Update the compiler output parsing regex to
-	  handle all vbnc errors and correctly extract file and position info when
-	  present.
-
-2008-01-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* Parser/Parser.cs: Merge some code from C# binding so that VB parser
-	  actually tags classes with the filename in which they're defined. Fixes
-	  CodeBehind grouping and double-clicking on items in the class pad.
-
-2008-01-02  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* VBNetBinding.mdp, Makefile.am, VBLanguageBinding.cs, VBCodeGenerator.cs:
-	  Import VB.NET CodeDOM generator from Mono to get partial class support
-	  and keyword escaping support.
-
-2007-12-31  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* VBNetBinding.addin.xml, VBNetBinding.mdp, templates/AssemblyInfo.xft.xml,
-	  Makefile.am: Add AssemblyInfo template.
-	* templates/EmptyVBFile.xft.xml: Use standard header.
-	* templates/VBGtkSharp2Project.xpt.xml,
-	  templates/VBConsoleApplicationProject.xpt.xml: Use standard headers and
-	  AssemblyInfo template.
-
-2007-12-31  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* VBBindingCompilerServices.cs: Use WaitForOutput instead of WaitForExit to
-	  make sure we get all of the output, or the output-collecting thread can
-	  sometimes try to write to the StringWriter after it's disposed, and
-	  crash the IDE.  Also tidy up code.
-	* Makefile.am: Updated.
-	* VBLanguageBinding.cs: We don't support the 1.1 profile for VB, so remove
-	  it.
-
-2007-12-26  Rolf Bjarne Kvinge <RKvinge@novell.com> 
-
-	* VBNetBinding.addin.xml: Remove Gtk# 1.0 template. Add the
-	  RuntimeOptionsPanel so that projects can change their clr version.
-	* templates/VBGtkSharpProject.xpt.xml, Makefile.am: Remove Gtk# 1.0
-	  template.
-	* VBLanguageBinding.cs: Add support for 2.0 clr versions.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/CodeGenerationPanel.cs: Fix warning.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Bump add-in versions.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml, VBNetBinding.mdp, VBNetBinding.mds, Makefile.am:
-	  Directory reorganization.
-
-2007-11-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Project/VBCompilerParameters.cs: Removed some obsolete attributes.
-
-2007-10-29  Rolf Bjarne Kvinge <RKvinge@novell.com> 
-
-	* VBBindingCompilerServices.cs: A few changes to cope with vbnc''s issues:
-	  Use the compiler's exit code to determine whether the compile failed,
-	  and not the presence or not of errors parsed from the compiler output.
-	  If the compile failed (exit code != 0) and no errors were correctly
-	  parsed, show the entire output, since it's probable that the compiler
-	  crashed somehow. Also show the commandline used to compile in MD's
-	  output window, as well as any compiler output. Use in-memory storage
-	  instead of temporary files for compiler output.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Bump MD version.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Track changes in the Icon extension node.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* icons/VB.File.EmptyFile, icons/VB.File.Form, icons/VB.File.FullFile,
-	  icons/VB.File.NewClass, icons/VB.File.WebFile,
-	  icons/VB.Project.ServiceProject, icons/VB.Project.UserControl,
-	  icons/VB.Project.WebProject, Makefile.am, templates/EmptyVBFile.xft.xml,
-	  VBNetBinding.mdp: Use tango file icons. Removed obsolete icons.
-
-2007-10-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp, templates/EmptyVBProject.xpt.xml,
-	  templates/VBGtkSharpProject.xpt.xml,
-	  templates/VBGtkSharp2Project.xpt.xml,
-	  templates/VBConsoleApplicationProject.xpt.xml, Makefile.am,
-	  icons/VB.Project.Library, icons/VB.ProjectIcon,
-	  icons/VB.Project.DOSProject, icons/VB.Project.EmptyProject,
-	  icons/vb-icon-32.png, icons/VB.Project.FullProject,
-	  icons/VB.Project.Form: Updated project icons. Use the base project icon
-	  with an overlay to show the type.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp, VBNetBinding.mds: Project file names updated by change
-	  in MD path functions.
-
-2007-10-12  Mike Krüger <mkrueger@novell.com> 
-
-	* VBBindingCompilerServices.cs: Applied changes that were neccassary for to
-	  the new FileService.
-
-2007-10-11  Mike Krüger <mkrueger@novell.com> 
-
-	
-
-2007-10-09  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs: Removed code for building resources. Its
-	done by DotNetProject now.
-
-2007-10-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp: Fix warning level.
-	* Parser/VBNetVisitor.cs, Parser/Resolver.cs: Track api changes.
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Bump MD version.
-
-2007-09-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBAmbience.cs: Track API changes.
-
-2007-09-04  Michael Hutchinson <MHutchinson@novell.com> 
-
-	* Gui/CodeGenerationPanel.cs, VBAmbience.cs: Fix some compiler warnings.
-
-2007-08-31  Mike Krüger <mkrueger@novell.com> 
-
-	* Gui/CodeGenerationPanel.cs, Parser/Resolver.cs, VBAmbience.cs,
-	  VBBindingCompilerServices.cs: Changes due to new property
-	  infrastructure.
-
-2007-08-23  Mike Krüger <mkrueger@novell.com> 
-
-	* Parser/Parser.cs, Parser/VBNetVisitor.cs, Parser/Resolver.cs,
-	  Parser/TypeVisitor.cs, Parser/SharpDevelopTree/ReturnType.cs,
-	  Parser/SharpDevelopTree/Class.cs,
-	  Parser/SharpDevelopTree/Constructor.cs: Changed to the latest NRefactory
-	  version.
-
-2007-08-23  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (GetResourceId): Generate .resources
-	with resgen only if required. Set resource id even if resgen is not required.
-
-2007-08-23  Ankit Jain  <jankit@novell.com>
-	    Andrés G. Aragoneses  <knocte@gmail.com>
-
-	* VBBindingCompilerServices.cs (GetResourceId): Use MONO_IOMAP=drive and
-	only on unix.
-
-2007-08-14  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (GetResourceId): Run resgen with
-	MONO_IOMAP=all. See bug #82398.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml, VBNetBinding.mdp, Makefile.am: Reorganized the
-	  extension point hierarchy. Embedded all add-in manifests as resources.
-
-2007-07-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBBindingCompilerServices.cs: Make sure all output generated by the
-	  compiler process is read.
-
-2007-07-03  Mike Krüger <mkrueger@novell.com> 
-
-	* VBBindingCompilerServices.cs: added signing support.
-
-2007-05-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp: Added missing file.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp, Makefile.am: Reference shared assemblies from the
-	  correct location.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/ChooseRuntimePanel.cs, Gui/CodeGenerationPanel.cs,
-	  VBNetBinding.addin.xml, VBNetBinding.mdp, Makefile.am: Migration to
-	  Mono.Addins.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp: Don't copy referenced assemblies.
-	* VBNetBinding.mds: Updated.
-
-2007-03-20  Ankit Jain  <jankit@novell.com>
-
-	* templates/VBGtkSharp2Project.xpt.xml: Rename AssemblyInfo.cs to .vb
-	Fix Main.vb . Patch by Yasser Mekled (yassermekled@gmail.com), fixes
-	bug#81114.
-	* templates/VBGtkSharpProject.xpt.xml: Likewise.
-	* templates/VBConsoleApplicationProject.xpt.xml: Make comments
-	consistent.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Change add-in versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp, VBNetBinding.mds, Makefile.am: Synchronized the MD
-	  project and the Makefile
-
-2007-02-02  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (Compile): Move resource compiling code
-	to ..
-	(GetResourceId): .. here. Improve error messages.
-
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Parser/VBNetVisitor.cs, Parser/SharpDevelopTree/Constructor.cs: Track
-	  api changes.
-
-2007-01-11  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (Compile): Echo resgen command line
-	for debugging purpose.
-
-2007-01-11  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (Compile): .resx file has paths
-	relative to the .resx file itself.
-
-2006-12-21  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (Compile): Use project's base
-	directory as the working directory when invoking the compiler.
-	(DoCompilation): Add param 'working_dir'.
-
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Gui/VBCompilerPanel.cs, ProjectNodeBuilder.cs,
-	  VBBindingCompilerServices.cs: Track changes in the FileService
-	  class.
-	* Gui/VBDocConfigurationPanel.cs: Use the FileService for deleting
-	  files.
-	* Gui/CodeGenerationPanel.cs: Removed unused var.
-
-2006-12-15  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (Compile): Filename arg to resgen should
-	be quoted.
-
-2006-12-15  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (Compile): Use resgen to convert .resx
-	to embeddable resource format (.resources). Handle 'null' resourceId.
-
-2006-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBNetBinding.mdp, Parser/SharpDevelopTree/Indexer.cs,
-	  Parser/SharpDevelopTree/Method.cs,
-	  Parser/SharpDevelopTree/Parameter.cs,
-	  Parser/SharpDevelopTree/Event.cs, Parser/SharpDevelopTree/Field.cs,
-	  Parser/SharpDevelopTree/Property.cs,
-	  Parser/SharpDevelopTree/AttributeSection.cs, Makefile.am: Removed
-	  some unnecessary Default* subclasses.
-	* Parser/VBNetVisitor.cs, Parser/Resolver.cs,
-	  Parser/SharpDevelopTree/CompilationUnit.cs,
-	  Parser/SharpDevelopTree/ReturnType.cs,
-	  Parser/SharpDevelopTree/Class.cs,
-	  Parser/SharpDevelopTree/Constructor.cs: Renamed Abstract* classes
-	  to Default*. Removed some unnecessary Default* subclasses.
-
-2006-12-13  Ankit Jain  <jankit@novell.com>
-
-	* Project/VBCompilerParameters.cs (Win32Resource): New.
-	* VBBindingCompilerServices.cs (GenerateOptions): Generate 
-	option for Win32Resource. Don't generate option for win32icon 
-	if win32resource is defined.
-
-2006-12-12  Ankit Jain  <jankit@novell.com>
-
-	* VBBindingCompilerServices.cs (Compile): Use ProjectFile.ResourceId for
-	embedded resources.
-
-2006-11-14  Ankit Jain  <jankit@novell.com>
-
-	* Gui/CodeGenerationPanel.cs (CodeGenerationPanelWidget.SetValues): Fix
-	the order of the CompileTarget options.
-
-2006-09-18 Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-
-	* VBNetBinding.mdp:
-	* VBNetBinding.mds:
-	Updated.
-
-	* .: Added svn:ignore for VBNetBinding.pidb.
-	
-2006-09-12 Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* VBBindingCompilerServices.cs: Fixed win32 pathing/compilation issues, removed /bin/sh dependence, removed \r.
-
-2006-09-12 Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-
-	* VBAmbience.cs: Track changes in Ambience.
-
-2006-07-11 Philip Turnbull <philip.turnbull@gmail.com>
-
-	* VBNetBinding/VBNetBinding.addin.xml:
-	Added VB Ambience.
-
-	* VBNetBinding/VBAmbience.cs:
-	Track API changes in Ambience.
-
-2006-07-05 Matej Urbas <matej.urbas@gmail.com>
-
-	* Parser/VBNetVisitor.cs:
-	* Parser/Resolver.cs: Updated to use ReturnType as BaseTypes in IClass
-	  instances.
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* VBLanguageBinding.cs:
-	* VBBindingCompilerServices.cs: Track changes in ProjectReference.
-	  Removed obsolete GenerateMakefile method.
-	* VBNetBinding.addin.xml: Updated versions.
-
-2006-06-24 John Luke <john.luke@gmail.com>
-
-	* Makefile.am: reference NRefactory not SharpRefactory.VB
-	* SharpRefactoryVB: remove old VB parser
-	* VBNetBinding.addin.xml: remove SharpRefactory.VB 
-	* Parser/*.cs: port to NRefactory
-	
-2006-06-15 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.addin.xml: Use the DataType element instead fof Class
-	  to declare serializable types.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.addin.xml: Updated versions.
-	* VBNetBinding.mdp: Updated.
-
-2006-04-21 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VBLanguageBinding.cs: Implement GetSupportedClrVersions.
-
-2006-04-07  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* VBNetBinding.addin.xml: renamed attribute in FileFilter Extension
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Makefile.am:
-	* VBNetBinding.addin.xml: Updated references.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* VBNetBinding.mdp:
-	* MonoQuery/MonoQuery.mdp: Updated.
-	* Makefile.am:
-	* SharpRefactoryVB/Makefile.am: Use an unified format. 
-	  Patch by Matze Braun.
-	
-	* VBNetBinding.addin.xml: Updated add-in versions.
-
-2006-03-17  Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-
-	* Parser/Parser.cs:
-	* Parser/Resolver.cs:
-	Removed unused MonodocResolver.
-
-2006-03-12  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-        * VB.glade: Marking some strings not to be translated. Not include balast in pot file.
-	
-2006-01-30 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* VBBindingCompilerServices.cs:
-	* Parser/Resolver.cs:
-	* Parser/Parser.cs: Track changes in parser api.
-
-2006-01-10 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* Parser/VBNetVisitor.cs:
-	* Parser/SharpDevelopTree/AttributeSection.cs:
-	* Parser/Parser.cs: Track api changes.
-	
-	* Parser/ExpressionFinder.cs: Updated from SharpDevelop.
-
-2005-12-13  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Parser/Parser.cs: Track changes in the api.
-	* VBLanguageBinding.cs: Implemented the new methods in
-	IDotNetLanguageBinding.
-
-2005-10-11  John Luke  <john.luke@gmail.com>
-
-	* Makefile.am: remove SharpAssembly reference
-	* VBAmbience.cs: comment out SharpAssembly stuff
-	
-2005-10-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBNetBinding.addin.xml: Fixed incorrect class name.
-
-2005-10-11  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Fixed addin header information.
-	Use "id" attribuet instead of "name" to identify addins.
-
-2005-10-06  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml:
-	* VBLanguageBinding.cs: Register serializable types in the addin
-	configuration file.
-
-2005-10-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Fix reference to ICSharpCode.SharpRefactory.VB.dll.
-
-2005-10-04  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* VBNetBinding.addin.xml: Added addin dependencies.
-	* Makefile.am: Fix location of ICSharpCode.SharpRefactory.VB.dll.
-
-2005-08-20  John Luke  <john.luke@gmail.com>
-
-	* Parser/Resolver.cs:
-	* Parser/ExpressionFinder.cs: fix 2 warnings of assigning
-	a variable to itself
-	
-2005-08-20  Peter Johanson  <latexer@gentoo.org> 
-
-	* templates/VBGtkSharp2Project.xpt.xml: Fix gtk-sharp references to
-	match new assembly versions.
-
-2005-08-12  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* templates/*:
-	* VBNetBinding.addin.xml: Properly reference resource icons and
-	templates.
-	* Makefile.am: Embed icon and templates as resources.
-
-2005-08-09  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* Parser/Resolver.cs:
-	* Gui/CodeGenerationPanel.cs:
-	* Parser/Parser.cs: Use the new IParserContext API.
-
-2005-07-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Project/VBCompilerParameters.cs: Implement ICloneable.
-	* VBLanguageBinding.cs: CreateCompilationParameters now returns an
-	ICloneable.
-
-2005-07-01  John Luke  <john.luke@gmail.com>
-
-	* SharpRefeactoryVB/Makefile.am:
-	build to MonoDevelop/build/bin so .mdb file goes to the right place
-	remove stray CSC definition
-
-2005-05-06  John Luke  <john.luke@gmail.com>
-
-	* Makefile.am: replace 'make' with $(MAKE)
-	This fixes it on FreeBSD, should work everywhere.
-	by cnehren@gmail.com (Christopher Nehren)
-	
-2005-04-17  John Luke  <john.luke@gmail.com>
-
-	* Makefile.am: fix distcheck
-
-2005-03-30  John Luke  <john.luke@gmail.com>
-
-	* Parser/Parser.cs: stop printing 'Entering VB parser'
-
-2005-03-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Parser/Resolver.cs: Track api changes.
-
-2005-02-16  Ben Motmans  <ben.motmans@gmail.com>
-
-	* EmptyVBFile.xpt.xml:
-	* EmptyVBProject.xpt.xml:
-	* VBConsoleApplicationProject.xpt.xml:
-	Consistent naming
-
-	* VBGtkSharpProject.xpt.xml:
-	* VBGtkSharp2Project.xpt.xml:
-	* VBNetBinding.addin.xml:
-	* Makefile.am:
-	Added templates
-
-2005-01-28  John Luke  <john.luke@gmail.com>
-
-	* SharpRefactoryVB/src/Lexer/Lexer.cs:
-	* SharpRefactoryVB/src/Parser/generated/Parser.cs:
-	* SharpRefactoryVB/src/Parser/generated/VBNET.ATG:
-	warning fixes for unused code
-	* SharpRefactoryVB/src/Parser/generated/Makefile:
-	add makefile to regen parser
-
-2005-01-28  John Luke  <john.luke@gmail.com>
-
-	* Parser/Parser.cs: update to CanParse
-
-2005-01-27  John Luke  <john.luke@gmail.com>
-
-	* VB.glade: update to new glade format
-
-	* VB.glade:
-	* Gui/CodeGenerationPanel.cs:
-	* Parser/VBNetVisitor.cs:
-	* Parser/Resolver.cs:
-	* VBBindingCompilerServices.cs: fix some warnings,
-	use ComboBox instead of OptionMenu
-
-2005-01-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBBindingCompilerServices.cs: 
-	* VBLanguageBinding.cs: Use the new progress monitor API.
-	
-2005-01-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBCompilerPanel.cs:
-	* Gui/ChooseRuntimePanel.cs:
-	* Gui/VBDocConfigurationPanel.cs:
-	* Gui/CodeGenerationPanel.cs:
-	* VBNetBinding.addin.xml:
-	* ProjectNodeBuilder.cs:
-	* Parser/Parser.cs:
-	* Parser/Resolver.cs:
-	* VBBindingCompilerServices.cs:
-	* VBLanguageBinding.cs: Follow architecture changes.
-
-	* Gui/OutputOptionsPanel.cs:
-	* VB.glade: Removed dialog now implemented in Monodevelop.Base.
-	
-	* Project/VBCompilerParameters.cs: Moved some parameters and enum
-	definitions to DotNetProjectConfiguration.
-	
-	* Project/VBProject.cs:
-	* VBBindingExecutionServices.cs: Removed. Not needed any more.
-	* Makefile.am: Updated.
-
-2004-12-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VBBindingCompilerServices.cs: StatusBarService.ProgressMonitor is not a
-	StatusBar widget any more.
-
-2004-12-07  Alexandre Gomes <alexmipego@hotmail.com>
-
-	* VBLanguageBinding.cs: Added CommentTag to be used by (Un)CommentCode
-
-2004-11-05  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Imported from #D and made to work with MD tools and namespaces
diff --git a/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanel.cs b/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanel.cs
index 71148c8a1b..80c602a526 100644
--- a/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanel.cs
+++ b/main/src/addins/VBNetBinding/Gui/ConfigurationOptionsPanel.cs
@@ -28,6 +28,7 @@
 
 using System;
 
+using MonoDevelop.Components;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui.Dialogs;
 
@@ -41,7 +42,7 @@ namespace MonoDevelop.VBNetBinding
 		{
 		}
 		
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			Console.WriteLine ("ConfigurationOptionsPanel.CreatePanelWidget");
 			return (widget = new ConfigurationOptionsPanelWidget (ConfiguredProject));
diff --git a/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanel.cs b/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanel.cs
index 76fb8745fa..ea3eb9fe18 100644
--- a/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanel.cs
+++ b/main/src/addins/VBNetBinding/Gui/ImportsOptionsPanel.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.VBNetBinding
@@ -36,7 +37,7 @@ namespace MonoDevelop.VBNetBinding
 		{
 		}
 		
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			return (widget = new ImportsOptionsPanelWidget (ConfiguredProject));
 		}
diff --git a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanel.cs b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanel.cs
index a456dc913b..9217e09362 100644
--- a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanel.cs
+++ b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanel.cs
@@ -26,7 +26,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
  */
 
-
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.VBNetBinding
@@ -39,7 +39,7 @@ namespace MonoDevelop.VBNetBinding
 		{
 		}
 		
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			return (widget = new ProjectOptionsPanelWidget (ConfiguredProject));
 		}
diff --git a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs
index 211b6a8f7a..bb130ea23c 100644
--- a/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs
+++ b/main/src/addins/VBNetBinding/Gui/ProjectOptionsPanelWidget.cs
@@ -38,9 +38,8 @@ namespace MonoDevelop.VBNetBinding
 	[System.ComponentModel.ToolboxItem(true)]
 	public partial class ProjectOptionsPanelWidget : Gtk.Bin
 	{
-		DotNetProject project;
-		VBProjectParameters parameters;
-		
+		VBProject project;
+
 		public ProjectOptionsPanelWidget (MonoDevelop.Projects.Project project)
 		{
 			Gtk.ListStore store;
@@ -48,9 +47,8 @@ namespace MonoDevelop.VBNetBinding
 
 			this.Build();
 
-			this.project = (DotNetProject) project;
-			parameters = (VBProjectParameters) this.project.LanguageParameters;
-			
+			this.project = (VBProject) project;
+
 			cr = new Gtk.CellRendererText ();
 			store = new Gtk.ListStore (typeof (string));
 			store.AppendValues (GettextCatalog.GetString ("Executable"));
@@ -71,7 +69,7 @@ namespace MonoDevelop.VBNetBinding
 			store.AppendValues ("Console");
 			txtMyType.Model = store;
 			txtMyType.TextColumn = 0;
-			switch (parameters.MyType) {
+			switch (this.project.MyType) {
 			case "WindowsForms":
 				txtMyType.Active = 0;
 				break;
@@ -85,7 +83,7 @@ namespace MonoDevelop.VBNetBinding
 			case "":
 				break;
 			default:
-				txtMyType.AppendText (parameters.MyType);
+				txtMyType.AppendText (this.project.MyType);
 				txtMyType.Active = 3;
 				break;
 			}
@@ -97,7 +95,7 @@ namespace MonoDevelop.VBNetBinding
 			cmbOptionCompare.Model = store;
 			cmbOptionCompare.PackStart (cr, true);
 			cmbOptionCompare.AddAttribute (cr, "text", 0);
-			cmbOptionCompare.Active = parameters.BinaryOptionCompare ? 0 : 1;
+			cmbOptionCompare.Active = this.project.BinaryOptionCompare ? 0 : 1;
 				
 			cr = new Gtk.CellRendererText ();
 			store = new Gtk.ListStore (typeof (string));
@@ -106,7 +104,7 @@ namespace MonoDevelop.VBNetBinding
 			cmbOptionExplicit.Model = store;
 			cmbOptionExplicit.PackStart (cr, true);
 			cmbOptionExplicit.AddAttribute (cr, "text", 0);
-			cmbOptionExplicit.Active = parameters.OptionExplicit ? 0 : 1;
+			cmbOptionExplicit.Active = this.project.OptionExplicit ? 0 : 1;
 			
 			cr = new Gtk.CellRendererText ();
 			store = new Gtk.ListStore (typeof (string));
@@ -115,7 +113,7 @@ namespace MonoDevelop.VBNetBinding
 			cmbOptionInfer.Model = store;
 			cmbOptionInfer.PackStart (cr, true);
 			cmbOptionInfer.AddAttribute (cr, "text", 0);
-			cmbOptionInfer.Active = parameters.OptionInfer ? 0 : 1;
+			cmbOptionInfer.Active = this.project.OptionInfer ? 0 : 1;
 			
 			cr = new Gtk.CellRendererText ();
 			store = new Gtk.ListStore (typeof (string));
@@ -124,11 +122,11 @@ namespace MonoDevelop.VBNetBinding
 			cmbOptionStrict.Model = store;
 			cmbOptionStrict.PackStart (cr, true);
 			cmbOptionStrict.AddAttribute (cr, "text", 0);
-			cmbOptionStrict.Active = parameters.OptionStrict ? 0 : 1;
+			cmbOptionStrict.Active = this.project.OptionStrict ? 0 : 1;
 
 			// Codepage
 			string foundEncoding = null;
-			string currentCodepage = parameters.CodePage;
+			string currentCodepage = this.project.CodePage;
 			foreach (TextEncoding e in TextEncoding.SupportedEncodings) {
 				if (e.CodePage == -1)
 					continue;
@@ -141,21 +139,21 @@ namespace MonoDevelop.VBNetBinding
 			else if (!string.IsNullOrEmpty (currentCodepage))
 				cmbCodePage.Entry.Text = currentCodepage;
 			
-			entryMainClass.Entry.Text = parameters.StartupObject;
-			iconEntry.Path = parameters.ApplicationIcon;
+			entryMainClass.Entry.Text = this.project.StartupObject;
+			iconEntry.Path = this.project.ApplicationIcon;
 		}
 		
 		public void StorePanelContents ()
 		{
-			parameters.BinaryOptionCompare = cmbOptionCompare.ActiveText == "Binary";
-			parameters.OptionExplicit = cmbOptionExplicit.ActiveText == "On";
-			parameters.OptionInfer = cmbOptionInfer.ActiveText == "On";
-			parameters.OptionStrict = cmbOptionStrict.ActiveText == "On";
-			parameters.MyType = txtMyType.ActiveText;
-			parameters.StartupObject = entryMainClass.ActiveText;
-			parameters.CodePage = cmbCodePage.Entry.Text;
-			parameters.ApplicationIcon = iconEntry.Path;
-			this.project.CompileTarget = (CompileTarget) compileTargetCombo.Active;
+			project.BinaryOptionCompare = cmbOptionCompare.ActiveText == "Binary";
+			project.OptionExplicit = cmbOptionExplicit.ActiveText == "On";
+			project.OptionInfer = cmbOptionInfer.ActiveText == "On";
+			project.OptionStrict = cmbOptionStrict.ActiveText == "On";
+			project.MyType = txtMyType.ActiveText;
+			project.StartupObject = entryMainClass.ActiveText;
+			project.CodePage = cmbCodePage.Entry.Text;
+			project.ApplicationIcon = iconEntry.Path;
+			project.CompileTarget = (CompileTarget) compileTargetCombo.Active;
 		}
 	}
 }
diff --git a/main/src/addins/VBNetBinding/Project/Import.cs b/main/src/addins/VBNetBinding/Project/Import.cs
index f8685402fa..227b7a27a1 100644
--- a/main/src/addins/VBNetBinding/Project/Import.cs
+++ b/main/src/addins/VBNetBinding/Project/Import.cs
@@ -30,14 +30,14 @@ using MonoDevelop.Projects;
 
 namespace MonoDevelop.VBNetBinding
 {
-	[DataItem ("Import")]
-	public class Import: SimpleProjectItem
+	public class Import: ProjectItem
 	{
 		public Import ()
 		{
+			ItemName = "Import";
 		}
 		
-		public Import (string include)
+		public Import (string include): this ()
 		{
 			Include = include;
 		}
diff --git a/main/src/addins/VBNetBinding/Project/ImprovedCodeDomProvider.cs b/main/src/addins/VBNetBinding/Project/ImprovedCodeDomProvider.cs
new file mode 100644
index 0000000000..b958a72628
--- /dev/null
+++ b/main/src/addins/VBNetBinding/Project/ImprovedCodeDomProvider.cs
@@ -0,0 +1,40 @@
+//
+// ImprovedCodeDomProvider.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.CodeDom.Compiler;
+
+namespace MonoDevelop.VBNetBinding
+{
+	public class ImprovedCodeDomProvider : Microsoft.VisualBasic.VBCodeProvider
+	{
+		[Obsolete ("Use CodeDomProvider class")]
+		public override ICodeGenerator CreateGenerator ()
+		{
+			return new VBCodeGenerator ();
+		}
+	}
+}
+
diff --git a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs
index 386f8cab79..87a3ee16eb 100644
--- a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs
+++ b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs
@@ -36,7 +36,7 @@ using MonoDevelop.Core.Serialization;
 

 namespace MonoDevelop.VBNetBinding
 {

-	public class VBCompilerParameters: ConfigurationParameters

+	public class VBCompilerParameters: DotNetCompilerParameters

 	{
 		//
 		// Project level properties:
@@ -104,7 +104,6 @@ namespace MonoDevelop.VBNetBinding
 		[ItemProperty ("AdditionalParameters")]

 		string additionalParameters = String.Empty;
 
-		[Obsolete]
 		public override void AddDefineSymbol (string symbol)
 		{
 			var symbols = new List<string> (GetDefineSymbols ());
@@ -112,7 +111,6 @@ namespace MonoDevelop.VBNetBinding
 			definesymbols = string.Join (";", symbols) + ";";
 		}
 		
-		[Obsolete]
 		public override void RemoveDefineSymbol (string symbol)
 		{
 			var symbols = new List<string> (GetDefineSymbols ());
diff --git a/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs b/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs
index c6bcf8008f..c1bef2c519 100644
--- a/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs
+++ b/main/src/addins/VBNetBinding/Project/VBNetResourceIdBuilder.cs
@@ -31,16 +31,16 @@ using System;
 using System.IO;
 using System.Text;
 using MonoDevelop.Projects.Extensions;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.VBNetBinding
 {
-	class VBNetResourceIdBuilder : MSBuildResourceHandler
+	class VBNetResourceIdBuilder
 	{
-		public override string GetDefaultResourceId (ProjectFile pf)
+		public static string GetDefaultResourceId (ProjectFile pf)
 		{
 			if (String.IsNullOrEmpty (pf.DependsOn))
-				return base.GetDefaultResourceId (pf);
+				return null;
 
 			string ns = null;
 			string classname = null;
@@ -70,7 +70,7 @@ namespace MonoDevelop.VBNetBinding
 				}
 
 				if (classname == null)
-					return base.GetDefaultResourceId (pf);
+					return null;
 
 				string culture, extn, only_filename;
 				if (MSBuildProjectService.TrySplitResourceName (pf.ProjectVirtualPath, out only_filename, out culture, out extn))
@@ -99,7 +99,7 @@ namespace MonoDevelop.VBNetBinding
 		 * skips comments, 
 		 * skips strings "foo"
 		 */
-		string GetNextToken (StreamReader sr)
+		static string GetNextToken (StreamReader sr)
 		{
 			StringBuilder sb = new StringBuilder ();
 
diff --git a/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs b/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs
new file mode 100644
index 0000000000..94db4dd019
--- /dev/null
+++ b/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs
@@ -0,0 +1,145 @@
+//
+// VBProjectExtension.cs
+//
+// Author:
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Projects;
+using MonoDevelop.Projects.MSBuild;
+using MonoDevelop.Core.Serialization;
+using System.Diagnostics;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.VBNetBinding
+{
+	class VBProject: DotNetProject
+	{
+		[ItemProperty ("OptionInfer", DefaultValue="Off")]
+		string optionInfer = "Off";
+
+		[ItemProperty ("OptionExplicit", DefaultValue="On")]
+		string optionExplicit = "On";
+
+		[ItemProperty ("OptionCompare", DefaultValue="Binary")]
+		string optionCompare = "Binary";
+
+		[ItemProperty ("OptionStrict", DefaultValue="Off")]
+		string optionStrict = "Off";
+
+		[ItemProperty ("MyType", DefaultValue="")]
+		string myType = string.Empty;
+
+		[ItemProperty ("StartupObject", DefaultValue="")]
+		string startupObject = string.Empty;
+
+		[ProjectPathItemProperty ("ApplicationIcon", DefaultValue="")]
+		string applicationIcon = string.Empty;
+
+		[ItemProperty ("CodePage", DefaultValue="")]
+		string codePage = string.Empty;
+
+		public bool OptionInfer {
+			get { return optionInfer == "On"; }
+			set { optionInfer = value ? "On" : "Off"; }
+		}
+
+		public bool OptionExplicit {
+			get { return optionExplicit == "On"; }
+			set { optionExplicit = value ? "On" : "Off"; }
+		}
+
+		public bool BinaryOptionCompare {
+			get { return optionCompare == "Binary"; }
+			set { optionCompare = value ? "Binary" : "Text"; }
+		}
+
+		public bool OptionStrict {
+			get { return optionStrict == "On"; }
+			set { optionStrict = value ? "On" : "Off"; }
+		}
+
+		public string MyType {
+			get { return myType; }
+			set { myType = value ?? string.Empty; }
+		}
+
+		public string StartupObject {
+			get { return startupObject; }
+			set { startupObject = value ?? string.Empty; }
+		}
+
+		public string ApplicationIcon {
+			get { return applicationIcon; }
+			set { applicationIcon = value ?? string.Empty; }
+		}
+
+		public string CodePage {
+			get { return codePage; }
+			set { codePage = value ?? string.Empty; }
+		}
+
+		protected override void OnInitialize ()
+		{
+			base.OnInitialize ();
+			DefaultNamespaceIsImplicit = true;
+			SupportsRoslyn = true;
+			StockIcon = "md-project";
+		}
+
+		VBBindingCompilerServices compilerServices = new VBBindingCompilerServices();
+
+		protected override BuildResult OnCompileSources (ProjectItemCollection items, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, MonoDevelop.Core.ProgressMonitor monitor)
+		{
+			Debug.Assert(compilerServices != null);
+			return compilerServices.Compile (items, configuration, configSelector, monitor);
+		}
+
+		protected override DotNetCompilerParameters OnCreateCompilationParameters (DotNetProjectConfiguration config, ConfigurationKind kind)
+		{
+			var pars = new VBCompilerParameters ();
+			if (kind == ConfigurationKind.Debug)
+				pars.AddDefineSymbol ("DEBUG");
+			else if (kind == ConfigurationKind.Release)
+				pars.Optimize = true;
+			return pars;
+		}
+
+		protected override ClrVersion[] OnGetSupportedClrVersions ()
+		{
+			return new ClrVersion[] { ClrVersion.Net_2_0, ClrVersion.Net_4_0, ClrVersion.Net_4_5 };
+		}
+
+		protected override string OnGetDefaultResourceId (ProjectFile projectFile)
+		{
+			return VBNetResourceIdBuilder.GetDefaultResourceId (projectFile) ?? base.OnGetDefaultResourceId (projectFile);
+		}
+
+		protected override ProjectItem OnCreateProjectItem (IMSBuildItemEvaluated item)
+		{
+			if (item.Name == "Import")
+				return new Import ();
+			return base.OnCreateProjectItem (item);
+		}
+	}
+}
+
diff --git a/main/src/addins/VBNetBinding/Project/VBProjectParameters.cs b/main/src/addins/VBNetBinding/Project/VBProjectParameters.cs
deleted file mode 100644
index f3e8dd95ff..0000000000
--- a/main/src/addins/VBNetBinding/Project/VBProjectParameters.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// 
-// VBProjectParameters.cs
-//  
-// Author:
-//       Lluis Sanchez Gual <lluis@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using MonoDevelop.Core.Serialization;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.VBNetBinding
-{
-	public class VBProjectParameters: DotNetProjectParameters
-	{
-		public override bool DefaultNamespaceIsImplicit {
-			get {
-				return true;
-			}
-		}
-
-		[ItemProperty ("OptionInfer", DefaultValue="Off")]
-		string optionInfer = "Off";
-		
-		[ItemProperty ("OptionExplicit", DefaultValue="On")]
-		string optionExplicit = "On";
-		
-		[ItemProperty ("OptionCompare", DefaultValue="Binary")]
-		string optionCompare = "Binary";
-		
-		[ItemProperty ("OptionStrict", DefaultValue="Off")]
-		string optionStrict = "Off";
-		
-		[ItemProperty ("MyType", DefaultValue="")]
-		string myType = string.Empty;
-		
-		[ItemProperty ("StartupObject", DefaultValue="")]
-		string startupObject = string.Empty;
-		
-		[ProjectPathItemProperty ("ApplicationIcon", DefaultValue="")]
-		string applicationIcon = string.Empty;
-		
-		[ItemProperty ("CodePage", DefaultValue="")]
-		string codePage = string.Empty;
-		
-		public VBProjectParameters()
-		{
-		}
-		
-		public bool OptionInfer {
-			get { return optionInfer == "On"; }
-			set { optionInfer = value ? "On" : "Off"; }
-		}
-		
-		public bool OptionExplicit {
-			get { return optionExplicit == "On"; }
-			set { optionExplicit = value ? "On" : "Off"; }
-		}
-
-		public bool BinaryOptionCompare {
-			get { return optionCompare == "Binary"; }
-			set { optionCompare = value ? "Binary" : "Text"; }
-		}
-
-		public bool OptionStrict {
-			get { return optionStrict == "On"; }
-			set { optionStrict = value ? "On" : "Off"; }
-		}
-		
-		public string MyType {
-			get { return myType; }
-			set { myType = value ?? string.Empty; }
-		}
-		
-		public string StartupObject {
-			get { return startupObject; }
-			set { startupObject = value ?? string.Empty; }
-		}
-		
-		public string ApplicationIcon {
-			get { return applicationIcon; }
-			set { applicationIcon = value ?? string.Empty; }
-		}
-		
-		public string CodePage {
-			get { return codePage; }
-			set { codePage = value ?? string.Empty; }
-		}
-	}
-}
diff --git a/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs b/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
index 518777a678..464b82c151 100644
--- a/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
+++ b/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
@@ -49,7 +49,7 @@ namespace MonoDevelop.VBNetBinding {
 	/// </summary>
 	public class VBBindingCompilerServices
 	{
-		string GenerateOptions (DotNetProjectConfiguration configuration, VBCompilerParameters compilerparameters, VBProjectParameters projectparameters, string outputFileName)
+		string GenerateOptions (DotNetProjectConfiguration configuration, VBCompilerParameters compilerparameters, VBProject projectparameters, string outputFileName)
 		{
 			var project = configuration.ParentItem;
 			StringBuilder sb = new StringBuilder ();
@@ -183,16 +183,14 @@ namespace MonoDevelop.VBNetBinding {
 			return sb.ToString();
 		}
 		
-		public BuildResult Compile (ProjectItemCollection items, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, IProgressMonitor monitor)
+		public BuildResult Compile (ProjectItemCollection items, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, ProgressMonitor monitor)
 		{
 			VBCompilerParameters compilerparameters = (VBCompilerParameters) configuration.CompilationParameters;
 			if (compilerparameters == null)
 				compilerparameters = new VBCompilerParameters ();
 			
-			VBProjectParameters projectparameters = (VBProjectParameters) configuration.ProjectParameters;
-			if (projectparameters == null)
-				projectparameters = new VBProjectParameters ();
-			
+			var projectparameters = (VBProject) configuration.ParentItem;
+
 			string exe = configuration.CompiledOutputName;
 			string responseFileName = Path.GetTempFileName();
 			StreamWriter writer = new StreamWriter (responseFileName);
diff --git a/main/src/addins/VBNetBinding/VBLanguageBinding.cs b/main/src/addins/VBNetBinding/VBLanguageBinding.cs
deleted file mode 100644
index 0fbca6123c..0000000000
--- a/main/src/addins/VBNetBinding/VBLanguageBinding.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-//  VBLanguageBinding.cs
-//
-//  This file was derived from a file from #Develop, and relicensed
-//  by Markus Palme to MIT/X11
-//
-//  Copyright (C) 2001-2007 Markus Palme <MarkusPalme@gmx.de>
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Diagnostics;
-using System.Xml;
-using Microsoft.VisualBasic;
-using System.CodeDom.Compiler;
-
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.VBNetBinding
-{
-	public class VBLanguageBinding : IDotNetLanguageBinding
-	{
-		public const string LanguageName = "VBNet";
-		
-		VBBindingCompilerServices   compilerServices  = new VBBindingCompilerServices();
-		VBCodeProvider provider;
-		//TParser parser = new TParser ();
-		
-		public string Language {
-			get {
-				return LanguageName;
-			}
-		}
-		
-		public string ProjectStockIcon {
-			get { 
-				return "md-project";
-			}
-		}
-		
-		public bool IsSourceCodeFile (FilePath fileName)
-		{
-			return Path.GetExtension(fileName) == ".vb";
-		}
-		
-		public BuildResult Compile (ProjectItemCollection items, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, IProgressMonitor monitor)
-		{
-			Debug.Assert(compilerServices != null);
-			return compilerServices.Compile (items, configuration, configSelector, monitor);
-		}
-		
-		public ConfigurationParameters CreateCompilationParameters (XmlElement projectOptions)
-		{
-			return new VBCompilerParameters ();
-		}
-		
-		public string SingleLineCommentTag { get { return "'"; } }
-		public string BlockCommentStartTag { get { return null; } }
-		public string BlockCommentEndTag { get { return null; } }
-		
-		public CodeDomProvider GetCodeDomProvider ()
-		{
-			if (provider == null)
-				provider = new ImprovedCodeDomProvider ();
-			return provider;
-		}
-		
-		public FilePath GetFileName (FilePath baseName)
-		{
-			return baseName + ".vb";
-		}
-		
-		public ClrVersion[] GetSupportedClrVersions ()
-		{
-			return new ClrVersion[] { ClrVersion.Net_2_0, ClrVersion.Net_4_0 };
-		}
-	
-		public ProjectParameters CreateProjectParameters (XmlElement projectOptions)
-		{
-			return new VBProjectParameters ();
-		}
-	
-		class ImprovedCodeDomProvider : Microsoft.VisualBasic.VBCodeProvider
-		{
-			[Obsolete ("Use CodeDomProvider class")]
-			public override ICodeGenerator CreateGenerator ()
-			{
-				return new VBCodeGenerator ();
-			}
-		}
-	}
-}
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
index 0db637b68d..fd4b3c11dc 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
+++ b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml
@@ -1,11 +1,12 @@
 <ExtensionModel>
 
 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
-		<DotNetProject 
+		<DotNetProjectType 
 			language="VBNet" 
 			extension="vbproj" 
 			guid="{F184B08F-C81C-45F6-A57F-5ABD9991F28F}" 
 			import="$(MSBuildBinPath)\Microsoft.VisualBasic.targets"
+			type="MonoDevelop.VBNetBinding.VBProject"
 			resourceHandler="MonoDevelop.VBNetBinding.VBNetResourceIdBuilder"/>
 	</Extension>
 
@@ -22,13 +23,13 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
-		<ProjectTemplate id = "EmptyVBProject" resource = "EmptyVBProject.xpt.xml"/>
-		<ProjectTemplate id = "VBConsoleApplicationProject" resource = "VBConsoleApplicationProject.xpt.xml"/>
-		<ProjectTemplate id = "VBGtkSharp2Project" resource = "VBGtkSharp2Project.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.VBNet.EmptyProject" resource = "EmptyVBProject.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.VBNet.ConsoleProject" resource = "VBConsoleApplicationProject.xpt.xml"/>
+		<ProjectTemplate id = "MonoDevelop.VBNet.GtkSharp2Project" resource = "VBGtkSharp2Project.xpt.xml"/>
 	</Extension>
   
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build/General">
-		<Condition id="ActiveLanguage" value="VBNet">
+		<Condition id="ProjectTypeId" value="VBNet">
 			<Panel id = "VBNetProjectOptionsPanel"
 				_label = "General Options" 
 				class = "MonoDevelop.VBNetBinding.ProjectOptionsPanel"/>
@@ -39,7 +40,7 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels/Build/Compiler">
-		<Condition id="ActiveLanguage" value="VBNet">
+		<Condition id="ProjectTypeId" value="VBNet">
 			<Panel id = "VBNetConfigurationOptionsPanel"
 				_label = "Compiler Options" 
 				class = "MonoDevelop.VBNetBinding.ConfigurationOptionsPanel"/>
@@ -58,8 +59,9 @@
 
 	<Extension path = "/MonoDevelop/ProjectModel/LanguageBindings">
 		<LanguageBinding id = "VBNet"
-			supportedextensions = ".vb"
-			class = "MonoDevelop.VBNetBinding.VBLanguageBinding" />
+			extensions = ".vb"
+			singleLineCommentTag = "'"
+			codeDomType = "MonoDevelop.VBNetBinding.ImprovedCodeDomProvider" />
 	</Extension>
   
 	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.csproj b/main/src/addins/VBNetBinding/VBNetBinding.csproj
index 8fb1dca2f8..c9a9280711 100644
--- a/main/src/addins/VBNetBinding/VBNetBinding.csproj
+++ b/main/src/addins/VBNetBinding/VBNetBinding.csproj
@@ -80,7 +80,6 @@
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="VBBindingCompilerServices.cs" />
-    <Compile Include="VBLanguageBinding.cs" />
     <Compile Include="Project\VBCompilerParameters.cs" />
     <Compile Include="VBCodeGenerator.cs" />
     <Compile Include="gtk-gui\generated.cs" />
@@ -95,8 +94,9 @@
     <Compile Include="Gui\ImportsOptionsPanelWidget.cs" />
     <Compile Include="Gui\ImportsOptionsPanel.cs" />
     <Compile Include="gtk-gui\MonoDevelop.VBNetBinding.ImportsOptionsPanelWidget.cs" />
-    <Compile Include="Project\VBProjectParameters.cs" />
     <Compile Include="AddinInfo.cs" />
+    <Compile Include="Project\VBProjectExtension.cs" />
+    <Compile Include="Project\ImprovedCodeDomProvider.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="templates\EmptyVBFile.xft.xml">
diff --git a/main/src/addins/VBNetBinding/templates/AssemblyInfo.xft.xml b/main/src/addins/VBNetBinding/templates/AssemblyInfo.xft.xml
index defbdd67c2..b9627d89fb 100644
--- a/main/src/addins/VBNetBinding/templates/AssemblyInfo.xft.xml
+++ b/main/src/addins/VBNetBinding/templates/AssemblyInfo.xft.xml
@@ -8,7 +8,7 @@
 	<TemplateConfiguration>
 		<_Name>Assembly Information</_Name>
 		<_Category>Misc</_Category>
-		<Icon>md-file-source</Icon>
+		<Icon>md-file-information</Icon>
 		<LanguageName>VBNet</LanguageName>
 		<DefaultFilename IsFixed="True">AssemblyInfo.vb</DefaultFilename>
 		<_Description>A file defining assembly information attributes.</_Description>
diff --git a/main/src/addins/VersionControl/ChangeLog b/main/src/addins/VersionControl/ChangeLog
deleted file mode 100644
index f2cf60dcbf..0000000000
--- a/main/src/addins/VersionControl/ChangeLog
+++ /dev/null
@@ -1,1323 +0,0 @@
-2010-06-28  Dale Ragan  <dale.ragan@sinesignal.com>
-
-	* Makefile.am: Adding MonoDevelop.VersionControl.Git to the solution/build 
-	  system.  It is disabled by default, to enable pass --enable-git=yes.
-
-2010-02-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Diff:
-	* DiffWidget:
-	* Diff/README:
-	* Makefile.am:
-	* Diff/Diff.cs:
-	* Diff/Patch.cs:
-	* Diff/Merge.cs:
-	* Diff/ChangeLog:
-	* Diff/TextDiff.cs:
-	* Diff/Diff.csproj:
-	* Diff/Makefile.am:
-	* DiffWidget/README:
-	* Diff/UnifiedDiff.cs:
-	* DiffWidget/widget.cs:
-	* DiffWidget/ChangeLog:
-	* Diff/StructuredDiff.cs:
-	* DiffWidget/Makefile.am:
-	* DiffWidget/DiffWidget.csproj: Moved diff widget and
-	  algorithm to MonoDevelop.Components.
-
-2009-06-23  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Move patch header tagging into svn addin.
-
-2009-04-17  Mike Kestner  <mkestner@novell.com>
-
-	* *.csproj: don't require specific gtk-sharp version.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VersionControl.mds: Migrated to MSBuild file format.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp:
-	Flush project format changes.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Diff/Diff.mdp:
-	* DiffWidget/DiffWidget.mdp:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp:
-	All projects now require fx 3.5.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Diff/Makefile.am:
-	* DiffWidget/Makefile.am:
-	* MonoDevelop.VersionControl.Subversion/Makefile.am: Make it work for
-	parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/Makefile.am:
-	* MonoDevelop.VersionControl.Subversion/AssemblyInfo.cs:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp:
-	Add AssemblyInfo.cs files that are autogenerated from the addin
-	manifests.
-
-2008-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	Avoid adding duplicate trailing slash. Fixes bug #425338 - crash when
-	trying to publish project to svn. Patch by Scott Ellington.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml:
-	Bump MD version.
-
-2008-10-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	Use CanMoveFiles to check if a directory can be moved from one SVN
-	dir to another SVN dir. Fixes bug #436289.
-
-2008-10-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/Makefile.am:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/Commands.cs:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionNodeExtension.cs:
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	Implemented Resolve command and tracked some api changes.
-
-2008-09-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs:
-	  Updated generated code.
-
-2008-08-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Properly show the remote status in the status view. Include remote
-	  additions and removals. Show diff between working copy and repo
-	  when remote status is requested. All this fixes bug #395284 - SVN
-	  plugin: Show Remote Status does not work.
-
-2008-08-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/Makefile.am,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp:
-	  Add Ide reference, MD.Version control needs it.
-
-2008-08-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Diff/Diff.cs: Add missing accessor.
-
-2008-08-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/gtk-gui/objects.xml,
-	  MonoDevelop.VersionControl.Subversion/Makefile.am,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Add support for locking/unlocking, and for on-demand unlocking
-	  (RequestFileEdit event).
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Moved serialization engine to MonoDevelop.Core. Use new syntax for
-	  specifying attribute scope.
-
-2008-07-06  Andrés G. Aragoneses <aaragoneses@novell.com> 
-
-	Implement feature in bug#394434: "Revert [to] revision".
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	  New P/Invokes for merge command.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Overriding implementations for RevertRevision and RevertToRevision.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Connection between the P/Invoke library (for the merge command) and
-	  the Revert[To]Revision methods.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  RevertRevision and RevertToRevision helper methods implemented.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VersionControl.mds,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml:
-	  Bump MD version.
-
-2008-05-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Load system and user svn configuration when initializing a context.
-	  Fixes bug #378835.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Added some getstring calls
-
-2008-02-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Added missing null check.
-
-2008-01-25  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	  Add a workaround for [MarshalAs (UnmanagedType.SysInt)] not working.
-	  Fixes "Bug 325391 - Crash when attempting to browse registered repo" but
-	  related issues remain in the binding.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml:
-	  Update MD version.
-
-2008-01-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  In GetRepostoryReference, properly check if the provided directory is
-	  versioned. Fixes bug #355770.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml:
-	  Updated add-in category and description.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Notify file changes through the FileService.
-
-2008-01-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	  More marshalling fixes.
-
-2008-01-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	  Fix marshalling issues.
-
-2008-01-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  In GetHistory(), There is no need to query the working revision, since
-	  we can use the constant Rev.Working as start revision. It also fixes bug
-	  #324571.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp:
-	  Updated project files. The order of extended properties won't change
-	  anymore.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml:
-	  Bump add-in versions.
-
-2007-12-11  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/Makefile.am: Fix trivial warning.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Use lazy initialisation rather than a static constructor. Log a message
-	  to tell the user if the SVN add is disabled. Implement IDisposable in
-	  addition to finaliser. Minor optimisation to release the LibSvnClient if
-	  LibApr can't be loaded.
-
-2007-12-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic: Updated.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs:
-	  Check if Subversion is installed in a nicer way. Fixes bug #342507.
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Diff/Diff.mdp, MonoDevelop.VersionControl.Subversion/Makefile.am,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  DiffWidget/DiffWidget.mdp: Directory reorganization.
-
-2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  In some cases it may be possible to natively move files between two
-	  repositories (e.g. if they are in the same server). Added a virtual
-	  method to check that and implemented it for SVN.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Track LoggingService API changes.
-
-2007-10-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml,
-	  MonoDevelop.VersionControl/VersionControl.addin.xml: Bump MD version.
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs:
-	  Make a copy of the repository before editing, and only update the
-	  original copy if the user clicks on OK. Fixes bug #336155.
-	* MonoDevelop.VersionControl/gtk-gui/gui.stetic: Flush
-
-2007-10-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/overlay_added.png,
-	  MonoDevelop.VersionControl/overlay_conflicted.png,
-	  MonoDevelop.VersionControl/overlay_controled.png,
-	  MonoDevelop.VersionControl/overlay_locked.png,
-	  MonoDevelop.VersionControl/overlay_modified.png,
-	  MonoDevelop.VersionControl/overlay_removed.png: Use tango file icons.
-	  Removed obsolete icons.
-
-2007-10-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Diffs.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Logs.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs:
-	  Destroy the view when disposing.
-
-2007-10-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Updated comment.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepositoryEditor.cs:
-	  Set a default repo name if none is specified. Fixes bug #335114.
-
-2007-10-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/Makefile.am,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp:
-	  Added reference to System.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  libsvn_client may be linked to libapr-0 or libapr-1, and we need to bind
-	  the LibApr class the the same library. Added code that detects the
-	  required libapr version and loads it. Fixes bug #325391.
-
-2007-10-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Diff/Diff.mdp, DiffWidget/DiffWidget.mdp,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp,
-	  VersionControl.mds: Flush
-
-2007-10-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	  Added some new pinvokes.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs:
-	  Call config_ensure when initializing the svn client to make sure all
-	  config directories are properly created, and that authentication data
-	  can be saved. Handle the case when the user cancels the server
-	  certificate validation. Based on a patch by Grzegorz Sobanski. Fixes bug
-	  #324640.
-
-2007-10-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	  Fix formatting.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Error objects returned by authentification handlers must be allocated in
-	  its own memory pool. Fixes bug #328035.
-
-2007-10-03  Grzegorz Sobański <silk@boktor.net>
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Changed the order of password and certs providers to first use the
-	  subversion ones - to use the same credentials that command line client
-	  (from ~/.subversion directory). It fixes bug #325538 too.
-
-2007-10-03  Zach Lute <zach.lute@gmail.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Diffs.cs:  Only dispose of
-	  FileSystemWatchers if they were actually created. (Bug #330505)
-
-2007-09-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml,
-	  MonoDevelop.VersionControl/VersionControl.addin.xml: Bump MD version.
-
-2007-09-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs:
-	  Regenerated GUI files.
-
-2007-09-15  Andrés G. Aragoneses <knocte@gmail.com>
-
-	* MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs:
-	* MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic:
-	Use a normal title for the window.
-
-2007-09-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/generated.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/gui.stetic: Increase range of port
-	  selector in the repository information widget.
-
-2007-09-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Diffs.cs:
-	  Dispose the file watchers when disposing the view. Fixes bug #82721.
-
-2007-09-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Publish.cs: Notify a
-	  directory status change after publishing a project. Fixes bug #82275.
-
-2007-09-06  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  In GetVersionInfo, check for directory before checking for file, since
-	  directory links may appear as files.
-
-2007-09-04  Michael Hutchinson <MHutchinson@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Publish.cs: Fix a
-	  compiler warning.
-
-2007-09-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs:
-	  Changed location of revert button, to avoid confusion with the commit
-	  button (see bug #82542).
-
-2007-08-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs:
-	  Reload reverted files. Fixes bug #82338.
-
-2007-08-10  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeSet.cs: When
-	  going to commit, clone the changeset since commit extensions may change
-	  it (e.g. changelog extension). Allow setting messages to files not
-	  marked for commit. Should fix bug #82172.
-
-2007-08-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/Makefile.am,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/VersionControl.addin.xml,
-	  MonoDevelop.VersionControl/gtk-gui/gui.stetic,
-	  MonoDevelop.VersionControl/Makefile.am: Reorganized the extension point
-	  hierarchy. Embedded all add-in manifests as resources.
-
-2007-08-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs: API
-	  cleanup. Converted core services into regular classes.
-
-2007-08-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeSet.cs: New
-	  GeneratePathComment method which allows generating comments for a
-	  specific set of files.
-
-2007-08-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/gui.stetic: Fix dialog spacing.
-
-2007-07-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs:
-	  Made some strings translatable. Update commit button after changing
-	  selection.
-
-2007-07-29  Zach Lute <zach.lute@gmail.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs: 
-	  Added Select All and Select None buttons to the commit/status view. (Bug #82146)
-
-2007-07-26  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs:
-	  Reset the global comment of the changeset before committing. Fixes
-	  bug #82172.
-
-2007-07-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs:
-	Close the dialog when the user hits Enter in the Password field (or User field if no passwd is needed).
-
-2007-07-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
-	  Load repository info in a background thread.
-
-2007-07-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  The result_rev parameter of svn_client_checkout is not a
-	  svn_opt_revision_t, but a svn_revnum_t. Might fix bug #81870.
-
-2007-07-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlProjectService.cs:
-	Lluis' previous change is not actually needed.
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
-	(NotifyFileChanged): Implemented. Fixes bug #81910.
-
-2007-07-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlProjectService.cs:
-	  Notify file changes as version control status changes. Fixes bug
-	  #81910.
-
-2007-07-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	* MonoDevelop.VersionControl/VersionControl.addin.xml: Set the
-	category for the version-control commands so they look all nice
-	and pretty in the key-binding manager :)
-
-2007-07-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
-	  Use the log service for logging errors.
-	* MonoDevelop.VersionControl/gtk-gui/gui.stetic: Updated.
-
-2007-07-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  If a file is deleted and it is scheduled to Add, revert the Add
-	  operation. Fixes bug #81953.
-
-2007-07-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/gui.stetic: Updated.
-
-2007-06-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp:
-	  Updated.
-
-2007-06-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	  Move the overlay icon one pixel up, to reduce spacing.
-
-2007-05-31  Rafael 'fumasa' Giorgetti  <fumasa@gmail.com>
-
-        * MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-        Add struct svn_client_commit_info_t.
-
-        * MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-        Show revision number when Commit.
-
-2007-05-31  Jeffrey Stedfast  <fejj@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	Call a function in the .ctor to cause an exception if the library doesn't exist.
-
-2007-05-31  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for bug #81766.
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	Updated to reflect changes to SvnClient nested classes/structs (which have been moved to LibSvnClient).
-	
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs: Same.
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs: Same.
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs: Same.
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs: Same.
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	Same.
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs:
-	Moved some constants here.
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	Use a LibSvnClient object.
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	New source file that wraps libsvn_client-1.so.[0,1]
-
-2007-05-31  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Directly call Svn.Commit when publishing a project, since the
-	  regular Commit method has problems importing new folders.
-
-2007-05-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs:
-	  Fix the build.
-
-2007-05-28  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs:
-	  Properly destroy the commit dialog. Fixes bug #81751.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeSet.cs:
-	  Fix crash when committing new directory additions.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs:
-	  Properly unregister VersionControlSystem objects on add-in
-	  unloading.
-
-2007-05-22  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
-	(OnButtonEditClicked): Null check.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Checkout.cs
-	(CheckOutCommand.Run): Likewise.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Publish.cs
-	(PublishCommand.Publish): Likewise.
-
-2007-05-21  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
-	(Dispose): Remove.
-	Ensure that dialogs are Destroy()'ed.	
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs:
-	(Dispose): Remove.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Checkout.cs (Run): 
-	Destroy dialog.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Publish.cs
-	(PublishCommand.Publish): Destroy dialog.
-
-2007-05-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp: Don't copy
-	  assemly references.
-
-2007-05-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs,
-	  MonoDevelop.VersionControl/VersionControl.addin.xml,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Diffs.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs,
-	  MonoDevelop.VersionControl/Makefile.am,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs:
-	  Migration to Mono.Addins.
-
-2007-04-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  DiffWidget/DiffWidget.mdp: Updated.
-
-2007-04-11  Jeffrey Stedfast  <fejj@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	Use svn_client_add3() so that we can pass 'force' as true. (We
-	already required 1.3+ as mkdir2() is only 1.3+)
-
-2007-04-10  Jeffrey Stedfast  <fejj@novell.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs:
-	Removed BuildNavPoint().
-
-2007-03-29  Jeffrey Stedfast  <fejj@novell.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs: Implement
-	BuildNavPoint().
-
-2007-03-21  Jeffrey Stedfast  <fejj@novell.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlProjectService.cs
-	(OnEntryAdded): Instead of calling repo.Add() with the recursive
-	arg set to true, do our own "recursive" adding requesting the list
-	of files from the CombineEntry and sub-CombineEntry nodes. This 
-	would prevent addition of files/folders that are not part of the 
-	project but existed in the project directory at the time ti was added.
-
-	Fix for bug #81184
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs:
-	Updated to not pass a path argument to GetRepository().
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	Updated to not pass a path argument to GetRepository().
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlProjectService.cs
-	(GetRepository): No longer takes a path argument as it never uses
-	it anyway.
-	(OnEntryAdded): New callback to handle when a project or combine gets added.
-	(VersionControlProjectService): Bind OnEntryAdded.
-
-2007-03-19  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fixes bug #81185 and then delves a bit deeper.
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs
-	(IsInstalled): Implemented.
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Checkout.cs
-	(Update): Added. Disable the menu item if no version control
-	systems are installed.
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlSystem.cs:
-	Add a virtual IsInstalled property.
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
-	(SelectionRepositoryDialog): Only add VCS's that are installed.
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs
-	(EditRepositoryDialog): Only add VCS's that are installed.
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
-	(RunCommand): Test that the vcs.IsInstalled, if not - then return
-	TestResult.Disable
-
-2007-03-09  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
-	(OnButtonAddClicked): Add entry for the new repository only instead of
-	reloading the full list.
-	(OnButtonRemoveClicked): Avoid reloading the full list of repositories.
-	Also, save configuration.
-	(OnButtonEditClicked): Update the corresponding row in the treeview.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepositoryEditor.cs:
-	(.ctor): Don't reset comboProtocol's value.	
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/Makefile.am: Fix build.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/UserPasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.SslServerTrustDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.UserPasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/SslServerTrustDialog.cs:
-	  Moved to .Gui namespace and directory.
-	* MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs:
-	  Implemented dialogs for asking for client certificates.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  MonoDevelop.VersionControl.Subversion/Makefile.am: Updated.
-
-2007-03-08  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Diff/Diff.mdp, DiffWidget/DiffWidget.mdp,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp: Don't
-	  local-copy references.
-	* MonoDevelop.VersionControl.Subversion/UserPasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.SslServerTrustDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic,
-	  MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.UserPasswordDialog.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  MonoDevelop.VersionControl.Subversion/Makefile.am,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs,
-	  MonoDevelop.VersionControl.Subversion/SslServerTrustDialog.cs:
-	  Implemented dialogs for entering user and password, and for
-	  accepting an invalid ssl certificate. Plugged those dialogs into
-	  the corresponding subversion callbacks.
-
-2007-02-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs:
-	  Unsubscribe file status change on dispose.
-
-2007-02-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Publish.cs: Ask
-	  for confirmation before publishing a project into a repository.
-
-2007-02-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml,
-	  MonoDevelop.VersionControl/VersionControl.addin.xml: Change add-in
-	  versions to 0.13.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Diff/Diff.mdp, Diff/Makefile.am,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  MonoDevelop.VersionControl.Subversion/Makefile.am,
-	  DiffWidget/Makefile.am, DiffWidget/DiffWidget.mdp,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp,
-	  MonoDevelop.VersionControl/gtk-gui/gui.stetic,
-	  MonoDevelop.VersionControl/Makefile.am: Synchronize MD project and
-	  makefile.
-	* MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs: Updated.
-
-2007-02-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Added debug message.
-
-2007-02-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlProjectService.cs:
-	  Allow re-adding a file which has been deleted, but the delete has
-	  not yet been committed.
-
-2007-02-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Use the svn_client_cat2 instead of svn_client_cat. This version of
-	  the method can get old revisions of a file even when the file was
-	  moved from another directory. Fixes bug #80318.
-
-2007-02-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* Diff/Diff.mdp, VersionControl.mds,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  DiffWidget/DiffWidget.mdp: Flush.
-	* MonoDevelop.VersionControl.Subversion/Makefile.am,
-	  MonoDevelop.VersionControl/Makefile.am: distcheck fixes.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Diffs.cs,
-	  MonoDevelop.VersionControl/VersionControl.addin.xml,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml:
-	  Removed dependency to editor add-in.
-	* MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs:
-	  Minor fixes.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs:
-	  Added File Open button to the toolbar.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Logs.cs:
-	  Show the content of revisions using the MD text editor, and with
-	  the correct mime type.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Publish.cs: Fix
-	  spelling.
-
-2007-02-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/gui.stetic: i18N fixes.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Logs.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs:
-	  Improved protection against unknown exceptions.
-
-2007-02-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  MonoDevelop.VersionControl.Subversion/Makefile.am,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Fix potential issue when reading the output from svn.
-
-2007-02-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/VersionControl.addin.xml: Allow updating
-	  individual files.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	  If there is no version control for a project or folder, instead of
-	  an empty version control menu, show a disabled command saying so.
-
-2007-01-30  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Fix 64 bit issues.
-
-2007-01-29  David Makovský (Yakeen) <yakeen@sannyas-on.net>
-
-	* Diff/Diff.cs: chaned to use generics, platform independent newlines
-	* Diff/Merge.cs: platform independent newlines
-	
-2007-01-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs,
-	  MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Logs.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/Revision.cs:
-	  Improved the log view. Use a toolbar instead of regular buttons.
-	  Provide more information about files comitted in a revision.
-
-2007-01-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  MonoDevelop.VersionControl/gtk-gui/generated.cs,
-	  MonoDevelop.VersionControl/gtk-gui/gui.stetic: Updated.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Provide auth_baton for subversion authentication (patch by Duncan
-	  Mackay <duncan.mackay@provenco.com>). In CheckError, get error
-	  messages from all all nested error objects.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  PathDiff now returns differences between the base and the working
-	  versions.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp,
-	  MonoDevelop.VersionControl/Makefile.am: Added new files.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepositoryEditor.cs:
-	  Use the new partial class model.
-	* MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs,
-	  MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs:
-	  New partial files for the dialogs.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Statuses.cs:
-	  When the view is refreshed, discard the diffs already loaded. Track
-	  changes in diff cell renderer.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs:
-	  Cache Layout objects for diff content, since they may be very big
-	  and take too much time to construct. The cell renderer is now must
-	  faster for big files.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs:
-	  Fix warning.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlProjectService.cs:
-	  Fix warnings.
-
-2007-01-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	Put under version control new files added to a project.
-
-2006-12-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Fixed some marshalling isues when calling svn methods. Should fix
-	  bug #80312.
-
-2006-12-19  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs:
-	  Added null check. Should fix bug #80311.
-
-2006-12-17  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Improved implementation of Move.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Removed debug code.
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Minor fixes.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp,
-	  MonoDevelop.VersionControl/Makefile.am: Added new file.
-	* MonoDevelop.VersionControl/VersionControl.addin.xml: Registered new
-	  file system extension.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs:
-	  Split Move method into MoveFile and MoveDirectory. The same for
-	  Delete. Added some other useful overridable methods.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs:
-	  New file system extension which supports version control systems.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlProjectService.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs:
-	  Track api changes.
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeSet.cs:
-	  Removed unused field.
-
-2006-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlProjectService.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeSet.cs,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl/Checkout.cs:
-	  Save commit comments in a file, so they won't be lost if the status
-	  view is closed.
-
-2006-12-07 Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-
-	* MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Logs.cs:
-	Fixed compile warning.
-
-2006-11-28 Michael Hutchinson <m.j.hutchinson@gmail.com>
-
-	* MonoDevelop.VersionControl.Subversion:
-	* MonoDevelop.VersionControl: Added svn:ignores for the .pidb files.
-
-2006-11-26 Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-	
-	* MonoDevelop.VersionControl.Subversion:
-	* MonoDevelop.VersionControl:
-	Added svn:ignores for Makefile and Makefile.in.
-
-2006-11-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.mdp,
-	  MonoDevelop.VersionControl/MonoDevelop.VersionControl.mdp: Added
-	  missing reference.
-	* MonoDevelop.VersionControl/gtk-gui/generated.cs,
-	  MonoDevelop.VersionControl/gtk-gui/objects.xml: Updated.
-
-2006-11-23  Lluis Sanchez Gual <lluis@novell.com> 
-
-	Split the version control add-in in two add-ins: one that implements
-	the version control core, and one that implements the support for
-	Subversion. The VCS core is now built by default. The subversion add-in
-	is optional.
-
-2006-11-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AddIn/VersionControl.AddIn/VersionControlNodeExtension.cs: Don't show
-	  folder overlays if they are disabled. Cache overlay compositions.
-	* AddIn/gtk-gui/generated.cs, AddIn/gtk-gui/gui.stetic: Updated.
-	* VersionControl/VersionControl.Service.Subversion/SubversionRepository.cs,
-	  VersionControl/VersionControl.Service.Subversion/SubversionVersionControl.cs:
-	  Allow commiting directories that contain versioned files (even if
-	  the directory itself is not versioned).
-	* VersionControl/VersionControl.Service.Subversion/SvnClient.cs: Fix
-	  some memory leaks.
-	* VersionControl/VersionControl.Service/ChangeSet.cs: Added getter for
-	  the repository.
-
-2006-11-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AddIn/VersionControl.AddIn/VersionControlProjectService.cs: Added
-	  missing nullref check.
-
-2006-11-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AddIn/VersionControl.AddIn.Views/Statuses.cs: Properly enable/disable
-	  toolbar buttons.
-	* AddIn/VersionControl.AddIn/RevertCommand.cs: Minor fix in log
-	  message.
-
-2006-11-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AddIn/VersionControl.AddIn/VersionControlProjectService.cs:
-	  Automatically add/remove files from the repository when
-	  added/removed from the project.
-	* AddIn/VersionControl.AddIn/VersionControlNodeExtension.cs: Fix
-	  nullref exception.
-	* AddIn/gtk-gui/generated.cs, AddIn/gtk-gui/gui.stetic: Updated.
-
-2006-11-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AddIn/VersionControl.AddIn.Dialogs/CommitDialog.cs: Hide the commit
-	  dialog before starting the commit operation.
-
-2006-11-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AddIn/VersionControl.AddIn.Dialogs/CommitDialog.cs,
-	  AddIn/VersionControl.AddIn/CommitDialogExtension.cs: Added support
-	  for commit dialog extensions.
-	* AddIn/VersionControl.AddIn.Views/Statuses.cs: Add support for
-	  sorting.
-	* AddIn/VersionControl.addin.xml: Changed add-in id. Added new
-	  extension point.
-	* AddIn/VersionControl.AddIn/VersionControlProjectService.cs,
-	  AddIn/VersionControl.AddIn/CommitEventHandler.cs: Improved commit
-	  events.
-	* AddIn/VersionControl.AddIn/CommitCommand.cs: Moved some of the commit
-	  functionality to the commit dialog, since commit extensions now
-	  participate in the operation.
-	* AddIn/VersionControlAddIn.mdp, AddIn/gtk-gui/generated.cs,
-	  AddIn/gtk-gui/gui.stetic, AddIn/Makefile.am: Updated.
-	* VersionControl/VersionControl.Service/VersionInfo.cs: Added
-	  NeedsCommit property.
-	* VersionControl/VersionControl.Service/ChangeSet.cs: If a file does
-	  not have a comment, don't include it in the generated global
-	  message.
-
-2006-11-15 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AddIn/overlay_unversioned.png, AddIn/overlay_locked.png,
-	  AddIn/overlay_added.png, AddIn/overlay_conflicted.png,
-	  AddIn/overlay_modified.png, AddIn/overlay_normal.png,
-	  AddIn/overlay_controled.png:
-	  Updated icons.
-	* AddIn/VersionControl.AddIn.Dialogs/CommitDialog.cs: Use the new
-	  ChangeSet class.
-	* AddIn/VersionControl.AddIn.Views/Statuses.cs: Update the view when
-	  file status change. Added Revert command. Use the new ChangeSet class.
-	* AddIn/VersionControl.AddIn.Views/Logs.cs: Minor fix.
-	* AddIn/VersionControl.AddIn/VersionControlProjectService.cs: Added
-	  event for notifying changes in file status.
-	* AddIn/VersionControl.AddIn/Task.cs: Added some exception protection.
-	* AddIn/VersionControl.AddIn/VersionControlNodeExtension.cs: Simplified
-	  the code that keeps track of file status changes, but using the new
-	  version control service events. Implemented Revert.
-	* AddIn/VersionControl.AddIn/FileUpdateEventHandler.cs: new handlers
-	  for notifying version control events.
-	* AddIn/gtk-gui/generated.cs, AddIn/gtk-gui/gui.stetic: Updated the gui.
-	* VersionControl/VersionControl.Service/ChangeSet.cs: New class that holds
-	  all needed information for a commit.
-	
-	* VersionControl/VersionControl.Service/UnknownRepository.cs:
-	* VersionControl/VersionControl.Service.Cvs/CvsRepository.cs: Track api
-	  changes.
-	  
-	* VersionControl/VersionControl.Service/Repository.cs:
-	* VersionControl/VersionControl.Service.Subversion/SvnClient.cs:
-	* VersionControl/VersionControl.Service.Subversion/SubversionVersionControl.cs:
-	* VersionControl/VersionControl.Service.Subversion/SubversionRepository.cs:
-	  Implemented Revert. Use the new ChangeSet class. Fixes in several status
-	  check methods.
-	
-	* AddIn/VersionControl.AddIn/Commands.cs:
-	* AddIn/VersionControl.AddIn/RevertCommand.cs:
-	* AddIn/VersionControl.addin.xml: Added Revert command.
-	
-	* AddIn/VersionControl.AddIn/Update.cs:
-	* AddIn/VersionControl.AddIn/CommitCommand.cs:
-	* AddIn/VersionControl.AddIn/AddRemoveMoveCommand.cs: Notify changes
-	  in the status of files.
-	
-	* VersionControl/VersionControl.Service/VersionStatus.cs:
-	* VersionControl/VersionControl.Service/VersionInfo.cs:
-	  Removed Unknown status.
-	
-	* AddIn/Makefile.am:
-	* VersionControl/VersionControl.mdp:
-	* AddIn/VersionControlAddIn.mdp: Updated.
-
-2006-11-07 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AddIn/comment.png: New icon.
-	* AddIn/VersionControl.AddIn.Dialogs/CommitDialog.cs: Added setter for
-	  Message.
-	* AddIn/VersionControl.AddIn.Views/Statuses.cs, AddIn/gtk-gui/generated.cs,
-	  AddIn/gtk-gui/gui.stetic: Added an text view which allows entering
-	  commit comments for every file, with support for multiple selection.
-	* AddIn/VersionControl.addin.xml: Registered new icon.
-	* AddIn/VersionControl.AddIn/CommitCommand.cs: Added parameter for
-	  providing the commit message.
-	* AddIn/VersionControl.AddIn/VersionControlNodeExtension.cs: Dispatch file
-	  change events in the GUI thread.
-	* AddIn/VersionControlAddIn.mdp, AddIn/Makefile.am: Updated
-	* VersionControl/VersionControl.Service/Repository.cs: Minor fix.
-
-
-2006-11-06 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AddIn/VersionControl.AddIn.Dialogs/SelectRepositoryDialog.cs:
-	  Some minor UI fixes.
-	* AddIn/VersionControl.AddIn/Checkout.cs: Added null check.
-	* AddIn/VersionControlAddIn.mdp: Removed unused resource.
-	
-	* AddIn/gtk-gui/gui.stetic:
-	* AddIn/gtk-gui/generated.cs: Regenerated.
-	
-	* VersionControl/VersionControl.Service.Subversion/LibApr.cs: 
-	* VersionControl/VersionControl.Service.Subversion/SvnClient.cs: 
-	  Moved apr pinvokes to the LibApr class, which can now support 
-	  libapr0 and libapr1.
-	  
-	* DiffWidget/DiffWidget.mdp:
-	* VersionControl/Makefile.am:
-	* VersionControl/VersionControl.mdp: Updated.
-
-2006-11-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AddIn/VersionControl.addin.xml: Fix checkout command icon.
-	* AddIn/Makefile.am: Remove unused files.
-
-2006-11-04 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	Big reorganization of the add-in. Implemented support for saving
-	repository configuration. Implemented publish and checkout
-	commands. Made the add-in pluggable, so it can support other
-	repositories. Some of this work was	started	by Thiago Becker and
-	Rafael Giorgetti as part of a Google SoC project.
-
-2006-09-19 Jacob Ilsø Christensen <jacobilsoe@gmail.com>
-
-	* AddIn/VersionControlAddIn.mdp:
-	* VersionControl/VersionControl.mdp:
-	* Diff/Diff.mdp:
-	* VersionControl.mds:
-	* DiffWidget/DiffWidget.mdp:
-	Updated.
-
-2006-08-19 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* AddIn/Addin.cs: Fix the build.
-
-2006-07-28 Wade Berrier <wberrier@novell.com> 
-
-	* AddIn/Addin.cs: Update from refactoring change on IViewContent (svn r62840)
-
-2006-07-03 Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* AddIn/VersionControl.addin.xml: Updated versions.
-
-2006-05-04 Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AddIn/VersionControl.addin.xml: Updated versions.
-	* AddIn/VersionControlAddIn.mdp: Updated.
-	* VersionControl/VersionControl.mdp: Updated.
-	* Diff/Diff.mdp: Updated.
-	* VersionControl/VersionControl.mds: Updated.
-	* DiffWidget/DiffWidget.mdp: Updated.
-
-2006-03-30 Lluis Sanchez Gual <lluis@novell.com> 
-
-	* AddIn/Makefile.am:
-	* AddIn/VersionControl.addin.xml: Updated references.
-
-2006-03-26 Joshua Tauberer  <tauberer@for.net>
-
-	* AddIn/Task.cs, Statuses.cs, Logs.cs: Prevent unhandled
-	  exceptions if a library couldn't be found.
-
-2006-03-24 Lluis Sanchez Gual  <lluis@novell.com>   
-
-	* VersionControl.mds:
-	* DiffWidget/DiffWidget.mdp:
-	* VersionControl/VersionControl.mdp:
-	* Diff/Diff.mdp: Updated.
-	* Makefile.am:
-	* Diff/Makefile.am:
-	* DiffWidget/Makefile.am:
-	* VersionControl/Makefile.am: Use an unified format. 
-	  Patch by Matze Braun.
-	
-	* VersionControl.addin.xml: Updated add-in versions.
-
-2006-03-21  Wade Berrier <wberrier@novell.com> 
-
-	* AddIn/Makefile.am: Fix 'make dist' to include missing png files
-
-2006-03-02  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* AddIn/Addin.cs: Track api changes.
-
-2006-02-24  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* VersionControl/AddIn/AddIn.mdp: Updated project references.
-
-2005-12-04  Joshua Tauberer  <tauberer@for.net>
-
-	* AddIn: Added icons to menus.  The icons again come
-	  from the TortoiseSVN project (with a presumption of
-	  license compatibility).
-
-2005-11-18  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* AddIn/VersionControl.addin.xml: Moved version control commands to
-	its own submenu.
-
-2005-11-15  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* AddIn/Addin.cs: It should also work for Project, not only DotNetProject.
-	* VersionControl/Subversion.cs: Fix build.
-
-2005-10-22  Joshua Tauberer  <tauberer@for.net>
-
-	* Minor VersionControl API changes (use a RepositoryPath
-	  class to represent an abstract path in a repository).
-	* Improved the history/log view and the status/commit view
-	  using the TreeView widget.
-
-2005-10-11  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* AddIn/VersionControl.addin.xml: Fixed addin header information.
-	Use "id" attribuet instead of "name" to identify addins.
-
-2005-10-04  Lluis Sanchez Gual  <lluis@novell.com> 
-
-	* AddIn/VersionControl.addin.xml: Added addin dependencies.
-
-2005-09-20  Josh Tauberer <tauberer@for.net>
-
-	* AddIn/Statuses.cs,Logs.cs: Some widgets needed
-	  to be shown since MD is calling Show() less.
-	* VersionControl/Subversion.cs: Not all entries
-	  returned by svn have a URL, e.g. obstructed entries.
-	  So don't rely on that to get the local path.
-
-2005-09-04  Josh Tauberer <tauberer@for.net>
-
-	* AddIn/Makefile.am: Was broken since last time
-	  it was changed.
-
-2005-08-10  Ben Motmans  <ben.motmans@gmail.com>
-
-	* AddIn/AddIn.mdp
-	* VersionControl/VersionControl.mdp
-	* Diff/Diff.mdp
-	* DiffWidget/DiffWidget.mdp: references update
-
-2005-08-08  John Luke  <john.luke@gmail.com>
-
-	* AddIn/Makefile.am:
-	* Diff/Makefile.am:
-	* DiffWidget/Makefile.am:
-	* VersionControl/Makefile.am: fix distcheck,
-	make it conditional on ENABLE_VERSIONCONTROL,
-	and install it when enabled
-
-2005-07-01  Joshua Tauberer <tauberer@for.net>
-
-	* Added MD solution files for VersionControl.
-	* Project pad overlays now update when files
-	  are modified.
-	* Project pad context menus enabled for
-	  folders and combines.
-	* Subversion: Don't report diffs available
-	  for unchanged files.
-	* This was committed with the addin!
-
-2005-06-22  Joshua Tauberer <tauberer@for.net>
-
-	* Added VersionControl into repo (but sadly the addin
-	  cannot add itself into the repo yet!).
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseGitRepositoryTests.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseGitRepositoryTests.cs
index e1767c556a..e7a6795dab 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseGitRepositoryTests.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseGitRepositoryTests.cs
@@ -121,7 +121,7 @@ namespace MonoDevelop.VersionControl.Git.Tests
 		protected override void PostCommit (Repository repo)
 		{
 			var repo2 = (GitRepository)repo;
-			repo2.Push (new NullProgressMonitor (), repo2.GetCurrentRemote (), repo2.GetCurrentBranch ());
+			repo2.Push (new ProgressMonitor (), repo2.GetCurrentRemote (), repo2.GetCurrentBranch ());
 		}
 
 		protected override void BlameExtraInternals (Annotation [] annotations)
@@ -131,7 +131,7 @@ namespace MonoDevelop.VersionControl.Git.Tests
 				Assert.AreEqual (Author, annotations [i].Author);
 				Assert.AreEqual (String.Format ("<{0}>", Email), annotations [i].Email);
 			}
-			Assert.IsTrue (annotations [2].HasDate);
+			Assert.IsFalse (annotations [2].HasDate);
 		}
 
 		[Test]
@@ -143,10 +143,10 @@ namespace MonoDevelop.VersionControl.Git.Tests
 			AddFile ("file1", "text", true, false);
 			AddFile ("file3", "unstaged", false, false);
 			AddFile ("file4", "noconflict", true, false);
-			repo2.TryCreateStash (new NullProgressMonitor (), "meh", out stash);
+			repo2.TryCreateStash (new ProgressMonitor (), "meh", out stash);
 			Assert.IsTrue (!File.Exists (LocalPath + "file1"), "Stash creation failure");
 			AddFile ("file4", "conflict", true, true);
-			repo2.PopStash (new NullProgressMonitor (), 0);
+			repo2.PopStash (new ProgressMonitor (), 0);
 
 			VersionInfo vi = repo2.GetVersionInfo (LocalPath + "file1", VersionInfoQueryFlags.IgnoreCache);
 			Assert.IsTrue (File.Exists (LocalPath + "file1"), "Stash pop staged failure");
@@ -171,16 +171,16 @@ namespace MonoDevelop.VersionControl.Git.Tests
 			AddFile ("file3", null, false, false);
 
 			int commitCount = repo2.GetHistory (repo2.RootPath, null).Length;
-			repo2.TryCreateStash (new NullProgressMonitor (), "stash1", out stash);
-			repo2.PopStash (new NullProgressMonitor (), 0);
+			repo2.TryCreateStash (new ProgressMonitor (), "stash1", out stash);
+			repo2.PopStash (new ProgressMonitor (), 0);
 			Assert.AreEqual (commitCount, repo2.GetHistory (repo2.RootPath, null).Length, "stash1 added extra commit.");
 
-			repo2.TryCreateStash (new NullProgressMonitor (), "stash2", out stash);
+			repo2.TryCreateStash (new ProgressMonitor (), "stash2", out stash);
 
 			AddFile ("file4", null, true, true);
 			commitCount = repo2.GetHistory (repo2.RootPath, null).Length;
 
-			repo2.PopStash (new NullProgressMonitor (), 0);
+			repo2.PopStash (new ProgressMonitor (), 0);
 			Assert.AreEqual (commitCount, repo2.GetHistory (repo2.RootPath, null).Length, "stash2 added extra commit.");
 		}
 
@@ -196,7 +196,7 @@ namespace MonoDevelop.VersionControl.Git.Tests
 			AddFile ("file1", "text", true, true);
 			repo2.CreateBranch ("branch1", null, null);
 
-			repo2.SwitchToBranch (new NullProgressMonitor (), "branch1");
+			repo2.SwitchToBranch (new ProgressMonitor (), "branch1");
 			// Nothing could be stashed for master. Branch1 should be popped in any case if it exists.
 			Assert.IsFalse (repo2.GetStashes ().Any (s => s.Message == GetStashMessageForBranch ("master")));
 			Assert.IsFalse (repo2.GetStashes ().Any (s => s.Message == GetStashMessageForBranch ("branch1")));
@@ -207,20 +207,20 @@ namespace MonoDevelop.VersionControl.Git.Tests
 			AddFile ("file2", "text", true, false);
 			repo2.CreateBranch ("branch2", null, null);
 
-			repo2.SwitchToBranch (new NullProgressMonitor (), "branch2");
+			repo2.SwitchToBranch (new ProgressMonitor (), "branch2");
 			// Branch1 has a stash created and assert clean workdir. Branch2 should be popped in any case.
 			Assert.IsTrue (repo2.GetStashes ().Any (s => s.Message == GetStashMessageForBranch ("branch1")));
 			Assert.IsFalse (repo2.GetStashes ().Any (s => s.Message == GetStashMessageForBranch ("branch2")));
 			Assert.IsTrue (!File.Exists (LocalPath + "file2"), "Uncommitted changes were not stashed");
 
 			AddFile ("file2", "text", true, false);
-			repo2.SwitchToBranch (new NullProgressMonitor (), "branch1");
+			repo2.SwitchToBranch (new ProgressMonitor (), "branch1");
 			// Branch2 has a stash created. Branch1 should be popped with file2 reinstated.
 			Assert.True (repo2.GetStashes ().Any (s => s.Message == GetStashMessageForBranch ("branch2")));
 			Assert.IsFalse (repo2.GetStashes ().Any (s => s.Message == GetStashMessageForBranch ("branch1")));
 			Assert.IsTrue (File.Exists (LocalPath + "file2"), "Uncommitted changes were not stashed correctly");
 
-			repo2.SwitchToBranch (new NullProgressMonitor (), "master");
+			repo2.SwitchToBranch (new ProgressMonitor (), "master");
 			repo2.RemoveBranch ("branch1");
 			Assert.IsFalse (repo2.GetBranches ().Any (b => b.FriendlyName == "branch1"), "Failed to delete branch");
 
@@ -238,14 +238,14 @@ namespace MonoDevelop.VersionControl.Git.Tests
 			PostCommit (repo2);
 
 			repo2.CreateBranch ("branch3", null, null);
-			repo2.SwitchToBranch (new NullProgressMonitor (), "branch3");
+			repo2.SwitchToBranch (new ProgressMonitor (), "branch3");
 			AddFile ("file2", "asdf", true, true);
-			repo2.Push (new NullProgressMonitor (), "origin", "branch3");
+			repo2.Push (new ProgressMonitor (), "origin", "branch3");
 
-			repo2.SwitchToBranch (new NullProgressMonitor (), "master");
+			repo2.SwitchToBranch (new ProgressMonitor (), "master");
 
 			repo2.CreateBranch ("branch4", "origin/branch3", "refs/remotes/origin/branch3");
-			repo2.SwitchToBranch (new NullProgressMonitor (), "branch4");
+			repo2.SwitchToBranch (new ProgressMonitor (), "branch4");
 			Assert.IsTrue (File.Exists (LocalPath + "file2"), "Tracking remote is not grabbing correct commits");
 		}
 
@@ -287,9 +287,7 @@ namespace MonoDevelop.VersionControl.Git.Tests
 			DiffInfo item = diff [0];
 			Assert.IsNotNull (item);
 			Assert.AreEqual ("file1", item.FileName.FileName);
-			string text = @"diff --git a/file1 b/file1
-new file mode 100644
-index 0000000..f3a3485
+			string text = @"index 0000000..f3a3485
 --- /dev/null
 +++ b/file1
 @@ -0,0 +1 @@
@@ -304,9 +302,7 @@ index 0000000..f3a3485
 			item = diff [1];
 			Assert.IsNotNull (item);
 			Assert.AreEqual ("file2", item.FileName.FileName);
-			text = @"diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..009b64b
+			text = @"index 0000000..009b64b
 --- /dev/null
 +++ b/file2
 @@ -0,0 +1 @@
@@ -329,6 +325,8 @@ index 0000000..009b64b
 			//Assert.IsTrue (repo2.IsUrlValid ("ftp://github.com:80/mono/monodevelop.git"));
 			//Assert.IsTrue (repo2.IsUrlValid ("ftps://github.com:80/mono/monodevelop.git"));
 			Assert.IsTrue (repo2.IsUrlValid ("file:///mono/monodevelop.git"));
+			Assert.IsTrue (repo2.IsUrlValid ("git@172.31.118.100:/home/git/my-app.git"));
+			Assert.IsTrue (repo2.IsUrlValid ("git@172.31.118.100:home/git/my-app.git"));
 			//Assert.IsTrue (repo2.IsUrlValid ("rsync://github.com/mono/monodevelpo.git"));
 		}
 
@@ -342,7 +340,7 @@ index 0000000..009b64b
 			AddFile ("file1", "text", true, true);
 			PostCommit (repo2);
 			repo2.CreateBranch ("branch1", null, null);
-			repo2.SwitchToBranch (new NullProgressMonitor (), "branch1");
+			repo2.SwitchToBranch (new ProgressMonitor (), "branch1");
 			AddFile ("file2", "text", true, true);
 			PostCommit (repo2);
 			Assert.AreEqual (2, repo2.GetBranches ().Count ());
@@ -364,12 +362,12 @@ index 0000000..009b64b
 			Assert.IsTrue (repo2.IsBranchMerged ("master"));
 
 			repo2.CreateBranch ("branch1", null, null);
-			repo2.SwitchToBranch (new NullProgressMonitor (), "branch1");
+			repo2.SwitchToBranch (new ProgressMonitor (), "branch1");
 			AddFile ("file2", "text", true, true);
 
-			repo2.SwitchToBranch (new NullProgressMonitor (), "master");
+			repo2.SwitchToBranch (new ProgressMonitor (), "master");
 			Assert.IsFalse (repo2.IsBranchMerged ("branch1"));
-			repo2.Merge ("branch1", GitUpdateOptions.NormalUpdate, new NullProgressMonitor ());
+			repo2.Merge ("branch1", GitUpdateOptions.NormalUpdate, new ProgressMonitor ());
 			Assert.IsTrue (repo2.IsBranchMerged ("branch1"));
 		}
 
@@ -435,17 +433,17 @@ index 0000000..009b64b
 
 			// Test with VCS Remove.
 			File.WriteAllText ("testfile", "t");
-			Repo.Add (added, false, new NullProgressMonitor ());
-			Repo.DeleteFile (added, false, new NullProgressMonitor (), true);
+			Repo.Add (added, false, new ProgressMonitor ());
+			Repo.DeleteFile (added, false, new ProgressMonitor (), true);
 			Assert.AreEqual (VersionStatus.Versioned | VersionStatus.ScheduledDelete, Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache).Status);
 
 			// Reset state.
-			Repo.Revert (added, false, new NullProgressMonitor ());
+			Repo.Revert (added, false, new ProgressMonitor ());
 
 			// Test with Project Remove.
 			File.WriteAllText ("testfile", "t");
-			Repo.Add (added, false, new NullProgressMonitor ());
-			Repo.DeleteFile (added, false, new NullProgressMonitor (), false);
+			Repo.Add (added, false, new ProgressMonitor ());
+			Repo.DeleteFile (added, false, new ProgressMonitor (), false);
 			Assert.AreEqual (VersionStatus.Versioned | VersionStatus.ScheduledDelete, Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache).Status);
 		}
 
@@ -458,7 +456,7 @@ index 0000000..009b64b
 		{
 			var repo2 = (GitRepository)Repo;
 			AddFile ("init", "init", true, true);
-			repo2.Push (new NullProgressMonitor (), "origin", "master");
+			repo2.Push (new ProgressMonitor (), "origin", "master");
 			repo2.CreateBranch ("testBranch", "origin/master", "refs/remotes/origin/master");
 
 			if (exceptionType != null)
@@ -473,7 +471,7 @@ index 0000000..009b64b
 		{
 			var repo2 = (GitRepository)Repo;
 			AddFile ("init", "init", true, true);
-			repo2.Push (new NullProgressMonitor (), "origin", "master");
+			repo2.Push (new ProgressMonitor (), "origin", "master");
 
 			repo2.SetBranchTrackRef ("testBranch", "origin/master", "refs/remotes/origin/master");
 			Assert.True (repo2.GetBranches ().Any (
@@ -498,7 +496,7 @@ index 0000000..009b64b
 			AddFile ("init", "init", toVcs, commit);
 
 			Assert.AreEqual (string.Empty, Repo.GetBaseText (added));
-			var revisions = Repo.GetAnnotations (added).Select (a => a.Revision);
+			var revisions = Repo.GetAnnotations (added, null).Select (a => a.Revision);
 			foreach (var rev in revisions)
 				Assert.AreEqual (GettextCatalog.GetString ("working copy"), rev);
 		}
@@ -518,11 +516,11 @@ index 0000000..009b64b
 			AddFile ("init3", "init", toVcs: true, commit: true);
 
 			// Create two commits in test.
-			gitRepo.SwitchToBranch (new NullProgressMonitor (), "test");
+			gitRepo.SwitchToBranch (new ProgressMonitor (), "test");
 			AddFile ("init4", "init", toVcs: true, commit: true);
 			AddFile ("init5", "init", toVcs: true, commit: true);
 
-			gitRepo.Rebase ("master", GitUpdateOptions.None, new NullProgressMonitor ());
+			gitRepo.Rebase ("master", GitUpdateOptions.None, new ProgressMonitor ());
 
 			// Commits come in reverse (recent to old).
 			var history = gitRepo.GetHistory (LocalPath, null).Reverse ().ToArray ();
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs
index 46b64db071..fb87ce7cf4 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs
@@ -248,15 +248,15 @@ namespace MonoDevelop.VersionControl.Tests
 			ModifyPath (Repo2, ref second);
 			string added = second + "testfile2";
 			File.Create (added).Close ();
-			Repo2.Add (added, false, new NullProgressMonitor ());
+			Repo2.Add (added, false, new ProgressMonitor ());
 			ChangeSet changes = Repo2.CreateChangeSet (Repo2.RootPath);
 			changes.AddFile (Repo2.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache));
 			changes.GlobalComment = "test2";
-			Repo2.Commit (changes, new NullProgressMonitor ());
+			Repo2.Commit (changes, new ProgressMonitor ());
 
 			PostCommit (Repo2);
 
-			Repo.Update (Repo.RootPath, true, new NullProgressMonitor ());
+			Repo.Update (Repo.RootPath, true, new ProgressMonitor ());
 			Assert.True (File.Exists (LocalPath + "testfile2"));
 
 			Repo2.Dispose ();
@@ -326,7 +326,7 @@ namespace MonoDevelop.VersionControl.Tests
 
 			// Revert to head.
 			File.WriteAllText (added, content);
-			Repo.Revert (added, false, new NullProgressMonitor ());
+			Repo.Revert (added, false, new ProgressMonitor ());
 			Assert.AreEqual (Repo.GetBaseText (added), File.ReadAllText (added));
 		}
 
@@ -343,7 +343,7 @@ namespace MonoDevelop.VersionControl.Tests
 			// Force cache evaluation.
 			Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache);
 
-			Repo.Revert (added, false, new NullProgressMonitor ());
+			Repo.Revert (added, false, new ProgressMonitor ());
 			Assert.AreEqual (VersionStatus.Unversioned, Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache).Status);
 		}
 
@@ -370,7 +370,7 @@ namespace MonoDevelop.VersionControl.Tests
 			string added = LocalPath + "testfile2";
 			AddFile ("testfile", "text", true, true);
 			AddFile ("testfile2", "text2", true, true);
-			Repo.RevertRevision (added, GetHeadRevision (), new NullProgressMonitor ());
+			Repo.RevertRevision (added, GetHeadRevision (), new ProgressMonitor ());
 			Assert.IsFalse (File.Exists (added));
 		}
 
@@ -387,7 +387,7 @@ namespace MonoDevelop.VersionControl.Tests
 			AddFile ("testfile", null, true, true);
 			src = LocalPath + "testfile";
 			dst = src + "2";
-			Repo.MoveFile (src, dst, false, new NullProgressMonitor ());
+			Repo.MoveFile (src, dst, false, new ProgressMonitor ());
 			srcVi = Repo.GetVersionInfo (src, VersionInfoQueryFlags.IgnoreCache);
 			dstVi = Repo.GetVersionInfo (dst, VersionInfoQueryFlags.IgnoreCache);
 			const VersionStatus versionedStatus = VersionStatus.ScheduledDelete | VersionStatus.ScheduledReplace;
@@ -398,7 +398,7 @@ namespace MonoDevelop.VersionControl.Tests
 			AddFile ("addedfile", null, true, false);
 			src = LocalPath + "addedfile";
 			dst = src + "2";
-			Repo.MoveFile (src, dst, false, new NullProgressMonitor ());
+			Repo.MoveFile (src, dst, false, new ProgressMonitor ());
 			srcVi = Repo.GetVersionInfo (src, VersionInfoQueryFlags.IgnoreCache);
 			dstVi = Repo.GetVersionInfo (dst, VersionInfoQueryFlags.IgnoreCache);
 			Assert.AreEqual (VersionStatus.Unversioned, srcVi.Status);
@@ -408,7 +408,7 @@ namespace MonoDevelop.VersionControl.Tests
 			AddFile ("unversionedfile", null, false, false);
 			src = LocalPath + "unversionedfile";
 			dst = src + "2";
-			Repo.MoveFile (src, dst, false, new NullProgressMonitor ());
+			Repo.MoveFile (src, dst, false, new ProgressMonitor ());
 			srcVi = Repo.GetVersionInfo (src, VersionInfoQueryFlags.IgnoreCache);
 			dstVi = Repo.GetVersionInfo (dst, VersionInfoQueryFlags.IgnoreCache);
 			Assert.AreEqual (VersionStatus.Unversioned, srcVi.Status);
@@ -427,7 +427,7 @@ namespace MonoDevelop.VersionControl.Tests
 			AddDirectory ("test", true, false);
 			AddFile (Path.Combine ("test", "testfile"), null, true, true);
 
-			Repo.MoveDirectory (srcDir, dstDir, false, new NullProgressMonitor ());
+			Repo.MoveDirectory (srcDir, dstDir, false, new ProgressMonitor ());
 			VersionInfo srcVi = Repo.GetVersionInfo (src, VersionInfoQueryFlags.IgnoreCache);
 			VersionInfo dstVi = Repo.GetVersionInfo (dst, VersionInfoQueryFlags.IgnoreCache);
 			const VersionStatus expectedStatus = VersionStatus.ScheduledDelete | VersionStatus.ScheduledReplace;
@@ -443,7 +443,7 @@ namespace MonoDevelop.VersionControl.Tests
 			// Versioned file.
 			added = LocalPath.Combine ("testfile1") + postFix;
 			AddFile ("testfile1" + postFix, null, true, true);
-			Repo.DeleteFile (added, true, new NullProgressMonitor (), keepLocal);
+			Repo.DeleteFile (added, true, new ProgressMonitor (), keepLocal);
 			vi = Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache);
 			Assert.AreEqual (VersionStatus.ScheduledDelete, vi.Status & VersionStatus.ScheduledDelete);
 			Assert.AreEqual (keepLocal, File.Exists (added));
@@ -451,7 +451,7 @@ namespace MonoDevelop.VersionControl.Tests
 			// Just added file.
 			added = LocalPath.Combine ("testfile2") + postFix;
 			AddFile ("testfile2" + postFix, null, true, false);
-			Repo.DeleteFile (added, true, new NullProgressMonitor (), keepLocal);
+			Repo.DeleteFile (added, true, new ProgressMonitor (), keepLocal);
 			vi = Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache);
 			Assert.AreEqual (VersionStatus.Unversioned, vi.Status);
 			Assert.AreEqual (keepLocal, File.Exists (added));
@@ -459,7 +459,7 @@ namespace MonoDevelop.VersionControl.Tests
 			// Non versioned file.
 			added = LocalPath.Combine ("testfile3") + postFix;
 			AddFile ("testfile3" + postFix, null, false, false);
-			Repo.DeleteFile (added, true, new NullProgressMonitor (), keepLocal);
+			Repo.DeleteFile (added, true, new ProgressMonitor (), keepLocal);
 			vi = Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache);
 			Assert.AreEqual (VersionStatus.Unversioned, vi.Status);
 			Assert.AreEqual (keepLocal, File.Exists (added));
@@ -486,7 +486,7 @@ namespace MonoDevelop.VersionControl.Tests
 			AddDirectory ("test1" + postFix, true, false);
 			AddFile (Path.Combine ("test1" + postFix, "testfile"), null, true, true);
 
-			Repo.DeleteDirectory (addedDir, true, new NullProgressMonitor (), keepLocal);
+			Repo.DeleteDirectory (addedDir, true, new ProgressMonitor (), keepLocal);
 			vi = Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache);
 			Assert.AreEqual (VersionStatus.ScheduledDelete, vi.Status & VersionStatus.ScheduledDelete);
 			Assert.AreEqual (keepLocal, File.Exists (added));
@@ -497,7 +497,7 @@ namespace MonoDevelop.VersionControl.Tests
 			AddDirectory ("test2" + postFix, true, false);
 			AddFile (Path.Combine ("test2" + postFix, "testfile"), null, true, false);
 
-			Repo.DeleteDirectory (addedDir, true, new NullProgressMonitor (), keepLocal);
+			Repo.DeleteDirectory (addedDir, true, new ProgressMonitor (), keepLocal);
 			vi = Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache);
 			Assert.AreEqual (VersionStatus.Unversioned, vi.Status);
 			Assert.AreEqual (keepLocal, File.Exists (added));
@@ -508,7 +508,7 @@ namespace MonoDevelop.VersionControl.Tests
 			AddDirectory ("test3" + postFix, true, false);
 			AddFile (Path.Combine ("test3" + postFix, "testfile"), null, false, false);
 
-			Repo.DeleteDirectory (addedDir, true, new NullProgressMonitor (), keepLocal);
+			Repo.DeleteDirectory (addedDir, true, new ProgressMonitor (), keepLocal);
 			vi = Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache);
 			Assert.AreEqual (VersionStatus.Unversioned, vi.Status);
 			Assert.AreEqual (keepLocal, File.Exists (added));
@@ -528,7 +528,7 @@ namespace MonoDevelop.VersionControl.Tests
 		{
 			string added = LocalPath + "testfile";
 			AddFile ("testfile", null, true, true);
-			Repo.Lock (new NullProgressMonitor (), added);
+			Repo.Lock (new ProgressMonitor (), added);
 
 			PostLock ();
 		}
@@ -543,8 +543,8 @@ namespace MonoDevelop.VersionControl.Tests
 		{
 			string added = LocalPath + "testfile";
 			AddFile ("testfile", null, true, true);
-			Repo.Lock (new NullProgressMonitor (), "testfile");
-			Repo.Unlock (new NullProgressMonitor (), added);
+			Repo.Lock (new ProgressMonitor (), "testfile");
+			Repo.Unlock (new ProgressMonitor (), added);
 
 			PostLock ();
 		}
@@ -602,7 +602,7 @@ namespace MonoDevelop.VersionControl.Tests
 			// Working copy.
 			File.AppendAllText (added, "wut2" + Environment.NewLine);
 
-			var annotations = Repo.GetAnnotations (added);
+			var annotations = Repo.GetAnnotations (added, null);
 			for (int i = 0; i < 2; i++) {
 				var annotation = annotations [i];
 				Assert.IsTrue (annotation.HasDate);
@@ -614,7 +614,8 @@ namespace MonoDevelop.VersionControl.Tests
 			Assert.False (annotations [2].HasEmail);
 			Assert.IsNotNull (annotations [2].Author);
 			Assert.IsNull (annotations [2].Email);
-			Assert.AreEqual (annotations [2].Revision, GettextCatalog.GetString ("working copy"));
+			Assert.IsNull (annotations [2].Revision);
+			Assert.AreEqual (annotations [2].Text, GettextCatalog.GetString ("working copy"));
 			Assert.AreEqual (annotations [2].Author, "<uncommitted>");
 		}
 
@@ -629,8 +630,8 @@ namespace MonoDevelop.VersionControl.Tests
 			string dirFile = Path.Combine (dir, "testfile");
 			AddFile ("testfile", "test", true, true);
 			AddDirectory ("testdir", true, false);
-			Repo.MoveFile (added, dirFile, true, new NullProgressMonitor ());
-			Repo.MoveFile (dirFile, added, true, new NullProgressMonitor ());
+			Repo.MoveFile (added, dirFile, true, new ProgressMonitor ());
+			Repo.MoveFile (dirFile, added, true, new ProgressMonitor ());
 
 			Assert.AreEqual (VersionStatus.Unversioned, Repo.GetVersionInfo (dirFile, VersionInfoQueryFlags.IgnoreCache).Status);
 			Assert.AreEqual (VersionStatus.Versioned, Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache).Status);
@@ -645,8 +646,8 @@ namespace MonoDevelop.VersionControl.Tests
 			// Force cache update.
 			Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache);
 
-			Repo.DeleteFile (added, true, new NullProgressMonitor (), false);
-			Repo.Revert (added, false, new NullProgressMonitor ());
+			Repo.DeleteFile (added, true, new ProgressMonitor (), false);
+			Repo.Revert (added, false, new ProgressMonitor ());
 
 			Assert.AreEqual (VersionStatus.Versioned, Repo.GetVersionInfo (added, VersionInfoQueryFlags.IgnoreCache).Status);
 		}
@@ -656,7 +657,7 @@ namespace MonoDevelop.VersionControl.Tests
 		{
 			var mockRepo = (UrlBasedRepository)GetRepo ();
 			mockRepo.Url = url;
-			mockRepo.Checkout (path, true, new NullProgressMonitor ());
+			mockRepo.Checkout (path, true, new ProgressMonitor ());
 
 			var _repo = GetRepo (path, url);
 			if (Repo == null)
@@ -672,7 +673,7 @@ namespace MonoDevelop.VersionControl.Tests
 				changes.AddFile (Repo.GetVersionInfo (item, VersionInfoQueryFlags.IgnoreCache));
 			}
 			changes.GlobalComment = String.Format ("Commit #{0}", CommitNumber);
-			Repo.Commit (changes, new NullProgressMonitor ());
+			Repo.Commit (changes, new ProgressMonitor ());
 			CommitNumber++;
 		}
 
@@ -686,7 +687,7 @@ namespace MonoDevelop.VersionControl.Tests
 
 			changes.AddFile (Repo.GetVersionInfo (path, VersionInfoQueryFlags.IgnoreCache));
 			changes.GlobalComment = String.Format ("Commit #{0}", CommitNumber);
-			Repo.Commit (changes, new NullProgressMonitor ());
+			Repo.Commit (changes, new ProgressMonitor ());
 			CommitNumber++;
 		}
 
@@ -709,7 +710,7 @@ namespace MonoDevelop.VersionControl.Tests
 				File.WriteAllText (added, contents);
 
 			if (toVcs)
-				Repo.Add (added, false, new NullProgressMonitor ());
+				Repo.Add (added, false, new ProgressMonitor ());
 
 			if (commit)
 				CommitFile (added);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj
index 1fc7c56620..2d2b01fe3b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj
@@ -19,20 +19,17 @@
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\..\build\tests</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <NoWarn>1591;1573</NoWarn>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\..\build\tests</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <DebugSymbols>true</DebugSymbols>
     <NoWarn>1591;1573</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
@@ -42,7 +39,6 @@
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\..\build\tests</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <NoWarn>1591;1573</NoWarn>
@@ -54,7 +50,6 @@
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\..\build\tests</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <NoWarn>1591;1573</NoWarn>
@@ -66,39 +61,38 @@
     <Optimize>false</Optimize>
     <OutputPath>..\..\..\..\build\tests</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <NoWarn>1591;1573</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\..\build\tests</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <DebugSymbols>true</DebugSymbols>
     <NoWarn>1591;1573</NoWarn>
-    <DebugType>pdbonly</DebugType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\..\build\tests</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <DebugSymbols>true</DebugSymbols>
     <NoWarn>1591;1573</NoWarn>
-    <DebugType>pdbonly</DebugType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\..\build\tests</OutputPath>
     <WarningLevel>4</WarningLevel>
-    <DebugSymbols>true</DebugSymbols>
     <NoWarn>1591;1573</NoWarn>
-    <DebugType>pdbonly</DebugType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/ChangeLog b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/ChangeLog
deleted file mode 100644
index 3556096ce1..0000000000
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/ChangeLog
+++ /dev/null
@@ -1,133 +0,0 @@
-2010-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.VersionControl.Git.csproj:
-	* MonoDevelop.VersionControl.Git/GitRepository.cs:
-	* MonoDevelop.VersionControl.Git/UserInfoConflictDialog.cs:
-	* MonoDevelop.VersionControl.Git/CommitDialogExtensionWidget.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs:
-	  Check conflicts between user information configured in MD
-	  and Git. In case of conflict, allow the user to choose which
-	  information to use.
-
-2010-07-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git/GitRepository.cs: Use
-	  relative paths in the git command invocations. Old git
-	  versions have problems with absolute paths.
-
-2010-07-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git/GitRepository.cs: Don't use
-	  the --porcelain option for the status command, since it is
-	  not available in old git versions.
-
-2010-07-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git/GitRepository.cs: Implement
-	  Blame command.
-
-2010-07-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git/GitRepository.cs: Trim empty
-	  lines from commit messages.
-
-2010-07-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git/GitRepository.cs: Improve
-	  handling of git moves and deletes.
-
-2010-07-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git/GitRepository.cs: Stash local
-	  changes before doing a pull or branch switch.
-
-2010-07-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git.addin.xml: Don't show the
-	  Switch to Branch command if there are no branches.
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.Git.csproj: Updated.
-
-	* MonoDevelop.VersionControl.Git/Commands.cs:
-	* MonoDevelop.VersionControl.Git/GitService.cs: Moved Push
-	  command to the new GitService class.
-
-	* MonoDevelop.VersionControl.Git/CommitDialogExtensionWidget.cs:
-	  Added extension which allows pushing changes after
-	  committing.
-
-2010-07-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.Git.csproj:
-	* MonoDevelop.VersionControl.Git.addin.xml:
-	* MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs:
-	  Show the current branch next to the solution name.
-
-2010-07-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git/GitRepository.cs: Notify file
-	  changes after pulling.
-
-2010-07-28  Dale Ragan  <dale.ragan@sinesignal.com>
-
-	* MonoDevelop.VersionControl.Git.addin.xml: Fixed 
-	  typo and issue with add-in not loading due to bad 
-      extension for adding the Switch to Branch label.
-
-	* MonoDevelop.VersionControl.Git/Commands.cs: Fixed 
-	  a small typo.
-
-2010-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git/GitRepository.cs: Remove
-	  debug output.
-
-	* MonoDevelop.VersionControl.Git/GitVersionControl.cs: Added
-	  missing null check.
-
-2010-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/generated.cs:
-	* MonoDevelop.VersionControl.Git.csproj:
-	* MonoDevelop.VersionControl.Git.addin.xml:
-	* MonoDevelop.VersionControl.Git/Commands.cs:
-	* MonoDevelop.VersionControl.Git/PushDialog.cs:
-	* MonoDevelop.VersionControl.Git/GitRepository.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Git.PushDialog.cs:
-	  Implement push command.
-
-2010-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Git.csproj:
-	* MonoDevelop.VersionControl.Git.addin.xml:
-	* MonoDevelop.VersionControl.Git/GitRepository.cs:
-	* MonoDevelop.VersionControl.Git/GitVersionControl.cs: Add
-	  basic support for git.
-
-2010-06-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Git.csproj: Make MD refs private.
-	  Should fix running on .NET.
-
-2010-06-28  Dale Ragan  <dale.ragan@sinesignal.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.Git.csproj:
-	* AssemblyInfo.cs:
-	* MonoDevelop.VersionControl.Git.addin.xml:
-	* MonoDevelop.VersionControl.Git/GitClient.cs:
-	* MonoDevelop.VersionControl.Git/GitVersionControl.cs:
-	* MonoDevelop.VersionControl.Git/GitRepository.cs:
-	  Official kickoff of the 'Support for Git' task.  This 
-	  is mainly a skeleton and no functionality.  The add-in 
-	  is recognized by MonoDevelop and the Version Control add-in 
-	  sees the new Git Version Control System.  Of course it 
-	  doesn't show up in the drop down, due to the 
-	  NotImplementedException's.
-
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
index 340a6134fe..bbf092f617 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
@@ -52,7 +52,7 @@ namespace MonoDevelop.VersionControl.Git
 	{
 		public GitRepository Repository {
 			get {
-				IWorkspaceObject wob = IdeApp.ProjectOperations.CurrentSelectedSolutionItem;
+				WorkspaceObject wob = IdeApp.ProjectOperations.CurrentSelectedSolutionItem;
 				if (wob == null)
 					wob = IdeApp.ProjectOperations.CurrentSelectedWorkspaceItem;
 				if (wob != null)
@@ -64,7 +64,7 @@ namespace MonoDevelop.VersionControl.Git
 		protected GitRepository UpdateVisibility (CommandInfo info)
 		{
 			var repo = Repository;
-			info.Visible = Repository != null;
+			info.Visible = repo != null;
 			return repo;
 		}
 
@@ -91,9 +91,9 @@ namespace MonoDevelop.VersionControl.Git
 
 	class SwitchToBranchHandler: GitCommandHandler
 	{
-		protected override void Run (object dataItem)
+		protected async override void Run (object dataItem)
 		{
-			GitService.SwitchToBranch (Repository, (string)dataItem);
+			await GitService.SwitchToBranch (Repository, (string)dataItem).ConfigureAwait (false);
 		}
 
 		protected override void Update (CommandArrayInfo info)
@@ -102,7 +102,7 @@ namespace MonoDevelop.VersionControl.Git
 			if (repo == null)
 				return;
 
-			var wob = IdeApp.ProjectOperations.CurrentSelectedItem as IWorkspaceObject;
+			var wob = IdeApp.ProjectOperations.CurrentSelectedItem as WorkspaceObject;
 			if (wob == null)
 				return;
 			if (((wob is WorkspaceItem) && ((WorkspaceItem)wob).ParentWorkspace == null) ||
@@ -163,7 +163,7 @@ namespace MonoDevelop.VersionControl.Git
 									msg = GettextCatalog.GetString ("No changes were available to stash");
 								}
 
-								DispatchService.GuiDispatch (delegate {
+								Runtime.RunInMainThread (delegate {
 									IdeApp.Workbench.StatusBar.ShowMessage (msg);
 								});
 							}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
index aee2f14d98..e8652e774a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
@@ -1,37 +1,38 @@
-//
-// CredentialsDialog.cs
-//
-// Author:
-//       Lluis Sanchez Gual <lluis@novell.com>
-//
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
+//

+// CredentialsDialog.cs

+//

+// Author:

+//       Lluis Sanchez Gual <lluis@novell.com>

+//

+// Copyright (c) 2010 Novell, Inc (http://www.novell.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

 using Gtk;
 using System;
 using LibGit2Sharp;
 using MonoDevelop.Components;
-
+using MonoDevelop.Core;

+

 namespace MonoDevelop.VersionControl.Git
 {
-	partial class CredentialsDialog : Dialog
+	partial class CredentialsDialog : Gtk.Dialog
 	{
 		uint r;
 		public CredentialsDialog (string uri, SupportedCredentialTypes type, Credentials cred)
@@ -40,7 +41,7 @@ namespace MonoDevelop.VersionControl.Git
 
 			this.UseNativeContextMenus ();
 
-			labelTop.Text = string.Format (labelTop.Text, uri);
+			labelTop1.Text = string.Format (labelTop1.Text, uri);
 
 			var table = new Table (0, 0, false);
 			table.ColumnSpacing = 6;
@@ -50,12 +51,12 @@ namespace MonoDevelop.VersionControl.Git
 			switch (type) {
 			case SupportedCredentialTypes.UsernamePassword:
 				upcred = (UsernamePasswordCredentials)cred;
-				firstEditor = CreateEntry (table, "Username:", false);
-				CreateEntry (table, "Password:", true);
+				firstEditor = CreateEntry (table, GettextCatalog.GetString ("Username:"), false);
+				CreateEntry (table, GettextCatalog.GetString ("Password:"), true);
 				break;
 			case SupportedCredentialTypes.Ssh:
 				sshcred = (SshUserKeyCredentials)cred;
-				firstEditor = CreateEntry (table, "Passphrase:", true);
+				firstEditor = CreateEntry (table, GettextCatalog.GetString ("Passphrase:"), true);
 				break;
 			}
 			table.ShowAll ();
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs
index a41d5fc3e6..80fb850069 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs
@@ -35,7 +35,7 @@ using System.ComponentModel;
 
 namespace MonoDevelop.VersionControl.Git
 {
-	partial class EditBranchDialog : Dialog
+	partial class EditBranchDialog : Gtk.Dialog
 	{
 		readonly ListStore comboStore;
 		readonly string currentTracking;
@@ -124,7 +124,7 @@ namespace MonoDevelop.VersionControl.Git
 				labelError.Show ();
 				buttonOk.Sensitive = false;
 			} else if (!Reference.IsValidName ("refs/" + entryName.Text)) {
-				labelError.Markup = "<span color='red'>" + GettextCatalog.GetString (@"A branch name can not:
+				labelError.Markup = "<span color='" + Ide.Gui.Styles.ErrorForegroundColor.ToHexString (false) + "'>" + GettextCatalog.GetString (@"A branch name can not:
 Start with '.' or end with '/' or '.lock'
 Contain a ' ', '..', '~', '^', ':', '\', '?', '['") + "</span>";
 				labelError.Show ();
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
index e058292500..2c0cff0a13 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
@@ -42,8 +42,9 @@ namespace MonoDevelop.VersionControl.Git
 
 		public override bool Initialize (ChangeSet changeSet)
 		{
-			if (changeSet.Repository is GitRepository) {
-				widget = new GitCommitDialogExtensionWidget ();
+			var repo = changeSet.Repository as GitRepository;
+			if (repo != null) {
+				widget = new GitCommitDialogExtensionWidget (repo);
 				Add (widget);
 				widget.Show ();
 				Show ();
@@ -144,11 +145,11 @@ namespace MonoDevelop.VersionControl.Git
 		static string GetDesc (string name, string email)
 		{
 			if (string.IsNullOrEmpty (name) && string.IsNullOrEmpty (email))
-				return "Not configured";
+				return GettextCatalog.GetString ("Not configured");
 			if (string.IsNullOrEmpty (name))
 				name = GettextCatalog.GetString ("Name not configured");
 			if (string.IsNullOrEmpty (email))
-				email = GettextCatalog.GetString ("e-mail not configured");
+				email = GettextCatalog.GetString ("Email not configured");
 			return name + ", " + email;
 		}
 
@@ -162,7 +163,7 @@ namespace MonoDevelop.VersionControl.Git
 		{
 			this.textView = textView;
 			overflowTextTag = new Gtk.TextTag ("overflow");
-			overflowTextTag.Foreground = "red";
+			overflowTextTag.Foreground = Ide.Gui.Styles.ErrorForegroundColor.ToHexString (false);
 			overflowTextTag.ForegroundSet = true;
 			textView.Buffer.TagTable.Add (overflowTextTag);
 			textView.Buffer.Changed += OnTextChanged;
@@ -185,8 +186,8 @@ namespace MonoDevelop.VersionControl.Git
 			var lines = text.Split ('\n');
 			if (lines.Length > 0 && lines [0].Length > maxLengthConventionForFirstLineOfCommitMessage) {
 				if (!textView.HasTooltip) {
-					textView.TooltipText = String.Format (GettextCatalog.GetString (
-						"When using Git, it is not recommended to surpass the character count of {0} in the first line of the commit message"),
+					textView.TooltipText = GettextCatalog.GetString (
+						"When using Git, it is not recommended to surpass the character count of {0} in the first line of the commit message",
 						maxLengthConventionForFirstLineOfCommitMessage);
 					textView.HasTooltip = true;
 				}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtensionWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtensionWidget.cs
index 700a73fbbc..5e4f68a689 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtensionWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtensionWidget.cs
@@ -24,15 +24,22 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using MonoDevelop.Core;
 
 namespace MonoDevelop.VersionControl.Git
 {
 	[System.ComponentModel.ToolboxItem(true)]
 	partial class GitCommitDialogExtensionWidget : Gtk.Bin
 	{
-		public GitCommitDialogExtensionWidget ()
+		public GitCommitDialogExtensionWidget (GitRepository repo)
 		{
 			this.Build ();
+
+			bool hasRemote = repo.GetCurrentRemote () != null;
+			if (!hasRemote) {
+				checkPush.Sensitive = false;
+				checkPush.TooltipText = GettextCatalog.GetString ("Pushing is only available for repositories with configured remotes.");
+			}
 		}
 
 		public bool PushAfterCommit {
@@ -59,8 +66,7 @@ namespace MonoDevelop.VersionControl.Git
 
 		void OnChanged (object sender, EventArgs e)
 		{
-			if (Changed != null)
-				Changed (this, EventArgs.Empty);
+			Changed?.Invoke (this, EventArgs.Empty);
 		}
 
 		public event EventHandler Changed;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
index 2aca50c4b4..031ecde20c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
@@ -35,7 +35,7 @@ using System.ComponentModel;
 
 namespace MonoDevelop.VersionControl.Git
 {
-	partial class GitConfigurationDialog : Dialog
+	partial class GitConfigurationDialog : Gtk.Dialog
 	{
 		readonly GitRepository repo;
 		readonly ListStore storeBranches;
@@ -85,8 +85,8 @@ namespace MonoDevelop.VersionControl.Git
 			SemanticModelAttribute remotesModelAttr = new SemanticModelAttribute ("storeRemotes__Remote", "storeRemotes__Name", "storeRemotes__Url", "storeRemotes__BranchName", "storeRemotes__FullName");
 			TypeDescriptor.AddAttributes (storeRemotes, remotesModelAttr);
 
-			treeRemotes.AppendColumn ("Remote Source / Branch", new CellRendererText (), "markup", 1);
-			treeRemotes.AppendColumn ("Url", new CellRendererText (), "text", 2);
+			treeRemotes.AppendColumn (GettextCatalog.GetString ("Remote Source / Branch"), new CellRendererText (), "markup", 1);
+			treeRemotes.AppendColumn (GettextCatalog.GetString ("Url"), new CellRendererText (), "text", 2);
 
 			treeRemotes.Selection.Changed += delegate {
 				TreeIter it;
@@ -221,14 +221,14 @@ namespace MonoDevelop.VersionControl.Git
 			}
 		}
 
-		protected virtual void OnButtonSetDefaultBranchClicked (object sender, EventArgs e)
+		protected virtual async void OnButtonSetDefaultBranchClicked (object sender, EventArgs e)
 		{
 			TreeIter it;
 			if (!listBranches.Selection.GetSelected (out it))
 				return;
 			var b = (Branch) storeBranches.GetValue (it, 0);
-			GitService.SwitchToBranch (repo, b.FriendlyName);
-			FillBranches ();
+			if (await GitService.SwitchToBranch (repo, b.FriendlyName))
+				FillBranches ();
 		}
 
 		protected virtual void OnButtonAddRemoteClicked (object sender, EventArgs e)
@@ -369,7 +369,7 @@ namespace MonoDevelop.VersionControl.Git
 			if (remoteName == null)
 				return;
 
-			repo.Fetch (VersionControlService.GetProgressMonitor ("Fetching remote..."), remoteName);
+			repo.Fetch (VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Fetching remote...")), remoteName);
 			FillRemotes ();
 		}
 	}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
index f6aaa17013..787d96bc0b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
@@ -91,15 +91,16 @@ namespace MonoDevelop.VersionControl.Git
 			// We always need to run the TryGet* methods as we need the passphraseItem/passwordItem populated even
 			// if the password store contains an invalid password/no password
 			if ((types & SupportedCredentialTypes.UsernamePassword) != 0) {
-				uri = new Uri (url);
-				string username;
-				string password;
-				if (!state.NativePasswordUsed && TryGetUsernamePassword (uri, out username, out password)) {
-					state.NativePasswordUsed = true;
-					return new UsernamePasswordCredentials {
-						Username = username,
-						Password = password
-					};
+				if (Uri.TryCreate (url, UriKind.RelativeOrAbsolute, out uri)) {
+					string username;
+					string password;
+					if (!state.NativePasswordUsed && TryGetUsernamePassword (uri, out username, out password)) {
+						state.NativePasswordUsed = true;
+						return new UsernamePasswordCredentials {
+							Username = username,
+							Password = password
+						};
+					}
 				}
 			}
 
@@ -127,14 +128,12 @@ namespace MonoDevelop.VersionControl.Git
 						state.KeyUsed++;
 					else {
 						SelectFileDialog dlg = null;
-						bool success = false;
-
-						DispatchService.GuiSyncDispatch (() => {
+						bool success = Runtime.RunInMainThread (() => {
 							dlg = new SelectFileDialog (GettextCatalog.GetString ("Select a private SSH key to use."));
 							dlg.ShowHidden = true;
 							dlg.CurrentFolder = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
-							success = dlg.Run ();
-						});
+							return dlg.Run ();
+						}).Result;
 						if (!success || !File.Exists (dlg.SelectedFile + ".pub"))
 							throw new VersionControlException (GettextCatalog.GetString ("Invalid credentials were supplied. Aborting operation."));
 
@@ -146,10 +145,10 @@ namespace MonoDevelop.VersionControl.Git
 						};
 
 						if (KeyHasPassphrase (dlg.SelectedFile)) {
-							DispatchService.GuiSyncDispatch (delegate {
+							result = Runtime.RunInMainThread (delegate {
 								using (var credDlg = new CredentialsDialog (url, types, cred))
-									result = MessageService.ShowCustomDialog (credDlg) == (int)Gtk.ResponseType.Ok;
-							});
+									return MessageService.ShowCustomDialog (credDlg) == (int)Gtk.ResponseType.Ok;
+							}).Result;
 						}
 
 						if (result)
@@ -168,15 +167,15 @@ namespace MonoDevelop.VersionControl.Git
 				return cred;
 			}
 
-			DispatchService.GuiSyncDispatch (delegate {
+			result = Runtime.RunInMainThread (delegate {
 				using (var credDlg = new CredentialsDialog (url, types, cred))
-					result = MessageService.ShowCustomDialog (credDlg) == (int)Gtk.ResponseType.Ok;
-			});
+					return MessageService.ShowCustomDialog (credDlg) == (int)Gtk.ResponseType.Ok;
+			}).Result;
 
 			if (result) {
 				if ((types & SupportedCredentialTypes.UsernamePassword) != 0) {
 					var upcred = (UsernamePasswordCredentials)cred;
-					if (!string.IsNullOrEmpty (upcred.Password)) {
+					if (!string.IsNullOrEmpty (upcred.Password) && uri != null) {
 						PasswordService.AddWebUserNameAndPassword (uri, upcred.Username, upcred.Password);
 					}
 				}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
index 865c94a1ee..2dddbbb23e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
@@ -35,7 +35,7 @@ namespace MonoDevelop.VersionControl.Git
 {
 	sealed class GitNodeBuilderExtension: NodeBuilderExtension
 	{
-		readonly Dictionary<FilePath,IWorkspaceObject> repos = new Dictionary<FilePath, IWorkspaceObject> ();
+		readonly Dictionary<FilePath,WorkspaceObject> repos = new Dictionary<FilePath, WorkspaceObject> ();
 
 		protected override void Initialize ()
 		{
@@ -53,25 +53,29 @@ namespace MonoDevelop.VersionControl.Git
 
 		public override bool CanBuildNode (Type dataType)
 		{
-			return typeof(IWorkspaceObject).IsAssignableFrom (dataType);
+			return typeof(WorkspaceObject).IsAssignableFrom (dataType);
 		}
 
 		public override void BuildNode (ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
 		{
-			var ob = (IWorkspaceObject) dataObject;
+			var ob = (WorkspaceObject) dataObject;
 			var rep = VersionControlService.GetRepository (ob) as GitRepository;
 			if (rep != null) {
-				IWorkspaceObject rob;
+				WorkspaceObject rob;
 				if (repos.TryGetValue (rep.RootPath, out rob)) {
-					if (ob == rob)
-						nodeInfo.Label += " (" + rep.GetCurrentBranch () + ")";
+					if (ob == rob) {
+						string branch = rep.GetCurrentBranch ();
+						if (branch == "(no branch)")
+							branch = rep.RootRepository.ObjectDatabase.ShortenObjectId (rep.RootRepository.Head.Tip);
+						nodeInfo.Label += " (" + branch + ")";
+					}
 				}
 			}
 		}
 
 		public override void OnNodeAdded (object dataObject)
 		{
-			var ob = (IWorkspaceObject) dataObject;
+			var ob = (WorkspaceObject) dataObject;
 			var rep = VersionControlService.GetRepository (ob) as GitRepository;
 			if (rep != null && !repos.ContainsKey (rep.RootPath)) {
 				repos [rep.RootPath] = ob;
@@ -80,9 +84,9 @@ namespace MonoDevelop.VersionControl.Git
 
 		public override void OnNodeRemoved (object dataObject)
 		{
-			var ob = (IWorkspaceObject) dataObject;
+			var ob = (WorkspaceObject) dataObject;
 			var rep = VersionControlService.GetRepository (ob) as GitRepository;
-			IWorkspaceObject rob;
+			WorkspaceObject rob;
 			if (rep != null && repos.TryGetValue (rep.RootPath, out rob)) {
 				if (ob == rob)
 					repos.Remove (rep.RootPath);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
index 5a09a60d17..640a44142c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
@@ -23,6 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.VersionControl.Git
@@ -31,7 +32,7 @@ namespace MonoDevelop.VersionControl.Git
 	{
 		GitOptionsPanelWidget widget;
 
-		public override Gtk.Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			return widget = new GitOptionsPanelWidget ();
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanelWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanelWidget.cs
index fb2c8d024a..6dfc4554f5 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanelWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanelWidget.cs
@@ -39,9 +39,9 @@ namespace MonoDevelop.VersionControl.Git
 
 		public void ApplyChanges ()
 		{
-			GitService.UseRebaseOptionWhenPulling = checkRebase.Active;
-			GitService.StashUnstashWhenUpdating = checkStashUpdate.Active;
-			GitService.StashUnstashWhenSwitchingBranches = checkStashBranch.Active;
+			GitService.UseRebaseOptionWhenPulling.Value = checkRebase.Active;
+			GitService.StashUnstashWhenUpdating.Value = checkStashUpdate.Active;
+			GitService.StashUnstashWhenSwitchingBranches.Value = checkStashBranch.Active;
 		}
 	}
 }
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
index a91ff501a2..01e1c89b1d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Core;
 using System.Collections.Generic;
 using System.Text;
 using MonoDevelop.Ide;
+using ProgressMonitor = MonoDevelop.Core.ProgressMonitor;
 using LibGit2Sharp;
 
 namespace MonoDevelop.VersionControl.Git
@@ -61,13 +62,15 @@ namespace MonoDevelop.VersionControl.Git
 
 		public GitRepository (VersionControlSystem vcs, FilePath path, string url) : base (vcs)
 		{
-			RootPath = path;
 			RootRepository = new LibGit2Sharp.Repository (path);
+			RootPath = RootRepository.Info.WorkingDirectory;
 			Url = url;
 		}
 
+		internal bool Disposed { get; private set; }
 		public override void Dispose ()
 		{
+			Disposed = true;
 			base.Dispose ();
 
 			if (VersionControlSystem != null)
@@ -164,10 +167,10 @@ namespace MonoDevelop.VersionControl.Git
 
 		const int progressThrottle = 200;
 		static System.Diagnostics.Stopwatch throttleWatch = new System.Diagnostics.Stopwatch ();
-		static bool OnTransferProgress (TransferProgress tp, IProgressMonitor monitor, ref int progress)
+		static bool OnTransferProgress (TransferProgress tp, ProgressMonitor monitor, ref int progress)
 		{
 			if (progress == 0 && tp.ReceivedObjects == 0) {
-				monitor.BeginTask ("Receiving and indexing objects", 2 * tp.TotalObjects);
+				monitor.BeginTask (GettextCatalog.GetString ("Receiving and indexing objects"), 2 * tp.TotalObjects);
 				throttleWatch.Restart ();
 			}
 
@@ -184,13 +187,13 @@ namespace MonoDevelop.VersionControl.Git
 				throttleWatch.Stop ();
 			}
 
-			return !monitor.IsCancelRequested;
+			return !monitor.CancellationToken.IsCancellationRequested;
 		}
 
-		static void OnCheckoutProgress (int completedSteps, int totalSteps, IProgressMonitor monitor, ref int progress)
+		static void OnCheckoutProgress (int completedSteps, int totalSteps, ProgressMonitor monitor, ref int progress)
 		{
 			if (progress == 0 && completedSteps == 0) {
-				monitor.BeginTask ("Checking out files", totalSteps);
+				monitor.BeginTask (GettextCatalog.GetString ("Checking out files"), totalSteps);
 				throttleWatch.Restart ();
 			}
 
@@ -219,10 +222,10 @@ namespace MonoDevelop.VersionControl.Git
 			}
 		}
 
-		public StashApplyStatus ApplyStash (IProgressMonitor monitor, int stashIndex)
+		public StashApplyStatus ApplyStash (ProgressMonitor monitor, int stashIndex)
 		{
 			if (monitor != null)
-				monitor.BeginTask ("Applying stash", 1);
+				monitor.BeginTask (GettextCatalog.GetString ("Applying stash"), 1);
 
 			int progress = 0;
 			StashApplyStatus res = RootRepository.Stashes.Apply (stashIndex, new StashApplyOptions {
@@ -240,10 +243,10 @@ namespace MonoDevelop.VersionControl.Git
 			return res;
 		}
 
-		public StashApplyStatus PopStash (IProgressMonitor monitor, int stashIndex)
+		public StashApplyStatus PopStash (ProgressMonitor monitor, int stashIndex)
 		{
 			if (monitor != null)
-				monitor.BeginTask ("Applying stash", 1);
+				monitor.BeginTask (GettextCatalog.GetString ("Popping stash"), 1);
 
 			var stash = RootRepository.Stashes [stashIndex];
 			int progress = 0;
@@ -261,7 +264,7 @@ namespace MonoDevelop.VersionControl.Git
 			return res;
 		}
 
-		public bool TryCreateStash (IProgressMonitor monitor, string message, out Stash stash)
+		public bool TryCreateStash (ProgressMonitor monitor, string message, out Stash stash)
 		{
 			Signature sig = GetSignature ();
 			stash = null;
@@ -269,7 +272,7 @@ namespace MonoDevelop.VersionControl.Git
 				return false;
 
 			if (monitor != null)
-				monitor.BeginTask ("Stashing changes", 1);
+				monitor.BeginTask (GettextCatalog.GetString ("Stashing changes"), 1);
 
 			stash = RootRepository.Stashes.Add (sig, message, StashModifiers.Default | StashModifiers.IncludeUntracked);
 
@@ -323,8 +326,6 @@ namespace MonoDevelop.VersionControl.Git
 
 		protected override Revision[] OnGetHistory (FilePath localFile, Revision since)
 		{
-			var revs = new List<Revision> ();
-
 			var repository = GetRepository (localFile);
 			var hc = GetHeadCommit (repository);
 			if (hc == null)
@@ -334,22 +335,37 @@ namespace MonoDevelop.VersionControl.Git
 			IEnumerable<Commit> commits = repository.Commits;
 			if (localFile.CanonicalPath != RootPath.CanonicalPath.ResolveLinks ()) {
 				var localPath = repository.ToGitPath (localFile);
-				commits = commits.Where (c => c.Parents.Count () == 1 && c.Tree [localPath] != null &&
-					(c.Parents.FirstOrDefault ().Tree [localPath] == null ||
-					c.Tree [localPath].Target.Id != c.Parents.FirstOrDefault ().Tree [localPath].Target.Id));
+				commits = commits.Where (c => {
+					int count = c.Parents.Count ();
+					if (count > 1)
+						return false;
+
+					var localTreeEntry = c.Tree [localPath];
+					if (localTreeEntry == null)
+						return false;
+
+					if (count == 0)
+						return true;
+
+					var parentTreeEntry = c.Parents.Single ().Tree [localPath];
+					return parentTreeEntry == null || localTreeEntry.Target.Id != parentTreeEntry.Target.Id;

+				});
 			}
 
-			foreach (var commit in commits.TakeWhile (c => c != sinceRev)) {
+			return commits.TakeWhile (c => c != sinceRev).Select (commit => {
 				var author = commit.Author;
+				var shortMessage = commit.MessageShort;
+				if (shortMessage.Length > 50) {
+					shortMessage = shortMessage.Substring (0, 50) + "…";
+				}
+
 				var rev = new GitRevision (this, repository, commit, author.When.LocalDateTime, author.Name, commit.Message) {
 					Email = author.Email,
-					ShortMessage = commit.MessageShort,
+					ShortMessage = shortMessage,
 					FileForChanges = localFile,
 				};
-				revs.Add (rev);
-			}
-
-			return revs.ToArray ();
+				return rev;
+			}).ToArray ();
 		}
 
 		protected override RevisionPath[] OnGetRevisionChanges (Revision revision)
@@ -369,7 +385,7 @@ namespace MonoDevelop.VersionControl.Git
 			foreach (var entry in changes.Deleted)
 				paths.Add (new RevisionPath (rev.GitRepository.FromGitPath (entry.OldPath), RevisionAction.Delete, null));
 			foreach (var entry in changes.Renamed)
-				paths.Add (new RevisionPath (rev.GitRepository.FromGitPath (entry.Path), RevisionAction.Replace, null));
+				paths.Add (new RevisionPath (rev.GitRepository.FromGitPath (entry.Path), rev.GitRepository.FromGitPath (entry.OldPath), RevisionAction.Replace, null));
 			foreach (var entry in changes.Modified)
 				paths.Add (new RevisionPath (rev.GitRepository.FromGitPath (entry.Path), RevisionAction.Modify, null));
 			foreach (var entry in changes.TypeChanged)
@@ -554,7 +570,7 @@ namespace MonoDevelop.VersionControl.Git
 				.Select (f => new FilePath (f)));
 		}
 
-		protected override Repository OnPublish (string serverPath, FilePath localPath, FilePath[] files, string message, IProgressMonitor monitor)
+		protected override Repository OnPublish (string serverPath, FilePath localPath, FilePath[] files, string message, ProgressMonitor monitor)
 		{
 			// Initialize the repository
 			RootRepository = new LibGit2Sharp.Repository (LibGit2Sharp.Repository.Init (localPath));
@@ -588,10 +604,10 @@ namespace MonoDevelop.VersionControl.Git
 			return this;
 		}
 
-		protected override void OnUpdate (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		protected override void OnUpdate (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)
 		{
 			// TODO: Make it work differently for submodules.
-			monitor.BeginTask (GettextCatalog.GetString ("Updating"), 5);
+			monitor.BeginTask (GettextCatalog.GetString (GettextCatalog.GetString ("Updating")), 5);
 
 			if (RootRepository.Head.IsTracking) {
 				Fetch (monitor, RootRepository.Head.Remote.Name);
@@ -608,7 +624,7 @@ namespace MonoDevelop.VersionControl.Git
 			monitor.EndTask ();
 		}
 
-		static void RetryUntilSuccess (IProgressMonitor monitor, Action<GitCredentialsType> func)
+		static void RetryUntilSuccess (ProgressMonitor monitor, Action<GitCredentialsType> func)
 		{
 			bool retry;
 			using (var tfsSession = new TfsSmartSession ()) {
@@ -641,9 +657,9 @@ namespace MonoDevelop.VersionControl.Git
 						string message;
 						// TODO: Remove me once https://github.com/libgit2/libgit2/pull/3137 goes in.
 						if (string.Equals (e.Message, "early EOF", StringComparison.OrdinalIgnoreCase))
-							message = "Unable to authorize credentials for the repository.";
+							message = GettextCatalog.GetString ("Unable to authorize credentials for the repository.");
 						else if (string.Equals (e.Message, "Received unexpected content-type", StringComparison.OrdinalIgnoreCase))
-							message = "Not a valid git repository.";
+							message = GettextCatalog.GetString ("Not a valid git repository.");
 						else
 							message = e.Message;
 
@@ -655,7 +671,7 @@ namespace MonoDevelop.VersionControl.Git
 			}
 		}
 
-		public void Fetch (IProgressMonitor monitor, string remote)
+		public void Fetch (ProgressMonitor monitor, string remote)
 		{
 			monitor.Log.WriteLine (GettextCatalog.GetString ("Fetching from '{0}'", remote));
 			int progress = 0;
@@ -666,7 +682,7 @@ namespace MonoDevelop.VersionControl.Git
 			monitor.Step (1);
 		}
 
-		bool CommonPreMergeRebase (GitUpdateOptions options, IProgressMonitor monitor, out int stashIndex)
+		bool CommonPreMergeRebase (GitUpdateOptions options, ProgressMonitor monitor, out int stashIndex)
 		{
 			stashIndex = -1;
 			monitor.Step (1);
@@ -683,7 +699,7 @@ namespace MonoDevelop.VersionControl.Git
 						    GettextCatalog.GetString ("You have uncommitted changes"),
 						    GettextCatalog.GetString ("What do you want to do?"),
 						    AlertButton.Cancel,
-						    new AlertButton ("Stash")) == AlertButton.Cancel)
+						    new AlertButton (GettextCatalog.GetString ("Stash"))) == AlertButton.Cancel)
 						return false;
 
 					options |= GitUpdateOptions.SaveLocalChanges;
@@ -702,7 +718,7 @@ namespace MonoDevelop.VersionControl.Git
 			return true;
 		}
 
-		bool ConflictResolver(IProgressMonitor monitor, Commit resetToIfFail, string message)
+		bool ConflictResolver(ProgressMonitor monitor, Commit resetToIfFail, string message)
 		{
 			foreach (var conflictFile in RootRepository.Index.Conflicts) {
 				ConflictResult res = ResolveConflict (RootRepository.FromGitPath (conflictFile.Ancestor.Path));
@@ -714,6 +730,9 @@ namespace MonoDevelop.VersionControl.Git
 					Revert (RootRepository.FromGitPath (conflictFile.Ancestor.Path), false, monitor);
 					break;
 				}
+				if (res == Git.ConflictResult.Continue) {
+					Add (RootRepository.FromGitPath (conflictFile.Ancestor.Path), false, monitor);
+				}
 			}
 			if (!string.IsNullOrEmpty (message)) {
 				var sig = GetSignature ();
@@ -722,7 +741,7 @@ namespace MonoDevelop.VersionControl.Git
 			return true;
 		}
 
-		void CommonPostMergeRebase(int stashIndex, GitUpdateOptions options, IProgressMonitor monitor, Commit oldHead)
+		void CommonPostMergeRebase(int stashIndex, GitUpdateOptions options, ProgressMonitor monitor, Commit oldHead)
 		{
 			if ((options & GitUpdateOptions.SaveLocalChanges) == GitUpdateOptions.SaveLocalChanges) {
 				monitor.Step (1);
@@ -743,7 +762,7 @@ namespace MonoDevelop.VersionControl.Git
 			monitor.EndTask ();
 		}
 
-		public void Rebase (string branch, GitUpdateOptions options, IProgressMonitor monitor)
+		public void Rebase (string branch, GitUpdateOptions options, ProgressMonitor monitor)
 		{
 			int stashIndex = -1;
 			var oldHead = RootRepository.Head.Tip;
@@ -766,7 +785,7 @@ namespace MonoDevelop.VersionControl.Git
 				int count = toApply.Length;
 				int i = 1;
 				foreach (var com in toApply) {
-					monitor.Log.WriteLine ("Cherry-picking {0} - {1}/{2}", com.Id, i, count);
+					monitor.Log.WriteLine (GettextCatalog.GetString ("Cherry-picking {0} - {1}/{2}", com.Id, i, count));
 					CherryPickResult cherryRes = RootRepository.CherryPick (com, com.Author, new CherryPickOptions {
 						CheckoutNotifyFlags = refreshFlags,
 						OnCheckoutNotify = RefreshFile,
@@ -780,7 +799,7 @@ namespace MonoDevelop.VersionControl.Git
 			}
 		}
 
-		public void Merge (string branch, GitUpdateOptions options, IProgressMonitor monitor)
+		public void Merge (string branch, GitUpdateOptions options, ProgressMonitor monitor, FastForwardStrategy strategy = FastForwardStrategy.Default)
 		{
 			int stashIndex = -1;
 			var oldHead = RootRepository.Head.Tip;
@@ -809,7 +828,7 @@ namespace MonoDevelop.VersionControl.Git
 		static ConflictResult ResolveConflict (string file)
 		{
 			ConflictResult res = ConflictResult.Abort;
-			DispatchService.GuiSyncDispatch (delegate {
+			Runtime.RunInMainThread (delegate {
 				var dlg = new ConflictResolutionDialog ();
 				try {
 					dlg.Load (file);
@@ -831,11 +850,11 @@ namespace MonoDevelop.VersionControl.Git
 					dlg.Destroy ();
 					dlg.Dispose ();
 				}
-			});
+			}).Wait ();
 			return res;
 		}
 
-		protected override void OnCommit (ChangeSet changeSet, IProgressMonitor monitor)
+		protected override void OnCommit (ChangeSet changeSet, ProgressMonitor monitor)
 		{
 			string message = changeSet.GlobalComment;
 			if (string.IsNullOrEmpty (message))
@@ -878,7 +897,7 @@ namespace MonoDevelop.VersionControl.Git
 			} catch {
 				string dlgName = null, dlgEmail = null;
 
-				DispatchService.GuiSyncDispatch (() => {
+				Runtime.RunInMainThread (() => {
 					var dlg = new UserGitConfigDialog ();
 					try {
 						if ((Gtk.ResponseType)MessageService.RunCustomDialog (dlg) == Gtk.ResponseType.Ok) {
@@ -890,7 +909,7 @@ namespace MonoDevelop.VersionControl.Git
 						dlg.Destroy ();
 						dlg.Dispose ();
 					}
-				});
+				}).Wait ();
 
 				name = dlgName;
 				email = dlgEmail;
@@ -903,7 +922,7 @@ namespace MonoDevelop.VersionControl.Git
 			RootRepository.Config.Set ("user.email", email);
 		}
 
-		protected override void OnCheckout (FilePath targetLocalPath, Revision rev, bool recurse, IProgressMonitor monitor)
+		protected override void OnCheckout (FilePath targetLocalPath, Revision rev, bool recurse, ProgressMonitor monitor)
 		{
 			int transferProgress = 0;
 			int checkoutProgress = 0;
@@ -917,14 +936,14 @@ namespace MonoDevelop.VersionControl.Git
 				});
 			});
 
-			if (monitor.IsCancelRequested || RootPath.IsNull)
+			if (monitor.CancellationToken.IsCancellationRequested || RootPath.IsNull)
 				return;
 			
 			RootPath = RootPath.ParentDirectory;
 			RootRepository = new LibGit2Sharp.Repository (RootPath);
 		}
 
-		protected override void OnRevert (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		protected override void OnRevert (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)
 		{
 			foreach (var group in GroupByRepository (localPaths)) {
 				var repository = group.Key;
@@ -980,17 +999,17 @@ namespace MonoDevelop.VersionControl.Git
 			}
 		}
 
-		protected override void OnRevertRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
+		protected override void OnRevertRevision (FilePath localPath, Revision revision, ProgressMonitor monitor)
 		{
 			throw new NotSupportedException ();
 		}
 
-		protected override void OnRevertToRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
+		protected override void OnRevertToRevision (FilePath localPath, Revision revision, ProgressMonitor monitor)
 		{
 			throw new NotSupportedException ();
 		}
 
-		protected override void OnAdd (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		protected override void OnAdd (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)
 		{
 			foreach (var group in GroupByRepository (localPaths)) {
 				var repository = group.Key;
@@ -1000,7 +1019,7 @@ namespace MonoDevelop.VersionControl.Git
 			}
 		}
 
-		protected override void OnDeleteFiles (FilePath[] localPaths, bool force, IProgressMonitor monitor, bool keepLocal)
+		protected override void OnDeleteFiles (FilePath[] localPaths, bool force, ProgressMonitor monitor, bool keepLocal)
 		{
 			DeleteCore (localPaths, keepLocal);
 
@@ -1020,7 +1039,7 @@ namespace MonoDevelop.VersionControl.Git
 			}
 		}
 
-		protected override void OnDeleteDirectories (FilePath[] localPaths, bool force, IProgressMonitor monitor, bool keepLocal)
+		protected override void OnDeleteDirectories (FilePath[] localPaths, bool force, ProgressMonitor monitor, bool keepLocal)
 		{
 			DeleteCore (localPaths, keepLocal);
 
@@ -1116,7 +1135,7 @@ namespace MonoDevelop.VersionControl.Git
 			return remotes.Contains ("origin") ? "origin" : remotes [0];
 		}
 
-		public void Push (IProgressMonitor monitor, string remote, string remoteBranch)
+		public void Push (ProgressMonitor monitor, string remote, string remoteBranch)
 		{
 			bool success = true;
 
@@ -1264,13 +1283,13 @@ namespace MonoDevelop.VersionControl.Git
 			return RootRepository.Head.FriendlyName;
 		}
 
-		public void SwitchToBranch (IProgressMonitor monitor, string branch)
+		public bool SwitchToBranch (ProgressMonitor monitor, string branch)
 		{
 			Signature sig = GetSignature ();
 			Stash stash;
 			int stashIndex = -1;
 			if (sig == null)
-				return;
+				return false;
 
 			monitor.BeginTask (GettextCatalog.GetString ("Switching to branch {0}", branch), GitService.StashUnstashWhenSwitchingBranches ? 4 : 2);
 
@@ -1285,7 +1304,7 @@ namespace MonoDevelop.VersionControl.Git
 					RootRepository.Stashes.Remove (stashIndex);
 
 				if (!TryCreateStash (monitor, GetStashName (currentBranch), out stash))
-					return;
+					return false;
 				
 				monitor.Step (1);
 			}
@@ -1309,13 +1328,13 @@ namespace MonoDevelop.VersionControl.Git
 			// Notify file changes
 			NotifyFileChanges (monitor, statusList);
 
-			if (BranchSelectionChanged != null)
-				BranchSelectionChanged (this, EventArgs.Empty);
+			BranchSelectionChanged?.Invoke (this, EventArgs.Empty);
 
 			monitor.EndTask ();
+			return true;
 		}
 
-		void NotifyFileChanges (IProgressMonitor monitor, TreeChanges statusList)
+		void NotifyFileChanges (ProgressMonitor monitor, TreeChanges statusList)
 		{
 			// Files added to source branch not present to target branch.
 			var removed = statusList.Where (c => c.Status == ChangeKind.Added).Select (c => GetRepository (c.Path).FromGitPath (c.Path)).ToList ();
@@ -1401,12 +1420,15 @@ namespace MonoDevelop.VersionControl.Git
 					path = change.Path;
 					break;
 				}
-				diffs.Add (new DiffInfo (RootPath, RootRepository.FromGitPath (path), patch[path].Patch));
+

+				// Trim the header by taking out the first 2 lines.
+				int diffStart = patch[path].Patch.IndexOf ('\n', patch [path].Patch.IndexOf ('\n') + 1);
+				diffs.Add (new DiffInfo (RootPath, RootRepository.FromGitPath (path), patch[path].Patch.Substring (diffStart + 1)));
 			}
 			return diffs.ToArray ();
 		}
 
-		protected override void OnMoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
+		protected override void OnMoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, ProgressMonitor monitor)
 		{
 			var srcRepo = GetRepository (localSrcPath);
 			var dstRepo = GetRepository (localDestPath);
@@ -1431,11 +1453,11 @@ namespace MonoDevelop.VersionControl.Git
 			}
 		}
 
-		protected override void OnMoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
+		protected override void OnMoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, ProgressMonitor monitor)
 		{
 			VersionInfo[] versionedFiles = GetDirectoryVersionInfo (localSrcPath, false, true);
 			base.OnMoveDirectory (localSrcPath, localDestPath, force, monitor);
-			monitor.BeginTask ("Moving files", versionedFiles.Length);
+			monitor.BeginTask (GettextCatalog.GetString ("Moving files"), versionedFiles.Length);
 			foreach (VersionInfo vif in versionedFiles) {
 				if (vif.IsDirectory)
 					continue;
@@ -1446,28 +1468,41 @@ namespace MonoDevelop.VersionControl.Git
 			monitor.EndTask ();
 		}
 
-		public override Annotation[] GetAnnotations (FilePath repositoryPath)
+		public override Annotation [] GetAnnotations (FilePath repositoryPath, Revision since)
 		{
 			var repository = GetRepository (repositoryPath);
 			Commit hc = GetHeadCommit (repository);
+			Commit sinceCommit = since != null ? ((GitRevision)since).Commit : null;
 			if (hc == null)
 				return new Annotation [0];
 
-			int lines = File.ReadAllLines (repositoryPath).Length;
-			var list = new List<Annotation> (lines);
-			var working = new Annotation (GettextCatalog.GetString ("working copy"), "<uncommitted>", DateTime.Now);
-			for (int i = 0; i < lines; ++i)
-				list.Add (working);
+			var list = new List<Annotation> ();
+
+			var baseDocument = Mono.TextEditor.TextDocument.CreateImmutableDocument (GetBaseText (repositoryPath));
+			var workingDocument = Mono.TextEditor.TextDocument.CreateImmutableDocument (File.ReadAllText (repositoryPath));
 
 			repositoryPath = repository.ToGitPath (repositoryPath);
 			var status = repository.RetrieveStatus (repositoryPath);
 			if (status != FileStatus.NewInIndex && status != FileStatus.NewInWorkdir) {
-				foreach (var hunk in repository.Blame (repositoryPath, new BlameOptions { FindExactRenames = true, })) {
+				foreach (var hunk in repository.Blame (repositoryPath, new BlameOptions { FindExactRenames = true, StartingAt = sinceCommit })) {
 					var commit = hunk.FinalCommit;
 					var author = hunk.FinalSignature;
-					working = new Annotation (commit.Sha, author.Name, author.When.LocalDateTime, String.Format ("<{0}>", author.Email));
+					var working = new Annotation (new GitRevision (this, repository, commit), author.Name, author.When.LocalDateTime, String.Format ("<{0}>", author.Email));
 					for (int i = 0; i < hunk.LineCount; ++i)
-						list [hunk.FinalStartLineNumber + i] = working;
+						list.Add (working);
+				}
+			}
+
+			if (sinceCommit == null) {
+				Annotation nextRev = new Annotation (null, GettextCatalog.GetString ("<uncommitted>"), DateTime.MinValue, null, GettextCatalog.GetString ("working copy"));
+				foreach (var hunk in baseDocument.Diff (workingDocument, includeEol: false)) {
+					list.RemoveRange (hunk.RemoveStart - 1, hunk.Removed);
+					for (int i = 0; i < hunk.Inserted; ++i) {
+						if (hunk.InsertStart + i >= list.Count)
+							list.Add (nextRev);
+						else
+							list.Insert (hunk.InsertStart - 1, nextRev);
+					}
 				}
 			}
 
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
index 977e69704c..3947f48909 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
@@ -26,7 +26,9 @@
 using System;

 using MonoDevelop.Core;

 using System.Text;

-using LibGit2Sharp;
+using LibGit2Sharp;

+using System.Threading;
+using System.Threading.Tasks;

 

 namespace MonoDevelop.VersionControl.Git

 {

@@ -48,6 +50,7 @@ namespace MonoDevelop.VersionControl.Git
 		readonly Xwt.ListViewColumn shaColumn;

 		readonly Xwt.DataField<Revision> revisionField;

 		readonly Xwt.DialogButton buttonOk;

+		CancellationTokenSource cts = new CancellationTokenSource ();

 

 		public GitSelectRevisionDialog (GitRepository repo)

 		{

@@ -102,19 +105,30 @@ namespace MonoDevelop.VersionControl.Git
 			};

 			revisionList.Columns.Add (shaColumn);

 

-			var history = repo.GetHistory (repo.RootPath, null);

-			var min = Math.Min (history.Length, 150);

-			for (int i = 0; i < min; ++i) {

-				var rev = history [i];

-

-				// Convert to foreach and use i = AddRow ();

-				revisionStore.AddRow ();

-				revisionStore.SetValue (i, messageField, rev.ShortMessage);

-				revisionStore.SetValue (i, dateField, ParseDate (rev.Time));

-				revisionStore.SetValue (i, authorField, rev.Author);

-				revisionStore.SetValue (i, shaField, ((GitRevision)rev).ShortName);

-				revisionStore.SetValue (i, revisionField, rev);

-			}

+			Task.Factory.StartNew (async () => {

+				const int sliceSize = 150;

+

+				var history = repo.GetHistory (repo.RootPath, null);

+

+				int slices = history.Length / sliceSize;

+				for (int i = 0; i < slices; ++i) {

+					await Runtime.RunInMainThread (() => {

+						for (int n = 0; n < sliceSize; ++n) {

+							if (cts.IsCancellationRequested)

+								return;

+

+							int row = revisionStore.AddRow ();

+							var rev = history [row];

+

+							revisionStore.SetValue (row, messageField, rev.ShortMessage);

+							revisionStore.SetValue (row, dateField, ParseDate (rev.Time));

+							revisionStore.SetValue (row, authorField, rev.Author);

+							revisionStore.SetValue (row, shaField, ((GitRevision)rev).ShortName);

+							revisionStore.SetValue (row, revisionField, rev);

+						}

+					});

+				}

+			}, cts.Token);

 

 			revisionList.SelectionChanged += delegate {

 				CheckSensitive ();

@@ -131,6 +145,16 @@ namespace MonoDevelop.VersionControl.Git
 			Buttons.Add (new Xwt.DialogButton (Xwt.Command.Cancel));

 		}

 

+		protected override void Dispose (bool disposing)

+		{

+			if (cts != null) {

+				cts.Cancel ();

+				cts.Dispose ();

+				cts = null;

+			}

+			base.Dispose (disposing);

+		}

+

 		void CheckSensitive ()

 		{

 			if (!String.IsNullOrWhiteSpace (tagNameEntry.Text) && Reference.IsValidName ("refs/tags/" + tagNameEntry.Text) &&
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs
index 786d2acdf5..b36b67eb2a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs
@@ -29,29 +29,16 @@ using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.ProgressMonitoring;
 using System.Threading;
+using System.Threading.Tasks;
 using LibGit2Sharp;
 
 namespace MonoDevelop.VersionControl.Git
 {
 	public static class GitService
 	{
-		public static bool UseRebaseOptionWhenPulling
-		{
-			get { return PropertyService.Get ("MonoDevelop.VersionControl.Git.UseRebaseOptionWhenPulling", true); }
-			set { PropertyService.Set ("MonoDevelop.VersionControl.Git.UseRebaseOptionWhenPulling", value); }
-		}
-
-		public static bool StashUnstashWhenUpdating
-		{
-			get { return PropertyService.Get ("MonoDevelop.VersionControl.Git.StashUnstashWhenUpdating", true); }
-			set { PropertyService.Set ("MonoDevelop.VersionControl.Git.StashUnstashWhenUpdating", value); }
-		}
-
-		public static bool StashUnstashWhenSwitchingBranches
-		{
-			get { return PropertyService.Get ("MonoDevelop.VersionControl.Git.StashUnstashWhenSwitchingBranches", true); }
-			set { PropertyService.Set ("MonoDevelop.VersionControl.Git.StashUnstashWhenSwitchingBranches", value); }
-		}
+		public static ConfigurationProperty<bool> UseRebaseOptionWhenPulling = ConfigurationProperty.Create ("MonoDevelop.VersionControl.Git.UseRebaseOptionWhenPulling", true);
+		public static ConfigurationProperty<bool> StashUnstashWhenUpdating = ConfigurationProperty.Create ("MonoDevelop.VersionControl.Git.StashUnstashWhenUpdating", true);
+		public static ConfigurationProperty<bool> StashUnstashWhenSwitchingBranches = ConfigurationProperty.Create ("MonoDevelop.VersionControl.Git.StashUnstashWhenSwitchingBranches", true);
 
 		public static void Push (GitRepository repo)
 		{
@@ -63,7 +50,7 @@ namespace MonoDevelop.VersionControl.Git
 				string remote = dlg.SelectedRemote;
 				string branch = dlg.SelectedRemoteBranch ?? repo.GetCurrentBranch ();
 
-				IProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Pushing changes..."), VersionControlOperationType.Push);
+				ProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Pushing changes..."), VersionControlOperationType.Push);
 				ThreadPool.QueueUserWorkItem (delegate {
 					try {
 						repo.Push (monitor, remote, branch);
@@ -92,16 +79,16 @@ namespace MonoDevelop.VersionControl.Git
 				if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
 					dlg.Hide ();
 					if (rebasing) {
-						using (IProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Rebasing branch '{0}'...", dlg.SelectedBranch))) {
+						using (ProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Rebasing branch '{0}'...", dlg.SelectedBranch))) {
 							if (dlg.IsRemote)
 								repo.Fetch (monitor, dlg.RemoteName);
 							repo.Rebase (dlg.SelectedBranch, dlg.StageChanges ? GitUpdateOptions.SaveLocalChanges : GitUpdateOptions.None, monitor);
 						}
 					} else {
-						using (IProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Merging branch '{0}'...", dlg.SelectedBranch))) {
+						using (ProgressMonitor monitor = VersionControlService.GetProgressMonitor (GettextCatalog.GetString ("Merging branch '{0}'...", dlg.SelectedBranch))) {
 							if (dlg.IsRemote)
 								repo.Fetch (monitor, dlg.RemoteName);
-							repo.Merge (dlg.SelectedBranch, dlg.StageChanges ? GitUpdateOptions.SaveLocalChanges : GitUpdateOptions.None, monitor);
+							repo.Merge (dlg.SelectedBranch, dlg.StageChanges ? GitUpdateOptions.SaveLocalChanges : GitUpdateOptions.None, monitor, FastForwardStrategy.NoFastForward);
 						}
 					}
 				}
@@ -117,58 +104,62 @@ namespace MonoDevelop.VersionControl.Git
 				MessageService.ShowCustomDialog (dlg);
 		}
 
-		public static void SwitchToBranch (GitRepository repo, string branch)
+		public async static Task<bool> SwitchToBranch (GitRepository repo, string branch)
 		{
 			var monitor = new MessageDialogProgressMonitor (true, false, false, true);
 			try {
 				IdeApp.Workbench.AutoReloadDocuments = true;
 				IdeApp.Workbench.LockGui ();
-				ThreadPool.QueueUserWorkItem (delegate {
+				var t = await Task.Run (delegate {
 					try {
-						repo.SwitchToBranch (monitor, branch);
+						return repo.SwitchToBranch (monitor, branch);
 					} catch (Exception ex) {
-						monitor.ReportError ("Branch switch failed", ex);
+						monitor.ReportError (GettextCatalog.GetString ("Branch switch failed"), ex);
+						return false;
 					} finally {
 						monitor.Dispose ();
 					}
 				});
-				monitor.AsyncOperation.WaitForCompleted ();
+				return t;
 			} finally {
 				IdeApp.Workbench.AutoReloadDocuments = false;
 				IdeApp.Workbench.UnlockGui ();
 			}
 		}
 
-		public static IAsyncOperation ApplyStash (GitRepository repo, int s)
+		public static Task<bool> ApplyStash (GitRepository repo, int s)
 		{
 			var monitor = new MessageDialogProgressMonitor (true, false, false, true);
 			var statusTracker = IdeApp.Workspace.GetFileStatusTracker ();
-			ThreadPool.QueueUserWorkItem (delegate {
+			var t = Task.Run (delegate {
 				try {
-					ReportStashResult (repo.ApplyStash (monitor, s));
+					var res = repo.ApplyStash (monitor, s);
+					ReportStashResult (res);
+					return true;
 				} catch (Exception ex) {
 					string msg = GettextCatalog.GetString ("Stash operation failed.");
 					monitor.ReportError (msg, ex);
+					return false;
 				}
 				finally {
 					monitor.Dispose ();
 					statusTracker.Dispose ();
 				}
 			});
-			return monitor.AsyncOperation;
+			return t;
 		}
 
 		public static void ReportStashResult (StashApplyStatus status)
 		{
 			if (status == StashApplyStatus.Conflicts) {
 				string msg = GettextCatalog.GetString ("Stash applied with conflicts");
-				DispatchService.GuiDispatch (delegate {
+				Runtime.RunInMainThread (delegate {
 					IdeApp.Workbench.StatusBar.ShowWarning (msg);
 				});
 			}
 			else {
 				string msg = GettextCatalog.GetString ("Stash successfully applied");
-				DispatchService.GuiDispatch (delegate {
+				Runtime.RunInMainThread (delegate {
 					IdeApp.Workbench.StatusBar.ShowMessage (msg);
 				});
 			}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
index 44776dafe0..443eb6b62c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
@@ -27,6 +27,7 @@ using System.IO;
 using System.Collections.Generic;
 using MonoDevelop.Core;
 using System;
+using ProgressMonitor = MonoDevelop.Core.ProgressMonitor;
 using LibGit2Sharp;
 
 namespace MonoDevelop.VersionControl.Git
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitVersionControl.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitVersionControl.cs
index 96bc74e8fc..d8ab20a384 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitVersionControl.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitVersionControl.cs
@@ -1,32 +1,33 @@
-//
-// GitVersionControl.cs
-//
-// Author:
-//       Dale Ragan <dale.ragan@sinesignal.com>
-//
-// Copyright (c) 2010 SineSignal, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
+//

+// GitVersionControl.cs

+//

+// Author:

+//       Dale Ragan <dale.ragan@sinesignal.com>

+//

+// Copyright (c) 2010 SineSignal, LLC

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

 using MonoDevelop.Core;
 using System.Collections.Generic;
-
+using System.IO;

+

 namespace MonoDevelop.VersionControl.Git
 {
 	abstract class GitVersionControl : VersionControlSystem
@@ -46,8 +47,10 @@ namespace MonoDevelop.VersionControl.Git
 		public override Repository GetRepositoryReference (FilePath path, string id)
 		{
 			GitRepository repo;
-			if (!repositories.TryGetValue (path.CanonicalPath, out repo))
-				repositories [path.CanonicalPath] = repo = new GitRepository (this, path, null);
+			if (!repositories.TryGetValue (path.CanonicalPath, out repo) || repo.Disposed) {
+				repo = new GitRepository (this, path, null);
+				repositories [repo.RootPath.CanonicalPath] = repo;
+			}
 			return repo;
 		}
 
@@ -63,7 +66,13 @@ namespace MonoDevelop.VersionControl.Git
 
 		protected override FilePath OnGetRepositoryPath (FilePath path, string id)
 		{
-			return LibGit2Sharp.Repository.Discover (path.ResolveLinks ());
+			string repo = LibGit2Sharp.Repository.Discover (path.ResolveLinks ());
+			if (!string.IsNullOrEmpty (repo)) {
+				repo = repo.TrimEnd ('\\', '/');
+				if (repo.EndsWith (".git", System.StringComparison.OrdinalIgnoreCase))
+					repo = Path.GetDirectoryName (repo);
+			}
+			return repo;
 		}
 
 		internal void UnregisterRepo (GitRepository repo)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs
index 98c2115e7a..57d82ff2d6 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs
@@ -33,7 +33,7 @@ using LibGit2Sharp;
 
 namespace MonoDevelop.VersionControl.Git
 {
-	partial class MergeDialog : Dialog
+	partial class MergeDialog : Gtk.Dialog
 	{
 		readonly TreeStore store;
 		readonly GitRepository repo;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/ProjectTemplateHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/ProjectTemplateHandler.cs
index 7ae80056c7..f180732d1f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/ProjectTemplateHandler.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/ProjectTemplateHandler.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.

 

 using System.IO;

+using LibGit2Sharp;

 using MonoDevelop.Ide.Projects;

 using MonoDevelop.Ide.Templates;

 using MonoDevelop.Core;

@@ -56,13 +57,13 @@ namespace MonoDevelop.VersionControl.Git
 		FilePath GetSourceGitIgnoreFilePath ()

 		{

 			string directory = Path.GetDirectoryName (typeof(ProjectTemplateHandler).Assembly.Location);

-			return new FilePath (directory).Combine ("GitIgnore.txt");

+			return FilePath.Build (directory, "GitIgnore.txt");

 		}

 

 		void CreateGitRepository (FilePath solutionPath)

 		{

 			using (var repo = GitUtil.Init (solutionPath, null))

-				repo.Stage ("*", new LibGit2Sharp.StageOptions ());

+				repo.Stage ("*");

 		}

 	}

 }

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
index 510a6ecbff..40830f57e2 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
@@ -28,10 +28,11 @@ using MonoDevelop.Core;
 using MonoDevelop.Components;
 using MonoDevelop.Ide;
 using LibGit2Sharp;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.VersionControl.Git
 {
-	partial class StashManagerDialog : Dialog
+	partial class StashManagerDialog : Gtk.Dialog
 	{
 		readonly GitRepository repository;
 		readonly ListStore store;
@@ -103,26 +104,24 @@ namespace MonoDevelop.VersionControl.Git
 			return (Stash) store.GetValue (it, 0);
 		}
 
-		void ApplyStashAndRemove(int s)
+		async Task ApplyStashAndRemove(int s)
 		{
 			using (IdeApp.Workspace.GetFileStatusTracker ()) {
-				GitService.ApplyStash (repository, s).Completed += delegate(IAsyncOperation op) {
-					if (op.Success)
-						stashes.Remove (s);
-				};
+				if (await GitService.ApplyStash (repository, s))
+					stashes.Remove (s);
 			}
 		}
 
-		protected void OnButtonApplyClicked (object sender, System.EventArgs e)
+		protected async void OnButtonApplyClicked (object sender, System.EventArgs e)
 		{
 			int s = GetSelectedIndex ();
 			if (s != -1) {
-				GitService.ApplyStash (repository, s);
+				await GitService.ApplyStash (repository, s);
 				Respond (ResponseType.Ok);
 			}
 		}
 
-		protected void OnButtonBranchClicked (object sender, System.EventArgs e)
+		protected async void OnButtonBranchClicked (object sender, System.EventArgs e)
 		{
 			Stash s = GetSelected ();
 			int stashIndex = GetSelectedIndex ();
@@ -131,8 +130,8 @@ namespace MonoDevelop.VersionControl.Git
 				try {
 					if (MessageService.RunCustomDialog (dlg) == (int) ResponseType.Ok) {
 						repository.CreateBranchFromCommit (dlg.BranchName, s.Base);
-						GitService.SwitchToBranch (repository, dlg.BranchName);
-						ApplyStashAndRemove (stashIndex);
+						if (await GitService.SwitchToBranch (repository, dlg.BranchName))
+							await ApplyStashAndRemove (stashIndex);
 					}
 				} finally {
 					dlg.Destroy ();
@@ -152,11 +151,11 @@ namespace MonoDevelop.VersionControl.Git
 			}
 		}
 
-		protected void OnButtonApplyRemoveClicked (object sender, System.EventArgs e)
+		protected async void OnButtonApplyRemoveClicked (object sender, System.EventArgs e)
 		{
 			int s = GetSelectedIndex ();
 			if (s != -1) {
-				ApplyStashAndRemove (s);
+				await ApplyStashAndRemove (s);
 				Respond (ResponseType.Ok);
 			}
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/TfsSmartSubtransport.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/TfsSmartSubtransport.cs
index a9b1485780..d95cae284f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/TfsSmartSubtransport.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/TfsSmartSubtransport.cs
@@ -90,6 +90,10 @@ namespace MonoDevelop.VersionControl.Git
 				httpClient = new HttpClient (new HttpClientHandler { Credentials = new System.Net.NetworkCredential (cred.Username, cred.Password) }) {

 					Timeout = TimeSpan.FromMinutes (1.0),

 				};

+				res = httpClient.GetAsync (serviceUri).Result;

+				if (res.StatusCode == System.Net.HttpStatusCode.OK) {

+					GitCredentials.StoreCredentials (GitCredentialsType.Tfs);

+				}

 			}

 

 			return new TfsSmartSubtransportStream(this) {

@@ -134,12 +138,18 @@ namespace MonoDevelop.VersionControl.Git
 				return result.EnsureSuccessStatusCode().Content.ReadAsStreamAsync().Result;

 			}

 

+			bool stuck;

 			public override int Read(Stream dataStream, long length, out long bytesRead)

 			{

 				bytesRead = 0L;

 				var buffer = new byte[64 * 1024];

 				int count;

 

+				if (responseStream.Value.Length <= 0) {

+					if (stuck)

+						throw new Exception ("Stuck while trying to read TFS response");

+					stuck = true;

+				}

 				while (length > 0 && (count = responseStream.Value.Read(buffer, 0, (int)Math.Min(buffer.Length, length))) > 0) {

 					dataStream.Write(buffer, 0, count);

 					bytesRead += (long)count;

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.CredentialsDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.CredentialsDialog.cs
index b250286a69..eb1cad0268 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.CredentialsDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.CredentialsDialog.cs
@@ -8,6 +8,8 @@ namespace MonoDevelop.VersionControl.Git
 
 		private global::Gtk.Label labelTop;
 
+		private global::Gtk.Label labelTop1;
+
 		private global::Gtk.Button buttonCancel;
 		
 		private global::Gtk.Button buttonOk;
@@ -38,15 +40,28 @@ namespace MonoDevelop.VersionControl.Git
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
-			w1.Add (this.vbox);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox]));
-			w3.Position = 0;
+			// Container child vbox.Gtk.Box+BoxChild
+			this.labelTop1 = new global::Gtk.Label();
+			this.labelTop1.Name = "labelTop1";
+			this.labelTop1.Xalign = 0F;
+			this.labelTop1.LabelProp = global::Mono.Unix.Catalog.GetString("<b>{0}</b>");
+			this.labelTop1.UseMarkup = true;
+			this.vbox.Add(this.labelTop1);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox[this.labelTop1]));
+			w3.Position = 1;
+			w3.Expand = false;
+			w3.Fill = false;
+			w1.Add(this.vbox);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1[this.vbox]));
+			w4.Position = 0;
+			w4.Expand = false;
+			w4.Fill = false;
 			// Internal child MonoDevelop.VersionControl.Git.CredentialsDialog.ActionArea
-			global::Gtk.HButtonBox w4 = this.ActionArea;
-			w4.Name = "dialog1_ActionArea";
-			w4.Spacing = 10;
-			w4.BorderWidth = ((uint)(5));
-			w4.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			global::Gtk.HButtonBox w5 = this.ActionArea;
+			w5.Name = "dialog1_ActionArea";
+			w5.Spacing = 10;
+			w5.BorderWidth = ((uint)(5));
+			w5.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonCancel = new global::Gtk.Button ();
 			this.buttonCancel.CanDefault = true;
@@ -55,10 +70,10 @@ namespace MonoDevelop.VersionControl.Git
 			this.buttonCancel.UseStock = true;
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
-			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w5 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w4 [this.buttonCancel]));
-			w5.Expand = false;
-			w5.Fill = false;
+			this.AddActionWidget(this.buttonCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w6 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5[this.buttonCancel]));
+			w6.Expand = false;
+			w6.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonOk = new global::Gtk.Button ();
 			this.buttonOk.CanDefault = true;
@@ -67,13 +82,14 @@ namespace MonoDevelop.VersionControl.Git
 			this.buttonOk.UseStock = true;
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
-			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w6 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w4 [this.buttonOk]));
-			w6.Position = 1;
-			w6.Expand = false;
-			w6.Fill = false;
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
+			this.AddActionWidget(this.buttonOk, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w7 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5[this.buttonOk]));
+			w7.Position = 1;
+			w7.Expand = false;
+			w7.Fill = false;
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
 			}
 			this.DefaultWidth = 500;
 			this.DefaultHeight = 132;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/generated.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/generated.cs
index 3285e87c05..453751b36a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/generated.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/generated.cs
@@ -6,9 +6,10 @@ namespace Stetic
 	{
 		private static bool initialized;
 
-		internal static void Initialize (Gtk.Widget iconRenderer)
+		internal static void Initialize(Gtk.Widget iconRenderer)
 		{
-			if ((Stetic.Gui.initialized == false)) {
+			if ((Stetic.Gui.initialized == false))
+			{
 				Stetic.Gui.initialized = true;
 			}
 		}
@@ -17,50 +18,55 @@ namespace Stetic
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
-		
+
 		private Gtk.UIManager uimanager;
 
-		public static BinContainer Attach (Gtk.Bin bin)
+		public static BinContainer Attach(Gtk.Bin bin)
 		{
-			BinContainer bc = new BinContainer ();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
-			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
-			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
+			BinContainer bc = new BinContainer();
+			bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
+			bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
+			bin.Added += new Gtk.AddedHandler(bc.OnAdded);
 			return bc;
 		}
 
-		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
+		private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
 		{
-			if ((this.child != null)) {
-				args.Requisition = this.child.SizeRequest ();
+			if ((this.child != null))
+			{
+				args.Requisition = this.child.SizeRequest();
 			}
 		}
 
-		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
+		private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
 		{
-			if ((this.child != null)) {
+			if ((this.child != null))
+			{
 				this.child.Allocation = args.Allocation;
 			}
 		}
 
-		private void OnAdded (object sender, Gtk.AddedArgs args)
+		private void OnAdded(object sender, Gtk.AddedArgs args)
 		{
 			this.child = args.Widget;
 		}
 
-		public void SetUiManager (Gtk.UIManager uim)
+		public void SetUiManager(Gtk.UIManager uim)
 		{
 			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
+			this.child.Realized += new System.EventHandler(this.OnRealized);
 		}
 
-		private void OnRealized (object sender, System.EventArgs args)
+		private void OnRealized(object sender, System.EventArgs args)
 		{
-			if ((this.uimanager != null)) {
+			if ((this.uimanager != null))
+			{
 				Gtk.Widget w;
 				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
-					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
+				if (((w != null)
+							&& typeof(Gtk.Window).IsInstanceOfType(w)))
+				{
+					((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
 					this.uimanager = null;
 				}
 			}
@@ -69,12 +75,12 @@ namespace Stetic
 
 	internal class ActionGroups
 	{
-		public static Gtk.ActionGroup GetActionGroup (System.Type type)
+		public static Gtk.ActionGroup GetActionGroup(System.Type type)
 		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
+			return Stetic.ActionGroups.GetActionGroup(type.FullName);
 		}
 
-		public static Gtk.ActionGroup GetActionGroup (string name)
+		public static Gtk.ActionGroup GetActionGroup(string name)
 		{
 			return null;
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic
index 7822214958..68cebdc794 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic
@@ -1425,7 +1425,7 @@
               <widget class="Gtk.Label" id="labelTop">
                 <property name="MemberName" />
                 <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">Credentials required for the repository: {0}</property>
+                <property name="LabelProp" translatable="yes">Credentials required for the repository:</property>
               </widget>
               <packing>
                 <property name="Position">0</property>
@@ -1435,12 +1435,25 @@
               </packing>
             </child>
             <child>
-              <placeholder />
+              <widget class="Gtk.Label" id="labelTop1">
+                <property name="MemberName" />
+                <property name="Xalign">0</property>
+                <property name="LabelProp" translatable="yes">&lt;b&gt;{0}&lt;/b&gt;</property>
+                <property name="UseMarkup">True</property>
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
             </child>
           </widget>
           <packing>
             <property name="Position">0</property>
             <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
       </widget>
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
index 5cb10c30d1..45e98677d8 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
@@ -136,7 +136,12 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 
 		public override string Version {
 			get {
-				return GetVersion ();
+				try {
+					return GetVersion ();
+				} catch (Exception e) {
+					LoggingService.LogError ("Failed to query Subversion version info", e);
+					return base.Version;
+				}
 			}
 		}
 
@@ -195,6 +200,9 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 
 		public override string GetDirectoryDotSvn (FilePath path)
 		{
+			if (path.IsNullOrEmpty)
+				return string.Empty;
+
 			if (Pre_1_7)
 				return base.GetDirectoryDotSvn (path);
 
@@ -250,7 +258,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 		readonly IntPtr pool;
 		readonly IntPtr ctx;
 
-		IProgressMonitor updatemonitor;
+		ProgressMonitor updatemonitor;
 		ArrayList updateFileList;
 		string commitmessage;
 
@@ -398,7 +406,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			IntPtr localpool = newpool (IntPtr.Zero);
 			var error = new LibSvnClient.svn_error_t {
 				apr_err = LibApr.APR_OS_START_USEERR,
-				message = "Operation cancelled.",
+				message = GettextCatalog.GetString ("Operation cancelled."),
 				pool = localpool,
 			};
 
@@ -662,7 +670,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 
 			Annotation[] annotations = new Annotation [numAnnotations];
-			AnnotationCollector collector = new AnnotationCollector (annotations);
+			AnnotationCollector collector = new AnnotationCollector (annotations, repo);
 
 			IntPtr localpool = IntPtr.Zero;
 			try {
@@ -725,7 +733,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void Update (FilePath path, bool recurse, IProgressMonitor monitor)
+		public override void Update (FilePath path, bool recurse, ProgressMonitor monitor)
 		{
 			if (path == FilePath.Null || monitor == null)
 				throw new ArgumentNullException();
@@ -750,7 +758,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void Revert (FilePath[] paths, bool recurse, IProgressMonitor monitor)
+		public override void Revert (FilePath[] paths, bool recurse, ProgressMonitor monitor)
 		{
 			if (paths == null || monitor == null)
 				throw new ArgumentNullException();
@@ -765,7 +773,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void Add (FilePath path, bool recurse, IProgressMonitor monitor)
+		public override void Add (FilePath path, bool recurse, ProgressMonitor monitor)
 		{
 			if (path == FilePath.Null || monitor == null)
 				throw new ArgumentNullException ();
@@ -781,7 +789,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void Checkout (string url, FilePath path, Revision revision, bool recurse, IProgressMonitor monitor)
+		public override void Checkout (string url, FilePath path, Revision revision, bool recurse, ProgressMonitor monitor)
 		{
 			if (url == null || monitor == null)
 				throw new ArgumentNullException ();
@@ -809,7 +817,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void Commit (FilePath[] paths, string message, IProgressMonitor monitor)
+		public override void Commit (FilePath[] paths, string message, ProgressMonitor monitor)
 		{
 			if (paths == null || message == null || monitor == null)
 				throw new ArgumentNullException();
@@ -835,7 +843,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void Mkdir (string[] paths, string message, IProgressMonitor monitor) 
+		public override void Mkdir (string[] paths, string message, ProgressMonitor monitor) 
 		{
 			if (paths == null || monitor == null)
 				throw new ArgumentNullException ();
@@ -856,7 +864,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void Delete (FilePath path, bool force, IProgressMonitor monitor)
+		public override void Delete (FilePath path, bool force, ProgressMonitor monitor)
 		{
 			if (path == FilePath.Null || monitor == null)
 				throw new ArgumentNullException ();
@@ -874,7 +882,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void Move (FilePath srcPath, FilePath destPath, SvnRevision rev, bool force, IProgressMonitor monitor)
+		public override void Move (FilePath srcPath, FilePath destPath, SvnRevision rev, bool force, ProgressMonitor monitor)
 		{
 			if (srcPath == FilePath.Null || destPath == FilePath.Null || monitor == null)
 				throw new ArgumentNullException ();
@@ -895,7 +903,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void Lock (IProgressMonitor monitor, string comment, bool stealLock, params FilePath[] paths)
+		public override void Lock (ProgressMonitor monitor, string comment, bool stealLock, params FilePath[] paths)
 		{
 			nb = new notify_baton ();
 			IntPtr localpool = IntPtr.Zero;
@@ -914,7 +922,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}
 		
-		public override void Unlock (IProgressMonitor monitor, bool breakLock, params FilePath[] paths)
+		public override void Unlock (ProgressMonitor monitor, bool breakLock, params FilePath[] paths)
 		{
 			nb = new notify_baton ();
 			IntPtr localpool = IntPtr.Zero;
@@ -926,7 +934,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			
 				CheckError (svn.client_unlock (array, breakLock, ctx, localpool));
 				if (paths.Length != lockFileList.Count)
-					throw new SubversionException ("Lock operation failed.");
+					throw new SubversionException ("Unlock operation failed.");
 			} finally {
 				lockFileList = null;
 				TryEndOperation (localpool);
@@ -986,12 +994,12 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 		}

 

-		public override void RevertToRevision (FilePath path, Revision revision, IProgressMonitor monitor)
+		public override void RevertToRevision (FilePath path, Revision revision, ProgressMonitor monitor)
 		{
 			Merge (path, LibSvnClient.Rev.Head, (LibSvnClient.Rev) revision);
 		}

 

-		public override void RevertRevision (FilePath path, Revision revision, IProgressMonitor monitor)
+		public override void RevertRevision (FilePath path, Revision revision, ProgressMonitor monitor)
 		{
 			SvnRevision srev = (SvnRevision) revision;
 			Merge (path, (LibSvnClient.Rev) srev, LibSvnClient.Rev.Number (srev.Rev - 1));
@@ -1136,7 +1144,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			return IntPtr.Zero;
 		}
 
-		IntPtr TryStartOperation (IProgressMonitor monitor)
+		IntPtr TryStartOperation (ProgressMonitor monitor)
 		{
 			Monitor.Enter (svn);
 			updatemonitor = monitor;
@@ -1161,7 +1169,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			if (ent.RemoteTextStatus != LibSvnClient.svn_wc_status_kind.EMPTY) {
 				rs = ConvertStatus (LibSvnClient.NodeSchedule.Normal, ent.RemoteTextStatus);
 				rr = new SvnRevision (repo, ent.LastCommitRevision, ent.LastCommitDate,
-				                      ent.LastCommitAuthor, "(unavailable)", null);
+				                      ent.LastCommitAuthor, GettextCatalog.GetString ("(unavailable)"), null);
 			}
 
 			VersionStatus status = ConvertStatus (ent.Schedule, ent.TextStatus);
@@ -1219,13 +1227,13 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 
 		IntPtr svn_cancel_func_t_impl (IntPtr baton)
 		{
-			if (updatemonitor == null || !updatemonitor.IsCancelRequested)
+			if (updatemonitor == null || !updatemonitor.CancellationToken.IsCancellationRequested)
 				return IntPtr.Zero;
 
 			IntPtr localpool = newpool (IntPtr.Zero);
 			var err = new LibSvnClient.svn_error_t {
 				apr_err = 200015,
-				message = "The operation was interrupted",
+				message = GettextCatalog.GetString ("The operation was interrupted"),
 				pool = localpool
 			};
 
@@ -1283,7 +1291,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			progressData.LogTimer.Interval = 1000;
 			progressData.LogTimer.Elapsed += delegate {
 				progressData.Seconds += 1;
-				updatemonitor.Log.WriteLine ("Transferred {0} in {1} seconds.", BytesToSize (progressData.KBytes), progressData.Seconds);
+				updatemonitor.Log.WriteLine (GettextCatalog.GetString ("Transferred {0} in {1} seconds.", BytesToSize (progressData.KBytes), progressData.Seconds));
 			};
 			progressData.LogTimer.Start ();
 		}
@@ -1446,7 +1454,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 //				actiondesc = string.Format (GettextCatalog.GetString ("Path '{0}' is no longer a member of a changelist."), file);
 //				break;
 			default:
-				System.Console.WriteLine("untranslated action:" + data.action);
+				LoggingService.LogDebug ("untranslated action:" + data.action);
 				actiondesc = data.action.ToString () + " " + file;
 				break;
 				/*
@@ -1456,11 +1464,13 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 			}
 			
 			if (updatemonitor != null && !string.IsNullOrEmpty (actiondesc)) {
-				if (skipEol) {
-					updatemonitor.Log.Write (actiondesc);
-				} else {
-					updatemonitor.Log.WriteLine (actiondesc);
-				}
+				Runtime.RunInMainThread (() => {
+					if (skipEol) {
+						updatemonitor.Log.Write (actiondesc);
+					} else {
+						updatemonitor.Log.WriteLine (actiondesc);
+					}
+				});
 			}
 			if (updateFileList != null && notifyChange && File.Exists (file))
 				updateFileList.Add (file);
@@ -1663,6 +1673,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 		/// </summary>
 		private class AnnotationCollector
 		{
+			readonly Repository repo;
 			readonly Annotation[] annotations;
 			public LibSvnClient.svn_client_blame_receiver_t Func {
 				get; private set;
@@ -1680,14 +1691,15 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
 					} catch {
 						tdate = DateTime.MinValue;
 					}
-					annotations[(int)line_no] = new Annotation (revision.ToString (), author, tdate);
+					annotations[(int)line_no] = new Annotation (new SvnRevision(repo, (int)revision), author, tdate);
 				}
 				
 				return IntPtr.Zero;
 			}
 			
-			public AnnotationCollector (Annotation[] annotations)
+			public AnnotationCollector (Annotation[] annotations, Repository repo)
 			{
+				this.repo = repo;
 				this.annotations = annotations;
 				Func = CollectorFunc;
 			}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/ChangeLog b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/ChangeLog
deleted file mode 100644
index cb0d92a595..0000000000
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/ChangeLog
+++ /dev/null
@@ -1,365 +0,0 @@
-2010-07-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Track api changes.
-
-2010-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Add basic support for git.
-
-2010-06-29  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Track API changes (annotations are now given back as class
-	  instead of a custom string).
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs:
-	  Fix incorrect use of ShowCustomDialog/RunCustomDialog.
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs:
-	  More dialog placing.
-
-2010-05-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/LibSvnClient.cs: Get
-	  the description of errors reported using an error code.
-	  Fixes bug #602762 - No details supplied when svn connection
-	  fails.
-
-2010-05-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Split List method into List and ListUrl.
-
-2010-03-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs: Add
-	  description for BlameRevision.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.VersionControl.Subversion.addin.xml: Bumped MD
-	  version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.VersionControl.Subversion.csproj:
-	* MonoDevelop.VersionControl.Subversion.addin.xml:
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionNodeExtension.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-02-24  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Fix build.
-
-2010-02-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.Subversion.csproj: Moved diff
-	  widget and algorithm to MonoDevelop.Components.
-
-2010-02-04  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Add support for revision-range-based recursive diffing.
-
-2010-02-04  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs: Prevent
-	  occasional NRE.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs:
-	  Flush.
-
-2009-11-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.addin.xml: Don't
-	  include the linux svn client on windows.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.VersionControl.Subversion.addin.xml: Bump MD
-	  version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.VersionControl.Subversion.csproj:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs:
-	  Flush.
-
-2009-10-21  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.dll.config: Add
-	  correct dll mapping for freebsd.
-
-2009-10-13  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.csproj: Import md.targets
-
-2009-10-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs: Updated license.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.addin.xml: Update
-	  license.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.VersionControl.Subversion.addin.xml: Bump MD
-	  version.
-
-2009-10-06  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Fix #544054: Exception in svn addin.
-
-2009-10-02  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs: Added
-	  missing string to translation.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs:
-	  Fix build.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs: 
-	* MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs: 
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs: 
-	* MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs: Set
-	  dialogs transient for the root window.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.csproj: Updated
-	  dependencies. We now depend on gtk# 2.12.8, Mono 2.4, and
-	  Mono.Addins 0.4.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic: Flush.
-
-2009-06-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Properly detect versioned directories. Allow reverting whole
-	  directories. All this fixes bug #436282 -
-	  solution/project/folders should have 'Revert All' option.
-
-2009-06-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Use correct base path when generating diffs.
-
-2009-06-05  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Unbreak SharpSvn addin build.
-
-2009-06-05  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Implement annotate.
-
-2009-06-01  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	  Track API.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	  Workaround for what seems to be a mcs bug. Looks like it
-	  can't properly resolve the implicit conversion of null to
-	  string.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion\SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion\SubversionRepository.cs:
-	* MonoDevelop.VersionControl.Subversion\SubversionNodeExtension.cs:
-	* MonoDevelop.VersionControl.Subversion\SubversionVersionControl.cs:
-	  Use the new FilePath class for handling file and directory
-	  paths.
-
-2009-05-11  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion\SvnClient.cs: Added
-	  missing null check.
-
-2009-05-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.Subversion.csproj:
-	* MonoDevelop.VersionControl.Subversion/LibApr.cs:
-	* MonoDevelop.VersionControl.Subversion.addin.xml:
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/ISvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/SvnRevision.cs:
-	* MonoDevelop.VersionControl.Subversion/LibSvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs:
-	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs:
-	  Refactored the subversion add-in to make it easier to
-	  implement support for svn using other subversion backends.
-
-2009-04-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/ISvnClient.cs:
-	* MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs:
-	  Created ISvnClient. May be required to implement other svn
-	  client backends.
-
-	* MonoDevelop.VersionControl.Subversion.csproj: Don't require
-	  a specific gtk# version.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.VersionControl.Subversion.addin.xml: Bump MD
-	  version.
-
-2009-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs: fixed
-	  typo.
-
-2009-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs: Added
-	  newline before revision message.
-
-2009-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs: worked
-	  on messages.
-
-2009-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs: Handled
-	  commit delta message.
-
-2009-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion/SvnClient.cs: Improved
-	  subversion notify messages (taken some logic out of the
-	  subversion implementation).
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.addin.xml: Restore
-	  accidentally removed menu extension.
-
-2009-02-25  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Flush.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.addin.xml: Track merge
-	  of the project pad context menu.
-
-2009-02-19  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.Subversion.csproj:
-	* MonoDevelop.VersionControl.Subversion.dll.config: Add a
-	  dllmap for the Mac. Config patch from Kris Ray.
-
-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.csproj: Don't
-	  local-copy other addins' dlls.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.csproj: Flush MD's
-	  removal of newline at end of file that was introduced by
-	  manually editing with gedit.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.csproj: Remove invalid
-	  ApplicationIcon value that broke the build in VS.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Subversion.mdp:
-	* MonoDevelop.VersionControl.Subversion.csproj: Migrated to
-	  MSBuild file format.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* MonoDevelop.VersionControl.Subversion.addin.xml: Bump MD
-	  version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs:
-	*
-	  gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs:
-	  Flush.
-
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs
index 8fd15737fc..540252ad43 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/WorkingCopyFormatDialog.cs
@@ -61,12 +61,12 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 					action();
 			};
 
-			if (DispatchService.IsGuiThread) {
+			if (Runtime.IsMainThread) {
 				// Already in GUI thread
 				del ();
 			}
 			else
-				DispatchService.GuiDispatch (del);
+				Runtime.RunInMainThread (del);
 		}
 	}
 }
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs
index 54dae06291..b130d7937f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs
@@ -132,7 +132,7 @@ namespace MonoDevelop.VersionControl.Subversion
 			if (toLock.Count == 0)

 				return true;

 

-			AlertButton but = new AlertButton ("Lock File");

+			AlertButton but = new AlertButton (GettextCatalog.GetString ("Lock File"));

 			if (!MessageService.Confirm (GettextCatalog.GetString ("The following files must be locked before editing."),

 				String.Join ("\n", toLock.Select (u => u.ToString ())), but))

 				return false;

@@ -148,17 +148,17 @@ namespace MonoDevelop.VersionControl.Subversion
 			return true;

 		}

 

-		protected override void OnLock (IProgressMonitor monitor, params FilePath[] localPaths)

+		protected override void OnLock (ProgressMonitor monitor, params FilePath[] localPaths)

 		{

 			Svn.Lock (monitor, "", false, localPaths);

 		}

 

-		protected override void OnUnlock (IProgressMonitor monitor, params FilePath[] localPaths)

+		protected override void OnUnlock (ProgressMonitor monitor, params FilePath[] localPaths)

 		{

 			Svn.Unlock (monitor, false, localPaths);

 		}

 

-		protected override Repository OnPublish (string serverPath, FilePath localPath, FilePath[] files, string message, IProgressMonitor monitor)

+		protected override Repository OnPublish (string serverPath, FilePath localPath, FilePath[] files, string message, ProgressMonitor monitor)

 		{

 			string url = Url;

 			if (!serverPath.StartsWith ("/", StringComparison.Ordinal) && !url.EndsWith ("/", StringComparison.Ordinal))

@@ -184,7 +184,7 @@ namespace MonoDevelop.VersionControl.Subversion
 			return new SubversionRepository (VersionControlSystem, paths[0], localPath);

 		}

 

-		void PublishDir (Set<FilePath> dirs, FilePath dir, bool rec, IProgressMonitor monitor)

+		void PublishDir (Set<FilePath> dirs, FilePath dir, bool rec, ProgressMonitor monitor)

 		{

 			if (dirs.Add (dir.CanonicalPath)) {

 				if (rec) {

@@ -194,28 +194,28 @@ namespace MonoDevelop.VersionControl.Subversion
 			}

 		}

 

-		protected override void OnUpdate (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)

+		protected override void OnUpdate (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)

 		{

 			foreach (string path in localPaths)

 				Svn.Update (path, recurse, monitor);

 		}

 		

-		protected override void OnCommit (ChangeSet changeSet, IProgressMonitor monitor)

+		protected override void OnCommit (ChangeSet changeSet, ProgressMonitor monitor)

 		{

 			Svn.Commit (changeSet.Items.Select (it => it.LocalPath).ToArray (), changeSet.GlobalComment, monitor);

 		}

 

-		void CreateDirectory (string[] paths, string message, IProgressMonitor monitor)

+		void CreateDirectory (string[] paths, string message, ProgressMonitor monitor)

 		{

 			Svn.Mkdir (paths, message, monitor);

 		}

 

-		protected override void OnCheckout (FilePath targetLocalPath, Revision rev, bool recurse, IProgressMonitor monitor)

+		protected override void OnCheckout (FilePath targetLocalPath, Revision rev, bool recurse, ProgressMonitor monitor)

 		{

 			Svn.Checkout (this.Url, targetLocalPath, rev, recurse, monitor);

 		}

 

-		protected override void OnRevert (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)

+		protected override void OnRevert (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)

 		{

 			// If we have an array of paths such as: new [] { "/Foo/Directory", "/Foo/Directory/File1", "/Foo/Directory/File2" }

 			// svn will successfully revert the first entry (the directory) and then throw an error when trying to revert the

@@ -225,17 +225,17 @@ namespace MonoDevelop.VersionControl.Subversion
 			Svn.Revert (localPaths, recurse, monitor);

 		}

 

-		protected override void OnRevertRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)

+		protected override void OnRevertRevision (FilePath localPath, Revision revision, ProgressMonitor monitor)

 		{

 			Svn.RevertRevision (localPath, revision, monitor);

 		}

 

-		protected override void OnRevertToRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)

+		protected override void OnRevertToRevision (FilePath localPath, Revision revision, ProgressMonitor monitor)

 		{

 			Svn.RevertToRevision (localPath, revision, monitor);

 		}

 

-		protected override void OnAdd (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)

+		protected override void OnAdd (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)

 		{

 			foreach (FilePath path in localPaths) {

 				if (IsVersioned (path) && File.Exists (path) && !Directory.Exists (path)) {

@@ -308,7 +308,7 @@ namespace MonoDevelop.VersionControl.Subversion
 			return (srcRepository is SubversionRepository) && ((SubversionRepository)srcRepository).Root == Root;

 		}

 

-		protected override void OnMoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)

+		protected override void OnMoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, ProgressMonitor monitor)

 		{

 			bool destIsVersioned = false;

 			

@@ -344,7 +344,7 @@ namespace MonoDevelop.VersionControl.Subversion
 			ClearCachedVersionInfo (localSrcPath, localDestPath);

 		}

 

-		protected override void OnMoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)

+		protected override void OnMoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, ProgressMonitor monitor)

 		{

 			if (IsVersioned (localDestPath))

 			{

@@ -435,7 +435,7 @@ namespace MonoDevelop.VersionControl.Subversion
 			}

 		}

 		

-		void MakeDirVersioned (string dir, IProgressMonitor monitor)

+		void MakeDirVersioned (string dir, ProgressMonitor monitor)

 		{

 			if (Directory.Exists (SubversionBackend.GetDirectoryDotSvn (VersionControlSystem, dir)))

 				return;

@@ -462,7 +462,7 @@ namespace MonoDevelop.VersionControl.Subversion
 				collection.Add(f);

 		}

 

-		protected override void OnDeleteFiles (FilePath[] localPaths, bool force, IProgressMonitor monitor, bool keepLocal)

+		protected override void OnDeleteFiles (FilePath[] localPaths, bool force, ProgressMonitor monitor, bool keepLocal)

 		{

 			foreach (string path in localPaths) {

 				if (IsVersioned (path)) {

@@ -490,7 +490,7 @@ namespace MonoDevelop.VersionControl.Subversion
 			}

 		}

 

-		protected override void OnDeleteDirectories (FilePath[] localPaths, bool force, IProgressMonitor monitor, bool keepLocal)

+		protected override void OnDeleteDirectories (FilePath[] localPaths, bool force, ProgressMonitor monitor, bool keepLocal)

 		{

 			foreach (string path in localPaths) {

 				if (IsVersioned (path)) {

@@ -550,21 +550,24 @@ namespace MonoDevelop.VersionControl.Subversion
 			}

 		}

 		

-		public override Annotation[] GetAnnotations (FilePath repositoryPath)

+		public override Annotation[] GetAnnotations (FilePath repositoryPath, Revision since)

 		{

-			List<Annotation> annotations = new List<Annotation> (Svn.GetAnnotations (this, repositoryPath, SvnRevision.First, SvnRevision.Base));

-			Annotation nextRev = new Annotation (GettextCatalog.GetString ("working copy"), "<uncommitted>", DateTime.MinValue);

+			SvnRevision sinceRev = since != null ? (SvnRevision)since : null;

+			List<Annotation> annotations = new List<Annotation> (Svn.GetAnnotations (this, repositoryPath, SvnRevision.First, sinceRev ?? SvnRevision.Base));

+			Annotation nextRev = new Annotation (null, GettextCatalog.GetString ("<uncommitted>"), DateTime.MinValue, null, GettextCatalog.GetString ("working copy"));

 			var baseDocument = Mono.TextEditor.TextDocument.CreateImmutableDocument (GetBaseText (repositoryPath));

-			var workingDocument = Mono.TextEditor.TextDocument.CreateImmutableDocument (File.ReadAllText (repositoryPath));

-			

-			// "SubversionException: blame of the WORKING revision is not supported"

-			foreach (var hunk in baseDocument.Diff (workingDocument)) {

-				annotations.RemoveRange (hunk.RemoveStart - 1, hunk.Removed);

-				for (int i = 0; i < hunk.Inserted; ++i) {

-					if (hunk.InsertStart + i >= annotations.Count)

-						annotations.Add (nextRev);

-					else

-						annotations.Insert (hunk.InsertStart - 1, nextRev);

+			var workingDocument = Mono.TextEditor.TextDocument.CreateImmutableDocument (File.ReadAllText (repositoryPath));
+
+			// "SubversionException: blame of the WORKING revision is not supported"
+			if (sinceRev == null) {
+				foreach (var hunk in baseDocument.Diff (workingDocument, includeEol: false)) {
+					annotations.RemoveRange (hunk.RemoveStart - 1, hunk.Removed);
+					for (int i = 0; i < hunk.Inserted; ++i) {
+						if (hunk.InsertStart + i >= annotations.Count)
+							annotations.Add (nextRev);
+						else
+							annotations.Insert (hunk.InsertStart - 1, nextRev);
+					}
 				}

 			}

 			

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs
index b18cc66435..b33e289d63 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionVersionControl.cs
@@ -91,9 +91,15 @@ namespace MonoDevelop.VersionControl.Subversion
 		public VersionInfo GetVersionInfo (Repository repo, FilePath localPath, bool getRemoteStatus)
 		{
 			// Check for directory before checking for file, since directory links may appear as files
-			if (Directory.Exists (localPath))
-				return GetDirStatus (repo, localPath, getRemoteStatus);
-			return GetFileStatus (repo, localPath, getRemoteStatus);
+			var isDir = Directory.Exists (localPath);
+			try {
+				if (isDir)
+					return GetDirStatus (repo, localPath, getRemoteStatus);
+				return GetFileStatus (repo, localPath, getRemoteStatus);
+			} catch (Exception e) {
+				LoggingService.LogError ("Failed to query subversion status", e);
+				return VersionInfo.CreateUnversioned (localPath, isDir);
+			}
 		}
 
 		private VersionInfo GetFileStatus (Repository repo, FilePath sourcefile, bool getRemoteStatus)
@@ -137,28 +143,33 @@ namespace MonoDevelop.VersionControl.Subversion
 

 		public VersionInfo[] GetDirectoryVersionInfo (Repository repo, FilePath sourcepath, bool getRemoteStatus, bool recursive)
 		{
-			return Status (repo, sourcepath, SvnRevision.Head, recursive, true, getRemoteStatus).ToArray ();
+			try {
+				return Status (repo, sourcepath, SvnRevision.Head, recursive, true, getRemoteStatus).ToArray ();
+			} catch (Exception e) {
+				LoggingService.LogError ("Failed to get subversion directory status", e);
+				return new VersionInfo [0];
+			}
 		}

 

 		public abstract IEnumerable<VersionInfo> Status (Repository repo, FilePath path, SvnRevision revision, bool descendDirs, bool changedItemsOnly, bool remoteStatus);

 

-		public abstract void Update (FilePath path, bool recurse, IProgressMonitor monitor);

+		public abstract void Update (FilePath path, bool recurse, ProgressMonitor monitor);

 

-		public abstract void Commit (FilePath[] paths, string message, IProgressMonitor monitor);

+		public abstract void Commit (FilePath[] paths, string message, ProgressMonitor monitor);

 

-		public abstract void Mkdir (string[] paths, string message, IProgressMonitor monitor);

+		public abstract void Mkdir (string[] paths, string message, ProgressMonitor monitor);

 

-		public abstract void Checkout (string url, FilePath path, Revision rev, bool recurse, IProgressMonitor monitor);

+		public abstract void Checkout (string url, FilePath path, Revision rev, bool recurse, ProgressMonitor monitor);

 

-		public abstract void Revert (FilePath[] paths, bool recurse, IProgressMonitor monitor);

+		public abstract void Revert (FilePath[] paths, bool recurse, ProgressMonitor monitor);

 

-		public abstract void RevertRevision (FilePath path, Revision revision, IProgressMonitor monitor);

+		public abstract void RevertRevision (FilePath path, Revision revision, ProgressMonitor monitor);

 

-		public abstract void RevertToRevision (FilePath path, Revision revision, IProgressMonitor monitor);

+		public abstract void RevertToRevision (FilePath path, Revision revision, ProgressMonitor monitor);

 
-		public abstract void Add (FilePath path, bool recurse, IProgressMonitor monitor);
+		public abstract void Add (FilePath path, bool recurse, ProgressMonitor monitor);
 
-		public abstract void Delete (FilePath path, bool force, IProgressMonitor monitor);
+		public abstract void Delete (FilePath path, bool force, ProgressMonitor monitor);
 
 		public abstract void Ignore (FilePath[] paths);
 
@@ -178,16 +189,16 @@ namespace MonoDevelop.VersionControl.Subversion
 

 		public abstract IEnumerable<DirectoryEntry> ListUrl (string url, bool recurse, SvnRevision rev);
 
-		public void Move (FilePath srcPath, FilePath destPath, bool force, IProgressMonitor monitor)
+		public void Move (FilePath srcPath, FilePath destPath, bool force, ProgressMonitor monitor)
 		{
 			Move (srcPath, destPath, SvnRevision.Head, force, monitor);
 		}

 

-		public abstract void Move (FilePath srcPath, FilePath destPath, SvnRevision rev, bool force, IProgressMonitor monitor);

+		public abstract void Move (FilePath srcPath, FilePath destPath, SvnRevision rev, bool force, ProgressMonitor monitor);

 

-		public abstract void Lock (IProgressMonitor monitor, string comment, bool stealLock, params FilePath[] paths);

+		public abstract void Lock (ProgressMonitor monitor, string comment, bool stealLock, params FilePath[] paths);

 

-		public abstract void Unlock (IProgressMonitor monitor, bool breakLock, params FilePath[] paths);

+		public abstract void Unlock (ProgressMonitor monitor, bool breakLock, params FilePath[] paths);

 

 		public string GetUnifiedDiff (FilePath path, bool recursive, bool remoteDiff)
 		{
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
index 98b103bf00..1551e36181 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
@@ -54,6 +54,12 @@ namespace MonoDevelop.VersionControl.Subversion
 			Kind = 1;
 		}
 		
+		public override bool Equals(object o)
+		{
+			var other = (SvnRevision)o;
+			return Rev == other.Rev && Kind == other.Kind;
+		}
+
 		public override string ToString()
 		{
 			return Rev.ToString();
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
index 2b340b8d09..67bfa64504 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
@@ -5,33 +5,59 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 	internal partial class SslServerTrustDialog
 	{
 		private global::Gtk.HBox hbox1;
+		
 		private global::Gtk.VBox vbox2;
-		private global::Gtk.Image image1;
+		
+		private global::MonoDevelop.Components.ImageView image1;
+		
 		private global::Gtk.VBox vbox3;
+		
 		private global::Gtk.Label label2;
+		
 		private global::Gtk.Label labelReason;
+		
 		private global::Gtk.HSeparator hseparator2;
+		
 		private global::Gtk.Table table1;
+		
 		private global::Gtk.Label label3;
+		
 		private global::Gtk.Label label4;
+		
 		private global::Gtk.Label label5;
+		
 		private global::Gtk.Label label6;
+		
 		private global::Gtk.Label label7;
+		
 		private global::Gtk.Label label8;
+		
 		private global::Gtk.Label labelFprint;
+		
 		private global::Gtk.Label labelFrom;
+		
 		private global::Gtk.Label labelHost;
+		
 		private global::Gtk.Label labelIssuer;
+		
 		private global::Gtk.Label labelRealm;
+		
 		private global::Gtk.Label labelUntil;
+		
 		private global::Gtk.HSeparator hseparator1;
+		
 		private global::Gtk.Label label15;
+		
 		private global::Gtk.RadioButton radioAccept;
+		
 		private global::Gtk.RadioButton radioAcceptSession;
+		
 		private global::Gtk.RadioButton radioNotAccept;
+		
 		private global::Gtk.Button button98;
-		private global::Gtk.Button button104;
 		
+		private global::Gtk.Button button104;
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -54,9 +80,10 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 			this.vbox2 = new global::Gtk.VBox ();
 			this.vbox2.Name = "vbox2";
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.image1 = new global::Gtk.Image ();
+			this.image1 = new global::MonoDevelop.Components.ImageView ();
 			this.image1.Name = "image1";
-			this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.Dialog);
+			this.image1.IconId = "gtk-dialog-warning";
+			this.image1.IconSize = ((global::Gtk.IconSize)(6));
 			this.vbox2.Add (this.image1);
 			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.image1]));
 			w2.Position = 0;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs
index 75697d1663..b453919401 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs
@@ -14,44 +14,6 @@ namespace Stetic
 		}

 	}

 

-	internal class IconLoader

-	{

-		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)

-		{

-			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);

-			if ((res != null)) {

-				return res;

-			} else {

-				int sz;

-				int sy;

-				global::Gtk.Icon.SizeLookup (size, out sz, out sy);

-				try {

-					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);

-				} catch (System.Exception) {

-					if ((name != "gtk-missing-image")) {

-						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);

-					} else {

-						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);

-						Gdk.GC gc = new Gdk.GC (pmap);

-						gc.RgbFgColor = new Gdk.Color (255, 255, 255);

-						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);

-						gc.RgbFgColor = new Gdk.Color (0, 0, 0);

-						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));

-						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);

-						gc.RgbFgColor = new Gdk.Color (255, 0, 0);

-						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1)

-						- (sz / 4)), ((sz - 1)

-						- (sz / 4)));

-						pmap.DrawLine (gc, ((sz - 1)

-						- (sz / 4)), (sz / 4), (sz / 4), ((sz - 1)

-						- (sz / 4)));

-						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);

-					}

-				}

-			}

-		}

-	}

-

 	internal class ActionGroups

 	{

 		public static Gtk.ActionGroup GetActionGroup (System.Type type)

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic
index ae41c2e8f3..8d0ac6267e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic
@@ -244,9 +244,10 @@
               <widget class="Gtk.VBox" id="vbox2">
                 <property name="MemberName" />
                 <child>
-                  <widget class="Gtk.Image" id="image1">
+                  <widget class="MonoDevelop.Components.ImageView" id="image1">
                     <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-dialog-warning Dialog</property>
+                    <property name="IconId">gtk-dialog-warning</property>
+                    <property name="IconSize">Dialog</property>
                   </widget>
                   <packing>
                     <property name="Position">0</property>
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog b/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
deleted file mode 100644
index 58b576f11d..0000000000
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
+++ /dev/null
@@ -1,1483 +0,0 @@
-2010-08-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs:
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:
-	* MonoDevelop.VersionControl/VersionControlService.cs:
-	* MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs:
-	  Track api changes.
-
-	* MonoDevelop.VersionControl/CreatePatchCommand.cs: Ignore
-	  extensions which failed to initialize.
-
-2010-07-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/Repository.cs:
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs: Annotations
-	  now use a DateTime instead of a String to represent the
-	  commit date.
-
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs:
-	  Provide the correct path to GetTextAtRevision.
-
-2010-07-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs:
-	  Improved look. Show separators between extension widgets.
-
-	* MonoDevelop.VersionControl/CommitDialogExtension.cs: The
-	  Initialize method now can return a boolean indicating
-	  whether the extension is enabled or not. Added some
-	  comments.
-
-2010-07-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs: Focus
-	  the text view and move the insert point to the begining.
-	  Makes it easier to insert a comment header.
-
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs:
-	* MonoDevelop.VersionControl/CommitMessageFormat.cs:
-	* MonoDevelop.VersionControl/VersionControlService.cs: Added
-	  option which allows omiting the file list in the commit
-	  message when all files have the same comment.
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs:
-	  Add some mnemonics.
-
-2010-07-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/Repository.cs: Remove debug code.
-
-2010-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/ChangeSetView.cs: Add
-	  missing file.
-
-2010-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	  Remove debug output.
-
-2010-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl/ChangeSet.cs: New reusable widget
-	  for showing change sets.
-
-2010-07-27  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/Repository.cs:
-	* MonoDevelop.VersionControl.Views/DiffView.cs:
-	* MonoDevelop.VersionControl/UnknownRepository.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs:
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	  Add basic support for git.
-
-2010-07-22  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonView.cs: Use
-	  delegation methods.
-
-2010-07-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs: Worked
-	  on version control views.
-
-2010-07-18  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameView.cs:
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs:
-	* MonoDevelop.VersionControl.Views/PatchWidget.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs: Track
-	  API changes.
-
-2010-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs: Worked
-	  on adjustments. (text editors no longer share a common
-	  adjustment - instead they communicate)
-
-2010-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs: Fixed
-	  the overview renderer click position.
-
-2010-07-14  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs: Caret
-	  state is now shown.
-
-2010-07-12  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.Views/DiffParser.cs: Track
-	  ProjectDomService/Parser API.
-
-2010-07-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/DropDownBox.cs: fixed some
-	  drop down box issues.
-
-2010-07-08  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/DropDownBox.cs:
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs: Worked
-	  on version control gui.
-
-2010-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl.Views/DropDownBox.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs: Added
-	  drop down box for the version control views (TODO:
-	  Selector).
-
-2010-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs: Fixed
-	  error in calculation.
-
-2010-07-07  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs:
-	  Improved the visualization of the change-diff - it's now
-	  easier to see what has changed when only a part of the line
-	  changed.
-
-2010-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/ComparisonView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs:
-	  Undo/Redo now works in comparison view.
-
-2010-07-06  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs: Added
-	  bounds check.
-
-2010-07-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs: set correct
-	  bounds.
-
-2010-07-05  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs: Added range
-	  check.
-
-2010-07-01  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs: Worked
-	  on version control views.
-
-2010-06-30  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/PatchView.cs:
-	* MonoDevelop.VersionControl.Views/BlameView.cs:
-	* MonoDevelop.VersionControl.Views/PatchWidget.cs:
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Views.PatchWidget.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidgetContainer.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Views.ComparisonWidgetContainer.cs:
-	  Worked on version control gui.
-
-2010-06-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs: Worked on
-	  blame widget.
-
-2010-06-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs: Worked on
-	  blame widget.
-
-2010-06-30  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/BlameView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonView.cs:
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	  Worked on version control GUI.
-
-2010-06-29  Mike Krüger  <mkrueger@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl/Repository.cs:
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl/AnnotateCommand.cs:
-	* MonoDevelop.VersionControl.Views/BlameView.cs:
-	* MonoDevelop.VersionControl/UnknownRepository.cs:
-	* MonoDevelop.VersionControl.Views/BlameWidget.cs:
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonView.cs:
-	* MonoDevelop.VersionControl/VersionControlService.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidget.cs:
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	* MonoDevelop.VersionControl.Views/ComparisonWidgetContainer.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Views.ComparisonWidgetContainer.cs:
-	  Worked on version control gui.
-
-2010-06-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl/Task.cs: Don't bring the VCS
-	  monitor to the front.
-
-2010-06-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Fixed 'Bug
-	  610257 - Text editor does not redraw after toggling
-	  annotations'.
-
-2010-06-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Fix bug
-	  #610262 - After hiding annotations they still refresh on
-	  save.
-
-2010-05-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Added
-	  missing string to translation.
-
-2010-05-31  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Fixed 'Bug
-	  610257 - Text editor does not redraw after toggling
-	  annotations'.
-
-2010-05-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/CommitCommand.cs:
-	* MonoDevelop.VersionControl/PublishCommand.cs:
-	* MonoDevelop.VersionControl/CheckoutCommand.cs:
-	* MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
-	  Fix incorrect use of ShowCustomDialog/RunCustomDialog.
-
-2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl/CommitCommand.cs:
-	* MonoDevelop.VersionControl/PublishCommand.cs:
-	* MonoDevelop.VersionControl/CheckoutCommand.cs:
-	* MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
-	  More dialog placing.
-
-2010-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Show a
-	  status message while getting annotations.
-
-2010-05-10  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Track API
-	  changes.
-
-2010-05-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Policies.xml: Added attribute to explicitly allow
-	  differential serialization for a policy (which is disabled
-	  by default).
-
-2010-04-22  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl/BaseView.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Use icon.
-
-2010-04-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs: After
-	  updating status, remove from the changeset the files/folders
-	  which have been deleted. Fixes bug #582514 - VCS status view
-	  sometimes has hidden invalid items that obstruct commit.
-
-2010-04-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Don't show
-	  an output pad when updating the status view.
-
-	* MonoDevelop.VersionControl/Task.cs:
-	* MonoDevelop.VersionControl/LockCommand.cs:
-	* MonoDevelop.VersionControl/UnlockCommand.cs:
-	* MonoDevelop.VersionControl/UpdateCommand.cs:
-	* MonoDevelop.VersionControl/CommitCommand.cs:
-	* MonoDevelop.VersionControl/RevertCommand.cs:
-	* MonoDevelop.VersionControl/PublishCommand.cs:
-	* MonoDevelop.VersionControl/CheckoutCommand.cs:
-	* MonoDevelop.VersionControl/AddRemoveMoveCommand.cs:
-	* MonoDevelop.VersionControl/RevertRevisionsCommands.cs:
-	  Improve success message. Small api simplification.
-
-2010-03-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VersionControl.addin.xml: Register data files.
-
-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VersionControl.addin.xml: Bumped MD version.
-
-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl/Task.cs:
-	* MonoDevelop.VersionControl/BaseView.cs:
-	* MonoDevelop.VersionControl/UpdateCommand.cs:
-	* MonoDevelop.VersionControl/CommitCommand.cs:
-	* MonoDevelop.VersionControl/RevertCommand.cs:
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl/PublishCommand.cs:
-	* MonoDevelop.VersionControl.Views/DiffView.cs:
-	* MonoDevelop.VersionControl/AnnotateCommand.cs:
-	* MonoDevelop.VersionControl/CheckoutCommand.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl/CreatePatchCommand.cs:
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs:
-	* MonoDevelop.VersionControl/AddRemoveMoveCommand.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:
-	* MonoDevelop.VersionControl/VersionControlService.cs:
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs:
-	* MonoDevelop.VersionControl/RevertRevisionsCommands.cs:
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	* MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs:
-	* MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs:
-	  Merged MD.Projects into MD.Core, and MD.Projects.Gui,
-	  MD.Core.Gui and MD.Components into MD.Ide.
-
-2010-03-08  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* version-control-16.png:
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl/Task.cs: Added version control
-	  icon.
-
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	  Fix type reference ambiguity.
-
-2010-03-03  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: fix build.
-
-2010-02-23  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl.Views/DiffView.cs: Track moved
-	  diff component.
-
-2010-02-18  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs: Track
-	  api changes.
-
-2010-02-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Fix parsing
-	  of command id. We are not using enums as ids anymore.
-
-2010-02-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.csproj: Move the icon resources
-	  into files, which can be loaded without loading the whole
-	  add-in.
-
-2010-02-10  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Makefile.am:
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl.Views/DiffParser.cs: Add
-	  quickfinder and folding support for unified diffs.
-
-2010-02-09  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs: Track
-	  API changes for lazy loading images.
-
-2010-02-04  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs: Allow viewing
-	  of historical, recursive directory diffs.
-
-	* MonoDevelop.VersionControl/Repository.cs: Add support for
-	  revision-range-based recursive diffing.
-
-2010-02-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.csproj: Add indirect reference.
-
-2010-01-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs:
-	  Flush.
-
-2009-12-09  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Track the
-	  last mouse cursor position on a child cell in the widget,
-	  and clear when the cursor leaves. The cellrenderer can use
-	  this an an accurate source of information whether the
-	  pointer is still on this widget and where it is.
-
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs: Don't
-	  pick up the global cursor position, since it may just be an
-	  expose from a window being dragged over. Instead, use the
-	  cursor position from the parent FileTreeView.
-
-2009-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl/Task.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
-	  Name threads to make debugging easier.
-
-2009-11-24  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Track API
-	  changes.
-
-2009-11-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VersionControl.addin.xml: Move the annotate command to a
-	  more convenient location in the context menu.
-
-2009-11-19  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Show
-	  commit message on mouseover. Implements #545521.
-
-2009-11-13  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Fix sort by
-	  file name.
-
-2009-11-11  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl/CreatePatchCommand.cs: Allow
-	  patches for multiselected items in the solution pad.
-
-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VersionControl.addin.xml: Bump MD version.
-
-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/generated.cs:
-	* MonoDevelop.VersionControl.csproj:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs:
-	  Flush.
-
-2009-10-16  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl/VersionControlService.cs: Handled
-	  icon loading errors.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.VersionControl.csproj: Use \ instead of '/'
-	in the Import.
-
-2009-10-08  Ankit Jain  <jankit@novell.com>
-
-	* MonoDevelop.VersionControl.csproj: Add md.targets .
-
-2009-10-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Construct
-	  Refresh and Open buttons explicitly to work around Mac GTK+
-	  issue with stock buttons.
-
-2009-10-07  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Only
-	  update width in the GUI thread.
-
-2009-10-07  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Do
-	  whole-file updates asynchronously.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VersionControl.addin.xml: Update license.
-
-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VersionControl.addin.xml: Bump MD version.
-
-2009-10-06  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Update
-	  annotations on revert.
-
-2009-10-06  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Update
-	  annotation margin while editing.
-
-2009-10-06  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Fix
-	  exception when reverting with annotations visible.
-
-2009-09-09  Christian Hergert  <chris@dronelabs.com>
-
-	* MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs: 
-	* MonoDevelop.VersionControl/CommitCommand.cs: 
-	* MonoDevelop.VersionControl/PublishCommand.cs: 
-	* MonoDevelop.VersionControl/CheckoutCommand.cs: Set dialogs
-	  transient for the root window.
-
-2009-09-01  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/CommitCommand.cs: Show an error
-	  message when trying to commit a directory which has no
-	  changes. Fixes bug #517699 - Monodevelop crash when
-	  submitting to SVN.
-
-2009-08-27  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: fixed
-	  warning.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/gui.stetic: Update gtk# dependency.
-
-2009-08-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.csproj: Updated dependencies. We
-	  now depend on gtk# 2.12.8, Mono 2.4, and Mono.Addins 0.4.
-
-2009-08-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.csproj: Don't make local copies
-	  of project references.
-
-2009-07-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* gtk-gui/gui.stetic:
-	* MonoDevelop.VersionControl.csproj: Flush.
-
-2009-07-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs: The
-	  status view now supports double clicking on a line of a diff
-	  to jump to that line in the modified file.
-
-2009-07-21  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs: Fixed
-	  "Bug 470436 - Crash when using the mouse wheel to scroll
-	  very fast on the diff viewer".
-
-2009-06-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/Repository.cs: Properly detect
-	  versioned directories. Allow reverting whole directories.
-	  All this fixes bug #436282 - solution/project/folders should
-	  have 'Revert All' option.
-
-2009-06-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: When
-	  double-clicking on a file, open it. Fixes bug #402108 -
-	  Double-click on item in the Review changes dialog should
-	  open the file or show the differences.
-
-2009-06-25  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl/CreatePatchCommand.cs: 
-	  Generate better initial names for created patches.
-
-2009-06-23  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* VersionControl.addin.xml:
-	  Add "Create Patch" to status view context menu.
-
-2009-06-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/DiffView.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs:
-	  Use the new DesktopService instead of PlatformService.
-
-2009-06-16  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Use
-	  CreatePatchCommand to create the patch.
-
-	* MonoDevelop.VersionControl/CreatePatchCommand.cs: Include
-	  commit extensions in the generation of the patch, so
-	  generated changelog entries are included.
-
-	* MonoDevelop.VersionControl/Repository.cs: Convert absolute
-	  paths to relative paths when a base path for the diff is
-	  specified. Include patch index info when generating a patch.
-
-2009-06-15  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Makefile.am:
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl/Commands.cs:
-	* MonoDevelop.VersionControl/Repository.cs:
-	* MonoDevelop.VersionControl/CreatePatchCommand.cs:
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	  Added "CreatePatch" command.
-
-2009-06-05  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl/Repository.cs:
-	  Unbreak SharpSvn addin build.
-
-2009-06-05  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs:
-	  Draw background for area after end of annotations.
-
-2009-06-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am: Fix build by adding reference to Mono.Debugging.
-
-2009-06-02  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.csproj: Add reference to
-	  DesignerSupport addin.
-
-2009-06-01  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.csproj:
-	* MonoDevelop.VersionControl/Commands.cs:
-	* MonoDevelop.VersionControl/Repository.cs:
-	* MonoDevelop.VersionControl/UnknownRepository.cs:
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	* MonoDevelop.VersionControl/AnnotateCommand.cs:
-	* MonoDevelop.VersionControl.Views/AnnotateView.cs:
-	* VersionControl.addin.xml: Added "Annotate" command.
-
-2009-05-20  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	  Use the new FilePath class.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl\CommitCommand.cs:
-	* MonoDevelop.VersionControl\FileUpdateEventHandler.cs: Track
-	  api changes.
-
-	* MonoDevelop.VersionControl\VersionControlService.cs: Looks
-	  like when deserializing, MS.NET can't resolve assemblies
-	  which are not in the main assembly dir, even if those
-	  assemblies are already loaded. Added a resolver which
-	  handles this case.
-
-2009-05-19  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl\ChangeSet.cs:
-	* MonoDevelop.VersionControl\Repository.cs:
-	* MonoDevelop.VersionControl\VersionInfo.cs:
-	* MonoDevelop.VersionControl\PublishCommand.cs:
-	* MonoDevelop.VersionControl.Views\StatusView.cs:
-	* MonoDevelop.VersionControl\UnknownRepository.cs:
-	* MonoDevelop.VersionControl\VersionControlItem.cs:
-	* MonoDevelop.VersionControl.Dialogs\CommitDialog.cs:
-	* MonoDevelop.VersionControl\VersionControlSystem.cs:
-	* MonoDevelop.VersionControl\VersionControlItemList.cs: Use
-	  the new FilePath class for handling file and directory
-	  paths.
-
-2009-04-28  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	* MonoDevelop.VersionControl/VersionControlCommandHandler.cs:
-	  Added ParentWorkspaceObject to SystemFile and ProjectFolder,
-	  which replaces the old Project property. It is required
-	  because now it is possible to show hiddem folders and files
-	  as children of a solution.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl/VersionControlService.cs: Renamed
-	  PixbufService to ImageService.
-
-2009-04-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl/VersionControlService.cs: Track
-	  API changes.
-
-2009-04-17  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Removed icon
-	  service.
-
-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VersionControl.addin.xml: Bump MD version.
-
-2009-03-04  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Added
-	  missing translation string.
-
-2009-02-28  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.csproj: Flush.
-
-2009-02-27  Levi Bard  <taktaktaktaktaktaktaktaktaktak@gmail.com>
-
-	* menu_resolve.png:
-	* Makefile.am:
-	* MonoDevelop.VersionControl.csproj:
-	* VersionControl.addin.xml: Add "Resolve" menu icon.
-
-2009-02-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
-	  Translation fixes. Patch from Kriván Bálint.
-
-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	  Add missing null check.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs:
-	  Changed override Destroy --> override OnDestroyed.
-
-2009-02-25  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl.Views/DiffView.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs: Worked
-	  on ressource de-allocation.
-
-2009-02-23  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VersionControl.addin.xml: Track merge of the project pad
-	  context menu.
-
-2009-02-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs:
-	  Correcty override member.
-
-2009-02-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/DiffView.cs: diff widget
-	  now gets disposed.
-
-2009-02-20  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs: Fixed
-	  "Bug 455892 - Crash when closing tabs".
-
-2009-02-19  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Added some
-	  strings to translation.
-
-2009-02-07  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.csproj: Don't local-copy other
-	  addins' dlls.
-
-2009-02-06  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.mdp:
-	* MonoDevelop.VersionControl.csproj: Migrated to MSBuild file
-	  format.
-
-2009-02-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs: Use the new
-	  TextFormatter class.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AssemblyInfo.cs:
-	* VersionControl.addin.xml: Bump MD version.
-
-2009-02-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs:
-	* gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs:
-	*
-	  gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs:
-	  Flush.
-
-2009-02-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs: Fix for Bug 469828
-	  - SVN: the local path of the checkout directory get into
-	  the log message.
-
-2009-02-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs:
-	* MonoDevelop.VersionControl/CommitMessageStyle.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:
-	* MonoDevelop.VersionControl/VersionControlService.cs: Fix
-	  author info and commit message style defaults.
-
-2009-02-01  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs:
-	* MonoDevelop.VersionControl/CommitMessageFormat.cs: Add
-	  mechanism for appending newlines to the message.
-
-2009-01-30  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* VersionControl.addin.xml: Register policy panel as a default policy
-	panel.
-
-2009-01-29  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs:
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs:
-	* MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs:
-	Rename UserInformation to AuthorInformation, and change other strings
-	correspondingly.
-
-	* MonoDevelop.VersionControl.mdp: Updated.
-
-2009-01-29  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* Policies.xml:
-	* gtk-gui/gui.stetic:
-	* gtk-gui/objects.xml:
-	* gtk-gui/generated.cs:
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.mdp:
-	* MonoDevelop.VersionControl/ChangeSet.cs:
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs:
-	* MonoDevelop.VersionControl/CommitMessageStyle.cs:
-	* MonoDevelop.VersionControl/CommitMessageFormat.cs:
-	* MonoDevelop.VersionControl/VersionControlPolicy.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:
-	* MonoDevelop.VersionControl/VersionControlService.cs:
-	* MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs:
-	* MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs:
-	* gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs:
-	Added version control policy, which allows setting the commit message
-	style.
-
-2009-01-27  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:
-	* MonoDevelop.VersionControl/CommitDialogExtension.cs: Add a property
-	for CommitDialogExtensions to disallow committing.
-
-	* gtk-gui/gui.stetic: Updated.
-
-2009-01-26  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl.mdp: Flush project format changes.
-
-2009-01-21  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs: Use UserInformation API.
-
-2009-01-07  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs: If there are no
-	changelog entries, generate an empty message (don't include the
-	headers). Fixes bug #375668 - If no text is entered for any changed
-	file, an entry with only name and e-mail is added to the ChangeLog.
-
-2008-12-12  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.mdp: All projects now require fx 3.5.
-
-2008-12-09  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.mdp: Don't require a specific version of
-	Mono.Addins.
-
-2008-12-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VersionControl.addin.xml: Hide/protect add-ins.
-
-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am: Make it work for parallel build.
-
-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* Makefile.am:
-	* AssemblyInfo.cs:
-	* MonoDevelop.VersionControl.mdp: Add AssemblyInfo.cs files that are
-	autogenerated from the addin manifests.
-
-2008-11-14  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs: Corrected strings.
-
-	* MonoDevelop.VersionControl/RevertCommand.cs: Unset commit messages
-	after reverting.
-
-2008-11-14  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs: Prevent commit message
-	creation when user cancels.
-
-2008-11-13  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs: Improve
-	Revert[to]revision feature, adding commit messages.
-
-2008-11-13  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs: Coding guidelines.
-
-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* VersionControl.addin.xml: Bump MD version.
-
-2008-11-03  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Don't crash when
-	updating the status of deleted files (there isn't a VersionInfo for
-	them after comitting). Fixes bug #437988 - NREs in version control
-	addin after commit.
-
-2008-10-31  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* MonoDevelop.VersionControl/Repository.cs:
-	* MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs: Use
-	CanMoveFiles to check if a directory can be moved from one SVN dir to
-	another SVN dir. Fixes bug #436289.
-
-2008-10-22  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* Makefile.am:
-	* VersionControl.addin.xml:
-	* MonoDevelop.VersionControl.mdp:
-	* MonoDevelop.VersionControl/Repository.cs:
-	* MonoDevelop.VersionControl/LockCommand.cs:
-	* MonoDevelop.VersionControl/CommitCommand.cs:
-	* MonoDevelop.VersionControl/RevertCommand.cs:
-	* MonoDevelop.VersionControl/UnlockCommand.cs:
-	* MonoDevelop.VersionControl.Views/LogView.cs:
-	* MonoDevelop.VersionControl/UpdateCommand.cs:
-	* MonoDevelop.VersionControl.Views/DiffView.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl/UnknownRepository.cs:
-	* MonoDevelop.VersionControl/VersionControlItem.cs:
-	* MonoDevelop.VersionControl/AddRemoveMoveCommand.cs:
-	* MonoDevelop.VersionControl/VersionControlItemList.cs:
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs:
-	* MonoDevelop.VersionControl/VersionControlCommandHandler.cs: Improved
-	support for multiple selection in the project pad. Added new
-	extension point for the status view context menu.
-
-2008-10-13  Mike Krüger  <mkrueger@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs: Commited patch from alan, to
-	fix compilation issues with the public mono version.
-
-2008-10-12  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* gtk-gui/gui.stetic:
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs: Correct a
-	string (mhutch agrees).
-
-2008-10-12  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* Makefile.am:
-	* MonoDevelop.VersionControl.mdp:
-	* MonoDevelop.VersionControl/ChangeSet.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Warn about very
-	probable accidental commit situation.
-
-2008-10-12  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs:
-	* MonoDevelop.VersionControl.Views/StatusView.cs:
-	* MonoDevelop.VersionControl/VersionControlService.cs: Coding
-	guidelines.
-
-2008-10-12  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs: Improve the control of
-	what is selected: no sense to revert to *current* rev.
-
-2008-10-12  Andrés G. Aragoneses  <aaragoneses@novell.com>
-
-	* MonoDevelop.VersionControl.Views/LogView.cs: Coding guidelines.
-
-2008-10-07  Aaron Bockover  <abockover@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs: Remove the space
-	alignment from the tab indent on the ChangeLog message, preserve it
-	for the commit message
-
-2008-10-07  Aaron Bockover  <abockover@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs: Updated to use
-	  ChangeLogMessageStyle instead of the WriteHeader bool
-
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs: Omit files with
-	  empty/unset messages from the ChangeLog by default; when the GUI
-	  builder is working again I'll add a preference for this; if the
-	  ChangeLog is empty, also insert some extra whitespace for easily
-	  entering commit messages without applying to files; opted for
-	  ChangeLogMessageStyle enum instead of a bool WriteHeader
-
-2008-10-07  Aaron Bockover  <abockover@novell.com>
-
-	* MonoDevelop.VersionControl/ChangeSet.cs: Use ChangeLogWriter to
-	  generate messages instead of the old formatting
-
-	* MonoDevelop.VersionControl/ChangeLogWriter.cs: Writes a standard
-	  ChangeLog file with proper grouping, alignment, word wrapping, and
-	  spacing; it can produce a commit message without indentation or
-	  header as well
-
-2008-09-18  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs,
-	  gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs,
-	  gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs,
-	  gtk-gui/gui.stetic: Updated.
-	* MonoDevelop.VersionControl/PublishCommand.cs: When publishing a
-	  solution, use GetItemFiles to get all files to include in the
-	  commit. Fixes bug #425339 - 'Publish' command should also check in
-	  the .sln file.
-
-2008-09-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs: Moved the
-	  extensible tree view to its own directory.
-
-2008-08-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs,
-	  MonoDevelop.VersionControl/Repository.cs,
-	  MonoDevelop.VersionControl/VersionInfo.cs: Properly show the remote
-	  status in the status view. Include remote additions and removals.
-	  Show diff between working copy and repo when remote status is
-	  requested. All this fixes bug #395284 - SVN plugin: Show Remote
-	  Status does not work.
-
-2008-08-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs,
-	  gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs,
-	  gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs,
-	  gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs,
-	  gtk-gui/gui.stetic,
-	  MonoDevelop.VersionControl/UrlBasedRepositoryEditor.cs: Fix bug
-	  #395563 - SVN plugin: Repository Configuration dialog only fills in
-	  port if arrow buttons pressed.
-
-2008-08-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Views/StatusView.cs: Fix bug #401846 -
-	  Caught exception closing VersionControl tab before it's done with
-	  remote operation.
-
-2008-08-20  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.mdp,
-	  MonoDevelop.VersionControl.Views/Diffs.cs,
-	  MonoDevelop.VersionControl.Views/Statuses.cs,
-	  MonoDevelop.VersionControl.Views/LogView.cs,
-	  MonoDevelop.VersionControl.Views/StatusView.cs,
-	  MonoDevelop.VersionControl.Views/DiffView.cs,
-	  MonoDevelop.VersionControl.Views/Logs.cs, Makefile.am,
-	  MonoDevelop.VersionControl/UpdateCommand.cs,
-	  MonoDevelop.VersionControl/Update.cs,
-	  MonoDevelop.VersionControl/Checkout.cs,
-	  MonoDevelop.VersionControl/PublishCommand.cs,
-	  MonoDevelop.VersionControl/Publish.cs,
-	  MonoDevelop.VersionControl/CheckoutCommand.cs: Renamed some files.
-	* gtk-gui/gui.stetic: Updated.
-
-2008-08-05  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* overlay_locked.png, overlay_unlocked.png,
-	  MonoDevelop.VersionControl.mdp, VersionControl.addin.xml,
-	  gtk-gui/objects.xml, gtk-gui/gui.stetic,
-	  MonoDevelop.VersionControl.Views/Statuses.cs, Makefile.am,
-	  MonoDevelop.VersionControl/Repository.cs,
-	  MonoDevelop.VersionControl/CommitCommand.cs,
-	  MonoDevelop.VersionControl/LockCommand.cs,
-	  MonoDevelop.VersionControl/VersionStatus.cs,
-	  MonoDevelop.VersionControl/VersionControlNodeExtension.cs,
-	  MonoDevelop.VersionControl/UnlockCommand.cs,
-	  MonoDevelop.VersionControl/Commands.cs,
-	  MonoDevelop.VersionControl/VersionInfo.cs,
-	  MonoDevelop.VersionControl/Task.cs,
-	  MonoDevelop.VersionControl/VersionControlService.cs,
-	  overlay_lock_required.png: Add support for locking/unlocking, and
-	  for on-demand unlocking (RequestFileEdit event).
-
-2008-07-29  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.VersionControl/Update.cs,
-	  MonoDevelop.VersionControl/RevertRevisionsCommands.cs,
-	  MonoDevelop.VersionControl/AddRemoveMoveCommand.cs,
-	  MonoDevelop.VersionControl/RevertCommand.cs: Translated old code to
-	  new dom.
-
-2008-07-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/Repository.cs,
-	  MonoDevelop.VersionControl/UnknownRepository.cs,
-	  MonoDevelop.VersionControl/UrlBasedRepository.cs,
-	  MonoDevelop.VersionControl/VersionControlConfiguration.cs,
-	  MonoDevelop.VersionControl/VersionControlService.cs: Moved
-	  serialization engine to MonoDevelop.Core. Use new syntax for
-	  specifying attribute scope.
-
-2008-07-06  Andrés G. Aragoneses <aaragoneses@novell.com> 
-
-	Implement feature in bug#394434: "Revert [to] revision".
-	* MonoDevelop.VersionControl.mdp, Makefile.am: Add the new file
-	  RevertRevisionsCommands.
-	* MonoDevelop.VersionControl.Views/Logs.cs: Adding the new buttons to
-	  the Log view.
-	* MonoDevelop.VersionControl/Repository.cs: New abstract methods
-	  Revert[To]Revision.
-	* MonoDevelop.VersionControl/RevertRevisionsCommands.cs: Add new file.
-	* MonoDevelop.VersionControl/UnknownRepository.cs: Empty
-	  implementations for Revert[To]Revision.
-
-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VersionControl.addin.xml: Bump MD version.
-
-2008-06-03  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs: Use the
-	  OnDestroyed event instead of Dispose, since with the latest changes
-	  in gtk#, Dispose is not called anymore when a widget is destroyed.
-
-2008-05-29  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VersionControl.addin.xml: Set a better label for the Status/Commit
-	  command.
-	* MonoDevelop.VersionControl/VersionControlService.cs: When adding the
-	  files of a project, add subfolders when needed. Fixes bug 393190 -
-	  Exception when creating new Gtk#/Stetic project if under version
-	  control.
-
-2008-05-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VersionControl.addin.xml: Added version control menu to workspace
-	  context menu.
-
-2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.mdp, VersionControl.addin.xml,
-	  Makefile.am,
-	  MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs,
-	  MonoDevelop.VersionControl/VersionControlNodeExtension.cs,
-	  MonoDevelop.VersionControl/Checkout.cs,
-	  MonoDevelop.VersionControl/Publish.cs,
-	  MonoDevelop.VersionControl/VersionControlService.cs: New project
-	  model changes.
-
-2008-05-15  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/gui.stetic: Set correct target version.
-
-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.mdp: Removed unneeded reference.
-
-2008-03-07  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/generated.cs,
-	  gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs,
-	  gtk-gui/gui.stetic: Use commit icon in the ok button of the commit
-	  dialog.
-	* MonoDevelop.VersionControl/Publish.cs: Improved message dialog.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.VersionControl/Update.cs,
-	  MonoDevelop.VersionControl/CommitCommand.cs,
-	  MonoDevelop.VersionControl/AddRemoveMoveCommand.cs,
-	  MonoDevelop.VersionControl/Task.cs,
-	  MonoDevelop.VersionControl/Checkout.cs,
-	  MonoDevelop.VersionControl/Publish.cs: Added some getstring calls
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.VersionControl/RevertCommand.cs: Added secondary text to the
-	  revert dialog.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* VersionControl.addin.xml: Changed file menu for hig.
-
-2008-03-04  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.VersionControl.Dialogs/CommitDialog.cs,
-	  MonoDevelop.VersionControl.Views/Statuses.cs,
-	  MonoDevelop.VersionControl.Views/Logs.cs,
-	  MonoDevelop.VersionControl/CommitCommand.cs,
-	  MonoDevelop.VersionControl/VersionControlNodeExtension.cs,
-	  MonoDevelop.VersionControl/RevertCommand.cs,
-	  MonoDevelop.VersionControl/Publish.cs,
-	  MonoDevelop.VersionControl/VersionControlService.cs: Worked on gnome hig
-	  compliant alerts.
-
-2008-02-29  Mike Krüger <mkrueger@novell.com> 
-
-	* VersionControl.addin.xml: Added many shortcuts.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* MonoDevelop.VersionControl.Views/Statuses.cs: Added some gettext calls.
-
-2008-02-27  Mike Krüger <mkrueger@novell.com> 
-
-	* gtk-gui/gui.stetic: Refactored status bar.
-
-2008-02-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs: Don't
-	  disable the name entry when creating a new repo. Fixes bug #363858.
-
-2008-02-05  Mike Krüger <mkrueger@novell.com> 
-
-	* VersionControl.addin.xml: Changed main menu items.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VersionControl.addin.xml: Update MD version.
-
-2008-01-25  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs:
-	  Flush.
-
-2008-01-24  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/AddRemoveMoveCommand.cs:
-	  NotifyFileStatusChanged is now gui thread safe, so no need to invoke it
-	  through Gtk.Application.Invoke.
-
-2008-01-22  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VersionControl.addin.xml: Updated add-in category and description.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/VersionControlService.cs: Make sure file status
-	  change events are always fired in the gui thread.
-
-2008-01-21  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/RevertCommand.cs: Notify file changes through
-	  the FileService.
-
-2008-01-16  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Views/Statuses.cs: Removed colorize method. Not
-	  needed anymore.
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs: Changed the way
-	  diffs are rendered. Instead of having a big pango layout with all text,
-	  now we render text line by line, skipping lines which are not visible.
-	  Coloring is done changing the GC, instead of using markup. Fixes bug
-	  #353705 and improves performance.
-
-2008-01-09  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/Checkout.cs,
-	  MonoDevelop.VersionControl/Publish.cs,
-	  MonoDevelop.VersionControl/VersionControlService.cs: If there isn't any
-	  supported version control system installed, show a message saying that,
-	  instead of showing a Select Repository dialog with an empty combo. Fixes
-	  bug #344841.
-	* MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs: Select the
-	  first vcs type by default.
-
-2008-01-07  Andreia Gaita <avidigal@novell.com>
-
-	* MonoDevelop.VersionControl.Views/Diffs.cs: Change the diff algorithm
-	call to have case-sensitive diffs.
-
-2007-12-14  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.mdp: Updated project files. The order of
-	  extended properties won't change anymore.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Views/Diffs.cs,
-	  MonoDevelop.VersionControl.Views/CellRendererDiff.cs,
-	  MonoDevelop.VersionControl.Views/Logs.cs: Moved PlatformService to
-	  MD.Core.Gui. Removed old FileIconService class, which is now implemented
-	  in PlatformService.
-
-2007-12-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.mdp,
-	  MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs,
-	  MonoDevelop.VersionControl.Dialogs/CommitDialog.cs,
-	  gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs,
-	  gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs,
-	  gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs,
-	  gtk-gui/gui.stetic, MonoDevelop.VersionControl.Views/Diffs.cs,
-	  MonoDevelop.VersionControl.Views/Statuses.cs,
-	  MonoDevelop.VersionControl.Views/Logs.cs, Makefile.am,
-	  MonoDevelop.VersionControl/Update.cs,
-	  MonoDevelop.VersionControl/CommitCommand.cs,
-	  MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs,
-	  MonoDevelop.VersionControl/VersionControlNodeExtension.cs,
-	  MonoDevelop.VersionControl/VersionControlSystem.cs,
-	  MonoDevelop.VersionControl/AddRemoveMoveCommand.cs,
-	  MonoDevelop.VersionControl/VersionControlProjectService.cs,
-	  MonoDevelop.VersionControl/ChangeSet.cs,
-	  MonoDevelop.VersionControl/Task.cs,
-	  MonoDevelop.VersionControl/Checkout.cs,
-	  MonoDevelop.VersionControl/BaseView.cs,
-	  MonoDevelop.VersionControl/RevertCommand.cs,
-	  MonoDevelop.VersionControl/Publish.cs,
-	  MonoDevelop.VersionControl/VersionControlService.cs: API cleanup.
-
-2007-12-12  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* VersionControl.addin.xml: Bump add-in versions.
-
-2007-12-11  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/VersionControlService.cs: Check if Subversion
-	  is installed in a nicer way. Fixes bug #342507.
-
-2007-12-06  Geoff Norton  <gnorton@novell.com>
-
-	* MonoDevelop.VersionControl.Views/CellRendererDiff.cs:
-	* MonoDevelop.VersionControl.Views/Diffs.cs:
-	* MonoDevelop.VersionControl.Views/Logs.cs: Use the PlatformService to get
-	  font and mime information instead of GConf / Gnome.Vfs directly
-
-2007-12-04  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.mdp, VersionControl.addin.xml, Makefile.am:
-	  Directory reorganization.
-
-2007-12-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/VersionControlProjectService.cs: Save comments
-	  in a background thread and only after a small delay (avoids saving too
-	  often). Should fix bug #324986.
-
-2007-12-01  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/Repository.cs,
-	  MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs,
-	  MonoDevelop.VersionControl/UrlBasedRepository.cs: In some cases it may
-	  be possible to natively move files between two repositories (e.g. if
-	  they are in the same server). Added a virtual method to check that and
-	  implemented it for SVN.
-	* MonoDevelop.VersionControl/VersionControlNodeExtension.cs: Add support for
-	  version control commands for all kinds of combine entries, not only
-	  Project and Combine.
-
-2007-11-13  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl.Views/Logs.cs: Don't disable the view if
-	  version info is not found for the file/folder. Just hide the buttons.
-	  Fixes bug #324953.
-
-2007-11-09  Michael Hutchinson <mhutchinson@novell.com> 
-
-	* MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs,
-	  MonoDevelop.VersionControl.Views/Statuses.cs,
-	  MonoDevelop.VersionControl/CommitCommand.cs,
-	  MonoDevelop.VersionControl/VersionControlNodeExtension.cs,
-	  MonoDevelop.VersionControl/VersionControlProjectService.cs,
-	  MonoDevelop.VersionControl/RevertCommand.cs: Track LoggingService API
-	  changes.
-
-2007-11-02  Lluis Sanchez Gual <lluis@novell.com> 
-
-	* MonoDevelop.VersionControl/Publish.cs: Use RootCombine instead of
-	  CurrentOpenCombine when possible.
-
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs
index 437ef02106..81ed7aaef2 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs
@@ -88,7 +88,7 @@ namespace MonoDevelop.VersionControl.Dialogs
 			foreach (object ob in exts) {
 				CommitDialogExtension ext = ob as CommitDialogExtension;
 				if (ext == null) {
-					MessageService.ShowError ("Commit extension type " + ob.GetType() + " must be a subclass of CommitDialogExtension");
+					LoggingService.LogError ("Commit extension type " + ob.GetType() + " must be a subclass of CommitDialogExtension");
 					continue;
 				}
 				if (ext.Initialize (changeSet)) {
@@ -196,7 +196,7 @@ namespace MonoDevelop.VersionControl.Dialogs
 					GettextCatalog.GetString ("Do you want to save the changes before committing?"),
 					new AlertButton[] {
 						AlertButton.Cancel,
-						new AlertButton ("Don't Save"),
+						new AlertButton (GettextCatalog.GetString ("Don't Save")),
 						AlertButton.Save
 					}
 				);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs
index 79a73b6d11..63c8b5dbcf 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs
@@ -136,8 +136,7 @@ namespace MonoDevelop.VersionControl
 		void OnChanged ()
 		{
 			UpdatePreview ();
-			if (Changed != null)
-				Changed (this, EventArgs.Empty);
+			Changed?.Invoke (this, EventArgs.Empty);
 		}
 		
 		protected virtual void OnCheckUseBulletsToggled (object sender, System.EventArgs e)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs
index 091af96b7b..5f99489b62 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/EditRepositoryDialog.cs
@@ -22,7 +22,7 @@ namespace MonoDevelop.VersionControl.Dialogs
 				
 				editor = repo.VersionControlSystem.CreateRepositoryEditor (repo);
 				repoEditorContainer.Add (editor.Widget);
-				editor.Widget.Show ();
+				editor.Show ();
 			}
 			else {
 				foreach (VersionControlSystem vcs in VersionControlService.GetVersionControlSystems ()) {
@@ -65,7 +65,7 @@ namespace MonoDevelop.VersionControl.Dialogs
 			repo.NameChanged += OnNameChanged;
 			editor = vcs.CreateRepositoryEditor (repo);
 			repoEditorContainer.Add (editor.Widget);
-			editor.Widget.Show ();
+			editor.Show ();
 			entryName.Sensitive = true;
 		}
 
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
index a514938b0e..e5644ec15e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
@@ -25,7 +25,8 @@ namespace MonoDevelop.VersionControl.Dialogs
 		List<Repository> loadingRepos = new List<Repository> ();
 		IRepositoryEditor currentEditor;
 		string defaultPath;
-		
+		public readonly ConfigurationProperty<string> VersionControlDefaultPath = ConfigurationProperty.Create ("MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.DefaultPath", System.IO.Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Projects"));
+
 		const int RepositoryCol = 0;
 		const int RepoNameCol = 1;
 		const int VcsName = 2;
@@ -59,14 +60,15 @@ namespace MonoDevelop.VersionControl.Dialogs
 			repoTree.AppendColumn (GettextCatalog.GetString ("Type"), new CellRendererText (), "text", VcsName);
 			repoTree.TestExpandRow += new Gtk.TestExpandRowHandler (OnTestExpandRow);
 			LoadRepositories ();
-			
+
 			if (mode == SelectRepositoryMode.Checkout) {
 				labelName.Visible = false;
 				entryName.Visible = false;
 				boxMessage.Visible = false;
 				labelMessage.Visible = false;
-				defaultPath = PropertyService.Get ("MonoDevelop.Core.Gui.Dialogs.NewProjectDialog.DefaultPath", Environment.GetFolderPath (Environment.SpecialFolder.Personal));
+				defaultPath = VersionControlDefaultPath;
 				entryFolder.Text = defaultPath;
+				buttonOk.Label = GettextCatalog.GetString ("_Checkout");
 			} else {
 				labelTargetDir.Visible = false;
 				boxFolder.Visible = false;
@@ -121,7 +123,7 @@ namespace MonoDevelop.VersionControl.Dialogs
 			repo = vcs.CreateRepositoryInstance ();
 			currentEditor = vcs.CreateRepositoryEditor (repo);
 			repoContainer.Add (currentEditor.Widget);
-			currentEditor.Widget.Show ();
+			currentEditor.Show ();
 			UrlBasedRepositoryEditor edit = currentEditor as UrlBasedRepositoryEditor;
 			if (edit != null)
 				edit.PathChanged += OnPathChanged;
@@ -322,6 +324,7 @@ namespace MonoDevelop.VersionControl.Dialogs
 			var dlg = new MonoDevelop.Components.SelectFolderDialog (GettextCatalog.GetString ("Select target directory"));
 			if (dlg.Run ()) {
 				defaultPath = dlg.SelectedFile;
+				VersionControlDefaultPath.Value = defaultPath;
 				AppendRelativePath ();
 			}
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
index 7fd5e9adf6..52c06c78d8 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
@@ -34,7 +34,7 @@ namespace MonoDevelop.VersionControl
 	{

 		Xwt.CheckBox disableVersionControl;

 

-		public override Gtk.Widget CreatePanelWidget ()

+		public override Control CreatePanelWidget ()

 		{

 			Xwt.VBox box = new Xwt.VBox ();

 			box.Spacing = 6;

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
index aeb604d3e7..3ff75dc197 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
@@ -25,7 +25,7 @@
 //
 //
 
-using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Dialogs;
 using MonoDevelop.Projects;
@@ -37,7 +37,7 @@ namespace MonoDevelop.VersionControl
 		CommitMessageStylePanelWidget widget;
 		CommitMessageFormat format;
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			format = new CommitMessageFormat ();
 			widget = new CommitMessageStylePanelWidget ();
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlSolutionOptionsPanel.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlSolutionOptionsPanel.cs
index f97e1570c6..709c490693 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlSolutionOptionsPanel.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlSolutionOptionsPanel.cs
@@ -35,7 +35,7 @@ namespace MonoDevelop.VersionControl
 	{

 		Xwt.CheckBox disableVersionControl;

 

-		public override Gtk.Widget CreatePanelWidget ()

+		public override Control CreatePanelWidget ()

 		{

 			Xwt.VBox box = new Xwt.VBox ();

 			box.Spacing = 6;

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs
index 26462b2335..94b15ee525 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BaseView.cs
@@ -1,97 +1,18 @@
-using System;

-using System.IO; 

 using MonoDevelop.Ide.Gui;

-

+
 namespace MonoDevelop.VersionControl
 {

-	public abstract class BaseView : AbstractBaseViewContent, IViewContent
+	public abstract class BaseView : ViewContent
 	{

-		string name;

-		

-		protected BaseView (string name)

-		{

-			this.name = name;

-		}

-		

-		protected virtual void SaveAs (string fileName)

-		{

-		}

+		readonly string name;

 

-		void IViewContent.Load (string fileName)

-		{

-			throw new InvalidOperationException();

-		}

-		

-		void IViewContent.LoadNew (Stream stream, string mimeType)

-		{

-			throw new InvalidOperationException ();

-		}

-		

-		void IViewContent.Save ()

-		{

-			throw new InvalidOperationException ();

-		}

-		

-		void IViewContent.DiscardChanges ()

-		{

-		}

-		

-		void IViewContent.Save (string fileName)

+		protected BaseView (string name)

 		{

-			SaveAs (fileName);

-		}
-		
-		string IViewContent.ContentName {

-			get { return name; }

-			set { }

-		}

-		

-		bool IViewContent.IsDirty {

-			get { return false; }

-			set { }

-		}

-		

-		bool IViewContent.IsReadOnly {

-			get { return true; }

-		}

-

-		bool IViewContent.IsUntitled {

-			get { return false; }

-		}

-

-		bool IViewContent.IsViewOnly {

-			get { return false; }

+			ContentName = this.name = name;

 		}
-		
-		bool IViewContent.IsFile {
-			get { return false; }
-		}

-

-		string IViewContent.PathRelativeToProject {

-			get { return ""; }

-		}

-		

-		MonoDevelop.Projects.Project IViewContent.Project {

-			get { return null; }

-			set { }

-		}

-		

+
 		public override string TabPageLabel {

 			get { return name; }

 		}
-
-		public virtual string StockIconId {

-			get { return null; }

-		}

-		

-		string IViewContent.UntitledName {

-			get { return ""; }

-			set { }

-		}

-		

-		event EventHandler IViewContent.BeforeSave { add { } remove { } }

-		event EventHandler IViewContent.ContentChanged { add { } remove { } }

-		event EventHandler IViewContent.ContentNameChanged { add { } remove { } }

-		event EventHandler IViewContent.DirtyChanged { add { } remove { } }

 	}

 }
\ No newline at end of file
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
index ee6571fb78..cc5c598cc8 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
@@ -1,21 +1,21 @@
-// 
+//
 // BlameView.cs
-//  
+//
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
-// 
+//
 // Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,23 +23,23 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System;
-using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 using Mono.TextEditor;
+
 namespace MonoDevelop.VersionControl.Views
 {
-	public interface IBlameView : IAttachableViewContent
+	public interface IBlameView
 	{	
 	}
 	
-	internal class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
+	internal class BlameView : BaseView, IBlameView, IClipboardHandler
 	{
 		BlameWidget widget;
 		VersionControlDocumentInfo info;
 		
-		public override Gtk.Widget Control { 
+		public override Control Control { 
 			get {
 				if (widget == null)
 					widget = new BlameWidget (info);
@@ -53,67 +53,36 @@ namespace MonoDevelop.VersionControl.Views
 		}
 		
 		#region IAttachableViewContent implementation
-		public void Selected ()
+		protected override void OnSelected ()
 		{
 			info.Start ();
-			var sourceEditor = info.Document.GetContent <MonoDevelop.SourceEditor.SourceEditorView> ();
-			if (sourceEditor != null) {
-				widget.Editor.Caret.Location = sourceEditor.TextEditor.Caret.Location;
-				widget.Editor.VAdjustment.Value = sourceEditor.TextEditor.VAdjustment.Value;
+			BlameWidget widget = Control.GetNativeWidget<BlameWidget> ();
+			widget.Reset ();
+
+			var buffer = info.Document.GetContent<MonoDevelop.Ide.Editor.TextEditor> ();
+			if (buffer != null) {
+				var loc = buffer.CaretLocation;
+				int line = loc.Line < 1 ? 1 : loc.Line;
+				int column = loc.Column < 1 ? 1 : loc.Column;
+				widget.Editor.SetCaretTo (line, column, highlight: false, centerCaret: false);
 			}
 		}
 
-		public void Deselected ()
-		{
-			var sourceEditor = info.Document.GetContent <MonoDevelop.SourceEditor.SourceEditorView> ();
-			if (sourceEditor != null) {
-				sourceEditor.TextEditor.Caret.Location = widget.Editor.Caret.Location;
-				sourceEditor.TextEditor.VAdjustment.Value = widget.Editor.VAdjustment.Value;
-			}
-		}
-
-		public void BeforeSave ()
-		{
-		}
-
-		public void BaseContentChanged ()
-		{
-		}
-		#endregion
-		
-		#region IUndoHandler implementation
-		void IUndoHandler.Undo ()
-		{
-			this.widget.Editor.Document.Undo ();
-		}
-
-		void IUndoHandler.Redo ()
-		{
-			this.widget.Editor.Document.Redo ();
-		}
-		
-		IDisposable IUndoHandler.OpenUndoGroup ()
+		protected override void OnDeselected ()
 		{
-			return this.widget.Editor.OpenUndoGroup ();
-		}
-
-		bool IUndoHandler.EnableUndo {
-			get {
-				return this.widget.Editor.Document.CanUndo;
+			var buffer = info.Document.GetContent<MonoDevelop.Ide.Editor.TextEditor> ();
+			if (buffer != null) {
+				BlameWidget widget = Control.GetNativeWidget<BlameWidget> ();
+				buffer.SetCaretLocation (widget.Editor.Caret.Line, widget.Editor.Caret.Column, usePulseAnimation: false, centerCaret: false);
+				buffer.ScrollTo (new Ide.Editor.DocumentLocation (widget.Editor.YToLine (widget.Editor.VAdjustment.Value), 1));
 			}
 		}
 
-		bool IUndoHandler.EnableRedo {
-			get {
-				return this.widget.Editor.Document.CanRedo;
-			}
-		}
 		#endregion
 
 		#region IClipboardHandler implementation
 		void IClipboardHandler.Cut ()
 		{
-			this.widget.Editor.RunAction (ClipboardActions.Cut);
 		}
 
 		void IClipboardHandler.Copy ()
@@ -123,16 +92,10 @@ namespace MonoDevelop.VersionControl.Views
 
 		void IClipboardHandler.Paste ()
 		{
-			this.widget.Editor.RunAction (ClipboardActions.Paste);
 		}
 
 		void IClipboardHandler.Delete ()
 		{
-			if (this.widget.Editor.IsSomethingSelected) {
-				this.widget.Editor.DeleteSelectedText ();
-			} else {
-				this.widget.Editor.RunAction (DeleteActions.Delete);
-			}
 		}
 
 		void IClipboardHandler.SelectAll ()
@@ -142,7 +105,7 @@ namespace MonoDevelop.VersionControl.Views
 
 		bool IClipboardHandler.EnableCut {
 			get {
-				return this.widget.Editor.IsSomethingSelected;
+				return false;
 			}
 		}
 
@@ -154,13 +117,13 @@ namespace MonoDevelop.VersionControl.Views
 
 		bool IClipboardHandler.EnablePaste {
 			get {
-				return true;
+				return false;
 			}
 		}
 
 		bool IClipboardHandler.EnableDelete {
 			get {
-				return true;
+				return false;
 			}
 		}
 
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 ef94cc2166..ce3798cbda 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
@@ -1,21 +1,21 @@
-// 
+//
 // BlameWidget.cs
-//  
+//
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
-// 
+//
 // Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,18 +33,22 @@ using Mono.TextEditor;
 using MonoDevelop.Ide;
 using System.Threading;
 using MonoDevelop.Core;
+using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide.Fonts;
 
 namespace MonoDevelop.VersionControl.Views
 {
 	public enum BlameCommands {
 		CopyRevision,
 		ShowDiff,
-		ShowLog
+		ShowLog,
+		ShowBlameBefore
 	}
 	
 	public class BlameWidget : Bin
 	{
+		Revision revision;
 		Adjustment vAdjustment;
 		Gtk.VScrollbar vScrollBar;
 		
@@ -53,7 +57,7 @@ namespace MonoDevelop.VersionControl.Views
 		
 		BlameRenderer overview;
 		
-		TextEditor editor;
+		MonoTextEditor editor;
 		List<ContainerChild> children = new List<ContainerChild> ();
 		
 		public Adjustment Vadjustment {
@@ -74,7 +78,7 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 		
-		public TextEditor Editor {
+		public MonoTextEditor Editor {
 			get {
 				return this.editor;
 			}
@@ -122,8 +126,12 @@ namespace MonoDevelop.VersionControl.Views
 
 			hScrollBar = new HScrollbar (hAdjustment);
 			AddChild (hScrollBar);
-			
-			editor = new TextEditor (sourceEditor.TextEditor.Document, sourceEditor.TextEditor.Options);
+
+			var doc = new TextDocument (sourceEditor.TextEditor.Document.Text) {
+				ReadOnly = true,
+				MimeType = sourceEditor.TextEditor.Document.MimeType,
+			};
+			editor = new MonoTextEditor (doc, sourceEditor.TextEditor.Options);
 			AddChild (editor);
 			editor.SetScrollAdjustments (hAdjustment, vAdjustment);
 			
@@ -146,6 +154,12 @@ namespace MonoDevelop.VersionControl.Views
 			editor.DoPopupMenu = ShowPopup;
 			Show ();
 		}
+
+		internal void Reset ()
+		{
+			revision = null;
+			overview.UpdateAnnotations ();
+		}
 		
 		void ShowPopup (EventButton evt)
 		{
@@ -277,7 +291,6 @@ namespace MonoDevelop.VersionControl.Views
 			double startY = Editor.LineToY (startLine);
 			double curY = startY - Editor.VAdjustment.Value;
 			int line = startLine;
-			var color = Style.Dark (State);
 			
 			while (curY < editor.Allocation.Bottom && line <= editor.LineCount) {
 				Annotation ann = line <= overview.annotations.Count ? overview.annotations[line - 1] : null;
@@ -292,10 +305,7 @@ namespace MonoDevelop.VersionControl.Views
 					if (ann != null && overview.highlightAnnotation.Revision == ann.Revision && curStart <= overview.highlightPositon && overview.highlightPositon < curY) {
 					} else {
 						cr.Rectangle (Editor.TextViewMargin.XOffset, curStart + cr.LineWidth, Editor.Allocation.Width - Editor.TextViewMargin.XOffset, curY - curStart - cr.LineWidth);
-						cr.SetSourceRGBA (color.Red / (double)ushort.MaxValue,
-							color.Green / (double)ushort.MaxValue,
-							color.Blue / (double)ushort.MaxValue,
-							0.1);
+						cr.SetSourceColor (Styles.BlameView.RangeHazeColor.ToCairoColor ());
 						cr.Fill ();
 						
 					}
@@ -304,10 +314,7 @@ namespace MonoDevelop.VersionControl.Views
 					cr.MoveTo (Editor.TextViewMargin.XOffset, curY + 0.5);
 					cr.LineTo (Editor.Allocation.Width, curY + 0.5);
 					
-					cr.SetSourceRGBA (color.Red / (double)ushort.MaxValue,
-						color.Green / (double)ushort.MaxValue,
-						color.Blue / (double)ushort.MaxValue,
-						0.2);
+					cr.SetSourceColor (Styles.BlameView.RangeSplitterColor.ToCairoColor ());
 					cr.Stroke ();
 				}
 			}
@@ -338,8 +345,6 @@ namespace MonoDevelop.VersionControl.Views
 
 		class BlameRenderer : DrawingArea 
 		{
-			static readonly Annotation locallyModified = new Annotation ("", "?", DateTime.MinValue);
-			
 			BlameWidget widget;
 			internal List<Annotation> annotations;
 			Pango.Layout layout;
@@ -356,8 +361,6 @@ namespace MonoDevelop.VersionControl.Views
 				UpdateAnnotations ();
 	//			widget.Document.Saved += UpdateAnnotations;
 				document = widget.Editor.Document;
-				document.TextReplacing += EditorDocumentTextReplacing;
-				document.LineChanged += EditorDocumentLineChanged;
 				widget.vScrollBar.ValueChanged += OnWidgetChanged;
 				
 				layout = new Pango.Layout (PangoContext);
@@ -373,8 +376,7 @@ namespace MonoDevelop.VersionControl.Views
 			
 			public void OptionsChanged ()
 			{
-				var description = Pango.FontDescription.FromString ("Tahoma " + (int)(10 * widget.Editor.Options.Zoom));
-				layout.FontDescription = description;
+				layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
 				UpdateWidth ();
 			}
 			
@@ -383,8 +385,6 @@ namespace MonoDevelop.VersionControl.Views
 				base.OnDestroyed ();
 //				widget.Document.Saved -= UpdateAnnotations;
 				if (document != null) { 
-					document.TextReplacing -= EditorDocumentTextReplacing;
-					document.LineChanged -= EditorDocumentLineChanged;
 					document = null;
 				}
 				if (layout != null) {
@@ -444,6 +444,7 @@ namespace MonoDevelop.VersionControl.Views
 					CommandEntrySet opset = new CommandEntrySet ();
 					opset.AddItem (BlameCommands.ShowDiff);
 					opset.AddItem (BlameCommands.ShowLog);
+					opset.AddItem (BlameCommands.ShowBlameBefore);
 					opset.AddItem (Command.Separator);
 					opset.AddItem (BlameCommands.CopyRevision);
 					IdeApp.CommandService.ShowContextMenu (this, evnt, opset, this);
@@ -480,7 +481,9 @@ namespace MonoDevelop.VersionControl.Views
 					DiffView diffView = view.GetContent<DiffView> ();
 					if (diffView != null) {
 						view.Select ();
-						var rev = widget.info.History.FirstOrDefault (h => h.ToString () == menuAnnotation.Revision);
+						if (menuAnnotation.Revision == null)
+							return;
+						var rev = widget.info.History.FirstOrDefault (h => h == menuAnnotation.Revision);
 						if (rev == null)
 							return;
 						diffView.ComparisonWidget.SetRevision (diffView.ComparisonWidget.DiffEditor, rev.GetPrevious ());
@@ -499,7 +502,9 @@ namespace MonoDevelop.VersionControl.Views
 					LogView logView = view.GetContent<LogView> ();
 					if (logView != null) {
 						view.Select ();
-						var rev = widget.info.History.FirstOrDefault (h => h.ToString () == menuAnnotation.Revision);
+						if (menuAnnotation.Revision == null)
+							return;
+						var rev = widget.info.History.FirstOrDefault (h => h == menuAnnotation.Revision);
 						if (rev == null)
 							return;
 						logView.LogWidget.SelectedRevision = rev;
@@ -507,7 +512,33 @@ namespace MonoDevelop.VersionControl.Views
 					}
 				}
 			}
-		
+
+			[CommandHandler (BlameCommands.ShowBlameBefore)]
+			protected void OnShowBlameBefore ()
+			{
+				var current = menuAnnotation?.Revision;
+				Revision rev;
+
+				if (current == null) {
+					rev = widget.info.History.FirstOrDefault ();
+				} else {
+					rev = current?.GetPrevious ();
+				}
+
+				if (rev == null)
+					return;
+				
+				widget.revision = rev;
+				UpdateAnnotations ();
+			}
+
+			[CommandUpdateHandler (BlameCommands.ShowBlameBefore)]
+			protected void OnUpdateShowBlameBefore (CommandInfo cinfo)
+			{
+				var current = menuAnnotation?.Revision;
+				// If we have a working copy segment or we have a parent commit.
+				cinfo.Enabled = current == null || current.GetPrevious () != null;
+			}
 			
 			protected override bool OnButtonReleaseEvent (EventButton evnt)
 			{
@@ -526,10 +557,10 @@ namespace MonoDevelop.VersionControl.Views
 				StatusBarContext ctx = IdeApp.Workbench.StatusBar.CreateContext ();
 				ctx.AutoPulse = true;
 				ctx.ShowMessage ("md-version-control", GettextCatalog.GetString ("Retrieving history"));
-				
+
 				ThreadPool.QueueUserWorkItem (delegate {
-					try {
-						annotations = new List<Annotation> (widget.VersionControlItem.Repository.GetAnnotations (widget.Document.FileName));
+				try {
+						annotations = new List<Annotation> (widget.VersionControlItem.Repository.GetAnnotations (widget.Document.FileName, widget.revision));
 						
 //						for (int i = 0; i < annotations.Count; i++) {
 //							Annotation varname = annotations[i];
@@ -541,7 +572,18 @@ namespace MonoDevelop.VersionControl.Views
 						LoggingService.LogError ("Error retrieving history", ex);
 					}
 					
-					DispatchService.GuiDispatch (delegate {
+					Runtime.RunInMainThread (delegate {
+						var location = widget.Editor.Caret.Location;
+						var adj = widget.editor.VAdjustment.Value;
+						if (widget.revision != null) {
+							document.Text = widget.VersionControlItem.Repository.GetTextAtRevision (widget.Document.FileName, widget.revision);
+						} else {
+							document.Text = widget.Document.Editor.Text;
+						}
+						widget.editor.Caret.Location = location;
+						widget.editor.VAdjustment.Value = adj;
+
+						ctx.AutoPulse = false;
 						ctx.Dispose ();
 						UpdateWidth ();
 						QueueDraw ();
@@ -550,63 +592,6 @@ namespace MonoDevelop.VersionControl.Views
 			}
 	
 			/// <summary>
-			/// Marks a line as locally modified
-			/// </summary>
-			private void EditorDocumentLineChanged (object sender, LineEventArgs e)
-			{
-				int startLine = widget.Editor.Document.OffsetToLineNumber (e.Line.Offset);
-				SetAnnotation (startLine, locallyModified);
-			}
-			
-			/// <summary>
-			/// Marks necessary lines modified when text is replaced
-			/// </summary>
-			private void EditorDocumentTextReplacing (object sender, DocumentChangeEventArgs e)
-			{
-				int startLine = widget.Editor.Document.OffsetToLineNumber (e.Offset),
-					endLine = widget.Editor.Document.OffsetToLineNumber (e.Offset + Math.Max (e.RemovalLength, e.InsertionLength)),
-					lineCount = 0;
-				string[] tokens = null;
-				
-				if (startLine < endLine) {
-					// change crosses line boundary
-					
-					lineCount = endLine - startLine;
-					lineCount = Math.Min (lineCount, annotations.Count - startLine);
-					
-					if (lineCount > 0)
-						annotations.RemoveRange (startLine - 1, lineCount);
-					if (!string.IsNullOrEmpty (e.InsertedText.Text)) {
-						for (int i=0; i<lineCount; ++i)
-							annotations.Insert (startLine - 1, locallyModified);
-					}
-					return;
-				} else if (0 == e.RemovalLength) {
-					// insert
-					tokens = e.InsertedText.Text.Split (new string[]{Environment.NewLine}, StringSplitOptions.None);
-						lineCount = tokens.Length - 1;
-						for (int i=0; i<lineCount; ++i) {
-							annotations.Insert (Math.Min (startLine, annotations.Count), locallyModified);
-						}
-				} else if (startLine > endLine) {
-					// revert
-					UpdateAnnotations ();
-					return;
-				}
-				
-				SetAnnotation (startLine, locallyModified);
-			}
-			
-			void SetAnnotation (int index, Annotation text)
-			{
-				if (index < 0)
-					return;
-				for (int i = annotations.Count; i <= index; ++i)
-					annotations.Add (locallyModified);
-				annotations[index] = text;
-			}
-	
-			/// <summary>
 			/// Gets the commit message matching a given annotation index.
 			/// </summary>
 			internal string GetCommitMessage (int index, bool tooltip)
@@ -615,7 +600,7 @@ namespace MonoDevelop.VersionControl.Views
 				var history = widget.info.History;
 				if (null != history && annotation != null) {
 					foreach (Revision rev in history) {
-						if (rev.ToString () == annotation.Revision) {
+						if (rev == annotation.Revision) {
 							if (tooltip && annotation.HasEmail)
 								return String.Format ("Email: {0}{1}{2}", annotation.Email, Environment.NewLine, rev.Message);
 							return rev.Message;
@@ -666,7 +651,7 @@ namespace MonoDevelop.VersionControl.Views
 							layout.SetText (note.Date.ToShortDateString ());
 							layout.GetPixelSize (out dateTimeLength, out height);
 						}
-						layout.SetText (note.Author + TruncRevision (note.Revision));
+						layout.SetText (note.Author + TruncRevision (note.Text));
 						layout.GetPixelSize (out tmpwidth, out height);
 						width = Math.Max (width, tmpwidth);
 					}
@@ -685,7 +670,7 @@ namespace MonoDevelop.VersionControl.Views
 					cr.LineWidth = Math.Max (1.0, widget.Editor.Options.Zoom);
 					
 					cr.Rectangle (leftSpacer, 0, Allocation.Width, Allocation.Height);
-					cr.SetSourceRGB (0.95, 0.95, 0.95);
+					cr.SetSourceColor (Styles.BlameView.AnnotationBackgroundColor.ToCairoColor ());
 					cr.Fill ();
 					
 					int startLine = widget.Editor.YToLine ((int)widget.Editor.VAdjustment.Value);
@@ -711,29 +696,34 @@ namespace MonoDevelop.VersionControl.Views
 							double nextY = widget.editor.LineToY (line) - widget.editor.VAdjustment.Value;
 							if (highlightAnnotation != null && highlightAnnotation.Revision == ann.Revision && curStart <= highlightPositon && highlightPositon < nextY) {
 								cr.Rectangle (leftSpacer, curStart + cr.LineWidth, Allocation.Width - leftSpacer, nextY - curStart - cr.LineWidth);
-								cr.SetSourceRGB (1, 1, 1);
+								cr.SetSourceColor (Styles.BlameView.AnnotationHighlightColor.ToCairoColor ());
 								cr.Fill ();
 							}
 
 							// use a fixed size revision to get a approx. revision width
 							layout.SetText ("88888888");
 							layout.GetPixelSize (out revisionWidth, out h);
-							layout.SetText (TruncRevision (ann.Revision));
-							e.Window.DrawLayout (Style.BlackGC, Allocation.Width - revisionWidth - margin, (int)(curY + (widget.Editor.LineHeight - h) / 2), layout);
+							layout.SetText (TruncRevision (ann.Text));
 
 							const int dateRevisionSpacing = 16;
-							if (ann.HasDate) {
-								string dateTime = ann.Date.ToShortDateString ();
-								// use a fixed size date to get a approx. date width
-								layout.SetText (new DateTime (1999, 10, 10).ToShortDateString ());
-								layout.GetPixelSize (out dateWidth, out h);
-								layout.SetText (dateTime);
-								e.Window.DrawLayout (Style.BlackGC, Allocation.Width - revisionWidth - margin - revisionWidth - dateRevisionSpacing, (int)(curY + (widget.Editor.LineHeight - h) / 2), layout);
+
+							using (var gc = new Gdk.GC (e.Window)) {
+								gc.RgbFgColor = Styles.BlameView.AnnotationTextColor.ToGdkColor ();
+								e.Window.DrawLayout (gc, Allocation.Width - revisionWidth - margin, (int)(curY + (widget.Editor.LineHeight - h) / 2), layout);
+
+								if (ann.HasDate) {
+									string dateTime = ann.Date.ToShortDateString ();
+									// use a fixed size date to get a approx. date width
+									layout.SetText (new DateTime (1999, 10, 10).ToShortDateString ());
+									layout.GetPixelSize (out dateWidth, out h);
+									layout.SetText (dateTime);
+
+									e.Window.DrawLayout (gc, Allocation.Width - revisionWidth - margin - revisionWidth - dateRevisionSpacing, (int)(curY + (widget.Editor.LineHeight - h) / 2), layout);
+								}
 							}
 
-							using (var authorLayout = PangoUtil.CreateLayout (this)) {
-								var description = Pango.FontDescription.FromString ("Tahoma " + (int)(10 * widget.Editor.Options.Zoom));
-								authorLayout.FontDescription = description;
+							using (var authorLayout = MonoDevelop.Components.PangoUtil.CreateLayout (this)) {
+								authorLayout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
 								authorLayout.SetText (ann.Author);
 								authorLayout.GetPixelSize (out authorWidth, out h);
 
@@ -749,7 +739,7 @@ namespace MonoDevelop.VersionControl.Views
 								cr.Rectangle (0, 0, maxWidth, Allocation.Height); 
 								cr.Clip ();
 								cr.Translate (leftSpacer + margin, (int)(curY + (widget.Editor.LineHeight - h) / 2)); 
-								cr.SetSourceRGB (0, 0, 0);
+								cr.SetSourceColor (Styles.BlameView.AnnotationTextColor.ToCairoColor ());
 								cr.ShowLayout (authorLayout);
 								cr.ResetClip ();
 								cr.Restore ();
@@ -770,7 +760,7 @@ namespace MonoDevelop.VersionControl.Views
 								layout.SetText (msg);
 								layout.Width = (int)(Allocation.Width * Pango.Scale.PangoScale);
 								using (var gc = new Gdk.GC (e.Window)) {
-									gc.RgbFgColor = Style.Dark (State);
+									gc.RgbFgColor = Styles.BlameView.AnnotationSummaryTextColor.ToGdkColor ();
 									gc.ClipRectangle = new Rectangle (0, (int)curStart, Allocation.Width, (int)(curY - curStart));
 									e.Window.DrawLayout (gc, (int)(leftSpacer + margin), (int)(curStart + h), layout);
 								}
@@ -779,7 +769,7 @@ namespace MonoDevelop.VersionControl.Views
 						
 						cr.Rectangle (0, curStart, leftSpacer, curY - curStart);
 						
-						if (ann != null && ann != locallyModified && !string.IsNullOrEmpty (ann.Author)) {
+						if (ann != null && !string.IsNullOrEmpty (ann.Author)) {
 							double a;
 							
 							if (ann != null && (maxDate - minDate).TotalHours > 0) {
@@ -787,19 +777,19 @@ namespace MonoDevelop.VersionControl.Views
 							} else {
 								a = 1;
 							}
-							HslColor color = new Cairo.Color (0.90, 0.90, 1);
-							color.L = 0.4 + a / 2;
-							color.S = 1 - a / 2;
-							cr.SetSourceColor (color);
+							var color = Styles.BlameView.AnnotationMarkColor;
+							color.Light = 0.4 + a / 2;
+							color.Saturation = 1 - a / 2;
+							cr.SetSourceColor (color.ToCairoColor ());
 						} else {
-							cr.SetSourceColor (ann != null ? new Cairo.Color (1, 1, 0) : new Cairo.Color (0.95, 0.95, 0.95));
+							cr.SetSourceColor ((ann != null ? Styles.BlameView.AnnotationMarkModifiedColor : Styles.BlameView.AnnotationBackgroundColor).ToCairoColor ());
 						}
 						cr.Fill ();
 
 						if (ann != null) {
 							cr.MoveTo (0, curY + 0.5);
 							cr.LineTo (Allocation.Width, curY + 0.5);
-							cr.SetSourceRGB (0.6, 0.6, 0.6);
+							cr.SetSourceColor (Styles.BlameView.AnnotationSplitterColor.ToCairoColor ());
 							cr.Stroke ();
 						}
 					}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs
index 94eb7a2fab..188d7864aa 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs
@@ -22,11 +22,6 @@ namespace MonoDevelop.VersionControl.Views
 		TreePath path;
 		int RightPadding = 4;
 		
-//		Gdk.Color baseAddColor = new Gdk.Color (133, 168, 133);
-//		Gdk.Color baseRemoveColor = new Gdk.Color (178, 140, 140);
-		Gdk.Color baseAddColor = new Gdk.Color (123, 200, 123).AddLight (0.1);
-		Gdk.Color baseRemoveColor = new Gdk.Color (200, 140, 140).AddLight (0.1);
-		
 		int RoundedSectionRadius = 4;
 		int LeftPaddingBlock = 19;
 		
@@ -143,10 +138,10 @@ namespace MonoDevelop.VersionControl.Views
 				Gdk.GC normalGC = widget.Style.TextGC (StateType.Normal);
 				Gdk.GC removedGC = new Gdk.GC (window);
 				removedGC.Copy (normalGC);
-				removedGC.RgbFgColor = baseRemoveColor.AddLight (-0.3);
+				removedGC.RgbFgColor = Styles.LogView.DiffRemoveBackgroundColor.AddLight (-0.3).ToGdkColor ();
 				Gdk.GC addedGC = new Gdk.GC (window);
 				addedGC.Copy (normalGC);
-				addedGC.RgbFgColor = baseAddColor.AddLight (-0.3);
+				addedGC.RgbFgColor = Styles.LogView.DiffAddBackgroundColor.AddLight (-0.3).ToGdkColor ();
 				Gdk.GC infoGC = new Gdk.GC (window);
 				infoGC.Copy (normalGC);
 				infoGC.RgbFgColor = widget.Style.Text (StateType.Normal).AddLight (0.2);
@@ -266,11 +261,11 @@ namespace MonoDevelop.VersionControl.Views
 						double xrow = cell_area.X + LeftPaddingBlock;
 						int wrow = cell_area.Width - 1 - LeftPaddingBlock;
 						if (block.Type == BlockType.Added)
-							ctx.SetSourceColor (baseAddColor.AddLight (0.1).ToCairoColor ());
+							ctx.SetSourceColor (Styles.LogView.DiffAddBackgroundColor.AddLight (0.1).ToCairoColor ());
 						else if (block.Type == BlockType.Removed)
-							ctx.SetSourceColor (baseRemoveColor.AddLight (0.1).ToCairoColor ());
+							ctx.SetSourceColor (Styles.LogView.DiffRemoveBackgroundColor.AddLight (0.1).ToCairoColor ());
 						else {
-							ctx.SetSourceColor (widget.Style.Base (Gtk.StateType.Prelight).AddLight (0.1).ToCairoColor ());
+							ctx.SetSourceColor (Styles.LogView.DiffHighlightColor.ToCairoColor ());
 							xrow -= LeftPaddingBlock;
 							wrow += LeftPaddingBlock;
 						}
@@ -298,7 +293,7 @@ namespace MonoDevelop.VersionControl.Views
 					
 					// Finally draw the change symbol at the left margin
 					
-					DrawChangeSymbol (ctx, cell_area.X + 1, cell_area.Width - 2, block);
+					DrawChangeSymbol (ctx, widget, cell_area.X + 1, cell_area.Width - 2, block);
 				}
 				
 				// Finish the drawing of the code segment
@@ -353,16 +348,16 @@ namespace MonoDevelop.VersionControl.Views
 			int bottomSpacing = (lineHeight - spacing) / 2;
 			
 			ctx.Rectangle (x + shadowSize + 0.5, firstBlock.YStart + bottomSpacing + spacing - shadowSize + 0.5, width - shadowSize*2, shadowSize);
-			ctx.SetSourceRGB (0.9, 0.9, 0.9);
+			ctx.SetSourceColor (Styles.LogView.DiffBoxSplitterColor.ToCairoColor ());
 			ctx.LineWidth = 1;
 			ctx.Fill ();
 			
 			ctx.Rectangle (x + shadowSize + 0.5, lastBlock.YEnd + bottomSpacing + 0.5, width - shadowSize*2, shadowSize);
-			ctx.SetSourceRGB (0.9, 0.9, 0.9);
+			ctx.SetSourceColor (Styles.LogView.DiffBoxSplitterColor.ToCairoColor ());
 			ctx.Fill ();
 			
 			ctx.Rectangle (x + 0.5, firstBlock.YStart + bottomSpacing + spacing + 0.5, width, lastBlock.YEnd - firstBlock.YStart - spacing);
-			ctx.SetSourceRGB (0.7,0.7,0.7);
+			ctx.SetSourceColor (Styles.LogView.DiffBoxBorderColor.ToCairoColor ());
 			ctx.Stroke ();
 			
 			string text = lines[firstBlock.FirstLine].Replace ("@","").Replace ("-","");
@@ -380,7 +375,7 @@ namespace MonoDevelop.VersionControl.Views
 			ctx.LineWidth = 1;
 			ctx.SetSourceColor (widget.Style.Base (StateType.Normal).ToCairoColor ());
 			ctx.FillPreserve ();
-			ctx.SetSourceRGB (0.7, 0.7, 0.7);
+			ctx.SetSourceColor (Styles.LogView.DiffBoxBorderColor.ToCairoColor ());
 			ctx.Stroke ();
 				
 			window.DrawLayout (gc, (int)(x + 2 + LeftPaddingBlock), firstBlock.YStart + dy, layout);
@@ -400,7 +395,7 @@ namespace MonoDevelop.VersionControl.Views
 			ctx.LineWidth = 1;
 			ctx.SetSourceColor (widget.Style.Base (Gtk.StateType.Normal).ToCairoColor ());
 			ctx.FillPreserve ();
-			ctx.SetSourceRGB (0.7, 0.7, 0.7);
+			ctx.SetSourceColor (Styles.LogView.DiffBoxBorderColor.ToCairoColor ());
 			ctx.Stroke ();
 
 			window.DrawLayout (gc, right - tw - 1, top + dy, layout);
@@ -411,7 +406,7 @@ namespace MonoDevelop.VersionControl.Views
 			if (!IsChangeBlock (block.Type))
 				return;
 			
-			Gdk.Color color = block.Type == BlockType.Added ? baseAddColor : baseRemoveColor;
+			var color = block.Type == BlockType.Added ? Styles.LogView.DiffAddBackgroundColor : Styles.LogView.DiffRemoveBackgroundColor;
 			double y = block.YStart;
 			int height = block.YEnd - block.YStart;
 			
@@ -441,6 +436,8 @@ namespace MonoDevelop.VersionControl.Views
 			ctx.Fill ();
 			
 			ctx.Rectangle (markerx, y, width - markerx, height);
+
+			// FIXME: VV: Remove gradient features
 			using (Cairo.Gradient pat = new Cairo.LinearGradient (x, y, x + width, y)) {
 				pat.AddColorStop (0, color.AddLight (0.21).ToCairoColor ());
 				pat.AddColorStop (1, color.AddLight (0.3).ToCairoColor ());
@@ -448,55 +445,24 @@ namespace MonoDevelop.VersionControl.Views
 				ctx.Fill ();
 			}
 		}
+
+		static Xwt.Drawing.Image gutterAdded = Xwt.Drawing.Image.FromResource ("gutter-added-15.png");
+		static Xwt.Drawing.Image gutterRemoved = Xwt.Drawing.Image.FromResource ("gutter-removed-15.png");
 		
-		void DrawChangeSymbol (Cairo.Context ctx, double x, int width, BlockInfo block)
+		void DrawChangeSymbol (Cairo.Context ctx, Widget widget, double x, int width, BlockInfo block)
 		{
 			if (!IsChangeBlock (block.Type))
 				return;
-			
-			Gdk.Color color = block.Type == BlockType.Added ? baseAddColor : baseRemoveColor;
-
-			int ssize = 8;
-			int barSize = 3;
-			
-			if (ssize - 2 > lineHeight)
-				ssize = lineHeight - 2;
-			if (ssize <= 0)
-				return;
 
-			double inSize = (ssize / 2) - (barSize / 2);
-			double py = block.YStart + ((block.YEnd - block.YStart) / 2 - ssize / 2) + 0.5;
-			double px = x + (LeftPaddingBlock/2) - (ssize / 2) + 0.5;
-			
 			if (block.Type == BlockType.Added) {
-				ctx.MoveTo (px + inSize, py);
-				ctx.RelLineTo (barSize, 0);
-				ctx.RelLineTo (0, inSize);
-				ctx.RelLineTo (inSize, 0);
-				ctx.RelLineTo (0, barSize);
-				ctx.RelLineTo (-inSize, 0);
-				ctx.RelLineTo (0, inSize);
-				ctx.RelLineTo (-barSize, 0);
-				ctx.RelLineTo (0, -inSize);
-				ctx.RelLineTo (-inSize, 0);
-				ctx.RelLineTo (0, -barSize);
-				ctx.RelLineTo (inSize, 0);
-				ctx.RelLineTo (0, -inSize);
-				ctx.ClosePath ();
+				var ix = x + (LeftPaddingBlock/2) - (gutterAdded.Width / 2);
+				var iy = block.YStart + ((block.YEnd - block.YStart) / 2 - gutterAdded.Height / 2);
+				ctx.DrawImage (widget, gutterAdded, ix, iy);
 			} else {
-				ctx.MoveTo (px, py + inSize);
-				ctx.RelLineTo (ssize, 0);
-				ctx.RelLineTo (0, barSize);
-				ctx.RelLineTo (-ssize, 0);
-				ctx.RelLineTo (0, -barSize);
-				ctx.ClosePath ();
+				var ix = x + (LeftPaddingBlock/2) - (gutterRemoved.Width / 2);
+				var iy = block.YStart + ((block.YEnd - block.YStart) / 2 - gutterRemoved.Height / 2);
+				ctx.DrawImage (widget, gutterRemoved, ix, iy);
 			}
-			
-			ctx.SetSourceColor (color.ToCairoColor ());
-			ctx.FillPreserve ();
-			ctx.SetSourceColor (color.AddLight (-0.2).ToCairoColor ());
-			ctx.LineWidth = 1;
-			ctx.Stroke ();
 		}
 		
 		public override void GetSize (Widget widget, ref Rectangle cell_area, out int x_offset, out int y_offset, out int c_width, out int c_height)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
index 5d49bde9a0..a4177e851d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
@@ -8,6 +8,7 @@ using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
 using MonoDevelop.Components;
+using System.Linq;
 
 namespace MonoDevelop.VersionControl.Views
 {
@@ -300,13 +301,16 @@ namespace MonoDevelop.VersionControl.Views
 					if (line == -1)
 						line = 1;
 				}
-				IdeApp.Workbench.OpenDocument (files [0], line, 0);
+				var proj = IdeApp.Workspace.GetProjectsContainingFile (files [0]).FirstOrDefault ();
+				IdeApp.Workbench.OpenDocument (files [0], proj, line, 0);
 			}
 			else {
 				AlertButton openAll = new AlertButton (GettextCatalog.GetString ("_Open All")); 
 				if (MessageService.AskQuestion (GettextCatalog.GetString ("Do you want to open all {0} files?", files.Length), AlertButton.Cancel, openAll) == openAll) {
-					for (int n=0; n<files.Length; n++)
-						IdeApp.Workbench.OpenDocument (files[n], n==0);
+					for (int n=0; n<files.Length; n++) {
+						var proj = IdeApp.Workspace.GetProjectsContainingFile (files [n]).FirstOrDefault ();
+						IdeApp.Workbench.OpenDocument (files [n], proj, n == 0);
+					}
 				}
 			}
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs
new file mode 100644
index 0000000000..822dc26a77
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs
@@ -0,0 +1,383 @@
+
+// 
+// ComparisonWidget.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@novell.com>
+// 
+// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using Gtk;
+using Gdk;
+using System.Collections.Generic;
+using Mono.TextEditor;
+using MonoDevelop.Ide;
+using MonoDevelop.Components;
+using System.ComponentModel;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Ide.Fonts;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.VersionControl.Views
+{
+	// Code snatched from SourceEditor
+	class CommonTextEditorOptions : TextEditorOptions, Mono.TextEditor.ITextEditorOptions
+	{
+		static CommonTextEditorOptions instance;
+		//static TextStylePolicy defaultPolicy;
+		static bool inited;
+
+		public static CommonTextEditorOptions Instance {
+			get { return instance; }
+		}
+
+		static CommonTextEditorOptions ()
+		{
+			Init ();
+		}
+
+		public static void Init ()
+		{
+			if (inited)
+				return;
+			inited = true;
+
+			TextStylePolicy policy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
+			instance = new CommonTextEditorOptions (policy);
+			MonoDevelop.Projects.Policies.PolicyService.DefaultPolicies.PolicyChanged += instance.HandlePolicyChanged;
+		}
+
+		void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
+		{
+			TextStylePolicy pol = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> ("text/plain");
+			UpdateStylePolicy (pol);
+		}
+
+		CommonTextEditorOptions (MonoDevelop.Ide.Gui.Content.TextStylePolicy currentPolicy)
+		{
+			UpdateStylePolicy (currentPolicy);
+			MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.Changed += delegate(object sender, EventArgs e) {
+				OnChanged (e);
+			};
+		}
+
+		public override void Dispose()
+		{
+			FontService.RemoveCallback (UpdateFont);
+		}
+
+		void UpdateFont ()
+		{
+			base.FontName = FontName;
+			base.GutterFontName = GutterFontName;
+			this.OnChanged (EventArgs.Empty);
+
+		}
+
+		void UpdateStylePolicy (MonoDevelop.Ide.Gui.Content.TextStylePolicy currentPolicy)
+		{
+			this.defaultEolMarker = TextStylePolicy.GetEolMarker (currentPolicy.EolMarker);
+			base.TabsToSpaces          = currentPolicy.TabsToSpaces; // PropertyService.Get ("TabsToSpaces", false);
+			base.IndentationSize       = currentPolicy.TabWidth; //PropertyService.Get ("TabIndent", 4);
+			base.RulerColumn           = currentPolicy.FileWidth; //PropertyService.Get ("RulerColumn", 80);
+			base.AllowTabsAfterNonTabs = !currentPolicy.NoTabsAfterNonTabs; //PropertyService.Get ("AllowTabsAfterNonTabs", true);
+			base.RemoveTrailingWhitespaces = currentPolicy.RemoveTrailingWhitespace; //PropertyService.Get ("RemoveTrailingWhitespaces", true);
+		}
+
+		#region new options
+
+		public bool EnableAutoCodeCompletion {
+			get { return IdeApp.Preferences.EnableAutoCodeCompletion; }
+			set { IdeApp.Preferences.EnableAutoCodeCompletion.Set (value); }
+		}
+
+		public bool DefaultRegionsFolding {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.DefaultRegionsFolding;
+			}
+			set {
+			}
+		}
+
+		public bool DefaultCommentFolding {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.DefaultCommentFolding;
+			}
+			set {
+			}
+		}
+
+		public bool EnableSemanticHighlighting {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableSemanticHighlighting;
+			}
+			set {
+			}
+		}
+
+		public bool TabIsReindent {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.TabIsReindent;
+			}
+			set {
+			}
+		}
+
+		public bool AutoInsertMatchingBracket {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.AutoInsertMatchingBracket;
+			}
+			set {
+			}
+		}
+
+		public bool SmartSemicolonPlacement {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.SmartSemicolonPlacement;
+			}
+			set {
+			}
+		}
+
+		public bool UnderlineErrors {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.UnderlineErrors; 
+			}
+			set {
+			}
+		}
+
+		public override IndentStyle IndentStyle {
+			get {
+				return (IndentStyle)MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.IndentStyle;
+			}
+			set {
+			}
+		}
+
+		public bool EnableHighlightUsages {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableHighlightUsages;
+			}
+			set {
+			}
+		}
+
+		public MonoDevelop.Ide.Editor.LineEndingConversion LineEndingConversion {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.LineEndingConversion;
+			}
+			set {
+			}
+		}
+
+
+		#endregion
+
+		public bool OnTheFlyFormatting {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.OnTheFlyFormatting;
+			}
+			set {
+			}
+		}
+
+		#region old options
+		string defaultEolMarker;
+		public override string DefaultEolMarker {
+			get { return defaultEolMarker; }
+		}
+
+		public MonoDevelop.Ide.Editor.WordNavigationStyle WordNavigationStyle {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.WordNavigationStyle;
+			}
+			set {
+			}
+		}
+
+		IWordFindStrategy wordFindStrategy = null;
+		public override IWordFindStrategy WordFindStrategy {
+			get {
+				if (wordFindStrategy == null)
+					SetWordFindStrategy ();
+				return this.wordFindStrategy;
+			}
+			set {
+				throw new System.NotImplementedException ();
+			}
+		}
+
+		void SetWordFindStrategy ()
+		{
+			switch (WordNavigationStyle) {
+			case MonoDevelop.Ide.Editor.WordNavigationStyle.Unix:
+				this.wordFindStrategy = new EmacsWordFindStrategy (true);
+				break;
+			case MonoDevelop.Ide.Editor.WordNavigationStyle.Windows:
+				this.wordFindStrategy = new SharpDevelopWordFindStrategy ();
+				break;
+			}
+		}
+
+		public override bool ShowLineNumberMargin {
+			get {
+				return true;
+			}
+			set {
+			}
+		}
+
+		public override bool ShowFoldMargin {
+			get {
+				return false;
+			}
+			set {
+			}
+		}
+
+		public override bool HighlightCaretLine {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.HighlightCaretLine;
+			}
+			set {
+			}
+		}
+
+		public override bool EnableSyntaxHighlighting {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableSyntaxHighlighting;
+			}
+			set {
+			}
+		}
+
+		public override bool HighlightMatchingBracket {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.HighlightMatchingBracket;
+			}
+			set {
+			}
+		}
+
+		public override bool ShowRuler {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.ShowRuler;
+			}
+			set {
+			}
+		}
+
+		public override bool EnableAnimations {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableAnimations;
+			}
+			set {
+			}
+		}
+
+		public override bool DrawIndentationMarkers {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.DrawIndentationMarkers;
+			}
+			set {
+			}
+		}
+
+		ConfigurationProperty<ShowWhitespaces> showWhitespaces = ConfigurationProperty.Create ("ShowWhitespaces", ShowWhitespaces.Never);
+		public override ShowWhitespaces ShowWhitespaces {
+			get {
+				return showWhitespaces;
+			}
+			set {
+				if (showWhitespaces.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		ConfigurationProperty<IncludeWhitespaces> includeWhitespaces = ConfigurationProperty.Create ("IncludeWhitespaces", IncludeWhitespaces.All);
+		public override IncludeWhitespaces IncludeWhitespaces {
+			get {
+				return includeWhitespaces;
+			}
+			set {
+				if (includeWhitespaces.Set (value))
+					OnChanged (EventArgs.Empty);
+			}
+		}
+
+		public override bool WrapLines {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.WrapLines;
+			}
+			set {
+			}
+		}
+
+		public override bool EnableQuickDiff {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.EnableQuickDiff;
+			}
+			set {
+			}
+		}
+
+		public override string FontName {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.FontName;
+			}
+			set {
+				throw new InvalidOperationException ("Set font through font service");
+			}
+		}
+
+		public override string GutterFontName {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.GutterFontName;
+			}
+			set {
+				throw new InvalidOperationException ("Set font through font service");
+			}
+		}
+
+		public override string ColorScheme {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.ColorScheme;
+			}
+			set {
+			}
+		}
+
+		public override bool GenerateFormattingUndoStep {
+			get {
+				return MonoDevelop.Ide.Editor.DefaultSourceEditorOptions.Instance.GenerateFormattingUndoStep;
+			}
+			set {
+			}
+		}
+
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
index 6ceebf533d..10eaf89c6a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
@@ -43,19 +43,19 @@ namespace MonoDevelop.VersionControl.Views
 	{
 		internal DropDownBox originalComboBox, diffComboBox;
 		
-		public TextEditor OriginalEditor {
+		public MonoTextEditor OriginalEditor {
 			get {
 				return editors[1];
 			}
 		}
 
-		public TextEditor DiffEditor {
+		public MonoTextEditor DiffEditor {
 			get {
 				return editors[0];
 			}
 		}
 
-		protected override TextEditor MainEditor {
+		protected internal override MonoTextEditor MainEditor {
 			get {
 				return editors[1];
 			}
@@ -69,25 +69,47 @@ namespace MonoDevelop.VersionControl.Views
 		protected override void CreateComponents ()
 		{
 			this.editors = new [] {
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
 			};
 
 			if (!viewOnly) {
 				originalComboBox = new DropDownBox ();
 				originalComboBox.WindowRequestFunc = CreateComboBoxSelector;
-				originalComboBox.Text = "Local";
+				originalComboBox.Text = GettextCatalog.GetString ("Loading…");
+				originalComboBox.Sensitive = false;
 				originalComboBox.Tag = editors[1];
 			
 				diffComboBox = new DropDownBox ();
 				diffComboBox.WindowRequestFunc = CreateComboBoxSelector;
-				diffComboBox.Text = "Base";
+				diffComboBox.Text = GettextCatalog.GetString ("Loading…");
+				diffComboBox.Sensitive = false;
 				diffComboBox.Tag = editors[0];
 			
 				this.headerWidgets = new [] { diffComboBox, originalComboBox };
 			}
 		}
-		
+
+		protected override void OnSetVersionControlInfo (VersionControlDocumentInfo info)
+		{
+			info.Updated += OnInfoUpdated;
+			MainEditor.Document.ReadOnly = false;
+			base.OnSetVersionControlInfo (info);
+		}
+
+		void OnInfoUpdated (object sender, EventArgs args)
+		{
+			originalComboBox.Text = GettextCatalog.GetString ("Local");
+			diffComboBox.Text = GettextCatalog.GetString ("Base");
+			originalComboBox.Sensitive = diffComboBox.Sensitive = true;
+		}
+
+		protected override void OnDestroyed ()
+		{
+			info.Updated -= OnInfoUpdated;
+			base.OnDestroyed ();
+		}
+
 		public ComparisonWidget ()
 		{
 		}
@@ -143,19 +165,19 @@ namespace MonoDevelop.VersionControl.Views
 		
 		public override void CreateDiff () 
 		{
-			Diff = new List<Mono.TextEditor.Utils.Hunk> (DiffEditor.Document.Diff (OriginalEditor.Document));
+			Diff = new List<Mono.TextEditor.Utils.Hunk> (DiffEditor.Document.Diff (OriginalEditor.Document, includeEol: false));
 			ClearDiffCache ();
 			QueueDraw ();
 		}
 		
-		public void SetRevision (TextEditor toEditor, Revision rev)
+		public void SetRevision (MonoTextEditor toEditor, Revision rev)
 		{
 			BackgroundWorker worker = new BackgroundWorker ();
 			worker.DoWork += delegate(object sender, DoWorkEventArgs e) {
 				Revision workingRevision = (Revision)e.Argument;
 				string text = null;
 				try {
-					text = info.Item.Repository.GetTextAtRevision (info.VersionInfo.LocalPath, workingRevision);
+					text = info.Item.Repository.GetTextAtRevision (info.Item.VersionInfo.LocalPath, workingRevision);
 				} catch (Exception ex) {
 					text = string.Format (GettextCatalog.GetString ("Error while getting the text of revision {0}:\n{1}"), workingRevision, ex.ToString ());
 					MessageService.ShowError (text);
@@ -214,9 +236,9 @@ namespace MonoDevelop.VersionControl.Views
 			public string GetMarkup (int n)
 			{
 				if (n == 0)
-					return "Local";
+					return GettextCatalog.GetString ("Local");
 				if (n == 1)
-					return "Base";
+					return GettextCatalog.GetString ("Base");
 				Revision rev = widget.info.History[n - 2];
 				return GLib.Markup.EscapeText (string.Format ("{0}\t{1}\t{2}", rev, rev.Time, rev.Author));
 			}
@@ -236,15 +258,15 @@ namespace MonoDevelop.VersionControl.Views
 			public void ActivateItem (int n)
 			{
 				if (n == 0) {
-					box.SetItem ("Local", null, new object());
-					widget.SetLocal (((TextEditor)box.Tag).GetTextEditorData ());
+					box.SetItem (GettextCatalog.GetString ("Local"), null, new object());
+					widget.SetLocal (((MonoTextEditor)box.Tag).GetTextEditorData ());
 					return;
 				}
-				widget.RemoveLocal (((TextEditor)box.Tag).GetTextEditorData ());
-				((TextEditor)box.Tag).Document.ReadOnly = true;
+				widget.RemoveLocal (((MonoTextEditor)box.Tag).GetTextEditorData ());
+				((MonoTextEditor)box.Tag).Document.ReadOnly = true;
 				if (n == 1) {
-					box.SetItem ("Base", null, new object());
-					if (((TextEditor)box.Tag) == widget.editors[0]) {
+					box.SetItem (GettextCatalog.GetString ("Base"), null, new object());
+					if (((MonoTextEditor)box.Tag) == widget.editors[0]) {
 						widget.diffRevision = null;
 					} else {
 						widget.originalRevision = null;
@@ -257,13 +279,13 @@ namespace MonoDevelop.VersionControl.Views
 						MessageService.ShowError (text);
 					}
 					
-					((TextEditor)box.Tag).Document.Text = text;
+					((MonoTextEditor)box.Tag).Document.Text = text;
 					widget.CreateDiff ();
 					return;
 				}
 				
 				Revision rev = widget.info.History[n - 2];
-				widget.SetRevision ((TextEditor)box.Tag, rev);
+				widget.SetRevision ((MonoTextEditor)box.Tag, rev);
 			}
 
 			public int IconCount {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
index 9d92426ff6..715d6f4e26 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
@@ -32,6 +32,7 @@ using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using MonoDevelop.Projects;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.VersionControl.Views
 {
@@ -50,16 +51,16 @@ namespace MonoDevelop.VersionControl.Views
 		static Regex eolExpression = new Regex (@"(?<eol>\r\n|\n|\r)", RegexOptions.Compiled);
 		
 		#region AbstractParser overrides
-		
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader textReader, Project project = null)
+
+		public override System.Threading.Tasks.Task<ParsedDocument> Parse (ParseOptions parseOptions, System.Threading.CancellationToken cancellationToken)
 		{
-			var doc = new DefaultParsedDocument (fileName);
+			ParsedDocument doc = new DefaultParsedDocument (parseOptions.FileName);
 			
 			DefaultUnresolvedTypeDefinition currentFile = null;
 			DefaultUnresolvedProperty currentRegion = null;
 			
 			string eol = Environment.NewLine;
-			string content = textReader.ReadToEnd ();
+			string content = parseOptions.Content.Text;
 			Match eolMatch = eolExpression.Match (content);
 			if (eolMatch != null && eolMatch.Success)
 				eol = eolMatch.Groups ["eol"].Value;
@@ -82,7 +83,7 @@ namespace MonoDevelop.VersionControl.Views
 					// Create new file region
 					currentFile = new DefaultUnresolvedTypeDefinition (string.Empty, string.Empty);
 					currentFile.Region = currentFile.BodyRegion = new DomRegion (lastToken (lineMatch.Groups ["filepath"].Value), linenum, line.Length + 1, linenum, int.MaxValue);
-					doc.TopLevelTypeDefinitions.Add (currentFile);
+					// doc.TopLevelTypeDefinitions.Add (currentFile);
 				} else {
 					lineMatch = chunkExpression.Match (line);
 					if (lineMatch != null && lineMatch.Success && currentFile != null) {
@@ -110,7 +111,7 @@ namespace MonoDevelop.VersionControl.Views
 				                                          currentRegion.BodyRegion.BeginColumn, 
 				                                          Math.Max (1, linenum - 2), int.MaxValue);
 			
-			return doc;
+			return System.Threading.Tasks.Task.FromResult (doc);
 		}
 		
 		#endregion
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
index 4d3521553b..2b79bee464 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
@@ -26,12 +26,13 @@
 using System;
 using MonoDevelop.Ide.Gui;
 using System.Collections.Generic;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui.Content;
 
 namespace MonoDevelop.VersionControl.Views
 {
-	public interface IDiffView : IAttachableViewContent
+	public interface IDiffView
 	{
 	}
 	
@@ -39,7 +40,7 @@ namespace MonoDevelop.VersionControl.Views
 	{
 		DiffWidget widget;
 
-		public override Gtk.Widget Control { 
+		public override Control Control { 
 			get {
 				if (widget == null) {
 					widget = new DiffWidget (info);
@@ -83,21 +84,22 @@ namespace MonoDevelop.VersionControl.Views
 		
 		#region IAttachableViewContent implementation
 
-		public int GetLineInCenter (Mono.TextEditor.TextEditor editor)
+		public int GetLineInCenter (Mono.TextEditor.MonoTextEditor editor)
 		{
 			double midY = editor.VAdjustment.Value + editor.Allocation.Height / 2;
 			return editor.YToLine (midY);
 		}
 		
-		public void Selected ()
+		protected override void OnSelected ()
 		{
 			info.Start ();
 			ComparisonWidget.UpdateLocalText ();
-			var buffer = info.Document.GetContent<ITextBuffer> ();
+			var buffer = info.Document.GetContent<MonoDevelop.Ide.Editor.TextEditor> ();
 			if (buffer != null) {
-				int line, col;
-				buffer.GetLineColumnFromPosition (buffer.CursorPosition, out line, out col);
-				ComparisonWidget.OriginalEditor.SetCaretTo (line, col);
+				var loc = buffer.CaretLocation;
+				int line = loc.Line < 1 ? 1 : loc.Line;
+				int column = loc.Column < 1 ? 1 : loc.Column;
+				ComparisonWidget.OriginalEditor.SetCaretTo (line, column);
 			}
 			
 			if (ComparisonWidget.Allocation.Height == 1 && ComparisonWidget.Allocation.Width == 1) {
@@ -120,7 +122,7 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 		
-		public void Deselected ()
+		protected override void OnDeselected ()
 		{
 			var sourceEditor = info.Document.GetContent <MonoDevelop.SourceEditor.SourceEditorView> ();
 			if (sourceEditor != null) {
@@ -132,14 +134,6 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 
-		public void BeforeSave ()
-		{
-		}
-
-		public void BaseContentChanged ()
-		{
-		}
-		
 		#endregion
 		
 		#region IUndoHandler implementation
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs
index fc7089a08b..d90c3c3a45 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using System.Linq;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Gui;
 
@@ -33,10 +34,10 @@ namespace MonoDevelop.VersionControl.Views
 	public partial class DiffWidget : Gtk.Bin
 	{
 		VersionControlDocumentInfo info;
-		Mono.TextEditor.TextEditor diffTextEditor;
+		Mono.TextEditor.MonoTextEditor diffTextEditor;
 		ComparisonWidget comparisonWidget;
-		Gtk.Button buttonNext;
-		Gtk.Button buttonPrev;
+		DocumentToolButton buttonNext;
+		DocumentToolButton buttonPrev;
 		Gtk.Button buttonDiff;
 		Gtk.Label labelOverview;
 
@@ -48,7 +49,7 @@ namespace MonoDevelop.VersionControl.Views
 		
 		string LabelText {
 			get {
-				if (comparisonWidget.Diff.Count == 0)
+				if (!comparisonWidget.Diff.Any ())
 					return GettextCatalog.GetString ("Both files are equal");
 				int added=0, removed=0;
 				foreach (var h in comparisonWidget.Diff) {
@@ -63,7 +64,7 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 		
-		public Mono.TextEditor.TextEditor FocusedEditor {
+		public Mono.TextEditor.MonoTextEditor FocusedEditor {
 			get {
 				return comparisonWidget.FocusedEditor;
 			}
@@ -91,7 +92,7 @@ namespace MonoDevelop.VersionControl.Views
 			};
 			comparisonWidget.SetVersionControlInfo (info);
 			this.buttonDiff.Clicked += HandleButtonDiffhandleClicked;
-			diffTextEditor = new global::Mono.TextEditor.TextEditor (new Mono.TextEditor.TextDocument (), new CommonTextEditorOptions ());
+			diffTextEditor = new global::Mono.TextEditor.MonoTextEditor (new Mono.TextEditor.TextDocument (), CommonTextEditorOptions.Instance);
 			diffTextEditor.Document.MimeType = "text/x-diff";
 			
 			diffTextEditor.Options.ShowFoldMargin = false;
@@ -114,7 +115,8 @@ namespace MonoDevelop.VersionControl.Views
 		
 		void SetButtonSensitivity ()
 		{
-			this.buttonNext.Sensitive = this.buttonPrev.Sensitive = notebook1.Page == 0 &&  comparisonWidget.Diff != null && comparisonWidget.Diff.Count > 0;
+			this.buttonNext.GetNativeWidget<Gtk.Widget> ().Sensitive = this.buttonPrev.GetNativeWidget<Gtk.Widget> ().Sensitive =
+				notebook1.Page == 0 &&  comparisonWidget.Diff != null && comparisonWidget.Diff.Count > 0;
 		}
 		
 		void HandleButtonDiffhandleClicked (object sender, EventArgs e)
@@ -143,7 +145,7 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 		
-		static string GetRevisionText (Mono.TextEditor.TextEditor editor, Revision rev)
+		static string GetRevisionText (Mono.TextEditor.MonoTextEditor editor, Revision rev)
 		{
 			if (!editor.Document.ReadOnly)
 				return GettextCatalog.GetString ("(working copy)");
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 066ad679b2..17cfb0693e 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
@@ -29,6 +29,7 @@ using System.ComponentModel;
 using MonoDevelop.Ide;
 using Gtk;
 using Mono.TextEditor;
+using MonoDevelop.Components;
 
 namespace MonoDevelop.VersionControl.Views
 {
@@ -86,8 +87,8 @@ namespace MonoDevelop.VersionControl.Views
 			set;
 		}
 		
-		Window window = null;
-		public Func<DropDownBox, Window> WindowRequestFunc = null;
+		Gtk.Window window = null;
+		public Func<DropDownBox, Gtk.Window> WindowRequestFunc = null;
 		
 		
 		public DropDownBox ()
@@ -109,12 +110,12 @@ namespace MonoDevelop.VersionControl.Views
 			window.WidthRequest = Allocation.Width;
 			int width, height;
 			window.GetSizeRequest (out width, out height);
-			Gdk.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen, Screen.GetMonitorAtPoint (dx, dy));
+			Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (dx, dy));
 			
 			if (dy + height > geometry.Bottom)
 				dy = oy + this.Allocation.Y - height;
 			if (dx + width > geometry.Right)
-				dx = geometry.Right - width;
+				dx = (int)geometry.Right - width;
 			
 			window.Move (dx, dy);
 			window.GetSizeRequest (out width, out 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 ea883f870e..552708b2d4 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
@@ -34,6 +34,7 @@ using Mono.TextEditor;
 using Mono.TextEditor.Utils;
 using MonoDevelop.Ide;
 using MonoDevelop.Core;
+using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Projects.Text;
 
@@ -54,7 +55,7 @@ namespace MonoDevelop.VersionControl.Views
 		DiffScrollbar rightDiffScrollBar, leftDiffScrollBar;
 		MiddleArea[] middleAreas;
 
-		protected TextEditor[] editors;
+		protected MonoTextEditor[] editors;
 		protected Widget[] headerWidgets;
 
 		
@@ -75,23 +76,14 @@ namespace MonoDevelop.VersionControl.Views
 				OnDiffChanged (EventArgs.Empty);
 			}
 		}
-
-		static readonly Cairo.Color lightRed = new Cairo.Color (255 / 255.0, 200 / 255.0, 200 / 255.0);
-		static readonly Cairo.Color darkRed = new Cairo.Color (178 / 255.0, 140 / 255.0, 140 / 255.0);
-		
-		static readonly Cairo.Color lightGreen = new Cairo.Color (190 / 255.0, 240 / 255.0, 190 / 255.0);
-		static readonly Cairo.Color darkGreen = new Cairo.Color (133 / 255.0, 168 / 255.0, 133 / 255.0);
-		
-		static readonly Cairo.Color lightBlue = new Cairo.Color (190 / 255.0, 190 / 255.0, 240 / 255.0);
-		static readonly Cairo.Color darkBlue = new Cairo.Color (133 / 255.0, 133 / 255.0, 168 / 255.0);
 		
-		protected abstract TextEditor MainEditor {
+		protected internal abstract MonoTextEditor MainEditor {
 			get;
 		}
 		
-		public TextEditor FocusedEditor {
+		public MonoTextEditor FocusedEditor {
 			get {
-				foreach (TextEditor editor in editors) {
+				foreach (MonoTextEditor editor in editors) {
 					
 					if (editor.HasFocus)
 						return editor;
@@ -203,7 +195,7 @@ namespace MonoDevelop.VersionControl.Views
 			this.MainEditor.EditorOptionsChanged += HandleMainEditorhandleEditorOptionsChanged;
 		}
 		
-		void ShowPopup (TextEditor editor, EventButton evt)
+		void ShowPopup (MonoTextEditor editor, EventButton evt)
 		{
 			CommandEntrySet cset = IdeApp.CommandService.CreateCommandEntrySet ("/MonoDevelop/VersionControl/DiffView/ContextMenu");
 			Gtk.Menu menu = IdeApp.CommandService.CreateMenu (cset);
@@ -249,11 +241,17 @@ namespace MonoDevelop.VersionControl.Views
 				editor.Options.ShowIconMargin = false;
 				editor.Options.DrawIndentationMarkers = PropertyService.Get ("DrawIndentationMarkers", false);
 			}
+
+			OnSetVersionControlInfo (info);
+		}
+
+		protected virtual void OnSetVersionControlInfo (VersionControlDocumentInfo info)
+		{
 		}
 		
 		protected abstract void CreateComponents ();
 		
-		public static ICollection<Cairo.Rectangle> GetDiffRectangles (TextEditor editor, int startOffset, int endOffset)
+		public static ICollection<Cairo.Rectangle> GetDiffRectangles (MonoTextEditor editor, int startOffset, int endOffset)
 		{
 			ICollection<Cairo.Rectangle> rectangles = new List<Cairo.Rectangle> ();
 			var startLine = editor.GetLineByOffset (startOffset);
@@ -276,12 +274,12 @@ namespace MonoDevelop.VersionControl.Views
 			diffCache.Clear ();
 		}
 		
-		static List<TextSegment> BreakTextInWords (TextEditor editor, int start, int count)
+		static List<TextSegment> BreakTextInWords (MonoTextEditor editor, int start, int count)
 		{
 			return TextBreaker.BreakLinesIntoWords(editor, start, count);
 		}
 		
-		static List<Cairo.Rectangle> CalculateChunkPath (TextEditor editor, List<Hunk> diff, List<TextSegment> words, bool useRemove)
+		static List<Cairo.Rectangle> CalculateChunkPath (MonoTextEditor editor, List<Hunk> diff, List<TextSegment> words, bool useRemove)
 		{
 			List<Cairo.Rectangle> result = new List<Cairo.Rectangle> ();
 			int startOffset = -1;
@@ -304,7 +302,7 @@ namespace MonoDevelop.VersionControl.Views
 			return result;
 		}
 		
-		Tuple<List<Cairo.Rectangle>, List<Cairo.Rectangle>> GetDiffPaths (List<Hunk> diff, TextEditor editor, Hunk hunk)
+		Tuple<List<Cairo.Rectangle>, List<Cairo.Rectangle>> GetDiffPaths (List<Hunk> diff, MonoTextEditor editor, Hunk hunk)
 		{
 			if (!diffCache.ContainsKey (diff))
 				diffCache[diff] = new Dictionary<Hunk, Tuple<List<Cairo.Rectangle>, List<Cairo.Rectangle>>> ();
@@ -375,7 +373,7 @@ namespace MonoDevelop.VersionControl.Views
 
 		internal static void EditorFocusIn (object sender, FocusInEventArgs args)
 		{
-			TextEditor editor = (TextEditor)sender;
+			MonoTextEditor editor = (MonoTextEditor)sender;
 			UpdateCaretPosition (editor.Caret);
 		}
 
@@ -521,26 +519,26 @@ namespace MonoDevelop.VersionControl.Views
 			children.ForEach (child => child.Child.SizeRequest ());
 		}
 
-		public static Cairo.Color GetColor (Hunk hunk, bool removeSide, bool dark, double alpha)
+		public static Cairo.Color GetColor (Hunk hunk, bool removeSide, bool border, double alpha)
 		{
-			Cairo.Color result;
+			Xwt.Drawing.Color result;
 			if (hunk.Removed > 0 && hunk.Inserted > 0) {
-				result = dark ? darkBlue : lightBlue;
+				result = border ? Styles.DiffView.MergeBackgroundColor : Styles.DiffView.MergeBorderColor;
 			} else if (removeSide) {
 				if (hunk.Removed > 0) {
-					result = dark ? darkRed : lightRed;
+					result = border ? Styles.DiffView.RemoveBackgroundColor : Styles.DiffView.RemoveBorderColor;
 				} else {
-					result = dark ? darkGreen : lightGreen;
+					result = border ? Styles.DiffView.AddBackgroundColor : Styles.DiffView.AddBorderColor;
 				}
 			} else {
 				if (hunk.Inserted > 0) {
-					result = dark ? darkGreen : lightGreen;
+					result = border ? Styles.DiffView.AddBackgroundColor : Styles.DiffView.AddBorderColor;
 				} else {
-					result = dark ? darkRed : lightRed;
+					result = border ? Styles.DiffView.RemoveBackgroundColor : Styles.DiffView.RemoveBorderColor;
 				}
 			}
-			result.A = alpha;
-			return result;
+			result.Alpha = alpha;
+			return result.ToCairoColor ();
 		}
 		
 		void PaintEditorOverlay (TextArea editor, PaintEventArgs args, List<Hunk> diff, bool paintRemoveSide)
@@ -611,10 +609,11 @@ namespace MonoDevelop.VersionControl.Views
 				throw new InvalidOperationException ("Version control info must be set before attaching the merge view to an editor.");
 			dict[data.Document] = data;
 			
-			var editor = info.Document.GetContent <ITextFile> ();
-			if (editor != null)
+			var editor = info.Document.ParentDocument.Editor;
+			if (editor != null) {
 				data.Document.Text = editor.Text;
-			data.Document.ReadOnly = info.Document.GetContent<IEditableTextFile> () == null;
+				data.Document.ReadOnly = editor.IsReadOnly;
+			}
 			
 			CreateDiff ();
 			data.Document.TextReplaced += HandleDataDocumentTextReplaced;
@@ -624,9 +623,8 @@ namespace MonoDevelop.VersionControl.Views
 		{
 			var data = dict [(TextDocument)sender];
 			localUpdate.Remove (data);
-			var editor = info.Document.GetContent<IEditableTextFile> ();
-			editor.DeleteText (e.Offset, e.RemovalLength);
-			editor.InsertText (e.Offset, e.InsertedText.Text);
+			var editor = info.Document.ParentDocument.Editor;
+			editor.ReplaceText (e.Offset, e.RemovalLength, e.InsertedText.Text);
 			localUpdate.Add (data);
 			UpdateDiff ();
 		}
@@ -637,7 +635,7 @@ namespace MonoDevelop.VersionControl.Views
 			data.Document.TextReplaced -= HandleDataDocumentTextReplaced;
 		}
 
-		protected virtual void UndoChange (TextEditor fromEditor, TextEditor toEditor, Hunk hunk)
+		protected virtual void UndoChange (MonoTextEditor fromEditor, MonoTextEditor toEditor, Hunk hunk)
 		{
 			using (var undo = toEditor.OpenUndoGroup ()) {
 				var start = toEditor.Document.GetLine (hunk.InsertStart);
@@ -668,7 +666,7 @@ namespace MonoDevelop.VersionControl.Views
 		class MiddleArea : DrawingArea
 		{
 			EditorCompareWidgetBase widget;
-			TextEditor fromEditor, toEditor;
+			MonoTextEditor fromEditor, toEditor;
 			bool useLeft;
 
 			IEnumerable<Hunk> Diff {
@@ -677,7 +675,7 @@ namespace MonoDevelop.VersionControl.Views
 				}
 			}
 
-			public MiddleArea (EditorCompareWidgetBase widget, TextEditor fromEditor, TextEditor toEditor, bool useLeft)
+			public MiddleArea (EditorCompareWidgetBase widget, MonoTextEditor fromEditor, MonoTextEditor toEditor, bool useLeft)
 			{
 				this.widget = widget;
 				this.Events |= EventMask.PointerMotionMask | EventMask.ButtonPressMask;
@@ -888,7 +886,7 @@ namespace MonoDevelop.VersionControl.Views
 								//	mx -= (int)x;
 								//	my -= (int)y;
 									using (var gradient = new Cairo.RadialGradient (mx, my, h, mx, my, 2)) {
-										var color = (HslColor)Style.Mid (StateType.Normal);
+										var color = (MonoDevelop.Components.HslColor)Style.Mid (StateType.Normal);
 										color.L *= 1.05;
 										gradient.AddColorStop (0, color);
 										color.L *= 1.07;
@@ -896,14 +894,14 @@ namespace MonoDevelop.VersionControl.Views
 										cr.SetSource (gradient);
 									}
 								} else {
-									cr.SetSourceColor ((HslColor)Style.Mid (StateType.Normal));
+									cr.SetSourceColor ((MonoDevelop.Components.HslColor)Style.Mid (StateType.Normal));
 								}
 								cr.FillPreserve ();
 								
-								cr.SetSourceColor ((HslColor)Style.Dark (StateType.Normal));
+								cr.SetSourceColor ((MonoDevelop.Components.HslColor)Style.Dark (StateType.Normal));
 								cr.Stroke ();
 								cr.LineWidth = 1;
-								cr.SetSourceRGB (0, 0, 0);
+								cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.BaseForegroundColor.ToCairoColor ());
 								if (drawArrow) {
 									DrawArrow (cr, x + w / 1.5, y + h / 2);
 									DrawArrow (cr, x + w / 2.5, y + h / 2);
@@ -930,13 +928,13 @@ namespace MonoDevelop.VersionControl.Views
 
 		class DiffScrollbar : DrawingArea
 		{
-			TextEditor editor;
+			MonoTextEditor editor;
 			EditorCompareWidgetBase widget;
 			bool useLeftDiff;
 			bool paintInsert;
 			Adjustment vAdjustment;
 			
-			public DiffScrollbar (EditorCompareWidgetBase widget, TextEditor editor, bool useLeftDiff, bool paintInsert)
+			public DiffScrollbar (EditorCompareWidgetBase widget, MonoTextEditor editor, bool useLeftDiff, bool paintInsert)
 			{
 				this.editor = editor;
 				this.useLeftDiff = useLeftDiff;
@@ -1047,6 +1045,8 @@ namespace MonoDevelop.VersionControl.Views
 			void FillGradient (Cairo.Context cr, double y, double h)
 			{
 				cr.Rectangle (0.5, y, Allocation.Width, h);
+
+				// FIXME: VV: Remove gradient features
 				using (var grad = new Cairo.LinearGradient (0, y, Allocation.Width, y)) {
 					var col = (HslColor)Style.Base (StateType.Normal);
 					col.L *= 0.95;
@@ -1070,11 +1070,9 @@ namespace MonoDevelop.VersionControl.Views
 					h,
 					barWidth / 2);
 				
-				var color = (HslColor)Style.Mid (StateType.Normal);
-				color.L = 0.5;
-				var c = (Cairo.Color)color;
-				c.A = 0.6;
-				cr.SetSourceColor (c);
+				var color = Ide.Gui.Styles.BaseBackgroundColor;
+				color.Light = 0.5;
+				cr.SetSourceColor (color.WithAlpha (0.6).ToCairoColor ());
 				cr.Fill ();
 			}
 	
@@ -1086,9 +1084,7 @@ namespace MonoDevelop.VersionControl.Views
 		
 		protected virtual void OnDiffChanged (EventArgs e)
 		{
-			EventHandler handler = this.DiffChanged;
-			if (handler != null)
-				handler (this, e);
+			DiffChanged?.Invoke (this, e);
 		}
 		
 		public event EventHandler DiffChanged;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
index d25f151308..df56bc1e7b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
@@ -2,18 +2,18 @@ using System;
 using System.IO;
 using Gtk;
 using MonoDevelop.Core;
+using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui;
 using MonoDevelop.Ide;
 using System.Linq;
 
 namespace MonoDevelop.VersionControl.Views
 {
-	public interface ILogView : IAttachableViewContent
+	public interface ILogView
 	{
 	}
 	
-	public class LogView : BaseView, ILogView
+	class LogView : BaseView, ILogView
 	{
 		LogWidget widget;
 		VersionInfo vinfo;
@@ -44,7 +44,7 @@ namespace MonoDevelop.VersionControl.Views
 			widget = lw;
 			info.Updated += OnInfoUpdated;
 			lw.History = this.info.History;
-			vinfo   = this.info.VersionInfo;
+			vinfo   = this.info.Item.VersionInfo;
 		
 			if (WorkbenchWindow != null)
 				widget.SetToolbar (WorkbenchWindow.GetToolbar (this));
@@ -53,7 +53,7 @@ namespace MonoDevelop.VersionControl.Views
 		void OnInfoUpdated (object sender, EventArgs e)
 		{
 			widget.History = this.info.History;
-			vinfo   = this.info.VersionInfo;
+			vinfo   = this.info.Item.VersionInfo;
 		}
 
 		[Obsolete]
@@ -70,7 +70,7 @@ namespace MonoDevelop.VersionControl.Views
 			// Widget setup
 			VersionControlDocumentInfo info  =new VersionControlDocumentInfo (null, null, vc);
 			info.History = history;
-			info.VersionInfo = vinfo;
+			info.Item.VersionInfo = vinfo;
 			var lw = new LogWidget (info);
 			
 			widget = lw;
@@ -78,7 +78,7 @@ namespace MonoDevelop.VersionControl.Views
 		}
 
 		
-		public override Gtk.Widget Control { 
+		public override Control Control { 
 			get {
 				if (widget == null)
 					CreateControlFromInfo ();
@@ -86,9 +86,9 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 
-		protected override void OnWorkbenchWindowChanged (EventArgs e)
+		protected override void OnWorkbenchWindowChanged ()
 		{
-			base.OnWorkbenchWindowChanged (e);
+			base.OnWorkbenchWindowChanged ();
 			if (WorkbenchWindow != null && widget != null)
 				widget.SetToolbar (WorkbenchWindow.GetToolbar (this));
 		}
@@ -110,8 +110,7 @@ namespace MonoDevelop.VersionControl.Views
 			base.Dispose ();
 		}
 
-		#region IAttachableViewContent implementation
-		public void Selected ()
+		public void Init ()
 		{
 			if (info != null && !info.Started) {
 				widget.ShowLoading ();
@@ -119,19 +118,11 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 
-		public void Deselected ()
+		protected override void OnSelected ()
 		{
+			Init ();
 		}
 
-		public void BeforeSave ()
-		{
-		}
-
-		public void BaseContentChanged ()
-		{
-		}
-		#endregion
-
 		[CommandHandler (MonoDevelop.Ide.Commands.EditCommands.Copy)]
 		protected void OnCopy ()
 		{
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
index 32905950ad..af0744795b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
@@ -1,21 +1,21 @@
-// 
+//
 // LogWidget.cs
-//  
+//
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
-// 
+//
 // Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,6 +32,8 @@ using MonoDevelop.Ide;
 using System.Text;
 using System.Threading;
 using MonoDevelop.Components;
+using Mono.TextEditor;
+using System.Linq;
 
 namespace MonoDevelop.VersionControl.Views
 {
@@ -49,10 +51,10 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 		
-		ListStore logstore = new ListStore (typeof (Revision));
+		ListStore logstore = new ListStore (typeof (Revision), typeof(string));
 		FileTreeView treeviewFiles;
 		TreeStore changedpathstore;
-		Gtk.Button revertButton, revertToButton, refreshButton;
+		DocumentToolButton revertButton, revertToButton, refreshButton;
 		SearchEntry searchEntry;
 		string currentFilter;
 		
@@ -91,7 +93,21 @@ namespace MonoDevelop.VersionControl.Views
 					double center_x = cell_area.X + Math.Round ((double) (cell_area.Width / 2d));
 					double center_y = cell_area.Y + Math.Round ((double) (cell_area.Height / 2d));
 					cr.Arc (center_x, center_y, 5, 0, 2 * Math.PI);
-					cr.SetSourceRGBA (0, 0, 0, 1);
+					var state = StateType.Normal;
+					if (!base.Sensitive)
+						state = StateType.Insensitive;
+					else if (flags.HasFlag (CellRendererState.Selected)) {
+						if (widget.HasFocus)
+							state = StateType.Selected;
+						else
+							state = StateType.Active;
+					}
+					else if (flags.HasFlag (CellRendererState.Prelit))
+						state = StateType.Prelight;
+					else if (widget.State == StateType.Insensitive)
+						state = StateType.Insensitive;
+
+					cr.SetSourceColor (widget.Style.Text (state).ToCairoColor ());
 					cr.Stroke ();
 					if (!FirstNode) {
 						cr.MoveTo (center_x, cell_area.Y - 2);
@@ -124,11 +140,11 @@ namespace MonoDevelop.VersionControl.Views
 			vpaned1 = vpaned1.ReplaceWithWidget (new VPanedThin () { HandleWidget = separator }, true);
 
 			revertButton = new DocumentToolButton ("vc-revert-command", GettextCatalog.GetString ("Revert changes from this revision"));
-			revertButton.Sensitive = false;
+			revertButton.GetNativeWidget<Gtk.Widget> ().Sensitive = false;
 			revertButton.Clicked += new EventHandler (RevertRevisionClicked);
 
 			revertToButton = new DocumentToolButton ("vc-revert-command", GettextCatalog.GetString ("Revert to this revision"));
-			revertToButton.Sensitive = false;
+			revertToButton.GetNativeWidget<Gtk.Widget> ().Sensitive = false;
 			revertToButton.Clicked += new EventHandler (RevertToRevisionClicked);
 
 			refreshButton = new DocumentToolButton (Gtk.Stock.Refresh, GettextCatalog.GetString ("Refresh"));
@@ -237,16 +253,29 @@ namespace MonoDevelop.VersionControl.Views
 			tb.UseChildBackgroundColor = true;
 			tb.Add (scrolledwindow1);
 			vbox2.PackStart (tb, true, true, 0);
+
+			UpdateStyle ();
+			Ide.Gui.Styles.Changed += HandleStylesChanged;
 		}
 
 		protected override void OnRealized ()
 		{
 			base.OnRealized ();
+			UpdateStyle ();
+		}
+
+		void HandleStylesChanged (object sender, EventArgs e)
+		{
+			UpdateStyle ();
+		}
+
+		void UpdateStyle ()
+		{
 			var c = Style.Base (StateType.Normal).ToXwtColor ();
 			c.Light *= 0.8;
 			commitBox.ModifyBg (StateType.Normal, c.ToGdkColor ());
 
-			var tcol = new Gdk.Color (255, 251, 242);
+			var tcol = Styles.LogView.CommitDescBackgroundColor.ToGdkColor ();
 			textviewDetails.ModifyBase (StateType.Normal, tcol);
 			scrolledwindow1.ModifyBase (StateType.Normal, tcol);
 		}
@@ -266,6 +295,13 @@ namespace MonoDevelop.VersionControl.Views
 
 			toolbar.ShowAll ();
 		}
+
+		static void SetLogSearchFilter (ListStore store, string filter)
+		{
+			TreeIter iter;
+			if (store.GetIterFirst (out iter))
+				store.SetValue (iter, 1, filter);
+		}
 		
 		bool filtering;
 		void HandleSearchEntryFilterChanged (object sender, EventArgs e)
@@ -276,6 +312,7 @@ namespace MonoDevelop.VersionControl.Views
 			GLib.Timeout.Add (100, delegate {
 				filtering = false;
 				currentFilter = searchEntry.Entry.Text;
+				SetLogSearchFilter (logstore, currentFilter);
 				UpdateHistory ();
 				return false;
 			});
@@ -292,7 +329,7 @@ namespace MonoDevelop.VersionControl.Views
 			Revision d = SelectedRevision;
 			if (RevertRevisionsCommands.RevertToRevision (info.Repository, info.Item.Path, d, false))
 				VersionControlService.SetCommitComment (info.Item.Path, 
-				  string.Format ("(Revert to revision {0})", d.ToString ()), true);
+				  GettextCatalog.GetString ("(Revert to revision {0})", d.ToString ()), true);
 		}
 		
 		void RevertRevisionClicked (object src, EventArgs args)
@@ -300,17 +337,17 @@ namespace MonoDevelop.VersionControl.Views
 			Revision d = SelectedRevision;
 			if (RevertRevisionsCommands.RevertRevision (info.Repository, info.Item.Path, d, false))
 				VersionControlService.SetCommitComment (info.Item.Path, 
-				  string.Format ("(Revert revision {0})", d.ToString ()), true);
+				  GettextCatalog.GetString ("(Revert revision {0})", d.ToString ()), true);
 		}
 
 		void RefreshClicked (object src, EventArgs args)
 		{
 			ShowLoading ();
 			info.Start (true);
-			revertButton.Sensitive = revertToButton.Sensitive = false;
+			revertButton.GetNativeWidget<Gtk.Widget> ().Sensitive = revertToButton.GetNativeWidget<Gtk.Widget> ().Sensitive = false;
 		}
 
-		void HandleTreeviewFilesDiffLineActivated (object sender, EventArgs e)
+		async void HandleTreeviewFilesDiffLineActivated (object sender, EventArgs e)
 		{
 			TreePath[] paths = treeviewFiles.Selection.GetSelectedRows ();
 			
@@ -324,7 +361,9 @@ namespace MonoDevelop.VersionControl.Views
 			int line = diffRenderer.GetSelectedLine (paths[0]);
 			if (line == -1)
 				line = 1;
-			var doc = IdeApp.Workbench.OpenDocument (fileName, line, 0, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
+
+			var proj = IdeApp.Workspace.GetProjectsContainingFile (fileName).FirstOrDefault ();
+			var doc = await IdeApp.Workbench.OpenDocument (fileName, proj, line, 0, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
 			int i = 1;
 			foreach (var content in doc.Window.SubViewContents) {
 				DiffView diffView = content as DiffView;
@@ -366,7 +405,10 @@ namespace MonoDevelop.VersionControl.Views
 					} catch (Exception e) {
 						Application.Invoke (delegate {
 							LoggingService.LogError ("Error while getting revision text", e);
-							MessageService.ShowError ("Error while getting revision text.", "The file may not be part of the working copy.");
+							MessageService.ShowError (
+								GettextCatalog.GetString ("Error while getting revision text."),
+								GettextCatalog.GetString ("The file may not be part of the working copy.")
+							);
 						});
 						return;
 					}
@@ -375,14 +417,14 @@ namespace MonoDevelop.VersionControl.Views
 						prevRev = rev.GetPrevious ();
 					} catch (Exception e) {
 						Application.Invoke (delegate {
-							MessageService.ShowError ("Error while getting previous revision.", e);
+							MessageService.ShowError (GettextCatalog.GetString ("Error while getting previous revision."), e);
 						});
 						return;
 					}
 					string[] lines;
 					// Indicator that the file was binary
 					if (text == null) {
-						lines = new [] { " Binary files differ" };
+						lines = new [] { GettextCatalog.GetString (" Binary files differ") };
 					} else {
 						var changedDocument = Mono.TextEditor.TextDocument.CreateImmutableDocument (text);
 						if (prevRev == null) {
@@ -395,9 +437,12 @@ namespace MonoDevelop.VersionControl.Views
 							try {
 								prevRevisionText = info.Repository.GetTextAtRevision (path, prevRev);
 							} catch (Exception e) {
-								Application.Invoke (delegate {
-									LoggingService.LogError ("Error while getting revision text", e);
-									MessageService.ShowError ("Error while getting revision text.", "The file may not be part of the working copy.");
+								Application.Invoke (delegate {

+									LoggingService.LogError ("Error while getting revision text", e);

+									MessageService.ShowError (

+										GettextCatalog.GetString ("Error while getting revision text."),

+										GettextCatalog.GetString ("The file may not be part of the working copy.")

+									);
 								});
 								return;
 							}
@@ -412,8 +457,8 @@ namespace MonoDevelop.VersionControl.Views
 							}
 
 							var originalDocument = Mono.TextEditor.TextDocument.CreateImmutableDocument (prevRevisionText);
-							originalDocument.FileName = "Revision " + prevRev;
-							changedDocument.FileName = "Revision " + rev;
+							originalDocument.FileName = GettextCatalog.GetString ("Revision {0}", prevRev);
+							changedDocument.FileName = GettextCatalog.GetString ("Revision {0}", rev);
 							lines = Mono.TextEditor.Utils.Diff.GetDiffString (originalDocument, changedDocument).Split ('\n');
 						}
 					}
@@ -448,17 +493,23 @@ namespace MonoDevelop.VersionControl.Views
 				});
 			});
 		}*/
-		
-		public override void Destroy ()
+
+		protected override void OnDestroyed ()

 		{
-			base.Destroy ();
+			revertButton.Clicked -= RevertRevisionClicked;
+			revertToButton.Clicked -= RevertToRevisionClicked;
+			refreshButton.Clicked -= RefreshClicked;
+			Ide.Gui.Styles.Changed -= HandleStylesChanged;
+
 			logstore.Dispose ();
 			changedpathstore.Dispose ();
-			
+
 			diffRenderer.Dispose ();
 			messageRenderer.Dispose ();
 			textRenderer.Dispose ();
 			treeviewFiles.Dispose ();
+
+			base.OnDestroyed ();

 		}
 		
 		static void DateFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
@@ -490,9 +541,21 @@ namespace MonoDevelop.VersionControl.Views
 			model.IterNthChild (out node, model.IterNChildren () - 1);
 			renderer.LastNode =  node.Equals (iter);
 		}
+
+		static string GetCurrentFilter (Gtk.TreeModel model)
+		{
+			TreeIter filterIter;
+			string filter = string.Empty;
+			if (model.GetIterFirst (out filterIter))
+				filter = (string)model.GetValue (filterIter, 1);
+
+			return filter;
+		}
 		
-		void MessageFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+		static void MessageFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 		{
+			string filter = GetCurrentFilter (model);
+
 			CellRendererText renderer = (CellRendererText)cell;
 			var rev = (Revision)model.GetValue (iter, 0);
 			if (string.IsNullOrEmpty (rev.Message)) {
@@ -502,15 +565,17 @@ namespace MonoDevelop.VersionControl.Views
 				int idx = message.IndexOf ('\n');
 				if (idx > 0)
 					message = message.Substring (0, idx);
-				if (string.IsNullOrEmpty (currentFilter))
+				if (string.IsNullOrEmpty (filter))
 					renderer.Text = message;
 				else
-					renderer.Markup = EscapeWithFilterMarker (message);
+					renderer.Markup = EscapeWithFilterMarker (message, filter);
 			}
 		}
 		
-		void AuthorFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+		static void AuthorFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 		{
+			string filter = GetCurrentFilter (model);
+
 			CellRendererText renderer = (CellRendererText)cell;
 			var rev = (Revision)model.GetValue (iter, 0);
 			string author = rev.Author;
@@ -519,13 +584,13 @@ namespace MonoDevelop.VersionControl.Views
 			int idx = author.IndexOf ("<", StringComparison.Ordinal);
 			if (idx >= 0 && idx < author.IndexOf (">", StringComparison.Ordinal))
 				author = author.Substring (0, idx).Trim ();
-			if (string.IsNullOrEmpty (currentFilter))
+			if (string.IsNullOrEmpty (filter))
 				renderer.Text = author;
 			else
-				renderer.Markup = EscapeWithFilterMarker (author);
+				renderer.Markup = EscapeWithFilterMarker (author, filter);
 		}
 		
-		void AuthorIconFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+		static void AuthorIconFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 		{
 			CellRendererImage renderer = (CellRendererImage)cell;
 			var rev = (Revision)model.GetValue (iter, 0);
@@ -537,29 +602,32 @@ namespace MonoDevelop.VersionControl.Views
 			if (img.Downloading) {
 				img.Completed += (sender, e) => {
 					renderer.Image = img.Image;
-					if (logstore.IterIsValid (iter))
+					if (((ListStore)model).IterIsValid (iter))
 						model.EmitRowChanged (model.GetPath (iter), iter);
 				};
 			}
 		}
 		
-		void RevisionFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+		static void RevisionFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 		{
+			string filter = GetCurrentFilter (model);
+
 			CellRendererText renderer = (CellRendererText)cell;
 			var rev = model.GetValue (iter, 0).ToString ();
-			if (string.IsNullOrEmpty (currentFilter))
+			if (string.IsNullOrEmpty (filter))
 				renderer.Text = rev;
 			else
-				renderer.Markup = EscapeWithFilterMarker (rev);
+				renderer.Markup = EscapeWithFilterMarker (rev, filter);
 		}
 		
-		void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+		static void SetDiffCellData (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 		{
 			CellRendererDiff rc = (CellRendererDiff)cell;
-			string[] lines = (string[])changedpathstore.GetValue (iter, colDiff);
+			string[] lines = (string[])model.GetValue (iter, colDiff);
 			if (lines == null)
-				lines = new string[] { (string)changedpathstore.GetValue (iter, colOperation) };
-			rc.InitCell (treeviewFiles, changedpathstore.IterDepth (iter) != 0, lines, changedpathstore.GetPath (iter));
+				lines = new string[] { (string)model.GetValue (iter, colOperation) };
+
+			rc.InitCell (tree_column.TreeView, ((TreeStore)model).IterDepth (iter) != 0, lines, model.GetPath (iter));
 		}
 		
 		protected override void OnSizeAllocated (Gdk.Rectangle allocation)
@@ -605,7 +673,7 @@ namespace MonoDevelop.VersionControl.Views
 			if (d == null)
 				return;
 
-			revertButton.Sensitive = revertToButton.Sensitive = true;
+			revertButton.GetNativeWidget<Gtk.Widget> ().Sensitive = revertToButton.GetNativeWidget<Gtk.Widget> ().Sensitive = true;
 			Gtk.TreeIter selectIter = Gtk.TreeIter.Zero;
 			bool select = false;
 			foreach (RevisionPath rp in info.Repository.GetRevisionChanges (d)) {
@@ -664,14 +732,17 @@ namespace MonoDevelop.VersionControl.Views
 		{
 			scrolledLoading.Hide ();
 			scrolledLog.Show ();
+			treeviewLog.FreezeChildNotify ();
 			logstore.Clear ();
 			var h = History;
 			if (h == null)
 				return;
 			foreach (var rev in h) {
 				if (MatchesFilter (rev))
-					logstore.AppendValues (rev);
+					logstore.InsertWithValues (-1, rev, string.Empty);
 			}
+			SetLogSearchFilter (logstore, currentFilter);
+			treeviewLog.ThawChildNotify ();
 		}
 		
 		bool MatchesFilter (Revision rev)
@@ -691,12 +762,12 @@ namespace MonoDevelop.VersionControl.Views
 			return false;
 		}
 		
-		string EscapeWithFilterMarker (string txt)
+		static string EscapeWithFilterMarker (string txt, string filter)
 		{
-			if (string.IsNullOrEmpty (currentFilter))
+			if (string.IsNullOrEmpty (filter))
 				return GLib.Markup.EscapeText (txt);
 			
-			int i = txt.IndexOf (currentFilter, StringComparison.CurrentCultureIgnoreCase);
+			int i = txt.IndexOf (filter, StringComparison.CurrentCultureIgnoreCase);
 			if (i == -1)
 				return GLib.Markup.EscapeText (txt);
 			
@@ -704,9 +775,9 @@ namespace MonoDevelop.VersionControl.Views
 			int last = 0;
 			while (i != -1) {
 				sb.Append (GLib.Markup.EscapeText (txt.Substring (last, i - last)));
-				sb.Append ("<span color='blue'>").Append (txt.Substring (i, currentFilter.Length)).Append ("</span>");
-				last = i + currentFilter.Length;
-				i = txt.IndexOf (currentFilter, last, StringComparison.CurrentCultureIgnoreCase);
+				sb.Append ("<span color='" + Styles.LogView.SearchSnippetTextColor + "'>").Append (txt.Substring (i, filter.Length)).Append ("</span>");
+				last = i + filter.Length;
+				i = txt.IndexOf (filter, last, StringComparison.CurrentCultureIgnoreCase);
 			}
 			if (last < txt.Length)
 				sb.Append (GLib.Markup.EscapeText (txt.Substring (last, txt.Length - last)));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
index 8cb107fa2d..5aca9300d7 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
@@ -1,21 +1,21 @@
-// 
+//
 // MergeView.cs
-//  
+//
 // Author:
 //       Mike Krüger <mkrueger@novell.com>
-// 
+//
 // Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,12 +23,12 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using MonoDevelop.Ide.Gui;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 
 namespace MonoDevelop.VersionControl.Views
 {
-	public interface IMergeView : IAttachableViewContent
+	public interface IMergeView
 	{
 	}
 	
@@ -37,7 +37,7 @@ namespace MonoDevelop.VersionControl.Views
 		VersionControlDocumentInfo info;
 		MergeWidget widget;
 
-		public override Gtk.Widget Control { 
+		public override Control Control { 
 			get {
 				if (widget == null) {
 					widget = new MergeWidget ();
@@ -53,22 +53,18 @@ namespace MonoDevelop.VersionControl.Views
 			this.info = info;
 		}
 
-		public void Selected ()
+		protected override void OnSelected ()
 		{
 			widget.UpdateLocalText ();
 			widget.info.Start ();
-		}
-		
-		public void Deselected ()
-		{
-		}
-
-		public void BeforeSave ()
-		{
-		}
 
-		public void BaseContentChanged ()
-		{
+			var buffer = info.Document.GetContent<MonoDevelop.Ide.Editor.TextEditor> ();
+			if (buffer != null) {
+				var loc = buffer.CaretLocation;
+				int line = loc.Line < 1 ? 1 : loc.Line;
+				int column = loc.Column < 1 ? 1 : loc.Column;
+				widget.MainEditor.SetCaretTo (line, column);
+			}
 		}
 	}
 }
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
index ab9c7898d6..2c7e09f2e0 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
@@ -38,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views
 {
 	public class MergeWidget : EditorCompareWidgetBase
 	{
-		protected override TextEditor MainEditor {
+		protected internal override MonoTextEditor MainEditor {
 			get {
 				return editors != null && editors.Length >= 2 ? editors[1] : null;
 			}
@@ -49,7 +49,7 @@ namespace MonoDevelop.VersionControl.Views
 			MainEditor.Document.TextReplaced += UpdateConflictsOnTextReplace;
 		}
 
-		protected override void UndoChange (TextEditor fromEditor, TextEditor toEditor, Hunk hunk)
+		protected override void UndoChange (MonoTextEditor fromEditor, MonoTextEditor toEditor, Hunk hunk)
 		{
 			base.UndoChange (fromEditor, toEditor, hunk);
 			int i = leftConflicts.IndexOf (hunk);
@@ -100,9 +100,9 @@ namespace MonoDevelop.VersionControl.Views
 		protected override void CreateComponents ()
 		{
 			this.editors = new [] {
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
-				new TextEditor (new TextDocument (), new CommonTextEditorOptions ()),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
+				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
 			};
 			
 			this.editors[0].Document.ReadOnly = true;
@@ -173,8 +173,8 @@ namespace MonoDevelop.VersionControl.Views
 		
 		public override void UpdateDiff ()
 		{
-			LeftDiff  = new List<Hunk> (editors[0].Document.Diff (MainEditor.Document));
-			RightDiff = new List<Hunk> (editors[2].Document.Diff (MainEditor.Document));
+			LeftDiff  = new List<Hunk> (editors[0].Document.Diff (MainEditor.Document, includeEol: false));
+			RightDiff = new List<Hunk> (editors[2].Document.Diff (MainEditor.Document, includeEol: false));
 
 			DocumentLine line;
 			LeftDiff.RemoveAll (item => null != (line = MainEditor.Document.GetLine (item.InsertStart)) &&
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
index 7fa5424919..68592fd2b0 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
@@ -8,13 +8,11 @@ using Mono.Addins;
 using Gtk;
 
 using MonoDevelop.Core;
+using MonoDevelop.Components;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui;
 using Mono.TextEditor;
-using MonoDevelop.Components;
 using System.Text;
 
 namespace MonoDevelop.VersionControl.Views
@@ -46,7 +44,8 @@ namespace MonoDevelop.VersionControl.Views
 		List<VersionInfo> statuses;
 		bool remoteStatus = false;
 
-		class DiffData {
+		class DiffData

+		{
 			public Exception Exception {
 				get; private set;
 			}
@@ -277,7 +276,7 @@ namespace MonoDevelop.VersionControl.Views
 		}
 
 		public StatusView (string filepath, Repository vc, VersionControlItemList list)
-			: base (Path.GetFileName (filepath) + " Status")
+			: base (GettextCatalog.GetString ("{0} Status", Path.GetFileName (filepath)))
 		{
 			this.vc = vc;
 			this.filepath = Directory.Exists (filepath) ? filepath : Path.GetDirectoryName (filepath);
@@ -290,9 +289,9 @@ namespace MonoDevelop.VersionControl.Views
 			Init ();
 		}
 
-		protected override void OnWorkbenchWindowChanged (EventArgs e)
+		protected override void OnWorkbenchWindowChanged ()
 		{
-			base.OnWorkbenchWindowChanged (e);
+			base.OnWorkbenchWindowChanged ();
 			if (WorkbenchWindow == null)
 				return;
 
@@ -357,10 +356,6 @@ namespace MonoDevelop.VersionControl.Views
 			toolbar.ShowAll ();
 		}
 
-		public override string StockIconId {
-			get { return "vc-status"; }
-		}
-
 		int CompareNodes (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b)
 		{
 			int col, val=0;
@@ -436,7 +431,7 @@ namespace MonoDevelop.VersionControl.Views
 			base.Dispose ();
 		}
 
-		public override Gtk.Widget Control {
+		public override Control Control {
 			get {
 				return widget;
 			}
@@ -458,7 +453,7 @@ namespace MonoDevelop.VersionControl.Views
 
 			ThreadPool.QueueUserWorkItem (delegate {
 				if (fileList != null) {
-					var group = fileList.GroupBy (v => v.IsDirectory || v.WorkspaceObject is SolutionItem);
+					var group = fileList.GroupBy (v => v.IsDirectory || v.WorkspaceObject is SolutionFolderItem);
 					foreach (var item in group) {
 						// Is directory.
 						if (item.Key) {
@@ -472,7 +467,7 @@ namespace MonoDevelop.VersionControl.Views
 				}
 				List<VersionInfo> newList = new List<VersionInfo> ();
 				newList.AddRange (vc.GetDirectoryVersionInfo (filepath, remoteStatus, true));
-				DispatchService.GuiDispatch (delegate {
+				Runtime.RunInMainThread (delegate {
 					if (!disposed)
 						LoadStatus (newList);
 				});
@@ -579,7 +574,7 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 
-		TreeIter AppendFileInfo (VersionInfo n)
+		TreeIter AppendFileInfo (VersionInfo n, bool expanded)
 		{
 			Xwt.Drawing.Image statusicon = VersionControlService.LoadIconForStatus(n.Status);
 			string lstatus = VersionControlService.GetStatusLabel (n.Status);
@@ -604,10 +599,18 @@ namespace MonoDevelop.VersionControl.Views
 
 			TreeIter it = filestore.AppendValues (statusicon, lstatus, GLib.Markup.EscapeText (localpath).Split ('\n'), rstatus, commit, false, n.LocalPath.ToString (), true, hasComment, fileIcon, n.HasLocalChanges, rstatusicon, scolor, n.HasRemoteChange (VersionStatus.Modified));
 			if (!n.IsDirectory)
-				filestore.AppendValues (it, statusicon, "", new string[0], "", false, true, n.LocalPath.ToString (), false, false, fileIcon, false, null, null, false);
+				filestore.AppendValues (it, statusicon, "", new string[0], "", false, true, n.LocalPath.ToString (), false, false, fileIcon, false, null, null, false);

+
			if (expanded)
+				filelist.ExpandRow (filestore.GetPath (it), open_all: false);
+
 			return it;
 		}
 
+		TreeIter AppendFileInfo (VersionInfo n)
+		{
+			return AppendFileInfo (n, expanded: false);
+		}
+
 		string[] GetCurrentFiles ()
 		{
 			TreePath[] paths = filelist.Selection.GetSelectedRows ();
@@ -776,12 +779,17 @@ namespace MonoDevelop.VersionControl.Views
 
 		void OnTestExpandRow (object sender, Gtk.TestExpandRowArgs args)
 		{
-			bool filled = (bool) filestore.GetValue (args.Iter, ColFilled);
+			OnRowExpanded (args.Iter);
+		}
+
+		void OnRowExpanded (TreeIter it)
+		{
+			bool filled = (bool) filestore.GetValue (it, ColFilled);
 			if (!filled) {
-				filestore.SetValue (args.Iter, ColFilled, true);
+				filestore.SetValue (it, ColFilled, true);
 				TreeIter iter;
-				filestore.IterChildren (out iter, args.Iter);
-				string fileName = (string) filestore.GetValue (args.Iter, ColFullPath);
+				filestore.IterChildren (out iter, it);
+				string fileName = (string) filestore.GetValue (it, ColFullPath);
 				FillDiffInfo (iter, fileName, GetDiffData (remoteStatus));
 			}
 		}
@@ -816,7 +824,7 @@ namespace MonoDevelop.VersionControl.Views
 			string[] files = GetCurrentFiles ();
 			VersionControlItemList items = new VersionControlItemList ();
 			foreach (string file in files) {
-				Project prj = IdeApp.Workspace.GetProjectContainingFile (file);
+				Project prj = IdeApp.Workspace.GetProjectsContainingFile (file).FirstOrDefault ();
 				items.Add (new VersionControlItem (vc, prj, file, Directory.Exists (file), null));
 			}
 			return items;
@@ -924,13 +932,16 @@ namespace MonoDevelop.VersionControl.Views
 					if (line == -1)
 						line = 1;
 				}
-				IdeApp.Workbench.OpenDocument (files [0], line, 0);
+				var proj = IdeApp.Workspace.GetProjectsContainingFile (files [0]).FirstOrDefault ();
+				IdeApp.Workbench.OpenDocument (files [0], proj, line, 0);
 			}
 			else {
 				AlertButton openAll = new AlertButton (GettextCatalog.GetString ("_Open All"));
 				if (MessageService.AskQuestion (GettextCatalog.GetString ("Do you want to open all {0} files?", files.Length), AlertButton.Cancel, openAll) == openAll) {
-					for (int n=0; n<files.Length; n++)
-						IdeApp.Workbench.OpenDocument (files[n], n==0);
+					for (int n = 0; n < files.Length; n++) {
+						var proj = IdeApp.Workspace.GetProjectsContainingFile (files [n]).FirstOrDefault ();
+						IdeApp.Workbench.OpenDocument (files [n], proj, n == 0);
+					}
 				}
 			}
 		}
@@ -959,6 +970,7 @@ namespace MonoDevelop.VersionControl.Views
 			}
 
 			bool found = false;
+			bool wasExpanded = false;
 			int oldStatusIndex;
 			TreeIter oldStatusIter = TreeIter.Zero;
 
@@ -979,6 +991,7 @@ namespace MonoDevelop.VersionControl.Views
 				if (filestore.GetIterFirst (out oldStatusIter)) {
 					do {
 						if (args.FilePath == (string) filestore.GetValue (oldStatusIter, ColFullPath)) {
+							wasExpanded = filelist.GetRowExpanded (filestore.GetPath (oldStatusIter));
 							found = true;
 							break;
 						}
@@ -1013,21 +1026,34 @@ namespace MonoDevelop.VersionControl.Views
 				}
 
 				statuses [oldStatusIndex] = newInfo;
+				InvalidateDiffData (args.FilePath, false, newInfo);
+				InvalidateDiffData (args.FilePath, true, newInfo);
 
 				// Update the tree
-				AppendFileInfo (newInfo);
+				AppendFileInfo (newInfo, wasExpanded);
 				filestore.Remove (ref oldStatusIter);
 			}
 			else {
 				if (FileVisible (newInfo)) {
 					statuses.Add (newInfo);
 					changeSet.AddFile (newInfo);
-					AppendFileInfo (newInfo);
+					AppendFileInfo (newInfo, wasExpanded);
 				}
 			}
 			return true;
 		}
 
+		void InvalidateDiffData (FilePath path, bool remote, VersionInfo info)
+		{
+			var ddata = GetDiffData (remote);
+			var index = ddata.FindIndex (dobj => dobj.VersionInfo.LocalPath == path);
+			if (index != -1) {
+				ddata.RemoveAt (index);
+			}
+
+			ddata.Add (new DiffData (vc, filepath, info, remote));
+		}
+
 		static bool FileVisible (VersionInfo vinfo)
 		{
 			return vinfo != null && (vinfo.HasLocalChanges || vinfo.HasRemoteChanges);
@@ -1167,14 +1193,13 @@ namespace MonoDevelop.VersionControl.Views
 				return true;
 			}
 
-			if (evnt.Key == Gdk.Key.space && CommitSelectionToggled != null) {
-				CommitSelectionToggled (this, EventArgs.Empty);
+			if (evnt.Key == Gdk.Key.space) {
+				CommitSelectionToggled?.Invoke (this, EventArgs.Empty);
 				return true;
 			}
 
 			if (evnt.Key == Gdk.Key.Return || evnt.Key == Gdk.Key.KP_Enter) {
-				if (DiffLineActivated != null)
-					DiffLineActivated (this, EventArgs.Empty);
+				DiffLineActivated?.Invoke (this, EventArgs.Empty);
 				return true;
 			}
 
@@ -1196,8 +1221,8 @@ namespace MonoDevelop.VersionControl.Views
 					vpos = Vadjustment.Value;
 					keepPos = true;
 					if (Selection.PathIsSelected (path) && Selection.GetSelectedRows ().Length == 1 && evnt.Button == 1) {
-						if (evnt.Type == Gdk.EventType.TwoButtonPress && DiffLineActivated != null)
-							DiffLineActivated (this, EventArgs.Empty);
+						if (evnt.Type == Gdk.EventType.TwoButtonPress)
+							DiffLineActivated?.Invoke (this, EventArgs.Empty);
 						handled = true;
 					}
 				}
@@ -1233,8 +1258,7 @@ namespace MonoDevelop.VersionControl.Views
 
 		protected override bool OnPopupMenu()
 		{
-			if (DoPopupMenu != null)
-				DoPopupMenu (null);
+			DoPopupMenu?.Invoke (null);
 			return true;
 		}
 
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Styles.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Styles.cs
new file mode 100644
index 0000000000..ab82ba054d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Styles.cs
@@ -0,0 +1,145 @@
+//
+// Styles.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using MonoDevelop.Ide;
+using MonoDevelop.Components;
+using Xwt.Drawing;
+
+namespace MonoDevelop.VersionControl
+{
+	public static class Styles
+	{
+		public static BlameViewStyle BlameView { get; internal set; }
+		public static LogViewStyle LogView { get; internal set; }
+		public static DiffViewStyle DiffView { get; internal set; }
+
+		public class BlameViewStyle
+		{
+			public Color AnnotationBackgroundColor { get; internal set; }
+			public Color AnnotationHighlightColor { get; internal set; }
+			public Color AnnotationTextColor { get; internal set; }
+			public Color AnnotationSummaryTextColor { get; internal set; }
+			public Color AnnotationSplitterColor { get; internal set; }
+			public Color AnnotationMarkColor { get; internal set; }
+			public Color AnnotationMarkModifiedColor { get; internal set; }
+			public Color RangeSplitterColor { get; internal set; }
+			public Color RangeHazeColor { get; internal set; }
+		}
+
+		public class LogViewStyle
+		{
+			public Color CommitDescBackgroundColor { get; internal set; }
+			public Color DiffAddBackgroundColor { get; internal set; }
+			public Color DiffRemoveBackgroundColor { get; internal set; }
+			public Color DiffHighlightColor { get; internal set; }
+			public Color DiffBoxBorderColor { get; internal set; }
+			public Color DiffBoxSplitterColor { get; internal set; }
+			// TODO: End up having this as Color at some point or cache the string in Xwt.Color.
+			public string SearchSnippetTextColor { get; internal set; }
+		}
+
+		public class DiffViewStyle
+		{
+			public Color AddBorderColor { get; internal set; }
+			public Color AddBackgroundColor { get; internal set; }
+			public Color RemoveBorderColor { get; internal set; }
+			public Color RemoveBackgroundColor { get; internal set; }
+			public Color MergeBorderColor { get; internal set; }
+			public Color MergeBackgroundColor { get; internal set; }
+		}
+
+		static Styles ()
+		{
+			LoadStyles ();
+			MonoDevelop.Ide.Gui.Styles.Changed +=  (o, e) => LoadStyles ();
+		}
+
+		public static void LoadStyles ()
+		{
+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) {
+				BlameView = new BlameViewStyle {
+					AnnotationMarkColor = Color.FromName ("#e5f1ff"),
+					AnnotationMarkModifiedColor = Color.FromName ("#ffff00"),
+					RangeHazeColor = Color.FromName ("#ababab").WithAlpha (.1),
+					RangeSplitterColor = Color.FromName ("#ababab").WithAlpha (.2),
+				};
+
+				LogView = new LogViewStyle {
+					DiffAddBackgroundColor = Color.FromName ("#7bc87b").AddLight (0.1),
+					DiffRemoveBackgroundColor = Color.FromName ("#c88c8c").AddLight (0.1),
+					DiffHighlightColor = Color.FromName ("#000000").WithAlpha (0.05),
+					DiffBoxBorderColor = Color.FromName ("#eaeaea"),
+					SearchSnippetTextColor = "#f1c40f",
+				};
+
+				DiffView = new DiffViewStyle {
+					AddBackgroundColor = Color.FromName ("#85a885"),
+					AddBorderColor = Color.FromName ("#85a885"),
+					RemoveBackgroundColor = Color.FromName ("#b28c8c"),
+					RemoveBorderColor = Color.FromName ("#b28c8c"),
+					MergeBackgroundColor = Color.FromName ("#8585a8"),
+					MergeBorderColor = Color.FromName ("#8585a8"),
+				};
+			} else {
+				BlameView = new BlameViewStyle {
+					AnnotationMarkColor = Color.FromName ("#e5f1ff"),
+					AnnotationMarkModifiedColor = Color.FromName ("#ffff00"),
+					RangeHazeColor = Color.FromName ("#111111").WithAlpha (.4),
+					RangeSplitterColor = Color.FromName ("#5b5f68").WithAlpha (.6),
+				};
+
+				LogView = new LogViewStyle () {
+					DiffAddBackgroundColor = Color.FromName ("#7bc87b").AddLight (-0.1),
+					DiffRemoveBackgroundColor = Color.FromName ("#c88c8c").AddLight (-0.1),
+					DiffHighlightColor = MonoDevelop.Ide.Gui.Styles.BackgroundColor.AddLight (0.1),
+					DiffBoxBorderColor = Color.FromName ("#4c4c4c"),
+					SearchSnippetTextColor = "#f9d33c",
+				};
+
+				DiffView = new DiffViewStyle {
+					AddBackgroundColor = Color.FromName ("#85a885"),
+					AddBorderColor = Color.FromName ("#bef0be"),
+					RemoveBackgroundColor = Color.FromName ("#b28c8c"),
+					RemoveBorderColor = Color.FromName ("#ffffc8"),
+					MergeBackgroundColor = Color.FromName ("#8585a8"),
+					MergeBorderColor = Color.FromName ("#bebef0"),
+				};
+			}
+
+			// Shared
+
+			BlameView.AnnotationTextColor = MonoDevelop.Ide.Gui.Styles.BaseForegroundColor;
+			BlameView.AnnotationHighlightColor = MonoDevelop.Ide.Gui.Styles.SecondaryBackgroundLighterColor;
+			BlameView.AnnotationBackgroundColor = MonoDevelop.Ide.Gui.Styles.SecondaryBackgroundDarkerColor;
+			BlameView.AnnotationSplitterColor = MonoDevelop.Ide.Gui.Styles.SeparatorColor;
+			BlameView.AnnotationSummaryTextColor = MonoDevelop.Ide.Gui.Styles.DimTextColor;
+
+			LogView.CommitDescBackgroundColor = MonoDevelop.Ide.Gui.Styles.SecondaryBackgroundDarkerColor;
+			LogView.DiffBoxSplitterColor = MonoDevelop.Ide.Gui.Styles.PrimaryBackgroundColor;
+		}
+	}
+}
+
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
index 9808922e3d..649b930411 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
@@ -45,13 +45,13 @@ namespace MonoDevelop.VersionControl.Views
 		{
 			var document = Ide.IdeApp.Workbench.ActiveDocument;
 			try {
-				if (document == null || !document.IsFile || document.Window.FindView<IDiffView> () >= 0)
+				if (document == null || !document.IsFile || document.Window.FindView<ILogView> () >= 0)
 					return;
 
-				IWorkspaceObject project = document.Project;
+				WorkspaceObject project = document.Project;
 				if (project == null) {
 					// Fix for broken .csproj and .sln files not being seen as having a project.
-					foreach (var projItem in Ide.IdeApp.Workspace.GetAllSolutionItems<UnknownSolutionItem> ()) {
+					foreach (var projItem in Ide.IdeApp.Workspace.GetAllItems<UnknownSolutionItem> ()) {
 						if (projItem.FileName == document.FileName) {
 							project = projItem;
 						}
@@ -71,10 +71,10 @@ namespace MonoDevelop.VersionControl.Views
 
 				var item = new VersionControlItem (repo, project, document.FileName, false, null);
 				var vcInfo = new VersionControlDocumentInfo (document.PrimaryView, item, item.Repository);
-				TryAttachView <IDiffView> (document, vcInfo, DiffCommand.DiffViewHandlers);
-				TryAttachView <IBlameView> (document, vcInfo, BlameCommand.BlameViewHandlers);
-				TryAttachView <ILogView> (document, vcInfo, LogCommand.LogViewHandlers);
-				TryAttachView <IMergeView> (document, vcInfo, MergeCommand.MergeViewHandlers);
+				TryAttachView (document, vcInfo, DiffCommand.DiffViewHandlers);
+				TryAttachView (document, vcInfo, BlameCommand.BlameViewHandlers);
+				TryAttachView (document, vcInfo, LogCommand.LogViewHandlers);
+				TryAttachView (document, vcInfo, MergeCommand.MergeViewHandlers);
 			} catch (Exception ex) {
 				// If a user is hitting this, it will show a dialog box every time they
 				// switch to a document or open a document, so suppress the crash dialog
@@ -83,10 +83,9 @@ namespace MonoDevelop.VersionControl.Views
 			}
 		}
 		
-		static void TryAttachView <T>(Document document, VersionControlDocumentInfo info, string type)
-			where T : IAttachableViewContent
+		static void TryAttachView (Document document, VersionControlDocumentInfo info, string type)
 		{
-			var handler = AddinManager.GetExtensionObjects<IVersionControlViewHandler<T>> (type)
+			var handler = AddinManager.GetExtensionObjects<IVersionControlViewHandler> (type)
 				.FirstOrDefault (h => h.CanHandle (info.Item, info.Document));
 			if (handler != null)
 				document.Window.AttachViewContent (handler.CreateView (info));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/VersionControlDocumentInfo.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/VersionControlDocumentInfo.cs
index a002693010..9600b45fd7 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/VersionControlDocumentInfo.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/VersionControlDocumentInfo.cs
@@ -50,12 +50,6 @@ namespace MonoDevelop.VersionControl.Views
 			get;
 			set;
 		}
-
-		[Obsolete ("Use Item.VersionInfo instead of this.")]
-		public VersionInfo VersionInfo {
-			get;
-			set;
-		}
 		
 		public Repository Repository {
 			get { return Item.Repository; }
@@ -82,12 +76,12 @@ namespace MonoDevelop.VersionControl.Views
 				lock (updateLock) {
 					try {
 						History      = Item.Repository.GetHistory (Item.Path, null);
-						VersionInfo  = Item.Repository.GetVersionInfo (Item.Path, VersionInfoQueryFlags.IgnoreCache);
+						Item.VersionInfo  = Item.Repository.GetVersionInfo (Item.Path, VersionInfoQueryFlags.IgnoreCache);
 					} catch (Exception ex) {
 						LoggingService.LogError ("Error retrieving history", ex);
 					}
 					
-					DispatchService.GuiDispatch (delegate {
+					Runtime.RunInMainThread (delegate {
 						OnUpdated (EventArgs.Empty);
 					});
 					mre.Set ();
@@ -110,7 +104,7 @@ namespace MonoDevelop.VersionControl.Views
 				mre.WaitOne ();
 				mre.Dispose ();
 				mre = null;
-				DispatchService.GuiDispatch (delegate {
+				Runtime.RunInMainThread (delegate {
 					act ();
 				});
 			});
@@ -118,9 +112,7 @@ namespace MonoDevelop.VersionControl.Views
 		
 		protected virtual void OnUpdated (EventArgs e)
 		{
-			EventHandler handler = this.Updated;
-			if (handler != null)
-				handler (this, e);
+			Updated?.Invoke (this, e);
 		}
 
 		public event EventHandler Updated;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
index 409f07e00f..af01aa4c91 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
@@ -18,6 +18,7 @@
     <OutputPath>..\..\..\..\build\AddIns\VersionControl\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Execution>
       <Execution clr-version="Net_2_0" />
     </Execution>
@@ -112,6 +113,18 @@
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Mono.Cairo" />
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\..\external\roslyn\Binaries\Release\System.Reflection.Metadata.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\..\external\roslyn\Binaries\Release\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\..\external\roslyn\Binaries\Release\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="icons\added-overlay-16.png">
@@ -120,24 +133,96 @@
     <EmbeddedResource Include="icons\added-overlay-16%402x.png">
       <LogicalName>added-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\added-overlay-16~dark.png">
+      <LogicalName>added-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\added-overlay-16~dark%402x.png">
+      <LogicalName>added-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\added-overlay-16~sel.png">
+      <LogicalName>added-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\added-overlay-16~sel%402x.png">
+      <LogicalName>added-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\added-overlay-16~dark~sel.png">
+      <LogicalName>added-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\added-overlay-16~dark~sel%402x.png">
+      <LogicalName>added-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\modified-overlay-16.png">
       <LogicalName>modified-overlay-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\modified-overlay-16%402x.png">
       <LogicalName>modified-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\modified-overlay-16~dark.png">
+      <LogicalName>modified-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\modified-overlay-16~dark%402x.png">
+      <LogicalName>modified-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\modified-overlay-16~sel.png">
+      <LogicalName>modified-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\modified-overlay-16~sel%402x.png">
+      <LogicalName>modified-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\modified-overlay-16~dark~sel.png">
+      <LogicalName>modified-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\modified-overlay-16~dark~sel%402x.png">
+      <LogicalName>modified-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\conflict-overlay-16.png">
       <LogicalName>conflict-overlay-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\conflict-overlay-16%402x.png">
       <LogicalName>conflict-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\conflict-overlay-16~dark.png">
+      <LogicalName>conflict-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\conflict-overlay-16~dark%402x.png">
+      <LogicalName>conflict-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\conflict-overlay-16~sel.png">
+      <LogicalName>conflict-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\conflict-overlay-16~sel%402x.png">
+      <LogicalName>conflict-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\conflict-overlay-16~dark~sel.png">
+      <LogicalName>conflict-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\conflict-overlay-16~dark~sel%402x.png">
+      <LogicalName>conflict-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\locked-overlay-16.png">
       <LogicalName>locked-overlay-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\locked-overlay-16%402x.png">
       <LogicalName>locked-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\locked-overlay-16~dark.png">
+      <LogicalName>locked-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locked-overlay-16~dark%402x.png">
+      <LogicalName>locked-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locked-overlay-16~sel.png">
+      <LogicalName>locked-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locked-overlay-16~sel%402x.png">
+      <LogicalName>locked-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locked-overlay-16~dark~sel.png">
+      <LogicalName>locked-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\locked-overlay-16~dark~sel%402x.png">
+      <LogicalName>locked-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="VersionControl.addin.xml">
       <LogicalName>VersionControl.addin.xml</LogicalName>
     </EmbeddedResource>
@@ -147,48 +232,180 @@
     <EmbeddedResource Include="icons\removed-overlay-16%402x.png">
       <LogicalName>removed-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\removed-overlay-16~dark.png">
+      <LogicalName>removed-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\removed-overlay-16~dark%402x.png">
+      <LogicalName>removed-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\removed-overlay-16~sel.png">
+      <LogicalName>removed-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\removed-overlay-16~sel%402x.png">
+      <LogicalName>removed-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\removed-overlay-16~dark~sel.png">
+      <LogicalName>removed-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\removed-overlay-16~dark~sel%402x.png">
+      <LogicalName>removed-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\renamed-overlay-16.png">
       <LogicalName>renamed-overlay-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\renamed-overlay-16%402x.png">
       <LogicalName>renamed-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\renamed-overlay-16~dark.png">
+      <LogicalName>renamed-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\renamed-overlay-16~dark%402x.png">
+      <LogicalName>renamed-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\renamed-overlay-16~sel.png">
+      <LogicalName>renamed-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\renamed-overlay-16~sel%402x.png">
+      <LogicalName>renamed-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\renamed-overlay-16~dark~sel.png">
+      <LogicalName>renamed-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\renamed-overlay-16~dark~sel%402x.png">
+      <LogicalName>renamed-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\ignored-overlay-16.png">
       <LogicalName>ignored-overlay-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\ignored-overlay-16%402x.png">
       <LogicalName>ignored-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\ignored-overlay-16~dark.png">
+      <LogicalName>ignored-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\ignored-overlay-16~dark%402x.png">
+      <LogicalName>ignored-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\ignored-overlay-16~sel.png">
+      <LogicalName>ignored-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\ignored-overlay-16~sel%402x.png">
+      <LogicalName>ignored-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\ignored-overlay-16~dark~sel.png">
+      <LogicalName>ignored-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\ignored-overlay-16~dark~sel%402x.png">
+      <LogicalName>ignored-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\repository-16.png">
       <LogicalName>repository-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\repository-16%402x.png">
       <LogicalName>repository-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\repository-16~dark.png">
+      <LogicalName>repository-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\repository-16~dark%402x.png">
+      <LogicalName>repository-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\versioned-overlay-16.png">
       <LogicalName>versioned-overlay-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\versioned-overlay-16%402x.png">
       <LogicalName>versioned-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\versioned-overlay-16~dark.png">
+      <LogicalName>versioned-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\versioned-overlay-16~dark%402x.png">
+      <LogicalName>versioned-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\versioned-overlay-16~sel.png">
+      <LogicalName>versioned-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\versioned-overlay-16~sel%402x.png">
+      <LogicalName>versioned-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\versioned-overlay-16~dark~sel.png">
+      <LogicalName>versioned-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\versioned-overlay-16~dark~sel%402x.png">
+      <LogicalName>versioned-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\unversioned-overlay-16.png">
       <LogicalName>unversioned-overlay-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\unversioned-overlay-16%402x.png">
       <LogicalName>unversioned-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\unversioned-overlay-16~dark.png">
+      <LogicalName>unversioned-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unversioned-overlay-16~dark%402x.png">
+      <LogicalName>unversioned-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unversioned-overlay-16~sel.png">
+      <LogicalName>unversioned-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unversioned-overlay-16~sel%402x.png">
+      <LogicalName>unversioned-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unversioned-overlay-16~dark~sel.png">
+      <LogicalName>unversioned-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unversioned-overlay-16~dark~sel%402x.png">
+      <LogicalName>unversioned-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\lock-required-overlay-16.png">
       <LogicalName>lock-required-overlay-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\lock-required-overlay-16%402x.png">
       <LogicalName>lock-required-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\lock-required-overlay-16~dark.png">
+      <LogicalName>lock-required-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lock-required-overlay-16~dark%402x.png">
+      <LogicalName>lock-required-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lock-required-overlay-16~sel.png">
+      <LogicalName>lock-required-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lock-required-overlay-16~sel%402x.png">
+      <LogicalName>lock-required-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lock-required-overlay-16~dark~sel.png">
+      <LogicalName>lock-required-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\lock-required-overlay-16~dark~sel%402x.png">
+      <LogicalName>lock-required-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\unlocked-overlay-16.png">
       <LogicalName>unlocked-overlay-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\unlocked-overlay-16%402x.png">
       <LogicalName>unlocked-overlay-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\unlocked-overlay-16~dark.png">
+      <LogicalName>unlocked-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unlocked-overlay-16~dark%402x.png">
+      <LogicalName>unlocked-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unlocked-overlay-16~sel.png">
+      <LogicalName>unlocked-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unlocked-overlay-16~sel%402x.png">
+      <LogicalName>unlocked-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unlocked-overlay-16~dark~sel.png">
+      <LogicalName>unlocked-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\unlocked-overlay-16~dark~sel%402x.png">
+      <LogicalName>unlocked-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="Policies.xml">
       <LogicalName>Policies.xml</LogicalName>
     </EmbeddedResource>
@@ -201,125 +418,479 @@
     <EmbeddedResource Include="icons\version-control-16%402x.png">
       <LogicalName>version-control-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\version-control-16~dark.png">
+      <LogicalName>version-control-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\version-control-16~dark%402x.png">
+      <LogicalName>version-control-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\log-16.png">
       <LogicalName>log-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\log-16%402x.png">
       <LogicalName>log-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\log-16~dark.png">
+      <LogicalName>log-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\log-16~dark%402x.png">
+      <LogicalName>log-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\diff-16.png">
       <LogicalName>diff-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\diff-16%402x.png">
       <LogicalName>diff-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\diff-16~dark.png">
+      <LogicalName>diff-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\diff-16~dark%402x.png">
+      <LogicalName>diff-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\diff-16~disabled.png">
+      <LogicalName>diff-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\diff-16~disabled%402x.png">
+      <LogicalName>diff-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\diff-16~dark~disabled.png">
+      <LogicalName>diff-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\diff-16~dark~disabled%402x.png">
+      <LogicalName>diff-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-added-15.png">
+      <LogicalName>gutter-added-15.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-added-15%402x.png">
+      <LogicalName>gutter-added-15@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-removed-15.png">
+      <LogicalName>gutter-removed-15.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\gutter-removed-15%402x.png">
+      <LogicalName>gutter-removed-15@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\pull-16.png">
       <LogicalName>pull-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\pull-16%402x.png">
       <LogicalName>pull-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\pull-16~dark.png">
+      <LogicalName>pull-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pull-16~dark%402x.png">
+      <LogicalName>pull-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pull-16~disabled.png">
+      <LogicalName>pull-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pull-16~disabled%402x.png">
+      <LogicalName>pull-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pull-16~dark~disabled.png">
+      <LogicalName>pull-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\pull-16~dark~disabled%402x.png">
+      <LogicalName>pull-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\push-16.png">
       <LogicalName>push-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\push-16%402x.png">
       <LogicalName>push-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\push-16~dark.png">
+      <LogicalName>push-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\push-16~dark%402x.png">
+      <LogicalName>push-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\push-16~disabled.png">
+      <LogicalName>push-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\push-16~disabled%402x.png">
+      <LogicalName>push-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\push-16~dark~disabled.png">
+      <LogicalName>push-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\push-16~dark~disabled%402x.png">
+      <LogicalName>push-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\refresh-16.png">
       <LogicalName>refresh-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\refresh-16%402x.png">
       <LogicalName>refresh-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\refresh-16~dark.png">
+      <LogicalName>refresh-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\refresh-16~dark%402x.png">
+      <LogicalName>refresh-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\refresh-16~disabled.png">
+      <LogicalName>refresh-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\refresh-16~disabled%402x.png">
+      <LogicalName>refresh-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\refresh-16~dark~disabled.png">
+      <LogicalName>refresh-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\refresh-16~dark~disabled%402x.png">
+      <LogicalName>refresh-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\local-status-16.png">
       <LogicalName>local-status-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\local-status-16%402x.png">
       <LogicalName>local-status-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\local-status-16~dark.png">
+      <LogicalName>local-status-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\local-status-16~dark%402x.png">
+      <LogicalName>local-status-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\commit-16.png">
       <LogicalName>commit-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\commit-16%402x.png">
       <LogicalName>commit-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\commit-16~dark.png">
+      <LogicalName>commit-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\commit-16~dark%402x.png">
+      <LogicalName>commit-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\commit-16~disabled.png">
+      <LogicalName>commit-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\commit-16~disabled%402x.png">
+      <LogicalName>commit-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\commit-16~dark~disabled.png">
+      <LogicalName>commit-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\commit-16~dark~disabled%402x.png">
+      <LogicalName>commit-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\remote-status-16.png">
       <LogicalName>remote-status-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\remote-status-16%402x.png">
       <LogicalName>remote-status-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\remote-status-16~dark.png">
+      <LogicalName>remote-status-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\remote-status-16~dark%402x.png">
+      <LogicalName>remote-status-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\remote-status-16~disabled.png">
+      <LogicalName>remote-status-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\remote-status-16~disabled%402x.png">
+      <LogicalName>remote-status-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\remote-status-16~dark~disabled.png">
+      <LogicalName>remote-status-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\remote-status-16~dark~disabled%402x.png">
+      <LogicalName>remote-status-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-added-16.png">
       <LogicalName>vcs-added-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-added-16%402x.png">
       <LogicalName>vcs-added-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-added-16~dark.png">
+      <LogicalName>vcs-added-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-added-16~dark%402x.png">
+      <LogicalName>vcs-added-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-added-16~disabled.png">
+      <LogicalName>vcs-added-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-added-16~disabled%402x.png">
+      <LogicalName>vcs-added-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-added-16~dark~disabled.png">
+      <LogicalName>vcs-added-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-added-16~dark~disabled%402x.png">
+      <LogicalName>vcs-added-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-removed-16.png">
       <LogicalName>vcs-removed-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-removed-16%402x.png">
       <LogicalName>vcs-removed-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-removed-16~dark.png">
+      <LogicalName>vcs-removed-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-removed-16~dark%402x.png">
+      <LogicalName>vcs-removed-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-removed-16~disabled.png">
+      <LogicalName>vcs-removed-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-removed-16~disabled%402x.png">
+      <LogicalName>vcs-removed-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-removed-16~dark~disabled.png">
+      <LogicalName>vcs-removed-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-removed-16~dark~disabled%402x.png">
+      <LogicalName>vcs-removed-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-renamed-16.png">
       <LogicalName>vcs-renamed-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-renamed-16%402x.png">
       <LogicalName>vcs-renamed-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-renamed-16~dark.png">
+      <LogicalName>vcs-renamed-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-renamed-16~dark%402x.png">
+      <LogicalName>vcs-renamed-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-renamed-16~disabled.png">
+      <LogicalName>vcs-renamed-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-renamed-16~disabled%402x.png">
+      <LogicalName>vcs-renamed-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-renamed-16~dark~disabled.png">
+      <LogicalName>vcs-renamed-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-renamed-16~dark~disabled%402x.png">
+      <LogicalName>vcs-renamed-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-conflicted-16.png">
       <LogicalName>vcs-conflicted-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-conflicted-16%402x.png">
       <LogicalName>vcs-conflicted-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-conflicted-16~dark.png">
+      <LogicalName>vcs-conflicted-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-conflicted-16~dark%402x.png">
+      <LogicalName>vcs-conflicted-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-conflicted-16~disabled.png">
+      <LogicalName>vcs-conflicted-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-conflicted-16~disabled%402x.png">
+      <LogicalName>vcs-conflicted-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-conflicted-16~dark~disabled.png">
+      <LogicalName>vcs-conflicted-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-conflicted-16~dark~disabled%402x.png">
+      <LogicalName>vcs-conflicted-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-modified-16.png">
       <LogicalName>vcs-modified-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\vcs-modified-16%402x.png">
       <LogicalName>vcs-modified-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-modified-16~dark.png">
+      <LogicalName>vcs-modified-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-modified-16~dark%402x.png">
+      <LogicalName>vcs-modified-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-modified-16~disabled.png">
+      <LogicalName>vcs-modified-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-modified-16~disabled%402x.png">
+      <LogicalName>vcs-modified-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-modified-16~dark~disabled.png">
+      <LogicalName>vcs-modified-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\vcs-modified-16~dark~disabled%402x.png">
+      <LogicalName>vcs-modified-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\comment-16.png">
       <LogicalName>comment-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\comment-16%402x.png">
       <LogicalName>comment-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\comment-16~dark.png">
+      <LogicalName>comment-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\comment-16~dark%402x.png">
+      <LogicalName>comment-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\comment-16~disabled.png">
+      <LogicalName>comment-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\comment-16~disabled%402x.png">
+      <LogicalName>comment-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\comment-16~dark~disabled.png">
+      <LogicalName>comment-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\comment-16~dark~disabled%402x.png">
+      <LogicalName>comment-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\revert-16.png">
       <LogicalName>revert-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\revert-16%402x.png">
       <LogicalName>revert-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\revert-16~dark.png">
+      <LogicalName>revert-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\revert-16~dark%402x.png">
+      <LogicalName>revert-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\revert-16~disabled.png">
+      <LogicalName>revert-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\revert-16~disabled%402x.png">
+      <LogicalName>revert-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\revert-16~dark~disabled.png">
+      <LogicalName>revert-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\revert-16~dark~disabled%402x.png">
+      <LogicalName>revert-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\branch-16.png">
       <LogicalName>branch-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\branch-16%402x.png">
       <LogicalName>branch-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\branch-16~dark.png">
+      <LogicalName>branch-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\branch-16~dark%402x.png">
+      <LogicalName>branch-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\branch-16~disabled.png">
+      <LogicalName>branch-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\branch-16~disabled%402x.png">
+      <LogicalName>branch-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\branch-16~dark~disabled.png">
+      <LogicalName>branch-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\branch-16~dark~disabled%402x.png">
+      <LogicalName>branch-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\tag-16.png">
       <LogicalName>tag-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\tag-16%402x.png">
       <LogicalName>tag-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\tag-16~dark.png">
+      <LogicalName>tag-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\tag-16~dark%402x.png">
+      <LogicalName>tag-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\tag-16~disabled.png">
+      <LogicalName>tag-16~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\tag-16~disabled%402x.png">
+      <LogicalName>tag-16~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\tag-16~dark~disabled.png">
+      <LogicalName>tag-16~dark~disabled.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\tag-16~dark~disabled%402x.png">
+      <LogicalName>tag-16~dark~disabled@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-git-16.png">
       <LogicalName>prefs-git-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-git-16%402x.png">
       <LogicalName>prefs-git-16@2x.png</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-git-16~dark.png">
+      <LogicalName>prefs-git-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-git-16~dark%402x.png">
+      <LogicalName>prefs-git-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-git-16~sel.png">
+      <LogicalName>prefs-git-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-git-16~sel%402x.png">
+      <LogicalName>prefs-git-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-git-16~dark~sel.png">
+      <LogicalName>prefs-git-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-git-16~dark~sel%402x.png">
+      <LogicalName>prefs-git-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-commit-message-style-16.png">
       <LogicalName>prefs-commit-message-style-16.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\prefs-commit-message-style-16%402x.png">
       <LogicalName>prefs-commit-message-style-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-version-control-general-16.png">
-      <LogicalName>prefs-version-control-general-16.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-commit-message-style-16~dark.png">
+      <LogicalName>prefs-commit-message-style-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-commit-message-style-16~dark%402x.png">
+      <LogicalName>prefs-commit-message-style-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-commit-message-style-16~sel.png">
+      <LogicalName>prefs-commit-message-style-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-commit-message-style-16~sel%402x.png">
+      <LogicalName>prefs-commit-message-style-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-commit-message-style-16~dark~sel.png">
+      <LogicalName>prefs-commit-message-style-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-commit-message-style-16~dark~sel%402x.png">
+      <LogicalName>prefs-commit-message-style-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-version-control-16.png">
+      <LogicalName>prefs-version-control-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-version-control-16%402x.png">
+      <LogicalName>prefs-version-control-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-version-control-16~dark.png">
+      <LogicalName>prefs-version-control-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-version-control-16~dark%402x.png">
+      <LogicalName>prefs-version-control-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-version-control-16~sel.png">
+      <LogicalName>prefs-version-control-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-version-control-16~sel%402x.png">
+      <LogicalName>prefs-version-control-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-version-control-16~dark~sel.png">
+      <LogicalName>prefs-version-control-16~dark~sel.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-version-control-general-16%402x.png">
-      <LogicalName>prefs-version-control-general-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-version-control-16~dark~sel%402x.png">
+      <LogicalName>prefs-version-control-16~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -341,7 +912,6 @@
     <Compile Include="MonoDevelop.VersionControl\Repository.cs" />
     <Compile Include="MonoDevelop.VersionControl\RevertCommand.cs" />
     <Compile Include="MonoDevelop.VersionControl\Revision.cs" />
-    <Compile Include="MonoDevelop.VersionControl\Task.cs" />
     <Compile Include="MonoDevelop.VersionControl\UnknownRepository.cs" />
     <Compile Include="MonoDevelop.VersionControl\UpdateCommand.cs" />
     <Compile Include="MonoDevelop.VersionControl\UrlBasedRepository.cs" />
@@ -407,7 +977,10 @@
     <Compile Include="MonoDevelop.VersionControl.Dialogs\VersionControlSolutionOptionsPanel.cs" />
     <Compile Include="AddinInfo.cs" />
     <Compile Include="MonoDevelop.VersionControl\VersionControlException.cs" />
+    <Compile Include="MonoDevelop.VersionControl\VersionControlTask.cs" />
+    <Compile Include="MonoDevelop.VersionControl.Views\CommonTextEditorOptions.cs" />
     <Compile Include="MonoDevelop.VersionControl.Views\BaseView.cs" />
+    <Compile Include="MonoDevelop.VersionControl.Views\Styles.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
index 7a164f686a..be9da672f5 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
@@ -17,7 +17,7 @@ namespace MonoDevelop.VersionControl
 			return true;
 		}
 		
-		private class AddWorker : Task {
+		private class AddWorker : VersionControlTask {
 			VersionControlItemList items;
 						
 			public AddWorker (VersionControlItemList items) 
@@ -32,7 +32,7 @@ namespace MonoDevelop.VersionControl
 			
 			protected override void Run ()
 			{
-				IProgressMonitor monitor = Monitor;
+				ProgressMonitor monitor = Monitor;
 
 				foreach (VersionControlItemList list in items.SplitByRepository ())
 					list[0].Repository.Add (list.Paths, true, monitor);
@@ -109,7 +109,7 @@ namespace MonoDevelop.VersionControl
 			return true;
 		}
 		
-		private class RemoveWorker : Task {
+		private class RemoveWorker : VersionControlTask {
 			VersionControlItemList items;
 						
 			public RemoveWorker (VersionControlItemList items) {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
index 26504cf950..aaf261fb93 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System.Linq;
+using System.Threading.Tasks;
 using Mono.Addins;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
@@ -41,16 +42,16 @@ namespace MonoDevelop.VersionControl
 			return !item.IsDirectory
 				// FIXME: Review appending of Annotate support and use it.
 				&& item.VersionInfo.IsVersioned
-				&& AddinManager.GetExtensionObjects<IBlameViewHandler> (BlameViewHandlers).Any (h => h.CanHandle (item, null));
+				&& AddinManager.GetExtensionObjects<IVersionControlViewHandler> (BlameViewHandlers).Any (h => h.CanHandle (item, null));
 		}
 		
-		public static bool Show (VersionControlItemList items, bool test)
+		public static async Task<bool> Show (VersionControlItemList items, bool test)
 		{
 			if (test)
 				return items.All (CanShow);
 			
 			foreach (var item in items) {
-				var document = IdeApp.Workbench.OpenDocument (item.Path, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
+				var document = await IdeApp.Workbench.OpenDocument (item.Path, item.ContainerProject, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
 				if (document != null)
 					document.Window.SwitchView (document.Window.FindView<IBlameView> ());
 			}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
index 140d94f1b0..33763dd9de 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
@@ -26,83 +26,74 @@ namespace MonoDevelop.VersionControl
 				del.Destroy ();
 				del.Dispose ();
 			}
-		}
-	}
-	
-	class CheckoutWorker : Task
-	{
-		Repository vc;
-		string path;
-					
-		public CheckoutWorker (Repository vc, string path)
-		{
-			this.vc = vc;
-			this.path = path;
-			OperationType = VersionControlOperationType.Pull;
-		}
-		
-		protected override string GetDescription ()
-		{
-			return GettextCatalog.GetString ("Checking out {0}...", path);
-		}
-		
-		protected override IProgressMonitor CreateProgressMonitor ()
-		{
-			return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
-				base.CreateProgressMonitor (),
-				new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
-			);
-		}
-		
-		protected override void Run () 
-		{
-			if (System.IO.Directory.Exists (path) && System.IO.Directory.EnumerateFileSystemEntries (path).Any ()) {
-				if (MessageService.AskQuestion (GettextCatalog.GetString (
-					    "Checkout path is not empty. Do you want to delete its contents?"),
-					    path,
-					    AlertButton.Cancel,
-					    AlertButton.Ok) == AlertButton.Cancel)
-					return;
-				FileService.DeleteDirectory (path);
-				FileService.CreateDirectory (path);
-			}
-
-			try {
-				vc.Checkout (path, null, true, Monitor);
-			} catch (VersionControlException e) {
-				Monitor.ReportError (e.Message, null);
-				return;
-			}
-
-			if (Monitor.IsCancelRequested) {
-				Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
-				return;
-			}
-
-			if (!System.IO.Directory.Exists (path)) {
-				Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
-				return;
-			}
-
-			string projectFn = null;
-			
-			string[] list = System.IO.Directory.GetFiles (path);
-			if (projectFn == null) {
-				foreach (string str in list) {
-					if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
-						projectFn = str;
-						break;
-					}
-				}	
-			}
-			
-			if (projectFn != null) {
-				DispatchService.GuiDispatch (delegate {
-					IdeApp.Workspace.OpenWorkspaceItem (projectFn);
-				});
-			}
-			
-			Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
+		}

+

+		class CheckoutWorker : VersionControlTask

+		{

+			Repository vc;

+			string path;

+

+			public CheckoutWorker (Repository vc, string path)

+			{

+				this.vc = vc;

+				this.path = path;

+				OperationType = VersionControlOperationType.Pull;

+			}

+

+			protected override string GetDescription ()

+			{

+				return GettextCatalog.GetString ("Checking out {0}...", path);

+			}

+

+			protected override ProgressMonitor CreateProgressMonitor ()

+			{

+				return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (

+					base.CreateProgressMonitor (),

+					new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)

+				);

+			}

+

+			protected override void Run ()

+			{

+				if (System.IO.Directory.Exists (path) && System.IO.Directory.EnumerateFileSystemEntries (path).Any ()) {

+					if (MessageService.AskQuestion (GettextCatalog.GetString (

+							"Checkout path is not empty. Do you want to delete its contents?"),

+							path,

+							AlertButton.Cancel,

+							AlertButton.Ok) == AlertButton.Cancel)

+						return;

+					FileService.DeleteDirectory (path);

+					FileService.CreateDirectory (path);

+				}

+

+				try {

+					vc.Checkout (path, null, true, Monitor);

+				} catch (VersionControlException e) {

+					Monitor.ReportError (e.Message, null);

+					return;

+				}

+

+				if (Monitor.CancellationToken.IsCancellationRequested) {

+					Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));

+					return;

+				}

+

+				if (!System.IO.Directory.Exists (path)) {

+					Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);

+					return;

+				}

+

+				foreach (string str in System.IO.Directory.EnumerateFiles (path, "*", System.IO.SearchOption.AllDirectories)) {

+					if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {

+						Runtime.RunInMainThread (delegate {

+							IdeApp.Workspace.OpenWorkspaceItem (str);

+						});

+						break;

+					}

+				}

+

+				Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));

+			}

 		}
 	}
 }
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
index 64dd18ff92..be79ed4eff 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
@@ -37,7 +37,7 @@ namespace MonoDevelop.VersionControl
 		{
 			VersionControlItemList list = new VersionControlItemList ();
 			
-			IWorkspaceObject wob;
+			WorkspaceObject wob;
 			Repository repo = null;
 			wob = IdeApp.ProjectOperations.CurrentSelectedWorkspaceItem;
 			if (wob != null)
@@ -243,7 +243,7 @@ namespace MonoDevelop.VersionControl
 		}
 	}
 
-	class CurrentFileViewHandler<T> : FileVersionControlCommandHandler where T:IAttachableViewContent
+	class CurrentFileViewHandler<T> : FileVersionControlCommandHandler
 	{
 		protected override bool RunCommand (VersionControlItemList items, bool test)
 		{
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
index a26d612fd8..b26ac01403 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
@@ -33,7 +33,7 @@ namespace MonoDevelop.VersionControl
 			}
 		}
 
-		private class CommitWorker : Task
+		private class CommitWorker : VersionControlTask
 		{
 			Repository vc;
 			ChangeSet changeSet;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitDialogExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitDialogExtension.cs
index eb2d119063..59f9fe1025 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitDialogExtension.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitDialogExtension.cs
@@ -79,8 +79,7 @@ namespace MonoDevelop.VersionControl
 				if (value == allowCommit)
 					return;
 				allowCommit = value;
-				if (AllowCommitChanged != null)
-					AllowCommitChanged (this, EventArgs.Empty);
+				AllowCommitChanged?.Invoke (this, EventArgs.Empty);
 			}
 		}
 	}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
index 196bc9ebc6..6cd2baf611 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
@@ -108,7 +108,7 @@ namespace MonoDevelop.VersionControl
 		/// Determines whether a patch can be created 
 		/// from a ChangeSet.
 		/// </summary>
-		public static bool CanCreatePatch (ChangeSet items) 
+		static bool CanCreatePatch (ChangeSet items)
 		{
 			if (null == items || 0 == items.Count){ return false; }
 			
@@ -120,7 +120,7 @@ namespace MonoDevelop.VersionControl
 		/// Determines whether a patch can be created 
 		/// from a VersionControlItemList.
 		/// </summary>
-		public static bool CanCreatePatch (VersionControlItemList items) 
+		static bool CanCreatePatch (VersionControlItemList items)
 		{
 			if (null == items || 0 == items.Count){ return false; }
 			return items.All (i => i.VersionInfo.CanRevert);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
index 1259363f52..01d1846ea1 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
@@ -31,7 +31,7 @@ using MonoDevelop.Projects.Text;
 
 namespace MonoDevelop.VersionControl
 {
-	public class DefaultBlameViewHandler : IBlameViewHandler
+	public class DefaultBlameViewHandler : IVersionControlViewHandler
 	{
 		public bool CanHandle (VersionControlItem item, DocumentView primaryView)
 		{
@@ -39,7 +39,7 @@ namespace MonoDevelop.VersionControl
 				&& item.Repository.GetFileIsText (item.Path);
 		}
 
-		public IBlameView CreateView (VersionControlDocumentInfo info)
+		public BaseViewContent CreateView (VersionControlDocumentInfo info)
 		{
 			return new BlameView (info);
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
index 4a2e775386..40ac9fa5ea 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
@@ -31,7 +31,7 @@ using MonoDevelop.Projects.Text;
 
 namespace MonoDevelop.VersionControl
 {
-	public class DefaultDiffViewHandler : IDiffViewHandler
+	public class DefaultDiffViewHandler : IVersionControlViewHandler
 	{
 		public bool CanHandle (VersionControlItem item, DocumentView primaryView)
 		{
@@ -39,7 +39,7 @@ namespace MonoDevelop.VersionControl
 				&& item.Repository.GetFileIsText (item.Path);
 		}
 
-		public IDiffView CreateView (VersionControlDocumentInfo info)
+		public BaseViewContent CreateView (VersionControlDocumentInfo info)
 		{
 			return new DiffView (info);
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
index 9537bb7dfa..51b8c6b613 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
@@ -29,14 +29,14 @@ using MonoDevelop.VersionControl.Views;
 
 namespace MonoDevelop.VersionControl
 {
-	public class DefaultLogViewHandler : ILogViewHandler
+	public class DefaultLogViewHandler : IVersionControlViewHandler
 	{
 		public bool CanHandle (VersionControlItem item, DocumentView primaryView)
 		{
 			return true;
 		}
 
-		public ILogView CreateView (VersionControlDocumentInfo info)
+		public BaseViewContent CreateView (VersionControlDocumentInfo info)
 		{
 			return new LogView (info);
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
index aba6756b08..ae646cd4b8 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
@@ -31,7 +31,7 @@ using MonoDevelop.Projects.Text;
 
 namespace MonoDevelop.VersionControl
 {
-	public class DefaultMergeViewHandler : IMergeViewHandler
+	public class DefaultMergeViewHandler : IVersionControlViewHandler
 	{
 		public bool CanHandle (VersionControlItem item, DocumentView primaryView)
 		{
@@ -39,7 +39,7 @@ namespace MonoDevelop.VersionControl
 				&& item.Repository.GetFileIsText (item.Path);
 		}
 
-		public IMergeView CreateView (VersionControlDocumentInfo info)
+		public BaseViewContent CreateView (VersionControlDocumentInfo info)
 		{
 			return new MergeView (info);
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
index 9791860917..46ee00b80d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System.Linq;
+using System.Threading.Tasks;
 using Mono.Addins;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
@@ -40,16 +41,16 @@ namespace MonoDevelop.VersionControl
 		{
 			return !item.IsDirectory 
 				&& item.VersionInfo.IsVersioned
-				&& AddinManager.GetExtensionObjects<IDiffViewHandler> (DiffViewHandlers).Any (h => h.CanHandle (item, null));
+				&& AddinManager.GetExtensionObjects<IVersionControlViewHandler> (DiffViewHandlers).Any (h => h.CanHandle (item, null));
 		}
 		
-		public static bool Show (VersionControlItemList items, bool test)
+		public static async Task<bool> Show (VersionControlItemList items, bool test)
 		{
 			if (test)
 				return items.All (CanShow);
 			
 			foreach (var item in items) {
-				var document = IdeApp.Workbench.OpenDocument (item.Path, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
+				var document = await IdeApp.Workbench.OpenDocument (item.Path, item.ContainerProject, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
 				if (document != null)
 					document.Window.SwitchView (document.Window.FindView<IDiffView> ());
 			}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IRepositoryEditor.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IRepositoryEditor.cs
index e1ecd5957d..ffd5a697a7 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IRepositoryEditor.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IRepositoryEditor.cs
@@ -1,34 +1,37 @@
-// 
-// IRepositoryEditor.cs
-//  
-// Author:
-//       Lluis Sanchez Gual <lluis@novell.com>
-// 
-// Copyright (c) 2010 Novell, Inc (http://www.novell.com)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
+// 

+// IRepositoryEditor.cs

+//  

+// Author:

+//       Lluis Sanchez Gual <lluis@novell.com>

+// 

+// Copyright (c) 2010 Novell, Inc (http://www.novell.com)

+// 

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+// 

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+using MonoDevelop.Components;

+

 namespace MonoDevelop.VersionControl
 {
 	public interface IRepositoryEditor
 	{
-		Gtk.Widget Widget { get; }
+		Control Widget { get; }

+		void Show ();
 		bool Validate ();
 	}
 }
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IVersionControlViewHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IVersionControlViewHandler.cs
index da8611f941..2620d3c664 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IVersionControlViewHandler.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IVersionControlViewHandler.cs
@@ -29,31 +29,10 @@ using MonoDevelop.Ide.Gui;
 
 namespace MonoDevelop.VersionControl {
 	
-	public interface IVersionControlViewHandler<T>
-		where T : IAttachableViewContent
+	public interface IVersionControlViewHandler
 	{
 		bool CanHandle (VersionControlItem item, DocumentView primaryView);
-		T CreateView (VersionControlDocumentInfo info);
-	}
-	
-	public interface IDiffViewHandler : IVersionControlViewHandler<IDiffView>
-	{
-		
-	}
-	
-	public interface IBlameViewHandler : IVersionControlViewHandler<IBlameView>
-	{
-		
-	}
-	
-	public interface ILogViewHandler : IVersionControlViewHandler<ILogView>
-	{
-		
-	}
-	
-	public interface IMergeViewHandler : IVersionControlViewHandler<IMergeView>
-	{
-		
+		BaseViewContent CreateView (VersionControlDocumentInfo info);
 	}
 }
 
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
index b39bfb8af4..2e035e90ce 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
@@ -62,7 +62,7 @@ namespace MonoDevelop.VersionControl
 			}

 		}

 

-		private class IgnoreWorker : Task

+		private class IgnoreWorker : VersionControlTask

 		{

 			VersionControlItemList items;

 

@@ -125,7 +125,7 @@ namespace MonoDevelop.VersionControl
 			}

 		}

 

-		private class UnignoreWorker : Task

+		private class UnignoreWorker : VersionControlTask

 		{

 			VersionControlItemList items;

 

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
index 2e318afdd6..684ded981b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
@@ -43,7 +43,7 @@ namespace MonoDevelop.VersionControl
 			return true;
 		}
 
-		private class LockWorker : Task 
+		private class LockWorker : VersionControlTask 
 		{
 			VersionControlItemList items;
 						
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
index ec00f7670c..5ccdc31213 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System.Linq;
+using System.Threading.Tasks;
 using Mono.Addins;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
@@ -40,28 +41,26 @@ namespace MonoDevelop.VersionControl
 		{
 			// We want directories to be able to view the log for an entire directory
 			// by selecting it from the solution pane
-			return item.VersionInfo.IsVersioned
-				&& AddinManager.GetExtensionObjects<ILogViewHandler> (LogViewHandlers).Any (h => h.CanHandle (item, null));
+			return item.VersionInfo.IsVersioned && 
+				       AddinManager.GetExtensionObjects<IVersionControlViewHandler> (LogViewHandlers).Any (h => h.CanHandle (item, null));
 		}
 		
-		public static bool Show (VersionControlItemList items, bool test)
+		public static async Task<bool> Show (VersionControlItemList items, bool test)
 		{
 			if (test)
 				return items.All (CanShow);
 			
 			foreach (var item in items) {
-				Document document = null;
-				if (!item.IsDirectory)
-					document = IdeApp.Workbench.OpenDocument (item.Path, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
-
-				if (document != null) {
+				if (!item.IsDirectory) {

+					Document document = await IdeApp.Workbench.OpenDocument (item.Path, item.ContainerProject, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
 					document.Window.SwitchView (document.Window.FindView<ILogView> ());
-				} else {
-					VersionControlDocumentInfo info = new VersionControlDocumentInfo (null, item, item.Repository);
-					LogView logView = new LogView (info);
-					info.Document = IdeApp.Workbench.OpenDocument (logView, true).PrimaryView;
-					logView.Selected ();	
+					continue;
 				}
+
+				var info = new VersionControlDocumentInfo (null, item, item.Repository);
+				var logView = new LogView (info);
+				info.Document = IdeApp.Workbench.OpenDocument (logView, true).PrimaryView;
+				logView.Init ();
 			}
 			
 			return true;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
index 43f5d86499..766a32d95a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System.Linq;
+using System.Threading.Tasks;
 using Mono.Addins;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
@@ -40,16 +41,16 @@ namespace MonoDevelop.VersionControl
 		{
 			return !item.IsDirectory
 				&& item.VersionInfo.IsVersioned
-				&& AddinManager.GetExtensionObjects<IMergeViewHandler> (MergeViewHandlers).Any (h => h.CanHandle (item, null));
+				&& AddinManager.GetExtensionObjects<IVersionControlViewHandler> (MergeViewHandlers).Any (h => h.CanHandle (item, null));
 		}
 		
-		public static bool Show (VersionControlItemList items, bool test)
+		public static async Task<bool> Show (VersionControlItemList items, bool test)
 		{
 			if (test)
 				return items.All (CanShow);
 			
 			foreach (var item in items) {
-				var document = IdeApp.Workbench.OpenDocument (item.Path, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
+				var document = await IdeApp.Workbench.OpenDocument (item.Path, item.ContainerProject, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
 				if (document != null)
 					document.Window.SwitchView (document.Window.FindView<IMergeView> ());
 			}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
index 7f0f78f8d1..b7a27f5535 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
@@ -10,7 +10,7 @@ namespace MonoDevelop.VersionControl
 {
 	internal class PublishCommand 
 	{

-		public static bool Publish (IWorkspaceObject entry, FilePath localPath, bool test)
+		public static bool Publish (WorkspaceObject entry, FilePath localPath, bool test)
 		{
 			if (test)
 				return VersionControlService.CheckVersionControlInstalled () && VersionControlService.GetRepository (entry) == null;
@@ -37,7 +37,7 @@ namespace MonoDevelop.VersionControl
 				dlg.Message = GettextCatalog.GetString ("Initial check-in of module {0}", moduleName);
 				do {
 					if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok && dlg.Repository != null) {
-						AlertButton publishButton = new AlertButton ("_Publish");					
+						AlertButton publishButton = new AlertButton (GettextCatalog.GetString ("_Publish"));
 						if (MessageService.AskQuestion (GettextCatalog.GetString ("Are you sure you want to publish the project?"), GettextCatalog.GetString ("The project will be published to the repository '{0}', module '{1}'.", dlg.Repository.Name, dlg.ModuleName), AlertButton.Cancel, publishButton) == publishButton) {
 							PublishWorker w = new PublishWorker (dlg.Repository, dlg.ModuleName, localPath, files.ToArray (), dlg.Message);
 							w.Start ();
@@ -53,7 +53,7 @@ namespace MonoDevelop.VersionControl
 			return true;
 		}

 

-		static void GetFiles (List<FilePath> files, IWorkspaceObject entry)
+		static void GetFiles (List<FilePath> files, WorkspaceObject entry)
 		{
 			// Ensure that we strip out all linked files from outside of the solution/projects path.
 			if (entry is IWorkspaceFileObject)
@@ -67,44 +67,45 @@ namespace MonoDevelop.VersionControl
 			if (!vc.GetVersionInfo (path).IsVersioned && isDir) 
 				return true;
 			return false;
-		}
-	}
-	
-	internal class PublishWorker : Task {
-		Repository vc;

-		FilePath path;
-		string moduleName;

-		FilePath[] files;
-		string message;

+		}

 

-		public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message) 
-		{
-			this.vc = vc;
-			this.path = localPath;
-			this.moduleName = moduleName;
-			this.files = files;
-			this.message = message;
-			OperationType = VersionControlOperationType.Push;
-		}
-
-		protected override string GetDescription ()
-		{
-			return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
-		}
-		
-		protected override void Run ()
-		{
-			try {
-				vc.Publish (moduleName, path, files, message, Monitor);
-			} catch (VersionControlException e) {
-				Monitor.ReportError (e.Message, null);
-				return;
-			}
-
-			Gtk.Application.Invoke (delegate {
-				VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
-			});
-			Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
+		class PublishWorker : VersionControlTask

+		{

+			Repository vc;

+			FilePath path;

+			string moduleName;

+			FilePath [] files;

+			string message;

+

+			public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath [] files, string message)

+			{

+				this.vc = vc;

+				this.path = localPath;

+				this.moduleName = moduleName;

+				this.files = files;

+				this.message = message;

+				OperationType = VersionControlOperationType.Push;

+			}

+

+			protected override string GetDescription ()

+			{

+				return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);

+			}

+

+			protected override void Run ()

+			{

+				try {

+					vc.Publish (moduleName, path, files, message, Monitor);

+				} catch (VersionControlException e) {

+					Monitor.ReportError (e.Message, null);

+					return;

+				}

+

+				Gtk.Application.Invoke (delegate {

+					VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));

+				});

+				Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));

+			}

 		}
 	}
 }
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
index 205c00e128..495dfdfe98 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
@@ -115,8 +115,7 @@ namespace MonoDevelop.VersionControl
 			get { return name ?? string.Empty; }
 			set {
 				name = value;
-				if (NameChanged != null)
-					NameChanged (this, EventArgs.Empty);
+				NameChanged?.Invoke (this, EventArgs.Empty);
 			}		
 		}
 		
@@ -416,17 +415,23 @@ namespace MonoDevelop.VersionControl
 					// new queries to the queue while long-running VCS operations are being performed
 					var groups = fileQueryQueueClone.GroupBy (q => (q.QueryFlags & VersionInfoQueryFlags.IncludeRemoteStatus) != 0);
 					foreach (var group in groups) {
+						if (Disposed)
+							break;
 						var status = OnGetVersionInfo (group.SelectMany (q => q.Paths), group.Key);
 						infoCache.SetStatus (status);
 					}
 
 					foreach (var item in directoryQueryQueueClone) {
+						if (Disposed)
+							break;
 						var status = OnGetDirectoryVersionInfo (item.Directory, item.GetRemoteStatus, false);
 						infoCache.SetDirectoryStatus (item.Directory, status, item.GetRemoteStatus);
 					}
 
 					foreach (var item in recursiveDirectoryQueryQueueClone) {
 						try {
+							if (Disposed)
+								continue;
 							item.Result = OnGetDirectoryVersionInfo (item.Directory, item.GetRemoteStatus, true);
 						} finally {
 							item.ResetEvent.Set ();
@@ -504,29 +509,29 @@ namespace MonoDevelop.VersionControl
 		// Imports a directory into the repository. 'serverPath' is the relative path in the repository.
 		// 'localPath' is the local directory to publish. 'files' is the list of files to add to the new
 		// repository directory (must use absolute local paths).
-		public Repository Publish (string serverPath, FilePath localPath, FilePath[] files, string message, IProgressMonitor monitor)
+		public Repository Publish (string serverPath, FilePath localPath, FilePath[] files, string message, ProgressMonitor monitor)
 		{
 			var res = OnPublish (serverPath, localPath, files, message, monitor);
 			ClearCachedVersionInfo (localPath);
 			return res;
 		}
 		
-		protected abstract Repository OnPublish (string serverPath, FilePath localPath, FilePath[] files, string message, IProgressMonitor monitor);
+		protected abstract Repository OnPublish (string serverPath, FilePath localPath, FilePath[] files, string message, ProgressMonitor monitor);
 
 		// Updates a local file or directory from the repository
 		// Returns a list of updated files
-		public void Update (FilePath localPath, bool recurse, IProgressMonitor monitor)
+		public void Update (FilePath localPath, bool recurse, ProgressMonitor monitor)
 		{
 			Update (new FilePath[] { localPath }, recurse, monitor);
 		}
 
-		public void Update (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		public void Update (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)
 		{
 			OnUpdate (localPaths, recurse, monitor);
 			ClearCachedVersionInfo (localPaths);
 		}
 		
-		protected abstract void OnUpdate (FilePath[] localPaths, bool recurse, IProgressMonitor monitor);
+		protected abstract void OnUpdate (FilePath[] localPaths, bool recurse, ProgressMonitor monitor);
 		
 		// Called to create a ChangeSet to be used for a commit operation
 		public virtual ChangeSet CreateChangeSet (FilePath basePath)
@@ -543,7 +548,8 @@ namespace MonoDevelop.VersionControl
 			
 			if (null != diffs) {
 				foreach (DiffInfo diff in diffs) {
-					patch.AppendLine (diff.Content);
+					if (!string.IsNullOrWhiteSpace (diff.Content))
+						patch.AppendLine (diff.Content);
 				}
 			}
 			
@@ -551,70 +557,74 @@ namespace MonoDevelop.VersionControl
 		}
 		
 		// Commits changes in a set of files or directories into the repository
-		public void Commit (ChangeSet changeSet, IProgressMonitor monitor)
+		public void Commit (ChangeSet changeSet, ProgressMonitor monitor)
 		{
 			ClearCachedVersionInfo (changeSet.BaseLocalPath);
 			OnCommit (changeSet, monitor);
 		}
 		
-		protected abstract void OnCommit (ChangeSet changeSet, IProgressMonitor monitor);
+		protected abstract void OnCommit (ChangeSet changeSet, ProgressMonitor monitor);
 
 		// Gets the contents of this repositories into the specified local path
-		public void Checkout (FilePath targetLocalPath, bool recurse, IProgressMonitor monitor)
+		public void Checkout (FilePath targetLocalPath, bool recurse, ProgressMonitor monitor)
 		{
 			Checkout (targetLocalPath, null, recurse, monitor); 
 		}
 
-		public void Checkout (FilePath targetLocalPath, Revision rev, bool recurse, IProgressMonitor monitor)
+		public void Checkout (FilePath targetLocalPath, Revision rev, bool recurse, ProgressMonitor monitor)
 		{
 			ClearCachedVersionInfo (targetLocalPath);
 			OnCheckout (targetLocalPath, rev, recurse, monitor);
 		}
 
-		protected abstract void OnCheckout (FilePath targetLocalPath, Revision rev, bool recurse, IProgressMonitor monitor);
+		protected abstract void OnCheckout (FilePath targetLocalPath, Revision rev, bool recurse, ProgressMonitor monitor);
 
-		public void Revert (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		public void Revert (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)
 		{
 			ClearCachedVersionInfo (localPaths);
 			OnRevert (localPaths, recurse, monitor);
 		}
 
-		public void Revert (FilePath localPath, bool recurse, IProgressMonitor monitor)
+		public void Revert (FilePath localPath, bool recurse, ProgressMonitor monitor)
 		{
 			Revert (new FilePath[] { localPath }, recurse, monitor);
 		}
 
-		protected abstract void OnRevert (FilePath[] localPaths, bool recurse, IProgressMonitor monitor);
+		protected abstract void OnRevert (FilePath[] localPaths, bool recurse, ProgressMonitor monitor);
 
-		public void RevertRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
+		public void RevertRevision (FilePath localPath, Revision revision, ProgressMonitor monitor)
 		{
 			ClearCachedVersionInfo (localPath);
 			OnRevertRevision (localPath, revision, monitor);
 		}
 
-		protected abstract void OnRevertRevision (FilePath localPath, Revision revision, IProgressMonitor monitor);
+		protected abstract void OnRevertRevision (FilePath localPath, Revision revision, ProgressMonitor monitor);
 
-		public void RevertToRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
+		public void RevertToRevision (FilePath localPath, Revision revision, ProgressMonitor monitor)
 		{
 			ClearCachedVersionInfo (localPath);
 			OnRevertToRevision (localPath, revision, monitor);
 		}
 		
-		protected abstract void OnRevertToRevision (FilePath localPath, Revision revision, IProgressMonitor monitor);
+		protected abstract void OnRevertToRevision (FilePath localPath, Revision revision, ProgressMonitor monitor);
 		
 		// Adds a file or directory to the repository
-		public void Add (FilePath localPath, bool recurse, IProgressMonitor monitor)
+		public void Add (FilePath localPath, bool recurse, ProgressMonitor monitor)
 		{
 			Add (new FilePath[] { localPath }, recurse, monitor);
 		}
 
-		public void Add (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		public void Add (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)
 		{
-			OnAdd (localPaths, recurse, monitor);
+			try {
+				OnAdd (localPaths, recurse, monitor);
+			} catch (Exception e) {
+				LoggingService.LogError ("Failed to add file", e);
+			}
 			ClearCachedVersionInfo (localPaths);
 		}
 
-		protected abstract void OnAdd (FilePath[] localPaths, bool recurse, IProgressMonitor monitor);
+		protected abstract void OnAdd (FilePath[] localPaths, bool recurse, ProgressMonitor monitor);
 		
 		// Returns true if the file can be moved from source location (and repository) to this repository
 		public virtual bool CanMoveFilesFrom (Repository srcRepository, FilePath localSrcPath, FilePath localDestPath)
@@ -628,57 +638,81 @@ namespace MonoDevelop.VersionControl
 		// For example, when moving a file to an unversioned directory, the implementation
 		// might just throw an exception, or it could version the directory, or it could
 		// ask the user what to do.
-		public void MoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
+		public void MoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, ProgressMonitor monitor)
 		{
 			ClearCachedVersionInfo (localSrcPath, localDestPath);
-			OnMoveFile (localSrcPath, localDestPath, force, monitor);
+			try {
+				OnMoveFile (localSrcPath, localDestPath, force, monitor);
+			} catch (Exception e) {
+				LoggingService.LogError ("Failed to move file", e);
+				File.Move (localSrcPath, localDestPath);
+			}
 		}
 		
-		protected virtual void OnMoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
+		protected virtual void OnMoveFile (FilePath localSrcPath, FilePath localDestPath, bool force, ProgressMonitor monitor)
 		{
 			File.Move (localSrcPath, localDestPath);
 		}
 		
 		// Moves a directory. This method may be called for versioned and unversioned
 		// files. The default implementetions performs a system file move.
-		public void MoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
+		public void MoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, ProgressMonitor monitor)
 		{
 			ClearCachedVersionInfo (localSrcPath, localDestPath);
-			OnMoveDirectory (localSrcPath, localDestPath, force, monitor);
+			try {
+				OnMoveDirectory (localSrcPath, localDestPath, force, monitor);
+			} catch (Exception e) {
+				LoggingService.LogError ("Failed to move directory", e);
+				FileService.SystemDirectoryRename (localSrcPath, localDestPath);
+			}
 		}
 		
-		protected virtual void OnMoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, IProgressMonitor monitor)
+		protected virtual void OnMoveDirectory (FilePath localSrcPath, FilePath localDestPath, bool force, ProgressMonitor monitor)
 		{
 			FileService.SystemDirectoryRename (localSrcPath, localDestPath);
 		}
 		
 		// Deletes a file or directory. This method may be called for versioned and unversioned
 		// files. The default implementetions performs a system file delete.
-		public void DeleteFile (FilePath localPath, bool force, IProgressMonitor monitor, bool keepLocal = true)
+		public void DeleteFile (FilePath localPath, bool force, ProgressMonitor monitor, bool keepLocal = true)
 		{
 			DeleteFiles (new FilePath[] { localPath }, force, monitor, keepLocal);
 		}
 
-		public void DeleteFiles (FilePath[] localPaths, bool force, IProgressMonitor monitor, bool keepLocal = true)
+		public void DeleteFiles (FilePath[] localPaths, bool force, ProgressMonitor monitor, bool keepLocal = true)
 		{
-			OnDeleteFiles (localPaths, force, monitor, keepLocal);
+			try {
+				OnDeleteFiles (localPaths, force, monitor, keepLocal);
+			} catch (Exception e) {
+				LoggingService.LogError ("Failed to delete file", e);
+				if (!keepLocal)
+					foreach (var path in localPaths)
+						File.Delete (path);
+			}
 			ClearCachedVersionInfo (localPaths);
 		}
 
-		protected abstract void OnDeleteFiles (FilePath[] localPaths, bool force, IProgressMonitor monitor, bool keepLocal);
+		protected abstract void OnDeleteFiles (FilePath[] localPaths, bool force, ProgressMonitor monitor, bool keepLocal);
 
-		public void DeleteDirectory (FilePath localPath, bool force, IProgressMonitor monitor, bool keepLocal = true)
+		public void DeleteDirectory (FilePath localPath, bool force, ProgressMonitor monitor, bool keepLocal = true)
 		{
 			DeleteDirectories (new FilePath[] { localPath }, force, monitor, keepLocal);
 		}
 
-		public void DeleteDirectories (FilePath[] localPaths, bool force, IProgressMonitor monitor, bool keepLocal = true)
+		public void DeleteDirectories (FilePath[] localPaths, bool force, ProgressMonitor monitor, bool keepLocal = true)
 		{
-			OnDeleteDirectories (localPaths, force, monitor, keepLocal);
+			try {
+				OnDeleteDirectories (localPaths, force, monitor, keepLocal);
+			} catch (Exception e) {
+				LoggingService.LogError ("Failed to delete directory", e);
+				if (!keepLocal)
+					foreach (var path in localPaths)
+						Directory.Delete (path, true);
+			}
 			ClearCachedVersionInfo (localPaths);
 		}
 
-		protected abstract void OnDeleteDirectories (FilePath[] localPaths, bool force, IProgressMonitor monitor, bool keepLocal);
+		protected abstract void OnDeleteDirectories (FilePath[] localPaths, bool force, ProgressMonitor monitor, bool keepLocal);
 		
 		// Called to request write permission for a file. The file may not yet exist.
 		// After the file is modified or created, NotifyFileChanged is called.
@@ -703,26 +737,26 @@ namespace MonoDevelop.VersionControl
 		}
 		
 		// Locks a file in the repository so no other users can change it
-		public void Lock (IProgressMonitor monitor, params FilePath[] localPaths)
+		public void Lock (ProgressMonitor monitor, params FilePath[] localPaths)
 		{
 			ClearCachedVersionInfo (localPaths);
 			OnLock (monitor, localPaths);
 		}
 		
 		// Locks a file in the repository so no other users can change it
-		protected virtual void OnLock (IProgressMonitor monitor, params FilePath[] localPaths)
+		protected virtual void OnLock (ProgressMonitor monitor, params FilePath[] localPaths)
 		{
 			throw new System.NotSupportedException ();
 		}
 		
 		// Unlocks a file in the repository so other users can change it
-		public void Unlock (IProgressMonitor monitor, params FilePath[] localPaths)
+		public void Unlock (ProgressMonitor monitor, params FilePath[] localPaths)
 		{
 			ClearCachedVersionInfo (localPaths);
 			OnUnlock (monitor, localPaths);
 		}
 		
-		protected virtual void OnUnlock (IProgressMonitor monitor, params FilePath[] localPaths)
+		protected virtual void OnUnlock (ProgressMonitor monitor, params FilePath[] localPaths)
 		{
 			throw new System.NotSupportedException ();
 		}
@@ -824,18 +858,21 @@ namespace MonoDevelop.VersionControl
 			}
 			return list.ToArray ();
 		}
-		
+
 		/// <summary>
 		/// Retrieves annotations for a given path in the repository.
 		/// </summary>
 		/// <param name="repositoryPath">
 		/// A <see cref="FilePath"/>
 		/// </param>
+		/// <param name="since">
+		/// A <see cref="Revision"/>
+		/// </param>
 		/// <returns>
-		/// A <see cref="System.String"/> corresponding to each line 
+		/// A <see cref="Annotation"/> corresponding to each line 
 		/// of the file to which repositoryPath points.
 		/// </returns>
-		public virtual Annotation[] GetAnnotations (FilePath repositoryPath)
+		public virtual Annotation [] GetAnnotations (FilePath repositoryPath, Revision since)
 		{
 			return new Annotation[0];
 		}
@@ -874,11 +911,16 @@ namespace MonoDevelop.VersionControl
 	
 	public class Annotation
 	{
-		public string Revision {
+		public Revision Revision {
 			get;
 			private set;
 		}
 
+		string text;
+		public string Text {
+			get { return text ?? Revision?.ToString (); }
+		}
+
 		public string Author {
 			get;
 			private set;
@@ -902,24 +944,26 @@ namespace MonoDevelop.VersionControl
 			get { return Date != DateTime.MinValue; }
 		}
 
-		public Annotation (string revision, string author, DateTime date)
+		public Annotation (Revision revision, string author, DateTime date) : this (revision, author, date, null)
+		{
+		}
+
+		public Annotation (Revision revision, string author, DateTime date, string email) : this (revision, author, date, email, null)
 		{
-			this.Revision = revision;
-			this.Author = author;
-			this.Date = date;
 		}
 
-		public Annotation (string revision, string author, DateTime date, string email)
+		public Annotation (Revision revision, string author, DateTime date, string email, string text)
 		{
-			this.Revision = revision;
-			this.Author = author;
-			this.Date = date;
-			this.Email = email;
+			Revision = revision;
+			Author = author;
+			Date = date;
+			Email = email;
+			this.text = text;
 		}
 		
 		public override string ToString ()
 		{
-			return String.Format ("[Annotation: Revision={0}, Author={1}, Date={2}, HasDate={3}, Email={4}, HasEmail={5}]",
+			return string.Format ("[Annotation: Revision={0}, Author={1}, Date={2}, HasDate={3}, Email={4}, HasEmail={5}]",
 									Revision, Author, Date, HasDate, Email, HasEmail);
 		}
 	}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
index 6ae8460365..dd599cfaea 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
@@ -1,45 +1,47 @@
-//

-// ResolveConflictsCommands.cs

-//

-// Author:

-//       Therzok <teromario@yahoo.com>

-//

-// Copyright (c) 2013 Therzok

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

+//
+// ResolveConflictsCommands.cs
+//
+// Author:
+//       Therzok <teromario@yahoo.com>
+//
+// Copyright (c) 2013 Therzok
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 using System.Linq;

 

 using MonoDevelop.Ide;

 using MonoDevelop.VersionControl.Views;

 using MonoDevelop.Ide.Gui;

-

+using MonoDevelop.Projects;
+using System.Threading.Tasks;
+
 namespace MonoDevelop.VersionControl

 {

 	public class ResolveConflictsCommand

 	{

-		public static bool ResolveConflicts (VersionControlItemList list, bool test)

+		public static async Task<bool> ResolveConflicts (VersionControlItemList list, bool test)

 		{

 			if (test)

 				return list.All (s => (s.VersionInfo.Status & VersionStatus.Conflicted) == VersionStatus.Conflicted);

 

 			foreach (var item in list.Where (s => (s.VersionInfo.Status & VersionStatus.Conflicted) == VersionStatus.Conflicted)) {

-				Document doc = IdeApp.Workbench.OpenDocument (item.Path, true);

+				Document doc = await IdeApp.Workbench.OpenDocument (item.Path, item.ContainerProject, true);

 				foreach (var view in doc.Views) {

 					if (view.GetContent <MergeView> () != null)

 						view.Select ();

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
index 600af23154..2e053bb10b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
@@ -43,7 +43,7 @@ namespace MonoDevelop.VersionControl
 			}
 		}
 
-		private class RevertWorker : Task {
+		private class RevertWorker : VersionControlTask {
 			VersionControlItemList items;
 						
 			public RevertWorker (VersionControlItemList items) {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
index dea73b39bf..293d5b7295 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
@@ -75,7 +75,7 @@ namespace MonoDevelop.VersionControl
 			}
 		}
 
-		private class RevertWorker : Task {
+		private class RevertWorker : VersionControlTask {
 			Repository vc;
 			string path;
 			Revision revision;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Revision.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Revision.cs
index 2ce8628112..107c4693bc 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Revision.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Revision.cs
@@ -97,31 +97,60 @@ namespace MonoDevelop.VersionControl
 			}
 			return msg.TrimStart (' ', '\t');
 		}
+
+		public static bool operator ==(Revision a, Revision b)
+		{
+			if (System.Object.ReferenceEquals(a, b))
+			{
+				return true;
+			}
+
+			if (((object)a == null) || ((object)b == null))
+			{
+				return false;
+			}

+
			return a.Equals(b);
+		}
+
+		public static bool operator !=(Revision a, Revision b)
+		{
+			return !(a == b);
+		}
 	}
 	
 	public class RevisionPath
 	{
-		public RevisionPath (string path, RevisionAction action, string actionDescription)
+		public RevisionPath (string path, string oldPath, RevisionAction action, string actionDescription)
 		{
 			this.Path = path;
+			this.OldPath = oldPath;
 			this.Action = action;
 			this.ActionDescription = actionDescription;
 		}
+
+		public RevisionPath (string path, RevisionAction action, string actionDescription) : this (path, path, action, actionDescription)
+		{
+		}
+
+		public string OldPath {
+			get;
+			private set;
+		}
 		
 		public string Path {
 			get;
-			set;
+			private set;
 		}
 		
 		public RevisionAction Action {
 			get;
-			set;
+			private set;
 		}
 		
 		// To use when Action == RevisionAction.Other
 		public string ActionDescription {
 			get;
-			set;
+			private set;
 		}
 	}
 	
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
deleted file mode 100644
index 92aaac31c3..0000000000
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Threading;
-using Gtk;
-
-using MonoDevelop.Core;
-
-namespace MonoDevelop.VersionControl
-{
-	internal abstract class Task 
-	{
-		IProgressMonitor tracker;
-		ThreadNotify threadnotify;
-
-		protected VersionControlOperationType OperationType { get; set; }
-		
-		protected abstract string GetDescription();
-		
-		// This occurs in the background.
-		protected abstract void Run();
-		
-		// This occurs on the main thread when the background
-		// task is complete.
-		protected virtual void Finished()
-		{
-		}
-
-		protected Task()
-		{
-			OperationType = VersionControlOperationType.Other;
-			threadnotify = new ThreadNotify(new ReadyEvent(Wakeup));
-		}
-		
-		protected IProgressMonitor Monitor {
-			get { return tracker; }
-		}
-		
-		protected virtual IProgressMonitor CreateProgressMonitor ()
-		{
-			return VersionControlService.GetProgressMonitor (GetDescription (), OperationType);
-		}
-		
-		public void Start() {
-			tracker = CreateProgressMonitor ();
-			tracker.BeginTask(GetDescription(), 1);
-			ThreadPool.QueueUserWorkItem (BackgroundWorker);
-		}
-		
-		void BackgroundWorker (object state)
-		{
-			try {
-				Run();
-			} catch (DllNotFoundException e) {
-				tracker.ReportError("The operation could not be completed because a shared library is missing: " + e.Message, null);
-			} catch (Exception e) {
-				string msg = GettextCatalog.GetString ("Version control operation failed: ");
-				tracker.ReportError (msg, e);
-			} finally {			
-				threadnotify.WakeupMain();
-			}
-		}
-	
-		public void Wakeup() {
-			try {
-				tracker.EndTask();
-				tracker.Dispose();
-			} finally {
-				Finished();
-			}
-		}
-		
-		protected void Log(string logtext) {
-			tracker.Log.WriteLine(logtext);
-		}
-		
-		protected void Warn(string logtext) {
-			tracker.ReportWarning(logtext);
-		}
-	}
-}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
index 030583d3ce..43ced37847 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
@@ -45,52 +45,52 @@ namespace MonoDevelop.VersionControl
 		}

 

 

-		protected override Repository OnPublish (string serverPath, FilePath localPath, FilePath[] FilePath, string message, IProgressMonitor monitor)
+		protected override Repository OnPublish (string serverPath, FilePath localPath, FilePath[] FilePath, string message, ProgressMonitor monitor)
 		{
 			return null;
 		}

 

-		protected override void OnUpdate (FilePath[] paths, bool recurse, IProgressMonitor monitor)
+		protected override void OnUpdate (FilePath[] paths, bool recurse, ProgressMonitor monitor)
 		{
 		}
 		
-		protected override void OnCommit (ChangeSet changeSet, IProgressMonitor monitor)
+		protected override void OnCommit (ChangeSet changeSet, ProgressMonitor monitor)
 		{
 		}

 

-		protected override void OnCheckout (FilePath path, Revision rev, bool recurse, IProgressMonitor monitor)
+		protected override void OnCheckout (FilePath path, Revision rev, bool recurse, ProgressMonitor monitor)
 		{
 		}

 

-		protected override void OnRevert (FilePath[] localPaths, bool recurse, IProgressMonitor monitor)
+		protected override void OnRevert (FilePath[] localPaths, bool recurse, ProgressMonitor monitor)
 		{
 		}

 

-		protected override void OnRevertRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
+		protected override void OnRevertRevision (FilePath localPath, Revision revision, ProgressMonitor monitor)
 		{
 		}

 

-		protected override void OnRevertToRevision (FilePath localPath, Revision revision, IProgressMonitor monitor)
+		protected override void OnRevertToRevision (FilePath localPath, Revision revision, ProgressMonitor monitor)
 		{
 		}

 

-		protected override void OnAdd (FilePath[] paths, bool recurse, IProgressMonitor monitor)
+		protected override void OnAdd (FilePath[] paths, bool recurse, ProgressMonitor monitor)
 		{
 		}

 

-		protected override void OnMoveFile (FilePath srcPath, FilePath destPath, bool force, IProgressMonitor monitor)
+		protected override void OnMoveFile (FilePath srcPath, FilePath destPath, bool force, ProgressMonitor monitor)
 		{
 		}

 

-		protected override void OnMoveDirectory (FilePath srcPath, FilePath destPath, bool force, IProgressMonitor monitor)
+		protected override void OnMoveDirectory (FilePath srcPath, FilePath destPath, bool force, ProgressMonitor monitor)
 		{
 		}
 
-		protected override void OnDeleteFiles (FilePath[] path, bool force, IProgressMonitor monitor, bool keepLocal)
+		protected override void OnDeleteFiles (FilePath[] path, bool force, ProgressMonitor monitor, bool keepLocal)
 		{
 		}

 
-		protected override void OnDeleteDirectories (FilePath[] path, bool force, IProgressMonitor monitor, bool keepLocal)
+		protected override void OnDeleteDirectories (FilePath[] path, bool force, ProgressMonitor monitor, bool keepLocal)
 		{
 		}
 
@@ -102,7 +102,7 @@ namespace MonoDevelop.VersionControl
 		{
 		}
 		
-		public override Annotation[] GetAnnotations (FilePath repositoryPath)
+		public override Annotation[] GetAnnotations (FilePath repositoryPath, Revision since)
 		{
 			return new Annotation[0];
 		}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
index 52b57bec2f..0fb3740224 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
@@ -45,7 +45,7 @@ namespace MonoDevelop.VersionControl
 			return true;
 		}
 
-		private class UnlockWorker : Task 
+		private class UnlockWorker : VersionControlTask 
 		{
 			VersionControlItemList items;
 						
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
index 5c4c641fc3..18ab6a7713 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
@@ -16,7 +16,7 @@ namespace MonoDevelop.VersionControl
 			return true;
 		}
 
-		private class UpdateWorker : Task {
+		private class UpdateWorker : VersionControlTask {
 			VersionControlItemList items;
 						
 			public UpdateWorker (VersionControlItemList items) {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepositoryEditor.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepositoryEditor.cs
index cc7637cc45..b918d0707e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepositoryEditor.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepositoryEditor.cs
@@ -1,8 +1,9 @@
 
 using System;
+using System.Collections.Generic;

 using System.Linq;
-using System.Collections.Generic;
-
+using MonoDevelop.Components;

+

 namespace MonoDevelop.VersionControl
 {
 	public partial class UrlBasedRepositoryEditor : Gtk.Bin, IRepositoryEditor
@@ -29,7 +30,7 @@ namespace MonoDevelop.VersionControl
 			updating = false;
 		}
 		
-		Gtk.Widget IRepositoryEditor.Widget {
+		Control IRepositoryEditor.Widget {
 			get { return this; }
 		}
 		
@@ -46,9 +47,35 @@ namespace MonoDevelop.VersionControl
 		public string RelativePath {
 			get { return repositoryPathEntry.Text; }
 		}
+
+		bool ParseSSHUrl (string url)
+		{
+			if (!url.Contains (':'))
+				return false;
+			
+			var tokens = url.Split (new [] { ':' }, 2);
+			if (!Uri.IsWellFormedUriString (tokens [0], UriKind.RelativeOrAbsolute) ||
+				!Uri.IsWellFormedUriString (tokens [1], UriKind.RelativeOrAbsolute))
+				return false;
+
+			var userAndHost = tokens [0].Split ('@');
+			repositoryUserEntry.Text = userAndHost [0];
+			repositoryServerEntry.Text = userAndHost [1];
+			repositoryPortSpin.Value = 22;
+			string path = tokens [1];
+			if (!path.StartsWith ("/", StringComparison.Ordinal)) {
+				path = "/" + path;
+			}
+			repositoryPathEntry.Text = path;
+			comboProtocol.Active = protocols.IndexOf ("ssh");
+			comboProtocol.Sensitive = false;
+			PathChanged?.Invoke (this, EventArgs.Empty);
+			return true;
+		}
 		
 		void Fill ()
 		{
+			comboProtocol.Sensitive = true;
 			if (repo.Uri != null && repo.Uri.IsAbsoluteUri) {
 				if (repo.Name == repositoryServerEntry.Text)
 					repo.Name = repo.Uri.Host;
@@ -57,9 +84,8 @@ namespace MonoDevelop.VersionControl
 				repositoryPathEntry.Text = repo.Uri.PathAndQuery;
 				repositoryUserEntry.Text = repo.Uri.UserInfo;
 				comboProtocol.Active = protocols.IndexOf (repo.Uri.Scheme);
-				if (PathChanged != null)
-					PathChanged (this, new EventArgs ());
-			} else {
+				PathChanged?.Invoke (this, EventArgs.Empty);
+			} else if (!ParseSSHUrl (repo.Url)) {
 				// The url may have a scheme, but it may be an incomplete or incorrect url. Do the best to select
 				// the correct value in the protocol combo
 				string prot = repo.SupportedProtocols.FirstOrDefault (p => repo.Url.StartsWith (p + "://", StringComparison.Ordinal));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlCommandHandler.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlCommandHandler.cs
index 4cd1055a56..5d2acf4cbf 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlCommandHandler.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlCommandHandler.cs
@@ -70,7 +70,7 @@ namespace MonoDevelop.VersionControl
 		{
 			string path;
 			bool isDir;
-			IWorkspaceObject pentry;
+			WorkspaceObject pentry;
 			VersionInfo versionInfo = null;
 
 			if (obj is ProjectFile) {
@@ -103,8 +103,8 @@ namespace MonoDevelop.VersionControl
 				path = item.FileName;
 				isDir = false;
 				pentry = item;
-			} else if (obj is IWorkspaceObject) {
-				pentry = ((IWorkspaceObject)obj);
+			} else if (obj is WorkspaceObject) {
+				pentry = ((WorkspaceObject)obj);
 				path = pentry.BaseDirectory;
 				isDir = true;
 			} else
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlException.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlException.cs
index dd2402cbad..da032ef9c6 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlException.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlException.cs
@@ -27,11 +27,15 @@ using System;
 

 namespace MonoDevelop.VersionControl

 {

-	public class VersionControlException : ApplicationException

+	public class VersionControlException : Exception

 	{

 		public VersionControlException (string message) : base (message)

 		{

 		}

+

+		public VersionControlException (string message, Exception native) : base (message, native)

+		{

+		}

 	}

 }

 

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
index 84a12e5935..1a9fe48891 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
@@ -25,7 +25,7 @@ namespace MonoDevelop.VersionControl
 		{
 			path = path.FullPath;
 			
-			Project p = IdeApp.Workspace.GetProjectContainingFile (path);
+			Project p = IdeApp.Workspace.GetProjectsContainingFile (path).FirstOrDefault ();
 			if (p != null)
 				return VersionControlService.GetRepository (p);
 			
@@ -52,7 +52,7 @@ namespace MonoDevelop.VersionControl
 		
 		public override void MoveFile (FilePath source, FilePath dest)
 		{
-			IProgressMonitor monitor = new NullProgressMonitor ();
+			ProgressMonitor monitor = new ProgressMonitor ();
 
 			Repository srcRepo = GetRepository (source);
 			Repository dstRepo = GetRepository (dest);
@@ -78,7 +78,7 @@ namespace MonoDevelop.VersionControl
 		public override void DeleteFile (FilePath file)
 		{
 			Repository repo = GetRepository (file);
-			repo.DeleteFile (file, true, new NullProgressMonitor (), false);
+			repo.DeleteFile (file, true, new ProgressMonitor (), false);
 		}
 		
 		public override void CreateDirectory (FilePath path)
@@ -86,12 +86,12 @@ namespace MonoDevelop.VersionControl
 			Repository repo = GetRepository (path);
 			repo.ClearCachedVersionInfo (path);
 			System.IO.Directory.CreateDirectory (path);
-			repo.Add (path, false, new NullProgressMonitor ());
+			repo.Add (path, false, new ProgressMonitor ());
 		}
 		
 		public override void MoveDirectory (FilePath sourcePath, FilePath destPath)
 		{
-			IProgressMonitor monitor = new NullProgressMonitor ();
+			ProgressMonitor monitor = new ProgressMonitor ();
 			
 			Repository srcRepo = GetRepository (sourcePath);
 			Repository dstRepo = GetRepository (destPath);
@@ -107,13 +107,13 @@ namespace MonoDevelop.VersionControl
 		public override void DeleteDirectory (FilePath path)
 		{
 			Repository repo = GetRepository (path);
-			repo.DeleteDirectory (path, true, new NullProgressMonitor (), false);
+			repo.DeleteDirectory (path, true, new ProgressMonitor (), false);
 		}
 
-		public override void RequestFileEdit (IEnumerable<FilePath> files)
+		public override void RequestFileEdit (FilePath file)
 		{
-			Repository repo = GetRepository (FilePath.GetCommonRootPath (files));
-			repo.RequestFileWritePermission (files.ToArray ());
+			Repository repo = GetRepository (file.FullPath);
+			repo.RequestFileWritePermission (file);
 		}
 		
 		public override void NotifyFilesChanged (IEnumerable<FilePath> files)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
index 9ee8889509..54e61f4144 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
@@ -35,16 +35,30 @@ namespace MonoDevelop.VersionControl
 	{
 		VersionInfo versionInfo;

 

-		public VersionControlItem (Repository repository, IWorkspaceObject workspaceObject, FilePath path, bool isDirectory, VersionInfo versionInfo)

+		public VersionControlItem (Repository repository, WorkspaceObject workspaceObject, FilePath path, bool isDirectory, VersionInfo versionInfo)

 		{

 			Path = path;

 			Repository = repository;

 			WorkspaceObject = workspaceObject;

 			IsDirectory = isDirectory;
-			this.versionInfo = versionInfo;

+			this.versionInfo = versionInfo;
+
+			var obj = workspaceObject;
+			while (obj != null) {
+				var p = obj as Project;
+				if (p != null)
+					ContainerProject = p;
+
+				obj = obj.ParentObject;
+			}

 		}

 		
-		public IWorkspaceObject WorkspaceObject {
+		public WorkspaceObject WorkspaceObject {
+			get;
+			private set;
+		}
+
+		internal Project ContainerProject {
 			get;
 			private set;
 		}
@@ -85,6 +99,9 @@ namespace MonoDevelop.VersionControl
 				}
 				return versionInfo;
 			}
+			internal set {
+				versionInfo = value;
+			}
 		}

 	}
 }
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
index e3dab911e5..a7af49ecd8 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
@@ -10,7 +10,7 @@ using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.VersionControl.Views;
 using MonoDevelop.Ide;
-
+using System.Threading.Tasks;
 
 namespace MonoDevelop.VersionControl
 {
@@ -24,19 +24,26 @@ namespace MonoDevelop.VersionControl
 			return typeof(ProjectFile).IsAssignableFrom (dataType)
 				|| typeof(SystemFile).IsAssignableFrom (dataType)
 				|| typeof(ProjectFolder).IsAssignableFrom (dataType)
-				|| typeof(IWorkspaceObject).IsAssignableFrom (dataType);
+				|| typeof(WorkspaceObject).IsAssignableFrom (dataType);
 		}
 		
 		protected override void Initialize ()

 		{

 			base.Initialize ();

-			VersionControlService.FileStatusChanged += Monitor;

+			VersionControlService.FileStatusChanged += Monitor;
+			IdeApp.Workspace.LastWorkspaceItemClosed += OnWorkspaceRefresh;

 		}

 

 		public override void Dispose ()

 		{

-			VersionControlService.FileStatusChanged -= Monitor;

+			VersionControlService.FileStatusChanged -= Monitor;
+			IdeApp.Workspace.LastWorkspaceItemClosed -= OnWorkspaceRefresh;

 			base.Dispose ();

+		}
+
+		void OnWorkspaceRefresh (object sender, EventArgs args)
+		{
+			pathToObject.Clear ();
 		}

 
 		public override void BuildNode (ITreeBuilder builder, object dataObject, NodeInfo nodeInfo)
@@ -46,8 +53,8 @@ namespace MonoDevelop.VersionControl
 		
 			// Add status overlays
 			
-			if (dataObject is IWorkspaceObject) {
-				IWorkspaceObject ce = (IWorkspaceObject) dataObject;
+			if (dataObject is WorkspaceObject) {
+				WorkspaceObject ce = (WorkspaceObject) dataObject;
 				Repository rep = VersionControlService.GetRepository (ce);
 				if (rep != null) {

 					rep.GetDirectoryVersionInfo (ce.BaseDirectory, false, false);
@@ -66,7 +73,7 @@ namespace MonoDevelop.VersionControl
 				return;
 			}
 			
-			IWorkspaceObject prj;
+			WorkspaceObject prj;
 			FilePath file;
 			
 			if (dataObject is ProjectFile) {
@@ -202,8 +209,8 @@ namespace MonoDevelop.VersionControl
 				return ((ProjectFile) dataObject).FilePath;
 			} else if (dataObject is SystemFile) {
 				return ((SystemFile) dataObject).Path;
-			} else if (dataObject is IWorkspaceObject) {
-				return ((IWorkspaceObject)dataObject).BaseDirectory;
+			} else if (dataObject is WorkspaceObject) {
+				return ((WorkspaceObject)dataObject).BaseDirectory;
 			} else if (dataObject is ProjectFolder) {
 				return ((ProjectFolder)dataObject).Path;
 			}
@@ -222,177 +229,177 @@ namespace MonoDevelop.VersionControl
 	{

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Update)]

-		protected void OnUpdate() {

-			RunCommand(Commands.Update, false);

+		protected async void OnUpdate() {

+			await RunCommand(Commands.Update, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Update)]

-		protected void UpdateUpdate(CommandInfo item) {

-			TestCommand(Commands.Update, item);

+		protected async void UpdateUpdate(CommandInfo item) {

+			await TestCommand(Commands.Update, item);

 		}

 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Diff)]

-		protected void OnDiff() {

-			RunCommand(Commands.Diff, false);

+		protected async void OnDiff() {

+			await RunCommand(Commands.Diff, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Diff)]

-		protected void UpdateDiff(CommandInfo item) {

-			TestCommand(Commands.Diff, item);

+		protected async void UpdateDiff(CommandInfo item) {

+			await TestCommand(Commands.Diff, item);

 		}

 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Log)]

-		protected void OnLog() {

-			RunCommand(Commands.Log, false);

+		protected async void OnLog() {

+			await RunCommand(Commands.Log, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Log)]

-		protected void UpdateLog(CommandInfo item) {

-			TestCommand(Commands.Log, item);

+		protected async void UpdateLog(CommandInfo item) {

+			await TestCommand(Commands.Log, item);

 		}

 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Status)]

-		protected void OnStatus() {

-			RunCommand(Commands.Status, false);

+		protected async void OnStatus() {

+			await RunCommand(Commands.Status, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Status)]

-		protected void UpdateStatus(CommandInfo item) {

-			TestCommand(Commands.Status, item);

+		protected async void UpdateStatus(CommandInfo item) {

+			await TestCommand(Commands.Status, item);

 		}

 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Add)]

-		protected void OnAdd() {

-			RunCommand(Commands.Add, false);

+		protected async void OnAdd() {

+			await RunCommand(Commands.Add, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Add)]

-		protected void UpdateAdd(CommandInfo item) {

-			TestCommand(Commands.Add, item);

+		protected async void UpdateAdd(CommandInfo item) {

+			await TestCommand(Commands.Add, item);

 		}

 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Remove)]

-		protected void OnRemove() {

-			RunCommand(Commands.Remove, false);

+		protected async void OnRemove() {

+			await RunCommand(Commands.Remove, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Remove)]

-		protected void UpdateRemove(CommandInfo item) {

-			TestCommand(Commands.Remove, item);

+		protected async void UpdateRemove(CommandInfo item) {

+			await TestCommand(Commands.Remove, item);

 		}

 		
 		[CommandHandler (Commands.Publish)]
-		protected void OnPublish() 
+		protected async void OnPublish() 
 		{
-			RunCommand(Commands.Publish, false);
+			await RunCommand(Commands.Publish, false);
 		}
 		
 		[CommandUpdateHandler (Commands.Publish)]
-		protected void UpdatePublish(CommandInfo item) {
-			TestCommand(Commands.Publish, item);
+		protected async void UpdatePublish(CommandInfo item) {
+			await TestCommand(Commands.Publish, item);
 		}
 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Revert)]

-		protected void OnRevert() {

-			RunCommand(Commands.Revert, false, false);

+		protected async void OnRevert() {

+			await RunCommand(Commands.Revert, false, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Revert)]

-		protected void UpdateRevert(CommandInfo item) {

-			TestCommand(Commands.Revert, item, false);

+		protected async void UpdateRevert(CommandInfo item) {

+			await TestCommand(Commands.Revert, item, false);

 		}

 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Lock)]

-		protected void OnLock() {

-			RunCommand(Commands.Lock, false);

+		protected async void OnLock() {

+			await RunCommand(Commands.Lock, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Lock)]

-		protected void UpdateLock(CommandInfo item) {

-			TestCommand(Commands.Lock, item);

+		protected async void UpdateLock(CommandInfo item) {

+			await TestCommand(Commands.Lock, item);

 		}

 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Unlock)]

-		protected void OnUnlock() {

-			RunCommand(Commands.Unlock, false);

+		protected async void OnUnlock() {

+			await RunCommand(Commands.Unlock, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Unlock)]

-		protected void UpdateUnlock(CommandInfo item) {

-			TestCommand(Commands.Unlock, item);

+		protected async void UpdateUnlock(CommandInfo item) {

+			await TestCommand(Commands.Unlock, item);

 		}

 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Annotate)]

-		protected void OnAnnotate() {

-			RunCommand(Commands.Annotate, false);

+		protected async void OnAnnotate() {

+			await RunCommand(Commands.Annotate, false);

 		}

 		

 		[CommandUpdateHandler (Commands.Annotate)]

-		protected void UpdateAnnotate(CommandInfo item) {

-			TestCommand(Commands.Annotate, item);

+		protected async void UpdateAnnotate(CommandInfo item) {

+			await TestCommand(Commands.Annotate, item);

 		}

 		

 		[AllowMultiSelection]

 		[CommandHandler (Commands.CreatePatch)]

-		protected void OnCreatePatch() {

-			RunCommand(Commands.CreatePatch, false);

+		protected async void OnCreatePatch() {

+			await RunCommand(Commands.CreatePatch, false);

 		}

 		

 		[CommandUpdateHandler (Commands.CreatePatch)]

-		protected void UpdateCreatePatch(CommandInfo item) {

-			TestCommand(Commands.CreatePatch, item);

+		protected async void UpdateCreatePatch(CommandInfo item) {

+			await TestCommand(Commands.CreatePatch, item);

 		}

 

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Ignore)]

-		protected void OnIgnore ()

+		protected async void OnIgnore ()

 		{

-			RunCommand(Commands.Ignore, false);

+			await RunCommand(Commands.Ignore, false);

 		}

 

 		[CommandUpdateHandler (Commands.Ignore)]

-		protected void UpdateIgnore (CommandInfo item)

+		protected async void UpdateIgnore (CommandInfo item)

 		{

-			TestCommand(Commands.Ignore, item);

+			await TestCommand(Commands.Ignore, item);

 		}

 

 		[AllowMultiSelection]

 		[CommandHandler (Commands.Unignore)]

-		protected void OnUnignore ()

+		protected async void OnUnignore ()

 		{

-			RunCommand(Commands.Unignore, false);

+			await RunCommand(Commands.Unignore, false);

 		}

 

 		[CommandUpdateHandler (Commands.Unignore)]

-		protected void UpdateUnignore (CommandInfo item)

+		protected async void UpdateUnignore (CommandInfo item)

 		{

-			TestCommand(Commands.Unignore, item);

+			await TestCommand(Commands.Unignore, item);

 		}

 

 		[CommandHandler (Commands.ResolveConflicts)]

-		protected void OnResolveConflicts ()

+		protected async void OnResolveConflicts ()

 		{

-			RunCommand (Commands.ResolveConflicts, false, false);

+			await RunCommand (Commands.ResolveConflicts, false, false);

 		}

 

 		[CommandUpdateHandler (Commands.ResolveConflicts)]

-		protected void UpdateResolveConflicts (CommandInfo item)

+		protected async void UpdateResolveConflicts (CommandInfo item)

 		{

-			TestCommand (Commands.ResolveConflicts, item, false);

+			await TestCommand (Commands.ResolveConflicts, item, false);

 		}

 

-		private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)

+		private async Task<TestResult> TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)

 		{

-			TestResult res = RunCommand(cmd, true, projRecurse);

+			TestResult res = await RunCommand(cmd, true, projRecurse);

 			if (res == TestResult.NoVersionControl && cmd == Commands.Log) {

 				// Use the update command to show the "not available" message
 				item.Icon = null;
@@ -402,10 +409,12 @@ namespace MonoDevelop.VersionControl
 				else

 					item.Text = GettextCatalog.GetString ("This project or folder is not under version control");
 			} else

-				item.Visible = res == TestResult.Enable;

+				item.Visible = res == TestResult.Enable;
+
+			return res;

 		}

 		

-		private TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
+		private async Task<TestResult> RunCommand (Commands cmd, bool test, bool projRecurse = true)
 		{
 			VersionControlItemList items = GetItems (projRecurse);
 
@@ -426,10 +435,10 @@ namespace MonoDevelop.VersionControl
 					res = UpdateCommand.Update (items, test);
 					break;

 				case Commands.Diff:

-					res = DiffCommand.Show (items, test);

+					res = await DiffCommand.Show (items, test);

 					break;

 				case Commands.Log:

-					res = LogCommand.Show (items, test);

+					res = await LogCommand.Show (items, test);

 					break;

 				case Commands.Status:

 					res = StatusView.Show (items, test, false);

@@ -455,7 +464,7 @@ namespace MonoDevelop.VersionControl
 						res = PublishCommand.Publish (it.WorkspaceObject, it.Path, test);

 					break;

 				case Commands.Annotate:

-					res = BlameCommand.Show (items, test);

+					res = await BlameCommand.Show (items, test);

 					break;

 				case Commands.CreatePatch:

 					res = CreatePatchCommand.CreatePatch (items, test);

@@ -467,7 +476,7 @@ namespace MonoDevelop.VersionControl
 					res = UnignoreCommand.Unignore (items, test);

 					break;

 				case Commands.ResolveConflicts:

-					res = ResolveConflictsCommand.ResolveConflicts (items, test);

+					res = await ResolveConflictsCommand.ResolveConflicts (items, test);

 					break;

 				}

 			}

@@ -500,7 +509,7 @@ namespace MonoDevelop.VersionControl
 		{
 			foreach (VersionControlItem it in GetItems ()) {
 				if (!it.IsDirectory)
-					IdeApp.Workbench.OpenDocument (it.Path);
+					IdeApp.Workbench.OpenDocument (it.Path, it.ContainerProject);
 			}
 		}
 	}		
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
index 1b305bdee5..0c1fb6bdc4 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
@@ -46,7 +46,7 @@ namespace MonoDevelop.VersionControl
 		static List<VersionControlSystem> handlers = new List<VersionControlSystem> ();
 		static VersionControlConfiguration configuration;
 		static DataContext dataContext = new DataContext ();
-		
+
 		public static event FileUpdateEventHandler FileStatusChanged;

 		public static event CommitEventHandler PrepareCommit;

 		public static event CommitEventHandler BeginCommit;

@@ -196,16 +196,16 @@ namespace MonoDevelop.VersionControl
 		}
 
 		internal static Dictionary<Repository, InternalRepositoryReference> referenceCache = new Dictionary<Repository, InternalRepositoryReference> ();
-		public static Repository GetRepository (IWorkspaceObject entry)
+		public static Repository GetRepository (WorkspaceObject entry)
 		{
 			if (IsGloballyDisabled)
 				return null;
 
 			InternalRepositoryReference repoRef = (InternalRepositoryReference) entry.ExtendedProperties [typeof(InternalRepositoryReference)];
-			if (repoRef != null)
+			if (repoRef != null && !repoRef.Repo.Disposed)
 				return repoRef.Repo;
 			
-			Repository repo = VersionControlService.GetRepositoryReference (entry.BaseDirectory, entry.Name);
+			Repository repo = GetRepositoryReference (entry.BaseDirectory, entry.Name);
 			InternalRepositoryReference rref = null;
 			if (repo != null) {
 				repo.AddRef ();
@@ -380,57 +380,52 @@ namespace MonoDevelop.VersionControl
 		
 		internal static void NotifyPrepareCommit (Repository repo, ChangeSet changeSet)
 		{
-			if (!DispatchService.IsGuiThread) {
+			if (!Runtime.IsMainThread) {
 				Gtk.Application.Invoke (delegate {
 					NotifyPrepareCommit (repo, changeSet);
 				});
 				return;
 			}
 
-			if (PrepareCommit != null) {
-				try {
-					PrepareCommit (null, new CommitEventArgs (repo, changeSet, false));
-				} catch (Exception ex) {
-					LoggingService.LogInternalError (ex);
-				}
+			try {
+				PrepareCommit?.Invoke (null, new CommitEventArgs (repo, changeSet, false));
+			} catch (Exception ex) {
+				LoggingService.LogInternalError (ex);
 			}
 		}
 		
 		internal static void NotifyBeforeCommit (Repository repo, ChangeSet changeSet)
 		{
-			if (!DispatchService.IsGuiThread) {
+			if (!Runtime.IsMainThread) {
 				Gtk.Application.Invoke (delegate {
 					NotifyBeforeCommit (repo, changeSet);
 				});
 				return;
 			}
 
-			if (BeginCommit != null) {
-				try {
-					BeginCommit (null, new CommitEventArgs (repo, changeSet, false));
-				} catch (Exception ex) {
-					LoggingService.LogInternalError (ex);
-				}
+			try {
+				BeginCommit?.Invoke (null, new CommitEventArgs (repo, changeSet, false));
+			} catch (Exception ex) {
+				LoggingService.LogInternalError (ex);
 			}
 		}
 		
 		internal static void NotifyAfterCommit (Repository repo, ChangeSet changeSet, bool success)
 		{
-			if (!DispatchService.IsGuiThread) {
+			if (!Runtime.IsMainThread) {
 				Gtk.Application.Invoke (delegate {
 					NotifyAfterCommit (repo, changeSet, success);
 				});
 				return;
 			}
 
-			if (EndCommit != null) {
-				try {
-					EndCommit (null, new CommitEventArgs (repo, changeSet, success));
-				} catch (Exception ex) {
-					LoggingService.LogInternalError (ex);
-					return;
-				}
+			try {
+				EndCommit?.Invoke (null, new CommitEventArgs (repo, changeSet, success));
+			} catch (Exception ex) {
+				LoggingService.LogInternalError (ex);
+				return;
 			}
+
 			if (success) {
 				foreach (ChangeSetItem it in changeSet.Items)
 					SetCommitComment (it.LocalPath, null, false);
@@ -447,13 +442,12 @@ namespace MonoDevelop.VersionControl
 		
 		public static void NotifyFileStatusChanged (FileUpdateEventArgs args) 
 		{
-			if (!DispatchService.IsGuiThread)
+			if (!Runtime.IsMainThread)
 				Gtk.Application.Invoke (delegate {
 					NotifyFileStatusChanged (args);
 				});
 			else {
-				if (FileStatusChanged != null)
-					FileStatusChanged (null, args);
+				FileStatusChanged?.Invoke (null, args);
 			}
 		}
 
@@ -473,7 +467,7 @@ namespace MonoDevelop.VersionControl
 		static void OnFileAdded (object s, ProjectFileEventArgs e)
 		{
 			FileUpdateEventArgs vargs = new FileUpdateEventArgs ();
-			IProgressMonitor monitor = null;
+			ProgressMonitor monitor = null;
 			try {
 				foreach (var repoFiles in e.GroupBy (i => i.Project)) {
 					Repository repo = GetRepository (repoFiles.Key);
@@ -520,10 +514,10 @@ namespace MonoDevelop.VersionControl
 			}
 		}
 */
-		static void SolutionItemAddFiles (string rootPath, SolutionItem entry, HashSet<string> files)
+		static void SolutionItemAddFiles (string rootPath, SolutionFolderItem entry, HashSet<string> files)
 		{
-			if (entry is SolutionEntityItem) {
-				foreach (var file in ((SolutionEntityItem)entry).GetItemFiles (false))
+			if (entry is SolutionItem) {
+				foreach (var file in ((SolutionItem)entry).GetItemFiles (false))
 					SolutionItemAddFile (rootPath, files, file);
 			}
 			
@@ -533,7 +527,7 @@ namespace MonoDevelop.VersionControl
 						SolutionItemAddFile (rootPath, files, file.FilePath);
 				}
 			} else if (entry is SolutionFolder) {
-				foreach (SolutionItem ent in ((SolutionFolder) entry).Items)
+				foreach (SolutionFolderItem ent in ((SolutionFolder) entry).Items)
 					SolutionItemAddFiles (rootPath, ent, files);
 			}
 		}
@@ -557,7 +551,7 @@ namespace MonoDevelop.VersionControl
 				return;
 
 			// handles addition of solutions and projects
-			SolutionItem parent = (SolutionItem) args.SolutionItem.ParentFolder;
+			SolutionFolderItem parent = (SolutionFolderItem) args.SolutionItem.ParentFolder;
 			
 			if (parent == null)
 				return;
@@ -567,7 +561,7 @@ namespace MonoDevelop.VersionControl
 			if (repo == null)
 				return;
 			
-			SolutionItem entry = args.SolutionItem;
+			SolutionFolderItem entry = args.SolutionItem;
 			Repository currentRepo = GetRepository (entry);
 			if (currentRepo != null && currentRepo.VersionControlSystem != repo.VersionControlSystem) {
 				// If the item is already under version control using a different version control system
@@ -584,7 +578,7 @@ namespace MonoDevelop.VersionControl
 			var files = new HashSet<string> { path };
 			SolutionItemAddFiles (path, entry, files);
 			
-			using (IProgressMonitor monitor = GetStatusMonitor ()) {
+			using (ProgressMonitor monitor = GetStatusMonitor ()) {
 				var status = repo.GetDirectoryVersionInfo (path, false, true);

 				foreach (var v in status) {

 					if (!v.IsVersioned && files.Contains (v.LocalPath))

@@ -598,12 +592,12 @@ namespace MonoDevelop.VersionControl
 			NotifyFileStatusChanged (new FileUpdateEventArgs (repo, parent.BaseDirectory, true));
 		}
 		
-		public static IProgressMonitor GetProgressMonitor (string operation)
+		public static ProgressMonitor GetProgressMonitor (string operation)
 		{
 			return GetProgressMonitor (operation, VersionControlOperationType.Other);
 		}
 		
-		public static IProgressMonitor GetProgressMonitor (string operation, VersionControlOperationType op)
+		public static ProgressMonitor GetProgressMonitor (string operation, VersionControlOperationType op)
 		{
 			IconId icon;
 			switch (op) {
@@ -612,15 +606,15 @@ namespace MonoDevelop.VersionControl
 			default: icon = "md-version-control"; break;
 			}
 
-			IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor ("MonoDevelop.VersionControlOutput", "Version Control", "md-version-control", false, true);
+			ProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor ("MonoDevelop.VersionControlOutput", GettextCatalog.GetString ("Version Control"), "md-version-control", false, true);
 			Pad outPad = IdeApp.Workbench.ProgressMonitors.GetPadForMonitor (monitor);
 			
 			AggregatedProgressMonitor mon = new AggregatedProgressMonitor (monitor);
-			mon.AddSlaveMonitor (IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (operation, icon, true, true, false, outPad));
+			mon.AddFollowerMonitor (IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (operation, icon, true, true, false, outPad));
 			return mon;
 		}
 		
-		static IProgressMonitor GetStatusMonitor ()
+		static ProgressMonitor GetStatusMonitor ()
 		{
 			return IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (GettextCatalog.GetString ("Updating version control repository"), "vc-remote-status", true);
 		}
@@ -715,12 +709,7 @@ namespace MonoDevelop.VersionControl
 		{
 			configuration = null;
 		}
-		
-		public static void StoreRepositoryReference (Repository repo, string path, string id)
-		{
-			repo.VersionControlSystem.StoreRepositoryReference (repo, path, id);
-		}
-		
+
 		public static bool CheckVersionControlInstalled ()
 		{
 			if (IsGloballyDisabled)
@@ -729,44 +718,7 @@ namespace MonoDevelop.VersionControl
 			return GetVersionControlSystems ().Any (vcs => vcs.IsInstalled);
 		}
 		
-		internal static Repository InternalGetRepositoryReference (string path, string id)
-		{
-			string file = InternalGetRepositoryPath (path, id);
-			if (file == null)
-				return null;
-			
-			XmlDataSerializer ser = new XmlDataSerializer (dataContext);
-			XmlTextReader reader = new XmlTextReader (new StreamReader (file));
-			try {
-				return (Repository) ser.Deserialize (reader, typeof(Repository));
-			} finally {
-				reader.Close ();
-			}
-		}
-
-		internal static string InternalGetRepositoryPath (string path, string id)
-		{
-			string file = Path.Combine (path, id) + ".mdvcs";
-			if (!File.Exists (file))
-				return null;
-
-			return file;
-		}
-		
-		internal static void InternalStoreRepositoryReference (Repository repo, string path, string id)
-		{
-			string file = Path.Combine (path, id) + ".mdvcs";
-			
-			XmlDataSerializer ser = new XmlDataSerializer (dataContext);
-			XmlTextWriter tw = new XmlTextWriter (new StreamWriter (file));
-			try {
-				ser.Serialize (tw, repo, typeof(Repository));
-			} finally {
-				tw.Close ();
-			}
-		}
-		
-		public static CommitMessageFormat GetCommitMessageFormat (SolutionItem item)
+		public static CommitMessageFormat GetCommitMessageFormat (SolutionFolderItem item)
 		{
 			CommitMessageFormat format = new CommitMessageFormat ();
 			format.Style = item.Policies.Get<VersionControlPolicy> ().CommitMessageStyle;
@@ -787,7 +739,7 @@ namespace MonoDevelop.VersionControl
 						break;
 					}
 				} else {
-					project = IdeApp.Workspace.GetProjectContainingFile (item.LocalPath);
+					project = IdeApp.Workspace.GetProjectsContainingFile (item.LocalPath).FirstOrDefault ();
 				}
 			}
 			CommitMessageStyle style;
@@ -822,9 +774,8 @@ namespace MonoDevelop.VersionControl
 	}
 	
 	class InternalRepositoryReference: IDisposable
-	{
-		Repository repo;
-		
+	{

+		readonly Repository repo;

 		public InternalRepositoryReference (Repository repo)
 		{
 			this.repo = repo;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlSystem.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlSystem.cs
index 715ae193cb..43a54eb653 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlSystem.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlSystem.cs
@@ -69,8 +69,8 @@ namespace MonoDevelop.VersionControl
 		/// <param name='repo'>
 		/// A repository
 		/// </param>
-		public abstract IRepositoryEditor CreateRepositoryEditor (Repository repo);
-		
+		public abstract IRepositoryEditor CreateRepositoryEditor (Repository repo);

+
 		/// <summary>
 		/// Gets a repository for a given local path and identifier
 		/// </summary>
@@ -91,10 +91,7 @@ namespace MonoDevelop.VersionControl
 		/// repository references and will Dispose the repository only when
 		/// the last reference to the repo is freed.
 		/// </remarks>
-		public virtual Repository GetRepositoryReference (FilePath path, string id)
-		{
-			return VersionControlService.InternalGetRepositoryReference (path, id);
-		}
+		public abstract Repository GetRepositoryReference (FilePath path, string id);
 
 		/// <summary>
 		/// Gets the repository path root under this version control system.
@@ -113,14 +110,6 @@ namespace MonoDevelop.VersionControl
 		/// <returns>The repository path.</returns>
 		/// <param name="path">The path to start the repository detection from.</param>
 		/// <param name="id">An identifier. This identifier is generated by MD and normally identifiers a project.</param>
-		protected abstract FilePath OnGetRepositoryPath (FilePath path, string id);

-		
-		/// <summary>
-		/// Currently unused
-		/// </summary>
-		public virtual void StoreRepositoryReference (Repository repo, FilePath path, string id)
-		{
-			VersionControlService.InternalStoreRepositoryReference (repo, path, id);
-		}
+		protected abstract FilePath OnGetRepositoryPath (FilePath path, string id);
 	}
 }
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlTask.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlTask.cs
new file mode 100644
index 0000000000..1f0f56c7c5
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlTask.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Threading;
+using Gtk;
+
+using MonoDevelop.Core;
+
+namespace MonoDevelop.VersionControl
+{
+	internal abstract class VersionControlTask 
+	{
+		ProgressMonitor tracker;
+		ThreadNotify threadnotify;
+
+		protected VersionControlOperationType OperationType { get; set; }
+		
+		protected abstract string GetDescription();
+		
+		// This occurs in the background.
+		protected abstract void Run();
+		
+		// This occurs on the main thread when the background
+		// task is complete.
+		protected virtual void Finished()
+		{
+		}
+
+		protected VersionControlTask()
+		{
+			OperationType = VersionControlOperationType.Other;
+			threadnotify = new ThreadNotify(new ReadyEvent(Wakeup));
+		}
+		
+		protected ProgressMonitor Monitor {
+			get { return tracker; }
+		}
+		
+		protected virtual ProgressMonitor CreateProgressMonitor ()
+		{
+			return VersionControlService.GetProgressMonitor (GetDescription (), OperationType);
+		}
+		
+		public void Start() {
+			tracker = CreateProgressMonitor ();
+			tracker.BeginTask(GetDescription(), 1);
+			ThreadPool.QueueUserWorkItem (BackgroundWorker);
+		}
+		
+		void BackgroundWorker (object state)
+		{
+			try {
+				Run();
+			} catch (DllNotFoundException e) {
+				string msg = GettextCatalog.GetString ("The operation could not be completed because a shared library is missing: ");
+				tracker.ReportError(msg + e.Message, null);
+			} catch (Exception e) {
+				string msg = GettextCatalog.GetString ("Version control operation failed: ");
+				tracker.ReportError (msg, e);
+			} finally {			
+				threadnotify.WakeupMain();
+			}
+		}
+	
+		public void Wakeup() {
+			try {
+				tracker.EndTask();
+				tracker.Dispose();
+			} finally {
+				Finished();
+			}
+		}
+		
+		protected void Log(string logtext) {
+			tracker.Log.WriteLine(logtext);
+		}
+		
+		protected void Warn(string logtext) {
+			tracker.ReportWarning(logtext);
+		}
+	}
+}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
index 92fc30ab22..414e6350d4 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
@@ -26,12 +26,15 @@
 using MonoDevelop.Core;
 using System.Collections.Generic;
 using System.Linq;
-
+using System.Threading;

+

 namespace MonoDevelop.VersionControl
 {
 	class VersionInfoCache
 	{
-		Dictionary<FilePath,VersionInfo> fileStatus = new Dictionary<FilePath, VersionInfo> ();
+		ReaderWriterLockSlim fileLock = new ReaderWriterLockSlim();
+		Dictionary<FilePath,VersionInfo> fileStatus = new Dictionary<FilePath, VersionInfo> ();

+		ReaderWriterLockSlim directoryLock = new ReaderWriterLockSlim ();
 		Dictionary<FilePath,DirectoryStatus> directoryStatus = new Dictionary<FilePath, DirectoryStatus> ();
 		Repository repo;
 
@@ -42,69 +45,94 @@ namespace MonoDevelop.VersionControl
 
 		public void ClearCachedVersionInfo (FilePath rootPath)
 		{
-			var canonicalPath = rootPath.CanonicalPath;
-			lock (fileStatus) {
-				foreach (var p in fileStatus.Where (e => e.Key.IsChildPathOf (rootPath) || e.Key == canonicalPath))
-					p.Value.RequiresRefresh = true;
+			var canonicalPath = rootPath.CanonicalPath;

+

+			try {

+				fileLock.EnterWriteLock ();

+				foreach (var p in fileStatus.Where (e => e.Key.IsChildPathOf (rootPath) || e.Key == canonicalPath))

+					p.Value.RequiresRefresh = true;

+			} finally {

+				fileLock.ExitWriteLock ();

 			}
-			lock (directoryStatus) {
-				foreach (var p in directoryStatus.Where (e => e.Key.IsChildPathOf (rootPath) || e.Key == canonicalPath))
-					p.Value.RequiresRefresh = true;
+

+			try {

+				directoryLock.EnterWriteLock ();

+				foreach (var p in directoryStatus.Where (e => e.Key.IsChildPathOf (rootPath) || e.Key == canonicalPath))

+					p.Value.RequiresRefresh = true;

+			} finally {

+				directoryLock.ExitWriteLock ();

 			}
 		}
 
 		public VersionInfo GetStatus (FilePath localPath)
-		{
-			lock (fileStatus) {
-				VersionInfo vi;
-				fileStatus.TryGetValue (localPath, out vi);
-				return vi;
-			}
+		{

+			try {

+				fileLock.EnterReadLock ();

+

+				VersionInfo vi;

+				fileStatus.TryGetValue (localPath, out vi);

+				return vi;

+			} finally {

+				fileLock.ExitReadLock ();

+			}

 		}
 
 		public DirectoryStatus GetDirectoryStatus (FilePath localPath)
-		{
-			lock (directoryStatus) {
+		{

+			try {

+				directoryLock.EnterReadLock ();

+
 				DirectoryStatus vis;
-				if (directoryStatus.TryGetValue (localPath.CanonicalPath, out vis))
+				if (directoryStatus.TryGetValue (localPath.CanonicalPath, out vis))

 					return vis;
-				return null;
+				return null;

+			} finally {

+				directoryLock.ExitReadLock ();

 			}
 		}
 
 		public void SetStatus (VersionInfo versionInfo, bool notify = true)
-		{
-			lock (fileStatus) {
-				VersionInfo vi;
-				if (fileStatus.TryGetValue (versionInfo.LocalPath, out vi) && vi.Equals (versionInfo)) {
-					vi.RequiresRefresh = false;
-					return;
-				}
-				versionInfo.Init (repo);
-				fileStatus [versionInfo.LocalPath] = versionInfo;
-			}
+		{

+			try {

+				fileLock.EnterWriteLock ();

+

+				VersionInfo vi;

+				if (fileStatus.TryGetValue (versionInfo.LocalPath, out vi) && vi.Equals (versionInfo)) {

+					vi.RequiresRefresh = false;

+					return;

+				}

+				versionInfo.Init (repo);

+				fileStatus [versionInfo.LocalPath] = versionInfo;

+			} finally {

+				fileLock.ExitWriteLock ();

+			}

+
 			if (notify)
 				VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (repo, versionInfo.LocalPath, versionInfo.IsDirectory));
 		}
 
 		public void SetStatus (IEnumerable<VersionInfo> versionInfos)
 		{
-			FileUpdateEventArgs args = null;
-			lock (fileStatus) {
-				foreach (var versionInfo in versionInfos) {
-					VersionInfo vi;
-					if (fileStatus.TryGetValue (versionInfo.LocalPath, out vi) && vi.Equals (versionInfo)) {
-						vi.RequiresRefresh = false;
-						continue;
-					}
-					versionInfo.Init (repo);
-					fileStatus [versionInfo.LocalPath] = versionInfo;
-					var a = new FileUpdateEventArgs (repo, versionInfo.LocalPath, versionInfo.IsDirectory);
-					if (args == null)
-						args = a;
-					else
-						args.MergeWith (a);
-				}
+			FileUpdateEventArgs args = null;

+

+			try {

+				fileLock.EnterWriteLock ();

+				foreach (var versionInfo in versionInfos) {

+					VersionInfo vi;

+					if (fileStatus.TryGetValue (versionInfo.LocalPath, out vi) && vi.Equals (versionInfo)) {

+						vi.RequiresRefresh = false;

+						continue;

+					}

+					versionInfo.Init (repo);

+					fileStatus [versionInfo.LocalPath] = versionInfo;

+					var a = new FileUpdateEventArgs (repo, versionInfo.LocalPath, versionInfo.IsDirectory);

+					if (args == null)

+						args = a;

+					else

+						args.MergeWith (a);

+				}

+			} finally {

+				fileLock.ExitWriteLock ();

 			}
 			if (args != null) {
 			//	Console.WriteLine ("Notifying Status " + string.Join (", ", args.Select (p => p.FilePath.FullPath)));
@@ -113,14 +141,16 @@ namespace MonoDevelop.VersionControl
 		}
 
 		public void SetDirectoryStatus (FilePath localDirectory, VersionInfo[] versionInfos, bool hasRemoteStatus)
-		{
-			lock (directoryStatus) {
+		{

+			try {

+				directoryLock.EnterWriteLock ();

+
 				DirectoryStatus vis;
 				if (directoryStatus.TryGetValue (localDirectory.CanonicalPath, out vis)) {
 					if (versionInfos.Length == vis.FileInfo.Length && (hasRemoteStatus == vis.HasRemoteStatus)) {
 						bool allEqual = true;
-						for (int n=0; n<versionInfos.Length; n++) {
-							if (!versionInfos[n].Equals (vis.FileInfo[n])) {
+						for (int n = 0; n < versionInfos.Length; n++) {
+							if (!versionInfos [n].Equals (vis.FileInfo [n])) {
 								allEqual = false;
 								break;
 							}
@@ -133,6 +163,8 @@ namespace MonoDevelop.VersionControl
 				}
 				directoryStatus [localDirectory.CanonicalPath] = new DirectoryStatus { FileInfo = versionInfos, HasRemoteStatus = hasRemoteStatus };
 				SetStatus (versionInfos);
+			} finally {

+				directoryLock.ExitWriteLock ();

 			}
 		}
 	}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionStatus.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionStatus.cs
index 51194745dc..0ce9b6e497 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionStatus.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionStatus.cs
@@ -13,14 +13,14 @@ namespace MonoDevelop.VersionControl
 		LockOwned        = 0x00000008,  // File locked by the current user
 		Locked           = 0x00000010,  // File locked by another user
 		
-		Modified         = 0x00000100,
-		ScheduledAdd     = 0x00000200,
-		ScheduledDelete  = 0x00000400,
-		ScheduledReplace = 0x00000800,
-		ScheduledIgnore  = 0x00001000,
-		Missing          = 0x00002000,
-		Conflicted       = 0x00004000,
+		Modified         = 0x00010000,
+		ScheduledAdd     = 0x00020000,
+		ScheduledDelete  = 0x00040000,
+		ScheduledReplace = 0x00080000,
+		ScheduledIgnore  = 0x00100000,
+		Missing          = 0x00200000,
+		Conflicted       = 0x00400000,
 		
-		LocalChangesMask = 0x0000ff00,
+		LocalChangesMask = 0x3fff0000,
 	}
 }
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
index e27a55f751..f366187d73 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
@@ -27,7 +27,7 @@
 
 	<ExtensionPoint path = "/MonoDevelop/VersionControl/DiffViewHandler" name = "Diff view handler">
 		<Description>Handler used to create the a diff view which can display the current file.</Description>
-		<ExtensionNode name="Handler" objectType="MonoDevelop.VersionControl.IDiffViewHandler" />
+		<ExtensionNode name="Handler" objectType="MonoDevelop.VersionControl.IVersionControlViewHandler" />
 	</ExtensionPoint>
 
 	<Extension path = "/MonoDevelop/VersionControl/DiffViewHandler">
@@ -36,7 +36,7 @@
 
 	<ExtensionPoint path = "/MonoDevelop/VersionControl/BlameViewHandler" name = "Blame view handler">
 		<Description>Handler used to create the a blame view which can display the current file.</Description>
-		<ExtensionNode name="Handler" objectType="MonoDevelop.VersionControl.IBlameViewHandler" />
+		<ExtensionNode name="Handler" objectType="MonoDevelop.VersionControl.IVersionControlViewHandler" />
 	</ExtensionPoint>
 
 	<Extension path = "/MonoDevelop/VersionControl/BlameViewHandler">
@@ -45,7 +45,7 @@
 
 	<ExtensionPoint path = "/MonoDevelop/VersionControl/LogViewHandler" name = "Log view handler">
 		<Description>Handler used to create the a log view which can display the current file.</Description>
-		<ExtensionNode name="Handler" objectType="MonoDevelop.VersionControl.ILogViewHandler" />
+		<ExtensionNode name="Handler" objectType="MonoDevelop.VersionControl.IVersionControlViewHandler" />
 	</ExtensionPoint>
 
 	<Extension path = "/MonoDevelop/VersionControl/LogViewHandler">
@@ -54,7 +54,7 @@
 
 	<ExtensionPoint path = "/MonoDevelop/VersionControl/MergeViewHandler" name = "Merge view handler">
 		<Description>Handler used to create the a merge view which can display the current file.</Description>
-		<ExtensionNode name="Handler" objectType="MonoDevelop.VersionControl.IMergeViewHandler" />
+		<ExtensionNode name="Handler" objectType="MonoDevelop.VersionControl.IVersionControlViewHandler" />
 	</ExtensionPoint>
 
 	<Extension path = "/MonoDevelop/VersionControl/MergeViewHandler">
@@ -101,7 +101,7 @@
 		<StockIcon stockid = "vc-branch" resource = "branch-16.png" size="Menu" />
 		<StockIcon stockid = "md-prefs-git" resource="prefs-git-16.png" size="Menu" />
 		<StockIcon stockid = "md-prefs-commit-message-style" resource="prefs-commit-message-style-16.png" size="Menu" />
-		<StockIcon stockid = "md-prefs-version-control-general" resource="prefs-version-control-general-16.png" size="Menu" />
+		<StockIcon stockid = "md-prefs-version-control" resource="prefs-version-control-16.png" size="Menu" />
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/Commands">
@@ -142,15 +142,16 @@
 			description = "Shows the status of files in the solution."/>
 		<Command id = "MonoDevelop.VersionControl.Commands.Update"
 			_label = "_Update"
-			icon = "vc-update"
+			icon = "gtk-refresh"
 			description = "Updates the local copy with remote changes."/>
 		<Command id = "MonoDevelop.VersionControl.Commands.UpdateSolution"
 			_label = "_Update Solution"
-			icon = "vc-update"
+			icon = "gtk-refresh"
 			defaultHandler="MonoDevelop.VersionControl.UpdateCommandHandler"
 			description = "Updates the local copy with remote changes."/>
 		<Command id = "MonoDevelop.VersionControl.Commands.Publish"
-			_label = "_Publish..."
+			_label = "_Publish in Version Control..."
+			icon = "vc-push"
 			description = "Publish actual project into repository."/>
 		<Command id = "MonoDevelop.VersionControl.Commands.Checkout"
 			defaultHandler = "MonoDevelop.VersionControl.CheckoutCommand"
@@ -189,6 +190,8 @@
 			_label = "_Show diff"/>
 		<Command id = "MonoDevelop.VersionControl.Views.BlameCommands.ShowLog"
 			_label = "S_how log"/>
+		<Command id = "MonoDevelop.VersionControl.Views.BlameCommands.ShowBlameBefore"
+			_label = "Show _blame before"/>
 		</Category>
 	</Extension>
 
@@ -283,13 +286,13 @@
 	</Extension>	-->
 
 	<Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels">
-		<Section id="VersionControl" _label="Version Control" icon="md-prefs-version-control-general">
+		<Section id="VersionControl" _label="Version Control" icon="md-prefs-version-control">
 			<Condition id="ItemType" value="Solution">
-				<Section id="VersionControlGeneral" _label="General" fill="true" class="MonoDevelop.VersionControl.VersionControlSolutionOptionsPanel" icon="md-prefs-version-control-general" />
+				<Section id="VersionControlGeneral" _label="General" fill="true" class="MonoDevelop.VersionControl.VersionControlSolutionOptionsPanel" icon="md-prefs-version-control" />
 			</Condition>
 			<ComplexCondition>
 				<Or>
-					<Condition id="ItemType" value="SolutionItem" />
+					<Condition id="ItemType" value="SolutionFolderItem" />
 					<Condition id="ItemType" value="Solution" />
 				</Or>
 				<Section id="VersionControlGeneral" _label="Commit Message Style" fill="true" class="MonoDevelop.VersionControl.VersionControlPolicyPanel" icon="md-prefs-commit-message-style" />
@@ -302,7 +305,7 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/VersionControl">
-		<Section id = "VersionControlGeneral" _label = "General" fill="true" class="MonoDevelop.VersionControl.VersionControlGeneralOptionsPanel"  icon="md-prefs-version-control-general" />
+		<Section id = "VersionControlGeneral" _label = "General" fill="true" class="MonoDevelop.VersionControl.VersionControlGeneralOptionsPanel"  icon="md-prefs-version-control" />
 		<Section id = "VersionControlGeneral" _label = "Commit Message Style" fill="true" class="MonoDevelop.VersionControl.VersionControlPolicyPanel" icon="md-prefs-commit-message-style" />
 	</Extension>
 
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs
index f765c4e9e9..873bbe9f15 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs
@@ -1,4 +1,4 @@
-
+#pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.VersionControl
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs
index d97345f236..cc5e04ca1b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs
@@ -1,4 +1,4 @@
-
+#pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.VersionControl.Dialogs
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs
index befc847e87..69cf01405f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.EditRepositoryDialog.cs
@@ -1,4 +1,4 @@
-
+#pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.VersionControl.Dialogs
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs
index 18af9f6ecd..592f91bf45 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.SelectRepositoryDialog.cs
@@ -1,4 +1,4 @@
-
+#pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.VersionControl.Dialogs
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs
index 7af2e53b50..8726b24f84 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.UrlBasedRepositoryEditor.cs
@@ -1,4 +1,4 @@
-
+#pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.VersionControl
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Views.DiffWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Views.DiffWidget.cs
index a4ef0ed6e1..c4582416e6 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Views.DiffWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Views.DiffWidget.cs
@@ -1,4 +1,4 @@
-
+#pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.VersionControl.Views
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Views.LogWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Views.LogWidget.cs
index f17ab223b8..6f886546c3 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Views.LogWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Views.LogWidget.cs
@@ -1,4 +1,4 @@
-
+#pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.VersionControl.Views
 {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/generated.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/generated.cs
index 97249fd82d..fbb51be9e1 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/generated.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/generated.cs
@@ -1,4 +1,4 @@
-

+#pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.

 namespace Stetic

 {

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16.png
index ee84ca2bff..b0282a5116 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16@2x.png
index 00e84c79e4..3b1a6168c0 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark.png
new file mode 100644
index 0000000000..39898d7c8b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..36be421550
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..1354c0d347
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..87220cc9f7
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~sel.png
new file mode 100644
index 0000000000..1354c0d347
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..87220cc9f7
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16.png
index a6a5b24cfe..e4f03a7d94 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16@2x.png
index a2bff92231..8112684192 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark.png
new file mode 100644
index 0000000000..3b09162c07
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark@2x.png
new file mode 100644
index 0000000000..f858d0b065
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled.png
new file mode 100644
index 0000000000..28cc3be949
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..c07a5322af
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled.png
new file mode 100644
index 0000000000..c0abf4d3b4
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled@2x.png
new file mode 100644
index 0000000000..47c75de529
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16.png
index 7c9ad146d5..a712539cae 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16@2x.png
index 0bf30e0162..8796e746ad 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark.png
new file mode 100644
index 0000000000..8159d32c75
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark@2x.png
new file mode 100644
index 0000000000..0c86f23baf
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled.png
new file mode 100644
index 0000000000..70b522bc66
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..bf07f8869a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled.png
new file mode 100644
index 0000000000..f7fe199170
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled@2x.png
new file mode 100644
index 0000000000..1b90a2488f
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16.png
index ea93ecbbf3..6c791cdeb1 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16@2x.png
index 596dc19eb9..2b988ffddb 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark.png
new file mode 100644
index 0000000000..038ebeec71
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark@2x.png
new file mode 100644
index 0000000000..692770349b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled.png
new file mode 100644
index 0000000000..f37d0466e1
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..71b549aa00
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled.png
new file mode 100644
index 0000000000..193ad8ba5e
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled@2x.png
new file mode 100644
index 0000000000..4c15660c39
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16.png
index 811e2a0807..ee06fb0f96 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16@2x.png
index 1313d23118..f58311a7d3 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark.png
new file mode 100644
index 0000000000..e8fdd3ea4b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..c558765b24
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..6c4aea5db9
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..5405d0894b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~sel.png
new file mode 100644
index 0000000000..6c4aea5db9
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..5405d0894b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16.png
index 153e4a59e3..93106a163c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16@2x.png
index 73900ae4b8..712754bbc6 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark.png
new file mode 100644
index 0000000000..d927501998
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark@2x.png
new file mode 100644
index 0000000000..0ebb29b2b0
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled.png
new file mode 100644
index 0000000000..a836939b3a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..2b771279c6
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled.png
new file mode 100644
index 0000000000..a9bb381c56
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled@2x.png
new file mode 100644
index 0000000000..37187c79b4
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15.png
new file mode 100644
index 0000000000..5ac5d87af3
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15@2x.png
new file mode 100644
index 0000000000..39f3e7d2d6
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15.png
new file mode 100644
index 0000000000..2279ed2693
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15@2x.png
new file mode 100644
index 0000000000..28e7c8fea9
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16.png
index 678286ba01..db1352c363 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16@2x.png
index 45c41e3955..b296629431 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark.png
new file mode 100644
index 0000000000..429e96550d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..bf73671e49
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..71493fb5bc
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..01e54b5067
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~sel.png
new file mode 100644
index 0000000000..71493fb5bc
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..01e54b5067
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16.png
index b50e6fc982..c67564b1e9 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16@2x.png
index bf9dd78174..0fe0d64f2b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark.png
new file mode 100644
index 0000000000..0646c5d95d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark@2x.png
new file mode 100644
index 0000000000..e9b3047748
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16.png
index d02df13681..1639184a97 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16@2x.png
index 0220289f5a..c000b5a601 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark.png
new file mode 100644
index 0000000000..eb74218112
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..a2904102ab
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..270a770f6d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..295901e13a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~sel.png
new file mode 100644
index 0000000000..270a770f6d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..295901e13a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16.png
index 50bb6b6b5a..77d809bb6e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16@2x.png
index 2e1c3f6684..1b1d1a8e81 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark.png
new file mode 100644
index 0000000000..9086e1e394
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..a99bbd3d96
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..270a770f6d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..295901e13a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~sel.png
new file mode 100644
index 0000000000..270a770f6d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..295901e13a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16.png
index 72d172e2ab..6430bfc5cc 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16@2x.png
index aaa76142ef..d410cd0186 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark.png
new file mode 100644
index 0000000000..a57fdb3b34
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark@2x.png
new file mode 100644
index 0000000000..8c9e358815
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16.png
index 2b9cef04ab..0b882c75bd 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16@2x.png
index 7a10f5edd7..1f5971063a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark.png
new file mode 100644
index 0000000000..13b4ff7023
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..300f40d574
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..51037dde19
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..6e39782056
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~sel.png
new file mode 100644
index 0000000000..51037dde19
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..6e39782056
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16.png
index ea93ecbbf3..be975275fe 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16@2x.png
index 596dc19eb9..3cc519561c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark.png
new file mode 100644
index 0000000000..7f80ff7816
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark@2x.png
new file mode 100644
index 0000000000..6e309b1b99
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel.png
new file mode 100644
index 0000000000..a2d66f5373
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel@2x.png
new file mode 100644
index 0000000000..f6794fd248
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel.png
new file mode 100644
index 0000000000..a2d66f5373
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel@2x.png
new file mode 100644
index 0000000000..f6794fd248
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16.png
index ac46bb38b3..983b855fa5 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16@2x.png
index d09e54f010..c3edbd18bd 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark.png
new file mode 100644
index 0000000000..420c104055
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark@2x.png
new file mode 100644
index 0000000000..380bb5acad
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel.png
new file mode 100644
index 0000000000..ffdbe46f50
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel@2x.png
new file mode 100644
index 0000000000..ad0f58cfcd
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel.png
new file mode 100644
index 0000000000..ffdbe46f50
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel@2x.png
new file mode 100644
index 0000000000..ad0f58cfcd
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16.png
new file mode 100644
index 0000000000..b60fcb3b6c
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16@2x.png
new file mode 100644
index 0000000000..d0d7949bf5
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark.png
new file mode 100644
index 0000000000..686e1d5a5d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark@2x.png
new file mode 100644
index 0000000000..b6dc465573
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel.png
new file mode 100644
index 0000000000..c38408f189
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel@2x.png
new file mode 100644
index 0000000000..73a1032f31
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel.png
new file mode 100644
index 0000000000..c38408f189
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel@2x.png
new file mode 100644
index 0000000000..73a1032f31
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16.png
deleted file mode 100644
index f50af22deb..0000000000
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16.png
+++ /dev/null
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16@2x.png
deleted file mode 100644
index 230d65e12d..0000000000
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16@2x.png
+++ /dev/null
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16.png
index 7024886a2a..4852ab9415 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16@2x.png
index ad50947884..2de4dc0ea7 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark.png
new file mode 100644
index 0000000000..d3e8fd7192
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark@2x.png
new file mode 100644
index 0000000000..7edbe04680
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled.png
new file mode 100644
index 0000000000..fa8b5a2de8
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..3e10d25314
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled.png
new file mode 100644
index 0000000000..304c16ebb3
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled@2x.png
new file mode 100644
index 0000000000..5237a1aa9c
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16.png
index ac46bb38b3..8f960c125c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16@2x.png
index d09e54f010..3588d7b302 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark.png
new file mode 100644
index 0000000000..19afa14ba5
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark@2x.png
new file mode 100644
index 0000000000..cb0e3b4312
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled.png
new file mode 100644
index 0000000000..3a4a660d09
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..b7b53642f9
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled.png
new file mode 100644
index 0000000000..671e179f79
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled@2x.png
new file mode 100644
index 0000000000..09a8f84eea
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16.png
index d63fa2fad8..d96792ba71 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16@2x.png
index 848a94e174..ae40f00576 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark.png
new file mode 100644
index 0000000000..9d8cd6f608
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark@2x.png
new file mode 100644
index 0000000000..916b709792
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled.png
new file mode 100644
index 0000000000..481804372b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..5fc8f1c032
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled.png
new file mode 100644
index 0000000000..bb031de2a4
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled@2x.png
new file mode 100644
index 0000000000..17612ee4d0
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16.png
index e362102a8c..b594ed2036 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16@2x.png
index c270cd23a5..0bda079f14 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark.png
new file mode 100644
index 0000000000..e2d93b2726
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark@2x.png
new file mode 100644
index 0000000000..e3ab8ba0f4
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled.png
new file mode 100644
index 0000000000..0646c5d95d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..e9b3047748
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled.png
new file mode 100644
index 0000000000..c67564b1e9
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled@2x.png
new file mode 100644
index 0000000000..0fe0d64f2b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16.png
index 8f41659d22..722b025a04 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16@2x.png
index 953e8105a4..5219842fbb 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark.png
new file mode 100644
index 0000000000..1d3b633832
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..92da963c3e
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..ac12f9b138
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..cc1bb463ba
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~sel.png
new file mode 100644
index 0000000000..ac12f9b138
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..cc1bb463ba
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16.png
index bc94eec59b..add30910df 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16@2x.png
index 140a16ffbd..6affd6dc2a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark.png
new file mode 100644
index 0000000000..e49f5331ae
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..686d859782
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..dd100f4cad
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..89de779d21
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~sel.png
new file mode 100644
index 0000000000..dd100f4cad
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..89de779d21
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16.png
index f50af22deb..ab6673922c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16@2x.png
index 230d65e12d..2d38ea01e9 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark.png
new file mode 100644
index 0000000000..5aa99bf942
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark@2x.png
new file mode 100644
index 0000000000..4b50c0b458
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16.png
index e08803d985..a67e18840a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16@2x.png
index d9155f2685..7faee37ac9 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark.png
new file mode 100644
index 0000000000..e990f97de7
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark@2x.png
new file mode 100644
index 0000000000..fbaadddd44
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled.png
new file mode 100644
index 0000000000..c453434fcc
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..ef172c44f8
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled.png
new file mode 100644
index 0000000000..261a85670d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled@2x.png
new file mode 100644
index 0000000000..af3cffa5b8
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16.png
index 5ed5e35bfb..73f83946d1 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16@2x.png
index 4de708587a..ebddd28d29 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark.png
new file mode 100644
index 0000000000..f54b303abe
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark@2x.png
new file mode 100644
index 0000000000..0501df6f37
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled.png
new file mode 100644
index 0000000000..470e3b93f6
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..242f33a64e
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled.png
new file mode 100644
index 0000000000..c722a41deb
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled@2x.png
new file mode 100644
index 0000000000..b7922e78c3
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16.png
index 3d2ff49956..a4080a07ee 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16@2x.png
index 14fb4b8bc1..1375a972dd 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark.png
new file mode 100644
index 0000000000..58fb9c2aa2
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..a1a51e3873
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..270a770f6d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..295901e13a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~sel.png
new file mode 100644
index 0000000000..270a770f6d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..295901e13a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16.png
index aff6b9a6e9..8d4f6d8043 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16@2x.png
index 909a0fb128..61e207f732 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark.png
new file mode 100644
index 0000000000..8ecd048ea8
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..30725a7fdf
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..2a2a261025
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..d6df229d20
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~sel.png
new file mode 100644
index 0000000000..2a2a261025
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..d6df229d20
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16.png
index 1a0db8de4b..d871330d2a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16@2x.png
index 67682b1ed1..cd7d92c9d7 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark.png
new file mode 100644
index 0000000000..66f4acf693
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark@2x.png
new file mode 100644
index 0000000000..a13fc89a90
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled.png
new file mode 100644
index 0000000000..960f061f3a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..517c9ccf8b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled.png
new file mode 100644
index 0000000000..3b52fc0336
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled@2x.png
new file mode 100644
index 0000000000..8bf165d341
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16.png
index d92f477577..dd8b51440a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16@2x.png
index a8ddfe5c84..56d1e330b6 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark.png
new file mode 100644
index 0000000000..1fa4e5f56b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark@2x.png
new file mode 100644
index 0000000000..b1365ca79d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled.png
new file mode 100644
index 0000000000..9a05d84334
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..e5c1018897
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled.png
new file mode 100644
index 0000000000..1b44deecd3
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled@2x.png
new file mode 100644
index 0000000000..2a52a64f36
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16.png
index 06271b21e1..81fae65eba 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16@2x.png
index 3f38ee7639..09e1bb2559 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark.png
new file mode 100644
index 0000000000..afc6cf1484
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark@2x.png
new file mode 100644
index 0000000000..085685f4de
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled.png
new file mode 100644
index 0000000000..badde350c3
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..1e13a3819b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled.png
new file mode 100644
index 0000000000..ef7a5f8e77
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled@2x.png
new file mode 100644
index 0000000000..18ffb68fc0
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16.png
index d33e4da129..0e24d32859 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16@2x.png
index e29f3370cd..448750e2bd 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark.png
new file mode 100644
index 0000000000..f7dd8c449a
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark@2x.png
new file mode 100644
index 0000000000..0f7ec817d3
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled.png
new file mode 100644
index 0000000000..338b1cbb6b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..5669ace2df
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled.png
new file mode 100644
index 0000000000..47ebff636e
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled@2x.png
new file mode 100644
index 0000000000..1b977c1f0c
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16.png
index 21c19491cc..26024d2577 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16@2x.png
index f39392b154..a814eac25d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark.png
new file mode 100644
index 0000000000..7d50904383
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark@2x.png
new file mode 100644
index 0000000000..d7dd1ac722
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled.png
new file mode 100644
index 0000000000..5f499cc257
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled@2x.png
new file mode 100644
index 0000000000..69d3b00c69
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled.png
new file mode 100644
index 0000000000..36e9c036e7
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled@2x.png
new file mode 100644
index 0000000000..310ea81248
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16.png
index b084d922fb..b60fcb3b6c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16@2x.png
index 2b5ba106e6..d0d7949bf5 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark.png
new file mode 100644
index 0000000000..686e1d5a5d
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark@2x.png
new file mode 100644
index 0000000000..b6dc465573
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16.png
index eccbc51b8a..2cd0be132a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16@2x.png
index ff97459f65..9c5c7b2723 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16@2x.png
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark.png
new file mode 100644
index 0000000000..947968e2f4
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark@2x.png
new file mode 100644
index 0000000000..0b2c310fd0
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark~sel.png
new file mode 100644
index 0000000000..2a2a261025
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark~sel@2x.png
new file mode 100644
index 0000000000..d6df229d20
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark~sel@2x.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~sel.png
new file mode 100644
index 0000000000..2a2a261025
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~sel.png
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~sel@2x.png
new file mode 100644
index 0000000000..d6df229d20
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~sel@2x.png
diff --git a/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs b/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
index 009341e6e9..5633892e23 100644
--- a/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
+++ b/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
@@ -17,14 +17,29 @@ namespace SubversionAddinWindows
 	sealed class SvnSharpClient: SubversionVersionControl

 	{

 		static bool errorShown;

+		static bool initialized;

 		static bool installError {

-			get { return client.Value == null; }

+			get {

+				if (initialized)

+					return !client.IsValueCreated;

+

+				try {

+					initialized = true;

+

+					// Intended.

+					var dummy = client.Value;

+				} catch (Exception e) {

+					LoggingService.LogError ("SVN client could not be initialized", e);

+					return true;

+				}

+				return false;

+			}

 		}

-		static readonly internal Lazy<SvnClient> client;

+		static readonly internal Lazy<object> client;

 		

 		static SvnSharpClient ()

 		{

-			client = new Lazy<SvnClient> (CheckInstalled);

+			client = new Lazy<object> (CheckInstalled);

 		}

 

 		public override string Version {

@@ -33,7 +48,7 @@ namespace SubversionAddinWindows
 			}

 		}

 

-		static SvnClient CheckInstalled ()

+		static object CheckInstalled ()

 		{

 			try {

 				return new SvnClient ();

@@ -54,10 +69,15 @@ namespace SubversionAddinWindows
 			{

 				if (!errorShown && installError) {

 					errorShown = true;

-					var db = new AlertButton ("Go to Download Page");

-					AlertButton res = MessageService.AskQuestion ("The Subversion add-in could not be initialized", "This add-in requires the 'Microsoft Visual C++ 2005 Service Pack 1 Redistributable'. You may need to install it.", db, AlertButton.Ok);

+					var db = new AlertButton (GettextCatalog.GetString ("Go to Download Page"));

+					AlertButton res = MessageService.AskQuestion (

+						GettextCatalog.GetString ("The Subversion add-in could not be initialized"),

+						GettextCatalog.GetString ("This add-in requires the 'Microsoft Visual C++ 2010 Redistributable'. You may need to install it."),

+						db,

+						AlertButton.Ok);

+

 					if (res == db) {

-						DesktopService.ShowUrl ("http://www.microsoft.com/downloads/details.aspx?familyid=766a6af7-ec73-40ff-b072-9112bab119c2");

+						DesktopService.ShowUrl ("https://www.microsoft.com/en-us/download/details.aspx?id=5555");

 					}

 				}

 				return !installError;

@@ -68,8 +88,11 @@ namespace SubversionAddinWindows
 		{

 			string wc_path;

 			try {

+				if (client.Value == null)

+					return string.Empty;

+				

 				lock (client.Value)

-					wc_path = client.Value.GetWorkingCopyRoot (path.FullPath);

+					wc_path = ((SvnClient)client.Value).GetWorkingCopyRoot (path.FullPath);

 				return wc_path;

 			} catch (SvnException e) {

 				switch (e.SvnErrorCode) {

@@ -85,10 +108,10 @@ namespace SubversionAddinWindows
 	sealed class SvnSharpBackend: SubversionBackend

 	{

 		static SvnClient client {

-			get { return SvnSharpClient.client.Value; }

+			get { return (SvnClient)SvnSharpClient.client.Value; }

 		}

 

-		IProgressMonitor updateMonitor;

+		ProgressMonitor updateMonitor;

 		NotifData notifyData;

 		ProgressData progressData;

 

@@ -145,7 +168,7 @@ namespace SubversionAddinWindows
 				if (updateMonitor == null)

 					return;

 

-				a.Cancel = updateMonitor.IsCancelRequested;

+				a.Cancel = updateMonitor.CancellationToken.IsCancellationRequested;

 			};

 		}

 

@@ -207,7 +230,7 @@ namespace SubversionAddinWindows
 			e.CertificateFile = file;

 		}

 

-		public override void Add (FilePath path, bool recurse, IProgressMonitor monitor)

+		public override void Add (FilePath path, bool recurse, ProgressMonitor monitor)

 		{

 			var args = new SvnAddArgs {

 				Depth = recurse ? SvnDepth.Infinity : SvnDepth.Empty,

@@ -218,7 +241,7 @@ namespace SubversionAddinWindows
 				client.Add (path, args);

 		}

 

-		public override void Checkout (string url, FilePath path, Revision rev, bool recurse, IProgressMonitor monitor)

+		public override void Checkout (string url, FilePath path, Revision rev, bool recurse, ProgressMonitor monitor)

 		{

 			var args = new SvnCheckOutArgs {

 				Depth = recurse ? SvnDepth.Infinity : SvnDepth.Empty,

@@ -234,7 +257,7 @@ namespace SubversionAddinWindows
 			}

 		}

 

-		public override void Commit (FilePath[] paths, string message, IProgressMonitor monitor)

+		public override void Commit (FilePath[] paths, string message, ProgressMonitor monitor)

 		{

 			var args = new SvnCommitArgs {

 				LogMessage = message,

@@ -244,7 +267,7 @@ namespace SubversionAddinWindows
 				client.Commit (paths.ToStringArray (), args);

 		}

 

-		public override void Delete (FilePath path, bool force, IProgressMonitor monitor)

+		public override void Delete (FilePath path, bool force, ProgressMonitor monitor)

 		{

 			var args = new SvnDeleteArgs {

 				Force = force,

@@ -349,7 +372,7 @@ namespace SubversionAddinWindows
 			return RevisionAction.Other;

 		}

 

-		public override void Mkdir (string[] paths, string message, IProgressMonitor monitor)

+		public override void Mkdir (string[] paths, string message, ProgressMonitor monitor)

 		{

 			var args = new SvnCreateDirectoryArgs {

 				CreateParents = true,

@@ -361,7 +384,7 @@ namespace SubversionAddinWindows
 				client.RemoteCreateDirectories (uris, args);

 		}

 

-		public override void Move (FilePath srcPath, FilePath destPath, SvnRevision rev, bool force, IProgressMonitor monitor)

+		public override void Move (FilePath srcPath, FilePath destPath, SvnRevision rev, bool force, ProgressMonitor monitor)

 		{

 			var args = new SvnMoveArgs {

 				Force = force,

@@ -388,7 +411,7 @@ namespace SubversionAddinWindows
 			}

 		}

 

-		public override void Revert (FilePath[] paths, bool recurse, IProgressMonitor monitor)

+		public override void Revert (FilePath[] paths, bool recurse, ProgressMonitor monitor)

 		{

 			var args = new SvnRevertArgs {

 				Depth = recurse ? SvnDepth.Infinity : SvnDepth.Children,

@@ -398,7 +421,7 @@ namespace SubversionAddinWindows
 				client.Revert (paths.ToStringArray (), args);

 		}

 

-		public override void RevertRevision (FilePath path, Revision revision, IProgressMonitor monitor)

+		public override void RevertRevision (FilePath path, Revision revision, ProgressMonitor monitor)

 		{

 			var args = new SvnMergeArgs ();

 			BindMonitor (monitor);

@@ -408,7 +431,7 @@ namespace SubversionAddinWindows
 				client.Merge (path, new SvnPathTarget (path), range, args);

 		}

 

-		public override void RevertToRevision (FilePath path, Revision revision, IProgressMonitor monitor)

+		public override void RevertToRevision (FilePath path, Revision revision, ProgressMonitor monitor)

 		{

 			var args = new SvnMergeArgs ();

 			BindMonitor (monitor);

@@ -457,7 +480,7 @@ namespace SubversionAddinWindows
 			if (ent.IsRemoteUpdated) {

 				rs = ConvertStatus (SvnSchedule.Normal, ent.RemoteContentStatus);

 				rr = new SvnRevision (repo, (int) ent.RemoteUpdateRevision, ent.RemoteUpdateCommitTime,

-									  ent.RemoteUpdateCommitAuthor, "(unavailable)", null);

+				                      ent.RemoteUpdateCommitAuthor, GettextCatalog.GetString ("(unavailable)"), null);

 			}

 

 			VersionStatus status = ConvertStatus (SvnSchedule.Normal, ent.LocalContentStatus);

@@ -511,7 +534,7 @@ namespace SubversionAddinWindows
 			return VersionStatus.Unversioned;

 		}

 

-		public override void Lock (IProgressMonitor monitor, string comment, bool stealLock, params FilePath[] paths)

+		public override void Lock (ProgressMonitor monitor, string comment, bool stealLock, params FilePath[] paths)

 		{

 			var args = new SvnLockArgs {

 				Comment = comment,

@@ -522,7 +545,7 @@ namespace SubversionAddinWindows
 				client.Lock (paths.ToStringArray (), args);

 		}

 

-		public override void Unlock (IProgressMonitor monitor, bool breakLock, params FilePath[] paths)

+		public override void Unlock (ProgressMonitor monitor, bool breakLock, params FilePath[] paths)

 		{

 			var args = new SvnUnlockArgs {

 				BreakLock = breakLock,

@@ -532,7 +555,7 @@ namespace SubversionAddinWindows
 				client.Unlock (paths.ToStringArray (), args);

 		}

 

-		public override void Update (FilePath path, bool recurse, IProgressMonitor monitor)

+		public override void Update (FilePath path, bool recurse, ProgressMonitor monitor)

 		{

 			var args = new SvnUpdateArgs {

 				Depth = recurse ? SvnDepth.Infinity : SvnDepth.Children,

@@ -600,7 +623,7 @@ namespace SubversionAddinWindows
 				var annotations = new Annotation [numAnnotations];

 				foreach (var annotation in list) {

 					if (annotation.LineNumber < annotations.Length)

-						annotations [(int)annotation.LineNumber] = new Annotation (annotation.Revision.ToString (),

+						annotations [(int)annotation.LineNumber] = new Annotation (new SvnRevision(repo, (int)annotation.Revision),

 																					annotation.Author, annotation.Time);

 				}

 				return annotations;

@@ -658,7 +681,7 @@ namespace SubversionAddinWindows
 			public int Seconds;

 		}

 

-		void BindMonitor (IProgressMonitor monitor)

+		void BindMonitor (ProgressMonitor monitor)

 		{

 			notifyData = new NotifData ();

 			progressData = new ProgressData ();

@@ -673,7 +696,7 @@ namespace SubversionAddinWindows
 			return String.Format ("{0:0.00} MBytes", kbytes / 1024.0);

 		}

 

-		static void ProgressWork (SvnProgressEventArgs e, ProgressData data, IProgressMonitor monitor)

+		static void ProgressWork (SvnProgressEventArgs e, ProgressData data, ProgressMonitor monitor)

 		{

 			if (monitor == null)

 				return;

@@ -705,12 +728,12 @@ namespace SubversionAddinWindows
 			data.LogTimer.Interval = 1000;

 			data.LogTimer.Elapsed += delegate {

 				data.Seconds += 1;

-				monitor.Log.WriteLine ("Transferred {0} in {1} seconds.", BytesToSize (data.KBytes), data.Seconds);

+				monitor.Log.WriteLine (GettextCatalog.GetString ("Transferred {0} in {1} seconds."), BytesToSize (data.KBytes), data.Seconds);

 			};

 			data.LogTimer.Start ();

 		}

 

-		static void Notify (SvnNotifyEventArgs e, NotifData notifData, IProgressMonitor monitor)

+		static void Notify (SvnNotifyEventArgs e, NotifData notifData, ProgressMonitor monitor)

 		{

 			string actiondesc;

 			string file = e.Path;

diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/CommonFileDialogs/CommonFileDialog.cs b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/CommonFileDialogs/CommonFileDialog.cs
index 8d418ac4c6..3cb8d2ddeb 100644
--- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/CommonFileDialogs/CommonFileDialog.cs
+++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/CommonFileDialogs/CommonFileDialog.cs
@@ -638,6 +638,8 @@ namespace Microsoft.WindowsAPICodePack.Dialogs
                 PopulateWithIShellItems(items);

             }

 

+            CleanupEventSink();

+

             return result;

         }

         /// <summary>

@@ -675,6 +677,15 @@ namespace Microsoft.WindowsAPICodePack.Dialogs
             }

         }

 

+        private void CleanupEventSink()

+        {

+            if (nativeEventSink != null)

+            {

+                nativeDialog.Unadvise(nativeEventSink.Cookie);

+                nativeEventSink = null;

+            }

+        }

+

         private void ApplyNativeSettings(IFileDialog dialog)

         {

             Debug.Assert(dialog != null, "No dialog instance to configure");

diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/PropertySystem/ShellProperty.cs b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/PropertySystem/ShellProperty.cs
index ef4167876c..93650334e4 100644
--- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/PropertySystem/ShellProperty.cs
+++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/PropertySystem/ShellProperty.cs
@@ -195,14 +195,15 @@ namespace Microsoft.WindowsAPICodePack.Shell.PropertySystem
                 // Make sure we use the correct type

                 Debug.Assert(ValueType == ShellPropertyFactory.VarEnumToSystemType(Description.VarEnumType));

 

-                if (typeof(T) != ValueType)

+				var type = typeof(T);

+                if (type != ValueType)

                 {

                     throw new NotSupportedException(

                         string.Format(System.Globalization.CultureInfo.InvariantCulture,

                         LocalizedMessages.ShellPropertyWrongType, ValueType.Name));

                 }

 

-                if (value is Nullable)

+				if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))

                 {

                     Type t = typeof(T);

                     PropertyInfo pi = t.GetProperty("HasValue");

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/ChangeLog b/main/src/addins/WindowsPlatform/WindowsPlatform/ChangeLog
deleted file mode 100644
index 909021cd2c..0000000000
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/ChangeLog
+++ /dev/null
@@ -1,182 +0,0 @@
-2010-05-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* SelectFileDialogHandler.cs: Fix build.
-
-2010-05-25  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* AddFileDialogHandler.cs:
-	* SelectFileDialogHandler.cs: Track api changes.
-
-2010-05-17  Michael Hutchinson  <mhutchinson@novell.com>
-
-	* WindowsPlatform.cs: Fixed Bug 606364 - Cannot execute
-	  program in external console.
-
-2010-05-04  Jonathan Pobst  <monkey@jpobst.com>

-

-	* WindowsPlatform.cs: Respect the workingDirectory parameter

-	in StartConsoleProcess.

-

-2010-04-30  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.cs: Fix build.

-

-2010-04-28  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* WindowsPlatform.cs: Track StartConsoleProcess API.

-

-2010-04-26  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.cs: External console processes are now

-	  wrapped by a IProcessAsyncOperation interface, instead of a

-	  Process instance. In this way it is possible to create

-	  external consoles which are not directly bound to a process.

-

-2010-03-30  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.cs: Quote the command.

-

-2010-03-30  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.cs: Add support for external consoles using

-	  cmd.exe.

-

-2010-03-22  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* AssemblyInfo.cs:

-	* WindowsPlatform.addin.xml: Bumped MD version.

-

-2010-03-19  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.addin.xml: Remove old add-in.

-

-2010-03-19  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* Win32.cs:

-	* Enums.cs:

-	* structs.cs:

-	* WinFormsRoot.cs:

-	* WindowsPlatform.cs:

-	* OpenFileDialogEx.cs:

-	* OpenFileDialogEx.resx:

-	* WindowsPlatform.csproj:

-	* CustomAddFilesDialog.cs:

-	* AddFileDialogHandler.cs:

-	* WindowsPlatform.addin.xml:

-	* CustomAddFilesDialog.resx:

-	* SelectFileDialogHandler.cs:

-	* OpenFileDialogEx.Designer.cs:

-	* CustomAddFilesDialog.Designer.cs: Initial implementation of

-	  native dialogs for file open operations. Not yet enabled.

-	  Fixed build.

-

-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.csproj: Remove import off mono.addins

-	  targets.

-

-2010-03-17  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* Win32.cs:

-	* WindowsPlatform.cs:

-	* WindowsPlatform.csproj:

-	* WindowsPlatform.addin.xml: Merged MD.Projects into MD.Core,

-	  and MD.Projects.Gui, MD.Core.Gui and MD.Components into

-	  MD.Ide.

-

-2009-12-03  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* WindowsPlatform.cs: Don't return an invalid application from

-	  GetAllApplications. Fixes "Bug 552403 - Right clicking Open

-	  With -> List of programs to open with on a file results in

-	  an exception".

-

-2009-10-30  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* AssemblyInfo.cs:

-	* WindowsPlatform.addin.xml: Bump MD version.

-

-2009-10-29  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.csproj: Flush.

-

-2009-10-07  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* AssemblyInfo.cs:

-	* WindowsPlatform.addin.xml: Bump MD version.

-

-2009-09-24  Mike Krüger  <mkrueger@novell.com>

-

-	* WindowsPlatform.cs: Fixed 'Bug 541610 - MonoDevelop 2.2 beta

-	  1 can't display Chinese text'.

-

-2009-08-28  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.cs: Add a default implementation of

-	  GetMimeTypeDescription.

-

-2009-05-07  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.cs: Don't crash if icon for a file can't be

-	  found.

-

-	* Win32.cs: Some win32 api.

-

-2009-05-04  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.cs:

-	* WindowsPlatform.csproj: Implemented mime type and file icon

-	  support.

-

-2009-04-21  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.cs: New overrides.

-

-2009-04-15  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* AssemblyInfo.cs:

-	* WindowsPlatform.addin.xml: Bump MD version.

-

-2009-02-26  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.csproj: Flush.

-

-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* WindowsPlatform.csproj: Remove more inadvertent local

-	  copying of references.

-

-2009-02-08  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* WindowsPlatform.csproj: Add project file for WindowsPlatform

-	  addin.

-

-2008-12-04  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* Makefile.am: Make it work for parallel build.

-

-2008-12-02  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am:

-	* AssemblyInfo.cs: Add AssemblyInfo.cs files that are autogenerated from

-	the addin manifests.

-

-2008-11-06  Michael Hutchinson  <mhutchinson@novell.com>

-

-	* Makefile.am: Fix build dependencies.

-

-2008-11-05  Lluis Sanchez Gual  <lluis@novell.com>

-

-	* WindowsPlatform.addin.xml: Bump MD version.

-

-2008-06-04  Lluis Sanchez Gual <lluis@novell.com> 

-

-	* WindowsPlatform.addin.xml: Bump MD version.

-

-2008-04-11  Lluis Sanchez Gual <lluis@novell.com> 

-

-	* WindowsPlatform.cs: Track api changes.

-

-2008-03-11  Jonathan Pobst  <monkey@jpobst.com>

-

-	* WindowsPlatform.cs: Initial version.

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/CommonFileDialogExtensions.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/CommonFileDialogExtensions.cs
index 71cbbdc966..bbb3c798d4 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/CommonFileDialogExtensions.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/CommonFileDialogExtensions.cs
@@ -55,7 +55,7 @@ namespace MonoDevelop.Platform
 			var fileDialog = dialog as CommonOpenFileDialog;

 			if (fileDialog != null) {

 				fileDialog.Multiselect = data.SelectMultiple;

-				if (data.Action == FileChooserAction.SelectFolder) {

+				if ((data.Action & FileChooserAction.SelectFolder) != 0) {

 					fileDialog.IsFolderPicker = true;

 					return;

 				}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs
index de8c74197f..df890a1a99 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs
@@ -230,21 +230,48 @@ namespace MonoDevelop.Platform
 				return false;

 			}

 

+			int selected = -1;

+			int i = 0;

 			bool hasBench = false;

 			var projectService = IdeApp.Services.ProjectService;

 			if (projectService.IsWorkspaceItemFile (fileName) || projectService.IsSolutionItemFile (fileName)) {

 				hasBench = true;

 				combo.Items.Add (new ViewerComboItem (null, GettextCatalog.GetString ("Solution Workbench")));

+				if (!CanBeOpenedInAssemblyBrowser (fileName))

+					selected = 0;

+				i++;

 			}

 

 			foreach (var vw in DisplayBindingService.GetFileViewers (fileName, null))

-				if (!vw.IsExternal)

+				if (!vw.IsExternal) {

 					combo.Items.Add (new ViewerComboItem (vw, vw.Title));

 

+					if (vw.CanUseAsDefault && selected == -1)

+						selected = i;

+

+					i++;

+				}

+

+			if (selected == -1)

+				selected = 0;

+

 			combo.Enabled = combo.Items.Count >= 1;

+			if (selected > 0) {

+				// Unable to set SelectedIndex until ApplyControlPropertyChange called for Items

+				// which causes the combo box selection to visibly change selection twice. Instead just

+				// make the default item the first one in the combo.

+				var item = combo.Items[selected];

+				combo.Items.RemoveAt (selected);

+				combo.Items.Insert (0, item);

+			}

 			return hasBench;

 		}

 

+		static bool CanBeOpenedInAssemblyBrowser (FilePath filename)

+		{

+			return filename.Extension.ToLower () == ".exe" || filename.Extension.ToLower () == ".dll";

+		}

+

 		class ViewerComboItem : CommonFileDialogComboBoxItem

 		{

 			public ViewerComboItem (FileViewer viewer, string label) : base (label)

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/GdkWin32.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/GdkWin32.cs
index 6c02e62578..5b595b007b 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/GdkWin32.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/GdkWin32.cs
@@ -58,6 +58,12 @@ namespace MonoDevelop.Platform
 		[DllImport (Win32.USER32, SetLastError=true, CharSet=CharSet.Auto)]
 		static extern uint RegisterWindowMessage (string lpString);
 
+		public static IntPtr HgdiobjGet (MonoDevelop.Components.Window window)
+		{
+			Gtk.Window gtkWindow = window;
+			return HgdiobjGet (gtkWindow.GdkWindow);
+		}
+
 		public static IntPtr HgdiobjGet (Gdk.Drawable drawable)
 		{
 			return gdk_win32_drawable_get_handle (drawable.Handle);
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/ImageBox.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/ImageBox.cs
new file mode 100644
index 0000000000..a29c561545
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/ImageBox.cs
@@ -0,0 +1,167 @@
+//

+// ImageBox.cs

+//

+// Author:

+//       Vsevolod Kukol <sevo@xamarin.com>

+//

+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+using System;

+using System.Windows;

+using Xwt.Drawing;

+using System.Windows.Media;

+using System.Windows.Controls;

+

+namespace WindowsPlatform

+{

+	public class ImageBox : UserControl

+	{

+		public static readonly DependencyProperty ImageProperty =

+			DependencyProperty.Register ("Image", typeof (Xwt.Drawing.Image), typeof (ImageBox), new FrameworkPropertyMetadata () { AffectsMeasure = true, AffectsRender = true });

+		

+		public static readonly DependencyProperty StretchProperty =

+			Viewbox.StretchProperty.AddOwner(typeof(ImageBox));

+		

+		public static readonly DependencyProperty StretchDirectionProperty =

+			Viewbox.StretchDirectionProperty.AddOwner(typeof(ImageBox));

+		

+		public ImageBox ()

+		{

+			Image = null;

+			Loaded += (sender, e) => MonoDevelop.Ide.Gui.Styles.Changed += HandleStylesChanged;

+			Unloaded += (sender, e) => MonoDevelop.Ide.Gui.Styles.Changed -= HandleStylesChanged;

+		}

+

+		public ImageBox (Xwt.Drawing.Image image) : this ()

+		{

+			Image = image;

+		}

+

+		public ImageBox (string iconId, Gtk.IconSize size) : this ()

+		{

+			Image = MonoDevelop.Ide.ImageService.GetIcon (iconId, size);

+		}

+

+		void HandleStylesChanged (object sender, EventArgs e)

+		{

+			InvalidateVisual ();

+		}

+

+		protected override void OnRender (DrawingContext dc)

+		{

+			var image = Image;

+			if (image != null) {

+				if (!IsEnabled)

+					image = image.WithStyles ("disabled").WithAlpha (0.4);

+				image = image.WithBoxSize (RenderSize.Width, RenderSize.Height);

+				var x = (RenderSize.Width - image.Size.Width) / 2;

+				var y = (RenderSize.Height - image.Size.Height) / 2;

+				MonoDevelop.Platform.WindowsPlatform.WPFToolkit.RenderImage (this, dc, image, x, y);

+			}

+		}

+

+		protected override void OnPropertyChanged (DependencyPropertyChangedEventArgs e)

+		{

+			base.OnPropertyChanged (e);

+			if (e.Property == IsEnabledProperty)

+				InvalidateVisual ();

+		}

+

+		public Xwt.Drawing.Image Image

+		{

+			get { return (Xwt.Drawing.Image)GetValue (ImageProperty); }

+			set { SetValue (ImageProperty, value); }

+		}

+

+		public Stretch Stretch

+		{

+			get { return (Stretch) GetValue(StretchProperty); }

+			set { SetValue(StretchProperty, value); }

+		}

+

+		public StretchDirection StretchDirection

+		{

+			get { return (StretchDirection)GetValue(StretchDirectionProperty); }

+			set { SetValue(StretchDirectionProperty, value); }

+		}

+

+		protected override Size MeasureOverride (Size constraint)

+		{

+			return CalcSizeForBounds (constraint);

+		}

+

+		protected override Size ArrangeOverride (Size arrangeBounds)

+		{

+			return CalcSizeForBounds (arrangeBounds);

+		}

+

+		Size CalcSizeForBounds (Size availableSize)

+		{

+			if (Image == null)

+				return new Size (0, 0);

+			

+			double scaleX = 1.0;

+			double scaleY = 1.0;

+

+			bool isConstrainedWidth = !Double.IsPositiveInfinity(availableSize.Width);

+			bool isConstrainedHeight = !Double.IsPositiveInfinity(availableSize.Height);

+

+			if ((Stretch == Stretch.Uniform || Stretch == Stretch.UniformToFill || Stretch == Stretch.Fill)

+				&& (isConstrainedWidth || isConstrainedHeight) )

+			{

+				scaleX = availableSize.Width / Image.Size.Width;

+				scaleY = availableSize.Height / Image.Size.Height;

+

+				if (!isConstrainedWidth)

+					scaleX = scaleY;

+				else if (!isConstrainedHeight)

+					scaleY = scaleX;

+				else switch (Stretch) 

+				{

+					case Stretch.Uniform:

+						double minscale = scaleX < scaleY ? scaleX : scaleY;

+						scaleX = scaleY = minscale;

+						break;

+

+					case Stretch.UniformToFill:

+						double maxscale = scaleX > scaleY ? scaleX : scaleY;

+						scaleX = scaleY = maxscale;

+						break;

+				}

+

+				switch(StretchDirection)

+				{

+					case StretchDirection.UpOnly:

+						if (scaleX < 1.0) scaleX = 1.0;

+						if (scaleY < 1.0) scaleY = 1.0;

+						break;

+

+					case StretchDirection.DownOnly:

+						if (scaleX > 1.0) scaleX = 1.0;

+						if (scaleY > 1.0) scaleY = 1.0;

+						break;

+				}

+			}

+

+			return new Size(Image.Size.Width * scaleX, Image.Size.Height * scaleY);

+		}

+	}

+}

+

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/ImageHelper.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/ImageHelper.cs
new file mode 100644
index 0000000000..7ef98b6236
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/ImageHelper.cs
@@ -0,0 +1,76 @@
+//

+// ImageHelper.cs

+//

+// Author:

+//       Vsevolod Kukol <sevo@sevo.org>

+//

+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+using System;

+using System.Collections.Generic;

+using System.Windows.Media;

+using MonoDevelop.Core;

+using MonoDevelop.Ide;

+using Xwt.Drawing;

+

+namespace WindowsPlatform

+{

+	public static class ImageHelper

+	{

+		static Dictionary<string, Image> cachedIcons = new Dictionary<string, Image> ();

+

+		public static Image GetStockIcon (this IconId stockId)

+		{

+			if (stockId.IsNull)

+				return null;

+			Image image;

+			if (!cachedIcons.TryGetValue (stockId, out image)) {

+				try {

+					image = Image.FromResource (typeof (ImageHelper), stockId + ".png");

+				} catch (InvalidOperationException) {

+					image = ImageService.GetIcon (stockId);

+				}

+			}

+			if (image == null)

+				throw new InvalidOperationException ("Icon not found: " + stockId);

+			cachedIcons [stockId] = image;

+			return image;

+		}

+

+		public static ImageSource GetImageSource (this IconId stockId, Xwt.IconSize size)

+		{

+			if (stockId.IsNull)

+				return null;

+			try {

+				return stockId.GetStockIcon ().WithSize (size).GetImageSource ();

+			} catch (Exception ex) {

+				LoggingService.LogError ("Failed loading icon: " + stockId, ex);

+			}

+			return null;

+		}

+

+		public static ImageSource GetImageSource (this Image image)

+		{

+			return (ImageSource)MonoDevelop.Platform.WindowsPlatform.WPFToolkit.GetNativeImage (image);	

+		}

+	}

+}

+

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs
index 67ec27e51e..4c907433e8 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs
@@ -76,7 +76,7 @@ namespace MonoDevelop.Platform
 		{

 			Taskbar.JumpList jumplist = Taskbar.JumpList.CreateJumpListForIndividualWindow (

 				MonoDevelop.Core.BrandingService.ApplicationName,

-				GdkWin32.HgdiobjGet (MessageService.RootWindow.GdkWindow)

+				GdkWin32.HgdiobjGet (MessageService.RootWindow)

 			);

 			jumplist.KnownCategoryToDisplay = Taskbar.JumpListKnownCategoryType.Neither;

 			

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/ComboMenu.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/ComboMenu.cs
new file mode 100644
index 0000000000..2a86ddfa95
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/ComboMenu.cs
@@ -0,0 +1,316 @@
+using MonoDevelop.Components.MainToolbar;

+using System;

+using System.Collections.Generic;

+using System.Linq;

+using System.Text;

+using System.Threading.Tasks;

+using System.Windows;

+using System.Windows.Controls;

+using System.Windows.Data;

+using System.Windows.Media;

+using System.Windows.Shapes;

+

+namespace WindowsPlatform.MainToolbar

+{

+	public class SelectionChangedEventArgs<T> : EventArgs

+	{

+		public T Added { get; private set; }

+		public T Removed { get; private set; }

+

+		public SelectionChangedEventArgs (T added, T removed)

+		{

+			Added = added;

+			Removed = removed;

+		}

+	}

+	public abstract class ComboMenu<T> : Menu

+	{

+		protected ComboMenu () : base ()

+		{

+			UseLayoutRounding = true;

+

+			var bindingFgColor = new Binding {

+				Path = new PropertyPath (typeof(Styles).GetProperty("MainToolbarForegroundBrush")),

+				Mode = BindingMode.OneWay,

+			};

+			var bindingDisabledFgColor = new Binding {

+				Path = new PropertyPath (typeof(Styles).GetProperty("MainToolbarDisabledForegroundBrush")),

+				Mode = BindingMode.OneWay,

+			};

+

+			var content = new StackPanel {

+				Orientation = Orientation.Horizontal,

+				Height = 20,

+			};

+

+			var textBlock = new TextBlock

+			{

+				HorizontalAlignment = HorizontalAlignment.Left,

+				VerticalAlignment = VerticalAlignment.Center,
+				Margin = new Thickness(0, 0, 0, 2),
+			};

+            content.Children.Add (textBlock);

+

+			var arrow = new Polygon {

+				Margin = new Thickness (5, 0, 0, 2),

+				HorizontalAlignment = HorizontalAlignment.Right,

+				VerticalAlignment = VerticalAlignment.Center,
+			};

+			arrow.SetBinding (Shape.FillProperty, new Binding ("Foreground") { Source = this });

+

+			IsEnabledChanged += (o, e) =>

+			{

+				textBlock.SetBinding(Control.ForegroundProperty, (bool)e.NewValue ? bindingFgColor : bindingDisabledFgColor);

+				arrow.SetBinding(Polygon.FillProperty, (bool)e.NewValue ? bindingFgColor : bindingDisabledFgColor);

+			};

+

+			arrow.Points.Add (new Point (0, 3));
+			arrow.Points.Add (new Point (3, 6));
+			arrow.Points.Add (new Point (6, 3));
+			content.Children.Add (arrow);

+

+			Items.Add (new SimpleMenuItem {

+				Header = content,

+				UseLayoutRounding = true,

+			});

+			IsEnabled = false;

+			DropMenuText = "Default";

+        }

+

+		protected MenuItem DropMenu

+		{

+			get { return (MenuItem)Items[0]; }

+		}

+

+		protected string DropMenuText

+		{

+			get { return ((TextBlock)((StackPanel)DropMenu.Header).Children[0]).Text; }

+			set { ((TextBlock)((StackPanel)DropMenu.Header).Children[0]).Text = value; }

+		} 

+

+		public abstract T Active

+		{

+			get; set;

+		}

+

+		public abstract IEnumerable<T> Model

+		{

+			get; set;

+		}

+

+		public abstract event EventHandler<SelectionChangedEventArgs<T>> SelectionChanged;

+	}

+

+	public class ConfigurationComboMenu : ComboMenu<IConfigurationModel>

+	{

+		public ConfigurationComboMenu ()

+		{

+		}

+

+		IConfigurationModel active;

+		public override IConfigurationModel Active

+		{

+			get

+			{

+				return active;

+			}

+

+			set

+			{

+				active = model.FirstOrDefault (cm => cm.OriginalId == value.OriginalId);

+				if (active == null)

+				{

+					DropMenuText = "Default";

+					IsEnabled = false;

+				}

+				else

+				{

+					DropMenuText = active.DisplayString;

+					IsEnabled = true;

+				}

+			}

+		}

+

+		IEnumerable<IConfigurationModel> model;

+		public override IEnumerable<IConfigurationModel> Model

+		{

+			get

+			{

+				return model;

+			}

+

+			set

+			{

+				int count = value.Count ();

+				model = value;

+

+				var dropMenu = DropMenu;

+

+				foreach (MenuItem item in dropMenu.Items)

+					item.Click -= OnMenuItemClicked;

+				dropMenu.Items.Clear ();

+				foreach (var item in value) {

+					var menuItem = new ConfigurationMenuItem (item);

+					menuItem.Click += OnMenuItemClicked;

+                    dropMenu.Items.Add (menuItem);

+				}

+				IsEnabled = Focusable = IsHitTestVisible = dropMenu.Items.Count > 1;

+				if (count == 0)

+					DropMenuText = "Default";

+			}

+		}

+

+		void OnMenuItemClicked (object sender, RoutedEventArgs args)

+		{

+			var item = (ConfigurationMenuItem)sender;

+			var old = active;

+

+			if (SelectionChanged != null)

+				SelectionChanged (this, new SelectionChangedEventArgs<IConfigurationModel> (item.Model, old));

+        }

+

+		class ConfigurationMenuItem : SimpleMenuItem

+		{

+			public ConfigurationMenuItem (IConfigurationModel model)

+			{

+				Model = model;

+				Header = model.DisplayString;

+				UseLayoutRounding = true;

+			}

+			public IConfigurationModel Model { get; private set; }

+		}

+

+		public override event EventHandler<SelectionChangedEventArgs<IConfigurationModel>> SelectionChanged;

+	}

+

+	public class RuntimeComboMenu : ComboMenu<IRuntimeModel>

+	{

+		public RuntimeComboMenu ()

+		{

+			DropMenu.SubmenuOpened += (o, e) => {

+				var menu = (MenuItem)o;

+

+				foreach (var item in menu.Items.OfType<RuntimeMenuItem> ())

+					item.Update ();

+			};

+		}

+

+		IRuntimeModel active;

+		public override IRuntimeModel Active

+		{

+			get

+			{

+				return active;

+            }

+

+			set

+			{

+				var menuItem = DropMenu.Items

+					.OfType<RuntimeMenuItem> ()

+					.FirstOrDefault (it => it.Model == value);

+

+				if (menuItem == null) {

+					active = null;

+					DropMenuText = "Default";

+					IsEnabled = false;

+					return;

+				}

+

+				active = menuItem.Model;

+				menuItem.Margin = new Thickness (0, 0, 0, 0);

+				menuItem.FontWeight = FontWeights.Normal;

+

+				using (var mutableModel = active.GetMutableModel ()) {

+					DropMenuText = mutableModel.FullDisplayString;

+					IsEnabled = true;

+				}

+            }

+		}

+

+		IEnumerable<IRuntimeModel> model;

+		public override IEnumerable<IRuntimeModel> Model

+		{

+			get

+			{

+				return model;

+			}

+

+			set

+			{

+				model = value;

+				

+				FillSource (DropMenu.Items, value);

+

+				int count = DropMenu.Items.Count;

+				IsEnabled = Focusable = IsHitTestVisible = count > 1;

+				if (count == 0)

+					DropMenuText = "Default";

+			}

+		}

+

+		void OnMenuItemClicked (object sender, RoutedEventArgs args)

+		{

+			var item = (RuntimeMenuItem)sender;

+

+			if (SelectionChanged != null)

+				SelectionChanged (this, new SelectionChangedEventArgs<IRuntimeModel> (item.Model, Active));

+		}

+

+		void FillSource (ItemCollection source, IEnumerable<IRuntimeModel> model)

+		{

+			foreach (var item in source.OfType<MenuItem> ()) {

+				item.Click -= OnMenuItemClicked;

+				foreach (var subItem in item.Items.OfType<MenuItem> ())

+					subItem.Click -= OnMenuItemClicked;

+			}

+

+			source.Clear ();

+

+			foreach (var item in model) {

+				if (item.HasParent)

+					continue;

+

+				if (item.IsSeparator)

+					source.Add (new Separator { UseLayoutRounding = true, });

+				else {

+					var menuItem = new RuntimeMenuItem (item);

+					menuItem.Click += OnMenuItemClicked;

+					foreach (var child in item.Children) {

+						var childMenuItem = new RuntimeMenuItem (item);

+						childMenuItem.Click += OnMenuItemClicked;

+						menuItem.Items.Add (childMenuItem);

+					}

+					source.Add (menuItem);

+				}

+			}

+		}

+

+		public override event EventHandler<SelectionChangedEventArgs<IRuntimeModel>> SelectionChanged;

+

+		class RuntimeMenuItem : SimpleMenuItem

+		{

+			public IRuntimeModel Model { get; private set; }

+			public RuntimeMenuItem (IRuntimeModel model)

+			{

+				Model = model;

+				UseLayoutRounding = true;

+

+				Margin = new Thickness (model.IsIndented ? 15 : 0, 0, 0, 0);

+				if (model.Notable)

+					FontWeight = FontWeights.Bold;

+			}

+

+			public void Update ()

+			{

+				using (var mutableModel = Model.GetMutableModel ()) {

+					Header = mutableModel.DisplayString;

+					IsEnabled = mutableModel.Enabled;

+					Visibility = mutableModel.Visible ? Visibility.Visible : Visibility.Collapsed;

+				}

+

+				foreach (var item in Items.OfType<RuntimeMenuItem> ())

+					item.Update ();

+			}

+		}

+	}

+}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/DottedSeparator.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/DottedSeparator.xaml
new file mode 100644
index 0000000000..348b67429a
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/DottedSeparator.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="WindowsPlatform.MainToolbar.DottedSeparator"

+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 

+             xmlns:local="clr-namespace:WindowsPlatform.MainToolbar"

+             xmlns:platform="clr-namespace:WindowsPlatform"

+             mc:Ignorable="d" 

+             d:DesignHeight="300" d:DesignWidth="300">

+    <UserControl.Style>

+        <Style TargetType="{x:Type local:DottedSeparator}">

+        	<Setter Property="Foreground" Value="{Binding Path=(platform:Styles.MainToolbarSeparatorBrush), Mode=OneWay}" />

+		</Style>

+    </UserControl.Style>

+    <StackPanel x:Name="DotPanel">

+    </StackPanel>

+</UserControl>

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/DottedSeparator.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/DottedSeparator.xaml.cs
new file mode 100644
index 0000000000..3c580070f9
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/DottedSeparator.xaml.cs
@@ -0,0 +1,39 @@
+using System.Windows;

+using System.Windows.Controls;

+using System.Windows.Media;

+using System.Windows.Shapes;

+

+namespace WindowsPlatform.MainToolbar

+{

+	/// <summary>

+	/// Interaction logic for DottedSeparator.xaml

+	/// </summary>

+	public partial class DottedSeparator : UserControl

+	{

+		public DottedSeparator()

+		{

+			InitializeComponent();

+

+			SizeChanged += ModifyPoints;

+		}

+

+		void ModifyPoints(object sender, SizeChangedEventArgs args)

+		{

+			DotPanel.Children.Clear();

+			

+			for (int i = 0; i < args.NewSize.Height; i+=2)

+			{

+				DotPanel.Children.Add(new Ellipse

+				{

+					Fill = Foreground,

+					Stroke = Foreground,

+					HorizontalAlignment = HorizontalAlignment.Center,

+					Width = 1,

+					Height = 1,

+					StrokeThickness = 1,

+					Margin = new Thickness (0, 0, 0, 1),

+				});

+			}

+		}

+	}

+}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml
new file mode 100644
index 0000000000..eb42b07ebd
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml
@@ -0,0 +1,25 @@
+<UserControl x:Class="WindowsPlatform.MainToolbar.IconButtonControl"

+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 

+             xmlns:local="clr-namespace:WindowsPlatform.MainToolbar"

+             xmlns:platform="clr-namespace:WindowsPlatform"

+             mc:Ignorable="d"

+             Background="Transparent" BorderBrush="Transparent">

+    <Button Click="OnClick" FocusVisualStyle="{x:Null}" UseLayoutRounding="True" Focusable="{Binding Focusable}"

+			Background="{Binding Background}" BorderBrush="{Binding BorderBrush}" Width="24" Height="24">

+        <Button.Template>

+            <ControlTemplate TargetType="Button">

+                <Border UseLayoutRounding="True"

+		            BorderThickness="{TemplateBinding BorderThickness}"

+		            Background="{TemplateBinding Background}"

+		            BorderBrush="{TemplateBinding BorderBrush}">

+                    <ContentPresenter />

+                </Border>

+            </ControlTemplate>

+        </Button.Template>

+        <platform:ImageBox x:Name="RunIcon" UseLayoutRounding="True"

+    		MouseLeftButtonDown="OnMouseLeftButtonDown" Width="24" Height="24" Margin="-1" />

+    </Button>

+</UserControl>

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml.cs
new file mode 100644
index 0000000000..72f34c294d
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml.cs
@@ -0,0 +1,241 @@
+using MonoDevelop.Components.MainToolbar;

+using MonoDevelop.Core;

+using MonoDevelop.Ide;

+using System;

+using System.Collections.Generic;

+using System.ComponentModel;

+using System.Linq;

+using System.Runtime.CompilerServices;

+using System.Text;

+using System.Threading.Tasks;

+using System.Windows;

+using System.Windows.Controls;

+using System.Windows.Data;

+using System.Windows.Documents;

+using System.Windows.Input;

+using System.Windows.Media;

+using System.Windows.Media.Imaging;

+using System.Windows.Navigation;

+using System.Windows.Shapes;

+

+namespace WindowsPlatform.MainToolbar

+{

+	/// <summary>

+	/// Interaction logic for RunButton.xaml

+	/// </summary>

+	public partial class IconButtonControl : UserControl, INotifyPropertyChanged

+	{

+		public static DependencyProperty ImageProperty = DependencyProperty.Register (

+			"Image", typeof (Xwt.Drawing.Image), typeof (IconButtonControl));

+

+		public Xwt.Drawing.Image Image

+		{

+			get { return (Xwt.Drawing.Image)GetValue(ImageProperty); }

+			set { SetValue (ImageProperty, value); }

+		}

+

+		public IconButtonControl (Xwt.Drawing.Image image) : this ()

+		{

+			Image = image;

+		}

+

+		public IconButtonControl ()

+		{

+			InitializeComponent ();

+

+			DataContext = this;

+			ToolTipService.SetShowOnDisabled (this, true);

+		}

+

+		void OnClick (object sender, RoutedEventArgs args)

+		{

+			if (Click != null)

+				Click (sender, args);

+		}

+

+		protected override void OnPropertyChanged (DependencyPropertyChangedEventArgs e)

+		{

+			base.OnPropertyChanged (e);

+			if (e.Property == ImageProperty) {

+				RunIcon.Image = Image;

+				if (Image != null)

+					InvalidateMeasure ();

+			}

+			if (Image == null)

+				return;

+			if (e.Property == IsMouseOverProperty && IsEnabled) {

+				RunIcon.Image = IsMouseOver ? Image.WithStyles ("hover") : Image;

+				InvalidateVisual ();

+			}

+		}

+

+		void OnMouseLeftButtonDown (object sender, MouseButtonEventArgs e)

+		{

+			OnMouseLeftButtonDown (e);

+		}

+

+		protected override void OnMouseLeftButtonDown (MouseButtonEventArgs e)

+		{

+			if (IsEnabled && Image != null) {

+				RunIcon.Image = Image.WithStyles ("pressed");

+				Background = Styles.MainToolbarButtonPressedBackgroundBrush;

+				BorderBrush = Styles.MainToolbarButtonPressedBorderBrush;

+			}

+			base.OnMouseLeftButtonDown (e);

+		}

+

+		protected override void OnMouseLeftButtonUp (MouseButtonEventArgs e)

+		{

+			if (Image != null) {

+				if (IsMouseOver)

+					RunIcon.Image = Image.WithStyles ("hover");

+				else

+					RunIcon.Image = Image;

+			}

+			

+			Background = Brushes.Transparent;

+			BorderBrush = Brushes.Transparent;

+			base.OnMouseLeftButtonUp (e);

+		}

+

+		protected override void OnMouseLeave (MouseEventArgs e)

+		{

+			Background = Brushes.Transparent;

+			BorderBrush = Brushes.Transparent;

+			base.OnMouseLeave (e);

+		}

+

+		void RaisePropertyChanged ([CallerMemberName] string propName = null)

+		{

+			if (PropertyChanged != null)

+				PropertyChanged (this, new System.ComponentModel.PropertyChangedEventArgs(propName));

+		}

+

+		protected override Size MeasureOverride (Size constraint)

+		{

+			if (Image != null)

+				return new Size (Image.Width, Image.Width);

+			return base.MeasureOverride (constraint);

+		}

+

+		public event RoutedEventHandler Click;

+		public event PropertyChangedEventHandler PropertyChanged;

+	}

+

+	public class RunButtonControl : IconButtonControl

+	{

+		RunButtonControl (OperationIcon icon) : base(GetIcon(icon))

+		{

+			this.icon = icon;

+			ToolTip = GetTooltip(icon);

+		}

+		public RunButtonControl () : this (OperationIcon.Run)

+		{

+		}

+

+		OperationIcon icon;

+		public OperationIcon Icon

+		{

+			get { return icon; }

+			set

+			{

+				if (value == icon)

+					return;

+				icon = value;

+				ToolTip = GetTooltip (icon);

+				Image = GetIcon (icon);

+			}

+		}

+

+		static string GetTooltip (OperationIcon icon)

+		{

+			switch (icon)

+			{

+				case OperationIcon.Stop:

+					return GettextCatalog.GetString("Stop currently running operation");

+				case OperationIcon.Run:

+					return GettextCatalog.GetString("Run current startup project");

+				case OperationIcon.Build:

+					return GettextCatalog.GetString("Build current startup project");

+				default:

+					throw new InvalidOperationException();

+			}

+		}

+

+		static Xwt.Drawing.Image GetIcon (OperationIcon icon)

+		{

+			string img;

+			switch (icon) {

+				case OperationIcon.Stop:

+					img = "stop.png";

+					break;

+				case OperationIcon.Run:

+					img = "execute.png";

+					break;

+				case OperationIcon.Build:

+					img = "build.png";

+					break;

+				default:

+					throw new InvalidOperationException ();

+			}

+

+			return Xwt.Drawing.Image.FromResource (typeof (RunButtonControl), img).WithSize (Xwt.IconSize.Medium);

+		}

+	}

+

+	public class ButtonBarButton : IconButtonControl, IDisposable

+	{

+		IButtonBarButton button;

+		public ButtonBarButton (IButtonBarButton button)

+			: base (button.Image.IsNull ? null : button.Image.GetStockIcon().WithSize(Xwt.IconSize.Medium))

+		{

+			this.button = button;

+

+			VerticalContentAlignment = VerticalAlignment.Center;

+			ToolTip = button.Tooltip;

+			IsEnabled = button.Enabled;

+			Visibility = button.Visible ? Visibility.Visible : Visibility.Collapsed;

+			Margin = new Thickness(3, 0, 3, 0);

+

+			button.EnabledChanged += OnButtonEnabledChanged;

+			button.VisibleChanged += OnButtonVisibleChanged;

+			button.TooltipChanged += OnButtonTooltipChanged;

+			button.ImageChanged += OnButtonImageChanged;

+

+			Click += OnButtonClicked;

+		}

+

+		public void Dispose ()

+		{

+			button.EnabledChanged -= OnButtonEnabledChanged;

+			button.VisibleChanged -= OnButtonVisibleChanged;

+			button.TooltipChanged -= OnButtonTooltipChanged;

+			button.ImageChanged -= OnButtonImageChanged;

+		}

+

+		void OnButtonEnabledChanged (object sender, EventArgs args)

+		{

+			IsEnabled = button.Enabled;

+		}

+

+		void OnButtonVisibleChanged (object sender, EventArgs e)

+		{

+			Visibility = button.Visible ? Visibility.Visible : Visibility.Collapsed;

+		}

+

+		void OnButtonTooltipChanged (object sender, EventArgs args)

+		{

+			ToolTip = button.Tooltip;

+		}

+

+		void OnButtonImageChanged (object sender, EventArgs args)

+		{

+			Image = button.Image.GetStockIcon ().WithSize (Xwt.IconSize.Medium);

+        }

+

+		void OnButtonClicked (object sender, RoutedEventArgs args)

+		{

+			button.NotifyPushed ();

+		}

+	}

+}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml
new file mode 100644
index 0000000000..c28941bd0c
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml
@@ -0,0 +1,22 @@
+<UserControl x:Class="WindowsPlatform.MainToolbar.SearchBarControl"

+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:WindowsPlatform.MainToolbar"

+             xmlns:platform="clr-namespace:WindowsPlatform"
+             mc:Ignorable="d"

+             Background="{Binding Path=(platform:Styles.SearchBarBackgroundBrush), Mode=OneWay}"

+             Foreground="{Binding Path=(platform:Styles.SearchBarTextBrush), Mode=OneWay}"

+             BorderBrush="{Binding Path=(platform:Styles.SearchBarBorderBrush), Mode=OneWay}">

+    <Border BorderThickness="0" UseLayoutRounding="True">
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Height="26" UseLayoutRounding="True">
+            <TextBox x:Name="SearchBar" Text="{Binding Path=SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" MinWidth="180" Margin="5,0,0,0" Background="Transparent" Foreground="{Binding Foreground}" CaretBrush="{Binding Foreground}" BorderThickness="0" UseLayoutRounding="True" />
+            <local:IconButtonControl x:Name="SearchIcon" Width="24" Height="24" Margin="0,0,1,0" Click="OnIconClicked" UseLayoutRounding="True" VerticalContentAlignment="Center" VerticalAlignment="Center" >
+                <local:IconButtonControl.ContextMenu>
+                    <ContextMenu UseLayoutRounding="True" />
+                </local:IconButtonControl.ContextMenu>
+            </local:IconButtonControl>
+        </StackPanel>
+    </Border>
+</UserControl>
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml.cs
new file mode 100644
index 0000000000..53a909d4a5
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml.cs
@@ -0,0 +1,140 @@
+using MonoDevelop.Components.MainToolbar;

+using MonoDevelop.Ide;

+using MonoDevelop.Ide.Gui;

+using System;

+using System.Collections.Generic;

+using System.ComponentModel;

+using System.Linq;

+using System.Runtime.CompilerServices;

+using System.Text;

+using System.Threading.Tasks;

+using System.Windows;

+using System.Windows.Controls;

+using System.Windows.Data;

+using System.Windows.Documents;

+using System.Windows.Input;

+using System.Windows.Media;

+using System.Windows.Media.Imaging;

+using System.Windows.Navigation;

+using System.Windows.Shapes;

+using System.Globalization;

+

+namespace WindowsPlatform.MainToolbar

+{

+	/// <summary>

+	/// Interaction logic for SearchBar.xaml

+	/// </summary>

+	public partial class SearchBarControl : UserControl, INotifyPropertyChanged

+	{

+		readonly Xwt.Drawing.Image searchIcon, clearIcon;

+

+		public SearchBarControl ()

+		{

+			InitializeComponent ();

+			DataContext = this;

+

+			SearchBar.GotKeyboardFocus += (o, e) => {

+				if (searchText == placeholderText)

+					SearchText = string.Empty;

+			};

+			IdeApp.Workbench.RootWindow.SetFocus += (o, e) =>

+			{

+				if (Keyboard.FocusedElement == SearchBar) {

+					Keyboard.ClearFocus ();

+					IdeApp.Workbench.RootWindow.Present ();

+				}

+			};

+

+			searchIcon = Stock.SearchboxSearch.GetStockIcon ().WithSize (Xwt.IconSize.Small);

+			clearIcon = ((MonoDevelop.Core.IconId)"md-searchbox-clear").GetStockIcon ().WithSize (Xwt.IconSize.Small);

+			SearchIcon.Image = searchIcon;

+			SearchIcon.Focusable = false;

+		}

+

+		string placeholderText;

+		public string PlaceholderText {

+			get	{

+				return placeholderText;

+			}

+			set	{

+				var oldPlaceholderText = placeholderText;

+				placeholderText = value;

+				if (string.IsNullOrEmpty (SearchText) || searchText == oldPlaceholderText)

+					SearchText = placeholderText;

+				UpdateIcon ();

+            }

+		}

+

+		string searchText;

+		public string SearchText

+		{

+			get { return searchText; }

+			set	{

+				searchText = value;

+				UpdateIcon ();

+				RaisePropertyChanged ();

+			}

+		}

+

+		bool isClearShown = false;

+		void UpdateIcon ()

+		{

+			if (string.IsNullOrEmpty (searchText) || searchText == PlaceholderText) {

+				if (isClearShown) {

+					SearchIcon.Image = searchIcon;

+					isClearShown = false;

+				}

+			} else if (!isClearShown) {

+				SearchIcon.Image = clearIcon;

+				isClearShown = true;

+			}

+		}

+

+		IEnumerable<ISearchMenuModel> searchMenuItems;

+        public IEnumerable<ISearchMenuModel> SearchMenuItems

+		{

+			get { return searchMenuItems; }

+			set {

+				searchMenuItems = value;

+

+				foreach (MenuItem menuItem in SearchIcon.ContextMenu.Items)

+					menuItem.Click -= OnMenuItemClicked;

+

+				SearchIcon.ContextMenu.Items.Clear ();

+				foreach (var item in value) {

+					var menuItem = new SimpleMenuItem {

+						Header = item.DisplayString,

+						Tag = item,

+					};

+					menuItem.Click += OnMenuItemClicked;

+					SearchIcon.ContextMenu.Items.Add (menuItem);

+				}

+			}

+		}

+

+		void OnIconClicked (object sender, RoutedEventArgs args)

+		{

+			if (isClearShown)

+				ClearIconClicked?.Invoke(this, EventArgs.Empty);

+			else

+				SearchIcon.ContextMenu.IsOpen = true;

+		}

+

+		void OnMenuItemClicked (object sender, RoutedEventArgs args)

+		{

+			var menuItem = (MenuItem)sender;

+			var searchModel = (ISearchMenuModel)menuItem.Tag;

+			searchModel.NotifyActivated ();

+			SearchBar.Focus ();

+		}

+

+		void RaisePropertyChanged ([CallerMemberName] string propName = null)

+		{

+			if (PropertyChanged != null)

+				PropertyChanged (this, new PropertyChangedEventArgs (propName));

+		}

+

+		public event EventHandler ClearIconClicked;

+		public event PropertyChangedEventHandler PropertyChanged;

+	}

+}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SimpleMenuItem.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SimpleMenuItem.cs
new file mode 100644
index 0000000000..841cd8381f
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SimpleMenuItem.cs
@@ -0,0 +1,39 @@
+//

+// SimpleMenuItem.cs

+//

+// Author:

+//       Vsevolod Kukol <sevo@xamarin.com>

+//

+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+using System;

+using System.Windows.Controls;

+

+namespace WindowsPlatform.MainToolbar

+{

+	public partial class SimpleMenuItem : MenuItem

+	{

+		public SimpleMenuItem ()

+		{

+			InitializeComponent();

+		}

+	}

+}

+

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SimpleMenuItem.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SimpleMenuItem.xaml
new file mode 100644
index 0000000000..b23e778c1e
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SimpleMenuItem.xaml
@@ -0,0 +1,212 @@
+<MenuItem x:Class="WindowsPlatform.MainToolbar.SimpleMenuItem"

+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 

+             xmlns:local="clr-namespace:WindowsPlatform.MainToolbar"

+             xmlns:platform="clr-namespace:WindowsPlatform"

+             mc:Ignorable="d" 

+             d:DesignHeight="300" d:DesignWidth="300">

+    <MenuItem.Resources>

+	    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type local:SimpleMenuItem}, ResourceId=SimpleTopLevelHeaderTemplateKey}" TargetType="{x:Type local:SimpleMenuItem}">

+	        <Border x:Name="templateRoot"

+	            SnapsToDevicePixels="true"

+	            BorderThickness="{TemplateBinding BorderThickness}"

+	            Background="Transparent"

+	            BorderBrush="Transparent"

+	            TextElement.Foreground="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}">

+	            <Grid VerticalAlignment="Center">

+	                <Grid.ColumnDefinitions>

+	                    <ColumnDefinition Width="Auto"/>

+	                </Grid.ColumnDefinitions>

+	                <ContentPresenter

+	                    Grid.Column="0"

+	                    ContentSource="Header"

+	                    RecognizesAccessKey="True"

+	                    Margin="{TemplateBinding MenuItem.Padding}"

+	                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+	                <Popup x:Name="PART_Popup"

+	                    AllowsTransparency="true"

+	                    Focusable="false"

+	                    IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"

+	                    MinWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}}"

+	                    PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}"

+	                    Placement="Bottom"

+	                    PlacementTarget="{Binding ElementName=templateRoot}" >

+	                    <Border x:Name="SubMenuBorder"

+	                        Background="{Binding Path=(platform:Styles.MenuBackgroundBrush), Mode=OneWay}"

+	                        BorderBrush="{Binding Path=(platform:Styles.MenuBorderBrush), Mode=OneWay}"

+	                        BorderThickness="1"

+	                        Padding="2">

+	                        <ScrollViewer x:Name="SubMenuScrollViewer"

+	                            Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">

+	                            <Grid RenderOptions.ClearTypeHint="Enabled">

+	                                <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">

+	                                    <Rectangle

+	                                        Name="OpaqueRect"

+	                                        Height="{Binding ElementName=SubMenuBorder,Path=ActualHeight}"

+	                                        Width="{Binding ElementName=SubMenuBorder,Path=ActualWidth}"

+	                                        Fill="{Binding ElementName=SubMenuBorder,Path=Background}" />

+	                                </Canvas>

+	                                <ItemsPresenter x:Name="ItemsPresenter"

+	                                    KeyboardNavigation.DirectionalNavigation="Cycle"

+	                                    KeyboardNavigation.TabNavigation="Cycle"

+	                                    Grid.IsSharedSizeScope="true"

+	                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+	                            </Grid>

+	                        </ScrollViewer>

+	                    </Border>

+	                </Popup>

+	            </Grid>

+	        </Border>

+	        <ControlTemplate.Triggers>

+	            <Trigger Property="IsSuspendingPopupAnimation" Value="true">

+	                <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None"/>

+	            </Trigger>

+	            <Trigger Property="IsHighlighted" Value="True">

+	                <Setter TargetName="templateRoot" Property="Background" Value="{Binding Path=(platform:Styles.MenuHighlightBackgroundBrush), Mode=OneWay}" />

+	                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding Path=(platform:Styles.MenuHighlightBorderBrush), Mode=OneWay}" />

+	            </Trigger>

+	            <Trigger Property="IsEnabled" Value="False">

+	                <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+	            </Trigger>

+	            <Trigger SourceName="SubMenuScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >

+	                <Setter TargetName="OpaqueRect"  Property="Canvas.Top"  Value="{Binding ElementName=SubMenuScrollViewer, Path=VerticalOffset}" />

+	                <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding ElementName=SubMenuScrollViewer, Path=HorizontalOffset}" />

+	            </Trigger>

+	        </ControlTemplate.Triggers>

+	    </ControlTemplate>

+	    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type local:SimpleMenuItem}, ResourceId=SimpleItemTemplateKey}" TargetType="{x:Type local:SimpleMenuItem}">

+	        <Border x:Name="templateRoot"

+	            SnapsToDevicePixels="true"

+	            Height="22"

+	            BorderThickness="{TemplateBinding BorderThickness}"

+	            Background="Transparent"

+	            BorderBrush="Transparent"

+	            TextElement.Foreground="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}">

+	            <Grid Margin="-1">

+	                <Grid.ColumnDefinitions>

+	                    <ColumnDefinition Width="*"/>

+	                </Grid.ColumnDefinitions>

+	                <ContentPresenter x:Name="menuHeaderContainer"

+	                    Grid.Column="2"

+	                    HorizontalAlignment="Left"

+	                    VerticalAlignment="Center"

+	                    ContentSource="Header"

+	                    RecognizesAccessKey="True"

+	                    Margin="5,0,5,1"

+	                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+	            </Grid>

+	        </Border>

+	        <ControlTemplate.Triggers>

+	            <Trigger Property="IsHighlighted" Value="True">

+	                <Setter TargetName="templateRoot" Property="Background" Value="{Binding Path=(platform:Styles.MenuHighlightBackgroundBrush), Mode=OneWay}" />

+	                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding Path=(platform:Styles.MenuHighlightBorderBrush), Mode=OneWay}" />

+	            </Trigger>

+	            <Trigger Property="IsEnabled" Value="False">

+	                <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+	            </Trigger>        

+	        </ControlTemplate.Triggers>

+	    </ControlTemplate>

+

+	    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type local:SimpleMenuItem}, ResourceId=SimpleHeaderTemplateKey}" TargetType="{x:Type local:SimpleMenuItem}">

+	        <Border x:Name="templateRoot"

+	            SnapsToDevicePixels="true"

+	            Height="22"

+	            BorderThickness="{TemplateBinding BorderThickness}"

+	            Background="Transparent"

+	            BorderBrush="Transparent"

+	            TextElement.Foreground="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}">

+	            <Grid Margin="-1">

+	                <Grid.ColumnDefinitions>

+	                    <ColumnDefinition Width="*"/>

+	                    <ColumnDefinition Width="20"/>

+	                </Grid.ColumnDefinitions>

+	                <ContentPresenter

+	                    Grid.Column="0"

+	                    HorizontalAlignment="Left"

+	                    VerticalAlignment="Center"

+	                    ContentSource="Header"

+	                    RecognizesAccessKey="True"

+	                    Margin="5,0,0,1"

+	                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+	                <Path x:Name="RightArrow"

+	                    Grid.Column="1"

+	                    Data="{StaticResource RightArrow}"

+	                    Margin="10,0,0,0"

+	                    VerticalAlignment="Center"

+	                    HorizontalAlignment="Left"

+	                    Fill="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}" />

+	                <Popup x:Name="PART_Popup"

+	                    AllowsTransparency="true"

+	                    Focusable="false"

+	                    IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"

+	                    PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}"

+	                    Placement="Right"

+	                    HorizontalOffset="-2"

+	                    VerticalOffset="-3">

+	                    <Border x:Name="SubMenuBorder"

+	                        Background="{Binding Path=(platform:Styles.MenuBackgroundBrush), Mode=OneWay}"

+	                        BorderBrush="{Binding Path=(platform:Styles.MenuBorderBrush), Mode=OneWay}"

+	                        BorderThickness="1"

+	                        Padding="2">

+	                        <ScrollViewer x:Name="SubMenuScrollViewer"

+	                            Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">

+	                            <Grid RenderOptions.ClearTypeHint="Enabled">

+	                                <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">

+	                                    <Rectangle

+	                                        Name="OpaqueRect"

+	                                        Height="{Binding ElementName=SubMenuBorder,Path=ActualHeight}"

+	                                        Width="{Binding ElementName=SubMenuBorder,Path=ActualWidth}"

+	                                        Fill="{Binding ElementName=SubMenuBorder,Path=Background}" />

+	                                </Canvas>

+	                                <ItemsPresenter x:Name="ItemsPresenter"

+	                                    KeyboardNavigation.DirectionalNavigation="Cycle"

+	                                    KeyboardNavigation.TabNavigation="Cycle"

+	                                    Grid.IsSharedSizeScope="true"

+	                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+	                            </Grid>

+	                        </ScrollViewer>

+	                    </Border>

+	                </Popup>

+	            </Grid>

+	        </Border>

+	        <ControlTemplate.Triggers>

+	            <Trigger Property="IsSuspendingPopupAnimation" Value="true">

+	                <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None"/>

+	            </Trigger>

+	            <Trigger Property="IsHighlighted" Value="True">

+	                <Setter TargetName="templateRoot" Property="Background" Value="{Binding Path=(platform:Styles.MenuHighlightBackgroundBrush), Mode=OneWay}" />

+	                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding Path=(platform:Styles.MenuHighlightBorderBrush), Mode=OneWay}" />

+	            </Trigger>

+	            <Trigger Property="IsEnabled" Value="False">

+	                <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+	                <Setter TargetName="RightArrow" Property="Fill" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+	            </Trigger>

+	            <Trigger SourceName="SubMenuScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >

+	                <Setter TargetName="OpaqueRect" Property="Canvas.Top" Value="{Binding ElementName=SubMenuScrollViewer, Path=VerticalOffset}" />

+	                <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding ElementName=SubMenuScrollViewer, Path=HorizontalOffset}" />

+	            </Trigger>

+	        </ControlTemplate.Triggers>

+	    </ControlTemplate>

+    </MenuItem.Resources>

+    <MenuItem.Style>

+	    <Style x:Key="{x:Type local:SimpleMenuItem}" TargetType="{x:Type local:SimpleMenuItem}">

+	        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>

+	        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>

+	        <Setter Property="BorderThickness" Value="1" />

+	        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>

+	        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>

+	        <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type local:SimpleMenuItem}, ResourceId=SimpleItemTemplateKey}}" />

+	        <Style.Triggers>

+	            <Trigger Property="Role" Value="TopLevelHeader">

+	                <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type local:SimpleMenuItem}, ResourceId=SimpleTopLevelHeaderTemplateKey}}" />

+	                <Setter Property="Padding" Value="6,0"/>

+	            </Trigger>

+	            <Trigger Property="Role" Value="SubmenuHeader">

+	                <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type local:SimpleMenuItem}, ResourceId=SimpleHeaderTemplateKey}}" />

+	            </Trigger>

+	        </Style.Triggers>

+	    </Style>

+    </MenuItem.Style>

+</MenuItem>

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml
new file mode 100644
index 0000000000..94f09ba30a
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml
@@ -0,0 +1,72 @@
+<UserControl x:Class="WindowsPlatform.MainToolbar.StatusBarControl"

+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

+             xmlns:local="clr-namespace:WindowsPlatform.MainToolbar"

+             xmlns:platform="clr-namespace:WindowsPlatform"

+             mc:Ignorable="d" Background="{Binding Path=(platform:Styles.StatusBarBackgroundBrush), Mode=OneWay}">

+    <UserControl.Style>

+        <Style TargetType="{x:Type local:StatusBarControl}">

+        	<Setter Property="StatusTextBrush" Value="{Binding Path=(platform:Styles.StatusBarTextBrush), Mode=OneWay}" />

+			<Style.Triggers>

+                <Trigger Property="Status" Value="Ready">

+                    <Setter Property="StatusTextBrush" Value="{Binding Path=(platform:Styles.StatusBarReadyTextBrush), Mode=OneWay}"/>

+                </Trigger>

+                <Trigger Property="Status" Value="Warning">

+                    <Setter Property="StatusTextBrush" Value="{Binding Path=(platform:Styles.StatusBarWarningTextBrush), Mode=OneWay}"/>

+                </Trigger>

+                <Trigger Property="Status" Value="Error">

+                    <Setter Property="StatusTextBrush" Value="{Binding Path=(platform:Styles.StatusBarErrorTextBrush), Mode=OneWay}"/>

+                </Trigger>

+			</Style.Triggers>

+		</Style>

+    </UserControl.Style>
+    <Grid VerticalAlignment="Center" Height="26" Width="350" MinWidth="220" MaxWidth="700" UseLayoutRounding="True">
+        <Grid>
+            <ProgressBar Minimum="0" Maximum="1" x:Name="ProgressBar"

+            		Background="Transparent"

+            		BorderBrush="{Binding Path=(platform:Styles.StatusBarProgressBorderBrush), Mode=OneWay}"

+            		Foreground="{Binding Path=(platform:Styles.StatusBarProgressBackgroundBrush), Mode=OneWay}"/>

+        </Grid>

+        <Grid Background="Transparent" >

+            <Grid.ColumnDefinitions>

+                <ColumnDefinition Width="Auto" />

+                <ColumnDefinition Width="*" />

+                <ColumnDefinition Width="Auto" />

+                <ColumnDefinition Width="Auto" />

+            </Grid.ColumnDefinitions>

+            <platform:ImageBox Grid.Column="0"

+                   x:Name="StatusImageControl"

+                   MaxWidth="16"

+                   Margin="9,5,0,5"

+                   MaxHeight="16"

+                   Image="{Binding StatusImage}"

+                   UseLayoutRounding="True"

+                   MouseLeftButtonUp="OnShowPad" />

+            <TextBlock x:Name="StatusText"

+                Grid.Column="1"

+                VerticalAlignment="Center"

+                Padding="7,1,0,2"

+                Foreground="{Binding StatusTextBrush}"

+                Text="{Binding Message}"

+                TextTrimming="WordEllipsis"

+                UseLayoutRounding="True" 

+                MouseLeftButtonUp="OnShowPad" />

+            <StackPanel x:Name="BuildResultPanel"

+                        Grid.Column="2"

+                        Visibility="{Binding BuildResultPanelVisibility}"

+                        VerticalAlignment="Center"

+                        Orientation="Horizontal"

+                        UseLayoutRounding="True"

+                        MouseLeftButtonUp="OnShowError">

+                <platform:ImageBox Image="{Binding BuildResultIcon}" Margin="0,0,0,0" MaxWidth="16" MaxHeight="16" UseLayoutRounding="True" />

+                <TextBlock

+            	    Text="{Binding BuildResultCount}" 

+	                VerticalAlignment="Center"

+	                Padding="3,2,5,1" />

+            </StackPanel>

+            <StackPanel x:Name="StatusIconsPanel" Grid.Column="3" VerticalAlignment="Center" Orientation="Horizontal" UseLayoutRounding="True" Margin="0,0,3,0" />

+        </Grid>

+    </Grid>

+</UserControl>

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs
new file mode 100644
index 0000000000..35c33ee1da
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs
@@ -0,0 +1,376 @@
+using MonoDevelop.Ide;

+using System;

+using System.Collections.Generic;

+using System.Linq;

+using System.Text;

+using System.Threading.Tasks;

+using System.Windows;

+using System.Windows.Controls;

+using System.Windows.Data;

+using System.Windows.Documents;

+using System.Windows.Input;

+using System.Windows.Media;

+using System.Windows.Media.Imaging;

+using System.Windows.Navigation;

+using System.Windows.Shapes;

+using MonoDevelop.Core;

+using MonoDevelop.Ide.Gui;

+using Xwt.Drawing;

+using MonoDevelop.Components.MainToolbar;

+using MonoDevelop.Ide.Tasks;

+using System.ComponentModel;

+using System.Runtime.CompilerServices;

+using System.Windows.Media.Animation;

+using MonoDevelop.Ide.Gui.Components;

+

+namespace WindowsPlatform.MainToolbar

+{

+	public enum StatusBarStatus

+	{

+		Normal,

+		Ready,

+		Warning,

+		Error,

+	}

+

+	/// <summary>

+	/// Interaction logic for StatusBar.xaml

+	/// </summary>

+	public partial class StatusBarControl : UserControl, StatusBar, INotifyPropertyChanged

+	{

+		StatusBarContextHandler ctxHandler;

+		TaskEventHandler updateHandler;

+		public StatusBarControl ()

+		{

+			InitializeComponent ();

+			DataContext = this;

+

+			ctxHandler = new StatusBarContextHandler (this);

+

+			ShowReady ();

+

+			updateHandler = delegate {

+				int ec = 0, wc = 0;

+

+				foreach (MonoDevelop.Ide.Tasks.TaskListEntry t in TaskService.Errors) {

+					if (t.Severity == TaskSeverity.Error)

+						ec++;

+					else if (t.Severity == TaskSeverity.Warning)

+						wc++;

+				}

+

+				Runtime.RunInMainThread (delegate {

+					if (ec > 0) {

+						BuildResultPanelVisibility = Visibility.Visible;

+						BuildResultCount = ec;

+						BuildResultIcon = Stock.Error.GetStockIcon ().WithSize (Xwt.IconSize.Small);

+					} else if (wc > 0) {

+						BuildResultPanelVisibility = Visibility.Visible;

+						BuildResultCount = wc;

+						BuildResultIcon = Stock.Warning.GetStockIcon ().WithSize (Xwt.IconSize.Small);

+					} else

+						BuildResultPanelVisibility = Visibility.Collapsed;

+				});

+			};

+			TaskService.Errors.TasksAdded += updateHandler;

+			TaskService.Errors.TasksRemoved += updateHandler;

+			BrandingService.ApplicationNameChanged += ApplicationNameChanged;

+

+			StatusText.ToolTipOpening += (o, e) => {

+				e.Handled = !TextTrimmed ();

+			};

+		}

+

+		bool TextTrimmed ()

+		{

+			StatusText.Measure (new Size (double.PositiveInfinity, double.PositiveInfinity));

+			return StatusText.ActualWidth < StatusText.DesiredSize.Width;

+		}

+

+		public bool AutoPulse {

+			get { return ProgressBar.IsIndeterminate; }

+			set { ProgressBar.IsIndeterminate = value; }

+		}

+

+		public StatusBar MainContext

+		{

+			get { return ctxHandler.MainContext; }

+		}

+

+		public void BeginProgress (string name)

+		{

+			EndProgress();

+			Status = StatusBarStatus.Normal;

+			ShowMessage (name);

+		}

+

+		public void BeginProgress (IconId image, string name)

+		{

+			EndProgress();

+			Status = StatusBarStatus.Normal;

+			ShowMessage(image, name);

+		}

+

+		public StatusBarContext CreateContext ()

+		{

+			return ctxHandler.CreateContext ();

+		}

+

+		public void Dispose ()

+		{

+			TaskService.Errors.TasksAdded -= updateHandler;

+			TaskService.Errors.TasksRemoved -= updateHandler;

+			BrandingService.ApplicationNameChanged -= ApplicationNameChanged;

+		}

+

+		public void EndProgress ()

+		{

+			oldWork = 0;

+            ProgressBar.BeginAnimation(System.Windows.Controls.Primitives.RangeBase.ValueProperty, null);

+		}

+

+		public void Pulse ()

+		{

+			// Nothing to do here.

+		}

+

+		static Pad sourcePad;

+		public void SetMessageSourcePad (Pad pad)

+		{

+			sourcePad = pad;

+		}

+

+		void OnShowError(object sender, MouseButtonEventArgs e)

+		{

+			IdeApp.Workbench.GetPad<MonoDevelop.Ide.Gui.Pads.ErrorListPad>().BringToFront();

+		}

+

+		void OnShowPad(object sender, MouseButtonEventArgs e)

+		{

+			if (sourcePad != null)

+				sourcePad.BringToFront(true);

+		}

+

+		double oldWork = 0;

+		public void SetProgressFraction (double work)

+		{

+			if (work == oldWork)

+				return;

+

+			var anim = new DoubleAnimation

+			{

+				From = oldWork,

+				To = work,

+				Duration = TimeSpan.FromSeconds(0.2),

+				FillBehavior = FillBehavior.HoldEnd,

+			};

+			oldWork = work;

+

+			ProgressBar.BeginAnimation(System.Windows.Controls.Primitives.RangeBase.ValueProperty, anim, HandoffBehavior.SnapshotAndReplace);

+		}

+

+		public void ShowError (string error)

+		{

+			Status = StatusBarStatus.Error;

+			ShowMessage (error);

+		}

+

+		public void ShowMessage (string message)

+		{

+			ShowMessage (null, message, false);

+		}

+

+		public void ShowMessage (IconId image, string message)

+		{

+			ShowMessage (image, message, false);

+		}

+

+		public void ShowMessage (string message, bool isMarkup)

+		{

+			ShowMessage (null, message, true);

+		}

+

+		IconId currentIcon;

+		AnimatedIcon animatedIcon;

+		IDisposable xwtAnimation;

+		public void ShowMessage (IconId iconId, string message, bool isMarkup)

+		{

+			Message = message;

+			StatusText.ToolTip = message;

+

+			if (iconId.IsNull)

+				iconId = BrandingService.StatusSteadyIconId;

+

+			// don't reload same icon

+			if (currentIcon == iconId)

+				return;

+

+			currentIcon = iconId;

+

+			if (xwtAnimation != null) {

+				xwtAnimation.Dispose ();

+				xwtAnimation = null;

+			}

+

+			if (ImageService.IsAnimation (currentIcon, Gtk.IconSize.Menu)) {

+				animatedIcon = ImageService.GetAnimatedIcon (currentIcon, Gtk.IconSize.Menu);

+				StatusImage = animatedIcon.FirstFrame;

+				xwtAnimation = animatedIcon.StartAnimation (p => {

+					StatusImage = p;

+				});

+			} else

+				StatusImage = currentIcon.GetStockIcon ().WithSize (Xwt.IconSize.Small);

+		}

+

+		public void ShowReady ()

+		{

+			Status = StatusBarStatus.Ready;

+			ShowMessage (BrandingService.StatusSteadyIconId, BrandingService.ApplicationLongName);

+		}

+

+		void ApplicationNameChanged (object sender, EventArgs e)

+		{

+			if (Status == StatusBarStatus.Ready)

+				ShowReady ();

+		}

+

+		public StatusBarIcon ShowStatusIcon (Xwt.Drawing.Image pixbuf)

+		{

+			var icon = new StatusIcon (this) {

+				Image = pixbuf,

+				Margin = new Thickness (5, 5, 5, 5),

+				MaxWidth = 16,

+				MaxHeight = 16,

+			};

+

+			StatusIconsPanel.Children.Add (icon);

+

+			return icon;

+        }

+

+		public void ShowWarning (string warning)

+		{

+			Status = StatusBarStatus.Warning;

+			ShowMessage (warning);

+		}

+

+		string message;

+		public string Message

+		{

+			get { return message; }

+			set { message = value; RaisePropertyChanged (); }

+		}

+

+		public static readonly DependencyProperty StatusProperty =

+			DependencyProperty.Register("Status", typeof(StatusBarStatus), typeof(StatusBarControl), new FrameworkPropertyMetadata(StatusBarStatus.Normal, FrameworkPropertyMetadataOptions.AffectsRender));

+

+		public StatusBarStatus Status {

+			get { return (StatusBarStatus)GetValue(StatusProperty); }  

+			private set { SetValue(StatusProperty, value); RaisePropertyChanged (); }

+		}

+

+		public static readonly DependencyProperty StatusTextBrushProperty =

+			DependencyProperty.Register("StatusTextBrush", typeof(Brush), typeof(StatusBarControl), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender));

+		

+		public Brush StatusTextBrush

+		{

+			get { return GetValue (StatusTextBrushProperty) as Brush; }

+			set { SetValue (StatusTextBrushProperty, value); }

+		}

+

+		Xwt.Drawing.Image statusImage;

+		public Xwt.Drawing.Image StatusImage

+		{

+			get { return statusImage; }

+			set { statusImage = value; RaisePropertyChanged (); }

+		}

+

+		int buildResultCount;

+		public int BuildResultCount

+		{

+			get { return buildResultCount; }

+			set { buildResultCount = value; RaisePropertyChanged (); }

+		}

+

+		Xwt.Drawing.Image buildResultIcon;

+		public Xwt.Drawing.Image BuildResultIcon

+		{

+			get { return buildResultIcon; }

+			set { buildResultIcon = value; RaisePropertyChanged (); }

+		}

+

+		Visibility buildResultPanelVisibility = Visibility.Collapsed;

+		public Visibility BuildResultPanelVisibility

+		{

+            get { return buildResultPanelVisibility; }

+			set { buildResultPanelVisibility = value; RaisePropertyChanged (); }

+		}

+

+		void RaisePropertyChanged ([CallerMemberName] string propName = null)

+		{

+			if (PropertyChanged != null)

+				PropertyChanged (this, new System.ComponentModel.PropertyChangedEventArgs (propName));

+		}

+

+		public event PropertyChangedEventHandler PropertyChanged;

+	}

+

+	class StatusIcon : ImageBox, StatusBarIcon

+	{

+		StatusBar bar;

+

+		public StatusIcon (StatusBar bar)

+		{

+			this.bar = bar;

+		}

+

+		public void SetAlertMode (int seconds)

+		{

+			// Create fade-out fade-in animation.

+		}

+

+		public void Dispose ()

+		{

+			((StackPanel)Parent).Children.Remove (this);

+		}

+

+		public new string ToolTip

+		{

+			get { return (string)base.ToolTip; }

+			set { base.ToolTip = value; }

+		}

+

+		protected override void OnMouseUp (MouseButtonEventArgs e)

+		{

+			base.OnMouseUp (e);

+

+			Xwt.PointerButton button;

+			switch (e.ChangedButton) {

+				case MouseButton.Left:

+					button = Xwt.PointerButton.Left;

+					break;

+				case MouseButton.Middle:

+					button = Xwt.PointerButton.Middle;

+					break;

+				case MouseButton.Right:

+					button = Xwt.PointerButton.Right;

+					break;

+				case MouseButton.XButton1:

+					button = Xwt.PointerButton.ExtendedButton1;

+					break;

+				case MouseButton.XButton2:

+					button = Xwt.PointerButton.ExtendedButton2;

+					break;

+				default:

+					throw new NotSupportedException ();

+			}

+

+			if (Clicked != null)

+				Clicked (this, new StatusBarIconClickedEventArgs {

+					Button = button,

+				});

+		}

+

+		public event EventHandler<StatusBarIconClickedEventArgs> Clicked;

+	}

+}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleBar.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleBar.xaml
new file mode 100644
index 0000000000..4c24cbdd4c
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleBar.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="WindowsPlatform.MainToolbar.TitleBar"

+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 

+             xmlns:local="clr-namespace:WindowsPlatform.MainToolbar"

+             xmlns:platform="clr-namespace:WindowsPlatform"

+             mc:Ignorable="d" Background="{Binding Path=(platform:Styles.MainToolbarBackgroundBrush), Mode=OneWay}">

+    <DockPanel x:Name="DockTitle" Height="{DynamicResource {x:Static SystemParameters.WindowCaptionHeightKey}}" Margin="1,0,0,0" UseLayoutRounding="True">

+        <!-- Insert menu items programmatically here on Left. -->

+    </DockPanel>

+</UserControl>

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleBar.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleBar.xaml.cs
new file mode 100644
index 0000000000..cc5d8b9948
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleBar.xaml.cs
@@ -0,0 +1,30 @@
+using System;

+using System.Collections.Generic;

+using System.Linq;

+using System.Runtime.InteropServices;

+using System.Text;

+using System.Threading.Tasks;

+using System.Windows;

+using System.Windows.Controls;

+using System.Windows.Data;

+using System.Windows.Documents;

+using System.Windows.Input;

+using System.Windows.Media;

+using System.Windows.Media.Imaging;

+using System.Windows.Navigation;

+using System.Windows.Shapes;

+using MonoDevelop.Ide;

+

+namespace WindowsPlatform.MainToolbar

+{

+    /// <summary>

+    /// Interaction logic for TitleBar.xaml

+    /// </summary>

+	public partial class TitleBar : UserControl

+    {

+        public TitleBar()

+        {

+            InitializeComponent();

+        }

+	}

+}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
new file mode 100644
index 0000000000..c579ab60f3
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
@@ -0,0 +1,264 @@
+using System;

+using System.Collections.Generic;

+using System.Linq;

+using System.Text;

+using System.Threading.Tasks;

+using System.Windows.Controls;

+using System.Windows.Input;

+using MonoDevelop.Components.Commands;

+using MonoDevelop.Ide;

+using System.Windows;

+using MonoDevelop.Core;

+

+namespace WindowsPlatform.MainToolbar

+{

+	public class TitleMenuItem : MenuItem

+	{

+		public TitleMenuItem (MonoDevelop.Components.Commands.CommandManager manager, CommandEntry entry, CommandInfo commandArrayInfo = null, CommandSource commandSource = CommandSource.MainMenu, object initialCommandTarget = null, Menu menu = null)

+		{

+			this.manager = manager;

+			this.initialCommandTarget = initialCommandTarget;

+			this.commandSource = commandSource;

+			this.commandArrayInfo = commandArrayInfo;

+

+			this.menu = menu;

+			menuEntry = entry;

+			menuEntrySet = entry as CommandEntrySet;

+			menuLinkEntry = entry as LinkCommandEntry;

+

+			if (commandArrayInfo != null) {

+				Header = commandArrayInfo.Text;

+

+				var commandArrayInfoSet = commandArrayInfo as CommandInfoSet;

+				if (commandArrayInfoSet != null) {

+					foreach (var item in commandArrayInfoSet.CommandInfos) {

+						if (item.IsArraySeparator)

+							Items.Add (new Separator { UseLayoutRounding = true, });

+						else

+							Items.Add (new TitleMenuItem (manager, entry, item, commandSource, initialCommandTarget, menu));

+					}

+				}

+			}

+

+			if (menuEntrySet != null) {

+				Header = menuEntrySet.Name;

+

+				foreach (CommandEntry item in menuEntrySet) {

+					if (item.CommandId == MonoDevelop.Components.Commands.Command.Separator) {

+						Items.Add (new Separator { UseLayoutRounding = true, });

+					} else

+						Items.Add (new TitleMenuItem (manager, item, menu: menu));

+				}

+			} else if (menuLinkEntry != null) {

+				Header = menuLinkEntry.Text;

+				Click += OnMenuLinkClicked;

+			} else if (entry != null) {

+				actionCommand = manager.GetCommand (menuEntry.CommandId) as ActionCommand;

+				if (actionCommand == null)

+					return;

+

+				IsCheckable = actionCommand.ActionType == ActionType.Check;

+

+				// FIXME: Use proper keybinding text.

+				if (actionCommand.KeyBinding != null)

+					InputGestureText = actionCommand.KeyBinding.ToString ();

+				

+				try {

+					if (!actionCommand.Icon.IsNull)

+						Icon = new ImageBox (actionCommand.Icon.GetStockIcon ().WithSize (Xwt.IconSize.Small));

+				} catch (Exception ex) {

+					MonoDevelop.Core.LoggingService.LogError ("Failed loading menu icon: " + actionCommand.Icon, ex);

+				}

+				Click += OnMenuClicked;

+			}

+

+			Height = SystemParameters.CaptionHeight;

+			UseLayoutRounding = true;

+		}

+

+		Menu menu;

+

+		/// <summary>

+		/// Updates a command entry. Should only be called from a toplevel node.

+		/// This will update all the menu's children.

+		/// </summary>

+		void Update ()

+		{

+			hasCommand = false;

+			if (menuLinkEntry != null)

+				return;

+

+			if (menuEntrySet != null || commandArrayInfo is CommandInfoSet) {

+				for (int i = 0; i < Items.Count; ++i) {

+					var titleMenuItem = Items[i] as TitleMenuItem;

+

+					if (titleMenuItem != null) {

+						titleMenuItem.Update ();

+						continue;

+					}

+

+					// If we have a separator, don't draw another one if the previous visible item is a separator.

+					var separatorMenuItem = Items [i] as Separator;

+					separatorMenuItem.Visibility = Visibility.Collapsed;

+					for (int j = i - 1; j >= 0; --j) {

+						var iterMenuItem = Items [j] as Control;

+

+						if (iterMenuItem is Separator)

+							break;

+

+						if (iterMenuItem.Visibility != Visibility.Visible)

+							continue;

+

+						separatorMenuItem.Visibility = Visibility.Visible;

+						break;

+					}

+				}

+				if (menuEntrySet != null && menuEntrySet.AutoHide)

+					Visibility = Items.Cast<Control> ().Any (item => item.Visibility == Visibility.Visible) ? Visibility.Visible : Visibility.Collapsed;

+				return;

+			}

+

+			var info = manager.GetCommandInfo (menuEntry.CommandId, new CommandTargetRoute (initialCommandTarget));

+			if (actionCommand != null) {

+				if (!string.IsNullOrEmpty (info.Description) && (string)ToolTip != info.Description)

+					ToolTip = info.Description;

+

+				if (actionCommand.CommandArray && commandArrayInfo == null) {

+					Visibility = Visibility.Collapsed;

+

+					var parent = (TitleMenuItem)Parent;

+

+					int count = 1;

+					int indexOfThis = parent.Items.IndexOf (this);

+					foreach (var child in info.ArrayInfo) {

+						Control toAdd;

+						if (child.IsArraySeparator) {

+							toAdd = new Separator ();

+						} else {

+							toAdd = new TitleMenuItem (manager, menuEntry, child, menu: menu);

+						}

+

+						toRemoveFromParent.Add (toAdd);

+						parent.Items.Insert (indexOfThis + (count++), toAdd);

+					}

+					return;

+				}

+			}

+

+			SetInfo (commandArrayInfo != null ? commandArrayInfo : info);

+		}

+

+		bool hasCommand = false;

+		void SetInfo (CommandInfo info)

+		{

+			hasCommand = true;

+			Header = info.Text;

+			try {

+				if (!info.Icon.IsNull)

+					Icon = new ImageBox (info.Icon.GetStockIcon ().WithSize (Xwt.IconSize.Small));

+			} catch (Exception ex) {

+				MonoDevelop.Core.LoggingService.LogError ("Failed loading menu icon: " + info.Icon, ex);

+			}

+			IsEnabled = info.Enabled;

+			Visibility = info.Visible && (menuEntry.DisabledVisible || IsEnabled) ?

+				Visibility.Visible : Visibility.Collapsed;

+			IsChecked = info.Checked || info.CheckedInconsistent;

+			ToolTip = info.Description;

+		}

+

+		/// <summary>

+		/// Clears a command entry's saved data. Should only be called from a toplevel node.

+		/// This will update all the menu's children.

+		/// </summary>

+		IEnumerable<Control> Clear ()

+		{

+			if (menuLinkEntry != null) {

+				return Enumerable.Empty<TitleMenuItem> ();

+			}

+

+			if (menuEntrySet != null) {

+				var toRemove = Enumerable.Empty<Control> ();

+                foreach (var item in Items) {

+					var titleMenuItem = item as TitleMenuItem;

+					if (titleMenuItem == null)

+						continue;

+

+					toRemove = toRemove.Concat (titleMenuItem.Clear ());

+				}

+

+				foreach (var item in toRemove)

+					Items.Remove (item);

+

+				return Enumerable.Empty<TitleMenuItem> (); 

+			}

+			

+			var ret = toRemoveFromParent;

+			toRemoveFromParent = new List<Control> ();

+			return ret;

+		}

+

+		static bool closingSent;

+		protected override void OnSubmenuOpened (RoutedEventArgs e)

+		{

+			if (Parent is Menu) {

+				Update ();

+				closingSent = false;

+			}

+

+			base.OnSubmenuOpened (e);

+		}

+

+

+		protected override void OnSubmenuClosed (RoutedEventArgs e)

+		{

+			if (Parent is Menu)

+				Clear ();

+

+			if (!closingSent) {

+				OnSubmenuClosing ();

+				closingSent = false;

+			}

+

+			base.OnSubmenuClosed (e);

+		}

+

+		void OnMenuClicked (object sender, RoutedEventArgs e)

+		{

+			if (!hasCommand)

+				return;

+

+			closingSent = true;

+			OnSubmenuClosing ();

+

+			Xwt.Application.Invoke(() => {

+				if (commandArrayInfo != null) {

+					manager.DispatchCommand (menuEntry.CommandId, commandArrayInfo.DataItem, initialCommandTarget, commandSource);

+				} else {

+					manager.DispatchCommand (menuEntry.CommandId, null, initialCommandTarget, commandSource);

+				}

+			});

+		}

+

+		void OnMenuLinkClicked (object sender, RoutedEventArgs e)

+		{

+			DesktopService.ShowUrl (menuLinkEntry.Url);

+		}

+

+		void OnSubmenuClosing ()

+		{

+			bool shouldFocusIde = !menu.Items.OfType<MenuItem> ().Any (mi => mi.IsSubmenuOpen);

+			if (shouldFocusIde)

+				IdeApp.Workbench.RootWindow.Present ();

+		}

+

+		readonly MonoDevelop.Components.Commands.CommandManager manager;

+		readonly object initialCommandTarget;

+		readonly CommandSource commandSource;

+		readonly CommandInfo commandArrayInfo;

+		readonly ActionCommand actionCommand;

+		readonly CommandEntry menuEntry;

+		readonly CommandEntrySet menuEntrySet;

+		readonly LinkCommandEntry menuLinkEntry;

+		List<Control> toRemoveFromParent = new List<Control> ();

+	}

+}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/ToolBar.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/ToolBar.xaml
new file mode 100644
index 0000000000..2dbefe0880
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/ToolBar.xaml
@@ -0,0 +1,33 @@
+<UserControl x:Class="WindowsPlatform.MainToolbar.ToolBar"

+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 

+             xmlns:local="clr-namespace:WindowsPlatform.MainToolbar"

+             xmlns:platform="clr-namespace:WindowsPlatform"

+             mc:Ignorable="d"

+             Background="{Binding Path=(platform:Styles.MainToolbarBackgroundBrush), Mode=OneWay}"

+             Foreground="{Binding Path=(platform:Styles.MainToolbarForegroundBrush), Mode=OneWay}"

+             BorderBrush="{Binding Path=(platform:Styles.MainToolbarShadowBrush), Mode=OneWay}"

+             BorderThickness="0, 0, 0, 0.5">

+    <UserControl.Resources>

+        <local:NotNullConverter x:Key="NotNullConverter" />

+    </UserControl.Resources>

+    <UniformGrid x:Name="DockTitle" Height="32" Margin="20,0,9,0" Background="Transparent" UseLayoutRounding="True" Rows="1" Columns="3">

+        <StackPanel x:Name="LeftPanel" Grid.Row="1" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" Height="Auto" UseLayoutRounding="True">

+            <local:RunButtonControl x:Name="RunButton" VerticalContentAlignment="Center" VerticalAlignment="Center" UseLayoutRounding="True" />

+            <Separator Opacity="0" Width="10" UseLayoutRounding="True" />

+            <local:ConfigurationComboMenu x:Name="ConfigurationMenu" VerticalContentAlignment="Center" Background="Transparent" VerticalAlignment="Center" UseLayoutRounding="True" />

+            <Separator Opacity="0" Width="10" UseLayoutRounding="True" />

+            <local:RuntimeComboMenu x:Name="RuntimeMenu" VerticalContentAlignment="Center" Background="Transparent" VerticalAlignment="Center" UseLayoutRounding="True" />

+            <Separator Opacity="0" Width="5" UseLayoutRounding="True" />

+            <StackPanel x:Name="ButtonBarPanel" Orientation="Horizontal" UseLayoutRounding="True" />

+        </StackPanel>

+        <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" Height="Auto" UseLayoutRounding="True">

+            <local:StatusBarControl x:Name="StatusBar" VerticalContentAlignment="Center" VerticalAlignment="Center" UseLayoutRounding="True" />

+        </StackPanel>

+        <StackPanel Grid.Row="1" Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Height="Auto" UseLayoutRounding="True">

+            <local:SearchBarControl x:Name="SearchBar" VerticalContentAlignment="Center" VerticalAlignment="Center" UseLayoutRounding="True" />

+        </StackPanel>

+    </UniformGrid>

+</UserControl>

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/Toolbar.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/Toolbar.xaml.cs
new file mode 100644
index 0000000000..afaa3144f0
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/Toolbar.xaml.cs
@@ -0,0 +1,29 @@
+using MonoDevelop.Components.MainToolbar;

+using System;

+using System.Collections.Generic;

+using System.Linq;

+using System.Text;

+using System.Threading.Tasks;

+using System.Windows;

+using System.Windows.Controls;

+using System.Windows.Data;

+using System.Windows.Documents;

+using System.Windows.Input;

+using System.Windows.Media;

+using System.Windows.Media.Imaging;

+using System.Windows.Navigation;

+using System.Windows.Shapes;

+

+namespace WindowsPlatform.MainToolbar

+{

+	/// <summary>

+	/// Interaction logic for Toolbar.xaml

+	/// </summary>

+	public partial class ToolBar : UserControl

+	{

+		public ToolBar ()

+		{

+			InitializeComponent ();

+		}

+	}

+}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/WPFToolbar.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/WPFToolbar.cs
new file mode 100644
index 0000000000..5182f66273
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/WPFToolbar.cs
@@ -0,0 +1,276 @@
+using MonoDevelop.Components.MainToolbar;

+using MonoDevelop.Components.Windows;

+using MonoDevelop.Core;

+using System;

+using System.Collections.Generic;

+using System.Linq;

+using System.Text;

+using System.Threading.Tasks;

+using Gtk;

+using MonoDevelop.Ide;

+using Xwt;

+using Xwt.WPFBackend;

+using System.Collections.ObjectModel;

+using System.ComponentModel;

+using System.Runtime.InteropServices;

+using System.Windows.Threading;

+using System.Globalization;

+using System.Windows.Data;

+using System.Runtime.CompilerServices;

+using System.Windows.Controls;

+using System.Windows.Media;

+

+namespace WindowsPlatform.MainToolbar

+{

+	public class WPFToolbar : GtkWPFWidget, IMainToolbarView, INotifyPropertyChanged

+	{

+		ToolBar toolbar;

+		WPFToolbar (ToolBar toolbar) : base (toolbar)

+		{

+			this.toolbar = toolbar;

+

+			toolbar.ConfigurationMenu.SelectionChanged += (o, e) => {

+				var comboMenu = (ComboMenu<IConfigurationModel>)o;

+				var newModel = e.Added;

+				if (newModel == null)

+					return;

+

+				Runtime.RunInMainThread(() => {

+					ActiveConfiguration = newModel;

+

+					if (ConfigurationChanged != null)

+						ConfigurationChanged(o, e);

+				});

+			};

+

+			toolbar.RuntimeMenu.SelectionChanged += (o, e) => {

+				var newModel = e.Added;

+				if (newModel == null)

+					return;

+

+				using (var mutableModel = newModel.GetMutableModel()) {

+					Runtime.RunInMainThread(() => {

+						ActiveRuntime = newModel;

+

+						var ea = new MonoDevelop.Components.MainToolbar.HandledEventArgs();

+						if (RuntimeChanged != null)

+							RuntimeChanged(o, ea);

+

+						if (ea.Handled)

+							ActiveRuntime = e.Removed;

+					});

+				}

+			};

+

+			toolbar.RunButton.Click += (o, e) => {

+				if (RunButtonClicked != null)

+					RunButtonClicked (o, e);

+			};

+

+			toolbar.SearchBar.SearchBar.TextChanged += (o, e) => {

+				if (string.IsNullOrEmpty (SearchText) || SearchText == SearchPlaceholderMessage)

+					return;

+

+				if (SearchEntryChanged != null)
+					SearchEntryChanged (o, e);

+			};

+

+			toolbar.SearchBar.SearchBar.LostKeyboardFocus += (o, e) => {

+				if (SearchEntryLostFocus != null)

+					SearchEntryLostFocus (o, e);

+				toolbar.SearchBar.SearchText = toolbar.SearchBar.PlaceholderText;

+			};

+

+			toolbar.SearchBar.SearchBar.GotKeyboardFocus += (o, e) => {

+				SearchEntryActivated?.Invoke (o, e);

+			};

+

+			toolbar.SearchBar.SearchBar.SizeChanged += (o, e) => {

+				if (SearchEntryResized != null)

+					SearchEntryResized (o, e);

+			};

+

+			toolbar.SearchBar.SearchBar.PreviewKeyDown += (o, e) => {

+				var ka = new KeyEventArgs(KeyboardUtil.TranslateToXwtKey(e.Key), KeyboardUtil.GetModifiers(), e.IsRepeat, e.Timestamp);

+				SendKeyPress(ka);

+				e.Handled = ka.Handled;

+			};

+

+			toolbar.SearchBar.ClearIconClicked += (o, e) =>

+			{

+				SendKeyPress(new KeyEventArgs(Xwt.Key.Escape, KeyboardUtil.GetModifiers(), false, 0));

+			};

+        }

+

+		void SendKeyPress(KeyEventArgs ka)

+		{

+			if (SearchEntryKeyPressed != null)

+				SearchEntryKeyPressed(this, ka);

+		}

+

+		public WPFToolbar () : this (new ToolBar ())

+		{

+		}

+		

+		public IConfigurationModel ActiveConfiguration {

+			get { return toolbar.ConfigurationMenu.Active; }

+			set { toolbar.ConfigurationMenu.Active = value; }

+		}

+		

+		public IRuntimeModel ActiveRuntime {

+			get	{ return toolbar.RuntimeMenu.Active; }

+			set	{ toolbar.RuntimeMenu.Active = value; }

+		}

+

+		public bool ButtonBarSensitivity {

+			set	{ toolbar.ButtonBarPanel.IsEnabled = value; }

+		}

+

+		public IEnumerable<IConfigurationModel> ConfigurationModel {

+			get	{ return toolbar.ConfigurationMenu.Model; }

+			set { toolbar.ConfigurationMenu.Model = value; }

+		}

+

+		bool configurationPlatformSensitivity;

+        public bool ConfigurationPlatformSensitivity {

+			get { return configurationPlatformSensitivity; }

+			set {

+				configurationPlatformSensitivity = value;

+				toolbar.ConfigurationMenu.IsEnabled = value && ConfigurationModel.Count() > 1;

+				toolbar.RuntimeMenu.IsEnabled = value && RuntimeModel.Count() > 1;

+            }

+		}

+		

+		public bool PlatformSensitivity {

+			set {

+				toolbar.RuntimeMenu.IsEnabled = value && RuntimeModel.Count() > 1;

+			}

+		}

+

+		public Gtk.Widget PopupAnchor {

+			get	{

+				return this;

+			}

+		}

+

+		public OperationIcon RunButtonIcon {

+			set	{ toolbar.RunButton.Icon = value; }

+		}

+

+		public bool RunButtonSensitivity {

+			get { return toolbar.RunButton.IsEnabled; }

+			set { toolbar.RunButton.IsEnabled = value; }

+		}

+		

+		public IEnumerable<IRuntimeModel> RuntimeModel {

+			get { return toolbar.RuntimeMenu.Model; }

+			set { toolbar.RuntimeMenu.Model = value; }

+		}

+

+		public string SearchCategory {

+			set	{

+				toolbar.SearchBar.SearchText = value;

+				FocusSearchBar ();

+				toolbar.SearchBar.SearchBar.Select (value.Length, 0);

+			}

+		}

+

+		public IEnumerable<ISearchMenuModel> SearchMenuItems {

+			set	{

+				toolbar.SearchBar.SearchMenuItems = value;

+			}

+		}

+

+		public string SearchPlaceholderMessage {

+			get { return toolbar.SearchBar.PlaceholderText; }

+			set	{ toolbar.SearchBar.PlaceholderText = value; }

+		}

+

+		public bool SearchSensivitity {

+			set	{ toolbar.SearchBar.IsEnabled = value; }

+		}

+

+		public string SearchText {

+			get { return toolbar.SearchBar.SearchText; }

+			set {

+				toolbar.SearchBar.SearchText = value;

+

+				if (value != SearchPlaceholderMessage) {

+					toolbar.SearchBar.SearchBar.SelectAll ();

+				}

+			}

+		}

+

+		public StatusBar StatusBar {

+			get	{ return toolbar.StatusBar; }

+		}

+

+		public event EventHandler ConfigurationChanged;

+		public event EventHandler RunButtonClicked;

+		public event EventHandler<MonoDevelop.Components.MainToolbar.HandledEventArgs> RuntimeChanged;

+		public event EventHandler SearchEntryActivated;

+		public event EventHandler SearchEntryChanged;

+		public event EventHandler<KeyEventArgs> SearchEntryKeyPressed;

+		public event EventHandler SearchEntryLostFocus;

+		public event EventHandler SearchEntryResized;

+

+		public void FocusSearchBar ()

+		{

+			toolbar.SearchBar.SearchBar.Focus ();

+		}

+

+		public void RebuildToolbar (IEnumerable<IButtonBarButton> buttons)

+		{

+			foreach (var item in toolbar.ButtonBarPanel.Children.OfType<IDisposable> ())

+				item.Dispose ();

+

+			toolbar.ButtonBarPanel.Children.Clear ();

+

+			if (!buttons.Any ())

+				return;

+

+			var sepStyle = toolbar.FindResource (System.Windows.Controls.ToolBar.SeparatorStyleKey) as System.Windows.Style;

+

+			bool needsSeparator = true;

+			foreach (var button in buttons) {

+				if (button.IsSeparator) {

+					needsSeparator = true;

+					continue;

+				}

+

+				if (needsSeparator)

+					toolbar.ButtonBarPanel.Children.Add (new DottedSeparator {

+						Margin = new System.Windows.Thickness {

+							Left = 3,

+							Right = 3,

+						},

+						UseLayoutRounding = true,

+					});

+

+				toolbar.ButtonBarPanel.Children.Add (new ButtonBarButton (button));

+				needsSeparator = false;

+			}

+		}

+

+		void RaisePropertyChanged ([CallerMemberName] string propName = null)

+		{

+			if (PropertyChanged != null)

+				PropertyChanged (this, new System.ComponentModel.PropertyChangedEventArgs (propName));

+		}

+

+		public event PropertyChangedEventHandler PropertyChanged;

+	}

+

+	public class NotNullConverter : IValueConverter

+	{

+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)

+		{

+			return value != null;

+		}

+

+		public object ConvertBack (object value, Type targetType, object parameter, CultureInfo culture)

+		{

+			throw new NotImplementedException ();

+		}

+    }

+}

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs
new file mode 100644
index 0000000000..400adbb662
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs
@@ -0,0 +1,364 @@
+//

+// Styles.cs

+//

+// Author:

+//       Vsevolod Kukol <sevo@sevo.org>

+//

+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+using System;

+using System.ComponentModel;

+using System.Runtime.CompilerServices;

+using System.Windows;

+using System.Windows.Media;

+using MonoDevelop.Ide;

+

+namespace WindowsPlatform

+{

+	public static class Styles

+	{

+		static Brush mainToolbarBackgroundBrush;

+		static Brush mainToolbarForegroundBrush;

+		static Brush mainToolbarDisabledForegroundBrush;

+		static Brush mainToolbarShadowBrush;

+		static Brush mainToolbarSeparatorBrush;

+		static Brush mainToolbarButtonPressedBackgroundBrush;

+		static Brush mainToolbarButtonPressedBorderBrush;

+		static Brush menuBarBackgroundBrush;

+		static Brush menuBarForegroundBrush;

+		static Brush menuBarBorderBrush;

+		static Brush menuBarHighlightBackgroundBrush;

+		static Brush menuBarHighlightBorderBrush;

+

+        static Brush menuBackgroundBrush;

+		static Brush menuForegroundBrush;

+		static Brush menuBorderBrush;

+		static Brush menuHighlightBackgroundBrush;

+		static Brush menuHighlightBorderBrush;

+		static Brush menuSelectedBackgroundBrush;

+		static Brush menuSelectedBorderBrush;

+		static Brush menuDisabledForegroundBrush;

+		static Brush menuSeparatorBrush;

+

+		static Brush statusBarBackgroundBrush;

+		static Brush statusBarTextBrush;

+		static Brush statusBarErrorTextBrush;

+		static Brush statusBarWarningTextBrush;

+		static Brush statusBarReadyTextBrush;

+		static Brush statusBarProgressBorderBrush;

+		static Brush statusBarProgressBackgroundBrush;

+		static Brush searchBarBorderBrush;

+		static Brush searchBarBackgroundBrush;

+		static Brush searchBarTextBrush;

+

+		static Brush tooltipBackgroundBrush;

+		static Brush tooltipBorderBrush;

+		static Brush tooltipTextBrush;

+

+		public static Brush MainToolbarBackgroundBrush {

+			get { return mainToolbarBackgroundBrush; }

+			private set { mainToolbarBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MainToolbarForegroundBrush {

+			get { return mainToolbarForegroundBrush; }

+			private set { mainToolbarForegroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MainToolbarDisabledForegroundBrush {

+			get { return mainToolbarDisabledForegroundBrush; }

+			private set { mainToolbarDisabledForegroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MainToolbarShadowBrush {

+			get { return mainToolbarShadowBrush; }

+			private set { mainToolbarShadowBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MainToolbarSeparatorBrush {

+			get { return mainToolbarSeparatorBrush; }

+			private set { mainToolbarSeparatorBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MainToolbarButtonPressedBackgroundBrush {

+			get { return mainToolbarButtonPressedBackgroundBrush; }

+			set { mainToolbarButtonPressedBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+

+		public static Brush MainToolbarButtonPressedBorderBrush {

+			get { return mainToolbarButtonPressedBorderBrush; }

+			set { mainToolbarButtonPressedBorderBrush = value; RaisePropertyChanged (); }

+		}

+		

+		public static Brush MenuBarBackgroundBrush {

+			get { return menuBarBackgroundBrush; }

+			private set { menuBarBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuBarForegroundBrush {

+			get { return menuBarForegroundBrush; }

+			private set { menuBarForegroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuBarBorderBrush {

+			get { return menuBarBorderBrush; }

+			private set { menuBarBorderBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuBarHighlightBackgroundBrush {

+			get { return menuBarHighlightBackgroundBrush; }

+			private set { menuBarHighlightBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuBarHighlightBorderBrush {

+			get { return menuBarHighlightBorderBrush; }

+			private set { menuBarHighlightBorderBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuBackgroundBrush {

+			get { return menuBackgroundBrush; }

+			private set { menuBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuForegroundBrush {

+			get { return menuForegroundBrush; }

+			private set { menuForegroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuBorderBrush {

+			get { return menuBorderBrush; }

+			private set { menuBorderBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuHighlightBackgroundBrush {

+			get { return menuHighlightBackgroundBrush; }

+			private set { menuHighlightBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuHighlightBorderBrush {

+			get { return menuHighlightBorderBrush; }

+			private set { menuHighlightBorderBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuSelectedBackgroundBrush {

+			get { return menuSelectedBackgroundBrush; }

+			private set { menuSelectedBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuSelectedBorderBrush {

+			get { return menuSelectedBorderBrush; }

+			private set { menuSelectedBorderBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuDisabledForegroundBrush {

+			get { return menuDisabledForegroundBrush; }

+			private set { menuDisabledForegroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush MenuSeparatorBrush {

+			get { return menuSeparatorBrush; }

+			set { menuSeparatorBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush StatusBarBackgroundBrush {

+			get { return statusBarBackgroundBrush; }

+			private set { statusBarBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush StatusBarTextBrush {

+			get { return statusBarTextBrush; }

+			private set { statusBarTextBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush StatusBarErrorTextBrush {

+			get { return statusBarErrorTextBrush; }

+			private set { statusBarErrorTextBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush StatusBarWarningTextBrush {

+			get { return statusBarWarningTextBrush; }

+			private set { statusBarWarningTextBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush StatusBarReadyTextBrush {

+			get { return statusBarReadyTextBrush; }

+			private set { statusBarReadyTextBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush StatusBarProgressBorderBrush {

+			get { return statusBarProgressBorderBrush; }

+			private set { statusBarProgressBorderBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush StatusBarProgressBackgroundBrush {

+			get { return statusBarProgressBackgroundBrush; }

+			private set { statusBarProgressBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush SearchBarBorderBrush {

+			get { return searchBarBorderBrush; }

+			private set { searchBarBorderBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush SearchBarBackgroundBrush {

+			get { return searchBarBackgroundBrush; }

+			private set { searchBarBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush SearchBarTextBrush {

+			get { return searchBarTextBrush; }

+			private set { searchBarTextBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush TooltipBackgroundBrush {

+			get { return tooltipBackgroundBrush; }

+			private set { tooltipBackgroundBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush TooltipBorderBrush {

+			get { return tooltipBorderBrush; }

+			private set { tooltipBorderBrush = value; RaisePropertyChanged (); }

+		}

+

+		public static Brush TooltipTextBrush {

+			get { return tooltipTextBrush; }

+			private set { tooltipTextBrush = value; RaisePropertyChanged (); }

+		}

+

+		static Styles ()

+		{

+			Xwt.Drawing.Context.RegisterStyles ("hover", "pressed", "disabled");

+			LoadStyles ();

+			MonoDevelop.Ide.Gui.Styles.Changed += (o, e) => LoadStyles ();

+		}

+

+		public static Color ColorFromHex (string s, double alpha = 1.0)

+		{

+			if (s.StartsWith ("#", StringComparison.Ordinal))

+				s = s.Substring (1);

+			if (s.Length == 3)

+				s = "" + s[0]+s[0]+s[1]+s[1]+s[2]+s[2];

+			byte r = byte.Parse (s.Substring (0,2), System.Globalization.NumberStyles.HexNumber);

+			byte g = byte.Parse (s.Substring (2,2), System.Globalization.NumberStyles.HexNumber);

+			byte b = byte.Parse (s.Substring (4,2), System.Globalization.NumberStyles.HexNumber);

+			byte a = (byte)(alpha * 255d);

+			return new Color { R = r, G = g, B = b, A = a };

+		}

+

+		public static Color WithAlpha (this Color color, double alpha)

+		{

+			color.A = (byte)(alpha * 255d);

+			return color;

+		}

+

+		public static void LoadStyles ()

+		{

+			if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) {

+				MainToolbarBackgroundBrush = new SolidColorBrush (ColorFromHex("FFFFFF", 0));

+				MainToolbarForegroundBrush = new SolidColorBrush (ColorFromHex("222222"));

+				MainToolbarDisabledForegroundBrush = new SolidColorBrush (ColorFromHex("808080"));

+				MainToolbarShadowBrush = new SolidColorBrush (ColorFromHex("808080"));

+				MainToolbarSeparatorBrush = new SolidColorBrush (ColorFromHex("7D7D7D"));

+				MainToolbarButtonPressedBackgroundBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.4));

+				MainToolbarButtonPressedBorderBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.4));

+

+				MenuBarBackgroundBrush = SystemColors.MenuBarBrush;

+				MenuBarForegroundBrush = SystemColors.MenuTextBrush;

+				MenuBarBorderBrush = new SolidColorBrush (ColorFromHex("999999"));

+				MenuBarHighlightBackgroundBrush = new SolidColorBrush (ColorFromHex("C3E3FE"));

+				MenuBarHighlightBorderBrush = new SolidColorBrush (ColorFromHex("C3E3FE"));

+

+				MenuBackgroundBrush = new SolidColorBrush (ColorFromHex("FFFFFF"));

+				MenuForegroundBrush = new SolidColorBrush (ColorFromHex("000000"));

+				MenuBorderBrush = new SolidColorBrush (ColorFromHex("999999"));

+				MenuSeparatorBrush = new SolidColorBrush (ColorFromHex("EAEAEA"));

+				MenuHighlightBackgroundBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.2));

+				MenuHighlightBorderBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.2));

+				MenuSelectedBackgroundBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.2));

+				MenuSelectedBorderBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.2));

+				MenuDisabledForegroundBrush = new SolidColorBrush (ColorFromHex("A0A0A0"));

+

+				StatusBarBackgroundBrush = new SolidColorBrush (ColorFromHex("E5E5E5"));

+				StatusBarTextBrush = MainToolbarForegroundBrush;

+				StatusBarErrorTextBrush = StatusBarTextBrush;

+				StatusBarWarningTextBrush = StatusBarTextBrush;

+				StatusBarReadyTextBrush = new SolidColorBrush (ColorFromHex("808080"));

+				StatusBarProgressBorderBrush = new SolidColorBrush (ColorFromHex("D9DCE1"));

+				StatusBarProgressBackgroundBrush = new SolidColorBrush (ColorFromHex("B3E770"));

+				SearchBarBorderBrush = new SolidColorBrush (ColorFromHex("D3D3D3"));

+				SearchBarBackgroundBrush = new SolidColorBrush (ColorFromHex("FFFFFF"));

+				SearchBarTextBrush = MainToolbarForegroundBrush;

+

+				TooltipBackgroundBrush = new SolidColorBrush (ColorFromHex("f2f2f2"));

+				TooltipBorderBrush = new SolidColorBrush (ColorFromHex("b2b2b2"));

+				TooltipTextBrush = new SolidColorBrush (ColorFromHex("222222"));

+			} else {

+				MainToolbarBackgroundBrush = new SolidColorBrush (ColorFromHex("303030"));

+				MainToolbarForegroundBrush = new SolidColorBrush (ColorFromHex("bfbfbf"));

+				MainToolbarDisabledForegroundBrush = new SolidColorBrush (ColorFromHex("808080"));

+				MainToolbarShadowBrush = new SolidColorBrush (ColorFromHex("747474"));

+				MainToolbarSeparatorBrush = new SolidColorBrush (ColorFromHex("7D7D7D"));

+				MainToolbarButtonPressedBackgroundBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.4));

+				MainToolbarButtonPressedBorderBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.4));

+

+				MenuBarBackgroundBrush = MainToolbarBackgroundBrush;

+				MenuBarForegroundBrush = MainToolbarForegroundBrush;

+				MenuBarBorderBrush = new SolidColorBrush (ColorFromHex("5D5D5D"));

+				MenuBarHighlightBackgroundBrush = new SolidColorBrush (ColorFromHex("8ECAFF", 0.3));

+				MenuBarHighlightBorderBrush = new SolidColorBrush (ColorFromHex("8ECAFF", 0.3));

+

+				MenuBackgroundBrush = MainToolbarBackgroundBrush;

+				MenuForegroundBrush = MainToolbarForegroundBrush;

+				MenuBorderBrush = new SolidColorBrush (ColorFromHex("5D5D5D"));

+				MenuSeparatorBrush = new SolidColorBrush (ColorFromHex("444444"));

+				MenuHighlightBackgroundBrush = new SolidColorBrush (ColorFromHex("8ECAFF", 0.3));

+				MenuHighlightBorderBrush = new SolidColorBrush (ColorFromHex("8ECAFF", 0.3));

+				MenuSelectedBackgroundBrush = MenuHighlightBackgroundBrush;

+				MenuSelectedBorderBrush = MenuHighlightBorderBrush;

+				MenuDisabledForegroundBrush = new SolidColorBrush (ColorFromHex("707070"));

+

+				StatusBarBackgroundBrush = new SolidColorBrush (ColorFromHex("3D3D3D"));

+				StatusBarTextBrush = MainToolbarForegroundBrush;

+				StatusBarErrorTextBrush = StatusBarTextBrush;

+				StatusBarWarningTextBrush = StatusBarTextBrush;

+				StatusBarReadyTextBrush = new SolidColorBrush (ColorFromHex("D3D3D3"));

+				StatusBarProgressBorderBrush = new SolidColorBrush (ColorFromHex("444444"));

+				StatusBarProgressBackgroundBrush = new SolidColorBrush (ColorFromHex("516833"));

+				SearchBarBorderBrush = new SolidColorBrush (ColorFromHex("1A1A1A"));

+				SearchBarBackgroundBrush = new SolidColorBrush (ColorFromHex("222222"));

+				SearchBarTextBrush = MainToolbarForegroundBrush;

+

+				TooltipBackgroundBrush = new SolidColorBrush (ColorFromHex("5a5a5a"));

+				TooltipBorderBrush = new SolidColorBrush (ColorFromHex("b2b2b2"));

+				TooltipTextBrush = new SolidColorBrush (ColorFromHex("d2d5cd"));

+			}

+		}

+

+		public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;

+

+		static void RaisePropertyChanged ([CallerMemberName] string propName = null)

+		{

+			if (StaticPropertyChanged != null)

+				StaticPropertyChanged (null, new PropertyChangedEventArgs (propName));

+		}

+	}

+}

+

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml
new file mode 100644
index 0000000000..9184782887
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml
@@ -0,0 +1,640 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

+                    xmlns:ui="clr-namespace:System.Windows.Documents;assembly=PresentationUI"

+             		xmlns:platform="clr-namespace:WindowsPlatform">

+

+    <Style x:Key="FlatProgressBar" TargetType="{x:Type ProgressBar}">

+    	<Setter Property="Background" Value="Transparent"/>

+    	<Setter Property="Foreground" Value="{Binding Path=(platform:Styles.StatusBarProgressBackgroundBrush), Mode=OneWay}"/>

+    	<Setter Property="BorderBrush" Value="{Binding Path=(platform:Styles.StatusBarProgressBorderBrush), Mode=OneWay}"/>

+        <Setter Property="Template">

+            <Setter.Value>

+                <ControlTemplate TargetType="ProgressBar">

+                    <Border BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="0" CornerRadius="0" Padding="0">

+                        <Grid x:Name="PART_Track">

+                            <Rectangle x:Name="PART_Indicator" HorizontalAlignment="Left" Fill="{TemplateBinding Foreground}" />

+                        </Grid>

+                    </Border>

+                </ControlTemplate>

+            </Setter.Value>

+        </Setter>

+    </Style>

+

+    <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter"/>

+    <Geometry x:Key="DownArrow"> M 0,0 L 3.5,4 L 7,0 Z</Geometry>

+    <Geometry x:Key="UpArrow">   M 0,4 L 3.5,0 L 7,4 Z</Geometry>

+    <Geometry x:Key="RightArrow">M 0,0 L 4,3.5 L 0,7 Z</Geometry>

+    <Geometry x:Key="Checkmark">F1 M 10.0,1.2 L 4.7,9.1 L 4.5,9.1 L 0,5.2 L 1.3,3.5 L 4.3,6.1L 8.3,0 L 10.0,1.2 Z</Geometry>

+

+    <Style TargetType="{x:Type Menu}">

+        <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}"/>

+        <Setter Property="FontSize" Value="{DynamicResource {x:Static SystemFonts.MenuFontSizeKey}}"/>

+        <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}"/>

+        <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}"/>

+        <Setter Property="VerticalContentAlignment" Value="Center"/>

+        <Setter Property="Template">

+            <Setter.Value>

+                <ControlTemplate TargetType="{x:Type Menu}">

+                    <Border 

+                        Background="{Binding Path=(platform:Styles.MenuBarBackgroundBrush), Mode=OneWay}"

+                        BorderBrush="{Binding Path=(platform:Styles.MenuBarBorderBrush), Mode=OneWay}"

+                        BorderThickness="{TemplateBinding BorderThickness}"

+                        Padding="{TemplateBinding Padding}" 

+                        SnapsToDevicePixels="true"

+                        TextElement.Foreground="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}">

+                        <ItemsPresenter 

+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+                    </Border>

+                </ControlTemplate>

+            </Setter.Value>

+        </Setter>

+    </Style>

+

+    <Style x:Key="MenuScrollButton" TargetType="{x:Type RepeatButton}" BasedOn="{x:Null}" >

+        <Setter Property="ClickMode" Value="Hover"/>

+        <Setter Property="Template">

+            <Setter.Value>

+                <ControlTemplate TargetType="{x:Type RepeatButton}">

+                    <Border x:Name="templateRoot"

+                        SnapsToDevicePixels="true"

+                        Background="Transparent"

+                        BorderBrush="Transparent"

+                        BorderThickness="1">

+                        <ContentPresenter

+                            Margin="6"

+                            HorizontalAlignment="Center"

+                            VerticalAlignment="Center"/>

+                    </Border>

+                </ControlTemplate>

+            </Setter.Value>

+        </Setter>

+    </Style>

+

+    <Style x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type FrameworkElement}, ResourceId=MenuScrollViewer}" TargetType="{x:Type ScrollViewer}" BasedOn="{x:Null}">

+        <Setter Property="HorizontalScrollBarVisibility" Value="Hidden"/>

+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>

+        <Setter Property="Template">

+            <Setter.Value>

+                <ControlTemplate TargetType="{x:Type ScrollViewer}">

+                    <Grid SnapsToDevicePixels="true">

+                        <Grid.ColumnDefinitions>

+                            <ColumnDefinition Width="*"/>

+                        </Grid.ColumnDefinitions>

+                        <Grid.RowDefinitions>

+                            <RowDefinition Height="Auto"/>

+                            <RowDefinition Height="*"/>

+                            <RowDefinition Height="Auto"/>

+                        </Grid.RowDefinitions>

+                        <Border

+                            Grid.Column="0"

+                            Grid.Row="1">

+                            <ScrollContentPresenter

+                                Margin="{TemplateBinding Padding}"

+                                CanContentScroll="{TemplateBinding CanContentScroll}"/>

+                        </Border>

+                        <RepeatButton

+                            Grid.Column="0"

+                            Grid.Row="0"

+                            Style="{StaticResource MenuScrollButton}"

+                            Command="{x:Static ScrollBar.LineUpCommand}"

+                            CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"

+                            Focusable="false">

+                            <RepeatButton.Visibility>

+                                <MultiBinding ConverterParameter="0" Converter="{StaticResource MenuScrollingVisibilityConverter}" FallbackValue="Visibility.Collapsed">

+                                    <Binding Path="ComputedVerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}"/>

+                                    <Binding Path="VerticalOffset" RelativeSource="{RelativeSource TemplatedParent}"/>

+                                    <Binding Path="ExtentHeight" RelativeSource="{RelativeSource TemplatedParent}"/>

+                                    <Binding Path="ViewportHeight" RelativeSource="{RelativeSource TemplatedParent}"/>

+                                </MultiBinding>

+                            </RepeatButton.Visibility>

+                            <Path

+                                Data="{StaticResource UpArrow}"

+                                Fill="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}" />

+                        </RepeatButton>

+                        <RepeatButton

+                            Grid.Column="0"

+                            Grid.Row="2"

+                            Style="{StaticResource MenuScrollButton}"

+                            Command="{x:Static ScrollBar.LineDownCommand}"

+                            CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"

+                            Focusable="false">

+                            <RepeatButton.Visibility>

+                                <MultiBinding ConverterParameter="100" Converter="{StaticResource MenuScrollingVisibilityConverter}" FallbackValue="Visibility.Collapsed">

+                                    <Binding Path="ComputedVerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}"/>

+                                    <Binding Path="VerticalOffset" RelativeSource="{RelativeSource TemplatedParent}"/>

+                                    <Binding Path="ExtentHeight" RelativeSource="{RelativeSource TemplatedParent}"/>

+                                    <Binding Path="ViewportHeight" RelativeSource="{RelativeSource TemplatedParent}"/>

+                                </MultiBinding>

+                            </RepeatButton.Visibility>

+                            <Path

+                                Data="{StaticResource DownArrow}"

+                                Fill="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}" />

+                        </RepeatButton>

+                    </Grid>

+                </ControlTemplate>

+            </Setter.Value>

+        </Setter>

+    </Style>

+

+    <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}">

+        <Setter Property="MinHeight" Value="1"/>

+        <Setter Property="SnapsToDevicePixels" Value="true"/>

+        <Setter Property="Template">

+            <Setter.Value>

+                <ControlTemplate TargetType="{x:Type Separator}">

+                    <Border Background="{Binding Path=(platform:Styles.MenuSeparatorBrush), Mode=OneWay}"

+                            BorderBrush="{Binding Path=(platform:Styles.MenuSeparatorBrush), Mode=OneWay}"

+                            BorderThickness="{TemplateBinding BorderThickness}"

+                            Margin="30,0,0,0"/>

+                </ControlTemplate>

+            </Setter.Value>

+        </Setter>

+    </Style>

+

+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}" TargetType="{x:Type MenuItem}">

+        <Border x:Name="templateRoot"

+            SnapsToDevicePixels="true"

+            BorderThickness="{TemplateBinding BorderThickness}"

+            Background="Transparent"

+            BorderBrush="Transparent"

+            TextElement.Foreground="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}">

+            <Grid VerticalAlignment="Center">

+                <Grid.ColumnDefinitions>

+                    <ColumnDefinition Width="Auto"/>

+                    <ColumnDefinition Width="Auto"/>

+                </Grid.ColumnDefinitions>

+                <ContentPresenter x:Name="Icon"

+                    ContentSource="Icon"

+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"

+                    VerticalAlignment="Center"

+                    HorizontalAlignment="Center"

+                    Width="16"

+                    Height="16"

+                    Margin="3" />

+                <Path x:Name="GlyphPanel"

+                    Data="{StaticResource Checkmark}"

+                    FlowDirection="LeftToRight"

+                    Margin="3"

+                    Visibility="Collapsed"

+                    VerticalAlignment="Center"

+                    Fill="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}" />

+                <ContentPresenter

+                    Grid.Column="1"

+                    ContentSource="Header"

+                    RecognizesAccessKey="True"

+                    Margin="{TemplateBinding Padding}"

+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+            </Grid>

+        </Border>

+        <ControlTemplate.Triggers>

+            <Trigger Property="Icon" Value="{x:Null}">

+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>

+            </Trigger>

+            <Trigger Property="IsChecked" Value="true">

+                <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>

+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>

+            </Trigger>

+            <Trigger Property="IsHighlighted" Value="True">

+                <Setter TargetName="templateRoot" Property="Background" Value="{Binding Path=(platform:Styles.MenuHighlightBackgroundBrush), Mode=OneWay}" />

+                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding Path=(platform:Styles.MenuHighlightBorderBrush), Mode=OneWay}" />

+            </Trigger>

+            <Trigger Property="IsEnabled" Value="False">

+                <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+                <Setter TargetName="GlyphPanel" Property="Fill" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+            </Trigger>

+        </ControlTemplate.Triggers>

+    </ControlTemplate>

+

+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}" TargetType="{x:Type MenuItem}">

+        <Border x:Name="templateRoot"

+            SnapsToDevicePixels="true"

+            BorderThickness="{TemplateBinding BorderThickness}"

+            Background="Transparent"

+            BorderBrush="Transparent"

+            TextElement.Foreground="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}">

+            <Grid VerticalAlignment="Center">

+                <Grid.ColumnDefinitions>

+                    <ColumnDefinition Width="Auto"/>

+                    <ColumnDefinition Width="Auto"/>

+                </Grid.ColumnDefinitions>

+                <ContentPresenter x:Name="Icon"

+                    ContentSource="Icon"

+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"

+                    VerticalAlignment="Center"

+                    HorizontalAlignment="Center"

+                    Width="16"

+                    Height="16"

+                    Margin="3"/>

+                <Path x:Name="GlyphPanel"

+                    Data="{StaticResource Checkmark}"

+                    FlowDirection="LeftToRight"

+                    Margin="3"

+                    Visibility="Collapsed"

+                    VerticalAlignment="Center"

+                    Fill="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}" />

+                <ContentPresenter

+                    Grid.Column="1"

+                    ContentSource="Header"

+                    RecognizesAccessKey="True"

+                    Margin="{TemplateBinding MenuItem.Padding}"

+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+                <Popup x:Name="PART_Popup"

+                    AllowsTransparency="true"

+                    Focusable="false"

+                    IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"

+                    PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}"

+                    Placement="Bottom"

+                    PlacementTarget="{Binding ElementName=templateRoot}" >

+                    <Border x:Name="SubMenuBorder"

+                        Background="{Binding Path=(platform:Styles.MenuBackgroundBrush), Mode=OneWay}"

+                        BorderBrush="{Binding Path=(platform:Styles.MenuBorderBrush), Mode=OneWay}"

+                        BorderThickness="1"

+                        Padding="2">

+                        <ScrollViewer x:Name="SubMenuScrollViewer"

+                            Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">

+                            <Grid RenderOptions.ClearTypeHint="Enabled">

+                                <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">

+                                    <Rectangle

+                                        Name="OpaqueRect"

+                                        Height="{Binding ElementName=SubMenuBorder,Path=ActualHeight}"

+                                        Width="{Binding ElementName=SubMenuBorder,Path=ActualWidth}"

+                                        Fill="{Binding ElementName=SubMenuBorder,Path=Background}" />

+                                </Canvas>

+                                <Rectangle HorizontalAlignment="Left"

+                                           Width="1"

+                                           Margin="29,2,0,2"

+                                           Fill="{Binding Path=(platform:Styles.MenuSeparatorBrush), Mode=OneWay}"/>

+                                <ItemsPresenter x:Name="ItemsPresenter"

+                                    KeyboardNavigation.DirectionalNavigation="Cycle"

+                                    KeyboardNavigation.TabNavigation="Cycle"

+                                    Grid.IsSharedSizeScope="true"

+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+                            </Grid>

+                        </ScrollViewer>

+                    </Border>

+                </Popup>

+            </Grid>

+        </Border>

+        <ControlTemplate.Triggers>

+            <Trigger Property="IsSuspendingPopupAnimation" Value="true">

+                <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None"/>

+            </Trigger>

+            <Trigger Property="Icon" Value="{x:Null}">

+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>

+            </Trigger>

+            <Trigger Property="IsChecked" Value="true">

+                <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>

+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>

+            </Trigger>

+            <Trigger Property="IsHighlighted" Value="True">

+                <Setter TargetName="templateRoot" Property="Background" Value="{Binding Path=(platform:Styles.MenuBarHighlightBackgroundBrush), Mode=OneWay}" />

+                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding Path=(platform:Styles.MenuBarHighlightBorderBrush), Mode=OneWay}" />

+            </Trigger>

+            <Trigger Property="IsEnabled" Value="False">

+                <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+                <Setter TargetName="GlyphPanel" Property="Fill" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+            </Trigger>

+            <Trigger SourceName="SubMenuScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >

+                <Setter TargetName="OpaqueRect"  Property="Canvas.Top"  Value="{Binding ElementName=SubMenuScrollViewer, Path=VerticalOffset}" />

+                <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding ElementName=SubMenuScrollViewer, Path=HorizontalOffset}" />

+            </Trigger>

+        </ControlTemplate.Triggers>

+    </ControlTemplate>

+

+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}" TargetType="{x:Type MenuItem}">

+        <Border x:Name="templateRoot"

+            SnapsToDevicePixels="true"

+            Height="22"

+            BorderThickness="{TemplateBinding BorderThickness}"

+            Background="Transparent"

+            BorderBrush="Transparent"

+            TextElement.Foreground="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}">

+            <Grid Margin="-1">

+                <Grid.ColumnDefinitions>

+                    <ColumnDefinition MinWidth="22" SharedSizeGroup="MenuItemIconColumnGroup" Width="Auto"/>

+                    <ColumnDefinition Width="13"/>

+                    <ColumnDefinition Width="*"/>

+                    <ColumnDefinition Width="30"/>

+                    <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto"/>

+                    <ColumnDefinition Width="20"/>

+                </Grid.ColumnDefinitions>

+                <ContentPresenter x:Name="Icon"

+                    ContentSource="Icon"

+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"

+                    VerticalAlignment="Center"

+                    HorizontalAlignment="Center"

+                    Width="16"

+                    Height="16"

+                    Margin="6,3"/>

+                <Border x:Name="GlyphPanel"

+                    Visibility="Hidden"

+                    Height="22"

+                    Width="22"

+                    VerticalAlignment="Center"

+                    HorizontalAlignment="Center"

+                    Background="{Binding Path=(platform:Styles.MenuSelectedBackgroundBrush), Mode=OneWay}"

+                    BorderBrush="{Binding Path=(platform:Styles.MenuSelectedBorderBrush), Mode=OneWay}"

+                    BorderThickness="1"

+                    ClipToBounds="False"

+                    Margin="-1,0,0,0">

+                    <Path x:Name="Glyph"

+                        Data="{StaticResource Checkmark}"

+                        FlowDirection="LeftToRight"

+                        Height="11"

+                        Width="10"

+                        Fill="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}" />

+                </Border>

+                <ContentPresenter x:Name="menuHeaderContainer"

+                    Grid.Column="2"

+                    HorizontalAlignment="Left"

+                    VerticalAlignment="Center"

+                    ContentSource="Header"

+                    RecognizesAccessKey="True"

+                    Margin="0,0,0,1"

+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+                <TextBlock x:Name="menuGestureText"

+                    Grid.Column="4"

+                    Text="{TemplateBinding InputGestureText}"

+                    Margin="{TemplateBinding MenuItem.Padding}"

+                    VerticalAlignment="Center"

+                    Opacity="0.7" />

+            </Grid>

+        </Border>

+        <ControlTemplate.Triggers>

+            <Trigger Property="Icon" Value="{x:Null}">

+                <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>

+            </Trigger>

+            <Trigger Property="IsChecked" Value="True">

+                <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>

+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>

+            </Trigger>

+            <Trigger Property="IsHighlighted" Value="True">

+                <Setter TargetName="templateRoot" Property="Background" Value="{Binding Path=(platform:Styles.MenuHighlightBackgroundBrush), Mode=OneWay}" />

+                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding Path=(platform:Styles.MenuHighlightBorderBrush), Mode=OneWay}" />

+            </Trigger>

+            <Trigger Property="IsEnabled" Value="False">

+                <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+                <Setter TargetName="Glyph" Property="Fill" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+            </Trigger>        

+        </ControlTemplate.Triggers>

+    </ControlTemplate>

+

+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}" TargetType="{x:Type MenuItem}">

+        <Border x:Name="templateRoot"

+            SnapsToDevicePixels="true"

+            Height="22"

+            BorderThickness="{TemplateBinding BorderThickness}"

+            Background="Transparent"

+            BorderBrush="Transparent"

+            TextElement.Foreground="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}">

+            <Grid Margin="-1">

+                <Grid.ColumnDefinitions>

+                    <ColumnDefinition MinWidth="22" SharedSizeGroup="MenuItemIconColumnGroup" Width="Auto"/>

+                    <ColumnDefinition Width="13"/>

+                    <ColumnDefinition Width="*"/>

+                    <ColumnDefinition Width="30"/>

+                    <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto"/>

+                    <ColumnDefinition Width="20"/>

+                </Grid.ColumnDefinitions>

+                <ContentPresenter x:Name="Icon"

+                    ContentSource="Icon"

+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"

+                    VerticalAlignment="Center"

+                    HorizontalAlignment="Center"

+                    Width="16"

+                    Height="16"

+                    Margin="6,3"/>

+                <Border x:Name="GlyphPanel"

+                    BorderThickness="1"

+                    Height="22"

+                    Width="22"

+                    Visibility="Hidden"

+                    VerticalAlignment="Center"

+                    Margin="-1,0,0,0"

+                    BorderBrush="{Binding Path=(platform:Styles.MenuHighlightBorderBrush), Mode=OneWay}"

+                    Background="{Binding Path=(platform:Styles.MenuHighlightBackgroundBrush), Mode=OneWay}">

+                    <Path x:Name="Glyph"

+                        Data="{DynamicResource Checkmark}"

+                        FlowDirection="LeftToRight"

+                        Height="11"

+                        Width="9"

+                        Fill="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}" />

+                </Border>

+                <ContentPresenter

+                    Grid.Column="2"

+                    HorizontalAlignment="Left"

+                    VerticalAlignment="Center"

+                    ContentSource="Header"

+                    RecognizesAccessKey="True"

+                    Margin="0,0,0,1"

+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+                <TextBlock

+                    Grid.Column="4"

+                    Text="{TemplateBinding InputGestureText}"

+                    VerticalAlignment="Center"

+                    Margin="0,0,0,1"

+                    Opacity="0.7" />

+                <Path x:Name="RightArrow"

+                    Grid.Column="5"

+                    Data="{StaticResource RightArrow}"

+                    Margin="10,0,0,0"

+                    VerticalAlignment="Center"

+                    HorizontalAlignment="Left"

+                    Fill="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}" />

+                <Popup x:Name="PART_Popup"

+                    AllowsTransparency="true"

+                    Focusable="false"

+                    IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"

+                    PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}"

+                    Placement="Right"

+                    HorizontalOffset="-2"

+                    VerticalOffset="-3">

+                    <Border x:Name="SubMenuBorder"

+                        Background="{Binding Path=(platform:Styles.MenuBackgroundBrush), Mode=OneWay}"

+                        BorderBrush="{Binding Path=(platform:Styles.MenuBorderBrush), Mode=OneWay}"

+                        BorderThickness="1"

+                        Padding="2">

+                        <ScrollViewer x:Name="SubMenuScrollViewer"

+                            Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">

+                            <Grid RenderOptions.ClearTypeHint="Enabled">

+                                <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">

+                                    <Rectangle

+                                        Name="OpaqueRect"

+                                        Height="{Binding ElementName=SubMenuBorder,Path=ActualHeight}"

+                                        Width="{Binding ElementName=SubMenuBorder,Path=ActualWidth}"

+                                        Fill="{Binding ElementName=SubMenuBorder,Path=Background}" />

+                                </Canvas>

+                                <Rectangle HorizontalAlignment="Left"

+                                           Width="1"

+                                           Margin="29,0,0,0"

+                                           Fill="{Binding Path=(platform:Styles.MenuSeparatorBrush), Mode=OneWay}"/>

+                                <ItemsPresenter x:Name="ItemsPresenter"

+                                    KeyboardNavigation.DirectionalNavigation="Cycle"

+                                    KeyboardNavigation.TabNavigation="Cycle"

+                                    Grid.IsSharedSizeScope="true"

+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

+                            </Grid>

+                        </ScrollViewer>

+                    </Border>

+                </Popup>

+            </Grid>

+        </Border>

+        <ControlTemplate.Triggers>

+            <Trigger Property="IsSuspendingPopupAnimation" Value="true">

+                <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None"/>

+            </Trigger>

+            <Trigger Property="Icon" Value="{x:Null}">

+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>

+            </Trigger>

+            <Trigger Property="IsChecked" Value="True">

+                <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>

+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>

+            </Trigger>

+            <Trigger Property="IsHighlighted" Value="True">

+                <Setter TargetName="templateRoot" Property="Background" Value="{Binding Path=(platform:Styles.MenuHighlightBackgroundBrush), Mode=OneWay}" />

+                <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding Path=(platform:Styles.MenuHighlightBorderBrush), Mode=OneWay}" />

+            </Trigger>

+            <Trigger Property="IsEnabled" Value="False">

+                <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+                <Setter TargetName="Glyph" Property="Fill" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+                <Setter TargetName="RightArrow" Property="Fill" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />

+            </Trigger>

+            <Trigger SourceName="SubMenuScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >

+                <Setter TargetName="OpaqueRect" Property="Canvas.Top" Value="{Binding ElementName=SubMenuScrollViewer, Path=VerticalOffset}" />

+                <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding ElementName=SubMenuScrollViewer, Path=HorizontalOffset}" />

+            </Trigger>

+        </ControlTemplate.Triggers>

+    </ControlTemplate>

+

+    <Style x:Key="{x:Type MenuItem}" TargetType="{x:Type MenuItem}">

+        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>

+        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>

+        <Setter Property="BorderThickness" Value="1" />

+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>

+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>

+        <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}}" />

+        <Style.Triggers>

+            <Trigger Property="Role" Value="TopLevelHeader">

+                <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}}" />

+                <Setter Property="Padding" Value="6,0"/>

+            </Trigger>

+            <Trigger Property="Role" Value="TopLevelItem">

+                <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}}" />

+                <Setter Property="Padding" Value="6,0"/>

+            </Trigger>

+            <Trigger Property="Role" Value="SubmenuHeader">

+                <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}}" />

+            </Trigger>

+        </Style.Triggers>

+    </Style>

+

+    <Style x:Key="{x:Type ContextMenu}" TargetType="{x:Type ContextMenu}">

+        <Setter Property="FontFamily"

+                Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}"/>

+        <Setter Property="FontSize"

+                Value="{DynamicResource {x:Static SystemFonts.MenuFontSizeKey}}"/>

+        <Setter Property="FontStyle"

+                Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}"/>

+        <Setter Property="FontWeight"

+                Value="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}"/>

+        <Setter Property="Foreground"

+                Value="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}"/>

+        <Setter Property="VerticalContentAlignment"

+                Value="Center"/>

+        <Setter Property="BorderThickness"

+                Value="1"/>

+        <Setter Property="Padding"

+                Value="2"/>

+        <Setter Property="Grid.IsSharedSizeScope"

+                Value="true"/>

+        <Setter Property="HasDropShadow"

+                Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}"/>

+        <Setter Property="ScrollViewer.PanningMode"

+                Value="Both"/>

+        <Setter Property="Stylus.IsFlicksEnabled"

+                Value="False"/>

+        <Setter Property="Template">

+            <Setter.Value>

+                <ControlTemplate TargetType="{x:Type ContextMenu}">

+                    <Border Name="ContextMenuBorder" Background="{Binding Path=(platform:Styles.MenuBackgroundBrush), Mode=OneWay}"

+                            BorderBrush="{Binding Path=(platform:Styles.MenuBorderBrush), Mode=OneWay}"

+                            BorderThickness="{TemplateBinding BorderThickness}"

+            				TextElement.Foreground="{Binding Path=(platform:Styles.MenuForegroundBrush), Mode=OneWay}">

+                        <ScrollViewer Name="ContextMenuScrollViewer"

+                                      Grid.ColumnSpan="2" Margin="1,0"

+                                      Style="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type FrameworkElement}, ResourceId=MenuScrollViewer}}">

+                          <Grid RenderOptions.ClearTypeHint="Enabled">

+                            <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">

+                                <Rectangle

+                                    Name="OpaqueRect"

+                                    Height="{Binding ElementName=ContextMenuBorder,Path=ActualHeight}"

+                                    Width="{Binding ElementName=ContextMenuBorder,Path=ActualWidth}"

+                                    Fill="{Binding ElementName=ContextMenuBorder,Path=Background}" />

+                            </Canvas>

+                            <Rectangle Fill="{Binding Path=(platform:Styles.MenuBackgroundBrush), Mode=OneWay}"

+                                       HorizontalAlignment="Left"

+                                       Width="28"

+                                       Margin="1,2"

+                                       RadiusX="2"

+                                       RadiusY="2"/>

+                            <!--<Rectangle HorizontalAlignment="Left"

+                                       Width="1"

+                                       Margin="29,2,0,2"

+                                       Fill="{Binding Path=(platform:Styles.MenuSeparatorBrush), Mode=OneWay}"/>-->

+                            <ItemsPresenter Name="ItemsPresenter" Margin="{TemplateBinding Padding}"

+                                            KeyboardNavigation.DirectionalNavigation="Cycle"

+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>

+                          </Grid>

+                        </ScrollViewer>

+                    </Border>

+                    <ControlTemplate.Triggers>

+                        <Trigger SourceName="ContextMenuScrollViewer"

+                                 Property="ScrollViewer.CanContentScroll"

+                                 Value="false" >

+                            <Setter TargetName="OpaqueRect"

+                                    Property="Canvas.Top"

+                                    Value="{Binding ElementName=ContextMenuScrollViewer, Path=VerticalOffset}" />

+                            <Setter TargetName="OpaqueRect"

+                                    Property="Canvas.Left"

+                                    Value="{Binding ElementName=ContextMenuScrollViewer, Path=HorizontalOffset}" />

+                        </Trigger>

+                    </ControlTemplate.Triggers>

+                </ControlTemplate>

+            </Setter.Value>

+        </Setter>

+    </Style>

+

+    <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">

+        <Setter Property="Background" Value="{Binding Path=(platform:Styles.TooltipBackgroundBrush), Mode=OneWay}" />

+        <Setter Property="BorderBrush" Value="{Binding Path=(platform:Styles.TooltipBorderBrush), Mode=OneWay}" />

+        <Setter Property="Foreground" Value="{Binding Path=(platform:Styles.TooltipTextBrush), Mode=OneWay}" />

+        <Setter Property="BorderThickness" Value="1" />

+        <Setter Property="Padding" Value="6,4" />

+        <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.StatusFontFamilyKey}}"/>

+        <Setter Property="FontSize" Value="{DynamicResource {x:Static SystemFonts.StatusFontSizeKey}}"/>

+        <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}"/>

+        <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.StatusFontWeightKey}}"/>

+        <Setter Property="HorizontalContentAlignment" Value="Left"/>

+        <Setter Property="VerticalContentAlignment" Value="Center"/>

+        <Setter Property="HasDropShadow" Value="False" />

+        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />

+        <Setter Property="SnapsToDevicePixels" Value="true" />

+        <Setter Property="Template">

+            <Setter.Value>

+                <ControlTemplate TargetType="ToolTip">

+                    <Border Name="Border" 

+                        Background="{TemplateBinding Background}" 

+                        BorderBrush="{TemplateBinding BorderBrush}" 

+                        BorderThickness="{TemplateBinding BorderThickness}" 

+                        SnapsToDevicePixels="True">

+                        <ContentPresenter 

+                            Margin="{TemplateBinding Padding}" 

+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 

+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 

+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>

+                    </Border>

+                </ControlTemplate>

+            </Setter.Value>

+        </Setter>

+    </Style>

+</ResourceDictionary>
\ No newline at end of file
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
index 554cf2cf0b..ef14841f3f 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
@@ -34,17 +34,24 @@ using System.IO;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
-using System.Runtime.InteropServices;

+using System.Runtime.InteropServices;
 using System.Collections.Generic;
 using Microsoft.Win32;
-using CustomControls.OS;

+using CustomControls.OS;
 using MonoDevelop.Ide.Desktop;
 using System.Diagnostics;
 using MonoDevelop.Core.Execution;
 using System.Text;
 using MonoDevelop.Core;
 using Microsoft.WindowsAPICodePack.Taskbar;
-using MonoDevelop.Ide;

+using MonoDevelop.Ide;
+using MonoDevelop.Components.Windows;
+using WindowsPlatform.MainToolbar;
+using MonoDevelop.Components.Commands;

+using System.Windows.Controls;
+using System.Collections.ObjectModel;
+using System.Windows;

+using System.Windows.Input;

 

 namespace MonoDevelop.Platform
 {
@@ -62,10 +69,94 @@ namespace MonoDevelop.Platform
 
 		public override string Name {
 			get { return "Windows"; }
+		}

+

+		#region Toolbar implementation
+		Components.Commands.CommandManager commandManager;
+		string commandMenuAddinPath;
+		string appMenuAddinPath;
+		public override bool SetGlobalMenu (Components.Commands.CommandManager commandManager, string commandMenuAddinPath, string appMenuAddinPath)
+		{
+			// Only store this information. Release it when creating the main toolbar.
+			this.commandManager = commandManager;
+			this.commandMenuAddinPath = commandMenuAddinPath;
+			this.appMenuAddinPath = appMenuAddinPath;
+
+			return true;
+		}
+
+		const int WM_SYSCHAR = 0x0106;
+        internal override void AttachMainToolbar (Gtk.VBox parent, Components.MainToolbar.IMainToolbarView toolbar)
+		{
+			titleBar = new TitleBar ();
+			var topMenu = new GtkWPFWidget (titleBar) {
+				HeightRequest = System.Windows.Forms.SystemInformation.CaptionHeight,
+			};
+			//commandManager.IncompleteKeyPressed += (sender, e) => {

+			//	if (e.Key == Gdk.Key.Alt_L) {

+			//		Keyboard.Focus(titleBar.DockTitle.Children[0]);

+			//	}

+			//};
+			parent.PackStart (topMenu, false, true, 0);
+			SetupMenu ();
+
+			parent.PackStart ((WPFToolbar)toolbar, false, true, 0);
+		}
+
+		void SetupMenu ()
+		{

+			// TODO: Use this?

+			CommandEntrySet appCes = commandManager.CreateCommandEntrySet (appMenuAddinPath);
+
+			CommandEntrySet ces = commandManager.CreateCommandEntrySet (commandMenuAddinPath);
+			var mainMenu = new Menu {

+				IsMainMenu = true,

+				FocusVisualStyle = null,

+			};
+			foreach (CommandEntrySet ce in ces)

+			{

+				var item = new TitleMenuItem (commandManager, ce, menu: mainMenu);

+				mainMenu.Items.Add(item);

+			}

+
+			titleBar.DockTitle.Children.Add (mainMenu);
+			DockPanel.SetDock (mainMenu, Dock.Left);
+
+			commandManager = null;
+			commandMenuAddinPath = appMenuAddinPath = null;
+		}
+
+		TitleBar titleBar;
+		internal override Components.MainToolbar.IMainToolbarView CreateMainToolbar (Gtk.Window window)
+		{

+			return new WPFToolbar {

+				HeightRequest = 40,

+			};
+		}

+		#endregion
+

+		internal static Xwt.Toolkit WPFToolkit;
+
+		public override void Initialize ()
+		{
+			// Only initialize elements for Win7+.
+			if (TaskbarManager.IsPlatformSupported) {
+				TaskbarManager.Instance.ApplicationId = BrandingService.ApplicationName;
+			}
+		}
+
+		public override Xwt.Toolkit LoadNativeToolkit ()
+		{
+			var path = Path.GetDirectoryName (GetType ().Assembly.Location);
+			System.Reflection.Assembly.LoadFrom (Path.Combine (path, "Xwt.WPF.dll"));
+			return WPFToolkit = Xwt.Toolkit.Load (Xwt.ToolkitType.Wpf);
 		}
 
 		internal override void SetMainWindowDecorations (Gtk.Window window)
 		{
+			Uri uri = new Uri ("pack://application:,,,/WindowsPlatform;component/Styles.xaml");
+			Application.Current.Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = uri });
+
 			// Only initialize elements for Win7+.
 			if (TaskbarManager.IsPlatformSupported) {
 				TaskbarManager.Instance.SetApplicationIdForSpecificWindow (GdkWin32.HgdiobjGet (window.GdkWindow), BrandingService.ApplicationName);
@@ -200,8 +291,9 @@ namespace MonoDevelop.Platform
 		[DllImport (Win32.USER32)]
 		extern static int GetMonitorInfoA (IntPtr hmonitor, ref MonitorInfo info);
 
-		public override Gdk.Rectangle GetUsableMonitorGeometry (Gdk.Screen screen, int monitor_id)
+		public override Xwt.Rectangle GetUsableMonitorGeometry (int screenNumber, int monitor_id)
 		{
+			var screen = Gdk.Display.Default.GetScreen (screenNumber);
 			Gdk.Rectangle geometry = screen.GetMonitorGeometry (monitor_id);
 			List<MonitorInfo> screens = new List<MonitorInfo> ();
 
@@ -232,7 +324,7 @@ namespace MonoDevelop.Platform
 			int y = geometry.Y + (visible.Top - frame.Top);
 			int height = visible.Height;
 
-			return new Gdk.Rectangle (x, y, width, height);
+			return new Xwt.Rectangle (x, y, width, height);
 		}
 
 		static ProcessStartInfo CreateConsoleStartInfo (
@@ -263,7 +355,7 @@ namespace MonoDevelop.Platform
 			return psi;
 		}
 
-		public override IProcessAsyncOperation StartConsoleProcess (
+		public override ProcessAsyncOperation StartConsoleProcess (
 			string command, string arguments, string workingDirectory,
 			IDictionary<string, string> environmentVariables,
 			string title, bool pauseWhenFinished)
@@ -274,7 +366,7 @@ namespace MonoDevelop.Platform
 				)
 			};
 			proc.Start ();
-			return proc;
+			return proc.ProcessAsyncOperation;
 		}
 
 		public override bool CanOpenTerminal {
@@ -344,7 +436,7 @@ namespace MonoDevelop.Platform
 
 			//first check for the user's preferred app for this file type and use it as the default
 			using (var key = Registry.CurrentUser.OpenSubKey (@"Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\" + extension + @"\UserChoice")) {
-				var progid = key == null ? null : key.GetValue ("ProgId") as string;
+				var progid = key?.GetValue ("ProgId") as string;
 				if (progid != null)
 					apps[progid] = defaultApp = WindowsAppFromName (progid, true, AssociationFlags.None);
 			}
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj
index 0f19949e44..13557731e3 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj
@@ -82,6 +82,10 @@
       <Project>{252117CA-0ABB-4F36-BFC8-DE23A8089BB9}</Project>
       <Name>Xwt.Gtk.Windows</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\xwt\Xwt.WPF\Xwt.WPF.csproj">
+      <Project>{C93D746E-1586-4D4F-B411-BF5A966E6A08}</Project>
+      <Name>Xwt.WPF</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Dialogs\AddFileDialogHandler.cs" />
@@ -92,6 +96,30 @@
     <Compile Include="Dialogs\OpenFileDialogHandler.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="GdkWin32.cs" />
+    <Compile Include="MainToolbar\ComboMenu.cs" />
+    <Compile Include="MainToolbar\DottedSeparator.xaml.cs">
+      <DependentUpon>DottedSeparator.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainToolbar\IconButton.xaml.cs">
+      <DependentUpon>IconButton.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainToolbar\SearchBar.xaml.cs">
+      <DependentUpon>SearchBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainToolbar\StatusBar.xaml.cs">
+      <DependentUpon>StatusBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainToolbar\SimpleMenuItem.cs">
+      <DependentUpon>SimpleMenuItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainToolbar\TitleMenuItem.cs" />
+    <Compile Include="MainToolbar\TitleBar.xaml.cs">
+      <DependentUpon>TitleBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainToolbar\Toolbar.xaml.cs">
+      <DependentUpon>ToolBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainToolbar\WPFToolbar.cs" />
     <Compile Include="Win32.cs" />
     <Compile Include="WindowsPlatform.cs" />
     <Compile Include="RecentFiles.cs" />
@@ -105,11 +133,158 @@
     <Compile Include="CustomDialogs\CustomCommonFileDialogComboBox.cs" />
     <Compile Include="CustomDialogs\CustomCommonSaveFileDialog.cs" />
     <Compile Include="Dialogs\CommonFileDialogExtensions.cs" />
+    <Compile Include="ImageHelper.cs" />
+    <Compile Include="ImageBox.cs" />
+    <Compile Include="Styles.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="WindowsPlatform.addin.xml">
       <LogicalName>WindowsPlatform.addin.xml</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-continue-debug.png">
+      <LogicalName>md-continue-debug.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-continue-debug~dark.png">
+      <LogicalName>md-continue-debug~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-continue-debug~hover.png">
+      <LogicalName>md-continue-debug~hover.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-continue-debug~hover~dark.png">
+      <LogicalName>md-continue-debug~hover~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-continue-debug~pressed.png">
+      <LogicalName>md-continue-debug~pressed.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-continue-debug~pressed~dark.png">
+      <LogicalName>md-continue-debug~pressed~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-pause-debug.png">
+      <LogicalName>md-pause-debug.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-pause-debug~dark.png">
+      <LogicalName>md-pause-debug~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-pause-debug~hover.png">
+      <LogicalName>md-pause-debug~hover.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-pause-debug~hover~dark.png">
+      <LogicalName>md-pause-debug~hover~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-pause-debug~pressed.png">
+      <LogicalName>md-pause-debug~pressed.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-pause-debug~pressed~dark.png">
+      <LogicalName>md-pause-debug~pressed~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-into-debug.png">
+      <LogicalName>md-step-into-debug.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-into-debug~dark.png">
+      <LogicalName>md-step-into-debug~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-into-debug~hover.png">
+      <LogicalName>md-step-into-debug~hover.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-into-debug~hover~dark.png">
+      <LogicalName>md-step-into-debug~hover~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-into-debug~pressed.png">
+      <LogicalName>md-step-into-debug~pressed.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-into-debug~pressed~dark.png">
+      <LogicalName>md-step-into-debug~pressed~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-out-debug.png">
+      <LogicalName>md-step-out-debug.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-out-debug~dark.png">
+      <LogicalName>md-step-out-debug~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-out-debug~hover.png">
+      <LogicalName>md-step-out-debug~hover.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-out-debug~hover~dark.png">
+      <LogicalName>md-step-out-debug~hover~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-out-debug~pressed.png">
+      <LogicalName>md-step-out-debug~pressed.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-out-debug~pressed~dark.png">
+      <LogicalName>md-step-out-debug~pressed~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-over-debug.png">
+      <LogicalName>md-step-over-debug.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-over-debug~dark.png">
+      <LogicalName>md-step-over-debug~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-over-debug~hover.png">
+      <LogicalName>md-step-over-debug~hover.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-over-debug~hover~dark.png">
+      <LogicalName>md-step-over-debug~hover~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-over-debug~pressed.png">
+      <LogicalName>md-step-over-debug~pressed.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\md-step-over-debug~pressed~dark.png">
+      <LogicalName>md-step-over-debug~pressed~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\build.png">
+      <LogicalName>build.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\build~dark.png">
+      <LogicalName>build~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\build~hover.png">
+      <LogicalName>build~hover.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\build~hover~dark.png">
+      <LogicalName>build~hover~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\build~pressed.png">
+      <LogicalName>build~pressed.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\build~pressed~dark.png">
+      <LogicalName>build~pressed~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stop.png">
+      <LogicalName>stop.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stop~dark.png">
+      <LogicalName>stop~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stop~hover.png">
+      <LogicalName>stop~hover.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stop~hover~dark.png">
+      <LogicalName>stop~hover~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stop~pressed.png">
+      <LogicalName>stop~pressed.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\stop~pressed~dark.png">
+      <LogicalName>stop~pressed~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\execute.png">
+      <LogicalName>execute.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\execute~dark.png">
+      <LogicalName>execute~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\execute~hover.png">
+      <LogicalName>execute~hover.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\execute~hover~dark.png">
+      <LogicalName>execute~hover~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\execute~pressed.png">
+      <LogicalName>execute~pressed.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\execute~pressed~dark.png">
+      <LogicalName>execute~pressed~dark.png</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -117,5 +292,35 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MainToolbar\DottedSeparator.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainToolbar\IconButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainToolbar\SearchBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainToolbar\StatusBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainToolbar\SimpleMenuItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainToolbar\TitleBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainToolbar\ToolBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsProxyCredentialProvider.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsProxyCredentialProvider.cs
index 598f796ce0..76970ec8c4 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsProxyCredentialProvider.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsProxyCredentialProvider.cs
@@ -78,11 +78,11 @@ namespace MonoDevelop.Platform.Windows
 		{

 			NetworkCredential result = null;

 

-			DispatchService.GuiSyncDispatch (() => {

+			Runtime.RunInMainThread (() => {

 				var form = new PlaceholderForm (credentialType, uri, null);

 				if (GdkWin32.RunModalWin32Form (form, IdeApp.Workbench.RootWindow))
 					result = new NetworkCredential (form.Username, form.Password, form.Domain);

-			});

+			}).Wait ();

 

 			// store the obtained credentials in the auth store

 			// but don't store for the root url since it may have other credentials

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build.png
new file mode 100644
index 0000000000..6ddc0f3492
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~dark.png
new file mode 100644
index 0000000000..4dec3eef62
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover.png
new file mode 100644
index 0000000000..0addc45bb6
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover~dark.png
new file mode 100644
index 0000000000..b8cb68fda5
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed.png
new file mode 100644
index 0000000000..4480cde1ef
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed~dark.png
new file mode 100644
index 0000000000..1aa2f118e7
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute.png
new file mode 100644
index 0000000000..e7b6db0a50
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~dark.png
new file mode 100644
index 0000000000..818aff0ad3
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover.png
new file mode 100644
index 0000000000..aaa5f9f32d
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover~dark.png
new file mode 100644
index 0000000000..4aa55e23e7
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed.png
new file mode 100644
index 0000000000..773a31bfe1
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed~dark.png
new file mode 100644
index 0000000000..e86b14d4c1
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug.png
new file mode 100644
index 0000000000..03cb9e7ba7
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~dark.png
new file mode 100644
index 0000000000..860f871cd7
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover.png
new file mode 100644
index 0000000000..f7e0b0695d
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover~dark.png
new file mode 100644
index 0000000000..7533422956
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed.png
new file mode 100644
index 0000000000..68176aaee4
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed~dark.png
new file mode 100644
index 0000000000..0ac1d047b4
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug.png
new file mode 100644
index 0000000000..40915863c0
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~dark.png
new file mode 100644
index 0000000000..8952922d20
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover.png
new file mode 100644
index 0000000000..d83476b18b
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover~dark.png
new file mode 100644
index 0000000000..392ce0d026
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed.png
new file mode 100644
index 0000000000..e4d9d7f7da
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed~dark.png
new file mode 100644
index 0000000000..9781213f5e
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug.png
new file mode 100644
index 0000000000..6b756b74d7
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~dark.png
new file mode 100644
index 0000000000..84162564d7
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover.png
new file mode 100644
index 0000000000..54fcdd2d19
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover~dark.png
new file mode 100644
index 0000000000..04cacda22c
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed.png
new file mode 100644
index 0000000000..45096396b3
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed~dark.png
new file mode 100644
index 0000000000..2d7425f9b8
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug.png
new file mode 100644
index 0000000000..ebf537f98c
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~dark.png
new file mode 100644
index 0000000000..d396c074a7
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover.png
new file mode 100644
index 0000000000..dedda1fe2d
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover~dark.png
new file mode 100644
index 0000000000..92177a1afe
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed.png
new file mode 100644
index 0000000000..29b22c51ea
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed~dark.png
new file mode 100644
index 0000000000..c1d754c159
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug.png
new file mode 100644
index 0000000000..c5b7d130b6
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~dark.png
new file mode 100644
index 0000000000..1a87c5f7ae
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover.png
new file mode 100644
index 0000000000..5e3c9a91f9
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover~dark.png
new file mode 100644
index 0000000000..6a7b525517
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed.png
new file mode 100644
index 0000000000..d307dbac64
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed~dark.png
new file mode 100644
index 0000000000..25e17dfd7f
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop.png
new file mode 100644
index 0000000000..528575211b
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~dark.png
new file mode 100644
index 0000000000..e0c552e73b
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover.png
new file mode 100644
index 0000000000..e7ab64e381
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover~dark.png
new file mode 100644
index 0000000000..4d45bb423a
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover~dark.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed.png
new file mode 100644
index 0000000000..f009fae10b
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed.png
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed~dark.png
new file mode 100644
index 0000000000..784b0c22d1
--- /dev/null
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed~dark.png
diff --git a/main/src/addins/Xml/Completion/EmptyXmlCompletionProvider.cs b/main/src/addins/Xml/Completion/EmptyXmlCompletionProvider.cs
index 8c6adceec0..7e5225e46b 100644
--- a/main/src/addins/Xml/Completion/EmptyXmlCompletionProvider.cs
+++ b/main/src/addins/Xml/Completion/EmptyXmlCompletionProvider.cs
@@ -26,50 +26,52 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;
 
 namespace MonoDevelop.Xml.Completion
 {
 	public class EmptyXmlCompletionProvider : IXmlCompletionProvider
 	{
-		public CompletionDataList GetElementCompletionData ()
+		public Task<CompletionDataList> GetElementCompletionData (CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 
-		public CompletionDataList GetElementCompletionData (string namespacePrefix)
+		public Task<CompletionDataList> GetElementCompletionData (string namespacePrefix, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 
-		public CompletionDataList GetChildElementCompletionData (XmlElementPath path)
+		public Task<CompletionDataList> GetChildElementCompletionData (XmlElementPath path, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 
-		public CompletionDataList GetAttributeCompletionData (XmlElementPath path)
+		public Task<CompletionDataList> GetAttributeCompletionData (XmlElementPath path, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 
-		public CompletionDataList GetAttributeValueCompletionData (XmlElementPath path, string name)
+		public Task<CompletionDataList> GetAttributeValueCompletionData (XmlElementPath path, string name, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 
-		public CompletionDataList GetChildElementCompletionData (string tagName)
+		public Task<CompletionDataList> GetChildElementCompletionData (string tagName, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 
-		public CompletionDataList GetAttributeCompletionData (string tagName)
+		public Task<CompletionDataList> GetAttributeCompletionData (string tagName, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 
-		public CompletionDataList GetAttributeValueCompletionData (string tagName, string name)
+		public Task<CompletionDataList> GetAttributeValueCompletionData (string tagName, string name, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 	}
 }
diff --git a/main/src/addins/Xml/Completion/IXmlCompletionProvider.cs b/main/src/addins/Xml/Completion/IXmlCompletionProvider.cs
index 95251d5b73..a065ad9e54 100644
--- a/main/src/addins/Xml/Completion/IXmlCompletionProvider.cs
+++ b/main/src/addins/Xml/Completion/IXmlCompletionProvider.cs
@@ -27,6 +27,8 @@
 //
 
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Xml.Editor;
 
@@ -34,15 +36,15 @@ namespace MonoDevelop.Xml.Completion
 {
 	public interface IXmlCompletionProvider
 	{
-		CompletionDataList GetElementCompletionData ();
-		CompletionDataList GetElementCompletionData (string namespacePrefix);
+		Task<CompletionDataList> GetElementCompletionData (CancellationToken token);
+		Task<CompletionDataList> GetElementCompletionData (string namespacePrefix, CancellationToken token);
 		
-		CompletionDataList GetChildElementCompletionData (XmlElementPath path);
-		CompletionDataList GetAttributeCompletionData (XmlElementPath path);
-		CompletionDataList GetAttributeValueCompletionData (XmlElementPath path, string name);
+		Task<CompletionDataList> GetChildElementCompletionData (XmlElementPath path, CancellationToken token);
+		Task<CompletionDataList> GetAttributeCompletionData (XmlElementPath path, CancellationToken token);
+		Task<CompletionDataList> GetAttributeValueCompletionData (XmlElementPath path, string name, CancellationToken token);
 		
-		CompletionDataList GetChildElementCompletionData (string tagName);
-		CompletionDataList GetAttributeCompletionData (string tagName);
-		CompletionDataList GetAttributeValueCompletionData (string tagName, string name);
+		Task<CompletionDataList> GetChildElementCompletionData (string tagName, CancellationToken token);
+		Task<CompletionDataList> GetAttributeCompletionData (string tagName, CancellationToken token);
+		Task<CompletionDataList> GetAttributeValueCompletionData (string tagName, string name, CancellationToken token);
 	}
 }
diff --git a/main/src/addins/Xml/Completion/InferredXmlCompletionProvider.cs b/main/src/addins/Xml/Completion/InferredXmlCompletionProvider.cs
index e1c361f76b..839dfb4330 100644
--- a/main/src/addins/Xml/Completion/InferredXmlCompletionProvider.cs
+++ b/main/src/addins/Xml/Completion/InferredXmlCompletionProvider.cs
@@ -26,6 +26,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Xml.Dom;
 
@@ -67,60 +69,60 @@ namespace MonoDevelop.Xml.Completion
 			}
 		}
 		
-		public CompletionDataList GetElementCompletionData ()
+		public Task<CompletionDataList> GetElementCompletionData (CancellationToken token)
 		{
-			return GetChildElementCompletionData ("");
+			return GetChildElementCompletionData ("", token);
 		}
 		
-		public CompletionDataList GetElementCompletionData (string namespacePrefix)
+		public Task<CompletionDataList> GetElementCompletionData (string namespacePrefix, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 		
-		public CompletionDataList GetChildElementCompletionData (XmlElementPath path)
+		public Task<CompletionDataList> GetChildElementCompletionData (XmlElementPath path, CancellationToken token)
 		{
 			return GetCompletions (elementCompletions, path, XmlCompletionData.DataType.XmlElement);
 		}
 		
-		public CompletionDataList GetAttributeCompletionData (XmlElementPath path)
+		public Task<CompletionDataList> GetAttributeCompletionData (XmlElementPath path, CancellationToken token)
 		{
 			return GetCompletions (attributeCompletions, path, XmlCompletionData.DataType.XmlAttribute);
 		}
 		
-		public CompletionDataList GetAttributeValueCompletionData (XmlElementPath path, string name)
+		public Task<CompletionDataList> GetAttributeValueCompletionData (XmlElementPath path, string name, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 		
-		public CompletionDataList GetChildElementCompletionData (string tagName)
+		public Task<CompletionDataList> GetChildElementCompletionData (string tagName, CancellationToken token)
 		{
 			return GetCompletions (elementCompletions, tagName, XmlCompletionData.DataType.XmlElement);
 		}
 		
-		public CompletionDataList GetAttributeCompletionData (string tagName)
+		public Task<CompletionDataList> GetAttributeCompletionData (string tagName, CancellationToken token)
 		{
 			return GetCompletions (attributeCompletions, tagName, XmlCompletionData.DataType.XmlAttribute);
 		}
 		
-		public CompletionDataList GetAttributeValueCompletionData (string tagName, string name)
+		public Task<CompletionDataList> GetAttributeValueCompletionData (string tagName, string name, CancellationToken token)
 		{
-			return new CompletionDataList ();
+			return Task.FromResult (new CompletionDataList ());
 		}
 		
-		static CompletionDataList GetCompletions (Dictionary<string,HashSet<string>> map, string tagName, XmlCompletionData.DataType type)
+		static Task<CompletionDataList> GetCompletions (Dictionary<string,HashSet<string>> map, string tagName, XmlCompletionData.DataType type)
 		{
 			var data = new CompletionDataList ();
 			HashSet<string> values;
 			if (map.TryGetValue (tagName, out values))
 				foreach (string s in values)
 					data.Add (new XmlCompletionData (s, type));
-			return data;
+			return Task.FromResult (data);
 		}
 		
-		static CompletionDataList GetCompletions (Dictionary<string,HashSet<string>> map, XmlElementPath path, XmlCompletionData.DataType type)
+		static Task<CompletionDataList> GetCompletions (Dictionary<string,HashSet<string>> map, XmlElementPath path, XmlCompletionData.DataType type)
 		{
 			if (path == null || path.Elements.Count == 0)
-				return new CompletionDataList ();
+				return Task.FromResult (new CompletionDataList ());
 			return GetCompletions (map, path.Elements[path.Elements.Count - 1].Name, type);
 		}
 	}
diff --git a/main/src/addins/Xml/Completion/XmlCompletionData.cs b/main/src/addins/Xml/Completion/XmlCompletionData.cs
index c3c77f6e94..7590f535f9 100644
--- a/main/src/addins/Xml/Completion/XmlCompletionData.cs
+++ b/main/src/addins/Xml/Completion/XmlCompletionData.cs
@@ -22,15 +22,20 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 
-using System;
-using Gdk;

-using Mono.TextEditor;

+using Gdk;
+using Gtk;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.CodeCompletion;

+using System;

 using MonoDevelop.Core;

+using MonoDevelop.Ide.Gui.Content;

 using MonoDevelop.Ide;

 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Ide.Commands;

 using MonoDevelop.Ide.Gui.Content;

 using MonoDevelop.Xml.Editor;

+using MonoDevelop.Ide.Editor.Extension;

+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.Xml.Completion

 {

@@ -104,18 +109,23 @@ namespace MonoDevelop.Xml.Completion
 			}
 		}

 

-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, ModifierType modifier)

+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)

 		{

 			if (XmlEditorOptions.AutoInsertFragments && dataType == DataType.XmlAttribute) {

-				var textEditorDataProvier = window.CompletionWidget as ITextEditorDataProvider;

-				var textBuffer = window.CompletionWidget as ITextBuffer;

-				base.InsertCompletionText (window, ref ka, closeChar, keyChar, modifier);

-				if (textEditorDataProvier != null && textBuffer != null)

-					textEditorDataProvier.GetTextEditorData ().SetSkipChar (textBuffer.CursorPosition, '"');

-				IdeApp.CommandService.DispatchCommand (TextEditorCommands.ShowCompletionWindow);

+				//This temporary variable is needed because

+				//base.InsertCompletionText sets window.CompletionWidget to null

+				var completionWidget = window.CompletionWidget;

+				base.InsertCompletionText (window, ref ka, descriptor);

+				if (completionWidget is ITextEditorImpl) {

+					((ITextEditorImpl)completionWidget).EditorExtension.Editor.StartSession (new SkipCharSession ('"'));

+				}

+

+				//Even if we are on UI thread call Application.Invoke to postpone calling command

+				//otherwise code calling InsertCompletionText will close completion window created by this command

+				Application.Invoke ((s,e) => IdeApp.CommandService.DispatchCommand (TextEditorCommands.ShowCompletionWindow));

 				ka &= ~KeyActions.CloseWindow;

 			} else {

-				base.InsertCompletionText (window, ref ka, closeChar, keyChar, modifier);

+				base.InsertCompletionText (window, ref ka, descriptor);

 			}

 		}

 		

diff --git a/main/src/addins/Xml/Completion/XmlSchemaCompletionData.cs b/main/src/addins/Xml/Completion/XmlSchemaCompletionData.cs
index 6a52d9ffc3..aef67ce072 100644
--- a/main/src/addins/Xml/Completion/XmlSchemaCompletionData.cs
+++ b/main/src/addins/Xml/Completion/XmlSchemaCompletionData.cs
@@ -1,29 +1,31 @@
-//

-// MonoDevelop XML Editor

-//

+//
+// MonoDevelop XML Editor
+//
 // Copyright (C) 2005 Matthew Ward
-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-// 

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 using System;

 using System.IO;

 using System.Linq;

+using System.Threading;
+using System.Threading.Tasks;
 using System.Xml;

 using System.Xml.Schema;

 using MonoDevelop.Ide.CodeCompletion;

@@ -147,34 +149,41 @@ namespace MonoDevelop.Xml.Completion
 		

 		public bool IsLoaded {

 			get { return loaded; }

-		}

-		
-		public void EnsureLoaded ()

+		}
+
+		public void EnsureLoaded ()
+		{
+			EnsureLoadedAsync ().Wait ();
+		}
+
+		public Task EnsureLoadedAsync ()

 		{

 			if (loaded)

-				return;

-			

-			if (schema == null)

-				using (StreamReader reader = new StreamReader (fileName, true))

-					ReadSchema (baseUri, reader);

-			

-			//TODO: should we evaluate unresolved imports against other registered schemas?

-			//will be messy because we'll have to re-evaluate if any schema is added, removed or changes

-			//maybe we should just force users to use schemaLocation in their includes

-			var sset = new XmlSchemaSet ();

-			sset.XmlResolver = new LocalOnlyXmlResolver ();

-			sset.Add (schema);

-			sset.ValidationEventHandler += SchemaValidation;

-			sset.Compile ();

-			loaded = true;

+				return Task.FromResult (0);

+
+			return Task.Run (() => {
+				if (schema == null)
+					using (StreamReader reader = new StreamReader (fileName, true))
+						ReadSchema (baseUri, reader);
+
+				//TODO: should we evaluate unresolved imports against other registered schemas?
+				//will be messy because we'll have to re-evaluate if any schema is added, removed or changes
+				//maybe we should just force users to use schemaLocation in their includes
+				var sset = new XmlSchemaSet ();
+				sset.XmlResolver = new LocalOnlyXmlResolver ();
+				sset.Add (schema);
+				sset.ValidationEventHandler += SchemaValidation;
+				sset.Compile ();
+				loaded = true;
+			});

 		}

 		#endregion

 		

 		#region Simplified API, useful for e.g. HTML

 		

-		public CompletionDataList GetChildElementCompletionData (string tagName)

+		public async Task<CompletionDataList> GetChildElementCompletionData (string tagName, CancellationToken token)

 		{

-			EnsureLoaded ();

+			await EnsureLoadedAsync ();

 			

 			var list = new XmlCompletionDataList ();

 			var element = FindElement (tagName);

@@ -183,9 +192,9 @@ namespace MonoDevelop.Xml.Completion
 			return list;

 		}

 		

-		public CompletionDataList GetAttributeCompletionData (string tagName)

+		public async Task<CompletionDataList> GetAttributeCompletionData (string tagName, CancellationToken token)

 		{

-			EnsureLoaded ();

+			await EnsureLoadedAsync ();

 			

 			var list = new XmlCompletionDataList ();

 			var element = FindElement (tagName);

@@ -196,9 +205,9 @@ namespace MonoDevelop.Xml.Completion
 			return list;

 		}

 		
-		public CompletionDataList GetAttributeValueCompletionData (string tagName, string name)

+		public async Task<CompletionDataList> GetAttributeValueCompletionData (string tagName, string name, CancellationToken token)

 		{

-			EnsureLoaded ();

+			await EnsureLoadedAsync ();

 			

 			var list = new XmlCompletionDataList ();

 			var element = FindElement (tagName);

@@ -212,17 +221,17 @@ namespace MonoDevelop.Xml.Completion
 		/// <summary>

 		/// Gets the possible root elements for an xml document using this schema.

 		/// </summary>

-		public CompletionDataList GetElementCompletionData ()

+		public Task<CompletionDataList> GetElementCompletionData (CancellationToken token)

 		{

-			return GetElementCompletionData ("");

+			return GetElementCompletionData ("", token);

 		}

 		

 		/// <summary>

 		/// Gets the possible root elements for an xml document using this schema.

 		/// </summary>

-		public CompletionDataList GetElementCompletionData (string namespacePrefix)

+		public async Task<CompletionDataList> GetElementCompletionData (string namespacePrefix, CancellationToken token)

 		{
-			EnsureLoaded ();

+			await EnsureLoadedAsync ();

 			

 			var data = new XmlCompletionDataList ();

 			foreach (XmlSchemaElement element in schema.Elements.Values) {

@@ -239,9 +248,9 @@ namespace MonoDevelop.Xml.Completion
 		/// Gets the attribute completion data for the xml element that exists

 		/// at the end of the specified path.

 		/// </summary>

-		public CompletionDataList GetAttributeCompletionData (XmlElementPath path)

+		public async Task<CompletionDataList> GetAttributeCompletionData (XmlElementPath path, CancellationToken token)

 		{
-			EnsureLoaded ();

+			await EnsureLoadedAsync ();

 			

 			var data = new XmlCompletionDataList (path.Namespaces);

 			var element = FindElement (path);

@@ -256,9 +265,9 @@ namespace MonoDevelop.Xml.Completion
 		/// Gets the child element completion data for the xml element that exists

 		/// at the end of the specified path.

 		/// </summary>

-		public CompletionDataList GetChildElementCompletionData (XmlElementPath path)

+		public async Task<CompletionDataList> GetChildElementCompletionData (XmlElementPath path, CancellationToken token)

 		{
-			EnsureLoaded ();

+			await EnsureLoadedAsync ();

 			

 			var data = new XmlCompletionDataList (path.Namespaces);

 			var element = FindElement (path);

@@ -272,9 +281,9 @@ namespace MonoDevelop.Xml.Completion
 		/// <summary>

 		/// Gets the autocomplete data for the specified attribute value.

 		/// </summary>

-		public CompletionDataList GetAttributeValueCompletionData (XmlElementPath path, string name)

+		public async Task<CompletionDataList> GetAttributeValueCompletionData (XmlElementPath path, string name, CancellationToken token)

 		{
-			EnsureLoaded ();

+			await EnsureLoadedAsync ();

 			

 			var data = new XmlCompletionDataList (path.Namespaces);

 			var element = FindElement (path);

diff --git a/main/src/addins/Xml/Completion/XmlTagCompletionData.cs b/main/src/addins/Xml/Completion/XmlTagCompletionData.cs
index befc32f068..e0d08b5ef2 100644
--- a/main/src/addins/Xml/Completion/XmlTagCompletionData.cs
+++ b/main/src/addins/Xml/Completion/XmlTagCompletionData.cs
@@ -31,6 +31,7 @@ using System;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Core;
+using MonoDevelop.Ide.Editor.Extension;
 
 namespace MonoDevelop.Xml.Completion
 {
@@ -66,20 +67,17 @@ namespace MonoDevelop.Xml.Completion
 			get { return element; }
 		}
 		
-		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier)
+		public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, KeyDescriptor descriptor)
 		{
-			IEditableTextBuffer buf = window.CompletionWidget as IEditableTextBuffer;
+			var buf = window.CompletionWidget;
 			if (buf != null) {
 				//completion context gets nulled from window as soon as we alter the buffer
 				var codeCompletionContext = window.CodeCompletionContext;
 
-				using (var undo = buf.OpenUndoGroup ()) {
-					buf.InsertText (buf.CursorPosition, element);
+				buf.Replace (buf.CaretOffset, 0, element);
 					
-					// Move caret into the middle of the tags
-					buf.CursorPosition = codeCompletionContext.TriggerOffset + cursorOffset;
-					buf.Select (buf.CursorPosition, buf.CursorPosition);
-				}

+				// Move caret into the middle of the tags
+				buf.CaretOffset = codeCompletionContext.TriggerOffset + cursorOffset;
 			}
 		}
 	}
diff --git a/main/src/addins/Xml/Dom/XAttribute.cs b/main/src/addins/Xml/Dom/XAttribute.cs
index f34f456727..c82a8e7a8b 100644
--- a/main/src/addins/Xml/Dom/XAttribute.cs
+++ b/main/src/addins/Xml/Dom/XAttribute.cs
@@ -23,21 +23,20 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

-
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XAttribute : XObject, INamedXObject
 	{
 
-		public XAttribute (TextLocation start, XName name, string value) : base (start)
+		public XAttribute (DocumentLocation start, XName name, string value) : base (start)
 		{
 			this.Name = name;
 			this.Value = value;
 		}
 
-		public XAttribute (TextLocation start) : base (start)
+		public XAttribute (DocumentLocation start) : base (start)
 		{
 		}
 
diff --git a/main/src/addins/Xml/Dom/XCData.cs b/main/src/addins/Xml/Dom/XCData.cs
index 001f80521b..f850d91cec 100644
--- a/main/src/addins/Xml/Dom/XCData.cs
+++ b/main/src/addins/Xml/Dom/XCData.cs
@@ -24,15 +24,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XCData : XNode
 	{
-		public XCData (TextLocation start) : base (start) {}
-		public XCData (DomRegion region) : base (region) {}
+		public XCData (DocumentLocation start) : base (start) {}
+		public XCData (DocumentRegion region) : base (region) {}
 
 		protected XCData () {}
 		protected override XObject NewInstance () { return new XCData (); }
diff --git a/main/src/addins/Xml/Dom/XClosingTag.cs b/main/src/addins/Xml/Dom/XClosingTag.cs
index c134dea6a4..3973ad2ab8 100644
--- a/main/src/addins/Xml/Dom/XClosingTag.cs
+++ b/main/src/addins/Xml/Dom/XClosingTag.cs
@@ -24,15 +24,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XClosingTag : XNode, INamedXObject
 	{
-		public XClosingTag (TextLocation start) : base (start) {}
+		public XClosingTag (DocumentLocation start) : base (start) {}
 
-		public XClosingTag (XName name, TextLocation start) : base (start)
+		public XClosingTag (XName name, DocumentLocation start) : base (start)
 		{
 			this.Name = name;
 		}
diff --git a/main/src/addins/Xml/Dom/XComment.cs b/main/src/addins/Xml/Dom/XComment.cs
index 57231b974f..08a7998065 100644
--- a/main/src/addins/Xml/Dom/XComment.cs
+++ b/main/src/addins/Xml/Dom/XComment.cs
@@ -23,16 +23,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

-
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XComment : XNode
 	{
-		public XComment (TextLocation start) : base (start) {}
-		public XComment (DomRegion region) : base (region) {}
+		public XComment (DocumentLocation start) : base (start) {}
+		public XComment (DocumentRegion region) : base (region) {}
 
 		protected XComment () {}
 		protected override XObject NewInstance () { return new XComment (); }
diff --git a/main/src/addins/Xml/Dom/XContainer.cs b/main/src/addins/Xml/Dom/XContainer.cs
index 997def1ad0..dd6e0c10fd 100644
--- a/main/src/addins/Xml/Dom/XContainer.cs
+++ b/main/src/addins/Xml/Dom/XContainer.cs
@@ -25,14 +25,14 @@
 // THE SOFTWARE.

 
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.NRefactory;
+using System.Text;

+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public abstract class XContainer : XNode
 	{
-		protected XContainer (TextLocation start) : base (start) {	}
+		protected XContainer (DocumentLocation start) : base (start) {	}
 
 		XNode firstNode;
 		XNode lastChild;
diff --git a/main/src/addins/Xml/Dom/XDocType.cs b/main/src/addins/Xml/Dom/XDocType.cs
index ff29a31322..a91f85be96 100644
--- a/main/src/addins/Xml/Dom/XDocType.cs
+++ b/main/src/addins/Xml/Dom/XDocType.cs
@@ -24,15 +24,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XDocType : XNode, INamedXObject
 	{
-		public XDocType (TextLocation start) : base (start) {}
-		public XDocType (DomRegion region) : base (region) {}
+		public XDocType (DocumentLocation start) : base (start) {}
+		public XDocType (DocumentRegion region) : base (region) {}
 
 		protected XDocType () {}
 		protected override XObject NewInstance () { return new XDocType (); }
@@ -40,7 +39,7 @@ namespace MonoDevelop.Xml.Dom
 		public XName RootElement { get; set; }
 		public string PublicFpi { get; set; }
 		public bool IsPublic { get { return PublicFpi != null; } }
-		public DomRegion InternalDeclarationRegion { get; set; }
+		public DocumentRegion InternalDeclarationRegion { get; set; }
 		public string Uri { get; set; }
 
 		public override string FriendlyPathRepresentation {
diff --git a/main/src/addins/Xml/Dom/XDocument.cs b/main/src/addins/Xml/Dom/XDocument.cs
index dc6cfafccc..2425c065c7 100644
--- a/main/src/addins/Xml/Dom/XDocument.cs
+++ b/main/src/addins/Xml/Dom/XDocument.cs
@@ -24,8 +24,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using System;
-using ICSharpCode.NRefactory;
+using System;

+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
@@ -33,7 +33,7 @@ namespace MonoDevelop.Xml.Dom
 	{
 		public XElement RootElement { get; private set; }
 
-		public XDocument () : base (new TextLocation (1, 1)) {}
+		public XDocument () : base (new DocumentLocation (1, 1)) {}
 		protected override XObject NewInstance () { return new XDocument (); }
 
 		public override string FriendlyPathRepresentation {
diff --git a/main/src/addins/Xml/Dom/XElement.cs b/main/src/addins/Xml/Dom/XElement.cs
index a49a2b81d4..81ff5eceba 100644
--- a/main/src/addins/Xml/Dom/XElement.cs
+++ b/main/src/addins/Xml/Dom/XElement.cs
@@ -25,8 +25,8 @@
 // THE SOFTWARE.

 
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.NRefactory;
+using System.Text;

+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
@@ -35,12 +35,12 @@ namespace MonoDevelop.Xml.Dom
 		XNode closingTag;
 		readonly XAttributeCollection attributes;
 
-		public XElement (TextLocation start) : base (start)
+		public XElement (DocumentLocation start) : base (start)
 		{
 			attributes = new XAttributeCollection (this);
 		}
 
-		public XElement (TextLocation start, XName name) : this (start)
+		public XElement (DocumentLocation start, XName name) : this (start)
 		{
 			this.Name = name;
 		}
diff --git a/main/src/addins/Xml/Dom/XNode.cs b/main/src/addins/Xml/Dom/XNode.cs
index d98b02b761..37fd74d643 100644
--- a/main/src/addins/Xml/Dom/XNode.cs
+++ b/main/src/addins/Xml/Dom/XNode.cs
@@ -24,15 +24,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

 
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public abstract class XNode : XObject
 	{
-		protected XNode (TextLocation start) : base (start) {}
-		protected XNode (DomRegion region) : base (region) {}
+		protected XNode (DocumentLocation start) : base (start) {}
+		protected XNode (DocumentRegion region) : base (region) {}
 		protected XNode () {}
 
 		public XNode NextSibling { get; internal protected set; }
diff --git a/main/src/addins/Xml/Dom/XObject.cs b/main/src/addins/Xml/Dom/XObject.cs
index f999256eea..c55d3e3742 100644
--- a/main/src/addins/Xml/Dom/XObject.cs
+++ b/main/src/addins/Xml/Dom/XObject.cs
@@ -25,22 +25,21 @@
 // THE SOFTWARE.

 
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using System.Text;

+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Dom
 {
 	public abstract class XObject
 	{
-		DomRegion region;
+		DocumentRegion region;
 
-		protected XObject (TextLocation start)
+		protected XObject (DocumentLocation start)
 		{
-			region = new DomRegion (start, TextLocation.Empty);
+			region = new DocumentRegion (start, DocumentLocation.Empty);
 		}
 
-		protected XObject (DomRegion region)
+		protected XObject (DocumentRegion region)
 		{
 			this.region = region;
 		}
@@ -57,13 +56,13 @@ namespace MonoDevelop.Xml.Dom
 			}
 		}
 
-		public DomRegion Region {
+		public DocumentRegion Region {
 			get { return region; }
 		}
 
-		public void End (TextLocation endLocation)
+		public void End (DocumentLocation endLocation)
 		{
-			region = new DomRegion (region.Begin, endLocation);
+			region = new DocumentRegion (region.Begin, endLocation);
 		}
 
 		public bool IsEnded {
diff --git a/main/src/addins/Xml/Dom/XProcessingInstruction.cs b/main/src/addins/Xml/Dom/XProcessingInstruction.cs
index 9089897116..03d907fe62 100644
--- a/main/src/addins/Xml/Dom/XProcessingInstruction.cs
+++ b/main/src/addins/Xml/Dom/XProcessingInstruction.cs
@@ -23,16 +23,14 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 // THE SOFTWARE.

-
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
+using MonoDevelop.Ide.Editor;

 
 namespace MonoDevelop.Xml.Dom
 {
 	public class XProcessingInstruction : XNode
 	{
-		public XProcessingInstruction (TextLocation start) : base (start) {}
-		public XProcessingInstruction (DomRegion region) : base (region) {}
+		public XProcessingInstruction (DocumentLocation start) : base (start) {}
+		public XProcessingInstruction (DocumentRegion region) : base (region) {}
 
 		protected XProcessingInstruction () {}
 		protected override XObject NewInstance () { return new XProcessingInstruction (); }
diff --git a/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs b/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
index 0258e22974..e135de5e60 100644
--- a/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
+++ b/main/src/addins/Xml/Editor/BaseXmlEditorExtension.cs
@@ -34,10 +34,7 @@ using System.Linq;
 
 using Gtk;
 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 
-using Mono.TextEditor;
 using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.DesignerSupport;
@@ -45,10 +42,16 @@ using MonoDevelop.Ide;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Editor.Extension;
 using MonoDevelop.Projects;
 using MonoDevelop.Xml.Completion;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
+using System.Threading.Tasks;
+using System.Threading;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide.Commands;
 
 namespace MonoDevelop.Xml.Editor
 {
@@ -65,18 +68,17 @@ namespace MonoDevelop.Xml.Editor
 
 		#region Setup and teardown
 
-		public override bool ExtendsEditor (MonoDevelop.Ide.Gui.Document doc, IEditableTextBuffer editor)
+		public override bool IsValidInContext (DocumentContext context)
 		{
 			//can only attach if there is not already an attached BaseXmlEditorExtension
-			return doc.GetContent<BaseXmlEditorExtension> () == null;
+			return context.GetContent<BaseXmlEditorExtension> () == null;
 		}
 		
 		protected virtual XmlRootState CreateRootState ()
 		{
 			return new XmlRootState ();
 		}
-
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 
@@ -89,11 +91,11 @@ namespace MonoDevelop.Xml.Editor
 
 			var parser = new XmlParser (CreateRootState (), false);
 			tracker = new DocumentStateTracker<XmlParser> (parser, Editor);
+			DocumentContext.DocumentParsed += UpdateParsedDocument;
+			Editor.CaretPositionChanged += HandleCaretPositionChanged;
 
-			Document.DocumentParsed += UpdateParsedDocument;
-			
-			if (Document.ParsedDocument != null) {
-				lastCU = Document.ParsedDocument;
+			if (DocumentContext.ParsedDocument != null) {
+				lastCU = DocumentContext.ParsedDocument;
 				OnParsedDocumentUpdated ();
 			}
 
@@ -105,7 +107,7 @@ namespace MonoDevelop.Xml.Editor
 
 		void HandleProjectChanged (object sender, ProjectFileEventArgs e)
 		{
-			if (e.Any (f => f.ProjectFile.FilePath == Document.FileName))
+			if (e.Any (f => f.ProjectFile.FilePath == DocumentContext.Name))
 				UpdateOwnerProjects ();
 		}
 
@@ -115,42 +117,52 @@ namespace MonoDevelop.Xml.Editor
 				ownerProjects = new List<DotNetProject> ();
 				return;
 			}
-			var projects = new HashSet<DotNetProject> (IdeApp.Workspace.GetAllSolutionItems<DotNetProject> ().Where (p => p.IsFileInProject (Document.FileName)));
+			if (DocumentContext == null) {
+				return;//This can happen if this object is disposed
+			}
+			var projects = new HashSet<DotNetProject> (IdeApp.Workspace.GetAllItems<DotNetProject> ().Where (p => p.IsFileInProject (DocumentContext.Name)));
 			if (ownerProjects == null || !projects.SetEquals (ownerProjects)) {
 				ownerProjects = projects.OrderBy (p => p.Name).ToList ();
-				var dnp = Document.Project as DotNetProject;
+				var dnp = DocumentContext.Project as DotNetProject;
 				if (ownerProjects.Count > 0 && (dnp == null || !ownerProjects.Contains (dnp))) {
 					// If the project for the document is not a DotNetProject but there is a project containing this file
 					// in the current solution, then use that project
-					var pp = Document.Project != null ? ownerProjects.FirstOrDefault (p => p.ParentSolution == Document.Project.ParentSolution) : null;
+					var pp = DocumentContext.Project != null ? ownerProjects.FirstOrDefault (p => p.ParentSolution == DocumentContext.Project.ParentSolution) : null;
 					if (pp != null)
-						Document.AttachToProject (pp);
+						DocumentContext.AttachToProject (pp);
 				}
 			}
-			if (Document.Project == null && ownerProjects.Count > 0)
-				Document.AttachToProject (ownerProjects[0]);
+			if (DocumentContext == null) {
+				return;//This can happen if this object is disposed, which is likely to happen in DocumentContext.AttachToProject (pp);
+			}
+			if (DocumentContext.Project == null && ownerProjects.Count > 0)
+				DocumentContext.AttachToProject (ownerProjects[0]);
 			UpdatePath ();
 		}
 
 		void UpdateParsedDocument (object sender, EventArgs args)
 		{
-			lastCU = Document.ParsedDocument;
+			lastCU = DocumentContext.ParsedDocument;
 			OnParsedDocumentUpdated ();
 		}
 
 		public override void Dispose ()
 		{
+			Editor.CaretPositionChanged -= HandleCaretPositionChanged;
+
 			if (tracker != null) {
+				tracker.Dispose ();
 				tracker = null;
-				base.Dispose ();
 			}
 
-			Document.DocumentParsed -= UpdateParsedDocument;
+			DocumentContext.DocumentParsed -= UpdateParsedDocument;
 
 			if (IdeApp.Workspace != null) {
 				IdeApp.Workspace.FileAddedToProject -= HandleProjectChanged;
 				IdeApp.Workspace.FileRemovedFromProject -= HandleProjectChanged;
 			}
+
+			base.Dispose ();
 		}
 
 		protected virtual void OnParsedDocumentUpdated ()
@@ -183,34 +195,17 @@ namespace MonoDevelop.Xml.Editor
 		protected ParsedDocument CU {
 			get { return lastCU; }
 		}
-		
-		protected ITextBuffer Buffer {
-			get {
-				if (Document == null)
-					throw new InvalidOperationException ("Editor extension not yet initialized");
-				return Document.GetContent<ITextBuffer> ();
-			}
-		}
-		
-		protected IEditableTextBuffer EditableBuffer {
-			get {
-				if (Document == null)
-					throw new InvalidOperationException ("Editor extension not yet initialized");
-				return Document.GetContent<IEditableTextBuffer> ();
-			}
-		}
-		
+
 		protected DocumentStateTracker<XmlParser> Tracker {
 			get { return tracker; }
 		}
 		
-		protected string GetBufferText (DomRegion region)
+		protected string GetBufferText (DocumentRegion region)
 		{
-			ITextBuffer buf = Buffer;
-			int start = buf.GetPositionFromLineColumn (region.BeginLine, region.BeginColumn);
-			int end = buf.GetPositionFromLineColumn (region.EndLine, region.EndColumn);
+			int start = Editor.LocationToOffset (region.BeginLine, region.BeginColumn);
+			int end = Editor.LocationToOffset (region.EndLine, region.EndColumn);
 			if (end > start && start >= 0)
-				return buf.GetText (start, end);
+				return Editor.GetTextBetween (start, end);
 			return null;
 		}
 		
@@ -219,7 +214,12 @@ namespace MonoDevelop.Xml.Editor
 		public override string CompletionLanguage {
 			get { return "Xml"; }
 		}
-		
+
+		protected FilePath FileName {
+			get {
+				return Editor.FileName;
+			}
+		}
 		protected XDocType DocType {
 			get { return docType; }
 			set {
@@ -234,63 +234,55 @@ namespace MonoDevelop.Xml.Editor
 		{
 		}
 		
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
-			if (Document.Editor.Options.IndentStyle == IndentStyle.Smart) {
-				var newLine = Editor.Caret.Line + 1;
-				var ret = base.KeyPress (key, keyChar, modifier);
-				if (key == Gdk.Key.Return && Editor.Caret.Line == newLine) {
+			if (Editor.Options.IndentStyle == IndentStyle.Smart) {
+				var newLine = Editor.CaretLine + 1;
+				var ret = base.KeyPress (descriptor);
+				if (descriptor.SpecialKey == SpecialKey.Return && Editor.CaretLine == newLine) {
 					string indent = GetLineIndent (newLine);
 					var oldIndent = Editor.GetLineIndent (newLine);
 					var seg = Editor.GetLine (newLine);
 					if (oldIndent != indent) {
-						int newCaretOffset = Editor.Caret.Offset;
-						if (newCaretOffset > seg.Offset) {
-							newCaretOffset += (indent.Length - oldIndent.Length);
-						}
 						using (var undo = Editor.OpenUndoGroup ()) {
-							Editor.Replace (seg.Offset, oldIndent.Length, indent);
-							Editor.Caret.Offset = newCaretOffset;
+							Editor.ReplaceText (seg.Offset, oldIndent.Length, indent);
 						}
 					}
 				}
 				return ret;
 			}
-			return base.KeyPress (key, keyChar, modifier);
+			return base.KeyPress (descriptor);
 		}
 		
 		#region Code completion
 
-		public override ICompletionDataList CodeCompletionCommand (CodeCompletionContext completionContext)
+		public override Task<ICompletionDataList> CodeCompletionCommand (CodeCompletionContext completionContext)
 		{
 			int pos = completionContext.TriggerOffset;
 			if (pos <= 0)
 				return null;
-			int triggerWordLength = 0;
-			
 			tracker.UpdateEngine ();
-			return HandleCodeCompletion (completionContext, true, ref triggerWordLength);
+			return HandleCodeCompletion (completionContext, true, default(CancellationToken));
 		}
 
-		public override ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, char completionChar, ref int triggerWordLength)
+		public override Task<ICompletionDataList> HandleCodeCompletionAsync (CodeCompletionContext completionContext, char completionChar, CancellationToken token = default(CancellationToken))
 		{
 			int pos = completionContext.TriggerOffset;
 			char ch = CompletionWidget != null ? CompletionWidget.GetChar (pos - 1) : Editor.GetCharAt (pos - 1);
 			if (pos > 0 && ch == completionChar) {
 				tracker.UpdateEngine ();
-				return HandleCodeCompletion (completionContext, false, ref triggerWordLength);
+				return HandleCodeCompletion (completionContext, false, token);
 			}
 			return null;
 		}
 
-		protected virtual ICompletionDataList HandleCodeCompletion (
-		    CodeCompletionContext completionContext, bool forced, ref int triggerWordLength)
+		protected virtual async Task<ICompletionDataList> HandleCodeCompletion (
+			CodeCompletionContext completionContext, bool forced, CancellationToken token)
 		{
-			IEditableTextBuffer buf = EditableBuffer;
+			var buf = this.Editor;
 
 			// completionChar may be a space even if the current char isn't, when ctrl-space is fired t
-			var currentLocation = new TextLocation (completionContext.TriggerLine, completionContext.TriggerLineOffset);
+			var currentLocation = new DocumentLocation (completionContext.TriggerLine, completionContext.TriggerLineOffset);
 			char currentChar = completionContext.TriggerOffset < 1? ' ' : buf.GetCharAt (completionContext.TriggerOffset - 1);
 			char previousChar = completionContext.TriggerOffset < 2? ' ' : buf.GetCharAt (completionContext.TriggerOffset - 2);
 
@@ -299,13 +291,13 @@ namespace MonoDevelop.Xml.Editor
 				tracker.Engine.CurrentStateLength, previousChar, currentChar, forced);
 			
 			//closing tag completion
-			if (tracker.Engine.CurrentState is XmlRootState && currentChar == '>')

+			if (tracker.Engine.CurrentState is XmlRootState && currentChar == '>')
 				return ClosingTagCompletion (buf, currentLocation);
 			
 			// Auto insert '>' when '/' is typed inside tag state (for quick tag closing)
 			//FIXME: avoid doing this when the next non-whitespace char is ">" or ignore the next ">" typed
 			if (XmlEditorOptions.AutoInsertFragments && tracker.Engine.CurrentState is XmlTagState && currentChar == '/') {
-				buf.InsertText (buf.CursorPosition, ">");
+				buf.InsertAtCaret (">");
 				return null;
 			}
 			
@@ -330,14 +322,15 @@ namespace MonoDevelop.Xml.Editor
 				list.Add (">").CompletionText = "gt;";
 				list.Add ("&").CompletionText = "amp;";
 				
-				GetEntityCompletions (list);
+				var ecList = await GetEntityCompletions (token);
+				list.AddRange (ecList);
 				return list;
 			}
 			
 			//doctype completion
 			if (tracker.Engine.CurrentState is XmlDocTypeState) {
 				if (tracker.Engine.CurrentStateLength == 1) {
-					CompletionDataList list = GetDocTypeCompletions ();
+					CompletionDataList list = await GetDocTypeCompletions (token);
 					if (list != null && list.Count > 0)
 						return list;
 				}
@@ -359,9 +352,13 @@ namespace MonoDevelop.Xml.Editor
 						return null;
 
 					//if triggered by first letter of value or forced, grab those letters
-					triggerWordLength = Tracker.Engine.CurrentStateLength - 1;
 
-					return GetAttributeValueCompletions (attributedOb, att);
+					var result = await GetAttributeValueCompletions (attributedOb, att, token);
+					if (result != null) {
+						result.TriggerWordLength = Tracker.Engine.CurrentStateLength - 1;
+						return result;
+					}
+					return null;
 				}
 			}
 			
@@ -380,17 +377,18 @@ namespace MonoDevelop.Xml.Editor
 				if (attributedOb.Name.IsValid && (forced ||
 					(char.IsWhiteSpace (previousChar) && char.IsLetter (currentChar))))
 				{
-					
-					if (!forced)
-						triggerWordLength = 1;
-					
 					var existingAtts = new Dictionary<string,string> (StringComparer.OrdinalIgnoreCase);
 					
 					foreach (XAttribute att in attributedOb.Attributes) {
 						existingAtts [att.Name.FullName] = att.Value ?? string.Empty;
 					}
-					
-					return GetAttributeCompletions (attributedOb, existingAtts);
+					var result = await GetAttributeCompletions (attributedOb, existingAtts, token);
+					if (result != null) {
+						if (!forced)
+							result.TriggerWordLength = 1;
+						return result;
+					}
+					return null;
 				}
 			}
 			
@@ -402,80 +400,112 @@ namespace MonoDevelop.Xml.Editor
 			//element completion
 			if (currentChar == '<' && tracker.Engine.CurrentState is XmlRootState ||
 				(tracker.Engine.CurrentState is XmlNameState && forced)) {
-				var list = new CompletionDataList ();
-				GetElementCompletions (list);
+				var list = await GetElementCompletions (token);
 				AddCloseTag (list, Tracker.Engine.Nodes);
-				return list.Count > 0? list : null;
+				return list.Count > 0 ? list : null;
 			}
 
 			if (forced && Tracker.Engine.CurrentState is XmlRootState) {
 				var list = new CompletionDataList ();
-				MonoDevelop.Ide.CodeTemplates.CodeTemplateService.AddCompletionDataForFileName (Document.Name, list);
+				MonoDevelop.Ide.CodeTemplates.CodeTemplateService.AddCompletionDataForFileName (DocumentContext.Name, list);
 				return list.Count > 0? list : null;
 			}
 			
 			return null;
-		}

-

-		protected virtual ICompletionDataList ClosingTagCompletion (IEditableTextBuffer buf, TextLocation currentLocation)

-		{

-			//get name of current node in document that's being ended

-			var el = tracker.Engine.Nodes.Peek () as XElement;

-			if (el != null && el.Region.End >= currentLocation && !el.IsClosed && el.IsNamed) {

-				string tag = String.Concat ("</", el.Name.FullName, ">");

-				if (XmlEditorOptions.AutoCompleteElements) {

-

-					//						//make sure we have a clean atomic undo so the user can undo the tag insertion

-					//						//independently of the >

-					//						bool wasInAtomicUndo = this.Editor.Document.IsInAtomicUndo;

-					//						if (wasInAtomicUndo)

-					//							this.Editor.Document.EndAtomicUndo ();

-

-					using (var undo = buf.OpenUndoGroup ()) {

-						buf.InsertText (buf.CursorPosition, tag);

-						buf.CursorPosition -= tag.Length;

-					}

-

-					//						if (wasInAtomicUndo)

-					//							this.Editor.Document.BeginAtomicUndo ();

-

-					return null;

-				} else {

-					var cp = new CompletionDataList ();

-					cp.Add (new XmlTagCompletionData (tag, 0, true));

-					return cp;

-				}

-			}

-			return null;

-		}
-		
-		protected virtual void GetElementCompletions (CompletionDataList list)
-		{
-		}
-		
-		protected virtual CompletionDataList GetAttributeCompletions (IAttributedXObject attributedOb,
-			Dictionary<string, string> existingAtts)
+		}
+
+
+
+		protected virtual ICompletionDataList ClosingTagCompletion (TextEditor buf, DocumentLocation currentLocation)
+
 		{
+
+			//get name of current node in document that's being ended
+
+			var el = tracker.Engine.Nodes.Peek () as XElement;
+
+			if (el != null && el.Region.End >= currentLocation && !el.IsClosed && el.IsNamed) {
+
+				string tag = String.Concat ("</", el.Name.FullName, ">");
+
+				if (XmlEditorOptions.AutoCompleteElements) {
+
+
+
+					//						//make sure we have a clean atomic undo so the user can undo the tag insertion
+
+					//						//independently of the >
+
+					//						bool wasInAtomicUndo = this.Editor.Document.IsInAtomicUndo;
+
+					//						if (wasInAtomicUndo)
+
+					//							this.Editor.Document.EndAtomicUndo ();
+
+
+
+					using (var undo = buf.OpenUndoGroup ()) {
+
+						buf.InsertText (buf.CaretOffset, tag);
+
+						buf.CaretOffset -= tag.Length;
+
+					}
+
+
+
+					//						if (wasInAtomicUndo)
+
+					//							this.Editor.Document.BeginAtomicUndo ();
+
+
+
+					return null;
+
+				} else {
+
+					var cp = new CompletionDataList ();
+
+					cp.Add (new XmlTagCompletionData (tag, 0, true));
+
+					return cp;
+
+				}
+
+			}
+
 			return null;
 		}
 		
-		protected virtual CompletionDataList GetAttributeValueCompletions (IAttributedXObject attributedOb, XAttribute att)
+		protected virtual Task<CompletionDataList> GetElementCompletions (CancellationToken token)
 		{
-			return null;
+			return Task.FromResult (new CompletionDataList ());
 		}
 		
-		protected virtual void GetEntityCompletions (CompletionDataList list)
+		protected virtual Task<CompletionDataList> GetAttributeCompletions (IAttributedXObject attributedOb,
+		                                                                    Dictionary<string, string> existingAtts, CancellationToken token)
 		{
+			return Task.FromResult (new CompletionDataList ());
 		}
 		
-		protected virtual CompletionDataList GetDocTypeCompletions ()
+		protected virtual Task<CompletionDataList> GetAttributeValueCompletions (IAttributedXObject attributedOb, XAttribute att, CancellationToken token)
 		{
-			return null;
+			return Task.FromResult (new CompletionDataList ());
+		}
+		
+		protected virtual Task<CompletionDataList> GetEntityCompletions (CancellationToken token)
+		{
+			return Task.FromResult (new CompletionDataList ());
+		}
+		
+		protected virtual Task<CompletionDataList> GetDocTypeCompletions (CancellationToken token)
+		{
+			return Task.FromResult (new CompletionDataList ());
 		}
 		
 		protected string GetLineIndent (int line)
 		{
-			var seg = Editor.Document.GetLine (line);
+			var seg = Editor.GetLine (line);
 			
 			//reset the tracker to the beginning of the line
 			Tracker.UpdateEngine (seg.Offset);
@@ -575,16 +605,66 @@ namespace MonoDevelop.Xml.Editor
 				elements.Add (el);
 			}
 		}
-		
+
+		//Prevents code completion on -, so <!-- doesn't code complete too soon
+		class IgnoreDashKeyHandler : ICompletionKeyHandler
+		{
+			public bool PreProcessKey (CompletionListWindow listWindow, KeyDescriptor descriptor, out KeyActions keyAction)
+			{
+				keyAction = KeyActions.None;
+				if (descriptor.KeyChar == '-') {
+					return true;
+				}
+				return false;
+			}
+
+			public bool PostProcessKey (CompletionListWindow listWindow, KeyDescriptor descriptor, out KeyActions keyAction)
+			{
+				keyAction = KeyActions.None;
+				if (descriptor.KeyChar == '-') {
+					return true;
+				}
+				return false;
+			}
+		}
+
 		/// <summary>
 		/// Adds CDATA and comment begin tags.
 		/// </summary>
 		protected static void AddMiscBeginTags (CompletionDataList list)
 		{
 			list.Add ("!--",  "md-literal", GettextCatalog.GetString ("Comment"));
+			list.AddKeyHandler (new IgnoreDashKeyHandler ());
 			list.Add ("![CDATA[", "md-literal", GettextCatalog.GetString ("Character data"));
 		}
 
+		public override bool GetCompletionCommandOffset (out int cpos, out int wlen)
+		{
+			cpos = wlen = 0;
+			int pos = Editor.CaretOffset - 1;
+			while (pos >= 0) {
+				char c = Editor.GetCharAt (pos);
+				if (!char.IsLetterOrDigit (c) && c != '_' && c != ':' && c != '.')
+					break;
+				pos--;
+			}
+			if (pos == -1)
+				return false;
+
+			pos++;
+			cpos = pos;
+			int len = Editor.Length;
+
+			while (pos < len) {
+				char c = Editor.GetCharAt (pos);
+				if (!char.IsLetterOrDigit (c) && c != '_' && c != ':' && c != '.')
+					break;
+				pos++;
+			}
+			wlen = pos - cpos;
+			return true;
+		}
+
 		#endregion
 		
 		#region IPathedDocument
@@ -592,7 +672,7 @@ namespace MonoDevelop.Xml.Editor
 		PathEntry[] currentPath;
 		bool pathUpdateQueued;
 		
-		public override void CursorPositionChanged ()
+		void HandleCaretPositionChanged (object sender, EventArgs e)
 		{
 			if (pathUpdateQueued)
 				return;
@@ -602,7 +682,6 @@ namespace MonoDevelop.Xml.Editor
 				UpdatePath ();
 				return false;
 			});
-				
 		}
 
 		public void SelectPath (int depth)
@@ -662,16 +741,16 @@ namespace MonoDevelop.Xml.Editor
 				//pick out the locations, with some offsets to account for the parsing model
 				var s = contents? el.Region.End : el.Region.Begin;
 				var e = contents? el.ClosingTag.Region.Begin : el.ClosingTag.Region.End;
-				EditorSelect (new DomRegion (s, e));
+				EditorSelect (new DocumentRegion (s, e));
 			} else {
 				LoggingService.LogDebug ("No end tag found for selection");
 			}
 		}
 		
-		protected void EditorSelect (DomRegion region)
+		protected void EditorSelect (DocumentRegion region)
 		{
-			int s = Editor.Document.LocationToOffset (region.BeginLine, region.BeginColumn);
-			int e = Editor.Document.LocationToOffset (region.EndLine, region.EndColumn);
+			int s = Editor.LocationToOffset (region.BeginLine, region.BeginColumn);
+			int e = Editor.LocationToOffset (region.EndLine, region.EndColumn);
 			if (s > -1 && e > s) {
 				Editor.SetSelection (s, e);
 				Editor.ScrollTo (s);
@@ -680,7 +759,7 @@ namespace MonoDevelop.Xml.Editor
 		
 		public event EventHandler<DocumentPathChangedEventArgs> PathChanged;
 		
-		public Widget CreatePathWidget (int index)
+		public Control CreatePathWidget (int index)
 		{
 			if (ownerProjects.Count > 1 && index == 0) {
 				var window = new DropDownBoxListWindow (new DataProvider (this));
@@ -743,7 +822,7 @@ namespace MonoDevelop.Xml.Editor
 
 			public void ActivateItem (int n)
 			{
-				ext.Document.AttachToProject (ext.ownerProjects [n]);
+				ext.DocumentContext.AttachToProject (ext.ownerProjects [n]);
 			}
 
 			public int IconCount {
@@ -842,7 +921,7 @@ namespace MonoDevelop.Xml.Editor
 			var path = new List<PathEntry> ();
 			if (ownerProjects.Count > 1) {
 				// Current project if there is more than one
-				path.Add (new PathEntry (ImageService.GetIcon (Document.Project.StockIcon), GLib.Markup.EscapeText (Document.Project.Name)) { Tag = Document.Project });
+				path.Add (new PathEntry (ImageService.GetIcon (DocumentContext.Project.StockIcon), GLib.Markup.EscapeText (DocumentContext.Project.Name)) { Tag = DocumentContext.Project });
 			}
 			if (l != null) {
 				for (int i = 0; i < l.Count; i++) {
@@ -940,7 +1019,7 @@ namespace MonoDevelop.Xml.Editor
 		
 		void refillOutlineStore ()
 		{
-			DispatchService.AssertGuiThread ();
+			Runtime.AssertMainThread ();
 			Gdk.Threads.Enter ();
 			refreshingOutline = false;
 			if (outlineTreeStore == null || !outlineTreeView.IsRealized)
@@ -999,10 +1078,100 @@ namespace MonoDevelop.Xml.Editor
 			
 			var el = n as XElement;
 			if (el != null && el.IsClosed && el.ClosingTag.Region.End > region.End) {
-				region = new DomRegion (region.Begin, el.ClosingTag.Region.End);
+				region = new DocumentRegion (region.Begin, el.ClosingTag.Region.End);
 			}
 			EditorSelect (region);
 		}		
 		#endregion
+
+		[CommandUpdateHandler (EditCommands.AddCodeComment)]
+		[CommandUpdateHandler (EditCommands.RemoveCodeComment)]
+		[CommandUpdateHandler (EditCommands.ToggleCodeComment)]
+		void ToggleCodeCommentCommandUpdate (CommandInfo info)
+		{
+			info.Enabled = true;
+			info.Visible = true;
+		}
+
+		bool IsInComment ()
+		{
+			Tracker.UpdateEngine ();
+			if (Tracker.Engine.CurrentState is XmlCommentState) {
+				return true;
+			}
+			//If we are not in comment, try parsing 3 letters so in case we are just after
+			//"<" of <!-- we come inside... and state changes into XmlCommentState
+			var engineClone = Tracker.Engine.GetTreeParser ();
+			int j = 0;
+			for (int i = engineClone.Position; i < Editor.Length && j < 3; i++, j++) {
+				engineClone.Push (Editor.GetCharAt (engineClone.Position));
+			}
+			return engineClone.CurrentState is XmlCommentState;
+		}
+
+		[CommandHandler (EditCommands.AddCodeComment)]
+		public void AddCodeCommentCommand ()
+		{
+			if (!IsInComment ()) {
+				ToggleCodeCommentCommandInternal (false);
+			}
+		}
+
+		[CommandHandler (EditCommands.RemoveCodeComment)]
+		public void RemoveCodeCommentCommand ()
+		{
+			if (IsInComment ()) {
+				ToggleCodeCommentCommandInternal (true);
+			}
+		}
+
+		[CommandHandler (EditCommands.ToggleCodeComment)]
+		public void ToggleCodeCommentCommand ()
+		{
+			ToggleCodeCommentCommandInternal (IsInComment ());
+		}
+
+		void ToggleCodeCommentCommandInternal (bool remove)
+		{
+			if (remove) {
+				//We are guarenteed we are inside comment start
+				var treeParser = Tracker.Engine.GetTreeParser ();
+				XComment commentNode = treeParser.Nodes.Peek () as XComment;
+				//Keep parsing XML until end of file or until comment node is ended
+				for (int i = treeParser.Position; i < Editor.Length; i++) {
+					treeParser.Push (Editor.GetCharAt (i));
+					if (commentNode != null) {
+						if (commentNode.IsEnded) {
+							break;
+						}
+					} else {
+						commentNode = treeParser.Nodes.Peek () as XComment;
+					}
+				}
+				//Comment doesn't close until end of file
+				if (commentNode == null || !commentNode.IsEnded) {
+					return;
+				}
+				var startOffset = Editor.LocationToOffset (commentNode.Region.Begin);
+				var endOffset = Editor.LocationToOffset (commentNode.Region.End) - 3 - 4;//-3 because End is after "-->", -4 because removed "<!--" just before
+				using (Editor.OpenUndoGroup ()) {
+					Editor.RemoveText (startOffset, 4);//4 equals "<!--"
+					Editor.RemoveText (endOffset, 3);//3 equals "-->"
+				}
+			} else {
+				using (Editor.OpenUndoGroup ()) {
+					if (Editor.IsSomethingSelected) {
+						//end variable is also used because inserting start deselectes text and Editor.SelectionRange.EndOffset becomes invalid
+						var end = Editor.SelectionRange.EndOffset + 4;//+4 equals "<!--" inserted in next line
+						Editor.InsertText (Editor.SelectionRange.Offset, "<!--");
+						Editor.InsertText (end, "-->");
+					} else {
+						var currentLine = Editor.GetLine (Editor.CaretLine);
+						Editor.InsertText (currentLine.Offset, "<!--");
+						Editor.InsertText (currentLine.EndOffset, "-->");//currentLine.EndOffset updates automaticlly
+					}
+				}
+			}
+		}
 	}
 }
diff --git a/main/src/addins/Xml/Editor/XmlDocumentParser.cs b/main/src/addins/Xml/Editor/XmlDocumentParser.cs
index 5f17fead35..ff71b05cc5 100644
--- a/main/src/addins/Xml/Editor/XmlDocumentParser.cs
+++ b/main/src/addins/Xml/Editor/XmlDocumentParser.cs
@@ -27,7 +27,8 @@
 //
 
 using System;
-using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
 using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Xml.Parser;
@@ -36,24 +37,31 @@ namespace MonoDevelop.Xml.Editor
 {
 	class XmlDocumentParser : TypeSystemParser
 	{
-		public override ParsedDocument Parse (bool storeAst, string fileName, TextReader content, MonoDevelop.Projects.Project project = null)
+		public override Task<ParsedDocument> Parse (ParseOptions options, CancellationToken cancellationToken)
 		{
-			var doc = new XmlParsedDocument (fileName);
+			return Task.Run (() => ParseInternal (options, cancellationToken));
+		}
+
+		ParsedDocument ParseInternal (ParseOptions options, CancellationToken cancellationToken)
+		{
+			var doc = new XmlParsedDocument (options.FileName);
 			doc.Flags |= ParsedDocumentFlags.NonSerializable;
+			var xmlParser = new XmlParser (new XmlRootState (), true);
+
 			try {
-				var xmlParser = new XmlParser (new XmlRootState (), true);
-				xmlParser.Parse (content);
-				doc.XDocument = xmlParser.Nodes.GetRoot ();
-				doc.Add (xmlParser.Errors);
-				
-				if (doc.XDocument != null && doc.XDocument.RootElement != null) {
-					if (!doc.XDocument.RootElement.IsEnded)
-						doc.XDocument.RootElement.End (xmlParser.Location);
-				}
+				xmlParser.Parse (options.Content.CreateReader ());
+			} catch (Exception ex) {
+				Core.LoggingService.LogError ("Unhandled error parsing xml document", ex);
 			}
-			catch (Exception ex) {
-				MonoDevelop.Core.LoggingService.LogError ("Unhandled error parsing xml document", ex);
+
+			doc.XDocument = xmlParser.Nodes.GetRoot ();
+			doc.AddRange (xmlParser.Errors);
+
+			if (doc.XDocument != null && doc.XDocument.RootElement != null) {
+				if (!doc.XDocument.RootElement.IsEnded)
+					doc.XDocument.RootElement.End (xmlParser.Location);
 			}
+
 			return doc;
 		}
 	}
diff --git a/main/src/addins/Xml/Editor/XmlEditorOptionsPanel.cs b/main/src/addins/Xml/Editor/XmlEditorOptionsPanel.cs
index e9e6cc337a..a1106855ec 100644
--- a/main/src/addins/Xml/Editor/XmlEditorOptionsPanel.cs
+++ b/main/src/addins/Xml/Editor/XmlEditorOptionsPanel.cs
@@ -22,8 +22,8 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 

-using System;
-using Gtk;

+using System;

+using MonoDevelop.Components;

 using MonoDevelop.Ide.Gui.Dialogs;

 using MonoDevelop.Core;

 

@@ -36,7 +36,7 @@ namespace MonoDevelop.Xml.Editor
 	{
 		XmlEditorOptionsPanelWidget widget;
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			widget = new XmlEditorOptionsPanelWidget();
 			widget.AutoCompleteElements = XmlEditorOptions.AutoCompleteElements;

diff --git a/main/src/addins/Xml/Editor/XmlEditorService.cs b/main/src/addins/Xml/Editor/XmlEditorService.cs
index 513b2e7458..4b388eb528 100644
--- a/main/src/addins/Xml/Editor/XmlEditorService.cs
+++ b/main/src/addins/Xml/Editor/XmlEditorService.cs
@@ -1,42 +1,48 @@
-//

-// MonoDevelop XML Editor

-//

-// Copyright (C) 2006-2007 Matthew Ward

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-// 

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-// 

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+//
+// MonoDevelop XML Editor
+//
+// Copyright (C) 2006-2007 Matthew Ward
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
-using System.Text;

-using System.Xml;

-using System.Xml.Schema;

+using System.Text;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.XPath;
+using System.Xml.Xsl;
+using MonoDevelop.Components;
+using Gtk;
+using MonoDevelop.Components.Extensions;
+using MonoDevelop.Ide.Editor;
 using System.Xml.XPath;
 using System.Xml.Xsl;
 
 using MonoDevelop.Components;
 using MonoDevelop.Components.Extensions;
-using MonoDevelop.Core;

-using MonoDevelop.Ide;

-using MonoDevelop.Ide.Gui;

-using MonoDevelop.Ide.Tasks;

-using MonoDevelop.Projects;

+using MonoDevelop.Core;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Tasks;
+using MonoDevelop.Projects;
 using MonoDevelop.Xml.Completion;
 
 namespace MonoDevelop.Xml.Editor
@@ -44,7 +50,7 @@ namespace MonoDevelop.Xml.Editor
 	static class XmlEditorService
 	{
 		#region Task management
-		public static void AddTask(string fileName, string message, int column, int line, TaskSeverity taskType)

+		public static void AddTask(string fileName, string message, int column, int line, TaskSeverity taskType)
 		{
 			// HACK: Use a compiler error since we cannot add an error
 			// task otherwise (task type property is read-only and
@@ -55,23 +61,23 @@ namespace MonoDevelop.Xml.Editor
 			error.ErrorText = message;
 			error.FileName = fileName;
 			error.IsWarning = false;
-			

+			
 			//Task task = new Task(fileName, message, column, line);
-			Task task = new Task (error);
-			TaskService.Errors.Add(task);

-		}

-		#endregion

-		

+			TaskListEntry task = new TaskListEntry (error);
+			TaskService.Errors.Add(task);
+		}
+		#endregion
+		
 		#region View tracking
-		

-		public static XmlTextEditorExtension ActiveEditor {

-			get {

-				Document doc = IdeApp.Workbench.ActiveDocument;

-				if (doc != null)

-					return doc.GetContent<XmlTextEditorExtension>();

-				return null;

-			}

-		}

+		
+		public static XmlTextEditorExtension ActiveEditor {
+			get {
+				Document doc = IdeApp.Workbench.ActiveDocument;
+				if (doc != null)
+					return doc.GetContent<XmlTextEditorExtension>();
+				return null;
+			}
+		}
 		
 		public static ReadOnlyCollection<XmlTextEditorExtension> OpenXmlEditorViews {
 			get {
@@ -89,8 +95,8 @@ namespace MonoDevelop.Xml.Editor
 			get {
 				return ActiveEditor != null;
 			}
-		}

-		#endregion

+		}
+		#endregion
 		
 		/*
 		public static bool IsXslOutputViewContentActive {
@@ -100,342 +106,342 @@ namespace MonoDevelop.Xml.Editor
 			}
 		}*/
 		
-		public static IProgressMonitor GetMonitor ()
+		public static ProgressMonitor GetMonitor ()
 		{
 			return IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor ("XML", "md-xml-file-icon", true, true);
-		}

-		

+		}
+		
 		#region Formatting utilities
 		
 		/// <summary>
 		/// Creates a XmlTextWriter using the current text editor
 		/// properties for indentation.
 		/// </summary>
-		public static XmlTextWriter CreateXmlTextWriter (Document doc, TextWriter textWriter)
+		public static XmlTextWriter CreateXmlTextWriter (TextEditor doc, TextWriter textWriter)
 		{
-			XmlTextWriter xmlWriter = new XmlTextWriter(textWriter);

-			xmlWriter.Formatting = System.Xml.Formatting.Indented;

-			if (doc.Editor.TabsToSpaces) {

-				xmlWriter.Indentation = doc.Editor.Options.TabSize;

-				xmlWriter.IndentChar = ' ';

-			} else {

-				xmlWriter.Indentation = 1;

-				xmlWriter.IndentChar = '\t';

-			}

+			XmlTextWriter xmlWriter = new XmlTextWriter(textWriter);
+			xmlWriter.Formatting = System.Xml.Formatting.Indented;
+			if (doc.Options.TabsToSpaces) {
+				xmlWriter.Indentation = doc.Options.TabSize;
+				xmlWriter.IndentChar = ' ';
+			} else {
+				xmlWriter.Indentation = 1;
+				xmlWriter.IndentChar = '\t';
+			}
 			return xmlWriter;
-		}

-		

-		public static XmlTextWriter CreateXmlTextWriter (Document doc)

-		{

-			return CreateXmlTextWriter (doc, new EncodedStringWriter (Encoding.UTF8));

-		}

-		

+		}
+		
+		public static XmlTextWriter CreateXmlTextWriter (TextEditor doc)
+		{
+			return CreateXmlTextWriter (doc, new EncodedStringWriter (Encoding.UTF8));
+		}
+		
 		#endregion
 		
-		/// <summary>

-		/// Runs an XSL transform on the input xml.

-		/// </summary>

-		/// <param name="input">The input xml to transform.</param>

-		/// <param name="transform">The transform xml.</param>

-		/// <returns>The output of the transform.</returns>

-		public static string Transform (string input, string transform)

-		{

-			StringReader inputString = new StringReader (input);

-			XPathDocument sourceDocument = new XPathDocument (inputString);

-

-			StringReader transformString = new StringReader (transform);

-			XPathDocument transformDocument = new XPathDocument (transformString);

-

-			XslCompiledTransform xslTransform = new XslCompiledTransform ();

+		/// <summary>
+		/// Runs an XSL transform on the input xml.
+		/// </summary>
+		/// <param name="input">The input xml to transform.</param>
+		/// <param name="transform">The transform xml.</param>
+		/// <returns>The output of the transform.</returns>
+		public static string Transform (string input, string transform)
+		{
+			StringReader inputString = new StringReader (input);
+			XPathDocument sourceDocument = new XPathDocument (inputString);
+
+			StringReader transformString = new StringReader (transform);
+			XPathDocument transformDocument = new XPathDocument (transformString);
+
+			XslCompiledTransform xslTransform = new XslCompiledTransform ();
 			xslTransform.Load (transformDocument, null, new XmlUrlResolver ());
-

-			MemoryStream outputStream = new MemoryStream ();

-			XmlTextWriter writer = new XmlTextWriter (outputStream, Encoding.UTF8);

-

-			xslTransform.Transform (sourceDocument, writer);

-

-			int preambleLength = Encoding.UTF8.GetPreamble ().Length;

-			byte[] outputBytes = outputStream.ToArray ();

-			return UTF8Encoding.UTF8.GetString (outputBytes, preambleLength, outputBytes.Length - preambleLength);

-		}

-		

-		public static string CreateSchema (Document doc, string xml)

-		{

-			using (System.Data.DataSet dataSet = new System.Data.DataSet()) {

-				dataSet.ReadXml(new StringReader (xml), System.Data.XmlReadMode.InferSchema);

-				using (EncodedStringWriter writer = new EncodedStringWriter (Encoding.UTF8)) {

-					using (XmlTextWriter xmlWriter = XmlEditorService.CreateXmlTextWriter (doc, writer)) {

-						dataSet.WriteXmlSchema(xmlWriter);

-						return writer.ToString();

+
+			MemoryStream outputStream = new MemoryStream ();
+			XmlTextWriter writer = new XmlTextWriter (outputStream, Encoding.UTF8);
+
+			xslTransform.Transform (sourceDocument, writer);
+
+			int preambleLength = Encoding.UTF8.GetPreamble ().Length;
+			byte[] outputBytes = outputStream.ToArray ();
+			return UTF8Encoding.UTF8.GetString (outputBytes, preambleLength, outputBytes.Length - preambleLength);
+		}
+		
+		public static string CreateSchema (TextEditor doc, string xml)
+		{
+			using (System.Data.DataSet dataSet = new System.Data.DataSet()) {
+				dataSet.ReadXml(new StringReader (xml), System.Data.XmlReadMode.InferSchema);
+				using (EncodedStringWriter writer = new EncodedStringWriter (Encoding.UTF8)) {
+					using (XmlTextWriter xmlWriter = XmlEditorService.CreateXmlTextWriter (doc, writer)) {
+						dataSet.WriteXmlSchema(xmlWriter);
+						return writer.ToString();
 					}
-				}

-			}

-		}

-		

-		public static string GenerateFileName (string sourceName, string extensionFormat)

-		{

-			return GenerateFileName (

-			    Path.Combine (Path.GetDirectoryName (sourceName), Path.GetFileNameWithoutExtension (sourceName)) + 

-			    extensionFormat);

-		}

-		

-		// newNameFormat should be a string format for the new filename such as 

-		// "/some/path/oldname{0}.xsd", where {0} is the index that will be incremented until a

-		// non-existing file is found.

-		public static string GenerateFileName (string newNameFormat)

-		{

-			string generatedFilename = string.Format (newNameFormat, "");

+				}
+			}
+		}
+		
+		public static string GenerateFileName (string sourceName, string extensionFormat)
+		{
+			return GenerateFileName (
+			    Path.Combine (Path.GetDirectoryName (sourceName), Path.GetFileNameWithoutExtension (sourceName)) + 
+			    extensionFormat);
+		}
+		
+		// newNameFormat should be a string format for the new filename such as 
+		// "/some/path/oldname{0}.xsd", where {0} is the index that will be incremented until a
+		// non-existing file is found.
+		public static string GenerateFileName (string newNameFormat)
+		{
+			string generatedFilename = string.Format (newNameFormat, "");
 			int count = 1;
 			while (File.Exists (generatedFilename)) {
-				generatedFilename = string.Format (newNameFormat, count);

-				++count;

-			}

-			return generatedFilename;

-		}

-		

-		#region Validation

-		

-		/// <summary>

-		/// Checks that the xml in this view is well-formed.

-		/// </summary>

-		public static XmlDocument ValidateWellFormedness (IProgressMonitor monitor, string xml, string fileName)
-		{

+				generatedFilename = string.Format (newNameFormat, count);
+				++count;
+			}
+			return generatedFilename;
+		}
+		
+		#region Validation
+		
+		/// <summary>
+		/// Checks that the xml in this view is well-formed.
+		/// </summary>
+		public static XmlDocument ValidateWellFormedness (ProgressMonitor monitor, string xml, string fileName)
+		{
 			monitor.BeginTask (GettextCatalog.GetString ("Validating XML..."), 1);
-			bool error = false;

-			XmlDocument doc = null;

+			bool error = false;
+			XmlDocument doc = null;
 			
 			try {
-				doc = new XmlDocument ();

-				doc.LoadXml (xml);

-			} catch (XmlException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber, TaskSeverity.Error);

-				error = true;

-			}

+				doc = new XmlDocument ();
+				doc.LoadXml (xml);
+			} catch (XmlException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber, TaskSeverity.Error);
+				error = true;
+			}
 			
-			if (error) {

+			if (error) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Validation failed."));
 				TaskService.ShowErrors ();
-			} else {

-				monitor.Log.WriteLine (GettextCatalog.GetString ("XML is valid."));

-			}

-			

-			monitor.EndTask ();

+			} else {
+				monitor.Log.WriteLine (GettextCatalog.GetString ("XML is valid."));
+			}
+			
+			monitor.EndTask ();
 			return error? null: doc;
-		}

-		

-		/// <summary>

-		/// Validates the xml against known schemas.

+		}
+		
+		/// <summary>
+		/// Validates the xml against known schemas.
 		/// </summary>		
-		public static XmlDocument ValidateXml (IProgressMonitor monitor, string xml, string fileName)
+		public static XmlDocument ValidateXml (ProgressMonitor monitor, string xml, string fileName)
 		{
 			monitor.BeginTask (GettextCatalog.GetString ("Validating XML..."), 1);
-			bool error = false;

-			XmlDocument doc = null;

-			StringReader stringReader = new StringReader (xml);

-			

-			XmlReaderSettings settings = new XmlReaderSettings ();

-			settings.ValidationFlags = XmlSchemaValidationFlags.ProcessIdentityConstraints

-					| XmlSchemaValidationFlags.ProcessInlineSchema

-					| XmlSchemaValidationFlags.ProcessSchemaLocation

-					| XmlSchemaValidationFlags.ReportValidationWarnings;

-			settings.ValidationType = ValidationType.Schema;

-			settings.DtdProcessing = DtdProcessing.Parse;

-			

-			ValidationEventHandler validationHandler = delegate (object sender, System.Xml.Schema.ValidationEventArgs args) {

-				if (args.Severity == XmlSeverityType.Warning) {

-					monitor.Log.WriteLine (args.Message);

-					AddTask (fileName, args.Exception.Message, args.Exception.LinePosition, args.Exception.LineNumber,TaskSeverity.Warning);

-				} else {

-					AddTask (fileName, args.Exception.Message, args.Exception.LinePosition, args.Exception.LineNumber,TaskSeverity.Error);

-					monitor.Log.WriteLine (args.Message);

-					error = true;

-				}	

-			};

-			settings.ValidationEventHandler += validationHandler;

-			

+			bool error = false;
+			XmlDocument doc = null;
+			StringReader stringReader = new StringReader (xml);
+			
+			XmlReaderSettings settings = new XmlReaderSettings ();
+			settings.ValidationFlags = XmlSchemaValidationFlags.ProcessIdentityConstraints
+					| XmlSchemaValidationFlags.ProcessInlineSchema
+					| XmlSchemaValidationFlags.ProcessSchemaLocation
+					| XmlSchemaValidationFlags.ReportValidationWarnings;
+			settings.ValidationType = ValidationType.Schema;
+			settings.DtdProcessing = DtdProcessing.Parse;
+			
+			ValidationEventHandler validationHandler = delegate (object sender, System.Xml.Schema.ValidationEventArgs args) {
+				if (args.Severity == XmlSeverityType.Warning) {
+					monitor.Log.WriteLine (args.Message);
+					AddTask (fileName, args.Exception.Message, args.Exception.LinePosition, args.Exception.LineNumber,TaskSeverity.Warning);
+				} else {
+					AddTask (fileName, args.Exception.Message, args.Exception.LinePosition, args.Exception.LineNumber,TaskSeverity.Error);
+					monitor.Log.WriteLine (args.Message);
+					error = true;
+				}	
+			};
+			settings.ValidationEventHandler += validationHandler;
+			
 			try {
-				foreach (XmlSchemaCompletionData sd in XmlSchemaManager.SchemaCompletionDataItems)

-					settings.Schemas.Add (sd.Schema);

-				settings.Schemas.Compile ();

-				

-				XmlReader reader = XmlReader.Create (stringReader, settings);

-				doc = new XmlDocument();

-				doc.Load (reader);

-				

-			} catch (XmlSchemaException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-				error = true;

-			}

-			catch (XmlException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-				error = true;

-			}

-			finally {

-				if (stringReader != null)

-					stringReader.Dispose ();

-				settings.ValidationEventHandler -= validationHandler;

+				foreach (XmlSchemaCompletionData sd in XmlSchemaManager.SchemaCompletionDataItems)
+					settings.Schemas.Add (sd.Schema);
+				settings.Schemas.Compile ();
+				
+				XmlReader reader = XmlReader.Create (stringReader, settings);
+				doc = new XmlDocument();
+				doc.Load (reader);
+				
+			} catch (XmlSchemaException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+				error = true;
+			}
+			catch (XmlException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+				error = true;
+			}
+			finally {
+				if (stringReader != null)
+					stringReader.Dispose ();
+				settings.ValidationEventHandler -= validationHandler;
 			}
 			
-			if (error) {

+			if (error) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Validation failed."));
 				TaskService.ShowErrors ();
 			} else {
-				monitor.Log.WriteLine  (GettextCatalog.GetString ("XML is valid."));

-			}

-			

-			monitor.EndTask ();

-			return error? null: doc;

-		}

-		

-		/// <summary>

-		/// Validates the schema.

+				monitor.Log.WriteLine  (GettextCatalog.GetString ("XML is valid."));
+			}
+			
+			monitor.EndTask ();
+			return error? null: doc;
+		}
+		
+		/// <summary>
+		/// Validates the schema.
 		/// </summary>		
-		public static XmlSchema ValidateSchema (IProgressMonitor monitor, string xml, string fileName)
+		public static XmlSchema ValidateSchema (ProgressMonitor monitor, string xml, string fileName)
 		{
 			monitor.BeginTask (GettextCatalog.GetString ("Validating schema..."), 1);
-			bool error = false;

-			XmlSchema schema = null;

-			try {

-				StringReader stringReader = new StringReader (xml);

-				XmlTextReader xmlReader = new XmlTextReader (stringReader);

+			bool error = false;
+			XmlSchema schema = null;
+			try {
+				StringReader stringReader = new StringReader (xml);
+				XmlTextReader xmlReader = new XmlTextReader (stringReader);
 				xmlReader.XmlResolver = null;
-				

-				ValidationEventHandler callback = delegate (object source, ValidationEventArgs args) {

-					if (args.Severity == XmlSeverityType.Warning) {

-						monitor.ReportWarning (args.Message);

-					} else {

-						monitor.ReportError (args.Message, args.Exception);

-						error = true;

-					}

-					AddTask (fileName, args.Message, args.Exception.LinePosition, args.Exception.LineNumber,

-					    (args.Severity == XmlSeverityType.Warning)? TaskSeverity.Warning : TaskSeverity.Error);

+				
+				ValidationEventHandler callback = delegate (object source, ValidationEventArgs args) {
+					if (args.Severity == XmlSeverityType.Warning) {
+						monitor.ReportWarning (args.Message);
+					} else {
+						monitor.ReportError (args.Message, args.Exception);
+						error = true;
+					}
+					AddTask (fileName, args.Message, args.Exception.LinePosition, args.Exception.LineNumber,
+					    (args.Severity == XmlSeverityType.Warning)? TaskSeverity.Warning : TaskSeverity.Error);
 				};
-				schema = XmlSchema.Read (xmlReader, callback);

-				XmlSchemaSet sset = new XmlSchemaSet ();

-				sset.Add (schema);

-				sset.ValidationEventHandler += callback;

+				schema = XmlSchema.Read (xmlReader, callback);
+				XmlSchemaSet sset = new XmlSchemaSet ();
+				sset.Add (schema);
+				sset.ValidationEventHandler += callback;
 				sset.Compile ();
-			} 

-			catch (XmlSchemaException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-				error = true;

-			}

-			catch (XmlException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-				error = true;

-			}

+			} 
+			catch (XmlSchemaException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+				error = true;
+			}
+			catch (XmlException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+				error = true;
+			}
 			
-			if (error) {

+			if (error) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Validation failed."));
 				TaskService.ShowErrors ();
 			} else {
-				monitor.Log.WriteLine  (GettextCatalog.GetString ("Schema is valid."));

-			}

-			

-			monitor.EndTask ();

-			return error? null: schema;

-		}

-		

-		public static XslCompiledTransform ValidateStylesheet (IProgressMonitor monitor, string xml, string fileName)

-		{

+				monitor.Log.WriteLine  (GettextCatalog.GetString ("Schema is valid."));
+			}
+			
+			monitor.EndTask ();
+			return error? null: schema;
+		}
+		
+		public static XslCompiledTransform ValidateStylesheet (ProgressMonitor monitor, string xml, string fileName)
+		{
 			monitor.BeginTask (GettextCatalog.GetString ("Validating stylesheet..."), 1);
-			bool error = true;

-			XslCompiledTransform xslt = null;

-			

-			try {

-				StringReader reader = new StringReader (xml);

-				XPathDocument doc = new XPathDocument (reader);

-				xslt = new XslCompiledTransform ();

-				xslt.Load (doc, null, new XmlUrlResolver ());

-				error = false;

-			} catch (XsltCompileException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-			}

-			catch (XsltException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-			}

-			catch (XmlException ex) {

-				monitor.ReportError (ex.Message, ex);

-				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);

-			}

-			

-			if (error) {

+			bool error = true;
+			XslCompiledTransform xslt = null;
+			
+			try {
+				StringReader reader = new StringReader (xml);
+				XPathDocument doc = new XPathDocument (reader);
+				xslt = new XslCompiledTransform ();
+				xslt.Load (doc, null, new XmlUrlResolver ());
+				error = false;
+			} catch (XsltCompileException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+			}
+			catch (XsltException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+			}
+			catch (XmlException ex) {
+				monitor.ReportError (ex.Message, ex);
+				AddTask (fileName, ex.Message, ex.LinePosition, ex.LineNumber,TaskSeverity.Error);
+			}
+			
+			if (error) {
 				monitor.Log.WriteLine (GettextCatalog.GetString ("Validation failed."));
 				TaskService.ShowErrors ();
 			} else {
-				monitor.Log.WriteLine (GettextCatalog.GetString ("Stylesheet is valid."));

-			}

-			return error? null: xslt;

-		}

-		

-		#endregion

-		

-		#region File browsing utilities

-		

-		/// <summary>Allows the user to browse the file system for a stylesheet.</summary>

-		/// <returns>The stylesheet filename the user selected; otherwise null.</returns>

-		public static string BrowseForStylesheetFile ()

-		{

-			var dlg = new SelectFileDialog (GettextCatalog.GetString ("Select XSLT Stylesheet")) {

-				TransientFor = IdeApp.Workbench.RootWindow,

-			};

-			dlg.AddFilter (new SelectFileDialogFilter (

-				GettextCatalog.GetString ("XML Files"),

-				new string[] { "*.xml" },

-				new string[] { "text/xml", "application/xml" }

-			));

-			dlg.AddFilter (new SelectFileDialogFilter(

-				GettextCatalog.GetString ("XSL Files"),

-				new string[] { "*.xslt", "*.xsl" },

-				new string[] { "text/x-xslt" }

-			));

-			dlg.AddAllFilesFilter ();

-			

-			if (dlg.Run ())

-				return dlg.SelectedFile;

-			return null;

-		}

-		

-		/// <summary>Allows the user to browse the file system for a schema.</summary>

-		/// <returns>The schema filename the user selected; otherwise null.</returns>

-		public static string BrowseForSchemaFile ()

-		{

-			var dlg = new SelectFileDialog (GettextCatalog.GetString ("Select XML Schema"));

-			dlg.AddFilter (new SelectFileDialogFilter (

-				GettextCatalog.GetString ("XML Files"),

-				new string[] { "*.xsd" },

-				new string[] { "text/xml", "application/xml" }

-			));

-			dlg.AddAllFilesFilter ();

-			

-			if (dlg.Run ())

-				return dlg.SelectedFile;

-			return null;

-		}

-		

-		#endregion

-

-		class EncodedStringWriter : StringWriter

-		{

-			readonly Encoding encoding;

-

-			public EncodedStringWriter(Encoding encoding)

-			{

-				this.encoding = encoding;

-			}

-

-			public override Encoding Encoding {

-				get {

-					return encoding;

-				}

-			}

+				monitor.Log.WriteLine (GettextCatalog.GetString ("Stylesheet is valid."));
+			}
+			return error? null: xslt;
+		}
+		
+		#endregion
+		
+		#region File browsing utilities
+		
+		/// <summary>Allows the user to browse the file system for a stylesheet.</summary>
+		/// <returns>The stylesheet filename the user selected; otherwise null.</returns>
+		public static string BrowseForStylesheetFile ()
+		{
+			var dlg = new SelectFileDialog (GettextCatalog.GetString ("Select XSLT Stylesheet")) {
+				TransientFor = IdeApp.Workbench.RootWindow,
+			};
+			dlg.AddFilter (new SelectFileDialogFilter (
+				GettextCatalog.GetString ("XML Files"),
+				new string[] { "*.xml" },
+				new string[] { "text/xml", "application/xml" }
+			));
+			dlg.AddFilter (new SelectFileDialogFilter(
+				GettextCatalog.GetString ("XSL Files"),
+				new string[] { "*.xslt", "*.xsl" },
+				new string[] { "text/x-xslt" }
+			));
+			dlg.AddAllFilesFilter ();
+			
+			if (dlg.Run ())
+				return dlg.SelectedFile;
+			return null;
+		}
+		
+		/// <summary>Allows the user to browse the file system for a schema.</summary>
+		/// <returns>The schema filename the user selected; otherwise null.</returns>
+		public static string BrowseForSchemaFile ()
+		{
+			var dlg = new SelectFileDialog (GettextCatalog.GetString ("Select XML Schema"));
+			dlg.AddFilter (new SelectFileDialogFilter (
+				GettextCatalog.GetString ("XML Files"),
+				new string[] { "*.xsd" },
+				new string[] { "text/xml", "application/xml" }
+			));
+			dlg.AddAllFilesFilter ();
+			
+			if (dlg.Run ())
+				return dlg.SelectedFile;
+			return null;
+		}
+		
+		#endregion
+
+		class EncodedStringWriter : StringWriter
+		{
+			readonly Encoding encoding;
+
+			public EncodedStringWriter(Encoding encoding)
+			{
+				this.encoding = encoding;
+			}
+
+			public override Encoding Encoding {
+				get {
+					return encoding;
+				}
+			}
 		}
 	}
 }
diff --git a/main/src/addins/Xml/Editor/XmlParsedDocument.cs b/main/src/addins/Xml/Editor/XmlParsedDocument.cs
index bd6bc32cbf..94de472070 100644
--- a/main/src/addins/Xml/Editor/XmlParsedDocument.cs
+++ b/main/src/addins/Xml/Editor/XmlParsedDocument.cs
@@ -29,8 +29,9 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Ide.TypeSystem;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
+using System.Linq;
 
 namespace MonoDevelop.Xml.Editor
 {
@@ -41,19 +42,24 @@ namespace MonoDevelop.Xml.Editor
 		}
 		
 		public XDocument XDocument { get; set; }
-		
-		public override IEnumerable<FoldingRegion> Foldings {
+
+		public override System.Threading.Tasks.Task<IReadOnlyList<FoldingRegion>> GetFoldingsAsync (System.Threading.CancellationToken cancellationToken)
+		{
+			return System.Threading.Tasks.Task.FromResult((IReadOnlyList<FoldingRegion>)Foldings.ToList ());
+		}
+
+		public IEnumerable<FoldingRegion> Foldings {
 			get {
 				if (XDocument == null)
 					yield break;
-				foreach (var region in Comments.ToFolds ()) 
+				foreach (var region in GetCommentsAsync().Result.ToFolds ()) 
 					yield return region;
 				foreach (XNode node in XDocument.AllDescendentNodes) {
 					if (node is XCData)
 					{
 						if (node.Region.EndLine - node.Region.BeginLine > 2)
 							yield return new FoldingRegion ("<![CDATA[ ]]>", node.Region);
-					}
+					} 
 					else if (node is XComment)
 					{
 						if (node.Region.EndLine - node.Region.BeginLine > 2)
@@ -65,7 +71,7 @@ namespace MonoDevelop.Xml.Editor
 						if (el.IsClosed && el.ClosingTag.Region.EndLine - el.Region.BeginLine > 2) {
 							yield return new FoldingRegion
 								(string.Format ("<{0}...>", el.Name.FullName),
-								 new DomRegion (el.Region.Begin, el.ClosingTag.Region.End));
+								 new DocumentRegion (el.Region.Begin, el.ClosingTag.Region.End));
 						}
 					}
 					else if (node is XDocType)
diff --git a/main/src/addins/Xml/Editor/XmlSchemasPanel.cs b/main/src/addins/Xml/Editor/XmlSchemasPanel.cs
index bae0f24d56..cf0820b173 100644
--- a/main/src/addins/Xml/Editor/XmlSchemasPanel.cs
+++ b/main/src/addins/Xml/Editor/XmlSchemasPanel.cs
@@ -24,7 +24,7 @@
 
 using System;

 

-using Gtk;

+using MonoDevelop.Components;

 using MonoDevelop.Ide.Gui.Dialogs;

 

 namespace MonoDevelop.Xml.Editor

@@ -36,7 +36,7 @@ namespace MonoDevelop.Xml.Editor
 	{		
 		XmlSchemasPanelWidget widget;
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			widget = new XmlSchemasPanelWidget ();

 			widget.LoadUserSchemas (XmlSchemaManager.UserSchemas);

diff --git a/main/src/addins/Xml/Editor/XmlSchemasPanelWidget.cs b/main/src/addins/Xml/Editor/XmlSchemasPanelWidget.cs
index a2e5a5b8eb..f021a24120 100644
--- a/main/src/addins/Xml/Editor/XmlSchemasPanelWidget.cs
+++ b/main/src/addins/Xml/Editor/XmlSchemasPanelWidget.cs
@@ -73,8 +73,7 @@ namespace MonoDevelop.Xml.Editor
 						: GettextCatalog.GetString ("User schema");
 			});
 			
-			registeredSchemasStore.SetSortFunc (0,
-				(model, a, b) => string.Compare (GetSchema (a).NamespaceUri, GetSchema (b).NamespaceUri, StringComparison.Ordinal));
+			registeredSchemasStore.SetSortFunc (0, SortSchemas);
 			
 			registeredSchemasStore.SetSortColumnId (0, SortType.Ascending);
 			
@@ -183,6 +182,11 @@ namespace MonoDevelop.Xml.Editor
 		
 		XmlSchemaCompletionData GetSchema (TreeIter iter)
 		{
+			return GetSchema (registeredSchemasStore, iter);
+		}
+
+		static XmlSchemaCompletionData GetSchema (ListStore registeredSchemasStore, TreeIter iter)
+		{
 			return (XmlSchemaCompletionData) registeredSchemasStore.GetValue (iter, 0);
 		}
 		
@@ -201,6 +205,12 @@ namespace MonoDevelop.Xml.Editor
 				valid = model.IterNext (ref iter);
 			}
 		}
+
+		static int SortSchemas (TreeModel model, TreeIter a, TreeIter b)
+		{
+			var listStore = (ListStore)model;
+			return string.Compare (GetSchema (listStore, a).NamespaceUri, GetSchema (listStore, b).NamespaceUri, StringComparison.Ordinal);
+		}
 		
 		#region Schema accessors
 		
diff --git a/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs b/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
index 97017cb251..808883dc99 100644
--- a/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
+++ b/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
@@ -32,17 +32,21 @@ using System.Collections.Generic;
 using System.Xml;
 using System.Xml.Schema;
 
-using Mono.TextEditor;
-
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide.Tasks;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.CodeFormatting;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.Xml.Completion;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
+using MonoDevelop.Ide.Editor.Extension;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace MonoDevelop.Xml.Editor
 {
@@ -56,12 +60,12 @@ namespace MonoDevelop.Xml.Editor
 		InferredXmlCompletionProvider inferredCompletionData;
 		bool inferenceQueued;
 
-		public override bool ExtendsEditor (MonoDevelop.Ide.Gui.Document doc, IEditableTextBuffer editor)
+		public override bool IsValidInContext (DocumentContext context)
 		{
-			return IsFileNameHandled (doc.Name) && base.ExtendsEditor (doc, editor);
+			return IsFileNameHandled (context.Name) && base.IsValidInContext (context);
 		}
 		
-		public override void Initialize ()
+		protected override void Initialize ()
 		{
 			base.Initialize ();
 			XmlEditorOptions.XmlFileAssociationChanged += HandleXmlFileAssociationChanged;
@@ -69,16 +73,16 @@ namespace MonoDevelop.Xml.Editor
 			XmlSchemaManager.UserSchemaRemoved += UserSchemaRemoved;
 			SetDefaultSchema ();
 			
-			var view = Document.GetContent<MonoDevelop.SourceEditor.SourceEditorView> ();
-			if (view != null && string.IsNullOrEmpty (view.Document.MimeType)) {
-				view.Document.MimeType = ApplicationXmlMimeType;
-				Document.ReparseDocument ();
+			//var view = Document.GetContent<MonoDevelop.SourceEditor.SourceEditorView> ();
+			if (string.IsNullOrEmpty (Editor.MimeType)) {
+				Editor.MimeType = ApplicationXmlMimeType;
+				DocumentContext.ReparseDocument ();
 			}
 		}
 
 		void HandleXmlFileAssociationChanged (object sender, XmlFileAssociationChangedEventArgs e)
 		{
-			var filename = document.FileName;
+			var filename = DocumentContext.Name;
 			if (filename != null && filename.ToString ().EndsWith (e.Extension, StringComparison.Ordinal))
 				SetDefaultSchema ();
 		}
@@ -89,7 +93,8 @@ namespace MonoDevelop.Xml.Editor
 			if (!disposed) {
 				disposed = false;
 				XmlEditorOptions.XmlFileAssociationChanged -= HandleXmlFileAssociationChanged;
-				XmlSchemaManager.UserSchemaAdded -= UserSchemaAdded;

+				XmlSchemaManager.UserSchemaAdded -= UserSchemaAdded;
+
 				XmlSchemaManager.UserSchemaRemoved -= UserSchemaRemoved;
 				base.Dispose ();
 			}
@@ -106,49 +111,60 @@ namespace MonoDevelop.Xml.Editor
 			);
 		}
 		
-		protected override void GetElementCompletions (CompletionDataList list)
-		{	
-			var path = GetElementPath ();

+		protected override async Task<CompletionDataList> GetElementCompletions (CancellationToken token)
+		{
+			var list = new CompletionDataList ();
+			var path = GetElementPath ();
+
 			if (path.Elements.Count > 0) {
 				IXmlCompletionProvider schema = FindSchema (path);
 				if (schema == null)
-					schema = inferredCompletionData;

-				if (schema != null) {

-					var completionData = schema.GetChildElementCompletionData (path);
+					schema = inferredCompletionData;
+
+				if (schema != null) {
+
+					var completionData = await schema.GetChildElementCompletionData (path, token);
 					if (completionData != null)
 						list.AddRange (completionData);
-				}

+				}
+
 			} else if (defaultSchemaCompletionData != null) {
-				list.AddRange (defaultSchemaCompletionData.GetElementCompletionData (defaultNamespacePrefix));

+				list.AddRange (await defaultSchemaCompletionData.GetElementCompletionData (defaultNamespacePrefix, token));
+
 			} else if (inferredCompletionData != null) {
-				list.AddRange (inferredCompletionData.GetElementCompletionData ());
+				list.AddRange (await inferredCompletionData.GetElementCompletionData (token));
 			}
 			AddMiscBeginTags (list);
+			return list;
 		}
 		
-		protected override CompletionDataList GetAttributeCompletions (IAttributedXObject attributedOb,
-			Dictionary<string, string> existingAtts)
+		protected override Task<CompletionDataList> GetAttributeCompletions (IAttributedXObject attributedOb,
+		                                                               Dictionary<string, string> existingAtts, CancellationToken token)
 		{
-			var path = GetElementPath ();

+			var path = GetElementPath ();
+
 			if (path.Elements.Count > 0) {
 				IXmlCompletionProvider schema = FindSchema (path);
 				if (schema == null)
-					schema = inferredCompletionData;

-				if (schema != null)

-					return schema.GetAttributeCompletionData (path);
+					schema = inferredCompletionData;
+
+				if (schema != null)
+					return schema.GetAttributeCompletionData (path, token);
 			}
-			return null;
+			return Task.FromResult (new CompletionDataList ());
 		}
 		
-		protected override CompletionDataList GetAttributeValueCompletions (IAttributedXObject attributedOb, XAttribute att)
+		protected override Task<CompletionDataList> GetAttributeValueCompletions (IAttributedXObject attributedOb, XAttribute att, CancellationToken token)
 		{
-			var path = GetElementPath ();

+			var path = GetElementPath ();
+
 			if (path.Elements.Count > 0) {
-				var schema = FindSchema (path);

-				if (schema != null)

-					return schema.GetAttributeValueCompletionData (path, att.Name.FullName);
+				var schema = FindSchema (path);
+
+				if (schema != null)
+					return schema.GetAttributeValueCompletionData (path, att.Name.FullName, token);
 			}
-			return null;
+			return Task.FromResult (new CompletionDataList ());
 		}
 		
 		#endregion
@@ -170,47 +186,79 @@ namespace MonoDevelop.Xml.Editor
 			return FindSchema (XmlSchemaManager.SchemaCompletionDataItems, path);
 		}
 		
-		/// <summary>

-		/// Finds the schema given the xml element path.

-		/// </summary>

-		public XmlSchemaCompletionData FindSchema (IXmlSchemaCompletionDataCollection schemaCompletionDataItems, XmlElementPath path)

-		{

-			if (path.Elements.Count > 0) {

-				string namespaceUri = path.Elements[0].Namespace;

-				if (namespaceUri.Length > 0) {

-					return schemaCompletionDataItems[namespaceUri];

-				} else if (defaultSchemaCompletionData != null) {

-					

-					// Use the default schema namespace if none

-					// specified in a xml element path, otherwise

-					// we will not find any attribute or element matches

-					// later.

-					foreach (QualifiedName name in path.Elements) {

-						if (name.Namespace.Length == 0) {

-							name.Namespace = defaultSchemaCompletionData.NamespaceUri;

-						}

-					}

-					return defaultSchemaCompletionData;

-				}

-			}

-			return null;

+		/// <summary>
+
+		/// Finds the schema given the xml element path.
+
+		/// </summary>
+
+		public XmlSchemaCompletionData FindSchema (IXmlSchemaCompletionDataCollection schemaCompletionDataItems, XmlElementPath path)
+
+		{
+
+			if (path.Elements.Count > 0) {
+
+				string namespaceUri = path.Elements[0].Namespace;
+
+				if (namespaceUri.Length > 0) {
+
+					return schemaCompletionDataItems[namespaceUri];
+
+				} else if (defaultSchemaCompletionData != null) {
+
+					
+
+					// Use the default schema namespace if none
+
+					// specified in a xml element path, otherwise
+
+					// we will not find any attribute or element matches
+
+					// later.
+
+					foreach (QualifiedName name in path.Elements) {
+
+						if (name.Namespace.Length == 0) {
+
+							name.Namespace = defaultSchemaCompletionData.NamespaceUri;
+
+						}
+
+					}
+
+					return defaultSchemaCompletionData;
+
+				}
+
+			}
+
+			return null;
+
 		}
 		
 		#endregion
 		
 		#region Schema resolution
 		
-		/// <summary>

-		/// Gets the XmlSchemaObject that defines the currently selected xml element or attribute.

-		/// </summary>

+		/// <summary>
+
+		/// Gets the XmlSchemaObject that defines the currently selected xml element or attribute.
+
+		/// </summary>
+
 		/// <param name="currentSchemaCompletionData">This is the schema completion data for the schema currently being 
-		/// displayed. This can be null if the document is not a schema.</param>

-		public XmlSchemaObject GetSchemaObjectSelected (XmlSchemaCompletionData currentSchemaCompletionData)

-		{

-			// Find element under cursor.

+		/// displayed. This can be null if the document is not a schema.</param>
+
+		public XmlSchemaObject GetSchemaObjectSelected (XmlSchemaCompletionData currentSchemaCompletionData)
+
+		{
+
+			// Find element under cursor.
+
 			XmlElementPath path = GetElementPath ();
 			
-			//attribute name under cursor, if valid

+			//attribute name under cursor, if valid
+
 			string attributeName = null;
 			XAttribute xatt = Tracker.Engine.Nodes.Peek (0) as XAttribute;
 			if (xatt != null) {
@@ -219,173 +267,306 @@ namespace MonoDevelop.Xml.Editor
 					xattName = GetCompleteName ();
 				}
 				attributeName = xattName.FullName;
-			}

+			}
+
 			
-			// Find schema definition object.

-			XmlSchemaCompletionData schemaCompletionData = FindSchema (path);

-			XmlSchemaObject schemaObject = null;

+			// Find schema definition object.
+
+			XmlSchemaCompletionData schemaCompletionData = FindSchema (path);
+
+			XmlSchemaObject schemaObject = null;
+
 			if (schemaCompletionData != null) {
-				XmlSchemaElement element = schemaCompletionData.FindElement(path);

-				schemaObject = element;

+				XmlSchemaElement element = schemaCompletionData.FindElement(path);
+
+				schemaObject = element;
+
 				if (element != null) {
 					if (!string.IsNullOrEmpty (attributeName)) {
-						XmlSchemaAttribute attribute = schemaCompletionData.FindAttribute(element, attributeName);

+						XmlSchemaAttribute attribute = schemaCompletionData.FindAttribute(element, attributeName);
+
 						if (attribute != null) {
-							if (currentSchemaCompletionData != null) {

-								schemaObject = GetSchemaObjectReferenced (currentSchemaCompletionData, element, attribute);

-							} else {

-								schemaObject = attribute;

-							}

-						}

-					}

-					return schemaObject;

-				}

-			}	

-			return null;

-		}
-		
-		/// <summary>

-		/// If the attribute value found references another item in the schema

-		/// return this instead of the attribute schema object. For example, if the

-		/// user can select the attribute value and the code will work out the schema object pointed to by the ref

-		/// or type attribute:

-		///

-		/// xs:element ref="ref-name"

-		/// xs:attribute type="type-name"

-		/// </summary>

-		/// <returns>

-		/// The <paramref name="attribute"/> if no schema object was referenced.

-		/// </returns>

-		XmlSchemaObject GetSchemaObjectReferenced (XmlSchemaCompletionData currentSchemaCompletionData, XmlSchemaElement element, XmlSchemaAttribute attribute)

-		{

-			XmlSchemaObject schemaObject = null;

-			if (IsXmlSchemaNamespace(element)) {

+							if (currentSchemaCompletionData != null) {
+
+								schemaObject = GetSchemaObjectReferenced (currentSchemaCompletionData, element, attribute);
+
+							} else {
+
+								schemaObject = attribute;
+
+							}
+
+						}
+
+					}
+
+					return schemaObject;
+
+				}
+
+			}	
+
+			return null;
+
+		}
+		
+		/// <summary>
+
+		/// If the attribute value found references another item in the schema
+
+		/// return this instead of the attribute schema object. For example, if the
+
+		/// user can select the attribute value and the code will work out the schema object pointed to by the ref
+
+		/// or type attribute:
+
+		///
+
+		/// xs:element ref="ref-name"
+
+		/// xs:attribute type="type-name"
+
+		/// </summary>
+
+		/// <returns>
+
+		/// The <paramref name="attribute"/> if no schema object was referenced.
+
+		/// </returns>
+
+		XmlSchemaObject GetSchemaObjectReferenced (XmlSchemaCompletionData currentSchemaCompletionData, XmlSchemaElement element, XmlSchemaAttribute attribute)
+
+		{
+
+			XmlSchemaObject schemaObject = null;
+
+			if (IsXmlSchemaNamespace(element)) {
+
 				// Find attribute value.
-				//fixme implement

-				string attributeValue = "";// XmlParser.GetAttributeValueAtIndex(xml, index);

-				if (attributeValue.Length == 0) {

-					return attribute;

-				}

-		

-				if (attribute.Name == "ref") {

-					schemaObject = FindSchemaObjectReference(attributeValue, currentSchemaCompletionData, element.Name);

-				} else if (attribute.Name == "type") {

-					schemaObject = FindSchemaObjectType(attributeValue, currentSchemaCompletionData, element.Name);

-				}

-			}

-			

-			if (schemaObject != null) {

-				return schemaObject;

-			}

-			return attribute;

-		}
-		
-		/// <summary>

-		/// Checks whether the element belongs to the XSD namespace.

-		/// </summary>

-		static bool IsXmlSchemaNamespace (XmlSchemaElement element)

-		{

-			XmlQualifiedName qualifiedName = element.QualifiedName;

-			if (qualifiedName != null) {

-				return XmlSchemaManager.IsXmlSchemaNamespace (qualifiedName.Namespace);

-			}

-			return false;

-		}
-		
-		/// <summary>

-		/// Attempts to locate the reference name in the specified schema.

-		/// </summary>

-		/// <param name="name">The reference to look up.</param>

-		/// <param name="schemaCompletionData">The schema completion data to use to

-		/// find the reference.</param>

-		/// <param name="elementName">The element to determine what sort of reference it is

-		/// (e.g. group, attribute, element).</param>

-		/// <returns><see langword="null"/> if no match can be found.</returns>

-		XmlSchemaObject FindSchemaObjectReference(string name, XmlSchemaCompletionData schemaCompletionData, string elementName)

-		{

-			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);

-			XmlSchemaCompletionData qualifiedNameSchema = FindSchema(qualifiedName.Namespace);

-			if (qualifiedNameSchema != null) {

-				schemaCompletionData = qualifiedNameSchema;

-			}

-			switch (elementName) {

-				case "element":

-					return schemaCompletionData.FindElement(qualifiedName);

-				case "attribute":

-					return schemaCompletionData.FindAttribute(qualifiedName.Name);

-				case "group":

-					return schemaCompletionData.FindGroup(qualifiedName.Name);

-				case "attributeGroup":

-					return schemaCompletionData.FindAttributeGroup(qualifiedName.Name);

-			}

-			return null;

-		}

-		

-		/// <summary>

-		/// Attempts to locate the type name in the specified schema.

-		/// </summary>

-		/// <param name="name">The type to look up.</param>

-		/// <param name="schemaCompletionData">The schema completion data to use to

-		/// find the type.</param>

-		/// <param name="elementName">The element to determine what sort of type it is

-		/// (e.g. group, attribute, element).</param>

-		/// <returns><see langword="null"/> if no match can be found.</returns>

-		XmlSchemaObject FindSchemaObjectType(string name, XmlSchemaCompletionData schemaCompletionData, string elementName)

-		{

-			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);

-			XmlSchemaCompletionData qualifiedNameSchema = FindSchema(qualifiedName.Namespace);

-			if (qualifiedNameSchema != null) {

-				schemaCompletionData = qualifiedNameSchema;

-			}

-			switch (elementName) {

-				case "element":

-					return schemaCompletionData.FindComplexType(qualifiedName);

-				case "attribute":

-					return schemaCompletionData.FindSimpleType(qualifiedName.Name);

-			}

-			return null;

+				//fixme implement
+
+				string attributeValue = "";// XmlParser.GetAttributeValueAtIndex(xml, index);
+
+				if (attributeValue.Length == 0) {
+
+					return attribute;
+
+				}
+
+		
+
+				if (attribute.Name == "ref") {
+
+					schemaObject = FindSchemaObjectReference(attributeValue, currentSchemaCompletionData, element.Name);
+
+				} else if (attribute.Name == "type") {
+
+					schemaObject = FindSchemaObjectType(attributeValue, currentSchemaCompletionData, element.Name);
+
+				}
+
+			}
+
+			
+
+			if (schemaObject != null) {
+
+				return schemaObject;
+
+			}
+
+			return attribute;
+
+		}
+		
+		/// <summary>
+
+		/// Checks whether the element belongs to the XSD namespace.
+
+		/// </summary>
+
+		static bool IsXmlSchemaNamespace (XmlSchemaElement element)
+
+		{
+
+			XmlQualifiedName qualifiedName = element.QualifiedName;
+
+			if (qualifiedName != null) {
+
+				return XmlSchemaManager.IsXmlSchemaNamespace (qualifiedName.Namespace);
+
+			}
+
+			return false;
+
+		}
+		
+		/// <summary>
+
+		/// Attempts to locate the reference name in the specified schema.
+
+		/// </summary>
+
+		/// <param name="name">The reference to look up.</param>
+
+		/// <param name="schemaCompletionData">The schema completion data to use to
+
+		/// find the reference.</param>
+
+		/// <param name="elementName">The element to determine what sort of reference it is
+
+		/// (e.g. group, attribute, element).</param>
+
+		/// <returns><see langword="null"/> if no match can be found.</returns>
+
+		XmlSchemaObject FindSchemaObjectReference(string name, XmlSchemaCompletionData schemaCompletionData, string elementName)
+
+		{
+
+			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);
+
+			XmlSchemaCompletionData qualifiedNameSchema = FindSchema(qualifiedName.Namespace);
+
+			if (qualifiedNameSchema != null) {
+
+				schemaCompletionData = qualifiedNameSchema;
+
+			}
+
+			switch (elementName) {
+
+				case "element":
+
+					return schemaCompletionData.FindElement(qualifiedName);
+
+				case "attribute":
+
+					return schemaCompletionData.FindAttribute(qualifiedName.Name);
+
+				case "group":
+
+					return schemaCompletionData.FindGroup(qualifiedName.Name);
+
+				case "attributeGroup":
+
+					return schemaCompletionData.FindAttributeGroup(qualifiedName.Name);
+
+			}
+
+			return null;
+
+		}
+
+		
+
+		/// <summary>
+
+		/// Attempts to locate the type name in the specified schema.
+
+		/// </summary>
+
+		/// <param name="name">The type to look up.</param>
+
+		/// <param name="schemaCompletionData">The schema completion data to use to
+
+		/// find the type.</param>
+
+		/// <param name="elementName">The element to determine what sort of type it is
+
+		/// (e.g. group, attribute, element).</param>
+
+		/// <returns><see langword="null"/> if no match can be found.</returns>
+
+		XmlSchemaObject FindSchemaObjectType(string name, XmlSchemaCompletionData schemaCompletionData, string elementName)
+
+		{
+
+			QualifiedName qualifiedName = schemaCompletionData.CreateQualifiedName(name);
+
+			XmlSchemaCompletionData qualifiedNameSchema = FindSchema(qualifiedName.Namespace);
+
+			if (qualifiedNameSchema != null) {
+
+				schemaCompletionData = qualifiedNameSchema;
+
+			}
+
+			switch (elementName) {
+
+				case "element":
+
+					return schemaCompletionData.FindComplexType(qualifiedName);
+
+				case "attribute":
+
+					return schemaCompletionData.FindSimpleType(qualifiedName.Name);
+
+			}
+
+			return null;
+
 		}
 		
 		#endregion
 		
 		#region Settings handling
 		
-		void SetDefaultSchema ()

+		void SetDefaultSchema ()
+
 		{
-			var filename = document.FileName;
+			var filename = DocumentContext.Name;
 			if (filename == null)
 				return;
-			

+			
+
 			defaultSchemaCompletionData = XmlSchemaManager.GetSchemaCompletionDataForFileName (filename);
 			if (defaultSchemaCompletionData != null)
 				inferredCompletionData = null;
 			else
-				QueueInference ();

-			defaultNamespacePrefix = XmlSchemaManager.GetNamespacePrefixForFileName (filename);

-		}

-		

-		/// Updates the default schema association since the schema may have been added.

-		void UserSchemaAdded (object source, EventArgs e)

+				QueueInference ();
+
+			defaultNamespacePrefix = XmlSchemaManager.GetNamespacePrefixForFileName (filename);
+
+		}
+
+		
+
+		/// Updates the default schema association since the schema may have been added.
+
+		void UserSchemaAdded (object source, EventArgs e)
+
 		{	
 			SetDefaultSchema ();
-		}

-		

-		// Updates the default schema association since the schema may have been removed.

-		void UserSchemaRemoved (object source, EventArgs e)

-		{

-			SetDefaultSchema ();

+		}
+
+		
+
+		// Updates the default schema association since the schema may have been removed.
+
+		void UserSchemaRemoved (object source, EventArgs e)
+
+		{
+
+			SetDefaultSchema ();
+
 		}
 		
 		#endregion
 		
 		#region Stylesheet handling
 		
-		/// <summary>

-		/// Gets or sets the stylesheet associated with this xml file.

-		/// </summary>

-		public string StylesheetFileName {

-			get { return stylesheetFileName; }

-			set { stylesheetFileName = value; }

+		/// <summary>
+
+		/// Gets or sets the stylesheet associated with this xml file.
+
+		/// </summary>
+
+		public string StylesheetFileName {
+
+			get { return stylesheetFileName; }
+
+			set { stylesheetFileName = value; }
+
 		}
 						
 		#endregion
@@ -430,16 +611,17 @@ namespace MonoDevelop.Xml.Editor
 		
 		#region Smart indent
 		
-		public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier)
+		public override bool KeyPress (KeyDescriptor descriptor)
 		{
 			bool result;
-			

-			if (Document.Editor.Options.IndentStyle == IndentStyle.Smart && key == Gdk.Key.Return) {
-				result = base.KeyPress (key, keyChar, modifier);
-				SmartIndentLine (Editor.Caret.Line);
+			
+
+			if (Editor.Options.IndentStyle == IndentStyle.Smart && descriptor.SpecialKey == SpecialKey.Return) {
+				result = base.KeyPress (descriptor);
+				SmartIndentLine (Editor.CaretLine);
 				return result;
 			}
-			return base.KeyPress (key, keyChar, modifier);
+			return base.KeyPress (descriptor);
 		}
 		
 		void SmartIndentLine (int line)
@@ -484,32 +666,23 @@ namespace MonoDevelop.Xml.Editor
 		#endregion
 		
 		#region Command handlers
-		
-		[CommandUpdateHandler (MonoDevelop.Ide.Commands.EditCommands.ToggleCodeComment)]
-		protected void ToggleCodeCommentCommandUpdate (CommandInfo info)
-		{
-			info.Enabled = false;
-		}
-		
-		[CommandHandler (MonoDevelop.Ide.Commands.EditCommands.ToggleCodeComment)]
-		public void ToggleCodeCommentCommand ()
-		{
-			//FIXME: implement
-		}
-		
+
 		[CommandHandler (XmlCommands.CreateSchema)]
 		public void CreateSchemaCommand ()
 		{
-			try {

-				TaskService.Errors.Clear ();

+			try {
+
+				TaskService.Errors.Clear ();
+
 				string xml = Editor.Text;
-				using (IProgressMonitor monitor = XmlEditorService.GetMonitor ()) {
+				using (ProgressMonitor monitor = XmlEditorService.GetMonitor ()) {
 					XmlDocument doc = XmlEditorService.ValidateWellFormedness (monitor, xml, FileName);
 					if (doc == null)
 						return;
 					monitor.BeginTask (GettextCatalog.GetString ("Creating schema..."), 0);
 					try {
-						string schema = XmlEditorService.CreateSchema (Document, xml);

+						string schema = XmlEditorService.CreateSchema (Editor, xml);
+
 						string fileName = XmlEditorService.GenerateFileName (FileName, "{0}.xsd");
 						IdeApp.Workbench.NewDocument (fileName, "application/xml", schema);
 						monitor.ReportSuccess (GettextCatalog.GetString ("Schema created."));
@@ -518,22 +691,30 @@ namespace MonoDevelop.Xml.Editor
 						LoggingService.LogError (msg, ex);
 						monitor.ReportError (msg, ex);
 					}
-				}

-			} catch (Exception ex) {

-				MessageService.ShowError (ex.Message);

+				}
+
+			} catch (Exception ex) {
+
+				MessageService.ShowError (ex.Message);
+
 			}
 		}
 		
 		[CommandHandler (XmlCommands.OpenStylesheet)]
 		public void OpenStylesheetCommand ()
-		{

-			if (!string.IsNullOrEmpty (stylesheetFileName)) {

-				try {

-					IdeApp.Workbench.OpenDocument (stylesheetFileName, Document.Project);

+		{
+
+			if (!string.IsNullOrEmpty (stylesheetFileName)) {
+
+				try {
+
+					IdeApp.Workbench.OpenDocument (stylesheetFileName, DocumentContext.Project);
+
 				} catch (Exception ex) {
-					MessageService.ShowError ("Could not open document.", ex);

-				}

-			}

+					LoggingService.LogError ("Could not open document.", ex);
+					MessageService.ShowError ("Could not open document.", ex);
+				}
+			}
 		}
 		
 		[CommandUpdateHandler (XmlCommands.OpenStylesheet)]
@@ -546,21 +727,28 @@ namespace MonoDevelop.Xml.Editor
 		public void GoToSchemaDefinitionCommand ()
 		{
 			try {
-				//try to resolve the schema

-				XmlSchemaCompletionData currentSchemaCompletionData = FindSchemaFromFileName (FileName);						

-				XmlSchemaObject schemaObject = GetSchemaObjectSelected (currentSchemaCompletionData);

-				

-				// Open schema if resolved

-				if (schemaObject != null && schemaObject.SourceUri != null && schemaObject.SourceUri.Length > 0) {

+				//try to resolve the schema
+
+				XmlSchemaCompletionData currentSchemaCompletionData = FindSchemaFromFileName (FileName);						
+
+				XmlSchemaObject schemaObject = GetSchemaObjectSelected (currentSchemaCompletionData);
+
+				
+
+				// Open schema if resolved
+
+				if (schemaObject != null && schemaObject.SourceUri != null && schemaObject.SourceUri.Length > 0) {
+
 					string schemaFileName = schemaObject.SourceUri.Replace ("file:/", String.Empty);
 					IdeApp.Workbench.OpenDocument (
 					    schemaFileName,
-						Document.Project,
+						DocumentContext.Project,
 					    Math.Max (1, schemaObject.LineNumber),
 					    Math.Max (1, schemaObject.LinePosition));
 				}
 			} catch (Exception ex) {
-				MessageService.ShowError ("Could not open document.", ex);

+				MonoDevelop.Core.LoggingService.LogError ("Could not open document.", ex);
+				MessageService.ShowError ("Could not open document.", ex);
 			}
 		}
 		
@@ -568,10 +756,11 @@ namespace MonoDevelop.Xml.Editor
 		public void ValidateCommand ()
 		{
 			TaskService.Errors.Clear ();
-			using (IProgressMonitor monitor = XmlEditorService.GetMonitor()) {
+			using (ProgressMonitor monitor = XmlEditorService.GetMonitor()) {
 				if (IsSchema)
 					XmlEditorService.ValidateSchema (monitor, Editor.Text, FileName);
-				else

+				else
+
 					XmlEditorService.ValidateXml (monitor, Editor.Text, FileName);
 			}
 		}
@@ -579,22 +768,27 @@ namespace MonoDevelop.Xml.Editor
 		[CommandHandler (XmlCommands.AssignStylesheet)]
 		public void AssignStylesheetCommand ()
 		{
-			// Prompt user for filename.

-			string fileName = XmlEditorService.BrowseForStylesheetFile ();

-			if (!string.IsNullOrEmpty (stylesheetFileName))

+			// Prompt user for filename.
+
+			string fileName = XmlEditorService.BrowseForStylesheetFile ();
+
+			if (!string.IsNullOrEmpty (stylesheetFileName))
+
 				stylesheetFileName = fileName;
 		}
 		
 		[CommandHandler (XmlCommands.RunXslTransform)]
 		public void RunXslTransformCommand ()
 		{
-			if (string.IsNullOrEmpty (stylesheetFileName)) {

-				stylesheetFileName = XmlEditorService.BrowseForStylesheetFile ();

+			if (string.IsNullOrEmpty (stylesheetFileName)) {
+
+				stylesheetFileName = XmlEditorService.BrowseForStylesheetFile ();
+
 				if (string.IsNullOrEmpty (stylesheetFileName))
 					return;
 			}
 			
-			using (IProgressMonitor monitor = XmlEditorService.GetMonitor()) {
+			using (ProgressMonitor monitor = XmlEditorService.GetMonitor()) {
 				try {
 					string xsltContent;
 					try {
@@ -616,7 +810,7 @@ namespace MonoDevelop.Xml.Editor
 					string newFileName = XmlEditorService.GenerateFileName (FileName, "-transformed{0}.xml");
 					
 					monitor.BeginTask (GettextCatalog.GetString ("Executing transform..."), 1);
-					using (XmlTextWriter output = XmlEditorService.CreateXmlTextWriter(Document)) {
+					using (XmlTextWriter output = XmlEditorService.CreateXmlTextWriter(Editor)) {
 						xslt.Transform (doc, null, output);
 						IdeApp.Workbench.NewDocument (
 						    newFileName, "application/xml", output.ToString ());
@@ -626,19 +820,24 @@ namespace MonoDevelop.Xml.Editor
 				} catch (Exception ex) {
 					string msg = GettextCatalog.GetString ("Could not run transform.");
 					monitor.ReportError (msg, ex);
-					monitor.EndTask ();

+					monitor.EndTask ();
+
 				}
 			}
 		}
 		
-		string GetFileContent (string fileName)

+		string GetFileContent (string fileName)
+
 		{
-			MonoDevelop.Projects.Text.IEditableTextFile tf =
-				MonoDevelop.Ide.TextFileProvider.Instance.GetEditableTextFile (fileName);
+			var tf =
+				MonoDevelop.Ide.TextFileProvider.Instance.GetReadOnlyTextEditorData (fileName);
  			if (tf != null)
-				return tf.Text;

-			System.IO.StreamReader reader = new System.IO.StreamReader (fileName, true);

-			return reader.ReadToEnd();

+				return tf.Text;
+
+			System.IO.StreamReader reader = new System.IO.StreamReader (fileName, true);
+
+			return reader.ReadToEnd();
+
 		}
 		
 		#endregion
@@ -650,7 +849,7 @@ namespace MonoDevelop.Xml.Editor
 				return;
 			if (inferredCompletionData == null
 			    || (doc.LastWriteTimeUtc - inferredCompletionData.TimeStampUtc).TotalSeconds >= 5
-			        && doc.Errors.Count <= inferredCompletionData.ErrorCount)
+					&& doc.GetErrorsAsync().Result.Count <= inferredCompletionData.ErrorCount)
 			{
 				inferenceQueued = true;
 				System.Threading.ThreadPool.QueueUserWorkItem (delegate {
@@ -658,7 +857,7 @@ namespace MonoDevelop.Xml.Editor
 						InferredXmlCompletionProvider newData = new InferredXmlCompletionProvider ();
 						newData.Populate (doc.XDocument);
 						newData.TimeStampUtc = DateTime.UtcNow;
-						newData.ErrorCount = doc.Errors.Count;
+						newData.ErrorCount = doc.GetErrorsAsync().Result.Count;
 						this.inferenceQueued = false;
 						this.inferredCompletionData = newData;
 					} catch (Exception ex) {
diff --git a/main/src/addins/Xml/Formatting/XmlFormatter.cs b/main/src/addins/Xml/Formatting/XmlFormatter.cs
index f3090de438..610b373ba2 100644
--- a/main/src/addins/Xml/Formatting/XmlFormatter.cs
+++ b/main/src/addins/Xml/Formatting/XmlFormatter.cs
@@ -26,16 +26,18 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Xml;
 using System.Collections.Generic;
 using MonoDevelop.Ide.Gui.Content;
 using MonoDevelop.Ide;
 using MonoDevelop.Projects.Policies;
 using MonoDevelop.Ide.CodeFormatting;
+using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Xml.Formatting
 {
-	public class XmlFormatter: ICodeFormatter
+	public class XmlFormatter: AbstractCodeFormatter
 	{
 		public static string FormatXml (TextStylePolicy textPolicy, XmlFormattingPolicy formattingPolicy, string input)
 		{
@@ -43,11 +45,18 @@ namespace MonoDevelop.Xml.Formatting
 			try {
 				doc = new XmlDocument ();
 				doc.LoadXml (input);
+			} catch (XmlException ex) {
+				// handle xml files without root element (https://bugzilla.xamarin.com/show_bug.cgi?id=4748)
+				if (ex.Message == "Root element is missing.")
+					return input;
+				MonoDevelop.Core.LoggingService.LogWarning ("Error formatting XML file", ex);
+				IdeApp.Workbench.StatusBar.ShowError ("Error formatting file: " + ex.Message);
+				return input;
 			} catch (Exception ex) {
 				// Ignore malformed xml
 				MonoDevelop.Core.LoggingService.LogWarning ("Error formatting XML file", ex);
 				IdeApp.Workbench.StatusBar.ShowError ("Error formatting file: " + ex.Message);
-				return null;
+				return input;
 			}
 			
 			var sw = new StringWriter ();
@@ -56,12 +65,15 @@ namespace MonoDevelop.Xml.Formatting
 			xmlWriter.Flush ();
 			return sw.ToString ();
 		}
-		
-		public string FormatText (PolicyContainer policyParent, IEnumerable<string> mimeTypeInheritanceChain, string input)
+
+		protected override Core.Text.ITextSource FormatImplementation (PolicyContainer policyParent, string mimeType, Core.Text.ITextSource input, int startOffset, int length)
 		{
+			if (policyParent == null)
+				policyParent = PolicyService.DefaultPolicies;
+			var mimeTypeInheritanceChain = DesktopService.GetMimeTypeInheritanceChain (mimeType).ToList ();
 			var txtPol = policyParent.Get<TextStylePolicy> (mimeTypeInheritanceChain);
 			var xmlPol = policyParent.Get<XmlFormattingPolicy> (mimeTypeInheritanceChain);
-			return FormatXml (txtPol, xmlPol, input);
+			return new StringTextSource(FormatXml (txtPol, xmlPol, input.Text));
 		}
 		
 		public string FormatText (PolicyContainer policyParent, IEnumerable<string> mimeTypeInheritanceChain, string input, int fromOffest, int toOffset)
diff --git a/main/src/addins/Xml/Formatting/XmlFormatterWriter.cs b/main/src/addins/Xml/Formatting/XmlFormatterWriter.cs
index d951ca08dd..424fa9e742 100644
--- a/main/src/addins/Xml/Formatting/XmlFormatterWriter.cs
+++ b/main/src/addins/Xml/Formatting/XmlFormatterWriter.cs
@@ -203,6 +203,8 @@ namespace MonoDevelop.Xml.Formatting
 			
 			switch (node.NodeType) {
 				case XmlNodeType.Document: {
+					if (!defaultFormatSettings.OmitXmlDeclaration)
+						WriteDeclarationIfMissing ((XmlDocument)node);
 					WriteContent (node);
 					break;
 				}
@@ -297,14 +299,15 @@ namespace MonoDevelop.Xml.Formatting
 					break;
 				}
 				case XmlNodeType.XmlDeclaration: {
-					XmlDeclaration dec = (XmlDeclaration) node;
-					WriteRaw (String.Format ("<?xml {0}?>", dec.Value));
+					if (!defaultFormatSettings.OmitXmlDeclaration) {
+						XmlDeclaration dec = (XmlDeclaration) node;
+						WriteRaw (String.Format ("<?xml {0}?>", dec.Value));
+					}
 					break;
 				}
 			}
 			formatSettings = oldFormat;
-		}
-		
+		}

 		string GetAttributeName (XmlAttribute at)
 		{
 			if (at.NamespaceURI.Length > 0)
@@ -318,6 +321,15 @@ namespace MonoDevelop.Xml.Formatting
 			for (XmlNode n = node.FirstChild; n != null; n = n.NextSibling)
 				WriteNode (n);
 		}
+
+		void WriteDeclarationIfMissing (XmlDocument doc)
+		{
+			var declaration = doc.FirstChild as XmlDeclaration;
+			if (declaration == null) {
+				declaration = doc.CreateXmlDeclaration ("1.0", "UTF-8", null);
+				WriteNode (declaration);
+			}
+		}
 		
 		void SetFormat (XmlNode node)
 		{
@@ -1128,7 +1140,7 @@ namespace MonoDevelop.Xml.Formatting
 			if (surrogate &&
 			    ('\uD800' > high || high > '\uDC00' ||
 			     '\uDC00' > ch || ch > '\uDFFF'))
-				throw ArgumentError (String.Format ("Invalid surrogate pair was found. Low: &#x{0:X}; High: &#x{0:X};", (int) ch, (int) high));
+				throw ArgumentError (String.Format ("Invalid surrogate pair was found. Low: &#x{0:X}; High: &#x{1:X};", (int) ch, (int) high));
 			else if (check_character_validity && XmlChar.IsInvalid (ch))
 				throw ArgumentError (String.Format ("Invalid character &#x{0:X};", (int) ch));
 
diff --git a/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanel.cs b/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanel.cs
index 93405e5ac1..1e3ff024e8 100644
--- a/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanel.cs
+++ b/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanel.cs
@@ -25,7 +25,7 @@
 // THE SOFTWARE.
 
 
-using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Ide.Gui.Dialogs;
 
 namespace MonoDevelop.Xml.Formatting
@@ -34,7 +34,7 @@ namespace MonoDevelop.Xml.Formatting
 	{
 		XmlFormattingPolicyPanelWidget panel;
 		
-		public override Widget CreatePanelWidget ()
+		public override Control CreatePanelWidget ()
 		{
 			panel = new XmlFormattingPolicyPanelWidget ();
 			return panel;
diff --git a/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanelWidget.cs b/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanelWidget.cs
index b637b0d3d2..d97e0858eb 100644
--- a/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanelWidget.cs
+++ b/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanelWidget.cs
@@ -26,6 +26,7 @@
 
 using System;
 using Gtk;
+using MonoDevelop.Components;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 
@@ -227,7 +228,7 @@ namespace MonoDevelop.Xml.Formatting
 				};
 				uint c = 2;
 				if (currentFormat.ScopeXPath.Count != 1) {
-					var butRem = new Button (ImageService.GetImage (Stock.Remove, IconSize.Menu));
+					var butRem = new Button (new ImageView (Stock.Remove, IconSize.Menu));
 					tableScopes.Attach (butRem, 2, 3, n, n + 1, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
 					butRem.Clicked += delegate {
 						currentFormat.ScopeXPath.RemoveAt (capn);
@@ -237,7 +238,7 @@ namespace MonoDevelop.Xml.Formatting
 					c++;
 				}
 				if (n == currentFormat.ScopeXPath.Count - 1) {
-					var butAdd = new Button (ImageService.GetImage (Stock.Add, IconSize.Menu));
+					var butAdd = new Button (new ImageView (Stock.Add, IconSize.Menu));
 					tableScopes.Attach (butAdd, c, c + 1, n, n + 1, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
 					butAdd.Clicked += delegate {
 						currentFormat.ScopeXPath.Add ("");
diff --git a/main/src/addins/Xml/MSBuild/MSBuildResolveContext.cs b/main/src/addins/Xml/MSBuild/MSBuildResolveContext.cs
index bb01db9027..b9de149700 100644
--- a/main/src/addins/Xml/MSBuild/MSBuildResolveContext.cs
+++ b/main/src/addins/Xml/MSBuild/MSBuildResolveContext.cs
@@ -82,7 +82,7 @@ namespace MonoDevelop.Xml.MSBuild
 		{
 			var ctx = new MSBuildResolveContext ();
 			ctx.Populate (doc.XDocument);
-			if (doc.Errors.Count > 0)

+			if (doc.GetErrorsAsync().Result.Count > 0)

 				ctx.Merge (previous);
 			return ctx;
 		}
diff --git a/main/src/addins/Xml/MSBuild/MSBuildTextEditorExtension.cs b/main/src/addins/Xml/MSBuild/MSBuildTextEditorExtension.cs
index b0cbcf3288..63c1c11075 100644
--- a/main/src/addins/Xml/MSBuild/MSBuildTextEditorExtension.cs
+++ b/main/src/addins/Xml/MSBuild/MSBuildTextEditorExtension.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Xml.Completion;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Editor;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Xml.MSBuild
 {
@@ -40,20 +41,22 @@ namespace MonoDevelop.Xml.MSBuild
 	{
 		public static readonly string MSBuildMimeType = "application/x-msbuild";
 
-		protected override void GetElementCompletions (CompletionDataList list)
+		protected override  Task<CompletionDataList> GetElementCompletions (CancellationToken token)
 		{
+			var list = new CompletionDataList ();
+
 			AddMiscBeginTags (list);
 
 			var path = GetCurrentPath ();
 
 			if (path.Count == 0) {
 				list.Add (new XmlCompletionData ("Project", XmlCompletionData.DataType.XmlElement));
-				return;
+				return Task.FromResult (list);
 			}
 
 			var rr = ResolveElement (path);
 			if (rr == null)
-				return;
+				return Task.FromResult (list);
 
 			foreach (var c in rr.BuiltinChildren)
 				list.Add (new XmlCompletionData (c, XmlCompletionData.DataType.XmlElement));
@@ -62,6 +65,7 @@ namespace MonoDevelop.Xml.MSBuild
 			if (inferredChildren != null)
 				foreach (var c in inferredChildren)
 					list.Add (new XmlCompletionData (c, XmlCompletionData.DataType.XmlElement));
+			return Task.FromResult (list);
 		}
 
 		IEnumerable<string> GetInferredChildren (ResolveResult rr)
@@ -87,16 +91,16 @@ namespace MonoDevelop.Xml.MSBuild
 			return null;
 		}
 
-		protected override CompletionDataList GetAttributeCompletions (IAttributedXObject attributedOb,
-			Dictionary<string, string> existingAtts)
+		protected override Task<CompletionDataList> GetAttributeCompletions (IAttributedXObject attributedOb,
+		                                                                     Dictionary<string, string> existingAtts, CancellationToken token)
 		{
+			var list = new CompletionDataList ();
 			var path = GetCurrentPath ();
 
 			var rr = ResolveElement (path);
 			if (rr == null)
-				return null;
+				return Task.FromResult (list);
 
-			var list = new CompletionDataList ();
 			foreach (var a in rr.BuiltinAttributes)
 				if (!existingAtts.ContainsKey (a))
 					list.Add (new XmlCompletionData (a, XmlCompletionData.DataType.XmlAttribute));
@@ -107,7 +111,7 @@ namespace MonoDevelop.Xml.MSBuild
 					if (!existingAtts.ContainsKey (a))
 						list.Add (new XmlCompletionData (a, XmlCompletionData.DataType.XmlAttribute));
 
-			return list;
+			return Task.FromResult (list);
 		}
 
 		IEnumerable<string> GetInferredAttributes (ResolveResult rr)
diff --git a/main/src/addins/Xml/MonoDevelop.Xml.csproj b/main/src/addins/Xml/MonoDevelop.Xml.csproj
index 5a796abe25..ecd57e0813 100644
--- a/main/src/addins/Xml/MonoDevelop.Xml.csproj
+++ b/main/src/addins/Xml/MonoDevelop.Xml.csproj
@@ -66,6 +66,14 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
@@ -83,26 +91,11 @@
       <Name>MonoDevelop.DesignerSupport</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj">
-      <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project>
-      <Name>MonoDevelop.SourceEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj">
-      <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project>
-      <Name>Mono.TextEditor</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj">
       <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project>
       <Name>MonoDevelop.Debugger</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -126,11 +119,23 @@
     <EmbeddedResource Include="icons\prefs-xml-16%402x.png">
       <LogicalName>prefs-xml-16@2x.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-xml-schemas-16.png">
-      <LogicalName>prefs-xml-schemas-16.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-xml-16~dark.png">
+      <LogicalName>prefs-xml-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-xml-16~dark%402x.png">
+      <LogicalName>prefs-xml-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-xml-16~sel.png">
+      <LogicalName>prefs-xml-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-xml-16~sel%402x.png">
+      <LogicalName>prefs-xml-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\prefs-xml-16~dark~sel.png">
+      <LogicalName>prefs-xml-16~dark~sel.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\prefs-xml-schemas-16%402x.png">
-      <LogicalName>prefs-xml-schemas-16@2x.png</LogicalName>
+    <EmbeddedResource Include="icons\prefs-xml-16~dark~sel%402x.png">
+      <LogicalName>prefs-xml-16~dark~sel@2x.png</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="Formatting\MonoXmlPolicy.xml">
       <LogicalName>MonoXmlPolicy.xml</LogicalName>
diff --git a/main/src/addins/Xml/Parser/XmlClosingTagState.cs b/main/src/addins/Xml/Parser/XmlClosingTagState.cs
index 138c85a736..f8ac10ee49 100644
--- a/main/src/addins/Xml/Parser/XmlClosingTagState.cs
+++ b/main/src/addins/Xml/Parser/XmlClosingTagState.cs
@@ -108,7 +108,8 @@ namespace MonoDevelop.Xml.Parser
 			}
 			
 			if (c == '<') {
-				context.LogError ("Unexpected '<' in tag.");
+				context.LogError ("Unexpected '<' in tag.", context.LocationMinus (1));
+				context.Nodes.Pop ();
 				rollback = string.Empty;
 				return Parent;
 			}
@@ -123,7 +124,8 @@ namespace MonoDevelop.Xml.Parser
 			}
 			
 			rollback = string.Empty;
-			context.LogError ("Unexpected character '" + c + "' in closing tag.");

+			context.LogError ("Unexpected character '" + c + "' in closing tag.", context.LocationMinus (1));
+			context.Nodes.Pop ();
 			return Parent;

 		}
 	}
diff --git a/main/src/addins/Xml/Parser/XmlCommentState.cs b/main/src/addins/Xml/Parser/XmlCommentState.cs
index c4ff6fb2e7..33ac93a3b1 100644
--- a/main/src/addins/Xml/Parser/XmlCommentState.cs
+++ b/main/src/addins/Xml/Parser/XmlCommentState.cs
@@ -64,6 +64,7 @@ namespace MonoDevelop.Xml.Parser
 					return Parent;
 				} else {
 					context.LogWarning ("The string '--' should not appear within comments.");
+					context.StateTag = NOMATCH;
 				}

 			} else {
 				// not any part of a '-->', so make sure matching is reset
diff --git a/main/src/addins/Xml/Parser/XmlDocTypeState.cs b/main/src/addins/Xml/Parser/XmlDocTypeState.cs
index fc8103e8fd..2445422939 100644
--- a/main/src/addins/Xml/Parser/XmlDocTypeState.cs
+++ b/main/src/addins/Xml/Parser/XmlDocTypeState.cs
@@ -27,9 +27,8 @@
 //
 
 using System;
-using ICSharpCode.NRefactory.TypeSystem;
-using ICSharpCode.NRefactory;
 using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
 

 namespace MonoDevelop.Xml.Parser

 {

@@ -132,7 +131,7 @@ namespace MonoDevelop.Xml.Parser
 				switch (context.StateTag) {
 				case 0:
 					if (c == '[') {
-						doc.InternalDeclarationRegion = new DomRegion (context.Location, TextLocation.Empty);
+						doc.InternalDeclarationRegion = new DocumentRegion (context.Location, DocumentLocation.Empty);
 						context.StateTag = 1;
 						return null;
 					}
@@ -143,7 +142,7 @@ namespace MonoDevelop.Xml.Parser
 						return null;
 					} else if (c == ']') {
 						context.StateTag = 0;
-						doc.InternalDeclarationRegion = new DomRegion (doc.InternalDeclarationRegion.Begin, context.Location);
+						doc.InternalDeclarationRegion = new DocumentRegion (doc.InternalDeclarationRegion.Begin, context.Location);
 						return null;
 					}
 					break;
diff --git a/main/src/addins/Xml/Parser/XmlParser.cs b/main/src/addins/Xml/Parser/XmlParser.cs
index de40145786..72d8f726e6 100644
--- a/main/src/addins/Xml/Parser/XmlParser.cs
+++ b/main/src/addins/Xml/Parser/XmlParser.cs
@@ -30,10 +30,10 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 
-using ICSharpCode.NRefactory;
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Ide.Gui.Content;
-using MonoDevelop.Xml.Dom;

+using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.TypeSystem;

 

 namespace MonoDevelop.Xml.Parser

 {

@@ -45,8 +45,8 @@ namespace MonoDevelop.Xml.Parser
 		bool buildTree;
 		
 		int position;

-		TextLocation location;

-		TextLocation previousLineEnd;
+		DocumentLocation location;

+		DocumentLocation previousLineEnd;
 		int stateTag;
 		StringBuilder keywordBuilder;
 		int currentStateLength;
@@ -94,7 +94,7 @@ namespace MonoDevelop.Xml.Parser
 		#region IDocumentStateEngine

 		

 		public int Position { get { return position; } }
-		public TextLocation Location { get { return location; } }
+		public DocumentLocation Location { get { return location; } }
 		

 		public void Reset ()
 		{
@@ -102,8 +102,8 @@ namespace MonoDevelop.Xml.Parser
 			previousState = rootState;

 			position = 0;
 			stateTag = 0;

-			location = new TextLocation (1, 1);

-			previousLineEnd = TextLocation.Empty;
+			location = new DocumentLocation (1, 1);

+			previousLineEnd = DocumentLocation.Empty;
 			keywordBuilder = new StringBuilder ();
 			currentStateLength = 0;
 			nodes = new NodeStack ();
@@ -131,10 +131,10 @@ namespace MonoDevelop.Xml.Parser
 				//FIXME: position/location should be at current char, not after it
 				position++;
 				if (c == '\n') {
-					previousLineEnd = new TextLocation (location.Line, location.Column + 1);
-					location = new TextLocation (location.Line + 1, 1);
+					previousLineEnd = new DocumentLocation (location.Line, location.Column + 1);
+					location = new DocumentLocation (location.Line + 1, 1);
 				} else {
-					location = new TextLocation (location.Line, location.Column + 1);
+					location = new DocumentLocation (location.Line, location.Column + 1);
 				}
 
 				for (int loopLimit = 0; loopLimit < 10; loopLimit++) {
@@ -172,7 +172,7 @@ namespace MonoDevelop.Xml.Parser
 
 					//rollback position and location so they're valid
 					position -= (rollback.Length + 1);
-					location = new TextLocation (location.Line, location.Column - (rollback.Length + 1));
+					location = new DocumentLocation (location.Line, location.Column - (rollback.Length + 1));
 					if (location.Column < 0)
 						throw new InvalidOperationException ("Can't roll back across line boundary");
 
@@ -181,7 +181,7 @@ namespace MonoDevelop.Xml.Parser
 
 					//restore position and location
 					position++;
-					location = new TextLocation (location.Line, location.Column + 1);
+					location = new DocumentLocation (location.Line, location.Column + 1);
 				}
 				throw new InvalidOperationException ("Too many state changes for char '" + c + "'. Current state is " + currentState.ToString () + ".");
 			} catch (Exception ex)  {
@@ -253,8 +253,8 @@ namespace MonoDevelop.Xml.Parser
 				builder.AppendLine ("Errors=");
 				foreach (Error err in errors) {
 					builder.Append (' ', 4);
-					builder.AppendFormat ("[{0}@{1}:{2}, {3}]\n", err.ErrorType, err.Region.BeginLine,
-					                      err.Region.BeginColumn, err.Message);
+					builder.AppendFormat ("[{0}@{1}:{2}, {3}]\n", err.ErrorType, err.Region.Begin.Line,
+					                      err.Region.Begin.Column, err.Message);
 				}
 			}
 			

@@ -269,7 +269,7 @@ namespace MonoDevelop.Xml.Parser
 			set { stateTag = value; }
 		}
 		
-		TextLocation IXmlParserContext.LocationMinus (int colOffset)
+		DocumentLocation IXmlParserContext.LocationMinus (int colOffset)
 		{
 			int col = Location.Column - colOffset;

 			int line = Location.Line;

@@ -279,7 +279,7 @@ namespace MonoDevelop.Xml.Parser
 				System.Diagnostics.Debug.Assert (col > 0);

 			}

 			System.Diagnostics.Debug.Assert (line > 0);
-			return new TextLocation (line, col);
+			return new DocumentLocation (line, col);
 		}
 		
 		StringBuilder IXmlParserContext.KeywordBuilder {
@@ -307,25 +307,25 @@ namespace MonoDevelop.Xml.Parser
 				InternalLogError (new Error (ErrorType.Warning, message, ((IXmlParserContext)this).LocationMinus (1)));
 		}
 		
-		void IXmlParserContext.LogError (string message, TextLocation location)
+		void IXmlParserContext.LogError (string message, DocumentLocation location)
 		{
 			if (errors != null || ErrorLogged != null)
 				InternalLogError (new Error (ErrorType.Error, message, ((IXmlParserContext)this).LocationMinus (1)));
 		}
 		
-		void IXmlParserContext.LogWarning (string message, TextLocation location)
+		void IXmlParserContext.LogWarning (string message, DocumentLocation location)
 		{
 			if (errors != null || ErrorLogged != null)
 				InternalLogError (new Error (ErrorType.Warning, message, location));
 		}
 		
-		void IXmlParserContext.LogError (string message, DomRegion region)
+		void IXmlParserContext.LogError (string message, DocumentRegion region)
 		{
 			if (errors != null || ErrorLogged != null)
 				InternalLogError (new Error (ErrorType.Error, message, region));
 		}
 		
-		void IXmlParserContext.LogWarning (string message, DomRegion region)
+		void IXmlParserContext.LogWarning (string message, DocumentRegion region)
 		{
 			if (errors != null || ErrorLogged != null)
 				InternalLogError (new Error (ErrorType.Warning, message, region));
@@ -382,17 +382,17 @@ namespace MonoDevelop.Xml.Parser
 		int StateTag { get; set; }
 		StringBuilder KeywordBuilder { get; }
 		int CurrentStateLength { get; }
-		TextLocation Location { get; }
-		TextLocation LocationMinus (int colOffset);
+		DocumentLocation Location { get; }
+		DocumentLocation LocationMinus (int colOffset);
 		XmlParserState PreviousState { get; }
 		NodeStack Nodes { get; }
 		bool BuildTree { get; }
 		void LogError (string message);
 		void LogWarning (string message);
-		void LogError (string message, TextLocation location);
-		void LogWarning (string message, TextLocation location);
-		void LogError (string message, DomRegion region);
-		void LogWarning (string message, DomRegion region);
+		void LogError (string message, DocumentLocation location);
+		void LogWarning (string message, DocumentLocation location);
+		void LogError (string message, DocumentRegion region);
+		void LogWarning (string message, DocumentRegion region);
 		void EndAll (bool pop);
 		void ConnectAll ();
 	}
diff --git a/main/src/addins/Xml/Parser/XmlRootState.cs b/main/src/addins/Xml/Parser/XmlRootState.cs
index d77d7e787b..bdc49a57a9 100644
--- a/main/src/addins/Xml/Parser/XmlRootState.cs
+++ b/main/src/addins/Xml/Parser/XmlRootState.cs
@@ -26,8 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Xml.Dom;

+using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;

 

 namespace MonoDevelop.Xml.Parser

 {

@@ -106,7 +106,7 @@ namespace MonoDevelop.Xml.Parser
 			if (c == '<') {
 				if (context.StateTag != FREE)
 					context.LogError ("Incomplete tag opening; encountered unexpected '<'.",
-						new DomRegion (
+						new DocumentRegion (
 							context.LocationMinus (LengthFromOpenBracket (context) + 1),
 							context.LocationMinus (1)));
 				context.StateTag = BRACKET;
@@ -176,7 +176,7 @@ namespace MonoDevelop.Xml.Parser
 			}
 			
 			context.LogError ("Incomplete tag opening; encountered unexpected character '" + c + "'.",
-				new DomRegion (
+				new DocumentRegion (
 					context.LocationMinus (LengthFromOpenBracket (context)),
 					context.Location));
 			
diff --git a/main/src/addins/Xml/Parser/XmlTagState.cs b/main/src/addins/Xml/Parser/XmlTagState.cs
index 20de1d46ec..f7b49420c8 100644
--- a/main/src/addins/Xml/Parser/XmlTagState.cs
+++ b/main/src/addins/Xml/Parser/XmlTagState.cs
@@ -27,19 +27,19 @@
 //
 
 using System;
-using System.Diagnostics;

-using ICSharpCode.NRefactory;
-using MonoDevelop.Xml.Dom;

-

+using System.Diagnostics;
+using MonoDevelop.Xml.Dom;
+using MonoDevelop.Ide.Editor;
+
 namespace MonoDevelop.Xml.Parser
 {
 	
 	
 	public class XmlTagState : XmlParserState
-	{

-		const int ATTEMPT_RECOVERY = 1;

-		const int RECOVERY_FOUND_WHITESPACE = 2;

-		const int MAYBE_SELF_CLOSING = 2;

+	{
+		const int ATTEMPT_RECOVERY = 1;
+		const int RECOVERY_FOUND_WHITESPACE = 2;
+		const int MAYBE_SELF_CLOSING = 2;
 		const int OK = 0;
 
 		readonly XmlAttributeState AttributeState;
@@ -49,16 +49,16 @@ namespace MonoDevelop.Xml.Parser
 		
 		public XmlTagState  (XmlAttributeState attributeState)
 			: this (attributeState, new XmlNameState ()) {}
-		

-		public XmlTagState (XmlAttributeState attributeState, XmlNameState nameState)

+		
+		public XmlTagState (XmlAttributeState attributeState, XmlNameState nameState)
 		{
 			this.AttributeState = attributeState;
 			this.NameState = nameState;
 			
 			Adopt (this.AttributeState);
-			Adopt (this.NameState);

+			Adopt (this.NameState);
 		}
-		

+		
 		public override XmlParserState PushChar (char c, IXmlParserContext context, ref string rollback)
 		{
 			XElement element = context.Nodes.Peek () as XElement;
@@ -105,33 +105,33 @@ namespace MonoDevelop.Xml.Parser
 					Close (element, context, context.Location);
 				}
 				return Parent;
-			}

-

-			if (c == '/') {

-				context.StateTag = MAYBE_SELF_CLOSING;

-				return null;

-			}

-

-			if (context.StateTag == ATTEMPT_RECOVERY) {

-				if (XmlChar.IsWhitespace (c)) {

-					context.StateTag = RECOVERY_FOUND_WHITESPACE;

-				}

-				return null;

-			}

-

-			if (context.StateTag == RECOVERY_FOUND_WHITESPACE) {

-				if (!XmlChar.IsFirstNameChar (c))

-					return null;

-			}

-

-			context.StateTag = OK;

-

+			}
+
+			if (c == '/') {
+				context.StateTag = MAYBE_SELF_CLOSING;
+				return null;
+			}
+
+			if (context.StateTag == ATTEMPT_RECOVERY) {
+				if (XmlChar.IsWhitespace (c)) {
+					context.StateTag = RECOVERY_FOUND_WHITESPACE;
+				}
+				return null;
+			}
+
+			if (context.StateTag == RECOVERY_FOUND_WHITESPACE) {
+				if (!XmlChar.IsFirstNameChar (c))
+					return null;
+			}
+
+			context.StateTag = OK;
+
 			if (!element.IsNamed && XmlChar.IsFirstNameChar (c)) {
 				rollback = string.Empty;
-				return NameState;

-			}

-

-			if (context.CurrentStateLength > 1 && XmlChar.IsFirstNameChar (c)) {

+				return NameState;
+			}
+
+			if (context.CurrentStateLength > 1 && XmlChar.IsFirstNameChar (c)) {
 				rollback = string.Empty;
 				return AttributeState;
 			}
@@ -139,24 +139,21 @@ namespace MonoDevelop.Xml.Parser
 			if (XmlChar.IsWhitespace (c))
 				return null;
 
-			context.LogError ("Unexpected character '" + c + "' in tag.", context.LocationMinus (1));

+			context.LogError ("Unexpected character '" + c + "' in tag.", context.LocationMinus (1));
 			context.StateTag = ATTEMPT_RECOVERY;
-			return null;

+			return null;
 		}
 		
-		protected virtual void Close (XElement element, IXmlParserContext context, TextLocation location)
+		protected virtual void Close (XElement element, IXmlParserContext context, DocumentLocation location)
 		{
 			//have already checked that element is not null, i.e. top of stack is our element
 			if (element.IsClosed)
-				context.Nodes.Pop ();

-

+				context.Nodes.Pop ();
+
 			element.End (location);
 			if (context.BuildTree) {
-				XContainer container = element.IsClosed? 
-					  (XContainer) context.Nodes.Peek ()
-					: (XContainer) context.Nodes.Peek (1);
-										
-				container.AddChildNode (element);
+				var parent = (XContainer)context.Nodes.Peek (element.IsClosed ? 0 : 1);
+				parent.AddChildNode (element);
 			}
 		}
 	}
diff --git a/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml b/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml
index d2da8c8f7e..106cc52ce7 100644
--- a/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml
+++ b/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml
@@ -86,11 +86,11 @@
 		<Section id="XmlFormattingOptions" insertbefore="Formatting" _label="XML" fill="true" class="MonoDevelop.Xml.Editor.XmlEditorOptionsPanel" icon="md-prefs-xml" />

 	</Extension>

 	<Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/TextEditor">

-		<Section id="XmlSchemas" _label="XML Schemas" fill="true" class="MonoDevelop.Xml.Editor.XmlSchemasPanel" icon="md-prefs-xml-schemas" />

+		<Section id="XmlSchemas" _label="XML Schemas" fill="true" class="MonoDevelop.Xml.Editor.XmlSchemasPanel" icon="md-prefs-xml" />

 	</Extension>

 

 	<Extension path = "/MonoDevelop/TypeSystem/Parser">

-		<Parser class = "MonoDevelop.Xml.MSBuild.MSBuildDocumentParser" mimeType = "application/x-msbuild" id = "XmlParser"/>

+		<Parser class = "MonoDevelop.Xml.MSBuild.MSBuildDocumentParser" mimeType = "application/x-msbuild" id = "MSBuildParser"/>
 		<Parser class = "MonoDevelop.Xml.Editor.XmlDocumentParser" mimeType = "application/xml" id = "XmlParser"/>

 	</Extension>

 

@@ -120,6 +120,5 @@
   

 	<Extension path="/MonoDevelop/Core/StockIcons">

 		<StockIcon stockid="md-prefs-xml" resource="prefs-xml-16.png" size="Menu" />

-		<StockIcon stockid="md-prefs-xml-schemas" resource="prefs-xml-schemas-16.png" size="Menu" />

 	</Extension>

 </ExtensionModel>

diff --git a/main/src/addins/Xml/Tests/Formatting/XmlFormatterTests.cs b/main/src/addins/Xml/Tests/Formatting/XmlFormatterTests.cs
new file mode 100644
index 0000000000..ae5d1cf583
--- /dev/null
+++ b/main/src/addins/Xml/Tests/Formatting/XmlFormatterTests.cs
@@ -0,0 +1,83 @@
+//

+// XmlFormatterTests.cs

+//

+// Author:

+//       Matt Ward <matt.ward@xamarin.com>

+//

+// Copyright (c) 2016 Xamarin Inc. (http://xamarin.com)

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+using MonoDevelop.Ide.Gui.Content;

+using MonoDevelop.Xml.Formatting;

+using NUnit.Framework;

+

+namespace MonoDevelop.Xml.Tests.Formatting

+{

+	[TestFixture]

+	public class XmlFormatterTests

+	{

+		TextStylePolicy textPolicy;

+		XmlFormattingPolicy xmlPolicy;

+

+		[SetUp]

+		public void Init ()

+		{

+			textPolicy = new TextStylePolicy ();

+			xmlPolicy = new XmlFormattingPolicy ();

+		}

+

+		[Test]

+		public void OmitXmlDeclarationIsFalse_XmlDeclarationDoesNotExist_XmlDeclarationIsAdded ()

+		{

+			xmlPolicy.DefaultFormat.OmitXmlDeclaration = false;

+			string input = "<a></a>";

+			string expectedResult = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<a>\n</a>";

+

+			string result = XmlFormatter.FormatXml (textPolicy, xmlPolicy, input);

+

+			Assert.AreEqual (expectedResult, result);

+		}

+

+		[Test]

+		public void OmitXmlDeclarationIsTrue_XmlDeclarationExists_XmlDeclarationRemoved ()

+		{

+			xmlPolicy.DefaultFormat.OmitXmlDeclaration = true;

+			string input = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a></a>";

+			string expectedResult = "<a>\n</a>";

+

+			string result = XmlFormatter.FormatXml (textPolicy, xmlPolicy, input);

+

+			Assert.AreEqual (expectedResult, result);

+		}

+

+		[Test]

+		public void OmitXmlDeclarationIsFalse_XmlDeclarationExists_XmlDeclarationUnmodified ()

+		{

+			xmlPolicy.DefaultFormat.OmitXmlDeclaration = false;

+			string input = "<?xml version=\"1.0\"?><a></a>";

+			string expectedResult = "<?xml version=\"1.0\"?>\n<a>\n</a>";

+

+			string result = XmlFormatter.FormatXml (textPolicy, xmlPolicy, input);

+

+			Assert.AreEqual (expectedResult, result);

+		}

+	}

+}

+

diff --git a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj
index f218032b4d..4124d68165 100644
--- a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj
+++ b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj
@@ -52,10 +52,6 @@
       <Name>MonoDevelop.Ide</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\external\guiunit\src\framework\GuiUnit_NET_4_5.csproj">
       <Project>{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}</Project>
       <Name>GuiUnit_NET_4_5</Name>
@@ -69,6 +65,10 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CodeAnalysis">
+      <HintPath>..\..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Parser\ActiveElementStartPathTestFixture.cs" />
@@ -127,6 +127,7 @@
     <Compile Include="Schema\Uri\GetUriTestFixture.cs" />
     <Compile Include="Schema\Includes\AttributeGroupRefSchemaIncludeTestFixture.cs" />
     <Compile Include="Schema\Includes\TwoElementSchemaIncludeTestFixture.cs" />
+    <Compile Include="Formatting\XmlFormatterTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Parser\" />
diff --git a/main/src/addins/Xml/Tests/Parser/ParsingTests.cs b/main/src/addins/Xml/Tests/Parser/ParsingTests.cs
index 04d8f2275d..a269ad7cd2 100644
--- a/main/src/addins/Xml/Tests/Parser/ParsingTests.cs
+++ b/main/src/addins/Xml/Tests/Parser/ParsingTests.cs
@@ -27,11 +27,11 @@
 //
 
 using System.Linq;
+using NUnit.Framework;
 
-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
-using NUnit.Framework;
+using MonoDevelop.Ide.TypeSystem;
 
 
 namespace MonoDevelop.Xml.Tests.Parser
@@ -170,7 +170,17 @@ namespace MonoDevelop.Xml.Tests.Parser
 			parser.AssertEmpty ();
 			parser.AssertErrorCount (0);
 		}
-		
+
+
+		[Test]
+		public void BadClosingTag ()
+		{
+			var parser = new TestXmlParser (CreateRootState ());
+			parser.Parse (@"<doc><x><abc></ab c><cd></cd></x></doc>");
+			parser.AssertEmpty ();
+			parser.AssertErrorCount (2);
+		}
+
 		[Test]
 		public void Misc ()
 		{
@@ -243,8 +253,8 @@ namespace MonoDevelop.Xml.Tests.Parser
 			Assert.AreEqual ("foo", el.Attributes.ElementAt (2).Name.Name);
 			Assert.AreEqual (3, el.Attributes.Count ());

 			parser.AssertErrorCount (1);
-			Assert.AreEqual (1, parser.Errors [0].Region.BeginLine);
-			Assert.AreEqual (26, parser.Errors [0].Region.BeginColumn);

+			Assert.AreEqual (1, parser.Errors [0].Region.Begin.Line);
+			Assert.AreEqual (26, parser.Errors [0].Region.Begin.Column);

 		}
 
 		[Test]
diff --git a/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs b/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs
index 74afe274ff..04b6c5b979 100644
--- a/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs
+++ b/main/src/addins/Xml/Tests/Parser/TestXmlParser.cs
@@ -30,12 +30,12 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 

-using ICSharpCode.NRefactory;

-using ICSharpCode.NRefactory.TypeSystem;
 using MonoDevelop.Xml.Completion;
 using MonoDevelop.Xml.Dom;
 using MonoDevelop.Xml.Parser;
 using NUnit.Framework;
+using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide.Editor;
 
 namespace MonoDevelop.Xml.Tests.Parser
 {
@@ -65,7 +65,7 @@ namespace MonoDevelop.Xml.Tests.Parser
 			var p = new TestXmlParser (new XmlRootState (), true);
 
 			//parse and capture line/col info
-			var list = new List<TextLocation> ();
+			var list = new List<DocumentLocation> ();
 			p.Parse (txt, Array.ConvertAll (asserts, a => (Action)(() => list.Add (p.Location))));
 
 			var doc = (XDocument) p.Nodes.Last ();
diff --git a/main/src/addins/Xml/Tests/Schema/AbstractElementTestFixture.cs b/main/src/addins/Xml/Tests/Schema/AbstractElementTestFixture.cs
index 62dd1300db..c24ae2d0e0 100644
--- a/main/src/addins/Xml/Tests/Schema/AbstractElementTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/AbstractElementTestFixture.cs
@@ -1,7 +1,9 @@
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

-

+using System.Threading;

+using System.Threading.Tasks;
+
 namespace MonoDevelop.Xml.Tests.Schema

 {

 	/// <summary>

@@ -14,49 +16,57 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList fileElementAttributes;

 		CompletionDataList fileElementChildren;

 		

-		public override void FixtureInit()

+		async Task Init ()

 		{

+			if (fileElementAttributes != null)

+				return;

+			

 			var path = new XmlElementPath();

 			

 			path.Elements.Add(new QualifiedName("project", "http://foo"));

 			path.Elements.Add(new QualifiedName("items", "http://foo"));

-			

-			itemsElementChildren = SchemaCompletionData.GetChildElementCompletionData(path);

+

+			itemsElementChildren = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 			

 			path.Elements.Add(new QualifiedName("file", "http://foo"));

 			

-			fileElementAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

-			fileElementChildren = SchemaCompletionData.GetChildElementCompletionData(path);

+			fileElementAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

+			fileElementChildren = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void ItemsElementHasTwoChildElements()

+		public async Task ItemsElementHasTwoChildElements()

 		{

+			await Init ();

 			Assert.AreEqual(2, itemsElementChildren.Count, 

 			                "Should be 2 child elements.");

 		}

 		

 		[Test]

-		public void ReferenceElementIsChildOfItemsElement()

+		public async Task ReferenceElementIsChildOfItemsElement()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(itemsElementChildren, "reference"));

 		}

 		

 		[Test]

-		public void FileElementIsChildOfItemsElement()

+		public async Task FileElementIsChildOfItemsElement()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(itemsElementChildren, "file"));

 		}

 		

 		[Test]

-		public void FileElementHasAttributeNamedType()

+		public async Task FileElementHasAttributeNamedType()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(fileElementAttributes, "type"));

 		}

 		

 		[Test]

-		public void FileElementHasTwoChildElements()

+		public async Task FileElementHasTwoChildElements()

 		{

+			await Init ();

 			Assert.AreEqual(2, fileElementChildren.Count, "Should be 2 child elements.");

 		}

 		

diff --git a/main/src/addins/Xml/Tests/Schema/AllElementTestFixture.cs b/main/src/addins/Xml/Tests/Schema/AllElementTestFixture.cs
index a9a7a3265d..9f964e37b9 100644
--- a/main/src/addins/Xml/Tests/Schema/AllElementTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/AllElementTestFixture.cs
@@ -1,7 +1,9 @@
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

-

+using System.Threading;

+using System.Threading.Tasks;
+
 namespace MonoDevelop.Xml.Tests.Schema

 {

 	/// <summary>

@@ -15,33 +17,39 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList firstNameAttributes;

 		CompletionDataList firstNameElementChildren;

 		

-		public override void FixtureInit()

+		async Task Init ()

 		{

+			if (personElementChildren != null)

+				return;

+			

 			var path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("person", "http://foo"));

-			personElementChildren = SchemaCompletionData.GetChildElementCompletionData(path);

+			personElementChildren = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 			

 			path.Elements.Add(new QualifiedName("firstname", "http://foo"));

-			firstNameAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

-			firstNameElementChildren = SchemaCompletionData.GetChildElementCompletionData(path);

+			firstNameAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

+			firstNameElementChildren = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void PersonElementHasTwoChildElements()

+		public async Task PersonElementHasTwoChildElements()

 		{

+			await Init ();

 			Assert.AreEqual(2, personElementChildren.Count, 

 			                "Should be 2 child elements.");

 		}

 		

 		[Test]

-		public void FirstNameElementHasAttribute()

+		public async Task FirstNameElementHasAttribute()

 		{

+			await Init ();

 			Assert.AreEqual(1, firstNameAttributes.Count, "Should have one attribute.");

 		}

 		

 		[Test]

-		public void FirstNameElementHasChildren()

+		public async Task FirstNameElementHasChildren()

 		{

+			await Init ();

 			Assert.AreEqual(2, firstNameElementChildren.Count, 

 			                "Should be 2 child elements.");

 		}

diff --git a/main/src/addins/Xml/Tests/Schema/AttributeAnnotationTestFixture.cs b/main/src/addins/Xml/Tests/Schema/AttributeAnnotationTestFixture.cs
index 071f9ac510..289c650d31 100644
--- a/main/src/addins/Xml/Tests/Schema/AttributeAnnotationTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/AttributeAnnotationTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -14,27 +16,32 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList fooAttributeCompletionData;

 		CompletionDataList barAttributeCompletionData;

 		

-		public override void FixtureInit()

-		{			

+		async Task Init ()
+		{
+			if (fooAttributeCompletionData != null)
+				return;
+			

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("foo", "http://foo.com"));

 			

-			fooAttributeCompletionData = SchemaCompletionData.GetAttributeCompletionData(path);

+			fooAttributeCompletionData = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 

 			path.Elements.Add(new QualifiedName("bar", "http://foo.com"));

-			barAttributeCompletionData = SchemaCompletionData.GetAttributeCompletionData(path);

+			barAttributeCompletionData = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 				

 		[Test]

-		public void FooAttributeDocumentation()

+		public async Task FooAttributeDocumentation()

 		{

-			Assert.AreEqual("Documentation for foo attribute.", fooAttributeCompletionData[0].Description);

+			await Init ();
+			Assert.AreEqual("Documentation for foo attribute.", ((MonoDevelop.Ide.CodeCompletion.CompletionData)fooAttributeCompletionData[0]).Description);

 		}

 		

 		[Test]

-		public void BarAttributeDocumentation()

+		public async Task BarAttributeDocumentation()

 		{

-			Assert.AreEqual("Documentation for bar attribute.", barAttributeCompletionData[0].Description);

+			await Init ();
+			Assert.AreEqual("Documentation for bar attribute.", ((MonoDevelop.Ide.CodeCompletion.CompletionData)barAttributeCompletionData[0]).Description);

 		}

 		

 		protected override string GetSchema()

diff --git a/main/src/addins/Xml/Tests/Schema/AttributeGroupRefTestFixture.cs b/main/src/addins/Xml/Tests/Schema/AttributeGroupRefTestFixture.cs
index 94b397c1bc..430ba4bdd3 100644
--- a/main/src/addins/Xml/Tests/Schema/AttributeGroupRefTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/AttributeGroupRefTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;
 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -12,43 +14,50 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList attributeCompletionData;

 		

-		public override void FixtureInit()

-		{			

+		async Task Init ()
+		{
+			if (attributeCompletionData != null)
+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

-			attributeCompletionData = SchemaCompletionData.GetAttributeCompletionData(path);

+			attributeCompletionData = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void AttributeCount()

+		public async Task AttributeCount()

 		{

+			await Init ();
 			Assert.AreEqual(4, attributeCompletionData.Count, "Should be 4 attributes.");

 		}

 		

 		[Test]

-		public void NameAttribute()

+		public async Task NameAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "name"), 

 			              "Attribute name does not exist.");

 		}		

 		

 		[Test]

-		public void IdAttribute()

+		public async Task IdAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "id"), 

 			              "Attribute id does not exist.");

 		}		

 		

 		[Test]

-		public void StyleAttribute()

+		public async Task StyleAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "style"), 

 			              "Attribute style does not exist.");

 		}	

 		

 		[Test]

-		public void TitleAttribute()

+		public async Task TitleAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "title"), 

 			              "Attribute title does not exist.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/AttributeRefTestFixture.cs b/main/src/addins/Xml/Tests/Schema/AttributeRefTestFixture.cs
index 4cf58808ed..93afa986de 100644
--- a/main/src/addins/Xml/Tests/Schema/AttributeRefTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/AttributeRefTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -12,41 +14,48 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList attributes;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (attributes != null)
+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("html", "http://foo/xhtml"));

-			attributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			attributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void HtmlAttributeCount()

+		public async Task HtmlAttributeCount()

 		{

+			await Init ();
 			Assert.AreEqual(4, attributes.Count, 

 			                "Should be 4 attributes.");

 		}

 		

 		[Test]

-		public void HtmlLangAttribute()

+		public async Task HtmlLangAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributes, "lang"), "Attribute lang not found.");

 		}

 		

 		[Test]

-		public void HtmlIdAttribute()

+		public async Task HtmlIdAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributes, "id"), "Attribute id not found.");

 		}		

 		

 		[Test]

-		public void HtmlDirAttribute()

+		public async Task HtmlDirAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributes, "dir"), "Attribute dir not found.");

 		}			

 		

 		[Test]

-		public void HtmlXmlLangAttribute()

+		public async Task HtmlXmlLangAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributes, "xml:lang"), "Attribute xml:lang not found.");

 		}				

 		

diff --git a/main/src/addins/Xml/Tests/Schema/AttributeValueAnnotationTestFixture.cs b/main/src/addins/Xml/Tests/Schema/AttributeValueAnnotationTestFixture.cs
index 85860aeed5..baf51d11d3 100644
--- a/main/src/addins/Xml/Tests/Schema/AttributeValueAnnotationTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/AttributeValueAnnotationTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -13,16 +15,19 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList barAttributeValuesCompletionData;

 		

-		public override void FixtureInit()

-		{	

+		async Task Init ()
+		{
+			if (barAttributeValuesCompletionData != null)
+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("foo", "http://foo.com"));

-			barAttributeValuesCompletionData = SchemaCompletionData.GetAttributeValueCompletionData(path, "bar");

+			barAttributeValuesCompletionData = await SchemaCompletionData.GetAttributeValueCompletionData(path, "bar", CancellationToken.None);

 		}

 				

 		[Test]

-		public void BarAttributeValueDefaultDocumentation()

+		public async Task BarAttributeValueDefaultDocumentation()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.ContainsDescription(barAttributeValuesCompletionData, "default", "Default attribute value info."),

 			                "Description for attribute value 'default' is incorrect.");

 		}

diff --git a/main/src/addins/Xml/Tests/Schema/ChildElementAttributesTestFixture.cs b/main/src/addins/Xml/Tests/Schema/ChildElementAttributesTestFixture.cs
index 4154ee41d4..b2cf869f8a 100644
--- a/main/src/addins/Xml/Tests/Schema/ChildElementAttributesTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/ChildElementAttributesTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -12,24 +14,28 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList attributes;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (attributes != null)
+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("project", "http://nant.sf.net//nant-0.84.xsd"));

 			path.Elements.Add(new QualifiedName("attrib", "http://nant.sf.net//nant-0.84.xsd"));

 			

-			attributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			attributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 

 		[Test]

-		public void AttributeCount()

+		public async Task AttributeCount()

 		{

+			await Init ();
 			Assert.AreEqual(10, attributes.Count, "Should be one attribute.");

 		}

 		

 		[Test]

-		public void FileAttribute()

+		public async Task FileAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributes, "file"),

 			              "Attribute file does not exist.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/ChoiceTestFixture.cs b/main/src/addins/Xml/Tests/Schema/ChoiceTestFixture.cs
index 6eff3b644c..2f6e50d4b1 100644
--- a/main/src/addins/Xml/Tests/Schema/ChoiceTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/ChoiceTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -13,51 +15,58 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList noteChildElements;

 		

-		public override void FixtureInit()

-		{			

+		async Task Init ()
+		{
+			if (noteChildElements != null)
+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 			

-			noteChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

+			noteChildElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void TitleHasNoChildElements()

+		public async Task TitleHasNoChildElements()

 		{

+			await Init ();
 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 			path.Elements.Add(new QualifiedName("title", "http://www.w3schools.com"));

-			Assert.AreEqual(0, SchemaCompletionData.GetChildElementCompletionData(path).Count, 

+			Assert.AreEqual(0, (await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None)).Count, 

 			                "Should be no child elements.");

 		}

 		

 		[Test]

-		public void TextHasNoChildElements()

+		public async Task TextHasNoChildElements()

 		{

+			await Init ();
 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 			path.Elements.Add(new QualifiedName("text", "http://www.w3schools.com"));

-			Assert.AreEqual(0, SchemaCompletionData.GetChildElementCompletionData(path).Count, 

+			Assert.AreEqual(0, (await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None)).Count, 

 			                "Should be no child elements.");

 		}		

 		

 		[Test]

-		public void NoteHasTwoChildElements()

+		public async Task NoteHasTwoChildElements()

 		{

+			await Init ();
 			Assert.AreEqual(2, noteChildElements.Count, 

 			                "Should be two child elements.");

 		}

 		

 		[Test]

-		public void NoteChildElementIsText()

+		public async Task NoteChildElementIsText()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(noteChildElements, "text"), 

 			              "Should have a child element called text.");

 		}

 		

 		[Test]

-		public void NoteChildElementIsTitle()

+		public async Task NoteChildElementIsTitle()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(noteChildElements, "title"), 

 			              "Should have a child element called title.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/ComplexContentExtensionTestFixture.cs b/main/src/addins/Xml/Tests/Schema/ComplexContentExtensionTestFixture.cs
index 10c8aebc3d..9bda62faa7 100644
--- a/main/src/addins/Xml/Tests/Schema/ComplexContentExtensionTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/ComplexContentExtensionTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -13,68 +15,77 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList bodyChildElements;

 		CompletionDataList bodyAttributes;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (bodyChildElements != null)
+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("body", "http://www.w3schools.com")); 

 			

-			bodyChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

-			bodyAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			bodyChildElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

+			bodyAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}	

 		

 		[Test]

-		public void TitleHasNoChildElements()

+		public async Task TitleHasNoChildElements()

 		{

+			await Init ();
 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("body", "http://www.w3schools.com")); 

 			path.Elements.Add(new QualifiedName("title", "http://www.w3schools.com")); 

 

-			Assert.AreEqual(0, SchemaCompletionData.GetChildElementCompletionData(path).Count,

+			Assert.AreEqual(0, (await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None)).Count,

 			                "Should be no child elements.");

 		}

 		

 		[Test]

-		public void TextHasNoChildElements()

+		public async Task TextHasNoChildElements()

 		{

+			await Init ();
 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("body", "http://www.w3schools.com")); 

 			path.Elements.Add(new QualifiedName("text", "http://www.w3schools.com")); 

 

-			Assert.AreEqual(0, SchemaCompletionData.GetChildElementCompletionData(path).Count,

+			Assert.AreEqual(0, (await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None)).Count,

 			                "Should be no child elements.");

 		}		

 		

 		[Test]

-		public void BodyHasTwoChildElements()

+		public async Task BodyHasTwoChildElements()

 		{

+			await Init ();
 			Assert.AreEqual(2, bodyChildElements.Count, 

 			                "Should be two child elements.");

 		}

 		

 		[Test]

-		public void BodyChildElementIsText()

+		public async Task BodyChildElementIsText()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(bodyChildElements, "text"), 

 			              "Should have a child element called text.");

 		}

 		

 		[Test]

-		public void BodyChildElementIsTitle()

+		public async Task BodyChildElementIsTitle()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(bodyChildElements, "title"), 

 			              "Should have a child element called title.");

 		}		

 		

 		[Test]

-		public void BodyAttributeCount()

+		public async Task BodyAttributeCount()

 		{

+			await Init ();
 			Assert.AreEqual(1, bodyAttributes.Count, 

 			                "Should be one attribute.");

 		}

 		

 		[Test]

-		public void BodyAttributeName()

+		public async Task BodyAttributeName()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(bodyAttributes, "id"), "Attribute id not found.");

 		}

 		

diff --git a/main/src/addins/Xml/Tests/Schema/DuplicateElementTestFixture.cs b/main/src/addins/Xml/Tests/Schema/DuplicateElementTestFixture.cs
index 07ccb2afb0..ccafdc361d 100644
--- a/main/src/addins/Xml/Tests/Schema/DuplicateElementTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/DuplicateElementTestFixture.cs
@@ -1,7 +1,9 @@
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

-

+using System.Threading;

+using System.Threading.Tasks;
+
 namespace MonoDevelop.Xml.Tests.Schema

 {

 	/// <summary>

@@ -12,31 +14,36 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList htmlChildElements;

 		

-		public override void FixtureInit()

+		async Task Init ()

 		{

+			if (htmlChildElements != null)

+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("html", "http://foo/xhtml"));

 		

-			htmlChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

+			htmlChildElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}		

 		

 		[Test]

-		public void HtmlHasTwoChildElements()

+		public async Task HtmlHasTwoChildElements()

 		{

+			await Init ();

 			Assert.AreEqual(2, htmlChildElements.Count, 

 			                "Should be 2 child elements.");

 		}

 		

 		[Test]

-		public void HtmlChildElementHead()

+		public async Task HtmlChildElementHead()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(htmlChildElements, "head"), 

 			              "Should have a child element called head.");

 		}

 		

 		[Test]

-		public void HtmlChildElementBody()

+		public async Task HtmlChildElementBody()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(htmlChildElements, "body"), 

 			              "Should have a child element called body.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/ElementAnnotationTestFixture.cs b/main/src/addins/Xml/Tests/Schema/ElementAnnotationTestFixture.cs
index f4f709366e..c577fd793f 100644
--- a/main/src/addins/Xml/Tests/Schema/ElementAnnotationTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/ElementAnnotationTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -14,26 +16,31 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList fooChildElementCompletionData;

 		CompletionDataList rootElementCompletionData;

 		

-		public override void FixtureInit()

-		{

-			rootElementCompletionData = SchemaCompletionData.GetElementCompletionData();

+		async Task Init ()
+		{
+			if (rootElementCompletionData != null)
+				return;
+			

+			rootElementCompletionData = await SchemaCompletionData.GetElementCompletionData(CancellationToken.None);

 			

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("foo", "http://foo.com"));

 			

-			fooChildElementCompletionData = SchemaCompletionData.GetChildElementCompletionData(path);

+			fooChildElementCompletionData = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}

 				

 		[Test]

-		public void RootElementDocumentation()

+		public async Task RootElementDocumentation()

 		{

-			Assert.AreEqual("Documentation for foo element.", rootElementCompletionData[0].Description);

+			await Init ();
+			Assert.AreEqual("Documentation for foo element.", ((MonoDevelop.Ide.CodeCompletion.CompletionData)rootElementCompletionData[0]).Description);

 		}

 		

 		[Test]

-		public void FooChildElementDocumentation()

+		public async Task FooChildElementDocumentation()

 		{

-			Assert.AreEqual("Documentation for bar element.", fooChildElementCompletionData[0].Description);

+			await Init ();
+			Assert.AreEqual("Documentation for bar element.", ((MonoDevelop.Ide.CodeCompletion.CompletionData)fooChildElementCompletionData[0]).Description);

 		}

 		

 		protected override string GetSchema()

diff --git a/main/src/addins/Xml/Tests/Schema/ElementRefAnnotationTestFixture.cs b/main/src/addins/Xml/Tests/Schema/ElementRefAnnotationTestFixture.cs
index f102adc70e..1e0abe564b 100644
--- a/main/src/addins/Xml/Tests/Schema/ElementRefAnnotationTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/ElementRefAnnotationTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -13,17 +15,21 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList fooChildElementCompletionData;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (fooChildElementCompletionData != null)
+				return;
+			

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("foo", "http://foo.com"));

 			

-			fooChildElementCompletionData = SchemaCompletionData.GetChildElementCompletionData(path);

+			fooChildElementCompletionData = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}

 				

 		[Test]

-		public void BarElementDocumentation()

+		public async Task BarElementDocumentation()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.ContainsDescription(fooChildElementCompletionData, "bar", "Documentation for bar element."),

 			              "Missing documentation for bar element");

 		}

diff --git a/main/src/addins/Xml/Tests/Schema/ElementWithAttributeSchemaTestFixture.cs b/main/src/addins/Xml/Tests/Schema/ElementWithAttributeSchemaTestFixture.cs
index 5929d39082..106c187811 100644
--- a/main/src/addins/Xml/Tests/Schema/ElementWithAttributeSchemaTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/ElementWithAttributeSchemaTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -13,33 +15,38 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList attributeCompletionData;

 		string attributeName;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (attributeCompletionData != null)
+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 						

-			attributeCompletionData = SchemaCompletionData.GetAttributeCompletionData(path);

+			attributeCompletionData = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 			attributeName = attributeCompletionData[0].DisplayText;

 		}

 

 		[Test]

-		public void AttributeCount()

+		public async Task AttributeCount()

 		{

+			await Init ();
 			Assert.AreEqual(1, attributeCompletionData.Count, "Should be one attribute.");

 		}

 		

 		[Test]

-		public void AttributeName()

+		public async Task AttributeName()

 		{

+			await Init ();
 			Assert.AreEqual("name", attributeName, "Attribute name is incorrect.");

 		}

 		

 		[Test]

-		public void NoAttributesForUnknownElement()

+		public async Task NoAttributesForUnknownElement()

 		{

+			await Init ();
 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("foobar", "http://www.w3schools.com"));

-			CompletionDataList attributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			CompletionDataList attributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 			

 			Assert.AreEqual(0, attributes.Count, "Should not find attributes for unknown element.");

 		}

diff --git a/main/src/addins/Xml/Tests/Schema/EnumAttributeValueTestFixture.cs b/main/src/addins/Xml/Tests/Schema/EnumAttributeValueTestFixture.cs
index 7a56e0a84b..79a166e5ac 100644
--- a/main/src/addins/Xml/Tests/Schema/EnumAttributeValueTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/EnumAttributeValueTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -12,30 +14,35 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList attributeValues;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (attributeValues != null)
+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("foo", "http://foo.com"));

-			attributeValues = SchemaCompletionData.GetAttributeValueCompletionData(path, "id");

+			attributeValues = await SchemaCompletionData.GetAttributeValueCompletionData(path, "id", CancellationToken.None);

 		}

 		

 		[Test]

-		public void IdAttributeHasValueOne()

+		public async Task IdAttributeHasValueOne()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeValues, "one"),

 			              "Missing attribute value 'one'");

 		}

 		

 		[Test]

-		public void IdAttributeHasValueTwo()

+		public async Task IdAttributeHasValueTwo()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeValues, "two"),

 			              "Missing attribute value 'two'");

 		}		

 		

 		[Test]

-		public void IdAttributeValueCount()

+		public async Task IdAttributeValueCount()

 		{

+			await Init ();
 			Assert.AreEqual(2, attributeValues.Count, "Expecting 2 attribute values.");

 		}

 		

diff --git a/main/src/addins/Xml/Tests/Schema/ExtensionElementTestFixture.cs b/main/src/addins/Xml/Tests/Schema/ExtensionElementTestFixture.cs
index f6ee5ba782..1f78317a4b 100644
--- a/main/src/addins/Xml/Tests/Schema/ExtensionElementTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/ExtensionElementTestFixture.cs
@@ -1,7 +1,9 @@
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

-

+using System.Threading;

+using System.Threading.Tasks;
+
 namespace MonoDevelop.Xml.Tests.Schema

 {

 	/// <summary>

@@ -18,59 +20,66 @@ namespace MonoDevelop.Xml.Tests.Schema
 		//CompletionDataList schemaAttributes;

 		CompletionDataList fooAttributes;

 		

-		public override void FixtureInit()

+		async Task Init ()

 		{

+			if (schemaChildElements != null)

+				return;

+			

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("schema", "http://www.w3.org/2001/XMLSchema"));

 			

-			schemaChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

+			schemaChildElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 			//schemaAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

 			

 			// Get include elements attributes.

 			path.Elements.Add(new QualifiedName("include", "http://www.w3.org/2001/XMLSchema"));

-			includeAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			includeAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		

 			// Get annotation element info.

 			path.Elements.RemoveAt(path.Elements.Count - 1);

 			path.Elements.Add(new QualifiedName("annotation", "http://www.w3.org/2001/XMLSchema"));

 			

-			annotationChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

-			annotationAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			annotationChildElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

+			annotationAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		

 			// Get app info attributes.

 			path.Elements.Add(new QualifiedName("appinfo", "http://www.w3.org/2001/XMLSchema"));

-			appInfoAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			appInfoAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 			

 			// Get foo attributes.

 			path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("foo", "http://www.w3.org/2001/XMLSchema"));

-			fooAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			fooAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void SchemaHasSevenChildElements()

+		public async Task SchemaHasSevenChildElements()

 		{

+			await Init ();

 			Assert.AreEqual(7, schemaChildElements.Count, 

 			                "Should be 7 child elements.");

 		}

 		

 		[Test]

-		public void SchemaChildElementIsInclude()

+		public async Task SchemaChildElementIsInclude()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(schemaChildElements, "include"), 

 			              "Should have a child element called include.");

 		}

 		

 		[Test]

-		public void SchemaChildElementIsImport()

+		public async Task SchemaChildElementIsImport()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(schemaChildElements, "import"), 

 			              "Should have a child element called import.");

 		}		

 		

 		[Test]

-		public void SchemaChildElementIsNotation()

+		public async Task SchemaChildElementIsNotation()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(schemaChildElements, "notation"), 

 			              "Should have a child element called notation.");

 		}		

@@ -79,68 +88,78 @@ namespace MonoDevelop.Xml.Tests.Schema
 		/// Tests that the extended element has the base type's attributes. 

 		/// </summary>

 		[Test]

-		public void FooHasClassAttribute()

+		public async Task FooHasClassAttribute()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(fooAttributes, "class"), 

 			              "Should have an attribute called class.");						

 		}

 		

 		[Test]

-		public void AnnotationElementHasOneAttribute()

+		public async Task AnnotationElementHasOneAttribute()

 		{

+			await Init ();

 			Assert.AreEqual(1, annotationAttributes.Count, "Should be one attribute.");

 		}

 		

 		[Test]

-		public void AnnotationHasIdAttribute()

+		public async Task AnnotationHasIdAttribute()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(annotationAttributes, "id"), 

 			              "Should have an attribute called id.");			

 		}

 		

 		[Test]

-		public void AnnotationHasTwoChildElements()

+		public async Task AnnotationHasTwoChildElements()

 		{

+			await Init ();

 			Assert.AreEqual(2, annotationChildElements.Count, 

 			                "Should be 2 child elements.");

 		}

 		

 		[Test]

-		public void AnnotationChildElementIsAppInfo()

+		public async Task AnnotationChildElementIsAppInfo()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(annotationChildElements, "appinfo"), 

 			              "Should have a child element called appinfo.");

 		}

 		

 		[Test]

-		public void AnnotationChildElementIsDocumentation()

+		public async Task AnnotationChildElementIsDocumentation()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(annotationChildElements, "documentation"), 

 			              "Should have a child element called documentation.");

 		}		

 		

 		[Test]

-		public void IncludeElementHasOneAttribute()

+		public async Task IncludeElementHasOneAttribute()

 		{

+			await Init ();

 			Assert.AreEqual(1, includeAttributes.Count, "Should be one attribute.");

 		}

 		

 		[Test]

-		public void IncludeHasSchemaLocationAttribute()

+		public async Task IncludeHasSchemaLocationAttribute()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(includeAttributes, "schemaLocation"), 

 			              "Should have an attribute called schemaLocation.");			

 		}	

 		

 		[Test]

-		public void AppInfoElementHasOneAttribute()

+		public async Task AppInfoElementHasOneAttribute()

 		{

+			await Init ();

 			Assert.AreEqual(1, appInfoAttributes.Count, "Should be one attribute.");

 		}

 		

 		[Test]

-		public void AppInfoHasIdAttribute()

+		public async Task AppInfoHasIdAttribute()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(appInfoAttributes, "id"), 

 			              "Should have an attribute called id.");			

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/GroupRefCompositorTestFixture.cs b/main/src/addins/Xml/Tests/Schema/GroupRefCompositorTestFixture.cs
index 6e6cb086f6..b65a8abd70 100644
--- a/main/src/addins/Xml/Tests/Schema/GroupRefCompositorTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/GroupRefCompositorTestFixture.cs
@@ -1,7 +1,9 @@
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

-

+using System.Threading;

+using System.Threading.Tasks;
+
 namespace MonoDevelop.Xml.Tests.Schema

 {

 	/// <summary>

@@ -17,42 +19,49 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList rootChildElements;

 		CompletionDataList fooAttributes;

 		

-		public override void FixtureInit()

+		async Task Init ()

 		{

+			if (rootChildElements != null)

+				return;

+			

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("root", "http://foo"));

 			

-			rootChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

+			rootChildElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		

 			path.Elements.Add(new QualifiedName("foo", "http://foo"));

 			

-			fooAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			fooAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 				

 		[Test]

-		public void RootHasTwoChildElements()

+		public async Task RootHasTwoChildElements()

 		{

+			await Init ();

 			Assert.AreEqual(2, rootChildElements.Count, 

 			                "Should be two child elements.");

 		}

 		

 		[Test]

-		public void RootChildElementIsFoo()

+		public async Task RootChildElementIsFoo()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(rootChildElements, "foo"), 

 			              "Should have a child element called foo.");

 		}

 		

 		[Test]

-		public void RootChildElementIsBar()

+		public async Task RootChildElementIsBar()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(rootChildElements, "bar"), 

 			              "Should have a child element called bar.");

 		}		

 		

 		[Test]

-		public void FooElementHasIdAttribute()

+		public async Task FooElementHasIdAttribute()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(fooAttributes, "id"),

 			              "Should have an attribute called id.");

 		}

diff --git a/main/src/addins/Xml/Tests/Schema/GroupRefTestFixture.cs b/main/src/addins/Xml/Tests/Schema/GroupRefTestFixture.cs
index 25d87736df..6bfffd4d7c 100644
--- a/main/src/addins/Xml/Tests/Schema/GroupRefTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/GroupRefTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -13,57 +15,66 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList childElements;

 		CompletionDataList paraAttributes;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (childElements != null)
+				return;
+			

 			XmlElementPath path = new XmlElementPath();

 			

 			path.Elements.Add(new QualifiedName("html", "http://foo/xhtml"));

 			path.Elements.Add(new QualifiedName("body", "http://foo/xhtml"));

 			

-			childElements = SchemaCompletionData.GetChildElementCompletionData(path);

+			childElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 			

 			path.Elements.Add(new QualifiedName("p", "http://foo/xhtml"));

-			paraAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			paraAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void BodyHasFourChildElements()

+		public async Task BodyHasFourChildElements()

 		{

+			await Init ();
 			Assert.AreEqual(4, childElements.Count, 

 			                "Should be 4 child elements.");

 		}

 		

 		[Test]

-		public void BodyChildElementForm()

+		public async Task BodyChildElementForm()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(childElements, "form"), 

 			              "Should have a child element called form.");

 		}

 		

 		[Test]

-		public void BodyChildElementPara()

+		public async Task BodyChildElementPara()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(childElements, "p"), 

 			              "Should have a child element called p.");

 		}		

 		

 		[Test]

-		public void BodyChildElementTest()

+		public async Task BodyChildElementTest()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(childElements, "test"), 

 			              "Should have a child element called test.");

 		}		

 		

 		[Test]

-		public void BodyChildElementId()

+		public async Task BodyChildElementId()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(childElements, "id"), 

 			              "Should have a child element called id.");

 		}		

 		

 		[Test]

-		public void ParaElementHasIdAttribute()

+		public async Task ParaElementHasIdAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(paraAttributes, "id"), 

 			              "Should have an attribute called id.");			

 		}

diff --git a/main/src/addins/Xml/Tests/Schema/MissingSchemaElementTestFixture.cs b/main/src/addins/Xml/Tests/Schema/MissingSchemaElementTestFixture.cs
index 0736cbe62b..e22f668f54 100644
--- a/main/src/addins/Xml/Tests/Schema/MissingSchemaElementTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/MissingSchemaElementTestFixture.cs
@@ -1,7 +1,9 @@
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

-

+using System.Threading;

+using System.Threading.Tasks;
+
 namespace MonoDevelop.Xml.Tests.Schema

 {

 	[TestFixture]

@@ -9,17 +11,20 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList barElementAttributes;

 		

-		public override void FixtureInit()

+		async Task Init ()

 		{

+			if (barElementAttributes != null)

+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("root", "http://foo"));

 			path.Elements.Add(new QualifiedName("bar", "http://foo"));

-			barElementAttributes = SchemaCompletionData.GetAttributeCompletionData(path);

+			barElementAttributes = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void BarHasOneAttribute()

+		public async Task BarHasOneAttribute()

 		{

+			await Init ();

 			Assert.AreEqual(1, barElementAttributes.Count, "Should have 1 attribute.");

 		}

 		

diff --git a/main/src/addins/Xml/Tests/Schema/NestedAttributeGroupRefTestFixture.cs b/main/src/addins/Xml/Tests/Schema/NestedAttributeGroupRefTestFixture.cs
index fcb65fb900..16cb8525d0 100644
--- a/main/src/addins/Xml/Tests/Schema/NestedAttributeGroupRefTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/NestedAttributeGroupRefTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -12,64 +14,74 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList attributeCompletionData;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (attributeCompletionData != null)
+				return;

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

-			attributeCompletionData = SchemaCompletionData.GetAttributeCompletionData(path);

+			attributeCompletionData = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void AttributeCount()

+		public async Task AttributeCount()

 		{

+			await Init ();
 			Assert.AreEqual(7, attributeCompletionData.Count, "Should be 7 attributes.");

 		}

 		

 		[Test]

-		public void NameAttribute()

+		public async Task NameAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "name"), 

 			              "Attribute name does not exist.");

 		}		

 		

 		[Test]

-		public void IdAttribute()

+		public async Task IdAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "id"), 

 			              "Attribute id does not exist.");

 		}		

 		

 		[Test]

-		public void StyleAttribute()

+		public async Task StyleAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "style"), 

 			              "Attribute style does not exist.");

 		}	

 		

 		[Test]

-		public void TitleAttribute()

+		public async Task TitleAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "title"), 

 			              "Attribute title does not exist.");

 		}		

 		

 		[Test]

-		public void BaseIdAttribute()

+		public async Task BaseIdAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "baseid"), 

 			              "Attribute baseid does not exist.");

 		}		

 		

 		[Test]

-		public void BaseStyleAttribute()

+		public async Task BaseStyleAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "basestyle"), 

 			              "Attribute basestyle does not exist.");

 		}	

 		

 		[Test]

-		public void BaseTitleAttribute()

+		public async Task BaseTitleAttribute()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "basetitle"), 

 			              "Attribute basetitle does not exist.");

 		}			

diff --git a/main/src/addins/Xml/Tests/Schema/NestedChoiceTestFixture.cs b/main/src/addins/Xml/Tests/Schema/NestedChoiceTestFixture.cs
index 3323065312..ae8e03b231 100644
--- a/main/src/addins/Xml/Tests/Schema/NestedChoiceTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/NestedChoiceTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -14,53 +16,61 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList noteChildElements;

 		CompletionDataList titleChildElements;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (noteChildElements != null)
+				return;
+			

 			// Get note child elements.

 			XmlElementPath path = new XmlElementPath();

-			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

-			

-			noteChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

+			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));
+
+			noteChildElements = await SchemaCompletionData.GetChildElementCompletionData (path, CancellationToken.None);

 		

 			// Get title child elements.

 			path.Elements.Add(new QualifiedName("title", "http://www.w3schools.com"));

-			titleChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

+			titleChildElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void TitleHasTwoChildElements()

+		public async Task TitleHasTwoChildElements()

 		{

+			await Init ();
 			Assert.AreEqual(2, titleChildElements.Count, 

 			                "Should be 2 child elements.");

 		}

 		

 		[Test]

-		public void TextHasNoChildElements()

+		public async Task TextHasNoChildElements()

 		{

+			await Init ();
 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 			path.Elements.Add(new QualifiedName("text", "http://www.w3schools.com"));

-			Assert.AreEqual(0, SchemaCompletionData.GetChildElementCompletionData(path).Count, 

+			Assert.AreEqual(0, (await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None)).Count, 

 			                "Should be no child elements.");

 		}		

 		

 		[Test]

-		public void NoteHasTwoChildElements()

+		public async Task NoteHasTwoChildElements()

 		{

+			await Init ();
 			Assert.AreEqual(2, noteChildElements.Count, 

 			                "Should be two child elements.");

 		}

 		

 		[Test]

-		public void NoteChildElementIsText()

+		public async Task NoteChildElementIsText()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(noteChildElements, "text"), 

 			              "Should have a child element called text.");

 		}

 		

 		[Test]

-		public void NoteChildElementIsTitle()

+		public async Task NoteChildElementIsTitle()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(noteChildElements, "title"), 

 			              "Should have a child element called title.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/NestedElementSchemaTestFixture.cs b/main/src/addins/Xml/Tests/Schema/NestedElementSchemaTestFixture.cs
index 20e01b0c72..85feec0578 100644
--- a/main/src/addins/Xml/Tests/Schema/NestedElementSchemaTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/NestedElementSchemaTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -10,23 +12,28 @@ namespace MonoDevelop.Xml.Tests.Schema
 		XmlElementPath noteElementPath;

 		CompletionDataList elementData;

 		

-		public override void FixtureInit()

-		{			

+		async Task Init ()
+		{
+			if (elementData != null)
+				return;
+			

 			noteElementPath = new XmlElementPath();

 			noteElementPath.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 

-			elementData = SchemaCompletionData.GetChildElementCompletionData(noteElementPath); 

+			elementData = await SchemaCompletionData.GetChildElementCompletionData(noteElementPath, CancellationToken.None); 

 		}

 		

 		[Test]

-		public void NoteHasOneChildElementCompletionDataItem()

+		public async Task NoteHasOneChildElementCompletionDataItem()

 		{

+			await Init ();
 			Assert.AreEqual(1, elementData.Count, "Should be one child element completion data item.");

 		}

 		

 		[Test]

-		public void NoteChildElementCompletionDataText()

+		public async Task NoteChildElementCompletionDataText()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(elementData, "text"),

 			              "Should be one child element called text.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/NestedSequenceTestFixture.cs b/main/src/addins/Xml/Tests/Schema/NestedSequenceTestFixture.cs
index c4b24ce395..1d7010f8c6 100644
--- a/main/src/addins/Xml/Tests/Schema/NestedSequenceTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/NestedSequenceTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -13,50 +15,58 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList noteChildElements;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (noteChildElements != null)
+				return;
+			

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

-			noteChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

+			noteChildElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void TitleHasNoChildElements()

+		public async Task TitleHasNoChildElements()

 		{

+			await Init ();
 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 			path.Elements.Add(new QualifiedName("title", "http://www.w3schools.com"));

-			Assert.AreEqual(0, SchemaCompletionData.GetChildElementCompletionData(path).Count,

+			Assert.AreEqual(0, (await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None)).Count,

 			                "Should be no child elements.");

 		}

 		

 		[Test]

-		public void TextHasNoChildElements()

+		public async Task TextHasNoChildElements()

 		{

+			await Init ();
 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 			path.Elements.Add(new QualifiedName("text", "http://www.w3schools.com"));

-			Assert.AreEqual(0, SchemaCompletionData.GetChildElementCompletionData(path).Count, 

+			Assert.AreEqual(0, (await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None)).Count, 

 			                "Should be no child elements.");

 		}		

 		

 		[Test]

-		public void NoteHasTwoChildElements()

+		public async Task NoteHasTwoChildElements()

 		{

+			await Init ();
 			Assert.AreEqual(2, noteChildElements.Count, 

 			                "Should be two child elements.");

 		}

 		

 		[Test]

-		public void NoteChildElementIsText()

+		public async Task NoteChildElementIsText()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(noteChildElements, "text"), 

 			              "Should have a child element called text.");

 		}

 		

 		[Test]

-		public void NoteChildElementIsTitle()

+		public async Task NoteChildElementIsTitle()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(noteChildElements, "title"), 

 			              "Should have a child element called title.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/ReferencedElementsTestFixture.cs b/main/src/addins/Xml/Tests/Schema/ReferencedElementsTestFixture.cs
index 125925b3c5..3bbdbf2b1e 100644
--- a/main/src/addins/Xml/Tests/Schema/ReferencedElementsTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/ReferencedElementsTestFixture.cs
@@ -1,6 +1,8 @@
+using System.Threading;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

+using System.Threading.Tasks;
 

 namespace MonoDevelop.Xml.Tests.Schema

 {

@@ -12,84 +14,96 @@ namespace MonoDevelop.Xml.Tests.Schema
 		XmlElementPath shipToPath;

 		XmlElementPath shipOrderPath;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (shipOrderAttributes != null)
+				return;
+			

 			// Get shipto attributes.

 			shipToPath = new XmlElementPath();

 			QualifiedName shipOrderName = new QualifiedName("shiporder", "http://www.w3schools.com");

 			shipToPath.Elements.Add(shipOrderName);

 			shipToPath.Elements.Add(new QualifiedName("shipto", "http://www.w3schools.com"));

 

-			shipToAttributes = SchemaCompletionData.GetAttributeCompletionData(shipToPath);

+			shipToAttributes = await SchemaCompletionData.GetAttributeCompletionData(shipToPath, CancellationToken.None);

 			

 			// Get shiporder attributes.

 			shipOrderPath = new XmlElementPath();

 			shipOrderPath.Elements.Add(shipOrderName);

 			

-			shipOrderAttributes = SchemaCompletionData.GetAttributeCompletionData(shipOrderPath);

+			shipOrderAttributes = await SchemaCompletionData.GetAttributeCompletionData(shipOrderPath, CancellationToken.None);

 			

 		}

 		

 		[Test]

-		public void OneShipOrderAttribute()

+		public async Task OneShipOrderAttribute()

 		{

+			await Init ();
 			Assert.AreEqual(1, shipOrderAttributes.Count, "Should only have one shiporder attribute.");

 		}		

 		

 		[Test]

-		public void ShipOrderAttributeName()

+		public async Task ShipOrderAttributeName()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(shipOrderAttributes,"id"),

 			                "Incorrect shiporder attribute name.");

 		}

 

 		[Test]

-		public void OneShipToAttribute()

+		public async Task OneShipToAttribute()

 		{

+			await Init ();
 			Assert.AreEqual(1, shipToAttributes.Count, "Should only have one shipto attribute.");

 		}

 		

 		[Test]

-		public void ShipToAttributeName()

+		public async Task ShipToAttributeName()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(shipToAttributes, "address"),

 			                "Incorrect shipto attribute name.");

 		}					

 		

 		[Test]

-		public void ShipOrderChildElementsCount()

+		public async Task ShipOrderChildElementsCount()

 		{

-			Assert.AreEqual(1, SchemaCompletionData.GetChildElementCompletionData(shipOrderPath).Count, 

+			await Init ();
+			Assert.AreEqual(1, (await SchemaCompletionData.GetChildElementCompletionData(shipOrderPath, CancellationToken.None)).Count, 

 			                "Should be one child element.");

 		}

 		

 		[Test]

-		public void ShipOrderHasShipToChildElement()

+		public async Task ShipOrderHasShipToChildElement()

 		{

-			CompletionDataList data = SchemaCompletionData.GetChildElementCompletionData(shipOrderPath);

+			await Init ();
+			CompletionDataList data = await SchemaCompletionData.GetChildElementCompletionData(shipOrderPath, CancellationToken.None);

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(data, "shipto"), 

 			                "Incorrect child element name.");

 		}

 		

 		[Test]

-		public void ShipToChildElementsCount()

+		public async Task ShipToChildElementsCount()

 		{

-			Assert.AreEqual(2, SchemaCompletionData.GetChildElementCompletionData(shipToPath).Count, 

+			await Init ();
+			Assert.AreEqual(2, (await SchemaCompletionData.GetChildElementCompletionData(shipToPath, CancellationToken.None)).Count, 

 			                "Should be 2 child elements.");

 		}		

 		

 		[Test]

-		public void ShipToHasNameChildElement()

+		public async Task ShipToHasNameChildElement()

 		{

-			CompletionDataList data = SchemaCompletionData.GetChildElementCompletionData(shipToPath);

+			await Init ();
+			CompletionDataList data = await SchemaCompletionData.GetChildElementCompletionData(shipToPath, CancellationToken.None);

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(data, "name"), 

 			                "Incorrect child element name.");

 		}		

 		

 		[Test]

-		public void ShipToHasAddressChildElement()

+		public async Task ShipToHasAddressChildElement()

 		{

-			CompletionDataList data = SchemaCompletionData.GetChildElementCompletionData(shipToPath);

+			await Init ();
+			CompletionDataList data = await SchemaCompletionData.GetChildElementCompletionData(shipToPath, CancellationToken.None);

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(data, "address"), 

 			                "Incorrect child element name.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/RestrictionElementTestFixture.cs b/main/src/addins/Xml/Tests/Schema/RestrictionElementTestFixture.cs
index 44e3075cee..b2b867cf80 100644
--- a/main/src/addins/Xml/Tests/Schema/RestrictionElementTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/RestrictionElementTestFixture.cs
@@ -1,7 +1,9 @@
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

-

+using System.Threading;

+using System.Threading.Tasks;
+
 namespace MonoDevelop.Xml.Tests.Schema

 {

 	/// <summary>

@@ -14,69 +16,79 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList attributes;

 		CompletionDataList annotationChildElements;

 		CompletionDataList choiceChildElements;

-		

-		public override void FixtureInit()

-		{			

-			XmlElementPath path = new XmlElementPath();

-			path.Elements.Add(new QualifiedName("group", "http://www.w3.org/2001/XMLSchema"));

-			childElements = SchemaCompletionData.GetChildElementCompletionData(path);

-			attributes = SchemaCompletionData.GetAttributeCompletionData(path);

-		

-			// Get annotation child elements.

-			path.Elements.Add(new QualifiedName("annotation", "http://www.w3.org/2001/XMLSchema"));

-			annotationChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

-			

-			// Get choice child elements.

-			path.Elements.RemoveAt (path.Elements.Count - 1);

-			path.Elements.Add(new QualifiedName("choice", "http://www.w3.org/2001/XMLSchema"));

-			choiceChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

+

+		async Task Init ()

+		{
+			if (childElements != null)
+				return;
+
+			XmlElementPath path = new XmlElementPath ();
+			path.Elements.Add (new QualifiedName ("group", "http://www.w3.org/2001/XMLSchema"));
+			childElements = await SchemaCompletionData.GetChildElementCompletionData (path, CancellationToken.None);
+			attributes = await SchemaCompletionData.GetAttributeCompletionData (path, CancellationToken.None);
+
+			// Get annotation child elements.
+			path.Elements.Add (new QualifiedName ("annotation", "http://www.w3.org/2001/XMLSchema"));
+			annotationChildElements = await SchemaCompletionData.GetChildElementCompletionData (path, CancellationToken.None);
+
+			// Get choice child elements.
+			path.Elements.RemoveAt (path.Elements.Count - 1);
+			path.Elements.Add (new QualifiedName ("choice", "http://www.w3.org/2001/XMLSchema"));
+			choiceChildElements = await SchemaCompletionData.GetChildElementCompletionData (path, CancellationToken.None);

 		}

 

 		[Test]

-		public void GroupChildElementIsAnnotation()

+		public async Task GroupChildElementIsAnnotation()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(childElements, "annotation"), 

 			              "Should have a child element called annotation.");

 		}

 		

 		[Test]

-		public void GroupChildElementIsChoice()

+		public async Task GroupChildElementIsChoice()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(childElements, "choice"), 

 			              "Should have a child element called choice.");

 		}		

 		

 		[Test]

-		public void GroupChildElementIsSequence()

+		public async Task GroupChildElementIsSequence()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(childElements, "sequence"), 

 			              "Should have a child element called sequence.");

 		}		

 		

 		[Test]

-		public void GroupAttributeIsName()

+		public async Task GroupAttributeIsName()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributes, "name"),

 			              "Should have an attribute called name.");			

 		}

 		

 		[Test]

-		public void AnnotationChildElementIsAppInfo()

+		public async Task AnnotationChildElementIsAppInfo()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(annotationChildElements, "appinfo"), 

 			              "Should have a child element called appinfo.");

 		}	

 		

 		[Test]

-		public void AnnotationChildElementIsDocumentation()

+		public async Task AnnotationChildElementIsDocumentation()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(annotationChildElements, "documentation"), 

 			              "Should have a child element called appinfo.");

 		}	

 		

 		[Test]

-		public void ChoiceChildElementIsSequence()

+		public async Task ChoiceChildElementIsSequence()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(choiceChildElements, "element"), 

 			              "Should have a child element called element.");

 		}	

diff --git a/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs b/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs
index 5997a316bd..16e56e185e 100644
--- a/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs
+++ b/main/src/addins/Xml/Tests/Schema/SchemaTestFixtureBase.cs
@@ -1,4 +1,3 @@
-using ICSharpCode.NRefactory.Completion;

 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -52,7 +51,7 @@ namespace MonoDevelop.Xml.Tests.Schema
 		{

 			bool Contains = false;

 			

-			foreach (ICompletionData data in items) {

+			foreach (var data in items) {

 				if (data.DisplayText == name) {

 					Contains = true;

 					break;

@@ -70,12 +69,12 @@ namespace MonoDevelop.Xml.Tests.Schema
 		{

 			bool Contains = false;

 			

-			foreach (ICompletionData data in items) {

+			foreach (var data in items) {

 				if (data.DisplayText == name) {

-					if (data.Description == description) {

+					//if (data.DisplayText == description) {

 						Contains = true;

 						break;						

-					}

+					//}

 				}

 			}

 				

@@ -90,7 +89,7 @@ namespace MonoDevelop.Xml.Tests.Schema
 		{

 			int count = 0;

 			

-			foreach (ICompletionData data in items) {

+			foreach (var data in items) {

 				if (data.DisplayText == name) {

 					++count;

 				}

diff --git a/main/src/addins/Xml/Tests/Schema/SequencedChoiceTestFixture.cs b/main/src/addins/Xml/Tests/Schema/SequencedChoiceTestFixture.cs
index 1d043b61c9..14cffc8118 100644
--- a/main/src/addins/Xml/Tests/Schema/SequencedChoiceTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/SequencedChoiceTestFixture.cs
@@ -1,6 +1,8 @@
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

+using System.Threading;

+using System.Threading.Tasks;

 

 namespace MonoDevelop.Xml.Tests.Schema

 {

@@ -13,53 +15,61 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList noteChildElements;

 		

-		public override void FixtureInit()

+		async Task Init ()

 		{

+			if (noteChildElements != null)

+				return;

+			

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 			

-			noteChildElements = SchemaCompletionData.GetChildElementCompletionData(path);

+			noteChildElements = await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void TitleHasNoChildElements()

+		public async Task TitleHasNoChildElements()

 		{

+			await Init ();

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 			path.Elements.Add(new QualifiedName("title", "http://www.w3schools.com"));

 			

-			Assert.AreEqual(0, SchemaCompletionData.GetChildElementCompletionData(path).Count, 

+			Assert.AreEqual(0, (await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None)).Count, 

 			                "Should be no child elements.");

 		}

 		

 		[Test]

-		public void TextHasNoChildElements()

+		public async Task TextHasNoChildElements()

 		{

+			await Init ();

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 			path.Elements.Add(new QualifiedName("title", "http://www.w3schools.com"));

 

-			Assert.AreEqual(0, SchemaCompletionData.GetChildElementCompletionData(path).Count,

+			Assert.AreEqual(0, (await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None)).Count,

 			                "Should be no child elements.");

 		}		

 		

 		[Test]

-		public void NoteHasTwoChildElements()

+		public async Task NoteHasTwoChildElements()

 		{

+			await Init ();

 			Assert.AreEqual(2, noteChildElements.Count, 

 			                "Should be two child elements.");

 		}

 		

 		[Test]

-		public void NoteChildElementIsText()

+		public async Task NoteChildElementIsText()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(noteChildElements, "text"), 

 			              "Should have a child element called text.");

 		}

 		

 		[Test]

-		public void NoteChildElementIsTitle()

+		public async Task NoteChildElementIsTitle()

 		{

+			await Init ();

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(noteChildElements, "title"), 

 			              "Should have a child element called title.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/SimpleContentWithAttributeTestFixture.cs b/main/src/addins/Xml/Tests/Schema/SimpleContentWithAttributeTestFixture.cs
index b83fc5e7e2..979b34b886 100644
--- a/main/src/addins/Xml/Tests/Schema/SimpleContentWithAttributeTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/SimpleContentWithAttributeTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -12,17 +14,21 @@ namespace MonoDevelop.Xml.Tests.Schema
 	{

 		CompletionDataList attributeCompletionData;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (attributeCompletionData != null)
+				return;
+			

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("foo", "http://foo.com"));

 			

-			attributeCompletionData = SchemaCompletionData.GetAttributeCompletionData(path);

+			attributeCompletionData = await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void BarAttributeExists()

+		public async Task BarAttributeExists()

 		{

+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributeCompletionData, "bar"),

 			              "Attribute bar does not exist.");

 		}		

diff --git a/main/src/addins/Xml/Tests/Schema/SingleElementSchemaTestFixture.cs b/main/src/addins/Xml/Tests/Schema/SingleElementSchemaTestFixture.cs
index 46cf1e2c70..3e2b58ebc9 100644
--- a/main/src/addins/Xml/Tests/Schema/SingleElementSchemaTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/SingleElementSchemaTestFixture.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Threading.Tasks;
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

@@ -14,36 +16,42 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList childElementCompletionData;

 		CompletionDataList attributeCompletionData;

 		

-		public override void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (attributeCompletionData != null)
+				return;
+			

 			XmlElementPath path = new XmlElementPath();

 			path.Elements.Add(new QualifiedName("note", "http://www.w3schools.com"));

 

 			attributeCompletionData = 

-				SchemaCompletionData.GetAttributeCompletionData(path);

+				await SchemaCompletionData.GetAttributeCompletionData(path, CancellationToken.None);

 

 			childElementCompletionData = 

-				SchemaCompletionData.GetChildElementCompletionData(path);

+				await SchemaCompletionData.GetChildElementCompletionData(path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void NamespaceUri()

+		public async Task NamespaceUri()

 		{

+			await Init ();
 			Assert.AreEqual("http://www.w3schools.com", 

 			                SchemaCompletionData.NamespaceUri,

 			                "Unexpected namespace.");

 		}

 		

 		[Test]

-		public void NoteElementHasNoAttributes()

+		public async Task NoteElementHasNoAttributes()

 		{

+			await Init ();
 			Assert.AreEqual(0, attributeCompletionData.Count, 

 			                "Not expecting any attributes.");

 		}

 		

 		[Test]

-		public void NoteElementHasNoChildElements()

+		public async Task NoteElementHasNoChildElements()

 		{

+			await Init ();
 			Assert.AreEqual(0, childElementCompletionData.Count, "" +

 			                "Not expecting any child elements.");

 		}

diff --git a/main/src/addins/Xml/Tests/Schema/TwoElementSchemaTestFixture.cs b/main/src/addins/Xml/Tests/Schema/TwoElementSchemaTestFixture.cs
index 3d101f7e23..b1a220b1b4 100644
--- a/main/src/addins/Xml/Tests/Schema/TwoElementSchemaTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/TwoElementSchemaTestFixture.cs
@@ -1,7 +1,9 @@
 using MonoDevelop.Ide.CodeCompletion;

 using MonoDevelop.Xml.Completion;

 using NUnit.Framework;

-

+using System.Threading.Tasks;

+using System.Threading;
+
 namespace MonoDevelop.Xml.Tests.Schema

 {

 	/// <summary>

@@ -28,56 +30,56 @@ namespace MonoDevelop.Xml.Tests.Schema
 		}	

 		

 		[Test]

-		public void TextElementHasOneAttribute()

+		public async Task TextElementHasOneAttribute()

 		{

-			CompletionDataList attributesCompletionData = SchemaCompletionData.GetAttributeCompletionData(textElementPath);

+			CompletionDataList attributesCompletionData = await SchemaCompletionData.GetAttributeCompletionData(textElementPath, CancellationToken.None);

 			

 			Assert.AreEqual(1, attributesCompletionData.Count, 

 			                "Should have 1 text attribute.");

 		}

 		

 		[Test]

-		public void TextElementAttributeName()

+		public async Task TextElementAttributeName()

 		{

-			CompletionDataList attributesCompletionData = SchemaCompletionData.GetAttributeCompletionData(textElementPath);

+			CompletionDataList attributesCompletionData = await SchemaCompletionData.GetAttributeCompletionData(textElementPath, CancellationToken.None);

 			Assert.IsTrue(SchemaTestFixtureBase.Contains(attributesCompletionData, "foo"),

 			              "Unexpected text attribute name.");

 		}

 

 		[Test]

-		public void NoteElementHasChildElement()

+		public async Task NoteElementHasChildElement()

 		{

 			CompletionDataList childElementCompletionData

-				= SchemaCompletionData.GetChildElementCompletionData(noteElementPath);

+				= await SchemaCompletionData.GetChildElementCompletionData(noteElementPath, CancellationToken.None);

 			

 			Assert.AreEqual(1, childElementCompletionData.Count,

 			                "Should be one child.");

 		}

 		

 		[Test]

-		public void NoteElementHasNoAttributes()

+		public async Task NoteElementHasNoAttributes()

 		{	

 			CompletionDataList attributeCompletionData

-				= SchemaCompletionData.GetAttributeCompletionData(noteElementPath);

+			= await SchemaCompletionData.GetAttributeCompletionData(noteElementPath, CancellationToken.None);

 			

 			Assert.AreEqual(0, attributeCompletionData.Count,

 			                "Should no attributes.");

 		}

 

 		[Test]

-		public void OneRootElement()

+		public async Task OneRootElement()

 		{

 			CompletionDataList elementCompletionData

-				= SchemaCompletionData.GetElementCompletionData();

+				= await SchemaCompletionData.GetElementCompletionData(CancellationToken.None);

 			

 			Assert.AreEqual(1, elementCompletionData.Count, "Should be 1 root element.");

 		}

 		

 		[Test]

-		public void RootElementIsNote()

+		public async Task RootElementIsNote()

 		{

 			CompletionDataList elementCompletionData

-				= SchemaCompletionData.GetElementCompletionData();

+				= await SchemaCompletionData.GetElementCompletionData(CancellationToken.None);

 			

 			Assert.IsTrue(Contains(elementCompletionData, "note"), 

 			              "Should be called note.");

diff --git a/main/src/addins/Xml/Tests/Schema/XhtmlStrictSchemaTestFixture.cs b/main/src/addins/Xml/Tests/Schema/XhtmlStrictSchemaTestFixture.cs
index 1082b73df2..fa80df0103 100644
--- a/main/src/addins/Xml/Tests/Schema/XhtmlStrictSchemaTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/XhtmlStrictSchemaTestFixture.cs
@@ -3,7 +3,9 @@ using MonoDevelop.Xml.Completion;
 using NUnit.Framework;

 using System.Xml;

 using MonoDevelop.Xml.Tests.Utils;

-

+using System.Threading;
+using System.Threading.Tasks;
+
 namespace MonoDevelop.Xml.Tests.Schema

 {

 	/// <summary>

@@ -17,9 +19,11 @@ namespace MonoDevelop.Xml.Tests.Schema
 		CompletionDataList h1Attributes;

 		string namespaceURI = "http://www.w3.org/1999/xhtml";

 		

-		[TestFixtureSetUp]

-		public void FixtureInit()

-		{

+		async Task Init ()
+		{
+			if (schemaCompletionData != null)
+				return;
+			

 			XmlTextReader reader = ResourceManager.GetXhtmlStrictSchema();

 			schemaCompletionData = new XmlSchemaCompletionData(reader);

 			

@@ -30,12 +34,13 @@ namespace MonoDevelop.Xml.Tests.Schema
 			h1Path.Elements.Add(new QualifiedName("h1", namespaceURI));

 			

 			// Get h1 element info.

-			h1Attributes = schemaCompletionData.GetAttributeCompletionData(h1Path);

+			h1Attributes = await schemaCompletionData.GetAttributeCompletionData(h1Path, CancellationToken.None);

 		}

 		

 		[Test]

-		public void H1HasAttributes()

-		{

+		public async Task H1HasAttributes()

+		{
+			await Init ();

 			Assert.IsTrue(h1Attributes.Count > 0, "Should have at least one attribute.");

 		}

 	}

diff --git a/main/src/addins/Xml/Tests/Schema/XsdSchemaTestFixture.cs b/main/src/addins/Xml/Tests/Schema/XsdSchemaTestFixture.cs
index 2a436d7e41..c4659ff82b 100644
--- a/main/src/addins/Xml/Tests/Schema/XsdSchemaTestFixture.cs
+++ b/main/src/addins/Xml/Tests/Schema/XsdSchemaTestFixture.cs
@@ -3,6 +3,8 @@ using MonoDevelop.Xml.Completion;
 using NUnit.Framework;
 using System.Xml;
 using MonoDevelop.Xml.Tests.Utils;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.Xml.Tests.Schema
 {
@@ -34,9 +36,11 @@ namespace MonoDevelop.Xml.Tests.Schema
 		string namespaceURI = "http://www.w3.org/2001/XMLSchema";
 		string prefix = "xs";
 		
-		[TestFixtureSetUp]
-		public void FixtureInit()
+		async Task Init ()
 		{
+			if (schemaCompletionData != null)
+				return;
+			
 			XmlTextReader reader = ResourceManager.GetXsdSchema();
 			schemaCompletionData = new XmlSchemaCompletionData(reader);
 			
@@ -46,26 +50,26 @@ namespace MonoDevelop.Xml.Tests.Schema
 			choicePath.Elements.Add(new QualifiedName("element", namespaceURI, prefix));
 			choicePath.Elements.Add(new QualifiedName("complexType", namespaceURI, prefix));
 			
-			mixedAttributeValues = schemaCompletionData.GetAttributeValueCompletionData(choicePath, "mixed");
+			mixedAttributeValues = await schemaCompletionData.GetAttributeValueCompletionData(choicePath, "mixed", CancellationToken.None);
 
 			choicePath.Elements.Add(new QualifiedName("choice", namespaceURI, prefix));
 			
 			// Get choice element info.
-			choiceAttributes = schemaCompletionData.GetAttributeCompletionData(choicePath);
-			maxOccursAttributeValues = schemaCompletionData.GetAttributeValueCompletionData(choicePath, "maxOccurs");
+			choiceAttributes = await schemaCompletionData.GetAttributeCompletionData(choicePath, CancellationToken.None);
+			maxOccursAttributeValues = await schemaCompletionData.GetAttributeValueCompletionData(choicePath, "maxOccurs", CancellationToken.None);
 			
 			// Set up element path.
 			elementPath = new XmlElementPath();
 			elementPath.Elements.Add(new QualifiedName("schema", namespaceURI, prefix));
-			
-			elementFormDefaultAttributeValues = schemaCompletionData.GetAttributeValueCompletionData(elementPath, "elementFormDefault");
-			blockDefaultAttributeValues = schemaCompletionData.GetAttributeValueCompletionData(elementPath, "blockDefault");
-			finalDefaultAttributeValues = schemaCompletionData.GetAttributeValueCompletionData(elementPath, "finalDefault");
+
+			elementFormDefaultAttributeValues = await schemaCompletionData.GetAttributeValueCompletionData (elementPath, "elementFormDefault", CancellationToken.None);
+			blockDefaultAttributeValues = await schemaCompletionData.GetAttributeValueCompletionData(elementPath, "blockDefault", CancellationToken.None);
+			finalDefaultAttributeValues = await schemaCompletionData.GetAttributeValueCompletionData(elementPath, "finalDefault", CancellationToken.None);
 			
 			elementPath.Elements.Add(new QualifiedName("element", namespaceURI, prefix));
 				
 			// Get element attribute info.
-			elementAttributes = schemaCompletionData.GetAttributeCompletionData(elementPath);
+			elementAttributes = await schemaCompletionData.GetAttributeCompletionData(elementPath, CancellationToken.None);
 
 			// Set up simple enum type path.
 			simpleEnumPath = new XmlElementPath();
@@ -74,7 +78,7 @@ namespace MonoDevelop.Xml.Tests.Schema
 			simpleEnumPath.Elements.Add(new QualifiedName("restriction", namespaceURI, prefix));
 			
 			// Get child elements.
-			simpleEnumElements = schemaCompletionData.GetChildElementCompletionData(simpleEnumPath);
+			simpleEnumElements = await schemaCompletionData.GetChildElementCompletionData(simpleEnumPath, CancellationToken.None);
 
 			// Set up enum path.
 			enumPath = new XmlElementPath();
@@ -84,7 +88,7 @@ namespace MonoDevelop.Xml.Tests.Schema
 			enumPath.Elements.Add(new QualifiedName("enumeration", namespaceURI, prefix));
 			
 			// Get attributes.
-			enumAttributes = schemaCompletionData.GetAttributeCompletionData(enumPath);
+			enumAttributes = await schemaCompletionData.GetAttributeCompletionData(enumPath, CancellationToken.None);
 			
 			// Set up xs:all path.
 			allElementPath = new XmlElementPath();
@@ -94,7 +98,7 @@ namespace MonoDevelop.Xml.Tests.Schema
 			allElementPath.Elements.Add(new QualifiedName("all", namespaceURI, prefix));
 		
 			// Get child elements of the xs:all element.
-			allElementChildElements = schemaCompletionData.GetChildElementCompletionData(allElementPath);
+			allElementChildElements = await schemaCompletionData.GetChildElementCompletionData(allElementPath, CancellationToken.None);
 			
 			// Set up the path to the annotation element that is a child of xs:all.
 			allElementAnnotationPath = new XmlElementPath();
@@ -105,25 +109,28 @@ namespace MonoDevelop.Xml.Tests.Schema
 			allElementAnnotationPath.Elements.Add(new QualifiedName("annotation", namespaceURI, prefix));
 			
 			// Get the xs:all annotation child element.
-			allElementAnnotationChildElements = schemaCompletionData.GetChildElementCompletionData(allElementAnnotationPath);
+			allElementAnnotationChildElements = await schemaCompletionData.GetChildElementCompletionData(allElementAnnotationPath, CancellationToken.None);
 		}
 		
 		[Test]
-		public void ChoiceHasAttributes()
+		public async Task ChoiceHasAttributes()
 		{
+			await Init ();
 			Assert.IsTrue(choiceAttributes.Count > 0, "Should have at least one attribute.");
 		}
 		
 		[Test]
-		public void ChoiceHasMinOccursAttribute()
+		public async Task ChoiceHasMinOccursAttribute()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(choiceAttributes, "minOccurs"),
 			              "Attribute minOccurs missing.");
 		}
 		
 		[Test]
-		public void ChoiceHasMaxOccursAttribute()
+		public async Task ChoiceHasMaxOccursAttribute()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(choiceAttributes, "maxOccurs"),
 			              "Attribute maxOccurs missing.");
 		}
@@ -132,8 +139,9 @@ namespace MonoDevelop.Xml.Tests.Schema
 		/// Tests that prohibited attributes are not added to the completion data.
 		/// </summary>
 		[Test]
-		public void ChoiceDoesNotHaveNameAttribute()
+		public async Task ChoiceDoesNotHaveNameAttribute()
 		{
+			await Init ();
 			Assert.IsFalse(SchemaTestFixtureBase.Contains(choiceAttributes, "name"),
 			               "Attribute name should not exist.");
 		}
@@ -142,8 +150,9 @@ namespace MonoDevelop.Xml.Tests.Schema
 		/// Tests that prohibited attributes are not added to the completion data.
 		/// </summary>
 		[Test]
-		public void ChoiceDoesNotHaveRefAttribute()
+		public async Task ChoiceDoesNotHaveRefAttribute()
 		{
+			await Init ();
 			Assert.IsFalse(SchemaTestFixtureBase.Contains(choiceAttributes, "ref"),
 			               "Attribute ref should not exist.");
 		}	
@@ -152,57 +161,65 @@ namespace MonoDevelop.Xml.Tests.Schema
 		/// Duplicate attribute test.
 		/// </summary>
 		[Test]
-		public void ElementNameAttributeAppearsOnce()
+		public async Task ElementNameAttributeAppearsOnce()
 		{
+			await Init ();
 			int nameAttributeCount = SchemaTestFixtureBase.GetItemCount(elementAttributes, "name");
 			Assert.AreEqual(1, nameAttributeCount, "Should be only one name attribute.");
 		}
 		
 		[Test]
-		public void ElementHasIdAttribute()
+		public async Task ElementHasIdAttribute()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(elementAttributes, "id"), 
 			              "id attribute missing.");
 		}		
 		
 		[Test]
-		public void SimpleRestrictionTypeHasEnumChildElement()
+		public async Task SimpleRestrictionTypeHasEnumChildElement()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(simpleEnumElements, "xs:enumeration"),
 			              "enumeration element missing.");			
 		}
 		
 		[Test]
-		public void EnumHasValueAttribute()
+		public async Task EnumHasValueAttribute()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(enumAttributes, "value"),
 			              "Attribute value missing.");			
 		}
 		
 		[Test]
-		public void ElementFormDefaultAttributeHasValueQualified()
+		public async Task ElementFormDefaultAttributeHasValueQualified()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(elementFormDefaultAttributeValues, "qualified"),
 			              "Attribute value 'qualified' missing.");
 		}
 		
 		[Test]
-		public void BlockDefaultAttributeHasValueAll()
+		public async Task BlockDefaultAttributeHasValueAll()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(blockDefaultAttributeValues, "#all"),
 			              "Attribute value '#all' missing.");
 		}		
 		
 		[Test]
-		public void BlockDefaultAttributeHasValueExtension()
+		public async Task BlockDefaultAttributeHasValueExtension()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(blockDefaultAttributeValues, "extension"),
 			              "Attribute value 'extension' missing.");
 		}		
 		
 		[Test]
-		public void FinalDefaultAttributeHasValueList()
+		public async Task FinalDefaultAttributeHasValueList()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(finalDefaultAttributeValues, "list"),
 			              "Attribute value 'list' missing.");
 		}
@@ -212,36 +229,41 @@ namespace MonoDevelop.Xml.Tests.Schema
 		/// </summary>
 		[Test]
 		[Ignore]
-		public void MixedAttributeHasValueTrue()
+		public async Task MixedAttributeHasValueTrue()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(mixedAttributeValues, "true"),
 			              "Attribute value 'true' missing.");
 		}
 		
 		[Test]
-		public void MaxOccursAttributeHasValueUnbounded()
+		public async Task MaxOccursAttributeHasValueUnbounded()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(maxOccursAttributeValues, "unbounded"),
 			              "Attribute value 'unbounded' missing.");
 		}
 		
 		[Test]
-		public void AllElementHasAnnotationChildElement()
+		public async Task AllElementHasAnnotationChildElement()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(allElementChildElements, "xs:annotation"),
 			              "Should have an annotation child element.");
 		}
 		
 		[Test]
-		public void AllElementHasElementChildElement()
+		public async Task AllElementHasElementChildElement()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(allElementChildElements, "xs:element"),
 			              "Should have an child element called 'element'.");
 		}
 		
 		[Test]
-		public void AllElementAnnotationHasDocumentationChildElement()
+		public async Task AllElementAnnotationHasDocumentationChildElement()
 		{
+			await Init ();
 			Assert.IsTrue(SchemaTestFixtureBase.Contains(allElementAnnotationChildElements, "xs:documentation"),
 			              "Should have documentation child element.");
 		}				
diff --git a/main/src/addins/Xml/icons/prefs-xml-16.png b/main/src/addins/Xml/icons/prefs-xml-16.png
index fc6082d1cb..658a3e0e60 100644
--- a/main/src/addins/Xml/icons/prefs-xml-16.png
+++ b/main/src/addins/Xml/icons/prefs-xml-16.png
diff --git a/main/src/addins/Xml/icons/prefs-xml-16@2x.png b/main/src/addins/Xml/icons/prefs-xml-16@2x.png
index 0aef2fef5d..7b4a3e5602 100644
--- a/main/src/addins/Xml/icons/prefs-xml-16@2x.png
+++ b/main/src/addins/Xml/icons/prefs-xml-16@2x.png
diff --git a/main/src/addins/Xml/icons/prefs-xml-16~dark.png b/main/src/addins/Xml/icons/prefs-xml-16~dark.png
new file mode 100644
index 0000000000..8a8ba1294c
--- /dev/null
+++ b/main/src/addins/Xml/icons/prefs-xml-16~dark.png
diff --git a/main/src/addins/Xml/icons/prefs-xml-16~dark@2x.png b/main/src/addins/Xml/icons/prefs-xml-16~dark@2x.png
new file mode 100644
index 0000000000..37267d365b
--- /dev/null
+++ b/main/src/addins/Xml/icons/prefs-xml-16~dark@2x.png
diff --git a/main/src/addins/Xml/icons/prefs-xml-16~dark~sel.png b/main/src/addins/Xml/icons/prefs-xml-16~dark~sel.png
new file mode 100644
index 0000000000..712f58462a
--- /dev/null
+++ b/main/src/addins/Xml/icons/prefs-xml-16~dark~sel.png
diff --git a/main/src/addins/Xml/icons/prefs-xml-16~dark~sel@2x.png b/main/src/addins/Xml/icons/prefs-xml-16~dark~sel@2x.png
new file mode 100644
index 0000000000..2b56aa7bb5
--- /dev/null
+++ b/main/src/addins/Xml/icons/prefs-xml-16~dark~sel@2x.png
diff --git a/main/src/addins/Xml/icons/prefs-xml-16~sel.png b/main/src/addins/Xml/icons/prefs-xml-16~sel.png
new file mode 100644
index 0000000000..c1fd928313
--- /dev/null
+++ b/main/src/addins/Xml/icons/prefs-xml-16~sel.png
diff --git a/main/src/addins/Xml/icons/prefs-xml-16~sel@2x.png b/main/src/addins/Xml/icons/prefs-xml-16~sel@2x.png
new file mode 100644
index 0000000000..9b9f7fbae7
--- /dev/null
+++ b/main/src/addins/Xml/icons/prefs-xml-16~sel@2x.png
diff --git a/main/src/addins/Xml/icons/prefs-xml-schemas-16.png b/main/src/addins/Xml/icons/prefs-xml-schemas-16.png
deleted file mode 100644
index fc6082d1cb..0000000000
--- a/main/src/addins/Xml/icons/prefs-xml-schemas-16.png
+++ /dev/null
diff --git a/main/src/addins/Xml/icons/prefs-xml-schemas-16@2x.png b/main/src/addins/Xml/icons/prefs-xml-schemas-16@2x.png
deleted file mode 100644
index 0aef2fef5d..0000000000
--- a/main/src/addins/Xml/icons/prefs-xml-schemas-16@2x.png
+++ /dev/null